From 38a126df66092487803d2759c1698fa86a5be01d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 11 Jun 2018 08:34:19 -0500 Subject: [PATCH 01/55] Rename field_map_obj to event_object_movement --- asm/field_ground_effect.s | 108 ------------------ ...ield_map_obj.s => event_object_movement.s} | 0 data/map_obj_8097404.s | 2 +- ...ield_map_obj.h => event_object_movement.h} | 0 ...pers.h => event_object_movement_helpers.h} | 0 ld_script.txt | 6 +- src/battle_setup.c | 4 +- src/berry_tag_screen.c | 2 +- src/bike.c | 2 +- src/decoration.c | 2 +- ...ield_map_obj.c => event_object_movement.c} | 61 +++++++++- ...pers.c => event_object_movement_helpers.c} | 4 +- src/field_camera.c | 2 +- src/field_effect.c | 4 +- src/field_special_scene.c | 2 +- src/fldeff_groundshake.c | 2 +- src/fossil_specials.c | 2 +- src/item_menu.c | 2 +- src/item_use.c | 4 +- src/map_obj_lock.c | 4 +- src/naming_screen.c | 2 +- src/overworld.c | 4 +- src/player_pc.c | 2 +- src/rom6.c | 2 +- src/rotating_gate.c | 2 +- src/scrcmd.c | 4 +- src/script_movement.c | 4 +- src/secret_base.c | 2 +- src/start_menu.c | 2 +- src/trainer_see.c | 4 +- src/tv.c | 2 +- 31 files changed, 96 insertions(+), 147 deletions(-) rename data/{field_map_obj.s => event_object_movement.s} (100%) rename include/{field_map_obj.h => event_object_movement.h} (100%) rename include/{field_map_obj_helpers.h => event_object_movement_helpers.h} (100%) rename src/{field_map_obj.c => event_object_movement.c} (98%) rename src/{field_map_obj_helpers.c => event_object_movement_helpers.c} (99%) diff --git a/asm/field_ground_effect.s b/asm/field_ground_effect.s index 2152a5c5b4..05f8ffce0d 100644 --- a/asm/field_ground_effect.s +++ b/asm/field_ground_effect.s @@ -5,114 +5,6 @@ .text - thumb_func_start GetAllGroundEffectFlags_OnSpawn -@ void GetAllGroundEffectFlags_OnSpawn(struct npc_state *fieldObject, u32 *flags) -GetAllGroundEffectFlags_OnSpawn: @ 8096638 - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - bl FieldObjectUpdateMetatileBehaviors - adds r0, r4, 0 - adds r1, r5, 0 - bl GetGroundEffectFlags_Reflection - adds r0, r4, 0 - adds r1, r5, 0 - bl GetGroundEffectFlags_TallGrassOnSpawn - adds r0, r4, 0 - adds r1, r5, 0 - bl GetGroundEffectFlags_LongGrassOnSpawn - adds r0, r4, 0 - adds r1, r5, 0 - bl GetGroundEffectFlags_SandHeap - adds r0, r4, 0 - adds r1, r5, 0 - bl GetGroundEffectFlags_ShallowFlowingWater - adds r0, r4, 0 - adds r1, r5, 0 - bl GetGroundEffectFlags_ShortGrass - adds r0, r4, 0 - adds r1, r5, 0 - bl GetGroundEffectFlags_HotSprings - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end GetAllGroundEffectFlags_OnSpawn - - thumb_func_start GetAllGroundEffectFlags_OnBeginStep -@ void GetAllGroundEffectFlags_OnBeginStep(struct npc_state *fieldObject, u32 *flags) -GetAllGroundEffectFlags_OnBeginStep: @ 8096680 - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - bl FieldObjectUpdateMetatileBehaviors - adds r0, r4, 0 - adds r1, r5, 0 - bl GetGroundEffectFlags_Reflection - adds r0, r4, 0 - adds r1, r5, 0 - bl GetGroundEffectFlags_TallGrassOnBeginStep - adds r0, r4, 0 - adds r1, r5, 0 - bl GetGroundEffectFlags_LongGrassOnBeginStep - adds r0, r4, 0 - adds r1, r5, 0 - bl GetGroundEffectFlags_Tracks - adds r0, r4, 0 - adds r1, r5, 0 - bl GetGroundEffectFlags_SandHeap - adds r0, r4, 0 - adds r1, r5, 0 - bl GetGroundEffectFlags_ShallowFlowingWater - adds r0, r4, 0 - adds r1, r5, 0 - bl GetGroundEffectFlags_Puddle - adds r0, r4, 0 - adds r1, r5, 0 - bl GetGroundEffectFlags_ShortGrass - adds r0, r4, 0 - adds r1, r5, 0 - bl GetGroundEffectFlags_HotSprings - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end GetAllGroundEffectFlags_OnBeginStep - - thumb_func_start GetAllGroundEffectFlags_OnFinishStep -@ void GetAllGroundEffectFlags_OnFinishStep(struct npc_state *fieldObject, u32 *flags) -GetAllGroundEffectFlags_OnFinishStep: @ 80966D8 - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - bl FieldObjectUpdateMetatileBehaviors - adds r0, r4, 0 - adds r1, r5, 0 - bl GetGroundEffectFlags_ShallowFlowingWater - adds r0, r4, 0 - adds r1, r5, 0 - bl GetGroundEffectFlags_SandHeap - adds r0, r4, 0 - adds r1, r5, 0 - bl GetGroundEffectFlags_Puddle - adds r0, r4, 0 - adds r1, r5, 0 - bl GetGroundEffectFlags_Ripple - adds r0, r4, 0 - adds r1, r5, 0 - bl GetGroundEffectFlags_ShortGrass - adds r0, r4, 0 - adds r1, r5, 0 - bl GetGroundEffectFlags_HotSprings - adds r0, r4, 0 - adds r1, r5, 0 - bl GetGroundEffectFlags_Seaweed - adds r0, r4, 0 - adds r1, r5, 0 - bl GetGroundEffectFlags_JumpLanding - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end GetAllGroundEffectFlags_OnFinishStep - thumb_func_start FieldObjectUpdateMetatileBehaviors @ void FieldObjectUpdateMetatileBehaviors(struct npc_state *fieldObject) FieldObjectUpdateMetatileBehaviors: @ 8096728 diff --git a/data/field_map_obj.s b/data/event_object_movement.s similarity index 100% rename from data/field_map_obj.s rename to data/event_object_movement.s diff --git a/data/map_obj_8097404.s b/data/map_obj_8097404.s index 719a782662..b30e4b6d7f 100644 --- a/data/map_obj_8097404.s +++ b/data/map_obj_8097404.s @@ -106,7 +106,7 @@ gUnknown_0850E84A:: @ 850E84A gUnknown_0850E850:: @ 850E850 .byte 0x01, 0x01, 0x02, 0x00 -// referenced in data/field_map_obj.s +// referenced in data/event_object_movement.s .align 2 gUnknown_0850E854:: .4byte sub_8097E50 diff --git a/include/field_map_obj.h b/include/event_object_movement.h similarity index 100% rename from include/field_map_obj.h rename to include/event_object_movement.h diff --git a/include/field_map_obj_helpers.h b/include/event_object_movement_helpers.h similarity index 100% rename from include/field_map_obj_helpers.h rename to include/event_object_movement_helpers.h diff --git a/ld_script.txt b/ld_script.txt index f7e531fce2..51e641fd11 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -92,9 +92,9 @@ SECTIONS { src/field_camera.o(.text); src/field_door.o(.text); asm/field_player_avatar.o(.text); - src/field_map_obj.o(.text); + src/event_object_movement.o(.text); asm/field_ground_effect.o(.text); - src/field_map_obj_helpers.o(.text); + src/event_object_movement_helpers.o(.text); src/field_message_box.o(.text); src/map_obj_lock.o(.text); src/text_window.o(.text); @@ -397,7 +397,7 @@ SECTIONS { src/metatile_behavior.o(.rodata); src/field_door.o(.rodata); data/field_player_avatar.o(.rodata); - data/field_map_obj.o(.rodata); + data/event_object_movement.o(.rodata); data/field_ground_effect.o(.rodata); data/map_obj_8097404.o(.rodata); src/text_window.o(.rodata); diff --git a/src/battle_setup.c b/src/battle_setup.c index 48a2ef2572..5411551f73 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -21,7 +21,7 @@ #include "constants/items.h" #include "palette.h" #include "window.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "event_scripts.h" #include "trainer_see.h" #include "field_message_box.h" @@ -32,7 +32,7 @@ #include "overworld.h" #include "field_weather.h" #include "gym_leader_rematch.h" -#include "field_map_obj_helpers.h" +#include "event_object_movement_helpers.h" enum { diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index 9a6e78c819..a755f4f440 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -2,7 +2,7 @@ #include "berry_tag_screen.h" #include "berry.h" #include "decompress.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "item_menu.h" #include "constants/items.h" #include "item.h" diff --git a/src/bike.c b/src/bike.c index e827707cd8..d413989f06 100644 --- a/src/bike.c +++ b/src/bike.c @@ -1,6 +1,6 @@ #include "global.h" #include "bike.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "field_player_avatar.h" #include "fieldmap.h" #include "constants/flags.h" diff --git a/src/decoration.c b/src/decoration.c index 08287a3cce..2fbd247a6d 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -17,7 +17,7 @@ #include "field_player_avatar.h" #include "field_camera.h" #include "field_screen.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "list_menu.h" #include "menu_helpers.h" #include "menu.h" diff --git a/src/field_map_obj.c b/src/event_object_movement.c similarity index 98% rename from src/field_map_obj.c rename to src/event_object_movement.c index af018eb164..d847599b8d 100644 --- a/src/field_map_obj.c +++ b/src/event_object_movement.c @@ -14,7 +14,7 @@ #include "rom_818CFC8.h" #include "rom_81BE66C.h" #include "field_ground_effect.h" -#include "field_map_obj_helpers.h" +#include "event_object_movement_helpers.h" #include "mauville_old_man.h" #include "metatile_behavior.h" #include "field_effect.h" @@ -22,7 +22,7 @@ #include "field_camera.h" #include "trainer_see.h" #include "decoration.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #define NUM_FIELD_MAP_OBJECT_TEMPLATES 0x51 @@ -175,6 +175,24 @@ extern u8 (*const gUnknown_0850DEE8[5])(u8); extern const s16 gUnknown_0850DFBC[3]; extern const s16 gUnknown_0850DFC2[3]; +/*static*/ void FieldObjectUpdateMetatileBehaviors(struct MapObject*); +/*static*/ void GetAllGroundEffectFlags_OnBeginStep(struct MapObject*, u32*); +/*static*/ void GetGroundEffectFlags_Reflection(struct MapObject*, u32*); +/*static*/ void GetGroundEffectFlags_TallGrassOnSpawn(struct MapObject*, u32*); +/*static*/ void GetGroundEffectFlags_LongGrassOnSpawn(struct MapObject*, u32*); +/*static*/ void GetGroundEffectFlags_SandHeap(struct MapObject*, u32*); +/*static*/ void GetGroundEffectFlags_ShallowFlowingWater(struct MapObject*, u32*); +/*static*/ void GetGroundEffectFlags_ShortGrass(struct MapObject*, u32*); +/*static*/ void GetGroundEffectFlags_HotSprings(struct MapObject*, u32*); +/*static*/ void GetGroundEffectFlags_TallGrassOnBeginStep(struct MapObject*, u32*); +/*static*/ void GetGroundEffectFlags_LongGrassOnBeginStep(struct MapObject*, u32*); +/*static*/ void GetGroundEffectFlags_Tracks(struct MapObject*, u32*); +/*static*/ void GetGroundEffectFlags_Puddle(struct MapObject*, u32*); +/*static*/ void GetGroundEffectFlags_Ripple(struct MapObject*, u32*); +/*static*/ void GetGroundEffectFlags_Seaweed(struct MapObject*, u32*); +/*static*/ void GetGroundEffectFlags_JumpLanding(struct MapObject*, u32*); + + // Code static void npc_clear_ids_and_state(struct MapObject *mapObject) @@ -5117,3 +5135,42 @@ static void npc_update_obj_anim_flag(struct MapObject *mapObject, struct Sprite sprite->invisible = TRUE; } } + +/*static*/ void GetAllGroundEffectFlags_OnSpawn(struct MapObject *eventObj, u32 *flags) +{ + FieldObjectUpdateMetatileBehaviors(eventObj); + GetGroundEffectFlags_Reflection(eventObj, flags); + GetGroundEffectFlags_TallGrassOnSpawn(eventObj, flags); + GetGroundEffectFlags_LongGrassOnSpawn(eventObj, flags); + GetGroundEffectFlags_SandHeap(eventObj, flags); + GetGroundEffectFlags_ShallowFlowingWater(eventObj, flags); + GetGroundEffectFlags_ShortGrass(eventObj, flags); + GetGroundEffectFlags_HotSprings(eventObj, flags); +} + +/*static*/ void GetAllGroundEffectFlags_OnBeginStep(struct MapObject *eventObj, u32 *flags) +{ + FieldObjectUpdateMetatileBehaviors(eventObj); + GetGroundEffectFlags_Reflection(eventObj, flags); + GetGroundEffectFlags_TallGrassOnBeginStep(eventObj, flags); + GetGroundEffectFlags_LongGrassOnBeginStep(eventObj, flags); + GetGroundEffectFlags_Tracks(eventObj, flags); + GetGroundEffectFlags_SandHeap(eventObj, flags); + GetGroundEffectFlags_ShallowFlowingWater(eventObj, flags); + GetGroundEffectFlags_Puddle(eventObj, flags); + GetGroundEffectFlags_ShortGrass(eventObj, flags); + GetGroundEffectFlags_HotSprings(eventObj, flags); +} + +/*static*/ void GetAllGroundEffectFlags_OnFinishStep(struct MapObject *eventObj, u32 *flags) +{ + FieldObjectUpdateMetatileBehaviors(eventObj); + GetGroundEffectFlags_ShallowFlowingWater(eventObj, flags); + GetGroundEffectFlags_SandHeap(eventObj, flags); + GetGroundEffectFlags_Puddle(eventObj, flags); + GetGroundEffectFlags_Ripple(eventObj, flags); + GetGroundEffectFlags_ShortGrass(eventObj, flags); + GetGroundEffectFlags_HotSprings(eventObj, flags); + GetGroundEffectFlags_Seaweed(eventObj, flags); + GetGroundEffectFlags_JumpLanding(eventObj, flags); +} diff --git a/src/field_map_obj_helpers.c b/src/event_object_movement_helpers.c similarity index 99% rename from src/field_map_obj_helpers.c rename to src/event_object_movement_helpers.c index b8efcfe721..48f3b9052f 100755 --- a/src/field_map_obj_helpers.c +++ b/src/event_object_movement_helpers.c @@ -1,8 +1,8 @@ #include "global.h" #include "field_ground_effect.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "field_effect.h" -#include "field_map_obj_helpers.h" +#include "event_object_movement_helpers.h" #include "malloc.h" #include "task.h" #include "util.h" diff --git a/src/field_camera.c b/src/field_camera.c index 95167ee10f..b937f704b8 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -4,7 +4,7 @@ #include "field_camera.h" #include "field_player_avatar.h" #include "fieldmap.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "gpu_regs.h" #include "menu.h" #include "overworld.h" diff --git a/src/field_effect.c b/src/field_effect.c index 692090779b..79753f027f 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -6,8 +6,8 @@ #include "decompress.h" #include "field_camera.h" #include "field_effect_helpers.h" -#include "field_map_obj.h" -#include "field_map_obj_helpers.h" +#include "event_object_movement.h" +#include "event_object_movement_helpers.h" #include "field_player_avatar.h" #include "field_screen.h" #include "field_weather.h" diff --git a/src/field_special_scene.c b/src/field_special_scene.c index a704beaaba..2d9973488a 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -1,7 +1,7 @@ #include "global.h" #include "task.h" #include "sprite.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "constants/songs.h" #include "sound.h" #include "palette.h" diff --git a/src/fldeff_groundshake.c b/src/fldeff_groundshake.c index bee4d2c4b0..6da529d003 100644 --- a/src/fldeff_groundshake.c +++ b/src/fldeff_groundshake.c @@ -4,7 +4,7 @@ #include "constants/songs.h" #include "event_data.h" #include "field_camera.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "malloc.h" #include "random.h" #include "roulette_util.h" diff --git a/src/fossil_specials.c b/src/fossil_specials.c index 060915fa64..49db0f5b6e 100644 --- a/src/fossil_specials.c +++ b/src/fossil_specials.c @@ -4,7 +4,7 @@ #include "bg.h" #include "event_data.h" #include "field_camera.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "fieldmap.h" #include "global.fieldmap.h" #include "gpu_regs.h" diff --git a/src/item_menu.c b/src/item_menu.c index c4b4b15b14..75465e2989 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -9,7 +9,7 @@ #include "constants/songs.h" #include "decompress.h" #include "event_data.h" -#include "field_map_obj_helpers.h" +#include "event_object_movement_helpers.h" #include "field_player_avatar.h" #include "field_specials.h" #include "graphics.h" diff --git a/src/item_use.c b/src/item_use.c index d036da6d3b..4318a930bd 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -12,12 +12,12 @@ #include "data2.h" #include "event_data.h" #include "fieldmap.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "field_player_avatar.h" #include "field_screen.h" #include "field_weather.h" #include "item.h" -#include "field_map_obj_helpers.h" +#include "event_object_movement_helpers.h" #include "mail.h" #include "metatile_behavior.h" #include "overworld.h" diff --git a/src/map_obj_lock.c b/src/map_obj_lock.c index 688d0594dd..3a67950de1 100644 --- a/src/map_obj_lock.c +++ b/src/map_obj_lock.c @@ -1,7 +1,7 @@ #include "global.h" #include "event_data.h" -#include "field_map_obj.h" -#include "field_map_obj_helpers.h" +#include "event_object_movement.h" +#include "event_object_movement_helpers.h" #include "field_player_avatar.h" #include "map_obj_lock.h" #include "script_movement.h" diff --git a/src/naming_screen.c b/src/naming_screen.c index 0e350aa354..9ad1a9742a 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -11,7 +11,7 @@ #include "pokemon.h" #include "field_specials.h" #include "field_player_avatar.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "event_data.h" #include "constants/vars.h" #include "constants/songs.h" diff --git a/src/overworld.c b/src/overworld.c index 3d9a1bdc2e..b895ba43ea 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -11,8 +11,8 @@ #include "field_effect.h" #include "field_fadetransition.h" #include "field_ground_effect.h" -#include "field_map_obj.h" -#include "field_map_obj_helpers.h" +#include "event_object_movement.h" +#include "event_object_movement_helpers.h" #include "field_message_box.h" #include "field_player_avatar.h" #include "field_screen_effect.h" diff --git a/src/player_pc.c b/src/player_pc.c index c10c63dda0..48be0633f4 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -4,7 +4,7 @@ #include "decoration.h" #include "event_scripts.h" #include "field_fadetransition.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "field_screen.h" #include "field_weather.h" #include "international_string_util.h" diff --git a/src/rom6.c b/src/rom6.c index 4a5c506b62..9b505a2054 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -6,7 +6,7 @@ #include "event_data.h" #include "event_scripts.h" #include "field_effect.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "field_player_avatar.h" #include "item_use.h" #include "party_menu.h" diff --git a/src/rotating_gate.c b/src/rotating_gate.c index b07814f588..1f5ef165f0 100644 --- a/src/rotating_gate.c +++ b/src/rotating_gate.c @@ -1,7 +1,7 @@ #include "global.h" #include "bike.h" #include "event_data.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "constants/maps.h" #include "constants/songs.h" #include "sound.h" diff --git a/src/scrcmd.c b/src/scrcmd.c index a29e649792..68bcd49364 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -13,8 +13,8 @@ #include "field_door.h" #include "field_effect.h" #include "field_fadetransition.h" -#include "field_map_obj.h" -#include "field_map_obj_helpers.h" +#include "event_object_movement.h" +#include "event_object_movement_helpers.h" #include "field_message_box.h" #include "field_player_avatar.h" #include "field_screen_effect.h" diff --git a/src/script_movement.c b/src/script_movement.c index bbeb0eedc6..4d1e77d4a1 100644 --- a/src/script_movement.c +++ b/src/script_movement.c @@ -1,7 +1,7 @@ #include "global.h" #include "script_movement.h" -#include "field_map_obj.h" -#include "field_map_obj_helpers.h" +#include "event_object_movement.h" +#include "event_object_movement_helpers.h" #include "task.h" #include "util.h" diff --git a/src/secret_base.c b/src/secret_base.c index 44e980c438..71cf3f1a64 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -20,7 +20,7 @@ #include "field_player_avatar.h" #include "field_screen.h" #include "field_weather.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "field_effect.h" #include "fldeff_80F9BCC.h" #include "metatile_behavior.h" diff --git a/src/start_menu.c b/src/start_menu.c index c248ca86bc..355d0fa228 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -15,7 +15,7 @@ #include "battle_frontier_2.h" #include "rom_818CFC8.h" #include "field_specials.h" -#include "field_map_obj_helpers.h" +#include "event_object_movement_helpers.h" #include "script.h" #include "main.h" #include "sound.h" diff --git a/src/trainer_see.c b/src/trainer_see.c index 7706da703d..28fe0064b4 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -4,9 +4,9 @@ #include "pokemon.h" #include "sprite.h" #include "field_effect.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "field_player_avatar.h" -#include "field_map_obj_helpers.h" +#include "event_object_movement_helpers.h" #include "pokenav.h" #include "task.h" #include "util.h" diff --git a/src/tv.c b/src/tv.c index e69f6f4115..5c10372931 100644 --- a/src/tv.c +++ b/src/tv.c @@ -26,7 +26,7 @@ #include "lilycove_lady.h" #include "rom6.h" #include "pokedex.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "text.h" #include "script_menu.h" #include "naming_screen.h" From 4018acfae12ab5d39aaff9acdeaa5d713d1def0e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 11 Jun 2018 09:19:17 -0500 Subject: [PATCH 02/55] Update event object struct members --- include/event_object_movement.h | 2 +- include/global.fieldmap.h | 90 ++-- src/battle_setup.c | 2 +- src/berry.c | 6 +- src/bike.c | 72 ++-- src/event_object_movement.c | 620 ++++++++++++++-------------- src/event_object_movement_helpers.c | 30 +- src/field_effect.c | 114 ++--- src/field_special_scene.c | 2 +- src/map_obj_lock.c | 12 +- src/overworld.c | 58 +-- src/trainer_see.c | 74 ++-- 12 files changed, 539 insertions(+), 543 deletions(-) diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 1bf3915e12..7fd1fc93ad 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -77,7 +77,7 @@ void MoveCoords(u8, s16 *, s16 *); bool8 FieldObjectIsSpecialAnimActive(struct MapObject *); u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *); u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z); -void npc_set_running_behaviour_etc(struct MapObject *mapObject, u8 animPattern); +void npc_set_running_behaviour_etc(struct MapObject *mapObject, u8 movementType); u8 npc_running_behaviour_by_direction(u8 direction); const u8 *GetFieldObjectScriptPointerByFieldObjectId(u8 mapObjectId); u8 sub_8092C8C(struct MapObject *mapObject, s16 x, s16 y, u8 direction); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 94127c554e..06f3cebb2f 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -181,51 +181,47 @@ struct MapHeader struct MapObject { /*0x00*/ u32 active:1; - u32 mapobj_bit_1:1; - u32 mapobj_bit_2:1; - u32 mapobj_bit_3:1; - u32 mapobj_bit_4:1; - u32 mapobj_bit_5:1; - u32 mapobj_bit_6:1; - u32 mapobj_bit_7:1; - /*0x01*/ u32 mapobj_bit_8:1; - u32 mapobj_bit_9:1; - u32 mapobj_bit_10:1; - u32 mapobj_bit_11:1; - u32 mapobj_bit_12:1; - u32 mapobj_bit_13:1; - u32 mapobj_bit_14:1; - u32 mapobj_bit_15:1; - /*0x02*/ u32 mapobj_bit_16:1; - u32 mapobj_bit_17:1; - u32 mapobj_bit_18:1; - u32 mapobj_bit_19:1; - u32 mapobj_bit_20:1; - u32 mapobj_bit_21:1; - u32 mapobj_bit_22:1; - u32 mapobj_bit_23:1; - /*0x03*/ u32 mapobj_bit_24:1; - u32 mapobj_bit_25:1; - u32 mapobj_bit_26:1; - u32 mapobj_bit_27:1; - u32 mapobj_bit_28:1; - u32 mapobj_bit_29:1; - u32 mapobj_bit_30:1; - u32 mapobj_bit_31:1; + u32 singleMovementActive:1; + u32 triggerGroundEffectsOnMove:1; + u32 triggerGroundEffectsOnStop:1; + u32 disableCoveringGroundEffects:1; + u32 landingJump:1; + u32 heldMovementActive:1; + u32 heldMovementFinished:1; + /*0x01*/ u32 frozen:1; + u32 facingDirectionLocked:1; + u32 disableAnim:1; + u32 enableAnim:1; + u32 inanimate:1; + u32 invisible:1; + u32 offScreen:1; + u32 trackedByCamera:1; + /*0x02*/ u32 isPlayer:1; + u32 hasReflection:1; + u32 inShortGrass:1; + u32 inShallowFlowingWater:1; + u32 inSandPile:1; + u32 inHotSprings:1; + u32 hasShadow:1; + u32 spriteAnimPausedBackup:1; + /*0x03*/ u32 spriteAffineAnimPausedBackup:1; + u32 disableJumpLandingGroundEffect:1; + u32 fixedPriority:1; + u32 unk3_3:1; /*0x04*/ u8 spriteId; /*0x05*/ u8 graphicsId; - /*0x06*/ u8 animPattern; + /*0x06*/ u8 movementType; /*0x07*/ u8 trainerType; /*0x08*/ u8 localId; /*0x09*/ u8 mapNum; /*0x0A*/ u8 mapGroup; - /*0x0B*/ u8 mapobj_unk_0B_0:4; - u8 elevation:4; - /*0x0C*/ struct Coords16 coords1; - /*0x10*/ struct Coords16 coords2; - /*0x14*/ struct Coords16 coords3; - /*0x18*/ u8 mapobj_unk_18:4; // current direction? - /*0x18*/ u8 placeholder18:4; + /*0x0B*/ u8 currentElevation:4; + u8 previousElevation:4; + /*0x0C*/ struct Coords16 initialCoords; + /*0x10*/ struct Coords16 currentCoords; + /*0x14*/ struct Coords16 previousCoords; + /*0x18*/ u8 facingDirection:4; // current direction? + /*0x18*/ u8 movementDirection:4; /*0x19*/ union __attribute__((packed)) { u8 as_byte; struct __attribute__((packed)) { @@ -233,15 +229,15 @@ struct MapObject u8 y:4; } __attribute__((aligned (1))) as_nybbles; } __attribute__((aligned (1))) range; - /*0x1A*/ u8 mapobj_unk_1A; - /*0x1B*/ u8 mapobj_unk_1B; - /*0x1C*/ u8 mapobj_unk_1C; + /*0x1A*/ u8 fieldEffectSpriteId; + /*0x1B*/ u8 warpArrowSpriteId; + /*0x1C*/ u8 movementActionId; /*0x1D*/ u8 trainerRange_berryTreeId; - /*0x1E*/ u8 mapobj_unk_1E; - /*0x1F*/ u8 mapobj_unk_1F; - /*0x20*/ u8 mapobj_unk_20; - /*0x21*/ u8 mapobj_unk_21; - /*0x22*/ u8 animId; + /*0x1E*/ u8 currentMetatileBehavior; + /*0x1F*/ u8 previousMetatileBehavior; + /*0x20*/ u8 previousMovementDirection; + /*0x21*/ u8 directionSequenceIndex; + /*0x22*/ u8 playerCopyableMovement; /*size = 0x24*/ }; diff --git a/src/battle_setup.c b/src/battle_setup.c index 5411551f73..a801367e95 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -1204,7 +1204,7 @@ void sub_80B16D8(void) { struct MapObject *mapObject = &gMapObjects[gSelectedMapObject]; - npc_set_running_behaviour_etc(mapObject, npc_running_behaviour_by_direction(mapObject->mapobj_unk_18)); + npc_set_running_behaviour_etc(mapObject, npc_running_behaviour_by_direction(mapObject->facingDirection)); } u8 GetTrainerBattleMode(void) diff --git a/src/berry.c b/src/berry.c index e128eb0ec7..3b5df1cc84 100644 --- a/src/berry.c +++ b/src/berry.c @@ -1238,10 +1238,10 @@ void ResetBerryTreeSparkleFlags(void) bottom = top + 8; for (i = 0; i < MAP_OBJECTS_COUNT; i++) { - if (gMapObjects[i].active && gMapObjects[i].animPattern == 12) + if (gMapObjects[i].active && gMapObjects[i].movementType == 12) { - cam_left = gMapObjects[i].coords2.x; - cam_top = gMapObjects[i].coords2.y; + cam_left = gMapObjects[i].currentCoords.x; + cam_top = gMapObjects[i].currentCoords.y; if (left <= cam_left && cam_left <= right && top <= cam_top && cam_top <= bottom) ResetBerryTreeSparkleFlag(gMapObjects[i].trainerRange_berryTreeId); } diff --git a/src/bike.c b/src/bike.c index d413989f06..92f4b8a60e 100644 --- a/src/bike.c +++ b/src/bike.c @@ -198,14 +198,14 @@ static void MachBikeTransition_TurnDirection(u8 direction) { struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E)) + if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior)) { PlayerTurnInPlace(direction); Bike_SetBikeStill(); } else { - MachBikeTransition_FaceDirection(playerMapObj->mapobj_unk_18); + MachBikeTransition_FaceDirection(playerMapObj->facingDirection); } } @@ -214,13 +214,13 @@ static void MachBikeTransition_TrySpeedUp(u8 direction) struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; u8 collision; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == FALSE) + if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == FALSE) { // we cannot go forward, so either slow down or, if we are stopped, idle face direction. if (gPlayerAvatar.bikeSpeed) - MachBikeTransition_TrySlowDown(playerMapObj->placeholder18); + MachBikeTransition_TrySlowDown(playerMapObj->movementDirection); else - MachBikeTransition_FaceDirection(playerMapObj->placeholder18); + MachBikeTransition_FaceDirection(playerMapObj->movementDirection); } else { @@ -388,7 +388,7 @@ static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16 { // B button was released. gPlayerAvatar.bikeFrameCounter = 0; - if (!MetatileBehavior_IsBumpySlope(playerMapObj->mapobj_unk_1E)) + if (!MetatileBehavior_IsBumpySlope(playerMapObj->currentMetatileBehavior)) { // Go back to normal on flat ground *newDirection = direction; @@ -431,7 +431,7 @@ static u8 AcroBikeHandleInputBunnyHop(u8 *newDirection, u16 newKeys, u16 heldKey { // B button was released Bike_SetBikeStill(); - if (MetatileBehavior_IsBumpySlope(playerMapObj->mapobj_unk_1E)) + if (MetatileBehavior_IsBumpySlope(playerMapObj->currentMetatileBehavior)) { // even though B was released, dont undo the wheelie on the bumpy slope. gPlayerAvatar.acroBikeState = ACRO_STATE_WHEELIE_STANDING; @@ -478,7 +478,7 @@ static u8 AcroBikeHandleInputWheelieMoving(u8 *newDirection, u16 newKeys, u16 he { // we were moving on a wheelie, but we let go while moving. reset bike still status Bike_SetBikeStill(); - if (!MetatileBehavior_IsBumpySlope(playerMapObj->mapobj_unk_1E)) + if (!MetatileBehavior_IsBumpySlope(playerMapObj->currentMetatileBehavior)) { // we let go of B and arent on a bumpy slope, set state to normal because now we need to handle this gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL; @@ -526,8 +526,8 @@ static u8 AcroBikeHandleInputSidewaysJump(u8 *ptr, u16 newKeys, u16 heldKeys) { struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - playerMapObj->mapobj_bit_9 = 0; - FieldObjectSetDirection(playerMapObj, playerMapObj->mapobj_unk_18); + playerMapObj->facingDirectionLocked = 0; + FieldObjectSetDirection(playerMapObj, playerMapObj->facingDirection); gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL; return CheckMovementInputAcroBike(ptr, newKeys, heldKeys); } @@ -547,8 +547,8 @@ static void AcroBikeTransition_TurnDirection(u8 direction) { struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0) - direction = playerMapObj->placeholder18; + if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) + direction = playerMapObj->movementDirection; PlayerFaceDirection(direction); } @@ -557,9 +557,9 @@ static void AcroBikeTransition_Moving(u8 direction) u8 collision; struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) { - AcroBikeTransition_FaceDirection(playerMapObj->placeholder18); + AcroBikeTransition_FaceDirection(playerMapObj->movementDirection); return; } collision = get_some_collision(direction); @@ -582,8 +582,8 @@ static void AcroBikeTransition_NormalToWheelie(u8 direction) { struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0) - direction = playerMapObj->placeholder18; + if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) + direction = playerMapObj->movementDirection; PlayerStartWheelie(direction); } @@ -591,8 +591,8 @@ static void AcroBikeTransition_WheelieToNormal(u8 direction) { struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0) - direction = playerMapObj->placeholder18; + if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) + direction = playerMapObj->movementDirection; PlayerEndWheelie(direction); } @@ -600,8 +600,8 @@ static void AcroBikeTransition_WheelieIdle(u8 direction) { struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0) - direction = playerMapObj->placeholder18; + if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) + direction = playerMapObj->movementDirection; PlayerIdleWheelie(direction); } @@ -609,8 +609,8 @@ static void AcroBikeTransition_WheelieHoppingStanding(u8 direction) { struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0) - direction = playerMapObj->placeholder18; + if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) + direction = playerMapObj->movementDirection; PlayerStandingHoppingWheelie(direction); } @@ -619,9 +619,9 @@ static void AcroBikeTransition_WheelieHoppingMoving(u8 direction) u8 collision; struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) { - AcroBikeTransition_WheelieHoppingStanding(playerMapObj->placeholder18); + AcroBikeTransition_WheelieHoppingStanding(playerMapObj->movementDirection); return; } collision = get_some_collision(direction); @@ -671,7 +671,7 @@ static void AcroBikeTransition_SideJump(u8 direction) } playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; PlaySE(SE_JITE_PYOKO); - playerMapObj->mapobj_bit_9 = 1; + playerMapObj->facingDirectionLocked = 1; PlayerSetAnimId(sub_8093514(direction), 2); } @@ -685,9 +685,9 @@ static void AcroBikeTransition_WheelieMoving(u8 direction) u8 collision; struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) { - PlayerIdleWheelie(playerMapObj->placeholder18); + PlayerIdleWheelie(playerMapObj->movementDirection); return; } collision = get_some_collision(direction); @@ -703,7 +703,7 @@ static void AcroBikeTransition_WheelieMoving(u8 direction) } else if (collision <= 4) { - if (MetatileBehavior_IsBumpySlope(playerMapObj->mapobj_unk_1E)) + if (MetatileBehavior_IsBumpySlope(playerMapObj->currentMetatileBehavior)) PlayerIdleWheelie(direction); else sub_808B980(direction); //hit wall? @@ -719,9 +719,9 @@ static void AcroBikeTransition_WheelieRisingMoving(u8 direction) u8 collision; struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) { - PlayerStartWheelie(playerMapObj->placeholder18); + PlayerStartWheelie(playerMapObj->movementDirection); return; } collision = get_some_collision(direction); @@ -737,7 +737,7 @@ static void AcroBikeTransition_WheelieRisingMoving(u8 direction) } else if (collision <= 4) { - if (MetatileBehavior_IsBumpySlope(playerMapObj->mapobj_unk_1E)) + if (MetatileBehavior_IsBumpySlope(playerMapObj->currentMetatileBehavior)) PlayerIdleWheelie(direction); else sub_808B980(direction); //hit wall? @@ -753,9 +753,9 @@ static void AcroBikeTransition_WheelieLoweringMoving(u8 direction) u8 collision; struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) { - PlayerEndWheelie(playerMapObj->placeholder18); + PlayerEndWheelie(playerMapObj->movementDirection); return; } collision = get_some_collision(direction); @@ -882,8 +882,8 @@ static u8 get_some_collision(u8 direction) u8 metatitleBehavior; struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - x = playerMapObj->coords2.x; - y = playerMapObj->coords2.y; + x = playerMapObj->currentCoords.x; + y = playerMapObj->currentCoords.y; MoveCoords(direction, &x, &y); metatitleBehavior = MapGridGetMetatileBehaviorAt(x, y); return Bike_CheckCollisionTryAdvanceCollisionCount(playerMapObj, x, y, direction, metatitleBehavior); @@ -979,7 +979,7 @@ bool8 IsBikingDisallowedByPlayer(void) bool8 player_should_look_direction_be_enforced_upon_movement(void) { - if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE) != FALSE && MetatileBehavior_IsBumpySlope(gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1E) != FALSE) + if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE) != FALSE && MetatileBehavior_IsBumpySlope(gMapObjects[gPlayerAvatar.mapObjectId].currentMetatileBehavior) != FALSE) return FALSE; else return TRUE; diff --git a/src/event_object_movement.c b/src/event_object_movement.c index d847599b8d..261f234f4b 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -56,9 +56,9 @@ bool8 sub(struct MapObject *mapObject, struct Sprite *sprite)\ {\ u8 route[sizeof(path)];\ memcpy(route, path, sizeof(path));\ - if (mapObject->mapobj_unk_21 == (catch) && mapObject->coords1.coord == mapObject->coords2.coord)\ + if (mapObject->directionSequenceIndex == (catch) && mapObject->initialCoords.coord == mapObject->currentCoords.coord)\ {\ - mapObject->mapobj_unk_21 = (catch) + 1;\ + mapObject->directionSequenceIndex = (catch) + 1;\ }\ return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, route);\ }\ @@ -201,7 +201,7 @@ static void npc_clear_ids_and_state(struct MapObject *mapObject) mapObject->localId = 0xFF; mapObject->mapNum = -1; mapObject->mapGroup = -1; - mapObject->mapobj_unk_1C = -1; + mapObject->movementActionId = -1; } static void npcs_clear_ids_and_state(void) @@ -278,7 +278,7 @@ u8 GetFieldObjectIdByXY(s16 x, s16 y) for (i = 0; i < NUM_FIELD_OBJECTS; i ++) { - if (gMapObjects[i].active && gMapObjects[i].coords2.x == x && gMapObjects[i].coords2.y == y) + if (gMapObjects[i].active && gMapObjects[i].currentCoords.x == x && gMapObjects[i].currentCoords.y == y) { break; } @@ -333,30 +333,30 @@ static u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u x = template->x + 7; y = template->y + 7; mapObject->active = TRUE; - mapObject->mapobj_bit_2 = TRUE; + mapObject->triggerGroundEffectsOnMove = TRUE; mapObject->graphicsId = template->graphicsId; - mapObject->animPattern = template->movementType; + mapObject->movementType = template->movementType; mapObject->localId = template->localId; mapObject->mapNum = mapNum; mapObject->mapGroup = mapGroup; - mapObject->coords1.x = x; - mapObject->coords1.y = y; - mapObject->coords2.x = x; - mapObject->coords2.y = y; - mapObject->coords3.x = x; - mapObject->coords3.y = y; - mapObject->mapobj_unk_0B_0 = template->elevation; - mapObject->elevation = template->elevation; + mapObject->initialCoords.x = x; + mapObject->initialCoords.y = y; + mapObject->currentCoords.x = x; + mapObject->currentCoords.y = y; + mapObject->previousCoords.x = x; + mapObject->previousCoords.y = y; + mapObject->currentElevation = template->elevation; + mapObject->previousElevation = template->elevation; // For some reason, 0x0F is placed in r9, to be used later mapObject->range.as_nybbles.x = template->unkA_0; mapObject->range.as_nybbles.y = template->unkA_4; mapObject->trainerType = template->unkC; mapObject->trainerRange_berryTreeId = template->unkE; - mapObject->mapobj_unk_20 = gUnknown_085055CD[template->movementType]; - FieldObjectSetDirection(mapObject, mapObject->mapobj_unk_20); + mapObject->previousMovementDirection = gUnknown_085055CD[template->movementType]; + FieldObjectSetDirection(mapObject, mapObject->previousMovementDirection); FieldObjectHandleDynamicGraphicsId(mapObject); - if (gUnknown_0850557C[mapObject->animPattern]) + if (gUnknown_0850557C[mapObject->movementType]) { if ((mapObject->range.as_nybbles.x) == 0) { @@ -654,9 +654,9 @@ static u8 SpawnFieldObjectInternal(struct MapObjectTemplate *mapObjectTemplate, paletteSlot -= 16; sub_808EAB0(graphicsInfo->paletteTag1, paletteSlot); } - if (mapObject->animPattern == 0x4c) + if (mapObject->movementType == 0x4c) { - mapObject->mapobj_bit_13 = TRUE; + mapObject->invisible = TRUE; } *(u16 *)&spriteTemplate->paletteTag = 0xFFFF; spriteId = CreateSprite(spriteTemplate, 0, 0, 0); @@ -666,7 +666,7 @@ static u8 SpawnFieldObjectInternal(struct MapObjectTemplate *mapObjectTemplate, return NUM_FIELD_OBJECTS; } sprite = &gSprites[spriteId]; - sub_8092FF0(mapObject->coords2.x + cameraX, mapObject->coords2.y + cameraY, &sprite->pos1.x, &sprite->pos1.y); + sub_8092FF0(mapObject->currentCoords.x + cameraX, mapObject->currentCoords.y + cameraY, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); sprite->pos1.x += 8; @@ -675,12 +675,12 @@ static u8 SpawnFieldObjectInternal(struct MapObjectTemplate *mapObjectTemplate, sprite->coordOffsetEnabled = TRUE; sprite->data[0] = mapObjectId; mapObject->spriteId = spriteId; - mapObject->mapobj_bit_12 = graphicsInfo->inanimate; - if (!mapObject->mapobj_bit_12) + mapObject->inanimate = graphicsInfo->inanimate; + if (!mapObject->inanimate) { - StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObject->mapobj_unk_18)); + StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObject->facingDirection)); } - SetObjectSubpriorityByZCoord(mapObject->elevation, sprite, 1); + SetObjectSubpriorityByZCoord(mapObject->previousElevation, sprite, 1); sub_8096518(mapObject, sprite); return mapObjectId; } @@ -915,7 +915,7 @@ void SpawnFieldObjectsInView(s16 cameraX, s16 cameraY) { mapObject = &gMapObjects[i]; - if (mapObject->active && !mapObject->mapobj_bit_16) + if (mapObject->active && !mapObject->isPlayer) RemoveFieldObjectIfOutsideView(mapObject); } } @@ -933,11 +933,11 @@ static void RemoveFieldObjectIfOutsideView(struct MapObject *mapObject) top = gSaveBlock1Ptr->pos.y; bottom = gSaveBlock1Ptr->pos.y + 16; - if (mapObject->coords2.x >= left && mapObject->coords2.x <= right - && mapObject->coords2.y >= top && mapObject->coords2.y <= bottom) + if (mapObject->currentCoords.x >= left && mapObject->currentCoords.x <= right + && mapObject->currentCoords.y >= top && mapObject->currentCoords.y <= bottom) return; - if (mapObject->coords1.x >= left && mapObject->coords1.x <= right - && mapObject->coords1.y >= top && mapObject->coords1.y <= bottom) + if (mapObject->initialCoords.x >= left && mapObject->initialCoords.x <= right + && mapObject->initialCoords.y >= top && mapObject->initialCoords.y <= bottom) return; RemoveFieldObject(mapObject); } @@ -982,7 +982,7 @@ static void sub_808E1B8(u8 mapObjectId, s16 x, s16 y) subspriteTables = NULL; graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId); spriteFrameImage.size = graphicsInfo->size; - MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(mapObject->graphicsId, mapObject->animPattern, &spriteTemplate, &subspriteTables); + MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(mapObject->graphicsId, mapObject->movementType, &spriteTemplate, &subspriteTables); spriteTemplate.images = &spriteFrameImage; *(u16 *)&spriteTemplate.paletteTag = 0xffff; paletteSlot = graphicsInfo->paletteSlot; @@ -1004,16 +1004,16 @@ static void sub_808E1B8(u8 mapObjectId, s16 x, s16 y) if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; - sub_8092FF0(x + mapObject->coords2.x, y + mapObject->coords2.y, &sprite->pos1.x, &sprite->pos1.y); + sub_8092FF0(x + mapObject->currentCoords.x, y + mapObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); sprite->pos1.x += 8; sprite->pos1.y += 16 + sprite->centerToCornerVecY; sprite->images = graphicsInfo->images; - if (mapObject->animPattern == 0x0b) + if (mapObject->movementType == 0x0b) { SetPlayerAvatarFieldObjectIdAndObjectId(mapObjectId, spriteId); - mapObject->mapobj_unk_1B = sub_8154228(); + mapObject->warpArrowSpriteId = sub_8154228(); } if (subspriteTables != NULL) { @@ -1023,25 +1023,25 @@ static void sub_808E1B8(u8 mapObjectId, s16 x, s16 y) sprite->coordOffsetEnabled = TRUE; sprite->data[0] = mapObjectId; mapObject->spriteId = spriteId; - if (!mapObject->mapobj_bit_12 && mapObject->animPattern != 0x0b) + if (!mapObject->inanimate && mapObject->movementType != 0x0b) { - StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObject->mapobj_unk_18)); + StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObject->facingDirection)); } sub_808E38C(mapObject); - SetObjectSubpriorityByZCoord(mapObject->elevation, sprite, 1); + SetObjectSubpriorityByZCoord(mapObject->previousElevation, sprite, 1); } } /*static*/ void sub_808E38C(struct MapObject *mapObject) { - mapObject->mapobj_bit_1 = FALSE; - mapObject->mapobj_bit_2 = TRUE; - mapObject->mapobj_bit_22 = FALSE; - mapObject->mapobj_bit_17 = FALSE; - mapObject->mapobj_bit_18 = FALSE; - mapObject->mapobj_bit_19 = FALSE; - mapObject->mapobj_bit_20 = FALSE; - mapObject->mapobj_bit_21 = FALSE; + mapObject->singleMovementActive = FALSE; + mapObject->triggerGroundEffectsOnMove = TRUE; + mapObject->hasShadow = FALSE; + mapObject->hasReflection = FALSE; + mapObject->inShortGrass = FALSE; + mapObject->inShallowFlowingWater = FALSE; + mapObject->inSandPile = FALSE; + mapObject->inHotSprings = FALSE; FieldObjectClearAnim(mapObject); } @@ -1081,14 +1081,14 @@ void FieldObjectSetGraphicsId(struct MapObject *mapObject, u8 graphicsId) sprite->anims = graphicsInfo->anims; sprite->subspriteTables = graphicsInfo->subspriteTables; sprite->oam.paletteNum = paletteSlot; - mapObject->mapobj_bit_12 = graphicsInfo->inanimate; + mapObject->inanimate = graphicsInfo->inanimate; mapObject->graphicsId = graphicsId; - sub_8093038(mapObject->coords2.x, mapObject->coords2.y, &sprite->pos1.x, &sprite->pos1.y); + sub_8093038(mapObject->currentCoords.x, mapObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); sprite->pos1.x += 8; sprite->pos1.y += 16 + sprite->centerToCornerVecY; - if (mapObject->mapobj_bit_15) + if (mapObject->trackedByCamera) { CameraObjectReset1(); } @@ -1107,9 +1107,9 @@ void FieldObjectSetGraphicsIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, void FieldObjectTurn(struct MapObject *mapObject, u8 direction) { FieldObjectSetDirection(mapObject, direction); - if (!mapObject->mapobj_bit_12) + if (!mapObject->inanimate) { - StartSpriteAnim(&gSprites[mapObject->spriteId], FieldObjectDirectionToImageAnimId(mapObject->mapobj_unk_18)); + StartSpriteAnim(&gSprites[mapObject->spriteId], FieldObjectDirectionToImageAnimId(mapObject->facingDirection)); SeekSpriteAnim(&gSprites[mapObject->spriteId], 0); } } @@ -1134,12 +1134,12 @@ void PlayerObjectTurn(struct PlayerAvatar *playerAvatar, u8 direction) u8 berryStage; u8 berryId; - mapObject->mapobj_bit_13 = TRUE; + mapObject->invisible = TRUE; sprite->invisible = TRUE; berryStage = GetStageByBerryTreeId(mapObject->trainerRange_berryTreeId); if (berryStage != 0) { - mapObject->mapobj_bit_13 = FALSE; + mapObject->invisible = FALSE; sprite->invisible = FALSE; berryId = GetBerryTypeByBerryTreeId(mapObject->trainerRange_berryTreeId) - 1; berryStage -= 1; @@ -1188,7 +1188,7 @@ void npc_by_local_id_and_map_set_field_1_bit_x20(u8 localId, u8 mapNum, u8 mapGr if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) { - gMapObjects[mapObjectId].mapobj_bit_13 = state; + gMapObjects[mapObjectId].invisible = state; } } @@ -1208,7 +1208,7 @@ void sub_808E75C(s16 x, s16 y) if (mapObjectId != NUM_FIELD_OBJECTS) { mapObject = &gMapObjects[mapObjectId]; - mapObject->mapobj_bit_2 = TRUE; + mapObject->triggerGroundEffectsOnMove = TRUE; } } @@ -1222,7 +1222,7 @@ void sub_808E78C(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority) { mapObject = &gMapObjects[mapObjectId]; sprite = &gSprites[mapObject->spriteId]; - mapObject->mapobj_bit_26 = TRUE; + mapObject->fixedPriority = TRUE; sprite->subpriority = subpriority; } } @@ -1235,8 +1235,8 @@ void sub_808E7E4(u8 localId, u8 mapNum, u8 mapGroup) if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) { mapObject = &gMapObjects[mapObjectId]; - mapObject->mapobj_bit_26 = FALSE; - mapObject->mapobj_bit_2 = TRUE; + mapObject->fixedPriority = FALSE; + mapObject->triggerGroundEffectsOnMove = TRUE; } } @@ -1359,26 +1359,26 @@ static void sub_808EAB0(u16 tag, u8 slot) void unref_sub_808EAC4(struct MapObject *mapObject, s16 x, s16 y) { - mapObject->coords3.x = mapObject->coords2.x; - mapObject->coords3.y = mapObject->coords2.y; - mapObject->coords2.x += x; - mapObject->coords2.y += y; + mapObject->previousCoords.x = mapObject->currentCoords.x; + mapObject->previousCoords.y = mapObject->currentCoords.y; + mapObject->currentCoords.x += x; + mapObject->currentCoords.y += y; } void npc_coords_shift(struct MapObject *mapObject, s16 x, s16 y) { - mapObject->coords3.x = mapObject->coords2.x; - mapObject->coords3.y = mapObject->coords2.y; - mapObject->coords2.x = x; - mapObject->coords2.y = y; + mapObject->previousCoords.x = mapObject->currentCoords.x; + mapObject->previousCoords.y = mapObject->currentCoords.y; + mapObject->currentCoords.x = x; + mapObject->currentCoords.y = y; } /*static*/ void npc_coords_set(struct MapObject *mapObject, s16 x, s16 y) { - mapObject->coords3.x = x; - mapObject->coords3.y = y; - mapObject->coords2.x = x; - mapObject->coords2.y = y; + mapObject->previousCoords.x = x; + mapObject->previousCoords.y = y; + mapObject->currentCoords.x = x; + mapObject->currentCoords.y = y; } void sub_808EB08(struct MapObject *mapObject, s16 x, s16 y) @@ -1389,13 +1389,13 @@ void sub_808EB08(struct MapObject *mapObject, s16 x, s16 y) sprite = &gSprites[mapObject->spriteId]; graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId); npc_coords_set(mapObject, x, y); - sub_8093038(mapObject->coords2.x, mapObject->coords2.y, &sprite->pos1.x, &sprite->pos1.y); + sub_8093038(mapObject->currentCoords.x, mapObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); sprite->pos1.x += 8; sprite->pos1.y += 16 + sprite->centerToCornerVecY; sub_808E38C(mapObject); - if (mapObject->mapobj_bit_15) + if (mapObject->trackedByCamera) { CameraObjectReset1(); } @@ -1415,7 +1415,7 @@ void sub_808EBA8(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) void npc_coords_shift_still(struct MapObject *mapObject) { - npc_coords_shift(mapObject, mapObject->coords2.x, mapObject->coords2.y); + npc_coords_shift(mapObject, mapObject->currentCoords.x, mapObject->currentCoords.y); } void UpdateFieldObjectCoordsForCameraUpdate(void) @@ -1432,12 +1432,12 @@ void UpdateFieldObjectCoordsForCameraUpdate(void) { if (gMapObjects[i].active) { - gMapObjects[i].coords1.x -= dx; - gMapObjects[i].coords1.y -= dy; - gMapObjects[i].coords2.x -= dx; - gMapObjects[i].coords2.y -= dy; - gMapObjects[i].coords3.x -= dx; - gMapObjects[i].coords3.y -= dy; + gMapObjects[i].initialCoords.x -= dx; + gMapObjects[i].initialCoords.y -= dy; + gMapObjects[i].currentCoords.x -= dx; + gMapObjects[i].currentCoords.y -= dy; + gMapObjects[i].previousCoords.x -= dx; + gMapObjects[i].previousCoords.y -= dy; } } } @@ -1450,7 +1450,7 @@ u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z) { if (gMapObjects[i].active) { - if (gMapObjects[i].coords2.x == x && gMapObjects[i].coords2.y == y && FieldObjectDoesZCoordMatch(&gMapObjects[i], z)) + if (gMapObjects[i].currentCoords.x == x && gMapObjects[i].currentCoords.y == y && FieldObjectDoesZCoordMatch(&gMapObjects[i], z)) { return i; } @@ -1461,7 +1461,7 @@ u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z) static bool8 FieldObjectDoesZCoordMatch(struct MapObject *mapObject, u8 z) { - if (mapObject->mapobj_unk_0B_0 != 0 && z != 0 && mapObject->mapobj_unk_0B_0 != z) + if (mapObject->currentElevation != 0 && z != 0 && mapObject->currentElevation != z) { return FALSE; } @@ -1617,13 +1617,13 @@ u8 obj_unfreeze(struct Sprite *sprite, s16 x, s16 y, u8 subpriority) void FieldObjectSetDirection(struct MapObject *mapObject, u8 direction) { s8 d2; - mapObject->mapobj_unk_20 = mapObject->mapobj_unk_18; - if (!mapObject->mapobj_bit_9) + mapObject->previousMovementDirection = mapObject->facingDirection; + if (!mapObject->facingDirectionLocked) { d2 = direction; - mapObject->mapobj_unk_18 = d2; + mapObject->facingDirection = d2; } - mapObject->placeholder18 = direction; + mapObject->movementDirection = direction; } static const u8 *GetFieldObjectScriptPointerByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) @@ -1737,8 +1737,8 @@ void sub_808F208(const struct MapObject *mapObject) mapObjectTemplate = sub_808F1B4(mapObject); if (mapObjectTemplate != NULL) { - mapObjectTemplate->x = mapObject->coords2.x - 7; - mapObjectTemplate->y = mapObject->coords2.y - 7; + mapObjectTemplate->x = mapObject->currentCoords.x - 7; + mapObjectTemplate->y = mapObject->currentCoords.y - 7; } } @@ -1842,7 +1842,7 @@ bool8 sub_808F44C(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_808F460(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return TRUE; } @@ -1886,8 +1886,8 @@ bool8 sub_808F4E8(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_808F534(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->placeholder18)); - mapObject->mapobj_bit_1 = TRUE; + FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->movementDirection)); + mapObject->singleMovementActive = TRUE; sprite->data[1] = 6; return TRUE; } @@ -1896,7 +1896,7 @@ bool8 sub_808F564(struct MapObject *mapObject, struct Sprite *sprite) { if (FieldObjectExecRegularAnim(mapObject, sprite)) { - mapObject->mapobj_bit_1 = FALSE; + mapObject->singleMovementActive = FALSE; sprite->data[1] = 1; } return FALSE; @@ -1922,8 +1922,8 @@ bool8 FieldObjectIsTrainerAndCloseToPlayer(struct MapObject *mapObject) return FALSE; } PlayerGetDestCoords(&playerX, &playerY); - objX = mapObject->coords2.x; - objY = mapObject->coords2.y; + objX = mapObject->currentCoords.x; + objY = mapObject->currentCoords.y; minX = objX - mapObject->trainerRange_berryTreeId; minY = objY - mapObject->trainerRange_berryTreeId; maxX = objX + mapObject->trainerRange_berryTreeId; @@ -2138,8 +2138,8 @@ u8 GetRunningPastFacingDirection(struct MapObject *mapObject, u8 movementType) return 0; } PlayerGetDestCoords(&dx, &dy); - dx -= mapObject->coords2.x; - dy -= mapObject->coords2.y; + dx -= mapObject->currentCoords.x; + dy -= mapObject->currentCoords.y; absdx = dx; absdy = dy; if (absdx < 0) @@ -2164,7 +2164,7 @@ bool8 sub_808F988(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_808F99C(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return TRUE; } @@ -2174,7 +2174,7 @@ bool8 sub_808F9C8(struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite)) { SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]); - mapObject->mapobj_bit_1 = FALSE; + mapObject->singleMovementActive = FALSE; sprite->data[1] = 3; } return FALSE; @@ -2217,7 +2217,7 @@ bool8 sub_808FAC8(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_808FADC(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return TRUE; } @@ -2261,8 +2261,8 @@ bool8 sub_808FB64(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_808FBB0(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->placeholder18)); - mapObject->mapobj_bit_1 = TRUE; + FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->movementDirection)); + mapObject->singleMovementActive = TRUE; sprite->data[1] = 6; return TRUE; } @@ -2271,7 +2271,7 @@ bool8 sub_808FBE0(struct MapObject *mapObject, struct Sprite *sprite) { if (FieldObjectExecRegularAnim(mapObject, sprite)) { - mapObject->mapobj_bit_1 = FALSE; + mapObject->singleMovementActive = FALSE; sprite->data[1] = 1; } return FALSE; @@ -2288,7 +2288,7 @@ bool8 sub_808FC4C(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_808FC60(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return TRUE; } @@ -2332,8 +2332,8 @@ bool8 sub_808FCE8(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_808FD34(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->placeholder18)); - mapObject->mapobj_bit_1 = TRUE; + FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->movementDirection)); + mapObject->singleMovementActive = TRUE; sprite->data[1] = 6; return TRUE; } @@ -2342,7 +2342,7 @@ bool8 sub_808FD64(struct MapObject *mapObject, struct Sprite *sprite) { if (FieldObjectExecRegularAnim(mapObject, sprite)) { - mapObject->mapobj_bit_1 = FALSE; + mapObject->singleMovementActive = FALSE; sprite->data[1] = 1; } return FALSE; @@ -2353,7 +2353,7 @@ field_object_step(FaceFixedDirection, gUnknown_0850D794) bool8 sub_808FDD0(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 1; return TRUE; } @@ -2370,7 +2370,7 @@ bool8 sub_808FDFC(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_808FE1C(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_1 = FALSE; + mapObject->singleMovementActive = FALSE; return FALSE; } @@ -2398,15 +2398,15 @@ bool8 do_berry_tree_growth_sparkle_1 (struct MapObject *mapObject, struct Sprite u8 berryStage; npc_reset(mapObject, sprite); - mapObject->mapobj_bit_13 = TRUE; + mapObject->invisible = TRUE; sprite->invisible = TRUE; berryStage = GetStageByBerryTreeId(mapObject->trainerRange_berryTreeId); if (berryStage == 0) { if (!(sprite->data[7] & 0x0004) && sprite->animNum == 4) { - gFieldEffectArguments[0] = mapObject->coords2.x; - gFieldEffectArguments[1] = mapObject->coords2.y; + gFieldEffectArguments[0] = mapObject->currentCoords.x; + gFieldEffectArguments[1] = mapObject->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE); @@ -2414,7 +2414,7 @@ bool8 do_berry_tree_growth_sparkle_1 (struct MapObject *mapObject, struct Sprite } return FALSE; } - mapObject->mapobj_bit_13 = FALSE; + mapObject->invisible = FALSE; sprite->invisible = FALSE; berryStage --; if (sprite->animNum != berryStage) @@ -2440,12 +2440,12 @@ bool8 sub_808FF48 (struct MapObject *mapObject, struct Sprite *sprite) bool8 do_berry_tree_growth_sparkle_2 (struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_1 = TRUE; + mapObject->singleMovementActive = TRUE; sprite->data[1] = 3; sprite->data[2] = 0; sprite->data[7] |= 0x0002; - gFieldEffectArguments[0] = mapObject->coords2.x; - gFieldEffectArguments[1] = mapObject->coords2.y; + gFieldEffectArguments[0] = mapObject->currentCoords.x; + gFieldEffectArguments[1] = mapObject->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE); @@ -2455,7 +2455,7 @@ bool8 do_berry_tree_growth_sparkle_2 (struct MapObject *mapObject, struct Sprite bool8 sub_808FFB4 (struct MapObject *mapObject, struct Sprite *sprite) { sprite->data[2] ++; - mapObject->mapobj_bit_13 = (sprite->data[2] & 0x02) >> 1; + mapObject->invisible = (sprite->data[2] & 0x02) >> 1; sprite->animPaused = TRUE; if (sprite->data[2] > 64) { @@ -2470,7 +2470,7 @@ bool8 sub_808FFB4 (struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_8090004 (struct MapObject *mapObject, struct Sprite *sprite) { sprite->data[2] ++; - mapObject->mapobj_bit_13 = (sprite->data[2] & 0x02) >> 1; + mapObject->invisible = (sprite->data[2] & 0x02) >> 1; sprite->animPaused = TRUE; if (sprite->data[2] > 64) { @@ -2492,7 +2492,7 @@ bool8 sub_8090094 (struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_80900A8 (struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return TRUE; } @@ -2502,7 +2502,7 @@ bool8 sub_80900D4 (struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite)) { SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]); - mapObject->mapobj_bit_1 = FALSE; + mapObject->singleMovementActive = FALSE; sprite->data[1] = 3; } return FALSE; @@ -2545,7 +2545,7 @@ bool8 sub_80901D4 (struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_80901E8 (struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return TRUE; } @@ -2555,7 +2555,7 @@ bool8 sub_8090214 (struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite)) { SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]); - mapObject->mapobj_bit_1 = FALSE; + mapObject->singleMovementActive = FALSE; sprite->data[1] = 3; } return FALSE; @@ -2598,7 +2598,7 @@ bool8 sub_8090314 (struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_8090328 (struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return TRUE; } @@ -2608,7 +2608,7 @@ bool8 sub_8090354 (struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite)) { SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); - mapObject->mapobj_bit_1 = FALSE; + mapObject->singleMovementActive = FALSE; sprite->data[1] = 3; } return FALSE; @@ -2651,7 +2651,7 @@ bool8 sub_8090454 (struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_8090468 (struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return TRUE; } @@ -2661,7 +2661,7 @@ bool8 sub_8090494 (struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite)) { SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); - mapObject->mapobj_bit_1 = FALSE; + mapObject->singleMovementActive = FALSE; sprite->data[1] = 3; } return FALSE; @@ -2704,7 +2704,7 @@ bool8 sub_8090594 (struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_80905A8 (struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return TRUE; } @@ -2714,7 +2714,7 @@ bool8 sub_80905D4 (struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite)) { SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); - mapObject->mapobj_bit_1 = FALSE; + mapObject->singleMovementActive = FALSE; sprite->data[1] = 3; } return FALSE; @@ -2757,7 +2757,7 @@ bool8 sub_80906D4 (struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_80906E8 (struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return TRUE; } @@ -2767,7 +2767,7 @@ bool8 sub_8090714 (struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite)) { SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); - mapObject->mapobj_bit_1 = FALSE; + mapObject->singleMovementActive = FALSE; sprite->data[1] = 3; } return FALSE; @@ -2810,7 +2810,7 @@ bool8 sub_8090814 (struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_8090828 (struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return TRUE; } @@ -2820,7 +2820,7 @@ bool8 sub_8090854 (struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite)) { SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); - mapObject->mapobj_bit_1 = FALSE; + mapObject->singleMovementActive = FALSE; sprite->data[1] = 3; } return FALSE; @@ -2863,7 +2863,7 @@ bool8 sub_8090954 (struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_8090968 (struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return TRUE; } @@ -2873,7 +2873,7 @@ bool8 sub_8090994 (struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite)) { SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); - mapObject->mapobj_bit_1 = FALSE; + mapObject->singleMovementActive = FALSE; sprite->data[1] = 3; } return FALSE; @@ -2916,7 +2916,7 @@ bool8 sub_8090A94 (struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_8090AA8 (struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return TRUE; } @@ -2926,7 +2926,7 @@ bool8 sub_8090AD4 (struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite)) { SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); - mapObject->mapobj_bit_1 = FALSE; + mapObject->singleMovementActive = FALSE; sprite->data[1] = 3; } return FALSE; @@ -2969,7 +2969,7 @@ bool8 sub_8090BD4 (struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_8090BE8 (struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return TRUE; } @@ -2979,7 +2979,7 @@ bool8 sub_8090C14 (struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite)) { SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); - mapObject->mapobj_bit_1 = FALSE; + mapObject->singleMovementActive = FALSE; sprite->data[1] = 3; } return FALSE; @@ -3016,7 +3016,7 @@ field_object_step(LookAroundCounterclockwise, gUnknown_0850D89C) bool8 sub_8090D14 (struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 1; return TRUE; } @@ -3049,7 +3049,7 @@ bool8 sub_8090D90 (struct MapObject *mapObject, struct Sprite *sprite) direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_ANY); if (direction == 0) { - direction = directions[mapObject->mapobj_unk_18]; + direction = directions[mapObject->facingDirection]; } FieldObjectSetDirection(mapObject, direction); sprite->data[1] = 0; @@ -3061,7 +3061,7 @@ field_object_step(LookAroundClockwise, gUnknown_0850D8B4) bool8 sub_8090E18 (struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 1; return TRUE; } @@ -3094,7 +3094,7 @@ bool8 sub_8090E94 (struct MapObject *mapObject, struct Sprite *sprite) direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_ANY); if (direction == 0) { - direction = directions[mapObject->mapobj_unk_18]; + direction = directions[mapObject->facingDirection]; } FieldObjectSetDirection(mapObject, direction); sprite->data[1] = 0; @@ -3114,8 +3114,8 @@ bool8 sub_8090F30 (struct MapObject *mapObject, struct Sprite *sprite) { u8 direction; - direction = gUnknown_085055CD[mapObject->animPattern]; - if (mapObject->mapobj_unk_21) + direction = gUnknown_085055CD[mapObject->movementType]; + if (mapObject->directionSequenceIndex) { direction = GetOppositeDirection(direction); } @@ -3129,26 +3129,26 @@ bool8 sub_8090F68 (struct MapObject *mapObject, struct Sprite *sprite) bool8 blockingWay; u8 animId; - if (mapObject->mapobj_unk_21 && mapObject->coords1.x == mapObject->coords2.x && mapObject->coords1.y == mapObject->coords2.y) + if (mapObject->directionSequenceIndex && mapObject->initialCoords.x == mapObject->currentCoords.x && mapObject->initialCoords.y == mapObject->currentCoords.y) { - mapObject->mapobj_unk_21 = 0; - FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->placeholder18)); + mapObject->directionSequenceIndex = 0; + FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->movementDirection)); } - blockingWay = npc_block_way__next_tile(mapObject, mapObject->placeholder18); - animId = GetGoSpeed0AnimId(mapObject->placeholder18); + blockingWay = npc_block_way__next_tile(mapObject, mapObject->movementDirection); + animId = GetGoSpeed0AnimId(mapObject->movementDirection); if (blockingWay == TRUE) { - mapObject->mapobj_unk_21 ++; - FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->placeholder18)); - animId = GetGoSpeed0AnimId(mapObject->placeholder18); - blockingWay = npc_block_way__next_tile(mapObject, mapObject->placeholder18); + mapObject->directionSequenceIndex ++; + FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->movementDirection)); + animId = GetGoSpeed0AnimId(mapObject->movementDirection); + blockingWay = npc_block_way__next_tile(mapObject, mapObject->movementDirection); } if (blockingWay) { - animId = GetStepInPlaceDelay16AnimId(mapObject->mapobj_unk_18); + animId = GetStepInPlaceDelay16AnimId(mapObject->facingDirection); } FieldObjectSetRegularAnim(mapObject, sprite, animId); - mapObject->mapobj_bit_1 = TRUE; + mapObject->singleMovementActive = TRUE; sprite->data[1] = 3; return TRUE; } @@ -3157,7 +3157,7 @@ bool8 sub_8091020 (struct MapObject *mapObject, struct Sprite *sprite) { if (FieldObjectExecRegularAnim(mapObject, sprite)) { - mapObject->mapobj_bit_1 = FALSE; + mapObject->singleMovementActive = FALSE; sprite->data[1] = 1; } return FALSE; @@ -3175,26 +3175,26 @@ bool8 MoveFieldObjectInNextDirectionInSequence(struct MapObject *mapObject, stru u8 blockingWay; u8 animId; - if (mapObject->mapobj_unk_21 == 3 && mapObject->coords1.x == mapObject->coords2.x && mapObject->coords1.y == mapObject->coords2.y) + if (mapObject->directionSequenceIndex == 3 && mapObject->initialCoords.x == mapObject->currentCoords.x && mapObject->initialCoords.y == mapObject->currentCoords.y) { - mapObject->mapobj_unk_21 = 0; + mapObject->directionSequenceIndex = 0; } - FieldObjectSetDirection(mapObject, route[mapObject->mapobj_unk_21]); - animId = GetGoSpeed0AnimId(mapObject->placeholder18); - blockingWay = npc_block_way__next_tile(mapObject, mapObject->placeholder18); + FieldObjectSetDirection(mapObject, route[mapObject->directionSequenceIndex]); + animId = GetGoSpeed0AnimId(mapObject->movementDirection); + blockingWay = npc_block_way__next_tile(mapObject, mapObject->movementDirection); if (blockingWay == TRUE) { - mapObject->mapobj_unk_21 ++; - FieldObjectSetDirection(mapObject, route[mapObject->mapobj_unk_21]); - animId = GetGoSpeed0AnimId(mapObject->placeholder18); - blockingWay = npc_block_way__next_tile(mapObject, mapObject->placeholder18); + mapObject->directionSequenceIndex ++; + FieldObjectSetDirection(mapObject, route[mapObject->directionSequenceIndex]); + animId = GetGoSpeed0AnimId(mapObject->movementDirection); + blockingWay = npc_block_way__next_tile(mapObject, mapObject->movementDirection); } if (blockingWay) { - animId = GetStepInPlaceDelay16AnimId(mapObject->mapobj_unk_18); + animId = GetStepInPlaceDelay16AnimId(mapObject->facingDirection); } FieldObjectSetRegularAnim(mapObject, sprite, animId); - mapObject->mapobj_bit_1 = TRUE; + mapObject->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } @@ -3203,7 +3203,7 @@ bool8 sub_8091110(struct MapObject *mapObject, struct Sprite *sprite) { if (FieldObjectExecRegularAnim(mapObject, sprite)) { - mapObject->mapobj_bit_1 = FALSE; + mapObject->singleMovementActive = FALSE; sprite->data[1] = 1; } return FALSE; @@ -3239,9 +3239,9 @@ field_object_step(CopyPlayer1, gUnknown_0850DA58) bool8 mss_npc_reset_oampriv3_1_unk2_unk3(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - if (mapObject->mapobj_unk_21 == 0) + if (mapObject->directionSequenceIndex == 0) { - mapObject->mapobj_unk_21 = player_get_direction_lower_nybble(); + mapObject->directionSequenceIndex = player_get_direction_lower_nybble(); } sprite->data[1] = 1; return TRUE; @@ -3249,7 +3249,7 @@ bool8 mss_npc_reset_oampriv3_1_unk2_unk3(struct MapObject *mapObject, struct Spr bool8 sub_8091EC0(struct MapObject *mapObject, struct Sprite *sprite) { - if (gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1C == 0xFF || gPlayerAvatar.tileTransitionState == 2) + if (gMapObjects[gPlayerAvatar.mapObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == 2) { return FALSE; } @@ -3260,7 +3260,7 @@ bool8 sub_8091F20(struct MapObject *mapObject, struct Sprite *sprite) { if (FieldObjectExecRegularAnim(mapObject, sprite)) { - mapObject->mapobj_bit_1 = FALSE; + mapObject->singleMovementActive = FALSE; sprite->data[1] = 1; } return FALSE; @@ -3273,8 +3273,8 @@ bool8 sub_8091F48(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD bool8 sub_8091F4C(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, playerDirection))); - mapObject->mapobj_bit_1 = TRUE; + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(state_to_direction(gUnknown_085055CD[mapObject->movementType], mapObject->directionSequenceIndex, playerDirection))); + mapObject->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } @@ -3292,17 +3292,17 @@ bool8 sub_8091F94(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD if (direction == 0) { direction = playerDirection; - direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, direction); + direction = state_to_direction(gUnknown_085055CD[mapObject->movementType], mapObject->directionSequenceIndex, direction); FieldObjectMoveDestCoords(mapObject, direction, &x, &y); FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); - mapObject->mapobj_bit_1 = TRUE; + mapObject->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } } else { - direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, direction); + direction = state_to_direction(gUnknown_085055CD[mapObject->movementType], mapObject->directionSequenceIndex, direction); } FieldObjectMoveDestCoords(mapObject, direction, &x, &y); FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(direction)); @@ -3310,7 +3310,7 @@ bool8 sub_8091F94(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD { FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); } - mapObject->mapobj_bit_1 = TRUE; + mapObject->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } @@ -3322,14 +3322,14 @@ bool8 sub_80920A4(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD s16 y; direction = playerDirection; - direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, direction); + direction = state_to_direction(gUnknown_085055CD[mapObject->movementType], mapObject->directionSequenceIndex, direction); FieldObjectMoveDestCoords(mapObject, direction, &x, &y); FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed1AnimId(direction)); if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) { FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); } - mapObject->mapobj_bit_1 = TRUE; + mapObject->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } @@ -3341,14 +3341,14 @@ bool8 sub_809215C(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD s16 y; direction = playerDirection; - direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, direction); + direction = state_to_direction(gUnknown_085055CD[mapObject->movementType], mapObject->directionSequenceIndex, direction); FieldObjectMoveDestCoords(mapObject, direction, &x, &y); FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed3AnimId(direction)); if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) { FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); } - mapObject->mapobj_bit_1 = TRUE; + mapObject->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } @@ -3360,14 +3360,14 @@ bool8 sub_8092214(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD s16 y; direction = playerDirection; - direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, direction); + direction = state_to_direction(gUnknown_085055CD[mapObject->movementType], mapObject->directionSequenceIndex, direction); FieldObjectMoveDestCoords(mapObject, direction, &x, &y); FieldObjectSetRegularAnim(mapObject, sprite, sub_8093438(direction)); if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) { FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); } - mapObject->mapobj_bit_1 = TRUE; + mapObject->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } @@ -3377,9 +3377,9 @@ bool8 cph_IM_DIFFERENT(struct MapObject *mapObject, struct Sprite *sprite, u8 pl u32 direction; direction = playerDirection; - direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, direction); + direction = state_to_direction(gUnknown_085055CD[mapObject->movementType], mapObject->directionSequenceIndex, direction); FieldObjectSetRegularAnim(mapObject, sprite, sub_80934BC(direction)); - mapObject->mapobj_bit_1 = TRUE; + mapObject->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } @@ -3391,14 +3391,14 @@ bool8 sub_8092314(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD s16 y; direction = playerDirection; - direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, direction); + direction = state_to_direction(gUnknown_085055CD[mapObject->movementType], mapObject->directionSequenceIndex, direction); FieldObjectMoveDestCoords(mapObject, direction, &x, &y); FieldObjectSetRegularAnim(mapObject, sprite, sub_8093514(direction)); if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) { FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); } - mapObject->mapobj_bit_1 = TRUE; + mapObject->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } @@ -3410,16 +3410,16 @@ bool8 oac_hopping(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD s16 y; direction = playerDirection; - direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, direction); - x = mapObject->coords2.x; - y = mapObject->coords2.y; + direction = state_to_direction(gUnknown_085055CD[mapObject->movementType], mapObject->directionSequenceIndex, direction); + x = mapObject->currentCoords.x; + y = mapObject->currentCoords.y; sub_8092F88(direction, &x, &y, 2, 2); FieldObjectSetRegularAnim(mapObject, sprite, GetJumpLedgeAnimId(direction)); if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) { FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); } - mapObject->mapobj_bit_1 = TRUE; + mapObject->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } @@ -3428,7 +3428,7 @@ field_object_step(CopyPlayer2, gUnknown_0850DA90) bool8 mss_08062EA4(struct MapObject *mapObject, struct Sprite *sprite) { - if (gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1C == 0xFF || gPlayerAvatar.tileTransitionState == 2) + if (gMapObjects[gPlayerAvatar.mapObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == 2) { return FALSE; } @@ -3442,11 +3442,11 @@ void FieldObjectCB_TreeDisguise(struct Sprite *sprite) struct MapObject *mapObject; mapObject = &gMapObjects[sprite->data[0]]; - if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && !sprite->data[7])) + if (mapObject->directionSequenceIndex == 0 || (mapObject->directionSequenceIndex == 1 && !sprite->data[7])) { FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); - mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_TREE_DISGUISE); - mapObject->mapobj_unk_21 = 1; + mapObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_TREE_DISGUISE); + mapObject->directionSequenceIndex = 1; sprite->data[7] ++; } FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, sub_80925AC); @@ -3463,11 +3463,11 @@ void FieldObjectCB_MountainDisguise(struct Sprite *sprite) struct MapObject *mapObject; mapObject = &gMapObjects[sprite->data[0]]; - if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && !sprite->data[7])) + if (mapObject->directionSequenceIndex == 0 || (mapObject->directionSequenceIndex == 1 && !sprite->data[7])) { FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); - mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE); - mapObject->mapobj_unk_21 = 1; + mapObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE); + mapObject->directionSequenceIndex = 1; sprite->data[7] ++; } FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, sub_80925AC); @@ -3480,7 +3480,7 @@ void FieldObjectCB_Hidden1(struct Sprite *sprite) { if (!sprite->data[7]) { - gMapObjects[sprite->data[0]].mapobj_bit_26 = TRUE; + gMapObjects[sprite->data[0]].fixedPriority = TRUE; sprite->subspriteMode = 2; sprite->oam.priority = 3; sprite->data[7] ++; @@ -3512,7 +3512,7 @@ field_object_step(WalkInPlace1, gUnknown_0850DAA0) bool8 sub_8092718(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay16AnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay16AnimId(mapObject->facingDirection)); sprite->data[1] = 1; return TRUE; } @@ -3522,7 +3522,7 @@ field_object_step(WalkInPlace4, gUnknown_0850DAA8) bool8 sub_8092788(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay32AnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay32AnimId(mapObject->facingDirection)); sprite->data[1] = 1; return TRUE; } @@ -3532,7 +3532,7 @@ field_object_step(WalkInPlace2, gUnknown_0850DAB0) bool8 sub_80927F8(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay8AnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay8AnimId(mapObject->facingDirection)); sprite->data[1] = 1; return TRUE; } @@ -3542,7 +3542,7 @@ field_object_step(WalkInPlace3, gUnknown_0850DAB8) bool8 sub_8092868(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay4AnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay4AnimId(mapObject->facingDirection)); sprite->data[1] = 1; return TRUE; } @@ -3552,8 +3552,8 @@ field_object_step(Hidden2, gUnknown_0850DAC0) bool8 sub_80928D8(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - mapObject->mapobj_bit_13 = TRUE; + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + mapObject->invisible = TRUE; sprite->data[1] = 1; return TRUE; } @@ -3569,16 +3569,16 @@ bool8 sub_809290C(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_809292C(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_1 = FALSE; + mapObject->singleMovementActive = FALSE; return FALSE; } void npc_reset(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_1 = FALSE; - mapObject->mapobj_bit_6 = FALSE; - mapObject->mapobj_bit_7 = FALSE; - mapObject->mapobj_unk_1C = 0xFF; + mapObject->singleMovementActive = FALSE; + mapObject->heldMovementActive = FALSE; + mapObject->heldMovementFinished = FALSE; + mapObject->movementActionId = 0xFF; sprite->data[1] = 0; } @@ -3632,7 +3632,7 @@ void npc_apply_anim_looping(struct MapObject *mapObject, struct Sprite *sprite, { const struct UnkStruct_085094AC *unk85094AC; - if (!mapObject->mapobj_bit_12) + if (!mapObject->inanimate) { sprite->animNum = animNum; unk85094AC = sub_8092A4C(sprite->anims); @@ -3655,7 +3655,7 @@ void obj_npc_animation_step(struct MapObject *mapObject, struct Sprite *sprite, { const struct UnkStruct_085094AC *unk85094AC; - if (!mapObject->mapobj_bit_12) + if (!mapObject->inanimate) { u8 animPos; @@ -3692,12 +3692,12 @@ u8 sub_8092AF8(s16 x1, s16 y1, s16 x2, s16 y2) return DIR_SOUTH; } -void npc_set_running_behaviour_etc(struct MapObject *mapObject, u8 animPattern) +void npc_set_running_behaviour_etc(struct MapObject *mapObject, u8 movementType) { - mapObject->animPattern = animPattern; - mapObject->mapobj_unk_21 = 0; - mapObject->animId = 0; - gSprites[mapObject->spriteId].callback = gUnknown_08505438[animPattern]; + mapObject->movementType = movementType; + mapObject->directionSequenceIndex = 0; + mapObject->playerCopyableMovement = 0; + gSprites[mapObject->spriteId].callback = gUnknown_08505438[movementType]; gSprites[mapObject->spriteId].data[1] = 0; } @@ -3708,8 +3708,8 @@ u8 npc_block_way__next_tile(struct MapObject *mapObject, u8 direction) s16 x; s16 y; - x = mapObject->coords2.x; - y = mapObject->coords2.y; + x = mapObject->currentCoords.x; + y = mapObject->currentCoords.y; MoveCoords(direction, &x, &y); return npc_block_way(mapObject, x, y, direction); } @@ -3727,11 +3727,11 @@ u8 npc_block_way(struct MapObject *mapObject, s16 x, s16 y, u32 dirn) { return 2; } - if (mapObject->mapobj_bit_15 && !CanCameraMoveInDirection(direction)) + if (mapObject->trackedByCamera && !CanCameraMoveInDirection(direction)) { return 2; } - if (IsZCoordMismatchAt(mapObject->mapobj_unk_0B_0, x, y)) + if (IsZCoordMismatchAt(mapObject->currentElevation, x, y)) { return 3; } @@ -3751,11 +3751,11 @@ u8 sub_8092C8C(struct MapObject *mapObject, s16 x, s16 y, u8 direction) { retval |= 1; } - if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(mapObject, x, y, direction) || (mapObject->mapobj_bit_15 && !CanCameraMoveInDirection(direction))) + if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(mapObject, x, y, direction) || (mapObject->trackedByCamera && !CanCameraMoveInDirection(direction))) { retval |= 2; } - if (IsZCoordMismatchAt(mapObject->mapobj_unk_0B_0, x, y)) + if (IsZCoordMismatchAt(mapObject->currentElevation, x, y)) { retval |= 4; } @@ -3775,8 +3775,8 @@ static bool8 IsCoordOutsideFieldObjectMovementRect(struct MapObject *mapObject, if (mapObject->range.as_nybbles.x != 0) { - left = mapObject->coords1.x - mapObject->range.as_nybbles.x; - right = mapObject->coords1.x + mapObject->range.as_nybbles.x; + left = mapObject->initialCoords.x - mapObject->range.as_nybbles.x; + right = mapObject->initialCoords.x + mapObject->range.as_nybbles.x; if (left > x || right < x) { return TRUE; @@ -3784,8 +3784,8 @@ static bool8 IsCoordOutsideFieldObjectMovementRect(struct MapObject *mapObject, } if (mapObject->range.as_nybbles.y != 0) { - top = mapObject->coords1.y - mapObject->range.as_nybbles.y; - bottom = mapObject->coords1.y + mapObject->range.as_nybbles.y; + top = mapObject->initialCoords.y - mapObject->range.as_nybbles.y; + bottom = mapObject->initialCoords.y + mapObject->range.as_nybbles.y; if (top > y || bottom < y) { return TRUE; @@ -3796,7 +3796,7 @@ static bool8 IsCoordOutsideFieldObjectMovementRect(struct MapObject *mapObject, static bool8 IsMetatileDirectionallyImpassable(struct MapObject *mapObject, s16 x, s16 y, u8 direction) { - if (gUnknown_0850DB5C[direction - 1](mapObject->mapobj_unk_1E) || gUnknown_0850DB6C[direction - 1](MapGridGetMetatileBehaviorAt(x, y))) + if (gUnknown_0850DB5C[direction - 1](mapObject->currentMetatileBehavior) || gUnknown_0850DB6C[direction - 1](MapGridGetMetatileBehaviorAt(x, y))) { return TRUE; } @@ -3813,9 +3813,9 @@ static bool8 CheckForCollisionBetweenFieldObjects(struct MapObject *mapObject, s curObject = &gMapObjects[i]; if (curObject->active && curObject != mapObject) { - if ((curObject->coords2.x == x && curObject->coords2.y == y) || (curObject->coords3.x == x && curObject->coords3.y == y)) + if ((curObject->currentCoords.x == x && curObject->currentCoords.y == y) || (curObject->previousCoords.x == x && curObject->previousCoords.y == y)) { - if (AreZCoordsCompatible(mapObject->mapobj_unk_0B_0, curObject->mapobj_unk_0B_0)) + if (AreZCoordsCompatible(mapObject->currentElevation, curObject->currentElevation)) { return TRUE; } @@ -3958,8 +3958,8 @@ void FieldObjectMoveDestCoords(struct MapObject *mapObject, u32 dirn, s16 *x, s1 u8 direction; direction = dirn; - *x = mapObject->coords2.x; - *y = mapObject->coords2.y; + *x = mapObject->currentCoords.x; + *y = mapObject->currentCoords.y; MoveCoords(direction, x, y); } @@ -3967,7 +3967,7 @@ void FieldObjectMoveDestCoords(struct MapObject *mapObject, u32 dirn, s16 *x, s1 bool8 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct MapObject *mapObject) { - if (mapObject->mapobj_bit_1 || mapObject->mapobj_bit_6) + if (mapObject->singleMovementActive || mapObject->heldMovementActive) { return TRUE; } @@ -3976,7 +3976,7 @@ bool8 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct MapObject *ma bool8 FieldObjectIsSpecialAnimActive(struct MapObject *mapObject) { - if (mapObject->mapobj_bit_6 && mapObject->mapobj_unk_1C != 0xFF) + if (mapObject->heldMovementActive && mapObject->movementActionId != 0xFF) { return TRUE; } @@ -3990,9 +3990,9 @@ bool8 FieldObjectSetSpecialAnim(struct MapObject *mapObject, u8 specialAnimId) return TRUE; } npc_sync_anim_pause_bits(mapObject); - mapObject->mapobj_unk_1C = specialAnimId; - mapObject->mapobj_bit_6 = TRUE; - mapObject->mapobj_bit_7 = FALSE; + mapObject->movementActionId = specialAnimId; + mapObject->heldMovementActive = TRUE; + mapObject->heldMovementFinished = FALSE; gSprites[mapObject->spriteId].data[2] = 0; return FALSE; } @@ -4005,7 +4005,7 @@ void FieldObjectForceSetSpecialAnim(struct MapObject *mapObject, u8 specialAnimI void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *mapObject) { - if (mapObject->mapobj_bit_6) + if (mapObject->heldMovementActive) { FieldObjectClearAnim(mapObject); } @@ -4013,18 +4013,18 @@ void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *mapObject) void FieldObjectClearAnim(struct MapObject *mapObject) { - mapObject->mapobj_unk_1C = 0xFF; - mapObject->mapobj_bit_6 = FALSE; - mapObject->mapobj_bit_7 = FALSE; + mapObject->movementActionId = 0xFF; + mapObject->heldMovementActive = FALSE; + mapObject->heldMovementFinished = FALSE; gSprites[mapObject->spriteId].data[1] = 0; gSprites[mapObject->spriteId].data[2] = 0; } u8 FieldObjectCheckIfSpecialAnimFinishedOrInactive(struct MapObject *mapObject) { - if (mapObject->mapobj_bit_6) + if (mapObject->heldMovementActive) { - return mapObject->mapobj_bit_7; + return mapObject->heldMovementFinished; } return 0x10; } @@ -4043,9 +4043,9 @@ u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *mapObject) u8 FieldObjectGetSpecialAnim(struct MapObject *mapObject) { - if (mapObject->mapobj_bit_6) + if (mapObject->heldMovementActive) { - return mapObject->mapobj_unk_1C; + return mapObject->movementActionId; } return 0xFF; } @@ -4058,7 +4058,7 @@ void FieldObjectStep(struct MapObject *mapObject, struct Sprite *sprite, bool8 ( { FieldObjectExecSpecialAnim(mapObject, sprite); } - else if (!mapObject->mapobj_bit_8) + else if (!mapObject->frozen) { while (callback(mapObject, sprite)); } @@ -4155,17 +4155,17 @@ static u32 state_to_direction(u8 a0, u32 a1, u32 a2) static void FieldObjectExecSpecialAnim(struct MapObject *mapObject, struct Sprite *sprite) { - if (gUnknown_0850DC50[mapObject->mapobj_unk_1C][sprite->data[2]](mapObject, sprite)) + if (gUnknown_0850DC50[mapObject->movementActionId][sprite->data[2]](mapObject, sprite)) { - mapObject->mapobj_bit_7 = TRUE; + mapObject->heldMovementFinished = TRUE; } } bool8 FieldObjectExecRegularAnim(struct MapObject *mapObject, struct Sprite *sprite) { - if (gUnknown_0850DC50[mapObject->mapobj_unk_1C][sprite->data[2]](mapObject, sprite)) + if (gUnknown_0850DC50[mapObject->movementActionId][sprite->data[2]](mapObject, sprite)) { - mapObject->mapobj_unk_1C = 0xFF; + mapObject->movementActionId = 0xFF; sprite->data[2] = 0; return TRUE; } @@ -4174,7 +4174,7 @@ bool8 FieldObjectExecRegularAnim(struct MapObject *mapObject, struct Sprite *spr void FieldObjectSetRegularAnim(struct MapObject *mapObject, struct Sprite *sprite, u8 animId) { - mapObject->mapobj_unk_1C = animId; + mapObject->movementActionId = animId; sprite->data[2] = 0; } @@ -4184,7 +4184,7 @@ void an_look_any(struct MapObject *mapObject, struct Sprite *sprite, u8 directio { FieldObjectSetDirection(mapObject, direction); npc_coords_shift_still(mapObject); - obj_npc_animation_step(mapObject, sprite, get_go_image_anim_num(mapObject->mapobj_unk_18)); + obj_npc_animation_step(mapObject, sprite, get_go_image_anim_num(mapObject->facingDirection)); sprite->animPaused = TRUE; sprite->data[2] = 1; } @@ -4218,8 +4218,8 @@ void npc_apply_direction(struct MapObject *mapObject, struct Sprite *sprite, u8 s16 x; s16 y; - x = mapObject->coords2.x; - y = mapObject->coords2.y; + x = mapObject->currentCoords.x; + y = mapObject->currentCoords.y; FieldObjectSetDirection(mapObject, direction); MoveCoords(direction, &x, &y); npc_coords_shift(mapObject, x, y); @@ -4229,7 +4229,7 @@ void npc_apply_direction(struct MapObject *mapObject, struct Sprite *sprite, u8 { sprite->animPaused = TRUE; } - mapObject->mapobj_bit_2 = TRUE; + mapObject->triggerGroundEffectsOnMove = TRUE; sprite->data[2] = 1; } @@ -4239,13 +4239,13 @@ void do_go_anim(struct MapObject *mapObject, struct Sprite *sprite, u8 direction memcpy(functions, gUnknown_0850DEE8, sizeof gUnknown_0850DEE8); npc_apply_direction(mapObject, sprite, direction, speed); - npc_apply_anim_looping(mapObject, sprite, functions[speed](mapObject->mapobj_unk_18)); + npc_apply_anim_looping(mapObject, sprite, functions[speed](mapObject->facingDirection)); } void do_run_anim(struct MapObject *mapObject, struct Sprite *sprite, u8 direction) { npc_apply_direction(mapObject, sprite, direction, 1); - npc_apply_anim_looping(mapObject, sprite, get_run_image_anim_num(mapObject->mapobj_unk_18)); + npc_apply_anim_looping(mapObject, sprite, get_run_image_anim_num(mapObject->facingDirection)); } bool8 npc_obj_ministep_stop_on_arrival(struct MapObject *mapObject, struct Sprite *sprite) @@ -4253,7 +4253,7 @@ bool8 npc_obj_ministep_stop_on_arrival(struct MapObject *mapObject, struct Sprit if (obj_npc_ministep(sprite)) { npc_coords_shift_still(mapObject); - mapObject->mapobj_bit_3 = TRUE; + mapObject->triggerGroundEffectsOnStop = TRUE; sprite->animPaused = TRUE; return TRUE; } @@ -4265,21 +4265,21 @@ void sub_8093AF0(struct MapObject *mapObject, struct Sprite *sprite, u8 directio s16 x; s16 y; - x = mapObject->coords2.x; - y = mapObject->coords2.y; + x = mapObject->currentCoords.x; + y = mapObject->currentCoords.y; FieldObjectSetDirection(mapObject, direction); MoveCoords(direction, &x, &y); npc_coords_shift(mapObject, x, y); sub_80976DC(sprite, direction); sprite->animPaused = FALSE; - mapObject->mapobj_bit_2 = TRUE; + mapObject->triggerGroundEffectsOnMove = TRUE; sprite->data[2] = 1; } void sub_8093B60(struct MapObject *mapObject, struct Sprite *sprite, u8 direction) { sub_8093AF0(mapObject, sprite, direction); - npc_apply_anim_looping(mapObject, sprite, get_go_image_anim_num(mapObject->mapobj_unk_18)); + npc_apply_anim_looping(mapObject, sprite, get_go_image_anim_num(mapObject->facingDirection)); } bool8 an_walk_any_2(struct MapObject *mapObject, struct Sprite *sprite) @@ -4287,7 +4287,7 @@ bool8 an_walk_any_2(struct MapObject *mapObject, struct Sprite *sprite) if (sub_80976EC(sprite)) { npc_coords_shift_still(mapObject); - mapObject->mapobj_bit_3 = TRUE; + mapObject->triggerGroundEffectsOnStop = TRUE; sprite->animPaused = TRUE; return TRUE; } @@ -4339,18 +4339,18 @@ void sub_8093FC4(struct MapObject *mapObject, struct Sprite *sprite, u8 directio y = 0; FieldObjectSetDirection(mapObject, direction); sub_8092F88(direction, &x, &y, displacements[speed], displacements[speed]); - npc_coords_shift(mapObject, mapObject->coords2.x + x, mapObject->coords2.y + y); + npc_coords_shift(mapObject, mapObject->currentCoords.x + x, mapObject->currentCoords.y + y); sub_809783C(sprite, direction, speed, a5); sprite->data[2] = 1; sprite->animPaused = 0; - mapObject->mapobj_bit_2 = 1; - mapObject->mapobj_bit_4 = 1; + mapObject->triggerGroundEffectsOnMove = 1; + mapObject->disableCoveringGroundEffects = 1; } void maybe_shadow_1(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a4) { sub_8093FC4(mapObject, sprite, direction, speed, a4); - npc_apply_anim_looping(mapObject, sprite, get_go_image_anim_num(mapObject->mapobj_unk_18)); + npc_apply_anim_looping(mapObject, sprite, get_go_image_anim_num(mapObject->facingDirection)); DoShadowFieldEffect(mapObject); } @@ -4367,16 +4367,16 @@ u8 sub_80940C4(struct MapObject *mapObject, struct Sprite *sprite, u8 callback(s { x = 0; y = 0; - sub_8092F88(mapObject->placeholder18, &x, &y, displacements[sprite->data[4]], displacements[sprite->data[4]]); - npc_coords_shift(mapObject, mapObject->coords2.x + x, mapObject->coords2.y + y); - mapObject->mapobj_bit_2 = TRUE; - mapObject->mapobj_bit_4 = TRUE; + sub_8092F88(mapObject->movementDirection, &x, &y, displacements[sprite->data[4]], displacements[sprite->data[4]]); + npc_coords_shift(mapObject, mapObject->currentCoords.x + x, mapObject->currentCoords.y + y); + mapObject->triggerGroundEffectsOnMove = TRUE; + mapObject->disableCoveringGroundEffects = TRUE; } else if (result == 0xFF) { npc_coords_shift_still(mapObject); - mapObject->mapobj_bit_3 = TRUE; - mapObject->mapobj_bit_5 = TRUE; + mapObject->triggerGroundEffectsOnStop = TRUE; + mapObject->landingJump = TRUE; sprite->animPaused = TRUE; } return result; @@ -4417,8 +4417,8 @@ bool8 sub_80941E0(struct MapObject *mapObject, struct Sprite *sprite) case 255: return TRUE; case 1: - FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->placeholder18)); - obj_npc_animation_step(mapObject, sprite, get_go_image_anim_num(mapObject->mapobj_unk_18)); + FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->movementDirection)); + obj_npc_animation_step(mapObject, sprite, get_go_image_anim_num(mapObject->facingDirection)); default: return FALSE; } @@ -4435,7 +4435,7 @@ bool8 name##_2(struct MapObject *mapObject, struct Sprite *sprite)\ {\ if (fn2(mapObject, sprite))\ {\ - mapObject->mapobj_bit_22 = FALSE;\ + mapObject->hasShadow = FALSE;\ sprite->data[2] = 2;\ return TRUE;\ }\ @@ -4562,7 +4562,7 @@ void npc_set_direction_and_anim__an_proceed(struct MapObject *mapObject, struct bool8 sub_8094DAC(struct MapObject *mapObject, struct Sprite *sprite) { - npc_set_direction_and_anim__an_proceed(mapObject, sprite, mapObject->placeholder18, sprite->animNum); + npc_set_direction_and_anim__an_proceed(mapObject, sprite, mapObject->movementDirection, sprite->animNum); return FALSE; } @@ -4594,7 +4594,7 @@ bool8 name##_2(struct MapObject *mapObject, struct Sprite *sprite)\ if (sub_80941C8(mapObject, sprite))\ {\ sprite->data[2] = 2;\ - mapObject->mapobj_bit_5 = FALSE;\ + mapObject->landingJump = FALSE;\ return TRUE;\ }\ return FALSE;\ @@ -4611,7 +4611,7 @@ bool8 sub_8094F38(struct MapObject *mapObject, struct Sprite *sprite) if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0, &mapObjectId)) { - an_look_any(mapObject, sprite, sub_8092AF8(mapObject->coords2.x, mapObject->coords2.y, gMapObjects[mapObjectId].coords2.x, gMapObjects[mapObjectId].coords2.y)); + an_look_any(mapObject, sprite, sub_8092AF8(mapObject->currentCoords.x, mapObject->currentCoords.y, gMapObjects[mapObjectId].currentCoords.x, gMapObjects[mapObjectId].currentCoords.y)); } sprite->data[2] = 1; return TRUE; @@ -4623,7 +4623,7 @@ bool8 sub_8094F94(struct MapObject *mapObject, struct Sprite *sprite) if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0, &mapObjectId)) { - an_look_any(mapObject, sprite, GetOppositeDirection(sub_8092AF8(mapObject->coords2.x, mapObject->coords2.y, gMapObjects[mapObjectId].coords2.x, gMapObjects[mapObjectId].coords2.y))); + an_look_any(mapObject, sprite, GetOppositeDirection(sub_8092AF8(mapObject->currentCoords.x, mapObject->currentCoords.y, gMapObjects[mapObjectId].currentCoords.x, gMapObjects[mapObjectId].currentCoords.y))); } sprite->data[2] = 1; return TRUE; @@ -4631,14 +4631,14 @@ bool8 sub_8094F94(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_8094FF8(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_9 = TRUE; + mapObject->facingDirectionLocked = TRUE; sprite->data[2] = 1; return TRUE; } bool8 sub_8095008(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_9 = FALSE; + mapObject->facingDirectionLocked = FALSE; sprite->data[2] = 1; return TRUE; } @@ -4658,7 +4658,7 @@ maybe_shadow_1_macro(sub_80953E0, maybe_shadow_1, sub_80941E0, DIR_EAST, 0, 2) bool8 sub_8095438(struct MapObject *mapObject, struct Sprite *sprite) { - an_look_any(mapObject, sprite, gUnknown_085055CD[mapObject->animPattern]); + an_look_any(mapObject, sprite, gUnknown_085055CD[mapObject->movementType]); return TRUE; } @@ -4670,42 +4670,42 @@ bool8 sub_8095450(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_8095460(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_25 = FALSE; + mapObject->disableJumpLandingGroundEffect = FALSE; sprite->data[2] = 1; return TRUE; } bool8 sub_8095470(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_25 = TRUE; + mapObject->disableJumpLandingGroundEffect = TRUE; sprite->data[2] = 1; return TRUE; } bool8 sub_8095480(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_12 = TRUE; + mapObject->inanimate = TRUE; sprite->data[2] = 1; return TRUE; } bool8 sub_8095490(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_12 = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->inanimate; + mapObject->inanimate = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->inanimate; sprite->data[2] = 1; return TRUE; } bool8 sub_80954BC(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_13 = TRUE; + mapObject->invisible = TRUE; sprite->data[2] = 1; return TRUE; } bool8 sub_80954CC(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_13 = FALSE; + mapObject->invisible = FALSE; sprite->data[2] = 1; return TRUE; } @@ -4736,12 +4736,12 @@ bool8 do_heart_bubble(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_8095548(struct MapObject *mapObject, struct Sprite *sprite) { - if (mapObject->animPattern == 0x3F) + if (mapObject->movementType == 0x3F) { sub_80B4578(mapObject); return FALSE; } - if (mapObject->animPattern != 0x39 && mapObject->animPattern != 0x3A) + if (mapObject->movementType != 0x39 && mapObject->movementType != 0x3A) { sprite->data[2] = 2; return TRUE; @@ -4780,10 +4780,10 @@ bool8 sub_80955C8(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_80955EC(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_13 ^= TRUE; + mapObject->invisible ^= TRUE; if (RunFieldObjectStepTimer(sprite)) { - mapObject->mapobj_bit_13 = TRUE; + mapObject->invisible = TRUE; sprite->data[2] = 3; } return FALSE; @@ -4808,10 +4808,10 @@ bool8 sub_8095644(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_8095668(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_13 ^= TRUE; + mapObject->invisible ^= TRUE; if (RunFieldObjectStepTimer(sprite)) { - mapObject->mapobj_bit_13 = TRUE; + mapObject->invisible = TRUE; sprite->data[2] = 3; } return FALSE; @@ -4819,14 +4819,14 @@ bool8 sub_8095668(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_80956A4(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_26 = TRUE; + mapObject->fixedPriority = TRUE; sprite->data[2] = 1; return TRUE; } bool8 sub_80956B4(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_26 = FALSE; + mapObject->fixedPriority = FALSE; sprite->data[2] = 1; return TRUE; } @@ -4850,13 +4850,13 @@ bool8 sub_80956F4(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_8095724(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_27 = TRUE; + mapObject->unk3_3 = TRUE; return TRUE; } bool8 sub_8095730(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_27 = FALSE; + mapObject->unk3_3 = FALSE; return TRUE; } @@ -4949,7 +4949,7 @@ bool8 sub_8095B0C(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8097758(sprite)) { npc_coords_shift_still(mapObject); - mapObject->mapobj_bit_3 = TRUE; + mapObject->triggerGroundEffectsOnStop = TRUE; sprite->animPaused = TRUE; return TRUE; } @@ -5001,7 +5001,7 @@ special_anim_with_timer_2(sub_8096090, EAST, sub_80929FC, 8, sub_809459C) void sub_80960C8(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed) { npc_apply_direction(mapObject, sprite, direction, speed); - StartSpriteAnim(sprite, sub_80929BC(mapObject->mapobj_unk_18)); + StartSpriteAnim(sprite, sub_80929BC(mapObject->facingDirection)); SeekSpriteAnim(sprite, 0); } @@ -5013,7 +5013,7 @@ an_walk_any_2_macro(sub_80961C0, sub_80960C8, npc_obj_ministep_stop_on_arrival, void sub_8096200(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed) { npc_apply_direction(mapObject, sprite, direction, speed); - npc_apply_anim_looping(mapObject, sprite, sub_80929FC(mapObject->mapobj_unk_18)); + npc_apply_anim_looping(mapObject, sprite, sub_80929FC(mapObject->facingDirection)); } an_walk_any_2_macro(sub_8096230, sub_8096200, npc_obj_ministep_stop_on_arrival, DIR_SOUTH, 1) @@ -5024,7 +5024,7 @@ an_walk_any_2_macro(sub_80962F0, sub_8096200, npc_obj_ministep_stop_on_arrival, void sub_8096330(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed) { npc_apply_direction(mapObject, sprite, direction, speed); - StartSpriteAnim(sprite, sub_80929DC(mapObject->mapobj_unk_18)); + StartSpriteAnim(sprite, sub_80929DC(mapObject->facingDirection)); SeekSpriteAnim(sprite, 0); } an_walk_any_2_macro(sub_8096368, sub_8096330, npc_obj_ministep_stop_on_arrival, DIR_SOUTH, 1) @@ -5041,7 +5041,7 @@ bool8 sub_8096468(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_809647C(struct MapObject *mapObject, struct Sprite *sprite) { - sub_8098044(mapObject->mapobj_unk_1B); + sub_8098044(mapObject->warpArrowSpriteId); sprite->pos2.y = 0; sprite->data[2] = 1; return TRUE; @@ -5051,7 +5051,7 @@ bool8 sub_8096494(struct MapObject *mapObject, struct Sprite *sprite) { if (sprite->pos2.y == 0) { - sub_8098044(mapObject->mapobj_unk_1B); + sub_8098044(mapObject->warpArrowSpriteId); sprite->data[2] = 1; return TRUE; } @@ -5071,7 +5071,7 @@ bool8 sub_80964BC(struct MapObject *mapObject, struct Sprite *sprite) void npc_obj_transfer_image_anim_pause_flag(struct MapObject *mapObject, struct Sprite *sprite) { - if (mapObject->mapobj_bit_10) + if (mapObject->disableAnim) { sprite->animPaused = TRUE; } @@ -5079,11 +5079,11 @@ void npc_obj_transfer_image_anim_pause_flag(struct MapObject *mapObject, struct void sub_80964E8(struct MapObject *mapObject, struct Sprite *sprite) { - if (mapObject->mapobj_bit_11) + if (mapObject->enableAnim) { sprite->animPaused = FALSE; - mapObject->mapobj_bit_10 = FALSE; - mapObject->mapobj_bit_11 = FALSE; + mapObject->disableAnim = FALSE; + mapObject->enableAnim = FALSE; } } @@ -5101,7 +5101,7 @@ static void sub_8096530(struct MapObject *mapObject, struct Sprite *sprite) u16 y2; const struct MapObjectGraphicsInfo *graphicsInfo; - mapObject->mapobj_bit_14 = FALSE; + mapObject->offScreen = FALSE; graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId); if (sprite->coordOffsetEnabled) { @@ -5119,18 +5119,18 @@ static void sub_8096530(struct MapObject *mapObject, struct Sprite *sprite) y2 += graphicsInfo->height; if ((s16)x >= 0x100 || (s16)x2 < -0x10) { - mapObject->mapobj_bit_14 = TRUE; + mapObject->offScreen = TRUE; } if ((s16)y >= 0xB0 || (s16)y2 < -0x10) { - mapObject->mapobj_bit_14 = TRUE; + mapObject->offScreen = TRUE; } } static void npc_update_obj_anim_flag(struct MapObject *mapObject, struct Sprite *sprite) { sprite->invisible = FALSE; - if (mapObject->mapobj_bit_13 || mapObject->mapobj_bit_14) + if (mapObject->invisible || mapObject->offScreen) { sprite->invisible = TRUE; } diff --git a/src/event_object_movement_helpers.c b/src/event_object_movement_helpers.c index 48f3b9052f..660c8961a6 100755 --- a/src/event_object_movement_helpers.c +++ b/src/event_object_movement_helpers.c @@ -25,15 +25,15 @@ void sub_8097FE4(u8); bool8 FreezeMapObject(struct MapObject *mapObject) { - if (mapObject->mapobj_bit_6 || mapObject->mapobj_bit_8) + if (mapObject->heldMovementActive || mapObject->frozen) { return TRUE; } else { - mapObject->mapobj_bit_8 = 1; - mapObject->mapobj_bit_23 = gSprites[mapObject->spriteId].animPaused; - mapObject->mapobj_bit_24 = gSprites[mapObject->spriteId].affineAnimPaused; + mapObject->frozen = 1; + mapObject->spriteAnimPausedBackup = gSprites[mapObject->spriteId].animPaused; + mapObject->spriteAffineAnimPausedBackup = gSprites[mapObject->spriteId].affineAnimPaused; gSprites[mapObject->spriteId].animPaused = 1; gSprites[mapObject->spriteId].affineAnimPaused = 1; return FALSE; @@ -58,11 +58,11 @@ void FreezeMapObjectsExceptOne(u8 a1) void npc_sync_anim_pause_bits(struct MapObject *mapObject) { - if (mapObject->active && mapObject->mapobj_bit_8) + if (mapObject->active && mapObject->frozen) { - mapObject->mapobj_bit_8 = 0; - gSprites[mapObject->spriteId].animPaused = mapObject->mapobj_bit_23; - gSprites[mapObject->spriteId].affineAnimPaused = mapObject->mapobj_bit_24; + mapObject->frozen = 0; + gSprites[mapObject->spriteId].animPaused = mapObject->spriteAnimPausedBackup; + gSprites[mapObject->spriteId].affineAnimPaused = mapObject->spriteAffineAnimPausedBackup; } } @@ -512,9 +512,9 @@ u32 oe_exec_and_other_stuff(u8 fieldEffectId, struct MapObject *mapObject) void DoShadowFieldEffect(struct MapObject *mapObject) { - if (!mapObject->mapobj_bit_22) + if (!mapObject->hasShadow) { - mapObject->mapobj_bit_22 = 1; + mapObject->hasShadow = 1; oe_exec_and_other_stuff(FLDEFF_SHADOW, mapObject); } } @@ -568,8 +568,8 @@ bool32 sub_8097E50(struct MapObject *mapObject, struct Sprite *sprite) if (ableToStore == TRUE) { - mapObject->mapobj_bit_12 = TRUE; - mapObject->mapobj_bit_9 = TRUE; + mapObject->inanimate = TRUE; + mapObject->facingDirectionLocked = TRUE; } sprite->data[2] = 1; @@ -596,8 +596,8 @@ bool32 sub_8097EF0(struct MapObject *mapObject, struct Sprite *sprite) FREE_AND_SET_NULL(gUnknown_020375B8); if (ableToStore == TRUE) { - mapObject->mapobj_bit_12 = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->inanimate; - mapObject->mapobj_bit_9 = 0; + mapObject->inanimate = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->inanimate; + mapObject->facingDirectionLocked = 0; sprite->animPaused = 0; } } @@ -623,7 +623,7 @@ void sub_8097FA4(struct MapObject *mapObject) struct Task *task = &gTasks[taskId]; StoreWordInTwoHalfwords(&task->data[0], (u32)mapObject); - mapObject->mapobj_unk_1B = taskId; + mapObject->warpArrowSpriteId = taskId; task->data[3] = 0xFFFF; } diff --git a/src/field_effect.c b/src/field_effect.c index 79753f027f..b80f0b5eb9 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -1185,7 +1185,7 @@ void mapldr_08084390(void) Overworld_PlaySpecialMapMusic(); pal_fill_black(); CreateTask(c3_080843F8, 0); - gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 1; + gMapObjects[gPlayerAvatar.mapObjectId].invisible = 1; if (gPlayerAvatar.flags & 0x08) { FieldObjectTurn(&gMapObjects[gPlayerAvatar.mapObjectId], DIR_WEST); @@ -1245,11 +1245,11 @@ bool8 sub_80B6BCC(struct Task *task) // gUnknown_0855C3C8[0] playerObject = &gMapObjects[gPlayerAvatar.mapObjectId]; playerSprite = &gSprites[gPlayerAvatar.spriteId]; CameraObjectReset2(); - gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 1; + gMapObjects[gPlayerAvatar.mapObjectId].invisible = 1; gPlayerAvatar.preventStep = TRUE; FieldObjectSetSpecialAnim(playerObject, GetFaceDirectionAnimId(player_get_direction_lower_nybble())); task->data[4] = playerSprite->subspriteMode; - playerObject->mapobj_bit_26 = 1; + playerObject->fixedPriority = 1; playerSprite->oam.priority = 1; playerSprite->subspriteMode = 2; task->data[0]++; @@ -1274,7 +1274,7 @@ bool8 sub_80B6C90(struct Task *task) // gUnknown_0855C3C8[2] sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY); task->data[1] = 1; task->data[2] = 0; - gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 0; + gMapObjects[gPlayerAvatar.mapObjectId].invisible = 0; PlaySE(SE_RU_HYUU); task->data[0]++; return FALSE; @@ -1299,15 +1299,15 @@ bool8 sub_80B6D04(struct Task *task) if (task->data[3] == 0 && sprite->pos2.y >= -16) { task->data[3]++; - mapObject->mapobj_bit_26 = 0; + mapObject->fixedPriority = 0; sprite->subspriteMode = task->data[4]; - mapObject->mapobj_bit_2 = 1; + mapObject->triggerGroundEffectsOnMove = 1; } if (sprite->pos2.y >= 0) { PlaySE(SE_W070); - mapObject->mapobj_bit_3 = 1; - mapObject->mapobj_bit_5 = 1; + mapObject->triggerGroundEffectsOnStop = 1; + mapObject->landingJump = 1; sprite->pos2.y = 0; task->data[0]++; } @@ -1677,7 +1677,7 @@ bool8 sub_80B7478(struct Task *task, struct MapObject *mapObject) { return FALSE; } - if (MetatileBehavior_IsWaterfall(mapObject->mapobj_unk_1E)) + if (MetatileBehavior_IsWaterfall(mapObject->currentMetatileBehavior)) { task->data[0] = 3; return TRUE; @@ -1729,7 +1729,7 @@ bool8 dive_3_unknown(struct Task *task) PlayerGetDestCoords(&mapPosition.x, &mapPosition.y); if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { - dive_warp(&mapPosition, gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1E); + dive_warp(&mapPosition, gMapObjects[gPlayerAvatar.mapObjectId].currentMetatileBehavior); DestroyTask(FindTaskIdByFunc(Task_Dive)); FieldEffectActiveListRemove(FLDEFF_USE_DIVE); } @@ -1755,7 +1755,7 @@ bool8 sub_80B764C(struct Task *task, struct MapObject *mapObject, struct Sprite CameraObjectReset2(); SetCameraPanningCallback(NULL); gPlayerAvatar.preventStep = TRUE; - mapObject->mapobj_bit_26 = 1; + mapObject->fixedPriority = 1; task->data[1] = 1; task->data[0]++; return TRUE; @@ -1778,8 +1778,8 @@ bool8 sub_80B76B8(struct Task *task, struct MapObject *mapObject, struct Sprite { sprite->pos2.y = 0; task->data[3] = 1; - gFieldEffectArguments[0] = mapObject->coords2.x; - gFieldEffectArguments[1] = mapObject->coords2.y; + gFieldEffectArguments[0] = mapObject->currentCoords.x; + gFieldEffectArguments[1] = mapObject->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_LAVARIDGE_GYM_WARP); @@ -1820,7 +1820,7 @@ bool8 sub_80B7704(struct Task *task, struct MapObject *mapObject, struct Sprite if (task->data[5] == 0 && sprite->pos2.y < -0x10) { task->data[5]++; - mapObject->mapobj_bit_26 = 1; + mapObject->fixedPriority = 1; sprite->oam.priority = 1; sprite->subspriteMode = 2; } @@ -1872,7 +1872,7 @@ bool8 sub_80B78EC(struct Task *task, struct MapObject *mapObject, struct Sprite CameraObjectReset2(); FreezeMapObjects(); gPlayerAvatar.preventStep = TRUE; - mapObject->mapobj_bit_13 = 1; + mapObject->invisible = 1; task->data[0]++; return FALSE; } @@ -1881,8 +1881,8 @@ bool8 sub_80B791C(struct Task *task, struct MapObject *mapObject, struct Sprite { if (IsWeatherNotFadingIn()) { - gFieldEffectArguments[0] = mapObject->coords2.x; - gFieldEffectArguments[1] = mapObject->coords2.y; + gFieldEffectArguments[0] = mapObject->currentCoords.x; + gFieldEffectArguments[1] = mapObject->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH); @@ -1897,7 +1897,7 @@ bool8 sub_80B7968(struct Task *task, struct MapObject *mapObject, struct Sprite if (sprite->animCmdIndex > 1) { task->data[0]++; - mapObject->mapobj_bit_13 = 0; + mapObject->invisible = 0; CameraObjectReset1(); PlaySE(SE_W091); FieldObjectSetSpecialAnim(mapObject, sub_8093514(DIR_EAST)); @@ -1954,7 +1954,7 @@ bool8 sub_80B7AE8(struct Task *task, struct MapObject *mapObject, struct Sprite FreezeMapObjects(); CameraObjectReset2(); gPlayerAvatar.preventStep = TRUE; - mapObject->mapobj_bit_26 = 1; + mapObject->fixedPriority = 1; task->data[0]++; return FALSE; } @@ -1965,8 +1965,8 @@ bool8 sub_80B7B18(struct Task *task, struct MapObject *mapObject, struct Sprite { if (task->data[1] > 3) { - gFieldEffectArguments[0] = mapObject->coords2.x; - gFieldEffectArguments[1] = mapObject->coords2.y; + gFieldEffectArguments[0] = mapObject->currentCoords.x; + gFieldEffectArguments[1] = mapObject->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH); @@ -1974,7 +1974,7 @@ bool8 sub_80B7B18(struct Task *task, struct MapObject *mapObject, struct Sprite } else { task->data[1]++; - FieldObjectSetSpecialAnim(mapObject, GetStepInPlaceDelay4AnimId(mapObject->mapobj_unk_18)); + FieldObjectSetSpecialAnim(mapObject, GetStepInPlaceDelay4AnimId(mapObject->facingDirection)); PlaySE(SE_FU_ZUZUZU); } } @@ -1985,7 +1985,7 @@ bool8 sub_80B7B94(struct Task *task, struct MapObject *mapObject, struct Sprite { if (gSprites[task->data[1]].animCmdIndex == 2) { - mapObject->mapobj_bit_13 = 1; + mapObject->invisible = 1; task->data[0]++; } return FALSE; @@ -2076,7 +2076,7 @@ void sub_80B7D34(struct Task *task) DestroyTask(FindTaskIdByFunc(sub_80B7CE4)); } else if (task->data[1] == 0 || (--task->data[1]) == 0) { - FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(spinDirections[mapObject->mapobj_unk_18])); + FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(spinDirections[mapObject->facingDirection])); if (task->data[2] < 12) { task->data[2]++; @@ -2100,7 +2100,7 @@ void mapldr_080859D4(void) ScriptContext2_Enable(); FreezeMapObjects(); gFieldCallback = NULL; - gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 1; + gMapObjects[gPlayerAvatar.mapObjectId].invisible = 1; CreateTask(sub_80B7E94, 0); } @@ -2130,20 +2130,20 @@ void sub_80B7EE8(struct Task *task) } if (task->data[2] >= 32 && task->data[15] == player_get_direction_lower_nybble()) { - mapObject->mapobj_bit_13 = 0; + mapObject->invisible = 0; ScriptContext2_Disable(); UnfreezeMapObjects(); DestroyTask(FindTaskIdByFunc(sub_80B7E94)); return; } - FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(spinDirections[mapObject->mapobj_unk_18])); + FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(spinDirections[mapObject->facingDirection])); if (task->data[2] < 32) { task->data[2]++; } task->data[1] = task->data[2] >> 2; } - mapObject->mapobj_bit_13 ^= 1; + mapObject->invisible ^= 1; } static void ExecuteTeleportFieldEffectTask(u8); @@ -2185,11 +2185,11 @@ static void TeleportFieldEffectTask2(struct Task *task) struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; if (task->data[1] == 0 || (--task->data[1]) == 0) { - FieldObjectTurn(mapObject, spinDirections[mapObject->mapobj_unk_18]); + FieldObjectTurn(mapObject, spinDirections[mapObject->facingDirection]); task->data[1] = 8; task->data[2]++; } - if (task->data[2] > 7 && task->data[15] == mapObject->mapobj_unk_18) + if (task->data[2] > 7 && task->data[15] == mapObject->facingDirection) { task->data[0]++; task->data[1] = 4; @@ -2207,7 +2207,7 @@ static void TeleportFieldEffectTask3(struct Task *task) if ((--task->data[1]) <= 0) { task->data[1] = 4; - FieldObjectTurn(mapObject, spinDirections[mapObject->mapobj_unk_18]); + FieldObjectTurn(mapObject, spinDirections[mapObject->facingDirection]); } sprite->pos1.y -= task->data[3]; task->data[4] += task->data[3]; @@ -2257,7 +2257,7 @@ static void mapldr_08085D88(void) ScriptContext2_Enable(); FreezeMapObjects(); gFieldCallback = NULL; - gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 1; + gMapObjects[gPlayerAvatar.mapObjectId].invisible = 1; CameraObjectReset2(); CreateTask(sub_80B8250, 0); } @@ -2282,7 +2282,7 @@ void sub_80B8280(struct Task *task) sprite = &gSprites[gPlayerAvatar.spriteId]; centerToCornerVecY = -(sprite->centerToCornerVecY << 1); sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY); - gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 0; + gMapObjects[gPlayerAvatar.mapObjectId].invisible = 0; task->data[0]++; task->data[1] = 8; task->data[2] = 1; @@ -2302,7 +2302,7 @@ void sub_80B830C(struct Task *task) if (task->data[13] == 0) { task->data[13]++; - mapObject->mapobj_bit_2 = 1; + mapObject->triggerGroundEffectsOnMove = 1; sprite->subspriteMode = task->data[14]; } } else @@ -2320,7 +2320,7 @@ void sub_80B830C(struct Task *task) if ((--task->data[2]) == 0) { task->data[2] = 4; - FieldObjectTurn(mapObject, spinDirections[mapObject->mapobj_unk_18]); + FieldObjectTurn(mapObject, spinDirections[mapObject->facingDirection]); } if (sprite->pos2.y >= 0) { @@ -2337,9 +2337,9 @@ void sub_80B8410(struct Task *task) struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; if ((--task->data[1]) == 0) { - FieldObjectTurn(mapObject, spinDirections[mapObject->mapobj_unk_18]); + FieldObjectTurn(mapObject, spinDirections[mapObject->facingDirection]); task->data[1] = 8; - if ((++task->data[2]) > 4 && task->data[14] == mapObject->mapobj_unk_18) + if ((++task->data[2]) > 4 && task->data[14] == mapObject->facingDirection) { ScriptContext2_Disable(); CameraObjectReset1(); @@ -2897,7 +2897,7 @@ void sub_80B8DB4(struct Task *task) gPlayerAvatar.preventStep = TRUE; SetPlayerAvatarStateMask(8); PlayerGetDestCoords(&task->data[1], &task->data[2]); - MoveCoords(gMapObjects[gPlayerAvatar.mapObjectId].placeholder18, &task->data[1], &task->data[2]); + MoveCoords(gMapObjects[gPlayerAvatar.mapObjectId].movementDirection, &task->data[1], &task->data[2]); task->data[0]++; } @@ -2933,11 +2933,11 @@ void sub_80B8EA8(struct Task *task) mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; FieldObjectSetGraphicsId(mapObject, GetPlayerAvatarGraphicsIdByStateId(3)); FieldObjectClearAnimIfSpecialAnimFinished(mapObject); - FieldObjectSetSpecialAnim(mapObject, sub_8093540(mapObject->placeholder18)); + FieldObjectSetSpecialAnim(mapObject, sub_8093540(mapObject->movementDirection)); gFieldEffectArguments[0] = task->data[1]; gFieldEffectArguments[1] = task->data[2]; gFieldEffectArguments[2] = gPlayerAvatar.mapObjectId; - mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_SURF_BLOB); + mapObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_SURF_BLOB); task->data[0]++; } } @@ -2950,8 +2950,8 @@ void sub_80B8F24(struct Task *task) { gPlayerAvatar.preventStep = FALSE; gPlayerAvatar.flags &= 0xdf; - FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(mapObject->placeholder18)); - sub_81555AC(mapObject->mapobj_unk_1A, 1); + FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(mapObject->movementDirection)); + sub_81555AC(mapObject->fieldEffectSpriteId, 1); UnfreezeMapObjects(); ScriptContext2_Disable(); FieldEffectActiveListRemove(FLDEFF_USE_SURF); @@ -3238,8 +3238,8 @@ void sub_80B92A0(struct Task *task) mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; if (task->data[15] & 0x08) { - sub_81555AC(mapObject->mapobj_unk_1A, 2); - sub_81555D8(mapObject->mapobj_unk_1A, 0); + sub_81555AC(mapObject->fieldEffectSpriteId, 2); + sub_81555D8(mapObject->fieldEffectSpriteId, 0); } task->data[1] = sub_80B94C4(); task->data[0]++; @@ -3277,11 +3277,11 @@ void sub_80B9390(struct Task *task) mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; FieldObjectSetGraphicsId(mapObject, GetPlayerAvatarGraphicsIdByStateId(0x03)); StartSpriteAnim(&gSprites[mapObject->spriteId], 0x16); - mapObject->mapobj_bit_12 = 1; + mapObject->inanimate = 1; FieldObjectSetSpecialAnim(mapObject, 0x48); if (task->data[15] & 0x08) { - DestroySprite(&gSprites[mapObject->mapobj_unk_1A]); + DestroySprite(&gSprites[mapObject->fieldEffectSpriteId]); } task->data[0]++; task->data[2] = 0; @@ -3295,8 +3295,8 @@ void sub_80B9418(struct Task *task) { mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; FieldObjectClearAnimIfSpecialAnimActive(mapObject); - mapObject->mapobj_bit_12 = 0; - mapObject->mapobj_bit_22 = 0; + mapObject->inanimate = 0; + mapObject->hasShadow = 0; sub_80B9560(task->data[1], mapObject->spriteId); CameraObjectReset2(); task->data[0]++; @@ -3513,13 +3513,13 @@ void sub_80B9804(struct Task *task) SetPlayerAvatarStateMask(0x01); if (task->data[15] & 0x08) { - sub_81555AC(mapObject->mapobj_unk_1A, 0); + sub_81555AC(mapObject->fieldEffectSpriteId, 0); } FieldObjectSetGraphicsId(mapObject, GetPlayerAvatarGraphicsIdByStateId(0x3)); CameraObjectReset2(); FieldObjectTurn(mapObject, DIR_WEST); StartSpriteAnim(&gSprites[mapObject->spriteId], 0x16); - mapObject->mapobj_bit_13 = 0; + mapObject->invisible = 0; task->data[1] = sub_80B94C4(); sub_80B9524(task->data[1]); sub_80B9560(task->data[1], mapObject->spriteId); @@ -3582,8 +3582,8 @@ void sub_80B9978(struct Task *task) { mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; sprite = &gSprites[mapObject->spriteId]; - mapObject->mapobj_bit_12 = 0; - sub_808EB08(mapObject, mapObject->coords2.x, mapObject->coords2.y); + mapObject->inanimate = 0; + sub_808EB08(mapObject, mapObject->currentCoords.x, mapObject->currentCoords.y); sprite->pos2.x = 0; sprite->pos2.y = 0; sprite->coordOffsetEnabled = 1; @@ -3623,7 +3623,7 @@ void sub_80B9A60(struct Task *task) if (task->data[15] & 0x08) { state = 3; - sub_81555AC(mapObject->mapobj_unk_1A, 1); + sub_81555AC(mapObject->fieldEffectSpriteId, 1); } FieldObjectSetGraphicsId(mapObject, GetPlayerAvatarGraphicsIdByStateId(state)); FieldObjectTurn(mapObject, DIR_SOUTH); @@ -3723,7 +3723,7 @@ void sub_80B9C54(s16* data, u8 taskId) if (++data[3] > 0x78) { struct Sprite *sprite = &gSprites[gMapObjects[data[2]].spriteId]; - gMapObjects[data[2]].mapobj_bit_13 = TRUE; + gMapObjects[data[2]].invisible = TRUE; BlendPalettes(0x0000FFFF, 0x10, RGB_WHITE); BeginNormalPaletteFade(0x0000FFFF, 0, 0x10, 0, RGB_WHITE); sub_80B9D24(sprite); @@ -3845,8 +3845,8 @@ bool8 sub_80B9E28(struct Sprite* sprite) int xPos, yPos; u8 taskId; object = &gMapObjects[mapObjectIdBuffer]; - xPos = object->coords2.x - 7; - yPos = object->coords2.y - 7; + xPos = object->currentCoords.x - 7; + yPos = object->currentCoords.y - 7; xPos = (gFieldEffectArguments[3] - xPos) * 16; yPos = (gFieldEffectArguments[4] - yPos) * 16; npc_coords_shift(object, gFieldEffectArguments[3] + 7, gFieldEffectArguments[4] + 7); @@ -3888,7 +3888,7 @@ void sub_80B9EDC(u8 taskId) sprite->pos1.x = data[2]; sprite->pos1.y = data[3]; npc_coords_shift_still(object); - object->mapobj_bit_3 = TRUE; + object->triggerGroundEffectsOnStop = TRUE; FieldEffectActiveListRemove(0x42); DestroyTask(taskId); } diff --git a/src/field_special_scene.c b/src/field_special_scene.c index 2d9973488a..8a4fb7c694 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -346,7 +346,7 @@ void sub_80FB6EC(void) void sub_80FB768(void) { sub_80FB6EC(); - gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = TRUE; + gMapObjects[gPlayerAvatar.mapObjectId].invisible = TRUE; pal_fill_black(); CreateTask(Task_HandlePorthole, 80); ScriptContext2_Enable(); diff --git a/src/map_obj_lock.c b/src/map_obj_lock.c index 3a67950de1..d57cc5b86f 100644 --- a/src/map_obj_lock.c +++ b/src/map_obj_lock.c @@ -54,7 +54,7 @@ static void sub_8098400(u8 taskId) sub_808B864(); task->data[0] = 1; } - if (!task->data[1] && !gMapObjects[gSelectedMapObject].mapobj_bit_1) + if (!task->data[1] && !gMapObjects[gSelectedMapObject].singleMovementActive) { FreezeMapObject(&gMapObjects[gSelectedMapObject]); task->data[1] = 1; @@ -81,7 +81,7 @@ void LockSelectedMapObject(void) u8 taskId; FreezeMapObjectsExceptOne(gSelectedMapObject); taskId = CreateTask(sub_8098400, 80); - if (!gMapObjects[gSelectedMapObject].mapobj_bit_1) + if (!gMapObjects[gSelectedMapObject].singleMovementActive) { FreezeMapObject(&gMapObjects[gSelectedMapObject]); gTasks[taskId].data[1] = 1; @@ -128,7 +128,7 @@ static void sub_80985BC(u8 taskId) sub_808B864(); task->data[0] = 1; } - if (!task->data[1] && !gMapObjects[mapObjectId].mapobj_bit_1) + if (!task->data[1] && !gMapObjects[mapObjectId].singleMovementActive) { FreezeMapObject(&gMapObjects[mapObjectId]); task->data[1] = 1; @@ -147,14 +147,14 @@ void sub_8098630(void) sub_8098074(trainerObjectId1, trainerObjectId2); taskId = CreateTask(sub_80985BC, 80); gTasks[taskId].data[2] = trainerObjectId1; - if(!gMapObjects[trainerObjectId1].mapobj_bit_1) + if(!gMapObjects[trainerObjectId1].singleMovementActive) { FreezeMapObject(&gMapObjects[trainerObjectId1]); gTasks[taskId].data[1] = 1; } taskId = CreateTask(sub_80985BC, 81); gTasks[taskId].data[2] = trainerObjectId2; - if(!gMapObjects[trainerObjectId2].mapobj_bit_1) + if(!gMapObjects[trainerObjectId2].singleMovementActive) { FreezeMapObject(&gMapObjects[trainerObjectId2]); gTasks[taskId].data[1] = 1; @@ -165,7 +165,7 @@ void sub_8098630(void) FreezeMapObjectsExceptOne(trainerObjectId1); taskId = CreateTask(sub_80985BC, 80); gTasks[taskId].data[2] = trainerObjectId1; - if(!gMapObjects[trainerObjectId1].mapobj_bit_1) + if(!gMapObjects[trainerObjectId1].singleMovementActive) { FreezeMapObject(&gMapObjects[trainerObjectId1]); gTasks[taskId].data[1] = 1; diff --git a/src/overworld.c b/src/overworld.c index b895ba43ea..3279ce4fbe 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -2202,7 +2202,7 @@ static void sub_8086A68(void) static void sub_8086A80(void) { - gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_15 = 1; + gMapObjects[gPlayerAvatar.mapObjectId].trackedByCamera = 1; InitCameraUpdateCallback(gPlayerAvatar.spriteId); } @@ -2921,7 +2921,7 @@ static void SpawnLinkPlayerMapObject(u8 linkPlayerId, s16 x, s16 y, u8 a4) linkPlayerMapObj->mode = 0; mapObj->active = 1; - mapObj->mapobj_bit_1 = a4; + mapObj->singleMovementActive = a4; mapObj->range.as_byte = 2; mapObj->spriteId = 64; @@ -2930,12 +2930,12 @@ static void SpawnLinkPlayerMapObject(u8 linkPlayerId, s16 x, s16 y, u8 a4) static void InitLinkPlayerMapObjectPos(struct MapObject *mapObj, s16 x, s16 y) { - mapObj->coords2.x = x; - mapObj->coords2.y = y; - mapObj->coords3.x = x; - mapObj->coords3.y = y; - sub_8093038(x, y, &mapObj->coords1.x, &mapObj->coords1.y); - mapObj->coords1.x += 8; + mapObj->currentCoords.x = x; + mapObj->currentCoords.y = y; + mapObj->previousCoords.x = x; + mapObj->previousCoords.y = y; + sub_8093038(x, y, &mapObj->initialCoords.x, &mapObj->initialCoords.y); + mapObj->initialCoords.x += 8; FieldObjectUpdateZCoord(mapObj); } @@ -2971,8 +2971,8 @@ static void sub_8087878(u8 linkPlayerId, u16 *x, u16 *y) { u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId; struct MapObject *mapObj = &gMapObjects[mapObjId]; - *x = mapObj->coords2.x; - *y = mapObj->coords2.y; + *x = mapObj->currentCoords.x; + *y = mapObj->currentCoords.y; } static u8 sub_80878A0(u8 linkPlayerId) @@ -2986,14 +2986,14 @@ static u8 sub_80878C0(u8 linkPlayerId) { u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId; struct MapObject *mapObj = &gMapObjects[mapObjId]; - return mapObj->mapobj_unk_0B_0; + return mapObj->currentElevation; } static s32 sub_80878E4(u8 linkPlayerId) { u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId; struct MapObject *mapObj = &gMapObjects[mapObjId]; - return 16 - (s8)mapObj->mapobj_unk_21; + return 16 - (s8)mapObj->directionSequenceIndex; } static u8 GetLinkPlayerIdAt(s16 x, s16 y) @@ -3005,7 +3005,7 @@ static u8 GetLinkPlayerIdAt(s16 x, s16 y) && (gLinkPlayerMapObjects[i].mode == 0 || gLinkPlayerMapObjects[i].mode == 2)) { struct MapObject *mapObj = &gMapObjects[gLinkPlayerMapObjects[i].mapObjId]; - if (mapObj->coords2.x == x && mapObj->coords2.y == y) + if (mapObj->currentCoords.x == x && mapObj->currentCoords.y == y) return i; } } @@ -3021,7 +3021,7 @@ static void sub_808796C(u8 linkPlayerId, u8 a2) if (linkPlayerMapObj->active) { if (a2 > 10) - mapObj->mapobj_bit_2 = 1; + mapObj->triggerGroundEffectsOnMove = 1; else gUnknown_08339E00[gUnknown_08339DC8[linkPlayerMapObj->mode](linkPlayerMapObj, mapObj, a2)](linkPlayerMapObj, mapObj); } @@ -3060,7 +3060,7 @@ static u8 sub_8087A20(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapOb } else { - mapObj->mapobj_unk_21 = 16; + mapObj->directionSequenceIndex = 16; npc_coords_shift(mapObj, x, y); FieldObjectUpdateZCoord(mapObj); return 1; @@ -3080,10 +3080,10 @@ static void sub_8087AA0(struct LinkPlayerMapObject *linkPlayerMapObj, struct Map static void sub_8087AA8(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj) { - mapObj->mapobj_unk_21--; + mapObj->directionSequenceIndex--; linkPlayerMapObj->mode = 1; - MoveCoords(mapObj->range.as_byte, &mapObj->coords1.x, &mapObj->coords1.y); - if (!mapObj->mapobj_unk_21) + MoveCoords(mapObj->range.as_byte, &mapObj->initialCoords.x, &mapObj->initialCoords.y); + if (!mapObj->directionSequenceIndex) { npc_coords_shift_still(mapObj); linkPlayerMapObj->mode = 2; @@ -3117,8 +3117,8 @@ static u8 LinkPlayerDetectCollision(u8 selfMapObjId, u8 a2, s16 x, s16 y) { if (i != selfMapObjId) { - if ((gMapObjects[i].coords2.x == x && gMapObjects[i].coords2.y == y) - || (gMapObjects[i].coords3.x == x && gMapObjects[i].coords3.y == y)) + if ((gMapObjects[i].currentCoords.x == x && gMapObjects[i].currentCoords.y == y) + || (gMapObjects[i].previousCoords.x == x && gMapObjects[i].previousCoords.y == y)) { return 1; } @@ -3140,21 +3140,21 @@ static void CreateLinkPlayerSprite(u8 linkPlayerId, u8 gameVersion) { case VERSION_FIRE_RED: case VERSION_LEAF_GREEN: - mapObj->spriteId = AddPseudoFieldObject(sub_808BD6C(mapObj->mapobj_bit_1), SpriteCB_LinkPlayer, 0, 0, 0); + mapObj->spriteId = AddPseudoFieldObject(sub_808BD6C(mapObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); break; case VERSION_RUBY: case VERSION_SAPPHIRE: - mapObj->spriteId = AddPseudoFieldObject(sub_808BD7C(mapObj->mapobj_bit_1), SpriteCB_LinkPlayer, 0, 0, 0); + mapObj->spriteId = AddPseudoFieldObject(sub_808BD7C(mapObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); break; case VERSION_EMERALD: - mapObj->spriteId = AddPseudoFieldObject(GetRivalAvatarGraphicsIdByStateIdAndGender(0, mapObj->mapobj_bit_1), SpriteCB_LinkPlayer, 0, 0, 0); + mapObj->spriteId = AddPseudoFieldObject(GetRivalAvatarGraphicsIdByStateIdAndGender(0, mapObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); break; } sprite = &gSprites[mapObj->spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->data[0] = linkPlayerId; - mapObj->mapobj_bit_2 = 0; + mapObj->triggerGroundEffectsOnMove = 0; } } @@ -3162,10 +3162,10 @@ static void SpriteCB_LinkPlayer(struct Sprite *sprite) { struct LinkPlayerMapObject *linkPlayerMapObj = &gLinkPlayerMapObjects[sprite->data[0]]; struct MapObject *mapObj = &gMapObjects[linkPlayerMapObj->mapObjId]; - sprite->pos1.x = mapObj->coords1.x; - sprite->pos1.y = mapObj->coords1.y; - SetObjectSubpriorityByZCoord(mapObj->elevation, sprite, 1); - sprite->oam.priority = ZCoordToPriority(mapObj->elevation); + sprite->pos1.x = mapObj->initialCoords.x; + sprite->pos1.y = mapObj->initialCoords.y; + SetObjectSubpriorityByZCoord(mapObj->previousElevation, sprite, 1); + sprite->oam.priority = ZCoordToPriority(mapObj->previousElevation); if (!linkPlayerMapObj->mode) StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObj->range.as_byte)); @@ -3173,7 +3173,7 @@ static void SpriteCB_LinkPlayer(struct Sprite *sprite) StartSpriteAnimIfDifferent(sprite, get_go_image_anim_num(mapObj->range.as_byte)); sub_80979D4(sprite, 0); - if (mapObj->mapobj_bit_2) + if (mapObj->triggerGroundEffectsOnMove) { sprite->invisible = ((sprite->data[7] & 4) >> 2); sprite->data[7]++; diff --git a/src/trainer_see.c b/src/trainer_see.c index 28fe0064b4..16520c27ac 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -284,8 +284,8 @@ static u8 GetTrainerApproachDistance(struct MapObject *trainerObj) PlayerGetDestCoords(&x, &y); if (trainerObj->trainerType == 1) // can only see in one direction { - approachDistance = sDirectionalApproachDistanceFuncs[trainerObj->mapobj_unk_18 - 1](trainerObj, trainerObj->trainerRange_berryTreeId, x, y); - return CheckPathBetweenTrainerAndPlayer(trainerObj, approachDistance, trainerObj->mapobj_unk_18); + approachDistance = sDirectionalApproachDistanceFuncs[trainerObj->facingDirection - 1](trainerObj, trainerObj->trainerRange_berryTreeId, x, y); + return CheckPathBetweenTrainerAndPlayer(trainerObj, approachDistance, trainerObj->facingDirection); } else // can see in all directions { @@ -303,10 +303,10 @@ static u8 GetTrainerApproachDistance(struct MapObject *trainerObj) // Returns how far south the player is from trainer. 0 if out of trainer's sight. static u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y) { - if (trainerObj->coords2.x == x - && y > trainerObj->coords2.y - && y <= trainerObj->coords2.y + range) - return (y - trainerObj->coords2.y); + if (trainerObj->currentCoords.x == x + && y > trainerObj->currentCoords.y + && y <= trainerObj->currentCoords.y + range) + return (y - trainerObj->currentCoords.y); else return 0; } @@ -314,10 +314,10 @@ static u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 rang // Returns how far north the player is from trainer. 0 if out of trainer's sight. static u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y) { - if (trainerObj->coords2.x == x - && y < trainerObj->coords2.y - && y >= trainerObj->coords2.y - range) - return (trainerObj->coords2.y - y); + if (trainerObj->currentCoords.x == x + && y < trainerObj->currentCoords.y + && y >= trainerObj->currentCoords.y - range) + return (trainerObj->currentCoords.y - y); else return 0; } @@ -325,10 +325,10 @@ static u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 rang // Returns how far west the player is from trainer. 0 if out of trainer's sight. static u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x, s16 y) { - if (trainerObj->coords2.y == y - && x < trainerObj->coords2.x - && x >= trainerObj->coords2.x - range) - return (trainerObj->coords2.x - x); + if (trainerObj->currentCoords.y == y + && x < trainerObj->currentCoords.x + && x >= trainerObj->currentCoords.x - range) + return (trainerObj->currentCoords.x - x); else return 0; } @@ -336,10 +336,10 @@ static u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range // Returns how far east the player is from trainer. 0 if out of trainer's sight. static u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x, s16 y) { - if (trainerObj->coords2.y == y - && x > trainerObj->coords2.x - && x <= trainerObj->coords2.x + range) - return (x - trainerObj->coords2.x); + if (trainerObj->currentCoords.y == y + && x > trainerObj->currentCoords.x + && x <= trainerObj->currentCoords.x + range) + return (x - trainerObj->currentCoords.x); else return 0; } @@ -357,8 +357,8 @@ static u8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 appr if (approachDistance == 0) return 0; - x = trainerObj->coords2.x; - y = trainerObj->coords2.y; + x = trainerObj->currentCoords.x; + y = trainerObj->currentCoords.y; MoveCoords(direction, &x, &y); for (i = 0; i < approachDistance - 1; i++, MoveCoords(direction, &x, &y)) @@ -441,7 +441,7 @@ static bool8 sub_80B417C(u8 taskId, struct Task *task, struct MapObject *trainer FieldObjectGetLocalIdAndMap(trainerObj, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1); - direction = GetFaceDirectionAnimId(trainerObj->mapobj_unk_18); + direction = GetFaceDirectionAnimId(trainerObj->facingDirection); FieldObjectSetSpecialAnim(trainerObj, direction); task->tFuncId++; return TRUE; @@ -456,9 +456,9 @@ static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct MapObject *trainer else { task->tFuncId++; - if (trainerObj->animPattern == 57 || trainerObj->animPattern == 58) + if (trainerObj->movementType == 57 || trainerObj->movementType == 58) task->tFuncId = 6; - if (trainerObj->animPattern == 63) + if (trainerObj->movementType == 63) task->tFuncId = 8; return TRUE; } @@ -470,7 +470,7 @@ static bool8 sub_80B4200(u8 taskId, struct Task *task, struct MapObject *trainer { if (task->tTrainerRange) { - FieldObjectSetSpecialAnim(trainerObj, GetGoSpeed0AnimId(trainerObj->mapobj_unk_18)); + FieldObjectSetSpecialAnim(trainerObj, GetGoSpeed0AnimId(trainerObj->facingDirection)); task->tTrainerRange--; } else @@ -489,8 +489,8 @@ static bool8 sub_80B425C(u8 taskId, struct Task *task, struct MapObject *trainer if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) && !FieldObjectClearAnimIfSpecialAnimFinished(trainerObj)) return FALSE; - npc_set_running_behaviour_etc(trainerObj, npc_running_behaviour_by_direction(trainerObj->mapobj_unk_18)); - sub_808F23C(trainerObj, npc_running_behaviour_by_direction(trainerObj->mapobj_unk_18)); + npc_set_running_behaviour_etc(trainerObj, npc_running_behaviour_by_direction(trainerObj->facingDirection)); + sub_808F23C(trainerObj, npc_running_behaviour_by_direction(trainerObj->facingDirection)); sub_808F208(trainerObj); playerObj = &gMapObjects[gPlayerAvatar.mapObjectId]; @@ -498,7 +498,7 @@ static bool8 sub_80B425C(u8 taskId, struct Task *task, struct MapObject *trainer return FALSE; sub_808BCE8(); - FieldObjectSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->mapobj_unk_18))); + FieldObjectSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->facingDirection))); task->tFuncId++; return FALSE; } @@ -547,8 +547,8 @@ static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct MapObject *trainer { if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(trainerObj)) { - gFieldEffectArguments[0] = trainerObj->coords2.x; - gFieldEffectArguments[1] = trainerObj->coords2.y; + gFieldEffectArguments[0] = trainerObj->currentCoords.x; + gFieldEffectArguments[1] = trainerObj->currentCoords.y; gFieldEffectArguments[2] = gSprites[trainerObj->spriteId].subpriority - 1; gFieldEffectArguments[3] = 2; task->tOutOfAshSpriteId = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH); @@ -563,13 +563,13 @@ static bool8 sub_80B4438(u8 taskId, struct Task *task, struct MapObject *trainer if (gSprites[task->tOutOfAshSpriteId].animCmdIndex == 2) { - trainerObj->mapobj_bit_26 = 0; - trainerObj->mapobj_bit_2 = 1; + trainerObj->fixedPriority = 0; + trainerObj->triggerGroundEffectsOnMove = 1; sprite = &gSprites[trainerObj->spriteId]; sprite->oam.priority = 2; FieldObjectClearAnimIfSpecialAnimFinished(trainerObj); - FieldObjectSetSpecialAnim(trainerObj, sub_80934BC(trainerObj->mapobj_unk_18)); + FieldObjectSetSpecialAnim(trainerObj, sub_80934BC(trainerObj->facingDirection)); task->tFuncId++; } @@ -604,13 +604,13 @@ static void sub_80B44C8(u8 taskId) sTrainerSeeFuncList2[task->data[0]](taskId, task, mapObj); if (task->data[0] == 3 && !FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) { - npc_set_running_behaviour_etc(mapObj, npc_running_behaviour_by_direction(mapObj->mapobj_unk_18)); - sub_808F23C(mapObj, npc_running_behaviour_by_direction(mapObj->mapobj_unk_18)); + npc_set_running_behaviour_etc(mapObj, npc_running_behaviour_by_direction(mapObj->facingDirection)); + sub_808F23C(mapObj, npc_running_behaviour_by_direction(mapObj->facingDirection)); DestroyTask(taskId); } else { - mapObj->mapobj_bit_7 = 0; + mapObj->heldMovementFinished = 0; } } @@ -765,14 +765,14 @@ void sub_80B4808(void) if (gUnknown_030060AC == 1) { trainerObj = &gMapObjects[gApproachingTrainers[gUnknown_03006080].mapObjectId]; - gUnknown_03006084[0] = GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->mapobj_unk_18)); + gUnknown_03006084[0] = GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->facingDirection)); gUnknown_03006084[1] = 0xFE; ScriptMovement_StartObjectMovementScript(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gUnknown_03006084); } else { trainerObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - gUnknown_03006084[0] = GetFaceDirectionAnimId(trainerObj->mapobj_unk_18); + gUnknown_03006084[0] = GetFaceDirectionAnimId(trainerObj->facingDirection); gUnknown_03006084[1] = 0xFE; ScriptMovement_StartObjectMovementScript(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gUnknown_03006084); } From 73327f0d44195f26d1af8b894326e1b98b609681 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 11 Jun 2018 10:23:14 -0500 Subject: [PATCH 03/55] Decompile field_ground_effect into event_object_movement.c --- asm/field_ground_effect.s | 1821 --------------------------- data/field_ground_effect.s | 63 - include/event_object_movement.h | 26 + include/field_effect_helpers.h | 3 + include/field_ground_effect.h | 24 - include/fieldmap.h | 1 + include/metatile_behavior.h | 2 +- include/pokenav.h | 1 + ld_script.txt | 3 +- src/event_object_movement.c | 724 ++++++++++- src/event_object_movement_helpers.c | 5 +- src/metatile_behavior.c | 3 +- src/overworld.c | 1 - 13 files changed, 758 insertions(+), 1919 deletions(-) delete mode 100644 asm/field_ground_effect.s delete mode 100644 include/field_ground_effect.h diff --git a/asm/field_ground_effect.s b/asm/field_ground_effect.s deleted file mode 100644 index 05f8ffce0d..0000000000 --- a/asm/field_ground_effect.s +++ /dev/null @@ -1,1821 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start FieldObjectUpdateMetatileBehaviors -@ void FieldObjectUpdateMetatileBehaviors(struct npc_state *fieldObject) -FieldObjectUpdateMetatileBehaviors: @ 8096728 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x14 - ldrsh r0, [r4, r1] - movs r2, 0x16 - ldrsh r1, [r4, r2] - bl MapGridGetMetatileBehaviorAt - strb r0, [r4, 0x1F] - movs r1, 0x10 - ldrsh r0, [r4, r1] - movs r2, 0x12 - ldrsh r1, [r4, r2] - bl MapGridGetMetatileBehaviorAt - strb r0, [r4, 0x1E] - pop {r4} - pop {r0} - bx r0 - thumb_func_end FieldObjectUpdateMetatileBehaviors - - thumb_func_start GetGroundEffectFlags_Reflection -@ void GetGroundEffectFlags_Reflection(struct npc_state *fieldObject, u32 *flags) -GetGroundEffectFlags_Reflection: @ 8096750 - push {r4,r5,lr} - sub sp, 0x8 - adds r4, r0, 0 - adds r5, r1, 0 - ldr r0, =gUnknown_0850E5DC - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp] - str r1, [sp, 0x4] - adds r0, r4, 0 - bl FieldObjectCheckForReflectiveSurface - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0 - beq _08096798 - ldrb r1, [r4, 0x2] - lsls r0, r1, 30 - cmp r0, 0 - blt _080967A2 - movs r0, 0x3 - negs r0, r0 - ands r0, r1 - movs r1, 0x2 - orrs r0, r1 - strb r0, [r4, 0x2] - subs r0, r2, 0x1 - lsls r0, 2 - add r0, sp - ldr r1, [r5] - ldr r0, [r0] - orrs r1, r0 - str r1, [r5] - b _080967A2 - .pool -_08096798: - ldrb r1, [r4, 0x2] - movs r0, 0x3 - negs r0, r0 - ands r0, r1 - strb r0, [r4, 0x2] -_080967A2: - add sp, 0x8 - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end GetGroundEffectFlags_Reflection - - thumb_func_start GetGroundEffectFlags_TallGrassOnSpawn -@ void GetGroundEffectFlags_TallGrassOnSpawn(struct npc_state *fieldObject, u32 *flags) -GetGroundEffectFlags_TallGrassOnSpawn: @ 80967AC - push {r4,lr} - adds r4, r1, 0 - ldrb r0, [r0, 0x1E] - bl MetatileBehavior_IsTallGrass - lsls r0, 24 - cmp r0, 0 - beq _080967C4 - ldr r0, [r4] - movs r1, 0x1 - orrs r0, r1 - str r0, [r4] -_080967C4: - pop {r4} - pop {r0} - bx r0 - thumb_func_end GetGroundEffectFlags_TallGrassOnSpawn - - thumb_func_start GetGroundEffectFlags_TallGrassOnBeginStep -@ void GetGroundEffectFlags_TallGrassOnBeginStep(struct npc_state *fieldObject, u32 *flags) -GetGroundEffectFlags_TallGrassOnBeginStep: @ 80967CC - push {r4,lr} - adds r4, r1, 0 - ldrb r0, [r0, 0x1E] - bl MetatileBehavior_IsTallGrass - lsls r0, 24 - cmp r0, 0 - beq _080967E4 - ldr r0, [r4] - movs r1, 0x2 - orrs r0, r1 - str r0, [r4] -_080967E4: - pop {r4} - pop {r0} - bx r0 - thumb_func_end GetGroundEffectFlags_TallGrassOnBeginStep - - thumb_func_start GetGroundEffectFlags_LongGrassOnSpawn -@ void GetGroundEffectFlags_LongGrassOnSpawn(struct npc_state *fieldObject, u32 *flags) -GetGroundEffectFlags_LongGrassOnSpawn: @ 80967EC - push {r4,lr} - adds r4, r1, 0 - ldrb r0, [r0, 0x1E] - bl MetatileBehavior_IsLongGrass - lsls r0, 24 - cmp r0, 0 - beq _08096804 - ldr r0, [r4] - movs r1, 0x4 - orrs r0, r1 - str r0, [r4] -_08096804: - pop {r4} - pop {r0} - bx r0 - thumb_func_end GetGroundEffectFlags_LongGrassOnSpawn - - thumb_func_start GetGroundEffectFlags_LongGrassOnBeginStep -@ void GetGroundEffectFlags_LongGrassOnBeginStep(struct npc_state *fieldObject, u32 *flags) -GetGroundEffectFlags_LongGrassOnBeginStep: @ 809680C - push {r4,lr} - adds r4, r1, 0 - ldrb r0, [r0, 0x1E] - bl MetatileBehavior_IsLongGrass - lsls r0, 24 - cmp r0, 0 - beq _08096824 - ldr r0, [r4] - movs r1, 0x8 - orrs r0, r1 - str r0, [r4] -_08096824: - pop {r4} - pop {r0} - bx r0 - thumb_func_end GetGroundEffectFlags_LongGrassOnBeginStep - - thumb_func_start GetGroundEffectFlags_Tracks -@ void GetGroundEffectFlags_Tracks(struct npc_state *fieldObject, u32 *flags) -GetGroundEffectFlags_Tracks: @ 809682C - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - ldrb r0, [r4, 0x1F] - bl MetatileBehavior_IsDeepSand - lsls r0, 24 - cmp r0, 0 - beq _08096846 - ldr r0, [r5] - movs r1, 0x80 - lsls r1, 1 - b _08096862 -_08096846: - ldrb r0, [r4, 0x1F] - bl MetatileBehavior_IsSandOrDeepSand - lsls r0, 24 - cmp r0, 0 - bne _0809685E - ldrb r0, [r4, 0x1F] - bl MetatileBehavior_IsUnusedFootprintMetatile - lsls r0, 24 - cmp r0, 0 - beq _08096866 -_0809685E: - ldr r0, [r5] - movs r1, 0x80 -_08096862: - orrs r0, r1 - str r0, [r5] -_08096866: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end GetGroundEffectFlags_Tracks - - thumb_func_start GetGroundEffectFlags_SandHeap -@ void GetGroundEffectFlags_SandHeap(struct npc_state *fieldObject, u32 *flags) -GetGroundEffectFlags_SandHeap: @ 809686C - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - ldrb r0, [r4, 0x1E] - bl MetatileBehavior_IsDeepSand - lsls r0, 24 - cmp r0, 0 - beq _080968AA - ldrb r0, [r4, 0x1F] - bl MetatileBehavior_IsDeepSand - lsls r0, 24 - cmp r0, 0 - beq _080968AA - ldrb r1, [r4, 0x2] - lsls r0, r1, 27 - cmp r0, 0 - blt _080968B4 - movs r0, 0x11 - negs r0, r0 - ands r0, r1 - movs r1, 0x10 - orrs r0, r1 - strb r0, [r4, 0x2] - ldr r0, [r5] - movs r1, 0x80 - lsls r1, 4 - orrs r0, r1 - str r0, [r5] - b _080968B4 -_080968AA: - ldrb r1, [r4, 0x2] - movs r0, 0x11 - negs r0, r0 - ands r0, r1 - strb r0, [r4, 0x2] -_080968B4: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end GetGroundEffectFlags_SandHeap - - thumb_func_start GetGroundEffectFlags_ShallowFlowingWater -@ void GetGroundEffectFlags_ShallowFlowingWater(struct npc_state *fieldObject, u32 *flags) -GetGroundEffectFlags_ShallowFlowingWater: @ 80968BC - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - ldrb r0, [r4, 0x1E] - bl MetatileBehavior_IsShallowFlowingWater - lsls r0, 24 - cmp r0, 0 - beq _080968DA - ldrb r0, [r4, 0x1F] - bl MetatileBehavior_IsShallowFlowingWater - lsls r0, 24 - cmp r0, 0 - bne _080968F2 -_080968DA: - ldrb r0, [r4, 0x1E] - bl MetatileBehavior_IsPacifidlogLog - lsls r0, 24 - cmp r0, 0 - beq _08096910 - ldrb r0, [r4, 0x1F] - bl MetatileBehavior_IsPacifidlogLog - lsls r0, 24 - cmp r0, 0 - beq _08096910 -_080968F2: - ldrb r1, [r4, 0x2] - lsls r0, r1, 28 - cmp r0, 0 - blt _0809691A - movs r0, 0x9 - negs r0, r0 - ands r0, r1 - movs r1, 0x8 - orrs r0, r1 - strb r0, [r4, 0x2] - ldr r0, [r5] - movs r1, 0x40 - orrs r0, r1 - str r0, [r5] - b _0809691A -_08096910: - ldrb r1, [r4, 0x2] - movs r0, 0x9 - negs r0, r0 - ands r0, r1 - strb r0, [r4, 0x2] -_0809691A: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end GetGroundEffectFlags_ShallowFlowingWater - - thumb_func_start GetGroundEffectFlags_Puddle -@ void GetGroundEffectFlags_Puddle(struct npc_state *fieldObject, u32 *flags) -GetGroundEffectFlags_Puddle: @ 8096920 - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - ldrb r0, [r4, 0x1E] - bl MetatileBehavior_IsPuddle - lsls r0, 24 - cmp r0, 0 - beq _08096948 - ldrb r0, [r4, 0x1F] - bl MetatileBehavior_IsPuddle - lsls r0, 24 - cmp r0, 0 - beq _08096948 - ldr r0, [r5] - movs r1, 0x80 - lsls r1, 3 - orrs r0, r1 - str r0, [r5] -_08096948: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end GetGroundEffectFlags_Puddle - - thumb_func_start GetGroundEffectFlags_Ripple -@ void GetGroundEffectFlags_Ripple(struct npc_state *fieldObject, u32 *flags) -GetGroundEffectFlags_Ripple: @ 8096950 - push {r4,lr} - adds r4, r1, 0 - ldrb r0, [r0, 0x1E] - bl MetatileBehavior_HasRipples - lsls r0, 24 - cmp r0, 0 - beq _0809696A - ldr r0, [r4] - movs r1, 0x80 - lsls r1, 2 - orrs r0, r1 - str r0, [r4] -_0809696A: - pop {r4} - pop {r0} - bx r0 - thumb_func_end GetGroundEffectFlags_Ripple - - thumb_func_start GetGroundEffectFlags_ShortGrass -@ void GetGroundEffectFlags_ShortGrass(struct npc_state *fieldObject, u32 *flags) -GetGroundEffectFlags_ShortGrass: @ 8096970 - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - ldrb r0, [r4, 0x1E] - bl MetatileBehavior_IsShortGrass - lsls r0, 24 - cmp r0, 0 - beq _080969AE - ldrb r0, [r4, 0x1F] - bl MetatileBehavior_IsShortGrass - lsls r0, 24 - cmp r0, 0 - beq _080969AE - ldrb r1, [r4, 0x2] - lsls r0, r1, 29 - cmp r0, 0 - blt _080969B8 - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - movs r1, 0x4 - orrs r0, r1 - strb r0, [r4, 0x2] - ldr r0, [r5] - movs r1, 0x80 - lsls r1, 10 - orrs r0, r1 - str r0, [r5] - b _080969B8 -_080969AE: - ldrb r1, [r4, 0x2] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - strb r0, [r4, 0x2] -_080969B8: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end GetGroundEffectFlags_ShortGrass - - thumb_func_start GetGroundEffectFlags_HotSprings -@ void GetGroundEffectFlags_HotSprings(struct npc_state *fieldObject, u32 *flags) -GetGroundEffectFlags_HotSprings: @ 80969C0 - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - ldrb r0, [r4, 0x1E] - bl MetatileBehavior_IsHotSprings - lsls r0, 24 - cmp r0, 0 - beq _080969FE - ldrb r0, [r4, 0x1F] - bl MetatileBehavior_IsHotSprings - lsls r0, 24 - cmp r0, 0 - beq _080969FE - ldrb r1, [r4, 0x2] - lsls r0, r1, 26 - cmp r0, 0 - blt _08096A08 - movs r0, 0x21 - negs r0, r0 - ands r0, r1 - movs r1, 0x20 - orrs r0, r1 - strb r0, [r4, 0x2] - ldr r0, [r5] - movs r1, 0x80 - lsls r1, 11 - orrs r0, r1 - str r0, [r5] - b _08096A08 -_080969FE: - ldrb r1, [r4, 0x2] - movs r0, 0x21 - negs r0, r0 - ands r0, r1 - strb r0, [r4, 0x2] -_08096A08: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end GetGroundEffectFlags_HotSprings - - thumb_func_start GetGroundEffectFlags_Seaweed -@ void GetGroundEffectFlags_Seaweed(struct npc_state *fieldObject, u32 *flags) -GetGroundEffectFlags_Seaweed: @ 8096A10 - push {r4,lr} - adds r4, r1, 0 - ldrb r0, [r0, 0x1E] - bl MetatileBehavior_IsSeaweed - lsls r0, 24 - cmp r0, 0 - beq _08096A2A - ldr r0, [r4] - movs r1, 0x80 - lsls r1, 12 - orrs r0, r1 - str r0, [r4] -_08096A2A: - pop {r4} - pop {r0} - bx r0 - thumb_func_end GetGroundEffectFlags_Seaweed - - thumb_func_start GetGroundEffectFlags_JumpLanding -@ void GetGroundEffectFlags_JumpLanding(struct npc_state *fieldObject, u32 *flags) -GetGroundEffectFlags_JumpLanding: @ 8096A30 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r7, r0, 0 - adds r6, r1, 0 - ldr r0, [r7] - ldr r1, =0x02000020 - ands r0, r1 - cmp r0, 0x20 - bne _08096A82 - movs r5, 0 - ldr r0, =gUnknown_0850E5E4 - mov r8, r0 -_08096A4A: - lsls r4, r5, 2 - mov r0, r8 - adds r1, r4, r0 - ldrb r0, [r7, 0x1E] - ldr r1, [r1] - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - beq _08096A78 - ldr r0, =gUnknown_0850E5FC - adds r0, r4, r0 - ldr r1, [r6] - ldr r0, [r0] - orrs r1, r0 - str r1, [r6] - b _08096A82 - .pool -_08096A78: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x5 - bls _08096A4A -_08096A82: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end GetGroundEffectFlags_JumpLanding - - thumb_func_start FieldObjectCheckForReflectiveSurface -@ u8 FieldObjectCheckForReflectiveSurface(struct npc_state *fieldObject) -FieldObjectCheckForReflectiveSurface: @ 8096A8C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - adds r5, r0, 0 - ldrb r0, [r5, 0x5] - bl GetFieldObjectGraphicsInfo - movs r2, 0x8 - ldrsh r1, [r0, r2] - adds r1, 0x8 - lsls r1, 12 - lsrs r1, 16 - str r1, [sp] - movs r1, 0xA - ldrsh r0, [r0, r1] - adds r0, 0x8 - lsls r0, 12 - movs r4, 0 - lsrs r2, r0, 16 - str r2, [sp, 0x4] - asrs r0, 16 - cmp r4, r0 - blt _08096AC2 - b _08096BC8 -_08096AC2: - movs r0, 0x1 - mov r10, r0 -_08096AC6: - movs r1, 0x10 - ldrsh r0, [r5, r1] - movs r2, 0x12 - ldrsh r1, [r5, r2] - add r1, r10 - lsls r4, 16 - asrs r6, r4, 16 - adds r1, r6 - bl MapGridGetMetatileBehaviorAt - lsls r0, 24 - lsrs r0, 24 - bl GetReflectionTypeByMetatileBehavior - lsls r0, 24 - lsrs r0, 24 - mov r9, r4 - cmp r0, 0 - bne _08096BCA - movs r1, 0x14 - ldrsh r0, [r5, r1] - movs r2, 0x16 - ldrsh r1, [r5, r2] - add r1, r10 - adds r1, r6 - bl MapGridGetMetatileBehaviorAt - lsls r0, 24 - lsrs r0, 24 - bl GetReflectionTypeByMetatileBehavior - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0 - bne _08096BCA - movs r2, 0x1 - ldr r1, [sp] - lsls r0, r1, 16 - asrs r1, r0, 16 - mov r8, r0 - cmp r2, r1 - bge _08096BB6 - movs r0, 0x80 - lsls r0, 9 - asrs r7, r0, 16 -_08096B20: - movs r1, 0x10 - ldrsh r0, [r5, r1] - lsls r1, r2, 16 - asrs r4, r1, 16 - adds r0, r4 - movs r2, 0x12 - ldrsh r1, [r5, r2] - adds r1, r7 - adds r1, r6 - bl MapGridGetMetatileBehaviorAt - lsls r0, 24 - lsrs r0, 24 - bl GetReflectionTypeByMetatileBehavior - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0 - bne _08096BCA - movs r1, 0x10 - ldrsh r0, [r5, r1] - subs r0, r4 - movs r2, 0x12 - ldrsh r1, [r5, r2] - adds r1, r7 - adds r1, r6 - bl MapGridGetMetatileBehaviorAt - lsls r0, 24 - lsrs r0, 24 - bl GetReflectionTypeByMetatileBehavior - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0 - bne _08096BCA - movs r1, 0x14 - ldrsh r0, [r5, r1] - adds r0, r4 - movs r2, 0x16 - ldrsh r1, [r5, r2] - adds r1, r7 - adds r1, r6 - bl MapGridGetMetatileBehaviorAt - lsls r0, 24 - lsrs r0, 24 - bl GetReflectionTypeByMetatileBehavior - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0 - bne _08096BCA - movs r1, 0x14 - ldrsh r0, [r5, r1] - subs r0, r4 - movs r2, 0x16 - ldrsh r1, [r5, r2] - adds r1, r7 - adds r1, r6 - bl MapGridGetMetatileBehaviorAt - lsls r0, 24 - lsrs r0, 24 - bl GetReflectionTypeByMetatileBehavior - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0 - bne _08096BCA - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r0, r8 - blt _08096B20 -_08096BB6: - movs r1, 0x80 - lsls r1, 9 - add r1, r9 - lsrs r4, r1, 16 - ldr r2, [sp, 0x4] - lsls r0, r2, 16 - cmp r1, r0 - bge _08096BC8 - b _08096AC6 -_08096BC8: - movs r0, 0 -_08096BCA: - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end FieldObjectCheckForReflectiveSurface - - thumb_func_start GetReflectionTypeByMetatileBehavior -@ u8 GetReflectionTypeByMetatileBehavior(u8 metatileBehavior) -GetReflectionTypeByMetatileBehavior: @ 8096BDC - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - adds r0, r4, 0 - bl MetatileBehavior_IsIce - lsls r0, 24 - cmp r0, 0 - beq _08096BF2 - movs r0, 0x1 - b _08096C04 -_08096BF2: - adds r0, r4, 0 - bl MetatileBehavior_IsReflective - lsls r0, 24 - cmp r0, 0 - bne _08096C02 - movs r0, 0 - b _08096C04 -_08096C02: - movs r0, 0x2 -_08096C04: - pop {r4} - pop {r1} - bx r1 - thumb_func_end GetReflectionTypeByMetatileBehavior - - thumb_func_start GetLedgeJumpDirection -@ u8 GetLedgeJumpDirection(u16 x, u16 y, u8 direction) -GetLedgeJumpDirection: @ 8096C0C - push {r4,lr} - lsls r0, 16 - lsrs r3, r0, 16 - lsls r1, 16 - lsrs r1, 16 - lsls r2, 24 - lsrs r4, r2, 24 - cmp r4, 0 - beq _08096C52 - cmp r4, 0x4 - bls _08096C28 - subs r0, r4, 0x4 - lsls r0, 24 - lsrs r4, r0, 24 -_08096C28: - subs r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - lsls r0, r3, 16 - asrs r0, 16 - lsls r1, 16 - asrs r1, 16 - bl MapGridGetMetatileBehaviorAt - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gUnknown_0850E614 - lsls r1, r4, 2 - adds r1, r2 - ldr r1, [r1] - bl _call_via_r1 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08096C5C -_08096C52: - movs r0, 0 - b _08096C62 - .pool -_08096C5C: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r0, 24 -_08096C62: - pop {r4} - pop {r1} - bx r1 - thumb_func_end GetLedgeJumpDirection - - thumb_func_start FieldObjectSetSpriteOamTableForLongGrass -@ void FieldObjectSetSpriteOamTableForLongGrass(struct npc_state *fieldObject, struct obj *object) -FieldObjectSetSpriteOamTableForLongGrass: @ 8096C68 - push {r4-r6,lr} - adds r5, r0, 0 - adds r4, r1, 0 - ldrb r0, [r5] - lsls r0, 27 - cmp r0, 0 - blt _08096CBC - ldrb r0, [r5, 0x1E] - bl MetatileBehavior_IsLongGrass - lsls r0, 24 - cmp r0, 0 - beq _08096CBC - ldrb r0, [r5, 0x1F] - bl MetatileBehavior_IsLongGrass - lsls r0, 24 - cmp r0, 0 - beq _08096CBC - adds r4, 0x42 - ldrb r1, [r4] - movs r6, 0x40 - negs r6, r6 - adds r0, r6, 0 - ands r0, r1 - movs r1, 0x4 - orrs r0, r1 - strb r0, [r4] - ldrb r0, [r5, 0xB] - lsrs r0, 4 - bl ZCoordToPriority - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08096CBC - ldrb r0, [r4] - adds r1, r6, 0 - ands r1, r0 - movs r0, 0x5 - orrs r1, r0 - strb r1, [r4] -_08096CBC: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end FieldObjectSetSpriteOamTableForLongGrass - - thumb_func_start IsZCoordMismatchAt -@ bool8 IsZCoordMismatchAt(u8 z, u16 x, u16 y) -IsZCoordMismatchAt: @ 8096CC4 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - lsls r1, 16 - lsrs r0, r1, 16 - lsls r2, 16 - lsrs r1, r2, 16 - cmp r4, 0 - beq _08096CF2 - lsls r0, 16 - asrs r0, 16 - lsls r1, 16 - asrs r1, 16 - bl MapGridGetZCoordAt - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0 - beq _08096CF2 - cmp r0, 0xF - beq _08096CF2 - cmp r0, r4 - bne _08096CF6 -_08096CF2: - movs r0, 0 - b _08096CF8 -_08096CF6: - movs r0, 0x1 -_08096CF8: - pop {r4} - pop {r1} - bx r1 - thumb_func_end IsZCoordMismatchAt - - thumb_func_start FieldObjectUpdateZCoordAndPriority -@ void FieldObjectUpdateZCoordAndPriority(struct npc_state *fieldObject, struct obj *object) -FieldObjectUpdateZCoordAndPriority: @ 8096D00 - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - ldrb r0, [r4, 0x3] - lsls r0, 29 - cmp r0, 0 - blt _08096D4E - adds r0, r4, 0 - bl FieldObjectUpdateZCoord - ldr r1, =gUnknown_0850E644 - ldrb r2, [r4, 0xB] - lsls r2, 24 - lsrs r0, r2, 28 - adds r0, r1 - ldrb r0, [r0] - adds r4, r5, 0 - adds r4, 0x42 - movs r1, 0x3F - ands r1, r0 - ldrb r3, [r4] - movs r0, 0x40 - negs r0, r0 - ands r0, r3 - orrs r0, r1 - strb r0, [r4] - ldr r0, =gUnknown_0850E634 - lsrs r2, 28 - adds r2, r0 - movs r0, 0x3 - ldrb r1, [r2] - ands r1, r0 - lsls r1, 2 - ldrb r2, [r5, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r5, 0x5] -_08096D4E: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end FieldObjectUpdateZCoordAndPriority - - thumb_func_start InitObjectPriorityByZCoord -@ void InitObjectPriorityByZCoord(struct obj *object, u8 z) -InitObjectPriorityByZCoord: @ 8096D5C - push {r4,lr} - lsls r1, 24 - lsrs r1, 24 - ldr r2, =gUnknown_0850E644 - adds r2, r1, r2 - ldrb r2, [r2] - movs r3, 0x42 - adds r3, r0 - mov r12, r3 - movs r3, 0x3F - ands r3, r2 - mov r2, r12 - ldrb r4, [r2] - movs r2, 0x40 - negs r2, r2 - ands r2, r4 - orrs r2, r3 - mov r3, r12 - strb r2, [r3] - ldr r2, =gUnknown_0850E634 - adds r1, r2 - movs r3, 0x3 - ldrb r2, [r1] - ands r2, r3 - lsls r2, 2 - ldrb r3, [r0, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r3 - orrs r1, r2 - strb r1, [r0, 0x5] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end InitObjectPriorityByZCoord - - thumb_func_start ZCoordToPriority -@ u8 ZCoordToPriority(u8 z) -ZCoordToPriority: @ 8096DA8 - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gUnknown_0850E634 - adds r0, r1 - ldrb r0, [r0] - bx lr - .pool - thumb_func_end ZCoordToPriority - - thumb_func_start FieldObjectUpdateZCoord -@ void FieldObjectUpdateZCoord(struct npc_state *fieldObject) -FieldObjectUpdateZCoord: @ 8096DB8 - push {r4,r5,lr} - adds r4, r0, 0 - movs r1, 0x10 - ldrsh r0, [r4, r1] - movs r2, 0x12 - ldrsh r1, [r4, r2] - bl MapGridGetZCoordAt - lsls r0, 24 - lsrs r5, r0, 24 - movs r1, 0x14 - ldrsh r0, [r4, r1] - movs r2, 0x16 - ldrsh r1, [r4, r2] - bl MapGridGetZCoordAt - lsls r0, 24 - lsrs r0, 24 - cmp r5, 0xF - beq _08096E06 - cmp r0, 0xF - beq _08096E06 - movs r3, 0xF - adds r0, r5, 0 - ands r0, r3 - ldrb r1, [r4, 0xB] - movs r2, 0x10 - negs r2, r2 - ands r2, r1 - orrs r2, r0 - strb r2, [r4, 0xB] - cmp r5, 0 - beq _08096E06 - cmp r5, 0xF - beq _08096E06 - lsls r0, r5, 4 - ands r2, r3 - orrs r2, r0 - strb r2, [r4, 0xB] -_08096E06: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end FieldObjectUpdateZCoord - - thumb_func_start SetObjectSubpriorityByZCoord -@ void SetObjectSubpriorityByZCoord(u8 z, struct obj *object, u8 offset) -SetObjectSubpriorityByZCoord: @ 8096E0C - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r2, 24 - lsrs r2, 24 - adds r3, r1, 0 - adds r3, 0x29 - movs r5, 0 - ldrsb r5, [r3, r5] - ldrh r4, [r1, 0x22] - ldr r3, =gSpriteCoordOffsetY - subs r4, r5 - ldrh r3, [r3] - adds r4, r3 - adds r4, 0x8 - movs r3, 0xFF - ands r4, r3 - lsrs r4, 4 - movs r3, 0x10 - subs r3, r4 - lsls r3, 17 - ldr r4, =gUnknown_0850E624 - adds r0, r4 - lsrs r3, 16 - ldrb r0, [r0] - adds r3, r0 - adds r2, r3 - adds r1, 0x43 - strb r2, [r1] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end SetObjectSubpriorityByZCoord - - thumb_func_start FieldObjectUpdateSubpriority -@ void FieldObjectUpdateSubpriority(struct npc_state *fieldObject, struct obj *object) -FieldObjectUpdateSubpriority: @ 8096E54 - push {lr} - adds r2, r0, 0 - ldrb r0, [r2, 0x3] - lsls r0, 29 - cmp r0, 0 - blt _08096E6A - ldrb r0, [r2, 0xB] - lsrs r0, 4 - movs r2, 0x1 - bl SetObjectSubpriorityByZCoord -_08096E6A: - pop {r0} - bx r0 - thumb_func_end FieldObjectUpdateSubpriority - - thumb_func_start AreZCoordsCompatible -@ bool8 AreZCoordsCompatible(u8 z1, u8 z2) -AreZCoordsCompatible: @ 8096E70 - push {lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r1, 24 - cmp r0, 0 - beq _08096E86 - cmp r1, 0 - beq _08096E86 - cmp r0, r1 - bne _08096E8A -_08096E86: - movs r0, 0x1 - b _08096E8C -_08096E8A: - movs r0, 0 -_08096E8C: - pop {r1} - bx r1 - thumb_func_end AreZCoordsCompatible - - thumb_func_start GroundEffect_SpawnOnTallGrass -@ void GroundEffect_SpawnOnTallGrass(struct npc_state *fieldObject, struct obj *object) -GroundEffect_SpawnOnTallGrass: @ 8096E90 - push {lr} - ldr r3, =gFieldEffectArguments - movs r2, 0x10 - ldrsh r1, [r0, r2] - str r1, [r3] - movs r2, 0x12 - ldrsh r1, [r0, r2] - str r1, [r3, 0x4] - ldrb r1, [r0, 0xB] - lsrs r1, 4 - str r1, [r3, 0x8] - movs r1, 0x2 - str r1, [r3, 0xC] - ldrb r1, [r0, 0x8] - lsls r1, 8 - ldrb r2, [r0, 0x9] - orrs r1, r2 - str r1, [r3, 0x10] - ldrb r0, [r0, 0xA] - str r0, [r3, 0x14] - ldr r0, =gSaveBlock1Ptr - ldr r1, [r0] - ldrb r0, [r1, 0x5] - lsls r0, 8 - ldrb r1, [r1, 0x4] - orrs r0, r1 - str r0, [r3, 0x18] - movs r0, 0x1 - str r0, [r3, 0x1C] - movs r0, 0x4 - bl FieldEffectStart - pop {r0} - bx r0 - .pool - thumb_func_end GroundEffect_SpawnOnTallGrass - - thumb_func_start GroundEffect_StepOnTallGrass -@ void GroundEffect_StepOnTallGrass(struct npc_state *fieldObject, struct obj *object) -GroundEffect_StepOnTallGrass: @ 8096EDC - push {lr} - ldr r3, =gFieldEffectArguments - movs r2, 0x10 - ldrsh r1, [r0, r2] - str r1, [r3] - movs r2, 0x12 - ldrsh r1, [r0, r2] - str r1, [r3, 0x4] - ldrb r1, [r0, 0xB] - lsrs r1, 4 - str r1, [r3, 0x8] - movs r1, 0x2 - str r1, [r3, 0xC] - ldrb r1, [r0, 0x8] - lsls r1, 8 - ldrb r2, [r0, 0x9] - orrs r1, r2 - str r1, [r3, 0x10] - ldrb r0, [r0, 0xA] - str r0, [r3, 0x14] - ldr r0, =gSaveBlock1Ptr - ldr r1, [r0] - ldrb r0, [r1, 0x5] - lsls r0, 8 - ldrb r1, [r1, 0x4] - orrs r0, r1 - str r0, [r3, 0x18] - movs r0, 0 - str r0, [r3, 0x1C] - movs r0, 0x4 - bl FieldEffectStart - pop {r0} - bx r0 - .pool - thumb_func_end GroundEffect_StepOnTallGrass - - thumb_func_start GroundEffect_SpawnOnLongGrass -@ void GroundEffect_SpawnOnLongGrass(struct npc_state *fieldObject, struct obj *object) -GroundEffect_SpawnOnLongGrass: @ 8096F28 - push {lr} - ldr r3, =gFieldEffectArguments - movs r2, 0x10 - ldrsh r1, [r0, r2] - str r1, [r3] - movs r2, 0x12 - ldrsh r1, [r0, r2] - str r1, [r3, 0x4] - ldrb r1, [r0, 0xB] - lsrs r1, 4 - str r1, [r3, 0x8] - movs r1, 0x2 - str r1, [r3, 0xC] - ldrb r1, [r0, 0x8] - lsls r1, 8 - ldrb r2, [r0, 0x9] - orrs r1, r2 - str r1, [r3, 0x10] - ldrb r0, [r0, 0xA] - str r0, [r3, 0x14] - ldr r0, =gSaveBlock1Ptr - ldr r1, [r0] - ldrb r0, [r1, 0x5] - lsls r0, 8 - ldrb r1, [r1, 0x4] - orrs r0, r1 - str r0, [r3, 0x18] - movs r0, 0x1 - str r0, [r3, 0x1C] - movs r0, 0x11 - bl FieldEffectStart - pop {r0} - bx r0 - .pool - thumb_func_end GroundEffect_SpawnOnLongGrass - - thumb_func_start GroundEffect_StepOnLongGrass -@ void GroundEffect_StepOnLongGrass(struct npc_state *fieldObject, struct obj *object) -GroundEffect_StepOnLongGrass: @ 8096F74 - push {lr} - ldr r3, =gFieldEffectArguments - movs r2, 0x10 - ldrsh r1, [r0, r2] - str r1, [r3] - movs r2, 0x12 - ldrsh r1, [r0, r2] - str r1, [r3, 0x4] - ldrb r1, [r0, 0xB] - lsrs r1, 4 - str r1, [r3, 0x8] - movs r1, 0x2 - str r1, [r3, 0xC] - ldrb r1, [r0, 0x8] - lsls r1, 8 - ldrb r2, [r0, 0x9] - orrs r1, r2 - str r1, [r3, 0x10] - ldrb r0, [r0, 0xA] - str r0, [r3, 0x14] - ldr r0, =gSaveBlock1Ptr - ldr r1, [r0] - ldrb r0, [r1, 0x5] - lsls r0, 8 - ldrb r1, [r1, 0x4] - orrs r0, r1 - str r0, [r3, 0x18] - movs r0, 0 - str r0, [r3, 0x1C] - movs r0, 0x11 - bl FieldEffectStart - pop {r0} - bx r0 - .pool - thumb_func_end GroundEffect_StepOnLongGrass - - thumb_func_start GroundEffect_WaterReflection -@ void GroundEffect_WaterReflection(struct npc_state *fieldObject, struct obj *object) -GroundEffect_WaterReflection: @ 8096FC0 - push {lr} - movs r2, 0 - bl SetUpReflection - pop {r0} - bx r0 - thumb_func_end GroundEffect_WaterReflection - - thumb_func_start GroundEffect_IceReflection -@ void GroundEffect_IceReflection(struct npc_state *fieldObject, struct obj *object) -GroundEffect_IceReflection: @ 8096FCC - push {lr} - movs r2, 0x1 - bl SetUpReflection - pop {r0} - bx r0 - thumb_func_end GroundEffect_IceReflection - - thumb_func_start GroundEffect_FlowingWater -@ void GroundEffect_FlowingWater(struct npc_state *fieldObject, struct obj *object) -GroundEffect_FlowingWater: @ 8096FD8 - push {lr} - adds r1, r0, 0 - movs r0, 0x22 - bl oe_exec_and_other_stuff - pop {r0} - bx r0 - thumb_func_end GroundEffect_FlowingWater - - thumb_func_start GroundEffect_SandTracks -@ void GroundEffect_SandTracks(struct npc_state *fieldObject, struct obj *object) -GroundEffect_SandTracks: @ 8096FE8 - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - ldrb r0, [r4, 0x5] - bl GetFieldObjectGraphicsInfo - ldr r1, =gUnknown_0850E654 - ldrb r0, [r0, 0xD] - lsls r0, 2 - adds r0, r1 - ldr r3, [r0] - adds r0, r4, 0 - adds r1, r5, 0 - movs r2, 0 - bl _call_via_r3 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end GroundEffect_SandTracks - - thumb_func_start GroundEffect_DeepSandTracks -@ void GroundEffect_DeepSandTracks(struct npc_state *fieldObject, struct obj *object) -GroundEffect_DeepSandTracks: @ 8097014 - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - ldrb r0, [r4, 0x5] - bl GetFieldObjectGraphicsInfo - ldr r1, =gUnknown_0850E654 - ldrb r0, [r0, 0xD] - lsls r0, 2 - adds r0, r1 - ldr r3, [r0] - adds r0, r4, 0 - adds r1, r5, 0 - movs r2, 0x1 - bl _call_via_r3 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end GroundEffect_DeepSandTracks - - thumb_func_start DoTracksGroundEffect_None -@ void DoTracksGroundEffect_None(struct npc_state *fieldObject, struct obj *object) -DoTracksGroundEffect_None: @ 8097040 - bx lr - thumb_func_end DoTracksGroundEffect_None - - thumb_func_start DoTracksGroundEffect_Footprints -@ void DoTracksGroundEffect_Footprints(struct npc_state *fieldObject, struct obj *object) -DoTracksGroundEffect_Footprints: @ 8097044 - push {r4,r5,lr} - sub sp, 0x4 - adds r5, r0, 0 - lsls r4, r2, 24 - lsrs r4, 24 - ldr r1, =gUnknown_0850E660 - mov r0, sp - movs r2, 0x4 - bl memcpy - ldr r1, =gFieldEffectArguments - movs r2, 0x14 - ldrsh r0, [r5, r2] - str r0, [r1] - movs r2, 0x16 - ldrsh r0, [r5, r2] - str r0, [r1, 0x4] - movs r0, 0x95 - str r0, [r1, 0x8] - movs r0, 0x2 - str r0, [r1, 0xC] - ldrb r0, [r5, 0x18] - lsls r0, 28 - lsrs r0, 28 - str r0, [r1, 0x10] - lsls r4, 1 - mov r1, sp - adds r0, r1, r4 - ldrb r0, [r0] - bl FieldEffectStart - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end DoTracksGroundEffect_Footprints - - thumb_func_start DoTracksGroundEffect_BikeTireTracks -@ void DoTracksGroundEffect_BikeTireTracks(struct npc_state *fieldObject, struct obj *object) -DoTracksGroundEffect_BikeTireTracks: @ 8097094 - push {r4,lr} - adds r4, r0, 0 - ldr r1, [r4, 0x10] - ldr r0, [r4, 0x14] - cmp r1, r0 - beq _080970D6 - ldr r2, =gFieldEffectArguments - movs r1, 0x14 - ldrsh r0, [r4, r1] - str r0, [r2] - movs r1, 0x16 - ldrsh r0, [r4, r1] - str r0, [r2, 0x4] - movs r0, 0x95 - str r0, [r2, 0x8] - movs r0, 0x2 - str r0, [r2, 0xC] - ldr r3, =gUnknown_0850E664 - ldrb r1, [r4, 0x18] - lsls r1, 28 - lsrs r1, 28 - adds r0, r4, 0 - adds r0, 0x20 - ldrb r0, [r0] - lsls r0, 2 - subs r0, 0x5 - adds r1, r0 - adds r1, r3 - ldrb r0, [r1] - str r0, [r2, 0x10] - movs r0, 0x23 - bl FieldEffectStart -_080970D6: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end DoTracksGroundEffect_BikeTireTracks - - thumb_func_start GroundEffect_Ripple -@ void GroundEffect_Ripple(struct npc_state *fieldObject, struct obj *object) -GroundEffect_Ripple: @ 80970E4 - push {lr} - bl DoRippleFieldEffect - pop {r0} - bx r0 - thumb_func_end GroundEffect_Ripple - - thumb_func_start GroundEffect_StepOnPuddle -@ void GroundEffect_StepOnPuddle(struct npc_state *fieldObject, struct obj *object) -GroundEffect_StepOnPuddle: @ 80970F0 - push {lr} - adds r1, r0, 0 - movs r0, 0xF - bl oe_exec_and_other_stuff - pop {r0} - bx r0 - thumb_func_end GroundEffect_StepOnPuddle - - thumb_func_start GroundEffect_SandHeap -@ void GroundEffect_SandHeap(struct npc_state *fieldObject, struct obj *object) -GroundEffect_SandHeap: @ 8097100 - push {lr} - adds r1, r0, 0 - movs r0, 0x27 - bl oe_exec_and_other_stuff - pop {r0} - bx r0 - thumb_func_end GroundEffect_SandHeap - - thumb_func_start GroundEffect_JumpOnTallGrass -@ void GroundEffect_JumpOnTallGrass(struct npc_state *fieldObject, struct obj *object) -GroundEffect_JumpOnTallGrass: @ 8097110 - push {r4-r7,lr} - sub sp, 0x4 - adds r5, r0, 0 - adds r6, r1, 0 - ldr r1, =gFieldEffectArguments - movs r2, 0x10 - ldrsh r0, [r5, r2] - str r0, [r1] - movs r4, 0x12 - ldrsh r0, [r5, r4] - str r0, [r1, 0x4] - ldrb r0, [r5, 0xB] - lsrs r0, 4 - str r0, [r1, 0x8] - movs r0, 0x2 - str r0, [r1, 0xC] - movs r0, 0xC - bl FieldEffectStart - ldrb r0, [r5, 0x8] - ldrb r1, [r5, 0x9] - ldrb r2, [r5, 0xA] - movs r7, 0x10 - ldrsh r3, [r5, r7] - movs r7, 0x12 - ldrsh r4, [r5, r7] - str r4, [sp] - bl sub_81546C8 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x40 - bne _0809715A - adds r0, r5, 0 - adds r1, r6, 0 - bl GroundEffect_SpawnOnTallGrass -_0809715A: - add sp, 0x4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end GroundEffect_JumpOnTallGrass - - thumb_func_start GroundEffect_JumpOnLongGrass -@ void GroundEffect_JumpOnLongGrass(struct npc_state *fieldObject, struct obj *object) -GroundEffect_JumpOnLongGrass: @ 8097168 - push {lr} - ldr r2, =gFieldEffectArguments - movs r3, 0x10 - ldrsh r1, [r0, r3] - str r1, [r2] - movs r3, 0x12 - ldrsh r1, [r0, r3] - str r1, [r2, 0x4] - ldrb r0, [r0, 0xB] - lsrs r0, 4 - str r0, [r2, 0x8] - movs r0, 0x2 - str r0, [r2, 0xC] - movs r0, 0x12 - bl FieldEffectStart - pop {r0} - bx r0 - .pool - thumb_func_end GroundEffect_JumpOnLongGrass - - thumb_func_start GroundEffect_JumpOnShallowWater -@ void GroundEffect_JumpOnShallowWater(struct npc_state *fieldObject, struct obj *object) -GroundEffect_JumpOnShallowWater: @ 8097190 - push {r4,lr} - ldr r3, =gFieldEffectArguments - movs r4, 0x10 - ldrsh r2, [r0, r4] - str r2, [r3] - movs r4, 0x12 - ldrsh r2, [r0, r4] - str r2, [r3, 0x4] - ldrb r0, [r0, 0xB] - lsrs r0, 4 - str r0, [r3, 0x8] - ldrb r0, [r1, 0x5] - lsls r0, 28 - lsrs r0, 30 - str r0, [r3, 0xC] - movs r0, 0x10 - bl FieldEffectStart - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end GroundEffect_JumpOnShallowWater - - thumb_func_start GroundEffect_JumpOnWater -@ void GroundEffect_JumpOnWater(struct npc_state *fieldObject, struct obj *object) -GroundEffect_JumpOnWater: @ 80971C0 - push {r4,lr} - ldr r3, =gFieldEffectArguments - movs r4, 0x10 - ldrsh r2, [r0, r4] - str r2, [r3] - movs r4, 0x12 - ldrsh r2, [r0, r4] - str r2, [r3, 0x4] - ldrb r0, [r0, 0xB] - lsrs r0, 4 - str r0, [r3, 0x8] - ldrb r0, [r1, 0x5] - lsls r0, 28 - lsrs r0, 30 - str r0, [r3, 0xC] - movs r0, 0xE - bl FieldEffectStart - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end GroundEffect_JumpOnWater - - thumb_func_start GroundEffect_JumpLandingDust -@ void GroundEffect_JumpLandingDust(struct npc_state *fieldObject, struct obj *object) -GroundEffect_JumpLandingDust: @ 80971F0 - push {r4,lr} - ldr r3, =gFieldEffectArguments - movs r4, 0x10 - ldrsh r2, [r0, r4] - str r2, [r3] - movs r4, 0x12 - ldrsh r2, [r0, r4] - str r2, [r3, 0x4] - ldrb r0, [r0, 0xB] - lsrs r0, 4 - str r0, [r3, 0x8] - ldrb r0, [r1, 0x5] - lsls r0, 28 - lsrs r0, 30 - str r0, [r3, 0xC] - movs r0, 0xA - bl FieldEffectStart - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end GroundEffect_JumpLandingDust - - thumb_func_start GroundEffect_ShortGrass -@ void GroundEffect_ShortGrass(struct npc_state *fieldObject, struct obj *object) -GroundEffect_ShortGrass: @ 8097220 - push {lr} - adds r1, r0, 0 - movs r0, 0x29 - bl oe_exec_and_other_stuff - pop {r0} - bx r0 - thumb_func_end GroundEffect_ShortGrass - - thumb_func_start GroundEffect_HotSprings -@ void GroundEffect_HotSprings(struct npc_state *fieldObject, struct obj *object) -GroundEffect_HotSprings: @ 8097230 - push {lr} - adds r1, r0, 0 - movs r0, 0x2A - bl oe_exec_and_other_stuff - pop {r0} - bx r0 - thumb_func_end GroundEffect_HotSprings - - thumb_func_start GroundEffect_Seaweed -@ void GroundEffect_Seaweed(struct npc_state *fieldObject, struct obj *object) -GroundEffect_Seaweed: @ 8097240 - push {lr} - ldr r2, =gFieldEffectArguments - movs r3, 0x10 - ldrsh r1, [r0, r3] - str r1, [r2] - movs r1, 0x12 - ldrsh r0, [r0, r1] - str r0, [r2, 0x4] - movs r0, 0x35 - bl FieldEffectStart - pop {r0} - bx r0 - .pool - thumb_func_end GroundEffect_Seaweed - - thumb_func_start DoFlaggedGroundEffects -@ void DoFlaggedGroundEffects(struct npc_state *fieldObject, struct obj *object, u32 flags) -DoFlaggedGroundEffects: @ 8097260 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r6, r0, 0 - adds r7, r1, 0 - adds r5, r2, 0 - bl FieldObjectIsFarawayIslandMew - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08097284 - adds r0, r6, 0 - bl sub_81D4A58 - lsls r0, 24 - cmp r0, 0 - beq _080972AC -_08097284: - movs r4, 0 - ldr r0, =gUnknown_0850E674 - mov r8, r0 -_0809728A: - movs r0, 0x1 - ands r0, r5 - cmp r0, 0 - beq _080972A0 - lsls r0, r4, 2 - add r0, r8 - ldr r2, [r0] - adds r0, r6, 0 - adds r1, r7, 0 - bl _call_via_r2 -_080972A0: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - lsrs r5, 1 - cmp r4, 0x13 - bls _0809728A -_080972AC: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end DoFlaggedGroundEffects - - thumb_func_start filters_out_some_ground_effects -@ void filters_out_some_ground_effects(struct npc_state *fieldObject, u32 *flags) -filters_out_some_ground_effects: @ 80972BC - push {lr} - adds r2, r0, 0 - adds r3, r1, 0 - ldrb r0, [r2] - lsls r0, 27 - cmp r0, 0 - bge _080972EA - ldrb r1, [r2, 0x2] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - movs r1, 0x11 - negs r1, r1 - ands r0, r1 - adds r1, 0x8 - ands r0, r1 - subs r1, 0x18 - ands r0, r1 - strb r0, [r2, 0x2] - ldr r0, [r3] - ldr r1, =0xfff9f7bd - ands r0, r1 - str r0, [r3] -_080972EA: - pop {r0} - bx r0 - .pool - thumb_func_end filters_out_some_ground_effects - - thumb_func_start FilterOutStepOnPuddleGroundEffectIfJumping -@ void FilterOutStepOnPuddleGroundEffectIfJumping(struct npc_state *fieldObject, u32 *flags) -FilterOutStepOnPuddleGroundEffectIfJumping: @ 80972F4 - push {lr} - adds r2, r1, 0 - ldrb r0, [r0] - lsls r0, 26 - cmp r0, 0 - bge _08097308 - ldr r0, [r2] - ldr r1, =0xfffffbff - ands r0, r1 - str r0, [r2] -_08097308: - pop {r0} - bx r0 - .pool - thumb_func_end FilterOutStepOnPuddleGroundEffectIfJumping - - thumb_func_start DoGroundEffects_OnSpawn -@ void DoGroundEffects_OnSpawn(struct npc_state *fieldObject, struct obj *object) -DoGroundEffects_OnSpawn: @ 8097310 - push {r4,r5,lr} - sub sp, 0x4 - adds r4, r0, 0 - adds r5, r1, 0 - ldrb r0, [r4] - lsls r0, 29 - cmp r0, 0 - bge _08097354 - movs r0, 0 - str r0, [sp] - adds r0, r4, 0 - bl FieldObjectUpdateZCoordAndPriority - adds r0, r4, 0 - mov r1, sp - bl GetAllGroundEffectFlags_OnSpawn - adds r0, r4, 0 - adds r1, r5, 0 - bl FieldObjectSetSpriteOamTableForLongGrass - ldr r2, [sp] - adds r0, r4, 0 - adds r1, r5, 0 - bl DoFlaggedGroundEffects - ldrb r1, [r4] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - movs r1, 0x11 - negs r1, r1 - ands r0, r1 - strb r0, [r4] -_08097354: - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end DoGroundEffects_OnSpawn - - thumb_func_start DoGroundEffects_OnBeginStep -@ void DoGroundEffects_OnBeginStep(struct npc_state *fieldObject, struct obj *object) -DoGroundEffects_OnBeginStep: @ 809735C - push {r4,r5,lr} - sub sp, 0x4 - adds r4, r0, 0 - adds r5, r1, 0 - ldrb r0, [r4] - lsls r0, 29 - cmp r0, 0 - bge _080973A8 - movs r0, 0 - str r0, [sp] - adds r0, r4, 0 - bl FieldObjectUpdateZCoordAndPriority - adds r0, r4, 0 - mov r1, sp - bl GetAllGroundEffectFlags_OnBeginStep - adds r0, r4, 0 - adds r1, r5, 0 - bl FieldObjectSetSpriteOamTableForLongGrass - adds r0, r4, 0 - mov r1, sp - bl filters_out_some_ground_effects - ldr r2, [sp] - adds r0, r4, 0 - adds r1, r5, 0 - bl DoFlaggedGroundEffects - ldrb r1, [r4] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - movs r1, 0x11 - negs r1, r1 - ands r0, r1 - strb r0, [r4] -_080973A8: - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end DoGroundEffects_OnBeginStep - - thumb_func_start DoGroundEffects_OnFinishStep -@ void DoGroundEffects_OnFinishStep(struct npc_state *fieldObject, struct obj *object) -DoGroundEffects_OnFinishStep: @ 80973B0 - push {r4,r5,lr} - sub sp, 0x4 - adds r4, r0, 0 - adds r5, r1, 0 - ldrb r0, [r4] - lsls r0, 28 - cmp r0, 0 - bge _080973FC - movs r0, 0 - str r0, [sp] - adds r0, r4, 0 - bl FieldObjectUpdateZCoordAndPriority - adds r0, r4, 0 - mov r1, sp - bl GetAllGroundEffectFlags_OnFinishStep - adds r0, r4, 0 - adds r1, r5, 0 - bl FieldObjectSetSpriteOamTableForLongGrass - adds r0, r4, 0 - mov r1, sp - bl FilterOutStepOnPuddleGroundEffectIfJumping - ldr r2, [sp] - adds r0, r4, 0 - adds r1, r5, 0 - bl DoFlaggedGroundEffects - ldrb r1, [r4] - movs r0, 0x9 - negs r0, r0 - ands r0, r1 - movs r1, 0x21 - negs r1, r1 - ands r0, r1 - strb r0, [r4] -_080973FC: - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end DoGroundEffects_OnFinishStep - - .align 2, 0 @ Don't pad with nop. diff --git a/data/field_ground_effect.s b/data/field_ground_effect.s index 989d2add76..686d9396b7 100644 --- a/data/field_ground_effect.s +++ b/data/field_ground_effect.s @@ -4,66 +4,3 @@ .section .rodata .align 2, 0 -gUnknown_0850E5DC:: @ 850E5DC - .4byte 0x00000020, 0x00000010 - -gUnknown_0850E5E4:: @ 850E5E4 - .4byte MetatileBehavior_IsTallGrass - .4byte MetatileBehavior_IsLongGrass - .4byte MetatileBehavior_IsPuddle - .4byte MetatileBehavior_IsSurfableWaterOrUnderwater - .4byte MetatileBehavior_IsShallowFlowingWater - .4byte ShouldDoJumpLandingDustEffect - -gUnknown_0850E5FC:: @ 850E5FC - .4byte 0x00001000, 0x00002000, 0x00004000, 0x00008000, 0x00004000, 0x00010000 - -gUnknown_0850E614:: @ 850E614 - .4byte MetatileBehavior_IsJumpSouth - .4byte MetatileBehavior_IsJumpNorth - .4byte MetatileBehavior_IsJumpWest - .4byte MetatileBehavior_IsJumpEast - -gUnknown_0850E624:: @ 850E624 - .byte 0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73 - -gUnknown_0850E634:: @ 850E634 - .byte 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x02 - -gUnknown_0850E644:: @ 850E644 - .byte 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01 - -gUnknown_0850E654:: @ 850E654 - .4byte DoTracksGroundEffect_None - .4byte DoTracksGroundEffect_Footprints - .4byte DoTracksGroundEffect_BikeTireTracks - -gUnknown_0850E660:: @ 850E660 - .byte 13, 0 - .byte 24, 0 - -gUnknown_0850E664:: @ 850E664 - .byte 0x01, 0x02, 0x07, 0x08, 0x01, 0x02, 0x06, 0x05, 0x05, 0x08, 0x03, 0x04, 0x06, 0x07, 0x03, 0x04 - -gUnknown_0850E674:: @ 850E674 - .4byte GroundEffect_SpawnOnTallGrass - .4byte GroundEffect_StepOnTallGrass - .4byte GroundEffect_SpawnOnLongGrass - .4byte GroundEffect_StepOnLongGrass - .4byte GroundEffect_WaterReflection - .4byte GroundEffect_IceReflection - .4byte GroundEffect_FlowingWater - .4byte GroundEffect_SandTracks - .4byte GroundEffect_DeepSandTracks - .4byte GroundEffect_Ripple - .4byte GroundEffect_StepOnPuddle - .4byte GroundEffect_SandHeap - .4byte GroundEffect_JumpOnTallGrass - .4byte GroundEffect_JumpOnLongGrass - .4byte GroundEffect_JumpOnShallowWater - .4byte GroundEffect_JumpOnWater - .4byte GroundEffect_JumpLandingDust - .4byte GroundEffect_ShortGrass - .4byte GroundEffect_HotSprings - .4byte GroundEffect_Seaweed - diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 7fd1fc93ad..4e0d4ad229 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -20,6 +20,27 @@ enum SpinnerRunnerFollowPatterns { RUNFOLLOW_SOUTH_EAST_WEST }; +#define GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN (1 << 0) +#define GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE (1 << 1) +#define GROUND_EFFECT_FLAG_LONG_GRASS_ON_SPAWN (1 << 2) +#define GROUND_EFFECT_FLAG_LONG_GRASS_ON_MOVE (1 << 3) +#define GROUND_EFFECT_FLAG_ICE_REFLECTION (1 << 4) +#define GROUND_EFFECT_FLAG_REFLECTION (1 << 5) +#define GROUND_EFFECT_FLAG_SHALLOW_FLOWING_WATER (1 << 6) +#define GROUND_EFFECT_FLAG_SAND (1 << 7) +#define GROUND_EFFECT_FLAG_DEEP_SAND (1 << 8) +#define GROUND_EFFECT_FLAG_RIPPLES (1 << 9) +#define GROUND_EFFECT_FLAG_PUDDLE (1 << 10) +#define GROUND_EFFECT_FLAG_SAND_PILE (1 << 11) +#define GROUND_EFFECT_FLAG_LAND_IN_TALL_GRASS (1 << 12) +#define GROUND_EFFECT_FLAG_LAND_IN_LONG_GRASS (1 << 13) +#define GROUND_EFFECT_FLAG_LAND_IN_SHALLOW_WATER (1 << 14) +#define GROUND_EFFECT_FLAG_LAND_IN_DEEP_WATER (1 << 15) +#define GROUND_EFFECT_FLAG_LAND_ON_NORMAL_GROUND (1 << 16) +#define GROUND_EFFECT_FLAG_SHORT_GRASS (1 << 17) +#define GROUND_EFFECT_FLAG_HOT_SPRINGS (1 << 18) +#define GROUND_EFFECT_FLAG_SEAWEED (1 << 19) + // Exported RAM declarations // Exported ROM declarations @@ -95,6 +116,11 @@ u8 AddCameraObject(u8 linkedSpriteId); void UpdateFieldObjectsForCameraUpdate(s16 x, s16 y); u8 GetSimpleGoAnimId(u32); u8 sub_8093514(u32); +bool8 AreZCoordsCompatible(u8, u8); +u8 ZCoordToPriority(u8); +void FieldObjectUpdateZCoord(struct MapObject *pObject); +void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8); +bool8 IsZCoordMismatchAt(u8, s16, s16); // Exported data declarations diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index 3c9e00b62a..faf6290e44 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -15,5 +15,8 @@ bool8 sub_8155DA0(struct MapObject *); void sub_8155D78(struct MapObject *); void sub_81555AC(u8, u8); void ash(s16, s16, u16, s16); +void SetUpReflection(struct MapObject*, struct Sprite*, u8); +u32 StartFieldEffectForEventObject(u8, struct MapObject*); +u8 sub_81546C8(u8, u8, u8, s16, s16); #endif //GUARD_FIELD_EFFECT_HELPERS_H diff --git a/include/field_ground_effect.h b/include/field_ground_effect.h deleted file mode 100644 index 89b14aed1c..0000000000 --- a/include/field_ground_effect.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// Created by scott on 9/6/2017. -// - -#ifndef GUARD_FIELD_GROUND_EFFECT_H -#define GUARD_FIELD_GROUND_EFFECT_H - -// Exported type declarations - -// Exported RAM declarations - -// Exported ROM declarations -u8 ZCoordToPriority(u8); -void FieldObjectUpdateZCoord(struct MapObject *pObject); -void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8); -void InitObjectPriorityByZCoord(struct Sprite *, u8); -bool8 IsZCoordMismatchAt(u8, s16, s16); -bool8 AreZCoordsCompatible(u8, u8); -void FieldObjectUpdateSubpriority(struct MapObject *, struct Sprite *); -void DoGroundEffects_OnSpawn(struct MapObject *, struct Sprite *); -void DoGroundEffects_OnBeginStep(struct MapObject *, struct Sprite *); -void DoGroundEffects_OnFinishStep(struct MapObject *, struct Sprite *); - -#endif //GUARD_FIELD_GROUND_EFFECT_H diff --git a/include/fieldmap.h b/include/fieldmap.h index 699595580b..01218493ab 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -14,6 +14,7 @@ int CanCameraMoveInDirection(int direction); u16 GetBehaviorByMetatileId(u16 metatileId); void sav1_camera_get_focus_coords(u16 *x, u16 *y); u8 MapGridGetMetatileLayerTypeAt(s32 x, s32 y); +u8 MapGridGetZCoordAt(int x, int y); u8 CameraMove(s32 deltaX, s32 deltaY); void mapheader_copy_mapdata_with_padding(struct MapHeader *mapHeader); void map_copy_with_padding(u16 *map, u16 width, u16 height); diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h index d6743b7887..4b9fd2488b 100644 --- a/include/metatile_behavior.h +++ b/include/metatile_behavior.h @@ -1,7 +1,7 @@ #ifndef GUARD_METATILE_BEHAVIOR #define GUARD_METATILE_BEHAVIOR -bool8 ShouldDoJumpLandingDustEffect(u8); +bool8 MetatileBehavior_IsATile(u8); bool8 MetatileBehavior_IsEncounterTile(u8); bool8 MetatileBehavior_IsJumpEast(u8); bool8 MetatileBehavior_IsJumpWest(u8); diff --git a/include/pokenav.h b/include/pokenav.h index 42affc9383..734a1ec3f4 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -21,6 +21,7 @@ void sub_81D1EC0(void); void sub_81D1D04(u8); bool8 sub_81D1C44(u8); void sub_81D5FB4(u16*); +bool8 sub_81D4A58(struct MapObject*); #endif //GUARD_POKENAV_H diff --git a/ld_script.txt b/ld_script.txt index 51e641fd11..b4d69ec4a0 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -93,7 +93,6 @@ SECTIONS { src/field_door.o(.text); asm/field_player_avatar.o(.text); src/event_object_movement.o(.text); - asm/field_ground_effect.o(.text); src/event_object_movement_helpers.o(.text); src/field_message_box.o(.text); src/map_obj_lock.o(.text); @@ -398,7 +397,7 @@ SECTIONS { src/field_door.o(.rodata); data/field_player_avatar.o(.rodata); data/event_object_movement.o(.rodata); - data/field_ground_effect.o(.rodata); + src/event_object_movement.o(.rodata); data/map_obj_8097404.o(.rodata); src/text_window.o(.rodata); src/scrcmd.o(.rodata); diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 261f234f4b..5c6f503ef7 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -13,7 +13,6 @@ #include "event_data.h" #include "rom_818CFC8.h" #include "rom_81BE66C.h" -#include "field_ground_effect.h" #include "event_object_movement_helpers.h" #include "mauville_old_man.h" #include "metatile_behavior.h" @@ -23,6 +22,7 @@ #include "trainer_see.h" #include "decoration.h" #include "event_object_movement.h" +#include "pokenav.h" #define NUM_FIELD_MAP_OBJECT_TEMPLATES 0x51 @@ -175,7 +175,7 @@ extern u8 (*const gUnknown_0850DEE8[5])(u8); extern const s16 gUnknown_0850DFBC[3]; extern const s16 gUnknown_0850DFC2[3]; -/*static*/ void FieldObjectUpdateMetatileBehaviors(struct MapObject*); +static void FieldObjectUpdateMetatileBehaviors(struct MapObject*); /*static*/ void GetAllGroundEffectFlags_OnBeginStep(struct MapObject*, u32*); /*static*/ void GetGroundEffectFlags_Reflection(struct MapObject*, u32*); /*static*/ void GetGroundEffectFlags_TallGrassOnSpawn(struct MapObject*, u32*); @@ -191,6 +191,17 @@ extern const s16 gUnknown_0850DFC2[3]; /*static*/ void GetGroundEffectFlags_Ripple(struct MapObject*, u32*); /*static*/ void GetGroundEffectFlags_Seaweed(struct MapObject*, u32*); /*static*/ void GetGroundEffectFlags_JumpLanding(struct MapObject*, u32*); +/*static*/ u8 FieldObjectCheckForReflectiveSurface(struct MapObject*); +static u8 GetReflectionTypeByMetatileBehavior(u32); +static void InitObjectPriorityByZCoord(struct Sprite *sprite, u8 z); +static void FieldObjectUpdateSubpriority(struct MapObject*, struct Sprite*); +static void DoTracksGroundEffect_None(struct MapObject*, struct Sprite*, u8); +static void DoTracksGroundEffect_Footprints(struct MapObject*, struct Sprite*, u8); +static void DoTracksGroundEffect_BikeTireTracks(struct MapObject*, struct Sprite*, u8); +/*static*/ void DoRippleFieldEffect(struct MapObject*, struct Sprite*); +static void DoGroundEffects_OnSpawn(struct MapObject*, struct Sprite*); +static void DoGroundEffects_OnBeginStep(struct MapObject*, struct Sprite*); +static void DoGroundEffects_OnFinishStep(struct MapObject*, struct Sprite*); // Code @@ -5174,3 +5185,712 @@ static void npc_update_obj_anim_flag(struct MapObject *mapObject, struct Sprite GetGroundEffectFlags_Seaweed(eventObj, flags); GetGroundEffectFlags_JumpLanding(eventObj, flags); } + +static void FieldObjectUpdateMetatileBehaviors(struct MapObject *eventObj) +{ + eventObj->previousMetatileBehavior = MapGridGetMetatileBehaviorAt(eventObj->previousCoords.x, eventObj->previousCoords.y); + eventObj->currentMetatileBehavior = MapGridGetMetatileBehaviorAt(eventObj->currentCoords.x, eventObj->currentCoords.y); +} + +void GetGroundEffectFlags_Reflection(struct MapObject *eventObj, u32 *flags) +{ + u32 reflectionFlags[2] = { GROUND_EFFECT_FLAG_REFLECTION, GROUND_EFFECT_FLAG_ICE_REFLECTION }; + u8 type = FieldObjectCheckForReflectiveSurface(eventObj); + + if (type) + { + if (!eventObj->hasReflection) + { + eventObj->hasReflection = 0; + eventObj->hasReflection = 1; + *flags |= reflectionFlags[type - 1]; + } + } + else + { + eventObj->hasReflection = 0; + } +} + +void GetGroundEffectFlags_TallGrassOnSpawn(struct MapObject *eventObj, u32 *flags) +{ + if (MetatileBehavior_IsTallGrass(eventObj->currentMetatileBehavior)) + *flags |= GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN; +} + +void GetGroundEffectFlags_TallGrassOnBeginStep(struct MapObject *eventObj, u32 *flags) +{ + if (MetatileBehavior_IsTallGrass(eventObj->currentMetatileBehavior)) + *flags |= GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE; +} + +void GetGroundEffectFlags_LongGrassOnSpawn(struct MapObject *eventObj, u32 *flags) +{ + if (MetatileBehavior_IsLongGrass(eventObj->currentMetatileBehavior)) + *flags |= GROUND_EFFECT_FLAG_LONG_GRASS_ON_SPAWN; +} + +void GetGroundEffectFlags_LongGrassOnBeginStep(struct MapObject *eventObj, u32 *flags) +{ + if (MetatileBehavior_IsLongGrass(eventObj->currentMetatileBehavior)) + *flags |= GROUND_EFFECT_FLAG_LONG_GRASS_ON_MOVE; +} + +void GetGroundEffectFlags_Tracks(struct MapObject *eventObj, u32 *flags) +{ + if (MetatileBehavior_IsDeepSand(eventObj->previousMetatileBehavior)) + { + *flags |= GROUND_EFFECT_FLAG_DEEP_SAND; + } + else if (MetatileBehavior_IsSandOrDeepSand(eventObj->previousMetatileBehavior) + || MetatileBehavior_IsUnusedFootprintMetatile(eventObj->previousMetatileBehavior)) + { + *flags |= GROUND_EFFECT_FLAG_SAND; + } +} + +void GetGroundEffectFlags_SandHeap(struct MapObject *eventObj, u32 *flags) +{ + if (MetatileBehavior_IsDeepSand(eventObj->currentMetatileBehavior) + && MetatileBehavior_IsDeepSand(eventObj->previousMetatileBehavior)) + { + if (!eventObj->inSandPile) + { + eventObj->inSandPile = 0; + eventObj->inSandPile = 1; + *flags |= GROUND_EFFECT_FLAG_SAND_PILE; + } + } + else + { + eventObj->inSandPile = 0; + } +} + +void GetGroundEffectFlags_ShallowFlowingWater(struct MapObject *eventObj, u32 *flags) +{ + if ((MetatileBehavior_IsShallowFlowingWater(eventObj->currentMetatileBehavior) + && MetatileBehavior_IsShallowFlowingWater(eventObj->previousMetatileBehavior)) + || (MetatileBehavior_IsPacifidlogLog(eventObj->currentMetatileBehavior) + && MetatileBehavior_IsPacifidlogLog(eventObj->previousMetatileBehavior))) + { + if (!eventObj->inShallowFlowingWater) + { + eventObj->inShallowFlowingWater = 0; + eventObj->inShallowFlowingWater = 1; + *flags |= GROUND_EFFECT_FLAG_SHALLOW_FLOWING_WATER; + } + } + else + { + eventObj->inShallowFlowingWater = 0; + } +} + +void GetGroundEffectFlags_Puddle(struct MapObject *eventObj, u32 *flags) +{ + if (MetatileBehavior_IsPuddle(eventObj->currentMetatileBehavior) + && MetatileBehavior_IsPuddle(eventObj->previousMetatileBehavior)) + { + *flags |= GROUND_EFFECT_FLAG_PUDDLE; + } +} + +void GetGroundEffectFlags_Ripple(struct MapObject *eventObj, u32 *flags) +{ + if (MetatileBehavior_HasRipples(eventObj->currentMetatileBehavior)) + *flags |= GROUND_EFFECT_FLAG_RIPPLES; +} + +void GetGroundEffectFlags_ShortGrass(struct MapObject *eventObj, u32 *flags) +{ + if (MetatileBehavior_IsShortGrass(eventObj->currentMetatileBehavior) + && MetatileBehavior_IsShortGrass(eventObj->previousMetatileBehavior)) + { + if (!eventObj->inShortGrass) + { + eventObj->inShortGrass = 0; + eventObj->inShortGrass = 1; + *flags |= GROUND_EFFECT_FLAG_SHORT_GRASS; + } + } + else + { + eventObj->inShortGrass = 0; + } +} + +void GetGroundEffectFlags_HotSprings(struct MapObject *eventObj, u32 *flags) +{ + if (MetatileBehavior_IsHotSprings(eventObj->currentMetatileBehavior) + && MetatileBehavior_IsHotSprings(eventObj->previousMetatileBehavior)) + { + if (!eventObj->inHotSprings) + { + eventObj->inHotSprings = 0; + eventObj->inHotSprings = 1; + *flags |= GROUND_EFFECT_FLAG_HOT_SPRINGS; + } + } + else + { + eventObj->inHotSprings = 0; + } +} + +void GetGroundEffectFlags_Seaweed(struct MapObject *eventObj, u32 *flags) +{ + if (MetatileBehavior_IsSeaweed(eventObj->currentMetatileBehavior)) + *flags |= GROUND_EFFECT_FLAG_SEAWEED; +} + +void GetGroundEffectFlags_JumpLanding(struct MapObject *eventObj, u32 *flags) +{ + typedef bool8 (*MetatileFunc)(u8); + + static const MetatileFunc metatileFuncs[] = { + MetatileBehavior_IsTallGrass, + MetatileBehavior_IsLongGrass, + MetatileBehavior_IsPuddle, + MetatileBehavior_IsSurfableWaterOrUnderwater, + MetatileBehavior_IsShallowFlowingWater, + MetatileBehavior_IsATile, + }; + + static const u32 jumpLandingFlags[] = { + GROUND_EFFECT_FLAG_LAND_IN_TALL_GRASS, + GROUND_EFFECT_FLAG_LAND_IN_LONG_GRASS, + GROUND_EFFECT_FLAG_LAND_IN_SHALLOW_WATER, + GROUND_EFFECT_FLAG_LAND_IN_DEEP_WATER, + GROUND_EFFECT_FLAG_LAND_IN_SHALLOW_WATER, + GROUND_EFFECT_FLAG_LAND_ON_NORMAL_GROUND, + }; + + if (eventObj->landingJump && !eventObj->disableJumpLandingGroundEffect) + { + u8 i; + + for (i = 0; i < ARRAY_COUNT(metatileFuncs); i++) + { + if (metatileFuncs[i](eventObj->currentMetatileBehavior)) + { + *flags |= jumpLandingFlags[i]; + return; + } + } + } +} + +u8 FieldObjectCheckForReflectiveSurface(struct MapObject *eventObj) +{ + const struct MapObjectGraphicsInfo *info = GetFieldObjectGraphicsInfo(eventObj->graphicsId); + + // ceil div by tile width? + s16 width = (info->width + 8) >> 4; + s16 height = (info->height + 8) >> 4; + s16 i; + s16 j; + u8 result; + u8 b; + s16 one; + +#define RETURN_REFLECTION_TYPE_AT(x, y) \ + b = MapGridGetMetatileBehaviorAt(x, y); \ + result = GetReflectionTypeByMetatileBehavior(b); \ + if (result != 0) \ + return result; + + for (i = 0, one = 1; i < height; i++) + { + RETURN_REFLECTION_TYPE_AT(eventObj->currentCoords.x, eventObj->currentCoords.y + one + i) + RETURN_REFLECTION_TYPE_AT(eventObj->previousCoords.x, eventObj->previousCoords.y + one + i) + for (j = 1; j < width; j++) + { + RETURN_REFLECTION_TYPE_AT(eventObj->currentCoords.x + j, eventObj->currentCoords.y + one + i) + RETURN_REFLECTION_TYPE_AT(eventObj->currentCoords.x - j, eventObj->currentCoords.y + one + i) + RETURN_REFLECTION_TYPE_AT(eventObj->previousCoords.x + j, eventObj->previousCoords.y + one + i) + RETURN_REFLECTION_TYPE_AT(eventObj->previousCoords.x - j, eventObj->previousCoords.y + one + i) + } + } + return 0; + +#undef RETURN_REFLECTION_TYPE_AT +} + +static u8 GetReflectionTypeByMetatileBehavior(u32 behavior) +{ + if (MetatileBehavior_IsIce(behavior)) + return 1; + else if (MetatileBehavior_IsReflective(behavior)) + return 2; + else + return 0; +} + +u8 GetLedgeJumpDirection(s16 x, s16 y, u8 z) +{ + static bool8 (*const unknown_08376040[])(u8) = { + MetatileBehavior_IsJumpSouth, + MetatileBehavior_IsJumpNorth, + MetatileBehavior_IsJumpWest, + MetatileBehavior_IsJumpEast, + }; + + u8 b; + u8 index = z; + + if (index == 0) + return 0; + else if (index > 4) + index -= 4; + + index--; + b = MapGridGetMetatileBehaviorAt(x, y); + + if (unknown_08376040[index](b) == 1) + return index + 1; + + return 0; +} + +void FieldObjectSetSpriteOamTableForLongGrass(struct MapObject *eventObj, struct Sprite *sprite) +{ + if (eventObj->disableCoveringGroundEffects) + return; + + if (!MetatileBehavior_IsLongGrass(eventObj->currentMetatileBehavior)) + return; + + if (!MetatileBehavior_IsLongGrass(eventObj->previousMetatileBehavior)) + return; + + sprite->subspriteTableNum = 4; + + if (ZCoordToPriority(eventObj->previousElevation) == 1) + sprite->subspriteTableNum = 5; +} + +bool8 IsZCoordMismatchAt(u8 z, s16 x, s16 y) +{ + u8 mapZ; + + if (z == 0) + return FALSE; + + mapZ = MapGridGetZCoordAt(x, y); + + if (mapZ == 0 || mapZ == 0xF) + return FALSE; + + if (mapZ != z) + return TRUE; + + return FALSE; +} + +static const u8 sUnknown_08376050[] = { + 0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73 +}; + +// Each byte corresponds to a sprite priority for an event object. +// This is directly the inverse of gEventObjectPriorities_08376070. +static const u8 sEventObjectPriorities_08376060[] = { + 2, 2, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 0, 0, 2 +}; + +// Each byte corresponds to a sprite priority for an event object. +// This is the inverse of gEventObjectPriorities_08376060. +// 1 = Above player sprite +// 2 = Below player sprite +static const u8 sEventObjectPriorities_08376070[] = { + 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 0, 0, 1, +}; + +void FieldObjectUpdateZCoordAndPriority(struct MapObject *eventObj, struct Sprite *sprite) +{ + if (eventObj->fixedPriority) + return; + + FieldObjectUpdateZCoord(eventObj); + + sprite->subspriteTableNum = sEventObjectPriorities_08376070[eventObj->previousElevation]; + sprite->oam.priority = sEventObjectPriorities_08376060[eventObj->previousElevation]; +} + +static void InitObjectPriorityByZCoord(struct Sprite *sprite, u8 z) +{ + sprite->subspriteTableNum = sEventObjectPriorities_08376070[z]; + sprite->oam.priority = sEventObjectPriorities_08376060[z]; +} + +u8 ZCoordToPriority(u8 z) +{ + return sEventObjectPriorities_08376060[z]; +} + +void FieldObjectUpdateZCoord(struct MapObject *eventObj) +{ + u8 z = MapGridGetZCoordAt(eventObj->currentCoords.x, eventObj->currentCoords.y); + u8 z2 = MapGridGetZCoordAt(eventObj->previousCoords.x, eventObj->previousCoords.y); + + if (z == 0xF || z2 == 0xF) + return; + + eventObj->currentElevation = z; + + if (z != 0 && z != 0xF) + eventObj->previousElevation = z; +} + +void SetObjectSubpriorityByZCoord(u8 a, struct Sprite *sprite, u8 b) +{ + s32 tmp = sprite->centerToCornerVecY; + u32 tmpa = *(u16 *)&sprite->pos1.y; + u32 tmpb = *(u16 *)&gSpriteCoordOffsetY; + s32 tmp2 = (tmpa - tmp) + tmpb; + u16 tmp3 = (0x10 - ((((u32)tmp2 + 8) & 0xFF) >> 4)) * 2; + sprite->subpriority = tmp3 + sUnknown_08376050[a] + b; +} + +static void FieldObjectUpdateSubpriority(struct MapObject *eventObj, struct Sprite *sprite) +{ + if (eventObj->fixedPriority) + return; + + SetObjectSubpriorityByZCoord(eventObj->previousElevation, sprite, 1); +} + +bool8 AreZCoordsCompatible(u8 a, u8 b) +{ + if (a == 0 || b == 0) + return TRUE; + + if (a != b) + return FALSE; + + return TRUE; +} + +void GroundEffect_SpawnOnTallGrass(struct MapObject *eventObj, struct Sprite *sprite) +{ + gFieldEffectArguments[0] = eventObj->currentCoords.x; + gFieldEffectArguments[1] = eventObj->currentCoords.y; + gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[3] = 2; + gFieldEffectArguments[4] = eventObj->localId << 8 | eventObj->mapNum; + gFieldEffectArguments[5] = eventObj->mapGroup; + gFieldEffectArguments[6] = (u8)gSaveBlock1Ptr->location.mapNum << 8 | (u8)gSaveBlock1Ptr->location.mapGroup; + gFieldEffectArguments[7] = 1; + FieldEffectStart(FLDEFF_TALL_GRASS); +} + +void GroundEffect_StepOnTallGrass(struct MapObject *eventObj, struct Sprite *sprite) +{ + gFieldEffectArguments[0] = eventObj->currentCoords.x; + gFieldEffectArguments[1] = eventObj->currentCoords.y; + gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[3] = 2; + gFieldEffectArguments[4] = eventObj->localId << 8 | eventObj->mapNum; + gFieldEffectArguments[5] = eventObj->mapGroup; + gFieldEffectArguments[6] = (u8)gSaveBlock1Ptr->location.mapNum << 8 | (u8)gSaveBlock1Ptr->location.mapGroup; + gFieldEffectArguments[7] = 0; + FieldEffectStart(FLDEFF_TALL_GRASS); +} + +void GroundEffect_SpawnOnLongGrass(struct MapObject *eventObj, struct Sprite *sprite) +{ + gFieldEffectArguments[0] = eventObj->currentCoords.x; + gFieldEffectArguments[1] = eventObj->currentCoords.y; + gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[3] = 2; + gFieldEffectArguments[4] = eventObj->localId << 8 | eventObj->mapNum; + gFieldEffectArguments[5] = eventObj->mapGroup; + gFieldEffectArguments[6] = (u8)gSaveBlock1Ptr->location.mapNum << 8 | (u8)gSaveBlock1Ptr->location.mapGroup; + gFieldEffectArguments[7] = 1; + FieldEffectStart(FLDEFF_LONG_GRASS); +} + +void GroundEffect_StepOnLongGrass(struct MapObject *eventObj, struct Sprite *sprite) +{ + gFieldEffectArguments[0] = eventObj->currentCoords.x; + gFieldEffectArguments[1] = eventObj->currentCoords.y; + gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[3] = 2; + gFieldEffectArguments[4] = (eventObj->localId << 8) | eventObj->mapNum; + gFieldEffectArguments[5] = eventObj->mapGroup; + gFieldEffectArguments[6] = (u8)gSaveBlock1Ptr->location.mapNum << 8 | (u8)gSaveBlock1Ptr->location.mapGroup; + gFieldEffectArguments[7] = 0; + FieldEffectStart(FLDEFF_LONG_GRASS); +} + +void GroundEffect_WaterReflection(struct MapObject *eventObj, struct Sprite *sprite) +{ + SetUpReflection(eventObj, sprite, 0); +} + +void GroundEffect_IceReflection(struct MapObject *eventObj, struct Sprite *sprite) +{ + SetUpReflection(eventObj, sprite, 1); +} + +void GroundEffect_FlowingWater(struct MapObject *eventObj, struct Sprite *sprite) +{ + StartFieldEffectForEventObject(FLDEFF_FEET_IN_FLOWING_WATER, eventObj); +} + +static void (*const sGroundEffectTracksFuncs[])(struct MapObject *eventObj, struct Sprite *sprite, u8 a) = { + DoTracksGroundEffect_None, + DoTracksGroundEffect_Footprints, + DoTracksGroundEffect_BikeTireTracks, +}; + +void GroundEffect_SandTracks(struct MapObject *eventObj, struct Sprite *sprite) +{ + const struct MapObjectGraphicsInfo *info = GetFieldObjectGraphicsInfo(eventObj->graphicsId); + sGroundEffectTracksFuncs[info->tracks](eventObj, sprite, 0); +} + +void GroundEffect_DeepSandTracks(struct MapObject *eventObj, struct Sprite *sprite) +{ + const struct MapObjectGraphicsInfo *info = GetFieldObjectGraphicsInfo(eventObj->graphicsId); + sGroundEffectTracksFuncs[info->tracks](eventObj, sprite, 1); +} + +static void DoTracksGroundEffect_None(struct MapObject *eventObj, struct Sprite *sprite, u8 a) +{ +} + +static void DoTracksGroundEffect_Footprints(struct MapObject *eventObj, struct Sprite *sprite, u8 a) +{ + // First half-word is a Field Effect script id. (gFieldEffectScriptPointers) + u16 sandFootprints_FieldEffectData[2] = { + FLDEFF_SAND_FOOTPRINTS, + FLDEFF_DEEP_SAND_FOOTPRINTS + }; + + gFieldEffectArguments[0] = eventObj->previousCoords.x; + gFieldEffectArguments[1] = eventObj->previousCoords.y; + gFieldEffectArguments[2] = 149; + gFieldEffectArguments[3] = 2; + gFieldEffectArguments[4] = eventObj->facingDirection; + FieldEffectStart(sandFootprints_FieldEffectData[a]); +} + +static void DoTracksGroundEffect_BikeTireTracks(struct MapObject *eventObj, struct Sprite *sprite, u8 a) +{ + // Specifies which bike track shape to show next. + // For example, when the bike turns from up to right, it will show + // a track that curves to the right. + // Each 4-byte row corresponds to the initial direction of the bike, and + // each byte in that row is for the next direction of the bike in the order + // of down, up, left, right. + static const u8 bikeTireTracks_Transitions[4][4] = { + 1, 2, 7, 8, + 1, 2, 6, 5, + 5, 8, 3, 4, + 6, 7, 3, 4, + }; + + if (eventObj->currentCoords.x != eventObj->previousCoords.x || eventObj->currentCoords.y != eventObj->previousCoords.y) + { + gFieldEffectArguments[0] = eventObj->previousCoords.x; + gFieldEffectArguments[1] = eventObj->previousCoords.y; + gFieldEffectArguments[2] = 149; + gFieldEffectArguments[3] = 2; + gFieldEffectArguments[4] = + bikeTireTracks_Transitions[eventObj->previousMovementDirection][eventObj->facingDirection - 5]; + FieldEffectStart(FLDEFF_BIKE_TIRE_TRACKS); + } +} + +void GroundEffect_Ripple(struct MapObject *eventObj, struct Sprite *sprite) +{ + DoRippleFieldEffect(eventObj, sprite); +} + +void GroundEffect_StepOnPuddle(struct MapObject *eventObj, struct Sprite *sprite) +{ + StartFieldEffectForEventObject(FLDEFF_SPLASH, eventObj); +} + +void GroundEffect_SandHeap(struct MapObject *eventObj, struct Sprite *sprite) +{ + StartFieldEffectForEventObject(FLDEFF_SAND_PILE, eventObj); +} + +void GroundEffect_JumpOnTallGrass(struct MapObject *eventObj, struct Sprite *sprite) +{ + u8 spriteId; + + gFieldEffectArguments[0] = eventObj->currentCoords.x; + gFieldEffectArguments[1] = eventObj->currentCoords.y; + gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[3] = 2; + FieldEffectStart(FLDEFF_JUMP_TALL_GRASS); + + spriteId = sub_81546C8( + eventObj->localId, eventObj->mapNum, eventObj->mapGroup, eventObj->currentCoords.x, eventObj->currentCoords.y); + + if (spriteId == MAX_SPRITES) + GroundEffect_SpawnOnTallGrass(eventObj, sprite); +} + +void GroundEffect_JumpOnLongGrass(struct MapObject *eventObj, struct Sprite *sprite) +{ + gFieldEffectArguments[0] = eventObj->currentCoords.x; + gFieldEffectArguments[1] = eventObj->currentCoords.y; + gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[3] = 2; + FieldEffectStart(FLDEFF_JUMP_LONG_GRASS); +} + +void GroundEffect_JumpOnShallowWater(struct MapObject *eventObj, struct Sprite *sprite) +{ + gFieldEffectArguments[0] = eventObj->currentCoords.x; + gFieldEffectArguments[1] = eventObj->currentCoords.y; + gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[3] = sprite->oam.priority; + FieldEffectStart(FLDEFF_JUMP_SMALL_SPLASH); +} + +void GroundEffect_JumpOnWater(struct MapObject *eventObj, struct Sprite *sprite) +{ + gFieldEffectArguments[0] = eventObj->currentCoords.x; + gFieldEffectArguments[1] = eventObj->currentCoords.y; + gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[3] = sprite->oam.priority; + FieldEffectStart(FLDEFF_JUMP_BIG_SPLASH); +} + +void GroundEffect_JumpLandingDust(struct MapObject *eventObj, struct Sprite *sprite) +{ + gFieldEffectArguments[0] = eventObj->currentCoords.x; + gFieldEffectArguments[1] = eventObj->currentCoords.y; + gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[3] = sprite->oam.priority; + FieldEffectStart(FLDEFF_DUST); +} + +void GroundEffect_ShortGrass(struct MapObject *eventObj, struct Sprite *sprite) +{ + StartFieldEffectForEventObject(FLDEFF_SHORT_GRASS, eventObj); +} + +void GroundEffect_HotSprings(struct MapObject *eventObj, struct Sprite *sprite) +{ + StartFieldEffectForEventObject(FLDEFF_HOT_SPRINGS_WATER, eventObj); +} + +void GroundEffect_Seaweed(struct MapObject *eventObj, struct Sprite *sprite) +{ + gFieldEffectArguments[0] = eventObj->currentCoords.x; + gFieldEffectArguments[1] = eventObj->currentCoords.y; + FieldEffectStart(FLDEFF_BUBBLES); +} + +static void (*const sGroundEffectFuncs[])(struct MapObject *eventObj, struct Sprite *sprite) = { + GroundEffect_SpawnOnTallGrass, + GroundEffect_StepOnTallGrass, + GroundEffect_SpawnOnLongGrass, + GroundEffect_StepOnLongGrass, + GroundEffect_WaterReflection, + GroundEffect_IceReflection, + GroundEffect_FlowingWater, + GroundEffect_SandTracks, + GroundEffect_DeepSandTracks, + GroundEffect_Ripple, + GroundEffect_StepOnPuddle, + GroundEffect_SandHeap, + GroundEffect_JumpOnTallGrass, + GroundEffect_JumpOnLongGrass, + GroundEffect_JumpOnShallowWater, + GroundEffect_JumpOnWater, + GroundEffect_JumpLandingDust, + GroundEffect_ShortGrass, + GroundEffect_HotSprings, + GroundEffect_Seaweed +}; + +/*static*/ void DoFlaggedGroundEffects(struct MapObject *eventObj, struct Sprite *sprite, u32 flags) +{ + u8 i; + + if (FieldObjectIsFarawayIslandMew(eventObj) == TRUE && !sub_81D4A58(eventObj)) + return; + + for (i = 0; i < ARRAY_COUNT(sGroundEffectFuncs); i++, flags >>= 1) + if (flags & 1) + sGroundEffectFuncs[i](eventObj, sprite); +} + +void filters_out_some_ground_effects(struct MapObject *eventObj, u32 *flags) +{ + if (eventObj->disableCoveringGroundEffects) + { + eventObj->inShortGrass = 0; + eventObj->inSandPile = 0; + eventObj->inShallowFlowingWater = 0; + eventObj->inHotSprings = 0; + *flags &= ~(GROUND_EFFECT_FLAG_HOT_SPRINGS + | GROUND_EFFECT_FLAG_SHORT_GRASS + | GROUND_EFFECT_FLAG_SAND_PILE + | GROUND_EFFECT_FLAG_SHALLOW_FLOWING_WATER + | GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE); + } +} + +void FilterOutStepOnPuddleGroundEffectIfJumping(struct MapObject *eventObj, u32 *flags) +{ + if (eventObj->landingJump) + *flags &= ~GROUND_EFFECT_FLAG_PUDDLE; +} + +static void DoGroundEffects_OnSpawn(struct MapObject *eventObj, struct Sprite *sprite) +{ + u32 flags; + + if (eventObj->triggerGroundEffectsOnMove) + { + flags = 0; + FieldObjectUpdateZCoordAndPriority(eventObj, sprite); + GetAllGroundEffectFlags_OnSpawn(eventObj, &flags); + FieldObjectSetSpriteOamTableForLongGrass(eventObj, sprite); + DoFlaggedGroundEffects(eventObj, sprite, flags); + eventObj->triggerGroundEffectsOnMove = 0; + eventObj->disableCoveringGroundEffects = 0; + } +} + +static void DoGroundEffects_OnBeginStep(struct MapObject *eventObj, struct Sprite *sprite) +{ + u32 flags; + + if (eventObj->triggerGroundEffectsOnMove) + { + flags = 0; + FieldObjectUpdateZCoordAndPriority(eventObj, sprite); + GetAllGroundEffectFlags_OnBeginStep(eventObj, &flags); + FieldObjectSetSpriteOamTableForLongGrass(eventObj, sprite); + filters_out_some_ground_effects(eventObj, &flags); + DoFlaggedGroundEffects(eventObj, sprite, flags); + eventObj->triggerGroundEffectsOnMove = 0; + eventObj->disableCoveringGroundEffects = 0; + } +} + +static void DoGroundEffects_OnFinishStep(struct MapObject *eventObj, struct Sprite *sprite) +{ + u32 flags; + + if (eventObj->triggerGroundEffectsOnStop) + { + flags = 0; + FieldObjectUpdateZCoordAndPriority(eventObj, sprite); + GetAllGroundEffectFlags_OnFinishStep(eventObj, &flags); + FieldObjectSetSpriteOamTableForLongGrass(eventObj, sprite); + FilterOutStepOnPuddleGroundEffectIfJumping(eventObj, &flags); + DoFlaggedGroundEffects(eventObj, sprite, flags); + eventObj->triggerGroundEffectsOnStop = 0; + eventObj->landingJump = 0; + } +} diff --git a/src/event_object_movement_helpers.c b/src/event_object_movement_helpers.c index 660c8961a6..6a8b410f5f 100755 --- a/src/event_object_movement_helpers.c +++ b/src/event_object_movement_helpers.c @@ -1,5 +1,4 @@ #include "global.h" -#include "field_ground_effect.h" #include "event_object_movement.h" #include "field_effect.h" #include "event_object_movement_helpers.h" @@ -504,7 +503,7 @@ bool32 sub_8097D9C(u8 var) return FALSE; } -u32 oe_exec_and_other_stuff(u8 fieldEffectId, struct MapObject *mapObject) +u32 StartFieldEffectForEventObject(u8 fieldEffectId, struct MapObject *mapObject) { FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); return FieldEffectStart(fieldEffectId); @@ -515,7 +514,7 @@ void DoShadowFieldEffect(struct MapObject *mapObject) if (!mapObject->hasShadow) { mapObject->hasShadow = 1; - oe_exec_and_other_stuff(FLDEFF_SHADOW, mapObject); + StartFieldEffectForEventObject(FLDEFF_SHADOW, mapObject); } } diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c index b9760f5223..ad0062c206 100644 --- a/src/metatile_behavior.c +++ b/src/metatile_behavior.c @@ -252,8 +252,7 @@ static const u8 sTileBitAttributes[] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // ? 0xEF }; -// only used as default case for checking jump landing in field_ground_effect. -bool8 ShouldDoJumpLandingDustEffect(u8 var) +bool8 MetatileBehavior_IsATile(u8 var) { return TRUE; } diff --git a/src/overworld.c b/src/overworld.c index 3279ce4fbe..045ebb4fd3 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -10,7 +10,6 @@ #include "field_control_avatar.h" #include "field_effect.h" #include "field_fadetransition.h" -#include "field_ground_effect.h" #include "event_object_movement.h" #include "event_object_movement_helpers.h" #include "field_message_box.h" From eb8dbff4a783e880d950be73963e523c86a54615 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 11 Jun 2018 10:34:51 -0500 Subject: [PATCH 04/55] Move event_object_movement_helpers into event_object_movement --- data/event_object_movement.s | 4 +- include/global.fieldmap.h | 10 +- ld_script.txt | 1 - src/event_object_movement.c | 747 +++++++++++++++++++++++++++- src/event_object_movement_helpers.c | 704 -------------------------- 5 files changed, 727 insertions(+), 739 deletions(-) delete mode 100755 src/event_object_movement_helpers.c diff --git a/data/event_object_movement.s b/data/event_object_movement.s index 844612a7c6..38f4889738 100644 --- a/data/event_object_movement.s +++ b/data/event_object_movement.s @@ -101,12 +101,12 @@ gUnknown_08505438:: @ 8505438 .4byte FieldObjectCB_WalkInPlace4 .4byte FieldObjectCB_WalkInPlace4 -gUnknown_0850557C:: @ 850557C +gRangedMovementTypes:: @ 850557C .byte 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -gUnknown_085055CD:: @ 85055CD +gInitialMovementTypeFacingDirections:: @ 85055CD .byte 0x01, 0x01, 0x01, 0x02, 0x01, 0x03, 0x04, 0x02, 0x01, 0x03, 0x04, 0x01, 0x01, 0x01, 0x03, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x03, 0x04, 0x02, 0x04, 0x01 .byte 0x03, 0x02, 0x03, 0x01, 0x04, 0x03, 0x02, 0x04, 0x01, 0x04, 0x02, 0x03, 0x01, 0x02, 0x01, 0x03, 0x04, 0x02, 0x01, 0x03, 0x04, 0x02, 0x01, 0x03, 0x04, 0x01, 0x01, 0x02, 0x01, 0x03, 0x04, 0x01 .byte 0x01, 0x02, 0x03, 0x04, 0x01, 0x02, 0x03, 0x04, 0x01, 0x02, 0x03, 0x04, 0x01, 0x01, 0x02, 0x03, 0x04 diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 06f3cebb2f..fa142e4fe1 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -81,14 +81,12 @@ struct MapObjectTemplate /*0x06*/ s16 y; /*0x08*/ u8 elevation; /*0x09*/ u8 movementType; - /*0x0A*/ u8 unkA_0:4; - u8 unkA_4:4; - ///*0x0B*/ u8 fillerB[1]; - /*0x0C*/ u16 unkC; - /*0x0E*/ u16 unkE; + /*0x0A*/ u8 movementRangeX:4; + u8 movementRangeY:4; + /*0x0C*/ u16 trainerType; + /*0x0E*/ u16 trainerRange_berryTreeId; /*0x10*/ const u8 *script; /*0x14*/ u16 flagId; - /*0x16*/ u8 filler_16[2]; }; /*size = 0x18*/ struct WarpEvent diff --git a/ld_script.txt b/ld_script.txt index b4d69ec4a0..bf8bfa7d5e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -93,7 +93,6 @@ SECTIONS { src/field_door.o(.text); asm/field_player_avatar.o(.text); src/event_object_movement.o(.text); - src/event_object_movement_helpers.o(.text); src/field_message_box.o(.text); src/map_obj_lock.o(.text); src/text_window.o(.text); diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 5c6f503ef7..a935f20d6b 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -23,6 +23,7 @@ #include "decoration.h" #include "event_object_movement.h" #include "pokenav.h" +#include "util.h" #define NUM_FIELD_MAP_OBJECT_TEMPLATES 0x51 @@ -110,7 +111,7 @@ u8 GetJumpLedgeAnimId(u32); void sub_8092F88(u32, s16 *, s16 *, s16, s16); bool8 FieldObjectExecRegularAnim(struct MapObject *, struct Sprite *); -void SetFieldObjectStepTimer(struct Sprite *, s16); +static void SetFieldObjectStepTimer(struct Sprite *, s16); bool8 RunFieldObjectStepTimer(struct Sprite *); bool8 npc_block_way__next_tile(struct MapObject *, u8); static u32 state_to_direction(u8, u32, u32); @@ -129,8 +130,8 @@ static void npc_update_obj_anim_flag(struct MapObject *, struct Sprite *); // ROM data extern void (*const gUnknown_08505438[NUM_FIELD_MAP_OBJECT_TEMPLATES])(struct Sprite *); -extern const u8 gUnknown_0850557C[NUM_FIELD_MAP_OBJECT_TEMPLATES]; -extern const u8 gUnknown_085055CD[NUM_FIELD_MAP_OBJECT_TEMPLATES]; +extern const u8 gRangedMovementTypes[NUM_FIELD_MAP_OBJECT_TEMPLATES]; +extern const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLATES]; extern const struct MapObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[7]; extern const struct MapObjectGraphicsInfo *const gFieldObjectGraphicsInfoPointers[0xEF]; extern u8 (*const gUnknown_0850D714[11])(s16, s16, s16, s16); @@ -175,6 +176,18 @@ extern u8 (*const gUnknown_0850DEE8[5])(u8); extern const s16 gUnknown_0850DFBC[3]; extern const s16 gUnknown_0850DFC2[3]; +typedef void (*SpriteStepFunc)(struct Sprite *sprite, u8 dir); + +extern s16 gUnknown_0850E768[]; +extern SpriteStepFunc *const gUnknown_0850E754[]; +extern const s8 gUnknown_0850E772[]; +extern const s8 gUnknown_0850E7BA[]; +extern const s8 *const gUnknown_0850E834[]; +extern s16 gUnknown_0850E840[]; +extern u8 gUnknown_0850E846[]; +extern s16 gUnknown_0850E84A[]; +extern u8 gUnknown_0850E850[]; + static void FieldObjectUpdateMetatileBehaviors(struct MapObject*); /*static*/ void GetAllGroundEffectFlags_OnBeginStep(struct MapObject*, u32*); /*static*/ void GetGroundEffectFlags_Reflection(struct MapObject*, u32*); @@ -202,6 +215,8 @@ static void DoTracksGroundEffect_BikeTireTracks(struct MapObject*, struct Sprite static void DoGroundEffects_OnSpawn(struct MapObject*, struct Sprite*); static void DoGroundEffects_OnBeginStep(struct MapObject*, struct Sprite*); static void DoGroundEffects_OnFinishStep(struct MapObject*, struct Sprite*); +static void sub_8097D68(struct Sprite*); +static void sub_8097FE4(u8); // Code @@ -359,15 +374,15 @@ static u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u mapObject->currentElevation = template->elevation; mapObject->previousElevation = template->elevation; // For some reason, 0x0F is placed in r9, to be used later - mapObject->range.as_nybbles.x = template->unkA_0; - mapObject->range.as_nybbles.y = template->unkA_4; - mapObject->trainerType = template->unkC; - mapObject->trainerRange_berryTreeId = template->unkE; - mapObject->previousMovementDirection = gUnknown_085055CD[template->movementType]; + mapObject->range.as_nybbles.x = template->movementRangeX; + mapObject->range.as_nybbles.y = template->movementRangeY; + mapObject->trainerType = template->trainerType; + mapObject->trainerRange_berryTreeId = template->trainerRange_berryTreeId; + mapObject->previousMovementDirection = gInitialMovementTypeFacingDirections[template->movementType]; FieldObjectSetDirection(mapObject, mapObject->previousMovementDirection); FieldObjectHandleDynamicGraphicsId(mapObject); - if (gUnknown_0850557C[mapObject->movementType]) + if (gRangedMovementTypes[mapObject->movementType]) { if ((mapObject->range.as_nybbles.x) == 0) { @@ -478,7 +493,7 @@ static NAKED u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *templ "\tstrb r0, [r4, 0x7]\n" "\tldrh r0, [r5, 0xE]\n" "\tstrb r0, [r4, 0x1D]\n" - "\tldr r1, =gUnknown_085055CD\n" + "\tldr r1, =gInitialMovementTypeFacingDirections\n" "\tldrb r0, [r5, 0x9]\n" "\tadds r0, r1\n" "\tldrb r1, [r0]\n" @@ -490,7 +505,7 @@ static NAKED u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *templ "\tbl FieldObjectSetDirection\n" "\tadds r0, r4, 0\n" "\tbl FieldObjectHandleDynamicGraphicsId\n" - "\tldr r1, =gUnknown_0850557C\n" + "\tldr r1, =gRangedMovementTypes\n" "\tldrb r0, [r4, 0x6]\n" "\tadds r0, r1\n" "\tldrb r0, [r0]\n" @@ -744,10 +759,10 @@ u8 SpawnSpecialFieldObjectParametrized(u8 graphicsId, u8 movementBehavior, u8 lo mapObjectTemplate.y = y; mapObjectTemplate.elevation = z; mapObjectTemplate.movementType = movementBehavior; - mapObjectTemplate.unkA_0 = 0; - mapObjectTemplate.unkA_4 = 0; - mapObjectTemplate.unkC = 0; - mapObjectTemplate.unkE = 0; + mapObjectTemplate.movementRangeX = 0; + mapObjectTemplate.movementRangeY = 0; + mapObjectTemplate.trainerType = 0; + mapObjectTemplate.trainerRange_berryTreeId = 0; return SpawnSpecialFieldObject(&mapObjectTemplate); } @@ -3125,7 +3140,7 @@ bool8 sub_8090F30 (struct MapObject *mapObject, struct Sprite *sprite) { u8 direction; - direction = gUnknown_085055CD[mapObject->movementType]; + direction = gInitialMovementTypeFacingDirections[mapObject->movementType]; if (mapObject->directionSequenceIndex) { direction = GetOppositeDirection(direction); @@ -3284,7 +3299,7 @@ bool8 sub_8091F48(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD bool8 sub_8091F4C(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(state_to_direction(gUnknown_085055CD[mapObject->movementType], mapObject->directionSequenceIndex, playerDirection))); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, playerDirection))); mapObject->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; @@ -3303,7 +3318,7 @@ bool8 sub_8091F94(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD if (direction == 0) { direction = playerDirection; - direction = state_to_direction(gUnknown_085055CD[mapObject->movementType], mapObject->directionSequenceIndex, direction); + direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, direction); FieldObjectMoveDestCoords(mapObject, direction, &x, &y); FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); mapObject->singleMovementActive = TRUE; @@ -3313,7 +3328,7 @@ bool8 sub_8091F94(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD } else { - direction = state_to_direction(gUnknown_085055CD[mapObject->movementType], mapObject->directionSequenceIndex, direction); + direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, direction); } FieldObjectMoveDestCoords(mapObject, direction, &x, &y); FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(direction)); @@ -3333,7 +3348,7 @@ bool8 sub_80920A4(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD s16 y; direction = playerDirection; - direction = state_to_direction(gUnknown_085055CD[mapObject->movementType], mapObject->directionSequenceIndex, direction); + direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, direction); FieldObjectMoveDestCoords(mapObject, direction, &x, &y); FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed1AnimId(direction)); if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) @@ -3352,7 +3367,7 @@ bool8 sub_809215C(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD s16 y; direction = playerDirection; - direction = state_to_direction(gUnknown_085055CD[mapObject->movementType], mapObject->directionSequenceIndex, direction); + direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, direction); FieldObjectMoveDestCoords(mapObject, direction, &x, &y); FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed3AnimId(direction)); if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) @@ -3371,7 +3386,7 @@ bool8 sub_8092214(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD s16 y; direction = playerDirection; - direction = state_to_direction(gUnknown_085055CD[mapObject->movementType], mapObject->directionSequenceIndex, direction); + direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, direction); FieldObjectMoveDestCoords(mapObject, direction, &x, &y); FieldObjectSetRegularAnim(mapObject, sprite, sub_8093438(direction)); if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) @@ -3388,7 +3403,7 @@ bool8 cph_IM_DIFFERENT(struct MapObject *mapObject, struct Sprite *sprite, u8 pl u32 direction; direction = playerDirection; - direction = state_to_direction(gUnknown_085055CD[mapObject->movementType], mapObject->directionSequenceIndex, direction); + direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, direction); FieldObjectSetRegularAnim(mapObject, sprite, sub_80934BC(direction)); mapObject->singleMovementActive = TRUE; sprite->data[1] = 2; @@ -3402,7 +3417,7 @@ bool8 sub_8092314(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD s16 y; direction = playerDirection; - direction = state_to_direction(gUnknown_085055CD[mapObject->movementType], mapObject->directionSequenceIndex, direction); + direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, direction); FieldObjectMoveDestCoords(mapObject, direction, &x, &y); FieldObjectSetRegularAnim(mapObject, sprite, sub_8093514(direction)); if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) @@ -3421,7 +3436,7 @@ bool8 oac_hopping(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD s16 y; direction = playerDirection; - direction = state_to_direction(gUnknown_085055CD[mapObject->movementType], mapObject->directionSequenceIndex, direction); + direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, direction); x = mapObject->currentCoords.x; y = mapObject->currentCoords.y; sub_8092F88(direction, &x, &y, 2, 2); @@ -4669,7 +4684,7 @@ maybe_shadow_1_macro(sub_80953E0, maybe_shadow_1, sub_80941E0, DIR_EAST, 0, 2) bool8 sub_8095438(struct MapObject *mapObject, struct Sprite *sprite) { - an_look_any(mapObject, sprite, gUnknown_085055CD[mapObject->movementType]); + an_look_any(mapObject, sprite, gInitialMovementTypeFacingDirections[mapObject->movementType]); return TRUE; } @@ -5894,3 +5909,683 @@ static void DoGroundEffects_OnFinishStep(struct MapObject *eventObj, struct Spri eventObj->landingJump = 0; } } + +bool8 FreezeMapObject(struct MapObject *mapObject) +{ + if (mapObject->heldMovementActive || mapObject->frozen) + { + return TRUE; + } + else + { + mapObject->frozen = 1; + mapObject->spriteAnimPausedBackup = gSprites[mapObject->spriteId].animPaused; + mapObject->spriteAffineAnimPausedBackup = gSprites[mapObject->spriteId].affineAnimPaused; + gSprites[mapObject->spriteId].animPaused = 1; + gSprites[mapObject->spriteId].affineAnimPaused = 1; + return FALSE; + } +} + +void FreezeMapObjects(void) +{ + u8 i; + for (i = 0; i < MAP_OBJECTS_COUNT; i++) + if (gMapObjects[i].active && i != gPlayerAvatar.mapObjectId) + FreezeMapObject(&gMapObjects[i]); +} + +void FreezeMapObjectsExceptOne(u8 a1) +{ + u8 i; + for (i = 0; i < MAP_OBJECTS_COUNT; i++) + if (i != a1 && gMapObjects[i].active && i != gPlayerAvatar.mapObjectId) + FreezeMapObject(&gMapObjects[i]); +} + +void npc_sync_anim_pause_bits(struct MapObject *mapObject) +{ + if (mapObject->active && mapObject->frozen) + { + mapObject->frozen = 0; + gSprites[mapObject->spriteId].animPaused = mapObject->spriteAnimPausedBackup; + gSprites[mapObject->spriteId].affineAnimPaused = mapObject->spriteAffineAnimPausedBackup; + } +} + +void UnfreezeMapObjects(void) +{ + u8 i; + for (i = 0; i < MAP_OBJECTS_COUNT; i++) + if (gMapObjects[i].active) + npc_sync_anim_pause_bits(&gMapObjects[i]); +} + +void little_step(struct Sprite *sprite, u8 dir) +{ + sprite->pos1.x += gUnknown_0850DB7C[dir].x; + sprite->pos1.y += gUnknown_0850DB7C[dir].y; +} + +void double_little_steps(struct Sprite *sprite, u8 dir) +{ + sprite->pos1.x += 2 * (u16) gUnknown_0850DB7C[dir].x; + sprite->pos1.y += 2 * (u16) gUnknown_0850DB7C[dir].y; +} + +void triple_little_steps(struct Sprite *sprite, u8 dir) +{ + sprite->pos1.x += 2 * (u16) gUnknown_0850DB7C[dir].x + (u16) gUnknown_0850DB7C[dir].x; + sprite->pos1.y += 2 * (u16) gUnknown_0850DB7C[dir].y + (u16) gUnknown_0850DB7C[dir].y; +} + +void quad_little_steps(struct Sprite *sprite, u8 dir) +{ + sprite->pos1.x += 4 * (u16) gUnknown_0850DB7C[dir].x; + sprite->pos1.y += 4 * (u16) gUnknown_0850DB7C[dir].y; +} + +void oct_little_steps(struct Sprite *sprite, u8 dir) +{ + sprite->pos1.x += 8 * (u16) gUnknown_0850DB7C[dir].x; + sprite->pos1.y += 8 * (u16) gUnknown_0850DB7C[dir].y; +} + +void oamt_npc_ministep_reset(struct Sprite *sprite, u8 a2, u8 a3) +{ + sprite->data[3] = a2; + sprite->data[4] = a3; + sprite->data[5] = 0; +} + +bool8 obj_npc_ministep(struct Sprite *sprite) +{ + if (sprite->data[5] >= gUnknown_0850E768[sprite->data[4]]) + return FALSE; + + gUnknown_0850E754[sprite->data[4]][sprite->data[5]](sprite, sprite->data[3]); + + sprite->data[5]++; + + if (sprite->data[5] < gUnknown_0850E768[sprite->data[4]]) + return FALSE; + + return TRUE; +} + +void sub_80976DC(struct Sprite *sprite, u8 a2) +{ + sprite->data[3] = a2; + sprite->data[4] = 0; + sprite->data[5] = 0; +} + +bool8 sub_80976EC(struct Sprite *sprite) +{ + if (!(sprite->data[4] & 1)) + { + little_step(sprite, sprite->data[3]); + sprite->data[5]++; + } + + sprite->data[4]++; + + if (sprite->data[5] > 15) + return TRUE; + else + return FALSE; +} + +// new helper added here in the middle. Perhaps Game Freak kept these organized in alphebetical order or some other heirarchy? + +s16 sub_8097728(s16 a1) +{ + return gUnknown_0850E7BA[a1]; +} + +s16 sub_809773C(s16 a1) +{ + return gUnknown_0850E772[a1]; +} + +void sub_8097750(struct Sprite *sprite) +{ + sprite->data[6] = 0; + sprite->data[7] = 0; +} + +bool8 sub_8097758(struct Sprite *sprite) +{ + bool8 result = FALSE; + + switch(sprite->data[7]) + { + case 0: + sprite->pos2.x += sub_809773C(sprite->data[6]); + sprite->pos2.y += sub_8097728(sprite->data[6]); + break; + case 1: + sprite->pos2.x -= sub_809773C(0x47 - sprite->data[6]); + sprite->pos2.y += sub_8097728(0x47 - sprite->data[6]); + break; + case 2: + sprite->pos2.x -= sub_809773C(sprite->data[6]); + sprite->pos2.y += sub_8097728(sprite->data[6]); + break; + case 3: + sprite->pos2.x += sub_809773C(0x47 - sprite->data[6]); + sprite->pos2.y += sub_8097728(0x47 - sprite->data[6]); + break; + } + if(++sprite->data[6] == 0x48) + { + sprite->data[6] = 0; + sprite->data[7]++; + } + if(sprite->data[7] == 0x4) + { + sprite->pos2.y = 0; + sprite->pos2.x = 0; + result = TRUE; + } + return result; +} + +s16 sub_8097820(s16 a1, u8 a2) +{ + return gUnknown_0850E834[a2][a1]; +} + +void sub_809783C(struct Sprite *sprite, u8 a2, u8 a3, u8 a4) +{ + sprite->data[3] = a2; + sprite->data[4] = a3; + sprite->data[5] = a4; + sprite->data[6] = 0; +} + +u8 sub_809785C(struct Sprite *sprite) +{ + s16 v5[3]; + u8 v6[3]; + u8 v2; + + memcpy(v5, gUnknown_0850E840, 6); // TODO: get rid of memcpy + memcpy(v6, gUnknown_0850E846, 3); + v2 = 0; + + if (sprite->data[4]) + little_step(sprite, sprite->data[3]); + + sprite->pos2.y = sub_8097820(sprite->data[6] >> v6[sprite->data[4]], sprite->data[5]); + + sprite->data[6]++; + + if (sprite->data[6] == (v5[sprite->data[4]] >> 1)) + v2 = 1; + + if (sprite->data[6] >= v5[sprite->data[4]]) + { + sprite->pos2.y = 0; + v2 = -1; + } + + return v2; +} + +u8 sub_80978E4(struct Sprite *sprite) +{ + s16 v5[3]; + u8 v6[3]; + u8 v2; + + memcpy(v5, gUnknown_0850E84A, 6); + memcpy(v6, gUnknown_0850E850, 3); + v2 = 0; + + if (sprite->data[4] && !(sprite->data[6] & 1)) + little_step(sprite, sprite->data[3]); + + sprite->pos2.y = sub_8097820(sprite->data[6] >> v6[sprite->data[4]], sprite->data[5]); + + sprite->data[6]++; + + if (sprite->data[6] == (v5[sprite->data[4]] >> 1)) + v2 = 1; + + if (sprite->data[6] >= v5[sprite->data[4]]) + { + sprite->pos2.y = 0; + v2 = -1; + } + + return v2; +} + +void SetFieldObjectStepTimer(struct Sprite *sprite, s16 timer) +{ + sprite->data[3] = timer; +} + +bool8 RunFieldObjectStepTimer(struct Sprite *sprite) +{ + sprite->data[3]--; + + if (sprite->data[3] == 0) + return TRUE; + else + return FALSE; +} + +void obj_anim_image_set_and_seek(struct Sprite *sprite, u8 a2, u8 a3) +{ + sprite->animNum = a2; + sprite->animPaused = 0 ; + SeekSpriteAnim(sprite, a3); +} + +bool8 sub_80979BC(struct Sprite *sprite) +{ + if (sprite->animEnded) + return TRUE; + else + return FALSE; +} + +void sub_80979D4(struct Sprite *sprite, bool8 invisible) +{ + u16 x, y; + s16 x2, y2; + + sprite->invisible = invisible; + + if (sprite->coordOffsetEnabled) + { + x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX; + y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY; + } + else + { + x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX; + y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY; + } + + x2 = x - (sprite->centerToCornerVecX >> 1); + y2 = y - (sprite->centerToCornerVecY >> 1); + + if ((s16)x > 255 || x2 < -16) + sprite->invisible = 1; + if ((s16)y > 175 || y2 < -16) + sprite->invisible = 1; +} + +void sub_8097AC8(struct Sprite *sprite) +{ + sub_8097D68(sprite); + SetObjectSubpriorityByZCoord(sprite->data[1], sprite, 1); + sub_80979D4(sprite, sprite->data[2]); +} + +void sub_8097AF0(void) +{ + int i; + + for(i = 0; i < MAX_SPRITES; i++) + { + struct Sprite *sprite = &gSprites[i]; + if(sprite->inUse && sprite->callback == sub_8097AC8) + DestroySprite(sprite); + } +} + +int sub_8097B2C(u8 var) // this should return a u8, because all that call this shifts to u8, but it wont match because it doesnt shift u8 at the end. +{ + int i; + + for(i = 0; i < MAX_SPRITES; i++) + { + struct Sprite *sprite = &gSprites[i]; + if(sprite->inUse && sprite->callback == sub_8097AC8 && (u8)sprite->data[0] == var) + return i; + } + return MAX_SPRITES; +} + +void sub_8097B78(u8 var1, u8 var2) +{ + u8 spriteId = sub_8097B2C(var1); + + if(spriteId != MAX_SPRITES) + StartSpriteAnim(&gSprites[spriteId], FieldObjectDirectionToImageAnimId(var2)); +} + +void sub_8097BB4(u8 var1, u8 var2) +{ + int spriteId = sub_8097B2C(var1); + + if(spriteId != MAX_SPRITES) + { + struct Sprite *sprite = &gSprites[spriteId]; + const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(var2); + u16 tileNum = sprite->oam.tileNum; + + sprite->oam = *gfxInfo->oam; + sprite->oam.tileNum = tileNum; + sprite->oam.paletteNum = gfxInfo->paletteSlot; + sprite->images = gfxInfo->images; + + if(gfxInfo->subspriteTables == NULL) + { + sprite->subspriteTables = NULL; + sprite->subspriteTableNum = 0; + sprite->subspriteMode = 0; + } + else + { + SetSubspriteTables(sprite, gfxInfo->subspriteTables); + sprite->subspriteMode = 2; + } + StartSpriteAnim(sprite, 0); + } +} + +void sub_8097C44(u8 var, bool32 var2) +{ + u8 spriteId = sub_8097B2C(var); + + if(spriteId == MAX_SPRITES) + return; + + if(var2) + gSprites[spriteId].data[2] = 1; + else + gSprites[spriteId].data[2] = 0; +} + +bool32 sub_8097C8C(u8 var) +{ + u8 spriteId = sub_8097B2C(var); + + if(spriteId == MAX_SPRITES) + return FALSE; + + return (gSprites[spriteId].data[2] == TRUE); +} + +void sub_8097CC4(u8 var1, u8 var2) +{ + u8 spriteId = sub_8097B2C(var1); + + if(spriteId != MAX_SPRITES) + { + gSprites[spriteId].data[3] = var2; + gSprites[spriteId].data[4] = 0; + } +} + +void sub_8097CF4(struct Sprite *sprite) +{ + switch(sprite->data[4]) + { + case 0: + sprite->pos2.y = 0; + sprite->data[4]++; + case 1: + sprite->pos2.y -= 8; + if(sprite->pos2.y == -160) + { + sprite->pos2.y = 0; + sprite->data[2] = 1; + sprite->data[3] = 0; + sprite->data[4] = 0; + } + } +} + +void sub_8097D30(struct Sprite *sprite) +{ + switch(sprite->data[4]) + { + case 0: + sprite->pos2.y = -160; + sprite->data[4]++; + case 1: + sprite->pos2.y += 8; + if(sprite->pos2.y == 0) + { + sprite->data[3] = 0; + sprite->data[4] = 0; + } + } +} + +static void sub_8097D68(struct Sprite *sprite) +{ + switch(sprite->data[3]) + { + case 1: + sub_8097D30(sprite); + break; + case 2: + sub_8097CF4(sprite); + break; + case 0: + break; + default: + sprite->data[3] = 0; + break; + } +} + +bool32 sub_8097D9C(u8 var) +{ + u8 spriteId = sub_8097B2C(var); + + if(spriteId == MAX_SPRITES) + return FALSE; + + if(gSprites[spriteId].data[3] != FALSE) + return TRUE; + + return FALSE; +} + +u32 StartFieldEffectForEventObject(u8 fieldEffectId, struct MapObject *mapObject) +{ + FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + return FieldEffectStart(fieldEffectId); +} + +void DoShadowFieldEffect(struct MapObject *mapObject) +{ + if (!mapObject->hasShadow) + { + mapObject->hasShadow = 1; + StartFieldEffectForEventObject(FLDEFF_SHADOW, mapObject); + } +} + +void DoRippleFieldEffect(struct MapObject *mapObject, struct Sprite *sprite) +{ + const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId); + gFieldEffectArguments[0] = sprite->pos1.x; + gFieldEffectArguments[1] = sprite->pos1.y + (gfxInfo->height >> 1) - 2; + gFieldEffectArguments[2] = 151; + gFieldEffectArguments[3] = 3; + FieldEffectStart(FLDEFF_RIPPLE); +} + +bool32 sub_8097E50(struct MapObject *mapObject, struct Sprite *sprite) +{ + u32 one; + bool32 ableToStore = FALSE; + if (gUnknown_020375B8 == NULL) + { + gUnknown_020375B8 = AllocZeroed(0x14); + gUnknown_020375B8[0] = mapObject->localId; + // needed to match + gUnknown_020375B8[16] = (one = 1); + ableToStore = one; + } + else + { + u8 i; + u8 firstFreeSlot; + bool32 found; + for (firstFreeSlot = 16, found = FALSE, i = 0; i < 16; i++) + { + if (firstFreeSlot == 16 && gUnknown_020375B8[i] == 0) + firstFreeSlot = i; + + if (gUnknown_020375B8[i] == mapObject->localId) + { + found = TRUE; + break; + } + } + + if (!found && firstFreeSlot != 16) + { + gUnknown_020375B8[firstFreeSlot] = mapObject->localId; + gUnknown_020375B8[16]++; + ableToStore = TRUE; + } + } + + if (ableToStore == TRUE) + { + mapObject->inanimate = TRUE; + mapObject->facingDirectionLocked = TRUE; + } + + sprite->data[2] = 1; + return TRUE; +} + +bool32 sub_8097EF0(struct MapObject *mapObject, struct Sprite *sprite) +{ + bool32 ableToStore; + u8 id; + + sprite->data[2] = 1; + if (gUnknown_020375B8 != NULL) + { + ableToStore = FALSE; + id = sub_8097F78(mapObject); + if (id != 16) + { + gUnknown_020375B8[id] = 0; + gUnknown_020375B8[16]--; + ableToStore = TRUE; + } + if (gUnknown_020375B8[16] == 0) + FREE_AND_SET_NULL(gUnknown_020375B8); + if (ableToStore == TRUE) + { + mapObject->inanimate = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->inanimate; + mapObject->facingDirectionLocked = 0; + sprite->animPaused = 0; + } + } + + return TRUE; +} + +u8 sub_8097F78(struct MapObject *mapObject) +{ + u8 i; + + for(i = 0; i < MAP_OBJECTS_COUNT; i++) + { + if(gUnknown_020375B8[i] == mapObject->localId) + return i; + } + return MAP_OBJECTS_COUNT; +} + +void sub_8097FA4(struct MapObject *mapObject) +{ + u8 taskId = CreateTask(sub_8097FE4, 0xFF); + struct Task *task = &gTasks[taskId]; + + StoreWordInTwoHalfwords(&task->data[0], (u32)mapObject); + mapObject->warpArrowSpriteId = taskId; + task->data[3] = 0xFFFF; +} + +static void sub_8097FE4(u8 taskId) +{ + struct MapObject *mapObject; + struct Sprite *sprite; + struct Task *task = &gTasks[taskId]; + + LoadWordFromTwoHalfwords(&task->data[0], (u32 *)&mapObject); // load the map object pointer. + sprite = &gSprites[mapObject->spriteId]; + + if(!(task->data[2] & 0x3)) + sprite->pos2.y += task->data[3]; + + if(!(task->data[2] & 0xF)) + task->data[3] = -task->data[3]; + + task->data[2]++; +} + +void sub_8098044(u8 taskId) +{ + u32 word; + struct Task *task = &gTasks[taskId]; + + LoadWordFromTwoHalfwords(&task->data[0], &word); // huh??? why does it load a word that never gets used??? + DestroyTask(taskId); +} + +void sub_8098074(u8 var1, u8 var2) +{ + u8 i; + + for(i = 0; i < MAP_OBJECTS_COUNT; i++) + { + if(i != var1 && i != var2 && + gMapObjects[i].active && i != gPlayerAvatar.mapObjectId) + FreezeMapObject(&gMapObjects[i]); + } +} + +bool32 sub_80980C0(struct MapObject *mapObject, struct Sprite *sprite) +{ + sprite->pos2.y = 0; + sprite->data[2]++; + return FALSE; +} + +bool32 sub_80980D0(struct MapObject *mapObject, struct Sprite *sprite) +{ + sprite->pos2.y -= 8; + + if(sprite->pos2.y == -160) + sprite->data[2]++; + return FALSE; +} + +bool32 sub_80980F4(struct MapObject *mapObject, struct Sprite *sprite) +{ + sprite->pos2.y = -160; + sprite->data[2]++; + return FALSE; +} + +bool32 sub_8098108(struct MapObject *mapObject, struct Sprite *sprite) +{ + sprite->pos2.y += 8; + + if(!sprite->pos2.y) + sprite->data[2]++; + return FALSE; +} + +// though this function returns TRUE without doing anything, this header is required due to being in an array of functions which needs it. +bool32 sub_8098124(struct MapObject *mapObject, struct Sprite *sprite) +{ + return TRUE; +} diff --git a/src/event_object_movement_helpers.c b/src/event_object_movement_helpers.c deleted file mode 100755 index 6a8b410f5f..0000000000 --- a/src/event_object_movement_helpers.c +++ /dev/null @@ -1,704 +0,0 @@ -#include "global.h" -#include "event_object_movement.h" -#include "field_effect.h" -#include "event_object_movement_helpers.h" -#include "malloc.h" -#include "task.h" -#include "util.h" - -typedef void (*SpriteStepFunc)(struct Sprite *sprite, u8 dir); - -extern const struct Coords16 gUnknown_0850DB7C[4]; -extern s16 gUnknown_0850E768[]; -extern SpriteStepFunc *const gUnknown_0850E754[]; -extern const s8 gUnknown_0850E772[]; -extern const s8 gUnknown_0850E7BA[]; -extern const s8 *const gUnknown_0850E834[]; -extern s16 gUnknown_0850E840[]; -extern u8 gUnknown_0850E846[]; -extern s16 gUnknown_0850E84A[]; -extern u8 gUnknown_0850E850[]; - -void sub_8097D68(struct Sprite *sprite); -void sub_8097FE4(u8); - -bool8 FreezeMapObject(struct MapObject *mapObject) -{ - if (mapObject->heldMovementActive || mapObject->frozen) - { - return TRUE; - } - else - { - mapObject->frozen = 1; - mapObject->spriteAnimPausedBackup = gSprites[mapObject->spriteId].animPaused; - mapObject->spriteAffineAnimPausedBackup = gSprites[mapObject->spriteId].affineAnimPaused; - gSprites[mapObject->spriteId].animPaused = 1; - gSprites[mapObject->spriteId].affineAnimPaused = 1; - return FALSE; - } -} - -void FreezeMapObjects(void) -{ - u8 i; - for (i = 0; i < MAP_OBJECTS_COUNT; i++) - if (gMapObjects[i].active && i != gPlayerAvatar.mapObjectId) - FreezeMapObject(&gMapObjects[i]); -} - -void FreezeMapObjectsExceptOne(u8 a1) -{ - u8 i; - for (i = 0; i < MAP_OBJECTS_COUNT; i++) - if (i != a1 && gMapObjects[i].active && i != gPlayerAvatar.mapObjectId) - FreezeMapObject(&gMapObjects[i]); -} - -void npc_sync_anim_pause_bits(struct MapObject *mapObject) -{ - if (mapObject->active && mapObject->frozen) - { - mapObject->frozen = 0; - gSprites[mapObject->spriteId].animPaused = mapObject->spriteAnimPausedBackup; - gSprites[mapObject->spriteId].affineAnimPaused = mapObject->spriteAffineAnimPausedBackup; - } -} - -void UnfreezeMapObjects(void) -{ - u8 i; - for (i = 0; i < MAP_OBJECTS_COUNT; i++) - if (gMapObjects[i].active) - npc_sync_anim_pause_bits(&gMapObjects[i]); -} - -void little_step(struct Sprite *sprite, u8 dir) -{ - sprite->pos1.x += gUnknown_0850DB7C[dir].x; - sprite->pos1.y += gUnknown_0850DB7C[dir].y; -} - -void double_little_steps(struct Sprite *sprite, u8 dir) -{ - sprite->pos1.x += 2 * (u16) gUnknown_0850DB7C[dir].x; - sprite->pos1.y += 2 * (u16) gUnknown_0850DB7C[dir].y; -} - -void triple_little_steps(struct Sprite *sprite, u8 dir) -{ - sprite->pos1.x += 2 * (u16) gUnknown_0850DB7C[dir].x + (u16) gUnknown_0850DB7C[dir].x; - sprite->pos1.y += 2 * (u16) gUnknown_0850DB7C[dir].y + (u16) gUnknown_0850DB7C[dir].y; -} - -void quad_little_steps(struct Sprite *sprite, u8 dir) -{ - sprite->pos1.x += 4 * (u16) gUnknown_0850DB7C[dir].x; - sprite->pos1.y += 4 * (u16) gUnknown_0850DB7C[dir].y; -} - -void oct_little_steps(struct Sprite *sprite, u8 dir) -{ - sprite->pos1.x += 8 * (u16) gUnknown_0850DB7C[dir].x; - sprite->pos1.y += 8 * (u16) gUnknown_0850DB7C[dir].y; -} - -void oamt_npc_ministep_reset(struct Sprite *sprite, u8 a2, u8 a3) -{ - sprite->data[3] = a2; - sprite->data[4] = a3; - sprite->data[5] = 0; -} - -bool8 obj_npc_ministep(struct Sprite *sprite) -{ - if (sprite->data[5] >= gUnknown_0850E768[sprite->data[4]]) - return FALSE; - - gUnknown_0850E754[sprite->data[4]][sprite->data[5]](sprite, sprite->data[3]); - - sprite->data[5]++; - - if (sprite->data[5] < gUnknown_0850E768[sprite->data[4]]) - return FALSE; - - return TRUE; -} - -void sub_80976DC(struct Sprite *sprite, u8 a2) -{ - sprite->data[3] = a2; - sprite->data[4] = 0; - sprite->data[5] = 0; -} - -bool8 sub_80976EC(struct Sprite *sprite) -{ - if (!(sprite->data[4] & 1)) - { - little_step(sprite, sprite->data[3]); - sprite->data[5]++; - } - - sprite->data[4]++; - - if (sprite->data[5] > 15) - return TRUE; - else - return FALSE; -} - -// new helper added here in the middle. Perhaps Game Freak kept these organized in alphebetical order or some other heirarchy? - -s16 sub_8097728(s16 a1) -{ - return gUnknown_0850E7BA[a1]; -} - -s16 sub_809773C(s16 a1) -{ - return gUnknown_0850E772[a1]; -} - -void sub_8097750(struct Sprite *sprite) -{ - sprite->data[6] = 0; - sprite->data[7] = 0; -} - -bool8 sub_8097758(struct Sprite *sprite) -{ - bool8 result = FALSE; - - switch(sprite->data[7]) - { - case 0: - sprite->pos2.x += sub_809773C(sprite->data[6]); - sprite->pos2.y += sub_8097728(sprite->data[6]); - break; - case 1: - sprite->pos2.x -= sub_809773C(0x47 - sprite->data[6]); - sprite->pos2.y += sub_8097728(0x47 - sprite->data[6]); - break; - case 2: - sprite->pos2.x -= sub_809773C(sprite->data[6]); - sprite->pos2.y += sub_8097728(sprite->data[6]); - break; - case 3: - sprite->pos2.x += sub_809773C(0x47 - sprite->data[6]); - sprite->pos2.y += sub_8097728(0x47 - sprite->data[6]); - break; - } - if(++sprite->data[6] == 0x48) - { - sprite->data[6] = 0; - sprite->data[7]++; - } - if(sprite->data[7] == 0x4) - { - sprite->pos2.y = 0; - sprite->pos2.x = 0; - result = TRUE; - } - return result; -} - -s16 sub_8097820(s16 a1, u8 a2) -{ - return gUnknown_0850E834[a2][a1]; -} - -void sub_809783C(struct Sprite *sprite, u8 a2, u8 a3, u8 a4) -{ - sprite->data[3] = a2; - sprite->data[4] = a3; - sprite->data[5] = a4; - sprite->data[6] = 0; -} - -u8 sub_809785C(struct Sprite *sprite) -{ - s16 v5[3]; - u8 v6[3]; - u8 v2; - - memcpy(v5, gUnknown_0850E840, 6); // TODO: get rid of memcpy - memcpy(v6, gUnknown_0850E846, 3); - v2 = 0; - - if (sprite->data[4]) - little_step(sprite, sprite->data[3]); - - sprite->pos2.y = sub_8097820(sprite->data[6] >> v6[sprite->data[4]], sprite->data[5]); - - sprite->data[6]++; - - if (sprite->data[6] == (v5[sprite->data[4]] >> 1)) - v2 = 1; - - if (sprite->data[6] >= v5[sprite->data[4]]) - { - sprite->pos2.y = 0; - v2 = -1; - } - - return v2; -} - -u8 sub_80978E4(struct Sprite *sprite) -{ - s16 v5[3]; - u8 v6[3]; - u8 v2; - - memcpy(v5, gUnknown_0850E84A, 6); - memcpy(v6, gUnknown_0850E850, 3); - v2 = 0; - - if (sprite->data[4] && !(sprite->data[6] & 1)) - little_step(sprite, sprite->data[3]); - - sprite->pos2.y = sub_8097820(sprite->data[6] >> v6[sprite->data[4]], sprite->data[5]); - - sprite->data[6]++; - - if (sprite->data[6] == (v5[sprite->data[4]] >> 1)) - v2 = 1; - - if (sprite->data[6] >= v5[sprite->data[4]]) - { - sprite->pos2.y = 0; - v2 = -1; - } - - return v2; -} - -void SetFieldObjectStepTimer(struct Sprite *sprite, u16 timer) -{ - sprite->data[3] = timer; -} - - -bool8 RunFieldObjectStepTimer(struct Sprite *sprite) -{ - sprite->data[3]--; - - if (sprite->data[3] == 0) - return TRUE; - else - return FALSE; -} - -void obj_anim_image_set_and_seek(struct Sprite *sprite, u8 a2, u8 a3) -{ - sprite->animNum = a2; - sprite->animPaused = 0 ; - SeekSpriteAnim(sprite, a3); -} - -bool8 sub_80979BC(struct Sprite *sprite) -{ - if (sprite->animEnded) - return TRUE; - else - return FALSE; -} - -void sub_80979D4(struct Sprite *sprite, bool8 invisible) -{ - u16 x, y; - s16 x2, y2; - - sprite->invisible = invisible; - - if (sprite->coordOffsetEnabled) - { - x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX; - y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY; - } - else - { - x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX; - y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY; - } - - x2 = x - (sprite->centerToCornerVecX >> 1); - y2 = y - (sprite->centerToCornerVecY >> 1); - - if ((s16)x > 255 || x2 < -16) - sprite->invisible = 1; - if ((s16)y > 175 || y2 < -16) - sprite->invisible = 1; -} - -void sub_8097AC8(struct Sprite *sprite) -{ - sub_8097D68(sprite); - SetObjectSubpriorityByZCoord(sprite->data[1], sprite, 1); - sub_80979D4(sprite, sprite->data[2]); -} - -void sub_8097AF0(void) -{ - int i; - - for(i = 0; i < MAX_SPRITES; i++) - { - struct Sprite *sprite = &gSprites[i]; - if(sprite->inUse && sprite->callback == sub_8097AC8) - DestroySprite(sprite); - } -} - -int sub_8097B2C(u8 var) // this should return a u8, because all that call this shifts to u8, but it wont match because it doesnt shift u8 at the end. -{ - int i; - - for(i = 0; i < MAX_SPRITES; i++) - { - struct Sprite *sprite = &gSprites[i]; - if(sprite->inUse && sprite->callback == sub_8097AC8 && (u8)sprite->data[0] == var) - return i; - } - return MAX_SPRITES; -} - -void sub_8097B78(u8 var1, u8 var2) -{ - u8 spriteId = sub_8097B2C(var1); - - if(spriteId != MAX_SPRITES) - StartSpriteAnim(&gSprites[spriteId], FieldObjectDirectionToImageAnimId(var2)); -} - -void sub_8097BB4(u8 var1, u8 var2) -{ - int spriteId = sub_8097B2C(var1); - - if(spriteId != MAX_SPRITES) - { - struct Sprite *sprite = &gSprites[spriteId]; - const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(var2); - u16 tileNum = sprite->oam.tileNum; - - sprite->oam = *gfxInfo->oam; - sprite->oam.tileNum = tileNum; - sprite->oam.paletteNum = gfxInfo->paletteSlot; - sprite->images = gfxInfo->images; - - if(gfxInfo->subspriteTables == NULL) - { - sprite->subspriteTables = NULL; - sprite->subspriteTableNum = 0; - sprite->subspriteMode = 0; - } - else - { - SetSubspriteTables(sprite, gfxInfo->subspriteTables); - sprite->subspriteMode = 2; - } - StartSpriteAnim(sprite, 0); - } -} - -void sub_8097C44(u8 var, bool32 var2) -{ - u8 spriteId = sub_8097B2C(var); - - if(spriteId == MAX_SPRITES) - return; - - if(var2) - gSprites[spriteId].data[2] = 1; - else - gSprites[spriteId].data[2] = 0; -} - -bool32 sub_8097C8C(u8 var) -{ - u8 spriteId = sub_8097B2C(var); - - if(spriteId == MAX_SPRITES) - return FALSE; - - return (gSprites[spriteId].data[2] == TRUE); -} - -void sub_8097CC4(u8 var1, u8 var2) -{ - u8 spriteId = sub_8097B2C(var1); - - if(spriteId != MAX_SPRITES) - { - gSprites[spriteId].data[3] = var2; - gSprites[spriteId].data[4] = 0; - } -} - -void sub_8097CF4(struct Sprite *sprite) -{ - switch(sprite->data[4]) - { - case 0: - sprite->pos2.y = 0; - sprite->data[4]++; - case 1: - sprite->pos2.y -= 8; - if(sprite->pos2.y == -160) - { - sprite->pos2.y = 0; - sprite->data[2] = 1; - sprite->data[3] = 0; - sprite->data[4] = 0; - } - } -} - -void sub_8097D30(struct Sprite *sprite) -{ - switch(sprite->data[4]) - { - case 0: - sprite->pos2.y = -160; - sprite->data[4]++; - case 1: - sprite->pos2.y += 8; - if(sprite->pos2.y == 0) - { - sprite->data[3] = 0; - sprite->data[4] = 0; - } - } -} - -void sub_8097D68(struct Sprite *sprite) -{ - switch(sprite->data[3]) - { - case 1: - sub_8097D30(sprite); - break; - case 2: - sub_8097CF4(sprite); - break; - case 0: - break; - default: - sprite->data[3] = 0; - break; - } -} - -bool32 sub_8097D9C(u8 var) -{ - u8 spriteId = sub_8097B2C(var); - - if(spriteId == MAX_SPRITES) - return FALSE; - - if(gSprites[spriteId].data[3] != FALSE) - return TRUE; - - return FALSE; -} - -u32 StartFieldEffectForEventObject(u8 fieldEffectId, struct MapObject *mapObject) -{ - FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); - return FieldEffectStart(fieldEffectId); -} - -void DoShadowFieldEffect(struct MapObject *mapObject) -{ - if (!mapObject->hasShadow) - { - mapObject->hasShadow = 1; - StartFieldEffectForEventObject(FLDEFF_SHADOW, mapObject); - } -} - -void DoRippleFieldEffect(struct MapObject *mapObject, struct Sprite *sprite) -{ - const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId); - gFieldEffectArguments[0] = sprite->pos1.x; - gFieldEffectArguments[1] = sprite->pos1.y + (gfxInfo->height >> 1) - 2; - gFieldEffectArguments[2] = 151; - gFieldEffectArguments[3] = 3; - FieldEffectStart(FLDEFF_RIPPLE); -} - -bool32 sub_8097E50(struct MapObject *mapObject, struct Sprite *sprite) -{ - u32 one; - bool32 ableToStore = FALSE; - if (gUnknown_020375B8 == NULL) - { - gUnknown_020375B8 = AllocZeroed(0x14); - gUnknown_020375B8[0] = mapObject->localId; - // needed to match - gUnknown_020375B8[16] = (one = 1); - ableToStore = one; - } - else - { - u8 i; - u8 firstFreeSlot; - bool32 found; - for (firstFreeSlot = 16, found = FALSE, i = 0; i < 16; i++) - { - if (firstFreeSlot == 16 && gUnknown_020375B8[i] == 0) - firstFreeSlot = i; - - if (gUnknown_020375B8[i] == mapObject->localId) - { - found = TRUE; - break; - } - } - - if (!found && firstFreeSlot != 16) - { - gUnknown_020375B8[firstFreeSlot] = mapObject->localId; - gUnknown_020375B8[16]++; - ableToStore = TRUE; - } - } - - if (ableToStore == TRUE) - { - mapObject->inanimate = TRUE; - mapObject->facingDirectionLocked = TRUE; - } - - sprite->data[2] = 1; - return TRUE; -} - -bool32 sub_8097EF0(struct MapObject *mapObject, struct Sprite *sprite) -{ - bool32 ableToStore; - u8 id; - - sprite->data[2] = 1; - if (gUnknown_020375B8 != NULL) - { - ableToStore = FALSE; - id = sub_8097F78(mapObject); - if (id != 16) - { - gUnknown_020375B8[id] = 0; - gUnknown_020375B8[16]--; - ableToStore = TRUE; - } - if (gUnknown_020375B8[16] == 0) - FREE_AND_SET_NULL(gUnknown_020375B8); - if (ableToStore == TRUE) - { - mapObject->inanimate = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->inanimate; - mapObject->facingDirectionLocked = 0; - sprite->animPaused = 0; - } - } - - return TRUE; -} - -u8 sub_8097F78(struct MapObject *mapObject) -{ - u8 i; - - for(i = 0; i < MAP_OBJECTS_COUNT; i++) - { - if(gUnknown_020375B8[i] == mapObject->localId) - return i; - } - return MAP_OBJECTS_COUNT; -} - -void sub_8097FA4(struct MapObject *mapObject) -{ - u8 taskId = CreateTask(sub_8097FE4, 0xFF); - struct Task *task = &gTasks[taskId]; - - StoreWordInTwoHalfwords(&task->data[0], (u32)mapObject); - mapObject->warpArrowSpriteId = taskId; - task->data[3] = 0xFFFF; -} - -void sub_8097FE4(u8 taskId) -{ - struct MapObject *mapObject; - struct Sprite *sprite; - struct Task *task = &gTasks[taskId]; - - LoadWordFromTwoHalfwords(&task->data[0], (u32 *)&mapObject); // load the map object pointer. - sprite = &gSprites[mapObject->spriteId]; - - if(!(task->data[2] & 0x3)) - sprite->pos2.y += task->data[3]; - - if(!(task->data[2] & 0xF)) - task->data[3] = -task->data[3]; - - task->data[2]++; -} - -void sub_8098044(u8 taskId) -{ - u32 word; - struct Task *task = &gTasks[taskId]; - - LoadWordFromTwoHalfwords(&task->data[0], &word); // huh??? why does it load a word that never gets used??? - DestroyTask(taskId); -} - -void sub_8098074(u8 var1, u8 var2) -{ - u8 i; - - for(i = 0; i < MAP_OBJECTS_COUNT; i++) - { - if(i != var1 && i != var2 && - gMapObjects[i].active && i != gPlayerAvatar.mapObjectId) - FreezeMapObject(&gMapObjects[i]); - } -} - -bool32 sub_80980C0(struct MapObject *mapObject, struct Sprite *sprite) -{ - sprite->pos2.y = 0; - sprite->data[2]++; - return FALSE; -} - -bool32 sub_80980D0(struct MapObject *mapObject, struct Sprite *sprite) -{ - sprite->pos2.y -= 8; - - if(sprite->pos2.y == -160) - sprite->data[2]++; - return FALSE; -} - -bool32 sub_80980F4(struct MapObject *mapObject, struct Sprite *sprite) -{ - sprite->pos2.y = -160; - sprite->data[2]++; - return FALSE; -} - -bool32 sub_8098108(struct MapObject *mapObject, struct Sprite *sprite) -{ - sprite->pos2.y += 8; - - if(!sprite->pos2.y) - sprite->data[2]++; - return FALSE; -} - -// though this function returns TRUE without doing anything, this header is required due to being in an array of functions which needs it. -bool32 sub_8098124(struct MapObject *mapObject, struct Sprite *sprite) -{ - return TRUE; -} From 7de91ed6ae110dbc08ece5626dc41243122a24ff Mon Sep 17 00:00:00 2001 From: Avara <31101124+Mother-Of-Dragons@users.noreply.github.com> Date: Mon, 11 Jun 2018 21:22:41 +0100 Subject: [PATCH 05/55] updated label names --- src/tileset_anims.c | 356 ++++++++++++++++++++++---------------------- 1 file changed, 178 insertions(+), 178 deletions(-) diff --git a/src/tileset_anims.c b/src/tileset_anims.c index f89cfdd2bd..70280170f5 100644 --- a/src/tileset_anims.c +++ b/src/tileset_anims.c @@ -33,86 +33,86 @@ static void cur_mapheader_run_tileset2_func(void); // .rodata -const u16 gUnknown_085105C4[] = INCBIN_U16("data/tilesets/primary/general/anim/0/1.4bpp"); +const u16 gTilesetAnims_General0_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/0/1.4bpp"); -const u16 gUnknown_08510644[] = INCBIN_U16("data/tilesets/primary/general/anim/0/0.4bpp"); +const u16 gTilesetAnims_General0_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/0/0.4bpp"); -const u16 gUnknown_085106C4[] = INCBIN_U16("data/tilesets/primary/general/anim/0/2.4bpp"); +const u16 gTilesetAnims_General0_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/0/2.4bpp"); const u16 tileset_anims_space_0[16] = {}; const u16 *const gTilesetAnims_General0[] = { - gUnknown_08510644, - gUnknown_085105C4, - gUnknown_08510644, - gUnknown_085106C4 + gTilesetAnims_General0_Frame0, + gTilesetAnims_General0_Frame1, + gTilesetAnims_General0_Frame0, + gTilesetAnims_General0_Frame2 }; -const u16 gUnknown_08510774[] = INCBIN_U16("data/tilesets/primary/general/anim/1/0.4bpp"); +const u16 gTilesetAnims_General1_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/1/0.4bpp"); -const u16 gUnknown_08510B34[] = INCBIN_U16("data/tilesets/primary/general/anim/1/1.4bpp"); +const u16 gTilesetAnims_General1_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/1/1.4bpp"); -const u16 gUnknown_08510EF4[] = INCBIN_U16("data/tilesets/primary/general/anim/1/2.4bpp"); +const u16 gTilesetAnims_General1_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/1/2.4bpp"); -const u16 gUnknown_085112B4[] = INCBIN_U16("data/tilesets/primary/general/anim/1/3.4bpp"); +const u16 gTilesetAnims_General1_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/1/3.4bpp"); -const u16 gUnknown_08511674[] = INCBIN_U16("data/tilesets/primary/general/anim/1/4.4bpp"); +const u16 gTilesetAnims_General1_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/1/4.4bpp"); -const u16 gUnknown_08511A34[] = INCBIN_U16("data/tilesets/primary/general/anim/1/5.4bpp"); +const u16 gTilesetAnims_General1_Frame5[] = INCBIN_U16("data/tilesets/primary/general/anim/1/5.4bpp"); -const u16 gUnknown_08511DF4[] = INCBIN_U16("data/tilesets/primary/general/anim/1/6.4bpp"); +const u16 gTilesetAnims_General1_Frame6[] = INCBIN_U16("data/tilesets/primary/general/anim/1/6.4bpp"); -const u16 gUnknown_085121B4[] = INCBIN_U16("data/tilesets/primary/general/anim/1/7.4bpp"); +const u16 gTilesetAnims_General1_Frame7[] = INCBIN_U16("data/tilesets/primary/general/anim/1/7.4bpp"); const u16 *const gTilesetAnims_General1[] = { - gUnknown_08510774, - gUnknown_08510B34, - gUnknown_08510EF4, - gUnknown_085112B4, - gUnknown_08511674, - gUnknown_08511A34, - gUnknown_08511DF4, - gUnknown_085121B4 + gTilesetAnims_General1_Frame0, + gTilesetAnims_General1_Frame1, + gTilesetAnims_General1_Frame2, + gTilesetAnims_General1_Frame3, + gTilesetAnims_General1_Frame4, + gTilesetAnims_General1_Frame5, + gTilesetAnims_General1_Frame6, + gTilesetAnims_General1_Frame7 }; -const u16 gUnknown_08512594[] = INCBIN_U16("data/tilesets/primary/general/anim/2/0.4bpp"); +const u16 gTilesetAnims_General2_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/2/0.4bpp"); -const u16 gUnknown_085126D4[] = INCBIN_U16("data/tilesets/primary/general/anim/2/1.4bpp"); +const u16 gTilesetAnims_General2_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/2/1.4bpp"); -const u16 gUnknown_08512814[] = INCBIN_U16("data/tilesets/primary/general/anim/2/2.4bpp"); +const u16 gTilesetAnims_General2_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/2/2.4bpp"); -const u16 gUnknown_08512954[] = INCBIN_U16("data/tilesets/primary/general/anim/2/3.4bpp"); +const u16 gTilesetAnims_General2_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/2/3.4bpp"); -const u16 gUnknown_08512A94[] = INCBIN_U16("data/tilesets/primary/general/anim/2/4.4bpp"); +const u16 gTilesetAnims_General2_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/2/4.4bpp"); -const u16 gUnknown_08512BD4[] = INCBIN_U16("data/tilesets/primary/general/anim/2/5.4bpp"); +const u16 gTilesetAnims_General2_Frame5[] = INCBIN_U16("data/tilesets/primary/general/anim/2/5.4bpp"); -const u16 gUnknown_08512D14[] = INCBIN_U16("data/tilesets/primary/general/anim/2/6.4bpp"); +const u16 gTilesetAnims_General2_Frame6[] = INCBIN_U16("data/tilesets/primary/general/anim/2/6.4bpp"); const u16 *const gTilesetAnims_General2[] = { - gUnknown_08512594, - gUnknown_085126D4, - gUnknown_08512814, - gUnknown_08512954, - gUnknown_08512A94, - gUnknown_08512BD4, - gUnknown_08512D14, - gUnknown_08512594 + gTilesetAnims_General2_Frame0, + gTilesetAnims_General2_Frame1, + gTilesetAnims_General2_Frame2, + gTilesetAnims_General2_Frame3, + gTilesetAnims_General2_Frame4, + gTilesetAnims_General2_Frame5, + gTilesetAnims_General2_Frame6, + gTilesetAnims_General2_Frame0 }; -const u16 gUnknown_08512E74[] = INCBIN_U16("data/tilesets/primary/general/anim/3/0.4bpp"); +const u16 gTilesetAnims_General3_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/3/0.4bpp"); -const u16 gUnknown_08512F34[] = INCBIN_U16("data/tilesets/primary/general/anim/3/1.4bpp"); +const u16 gTilesetAnims_General3_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/3/1.4bpp"); -const u16 gUnknown_08512FF4[] = INCBIN_U16("data/tilesets/primary/general/anim/3/2.4bpp"); +const u16 gTilesetAnims_General3_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/3/2.4bpp"); -const u16 gUnknown_085130B4[] = INCBIN_U16("data/tilesets/primary/general/anim/3/3.4bpp"); +const u16 gTilesetAnims_General3_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/3/3.4bpp"); const u16 *const gTilesetAnims_General3[] = { - gUnknown_08512E74, - gUnknown_08512F34, - gUnknown_08512FF4, - gUnknown_085130B4 + gTilesetAnims_General3_Frame0, + gTilesetAnims_General3_Frame1, + gTilesetAnims_General3_Frame2, + gTilesetAnims_General3_Frame3 }; const u16 gUnknown_08513184[] = INCBIN_U16("data/tilesets/primary/general/anim/4/0.4bpp"); @@ -158,19 +158,19 @@ const u16 *const gTilesetAnims_Pacifidlog0[] = { gUnknown_08513C64 }; -const u16 gUnknown_085143F4[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/0.4bpp"); +const u16 gTilesetAnims_Underwater0_Frame0[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/0.4bpp"); -const u16 gUnknown_08514474[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/1.4bpp"); +const u16 gTilesetAnims_Underwater0_Frame1[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/1.4bpp"); -const u16 gUnknown_085144F4[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/2.4bpp"); +const u16 gTilesetAnims_Underwater0_Frame2[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/2.4bpp"); -const u16 gUnknown_08514574[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/3.4bpp"); +const u16 gTilesetAnims_Underwater0_Frame3[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/3.4bpp"); const u16 *const gTilesetAnims_Underwater0[] = { - gUnknown_085143F4, - gUnknown_08514474, - gUnknown_085144F4, - gUnknown_08514574 + gTilesetAnims_Underwater0_Frame0, + gTilesetAnims_Underwater0_Frame1, + gTilesetAnims_Underwater0_Frame2, + gTilesetAnims_Underwater0_Frame3 }; const u16 gUnknown_08514604[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/0.4bpp"); @@ -326,24 +326,24 @@ const u16 *const gTilesetAnims_Rustboro0[] = { gUnknown_08515784 }; -const u16 gUnknown_08515844[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/1/0.4bpp"); +const u16 gTilesetAnims_Rustboro1_Frame0[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/1/0.4bpp"); -const u16 gUnknown_085158C4[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/1/1.4bpp"); +const u16 gTilesetAnims_Rustboro1_Frame1[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/1/1.4bpp"); const u16 tileset_anims_space_2[16] = {}; const u16 *const gTilesetAnims_Rustboro1[] = { - gUnknown_08515844, - gUnknown_085158C4 + gTilesetAnims_Rustboro1_Frame0, + gTilesetAnims_Rustboro1_Frame1 }; -const u16 gUnknown_0851596C[] = INCBIN_U16("data/tilesets/secondary/cave/anim/0.4bpp"); +const u16 gTilesetAnims_Lavaridge1_Cave0_Frame0[] = INCBIN_U16("data/tilesets/secondary/cave/anim/0.4bpp"); -const u16 gUnknown_085159EC[] = INCBIN_U16("data/tilesets/secondary/cave/anim/1.4bpp"); +const u16 gTilesetAnims_Lavaridge1_Cave0_Frame1[] = INCBIN_U16("data/tilesets/secondary/cave/anim/1.4bpp"); -const u16 gUnknown_08515A6C[] = INCBIN_U16("data/tilesets/secondary/cave/anim/2.4bpp"); +const u16 gTilesetAnims_Lavaridge1_Cave0_Frame2[] = INCBIN_U16("data/tilesets/secondary/cave/anim/2.4bpp"); -const u16 gUnknown_08515AEC[] = INCBIN_U16("data/tilesets/secondary/cave/anim/3.4bpp"); +const u16 gTilesetAnims_Lavaridge1_Cave0_Frame3[] = INCBIN_U16("data/tilesets/secondary/cave/anim/3.4bpp"); const u16 gUnknown_08515B6C[] = INCBIN_U16("data/tilesets/secondary/cave/anim/unused/0.4bpp"); @@ -356,27 +356,27 @@ const u16 gUnknown_08515CEC[] = INCBIN_U16("data/tilesets/secondary/cave/anim/un const u16 tileset_anims_space_3[16] = {}; const u16 *const gTilesetAnims_Lavaridge1_Cave0[] = { - gUnknown_0851596C, - gUnknown_085159EC, - gUnknown_08515A6C, - gUnknown_08515AEC + gTilesetAnims_Lavaridge1_Cave0_Frame0, + gTilesetAnims_Lavaridge1_Cave0_Frame1, + gTilesetAnims_Lavaridge1_Cave0_Frame2, + gTilesetAnims_Lavaridge1_Cave0_Frame3 }; -const u16 gUnknown_08515D9C[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/0.4bpp"); +const u16 gTilesetAnims_EverGrande0_Frame0[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/0.4bpp"); -const u16 gUnknown_08515E1C[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/1.4bpp"); +const u16 gTilesetAnims_EverGrande0_Frame1[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/1.4bpp"); -const u16 gUnknown_08515E9C[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/2.4bpp"); +const u16 gTilesetAnims_EverGrande0_Frame2[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/2.4bpp"); -const u16 gUnknown_08515F1C[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/3.4bpp"); +const u16 gTilesetAnims_EverGrande0_Frame3[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/3.4bpp"); -const u16 gUnknown_08515F9C[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/4.4bpp"); +const u16 gTilesetAnims_EverGrande0_Frame4[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/4.4bpp"); -const u16 gUnknown_0851601C[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/5.4bpp"); +const u16 gTilesetAnims_EverGrande0_Frame5[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/5.4bpp"); -const u16 gUnknown_0851609C[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/6.4bpp"); +const u16 gTilesetAnims_EverGrande0_Frame6[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/6.4bpp"); -const u16 gUnknown_0851611C[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/7.4bpp"); +const u16 gTilesetAnims_EverGrande0_Frame7[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/7.4bpp"); const u16 tileset_anims_space_4[16] = {}; @@ -392,172 +392,172 @@ u16 *const gTilesetAnims_EverGrandeVDests0[] = { }; const u16 *const gTilesetAnims_EverGrande0[] = { - gUnknown_08515D9C, - gUnknown_08515E1C, - gUnknown_08515E9C, - gUnknown_08515F1C, - gUnknown_08515F9C, - gUnknown_0851601C, - gUnknown_0851609C, - gUnknown_0851611C + gTilesetAnims_EverGrande0_Frame0, + gTilesetAnims_EverGrande0_Frame1, + gTilesetAnims_EverGrande0_Frame2, + gTilesetAnims_EverGrande0_Frame3, + gTilesetAnims_EverGrande0_Frame4, + gTilesetAnims_EverGrande0_Frame5, + gTilesetAnims_EverGrande0_Frame6, + gTilesetAnims_EverGrande0_Frame7 }; -const u16 gUnknown_085161FC[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/0.4bpp"); +const u16 gTilesetAnims_Dewford0_Frame0[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/0.4bpp"); -const u16 gUnknown_085162BC[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/1.4bpp"); +const u16 gTilesetAnims_Dewford0_Frame1[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/1.4bpp"); -const u16 gUnknown_0851637C[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/2.4bpp"); +const u16 gTilesetAnims_Dewford0_Frame2[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/2.4bpp"); -const u16 gUnknown_0851643C[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/3.4bpp"); +const u16 gTilesetAnims_Dewford0_Frame3[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/3.4bpp"); const u16 *const gTilesetAnims_Dewford0[] = { - gUnknown_085161FC, - gUnknown_085162BC, - gUnknown_0851637C, - gUnknown_0851643C + gTilesetAnims_Dewford0_Frame0, + gTilesetAnims_Dewford0_Frame1, + gTilesetAnims_Dewford0_Frame2, + gTilesetAnims_Dewford0_Frame3 }; -const u16 gUnknown_0851650C[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/0.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideWest0_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/0.4bpp"); -const u16 gUnknown_085165CC[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/1.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideWest0_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/1.4bpp"); -const u16 gUnknown_0851668C[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/2.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideWest0_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/2.4bpp"); -const u16 gUnknown_0851674C[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/3.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideWest0_Frame3[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/3.4bpp"); const u16 *const gTilesetAnims_BattleFrontierOutsideWest0[] = { - gUnknown_0851650C, - gUnknown_085165CC, - gUnknown_0851668C, - gUnknown_0851674C + gTilesetAnims_BattleFrontierOutsideWest0_Frame0, + gTilesetAnims_BattleFrontierOutsideWest0_Frame1, + gTilesetAnims_BattleFrontierOutsideWest0_Frame2, + gTilesetAnims_BattleFrontierOutsideWest0_Frame3 }; -const u16 gUnknown_0851681C[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/0.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideEast0_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/0.4bpp"); -const u16 gUnknown_085168DC[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/1.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideEast0_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/1.4bpp"); -const u16 gUnknown_0851699C[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/2.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideEast0_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/2.4bpp"); -const u16 gUnknown_08516A5C[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/3.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideEast0_Frame3[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/3.4bpp"); const u16 *const gTilesetAnims_BattleFrontierOutsideEast0[] = { - gUnknown_0851681C, - gUnknown_085168DC, - gUnknown_0851699C, - gUnknown_08516A5C + gTilesetAnims_BattleFrontierOutsideEast0_Frame0, + gTilesetAnims_BattleFrontierOutsideEast0_Frame1, + gTilesetAnims_BattleFrontierOutsideEast0_Frame2, + gTilesetAnims_BattleFrontierOutsideEast0_Frame3 }; -const u16 gUnknown_08516B2C[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/0.4bpp"); +const u16 gTilesetAnims_Slateport0_Frame0[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/0.4bpp"); -const u16 gUnknown_08516BAC[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/1.4bpp"); +const u16 gTilesetAnims_Slateport0_Frame1[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/1.4bpp"); -const u16 gUnknown_08516C2C[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/2.4bpp"); +const u16 gTilesetAnims_Slateport0_Frame2[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/2.4bpp"); -const u16 gUnknown_08516CAC[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/3.4bpp"); +const u16 gTilesetAnims_Slateport0_Frame3[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/3.4bpp"); const u16 *const gTilesetAnims_Slateport0[] = { - gUnknown_08516B2C, - gUnknown_08516BAC, - gUnknown_08516C2C, - gUnknown_08516CAC + gTilesetAnims_Slateport0_Frame0, + gTilesetAnims_Slateport0_Frame1, + gTilesetAnims_Slateport0_Frame2, + gTilesetAnims_Slateport0_Frame3 }; -const u16 gUnknown_08516D3C[] = INCBIN_U16("data/tilesets/primary/building/anim/0.4bpp"); +const u16 gTilesetAnims_InsideBuilding0_Frame0[] = INCBIN_U16("data/tilesets/primary/building/anim/0.4bpp"); -const u16 gUnknown_08516DBC[] = INCBIN_U16("data/tilesets/primary/building/anim/1.4bpp"); +const u16 gTilesetAnims_InsideBuilding0_Frame1[] = INCBIN_U16("data/tilesets/primary/building/anim/1.4bpp"); const u16 *const gTilesetAnims_InsideBuilding0[] = { - gUnknown_08516D3C, - gUnknown_08516DBC + gTilesetAnims_InsideBuilding0_Frame0, + gTilesetAnims_InsideBuilding0_Frame1 }; -const u16 gUnknown_08516E44[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/0/0.4bpp"); +const u16 gTilesetAnims_SootopolisGym0_Frame0[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/0/0.4bpp"); -const u16 gUnknown_08516FC4[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/0/1.4bpp"); +const u16 gTilesetAnims_SootopolisGym0_Frame1[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/0/1.4bpp"); -const u16 gUnknown_08517144[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/0/2.4bpp"); +const u16 gTilesetAnims_SootopolisGym0_Frame2[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/0/2.4bpp"); -const u16 gUnknown_085172C4[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/1/0.4bpp"); +const u16 gTilesetAnims_SootopolisGym1_Frame0[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/1/0.4bpp"); -const u16 gUnknown_08517544[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/1/1.4bpp"); +const u16 gTilesetAnims_SootopolisGym1_Frame1[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/1/1.4bpp"); -const u16 gUnknown_085177C4[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/1/2.4bpp"); +const u16 gTilesetAnims_SootopolisGym1_Frame2[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/1/2.4bpp"); const u16 *const gTilesetAnims_SootopolisGym0[] = { - gUnknown_08516E44, - gUnknown_08516FC4, - gUnknown_08517144 + gTilesetAnims_SootopolisGym0_Frame0, + gTilesetAnims_SootopolisGym0_Frame1, + gTilesetAnims_SootopolisGym0_Frame2 }; const u16 *const gTilesetAnims_SootopolisGym1[] = { - gUnknown_085172C4, - gUnknown_08517544, - gUnknown_085177C4 + gTilesetAnims_SootopolisGym1_Frame0, + gTilesetAnims_SootopolisGym1_Frame1, + gTilesetAnims_SootopolisGym1_Frame2 }; -const u16 gUnknown_08517A5C[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/1/0.4bpp"); +const u16 gTilesetAnims_EliteFour0_Frame0[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/1/0.4bpp"); -const u16 gUnknown_08517ADC[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/1/1.4bpp"); +const u16 gTilesetAnims_EliteFour0_Frame1[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/1/1.4bpp"); -const u16 gUnknown_08517B5C[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/0/0.4bpp"); +const u16 gTilesetAnims_EliteFour1_Frame0[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/0/0.4bpp"); -const u16 gUnknown_08517B7C[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/0/1.4bpp"); +const u16 gTilesetAnims_EliteFour1_Frame1[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/0/1.4bpp"); -const u16 gUnknown_08517B9C[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/0/2.4bpp"); +const u16 gTilesetAnims_EliteFour1_Frame2[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/0/2.4bpp"); -const u16 gUnknown_08517BBC[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/0/3.4bpp"); +const u16 gTilesetAnims_EliteFour1_Frame3[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/0/3.4bpp"); const u16 tileset_anims_space_5[16] = {}; const u16 *const gTilesetAnims_EliteFour1[] = { - gUnknown_08517B5C, - gUnknown_08517B7C, - gUnknown_08517B9C, - gUnknown_08517BBC + gTilesetAnims_EliteFour1_Frame0, + gTilesetAnims_EliteFour1_Frame1, + gTilesetAnims_EliteFour1_Frame2, + gTilesetAnims_EliteFour1_Frame3 }; const u16 *const gTilesetAnims_EliteFour0[] = { - gUnknown_08517A5C, - gUnknown_08517ADC + gTilesetAnims_EliteFour0_Frame0, + gTilesetAnims_EliteFour0_Frame1 }; -const u16 gUnknown_08517C14[] = INCBIN_U16("data/tilesets/secondary/mauville_gym/anim/0.4bpp"); +const u16 gTilesetAnims_MauvilleGym0_Frame0[] = INCBIN_U16("data/tilesets/secondary/mauville_gym/anim/0.4bpp"); -const u16 gUnknown_08517E14[] = INCBIN_U16("data/tilesets/secondary/mauville_gym/anim/1.4bpp"); +const u16 gTilesetAnims_MauvilleGym0_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville_gym/anim/1.4bpp"); const u16 tileset_anims_space_6[16] = {}; const u16 *const gTilesetAnims_MauvilleGym0[] = { - gUnknown_08517C14, - gUnknown_08517E14 + gTilesetAnims_MauvilleGym0_Frame0, + gTilesetAnims_MauvilleGym0_Frame1 }; -const u16 gUnknown_0851803C[] = INCBIN_U16("data/tilesets/secondary/bike_shop/anim/0.4bpp"); +const u16 gTilesetAnims_BikeShop0_Frame0[] = INCBIN_U16("data/tilesets/secondary/bike_shop/anim/0.4bpp"); -const u16 gUnknown_0851815C[] = INCBIN_U16("data/tilesets/secondary/bike_shop/anim/1.4bpp"); +const u16 gTilesetAnims_BikeShop0_Frame1[] = INCBIN_U16("data/tilesets/secondary/bike_shop/anim/1.4bpp"); const u16 tileset_anims_space_7[16] = {}; const u16 *const gTilesetAnims_BikeShop0[] = { - gUnknown_0851803C, - gUnknown_0851815C + gTilesetAnims_BikeShop0_Frame0, + gTilesetAnims_BikeShop0_Frame1 }; -const u16 gUnknown_085182A4[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/0.4bpp"); +const u16 gTilesetAnims_Sootopolis0_Frame0[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/0.4bpp"); -const u16 gUnknown_08518EA4[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/1.4bpp"); +const u16 gTilesetAnims_Sootopolis0_Frame1[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/1.4bpp"); -const u16 gUnknown_08519AA4[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/2.4bpp"); +const u16 gTilesetAnims_Sootopolis0_Frame2[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/2.4bpp"); -const u16 gUnknown_0851A6A4[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/3.4bpp"); +const u16 gTilesetAnims_Sootopolis0_Frame3[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/3.4bpp"); -const u16 gUnknown_0851B2A4[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/4.4bpp"); +const u16 gTilesetAnims_Sootopolis0_Frame4[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/4.4bpp"); -const u16 gUnknown_0851BEA4[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/5.4bpp"); +const u16 gTilesetAnims_Sootopolis0_Frame5[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/5.4bpp"); -const u16 gUnknown_0851CAA4[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/6.4bpp"); +const u16 gTilesetAnims_Sootopolis0_Frame6[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/6.4bpp"); -const u16 gUnknown_0851D6A4[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/7.4bpp"); +const u16 gTilesetAnims_Sootopolis0_Frame7[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/7.4bpp"); const u16 tileset_anims_space_8[16] = {}; @@ -570,29 +570,29 @@ const u16 gUnknown_0851F2C4[] = INCBIN_U16("data/tilesets/secondary/unused_1/2.4 const u16 gUnknown_0851FAC4[] = INCBIN_U16("data/tilesets/secondary/unused_1/3.4bpp"); const u16 *const gTilesetAnims_Sootopolis0[] = { - gUnknown_085182A4, - gUnknown_08518EA4, - gUnknown_08519AA4, - gUnknown_0851A6A4, - gUnknown_0851B2A4, - gUnknown_0851BEA4, - gUnknown_0851CAA4, - gUnknown_0851D6A4 + gTilesetAnims_Sootopolis0_Frame0, + gTilesetAnims_Sootopolis0_Frame1, + gTilesetAnims_Sootopolis0_Frame2, + gTilesetAnims_Sootopolis0_Frame3, + gTilesetAnims_Sootopolis0_Frame4, + gTilesetAnims_Sootopolis0_Frame5, + gTilesetAnims_Sootopolis0_Frame6, + gTilesetAnims_Sootopolis0_Frame7 }; -const u16 gUnknown_085202E4[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/0/0.4bpp"); +const u16 gTilesetAnims_BattlePyramid0_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/0/0.4bpp"); -const u16 gUnknown_085203E4[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/0/1.4bpp"); +const u16 gTilesetAnims_BattlePyramid0_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/0/1.4bpp"); -const u16 gUnknown_085204E4[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/0/2.4bpp"); +const u16 gTilesetAnims_BattlePyramid0_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/0/2.4bpp"); const u16 tileset_anims_space_9[16] = {}; -const u16 gUnknown_08520604[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/1/0.4bpp"); +const u16 gTilesetAnims_BattlePyramid1_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/1/0.4bpp"); -const u16 gUnknown_08520704[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/1/1.4bpp"); +const u16 gTilesetAnims_BattlePyramid1_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/1/1.4bpp"); -const u16 gUnknown_08520804[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/1/2.4bpp"); +const u16 gTilesetAnims_BattlePyramid1_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/1/2.4bpp"); const u16 tileset_anims_space_10[7808] = {}; @@ -603,15 +603,15 @@ const u16 tileset_anims_space_11[224] = {}; const u16 gUnknown_08524804[] = INCBIN_U16("data/tilesets/secondary/unused_2/1.4bpp"); const u16 *const gTilesetAnims_BattlePyramid0[] = { - gUnknown_085202E4, - gUnknown_085203E4, - gUnknown_085204E4 + gTilesetAnims_BattlePyramid0_Frame0, + gTilesetAnims_BattlePyramid0_Frame1, + gTilesetAnims_BattlePyramid0_Frame2 }; const u16 *const gTilesetAnims_BattlePyramid1[] = { - gUnknown_08520604, - gUnknown_08520704, - gUnknown_08520804 + gTilesetAnims_BattlePyramid1_Frame0, + gTilesetAnims_BattlePyramid1_Frame1, + gTilesetAnims_BattlePyramid1_Frame2 }; extern const u16 gUnknown_08D85640[]; From 3bed36276d34434ac5b87e57bf12180fec6147c0 Mon Sep 17 00:00:00 2001 From: Avara <31101124+Mother-Of-Dragons@users.noreply.github.com> Date: Mon, 11 Jun 2018 21:57:22 +0100 Subject: [PATCH 06/55] updated label names --- src/tileset_anims.c | 230 ++++++++++++++++++++++---------------------- 1 file changed, 115 insertions(+), 115 deletions(-) diff --git a/src/tileset_anims.c b/src/tileset_anims.c index 70280170f5..ebdea4b867 100644 --- a/src/tileset_anims.c +++ b/src/tileset_anims.c @@ -115,47 +115,47 @@ const u16 *const gTilesetAnims_General3[] = { gTilesetAnims_General3_Frame3 }; -const u16 gUnknown_08513184[] = INCBIN_U16("data/tilesets/primary/general/anim/4/0.4bpp"); +const u16 gTilesetAnims_General4_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/4/0.4bpp"); -const u16 gUnknown_085132C4[] = INCBIN_U16("data/tilesets/primary/general/anim/4/1.4bpp"); +const u16 gTilesetAnims_General4_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/4/1.4bpp"); -const u16 gUnknown_08513404[] = INCBIN_U16("data/tilesets/primary/general/anim/4/2.4bpp"); +const u16 gTilesetAnims_General4_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/4/2.4bpp"); -const u16 gUnknown_08513544[] = INCBIN_U16("data/tilesets/primary/general/anim/4/3.4bpp"); +const u16 gTilesetAnims_General4_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/4/3.4bpp"); const u16 *const gTilesetAnims_General4[] = { - gUnknown_08513184, - gUnknown_085132C4, - gUnknown_08513404, - gUnknown_08513544 + gTilesetAnims_General4_Frame0, + gTilesetAnims_General4_Frame1, + gTilesetAnims_General4_Frame2, + gTilesetAnims_General4_Frame4 }; -const u16 gUnknown_08513694[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/0.4bpp"); +const u16 gTilesetAnims_Lavaridge0_Frame0[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/0.4bpp"); -const u16 gUnknown_08513714[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/1.4bpp"); +const u16 gTilesetAnims_Lavaridge0_Frame1[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/1.4bpp"); -const u16 gUnknown_08513794[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/2.4bpp"); +const u16 gTilesetAnims_Lavaridge0_Frame2[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/2.4bpp"); -const u16 gUnknown_08513814[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/3.4bpp"); +const u16 gTilesetAnims_Lavaridge0_Frame3[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/3.4bpp"); const u16 *const gTilesetAnims_Lavaridge0[] = { - gUnknown_08513694, - gUnknown_08513714, - gUnknown_08513794, - gUnknown_08513814 + gTilesetAnims_Lavaridge0_Frame0, + gTilesetAnims_Lavaridge0_Frame1, + gTilesetAnims_Lavaridge0_Frame2, + gTilesetAnims_Lavaridge0_Frame3 }; -const u16 gUnknown_085138A4[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/0/0.4bpp"); +const u16 gTilesetAnims_Pacifidlog0_Frame0[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/0/0.4bpp"); -const u16 gUnknown_08513C64[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/0/1.4bpp"); +const u16 gTilesetAnims_Pacifidlog0_Frame1[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/0/1.4bpp"); -const u16 gUnknown_08514024[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/0/2.4bpp"); +const u16 gTilesetAnims_Pacifidlog0_Frame2[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/0/2.4bpp"); const u16 *const gTilesetAnims_Pacifidlog0[] = { - gUnknown_085138A4, - gUnknown_08513C64, - gUnknown_08514024, - gUnknown_08513C64 + gTilesetAnims_Pacifidlog0_Frame0, + gTilesetAnims_Pacifidlog0_Frame1, + gTilesetAnims_Pacifidlog0_Frame2, + gTilesetAnims_Pacifidlog0_Frame1 }; const u16 gTilesetAnims_Underwater0_Frame0[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/0.4bpp"); @@ -173,52 +173,52 @@ const u16 *const gTilesetAnims_Underwater0[] = { gTilesetAnims_Underwater0_Frame3 }; -const u16 gUnknown_08514604[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/0.4bpp"); +const u16 gTilesetAnims_Pacifidlog1_Frame0[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/0.4bpp"); -const u16 gUnknown_08514704[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/1.4bpp"); +const u16 gTilesetAnims_Pacifidlog1_Frame1[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/1.4bpp"); -const u16 gUnknown_08514804[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/2.4bpp"); +const u16 gTilesetAnims_Pacifidlog1_Frame2[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/2.4bpp"); -const u16 gUnknown_08514904[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/3.4bpp"); +const u16 gTilesetAnims_Pacifidlog1_Frame3[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/3.4bpp"); -const u16 gUnknown_08514A04[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/4.4bpp"); +const u16 gTilesetAnims_Pacifidlog1_Frame4[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/4.4bpp"); -const u16 gUnknown_08514B04[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/5.4bpp"); +const u16 gTilesetAnims_Pacifidlog1_Frame5[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/5.4bpp"); -const u16 gUnknown_08514C04[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/6.4bpp"); +const u16 gTilesetAnims_Pacifidlog1_Frame6[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/6.4bpp"); -const u16 gUnknown_08514D04[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/7.4bpp"); +const u16 gTilesetAnims_Pacifidlog1_Frame7[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/7.4bpp"); const u16 *const gTilesetAnims_Pacifidlog1[] = { - gUnknown_08514604, - gUnknown_08514704, - gUnknown_08514804, - gUnknown_08514904, - gUnknown_08514A04, - gUnknown_08514B04, - gUnknown_08514C04, - gUnknown_08514D04 + gTilesetAnims_Pacifidlog1_Frame0, + gTilesetAnims_Pacifidlog1_Frame1, + gTilesetAnims_Pacifidlog1_Frame2, + gTilesetAnims_Pacifidlog1_Frame3, + gTilesetAnims_Pacifidlog1_Frame4, + gTilesetAnims_Pacifidlog1_Frame5, + gTilesetAnims_Pacifidlog1_Frame6, + gTilesetAnims_Pacifidlog1_Frame7 }; -const u16 gUnknown_08514E24[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/a/0.4bpp"); +const u16 gTilesetAnims_Mauville0a_Frame0[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/a/0.4bpp"); -const u16 gUnknown_08514EA4[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/a/1.4bpp"); +const u16 gTilesetAnims_Mauville0a_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/a/1.4bpp"); -const u16 gUnknown_08514F24[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/a/2.4bpp"); +const u16 gTilesetAnims_Mauville0a_Frame2[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/a/2.4bpp"); -const u16 gUnknown_08514FA4[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/a/3.4bpp"); +const u16 gTilesetAnims_Mauville0a_Frame3[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/a/3.4bpp"); -const u16 gUnknown_08515024[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/1/a/1.4bpp"); +const u16 gTilesetAnims_Mauville1a_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/1/a/1.4bpp"); -const u16 gUnknown_085150A4[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/b/0.4bpp"); +const u16 gTilesetAnims_Mauville0b_Frame0[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/b/0.4bpp"); -const u16 gUnknown_08515124[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/b/1.4bpp"); +const u16 gTilesetAnims_Mauville0b_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/b/1.4bpp"); -const u16 gUnknown_085151A4[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/b/2.4bpp"); +const u16 gTilesetAnims_Mauville0b_Frame2[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/b/2.4bpp"); -const u16 gUnknown_08515224[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/b/3.4bpp"); +const u16 gTilesetAnims_Mauville0b_Frame3[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/b/3.4bpp"); -const u16 gUnknown_085152A4[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/1/b/1.4bpp"); +const u16 gTilesetAnims_Mauville1b_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/1/b/1.4bpp"); const u16 tileset_anims_space_1[16] = {}; @@ -245,64 +245,64 @@ u16 *const gTilesetAnims_MauvilleVDests1[] = { }; const u16 *const gTilesetAnims_Mauville0a[] = { - gUnknown_08514E24, - gUnknown_08514E24, - gUnknown_08514EA4, - gUnknown_08514F24, - gUnknown_08514FA4, - gUnknown_08514FA4, - gUnknown_08514FA4, - gUnknown_08514FA4, - gUnknown_08514FA4, - gUnknown_08514FA4, - gUnknown_08514F24, - gUnknown_08514EA4 + gTilesetAnims_Mauville0a_Frame0, + gTilesetAnims_Mauville0a_Frame0, + gTilesetAnims_Mauville0a_Frame1, + gTilesetAnims_Mauville0a_Frame2, + gTilesetAnims_Mauville0a_Frame3, + gTilesetAnims_Mauville0a_Frame3, + gTilesetAnims_Mauville0a_Frame3, + gTilesetAnims_Mauville0a_Frame3, + gTilesetAnims_Mauville0a_Frame3, + gTilesetAnims_Mauville0a_Frame3, + gTilesetAnims_Mauville0a_Frame2, + gTilesetAnims_Mauville0a_Frame1 }; const u16 *const gTilesetAnims_Mauville0b[] = { - gUnknown_085150A4, - gUnknown_085150A4, - gUnknown_08515124, - gUnknown_085151A4, - gUnknown_08515224, - gUnknown_08515224, - gUnknown_08515224, - gUnknown_08515224, - gUnknown_08515224, - gUnknown_08515224, - gUnknown_085151A4, - gUnknown_08515124 + gTilesetAnims_Mauville0b_Frame0, + gTilesetAnims_Mauville0b_Frame0, + gTilesetAnims_Mauville0b_Frame1, + gTilesetAnims_Mauville0b_Frame2, + gTilesetAnims_Mauville0b_Frame3, + gTilesetAnims_Mauville0b_Frame3, + gTilesetAnims_Mauville0b_Frame3, + gTilesetAnims_Mauville0b_Frame3, + gTilesetAnims_Mauville0b_Frame3, + gTilesetAnims_Mauville0b_Frame3, + gTilesetAnims_Mauville0b_Frame2, + gTilesetAnims_Mauville0b_Frame1 }; const u16 *const gTilesetAnims_Mauville1a[] = { - gUnknown_08514E24, - gUnknown_08514E24, - gUnknown_08515024, - gUnknown_08515024 + gTilesetAnims_Mauville0a_Frame0, + gTilesetAnims_Mauville0a_Frame0, + gTilesetAnims_Mauville1a_Frame1, + gTilesetAnims_Mauville1a_Frame1 }; const u16 *const gTilesetAnims_Mauville1b[] = { - gUnknown_085150A4, - gUnknown_085150A4, - gUnknown_085152A4, - gUnknown_085152A4 + gTilesetAnims_Mauville0b_Frame0, + gTilesetAnims_Mauville0b_Frame0, + gTilesetAnims_Mauville1b_Frame1, + gTilesetAnims_Mauville1b_Frame1 }; -const u16 gUnknown_08515404[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/0.4bpp"); +const u16 gTilesetAnims_Rustboro0_Frame0[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/0.4bpp"); -const u16 gUnknown_08515484[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/1.4bpp"); +const u16 gTilesetAnims_Rustboro0_Frame1[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/1.4bpp"); -const u16 gUnknown_08515504[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/2.4bpp"); +const u16 gTilesetAnims_Rustboro0_Frame2[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/2.4bpp"); -const u16 gUnknown_08515584[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/3.4bpp"); +const u16 gTilesetAnims_Rustboro0_Frame3[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/3.4bpp"); -const u16 gUnknown_08515604[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/4.4bpp"); +const u16 gTilesetAnims_Rustboro0_Frame4[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/4.4bpp"); -const u16 gUnknown_08515684[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/5.4bpp"); +const u16 gTilesetAnims_Rustboro0_Frame5[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/5.4bpp"); -const u16 gUnknown_08515704[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/6.4bpp"); +const u16 gTilesetAnims_Rustboro0_Frame6[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/6.4bpp"); -const u16 gUnknown_08515784[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/7.4bpp"); +const u16 gTilesetAnims_Rustboro0_Frame7[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/7.4bpp"); u16 *const gTilesetAnims_RustboroVDests0[] = { (u16 *)(BG_VRAM + 0x5000), @@ -316,14 +316,14 @@ u16 *const gTilesetAnims_RustboroVDests0[] = { }; const u16 *const gTilesetAnims_Rustboro0[] = { - gUnknown_08515404, - gUnknown_08515484, - gUnknown_08515504, - gUnknown_08515584, - gUnknown_08515604, - gUnknown_08515684, - gUnknown_08515704, - gUnknown_08515784 + gTilesetAnims_Rustboro0_Frame0, + gTilesetAnims_Rustboro0_Frame1, + gTilesetAnims_Rustboro0_Frame2, + gTilesetAnims_Rustboro0_Frame3, + gTilesetAnims_Rustboro0_Frame4, + gTilesetAnims_Rustboro0_Frame5, + gTilesetAnims_Rustboro0_Frame6, + gTilesetAnims_Rustboro0_Frame7 }; const u16 gTilesetAnims_Rustboro1_Frame0[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/1/0.4bpp"); @@ -345,13 +345,13 @@ const u16 gTilesetAnims_Lavaridge1_Cave0_Frame2[] = INCBIN_U16("data/tilesets/se const u16 gTilesetAnims_Lavaridge1_Cave0_Frame3[] = INCBIN_U16("data/tilesets/secondary/cave/anim/3.4bpp"); -const u16 gUnknown_08515B6C[] = INCBIN_U16("data/tilesets/secondary/cave/anim/unused/0.4bpp"); +const u16 gTilesetAnims_Lavaridge1_CaveUnused_Frame0[] = INCBIN_U16("data/tilesets/secondary/cave/anim/unused/0.4bpp"); -const u16 gUnknown_08515BEC[] = INCBIN_U16("data/tilesets/secondary/cave/anim/unused/1.4bpp"); +const u16 gTilesetAnims_Lavaridge1_CaveUnused_Frame1[] = INCBIN_U16("data/tilesets/secondary/cave/anim/unused/1.4bpp"); -const u16 gUnknown_08515C6C[] = INCBIN_U16("data/tilesets/secondary/cave/anim/unused/2.4bpp"); +const u16 gTilesetAnims_Lavaridge1_CaveUnused_Frame2[] = INCBIN_U16("data/tilesets/secondary/cave/anim/unused/2.4bpp"); -const u16 gUnknown_08515CEC[] = INCBIN_U16("data/tilesets/secondary/cave/anim/unused/3.4bpp"); +const u16 gTilesetAnims_Lavaridge1_CaveUnused_Frame3[] = INCBIN_U16("data/tilesets/secondary/cave/anim/unused/3.4bpp"); const u16 tileset_anims_space_3[16] = {}; @@ -561,13 +561,13 @@ const u16 gTilesetAnims_Sootopolis0_Frame7[] = INCBIN_U16("data/tilesets/seconda const u16 tileset_anims_space_8[16] = {}; -const u16 gUnknown_0851E2C4[] = INCBIN_U16("data/tilesets/secondary/unused_1/0.4bpp"); +const u16 gTilesetAnims_Unused1_Frame0[] = INCBIN_U16("data/tilesets/secondary/unused_1/0.4bpp"); -const u16 gUnknown_0851EAC4[] = INCBIN_U16("data/tilesets/secondary/unused_1/1.4bpp"); +const u16 gTilesetAnims_Unused1_Frame1[] = INCBIN_U16("data/tilesets/secondary/unused_1/1.4bpp"); -const u16 gUnknown_0851F2C4[] = INCBIN_U16("data/tilesets/secondary/unused_1/2.4bpp"); +const u16 gTilesetAnims_Unused1_Frame2[] = INCBIN_U16("data/tilesets/secondary/unused_1/2.4bpp"); -const u16 gUnknown_0851FAC4[] = INCBIN_U16("data/tilesets/secondary/unused_1/3.4bpp"); +const u16 gTilesetAnims_Unused1_Frame3[] = INCBIN_U16("data/tilesets/secondary/unused_1/3.4bpp"); const u16 *const gTilesetAnims_Sootopolis0[] = { gTilesetAnims_Sootopolis0_Frame0, @@ -596,11 +596,11 @@ const u16 gTilesetAnims_BattlePyramid1_Frame2[] = INCBIN_U16("data/tilesets/seco const u16 tileset_anims_space_10[7808] = {}; -const u16 gUnknown_08524604[] = INCBIN_U16("data/tilesets/secondary/unused_2/0.4bpp"); +const u16 gTilesetAnims_Unused2_Frame0[] = INCBIN_U16("data/tilesets/secondary/unused_2/0.4bpp"); const u16 tileset_anims_space_11[224] = {}; -const u16 gUnknown_08524804[] = INCBIN_U16("data/tilesets/secondary/unused_2/1.4bpp"); +const u16 gTilesetAnims_Unused2_Frame1[] = INCBIN_U16("data/tilesets/secondary/unused_2/1.4bpp"); const u16 *const gTilesetAnims_BattlePyramid0[] = { gTilesetAnims_BattlePyramid0_Frame0, @@ -614,16 +614,16 @@ const u16 *const gTilesetAnims_BattlePyramid1[] = { gTilesetAnims_BattlePyramid1_Frame2 }; -extern const u16 gUnknown_08D85640[]; -extern const u16 gUnknown_08D85660[]; -extern const u16 gUnknown_08D85680[]; -extern const u16 gUnknown_08D856A0[]; +extern const u16 gTilesetAnims_BattleDomePals0_0[]; +extern const u16 gTilesetAnims_BattleDomePals0_1[]; +extern const u16 gTilesetAnims_BattleDomePals0_2[]; +extern const u16 gTilesetAnims_BattleDomePals0_3[]; static const u16 *const gTilesetAnims_BattleDomePals0[] = { - gUnknown_08D85640, - gUnknown_08D85660, - gUnknown_08D85680, - gUnknown_08D856A0, + gTilesetAnims_BattleDomePals0_0, + gTilesetAnims_BattleDomePals0_1, + gTilesetAnims_BattleDomePals0_2, + gTilesetAnims_BattleDomePals0_3, }; // .text From 89edf6d9e989669f439fdfbf452ee4079e325785 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 11 Jun 2018 17:33:50 -0500 Subject: [PATCH 07/55] Move all field object data into src/data and event_object_movement.c --- data/event_object_movement.s | 1731 ----- .../berry_tree_graphics_tables.inc | 635 -- .../field_effect_object_template_pointers.inc | 39 - .../field_objects/field_effect_objects.inc | 1208 --- .../field_objects/field_object_anims.inc | 1029 --- .../field_objects/field_object_graphics.inc | 6530 ----------------- .../field_object_graphics_info.inc | 4164 ----------- .../field_object_graphics_info_pointers.inc | 251 - .../field_objects/field_object_oam.inc | 465 -- .../field_objects/field_object_pic_tables.inc | 2174 ------ include/berry.h | 6 +- include/event_object_movement.h | 271 + include/event_object_movement_helpers.h | 35 - include/field_effect.h | 3 + include/field_effect_helpers.h | 16 + include/global.fieldmap.h | 4 + ld_script.txt | 1 - src/battle_setup.c | 1 - src/data/field_event_obj/base_oam.h | 52 + .../berry_tree_graphics_tables.h | 570 ++ src/data/field_event_obj/event_object_anims.h | 1176 +++ .../field_event_obj/event_object_graphics.h | 1667 +++++ .../event_object_graphics_info.h | 250 + .../event_object_graphics_info_pointers.h | 504 ++ .../field_event_obj/event_object_pic_tables.h | 2179 ++++++ .../field_event_obj/event_object_subsprites.h | 342 + .../field_effect_object_template_pointers.h | 82 + .../field_event_obj/field_effect_objects.h | 997 +++ .../movement_action_func_tables.h | 1499 ++++ .../movement_type_func_tables.h | 443 ++ src/event_object_movement.c | 1177 ++- src/field_effect.c | 1 - src/item_menu.c | 2 +- src/item_use.c | 1 - src/map_obj_lock.c | 1 - src/overworld.c | 1 - src/scrcmd.c | 1 - src/script_movement.c | 1 - src/start_menu.c | 2 +- src/trainer_see.c | 1 - 40 files changed, 11104 insertions(+), 18408 deletions(-) delete mode 100644 data/event_object_movement.s delete mode 100644 data/graphics/field_objects/berry_tree_graphics_tables.inc delete mode 100644 data/graphics/field_objects/field_effect_object_template_pointers.inc delete mode 100644 data/graphics/field_objects/field_effect_objects.inc delete mode 100644 data/graphics/field_objects/field_object_anims.inc delete mode 100644 data/graphics/field_objects/field_object_graphics.inc delete mode 100644 data/graphics/field_objects/field_object_graphics_info.inc delete mode 100644 data/graphics/field_objects/field_object_graphics_info_pointers.inc delete mode 100644 data/graphics/field_objects/field_object_oam.inc delete mode 100644 data/graphics/field_objects/field_object_pic_tables.inc delete mode 100644 include/event_object_movement_helpers.h create mode 100755 src/data/field_event_obj/base_oam.h create mode 100755 src/data/field_event_obj/berry_tree_graphics_tables.h create mode 100755 src/data/field_event_obj/event_object_anims.h create mode 100755 src/data/field_event_obj/event_object_graphics.h create mode 100755 src/data/field_event_obj/event_object_graphics_info.h create mode 100755 src/data/field_event_obj/event_object_graphics_info_pointers.h create mode 100755 src/data/field_event_obj/event_object_pic_tables.h create mode 100755 src/data/field_event_obj/event_object_subsprites.h create mode 100755 src/data/field_event_obj/field_effect_object_template_pointers.h create mode 100755 src/data/field_event_obj/field_effect_objects.h create mode 100755 src/data/field_event_obj/movement_action_func_tables.h create mode 100755 src/data/field_event_obj/movement_type_func_tables.h diff --git a/data/event_object_movement.s b/data/event_object_movement.s deleted file mode 100644 index 38f4889738..0000000000 --- a/data/event_object_movement.s +++ /dev/null @@ -1,1731 +0,0 @@ -#include "constants/map_objects.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_084975C4:: @ 84975C4 - .byte 0x01, 0x01, 0x06, 0x07, 0x08, 0x09, 0x06, 0x07, 0x08, 0x09, 0x0b, 0x0b, 0x00, 0x00, 0x00, 0x00 - -gUnknown_084975D4:: @ 84975D4 - spr_template 0x0000, 0xFFFF, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject - -gUnknown_084975EC:: @ 84975EC - .4byte CameraObject_0 - .4byte CameraObject_1 - .4byte CameraObject_2 - -@ 84975F8 - .include "data/graphics/field_objects/field_object_graphics.inc" - -gUnknown_08505438:: @ 8505438 - .4byte FieldObjectCB_NoMovement1 - .4byte FieldObjectCB_LookRandomDirections - .4byte FieldObjectCB_GoRandomDirections - .4byte FieldObjectCB_RandomlyGoNorthOrSouth - .4byte FieldObjectCB_RandomlyGoNorthOrSouth - .4byte FieldObjectCB_RandomlyGoEastOrWest - .4byte FieldObjectCB_RandomlyGoEastOrWest - .4byte FieldObjectCB_FaceFixedDirection - .4byte FieldObjectCB_FaceFixedDirection - .4byte FieldObjectCB_FaceFixedDirection - .4byte FieldObjectCB_FaceFixedDirection - .4byte FieldObjectCB_NoMovement2 - .4byte FieldObjectCB_BerryTree - .4byte FieldObjectCB_RandomlyLookNorthOrSouth - .4byte FieldObjectCB_RandomlyLookEastOrWest - .4byte FieldObjectCB_RandomlyLookNorthOrWest - .4byte FieldObjectCB_RandomlyLookNorthOrEast - .4byte FieldObjectCB_RandomlyLookSouthOrWest - .4byte FieldObjectCB_RandomlyLookSouthOrEast - .4byte FieldObjectCB_RandomlyLookNorthOrSouthOrWest - .4byte FieldObjectCB_RandomlyLookNorthOrSouthOrEast - .4byte FieldObjectCB_RandomlyLookNorthOrEastOrWest - .4byte FieldObjectCB_RandomlyLookSouthOrEastOrWest - .4byte FieldObjectCB_LookAroundCounterclockwise - .4byte FieldObjectCB_LookAroundClockwise - .4byte FieldObjectCB_AlternatelyGoInOppositeDirections - .4byte FieldObjectCB_AlternatelyGoInOppositeDirections - .4byte FieldObjectCB_AlternatelyGoInOppositeDirections - .4byte FieldObjectCB_AlternatelyGoInOppositeDirections - .4byte FieldObjectCB_GoInDirectionSequence1 - .4byte FieldObjectCB_GoInDirectionSequence2 - .4byte FieldObjectCB_GoInDirectionSequence3 - .4byte FieldObjectCB_GoInDirectionSequence4 - .4byte FieldObjectCB_GoInDirectionSequence5 - .4byte FieldObjectCB_GoInDirectionSequence6 - .4byte FieldObjectCB_GoInDirectionSequence7 - .4byte FieldObjectCB_GoInDirectionSequence8 - .4byte FieldObjectCB_GoInDirectionSequence9 - .4byte FieldObjectCB_GoInDirectionSequence10 - .4byte FieldObjectCB_GoInDirectionSequence11 - .4byte FieldObjectCB_GoInDirectionSequence12 - .4byte FieldObjectCB_GoInDirectionSequence13 - .4byte FieldObjectCB_GoInDirectionSequence14 - .4byte FieldObjectCB_GoInDirectionSequence15 - .4byte FieldObjectCB_GoInDirectionSequence16 - .4byte FieldObjectCB_GoInDirectionSequence17 - .4byte FieldObjectCB_GoInDirectionSequence18 - .4byte FieldObjectCB_GoInDirectionSequence19 - .4byte FieldObjectCB_GoInDirectionSequence20 - .4byte FieldObjectCB_GoInDirectionSequence21 - .4byte FieldObjectCB_GoInDirectionSequence22 - .4byte FieldObjectCB_GoInDirectionSequence23 - .4byte FieldObjectCB_GoInDirectionSequence24 - .4byte FieldObjectCB_CopyPlayer1 - .4byte FieldObjectCB_CopyPlayer1 - .4byte FieldObjectCB_CopyPlayer1 - .4byte FieldObjectCB_CopyPlayer1 - .4byte FieldObjectCB_TreeDisguise - .4byte FieldObjectCB_MountainDisguise - .4byte FieldObjectCB_CopyPlayer2 - .4byte FieldObjectCB_CopyPlayer2 - .4byte FieldObjectCB_CopyPlayer2 - .4byte FieldObjectCB_CopyPlayer2 - .4byte FieldObjectCB_Hidden1 - .4byte FieldObjectCB_WalkInPlace1 - .4byte FieldObjectCB_WalkInPlace1 - .4byte FieldObjectCB_WalkInPlace1 - .4byte FieldObjectCB_WalkInPlace1 - .4byte FieldObjectCB_WalkInPlace2 - .4byte FieldObjectCB_WalkInPlace2 - .4byte FieldObjectCB_WalkInPlace2 - .4byte FieldObjectCB_WalkInPlace2 - .4byte FieldObjectCB_WalkInPlace3 - .4byte FieldObjectCB_WalkInPlace3 - .4byte FieldObjectCB_WalkInPlace3 - .4byte FieldObjectCB_WalkInPlace3 - .4byte FieldObjectCB_Hidden2 - .4byte FieldObjectCB_WalkInPlace4 - .4byte FieldObjectCB_WalkInPlace4 - .4byte FieldObjectCB_WalkInPlace4 - .4byte FieldObjectCB_WalkInPlace4 - -gRangedMovementTypes:: @ 850557C - .byte 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 - .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -gInitialMovementTypeFacingDirections:: @ 85055CD - .byte 0x01, 0x01, 0x01, 0x02, 0x01, 0x03, 0x04, 0x02, 0x01, 0x03, 0x04, 0x01, 0x01, 0x01, 0x03, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x03, 0x04, 0x02, 0x04, 0x01 - .byte 0x03, 0x02, 0x03, 0x01, 0x04, 0x03, 0x02, 0x04, 0x01, 0x04, 0x02, 0x03, 0x01, 0x02, 0x01, 0x03, 0x04, 0x02, 0x01, 0x03, 0x04, 0x02, 0x01, 0x03, 0x04, 0x01, 0x01, 0x02, 0x01, 0x03, 0x04, 0x01 - .byte 0x01, 0x02, 0x03, 0x04, 0x01, 0x02, 0x03, 0x04, 0x01, 0x02, 0x03, 0x04, 0x01, 0x01, 0x02, 0x03, 0x04 - - .align 2, 0 -@ 8505620 - .include "data/graphics/field_objects/field_object_graphics_info_pointers.inc" - -@ 85059F8 - .include "data/graphics/field_objects/field_effect_object_template_pointers.inc" - -@ 8505A8C - .include "data/graphics/field_objects/field_object_pic_tables.inc" - -@ 85089FC - .include "data/graphics/field_objects/field_object_anims.inc" - -gUnknown_085094AC:: @ 85094AC - .4byte gFieldObjectImageAnimTable_QuintyPlump - .byte 1, 3, 0, 2 - .4byte gFieldObjectImageAnimTable_Standard - .byte 1, 3, 0, 2 - .4byte gFieldObjectImageAnimTable_BrendanMayNormal - .byte 1, 3, 0, 2 - .4byte gFieldObjectImageAnimTable_AcroBike - .byte 1, 3, 0, 2 - .4byte gFieldObjectImageAnimTable_Surfing - .byte 1, 3, 0, 2 - .4byte gFieldObjectImageAnimTable_Nurse - .byte 1, 3, 0, 2 - .4byte gFieldObjectImageAnimTable_Fishing - .byte 1, 3, 0, 2 - .4byte NULL - .byte 0, 0, 0, 0 - -@ 85094EC - .include "data/graphics/field_objects/field_object_oam.inc" - -@ 8509954 - .include "data/graphics/field_objects/field_object_graphics_info.inc" - -gUnknown_0850BBC8:: @ 850BBC8 - .align 2, 0 - .4byte gFieldObjectPalette0 - .2byte 4355 - .align 2, 0 - .4byte gFieldObjectPalette1 - .2byte 4356 - .align 2, 0 - .4byte gFieldObjectPalette2 - .2byte 4357 - .align 2, 0 - .4byte gFieldObjectPalette3 - .2byte 4358 - .align 2, 0 - .4byte gFieldObjectPalette4 - .2byte 4359 - .align 2, 0 - .4byte gFieldObjectPalette5 - .2byte 4360 - .align 2, 0 - .4byte gFieldObjectPalette6 - .2byte 4361 - .align 2, 0 - .4byte gFieldObjectPalette7 - .2byte 4362 - .align 2, 0 - .4byte gFieldObjectPalette8 - .2byte 4352 - .align 2, 0 - .4byte gFieldObjectPalette9 - .2byte 4353 - .align 2, 0 - .4byte gFieldObjectPalette10 - .2byte 4354 - .align 2, 0 - .4byte gFieldObjectPalette11 - .2byte 4373 - .align 2, 0 - .4byte gFieldObjectPalette12 - .2byte 4363 - .align 2, 0 - .4byte gFieldObjectPalette13 - .2byte 4364 - .align 2, 0 - .4byte gFieldObjectPalette14 - .2byte 4365 - .align 2, 0 - .4byte gFieldObjectPalette15 - .2byte 4366 - .align 2, 0 - .4byte gFieldObjectPalette16 - .2byte 4367 - .align 2, 0 - .4byte gFieldObjectPalette17 - .2byte 4368 - .align 2, 0 - .4byte gFieldObjectPalette18 - .2byte 4369 - .align 2, 0 - .4byte gFieldObjectPalette19 - .2byte 4370 - .align 2, 0 - .4byte gFieldObjectPalette20 - .2byte 4371 - .align 2, 0 - .4byte gFieldObjectPalette21 - .2byte 4372 - .align 2, 0 - .4byte gFieldObjectPalette22 - .2byte 4374 - .align 2, 0 - .4byte gFieldObjectPalette23 - .2byte 4375 - .align 2, 0 - .4byte gFieldObjectPalette24 - .2byte 4376 - .align 2, 0 - .4byte gFieldObjectPalette25 - .2byte 4377 - .align 2, 0 - .4byte gFieldObjectPalette26 - .2byte 4379 - .align 2, 0 - .4byte gFieldObjectPalette27 - .2byte 4380 - .align 2, 0 - .4byte gFieldObjectPalette28 - .2byte 4381 - .align 2, 0 - .4byte gFieldObjectPalette29 - .2byte 4382 - .align 2, 0 - .4byte gFieldObjectPalette30 - .2byte 4383 - .align 2, 0 - .4byte gFieldObjectPalette31 - .2byte 4384 - .align 2, 0 - .4byte gFieldObjectPalette32 - .2byte 4385 - .align 2, 0 - .4byte gFieldObjectPalette33 - .2byte 4386 - .align 2, 0 - .4byte gFieldObjectPalette34 - .2byte 4387 - .align 2, 0 - .4byte NULL - .2byte 0 - .align 2, 0 - -Unknown_0850BCE8:: @ 0850BCE8 -.2byte 0x1101, 0x1101, 0x1101, 0x1101 - -Unknown_0850BCF0:: @ 0850BCF0 -.2byte 0x1111, 0x1111, 0x1111, 0x1111 - -Unknown_0850BCF8:: @ 0850BCF8 -.2byte 0x1115, 0x1115, 0x1115, 0x1115 - -gUnknown_0850BD00:: @ 850BD00 - .2byte 4352, 0 - .4byte Unknown_0850BCE8 - .2byte 4368, 0 - .4byte Unknown_0850BCF0 - .2byte 4373, 0 - .4byte Unknown_0850BCF8 - .2byte 4607, 0 - .4byte NULL - -Unknown_0850BD20:: @ 0850BD20 -.2byte 0x110c, 0x110c, 0x110c, 0x110c - -Unknown_0850BD28:: @ 0x0850bd28 -.2byte 0x110d, 0x110d, 0x110d, 0x110d - -Unknown_0850BD30:: @ 0x0850bd30 -.2byte 0x110e, 0x110e, 0x110e, 0x110e - -Unknown_0850BD38:: @ 0x0850bd38 -.2byte 0x1112, 0x1112, 0x1112, 0x1112 - -Unknown_0850BD40:: @ 0x0850bd40 -.2byte 0x1113, 0x1113, 0x1113, 0x1113 - -Unknown_0850BD48:: @ 0x0850bd48 -.2byte 0x1114, 0x1114, 0x1114, 0x1114 - -Unknown_0850BD50:: @ 0x0850bd50 -.2byte 0x111b, 0x111b, 0x111b, 0x111b - -Unknown_0850BD58:: @ 0x0850bd58 -.2byte 0x1117, 0x1117, 0x1117, 0x1117 - -Unknown_0850BD60:: @ 0x0850bd60 -.2byte 0x1119, 0x1119, 0x1119, 0x1119 - -Unknown_0850BD68:: @ 0x0850bd68 -.2byte 0x1109, 0x1109, 0x1109, 0x1109 - -Unknown_0850BD70:: @ 0x0850bd70 -.2byte 0x111d, 0x111d, 0x111d, 0x111d - -gUnknown_0850BD78:: @ 850BD78 - .2byte 4352, 0 - .4byte Unknown_0850BCE8 - .2byte 4368, 0 - .4byte Unknown_0850BCF0 - .2byte 4363, 0 - .4byte Unknown_0850BD20 - .2byte 4365, 0 - .4byte Unknown_0850BD28 - .2byte 4366, 0 - .4byte Unknown_0850BD30 - .2byte 4370, 0 - .4byte Unknown_0850BD38 - .2byte 4371, 0 - .4byte Unknown_0850BD40 - .2byte 4372, 0 - .4byte Unknown_0850BD48 - .2byte 4374, 0 - .4byte Unknown_0850BD58 - .2byte 4376, 0 - .4byte Unknown_0850BD60 - .2byte 4357, 0 - .4byte Unknown_0850BD68 - .2byte 4379, 0 - .4byte Unknown_0850BD50 - .2byte 4381, 0 - .4byte Unknown_0850BD70 - .2byte 4607, 0 - .4byte NULL - -gUnknown_0850BDE8:: @ 850BDE8 - .2byte 0x1100, 0x1101, 0x1103, 0x1104, 0x1105, 0x1106, 0x1107, 0x1108, 0x1109, 0x110a -gUnknown_0850BDFC:: - .2byte 0x1100, 0x1101, 0x1103, 0x1104, 0x1105, 0x1106, 0x1107, 0x1108, 0x1109, 0x110a -gUnknown_0850BE10:: - .2byte 0x1100, 0x1101, 0x1103, 0x1104, 0x1105, 0x1106, 0x1107, 0x1108, 0x1109, 0x110a -gUnknown_0850BE24:: - .2byte 0x1100, 0x1101, 0x1103, 0x1104, 0x1105, 0x1106, 0x1107, 0x1108, 0x1109, 0x110a - -gUnknown_0850BE38:: @ 850BE38 - .4byte gUnknown_0850BDE8 - .4byte gUnknown_0850BDFC - .4byte gUnknown_0850BE10 - .4byte gUnknown_0850BE24 - -@ 850BE48 - .include "data/graphics/field_objects/berry_tree_graphics_tables.inc" - -@ 850C9C0 - .include "data/graphics/field_objects/field_effect_objects.inc" - - .align 2, 0 - .4byte gFieldObjectPalette2 - .2byte 4113 - - .align 2, 0 -gUnknown_0850D6DC:: @ 850D6DC - .2byte 0x0020, 0x0040, 0x0060, 0x0080, 0x0020, 0x0040, 0x0080, 0x00c0 - -gUnknown_0850D6EC:: @ 850D6EC - .2byte 0x0020, 0x0030, 0x0040, 0x0050 - -gUnknown_0850D6F4:: @ 850D6F4 - .4byte sub_808F44C - .4byte sub_808F460 - .4byte sub_808F48C - .4byte sub_808F4C8 - .4byte sub_808F4E8 - .4byte sub_808F534 - .4byte sub_808F564 - -gUnknown_0850D710:: @ 850D710 - .byte 0x01, 0x02, 0x03, 0x04 - -gUnknown_0850D714:: @ 850D714 - .4byte GetRegularRunningPastFacingDirection - .4byte GetNorthSouthRunningPastFacingDirection - .4byte GetEastWestRunningPastFacingDirection - .4byte GetNorthEastRunningPastFacingDirection - .4byte GetNorthWestRunningPastFacingDirection - .4byte GetSouthEastRunningPastFacingDirection - .4byte GetSouthWestRunningPastFacingDirection - .4byte GetNonEastRunningPastFacingDirection - .4byte GetNonWestRunningPastFacingDirection - .4byte GetNonSouthRunningPastFacingDirection - .4byte GetNonNorthRunningPastFacingDirection - -gUnknown_0850D740:: @ 850D740 - .4byte sub_808F988 - .4byte sub_808F99C - .4byte sub_808F9C8 - .4byte sub_808FA0C - .4byte sub_808FA3C - -gUnknown_0850D754:: @ 850D754 - .4byte sub_808FAC8 - .4byte sub_808FADC - .4byte sub_808FB08 - .4byte sub_808FB44 - .4byte sub_808FB64 - .4byte sub_808FBB0 - .4byte sub_808FBE0 - -gUnknown_0850D770:: @ 850D770 - .byte 0x01, 0x02, 0x00, 0x00 - -gUnknown_0850D774:: @ 850D774 - .4byte sub_808FC4C - .4byte sub_808FC60 - .4byte sub_808FC8C - .4byte sub_808FCC8 - .4byte sub_808FCE8 - .4byte sub_808FD34 - .4byte sub_808FD64 - -gUnknown_0850D790:: @ 850D790 - .byte 0x03, 0x04, 0x00, 0x00 - -gUnknown_0850D794:: @ 850D794 - .4byte sub_808FDD0 - .4byte sub_808FDFC - .4byte sub_808FE1C - -gUnknown_0850D7A0:: @ 850D7A0 - .4byte do_berry_tree_growth_sparkle_1 - .4byte sub_808FF48 - .4byte do_berry_tree_growth_sparkle_2 - .4byte sub_808FFB4 - .4byte sub_8090004 - -gUnknown_0850D7B4:: @ 850D7B4 - .4byte sub_8090094 - .4byte sub_80900A8 - .4byte sub_80900D4 - .4byte sub_8090118 - .4byte sub_8090148 - -gUnknown_0850D7C8:: @ 850D7C8 - .4byte sub_80901D4 - .4byte sub_80901E8 - .4byte sub_8090214 - .4byte sub_8090258 - .4byte sub_8090288 - -gUnknown_0850D7DC:: @ 850D7DC - .4byte sub_8090314 - .4byte sub_8090328 - .4byte sub_8090354 - .4byte sub_8090398 - .4byte sub_80903C8 - -gUnknown_0850D7F0:: @ 850D7F0 - .byte 0x02, 0x03, 0x00, 0x00 - -gUnknown_0850D7F4:: @ 850D7F4 - .4byte sub_8090454 - .4byte sub_8090468 - .4byte sub_8090494 - .4byte sub_80904D8 - .4byte sub_8090508 - -gUnknown_0850D808:: @ 850D808 - .byte 0x02, 0x04, 0x00, 0x00 - -gUnknown_0850D80C:: @ 850D80C - .4byte sub_8090594 - .4byte sub_80905A8 - .4byte sub_80905D4 - .4byte sub_8090618 - .4byte sub_8090648 - -gUnknown_0850D820:: @ 850D820 - .byte 0x01, 0x03, 0x00, 0x00 - -gUnknown_0850D824:: @ 850D824 - .4byte sub_80906D4 - .4byte sub_80906E8 - .4byte sub_8090714 - .4byte sub_8090758 - .4byte sub_8090788 - -gUnknown_0850D838:: @ 850D838 - .byte 0x01, 0x04, 0x00, 0x00 - -gUnknown_0850D83C:: @ 850D83C - .4byte sub_8090814 - .4byte sub_8090828 - .4byte sub_8090854 - .4byte sub_8090898 - .4byte sub_80908C8 - -gUnknown_0850D850:: @ 850D850 - .byte 0x02, 0x01, 0x03, 0x01 - -gUnknown_0850D854:: @ 850D854 - .4byte sub_8090954 - .4byte sub_8090968 - .4byte sub_8090994 - .4byte sub_80909D8 - .4byte sub_8090A08 - -gUnknown_0850D868:: @ 850D868 - .byte 0x01, 0x02, 0x04, 0x01 - -gUnknown_0850D86C:: @ 850D86C - .4byte sub_8090A94 - .4byte sub_8090AA8 - .4byte sub_8090AD4 - .4byte sub_8090B18 - .4byte sub_8090B48 - -gUnknown_0850D880:: @ 850D880 - .byte 0x02, 0x03, 0x04, 0x02 - -gUnknown_0850D884:: @ 850D884 - .4byte sub_8090BD4 - .4byte sub_8090BE8 - .4byte sub_8090C14 - .4byte sub_8090C58 - .4byte sub_8090C88 - -gUnknown_0850D898:: @ 850D898 - .byte 0x03, 0x04, 0x01, 0x01 - -gUnknown_0850D89C:: @ 850D89C - .4byte sub_8090D14 - .4byte sub_8090D40 - .4byte sub_8090D64 - .4byte sub_8090D90 - -gUnknown_0850D8AC:: @ 850D8AC - .byte 0x01, 0x04, 0x03, 0x01, 0x02, 0x00, 0x00, 0x00 - -gUnknown_0850D8B4:: @ 850D8B4 - .4byte sub_8090E18 - .4byte sub_8090E44 - .4byte sub_8090E68 - .4byte sub_8090E94 - -gUnknown_0850D8C4:: @ 850D8C4 - .byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00 - -gUnknown_0850D8CC:: @ 850D8CC - .4byte sub_8090F1C - .4byte sub_8090F30 - .4byte sub_8090F68 - .4byte sub_8091020 - -gUnknown_0850D8DC:: @ 850D8DC - .4byte sub_8091048 - .4byte sub_809117C - .4byte sub_8091110 - -gUnknown_0850D8E8:: @ 850D8E8 - .byte 0x02, 0x04, 0x03, 0x01 - -gUnknown_0850D8EC:: @ 850D8EC - .4byte sub_8091048 - .4byte sub_8091208 - .4byte sub_8091110 - -gUnknown_0850D8F8:: @ 850D8F8 - .byte 0x04, 0x03, 0x01, 0x02 - -gUnknown_0850D8FC:: @ 850D8FC - .4byte sub_8091048 - .4byte sub_8091294 - .4byte sub_8091110 - -gUnknown_0850D908:: @ 850D908 - .byte 0x01, 0x02, 0x04, 0x03 - -gUnknown_0850D90C:: @ 850D90C - .4byte sub_8091048 - .4byte sub_8091320 - .4byte sub_8091110 - -gUnknown_0850D918:: @ 850D918 - .byte 0x03, 0x01, 0x02, 0x04 - -gUnknown_0850D91C:: @ 850D91C - .4byte sub_8091048 - .4byte sub_80913AC - .4byte sub_8091110 - -gUnknown_0850D928:: @ 850D928 - .byte 0x02, 0x03, 0x04, 0x01 - -gUnknown_0850D92C:: @ 850D92C - .4byte sub_8091048 - .4byte sub_8091438 - .4byte sub_8091110 - -gUnknown_0850D938:: @ 850D938 - .byte 0x03, 0x04, 0x01, 0x02 - -gUnknown_0850D93C:: @ 850D93C - .4byte sub_8091048 - .4byte sub_80914C4 - .4byte sub_8091110 - -gUnknown_0850D948:: @ 850D948 - .4byte sub_8091048 - .4byte sub_8091550 - .4byte sub_8091110 - -gUnknown_0850D954:: @ 850D954 - .byte 0x04, 0x01, 0x02, 0x03 - -gUnknown_0850D958:: @ 850D958 - .4byte sub_8091048 - .4byte sub_80915DC - .4byte sub_8091110 - -gUnknown_0850D964:: @ 850D964 - .byte 0x03, 0x02, 0x01, 0x04 - -gUnknown_0850D968:: @ 850D968 - .4byte sub_8091048 - .4byte sub_8091668 - .4byte sub_8091110 - -gUnknown_0850D974:: @ 850D974 - .byte 0x02, 0x01, 0x04, 0x03 - -gUnknown_0850D978:: @ 850D978 - .4byte sub_8091048 - .4byte sub_80916F4 - .4byte sub_8091110 - -gUnknown_0850D984:: @ 850D984 - .byte 0x04, 0x03, 0x02, 0x01 - -gUnknown_0850D988:: @ 850D988 - .4byte sub_8091048 - .4byte sub_8091780 - .4byte sub_8091110 - -gUnknown_0850D994:: @ 850D994 - .byte 0x01, 0x04, 0x03, 0x02 - -gUnknown_0850D998:: @ 850D998 - .4byte sub_8091048 - .4byte sub_809180C - .4byte sub_8091110 - -gUnknown_0850D9A4:: @ 850D9A4 - .byte 0x04, 0x02, 0x01, 0x03 - -gUnknown_0850D9A8:: @ 850D9A8 - .4byte sub_8091048 - .4byte sub_8091898 - .4byte sub_8091110 - -gUnknown_0850D9B4:: @ 850D9B4 - .byte 0x02, 0x01, 0x03, 0x04 - -gUnknown_0850D9B8:: @ 850D9B8 - .4byte sub_8091048 - .4byte sub_8091924 - .4byte sub_8091110 - -gUnknown_0850D9C4:: @ 850D9C4 - .byte 0x03, 0x04, 0x02, 0x01 - -gUnknown_0850D9C8:: @ 850D9C8 - .4byte sub_8091048 - .4byte sub_80919B0 - .4byte sub_8091110 - -gUnknown_0850D9D4:: @ 850D9D4 - .byte 0x01, 0x03, 0x04, 0x02 - -gUnknown_0850D9D8:: @ 850D9D8 - .4byte sub_8091048 - .4byte sub_8091A3C - .4byte sub_8091110 - -gUnknown_0850D9E4:: @ 850D9E4 - .byte 0x02, 0x03, 0x01, 0x04 - -gUnknown_0850D9E8:: @ 850D9E8 - .4byte sub_8091048 - .4byte sub_8091AC8 - .4byte sub_8091110 - -gUnknown_0850D9F4:: @ 850D9F4 - .byte 0x01, 0x04, 0x02, 0x03 - -gUnknown_0850D9F8:: @ 850D9F8 - .4byte sub_8091048 - .4byte sub_8091B54 - .4byte sub_8091110 - -gUnknown_0850DA04:: @ 850DA04 - .byte 0x03, 0x01, 0x04, 0x02 - -gUnknown_0850DA08:: @ 850DA08 - .4byte sub_8091048 - .4byte sub_8091BE0 - .4byte sub_8091110 - -gUnknown_0850DA14:: @ 850DA14 - .byte 0x04, 0x02, 0x03, 0x01 - -gUnknown_0850DA18:: @ 850DA18 - .4byte sub_8091048 - .4byte sub_8091C6C - .4byte sub_8091110 - -gUnknown_0850DA24:: @ 850DA24 - .byte 0x02, 0x04, 0x01, 0x03 - -gUnknown_0850DA28:: @ 850DA28 - .4byte sub_8091048 - .4byte sub_8091CF8 - .4byte sub_8091110 - -gUnknown_0850DA34:: @ 850DA34 - .byte 0x01, 0x03, 0x02, 0x04 - -gUnknown_0850DA38:: @ 850DA38 - .4byte sub_8091048 - .4byte sub_8091D84 - .4byte sub_8091110 - -gUnknown_0850DA44:: @ 850DA44 - .byte 0x03, 0x02, 0x04, 0x01 - -gUnknown_0850DA48:: @ 850DA48 - .4byte sub_8091048 - .4byte sub_8091E10 - .4byte sub_8091110 - -gUnknown_0850DA54:: @ 850DA54 - .byte 0x04, 0x01, 0x03, 0x02 - -gUnknown_0850DA58:: @ 850DA58 - .4byte mss_npc_reset_oampriv3_1_unk2_unk3 - .4byte sub_8091EC0 - .4byte sub_8091F20 - -gUnknown_0850DA64:: @ 850DA64 - .4byte sub_8091F48 - .4byte sub_8091F4C - .4byte sub_8091F94 - .4byte sub_80920A4 - .4byte sub_809215C - .4byte sub_8092214 - .4byte cph_IM_DIFFERENT - .4byte sub_8092314 - .4byte oac_hopping - .4byte sub_8091F48 - .4byte sub_8091F48 - -gUnknown_0850DA90:: @ 850DA90 - .4byte mss_npc_reset_oampriv3_1_unk2_unk3 - .4byte mss_08062EA4 - .4byte sub_8091F20 - -gUnknown_0850DA9C:: @ 850DA9C - .4byte sub_80926AC - -gUnknown_0850DAA0:: @ 850DAA0 - .4byte sub_8092718 - .4byte sub_80926B8 - -gUnknown_0850DAA8:: @ 850DAA8 - .4byte sub_8092788 - .4byte sub_80926B8 - -gUnknown_0850DAB0:: @ 850DAB0 - .4byte sub_80927F8 - .4byte sub_80926B8 - -gUnknown_0850DAB8:: @ 850DAB8 - .4byte sub_8092868 - .4byte sub_80926B8 - -gUnknown_0850DAC0:: @ 850DAC0 - .4byte sub_80928D8 - .4byte sub_809290C - .4byte sub_809292C - -gUnknown_0850DACC:: @ 850DACC - .byte 0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x01, 0x01 - -gUnknown_0850DAD5:: @ 850DAD5 - .byte 0x04, 0x04, 0x05, 0x06, 0x07, 0x04, 0x04, 0x05, 0x05 - -gUnknown_0850DADE:: @ 850DADE - .byte 0x08, 0x08, 0x09, 0x0a, 0x0b, 0x08, 0x08, 0x09, 0x09 - -gUnknown_0850DAE7:: @ 850DAE7 - .byte 0x0c, 0x0c, 0x0d, 0x0e, 0x0f, 0x0c, 0x0c, 0x0d, 0x0d - -gUnknown_0850DAF0:: @ 850DAF0 - .byte 0x10, 0x10, 0x11, 0x12, 0x13, 0x10, 0x10, 0x11, 0x11 - -gUnknown_0850DAF9:: @ 850DAF9 - .byte 0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15 - -gUnknown_0850DB02:: @ 850DB02 - .byte 0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15 - -gUnknown_0850DB0B:: @ 850DB0B - .byte 0x18, 0x18, 0x19, 0x1a, 0x1b, 0x18, 0x18, 0x19, 0x19 - -gUnknown_0850DB14:: @ 850DB14 - .byte 0x1c, 0x1c, 0x1d, 0x1e, 0x1f, 0x1c, 0x1c, 0x1d, 0x1d - -gUnknown_0850DB1D:: @ 850DB1D - .byte 0x20, 0x20, 0x21, 0x22, 0x23, 0x20, 0x20, 0x21, 0x21 - -gUnknown_0850DB26:: @ 850DB26 - .byte 0x24, 0x24, 0x25, 0x26, 0x27, 0x24, 0x24, 0x25, 0x25 - -gUnknown_0850DB2F:: @ 850DB2F - .byte 0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x01, 0x01 - -gUnknown_0850DB38:: @ 850DB38 - .byte 0x04, 0x04, 0x05, 0x06, 0x07, 0x04, 0x04, 0x05, 0x05 - -gUnknown_0850DB41:: @ 850DB41 - .byte 0x08, 0x08, 0x09, 0x0a, 0x0b, 0x08, 0x08, 0x09, 0x09 - -gUnknown_0850DB4A:: @ 850DB4A - .byte 0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15 - -gUnknown_0850DB53:: @ 850DB53 - .byte 0x08, 0x08, 0x07, 0x09, 0x0a, 0x08, 0x08, 0x07, 0x07 - - .align 2, 0 -gUnknown_0850DB5C:: @ 850DB5C - .4byte MetatileBehavior_IsSouthBlocked - .4byte MetatileBehavior_IsNorthBlocked - .4byte MetatileBehavior_IsWestBlocked - .4byte MetatileBehavior_IsEastBlocked - -gUnknown_0850DB6C:: @ 850DB6C - .4byte MetatileBehavior_IsNorthBlocked - .4byte MetatileBehavior_IsSouthBlocked - .4byte MetatileBehavior_IsEastBlocked - .4byte MetatileBehavior_IsWestBlocked - -gUnknown_0850DB7C:: @ 850DB7C - .2byte 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0xffff, 0xffff, 0x0000, 0x0001, 0x0000, 0xffff, 0x0001, 0x0001, 0x0001, 0xffff, 0xffff - .2byte 0x0001, 0xffff - -gUnknown_0850DBA0:: @ 850DBA0 - .byte 0x00, 0x00, 0x01, 0x02, 0x03 - -gUnknown_0850DBA5:: @ 850DBA5 - .byte 0x04, 0x04, 0x05, 0x06, 0x07 - -gUnknown_0850DBAA:: @ 850DBAA - .byte 0x08, 0x08, 0x09, 0x0a, 0x0b - -gUnknown_0850DBAF:: @ 850DBAF - .byte 0x15, 0x15, 0x16, 0x17, 0x18 - -gUnknown_0850DBB4:: @ 850DBB4 - .byte 0x29, 0x29, 0x2a, 0x2b, 0x2c - -gUnknown_0850DBB9:: @ 850DBB9 - .byte 0x2d, 0x2d, 0x2e, 0x2f, 0x30 - -gUnknown_0850DBBE:: @ 850DBBE - .byte 0x31, 0x31, 0x32, 0x33, 0x34 - -gUnknown_0850DBC3:: @ 850DBC3 - .byte 0x35, 0x35, 0x36, 0x37, 0x38 - -gUnknown_0850DBC8:: @ 850DBC8 - .byte 0x0c, 0x0c, 0x0d, 0x0e, 0x0f - -gUnknown_0850DBCD:: @ 850DBCD - .byte 0x46, 0x46, 0x47, 0x48, 0x49 - -gUnknown_0850DBD2:: @ 850DBD2 - .byte 0x4b, 0x4b, 0x4a, 0x4d, 0x4c - -gUnknown_0850DBD7:: @ 850DBD7 - .byte 0x42, 0x42, 0x43, 0x44, 0x45 - -gUnknown_0850DBDC:: @ 850DBDC - .byte 0x3a, 0x3a, 0x3b, 0x3c, 0x3d - -gUnknown_0850DBE1:: @ 850DBE1 - .byte 0x19, 0x19, 0x1a, 0x1b, 0x1c - -gUnknown_0850DBE6:: @ 850DBE6 - .byte 0x1d, 0x1d, 0x1e, 0x1f, 0x20 - -gUnknown_0850DBEB:: @ 850DBEB - .byte 0x21, 0x21, 0x22, 0x23, 0x24 - -gUnknown_0850DBF0:: @ 850DBF0 - .byte 0x25, 0x25, 0x26, 0x27, 0x28 - -gUnknown_0850DBF5:: @ 850DBF5 - .byte 0x64, 0x64, 0x65, 0x66, 0x67 - -gUnknown_0850DBFA:: @ 850DBFA - .byte 0x68, 0x68, 0x69, 0x6a, 0x6b - -gUnknown_0850DBFF:: @ 850DBFF - .byte 0x6c, 0x6c, 0x6d, 0x6e, 0x6f - -gUnknown_0850DC04:: @ 850DC04 - .byte 0x70, 0x70, 0x71, 0x72, 0x73 - -gUnknown_0850DC09:: @ 850DC09 - .byte 0x74, 0x74, 0x75, 0x76, 0x77 - -gUnknown_0850DC0E:: @ 850DC0E - .byte 0x78, 0x78, 0x79, 0x7a, 0x7b - -gUnknown_0850DC13:: @ 850DC13 - .byte 0x7c, 0x7c, 0x7d, 0x7e, 0x7f - -gUnknown_0850DC18:: @ 850DC18 - .byte 0x80, 0x80, 0x81, 0x82, 0x83 - -gUnknown_0850DC1D:: @ 850DC1D - .byte 0x84, 0x84, 0x85, 0x86, 0x87 - -gUnknown_0850DC22:: @ 850DC22 - .byte 0x88, 0x88, 0x89, 0x8a, 0x8b - -gUnknown_0850DC27:: @ 850DC27 - .byte 0x02, 0x01, 0x04, 0x03, 0x08, 0x07, 0x06, 0x05 - -gUnknown_0850DC2F:: @ 850DC2F - .byte 0x02, 0x01, 0x04, 0x03, 0x01, 0x02, 0x03, 0x04, 0x03, 0x04, 0x02, 0x01, 0x04, 0x03, 0x01, 0x02 - -gUnknown_0850DC3F:: @ 850DC3F - .byte 0x02, 0x01, 0x04, 0x03, 0x01, 0x02, 0x03, 0x04, 0x04, 0x03, 0x01, 0x02, 0x03, 0x04, 0x02, 0x01, 0x00 - - .align 2, 0 -gUnknown_0850DC50:: @ 850DC50 -.4byte gUnknown_0850DEC8 -.4byte gUnknown_0850DED0 -.4byte gUnknown_0850DED8 -.4byte gUnknown_0850DEE0 -.4byte gUnknown_0850DF2C -.4byte gUnknown_0850DF38 -.4byte gUnknown_0850DF44 -.4byte gUnknown_0850DF50 -.4byte gUnknown_0850DF8C -.4byte gUnknown_0850DF98 -.4byte gUnknown_0850DFA4 -.4byte gUnknown_0850DFB0 -.4byte gUnknown_0850DFC8 -.4byte gUnknown_0850DFD4 -.4byte gUnknown_0850DFE0 -.4byte gUnknown_0850DFEC -.4byte gUnknown_0850DFF8 -.4byte gUnknown_0850E004 -.4byte gUnknown_0850E010 -.4byte gUnknown_0850E01C -.4byte gUnknown_0850E028 -.4byte gUnknown_0850E034 -.4byte gUnknown_0850E040 -.4byte gUnknown_0850E04C -.4byte gUnknown_0850E058 -.4byte gUnknown_0850E064 -.4byte gUnknown_0850E070 -.4byte gUnknown_0850E07C -.4byte gUnknown_0850E088 -.4byte gUnknown_0850E094 -.4byte gUnknown_0850E0A0 -.4byte gUnknown_0850E0AC -.4byte gUnknown_0850E0B8 -.4byte gUnknown_0850E0C4 -.4byte gUnknown_0850E0D0 -.4byte gUnknown_0850E0DC -.4byte gUnknown_0850E0E8 -.4byte gUnknown_0850E0F4 -.4byte gUnknown_0850E100 -.4byte gUnknown_0850E10C -.4byte gUnknown_0850E118 -.4byte gUnknown_0850E124 -.4byte gUnknown_0850E130 -.4byte gUnknown_0850E13C -.4byte gUnknown_0850E148 -.4byte gUnknown_0850E154 -.4byte gUnknown_0850E160 -.4byte gUnknown_0850E16C -.4byte gUnknown_0850E178 -.4byte gUnknown_0850E184 -.4byte gUnknown_0850E190 -.4byte gUnknown_0850E19C -.4byte gUnknown_0850E1A8 -.4byte gUnknown_0850E1B4 -.4byte gUnknown_0850E1C0 -.4byte gUnknown_0850E1CC -.4byte gUnknown_0850E1D8 -.4byte gUnknown_0850E1E4 -.4byte gUnknown_0850E1F0 -.4byte gUnknown_0850E1FC -.4byte gUnknown_0850E208 -.4byte gUnknown_0850E214 -.4byte gUnknown_0850E220 -.4byte gUnknown_0850E228 -.4byte gUnknown_0850E230 -.4byte gUnknown_0850E238 -.4byte gUnknown_0850E240 -.4byte gUnknown_0850E24C -.4byte gUnknown_0850E258 -.4byte gUnknown_0850E264 -.4byte gUnknown_0850E270 -.4byte gUnknown_0850E27C -.4byte gUnknown_0850E288 -.4byte gUnknown_0850E294 -.4byte gUnknown_0850E2A0 -.4byte gUnknown_0850E2AC -.4byte gUnknown_0850E2B8 -.4byte gUnknown_0850E2C4 -.4byte gUnknown_0850E2D0 -.4byte gUnknown_0850E2D8 -.4byte gUnknown_0850E2E4 -.4byte gUnknown_0850E2EC -.4byte gUnknown_0850E2F4 -.4byte gUnknown_0850E2FC -.4byte gUnknown_0850E304 -.4byte gUnknown_0850E30C -.4byte gUnknown_0850E314 -.4byte gUnknown_0850E31C -.4byte gUnknown_0850E324 -.4byte gUnknown_0850E32C -.4byte gUnknown_0850E338 -.4byte gUnknown_0850E348 -.4byte gUnknown_0850E358 -.4byte gUnknown_0850E360 -.4byte gUnknown_0850E368 -.4byte gUnknown_0850E370 -.4byte gUnknown_0850E378 -.4byte gUnknown_0850E380 -.4byte gUnknown_0850E388 -.4byte gUnknown_0850E394 -.4byte gUnknown_0850E3B8 -.4byte gUnknown_0850E3C0 -.4byte gUnknown_0850E3C8 -.4byte gUnknown_0850E3D0 -.4byte gUnknown_0850E3D8 -.4byte gUnknown_0850E3E4 -.4byte gUnknown_0850E3F0 -.4byte gUnknown_0850E3FC -.4byte gUnknown_0850E408 -.4byte gUnknown_0850E414 -.4byte gUnknown_0850E420 -.4byte gUnknown_0850E42C -.4byte gUnknown_0850E474 -.4byte gUnknown_0850E480 -.4byte gUnknown_0850E48C -.4byte gUnknown_0850E498 -.4byte gUnknown_0850E4A4 -.4byte gUnknown_0850E4B0 -.4byte gUnknown_0850E4BC -.4byte gUnknown_0850E4C8 -.4byte gUnknown_0850E4D4 -.4byte gUnknown_0850E4E0 -.4byte gUnknown_0850E4EC -.4byte gUnknown_0850E4F8 -.4byte gUnknown_0850E504 -.4byte gUnknown_0850E510 -.4byte gUnknown_0850E51C -.4byte gUnknown_0850E528 -.4byte gUnknown_0850E534 -.4byte gUnknown_0850E540 -.4byte gUnknown_0850E54C -.4byte gUnknown_0850E558 -.4byte gUnknown_0850E564 -.4byte gUnknown_0850E570 -.4byte gUnknown_0850E57C -.4byte gUnknown_0850E588 -.4byte gUnknown_0850E594 -.4byte gUnknown_0850E5A0 -.4byte gUnknown_0850E5AC -.4byte gUnknown_0850E5B8 -.4byte gUnknown_0850DF5C -.4byte gUnknown_0850DF68 -.4byte gUnknown_0850DF74 -.4byte gUnknown_0850DF80 -.4byte gUnknown_0850DEFC -.4byte gUnknown_0850DF08 -.4byte gUnknown_0850DF14 -.4byte gUnknown_0850DF20 -.4byte gUnknown_0850E854 -.4byte gUnknown_0850E85C -.4byte gUnknown_0850E3A0 -.4byte gUnknown_0850E3AC -.4byte gUnknown_0850E5C4 -.4byte gUnknown_0850E5CC -.4byte gUnknown_0850E5D4 -.4byte gUnknown_0850E468 -.4byte gUnknown_0850E864 -.4byte gUnknown_0850E870 - -gUnknown_0850DEC8:: @ 850DEC8 - .4byte sub_8093950 - .4byte sub_80964BC - -gUnknown_0850DED0:: - .4byte sub_8093960 - .4byte sub_80964BC - -gUnknown_0850DED8:: - .4byte sub_8093970 - .4byte sub_80964BC - -gUnknown_0850DEE0:: - .4byte sub_8093980 - .4byte sub_80964BC - -gUnknown_0850DEE8:: @ 850DEE8 - .4byte get_go_image_anim_num - .4byte get_go_fast_image_anim_num - .4byte get_go_fast_image_anim_num - .4byte get_go_faster_image_anim_num - .4byte get_go_fastest_image_anim_num - -gUnknown_0850DEFC:: - .4byte sub_8093BC4 - .4byte sub_8093BC4_2 - .4byte sub_80964BC -gUnknown_0850DF08:: - .4byte sub_8093C04 - .4byte sub_8093C04_2 - .4byte sub_80964BC -gUnknown_0850DF14:: - .4byte sub_8093C44 - .4byte sub_8093C44_2 - .4byte sub_80964BC -gUnknown_0850DF20:: - .4byte sub_8093C84 - .4byte sub_8093C84_2 - .4byte sub_80964BC -gUnknown_0850DF2C:: - .4byte sub_8093CC4 - .4byte sub_8093CC4_2 - .4byte sub_80964BC -gUnknown_0850DF38:: - .4byte sub_8093D04 - .4byte sub_8093D04_2 - .4byte sub_80964BC -gUnknown_0850DF44:: - .4byte sub_8093D44 - .4byte sub_8093D44_2 - .4byte sub_80964BC -gUnknown_0850DF50:: - .4byte sub_8093D84 - .4byte sub_8093D84_2 - .4byte sub_80964BC -gUnknown_0850DF5C:: - .4byte sub_8093DC4 - .4byte sub_8093DC4_2 - .4byte sub_80964BC -gUnknown_0850DF68:: - .4byte sub_8093E04 - .4byte sub_8093E04_2 - .4byte sub_80964BC -gUnknown_0850DF74:: - .4byte sub_8093E44 - .4byte sub_8093E44_2 - .4byte sub_80964BC -gUnknown_0850DF80:: - .4byte sub_8093E84 - .4byte sub_8093E84_2 - .4byte sub_80964BC -gUnknown_0850DF8C:: - .4byte sub_8093EC4 - .4byte sub_8093EC4_2 - .4byte sub_80964BC -gUnknown_0850DF98:: - .4byte sub_8093F04 - .4byte sub_8093F04_2 - .4byte sub_80964BC -gUnknown_0850DFA4:: - .4byte sub_8093F44 - .4byte sub_8093F44_2 - .4byte sub_80964BC -gUnknown_0850DFB0:: - .4byte sub_8093F84 - .4byte sub_8093F84_2 - .4byte sub_80964BC - -gUnknown_0850DFBC:: @ 850DFBC - .byte 0x00, 0x00, 0x01, 0x00, 0x01, 0x00 - -gUnknown_0850DFC2:: @ 850DFC2 - .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 - -gUnknown_0850DFC8:: @ 850DFC8 - .4byte sub_8094230 - .4byte sub_8094230_2 - .4byte sub_80964BC -gUnknown_0850DFD4:: - .4byte sub_8094288 - .4byte sub_8094288_2 - .4byte sub_80964BC -gUnknown_0850DFE0:: - .4byte sub_80942E0 - .4byte sub_80942E0_2 - .4byte sub_80964BC -gUnknown_0850DFEC:: - .4byte sub_8094338 - .4byte sub_8094338_2 - .4byte sub_80964BC -gUnknown_0850DFF8:: - .4byte sub_80943B4 - .4byte sub_8094398 - .4byte sub_80964B8 -gUnknown_0850E004:: - .4byte sub_80943D4 - .4byte sub_8094398 - .4byte sub_80964B8 -gUnknown_0850E010:: - .4byte sub_80943F4 - .4byte sub_8094398 - .4byte sub_80964B8 -gUnknown_0850E01C:: - .4byte sub_8094414 - .4byte sub_8094398 - .4byte sub_80964B8 -gUnknown_0850E028:: - .4byte sub_8094434 - .4byte sub_8094398 - .4byte sub_80964B8 -gUnknown_0850E034:: - .4byte sub_8094454 - .4byte sub_8094454_2 - .4byte sub_80964BC -gUnknown_0850E040:: - .4byte sub_8094494 - .4byte sub_8094494_2 - .4byte sub_80964BC -gUnknown_0850E04C:: - .4byte sub_80944D4 - .4byte sub_80944D4_2 - .4byte sub_80964BC -gUnknown_0850E058:: - .4byte sub_8094514 - .4byte sub_8094514_2 - .4byte sub_80964BC -gUnknown_0850E064:: - .4byte sub_8094600 - .4byte sub_80945C4 - .4byte sub_80964BC -gUnknown_0850E070:: - .4byte sub_8094638 - .4byte sub_80945C4 - .4byte sub_80964BC -gUnknown_0850E07C:: - .4byte sub_8094670 - .4byte sub_80945C4 - .4byte sub_80964BC -gUnknown_0850E088:: - .4byte sub_80946A8 - .4byte sub_80945C4 - .4byte sub_80964BC -gUnknown_0850E094:: - .4byte sub_80946E0 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E0A0:: - .4byte sub_8094718 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E0AC:: - .4byte sub_8094750 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E0B8:: - .4byte sub_8094788 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E0C4:: - .4byte sub_80947C0 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E0D0:: - .4byte sub_80947F8 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E0DC:: - .4byte sub_8094830 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E0E8:: - .4byte sub_8094868 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E0F4:: - .4byte sub_80948A0 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E100:: - .4byte sub_80948D8 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E10C:: - .4byte sub_8094910 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E118:: - .4byte sub_8094948 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E124:: - .4byte sub_8094980 - .4byte sub_8094980_2 - .4byte sub_80964BC -gUnknown_0850E130:: - .4byte sub_80949C0 - .4byte sub_80949C0_2 - .4byte sub_80964BC -gUnknown_0850E13C:: - .4byte sub_8094A00 - .4byte sub_8094A00_2 - .4byte sub_80964BC -gUnknown_0850E148:: - .4byte sub_8094A40 - .4byte sub_8094A40_2 - .4byte sub_80964BC -gUnknown_0850E154:: - .4byte sub_8094A80 - .4byte sub_8094A80_2 - .4byte sub_80964BC -gUnknown_0850E160:: - .4byte sub_8094AC0 - .4byte sub_8094AC0_2 - .4byte sub_80964BC -gUnknown_0850E16C:: - .4byte sub_8094B00 - .4byte sub_8094B00_2 - .4byte sub_80964BC -gUnknown_0850E178:: - .4byte sub_8094B40 - .4byte sub_8094B40_2 - .4byte sub_80964BC -gUnknown_0850E184:: - .4byte sub_8094B80 - .4byte sub_8094B80_2 - .4byte sub_80964BC -gUnknown_0850E190:: - .4byte sub_8094BC0 - .4byte sub_8094BC0_2 - .4byte sub_80964BC -gUnknown_0850E19C:: - .4byte sub_8094C00 - .4byte sub_8094C00_2 - .4byte sub_80964BC -gUnknown_0850E1A8:: - .4byte sub_8094C40 - .4byte sub_8094C40_2 - .4byte sub_80964BC -gUnknown_0850E1B4:: - .4byte sub_8094C80 - .4byte sub_8094C80_2 - .4byte sub_80964BC -gUnknown_0850E1C0:: - .4byte sub_8094CC0 - .4byte sub_8094CC0_2 - .4byte sub_80964BC -gUnknown_0850E1CC:: - .4byte sub_8094D00 - .4byte sub_8094D00_2 - .4byte sub_80964BC -gUnknown_0850E1D8:: - .4byte sub_8094D40 - .4byte sub_8094D40_2 - .4byte sub_80964BC -gUnknown_0850E1E4:: - .4byte sub_8094DAC - .4byte sub_8094DC4 - .4byte sub_80964BC -gUnknown_0850E1F0:: - .4byte sub_8094E18 - .4byte sub_8094E18_2 - .4byte sub_80964BC -gUnknown_0850E1FC:: - .4byte sub_8094E60 - .4byte sub_8094E60_2 - .4byte sub_80964BC -gUnknown_0850E208:: - .4byte sub_8094EB8 - .4byte sub_8094EB8_2 - .4byte sub_80964BC -gUnknown_0850E214:: - .4byte sub_8094710 - .4byte sub_8094710_2 - .4byte sub_80964BC -gUnknown_0850E220:: - .4byte sub_8094F38 - .4byte sub_80964BC -gUnknown_0850E228:: - .4byte sub_8094F94 - .4byte sub_80964BC -gUnknown_0850E230:: - .4byte sub_8094FF8 - .4byte sub_80964BC -gUnknown_0850E238:: - .4byte sub_8095008 - .4byte sub_80964BC -gUnknown_0850E240:: - .4byte sub_8095018 - .4byte sub_8095018_2 - .4byte sub_80964BC -gUnknown_0850E24C:: - .4byte sub_8095070 - .4byte sub_8095070_2 - .4byte sub_80964BC -gUnknown_0850E258:: - .4byte sub_80950C8 - .4byte sub_80950C8_2 - .4byte sub_80964BC -gUnknown_0850E264:: - .4byte sub_8095120 - .4byte sub_8095120_2 - .4byte sub_80964BC -gUnknown_0850E270:: - .4byte sub_8095178 - .4byte sub_8095178_2 - .4byte sub_80964BC -gUnknown_0850E27C:: - .4byte sub_80951D0 - .4byte sub_80951D0_2 - .4byte sub_80964BC -gUnknown_0850E288:: - .4byte sub_8095228 - .4byte sub_8095228_2 - .4byte sub_80964BC -gUnknown_0850E294:: - .4byte sub_8095280 - .4byte sub_8095280_2 - .4byte sub_80964BC -gUnknown_0850E2A0:: - .4byte sub_80952D8 - .4byte sub_80952D8_2 - .4byte sub_80964BC -gUnknown_0850E2AC:: - .4byte sub_8095330 - .4byte sub_8095330_2 - .4byte sub_80964BC -gUnknown_0850E2B8:: - .4byte sub_8095388 - .4byte sub_8095388_2 - .4byte sub_80964BC -gUnknown_0850E2C4:: - .4byte sub_80953E0 - .4byte sub_80953E0_2 - .4byte sub_80964BC -gUnknown_0850E2D0:: - .4byte sub_8095438 - .4byte sub_80964BC -gUnknown_0850E2D8:: - .4byte sub_8095450 - .4byte sub_8094DC4 - .4byte sub_80964BC -gUnknown_0850E2E4:: - .4byte sub_8095460 - .4byte sub_80964B8 -gUnknown_0850E2EC:: - .4byte sub_8095470 - .4byte sub_80964B8 -gUnknown_0850E2F4:: - .4byte sub_8095480 - .4byte sub_80964B8 -gUnknown_0850E2FC:: - .4byte sub_8095490 - .4byte sub_80964B8 -gUnknown_0850E304:: - .4byte sub_80954BC - .4byte sub_80964B8 -gUnknown_0850E30C:: - .4byte sub_80954CC - .4byte sub_80964B8 -gUnknown_0850E314:: - .4byte do_exclamation_mark_bubble_1 - .4byte sub_80964B8 -gUnknown_0850E31C:: - .4byte do_exclamation_mark_bubble_2 - .4byte sub_80964B8 -gUnknown_0850E324:: - .4byte do_heart_bubble - .4byte sub_80964B8 -gUnknown_0850E32C:: - .4byte sub_8095548 - .4byte sub_809558C - .4byte sub_80964B8 -gUnknown_0850E338:: - .4byte sub_80955AC - .4byte sub_80955C8 - .4byte sub_80955EC - .4byte sub_80964B8 -gUnknown_0850E348:: - .4byte sub_8095628 - .4byte sub_8095644 - .4byte sub_8095668 - .4byte sub_80964B8 -gUnknown_0850E358:: - .4byte sub_80956A4 - .4byte sub_80964B8 -gUnknown_0850E360:: - .4byte sub_80956B4 - .4byte sub_80964B8 -gUnknown_0850E368:: - .4byte sub_80956C4 - .4byte sub_80964B8 -gUnknown_0850E370:: - .4byte sub_80956F4 - .4byte sub_80964B8 -gUnknown_0850E378:: - .4byte sub_8095724 - .4byte sub_80964B8 -gUnknown_0850E380:: - .4byte sub_8095730 - .4byte sub_80964B8 -gUnknown_0850E388:: - .4byte sub_8095740 - .4byte sub_8095740_2 - .4byte sub_80964BC -gUnknown_0850E394:: - .4byte sub_80957A0 - .4byte sub_80957A0_2 - .4byte sub_80964BC -gUnknown_0850E3A0:: - .4byte sub_8095800 - .4byte sub_8095800_2 - .4byte sub_80964BC -gUnknown_0850E3AC:: - .4byte sub_8095860 - .4byte sub_8095860_2 - .4byte sub_80964BC -gUnknown_0850E3B8:: - .4byte sub_8095900 - .4byte sub_80964BC -gUnknown_0850E3C0:: - .4byte sub_8095910 - .4byte sub_80964BC -gUnknown_0850E3C8:: - .4byte sub_8095920 - .4byte sub_80964BC -gUnknown_0850E3D0:: - .4byte sub_8095930 - .4byte sub_80964BC -gUnknown_0850E3D8:: - .4byte sub_8095940 - .4byte sub_8094DC4 - .4byte sub_80964BC -gUnknown_0850E3E4:: - .4byte sub_8095964 - .4byte sub_8094DC4 - .4byte sub_80964BC -gUnknown_0850E3F0:: - .4byte sub_8095988 - .4byte sub_8094DC4 - .4byte sub_80964BC -gUnknown_0850E3FC:: - .4byte sub_80959AC - .4byte sub_8094DC4 - .4byte sub_80964BC -gUnknown_0850E408:: - .4byte sub_80959D0 - .4byte sub_8094DC4 - .4byte sub_80964BC -gUnknown_0850E414:: - .4byte sub_80959F4 - .4byte sub_8094DC4 - .4byte sub_80964BC -gUnknown_0850E420:: - .4byte sub_8095A18 - .4byte sub_8094DC4 - .4byte sub_80964BC -gUnknown_0850E42C:: - .4byte sub_8095A3C - .4byte sub_8094DC4 - .4byte sub_80964BC - .4byte sub_8095A60 - .4byte sub_8094DC4 - .4byte sub_80964BC - .4byte sub_8095A84 - .4byte sub_8094DC4 - .4byte sub_80964BC - .4byte sub_8095AA8 - .4byte sub_8094DC4 - .4byte sub_80964BC - .4byte sub_8095ACC - .4byte sub_8094DC4 - .4byte sub_80964BC -gUnknown_0850E468:: - .4byte sub_8095B44 - .4byte sub_8095B64 - .4byte sub_80964BC -gUnknown_0850E474:: - .4byte sub_8095BC8 - .4byte sub_8095BC8_2 - .4byte sub_80964BC -gUnknown_0850E480:: - .4byte sub_8095C20 - .4byte sub_8095C20_2 - .4byte sub_80964BC -gUnknown_0850E48C:: - .4byte sub_8095C78 - .4byte sub_8095C78_2 - .4byte sub_80964BC -gUnknown_0850E498:: - .4byte sub_8095CD0 - .4byte sub_8095CD0_2 - .4byte sub_80964BC -gUnknown_0850E4A4:: - .4byte sub_8095D28 - .4byte sub_8095D28_2 - .4byte sub_80964BC -gUnknown_0850E4B0:: - .4byte sub_8095D80 - .4byte sub_8095D80_2 - .4byte sub_80964BC -gUnknown_0850E4BC:: - .4byte sub_8095DD8 - .4byte sub_8095DD8_2 - .4byte sub_80964BC -gUnknown_0850E4C8:: - .4byte sub_8095E30 - .4byte sub_8095E30_2 - .4byte sub_80964BC -gUnknown_0850E4D4:: - .4byte sub_8095E88 - .4byte sub_8095E88_2 - .4byte sub_80964BC -gUnknown_0850E4E0:: - .4byte sub_8095EE0 - .4byte sub_8095EE0_2 - .4byte sub_80964BC -gUnknown_0850E4EC:: - .4byte sub_8095F38 - .4byte sub_8095F38_2 - .4byte sub_80964BC -gUnknown_0850E4F8:: - .4byte sub_8095F90 - .4byte sub_8095F90_2 - .4byte sub_80964BC -gUnknown_0850E504:: - .4byte sub_8095FE8 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E510:: - .4byte sub_8096020 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E51C:: - .4byte sub_8096058 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E528:: - .4byte sub_8096090 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E534:: - .4byte sub_8096100 - .4byte sub_8096100_2 - .4byte sub_80964BC -gUnknown_0850E540:: - .4byte sub_8096140 - .4byte sub_8096140_2 - .4byte sub_80964BC -gUnknown_0850E54C:: - .4byte sub_8096180 - .4byte sub_8096180_2 - .4byte sub_80964BC -gUnknown_0850E558:: - .4byte sub_80961C0 - .4byte sub_80961C0_2 - .4byte sub_80964BC -gUnknown_0850E564:: - .4byte sub_8096230 - .4byte sub_8096230_2 - .4byte sub_80964BC -gUnknown_0850E570:: - .4byte sub_8096270 - .4byte sub_8096270_2 - .4byte sub_80964BC -gUnknown_0850E57C:: - .4byte sub_80962B0 - .4byte sub_80962B0_2 - .4byte sub_80964BC -gUnknown_0850E588:: - .4byte sub_80962F0 - .4byte sub_80962F0_2 - .4byte sub_80964BC -gUnknown_0850E594:: - .4byte sub_8096368 - .4byte sub_8096368_2 - .4byte sub_80964BC -gUnknown_0850E5A0:: - .4byte sub_80963A8 - .4byte sub_80963A8_2 - .4byte sub_80964BC -gUnknown_0850E5AC:: - .4byte sub_80963E8 - .4byte sub_80963E8_2 - .4byte sub_80964BC -gUnknown_0850E5B8:: - .4byte sub_8096428 - .4byte sub_8096428_2 - .4byte sub_80964BC -gUnknown_0850E5C4:: - .4byte sub_8096468 - .4byte sub_80964B8 -gUnknown_0850E5CC:: - .4byte sub_809647C - .4byte sub_80964B8 -gUnknown_0850E5D4:: - .4byte sub_8096494 - .4byte sub_80964B8 - diff --git a/data/graphics/field_objects/berry_tree_graphics_tables.inc b/data/graphics/field_objects/berry_tree_graphics_tables.inc deleted file mode 100644 index 8d716d7594..0000000000 --- a/data/graphics/field_objects/berry_tree_graphics_tables.inc +++ /dev/null @@ -1,635 +0,0 @@ - .align 2 -gFieldObjectPicTable_PechaBerryTree:: @ 850BE48 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_PechaBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_PechaBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_PechaBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_PechaBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_PechaBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_PechaBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Pecha:: @ 850BE90 - berry_tree_palette_slot_table 4 - - .align 2 -gFieldObjectPicTable_KelpsyBerryTree:: @ 850BE98 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_KelpsyBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_KelpsyBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_KelpsyBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_KelpsyBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_KelpsyBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_KelpsyBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Kelpsy:: @ 850BEE0 - berry_tree_palette_slot_table 2 - - .align 2 -gFieldObjectPicTable_WepearBerryTree:: @ 850BEE8 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_WepearBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_WepearBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_WepearBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_WepearBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_WepearBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_WepearBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Wepear:: @ 850BF30 - berry_tree_palette_slot_table 2 - - .align 2 -gFieldObjectPicTable_IapapaBerryTree:: @ 850BF38 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_IapapaBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_IapapaBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_IapapaBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_IapapaBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_IapapaBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_IapapaBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Iapapa:: @ 850BF80 - berry_tree_palette_slot_table 3 - - .align 2 -gFieldObjectPicTable_CheriBerryTree:: @ 850BF88 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_CheriBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_CheriBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_CheriBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_CheriBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_CheriBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_CheriBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Cheri:: @ 850BFD0 - berry_tree_palette_slot_table 4 - - .align 2 -gFieldObjectPicTable_FigyBerryTree:: @ 850BFD8 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_FigyBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_FigyBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_FigyBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_FigyBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_FigyBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_FigyBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Figy:: @ 850C020 - berry_tree_palette_slot_table 3 - - .align 2 -gFieldObjectPicTable_MagoBerryTree:: @ 850C028 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_MagoBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_MagoBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_MagoBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_MagoBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_MagoBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_MagoBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Mago:: @ 850C070 - berry_tree_palette_slot_table 3 - - .align 2 -gFieldObjectPicTable_LumBerryTree:: @ 850C078 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_LumBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_LumBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_LumBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_LumBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_LumBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_LumBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Lum:: @ 850C0C0 - berry_tree_palette_slot_table 4 - - .align 2 -gFieldObjectPicTable_RazzBerryTree:: @ 850C0C8 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_RazzBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_RazzBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_RazzBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_RazzBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_RazzBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_RazzBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Razz:: @ 850C110 - berry_tree_palette_slot_table 4 - - .align 2 -gFieldObjectPicTable_GrepaBerryTree:: @ 850C118 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_GrepaBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_GrepaBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_GrepaBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_GrepaBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_GrepaBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_GrepaBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Grepa:: @ 850C160 - berry_tree_palette_slot_table 3 - - .align 2 -gFieldObjectPicTable_RabutaBerryTree:: @ 850C168 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_RabutaBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_RabutaBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_RabutaBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_RabutaBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_RabutaBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_RabutaBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Rabuta:: @ 850C1B0 - berry_tree_palette_slot_table 4 - - .align 2 -gFieldObjectPicTable_NomelBerryTree:: @ 850C1B8 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_NomelBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_NomelBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_NomelBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_NomelBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_NomelBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_NomelBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Nomel:: @ 850C200 - berry_tree_palette_slot_table 3 - - .align 2 -gFieldObjectPicTable_LeppaBerryTree:: @ 850C208 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_LeppaBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_LeppaBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_LeppaBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_LeppaBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_LeppaBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_LeppaBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Leppa:: @ 850C250 - berry_tree_palette_slot_table 3 - - .align 2 -gFieldObjectPicTable_LiechiBerryTree:: @ 850C258 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_LiechiBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_LiechiBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_LiechiBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_LiechiBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_LiechiBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_LiechiBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Liechi:: @ 850C2A0 - berry_tree_palette_slot_table 4 - - .align 2 -gFieldObjectPicTable_HondewBerryTree:: @ 850C2A8 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_HondewBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_HondewBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_HondewBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_HondewBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_HondewBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_HondewBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Hondew:: @ 850C2F0 - berry_tree_palette_slot_table 5 - - .align 2 -gFieldObjectPicTable_AguavBerryTree:: @ 850C2F8 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_AguavBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_AguavBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_AguavBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_AguavBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_AguavBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_AguavBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Aguav:: @ 850C340 - berry_tree_palette_slot_table 4 - - .align 2 -gFieldObjectPicTable_WikiBerryTree:: @ 850C348 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_WikiBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_WikiBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_WikiBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_WikiBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_WikiBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_WikiBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Wiki:: @ 850C390 - berry_tree_palette_slot_table 3 - - .align 2 -gFieldObjectPicTable_PomegBerryTree:: @ 850C398 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_PomegBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_PomegBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_PomegBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_PomegBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_PomegBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_PomegBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Pomeg:: @ 850C3E0 - berry_tree_palette_slot_table 3 - - .align 2 -gFieldObjectPicTable_RawstBerryTree:: @ 850C3E8 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_RawstBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_RawstBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_RawstBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_RawstBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_RawstBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_RawstBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Rawst:: @ 850C430 - berry_tree_palette_slot_table 4 - - .align 2 -gFieldObjectPicTable_SpelonBerryTree:: @ 850C438 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_SpelonBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_SpelonBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_SpelonBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_SpelonBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_SpelonBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_SpelonBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Spelon:: @ 850C480 - berry_tree_palette_slot_table 3 - - .align 2 -gFieldObjectPicTable_ChestoBerryTree:: @ 850C488 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_ChestoBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_ChestoBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_ChestoBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_ChestoBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_ChestoBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_ChestoBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Chesto:: @ 850C4D0 - berry_tree_palette_slot_table 2 - - .align 2 -gFieldObjectPicTable_OranBerryTree:: @ 850C4D8 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_OranBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_OranBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_OranBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_OranBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_OranBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_OranBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Oran:: @ 850C520 - berry_tree_palette_slot_table 2 - - .align 2 -gFieldObjectPicTable_PersimBerryTree:: @ 850C528 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_PersimBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_PersimBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_PersimBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_PersimBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_PersimBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_PersimBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Persim:: @ 850C570 - berry_tree_palette_slot_table 2 - - .align 2 -gFieldObjectPicTable_SitrusBerryTree:: @ 850C578 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_SitrusBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_SitrusBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_SitrusBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_SitrusBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_SitrusBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_SitrusBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Sitrus:: @ 850C5C0 - berry_tree_palette_slot_table 4 - - .align 2 -gFieldObjectPicTable_AspearBerryTree:: @ 850C5C8 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_AspearBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_AspearBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_AspearBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_AspearBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_AspearBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_AspearBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Aspear:: @ 850C610 - berry_tree_palette_slot_table 3 - - .align 2 -gFieldObjectPicTable_PamtreBerryTree:: @ 850C618 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_PamtreBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_PamtreBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_PamtreBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_PamtreBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_PamtreBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_PamtreBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Pamtre:: @ 850C660 - berry_tree_palette_slot_table 2 - - .align 2 -gFieldObjectPicTable_CornnBerryTree:: @ 850C668 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_CornnBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_CornnBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_CornnBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_CornnBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_CornnBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_CornnBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Cornn:: @ 850C6B0 - berry_tree_palette_slot_table 2 - - .align 2 -gFieldObjectPicTable_LansatBerryTree:: @ 850C6B8 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_LansatBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_LansatBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_LansatBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_LansatBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_LansatBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_LansatBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Lansat:: @ 850C700 - berry_tree_palette_slot_table 2 - - .align 2 -gFieldObjectPicTable_DurinBerryTree:: @ 850C708 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_DurinBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_DurinBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_DurinBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_DurinBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_DurinBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_DurinBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Durin:: @ 850C750 - berry_tree_palette_slot_table 4 - - .align 2 -gFieldObjectPicTable_TamatoBerryTree:: @ 850C758 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_TamatoBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_TamatoBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_TamatoBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_TamatoBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_TamatoBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_TamatoBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Tamato:: @ 850C7A0 - berry_tree_palette_slot_table 2 - - .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES - .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES - .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES - .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES - .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES - -gBerryTreeFieldObjectGraphicsIdTable:: @ 850C7AA - .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES - .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES - .byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES - .byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES - .byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES - - .align 2 -gBerryTreePicTablePointers:: @ 850C7B0 - .4byte gFieldObjectPicTable_CheriBerryTree @ Cheri - .4byte gFieldObjectPicTable_ChestoBerryTree @ Chesto - .4byte gFieldObjectPicTable_PechaBerryTree @ Pecha - .4byte gFieldObjectPicTable_RawstBerryTree @ Rawst - .4byte gFieldObjectPicTable_AspearBerryTree @ Aspear - .4byte gFieldObjectPicTable_LeppaBerryTree @ Leppa - .4byte gFieldObjectPicTable_OranBerryTree @ Oran - .4byte gFieldObjectPicTable_PersimBerryTree @ Persim - .4byte gFieldObjectPicTable_LumBerryTree @ Lum - .4byte gFieldObjectPicTable_SitrusBerryTree @ Sitrus - .4byte gFieldObjectPicTable_FigyBerryTree @ Figy - .4byte gFieldObjectPicTable_WikiBerryTree @ Wiki - .4byte gFieldObjectPicTable_MagoBerryTree @ Mago - .4byte gFieldObjectPicTable_AguavBerryTree @ Aguav - .4byte gFieldObjectPicTable_IapapaBerryTree @ Iapapa - .4byte gFieldObjectPicTable_RazzBerryTree @ Razz - .4byte gFieldObjectPicTable_RazzBerryTree @ Bluk - .4byte gFieldObjectPicTable_MagoBerryTree @ Nanab - .4byte gFieldObjectPicTable_WepearBerryTree @ Wepear - .4byte gFieldObjectPicTable_IapapaBerryTree @ Pinap - .4byte gFieldObjectPicTable_PomegBerryTree @ Pomeg - .4byte gFieldObjectPicTable_KelpsyBerryTree @ Kelpsy - .4byte gFieldObjectPicTable_WepearBerryTree @ Qualot - .4byte gFieldObjectPicTable_HondewBerryTree @ Hondew - .4byte gFieldObjectPicTable_GrepaBerryTree @ Grepa - .4byte gFieldObjectPicTable_TamatoBerryTree @ Tamato - .4byte gFieldObjectPicTable_CornnBerryTree @ Cornn - .4byte gFieldObjectPicTable_PomegBerryTree @ Magost - .4byte gFieldObjectPicTable_RabutaBerryTree @ Rabuta - .4byte gFieldObjectPicTable_NomelBerryTree @ Nomel - .4byte gFieldObjectPicTable_SpelonBerryTree @ Spelon - .4byte gFieldObjectPicTable_PamtreBerryTree @ Pamtre - .4byte gFieldObjectPicTable_RabutaBerryTree @ Watmel - .4byte gFieldObjectPicTable_DurinBerryTree @ Durin - .4byte gFieldObjectPicTable_HondewBerryTree @ Belue - .4byte gFieldObjectPicTable_LiechiBerryTree @ Liechi - .4byte gFieldObjectPicTable_HondewBerryTree @ Ganlon - .4byte gFieldObjectPicTable_AguavBerryTree @ Salac - .4byte gFieldObjectPicTable_PomegBerryTree @ Petaya - .4byte gFieldObjectPicTable_GrepaBerryTree @ Apicot - .4byte gFieldObjectPicTable_LansatBerryTree @ Lansat - .4byte gFieldObjectPicTable_CornnBerryTree @ Starf - .4byte gFieldObjectPicTable_DurinBerryTree @ Enigma - - .align 2 -gBerryTreePaletteSlotTablePointers:: @ 850C85C - .4byte gBerryTreePaletteSlotTable_Cheri @ Cheri - .4byte gBerryTreePaletteSlotTable_Chesto @ Chesto - .4byte gBerryTreePaletteSlotTable_Pecha @ Pecha - .4byte gBerryTreePaletteSlotTable_Rawst @ Rawst - .4byte gBerryTreePaletteSlotTable_Aspear @ Aspear - .4byte gBerryTreePaletteSlotTable_Leppa @ Leppa - .4byte gBerryTreePaletteSlotTable_Oran @ Oran - .4byte gBerryTreePaletteSlotTable_Persim @ Persim - .4byte gBerryTreePaletteSlotTable_Lum @ Lum - .4byte gBerryTreePaletteSlotTable_Sitrus @ Sitrus - .4byte gBerryTreePaletteSlotTable_Figy @ Figy - .4byte gBerryTreePaletteSlotTable_Wiki @ Wiki - .4byte gBerryTreePaletteSlotTable_Mago @ Mago - .4byte gBerryTreePaletteSlotTable_Aguav @ Aguav - .4byte gBerryTreePaletteSlotTable_Iapapa @ Iapapa - .4byte gBerryTreePaletteSlotTable_Razz @ Razz - .4byte gBerryTreePaletteSlotTable_Razz @ Bluk - .4byte gBerryTreePaletteSlotTable_Mago @ Nanab - .4byte gBerryTreePaletteSlotTable_Wepear @ Wepear - .4byte gBerryTreePaletteSlotTable_Iapapa @ Pinap - .4byte gBerryTreePaletteSlotTable_Pomeg @ Pomeg - .4byte gBerryTreePaletteSlotTable_Kelpsy @ Kelpsy - .4byte gBerryTreePaletteSlotTable_Wepear @ Qualot - .4byte gBerryTreePaletteSlotTable_Hondew @ Hondew - .4byte gBerryTreePaletteSlotTable_Grepa @ Grepa - .4byte gBerryTreePaletteSlotTable_Tamato @ Tamato - .4byte gBerryTreePaletteSlotTable_Cornn @ Cornn - .4byte gBerryTreePaletteSlotTable_Pomeg @ Magost - .4byte gBerryTreePaletteSlotTable_Rabuta @ Rabuta - .4byte gBerryTreePaletteSlotTable_Nomel @ Nomel - .4byte gBerryTreePaletteSlotTable_Spelon @ Spelon - .4byte gBerryTreePaletteSlotTable_Pamtre @ Pamtre - .4byte gBerryTreePaletteSlotTable_Rabuta @ Watmel - .4byte gBerryTreePaletteSlotTable_Durin @ Durin - .4byte gBerryTreePaletteSlotTable_Hondew @ Belue - .4byte gBerryTreePaletteSlotTable_Liechi @ Liechi - .4byte gBerryTreePaletteSlotTable_Hondew @ Ganlon - .4byte gBerryTreePaletteSlotTable_Aguav @ Salac - .4byte gBerryTreePaletteSlotTable_Pomeg @ Petaya - .4byte gBerryTreePaletteSlotTable_Grepa @ Apicot - .4byte gBerryTreePaletteSlotTable_Lansat @ Lansat - .4byte gBerryTreePaletteSlotTable_Cornn @ Starf - .4byte gBerryTreePaletteSlotTable_Durin @ Enigma - - .align 2 -gBerryTreeFieldObjectGraphicsIdTablePointers:: @ 850C908 - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Cheri - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Chesto - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Pecha - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Rawst - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Aspear - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Leppa - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Oran - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Persim - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Lum - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Sitrus - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Figy - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Wiki - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Mago - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Aguav - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Iapapa - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Razz - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Bluk - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Nanab - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Wepear - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Pinap - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Pomeg - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Kelpsy - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Qualot - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Hondew - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Grepa - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Tamato - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Cornn - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Magost - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Rabuta - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Nomel - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Spelon - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Pamtre - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Watmel - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Durin - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Belue - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Liechi - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Ganlon - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Salac - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Petaya - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Apicot - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Lansat - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Starf - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Enigma - -@ extras - .4byte gBerryTreeFieldObjectGraphicsIdTable - .4byte gBerryTreeFieldObjectGraphicsIdTable - .4byte gBerryTreeFieldObjectGraphicsIdTable diff --git a/data/graphics/field_objects/field_effect_object_template_pointers.inc b/data/graphics/field_objects/field_effect_object_template_pointers.inc deleted file mode 100644 index 846cdf6c2e..0000000000 --- a/data/graphics/field_objects/field_effect_object_template_pointers.inc +++ /dev/null @@ -1,39 +0,0 @@ - .align 2 -gFieldEffectObjectTemplatePointers:: @ 85059F8 - .4byte gFieldEffectObjectTemplate_ShadowSmall - .4byte gFieldEffectObjectTemplate_ShadowMedium - .4byte gFieldEffectObjectTemplate_ShadowLarge - .4byte gFieldEffectObjectTemplate_ShadowExtraLarge - .4byte gFieldEffectObjectTemplate_TallGrass - .4byte gFieldEffectObjectTemplate_Ripple - .4byte gFieldEffectObjectTemplate_Ash - .4byte gFieldEffectObjectTemplate_SurfBlob - .4byte gFieldEffectObjectTemplate_Arrow - .4byte gFieldEffectObjectTemplate_GroundImpactDust - .4byte gFieldEffectObjectTemplate_BikeHopTallGrass - .4byte gFieldEffectObjectTemplate_SandFootprints - .4byte gFieldEffectObjectTemplate_BikeHopBigSplash - .4byte gFieldEffectObjectTemplate_Splash - .4byte gFieldEffectObjectTemplate_BikeHopSmallSplash - .4byte gFieldEffectObjectTemplate_LongGrass - .4byte gFieldEffectObjectTemplate_Unknown16 - .4byte gFieldEffectObjectTemplate_Unknown17 - .4byte gFieldEffectObjectTemplate_Unknown18 - .4byte gFieldEffectObjectTemplate_Unknown19 - .4byte gFieldEffectObjectTemplate_Unknown20 - .4byte gFieldEffectObjectTemplate_Unknown21 - .4byte gFieldEffectObjectTemplate_BerryTreeGrowthSparkle - .4byte gFieldEffectObjectTemplate_DeepSandFootprints - .4byte gFieldEffectObjectTemplate_TreeDisguise - .4byte gFieldEffectObjectTemplate_MountainDisguise - .4byte gFieldEffectObjectTemplate_Bird - .4byte gFieldEffectObjectTemplate_BikeTireTracks - .4byte gFieldEffectObjectTemplate_SandDisguisePlaceholder - .4byte gFieldEffectObjectTemplate_Unknown29 - .4byte gFieldEffectObjectTemplate_ShortGrass - .4byte gFieldEffectObjectTemplate_HotSpringsWater - .4byte gFieldEffectObjectTemplate_JumpOutOfAsh - .4byte gFieldEffectObjectTemplate_Unknown33 - .4byte gFieldEffectObjectTemplate_Bubbles - .4byte gFieldEffectObjectTemplate_Unknown35 - .4byte gFieldEffectObjectTemplate_Rayquaza diff --git a/data/graphics/field_objects/field_effect_objects.inc b/data/graphics/field_objects/field_effect_objects.inc deleted file mode 100644 index 2c1ce3c4c2..0000000000 --- a/data/graphics/field_objects/field_effect_objects.inc +++ /dev/null @@ -1,1208 +0,0 @@ - - .align 2 -gFieldEffectObjectPaletteInfo0:: @ 850C9C0 - obj_pal gFieldEffectObjectPalette0, 0x1004 - - .align 2 -gFieldEffectObjectPaletteInfo1:: @ 850C9C8 - obj_pal gFieldEffectObjectPalette1, 0x1005 - - .align 2 -gFieldEffectObjectImageAnim_850C9D0:: @ 850C9D0 - obj_image_anim_frame 0, 1 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_Shadow:: @ 850C9D8 - .4byte gFieldEffectObjectImageAnim_850C9D0 - - .align 2 -gFieldEffectObjectPicTable_ShadowSmall:: @ 850C9DC - obj_tiles gFieldEffectObjectPic_ShadowSmall, 0x20 - - .align 2 -gFieldEffectObjectPicTable_ShadowMedium:: @ 850C9E4 - obj_tiles gFieldEffectObjectPic_ShadowMedium, 0x40 - - .align 2 -gFieldEffectObjectPicTable_ShadowLarge:: @ 850C9EC - obj_tiles gFieldEffectObjectPic_ShadowLarge, 0x80 - - .align 2 -gFieldEffectObjectPicTable_ShadowExtraLarge:: @ 850C9F4 - obj_tiles gFieldEffectObjectPic_ShadowExtraLarge, 0x400 - - .align 2 -gFieldEffectObjectTemplate_ShadowSmall:: @ 850C9FC - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_8x8 - .4byte gFieldEffectObjectImageAnimTable_Shadow - .4byte gFieldEffectObjectPicTable_ShadowSmall - .4byte gDummySpriteAffineAnimTable - .4byte oamc_shadow - - .align 2 -gFieldEffectObjectTemplate_ShadowMedium:: @ 850CA14 - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_16x8 - .4byte gFieldEffectObjectImageAnimTable_Shadow - .4byte gFieldEffectObjectPicTable_ShadowMedium - .4byte gDummySpriteAffineAnimTable - .4byte oamc_shadow - - .align 2 -gFieldEffectObjectTemplate_ShadowLarge:: @ 850CA2C - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_32x8 - .4byte gFieldEffectObjectImageAnimTable_Shadow - .4byte gFieldEffectObjectPicTable_ShadowLarge - .4byte gDummySpriteAffineAnimTable - .4byte oamc_shadow - - .align 2 -gFieldEffectObjectTemplate_ShadowExtraLarge:: @ 850CA44 - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_64x32 - .4byte gFieldEffectObjectImageAnimTable_Shadow - .4byte gFieldEffectObjectPicTable_ShadowExtraLarge - .4byte gDummySpriteAffineAnimTable - .4byte oamc_shadow - - .align 2 -gFieldEffectObjectPicTable_TallGrass:: @ 850CA5C - obj_tiles gFieldEffectObjectPic_TallGrass_0, 0x80 - obj_tiles gFieldEffectObjectPic_TallGrass_1, 0x80 - obj_tiles gFieldEffectObjectPic_TallGrass_2, 0x80 - obj_tiles gFieldEffectObjectPic_TallGrass_3, 0x80 - obj_tiles gFieldEffectObjectPic_TallGrass_4, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850CA84:: @ 850CA84 - obj_image_anim_frame 1, 10 - obj_image_anim_frame 2, 10 - obj_image_anim_frame 3, 10 - obj_image_anim_frame 4, 10 - obj_image_anim_frame 0, 10 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_TallGrass:: @ 850CA9C - .4byte gFieldEffectObjectImageAnim_850CA84 - - .align 2 -gFieldEffectObjectTemplate_TallGrass:: @ 850CAA0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_TallGrass - .4byte gFieldEffectObjectPicTable_TallGrass - .4byte gDummySpriteAffineAnimTable - .4byte unc_grass_normal - - .align 2 -gFieldEffectObjectPicTable_Ripple:: @ 850CAB8 - obj_tiles gFieldEffectObjectPic_Ripple_0, 0x80 - obj_tiles gFieldEffectObjectPic_Ripple_1, 0x80 - obj_tiles gFieldEffectObjectPic_Ripple_2, 0x80 - obj_tiles gFieldEffectObjectPic_Ripple_3, 0x80 - obj_tiles gFieldEffectObjectPic_Ripple_4, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850CAE0:: @ 850CAE0 - obj_image_anim_frame 0, 12 - obj_image_anim_frame 1, 9 - obj_image_anim_frame 2, 9 - obj_image_anim_frame 3, 9 - obj_image_anim_frame 0, 9 - obj_image_anim_frame 1, 9 - obj_image_anim_frame 2, 11 - obj_image_anim_frame 4, 11 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_Ripple:: @ 850CB04 - .4byte gFieldEffectObjectImageAnim_850CAE0 - - .align 2 -gFieldEffectObjectTemplate_Ripple:: @ 850CB08 - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Ripple - .4byte gFieldEffectObjectPicTable_Ripple - .4byte gDummySpriteAffineAnimTable - .4byte sub_81561D0 - - .align 2 -gFieldEffectObjectPicTable_Ash:: @ 850CB20 - obj_tiles gFieldEffectObjectPic_Ash_0, 0x80 - obj_tiles gFieldEffectObjectPic_Ash_1, 0x80 - obj_tiles gFieldEffectObjectPic_Ash_2, 0x80 - obj_tiles gFieldEffectObjectPic_Ash_3, 0x80 - obj_tiles gFieldEffectObjectPic_Ash_4, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850CB48:: @ 850CB48 - obj_image_anim_frame 0, 12 - obj_image_anim_frame 1, 12 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 12 - obj_image_anim_frame 4, 12 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_Ash:: @ 850CB60 - .4byte gFieldEffectObjectImageAnim_850CB48 - - .align 2 -gFieldEffectObjectTemplate_Ash:: @ 850CB64 - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Ash - .4byte gFieldEffectObjectPicTable_Ash - .4byte gDummySpriteAffineAnimTable - .4byte sub_8155460 - - .align 2 -gFieldEffectObjectPicTable_SurfBlob:: @ 850CB7C - obj_tiles gFieldEffectObjectPic_SurfBlob_0, 0x200 - obj_tiles gFieldEffectObjectPic_SurfBlob_1, 0x200 - obj_tiles gFieldEffectObjectPic_SurfBlob_2, 0x200 - - .align 2 -gFieldEffectObjectImageAnim_850CB94:: @ 850CB94 - obj_image_anim_frame 0, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldEffectObjectImageAnim_850CB9C:: @ 850CB9C - obj_image_anim_frame 1, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldEffectObjectImageAnim_850CBA4:: @ 850CBA4 - obj_image_anim_frame 2, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldEffectObjectImageAnim_850CBAC:: @ 850CBAC - obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldEffectObjectImageAnimTable_SurfBlob:: @ 850CBB4 - .4byte gFieldEffectObjectImageAnim_850CB94 - .4byte gFieldEffectObjectImageAnim_850CB9C - .4byte gFieldEffectObjectImageAnim_850CBA4 - .4byte gFieldEffectObjectImageAnim_850CBAC - - .align 2 -gFieldEffectObjectTemplate_SurfBlob:: @ 850CBC4 - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldEffectObjectImageAnimTable_SurfBlob - .4byte gFieldEffectObjectPicTable_SurfBlob - .4byte gDummySpriteAffineAnimTable - .4byte sub_8155658 - - .align 2 -gFieldEffectObjectPicTable_Arrow:: @ 850CBDC - obj_tiles gFieldEffectObjectPic_Arrow_0, 0x80 - obj_tiles gFieldEffectObjectPic_Arrow_1, 0x80 - obj_tiles gFieldEffectObjectPic_Arrow_2, 0x80 - obj_tiles gFieldEffectObjectPic_Arrow_3, 0x80 - obj_tiles gFieldEffectObjectPic_Arrow_4, 0x80 - obj_tiles gFieldEffectObjectPic_Arrow_5, 0x80 - obj_tiles gFieldEffectObjectPic_Arrow_6, 0x80 - obj_tiles gFieldEffectObjectPic_Arrow_7, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850CC1C:: @ 850CC1C - obj_image_anim_frame 3, 32 - obj_image_anim_frame 7, 32 - obj_image_anim_jump 0 - - .align 2 -gFieldEffectObjectImageAnim_850CC28:: @ 850CC28 - obj_image_anim_frame 0, 32 - obj_image_anim_frame 4, 32 - obj_image_anim_jump 0 - - .align 2 -gFieldEffectObjectImageAnim_850CC34:: @ 850CC34 - obj_image_anim_frame 1, 32 - obj_image_anim_frame 5, 32 - obj_image_anim_jump 0 - - .align 2 -gFieldEffectObjectImageAnim_850CC40:: @ 850CC40 - obj_image_anim_frame 2, 32 - obj_image_anim_frame 6, 32 - obj_image_anim_jump 0 - - .align 2 -gFieldEffectObjectImageAnimTable_Arrow:: @ 850CC4C - .4byte gFieldEffectObjectImageAnim_850CC1C - .4byte gFieldEffectObjectImageAnim_850CC28 - .4byte gFieldEffectObjectImageAnim_850CC34 - .4byte gFieldEffectObjectImageAnim_850CC40 - - .align 2 -gFieldEffectObjectTemplate_Arrow:: @ 850CC5C - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Arrow - .4byte gFieldEffectObjectPicTable_Arrow - .4byte gDummySpriteAffineAnimTable - .4byte SpriteCallbackDummy - - .align 2 -gFieldEffectObjectPicTable_GroundImpactDust:: @ 850CC74 - obj_tiles gFieldEffectObjectPic_GroundImpactDust_0, 0x40 - obj_tiles gFieldEffectObjectPic_GroundImpactDust_1, 0x40 - obj_tiles gFieldEffectObjectPic_GroundImpactDust_2, 0x40 - - .align 2 -gFieldEffectObjectImageAnim_850CC8C:: @ 850CC8C - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_GroundImpactDust:: @ 850CC9C - .4byte gFieldEffectObjectImageAnim_850CC8C - - .align 2 -gFieldEffectObjectTemplate_GroundImpactDust:: @ 850CCA0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x8 - .4byte gFieldEffectObjectImageAnimTable_GroundImpactDust - .4byte gFieldEffectObjectPicTable_GroundImpactDust - .4byte gDummySpriteAffineAnimTable - .4byte sub_8156194 - - .align 2 -gFieldEffectObjectPicTable_BikeHopTallGrass:: @ 850CCB8 - obj_tiles gFieldEffectObjectPic_BikeHopTallGrass_0, 0x40 - obj_tiles gFieldEffectObjectPic_BikeHopTallGrass_1, 0x40 - obj_tiles gFieldEffectObjectPic_BikeHopTallGrass_2, 0x40 - obj_tiles gFieldEffectObjectPic_BikeHopTallGrass_3, 0x40 - - .align 2 -gFieldEffectObjectImageAnim_850CCD8:: @ 850CCD8 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_BikeHopTallGrass:: @ 850CCEC - .4byte gFieldEffectObjectImageAnim_850CCD8 - - .align 2 -gFieldEffectObjectTemplate_BikeHopTallGrass:: @ 850CCF0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x8 - .4byte gFieldEffectObjectImageAnimTable_BikeHopTallGrass - .4byte gFieldEffectObjectPicTable_BikeHopTallGrass - .4byte gDummySpriteAffineAnimTable - .4byte sub_8156194 - - .align 2 -gFieldEffectObjectPicTable_SandFootprints:: @ 850CD08 - obj_tiles gFieldEffectObjectPic_SandFootprints_0, 0x80 - obj_tiles gFieldEffectObjectPic_SandFootprints_1, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850CD18:: @ 850CD18 - obj_image_anim_frame 0, 1, OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CD20:: @ 850CD20 - obj_image_anim_frame 0, 1 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CD28:: @ 850CD28 - obj_image_anim_frame 1, 1 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CD30:: @ 850CD30 - obj_image_anim_frame 1, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_SandFootprints:: @ 850CD38 - .4byte gFieldEffectObjectImageAnim_850CD18 - .4byte gFieldEffectObjectImageAnim_850CD18 - .4byte gFieldEffectObjectImageAnim_850CD20 - .4byte gFieldEffectObjectImageAnim_850CD28 - .4byte gFieldEffectObjectImageAnim_850CD30 - - .align 2 -gFieldEffectObjectTemplate_SandFootprints:: @ 850CD4C - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_SandFootprints - .4byte gFieldEffectObjectPicTable_SandFootprints - .4byte gDummySpriteAffineAnimTable - .4byte sub_8154C60 - - .align 2 -gFieldEffectObjectPicTable_DeepSandFootprints:: @ 850CD64 - obj_tiles gFieldEffectObjectPic_DeepSandFootprints_0, 0x80 - obj_tiles gFieldEffectObjectPic_DeepSandFootprints_1, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850CD74:: @ 850CD74 - obj_image_anim_frame 0, 1, OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CD7C:: @ 850CD7C - obj_image_anim_frame 0, 1 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CD84:: @ 850CD84 - obj_image_anim_frame 1, 1 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CD8C:: @ 850CD8C - obj_image_anim_frame 1, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_DeepSandFootprints:: @ 850CD94 - .4byte gFieldEffectObjectImageAnim_850CD74 - .4byte gFieldEffectObjectImageAnim_850CD74 - .4byte gFieldEffectObjectImageAnim_850CD7C - .4byte gFieldEffectObjectImageAnim_850CD84 - .4byte gFieldEffectObjectImageAnim_850CD8C - - .align 2 -gFieldEffectObjectTemplate_DeepSandFootprints:: @ 850CDA8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_DeepSandFootprints - .4byte gFieldEffectObjectPicTable_DeepSandFootprints - .4byte gDummySpriteAffineAnimTable - .4byte sub_8154C60 - - .align 2 -gFieldEffectObjectPicTable_BikeTireTracks:: @ 850CDC0 - obj_tiles gFieldEffectObjectPic_BikeTireTracks_0, 0x80 - obj_tiles gFieldEffectObjectPic_BikeTireTracks_1, 0x80 - obj_tiles gFieldEffectObjectPic_BikeTireTracks_2, 0x80 - obj_tiles gFieldEffectObjectPic_BikeTireTracks_3, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850CDE0:: @ 850CDE0 - obj_image_anim_frame 2, 1 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CDE8:: @ 850CDE8 - obj_image_anim_frame 2, 1 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CDF0:: @ 850CDF0 - obj_image_anim_frame 1, 1 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CDF8:: @ 850CDF8 - obj_image_anim_frame 1, 1 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CE00:: @ 850CE00 - obj_image_anim_frame 0, 1 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CE08:: @ 850CE08 - obj_image_anim_frame 0, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CE10:: @ 850CE10 - obj_image_anim_frame 3, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CE18:: @ 850CE18 - obj_image_anim_frame 3, 1 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_BikeTireTracks:: @ 850CE20 - .4byte gFieldEffectObjectImageAnim_850CDE0 - .4byte gFieldEffectObjectImageAnim_850CDE0 - .4byte gFieldEffectObjectImageAnim_850CDE8 - .4byte gFieldEffectObjectImageAnim_850CDF0 - .4byte gFieldEffectObjectImageAnim_850CDF8 - .4byte gFieldEffectObjectImageAnim_850CE00 - .4byte gFieldEffectObjectImageAnim_850CE08 - .4byte gFieldEffectObjectImageAnim_850CE10 - .4byte gFieldEffectObjectImageAnim_850CE18 - - .align 2 -gFieldEffectObjectTemplate_BikeTireTracks:: @ 850CE44 - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_BikeTireTracks - .4byte gFieldEffectObjectPicTable_BikeTireTracks - .4byte gDummySpriteAffineAnimTable - .4byte sub_8154C60 - - .align 2 -gFieldEffectObjectPicTable_BikeHopBigSplash:: @ 850CE5C - obj_tiles gFieldEffectObjectPic_BikeHopBigSplash_0, 0x80 - obj_tiles gFieldEffectObjectPic_BikeHopBigSplash_1, 0x80 - obj_tiles gFieldEffectObjectPic_BikeHopBigSplash_2, 0x80 - obj_tiles gFieldEffectObjectPic_BikeHopBigSplash_3, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850CE7C:: @ 850CE7C - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_BikeHopBigSplash:: @ 850CE90 - .4byte gFieldEffectObjectImageAnim_850CE7C - - .align 2 -gFieldEffectObjectTemplate_BikeHopBigSplash:: @ 850CE94 - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_BikeHopBigSplash - .4byte gFieldEffectObjectPicTable_BikeHopBigSplash - .4byte gDummySpriteAffineAnimTable - .4byte sub_8156194 - - .align 2 -gFieldEffectObjectPicTable_Splash:: @ 850CEAC - obj_tiles gFieldEffectObjectPic_Splash_0, 0x40 - obj_tiles gFieldEffectObjectPic_Splash_1, 0x40 - - .align 2 -gFieldEffectObjectImageAnim_850CEBC:: @ 850CEBC - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CEC8:: @ 850CEC8 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 0, 6 - obj_image_anim_frame 1, 6 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 0, 6 - obj_image_anim_frame 1, 6 - obj_image_anim_jump 0 - - .align 2 -gFieldEffectObjectImageAnimTable_Splash:: @ 850CEEC - .4byte gFieldEffectObjectImageAnim_850CEBC - .4byte gFieldEffectObjectImageAnim_850CEC8 - - .align 2 -gFieldEffectObjectTemplate_Splash:: @ 850CEF4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x8 - .4byte gFieldEffectObjectImageAnimTable_Splash - .4byte gFieldEffectObjectPicTable_Splash - .4byte gDummySpriteAffineAnimTable - .4byte sub_8154D90 - - .align 2 -gFieldEffectObjectPicTable_BikeHopSmallSplash:: @ 850CF0C - obj_tiles gFieldEffectObjectPic_BikeHopSmallSplash_0, 0x40 - obj_tiles gFieldEffectObjectPic_BikeHopSmallSplash_1, 0x40 - obj_tiles gFieldEffectObjectPic_BikeHopSmallSplash_2, 0x40 - - .align 2 -gFieldEffectObjectImageAnim_850CF24:: @ 850CF24 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_BikeHopSmallSplash:: @ 850CF34 - .4byte gFieldEffectObjectImageAnim_850CF24 - - .align 2 -gFieldEffectObjectTemplate_BikeHopSmallSplash:: @ 850CF38 - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x8 - .4byte gFieldEffectObjectImageAnimTable_BikeHopSmallSplash - .4byte gFieldEffectObjectPicTable_BikeHopSmallSplash - .4byte gDummySpriteAffineAnimTable - .4byte sub_8156194 - - .align 2 -gFieldEffectObjectPicTable_LongGrass:: @ 850CF50 - obj_tiles gFieldEffectObjectPic_LongGrass_0, 0x80 - obj_tiles gFieldEffectObjectPic_LongGrass_1, 0x80 - obj_tiles gFieldEffectObjectPic_LongGrass_2, 0x80 - obj_tiles gFieldEffectObjectPic_LongGrass_3, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850CF70:: @ 850CF70 - obj_image_anim_frame 1, 3 - obj_image_anim_frame 2, 3 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_LongGrass:: @ 850CF90 - .4byte gFieldEffectObjectImageAnim_850CF70 - - .align 2 -gFieldEffectObjectTemplate_LongGrass:: @ 850CF94 - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_LongGrass - .4byte gFieldEffectObjectPicTable_LongGrass - .4byte gDummySpriteAffineAnimTable - .4byte unc_grass_tall - - .align 2 -gFieldEffectObjectPicTable_Unknown16:: @ 850CFAC - obj_tiles gFieldEffectObjectPic_Unknown16_0, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown16_1, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown16_2, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown16_3, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown16_4, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown16_5, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850CFDC:: @ 850CFDC - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_frame 5, 8 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_Unknown16:: @ 850CFF8 - .4byte gFieldEffectObjectImageAnim_850CFDC - - .align 2 -gFieldEffectObjectTemplate_Unknown16:: @ 850CFFC - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Unknown16 - .4byte gFieldEffectObjectPicTable_Unknown16 - .4byte gDummySpriteAffineAnimTable - .4byte sub_8156194 - - .align 2 -gFieldEffectObjectPicTable_Unknown17:: @ 850D014 - obj_tiles gFieldEffectObjectPic_Unknown16_5, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown17_0, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown17_1, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown17_2, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown17_3, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown17_4, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown17_5, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown17_6, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown17_7, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850D05C:: @ 850D05C - obj_image_anim_frame 0, 10 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 4, 4 - obj_image_anim_frame 5, 4 - obj_image_anim_frame 6, 4 - obj_image_anim_frame 7, 4 - obj_image_anim_frame 8, 4 - obj_image_anim_jump 7 - - .align 2 -gFieldEffectObjectImageAnimTable_Unknown17:: @ 850D084 - .4byte gFieldEffectObjectImageAnim_850D05C - - .align 2 -gFieldEffectObjectTemplate_Unknown17:: @ 850D088 - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Unknown17 - .4byte gFieldEffectObjectPicTable_Unknown17 - .4byte gDummySpriteAffineAnimTable - .4byte sub_81561D0 - - .align 2 -gFieldEffectObjectPicTable_Unknown18:: @ 850D0A0 - obj_tiles gFieldEffectObjectPic_Unknown18_0, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown18_1, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown18_2, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown18_3, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850D0C0:: @ 850D0C0 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_jump 0 - - .align 2 -gFieldEffectObjectImageAnimTable_Unknown18:: @ 850D0DC - .4byte gFieldEffectObjectImageAnim_850D0C0 - - .align 2 -gFieldEffectObjectTemplate_Unknown18:: @ 850D0E0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Unknown18 - .4byte gFieldEffectObjectPicTable_Unknown18 - .4byte gDummySpriteAffineAnimTable - .4byte sub_81561D0 - - .align 2 -gFieldEffectObjectPicTable_Unknown19:: @ 850D0F8 - obj_tiles gFieldEffectObjectPic_Unknown19_0, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown19_1, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown19_2, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown19_3, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850D118:: @ 850D118 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_jump 0 - - .align 2 -gFieldEffectObjectImageAnimTable_Unknown19:: @ 850D12C - .4byte gFieldEffectObjectImageAnim_850D118 - - .align 2 -gFieldEffectObjectTemplate_Unknown19:: @ 850D130 - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Unknown19 - .4byte gFieldEffectObjectPicTable_Unknown19 - .4byte gDummySpriteAffineAnimTable - .4byte sub_81561D0 - - .align 2 -gFieldEffectObjectPicTable_Unknown29:: @ 850D148 - obj_tiles gFieldEffectObjectPic_Unknown29_0, 0x40 - obj_tiles gFieldEffectObjectPic_Unknown29_1, 0x40 - obj_tiles gFieldEffectObjectPic_Unknown29_2, 0x40 - - .align 2 -gFieldEffectObjectImageAnim_850D160:: @ 850D160 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_Unknown29:: @ 850D170 - .4byte gFieldEffectObjectImageAnim_850D160 - - .align 2 -gFieldEffectObjectTemplate_Unknown29:: @ 850D174 - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x8 - .4byte gFieldEffectObjectImageAnimTable_Unknown29 - .4byte gFieldEffectObjectPicTable_Unknown29 - .4byte gDummySpriteAffineAnimTable - .4byte sub_81559BC - - .align 2 -gFieldEffectObjectPicTable_Unknown20:: @ 850D18C - obj_tiles gFieldEffectObjectPic_Unknown20_0, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown20_1, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown20_2, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown20_3, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850D1AC:: @ 850D1AC - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_jump 0 - - .align 2 -gFieldEffectObjectImageAnimTable_Unknown20:: @ 850D1C8 - .4byte gFieldEffectObjectImageAnim_850D1AC - - .align 2 -gFieldEffectObjectTemplate_Unknown20:: @ 850D1CC - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Unknown20 - .4byte gFieldEffectObjectPicTable_Unknown20 - .4byte gDummySpriteAffineAnimTable - .4byte sub_81561D0 - - .align 2 -gFieldEffectObjectRotScalAnim_850D1E4:: @ 850D1E4 - obj_rot_scal_anim_frame 0xFF00, 0x100, -128, 0 - obj_rot_scal_anim_frame 0x1, 0x0, 0, 4 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 8 - obj_rot_scal_anim_frame 0xFFFF, 0x0, 0, 4 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 8 - obj_rot_scal_anim_frame 0xFFFF, 0x0, 0, 4 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 8 - obj_rot_scal_anim_frame 0x1, 0x0, 0, 4 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 8 - obj_rot_scal_anim_jump 1 - - .align 2 -gFieldEffectObjectRotScalAnim_850D234:: @ 850D234 - obj_rot_scal_anim_frame 0x100, 0x100, -128, 0 - obj_rot_scal_anim_frame 0xFFFF, 0x0, 0, 4 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 8 - obj_rot_scal_anim_frame 0x1, 0x0, 0, 4 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 8 - obj_rot_scal_anim_frame 0x1, 0x0, 0, 4 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 8 - obj_rot_scal_anim_frame 0xFFFF, 0x0, 0, 4 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 8 - obj_rot_scal_anim_jump 1 - - .align 2 -gFieldEffectObjectRotScalAnimTable_Unknown21:: @ 850D284 - .4byte gFieldEffectObjectRotScalAnim_850D1E4 - .4byte gFieldEffectObjectRotScalAnim_850D234 - - .align 2 -gFieldEffectObjectTemplate_Unknown21:: @ 850D28C - .2byte 0x0 @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gDummyOamData - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gFieldEffectObjectRotScalAnimTable_Unknown21 - .4byte SpriteCallbackDummy - - .align 2 -gFieldEffectObjectPicTable_BerryTreeGrowthSparkle:: @ 850D2A4 - obj_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_0, 0x80 - obj_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_1, 0x80 - obj_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_2, 0x80 - obj_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_3, 0x80 - obj_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_4, 0x80 - obj_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_5, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850D2D4:: @ 850D2D4 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_frame 5, 8 - obj_image_anim_loop 0 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 4, 4 - obj_image_anim_frame 5, 4 - obj_image_anim_loop 3 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_frame 5, 8 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle:: @ 850D328 - .4byte gFieldEffectObjectImageAnim_850D2D4 - - .align 2 -gFieldEffectObjectTemplate_BerryTreeGrowthSparkle:: @ 850D32C - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle - .4byte gFieldEffectObjectPicTable_BerryTreeGrowthSparkle - .4byte gDummySpriteAffineAnimTable - .4byte sub_81561D0 - - .align 2 -gFieldEffectObjectPicTable_TreeDisguise:: @ 850D344 - obj_tiles gFieldEffectObjectPic_TreeDisguise_0, 0x100 - obj_tiles gFieldEffectObjectPic_TreeDisguise_1, 0x100 - obj_tiles gFieldEffectObjectPic_TreeDisguise_2, 0x100 - obj_tiles gFieldEffectObjectPic_TreeDisguise_3, 0x100 - obj_tiles gFieldEffectObjectPic_TreeDisguise_4, 0x100 - obj_tiles gFieldEffectObjectPic_TreeDisguise_5, 0x100 - obj_tiles gFieldEffectObjectPic_TreeDisguise_6, 0x100 - - .align 2 -gFieldEffectObjectImageAnim_850D37C:: @ 850D37C - obj_image_anim_frame 0, 16 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850D384:: @ 850D384 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 4, 4 - obj_image_anim_frame 5, 4 - obj_image_anim_frame 6, 4 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_TreeDisguise:: @ 850D3A4 - .4byte gFieldEffectObjectImageAnim_850D37C - .4byte gFieldEffectObjectImageAnim_850D384 - - .align 2 -gFieldEffectObjectTemplate_TreeDisguise:: @ 850D3AC - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldEffectObjectImageAnimTable_TreeDisguise - .4byte gFieldEffectObjectPicTable_TreeDisguise - .4byte gDummySpriteAffineAnimTable - .4byte sub_8155C88 - - .align 2 -gFieldEffectObjectPicTable_MountainDisguise:: @ 850D3C4 - obj_tiles gFieldEffectObjectPic_MountainDisguise_0, 0x100 - obj_tiles gFieldEffectObjectPic_MountainDisguise_1, 0x100 - obj_tiles gFieldEffectObjectPic_MountainDisguise_2, 0x100 - obj_tiles gFieldEffectObjectPic_MountainDisguise_3, 0x100 - obj_tiles gFieldEffectObjectPic_MountainDisguise_4, 0x100 - obj_tiles gFieldEffectObjectPic_MountainDisguise_5, 0x100 - obj_tiles gFieldEffectObjectPic_MountainDisguise_6, 0x100 - - .align 2 -gFieldEffectObjectImageAnim_850D3FC:: @ 850D3FC - obj_image_anim_frame 0, 16 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850D404:: @ 850D404 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 4, 4 - obj_image_anim_frame 5, 4 - obj_image_anim_frame 6, 4 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_MountainDisguise:: @ 850D424 - .4byte gFieldEffectObjectImageAnim_850D3FC - .4byte gFieldEffectObjectImageAnim_850D404 - - .align 2 -gFieldEffectObjectTemplate_MountainDisguise:: @ 850D42C - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldEffectObjectImageAnimTable_MountainDisguise - .4byte gFieldEffectObjectPicTable_MountainDisguise - .4byte gDummySpriteAffineAnimTable - .4byte sub_8155C88 - - .align 2 -gFieldEffectObjectPicTable_SandDisguisePlaceholder:: @ 850D444 - obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_0, 0x100 - obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_1, 0x100 - obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_2, 0x100 - obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_3, 0x100 - obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_4, 0x100 - obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_5, 0x100 - obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_6, 0x100 - - .align 2 -gFieldEffectObjectTemplate_SandDisguisePlaceholder:: @ 850D47C - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldEffectObjectImageAnimTable_TreeDisguise - .4byte gFieldEffectObjectPicTable_SandDisguisePlaceholder - .4byte gDummySpriteAffineAnimTable - .4byte sub_8155C88 - - .align 2 -gFieldEffectObjectPicTable_Bird:: @ 850D494 - obj_tiles gFieldEffectObjectPic_Bird, 0x200 - - .align 2 -gFieldEffectObjectImageAnim_850D49C:: @ 850D49C - obj_image_anim_frame 0, 1 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_Bird:: @ 850D4A4 - .4byte gFieldEffectObjectImageAnim_850D49C - - .align 2 -gFieldEffectObjectTemplate_Bird:: @ 850D4A8 - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldEffectObjectImageAnimTable_Bird - .4byte gFieldEffectObjectPicTable_Bird - .4byte gDummySpriteAffineAnimTable - .4byte SpriteCallbackDummy - - .align 2 -gFieldEffectObjectPicTable_ShortGrass:: @ 850D4C0 - obj_tiles gFieldEffectObjectPic_ShortGrass_0, 0x80 - obj_tiles gFieldEffectObjectPic_ShortGrass_1, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850D4D0:: @ 850D4D0 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_ShortGrass:: @ 850D4DC - .4byte gFieldEffectObjectImageAnim_850D4D0 - - .align 2 -gFieldEffectObjectTemplate_ShortGrass:: @ 850D4E0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_ShortGrass - .4byte gFieldEffectObjectPicTable_ShortGrass - .4byte gDummySpriteAffineAnimTable - .4byte sub_8154A10 - - .align 2 -gFieldEffectObjectPicTable_HotSpringsWater:: @ 850D4F8 - obj_tiles gFieldEffectObjectPic_HotSpringsWater, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850D500:: @ 850D500 - obj_image_anim_frame 0, 4 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_HotSpringsWater:: @ 850D508 - .4byte gFieldEffectObjectImageAnim_850D500 - - .align 2 -gFieldEffectObjectTemplate_HotSpringsWater:: @ 850D50C - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_HotSpringsWater - .4byte gFieldEffectObjectPicTable_HotSpringsWater - .4byte gDummySpriteAffineAnimTable - .4byte sub_8155158 - - .align 2 -gFieldEffectObjectPicTable_JumpOutOfAsh:: @ 850D524 - obj_tiles gFieldEffectObjectPic_JumpOutOfAsh_0, 0x80 - obj_tiles gFieldEffectObjectPic_JumpOutOfAsh_1, 0x80 - obj_tiles gFieldEffectObjectPic_JumpOutOfAsh_2, 0x80 - obj_tiles gFieldEffectObjectPic_JumpOutOfAsh_3, 0x80 - obj_tiles gFieldEffectObjectPic_JumpOutOfAsh_4, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850D54C:: @ 850D54C - obj_image_anim_frame 0, 6 - obj_image_anim_frame 1, 6 - obj_image_anim_frame 2, 6 - obj_image_anim_frame 3, 6 - obj_image_anim_frame 4, 6 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_JumpOutOfAsh:: @ 850D564 - .4byte gFieldEffectObjectImageAnim_850D54C - - .align 2 -gFieldEffectObjectTemplate_JumpOutOfAsh:: @ 850D568 - .2byte 0xFFFF @ tiles tag - .2byte 0x100D @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_JumpOutOfAsh - .4byte gFieldEffectObjectPicTable_JumpOutOfAsh - .4byte gDummySpriteAffineAnimTable - .4byte sub_80B7CAC - - .align 2 -gFieldEffectObjectPaletteInfo2:: @ 850D580 - obj_pal gFieldEffectObjectPalette2, 0x100D - - .align 2 -gFieldEffectObjectPicTable_Unknown33:: @ 850D588 - obj_tiles gFieldEffectObjectPic_Unknown33_0, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown33_1, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown33_2, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown33_3, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown33_4, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850D5B0:: @ 850D5B0 - obj_image_anim_frame 0, 6 - obj_image_anim_frame 1, 6 - obj_image_anim_frame 2, 6 - obj_image_anim_frame 3, 6 - obj_image_anim_frame 4, 6 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_Unknown33:: @ 850D5C8 - .4byte gFieldEffectObjectImageAnim_850D5B0 - - .align 2 -gFieldEffectObjectTemplate_Unknown33:: @ 850D5CC - .2byte 0xFFFF @ tiles tag - .2byte 0x100D @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Unknown33 - .4byte gFieldEffectObjectPicTable_Unknown33 - .4byte gDummySpriteAffineAnimTable - .4byte sub_80B7A58 - - .align 2 -gFieldEffectObjectPicTable_Bubbles:: @ 850D5E4 - obj_tiles gFieldEffectObjectPic_Bubbles_0, 0x100 - obj_tiles gFieldEffectObjectPic_Bubbles_1, 0x100 - obj_tiles gFieldEffectObjectPic_Bubbles_2, 0x100 - obj_tiles gFieldEffectObjectPic_Bubbles_3, 0x100 - obj_tiles gFieldEffectObjectPic_Bubbles_4, 0x100 - obj_tiles gFieldEffectObjectPic_Bubbles_5, 0x100 - obj_tiles gFieldEffectObjectPic_Bubbles_6, 0x100 - obj_tiles gFieldEffectObjectPic_Bubbles_7, 0x100 - - .align 2 -gFieldEffectObjectImageAnim_850D624:: @ 850D624 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 6 - obj_image_anim_frame 4, 6 - obj_image_anim_frame 5, 4 - obj_image_anim_frame 6, 4 - obj_image_anim_frame 7, 4 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_Bubbles:: @ 850D648 - .4byte gFieldEffectObjectImageAnim_850D624 - - .align 2 -gFieldEffectObjectTemplate_Bubbles:: @ 850D64C - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldEffectObjectImageAnimTable_Bubbles - .4byte gFieldEffectObjectPicTable_Bubbles - .4byte gDummySpriteAffineAnimTable - .4byte sub_8155AEC - - .align 2 -gFieldEffectObjectPicTable_Unknown35:: @ 850D664 - obj_tiles gFieldEffectObjectPic_Unknown35_0, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown35_1, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850D674:: @ 850D674 - obj_image_anim_frame 0, 3 - obj_image_anim_frame 1, 5 - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_Unknown35:: @ 850D684 - .4byte gFieldEffectObjectImageAnim_850D674 - - .align 2 -gFieldEffectObjectTemplate_Unknown35:: @ 850D688 - .2byte 0xFFFF @ tiles tag - .2byte 0x100F @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Unknown35 - .4byte gFieldEffectObjectPicTable_Unknown35 - .4byte gDummySpriteAffineAnimTable - .4byte sub_8155E50 - - .align 2 -gFieldEffectObjectPaletteInfo3:: @ 850D6A0 - obj_pal gFieldEffectObjectPalette3, 0x100F - - .align 2 -gFieldEffectObjectImageAnim_850D6A8:: @ 850D6A8 - obj_image_anim_frame 0, 1 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_Rayquaza:: @ 850D6B0 - .4byte gFieldEffectObjectImageAnim_850D6A8 - - .align 2 -gFieldEffectObjectPicTable_Rayquaza:: @ 850D6B4 - obj_tiles gFieldObjectPic_Rayquaza_0, 0x200 - - .align 2 -gFieldEffectObjectTemplate_Rayquaza:: @ 850D6BC - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldEffectObjectImageAnimTable_Rayquaza - .4byte gFieldEffectObjectPicTable_Rayquaza - .4byte gDummySpriteAffineAnimTable - .4byte sub_8155F80 diff --git a/data/graphics/field_objects/field_object_anims.inc b/data/graphics/field_objects/field_object_anims.inc deleted file mode 100644 index d75df6d9da..0000000000 --- a/data/graphics/field_objects/field_object_anims.inc +++ /dev/null @@ -1,1029 +0,0 @@ - .align 2 -gFieldObjectImageAnim_StayStill:: @ 85089FC - obj_image_anim_frame 0, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpFaceSouth:: @ 8508A10 - obj_image_anim_frame 0, 16 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpFaceNorth:: @ 8508A18 - obj_image_anim_frame 1, 16 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpFaceWest:: @ 8508A20 - obj_image_anim_frame 2, 16 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpFaceEast:: @ 8508A28 - obj_image_anim_frame 2, 16, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoSouth:: @ 8508A30 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 3, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0, 8 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoNorth:: @ 8508A44 - obj_image_anim_frame 4, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 4, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 1, 8 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoWest:: @ 8508A58 - obj_image_anim_frame 5, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 6, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoEast:: @ 8508A6C - obj_image_anim_frame 5, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 6, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoFastSouth:: @ 8508A80 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 3, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0, 4 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoFastNorth:: @ 8508A94 - obj_image_anim_frame 4, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 1, 4 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoFastWest:: @ 8508AA8 - obj_image_anim_frame 5, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 6, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoFastEast:: @ 8508ABC - obj_image_anim_frame 5, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 6, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoFasterSouth:: @ 8508AD0 - obj_image_anim_frame 3, 2 - obj_image_anim_frame 0, 2 - obj_image_anim_frame 3, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0, 2 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoFasterNorth:: @ 8508AE4 - obj_image_anim_frame 4, 2 - obj_image_anim_frame 1, 2 - obj_image_anim_frame 4, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 1, 2 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoFasterWest:: @ 8508AF8 - obj_image_anim_frame 5, 2 - obj_image_anim_frame 2, 2 - obj_image_anim_frame 6, 2 - obj_image_anim_frame 2, 2 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoFasterEast:: @ 8508B0C - obj_image_anim_frame 5, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 6, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoFastestSouth:: @ 8508B20 - obj_image_anim_frame 3, 1 - obj_image_anim_frame 0, 1 - obj_image_anim_frame 3, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoFastestNorth:: @ 8508B34 - obj_image_anim_frame 4, 1 - obj_image_anim_frame 1, 1 - obj_image_anim_frame 4, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 1, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoFastestWest:: @ 8508B48 - obj_image_anim_frame 5, 1 - obj_image_anim_frame 2, 1 - obj_image_anim_frame 6, 1 - obj_image_anim_frame 2, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoFastestEast:: @ 8508B5C - obj_image_anim_frame 5, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 6, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_FaceSouth:: @ 8508B70 - obj_image_anim_frame 0, 16 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_FaceNorth:: @ 8508B78 - obj_image_anim_frame 1, 16 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_FaceWest:: @ 8508B80 - obj_image_anim_frame 2, 16 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_FaceEast:: @ 8508B88 - obj_image_anim_frame 2, 16, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoSouth:: @ 8508B90 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoNorth:: @ 8508BA4 - obj_image_anim_frame 5, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 6, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoWest:: @ 8508BB8 - obj_image_anim_frame 7, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 8, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoEast:: @ 8508BCC - obj_image_anim_frame 7, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 8, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoFastSouth:: @ 8508BE0 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 4, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoFastNorth:: @ 8508BF4 - obj_image_anim_frame 5, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 6, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoFastWest:: @ 8508C08 - obj_image_anim_frame 7, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 8, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoFastEast:: @ 8508C1C - obj_image_anim_frame 7, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoFasterSouth:: @ 8508C30 - obj_image_anim_frame 3, 2 - obj_image_anim_frame 0, 2 - obj_image_anim_frame 4, 2 - obj_image_anim_frame 0, 2 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoFasterNorth:: @ 8508C44 - obj_image_anim_frame 5, 2 - obj_image_anim_frame 1, 2 - obj_image_anim_frame 6, 2 - obj_image_anim_frame 1, 2 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoFasterWest:: @ 8508C58 - obj_image_anim_frame 7, 2 - obj_image_anim_frame 2, 2 - obj_image_anim_frame 8, 2 - obj_image_anim_frame 2, 2 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoFasterEast:: @ 8508C6C - obj_image_anim_frame 7, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 8, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoFastestSouth:: @ 8508C80 - obj_image_anim_frame 3, 1 - obj_image_anim_frame 0, 1 - obj_image_anim_frame 4, 1 - obj_image_anim_frame 0, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoFastestNorth:: @ 8508C94 - obj_image_anim_frame 5, 1 - obj_image_anim_frame 1, 1 - obj_image_anim_frame 6, 1 - obj_image_anim_frame 1, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoFastestWest:: @ 8508CA8 - obj_image_anim_frame 7, 1 - obj_image_anim_frame 2, 1 - obj_image_anim_frame 8, 1 - obj_image_anim_frame 2, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoFastestEast:: @ 8508CBC - obj_image_anim_frame 7, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 8, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_RunSouth:: @ 8508CD0 - obj_image_anim_frame 12, 5 - obj_image_anim_frame 9, 3 - obj_image_anim_frame 13, 5 - obj_image_anim_frame 9, 3 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_RunNorth:: @ 8508CE4 - obj_image_anim_frame 14, 5 - obj_image_anim_frame 10, 3 - obj_image_anim_frame 15, 5 - obj_image_anim_frame 10, 3 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_RunWest:: @ 8508CF8 - obj_image_anim_frame 16, 5 - obj_image_anim_frame 11, 3 - obj_image_anim_frame 17, 5 - obj_image_anim_frame 11, 3 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_RunEast:: @ 8508D0C - obj_image_anim_frame 16, 5, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 11, 3, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 17, 5, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 11, 3, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_FieldMove:: @ 8508D20 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 4, 8 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_GetOnOffSurfBlobSouth:: @ 8508D38 - obj_image_anim_frame 9, 32 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GetOnOffSurfBlobNorth:: @ 8508D40 - obj_image_anim_frame 10, 32 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GetOnOffSurfBlobWest:: @ 8508D48 - obj_image_anim_frame 11, 32 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GetOnOffSurfBlobEast:: @ 8508D50 - obj_image_anim_frame 11, 32, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_BunnyHoppyBackWheelSouth:: @ 8508D58 - obj_image_anim_frame 9, 4 - obj_image_anim_frame 10, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_BunnyHoppyBackWheelNorth:: @ 8508D64 - obj_image_anim_frame 13, 4 - obj_image_anim_frame 14, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_BunnyHoppyBackWheelWest:: @ 8508D70 - obj_image_anim_frame 17, 4 - obj_image_anim_frame 18, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_BunnyHoppyBackWheelEast:: @ 8508D7C - obj_image_anim_frame 17, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 18, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_BunnyHoppyFrontWheelSouth:: @ 8508D88 - obj_image_anim_frame 11, 4 - obj_image_anim_frame 12, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_BunnyHoppyFrontWheelNorth:: @ 8508D94 - obj_image_anim_frame 15, 4 - obj_image_anim_frame 16, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_BunnyHoppyFrontWheelWest:: @ 8508DA0 - obj_image_anim_frame 19, 4 - obj_image_anim_frame 20, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_BunnyHoppyFrontWheelEast:: @ 8508DAC - obj_image_anim_frame 19, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 20, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_StandingWheelieBackWheelSouth:: @ 8508DB8 - obj_image_anim_frame 9, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_StandingWheelieBackWheelNorth:: @ 8508DC4 - obj_image_anim_frame 13, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_StandingWheelieBackWheelWest:: @ 8508DD0 - obj_image_anim_frame 17, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_StandingWheelieBackWheelEast:: @ 8508DDC - obj_image_anim_frame 17, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_StandingWheelieFrontWheelSouth:: @ 8508DE8 - obj_image_anim_frame 11, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_StandingWheelieFrontWheelNorth:: @ 8508DF4 - obj_image_anim_frame 15, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_StandingWheelieFrontWheelWest:: @ 8508E00 - obj_image_anim_frame 19, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_StandingWheelieFrontWheelEast:: @ 8508E0C - obj_image_anim_frame 19, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_MovingWheelieSouth:: @ 8508E18 - obj_image_anim_frame 21, 4 - obj_image_anim_frame 10, 4 - obj_image_anim_frame 22, 4 - obj_image_anim_frame 10, 4 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_MovingWheelieNorth:: @ 8508E2C - obj_image_anim_frame 23, 4 - obj_image_anim_frame 14, 4 - obj_image_anim_frame 24, 4 - obj_image_anim_frame 14, 4 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_MovingWheelieWest:: @ 8508E40 - obj_image_anim_frame 25, 4 - obj_image_anim_frame 18, 4 - obj_image_anim_frame 26, 4 - obj_image_anim_frame 18, 4 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_MovingWheelieEast:: @ 8508E54 - obj_image_anim_frame 25, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 18, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 26, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 18, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_BerryTreeStage0:: @ 8508E68 - obj_image_anim_frame 0, 32 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_BerryTreeStage1:: @ 8508E70 - obj_image_anim_frame 1, 32 - obj_image_anim_frame 2, 32 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_BerryTreeStage2:: @ 8508E7C - obj_image_anim_frame 3, 48 - obj_image_anim_frame 4, 48 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_BerryTreeStage3:: @ 8508E88 - obj_image_anim_frame 5, 32 - obj_image_anim_frame 5, 32 - obj_image_anim_frame 6, 32 - obj_image_anim_frame 6, 32 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_BerryTreeStage4:: @ 8508E9C - obj_image_anim_frame 7, 48 - obj_image_anim_frame 7, 48 - obj_image_anim_frame 8, 48 - obj_image_anim_frame 8, 48 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_NurseBow:: @ 8508EB0 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 9, 32 - obj_image_anim_frame 0, 8 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_RockBreak:: @ 8508EC0 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_TreeCut:: @ 8508ED4 - obj_image_anim_frame 0, 6 - obj_image_anim_frame 1, 6 - obj_image_anim_frame 2, 6 - obj_image_anim_frame 3, 6 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_TakeOutRodSouth:: @ 8508EE8 - obj_image_anim_frame 8, 4 - obj_image_anim_frame 9, 4 - obj_image_anim_frame 10, 4 - obj_image_anim_frame 11, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_TakeOutRodNorth:: @ 8508EFC - obj_image_anim_frame 4, 4 - obj_image_anim_frame 5, 4 - obj_image_anim_frame 6, 4 - obj_image_anim_frame 7, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_TakeOutRodWest:: @ 8508F10 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_TakeOutRodEast:: @ 8508F24 - obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 1, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 3, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_PutAwayRodSouth:: @ 8508F38 - obj_image_anim_frame 11, 4 - obj_image_anim_frame 10, 6 - obj_image_anim_frame 9, 6 - obj_image_anim_frame 8, 6 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_PutAwayRodNorth:: @ 8508F4C - obj_image_anim_frame 7, 4 - obj_image_anim_frame 6, 6 - obj_image_anim_frame 5, 6 - obj_image_anim_frame 4, 6 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_PutAwayRodWest:: @ 8508F60 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_PutAwayRodEast:: @ 8508F74 - obj_image_anim_frame 3, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 1, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_HookedPokemonSouth:: @ 8508F88 - obj_image_anim_frame 10, 6 - obj_image_anim_frame 11, 6 - obj_image_anim_loop 1 - obj_image_anim_frame 11, 30 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_HookedPokemonNorth:: @ 8508F9C - obj_image_anim_frame 6, 6 - obj_image_anim_frame 7, 6 - obj_image_anim_loop 1 - obj_image_anim_frame 7, 30 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_HookedPokemonWest:: @ 8508FB0 - obj_image_anim_frame 2, 6 - obj_image_anim_frame 3, 6 - obj_image_anim_loop 1 - obj_image_anim_frame 3, 30 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_HookedPokemonEast:: @ 8508FC4 - obj_image_anim_frame 2, 6, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 3, 6, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_loop 1 - obj_image_anim_frame 3, 30, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectRotScalAnim_8508FD8:: @ 8508FD8 - obj_rot_scal_anim_frame 0x0, 0x0, 1, 1 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 1 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 1 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 1 - obj_rot_scal_anim_loop 7 - obj_rot_scal_anim_jump 0 - - .align 2 -gFieldObjectRotScalAnim_8509008:: @ 8509008 - obj_rot_scal_anim_frame 0x0, 0x0, -1, 1 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 1 - obj_rot_scal_anim_loop 15 - obj_rot_scal_anim_frame 0x0, 0x0, 1, 1 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 1 - obj_rot_scal_anim_loop 15 - obj_rot_scal_anim_jump 0 - - .align 2 -gFieldObjectRotScalAnim_8509040:: @ 8509040 - obj_rot_scal_anim_frame 0x100, 0x100, 10, 0 - obj_rot_scal_anim_end - - .align 2 -gFieldObjectRotScalAnim_8509050:: @ 8509050 - obj_rot_scal_anim_frame 0x100, 0x100, 10, 0 - obj_rot_scal_anim_end - - .align 2 -gFieldObjectRotScalAnim_8509060:: @ 8509060 - obj_rot_scal_anim_frame 0x0, 0x0, -1, 1 - obj_rot_scal_anim_loop 8 - obj_rot_scal_anim_end - - .align 2 -gFieldObjectRotScalAnim_8509078:: @ 8509078 - obj_rot_scal_anim_frame 0x0, 0x0, 1, 1 - obj_rot_scal_anim_loop 8 - obj_rot_scal_anim_end - - .align 2 -gFieldObjectImageAnim_HoOhFlapWings:: @ 8509090 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_HoOhStayStill:: @ 85090A4 - obj_image_anim_frame 3, 16 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnimTable_Inanimate:: @ 85090AC - .4byte gFieldObjectImageAnim_StayStill - - .align 2 -gFieldObjectImageAnimTable_QuintyPlump:: @ 85090B0 - .4byte gFieldObjectImageAnim_QuintyPlumpFaceSouth - .4byte gFieldObjectImageAnim_QuintyPlumpFaceNorth - .4byte gFieldObjectImageAnim_QuintyPlumpFaceWest - .4byte gFieldObjectImageAnim_QuintyPlumpFaceEast - .4byte gFieldObjectImageAnim_QuintyPlumpGoSouth - .4byte gFieldObjectImageAnim_QuintyPlumpGoNorth - .4byte gFieldObjectImageAnim_QuintyPlumpGoWest - .4byte gFieldObjectImageAnim_QuintyPlumpGoEast - .4byte gFieldObjectImageAnim_QuintyPlumpGoFastSouth - .4byte gFieldObjectImageAnim_QuintyPlumpGoFastNorth - .4byte gFieldObjectImageAnim_QuintyPlumpGoFastWest - .4byte gFieldObjectImageAnim_QuintyPlumpGoFastEast - .4byte gFieldObjectImageAnim_QuintyPlumpGoFasterSouth - .4byte gFieldObjectImageAnim_QuintyPlumpGoFasterNorth - .4byte gFieldObjectImageAnim_QuintyPlumpGoFasterWest - .4byte gFieldObjectImageAnim_QuintyPlumpGoFasterEast - .4byte gFieldObjectImageAnim_QuintyPlumpGoFastestSouth - .4byte gFieldObjectImageAnim_QuintyPlumpGoFastestNorth - .4byte gFieldObjectImageAnim_QuintyPlumpGoFastestWest - .4byte gFieldObjectImageAnim_QuintyPlumpGoFastestEast - - .align 2 -gFieldObjectImageAnimTable_Standard:: @ 8509100 - .4byte gFieldObjectImageAnim_FaceSouth - .4byte gFieldObjectImageAnim_FaceNorth - .4byte gFieldObjectImageAnim_FaceWest - .4byte gFieldObjectImageAnim_FaceEast - .4byte gFieldObjectImageAnim_GoSouth - .4byte gFieldObjectImageAnim_GoNorth - .4byte gFieldObjectImageAnim_GoWest - .4byte gFieldObjectImageAnim_GoEast - .4byte gFieldObjectImageAnim_GoFastSouth - .4byte gFieldObjectImageAnim_GoFastNorth - .4byte gFieldObjectImageAnim_GoFastWest - .4byte gFieldObjectImageAnim_GoFastEast - .4byte gFieldObjectImageAnim_GoFasterSouth - .4byte gFieldObjectImageAnim_GoFasterNorth - .4byte gFieldObjectImageAnim_GoFasterWest - .4byte gFieldObjectImageAnim_GoFasterEast - .4byte gFieldObjectImageAnim_GoFastestSouth - .4byte gFieldObjectImageAnim_GoFastestNorth - .4byte gFieldObjectImageAnim_GoFastestWest - .4byte gFieldObjectImageAnim_GoFastestEast - - .align 2 -gFieldObjectImageAnimTable_HoOh:: @ 8509150 - .4byte gFieldObjectImageAnim_FaceSouth - .4byte gFieldObjectImageAnim_FaceNorth - .4byte gFieldObjectImageAnim_FaceWest - .4byte gFieldObjectImageAnim_FaceEast - .4byte gFieldObjectImageAnim_HoOhFlapWings - .4byte gFieldObjectImageAnim_HoOhStayStill - .4byte gFieldObjectImageAnim_GoWest - .4byte gFieldObjectImageAnim_GoEast - .4byte gFieldObjectImageAnim_GoFastSouth - .4byte gFieldObjectImageAnim_GoFastNorth - .4byte gFieldObjectImageAnim_GoFastWest - .4byte gFieldObjectImageAnim_GoFastEast - .4byte gFieldObjectImageAnim_GoFasterSouth - .4byte gFieldObjectImageAnim_GoFasterNorth - .4byte gFieldObjectImageAnim_GoFasterWest - .4byte gFieldObjectImageAnim_GoFasterEast - .4byte gFieldObjectImageAnim_GoFastestSouth - .4byte gFieldObjectImageAnim_GoFastestNorth - .4byte gFieldObjectImageAnim_GoFastestWest - .4byte gFieldObjectImageAnim_GoFastestEast - - .align 2 -gFieldObjectImageAnimTable_Groudon3:: @ 85091A0 - .4byte gFieldObjectImageAnim_FaceSouth - .4byte gFieldObjectImageAnim_FaceNorth - .4byte gFieldObjectImageAnim_FaceWest - .4byte gFieldObjectImageAnim_FaceEast - .4byte gFieldObjectImageAnim_GoSouth - .4byte gFieldObjectImageAnim_GoEast - .4byte gFieldObjectImageAnim_GoWest - .4byte gFieldObjectImageAnim_GoEast - .4byte gFieldObjectImageAnim_GoFastSouth - .4byte gFieldObjectImageAnim_GoFastEast - .4byte gFieldObjectImageAnim_GoFastWest - .4byte gFieldObjectImageAnim_GoFastEast - .4byte gFieldObjectImageAnim_GoFasterSouth - .4byte gFieldObjectImageAnim_GoFasterEast - .4byte gFieldObjectImageAnim_GoFasterWest - .4byte gFieldObjectImageAnim_GoFasterEast - .4byte gFieldObjectImageAnim_GoFastestSouth - .4byte gFieldObjectImageAnim_GoFastestEast - .4byte gFieldObjectImageAnim_GoFastestWest - .4byte gFieldObjectImageAnim_GoFastestEast - - .align 2 -gFieldObjectImageAnim_85091F0:: @ 85091F0 - obj_image_anim_frame 1, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_85091F8:: @ 85091F8 - obj_image_anim_frame 4, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_8509200:: @ 8509200 - obj_image_anim_frame 0, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_8509208:: @ 8509208 - obj_image_anim_frame 2, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_8509210:: @ 8509210 - obj_image_anim_frame 3, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_8509218:: @ 8509218 - obj_image_anim_frame 0, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_8509220:: @ 8509220 - obj_image_anim_frame 0, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_8509228:: @ 8509228 - obj_image_anim_frame 0, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_8509230:: @ 8509230 - obj_image_anim_frame 3, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnimTable_Rayquaza2:: @ 8509238 - .4byte gFieldObjectImageAnim_8509218 - .4byte gFieldObjectImageAnim_8509220 - .4byte gFieldObjectImageAnim_8509228 - .4byte gFieldObjectImageAnim_8509230 - .4byte gFieldObjectImageAnim_8509200 - .4byte gFieldObjectImageAnim_85091F8 - .4byte gFieldObjectImageAnim_8509208 - .4byte gFieldObjectImageAnim_8509210 - .4byte gFieldObjectImageAnim_8509200 - .4byte gFieldObjectImageAnim_85091F8 - .4byte gFieldObjectImageAnim_85091F0 - .4byte gFieldObjectImageAnim_8509210 - .4byte gFieldObjectImageAnim_8509200 - .4byte gFieldObjectImageAnim_85091F8 - .4byte gFieldObjectImageAnim_8509208 - .4byte gFieldObjectImageAnim_8509210 - .4byte gFieldObjectImageAnim_8509200 - .4byte gFieldObjectImageAnim_85091F8 - .4byte gFieldObjectImageAnim_8509208 - .4byte gFieldObjectImageAnim_8509210 - - .align 2 -gFieldObjectImageAnimTable_BrendanMayNormal:: @ 8509288 - .4byte gFieldObjectImageAnim_FaceSouth - .4byte gFieldObjectImageAnim_FaceNorth - .4byte gFieldObjectImageAnim_FaceWest - .4byte gFieldObjectImageAnim_FaceEast - .4byte gFieldObjectImageAnim_GoSouth - .4byte gFieldObjectImageAnim_GoNorth - .4byte gFieldObjectImageAnim_GoWest - .4byte gFieldObjectImageAnim_GoEast - .4byte gFieldObjectImageAnim_GoFastSouth - .4byte gFieldObjectImageAnim_GoFastNorth - .4byte gFieldObjectImageAnim_GoFastWest - .4byte gFieldObjectImageAnim_GoFastEast - .4byte gFieldObjectImageAnim_GoFasterSouth - .4byte gFieldObjectImageAnim_GoFasterNorth - .4byte gFieldObjectImageAnim_GoFasterWest - .4byte gFieldObjectImageAnim_GoFasterEast - .4byte gFieldObjectImageAnim_GoFastestSouth - .4byte gFieldObjectImageAnim_GoFastestNorth - .4byte gFieldObjectImageAnim_GoFastestWest - .4byte gFieldObjectImageAnim_GoFastestEast - .4byte gFieldObjectImageAnim_RunSouth - .4byte gFieldObjectImageAnim_RunNorth - .4byte gFieldObjectImageAnim_RunWest - .4byte gFieldObjectImageAnim_RunEast - - .align 2 -gFieldObjectImageAnimTable_AcroBike:: @ 85092E8 - .4byte gFieldObjectImageAnim_FaceSouth - .4byte gFieldObjectImageAnim_FaceNorth - .4byte gFieldObjectImageAnim_FaceWest - .4byte gFieldObjectImageAnim_FaceEast - .4byte gFieldObjectImageAnim_GoSouth - .4byte gFieldObjectImageAnim_GoNorth - .4byte gFieldObjectImageAnim_GoWest - .4byte gFieldObjectImageAnim_GoEast - .4byte gFieldObjectImageAnim_GoFastSouth - .4byte gFieldObjectImageAnim_GoFastNorth - .4byte gFieldObjectImageAnim_GoFastWest - .4byte gFieldObjectImageAnim_GoFastEast - .4byte gFieldObjectImageAnim_GoFasterSouth - .4byte gFieldObjectImageAnim_GoFasterNorth - .4byte gFieldObjectImageAnim_GoFasterWest - .4byte gFieldObjectImageAnim_GoFasterEast - .4byte gFieldObjectImageAnim_GoFastestSouth - .4byte gFieldObjectImageAnim_GoFastestNorth - .4byte gFieldObjectImageAnim_GoFastestWest - .4byte gFieldObjectImageAnim_GoFastestEast - .4byte gFieldObjectImageAnim_BunnyHoppyBackWheelSouth - .4byte gFieldObjectImageAnim_BunnyHoppyBackWheelNorth - .4byte gFieldObjectImageAnim_BunnyHoppyBackWheelWest - .4byte gFieldObjectImageAnim_BunnyHoppyBackWheelEast - .4byte gFieldObjectImageAnim_BunnyHoppyFrontWheelSouth - .4byte gFieldObjectImageAnim_BunnyHoppyFrontWheelNorth - .4byte gFieldObjectImageAnim_BunnyHoppyFrontWheelWest - .4byte gFieldObjectImageAnim_BunnyHoppyFrontWheelEast - .4byte gFieldObjectImageAnim_StandingWheelieBackWheelSouth - .4byte gFieldObjectImageAnim_StandingWheelieBackWheelNorth - .4byte gFieldObjectImageAnim_StandingWheelieBackWheelWest - .4byte gFieldObjectImageAnim_StandingWheelieBackWheelEast - .4byte gFieldObjectImageAnim_StandingWheelieFrontWheelSouth - .4byte gFieldObjectImageAnim_StandingWheelieFrontWheelNorth - .4byte gFieldObjectImageAnim_StandingWheelieFrontWheelWest - .4byte gFieldObjectImageAnim_StandingWheelieFrontWheelEast - .4byte gFieldObjectImageAnim_MovingWheelieSouth - .4byte gFieldObjectImageAnim_MovingWheelieNorth - .4byte gFieldObjectImageAnim_MovingWheelieWest - .4byte gFieldObjectImageAnim_MovingWheelieEast - - .align 2 -gFieldObjectImageAnimTable_Surfing:: @ 8509388 - .4byte gFieldObjectImageAnim_FaceSouth - .4byte gFieldObjectImageAnim_FaceNorth - .4byte gFieldObjectImageAnim_FaceWest - .4byte gFieldObjectImageAnim_FaceEast - .4byte gFieldObjectImageAnim_GoSouth - .4byte gFieldObjectImageAnim_GoNorth - .4byte gFieldObjectImageAnim_GoWest - .4byte gFieldObjectImageAnim_GoEast - .4byte gFieldObjectImageAnim_GoFastSouth - .4byte gFieldObjectImageAnim_GoFastNorth - .4byte gFieldObjectImageAnim_GoFastWest - .4byte gFieldObjectImageAnim_GoFastEast - .4byte gFieldObjectImageAnim_GoFasterSouth - .4byte gFieldObjectImageAnim_GoFasterNorth - .4byte gFieldObjectImageAnim_GoFasterWest - .4byte gFieldObjectImageAnim_GoFasterEast - .4byte gFieldObjectImageAnim_GoFastestSouth - .4byte gFieldObjectImageAnim_GoFastestNorth - .4byte gFieldObjectImageAnim_GoFastestWest - .4byte gFieldObjectImageAnim_GoFastestEast - .4byte gFieldObjectImageAnim_GetOnOffSurfBlobSouth - .4byte gFieldObjectImageAnim_GetOnOffSurfBlobNorth - .4byte gFieldObjectImageAnim_GetOnOffSurfBlobWest - .4byte gFieldObjectImageAnim_GetOnOffSurfBlobEast - - .align 2 -gFieldObjectImageAnimTable_Nurse:: @ 85093E8 - .4byte gFieldObjectImageAnim_FaceSouth - .4byte gFieldObjectImageAnim_FaceNorth - .4byte gFieldObjectImageAnim_FaceWest - .4byte gFieldObjectImageAnim_FaceEast - .4byte gFieldObjectImageAnim_GoSouth - .4byte gFieldObjectImageAnim_GoNorth - .4byte gFieldObjectImageAnim_GoWest - .4byte gFieldObjectImageAnim_GoEast - .4byte gFieldObjectImageAnim_GoFastSouth - .4byte gFieldObjectImageAnim_GoFastNorth - .4byte gFieldObjectImageAnim_GoFastWest - .4byte gFieldObjectImageAnim_GoFastEast - .4byte gFieldObjectImageAnim_GoFasterSouth - .4byte gFieldObjectImageAnim_GoFasterNorth - .4byte gFieldObjectImageAnim_GoFasterWest - .4byte gFieldObjectImageAnim_GoFasterEast - .4byte gFieldObjectImageAnim_GoFastestSouth - .4byte gFieldObjectImageAnim_GoFastestNorth - .4byte gFieldObjectImageAnim_GoFastestWest - .4byte gFieldObjectImageAnim_GoFastestEast - .4byte gFieldObjectImageAnim_NurseBow - - .align 2 -gFieldObjectImageAnimTable_FieldMove:: @ 850943C - .4byte gFieldObjectImageAnim_FieldMove - - .align 2 -gFieldObjectImageAnimTable_BerryTree:: @ 8509440 - .4byte gFieldObjectImageAnim_BerryTreeStage0 - .4byte gFieldObjectImageAnim_BerryTreeStage1 - .4byte gFieldObjectImageAnim_BerryTreeStage2 - .4byte gFieldObjectImageAnim_BerryTreeStage3 - .4byte gFieldObjectImageAnim_BerryTreeStage4 - - .align 2 -gFieldObjectImageAnimTable_BreakableRock:: @ 8509454 - .4byte gFieldObjectImageAnim_StayStill - .4byte gFieldObjectImageAnim_RockBreak - - .align 2 -gFieldObjectImageAnimTable_CuttableTree:: @ 850945C - .4byte gFieldObjectImageAnim_StayStill - .4byte gFieldObjectImageAnim_TreeCut - - .align 2 -gFieldObjectImageAnimTable_Fishing:: @ 8509464 - .4byte gFieldObjectImageAnim_TakeOutRodSouth - .4byte gFieldObjectImageAnim_TakeOutRodNorth - .4byte gFieldObjectImageAnim_TakeOutRodWest - .4byte gFieldObjectImageAnim_TakeOutRodEast - .4byte gFieldObjectImageAnim_PutAwayRodSouth - .4byte gFieldObjectImageAnim_PutAwayRodNorth - .4byte gFieldObjectImageAnim_PutAwayRodWest - .4byte gFieldObjectImageAnim_PutAwayRodEast - .4byte gFieldObjectImageAnim_HookedPokemonSouth - .4byte gFieldObjectImageAnim_HookedPokemonNorth - .4byte gFieldObjectImageAnim_HookedPokemonWest - .4byte gFieldObjectImageAnim_HookedPokemonEast - - .align 2 -gFieldObjectRotScalAnimTable_KyogreGroudon:: @ 8509494 - .4byte gFieldObjectRotScalAnim_8508FD8 - .4byte gFieldObjectRotScalAnim_8509008 - .4byte gFieldObjectRotScalAnim_8509050 - .4byte gFieldObjectRotScalAnim_8509040 - .4byte gFieldObjectRotScalAnim_8509078 - .4byte gFieldObjectRotScalAnim_8509060 diff --git a/data/graphics/field_objects/field_object_graphics.inc b/data/graphics/field_objects/field_object_graphics.inc deleted file mode 100644 index 59333b9a43..0000000000 --- a/data/graphics/field_objects/field_object_graphics.inc +++ /dev/null @@ -1,6530 +0,0 @@ - .align 2 -gFieldObjectPic_BrendanNormal_0:: @ 84975F8 - .incbin "graphics/map_objects/pics/people/brendan/normal/00.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_1:: @ 84976F8 - .incbin "graphics/map_objects/pics/people/brendan/normal/01.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_2:: @ 84977F8 - .incbin "graphics/map_objects/pics/people/brendan/normal/02.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_3:: @ 84978F8 - .incbin "graphics/map_objects/pics/people/brendan/normal/03.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_4:: @ 84979F8 - .incbin "graphics/map_objects/pics/people/brendan/normal/04.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_5:: @ 8497AF8 - .incbin "graphics/map_objects/pics/people/brendan/normal/05.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_6:: @ 8497BF8 - .incbin "graphics/map_objects/pics/people/brendan/normal/06.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_7:: @ 8497CF8 - .incbin "graphics/map_objects/pics/people/brendan/normal/07.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_8:: @ 8497DF8 - .incbin "graphics/map_objects/pics/people/brendan/normal/08.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_9:: @ 8497EF8 - .incbin "graphics/map_objects/pics/people/brendan/normal/09.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_10:: @ 8497FF8 - .incbin "graphics/map_objects/pics/people/brendan/normal/10.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_11:: @ 84980F8 - .incbin "graphics/map_objects/pics/people/brendan/normal/11.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_12:: @ 84981F8 - .incbin "graphics/map_objects/pics/people/brendan/normal/12.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_13:: @ 84982F8 - .incbin "graphics/map_objects/pics/people/brendan/normal/13.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_14:: @ 84983F8 - .incbin "graphics/map_objects/pics/people/brendan/normal/14.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_15:: @ 84984F8 - .incbin "graphics/map_objects/pics/people/brendan/normal/15.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_16:: @ 84985F8 - .incbin "graphics/map_objects/pics/people/brendan/normal/16.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_17:: @ 84986F8 - .incbin "graphics/map_objects/pics/people/brendan/normal/17.4bpp" - - .align 2 -gFieldObjectPalette8:: @ 84987F8 - .incbin "graphics/map_objects/palettes/field_object_palette_08.gbapal" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_0:: @ 8498818 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/00.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_1:: @ 8498918 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/01.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_2:: @ 8498A18 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/02.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_3:: @ 8498B18 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/03.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_4:: @ 8498C18 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/04.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_5:: @ 8498D18 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/05.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_6:: @ 8498E18 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/06.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_7:: @ 8498F18 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/07.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_8:: @ 8499018 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/08.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_9:: @ 8499118 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/09.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_10:: @ 8499218 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/10.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_11:: @ 8499318 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/11.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_12:: @ 8499418 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/12.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_13:: @ 8499518 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/13.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_14:: @ 8499618 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/14.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_15:: @ 8499718 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/15.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_16:: @ 8499818 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/16.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_17:: @ 8499918 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/17.4bpp" - - .align 2 -gFieldObjectPalette33:: @ 8499A18 - .incbin "graphics/map_objects/palettes/field_object_palette_33.gbapal" - - .space 0x1E0 - - .align 2 -gFieldObjectPalette9:: @ 8499C18 - .incbin "graphics/map_objects/palettes/field_object_palette_09.gbapal" - - .align 2 -gFieldObjectPalette10:: @ 8499C38 - .incbin "graphics/map_objects/palettes/field_object_palette_10.gbapal" - - .align 2 -gFieldObjectPic_BrendanFieldMove_0:: @ 8499C58 - .incbin "graphics/map_objects/pics/people/brendan/field_move/0.4bpp" - - .align 2 -gFieldObjectPic_BrendanFieldMove_1:: @ 8499E58 - .incbin "graphics/map_objects/pics/people/brendan/field_move/1.4bpp" - - .align 2 -gFieldObjectPic_BrendanFieldMove_2:: @ 849A058 - .incbin "graphics/map_objects/pics/people/brendan/field_move/2.4bpp" - - .align 2 -gFieldObjectPic_BrendanFieldMove_3:: @ 849A258 - .incbin "graphics/map_objects/pics/people/brendan/field_move/3.4bpp" - - .align 2 -gFieldObjectPic_BrendanFieldMove_4:: @ 849A458 - .incbin "graphics/map_objects/pics/people/brendan/field_move/4.4bpp" - - .align 2 -gFieldObjectPic_BrendanSurfing_0:: @ 849A658 - .incbin "graphics/map_objects/pics/people/brendan/surfing/0.4bpp" - - .align 2 -gFieldObjectPic_BrendanSurfing_3:: @ 849A858 - .incbin "graphics/map_objects/pics/people/brendan/surfing/3.4bpp" - - .align 2 -gFieldObjectPic_BrendanSurfing_1:: @ 849AA58 - .incbin "graphics/map_objects/pics/people/brendan/surfing/1.4bpp" - - .align 2 -gFieldObjectPic_BrendanSurfing_4:: @ 849AC58 - .incbin "graphics/map_objects/pics/people/brendan/surfing/4.4bpp" - - .align 2 -gFieldObjectPic_BrendanSurfing_2:: @ 849AE58 - .incbin "graphics/map_objects/pics/people/brendan/surfing/2.4bpp" - - .align 2 -gFieldObjectPic_BrendanSurfing_5:: @ 849B058 - .incbin "graphics/map_objects/pics/people/brendan/surfing/5.4bpp" - - .align 2 -gFieldObjectPic_BrendanMachBike_0:: @ 849B258 - .incbin "graphics/map_objects/pics/people/brendan/mach_bike/0.4bpp" - - .align 2 -gFieldObjectPic_BrendanMachBike_1:: @ 849B458 - .incbin "graphics/map_objects/pics/people/brendan/mach_bike/1.4bpp" - - .align 2 -gFieldObjectPic_BrendanMachBike_2:: @ 849B658 - .incbin "graphics/map_objects/pics/people/brendan/mach_bike/2.4bpp" - - .align 2 -gFieldObjectPic_BrendanMachBike_3:: @ 849B858 - .incbin "graphics/map_objects/pics/people/brendan/mach_bike/3.4bpp" - - .align 2 -gFieldObjectPic_BrendanMachBike_4:: @ 849BA58 - .incbin "graphics/map_objects/pics/people/brendan/mach_bike/4.4bpp" - - .align 2 -gFieldObjectPic_BrendanMachBike_5:: @ 849BC58 - .incbin "graphics/map_objects/pics/people/brendan/mach_bike/5.4bpp" - - .align 2 -gFieldObjectPic_BrendanMachBike_6:: @ 849BE58 - .incbin "graphics/map_objects/pics/people/brendan/mach_bike/6.4bpp" - - .align 2 -gFieldObjectPic_BrendanMachBike_7:: @ 849C058 - .incbin "graphics/map_objects/pics/people/brendan/mach_bike/7.4bpp" - - .align 2 -gFieldObjectPic_BrendanMachBike_8:: @ 849C258 - .incbin "graphics/map_objects/pics/people/brendan/mach_bike/8.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_0:: @ 849C458 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/00.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_1:: @ 849C658 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/01.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_2:: @ 849C858 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/02.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_3:: @ 849CA58 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/03.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_4:: @ 849CC58 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/04.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_5:: @ 849CE58 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/05.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_6:: @ 849D058 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/06.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_7:: @ 849D258 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/07.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_8:: @ 849D458 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/08.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_9:: @ 849D658 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/09.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_10:: @ 849D858 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/10.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_11:: @ 849DA58 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/11.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_12:: @ 849DC58 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/12.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_13:: @ 849DE58 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/13.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_14:: @ 849E058 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/14.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_15:: @ 849E258 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/15.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_16:: @ 849E458 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/16.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_17:: @ 849E658 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/17.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_18:: @ 849E858 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/18.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_19:: @ 849EA58 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/19.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_20:: @ 849EC58 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/20.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_21:: @ 849EE58 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/21.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_22:: @ 849F058 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/22.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_23:: @ 849F258 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/23.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_24:: @ 849F458 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/24.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_25:: @ 849F658 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/25.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_26:: @ 849F858 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/26.4bpp" - - .align 2 -gFieldObjectPic_BrendanFishing_0:: @ 849FA58 - .incbin "graphics/map_objects/pics/people/brendan/fishing/00.4bpp" - - .align 2 -gFieldObjectPic_BrendanFishing_1:: @ 849FC58 - .incbin "graphics/map_objects/pics/people/brendan/fishing/01.4bpp" - - .align 2 -gFieldObjectPic_BrendanFishing_2:: @ 849FE58 - .incbin "graphics/map_objects/pics/people/brendan/fishing/02.4bpp" - - .align 2 -gFieldObjectPic_BrendanFishing_3:: @ 84A0058 - .incbin "graphics/map_objects/pics/people/brendan/fishing/03.4bpp" - - .align 2 -gFieldObjectPic_BrendanFishing_4:: @ 84A0258 - .incbin "graphics/map_objects/pics/people/brendan/fishing/04.4bpp" - - .align 2 -gFieldObjectPic_BrendanFishing_5:: @ 84A0458 - .incbin "graphics/map_objects/pics/people/brendan/fishing/05.4bpp" - - .align 2 -gFieldObjectPic_BrendanFishing_6:: @ 84A0658 - .incbin "graphics/map_objects/pics/people/brendan/fishing/06.4bpp" - - .align 2 -gFieldObjectPic_BrendanFishing_7:: @ 84A0858 - .incbin "graphics/map_objects/pics/people/brendan/fishing/07.4bpp" - - .align 2 -gFieldObjectPic_BrendanFishing_8:: @ 84A0A58 - .incbin "graphics/map_objects/pics/people/brendan/fishing/08.4bpp" - - .align 2 -gFieldObjectPic_BrendanFishing_9:: @ 84A0C58 - .incbin "graphics/map_objects/pics/people/brendan/fishing/09.4bpp" - - .align 2 -gFieldObjectPic_BrendanFishing_10:: @ 84A0E58 - .incbin "graphics/map_objects/pics/people/brendan/fishing/10.4bpp" - - .align 2 -gFieldObjectPic_BrendanFishing_11:: @ 84A1058 - .incbin "graphics/map_objects/pics/people/brendan/fishing/11.4bpp" - - .align 2 -gFieldObjectPic_BrendanWatering_0:: @ 84A1258 - .incbin "graphics/map_objects/pics/people/brendan/watering/0.4bpp" - - .align 2 -gFieldObjectPic_BrendanWatering_3:: @ 84A1458 - .incbin "graphics/map_objects/pics/people/brendan/watering/3.4bpp" - - .align 2 -gFieldObjectPic_BrendanWatering_1:: @ 84A1658 - .incbin "graphics/map_objects/pics/people/brendan/watering/1.4bpp" - - .align 2 -gFieldObjectPic_BrendanWatering_4:: @ 84A1858 - .incbin "graphics/map_objects/pics/people/brendan/watering/4.4bpp" - - .align 2 -gFieldObjectPic_BrendanWatering_2:: @ 84A1A58 - .incbin "graphics/map_objects/pics/people/brendan/watering/2.4bpp" - - .align 2 -gFieldObjectPic_BrendanWatering_5:: @ 84A1C58 - .incbin "graphics/map_objects/pics/people/brendan/watering/5.4bpp" - - .align 2 -gFieldObjectPic_BrendanDecorating:: @ 84A1E58 - .incbin "graphics/map_objects/pics/people/brendan/decorating.4bpp" - - .align 2 -gFieldObjectPic_MayDecorating:: @ 84A1F58 - .incbin "graphics/map_objects/pics/people/may/decorating.4bpp" - - .align 2 -gFieldObjectPic_BrendanUnderwater_0:: @ 84A2058 - .incbin "graphics/map_objects/pics/people/brendan/underwater/0.4bpp" - - .align 2 -gFieldObjectPic_BrendanUnderwater_1:: @ 84A2258 - .incbin "graphics/map_objects/pics/people/brendan/underwater/1.4bpp" - - .align 2 -gFieldObjectPic_BrendanUnderwater_2:: @ 84A2458 - .incbin "graphics/map_objects/pics/people/brendan/underwater/2.4bpp" - - .align 2 -gFieldObjectPic_BrendanUnderwater_3:: @ 84A2658 - .incbin "graphics/map_objects/pics/people/brendan/underwater/3.4bpp" - - .align 2 -gFieldObjectPic_MayUnderwater_0:: @ 84A2858 - .incbin "graphics/map_objects/pics/people/may/underwater/0.4bpp" - - .align 2 -gFieldObjectPic_MayUnderwater_1:: @ 84A2A58 - .incbin "graphics/map_objects/pics/people/may/underwater/1.4bpp" - - .align 2 -gFieldObjectPic_MayUnderwater_2:: @ 84A2C58 - .incbin "graphics/map_objects/pics/people/may/underwater/2.4bpp" - - .align 2 -gFieldObjectPic_MayUnderwater_3:: @ 84A2E58 - .incbin "graphics/map_objects/pics/people/may/underwater/3.4bpp" - - .align 2 -gFieldObjectPalette11:: @ 84A3058 - .incbin "graphics/map_objects/palettes/field_object_palette_11.gbapal" - - .align 2 -gFieldObjectPic_MayNormal_0:: @ 84A3078 - .incbin "graphics/map_objects/pics/people/may/normal/00.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_1:: @ 84A3178 - .incbin "graphics/map_objects/pics/people/may/normal/01.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_2:: @ 84A3278 - .incbin "graphics/map_objects/pics/people/may/normal/02.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_3:: @ 84A3378 - .incbin "graphics/map_objects/pics/people/may/normal/03.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_4:: @ 84A3478 - .incbin "graphics/map_objects/pics/people/may/normal/04.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_5:: @ 84A3578 - .incbin "graphics/map_objects/pics/people/may/normal/05.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_6:: @ 84A3678 - .incbin "graphics/map_objects/pics/people/may/normal/06.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_7:: @ 84A3778 - .incbin "graphics/map_objects/pics/people/may/normal/07.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_8:: @ 84A3878 - .incbin "graphics/map_objects/pics/people/may/normal/08.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_9:: @ 84A3978 - .incbin "graphics/map_objects/pics/people/may/normal/09.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_10:: @ 84A3A78 - .incbin "graphics/map_objects/pics/people/may/normal/10.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_11:: @ 84A3B78 - .incbin "graphics/map_objects/pics/people/may/normal/11.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_12:: @ 84A3C78 - .incbin "graphics/map_objects/pics/people/may/normal/12.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_13:: @ 84A3D78 - .incbin "graphics/map_objects/pics/people/may/normal/13.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_14:: @ 84A3E78 - .incbin "graphics/map_objects/pics/people/may/normal/14.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_15:: @ 84A3F78 - .incbin "graphics/map_objects/pics/people/may/normal/15.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_16:: @ 84A4078 - .incbin "graphics/map_objects/pics/people/may/normal/16.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_17:: @ 84A4178 - .incbin "graphics/map_objects/pics/people/may/normal/17.4bpp" - - .align 2 -gFieldObjectPalette17:: @ 84A4278 - .incbin "graphics/map_objects/palettes/field_object_palette_17.gbapal" - - .align 2 -gFieldObjectPalette18:: @ 84A4298 - .incbin "graphics/map_objects/palettes/field_object_palette_18.gbapal" - - .align 2 -gFieldObjectPic_RubySapphireMay_0:: @ 84A42B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/00.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_1:: @ 84A43B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/01.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_2:: @ 84A44B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/02.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_3:: @ 84A45B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/03.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_4:: @ 84A46B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/04.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_5:: @ 84A47B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/05.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_6:: @ 84A48B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/06.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_7:: @ 84A49B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/07.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_8:: @ 84A4AB8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/08.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_9:: @ 84A4BB8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/09.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_10:: @ 84A4CB8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/10.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_11:: @ 84A4DB8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/11.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_12:: @ 84A4EB8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/12.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_13:: @ 84A4FB8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/13.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_14:: @ 84A50B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/14.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_15:: @ 84A51B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/15.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_16:: @ 84A52B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/16.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_17:: @ 84A53B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/17.4bpp" - - .align 2 -gFieldObjectPalette34:: @ 84A54B8 - .incbin "graphics/map_objects/palettes/field_object_palette_34.gbapal" - - .align 2 -gUnusedFieldObjectPalette:: @ 84A54D8 - .incbin "graphics/map_objects/palettes/unused_palette.gbapal" - - .space 0x1C0 - - .align 2 -gFieldObjectPic_MayMachBike_0:: @ 84A56B8 - .incbin "graphics/map_objects/pics/people/may/mach_bike/0.4bpp" - - .align 2 -gFieldObjectPic_MayMachBike_1:: @ 84A58B8 - .incbin "graphics/map_objects/pics/people/may/mach_bike/1.4bpp" - - .align 2 -gFieldObjectPic_MayMachBike_2:: @ 84A5AB8 - .incbin "graphics/map_objects/pics/people/may/mach_bike/2.4bpp" - - .align 2 -gFieldObjectPic_MayMachBike_3:: @ 84A5CB8 - .incbin "graphics/map_objects/pics/people/may/mach_bike/3.4bpp" - - .align 2 -gFieldObjectPic_MayMachBike_4:: @ 84A5EB8 - .incbin "graphics/map_objects/pics/people/may/mach_bike/4.4bpp" - - .align 2 -gFieldObjectPic_MayMachBike_5:: @ 84A60B8 - .incbin "graphics/map_objects/pics/people/may/mach_bike/5.4bpp" - - .align 2 -gFieldObjectPic_MayMachBike_6:: @ 84A62B8 - .incbin "graphics/map_objects/pics/people/may/mach_bike/6.4bpp" - - .align 2 -gFieldObjectPic_MayMachBike_7:: @ 84A64B8 - .incbin "graphics/map_objects/pics/people/may/mach_bike/7.4bpp" - - .align 2 -gFieldObjectPic_MayMachBike_8:: @ 84A66B8 - .incbin "graphics/map_objects/pics/people/may/mach_bike/8.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_0:: @ 84A68B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/00.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_1:: @ 84A6AB8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/01.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_2:: @ 84A6CB8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/02.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_3:: @ 84A6EB8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/03.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_4:: @ 84A70B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/04.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_5:: @ 84A72B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/05.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_6:: @ 84A74B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/06.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_7:: @ 84A76B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/07.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_8:: @ 84A78B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/08.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_9:: @ 84A7AB8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/09.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_10:: @ 84A7CB8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/10.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_11:: @ 84A7EB8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/11.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_12:: @ 84A80B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/12.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_13:: @ 84A82B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/13.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_14:: @ 84A84B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/14.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_15:: @ 84A86B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/15.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_16:: @ 84A88B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/16.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_17:: @ 84A8AB8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/17.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_18:: @ 84A8CB8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/18.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_19:: @ 84A8EB8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/19.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_20:: @ 84A90B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/20.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_21:: @ 84A92B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/21.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_22:: @ 84A94B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/22.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_23:: @ 84A96B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/23.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_24:: @ 84A98B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/24.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_25:: @ 84A9AB8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/25.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_26:: @ 84A9CB8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/26.4bpp" - - .align 2 -gFieldObjectPic_MaySurfing_0:: @ 84A9EB8 - .incbin "graphics/map_objects/pics/people/may/surfing/0.4bpp" - - .align 2 -gFieldObjectPic_MaySurfing_3:: @ 84AA0B8 - .incbin "graphics/map_objects/pics/people/may/surfing/3.4bpp" - - .align 2 -gFieldObjectPic_MaySurfing_1:: @ 84AA2B8 - .incbin "graphics/map_objects/pics/people/may/surfing/1.4bpp" - - .align 2 -gFieldObjectPic_MaySurfing_4:: @ 84AA4B8 - .incbin "graphics/map_objects/pics/people/may/surfing/4.4bpp" - - .align 2 -gFieldObjectPic_MaySurfing_2:: @ 84AA6B8 - .incbin "graphics/map_objects/pics/people/may/surfing/2.4bpp" - - .align 2 -gFieldObjectPic_MaySurfing_5:: @ 84AA8B8 - .incbin "graphics/map_objects/pics/people/may/surfing/5.4bpp" - - .align 2 -gFieldObjectPic_MayFieldMove_0:: @ 84AAAB8 - .incbin "graphics/map_objects/pics/people/may/field_move/0.4bpp" - - .align 2 -gFieldObjectPic_MayFieldMove_1:: @ 84AACB8 - .incbin "graphics/map_objects/pics/people/may/field_move/1.4bpp" - - .align 2 -gFieldObjectPic_MayFieldMove_2:: @ 84AAEB8 - .incbin "graphics/map_objects/pics/people/may/field_move/2.4bpp" - - .align 2 -gFieldObjectPic_MayFieldMove_3:: @ 84AB0B8 - .incbin "graphics/map_objects/pics/people/may/field_move/3.4bpp" - - .align 2 -gFieldObjectPic_MayFieldMove_4:: @ 84AB2B8 - .incbin "graphics/map_objects/pics/people/may/field_move/4.4bpp" - - .align 2 -gFieldObjectPic_MayFishing_0:: @ 84AB4B8 - .incbin "graphics/map_objects/pics/people/may/fishing/00.4bpp" - - .align 2 -gFieldObjectPic_MayFishing_1:: @ 84AB6B8 - .incbin "graphics/map_objects/pics/people/may/fishing/01.4bpp" - - .align 2 -gFieldObjectPic_MayFishing_2:: @ 84AB8B8 - .incbin "graphics/map_objects/pics/people/may/fishing/02.4bpp" - - .align 2 -gFieldObjectPic_MayFishing_3:: @ 84ABAB8 - .incbin "graphics/map_objects/pics/people/may/fishing/03.4bpp" - - .align 2 -gFieldObjectPic_MayFishing_4:: @ 84ABCB8 - .incbin "graphics/map_objects/pics/people/may/fishing/04.4bpp" - - .align 2 -gFieldObjectPic_MayFishing_5:: @ 84ABEB8 - .incbin "graphics/map_objects/pics/people/may/fishing/05.4bpp" - - .align 2 -gFieldObjectPic_MayFishing_6:: @ 84AC0B8 - .incbin "graphics/map_objects/pics/people/may/fishing/06.4bpp" - - .align 2 -gFieldObjectPic_MayFishing_7:: @ 84AC2B8 - .incbin "graphics/map_objects/pics/people/may/fishing/07.4bpp" - - .align 2 -gFieldObjectPic_MayFishing_8:: @ 84AC4B8 - .incbin "graphics/map_objects/pics/people/may/fishing/08.4bpp" - - .align 2 -gFieldObjectPic_MayFishing_9:: @ 84AC6B8 - .incbin "graphics/map_objects/pics/people/may/fishing/09.4bpp" - - .align 2 -gFieldObjectPic_MayFishing_10:: @ 84AC8B8 - .incbin "graphics/map_objects/pics/people/may/fishing/10.4bpp" - - .align 2 -gFieldObjectPic_MayFishing_11:: @ 84ACAB8 - .incbin "graphics/map_objects/pics/people/may/fishing/11.4bpp" - - .align 2 -gFieldObjectPic_MayWatering_0:: @ 84ACCB8 - .incbin "graphics/map_objects/pics/people/may/watering/0.4bpp" - - .align 2 -gFieldObjectPic_MayWatering_3:: @ 84ACEB8 - .incbin "graphics/map_objects/pics/people/may/watering/3.4bpp" - - .align 2 -gFieldObjectPic_MayWatering_1:: @ 84AD0B8 - .incbin "graphics/map_objects/pics/people/may/watering/1.4bpp" - - .align 2 -gFieldObjectPic_MayWatering_4:: @ 84AD2B8 - .incbin "graphics/map_objects/pics/people/may/watering/4.4bpp" - - .align 2 -gFieldObjectPic_MayWatering_2:: @ 84AD4B8 - .incbin "graphics/map_objects/pics/people/may/watering/2.4bpp" - - .align 2 -gFieldObjectPic_MayWatering_5:: @ 84AD6B8 - .incbin "graphics/map_objects/pics/people/may/watering/5.4bpp" - - .align 2 -gFieldObjectPalette0:: @ 84AD8B8 - .incbin "graphics/map_objects/palettes/field_object_palette_00.gbapal" - - .align 2 -gFieldObjectPalette1:: @ 84AD8D8 - .incbin "graphics/map_objects/palettes/field_object_palette_01.gbapal" - - .align 2 -gFieldObjectPalette2:: @ 84AD8F8 - .incbin "graphics/map_objects/palettes/field_object_palette_02.gbapal" - - .align 2 -gFieldObjectPalette3:: @ 84AD918 - .incbin "graphics/map_objects/palettes/field_object_palette_03.gbapal" - - .align 2 -gFieldObjectPalette4:: @ 84AD938 - .incbin "graphics/map_objects/palettes/field_object_palette_04.gbapal" - - .align 2 -gFieldObjectPalette5:: @ 84AD958 - .incbin "graphics/map_objects/palettes/field_object_palette_05.gbapal" - - .align 2 -gFieldObjectPalette6:: @ 84AD978 - .incbin "graphics/map_objects/palettes/field_object_palette_06.gbapal" - - .align 2 -gFieldObjectPalette7:: @ 84AD998 - .incbin "graphics/map_objects/palettes/field_object_palette_07.gbapal" - - .align 2 -gFieldObjectPic_LittleBoy1_0:: @ 84AD9B8 - .incbin "graphics/map_objects/pics/people/little_boy_1/0.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy1_1:: @ 84ADA38 - .incbin "graphics/map_objects/pics/people/little_boy_1/1.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy1_2:: @ 84ADAB8 - .incbin "graphics/map_objects/pics/people/little_boy_1/2.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy1_3:: @ 84ADB38 - .incbin "graphics/map_objects/pics/people/little_boy_1/3.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy1_4:: @ 84ADBB8 - .incbin "graphics/map_objects/pics/people/little_boy_1/4.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy1_5:: @ 84ADC38 - .incbin "graphics/map_objects/pics/people/little_boy_1/5.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy1_6:: @ 84ADCB8 - .incbin "graphics/map_objects/pics/people/little_boy_1/6.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy1_7:: @ 84ADD38 - .incbin "graphics/map_objects/pics/people/little_boy_1/7.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy1_8:: @ 84ADDB8 - .incbin "graphics/map_objects/pics/people/little_boy_1/8.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl1_0:: @ 84ADE38 - .incbin "graphics/map_objects/pics/people/little_girl_1/0.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl1_1:: @ 84ADF38 - .incbin "graphics/map_objects/pics/people/little_girl_1/1.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl1_2:: @ 84AE038 - .incbin "graphics/map_objects/pics/people/little_girl_1/2.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl1_3:: @ 84AE138 - .incbin "graphics/map_objects/pics/people/little_girl_1/3.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl1_4:: @ 84AE238 - .incbin "graphics/map_objects/pics/people/little_girl_1/4.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl1_5:: @ 84AE338 - .incbin "graphics/map_objects/pics/people/little_girl_1/5.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl1_6:: @ 84AE438 - .incbin "graphics/map_objects/pics/people/little_girl_1/6.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl1_7:: @ 84AE538 - .incbin "graphics/map_objects/pics/people/little_girl_1/7.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl1_8:: @ 84AE638 - .incbin "graphics/map_objects/pics/people/little_girl_1/8.4bpp" - - .align 2 -gFieldObjectPic_Boy1_0:: @ 84AE738 - .incbin "graphics/map_objects/pics/people/boy_1/0.4bpp" - - .align 2 -gFieldObjectPic_Boy1_1:: @ 84AE838 - .incbin "graphics/map_objects/pics/people/boy_1/1.4bpp" - - .align 2 -gFieldObjectPic_Boy1_2:: @ 84AE938 - .incbin "graphics/map_objects/pics/people/boy_1/2.4bpp" - - .align 2 -gFieldObjectPic_Boy1_3:: @ 84AEA38 - .incbin "graphics/map_objects/pics/people/boy_1/3.4bpp" - - .align 2 -gFieldObjectPic_Boy1_4:: @ 84AEB38 - .incbin "graphics/map_objects/pics/people/boy_1/4.4bpp" - - .align 2 -gFieldObjectPic_Boy1_5:: @ 84AEC38 - .incbin "graphics/map_objects/pics/people/boy_1/5.4bpp" - - .align 2 -gFieldObjectPic_Boy1_6:: @ 84AED38 - .incbin "graphics/map_objects/pics/people/boy_1/6.4bpp" - - .align 2 -gFieldObjectPic_Boy1_7:: @ 84AEE38 - .incbin "graphics/map_objects/pics/people/boy_1/7.4bpp" - - .align 2 -gFieldObjectPic_Boy1_8:: @ 84AEF38 - .incbin "graphics/map_objects/pics/people/boy_1/8.4bpp" - - .align 2 -gFieldObjectPic_Girl1_0:: @ 84AF038 - .incbin "graphics/map_objects/pics/people/girl_1/0.4bpp" - - .align 2 -gFieldObjectPic_Girl1_1:: @ 84AF138 - .incbin "graphics/map_objects/pics/people/girl_1/1.4bpp" - - .align 2 -gFieldObjectPic_Girl1_2:: @ 84AF238 - .incbin "graphics/map_objects/pics/people/girl_1/2.4bpp" - - .align 2 -gFieldObjectPic_Girl1_3:: @ 84AF338 - .incbin "graphics/map_objects/pics/people/girl_1/3.4bpp" - - .align 2 -gFieldObjectPic_Girl1_4:: @ 84AF438 - .incbin "graphics/map_objects/pics/people/girl_1/4.4bpp" - - .align 2 -gFieldObjectPic_Girl1_5:: @ 84AF538 - .incbin "graphics/map_objects/pics/people/girl_1/5.4bpp" - - .align 2 -gFieldObjectPic_Girl1_6:: @ 84AF638 - .incbin "graphics/map_objects/pics/people/girl_1/6.4bpp" - - .align 2 -gFieldObjectPic_Girl1_7:: @ 84AF738 - .incbin "graphics/map_objects/pics/people/girl_1/7.4bpp" - - .align 2 -gFieldObjectPic_Girl1_8:: @ 84AF838 - .incbin "graphics/map_objects/pics/people/girl_1/8.4bpp" - - .align 2 -gFieldObjectPic_Boy2_0:: @ 84AF938 - .incbin "graphics/map_objects/pics/people/boy_2/0.4bpp" - - .align 2 -gFieldObjectPic_Boy2_1:: @ 84AFA38 - .incbin "graphics/map_objects/pics/people/boy_2/1.4bpp" - - .align 2 -gFieldObjectPic_Boy2_2:: @ 84AFB38 - .incbin "graphics/map_objects/pics/people/boy_2/2.4bpp" - - .align 2 -gFieldObjectPic_Boy2_3:: @ 84AFC38 - .incbin "graphics/map_objects/pics/people/boy_2/3.4bpp" - - .align 2 -gFieldObjectPic_Boy2_4:: @ 84AFD38 - .incbin "graphics/map_objects/pics/people/boy_2/4.4bpp" - - .align 2 -gFieldObjectPic_Boy2_5:: @ 84AFE38 - .incbin "graphics/map_objects/pics/people/boy_2/5.4bpp" - - .align 2 -gFieldObjectPic_Boy2_6:: @ 84AFF38 - .incbin "graphics/map_objects/pics/people/boy_2/6.4bpp" - - .align 2 -gFieldObjectPic_Boy2_7:: @ 84B0038 - .incbin "graphics/map_objects/pics/people/boy_2/7.4bpp" - - .align 2 -gFieldObjectPic_Boy2_8:: @ 84B0138 - .incbin "graphics/map_objects/pics/people/boy_2/8.4bpp" - - .align 2 -gFieldObjectPic_Girl2_0:: @ 84B0238 - .incbin "graphics/map_objects/pics/people/girl_2/0.4bpp" - - .align 2 -gFieldObjectPic_Girl2_1:: @ 84B0338 - .incbin "graphics/map_objects/pics/people/girl_2/1.4bpp" - - .align 2 -gFieldObjectPic_Girl2_2:: @ 84B0438 - .incbin "graphics/map_objects/pics/people/girl_2/2.4bpp" - - .align 2 -gFieldObjectPic_Girl2_3:: @ 84B0538 - .incbin "graphics/map_objects/pics/people/girl_2/3.4bpp" - - .align 2 -gFieldObjectPic_Girl2_4:: @ 84B0638 - .incbin "graphics/map_objects/pics/people/girl_2/4.4bpp" - - .align 2 -gFieldObjectPic_Girl2_5:: @ 84B0738 - .incbin "graphics/map_objects/pics/people/girl_2/5.4bpp" - - .align 2 -gFieldObjectPic_Girl2_6:: @ 84B0838 - .incbin "graphics/map_objects/pics/people/girl_2/6.4bpp" - - .align 2 -gFieldObjectPic_Girl2_7:: @ 84B0938 - .incbin "graphics/map_objects/pics/people/girl_2/7.4bpp" - - .align 2 -gFieldObjectPic_Girl2_8:: @ 84B0A38 - .incbin "graphics/map_objects/pics/people/girl_2/8.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy2_0:: @ 84B0B38 - .incbin "graphics/map_objects/pics/people/little_boy_2/0.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy2_1:: @ 84B0BB8 - .incbin "graphics/map_objects/pics/people/little_boy_2/1.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy2_2:: @ 84B0C38 - .incbin "graphics/map_objects/pics/people/little_boy_2/2.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy2_3:: @ 84B0CB8 - .incbin "graphics/map_objects/pics/people/little_boy_2/3.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy2_4:: @ 84B0D38 - .incbin "graphics/map_objects/pics/people/little_boy_2/4.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy2_5:: @ 84B0DB8 - .incbin "graphics/map_objects/pics/people/little_boy_2/5.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy2_6:: @ 84B0E38 - .incbin "graphics/map_objects/pics/people/little_boy_2/6.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy2_7:: @ 84B0EB8 - .incbin "graphics/map_objects/pics/people/little_boy_2/7.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy2_8:: @ 84B0F38 - .incbin "graphics/map_objects/pics/people/little_boy_2/8.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl2_0:: @ 84B0FB8 - .incbin "graphics/map_objects/pics/people/little_girl_2/0.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl2_1:: @ 84B1038 - .incbin "graphics/map_objects/pics/people/little_girl_2/1.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl2_2:: @ 84B10B8 - .incbin "graphics/map_objects/pics/people/little_girl_2/2.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl2_3:: @ 84B1138 - .incbin "graphics/map_objects/pics/people/little_girl_2/3.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl2_4:: @ 84B11B8 - .incbin "graphics/map_objects/pics/people/little_girl_2/4.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl2_5:: @ 84B1238 - .incbin "graphics/map_objects/pics/people/little_girl_2/5.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl2_6:: @ 84B12B8 - .incbin "graphics/map_objects/pics/people/little_girl_2/6.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl2_7:: @ 84B1338 - .incbin "graphics/map_objects/pics/people/little_girl_2/7.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl2_8:: @ 84B13B8 - .incbin "graphics/map_objects/pics/people/little_girl_2/8.4bpp" - - .align 2 -gFieldObjectPic_Boy3_0:: @ 84B1438 - .incbin "graphics/map_objects/pics/people/boy_3/0.4bpp" - - .align 2 -gFieldObjectPic_Boy3_1:: @ 84B1538 - .incbin "graphics/map_objects/pics/people/boy_3/1.4bpp" - - .align 2 -gFieldObjectPic_Boy3_2:: @ 84B1638 - .incbin "graphics/map_objects/pics/people/boy_3/2.4bpp" - - .align 2 -gFieldObjectPic_Boy3_3:: @ 84B1738 - .incbin "graphics/map_objects/pics/people/boy_3/3.4bpp" - - .align 2 -gFieldObjectPic_Boy3_4:: @ 84B1838 - .incbin "graphics/map_objects/pics/people/boy_3/4.4bpp" - - .align 2 -gFieldObjectPic_Boy3_5:: @ 84B1938 - .incbin "graphics/map_objects/pics/people/boy_3/5.4bpp" - - .align 2 -gFieldObjectPic_Boy3_6:: @ 84B1A38 - .incbin "graphics/map_objects/pics/people/boy_3/6.4bpp" - - .align 2 -gFieldObjectPic_Boy3_7:: @ 84B1B38 - .incbin "graphics/map_objects/pics/people/boy_3/7.4bpp" - - .align 2 -gFieldObjectPic_Boy3_8:: @ 84B1C38 - .incbin "graphics/map_objects/pics/people/boy_3/8.4bpp" - - .align 2 -gFieldObjectPic_Girl3_0:: @ 84B1D38 - .incbin "graphics/map_objects/pics/people/girl_3/0.4bpp" - - .align 2 -gFieldObjectPic_Girl3_1:: @ 84B1E38 - .incbin "graphics/map_objects/pics/people/girl_3/1.4bpp" - - .align 2 -gFieldObjectPic_Girl3_2:: @ 84B1F38 - .incbin "graphics/map_objects/pics/people/girl_3/2.4bpp" - - .align 2 -gFieldObjectPic_Girl3_3:: @ 84B2038 - .incbin "graphics/map_objects/pics/people/girl_3/3.4bpp" - - .align 2 -gFieldObjectPic_Girl3_4:: @ 84B2138 - .incbin "graphics/map_objects/pics/people/girl_3/4.4bpp" - - .align 2 -gFieldObjectPic_Girl3_5:: @ 84B2238 - .incbin "graphics/map_objects/pics/people/girl_3/5.4bpp" - - .align 2 -gFieldObjectPic_Girl3_6:: @ 84B2338 - .incbin "graphics/map_objects/pics/people/girl_3/6.4bpp" - - .align 2 -gFieldObjectPic_Girl3_7:: @ 84B2438 - .incbin "graphics/map_objects/pics/people/girl_3/7.4bpp" - - .align 2 -gFieldObjectPic_Girl3_8:: @ 84B2538 - .incbin "graphics/map_objects/pics/people/girl_3/8.4bpp" - - .align 2 -gFieldObjectPic_Boy4_0:: @ 84B2638 - .incbin "graphics/map_objects/pics/people/boy_4/0.4bpp" - - .align 2 -gFieldObjectPic_Boy4_1:: @ 84B2738 - .incbin "graphics/map_objects/pics/people/boy_4/1.4bpp" - - .align 2 -gFieldObjectPic_Boy4_2:: @ 84B2838 - .incbin "graphics/map_objects/pics/people/boy_4/2.4bpp" - - .align 2 -gFieldObjectPic_Boy4_3:: @ 84B2938 - .incbin "graphics/map_objects/pics/people/boy_4/3.4bpp" - - .align 2 -gFieldObjectPic_Boy4_4:: @ 84B2A38 - .incbin "graphics/map_objects/pics/people/boy_4/4.4bpp" - - .align 2 -gFieldObjectPic_Boy4_5:: @ 84B2B38 - .incbin "graphics/map_objects/pics/people/boy_4/5.4bpp" - - .align 2 -gFieldObjectPic_Boy4_6:: @ 84B2C38 - .incbin "graphics/map_objects/pics/people/boy_4/6.4bpp" - - .align 2 -gFieldObjectPic_Boy4_7:: @ 84B2D38 - .incbin "graphics/map_objects/pics/people/boy_4/7.4bpp" - - .align 2 -gFieldObjectPic_Boy4_8:: @ 84B2E38 - .incbin "graphics/map_objects/pics/people/boy_4/8.4bpp" - - .align 2 -gFieldObjectPic_Woman1_0:: @ 84B2F38 - .incbin "graphics/map_objects/pics/people/woman_1/0.4bpp" - - .align 2 -gFieldObjectPic_Woman1_1:: @ 84B3038 - .incbin "graphics/map_objects/pics/people/woman_1/1.4bpp" - - .align 2 -gFieldObjectPic_Woman1_2:: @ 84B3138 - .incbin "graphics/map_objects/pics/people/woman_1/2.4bpp" - - .align 2 -gFieldObjectPic_Woman1_3:: @ 84B3238 - .incbin "graphics/map_objects/pics/people/woman_1/3.4bpp" - - .align 2 -gFieldObjectPic_Woman1_4:: @ 84B3338 - .incbin "graphics/map_objects/pics/people/woman_1/4.4bpp" - - .align 2 -gFieldObjectPic_Woman1_5:: @ 84B3438 - .incbin "graphics/map_objects/pics/people/woman_1/5.4bpp" - - .align 2 -gFieldObjectPic_Woman1_6:: @ 84B3538 - .incbin "graphics/map_objects/pics/people/woman_1/6.4bpp" - - .align 2 -gFieldObjectPic_Woman1_7:: @ 84B3638 - .incbin "graphics/map_objects/pics/people/woman_1/7.4bpp" - - .align 2 -gFieldObjectPic_Woman1_8:: @ 84B3738 - .incbin "graphics/map_objects/pics/people/woman_1/8.4bpp" - - .align 2 -gFieldObjectPic_FatMan_0:: @ 84B3838 - .incbin "graphics/map_objects/pics/people/fat_man/0.4bpp" - - .align 2 -gFieldObjectPic_FatMan_1:: @ 84B3938 - .incbin "graphics/map_objects/pics/people/fat_man/1.4bpp" - - .align 2 -gFieldObjectPic_FatMan_2:: @ 84B3A38 - .incbin "graphics/map_objects/pics/people/fat_man/2.4bpp" - - .align 2 -gFieldObjectPic_FatMan_3:: @ 84B3B38 - .incbin "graphics/map_objects/pics/people/fat_man/3.4bpp" - - .align 2 -gFieldObjectPic_FatMan_4:: @ 84B3C38 - .incbin "graphics/map_objects/pics/people/fat_man/4.4bpp" - - .align 2 -gFieldObjectPic_FatMan_5:: @ 84B3D38 - .incbin "graphics/map_objects/pics/people/fat_man/5.4bpp" - - .align 2 -gFieldObjectPic_FatMan_6:: @ 84B3E38 - .incbin "graphics/map_objects/pics/people/fat_man/6.4bpp" - - .align 2 -gFieldObjectPic_FatMan_7:: @ 84B3F38 - .incbin "graphics/map_objects/pics/people/fat_man/7.4bpp" - - .align 2 -gFieldObjectPic_FatMan_8:: @ 84B4038 - .incbin "graphics/map_objects/pics/people/fat_man/8.4bpp" - - .align 2 -gFieldObjectPic_Woman2_0:: @ 84B4138 - .incbin "graphics/map_objects/pics/people/woman_2/0.4bpp" - - .align 2 -gFieldObjectPic_Woman2_1:: @ 84B4238 - .incbin "graphics/map_objects/pics/people/woman_2/1.4bpp" - - .align 2 -gFieldObjectPic_Woman2_2:: @ 84B4338 - .incbin "graphics/map_objects/pics/people/woman_2/2.4bpp" - - .align 2 -gFieldObjectPic_Woman2_3:: @ 84B4438 - .incbin "graphics/map_objects/pics/people/woman_2/3.4bpp" - - .align 2 -gFieldObjectPic_Woman2_4:: @ 84B4538 - .incbin "graphics/map_objects/pics/people/woman_2/4.4bpp" - - .align 2 -gFieldObjectPic_Woman2_5:: @ 84B4638 - .incbin "graphics/map_objects/pics/people/woman_2/5.4bpp" - - .align 2 -gFieldObjectPic_Woman2_6:: @ 84B4738 - .incbin "graphics/map_objects/pics/people/woman_2/6.4bpp" - - .align 2 -gFieldObjectPic_Woman2_7:: @ 84B4838 - .incbin "graphics/map_objects/pics/people/woman_2/7.4bpp" - - .align 2 -gFieldObjectPic_Woman2_8:: @ 84B4938 - .incbin "graphics/map_objects/pics/people/woman_2/8.4bpp" - - .align 2 -gFieldObjectPic_Man1_0:: @ 84B4A38 - .incbin "graphics/map_objects/pics/people/man_1/0.4bpp" - - .align 2 -gFieldObjectPic_Man1_1:: @ 84B4B38 - .incbin "graphics/map_objects/pics/people/man_1/1.4bpp" - - .align 2 -gFieldObjectPic_Man1_2:: @ 84B4C38 - .incbin "graphics/map_objects/pics/people/man_1/2.4bpp" - - .align 2 -gFieldObjectPic_Man1_3:: @ 84B4D38 - .incbin "graphics/map_objects/pics/people/man_1/3.4bpp" - - .align 2 -gFieldObjectPic_Man1_4:: @ 84B4E38 - .incbin "graphics/map_objects/pics/people/man_1/4.4bpp" - - .align 2 -gFieldObjectPic_Man1_5:: @ 84B4F38 - .incbin "graphics/map_objects/pics/people/man_1/5.4bpp" - - .align 2 -gFieldObjectPic_Man1_6:: @ 84B5038 - .incbin "graphics/map_objects/pics/people/man_1/6.4bpp" - - .align 2 -gFieldObjectPic_Man1_7:: @ 84B5138 - .incbin "graphics/map_objects/pics/people/man_1/7.4bpp" - - .align 2 -gFieldObjectPic_Man1_8:: @ 84B5238 - .incbin "graphics/map_objects/pics/people/man_1/8.4bpp" - - .align 2 -gFieldObjectPic_Woman3_0:: @ 84B5338 - .incbin "graphics/map_objects/pics/people/woman_3/0.4bpp" - - .align 2 -gFieldObjectPic_Woman3_1:: @ 84B5438 - .incbin "graphics/map_objects/pics/people/woman_3/1.4bpp" - - .align 2 -gFieldObjectPic_Woman3_2:: @ 84B5538 - .incbin "graphics/map_objects/pics/people/woman_3/2.4bpp" - - .align 2 -gFieldObjectPic_Woman3_3:: @ 84B5638 - .incbin "graphics/map_objects/pics/people/woman_3/3.4bpp" - - .align 2 -gFieldObjectPic_Woman3_4:: @ 84B5738 - .incbin "graphics/map_objects/pics/people/woman_3/4.4bpp" - - .align 2 -gFieldObjectPic_Woman3_5:: @ 84B5838 - .incbin "graphics/map_objects/pics/people/woman_3/5.4bpp" - - .align 2 -gFieldObjectPic_Woman3_6:: @ 84B5938 - .incbin "graphics/map_objects/pics/people/woman_3/6.4bpp" - - .align 2 -gFieldObjectPic_Woman3_7:: @ 84B5A38 - .incbin "graphics/map_objects/pics/people/woman_3/7.4bpp" - - .align 2 -gFieldObjectPic_Woman3_8:: @ 84B5B38 - .incbin "graphics/map_objects/pics/people/woman_3/8.4bpp" - - .align 2 -gFieldObjectPic_OldMan1_0:: @ 84B5C38 - .incbin "graphics/map_objects/pics/people/old_man_1/0.4bpp" - - .align 2 -gFieldObjectPic_OldMan1_1:: @ 84B5D38 - .incbin "graphics/map_objects/pics/people/old_man_1/1.4bpp" - - .align 2 -gFieldObjectPic_OldMan1_2:: @ 84B5E38 - .incbin "graphics/map_objects/pics/people/old_man_1/2.4bpp" - - .align 2 -gFieldObjectPic_OldMan1_3:: @ 84B5F38 - .incbin "graphics/map_objects/pics/people/old_man_1/3.4bpp" - - .align 2 -gFieldObjectPic_OldMan1_4:: @ 84B6038 - .incbin "graphics/map_objects/pics/people/old_man_1/4.4bpp" - - .align 2 -gFieldObjectPic_OldMan1_5:: @ 84B6138 - .incbin "graphics/map_objects/pics/people/old_man_1/5.4bpp" - - .align 2 -gFieldObjectPic_OldMan1_6:: @ 84B6238 - .incbin "graphics/map_objects/pics/people/old_man_1/6.4bpp" - - .align 2 -gFieldObjectPic_OldMan1_7:: @ 84B6338 - .incbin "graphics/map_objects/pics/people/old_man_1/7.4bpp" - - .align 2 -gFieldObjectPic_OldMan1_8:: @ 84B6438 - .incbin "graphics/map_objects/pics/people/old_man_1/8.4bpp" - - .align 2 -gFieldObjectPic_OldWoman1_0:: @ 84B6538 - .incbin "graphics/map_objects/pics/people/old_woman_1/0.4bpp" - - .align 2 -gFieldObjectPic_OldWoman1_1:: @ 84B6638 - .incbin "graphics/map_objects/pics/people/old_woman_1/1.4bpp" - - .align 2 -gFieldObjectPic_OldWoman1_2:: @ 84B6738 - .incbin "graphics/map_objects/pics/people/old_woman_1/2.4bpp" - - .align 2 -gFieldObjectPic_OldWoman1_3:: @ 84B6838 - .incbin "graphics/map_objects/pics/people/old_woman_1/3.4bpp" - - .align 2 -gFieldObjectPic_OldWoman1_4:: @ 84B6938 - .incbin "graphics/map_objects/pics/people/old_woman_1/4.4bpp" - - .align 2 -gFieldObjectPic_OldWoman1_5:: @ 84B6A38 - .incbin "graphics/map_objects/pics/people/old_woman_1/5.4bpp" - - .align 2 -gFieldObjectPic_OldWoman1_6:: @ 84B6B38 - .incbin "graphics/map_objects/pics/people/old_woman_1/6.4bpp" - - .align 2 -gFieldObjectPic_OldWoman1_7:: @ 84B6C38 - .incbin "graphics/map_objects/pics/people/old_woman_1/7.4bpp" - - .align 2 -gFieldObjectPic_OldWoman1_8:: @ 84B6D38 - .incbin "graphics/map_objects/pics/people/old_woman_1/8.4bpp" - - .align 2 -gFieldObjectPic_Man2_0:: @ 84B6E38 - .incbin "graphics/map_objects/pics/people/man_2/0.4bpp" - - .align 2 -gFieldObjectPic_Man2_1:: @ 84B6F38 - .incbin "graphics/map_objects/pics/people/man_2/1.4bpp" - - .align 2 -gFieldObjectPic_Man2_2:: @ 84B7038 - .incbin "graphics/map_objects/pics/people/man_2/2.4bpp" - - .align 2 -gFieldObjectPic_Man2_3:: @ 84B7138 - .incbin "graphics/map_objects/pics/people/man_2/3.4bpp" - - .align 2 -gFieldObjectPic_Man2_4:: @ 84B7238 - .incbin "graphics/map_objects/pics/people/man_2/4.4bpp" - - .align 2 -gFieldObjectPic_Man2_5:: @ 84B7338 - .incbin "graphics/map_objects/pics/people/man_2/5.4bpp" - - .align 2 -gFieldObjectPic_Man2_6:: @ 84B7438 - .incbin "graphics/map_objects/pics/people/man_2/6.4bpp" - - .align 2 -gFieldObjectPic_Man2_7:: @ 84B7538 - .incbin "graphics/map_objects/pics/people/man_2/7.4bpp" - - .align 2 -gFieldObjectPic_Man2_8:: @ 84B7638 - .incbin "graphics/map_objects/pics/people/man_2/8.4bpp" - - .align 2 -gFieldObjectPic_Woman4_0:: @ 84B7738 - .incbin "graphics/map_objects/pics/people/woman_4/0.4bpp" - - .align 2 -gFieldObjectPic_Woman4_1:: @ 84B7838 - .incbin "graphics/map_objects/pics/people/woman_4/1.4bpp" - - .align 2 -gFieldObjectPic_Woman4_2:: @ 84B7938 - .incbin "graphics/map_objects/pics/people/woman_4/2.4bpp" - - .align 2 -gFieldObjectPic_Woman4_3:: @ 84B7A38 - .incbin "graphics/map_objects/pics/people/woman_4/3.4bpp" - - .align 2 -gFieldObjectPic_Woman4_4:: @ 84B7B38 - .incbin "graphics/map_objects/pics/people/woman_4/4.4bpp" - - .align 2 -gFieldObjectPic_Woman4_5:: @ 84B7C38 - .incbin "graphics/map_objects/pics/people/woman_4/5.4bpp" - - .align 2 -gFieldObjectPic_Woman4_6:: @ 84B7D38 - .incbin "graphics/map_objects/pics/people/woman_4/6.4bpp" - - .align 2 -gFieldObjectPic_Woman4_7:: @ 84B7E38 - .incbin "graphics/map_objects/pics/people/woman_4/7.4bpp" - - .align 2 -gFieldObjectPic_Woman4_8:: @ 84B7F38 - .incbin "graphics/map_objects/pics/people/woman_4/8.4bpp" - - .align 2 -gFieldObjectPic_Man3_0:: @ 84B8038 - .incbin "graphics/map_objects/pics/people/man_3/0.4bpp" - - .align 2 -gFieldObjectPic_Man3_1:: @ 84B8138 - .incbin "graphics/map_objects/pics/people/man_3/1.4bpp" - - .align 2 -gFieldObjectPic_Man3_2:: @ 84B8238 - .incbin "graphics/map_objects/pics/people/man_3/2.4bpp" - - .align 2 -gFieldObjectPic_Man3_3:: @ 84B8338 - .incbin "graphics/map_objects/pics/people/man_3/3.4bpp" - - .align 2 -gFieldObjectPic_Man3_4:: @ 84B8438 - .incbin "graphics/map_objects/pics/people/man_3/4.4bpp" - - .align 2 -gFieldObjectPic_Man3_5:: @ 84B8538 - .incbin "graphics/map_objects/pics/people/man_3/5.4bpp" - - .align 2 -gFieldObjectPic_Man3_6:: @ 84B8638 - .incbin "graphics/map_objects/pics/people/man_3/6.4bpp" - - .align 2 -gFieldObjectPic_Man3_7:: @ 84B8738 - .incbin "graphics/map_objects/pics/people/man_3/7.4bpp" - - .align 2 -gFieldObjectPic_Man3_8:: @ 84B8838 - .incbin "graphics/map_objects/pics/people/man_3/8.4bpp" - - .align 2 -gFieldObjectPic_Woman5_0:: @ 84B8938 - .incbin "graphics/map_objects/pics/people/woman_5/0.4bpp" - - .align 2 -gFieldObjectPic_Woman5_1:: @ 84B8A38 - .incbin "graphics/map_objects/pics/people/woman_5/1.4bpp" - - .align 2 -gFieldObjectPic_Woman5_2:: @ 84B8B38 - .incbin "graphics/map_objects/pics/people/woman_5/2.4bpp" - - .align 2 -gFieldObjectPic_Woman5_3:: @ 84B8C38 - .incbin "graphics/map_objects/pics/people/woman_5/3.4bpp" - - .align 2 -gFieldObjectPic_Woman5_4:: @ 84B8D38 - .incbin "graphics/map_objects/pics/people/woman_5/4.4bpp" - - .align 2 -gFieldObjectPic_Woman5_5:: @ 84B8E38 - .incbin "graphics/map_objects/pics/people/woman_5/5.4bpp" - - .align 2 -gFieldObjectPic_Woman5_6:: @ 84B8F38 - .incbin "graphics/map_objects/pics/people/woman_5/6.4bpp" - - .align 2 -gFieldObjectPic_Woman5_7:: @ 84B9038 - .incbin "graphics/map_objects/pics/people/woman_5/7.4bpp" - - .align 2 -gFieldObjectPic_Woman5_8:: @ 84B9138 - .incbin "graphics/map_objects/pics/people/woman_5/8.4bpp" - - .align 2 -gFieldObjectPic_Cook_0:: @ 84B9238 - .incbin "graphics/map_objects/pics/people/cook/0.4bpp" - - .align 2 -gFieldObjectPic_Cook_1:: @ 84B9338 - .incbin "graphics/map_objects/pics/people/cook/1.4bpp" - - .align 2 -gFieldObjectPic_Cook_2:: @ 84B9438 - .incbin "graphics/map_objects/pics/people/cook/2.4bpp" - - .align 2 -gFieldObjectPic_Woman6_0:: @ 84B9538 - .incbin "graphics/map_objects/pics/people/woman_6/0.4bpp" - - .align 2 -gFieldObjectPic_Woman6_1:: @ 84B9638 - .incbin "graphics/map_objects/pics/people/woman_6/1.4bpp" - - .align 2 -gFieldObjectPic_Woman6_2:: @ 84B9738 - .incbin "graphics/map_objects/pics/people/woman_6/2.4bpp" - - .align 2 -gFieldObjectPic_Woman6_3:: @ 84B9838 - .incbin "graphics/map_objects/pics/people/woman_6/3.4bpp" - - .align 2 -gFieldObjectPic_Woman6_4:: @ 84B9938 - .incbin "graphics/map_objects/pics/people/woman_6/4.4bpp" - - .align 2 -gFieldObjectPic_Woman6_5:: @ 84B9A38 - .incbin "graphics/map_objects/pics/people/woman_6/5.4bpp" - - .align 2 -gFieldObjectPic_Woman6_6:: @ 84B9B38 - .incbin "graphics/map_objects/pics/people/woman_6/6.4bpp" - - .align 2 -gFieldObjectPic_Woman6_7:: @ 84B9C38 - .incbin "graphics/map_objects/pics/people/woman_6/7.4bpp" - - .align 2 -gFieldObjectPic_Woman6_8:: @ 84B9D38 - .incbin "graphics/map_objects/pics/people/woman_6/8.4bpp" - - .align 2 -gFieldObjectPic_OldMan2_0:: @ 84B9E38 - .incbin "graphics/map_objects/pics/people/old_man_2/0.4bpp" - - .align 2 -gFieldObjectPic_OldMan2_1:: @ 84B9F38 - .incbin "graphics/map_objects/pics/people/old_man_2/1.4bpp" - - .align 2 -gFieldObjectPic_OldMan2_2:: @ 84BA038 - .incbin "graphics/map_objects/pics/people/old_man_2/2.4bpp" - - .align 2 -gFieldObjectPic_OldWoman2_0:: @ 84BA138 - .incbin "graphics/map_objects/pics/people/old_woman_2/0.4bpp" - - .align 2 -gFieldObjectPic_OldWoman2_1:: @ 84BA238 - .incbin "graphics/map_objects/pics/people/old_woman_2/1.4bpp" - - .align 2 -gFieldObjectPic_OldWoman2_2:: @ 84BA338 - .incbin "graphics/map_objects/pics/people/old_woman_2/2.4bpp" - - .align 2 -gFieldObjectPic_OldWoman2_3:: @ 84BA438 - .incbin "graphics/map_objects/pics/people/old_woman_2/3.4bpp" - - .align 2 -gFieldObjectPic_OldWoman2_4:: @ 84BA538 - .incbin "graphics/map_objects/pics/people/old_woman_2/4.4bpp" - - .align 2 -gFieldObjectPic_OldWoman2_5:: @ 84BA638 - .incbin "graphics/map_objects/pics/people/old_woman_2/5.4bpp" - - .align 2 -gFieldObjectPic_OldWoman2_6:: @ 84BA738 - .incbin "graphics/map_objects/pics/people/old_woman_2/6.4bpp" - - .align 2 -gFieldObjectPic_OldWoman2_7:: @ 84BA838 - .incbin "graphics/map_objects/pics/people/old_woman_2/7.4bpp" - - .align 2 -gFieldObjectPic_OldWoman2_8:: @ 84BA938 - .incbin "graphics/map_objects/pics/people/old_woman_2/8.4bpp" - - .align 2 -gFieldObjectPic_Camper_0:: @ 84BAA38 - .incbin "graphics/map_objects/pics/people/camper/0.4bpp" - - .align 2 -gFieldObjectPic_Camper_1:: @ 84BAB38 - .incbin "graphics/map_objects/pics/people/camper/1.4bpp" - - .align 2 -gFieldObjectPic_Camper_2:: @ 84BAC38 - .incbin "graphics/map_objects/pics/people/camper/2.4bpp" - - .align 2 -gFieldObjectPic_Camper_3:: @ 84BAD38 - .incbin "graphics/map_objects/pics/people/camper/3.4bpp" - - .align 2 -gFieldObjectPic_Camper_4:: @ 84BAE38 - .incbin "graphics/map_objects/pics/people/camper/4.4bpp" - - .align 2 -gFieldObjectPic_Camper_5:: @ 84BAF38 - .incbin "graphics/map_objects/pics/people/camper/5.4bpp" - - .align 2 -gFieldObjectPic_Camper_6:: @ 84BB038 - .incbin "graphics/map_objects/pics/people/camper/6.4bpp" - - .align 2 -gFieldObjectPic_Camper_7:: @ 84BB138 - .incbin "graphics/map_objects/pics/people/camper/7.4bpp" - - .align 2 -gFieldObjectPic_Camper_8:: @ 84BB238 - .incbin "graphics/map_objects/pics/people/camper/8.4bpp" - - .align 2 -gFieldObjectPic_Picnicker_0:: @ 84BB338 - .incbin "graphics/map_objects/pics/people/picnicker/0.4bpp" - - .align 2 -gFieldObjectPic_Picnicker_1:: @ 84BB438 - .incbin "graphics/map_objects/pics/people/picnicker/1.4bpp" - - .align 2 -gFieldObjectPic_Picnicker_2:: @ 84BB538 - .incbin "graphics/map_objects/pics/people/picnicker/2.4bpp" - - .align 2 -gFieldObjectPic_Picnicker_3:: @ 84BB638 - .incbin "graphics/map_objects/pics/people/picnicker/3.4bpp" - - .align 2 -gFieldObjectPic_Picnicker_4:: @ 84BB738 - .incbin "graphics/map_objects/pics/people/picnicker/4.4bpp" - - .align 2 -gFieldObjectPic_Picnicker_5:: @ 84BB838 - .incbin "graphics/map_objects/pics/people/picnicker/5.4bpp" - - .align 2 -gFieldObjectPic_Picnicker_6:: @ 84BB938 - .incbin "graphics/map_objects/pics/people/picnicker/6.4bpp" - - .align 2 -gFieldObjectPic_Picnicker_7:: @ 84BBA38 - .incbin "graphics/map_objects/pics/people/picnicker/7.4bpp" - - .align 2 -gFieldObjectPic_Picnicker_8:: @ 84BBB38 - .incbin "graphics/map_objects/pics/people/picnicker/8.4bpp" - - .align 2 -gFieldObjectPic_Man4_0:: @ 84BBC38 - .incbin "graphics/map_objects/pics/people/man_4/0.4bpp" - - .align 2 -gFieldObjectPic_Man4_1:: @ 84BBD38 - .incbin "graphics/map_objects/pics/people/man_4/1.4bpp" - - .align 2 -gFieldObjectPic_Man4_2:: @ 84BBE38 - .incbin "graphics/map_objects/pics/people/man_4/2.4bpp" - - .align 2 -gFieldObjectPic_Man4_3:: @ 84BBF38 - .incbin "graphics/map_objects/pics/people/man_4/3.4bpp" - - .align 2 -gFieldObjectPic_Man4_4:: @ 84BC038 - .incbin "graphics/map_objects/pics/people/man_4/4.4bpp" - - .align 2 -gFieldObjectPic_Man4_5:: @ 84BC138 - .incbin "graphics/map_objects/pics/people/man_4/5.4bpp" - - .align 2 -gFieldObjectPic_Man4_6:: @ 84BC238 - .incbin "graphics/map_objects/pics/people/man_4/6.4bpp" - - .align 2 -gFieldObjectPic_Man4_7:: @ 84BC338 - .incbin "graphics/map_objects/pics/people/man_4/7.4bpp" - - .align 2 -gFieldObjectPic_Man4_8:: @ 84BC438 - .incbin "graphics/map_objects/pics/people/man_4/8.4bpp" - - .align 2 -gFieldObjectPic_Woman7_0:: @ 84BC538 - .incbin "graphics/map_objects/pics/people/woman_7/0.4bpp" - - .align 2 -gFieldObjectPic_Woman7_1:: @ 84BC638 - .incbin "graphics/map_objects/pics/people/woman_7/1.4bpp" - - .align 2 -gFieldObjectPic_Woman7_2:: @ 84BC738 - .incbin "graphics/map_objects/pics/people/woman_7/2.4bpp" - - .align 2 -gFieldObjectPic_Woman7_3:: @ 84BC838 - .incbin "graphics/map_objects/pics/people/woman_7/3.4bpp" - - .align 2 -gFieldObjectPic_Woman7_4:: @ 84BC938 - .incbin "graphics/map_objects/pics/people/woman_7/4.4bpp" - - .align 2 -gFieldObjectPic_Woman7_5:: @ 84BCA38 - .incbin "graphics/map_objects/pics/people/woman_7/5.4bpp" - - .align 2 -gFieldObjectPic_Woman7_6:: @ 84BCB38 - .incbin "graphics/map_objects/pics/people/woman_7/6.4bpp" - - .align 2 -gFieldObjectPic_Woman7_7:: @ 84BCC38 - .incbin "graphics/map_objects/pics/people/woman_7/7.4bpp" - - .align 2 -gFieldObjectPic_Woman7_8:: @ 84BCD38 - .incbin "graphics/map_objects/pics/people/woman_7/8.4bpp" - - .align 2 -gFieldObjectPic_Youngster_0:: @ 84BCE38 - .incbin "graphics/map_objects/pics/people/youngster/0.4bpp" - - .align 2 -gFieldObjectPic_Youngster_1:: @ 84BCF38 - .incbin "graphics/map_objects/pics/people/youngster/1.4bpp" - - .align 2 -gFieldObjectPic_Youngster_2:: @ 84BD038 - .incbin "graphics/map_objects/pics/people/youngster/2.4bpp" - - .align 2 -gFieldObjectPic_Youngster_3:: @ 84BD138 - .incbin "graphics/map_objects/pics/people/youngster/3.4bpp" - - .align 2 -gFieldObjectPic_Youngster_4:: @ 84BD238 - .incbin "graphics/map_objects/pics/people/youngster/4.4bpp" - - .align 2 -gFieldObjectPic_Youngster_5:: @ 84BD338 - .incbin "graphics/map_objects/pics/people/youngster/5.4bpp" - - .align 2 -gFieldObjectPic_Youngster_6:: @ 84BD438 - .incbin "graphics/map_objects/pics/people/youngster/6.4bpp" - - .align 2 -gFieldObjectPic_Youngster_7:: @ 84BD538 - .incbin "graphics/map_objects/pics/people/youngster/7.4bpp" - - .align 2 -gFieldObjectPic_Youngster_8:: @ 84BD638 - .incbin "graphics/map_objects/pics/people/youngster/8.4bpp" - - .align 2 -gFieldObjectPic_BugCatcher_0:: @ 84BD738 - .incbin "graphics/map_objects/pics/people/bug_catcher/0.4bpp" - - .align 2 -gFieldObjectPic_BugCatcher_1:: @ 84BD838 - .incbin "graphics/map_objects/pics/people/bug_catcher/1.4bpp" - - .align 2 -gFieldObjectPic_BugCatcher_2:: @ 84BD938 - .incbin "graphics/map_objects/pics/people/bug_catcher/2.4bpp" - - .align 2 -gFieldObjectPic_BugCatcher_3:: @ 84BDA38 - .incbin "graphics/map_objects/pics/people/bug_catcher/3.4bpp" - - .align 2 -gFieldObjectPic_BugCatcher_4:: @ 84BDB38 - .incbin "graphics/map_objects/pics/people/bug_catcher/4.4bpp" - - .align 2 -gFieldObjectPic_BugCatcher_5:: @ 84BDC38 - .incbin "graphics/map_objects/pics/people/bug_catcher/5.4bpp" - - .align 2 -gFieldObjectPic_BugCatcher_6:: @ 84BDD38 - .incbin "graphics/map_objects/pics/people/bug_catcher/6.4bpp" - - .align 2 -gFieldObjectPic_BugCatcher_7:: @ 84BDE38 - .incbin "graphics/map_objects/pics/people/bug_catcher/7.4bpp" - - .align 2 -gFieldObjectPic_BugCatcher_8:: @ 84BDF38 - .incbin "graphics/map_objects/pics/people/bug_catcher/8.4bpp" - - .align 2 -gFieldObjectPic_PsychicM_0:: @ 84BE038 - .incbin "graphics/map_objects/pics/people/psychic_m/0.4bpp" - - .align 2 -gFieldObjectPic_PsychicM_1:: @ 84BE138 - .incbin "graphics/map_objects/pics/people/psychic_m/1.4bpp" - - .align 2 -gFieldObjectPic_PsychicM_2:: @ 84BE238 - .incbin "graphics/map_objects/pics/people/psychic_m/2.4bpp" - - .align 2 -gFieldObjectPic_PsychicM_3:: @ 84BE338 - .incbin "graphics/map_objects/pics/people/psychic_m/3.4bpp" - - .align 2 -gFieldObjectPic_PsychicM_4:: @ 84BE438 - .incbin "graphics/map_objects/pics/people/psychic_m/4.4bpp" - - .align 2 -gFieldObjectPic_PsychicM_5:: @ 84BE538 - .incbin "graphics/map_objects/pics/people/psychic_m/5.4bpp" - - .align 2 -gFieldObjectPic_PsychicM_6:: @ 84BE638 - .incbin "graphics/map_objects/pics/people/psychic_m/6.4bpp" - - .align 2 -gFieldObjectPic_PsychicM_7:: @ 84BE738 - .incbin "graphics/map_objects/pics/people/psychic_m/7.4bpp" - - .align 2 -gFieldObjectPic_PsychicM_8:: @ 84BE838 - .incbin "graphics/map_objects/pics/people/psychic_m/8.4bpp" - - .align 2 -gFieldObjectPic_SchoolKidM_0:: @ 84BE938 - .incbin "graphics/map_objects/pics/people/school_kid_m/0.4bpp" - - .align 2 -gFieldObjectPic_SchoolKidM_1:: @ 84BEA38 - .incbin "graphics/map_objects/pics/people/school_kid_m/1.4bpp" - - .align 2 -gFieldObjectPic_SchoolKidM_2:: @ 84BEB38 - .incbin "graphics/map_objects/pics/people/school_kid_m/2.4bpp" - - .align 2 -gFieldObjectPic_SchoolKidM_3:: @ 84BEC38 - .incbin "graphics/map_objects/pics/people/school_kid_m/3.4bpp" - - .align 2 -gFieldObjectPic_SchoolKidM_4:: @ 84BED38 - .incbin "graphics/map_objects/pics/people/school_kid_m/4.4bpp" - - .align 2 -gFieldObjectPic_SchoolKidM_5:: @ 84BEE38 - .incbin "graphics/map_objects/pics/people/school_kid_m/5.4bpp" - - .align 2 -gFieldObjectPic_SchoolKidM_6:: @ 84BEF38 - .incbin "graphics/map_objects/pics/people/school_kid_m/6.4bpp" - - .align 2 -gFieldObjectPic_SchoolKidM_7:: @ 84BF038 - .incbin "graphics/map_objects/pics/people/school_kid_m/7.4bpp" - - .align 2 -gFieldObjectPic_SchoolKidM_8:: @ 84BF138 - .incbin "graphics/map_objects/pics/people/school_kid_m/8.4bpp" - - .align 2 -gFieldObjectPic_Maniac_0:: @ 84BF238 - .incbin "graphics/map_objects/pics/people/maniac/0.4bpp" - - .align 2 -gFieldObjectPic_Maniac_1:: @ 84BF338 - .incbin "graphics/map_objects/pics/people/maniac/1.4bpp" - - .align 2 -gFieldObjectPic_Maniac_2:: @ 84BF438 - .incbin "graphics/map_objects/pics/people/maniac/2.4bpp" - - .align 2 -gFieldObjectPic_Maniac_3:: @ 84BF538 - .incbin "graphics/map_objects/pics/people/maniac/3.4bpp" - - .align 2 -gFieldObjectPic_Maniac_4:: @ 84BF638 - .incbin "graphics/map_objects/pics/people/maniac/4.4bpp" - - .align 2 -gFieldObjectPic_Maniac_5:: @ 84BF738 - .incbin "graphics/map_objects/pics/people/maniac/5.4bpp" - - .align 2 -gFieldObjectPic_Maniac_6:: @ 84BF838 - .incbin "graphics/map_objects/pics/people/maniac/6.4bpp" - - .align 2 -gFieldObjectPic_Maniac_7:: @ 84BF938 - .incbin "graphics/map_objects/pics/people/maniac/7.4bpp" - - .align 2 -gFieldObjectPic_Maniac_8:: @ 84BFA38 - .incbin "graphics/map_objects/pics/people/maniac/8.4bpp" - - .align 2 -gFieldObjectPic_HexManiac_0:: @ 84BFB38 - .incbin "graphics/map_objects/pics/people/hex_maniac/0.4bpp" - - .align 2 -gFieldObjectPic_HexManiac_1:: @ 84BFC38 - .incbin "graphics/map_objects/pics/people/hex_maniac/1.4bpp" - - .align 2 -gFieldObjectPic_HexManiac_2:: @ 84BFD38 - .incbin "graphics/map_objects/pics/people/hex_maniac/2.4bpp" - - .align 2 -gFieldObjectPic_HexManiac_3:: @ 84BFE38 - .incbin "graphics/map_objects/pics/people/hex_maniac/3.4bpp" - - .align 2 -gFieldObjectPic_HexManiac_4:: @ 84BFF38 - .incbin "graphics/map_objects/pics/people/hex_maniac/4.4bpp" - - .align 2 -gFieldObjectPic_HexManiac_5:: @ 84C0038 - .incbin "graphics/map_objects/pics/people/hex_maniac/5.4bpp" - - .align 2 -gFieldObjectPic_HexManiac_6:: @ 84C0138 - .incbin "graphics/map_objects/pics/people/hex_maniac/6.4bpp" - - .align 2 -gFieldObjectPic_HexManiac_7:: @ 84C0238 - .incbin "graphics/map_objects/pics/people/hex_maniac/7.4bpp" - - .align 2 -gFieldObjectPic_HexManiac_8:: @ 84C0338 - .incbin "graphics/map_objects/pics/people/hex_maniac/8.4bpp" - - .align 2 -gFieldObjectPic_UnusedWoman_0:: @ 84C0438 - .incbin "graphics/map_objects/pics/people/unused_woman/0.4bpp" - - .align 2 -gFieldObjectPic_UnusedWoman_1:: @ 84C0538 - .incbin "graphics/map_objects/pics/people/unused_woman/1.4bpp" - - .align 2 -gFieldObjectPic_UnusedWoman_2:: @ 84C0638 - .incbin "graphics/map_objects/pics/people/unused_woman/2.4bpp" - - .align 2 -gFieldObjectPic_UnusedWoman_3:: @ 84C0738 - .incbin "graphics/map_objects/pics/people/unused_woman/3.4bpp" - - .align 2 -gFieldObjectPic_UnusedWoman_4:: @ 84C0838 - .incbin "graphics/map_objects/pics/people/unused_woman/4.4bpp" - - .align 2 -gFieldObjectPic_UnusedWoman_5:: @ 84C0938 - .incbin "graphics/map_objects/pics/people/unused_woman/5.4bpp" - - .align 2 -gFieldObjectPic_UnusedWoman_6:: @ 84C0A38 - .incbin "graphics/map_objects/pics/people/unused_woman/6.4bpp" - - .align 2 -gFieldObjectPic_UnusedWoman_7:: @ 84C0B38 - .incbin "graphics/map_objects/pics/people/unused_woman/7.4bpp" - - .align 2 -gFieldObjectPic_UnusedWoman_8:: @ 84C0C38 - .incbin "graphics/map_objects/pics/people/unused_woman/8.4bpp" - - .align 2 -gFieldObjectPic_SwimmerM_0:: @ 84C0D38 - .incbin "graphics/map_objects/pics/people/swimmer_m/0.4bpp" - - .align 2 -gFieldObjectPic_SwimmerM_1:: @ 84C0E38 - .incbin "graphics/map_objects/pics/people/swimmer_m/1.4bpp" - - .align 2 -gFieldObjectPic_SwimmerM_2:: @ 84C0F38 - .incbin "graphics/map_objects/pics/people/swimmer_m/2.4bpp" - - .align 2 -gFieldObjectPic_SwimmerM_3:: @ 84C1038 - .incbin "graphics/map_objects/pics/people/swimmer_m/3.4bpp" - - .align 2 -gFieldObjectPic_SwimmerM_4:: @ 84C1138 - .incbin "graphics/map_objects/pics/people/swimmer_m/4.4bpp" - - .align 2 -gFieldObjectPic_SwimmerM_5:: @ 84C1238 - .incbin "graphics/map_objects/pics/people/swimmer_m/5.4bpp" - - .align 2 -gFieldObjectPic_SwimmerM_6:: @ 84C1338 - .incbin "graphics/map_objects/pics/people/swimmer_m/6.4bpp" - - .align 2 -gFieldObjectPic_SwimmerM_7:: @ 84C1438 - .incbin "graphics/map_objects/pics/people/swimmer_m/7.4bpp" - - .align 2 -gFieldObjectPic_SwimmerM_8:: @ 84C1538 - .incbin "graphics/map_objects/pics/people/swimmer_m/8.4bpp" - - .align 2 -gFieldObjectPic_SwimmerF_0:: @ 84C1638 - .incbin "graphics/map_objects/pics/people/swimmer_f/0.4bpp" - - .align 2 -gFieldObjectPic_SwimmerF_1:: @ 84C1738 - .incbin "graphics/map_objects/pics/people/swimmer_f/1.4bpp" - - .align 2 -gFieldObjectPic_SwimmerF_2:: @ 84C1838 - .incbin "graphics/map_objects/pics/people/swimmer_f/2.4bpp" - - .align 2 -gFieldObjectPic_SwimmerF_3:: @ 84C1938 - .incbin "graphics/map_objects/pics/people/swimmer_f/3.4bpp" - - .align 2 -gFieldObjectPic_SwimmerF_4:: @ 84C1A38 - .incbin "graphics/map_objects/pics/people/swimmer_f/4.4bpp" - - .align 2 -gFieldObjectPic_SwimmerF_5:: @ 84C1B38 - .incbin "graphics/map_objects/pics/people/swimmer_f/5.4bpp" - - .align 2 -gFieldObjectPic_SwimmerF_6:: @ 84C1C38 - .incbin "graphics/map_objects/pics/people/swimmer_f/6.4bpp" - - .align 2 -gFieldObjectPic_SwimmerF_7:: @ 84C1D38 - .incbin "graphics/map_objects/pics/people/swimmer_f/7.4bpp" - - .align 2 -gFieldObjectPic_SwimmerF_8:: @ 84C1E38 - .incbin "graphics/map_objects/pics/people/swimmer_f/8.4bpp" - - .align 2 -gFieldObjectPic_BlackBelt_0:: @ 84C1F38 - .incbin "graphics/map_objects/pics/people/black_belt/0.4bpp" - - .align 2 -gFieldObjectPic_BlackBelt_1:: @ 84C2038 - .incbin "graphics/map_objects/pics/people/black_belt/1.4bpp" - - .align 2 -gFieldObjectPic_BlackBelt_2:: @ 84C2138 - .incbin "graphics/map_objects/pics/people/black_belt/2.4bpp" - - .align 2 -gFieldObjectPic_BlackBelt_3:: @ 84C2238 - .incbin "graphics/map_objects/pics/people/black_belt/3.4bpp" - - .align 2 -gFieldObjectPic_BlackBelt_4:: @ 84C2338 - .incbin "graphics/map_objects/pics/people/black_belt/4.4bpp" - - .align 2 -gFieldObjectPic_BlackBelt_5:: @ 84C2438 - .incbin "graphics/map_objects/pics/people/black_belt/5.4bpp" - - .align 2 -gFieldObjectPic_BlackBelt_6:: @ 84C2538 - .incbin "graphics/map_objects/pics/people/black_belt/6.4bpp" - - .align 2 -gFieldObjectPic_BlackBelt_7:: @ 84C2638 - .incbin "graphics/map_objects/pics/people/black_belt/7.4bpp" - - .align 2 -gFieldObjectPic_BlackBelt_8:: @ 84C2738 - .incbin "graphics/map_objects/pics/people/black_belt/8.4bpp" - - .align 2 -gFieldObjectPic_Beauty_0:: @ 84C2838 - .incbin "graphics/map_objects/pics/people/beauty/0.4bpp" - - .align 2 -gFieldObjectPic_Beauty_1:: @ 84C2938 - .incbin "graphics/map_objects/pics/people/beauty/1.4bpp" - - .align 2 -gFieldObjectPic_Beauty_2:: @ 84C2A38 - .incbin "graphics/map_objects/pics/people/beauty/2.4bpp" - - .align 2 -gFieldObjectPic_Beauty_3:: @ 84C2B38 - .incbin "graphics/map_objects/pics/people/beauty/3.4bpp" - - .align 2 -gFieldObjectPic_Beauty_4:: @ 84C2C38 - .incbin "graphics/map_objects/pics/people/beauty/4.4bpp" - - .align 2 -gFieldObjectPic_Beauty_5:: @ 84C2D38 - .incbin "graphics/map_objects/pics/people/beauty/5.4bpp" - - .align 2 -gFieldObjectPic_Beauty_6:: @ 84C2E38 - .incbin "graphics/map_objects/pics/people/beauty/6.4bpp" - - .align 2 -gFieldObjectPic_Beauty_7:: @ 84C2F38 - .incbin "graphics/map_objects/pics/people/beauty/7.4bpp" - - .align 2 -gFieldObjectPic_Beauty_8:: @ 84C3038 - .incbin "graphics/map_objects/pics/people/beauty/8.4bpp" - - .align 2 -gFieldObjectPic_Scientist1_0:: @ 84C3138 - .incbin "graphics/map_objects/pics/people/scientist_1/0.4bpp" - - .align 2 -gFieldObjectPic_Scientist1_1:: @ 84C3238 - .incbin "graphics/map_objects/pics/people/scientist_1/1.4bpp" - - .align 2 -gFieldObjectPic_Scientist1_2:: @ 84C3338 - .incbin "graphics/map_objects/pics/people/scientist_1/2.4bpp" - - .align 2 -gFieldObjectPic_Scientist1_3:: @ 84C3438 - .incbin "graphics/map_objects/pics/people/scientist_1/3.4bpp" - - .align 2 -gFieldObjectPic_Scientist1_4:: @ 84C3538 - .incbin "graphics/map_objects/pics/people/scientist_1/4.4bpp" - - .align 2 -gFieldObjectPic_Scientist1_5:: @ 84C3638 - .incbin "graphics/map_objects/pics/people/scientist_1/5.4bpp" - - .align 2 -gFieldObjectPic_Scientist1_6:: @ 84C3738 - .incbin "graphics/map_objects/pics/people/scientist_1/6.4bpp" - - .align 2 -gFieldObjectPic_Scientist1_7:: @ 84C3838 - .incbin "graphics/map_objects/pics/people/scientist_1/7.4bpp" - - .align 2 -gFieldObjectPic_Scientist1_8:: @ 84C3938 - .incbin "graphics/map_objects/pics/people/scientist_1/8.4bpp" - - .align 2 -gFieldObjectPic_Lass_0:: @ 84C3A38 - .incbin "graphics/map_objects/pics/people/lass/0.4bpp" - - .align 2 -gFieldObjectPic_Lass_1:: @ 84C3B38 - .incbin "graphics/map_objects/pics/people/lass/1.4bpp" - - .align 2 -gFieldObjectPic_Lass_2:: @ 84C3C38 - .incbin "graphics/map_objects/pics/people/lass/2.4bpp" - - .align 2 -gFieldObjectPic_Lass_3:: @ 84C3D38 - .incbin "graphics/map_objects/pics/people/lass/3.4bpp" - - .align 2 -gFieldObjectPic_Lass_4:: @ 84C3E38 - .incbin "graphics/map_objects/pics/people/lass/4.4bpp" - - .align 2 -gFieldObjectPic_Lass_5:: @ 84C3F38 - .incbin "graphics/map_objects/pics/people/lass/5.4bpp" - - .align 2 -gFieldObjectPic_Lass_6:: @ 84C4038 - .incbin "graphics/map_objects/pics/people/lass/6.4bpp" - - .align 2 -gFieldObjectPic_Lass_7:: @ 84C4138 - .incbin "graphics/map_objects/pics/people/lass/7.4bpp" - - .align 2 -gFieldObjectPic_Lass_8:: @ 84C4238 - .incbin "graphics/map_objects/pics/people/lass/8.4bpp" - - .align 2 -gFieldObjectPic_Gentleman_0:: @ 84C4338 - .incbin "graphics/map_objects/pics/people/gentleman/0.4bpp" - - .align 2 -gFieldObjectPic_Gentleman_1:: @ 84C4438 - .incbin "graphics/map_objects/pics/people/gentleman/1.4bpp" - - .align 2 -gFieldObjectPic_Gentleman_2:: @ 84C4538 - .incbin "graphics/map_objects/pics/people/gentleman/2.4bpp" - - .align 2 -gFieldObjectPic_Gentleman_3:: @ 84C4638 - .incbin "graphics/map_objects/pics/people/gentleman/3.4bpp" - - .align 2 -gFieldObjectPic_Gentleman_4:: @ 84C4738 - .incbin "graphics/map_objects/pics/people/gentleman/4.4bpp" - - .align 2 -gFieldObjectPic_Gentleman_5:: @ 84C4838 - .incbin "graphics/map_objects/pics/people/gentleman/5.4bpp" - - .align 2 -gFieldObjectPic_Gentleman_6:: @ 84C4938 - .incbin "graphics/map_objects/pics/people/gentleman/6.4bpp" - - .align 2 -gFieldObjectPic_Gentleman_7:: @ 84C4A38 - .incbin "graphics/map_objects/pics/people/gentleman/7.4bpp" - - .align 2 -gFieldObjectPic_Gentleman_8:: @ 84C4B38 - .incbin "graphics/map_objects/pics/people/gentleman/8.4bpp" - - .align 2 -gFieldObjectPic_Sailor_0:: @ 84C4C38 - .incbin "graphics/map_objects/pics/people/sailor/0.4bpp" - - .align 2 -gFieldObjectPic_Sailor_1:: @ 84C4D38 - .incbin "graphics/map_objects/pics/people/sailor/1.4bpp" - - .align 2 -gFieldObjectPic_Sailor_2:: @ 84C4E38 - .incbin "graphics/map_objects/pics/people/sailor/2.4bpp" - - .align 2 -gFieldObjectPic_Sailor_3:: @ 84C4F38 - .incbin "graphics/map_objects/pics/people/sailor/3.4bpp" - - .align 2 -gFieldObjectPic_Sailor_4:: @ 84C5038 - .incbin "graphics/map_objects/pics/people/sailor/4.4bpp" - - .align 2 -gFieldObjectPic_Sailor_5:: @ 84C5138 - .incbin "graphics/map_objects/pics/people/sailor/5.4bpp" - - .align 2 -gFieldObjectPic_Sailor_6:: @ 84C5238 - .incbin "graphics/map_objects/pics/people/sailor/6.4bpp" - - .align 2 -gFieldObjectPic_Sailor_7:: @ 84C5338 - .incbin "graphics/map_objects/pics/people/sailor/7.4bpp" - - .align 2 -gFieldObjectPic_Sailor_8:: @ 84C5438 - .incbin "graphics/map_objects/pics/people/sailor/8.4bpp" - - .align 2 -gFieldObjectPic_Fisherman_0:: @ 84C5538 - .incbin "graphics/map_objects/pics/people/fisherman/0.4bpp" - - .align 2 -gFieldObjectPic_Fisherman_1:: @ 84C5638 - .incbin "graphics/map_objects/pics/people/fisherman/1.4bpp" - - .align 2 -gFieldObjectPic_Fisherman_2:: @ 84C5738 - .incbin "graphics/map_objects/pics/people/fisherman/2.4bpp" - - .align 2 -gFieldObjectPic_Fisherman_3:: @ 84C5838 - .incbin "graphics/map_objects/pics/people/fisherman/3.4bpp" - - .align 2 -gFieldObjectPic_Fisherman_4:: @ 84C5938 - .incbin "graphics/map_objects/pics/people/fisherman/4.4bpp" - - .align 2 -gFieldObjectPic_Fisherman_5:: @ 84C5A38 - .incbin "graphics/map_objects/pics/people/fisherman/5.4bpp" - - .align 2 -gFieldObjectPic_Fisherman_6:: @ 84C5B38 - .incbin "graphics/map_objects/pics/people/fisherman/6.4bpp" - - .align 2 -gFieldObjectPic_Fisherman_7:: @ 84C5C38 - .incbin "graphics/map_objects/pics/people/fisherman/7.4bpp" - - .align 2 -gFieldObjectPic_Fisherman_8:: @ 84C5D38 - .incbin "graphics/map_objects/pics/people/fisherman/8.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteM_0:: @ 84C5E38 - .incbin "graphics/map_objects/pics/people/running_triathlete_m/0.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteM_1:: @ 84C5F38 - .incbin "graphics/map_objects/pics/people/running_triathlete_m/1.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteM_2:: @ 84C6038 - .incbin "graphics/map_objects/pics/people/running_triathlete_m/2.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteM_3:: @ 84C6138 - .incbin "graphics/map_objects/pics/people/running_triathlete_m/3.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteM_4:: @ 84C6238 - .incbin "graphics/map_objects/pics/people/running_triathlete_m/4.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteM_5:: @ 84C6338 - .incbin "graphics/map_objects/pics/people/running_triathlete_m/5.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteM_6:: @ 84C6438 - .incbin "graphics/map_objects/pics/people/running_triathlete_m/6.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteM_7:: @ 84C6538 - .incbin "graphics/map_objects/pics/people/running_triathlete_m/7.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteM_8:: @ 84C6638 - .incbin "graphics/map_objects/pics/people/running_triathlete_m/8.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteF_0:: @ 84C6738 - .incbin "graphics/map_objects/pics/people/running_triathlete_f/0.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteF_1:: @ 84C6838 - .incbin "graphics/map_objects/pics/people/running_triathlete_f/1.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteF_2:: @ 84C6938 - .incbin "graphics/map_objects/pics/people/running_triathlete_f/2.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteF_3:: @ 84C6A38 - .incbin "graphics/map_objects/pics/people/running_triathlete_f/3.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteF_4:: @ 84C6B38 - .incbin "graphics/map_objects/pics/people/running_triathlete_f/4.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteF_5:: @ 84C6C38 - .incbin "graphics/map_objects/pics/people/running_triathlete_f/5.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteF_6:: @ 84C6D38 - .incbin "graphics/map_objects/pics/people/running_triathlete_f/6.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteF_7:: @ 84C6E38 - .incbin "graphics/map_objects/pics/people/running_triathlete_f/7.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteF_8:: @ 84C6F38 - .incbin "graphics/map_objects/pics/people/running_triathlete_f/8.4bpp" - - .align 2 -gFieldObjectPic_TuberF_0:: @ 84C7038 - .incbin "graphics/map_objects/pics/people/tuber_f/0.4bpp" - - .align 2 -gFieldObjectPic_TuberF_1:: @ 84C70B8 - .incbin "graphics/map_objects/pics/people/tuber_f/1.4bpp" - - .align 2 -gFieldObjectPic_TuberF_2:: @ 84C7138 - .incbin "graphics/map_objects/pics/people/tuber_f/2.4bpp" - - .align 2 -gFieldObjectPic_TuberF_3:: @ 84C71B8 - .incbin "graphics/map_objects/pics/people/tuber_f/3.4bpp" - - .align 2 -gFieldObjectPic_TuberF_4:: @ 84C7238 - .incbin "graphics/map_objects/pics/people/tuber_f/4.4bpp" - - .align 2 -gFieldObjectPic_TuberF_5:: @ 84C72B8 - .incbin "graphics/map_objects/pics/people/tuber_f/5.4bpp" - - .align 2 -gFieldObjectPic_TuberF_6:: @ 84C7338 - .incbin "graphics/map_objects/pics/people/tuber_f/6.4bpp" - - .align 2 -gFieldObjectPic_TuberF_7:: @ 84C73B8 - .incbin "graphics/map_objects/pics/people/tuber_f/7.4bpp" - - .align 2 -gFieldObjectPic_TuberF_8:: @ 84C7438 - .incbin "graphics/map_objects/pics/people/tuber_f/8.4bpp" - - .align 2 -gFieldObjectPic_TuberM_0:: @ 84C74B8 - .incbin "graphics/map_objects/pics/people/tuber_m/0.4bpp" - - .align 2 -gFieldObjectPic_TuberM_1:: @ 84C7538 - .incbin "graphics/map_objects/pics/people/tuber_m/1.4bpp" - - .align 2 -gFieldObjectPic_TuberM_2:: @ 84C75B8 - .incbin "graphics/map_objects/pics/people/tuber_m/2.4bpp" - - .align 2 -gFieldObjectPic_TuberM_3:: @ 84C7638 - .incbin "graphics/map_objects/pics/people/tuber_m/3.4bpp" - - .align 2 -gFieldObjectPic_TuberM_4:: @ 84C76B8 - .incbin "graphics/map_objects/pics/people/tuber_m/4.4bpp" - - .align 2 -gFieldObjectPic_TuberM_5:: @ 84C7738 - .incbin "graphics/map_objects/pics/people/tuber_m/5.4bpp" - - .align 2 -gFieldObjectPic_TuberM_6:: @ 84C77B8 - .incbin "graphics/map_objects/pics/people/tuber_m/6.4bpp" - - .align 2 -gFieldObjectPic_TuberM_7:: @ 84C7838 - .incbin "graphics/map_objects/pics/people/tuber_m/7.4bpp" - - .align 2 -gFieldObjectPic_TuberM_8:: @ 84C78B8 - .incbin "graphics/map_objects/pics/people/tuber_m/8.4bpp" - - .align 2 -gFieldObjectPic_Hiker_0:: @ 84C7938 - .incbin "graphics/map_objects/pics/people/hiker/0.4bpp" - - .align 2 -gFieldObjectPic_Hiker_1:: @ 84C7A38 - .incbin "graphics/map_objects/pics/people/hiker/1.4bpp" - - .align 2 -gFieldObjectPic_Hiker_2:: @ 84C7B38 - .incbin "graphics/map_objects/pics/people/hiker/2.4bpp" - - .align 2 -gFieldObjectPic_Hiker_3:: @ 84C7C38 - .incbin "graphics/map_objects/pics/people/hiker/3.4bpp" - - .align 2 -gFieldObjectPic_Hiker_4:: @ 84C7D38 - .incbin "graphics/map_objects/pics/people/hiker/4.4bpp" - - .align 2 -gFieldObjectPic_Hiker_5:: @ 84C7E38 - .incbin "graphics/map_objects/pics/people/hiker/5.4bpp" - - .align 2 -gFieldObjectPic_Hiker_6:: @ 84C7F38 - .incbin "graphics/map_objects/pics/people/hiker/6.4bpp" - - .align 2 -gFieldObjectPic_Hiker_7:: @ 84C8038 - .incbin "graphics/map_objects/pics/people/hiker/7.4bpp" - - .align 2 -gFieldObjectPic_Hiker_8:: @ 84C8138 - .incbin "graphics/map_objects/pics/people/hiker/8.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteM_0:: @ 84C8238 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_m/0.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteM_1:: @ 84C8438 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_m/1.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteM_2:: @ 84C8638 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_m/2.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteM_3:: @ 84C8838 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_m/3.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteM_4:: @ 84C8A38 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_m/4.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteM_5:: @ 84C8C38 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_m/5.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteM_6:: @ 84C8E38 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_m/6.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteM_7:: @ 84C9038 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_m/7.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteM_8:: @ 84C9238 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_m/8.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteF_0:: @ 84C9438 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_f/0.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteF_1:: @ 84C9638 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_f/1.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteF_2:: @ 84C9838 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_f/2.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteF_3:: @ 84C9A38 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_f/3.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteF_4:: @ 84C9C38 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_f/4.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteF_5:: @ 84C9E38 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_f/5.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteF_6:: @ 84CA038 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_f/6.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteF_7:: @ 84CA238 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_f/7.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteF_8:: @ 84CA438 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_f/8.4bpp" - - .align 2 -gFieldObjectPic_Man5_0:: @ 84CA638 - .incbin "graphics/map_objects/pics/people/man_5/0.4bpp" - - .align 2 -gFieldObjectPic_Man5_1:: @ 84CA738 - .incbin "graphics/map_objects/pics/people/man_5/1.4bpp" - - .align 2 -gFieldObjectPic_Man5_2:: @ 84CA838 - .incbin "graphics/map_objects/pics/people/man_5/2.4bpp" - - .align 2 -gFieldObjectPic_Man5_3:: @ 84CA938 - .incbin "graphics/map_objects/pics/people/man_5/3.4bpp" - - .align 2 -gFieldObjectPic_Man5_4:: @ 84CAA38 - .incbin "graphics/map_objects/pics/people/man_5/4.4bpp" - - .align 2 -gFieldObjectPic_Man5_5:: @ 84CAB38 - .incbin "graphics/map_objects/pics/people/man_5/5.4bpp" - - .align 2 -gFieldObjectPic_Man5_6:: @ 84CAC38 - .incbin "graphics/map_objects/pics/people/man_5/6.4bpp" - - .align 2 -gFieldObjectPic_Man5_7:: @ 84CAD38 - .incbin "graphics/map_objects/pics/people/man_5/7.4bpp" - - .align 2 -gFieldObjectPic_Man5_8:: @ 84CAE38 - .incbin "graphics/map_objects/pics/people/man_5/8.4bpp" - - .align 2 -gFieldObjectPic_Man6_0:: @ 84CAF38 - .incbin "graphics/map_objects/pics/people/man_6/0.4bpp" - - .align 2 -gFieldObjectPic_Man6_1:: @ 84CB038 - .incbin "graphics/map_objects/pics/people/man_6/1.4bpp" - - .align 2 -gFieldObjectPic_Man6_2:: @ 84CB138 - .incbin "graphics/map_objects/pics/people/man_6/2.4bpp" - - .align 2 -gFieldObjectPic_Man6_3:: @ 84CB238 - .incbin "graphics/map_objects/pics/people/man_6/3.4bpp" - - .align 2 -gFieldObjectPic_Man6_4:: @ 84CB338 - .incbin "graphics/map_objects/pics/people/man_6/4.4bpp" - - .align 2 -gFieldObjectPic_Man6_5:: @ 84CB438 - .incbin "graphics/map_objects/pics/people/man_6/5.4bpp" - - .align 2 -gFieldObjectPic_Man6_6:: @ 84CB538 - .incbin "graphics/map_objects/pics/people/man_6/6.4bpp" - - .align 2 -gFieldObjectPic_Man6_7:: @ 84CB638 - .incbin "graphics/map_objects/pics/people/man_6/7.4bpp" - - .align 2 -gFieldObjectPic_Man6_8:: @ 84CB738 - .incbin "graphics/map_objects/pics/people/man_6/8.4bpp" - - .align 2 -gFieldObjectPic_Nurse_0:: @ 84CB838 - .incbin "graphics/map_objects/pics/people/nurse/0.4bpp" - - .align 2 -gFieldObjectPic_Nurse_1:: @ 84CB938 - .incbin "graphics/map_objects/pics/people/nurse/1.4bpp" - - .align 2 -gFieldObjectPic_Nurse_2:: @ 84CBA38 - .incbin "graphics/map_objects/pics/people/nurse/2.4bpp" - - .align 2 -gFieldObjectPic_Nurse_3:: @ 84CBB38 - .incbin "graphics/map_objects/pics/people/nurse/3.4bpp" - - .align 2 -gFieldObjectPic_ItemBall:: @ 84CBC38 - .incbin "graphics/map_objects/pics/misc/item_ball.4bpp" - - .align 2 -gFieldObjectPic_ProfBirch_0:: @ 84CBCB8 - .incbin "graphics/map_objects/pics/people/prof_birch/0.4bpp" - - .align 2 -gFieldObjectPic_ProfBirch_1:: @ 84CBDB8 - .incbin "graphics/map_objects/pics/people/prof_birch/1.4bpp" - - .align 2 -gFieldObjectPic_ProfBirch_2:: @ 84CBEB8 - .incbin "graphics/map_objects/pics/people/prof_birch/2.4bpp" - - .align 2 -gFieldObjectPic_ProfBirch_3:: @ 84CBFB8 - .incbin "graphics/map_objects/pics/people/prof_birch/3.4bpp" - - .align 2 -gFieldObjectPic_ProfBirch_4:: @ 84CC0B8 - .incbin "graphics/map_objects/pics/people/prof_birch/4.4bpp" - - .align 2 -gFieldObjectPic_ProfBirch_5:: @ 84CC1B8 - .incbin "graphics/map_objects/pics/people/prof_birch/5.4bpp" - - .align 2 -gFieldObjectPic_ProfBirch_6:: @ 84CC2B8 - .incbin "graphics/map_objects/pics/people/prof_birch/6.4bpp" - - .align 2 -gFieldObjectPic_ProfBirch_7:: @ 84CC3B8 - .incbin "graphics/map_objects/pics/people/prof_birch/7.4bpp" - - .align 2 -gFieldObjectPic_ProfBirch_8:: @ 84CC4B8 - .incbin "graphics/map_objects/pics/people/prof_birch/8.4bpp" - - .align 2 -gFieldObjectPic_ReporterM_0:: @ 84CC5B8 - .incbin "graphics/map_objects/pics/people/reporter_m/0.4bpp" - - .align 2 -gFieldObjectPic_ReporterM_1:: @ 84CC6B8 - .incbin "graphics/map_objects/pics/people/reporter_m/1.4bpp" - - .align 2 -gFieldObjectPic_ReporterM_2:: @ 84CC7B8 - .incbin "graphics/map_objects/pics/people/reporter_m/2.4bpp" - - .align 2 -gFieldObjectPic_ReporterM_3:: @ 84CC8B8 - .incbin "graphics/map_objects/pics/people/reporter_m/3.4bpp" - - .align 2 -gFieldObjectPic_ReporterM_4:: @ 84CC9B8 - .incbin "graphics/map_objects/pics/people/reporter_m/4.4bpp" - - .align 2 -gFieldObjectPic_ReporterM_5:: @ 84CCAB8 - .incbin "graphics/map_objects/pics/people/reporter_m/5.4bpp" - - .align 2 -gFieldObjectPic_ReporterM_6:: @ 84CCBB8 - .incbin "graphics/map_objects/pics/people/reporter_m/6.4bpp" - - .align 2 -gFieldObjectPic_ReporterM_7:: @ 84CCCB8 - .incbin "graphics/map_objects/pics/people/reporter_m/7.4bpp" - - .align 2 -gFieldObjectPic_ReporterM_8:: @ 84CCDB8 - .incbin "graphics/map_objects/pics/people/reporter_m/8.4bpp" - - .align 2 -gFieldObjectPic_ReporterF_0:: @ 84CCEB8 - .incbin "graphics/map_objects/pics/people/reporter_f/0.4bpp" - - .align 2 -gFieldObjectPic_ReporterF_1:: @ 84CCFB8 - .incbin "graphics/map_objects/pics/people/reporter_f/1.4bpp" - - .align 2 -gFieldObjectPic_ReporterF_2:: @ 84CD0B8 - .incbin "graphics/map_objects/pics/people/reporter_f/2.4bpp" - - .align 2 -gFieldObjectPic_ReporterF_3:: @ 84CD1B8 - .incbin "graphics/map_objects/pics/people/reporter_f/3.4bpp" - - .align 2 -gFieldObjectPic_ReporterF_4:: @ 84CD2B8 - .incbin "graphics/map_objects/pics/people/reporter_f/4.4bpp" - - .align 2 -gFieldObjectPic_ReporterF_5:: @ 84CD3B8 - .incbin "graphics/map_objects/pics/people/reporter_f/5.4bpp" - - .align 2 -gFieldObjectPic_ReporterF_6:: @ 84CD4B8 - .incbin "graphics/map_objects/pics/people/reporter_f/6.4bpp" - - .align 2 -gFieldObjectPic_ReporterF_7:: @ 84CD5B8 - .incbin "graphics/map_objects/pics/people/reporter_f/7.4bpp" - - .align 2 -gFieldObjectPic_ReporterF_8:: @ 84CD6B8 - .incbin "graphics/map_objects/pics/people/reporter_f/8.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan1_0:: @ 84CD7B8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_1/0.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan1_1:: @ 84CD8B8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_1/1.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan1_2:: @ 84CD9B8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_1/2.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan1_3:: @ 84CDAB8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_1/3.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan1_4:: @ 84CDBB8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_1/4.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan1_5:: @ 84CDCB8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_1/5.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan1_6:: @ 84CDDB8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_1/6.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan1_7:: @ 84CDEB8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_1/7.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan1_8:: @ 84CDFB8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_1/8.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan2_0:: @ 84CE0B8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_2/0.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan2_1:: @ 84CE1B8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_2/1.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan2_2:: @ 84CE2B8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_2/2.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan2_3:: @ 84CE3B8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_2/3.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan2_4:: @ 84CE4B8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_2/4.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan2_5:: @ 84CE5B8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_2/5.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan2_6:: @ 84CE6B8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_2/6.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan2_7:: @ 84CE7B8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_2/7.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan2_8:: @ 84CE8B8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_2/8.4bpp" - - .align 2 -gFieldObjectPic_MartEmployee_0:: @ 84CE9B8 - .incbin "graphics/map_objects/pics/people/mart_employee/0.4bpp" - - .align 2 -gFieldObjectPic_MartEmployee_1:: @ 84CEAB8 - .incbin "graphics/map_objects/pics/people/mart_employee/1.4bpp" - - .align 2 -gFieldObjectPic_MartEmployee_2:: @ 84CEBB8 - .incbin "graphics/map_objects/pics/people/mart_employee/2.4bpp" - - .align 2 -gFieldObjectPic_MartEmployee_3:: @ 84CECB8 - .incbin "graphics/map_objects/pics/people/mart_employee/3.4bpp" - - .align 2 -gFieldObjectPic_MartEmployee_4:: @ 84CEDB8 - .incbin "graphics/map_objects/pics/people/mart_employee/4.4bpp" - - .align 2 -gFieldObjectPic_MartEmployee_5:: @ 84CEEB8 - .incbin "graphics/map_objects/pics/people/mart_employee/5.4bpp" - - .align 2 -gFieldObjectPic_MartEmployee_6:: @ 84CEFB8 - .incbin "graphics/map_objects/pics/people/mart_employee/6.4bpp" - - .align 2 -gFieldObjectPic_MartEmployee_7:: @ 84CF0B8 - .incbin "graphics/map_objects/pics/people/mart_employee/7.4bpp" - - .align 2 -gFieldObjectPic_MartEmployee_8:: @ 84CF1B8 - .incbin "graphics/map_objects/pics/people/mart_employee/8.4bpp" - - .align 2 -gFieldObjectPic_RooftopSaleWoman_0:: @ 84CF2B8 - .incbin "graphics/map_objects/pics/people/rooftop_sale_woman/0.4bpp" - - .align 2 -gFieldObjectPic_RooftopSaleWoman_1:: @ 84CF3B8 - .incbin "graphics/map_objects/pics/people/rooftop_sale_woman/1.4bpp" - - .align 2 -gFieldObjectPic_RooftopSaleWoman_2:: @ 84CF4B8 - .incbin "graphics/map_objects/pics/people/rooftop_sale_woman/2.4bpp" - - .align 2 -gFieldObjectPic_RooftopSaleWoman_3:: @ 84CF5B8 - .incbin "graphics/map_objects/pics/people/rooftop_sale_woman/3.4bpp" - - .align 2 -gFieldObjectPic_RooftopSaleWoman_4:: @ 84CF6B8 - .incbin "graphics/map_objects/pics/people/rooftop_sale_woman/4.4bpp" - - .align 2 -gFieldObjectPic_RooftopSaleWoman_5:: @ 84CF7B8 - .incbin "graphics/map_objects/pics/people/rooftop_sale_woman/5.4bpp" - - .align 2 -gFieldObjectPic_RooftopSaleWoman_6:: @ 84CF8B8 - .incbin "graphics/map_objects/pics/people/rooftop_sale_woman/6.4bpp" - - .align 2 -gFieldObjectPic_RooftopSaleWoman_7:: @ 84CF9B8 - .incbin "graphics/map_objects/pics/people/rooftop_sale_woman/7.4bpp" - - .align 2 -gFieldObjectPic_RooftopSaleWoman_8:: @ 84CFAB8 - .incbin "graphics/map_objects/pics/people/rooftop_sale_woman/8.4bpp" - - .align 2 -gFieldObjectPic_Teala_0:: @ 84CFBB8 - .incbin "graphics/map_objects/pics/people/teala/0.4bpp" - - .align 2 -gFieldObjectPic_Teala_1:: @ 84CFCB8 - .incbin "graphics/map_objects/pics/people/teala/1.4bpp" - - .align 2 -gFieldObjectPic_Teala_2:: @ 84CFDB8 - .incbin "graphics/map_objects/pics/people/teala/2.4bpp" - - .align 2 -gFieldObjectPic_Teala_3:: @ 84CFEB8 - .incbin "graphics/map_objects/pics/people/teala/3.4bpp" - - .align 2 -gFieldObjectPic_Teala_4:: @ 84CFFB8 - .incbin "graphics/map_objects/pics/people/teala/4.4bpp" - - .align 2 -gFieldObjectPic_Teala_5:: @ 84D00B8 - .incbin "graphics/map_objects/pics/people/teala/5.4bpp" - - .align 2 -gFieldObjectPic_Teala_6:: @ 84D01B8 - .incbin "graphics/map_objects/pics/people/teala/6.4bpp" - - .align 2 -gFieldObjectPic_Teala_7:: @ 84D02B8 - .incbin "graphics/map_objects/pics/people/teala/7.4bpp" - - .align 2 -gFieldObjectPic_Teala_8:: @ 84D03B8 - .incbin "graphics/map_objects/pics/people/teala/8.4bpp" - - .align 2 -gFieldObjectPic_Artist_0:: @ 84D04B8 - .incbin "graphics/map_objects/pics/people/artist/0.4bpp" - - .align 2 -gFieldObjectPic_Artist_1:: @ 84D05B8 - .incbin "graphics/map_objects/pics/people/artist/1.4bpp" - - .align 2 -gFieldObjectPic_Artist_2:: @ 84D06B8 - .incbin "graphics/map_objects/pics/people/artist/2.4bpp" - - .align 2 -gFieldObjectPic_Artist_3:: @ 84D07B8 - .incbin "graphics/map_objects/pics/people/artist/3.4bpp" - - .align 2 -gFieldObjectPic_Artist_4:: @ 84D08B8 - .incbin "graphics/map_objects/pics/people/artist/4.4bpp" - - .align 2 -gFieldObjectPic_Artist_5:: @ 84D09B8 - .incbin "graphics/map_objects/pics/people/artist/5.4bpp" - - .align 2 -gFieldObjectPic_Artist_6:: @ 84D0AB8 - .incbin "graphics/map_objects/pics/people/artist/6.4bpp" - - .align 2 -gFieldObjectPic_Artist_7:: @ 84D0BB8 - .incbin "graphics/map_objects/pics/people/artist/7.4bpp" - - .align 2 -gFieldObjectPic_Artist_8:: @ 84D0CB8 - .incbin "graphics/map_objects/pics/people/artist/8.4bpp" - - .align 2 -gFieldObjectPic_Cameraman_0:: @ 84D0DB8 - .incbin "graphics/map_objects/pics/people/cameraman/0.4bpp" - - .align 2 -gFieldObjectPic_Cameraman_1:: @ 84D0EB8 - .incbin "graphics/map_objects/pics/people/cameraman/1.4bpp" - - .align 2 -gFieldObjectPic_Cameraman_2:: @ 84D0FB8 - .incbin "graphics/map_objects/pics/people/cameraman/2.4bpp" - - .align 2 -gFieldObjectPic_Cameraman_3:: @ 84D10B8 - .incbin "graphics/map_objects/pics/people/cameraman/3.4bpp" - - .align 2 -gFieldObjectPic_Cameraman_4:: @ 84D11B8 - .incbin "graphics/map_objects/pics/people/cameraman/4.4bpp" - - .align 2 -gFieldObjectPic_Cameraman_5:: @ 84D12B8 - .incbin "graphics/map_objects/pics/people/cameraman/5.4bpp" - - .align 2 -gFieldObjectPic_Cameraman_6:: @ 84D13B8 - .incbin "graphics/map_objects/pics/people/cameraman/6.4bpp" - - .align 2 -gFieldObjectPic_Cameraman_7:: @ 84D14B8 - .incbin "graphics/map_objects/pics/people/cameraman/7.4bpp" - - .align 2 -gFieldObjectPic_Cameraman_8:: @ 84D15B8 - .incbin "graphics/map_objects/pics/people/cameraman/8.4bpp" - - .align 2 -gFieldObjectPic_Scientist2_0:: @ 84D16B8 - .incbin "graphics/map_objects/pics/people/scientist_2/0.4bpp" - - .align 2 -gFieldObjectPic_Scientist2_1:: @ 84D17B8 - .incbin "graphics/map_objects/pics/people/scientist_2/1.4bpp" - - .align 2 -gFieldObjectPic_Scientist2_2:: @ 84D18B8 - .incbin "graphics/map_objects/pics/people/scientist_2/2.4bpp" - - .align 2 -gFieldObjectPic_Scientist2_3:: @ 84D19B8 - .incbin "graphics/map_objects/pics/people/scientist_2/3.4bpp" - - .align 2 -gFieldObjectPic_Scientist2_4:: @ 84D1AB8 - .incbin "graphics/map_objects/pics/people/scientist_2/4.4bpp" - - .align 2 -gFieldObjectPic_Scientist2_5:: @ 84D1BB8 - .incbin "graphics/map_objects/pics/people/scientist_2/5.4bpp" - - .align 2 -gFieldObjectPic_Scientist2_6:: @ 84D1CB8 - .incbin "graphics/map_objects/pics/people/scientist_2/6.4bpp" - - .align 2 -gFieldObjectPic_Scientist2_7:: @ 84D1DB8 - .incbin "graphics/map_objects/pics/people/scientist_2/7.4bpp" - - .align 2 -gFieldObjectPic_Scientist2_8:: @ 84D1EB8 - .incbin "graphics/map_objects/pics/people/scientist_2/8.4bpp" - - .align 2 -gFieldObjectPic_Man7_0:: @ 84D1FB8 - .incbin "graphics/map_objects/pics/people/man_7/0.4bpp" - - .align 2 -gFieldObjectPic_Man7_1:: @ 84D20B8 - .incbin "graphics/map_objects/pics/people/man_7/1.4bpp" - - .align 2 -gFieldObjectPic_Man7_2:: @ 84D21B8 - .incbin "graphics/map_objects/pics/people/man_7/2.4bpp" - - .align 2 -gFieldObjectPic_Man7_3:: @ 84D22B8 - .incbin "graphics/map_objects/pics/people/man_7/3.4bpp" - - .align 2 -gFieldObjectPic_Man7_4:: @ 84D23B8 - .incbin "graphics/map_objects/pics/people/man_7/4.4bpp" - - .align 2 -gFieldObjectPic_Man7_5:: @ 84D24B8 - .incbin "graphics/map_objects/pics/people/man_7/5.4bpp" - - .align 2 -gFieldObjectPic_Man7_6:: @ 84D25B8 - .incbin "graphics/map_objects/pics/people/man_7/6.4bpp" - - .align 2 -gFieldObjectPic_Man7_7:: @ 84D26B8 - .incbin "graphics/map_objects/pics/people/man_7/7.4bpp" - - .align 2 -gFieldObjectPic_Man7_8:: @ 84D27B8 - .incbin "graphics/map_objects/pics/people/man_7/8.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberM_0:: @ 84D28B8 - .incbin "graphics/map_objects/pics/people/aqua_member_m/0.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberM_1:: @ 84D29B8 - .incbin "graphics/map_objects/pics/people/aqua_member_m/1.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberM_2:: @ 84D2AB8 - .incbin "graphics/map_objects/pics/people/aqua_member_m/2.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberM_3:: @ 84D2BB8 - .incbin "graphics/map_objects/pics/people/aqua_member_m/3.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberM_4:: @ 84D2CB8 - .incbin "graphics/map_objects/pics/people/aqua_member_m/4.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberM_5:: @ 84D2DB8 - .incbin "graphics/map_objects/pics/people/aqua_member_m/5.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberM_6:: @ 84D2EB8 - .incbin "graphics/map_objects/pics/people/aqua_member_m/6.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberM_7:: @ 84D2FB8 - .incbin "graphics/map_objects/pics/people/aqua_member_m/7.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberM_8:: @ 84D30B8 - .incbin "graphics/map_objects/pics/people/aqua_member_m/8.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberF_0:: @ 84D31B8 - .incbin "graphics/map_objects/pics/people/aqua_member_f/0.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberF_1:: @ 84D32B8 - .incbin "graphics/map_objects/pics/people/aqua_member_f/1.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberF_2:: @ 84D33B8 - .incbin "graphics/map_objects/pics/people/aqua_member_f/2.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberF_3:: @ 84D34B8 - .incbin "graphics/map_objects/pics/people/aqua_member_f/3.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberF_4:: @ 84D35B8 - .incbin "graphics/map_objects/pics/people/aqua_member_f/4.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberF_5:: @ 84D36B8 - .incbin "graphics/map_objects/pics/people/aqua_member_f/5.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberF_6:: @ 84D37B8 - .incbin "graphics/map_objects/pics/people/aqua_member_f/6.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberF_7:: @ 84D38B8 - .incbin "graphics/map_objects/pics/people/aqua_member_f/7.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberF_8:: @ 84D39B8 - .incbin "graphics/map_objects/pics/people/aqua_member_f/8.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberM_0:: @ 84D3AB8 - .incbin "graphics/map_objects/pics/people/magma_member_m/0.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberM_1:: @ 84D3BB8 - .incbin "graphics/map_objects/pics/people/magma_member_m/1.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberM_2:: @ 84D3CB8 - .incbin "graphics/map_objects/pics/people/magma_member_m/2.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberM_3:: @ 84D3DB8 - .incbin "graphics/map_objects/pics/people/magma_member_m/3.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberM_4:: @ 84D3EB8 - .incbin "graphics/map_objects/pics/people/magma_member_m/4.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberM_5:: @ 84D3FB8 - .incbin "graphics/map_objects/pics/people/magma_member_m/5.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberM_6:: @ 84D40B8 - .incbin "graphics/map_objects/pics/people/magma_member_m/6.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberM_7:: @ 84D41B8 - .incbin "graphics/map_objects/pics/people/magma_member_m/7.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberM_8:: @ 84D42B8 - .incbin "graphics/map_objects/pics/people/magma_member_m/8.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberF_0:: @ 84D43B8 - .incbin "graphics/map_objects/pics/people/magma_member_f/0.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberF_1:: @ 84D44B8 - .incbin "graphics/map_objects/pics/people/magma_member_f/1.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberF_2:: @ 84D45B8 - .incbin "graphics/map_objects/pics/people/magma_member_f/2.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberF_3:: @ 84D46B8 - .incbin "graphics/map_objects/pics/people/magma_member_f/3.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberF_4:: @ 84D47B8 - .incbin "graphics/map_objects/pics/people/magma_member_f/4.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberF_5:: @ 84D48B8 - .incbin "graphics/map_objects/pics/people/magma_member_f/5.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberF_6:: @ 84D49B8 - .incbin "graphics/map_objects/pics/people/magma_member_f/6.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberF_7:: @ 84D4AB8 - .incbin "graphics/map_objects/pics/people/magma_member_f/7.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberF_8:: @ 84D4BB8 - .incbin "graphics/map_objects/pics/people/magma_member_f/8.4bpp" - - .align 2 -gFieldObjectPic_Sidney_0:: @ 84D4CB8 - .incbin "graphics/map_objects/pics/people/sidney/0.4bpp" - - .align 2 -gFieldObjectPic_Sidney_1:: @ 84D4DB8 - .incbin "graphics/map_objects/pics/people/sidney/1.4bpp" - - .align 2 -gFieldObjectPic_Sidney_2:: @ 84D4EB8 - .incbin "graphics/map_objects/pics/people/sidney/2.4bpp" - - .align 2 -gFieldObjectPic_Phoebe_0:: @ 84D4FB8 - .incbin "graphics/map_objects/pics/people/phoebe/0.4bpp" - - .align 2 -gFieldObjectPic_Phoebe_1:: @ 84D50B8 - .incbin "graphics/map_objects/pics/people/phoebe/1.4bpp" - - .align 2 -gFieldObjectPic_Phoebe_2:: @ 84D51B8 - .incbin "graphics/map_objects/pics/people/phoebe/2.4bpp" - - .align 2 -gFieldObjectPic_Glacia_0:: @ 84D52B8 - .incbin "graphics/map_objects/pics/people/glacia/0.4bpp" - - .align 2 -gFieldObjectPic_Glacia_1:: @ 84D53B8 - .incbin "graphics/map_objects/pics/people/glacia/1.4bpp" - - .align 2 -gFieldObjectPic_Glacia_2:: @ 84D54B8 - .incbin "graphics/map_objects/pics/people/glacia/2.4bpp" - - .align 2 -gFieldObjectPic_Drake_0:: @ 84D55B8 - .incbin "graphics/map_objects/pics/people/drake/0.4bpp" - - .align 2 -gFieldObjectPic_Drake_1:: @ 84D56B8 - .incbin "graphics/map_objects/pics/people/drake/1.4bpp" - - .align 2 -gFieldObjectPic_Drake_2:: @ 84D57B8 - .incbin "graphics/map_objects/pics/people/drake/2.4bpp" - - .align 2 -gFieldObjectPic_Roxanne_0:: @ 84D58B8 - .incbin "graphics/map_objects/pics/people/roxanne/0.4bpp" - - .align 2 -gFieldObjectPic_Roxanne_1:: @ 84D59B8 - .incbin "graphics/map_objects/pics/people/roxanne/1.4bpp" - - .align 2 -gFieldObjectPic_Roxanne_2:: @ 84D5AB8 - .incbin "graphics/map_objects/pics/people/roxanne/2.4bpp" - - .align 2 -gFieldObjectPic_Brawly_0:: @ 84D5BB8 - .incbin "graphics/map_objects/pics/people/brawly/0.4bpp" - - .align 2 -gFieldObjectPic_Brawly_1:: @ 84D5CB8 - .incbin "graphics/map_objects/pics/people/brawly/1.4bpp" - - .align 2 -gFieldObjectPic_Brawly_2:: @ 84D5DB8 - .incbin "graphics/map_objects/pics/people/brawly/2.4bpp" - - .align 2 -gFieldObjectPic_Wattson_0:: @ 84D5EB8 - .incbin "graphics/map_objects/pics/people/wattson/0.4bpp" - - .align 2 -gFieldObjectPic_Wattson_1:: @ 84D5FB8 - .incbin "graphics/map_objects/pics/people/wattson/1.4bpp" - - .align 2 -gFieldObjectPic_Wattson_2:: @ 84D60B8 - .incbin "graphics/map_objects/pics/people/wattson/2.4bpp" - - .align 2 -gFieldObjectPic_Flannery_0:: @ 84D61B8 - .incbin "graphics/map_objects/pics/people/flannery/0.4bpp" - - .align 2 -gFieldObjectPic_Flannery_1:: @ 84D62B8 - .incbin "graphics/map_objects/pics/people/flannery/1.4bpp" - - .align 2 -gFieldObjectPic_Flannery_2:: @ 84D63B8 - .incbin "graphics/map_objects/pics/people/flannery/2.4bpp" - - .align 2 -gFieldObjectPic_Norman_0:: @ 84D64B8 - .incbin "graphics/map_objects/pics/people/norman/0.4bpp" - - .align 2 -gFieldObjectPic_Norman_1:: @ 84D65B8 - .incbin "graphics/map_objects/pics/people/norman/1.4bpp" - - .align 2 -gFieldObjectPic_Norman_2:: @ 84D66B8 - .incbin "graphics/map_objects/pics/people/norman/2.4bpp" - - .align 2 -gFieldObjectPic_Norman_3:: @ 84D67B8 - .incbin "graphics/map_objects/pics/people/norman/3.4bpp" - - .align 2 -gFieldObjectPic_Norman_4:: @ 84D68B8 - .incbin "graphics/map_objects/pics/people/norman/4.4bpp" - - .align 2 -gFieldObjectPic_Norman_5:: @ 84D69B8 - .incbin "graphics/map_objects/pics/people/norman/5.4bpp" - - .align 2 -gFieldObjectPic_Norman_6:: @ 84D6AB8 - .incbin "graphics/map_objects/pics/people/norman/6.4bpp" - - .align 2 -gFieldObjectPic_Norman_7:: @ 84D6BB8 - .incbin "graphics/map_objects/pics/people/norman/7.4bpp" - - .align 2 -gFieldObjectPic_Norman_8:: @ 84D6CB8 - .incbin "graphics/map_objects/pics/people/norman/8.4bpp" - - .align 2 -gFieldObjectPic_Winona_0:: @ 84D6DB8 - .incbin "graphics/map_objects/pics/people/winona/0.4bpp" - - .align 2 -gFieldObjectPic_Winona_1:: @ 84D6EB8 - .incbin "graphics/map_objects/pics/people/winona/1.4bpp" - - .align 2 -gFieldObjectPic_Winona_2:: @ 84D6FB8 - .incbin "graphics/map_objects/pics/people/winona/2.4bpp" - - .align 2 -gFieldObjectPic_Liza_0:: @ 84D70B8 - .incbin "graphics/map_objects/pics/people/liza/0.4bpp" - - .align 2 -gFieldObjectPic_Liza_1:: @ 84D71B8 - .incbin "graphics/map_objects/pics/people/liza/1.4bpp" - - .align 2 -gFieldObjectPic_Liza_2:: @ 84D72B8 - .incbin "graphics/map_objects/pics/people/liza/2.4bpp" - - .align 2 -gFieldObjectPic_Tate_0:: @ 84D73B8 - .incbin "graphics/map_objects/pics/people/tate/0.4bpp" - - .align 2 -gFieldObjectPic_Tate_1:: @ 84D74B8 - .incbin "graphics/map_objects/pics/people/tate/1.4bpp" - - .align 2 -gFieldObjectPic_Tate_2:: @ 84D75B8 - .incbin "graphics/map_objects/pics/people/tate/2.4bpp" - - .align 2 -gFieldObjectPic_Wallace_0:: @ 84D76B8 - .incbin "graphics/map_objects/pics/people/wallace/0.4bpp" - - .align 2 -gFieldObjectPic_Wallace_1:: @ 84D77B8 - .incbin "graphics/map_objects/pics/people/wallace/1.4bpp" - - .align 2 -gFieldObjectPic_Wallace_2:: @ 84D78B8 - .incbin "graphics/map_objects/pics/people/wallace/2.4bpp" - - .align 2 -gFieldObjectPic_Wallace_3:: @ 84D79B8 - .incbin "graphics/map_objects/pics/people/wallace/3.4bpp" - - .align 2 -gFieldObjectPic_Wallace_4:: @ 84D7AB8 - .incbin "graphics/map_objects/pics/people/wallace/4.4bpp" - - .align 2 -gFieldObjectPic_Wallace_5:: @ 84D7BB8 - .incbin "graphics/map_objects/pics/people/wallace/5.4bpp" - - .align 2 -gFieldObjectPic_Wallace_6:: @ 84D7CB8 - .incbin "graphics/map_objects/pics/people/wallace/6.4bpp" - - .align 2 -gFieldObjectPic_Wallace_7:: @ 84D7DB8 - .incbin "graphics/map_objects/pics/people/wallace/7.4bpp" - - .align 2 -gFieldObjectPic_Wallace_8:: @ 84D7EB8 - .incbin "graphics/map_objects/pics/people/wallace/8.4bpp" - - .align 2 -gFieldObjectPic_Steven_0:: @ 84D7FB8 - .incbin "graphics/map_objects/pics/people/steven/0.4bpp" - - .align 2 -gFieldObjectPic_Steven_1:: @ 84D80B8 - .incbin "graphics/map_objects/pics/people/steven/1.4bpp" - - .align 2 -gFieldObjectPic_Steven_2:: @ 84D81B8 - .incbin "graphics/map_objects/pics/people/steven/2.4bpp" - - .align 2 -gFieldObjectPic_Steven_3:: @ 84D82B8 - .incbin "graphics/map_objects/pics/people/steven/3.4bpp" - - .align 2 -gFieldObjectPic_Steven_4:: @ 84D83B8 - .incbin "graphics/map_objects/pics/people/steven/4.4bpp" - - .align 2 -gFieldObjectPic_Steven_5:: @ 84D84B8 - .incbin "graphics/map_objects/pics/people/steven/5.4bpp" - - .align 2 -gFieldObjectPic_Steven_6:: @ 84D85B8 - .incbin "graphics/map_objects/pics/people/steven/6.4bpp" - - .align 2 -gFieldObjectPic_Steven_7:: @ 84D86B8 - .incbin "graphics/map_objects/pics/people/steven/7.4bpp" - - .align 2 -gFieldObjectPic_Steven_8:: @ 84D87B8 - .incbin "graphics/map_objects/pics/people/steven/8.4bpp" - - .align 2 -gFieldObjectPic_Wally_0:: @ 84D88B8 - .incbin "graphics/map_objects/pics/people/wally/0.4bpp" - - .align 2 -gFieldObjectPic_Wally_1:: @ 84D89B8 - .incbin "graphics/map_objects/pics/people/wally/1.4bpp" - - .align 2 -gFieldObjectPic_Wally_2:: @ 84D8AB8 - .incbin "graphics/map_objects/pics/people/wally/2.4bpp" - - .align 2 -gFieldObjectPic_Wally_3:: @ 84D8BB8 - .incbin "graphics/map_objects/pics/people/wally/3.4bpp" - - .align 2 -gFieldObjectPic_Wally_4:: @ 84D8CB8 - .incbin "graphics/map_objects/pics/people/wally/4.4bpp" - - .align 2 -gFieldObjectPic_Wally_5:: @ 84D8DB8 - .incbin "graphics/map_objects/pics/people/wally/5.4bpp" - - .align 2 -gFieldObjectPic_Wally_6:: @ 84D8EB8 - .incbin "graphics/map_objects/pics/people/wally/6.4bpp" - - .align 2 -gFieldObjectPic_Wally_7:: @ 84D8FB8 - .incbin "graphics/map_objects/pics/people/wally/7.4bpp" - - .align 2 -gFieldObjectPic_Wally_8:: @ 84D90B8 - .incbin "graphics/map_objects/pics/people/wally/8.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireLittleBoy_0:: @ 84D91B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/0.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireLittleBoy_1:: @ 84D9238 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/1.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireLittleBoy_2:: @ 84D92B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/2.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireLittleBoy_3:: @ 84D9338 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/3.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireLittleBoy_4:: @ 84D93B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/4.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireLittleBoy_5:: @ 84D9438 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/5.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireLittleBoy_6:: @ 84D94B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/6.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireLittleBoy_7:: @ 84D9538 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/7.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireLittleBoy_8:: @ 84D95B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/8.4bpp" - - .align 2 -gFieldObjectPic_HotSpringsOldWoman_0:: @ 84D9638 - .incbin "graphics/map_objects/pics/people/hot_springs_old_woman/0.4bpp" - - .align 2 -gFieldObjectPic_HotSpringsOldWoman_1:: @ 84D9738 - .incbin "graphics/map_objects/pics/people/hot_springs_old_woman/1.4bpp" - - .align 2 -gFieldObjectPic_HotSpringsOldWoman_2:: @ 84D9838 - .incbin "graphics/map_objects/pics/people/hot_springs_old_woman/2.4bpp" - - .align 2 -gFieldObjectPic_HotSpringsOldWoman_3:: @ 84D9938 - .incbin "graphics/map_objects/pics/people/hot_springs_old_woman/3.4bpp" - - .align 2 -gFieldObjectPic_HotSpringsOldWoman_4:: @ 84D9A38 - .incbin "graphics/map_objects/pics/people/hot_springs_old_woman/4.4bpp" - - .align 2 -gFieldObjectPic_HotSpringsOldWoman_5:: @ 84D9B38 - .incbin "graphics/map_objects/pics/people/hot_springs_old_woman/5.4bpp" - - .align 2 -gFieldObjectPic_HotSpringsOldWoman_6:: @ 84D9C38 - .incbin "graphics/map_objects/pics/people/hot_springs_old_woman/6.4bpp" - - .align 2 -gFieldObjectPic_HotSpringsOldWoman_7:: @ 84D9D38 - .incbin "graphics/map_objects/pics/people/hot_springs_old_woman/7.4bpp" - - .align 2 -gFieldObjectPic_HotSpringsOldWoman_8:: @ 84D9E38 - .incbin "graphics/map_objects/pics/people/hot_springs_old_woman/8.4bpp" - - .align 2 -gFieldObjectPic_LatiasLatios_0:: @ 84D9F38 - .incbin "graphics/map_objects/pics/pokemon/latias_latios/0.4bpp" - - .align 2 -gFieldObjectPic_LatiasLatios_1:: @ 84DA138 - .incbin "graphics/map_objects/pics/pokemon/latias_latios/1.4bpp" - - .align 2 -gFieldObjectPic_LatiasLatios_2:: @ 84DA338 - .incbin "graphics/map_objects/pics/pokemon/latias_latios/2.4bpp" - - .align 2 -gFieldObjectPic_Boy5_0:: @ 84DA538 - .incbin "graphics/map_objects/pics/people/boy_5/0.4bpp" - - .align 2 -gFieldObjectPic_Boy5_1:: @ 84DA638 - .incbin "graphics/map_objects/pics/people/boy_5/1.4bpp" - - .align 2 -gFieldObjectPic_Boy5_2:: @ 84DA738 - .incbin "graphics/map_objects/pics/people/boy_5/2.4bpp" - - .align 2 -gFieldObjectPic_ContestOldMan_0:: @ 84DA838 - .incbin "graphics/map_objects/pics/people/contest_old_man/0.4bpp" - - .align 2 -gFieldObjectPic_ContestOldMan_1:: @ 84DA938 - .incbin "graphics/map_objects/pics/people/contest_old_man/1.4bpp" - - .align 2 -gFieldObjectPic_ContestOldMan_2:: @ 84DAA38 - .incbin "graphics/map_objects/pics/people/contest_old_man/2.4bpp" - - .align 2 -gFieldObjectPic_ContestOldMan_3:: @ 84DAB38 - .incbin "graphics/map_objects/pics/people/contest_old_man/3.4bpp" - - .align 2 -gFieldObjectPic_ContestOldMan_4:: @ 84DAC38 - .incbin "graphics/map_objects/pics/people/contest_old_man/4.4bpp" - - .align 2 -gFieldObjectPic_ContestOldMan_5:: @ 84DAD38 - .incbin "graphics/map_objects/pics/people/contest_old_man/5.4bpp" - - .align 2 -gFieldObjectPic_ContestOldMan_6:: @ 84DAE38 - .incbin "graphics/map_objects/pics/people/contest_old_man/6.4bpp" - - .align 2 -gFieldObjectPic_ContestOldMan_7:: @ 84DAF38 - .incbin "graphics/map_objects/pics/people/contest_old_man/7.4bpp" - - .align 2 -gFieldObjectPic_ContestOldMan_8:: @ 84DB038 - .incbin "graphics/map_objects/pics/people/contest_old_man/8.4bpp" - - .align 2 -gFieldObjectPic_Archie_0:: @ 84DB138 - .incbin "graphics/map_objects/pics/people/archie/0.4bpp" - - .align 2 -gFieldObjectPic_Archie_1:: @ 84DB238 - .incbin "graphics/map_objects/pics/people/archie/1.4bpp" - - .align 2 -gFieldObjectPic_Archie_2:: @ 84DB338 - .incbin "graphics/map_objects/pics/people/archie/2.4bpp" - - .align 2 -gFieldObjectPic_Archie_3:: @ 84DB438 - .incbin "graphics/map_objects/pics/people/archie/3.4bpp" - - .align 2 -gFieldObjectPic_Archie_4:: @ 84DB538 - .incbin "graphics/map_objects/pics/people/archie/4.4bpp" - - .align 2 -gFieldObjectPic_Archie_5:: @ 84DB638 - .incbin "graphics/map_objects/pics/people/archie/5.4bpp" - - .align 2 -gFieldObjectPic_Archie_6:: @ 84DB738 - .incbin "graphics/map_objects/pics/people/archie/6.4bpp" - - .align 2 -gFieldObjectPic_Archie_7:: @ 84DB838 - .incbin "graphics/map_objects/pics/people/archie/7.4bpp" - - .align 2 -gFieldObjectPic_Archie_8:: @ 84DB938 - .incbin "graphics/map_objects/pics/people/archie/8.4bpp" - - .align 2 -gFieldObjectPic_Maxie_0:: @ 84DBA38 - .incbin "graphics/map_objects/pics/people/maxie/0.4bpp" - - .align 2 -gFieldObjectPic_Maxie_1:: @ 84DBB38 - .incbin "graphics/map_objects/pics/people/maxie/1.4bpp" - - .align 2 -gFieldObjectPic_Maxie_2:: @ 84DBC38 - .incbin "graphics/map_objects/pics/people/maxie/2.4bpp" - - .align 2 -gFieldObjectPic_Maxie_3:: @ 84DBD38 - .incbin "graphics/map_objects/pics/people/maxie/3.4bpp" - - .align 2 -gFieldObjectPic_Maxie_4:: @ 84DBE38 - .incbin "graphics/map_objects/pics/people/maxie/4.4bpp" - - .align 2 -gFieldObjectPic_Maxie_5:: @ 84DBF38 - .incbin "graphics/map_objects/pics/people/maxie/5.4bpp" - - .align 2 -gFieldObjectPic_Maxie_6:: @ 84DC038 - .incbin "graphics/map_objects/pics/people/maxie/6.4bpp" - - .align 2 -gFieldObjectPic_Maxie_7:: @ 84DC138 - .incbin "graphics/map_objects/pics/people/maxie/7.4bpp" - - .align 2 -gFieldObjectPic_Maxie_8:: @ 84DC238 - .incbin "graphics/map_objects/pics/people/maxie/8.4bpp" - - .align 2 -gFieldObjectPic_KyogreFront_0:: @ 84DC338 - .incbin "graphics/map_objects/pics/pokemon/kyogre_front/0.4bpp" - - .align 2 -gFieldObjectPic_KyogreFront_1:: @ 84DC538 - .incbin "graphics/map_objects/pics/pokemon/kyogre_front/1.4bpp" - - .align 2 -gFieldObjectPic_KyogreSide_0:: @ 84DC738 - .incbin "graphics/map_objects/pics/pokemon/kyogre_side/0.4bpp" - - .align 2 -gFieldObjectPic_KyogreSide_1:: @ 84DC938 - .incbin "graphics/map_objects/pics/pokemon/kyogre_side/1.4bpp" - - .align 2 -gFieldObjectPic_GroudonFront_0:: @ 84DCB38 - .incbin "graphics/map_objects/pics/pokemon/groudon_front/0.4bpp" - - .align 2 -gFieldObjectPic_GroudonFront_1:: @ 84DCD38 - .incbin "graphics/map_objects/pics/pokemon/groudon_front/1.4bpp" - - .align 2 -gFieldObjectPic_GroudonSide_0:: @ 84DCF38 - .incbin "graphics/map_objects/pics/pokemon/groudon_side/0.4bpp" - - .align 2 -gFieldObjectPic_GroudonSide_1:: @ 84DD138 - .incbin "graphics/map_objects/pics/pokemon/groudon_side/1.4bpp" - - .align 2 -gFieldObjectPic_Regi:: @ 84DD338 - .incbin "graphics/map_objects/pics/pokemon/regi.4bpp" - - .align 2 -gFieldObjectPic_Skitty_0:: @ 84DD538 - .incbin "graphics/map_objects/pics/pokemon/skitty/0.4bpp" - - .align 2 -gFieldObjectPic_Skitty_1:: @ 84DD5B8 - .incbin "graphics/map_objects/pics/pokemon/skitty/1.4bpp" - - .align 2 -gFieldObjectPic_Skitty_2:: @ 84DD638 - .incbin "graphics/map_objects/pics/pokemon/skitty/2.4bpp" - - .align 2 -gFieldObjectPic_Kecleon_0:: @ 84DD6B8 - .incbin "graphics/map_objects/pics/pokemon/kecleon/0.4bpp" - - .align 2 -gFieldObjectPic_Kecleon_1:: @ 84DD738 - .incbin "graphics/map_objects/pics/pokemon/kecleon/1.4bpp" - - .align 2 -gFieldObjectPic_Kecleon_2:: @ 84DD7B8 - .incbin "graphics/map_objects/pics/pokemon/kecleon/2.4bpp" - - .align 2 -gFieldObjectPic_Rayquaza_0:: @ 84DD838 - .incbin "graphics/map_objects/pics/pokemon/rayquaza/0.4bpp" - - .align 2 -gFieldObjectPic_Rayquaza_1:: @ 84DE038 - .incbin "graphics/map_objects/pics/pokemon/rayquaza/1.4bpp" - - .align 2 -gFieldObjectPic_Rayquaza_2:: @ 84DE838 - .incbin "graphics/map_objects/pics/pokemon/rayquaza/2.4bpp" - - .align 2 -gFieldObjectPic_Rayquaza_3:: @ 84DF038 - .incbin "graphics/map_objects/pics/pokemon/rayquaza/3.4bpp" - - .align 2 -gFieldObjectPic_Rayquaza_4:: @ 84DF838 - .incbin "graphics/map_objects/pics/pokemon/rayquaza/4.4bpp" - - .align 2 -gFieldObjectPic_RayquazaStill:: @ 84E0038 - .incbin "graphics/map_objects/pics/pokemon/rayquaza_still.4bpp" - - .align 2 -gFieldObjectPic_Zigzagoon_0:: @ 84E0838 - .incbin "graphics/map_objects/pics/pokemon/zigzagoon/0.4bpp" - - .align 2 -gFieldObjectPic_Zigzagoon_1:: @ 84E08B8 - .incbin "graphics/map_objects/pics/pokemon/zigzagoon/1.4bpp" - - .align 2 -gFieldObjectPic_Zigzagoon_2:: @ 84E0938 - .incbin "graphics/map_objects/pics/pokemon/zigzagoon/2.4bpp" - - .align 2 -gFieldObjectPic_Pikachu_0:: @ 84E09B8 - .incbin "graphics/map_objects/pics/pokemon/pikachu/0.4bpp" - - .align 2 -gFieldObjectPic_Pikachu_1:: @ 84E0A38 - .incbin "graphics/map_objects/pics/pokemon/pikachu/1.4bpp" - - .align 2 -gFieldObjectPic_Pikachu_2:: @ 84E0AB8 - .incbin "graphics/map_objects/pics/pokemon/pikachu/2.4bpp" - - .align 2 -gFieldObjectPic_Azumarill_0:: @ 84E0B38 - .incbin "graphics/map_objects/pics/pokemon/azumarill/0.4bpp" - - .align 2 -gFieldObjectPic_Azumarill_1:: @ 84E0BB8 - .incbin "graphics/map_objects/pics/pokemon/azumarill/1.4bpp" - - .align 2 -gFieldObjectPic_Azumarill_2:: @ 84E0C38 - .incbin "graphics/map_objects/pics/pokemon/azumarill/2.4bpp" - - .align 2 -gFieldObjectPic_Wingull_0:: @ 84E0CB8 - .incbin "graphics/map_objects/pics/pokemon/wingull/0.4bpp" - - .align 2 -gFieldObjectPic_Wingull_3:: @ 84E0D38 - .incbin "graphics/map_objects/pics/pokemon/wingull/3.4bpp" - - .align 2 -gFieldObjectPic_Wingull_1:: @ 84E0DB8 - .incbin "graphics/map_objects/pics/pokemon/wingull/1.4bpp" - - .align 2 -gFieldObjectPic_Wingull_4:: @ 84E0E38 - .incbin "graphics/map_objects/pics/pokemon/wingull/4.4bpp" - - .align 2 -gFieldObjectPic_Wingull_2:: @ 84E0EB8 - .incbin "graphics/map_objects/pics/pokemon/wingull/2.4bpp" - - .align 2 -gFieldObjectPic_Wingull_5:: @ 84E0F38 - .incbin "graphics/map_objects/pics/pokemon/wingull/5.4bpp" - - .align 2 -gFieldObjectPic_TuberMSwimming_0:: @ 84E0FB8 - .incbin "graphics/map_objects/pics/people/tuber_m_swimming/0.4bpp" - - .align 2 -gFieldObjectPic_TuberMSwimming_1:: @ 84E1038 - .incbin "graphics/map_objects/pics/people/tuber_m_swimming/1.4bpp" - - .align 2 -gFieldObjectPic_TuberMSwimming_2:: @ 84E10B8 - .incbin "graphics/map_objects/pics/people/tuber_m_swimming/2.4bpp" - - .align 2 -gFieldObjectPic_TuberMSwimming_3:: @ 84E1138 - .incbin "graphics/map_objects/pics/people/tuber_m_swimming/3.4bpp" - - .align 2 -gFieldObjectPic_TuberMSwimming_4:: @ 84E11B8 - .incbin "graphics/map_objects/pics/people/tuber_m_swimming/4.4bpp" - - .align 2 -gFieldObjectPic_TuberMSwimming_5:: @ 84E1238 - .incbin "graphics/map_objects/pics/people/tuber_m_swimming/5.4bpp" - - .align 2 -gFieldObjectPic_TuberMSwimming_6:: @ 84E12B8 - .incbin "graphics/map_objects/pics/people/tuber_m_swimming/6.4bpp" - - .align 2 -gFieldObjectPic_TuberMSwimming_7:: @ 84E1338 - .incbin "graphics/map_objects/pics/people/tuber_m_swimming/7.4bpp" - - .align 2 -gFieldObjectPic_TuberMSwimming_8:: @ 84E13B8 - .incbin "graphics/map_objects/pics/people/tuber_m_swimming/8.4bpp" - - .align 2 -gFieldObjectPic_Azurill_0:: @ 84E1438 - .incbin "graphics/map_objects/pics/pokemon/azurill/0.4bpp" - - .align 2 -gFieldObjectPic_Azurill_1:: @ 84E14B8 - .incbin "graphics/map_objects/pics/pokemon/azurill/1.4bpp" - - .align 2 -gFieldObjectPic_Azurill_2:: @ 84E1538 - .incbin "graphics/map_objects/pics/pokemon/azurill/2.4bpp" - - .align 2 -gFieldObjectPic_Mom_0:: @ 84E15B8 - .incbin "graphics/map_objects/pics/people/mom/0.4bpp" - - .align 2 -gFieldObjectPic_Mom_1:: @ 84E16B8 - .incbin "graphics/map_objects/pics/people/mom/1.4bpp" - - .align 2 -gFieldObjectPic_Mom_2:: @ 84E17B8 - .incbin "graphics/map_objects/pics/people/mom/2.4bpp" - - .align 2 -gFieldObjectPic_Mom_3:: @ 84E18B8 - .incbin "graphics/map_objects/pics/people/mom/3.4bpp" - - .align 2 -gFieldObjectPic_Mom_4:: @ 84E19B8 - .incbin "graphics/map_objects/pics/people/mom/4.4bpp" - - .align 2 -gFieldObjectPic_Mom_5:: @ 84E1AB8 - .incbin "graphics/map_objects/pics/people/mom/5.4bpp" - - .align 2 -gFieldObjectPic_Mom_6:: @ 84E1BB8 - .incbin "graphics/map_objects/pics/people/mom/6.4bpp" - - .align 2 -gFieldObjectPic_Mom_7:: @ 84E1CB8 - .incbin "graphics/map_objects/pics/people/mom/7.4bpp" - - .align 2 -gFieldObjectPic_Mom_8:: @ 84E1DB8 - .incbin "graphics/map_objects/pics/people/mom/8.4bpp" - - .align 2 -gFieldObjectPalette22:: @ 84E1EB8 - .incbin "graphics/map_objects/palettes/field_object_palette_22.gbapal" - - .align 2 -gFieldObjectPalette23:: @ 84E1ED8 - .incbin "graphics/map_objects/palettes/field_object_palette_23.gbapal" - - .align 2 -gFieldObjectPalette24:: @ 84E1EF8 - .incbin "graphics/map_objects/palettes/field_object_palette_24.gbapal" - - .align 2 -gFieldObjectPalette25:: @ 84E1F18 - .incbin "graphics/map_objects/palettes/field_object_palette_25.gbapal" - - .align 2 -gFieldObjectPic_UnusedNatuDoll:: @ 84E1F38 - .incbin "graphics/map_objects/pics/dolls/unused_natu_doll.4bpp" - - .align 2 -gFieldObjectPic_UnusedMagnemiteDoll:: @ 84E1FB8 - .incbin "graphics/map_objects/pics/dolls/unused_magnemite_doll.4bpp" - - .align 2 -gFieldObjectPic_UnusedSquirtleDoll:: @ 84E2038 - .incbin "graphics/map_objects/pics/dolls/unused_squirtle_doll.4bpp" - - .align 2 -gFieldObjectPic_UnusedWooperDoll:: @ 84E20B8 - .incbin "graphics/map_objects/pics/dolls/unused_wooper_doll.4bpp" - - .align 2 -gFieldObjectPic_UnusedPikachuDoll:: @ 84E2138 - .incbin "graphics/map_objects/pics/dolls/unused_pikachu_doll.4bpp" - - .align 2 -gFieldObjectPic_UnusedPorygon2Doll:: @ 84E21B8 - .incbin "graphics/map_objects/pics/dolls/unused_porygon2_doll.4bpp" - - .align 2 -gFieldObjectPic_PichuDoll:: @ 84E2238 - .incbin "graphics/map_objects/pics/dolls/pichu_doll.4bpp" - - .align 2 -gFieldObjectPic_PikachuDoll:: @ 84E22B8 - .incbin "graphics/map_objects/pics/dolls/pikachu_doll.4bpp" - - .align 2 -gFieldObjectPic_MarillDoll:: @ 84E2338 - .incbin "graphics/map_objects/pics/dolls/marill_doll.4bpp" - - .align 2 -gFieldObjectPic_TogepiDoll:: @ 84E23B8 - .incbin "graphics/map_objects/pics/dolls/togepi_doll.4bpp" - - .align 2 -gFieldObjectPic_CyndaquilDoll:: @ 84E2438 - .incbin "graphics/map_objects/pics/dolls/cyndaquil_doll.4bpp" - - .align 2 -gFieldObjectPic_ChikoritaDoll:: @ 84E24B8 - .incbin "graphics/map_objects/pics/dolls/chikorita_doll.4bpp" - - .align 2 -gFieldObjectPic_TotodileDoll:: @ 84E2538 - .incbin "graphics/map_objects/pics/dolls/totodile_doll.4bpp" - - .align 2 -gFieldObjectPic_JigglypuffDoll:: @ 84E25B8 - .incbin "graphics/map_objects/pics/dolls/jigglypuff_doll.4bpp" - - .align 2 -gFieldObjectPic_MeowthDoll:: @ 84E2638 - .incbin "graphics/map_objects/pics/dolls/meowth_doll.4bpp" - - .align 2 -gFieldObjectPic_ClefairyDoll:: @ 84E26B8 - .incbin "graphics/map_objects/pics/dolls/clefairy_doll.4bpp" - - .align 2 -gFieldObjectPic_DittoDoll:: @ 84E2738 - .incbin "graphics/map_objects/pics/dolls/ditto_doll.4bpp" - - .align 2 -gFieldObjectPic_SmoochumDoll:: @ 84E27B8 - .incbin "graphics/map_objects/pics/dolls/smoochum_doll.4bpp" - - .align 2 -gFieldObjectPic_TreeckoDoll:: @ 84E2838 - .incbin "graphics/map_objects/pics/dolls/treecko_doll.4bpp" - - .align 2 -gFieldObjectPic_TorchicDoll:: @ 84E28B8 - .incbin "graphics/map_objects/pics/dolls/torchic_doll.4bpp" - - .align 2 -gFieldObjectPic_MudkipDoll:: @ 84E2938 - .incbin "graphics/map_objects/pics/dolls/mudkip_doll.4bpp" - - .align 2 -gFieldObjectPic_DuskullDoll:: @ 84E29B8 - .incbin "graphics/map_objects/pics/dolls/duskull_doll.4bpp" - - .align 2 -gFieldObjectPic_WynautDoll:: @ 84E2A38 - .incbin "graphics/map_objects/pics/dolls/wynaut_doll.4bpp" - - .align 2 -gFieldObjectPic_BaltoyDoll:: @ 84E2AB8 - .incbin "graphics/map_objects/pics/dolls/baltoy_doll.4bpp" - - .align 2 -gFieldObjectPic_KecleonDoll:: @ 84E2B38 - .incbin "graphics/map_objects/pics/dolls/kecleon_doll.4bpp" - - .align 2 -gFieldObjectPic_AzurillDoll:: @ 84E2BB8 - .incbin "graphics/map_objects/pics/dolls/azurill_doll.4bpp" - - .align 2 -gFieldObjectPic_SkittyDoll:: @ 84E2C38 - .incbin "graphics/map_objects/pics/dolls/skitty_doll.4bpp" - - .align 2 -gFieldObjectPic_SwabluDoll:: @ 84E2CB8 - .incbin "graphics/map_objects/pics/dolls/swablu_doll.4bpp" - - .align 2 -gFieldObjectPic_GulpinDoll:: @ 84E2D38 - .incbin "graphics/map_objects/pics/dolls/gulpin_doll.4bpp" - - .align 2 -gFieldObjectPic_LotadDoll:: @ 84E2DB8 - .incbin "graphics/map_objects/pics/dolls/lotad_doll.4bpp" - - .align 2 -gFieldObjectPic_SeedotDoll:: @ 84E2E38 - .incbin "graphics/map_objects/pics/dolls/seedot_doll.4bpp" - - .align 2 -gFieldObjectPic_PikaCushion:: @ 84E2EB8 - .incbin "graphics/map_objects/pics/cushions/pika_cushion.4bpp" - - .align 2 -gFieldObjectPic_RoundCushion:: @ 84E2F38 - .incbin "graphics/map_objects/pics/cushions/round_cushion.4bpp" - - .align 2 -gFieldObjectPic_KissCushion:: @ 84E2FB8 - .incbin "graphics/map_objects/pics/cushions/kiss_cushion.4bpp" - - .align 2 -gFieldObjectPic_ZigzagCushion:: @ 84E3038 - .incbin "graphics/map_objects/pics/cushions/zigzag_cushion.4bpp" - - .align 2 -gFieldObjectPic_SpinCushion:: @ 84E30B8 - .incbin "graphics/map_objects/pics/cushions/spin_cushion.4bpp" - - .align 2 -gFieldObjectPic_DiamondCushion:: @ 84E3138 - .incbin "graphics/map_objects/pics/cushions/diamond_cushion.4bpp" - - .align 2 -gFieldObjectPic_BallCushion:: @ 84E31B8 - .incbin "graphics/map_objects/pics/cushions/ball_cushion.4bpp" - - .align 2 -gFieldObjectPic_GrassCushion:: @ 84E3238 - .incbin "graphics/map_objects/pics/cushions/grass_cushion.4bpp" - - .align 2 -gFieldObjectPic_FireCushion:: @ 84E32B8 - .incbin "graphics/map_objects/pics/cushions/fire_cushion.4bpp" - - .align 2 -gFieldObjectPic_WaterCushion:: @ 84E3338 - .incbin "graphics/map_objects/pics/cushions/water_cushion.4bpp" - - .align 2 -gFieldObjectPic_BigSnorlaxDoll:: @ 84E33B8 - .incbin "graphics/map_objects/pics/dolls/big_snorlax_doll.4bpp" - - .align 2 -gFieldObjectPic_BigRhydonDoll:: @ 84E35B8 - .incbin "graphics/map_objects/pics/dolls/big_rhydon_doll.4bpp" - - .align 2 -gFieldObjectPic_BigLaprasDoll:: @ 84E37B8 - .incbin "graphics/map_objects/pics/dolls/big_lapras_doll.4bpp" - - .align 2 -gFieldObjectPic_BigVenusaurDoll:: @ 84E39B8 - .incbin "graphics/map_objects/pics/dolls/big_venusaur_doll.4bpp" - - .align 2 -gFieldObjectPic_BigCharizardDoll:: @ 84E3BB8 - .incbin "graphics/map_objects/pics/dolls/big_charizard_doll.4bpp" - - .align 2 -gFieldObjectPic_BigBlastoiseDoll:: @ 84E3DB8 - .incbin "graphics/map_objects/pics/dolls/big_blastoise_doll.4bpp" - - .align 2 -gFieldObjectPic_BigWailmerDoll:: @ 84E3FB8 - .incbin "graphics/map_objects/pics/dolls/big_wailmer_doll.4bpp" - - .align 2 -gFieldObjectPic_BigRegirockDoll:: @ 84E41B8 - .incbin "graphics/map_objects/pics/dolls/big_regirock_doll.4bpp" - - .align 2 -gFieldObjectPic_BigRegiceDoll:: @ 84E43B8 - .incbin "graphics/map_objects/pics/dolls/big_regice_doll.4bpp" - - .align 2 -gFieldObjectPic_BigRegisteelDoll:: @ 84E45B8 - .incbin "graphics/map_objects/pics/dolls/big_registeel_doll.4bpp" - - .align 2 -gFieldObjectPic_CuttableTree_0:: @ 84E47B8 - .incbin "graphics/map_objects/pics/misc/cuttable_tree/0.4bpp" - - .align 2 -gFieldObjectPic_CuttableTree_1:: @ 84E4838 - .incbin "graphics/map_objects/pics/misc/cuttable_tree/1.4bpp" - - .align 2 -gFieldObjectPic_CuttableTree_2:: @ 84E48B8 - .incbin "graphics/map_objects/pics/misc/cuttable_tree/2.4bpp" - - .align 2 -gFieldObjectPic_CuttableTree_3:: @ 84E4938 - .incbin "graphics/map_objects/pics/misc/cuttable_tree/3.4bpp" - - .align 2 -gFieldObjectPic_BreakableRock_0:: @ 84E49B8 - .incbin "graphics/map_objects/pics/misc/breakable_rock/0.4bpp" - - .align 2 -gFieldObjectPic_BreakableRock_1:: @ 84E4A38 - .incbin "graphics/map_objects/pics/misc/breakable_rock/1.4bpp" - - .align 2 -gFieldObjectPic_BreakableRock_2:: @ 84E4AB8 - .incbin "graphics/map_objects/pics/misc/breakable_rock/2.4bpp" - - .align 2 -gFieldObjectPic_BreakableRock_3:: @ 84E4B38 - .incbin "graphics/map_objects/pics/misc/breakable_rock/3.4bpp" - - .align 2 -gFieldObjectPic_PushableBoulder:: @ 84E4BB8 - .incbin "graphics/map_objects/pics/misc/pushable_boulder.4bpp" - - .align 2 -gFieldObjectPic_MrBrineysBoat_0:: @ 84E4C38 - .incbin "graphics/map_objects/pics/misc/mr_brineys_boat/0.4bpp" - - .align 2 -gFieldObjectPic_MrBrineysBoat_1:: @ 84E4E38 - .incbin "graphics/map_objects/pics/misc/mr_brineys_boat/1.4bpp" - - .align 2 -gFieldObjectPic_MrBrineysBoat_2:: @ 84E5038 - .incbin "graphics/map_objects/pics/misc/mr_brineys_boat/2.4bpp" - - .align 2 -gFieldObjectPic_Fossil:: @ 84E5238 - .incbin "graphics/map_objects/pics/misc/fossil.4bpp" - - .align 2 -gFieldObjectPic_SubmarineShadow:: @ 84E52B8 - .incbin "graphics/map_objects/pics/misc/submarine_shadow.4bpp" - - .align 2 -gFieldObjectPalette26:: @ 84E5838 - .incbin "graphics/map_objects/palettes/field_object_palette_26.gbapal" - - .align 2 -gFieldObjectPic_Truck:: @ 84E5858 - .incbin "graphics/map_objects/pics/misc/truck.4bpp" - - .align 2 -gFieldObjectPalette14:: @ 84E5CD8 - .incbin "graphics/map_objects/palettes/field_object_palette_14.gbapal" - - .align 2 -gFieldObjectPic_VigorothCarryingBox_0:: @ 84E5CF8 - .incbin "graphics/map_objects/pics/pokemon/vigoroth_carrying_box/0.4bpp" - - .align 2 -gFieldObjectPic_VigorothCarryingBox_1:: @ 84E5EF8 - .incbin "graphics/map_objects/pics/pokemon/vigoroth_carrying_box/1.4bpp" - - .align 2 -gFieldObjectPic_VigorothCarryingBox_2:: @ 84E60F8 - .incbin "graphics/map_objects/pics/pokemon/vigoroth_carrying_box/2.4bpp" - - .align 2 -gFieldObjectPic_VigorothFacingAway_0:: @ 84E62F8 - .incbin "graphics/map_objects/pics/pokemon/vigoroth_facing_away/0.4bpp" - - .align 2 -gFieldObjectPic_VigorothFacingAway_1:: @ 84E64F8 - .incbin "graphics/map_objects/pics/pokemon/vigoroth_facing_away/1.4bpp" - - .align 2 -gFieldObjectPalette15:: @ 84E66F8 - .incbin "graphics/map_objects/palettes/field_object_palette_15.gbapal" - - .align 2 -gFieldObjectPic_BirchsBag:: @ 84E6718 - .incbin "graphics/map_objects/pics/misc/birchs_bag.4bpp" - - .align 2 -gFieldObjectPic_EnemyZigzagoon_0:: @ 84E6798 - .incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/0.4bpp" - - .align 2 -gFieldObjectPic_EnemyZigzagoon_1:: @ 84E6998 - .incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/1.4bpp" - - .align 2 -gFieldObjectPic_EnemyZigzagoon_2:: @ 84E6B98 - .incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/2.4bpp" - - .align 2 -gFieldObjectPic_EnemyZigzagoon_3:: @ 84E6D98 - .incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/3.4bpp" - - .align 2 -gFieldObjectPic_EnemyZigzagoon_4:: @ 84E6F98 - .incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/4.4bpp" - - .align 2 -gFieldObjectPic_EnemyZigzagoon_5:: @ 84E7198 - .incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/5.4bpp" - - .align 2 -gFieldObjectPic_EnemyZigzagoon_6:: @ 84E7398 - .incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/6.4bpp" - - .align 2 -gFieldObjectPic_EnemyZigzagoon_7:: @ 84E7598 - .incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/7.4bpp" - - .align 2 -gFieldObjectPic_EnemyZigzagoon_8:: @ 84E7798 - .incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/8.4bpp" - - .align 2 -gFieldObjectPalette16:: @ 84E7998 - .incbin "graphics/map_objects/palettes/field_object_palette_16.gbapal" - - .align 2 -gFieldObjectPic_Poochyena_0:: @ 84E79B8 - .incbin "graphics/map_objects/pics/pokemon/poochyena/0.4bpp" - - .align 2 -gFieldObjectPic_Poochyena_1:: @ 84E7BB8 - .incbin "graphics/map_objects/pics/pokemon/poochyena/1.4bpp" - - .align 2 -gFieldObjectPic_Poochyena_2:: @ 84E7DB8 - .incbin "graphics/map_objects/pics/pokemon/poochyena/2.4bpp" - - .align 2 -gFieldObjectPic_Poochyena_3:: @ 84E7FB8 - .incbin "graphics/map_objects/pics/pokemon/poochyena/3.4bpp" - - .align 2 -gFieldObjectPic_Poochyena_4:: @ 84E81B8 - .incbin "graphics/map_objects/pics/pokemon/poochyena/4.4bpp" - - .align 2 -gFieldObjectPic_Poochyena_5:: @ 84E83B8 - .incbin "graphics/map_objects/pics/pokemon/poochyena/5.4bpp" - - .align 2 -gFieldObjectPic_Poochyena_6:: @ 84E85B8 - .incbin "graphics/map_objects/pics/pokemon/poochyena/6.4bpp" - - .align 2 -gFieldObjectPic_Poochyena_7:: @ 84E87B8 - .incbin "graphics/map_objects/pics/pokemon/poochyena/7.4bpp" - - .align 2 -gFieldObjectPic_Poochyena_8:: @ 84E89B8 - .incbin "graphics/map_objects/pics/pokemon/poochyena/8.4bpp" - - .align 2 -gFieldObjectPalette27:: @ 84E8BB8 - .incbin "graphics/map_objects/palettes/field_object_palette_27.gbapal" - - .align 2 -gFieldObjectPic_CableCar:: @ 84E8BD8 - .incbin "graphics/map_objects/pics/misc/cable_car.4bpp" - - .align 2 -gFieldObjectPalette20:: @ 84E93D8 - .incbin "graphics/map_objects/palettes/field_object_palette_20.gbapal" - - .align 2 -gFieldObjectPic_SSTidal:: @ 84E93F8 - .incbin "graphics/map_objects/pics/misc/ss_tidal.4bpp" - - .align 2 -gFieldObjectPalette21:: @ 84E9B78 - .incbin "graphics/map_objects/palettes/field_object_palette_21.gbapal" - - .align 2 -gFieldEffectObjectPic_BerryTreeGrowthSparkle_0:: @ 84E9B98 - .incbin "graphics/map_objects/pics/effects/berry_tree_growth_sparkle/0.4bpp" - - .align 2 -gFieldEffectObjectPic_BerryTreeGrowthSparkle_1:: @ 84E9C18 - .incbin "graphics/map_objects/pics/effects/berry_tree_growth_sparkle/1.4bpp" - - .align 2 -gFieldEffectObjectPic_BerryTreeGrowthSparkle_2:: @ 84E9C98 - .incbin "graphics/map_objects/pics/effects/berry_tree_growth_sparkle/2.4bpp" - - .align 2 -gFieldEffectObjectPic_BerryTreeGrowthSparkle_3:: @ 84E9D18 - .incbin "graphics/map_objects/pics/effects/berry_tree_growth_sparkle/3.4bpp" - - .align 2 -gFieldEffectObjectPic_BerryTreeGrowthSparkle_4:: @ 84E9D98 - .incbin "graphics/map_objects/pics/effects/berry_tree_growth_sparkle/4.4bpp" - - .align 2 -gFieldEffectObjectPic_BerryTreeGrowthSparkle_5:: @ 84E9E18 - .incbin "graphics/map_objects/pics/effects/berry_tree_growth_sparkle/5.4bpp" - - .align 2 -gFieldObjectPic_BerryTreeDirtPile:: @ 84E9E98 - .incbin "graphics/map_objects/pics/berry_trees/dirt_pile.4bpp" - - .align 2 -gFieldObjectPic_BerryTreeSprout_0:: @ 84E9F18 - .incbin "graphics/map_objects/pics/berry_trees/sprout/0.4bpp" - - .align 2 -gFieldObjectPic_BerryTreeSprout_1:: @ 84E9F98 - .incbin "graphics/map_objects/pics/berry_trees/sprout/1.4bpp" - - .align 2 -gFieldObjectPic_PechaBerryTree_0:: @ 84EA018 - .incbin "graphics/map_objects/pics/berry_trees/pecha/0.4bpp" - - .align 2 -gFieldObjectPic_PechaBerryTree_1:: @ 84EA118 - .incbin "graphics/map_objects/pics/berry_trees/pecha/1.4bpp" - - .align 2 -gFieldObjectPic_PechaBerryTree_2:: @ 84EA218 - .incbin "graphics/map_objects/pics/berry_trees/pecha/2.4bpp" - - .align 2 -gFieldObjectPic_PechaBerryTree_3:: @ 84EA318 - .incbin "graphics/map_objects/pics/berry_trees/pecha/3.4bpp" - - .align 2 -gFieldObjectPic_PechaBerryTree_4:: @ 84EA418 - .incbin "graphics/map_objects/pics/berry_trees/pecha/4.4bpp" - - .align 2 -gFieldObjectPic_PechaBerryTree_5:: @ 84EA518 - .incbin "graphics/map_objects/pics/berry_trees/pecha/5.4bpp" - - .align 2 -gFieldObjectPic_KelpsyBerryTree_0:: @ 84EA618 - .incbin "graphics/map_objects/pics/berry_trees/kelpsy/0.4bpp" - - .align 2 -gFieldObjectPic_KelpsyBerryTree_1:: @ 84EA718 - .incbin "graphics/map_objects/pics/berry_trees/kelpsy/1.4bpp" - - .align 2 -gFieldObjectPic_KelpsyBerryTree_2:: @ 84EA818 - .incbin "graphics/map_objects/pics/berry_trees/kelpsy/2.4bpp" - - .align 2 -gFieldObjectPic_KelpsyBerryTree_3:: @ 84EA918 - .incbin "graphics/map_objects/pics/berry_trees/kelpsy/3.4bpp" - - .align 2 -gFieldObjectPic_KelpsyBerryTree_4:: @ 84EAA18 - .incbin "graphics/map_objects/pics/berry_trees/kelpsy/4.4bpp" - - .align 2 -gFieldObjectPic_KelpsyBerryTree_5:: @ 84EAB18 - .incbin "graphics/map_objects/pics/berry_trees/kelpsy/5.4bpp" - - .align 2 -gFieldObjectPic_WepearBerryTree_0:: @ 84EAC18 - .incbin "graphics/map_objects/pics/berry_trees/wepear/0.4bpp" - - .align 2 -gFieldObjectPic_WepearBerryTree_1:: @ 84EAD18 - .incbin "graphics/map_objects/pics/berry_trees/wepear/1.4bpp" - - .align 2 -gFieldObjectPic_WepearBerryTree_2:: @ 84EAE18 - .incbin "graphics/map_objects/pics/berry_trees/wepear/2.4bpp" - - .align 2 -gFieldObjectPic_WepearBerryTree_3:: @ 84EAF18 - .incbin "graphics/map_objects/pics/berry_trees/wepear/3.4bpp" - - .align 2 -gFieldObjectPic_WepearBerryTree_4:: @ 84EB018 - .incbin "graphics/map_objects/pics/berry_trees/wepear/4.4bpp" - - .align 2 -gFieldObjectPic_WepearBerryTree_5:: @ 84EB118 - .incbin "graphics/map_objects/pics/berry_trees/wepear/5.4bpp" - - .align 2 -gFieldObjectPic_IapapaBerryTree_0:: @ 84EB218 - .incbin "graphics/map_objects/pics/berry_trees/iapapa/0.4bpp" - - .align 2 -gFieldObjectPic_IapapaBerryTree_1:: @ 84EB318 - .incbin "graphics/map_objects/pics/berry_trees/iapapa/1.4bpp" - - .align 2 -gFieldObjectPic_IapapaBerryTree_2:: @ 84EB418 - .incbin "graphics/map_objects/pics/berry_trees/iapapa/2.4bpp" - - .align 2 -gFieldObjectPic_IapapaBerryTree_3:: @ 84EB518 - .incbin "graphics/map_objects/pics/berry_trees/iapapa/3.4bpp" - - .align 2 -gFieldObjectPic_IapapaBerryTree_4:: @ 84EB618 - .incbin "graphics/map_objects/pics/berry_trees/iapapa/4.4bpp" - - .align 2 -gFieldObjectPic_IapapaBerryTree_5:: @ 84EB718 - .incbin "graphics/map_objects/pics/berry_trees/iapapa/5.4bpp" - - .align 2 -gFieldObjectPic_CheriBerryTree_0:: @ 84EB818 - .incbin "graphics/map_objects/pics/berry_trees/cheri/0.4bpp" - - .align 2 -gFieldObjectPic_CheriBerryTree_1:: @ 84EB918 - .incbin "graphics/map_objects/pics/berry_trees/cheri/1.4bpp" - - .align 2 -gFieldObjectPic_CheriBerryTree_2:: @ 84EBA18 - .incbin "graphics/map_objects/pics/berry_trees/cheri/2.4bpp" - - .align 2 -gFieldObjectPic_CheriBerryTree_3:: @ 84EBB18 - .incbin "graphics/map_objects/pics/berry_trees/cheri/3.4bpp" - - .align 2 -gFieldObjectPic_CheriBerryTree_4:: @ 84EBC18 - .incbin "graphics/map_objects/pics/berry_trees/cheri/4.4bpp" - - .align 2 -gFieldObjectPic_CheriBerryTree_5:: @ 84EBD18 - .incbin "graphics/map_objects/pics/berry_trees/cheri/5.4bpp" - - .align 2 -gFieldObjectPic_FigyBerryTree_0:: @ 84EBE18 - .incbin "graphics/map_objects/pics/berry_trees/figy/0.4bpp" - - .align 2 -gFieldObjectPic_FigyBerryTree_1:: @ 84EBF18 - .incbin "graphics/map_objects/pics/berry_trees/figy/1.4bpp" - - .align 2 -gFieldObjectPic_FigyBerryTree_2:: @ 84EC018 - .incbin "graphics/map_objects/pics/berry_trees/figy/2.4bpp" - - .align 2 -gFieldObjectPic_FigyBerryTree_3:: @ 84EC118 - .incbin "graphics/map_objects/pics/berry_trees/figy/3.4bpp" - - .align 2 -gFieldObjectPic_FigyBerryTree_4:: @ 84EC218 - .incbin "graphics/map_objects/pics/berry_trees/figy/4.4bpp" - - .align 2 -gFieldObjectPic_FigyBerryTree_5:: @ 84EC318 - .incbin "graphics/map_objects/pics/berry_trees/figy/5.4bpp" - - .align 2 -gFieldObjectPic_MagoBerryTree_0:: @ 84EC418 - .incbin "graphics/map_objects/pics/berry_trees/mago/0.4bpp" - - .align 2 -gFieldObjectPic_MagoBerryTree_1:: @ 84EC518 - .incbin "graphics/map_objects/pics/berry_trees/mago/1.4bpp" - - .align 2 -gFieldObjectPic_MagoBerryTree_2:: @ 84EC618 - .incbin "graphics/map_objects/pics/berry_trees/mago/2.4bpp" - - .align 2 -gFieldObjectPic_MagoBerryTree_3:: @ 84EC718 - .incbin "graphics/map_objects/pics/berry_trees/mago/3.4bpp" - - .align 2 -gFieldObjectPic_MagoBerryTree_4:: @ 84EC818 - .incbin "graphics/map_objects/pics/berry_trees/mago/4.4bpp" - - .align 2 -gFieldObjectPic_MagoBerryTree_5:: @ 84EC918 - .incbin "graphics/map_objects/pics/berry_trees/mago/5.4bpp" - - .align 2 -gFieldObjectPic_LumBerryTree_0:: @ 84ECA18 - .incbin "graphics/map_objects/pics/berry_trees/lum/0.4bpp" - - .align 2 -gFieldObjectPic_LumBerryTree_1:: @ 84ECB18 - .incbin "graphics/map_objects/pics/berry_trees/lum/1.4bpp" - - .align 2 -gFieldObjectPic_LumBerryTree_2:: @ 84ECC18 - .incbin "graphics/map_objects/pics/berry_trees/lum/2.4bpp" - - .align 2 -gFieldObjectPic_LumBerryTree_3:: @ 84ECD18 - .incbin "graphics/map_objects/pics/berry_trees/lum/3.4bpp" - - .align 2 -gFieldObjectPic_LumBerryTree_4:: @ 84ECE18 - .incbin "graphics/map_objects/pics/berry_trees/lum/4.4bpp" - - .align 2 -gFieldObjectPic_LumBerryTree_5:: @ 84ECF18 - .incbin "graphics/map_objects/pics/berry_trees/lum/5.4bpp" - - .align 2 -gFieldObjectPic_RazzBerryTree_0:: @ 84ED018 - .incbin "graphics/map_objects/pics/berry_trees/razz/0.4bpp" - - .align 2 -gFieldObjectPic_RazzBerryTree_1:: @ 84ED118 - .incbin "graphics/map_objects/pics/berry_trees/razz/1.4bpp" - - .align 2 -gFieldObjectPic_RazzBerryTree_2:: @ 84ED218 - .incbin "graphics/map_objects/pics/berry_trees/razz/2.4bpp" - - .align 2 -gFieldObjectPic_RazzBerryTree_3:: @ 84ED318 - .incbin "graphics/map_objects/pics/berry_trees/razz/3.4bpp" - - .align 2 -gFieldObjectPic_RazzBerryTree_4:: @ 84ED418 - .incbin "graphics/map_objects/pics/berry_trees/razz/4.4bpp" - - .align 2 -gFieldObjectPic_RazzBerryTree_5:: @ 84ED518 - .incbin "graphics/map_objects/pics/berry_trees/razz/5.4bpp" - - .align 2 -gFieldObjectPic_GrepaBerryTree_0:: @ 84ED618 - .incbin "graphics/map_objects/pics/berry_trees/grepa/0.4bpp" - - .align 2 -gFieldObjectPic_GrepaBerryTree_1:: @ 84ED718 - .incbin "graphics/map_objects/pics/berry_trees/grepa/1.4bpp" - - .align 2 -gFieldObjectPic_GrepaBerryTree_2:: @ 84ED818 - .incbin "graphics/map_objects/pics/berry_trees/grepa/2.4bpp" - - .align 2 -gFieldObjectPic_GrepaBerryTree_3:: @ 84ED918 - .incbin "graphics/map_objects/pics/berry_trees/grepa/3.4bpp" - - .align 2 -gFieldObjectPic_GrepaBerryTree_4:: @ 84EDA18 - .incbin "graphics/map_objects/pics/berry_trees/grepa/4.4bpp" - - .align 2 -gFieldObjectPic_GrepaBerryTree_5:: @ 84EDB18 - .incbin "graphics/map_objects/pics/berry_trees/grepa/5.4bpp" - - .align 2 -gFieldObjectPic_RabutaBerryTree_0:: @ 84EDC18 - .incbin "graphics/map_objects/pics/berry_trees/rabuta/0.4bpp" - - .align 2 -gFieldObjectPic_RabutaBerryTree_1:: @ 84EDD18 - .incbin "graphics/map_objects/pics/berry_trees/rabuta/1.4bpp" - - .align 2 -gFieldObjectPic_RabutaBerryTree_2:: @ 84EDE18 - .incbin "graphics/map_objects/pics/berry_trees/rabuta/2.4bpp" - - .align 2 -gFieldObjectPic_RabutaBerryTree_3:: @ 84EDF18 - .incbin "graphics/map_objects/pics/berry_trees/rabuta/3.4bpp" - - .align 2 -gFieldObjectPic_RabutaBerryTree_4:: @ 84EE018 - .incbin "graphics/map_objects/pics/berry_trees/rabuta/4.4bpp" - - .align 2 -gFieldObjectPic_RabutaBerryTree_5:: @ 84EE118 - .incbin "graphics/map_objects/pics/berry_trees/rabuta/5.4bpp" - - .align 2 -gFieldObjectPic_NomelBerryTree_0:: @ 84EE218 - .incbin "graphics/map_objects/pics/berry_trees/nomel/0.4bpp" - - .align 2 -gFieldObjectPic_NomelBerryTree_1:: @ 84EE318 - .incbin "graphics/map_objects/pics/berry_trees/nomel/1.4bpp" - - .align 2 -gFieldObjectPic_NomelBerryTree_2:: @ 84EE418 - .incbin "graphics/map_objects/pics/berry_trees/nomel/2.4bpp" - - .align 2 -gFieldObjectPic_NomelBerryTree_3:: @ 84EE518 - .incbin "graphics/map_objects/pics/berry_trees/nomel/3.4bpp" - - .align 2 -gFieldObjectPic_NomelBerryTree_4:: @ 84EE618 - .incbin "graphics/map_objects/pics/berry_trees/nomel/4.4bpp" - - .align 2 -gFieldObjectPic_NomelBerryTree_5:: @ 84EE718 - .incbin "graphics/map_objects/pics/berry_trees/nomel/5.4bpp" - - .align 2 -gFieldObjectPic_LeppaBerryTree_0:: @ 84EE818 - .incbin "graphics/map_objects/pics/berry_trees/leppa/0.4bpp" - - .align 2 -gFieldObjectPic_LeppaBerryTree_1:: @ 84EE918 - .incbin "graphics/map_objects/pics/berry_trees/leppa/1.4bpp" - - .align 2 -gFieldObjectPic_LeppaBerryTree_2:: @ 84EEA18 - .incbin "graphics/map_objects/pics/berry_trees/leppa/2.4bpp" - - .align 2 -gFieldObjectPic_LeppaBerryTree_3:: @ 84EEB18 - .incbin "graphics/map_objects/pics/berry_trees/leppa/3.4bpp" - - .align 2 -gFieldObjectPic_LeppaBerryTree_4:: @ 84EEC18 - .incbin "graphics/map_objects/pics/berry_trees/leppa/4.4bpp" - - .align 2 -gFieldObjectPic_LeppaBerryTree_5:: @ 84EED18 - .incbin "graphics/map_objects/pics/berry_trees/leppa/5.4bpp" - - .align 2 -gFieldObjectPic_LiechiBerryTree_0:: @ 84EEE18 - .incbin "graphics/map_objects/pics/berry_trees/liechi/0.4bpp" - - .align 2 -gFieldObjectPic_LiechiBerryTree_1:: @ 84EEF18 - .incbin "graphics/map_objects/pics/berry_trees/liechi/1.4bpp" - - .align 2 -gFieldObjectPic_LiechiBerryTree_2:: @ 84EF018 - .incbin "graphics/map_objects/pics/berry_trees/liechi/2.4bpp" - - .align 2 -gFieldObjectPic_LiechiBerryTree_3:: @ 84EF118 - .incbin "graphics/map_objects/pics/berry_trees/liechi/3.4bpp" - - .align 2 -gFieldObjectPic_LiechiBerryTree_4:: @ 84EF218 - .incbin "graphics/map_objects/pics/berry_trees/liechi/4.4bpp" - - .align 2 -gFieldObjectPic_LiechiBerryTree_5:: @ 84EF318 - .incbin "graphics/map_objects/pics/berry_trees/liechi/5.4bpp" - - .align 2 -gFieldObjectPic_HondewBerryTree_0:: @ 84EF418 - .incbin "graphics/map_objects/pics/berry_trees/hondew/0.4bpp" - - .align 2 -gFieldObjectPic_HondewBerryTree_1:: @ 84EF518 - .incbin "graphics/map_objects/pics/berry_trees/hondew/1.4bpp" - - .align 2 -gFieldObjectPic_HondewBerryTree_2:: @ 84EF618 - .incbin "graphics/map_objects/pics/berry_trees/hondew/2.4bpp" - - .align 2 -gFieldObjectPic_HondewBerryTree_3:: @ 84EF718 - .incbin "graphics/map_objects/pics/berry_trees/hondew/3.4bpp" - - .align 2 -gFieldObjectPic_HondewBerryTree_4:: @ 84EF818 - .incbin "graphics/map_objects/pics/berry_trees/hondew/4.4bpp" - - .align 2 -gFieldObjectPic_HondewBerryTree_5:: @ 84EF918 - .incbin "graphics/map_objects/pics/berry_trees/hondew/5.4bpp" - - .align 2 -gFieldObjectPic_AguavBerryTree_0:: @ 84EFA18 - .incbin "graphics/map_objects/pics/berry_trees/aguav/0.4bpp" - - .align 2 -gFieldObjectPic_AguavBerryTree_1:: @ 84EFB18 - .incbin "graphics/map_objects/pics/berry_trees/aguav/1.4bpp" - - .align 2 -gFieldObjectPic_AguavBerryTree_2:: @ 84EFC18 - .incbin "graphics/map_objects/pics/berry_trees/aguav/2.4bpp" - - .align 2 -gFieldObjectPic_AguavBerryTree_3:: @ 84EFD18 - .incbin "graphics/map_objects/pics/berry_trees/aguav/3.4bpp" - - .align 2 -gFieldObjectPic_AguavBerryTree_4:: @ 84EFE18 - .incbin "graphics/map_objects/pics/berry_trees/aguav/4.4bpp" - - .align 2 -gFieldObjectPic_AguavBerryTree_5:: @ 84EFF18 - .incbin "graphics/map_objects/pics/berry_trees/aguav/5.4bpp" - - .align 2 -gFieldObjectPic_WikiBerryTree_0:: @ 84F0018 - .incbin "graphics/map_objects/pics/berry_trees/wiki/0.4bpp" - - .align 2 -gFieldObjectPic_WikiBerryTree_1:: @ 84F0118 - .incbin "graphics/map_objects/pics/berry_trees/wiki/1.4bpp" - - .align 2 -gFieldObjectPic_WikiBerryTree_2:: @ 84F0218 - .incbin "graphics/map_objects/pics/berry_trees/wiki/2.4bpp" - - .align 2 -gFieldObjectPic_WikiBerryTree_3:: @ 84F0318 - .incbin "graphics/map_objects/pics/berry_trees/wiki/3.4bpp" - - .align 2 -gFieldObjectPic_WikiBerryTree_4:: @ 84F0418 - .incbin "graphics/map_objects/pics/berry_trees/wiki/4.4bpp" - - .align 2 -gFieldObjectPic_WikiBerryTree_5:: @ 84F0518 - .incbin "graphics/map_objects/pics/berry_trees/wiki/5.4bpp" - - .align 2 -gFieldObjectPic_PomegBerryTree_0:: @ 84F0618 - .incbin "graphics/map_objects/pics/berry_trees/pomeg/0.4bpp" - - .align 2 -gFieldObjectPic_PomegBerryTree_1:: @ 84F0718 - .incbin "graphics/map_objects/pics/berry_trees/pomeg/1.4bpp" - - .align 2 -gFieldObjectPic_PomegBerryTree_2:: @ 84F0818 - .incbin "graphics/map_objects/pics/berry_trees/pomeg/2.4bpp" - - .align 2 -gFieldObjectPic_PomegBerryTree_3:: @ 84F0918 - .incbin "graphics/map_objects/pics/berry_trees/pomeg/3.4bpp" - - .align 2 -gFieldObjectPic_PomegBerryTree_4:: @ 84F0A18 - .incbin "graphics/map_objects/pics/berry_trees/pomeg/4.4bpp" - - .align 2 -gFieldObjectPic_PomegBerryTree_5:: @ 84F0B18 - .incbin "graphics/map_objects/pics/berry_trees/pomeg/5.4bpp" - - .align 2 -gFieldObjectPic_RawstBerryTree_0:: @ 84F0C18 - .incbin "graphics/map_objects/pics/berry_trees/rawst/0.4bpp" - - .align 2 -gFieldObjectPic_RawstBerryTree_1:: @ 84F0D18 - .incbin "graphics/map_objects/pics/berry_trees/rawst/1.4bpp" - - .align 2 -gFieldObjectPic_RawstBerryTree_2:: @ 84F0E18 - .incbin "graphics/map_objects/pics/berry_trees/rawst/2.4bpp" - - .align 2 -gFieldObjectPic_RawstBerryTree_3:: @ 84F0F18 - .incbin "graphics/map_objects/pics/berry_trees/rawst/3.4bpp" - - .align 2 -gFieldObjectPic_RawstBerryTree_4:: @ 84F1018 - .incbin "graphics/map_objects/pics/berry_trees/rawst/4.4bpp" - - .align 2 -gFieldObjectPic_RawstBerryTree_5:: @ 84F1118 - .incbin "graphics/map_objects/pics/berry_trees/rawst/5.4bpp" - - .align 2 -gFieldObjectPic_SpelonBerryTree_0:: @ 84F1218 - .incbin "graphics/map_objects/pics/berry_trees/spelon/0.4bpp" - - .align 2 -gFieldObjectPic_SpelonBerryTree_1:: @ 84F1318 - .incbin "graphics/map_objects/pics/berry_trees/spelon/1.4bpp" - - .align 2 -gFieldObjectPic_SpelonBerryTree_2:: @ 84F1418 - .incbin "graphics/map_objects/pics/berry_trees/spelon/2.4bpp" - - .align 2 -gFieldObjectPic_SpelonBerryTree_3:: @ 84F1518 - .incbin "graphics/map_objects/pics/berry_trees/spelon/3.4bpp" - - .align 2 -gFieldObjectPic_SpelonBerryTree_4:: @ 84F1618 - .incbin "graphics/map_objects/pics/berry_trees/spelon/4.4bpp" - - .align 2 -gFieldObjectPic_SpelonBerryTree_5:: @ 84F1718 - .incbin "graphics/map_objects/pics/berry_trees/spelon/5.4bpp" - - .align 2 -gFieldObjectPic_ChestoBerryTree_0:: @ 84F1818 - .incbin "graphics/map_objects/pics/berry_trees/chesto/0.4bpp" - - .align 2 -gFieldObjectPic_ChestoBerryTree_1:: @ 84F1918 - .incbin "graphics/map_objects/pics/berry_trees/chesto/1.4bpp" - - .align 2 -gFieldObjectPic_ChestoBerryTree_2:: @ 84F1A18 - .incbin "graphics/map_objects/pics/berry_trees/chesto/2.4bpp" - - .align 2 -gFieldObjectPic_ChestoBerryTree_3:: @ 84F1B18 - .incbin "graphics/map_objects/pics/berry_trees/chesto/3.4bpp" - - .align 2 -gFieldObjectPic_ChestoBerryTree_4:: @ 84F1C18 - .incbin "graphics/map_objects/pics/berry_trees/chesto/4.4bpp" - - .align 2 -gFieldObjectPic_ChestoBerryTree_5:: @ 84F1D18 - .incbin "graphics/map_objects/pics/berry_trees/chesto/5.4bpp" - - .align 2 -gFieldObjectPic_OranBerryTree_0:: @ 84F1E18 - .incbin "graphics/map_objects/pics/berry_trees/oran/0.4bpp" - - .align 2 -gFieldObjectPic_OranBerryTree_1:: @ 84F1F18 - .incbin "graphics/map_objects/pics/berry_trees/oran/1.4bpp" - - .align 2 -gFieldObjectPic_OranBerryTree_2:: @ 84F2018 - .incbin "graphics/map_objects/pics/berry_trees/oran/2.4bpp" - - .align 2 -gFieldObjectPic_OranBerryTree_3:: @ 84F2118 - .incbin "graphics/map_objects/pics/berry_trees/oran/3.4bpp" - - .align 2 -gFieldObjectPic_OranBerryTree_4:: @ 84F2218 - .incbin "graphics/map_objects/pics/berry_trees/oran/4.4bpp" - - .align 2 -gFieldObjectPic_OranBerryTree_5:: @ 84F2318 - .incbin "graphics/map_objects/pics/berry_trees/oran/5.4bpp" - - .align 2 -gFieldObjectPic_PersimBerryTree_0:: @ 84F2418 - .incbin "graphics/map_objects/pics/berry_trees/persim/0.4bpp" - - .align 2 -gFieldObjectPic_PersimBerryTree_1:: @ 84F2518 - .incbin "graphics/map_objects/pics/berry_trees/persim/1.4bpp" - - .align 2 -gFieldObjectPic_PersimBerryTree_2:: @ 84F2618 - .incbin "graphics/map_objects/pics/berry_trees/persim/2.4bpp" - - .align 2 -gFieldObjectPic_PersimBerryTree_3:: @ 84F2718 - .incbin "graphics/map_objects/pics/berry_trees/persim/3.4bpp" - - .align 2 -gFieldObjectPic_PersimBerryTree_4:: @ 84F2818 - .incbin "graphics/map_objects/pics/berry_trees/persim/4.4bpp" - - .align 2 -gFieldObjectPic_PersimBerryTree_5:: @ 84F2918 - .incbin "graphics/map_objects/pics/berry_trees/persim/5.4bpp" - - .align 2 -gFieldObjectPic_SitrusBerryTree_0:: @ 84F2A18 - .incbin "graphics/map_objects/pics/berry_trees/sitrus/0.4bpp" - - .align 2 -gFieldObjectPic_SitrusBerryTree_1:: @ 84F2B18 - .incbin "graphics/map_objects/pics/berry_trees/sitrus/1.4bpp" - - .align 2 -gFieldObjectPic_SitrusBerryTree_2:: @ 84F2C18 - .incbin "graphics/map_objects/pics/berry_trees/sitrus/2.4bpp" - - .align 2 -gFieldObjectPic_SitrusBerryTree_3:: @ 84F2D18 - .incbin "graphics/map_objects/pics/berry_trees/sitrus/3.4bpp" - - .align 2 -gFieldObjectPic_SitrusBerryTree_4:: @ 84F2E18 - .incbin "graphics/map_objects/pics/berry_trees/sitrus/4.4bpp" - - .align 2 -gFieldObjectPic_SitrusBerryTree_5:: @ 84F2F18 - .incbin "graphics/map_objects/pics/berry_trees/sitrus/5.4bpp" - - .align 2 -gFieldObjectPic_AspearBerryTree_0:: @ 84F3018 - .incbin "graphics/map_objects/pics/berry_trees/aspear/0.4bpp" - - .align 2 -gFieldObjectPic_AspearBerryTree_1:: @ 84F3118 - .incbin "graphics/map_objects/pics/berry_trees/aspear/1.4bpp" - - .align 2 -gFieldObjectPic_AspearBerryTree_2:: @ 84F3218 - .incbin "graphics/map_objects/pics/berry_trees/aspear/2.4bpp" - - .align 2 -gFieldObjectPic_AspearBerryTree_3:: @ 84F3318 - .incbin "graphics/map_objects/pics/berry_trees/aspear/3.4bpp" - - .align 2 -gFieldObjectPic_AspearBerryTree_4:: @ 84F3418 - .incbin "graphics/map_objects/pics/berry_trees/aspear/4.4bpp" - - .align 2 -gFieldObjectPic_AspearBerryTree_5:: @ 84F3518 - .incbin "graphics/map_objects/pics/berry_trees/aspear/5.4bpp" - - .align 2 -gFieldObjectPic_PamtreBerryTree_0:: @ 84F3618 - .incbin "graphics/map_objects/pics/berry_trees/pamtre/0.4bpp" - - .align 2 -gFieldObjectPic_PamtreBerryTree_1:: @ 84F3718 - .incbin "graphics/map_objects/pics/berry_trees/pamtre/1.4bpp" - - .align 2 -gFieldObjectPic_PamtreBerryTree_2:: @ 84F3818 - .incbin "graphics/map_objects/pics/berry_trees/pamtre/2.4bpp" - - .align 2 -gFieldObjectPic_PamtreBerryTree_3:: @ 84F3918 - .incbin "graphics/map_objects/pics/berry_trees/pamtre/3.4bpp" - - .align 2 -gFieldObjectPic_PamtreBerryTree_4:: @ 84F3A18 - .incbin "graphics/map_objects/pics/berry_trees/pamtre/4.4bpp" - - .align 2 -gFieldObjectPic_PamtreBerryTree_5:: @ 84F3B18 - .incbin "graphics/map_objects/pics/berry_trees/pamtre/5.4bpp" - - .align 2 -gFieldObjectPic_CornnBerryTree_0:: @ 84F3C18 - .incbin "graphics/map_objects/pics/berry_trees/cornn/0.4bpp" - - .align 2 -gFieldObjectPic_CornnBerryTree_1:: @ 84F3D18 - .incbin "graphics/map_objects/pics/berry_trees/cornn/1.4bpp" - - .align 2 -gFieldObjectPic_CornnBerryTree_2:: @ 84F3E18 - .incbin "graphics/map_objects/pics/berry_trees/cornn/2.4bpp" - - .align 2 -gFieldObjectPic_CornnBerryTree_3:: @ 84F3F18 - .incbin "graphics/map_objects/pics/berry_trees/cornn/3.4bpp" - - .align 2 -gFieldObjectPic_CornnBerryTree_4:: @ 84F4018 - .incbin "graphics/map_objects/pics/berry_trees/cornn/4.4bpp" - - .align 2 -gFieldObjectPic_CornnBerryTree_5:: @ 84F4118 - .incbin "graphics/map_objects/pics/berry_trees/cornn/5.4bpp" - - .align 2 -gFieldObjectPic_LansatBerryTree_0:: @ 84F4218 - .incbin "graphics/map_objects/pics/berry_trees/lansat/0.4bpp" - - .align 2 -gFieldObjectPic_LansatBerryTree_1:: @ 84F4318 - .incbin "graphics/map_objects/pics/berry_trees/lansat/1.4bpp" - - .align 2 -gFieldObjectPic_LansatBerryTree_2:: @ 84F4418 - .incbin "graphics/map_objects/pics/berry_trees/lansat/2.4bpp" - - .align 2 -gFieldObjectPic_LansatBerryTree_3:: @ 84F4518 - .incbin "graphics/map_objects/pics/berry_trees/lansat/3.4bpp" - - .align 2 -gFieldObjectPic_LansatBerryTree_4:: @ 84F4618 - .incbin "graphics/map_objects/pics/berry_trees/lansat/4.4bpp" - - .align 2 -gFieldObjectPic_LansatBerryTree_5:: @ 84F4718 - .incbin "graphics/map_objects/pics/berry_trees/lansat/5.4bpp" - - .align 2 -gFieldObjectPic_DurinBerryTree_0:: @ 84F4818 - .incbin "graphics/map_objects/pics/berry_trees/durin/0.4bpp" - - .align 2 -gFieldObjectPic_DurinBerryTree_1:: @ 84F4918 - .incbin "graphics/map_objects/pics/berry_trees/durin/1.4bpp" - - .align 2 -gFieldObjectPic_DurinBerryTree_2:: @ 84F4A18 - .incbin "graphics/map_objects/pics/berry_trees/durin/2.4bpp" - - .align 2 -gFieldObjectPic_DurinBerryTree_3:: @ 84F4B18 - .incbin "graphics/map_objects/pics/berry_trees/durin/3.4bpp" - - .align 2 -gFieldObjectPic_DurinBerryTree_4:: @ 84F4C18 - .incbin "graphics/map_objects/pics/berry_trees/durin/4.4bpp" - - .align 2 -gFieldObjectPic_DurinBerryTree_5:: @ 84F4D18 - .incbin "graphics/map_objects/pics/berry_trees/durin/5.4bpp" - - .align 2 -gFieldObjectPic_TamatoBerryTree_0:: @ 84F4E18 - .incbin "graphics/map_objects/pics/berry_trees/tamato/0.4bpp" - - .align 2 -gFieldObjectPic_TamatoBerryTree_1:: @ 84F4F18 - .incbin "graphics/map_objects/pics/berry_trees/tamato/1.4bpp" - - .align 2 -gFieldObjectPic_TamatoBerryTree_2:: @ 84F5018 - .incbin "graphics/map_objects/pics/berry_trees/tamato/2.4bpp" - - .align 2 -gFieldObjectPic_TamatoBerryTree_3:: @ 84F5118 - .incbin "graphics/map_objects/pics/berry_trees/tamato/3.4bpp" - - .align 2 -gFieldObjectPic_TamatoBerryTree_4:: @ 84F5218 - .incbin "graphics/map_objects/pics/berry_trees/tamato/4.4bpp" - - .align 2 -gFieldObjectPic_TamatoBerryTree_5:: @ 84F5318 - .incbin "graphics/map_objects/pics/berry_trees/tamato/5.4bpp" - - .align 2 -gFieldEffectObjectPic_SurfBlob_0:: @ 84F5418 - .incbin "graphics/map_objects/pics/effects/surf_blob/0.4bpp" - - .align 2 -gFieldEffectObjectPic_SurfBlob_1:: @ 84F5618 - .incbin "graphics/map_objects/pics/effects/surf_blob/1.4bpp" - - .align 2 -gFieldEffectObjectPic_SurfBlob_2:: @ 84F5818 - .incbin "graphics/map_objects/pics/effects/surf_blob/2.4bpp" - - .align 2 -gFieldObjectPic_QuintyPlump_0:: @ 84F5A18 - .incbin "graphics/map_objects/pics/people/quinty_plump/0.4bpp" - - .align 2 -gFieldObjectPic_QuintyPlump_1:: @ 84F5C18 - .incbin "graphics/map_objects/pics/people/quinty_plump/1.4bpp" - - .align 2 -gFieldObjectPic_QuintyPlump_2:: @ 84F5E18 - .incbin "graphics/map_objects/pics/people/quinty_plump/2.4bpp" - - .align 2 -gFieldObjectPic_QuintyPlump_3:: @ 84F6018 - .incbin "graphics/map_objects/pics/people/quinty_plump/3.4bpp" - - .align 2 -gFieldObjectPic_QuintyPlump_4:: @ 84F6218 - .incbin "graphics/map_objects/pics/people/quinty_plump/4.4bpp" - - .align 2 -gFieldObjectPic_QuintyPlump_5:: @ 84F6418 - .incbin "graphics/map_objects/pics/people/quinty_plump/5.4bpp" - - .align 2 -gFieldObjectPic_QuintyPlump_6:: @ 84F6618 - .incbin "graphics/map_objects/pics/people/quinty_plump/6.4bpp" - - .align 2 -gFieldObjectPalette12:: @ 84F6818 - .incbin "graphics/map_objects/palettes/field_object_palette_12.gbapal" - - .align 2 -gFieldObjectPalette13:: @ 84F6838 - .incbin "graphics/map_objects/palettes/field_object_palette_13.gbapal" - - .align 2 -gFieldEffectObjectPic_ShadowSmall:: @ 84F6858 - .incbin "graphics/map_objects/pics/effects/shadow_small.4bpp" - - .align 2 -gFieldEffectObjectPic_ShadowMedium:: @ 84F6878 - .incbin "graphics/map_objects/pics/effects/shadow_medium.4bpp" - - .align 2 -gFieldEffectObjectPic_ShadowLarge:: @ 84F68B8 - .incbin "graphics/map_objects/pics/effects/shadow_large.4bpp" - - .align 2 -gFieldEffectObjectPic_ShadowExtraLarge:: @ 84F6938 - .incbin "graphics/map_objects/pics/effects/shadow_extra_large.4bpp" - -gUnknown_084F6D38:: @ 84F6D38 - .incbin "graphics/map_objects/pics/effects/unknown_4F6D38/0.4bpp" - - .align 2 -gFieldEffectObjectPalette6:: @ 84F6E98 - .incbin "graphics/map_objects/palettes/field_effect_object_palette_06.gbapal" - - .align 2 -gFieldEffectObjectPic_Ripple_0:: @ 84F6EB8 - .incbin "graphics/map_objects/pics/effects/ripple/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Ripple_1:: @ 84F6F38 - .incbin "graphics/map_objects/pics/effects/ripple/1.4bpp" - - .align 2 -gFieldEffectObjectPic_Ripple_2:: @ 84F6FB8 - .incbin "graphics/map_objects/pics/effects/ripple/2.4bpp" - - .align 2 -gFieldEffectObjectPic_Ripple_3:: @ 84F7038 - .incbin "graphics/map_objects/pics/effects/ripple/3.4bpp" - - .align 2 -gFieldEffectObjectPic_Ripple_4:: @ 84F70B8 - .incbin "graphics/map_objects/pics/effects/ripple/4.4bpp" - - .align 2 -gFieldEffectObjectPic_Ash_0:: @ 84F7138 - .incbin "graphics/map_objects/pics/effects/ash/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Ash_1:: @ 84F71B8 - .incbin "graphics/map_objects/pics/effects/ash/1.4bpp" - - .align 2 -gFieldEffectObjectPic_Ash_2:: @ 84F7238 - .incbin "graphics/map_objects/pics/effects/ash/2.4bpp" - - .align 2 -gFieldEffectObjectPic_Ash_3:: @ 84F72B8 - .incbin "graphics/map_objects/pics/effects/ash/3.4bpp" - - .align 2 -gFieldEffectObjectPic_Ash_4:: @ 84F7338 - .incbin "graphics/map_objects/pics/effects/ash/4.4bpp" - - .align 2 -gFieldEffectObjectPic_Arrow_0:: @ 84F73B8 - .incbin "graphics/map_objects/pics/effects/arrow/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Arrow_1:: @ 84F7438 - .incbin "graphics/map_objects/pics/effects/arrow/1.4bpp" - - .align 2 -gFieldEffectObjectPic_Arrow_2:: @ 84F74B8 - .incbin "graphics/map_objects/pics/effects/arrow/2.4bpp" - - .align 2 -gFieldEffectObjectPic_Arrow_3:: @ 84F7538 - .incbin "graphics/map_objects/pics/effects/arrow/3.4bpp" - - .align 2 -gFieldEffectObjectPic_Arrow_4:: @ 84F75B8 - .incbin "graphics/map_objects/pics/effects/arrow/4.4bpp" - - .align 2 -gFieldEffectObjectPic_Arrow_5:: @ 84F7638 - .incbin "graphics/map_objects/pics/effects/arrow/5.4bpp" - - .align 2 -gFieldEffectObjectPic_Arrow_6:: @ 84F76B8 - .incbin "graphics/map_objects/pics/effects/arrow/6.4bpp" - - .align 2 -gFieldEffectObjectPic_Arrow_7:: @ 84F7738 - .incbin "graphics/map_objects/pics/effects/arrow/7.4bpp" - - .align 2 -gFieldEffectObjectPalette0:: @ 84F77B8 - .incbin "graphics/map_objects/palettes/field_effect_object_palette_00.gbapal" - - .align 2 -gFieldEffectObjectPalette1:: @ 84F77D8 - .incbin "graphics/map_objects/palettes/field_effect_object_palette_01.gbapal" - - .align 2 -gFieldEffectObjectPic_GroundImpactDust_0:: @ 84F77F8 - .incbin "graphics/map_objects/pics/effects/ground_impact_dust/0.4bpp" - - .align 2 -gFieldEffectObjectPic_GroundImpactDust_1:: @ 84F7838 - .incbin "graphics/map_objects/pics/effects/ground_impact_dust/1.4bpp" - - .align 2 -gFieldEffectObjectPic_GroundImpactDust_2:: @ 84F7878 - .incbin "graphics/map_objects/pics/effects/ground_impact_dust/2.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeHopTallGrass_0:: @ 84F78B8 - .incbin "graphics/map_objects/pics/effects/bike_hop_tall_grass/0.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeHopTallGrass_1:: @ 84F78F8 - .incbin "graphics/map_objects/pics/effects/bike_hop_tall_grass/1.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeHopTallGrass_2:: @ 84F7938 - .incbin "graphics/map_objects/pics/effects/bike_hop_tall_grass/2.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeHopTallGrass_3:: @ 84F7978 - .incbin "graphics/map_objects/pics/effects/bike_hop_tall_grass/3.4bpp" - -gUnusedGrass_0:: @4F79B8 - .incbin "graphics/map_objects/pics/effects/unused_grass/0.4bpp" - -gUnusedGrass_1:: @4F7A38 - .incbin "graphics/map_objects/pics/effects/unused_grass/1.4bpp" - -gUnusedGrass_2:: @4F7AB8 - .incbin "graphics/map_objects/pics/effects/unused_grass/2.4bpp" - -gUnusedGrass_3:: @4F7B38 - .incbin "graphics/map_objects/pics/effects/unused_grass/3.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown16_0:: @ 84F7BB8 - .incbin "graphics/map_objects/pics/effects/unknown_16/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown16_1:: @ 84F7C38 - .incbin "graphics/map_objects/pics/effects/unknown_16/1.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown16_2:: @ 84F7CB8 - .incbin "graphics/map_objects/pics/effects/unknown_16/2.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown16_3:: @ 84F7D38 - .incbin "graphics/map_objects/pics/effects/unknown_16/3.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown16_4:: @ 84F7DB8 - .incbin "graphics/map_objects/pics/effects/unknown_16/4.4bpp" - -gUnknown_084F7E38:: @ 84F7E38 - .incbin "graphics/map_objects/pics/effects/unknown_4F7E38/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown16_5:: @ 84F7EB8 - .incbin "graphics/map_objects/pics/effects/unknown_16/5.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown17_0:: @ 84F7F38 - .incbin "graphics/map_objects/pics/effects/unknown_17/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown17_1:: @ 84F7FB8 - .incbin "graphics/map_objects/pics/effects/unknown_17/1.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown17_2:: @ 84F8038 - .incbin "graphics/map_objects/pics/effects/unknown_17/2.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown17_3:: @ 84F80B8 - .incbin "graphics/map_objects/pics/effects/unknown_17/3.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown17_4:: @ 84F8138 - .incbin "graphics/map_objects/pics/effects/unknown_17/4.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown17_5:: @ 84F81B8 - .incbin "graphics/map_objects/pics/effects/unknown_17/5.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown17_6:: @ 84F8238 - .incbin "graphics/map_objects/pics/effects/unknown_17/6.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown17_7:: @ 84F82B8 - .incbin "graphics/map_objects/pics/effects/unknown_17/7.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown18_0:: @ 84F8338 - .incbin "graphics/map_objects/pics/effects/unknown_18/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown18_1:: @ 84F83B8 - .incbin "graphics/map_objects/pics/effects/unknown_18/1.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown18_2:: @ 84F8438 - .incbin "graphics/map_objects/pics/effects/unknown_18/2.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown18_3:: @ 84F84B8 - .incbin "graphics/map_objects/pics/effects/unknown_18/3.4bpp" - - .align 2 -gFieldEffectObjectPic_LongGrass_0:: @ 84F8538 - .incbin "graphics/map_objects/pics/effects/long_grass/0.4bpp" - - .align 2 -gFieldEffectObjectPic_LongGrass_1:: @ 84F85B8 - .incbin "graphics/map_objects/pics/effects/long_grass/1.4bpp" - - .align 2 -gFieldEffectObjectPic_LongGrass_2:: @ 84F8638 - .incbin "graphics/map_objects/pics/effects/long_grass/2.4bpp" - - .align 2 -gFieldEffectObjectPic_LongGrass_3:: @ 84F86B8 - .incbin "graphics/map_objects/pics/effects/long_grass/3.4bpp" - - .align 2 -gFieldEffectObjectPic_TallGrass_0:: @ 84F8738 - .incbin "graphics/map_objects/pics/effects/tall_grass/0.4bpp" - - .align 2 -gFieldEffectObjectPic_TallGrass_1:: @ 84F87B8 - .incbin "graphics/map_objects/pics/effects/tall_grass/1.4bpp" - - .align 2 -gFieldEffectObjectPic_TallGrass_2:: @ 84F8838 - .incbin "graphics/map_objects/pics/effects/tall_grass/2.4bpp" - - .align 2 -gFieldEffectObjectPic_TallGrass_3:: @ 84F88B8 - .incbin "graphics/map_objects/pics/effects/tall_grass/3.4bpp" - - .align 2 -gFieldEffectObjectPic_TallGrass_4:: @ 84F8938 - .incbin "graphics/map_objects/pics/effects/tall_grass/4.4bpp" - - .align 2 -gFieldEffectObjectPic_ShortGrass_0:: @ 84F89B8 - .incbin "graphics/map_objects/pics/effects/short_grass/0.4bpp" - - .align 2 -gFieldEffectObjectPic_ShortGrass_1:: @ 84F8A38 - .incbin "graphics/map_objects/pics/effects/short_grass/1.4bpp" - - .align 2 -gFieldEffectObjectPic_SandFootprints_0:: @ 84F8AB8 - .incbin "graphics/map_objects/pics/effects/sand_footprints/0.4bpp" - - .align 2 -gFieldEffectObjectPic_SandFootprints_1:: @ 84F8B38 - .incbin "graphics/map_objects/pics/effects/sand_footprints/1.4bpp" - - .align 2 -gFieldEffectObjectPic_DeepSandFootprints_0:: @ 84F8BB8 - .incbin "graphics/map_objects/pics/effects/deep_sand_footprints/0.4bpp" - - .align 2 -gFieldEffectObjectPic_DeepSandFootprints_1:: @ 84F8C38 - .incbin "graphics/map_objects/pics/effects/deep_sand_footprints/1.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeTireTracks_0:: @ 84F8CB8 - .incbin "graphics/map_objects/pics/effects/bike_tire_tracks/0.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeTireTracks_1:: @ 84F8D38 - .incbin "graphics/map_objects/pics/effects/bike_tire_tracks/1.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeTireTracks_2:: @ 84F8DB8 - .incbin "graphics/map_objects/pics/effects/bike_tire_tracks/2.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeTireTracks_3:: @ 84F8E38 - .incbin "graphics/map_objects/pics/effects/bike_tire_tracks/3.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown19_0:: @ 84F8EB8 - .incbin "graphics/map_objects/pics/effects/unknown_19/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown19_1:: @ 84F8F38 - .incbin "graphics/map_objects/pics/effects/unknown_19/1.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown19_2:: @ 84F8FB8 - .incbin "graphics/map_objects/pics/effects/unknown_19/2.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown19_3:: @ 84F9038 - .incbin "graphics/map_objects/pics/effects/unknown_19/3.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown29_0:: @ 84F90B8 - .incbin "graphics/map_objects/pics/effects/unknown_29/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown29_1:: @ 84F90F8 - .incbin "graphics/map_objects/pics/effects/unknown_29/1.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown29_2:: @ 84F9138 - .incbin "graphics/map_objects/pics/effects/unknown_29/2.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeHopBigSplash_0:: @ 84F9178 - .incbin "graphics/map_objects/pics/effects/bike_hop_big_splash/0.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeHopBigSplash_1:: @ 84F91F8 - .incbin "graphics/map_objects/pics/effects/bike_hop_big_splash/1.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeHopBigSplash_2:: @ 84F9278 - .incbin "graphics/map_objects/pics/effects/bike_hop_big_splash/2.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeHopBigSplash_3:: @ 84F92F8 - .incbin "graphics/map_objects/pics/effects/bike_hop_big_splash/3.4bpp" - - .align 2 -gFieldEffectObjectPic_Splash_0:: @ 84F9378 - .incbin "graphics/map_objects/pics/effects/splash/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Splash_1:: @ 84F93B8 - .incbin "graphics/map_objects/pics/effects/splash/1.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeHopSmallSplash_0:: @ 84F93F8 - .incbin "graphics/map_objects/pics/effects/bike_hop_small_splash/0.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeHopSmallSplash_1:: @ 84F9438 - .incbin "graphics/map_objects/pics/effects/bike_hop_small_splash/1.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeHopSmallSplash_2:: @ 84F9478 - .incbin "graphics/map_objects/pics/effects/bike_hop_small_splash/2.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown20_0:: @ 84F94B8 - .incbin "graphics/map_objects/pics/effects/unknown_20/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown20_1:: @ 84F9538 - .incbin "graphics/map_objects/pics/effects/unknown_20/1.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown20_2:: @ 84F95B8 - .incbin "graphics/map_objects/pics/effects/unknown_20/2.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown20_3:: @ 84F9638 - .incbin "graphics/map_objects/pics/effects/unknown_20/3.4bpp" - - .align 2 -@ unreferenced -gFieldEffectObjectPic_Unknown20_4:: @ 84F96B8 - .incbin "graphics/map_objects/pics/effects/unknown_20/4.4bpp" - - .align 2 -gFieldEffectObjectPic_TreeDisguise_0:: @ 84F9738 - .incbin "graphics/map_objects/pics/effects/tree_disguise/0.4bpp" - - .align 2 -gFieldEffectObjectPic_TreeDisguise_1:: @ 84F9838 - .incbin "graphics/map_objects/pics/effects/tree_disguise/1.4bpp" - - .align 2 -gFieldEffectObjectPic_TreeDisguise_2:: @ 84F9938 - .incbin "graphics/map_objects/pics/effects/tree_disguise/2.4bpp" - - .align 2 -gFieldEffectObjectPic_TreeDisguise_3:: @ 84F9A38 - .incbin "graphics/map_objects/pics/effects/tree_disguise/3.4bpp" - - .align 2 -gFieldEffectObjectPic_TreeDisguise_4:: @ 84F9B38 - .incbin "graphics/map_objects/pics/effects/tree_disguise/4.4bpp" - - .align 2 -gFieldEffectObjectPic_TreeDisguise_5:: @ 84F9C38 - .incbin "graphics/map_objects/pics/effects/tree_disguise/5.4bpp" - - .align 2 -gFieldEffectObjectPic_TreeDisguise_6:: @ 84F9D38 - .incbin "graphics/map_objects/pics/effects/tree_disguise/6.4bpp" - - .align 2 -gFieldEffectObjectPic_MountainDisguise_0:: @ 84F9E38 - .incbin "graphics/map_objects/pics/effects/mountain_disguise/0.4bpp" - - .align 2 -gFieldEffectObjectPic_MountainDisguise_1:: @ 84F9F38 - .incbin "graphics/map_objects/pics/effects/mountain_disguise/1.4bpp" - - .align 2 -gFieldEffectObjectPic_MountainDisguise_2:: @ 84FA038 - .incbin "graphics/map_objects/pics/effects/mountain_disguise/2.4bpp" - - .align 2 -gFieldEffectObjectPic_MountainDisguise_3:: @ 84FA138 - .incbin "graphics/map_objects/pics/effects/mountain_disguise/3.4bpp" - - .align 2 -gFieldEffectObjectPic_MountainDisguise_4:: @ 84FA238 - .incbin "graphics/map_objects/pics/effects/mountain_disguise/4.4bpp" - - .align 2 -gFieldEffectObjectPic_MountainDisguise_5:: @ 84FA338 - .incbin "graphics/map_objects/pics/effects/mountain_disguise/5.4bpp" - - .align 2 -gFieldEffectObjectPic_MountainDisguise_6:: @ 84FA438 - .incbin "graphics/map_objects/pics/effects/mountain_disguise/6.4bpp" - - .align 2 -gFieldEffectObjectPic_SandDisguisePlaceholder_0:: @ 84FA538 - .incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/0.4bpp" - - .align 2 -gFieldEffectObjectPic_SandDisguisePlaceholder_1:: @ 84FA638 - .incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/1.4bpp" - - .align 2 -gFieldEffectObjectPic_SandDisguisePlaceholder_2:: @ 84FA738 - .incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/2.4bpp" - - .align 2 -gFieldEffectObjectPic_SandDisguisePlaceholder_3:: @ 84FA838 - .incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/3.4bpp" - - .align 2 -gFieldEffectObjectPic_SandDisguisePlaceholder_4:: @ 84FA938 - .incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/4.4bpp" - - .align 2 -gFieldEffectObjectPic_SandDisguisePlaceholder_5:: @ 84FAA38 - .incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/5.4bpp" - - .align 2 -gFieldEffectObjectPic_SandDisguisePlaceholder_6:: @ 84FAB38 - .incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/6.4bpp" - - .align 2 -gFieldEffectObjectPic_HotSpringsWater:: @ 84FAC38 - .incbin "graphics/map_objects/pics/effects/hot_springs_water.4bpp" - - .align 2 -gFieldEffectObjectPalette2:: @ 84FACB8 - .incbin "graphics/map_objects/palettes/field_effect_object_palette_02.gbapal" - - .align 2 -gFieldEffectObjectPic_JumpOutOfAsh_0:: @ 84FACD8 - .incbin "graphics/map_objects/pics/effects/jump_out_of_ash/0.4bpp" - - .align 2 -gFieldEffectObjectPic_JumpOutOfAsh_1:: @ 84FAD58 - .incbin "graphics/map_objects/pics/effects/jump_out_of_ash/1.4bpp" - - .align 2 -gFieldEffectObjectPic_JumpOutOfAsh_2:: @ 84FADD8 - .incbin "graphics/map_objects/pics/effects/jump_out_of_ash/2.4bpp" - - .align 2 -gFieldEffectObjectPic_JumpOutOfAsh_3:: @ 84FAE58 - .incbin "graphics/map_objects/pics/effects/jump_out_of_ash/3.4bpp" - - .align 2 -gFieldEffectObjectPic_JumpOutOfAsh_4:: @ 84FAED8 - .incbin "graphics/map_objects/pics/effects/jump_out_of_ash/4.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown33_0:: @ 84FAF58 - .incbin "graphics/map_objects/pics/effects/unknown_33/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown33_1:: @ 84FAFD8 - .incbin "graphics/map_objects/pics/effects/unknown_33/1.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown33_2:: @ 84FB058 - .incbin "graphics/map_objects/pics/effects/unknown_33/2.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown33_3:: @ 84FB0D8 - .incbin "graphics/map_objects/pics/effects/unknown_33/3.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown33_4:: @ 84FB158 - .incbin "graphics/map_objects/pics/effects/unknown_33/4.4bpp" - - .align 2 -gFieldEffectObjectPic_Bubbles_0:: @ 84FB1D8 - .incbin "graphics/map_objects/pics/effects/bubbles/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Bubbles_1:: @ 84FB2D8 - .incbin "graphics/map_objects/pics/effects/bubbles/1.4bpp" - - .align 2 -gFieldEffectObjectPic_Bubbles_2:: @ 84FB3D8 - .incbin "graphics/map_objects/pics/effects/bubbles/2.4bpp" - - .align 2 -gFieldEffectObjectPic_Bubbles_3:: @ 84FB4D8 - .incbin "graphics/map_objects/pics/effects/bubbles/3.4bpp" - - .align 2 -gFieldEffectObjectPic_Bubbles_4:: @ 84FB5D8 - .incbin "graphics/map_objects/pics/effects/bubbles/4.4bpp" - - .align 2 -gFieldEffectObjectPic_Bubbles_5:: @ 84FB6D8 - .incbin "graphics/map_objects/pics/effects/bubbles/5.4bpp" - - .align 2 -gFieldEffectObjectPic_Bubbles_6:: @ 84FB7D8 - .incbin "graphics/map_objects/pics/effects/bubbles/6.4bpp" - - .align 2 -gFieldEffectObjectPic_Bubbles_7:: @ 84FB8D8 - .incbin "graphics/map_objects/pics/effects/bubbles/7.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown35_0:: @ 84FB9D8 - .incbin "graphics/map_objects/pics/effects/unknown_35/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown35_1:: @ 84FBA58 - .incbin "graphics/map_objects/pics/effects/unknown_35/1.4bpp" - - .align 2 -gFieldEffectObjectPalette3:: @ 84FBAD8 - .incbin "graphics/map_objects/palettes/field_effect_object_palette_03.gbapal" - - .align 2 -gFieldEffectObjectPic_Bird:: @ 84FBAF8 - .incbin "graphics/map_objects/pics/effects/bird.4bpp" - - .align 2 -gFieldObjectPic_Juan_0:: @ 84FBCF8 - .incbin "graphics/map_objects/pics/people/juan/0.4bpp" - - .align 2 -gFieldObjectPic_Juan_1:: @ 84FBDF8 - .incbin "graphics/map_objects/pics/people/juan/1.4bpp" - - .align 2 -gFieldObjectPic_Juan_2:: @ 84FBEF8 - .incbin "graphics/map_objects/pics/people/juan/2.4bpp" - - .align 2 -gFieldObjectPic_Juan_3:: @ 84FBFF8 - .incbin "graphics/map_objects/pics/people/juan/3.4bpp" - - .align 2 -gFieldObjectPic_Juan_4:: @ 84FC0F8 - .incbin "graphics/map_objects/pics/people/juan/4.4bpp" - - .align 2 -gFieldObjectPic_Juan_5:: @ 84FC1F8 - .incbin "graphics/map_objects/pics/people/juan/5.4bpp" - - .align 2 -gFieldObjectPic_Juan_6:: @ 84FC2F8 - .incbin "graphics/map_objects/pics/people/juan/6.4bpp" - - .align 2 -gFieldObjectPic_Juan_7:: @ 84FC3F8 - .incbin "graphics/map_objects/pics/people/juan/7.4bpp" - - .align 2 -gFieldObjectPic_Juan_8:: @ 84FC4F8 - .incbin "graphics/map_objects/pics/people/juan/8.4bpp" - - .align 2 -gFieldObjectPic_Scott_0:: @ 84FC5F8 - .incbin "graphics/map_objects/pics/people/scott/0.4bpp" - - .align 2 -gFieldObjectPic_Scott_1:: @ 84FC6F8 - .incbin "graphics/map_objects/pics/people/scott/1.4bpp" - - .align 2 -gFieldObjectPic_Scott_2:: @ 84FC7F8 - .incbin "graphics/map_objects/pics/people/scott/2.4bpp" - - .align 2 -gFieldObjectPic_Scott_3:: @ 84FC8F8 - .incbin "graphics/map_objects/pics/people/scott/3.4bpp" - - .align 2 -gFieldObjectPic_Scott_4:: @ 84FC9F8 - .incbin "graphics/map_objects/pics/people/scott/4.4bpp" - - .align 2 -gFieldObjectPic_Scott_5:: @ 84FCAF8 - .incbin "graphics/map_objects/pics/people/scott/5.4bpp" - - .align 2 -gFieldObjectPic_Scott_6:: @ 84FCBF8 - .incbin "graphics/map_objects/pics/people/scott/6.4bpp" - - .align 2 -gFieldObjectPic_Scott_7:: @ 84FCCF8 - .incbin "graphics/map_objects/pics/people/scott/7.4bpp" - - .align 2 -gFieldObjectPic_Scott_8:: @ 84FCDF8 - .incbin "graphics/map_objects/pics/people/scott/8.4bpp" - - .align 2 -gFieldObjectPic_Statue:: @ 84FCEF8 - .incbin "graphics/map_objects/pics/misc/statue.4bpp" - - .align 2 -gFieldObjectPic_Kirlia_0:: @ 84FCFF8 - .incbin "graphics/map_objects/pics/pokemon/kirlia/0.4bpp" - - .align 2 -gFieldObjectPic_Kirlia_1:: @ 84FD0F8 - .incbin "graphics/map_objects/pics/pokemon/kirlia/1.4bpp" - - .align 2 -gFieldObjectPic_Kirlia_2:: @ 84FD1F8 - .incbin "graphics/map_objects/pics/pokemon/kirlia/2.4bpp" - - .align 2 -gFieldObjectPic_Kirlia_3:: @ 84FD2F8 - .incbin "graphics/map_objects/pics/pokemon/kirlia/3.4bpp" - - .align 2 -gFieldObjectPic_Kirlia_4:: @ 84FD3F8 - .incbin "graphics/map_objects/pics/pokemon/kirlia/4.4bpp" - - .align 2 -gFieldObjectPic_Kirlia_5:: @ 84FD4F8 - .incbin "graphics/map_objects/pics/pokemon/kirlia/5.4bpp" - - .align 2 -gFieldObjectPic_Kirlia_6:: @ 84FD5F8 - .incbin "graphics/map_objects/pics/pokemon/kirlia/6.4bpp" - - .align 2 -gFieldObjectPic_Kirlia_7:: @ 84FD6F8 - .incbin "graphics/map_objects/pics/pokemon/kirlia/7.4bpp" - - .align 2 -gFieldObjectPic_Kirlia_8:: @ 84FD7F8 - .incbin "graphics/map_objects/pics/pokemon/kirlia/8.4bpp" - - .align 2 -gFieldObjectPic_Dusclops_0:: @ 84FD8F8 - .incbin "graphics/map_objects/pics/pokemon/dusclops/0.4bpp" - - .align 2 -gFieldObjectPic_Dusclops_1:: @ 84FD9F8 - .incbin "graphics/map_objects/pics/pokemon/dusclops/1.4bpp" - - .align 2 -gFieldObjectPic_Dusclops_2:: @ 84FDAF8 - .incbin "graphics/map_objects/pics/pokemon/dusclops/2.4bpp" - - .align 2 -gFieldObjectPic_Dusclops_3:: @ 84FDBF8 - .incbin "graphics/map_objects/pics/pokemon/dusclops/3.4bpp" - - .align 2 -gFieldObjectPic_Dusclops_4:: @ 84FDCF8 - .incbin "graphics/map_objects/pics/pokemon/dusclops/4.4bpp" - - .align 2 -gFieldObjectPic_Dusclops_5:: @ 84FDDF8 - .incbin "graphics/map_objects/pics/pokemon/dusclops/5.4bpp" - - .align 2 -gFieldObjectPic_Dusclops_6:: @ 84FDEF8 - .incbin "graphics/map_objects/pics/pokemon/dusclops/6.4bpp" - - .align 2 -gFieldObjectPic_Dusclops_7:: @ 84FDFF8 - .incbin "graphics/map_objects/pics/pokemon/dusclops/7.4bpp" - - .align 2 -gFieldObjectPic_Dusclops_8:: @ 84FE0F8 - .incbin "graphics/map_objects/pics/pokemon/dusclops/8.4bpp" - - .align 2 -gFieldObjectPic_MysteryEventDeliveryman_0:: @ 84FE1F8 - .incbin "graphics/map_objects/pics/people/mystery_event_deliveryman/0.4bpp" - - .align 2 -gFieldObjectPic_MysteryEventDeliveryman_1:: @ 84FE2F8 - .incbin "graphics/map_objects/pics/people/mystery_event_deliveryman/1.4bpp" - - .align 2 -gFieldObjectPic_MysteryEventDeliveryman_2:: @ 84FE3F8 - .incbin "graphics/map_objects/pics/people/mystery_event_deliveryman/2.4bpp" - - .align 2 -gFieldObjectPic_UnionRoomAttendant_0:: @ 84FE4F8 - .incbin "graphics/map_objects/pics/people/union_room_attendant/0.4bpp" - - .align 2 -gFieldObjectPic_UnionRoomAttendant_1:: @ 84FE5F8 - .incbin "graphics/map_objects/pics/people/union_room_attendant/1.4bpp" - - .align 2 -gFieldObjectPic_UnionRoomAttendant_2:: @ 84FE6F8 - .incbin "graphics/map_objects/pics/people/union_room_attendant/2.4bpp" - - .align 2 -gFieldObjectPic_MovingBox:: @ 84FE7F8 - .incbin "graphics/map_objects/pics/misc/moving_box.4bpp" - - .align 2 -gFieldObjectPalette19:: @ 84FE878 - .incbin "graphics/map_objects/palettes/field_object_palette_19.gbapal" - - .align 2 -gFieldObjectPic_Sudowoodo_0:: @ 84FE898 - .incbin "graphics/map_objects/pics/pokemon/sudowoodo/0.4bpp" - - .align 2 -gFieldObjectPic_Sudowoodo_1:: @ 84FE998 - .incbin "graphics/map_objects/pics/pokemon/sudowoodo/1.4bpp" - - .align 2 -gFieldObjectPic_Sudowoodo_2:: @ 84FEA98 - .incbin "graphics/map_objects/pics/pokemon/sudowoodo/2.4bpp" - - .align 2 -gFieldObjectPic_Mew_0:: @ 84FEB98 - .incbin "graphics/map_objects/pics/pokemon/mew/0.4bpp" - - .align 2 -gFieldObjectPic_Mew_1:: @ 84FEC98 - .incbin "graphics/map_objects/pics/pokemon/mew/1.4bpp" - - .align 2 -gFieldObjectPic_Mew_2:: @ 84FED98 - .incbin "graphics/map_objects/pics/pokemon/mew/2.4bpp" - - .align 2 -gFieldObjectPic_Mew_3:: @ 84FEE98 - .incbin "graphics/map_objects/pics/pokemon/mew/3.4bpp" - - .align 2 -gFieldObjectPic_Mew_4:: @ 84FEF98 - .incbin "graphics/map_objects/pics/pokemon/mew/4.4bpp" - - .align 2 -gFieldObjectPic_Mew_5:: @ 84FF098 - .incbin "graphics/map_objects/pics/pokemon/mew/5.4bpp" - - .align 2 -gFieldObjectPic_Mew_6:: @ 84FF198 - .incbin "graphics/map_objects/pics/pokemon/mew/6.4bpp" - - .align 2 -gFieldObjectPic_Mew_7:: @ 84FF298 - .incbin "graphics/map_objects/pics/pokemon/mew/7.4bpp" - - .align 2 -gFieldObjectPic_Mew_8:: @ 84FF398 - .incbin "graphics/map_objects/pics/pokemon/mew/8.4bpp" - - .align 2 -gFieldObjectPalette28:: @ 84FF498 - .incbin "graphics/map_objects/palettes/field_object_palette_28.gbapal" - - .align 2 -gFieldObjectPic_Red_0:: @ 84FF4B8 - .incbin "graphics/map_objects/pics/people/red/0.4bpp" - - .align 2 -gFieldObjectPic_Red_1:: @ 84FF5B8 - .incbin "graphics/map_objects/pics/people/red/1.4bpp" - - .align 2 -gFieldObjectPic_Red_2:: @ 84FF6B8 - .incbin "graphics/map_objects/pics/people/red/2.4bpp" - - .align 2 -gFieldObjectPic_Red_3:: @ 84FF7B8 - .incbin "graphics/map_objects/pics/people/red/3.4bpp" - - .align 2 -gFieldObjectPic_Red_4:: @ 84FF8B8 - .incbin "graphics/map_objects/pics/people/red/4.4bpp" - - .align 2 -gFieldObjectPic_Red_5:: @ 84FF9B8 - .incbin "graphics/map_objects/pics/people/red/5.4bpp" - - .align 2 -gFieldObjectPic_Red_6:: @ 84FFAB8 - .incbin "graphics/map_objects/pics/people/red/6.4bpp" - - .align 2 -gFieldObjectPic_Red_7:: @ 84FFBB8 - .incbin "graphics/map_objects/pics/people/red/7.4bpp" - - .align 2 -gFieldObjectPic_Red_8:: @ 84FFCB8 - .incbin "graphics/map_objects/pics/people/red/8.4bpp" - - .align 2 -gFieldObjectPic_Leaf_0:: @ 84FFDB8 - .incbin "graphics/map_objects/pics/people/leaf/0.4bpp" - - .align 2 -gFieldObjectPic_Leaf_1:: @ 84FFEB8 - .incbin "graphics/map_objects/pics/people/leaf/1.4bpp" - - .align 2 -gFieldObjectPic_Leaf_2:: @ 84FFFB8 - .incbin "graphics/map_objects/pics/people/leaf/2.4bpp" - - .align 2 -gFieldObjectPic_Leaf_3:: @ 85000B8 - .incbin "graphics/map_objects/pics/people/leaf/3.4bpp" - - .align 2 -gFieldObjectPic_Leaf_4:: @ 85001B8 - .incbin "graphics/map_objects/pics/people/leaf/4.4bpp" - - .align 2 -gFieldObjectPic_Leaf_5:: @ 85002B8 - .incbin "graphics/map_objects/pics/people/leaf/5.4bpp" - - .align 2 -gFieldObjectPic_Leaf_6:: @ 85003B8 - .incbin "graphics/map_objects/pics/people/leaf/6.4bpp" - - .align 2 -gFieldObjectPic_Leaf_7:: @ 85004B8 - .incbin "graphics/map_objects/pics/people/leaf/7.4bpp" - - .align 2 -gFieldObjectPic_Leaf_8:: @ 85005B8 - .incbin "graphics/map_objects/pics/people/leaf/8.4bpp" - - .align 2 -gFieldObjectPalette30:: @ 85006B8 - .incbin "graphics/map_objects/palettes/field_object_palette_30.gbapal" - - .align 2 -gFieldObjectPic_BirthIslandStone:: @ 85006D8 - .incbin "graphics/map_objects/pics/misc/birth_island_stone.4bpp" - - .align 2 -gFieldObjectPalette29:: @ 85008D8 - .incbin "graphics/map_objects/palettes/field_object_palette_29.gbapal" - - .align 2 -gFieldObjectPic_Deoxys_0:: @ 85008F8 - .incbin "graphics/map_objects/pics/pokemon/deoxys/0.4bpp" - - .align 2 -gFieldObjectPic_Deoxys_1:: @ 8500AF8 - .incbin "graphics/map_objects/pics/pokemon/deoxys/1.4bpp" - - .align 2 -gFieldObjectPic_Anabel_0:: @ 8500CF8 - .incbin "graphics/map_objects/pics/people/anabel/0.4bpp" - - .align 2 -gFieldObjectPic_Anabel_1:: @ 8500DF8 - .incbin "graphics/map_objects/pics/people/anabel/1.4bpp" - - .align 2 -gFieldObjectPic_Anabel_2:: @ 8500EF8 - .incbin "graphics/map_objects/pics/people/anabel/2.4bpp" - - .align 2 -gFieldObjectPic_Anabel_3:: @ 8500FF8 - .incbin "graphics/map_objects/pics/people/anabel/3.4bpp" - - .align 2 -gFieldObjectPic_Anabel_4:: @ 85010F8 - .incbin "graphics/map_objects/pics/people/anabel/4.4bpp" - - .align 2 -gFieldObjectPic_Anabel_5:: @ 85011F8 - .incbin "graphics/map_objects/pics/people/anabel/5.4bpp" - - .align 2 -gFieldObjectPic_Anabel_6:: @ 85012F8 - .incbin "graphics/map_objects/pics/people/anabel/6.4bpp" - - .align 2 -gFieldObjectPic_Anabel_7:: @ 85013F8 - .incbin "graphics/map_objects/pics/people/anabel/7.4bpp" - - .align 2 -gFieldObjectPic_Anabel_8:: @ 85014F8 - .incbin "graphics/map_objects/pics/people/anabel/8.4bpp" - - .align 2 -gFieldObjectPic_Tucker_0:: @ 85015F8 - .incbin "graphics/map_objects/pics/people/tucker/0.4bpp" - - .align 2 -gFieldObjectPic_Tucker_1:: @ 85016F8 - .incbin "graphics/map_objects/pics/people/tucker/1.4bpp" - - .align 2 -gFieldObjectPic_Tucker_2:: @ 85017F8 - .incbin "graphics/map_objects/pics/people/tucker/2.4bpp" - - .align 2 -gFieldObjectPic_Tucker_3:: @ 85018F8 - .incbin "graphics/map_objects/pics/people/tucker/3.4bpp" - - .align 2 -gFieldObjectPic_Tucker_4:: @ 85019F8 - .incbin "graphics/map_objects/pics/people/tucker/4.4bpp" - - .align 2 -gFieldObjectPic_Tucker_5:: @ 8501AF8 - .incbin "graphics/map_objects/pics/people/tucker/5.4bpp" - - .align 2 -gFieldObjectPic_Tucker_6:: @ 8501BF8 - .incbin "graphics/map_objects/pics/people/tucker/6.4bpp" - - .align 2 -gFieldObjectPic_Tucker_7:: @ 8501CF8 - .incbin "graphics/map_objects/pics/people/tucker/7.4bpp" - - .align 2 -gFieldObjectPic_Tucker_8:: @ 8501DF8 - .incbin "graphics/map_objects/pics/people/tucker/8.4bpp" - - .align 2 -gFieldObjectPic_Spenser_0:: @ 8501EF8 - .incbin "graphics/map_objects/pics/people/spenser/0.4bpp" - - .align 2 -gFieldObjectPic_Spenser_1:: @ 8501FF8 - .incbin "graphics/map_objects/pics/people/spenser/1.4bpp" - - .align 2 -gFieldObjectPic_Spenser_2:: @ 85020F8 - .incbin "graphics/map_objects/pics/people/spenser/2.4bpp" - - .align 2 -gFieldObjectPic_Spenser_3:: @ 85021F8 - .incbin "graphics/map_objects/pics/people/spenser/3.4bpp" - - .align 2 -gFieldObjectPic_Spenser_4:: @ 85022F8 - .incbin "graphics/map_objects/pics/people/spenser/4.4bpp" - - .align 2 -gFieldObjectPic_Spenser_5:: @ 85023F8 - .incbin "graphics/map_objects/pics/people/spenser/5.4bpp" - - .align 2 -gFieldObjectPic_Spenser_6:: @ 85024F8 - .incbin "graphics/map_objects/pics/people/spenser/6.4bpp" - - .align 2 -gFieldObjectPic_Spenser_7:: @ 85025F8 - .incbin "graphics/map_objects/pics/people/spenser/7.4bpp" - - .align 2 -gFieldObjectPic_Spenser_8:: @ 85026F8 - .incbin "graphics/map_objects/pics/people/spenser/8.4bpp" - - .align 2 -gFieldObjectPic_Greta_0:: @ 85027F8 - .incbin "graphics/map_objects/pics/people/greta/0.4bpp" - - .align 2 -gFieldObjectPic_Greta_1:: @ 85028F8 - .incbin "graphics/map_objects/pics/people/greta/1.4bpp" - - .align 2 -gFieldObjectPic_Greta_2:: @ 85029F8 - .incbin "graphics/map_objects/pics/people/greta/2.4bpp" - - .align 2 -gFieldObjectPic_Greta_3:: @ 8502AF8 - .incbin "graphics/map_objects/pics/people/greta/3.4bpp" - - .align 2 -gFieldObjectPic_Greta_4:: @ 8502BF8 - .incbin "graphics/map_objects/pics/people/greta/4.4bpp" - - .align 2 -gFieldObjectPic_Greta_5:: @ 8502CF8 - .incbin "graphics/map_objects/pics/people/greta/5.4bpp" - - .align 2 -gFieldObjectPic_Greta_6:: @ 8502DF8 - .incbin "graphics/map_objects/pics/people/greta/6.4bpp" - - .align 2 -gFieldObjectPic_Greta_7:: @ 8502EF8 - .incbin "graphics/map_objects/pics/people/greta/7.4bpp" - - .align 2 -gFieldObjectPic_Greta_8:: @ 8502FF8 - .incbin "graphics/map_objects/pics/people/greta/8.4bpp" - - .align 2 -gFieldObjectPic_Noland_0:: @ 85030F8 - .incbin "graphics/map_objects/pics/people/noland/0.4bpp" - - .align 2 -gFieldObjectPic_Noland_1:: @ 85031F8 - .incbin "graphics/map_objects/pics/people/noland/1.4bpp" - - .align 2 -gFieldObjectPic_Noland_2:: @ 85032F8 - .incbin "graphics/map_objects/pics/people/noland/2.4bpp" - - .align 2 -gFieldObjectPic_Noland_3:: @ 85033F8 - .incbin "graphics/map_objects/pics/people/noland/3.4bpp" - - .align 2 -gFieldObjectPic_Noland_4:: @ 85034F8 - .incbin "graphics/map_objects/pics/people/noland/4.4bpp" - - .align 2 -gFieldObjectPic_Noland_5:: @ 85035F8 - .incbin "graphics/map_objects/pics/people/noland/5.4bpp" - - .align 2 -gFieldObjectPic_Noland_6:: @ 85036F8 - .incbin "graphics/map_objects/pics/people/noland/6.4bpp" - - .align 2 -gFieldObjectPic_Noland_7:: @ 85037F8 - .incbin "graphics/map_objects/pics/people/noland/7.4bpp" - - .align 2 -gFieldObjectPic_Noland_8:: @ 85038F8 - .incbin "graphics/map_objects/pics/people/noland/8.4bpp" - - .align 2 -gFieldObjectPic_Lucy_0:: @ 85039F8 - .incbin "graphics/map_objects/pics/people/lucy/0.4bpp" - - .align 2 -gFieldObjectPic_Lucy_1:: @ 8503AF8 - .incbin "graphics/map_objects/pics/people/lucy/1.4bpp" - - .align 2 -gFieldObjectPic_Lucy_2:: @ 8503BF8 - .incbin "graphics/map_objects/pics/people/lucy/2.4bpp" - - .align 2 -gFieldObjectPic_Lucy_3:: @ 8503CF8 - .incbin "graphics/map_objects/pics/people/lucy/3.4bpp" - - .align 2 -gFieldObjectPic_Lucy_4:: @ 8503DF8 - .incbin "graphics/map_objects/pics/people/lucy/4.4bpp" - - .align 2 -gFieldObjectPic_Lucy_5:: @ 8503EF8 - .incbin "graphics/map_objects/pics/people/lucy/5.4bpp" - - .align 2 -gFieldObjectPic_Lucy_6:: @ 8503FF8 - .incbin "graphics/map_objects/pics/people/lucy/6.4bpp" - - .align 2 -gFieldObjectPic_Lucy_7:: @ 85040F8 - .incbin "graphics/map_objects/pics/people/lucy/7.4bpp" - - .align 2 -gFieldObjectPic_Lucy_8:: @ 85041F8 - .incbin "graphics/map_objects/pics/people/lucy/8.4bpp" - - .align 2 -gFieldObjectPic_Brandon_0:: @ 85042F8 - .incbin "graphics/map_objects/pics/people/brandon/0.4bpp" - - .align 2 -gFieldObjectPic_Brandon_1:: @ 85043F8 - .incbin "graphics/map_objects/pics/people/brandon/1.4bpp" - - .align 2 -gFieldObjectPic_Brandon_2:: @ 85044F8 - .incbin "graphics/map_objects/pics/people/brandon/2.4bpp" - - .align 2 -gFieldObjectPic_Brandon_3:: @ 85045F8 - .incbin "graphics/map_objects/pics/people/brandon/3.4bpp" - - .align 2 -gFieldObjectPic_Brandon_4:: @ 85046F8 - .incbin "graphics/map_objects/pics/people/brandon/4.4bpp" - - .align 2 -gFieldObjectPic_Brandon_5:: @ 85047F8 - .incbin "graphics/map_objects/pics/people/brandon/5.4bpp" - - .align 2 -gFieldObjectPic_Brandon_6:: @ 85048F8 - .incbin "graphics/map_objects/pics/people/brandon/6.4bpp" - - .align 2 -gFieldObjectPic_Brandon_7:: @ 85049F8 - .incbin "graphics/map_objects/pics/people/brandon/7.4bpp" - - .align 2 -gFieldObjectPic_Brandon_8:: @ 8504AF8 - .incbin "graphics/map_objects/pics/people/brandon/8.4bpp" - - .align 2 -gFieldObjectPic_Lugia_0:: @ 8504BF8 - .incbin "graphics/map_objects/pics/pokemon/lugia/0.4bpp" - - .align 2 -gFieldObjectPic_Lugia_1:: @ 8504DF8 - .incbin "graphics/map_objects/pics/pokemon/lugia/1.4bpp" - - .align 2 -gFieldObjectPalette32:: @ 8504FF8 - .incbin "graphics/map_objects/palettes/field_object_palette_32.gbapal" - - .align 2 -gFieldObjectPic_HoOh_0:: @ 8505018 - .incbin "graphics/map_objects/pics/pokemon/ho_oh/0.4bpp" - - .align 2 -gFieldObjectPic_HoOh_1:: @ 8505218 - .incbin "graphics/map_objects/pics/pokemon/ho_oh/1.4bpp" - - .align 2 -gFieldObjectPalette31:: @ 8505418 - .incbin "graphics/map_objects/palettes/field_object_palette_31.gbapal" diff --git a/data/graphics/field_objects/field_object_graphics_info.inc b/data/graphics/field_objects/field_object_graphics_info.inc deleted file mode 100644 index 6a0778adf2..0000000000 --- a/data/graphics/field_objects/field_object_graphics_info.inc +++ /dev/null @@ -1,4164 +0,0 @@ - .align 2 -gFieldObjectGraphicsInfo_BrendanNormal:: @ 8509954 - .2byte 0xFFFF @ tiles tag - .2byte 0x1100 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_BrendanMayNormal - .4byte gFieldObjectPicTable_BrendanNormal - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BrendanMachBike:: @ 8509978 - .2byte 0xFFFF @ tiles tag - .2byte 0x1100 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_BIKE_TIRE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_BrendanMachBike - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BrendanAcroBike:: @ 850999C - .2byte 0xFFFF @ tiles tag - .2byte 0x1100 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_BIKE_TIRE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_AcroBike - .4byte gFieldObjectPicTable_BrendanAcroBike - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BrendanSurfing:: @ 85099C0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1100 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Surfing - .4byte gFieldObjectPicTable_BrendanSurfing - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BrendanFieldMove:: @ 85099E4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1100 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_FieldMove - .4byte gFieldObjectPicTable_BrendanFieldMove - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_QuintyPlump:: @ 8509A08 - .2byte 0xFFFF @ tiles tag - .2byte 0x110B @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_L << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_QuintyPlump - .4byte gFieldObjectPicTable_QuintyPlump - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_LittleBoy1:: @ 8509A2C - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_LittleBoy1 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_LittleGirl1:: @ 8509A50 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_LittleGirl1 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Boy1:: @ 8509A74 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Boy1 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Girl1:: @ 8509A98 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Girl1 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Boy2:: @ 8509ABC - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Boy2 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Girl2:: @ 8509AE0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Girl2 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_LittleBoy2:: @ 8509B04 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_LittleBoy2 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_LittleGirl2:: @ 8509B28 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_LittleGirl2 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Boy3:: @ 8509B4C - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Boy3 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Girl3:: @ 8509B70 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Girl3 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Boy4:: @ 8509B94 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Boy4 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Woman1:: @ 8509BB8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Woman1 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_FatMan:: @ 8509BDC - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_FatMan - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Woman2:: @ 8509C00 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Woman2 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Man1:: @ 8509C24 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Man1 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Woman3:: @ 8509C48 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Woman3 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_OldMan1:: @ 8509C6C - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_OldMan1 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_OldWoman1:: @ 8509C90 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_OldWoman1 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Man2:: @ 8509CB4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Man2 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Woman4:: @ 8509CD8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Woman4 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Man3:: @ 8509CFC - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Man3 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Woman5:: @ 8509D20 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Woman5 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Cook:: @ 8509D44 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Cook - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Woman6:: @ 8509D68 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Woman6 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_OldMan2:: @ 8509D8C - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_OldMan2 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_OldWoman2:: @ 8509DB0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_OldWoman2 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Camper:: @ 8509DD4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Camper - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Picnicker:: @ 8509DF8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Picnicker - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Man4:: @ 8509E1C - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Man4 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Woman7:: @ 8509E40 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Woman7 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Youngster:: @ 8509E64 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Youngster - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BugCatcher:: @ 8509E88 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_BugCatcher - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_PsychicM:: @ 8509EAC - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_PsychicM - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_SchoolKidM:: @ 8509ED0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_SchoolKidM - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Maniac:: @ 8509EF4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Maniac - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_HexManiac:: @ 8509F18 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_HexManiac - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Rayquaza1:: @ 8509F3C - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 2048 @ image size - .2byte 64 @ width - .2byte 64 @ height - .byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_64x64 - .4byte gFieldObjectSpriteOamTables_64x64 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_RayquazaStill - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_SwimmerM:: @ 8509F60 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_SwimmerM - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_SwimmerF:: @ 8509F84 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_SwimmerF - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BlackBelt:: @ 8509FA8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_BlackBelt - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Beauty:: @ 8509FCC - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Beauty - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Scientist1:: @ 8509FF0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Scientist1 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Lass:: @ 850A014 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Lass - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Gentleman:: @ 850A038 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Gentleman - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Sailor:: @ 850A05C - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Sailor - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Fisherman:: @ 850A080 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Fisherman - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RunningTriathleteM:: @ 850A0A4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_RunningTriathleteM - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RunningTriathleteF:: @ 850A0C8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_RunningTriathleteF - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_TuberF:: @ 850A0EC - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_TuberF - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_TuberM:: @ 850A110 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_TuberM - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Hiker:: @ 850A134 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Hiker - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_CyclingTriathleteM:: @ 850A158 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_BIKE_TIRE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_AcroBike - .4byte gFieldObjectPicTable_CyclingTriathleteM - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_CyclingTriathleteF:: @ 850A17C - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_BIKE_TIRE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_AcroBike - .4byte gFieldObjectPicTable_CyclingTriathleteF - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Nurse:: @ 850A1A0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Nurse - .4byte gFieldObjectPicTable_Nurse - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_ItemBall:: @ 850A1C4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_ItemBall - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BerryTree:: @ 850A1E8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte NULL @ sprite OAM tables - .4byte gFieldObjectImageAnimTable_BerryTree - .4byte gFieldObjectPicTable_PechaBerryTree - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BerryTreeEarlyStages:: @ 850A20C - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_BerryTree - .4byte gFieldObjectPicTable_PechaBerryTree - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BerryTreeLateStages:: @ 850A230 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_BerryTree - .4byte gFieldObjectPicTable_PechaBerryTree - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_ProfBirch:: @ 850A254 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_ProfBirch - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Man5:: @ 850A278 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Man5 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Man6:: @ 850A29C - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Man6 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_ReporterM:: @ 850A2C0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_ReporterM - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_ReporterF:: @ 850A2E4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_ReporterF - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Bard:: @ 850A308 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MauvilleOldMan1 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Hipster:: @ 850A32C - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MauvilleOldMan1 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Trader:: @ 850A350 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MauvilleOldMan1 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Storyteller:: @ 850A374 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MauvilleOldMan2 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Giddy:: @ 850A398 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MauvilleOldMan2 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_UnusedMauvilleOldMan1:: @ 850A3BC - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MauvilleOldMan2 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_UnusedMauvilleOldMan2:: @ 850A3E0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MauvilleOldMan2 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_UnusedNatuDoll:: @ 850A404 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_UnusedNatuDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_UnusedMagnemiteDoll:: @ 850A428 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_UnusedMagnemiteDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_UnusedSquirtleDoll:: @ 850A44C - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_UnusedSquirtleDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_UnusedWooperDoll:: @ 850A470 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_UnusedWooperDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_UnusedPikachuDoll:: @ 850A494 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_UnusedPikachuDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_UnusedPorygon2Doll:: @ 850A4B8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_UnusedPorygon2Doll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_CuttableTree:: @ 850A4DC - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_CuttableTree - .4byte gFieldObjectPicTable_CuttableTree - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MartEmployee:: @ 850A500 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MartEmployee - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RooftopSaleWoman:: @ 850A524 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_RooftopSaleWoman - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Teala:: @ 850A548 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Teala - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BreakableRock:: @ 850A56C - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_BreakableRock - .4byte gFieldObjectPicTable_BreakableRock - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_PushableBoulder:: @ 850A590 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_PushableBoulder - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MrBrineysBoat:: @ 850A5B4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MrBrineysBoat - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MayNormal:: @ 850A5D8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_BrendanMayNormal - .4byte gFieldObjectPicTable_MayNormal - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MayMachBike:: @ 850A5FC - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_BIKE_TIRE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MayMachBike - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MayAcroBike:: @ 850A620 - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_BIKE_TIRE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_AcroBike - .4byte gFieldObjectPicTable_MayAcroBike - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MaySurfing:: @ 850A644 - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Surfing - .4byte gFieldObjectPicTable_MaySurfing - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MayFieldMove:: @ 850A668 - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_FieldMove - .4byte gFieldObjectPicTable_MayFieldMove - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Truck:: @ 850A68C - .2byte 0xFFFF @ tiles tag - .2byte 0x110D @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 1152 @ image size - .2byte 48 @ width - .2byte 48 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_Truck - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_Truck - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_VigorothCarryingBox:: @ 850A6B0 - .2byte 0xFFFF @ tiles tag - .2byte 0x110E @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_VigorothCarryingBox - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_VigorothFacingAway:: @ 850A6D4 - .2byte 0xFFFF @ tiles tag - .2byte 0x110E @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_VigorothFacingAway - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BirchsBag:: @ 850A6F8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BirchsBag - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_EnemyZigzagoon:: @ 850A71C - .2byte 0xFFFF @ tiles tag - .2byte 0x110F @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_EnemyZigzagoon - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Poochyena:: @ 850A740 - .2byte 0xFFFF @ tiles tag - .2byte 0x111C @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Poochyena - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Artist:: @ 850A764 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Artist - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RivalBrendanNormal:: @ 850A788 - .2byte 0xFFFF @ tiles tag - .2byte 0x1100 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_BrendanMayNormal - .4byte gFieldObjectPicTable_BrendanNormal - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RivalBrendanMachBike:: @ 850A7AC - .2byte 0xFFFF @ tiles tag - .2byte 0x1100 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_BIKE_TIRE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_BrendanMachBike - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RivalBrendanAcroBike:: @ 850A7D0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1100 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_BIKE_TIRE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_AcroBike - .4byte gFieldObjectPicTable_BrendanAcroBike - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RivalBrendanSurfing:: @ 850A7F4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1100 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Surfing - .4byte gFieldObjectPicTable_BrendanSurfing - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RivalBrendanFieldMove:: @ 850A818 - .2byte 0xFFFF @ tiles tag - .2byte 0x1100 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_FieldMove - .4byte gFieldObjectPicTable_BrendanFieldMove - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RivalMayNormal:: @ 850A83C - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_BrendanMayNormal - .4byte gFieldObjectPicTable_MayNormal - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RivalMayMachBike:: @ 850A860 - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_BIKE_TIRE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MayMachBike - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RivalMayAcroBike:: @ 850A884 - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_BIKE_TIRE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_AcroBike - .4byte gFieldObjectPicTable_MayAcroBike - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RivalMaySurfing:: @ 850A8A8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Surfing - .4byte gFieldObjectPicTable_MaySurfing - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RivalMayFieldMove:: @ 850A8CC - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_FieldMove - .4byte gFieldObjectPicTable_MayFieldMove - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Cameraman:: @ 850A8F0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Cameraman - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BrendanUnderwater:: @ 850A914 - .2byte 0xFFFF @ tiles tag - .2byte 0x1115 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_BrendanUnderwater - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MayUnderwater:: @ 850A938 - .2byte 0xFFFF @ tiles tag - .2byte 0x1115 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MayUnderwater - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MovingBox:: @ 850A95C - .2byte 0xFFFF @ tiles tag - .2byte 0x1112 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_MovingBox - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_CableCar:: @ 850A980 - .2byte 0xFFFF @ tiles tag - .2byte 0x1113 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 2048 @ image size - .2byte 64 @ width - .2byte 64 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_64x64 - .4byte gFieldObjectSpriteOamTables_64x64 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_CableCar - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Scientist2:: @ 850A9A4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Scientist2 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Man7:: @ 850A9C8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Man7 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_AquaMemberM:: @ 850A9EC - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_AquaMemberM - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_AquaMemberF:: @ 850AA10 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_AquaMemberF - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MagmaMemberM:: @ 850AA34 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MagmaMemberM - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MagmaMemberF:: @ 850AA58 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MagmaMemberF - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Sidney:: @ 850AA7C - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Sidney - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Phoebe:: @ 850AAA0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Phoebe - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Glacia:: @ 850AAC4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Glacia - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Drake:: @ 850AAE8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Drake - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Roxanne:: @ 850AB0C - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Roxanne - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Brawly:: @ 850AB30 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Brawly - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Wattson:: @ 850AB54 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Wattson - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Flannery:: @ 850AB78 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Flannery - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Norman:: @ 850AB9C - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Norman - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Winona:: @ 850ABC0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Winona - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Liza:: @ 850ABE4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Liza - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Tate:: @ 850AC08 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Tate - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Wallace:: @ 850AC2C - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Wallace - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Steven:: @ 850AC50 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Steven - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Wally:: @ 850AC74 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Wally - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RubySapphireLittleBoy:: @ 850AC98 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_RubySapphireLittleBoy - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BrendanFishing:: @ 850ACBC - .2byte 0xFFFF @ tiles tag - .2byte 0x1100 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Fishing - .4byte gFieldObjectPicTable_BrendanFishing - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MayFishing:: @ 850ACE0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Fishing - .4byte gFieldObjectPicTable_MayFishing - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_HotSpringsOldWoman:: @ 850AD04 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_HotSpringsOldWoman - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_SSTidal:: @ 850AD28 - .2byte 0xFFFF @ tiles tag - .2byte 0x1114 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 1920 @ image size - .2byte 96 @ width - .2byte 40 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_8x8 - .4byte gFieldObjectSpriteOamTables_SSTidal - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_SSTidal - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_SubmarineShadow:: @ 850AD4C - .2byte 0xFFFF @ tiles tag - .2byte 0x111B @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 1408 @ image size - .2byte 88 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_8x8 - .4byte gFieldObjectSpriteOamTables_SubmarineShadow - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_SubmarineShadow - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_PichuDoll:: @ 850AD70 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_PichuDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_PikachuDoll:: @ 850AD94 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_PikachuDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MarillDoll:: @ 850ADB8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_MarillDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_TogepiDoll:: @ 850ADDC - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_TogepiDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_CyndaquilDoll:: @ 850AE00 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_CyndaquilDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_ChikoritaDoll:: @ 850AE24 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_ChikoritaDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_TotodileDoll:: @ 850AE48 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_TotodileDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_JigglypuffDoll:: @ 850AE6C - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_JigglypuffDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MeowthDoll:: @ 850AE90 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_MeowthDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_ClefairyDoll:: @ 850AEB4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_ClefairyDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_DittoDoll:: @ 850AED8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_DittoDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_SmoochumDoll:: @ 850AEFC - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_SmoochumDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_TreeckoDoll:: @ 850AF20 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_TreeckoDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_TorchicDoll:: @ 850AF44 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_TorchicDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MudkipDoll:: @ 850AF68 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_MudkipDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_DuskullDoll:: @ 850AF8C - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_DuskullDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_WynautDoll:: @ 850AFB0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_WynautDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BaltoyDoll:: @ 850AFD4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BaltoyDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_KecleonDoll:: @ 850AFF8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_KecleonDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_AzurillDoll:: @ 850B01C - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_AzurillDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_SkittyDoll:: @ 850B040 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_SkittyDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_SwabluDoll:: @ 850B064 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_SwabluDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_GulpinDoll:: @ 850B088 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_GulpinDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_LotadDoll:: @ 850B0AC - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_LotadDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_SeedotDoll:: @ 850B0D0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_SeedotDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_PikaCushion:: @ 850B0F4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_PikaCushion - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RoundCushion:: @ 850B118 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_RoundCushion - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_KissCushion:: @ 850B13C - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_KissCushion - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_ZigzagCushion:: @ 850B160 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_ZigzagCushion - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_SpinCushion:: @ 850B184 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_SpinCushion - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_DiamondCushion:: @ 850B1A8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_DiamondCushion - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BallCushion:: @ 850B1CC - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BallCushion - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_GrassCushion:: @ 850B1F0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_GrassCushion - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_FireCushion:: @ 850B214 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_FireCushion - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_WaterCushion:: @ 850B238 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_WaterCushion - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BigSnorlaxDoll:: @ 850B25C - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BigSnorlaxDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BigRhydonDoll:: @ 850B280 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BigRhydonDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BigLaprasDoll:: @ 850B2A4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BigLaprasDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BigVenusaurDoll:: @ 850B2C8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BigVenusaurDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BigCharizardDoll:: @ 850B2EC - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BigCharizardDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BigBlastoiseDoll:: @ 850B310 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BigBlastoiseDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BigWailmerDoll:: @ 850B334 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BigWailmerDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BigRegirockDoll:: @ 850B358 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BigRegirockDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BigRegiceDoll:: @ 850B37C - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BigRegiceDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BigRegisteelDoll:: @ 850B3A0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BigRegisteelDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Latias:: @ 850B3C4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_LatiasLatios - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Latios:: @ 850B3E8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_LatiasLatios - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Boy5:: @ 850B40C - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Boy5 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_ContestOldMan:: @ 850B430 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_ContestOldMan - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BrendanWatering:: @ 850B454 - .2byte 0xFFFF @ tiles tag - .2byte 0x1100 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_BrendanWatering - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MayWatering:: @ 850B478 - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MayWatering - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BrendanDecorating:: @ 850B49C - .2byte 0xFFFF @ tiles tag - .2byte 0x1100 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BrendanDecorating - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MayDecorating:: @ 850B4C0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_MayDecorating - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Archie:: @ 850B4E4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Archie - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Maxie:: @ 850B508 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Maxie - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Kyogre1:: @ 850B52C - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_KyogreFront - .4byte gFieldObjectRotScalAnimTable_KyogreGroudon - - .align 2 -gFieldObjectGraphicsInfo_Groudon1:: @ 850B550 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_GroudonFront - .4byte gFieldObjectRotScalAnimTable_KyogreGroudon - - .align 2 -gFieldObjectGraphicsInfo_Kyogre3:: @ 850B574 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_KyogreSide - .4byte gFieldObjectRotScalAnimTable_KyogreGroudon - - .align 2 -gFieldObjectGraphicsInfo_Groudon3:: @ 850B598 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Groudon3 - .4byte gFieldObjectPicTable_GroudonSide - .4byte gFieldObjectRotScalAnimTable_KyogreGroudon - - .align 2 -gFieldObjectGraphicsInfo_Fossil:: @ 850B5BC - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_Fossil - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Regirock:: @ 850B5E0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Regi - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Regice:: @ 850B604 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Regi - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Registeel:: @ 850B628 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Regi - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Skitty:: @ 850B64C - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Skitty - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Kecleon1:: @ 850B670 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Kecleon - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Kyogre2:: @ 850B694 - .2byte 0xFFFF @ tiles tag - .2byte 0x1116 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_KyogreFront - .4byte gFieldObjectRotScalAnimTable_KyogreGroudon - - .align 2 -gFieldObjectGraphicsInfo_Groudon2:: @ 850B6B8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1118 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_GroudonFront - .4byte gFieldObjectRotScalAnimTable_KyogreGroudon - - .align 2 -gFieldObjectGraphicsInfo_Rayquaza2:: @ 850B6DC - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 2048 @ image size - .2byte 64 @ width - .2byte 64 @ height - .byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_64x64 - .4byte gFieldObjectSpriteOamTables_64x64 - .4byte gFieldObjectImageAnimTable_Rayquaza2 - .4byte gFieldObjectPicTable_Rayquaza - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Zigzagoon:: @ 850B700 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Zigzagoon - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Pikachu:: @ 850B724 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Pikachu - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Azumarill:: @ 850B748 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Azumarill - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Wingull:: @ 850B76C - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Wingull - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Kecleon2:: @ 850B790 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Kecleon - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_TuberMSwimming:: @ 850B7B4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_TuberMSwimming - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Azurill:: @ 850B7D8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Azurill - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Mom:: @ 850B7FC - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Mom - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_LinkBrendan:: @ 850B820 - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_BrendanMayNormal - .4byte gFieldObjectPicTable_BrendanNormal - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_LinkMay:: @ 850B844 - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_BrendanMayNormal - .4byte gFieldObjectPicTable_MayNormal - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Juan:: @ 850B868 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Juan - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Scott:: @ 850B88C - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Scott - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MysteryEventDeliveryman:: @ 850B8B0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MysteryEventDeliveryman - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Statue:: @ 850B8D4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_Statue - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Kirlia:: @ 850B8F8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Kirlia - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Dusclops:: @ 850B91C - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Dusclops - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_UnionRoomAttendant:: @ 850B940 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_UnionRoomAttendant - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Red:: @ 850B964 - .2byte 0xFFFF @ tiles tag - .2byte 0x111D @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Red - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Leaf:: @ 850B988 - .2byte 0xFFFF @ tiles tag - .2byte 0x111D @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Leaf - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Sudowoodo:: @ 850B9AC - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Sudowoodo - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Mew:: @ 850B9D0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Mew - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Deoxys:: @ 850B9F4 - .2byte 0xFFFF @ tiles tag - .2byte 0x111E @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Deoxys - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BirthIslandStone:: @ 850BA18 - .2byte 0xFFFF @ tiles tag - .2byte 0x111F @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BirthIslandStone - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Anabel:: @ 850BA3C - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Anabel - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Tucker:: @ 850BA60 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Tucker - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Greta:: @ 850BA84 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Greta - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Spenser:: @ 850BAA8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Spenser - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Noland:: @ 850BACC - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Noland - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Lucy:: @ 850BAF0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Lucy - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Brandon:: @ 850BB14 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Brandon - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RubySapphireBrendan:: @ 850BB38 - .2byte 0xFFFF @ tiles tag - .2byte 0x1122 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_RubySapphireBrendan - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RubySapphireMay:: @ 850BB5C - .2byte 0xFFFF @ tiles tag - .2byte 0x1123 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_RubySapphireMay - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Lugia:: @ 850BB80 - .2byte 0xFFFF @ tiles tag - .2byte 0x1121 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Lugia - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_HoOh:: @ 850BBA4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1120 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_HoOh - .4byte gFieldObjectPicTable_HoOh - .4byte gDummySpriteAffineAnimTable diff --git a/data/graphics/field_objects/field_object_graphics_info_pointers.inc b/data/graphics/field_objects/field_object_graphics_info_pointers.inc deleted file mode 100644 index 1faea449ce..0000000000 --- a/data/graphics/field_objects/field_object_graphics_info_pointers.inc +++ /dev/null @@ -1,251 +0,0 @@ - .align 2 -gFieldObjectGraphicsInfoPointers:: @ 8505620 - .4byte gFieldObjectGraphicsInfo_BrendanNormal - .4byte gFieldObjectGraphicsInfo_BrendanMachBike - .4byte gFieldObjectGraphicsInfo_BrendanSurfing - .4byte gFieldObjectGraphicsInfo_BrendanFieldMove - .4byte gFieldObjectGraphicsInfo_QuintyPlump - .4byte gFieldObjectGraphicsInfo_LittleBoy1 - .4byte gFieldObjectGraphicsInfo_LittleGirl1 - .4byte gFieldObjectGraphicsInfo_Boy1 - .4byte gFieldObjectGraphicsInfo_Girl1 - .4byte gFieldObjectGraphicsInfo_Boy2 - .4byte gFieldObjectGraphicsInfo_Girl2 - .4byte gFieldObjectGraphicsInfo_LittleBoy2 - .4byte gFieldObjectGraphicsInfo_LittleGirl2 - .4byte gFieldObjectGraphicsInfo_Boy3 - .4byte gFieldObjectGraphicsInfo_Girl3 - .4byte gFieldObjectGraphicsInfo_Boy4 - .4byte gFieldObjectGraphicsInfo_Woman1 - .4byte gFieldObjectGraphicsInfo_FatMan - .4byte gFieldObjectGraphicsInfo_Woman2 - .4byte gFieldObjectGraphicsInfo_Man1 - .4byte gFieldObjectGraphicsInfo_Woman3 - .4byte gFieldObjectGraphicsInfo_OldMan1 - .4byte gFieldObjectGraphicsInfo_OldWoman1 - .4byte gFieldObjectGraphicsInfo_Man2 - .4byte gFieldObjectGraphicsInfo_Woman4 - .4byte gFieldObjectGraphicsInfo_Man3 - .4byte gFieldObjectGraphicsInfo_Woman5 - .4byte gFieldObjectGraphicsInfo_Cook - .4byte gFieldObjectGraphicsInfo_Woman6 - .4byte gFieldObjectGraphicsInfo_OldMan2 - .4byte gFieldObjectGraphicsInfo_OldWoman2 - .4byte gFieldObjectGraphicsInfo_Camper - .4byte gFieldObjectGraphicsInfo_Picnicker - .4byte gFieldObjectGraphicsInfo_Man4 - .4byte gFieldObjectGraphicsInfo_Woman7 - .4byte gFieldObjectGraphicsInfo_Youngster - .4byte gFieldObjectGraphicsInfo_BugCatcher - .4byte gFieldObjectGraphicsInfo_PsychicM - .4byte gFieldObjectGraphicsInfo_SchoolKidM - .4byte gFieldObjectGraphicsInfo_Maniac - .4byte gFieldObjectGraphicsInfo_HexManiac - .4byte gFieldObjectGraphicsInfo_Rayquaza1 - .4byte gFieldObjectGraphicsInfo_SwimmerM - .4byte gFieldObjectGraphicsInfo_SwimmerF - .4byte gFieldObjectGraphicsInfo_BlackBelt - .4byte gFieldObjectGraphicsInfo_Beauty - .4byte gFieldObjectGraphicsInfo_Scientist1 - .4byte gFieldObjectGraphicsInfo_Lass - .4byte gFieldObjectGraphicsInfo_Gentleman - .4byte gFieldObjectGraphicsInfo_Sailor - .4byte gFieldObjectGraphicsInfo_Fisherman - .4byte gFieldObjectGraphicsInfo_RunningTriathleteM - .4byte gFieldObjectGraphicsInfo_RunningTriathleteF - .4byte gFieldObjectGraphicsInfo_TuberF - .4byte gFieldObjectGraphicsInfo_TuberM - .4byte gFieldObjectGraphicsInfo_Hiker - .4byte gFieldObjectGraphicsInfo_CyclingTriathleteM - .4byte gFieldObjectGraphicsInfo_CyclingTriathleteF - .4byte gFieldObjectGraphicsInfo_Nurse - .4byte gFieldObjectGraphicsInfo_ItemBall - .4byte gFieldObjectGraphicsInfo_BerryTree - .4byte gFieldObjectGraphicsInfo_BerryTreeEarlyStages - .4byte gFieldObjectGraphicsInfo_BerryTreeLateStages - .4byte gFieldObjectGraphicsInfo_BrendanAcroBike - .4byte gFieldObjectGraphicsInfo_ProfBirch - .4byte gFieldObjectGraphicsInfo_Man5 - .4byte gFieldObjectGraphicsInfo_Man6 - .4byte gFieldObjectGraphicsInfo_ReporterM - .4byte gFieldObjectGraphicsInfo_ReporterF - .4byte gFieldObjectGraphicsInfo_Bard - .4byte gFieldObjectGraphicsInfo_Anabel - .4byte gFieldObjectGraphicsInfo_Tucker - .4byte gFieldObjectGraphicsInfo_Greta - .4byte gFieldObjectGraphicsInfo_Spenser - .4byte gFieldObjectGraphicsInfo_Noland - .4byte gFieldObjectGraphicsInfo_Lucy - .4byte gFieldObjectGraphicsInfo_UnusedNatuDoll - .4byte gFieldObjectGraphicsInfo_UnusedMagnemiteDoll - .4byte gFieldObjectGraphicsInfo_UnusedSquirtleDoll - .4byte gFieldObjectGraphicsInfo_UnusedWooperDoll - .4byte gFieldObjectGraphicsInfo_UnusedPikachuDoll - .4byte gFieldObjectGraphicsInfo_UnusedPorygon2Doll - .4byte gFieldObjectGraphicsInfo_CuttableTree - .4byte gFieldObjectGraphicsInfo_MartEmployee - .4byte gFieldObjectGraphicsInfo_RooftopSaleWoman - .4byte gFieldObjectGraphicsInfo_Teala - .4byte gFieldObjectGraphicsInfo_BreakableRock - .4byte gFieldObjectGraphicsInfo_PushableBoulder - .4byte gFieldObjectGraphicsInfo_MrBrineysBoat - .4byte gFieldObjectGraphicsInfo_MayNormal - .4byte gFieldObjectGraphicsInfo_MayMachBike - .4byte gFieldObjectGraphicsInfo_MayAcroBike - .4byte gFieldObjectGraphicsInfo_MaySurfing - .4byte gFieldObjectGraphicsInfo_MayFieldMove - .4byte gFieldObjectGraphicsInfo_Truck - .4byte gFieldObjectGraphicsInfo_VigorothCarryingBox - .4byte gFieldObjectGraphicsInfo_VigorothFacingAway - .4byte gFieldObjectGraphicsInfo_BirchsBag - .4byte gFieldObjectGraphicsInfo_EnemyZigzagoon - .4byte gFieldObjectGraphicsInfo_Artist - .4byte gFieldObjectGraphicsInfo_RivalBrendanNormal - .4byte gFieldObjectGraphicsInfo_RivalBrendanMachBike - .4byte gFieldObjectGraphicsInfo_RivalBrendanAcroBike - .4byte gFieldObjectGraphicsInfo_RivalBrendanSurfing - .4byte gFieldObjectGraphicsInfo_RivalBrendanFieldMove - .4byte gFieldObjectGraphicsInfo_RivalMayNormal - .4byte gFieldObjectGraphicsInfo_RivalMayMachBike - .4byte gFieldObjectGraphicsInfo_RivalMayAcroBike - .4byte gFieldObjectGraphicsInfo_RivalMaySurfing - .4byte gFieldObjectGraphicsInfo_RivalMayFieldMove - .4byte gFieldObjectGraphicsInfo_Cameraman - .4byte gFieldObjectGraphicsInfo_BrendanUnderwater - .4byte gFieldObjectGraphicsInfo_MayUnderwater - .4byte gFieldObjectGraphicsInfo_MovingBox - .4byte gFieldObjectGraphicsInfo_CableCar - .4byte gFieldObjectGraphicsInfo_Scientist2 - .4byte gFieldObjectGraphicsInfo_Man7 - .4byte gFieldObjectGraphicsInfo_AquaMemberM - .4byte gFieldObjectGraphicsInfo_AquaMemberF - .4byte gFieldObjectGraphicsInfo_MagmaMemberM - .4byte gFieldObjectGraphicsInfo_MagmaMemberF - .4byte gFieldObjectGraphicsInfo_Sidney - .4byte gFieldObjectGraphicsInfo_Phoebe - .4byte gFieldObjectGraphicsInfo_Glacia - .4byte gFieldObjectGraphicsInfo_Drake - .4byte gFieldObjectGraphicsInfo_Roxanne - .4byte gFieldObjectGraphicsInfo_Brawly - .4byte gFieldObjectGraphicsInfo_Wattson - .4byte gFieldObjectGraphicsInfo_Flannery - .4byte gFieldObjectGraphicsInfo_Norman - .4byte gFieldObjectGraphicsInfo_Winona - .4byte gFieldObjectGraphicsInfo_Liza - .4byte gFieldObjectGraphicsInfo_Tate - .4byte gFieldObjectGraphicsInfo_Wallace - .4byte gFieldObjectGraphicsInfo_Steven - .4byte gFieldObjectGraphicsInfo_Wally - .4byte gFieldObjectGraphicsInfo_RubySapphireLittleBoy - .4byte gFieldObjectGraphicsInfo_BrendanFishing - .4byte gFieldObjectGraphicsInfo_MayFishing - .4byte gFieldObjectGraphicsInfo_HotSpringsOldWoman - .4byte gFieldObjectGraphicsInfo_SSTidal - .4byte gFieldObjectGraphicsInfo_SubmarineShadow - .4byte gFieldObjectGraphicsInfo_PichuDoll - .4byte gFieldObjectGraphicsInfo_PikachuDoll - .4byte gFieldObjectGraphicsInfo_MarillDoll - .4byte gFieldObjectGraphicsInfo_TogepiDoll - .4byte gFieldObjectGraphicsInfo_CyndaquilDoll - .4byte gFieldObjectGraphicsInfo_ChikoritaDoll - .4byte gFieldObjectGraphicsInfo_TotodileDoll - .4byte gFieldObjectGraphicsInfo_JigglypuffDoll - .4byte gFieldObjectGraphicsInfo_MeowthDoll - .4byte gFieldObjectGraphicsInfo_ClefairyDoll - .4byte gFieldObjectGraphicsInfo_DittoDoll - .4byte gFieldObjectGraphicsInfo_SmoochumDoll - .4byte gFieldObjectGraphicsInfo_TreeckoDoll - .4byte gFieldObjectGraphicsInfo_TorchicDoll - .4byte gFieldObjectGraphicsInfo_MudkipDoll - .4byte gFieldObjectGraphicsInfo_DuskullDoll - .4byte gFieldObjectGraphicsInfo_WynautDoll - .4byte gFieldObjectGraphicsInfo_BaltoyDoll - .4byte gFieldObjectGraphicsInfo_KecleonDoll - .4byte gFieldObjectGraphicsInfo_AzurillDoll - .4byte gFieldObjectGraphicsInfo_SkittyDoll - .4byte gFieldObjectGraphicsInfo_SwabluDoll - .4byte gFieldObjectGraphicsInfo_GulpinDoll - .4byte gFieldObjectGraphicsInfo_LotadDoll - .4byte gFieldObjectGraphicsInfo_SeedotDoll - .4byte gFieldObjectGraphicsInfo_PikaCushion - .4byte gFieldObjectGraphicsInfo_RoundCushion - .4byte gFieldObjectGraphicsInfo_KissCushion - .4byte gFieldObjectGraphicsInfo_ZigzagCushion - .4byte gFieldObjectGraphicsInfo_SpinCushion - .4byte gFieldObjectGraphicsInfo_DiamondCushion - .4byte gFieldObjectGraphicsInfo_BallCushion - .4byte gFieldObjectGraphicsInfo_GrassCushion - .4byte gFieldObjectGraphicsInfo_FireCushion - .4byte gFieldObjectGraphicsInfo_WaterCushion - .4byte gFieldObjectGraphicsInfo_BigSnorlaxDoll - .4byte gFieldObjectGraphicsInfo_BigRhydonDoll - .4byte gFieldObjectGraphicsInfo_BigLaprasDoll - .4byte gFieldObjectGraphicsInfo_BigVenusaurDoll - .4byte gFieldObjectGraphicsInfo_BigCharizardDoll - .4byte gFieldObjectGraphicsInfo_BigBlastoiseDoll - .4byte gFieldObjectGraphicsInfo_BigWailmerDoll - .4byte gFieldObjectGraphicsInfo_BigRegirockDoll - .4byte gFieldObjectGraphicsInfo_BigRegiceDoll - .4byte gFieldObjectGraphicsInfo_BigRegisteelDoll - .4byte gFieldObjectGraphicsInfo_Latias - .4byte gFieldObjectGraphicsInfo_Latios - .4byte gFieldObjectGraphicsInfo_Boy5 - .4byte gFieldObjectGraphicsInfo_ContestOldMan - .4byte gFieldObjectGraphicsInfo_BrendanWatering - .4byte gFieldObjectGraphicsInfo_MayWatering - .4byte gFieldObjectGraphicsInfo_BrendanDecorating - .4byte gFieldObjectGraphicsInfo_MayDecorating - .4byte gFieldObjectGraphicsInfo_Archie - .4byte gFieldObjectGraphicsInfo_Maxie - .4byte gFieldObjectGraphicsInfo_Kyogre1 - .4byte gFieldObjectGraphicsInfo_Groudon1 - .4byte gFieldObjectGraphicsInfo_Fossil - .4byte gFieldObjectGraphicsInfo_Regirock - .4byte gFieldObjectGraphicsInfo_Regice - .4byte gFieldObjectGraphicsInfo_Registeel - .4byte gFieldObjectGraphicsInfo_Skitty - .4byte gFieldObjectGraphicsInfo_Kecleon1 - .4byte gFieldObjectGraphicsInfo_Kyogre2 - .4byte gFieldObjectGraphicsInfo_Groudon2 - .4byte gFieldObjectGraphicsInfo_Rayquaza2 - .4byte gFieldObjectGraphicsInfo_Zigzagoon - .4byte gFieldObjectGraphicsInfo_Pikachu - .4byte gFieldObjectGraphicsInfo_Azumarill - .4byte gFieldObjectGraphicsInfo_Wingull - .4byte gFieldObjectGraphicsInfo_Kecleon2 - .4byte gFieldObjectGraphicsInfo_TuberMSwimming - .4byte gFieldObjectGraphicsInfo_Azurill - .4byte gFieldObjectGraphicsInfo_Mom - .4byte gFieldObjectGraphicsInfo_LinkBrendan - .4byte gFieldObjectGraphicsInfo_LinkMay - .4byte gFieldObjectGraphicsInfo_Juan - .4byte gFieldObjectGraphicsInfo_Scott - .4byte gFieldObjectGraphicsInfo_Poochyena - .4byte gFieldObjectGraphicsInfo_Kyogre3 - .4byte gFieldObjectGraphicsInfo_Groudon3 - .4byte gFieldObjectGraphicsInfo_MysteryEventDeliveryman - .4byte gFieldObjectGraphicsInfo_Statue - .4byte gFieldObjectGraphicsInfo_Kirlia - .4byte gFieldObjectGraphicsInfo_Dusclops - .4byte gFieldObjectGraphicsInfo_UnionRoomAttendant - .4byte gFieldObjectGraphicsInfo_Sudowoodo - .4byte gFieldObjectGraphicsInfo_Mew - .4byte gFieldObjectGraphicsInfo_Red - .4byte gFieldObjectGraphicsInfo_Leaf - .4byte gFieldObjectGraphicsInfo_Deoxys - .4byte gFieldObjectGraphicsInfo_BirthIslandStone - .4byte gFieldObjectGraphicsInfo_Brandon - .4byte gFieldObjectGraphicsInfo_RubySapphireBrendan - .4byte gFieldObjectGraphicsInfo_RubySapphireMay - .4byte gFieldObjectGraphicsInfo_Lugia - .4byte gFieldObjectGraphicsInfo_HoOh - - .align 2 -gMauvilleOldManGraphicsInfoPointers:: @ 85059DC - .4byte gFieldObjectGraphicsInfo_Bard - .4byte gFieldObjectGraphicsInfo_Hipster - .4byte gFieldObjectGraphicsInfo_Trader - .4byte gFieldObjectGraphicsInfo_Storyteller - .4byte gFieldObjectGraphicsInfo_Giddy - .4byte gFieldObjectGraphicsInfo_UnusedMauvilleOldMan1 - .4byte gFieldObjectGraphicsInfo_UnusedMauvilleOldMan2 diff --git a/data/graphics/field_objects/field_object_oam.inc b/data/graphics/field_objects/field_object_oam.inc deleted file mode 100644 index ea4da1c022..0000000000 --- a/data/graphics/field_objects/field_object_oam.inc +++ /dev/null @@ -1,465 +0,0 @@ - .align 2 -gFieldObjectBaseOam_8x8:: @ 85094EC - .4byte OAM_SIZE_8x8 - .2byte 2 << 10 @ priority - - .align 2 -gFieldObjectBaseOam_16x8:: @ 85094F4 - .4byte OAM_SIZE_16x8 - .2byte 2 << 10 @ priority - - .align 2 -gFieldObjectBaseOam_16x16:: @ 85094FC - .4byte OAM_SIZE_16x16 - .2byte 2 << 10 @ priority - - .align 2 -gFieldObjectBaseOam_32x8:: @ 8509504 - .4byte OAM_SIZE_32x8 - .2byte 2 << 10 @ priority - - .align 2 -gFieldObjectBaseOam_64x32:: @ 850950C - .4byte OAM_SIZE_64x32 - .2byte 2 << 10 @ priority - - .align 2 -gFieldObjectBaseOam_16x32:: @ 8509514 - .4byte OAM_SIZE_16x32 - .2byte 2 << 10 @ priority - - .align 2 -gFieldObjectBaseOam_32x32:: @ 850951C - .4byte OAM_SIZE_32x32 - .2byte 2 << 10 @ priority - - .align 2 -gFieldObjectBaseOam_64x64:: @ 8509524 - .4byte OAM_SIZE_64x64 - .2byte 2 << 10 @ priority - - .align 2 -gFieldObjectSpriteOamTable_16x16_0:: @ 850952C - subsprite -8, -8, 2, 0, 16x16 - - .align 2 -gFieldObjectSpriteOamTable_16x16_1:: @ 8509530 - subsprite -8, -8, 1, 0, 16x16 - - .align 2 -gFieldObjectSpriteOamTable_16x16_2:: @ 8509534 - subsprite -8, -8, 2, 0, 16x8 - subsprite -8, 0, 3, 2, 16x8 - - .align 2 -gFieldObjectSpriteOamTable_16x16_3:: @ 850953C - subsprite -8, -8, 2, 0, 16x16 - subsprite -8, -8, 3, 0, 16x16 - - .align 2 -gFieldObjectSpriteOamTable_16x16_4:: @ 8509544 - subsprite -8, -8, 1, 0, 16x16 - subsprite -8, -8, 3, 0, 16x16 - - .align 2 -gFieldObjectSpriteOamTables_16x16:: @ 850954C - .4byte 0 @ number of sprites - .4byte NULL @ unknown - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_16x16_0 @ below high bridge - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_16x16_1 @ above high bridge - - .4byte 2 @ number of sprites - .4byte gFieldObjectSpriteOamTable_16x16_2 @ unknown - - .4byte 2 @ number of sprites - .4byte gFieldObjectSpriteOamTable_16x16_3 @ long grass below high bridge - - .4byte 2 @ number of sprites - .4byte gFieldObjectSpriteOamTable_16x16_4 @ long grass above high bridge - - .align 2 -gFieldObjectSpriteOamTable_16x32_0:: @ 850957C - subsprite -8, -16, 2, 0, 16x32 - - .align 2 -gFieldObjectSpriteOamTable_16x32_1:: @ 8509580 - subsprite -8, -16, 1, 0, 16x32 - - .align 2 -gFieldObjectSpriteOamTable_16x32_2:: @ 8509584 - subsprite -8, -16, 2, 0, 16x16 - subsprite -8, 0, 2, 4, 16x8 - subsprite -8, 8, 3, 6, 16x8 - - .align 2 -gFieldObjectSpriteOamTable_16x32_3:: @ 8509590 - subsprite -8, -16, 2, 0, 16x16 - subsprite -8, 0, 3, 4, 16x16 - - .align 2 -gFieldObjectSpriteOamTable_16x32_4:: @ 8509598 - subsprite -8, -16, 1, 0, 16x16 - subsprite -8, 0, 3, 4, 16x16 - - .align 2 -gFieldObjectSpriteOamTables_16x32:: @ 85095A0 - .4byte 0 @ number of sprites - .4byte NULL @ unknown - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_16x32_0 @ below high bridge - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_16x32_1 @ above high bridge - - .4byte 3 @ number of sprites - .4byte gFieldObjectSpriteOamTable_16x32_2 @ unknown - - .4byte 2 @ number of sprites - .4byte gFieldObjectSpriteOamTable_16x32_3 @ long grass below high bridge - - .4byte 2 @ number of sprites - .4byte gFieldObjectSpriteOamTable_16x32_4 @ long grass above high bridge - - .align 2 -gFieldObjectSpriteOamTable_32x32_0:: @ 85095D0 - subsprite -16, -16, 2, 0, 32x32 - - .align 2 -gFieldObjectSpriteOamTable_32x32_1:: @ 85095D4 - subsprite -16, -16, 1, 0, 32x32 - - .align 2 -gFieldObjectSpriteOamTable_32x32_2:: @ 85095D8 - subsprite -16, -16, 2, 0, 32x16 - subsprite -16, 0, 2, 8, 32x8 - subsprite -16, 8, 3, 12, 32x8 - - .align 2 -gFieldObjectSpriteOamTable_32x32_3:: @ 85095E4 - subsprite -16, -16, 2, 0, 32x16 - subsprite -16, 0, 3, 8, 32x16 - - .align 2 -gFieldObjectSpriteOamTable_32x32_4:: @ 85095EC - subsprite -16, -16, 1, 0, 32x16 - subsprite -16, 0, 3, 8, 32x16 - - .align 2 -gFieldObjectSpriteOamTables_32x32:: @ 85095F4 - .4byte 0 @ number of sprites - .4byte NULL @ unknown - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_32x32_0 @ below high bridge - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_32x32_1 @ above high bridge - - .4byte 3 @ number of sprites - .4byte gFieldObjectSpriteOamTable_32x32_2 @ unknown - - .4byte 2 @ number of sprites - .4byte gFieldObjectSpriteOamTable_32x32_3 @ long grass below high bridge - - .4byte 2 @ number of sprites - .4byte gFieldObjectSpriteOamTable_32x32_4 @ long grass above high bridge - - .align 2 -gFieldObjectSpriteOamTable_Truck_0:: @ 8509624 - subsprite -24, -24, 2, 0, 32x8 - subsprite 8, -24, 2, 4, 16x8 - subsprite -24, -16, 2, 6, 32x8 - subsprite 8, -16, 2, 10, 16x8 - subsprite -24, -8, 2, 12, 32x8 - subsprite 8, -8, 2, 16, 16x8 - subsprite -24, 0, 2, 18, 32x8 - subsprite 8, 0, 2, 22, 16x8 - subsprite -24, 8, 2, 24, 32x8 - subsprite 8, 8, 2, 28, 16x8 - subsprite -24, 16, 2, 30, 32x8 - subsprite 8, 16, 2, 34, 16x8 - - .align 2 -gFieldObjectSpriteOamTables_Truck:: @ 8509654 - .4byte 12 @ number of sprites - .4byte gFieldObjectSpriteOamTable_Truck_0 @ unknown - - .4byte 12 @ number of sprites - .4byte gFieldObjectSpriteOamTable_Truck_0 @ below high bridge - - .4byte 12 @ number of sprites - .4byte gFieldObjectSpriteOamTable_Truck_0 @ above high bridge - - .4byte 12 @ number of sprites - .4byte gFieldObjectSpriteOamTable_Truck_0 @ unknown - - .4byte 12 @ number of sprites - .4byte gFieldObjectSpriteOamTable_Truck_0 @ long grass below high bridge - - .4byte 12 @ number of sprites - .4byte gFieldObjectSpriteOamTable_Truck_0 @ long grass above high bridge - - .align 2 -gFieldObjectSpriteOamTable_Unused_0:: @ 8509684 - subsprite -32, -16, 2, 0, 64x32 - - .align 2 -gFieldObjectSpriteOamTable_Unused_1:: @ 8509688 - subsprite -32, -16, 1, 0, 64x32 - - .align 2 -gFieldObjectSpriteOamTable_Unused_2:: @ 850968C - subsprite -32, -16, 2, 0, 64x32 - - .align 2 -gFieldObjectSpriteOamTable_Unused_3:: @ 8509690 - subsprite -32, -16, 2, 0, 64x32 - - .align 2 -gFieldObjectSpriteOamTables_Unused:: @ 8509694 - .4byte 0 @ number of sprites - .4byte NULL @ unknown - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_Unused_0 @ below high bridge - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_Unused_1 @ above high bridge - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_Unused_2 @ unknown - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_Unused_3 @ long grass below high bridge - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_Unused_3 @ long grass above high bridge - - .align 2 -gFieldObjectSpriteOamTable_64x64_0:: @ 85096C4 - subsprite -32, -32, 2, 0, 64x64 - - .align 2 -gFieldObjectSpriteOamTable_64x64_1:: @ 85096C8 - subsprite -32, -32, 1, 0, 64x64 - - .align 2 -gFieldObjectSpriteOamTable_64x64_2:: @ 85096CC - subsprite -32, -32, 2, 0, 64x64 - - .align 2 -gFieldObjectSpriteOamTable_64x64_3:: @ 85096D0 - subsprite -32, -32, 2, 0, 64x64 - - .align 2 -gFieldObjectSpriteOamTables_64x64:: @ 85096D4 - .4byte 0 @ number of sprites - .4byte NULL @ unknown - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_64x64_0 @ below high bridge - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_64x64_1 @ above high bridge - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_64x64_2 @ unknown - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_64x64_3 @ long grass below high bridge - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_64x64_3 @ long grass above high bridge - - .align 2 -gFieldObjectSpriteOamTable_SSTidal_0:: @ 8509704 - subsprite -48, -20, 2, 0, 32x8 - subsprite -16, -20, 2, 4, 32x8 - subsprite 16, -20, 2, 8, 32x8 - subsprite -48, -12, 2, 12, 32x8 - subsprite -16, -12, 2, 16, 32x8 - subsprite 16, -12, 2, 20, 32x8 - subsprite -48, -4, 2, 24, 32x8 - subsprite -16, -4, 2, 28, 32x8 - subsprite 16, -4, 2, 32, 32x8 - subsprite -48, 4, 2, 36, 32x8 - subsprite -16, 4, 2, 40, 32x8 - subsprite 16, 4, 2, 44, 32x8 - subsprite -48, 12, 2, 48, 32x8 - subsprite -16, 12, 2, 52, 32x8 - subsprite 16, 12, 2, 56, 32x8 - - .align 2 -gFieldObjectSpriteOamTable_SSTidal_1:: @ 8509740 - subsprite -48, -20, 1, 0, 32x8 - subsprite -16, -20, 1, 4, 32x8 - subsprite 16, -20, 1, 8, 32x8 - subsprite -48, -12, 1, 12, 32x8 - subsprite -16, -12, 1, 16, 32x8 - subsprite 16, -12, 1, 20, 32x8 - subsprite -48, -4, 1, 24, 32x8 - subsprite -16, -4, 1, 28, 32x8 - subsprite 16, -4, 1, 32, 32x8 - subsprite -48, 4, 1, 36, 32x8 - subsprite -16, 4, 1, 40, 32x8 - subsprite 16, 4, 1, 44, 32x8 - subsprite -48, 12, 1, 48, 32x8 - subsprite -16, 12, 1, 52, 32x8 - subsprite 16, 12, 1, 56, 32x8 - - .align 2 -gFieldObjectSpriteOamTable_SSTidal_2:: @ 850977C - subsprite -48, -20, 2, 0, 32x8 - subsprite -16, -20, 2, 4, 32x8 - subsprite 16, -20, 2, 8, 32x8 - subsprite -48, -12, 2, 12, 32x8 - subsprite -16, -12, 2, 16, 32x8 - subsprite 16, -12, 2, 20, 32x8 - subsprite -48, -4, 2, 24, 32x8 - subsprite -16, -4, 2, 28, 32x8 - subsprite 16, -4, 2, 32, 32x8 - subsprite -48, 4, 2, 36, 32x8 - subsprite -16, 4, 2, 40, 32x8 - subsprite 16, 4, 2, 44, 32x8 - subsprite -48, 12, 2, 48, 32x8 - subsprite -16, 12, 2, 52, 32x8 - subsprite 16, 12, 2, 56, 32x8 - - .align 2 -gFieldObjectSpriteOamTable_SSTidal_3:: @ 85097B8 - subsprite -48, -20, 1, 0, 32x8 - subsprite -16, -20, 1, 4, 32x8 - subsprite 16, -20, 1, 8, 32x8 - subsprite -48, -12, 1, 12, 32x8 - subsprite -16, -12, 1, 16, 32x8 - subsprite 16, -12, 1, 20, 32x8 - subsprite -48, -4, 2, 24, 32x8 - subsprite -16, -4, 2, 28, 32x8 - subsprite 16, -4, 2, 32, 32x8 - subsprite -48, 4, 2, 36, 32x8 - subsprite -16, 4, 2, 40, 32x8 - subsprite 16, 4, 2, 44, 32x8 - subsprite -48, 12, 2, 48, 32x8 - subsprite -16, 12, 2, 52, 32x8 - subsprite 16, 12, 2, 56, 32x8 - - .align 2 -gFieldObjectSpriteOamTables_SSTidal:: @ 85097F4 - .4byte 15 @ number of sprites - .4byte gFieldObjectSpriteOamTable_SSTidal_0 @ unknown - - .4byte 15 @ number of sprites - .4byte gFieldObjectSpriteOamTable_SSTidal_0 @ below high bridge - - .4byte 15 @ number of sprites - .4byte gFieldObjectSpriteOamTable_SSTidal_1 @ above high bridge - - .4byte 15 @ number of sprites - .4byte gFieldObjectSpriteOamTable_SSTidal_2 @ unknown - - .4byte 15 @ number of sprites - .4byte gFieldObjectSpriteOamTable_SSTidal_3 @ long grass below high bridge - - .4byte 15 @ number of sprites - .4byte gFieldObjectSpriteOamTable_SSTidal_3 @ long grass above high bridge - - .align 2 -gFieldObjectSpriteOamTable_SubmarineShadow_0:: @ 8509824 - subsprite -48, -20, 2, 0, 32x8 - subsprite -16, -20, 2, 4, 32x8 - subsprite 16, -20, 2, 8, 16x8 - subsprite 32, -20, 2, 10, 8x8 - subsprite -48, -12, 2, 11, 32x8 - subsprite -16, -12, 2, 15, 32x8 - subsprite 16, -12, 2, 19, 16x8 - subsprite 32, -12, 2, 21, 8x8 - subsprite -48, -4, 2, 22, 32x8 - subsprite -16, -4, 2, 26, 32x8 - subsprite 16, -4, 2, 30, 16x8 - subsprite 32, -4, 2, 32, 8x8 - subsprite -48, 4, 2, 33, 32x8 - subsprite -16, 4, 2, 37, 32x8 - subsprite 16, 4, 2, 41, 16x8 - subsprite 32, 4, 2, 43, 8x8 - - .align 2 -gFieldObjectSpriteOamTable_SubmarineShadow_1:: @ 8509864 - subsprite -48, -20, 1, 0, 32x8 - subsprite -16, -20, 1, 4, 32x8 - subsprite 16, -20, 1, 8, 16x8 - subsprite 32, -20, 1, 10, 8x8 - subsprite -48, -12, 1, 11, 32x8 - subsprite -16, -12, 1, 15, 32x8 - subsprite 16, -12, 1, 19, 16x8 - subsprite 32, -12, 1, 21, 8x8 - subsprite -48, -4, 1, 22, 32x8 - subsprite -16, -4, 1, 26, 32x8 - subsprite 16, -4, 1, 30, 16x8 - subsprite 32, -4, 1, 32, 8x8 - subsprite -48, 4, 1, 33, 32x8 - subsprite -16, 4, 1, 37, 32x8 - subsprite 16, 4, 1, 41, 16x8 - subsprite 32, 4, 1, 43, 8x8 - - .align 2 -gFieldObjectSpriteOamTable_SubmarineShadow_2:: @ 85098A4 - subsprite -48, -20, 2, 0, 32x8 - subsprite -16, -20, 2, 4, 32x8 - subsprite 16, -20, 2, 8, 16x8 - subsprite 32, -20, 2, 10, 8x8 - subsprite -48, -12, 2, 11, 32x8 - subsprite -16, -12, 2, 15, 32x8 - subsprite 16, -12, 2, 19, 16x8 - subsprite 32, -12, 2, 21, 8x8 - subsprite -48, -4, 2, 22, 32x8 - subsprite -16, -4, 2, 26, 32x8 - subsprite 16, -4, 2, 30, 16x8 - subsprite 32, -4, 2, 32, 8x8 - subsprite -48, 4, 2, 33, 32x8 - subsprite -16, 4, 2, 37, 32x8 - subsprite 16, 4, 2, 41, 16x8 - subsprite 32, 4, 2, 43, 8x8 - - .align 2 -gFieldObjectSpriteOamTable_SubmarineShadow_3:: @ 85098E4 - subsprite -48, -20, 1, 0, 32x8 - subsprite -16, -20, 1, 4, 32x8 - subsprite 16, -20, 1, 8, 16x8 - subsprite 32, -20, 1, 10, 8x8 - subsprite -48, -12, 1, 11, 32x8 - subsprite -16, -12, 1, 15, 32x8 - subsprite 16, -12, 1, 19, 16x8 - subsprite 32, -12, 1, 21, 8x8 - subsprite -48, -4, 2, 22, 32x8 - subsprite -16, -4, 2, 26, 32x8 - subsprite 16, -4, 2, 30, 16x8 - subsprite 32, -4, 2, 32, 8x8 - subsprite -48, 4, 2, 33, 32x8 - subsprite -16, 4, 2, 37, 32x8 - subsprite 16, 4, 2, 41, 16x8 - subsprite 32, 4, 2, 43, 8x8 - - .align 2 -gFieldObjectSpriteOamTables_SubmarineShadow:: @ 8509924 - .4byte 16 @ number of sprites - .4byte gFieldObjectSpriteOamTable_SubmarineShadow_0 @ unknown - - .4byte 16 @ number of sprites - .4byte gFieldObjectSpriteOamTable_SubmarineShadow_0 @ below high bridge - - .4byte 16 @ number of sprites - .4byte gFieldObjectSpriteOamTable_SubmarineShadow_1 @ above high bridge - - .4byte 16 @ number of sprites - .4byte gFieldObjectSpriteOamTable_SubmarineShadow_2 @ unknown - - .4byte 16 @ number of sprites - .4byte gFieldObjectSpriteOamTable_SubmarineShadow_3 @ long grass below high bridge - - .4byte 16 @ number of sprites - .4byte gFieldObjectSpriteOamTable_SubmarineShadow_3 @ long grass above high bridge diff --git a/data/graphics/field_objects/field_object_pic_tables.inc b/data/graphics/field_objects/field_object_pic_tables.inc deleted file mode 100644 index abd09d7c45..0000000000 --- a/data/graphics/field_objects/field_object_pic_tables.inc +++ /dev/null @@ -1,2174 +0,0 @@ - .align 2 -gFieldObjectPicTable_BrendanNormal:: @ 8505A8C - obj_tiles gFieldObjectPic_BrendanNormal_0, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_1, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_2, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_3, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_4, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_5, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_6, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_7, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_8, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_9, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_10, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_11, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_12, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_13, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_14, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_15, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_16, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_17, 0x100 - - .align 2 -gFieldObjectPicTable_BrendanMachBike:: @ 8505B1C - obj_tiles gFieldObjectPic_BrendanMachBike_0, 0x200 - obj_tiles gFieldObjectPic_BrendanMachBike_1, 0x200 - obj_tiles gFieldObjectPic_BrendanMachBike_2, 0x200 - obj_tiles gFieldObjectPic_BrendanMachBike_3, 0x200 - obj_tiles gFieldObjectPic_BrendanMachBike_4, 0x200 - obj_tiles gFieldObjectPic_BrendanMachBike_5, 0x200 - obj_tiles gFieldObjectPic_BrendanMachBike_6, 0x200 - obj_tiles gFieldObjectPic_BrendanMachBike_7, 0x200 - obj_tiles gFieldObjectPic_BrendanMachBike_8, 0x200 - - .align 2 -gFieldObjectPicTable_BrendanAcroBike:: @ 8505B64 - obj_tiles gFieldObjectPic_BrendanAcroBike_0, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_1, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_2, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_3, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_4, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_5, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_6, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_7, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_8, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_9, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_10, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_11, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_12, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_13, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_14, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_15, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_16, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_17, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_18, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_19, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_20, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_21, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_22, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_23, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_24, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_25, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_26, 0x200 - - .align 2 -gFieldObjectPicTable_BrendanSurfing:: @ 8505C3C - obj_tiles gFieldObjectPic_BrendanSurfing_0, 0x200 - obj_tiles gFieldObjectPic_BrendanSurfing_1, 0x200 - obj_tiles gFieldObjectPic_BrendanSurfing_2, 0x200 - obj_tiles gFieldObjectPic_BrendanSurfing_0, 0x200 - obj_tiles gFieldObjectPic_BrendanSurfing_0, 0x200 - obj_tiles gFieldObjectPic_BrendanSurfing_1, 0x200 - obj_tiles gFieldObjectPic_BrendanSurfing_1, 0x200 - obj_tiles gFieldObjectPic_BrendanSurfing_2, 0x200 - obj_tiles gFieldObjectPic_BrendanSurfing_2, 0x200 - obj_tiles gFieldObjectPic_BrendanSurfing_3, 0x200 - obj_tiles gFieldObjectPic_BrendanSurfing_4, 0x200 - obj_tiles gFieldObjectPic_BrendanSurfing_5, 0x200 - - .align 2 -gFieldObjectPicTable_BrendanUnderwater:: @ 8505C9C - obj_tiles gFieldObjectPic_BrendanUnderwater_0, 0x200 - obj_tiles gFieldObjectPic_BrendanUnderwater_1, 0x200 - obj_tiles gFieldObjectPic_BrendanUnderwater_2, 0x200 - obj_tiles gFieldObjectPic_BrendanUnderwater_0, 0x200 - obj_tiles gFieldObjectPic_BrendanUnderwater_0, 0x200 - obj_tiles gFieldObjectPic_BrendanUnderwater_1, 0x200 - obj_tiles gFieldObjectPic_BrendanUnderwater_1, 0x200 - obj_tiles gFieldObjectPic_BrendanUnderwater_2, 0x200 - obj_tiles gFieldObjectPic_BrendanUnderwater_2, 0x200 - - .align 2 -gFieldObjectPicTable_BrendanFieldMove:: @ 8505CE4 - obj_tiles gFieldObjectPic_BrendanFieldMove_0, 0x200 - obj_tiles gFieldObjectPic_BrendanFieldMove_1, 0x200 - obj_tiles gFieldObjectPic_BrendanFieldMove_2, 0x200 - obj_tiles gFieldObjectPic_BrendanFieldMove_3, 0x200 - obj_tiles gFieldObjectPic_BrendanFieldMove_4, 0x200 - - .align 2 -gFieldObjectPicTable_QuintyPlump:: @ 8505D0C - obj_tiles gFieldObjectPic_QuintyPlump_0, 0x200 - obj_tiles gFieldObjectPic_QuintyPlump_1, 0x200 - obj_tiles gFieldObjectPic_QuintyPlump_2, 0x200 - obj_tiles gFieldObjectPic_QuintyPlump_3, 0x200 - obj_tiles gFieldObjectPic_QuintyPlump_4, 0x200 - obj_tiles gFieldObjectPic_QuintyPlump_5, 0x200 - obj_tiles gFieldObjectPic_QuintyPlump_6, 0x200 - - .align 2 -gFieldObjectPicTable_LittleBoy1:: @ 8505D44 - obj_tiles gFieldObjectPic_LittleBoy1_0, 0x80 - obj_tiles gFieldObjectPic_LittleBoy1_1, 0x80 - obj_tiles gFieldObjectPic_LittleBoy1_2, 0x80 - obj_tiles gFieldObjectPic_LittleBoy1_3, 0x80 - obj_tiles gFieldObjectPic_LittleBoy1_4, 0x80 - obj_tiles gFieldObjectPic_LittleBoy1_5, 0x80 - obj_tiles gFieldObjectPic_LittleBoy1_6, 0x80 - obj_tiles gFieldObjectPic_LittleBoy1_7, 0x80 - obj_tiles gFieldObjectPic_LittleBoy1_8, 0x80 - - .align 2 -gFieldObjectPicTable_LittleGirl1:: @ 8505D8C - obj_tiles gFieldObjectPic_LittleGirl1_0, 0x100 - obj_tiles gFieldObjectPic_LittleGirl1_1, 0x100 - obj_tiles gFieldObjectPic_LittleGirl1_2, 0x100 - obj_tiles gFieldObjectPic_LittleGirl1_3, 0x100 - obj_tiles gFieldObjectPic_LittleGirl1_4, 0x100 - obj_tiles gFieldObjectPic_LittleGirl1_5, 0x100 - obj_tiles gFieldObjectPic_LittleGirl1_6, 0x100 - obj_tiles gFieldObjectPic_LittleGirl1_7, 0x100 - obj_tiles gFieldObjectPic_LittleGirl1_8, 0x100 - - .align 2 -gFieldObjectPicTable_Boy1:: @ 8505DD4 - obj_tiles gFieldObjectPic_Boy1_0, 0x100 - obj_tiles gFieldObjectPic_Boy1_1, 0x100 - obj_tiles gFieldObjectPic_Boy1_2, 0x100 - obj_tiles gFieldObjectPic_Boy1_3, 0x100 - obj_tiles gFieldObjectPic_Boy1_4, 0x100 - obj_tiles gFieldObjectPic_Boy1_5, 0x100 - obj_tiles gFieldObjectPic_Boy1_6, 0x100 - obj_tiles gFieldObjectPic_Boy1_7, 0x100 - obj_tiles gFieldObjectPic_Boy1_8, 0x100 - - .align 2 -gFieldObjectPicTable_Girl1:: @ 8505E1C - obj_tiles gFieldObjectPic_Girl1_0, 0x100 - obj_tiles gFieldObjectPic_Girl1_1, 0x100 - obj_tiles gFieldObjectPic_Girl1_2, 0x100 - obj_tiles gFieldObjectPic_Girl1_3, 0x100 - obj_tiles gFieldObjectPic_Girl1_4, 0x100 - obj_tiles gFieldObjectPic_Girl1_5, 0x100 - obj_tiles gFieldObjectPic_Girl1_6, 0x100 - obj_tiles gFieldObjectPic_Girl1_7, 0x100 - obj_tiles gFieldObjectPic_Girl1_8, 0x100 - - .align 2 -gFieldObjectPicTable_Boy2:: @ 8505E64 - obj_tiles gFieldObjectPic_Boy2_0, 0x100 - obj_tiles gFieldObjectPic_Boy2_1, 0x100 - obj_tiles gFieldObjectPic_Boy2_2, 0x100 - obj_tiles gFieldObjectPic_Boy2_3, 0x100 - obj_tiles gFieldObjectPic_Boy2_4, 0x100 - obj_tiles gFieldObjectPic_Boy2_5, 0x100 - obj_tiles gFieldObjectPic_Boy2_6, 0x100 - obj_tiles gFieldObjectPic_Boy2_7, 0x100 - obj_tiles gFieldObjectPic_Boy2_8, 0x100 - - .align 2 -gFieldObjectPicTable_Girl2:: @ 8505EAC - obj_tiles gFieldObjectPic_Girl2_0, 0x100 - obj_tiles gFieldObjectPic_Girl2_1, 0x100 - obj_tiles gFieldObjectPic_Girl2_2, 0x100 - obj_tiles gFieldObjectPic_Girl2_3, 0x100 - obj_tiles gFieldObjectPic_Girl2_4, 0x100 - obj_tiles gFieldObjectPic_Girl2_5, 0x100 - obj_tiles gFieldObjectPic_Girl2_6, 0x100 - obj_tiles gFieldObjectPic_Girl2_7, 0x100 - obj_tiles gFieldObjectPic_Girl2_8, 0x100 - - .align 2 -gFieldObjectPicTable_LittleBoy2:: @ 8505EF4 - obj_tiles gFieldObjectPic_LittleBoy2_0, 0x80 - obj_tiles gFieldObjectPic_LittleBoy2_1, 0x80 - obj_tiles gFieldObjectPic_LittleBoy2_2, 0x80 - obj_tiles gFieldObjectPic_LittleBoy2_3, 0x80 - obj_tiles gFieldObjectPic_LittleBoy2_4, 0x80 - obj_tiles gFieldObjectPic_LittleBoy2_5, 0x80 - obj_tiles gFieldObjectPic_LittleBoy2_6, 0x80 - obj_tiles gFieldObjectPic_LittleBoy2_7, 0x80 - obj_tiles gFieldObjectPic_LittleBoy2_8, 0x80 - - .align 2 -gFieldObjectPicTable_LittleGirl2:: @ 8505F3C - obj_tiles gFieldObjectPic_LittleGirl2_0, 0x80 - obj_tiles gFieldObjectPic_LittleGirl2_1, 0x80 - obj_tiles gFieldObjectPic_LittleGirl2_2, 0x80 - obj_tiles gFieldObjectPic_LittleGirl2_3, 0x80 - obj_tiles gFieldObjectPic_LittleGirl2_4, 0x80 - obj_tiles gFieldObjectPic_LittleGirl2_5, 0x80 - obj_tiles gFieldObjectPic_LittleGirl2_6, 0x80 - obj_tiles gFieldObjectPic_LittleGirl2_7, 0x80 - obj_tiles gFieldObjectPic_LittleGirl2_8, 0x80 - - .align 2 -gFieldObjectPicTable_Boy3:: @ 8505F84 - obj_tiles gFieldObjectPic_Boy3_0, 0x100 - obj_tiles gFieldObjectPic_Boy3_1, 0x100 - obj_tiles gFieldObjectPic_Boy3_2, 0x100 - obj_tiles gFieldObjectPic_Boy3_3, 0x100 - obj_tiles gFieldObjectPic_Boy3_4, 0x100 - obj_tiles gFieldObjectPic_Boy3_5, 0x100 - obj_tiles gFieldObjectPic_Boy3_6, 0x100 - obj_tiles gFieldObjectPic_Boy3_7, 0x100 - obj_tiles gFieldObjectPic_Boy3_8, 0x100 - - .align 2 -gFieldObjectPicTable_Girl3:: @ 8505FCC - obj_tiles gFieldObjectPic_Girl3_0, 0x100 - obj_tiles gFieldObjectPic_Girl3_1, 0x100 - obj_tiles gFieldObjectPic_Girl3_2, 0x100 - obj_tiles gFieldObjectPic_Girl3_3, 0x100 - obj_tiles gFieldObjectPic_Girl3_4, 0x100 - obj_tiles gFieldObjectPic_Girl3_5, 0x100 - obj_tiles gFieldObjectPic_Girl3_6, 0x100 - obj_tiles gFieldObjectPic_Girl3_7, 0x100 - obj_tiles gFieldObjectPic_Girl3_8, 0x100 - - .align 2 -gFieldObjectPicTable_Boy4:: @ 8506014 - obj_tiles gFieldObjectPic_Boy4_0, 0x100 - obj_tiles gFieldObjectPic_Boy4_1, 0x100 - obj_tiles gFieldObjectPic_Boy4_2, 0x100 - obj_tiles gFieldObjectPic_Boy4_3, 0x100 - obj_tiles gFieldObjectPic_Boy4_4, 0x100 - obj_tiles gFieldObjectPic_Boy4_5, 0x100 - obj_tiles gFieldObjectPic_Boy4_6, 0x100 - obj_tiles gFieldObjectPic_Boy4_7, 0x100 - obj_tiles gFieldObjectPic_Boy4_8, 0x100 - - .align 2 -gFieldObjectPicTable_Woman1:: @ 850605C - obj_tiles gFieldObjectPic_Woman1_0, 0x100 - obj_tiles gFieldObjectPic_Woman1_1, 0x100 - obj_tiles gFieldObjectPic_Woman1_2, 0x100 - obj_tiles gFieldObjectPic_Woman1_3, 0x100 - obj_tiles gFieldObjectPic_Woman1_4, 0x100 - obj_tiles gFieldObjectPic_Woman1_5, 0x100 - obj_tiles gFieldObjectPic_Woman1_6, 0x100 - obj_tiles gFieldObjectPic_Woman1_7, 0x100 - obj_tiles gFieldObjectPic_Woman1_8, 0x100 - - .align 2 -gFieldObjectPicTable_FatMan:: @ 85060A4 - obj_tiles gFieldObjectPic_FatMan_0, 0x100 - obj_tiles gFieldObjectPic_FatMan_1, 0x100 - obj_tiles gFieldObjectPic_FatMan_2, 0x100 - obj_tiles gFieldObjectPic_FatMan_3, 0x100 - obj_tiles gFieldObjectPic_FatMan_4, 0x100 - obj_tiles gFieldObjectPic_FatMan_5, 0x100 - obj_tiles gFieldObjectPic_FatMan_6, 0x100 - obj_tiles gFieldObjectPic_FatMan_7, 0x100 - obj_tiles gFieldObjectPic_FatMan_8, 0x100 - - .align 2 -gFieldObjectPicTable_Woman2:: @ 85060EC - obj_tiles gFieldObjectPic_Woman2_0, 0x100 - obj_tiles gFieldObjectPic_Woman2_1, 0x100 - obj_tiles gFieldObjectPic_Woman2_2, 0x100 - obj_tiles gFieldObjectPic_Woman2_3, 0x100 - obj_tiles gFieldObjectPic_Woman2_4, 0x100 - obj_tiles gFieldObjectPic_Woman2_5, 0x100 - obj_tiles gFieldObjectPic_Woman2_6, 0x100 - obj_tiles gFieldObjectPic_Woman2_7, 0x100 - obj_tiles gFieldObjectPic_Woman2_8, 0x100 - - .align 2 -gFieldObjectPicTable_Man1:: @ 8506134 - obj_tiles gFieldObjectPic_Man1_0, 0x100 - obj_tiles gFieldObjectPic_Man1_1, 0x100 - obj_tiles gFieldObjectPic_Man1_2, 0x100 - obj_tiles gFieldObjectPic_Man1_3, 0x100 - obj_tiles gFieldObjectPic_Man1_4, 0x100 - obj_tiles gFieldObjectPic_Man1_5, 0x100 - obj_tiles gFieldObjectPic_Man1_6, 0x100 - obj_tiles gFieldObjectPic_Man1_7, 0x100 - obj_tiles gFieldObjectPic_Man1_8, 0x100 - - .align 2 -gFieldObjectPicTable_Woman3:: @ 850617C - obj_tiles gFieldObjectPic_Woman3_0, 0x100 - obj_tiles gFieldObjectPic_Woman3_1, 0x100 - obj_tiles gFieldObjectPic_Woman3_2, 0x100 - obj_tiles gFieldObjectPic_Woman3_3, 0x100 - obj_tiles gFieldObjectPic_Woman3_4, 0x100 - obj_tiles gFieldObjectPic_Woman3_5, 0x100 - obj_tiles gFieldObjectPic_Woman3_6, 0x100 - obj_tiles gFieldObjectPic_Woman3_7, 0x100 - obj_tiles gFieldObjectPic_Woman3_8, 0x100 - - .align 2 -gFieldObjectPicTable_OldMan1:: @ 85061C4 - obj_tiles gFieldObjectPic_OldMan1_0, 0x100 - obj_tiles gFieldObjectPic_OldMan1_1, 0x100 - obj_tiles gFieldObjectPic_OldMan1_2, 0x100 - obj_tiles gFieldObjectPic_OldMan1_3, 0x100 - obj_tiles gFieldObjectPic_OldMan1_4, 0x100 - obj_tiles gFieldObjectPic_OldMan1_5, 0x100 - obj_tiles gFieldObjectPic_OldMan1_6, 0x100 - obj_tiles gFieldObjectPic_OldMan1_7, 0x100 - obj_tiles gFieldObjectPic_OldMan1_8, 0x100 - - .align 2 -gFieldObjectPicTable_OldWoman1:: @ 850620C - obj_tiles gFieldObjectPic_OldWoman1_0, 0x100 - obj_tiles gFieldObjectPic_OldWoman1_1, 0x100 - obj_tiles gFieldObjectPic_OldWoman1_2, 0x100 - obj_tiles gFieldObjectPic_OldWoman1_3, 0x100 - obj_tiles gFieldObjectPic_OldWoman1_4, 0x100 - obj_tiles gFieldObjectPic_OldWoman1_5, 0x100 - obj_tiles gFieldObjectPic_OldWoman1_6, 0x100 - obj_tiles gFieldObjectPic_OldWoman1_7, 0x100 - obj_tiles gFieldObjectPic_OldWoman1_8, 0x100 - - .align 2 -gFieldObjectPicTable_Man2:: @ 8506254 - obj_tiles gFieldObjectPic_Man2_0, 0x100 - obj_tiles gFieldObjectPic_Man2_1, 0x100 - obj_tiles gFieldObjectPic_Man2_2, 0x100 - obj_tiles gFieldObjectPic_Man2_3, 0x100 - obj_tiles gFieldObjectPic_Man2_4, 0x100 - obj_tiles gFieldObjectPic_Man2_5, 0x100 - obj_tiles gFieldObjectPic_Man2_6, 0x100 - obj_tiles gFieldObjectPic_Man2_7, 0x100 - obj_tiles gFieldObjectPic_Man2_8, 0x100 - - .align 2 -gFieldObjectPicTable_Woman4:: @ 850629C - obj_tiles gFieldObjectPic_Woman4_0, 0x100 - obj_tiles gFieldObjectPic_Woman4_1, 0x100 - obj_tiles gFieldObjectPic_Woman4_2, 0x100 - obj_tiles gFieldObjectPic_Woman4_3, 0x100 - obj_tiles gFieldObjectPic_Woman4_4, 0x100 - obj_tiles gFieldObjectPic_Woman4_5, 0x100 - obj_tiles gFieldObjectPic_Woman4_6, 0x100 - obj_tiles gFieldObjectPic_Woman4_7, 0x100 - obj_tiles gFieldObjectPic_Woman4_8, 0x100 - - .align 2 -gFieldObjectPicTable_Man3:: @ 85062E4 - obj_tiles gFieldObjectPic_Man3_0, 0x100 - obj_tiles gFieldObjectPic_Man3_1, 0x100 - obj_tiles gFieldObjectPic_Man3_2, 0x100 - obj_tiles gFieldObjectPic_Man3_3, 0x100 - obj_tiles gFieldObjectPic_Man3_4, 0x100 - obj_tiles gFieldObjectPic_Man3_5, 0x100 - obj_tiles gFieldObjectPic_Man3_6, 0x100 - obj_tiles gFieldObjectPic_Man3_7, 0x100 - obj_tiles gFieldObjectPic_Man3_8, 0x100 - - .align 2 -gFieldObjectPicTable_Woman5:: @ 850632C - obj_tiles gFieldObjectPic_Woman5_0, 0x100 - obj_tiles gFieldObjectPic_Woman5_1, 0x100 - obj_tiles gFieldObjectPic_Woman5_2, 0x100 - obj_tiles gFieldObjectPic_Woman5_3, 0x100 - obj_tiles gFieldObjectPic_Woman5_4, 0x100 - obj_tiles gFieldObjectPic_Woman5_5, 0x100 - obj_tiles gFieldObjectPic_Woman5_6, 0x100 - obj_tiles gFieldObjectPic_Woman5_7, 0x100 - obj_tiles gFieldObjectPic_Woman5_8, 0x100 - - .align 2 -gFieldObjectPicTable_Cook:: @ 8506374 - obj_tiles gFieldObjectPic_Cook_0, 0x100 - obj_tiles gFieldObjectPic_Cook_1, 0x100 - obj_tiles gFieldObjectPic_Cook_2, 0x100 - obj_tiles gFieldObjectPic_Cook_0, 0x100 - obj_tiles gFieldObjectPic_Cook_0, 0x100 - obj_tiles gFieldObjectPic_Cook_1, 0x100 - obj_tiles gFieldObjectPic_Cook_1, 0x100 - obj_tiles gFieldObjectPic_Cook_2, 0x100 - obj_tiles gFieldObjectPic_Cook_2, 0x100 - - .align 2 -gFieldObjectPicTable_Woman6:: @ 85063BC - obj_tiles gFieldObjectPic_Woman6_0, 0x100 - obj_tiles gFieldObjectPic_Woman6_1, 0x100 - obj_tiles gFieldObjectPic_Woman6_2, 0x100 - obj_tiles gFieldObjectPic_Woman6_3, 0x100 - obj_tiles gFieldObjectPic_Woman6_4, 0x100 - obj_tiles gFieldObjectPic_Woman6_5, 0x100 - obj_tiles gFieldObjectPic_Woman6_6, 0x100 - obj_tiles gFieldObjectPic_Woman6_7, 0x100 - obj_tiles gFieldObjectPic_Woman6_8, 0x100 - - .align 2 -gFieldObjectPicTable_OldMan2:: @ 8506404 - obj_tiles gFieldObjectPic_OldMan2_0, 0x100 - obj_tiles gFieldObjectPic_OldMan2_1, 0x100 - obj_tiles gFieldObjectPic_OldMan2_2, 0x100 - obj_tiles gFieldObjectPic_OldMan2_0, 0x100 - obj_tiles gFieldObjectPic_OldMan2_0, 0x100 - obj_tiles gFieldObjectPic_OldMan2_1, 0x100 - obj_tiles gFieldObjectPic_OldMan2_1, 0x100 - obj_tiles gFieldObjectPic_OldMan2_2, 0x100 - obj_tiles gFieldObjectPic_OldMan2_2, 0x100 - - .align 2 -gFieldObjectPicTable_OldWoman2:: @ 850644C - obj_tiles gFieldObjectPic_OldWoman2_0, 0x100 - obj_tiles gFieldObjectPic_OldWoman2_1, 0x100 - obj_tiles gFieldObjectPic_OldWoman2_2, 0x100 - obj_tiles gFieldObjectPic_OldWoman2_3, 0x100 - obj_tiles gFieldObjectPic_OldWoman2_4, 0x100 - obj_tiles gFieldObjectPic_OldWoman2_5, 0x100 - obj_tiles gFieldObjectPic_OldWoman2_6, 0x100 - obj_tiles gFieldObjectPic_OldWoman2_7, 0x100 - obj_tiles gFieldObjectPic_OldWoman2_8, 0x100 - - .align 2 -gFieldObjectPicTable_Camper:: @ 8506494 - obj_tiles gFieldObjectPic_Camper_0, 0x100 - obj_tiles gFieldObjectPic_Camper_1, 0x100 - obj_tiles gFieldObjectPic_Camper_2, 0x100 - obj_tiles gFieldObjectPic_Camper_3, 0x100 - obj_tiles gFieldObjectPic_Camper_4, 0x100 - obj_tiles gFieldObjectPic_Camper_5, 0x100 - obj_tiles gFieldObjectPic_Camper_6, 0x100 - obj_tiles gFieldObjectPic_Camper_7, 0x100 - obj_tiles gFieldObjectPic_Camper_8, 0x100 - - .align 2 -gFieldObjectPicTable_Picnicker:: @ 85064DC - obj_tiles gFieldObjectPic_Picnicker_0, 0x100 - obj_tiles gFieldObjectPic_Picnicker_1, 0x100 - obj_tiles gFieldObjectPic_Picnicker_2, 0x100 - obj_tiles gFieldObjectPic_Picnicker_3, 0x100 - obj_tiles gFieldObjectPic_Picnicker_4, 0x100 - obj_tiles gFieldObjectPic_Picnicker_5, 0x100 - obj_tiles gFieldObjectPic_Picnicker_6, 0x100 - obj_tiles gFieldObjectPic_Picnicker_7, 0x100 - obj_tiles gFieldObjectPic_Picnicker_8, 0x100 - - .align 2 -gFieldObjectPicTable_Man4:: @ 8506524 - obj_tiles gFieldObjectPic_Man4_0, 0x100 - obj_tiles gFieldObjectPic_Man4_1, 0x100 - obj_tiles gFieldObjectPic_Man4_2, 0x100 - obj_tiles gFieldObjectPic_Man4_3, 0x100 - obj_tiles gFieldObjectPic_Man4_4, 0x100 - obj_tiles gFieldObjectPic_Man4_5, 0x100 - obj_tiles gFieldObjectPic_Man4_6, 0x100 - obj_tiles gFieldObjectPic_Man4_7, 0x100 - obj_tiles gFieldObjectPic_Man4_8, 0x100 - - .align 2 -gFieldObjectPicTable_Woman7:: @ 850656C - obj_tiles gFieldObjectPic_Woman7_0, 0x100 - obj_tiles gFieldObjectPic_Woman7_1, 0x100 - obj_tiles gFieldObjectPic_Woman7_2, 0x100 - obj_tiles gFieldObjectPic_Woman7_3, 0x100 - obj_tiles gFieldObjectPic_Woman7_4, 0x100 - obj_tiles gFieldObjectPic_Woman7_5, 0x100 - obj_tiles gFieldObjectPic_Woman7_6, 0x100 - obj_tiles gFieldObjectPic_Woman7_7, 0x100 - obj_tiles gFieldObjectPic_Woman7_8, 0x100 - - .align 2 -gFieldObjectPicTable_Youngster:: @ 85065B4 - obj_tiles gFieldObjectPic_Youngster_0, 0x100 - obj_tiles gFieldObjectPic_Youngster_1, 0x100 - obj_tiles gFieldObjectPic_Youngster_2, 0x100 - obj_tiles gFieldObjectPic_Youngster_3, 0x100 - obj_tiles gFieldObjectPic_Youngster_4, 0x100 - obj_tiles gFieldObjectPic_Youngster_5, 0x100 - obj_tiles gFieldObjectPic_Youngster_6, 0x100 - obj_tiles gFieldObjectPic_Youngster_7, 0x100 - obj_tiles gFieldObjectPic_Youngster_8, 0x100 - - .align 2 -gFieldObjectPicTable_BugCatcher:: @ 85065FC - obj_tiles gFieldObjectPic_BugCatcher_0, 0x100 - obj_tiles gFieldObjectPic_BugCatcher_1, 0x100 - obj_tiles gFieldObjectPic_BugCatcher_2, 0x100 - obj_tiles gFieldObjectPic_BugCatcher_3, 0x100 - obj_tiles gFieldObjectPic_BugCatcher_4, 0x100 - obj_tiles gFieldObjectPic_BugCatcher_5, 0x100 - obj_tiles gFieldObjectPic_BugCatcher_6, 0x100 - obj_tiles gFieldObjectPic_BugCatcher_7, 0x100 - obj_tiles gFieldObjectPic_BugCatcher_8, 0x100 - - .align 2 -gFieldObjectPicTable_PsychicM:: @ 8506644 - obj_tiles gFieldObjectPic_PsychicM_0, 0x100 - obj_tiles gFieldObjectPic_PsychicM_1, 0x100 - obj_tiles gFieldObjectPic_PsychicM_2, 0x100 - obj_tiles gFieldObjectPic_PsychicM_3, 0x100 - obj_tiles gFieldObjectPic_PsychicM_4, 0x100 - obj_tiles gFieldObjectPic_PsychicM_5, 0x100 - obj_tiles gFieldObjectPic_PsychicM_6, 0x100 - obj_tiles gFieldObjectPic_PsychicM_7, 0x100 - obj_tiles gFieldObjectPic_PsychicM_8, 0x100 - - .align 2 -gFieldObjectPicTable_SchoolKidM:: @ 850668C - obj_tiles gFieldObjectPic_SchoolKidM_0, 0x100 - obj_tiles gFieldObjectPic_SchoolKidM_1, 0x100 - obj_tiles gFieldObjectPic_SchoolKidM_2, 0x100 - obj_tiles gFieldObjectPic_SchoolKidM_3, 0x100 - obj_tiles gFieldObjectPic_SchoolKidM_4, 0x100 - obj_tiles gFieldObjectPic_SchoolKidM_5, 0x100 - obj_tiles gFieldObjectPic_SchoolKidM_6, 0x100 - obj_tiles gFieldObjectPic_SchoolKidM_7, 0x100 - obj_tiles gFieldObjectPic_SchoolKidM_8, 0x100 - - .align 2 -gFieldObjectPicTable_Maniac:: @ 85066D4 - obj_tiles gFieldObjectPic_Maniac_0, 0x100 - obj_tiles gFieldObjectPic_Maniac_1, 0x100 - obj_tiles gFieldObjectPic_Maniac_2, 0x100 - obj_tiles gFieldObjectPic_Maniac_3, 0x100 - obj_tiles gFieldObjectPic_Maniac_4, 0x100 - obj_tiles gFieldObjectPic_Maniac_5, 0x100 - obj_tiles gFieldObjectPic_Maniac_6, 0x100 - obj_tiles gFieldObjectPic_Maniac_7, 0x100 - obj_tiles gFieldObjectPic_Maniac_8, 0x100 - - .align 2 -gFieldObjectPicTable_HexManiac:: @ 850671C - obj_tiles gFieldObjectPic_HexManiac_0, 0x100 - obj_tiles gFieldObjectPic_HexManiac_1, 0x100 - obj_tiles gFieldObjectPic_HexManiac_2, 0x100 - obj_tiles gFieldObjectPic_HexManiac_3, 0x100 - obj_tiles gFieldObjectPic_HexManiac_4, 0x100 - obj_tiles gFieldObjectPic_HexManiac_5, 0x100 - obj_tiles gFieldObjectPic_HexManiac_6, 0x100 - obj_tiles gFieldObjectPic_HexManiac_7, 0x100 - obj_tiles gFieldObjectPic_HexManiac_8, 0x100 - - .align 2 -gFieldObjectPicTable_SwimmerM:: @ 8506764 - obj_tiles gFieldObjectPic_SwimmerM_0, 0x100 - obj_tiles gFieldObjectPic_SwimmerM_1, 0x100 - obj_tiles gFieldObjectPic_SwimmerM_2, 0x100 - obj_tiles gFieldObjectPic_SwimmerM_3, 0x100 - obj_tiles gFieldObjectPic_SwimmerM_4, 0x100 - obj_tiles gFieldObjectPic_SwimmerM_5, 0x100 - obj_tiles gFieldObjectPic_SwimmerM_6, 0x100 - obj_tiles gFieldObjectPic_SwimmerM_7, 0x100 - obj_tiles gFieldObjectPic_SwimmerM_8, 0x100 - - .align 2 -gFieldObjectPicTable_SwimmerF:: @ 85067AC - obj_tiles gFieldObjectPic_SwimmerF_0, 0x100 - obj_tiles gFieldObjectPic_SwimmerF_1, 0x100 - obj_tiles gFieldObjectPic_SwimmerF_2, 0x100 - obj_tiles gFieldObjectPic_SwimmerF_3, 0x100 - obj_tiles gFieldObjectPic_SwimmerF_4, 0x100 - obj_tiles gFieldObjectPic_SwimmerF_5, 0x100 - obj_tiles gFieldObjectPic_SwimmerF_6, 0x100 - obj_tiles gFieldObjectPic_SwimmerF_7, 0x100 - obj_tiles gFieldObjectPic_SwimmerF_8, 0x100 - - .align 2 -gFieldObjectPicTable_BlackBelt:: @ 85067F4 - obj_tiles gFieldObjectPic_BlackBelt_0, 0x100 - obj_tiles gFieldObjectPic_BlackBelt_1, 0x100 - obj_tiles gFieldObjectPic_BlackBelt_2, 0x100 - obj_tiles gFieldObjectPic_BlackBelt_3, 0x100 - obj_tiles gFieldObjectPic_BlackBelt_4, 0x100 - obj_tiles gFieldObjectPic_BlackBelt_5, 0x100 - obj_tiles gFieldObjectPic_BlackBelt_6, 0x100 - obj_tiles gFieldObjectPic_BlackBelt_7, 0x100 - obj_tiles gFieldObjectPic_BlackBelt_8, 0x100 - - .align 2 -gFieldObjectPicTable_Beauty:: @ 850683C - obj_tiles gFieldObjectPic_Beauty_0, 0x100 - obj_tiles gFieldObjectPic_Beauty_1, 0x100 - obj_tiles gFieldObjectPic_Beauty_2, 0x100 - obj_tiles gFieldObjectPic_Beauty_3, 0x100 - obj_tiles gFieldObjectPic_Beauty_4, 0x100 - obj_tiles gFieldObjectPic_Beauty_5, 0x100 - obj_tiles gFieldObjectPic_Beauty_6, 0x100 - obj_tiles gFieldObjectPic_Beauty_7, 0x100 - obj_tiles gFieldObjectPic_Beauty_8, 0x100 - - .align 2 -gFieldObjectPicTable_Scientist1:: @ 8506884 - obj_tiles gFieldObjectPic_Scientist1_0, 0x100 - obj_tiles gFieldObjectPic_Scientist1_1, 0x100 - obj_tiles gFieldObjectPic_Scientist1_2, 0x100 - obj_tiles gFieldObjectPic_Scientist1_3, 0x100 - obj_tiles gFieldObjectPic_Scientist1_4, 0x100 - obj_tiles gFieldObjectPic_Scientist1_5, 0x100 - obj_tiles gFieldObjectPic_Scientist1_6, 0x100 - obj_tiles gFieldObjectPic_Scientist1_7, 0x100 - obj_tiles gFieldObjectPic_Scientist1_8, 0x100 - - .align 2 -gFieldObjectPicTable_Lass:: @ 85068CC - obj_tiles gFieldObjectPic_Lass_0, 0x100 - obj_tiles gFieldObjectPic_Lass_1, 0x100 - obj_tiles gFieldObjectPic_Lass_2, 0x100 - obj_tiles gFieldObjectPic_Lass_3, 0x100 - obj_tiles gFieldObjectPic_Lass_4, 0x100 - obj_tiles gFieldObjectPic_Lass_5, 0x100 - obj_tiles gFieldObjectPic_Lass_6, 0x100 - obj_tiles gFieldObjectPic_Lass_7, 0x100 - obj_tiles gFieldObjectPic_Lass_8, 0x100 - - .align 2 -gFieldObjectPicTable_Gentleman:: @ 8506914 - obj_tiles gFieldObjectPic_Gentleman_0, 0x100 - obj_tiles gFieldObjectPic_Gentleman_1, 0x100 - obj_tiles gFieldObjectPic_Gentleman_2, 0x100 - obj_tiles gFieldObjectPic_Gentleman_3, 0x100 - obj_tiles gFieldObjectPic_Gentleman_4, 0x100 - obj_tiles gFieldObjectPic_Gentleman_5, 0x100 - obj_tiles gFieldObjectPic_Gentleman_6, 0x100 - obj_tiles gFieldObjectPic_Gentleman_7, 0x100 - obj_tiles gFieldObjectPic_Gentleman_8, 0x100 - - .align 2 -gFieldObjectPicTable_Sailor:: @ 850695C - obj_tiles gFieldObjectPic_Sailor_0, 0x100 - obj_tiles gFieldObjectPic_Sailor_1, 0x100 - obj_tiles gFieldObjectPic_Sailor_2, 0x100 - obj_tiles gFieldObjectPic_Sailor_3, 0x100 - obj_tiles gFieldObjectPic_Sailor_4, 0x100 - obj_tiles gFieldObjectPic_Sailor_5, 0x100 - obj_tiles gFieldObjectPic_Sailor_6, 0x100 - obj_tiles gFieldObjectPic_Sailor_7, 0x100 - obj_tiles gFieldObjectPic_Sailor_8, 0x100 - - .align 2 -gFieldObjectPicTable_Fisherman:: @ 85069A4 - obj_tiles gFieldObjectPic_Fisherman_0, 0x100 - obj_tiles gFieldObjectPic_Fisherman_1, 0x100 - obj_tiles gFieldObjectPic_Fisherman_2, 0x100 - obj_tiles gFieldObjectPic_Fisherman_3, 0x100 - obj_tiles gFieldObjectPic_Fisherman_4, 0x100 - obj_tiles gFieldObjectPic_Fisherman_5, 0x100 - obj_tiles gFieldObjectPic_Fisherman_6, 0x100 - obj_tiles gFieldObjectPic_Fisherman_7, 0x100 - obj_tiles gFieldObjectPic_Fisherman_8, 0x100 - - .align 2 -gFieldObjectPicTable_RunningTriathleteM:: @ 85069EC - obj_tiles gFieldObjectPic_RunningTriathleteM_0, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteM_1, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteM_2, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteM_3, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteM_4, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteM_5, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteM_6, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteM_7, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteM_8, 0x100 - - .align 2 -gFieldObjectPicTable_RunningTriathleteF:: @ 8506A34 - obj_tiles gFieldObjectPic_RunningTriathleteF_0, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteF_1, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteF_2, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteF_3, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteF_4, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteF_5, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteF_6, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteF_7, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteF_8, 0x100 - - .align 2 -gFieldObjectPicTable_TuberF:: @ 8506A7C - obj_tiles gFieldObjectPic_TuberF_0, 0x80 - obj_tiles gFieldObjectPic_TuberF_1, 0x80 - obj_tiles gFieldObjectPic_TuberF_2, 0x80 - obj_tiles gFieldObjectPic_TuberF_3, 0x80 - obj_tiles gFieldObjectPic_TuberF_4, 0x80 - obj_tiles gFieldObjectPic_TuberF_5, 0x80 - obj_tiles gFieldObjectPic_TuberF_6, 0x80 - obj_tiles gFieldObjectPic_TuberF_7, 0x80 - obj_tiles gFieldObjectPic_TuberF_8, 0x80 - - .align 2 -gFieldObjectPicTable_TuberM:: @ 8506AC4 - obj_tiles gFieldObjectPic_TuberM_0, 0x80 - obj_tiles gFieldObjectPic_TuberM_1, 0x80 - obj_tiles gFieldObjectPic_TuberM_2, 0x80 - obj_tiles gFieldObjectPic_TuberM_3, 0x80 - obj_tiles gFieldObjectPic_TuberM_4, 0x80 - obj_tiles gFieldObjectPic_TuberM_5, 0x80 - obj_tiles gFieldObjectPic_TuberM_6, 0x80 - obj_tiles gFieldObjectPic_TuberM_7, 0x80 - obj_tiles gFieldObjectPic_TuberM_8, 0x80 - - .align 2 -gFieldObjectPicTable_Hiker:: @ 8506B0C - obj_tiles gFieldObjectPic_Hiker_0, 0x100 - obj_tiles gFieldObjectPic_Hiker_1, 0x100 - obj_tiles gFieldObjectPic_Hiker_2, 0x100 - obj_tiles gFieldObjectPic_Hiker_3, 0x100 - obj_tiles gFieldObjectPic_Hiker_4, 0x100 - obj_tiles gFieldObjectPic_Hiker_5, 0x100 - obj_tiles gFieldObjectPic_Hiker_6, 0x100 - obj_tiles gFieldObjectPic_Hiker_7, 0x100 - obj_tiles gFieldObjectPic_Hiker_8, 0x100 - - .align 2 -gFieldObjectPicTable_CyclingTriathleteM:: @ 8506B54 - obj_tiles gFieldObjectPic_CyclingTriathleteM_0, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteM_1, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteM_2, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteM_3, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteM_4, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteM_5, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteM_6, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteM_7, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteM_8, 0x200 - - .align 2 -gFieldObjectPicTable_CyclingTriathleteF:: @ 8506B9C - obj_tiles gFieldObjectPic_CyclingTriathleteF_0, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteF_1, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteF_2, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteF_3, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteF_4, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteF_5, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteF_6, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteF_7, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteF_8, 0x200 - - .align 2 -gFieldObjectPicTable_Nurse:: @ 8506BE4 - obj_tiles gFieldObjectPic_Nurse_0, 0x100 - obj_tiles gFieldObjectPic_Nurse_1, 0x100 - obj_tiles gFieldObjectPic_Nurse_2, 0x100 - obj_tiles gFieldObjectPic_Nurse_0, 0x100 - obj_tiles gFieldObjectPic_Nurse_0, 0x100 - obj_tiles gFieldObjectPic_Nurse_1, 0x100 - obj_tiles gFieldObjectPic_Nurse_1, 0x100 - obj_tiles gFieldObjectPic_Nurse_2, 0x100 - obj_tiles gFieldObjectPic_Nurse_2, 0x100 - obj_tiles gFieldObjectPic_Nurse_3, 0x100 - - .align 2 -gFieldObjectPicTable_ItemBall:: @ 8506C34 - obj_tiles gFieldObjectPic_ItemBall, 0x80 - - .align 2 -gFieldObjectPicTable_ProfBirch:: @ 8506C3C - obj_tiles gFieldObjectPic_ProfBirch_0, 0x100 - obj_tiles gFieldObjectPic_ProfBirch_1, 0x100 - obj_tiles gFieldObjectPic_ProfBirch_2, 0x100 - obj_tiles gFieldObjectPic_ProfBirch_3, 0x100 - obj_tiles gFieldObjectPic_ProfBirch_4, 0x100 - obj_tiles gFieldObjectPic_ProfBirch_5, 0x100 - obj_tiles gFieldObjectPic_ProfBirch_6, 0x100 - obj_tiles gFieldObjectPic_ProfBirch_7, 0x100 - obj_tiles gFieldObjectPic_ProfBirch_8, 0x100 - - .align 2 -gFieldObjectPicTable_Man5:: @ 8506C84 - obj_tiles gFieldObjectPic_Man5_0, 0x100 - obj_tiles gFieldObjectPic_Man5_1, 0x100 - obj_tiles gFieldObjectPic_Man5_2, 0x100 - obj_tiles gFieldObjectPic_Man5_3, 0x100 - obj_tiles gFieldObjectPic_Man5_4, 0x100 - obj_tiles gFieldObjectPic_Man5_5, 0x100 - obj_tiles gFieldObjectPic_Man5_6, 0x100 - obj_tiles gFieldObjectPic_Man5_7, 0x100 - obj_tiles gFieldObjectPic_Man5_8, 0x100 - - .align 2 -gFieldObjectPicTable_Man6:: @ 8506CCC - obj_tiles gFieldObjectPic_Man6_0, 0x100 - obj_tiles gFieldObjectPic_Man6_1, 0x100 - obj_tiles gFieldObjectPic_Man6_2, 0x100 - obj_tiles gFieldObjectPic_Man6_3, 0x100 - obj_tiles gFieldObjectPic_Man6_4, 0x100 - obj_tiles gFieldObjectPic_Man6_5, 0x100 - obj_tiles gFieldObjectPic_Man6_6, 0x100 - obj_tiles gFieldObjectPic_Man6_7, 0x100 - obj_tiles gFieldObjectPic_Man6_8, 0x100 - - .align 2 -gFieldObjectPicTable_ReporterM:: @ 8506D14 - obj_tiles gFieldObjectPic_ReporterM_0, 0x100 - obj_tiles gFieldObjectPic_ReporterM_1, 0x100 - obj_tiles gFieldObjectPic_ReporterM_2, 0x100 - obj_tiles gFieldObjectPic_ReporterM_3, 0x100 - obj_tiles gFieldObjectPic_ReporterM_4, 0x100 - obj_tiles gFieldObjectPic_ReporterM_5, 0x100 - obj_tiles gFieldObjectPic_ReporterM_6, 0x100 - obj_tiles gFieldObjectPic_ReporterM_7, 0x100 - obj_tiles gFieldObjectPic_ReporterM_8, 0x100 - - .align 2 -gFieldObjectPicTable_ReporterF:: @ 8506D5C - obj_tiles gFieldObjectPic_ReporterF_0, 0x100 - obj_tiles gFieldObjectPic_ReporterF_1, 0x100 - obj_tiles gFieldObjectPic_ReporterF_2, 0x100 - obj_tiles gFieldObjectPic_ReporterF_3, 0x100 - obj_tiles gFieldObjectPic_ReporterF_4, 0x100 - obj_tiles gFieldObjectPic_ReporterF_5, 0x100 - obj_tiles gFieldObjectPic_ReporterF_6, 0x100 - obj_tiles gFieldObjectPic_ReporterF_7, 0x100 - obj_tiles gFieldObjectPic_ReporterF_8, 0x100 - - .align 2 -gFieldObjectPicTable_MauvilleOldMan1:: @ 8506DA4 - obj_tiles gFieldObjectPic_MauvilleOldMan1_0, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan1_1, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan1_2, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan1_3, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan1_4, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan1_5, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan1_6, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan1_7, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan1_8, 0x100 - - .align 2 -gFieldObjectPicTable_MauvilleOldMan2:: @ 8506DEC - obj_tiles gFieldObjectPic_MauvilleOldMan2_0, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan2_1, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan2_2, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan2_3, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan2_4, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan2_5, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan2_6, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan2_7, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan2_8, 0x100 - - .align 2 -gFieldObjectPicTable_UnusedNatuDoll:: @ 8506E34 - obj_tiles gFieldObjectPic_UnusedNatuDoll, 0x80 - - .align 2 -gFieldObjectPicTable_UnusedMagnemiteDoll:: @ 8506E3C - obj_tiles gFieldObjectPic_UnusedMagnemiteDoll, 0x80 - - .align 2 -gFieldObjectPicTable_UnusedSquirtleDoll:: @ 8506E44 - obj_tiles gFieldObjectPic_UnusedSquirtleDoll, 0x80 - - .align 2 -gFieldObjectPicTable_UnusedWooperDoll:: @ 8506E4C - obj_tiles gFieldObjectPic_UnusedWooperDoll, 0x80 - - .align 2 -gFieldObjectPicTable_UnusedPikachuDoll:: @ 8506E54 - obj_tiles gFieldObjectPic_UnusedPikachuDoll, 0x80 - - .align 2 -gFieldObjectPicTable_UnusedPorygon2Doll:: @ 8506E5C - obj_tiles gFieldObjectPic_UnusedPorygon2Doll, 0x80 - - .align 2 -gFieldObjectPicTable_CuttableTree:: @ 8506E64 - obj_tiles gFieldObjectPic_CuttableTree_0, 0x80 - obj_tiles gFieldObjectPic_CuttableTree_1, 0x80 - obj_tiles gFieldObjectPic_CuttableTree_2, 0x80 - obj_tiles gFieldObjectPic_CuttableTree_3, 0x80 - - .align 2 -gFieldObjectPicTable_MartEmployee:: @ 8506E84 - obj_tiles gFieldObjectPic_MartEmployee_0, 0x100 - obj_tiles gFieldObjectPic_MartEmployee_1, 0x100 - obj_tiles gFieldObjectPic_MartEmployee_2, 0x100 - obj_tiles gFieldObjectPic_MartEmployee_3, 0x100 - obj_tiles gFieldObjectPic_MartEmployee_4, 0x100 - obj_tiles gFieldObjectPic_MartEmployee_5, 0x100 - obj_tiles gFieldObjectPic_MartEmployee_6, 0x100 - obj_tiles gFieldObjectPic_MartEmployee_7, 0x100 - obj_tiles gFieldObjectPic_MartEmployee_8, 0x100 - - .align 2 -gFieldObjectPicTable_RooftopSaleWoman:: @ 8506ECC - obj_tiles gFieldObjectPic_RooftopSaleWoman_0, 0x100 - obj_tiles gFieldObjectPic_RooftopSaleWoman_1, 0x100 - obj_tiles gFieldObjectPic_RooftopSaleWoman_2, 0x100 - obj_tiles gFieldObjectPic_RooftopSaleWoman_3, 0x100 - obj_tiles gFieldObjectPic_RooftopSaleWoman_4, 0x100 - obj_tiles gFieldObjectPic_RooftopSaleWoman_5, 0x100 - obj_tiles gFieldObjectPic_RooftopSaleWoman_6, 0x100 - obj_tiles gFieldObjectPic_RooftopSaleWoman_7, 0x100 - obj_tiles gFieldObjectPic_RooftopSaleWoman_8, 0x100 - - .align 2 -gFieldObjectPicTable_Teala:: @ 8506F14 - obj_tiles gFieldObjectPic_Teala_0, 0x100 - obj_tiles gFieldObjectPic_Teala_1, 0x100 - obj_tiles gFieldObjectPic_Teala_2, 0x100 - obj_tiles gFieldObjectPic_Teala_3, 0x100 - obj_tiles gFieldObjectPic_Teala_4, 0x100 - obj_tiles gFieldObjectPic_Teala_5, 0x100 - obj_tiles gFieldObjectPic_Teala_6, 0x100 - obj_tiles gFieldObjectPic_Teala_7, 0x100 - obj_tiles gFieldObjectPic_Teala_8, 0x100 - - .align 2 -gFieldObjectPicTable_BreakableRock:: @ 8506F5C - obj_tiles gFieldObjectPic_BreakableRock_0, 0x80 - obj_tiles gFieldObjectPic_BreakableRock_1, 0x80 - obj_tiles gFieldObjectPic_BreakableRock_2, 0x80 - obj_tiles gFieldObjectPic_BreakableRock_3, 0x80 - - .align 2 -gFieldObjectPicTable_PushableBoulder:: @ 8506F7C - obj_tiles gFieldObjectPic_PushableBoulder, 0x80 - - .align 2 -gFieldObjectPicTable_MrBrineysBoat:: @ 8506F84 - obj_tiles gFieldObjectPic_MrBrineysBoat_0, 0x200 - obj_tiles gFieldObjectPic_MrBrineysBoat_1, 0x200 - obj_tiles gFieldObjectPic_MrBrineysBoat_2, 0x200 - obj_tiles gFieldObjectPic_MrBrineysBoat_0, 0x200 - obj_tiles gFieldObjectPic_MrBrineysBoat_0, 0x200 - obj_tiles gFieldObjectPic_MrBrineysBoat_1, 0x200 - obj_tiles gFieldObjectPic_MrBrineysBoat_1, 0x200 - obj_tiles gFieldObjectPic_MrBrineysBoat_2, 0x200 - obj_tiles gFieldObjectPic_MrBrineysBoat_2, 0x200 - - .align 2 -gFieldObjectPicTable_Truck:: @ 8506FCC - obj_tiles gFieldObjectPic_Truck, 0x480 - - .align 2 -gFieldObjectPicTable_VigorothCarryingBox:: @ 8506FD4 - obj_tiles gFieldObjectPic_VigorothCarryingBox_0, 0x200 - obj_tiles gFieldObjectPic_VigorothCarryingBox_0, 0x200 - obj_tiles gFieldObjectPic_VigorothCarryingBox_0, 0x200 - obj_tiles gFieldObjectPic_VigorothCarryingBox_1, 0x200 - obj_tiles gFieldObjectPic_VigorothCarryingBox_2, 0x200 - obj_tiles gFieldObjectPic_VigorothCarryingBox_1, 0x200 - obj_tiles gFieldObjectPic_VigorothCarryingBox_2, 0x200 - obj_tiles gFieldObjectPic_VigorothCarryingBox_1, 0x200 - obj_tiles gFieldObjectPic_VigorothCarryingBox_2, 0x200 - - .align 2 -gFieldObjectPicTable_VigorothFacingAway:: @ 850701C - obj_tiles gFieldObjectPic_VigorothFacingAway_0, 0x200 - obj_tiles gFieldObjectPic_VigorothFacingAway_0, 0x200 - obj_tiles gFieldObjectPic_VigorothFacingAway_0, 0x200 - obj_tiles gFieldObjectPic_VigorothFacingAway_1, 0x200 - obj_tiles gFieldObjectPic_VigorothFacingAway_1, 0x200 - obj_tiles gFieldObjectPic_VigorothFacingAway_1, 0x200 - obj_tiles gFieldObjectPic_VigorothFacingAway_1, 0x200 - obj_tiles gFieldObjectPic_VigorothFacingAway_1, 0x200 - obj_tiles gFieldObjectPic_VigorothFacingAway_1, 0x200 - - .align 2 -gFieldObjectPicTable_BirchsBag:: @ 8507064 - obj_tiles gFieldObjectPic_BirchsBag, 0x80 - - .align 2 -gFieldObjectPicTable_EnemyZigzagoon:: @ 850706C - obj_tiles gFieldObjectPic_EnemyZigzagoon_0, 0x200 - obj_tiles gFieldObjectPic_EnemyZigzagoon_1, 0x200 - obj_tiles gFieldObjectPic_EnemyZigzagoon_2, 0x200 - obj_tiles gFieldObjectPic_EnemyZigzagoon_3, 0x200 - obj_tiles gFieldObjectPic_EnemyZigzagoon_4, 0x200 - obj_tiles gFieldObjectPic_EnemyZigzagoon_5, 0x200 - obj_tiles gFieldObjectPic_EnemyZigzagoon_6, 0x200 - obj_tiles gFieldObjectPic_EnemyZigzagoon_7, 0x200 - obj_tiles gFieldObjectPic_EnemyZigzagoon_8, 0x200 - - .align 2 -gFieldObjectPicTable_Poochyena:: @ 85070B4 - obj_tiles gFieldObjectPic_Poochyena_0, 0x200 - obj_tiles gFieldObjectPic_Poochyena_1, 0x200 - obj_tiles gFieldObjectPic_Poochyena_2, 0x200 - obj_tiles gFieldObjectPic_Poochyena_3, 0x200 - obj_tiles gFieldObjectPic_Poochyena_4, 0x200 - obj_tiles gFieldObjectPic_Poochyena_5, 0x200 - obj_tiles gFieldObjectPic_Poochyena_6, 0x200 - obj_tiles gFieldObjectPic_Poochyena_7, 0x200 - obj_tiles gFieldObjectPic_Poochyena_8, 0x200 - - .align 2 -gFieldObjectPicTable_Artist:: @ 85070FC - obj_tiles gFieldObjectPic_Artist_0, 0x100 - obj_tiles gFieldObjectPic_Artist_1, 0x100 - obj_tiles gFieldObjectPic_Artist_2, 0x100 - obj_tiles gFieldObjectPic_Artist_3, 0x100 - obj_tiles gFieldObjectPic_Artist_4, 0x100 - obj_tiles gFieldObjectPic_Artist_5, 0x100 - obj_tiles gFieldObjectPic_Artist_6, 0x100 - obj_tiles gFieldObjectPic_Artist_7, 0x100 - obj_tiles gFieldObjectPic_Artist_8, 0x100 - - .align 2 -gFieldObjectPicTable_MayNormal:: @ 8507144 - obj_tiles gFieldObjectPic_MayNormal_0, 0x100 - obj_tiles gFieldObjectPic_MayNormal_1, 0x100 - obj_tiles gFieldObjectPic_MayNormal_2, 0x100 - obj_tiles gFieldObjectPic_MayNormal_3, 0x100 - obj_tiles gFieldObjectPic_MayNormal_4, 0x100 - obj_tiles gFieldObjectPic_MayNormal_5, 0x100 - obj_tiles gFieldObjectPic_MayNormal_6, 0x100 - obj_tiles gFieldObjectPic_MayNormal_7, 0x100 - obj_tiles gFieldObjectPic_MayNormal_8, 0x100 - obj_tiles gFieldObjectPic_MayNormal_9, 0x100 - obj_tiles gFieldObjectPic_MayNormal_10, 0x100 - obj_tiles gFieldObjectPic_MayNormal_11, 0x100 - obj_tiles gFieldObjectPic_MayNormal_12, 0x100 - obj_tiles gFieldObjectPic_MayNormal_13, 0x100 - obj_tiles gFieldObjectPic_MayNormal_14, 0x100 - obj_tiles gFieldObjectPic_MayNormal_15, 0x100 - obj_tiles gFieldObjectPic_MayNormal_16, 0x100 - obj_tiles gFieldObjectPic_MayNormal_17, 0x100 - - .align 2 -gFieldObjectPicTable_MayMachBike:: @ 85071D4 - obj_tiles gFieldObjectPic_MayMachBike_0, 0x200 - obj_tiles gFieldObjectPic_MayMachBike_1, 0x200 - obj_tiles gFieldObjectPic_MayMachBike_2, 0x200 - obj_tiles gFieldObjectPic_MayMachBike_3, 0x200 - obj_tiles gFieldObjectPic_MayMachBike_4, 0x200 - obj_tiles gFieldObjectPic_MayMachBike_5, 0x200 - obj_tiles gFieldObjectPic_MayMachBike_6, 0x200 - obj_tiles gFieldObjectPic_MayMachBike_7, 0x200 - obj_tiles gFieldObjectPic_MayMachBike_8, 0x200 - - .align 2 -gFieldObjectPicTable_MayAcroBike:: @ 850721C - obj_tiles gFieldObjectPic_MayAcroBike_0, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_1, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_2, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_3, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_4, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_5, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_6, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_7, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_8, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_9, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_10, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_11, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_12, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_13, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_14, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_15, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_16, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_17, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_18, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_19, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_20, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_21, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_22, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_23, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_24, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_25, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_26, 0x200 - - .align 2 -gFieldObjectPicTable_MaySurfing:: @ 85072F4 - obj_tiles gFieldObjectPic_MaySurfing_0, 0x200 - obj_tiles gFieldObjectPic_MaySurfing_1, 0x200 - obj_tiles gFieldObjectPic_MaySurfing_2, 0x200 - obj_tiles gFieldObjectPic_MaySurfing_0, 0x200 - obj_tiles gFieldObjectPic_MaySurfing_0, 0x200 - obj_tiles gFieldObjectPic_MaySurfing_1, 0x200 - obj_tiles gFieldObjectPic_MaySurfing_1, 0x200 - obj_tiles gFieldObjectPic_MaySurfing_2, 0x200 - obj_tiles gFieldObjectPic_MaySurfing_2, 0x200 - obj_tiles gFieldObjectPic_MaySurfing_3, 0x200 - obj_tiles gFieldObjectPic_MaySurfing_4, 0x200 - obj_tiles gFieldObjectPic_MaySurfing_5, 0x200 - - .align 2 -gFieldObjectPicTable_MayUnderwater:: @ 8507354 - obj_tiles gFieldObjectPic_MayUnderwater_0, 0x200 - obj_tiles gFieldObjectPic_MayUnderwater_1, 0x200 - obj_tiles gFieldObjectPic_MayUnderwater_2, 0x200 - obj_tiles gFieldObjectPic_MayUnderwater_0, 0x200 - obj_tiles gFieldObjectPic_MayUnderwater_0, 0x200 - obj_tiles gFieldObjectPic_MayUnderwater_1, 0x200 - obj_tiles gFieldObjectPic_MayUnderwater_1, 0x200 - obj_tiles gFieldObjectPic_MayUnderwater_2, 0x200 - obj_tiles gFieldObjectPic_MayUnderwater_2, 0x200 - - .align 2 -gFieldObjectPicTable_MayFieldMove:: @ 850739C - obj_tiles gFieldObjectPic_MayFieldMove_0, 0x200 - obj_tiles gFieldObjectPic_MayFieldMove_1, 0x200 - obj_tiles gFieldObjectPic_MayFieldMove_2, 0x200 - obj_tiles gFieldObjectPic_MayFieldMove_3, 0x200 - obj_tiles gFieldObjectPic_MayFieldMove_4, 0x200 - - .align 2 -gFieldObjectPicTable_Cameraman:: @ 85073C4 - obj_tiles gFieldObjectPic_Cameraman_0, 0x100 - obj_tiles gFieldObjectPic_Cameraman_1, 0x100 - obj_tiles gFieldObjectPic_Cameraman_2, 0x100 - obj_tiles gFieldObjectPic_Cameraman_3, 0x100 - obj_tiles gFieldObjectPic_Cameraman_4, 0x100 - obj_tiles gFieldObjectPic_Cameraman_5, 0x100 - obj_tiles gFieldObjectPic_Cameraman_6, 0x100 - obj_tiles gFieldObjectPic_Cameraman_7, 0x100 - obj_tiles gFieldObjectPic_Cameraman_8, 0x100 - - .align 2 -gFieldObjectPicTable_MovingBox:: @ 850740C - obj_tiles gFieldObjectPic_MovingBox, 0x80 - - .align 2 -gFieldObjectPicTable_CableCar:: @ 8507414 - obj_tiles gFieldObjectPic_CableCar, 0x800 - - .align 2 -gFieldObjectPicTable_Scientist2:: @ 850741C - obj_tiles gFieldObjectPic_Scientist2_0, 0x100 - obj_tiles gFieldObjectPic_Scientist2_1, 0x100 - obj_tiles gFieldObjectPic_Scientist2_2, 0x100 - obj_tiles gFieldObjectPic_Scientist2_3, 0x100 - obj_tiles gFieldObjectPic_Scientist2_4, 0x100 - obj_tiles gFieldObjectPic_Scientist2_5, 0x100 - obj_tiles gFieldObjectPic_Scientist2_6, 0x100 - obj_tiles gFieldObjectPic_Scientist2_7, 0x100 - obj_tiles gFieldObjectPic_Scientist2_8, 0x100 - - .align 2 -gFieldObjectPicTable_Man7:: @ 8507464 - obj_tiles gFieldObjectPic_Man7_0, 0x100 - obj_tiles gFieldObjectPic_Man7_1, 0x100 - obj_tiles gFieldObjectPic_Man7_2, 0x100 - obj_tiles gFieldObjectPic_Man7_3, 0x100 - obj_tiles gFieldObjectPic_Man7_4, 0x100 - obj_tiles gFieldObjectPic_Man7_5, 0x100 - obj_tiles gFieldObjectPic_Man7_6, 0x100 - obj_tiles gFieldObjectPic_Man7_7, 0x100 - obj_tiles gFieldObjectPic_Man7_8, 0x100 - - .align 2 -gFieldObjectPicTable_AquaMemberM:: @ 85074AC - obj_tiles gFieldObjectPic_AquaMemberM_0, 0x100 - obj_tiles gFieldObjectPic_AquaMemberM_1, 0x100 - obj_tiles gFieldObjectPic_AquaMemberM_2, 0x100 - obj_tiles gFieldObjectPic_AquaMemberM_3, 0x100 - obj_tiles gFieldObjectPic_AquaMemberM_4, 0x100 - obj_tiles gFieldObjectPic_AquaMemberM_5, 0x100 - obj_tiles gFieldObjectPic_AquaMemberM_6, 0x100 - obj_tiles gFieldObjectPic_AquaMemberM_7, 0x100 - obj_tiles gFieldObjectPic_AquaMemberM_8, 0x100 - - .align 2 -gFieldObjectPicTable_AquaMemberF:: @ 85074F4 - obj_tiles gFieldObjectPic_AquaMemberF_0, 0x100 - obj_tiles gFieldObjectPic_AquaMemberF_1, 0x100 - obj_tiles gFieldObjectPic_AquaMemberF_2, 0x100 - obj_tiles gFieldObjectPic_AquaMemberF_3, 0x100 - obj_tiles gFieldObjectPic_AquaMemberF_4, 0x100 - obj_tiles gFieldObjectPic_AquaMemberF_5, 0x100 - obj_tiles gFieldObjectPic_AquaMemberF_6, 0x100 - obj_tiles gFieldObjectPic_AquaMemberF_7, 0x100 - obj_tiles gFieldObjectPic_AquaMemberF_8, 0x100 - - .align 2 -gFieldObjectPicTable_MagmaMemberM:: @ 850753C - obj_tiles gFieldObjectPic_MagmaMemberM_0, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberM_1, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberM_2, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberM_3, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberM_4, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberM_5, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberM_6, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberM_7, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberM_8, 0x100 - - .align 2 -gFieldObjectPicTable_MagmaMemberF:: @ 8507584 - obj_tiles gFieldObjectPic_MagmaMemberF_0, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberF_1, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberF_2, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberF_3, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberF_4, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberF_5, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberF_6, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberF_7, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberF_8, 0x100 - - .align 2 -gFieldObjectPicTable_Sidney:: @ 85075CC - obj_tiles gFieldObjectPic_Sidney_0, 0x100 - obj_tiles gFieldObjectPic_Sidney_1, 0x100 - obj_tiles gFieldObjectPic_Sidney_2, 0x100 - obj_tiles gFieldObjectPic_Sidney_0, 0x100 - obj_tiles gFieldObjectPic_Sidney_0, 0x100 - obj_tiles gFieldObjectPic_Sidney_1, 0x100 - obj_tiles gFieldObjectPic_Sidney_1, 0x100 - obj_tiles gFieldObjectPic_Sidney_2, 0x100 - obj_tiles gFieldObjectPic_Sidney_2, 0x100 - - .align 2 -gFieldObjectPicTable_Phoebe:: @ 8507614 - obj_tiles gFieldObjectPic_Phoebe_0, 0x100 - obj_tiles gFieldObjectPic_Phoebe_1, 0x100 - obj_tiles gFieldObjectPic_Phoebe_2, 0x100 - obj_tiles gFieldObjectPic_Phoebe_0, 0x100 - obj_tiles gFieldObjectPic_Phoebe_0, 0x100 - obj_tiles gFieldObjectPic_Phoebe_1, 0x100 - obj_tiles gFieldObjectPic_Phoebe_1, 0x100 - obj_tiles gFieldObjectPic_Phoebe_2, 0x100 - obj_tiles gFieldObjectPic_Phoebe_2, 0x100 - - .align 2 -gFieldObjectPicTable_Glacia:: @ 850765C - obj_tiles gFieldObjectPic_Glacia_0, 0x100 - obj_tiles gFieldObjectPic_Glacia_1, 0x100 - obj_tiles gFieldObjectPic_Glacia_2, 0x100 - obj_tiles gFieldObjectPic_Glacia_0, 0x100 - obj_tiles gFieldObjectPic_Glacia_0, 0x100 - obj_tiles gFieldObjectPic_Glacia_1, 0x100 - obj_tiles gFieldObjectPic_Glacia_1, 0x100 - obj_tiles gFieldObjectPic_Glacia_2, 0x100 - obj_tiles gFieldObjectPic_Glacia_2, 0x100 - - .align 2 -gFieldObjectPicTable_Drake:: @ 85076A4 - obj_tiles gFieldObjectPic_Drake_0, 0x100 - obj_tiles gFieldObjectPic_Drake_1, 0x100 - obj_tiles gFieldObjectPic_Drake_2, 0x100 - obj_tiles gFieldObjectPic_Drake_0, 0x100 - obj_tiles gFieldObjectPic_Drake_0, 0x100 - obj_tiles gFieldObjectPic_Drake_1, 0x100 - obj_tiles gFieldObjectPic_Drake_1, 0x100 - obj_tiles gFieldObjectPic_Drake_2, 0x100 - obj_tiles gFieldObjectPic_Drake_2, 0x100 - - .align 2 -gFieldObjectPicTable_Roxanne:: @ 85076EC - obj_tiles gFieldObjectPic_Roxanne_0, 0x100 - obj_tiles gFieldObjectPic_Roxanne_1, 0x100 - obj_tiles gFieldObjectPic_Roxanne_2, 0x100 - obj_tiles gFieldObjectPic_Roxanne_0, 0x100 - obj_tiles gFieldObjectPic_Roxanne_0, 0x100 - obj_tiles gFieldObjectPic_Roxanne_1, 0x100 - obj_tiles gFieldObjectPic_Roxanne_1, 0x100 - obj_tiles gFieldObjectPic_Roxanne_2, 0x100 - obj_tiles gFieldObjectPic_Roxanne_2, 0x100 - - .align 2 -gFieldObjectPicTable_Brawly:: @ 8507734 - obj_tiles gFieldObjectPic_Brawly_0, 0x100 - obj_tiles gFieldObjectPic_Brawly_1, 0x100 - obj_tiles gFieldObjectPic_Brawly_2, 0x100 - obj_tiles gFieldObjectPic_Brawly_0, 0x100 - obj_tiles gFieldObjectPic_Brawly_0, 0x100 - obj_tiles gFieldObjectPic_Brawly_1, 0x100 - obj_tiles gFieldObjectPic_Brawly_1, 0x100 - obj_tiles gFieldObjectPic_Brawly_2, 0x100 - obj_tiles gFieldObjectPic_Brawly_2, 0x100 - - .align 2 -gFieldObjectPicTable_Wattson:: @ 850777C - obj_tiles gFieldObjectPic_Wattson_0, 0x100 - obj_tiles gFieldObjectPic_Wattson_1, 0x100 - obj_tiles gFieldObjectPic_Wattson_2, 0x100 - obj_tiles gFieldObjectPic_Wattson_0, 0x100 - obj_tiles gFieldObjectPic_Wattson_0, 0x100 - obj_tiles gFieldObjectPic_Wattson_1, 0x100 - obj_tiles gFieldObjectPic_Wattson_1, 0x100 - obj_tiles gFieldObjectPic_Wattson_2, 0x100 - obj_tiles gFieldObjectPic_Wattson_2, 0x100 - - .align 2 -gFieldObjectPicTable_Flannery:: @ 85077C4 - obj_tiles gFieldObjectPic_Flannery_0, 0x100 - obj_tiles gFieldObjectPic_Flannery_1, 0x100 - obj_tiles gFieldObjectPic_Flannery_2, 0x100 - obj_tiles gFieldObjectPic_Flannery_0, 0x100 - obj_tiles gFieldObjectPic_Flannery_0, 0x100 - obj_tiles gFieldObjectPic_Flannery_1, 0x100 - obj_tiles gFieldObjectPic_Flannery_1, 0x100 - obj_tiles gFieldObjectPic_Flannery_2, 0x100 - obj_tiles gFieldObjectPic_Flannery_2, 0x100 - - .align 2 -gFieldObjectPicTable_Norman:: @ 850780C - obj_tiles gFieldObjectPic_Norman_0, 0x100 - obj_tiles gFieldObjectPic_Norman_1, 0x100 - obj_tiles gFieldObjectPic_Norman_2, 0x100 - obj_tiles gFieldObjectPic_Norman_3, 0x100 - obj_tiles gFieldObjectPic_Norman_4, 0x100 - obj_tiles gFieldObjectPic_Norman_5, 0x100 - obj_tiles gFieldObjectPic_Norman_6, 0x100 - obj_tiles gFieldObjectPic_Norman_7, 0x100 - obj_tiles gFieldObjectPic_Norman_8, 0x100 - - .align 2 -gFieldObjectPicTable_Winona:: @ 8507854 - obj_tiles gFieldObjectPic_Winona_0, 0x100 - obj_tiles gFieldObjectPic_Winona_1, 0x100 - obj_tiles gFieldObjectPic_Winona_2, 0x100 - obj_tiles gFieldObjectPic_Winona_0, 0x100 - obj_tiles gFieldObjectPic_Winona_0, 0x100 - obj_tiles gFieldObjectPic_Winona_1, 0x100 - obj_tiles gFieldObjectPic_Winona_1, 0x100 - obj_tiles gFieldObjectPic_Winona_2, 0x100 - obj_tiles gFieldObjectPic_Winona_2, 0x100 - - .align 2 -gFieldObjectPicTable_Liza:: @ 850789C - obj_tiles gFieldObjectPic_Liza_0, 0x100 - obj_tiles gFieldObjectPic_Liza_1, 0x100 - obj_tiles gFieldObjectPic_Liza_2, 0x100 - obj_tiles gFieldObjectPic_Liza_0, 0x100 - obj_tiles gFieldObjectPic_Liza_0, 0x100 - obj_tiles gFieldObjectPic_Liza_1, 0x100 - obj_tiles gFieldObjectPic_Liza_1, 0x100 - obj_tiles gFieldObjectPic_Liza_2, 0x100 - obj_tiles gFieldObjectPic_Liza_2, 0x100 - - .align 2 -gFieldObjectPicTable_Tate:: @ 85078E4 - obj_tiles gFieldObjectPic_Tate_0, 0x100 - obj_tiles gFieldObjectPic_Tate_1, 0x100 - obj_tiles gFieldObjectPic_Tate_2, 0x100 - obj_tiles gFieldObjectPic_Tate_0, 0x100 - obj_tiles gFieldObjectPic_Tate_0, 0x100 - obj_tiles gFieldObjectPic_Tate_1, 0x100 - obj_tiles gFieldObjectPic_Tate_1, 0x100 - obj_tiles gFieldObjectPic_Tate_2, 0x100 - obj_tiles gFieldObjectPic_Tate_2, 0x100 - - .align 2 -gFieldObjectPicTable_Wallace:: @ 850792C - obj_tiles gFieldObjectPic_Wallace_0, 0x100 - obj_tiles gFieldObjectPic_Wallace_1, 0x100 - obj_tiles gFieldObjectPic_Wallace_2, 0x100 - obj_tiles gFieldObjectPic_Wallace_3, 0x100 - obj_tiles gFieldObjectPic_Wallace_4, 0x100 - obj_tiles gFieldObjectPic_Wallace_5, 0x100 - obj_tiles gFieldObjectPic_Wallace_6, 0x100 - obj_tiles gFieldObjectPic_Wallace_7, 0x100 - obj_tiles gFieldObjectPic_Wallace_8, 0x100 - - .align 2 -gFieldObjectPicTable_Steven:: @ 8507974 - obj_tiles gFieldObjectPic_Steven_0, 0x100 - obj_tiles gFieldObjectPic_Steven_1, 0x100 - obj_tiles gFieldObjectPic_Steven_2, 0x100 - obj_tiles gFieldObjectPic_Steven_3, 0x100 - obj_tiles gFieldObjectPic_Steven_4, 0x100 - obj_tiles gFieldObjectPic_Steven_5, 0x100 - obj_tiles gFieldObjectPic_Steven_6, 0x100 - obj_tiles gFieldObjectPic_Steven_7, 0x100 - obj_tiles gFieldObjectPic_Steven_8, 0x100 - - .align 2 -gFieldObjectPicTable_Wally:: @ 85079BC - obj_tiles gFieldObjectPic_Wally_0, 0x100 - obj_tiles gFieldObjectPic_Wally_1, 0x100 - obj_tiles gFieldObjectPic_Wally_2, 0x100 - obj_tiles gFieldObjectPic_Wally_3, 0x100 - obj_tiles gFieldObjectPic_Wally_4, 0x100 - obj_tiles gFieldObjectPic_Wally_5, 0x100 - obj_tiles gFieldObjectPic_Wally_6, 0x100 - obj_tiles gFieldObjectPic_Wally_7, 0x100 - obj_tiles gFieldObjectPic_Wally_8, 0x100 - - .align 2 -gFieldObjectPicTable_RubySapphireLittleBoy:: @ 8507A04 - obj_tiles gFieldObjectPic_RubySapphireLittleBoy_0, 0x80 - obj_tiles gFieldObjectPic_RubySapphireLittleBoy_1, 0x80 - obj_tiles gFieldObjectPic_RubySapphireLittleBoy_2, 0x80 - obj_tiles gFieldObjectPic_RubySapphireLittleBoy_3, 0x80 - obj_tiles gFieldObjectPic_RubySapphireLittleBoy_4, 0x80 - obj_tiles gFieldObjectPic_RubySapphireLittleBoy_5, 0x80 - obj_tiles gFieldObjectPic_RubySapphireLittleBoy_6, 0x80 - obj_tiles gFieldObjectPic_RubySapphireLittleBoy_7, 0x80 - obj_tiles gFieldObjectPic_RubySapphireLittleBoy_8, 0x80 - - .align 2 -gFieldObjectPicTable_BrendanFishing:: @ 8507A4C - obj_tiles gFieldObjectPic_BrendanFishing_0, 0x200 - obj_tiles gFieldObjectPic_BrendanFishing_1, 0x200 - obj_tiles gFieldObjectPic_BrendanFishing_2, 0x200 - obj_tiles gFieldObjectPic_BrendanFishing_3, 0x200 - obj_tiles gFieldObjectPic_BrendanFishing_4, 0x200 - obj_tiles gFieldObjectPic_BrendanFishing_5, 0x200 - obj_tiles gFieldObjectPic_BrendanFishing_6, 0x200 - obj_tiles gFieldObjectPic_BrendanFishing_7, 0x200 - obj_tiles gFieldObjectPic_BrendanFishing_8, 0x200 - obj_tiles gFieldObjectPic_BrendanFishing_9, 0x200 - obj_tiles gFieldObjectPic_BrendanFishing_10, 0x200 - obj_tiles gFieldObjectPic_BrendanFishing_11, 0x200 - - .align 2 -gFieldObjectPicTable_MayFishing:: @ 8507AAC - obj_tiles gFieldObjectPic_MayFishing_0, 0x200 - obj_tiles gFieldObjectPic_MayFishing_1, 0x200 - obj_tiles gFieldObjectPic_MayFishing_2, 0x200 - obj_tiles gFieldObjectPic_MayFishing_3, 0x200 - obj_tiles gFieldObjectPic_MayFishing_4, 0x200 - obj_tiles gFieldObjectPic_MayFishing_5, 0x200 - obj_tiles gFieldObjectPic_MayFishing_6, 0x200 - obj_tiles gFieldObjectPic_MayFishing_7, 0x200 - obj_tiles gFieldObjectPic_MayFishing_8, 0x200 - obj_tiles gFieldObjectPic_MayFishing_9, 0x200 - obj_tiles gFieldObjectPic_MayFishing_10, 0x200 - obj_tiles gFieldObjectPic_MayFishing_11, 0x200 - - .align 2 -gFieldObjectPicTable_HotSpringsOldWoman:: @ 8507B0C - obj_tiles gFieldObjectPic_HotSpringsOldWoman_0, 0x100 - obj_tiles gFieldObjectPic_HotSpringsOldWoman_1, 0x100 - obj_tiles gFieldObjectPic_HotSpringsOldWoman_2, 0x100 - obj_tiles gFieldObjectPic_HotSpringsOldWoman_3, 0x100 - obj_tiles gFieldObjectPic_HotSpringsOldWoman_4, 0x100 - obj_tiles gFieldObjectPic_HotSpringsOldWoman_5, 0x100 - obj_tiles gFieldObjectPic_HotSpringsOldWoman_6, 0x100 - obj_tiles gFieldObjectPic_HotSpringsOldWoman_7, 0x100 - obj_tiles gFieldObjectPic_HotSpringsOldWoman_8, 0x100 - - .align 2 -gFieldObjectPicTable_SSTidal:: @ 8507B54 - obj_tiles gFieldObjectPic_SSTidal, 0x780 - obj_tiles gFieldObjectPic_SSTidal, 0x780 - obj_tiles gFieldObjectPic_SSTidal, 0x780 - obj_tiles gFieldObjectPic_SSTidal, 0x780 - obj_tiles gFieldObjectPic_SSTidal, 0x780 - obj_tiles gFieldObjectPic_SSTidal, 0x780 - obj_tiles gFieldObjectPic_SSTidal, 0x780 - obj_tiles gFieldObjectPic_SSTidal, 0x780 - obj_tiles gFieldObjectPic_SSTidal, 0x780 - - .align 2 -gFieldObjectPicTable_SubmarineShadow:: @ 8507B9C - obj_tiles gFieldObjectPic_SubmarineShadow, 0x580 - obj_tiles gFieldObjectPic_SubmarineShadow, 0x580 - obj_tiles gFieldObjectPic_SubmarineShadow, 0x580 - obj_tiles gFieldObjectPic_SubmarineShadow, 0x580 - obj_tiles gFieldObjectPic_SubmarineShadow, 0x580 - obj_tiles gFieldObjectPic_SubmarineShadow, 0x580 - obj_tiles gFieldObjectPic_SubmarineShadow, 0x580 - obj_tiles gFieldObjectPic_SubmarineShadow, 0x580 - obj_tiles gFieldObjectPic_SubmarineShadow, 0x580 - - .align 2 -gFieldObjectPicTable_PichuDoll:: @ 8507BE4 - obj_tiles gFieldObjectPic_PichuDoll, 0x80 - - .align 2 -gFieldObjectPicTable_PikachuDoll:: @ 8507BEC - obj_tiles gFieldObjectPic_PikachuDoll, 0x80 - - .align 2 -gFieldObjectPicTable_MarillDoll:: @ 8507BF4 - obj_tiles gFieldObjectPic_MarillDoll, 0x80 - - .align 2 -gFieldObjectPicTable_TogepiDoll:: @ 8507BFC - obj_tiles gFieldObjectPic_TogepiDoll, 0x80 - - .align 2 -gFieldObjectPicTable_CyndaquilDoll:: @ 8507C04 - obj_tiles gFieldObjectPic_CyndaquilDoll, 0x80 - - .align 2 -gFieldObjectPicTable_ChikoritaDoll:: @ 8507C0C - obj_tiles gFieldObjectPic_ChikoritaDoll, 0x80 - - .align 2 -gFieldObjectPicTable_TotodileDoll:: @ 8507C14 - obj_tiles gFieldObjectPic_TotodileDoll, 0x80 - - .align 2 -gFieldObjectPicTable_JigglypuffDoll:: @ 8507C1C - obj_tiles gFieldObjectPic_JigglypuffDoll, 0x80 - - .align 2 -gFieldObjectPicTable_MeowthDoll:: @ 8507C24 - obj_tiles gFieldObjectPic_MeowthDoll, 0x80 - - .align 2 -gFieldObjectPicTable_ClefairyDoll:: @ 8507C2C - obj_tiles gFieldObjectPic_ClefairyDoll, 0x80 - - .align 2 -gFieldObjectPicTable_DittoDoll:: @ 8507C34 - obj_tiles gFieldObjectPic_DittoDoll, 0x80 - - .align 2 -gFieldObjectPicTable_SmoochumDoll:: @ 8507C3C - obj_tiles gFieldObjectPic_SmoochumDoll, 0x80 - - .align 2 -gFieldObjectPicTable_TreeckoDoll:: @ 8507C44 - obj_tiles gFieldObjectPic_TreeckoDoll, 0x80 - - .align 2 -gFieldObjectPicTable_TorchicDoll:: @ 8507C4C - obj_tiles gFieldObjectPic_TorchicDoll, 0x80 - - .align 2 -gFieldObjectPicTable_MudkipDoll:: @ 8507C54 - obj_tiles gFieldObjectPic_MudkipDoll, 0x80 - - .align 2 -gFieldObjectPicTable_DuskullDoll:: @ 8507C5C - obj_tiles gFieldObjectPic_DuskullDoll, 0x80 - - .align 2 -gFieldObjectPicTable_WynautDoll:: @ 8507C64 - obj_tiles gFieldObjectPic_WynautDoll, 0x80 - - .align 2 -gFieldObjectPicTable_BaltoyDoll:: @ 8507C6C - obj_tiles gFieldObjectPic_BaltoyDoll, 0x80 - - .align 2 -gFieldObjectPicTable_KecleonDoll:: @ 8507C74 - obj_tiles gFieldObjectPic_KecleonDoll, 0x80 - - .align 2 -gFieldObjectPicTable_AzurillDoll:: @ 8507C7C - obj_tiles gFieldObjectPic_AzurillDoll, 0x80 - - .align 2 -gFieldObjectPicTable_SkittyDoll:: @ 8507C84 - obj_tiles gFieldObjectPic_SkittyDoll, 0x80 - - .align 2 -gFieldObjectPicTable_SwabluDoll:: @ 8507C8C - obj_tiles gFieldObjectPic_SwabluDoll, 0x80 - - .align 2 -gFieldObjectPicTable_GulpinDoll:: @ 8507C94 - obj_tiles gFieldObjectPic_GulpinDoll, 0x80 - - .align 2 -gFieldObjectPicTable_LotadDoll:: @ 8507C9C - obj_tiles gFieldObjectPic_LotadDoll, 0x80 - - .align 2 -gFieldObjectPicTable_SeedotDoll:: @ 8507CA4 - obj_tiles gFieldObjectPic_SeedotDoll, 0x80 - - .align 2 -gFieldObjectPicTable_PikaCushion:: @ 8507CAC - obj_tiles gFieldObjectPic_PikaCushion, 0x80 - - .align 2 -gFieldObjectPicTable_RoundCushion:: @ 8507CB4 - obj_tiles gFieldObjectPic_RoundCushion, 0x80 - - .align 2 -gFieldObjectPicTable_KissCushion:: @ 8507CBC - obj_tiles gFieldObjectPic_KissCushion, 0x80 - - .align 2 -gFieldObjectPicTable_ZigzagCushion:: @ 8507CC4 - obj_tiles gFieldObjectPic_ZigzagCushion, 0x80 - - .align 2 -gFieldObjectPicTable_SpinCushion:: @ 8507CCC - obj_tiles gFieldObjectPic_SpinCushion, 0x80 - - .align 2 -gFieldObjectPicTable_DiamondCushion:: @ 8507CD4 - obj_tiles gFieldObjectPic_DiamondCushion, 0x80 - - .align 2 -gFieldObjectPicTable_BallCushion:: @ 8507CDC - obj_tiles gFieldObjectPic_BallCushion, 0x80 - - .align 2 -gFieldObjectPicTable_GrassCushion:: @ 8507CE4 - obj_tiles gFieldObjectPic_GrassCushion, 0x80 - - .align 2 -gFieldObjectPicTable_FireCushion:: @ 8507CEC - obj_tiles gFieldObjectPic_FireCushion, 0x80 - - .align 2 -gFieldObjectPicTable_WaterCushion:: @ 8507CF4 - obj_tiles gFieldObjectPic_WaterCushion, 0x80 - - .align 2 -gFieldObjectPicTable_BigSnorlaxDoll:: @ 8507CFC - obj_tiles gFieldObjectPic_BigSnorlaxDoll, 0x200 - - .align 2 -gFieldObjectPicTable_BigRhydonDoll:: @ 8507D04 - obj_tiles gFieldObjectPic_BigRhydonDoll, 0x200 - - .align 2 -gFieldObjectPicTable_BigLaprasDoll:: @ 8507D0C - obj_tiles gFieldObjectPic_BigLaprasDoll, 0x200 - - .align 2 -gFieldObjectPicTable_BigVenusaurDoll:: @ 8507D14 - obj_tiles gFieldObjectPic_BigVenusaurDoll, 0x200 - - .align 2 -gFieldObjectPicTable_BigCharizardDoll:: @ 8507D1C - obj_tiles gFieldObjectPic_BigCharizardDoll, 0x200 - - .align 2 -gFieldObjectPicTable_BigBlastoiseDoll:: @ 8507D24 - obj_tiles gFieldObjectPic_BigBlastoiseDoll, 0x200 - - .align 2 -gFieldObjectPicTable_BigWailmerDoll:: @ 8507D2C - obj_tiles gFieldObjectPic_BigWailmerDoll, 0x200 - - .align 2 -gFieldObjectPicTable_BigRegirockDoll:: @ 8507D34 - obj_tiles gFieldObjectPic_BigRegirockDoll, 0x200 - - .align 2 -gFieldObjectPicTable_BigRegiceDoll:: @ 8507D3C - obj_tiles gFieldObjectPic_BigRegiceDoll, 0x200 - - .align 2 -gFieldObjectPicTable_BigRegisteelDoll:: @ 8507D44 - obj_tiles gFieldObjectPic_BigRegisteelDoll, 0x200 - - .align 2 -gFieldObjectPicTable_LatiasLatios:: @ 8507D4C - obj_tiles gFieldObjectPic_LatiasLatios_0, 0x200 - obj_tiles gFieldObjectPic_LatiasLatios_0, 0x200 - obj_tiles gFieldObjectPic_LatiasLatios_0, 0x200 - obj_tiles gFieldObjectPic_LatiasLatios_1, 0x200 - obj_tiles gFieldObjectPic_LatiasLatios_2, 0x200 - obj_tiles gFieldObjectPic_LatiasLatios_1, 0x200 - obj_tiles gFieldObjectPic_LatiasLatios_2, 0x200 - obj_tiles gFieldObjectPic_LatiasLatios_1, 0x200 - obj_tiles gFieldObjectPic_LatiasLatios_2, 0x200 - - .align 2 -gFieldObjectPicTable_Boy5:: @ 8507D94 - obj_tiles gFieldObjectPic_Boy5_0, 0x100 - obj_tiles gFieldObjectPic_Boy5_1, 0x100 - obj_tiles gFieldObjectPic_Boy5_2, 0x100 - obj_tiles gFieldObjectPic_Boy5_0, 0x100 - obj_tiles gFieldObjectPic_Boy5_0, 0x100 - obj_tiles gFieldObjectPic_Boy5_1, 0x100 - obj_tiles gFieldObjectPic_Boy5_1, 0x100 - obj_tiles gFieldObjectPic_Boy5_2, 0x100 - obj_tiles gFieldObjectPic_Boy5_2, 0x100 - - .align 2 -gFieldObjectPicTable_ContestOldMan:: @ 8507DDC - obj_tiles gFieldObjectPic_ContestOldMan_0, 0x100 - obj_tiles gFieldObjectPic_ContestOldMan_1, 0x100 - obj_tiles gFieldObjectPic_ContestOldMan_2, 0x100 - obj_tiles gFieldObjectPic_ContestOldMan_3, 0x100 - obj_tiles gFieldObjectPic_ContestOldMan_4, 0x100 - obj_tiles gFieldObjectPic_ContestOldMan_5, 0x100 - obj_tiles gFieldObjectPic_ContestOldMan_6, 0x100 - obj_tiles gFieldObjectPic_ContestOldMan_7, 0x100 - obj_tiles gFieldObjectPic_ContestOldMan_8, 0x100 - - .align 2 -gFieldObjectPicTable_BrendanWatering:: @ 8507E24 - obj_tiles gFieldObjectPic_BrendanWatering_0, 0x200 - obj_tiles gFieldObjectPic_BrendanWatering_1, 0x200 - obj_tiles gFieldObjectPic_BrendanWatering_2, 0x200 - obj_tiles gFieldObjectPic_BrendanWatering_3, 0x200 - obj_tiles gFieldObjectPic_BrendanWatering_3, 0x200 - obj_tiles gFieldObjectPic_BrendanWatering_4, 0x200 - obj_tiles gFieldObjectPic_BrendanWatering_4, 0x200 - obj_tiles gFieldObjectPic_BrendanWatering_5, 0x200 - obj_tiles gFieldObjectPic_BrendanWatering_5, 0x200 - - .align 2 -gFieldObjectPicTable_MayWatering:: @ 8507E6C - obj_tiles gFieldObjectPic_MayWatering_0, 0x200 - obj_tiles gFieldObjectPic_MayWatering_1, 0x200 - obj_tiles gFieldObjectPic_MayWatering_2, 0x200 - obj_tiles gFieldObjectPic_MayWatering_3, 0x200 - obj_tiles gFieldObjectPic_MayWatering_3, 0x200 - obj_tiles gFieldObjectPic_MayWatering_4, 0x200 - obj_tiles gFieldObjectPic_MayWatering_4, 0x200 - obj_tiles gFieldObjectPic_MayWatering_5, 0x200 - obj_tiles gFieldObjectPic_MayWatering_5, 0x200 - - .align 2 -gFieldObjectPicTable_BrendanDecorating:: @ 8507EB4 - obj_tiles gFieldObjectPic_BrendanDecorating, 0x100 - - .align 2 -gFieldObjectPicTable_MayDecorating:: @ 8507EBC - obj_tiles gFieldObjectPic_MayDecorating, 0x100 - - .align 2 -gFieldObjectPicTable_Archie:: @ 8507EC4 - obj_tiles gFieldObjectPic_Archie_0, 0x100 - obj_tiles gFieldObjectPic_Archie_1, 0x100 - obj_tiles gFieldObjectPic_Archie_2, 0x100 - obj_tiles gFieldObjectPic_Archie_3, 0x100 - obj_tiles gFieldObjectPic_Archie_4, 0x100 - obj_tiles gFieldObjectPic_Archie_5, 0x100 - obj_tiles gFieldObjectPic_Archie_6, 0x100 - obj_tiles gFieldObjectPic_Archie_7, 0x100 - obj_tiles gFieldObjectPic_Archie_8, 0x100 - - .align 2 -gFieldObjectPicTable_Maxie:: @ 8507F0C - obj_tiles gFieldObjectPic_Maxie_0, 0x100 - obj_tiles gFieldObjectPic_Maxie_1, 0x100 - obj_tiles gFieldObjectPic_Maxie_2, 0x100 - obj_tiles gFieldObjectPic_Maxie_3, 0x100 - obj_tiles gFieldObjectPic_Maxie_4, 0x100 - obj_tiles gFieldObjectPic_Maxie_5, 0x100 - obj_tiles gFieldObjectPic_Maxie_6, 0x100 - obj_tiles gFieldObjectPic_Maxie_7, 0x100 - obj_tiles gFieldObjectPic_Maxie_8, 0x100 - - .align 2 -gFieldObjectPicTable_KyogreFront:: @ 8507F54 - obj_tiles gFieldObjectPic_KyogreFront_0, 0x200 - obj_tiles gFieldObjectPic_KyogreFront_0, 0x200 - obj_tiles gFieldObjectPic_KyogreFront_0, 0x200 - obj_tiles gFieldObjectPic_KyogreFront_1, 0x200 - obj_tiles gFieldObjectPic_KyogreFront_1, 0x200 - obj_tiles gFieldObjectPic_KyogreFront_1, 0x200 - obj_tiles gFieldObjectPic_KyogreFront_1, 0x200 - obj_tiles gFieldObjectPic_KyogreFront_1, 0x200 - obj_tiles gFieldObjectPic_KyogreFront_1, 0x200 - - .align 2 -gFieldObjectPicTable_GroudonFront:: @ 8507F9C - obj_tiles gFieldObjectPic_GroudonFront_0, 0x200 - obj_tiles gFieldObjectPic_GroudonFront_0, 0x200 - obj_tiles gFieldObjectPic_GroudonFront_0, 0x200 - obj_tiles gFieldObjectPic_GroudonFront_1, 0x200 - obj_tiles gFieldObjectPic_GroudonFront_1, 0x200 - obj_tiles gFieldObjectPic_GroudonFront_1, 0x200 - obj_tiles gFieldObjectPic_GroudonFront_1, 0x200 - obj_tiles gFieldObjectPic_GroudonFront_1, 0x200 - obj_tiles gFieldObjectPic_GroudonFront_1, 0x200 - - .align 2 -gFieldObjectPicTable_KyogreSide:: @ 8507FE4 - obj_tiles gFieldObjectPic_KyogreSide_0, 0x200 - obj_tiles gFieldObjectPic_KyogreSide_0, 0x200 - obj_tiles gFieldObjectPic_KyogreSide_0, 0x200 - obj_tiles gFieldObjectPic_KyogreSide_1, 0x200 - obj_tiles gFieldObjectPic_KyogreSide_1, 0x200 - obj_tiles gFieldObjectPic_KyogreSide_1, 0x200 - obj_tiles gFieldObjectPic_KyogreSide_1, 0x200 - obj_tiles gFieldObjectPic_KyogreSide_1, 0x200 - obj_tiles gFieldObjectPic_KyogreSide_1, 0x200 - - .align 2 -gFieldObjectPicTable_GroudonSide:: @ 850802C - obj_tiles gFieldObjectPic_GroudonSide_0, 0x200 - obj_tiles gFieldObjectPic_GroudonSide_0, 0x200 - obj_tiles gFieldObjectPic_GroudonSide_0, 0x200 - obj_tiles gFieldObjectPic_GroudonSide_1, 0x200 - obj_tiles gFieldObjectPic_GroudonSide_1, 0x200 - obj_tiles gFieldObjectPic_GroudonSide_1, 0x200 - obj_tiles gFieldObjectPic_GroudonSide_1, 0x200 - obj_tiles gFieldObjectPic_GroudonSide_1, 0x200 - obj_tiles gFieldObjectPic_GroudonSide_1, 0x200 - - .align 2 -gFieldObjectPicTable_Fossil:: @ 8508074 - obj_tiles gFieldObjectPic_Fossil, 0x80 - - .align 2 -gFieldObjectPicTable_Regi:: @ 850807C - obj_tiles gFieldObjectPic_Regi, 0x200 - obj_tiles gFieldObjectPic_Regi, 0x200 - obj_tiles gFieldObjectPic_Regi, 0x200 - obj_tiles gFieldObjectPic_Regi, 0x200 - obj_tiles gFieldObjectPic_Regi, 0x200 - obj_tiles gFieldObjectPic_Regi, 0x200 - obj_tiles gFieldObjectPic_Regi, 0x200 - obj_tiles gFieldObjectPic_Regi, 0x200 - obj_tiles gFieldObjectPic_Regi, 0x200 - - .align 2 -gFieldObjectPicTable_Skitty:: @ 85080C4 - obj_tiles gFieldObjectPic_Skitty_0, 0x80 - obj_tiles gFieldObjectPic_Skitty_1, 0x80 - obj_tiles gFieldObjectPic_Skitty_2, 0x80 - obj_tiles gFieldObjectPic_Skitty_0, 0x80 - obj_tiles gFieldObjectPic_Skitty_0, 0x80 - obj_tiles gFieldObjectPic_Skitty_1, 0x80 - obj_tiles gFieldObjectPic_Skitty_1, 0x80 - obj_tiles gFieldObjectPic_Skitty_2, 0x80 - obj_tiles gFieldObjectPic_Skitty_2, 0x80 - - .align 2 -gFieldObjectPicTable_Kecleon:: @ 850810C - obj_tiles gFieldObjectPic_Kecleon_0, 0x80 - obj_tiles gFieldObjectPic_Kecleon_1, 0x80 - obj_tiles gFieldObjectPic_Kecleon_2, 0x80 - obj_tiles gFieldObjectPic_Kecleon_0, 0x80 - obj_tiles gFieldObjectPic_Kecleon_0, 0x80 - obj_tiles gFieldObjectPic_Kecleon_1, 0x80 - obj_tiles gFieldObjectPic_Kecleon_1, 0x80 - obj_tiles gFieldObjectPic_Kecleon_2, 0x80 - obj_tiles gFieldObjectPic_Kecleon_2, 0x80 - - .align 2 -gFieldObjectPicTable_Rayquaza:: @ 8508154 - obj_tiles gFieldObjectPic_Rayquaza_0, 0x800 - obj_tiles gFieldObjectPic_Rayquaza_1, 0x800 - obj_tiles gFieldObjectPic_Rayquaza_2, 0x800 - obj_tiles gFieldObjectPic_Rayquaza_3, 0x800 - obj_tiles gFieldObjectPic_Rayquaza_4, 0x800 - - .align 2 -gFieldObjectPicTable_RayquazaStill:: @ 850817C - obj_tiles gFieldObjectPic_RayquazaStill, 0x800 - obj_tiles gFieldObjectPic_RayquazaStill, 0x800 - obj_tiles gFieldObjectPic_RayquazaStill, 0x800 - obj_tiles gFieldObjectPic_RayquazaStill, 0x800 - obj_tiles gFieldObjectPic_RayquazaStill, 0x800 - obj_tiles gFieldObjectPic_RayquazaStill, 0x800 - obj_tiles gFieldObjectPic_RayquazaStill, 0x800 - obj_tiles gFieldObjectPic_RayquazaStill, 0x800 - obj_tiles gFieldObjectPic_RayquazaStill, 0x800 - - .align 2 -gFieldObjectPicTable_Zigzagoon:: @ 85081C4 - obj_tiles gFieldObjectPic_Zigzagoon_0, 0x80 - obj_tiles gFieldObjectPic_Zigzagoon_1, 0x80 - obj_tiles gFieldObjectPic_Zigzagoon_2, 0x80 - obj_tiles gFieldObjectPic_Zigzagoon_0, 0x80 - obj_tiles gFieldObjectPic_Zigzagoon_0, 0x80 - obj_tiles gFieldObjectPic_Zigzagoon_1, 0x80 - obj_tiles gFieldObjectPic_Zigzagoon_1, 0x80 - obj_tiles gFieldObjectPic_Zigzagoon_2, 0x80 - obj_tiles gFieldObjectPic_Zigzagoon_2, 0x80 - - .align 2 -gFieldObjectPicTable_Pikachu:: @ 850820C - obj_tiles gFieldObjectPic_Pikachu_0, 0x80 - obj_tiles gFieldObjectPic_Pikachu_1, 0x80 - obj_tiles gFieldObjectPic_Pikachu_2, 0x80 - obj_tiles gFieldObjectPic_Pikachu_0, 0x80 - obj_tiles gFieldObjectPic_Pikachu_0, 0x80 - obj_tiles gFieldObjectPic_Pikachu_1, 0x80 - obj_tiles gFieldObjectPic_Pikachu_1, 0x80 - obj_tiles gFieldObjectPic_Pikachu_2, 0x80 - obj_tiles gFieldObjectPic_Pikachu_2, 0x80 - - .align 2 -gFieldObjectPicTable_Azumarill:: @ 8508254 - obj_tiles gFieldObjectPic_Azumarill_0, 0x80 - obj_tiles gFieldObjectPic_Azumarill_1, 0x80 - obj_tiles gFieldObjectPic_Azumarill_2, 0x80 - obj_tiles gFieldObjectPic_Azumarill_0, 0x80 - obj_tiles gFieldObjectPic_Azumarill_0, 0x80 - obj_tiles gFieldObjectPic_Azumarill_1, 0x80 - obj_tiles gFieldObjectPic_Azumarill_1, 0x80 - obj_tiles gFieldObjectPic_Azumarill_2, 0x80 - obj_tiles gFieldObjectPic_Azumarill_2, 0x80 - - .align 2 -gFieldObjectPicTable_Wingull:: @ 850829C - obj_tiles gFieldObjectPic_Wingull_0, 0x80 - obj_tiles gFieldObjectPic_Wingull_1, 0x80 - obj_tiles gFieldObjectPic_Wingull_2, 0x80 - obj_tiles gFieldObjectPic_Wingull_3, 0x80 - obj_tiles gFieldObjectPic_Wingull_3, 0x80 - obj_tiles gFieldObjectPic_Wingull_4, 0x80 - obj_tiles gFieldObjectPic_Wingull_4, 0x80 - obj_tiles gFieldObjectPic_Wingull_5, 0x80 - obj_tiles gFieldObjectPic_Wingull_5, 0x80 - - .align 2 -gFieldObjectPicTable_TuberMSwimming:: @ 85082E4 - obj_tiles gFieldObjectPic_TuberMSwimming_0, 0x80 - obj_tiles gFieldObjectPic_TuberMSwimming_1, 0x80 - obj_tiles gFieldObjectPic_TuberMSwimming_2, 0x80 - obj_tiles gFieldObjectPic_TuberMSwimming_3, 0x80 - obj_tiles gFieldObjectPic_TuberMSwimming_4, 0x80 - obj_tiles gFieldObjectPic_TuberMSwimming_5, 0x80 - obj_tiles gFieldObjectPic_TuberMSwimming_6, 0x80 - obj_tiles gFieldObjectPic_TuberMSwimming_7, 0x80 - obj_tiles gFieldObjectPic_TuberMSwimming_8, 0x80 - - .align 2 -gFieldObjectPicTable_Azurill:: @ 850832C - obj_tiles gFieldObjectPic_Azurill_0, 0x80 - obj_tiles gFieldObjectPic_Azurill_1, 0x80 - obj_tiles gFieldObjectPic_Azurill_2, 0x80 - obj_tiles gFieldObjectPic_Azurill_0, 0x80 - obj_tiles gFieldObjectPic_Azurill_0, 0x80 - obj_tiles gFieldObjectPic_Azurill_1, 0x80 - obj_tiles gFieldObjectPic_Azurill_1, 0x80 - obj_tiles gFieldObjectPic_Azurill_2, 0x80 - obj_tiles gFieldObjectPic_Azurill_2, 0x80 - - .align 2 -gFieldObjectPicTable_Mom:: @ 8508374 - obj_tiles gFieldObjectPic_Mom_0, 0x100 - obj_tiles gFieldObjectPic_Mom_1, 0x100 - obj_tiles gFieldObjectPic_Mom_2, 0x100 - obj_tiles gFieldObjectPic_Mom_3, 0x100 - obj_tiles gFieldObjectPic_Mom_4, 0x100 - obj_tiles gFieldObjectPic_Mom_5, 0x100 - obj_tiles gFieldObjectPic_Mom_6, 0x100 - obj_tiles gFieldObjectPic_Mom_7, 0x100 - obj_tiles gFieldObjectPic_Mom_8, 0x100 - - .align 2 -gFieldObjectPicTable_Scott:: @ 85083BC - obj_tiles gFieldObjectPic_Scott_0, 0x100 - obj_tiles gFieldObjectPic_Scott_1, 0x100 - obj_tiles gFieldObjectPic_Scott_2, 0x100 - obj_tiles gFieldObjectPic_Scott_3, 0x100 - obj_tiles gFieldObjectPic_Scott_4, 0x100 - obj_tiles gFieldObjectPic_Scott_5, 0x100 - obj_tiles gFieldObjectPic_Scott_6, 0x100 - obj_tiles gFieldObjectPic_Scott_7, 0x100 - obj_tiles gFieldObjectPic_Scott_8, 0x100 - - .align 2 -gFieldObjectPicTable_Juan:: @ 8508404 - obj_tiles gFieldObjectPic_Juan_0, 0x100 - obj_tiles gFieldObjectPic_Juan_1, 0x100 - obj_tiles gFieldObjectPic_Juan_2, 0x100 - obj_tiles gFieldObjectPic_Juan_3, 0x100 - obj_tiles gFieldObjectPic_Juan_4, 0x100 - obj_tiles gFieldObjectPic_Juan_5, 0x100 - obj_tiles gFieldObjectPic_Juan_6, 0x100 - obj_tiles gFieldObjectPic_Juan_7, 0x100 - obj_tiles gFieldObjectPic_Juan_8, 0x100 - - .align 2 -gFieldObjectPicTable_MysteryEventDeliveryman:: @ 850844C - obj_tiles gFieldObjectPic_MysteryEventDeliveryman_0, 0x100 - obj_tiles gFieldObjectPic_MysteryEventDeliveryman_1, 0x100 - obj_tiles gFieldObjectPic_MysteryEventDeliveryman_2, 0x100 - obj_tiles gFieldObjectPic_MysteryEventDeliveryman_0, 0x100 - obj_tiles gFieldObjectPic_MysteryEventDeliveryman_0, 0x100 - obj_tiles gFieldObjectPic_MysteryEventDeliveryman_1, 0x100 - obj_tiles gFieldObjectPic_MysteryEventDeliveryman_1, 0x100 - obj_tiles gFieldObjectPic_MysteryEventDeliveryman_2, 0x100 - obj_tiles gFieldObjectPic_MysteryEventDeliveryman_2, 0x100 - - .align 2 -gFieldObjectPicTable_Statue:: @ 8508494 - obj_tiles gFieldObjectPic_Statue, 0x100 - - .align 2 -gFieldObjectPicTable_Dusclops:: @ 850849C - obj_tiles gFieldObjectPic_Dusclops_0, 0x100 - obj_tiles gFieldObjectPic_Dusclops_1, 0x100 - obj_tiles gFieldObjectPic_Dusclops_2, 0x100 - obj_tiles gFieldObjectPic_Dusclops_3, 0x100 - obj_tiles gFieldObjectPic_Dusclops_4, 0x100 - obj_tiles gFieldObjectPic_Dusclops_5, 0x100 - obj_tiles gFieldObjectPic_Dusclops_6, 0x100 - obj_tiles gFieldObjectPic_Dusclops_7, 0x100 - obj_tiles gFieldObjectPic_Dusclops_8, 0x100 - - .align 2 -gFieldObjectPicTable_Kirlia:: @ 85084E4 - obj_tiles gFieldObjectPic_Kirlia_0, 0x100 - obj_tiles gFieldObjectPic_Kirlia_1, 0x100 - obj_tiles gFieldObjectPic_Kirlia_2, 0x100 - obj_tiles gFieldObjectPic_Kirlia_3, 0x100 - obj_tiles gFieldObjectPic_Kirlia_4, 0x100 - obj_tiles gFieldObjectPic_Kirlia_5, 0x100 - obj_tiles gFieldObjectPic_Kirlia_6, 0x100 - obj_tiles gFieldObjectPic_Kirlia_7, 0x100 - obj_tiles gFieldObjectPic_Kirlia_8, 0x100 - - .align 2 -gFieldObjectPicTable_UnionRoomAttendant:: @ 850852C - obj_tiles gFieldObjectPic_UnionRoomAttendant_0, 0x100 - obj_tiles gFieldObjectPic_UnionRoomAttendant_1, 0x100 - obj_tiles gFieldObjectPic_UnionRoomAttendant_2, 0x100 - obj_tiles gFieldObjectPic_UnionRoomAttendant_0, 0x100 - obj_tiles gFieldObjectPic_UnionRoomAttendant_0, 0x100 - obj_tiles gFieldObjectPic_UnionRoomAttendant_1, 0x100 - obj_tiles gFieldObjectPic_UnionRoomAttendant_1, 0x100 - obj_tiles gFieldObjectPic_UnionRoomAttendant_2, 0x100 - obj_tiles gFieldObjectPic_UnionRoomAttendant_2, 0x100 - - .align 2 -gFieldObjectPicTable_Sudowoodo:: @ 8508574 - obj_tiles gFieldObjectPic_Sudowoodo_0, 0x100 - obj_tiles gFieldObjectPic_Sudowoodo_0, 0x100 - obj_tiles gFieldObjectPic_Sudowoodo_1, 0x100 - obj_tiles gFieldObjectPic_Sudowoodo_0, 0x100 - obj_tiles gFieldObjectPic_Sudowoodo_0, 0x100 - obj_tiles gFieldObjectPic_Sudowoodo_0, 0x100 - obj_tiles gFieldObjectPic_Sudowoodo_0, 0x100 - obj_tiles gFieldObjectPic_Sudowoodo_1, 0x100 - obj_tiles gFieldObjectPic_Sudowoodo_2, 0x100 - - .align 2 -gFieldObjectPicTable_Mew:: @ 85085BC - obj_tiles gFieldObjectPic_Mew_0, 0x100 - obj_tiles gFieldObjectPic_Mew_1, 0x100 - obj_tiles gFieldObjectPic_Mew_2, 0x100 - obj_tiles gFieldObjectPic_Mew_3, 0x100 - obj_tiles gFieldObjectPic_Mew_4, 0x100 - obj_tiles gFieldObjectPic_Mew_5, 0x100 - obj_tiles gFieldObjectPic_Mew_6, 0x100 - obj_tiles gFieldObjectPic_Mew_7, 0x100 - obj_tiles gFieldObjectPic_Mew_8, 0x100 - - .align 2 -gFieldObjectPicTable_Red:: @ 8508604 - obj_tiles gFieldObjectPic_Red_0, 0x100 - obj_tiles gFieldObjectPic_Red_1, 0x100 - obj_tiles gFieldObjectPic_Red_2, 0x100 - obj_tiles gFieldObjectPic_Red_3, 0x100 - obj_tiles gFieldObjectPic_Red_4, 0x100 - obj_tiles gFieldObjectPic_Red_5, 0x100 - obj_tiles gFieldObjectPic_Red_6, 0x100 - obj_tiles gFieldObjectPic_Red_7, 0x100 - obj_tiles gFieldObjectPic_Red_8, 0x100 - - .align 2 -gFieldObjectPicTable_Leaf:: @ 850864C - obj_tiles gFieldObjectPic_Leaf_0, 0x100 - obj_tiles gFieldObjectPic_Leaf_1, 0x100 - obj_tiles gFieldObjectPic_Leaf_2, 0x100 - obj_tiles gFieldObjectPic_Leaf_3, 0x100 - obj_tiles gFieldObjectPic_Leaf_4, 0x100 - obj_tiles gFieldObjectPic_Leaf_5, 0x100 - obj_tiles gFieldObjectPic_Leaf_6, 0x100 - obj_tiles gFieldObjectPic_Leaf_7, 0x100 - obj_tiles gFieldObjectPic_Leaf_8, 0x100 - - .align 2 -gFieldObjectPicTable_Deoxys:: @ 8508694 - obj_tiles gFieldObjectPic_Deoxys_0, 0x200 - obj_tiles gFieldObjectPic_Deoxys_0, 0x200 - obj_tiles gFieldObjectPic_Deoxys_0, 0x200 - obj_tiles gFieldObjectPic_Deoxys_0, 0x200 - obj_tiles gFieldObjectPic_Deoxys_1, 0x200 - obj_tiles gFieldObjectPic_Deoxys_0, 0x200 - obj_tiles gFieldObjectPic_Deoxys_1, 0x200 - obj_tiles gFieldObjectPic_Deoxys_0, 0x200 - obj_tiles gFieldObjectPic_Deoxys_0, 0x200 - - .align 2 -gFieldObjectPicTable_BirthIslandStone:: @ 85086DC - obj_tiles gFieldObjectPic_BirthIslandStone, 0x200 - - .align 2 -gFieldObjectPicTable_Anabel:: @ 85086E4 - obj_tiles gFieldObjectPic_Anabel_0, 0x100 - obj_tiles gFieldObjectPic_Anabel_1, 0x100 - obj_tiles gFieldObjectPic_Anabel_2, 0x100 - obj_tiles gFieldObjectPic_Anabel_3, 0x100 - obj_tiles gFieldObjectPic_Anabel_4, 0x100 - obj_tiles gFieldObjectPic_Anabel_5, 0x100 - obj_tiles gFieldObjectPic_Anabel_6, 0x100 - obj_tiles gFieldObjectPic_Anabel_7, 0x100 - obj_tiles gFieldObjectPic_Anabel_8, 0x100 - - .align 2 -gFieldObjectPicTable_Tucker:: @ 850872C - obj_tiles gFieldObjectPic_Tucker_0, 0x100 - obj_tiles gFieldObjectPic_Tucker_1, 0x100 - obj_tiles gFieldObjectPic_Tucker_2, 0x100 - obj_tiles gFieldObjectPic_Tucker_3, 0x100 - obj_tiles gFieldObjectPic_Tucker_4, 0x100 - obj_tiles gFieldObjectPic_Tucker_5, 0x100 - obj_tiles gFieldObjectPic_Tucker_6, 0x100 - obj_tiles gFieldObjectPic_Tucker_7, 0x100 - obj_tiles gFieldObjectPic_Tucker_8, 0x100 - - .align 2 -gFieldObjectPicTable_Spenser:: @ 8508774 - obj_tiles gFieldObjectPic_Spenser_0, 0x100 - obj_tiles gFieldObjectPic_Spenser_1, 0x100 - obj_tiles gFieldObjectPic_Spenser_2, 0x100 - obj_tiles gFieldObjectPic_Spenser_3, 0x100 - obj_tiles gFieldObjectPic_Spenser_4, 0x100 - obj_tiles gFieldObjectPic_Spenser_5, 0x100 - obj_tiles gFieldObjectPic_Spenser_6, 0x100 - obj_tiles gFieldObjectPic_Spenser_7, 0x100 - obj_tiles gFieldObjectPic_Spenser_8, 0x100 - - .align 2 -gFieldObjectPicTable_Greta:: @ 85087BC - obj_tiles gFieldObjectPic_Greta_0, 0x100 - obj_tiles gFieldObjectPic_Greta_1, 0x100 - obj_tiles gFieldObjectPic_Greta_2, 0x100 - obj_tiles gFieldObjectPic_Greta_3, 0x100 - obj_tiles gFieldObjectPic_Greta_4, 0x100 - obj_tiles gFieldObjectPic_Greta_5, 0x100 - obj_tiles gFieldObjectPic_Greta_6, 0x100 - obj_tiles gFieldObjectPic_Greta_7, 0x100 - obj_tiles gFieldObjectPic_Greta_8, 0x100 - - .align 2 -gFieldObjectPicTable_Noland:: @ 8508804 - obj_tiles gFieldObjectPic_Noland_0, 0x100 - obj_tiles gFieldObjectPic_Noland_1, 0x100 - obj_tiles gFieldObjectPic_Noland_2, 0x100 - obj_tiles gFieldObjectPic_Noland_3, 0x100 - obj_tiles gFieldObjectPic_Noland_4, 0x100 - obj_tiles gFieldObjectPic_Noland_5, 0x100 - obj_tiles gFieldObjectPic_Noland_6, 0x100 - obj_tiles gFieldObjectPic_Noland_7, 0x100 - obj_tiles gFieldObjectPic_Noland_8, 0x100 - - .align 2 -gFieldObjectPicTable_Lucy:: @ 850884C - obj_tiles gFieldObjectPic_Lucy_0, 0x100 - obj_tiles gFieldObjectPic_Lucy_1, 0x100 - obj_tiles gFieldObjectPic_Lucy_2, 0x100 - obj_tiles gFieldObjectPic_Lucy_3, 0x100 - obj_tiles gFieldObjectPic_Lucy_4, 0x100 - obj_tiles gFieldObjectPic_Lucy_5, 0x100 - obj_tiles gFieldObjectPic_Lucy_6, 0x100 - obj_tiles gFieldObjectPic_Lucy_7, 0x100 - obj_tiles gFieldObjectPic_Lucy_8, 0x100 - - .align 2 -gFieldObjectPicTable_Brandon:: @ 8508894 - obj_tiles gFieldObjectPic_Brandon_0, 0x100 - obj_tiles gFieldObjectPic_Brandon_1, 0x100 - obj_tiles gFieldObjectPic_Brandon_2, 0x100 - obj_tiles gFieldObjectPic_Brandon_3, 0x100 - obj_tiles gFieldObjectPic_Brandon_4, 0x100 - obj_tiles gFieldObjectPic_Brandon_5, 0x100 - obj_tiles gFieldObjectPic_Brandon_6, 0x100 - obj_tiles gFieldObjectPic_Brandon_7, 0x100 - obj_tiles gFieldObjectPic_Brandon_8, 0x100 - - .align 2 -gFieldObjectPicTable_Lugia:: @ 85088DC - obj_tiles gFieldObjectPic_Lugia_0, 0x200 - obj_tiles gFieldObjectPic_Lugia_0, 0x200 - obj_tiles gFieldObjectPic_Lugia_0, 0x200 - obj_tiles gFieldObjectPic_Lugia_0, 0x200 - obj_tiles gFieldObjectPic_Lugia_1, 0x200 - obj_tiles gFieldObjectPic_Lugia_0, 0x200 - obj_tiles gFieldObjectPic_Lugia_1, 0x200 - obj_tiles gFieldObjectPic_Lugia_0, 0x200 - obj_tiles gFieldObjectPic_Lugia_1, 0x200 - - .align 2 -gFieldObjectPicTable_HoOh:: @ 8508924 - obj_tiles gFieldObjectPic_HoOh_0, 0x200 - obj_tiles gFieldObjectPic_HoOh_0, 0x200 - obj_tiles gFieldObjectPic_HoOh_0, 0x200 - obj_tiles gFieldObjectPic_HoOh_0, 0x200 - obj_tiles gFieldObjectPic_HoOh_1, 0x200 - obj_tiles gFieldObjectPic_HoOh_0, 0x200 - obj_tiles gFieldObjectPic_HoOh_1, 0x200 - obj_tiles gFieldObjectPic_HoOh_0, 0x200 - obj_tiles gFieldObjectPic_HoOh_1, 0x200 - - .align 2 -gFieldObjectPicTable_RubySapphireBrendan:: @ 850896C - obj_tiles gFieldObjectPic_RubySapphireBrendan_0, 0x100 - obj_tiles gFieldObjectPic_RubySapphireBrendan_1, 0x100 - obj_tiles gFieldObjectPic_RubySapphireBrendan_2, 0x100 - obj_tiles gFieldObjectPic_RubySapphireBrendan_3, 0x100 - obj_tiles gFieldObjectPic_RubySapphireBrendan_4, 0x100 - obj_tiles gFieldObjectPic_RubySapphireBrendan_5, 0x100 - obj_tiles gFieldObjectPic_RubySapphireBrendan_6, 0x100 - obj_tiles gFieldObjectPic_RubySapphireBrendan_7, 0x100 - obj_tiles gFieldObjectPic_RubySapphireBrendan_8, 0x100 - - .align 2 -gFieldObjectPicTable_RubySapphireMay:: @ 85089B4 - obj_tiles gFieldObjectPic_RubySapphireMay_0, 0x100 - obj_tiles gFieldObjectPic_RubySapphireMay_1, 0x100 - obj_tiles gFieldObjectPic_RubySapphireMay_2, 0x100 - obj_tiles gFieldObjectPic_RubySapphireMay_3, 0x100 - obj_tiles gFieldObjectPic_RubySapphireMay_4, 0x100 - obj_tiles gFieldObjectPic_RubySapphireMay_5, 0x100 - obj_tiles gFieldObjectPic_RubySapphireMay_6, 0x100 - obj_tiles gFieldObjectPic_RubySapphireMay_7, 0x100 - obj_tiles gFieldObjectPic_RubySapphireMay_8, 0x100 diff --git a/include/berry.h b/include/berry.h index 425a664c9b..b6926ef682 100644 --- a/include/berry.h +++ b/include/berry.h @@ -23,9 +23,9 @@ enum #define NUM_BERRIES 44 -extern const u8 *const gBerryTreeFieldObjectGraphicsIdTablePointers[NUM_BERRIES]; -extern const struct SpriteFrameImage *const gBerryTreePicTablePointers[NUM_BERRIES]; -extern const u8 *const gBerryTreePaletteSlotTablePointers[NUM_BERRIES]; +extern const u8 *const gBerryTreeFieldObjectGraphicsIdTablePointers[]; +extern const struct SpriteFrameImage *const gBerryTreePicTablePointers[]; +extern const u8 *const gBerryTreePaletteSlotTablePointers[]; void ClearEnigmaBerries(void); void SetEnigmaBerry(u8 *src); diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 4e0d4ad229..a12032c930 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -20,6 +20,11 @@ enum SpinnerRunnerFollowPatterns { RUNFOLLOW_SOUTH_EAST_WEST }; +struct UnkStruct_085094AC { + const union AnimCmd *const *anims; + u8 animPos[4]; +}; + #define GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN (1 << 0) #define GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE (1 << 1) #define GROUND_EFFECT_FLAG_LONG_GRASS_ON_SPAWN (1 << 2) @@ -45,6 +50,8 @@ enum SpinnerRunnerFollowPatterns { // Exported ROM declarations +extern const struct SpriteFrameImage gFieldObjectPicTable_PechaBerryTree[]; + void sub_808D438(void); u8 get_go_image_anim_num(u8); u8 GetFieldObjectIdByLocalIdAndMap(u8, u8, u8); @@ -121,6 +128,270 @@ u8 ZCoordToPriority(u8); void FieldObjectUpdateZCoord(struct MapObject *pObject); void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8); bool8 IsZCoordMismatchAt(u8, s16, s16); +void sub_8097AC8(struct Sprite *); +void npc_sync_anim_pause_bits(struct MapObject *); +void oamt_npc_ministep_reset(struct Sprite *, u8, u8); +u8 sub_8097F78(struct MapObject *); +bool8 obj_npc_ministep(struct Sprite *sprite); +bool8 sub_80976EC(struct Sprite *sprite); +void sub_80976DC(struct Sprite *, u8); +void sub_809783C(struct Sprite *, u8, u8, u8); +void DoShadowFieldEffect(struct MapObject *); +u8 sub_809785C(struct Sprite *); +u8 sub_80978E4(struct Sprite *); +void obj_anim_image_set_and_seek(struct Sprite *, u8, u8); +bool8 sub_80979BC(struct Sprite *); +void sub_8097750(struct Sprite *); +bool8 sub_8097758(struct Sprite *); +void sub_8097FA4(struct MapObject *); +void sub_8098044(u8); +void UnfreezeMapObjects(void); +void FreezeMapObjectsExceptOne(u8 mapObjectId); +void sub_8097B78(u8, u8); +void sub_8098074(u8 var1, u8 var2); +void FreezeMapObjects(void); +bool8 FreezeMapObject(struct MapObject *mapObject); +u8 get_go_fast_image_anim_num(u8); +u8 get_go_faster_image_anim_num(u8); +u8 get_go_fastest_image_anim_num(u8); + +void FieldObjectCB_NoMovement1(struct Sprite *); +void FieldObjectCB_LookRandomDirections(struct Sprite *); +void FieldObjectCB_GoRandomDirections(struct Sprite *); +void FieldObjectCB_RandomlyGoNorthOrSouth(struct Sprite *); +void FieldObjectCB_RandomlyGoNorthOrSouth(struct Sprite *); +void FieldObjectCB_RandomlyGoEastOrWest(struct Sprite *); +void FieldObjectCB_RandomlyGoEastOrWest(struct Sprite *); +void FieldObjectCB_FaceFixedDirection(struct Sprite *); +void FieldObjectCB_FaceFixedDirection(struct Sprite *); +void FieldObjectCB_FaceFixedDirection(struct Sprite *); +void FieldObjectCB_FaceFixedDirection(struct Sprite *); +void FieldObjectCB_NoMovement2(struct Sprite *); +void FieldObjectCB_BerryTree(struct Sprite *); +void FieldObjectCB_RandomlyLookNorthOrSouth(struct Sprite *); +void FieldObjectCB_RandomlyLookEastOrWest(struct Sprite *); +void FieldObjectCB_RandomlyLookNorthOrWest(struct Sprite *); +void FieldObjectCB_RandomlyLookNorthOrEast(struct Sprite *); +void FieldObjectCB_RandomlyLookSouthOrWest(struct Sprite *); +void FieldObjectCB_RandomlyLookSouthOrEast(struct Sprite *); +void FieldObjectCB_RandomlyLookNorthOrSouthOrWest(struct Sprite *); +void FieldObjectCB_RandomlyLookNorthOrSouthOrEast(struct Sprite *); +void FieldObjectCB_RandomlyLookNorthOrEastOrWest(struct Sprite *); +void FieldObjectCB_RandomlyLookSouthOrEastOrWest(struct Sprite *); +void FieldObjectCB_LookAroundCounterclockwise(struct Sprite *); +void FieldObjectCB_LookAroundClockwise(struct Sprite *); +void FieldObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *); +void FieldObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *); +void FieldObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *); +void FieldObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *); +void FieldObjectCB_GoInDirectionSequence1(struct Sprite *); +void FieldObjectCB_GoInDirectionSequence2(struct Sprite *); +void FieldObjectCB_GoInDirectionSequence3(struct Sprite *); +void FieldObjectCB_GoInDirectionSequence4(struct Sprite *); +void FieldObjectCB_GoInDirectionSequence5(struct Sprite *); +void FieldObjectCB_GoInDirectionSequence6(struct Sprite *); +void FieldObjectCB_GoInDirectionSequence7(struct Sprite *); +void FieldObjectCB_GoInDirectionSequence8(struct Sprite *); +void FieldObjectCB_GoInDirectionSequence9(struct Sprite *); +void FieldObjectCB_GoInDirectionSequence10(struct Sprite *); +void FieldObjectCB_GoInDirectionSequence11(struct Sprite *); +void FieldObjectCB_GoInDirectionSequence12(struct Sprite *); +void FieldObjectCB_GoInDirectionSequence13(struct Sprite *); +void FieldObjectCB_GoInDirectionSequence14(struct Sprite *); +void FieldObjectCB_GoInDirectionSequence15(struct Sprite *); +void FieldObjectCB_GoInDirectionSequence16(struct Sprite *); +void FieldObjectCB_GoInDirectionSequence17(struct Sprite *); +void FieldObjectCB_GoInDirectionSequence18(struct Sprite *); +void FieldObjectCB_GoInDirectionSequence19(struct Sprite *); +void FieldObjectCB_GoInDirectionSequence20(struct Sprite *); +void FieldObjectCB_GoInDirectionSequence21(struct Sprite *); +void FieldObjectCB_GoInDirectionSequence22(struct Sprite *); +void FieldObjectCB_GoInDirectionSequence23(struct Sprite *); +void FieldObjectCB_GoInDirectionSequence24(struct Sprite *); +void FieldObjectCB_CopyPlayer1(struct Sprite *); +void FieldObjectCB_CopyPlayer1(struct Sprite *); +void FieldObjectCB_CopyPlayer1(struct Sprite *); +void FieldObjectCB_CopyPlayer1(struct Sprite *); +void FieldObjectCB_TreeDisguise(struct Sprite *); +void FieldObjectCB_MountainDisguise(struct Sprite *); +void FieldObjectCB_CopyPlayer2(struct Sprite *); +void FieldObjectCB_CopyPlayer2(struct Sprite *); +void FieldObjectCB_CopyPlayer2(struct Sprite *); +void FieldObjectCB_CopyPlayer2(struct Sprite *); +void FieldObjectCB_Hidden1(struct Sprite *); +void FieldObjectCB_WalkInPlace1(struct Sprite *); +void FieldObjectCB_WalkInPlace1(struct Sprite *); +void FieldObjectCB_WalkInPlace1(struct Sprite *); +void FieldObjectCB_WalkInPlace1(struct Sprite *); +void FieldObjectCB_WalkInPlace2(struct Sprite *); +void FieldObjectCB_WalkInPlace2(struct Sprite *); +void FieldObjectCB_WalkInPlace2(struct Sprite *); +void FieldObjectCB_WalkInPlace2(struct Sprite *); +void FieldObjectCB_WalkInPlace3(struct Sprite *); +void FieldObjectCB_WalkInPlace3(struct Sprite *); +void FieldObjectCB_WalkInPlace3(struct Sprite *); +void FieldObjectCB_WalkInPlace3(struct Sprite *); +void FieldObjectCB_Hidden2(struct Sprite *); +void FieldObjectCB_WalkInPlace4(struct Sprite *); +void FieldObjectCB_WalkInPlace4(struct Sprite *); +void FieldObjectCB_WalkInPlace4(struct Sprite *); +void FieldObjectCB_WalkInPlace4(struct Sprite *); + +u8 sub_808F44C(struct MapObject *, struct Sprite *); +u8 sub_808F460(struct MapObject *, struct Sprite *); +u8 sub_808F48C(struct MapObject *, struct Sprite *); +u8 sub_808F4C8(struct MapObject *, struct Sprite *); +u8 sub_808F4E8(struct MapObject *, struct Sprite *); +u8 sub_808F534(struct MapObject *, struct Sprite *); +u8 sub_808F564(struct MapObject *, struct Sprite *); +u8 GetRegularRunningPastFacingDirection(s16, s16, s16, s16); +u8 GetNorthSouthRunningPastFacingDirection(s16, s16, s16, s16); +u8 GetEastWestRunningPastFacingDirection(s16, s16, s16, s16); +u8 GetNorthEastRunningPastFacingDirection(s16, s16, s16, s16); +u8 GetNorthWestRunningPastFacingDirection(s16, s16, s16, s16); +u8 GetSouthEastRunningPastFacingDirection(s16, s16, s16, s16); +u8 GetSouthWestRunningPastFacingDirection(s16, s16, s16, s16); +u8 GetNonEastRunningPastFacingDirection(s16, s16, s16, s16); +u8 GetNonWestRunningPastFacingDirection(s16, s16, s16, s16); +u8 GetNonSouthRunningPastFacingDirection(s16, s16, s16, s16); +u8 GetNonNorthRunningPastFacingDirection(s16, s16, s16, s16); +u8 sub_808F988(struct MapObject *, struct Sprite *); +u8 sub_808F99C(struct MapObject *, struct Sprite *); +u8 sub_808F9C8(struct MapObject *, struct Sprite *); +u8 sub_808FA0C(struct MapObject *, struct Sprite *); +u8 sub_808FA3C(struct MapObject *, struct Sprite *); +u8 sub_808FAC8(struct MapObject *, struct Sprite *); +u8 sub_808FADC(struct MapObject *, struct Sprite *); +u8 sub_808FB08(struct MapObject *, struct Sprite *); +u8 sub_808FB44(struct MapObject *, struct Sprite *); +u8 sub_808FB64(struct MapObject *, struct Sprite *); +u8 sub_808FBB0(struct MapObject *, struct Sprite *); +u8 sub_808FBE0(struct MapObject *, struct Sprite *); +u8 sub_808FC4C(struct MapObject *, struct Sprite *); +u8 sub_808FC60(struct MapObject *, struct Sprite *); +u8 sub_808FC8C(struct MapObject *, struct Sprite *); +u8 sub_808FCC8(struct MapObject *, struct Sprite *); +u8 sub_808FCE8(struct MapObject *, struct Sprite *); +u8 sub_808FD34(struct MapObject *, struct Sprite *); +u8 sub_808FD64(struct MapObject *, struct Sprite *); +u8 sub_808FDD0(struct MapObject *, struct Sprite *); +u8 sub_808FDFC(struct MapObject *, struct Sprite *); +u8 sub_808FE1C(struct MapObject *, struct Sprite *); +u8 do_berry_tree_growth_sparkle_1(struct MapObject *, struct Sprite *); +u8 sub_808FF48(struct MapObject *, struct Sprite *); +u8 do_berry_tree_growth_sparkle_2(struct MapObject *, struct Sprite *); +u8 sub_808FFB4(struct MapObject *, struct Sprite *); +u8 sub_8090004(struct MapObject *, struct Sprite *); +u8 sub_8090094(struct MapObject *, struct Sprite *); +u8 sub_80900A8(struct MapObject *, struct Sprite *); +u8 sub_80900D4(struct MapObject *, struct Sprite *); +u8 sub_8090118(struct MapObject *, struct Sprite *); +u8 sub_8090148(struct MapObject *, struct Sprite *); +u8 sub_80901D4(struct MapObject *, struct Sprite *); +u8 sub_80901E8(struct MapObject *, struct Sprite *); +u8 sub_8090214(struct MapObject *, struct Sprite *); +u8 sub_8090258(struct MapObject *, struct Sprite *); +u8 sub_8090288(struct MapObject *, struct Sprite *); +u8 sub_8090314(struct MapObject *, struct Sprite *); +u8 sub_8090328(struct MapObject *, struct Sprite *); +u8 sub_8090354(struct MapObject *, struct Sprite *); +u8 sub_8090398(struct MapObject *, struct Sprite *); +u8 sub_80903C8(struct MapObject *, struct Sprite *); +u8 sub_8090454(struct MapObject *, struct Sprite *); +u8 sub_8090468(struct MapObject *, struct Sprite *); +u8 sub_8090494(struct MapObject *, struct Sprite *); +u8 sub_80904D8(struct MapObject *, struct Sprite *); +u8 sub_8090508(struct MapObject *, struct Sprite *); +u8 sub_8090594(struct MapObject *, struct Sprite *); +u8 sub_80905A8(struct MapObject *, struct Sprite *); +u8 sub_80905D4(struct MapObject *, struct Sprite *); +u8 sub_8090618(struct MapObject *, struct Sprite *); +u8 sub_8090648(struct MapObject *, struct Sprite *); +u8 sub_80906D4(struct MapObject *, struct Sprite *); +u8 sub_80906E8(struct MapObject *, struct Sprite *); +u8 sub_8090714(struct MapObject *, struct Sprite *); +u8 sub_8090758(struct MapObject *, struct Sprite *); +u8 sub_8090788(struct MapObject *, struct Sprite *); +u8 sub_8090814(struct MapObject *, struct Sprite *); +u8 sub_8090828(struct MapObject *, struct Sprite *); +u8 sub_8090854(struct MapObject *, struct Sprite *); +u8 sub_8090898(struct MapObject *, struct Sprite *); +u8 sub_80908C8(struct MapObject *, struct Sprite *); +u8 sub_8090954(struct MapObject *, struct Sprite *); +u8 sub_8090968(struct MapObject *, struct Sprite *); +u8 sub_8090994(struct MapObject *, struct Sprite *); +u8 sub_80909D8(struct MapObject *, struct Sprite *); +u8 sub_8090A08(struct MapObject *, struct Sprite *); +u8 sub_8090A94(struct MapObject *, struct Sprite *); +u8 sub_8090AA8(struct MapObject *, struct Sprite *); +u8 sub_8090AD4(struct MapObject *, struct Sprite *); +u8 sub_8090B18(struct MapObject *, struct Sprite *); +u8 sub_8090B48(struct MapObject *, struct Sprite *); +u8 sub_8090BD4(struct MapObject *, struct Sprite *); +u8 sub_8090BE8(struct MapObject *, struct Sprite *); +u8 sub_8090C14(struct MapObject *, struct Sprite *); +u8 sub_8090C58(struct MapObject *, struct Sprite *); +u8 sub_8090C88(struct MapObject *, struct Sprite *); +u8 sub_8090D14(struct MapObject *, struct Sprite *); +u8 sub_8090D40(struct MapObject *, struct Sprite *); +u8 sub_8090D64(struct MapObject *, struct Sprite *); +u8 sub_8090D90(struct MapObject *, struct Sprite *); +u8 sub_8090E18(struct MapObject *, struct Sprite *); +u8 sub_8090E44(struct MapObject *, struct Sprite *); +u8 sub_8090E68(struct MapObject *, struct Sprite *); +u8 sub_8090E94(struct MapObject *, struct Sprite *); +u8 sub_8090F1C(struct MapObject *, struct Sprite *); +u8 sub_8090F30(struct MapObject *, struct Sprite *); +u8 sub_8090F68(struct MapObject *, struct Sprite *); +u8 sub_8091020(struct MapObject *, struct Sprite *); +u8 sub_8091048(struct MapObject *, struct Sprite *); +u8 sub_809117C(struct MapObject *, struct Sprite *); +u8 sub_8091110(struct MapObject *, struct Sprite *); +u8 sub_8091208(struct MapObject *, struct Sprite *); +u8 sub_8091294(struct MapObject *, struct Sprite *); +u8 sub_8091320(struct MapObject *, struct Sprite *); +u8 sub_80913AC(struct MapObject *, struct Sprite *); +u8 sub_8091438(struct MapObject *, struct Sprite *); +u8 sub_80914C4(struct MapObject *, struct Sprite *); +u8 sub_8091550(struct MapObject *, struct Sprite *); +u8 sub_80915DC(struct MapObject *, struct Sprite *); +u8 sub_8091668(struct MapObject *, struct Sprite *); +u8 sub_80916F4(struct MapObject *, struct Sprite *); +u8 sub_8091780(struct MapObject *, struct Sprite *); +u8 sub_809180C(struct MapObject *, struct Sprite *); +u8 sub_8091898(struct MapObject *, struct Sprite *); +u8 sub_8091924(struct MapObject *, struct Sprite *); +u8 sub_80919B0(struct MapObject *, struct Sprite *); +u8 sub_8091A3C(struct MapObject *, struct Sprite *); +u8 sub_8091AC8(struct MapObject *, struct Sprite *); +u8 sub_8091B54(struct MapObject *, struct Sprite *); +u8 sub_8091BE0(struct MapObject *, struct Sprite *); +u8 sub_8091C6C(struct MapObject *, struct Sprite *); +u8 sub_8091CF8(struct MapObject *, struct Sprite *); +u8 sub_8091D84(struct MapObject *, struct Sprite *); +u8 sub_8091E10(struct MapObject *, struct Sprite *); +u8 mss_npc_reset_oampriv3_1_unk2_unk3(struct MapObject *, struct Sprite *); +u8 sub_8091EC0(struct MapObject *, struct Sprite *); +u8 sub_8091F20(struct MapObject *, struct Sprite *); +bool8 sub_8091F48(struct MapObject *, struct Sprite *, u8, bool8(u8)); +bool8 sub_8091F4C(struct MapObject *, struct Sprite *, u8, bool8(u8)); +bool8 sub_8091F94(struct MapObject *, struct Sprite *, u8, bool8(u8)); +bool8 sub_80920A4(struct MapObject *, struct Sprite *, u8, bool8(u8)); +bool8 sub_809215C(struct MapObject *, struct Sprite *, u8, bool8(u8)); +bool8 sub_8092214(struct MapObject *, struct Sprite *, u8, bool8(u8)); +bool8 cph_IM_DIFFERENT(struct MapObject *, struct Sprite *, u8, bool8(u8)); +bool8 sub_8092314(struct MapObject *, struct Sprite *, u8, bool8(u8)); +bool8 oac_hopping(struct MapObject *, struct Sprite *, u8, bool8(u8)); +u8 mss_08062EA4(struct MapObject *, struct Sprite *); +u8 sub_80926AC(struct MapObject *, struct Sprite *); +u8 sub_8092718(struct MapObject *, struct Sprite *); +u8 sub_80926B8(struct MapObject *, struct Sprite *); +u8 sub_8092788(struct MapObject *, struct Sprite *); +u8 sub_80927F8(struct MapObject *, struct Sprite *); +u8 sub_8092868(struct MapObject *, struct Sprite *); +u8 sub_80928D8(struct MapObject *, struct Sprite *); +u8 sub_809290C(struct MapObject *, struct Sprite *); +u8 sub_809292C(struct MapObject *, struct Sprite *); // Exported data declarations diff --git a/include/event_object_movement_helpers.h b/include/event_object_movement_helpers.h deleted file mode 100644 index 2e9f1d0cc3..0000000000 --- a/include/event_object_movement_helpers.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef GUARD_FIELD_MAP_OBJ_HELPERS_H -#define GUARD_FIELD_MAP_OBJ_HELPERS_H - -// Exported type declarations - -// Exported RAM declarations -extern u8 *gUnknown_020375B8; - -// Exported ROM declarations -void sub_8097AC8(struct Sprite *); -void npc_sync_anim_pause_bits(struct MapObject *); -void oamt_npc_ministep_reset(struct Sprite *, u8, u8); -u8 sub_8097F78(struct MapObject *); -bool8 obj_npc_ministep(struct Sprite *sprite); -bool8 sub_80976EC(struct Sprite *sprite); -void sub_80976DC(struct Sprite *, u8); -void sub_809783C(struct Sprite *, u8, u8, u8); -void DoShadowFieldEffect(struct MapObject *); -u8 sub_809785C(struct Sprite *); -u8 sub_80978E4(struct Sprite *); -void obj_anim_image_set_and_seek(struct Sprite *, u8, u8); -bool8 sub_80979BC(struct Sprite *); -void sub_8097750(struct Sprite *); -bool8 sub_8097758(struct Sprite *); -void sub_8097FA4(struct MapObject *); -void sub_8098044(u8); -void UnfreezeMapObjects(void); -void FreezeMapObjectsExceptOne(u8 mapObjectId); -void sub_8097B78(u8, u8); -void sub_8098074(u8 var1, u8 var2); -void FreezeMapObjects(void); -bool8 FreezeMapObject(struct MapObject *mapObject); - - -#endif //GUARD_FIELD_MAP_OBJ_HELPERS_H diff --git a/include/field_effect.h b/include/field_effect.h index 9cd26f6b8a..b613df9265 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -230,4 +230,7 @@ void sub_80B9C28(s16*, u8); void sub_80B9C54(s16*, u8); void sub_80B9CDC(s16*, u8); +void sub_80B7CAC(struct Sprite*); +void sub_80B7A58(struct Sprite*); + #endif //GUARD_FIELD_EFFECTS_H diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index faf6290e44..e7517acf17 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -18,5 +18,21 @@ void ash(s16, s16, u16, s16); void SetUpReflection(struct MapObject*, struct Sprite*, u8); u32 StartFieldEffectForEventObject(u8, struct MapObject*); u8 sub_81546C8(u8, u8, u8, s16, s16); +void sub_8155F80(struct Sprite*); +void oamc_shadow(struct Sprite*); +void unc_grass_normal(struct Sprite*); +void sub_81561D0(struct Sprite*); +void sub_8155460(struct Sprite*); +void sub_8155658(struct Sprite*); +void sub_8156194(struct Sprite*); +void sub_8154C60(struct Sprite*); +void sub_8154D90(struct Sprite*); +void unc_grass_tall(struct Sprite*); +void sub_81559BC(struct Sprite*); +void sub_8155C88(struct Sprite*); +void sub_8154A10(struct Sprite*); +void sub_8155158(struct Sprite*); +void sub_8155AEC(struct Sprite*); +void sub_8155E50(struct Sprite*); #endif //GUARD_FIELD_EFFECT_HELPERS_H diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index fa142e4fe1..68277812d4 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -286,6 +286,10 @@ enum DIR_NORTH, DIR_WEST, DIR_EAST, + DIR_SOUTHWEST, + DIR_SOUTHEAST, + DIR_NORTHWEST, + DIR_NORTHEAST, }; enum diff --git a/ld_script.txt b/ld_script.txt index bf8bfa7d5e..ec5e036fad 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -395,7 +395,6 @@ SECTIONS { src/metatile_behavior.o(.rodata); src/field_door.o(.rodata); data/field_player_avatar.o(.rodata); - data/event_object_movement.o(.rodata); src/event_object_movement.o(.rodata); data/map_obj_8097404.o(.rodata); src/text_window.o(.rodata); diff --git a/src/battle_setup.c b/src/battle_setup.c index a801367e95..bc79310258 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -32,7 +32,6 @@ #include "overworld.h" #include "field_weather.h" #include "gym_leader_rematch.h" -#include "event_object_movement_helpers.h" enum { diff --git a/src/data/field_event_obj/base_oam.h b/src/data/field_event_obj/base_oam.h new file mode 100755 index 0000000000..4558081e71 --- /dev/null +++ b/src/data/field_event_obj/base_oam.h @@ -0,0 +1,52 @@ +#ifndef GUARD_BASE_OAM_H +#define GUARD_BASE_OAM_H + +const struct OamData gFieldObjectBaseOam_8x8 = { + .shape = 0, + .size = 0, + .priority = 2 +}; + +const struct OamData gFieldObjectBaseOam_16x8 = { + .shape = 1, + .size = 0, + .priority = 2 +}; + +const struct OamData gFieldObjectBaseOam_16x16 = { + .shape = 0, + .size = 1, + .priority = 2 +}; + +const struct OamData gFieldObjectBaseOam_32x8 = { + .shape = 1, + .size = 1, + .priority = 2 +}; + +const struct OamData gFieldObjectBaseOam_64x32 = { + .shape = 1, + .size = 3, + .priority = 2 +}; + +const struct OamData gFieldObjectBaseOam_16x32 = { + .shape = 2, + .size = 2, + .priority = 2 +}; + +const struct OamData gFieldObjectBaseOam_32x32 = { + .shape = 0, + .size = 2, + .priority = 2 +}; + +const struct OamData gFieldObjectBaseOam_64x64 = { + .shape = 0, + .size = 3, + .priority = 2 +}; + +#endif //GUARD_BASE_OAM_H diff --git a/src/data/field_event_obj/berry_tree_graphics_tables.h b/src/data/field_event_obj/berry_tree_graphics_tables.h new file mode 100755 index 0000000000..9e899788ac --- /dev/null +++ b/src/data/field_event_obj/berry_tree_graphics_tables.h @@ -0,0 +1,570 @@ +#ifndef GUARD_BERRY_TREE_GRAPHICS_TABLES_H +#define GUARD_BERRY_TREE_GRAPHICS_TABLES_H + +const struct SpriteFrameImage gFieldObjectPicTable_PechaBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_PechaBerryTree_0), + obj_frame_tiles(gFieldObjectPic_PechaBerryTree_1), + obj_frame_tiles(gFieldObjectPic_PechaBerryTree_2), + obj_frame_tiles(gFieldObjectPic_PechaBerryTree_3), + obj_frame_tiles(gFieldObjectPic_PechaBerryTree_4), + obj_frame_tiles(gFieldObjectPic_PechaBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Pecha[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gFieldObjectPicTable_KelpsyBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_KelpsyBerryTree_0), + obj_frame_tiles(gFieldObjectPic_KelpsyBerryTree_1), + obj_frame_tiles(gFieldObjectPic_KelpsyBerryTree_2), + obj_frame_tiles(gFieldObjectPic_KelpsyBerryTree_3), + obj_frame_tiles(gFieldObjectPic_KelpsyBerryTree_4), + obj_frame_tiles(gFieldObjectPic_KelpsyBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Kelpsy[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gFieldObjectPicTable_WepearBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_WepearBerryTree_0), + obj_frame_tiles(gFieldObjectPic_WepearBerryTree_1), + obj_frame_tiles(gFieldObjectPic_WepearBerryTree_2), + obj_frame_tiles(gFieldObjectPic_WepearBerryTree_3), + obj_frame_tiles(gFieldObjectPic_WepearBerryTree_4), + obj_frame_tiles(gFieldObjectPic_WepearBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Wepear[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gFieldObjectPicTable_IapapaBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_IapapaBerryTree_0), + obj_frame_tiles(gFieldObjectPic_IapapaBerryTree_1), + obj_frame_tiles(gFieldObjectPic_IapapaBerryTree_2), + obj_frame_tiles(gFieldObjectPic_IapapaBerryTree_3), + obj_frame_tiles(gFieldObjectPic_IapapaBerryTree_4), + obj_frame_tiles(gFieldObjectPic_IapapaBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Iapapa[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gFieldObjectPicTable_CheriBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_CheriBerryTree_0), + obj_frame_tiles(gFieldObjectPic_CheriBerryTree_1), + obj_frame_tiles(gFieldObjectPic_CheriBerryTree_2), + obj_frame_tiles(gFieldObjectPic_CheriBerryTree_3), + obj_frame_tiles(gFieldObjectPic_CheriBerryTree_4), + obj_frame_tiles(gFieldObjectPic_CheriBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Cheri[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gFieldObjectPicTable_FigyBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_FigyBerryTree_0), + obj_frame_tiles(gFieldObjectPic_FigyBerryTree_1), + obj_frame_tiles(gFieldObjectPic_FigyBerryTree_2), + obj_frame_tiles(gFieldObjectPic_FigyBerryTree_3), + obj_frame_tiles(gFieldObjectPic_FigyBerryTree_4), + obj_frame_tiles(gFieldObjectPic_FigyBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Figy[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gFieldObjectPicTable_MagoBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_MagoBerryTree_0), + obj_frame_tiles(gFieldObjectPic_MagoBerryTree_1), + obj_frame_tiles(gFieldObjectPic_MagoBerryTree_2), + obj_frame_tiles(gFieldObjectPic_MagoBerryTree_3), + obj_frame_tiles(gFieldObjectPic_MagoBerryTree_4), + obj_frame_tiles(gFieldObjectPic_MagoBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Mago[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gFieldObjectPicTable_LumBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_LumBerryTree_0), + obj_frame_tiles(gFieldObjectPic_LumBerryTree_1), + obj_frame_tiles(gFieldObjectPic_LumBerryTree_2), + obj_frame_tiles(gFieldObjectPic_LumBerryTree_3), + obj_frame_tiles(gFieldObjectPic_LumBerryTree_4), + obj_frame_tiles(gFieldObjectPic_LumBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Lum[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gFieldObjectPicTable_RazzBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_RazzBerryTree_0), + obj_frame_tiles(gFieldObjectPic_RazzBerryTree_1), + obj_frame_tiles(gFieldObjectPic_RazzBerryTree_2), + obj_frame_tiles(gFieldObjectPic_RazzBerryTree_3), + obj_frame_tiles(gFieldObjectPic_RazzBerryTree_4), + obj_frame_tiles(gFieldObjectPic_RazzBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Razz[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gFieldObjectPicTable_GrepaBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_GrepaBerryTree_0), + obj_frame_tiles(gFieldObjectPic_GrepaBerryTree_1), + obj_frame_tiles(gFieldObjectPic_GrepaBerryTree_2), + obj_frame_tiles(gFieldObjectPic_GrepaBerryTree_3), + obj_frame_tiles(gFieldObjectPic_GrepaBerryTree_4), + obj_frame_tiles(gFieldObjectPic_GrepaBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Grepa[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gFieldObjectPicTable_RabutaBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_RabutaBerryTree_0), + obj_frame_tiles(gFieldObjectPic_RabutaBerryTree_1), + obj_frame_tiles(gFieldObjectPic_RabutaBerryTree_2), + obj_frame_tiles(gFieldObjectPic_RabutaBerryTree_3), + obj_frame_tiles(gFieldObjectPic_RabutaBerryTree_4), + obj_frame_tiles(gFieldObjectPic_RabutaBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Rabuta[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gFieldObjectPicTable_NomelBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_NomelBerryTree_0), + obj_frame_tiles(gFieldObjectPic_NomelBerryTree_1), + obj_frame_tiles(gFieldObjectPic_NomelBerryTree_2), + obj_frame_tiles(gFieldObjectPic_NomelBerryTree_3), + obj_frame_tiles(gFieldObjectPic_NomelBerryTree_4), + obj_frame_tiles(gFieldObjectPic_NomelBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Nomel[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gFieldObjectPicTable_LeppaBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_LeppaBerryTree_0), + obj_frame_tiles(gFieldObjectPic_LeppaBerryTree_1), + obj_frame_tiles(gFieldObjectPic_LeppaBerryTree_2), + obj_frame_tiles(gFieldObjectPic_LeppaBerryTree_3), + obj_frame_tiles(gFieldObjectPic_LeppaBerryTree_4), + obj_frame_tiles(gFieldObjectPic_LeppaBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Leppa[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gFieldObjectPicTable_LiechiBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_LiechiBerryTree_0), + obj_frame_tiles(gFieldObjectPic_LiechiBerryTree_1), + obj_frame_tiles(gFieldObjectPic_LiechiBerryTree_2), + obj_frame_tiles(gFieldObjectPic_LiechiBerryTree_3), + obj_frame_tiles(gFieldObjectPic_LiechiBerryTree_4), + obj_frame_tiles(gFieldObjectPic_LiechiBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Liechi[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gFieldObjectPicTable_HondewBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_HondewBerryTree_0), + obj_frame_tiles(gFieldObjectPic_HondewBerryTree_1), + obj_frame_tiles(gFieldObjectPic_HondewBerryTree_2), + obj_frame_tiles(gFieldObjectPic_HondewBerryTree_3), + obj_frame_tiles(gFieldObjectPic_HondewBerryTree_4), + obj_frame_tiles(gFieldObjectPic_HondewBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Hondew[] = {3, 4, 5, 5, 5}; + +const struct SpriteFrameImage gFieldObjectPicTable_AguavBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_AguavBerryTree_0), + obj_frame_tiles(gFieldObjectPic_AguavBerryTree_1), + obj_frame_tiles(gFieldObjectPic_AguavBerryTree_2), + obj_frame_tiles(gFieldObjectPic_AguavBerryTree_3), + obj_frame_tiles(gFieldObjectPic_AguavBerryTree_4), + obj_frame_tiles(gFieldObjectPic_AguavBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Aguav[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gFieldObjectPicTable_WikiBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_WikiBerryTree_0), + obj_frame_tiles(gFieldObjectPic_WikiBerryTree_1), + obj_frame_tiles(gFieldObjectPic_WikiBerryTree_2), + obj_frame_tiles(gFieldObjectPic_WikiBerryTree_3), + obj_frame_tiles(gFieldObjectPic_WikiBerryTree_4), + obj_frame_tiles(gFieldObjectPic_WikiBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Wiki[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gFieldObjectPicTable_PomegBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_PomegBerryTree_0), + obj_frame_tiles(gFieldObjectPic_PomegBerryTree_1), + obj_frame_tiles(gFieldObjectPic_PomegBerryTree_2), + obj_frame_tiles(gFieldObjectPic_PomegBerryTree_3), + obj_frame_tiles(gFieldObjectPic_PomegBerryTree_4), + obj_frame_tiles(gFieldObjectPic_PomegBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Pomeg[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gFieldObjectPicTable_RawstBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_RawstBerryTree_0), + obj_frame_tiles(gFieldObjectPic_RawstBerryTree_1), + obj_frame_tiles(gFieldObjectPic_RawstBerryTree_2), + obj_frame_tiles(gFieldObjectPic_RawstBerryTree_3), + obj_frame_tiles(gFieldObjectPic_RawstBerryTree_4), + obj_frame_tiles(gFieldObjectPic_RawstBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Rawst[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gFieldObjectPicTable_SpelonBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_SpelonBerryTree_0), + obj_frame_tiles(gFieldObjectPic_SpelonBerryTree_1), + obj_frame_tiles(gFieldObjectPic_SpelonBerryTree_2), + obj_frame_tiles(gFieldObjectPic_SpelonBerryTree_3), + obj_frame_tiles(gFieldObjectPic_SpelonBerryTree_4), + obj_frame_tiles(gFieldObjectPic_SpelonBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Spelon[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gFieldObjectPicTable_ChestoBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_ChestoBerryTree_0), + obj_frame_tiles(gFieldObjectPic_ChestoBerryTree_1), + obj_frame_tiles(gFieldObjectPic_ChestoBerryTree_2), + obj_frame_tiles(gFieldObjectPic_ChestoBerryTree_3), + obj_frame_tiles(gFieldObjectPic_ChestoBerryTree_4), + obj_frame_tiles(gFieldObjectPic_ChestoBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Chesto[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gFieldObjectPicTable_OranBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_OranBerryTree_0), + obj_frame_tiles(gFieldObjectPic_OranBerryTree_1), + obj_frame_tiles(gFieldObjectPic_OranBerryTree_2), + obj_frame_tiles(gFieldObjectPic_OranBerryTree_3), + obj_frame_tiles(gFieldObjectPic_OranBerryTree_4), + obj_frame_tiles(gFieldObjectPic_OranBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Oran[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gFieldObjectPicTable_PersimBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_PersimBerryTree_0), + obj_frame_tiles(gFieldObjectPic_PersimBerryTree_1), + obj_frame_tiles(gFieldObjectPic_PersimBerryTree_2), + obj_frame_tiles(gFieldObjectPic_PersimBerryTree_3), + obj_frame_tiles(gFieldObjectPic_PersimBerryTree_4), + obj_frame_tiles(gFieldObjectPic_PersimBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Persim[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gFieldObjectPicTable_SitrusBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_SitrusBerryTree_0), + obj_frame_tiles(gFieldObjectPic_SitrusBerryTree_1), + obj_frame_tiles(gFieldObjectPic_SitrusBerryTree_2), + obj_frame_tiles(gFieldObjectPic_SitrusBerryTree_3), + obj_frame_tiles(gFieldObjectPic_SitrusBerryTree_4), + obj_frame_tiles(gFieldObjectPic_SitrusBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Sitrus[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gFieldObjectPicTable_AspearBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_AspearBerryTree_0), + obj_frame_tiles(gFieldObjectPic_AspearBerryTree_1), + obj_frame_tiles(gFieldObjectPic_AspearBerryTree_2), + obj_frame_tiles(gFieldObjectPic_AspearBerryTree_3), + obj_frame_tiles(gFieldObjectPic_AspearBerryTree_4), + obj_frame_tiles(gFieldObjectPic_AspearBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Aspear[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gFieldObjectPicTable_PamtreBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_PamtreBerryTree_0), + obj_frame_tiles(gFieldObjectPic_PamtreBerryTree_1), + obj_frame_tiles(gFieldObjectPic_PamtreBerryTree_2), + obj_frame_tiles(gFieldObjectPic_PamtreBerryTree_3), + obj_frame_tiles(gFieldObjectPic_PamtreBerryTree_4), + obj_frame_tiles(gFieldObjectPic_PamtreBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Pamtre[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gFieldObjectPicTable_CornnBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_CornnBerryTree_0), + obj_frame_tiles(gFieldObjectPic_CornnBerryTree_1), + obj_frame_tiles(gFieldObjectPic_CornnBerryTree_2), + obj_frame_tiles(gFieldObjectPic_CornnBerryTree_3), + obj_frame_tiles(gFieldObjectPic_CornnBerryTree_4), + obj_frame_tiles(gFieldObjectPic_CornnBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Cornn[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gFieldObjectPicTable_LansatBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_LansatBerryTree_0), + obj_frame_tiles(gFieldObjectPic_LansatBerryTree_1), + obj_frame_tiles(gFieldObjectPic_LansatBerryTree_2), + obj_frame_tiles(gFieldObjectPic_LansatBerryTree_3), + obj_frame_tiles(gFieldObjectPic_LansatBerryTree_4), + obj_frame_tiles(gFieldObjectPic_LansatBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Lansat[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gFieldObjectPicTable_DurinBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_DurinBerryTree_0), + obj_frame_tiles(gFieldObjectPic_DurinBerryTree_1), + obj_frame_tiles(gFieldObjectPic_DurinBerryTree_2), + obj_frame_tiles(gFieldObjectPic_DurinBerryTree_3), + obj_frame_tiles(gFieldObjectPic_DurinBerryTree_4), + obj_frame_tiles(gFieldObjectPic_DurinBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Durin[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gFieldObjectPicTable_TamatoBerryTree[] = { + obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gFieldObjectPic_TamatoBerryTree_0), + obj_frame_tiles(gFieldObjectPic_TamatoBerryTree_1), + obj_frame_tiles(gFieldObjectPic_TamatoBerryTree_2), + obj_frame_tiles(gFieldObjectPic_TamatoBerryTree_3), + obj_frame_tiles(gFieldObjectPic_TamatoBerryTree_4), + obj_frame_tiles(gFieldObjectPic_TamatoBerryTree_5), +}; + +const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2}; + +const u8 gDeadBerryTreeFieldObjectGraphicsIdTable[] = {MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES, MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES, MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES, MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES, MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES}; + +const u8 gBerryTreeFieldObjectGraphicsIdTable[] = {MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES, MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES, MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES, MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES, MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES}; + +const struct SpriteFrameImage *const gBerryTreePicTablePointers[] = { + gFieldObjectPicTable_CheriBerryTree, + gFieldObjectPicTable_ChestoBerryTree, + gFieldObjectPicTable_PechaBerryTree, + gFieldObjectPicTable_RawstBerryTree, + gFieldObjectPicTable_AspearBerryTree, + gFieldObjectPicTable_LeppaBerryTree, + gFieldObjectPicTable_OranBerryTree, + gFieldObjectPicTable_PersimBerryTree, + gFieldObjectPicTable_LumBerryTree, + gFieldObjectPicTable_SitrusBerryTree, + gFieldObjectPicTable_FigyBerryTree, + gFieldObjectPicTable_WikiBerryTree, + gFieldObjectPicTable_MagoBerryTree, + gFieldObjectPicTable_AguavBerryTree, + gFieldObjectPicTable_IapapaBerryTree, + gFieldObjectPicTable_RazzBerryTree, + gFieldObjectPicTable_RazzBerryTree, + gFieldObjectPicTable_MagoBerryTree, + gFieldObjectPicTable_WepearBerryTree, + gFieldObjectPicTable_IapapaBerryTree, + gFieldObjectPicTable_PomegBerryTree, + gFieldObjectPicTable_KelpsyBerryTree, + gFieldObjectPicTable_WepearBerryTree, + gFieldObjectPicTable_HondewBerryTree, + gFieldObjectPicTable_GrepaBerryTree, + gFieldObjectPicTable_TamatoBerryTree, + gFieldObjectPicTable_CornnBerryTree, + gFieldObjectPicTable_PomegBerryTree, + gFieldObjectPicTable_RabutaBerryTree, + gFieldObjectPicTable_NomelBerryTree, + gFieldObjectPicTable_SpelonBerryTree, + gFieldObjectPicTable_PamtreBerryTree, + gFieldObjectPicTable_RabutaBerryTree, + gFieldObjectPicTable_DurinBerryTree, + gFieldObjectPicTable_HondewBerryTree, + gFieldObjectPicTable_LiechiBerryTree, + gFieldObjectPicTable_HondewBerryTree, + gFieldObjectPicTable_AguavBerryTree, + gFieldObjectPicTable_PomegBerryTree, + gFieldObjectPicTable_GrepaBerryTree, + gFieldObjectPicTable_LansatBerryTree, + gFieldObjectPicTable_CornnBerryTree, + gFieldObjectPicTable_DurinBerryTree, +}; + +const u8 *const gBerryTreePaletteSlotTablePointers[] = { + gBerryTreePaletteSlotTable_Cheri, + gBerryTreePaletteSlotTable_Chesto, + gBerryTreePaletteSlotTable_Pecha, + gBerryTreePaletteSlotTable_Rawst, + gBerryTreePaletteSlotTable_Aspear, + gBerryTreePaletteSlotTable_Leppa, + gBerryTreePaletteSlotTable_Oran, + gBerryTreePaletteSlotTable_Persim, + gBerryTreePaletteSlotTable_Lum, + gBerryTreePaletteSlotTable_Sitrus, + gBerryTreePaletteSlotTable_Figy, + gBerryTreePaletteSlotTable_Wiki, + gBerryTreePaletteSlotTable_Mago, + gBerryTreePaletteSlotTable_Aguav, + gBerryTreePaletteSlotTable_Iapapa, + gBerryTreePaletteSlotTable_Razz, + gBerryTreePaletteSlotTable_Razz, + gBerryTreePaletteSlotTable_Mago, + gBerryTreePaletteSlotTable_Wepear, + gBerryTreePaletteSlotTable_Iapapa, + gBerryTreePaletteSlotTable_Pomeg, + gBerryTreePaletteSlotTable_Kelpsy, + gBerryTreePaletteSlotTable_Wepear, + gBerryTreePaletteSlotTable_Hondew, + gBerryTreePaletteSlotTable_Grepa, + gBerryTreePaletteSlotTable_Tamato, + gBerryTreePaletteSlotTable_Cornn, + gBerryTreePaletteSlotTable_Pomeg, + gBerryTreePaletteSlotTable_Rabuta, + gBerryTreePaletteSlotTable_Nomel, + gBerryTreePaletteSlotTable_Spelon, + gBerryTreePaletteSlotTable_Pamtre, + gBerryTreePaletteSlotTable_Rabuta, + gBerryTreePaletteSlotTable_Durin, + gBerryTreePaletteSlotTable_Hondew, + gBerryTreePaletteSlotTable_Liechi, + gBerryTreePaletteSlotTable_Hondew, + gBerryTreePaletteSlotTable_Aguav, + gBerryTreePaletteSlotTable_Pomeg, + gBerryTreePaletteSlotTable_Grepa, + gBerryTreePaletteSlotTable_Lansat, + gBerryTreePaletteSlotTable_Cornn, + gBerryTreePaletteSlotTable_Durin, +}; + +const u8 *const gBerryTreeFieldObjectGraphicsIdTablePointers[] = { + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, + gBerryTreeFieldObjectGraphicsIdTable, +}; + + +#endif //GUARD_BERRY_TREE_GRAPHICS_TABLES_H diff --git a/src/data/field_event_obj/event_object_anims.h b/src/data/field_event_obj/event_object_anims.h new file mode 100755 index 0000000000..3857bf815d --- /dev/null +++ b/src/data/field_event_obj/event_object_anims.h @@ -0,0 +1,1176 @@ +#ifndef GUARD_EVENT_OBJECT_ANIMS_H +#define GUARD_EVENT_OBJECT_ANIMS_H + +const union AnimCmd gFieldObjectImageAnim_StayStill[] = +{ + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_QuintyPlumpFaceSouth[] = +{ + ANIMCMD_FRAME(0, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_QuintyPlumpFaceNorth[] = +{ + ANIMCMD_FRAME(1, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_QuintyPlumpFaceWest[] = +{ + ANIMCMD_FRAME(2, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_QuintyPlumpFaceEast[] = +{ + ANIMCMD_FRAME(2, 16, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoSouth[] = +{ + ANIMCMD_FRAME(3, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(3, 8, .hFlip = TRUE), + ANIMCMD_FRAME(0, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoNorth[] = +{ + ANIMCMD_FRAME(4, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(4, 8, .hFlip = TRUE), + ANIMCMD_FRAME(1, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoWest[] = +{ + ANIMCMD_FRAME(5, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(6, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoEast[] = +{ + ANIMCMD_FRAME(5, 8, .hFlip = TRUE), + ANIMCMD_FRAME(2, 8, .hFlip = TRUE), + ANIMCMD_FRAME(6, 8, .hFlip = TRUE), + ANIMCMD_FRAME(2, 8, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastSouth[] = +{ + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(3, 4, .hFlip = TRUE), + ANIMCMD_FRAME(0, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastNorth[] = +{ + ANIMCMD_FRAME(4, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(4, 4, .hFlip = TRUE), + ANIMCMD_FRAME(1, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastWest[] = +{ + ANIMCMD_FRAME(5, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(6, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastEast[] = +{ + ANIMCMD_FRAME(5, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_FRAME(6, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFasterSouth[] = +{ + ANIMCMD_FRAME(3, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(3, 2, .hFlip = TRUE), + ANIMCMD_FRAME(0, 2), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFasterNorth[] = +{ + ANIMCMD_FRAME(4, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(4, 2, .hFlip = TRUE), + ANIMCMD_FRAME(1, 2), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFasterWest[] = +{ + ANIMCMD_FRAME(5, 2), + ANIMCMD_FRAME(2, 2), + ANIMCMD_FRAME(6, 2), + ANIMCMD_FRAME(2, 2), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFasterEast[] = +{ + ANIMCMD_FRAME(5, 2, .hFlip = TRUE), + ANIMCMD_FRAME(2, 2, .hFlip = TRUE), + ANIMCMD_FRAME(6, 2, .hFlip = TRUE), + ANIMCMD_FRAME(2, 2, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastestSouth[] = +{ + ANIMCMD_FRAME(3, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(3, 1, .hFlip = TRUE), + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastestNorth[] = +{ + ANIMCMD_FRAME(4, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(4, 1, .hFlip = TRUE), + ANIMCMD_FRAME(1, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastestWest[] = +{ + ANIMCMD_FRAME(5, 1), + ANIMCMD_FRAME(2, 1), + ANIMCMD_FRAME(6, 1), + ANIMCMD_FRAME(2, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastestEast[] = +{ + ANIMCMD_FRAME(5, 1, .hFlip = TRUE), + ANIMCMD_FRAME(2, 1, .hFlip = TRUE), + ANIMCMD_FRAME(6, 1, .hFlip = TRUE), + ANIMCMD_FRAME(2, 1, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_FaceSouth[] = +{ + ANIMCMD_FRAME(0, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_FaceNorth[] = +{ + ANIMCMD_FRAME(1, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_FaceWest[] = +{ + ANIMCMD_FRAME(2, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_FaceEast[] = +{ + ANIMCMD_FRAME(2, 16, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_GoSouth[] = +{ + ANIMCMD_FRAME(3, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(4, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_GoNorth[] = +{ + ANIMCMD_FRAME(5, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(6, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_GoWest[] = +{ + ANIMCMD_FRAME(7, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(8, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_GoEast[] = +{ + ANIMCMD_FRAME(7, 8, .hFlip = TRUE), + ANIMCMD_FRAME(2, 8, .hFlip = TRUE), + ANIMCMD_FRAME(8, 8, .hFlip = TRUE), + ANIMCMD_FRAME(2, 8, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_GoFastSouth[] = +{ + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(4, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_GoFastNorth[] = +{ + ANIMCMD_FRAME(5, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(6, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_GoFastWest[] = +{ + ANIMCMD_FRAME(7, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(8, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_GoFastEast[] = +{ + ANIMCMD_FRAME(7, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_FRAME(8, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_GoFasterSouth[] = +{ + ANIMCMD_FRAME(3, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(4, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_GoFasterNorth[] = +{ + ANIMCMD_FRAME(5, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(6, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_GoFasterWest[] = +{ + ANIMCMD_FRAME(7, 2), + ANIMCMD_FRAME(2, 2), + ANIMCMD_FRAME(8, 2), + ANIMCMD_FRAME(2, 2), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_GoFasterEast[] = +{ + ANIMCMD_FRAME(7, 2, .hFlip = TRUE), + ANIMCMD_FRAME(2, 2, .hFlip = TRUE), + ANIMCMD_FRAME(8, 2, .hFlip = TRUE), + ANIMCMD_FRAME(2, 2, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_GoFastestSouth[] = +{ + ANIMCMD_FRAME(3, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(4, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_GoFastestNorth[] = +{ + ANIMCMD_FRAME(5, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(6, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_GoFastestWest[] = +{ + ANIMCMD_FRAME(7, 1), + ANIMCMD_FRAME(2, 1), + ANIMCMD_FRAME(8, 1), + ANIMCMD_FRAME(2, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_GoFastestEast[] = +{ + ANIMCMD_FRAME(7, 1, .hFlip = TRUE), + ANIMCMD_FRAME(2, 1, .hFlip = TRUE), + ANIMCMD_FRAME(8, 1, .hFlip = TRUE), + ANIMCMD_FRAME(2, 1, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_RunSouth[] = +{ + ANIMCMD_FRAME(12, 5), + ANIMCMD_FRAME(9, 3), + ANIMCMD_FRAME(13, 5), + ANIMCMD_FRAME(9, 3), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_RunNorth[] = +{ + ANIMCMD_FRAME(14, 5), + ANIMCMD_FRAME(10, 3), + ANIMCMD_FRAME(15, 5), + ANIMCMD_FRAME(10, 3), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_RunWest[] = +{ + ANIMCMD_FRAME(16, 5), + ANIMCMD_FRAME(11, 3), + ANIMCMD_FRAME(17, 5), + ANIMCMD_FRAME(11, 3), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_RunEast[] = +{ + ANIMCMD_FRAME(16, 5, .hFlip = TRUE), + ANIMCMD_FRAME(11, 3, .hFlip = TRUE), + ANIMCMD_FRAME(17, 5, .hFlip = TRUE), + ANIMCMD_FRAME(11, 3, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_FieldMove[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(4, 8), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_GetOnOffSurfBlobSouth[] = +{ + ANIMCMD_FRAME(9, 32), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_GetOnOffSurfBlobNorth[] = +{ + ANIMCMD_FRAME(10, 32), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_GetOnOffSurfBlobWest[] = +{ + ANIMCMD_FRAME(11, 32), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_GetOnOffSurfBlobEast[] = +{ + ANIMCMD_FRAME(11, 32, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_BunnyHoppyBackWheelSouth[] = +{ + ANIMCMD_FRAME(9, 4), + ANIMCMD_FRAME(10, 4), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_BunnyHoppyBackWheelNorth[] = +{ + ANIMCMD_FRAME(13, 4), + ANIMCMD_FRAME(14, 4), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_BunnyHoppyBackWheelWest[] = +{ + ANIMCMD_FRAME(17, 4), + ANIMCMD_FRAME(18, 4), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_BunnyHoppyBackWheelEast[] = +{ + ANIMCMD_FRAME(17, 4, .hFlip = TRUE), + ANIMCMD_FRAME(18, 4, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_BunnyHoppyFrontWheelSouth[] = +{ + ANIMCMD_FRAME(11, 4), + ANIMCMD_FRAME(12, 4), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_BunnyHoppyFrontWheelNorth[] = +{ + ANIMCMD_FRAME(15, 4), + ANIMCMD_FRAME(16, 4), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_BunnyHoppyFrontWheelWest[] = +{ + ANIMCMD_FRAME(19, 4), + ANIMCMD_FRAME(20, 4), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_BunnyHoppyFrontWheelEast[] = +{ + ANIMCMD_FRAME(19, 4, .hFlip = TRUE), + ANIMCMD_FRAME(20, 4, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_StandingWheelieBackWheelSouth[] = +{ + ANIMCMD_FRAME(9, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_StandingWheelieBackWheelNorth[] = +{ + ANIMCMD_FRAME(13, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_StandingWheelieBackWheelWest[] = +{ + ANIMCMD_FRAME(17, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_StandingWheelieBackWheelEast[] = +{ + ANIMCMD_FRAME(17, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_StandingWheelieFrontWheelSouth[] = +{ + ANIMCMD_FRAME(11, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_StandingWheelieFrontWheelNorth[] = +{ + ANIMCMD_FRAME(15, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_StandingWheelieFrontWheelWest[] = +{ + ANIMCMD_FRAME(19, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_StandingWheelieFrontWheelEast[] = +{ + ANIMCMD_FRAME(19, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_MovingWheelieSouth[] = +{ + ANIMCMD_FRAME(21, 4), + ANIMCMD_FRAME(10, 4), + ANIMCMD_FRAME(22, 4), + ANIMCMD_FRAME(10, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_MovingWheelieNorth[] = +{ + ANIMCMD_FRAME(23, 4), + ANIMCMD_FRAME(14, 4), + ANIMCMD_FRAME(24, 4), + ANIMCMD_FRAME(14, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_MovingWheelieWest[] = +{ + ANIMCMD_FRAME(25, 4), + ANIMCMD_FRAME(18, 4), + ANIMCMD_FRAME(26, 4), + ANIMCMD_FRAME(18, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_MovingWheelieEast[] = +{ + ANIMCMD_FRAME(25, 4, .hFlip = TRUE), + ANIMCMD_FRAME(18, 4, .hFlip = TRUE), + ANIMCMD_FRAME(26, 4, .hFlip = TRUE), + ANIMCMD_FRAME(18, 4, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_BerryTreeStage0[] = +{ + ANIMCMD_FRAME(0, 32), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_BerryTreeStage1[] = +{ + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(2, 32), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_BerryTreeStage2[] = +{ + ANIMCMD_FRAME(3, 48), + ANIMCMD_FRAME(4, 48), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_BerryTreeStage3[] = +{ + ANIMCMD_FRAME(5, 32), + ANIMCMD_FRAME(5, 32), + ANIMCMD_FRAME(6, 32), + ANIMCMD_FRAME(6, 32), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_BerryTreeStage4[] = +{ + ANIMCMD_FRAME(7, 48), + ANIMCMD_FRAME(7, 48), + ANIMCMD_FRAME(8, 48), + ANIMCMD_FRAME(8, 48), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_NurseBow[] = +{ + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(9, 32), + ANIMCMD_FRAME(0, 8), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_RockBreak[] = +{ + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(3, 8), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_TreeCut[] = +{ + ANIMCMD_FRAME(0, 6), + ANIMCMD_FRAME(1, 6), + ANIMCMD_FRAME(2, 6), + ANIMCMD_FRAME(3, 6), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_TakeOutRodSouth[] = +{ + ANIMCMD_FRAME(8, 4), + ANIMCMD_FRAME(9, 4), + ANIMCMD_FRAME(10, 4), + ANIMCMD_FRAME(11, 4), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_TakeOutRodNorth[] = +{ + ANIMCMD_FRAME(4, 4), + ANIMCMD_FRAME(5, 4), + ANIMCMD_FRAME(6, 4), + ANIMCMD_FRAME(7, 4), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_TakeOutRodWest[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(3, 4), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_TakeOutRodEast[] = +{ + ANIMCMD_FRAME(0, 4, .hFlip = TRUE), + ANIMCMD_FRAME(1, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_FRAME(3, 4, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_PutAwayRodSouth[] = +{ + ANIMCMD_FRAME(11, 4), + ANIMCMD_FRAME(10, 6), + ANIMCMD_FRAME(9, 6), + ANIMCMD_FRAME(8, 6), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_PutAwayRodNorth[] = +{ + ANIMCMD_FRAME(7, 4), + ANIMCMD_FRAME(6, 6), + ANIMCMD_FRAME(5, 6), + ANIMCMD_FRAME(4, 6), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_PutAwayRodWest[] = +{ + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_PutAwayRodEast[] = +{ + ANIMCMD_FRAME(3, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_FRAME(1, 4, .hFlip = TRUE), + ANIMCMD_FRAME(0, 4, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_HookedPokemonSouth[] = +{ + ANIMCMD_FRAME(10, 6), + ANIMCMD_FRAME(11, 6), + ANIMCMD_LOOP(1), + ANIMCMD_FRAME(11, 30), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_HookedPokemonNorth[] = +{ + ANIMCMD_FRAME(6, 6), + ANIMCMD_FRAME(7, 6), + ANIMCMD_LOOP(1), + ANIMCMD_FRAME(7, 30), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_HookedPokemonWest[] = +{ + ANIMCMD_FRAME(2, 6), + ANIMCMD_FRAME(3, 6), + ANIMCMD_LOOP(1), + ANIMCMD_FRAME(3, 30), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_HookedPokemonEast[] = +{ + ANIMCMD_FRAME(2, 6, .hFlip = TRUE), + ANIMCMD_FRAME(3, 6, .hFlip = TRUE), + ANIMCMD_LOOP(1), + ANIMCMD_FRAME(3, 30, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AffineAnimCmd gFieldObjectRotScalAnim_8508FD8[] = +{ + AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), + AFFINEANIMCMD_LOOP(7), + AFFINEANIMCMD_JUMP(0), +}; + +const union AffineAnimCmd gFieldObjectRotScalAnim_8509008[] = +{ + AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), + AFFINEANIMCMD_LOOP(15), + AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), + AFFINEANIMCMD_LOOP(15), + AFFINEANIMCMD_JUMP(0), +}; + +const union AffineAnimCmd gFieldObjectRotScalAnim_8509040[] = +{ + AFFINEANIMCMD_FRAME(0x100, 0x100, 10, 0), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gFieldObjectRotScalAnim_8509050[] = +{ + AFFINEANIMCMD_FRAME(0x100, 0x100, 10, 0), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gFieldObjectRotScalAnim_8509060[] = +{ + AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1), + AFFINEANIMCMD_LOOP(8), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gFieldObjectRotScalAnim_8509078[] = +{ + AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), + AFFINEANIMCMD_LOOP(8), + AFFINEANIMCMD_END, +}; + +const union AnimCmd gFieldObjectImageAnim_HoOhFlapWings[] = +{ + ANIMCMD_FRAME(3, 8), + ANIMCMD_FRAME(4, 8), + ANIMCMD_FRAME(3, 8), + ANIMCMD_FRAME(4, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_HoOhStayStill[] = +{ + ANIMCMD_FRAME(3, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd *const gFieldObjectImageAnimTable_Inanimate[] = { + gFieldObjectImageAnim_StayStill, +}; + +const union AnimCmd *const gFieldObjectImageAnimTable_QuintyPlump[] = { + gFieldObjectImageAnim_QuintyPlumpFaceSouth, + gFieldObjectImageAnim_QuintyPlumpFaceNorth, + gFieldObjectImageAnim_QuintyPlumpFaceWest, + gFieldObjectImageAnim_QuintyPlumpFaceEast, + gFieldObjectImageAnim_QuintyPlumpGoSouth, + gFieldObjectImageAnim_QuintyPlumpGoNorth, + gFieldObjectImageAnim_QuintyPlumpGoWest, + gFieldObjectImageAnim_QuintyPlumpGoEast, + gFieldObjectImageAnim_QuintyPlumpGoFastSouth, + gFieldObjectImageAnim_QuintyPlumpGoFastNorth, + gFieldObjectImageAnim_QuintyPlumpGoFastWest, + gFieldObjectImageAnim_QuintyPlumpGoFastEast, + gFieldObjectImageAnim_QuintyPlumpGoFasterSouth, + gFieldObjectImageAnim_QuintyPlumpGoFasterNorth, + gFieldObjectImageAnim_QuintyPlumpGoFasterWest, + gFieldObjectImageAnim_QuintyPlumpGoFasterEast, + gFieldObjectImageAnim_QuintyPlumpGoFastestSouth, + gFieldObjectImageAnim_QuintyPlumpGoFastestNorth, + gFieldObjectImageAnim_QuintyPlumpGoFastestWest, + gFieldObjectImageAnim_QuintyPlumpGoFastestEast, +}; + +const union AnimCmd *const gFieldObjectImageAnimTable_Standard[] = { + gFieldObjectImageAnim_FaceSouth, + gFieldObjectImageAnim_FaceNorth, + gFieldObjectImageAnim_FaceWest, + gFieldObjectImageAnim_FaceEast, + gFieldObjectImageAnim_GoSouth, + gFieldObjectImageAnim_GoNorth, + gFieldObjectImageAnim_GoWest, + gFieldObjectImageAnim_GoEast, + gFieldObjectImageAnim_GoFastSouth, + gFieldObjectImageAnim_GoFastNorth, + gFieldObjectImageAnim_GoFastWest, + gFieldObjectImageAnim_GoFastEast, + gFieldObjectImageAnim_GoFasterSouth, + gFieldObjectImageAnim_GoFasterNorth, + gFieldObjectImageAnim_GoFasterWest, + gFieldObjectImageAnim_GoFasterEast, + gFieldObjectImageAnim_GoFastestSouth, + gFieldObjectImageAnim_GoFastestNorth, + gFieldObjectImageAnim_GoFastestWest, + gFieldObjectImageAnim_GoFastestEast, +}; + +const union AnimCmd *const gFieldObjectImageAnimTable_HoOh[] = { + gFieldObjectImageAnim_FaceSouth, + gFieldObjectImageAnim_FaceNorth, + gFieldObjectImageAnim_FaceWest, + gFieldObjectImageAnim_FaceEast, + gFieldObjectImageAnim_HoOhFlapWings, + gFieldObjectImageAnim_HoOhStayStill, + gFieldObjectImageAnim_GoWest, + gFieldObjectImageAnim_GoEast, + gFieldObjectImageAnim_GoFastSouth, + gFieldObjectImageAnim_GoFastNorth, + gFieldObjectImageAnim_GoFastWest, + gFieldObjectImageAnim_GoFastEast, + gFieldObjectImageAnim_GoFasterSouth, + gFieldObjectImageAnim_GoFasterNorth, + gFieldObjectImageAnim_GoFasterWest, + gFieldObjectImageAnim_GoFasterEast, + gFieldObjectImageAnim_GoFastestSouth, + gFieldObjectImageAnim_GoFastestNorth, + gFieldObjectImageAnim_GoFastestWest, + gFieldObjectImageAnim_GoFastestEast, +}; + +const union AnimCmd *const gFieldObjectImageAnimTable_Groudon3[] = { + gFieldObjectImageAnim_FaceSouth, + gFieldObjectImageAnim_FaceNorth, + gFieldObjectImageAnim_FaceWest, + gFieldObjectImageAnim_FaceEast, + gFieldObjectImageAnim_GoSouth, + gFieldObjectImageAnim_GoEast, + gFieldObjectImageAnim_GoWest, + gFieldObjectImageAnim_GoEast, + gFieldObjectImageAnim_GoFastSouth, + gFieldObjectImageAnim_GoFastEast, + gFieldObjectImageAnim_GoFastWest, + gFieldObjectImageAnim_GoFastEast, + gFieldObjectImageAnim_GoFasterSouth, + gFieldObjectImageAnim_GoFasterEast, + gFieldObjectImageAnim_GoFasterWest, + gFieldObjectImageAnim_GoFasterEast, + gFieldObjectImageAnim_GoFastestSouth, + gFieldObjectImageAnim_GoFastestEast, + gFieldObjectImageAnim_GoFastestWest, + gFieldObjectImageAnim_GoFastestEast, +}; + +const union AnimCmd gFieldObjectImageAnim_85091F0[] = +{ + ANIMCMD_FRAME(1, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_85091F8[] = +{ + ANIMCMD_FRAME(4, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_8509200[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_8509208[] = +{ + ANIMCMD_FRAME(2, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_8509210[] = +{ + ANIMCMD_FRAME(3, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_8509218[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_8509220[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_8509228[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldObjectImageAnim_8509230[] = +{ + ANIMCMD_FRAME(3, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd *const gFieldObjectImageAnimTable_Rayquaza2[] = { + gFieldObjectImageAnim_8509218, + gFieldObjectImageAnim_8509220, + gFieldObjectImageAnim_8509228, + gFieldObjectImageAnim_8509230, + gFieldObjectImageAnim_8509200, + gFieldObjectImageAnim_85091F8, + gFieldObjectImageAnim_8509208, + gFieldObjectImageAnim_8509210, + gFieldObjectImageAnim_8509200, + gFieldObjectImageAnim_85091F8, + gFieldObjectImageAnim_85091F0, + gFieldObjectImageAnim_8509210, + gFieldObjectImageAnim_8509200, + gFieldObjectImageAnim_85091F8, + gFieldObjectImageAnim_8509208, + gFieldObjectImageAnim_8509210, + gFieldObjectImageAnim_8509200, + gFieldObjectImageAnim_85091F8, + gFieldObjectImageAnim_8509208, + gFieldObjectImageAnim_8509210, +}; + +const union AnimCmd *const gFieldObjectImageAnimTable_BrendanMayNormal[] = { + gFieldObjectImageAnim_FaceSouth, + gFieldObjectImageAnim_FaceNorth, + gFieldObjectImageAnim_FaceWest, + gFieldObjectImageAnim_FaceEast, + gFieldObjectImageAnim_GoSouth, + gFieldObjectImageAnim_GoNorth, + gFieldObjectImageAnim_GoWest, + gFieldObjectImageAnim_GoEast, + gFieldObjectImageAnim_GoFastSouth, + gFieldObjectImageAnim_GoFastNorth, + gFieldObjectImageAnim_GoFastWest, + gFieldObjectImageAnim_GoFastEast, + gFieldObjectImageAnim_GoFasterSouth, + gFieldObjectImageAnim_GoFasterNorth, + gFieldObjectImageAnim_GoFasterWest, + gFieldObjectImageAnim_GoFasterEast, + gFieldObjectImageAnim_GoFastestSouth, + gFieldObjectImageAnim_GoFastestNorth, + gFieldObjectImageAnim_GoFastestWest, + gFieldObjectImageAnim_GoFastestEast, + gFieldObjectImageAnim_RunSouth, + gFieldObjectImageAnim_RunNorth, + gFieldObjectImageAnim_RunWest, + gFieldObjectImageAnim_RunEast, +}; + +const union AnimCmd *const gFieldObjectImageAnimTable_AcroBike[] = { + gFieldObjectImageAnim_FaceSouth, + gFieldObjectImageAnim_FaceNorth, + gFieldObjectImageAnim_FaceWest, + gFieldObjectImageAnim_FaceEast, + gFieldObjectImageAnim_GoSouth, + gFieldObjectImageAnim_GoNorth, + gFieldObjectImageAnim_GoWest, + gFieldObjectImageAnim_GoEast, + gFieldObjectImageAnim_GoFastSouth, + gFieldObjectImageAnim_GoFastNorth, + gFieldObjectImageAnim_GoFastWest, + gFieldObjectImageAnim_GoFastEast, + gFieldObjectImageAnim_GoFasterSouth, + gFieldObjectImageAnim_GoFasterNorth, + gFieldObjectImageAnim_GoFasterWest, + gFieldObjectImageAnim_GoFasterEast, + gFieldObjectImageAnim_GoFastestSouth, + gFieldObjectImageAnim_GoFastestNorth, + gFieldObjectImageAnim_GoFastestWest, + gFieldObjectImageAnim_GoFastestEast, + gFieldObjectImageAnim_BunnyHoppyBackWheelSouth, + gFieldObjectImageAnim_BunnyHoppyBackWheelNorth, + gFieldObjectImageAnim_BunnyHoppyBackWheelWest, + gFieldObjectImageAnim_BunnyHoppyBackWheelEast, + gFieldObjectImageAnim_BunnyHoppyFrontWheelSouth, + gFieldObjectImageAnim_BunnyHoppyFrontWheelNorth, + gFieldObjectImageAnim_BunnyHoppyFrontWheelWest, + gFieldObjectImageAnim_BunnyHoppyFrontWheelEast, + gFieldObjectImageAnim_StandingWheelieBackWheelSouth, + gFieldObjectImageAnim_StandingWheelieBackWheelNorth, + gFieldObjectImageAnim_StandingWheelieBackWheelWest, + gFieldObjectImageAnim_StandingWheelieBackWheelEast, + gFieldObjectImageAnim_StandingWheelieFrontWheelSouth, + gFieldObjectImageAnim_StandingWheelieFrontWheelNorth, + gFieldObjectImageAnim_StandingWheelieFrontWheelWest, + gFieldObjectImageAnim_StandingWheelieFrontWheelEast, + gFieldObjectImageAnim_MovingWheelieSouth, + gFieldObjectImageAnim_MovingWheelieNorth, + gFieldObjectImageAnim_MovingWheelieWest, + gFieldObjectImageAnim_MovingWheelieEast, +}; + +const union AnimCmd *const gFieldObjectImageAnimTable_Surfing[] = { + gFieldObjectImageAnim_FaceSouth, + gFieldObjectImageAnim_FaceNorth, + gFieldObjectImageAnim_FaceWest, + gFieldObjectImageAnim_FaceEast, + gFieldObjectImageAnim_GoSouth, + gFieldObjectImageAnim_GoNorth, + gFieldObjectImageAnim_GoWest, + gFieldObjectImageAnim_GoEast, + gFieldObjectImageAnim_GoFastSouth, + gFieldObjectImageAnim_GoFastNorth, + gFieldObjectImageAnim_GoFastWest, + gFieldObjectImageAnim_GoFastEast, + gFieldObjectImageAnim_GoFasterSouth, + gFieldObjectImageAnim_GoFasterNorth, + gFieldObjectImageAnim_GoFasterWest, + gFieldObjectImageAnim_GoFasterEast, + gFieldObjectImageAnim_GoFastestSouth, + gFieldObjectImageAnim_GoFastestNorth, + gFieldObjectImageAnim_GoFastestWest, + gFieldObjectImageAnim_GoFastestEast, + gFieldObjectImageAnim_GetOnOffSurfBlobSouth, + gFieldObjectImageAnim_GetOnOffSurfBlobNorth, + gFieldObjectImageAnim_GetOnOffSurfBlobWest, + gFieldObjectImageAnim_GetOnOffSurfBlobEast, +}; + +const union AnimCmd *const gFieldObjectImageAnimTable_Nurse[] = { + gFieldObjectImageAnim_FaceSouth, + gFieldObjectImageAnim_FaceNorth, + gFieldObjectImageAnim_FaceWest, + gFieldObjectImageAnim_FaceEast, + gFieldObjectImageAnim_GoSouth, + gFieldObjectImageAnim_GoNorth, + gFieldObjectImageAnim_GoWest, + gFieldObjectImageAnim_GoEast, + gFieldObjectImageAnim_GoFastSouth, + gFieldObjectImageAnim_GoFastNorth, + gFieldObjectImageAnim_GoFastWest, + gFieldObjectImageAnim_GoFastEast, + gFieldObjectImageAnim_GoFasterSouth, + gFieldObjectImageAnim_GoFasterNorth, + gFieldObjectImageAnim_GoFasterWest, + gFieldObjectImageAnim_GoFasterEast, + gFieldObjectImageAnim_GoFastestSouth, + gFieldObjectImageAnim_GoFastestNorth, + gFieldObjectImageAnim_GoFastestWest, + gFieldObjectImageAnim_GoFastestEast, + gFieldObjectImageAnim_NurseBow, +}; + +const union AnimCmd *const gFieldObjectImageAnimTable_FieldMove[] = { + gFieldObjectImageAnim_FieldMove, +}; + +const union AnimCmd *const gFieldObjectImageAnimTable_BerryTree[] = { + gFieldObjectImageAnim_BerryTreeStage0, + gFieldObjectImageAnim_BerryTreeStage1, + gFieldObjectImageAnim_BerryTreeStage2, + gFieldObjectImageAnim_BerryTreeStage3, + gFieldObjectImageAnim_BerryTreeStage4, +}; + +const union AnimCmd *const gFieldObjectImageAnimTable_BreakableRock[] = { + gFieldObjectImageAnim_StayStill, + gFieldObjectImageAnim_RockBreak, +}; + +const union AnimCmd *const gFieldObjectImageAnimTable_CuttableTree[] = { + gFieldObjectImageAnim_StayStill, + gFieldObjectImageAnim_TreeCut, +}; + +const union AnimCmd *const gFieldObjectImageAnimTable_Fishing[] = { + gFieldObjectImageAnim_TakeOutRodSouth, + gFieldObjectImageAnim_TakeOutRodNorth, + gFieldObjectImageAnim_TakeOutRodWest, + gFieldObjectImageAnim_TakeOutRodEast, + gFieldObjectImageAnim_PutAwayRodSouth, + gFieldObjectImageAnim_PutAwayRodNorth, + gFieldObjectImageAnim_PutAwayRodWest, + gFieldObjectImageAnim_PutAwayRodEast, + gFieldObjectImageAnim_HookedPokemonSouth, + gFieldObjectImageAnim_HookedPokemonNorth, + gFieldObjectImageAnim_HookedPokemonWest, + gFieldObjectImageAnim_HookedPokemonEast, +}; + +const union AffineAnimCmd *const gFieldObjectRotScalAnimTable_KyogreGroudon[] = { + gFieldObjectRotScalAnim_8508FD8, + gFieldObjectRotScalAnim_8509008, + gFieldObjectRotScalAnim_8509050, + gFieldObjectRotScalAnim_8509040, + gFieldObjectRotScalAnim_8509078, + gFieldObjectRotScalAnim_8509060, +}; + +const struct UnkStruct_085094AC gUnknown_085094AC[] = { + { + .anims = gFieldObjectImageAnimTable_QuintyPlump, + .animPos = {1, 3, 0, 2}, + }, + { + .anims = gFieldObjectImageAnimTable_Standard, + .animPos = {1, 3, 0, 2}, + }, + { + .anims = gFieldObjectImageAnimTable_BrendanMayNormal, + .animPos = {1, 3, 0, 2}, + }, + { + .anims = gFieldObjectImageAnimTable_AcroBike, + .animPos = {1, 3, 0, 2}, + }, + { + .anims = gFieldObjectImageAnimTable_Surfing, + .animPos = {1, 3, 0, 2}, + }, + { + .anims = gFieldObjectImageAnimTable_Nurse, + .animPos = {1, 3, 0, 2}, + }, + { + .anims = gFieldObjectImageAnimTable_Fishing, + .animPos = {1, 3, 0, 2}, + }, + { + NULL, + {0, 0, 0, 0}, + }, +}; + +#endif //GUARD_EVENT_OBJECT_ANIMS_H diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h new file mode 100755 index 0000000000..9a9f096a21 --- /dev/null +++ b/src/data/field_event_obj/event_object_graphics.h @@ -0,0 +1,1667 @@ +#ifndef GUARD_EVENT_OBJECT_GFX_H +#define GUARD_EVENT_OBJECT_GFX_H + +const u32 gFieldObjectPic_BrendanNormal_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/00.4bpp"); +const u32 gFieldObjectPic_BrendanNormal_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/01.4bpp"); +const u32 gFieldObjectPic_BrendanNormal_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/02.4bpp"); +const u32 gFieldObjectPic_BrendanNormal_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/03.4bpp"); +const u32 gFieldObjectPic_BrendanNormal_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/04.4bpp"); +const u32 gFieldObjectPic_BrendanNormal_5[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/05.4bpp"); +const u32 gFieldObjectPic_BrendanNormal_6[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/06.4bpp"); +const u32 gFieldObjectPic_BrendanNormal_7[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/07.4bpp"); +const u32 gFieldObjectPic_BrendanNormal_8[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/08.4bpp"); +const u32 gFieldObjectPic_BrendanNormal_9[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/09.4bpp"); +const u32 gFieldObjectPic_BrendanNormal_10[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/10.4bpp"); +const u32 gFieldObjectPic_BrendanNormal_11[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/11.4bpp"); +const u32 gFieldObjectPic_BrendanNormal_12[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/12.4bpp"); +const u32 gFieldObjectPic_BrendanNormal_13[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/13.4bpp"); +const u32 gFieldObjectPic_BrendanNormal_14[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/14.4bpp"); +const u32 gFieldObjectPic_BrendanNormal_15[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/15.4bpp"); +const u32 gFieldObjectPic_BrendanNormal_16[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/16.4bpp"); +const u32 gFieldObjectPic_BrendanNormal_17[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/17.4bpp"); +const u16 gFieldObjectPalette8[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_08.gbapal"); +const u32 gFieldObjectPic_RubySapphireBrendan_0[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/00.4bpp"); +const u32 gFieldObjectPic_RubySapphireBrendan_1[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/01.4bpp"); +const u32 gFieldObjectPic_RubySapphireBrendan_2[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/02.4bpp"); +const u32 gFieldObjectPic_RubySapphireBrendan_3[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/03.4bpp"); +const u32 gFieldObjectPic_RubySapphireBrendan_4[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/04.4bpp"); +const u32 gFieldObjectPic_RubySapphireBrendan_5[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/05.4bpp"); +const u32 gFieldObjectPic_RubySapphireBrendan_6[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/06.4bpp"); +const u32 gFieldObjectPic_RubySapphireBrendan_7[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/07.4bpp"); +const u32 gFieldObjectPic_RubySapphireBrendan_8[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/08.4bpp"); +const u32 gFieldObjectPic_RubySapphireBrendan_9[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/09.4bpp"); +const u32 gFieldObjectPic_RubySapphireBrendan_10[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/10.4bpp"); +const u32 gFieldObjectPic_RubySapphireBrendan_11[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/11.4bpp"); +const u32 gFieldObjectPic_RubySapphireBrendan_12[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/12.4bpp"); +const u32 gFieldObjectPic_RubySapphireBrendan_13[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/13.4bpp"); +const u32 gFieldObjectPic_RubySapphireBrendan_14[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/14.4bpp"); +const u32 gFieldObjectPic_RubySapphireBrendan_15[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/15.4bpp"); +const u32 gFieldObjectPic_RubySapphireBrendan_16[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/16.4bpp"); +const u32 gFieldObjectPic_RubySapphireBrendan_17[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/17.4bpp"); +const u16 gFieldObjectPalette33[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_33.gbapal"); +const u16 NullPalette_8499A38[16] = {}; +const u16 NullPalette_8499A58[16] = {}; +const u16 NullPalette_8499A78[16] = {}; +const u16 NullPalette_8499A98[16] = {}; +const u16 NullPalette_8499AB8[16] = {}; +const u16 NullPalette_8499AD8[16] = {}; +const u16 NullPalette_8499AF8[16] = {}; +const u16 NullPalette_8499B18[16] = {}; +const u16 NullPalette_8499B38[16] = {}; +const u16 NullPalette_8499B58[16] = {}; +const u16 NullPalette_8499B78[16] = {}; +const u16 NullPalette_8499B98[16] = {}; +const u16 NullPalette_8499BB8[16] = {}; +const u16 NullPalette_8499BD8[16] = {}; +const u16 NullPalette_8499BF8[16] = {}; +const u16 gFieldObjectPalette9[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_09.gbapal"); +const u16 gFieldObjectPalette10[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_10.gbapal"); +const u32 gFieldObjectPic_BrendanFieldMove_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/field_move/0.4bpp"); +const u32 gFieldObjectPic_BrendanFieldMove_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/field_move/1.4bpp"); +const u32 gFieldObjectPic_BrendanFieldMove_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/field_move/2.4bpp"); +const u32 gFieldObjectPic_BrendanFieldMove_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/field_move/3.4bpp"); +const u32 gFieldObjectPic_BrendanFieldMove_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/field_move/4.4bpp"); +const u32 gFieldObjectPic_BrendanSurfing_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/surfing/0.4bpp"); +const u32 gFieldObjectPic_BrendanSurfing_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/surfing/3.4bpp"); +const u32 gFieldObjectPic_BrendanSurfing_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/surfing/1.4bpp"); +const u32 gFieldObjectPic_BrendanSurfing_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/surfing/4.4bpp"); +const u32 gFieldObjectPic_BrendanSurfing_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/surfing/2.4bpp"); +const u32 gFieldObjectPic_BrendanSurfing_5[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/surfing/5.4bpp"); +const u32 gFieldObjectPic_BrendanMachBike_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/0.4bpp"); +const u32 gFieldObjectPic_BrendanMachBike_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/1.4bpp"); +const u32 gFieldObjectPic_BrendanMachBike_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/2.4bpp"); +const u32 gFieldObjectPic_BrendanMachBike_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/3.4bpp"); +const u32 gFieldObjectPic_BrendanMachBike_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/4.4bpp"); +const u32 gFieldObjectPic_BrendanMachBike_5[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/5.4bpp"); +const u32 gFieldObjectPic_BrendanMachBike_6[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/6.4bpp"); +const u32 gFieldObjectPic_BrendanMachBike_7[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/7.4bpp"); +const u32 gFieldObjectPic_BrendanMachBike_8[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/8.4bpp"); +const u32 gFieldObjectPic_BrendanAcroBike_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/00.4bpp"); +const u32 gFieldObjectPic_BrendanAcroBike_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/01.4bpp"); +const u32 gFieldObjectPic_BrendanAcroBike_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/02.4bpp"); +const u32 gFieldObjectPic_BrendanAcroBike_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/03.4bpp"); +const u32 gFieldObjectPic_BrendanAcroBike_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/04.4bpp"); +const u32 gFieldObjectPic_BrendanAcroBike_5[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/05.4bpp"); +const u32 gFieldObjectPic_BrendanAcroBike_6[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/06.4bpp"); +const u32 gFieldObjectPic_BrendanAcroBike_7[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/07.4bpp"); +const u32 gFieldObjectPic_BrendanAcroBike_8[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/08.4bpp"); +const u32 gFieldObjectPic_BrendanAcroBike_9[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/09.4bpp"); +const u32 gFieldObjectPic_BrendanAcroBike_10[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/10.4bpp"); +const u32 gFieldObjectPic_BrendanAcroBike_11[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/11.4bpp"); +const u32 gFieldObjectPic_BrendanAcroBike_12[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/12.4bpp"); +const u32 gFieldObjectPic_BrendanAcroBike_13[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/13.4bpp"); +const u32 gFieldObjectPic_BrendanAcroBike_14[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/14.4bpp"); +const u32 gFieldObjectPic_BrendanAcroBike_15[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/15.4bpp"); +const u32 gFieldObjectPic_BrendanAcroBike_16[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/16.4bpp"); +const u32 gFieldObjectPic_BrendanAcroBike_17[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/17.4bpp"); +const u32 gFieldObjectPic_BrendanAcroBike_18[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/18.4bpp"); +const u32 gFieldObjectPic_BrendanAcroBike_19[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/19.4bpp"); +const u32 gFieldObjectPic_BrendanAcroBike_20[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/20.4bpp"); +const u32 gFieldObjectPic_BrendanAcroBike_21[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/21.4bpp"); +const u32 gFieldObjectPic_BrendanAcroBike_22[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/22.4bpp"); +const u32 gFieldObjectPic_BrendanAcroBike_23[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/23.4bpp"); +const u32 gFieldObjectPic_BrendanAcroBike_24[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/24.4bpp"); +const u32 gFieldObjectPic_BrendanAcroBike_25[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/25.4bpp"); +const u32 gFieldObjectPic_BrendanAcroBike_26[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/26.4bpp"); +const u32 gFieldObjectPic_BrendanFishing_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/00.4bpp"); +const u32 gFieldObjectPic_BrendanFishing_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/01.4bpp"); +const u32 gFieldObjectPic_BrendanFishing_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/02.4bpp"); +const u32 gFieldObjectPic_BrendanFishing_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/03.4bpp"); +const u32 gFieldObjectPic_BrendanFishing_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/04.4bpp"); +const u32 gFieldObjectPic_BrendanFishing_5[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/05.4bpp"); +const u32 gFieldObjectPic_BrendanFishing_6[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/06.4bpp"); +const u32 gFieldObjectPic_BrendanFishing_7[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/07.4bpp"); +const u32 gFieldObjectPic_BrendanFishing_8[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/08.4bpp"); +const u32 gFieldObjectPic_BrendanFishing_9[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/09.4bpp"); +const u32 gFieldObjectPic_BrendanFishing_10[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/10.4bpp"); +const u32 gFieldObjectPic_BrendanFishing_11[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/11.4bpp"); +const u32 gFieldObjectPic_BrendanWatering_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/watering/0.4bpp"); +const u32 gFieldObjectPic_BrendanWatering_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/watering/3.4bpp"); +const u32 gFieldObjectPic_BrendanWatering_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/watering/1.4bpp"); +const u32 gFieldObjectPic_BrendanWatering_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/watering/4.4bpp"); +const u32 gFieldObjectPic_BrendanWatering_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/watering/2.4bpp"); +const u32 gFieldObjectPic_BrendanWatering_5[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/watering/5.4bpp"); +const u32 gFieldObjectPic_BrendanDecorating[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/decorating.4bpp"); +const u32 gFieldObjectPic_MayDecorating[] = INCBIN_U32("graphics/map_objects/pics/people/may/decorating.4bpp"); +const u32 gFieldObjectPic_BrendanUnderwater_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/underwater/0.4bpp"); +const u32 gFieldObjectPic_BrendanUnderwater_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/underwater/1.4bpp"); +const u32 gFieldObjectPic_BrendanUnderwater_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/underwater/2.4bpp"); +const u32 gFieldObjectPic_BrendanUnderwater_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/underwater/3.4bpp"); +const u32 gFieldObjectPic_MayUnderwater_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/underwater/0.4bpp"); +const u32 gFieldObjectPic_MayUnderwater_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/underwater/1.4bpp"); +const u32 gFieldObjectPic_MayUnderwater_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/underwater/2.4bpp"); +const u32 gFieldObjectPic_MayUnderwater_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/underwater/3.4bpp"); +const u16 gFieldObjectPalette11[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_11.gbapal"); +const u32 gFieldObjectPic_MayNormal_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/00.4bpp"); +const u32 gFieldObjectPic_MayNormal_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/01.4bpp"); +const u32 gFieldObjectPic_MayNormal_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/02.4bpp"); +const u32 gFieldObjectPic_MayNormal_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/03.4bpp"); +const u32 gFieldObjectPic_MayNormal_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/04.4bpp"); +const u32 gFieldObjectPic_MayNormal_5[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/05.4bpp"); +const u32 gFieldObjectPic_MayNormal_6[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/06.4bpp"); +const u32 gFieldObjectPic_MayNormal_7[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/07.4bpp"); +const u32 gFieldObjectPic_MayNormal_8[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/08.4bpp"); +const u32 gFieldObjectPic_MayNormal_9[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/09.4bpp"); +const u32 gFieldObjectPic_MayNormal_10[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/10.4bpp"); +const u32 gFieldObjectPic_MayNormal_11[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/11.4bpp"); +const u32 gFieldObjectPic_MayNormal_12[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/12.4bpp"); +const u32 gFieldObjectPic_MayNormal_13[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/13.4bpp"); +const u32 gFieldObjectPic_MayNormal_14[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/14.4bpp"); +const u32 gFieldObjectPic_MayNormal_15[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/15.4bpp"); +const u32 gFieldObjectPic_MayNormal_16[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/16.4bpp"); +const u32 gFieldObjectPic_MayNormal_17[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/17.4bpp"); +const u16 gFieldObjectPalette17[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_17.gbapal"); +const u16 gFieldObjectPalette18[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_18.gbapal"); +const u32 gFieldObjectPic_RubySapphireMay_0[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/00.4bpp"); +const u32 gFieldObjectPic_RubySapphireMay_1[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/01.4bpp"); +const u32 gFieldObjectPic_RubySapphireMay_2[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/02.4bpp"); +const u32 gFieldObjectPic_RubySapphireMay_3[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/03.4bpp"); +const u32 gFieldObjectPic_RubySapphireMay_4[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/04.4bpp"); +const u32 gFieldObjectPic_RubySapphireMay_5[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/05.4bpp"); +const u32 gFieldObjectPic_RubySapphireMay_6[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/06.4bpp"); +const u32 gFieldObjectPic_RubySapphireMay_7[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/07.4bpp"); +const u32 gFieldObjectPic_RubySapphireMay_8[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/08.4bpp"); +const u32 gFieldObjectPic_RubySapphireMay_9[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/09.4bpp"); +const u32 gFieldObjectPic_RubySapphireMay_10[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/10.4bpp"); +const u32 gFieldObjectPic_RubySapphireMay_11[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/11.4bpp"); +const u32 gFieldObjectPic_RubySapphireMay_12[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/12.4bpp"); +const u32 gFieldObjectPic_RubySapphireMay_13[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/13.4bpp"); +const u32 gFieldObjectPic_RubySapphireMay_14[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/14.4bpp"); +const u32 gFieldObjectPic_RubySapphireMay_15[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/15.4bpp"); +const u32 gFieldObjectPic_RubySapphireMay_16[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/16.4bpp"); +const u32 gFieldObjectPic_RubySapphireMay_17[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/17.4bpp"); +const u16 gFieldObjectPalette34[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_34.gbapal"); +const u16 gUnusedFieldObjectPalette[] = INCBIN_U16("graphics/map_objects/palettes/unused_palette.gbapal"); +const u16 NullPalette_84A54F8[16] = {}; +const u16 NullPalette_84A5518[16] = {}; +const u16 NullPalette_84A5538[16] = {}; +const u16 NullPalette_84A5558[16] = {}; +const u16 NullPalette_84A5578[16] = {}; +const u16 NullPalette_84A5598[16] = {}; +const u16 NullPalette_84A55B8[16] = {}; +const u16 NullPalette_84A55D8[16] = {}; +const u16 NullPalette_84A55F8[16] = {}; +const u16 NullPalette_84A5618[16] = {}; +const u16 NullPalette_84A5638[16] = {}; +const u16 NullPalette_84A5658[16] = {}; +const u16 NullPalette_84A5678[16] = {}; +const u16 NullPalette_84A5698[16] = {}; +const u32 gFieldObjectPic_MayMachBike_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/0.4bpp"); +const u32 gFieldObjectPic_MayMachBike_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/1.4bpp"); +const u32 gFieldObjectPic_MayMachBike_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/2.4bpp"); +const u32 gFieldObjectPic_MayMachBike_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/3.4bpp"); +const u32 gFieldObjectPic_MayMachBike_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/4.4bpp"); +const u32 gFieldObjectPic_MayMachBike_5[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/5.4bpp"); +const u32 gFieldObjectPic_MayMachBike_6[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/6.4bpp"); +const u32 gFieldObjectPic_MayMachBike_7[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/7.4bpp"); +const u32 gFieldObjectPic_MayMachBike_8[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/8.4bpp"); +const u32 gFieldObjectPic_MayAcroBike_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/00.4bpp"); +const u32 gFieldObjectPic_MayAcroBike_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/01.4bpp"); +const u32 gFieldObjectPic_MayAcroBike_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/02.4bpp"); +const u32 gFieldObjectPic_MayAcroBike_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/03.4bpp"); +const u32 gFieldObjectPic_MayAcroBike_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/04.4bpp"); +const u32 gFieldObjectPic_MayAcroBike_5[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/05.4bpp"); +const u32 gFieldObjectPic_MayAcroBike_6[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/06.4bpp"); +const u32 gFieldObjectPic_MayAcroBike_7[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/07.4bpp"); +const u32 gFieldObjectPic_MayAcroBike_8[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/08.4bpp"); +const u32 gFieldObjectPic_MayAcroBike_9[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/09.4bpp"); +const u32 gFieldObjectPic_MayAcroBike_10[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/10.4bpp"); +const u32 gFieldObjectPic_MayAcroBike_11[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/11.4bpp"); +const u32 gFieldObjectPic_MayAcroBike_12[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/12.4bpp"); +const u32 gFieldObjectPic_MayAcroBike_13[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/13.4bpp"); +const u32 gFieldObjectPic_MayAcroBike_14[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/14.4bpp"); +const u32 gFieldObjectPic_MayAcroBike_15[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/15.4bpp"); +const u32 gFieldObjectPic_MayAcroBike_16[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/16.4bpp"); +const u32 gFieldObjectPic_MayAcroBike_17[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/17.4bpp"); +const u32 gFieldObjectPic_MayAcroBike_18[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/18.4bpp"); +const u32 gFieldObjectPic_MayAcroBike_19[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/19.4bpp"); +const u32 gFieldObjectPic_MayAcroBike_20[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/20.4bpp"); +const u32 gFieldObjectPic_MayAcroBike_21[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/21.4bpp"); +const u32 gFieldObjectPic_MayAcroBike_22[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/22.4bpp"); +const u32 gFieldObjectPic_MayAcroBike_23[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/23.4bpp"); +const u32 gFieldObjectPic_MayAcroBike_24[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/24.4bpp"); +const u32 gFieldObjectPic_MayAcroBike_25[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/25.4bpp"); +const u32 gFieldObjectPic_MayAcroBike_26[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/26.4bpp"); +const u32 gFieldObjectPic_MaySurfing_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/surfing/0.4bpp"); +const u32 gFieldObjectPic_MaySurfing_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/surfing/3.4bpp"); +const u32 gFieldObjectPic_MaySurfing_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/surfing/1.4bpp"); +const u32 gFieldObjectPic_MaySurfing_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/surfing/4.4bpp"); +const u32 gFieldObjectPic_MaySurfing_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/surfing/2.4bpp"); +const u32 gFieldObjectPic_MaySurfing_5[] = INCBIN_U32("graphics/map_objects/pics/people/may/surfing/5.4bpp"); +const u32 gFieldObjectPic_MayFieldMove_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/field_move/0.4bpp"); +const u32 gFieldObjectPic_MayFieldMove_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/field_move/1.4bpp"); +const u32 gFieldObjectPic_MayFieldMove_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/field_move/2.4bpp"); +const u32 gFieldObjectPic_MayFieldMove_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/field_move/3.4bpp"); +const u32 gFieldObjectPic_MayFieldMove_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/field_move/4.4bpp"); +const u32 gFieldObjectPic_MayFishing_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/00.4bpp"); +const u32 gFieldObjectPic_MayFishing_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/01.4bpp"); +const u32 gFieldObjectPic_MayFishing_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/02.4bpp"); +const u32 gFieldObjectPic_MayFishing_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/03.4bpp"); +const u32 gFieldObjectPic_MayFishing_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/04.4bpp"); +const u32 gFieldObjectPic_MayFishing_5[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/05.4bpp"); +const u32 gFieldObjectPic_MayFishing_6[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/06.4bpp"); +const u32 gFieldObjectPic_MayFishing_7[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/07.4bpp"); +const u32 gFieldObjectPic_MayFishing_8[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/08.4bpp"); +const u32 gFieldObjectPic_MayFishing_9[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/09.4bpp"); +const u32 gFieldObjectPic_MayFishing_10[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/10.4bpp"); +const u32 gFieldObjectPic_MayFishing_11[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/11.4bpp"); +const u32 gFieldObjectPic_MayWatering_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/watering/0.4bpp"); +const u32 gFieldObjectPic_MayWatering_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/watering/3.4bpp"); +const u32 gFieldObjectPic_MayWatering_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/watering/1.4bpp"); +const u32 gFieldObjectPic_MayWatering_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/watering/4.4bpp"); +const u32 gFieldObjectPic_MayWatering_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/watering/2.4bpp"); +const u32 gFieldObjectPic_MayWatering_5[] = INCBIN_U32("graphics/map_objects/pics/people/may/watering/5.4bpp"); +const u16 gFieldObjectPalette0[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_00.gbapal"); +const u16 gFieldObjectPalette1[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_01.gbapal"); +const u16 gFieldObjectPalette2[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_02.gbapal"); +const u16 gFieldObjectPalette3[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_03.gbapal"); +const u16 gFieldObjectPalette4[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_04.gbapal"); +const u16 gFieldObjectPalette5[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_05.gbapal"); +const u16 gFieldObjectPalette6[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_06.gbapal"); +const u16 gFieldObjectPalette7[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_07.gbapal"); +const u32 gFieldObjectPic_LittleBoy1_0[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/0.4bpp"); +const u32 gFieldObjectPic_LittleBoy1_1[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/1.4bpp"); +const u32 gFieldObjectPic_LittleBoy1_2[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/2.4bpp"); +const u32 gFieldObjectPic_LittleBoy1_3[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/3.4bpp"); +const u32 gFieldObjectPic_LittleBoy1_4[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/4.4bpp"); +const u32 gFieldObjectPic_LittleBoy1_5[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/5.4bpp"); +const u32 gFieldObjectPic_LittleBoy1_6[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/6.4bpp"); +const u32 gFieldObjectPic_LittleBoy1_7[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/7.4bpp"); +const u32 gFieldObjectPic_LittleBoy1_8[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/8.4bpp"); +const u32 gFieldObjectPic_LittleGirl1_0[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/0.4bpp"); +const u32 gFieldObjectPic_LittleGirl1_1[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/1.4bpp"); +const u32 gFieldObjectPic_LittleGirl1_2[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/2.4bpp"); +const u32 gFieldObjectPic_LittleGirl1_3[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/3.4bpp"); +const u32 gFieldObjectPic_LittleGirl1_4[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/4.4bpp"); +const u32 gFieldObjectPic_LittleGirl1_5[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/5.4bpp"); +const u32 gFieldObjectPic_LittleGirl1_6[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/6.4bpp"); +const u32 gFieldObjectPic_LittleGirl1_7[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/7.4bpp"); +const u32 gFieldObjectPic_LittleGirl1_8[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/8.4bpp"); +const u32 gFieldObjectPic_Boy1_0[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/0.4bpp"); +const u32 gFieldObjectPic_Boy1_1[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/1.4bpp"); +const u32 gFieldObjectPic_Boy1_2[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/2.4bpp"); +const u32 gFieldObjectPic_Boy1_3[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/3.4bpp"); +const u32 gFieldObjectPic_Boy1_4[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/4.4bpp"); +const u32 gFieldObjectPic_Boy1_5[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/5.4bpp"); +const u32 gFieldObjectPic_Boy1_6[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/6.4bpp"); +const u32 gFieldObjectPic_Boy1_7[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/7.4bpp"); +const u32 gFieldObjectPic_Boy1_8[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/8.4bpp"); +const u32 gFieldObjectPic_Girl1_0[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/0.4bpp"); +const u32 gFieldObjectPic_Girl1_1[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/1.4bpp"); +const u32 gFieldObjectPic_Girl1_2[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/2.4bpp"); +const u32 gFieldObjectPic_Girl1_3[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/3.4bpp"); +const u32 gFieldObjectPic_Girl1_4[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/4.4bpp"); +const u32 gFieldObjectPic_Girl1_5[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/5.4bpp"); +const u32 gFieldObjectPic_Girl1_6[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/6.4bpp"); +const u32 gFieldObjectPic_Girl1_7[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/7.4bpp"); +const u32 gFieldObjectPic_Girl1_8[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/8.4bpp"); +const u32 gFieldObjectPic_Boy2_0[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/0.4bpp"); +const u32 gFieldObjectPic_Boy2_1[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/1.4bpp"); +const u32 gFieldObjectPic_Boy2_2[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/2.4bpp"); +const u32 gFieldObjectPic_Boy2_3[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/3.4bpp"); +const u32 gFieldObjectPic_Boy2_4[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/4.4bpp"); +const u32 gFieldObjectPic_Boy2_5[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/5.4bpp"); +const u32 gFieldObjectPic_Boy2_6[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/6.4bpp"); +const u32 gFieldObjectPic_Boy2_7[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/7.4bpp"); +const u32 gFieldObjectPic_Boy2_8[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/8.4bpp"); +const u32 gFieldObjectPic_Girl2_0[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/0.4bpp"); +const u32 gFieldObjectPic_Girl2_1[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/1.4bpp"); +const u32 gFieldObjectPic_Girl2_2[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/2.4bpp"); +const u32 gFieldObjectPic_Girl2_3[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/3.4bpp"); +const u32 gFieldObjectPic_Girl2_4[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/4.4bpp"); +const u32 gFieldObjectPic_Girl2_5[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/5.4bpp"); +const u32 gFieldObjectPic_Girl2_6[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/6.4bpp"); +const u32 gFieldObjectPic_Girl2_7[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/7.4bpp"); +const u32 gFieldObjectPic_Girl2_8[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/8.4bpp"); +const u32 gFieldObjectPic_LittleBoy2_0[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/0.4bpp"); +const u32 gFieldObjectPic_LittleBoy2_1[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/1.4bpp"); +const u32 gFieldObjectPic_LittleBoy2_2[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/2.4bpp"); +const u32 gFieldObjectPic_LittleBoy2_3[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/3.4bpp"); +const u32 gFieldObjectPic_LittleBoy2_4[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/4.4bpp"); +const u32 gFieldObjectPic_LittleBoy2_5[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/5.4bpp"); +const u32 gFieldObjectPic_LittleBoy2_6[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/6.4bpp"); +const u32 gFieldObjectPic_LittleBoy2_7[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/7.4bpp"); +const u32 gFieldObjectPic_LittleBoy2_8[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/8.4bpp"); +const u32 gFieldObjectPic_LittleGirl2_0[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/0.4bpp"); +const u32 gFieldObjectPic_LittleGirl2_1[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/1.4bpp"); +const u32 gFieldObjectPic_LittleGirl2_2[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/2.4bpp"); +const u32 gFieldObjectPic_LittleGirl2_3[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/3.4bpp"); +const u32 gFieldObjectPic_LittleGirl2_4[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/4.4bpp"); +const u32 gFieldObjectPic_LittleGirl2_5[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/5.4bpp"); +const u32 gFieldObjectPic_LittleGirl2_6[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/6.4bpp"); +const u32 gFieldObjectPic_LittleGirl2_7[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/7.4bpp"); +const u32 gFieldObjectPic_LittleGirl2_8[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/8.4bpp"); +const u32 gFieldObjectPic_Boy3_0[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/0.4bpp"); +const u32 gFieldObjectPic_Boy3_1[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/1.4bpp"); +const u32 gFieldObjectPic_Boy3_2[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/2.4bpp"); +const u32 gFieldObjectPic_Boy3_3[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/3.4bpp"); +const u32 gFieldObjectPic_Boy3_4[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/4.4bpp"); +const u32 gFieldObjectPic_Boy3_5[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/5.4bpp"); +const u32 gFieldObjectPic_Boy3_6[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/6.4bpp"); +const u32 gFieldObjectPic_Boy3_7[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/7.4bpp"); +const u32 gFieldObjectPic_Boy3_8[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/8.4bpp"); +const u32 gFieldObjectPic_Girl3_0[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/0.4bpp"); +const u32 gFieldObjectPic_Girl3_1[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/1.4bpp"); +const u32 gFieldObjectPic_Girl3_2[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/2.4bpp"); +const u32 gFieldObjectPic_Girl3_3[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/3.4bpp"); +const u32 gFieldObjectPic_Girl3_4[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/4.4bpp"); +const u32 gFieldObjectPic_Girl3_5[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/5.4bpp"); +const u32 gFieldObjectPic_Girl3_6[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/6.4bpp"); +const u32 gFieldObjectPic_Girl3_7[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/7.4bpp"); +const u32 gFieldObjectPic_Girl3_8[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/8.4bpp"); +const u32 gFieldObjectPic_Boy4_0[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/0.4bpp"); +const u32 gFieldObjectPic_Boy4_1[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/1.4bpp"); +const u32 gFieldObjectPic_Boy4_2[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/2.4bpp"); +const u32 gFieldObjectPic_Boy4_3[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/3.4bpp"); +const u32 gFieldObjectPic_Boy4_4[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/4.4bpp"); +const u32 gFieldObjectPic_Boy4_5[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/5.4bpp"); +const u32 gFieldObjectPic_Boy4_6[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/6.4bpp"); +const u32 gFieldObjectPic_Boy4_7[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/7.4bpp"); +const u32 gFieldObjectPic_Boy4_8[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/8.4bpp"); +const u32 gFieldObjectPic_Woman1_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/0.4bpp"); +const u32 gFieldObjectPic_Woman1_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/1.4bpp"); +const u32 gFieldObjectPic_Woman1_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/2.4bpp"); +const u32 gFieldObjectPic_Woman1_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/3.4bpp"); +const u32 gFieldObjectPic_Woman1_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/4.4bpp"); +const u32 gFieldObjectPic_Woman1_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/5.4bpp"); +const u32 gFieldObjectPic_Woman1_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/6.4bpp"); +const u32 gFieldObjectPic_Woman1_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/7.4bpp"); +const u32 gFieldObjectPic_Woman1_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/8.4bpp"); +const u32 gFieldObjectPic_FatMan_0[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/0.4bpp"); +const u32 gFieldObjectPic_FatMan_1[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/1.4bpp"); +const u32 gFieldObjectPic_FatMan_2[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/2.4bpp"); +const u32 gFieldObjectPic_FatMan_3[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/3.4bpp"); +const u32 gFieldObjectPic_FatMan_4[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/4.4bpp"); +const u32 gFieldObjectPic_FatMan_5[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/5.4bpp"); +const u32 gFieldObjectPic_FatMan_6[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/6.4bpp"); +const u32 gFieldObjectPic_FatMan_7[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/7.4bpp"); +const u32 gFieldObjectPic_FatMan_8[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/8.4bpp"); +const u32 gFieldObjectPic_Woman2_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/0.4bpp"); +const u32 gFieldObjectPic_Woman2_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/1.4bpp"); +const u32 gFieldObjectPic_Woman2_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/2.4bpp"); +const u32 gFieldObjectPic_Woman2_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/3.4bpp"); +const u32 gFieldObjectPic_Woman2_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/4.4bpp"); +const u32 gFieldObjectPic_Woman2_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/5.4bpp"); +const u32 gFieldObjectPic_Woman2_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/6.4bpp"); +const u32 gFieldObjectPic_Woman2_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/7.4bpp"); +const u32 gFieldObjectPic_Woman2_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/8.4bpp"); +const u32 gFieldObjectPic_Man1_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/0.4bpp"); +const u32 gFieldObjectPic_Man1_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/1.4bpp"); +const u32 gFieldObjectPic_Man1_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/2.4bpp"); +const u32 gFieldObjectPic_Man1_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/3.4bpp"); +const u32 gFieldObjectPic_Man1_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/4.4bpp"); +const u32 gFieldObjectPic_Man1_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/5.4bpp"); +const u32 gFieldObjectPic_Man1_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/6.4bpp"); +const u32 gFieldObjectPic_Man1_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/7.4bpp"); +const u32 gFieldObjectPic_Man1_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/8.4bpp"); +const u32 gFieldObjectPic_Woman3_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/0.4bpp"); +const u32 gFieldObjectPic_Woman3_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/1.4bpp"); +const u32 gFieldObjectPic_Woman3_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/2.4bpp"); +const u32 gFieldObjectPic_Woman3_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/3.4bpp"); +const u32 gFieldObjectPic_Woman3_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/4.4bpp"); +const u32 gFieldObjectPic_Woman3_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/5.4bpp"); +const u32 gFieldObjectPic_Woman3_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/6.4bpp"); +const u32 gFieldObjectPic_Woman3_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/7.4bpp"); +const u32 gFieldObjectPic_Woman3_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/8.4bpp"); +const u32 gFieldObjectPic_OldMan1_0[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/0.4bpp"); +const u32 gFieldObjectPic_OldMan1_1[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/1.4bpp"); +const u32 gFieldObjectPic_OldMan1_2[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/2.4bpp"); +const u32 gFieldObjectPic_OldMan1_3[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/3.4bpp"); +const u32 gFieldObjectPic_OldMan1_4[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/4.4bpp"); +const u32 gFieldObjectPic_OldMan1_5[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/5.4bpp"); +const u32 gFieldObjectPic_OldMan1_6[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/6.4bpp"); +const u32 gFieldObjectPic_OldMan1_7[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/7.4bpp"); +const u32 gFieldObjectPic_OldMan1_8[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/8.4bpp"); +const u32 gFieldObjectPic_OldWoman1_0[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/0.4bpp"); +const u32 gFieldObjectPic_OldWoman1_1[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/1.4bpp"); +const u32 gFieldObjectPic_OldWoman1_2[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/2.4bpp"); +const u32 gFieldObjectPic_OldWoman1_3[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/3.4bpp"); +const u32 gFieldObjectPic_OldWoman1_4[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/4.4bpp"); +const u32 gFieldObjectPic_OldWoman1_5[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/5.4bpp"); +const u32 gFieldObjectPic_OldWoman1_6[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/6.4bpp"); +const u32 gFieldObjectPic_OldWoman1_7[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/7.4bpp"); +const u32 gFieldObjectPic_OldWoman1_8[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/8.4bpp"); +const u32 gFieldObjectPic_Man2_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/0.4bpp"); +const u32 gFieldObjectPic_Man2_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/1.4bpp"); +const u32 gFieldObjectPic_Man2_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/2.4bpp"); +const u32 gFieldObjectPic_Man2_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/3.4bpp"); +const u32 gFieldObjectPic_Man2_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/4.4bpp"); +const u32 gFieldObjectPic_Man2_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/5.4bpp"); +const u32 gFieldObjectPic_Man2_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/6.4bpp"); +const u32 gFieldObjectPic_Man2_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/7.4bpp"); +const u32 gFieldObjectPic_Man2_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/8.4bpp"); +const u32 gFieldObjectPic_Woman4_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/0.4bpp"); +const u32 gFieldObjectPic_Woman4_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/1.4bpp"); +const u32 gFieldObjectPic_Woman4_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/2.4bpp"); +const u32 gFieldObjectPic_Woman4_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/3.4bpp"); +const u32 gFieldObjectPic_Woman4_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/4.4bpp"); +const u32 gFieldObjectPic_Woman4_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/5.4bpp"); +const u32 gFieldObjectPic_Woman4_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/6.4bpp"); +const u32 gFieldObjectPic_Woman4_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/7.4bpp"); +const u32 gFieldObjectPic_Woman4_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/8.4bpp"); +const u32 gFieldObjectPic_Man3_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/0.4bpp"); +const u32 gFieldObjectPic_Man3_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/1.4bpp"); +const u32 gFieldObjectPic_Man3_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/2.4bpp"); +const u32 gFieldObjectPic_Man3_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/3.4bpp"); +const u32 gFieldObjectPic_Man3_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/4.4bpp"); +const u32 gFieldObjectPic_Man3_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/5.4bpp"); +const u32 gFieldObjectPic_Man3_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/6.4bpp"); +const u32 gFieldObjectPic_Man3_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/7.4bpp"); +const u32 gFieldObjectPic_Man3_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/8.4bpp"); +const u32 gFieldObjectPic_Woman5_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/0.4bpp"); +const u32 gFieldObjectPic_Woman5_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/1.4bpp"); +const u32 gFieldObjectPic_Woman5_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/2.4bpp"); +const u32 gFieldObjectPic_Woman5_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/3.4bpp"); +const u32 gFieldObjectPic_Woman5_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/4.4bpp"); +const u32 gFieldObjectPic_Woman5_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/5.4bpp"); +const u32 gFieldObjectPic_Woman5_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/6.4bpp"); +const u32 gFieldObjectPic_Woman5_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/7.4bpp"); +const u32 gFieldObjectPic_Woman5_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/8.4bpp"); +const u32 gFieldObjectPic_Cook_0[] = INCBIN_U32("graphics/map_objects/pics/people/cook/0.4bpp"); +const u32 gFieldObjectPic_Cook_1[] = INCBIN_U32("graphics/map_objects/pics/people/cook/1.4bpp"); +const u32 gFieldObjectPic_Cook_2[] = INCBIN_U32("graphics/map_objects/pics/people/cook/2.4bpp"); +const u32 gFieldObjectPic_Woman6_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/0.4bpp"); +const u32 gFieldObjectPic_Woman6_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/1.4bpp"); +const u32 gFieldObjectPic_Woman6_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/2.4bpp"); +const u32 gFieldObjectPic_Woman6_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/3.4bpp"); +const u32 gFieldObjectPic_Woman6_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/4.4bpp"); +const u32 gFieldObjectPic_Woman6_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/5.4bpp"); +const u32 gFieldObjectPic_Woman6_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/6.4bpp"); +const u32 gFieldObjectPic_Woman6_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/7.4bpp"); +const u32 gFieldObjectPic_Woman6_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/8.4bpp"); +const u32 gFieldObjectPic_OldMan2_0[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_2/0.4bpp"); +const u32 gFieldObjectPic_OldMan2_1[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_2/1.4bpp"); +const u32 gFieldObjectPic_OldMan2_2[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_2/2.4bpp"); +const u32 gFieldObjectPic_OldWoman2_0[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/0.4bpp"); +const u32 gFieldObjectPic_OldWoman2_1[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/1.4bpp"); +const u32 gFieldObjectPic_OldWoman2_2[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/2.4bpp"); +const u32 gFieldObjectPic_OldWoman2_3[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/3.4bpp"); +const u32 gFieldObjectPic_OldWoman2_4[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/4.4bpp"); +const u32 gFieldObjectPic_OldWoman2_5[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/5.4bpp"); +const u32 gFieldObjectPic_OldWoman2_6[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/6.4bpp"); +const u32 gFieldObjectPic_OldWoman2_7[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/7.4bpp"); +const u32 gFieldObjectPic_OldWoman2_8[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/8.4bpp"); +const u32 gFieldObjectPic_Camper_0[] = INCBIN_U32("graphics/map_objects/pics/people/camper/0.4bpp"); +const u32 gFieldObjectPic_Camper_1[] = INCBIN_U32("graphics/map_objects/pics/people/camper/1.4bpp"); +const u32 gFieldObjectPic_Camper_2[] = INCBIN_U32("graphics/map_objects/pics/people/camper/2.4bpp"); +const u32 gFieldObjectPic_Camper_3[] = INCBIN_U32("graphics/map_objects/pics/people/camper/3.4bpp"); +const u32 gFieldObjectPic_Camper_4[] = INCBIN_U32("graphics/map_objects/pics/people/camper/4.4bpp"); +const u32 gFieldObjectPic_Camper_5[] = INCBIN_U32("graphics/map_objects/pics/people/camper/5.4bpp"); +const u32 gFieldObjectPic_Camper_6[] = INCBIN_U32("graphics/map_objects/pics/people/camper/6.4bpp"); +const u32 gFieldObjectPic_Camper_7[] = INCBIN_U32("graphics/map_objects/pics/people/camper/7.4bpp"); +const u32 gFieldObjectPic_Camper_8[] = INCBIN_U32("graphics/map_objects/pics/people/camper/8.4bpp"); +const u32 gFieldObjectPic_Picnicker_0[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/0.4bpp"); +const u32 gFieldObjectPic_Picnicker_1[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/1.4bpp"); +const u32 gFieldObjectPic_Picnicker_2[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/2.4bpp"); +const u32 gFieldObjectPic_Picnicker_3[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/3.4bpp"); +const u32 gFieldObjectPic_Picnicker_4[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/4.4bpp"); +const u32 gFieldObjectPic_Picnicker_5[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/5.4bpp"); +const u32 gFieldObjectPic_Picnicker_6[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/6.4bpp"); +const u32 gFieldObjectPic_Picnicker_7[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/7.4bpp"); +const u32 gFieldObjectPic_Picnicker_8[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/8.4bpp"); +const u32 gFieldObjectPic_Man4_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/0.4bpp"); +const u32 gFieldObjectPic_Man4_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/1.4bpp"); +const u32 gFieldObjectPic_Man4_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/2.4bpp"); +const u32 gFieldObjectPic_Man4_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/3.4bpp"); +const u32 gFieldObjectPic_Man4_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/4.4bpp"); +const u32 gFieldObjectPic_Man4_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/5.4bpp"); +const u32 gFieldObjectPic_Man4_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/6.4bpp"); +const u32 gFieldObjectPic_Man4_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/7.4bpp"); +const u32 gFieldObjectPic_Man4_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/8.4bpp"); +const u32 gFieldObjectPic_Woman7_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/0.4bpp"); +const u32 gFieldObjectPic_Woman7_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/1.4bpp"); +const u32 gFieldObjectPic_Woman7_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/2.4bpp"); +const u32 gFieldObjectPic_Woman7_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/3.4bpp"); +const u32 gFieldObjectPic_Woman7_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/4.4bpp"); +const u32 gFieldObjectPic_Woman7_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/5.4bpp"); +const u32 gFieldObjectPic_Woman7_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/6.4bpp"); +const u32 gFieldObjectPic_Woman7_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/7.4bpp"); +const u32 gFieldObjectPic_Woman7_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/8.4bpp"); +const u32 gFieldObjectPic_Youngster_0[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/0.4bpp"); +const u32 gFieldObjectPic_Youngster_1[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/1.4bpp"); +const u32 gFieldObjectPic_Youngster_2[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/2.4bpp"); +const u32 gFieldObjectPic_Youngster_3[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/3.4bpp"); +const u32 gFieldObjectPic_Youngster_4[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/4.4bpp"); +const u32 gFieldObjectPic_Youngster_5[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/5.4bpp"); +const u32 gFieldObjectPic_Youngster_6[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/6.4bpp"); +const u32 gFieldObjectPic_Youngster_7[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/7.4bpp"); +const u32 gFieldObjectPic_Youngster_8[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/8.4bpp"); +const u32 gFieldObjectPic_BugCatcher_0[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/0.4bpp"); +const u32 gFieldObjectPic_BugCatcher_1[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/1.4bpp"); +const u32 gFieldObjectPic_BugCatcher_2[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/2.4bpp"); +const u32 gFieldObjectPic_BugCatcher_3[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/3.4bpp"); +const u32 gFieldObjectPic_BugCatcher_4[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/4.4bpp"); +const u32 gFieldObjectPic_BugCatcher_5[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/5.4bpp"); +const u32 gFieldObjectPic_BugCatcher_6[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/6.4bpp"); +const u32 gFieldObjectPic_BugCatcher_7[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/7.4bpp"); +const u32 gFieldObjectPic_BugCatcher_8[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/8.4bpp"); +const u32 gFieldObjectPic_PsychicM_0[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/0.4bpp"); +const u32 gFieldObjectPic_PsychicM_1[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/1.4bpp"); +const u32 gFieldObjectPic_PsychicM_2[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/2.4bpp"); +const u32 gFieldObjectPic_PsychicM_3[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/3.4bpp"); +const u32 gFieldObjectPic_PsychicM_4[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/4.4bpp"); +const u32 gFieldObjectPic_PsychicM_5[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/5.4bpp"); +const u32 gFieldObjectPic_PsychicM_6[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/6.4bpp"); +const u32 gFieldObjectPic_PsychicM_7[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/7.4bpp"); +const u32 gFieldObjectPic_PsychicM_8[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/8.4bpp"); +const u32 gFieldObjectPic_SchoolKidM_0[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/0.4bpp"); +const u32 gFieldObjectPic_SchoolKidM_1[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/1.4bpp"); +const u32 gFieldObjectPic_SchoolKidM_2[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/2.4bpp"); +const u32 gFieldObjectPic_SchoolKidM_3[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/3.4bpp"); +const u32 gFieldObjectPic_SchoolKidM_4[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/4.4bpp"); +const u32 gFieldObjectPic_SchoolKidM_5[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/5.4bpp"); +const u32 gFieldObjectPic_SchoolKidM_6[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/6.4bpp"); +const u32 gFieldObjectPic_SchoolKidM_7[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/7.4bpp"); +const u32 gFieldObjectPic_SchoolKidM_8[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/8.4bpp"); +const u32 gFieldObjectPic_Maniac_0[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/0.4bpp"); +const u32 gFieldObjectPic_Maniac_1[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/1.4bpp"); +const u32 gFieldObjectPic_Maniac_2[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/2.4bpp"); +const u32 gFieldObjectPic_Maniac_3[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/3.4bpp"); +const u32 gFieldObjectPic_Maniac_4[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/4.4bpp"); +const u32 gFieldObjectPic_Maniac_5[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/5.4bpp"); +const u32 gFieldObjectPic_Maniac_6[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/6.4bpp"); +const u32 gFieldObjectPic_Maniac_7[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/7.4bpp"); +const u32 gFieldObjectPic_Maniac_8[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/8.4bpp"); +const u32 gFieldObjectPic_HexManiac_0[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/0.4bpp"); +const u32 gFieldObjectPic_HexManiac_1[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/1.4bpp"); +const u32 gFieldObjectPic_HexManiac_2[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/2.4bpp"); +const u32 gFieldObjectPic_HexManiac_3[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/3.4bpp"); +const u32 gFieldObjectPic_HexManiac_4[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/4.4bpp"); +const u32 gFieldObjectPic_HexManiac_5[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/5.4bpp"); +const u32 gFieldObjectPic_HexManiac_6[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/6.4bpp"); +const u32 gFieldObjectPic_HexManiac_7[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/7.4bpp"); +const u32 gFieldObjectPic_HexManiac_8[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/8.4bpp"); +const u32 gFieldObjectPic_UnusedWoman_0[] = INCBIN_U32("graphics/map_objects/pics/people/unused_woman/0.4bpp"); +const u32 gFieldObjectPic_UnusedWoman_1[] = INCBIN_U32("graphics/map_objects/pics/people/unused_woman/1.4bpp"); +const u32 gFieldObjectPic_UnusedWoman_2[] = INCBIN_U32("graphics/map_objects/pics/people/unused_woman/2.4bpp"); +const u32 gFieldObjectPic_UnusedWoman_3[] = INCBIN_U32("graphics/map_objects/pics/people/unused_woman/3.4bpp"); +const u32 gFieldObjectPic_UnusedWoman_4[] = INCBIN_U32("graphics/map_objects/pics/people/unused_woman/4.4bpp"); +const u32 gFieldObjectPic_UnusedWoman_5[] = INCBIN_U32("graphics/map_objects/pics/people/unused_woman/5.4bpp"); +const u32 gFieldObjectPic_UnusedWoman_6[] = INCBIN_U32("graphics/map_objects/pics/people/unused_woman/6.4bpp"); +const u32 gFieldObjectPic_UnusedWoman_7[] = INCBIN_U32("graphics/map_objects/pics/people/unused_woman/7.4bpp"); +const u32 gFieldObjectPic_UnusedWoman_8[] = INCBIN_U32("graphics/map_objects/pics/people/unused_woman/8.4bpp"); +const u32 gFieldObjectPic_SwimmerM_0[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/0.4bpp"); +const u32 gFieldObjectPic_SwimmerM_1[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/1.4bpp"); +const u32 gFieldObjectPic_SwimmerM_2[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/2.4bpp"); +const u32 gFieldObjectPic_SwimmerM_3[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/3.4bpp"); +const u32 gFieldObjectPic_SwimmerM_4[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/4.4bpp"); +const u32 gFieldObjectPic_SwimmerM_5[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/5.4bpp"); +const u32 gFieldObjectPic_SwimmerM_6[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/6.4bpp"); +const u32 gFieldObjectPic_SwimmerM_7[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/7.4bpp"); +const u32 gFieldObjectPic_SwimmerM_8[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/8.4bpp"); +const u32 gFieldObjectPic_SwimmerF_0[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/0.4bpp"); +const u32 gFieldObjectPic_SwimmerF_1[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/1.4bpp"); +const u32 gFieldObjectPic_SwimmerF_2[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/2.4bpp"); +const u32 gFieldObjectPic_SwimmerF_3[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/3.4bpp"); +const u32 gFieldObjectPic_SwimmerF_4[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/4.4bpp"); +const u32 gFieldObjectPic_SwimmerF_5[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/5.4bpp"); +const u32 gFieldObjectPic_SwimmerF_6[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/6.4bpp"); +const u32 gFieldObjectPic_SwimmerF_7[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/7.4bpp"); +const u32 gFieldObjectPic_SwimmerF_8[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/8.4bpp"); +const u32 gFieldObjectPic_BlackBelt_0[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/0.4bpp"); +const u32 gFieldObjectPic_BlackBelt_1[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/1.4bpp"); +const u32 gFieldObjectPic_BlackBelt_2[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/2.4bpp"); +const u32 gFieldObjectPic_BlackBelt_3[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/3.4bpp"); +const u32 gFieldObjectPic_BlackBelt_4[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/4.4bpp"); +const u32 gFieldObjectPic_BlackBelt_5[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/5.4bpp"); +const u32 gFieldObjectPic_BlackBelt_6[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/6.4bpp"); +const u32 gFieldObjectPic_BlackBelt_7[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/7.4bpp"); +const u32 gFieldObjectPic_BlackBelt_8[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/8.4bpp"); +const u32 gFieldObjectPic_Beauty_0[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/0.4bpp"); +const u32 gFieldObjectPic_Beauty_1[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/1.4bpp"); +const u32 gFieldObjectPic_Beauty_2[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/2.4bpp"); +const u32 gFieldObjectPic_Beauty_3[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/3.4bpp"); +const u32 gFieldObjectPic_Beauty_4[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/4.4bpp"); +const u32 gFieldObjectPic_Beauty_5[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/5.4bpp"); +const u32 gFieldObjectPic_Beauty_6[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/6.4bpp"); +const u32 gFieldObjectPic_Beauty_7[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/7.4bpp"); +const u32 gFieldObjectPic_Beauty_8[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/8.4bpp"); +const u32 gFieldObjectPic_Scientist1_0[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/0.4bpp"); +const u32 gFieldObjectPic_Scientist1_1[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/1.4bpp"); +const u32 gFieldObjectPic_Scientist1_2[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/2.4bpp"); +const u32 gFieldObjectPic_Scientist1_3[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/3.4bpp"); +const u32 gFieldObjectPic_Scientist1_4[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/4.4bpp"); +const u32 gFieldObjectPic_Scientist1_5[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/5.4bpp"); +const u32 gFieldObjectPic_Scientist1_6[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/6.4bpp"); +const u32 gFieldObjectPic_Scientist1_7[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/7.4bpp"); +const u32 gFieldObjectPic_Scientist1_8[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/8.4bpp"); +const u32 gFieldObjectPic_Lass_0[] = INCBIN_U32("graphics/map_objects/pics/people/lass/0.4bpp"); +const u32 gFieldObjectPic_Lass_1[] = INCBIN_U32("graphics/map_objects/pics/people/lass/1.4bpp"); +const u32 gFieldObjectPic_Lass_2[] = INCBIN_U32("graphics/map_objects/pics/people/lass/2.4bpp"); +const u32 gFieldObjectPic_Lass_3[] = INCBIN_U32("graphics/map_objects/pics/people/lass/3.4bpp"); +const u32 gFieldObjectPic_Lass_4[] = INCBIN_U32("graphics/map_objects/pics/people/lass/4.4bpp"); +const u32 gFieldObjectPic_Lass_5[] = INCBIN_U32("graphics/map_objects/pics/people/lass/5.4bpp"); +const u32 gFieldObjectPic_Lass_6[] = INCBIN_U32("graphics/map_objects/pics/people/lass/6.4bpp"); +const u32 gFieldObjectPic_Lass_7[] = INCBIN_U32("graphics/map_objects/pics/people/lass/7.4bpp"); +const u32 gFieldObjectPic_Lass_8[] = INCBIN_U32("graphics/map_objects/pics/people/lass/8.4bpp"); +const u32 gFieldObjectPic_Gentleman_0[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/0.4bpp"); +const u32 gFieldObjectPic_Gentleman_1[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/1.4bpp"); +const u32 gFieldObjectPic_Gentleman_2[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/2.4bpp"); +const u32 gFieldObjectPic_Gentleman_3[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/3.4bpp"); +const u32 gFieldObjectPic_Gentleman_4[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/4.4bpp"); +const u32 gFieldObjectPic_Gentleman_5[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/5.4bpp"); +const u32 gFieldObjectPic_Gentleman_6[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/6.4bpp"); +const u32 gFieldObjectPic_Gentleman_7[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/7.4bpp"); +const u32 gFieldObjectPic_Gentleman_8[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/8.4bpp"); +const u32 gFieldObjectPic_Sailor_0[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/0.4bpp"); +const u32 gFieldObjectPic_Sailor_1[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/1.4bpp"); +const u32 gFieldObjectPic_Sailor_2[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/2.4bpp"); +const u32 gFieldObjectPic_Sailor_3[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/3.4bpp"); +const u32 gFieldObjectPic_Sailor_4[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/4.4bpp"); +const u32 gFieldObjectPic_Sailor_5[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/5.4bpp"); +const u32 gFieldObjectPic_Sailor_6[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/6.4bpp"); +const u32 gFieldObjectPic_Sailor_7[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/7.4bpp"); +const u32 gFieldObjectPic_Sailor_8[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/8.4bpp"); +const u32 gFieldObjectPic_Fisherman_0[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/0.4bpp"); +const u32 gFieldObjectPic_Fisherman_1[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/1.4bpp"); +const u32 gFieldObjectPic_Fisherman_2[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/2.4bpp"); +const u32 gFieldObjectPic_Fisherman_3[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/3.4bpp"); +const u32 gFieldObjectPic_Fisherman_4[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/4.4bpp"); +const u32 gFieldObjectPic_Fisherman_5[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/5.4bpp"); +const u32 gFieldObjectPic_Fisherman_6[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/6.4bpp"); +const u32 gFieldObjectPic_Fisherman_7[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/7.4bpp"); +const u32 gFieldObjectPic_Fisherman_8[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/8.4bpp"); +const u32 gFieldObjectPic_RunningTriathleteM_0[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/0.4bpp"); +const u32 gFieldObjectPic_RunningTriathleteM_1[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/1.4bpp"); +const u32 gFieldObjectPic_RunningTriathleteM_2[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/2.4bpp"); +const u32 gFieldObjectPic_RunningTriathleteM_3[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/3.4bpp"); +const u32 gFieldObjectPic_RunningTriathleteM_4[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/4.4bpp"); +const u32 gFieldObjectPic_RunningTriathleteM_5[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/5.4bpp"); +const u32 gFieldObjectPic_RunningTriathleteM_6[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/6.4bpp"); +const u32 gFieldObjectPic_RunningTriathleteM_7[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/7.4bpp"); +const u32 gFieldObjectPic_RunningTriathleteM_8[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/8.4bpp"); +const u32 gFieldObjectPic_RunningTriathleteF_0[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/0.4bpp"); +const u32 gFieldObjectPic_RunningTriathleteF_1[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/1.4bpp"); +const u32 gFieldObjectPic_RunningTriathleteF_2[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/2.4bpp"); +const u32 gFieldObjectPic_RunningTriathleteF_3[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/3.4bpp"); +const u32 gFieldObjectPic_RunningTriathleteF_4[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/4.4bpp"); +const u32 gFieldObjectPic_RunningTriathleteF_5[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/5.4bpp"); +const u32 gFieldObjectPic_RunningTriathleteF_6[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/6.4bpp"); +const u32 gFieldObjectPic_RunningTriathleteF_7[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/7.4bpp"); +const u32 gFieldObjectPic_RunningTriathleteF_8[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/8.4bpp"); +const u32 gFieldObjectPic_TuberF_0[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/0.4bpp"); +const u32 gFieldObjectPic_TuberF_1[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/1.4bpp"); +const u32 gFieldObjectPic_TuberF_2[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/2.4bpp"); +const u32 gFieldObjectPic_TuberF_3[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/3.4bpp"); +const u32 gFieldObjectPic_TuberF_4[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/4.4bpp"); +const u32 gFieldObjectPic_TuberF_5[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/5.4bpp"); +const u32 gFieldObjectPic_TuberF_6[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/6.4bpp"); +const u32 gFieldObjectPic_TuberF_7[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/7.4bpp"); +const u32 gFieldObjectPic_TuberF_8[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/8.4bpp"); +const u32 gFieldObjectPic_TuberM_0[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/0.4bpp"); +const u32 gFieldObjectPic_TuberM_1[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/1.4bpp"); +const u32 gFieldObjectPic_TuberM_2[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/2.4bpp"); +const u32 gFieldObjectPic_TuberM_3[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/3.4bpp"); +const u32 gFieldObjectPic_TuberM_4[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/4.4bpp"); +const u32 gFieldObjectPic_TuberM_5[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/5.4bpp"); +const u32 gFieldObjectPic_TuberM_6[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/6.4bpp"); +const u32 gFieldObjectPic_TuberM_7[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/7.4bpp"); +const u32 gFieldObjectPic_TuberM_8[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/8.4bpp"); +const u32 gFieldObjectPic_Hiker_0[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/0.4bpp"); +const u32 gFieldObjectPic_Hiker_1[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/1.4bpp"); +const u32 gFieldObjectPic_Hiker_2[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/2.4bpp"); +const u32 gFieldObjectPic_Hiker_3[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/3.4bpp"); +const u32 gFieldObjectPic_Hiker_4[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/4.4bpp"); +const u32 gFieldObjectPic_Hiker_5[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/5.4bpp"); +const u32 gFieldObjectPic_Hiker_6[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/6.4bpp"); +const u32 gFieldObjectPic_Hiker_7[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/7.4bpp"); +const u32 gFieldObjectPic_Hiker_8[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/8.4bpp"); +const u32 gFieldObjectPic_CyclingTriathleteM_0[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/0.4bpp"); +const u32 gFieldObjectPic_CyclingTriathleteM_1[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/1.4bpp"); +const u32 gFieldObjectPic_CyclingTriathleteM_2[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/2.4bpp"); +const u32 gFieldObjectPic_CyclingTriathleteM_3[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/3.4bpp"); +const u32 gFieldObjectPic_CyclingTriathleteM_4[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/4.4bpp"); +const u32 gFieldObjectPic_CyclingTriathleteM_5[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/5.4bpp"); +const u32 gFieldObjectPic_CyclingTriathleteM_6[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/6.4bpp"); +const u32 gFieldObjectPic_CyclingTriathleteM_7[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/7.4bpp"); +const u32 gFieldObjectPic_CyclingTriathleteM_8[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/8.4bpp"); +const u32 gFieldObjectPic_CyclingTriathleteF_0[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/0.4bpp"); +const u32 gFieldObjectPic_CyclingTriathleteF_1[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/1.4bpp"); +const u32 gFieldObjectPic_CyclingTriathleteF_2[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/2.4bpp"); +const u32 gFieldObjectPic_CyclingTriathleteF_3[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/3.4bpp"); +const u32 gFieldObjectPic_CyclingTriathleteF_4[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/4.4bpp"); +const u32 gFieldObjectPic_CyclingTriathleteF_5[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/5.4bpp"); +const u32 gFieldObjectPic_CyclingTriathleteF_6[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/6.4bpp"); +const u32 gFieldObjectPic_CyclingTriathleteF_7[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/7.4bpp"); +const u32 gFieldObjectPic_CyclingTriathleteF_8[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/8.4bpp"); +const u32 gFieldObjectPic_Man5_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/0.4bpp"); +const u32 gFieldObjectPic_Man5_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/1.4bpp"); +const u32 gFieldObjectPic_Man5_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/2.4bpp"); +const u32 gFieldObjectPic_Man5_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/3.4bpp"); +const u32 gFieldObjectPic_Man5_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/4.4bpp"); +const u32 gFieldObjectPic_Man5_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/5.4bpp"); +const u32 gFieldObjectPic_Man5_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/6.4bpp"); +const u32 gFieldObjectPic_Man5_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/7.4bpp"); +const u32 gFieldObjectPic_Man5_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/8.4bpp"); +const u32 gFieldObjectPic_Man6_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/0.4bpp"); +const u32 gFieldObjectPic_Man6_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/1.4bpp"); +const u32 gFieldObjectPic_Man6_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/2.4bpp"); +const u32 gFieldObjectPic_Man6_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/3.4bpp"); +const u32 gFieldObjectPic_Man6_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/4.4bpp"); +const u32 gFieldObjectPic_Man6_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/5.4bpp"); +const u32 gFieldObjectPic_Man6_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/6.4bpp"); +const u32 gFieldObjectPic_Man6_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/7.4bpp"); +const u32 gFieldObjectPic_Man6_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/8.4bpp"); +const u32 gFieldObjectPic_Nurse_0[] = INCBIN_U32("graphics/map_objects/pics/people/nurse/0.4bpp"); +const u32 gFieldObjectPic_Nurse_1[] = INCBIN_U32("graphics/map_objects/pics/people/nurse/1.4bpp"); +const u32 gFieldObjectPic_Nurse_2[] = INCBIN_U32("graphics/map_objects/pics/people/nurse/2.4bpp"); +const u32 gFieldObjectPic_Nurse_3[] = INCBIN_U32("graphics/map_objects/pics/people/nurse/3.4bpp"); +const u32 gFieldObjectPic_ItemBall[] = INCBIN_U32("graphics/map_objects/pics/misc/item_ball.4bpp"); +const u32 gFieldObjectPic_ProfBirch_0[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/0.4bpp"); +const u32 gFieldObjectPic_ProfBirch_1[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/1.4bpp"); +const u32 gFieldObjectPic_ProfBirch_2[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/2.4bpp"); +const u32 gFieldObjectPic_ProfBirch_3[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/3.4bpp"); +const u32 gFieldObjectPic_ProfBirch_4[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/4.4bpp"); +const u32 gFieldObjectPic_ProfBirch_5[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/5.4bpp"); +const u32 gFieldObjectPic_ProfBirch_6[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/6.4bpp"); +const u32 gFieldObjectPic_ProfBirch_7[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/7.4bpp"); +const u32 gFieldObjectPic_ProfBirch_8[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/8.4bpp"); +const u32 gFieldObjectPic_ReporterM_0[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/0.4bpp"); +const u32 gFieldObjectPic_ReporterM_1[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/1.4bpp"); +const u32 gFieldObjectPic_ReporterM_2[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/2.4bpp"); +const u32 gFieldObjectPic_ReporterM_3[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/3.4bpp"); +const u32 gFieldObjectPic_ReporterM_4[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/4.4bpp"); +const u32 gFieldObjectPic_ReporterM_5[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/5.4bpp"); +const u32 gFieldObjectPic_ReporterM_6[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/6.4bpp"); +const u32 gFieldObjectPic_ReporterM_7[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/7.4bpp"); +const u32 gFieldObjectPic_ReporterM_8[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/8.4bpp"); +const u32 gFieldObjectPic_ReporterF_0[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/0.4bpp"); +const u32 gFieldObjectPic_ReporterF_1[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/1.4bpp"); +const u32 gFieldObjectPic_ReporterF_2[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/2.4bpp"); +const u32 gFieldObjectPic_ReporterF_3[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/3.4bpp"); +const u32 gFieldObjectPic_ReporterF_4[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/4.4bpp"); +const u32 gFieldObjectPic_ReporterF_5[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/5.4bpp"); +const u32 gFieldObjectPic_ReporterF_6[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/6.4bpp"); +const u32 gFieldObjectPic_ReporterF_7[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/7.4bpp"); +const u32 gFieldObjectPic_ReporterF_8[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/8.4bpp"); +const u32 gFieldObjectPic_MauvilleOldMan1_0[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/0.4bpp"); +const u32 gFieldObjectPic_MauvilleOldMan1_1[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/1.4bpp"); +const u32 gFieldObjectPic_MauvilleOldMan1_2[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/2.4bpp"); +const u32 gFieldObjectPic_MauvilleOldMan1_3[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/3.4bpp"); +const u32 gFieldObjectPic_MauvilleOldMan1_4[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/4.4bpp"); +const u32 gFieldObjectPic_MauvilleOldMan1_5[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/5.4bpp"); +const u32 gFieldObjectPic_MauvilleOldMan1_6[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/6.4bpp"); +const u32 gFieldObjectPic_MauvilleOldMan1_7[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/7.4bpp"); +const u32 gFieldObjectPic_MauvilleOldMan1_8[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/8.4bpp"); +const u32 gFieldObjectPic_MauvilleOldMan2_0[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/0.4bpp"); +const u32 gFieldObjectPic_MauvilleOldMan2_1[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/1.4bpp"); +const u32 gFieldObjectPic_MauvilleOldMan2_2[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/2.4bpp"); +const u32 gFieldObjectPic_MauvilleOldMan2_3[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/3.4bpp"); +const u32 gFieldObjectPic_MauvilleOldMan2_4[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/4.4bpp"); +const u32 gFieldObjectPic_MauvilleOldMan2_5[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/5.4bpp"); +const u32 gFieldObjectPic_MauvilleOldMan2_6[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/6.4bpp"); +const u32 gFieldObjectPic_MauvilleOldMan2_7[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/7.4bpp"); +const u32 gFieldObjectPic_MauvilleOldMan2_8[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/8.4bpp"); +const u32 gFieldObjectPic_MartEmployee_0[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/0.4bpp"); +const u32 gFieldObjectPic_MartEmployee_1[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/1.4bpp"); +const u32 gFieldObjectPic_MartEmployee_2[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/2.4bpp"); +const u32 gFieldObjectPic_MartEmployee_3[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/3.4bpp"); +const u32 gFieldObjectPic_MartEmployee_4[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/4.4bpp"); +const u32 gFieldObjectPic_MartEmployee_5[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/5.4bpp"); +const u32 gFieldObjectPic_MartEmployee_6[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/6.4bpp"); +const u32 gFieldObjectPic_MartEmployee_7[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/7.4bpp"); +const u32 gFieldObjectPic_MartEmployee_8[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/8.4bpp"); +const u32 gFieldObjectPic_RooftopSaleWoman_0[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/0.4bpp"); +const u32 gFieldObjectPic_RooftopSaleWoman_1[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/1.4bpp"); +const u32 gFieldObjectPic_RooftopSaleWoman_2[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/2.4bpp"); +const u32 gFieldObjectPic_RooftopSaleWoman_3[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/3.4bpp"); +const u32 gFieldObjectPic_RooftopSaleWoman_4[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/4.4bpp"); +const u32 gFieldObjectPic_RooftopSaleWoman_5[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/5.4bpp"); +const u32 gFieldObjectPic_RooftopSaleWoman_6[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/6.4bpp"); +const u32 gFieldObjectPic_RooftopSaleWoman_7[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/7.4bpp"); +const u32 gFieldObjectPic_RooftopSaleWoman_8[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/8.4bpp"); +const u32 gFieldObjectPic_Teala_0[] = INCBIN_U32("graphics/map_objects/pics/people/teala/0.4bpp"); +const u32 gFieldObjectPic_Teala_1[] = INCBIN_U32("graphics/map_objects/pics/people/teala/1.4bpp"); +const u32 gFieldObjectPic_Teala_2[] = INCBIN_U32("graphics/map_objects/pics/people/teala/2.4bpp"); +const u32 gFieldObjectPic_Teala_3[] = INCBIN_U32("graphics/map_objects/pics/people/teala/3.4bpp"); +const u32 gFieldObjectPic_Teala_4[] = INCBIN_U32("graphics/map_objects/pics/people/teala/4.4bpp"); +const u32 gFieldObjectPic_Teala_5[] = INCBIN_U32("graphics/map_objects/pics/people/teala/5.4bpp"); +const u32 gFieldObjectPic_Teala_6[] = INCBIN_U32("graphics/map_objects/pics/people/teala/6.4bpp"); +const u32 gFieldObjectPic_Teala_7[] = INCBIN_U32("graphics/map_objects/pics/people/teala/7.4bpp"); +const u32 gFieldObjectPic_Teala_8[] = INCBIN_U32("graphics/map_objects/pics/people/teala/8.4bpp"); +const u32 gFieldObjectPic_Artist_0[] = INCBIN_U32("graphics/map_objects/pics/people/artist/0.4bpp"); +const u32 gFieldObjectPic_Artist_1[] = INCBIN_U32("graphics/map_objects/pics/people/artist/1.4bpp"); +const u32 gFieldObjectPic_Artist_2[] = INCBIN_U32("graphics/map_objects/pics/people/artist/2.4bpp"); +const u32 gFieldObjectPic_Artist_3[] = INCBIN_U32("graphics/map_objects/pics/people/artist/3.4bpp"); +const u32 gFieldObjectPic_Artist_4[] = INCBIN_U32("graphics/map_objects/pics/people/artist/4.4bpp"); +const u32 gFieldObjectPic_Artist_5[] = INCBIN_U32("graphics/map_objects/pics/people/artist/5.4bpp"); +const u32 gFieldObjectPic_Artist_6[] = INCBIN_U32("graphics/map_objects/pics/people/artist/6.4bpp"); +const u32 gFieldObjectPic_Artist_7[] = INCBIN_U32("graphics/map_objects/pics/people/artist/7.4bpp"); +const u32 gFieldObjectPic_Artist_8[] = INCBIN_U32("graphics/map_objects/pics/people/artist/8.4bpp"); +const u32 gFieldObjectPic_Cameraman_0[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/0.4bpp"); +const u32 gFieldObjectPic_Cameraman_1[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/1.4bpp"); +const u32 gFieldObjectPic_Cameraman_2[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/2.4bpp"); +const u32 gFieldObjectPic_Cameraman_3[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/3.4bpp"); +const u32 gFieldObjectPic_Cameraman_4[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/4.4bpp"); +const u32 gFieldObjectPic_Cameraman_5[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/5.4bpp"); +const u32 gFieldObjectPic_Cameraman_6[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/6.4bpp"); +const u32 gFieldObjectPic_Cameraman_7[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/7.4bpp"); +const u32 gFieldObjectPic_Cameraman_8[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/8.4bpp"); +const u32 gFieldObjectPic_Scientist2_0[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/0.4bpp"); +const u32 gFieldObjectPic_Scientist2_1[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/1.4bpp"); +const u32 gFieldObjectPic_Scientist2_2[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/2.4bpp"); +const u32 gFieldObjectPic_Scientist2_3[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/3.4bpp"); +const u32 gFieldObjectPic_Scientist2_4[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/4.4bpp"); +const u32 gFieldObjectPic_Scientist2_5[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/5.4bpp"); +const u32 gFieldObjectPic_Scientist2_6[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/6.4bpp"); +const u32 gFieldObjectPic_Scientist2_7[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/7.4bpp"); +const u32 gFieldObjectPic_Scientist2_8[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/8.4bpp"); +const u32 gFieldObjectPic_Man7_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/0.4bpp"); +const u32 gFieldObjectPic_Man7_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/1.4bpp"); +const u32 gFieldObjectPic_Man7_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/2.4bpp"); +const u32 gFieldObjectPic_Man7_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/3.4bpp"); +const u32 gFieldObjectPic_Man7_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/4.4bpp"); +const u32 gFieldObjectPic_Man7_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/5.4bpp"); +const u32 gFieldObjectPic_Man7_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/6.4bpp"); +const u32 gFieldObjectPic_Man7_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/7.4bpp"); +const u32 gFieldObjectPic_Man7_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/8.4bpp"); +const u32 gFieldObjectPic_AquaMemberM_0[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/0.4bpp"); +const u32 gFieldObjectPic_AquaMemberM_1[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/1.4bpp"); +const u32 gFieldObjectPic_AquaMemberM_2[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/2.4bpp"); +const u32 gFieldObjectPic_AquaMemberM_3[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/3.4bpp"); +const u32 gFieldObjectPic_AquaMemberM_4[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/4.4bpp"); +const u32 gFieldObjectPic_AquaMemberM_5[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/5.4bpp"); +const u32 gFieldObjectPic_AquaMemberM_6[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/6.4bpp"); +const u32 gFieldObjectPic_AquaMemberM_7[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/7.4bpp"); +const u32 gFieldObjectPic_AquaMemberM_8[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/8.4bpp"); +const u32 gFieldObjectPic_AquaMemberF_0[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/0.4bpp"); +const u32 gFieldObjectPic_AquaMemberF_1[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/1.4bpp"); +const u32 gFieldObjectPic_AquaMemberF_2[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/2.4bpp"); +const u32 gFieldObjectPic_AquaMemberF_3[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/3.4bpp"); +const u32 gFieldObjectPic_AquaMemberF_4[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/4.4bpp"); +const u32 gFieldObjectPic_AquaMemberF_5[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/5.4bpp"); +const u32 gFieldObjectPic_AquaMemberF_6[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/6.4bpp"); +const u32 gFieldObjectPic_AquaMemberF_7[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/7.4bpp"); +const u32 gFieldObjectPic_AquaMemberF_8[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/8.4bpp"); +const u32 gFieldObjectPic_MagmaMemberM_0[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/0.4bpp"); +const u32 gFieldObjectPic_MagmaMemberM_1[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/1.4bpp"); +const u32 gFieldObjectPic_MagmaMemberM_2[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/2.4bpp"); +const u32 gFieldObjectPic_MagmaMemberM_3[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/3.4bpp"); +const u32 gFieldObjectPic_MagmaMemberM_4[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/4.4bpp"); +const u32 gFieldObjectPic_MagmaMemberM_5[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/5.4bpp"); +const u32 gFieldObjectPic_MagmaMemberM_6[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/6.4bpp"); +const u32 gFieldObjectPic_MagmaMemberM_7[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/7.4bpp"); +const u32 gFieldObjectPic_MagmaMemberM_8[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/8.4bpp"); +const u32 gFieldObjectPic_MagmaMemberF_0[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/0.4bpp"); +const u32 gFieldObjectPic_MagmaMemberF_1[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/1.4bpp"); +const u32 gFieldObjectPic_MagmaMemberF_2[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/2.4bpp"); +const u32 gFieldObjectPic_MagmaMemberF_3[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/3.4bpp"); +const u32 gFieldObjectPic_MagmaMemberF_4[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/4.4bpp"); +const u32 gFieldObjectPic_MagmaMemberF_5[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/5.4bpp"); +const u32 gFieldObjectPic_MagmaMemberF_6[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/6.4bpp"); +const u32 gFieldObjectPic_MagmaMemberF_7[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/7.4bpp"); +const u32 gFieldObjectPic_MagmaMemberF_8[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/8.4bpp"); +const u32 gFieldObjectPic_Sidney_0[] = INCBIN_U32("graphics/map_objects/pics/people/sidney/0.4bpp"); +const u32 gFieldObjectPic_Sidney_1[] = INCBIN_U32("graphics/map_objects/pics/people/sidney/1.4bpp"); +const u32 gFieldObjectPic_Sidney_2[] = INCBIN_U32("graphics/map_objects/pics/people/sidney/2.4bpp"); +const u32 gFieldObjectPic_Phoebe_0[] = INCBIN_U32("graphics/map_objects/pics/people/phoebe/0.4bpp"); +const u32 gFieldObjectPic_Phoebe_1[] = INCBIN_U32("graphics/map_objects/pics/people/phoebe/1.4bpp"); +const u32 gFieldObjectPic_Phoebe_2[] = INCBIN_U32("graphics/map_objects/pics/people/phoebe/2.4bpp"); +const u32 gFieldObjectPic_Glacia_0[] = INCBIN_U32("graphics/map_objects/pics/people/glacia/0.4bpp"); +const u32 gFieldObjectPic_Glacia_1[] = INCBIN_U32("graphics/map_objects/pics/people/glacia/1.4bpp"); +const u32 gFieldObjectPic_Glacia_2[] = INCBIN_U32("graphics/map_objects/pics/people/glacia/2.4bpp"); +const u32 gFieldObjectPic_Drake_0[] = INCBIN_U32("graphics/map_objects/pics/people/drake/0.4bpp"); +const u32 gFieldObjectPic_Drake_1[] = INCBIN_U32("graphics/map_objects/pics/people/drake/1.4bpp"); +const u32 gFieldObjectPic_Drake_2[] = INCBIN_U32("graphics/map_objects/pics/people/drake/2.4bpp"); +const u32 gFieldObjectPic_Roxanne_0[] = INCBIN_U32("graphics/map_objects/pics/people/roxanne/0.4bpp"); +const u32 gFieldObjectPic_Roxanne_1[] = INCBIN_U32("graphics/map_objects/pics/people/roxanne/1.4bpp"); +const u32 gFieldObjectPic_Roxanne_2[] = INCBIN_U32("graphics/map_objects/pics/people/roxanne/2.4bpp"); +const u32 gFieldObjectPic_Brawly_0[] = INCBIN_U32("graphics/map_objects/pics/people/brawly/0.4bpp"); +const u32 gFieldObjectPic_Brawly_1[] = INCBIN_U32("graphics/map_objects/pics/people/brawly/1.4bpp"); +const u32 gFieldObjectPic_Brawly_2[] = INCBIN_U32("graphics/map_objects/pics/people/brawly/2.4bpp"); +const u32 gFieldObjectPic_Wattson_0[] = INCBIN_U32("graphics/map_objects/pics/people/wattson/0.4bpp"); +const u32 gFieldObjectPic_Wattson_1[] = INCBIN_U32("graphics/map_objects/pics/people/wattson/1.4bpp"); +const u32 gFieldObjectPic_Wattson_2[] = INCBIN_U32("graphics/map_objects/pics/people/wattson/2.4bpp"); +const u32 gFieldObjectPic_Flannery_0[] = INCBIN_U32("graphics/map_objects/pics/people/flannery/0.4bpp"); +const u32 gFieldObjectPic_Flannery_1[] = INCBIN_U32("graphics/map_objects/pics/people/flannery/1.4bpp"); +const u32 gFieldObjectPic_Flannery_2[] = INCBIN_U32("graphics/map_objects/pics/people/flannery/2.4bpp"); +const u32 gFieldObjectPic_Norman_0[] = INCBIN_U32("graphics/map_objects/pics/people/norman/0.4bpp"); +const u32 gFieldObjectPic_Norman_1[] = INCBIN_U32("graphics/map_objects/pics/people/norman/1.4bpp"); +const u32 gFieldObjectPic_Norman_2[] = INCBIN_U32("graphics/map_objects/pics/people/norman/2.4bpp"); +const u32 gFieldObjectPic_Norman_3[] = INCBIN_U32("graphics/map_objects/pics/people/norman/3.4bpp"); +const u32 gFieldObjectPic_Norman_4[] = INCBIN_U32("graphics/map_objects/pics/people/norman/4.4bpp"); +const u32 gFieldObjectPic_Norman_5[] = INCBIN_U32("graphics/map_objects/pics/people/norman/5.4bpp"); +const u32 gFieldObjectPic_Norman_6[] = INCBIN_U32("graphics/map_objects/pics/people/norman/6.4bpp"); +const u32 gFieldObjectPic_Norman_7[] = INCBIN_U32("graphics/map_objects/pics/people/norman/7.4bpp"); +const u32 gFieldObjectPic_Norman_8[] = INCBIN_U32("graphics/map_objects/pics/people/norman/8.4bpp"); +const u32 gFieldObjectPic_Winona_0[] = INCBIN_U32("graphics/map_objects/pics/people/winona/0.4bpp"); +const u32 gFieldObjectPic_Winona_1[] = INCBIN_U32("graphics/map_objects/pics/people/winona/1.4bpp"); +const u32 gFieldObjectPic_Winona_2[] = INCBIN_U32("graphics/map_objects/pics/people/winona/2.4bpp"); +const u32 gFieldObjectPic_Liza_0[] = INCBIN_U32("graphics/map_objects/pics/people/liza/0.4bpp"); +const u32 gFieldObjectPic_Liza_1[] = INCBIN_U32("graphics/map_objects/pics/people/liza/1.4bpp"); +const u32 gFieldObjectPic_Liza_2[] = INCBIN_U32("graphics/map_objects/pics/people/liza/2.4bpp"); +const u32 gFieldObjectPic_Tate_0[] = INCBIN_U32("graphics/map_objects/pics/people/tate/0.4bpp"); +const u32 gFieldObjectPic_Tate_1[] = INCBIN_U32("graphics/map_objects/pics/people/tate/1.4bpp"); +const u32 gFieldObjectPic_Tate_2[] = INCBIN_U32("graphics/map_objects/pics/people/tate/2.4bpp"); +const u32 gFieldObjectPic_Wallace_0[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/0.4bpp"); +const u32 gFieldObjectPic_Wallace_1[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/1.4bpp"); +const u32 gFieldObjectPic_Wallace_2[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/2.4bpp"); +const u32 gFieldObjectPic_Wallace_3[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/3.4bpp"); +const u32 gFieldObjectPic_Wallace_4[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/4.4bpp"); +const u32 gFieldObjectPic_Wallace_5[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/5.4bpp"); +const u32 gFieldObjectPic_Wallace_6[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/6.4bpp"); +const u32 gFieldObjectPic_Wallace_7[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/7.4bpp"); +const u32 gFieldObjectPic_Wallace_8[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/8.4bpp"); +const u32 gFieldObjectPic_Steven_0[] = INCBIN_U32("graphics/map_objects/pics/people/steven/0.4bpp"); +const u32 gFieldObjectPic_Steven_1[] = INCBIN_U32("graphics/map_objects/pics/people/steven/1.4bpp"); +const u32 gFieldObjectPic_Steven_2[] = INCBIN_U32("graphics/map_objects/pics/people/steven/2.4bpp"); +const u32 gFieldObjectPic_Steven_3[] = INCBIN_U32("graphics/map_objects/pics/people/steven/3.4bpp"); +const u32 gFieldObjectPic_Steven_4[] = INCBIN_U32("graphics/map_objects/pics/people/steven/4.4bpp"); +const u32 gFieldObjectPic_Steven_5[] = INCBIN_U32("graphics/map_objects/pics/people/steven/5.4bpp"); +const u32 gFieldObjectPic_Steven_6[] = INCBIN_U32("graphics/map_objects/pics/people/steven/6.4bpp"); +const u32 gFieldObjectPic_Steven_7[] = INCBIN_U32("graphics/map_objects/pics/people/steven/7.4bpp"); +const u32 gFieldObjectPic_Steven_8[] = INCBIN_U32("graphics/map_objects/pics/people/steven/8.4bpp"); +const u32 gFieldObjectPic_Wally_0[] = INCBIN_U32("graphics/map_objects/pics/people/wally/0.4bpp"); +const u32 gFieldObjectPic_Wally_1[] = INCBIN_U32("graphics/map_objects/pics/people/wally/1.4bpp"); +const u32 gFieldObjectPic_Wally_2[] = INCBIN_U32("graphics/map_objects/pics/people/wally/2.4bpp"); +const u32 gFieldObjectPic_Wally_3[] = INCBIN_U32("graphics/map_objects/pics/people/wally/3.4bpp"); +const u32 gFieldObjectPic_Wally_4[] = INCBIN_U32("graphics/map_objects/pics/people/wally/4.4bpp"); +const u32 gFieldObjectPic_Wally_5[] = INCBIN_U32("graphics/map_objects/pics/people/wally/5.4bpp"); +const u32 gFieldObjectPic_Wally_6[] = INCBIN_U32("graphics/map_objects/pics/people/wally/6.4bpp"); +const u32 gFieldObjectPic_Wally_7[] = INCBIN_U32("graphics/map_objects/pics/people/wally/7.4bpp"); +const u32 gFieldObjectPic_Wally_8[] = INCBIN_U32("graphics/map_objects/pics/people/wally/8.4bpp"); +const u32 gFieldObjectPic_RubySapphireLittleBoy_0[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_little_boy/0.4bpp"); +const u32 gFieldObjectPic_RubySapphireLittleBoy_1[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_little_boy/1.4bpp"); +const u32 gFieldObjectPic_RubySapphireLittleBoy_2[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_little_boy/2.4bpp"); +const u32 gFieldObjectPic_RubySapphireLittleBoy_3[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_little_boy/3.4bpp"); +const u32 gFieldObjectPic_RubySapphireLittleBoy_4[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_little_boy/4.4bpp"); +const u32 gFieldObjectPic_RubySapphireLittleBoy_5[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_little_boy/5.4bpp"); +const u32 gFieldObjectPic_RubySapphireLittleBoy_6[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_little_boy/6.4bpp"); +const u32 gFieldObjectPic_RubySapphireLittleBoy_7[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_little_boy/7.4bpp"); +const u32 gFieldObjectPic_RubySapphireLittleBoy_8[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_little_boy/8.4bpp"); +const u32 gFieldObjectPic_HotSpringsOldWoman_0[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/0.4bpp"); +const u32 gFieldObjectPic_HotSpringsOldWoman_1[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/1.4bpp"); +const u32 gFieldObjectPic_HotSpringsOldWoman_2[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/2.4bpp"); +const u32 gFieldObjectPic_HotSpringsOldWoman_3[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/3.4bpp"); +const u32 gFieldObjectPic_HotSpringsOldWoman_4[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/4.4bpp"); +const u32 gFieldObjectPic_HotSpringsOldWoman_5[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/5.4bpp"); +const u32 gFieldObjectPic_HotSpringsOldWoman_6[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/6.4bpp"); +const u32 gFieldObjectPic_HotSpringsOldWoman_7[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/7.4bpp"); +const u32 gFieldObjectPic_HotSpringsOldWoman_8[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/8.4bpp"); +const u32 gFieldObjectPic_LatiasLatios_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/latias_latios/0.4bpp"); +const u32 gFieldObjectPic_LatiasLatios_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/latias_latios/1.4bpp"); +const u32 gFieldObjectPic_LatiasLatios_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/latias_latios/2.4bpp"); +const u32 gFieldObjectPic_Boy5_0[] = INCBIN_U32("graphics/map_objects/pics/people/boy_5/0.4bpp"); +const u32 gFieldObjectPic_Boy5_1[] = INCBIN_U32("graphics/map_objects/pics/people/boy_5/1.4bpp"); +const u32 gFieldObjectPic_Boy5_2[] = INCBIN_U32("graphics/map_objects/pics/people/boy_5/2.4bpp"); +const u32 gFieldObjectPic_ContestOldMan_0[] = INCBIN_U32("graphics/map_objects/pics/people/contest_old_man/0.4bpp"); +const u32 gFieldObjectPic_ContestOldMan_1[] = INCBIN_U32("graphics/map_objects/pics/people/contest_old_man/1.4bpp"); +const u32 gFieldObjectPic_ContestOldMan_2[] = INCBIN_U32("graphics/map_objects/pics/people/contest_old_man/2.4bpp"); +const u32 gFieldObjectPic_ContestOldMan_3[] = INCBIN_U32("graphics/map_objects/pics/people/contest_old_man/3.4bpp"); +const u32 gFieldObjectPic_ContestOldMan_4[] = INCBIN_U32("graphics/map_objects/pics/people/contest_old_man/4.4bpp"); +const u32 gFieldObjectPic_ContestOldMan_5[] = INCBIN_U32("graphics/map_objects/pics/people/contest_old_man/5.4bpp"); +const u32 gFieldObjectPic_ContestOldMan_6[] = INCBIN_U32("graphics/map_objects/pics/people/contest_old_man/6.4bpp"); +const u32 gFieldObjectPic_ContestOldMan_7[] = INCBIN_U32("graphics/map_objects/pics/people/contest_old_man/7.4bpp"); +const u32 gFieldObjectPic_ContestOldMan_8[] = INCBIN_U32("graphics/map_objects/pics/people/contest_old_man/8.4bpp"); +const u32 gFieldObjectPic_Archie_0[] = INCBIN_U32("graphics/map_objects/pics/people/archie/0.4bpp"); +const u32 gFieldObjectPic_Archie_1[] = INCBIN_U32("graphics/map_objects/pics/people/archie/1.4bpp"); +const u32 gFieldObjectPic_Archie_2[] = INCBIN_U32("graphics/map_objects/pics/people/archie/2.4bpp"); +const u32 gFieldObjectPic_Archie_3[] = INCBIN_U32("graphics/map_objects/pics/people/archie/3.4bpp"); +const u32 gFieldObjectPic_Archie_4[] = INCBIN_U32("graphics/map_objects/pics/people/archie/4.4bpp"); +const u32 gFieldObjectPic_Archie_5[] = INCBIN_U32("graphics/map_objects/pics/people/archie/5.4bpp"); +const u32 gFieldObjectPic_Archie_6[] = INCBIN_U32("graphics/map_objects/pics/people/archie/6.4bpp"); +const u32 gFieldObjectPic_Archie_7[] = INCBIN_U32("graphics/map_objects/pics/people/archie/7.4bpp"); +const u32 gFieldObjectPic_Archie_8[] = INCBIN_U32("graphics/map_objects/pics/people/archie/8.4bpp"); +const u32 gFieldObjectPic_Maxie_0[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/0.4bpp"); +const u32 gFieldObjectPic_Maxie_1[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/1.4bpp"); +const u32 gFieldObjectPic_Maxie_2[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/2.4bpp"); +const u32 gFieldObjectPic_Maxie_3[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/3.4bpp"); +const u32 gFieldObjectPic_Maxie_4[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/4.4bpp"); +const u32 gFieldObjectPic_Maxie_5[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/5.4bpp"); +const u32 gFieldObjectPic_Maxie_6[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/6.4bpp"); +const u32 gFieldObjectPic_Maxie_7[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/7.4bpp"); +const u32 gFieldObjectPic_Maxie_8[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/8.4bpp"); +const u32 gFieldObjectPic_KyogreFront_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kyogre_front/0.4bpp"); +const u32 gFieldObjectPic_KyogreFront_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kyogre_front/1.4bpp"); +const u32 gFieldObjectPic_KyogreSide_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kyogre_side/0.4bpp"); +const u32 gFieldObjectPic_KyogreSide_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kyogre_side/1.4bpp"); +const u32 gFieldObjectPic_GroudonFront_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/groudon_front/0.4bpp"); +const u32 gFieldObjectPic_GroudonFront_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/groudon_front/1.4bpp"); +const u32 gFieldObjectPic_GroudonSide_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/groudon_side/0.4bpp"); +const u32 gFieldObjectPic_GroudonSide_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/groudon_side/1.4bpp"); +const u32 gFieldObjectPic_Regi[] = INCBIN_U32("graphics/map_objects/pics/pokemon/regi.4bpp"); +const u32 gFieldObjectPic_Skitty_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/skitty/0.4bpp"); +const u32 gFieldObjectPic_Skitty_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/skitty/1.4bpp"); +const u32 gFieldObjectPic_Skitty_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/skitty/2.4bpp"); +const u32 gFieldObjectPic_Kecleon_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kecleon/0.4bpp"); +const u32 gFieldObjectPic_Kecleon_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kecleon/1.4bpp"); +const u32 gFieldObjectPic_Kecleon_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kecleon/2.4bpp"); +const u32 gFieldObjectPic_Rayquaza_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/rayquaza/0.4bpp"); +const u32 gFieldObjectPic_Rayquaza_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/rayquaza/1.4bpp"); +const u32 gFieldObjectPic_Rayquaza_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/rayquaza/2.4bpp"); +const u32 gFieldObjectPic_Rayquaza_3[] = INCBIN_U32("graphics/map_objects/pics/pokemon/rayquaza/3.4bpp"); +const u32 gFieldObjectPic_Rayquaza_4[] = INCBIN_U32("graphics/map_objects/pics/pokemon/rayquaza/4.4bpp"); +const u32 gFieldObjectPic_RayquazaStill[] = INCBIN_U32("graphics/map_objects/pics/pokemon/rayquaza_still.4bpp"); +const u32 gFieldObjectPic_Zigzagoon_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/zigzagoon/0.4bpp"); +const u32 gFieldObjectPic_Zigzagoon_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/zigzagoon/1.4bpp"); +const u32 gFieldObjectPic_Zigzagoon_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/zigzagoon/2.4bpp"); +const u32 gFieldObjectPic_Pikachu_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/pikachu/0.4bpp"); +const u32 gFieldObjectPic_Pikachu_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/pikachu/1.4bpp"); +const u32 gFieldObjectPic_Pikachu_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/pikachu/2.4bpp"); +const u32 gFieldObjectPic_Azumarill_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/azumarill/0.4bpp"); +const u32 gFieldObjectPic_Azumarill_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/azumarill/1.4bpp"); +const u32 gFieldObjectPic_Azumarill_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/azumarill/2.4bpp"); +const u32 gFieldObjectPic_Wingull_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/wingull/0.4bpp"); +const u32 gFieldObjectPic_Wingull_3[] = INCBIN_U32("graphics/map_objects/pics/pokemon/wingull/3.4bpp"); +const u32 gFieldObjectPic_Wingull_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/wingull/1.4bpp"); +const u32 gFieldObjectPic_Wingull_4[] = INCBIN_U32("graphics/map_objects/pics/pokemon/wingull/4.4bpp"); +const u32 gFieldObjectPic_Wingull_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/wingull/2.4bpp"); +const u32 gFieldObjectPic_Wingull_5[] = INCBIN_U32("graphics/map_objects/pics/pokemon/wingull/5.4bpp"); +const u32 gFieldObjectPic_TuberMSwimming_0[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/0.4bpp"); +const u32 gFieldObjectPic_TuberMSwimming_1[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/1.4bpp"); +const u32 gFieldObjectPic_TuberMSwimming_2[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/2.4bpp"); +const u32 gFieldObjectPic_TuberMSwimming_3[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/3.4bpp"); +const u32 gFieldObjectPic_TuberMSwimming_4[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/4.4bpp"); +const u32 gFieldObjectPic_TuberMSwimming_5[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/5.4bpp"); +const u32 gFieldObjectPic_TuberMSwimming_6[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/6.4bpp"); +const u32 gFieldObjectPic_TuberMSwimming_7[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/7.4bpp"); +const u32 gFieldObjectPic_TuberMSwimming_8[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/8.4bpp"); +const u32 gFieldObjectPic_Azurill_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/azurill/0.4bpp"); +const u32 gFieldObjectPic_Azurill_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/azurill/1.4bpp"); +const u32 gFieldObjectPic_Azurill_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/azurill/2.4bpp"); +const u32 gFieldObjectPic_Mom_0[] = INCBIN_U32("graphics/map_objects/pics/people/mom/0.4bpp"); +const u32 gFieldObjectPic_Mom_1[] = INCBIN_U32("graphics/map_objects/pics/people/mom/1.4bpp"); +const u32 gFieldObjectPic_Mom_2[] = INCBIN_U32("graphics/map_objects/pics/people/mom/2.4bpp"); +const u32 gFieldObjectPic_Mom_3[] = INCBIN_U32("graphics/map_objects/pics/people/mom/3.4bpp"); +const u32 gFieldObjectPic_Mom_4[] = INCBIN_U32("graphics/map_objects/pics/people/mom/4.4bpp"); +const u32 gFieldObjectPic_Mom_5[] = INCBIN_U32("graphics/map_objects/pics/people/mom/5.4bpp"); +const u32 gFieldObjectPic_Mom_6[] = INCBIN_U32("graphics/map_objects/pics/people/mom/6.4bpp"); +const u32 gFieldObjectPic_Mom_7[] = INCBIN_U32("graphics/map_objects/pics/people/mom/7.4bpp"); +const u32 gFieldObjectPic_Mom_8[] = INCBIN_U32("graphics/map_objects/pics/people/mom/8.4bpp"); +const u16 gFieldObjectPalette22[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_22.gbapal"); +const u16 gFieldObjectPalette23[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_23.gbapal"); +const u16 gFieldObjectPalette24[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_24.gbapal"); +const u16 gFieldObjectPalette25[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_25.gbapal"); +const u32 gFieldObjectPic_UnusedNatuDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/unused_natu_doll.4bpp"); +const u32 gFieldObjectPic_UnusedMagnemiteDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/unused_magnemite_doll.4bpp"); +const u32 gFieldObjectPic_UnusedSquirtleDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/unused_squirtle_doll.4bpp"); +const u32 gFieldObjectPic_UnusedWooperDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/unused_wooper_doll.4bpp"); +const u32 gFieldObjectPic_UnusedPikachuDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/unused_pikachu_doll.4bpp"); +const u32 gFieldObjectPic_UnusedPorygon2Doll[] = INCBIN_U32("graphics/map_objects/pics/dolls/unused_porygon2_doll.4bpp"); +const u32 gFieldObjectPic_PichuDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/pichu_doll.4bpp"); +const u32 gFieldObjectPic_PikachuDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/pikachu_doll.4bpp"); +const u32 gFieldObjectPic_MarillDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/marill_doll.4bpp"); +const u32 gFieldObjectPic_TogepiDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/togepi_doll.4bpp"); +const u32 gFieldObjectPic_CyndaquilDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/cyndaquil_doll.4bpp"); +const u32 gFieldObjectPic_ChikoritaDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/chikorita_doll.4bpp"); +const u32 gFieldObjectPic_TotodileDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/totodile_doll.4bpp"); +const u32 gFieldObjectPic_JigglypuffDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/jigglypuff_doll.4bpp"); +const u32 gFieldObjectPic_MeowthDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/meowth_doll.4bpp"); +const u32 gFieldObjectPic_ClefairyDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/clefairy_doll.4bpp"); +const u32 gFieldObjectPic_DittoDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/ditto_doll.4bpp"); +const u32 gFieldObjectPic_SmoochumDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/smoochum_doll.4bpp"); +const u32 gFieldObjectPic_TreeckoDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/treecko_doll.4bpp"); +const u32 gFieldObjectPic_TorchicDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/torchic_doll.4bpp"); +const u32 gFieldObjectPic_MudkipDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/mudkip_doll.4bpp"); +const u32 gFieldObjectPic_DuskullDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/duskull_doll.4bpp"); +const u32 gFieldObjectPic_WynautDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/wynaut_doll.4bpp"); +const u32 gFieldObjectPic_BaltoyDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/baltoy_doll.4bpp"); +const u32 gFieldObjectPic_KecleonDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/kecleon_doll.4bpp"); +const u32 gFieldObjectPic_AzurillDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/azurill_doll.4bpp"); +const u32 gFieldObjectPic_SkittyDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/skitty_doll.4bpp"); +const u32 gFieldObjectPic_SwabluDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/swablu_doll.4bpp"); +const u32 gFieldObjectPic_GulpinDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/gulpin_doll.4bpp"); +const u32 gFieldObjectPic_LotadDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/lotad_doll.4bpp"); +const u32 gFieldObjectPic_SeedotDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/seedot_doll.4bpp"); +const u32 gFieldObjectPic_PikaCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/pika_cushion.4bpp"); +const u32 gFieldObjectPic_RoundCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/round_cushion.4bpp"); +const u32 gFieldObjectPic_KissCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/kiss_cushion.4bpp"); +const u32 gFieldObjectPic_ZigzagCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/zigzag_cushion.4bpp"); +const u32 gFieldObjectPic_SpinCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/spin_cushion.4bpp"); +const u32 gFieldObjectPic_DiamondCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/diamond_cushion.4bpp"); +const u32 gFieldObjectPic_BallCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/ball_cushion.4bpp"); +const u32 gFieldObjectPic_GrassCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/grass_cushion.4bpp"); +const u32 gFieldObjectPic_FireCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/fire_cushion.4bpp"); +const u32 gFieldObjectPic_WaterCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/water_cushion.4bpp"); +const u32 gFieldObjectPic_BigSnorlaxDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_snorlax_doll.4bpp"); +const u32 gFieldObjectPic_BigRhydonDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_rhydon_doll.4bpp"); +const u32 gFieldObjectPic_BigLaprasDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_lapras_doll.4bpp"); +const u32 gFieldObjectPic_BigVenusaurDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_venusaur_doll.4bpp"); +const u32 gFieldObjectPic_BigCharizardDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_charizard_doll.4bpp"); +const u32 gFieldObjectPic_BigBlastoiseDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_blastoise_doll.4bpp"); +const u32 gFieldObjectPic_BigWailmerDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_wailmer_doll.4bpp"); +const u32 gFieldObjectPic_BigRegirockDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_regirock_doll.4bpp"); +const u32 gFieldObjectPic_BigRegiceDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_regice_doll.4bpp"); +const u32 gFieldObjectPic_BigRegisteelDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_registeel_doll.4bpp"); +const u32 gFieldObjectPic_CuttableTree_0[] = INCBIN_U32("graphics/map_objects/pics/misc/cuttable_tree/0.4bpp"); +const u32 gFieldObjectPic_CuttableTree_1[] = INCBIN_U32("graphics/map_objects/pics/misc/cuttable_tree/1.4bpp"); +const u32 gFieldObjectPic_CuttableTree_2[] = INCBIN_U32("graphics/map_objects/pics/misc/cuttable_tree/2.4bpp"); +const u32 gFieldObjectPic_CuttableTree_3[] = INCBIN_U32("graphics/map_objects/pics/misc/cuttable_tree/3.4bpp"); +const u32 gFieldObjectPic_BreakableRock_0[] = INCBIN_U32("graphics/map_objects/pics/misc/breakable_rock/0.4bpp"); +const u32 gFieldObjectPic_BreakableRock_1[] = INCBIN_U32("graphics/map_objects/pics/misc/breakable_rock/1.4bpp"); +const u32 gFieldObjectPic_BreakableRock_2[] = INCBIN_U32("graphics/map_objects/pics/misc/breakable_rock/2.4bpp"); +const u32 gFieldObjectPic_BreakableRock_3[] = INCBIN_U32("graphics/map_objects/pics/misc/breakable_rock/3.4bpp"); +const u32 gFieldObjectPic_PushableBoulder[] = INCBIN_U32("graphics/map_objects/pics/misc/pushable_boulder.4bpp"); +const u32 gFieldObjectPic_MrBrineysBoat_0[] = INCBIN_U32("graphics/map_objects/pics/misc/mr_brineys_boat/0.4bpp"); +const u32 gFieldObjectPic_MrBrineysBoat_1[] = INCBIN_U32("graphics/map_objects/pics/misc/mr_brineys_boat/1.4bpp"); +const u32 gFieldObjectPic_MrBrineysBoat_2[] = INCBIN_U32("graphics/map_objects/pics/misc/mr_brineys_boat/2.4bpp"); +const u32 gFieldObjectPic_Fossil[] = INCBIN_U32("graphics/map_objects/pics/misc/fossil.4bpp"); +const u32 gFieldObjectPic_SubmarineShadow[] = INCBIN_U32("graphics/map_objects/pics/misc/submarine_shadow.4bpp"); +const u16 gFieldObjectPalette26[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_26.gbapal"); +const u32 gFieldObjectPic_Truck[] = INCBIN_U32("graphics/map_objects/pics/misc/truck.4bpp"); +const u16 gFieldObjectPalette14[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_14.gbapal"); +const u32 gFieldObjectPic_VigorothCarryingBox_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/vigoroth_carrying_box/0.4bpp"); +const u32 gFieldObjectPic_VigorothCarryingBox_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/vigoroth_carrying_box/1.4bpp"); +const u32 gFieldObjectPic_VigorothCarryingBox_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/vigoroth_carrying_box/2.4bpp"); +const u32 gFieldObjectPic_VigorothFacingAway_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/vigoroth_facing_away/0.4bpp"); +const u32 gFieldObjectPic_VigorothFacingAway_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/vigoroth_facing_away/1.4bpp"); +const u16 gFieldObjectPalette15[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_15.gbapal"); +const u32 gFieldObjectPic_BirchsBag[] = INCBIN_U32("graphics/map_objects/pics/misc/birchs_bag.4bpp"); +const u32 gFieldObjectPic_EnemyZigzagoon_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/enemy_zigzagoon/0.4bpp"); +const u32 gFieldObjectPic_EnemyZigzagoon_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/enemy_zigzagoon/1.4bpp"); +const u32 gFieldObjectPic_EnemyZigzagoon_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/enemy_zigzagoon/2.4bpp"); +const u32 gFieldObjectPic_EnemyZigzagoon_3[] = INCBIN_U32("graphics/map_objects/pics/pokemon/enemy_zigzagoon/3.4bpp"); +const u32 gFieldObjectPic_EnemyZigzagoon_4[] = INCBIN_U32("graphics/map_objects/pics/pokemon/enemy_zigzagoon/4.4bpp"); +const u32 gFieldObjectPic_EnemyZigzagoon_5[] = INCBIN_U32("graphics/map_objects/pics/pokemon/enemy_zigzagoon/5.4bpp"); +const u32 gFieldObjectPic_EnemyZigzagoon_6[] = INCBIN_U32("graphics/map_objects/pics/pokemon/enemy_zigzagoon/6.4bpp"); +const u32 gFieldObjectPic_EnemyZigzagoon_7[] = INCBIN_U32("graphics/map_objects/pics/pokemon/enemy_zigzagoon/7.4bpp"); +const u32 gFieldObjectPic_EnemyZigzagoon_8[] = INCBIN_U32("graphics/map_objects/pics/pokemon/enemy_zigzagoon/8.4bpp"); +const u16 gFieldObjectPalette16[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_16.gbapal"); +const u32 gFieldObjectPic_Poochyena_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/0.4bpp"); +const u32 gFieldObjectPic_Poochyena_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/1.4bpp"); +const u32 gFieldObjectPic_Poochyena_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/2.4bpp"); +const u32 gFieldObjectPic_Poochyena_3[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/3.4bpp"); +const u32 gFieldObjectPic_Poochyena_4[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/4.4bpp"); +const u32 gFieldObjectPic_Poochyena_5[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/5.4bpp"); +const u32 gFieldObjectPic_Poochyena_6[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/6.4bpp"); +const u32 gFieldObjectPic_Poochyena_7[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/7.4bpp"); +const u32 gFieldObjectPic_Poochyena_8[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/8.4bpp"); +const u16 gFieldObjectPalette27[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_27.gbapal"); +const u32 gFieldObjectPic_CableCar[] = INCBIN_U32("graphics/map_objects/pics/misc/cable_car.4bpp"); +const u16 gFieldObjectPalette20[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_20.gbapal"); +const u32 gFieldObjectPic_SSTidal[] = INCBIN_U32("graphics/map_objects/pics/misc/ss_tidal.4bpp"); +const u16 gFieldObjectPalette21[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_21.gbapal"); +const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_0[] = INCBIN_U32("graphics/map_objects/pics/effects/berry_tree_growth_sparkle/0.4bpp"); +const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_1[] = INCBIN_U32("graphics/map_objects/pics/effects/berry_tree_growth_sparkle/1.4bpp"); +const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_2[] = INCBIN_U32("graphics/map_objects/pics/effects/berry_tree_growth_sparkle/2.4bpp"); +const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_3[] = INCBIN_U32("graphics/map_objects/pics/effects/berry_tree_growth_sparkle/3.4bpp"); +const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_4[] = INCBIN_U32("graphics/map_objects/pics/effects/berry_tree_growth_sparkle/4.4bpp"); +const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_5[] = INCBIN_U32("graphics/map_objects/pics/effects/berry_tree_growth_sparkle/5.4bpp"); +const u32 gFieldObjectPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/dirt_pile.4bpp"); +const u32 gFieldObjectPic_BerryTreeSprout_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sprout/0.4bpp"); +const u32 gFieldObjectPic_BerryTreeSprout_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sprout/1.4bpp"); +const u32 gFieldObjectPic_PechaBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pecha/0.4bpp"); +const u32 gFieldObjectPic_PechaBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pecha/1.4bpp"); +const u32 gFieldObjectPic_PechaBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pecha/2.4bpp"); +const u32 gFieldObjectPic_PechaBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pecha/3.4bpp"); +const u32 gFieldObjectPic_PechaBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pecha/4.4bpp"); +const u32 gFieldObjectPic_PechaBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pecha/5.4bpp"); +const u32 gFieldObjectPic_KelpsyBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/kelpsy/0.4bpp"); +const u32 gFieldObjectPic_KelpsyBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/kelpsy/1.4bpp"); +const u32 gFieldObjectPic_KelpsyBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/kelpsy/2.4bpp"); +const u32 gFieldObjectPic_KelpsyBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/kelpsy/3.4bpp"); +const u32 gFieldObjectPic_KelpsyBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/kelpsy/4.4bpp"); +const u32 gFieldObjectPic_KelpsyBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/kelpsy/5.4bpp"); +const u32 gFieldObjectPic_WepearBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wepear/0.4bpp"); +const u32 gFieldObjectPic_WepearBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wepear/1.4bpp"); +const u32 gFieldObjectPic_WepearBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wepear/2.4bpp"); +const u32 gFieldObjectPic_WepearBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wepear/3.4bpp"); +const u32 gFieldObjectPic_WepearBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wepear/4.4bpp"); +const u32 gFieldObjectPic_WepearBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wepear/5.4bpp"); +const u32 gFieldObjectPic_IapapaBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/iapapa/0.4bpp"); +const u32 gFieldObjectPic_IapapaBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/iapapa/1.4bpp"); +const u32 gFieldObjectPic_IapapaBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/iapapa/2.4bpp"); +const u32 gFieldObjectPic_IapapaBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/iapapa/3.4bpp"); +const u32 gFieldObjectPic_IapapaBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/iapapa/4.4bpp"); +const u32 gFieldObjectPic_IapapaBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/iapapa/5.4bpp"); +const u32 gFieldObjectPic_CheriBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cheri/0.4bpp"); +const u32 gFieldObjectPic_CheriBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cheri/1.4bpp"); +const u32 gFieldObjectPic_CheriBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cheri/2.4bpp"); +const u32 gFieldObjectPic_CheriBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cheri/3.4bpp"); +const u32 gFieldObjectPic_CheriBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cheri/4.4bpp"); +const u32 gFieldObjectPic_CheriBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cheri/5.4bpp"); +const u32 gFieldObjectPic_FigyBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/figy/0.4bpp"); +const u32 gFieldObjectPic_FigyBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/figy/1.4bpp"); +const u32 gFieldObjectPic_FigyBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/figy/2.4bpp"); +const u32 gFieldObjectPic_FigyBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/figy/3.4bpp"); +const u32 gFieldObjectPic_FigyBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/figy/4.4bpp"); +const u32 gFieldObjectPic_FigyBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/figy/5.4bpp"); +const u32 gFieldObjectPic_MagoBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/mago/0.4bpp"); +const u32 gFieldObjectPic_MagoBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/mago/1.4bpp"); +const u32 gFieldObjectPic_MagoBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/mago/2.4bpp"); +const u32 gFieldObjectPic_MagoBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/mago/3.4bpp"); +const u32 gFieldObjectPic_MagoBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/mago/4.4bpp"); +const u32 gFieldObjectPic_MagoBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/mago/5.4bpp"); +const u32 gFieldObjectPic_LumBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lum/0.4bpp"); +const u32 gFieldObjectPic_LumBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lum/1.4bpp"); +const u32 gFieldObjectPic_LumBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lum/2.4bpp"); +const u32 gFieldObjectPic_LumBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lum/3.4bpp"); +const u32 gFieldObjectPic_LumBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lum/4.4bpp"); +const u32 gFieldObjectPic_LumBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lum/5.4bpp"); +const u32 gFieldObjectPic_RazzBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/razz/0.4bpp"); +const u32 gFieldObjectPic_RazzBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/razz/1.4bpp"); +const u32 gFieldObjectPic_RazzBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/razz/2.4bpp"); +const u32 gFieldObjectPic_RazzBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/razz/3.4bpp"); +const u32 gFieldObjectPic_RazzBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/razz/4.4bpp"); +const u32 gFieldObjectPic_RazzBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/razz/5.4bpp"); +const u32 gFieldObjectPic_GrepaBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/grepa/0.4bpp"); +const u32 gFieldObjectPic_GrepaBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/grepa/1.4bpp"); +const u32 gFieldObjectPic_GrepaBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/grepa/2.4bpp"); +const u32 gFieldObjectPic_GrepaBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/grepa/3.4bpp"); +const u32 gFieldObjectPic_GrepaBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/grepa/4.4bpp"); +const u32 gFieldObjectPic_GrepaBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/grepa/5.4bpp"); +const u32 gFieldObjectPic_RabutaBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rabuta/0.4bpp"); +const u32 gFieldObjectPic_RabutaBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rabuta/1.4bpp"); +const u32 gFieldObjectPic_RabutaBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rabuta/2.4bpp"); +const u32 gFieldObjectPic_RabutaBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rabuta/3.4bpp"); +const u32 gFieldObjectPic_RabutaBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rabuta/4.4bpp"); +const u32 gFieldObjectPic_RabutaBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rabuta/5.4bpp"); +const u32 gFieldObjectPic_NomelBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/nomel/0.4bpp"); +const u32 gFieldObjectPic_NomelBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/nomel/1.4bpp"); +const u32 gFieldObjectPic_NomelBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/nomel/2.4bpp"); +const u32 gFieldObjectPic_NomelBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/nomel/3.4bpp"); +const u32 gFieldObjectPic_NomelBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/nomel/4.4bpp"); +const u32 gFieldObjectPic_NomelBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/nomel/5.4bpp"); +const u32 gFieldObjectPic_LeppaBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/leppa/0.4bpp"); +const u32 gFieldObjectPic_LeppaBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/leppa/1.4bpp"); +const u32 gFieldObjectPic_LeppaBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/leppa/2.4bpp"); +const u32 gFieldObjectPic_LeppaBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/leppa/3.4bpp"); +const u32 gFieldObjectPic_LeppaBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/leppa/4.4bpp"); +const u32 gFieldObjectPic_LeppaBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/leppa/5.4bpp"); +const u32 gFieldObjectPic_LiechiBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/liechi/0.4bpp"); +const u32 gFieldObjectPic_LiechiBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/liechi/1.4bpp"); +const u32 gFieldObjectPic_LiechiBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/liechi/2.4bpp"); +const u32 gFieldObjectPic_LiechiBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/liechi/3.4bpp"); +const u32 gFieldObjectPic_LiechiBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/liechi/4.4bpp"); +const u32 gFieldObjectPic_LiechiBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/liechi/5.4bpp"); +const u32 gFieldObjectPic_HondewBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/hondew/0.4bpp"); +const u32 gFieldObjectPic_HondewBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/hondew/1.4bpp"); +const u32 gFieldObjectPic_HondewBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/hondew/2.4bpp"); +const u32 gFieldObjectPic_HondewBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/hondew/3.4bpp"); +const u32 gFieldObjectPic_HondewBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/hondew/4.4bpp"); +const u32 gFieldObjectPic_HondewBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/hondew/5.4bpp"); +const u32 gFieldObjectPic_AguavBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aguav/0.4bpp"); +const u32 gFieldObjectPic_AguavBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aguav/1.4bpp"); +const u32 gFieldObjectPic_AguavBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aguav/2.4bpp"); +const u32 gFieldObjectPic_AguavBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aguav/3.4bpp"); +const u32 gFieldObjectPic_AguavBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aguav/4.4bpp"); +const u32 gFieldObjectPic_AguavBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aguav/5.4bpp"); +const u32 gFieldObjectPic_WikiBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wiki/0.4bpp"); +const u32 gFieldObjectPic_WikiBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wiki/1.4bpp"); +const u32 gFieldObjectPic_WikiBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wiki/2.4bpp"); +const u32 gFieldObjectPic_WikiBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wiki/3.4bpp"); +const u32 gFieldObjectPic_WikiBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wiki/4.4bpp"); +const u32 gFieldObjectPic_WikiBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wiki/5.4bpp"); +const u32 gFieldObjectPic_PomegBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pomeg/0.4bpp"); +const u32 gFieldObjectPic_PomegBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pomeg/1.4bpp"); +const u32 gFieldObjectPic_PomegBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pomeg/2.4bpp"); +const u32 gFieldObjectPic_PomegBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pomeg/3.4bpp"); +const u32 gFieldObjectPic_PomegBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pomeg/4.4bpp"); +const u32 gFieldObjectPic_PomegBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pomeg/5.4bpp"); +const u32 gFieldObjectPic_RawstBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rawst/0.4bpp"); +const u32 gFieldObjectPic_RawstBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rawst/1.4bpp"); +const u32 gFieldObjectPic_RawstBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rawst/2.4bpp"); +const u32 gFieldObjectPic_RawstBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rawst/3.4bpp"); +const u32 gFieldObjectPic_RawstBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rawst/4.4bpp"); +const u32 gFieldObjectPic_RawstBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rawst/5.4bpp"); +const u32 gFieldObjectPic_SpelonBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/spelon/0.4bpp"); +const u32 gFieldObjectPic_SpelonBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/spelon/1.4bpp"); +const u32 gFieldObjectPic_SpelonBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/spelon/2.4bpp"); +const u32 gFieldObjectPic_SpelonBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/spelon/3.4bpp"); +const u32 gFieldObjectPic_SpelonBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/spelon/4.4bpp"); +const u32 gFieldObjectPic_SpelonBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/spelon/5.4bpp"); +const u32 gFieldObjectPic_ChestoBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/chesto/0.4bpp"); +const u32 gFieldObjectPic_ChestoBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/chesto/1.4bpp"); +const u32 gFieldObjectPic_ChestoBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/chesto/2.4bpp"); +const u32 gFieldObjectPic_ChestoBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/chesto/3.4bpp"); +const u32 gFieldObjectPic_ChestoBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/chesto/4.4bpp"); +const u32 gFieldObjectPic_ChestoBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/chesto/5.4bpp"); +const u32 gFieldObjectPic_OranBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/oran/0.4bpp"); +const u32 gFieldObjectPic_OranBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/oran/1.4bpp"); +const u32 gFieldObjectPic_OranBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/oran/2.4bpp"); +const u32 gFieldObjectPic_OranBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/oran/3.4bpp"); +const u32 gFieldObjectPic_OranBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/oran/4.4bpp"); +const u32 gFieldObjectPic_OranBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/oran/5.4bpp"); +const u32 gFieldObjectPic_PersimBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/persim/0.4bpp"); +const u32 gFieldObjectPic_PersimBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/persim/1.4bpp"); +const u32 gFieldObjectPic_PersimBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/persim/2.4bpp"); +const u32 gFieldObjectPic_PersimBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/persim/3.4bpp"); +const u32 gFieldObjectPic_PersimBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/persim/4.4bpp"); +const u32 gFieldObjectPic_PersimBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/persim/5.4bpp"); +const u32 gFieldObjectPic_SitrusBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sitrus/0.4bpp"); +const u32 gFieldObjectPic_SitrusBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sitrus/1.4bpp"); +const u32 gFieldObjectPic_SitrusBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sitrus/2.4bpp"); +const u32 gFieldObjectPic_SitrusBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sitrus/3.4bpp"); +const u32 gFieldObjectPic_SitrusBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sitrus/4.4bpp"); +const u32 gFieldObjectPic_SitrusBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sitrus/5.4bpp"); +const u32 gFieldObjectPic_AspearBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aspear/0.4bpp"); +const u32 gFieldObjectPic_AspearBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aspear/1.4bpp"); +const u32 gFieldObjectPic_AspearBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aspear/2.4bpp"); +const u32 gFieldObjectPic_AspearBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aspear/3.4bpp"); +const u32 gFieldObjectPic_AspearBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aspear/4.4bpp"); +const u32 gFieldObjectPic_AspearBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aspear/5.4bpp"); +const u32 gFieldObjectPic_PamtreBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pamtre/0.4bpp"); +const u32 gFieldObjectPic_PamtreBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pamtre/1.4bpp"); +const u32 gFieldObjectPic_PamtreBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pamtre/2.4bpp"); +const u32 gFieldObjectPic_PamtreBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pamtre/3.4bpp"); +const u32 gFieldObjectPic_PamtreBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pamtre/4.4bpp"); +const u32 gFieldObjectPic_PamtreBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pamtre/5.4bpp"); +const u32 gFieldObjectPic_CornnBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cornn/0.4bpp"); +const u32 gFieldObjectPic_CornnBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cornn/1.4bpp"); +const u32 gFieldObjectPic_CornnBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cornn/2.4bpp"); +const u32 gFieldObjectPic_CornnBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cornn/3.4bpp"); +const u32 gFieldObjectPic_CornnBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cornn/4.4bpp"); +const u32 gFieldObjectPic_CornnBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cornn/5.4bpp"); +const u32 gFieldObjectPic_LansatBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lansat/0.4bpp"); +const u32 gFieldObjectPic_LansatBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lansat/1.4bpp"); +const u32 gFieldObjectPic_LansatBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lansat/2.4bpp"); +const u32 gFieldObjectPic_LansatBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lansat/3.4bpp"); +const u32 gFieldObjectPic_LansatBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lansat/4.4bpp"); +const u32 gFieldObjectPic_LansatBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lansat/5.4bpp"); +const u32 gFieldObjectPic_DurinBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/durin/0.4bpp"); +const u32 gFieldObjectPic_DurinBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/durin/1.4bpp"); +const u32 gFieldObjectPic_DurinBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/durin/2.4bpp"); +const u32 gFieldObjectPic_DurinBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/durin/3.4bpp"); +const u32 gFieldObjectPic_DurinBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/durin/4.4bpp"); +const u32 gFieldObjectPic_DurinBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/durin/5.4bpp"); +const u32 gFieldObjectPic_TamatoBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/tamato/0.4bpp"); +const u32 gFieldObjectPic_TamatoBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/tamato/1.4bpp"); +const u32 gFieldObjectPic_TamatoBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/tamato/2.4bpp"); +const u32 gFieldObjectPic_TamatoBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/tamato/3.4bpp"); +const u32 gFieldObjectPic_TamatoBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/tamato/4.4bpp"); +const u32 gFieldObjectPic_TamatoBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/tamato/5.4bpp"); +const u32 gFieldEffectObjectPic_SurfBlob_0[] = INCBIN_U32("graphics/map_objects/pics/effects/surf_blob/0.4bpp"); +const u32 gFieldEffectObjectPic_SurfBlob_1[] = INCBIN_U32("graphics/map_objects/pics/effects/surf_blob/1.4bpp"); +const u32 gFieldEffectObjectPic_SurfBlob_2[] = INCBIN_U32("graphics/map_objects/pics/effects/surf_blob/2.4bpp"); +const u32 gFieldObjectPic_QuintyPlump_0[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/0.4bpp"); +const u32 gFieldObjectPic_QuintyPlump_1[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/1.4bpp"); +const u32 gFieldObjectPic_QuintyPlump_2[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/2.4bpp"); +const u32 gFieldObjectPic_QuintyPlump_3[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/3.4bpp"); +const u32 gFieldObjectPic_QuintyPlump_4[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/4.4bpp"); +const u32 gFieldObjectPic_QuintyPlump_5[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/5.4bpp"); +const u32 gFieldObjectPic_QuintyPlump_6[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/6.4bpp"); +const u16 gFieldObjectPalette12[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_12.gbapal"); +const u16 gFieldObjectPalette13[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_13.gbapal"); +const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/map_objects/pics/effects/shadow_small.4bpp"); +const u32 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U32("graphics/map_objects/pics/effects/shadow_medium.4bpp"); +const u32 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U32("graphics/map_objects/pics/effects/shadow_large.4bpp"); +const u32 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U32("graphics/map_objects/pics/effects/shadow_extra_large.4bpp"); +const u32 gUnknown_084F6D38[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_4F6D38/0.4bpp"); +const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/map_objects/palettes/field_effect_object_palette_06.gbapal"); +const u32 gFieldEffectObjectPic_Ripple_0[] = INCBIN_U32("graphics/map_objects/pics/effects/ripple/0.4bpp"); +const u32 gFieldEffectObjectPic_Ripple_1[] = INCBIN_U32("graphics/map_objects/pics/effects/ripple/1.4bpp"); +const u32 gFieldEffectObjectPic_Ripple_2[] = INCBIN_U32("graphics/map_objects/pics/effects/ripple/2.4bpp"); +const u32 gFieldEffectObjectPic_Ripple_3[] = INCBIN_U32("graphics/map_objects/pics/effects/ripple/3.4bpp"); +const u32 gFieldEffectObjectPic_Ripple_4[] = INCBIN_U32("graphics/map_objects/pics/effects/ripple/4.4bpp"); +const u32 gFieldEffectObjectPic_Ash_0[] = INCBIN_U32("graphics/map_objects/pics/effects/ash/0.4bpp"); +const u32 gFieldEffectObjectPic_Ash_1[] = INCBIN_U32("graphics/map_objects/pics/effects/ash/1.4bpp"); +const u32 gFieldEffectObjectPic_Ash_2[] = INCBIN_U32("graphics/map_objects/pics/effects/ash/2.4bpp"); +const u32 gFieldEffectObjectPic_Ash_3[] = INCBIN_U32("graphics/map_objects/pics/effects/ash/3.4bpp"); +const u32 gFieldEffectObjectPic_Ash_4[] = INCBIN_U32("graphics/map_objects/pics/effects/ash/4.4bpp"); +const u32 gFieldEffectObjectPic_Arrow_0[] = INCBIN_U32("graphics/map_objects/pics/effects/arrow/0.4bpp"); +const u32 gFieldEffectObjectPic_Arrow_1[] = INCBIN_U32("graphics/map_objects/pics/effects/arrow/1.4bpp"); +const u32 gFieldEffectObjectPic_Arrow_2[] = INCBIN_U32("graphics/map_objects/pics/effects/arrow/2.4bpp"); +const u32 gFieldEffectObjectPic_Arrow_3[] = INCBIN_U32("graphics/map_objects/pics/effects/arrow/3.4bpp"); +const u32 gFieldEffectObjectPic_Arrow_4[] = INCBIN_U32("graphics/map_objects/pics/effects/arrow/4.4bpp"); +const u32 gFieldEffectObjectPic_Arrow_5[] = INCBIN_U32("graphics/map_objects/pics/effects/arrow/5.4bpp"); +const u32 gFieldEffectObjectPic_Arrow_6[] = INCBIN_U32("graphics/map_objects/pics/effects/arrow/6.4bpp"); +const u32 gFieldEffectObjectPic_Arrow_7[] = INCBIN_U32("graphics/map_objects/pics/effects/arrow/7.4bpp"); +const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/map_objects/palettes/field_effect_object_palette_00.gbapal"); +const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/map_objects/palettes/field_effect_object_palette_01.gbapal"); +const u32 gFieldEffectObjectPic_GroundImpactDust_0[] = INCBIN_U32("graphics/map_objects/pics/effects/ground_impact_dust/0.4bpp"); +const u32 gFieldEffectObjectPic_GroundImpactDust_1[] = INCBIN_U32("graphics/map_objects/pics/effects/ground_impact_dust/1.4bpp"); +const u32 gFieldEffectObjectPic_GroundImpactDust_2[] = INCBIN_U32("graphics/map_objects/pics/effects/ground_impact_dust/2.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopTallGrass_0[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_tall_grass/0.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopTallGrass_1[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_tall_grass/1.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopTallGrass_2[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_tall_grass/2.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopTallGrass_3[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_tall_grass/3.4bpp"); +const u32 gUnusedGrass_0[] = INCBIN_U32("graphics/map_objects/pics/effects/unused_grass/0.4bpp"); +const u32 gUnusedGrass_1[] = INCBIN_U32("graphics/map_objects/pics/effects/unused_grass/1.4bpp"); +const u32 gUnusedGrass_2[] = INCBIN_U32("graphics/map_objects/pics/effects/unused_grass/2.4bpp"); +const u32 gUnusedGrass_3[] = INCBIN_U32("graphics/map_objects/pics/effects/unused_grass/3.4bpp"); +const u32 gFieldEffectObjectPic_Unknown16_0[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_16/0.4bpp"); +const u32 gFieldEffectObjectPic_Unknown16_1[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_16/1.4bpp"); +const u32 gFieldEffectObjectPic_Unknown16_2[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_16/2.4bpp"); +const u32 gFieldEffectObjectPic_Unknown16_3[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_16/3.4bpp"); +const u32 gFieldEffectObjectPic_Unknown16_4[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_16/4.4bpp"); +const u32 gUnknown_084F7E38[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_4F7E38/0.4bpp"); +const u32 gFieldEffectObjectPic_Unknown16_5[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_16/5.4bpp"); +const u32 gFieldEffectObjectPic_Unknown17_0[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_17/0.4bpp"); +const u32 gFieldEffectObjectPic_Unknown17_1[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_17/1.4bpp"); +const u32 gFieldEffectObjectPic_Unknown17_2[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_17/2.4bpp"); +const u32 gFieldEffectObjectPic_Unknown17_3[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_17/3.4bpp"); +const u32 gFieldEffectObjectPic_Unknown17_4[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_17/4.4bpp"); +const u32 gFieldEffectObjectPic_Unknown17_5[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_17/5.4bpp"); +const u32 gFieldEffectObjectPic_Unknown17_6[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_17/6.4bpp"); +const u32 gFieldEffectObjectPic_Unknown17_7[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_17/7.4bpp"); +const u32 gFieldEffectObjectPic_Unknown18_0[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_18/0.4bpp"); +const u32 gFieldEffectObjectPic_Unknown18_1[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_18/1.4bpp"); +const u32 gFieldEffectObjectPic_Unknown18_2[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_18/2.4bpp"); +const u32 gFieldEffectObjectPic_Unknown18_3[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_18/3.4bpp"); +const u32 gFieldEffectObjectPic_LongGrass_0[] = INCBIN_U32("graphics/map_objects/pics/effects/long_grass/0.4bpp"); +const u32 gFieldEffectObjectPic_LongGrass_1[] = INCBIN_U32("graphics/map_objects/pics/effects/long_grass/1.4bpp"); +const u32 gFieldEffectObjectPic_LongGrass_2[] = INCBIN_U32("graphics/map_objects/pics/effects/long_grass/2.4bpp"); +const u32 gFieldEffectObjectPic_LongGrass_3[] = INCBIN_U32("graphics/map_objects/pics/effects/long_grass/3.4bpp"); +const u32 gFieldEffectObjectPic_TallGrass_0[] = INCBIN_U32("graphics/map_objects/pics/effects/tall_grass/0.4bpp"); +const u32 gFieldEffectObjectPic_TallGrass_1[] = INCBIN_U32("graphics/map_objects/pics/effects/tall_grass/1.4bpp"); +const u32 gFieldEffectObjectPic_TallGrass_2[] = INCBIN_U32("graphics/map_objects/pics/effects/tall_grass/2.4bpp"); +const u32 gFieldEffectObjectPic_TallGrass_3[] = INCBIN_U32("graphics/map_objects/pics/effects/tall_grass/3.4bpp"); +const u32 gFieldEffectObjectPic_TallGrass_4[] = INCBIN_U32("graphics/map_objects/pics/effects/tall_grass/4.4bpp"); +const u32 gFieldEffectObjectPic_ShortGrass_0[] = INCBIN_U32("graphics/map_objects/pics/effects/short_grass/0.4bpp"); +const u32 gFieldEffectObjectPic_ShortGrass_1[] = INCBIN_U32("graphics/map_objects/pics/effects/short_grass/1.4bpp"); +const u32 gFieldEffectObjectPic_SandFootprints_0[] = INCBIN_U32("graphics/map_objects/pics/effects/sand_footprints/0.4bpp"); +const u32 gFieldEffectObjectPic_SandFootprints_1[] = INCBIN_U32("graphics/map_objects/pics/effects/sand_footprints/1.4bpp"); +const u32 gFieldEffectObjectPic_DeepSandFootprints_0[] = INCBIN_U32("graphics/map_objects/pics/effects/deep_sand_footprints/0.4bpp"); +const u32 gFieldEffectObjectPic_DeepSandFootprints_1[] = INCBIN_U32("graphics/map_objects/pics/effects/deep_sand_footprints/1.4bpp"); +const u32 gFieldEffectObjectPic_BikeTireTracks_0[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_tire_tracks/0.4bpp"); +const u32 gFieldEffectObjectPic_BikeTireTracks_1[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_tire_tracks/1.4bpp"); +const u32 gFieldEffectObjectPic_BikeTireTracks_2[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_tire_tracks/2.4bpp"); +const u32 gFieldEffectObjectPic_BikeTireTracks_3[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_tire_tracks/3.4bpp"); +const u32 gFieldEffectObjectPic_Unknown19_0[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_19/0.4bpp"); +const u32 gFieldEffectObjectPic_Unknown19_1[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_19/1.4bpp"); +const u32 gFieldEffectObjectPic_Unknown19_2[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_19/2.4bpp"); +const u32 gFieldEffectObjectPic_Unknown19_3[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_19/3.4bpp"); +const u32 gFieldEffectObjectPic_Unknown29_0[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_29/0.4bpp"); +const u32 gFieldEffectObjectPic_Unknown29_1[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_29/1.4bpp"); +const u32 gFieldEffectObjectPic_Unknown29_2[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_29/2.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopBigSplash_0[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_big_splash/0.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopBigSplash_1[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_big_splash/1.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopBigSplash_2[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_big_splash/2.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopBigSplash_3[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_big_splash/3.4bpp"); +const u32 gFieldEffectObjectPic_Splash_0[] = INCBIN_U32("graphics/map_objects/pics/effects/splash/0.4bpp"); +const u32 gFieldEffectObjectPic_Splash_1[] = INCBIN_U32("graphics/map_objects/pics/effects/splash/1.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopSmallSplash_0[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_small_splash/0.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopSmallSplash_1[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_small_splash/1.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopSmallSplash_2[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_small_splash/2.4bpp"); +const u32 gFieldEffectObjectPic_Unknown20_0[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_20/0.4bpp"); +const u32 gFieldEffectObjectPic_Unknown20_1[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_20/1.4bpp"); +const u32 gFieldEffectObjectPic_Unknown20_2[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_20/2.4bpp"); +const u32 gFieldEffectObjectPic_Unknown20_3[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_20/3.4bpp"); +const u32 gFieldEffectObjectPic_Unknown20_4[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_20/4.4bpp"); +const u32 gFieldEffectObjectPic_TreeDisguise_0[] = INCBIN_U32("graphics/map_objects/pics/effects/tree_disguise/0.4bpp"); +const u32 gFieldEffectObjectPic_TreeDisguise_1[] = INCBIN_U32("graphics/map_objects/pics/effects/tree_disguise/1.4bpp"); +const u32 gFieldEffectObjectPic_TreeDisguise_2[] = INCBIN_U32("graphics/map_objects/pics/effects/tree_disguise/2.4bpp"); +const u32 gFieldEffectObjectPic_TreeDisguise_3[] = INCBIN_U32("graphics/map_objects/pics/effects/tree_disguise/3.4bpp"); +const u32 gFieldEffectObjectPic_TreeDisguise_4[] = INCBIN_U32("graphics/map_objects/pics/effects/tree_disguise/4.4bpp"); +const u32 gFieldEffectObjectPic_TreeDisguise_5[] = INCBIN_U32("graphics/map_objects/pics/effects/tree_disguise/5.4bpp"); +const u32 gFieldEffectObjectPic_TreeDisguise_6[] = INCBIN_U32("graphics/map_objects/pics/effects/tree_disguise/6.4bpp"); +const u32 gFieldEffectObjectPic_MountainDisguise_0[] = INCBIN_U32("graphics/map_objects/pics/effects/mountain_disguise/0.4bpp"); +const u32 gFieldEffectObjectPic_MountainDisguise_1[] = INCBIN_U32("graphics/map_objects/pics/effects/mountain_disguise/1.4bpp"); +const u32 gFieldEffectObjectPic_MountainDisguise_2[] = INCBIN_U32("graphics/map_objects/pics/effects/mountain_disguise/2.4bpp"); +const u32 gFieldEffectObjectPic_MountainDisguise_3[] = INCBIN_U32("graphics/map_objects/pics/effects/mountain_disguise/3.4bpp"); +const u32 gFieldEffectObjectPic_MountainDisguise_4[] = INCBIN_U32("graphics/map_objects/pics/effects/mountain_disguise/4.4bpp"); +const u32 gFieldEffectObjectPic_MountainDisguise_5[] = INCBIN_U32("graphics/map_objects/pics/effects/mountain_disguise/5.4bpp"); +const u32 gFieldEffectObjectPic_MountainDisguise_6[] = INCBIN_U32("graphics/map_objects/pics/effects/mountain_disguise/6.4bpp"); +const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_0[] = INCBIN_U32("graphics/map_objects/pics/effects/sand_disguise_placeholder/0.4bpp"); +const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_1[] = INCBIN_U32("graphics/map_objects/pics/effects/sand_disguise_placeholder/1.4bpp"); +const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_2[] = INCBIN_U32("graphics/map_objects/pics/effects/sand_disguise_placeholder/2.4bpp"); +const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_3[] = INCBIN_U32("graphics/map_objects/pics/effects/sand_disguise_placeholder/3.4bpp"); +const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_4[] = INCBIN_U32("graphics/map_objects/pics/effects/sand_disguise_placeholder/4.4bpp"); +const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_5[] = INCBIN_U32("graphics/map_objects/pics/effects/sand_disguise_placeholder/5.4bpp"); +const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_6[] = INCBIN_U32("graphics/map_objects/pics/effects/sand_disguise_placeholder/6.4bpp"); +const u32 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U32("graphics/map_objects/pics/effects/hot_springs_water.4bpp"); +const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/map_objects/palettes/field_effect_object_palette_02.gbapal"); +const u32 gFieldEffectObjectPic_JumpOutOfAsh_0[] = INCBIN_U32("graphics/map_objects/pics/effects/jump_out_of_ash/0.4bpp"); +const u32 gFieldEffectObjectPic_JumpOutOfAsh_1[] = INCBIN_U32("graphics/map_objects/pics/effects/jump_out_of_ash/1.4bpp"); +const u32 gFieldEffectObjectPic_JumpOutOfAsh_2[] = INCBIN_U32("graphics/map_objects/pics/effects/jump_out_of_ash/2.4bpp"); +const u32 gFieldEffectObjectPic_JumpOutOfAsh_3[] = INCBIN_U32("graphics/map_objects/pics/effects/jump_out_of_ash/3.4bpp"); +const u32 gFieldEffectObjectPic_JumpOutOfAsh_4[] = INCBIN_U32("graphics/map_objects/pics/effects/jump_out_of_ash/4.4bpp"); +const u32 gFieldEffectObjectPic_Unknown33_0[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_33/0.4bpp"); +const u32 gFieldEffectObjectPic_Unknown33_1[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_33/1.4bpp"); +const u32 gFieldEffectObjectPic_Unknown33_2[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_33/2.4bpp"); +const u32 gFieldEffectObjectPic_Unknown33_3[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_33/3.4bpp"); +const u32 gFieldEffectObjectPic_Unknown33_4[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_33/4.4bpp"); +const u32 gFieldEffectObjectPic_Bubbles_0[] = INCBIN_U32("graphics/map_objects/pics/effects/bubbles/0.4bpp"); +const u32 gFieldEffectObjectPic_Bubbles_1[] = INCBIN_U32("graphics/map_objects/pics/effects/bubbles/1.4bpp"); +const u32 gFieldEffectObjectPic_Bubbles_2[] = INCBIN_U32("graphics/map_objects/pics/effects/bubbles/2.4bpp"); +const u32 gFieldEffectObjectPic_Bubbles_3[] = INCBIN_U32("graphics/map_objects/pics/effects/bubbles/3.4bpp"); +const u32 gFieldEffectObjectPic_Bubbles_4[] = INCBIN_U32("graphics/map_objects/pics/effects/bubbles/4.4bpp"); +const u32 gFieldEffectObjectPic_Bubbles_5[] = INCBIN_U32("graphics/map_objects/pics/effects/bubbles/5.4bpp"); +const u32 gFieldEffectObjectPic_Bubbles_6[] = INCBIN_U32("graphics/map_objects/pics/effects/bubbles/6.4bpp"); +const u32 gFieldEffectObjectPic_Bubbles_7[] = INCBIN_U32("graphics/map_objects/pics/effects/bubbles/7.4bpp"); +const u32 gFieldEffectObjectPic_Unknown35_0[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_35/0.4bpp"); +const u32 gFieldEffectObjectPic_Unknown35_1[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_35/1.4bpp"); +const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/map_objects/palettes/field_effect_object_palette_03.gbapal"); +const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/map_objects/pics/effects/bird.4bpp"); +const u32 gFieldObjectPic_Juan_0[] = INCBIN_U32("graphics/map_objects/pics/people/juan/0.4bpp"); +const u32 gFieldObjectPic_Juan_1[] = INCBIN_U32("graphics/map_objects/pics/people/juan/1.4bpp"); +const u32 gFieldObjectPic_Juan_2[] = INCBIN_U32("graphics/map_objects/pics/people/juan/2.4bpp"); +const u32 gFieldObjectPic_Juan_3[] = INCBIN_U32("graphics/map_objects/pics/people/juan/3.4bpp"); +const u32 gFieldObjectPic_Juan_4[] = INCBIN_U32("graphics/map_objects/pics/people/juan/4.4bpp"); +const u32 gFieldObjectPic_Juan_5[] = INCBIN_U32("graphics/map_objects/pics/people/juan/5.4bpp"); +const u32 gFieldObjectPic_Juan_6[] = INCBIN_U32("graphics/map_objects/pics/people/juan/6.4bpp"); +const u32 gFieldObjectPic_Juan_7[] = INCBIN_U32("graphics/map_objects/pics/people/juan/7.4bpp"); +const u32 gFieldObjectPic_Juan_8[] = INCBIN_U32("graphics/map_objects/pics/people/juan/8.4bpp"); +const u32 gFieldObjectPic_Scott_0[] = INCBIN_U32("graphics/map_objects/pics/people/scott/0.4bpp"); +const u32 gFieldObjectPic_Scott_1[] = INCBIN_U32("graphics/map_objects/pics/people/scott/1.4bpp"); +const u32 gFieldObjectPic_Scott_2[] = INCBIN_U32("graphics/map_objects/pics/people/scott/2.4bpp"); +const u32 gFieldObjectPic_Scott_3[] = INCBIN_U32("graphics/map_objects/pics/people/scott/3.4bpp"); +const u32 gFieldObjectPic_Scott_4[] = INCBIN_U32("graphics/map_objects/pics/people/scott/4.4bpp"); +const u32 gFieldObjectPic_Scott_5[] = INCBIN_U32("graphics/map_objects/pics/people/scott/5.4bpp"); +const u32 gFieldObjectPic_Scott_6[] = INCBIN_U32("graphics/map_objects/pics/people/scott/6.4bpp"); +const u32 gFieldObjectPic_Scott_7[] = INCBIN_U32("graphics/map_objects/pics/people/scott/7.4bpp"); +const u32 gFieldObjectPic_Scott_8[] = INCBIN_U32("graphics/map_objects/pics/people/scott/8.4bpp"); +const u32 gFieldObjectPic_Statue[] = INCBIN_U32("graphics/map_objects/pics/misc/statue.4bpp"); +const u32 gFieldObjectPic_Kirlia_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kirlia/0.4bpp"); +const u32 gFieldObjectPic_Kirlia_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kirlia/1.4bpp"); +const u32 gFieldObjectPic_Kirlia_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kirlia/2.4bpp"); +const u32 gFieldObjectPic_Kirlia_3[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kirlia/3.4bpp"); +const u32 gFieldObjectPic_Kirlia_4[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kirlia/4.4bpp"); +const u32 gFieldObjectPic_Kirlia_5[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kirlia/5.4bpp"); +const u32 gFieldObjectPic_Kirlia_6[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kirlia/6.4bpp"); +const u32 gFieldObjectPic_Kirlia_7[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kirlia/7.4bpp"); +const u32 gFieldObjectPic_Kirlia_8[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kirlia/8.4bpp"); +const u32 gFieldObjectPic_Dusclops_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/dusclops/0.4bpp"); +const u32 gFieldObjectPic_Dusclops_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/dusclops/1.4bpp"); +const u32 gFieldObjectPic_Dusclops_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/dusclops/2.4bpp"); +const u32 gFieldObjectPic_Dusclops_3[] = INCBIN_U32("graphics/map_objects/pics/pokemon/dusclops/3.4bpp"); +const u32 gFieldObjectPic_Dusclops_4[] = INCBIN_U32("graphics/map_objects/pics/pokemon/dusclops/4.4bpp"); +const u32 gFieldObjectPic_Dusclops_5[] = INCBIN_U32("graphics/map_objects/pics/pokemon/dusclops/5.4bpp"); +const u32 gFieldObjectPic_Dusclops_6[] = INCBIN_U32("graphics/map_objects/pics/pokemon/dusclops/6.4bpp"); +const u32 gFieldObjectPic_Dusclops_7[] = INCBIN_U32("graphics/map_objects/pics/pokemon/dusclops/7.4bpp"); +const u32 gFieldObjectPic_Dusclops_8[] = INCBIN_U32("graphics/map_objects/pics/pokemon/dusclops/8.4bpp"); +const u32 gFieldObjectPic_MysteryEventDeliveryman_0[] = INCBIN_U32("graphics/map_objects/pics/people/mystery_event_deliveryman/0.4bpp"); +const u32 gFieldObjectPic_MysteryEventDeliveryman_1[] = INCBIN_U32("graphics/map_objects/pics/people/mystery_event_deliveryman/1.4bpp"); +const u32 gFieldObjectPic_MysteryEventDeliveryman_2[] = INCBIN_U32("graphics/map_objects/pics/people/mystery_event_deliveryman/2.4bpp"); +const u32 gFieldObjectPic_UnionRoomAttendant_0[] = INCBIN_U32("graphics/map_objects/pics/people/union_room_attendant/0.4bpp"); +const u32 gFieldObjectPic_UnionRoomAttendant_1[] = INCBIN_U32("graphics/map_objects/pics/people/union_room_attendant/1.4bpp"); +const u32 gFieldObjectPic_UnionRoomAttendant_2[] = INCBIN_U32("graphics/map_objects/pics/people/union_room_attendant/2.4bpp"); +const u32 gFieldObjectPic_MovingBox[] = INCBIN_U32("graphics/map_objects/pics/misc/moving_box.4bpp"); +const u16 gFieldObjectPalette19[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_19.gbapal"); +const u32 gFieldObjectPic_Sudowoodo_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/sudowoodo/0.4bpp"); +const u32 gFieldObjectPic_Sudowoodo_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/sudowoodo/1.4bpp"); +const u32 gFieldObjectPic_Sudowoodo_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/sudowoodo/2.4bpp"); +const u32 gFieldObjectPic_Mew_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/mew/0.4bpp"); +const u32 gFieldObjectPic_Mew_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/mew/1.4bpp"); +const u32 gFieldObjectPic_Mew_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/mew/2.4bpp"); +const u32 gFieldObjectPic_Mew_3[] = INCBIN_U32("graphics/map_objects/pics/pokemon/mew/3.4bpp"); +const u32 gFieldObjectPic_Mew_4[] = INCBIN_U32("graphics/map_objects/pics/pokemon/mew/4.4bpp"); +const u32 gFieldObjectPic_Mew_5[] = INCBIN_U32("graphics/map_objects/pics/pokemon/mew/5.4bpp"); +const u32 gFieldObjectPic_Mew_6[] = INCBIN_U32("graphics/map_objects/pics/pokemon/mew/6.4bpp"); +const u32 gFieldObjectPic_Mew_7[] = INCBIN_U32("graphics/map_objects/pics/pokemon/mew/7.4bpp"); +const u32 gFieldObjectPic_Mew_8[] = INCBIN_U32("graphics/map_objects/pics/pokemon/mew/8.4bpp"); +const u16 gFieldObjectPalette28[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_28.gbapal"); +const u32 gFieldObjectPic_Red_0[] = INCBIN_U32("graphics/map_objects/pics/people/red/0.4bpp"); +const u32 gFieldObjectPic_Red_1[] = INCBIN_U32("graphics/map_objects/pics/people/red/1.4bpp"); +const u32 gFieldObjectPic_Red_2[] = INCBIN_U32("graphics/map_objects/pics/people/red/2.4bpp"); +const u32 gFieldObjectPic_Red_3[] = INCBIN_U32("graphics/map_objects/pics/people/red/3.4bpp"); +const u32 gFieldObjectPic_Red_4[] = INCBIN_U32("graphics/map_objects/pics/people/red/4.4bpp"); +const u32 gFieldObjectPic_Red_5[] = INCBIN_U32("graphics/map_objects/pics/people/red/5.4bpp"); +const u32 gFieldObjectPic_Red_6[] = INCBIN_U32("graphics/map_objects/pics/people/red/6.4bpp"); +const u32 gFieldObjectPic_Red_7[] = INCBIN_U32("graphics/map_objects/pics/people/red/7.4bpp"); +const u32 gFieldObjectPic_Red_8[] = INCBIN_U32("graphics/map_objects/pics/people/red/8.4bpp"); +const u32 gFieldObjectPic_Leaf_0[] = INCBIN_U32("graphics/map_objects/pics/people/leaf/0.4bpp"); +const u32 gFieldObjectPic_Leaf_1[] = INCBIN_U32("graphics/map_objects/pics/people/leaf/1.4bpp"); +const u32 gFieldObjectPic_Leaf_2[] = INCBIN_U32("graphics/map_objects/pics/people/leaf/2.4bpp"); +const u32 gFieldObjectPic_Leaf_3[] = INCBIN_U32("graphics/map_objects/pics/people/leaf/3.4bpp"); +const u32 gFieldObjectPic_Leaf_4[] = INCBIN_U32("graphics/map_objects/pics/people/leaf/4.4bpp"); +const u32 gFieldObjectPic_Leaf_5[] = INCBIN_U32("graphics/map_objects/pics/people/leaf/5.4bpp"); +const u32 gFieldObjectPic_Leaf_6[] = INCBIN_U32("graphics/map_objects/pics/people/leaf/6.4bpp"); +const u32 gFieldObjectPic_Leaf_7[] = INCBIN_U32("graphics/map_objects/pics/people/leaf/7.4bpp"); +const u32 gFieldObjectPic_Leaf_8[] = INCBIN_U32("graphics/map_objects/pics/people/leaf/8.4bpp"); +const u16 gFieldObjectPalette30[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_30.gbapal"); +const u32 gFieldObjectPic_BirthIslandStone[] = INCBIN_U32("graphics/map_objects/pics/misc/birth_island_stone.4bpp"); +const u16 gFieldObjectPalette29[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_29.gbapal"); +const u32 gFieldObjectPic_Deoxys_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/deoxys/0.4bpp"); +const u32 gFieldObjectPic_Deoxys_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/deoxys/1.4bpp"); +const u32 gFieldObjectPic_Anabel_0[] = INCBIN_U32("graphics/map_objects/pics/people/anabel/0.4bpp"); +const u32 gFieldObjectPic_Anabel_1[] = INCBIN_U32("graphics/map_objects/pics/people/anabel/1.4bpp"); +const u32 gFieldObjectPic_Anabel_2[] = INCBIN_U32("graphics/map_objects/pics/people/anabel/2.4bpp"); +const u32 gFieldObjectPic_Anabel_3[] = INCBIN_U32("graphics/map_objects/pics/people/anabel/3.4bpp"); +const u32 gFieldObjectPic_Anabel_4[] = INCBIN_U32("graphics/map_objects/pics/people/anabel/4.4bpp"); +const u32 gFieldObjectPic_Anabel_5[] = INCBIN_U32("graphics/map_objects/pics/people/anabel/5.4bpp"); +const u32 gFieldObjectPic_Anabel_6[] = INCBIN_U32("graphics/map_objects/pics/people/anabel/6.4bpp"); +const u32 gFieldObjectPic_Anabel_7[] = INCBIN_U32("graphics/map_objects/pics/people/anabel/7.4bpp"); +const u32 gFieldObjectPic_Anabel_8[] = INCBIN_U32("graphics/map_objects/pics/people/anabel/8.4bpp"); +const u32 gFieldObjectPic_Tucker_0[] = INCBIN_U32("graphics/map_objects/pics/people/tucker/0.4bpp"); +const u32 gFieldObjectPic_Tucker_1[] = INCBIN_U32("graphics/map_objects/pics/people/tucker/1.4bpp"); +const u32 gFieldObjectPic_Tucker_2[] = INCBIN_U32("graphics/map_objects/pics/people/tucker/2.4bpp"); +const u32 gFieldObjectPic_Tucker_3[] = INCBIN_U32("graphics/map_objects/pics/people/tucker/3.4bpp"); +const u32 gFieldObjectPic_Tucker_4[] = INCBIN_U32("graphics/map_objects/pics/people/tucker/4.4bpp"); +const u32 gFieldObjectPic_Tucker_5[] = INCBIN_U32("graphics/map_objects/pics/people/tucker/5.4bpp"); +const u32 gFieldObjectPic_Tucker_6[] = INCBIN_U32("graphics/map_objects/pics/people/tucker/6.4bpp"); +const u32 gFieldObjectPic_Tucker_7[] = INCBIN_U32("graphics/map_objects/pics/people/tucker/7.4bpp"); +const u32 gFieldObjectPic_Tucker_8[] = INCBIN_U32("graphics/map_objects/pics/people/tucker/8.4bpp"); +const u32 gFieldObjectPic_Spenser_0[] = INCBIN_U32("graphics/map_objects/pics/people/spenser/0.4bpp"); +const u32 gFieldObjectPic_Spenser_1[] = INCBIN_U32("graphics/map_objects/pics/people/spenser/1.4bpp"); +const u32 gFieldObjectPic_Spenser_2[] = INCBIN_U32("graphics/map_objects/pics/people/spenser/2.4bpp"); +const u32 gFieldObjectPic_Spenser_3[] = INCBIN_U32("graphics/map_objects/pics/people/spenser/3.4bpp"); +const u32 gFieldObjectPic_Spenser_4[] = INCBIN_U32("graphics/map_objects/pics/people/spenser/4.4bpp"); +const u32 gFieldObjectPic_Spenser_5[] = INCBIN_U32("graphics/map_objects/pics/people/spenser/5.4bpp"); +const u32 gFieldObjectPic_Spenser_6[] = INCBIN_U32("graphics/map_objects/pics/people/spenser/6.4bpp"); +const u32 gFieldObjectPic_Spenser_7[] = INCBIN_U32("graphics/map_objects/pics/people/spenser/7.4bpp"); +const u32 gFieldObjectPic_Spenser_8[] = INCBIN_U32("graphics/map_objects/pics/people/spenser/8.4bpp"); +const u32 gFieldObjectPic_Greta_0[] = INCBIN_U32("graphics/map_objects/pics/people/greta/0.4bpp"); +const u32 gFieldObjectPic_Greta_1[] = INCBIN_U32("graphics/map_objects/pics/people/greta/1.4bpp"); +const u32 gFieldObjectPic_Greta_2[] = INCBIN_U32("graphics/map_objects/pics/people/greta/2.4bpp"); +const u32 gFieldObjectPic_Greta_3[] = INCBIN_U32("graphics/map_objects/pics/people/greta/3.4bpp"); +const u32 gFieldObjectPic_Greta_4[] = INCBIN_U32("graphics/map_objects/pics/people/greta/4.4bpp"); +const u32 gFieldObjectPic_Greta_5[] = INCBIN_U32("graphics/map_objects/pics/people/greta/5.4bpp"); +const u32 gFieldObjectPic_Greta_6[] = INCBIN_U32("graphics/map_objects/pics/people/greta/6.4bpp"); +const u32 gFieldObjectPic_Greta_7[] = INCBIN_U32("graphics/map_objects/pics/people/greta/7.4bpp"); +const u32 gFieldObjectPic_Greta_8[] = INCBIN_U32("graphics/map_objects/pics/people/greta/8.4bpp"); +const u32 gFieldObjectPic_Noland_0[] = INCBIN_U32("graphics/map_objects/pics/people/noland/0.4bpp"); +const u32 gFieldObjectPic_Noland_1[] = INCBIN_U32("graphics/map_objects/pics/people/noland/1.4bpp"); +const u32 gFieldObjectPic_Noland_2[] = INCBIN_U32("graphics/map_objects/pics/people/noland/2.4bpp"); +const u32 gFieldObjectPic_Noland_3[] = INCBIN_U32("graphics/map_objects/pics/people/noland/3.4bpp"); +const u32 gFieldObjectPic_Noland_4[] = INCBIN_U32("graphics/map_objects/pics/people/noland/4.4bpp"); +const u32 gFieldObjectPic_Noland_5[] = INCBIN_U32("graphics/map_objects/pics/people/noland/5.4bpp"); +const u32 gFieldObjectPic_Noland_6[] = INCBIN_U32("graphics/map_objects/pics/people/noland/6.4bpp"); +const u32 gFieldObjectPic_Noland_7[] = INCBIN_U32("graphics/map_objects/pics/people/noland/7.4bpp"); +const u32 gFieldObjectPic_Noland_8[] = INCBIN_U32("graphics/map_objects/pics/people/noland/8.4bpp"); +const u32 gFieldObjectPic_Lucy_0[] = INCBIN_U32("graphics/map_objects/pics/people/lucy/0.4bpp"); +const u32 gFieldObjectPic_Lucy_1[] = INCBIN_U32("graphics/map_objects/pics/people/lucy/1.4bpp"); +const u32 gFieldObjectPic_Lucy_2[] = INCBIN_U32("graphics/map_objects/pics/people/lucy/2.4bpp"); +const u32 gFieldObjectPic_Lucy_3[] = INCBIN_U32("graphics/map_objects/pics/people/lucy/3.4bpp"); +const u32 gFieldObjectPic_Lucy_4[] = INCBIN_U32("graphics/map_objects/pics/people/lucy/4.4bpp"); +const u32 gFieldObjectPic_Lucy_5[] = INCBIN_U32("graphics/map_objects/pics/people/lucy/5.4bpp"); +const u32 gFieldObjectPic_Lucy_6[] = INCBIN_U32("graphics/map_objects/pics/people/lucy/6.4bpp"); +const u32 gFieldObjectPic_Lucy_7[] = INCBIN_U32("graphics/map_objects/pics/people/lucy/7.4bpp"); +const u32 gFieldObjectPic_Lucy_8[] = INCBIN_U32("graphics/map_objects/pics/people/lucy/8.4bpp"); +const u32 gFieldObjectPic_Brandon_0[] = INCBIN_U32("graphics/map_objects/pics/people/brandon/0.4bpp"); +const u32 gFieldObjectPic_Brandon_1[] = INCBIN_U32("graphics/map_objects/pics/people/brandon/1.4bpp"); +const u32 gFieldObjectPic_Brandon_2[] = INCBIN_U32("graphics/map_objects/pics/people/brandon/2.4bpp"); +const u32 gFieldObjectPic_Brandon_3[] = INCBIN_U32("graphics/map_objects/pics/people/brandon/3.4bpp"); +const u32 gFieldObjectPic_Brandon_4[] = INCBIN_U32("graphics/map_objects/pics/people/brandon/4.4bpp"); +const u32 gFieldObjectPic_Brandon_5[] = INCBIN_U32("graphics/map_objects/pics/people/brandon/5.4bpp"); +const u32 gFieldObjectPic_Brandon_6[] = INCBIN_U32("graphics/map_objects/pics/people/brandon/6.4bpp"); +const u32 gFieldObjectPic_Brandon_7[] = INCBIN_U32("graphics/map_objects/pics/people/brandon/7.4bpp"); +const u32 gFieldObjectPic_Brandon_8[] = INCBIN_U32("graphics/map_objects/pics/people/brandon/8.4bpp"); +const u32 gFieldObjectPic_Lugia_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/lugia/0.4bpp"); +const u32 gFieldObjectPic_Lugia_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/lugia/1.4bpp"); +const u16 gFieldObjectPalette32[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_32.gbapal"); +const u32 gFieldObjectPic_HoOh_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/ho_oh/0.4bpp"); +const u32 gFieldObjectPic_HoOh_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/ho_oh/1.4bpp"); +const u16 gFieldObjectPalette31[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_31.gbapal"); + +#endif //GUARD_EVENT_OBJECT_GFX_H diff --git a/src/data/field_event_obj/event_object_graphics_info.h b/src/data/field_event_obj/event_object_graphics_info.h new file mode 100755 index 0000000000..7741094728 --- /dev/null +++ b/src/data/field_event_obj/event_object_graphics_info.h @@ -0,0 +1,250 @@ +#ifndef GUARD_EVENT_OBJECT_GRAPHICS_INFO_H +#define GUARD_EVENT_OBJECT_GRAPHICS_INFO_H + +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanNormal = {0xFFFF, 0x1100, 0x1102, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_BrendanMayNormal, gFieldObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanMachBike = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanAcroBike = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_AcroBike, gFieldObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanSurfing = {0xFFFF, 0x1100, 0x11FF, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Surfing, gFieldObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanFieldMove = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_FieldMove, gFieldObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_QuintyPlump = {0xFFFF, 0x110B, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_L, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_QuintyPlump, gFieldObjectPicTable_QuintyPlump, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LittleBoy1 = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_LittleBoy1, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LittleGirl1 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_LittleGirl1, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy1 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Boy1, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Girl1 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Girl1, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy2 = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Boy2, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Girl2 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Girl2, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LittleBoy2 = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_LittleBoy2, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LittleGirl2 = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_LittleGirl2, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy3 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Boy3, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Girl3 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Girl3, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy4 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Boy4, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman1 = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Woman1, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_FatMan = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_FatMan, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman2 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Woman2, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man1 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Man1, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman3 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Woman3, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_OldMan1 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_OldMan1, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_OldWoman1 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_OldWoman1, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man2 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Man2, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman4 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Woman4, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man3 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Man3, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman5 = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Woman5, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Cook = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Cook, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman6 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Woman6, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_OldMan2 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_OldMan2, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_OldWoman2 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_OldWoman2, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Camper = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Camper, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Picnicker = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Picnicker, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man4 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Man4, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman7 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Woman7, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Youngster = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Youngster, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BugCatcher = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_BugCatcher, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PsychicM = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_PsychicM, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SchoolKidM = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_SchoolKidM, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Maniac = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Maniac, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_HexManiac = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_HexManiac, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Rayquaza1 = {0xFFFF, 0x1105, 0x11FF, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldObjectBaseOam_64x64, gFieldObjectSpriteOamTables_64x64, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_RayquazaStill, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SwimmerM = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_SwimmerM, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SwimmerF = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_SwimmerF, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BlackBelt = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_BlackBelt, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Beauty = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Beauty, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Scientist1 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Scientist1, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Lass = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Lass, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Gentleman = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Gentleman, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Sailor = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Sailor, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Fisherman = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Fisherman, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RunningTriathleteM = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_RunningTriathleteM, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RunningTriathleteF = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_RunningTriathleteF, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TuberF = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_TuberF, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TuberM = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_TuberM, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Hiker = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Hiker, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CyclingTriathleteM = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_AcroBike, gFieldObjectPicTable_CyclingTriathleteM, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CyclingTriathleteF = {0xFFFF, 0x1103, 0x11FF, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_AcroBike, gFieldObjectPicTable_CyclingTriathleteF, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Nurse = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Nurse, gFieldObjectPicTable_Nurse, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ItemBall = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_ItemBall, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BerryTree = {0xFFFF, 0x1103, 0x11FF, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, NULL, gFieldObjectImageAnimTable_BerryTree, gFieldObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BerryTreeEarlyStages = {0xFFFF, 0x1103, 0x11FF, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_BerryTree, gFieldObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BerryTreeLateStages = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_BerryTree, gFieldObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ProfBirch = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_ProfBirch, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man5 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Man5, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man6 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Man6, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ReporterM = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_ReporterM, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ReporterF = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_ReporterF, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Bard = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Hipster = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Trader = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Storyteller = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Giddy = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedMauvilleOldMan1 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedMauvilleOldMan2 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedNatuDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_UnusedNatuDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedMagnemiteDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_UnusedMagnemiteDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedSquirtleDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_UnusedSquirtleDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedWooperDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_UnusedWooperDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedPikachuDoll = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_UnusedPikachuDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedPorygon2Doll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_UnusedPorygon2Doll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CuttableTree = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_CuttableTree, gFieldObjectPicTable_CuttableTree, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MartEmployee = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MartEmployee, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RooftopSaleWoman = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_RooftopSaleWoman, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Teala = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Teala, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BreakableRock = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_BreakableRock, gFieldObjectPicTable_BreakableRock, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PushableBoulder = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_PushableBoulder, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MrBrineysBoat = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MrBrineysBoat, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayNormal = {0xFFFF, 0x1110, 0x1102, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_BrendanMayNormal, gFieldObjectPicTable_MayNormal, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayMachBike = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MayMachBike, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayAcroBike = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_AcroBike, gFieldObjectPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MaySurfing = {0xFFFF, 0x1110, 0x11FF, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Surfing, gFieldObjectPicTable_MaySurfing, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayFieldMove = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_FieldMove, gFieldObjectPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Truck = {0xFFFF, 0x110D, 0x11FF, 1152, 48, 48, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_Truck, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_Truck, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_VigorothCarryingBox = {0xFFFF, 0x110E, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_VigorothCarryingBox, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_VigorothFacingAway = {0xFFFF, 0x110E, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_VigorothFacingAway, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BirchsBag = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BirchsBag, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_EnemyZigzagoon = {0xFFFF, 0x110F, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_EnemyZigzagoon, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Poochyena = {0xFFFF, 0x111C, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Poochyena, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Artist = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Artist, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanNormal = {0xFFFF, 0x1100, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_BrendanMayNormal, gFieldObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanMachBike = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanAcroBike = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_AcroBike, gFieldObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanSurfing = {0xFFFF, 0x1100, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Surfing, gFieldObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanFieldMove = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_FieldMove, gFieldObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMayNormal = {0xFFFF, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_BrendanMayNormal, gFieldObjectPicTable_MayNormal, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMayMachBike = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MayMachBike, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMayAcroBike = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_AcroBike, gFieldObjectPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMaySurfing = {0xFFFF, 0x1110, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Surfing, gFieldObjectPicTable_MaySurfing, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMayFieldMove = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_FieldMove, gFieldObjectPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Cameraman = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Cameraman, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanUnderwater = {0xFFFF, 0x1115, 0x11FF, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_BrendanUnderwater, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayUnderwater = {0xFFFF, 0x1115, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MayUnderwater, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MovingBox = {0xFFFF, 0x1112, 0x11FF, 128, 16, 16, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_MovingBox, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CableCar = {0xFFFF, 0x1113, 0x11FF, 2048, 64, 64, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_64x64, gFieldObjectSpriteOamTables_64x64, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_CableCar, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Scientist2 = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Scientist2, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man7 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Man7, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_AquaMemberM = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_AquaMemberM, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_AquaMemberF = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_AquaMemberF, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MagmaMemberM = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MagmaMemberM, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MagmaMemberF = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MagmaMemberF, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Sidney = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Sidney, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Phoebe = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Phoebe, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Glacia = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Glacia, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Drake = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Drake, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Roxanne = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Roxanne, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Brawly = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Brawly, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Wattson = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Wattson, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Flannery = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Flannery, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Norman = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Norman, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Winona = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Winona, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Liza = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Liza, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Tate = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Tate, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Wallace = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Wallace, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Steven = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Steven, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Wally = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Wally, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RubySapphireLittleBoy = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_RubySapphireLittleBoy, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanFishing = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Fishing, gFieldObjectPicTable_BrendanFishing, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayFishing = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Fishing, gFieldObjectPicTable_MayFishing, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_HotSpringsOldWoman = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_HotSpringsOldWoman, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SSTidal = {0xFFFF, 0x1114, 0x11FF, 1920, 96, 40, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_8x8, gFieldObjectSpriteOamTables_SSTidal, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_SSTidal, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SubmarineShadow = {0xFFFF, 0x111B, 0x11FF, 1408, 88, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_8x8, gFieldObjectSpriteOamTables_SubmarineShadow, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_SubmarineShadow, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PichuDoll = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_PichuDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PikachuDoll = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_PikachuDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MarillDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_MarillDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TogepiDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_TogepiDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CyndaquilDoll = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_CyndaquilDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ChikoritaDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_ChikoritaDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TotodileDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_TotodileDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_JigglypuffDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_JigglypuffDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MeowthDoll = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_MeowthDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ClefairyDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_ClefairyDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_DittoDoll = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_DittoDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SmoochumDoll = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_SmoochumDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TreeckoDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_TreeckoDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TorchicDoll = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_TorchicDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MudkipDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_MudkipDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_DuskullDoll = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_DuskullDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_WynautDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_WynautDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BaltoyDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BaltoyDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_KecleonDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_KecleonDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_AzurillDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_AzurillDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SkittyDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_SkittyDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SwabluDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_SwabluDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_GulpinDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_GulpinDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LotadDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_LotadDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SeedotDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_SeedotDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PikaCushion = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_PikaCushion, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RoundCushion = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_RoundCushion, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_KissCushion = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_KissCushion, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ZigzagCushion = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_ZigzagCushion, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SpinCushion = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_SpinCushion, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_DiamondCushion = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_DiamondCushion, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BallCushion = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BallCushion, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_GrassCushion = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_GrassCushion, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_FireCushion = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_FireCushion, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_WaterCushion = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_WaterCushion, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigSnorlaxDoll = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigSnorlaxDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigRhydonDoll = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigRhydonDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigLaprasDoll = {0xFFFF, 0x1103, 0x11FF, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigLaprasDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigVenusaurDoll = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigVenusaurDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigCharizardDoll = {0xFFFF, 0x1104, 0x11FF, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigCharizardDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigBlastoiseDoll = {0xFFFF, 0x1103, 0x11FF, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigBlastoiseDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigWailmerDoll = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigWailmerDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigRegirockDoll = {0xFFFF, 0x1103, 0x11FF, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigRegirockDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigRegiceDoll = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigRegiceDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigRegisteelDoll = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigRegisteelDoll, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Latias = {0xFFFF, 0x1104, 0x11FF, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Latios = {0xFFFF, 0x1103, 0x11FF, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy5 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Boy5, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ContestOldMan = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_ContestOldMan, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanWatering = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_BrendanWatering, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayWatering = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MayWatering, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanDecorating = {0xFFFF, 0x1100, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BrendanDecorating, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayDecorating = {0xFFFF, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_MayDecorating, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Archie = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Archie, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Maxie = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Maxie, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kyogre1 = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_KyogreFront, gFieldObjectRotScalAnimTable_KyogreGroudon}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Groudon1 = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_GroudonFront, gFieldObjectRotScalAnimTable_KyogreGroudon}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kyogre3 = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_KyogreSide, gFieldObjectRotScalAnimTable_KyogreGroudon}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Groudon3 = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Groudon3, gFieldObjectPicTable_GroudonSide, gFieldObjectRotScalAnimTable_KyogreGroudon}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Fossil = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_Fossil, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Regirock = {0xFFFF, 0x1104, 0x11FF, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Regi, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Regice = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Regi, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Registeel = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Regi, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Skitty = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Skitty, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kecleon1 = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Kecleon, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kyogre2 = {0xFFFF, 0x1116, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_KyogreFront, gFieldObjectRotScalAnimTable_KyogreGroudon}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Groudon2 = {0xFFFF, 0x1118, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_GroudonFront, gFieldObjectRotScalAnimTable_KyogreGroudon}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Rayquaza2 = {0xFFFF, 0x1105, 0x11FF, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldObjectBaseOam_64x64, gFieldObjectSpriteOamTables_64x64, gFieldObjectImageAnimTable_Rayquaza2, gFieldObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Zigzagoon = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Zigzagoon, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Pikachu = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Pikachu, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Azumarill = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Azumarill, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Wingull = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Wingull, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kecleon2 = {0xFFFF, 0x1105, 0x1102, 128, 16, 16, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Kecleon, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TuberMSwimming = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_TuberMSwimming, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Azurill = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Azurill, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Mom = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Mom, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LinkBrendan = {0xFFFF, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_BrendanMayNormal, gFieldObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LinkMay = {0xFFFF, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_BrendanMayNormal, gFieldObjectPicTable_MayNormal, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Juan = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Juan, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Scott = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Scott, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MysteryEventDeliveryman = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MysteryEventDeliveryman, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Statue = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_Statue, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kirlia = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_S, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Kirlia, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Dusclops = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Dusclops, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnionRoomAttendant = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_UnionRoomAttendant, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Red = {0xFFFF, 0x111D, 0x11FF, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Red, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Leaf = {0xFFFF, 0x111D, 0x11FF, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Leaf, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Sudowoodo = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Sudowoodo, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Mew = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Mew, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Deoxys = {0xFFFF, 0x111E, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Deoxys, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BirthIslandStone = {0xFFFF, 0x111F, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BirthIslandStone, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Anabel = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Anabel, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Tucker = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Tucker, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Greta = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Greta, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Spenser = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Spenser, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Noland = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Noland, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Lucy = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Lucy, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Brandon = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Brandon, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RubySapphireBrendan = {0xFFFF, 0x1122, 0x11FF, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_RubySapphireBrendan, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RubySapphireMay = {0xFFFF, 0x1123, 0x11FF, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_RubySapphireMay, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Lugia = {0xFFFF, 0x1121, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Lugia, gDummySpriteAffineAnimTable}; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_HoOh = {0xFFFF, 0x1120, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_HoOh, gFieldObjectPicTable_HoOh, gDummySpriteAffineAnimTable}; + +#endif //GUARD_EVENT_OBJECT_GRAPHICS_INFO_H diff --git a/src/data/field_event_obj/event_object_graphics_info_pointers.h b/src/data/field_event_obj/event_object_graphics_info_pointers.h new file mode 100755 index 0000000000..6793a94878 --- /dev/null +++ b/src/data/field_event_obj/event_object_graphics_info_pointers.h @@ -0,0 +1,504 @@ +#ifndef GUARD_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H +#define GUARD_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H + +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanNormal; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanMachBike; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanSurfing; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanFieldMove; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_QuintyPlump; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LittleBoy1; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LittleGirl1; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy1; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Girl1; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy2; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Girl2; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LittleBoy2; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LittleGirl2; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy3; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Girl3; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy4; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman1; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_FatMan; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman2; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man1; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman3; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_OldMan1; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_OldWoman1; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man2; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman4; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man3; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman5; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Cook; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman6; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_OldMan2; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_OldWoman2; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Camper; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Picnicker; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man4; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman7; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Youngster; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BugCatcher; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PsychicM; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SchoolKidM; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Maniac; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_HexManiac; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Rayquaza1; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SwimmerM; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SwimmerF; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BlackBelt; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Beauty; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Scientist1; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Lass; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Gentleman; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Sailor; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Fisherman; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RunningTriathleteM; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RunningTriathleteF; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TuberF; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TuberM; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Hiker; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CyclingTriathleteM; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CyclingTriathleteF; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Nurse; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ItemBall; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BerryTree; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BerryTreeEarlyStages; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BerryTreeLateStages; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanAcroBike; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ProfBirch; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man5; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man6; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ReporterM; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ReporterF; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Bard; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Anabel; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Tucker; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Greta; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Spenser; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Noland; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Lucy; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedNatuDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedMagnemiteDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedSquirtleDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedWooperDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedPikachuDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedPorygon2Doll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CuttableTree; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MartEmployee; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RooftopSaleWoman; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Teala; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BreakableRock; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PushableBoulder; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MrBrineysBoat; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayNormal; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayMachBike; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayAcroBike; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MaySurfing; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayFieldMove; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Truck; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_VigorothCarryingBox; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_VigorothFacingAway; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BirchsBag; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_EnemyZigzagoon; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Artist; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanNormal; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanMachBike; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanAcroBike; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanSurfing; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanFieldMove; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMayNormal; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMayMachBike; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMayAcroBike; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMaySurfing; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMayFieldMove; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Cameraman; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanUnderwater; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayUnderwater; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MovingBox; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CableCar; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Scientist2; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man7; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_AquaMemberM; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_AquaMemberF; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MagmaMemberM; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MagmaMemberF; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Sidney; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Phoebe; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Glacia; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Drake; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Roxanne; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Brawly; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Wattson; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Flannery; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Norman; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Winona; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Liza; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Tate; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Wallace; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Steven; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Wally; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RubySapphireLittleBoy; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanFishing; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayFishing; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_HotSpringsOldWoman; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SSTidal; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SubmarineShadow; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PichuDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PikachuDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MarillDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TogepiDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CyndaquilDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ChikoritaDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TotodileDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_JigglypuffDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MeowthDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ClefairyDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_DittoDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SmoochumDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TreeckoDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TorchicDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MudkipDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_DuskullDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_WynautDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BaltoyDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_KecleonDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_AzurillDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SkittyDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SwabluDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_GulpinDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LotadDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SeedotDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PikaCushion; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RoundCushion; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_KissCushion; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ZigzagCushion; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SpinCushion; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_DiamondCushion; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BallCushion; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_GrassCushion; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_FireCushion; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_WaterCushion; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigSnorlaxDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigRhydonDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigLaprasDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigVenusaurDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigCharizardDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigBlastoiseDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigWailmerDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigRegirockDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigRegiceDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigRegisteelDoll; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Latias; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Latios; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy5; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ContestOldMan; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanWatering; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayWatering; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanDecorating; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayDecorating; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Archie; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Maxie; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kyogre1; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Groudon1; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Fossil; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Regirock; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Regice; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Registeel; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Skitty; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kecleon1; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kyogre2; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Groudon2; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Rayquaza2; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Zigzagoon; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Pikachu; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Azumarill; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Wingull; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kecleon2; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TuberMSwimming; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Azurill; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Mom; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LinkBrendan; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LinkMay; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Juan; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Scott; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Poochyena; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kyogre3; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Groudon3; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MysteryEventDeliveryman; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Statue; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kirlia; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Dusclops; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnionRoomAttendant; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Sudowoodo; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Mew; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Red; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Leaf; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Deoxys; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BirthIslandStone; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Brandon; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RubySapphireBrendan; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RubySapphireMay; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Lugia; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_HoOh; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Bard; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Hipster; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Trader; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Storyteller; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Giddy; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedMauvilleOldMan1; +const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedMauvilleOldMan2; + + +const struct MapObjectGraphicsInfo *const gFieldObjectGraphicsInfoPointers[] = { + &gFieldObjectGraphicsInfo_BrendanNormal, + &gFieldObjectGraphicsInfo_BrendanMachBike, + &gFieldObjectGraphicsInfo_BrendanSurfing, + &gFieldObjectGraphicsInfo_BrendanFieldMove, + &gFieldObjectGraphicsInfo_QuintyPlump, + &gFieldObjectGraphicsInfo_LittleBoy1, + &gFieldObjectGraphicsInfo_LittleGirl1, + &gFieldObjectGraphicsInfo_Boy1, + &gFieldObjectGraphicsInfo_Girl1, + &gFieldObjectGraphicsInfo_Boy2, + &gFieldObjectGraphicsInfo_Girl2, + &gFieldObjectGraphicsInfo_LittleBoy2, + &gFieldObjectGraphicsInfo_LittleGirl2, + &gFieldObjectGraphicsInfo_Boy3, + &gFieldObjectGraphicsInfo_Girl3, + &gFieldObjectGraphicsInfo_Boy4, + &gFieldObjectGraphicsInfo_Woman1, + &gFieldObjectGraphicsInfo_FatMan, + &gFieldObjectGraphicsInfo_Woman2, + &gFieldObjectGraphicsInfo_Man1, + &gFieldObjectGraphicsInfo_Woman3, + &gFieldObjectGraphicsInfo_OldMan1, + &gFieldObjectGraphicsInfo_OldWoman1, + &gFieldObjectGraphicsInfo_Man2, + &gFieldObjectGraphicsInfo_Woman4, + &gFieldObjectGraphicsInfo_Man3, + &gFieldObjectGraphicsInfo_Woman5, + &gFieldObjectGraphicsInfo_Cook, + &gFieldObjectGraphicsInfo_Woman6, + &gFieldObjectGraphicsInfo_OldMan2, + &gFieldObjectGraphicsInfo_OldWoman2, + &gFieldObjectGraphicsInfo_Camper, + &gFieldObjectGraphicsInfo_Picnicker, + &gFieldObjectGraphicsInfo_Man4, + &gFieldObjectGraphicsInfo_Woman7, + &gFieldObjectGraphicsInfo_Youngster, + &gFieldObjectGraphicsInfo_BugCatcher, + &gFieldObjectGraphicsInfo_PsychicM, + &gFieldObjectGraphicsInfo_SchoolKidM, + &gFieldObjectGraphicsInfo_Maniac, + &gFieldObjectGraphicsInfo_HexManiac, + &gFieldObjectGraphicsInfo_Rayquaza1, + &gFieldObjectGraphicsInfo_SwimmerM, + &gFieldObjectGraphicsInfo_SwimmerF, + &gFieldObjectGraphicsInfo_BlackBelt, + &gFieldObjectGraphicsInfo_Beauty, + &gFieldObjectGraphicsInfo_Scientist1, + &gFieldObjectGraphicsInfo_Lass, + &gFieldObjectGraphicsInfo_Gentleman, + &gFieldObjectGraphicsInfo_Sailor, + &gFieldObjectGraphicsInfo_Fisherman, + &gFieldObjectGraphicsInfo_RunningTriathleteM, + &gFieldObjectGraphicsInfo_RunningTriathleteF, + &gFieldObjectGraphicsInfo_TuberF, + &gFieldObjectGraphicsInfo_TuberM, + &gFieldObjectGraphicsInfo_Hiker, + &gFieldObjectGraphicsInfo_CyclingTriathleteM, + &gFieldObjectGraphicsInfo_CyclingTriathleteF, + &gFieldObjectGraphicsInfo_Nurse, + &gFieldObjectGraphicsInfo_ItemBall, + &gFieldObjectGraphicsInfo_BerryTree, + &gFieldObjectGraphicsInfo_BerryTreeEarlyStages, + &gFieldObjectGraphicsInfo_BerryTreeLateStages, + &gFieldObjectGraphicsInfo_BrendanAcroBike, + &gFieldObjectGraphicsInfo_ProfBirch, + &gFieldObjectGraphicsInfo_Man5, + &gFieldObjectGraphicsInfo_Man6, + &gFieldObjectGraphicsInfo_ReporterM, + &gFieldObjectGraphicsInfo_ReporterF, + &gFieldObjectGraphicsInfo_Bard, + &gFieldObjectGraphicsInfo_Anabel, + &gFieldObjectGraphicsInfo_Tucker, + &gFieldObjectGraphicsInfo_Greta, + &gFieldObjectGraphicsInfo_Spenser, + &gFieldObjectGraphicsInfo_Noland, + &gFieldObjectGraphicsInfo_Lucy, + &gFieldObjectGraphicsInfo_UnusedNatuDoll, + &gFieldObjectGraphicsInfo_UnusedMagnemiteDoll, + &gFieldObjectGraphicsInfo_UnusedSquirtleDoll, + &gFieldObjectGraphicsInfo_UnusedWooperDoll, + &gFieldObjectGraphicsInfo_UnusedPikachuDoll, + &gFieldObjectGraphicsInfo_UnusedPorygon2Doll, + &gFieldObjectGraphicsInfo_CuttableTree, + &gFieldObjectGraphicsInfo_MartEmployee, + &gFieldObjectGraphicsInfo_RooftopSaleWoman, + &gFieldObjectGraphicsInfo_Teala, + &gFieldObjectGraphicsInfo_BreakableRock, + &gFieldObjectGraphicsInfo_PushableBoulder, + &gFieldObjectGraphicsInfo_MrBrineysBoat, + &gFieldObjectGraphicsInfo_MayNormal, + &gFieldObjectGraphicsInfo_MayMachBike, + &gFieldObjectGraphicsInfo_MayAcroBike, + &gFieldObjectGraphicsInfo_MaySurfing, + &gFieldObjectGraphicsInfo_MayFieldMove, + &gFieldObjectGraphicsInfo_Truck, + &gFieldObjectGraphicsInfo_VigorothCarryingBox, + &gFieldObjectGraphicsInfo_VigorothFacingAway, + &gFieldObjectGraphicsInfo_BirchsBag, + &gFieldObjectGraphicsInfo_EnemyZigzagoon, + &gFieldObjectGraphicsInfo_Artist, + &gFieldObjectGraphicsInfo_RivalBrendanNormal, + &gFieldObjectGraphicsInfo_RivalBrendanMachBike, + &gFieldObjectGraphicsInfo_RivalBrendanAcroBike, + &gFieldObjectGraphicsInfo_RivalBrendanSurfing, + &gFieldObjectGraphicsInfo_RivalBrendanFieldMove, + &gFieldObjectGraphicsInfo_RivalMayNormal, + &gFieldObjectGraphicsInfo_RivalMayMachBike, + &gFieldObjectGraphicsInfo_RivalMayAcroBike, + &gFieldObjectGraphicsInfo_RivalMaySurfing, + &gFieldObjectGraphicsInfo_RivalMayFieldMove, + &gFieldObjectGraphicsInfo_Cameraman, + &gFieldObjectGraphicsInfo_BrendanUnderwater, + &gFieldObjectGraphicsInfo_MayUnderwater, + &gFieldObjectGraphicsInfo_MovingBox, + &gFieldObjectGraphicsInfo_CableCar, + &gFieldObjectGraphicsInfo_Scientist2, + &gFieldObjectGraphicsInfo_Man7, + &gFieldObjectGraphicsInfo_AquaMemberM, + &gFieldObjectGraphicsInfo_AquaMemberF, + &gFieldObjectGraphicsInfo_MagmaMemberM, + &gFieldObjectGraphicsInfo_MagmaMemberF, + &gFieldObjectGraphicsInfo_Sidney, + &gFieldObjectGraphicsInfo_Phoebe, + &gFieldObjectGraphicsInfo_Glacia, + &gFieldObjectGraphicsInfo_Drake, + &gFieldObjectGraphicsInfo_Roxanne, + &gFieldObjectGraphicsInfo_Brawly, + &gFieldObjectGraphicsInfo_Wattson, + &gFieldObjectGraphicsInfo_Flannery, + &gFieldObjectGraphicsInfo_Norman, + &gFieldObjectGraphicsInfo_Winona, + &gFieldObjectGraphicsInfo_Liza, + &gFieldObjectGraphicsInfo_Tate, + &gFieldObjectGraphicsInfo_Wallace, + &gFieldObjectGraphicsInfo_Steven, + &gFieldObjectGraphicsInfo_Wally, + &gFieldObjectGraphicsInfo_RubySapphireLittleBoy, + &gFieldObjectGraphicsInfo_BrendanFishing, + &gFieldObjectGraphicsInfo_MayFishing, + &gFieldObjectGraphicsInfo_HotSpringsOldWoman, + &gFieldObjectGraphicsInfo_SSTidal, + &gFieldObjectGraphicsInfo_SubmarineShadow, + &gFieldObjectGraphicsInfo_PichuDoll, + &gFieldObjectGraphicsInfo_PikachuDoll, + &gFieldObjectGraphicsInfo_MarillDoll, + &gFieldObjectGraphicsInfo_TogepiDoll, + &gFieldObjectGraphicsInfo_CyndaquilDoll, + &gFieldObjectGraphicsInfo_ChikoritaDoll, + &gFieldObjectGraphicsInfo_TotodileDoll, + &gFieldObjectGraphicsInfo_JigglypuffDoll, + &gFieldObjectGraphicsInfo_MeowthDoll, + &gFieldObjectGraphicsInfo_ClefairyDoll, + &gFieldObjectGraphicsInfo_DittoDoll, + &gFieldObjectGraphicsInfo_SmoochumDoll, + &gFieldObjectGraphicsInfo_TreeckoDoll, + &gFieldObjectGraphicsInfo_TorchicDoll, + &gFieldObjectGraphicsInfo_MudkipDoll, + &gFieldObjectGraphicsInfo_DuskullDoll, + &gFieldObjectGraphicsInfo_WynautDoll, + &gFieldObjectGraphicsInfo_BaltoyDoll, + &gFieldObjectGraphicsInfo_KecleonDoll, + &gFieldObjectGraphicsInfo_AzurillDoll, + &gFieldObjectGraphicsInfo_SkittyDoll, + &gFieldObjectGraphicsInfo_SwabluDoll, + &gFieldObjectGraphicsInfo_GulpinDoll, + &gFieldObjectGraphicsInfo_LotadDoll, + &gFieldObjectGraphicsInfo_SeedotDoll, + &gFieldObjectGraphicsInfo_PikaCushion, + &gFieldObjectGraphicsInfo_RoundCushion, + &gFieldObjectGraphicsInfo_KissCushion, + &gFieldObjectGraphicsInfo_ZigzagCushion, + &gFieldObjectGraphicsInfo_SpinCushion, + &gFieldObjectGraphicsInfo_DiamondCushion, + &gFieldObjectGraphicsInfo_BallCushion, + &gFieldObjectGraphicsInfo_GrassCushion, + &gFieldObjectGraphicsInfo_FireCushion, + &gFieldObjectGraphicsInfo_WaterCushion, + &gFieldObjectGraphicsInfo_BigSnorlaxDoll, + &gFieldObjectGraphicsInfo_BigRhydonDoll, + &gFieldObjectGraphicsInfo_BigLaprasDoll, + &gFieldObjectGraphicsInfo_BigVenusaurDoll, + &gFieldObjectGraphicsInfo_BigCharizardDoll, + &gFieldObjectGraphicsInfo_BigBlastoiseDoll, + &gFieldObjectGraphicsInfo_BigWailmerDoll, + &gFieldObjectGraphicsInfo_BigRegirockDoll, + &gFieldObjectGraphicsInfo_BigRegiceDoll, + &gFieldObjectGraphicsInfo_BigRegisteelDoll, + &gFieldObjectGraphicsInfo_Latias, + &gFieldObjectGraphicsInfo_Latios, + &gFieldObjectGraphicsInfo_Boy5, + &gFieldObjectGraphicsInfo_ContestOldMan, + &gFieldObjectGraphicsInfo_BrendanWatering, + &gFieldObjectGraphicsInfo_MayWatering, + &gFieldObjectGraphicsInfo_BrendanDecorating, + &gFieldObjectGraphicsInfo_MayDecorating, + &gFieldObjectGraphicsInfo_Archie, + &gFieldObjectGraphicsInfo_Maxie, + &gFieldObjectGraphicsInfo_Kyogre1, + &gFieldObjectGraphicsInfo_Groudon1, + &gFieldObjectGraphicsInfo_Fossil, + &gFieldObjectGraphicsInfo_Regirock, + &gFieldObjectGraphicsInfo_Regice, + &gFieldObjectGraphicsInfo_Registeel, + &gFieldObjectGraphicsInfo_Skitty, + &gFieldObjectGraphicsInfo_Kecleon1, + &gFieldObjectGraphicsInfo_Kyogre2, + &gFieldObjectGraphicsInfo_Groudon2, + &gFieldObjectGraphicsInfo_Rayquaza2, + &gFieldObjectGraphicsInfo_Zigzagoon, + &gFieldObjectGraphicsInfo_Pikachu, + &gFieldObjectGraphicsInfo_Azumarill, + &gFieldObjectGraphicsInfo_Wingull, + &gFieldObjectGraphicsInfo_Kecleon2, + &gFieldObjectGraphicsInfo_TuberMSwimming, + &gFieldObjectGraphicsInfo_Azurill, + &gFieldObjectGraphicsInfo_Mom, + &gFieldObjectGraphicsInfo_LinkBrendan, + &gFieldObjectGraphicsInfo_LinkMay, + &gFieldObjectGraphicsInfo_Juan, + &gFieldObjectGraphicsInfo_Scott, + &gFieldObjectGraphicsInfo_Poochyena, + &gFieldObjectGraphicsInfo_Kyogre3, + &gFieldObjectGraphicsInfo_Groudon3, + &gFieldObjectGraphicsInfo_MysteryEventDeliveryman, + &gFieldObjectGraphicsInfo_Statue, + &gFieldObjectGraphicsInfo_Kirlia, + &gFieldObjectGraphicsInfo_Dusclops, + &gFieldObjectGraphicsInfo_UnionRoomAttendant, + &gFieldObjectGraphicsInfo_Sudowoodo, + &gFieldObjectGraphicsInfo_Mew, + &gFieldObjectGraphicsInfo_Red, + &gFieldObjectGraphicsInfo_Leaf, + &gFieldObjectGraphicsInfo_Deoxys, + &gFieldObjectGraphicsInfo_BirthIslandStone, + &gFieldObjectGraphicsInfo_Brandon, + &gFieldObjectGraphicsInfo_RubySapphireBrendan, + &gFieldObjectGraphicsInfo_RubySapphireMay, + &gFieldObjectGraphicsInfo_Lugia, + &gFieldObjectGraphicsInfo_HoOh, +}; + +const struct MapObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = { + &gFieldObjectGraphicsInfo_Bard, + &gFieldObjectGraphicsInfo_Hipster, + &gFieldObjectGraphicsInfo_Trader, + &gFieldObjectGraphicsInfo_Storyteller, + &gFieldObjectGraphicsInfo_Giddy, + &gFieldObjectGraphicsInfo_UnusedMauvilleOldMan1, + &gFieldObjectGraphicsInfo_UnusedMauvilleOldMan2, +}; + +#endif //GUARD_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H diff --git a/src/data/field_event_obj/event_object_pic_tables.h b/src/data/field_event_obj/event_object_pic_tables.h new file mode 100755 index 0000000000..f5d6a24c3b --- /dev/null +++ b/src/data/field_event_obj/event_object_pic_tables.h @@ -0,0 +1,2179 @@ +#ifndef GUARD_EVENT_OBJECT_PIC_TABLES_H +#define GUARD_EVENT_OBJECT_PIC_TABLES_H + +const struct SpriteFrameImage gFieldObjectPicTable_BrendanNormal[] = { + obj_frame_tiles(gFieldObjectPic_BrendanNormal_0), + obj_frame_tiles(gFieldObjectPic_BrendanNormal_1), + obj_frame_tiles(gFieldObjectPic_BrendanNormal_2), + obj_frame_tiles(gFieldObjectPic_BrendanNormal_3), + obj_frame_tiles(gFieldObjectPic_BrendanNormal_4), + obj_frame_tiles(gFieldObjectPic_BrendanNormal_5), + obj_frame_tiles(gFieldObjectPic_BrendanNormal_6), + obj_frame_tiles(gFieldObjectPic_BrendanNormal_7), + obj_frame_tiles(gFieldObjectPic_BrendanNormal_8), + obj_frame_tiles(gFieldObjectPic_BrendanNormal_9), + obj_frame_tiles(gFieldObjectPic_BrendanNormal_10), + obj_frame_tiles(gFieldObjectPic_BrendanNormal_11), + obj_frame_tiles(gFieldObjectPic_BrendanNormal_12), + obj_frame_tiles(gFieldObjectPic_BrendanNormal_13), + obj_frame_tiles(gFieldObjectPic_BrendanNormal_14), + obj_frame_tiles(gFieldObjectPic_BrendanNormal_15), + obj_frame_tiles(gFieldObjectPic_BrendanNormal_16), + obj_frame_tiles(gFieldObjectPic_BrendanNormal_17), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_BrendanMachBike[] = { + obj_frame_tiles(gFieldObjectPic_BrendanMachBike_0), + obj_frame_tiles(gFieldObjectPic_BrendanMachBike_1), + obj_frame_tiles(gFieldObjectPic_BrendanMachBike_2), + obj_frame_tiles(gFieldObjectPic_BrendanMachBike_3), + obj_frame_tiles(gFieldObjectPic_BrendanMachBike_4), + obj_frame_tiles(gFieldObjectPic_BrendanMachBike_5), + obj_frame_tiles(gFieldObjectPic_BrendanMachBike_6), + obj_frame_tiles(gFieldObjectPic_BrendanMachBike_7), + obj_frame_tiles(gFieldObjectPic_BrendanMachBike_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_BrendanAcroBike[] = { + obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_0), + obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_1), + obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_2), + obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_3), + obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_4), + obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_5), + obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_6), + obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_7), + obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_8), + obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_9), + obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_10), + obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_11), + obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_12), + obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_13), + obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_14), + obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_15), + obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_16), + obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_17), + obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_18), + obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_19), + obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_20), + obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_21), + obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_22), + obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_23), + obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_24), + obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_25), + obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_26), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_BrendanSurfing[] = { + obj_frame_tiles(gFieldObjectPic_BrendanSurfing_0), + obj_frame_tiles(gFieldObjectPic_BrendanSurfing_1), + obj_frame_tiles(gFieldObjectPic_BrendanSurfing_2), + obj_frame_tiles(gFieldObjectPic_BrendanSurfing_0), + obj_frame_tiles(gFieldObjectPic_BrendanSurfing_0), + obj_frame_tiles(gFieldObjectPic_BrendanSurfing_1), + obj_frame_tiles(gFieldObjectPic_BrendanSurfing_1), + obj_frame_tiles(gFieldObjectPic_BrendanSurfing_2), + obj_frame_tiles(gFieldObjectPic_BrendanSurfing_2), + obj_frame_tiles(gFieldObjectPic_BrendanSurfing_3), + obj_frame_tiles(gFieldObjectPic_BrendanSurfing_4), + obj_frame_tiles(gFieldObjectPic_BrendanSurfing_5), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_BrendanUnderwater[] = { + obj_frame_tiles(gFieldObjectPic_BrendanUnderwater_0), + obj_frame_tiles(gFieldObjectPic_BrendanUnderwater_1), + obj_frame_tiles(gFieldObjectPic_BrendanUnderwater_2), + obj_frame_tiles(gFieldObjectPic_BrendanUnderwater_0), + obj_frame_tiles(gFieldObjectPic_BrendanUnderwater_0), + obj_frame_tiles(gFieldObjectPic_BrendanUnderwater_1), + obj_frame_tiles(gFieldObjectPic_BrendanUnderwater_1), + obj_frame_tiles(gFieldObjectPic_BrendanUnderwater_2), + obj_frame_tiles(gFieldObjectPic_BrendanUnderwater_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_BrendanFieldMove[] = { + obj_frame_tiles(gFieldObjectPic_BrendanFieldMove_0), + obj_frame_tiles(gFieldObjectPic_BrendanFieldMove_1), + obj_frame_tiles(gFieldObjectPic_BrendanFieldMove_2), + obj_frame_tiles(gFieldObjectPic_BrendanFieldMove_3), + obj_frame_tiles(gFieldObjectPic_BrendanFieldMove_4), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_QuintyPlump[] = { + obj_frame_tiles(gFieldObjectPic_QuintyPlump_0), + obj_frame_tiles(gFieldObjectPic_QuintyPlump_1), + obj_frame_tiles(gFieldObjectPic_QuintyPlump_2), + obj_frame_tiles(gFieldObjectPic_QuintyPlump_3), + obj_frame_tiles(gFieldObjectPic_QuintyPlump_4), + obj_frame_tiles(gFieldObjectPic_QuintyPlump_5), + obj_frame_tiles(gFieldObjectPic_QuintyPlump_6), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_LittleBoy1[] = { + obj_frame_tiles(gFieldObjectPic_LittleBoy1_0), + obj_frame_tiles(gFieldObjectPic_LittleBoy1_1), + obj_frame_tiles(gFieldObjectPic_LittleBoy1_2), + obj_frame_tiles(gFieldObjectPic_LittleBoy1_3), + obj_frame_tiles(gFieldObjectPic_LittleBoy1_4), + obj_frame_tiles(gFieldObjectPic_LittleBoy1_5), + obj_frame_tiles(gFieldObjectPic_LittleBoy1_6), + obj_frame_tiles(gFieldObjectPic_LittleBoy1_7), + obj_frame_tiles(gFieldObjectPic_LittleBoy1_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_LittleGirl1[] = { + obj_frame_tiles(gFieldObjectPic_LittleGirl1_0), + obj_frame_tiles(gFieldObjectPic_LittleGirl1_1), + obj_frame_tiles(gFieldObjectPic_LittleGirl1_2), + obj_frame_tiles(gFieldObjectPic_LittleGirl1_3), + obj_frame_tiles(gFieldObjectPic_LittleGirl1_4), + obj_frame_tiles(gFieldObjectPic_LittleGirl1_5), + obj_frame_tiles(gFieldObjectPic_LittleGirl1_6), + obj_frame_tiles(gFieldObjectPic_LittleGirl1_7), + obj_frame_tiles(gFieldObjectPic_LittleGirl1_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Boy1[] = { + obj_frame_tiles(gFieldObjectPic_Boy1_0), + obj_frame_tiles(gFieldObjectPic_Boy1_1), + obj_frame_tiles(gFieldObjectPic_Boy1_2), + obj_frame_tiles(gFieldObjectPic_Boy1_3), + obj_frame_tiles(gFieldObjectPic_Boy1_4), + obj_frame_tiles(gFieldObjectPic_Boy1_5), + obj_frame_tiles(gFieldObjectPic_Boy1_6), + obj_frame_tiles(gFieldObjectPic_Boy1_7), + obj_frame_tiles(gFieldObjectPic_Boy1_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Girl1[] = { + obj_frame_tiles(gFieldObjectPic_Girl1_0), + obj_frame_tiles(gFieldObjectPic_Girl1_1), + obj_frame_tiles(gFieldObjectPic_Girl1_2), + obj_frame_tiles(gFieldObjectPic_Girl1_3), + obj_frame_tiles(gFieldObjectPic_Girl1_4), + obj_frame_tiles(gFieldObjectPic_Girl1_5), + obj_frame_tiles(gFieldObjectPic_Girl1_6), + obj_frame_tiles(gFieldObjectPic_Girl1_7), + obj_frame_tiles(gFieldObjectPic_Girl1_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Boy2[] = { + obj_frame_tiles(gFieldObjectPic_Boy2_0), + obj_frame_tiles(gFieldObjectPic_Boy2_1), + obj_frame_tiles(gFieldObjectPic_Boy2_2), + obj_frame_tiles(gFieldObjectPic_Boy2_3), + obj_frame_tiles(gFieldObjectPic_Boy2_4), + obj_frame_tiles(gFieldObjectPic_Boy2_5), + obj_frame_tiles(gFieldObjectPic_Boy2_6), + obj_frame_tiles(gFieldObjectPic_Boy2_7), + obj_frame_tiles(gFieldObjectPic_Boy2_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Girl2[] = { + obj_frame_tiles(gFieldObjectPic_Girl2_0), + obj_frame_tiles(gFieldObjectPic_Girl2_1), + obj_frame_tiles(gFieldObjectPic_Girl2_2), + obj_frame_tiles(gFieldObjectPic_Girl2_3), + obj_frame_tiles(gFieldObjectPic_Girl2_4), + obj_frame_tiles(gFieldObjectPic_Girl2_5), + obj_frame_tiles(gFieldObjectPic_Girl2_6), + obj_frame_tiles(gFieldObjectPic_Girl2_7), + obj_frame_tiles(gFieldObjectPic_Girl2_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_LittleBoy2[] = { + obj_frame_tiles(gFieldObjectPic_LittleBoy2_0), + obj_frame_tiles(gFieldObjectPic_LittleBoy2_1), + obj_frame_tiles(gFieldObjectPic_LittleBoy2_2), + obj_frame_tiles(gFieldObjectPic_LittleBoy2_3), + obj_frame_tiles(gFieldObjectPic_LittleBoy2_4), + obj_frame_tiles(gFieldObjectPic_LittleBoy2_5), + obj_frame_tiles(gFieldObjectPic_LittleBoy2_6), + obj_frame_tiles(gFieldObjectPic_LittleBoy2_7), + obj_frame_tiles(gFieldObjectPic_LittleBoy2_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_LittleGirl2[] = { + obj_frame_tiles(gFieldObjectPic_LittleGirl2_0), + obj_frame_tiles(gFieldObjectPic_LittleGirl2_1), + obj_frame_tiles(gFieldObjectPic_LittleGirl2_2), + obj_frame_tiles(gFieldObjectPic_LittleGirl2_3), + obj_frame_tiles(gFieldObjectPic_LittleGirl2_4), + obj_frame_tiles(gFieldObjectPic_LittleGirl2_5), + obj_frame_tiles(gFieldObjectPic_LittleGirl2_6), + obj_frame_tiles(gFieldObjectPic_LittleGirl2_7), + obj_frame_tiles(gFieldObjectPic_LittleGirl2_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Boy3[] = { + obj_frame_tiles(gFieldObjectPic_Boy3_0), + obj_frame_tiles(gFieldObjectPic_Boy3_1), + obj_frame_tiles(gFieldObjectPic_Boy3_2), + obj_frame_tiles(gFieldObjectPic_Boy3_3), + obj_frame_tiles(gFieldObjectPic_Boy3_4), + obj_frame_tiles(gFieldObjectPic_Boy3_5), + obj_frame_tiles(gFieldObjectPic_Boy3_6), + obj_frame_tiles(gFieldObjectPic_Boy3_7), + obj_frame_tiles(gFieldObjectPic_Boy3_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Girl3[] = { + obj_frame_tiles(gFieldObjectPic_Girl3_0), + obj_frame_tiles(gFieldObjectPic_Girl3_1), + obj_frame_tiles(gFieldObjectPic_Girl3_2), + obj_frame_tiles(gFieldObjectPic_Girl3_3), + obj_frame_tiles(gFieldObjectPic_Girl3_4), + obj_frame_tiles(gFieldObjectPic_Girl3_5), + obj_frame_tiles(gFieldObjectPic_Girl3_6), + obj_frame_tiles(gFieldObjectPic_Girl3_7), + obj_frame_tiles(gFieldObjectPic_Girl3_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Boy4[] = { + obj_frame_tiles(gFieldObjectPic_Boy4_0), + obj_frame_tiles(gFieldObjectPic_Boy4_1), + obj_frame_tiles(gFieldObjectPic_Boy4_2), + obj_frame_tiles(gFieldObjectPic_Boy4_3), + obj_frame_tiles(gFieldObjectPic_Boy4_4), + obj_frame_tiles(gFieldObjectPic_Boy4_5), + obj_frame_tiles(gFieldObjectPic_Boy4_6), + obj_frame_tiles(gFieldObjectPic_Boy4_7), + obj_frame_tiles(gFieldObjectPic_Boy4_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Woman1[] = { + obj_frame_tiles(gFieldObjectPic_Woman1_0), + obj_frame_tiles(gFieldObjectPic_Woman1_1), + obj_frame_tiles(gFieldObjectPic_Woman1_2), + obj_frame_tiles(gFieldObjectPic_Woman1_3), + obj_frame_tiles(gFieldObjectPic_Woman1_4), + obj_frame_tiles(gFieldObjectPic_Woman1_5), + obj_frame_tiles(gFieldObjectPic_Woman1_6), + obj_frame_tiles(gFieldObjectPic_Woman1_7), + obj_frame_tiles(gFieldObjectPic_Woman1_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_FatMan[] = { + obj_frame_tiles(gFieldObjectPic_FatMan_0), + obj_frame_tiles(gFieldObjectPic_FatMan_1), + obj_frame_tiles(gFieldObjectPic_FatMan_2), + obj_frame_tiles(gFieldObjectPic_FatMan_3), + obj_frame_tiles(gFieldObjectPic_FatMan_4), + obj_frame_tiles(gFieldObjectPic_FatMan_5), + obj_frame_tiles(gFieldObjectPic_FatMan_6), + obj_frame_tiles(gFieldObjectPic_FatMan_7), + obj_frame_tiles(gFieldObjectPic_FatMan_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Woman2[] = { + obj_frame_tiles(gFieldObjectPic_Woman2_0), + obj_frame_tiles(gFieldObjectPic_Woman2_1), + obj_frame_tiles(gFieldObjectPic_Woman2_2), + obj_frame_tiles(gFieldObjectPic_Woman2_3), + obj_frame_tiles(gFieldObjectPic_Woman2_4), + obj_frame_tiles(gFieldObjectPic_Woman2_5), + obj_frame_tiles(gFieldObjectPic_Woman2_6), + obj_frame_tiles(gFieldObjectPic_Woman2_7), + obj_frame_tiles(gFieldObjectPic_Woman2_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Man1[] = { + obj_frame_tiles(gFieldObjectPic_Man1_0), + obj_frame_tiles(gFieldObjectPic_Man1_1), + obj_frame_tiles(gFieldObjectPic_Man1_2), + obj_frame_tiles(gFieldObjectPic_Man1_3), + obj_frame_tiles(gFieldObjectPic_Man1_4), + obj_frame_tiles(gFieldObjectPic_Man1_5), + obj_frame_tiles(gFieldObjectPic_Man1_6), + obj_frame_tiles(gFieldObjectPic_Man1_7), + obj_frame_tiles(gFieldObjectPic_Man1_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Woman3[] = { + obj_frame_tiles(gFieldObjectPic_Woman3_0), + obj_frame_tiles(gFieldObjectPic_Woman3_1), + obj_frame_tiles(gFieldObjectPic_Woman3_2), + obj_frame_tiles(gFieldObjectPic_Woman3_3), + obj_frame_tiles(gFieldObjectPic_Woman3_4), + obj_frame_tiles(gFieldObjectPic_Woman3_5), + obj_frame_tiles(gFieldObjectPic_Woman3_6), + obj_frame_tiles(gFieldObjectPic_Woman3_7), + obj_frame_tiles(gFieldObjectPic_Woman3_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_OldMan1[] = { + obj_frame_tiles(gFieldObjectPic_OldMan1_0), + obj_frame_tiles(gFieldObjectPic_OldMan1_1), + obj_frame_tiles(gFieldObjectPic_OldMan1_2), + obj_frame_tiles(gFieldObjectPic_OldMan1_3), + obj_frame_tiles(gFieldObjectPic_OldMan1_4), + obj_frame_tiles(gFieldObjectPic_OldMan1_5), + obj_frame_tiles(gFieldObjectPic_OldMan1_6), + obj_frame_tiles(gFieldObjectPic_OldMan1_7), + obj_frame_tiles(gFieldObjectPic_OldMan1_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_OldWoman1[] = { + obj_frame_tiles(gFieldObjectPic_OldWoman1_0), + obj_frame_tiles(gFieldObjectPic_OldWoman1_1), + obj_frame_tiles(gFieldObjectPic_OldWoman1_2), + obj_frame_tiles(gFieldObjectPic_OldWoman1_3), + obj_frame_tiles(gFieldObjectPic_OldWoman1_4), + obj_frame_tiles(gFieldObjectPic_OldWoman1_5), + obj_frame_tiles(gFieldObjectPic_OldWoman1_6), + obj_frame_tiles(gFieldObjectPic_OldWoman1_7), + obj_frame_tiles(gFieldObjectPic_OldWoman1_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Man2[] = { + obj_frame_tiles(gFieldObjectPic_Man2_0), + obj_frame_tiles(gFieldObjectPic_Man2_1), + obj_frame_tiles(gFieldObjectPic_Man2_2), + obj_frame_tiles(gFieldObjectPic_Man2_3), + obj_frame_tiles(gFieldObjectPic_Man2_4), + obj_frame_tiles(gFieldObjectPic_Man2_5), + obj_frame_tiles(gFieldObjectPic_Man2_6), + obj_frame_tiles(gFieldObjectPic_Man2_7), + obj_frame_tiles(gFieldObjectPic_Man2_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Woman4[] = { + obj_frame_tiles(gFieldObjectPic_Woman4_0), + obj_frame_tiles(gFieldObjectPic_Woman4_1), + obj_frame_tiles(gFieldObjectPic_Woman4_2), + obj_frame_tiles(gFieldObjectPic_Woman4_3), + obj_frame_tiles(gFieldObjectPic_Woman4_4), + obj_frame_tiles(gFieldObjectPic_Woman4_5), + obj_frame_tiles(gFieldObjectPic_Woman4_6), + obj_frame_tiles(gFieldObjectPic_Woman4_7), + obj_frame_tiles(gFieldObjectPic_Woman4_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Man3[] = { + obj_frame_tiles(gFieldObjectPic_Man3_0), + obj_frame_tiles(gFieldObjectPic_Man3_1), + obj_frame_tiles(gFieldObjectPic_Man3_2), + obj_frame_tiles(gFieldObjectPic_Man3_3), + obj_frame_tiles(gFieldObjectPic_Man3_4), + obj_frame_tiles(gFieldObjectPic_Man3_5), + obj_frame_tiles(gFieldObjectPic_Man3_6), + obj_frame_tiles(gFieldObjectPic_Man3_7), + obj_frame_tiles(gFieldObjectPic_Man3_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Woman5[] = { + obj_frame_tiles(gFieldObjectPic_Woman5_0), + obj_frame_tiles(gFieldObjectPic_Woman5_1), + obj_frame_tiles(gFieldObjectPic_Woman5_2), + obj_frame_tiles(gFieldObjectPic_Woman5_3), + obj_frame_tiles(gFieldObjectPic_Woman5_4), + obj_frame_tiles(gFieldObjectPic_Woman5_5), + obj_frame_tiles(gFieldObjectPic_Woman5_6), + obj_frame_tiles(gFieldObjectPic_Woman5_7), + obj_frame_tiles(gFieldObjectPic_Woman5_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Cook[] = { + obj_frame_tiles(gFieldObjectPic_Cook_0), + obj_frame_tiles(gFieldObjectPic_Cook_1), + obj_frame_tiles(gFieldObjectPic_Cook_2), + obj_frame_tiles(gFieldObjectPic_Cook_0), + obj_frame_tiles(gFieldObjectPic_Cook_0), + obj_frame_tiles(gFieldObjectPic_Cook_1), + obj_frame_tiles(gFieldObjectPic_Cook_1), + obj_frame_tiles(gFieldObjectPic_Cook_2), + obj_frame_tiles(gFieldObjectPic_Cook_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Woman6[] = { + obj_frame_tiles(gFieldObjectPic_Woman6_0), + obj_frame_tiles(gFieldObjectPic_Woman6_1), + obj_frame_tiles(gFieldObjectPic_Woman6_2), + obj_frame_tiles(gFieldObjectPic_Woman6_3), + obj_frame_tiles(gFieldObjectPic_Woman6_4), + obj_frame_tiles(gFieldObjectPic_Woman6_5), + obj_frame_tiles(gFieldObjectPic_Woman6_6), + obj_frame_tiles(gFieldObjectPic_Woman6_7), + obj_frame_tiles(gFieldObjectPic_Woman6_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_OldMan2[] = { + obj_frame_tiles(gFieldObjectPic_OldMan2_0), + obj_frame_tiles(gFieldObjectPic_OldMan2_1), + obj_frame_tiles(gFieldObjectPic_OldMan2_2), + obj_frame_tiles(gFieldObjectPic_OldMan2_0), + obj_frame_tiles(gFieldObjectPic_OldMan2_0), + obj_frame_tiles(gFieldObjectPic_OldMan2_1), + obj_frame_tiles(gFieldObjectPic_OldMan2_1), + obj_frame_tiles(gFieldObjectPic_OldMan2_2), + obj_frame_tiles(gFieldObjectPic_OldMan2_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_OldWoman2[] = { + obj_frame_tiles(gFieldObjectPic_OldWoman2_0), + obj_frame_tiles(gFieldObjectPic_OldWoman2_1), + obj_frame_tiles(gFieldObjectPic_OldWoman2_2), + obj_frame_tiles(gFieldObjectPic_OldWoman2_3), + obj_frame_tiles(gFieldObjectPic_OldWoman2_4), + obj_frame_tiles(gFieldObjectPic_OldWoman2_5), + obj_frame_tiles(gFieldObjectPic_OldWoman2_6), + obj_frame_tiles(gFieldObjectPic_OldWoman2_7), + obj_frame_tiles(gFieldObjectPic_OldWoman2_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Camper[] = { + obj_frame_tiles(gFieldObjectPic_Camper_0), + obj_frame_tiles(gFieldObjectPic_Camper_1), + obj_frame_tiles(gFieldObjectPic_Camper_2), + obj_frame_tiles(gFieldObjectPic_Camper_3), + obj_frame_tiles(gFieldObjectPic_Camper_4), + obj_frame_tiles(gFieldObjectPic_Camper_5), + obj_frame_tiles(gFieldObjectPic_Camper_6), + obj_frame_tiles(gFieldObjectPic_Camper_7), + obj_frame_tiles(gFieldObjectPic_Camper_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Picnicker[] = { + obj_frame_tiles(gFieldObjectPic_Picnicker_0), + obj_frame_tiles(gFieldObjectPic_Picnicker_1), + obj_frame_tiles(gFieldObjectPic_Picnicker_2), + obj_frame_tiles(gFieldObjectPic_Picnicker_3), + obj_frame_tiles(gFieldObjectPic_Picnicker_4), + obj_frame_tiles(gFieldObjectPic_Picnicker_5), + obj_frame_tiles(gFieldObjectPic_Picnicker_6), + obj_frame_tiles(gFieldObjectPic_Picnicker_7), + obj_frame_tiles(gFieldObjectPic_Picnicker_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Man4[] = { + obj_frame_tiles(gFieldObjectPic_Man4_0), + obj_frame_tiles(gFieldObjectPic_Man4_1), + obj_frame_tiles(gFieldObjectPic_Man4_2), + obj_frame_tiles(gFieldObjectPic_Man4_3), + obj_frame_tiles(gFieldObjectPic_Man4_4), + obj_frame_tiles(gFieldObjectPic_Man4_5), + obj_frame_tiles(gFieldObjectPic_Man4_6), + obj_frame_tiles(gFieldObjectPic_Man4_7), + obj_frame_tiles(gFieldObjectPic_Man4_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Woman7[] = { + obj_frame_tiles(gFieldObjectPic_Woman7_0), + obj_frame_tiles(gFieldObjectPic_Woman7_1), + obj_frame_tiles(gFieldObjectPic_Woman7_2), + obj_frame_tiles(gFieldObjectPic_Woman7_3), + obj_frame_tiles(gFieldObjectPic_Woman7_4), + obj_frame_tiles(gFieldObjectPic_Woman7_5), + obj_frame_tiles(gFieldObjectPic_Woman7_6), + obj_frame_tiles(gFieldObjectPic_Woman7_7), + obj_frame_tiles(gFieldObjectPic_Woman7_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Youngster[] = { + obj_frame_tiles(gFieldObjectPic_Youngster_0), + obj_frame_tiles(gFieldObjectPic_Youngster_1), + obj_frame_tiles(gFieldObjectPic_Youngster_2), + obj_frame_tiles(gFieldObjectPic_Youngster_3), + obj_frame_tiles(gFieldObjectPic_Youngster_4), + obj_frame_tiles(gFieldObjectPic_Youngster_5), + obj_frame_tiles(gFieldObjectPic_Youngster_6), + obj_frame_tiles(gFieldObjectPic_Youngster_7), + obj_frame_tiles(gFieldObjectPic_Youngster_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_BugCatcher[] = { + obj_frame_tiles(gFieldObjectPic_BugCatcher_0), + obj_frame_tiles(gFieldObjectPic_BugCatcher_1), + obj_frame_tiles(gFieldObjectPic_BugCatcher_2), + obj_frame_tiles(gFieldObjectPic_BugCatcher_3), + obj_frame_tiles(gFieldObjectPic_BugCatcher_4), + obj_frame_tiles(gFieldObjectPic_BugCatcher_5), + obj_frame_tiles(gFieldObjectPic_BugCatcher_6), + obj_frame_tiles(gFieldObjectPic_BugCatcher_7), + obj_frame_tiles(gFieldObjectPic_BugCatcher_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_PsychicM[] = { + obj_frame_tiles(gFieldObjectPic_PsychicM_0), + obj_frame_tiles(gFieldObjectPic_PsychicM_1), + obj_frame_tiles(gFieldObjectPic_PsychicM_2), + obj_frame_tiles(gFieldObjectPic_PsychicM_3), + obj_frame_tiles(gFieldObjectPic_PsychicM_4), + obj_frame_tiles(gFieldObjectPic_PsychicM_5), + obj_frame_tiles(gFieldObjectPic_PsychicM_6), + obj_frame_tiles(gFieldObjectPic_PsychicM_7), + obj_frame_tiles(gFieldObjectPic_PsychicM_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_SchoolKidM[] = { + obj_frame_tiles(gFieldObjectPic_SchoolKidM_0), + obj_frame_tiles(gFieldObjectPic_SchoolKidM_1), + obj_frame_tiles(gFieldObjectPic_SchoolKidM_2), + obj_frame_tiles(gFieldObjectPic_SchoolKidM_3), + obj_frame_tiles(gFieldObjectPic_SchoolKidM_4), + obj_frame_tiles(gFieldObjectPic_SchoolKidM_5), + obj_frame_tiles(gFieldObjectPic_SchoolKidM_6), + obj_frame_tiles(gFieldObjectPic_SchoolKidM_7), + obj_frame_tiles(gFieldObjectPic_SchoolKidM_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Maniac[] = { + obj_frame_tiles(gFieldObjectPic_Maniac_0), + obj_frame_tiles(gFieldObjectPic_Maniac_1), + obj_frame_tiles(gFieldObjectPic_Maniac_2), + obj_frame_tiles(gFieldObjectPic_Maniac_3), + obj_frame_tiles(gFieldObjectPic_Maniac_4), + obj_frame_tiles(gFieldObjectPic_Maniac_5), + obj_frame_tiles(gFieldObjectPic_Maniac_6), + obj_frame_tiles(gFieldObjectPic_Maniac_7), + obj_frame_tiles(gFieldObjectPic_Maniac_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_HexManiac[] = { + obj_frame_tiles(gFieldObjectPic_HexManiac_0), + obj_frame_tiles(gFieldObjectPic_HexManiac_1), + obj_frame_tiles(gFieldObjectPic_HexManiac_2), + obj_frame_tiles(gFieldObjectPic_HexManiac_3), + obj_frame_tiles(gFieldObjectPic_HexManiac_4), + obj_frame_tiles(gFieldObjectPic_HexManiac_5), + obj_frame_tiles(gFieldObjectPic_HexManiac_6), + obj_frame_tiles(gFieldObjectPic_HexManiac_7), + obj_frame_tiles(gFieldObjectPic_HexManiac_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_SwimmerM[] = { + obj_frame_tiles(gFieldObjectPic_SwimmerM_0), + obj_frame_tiles(gFieldObjectPic_SwimmerM_1), + obj_frame_tiles(gFieldObjectPic_SwimmerM_2), + obj_frame_tiles(gFieldObjectPic_SwimmerM_3), + obj_frame_tiles(gFieldObjectPic_SwimmerM_4), + obj_frame_tiles(gFieldObjectPic_SwimmerM_5), + obj_frame_tiles(gFieldObjectPic_SwimmerM_6), + obj_frame_tiles(gFieldObjectPic_SwimmerM_7), + obj_frame_tiles(gFieldObjectPic_SwimmerM_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_SwimmerF[] = { + obj_frame_tiles(gFieldObjectPic_SwimmerF_0), + obj_frame_tiles(gFieldObjectPic_SwimmerF_1), + obj_frame_tiles(gFieldObjectPic_SwimmerF_2), + obj_frame_tiles(gFieldObjectPic_SwimmerF_3), + obj_frame_tiles(gFieldObjectPic_SwimmerF_4), + obj_frame_tiles(gFieldObjectPic_SwimmerF_5), + obj_frame_tiles(gFieldObjectPic_SwimmerF_6), + obj_frame_tiles(gFieldObjectPic_SwimmerF_7), + obj_frame_tiles(gFieldObjectPic_SwimmerF_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_BlackBelt[] = { + obj_frame_tiles(gFieldObjectPic_BlackBelt_0), + obj_frame_tiles(gFieldObjectPic_BlackBelt_1), + obj_frame_tiles(gFieldObjectPic_BlackBelt_2), + obj_frame_tiles(gFieldObjectPic_BlackBelt_3), + obj_frame_tiles(gFieldObjectPic_BlackBelt_4), + obj_frame_tiles(gFieldObjectPic_BlackBelt_5), + obj_frame_tiles(gFieldObjectPic_BlackBelt_6), + obj_frame_tiles(gFieldObjectPic_BlackBelt_7), + obj_frame_tiles(gFieldObjectPic_BlackBelt_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Beauty[] = { + obj_frame_tiles(gFieldObjectPic_Beauty_0), + obj_frame_tiles(gFieldObjectPic_Beauty_1), + obj_frame_tiles(gFieldObjectPic_Beauty_2), + obj_frame_tiles(gFieldObjectPic_Beauty_3), + obj_frame_tiles(gFieldObjectPic_Beauty_4), + obj_frame_tiles(gFieldObjectPic_Beauty_5), + obj_frame_tiles(gFieldObjectPic_Beauty_6), + obj_frame_tiles(gFieldObjectPic_Beauty_7), + obj_frame_tiles(gFieldObjectPic_Beauty_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Scientist1[] = { + obj_frame_tiles(gFieldObjectPic_Scientist1_0), + obj_frame_tiles(gFieldObjectPic_Scientist1_1), + obj_frame_tiles(gFieldObjectPic_Scientist1_2), + obj_frame_tiles(gFieldObjectPic_Scientist1_3), + obj_frame_tiles(gFieldObjectPic_Scientist1_4), + obj_frame_tiles(gFieldObjectPic_Scientist1_5), + obj_frame_tiles(gFieldObjectPic_Scientist1_6), + obj_frame_tiles(gFieldObjectPic_Scientist1_7), + obj_frame_tiles(gFieldObjectPic_Scientist1_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Lass[] = { + obj_frame_tiles(gFieldObjectPic_Lass_0), + obj_frame_tiles(gFieldObjectPic_Lass_1), + obj_frame_tiles(gFieldObjectPic_Lass_2), + obj_frame_tiles(gFieldObjectPic_Lass_3), + obj_frame_tiles(gFieldObjectPic_Lass_4), + obj_frame_tiles(gFieldObjectPic_Lass_5), + obj_frame_tiles(gFieldObjectPic_Lass_6), + obj_frame_tiles(gFieldObjectPic_Lass_7), + obj_frame_tiles(gFieldObjectPic_Lass_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Gentleman[] = { + obj_frame_tiles(gFieldObjectPic_Gentleman_0), + obj_frame_tiles(gFieldObjectPic_Gentleman_1), + obj_frame_tiles(gFieldObjectPic_Gentleman_2), + obj_frame_tiles(gFieldObjectPic_Gentleman_3), + obj_frame_tiles(gFieldObjectPic_Gentleman_4), + obj_frame_tiles(gFieldObjectPic_Gentleman_5), + obj_frame_tiles(gFieldObjectPic_Gentleman_6), + obj_frame_tiles(gFieldObjectPic_Gentleman_7), + obj_frame_tiles(gFieldObjectPic_Gentleman_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Sailor[] = { + obj_frame_tiles(gFieldObjectPic_Sailor_0), + obj_frame_tiles(gFieldObjectPic_Sailor_1), + obj_frame_tiles(gFieldObjectPic_Sailor_2), + obj_frame_tiles(gFieldObjectPic_Sailor_3), + obj_frame_tiles(gFieldObjectPic_Sailor_4), + obj_frame_tiles(gFieldObjectPic_Sailor_5), + obj_frame_tiles(gFieldObjectPic_Sailor_6), + obj_frame_tiles(gFieldObjectPic_Sailor_7), + obj_frame_tiles(gFieldObjectPic_Sailor_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Fisherman[] = { + obj_frame_tiles(gFieldObjectPic_Fisherman_0), + obj_frame_tiles(gFieldObjectPic_Fisherman_1), + obj_frame_tiles(gFieldObjectPic_Fisherman_2), + obj_frame_tiles(gFieldObjectPic_Fisherman_3), + obj_frame_tiles(gFieldObjectPic_Fisherman_4), + obj_frame_tiles(gFieldObjectPic_Fisherman_5), + obj_frame_tiles(gFieldObjectPic_Fisherman_6), + obj_frame_tiles(gFieldObjectPic_Fisherman_7), + obj_frame_tiles(gFieldObjectPic_Fisherman_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_RunningTriathleteM[] = { + obj_frame_tiles(gFieldObjectPic_RunningTriathleteM_0), + obj_frame_tiles(gFieldObjectPic_RunningTriathleteM_1), + obj_frame_tiles(gFieldObjectPic_RunningTriathleteM_2), + obj_frame_tiles(gFieldObjectPic_RunningTriathleteM_3), + obj_frame_tiles(gFieldObjectPic_RunningTriathleteM_4), + obj_frame_tiles(gFieldObjectPic_RunningTriathleteM_5), + obj_frame_tiles(gFieldObjectPic_RunningTriathleteM_6), + obj_frame_tiles(gFieldObjectPic_RunningTriathleteM_7), + obj_frame_tiles(gFieldObjectPic_RunningTriathleteM_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_RunningTriathleteF[] = { + obj_frame_tiles(gFieldObjectPic_RunningTriathleteF_0), + obj_frame_tiles(gFieldObjectPic_RunningTriathleteF_1), + obj_frame_tiles(gFieldObjectPic_RunningTriathleteF_2), + obj_frame_tiles(gFieldObjectPic_RunningTriathleteF_3), + obj_frame_tiles(gFieldObjectPic_RunningTriathleteF_4), + obj_frame_tiles(gFieldObjectPic_RunningTriathleteF_5), + obj_frame_tiles(gFieldObjectPic_RunningTriathleteF_6), + obj_frame_tiles(gFieldObjectPic_RunningTriathleteF_7), + obj_frame_tiles(gFieldObjectPic_RunningTriathleteF_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_TuberF[] = { + obj_frame_tiles(gFieldObjectPic_TuberF_0), + obj_frame_tiles(gFieldObjectPic_TuberF_1), + obj_frame_tiles(gFieldObjectPic_TuberF_2), + obj_frame_tiles(gFieldObjectPic_TuberF_3), + obj_frame_tiles(gFieldObjectPic_TuberF_4), + obj_frame_tiles(gFieldObjectPic_TuberF_5), + obj_frame_tiles(gFieldObjectPic_TuberF_6), + obj_frame_tiles(gFieldObjectPic_TuberF_7), + obj_frame_tiles(gFieldObjectPic_TuberF_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_TuberM[] = { + obj_frame_tiles(gFieldObjectPic_TuberM_0), + obj_frame_tiles(gFieldObjectPic_TuberM_1), + obj_frame_tiles(gFieldObjectPic_TuberM_2), + obj_frame_tiles(gFieldObjectPic_TuberM_3), + obj_frame_tiles(gFieldObjectPic_TuberM_4), + obj_frame_tiles(gFieldObjectPic_TuberM_5), + obj_frame_tiles(gFieldObjectPic_TuberM_6), + obj_frame_tiles(gFieldObjectPic_TuberM_7), + obj_frame_tiles(gFieldObjectPic_TuberM_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Hiker[] = { + obj_frame_tiles(gFieldObjectPic_Hiker_0), + obj_frame_tiles(gFieldObjectPic_Hiker_1), + obj_frame_tiles(gFieldObjectPic_Hiker_2), + obj_frame_tiles(gFieldObjectPic_Hiker_3), + obj_frame_tiles(gFieldObjectPic_Hiker_4), + obj_frame_tiles(gFieldObjectPic_Hiker_5), + obj_frame_tiles(gFieldObjectPic_Hiker_6), + obj_frame_tiles(gFieldObjectPic_Hiker_7), + obj_frame_tiles(gFieldObjectPic_Hiker_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_CyclingTriathleteM[] = { + obj_frame_tiles(gFieldObjectPic_CyclingTriathleteM_0), + obj_frame_tiles(gFieldObjectPic_CyclingTriathleteM_1), + obj_frame_tiles(gFieldObjectPic_CyclingTriathleteM_2), + obj_frame_tiles(gFieldObjectPic_CyclingTriathleteM_3), + obj_frame_tiles(gFieldObjectPic_CyclingTriathleteM_4), + obj_frame_tiles(gFieldObjectPic_CyclingTriathleteM_5), + obj_frame_tiles(gFieldObjectPic_CyclingTriathleteM_6), + obj_frame_tiles(gFieldObjectPic_CyclingTriathleteM_7), + obj_frame_tiles(gFieldObjectPic_CyclingTriathleteM_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_CyclingTriathleteF[] = { + obj_frame_tiles(gFieldObjectPic_CyclingTriathleteF_0), + obj_frame_tiles(gFieldObjectPic_CyclingTriathleteF_1), + obj_frame_tiles(gFieldObjectPic_CyclingTriathleteF_2), + obj_frame_tiles(gFieldObjectPic_CyclingTriathleteF_3), + obj_frame_tiles(gFieldObjectPic_CyclingTriathleteF_4), + obj_frame_tiles(gFieldObjectPic_CyclingTriathleteF_5), + obj_frame_tiles(gFieldObjectPic_CyclingTriathleteF_6), + obj_frame_tiles(gFieldObjectPic_CyclingTriathleteF_7), + obj_frame_tiles(gFieldObjectPic_CyclingTriathleteF_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Nurse[] = { + obj_frame_tiles(gFieldObjectPic_Nurse_0), + obj_frame_tiles(gFieldObjectPic_Nurse_1), + obj_frame_tiles(gFieldObjectPic_Nurse_2), + obj_frame_tiles(gFieldObjectPic_Nurse_0), + obj_frame_tiles(gFieldObjectPic_Nurse_0), + obj_frame_tiles(gFieldObjectPic_Nurse_1), + obj_frame_tiles(gFieldObjectPic_Nurse_1), + obj_frame_tiles(gFieldObjectPic_Nurse_2), + obj_frame_tiles(gFieldObjectPic_Nurse_2), + obj_frame_tiles(gFieldObjectPic_Nurse_3), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_ItemBall[] = { + obj_frame_tiles(gFieldObjectPic_ItemBall), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_ProfBirch[] = { + obj_frame_tiles(gFieldObjectPic_ProfBirch_0), + obj_frame_tiles(gFieldObjectPic_ProfBirch_1), + obj_frame_tiles(gFieldObjectPic_ProfBirch_2), + obj_frame_tiles(gFieldObjectPic_ProfBirch_3), + obj_frame_tiles(gFieldObjectPic_ProfBirch_4), + obj_frame_tiles(gFieldObjectPic_ProfBirch_5), + obj_frame_tiles(gFieldObjectPic_ProfBirch_6), + obj_frame_tiles(gFieldObjectPic_ProfBirch_7), + obj_frame_tiles(gFieldObjectPic_ProfBirch_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Man5[] = { + obj_frame_tiles(gFieldObjectPic_Man5_0), + obj_frame_tiles(gFieldObjectPic_Man5_1), + obj_frame_tiles(gFieldObjectPic_Man5_2), + obj_frame_tiles(gFieldObjectPic_Man5_3), + obj_frame_tiles(gFieldObjectPic_Man5_4), + obj_frame_tiles(gFieldObjectPic_Man5_5), + obj_frame_tiles(gFieldObjectPic_Man5_6), + obj_frame_tiles(gFieldObjectPic_Man5_7), + obj_frame_tiles(gFieldObjectPic_Man5_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Man6[] = { + obj_frame_tiles(gFieldObjectPic_Man6_0), + obj_frame_tiles(gFieldObjectPic_Man6_1), + obj_frame_tiles(gFieldObjectPic_Man6_2), + obj_frame_tiles(gFieldObjectPic_Man6_3), + obj_frame_tiles(gFieldObjectPic_Man6_4), + obj_frame_tiles(gFieldObjectPic_Man6_5), + obj_frame_tiles(gFieldObjectPic_Man6_6), + obj_frame_tiles(gFieldObjectPic_Man6_7), + obj_frame_tiles(gFieldObjectPic_Man6_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_ReporterM[] = { + obj_frame_tiles(gFieldObjectPic_ReporterM_0), + obj_frame_tiles(gFieldObjectPic_ReporterM_1), + obj_frame_tiles(gFieldObjectPic_ReporterM_2), + obj_frame_tiles(gFieldObjectPic_ReporterM_3), + obj_frame_tiles(gFieldObjectPic_ReporterM_4), + obj_frame_tiles(gFieldObjectPic_ReporterM_5), + obj_frame_tiles(gFieldObjectPic_ReporterM_6), + obj_frame_tiles(gFieldObjectPic_ReporterM_7), + obj_frame_tiles(gFieldObjectPic_ReporterM_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_ReporterF[] = { + obj_frame_tiles(gFieldObjectPic_ReporterF_0), + obj_frame_tiles(gFieldObjectPic_ReporterF_1), + obj_frame_tiles(gFieldObjectPic_ReporterF_2), + obj_frame_tiles(gFieldObjectPic_ReporterF_3), + obj_frame_tiles(gFieldObjectPic_ReporterF_4), + obj_frame_tiles(gFieldObjectPic_ReporterF_5), + obj_frame_tiles(gFieldObjectPic_ReporterF_6), + obj_frame_tiles(gFieldObjectPic_ReporterF_7), + obj_frame_tiles(gFieldObjectPic_ReporterF_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_MauvilleOldMan1[] = { + obj_frame_tiles(gFieldObjectPic_MauvilleOldMan1_0), + obj_frame_tiles(gFieldObjectPic_MauvilleOldMan1_1), + obj_frame_tiles(gFieldObjectPic_MauvilleOldMan1_2), + obj_frame_tiles(gFieldObjectPic_MauvilleOldMan1_3), + obj_frame_tiles(gFieldObjectPic_MauvilleOldMan1_4), + obj_frame_tiles(gFieldObjectPic_MauvilleOldMan1_5), + obj_frame_tiles(gFieldObjectPic_MauvilleOldMan1_6), + obj_frame_tiles(gFieldObjectPic_MauvilleOldMan1_7), + obj_frame_tiles(gFieldObjectPic_MauvilleOldMan1_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_MauvilleOldMan2[] = { + obj_frame_tiles(gFieldObjectPic_MauvilleOldMan2_0), + obj_frame_tiles(gFieldObjectPic_MauvilleOldMan2_1), + obj_frame_tiles(gFieldObjectPic_MauvilleOldMan2_2), + obj_frame_tiles(gFieldObjectPic_MauvilleOldMan2_3), + obj_frame_tiles(gFieldObjectPic_MauvilleOldMan2_4), + obj_frame_tiles(gFieldObjectPic_MauvilleOldMan2_5), + obj_frame_tiles(gFieldObjectPic_MauvilleOldMan2_6), + obj_frame_tiles(gFieldObjectPic_MauvilleOldMan2_7), + obj_frame_tiles(gFieldObjectPic_MauvilleOldMan2_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_UnusedNatuDoll[] = { + obj_frame_tiles(gFieldObjectPic_UnusedNatuDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_UnusedMagnemiteDoll[] = { + obj_frame_tiles(gFieldObjectPic_UnusedMagnemiteDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_UnusedSquirtleDoll[] = { + obj_frame_tiles(gFieldObjectPic_UnusedSquirtleDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_UnusedWooperDoll[] = { + obj_frame_tiles(gFieldObjectPic_UnusedWooperDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_UnusedPikachuDoll[] = { + obj_frame_tiles(gFieldObjectPic_UnusedPikachuDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_UnusedPorygon2Doll[] = { + obj_frame_tiles(gFieldObjectPic_UnusedPorygon2Doll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_CuttableTree[] = { + obj_frame_tiles(gFieldObjectPic_CuttableTree_0), + obj_frame_tiles(gFieldObjectPic_CuttableTree_1), + obj_frame_tiles(gFieldObjectPic_CuttableTree_2), + obj_frame_tiles(gFieldObjectPic_CuttableTree_3), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_MartEmployee[] = { + obj_frame_tiles(gFieldObjectPic_MartEmployee_0), + obj_frame_tiles(gFieldObjectPic_MartEmployee_1), + obj_frame_tiles(gFieldObjectPic_MartEmployee_2), + obj_frame_tiles(gFieldObjectPic_MartEmployee_3), + obj_frame_tiles(gFieldObjectPic_MartEmployee_4), + obj_frame_tiles(gFieldObjectPic_MartEmployee_5), + obj_frame_tiles(gFieldObjectPic_MartEmployee_6), + obj_frame_tiles(gFieldObjectPic_MartEmployee_7), + obj_frame_tiles(gFieldObjectPic_MartEmployee_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_RooftopSaleWoman[] = { + obj_frame_tiles(gFieldObjectPic_RooftopSaleWoman_0), + obj_frame_tiles(gFieldObjectPic_RooftopSaleWoman_1), + obj_frame_tiles(gFieldObjectPic_RooftopSaleWoman_2), + obj_frame_tiles(gFieldObjectPic_RooftopSaleWoman_3), + obj_frame_tiles(gFieldObjectPic_RooftopSaleWoman_4), + obj_frame_tiles(gFieldObjectPic_RooftopSaleWoman_5), + obj_frame_tiles(gFieldObjectPic_RooftopSaleWoman_6), + obj_frame_tiles(gFieldObjectPic_RooftopSaleWoman_7), + obj_frame_tiles(gFieldObjectPic_RooftopSaleWoman_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Teala[] = { + obj_frame_tiles(gFieldObjectPic_Teala_0), + obj_frame_tiles(gFieldObjectPic_Teala_1), + obj_frame_tiles(gFieldObjectPic_Teala_2), + obj_frame_tiles(gFieldObjectPic_Teala_3), + obj_frame_tiles(gFieldObjectPic_Teala_4), + obj_frame_tiles(gFieldObjectPic_Teala_5), + obj_frame_tiles(gFieldObjectPic_Teala_6), + obj_frame_tiles(gFieldObjectPic_Teala_7), + obj_frame_tiles(gFieldObjectPic_Teala_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_BreakableRock[] = { + obj_frame_tiles(gFieldObjectPic_BreakableRock_0), + obj_frame_tiles(gFieldObjectPic_BreakableRock_1), + obj_frame_tiles(gFieldObjectPic_BreakableRock_2), + obj_frame_tiles(gFieldObjectPic_BreakableRock_3), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_PushableBoulder[] = { + obj_frame_tiles(gFieldObjectPic_PushableBoulder), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_MrBrineysBoat[] = { + obj_frame_tiles(gFieldObjectPic_MrBrineysBoat_0), + obj_frame_tiles(gFieldObjectPic_MrBrineysBoat_1), + obj_frame_tiles(gFieldObjectPic_MrBrineysBoat_2), + obj_frame_tiles(gFieldObjectPic_MrBrineysBoat_0), + obj_frame_tiles(gFieldObjectPic_MrBrineysBoat_0), + obj_frame_tiles(gFieldObjectPic_MrBrineysBoat_1), + obj_frame_tiles(gFieldObjectPic_MrBrineysBoat_1), + obj_frame_tiles(gFieldObjectPic_MrBrineysBoat_2), + obj_frame_tiles(gFieldObjectPic_MrBrineysBoat_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Truck[] = { + obj_frame_tiles(gFieldObjectPic_Truck), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_VigorothCarryingBox[] = { + obj_frame_tiles(gFieldObjectPic_VigorothCarryingBox_0), + obj_frame_tiles(gFieldObjectPic_VigorothCarryingBox_0), + obj_frame_tiles(gFieldObjectPic_VigorothCarryingBox_0), + obj_frame_tiles(gFieldObjectPic_VigorothCarryingBox_1), + obj_frame_tiles(gFieldObjectPic_VigorothCarryingBox_2), + obj_frame_tiles(gFieldObjectPic_VigorothCarryingBox_1), + obj_frame_tiles(gFieldObjectPic_VigorothCarryingBox_2), + obj_frame_tiles(gFieldObjectPic_VigorothCarryingBox_1), + obj_frame_tiles(gFieldObjectPic_VigorothCarryingBox_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_VigorothFacingAway[] = { + obj_frame_tiles(gFieldObjectPic_VigorothFacingAway_0), + obj_frame_tiles(gFieldObjectPic_VigorothFacingAway_0), + obj_frame_tiles(gFieldObjectPic_VigorothFacingAway_0), + obj_frame_tiles(gFieldObjectPic_VigorothFacingAway_1), + obj_frame_tiles(gFieldObjectPic_VigorothFacingAway_1), + obj_frame_tiles(gFieldObjectPic_VigorothFacingAway_1), + obj_frame_tiles(gFieldObjectPic_VigorothFacingAway_1), + obj_frame_tiles(gFieldObjectPic_VigorothFacingAway_1), + obj_frame_tiles(gFieldObjectPic_VigorothFacingAway_1), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_BirchsBag[] = { + obj_frame_tiles(gFieldObjectPic_BirchsBag), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_EnemyZigzagoon[] = { + obj_frame_tiles(gFieldObjectPic_EnemyZigzagoon_0), + obj_frame_tiles(gFieldObjectPic_EnemyZigzagoon_1), + obj_frame_tiles(gFieldObjectPic_EnemyZigzagoon_2), + obj_frame_tiles(gFieldObjectPic_EnemyZigzagoon_3), + obj_frame_tiles(gFieldObjectPic_EnemyZigzagoon_4), + obj_frame_tiles(gFieldObjectPic_EnemyZigzagoon_5), + obj_frame_tiles(gFieldObjectPic_EnemyZigzagoon_6), + obj_frame_tiles(gFieldObjectPic_EnemyZigzagoon_7), + obj_frame_tiles(gFieldObjectPic_EnemyZigzagoon_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Poochyena[] = { + obj_frame_tiles(gFieldObjectPic_Poochyena_0), + obj_frame_tiles(gFieldObjectPic_Poochyena_1), + obj_frame_tiles(gFieldObjectPic_Poochyena_2), + obj_frame_tiles(gFieldObjectPic_Poochyena_3), + obj_frame_tiles(gFieldObjectPic_Poochyena_4), + obj_frame_tiles(gFieldObjectPic_Poochyena_5), + obj_frame_tiles(gFieldObjectPic_Poochyena_6), + obj_frame_tiles(gFieldObjectPic_Poochyena_7), + obj_frame_tiles(gFieldObjectPic_Poochyena_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Artist[] = { + obj_frame_tiles(gFieldObjectPic_Artist_0), + obj_frame_tiles(gFieldObjectPic_Artist_1), + obj_frame_tiles(gFieldObjectPic_Artist_2), + obj_frame_tiles(gFieldObjectPic_Artist_3), + obj_frame_tiles(gFieldObjectPic_Artist_4), + obj_frame_tiles(gFieldObjectPic_Artist_5), + obj_frame_tiles(gFieldObjectPic_Artist_6), + obj_frame_tiles(gFieldObjectPic_Artist_7), + obj_frame_tiles(gFieldObjectPic_Artist_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_MayNormal[] = { + obj_frame_tiles(gFieldObjectPic_MayNormal_0), + obj_frame_tiles(gFieldObjectPic_MayNormal_1), + obj_frame_tiles(gFieldObjectPic_MayNormal_2), + obj_frame_tiles(gFieldObjectPic_MayNormal_3), + obj_frame_tiles(gFieldObjectPic_MayNormal_4), + obj_frame_tiles(gFieldObjectPic_MayNormal_5), + obj_frame_tiles(gFieldObjectPic_MayNormal_6), + obj_frame_tiles(gFieldObjectPic_MayNormal_7), + obj_frame_tiles(gFieldObjectPic_MayNormal_8), + obj_frame_tiles(gFieldObjectPic_MayNormal_9), + obj_frame_tiles(gFieldObjectPic_MayNormal_10), + obj_frame_tiles(gFieldObjectPic_MayNormal_11), + obj_frame_tiles(gFieldObjectPic_MayNormal_12), + obj_frame_tiles(gFieldObjectPic_MayNormal_13), + obj_frame_tiles(gFieldObjectPic_MayNormal_14), + obj_frame_tiles(gFieldObjectPic_MayNormal_15), + obj_frame_tiles(gFieldObjectPic_MayNormal_16), + obj_frame_tiles(gFieldObjectPic_MayNormal_17), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_MayMachBike[] = { + obj_frame_tiles(gFieldObjectPic_MayMachBike_0), + obj_frame_tiles(gFieldObjectPic_MayMachBike_1), + obj_frame_tiles(gFieldObjectPic_MayMachBike_2), + obj_frame_tiles(gFieldObjectPic_MayMachBike_3), + obj_frame_tiles(gFieldObjectPic_MayMachBike_4), + obj_frame_tiles(gFieldObjectPic_MayMachBike_5), + obj_frame_tiles(gFieldObjectPic_MayMachBike_6), + obj_frame_tiles(gFieldObjectPic_MayMachBike_7), + obj_frame_tiles(gFieldObjectPic_MayMachBike_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_MayAcroBike[] = { + obj_frame_tiles(gFieldObjectPic_MayAcroBike_0), + obj_frame_tiles(gFieldObjectPic_MayAcroBike_1), + obj_frame_tiles(gFieldObjectPic_MayAcroBike_2), + obj_frame_tiles(gFieldObjectPic_MayAcroBike_3), + obj_frame_tiles(gFieldObjectPic_MayAcroBike_4), + obj_frame_tiles(gFieldObjectPic_MayAcroBike_5), + obj_frame_tiles(gFieldObjectPic_MayAcroBike_6), + obj_frame_tiles(gFieldObjectPic_MayAcroBike_7), + obj_frame_tiles(gFieldObjectPic_MayAcroBike_8), + obj_frame_tiles(gFieldObjectPic_MayAcroBike_9), + obj_frame_tiles(gFieldObjectPic_MayAcroBike_10), + obj_frame_tiles(gFieldObjectPic_MayAcroBike_11), + obj_frame_tiles(gFieldObjectPic_MayAcroBike_12), + obj_frame_tiles(gFieldObjectPic_MayAcroBike_13), + obj_frame_tiles(gFieldObjectPic_MayAcroBike_14), + obj_frame_tiles(gFieldObjectPic_MayAcroBike_15), + obj_frame_tiles(gFieldObjectPic_MayAcroBike_16), + obj_frame_tiles(gFieldObjectPic_MayAcroBike_17), + obj_frame_tiles(gFieldObjectPic_MayAcroBike_18), + obj_frame_tiles(gFieldObjectPic_MayAcroBike_19), + obj_frame_tiles(gFieldObjectPic_MayAcroBike_20), + obj_frame_tiles(gFieldObjectPic_MayAcroBike_21), + obj_frame_tiles(gFieldObjectPic_MayAcroBike_22), + obj_frame_tiles(gFieldObjectPic_MayAcroBike_23), + obj_frame_tiles(gFieldObjectPic_MayAcroBike_24), + obj_frame_tiles(gFieldObjectPic_MayAcroBike_25), + obj_frame_tiles(gFieldObjectPic_MayAcroBike_26), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_MaySurfing[] = { + obj_frame_tiles(gFieldObjectPic_MaySurfing_0), + obj_frame_tiles(gFieldObjectPic_MaySurfing_1), + obj_frame_tiles(gFieldObjectPic_MaySurfing_2), + obj_frame_tiles(gFieldObjectPic_MaySurfing_0), + obj_frame_tiles(gFieldObjectPic_MaySurfing_0), + obj_frame_tiles(gFieldObjectPic_MaySurfing_1), + obj_frame_tiles(gFieldObjectPic_MaySurfing_1), + obj_frame_tiles(gFieldObjectPic_MaySurfing_2), + obj_frame_tiles(gFieldObjectPic_MaySurfing_2), + obj_frame_tiles(gFieldObjectPic_MaySurfing_3), + obj_frame_tiles(gFieldObjectPic_MaySurfing_4), + obj_frame_tiles(gFieldObjectPic_MaySurfing_5), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_MayUnderwater[] = { + obj_frame_tiles(gFieldObjectPic_MayUnderwater_0), + obj_frame_tiles(gFieldObjectPic_MayUnderwater_1), + obj_frame_tiles(gFieldObjectPic_MayUnderwater_2), + obj_frame_tiles(gFieldObjectPic_MayUnderwater_0), + obj_frame_tiles(gFieldObjectPic_MayUnderwater_0), + obj_frame_tiles(gFieldObjectPic_MayUnderwater_1), + obj_frame_tiles(gFieldObjectPic_MayUnderwater_1), + obj_frame_tiles(gFieldObjectPic_MayUnderwater_2), + obj_frame_tiles(gFieldObjectPic_MayUnderwater_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_MayFieldMove[] = { + obj_frame_tiles(gFieldObjectPic_MayFieldMove_0), + obj_frame_tiles(gFieldObjectPic_MayFieldMove_1), + obj_frame_tiles(gFieldObjectPic_MayFieldMove_2), + obj_frame_tiles(gFieldObjectPic_MayFieldMove_3), + obj_frame_tiles(gFieldObjectPic_MayFieldMove_4), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Cameraman[] = { + obj_frame_tiles(gFieldObjectPic_Cameraman_0), + obj_frame_tiles(gFieldObjectPic_Cameraman_1), + obj_frame_tiles(gFieldObjectPic_Cameraman_2), + obj_frame_tiles(gFieldObjectPic_Cameraman_3), + obj_frame_tiles(gFieldObjectPic_Cameraman_4), + obj_frame_tiles(gFieldObjectPic_Cameraman_5), + obj_frame_tiles(gFieldObjectPic_Cameraman_6), + obj_frame_tiles(gFieldObjectPic_Cameraman_7), + obj_frame_tiles(gFieldObjectPic_Cameraman_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_MovingBox[] = { + obj_frame_tiles(gFieldObjectPic_MovingBox), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_CableCar[] = { + obj_frame_tiles(gFieldObjectPic_CableCar), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Scientist2[] = { + obj_frame_tiles(gFieldObjectPic_Scientist2_0), + obj_frame_tiles(gFieldObjectPic_Scientist2_1), + obj_frame_tiles(gFieldObjectPic_Scientist2_2), + obj_frame_tiles(gFieldObjectPic_Scientist2_3), + obj_frame_tiles(gFieldObjectPic_Scientist2_4), + obj_frame_tiles(gFieldObjectPic_Scientist2_5), + obj_frame_tiles(gFieldObjectPic_Scientist2_6), + obj_frame_tiles(gFieldObjectPic_Scientist2_7), + obj_frame_tiles(gFieldObjectPic_Scientist2_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Man7[] = { + obj_frame_tiles(gFieldObjectPic_Man7_0), + obj_frame_tiles(gFieldObjectPic_Man7_1), + obj_frame_tiles(gFieldObjectPic_Man7_2), + obj_frame_tiles(gFieldObjectPic_Man7_3), + obj_frame_tiles(gFieldObjectPic_Man7_4), + obj_frame_tiles(gFieldObjectPic_Man7_5), + obj_frame_tiles(gFieldObjectPic_Man7_6), + obj_frame_tiles(gFieldObjectPic_Man7_7), + obj_frame_tiles(gFieldObjectPic_Man7_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_AquaMemberM[] = { + obj_frame_tiles(gFieldObjectPic_AquaMemberM_0), + obj_frame_tiles(gFieldObjectPic_AquaMemberM_1), + obj_frame_tiles(gFieldObjectPic_AquaMemberM_2), + obj_frame_tiles(gFieldObjectPic_AquaMemberM_3), + obj_frame_tiles(gFieldObjectPic_AquaMemberM_4), + obj_frame_tiles(gFieldObjectPic_AquaMemberM_5), + obj_frame_tiles(gFieldObjectPic_AquaMemberM_6), + obj_frame_tiles(gFieldObjectPic_AquaMemberM_7), + obj_frame_tiles(gFieldObjectPic_AquaMemberM_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_AquaMemberF[] = { + obj_frame_tiles(gFieldObjectPic_AquaMemberF_0), + obj_frame_tiles(gFieldObjectPic_AquaMemberF_1), + obj_frame_tiles(gFieldObjectPic_AquaMemberF_2), + obj_frame_tiles(gFieldObjectPic_AquaMemberF_3), + obj_frame_tiles(gFieldObjectPic_AquaMemberF_4), + obj_frame_tiles(gFieldObjectPic_AquaMemberF_5), + obj_frame_tiles(gFieldObjectPic_AquaMemberF_6), + obj_frame_tiles(gFieldObjectPic_AquaMemberF_7), + obj_frame_tiles(gFieldObjectPic_AquaMemberF_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_MagmaMemberM[] = { + obj_frame_tiles(gFieldObjectPic_MagmaMemberM_0), + obj_frame_tiles(gFieldObjectPic_MagmaMemberM_1), + obj_frame_tiles(gFieldObjectPic_MagmaMemberM_2), + obj_frame_tiles(gFieldObjectPic_MagmaMemberM_3), + obj_frame_tiles(gFieldObjectPic_MagmaMemberM_4), + obj_frame_tiles(gFieldObjectPic_MagmaMemberM_5), + obj_frame_tiles(gFieldObjectPic_MagmaMemberM_6), + obj_frame_tiles(gFieldObjectPic_MagmaMemberM_7), + obj_frame_tiles(gFieldObjectPic_MagmaMemberM_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_MagmaMemberF[] = { + obj_frame_tiles(gFieldObjectPic_MagmaMemberF_0), + obj_frame_tiles(gFieldObjectPic_MagmaMemberF_1), + obj_frame_tiles(gFieldObjectPic_MagmaMemberF_2), + obj_frame_tiles(gFieldObjectPic_MagmaMemberF_3), + obj_frame_tiles(gFieldObjectPic_MagmaMemberF_4), + obj_frame_tiles(gFieldObjectPic_MagmaMemberF_5), + obj_frame_tiles(gFieldObjectPic_MagmaMemberF_6), + obj_frame_tiles(gFieldObjectPic_MagmaMemberF_7), + obj_frame_tiles(gFieldObjectPic_MagmaMemberF_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Sidney[] = { + obj_frame_tiles(gFieldObjectPic_Sidney_0), + obj_frame_tiles(gFieldObjectPic_Sidney_1), + obj_frame_tiles(gFieldObjectPic_Sidney_2), + obj_frame_tiles(gFieldObjectPic_Sidney_0), + obj_frame_tiles(gFieldObjectPic_Sidney_0), + obj_frame_tiles(gFieldObjectPic_Sidney_1), + obj_frame_tiles(gFieldObjectPic_Sidney_1), + obj_frame_tiles(gFieldObjectPic_Sidney_2), + obj_frame_tiles(gFieldObjectPic_Sidney_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Phoebe[] = { + obj_frame_tiles(gFieldObjectPic_Phoebe_0), + obj_frame_tiles(gFieldObjectPic_Phoebe_1), + obj_frame_tiles(gFieldObjectPic_Phoebe_2), + obj_frame_tiles(gFieldObjectPic_Phoebe_0), + obj_frame_tiles(gFieldObjectPic_Phoebe_0), + obj_frame_tiles(gFieldObjectPic_Phoebe_1), + obj_frame_tiles(gFieldObjectPic_Phoebe_1), + obj_frame_tiles(gFieldObjectPic_Phoebe_2), + obj_frame_tiles(gFieldObjectPic_Phoebe_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Glacia[] = { + obj_frame_tiles(gFieldObjectPic_Glacia_0), + obj_frame_tiles(gFieldObjectPic_Glacia_1), + obj_frame_tiles(gFieldObjectPic_Glacia_2), + obj_frame_tiles(gFieldObjectPic_Glacia_0), + obj_frame_tiles(gFieldObjectPic_Glacia_0), + obj_frame_tiles(gFieldObjectPic_Glacia_1), + obj_frame_tiles(gFieldObjectPic_Glacia_1), + obj_frame_tiles(gFieldObjectPic_Glacia_2), + obj_frame_tiles(gFieldObjectPic_Glacia_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Drake[] = { + obj_frame_tiles(gFieldObjectPic_Drake_0), + obj_frame_tiles(gFieldObjectPic_Drake_1), + obj_frame_tiles(gFieldObjectPic_Drake_2), + obj_frame_tiles(gFieldObjectPic_Drake_0), + obj_frame_tiles(gFieldObjectPic_Drake_0), + obj_frame_tiles(gFieldObjectPic_Drake_1), + obj_frame_tiles(gFieldObjectPic_Drake_1), + obj_frame_tiles(gFieldObjectPic_Drake_2), + obj_frame_tiles(gFieldObjectPic_Drake_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Roxanne[] = { + obj_frame_tiles(gFieldObjectPic_Roxanne_0), + obj_frame_tiles(gFieldObjectPic_Roxanne_1), + obj_frame_tiles(gFieldObjectPic_Roxanne_2), + obj_frame_tiles(gFieldObjectPic_Roxanne_0), + obj_frame_tiles(gFieldObjectPic_Roxanne_0), + obj_frame_tiles(gFieldObjectPic_Roxanne_1), + obj_frame_tiles(gFieldObjectPic_Roxanne_1), + obj_frame_tiles(gFieldObjectPic_Roxanne_2), + obj_frame_tiles(gFieldObjectPic_Roxanne_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Brawly[] = { + obj_frame_tiles(gFieldObjectPic_Brawly_0), + obj_frame_tiles(gFieldObjectPic_Brawly_1), + obj_frame_tiles(gFieldObjectPic_Brawly_2), + obj_frame_tiles(gFieldObjectPic_Brawly_0), + obj_frame_tiles(gFieldObjectPic_Brawly_0), + obj_frame_tiles(gFieldObjectPic_Brawly_1), + obj_frame_tiles(gFieldObjectPic_Brawly_1), + obj_frame_tiles(gFieldObjectPic_Brawly_2), + obj_frame_tiles(gFieldObjectPic_Brawly_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Wattson[] = { + obj_frame_tiles(gFieldObjectPic_Wattson_0), + obj_frame_tiles(gFieldObjectPic_Wattson_1), + obj_frame_tiles(gFieldObjectPic_Wattson_2), + obj_frame_tiles(gFieldObjectPic_Wattson_0), + obj_frame_tiles(gFieldObjectPic_Wattson_0), + obj_frame_tiles(gFieldObjectPic_Wattson_1), + obj_frame_tiles(gFieldObjectPic_Wattson_1), + obj_frame_tiles(gFieldObjectPic_Wattson_2), + obj_frame_tiles(gFieldObjectPic_Wattson_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Flannery[] = { + obj_frame_tiles(gFieldObjectPic_Flannery_0), + obj_frame_tiles(gFieldObjectPic_Flannery_1), + obj_frame_tiles(gFieldObjectPic_Flannery_2), + obj_frame_tiles(gFieldObjectPic_Flannery_0), + obj_frame_tiles(gFieldObjectPic_Flannery_0), + obj_frame_tiles(gFieldObjectPic_Flannery_1), + obj_frame_tiles(gFieldObjectPic_Flannery_1), + obj_frame_tiles(gFieldObjectPic_Flannery_2), + obj_frame_tiles(gFieldObjectPic_Flannery_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Norman[] = { + obj_frame_tiles(gFieldObjectPic_Norman_0), + obj_frame_tiles(gFieldObjectPic_Norman_1), + obj_frame_tiles(gFieldObjectPic_Norman_2), + obj_frame_tiles(gFieldObjectPic_Norman_3), + obj_frame_tiles(gFieldObjectPic_Norman_4), + obj_frame_tiles(gFieldObjectPic_Norman_5), + obj_frame_tiles(gFieldObjectPic_Norman_6), + obj_frame_tiles(gFieldObjectPic_Norman_7), + obj_frame_tiles(gFieldObjectPic_Norman_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Winona[] = { + obj_frame_tiles(gFieldObjectPic_Winona_0), + obj_frame_tiles(gFieldObjectPic_Winona_1), + obj_frame_tiles(gFieldObjectPic_Winona_2), + obj_frame_tiles(gFieldObjectPic_Winona_0), + obj_frame_tiles(gFieldObjectPic_Winona_0), + obj_frame_tiles(gFieldObjectPic_Winona_1), + obj_frame_tiles(gFieldObjectPic_Winona_1), + obj_frame_tiles(gFieldObjectPic_Winona_2), + obj_frame_tiles(gFieldObjectPic_Winona_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Liza[] = { + obj_frame_tiles(gFieldObjectPic_Liza_0), + obj_frame_tiles(gFieldObjectPic_Liza_1), + obj_frame_tiles(gFieldObjectPic_Liza_2), + obj_frame_tiles(gFieldObjectPic_Liza_0), + obj_frame_tiles(gFieldObjectPic_Liza_0), + obj_frame_tiles(gFieldObjectPic_Liza_1), + obj_frame_tiles(gFieldObjectPic_Liza_1), + obj_frame_tiles(gFieldObjectPic_Liza_2), + obj_frame_tiles(gFieldObjectPic_Liza_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Tate[] = { + obj_frame_tiles(gFieldObjectPic_Tate_0), + obj_frame_tiles(gFieldObjectPic_Tate_1), + obj_frame_tiles(gFieldObjectPic_Tate_2), + obj_frame_tiles(gFieldObjectPic_Tate_0), + obj_frame_tiles(gFieldObjectPic_Tate_0), + obj_frame_tiles(gFieldObjectPic_Tate_1), + obj_frame_tiles(gFieldObjectPic_Tate_1), + obj_frame_tiles(gFieldObjectPic_Tate_2), + obj_frame_tiles(gFieldObjectPic_Tate_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Wallace[] = { + obj_frame_tiles(gFieldObjectPic_Wallace_0), + obj_frame_tiles(gFieldObjectPic_Wallace_1), + obj_frame_tiles(gFieldObjectPic_Wallace_2), + obj_frame_tiles(gFieldObjectPic_Wallace_3), + obj_frame_tiles(gFieldObjectPic_Wallace_4), + obj_frame_tiles(gFieldObjectPic_Wallace_5), + obj_frame_tiles(gFieldObjectPic_Wallace_6), + obj_frame_tiles(gFieldObjectPic_Wallace_7), + obj_frame_tiles(gFieldObjectPic_Wallace_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Steven[] = { + obj_frame_tiles(gFieldObjectPic_Steven_0), + obj_frame_tiles(gFieldObjectPic_Steven_1), + obj_frame_tiles(gFieldObjectPic_Steven_2), + obj_frame_tiles(gFieldObjectPic_Steven_3), + obj_frame_tiles(gFieldObjectPic_Steven_4), + obj_frame_tiles(gFieldObjectPic_Steven_5), + obj_frame_tiles(gFieldObjectPic_Steven_6), + obj_frame_tiles(gFieldObjectPic_Steven_7), + obj_frame_tiles(gFieldObjectPic_Steven_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Wally[] = { + obj_frame_tiles(gFieldObjectPic_Wally_0), + obj_frame_tiles(gFieldObjectPic_Wally_1), + obj_frame_tiles(gFieldObjectPic_Wally_2), + obj_frame_tiles(gFieldObjectPic_Wally_3), + obj_frame_tiles(gFieldObjectPic_Wally_4), + obj_frame_tiles(gFieldObjectPic_Wally_5), + obj_frame_tiles(gFieldObjectPic_Wally_6), + obj_frame_tiles(gFieldObjectPic_Wally_7), + obj_frame_tiles(gFieldObjectPic_Wally_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_RubySapphireLittleBoy[] = { + obj_frame_tiles(gFieldObjectPic_RubySapphireLittleBoy_0), + obj_frame_tiles(gFieldObjectPic_RubySapphireLittleBoy_1), + obj_frame_tiles(gFieldObjectPic_RubySapphireLittleBoy_2), + obj_frame_tiles(gFieldObjectPic_RubySapphireLittleBoy_3), + obj_frame_tiles(gFieldObjectPic_RubySapphireLittleBoy_4), + obj_frame_tiles(gFieldObjectPic_RubySapphireLittleBoy_5), + obj_frame_tiles(gFieldObjectPic_RubySapphireLittleBoy_6), + obj_frame_tiles(gFieldObjectPic_RubySapphireLittleBoy_7), + obj_frame_tiles(gFieldObjectPic_RubySapphireLittleBoy_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_BrendanFishing[] = { + obj_frame_tiles(gFieldObjectPic_BrendanFishing_0), + obj_frame_tiles(gFieldObjectPic_BrendanFishing_1), + obj_frame_tiles(gFieldObjectPic_BrendanFishing_2), + obj_frame_tiles(gFieldObjectPic_BrendanFishing_3), + obj_frame_tiles(gFieldObjectPic_BrendanFishing_4), + obj_frame_tiles(gFieldObjectPic_BrendanFishing_5), + obj_frame_tiles(gFieldObjectPic_BrendanFishing_6), + obj_frame_tiles(gFieldObjectPic_BrendanFishing_7), + obj_frame_tiles(gFieldObjectPic_BrendanFishing_8), + obj_frame_tiles(gFieldObjectPic_BrendanFishing_9), + obj_frame_tiles(gFieldObjectPic_BrendanFishing_10), + obj_frame_tiles(gFieldObjectPic_BrendanFishing_11), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_MayFishing[] = { + obj_frame_tiles(gFieldObjectPic_MayFishing_0), + obj_frame_tiles(gFieldObjectPic_MayFishing_1), + obj_frame_tiles(gFieldObjectPic_MayFishing_2), + obj_frame_tiles(gFieldObjectPic_MayFishing_3), + obj_frame_tiles(gFieldObjectPic_MayFishing_4), + obj_frame_tiles(gFieldObjectPic_MayFishing_5), + obj_frame_tiles(gFieldObjectPic_MayFishing_6), + obj_frame_tiles(gFieldObjectPic_MayFishing_7), + obj_frame_tiles(gFieldObjectPic_MayFishing_8), + obj_frame_tiles(gFieldObjectPic_MayFishing_9), + obj_frame_tiles(gFieldObjectPic_MayFishing_10), + obj_frame_tiles(gFieldObjectPic_MayFishing_11), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_HotSpringsOldWoman[] = { + obj_frame_tiles(gFieldObjectPic_HotSpringsOldWoman_0), + obj_frame_tiles(gFieldObjectPic_HotSpringsOldWoman_1), + obj_frame_tiles(gFieldObjectPic_HotSpringsOldWoman_2), + obj_frame_tiles(gFieldObjectPic_HotSpringsOldWoman_3), + obj_frame_tiles(gFieldObjectPic_HotSpringsOldWoman_4), + obj_frame_tiles(gFieldObjectPic_HotSpringsOldWoman_5), + obj_frame_tiles(gFieldObjectPic_HotSpringsOldWoman_6), + obj_frame_tiles(gFieldObjectPic_HotSpringsOldWoman_7), + obj_frame_tiles(gFieldObjectPic_HotSpringsOldWoman_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_SSTidal[] = { + obj_frame_tiles(gFieldObjectPic_SSTidal), + obj_frame_tiles(gFieldObjectPic_SSTidal), + obj_frame_tiles(gFieldObjectPic_SSTidal), + obj_frame_tiles(gFieldObjectPic_SSTidal), + obj_frame_tiles(gFieldObjectPic_SSTidal), + obj_frame_tiles(gFieldObjectPic_SSTidal), + obj_frame_tiles(gFieldObjectPic_SSTidal), + obj_frame_tiles(gFieldObjectPic_SSTidal), + obj_frame_tiles(gFieldObjectPic_SSTidal), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_SubmarineShadow[] = { + obj_frame_tiles(gFieldObjectPic_SubmarineShadow), + obj_frame_tiles(gFieldObjectPic_SubmarineShadow), + obj_frame_tiles(gFieldObjectPic_SubmarineShadow), + obj_frame_tiles(gFieldObjectPic_SubmarineShadow), + obj_frame_tiles(gFieldObjectPic_SubmarineShadow), + obj_frame_tiles(gFieldObjectPic_SubmarineShadow), + obj_frame_tiles(gFieldObjectPic_SubmarineShadow), + obj_frame_tiles(gFieldObjectPic_SubmarineShadow), + obj_frame_tiles(gFieldObjectPic_SubmarineShadow), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_PichuDoll[] = { + obj_frame_tiles(gFieldObjectPic_PichuDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_PikachuDoll[] = { + obj_frame_tiles(gFieldObjectPic_PikachuDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_MarillDoll[] = { + obj_frame_tiles(gFieldObjectPic_MarillDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_TogepiDoll[] = { + obj_frame_tiles(gFieldObjectPic_TogepiDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_CyndaquilDoll[] = { + obj_frame_tiles(gFieldObjectPic_CyndaquilDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_ChikoritaDoll[] = { + obj_frame_tiles(gFieldObjectPic_ChikoritaDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_TotodileDoll[] = { + obj_frame_tiles(gFieldObjectPic_TotodileDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_JigglypuffDoll[] = { + obj_frame_tiles(gFieldObjectPic_JigglypuffDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_MeowthDoll[] = { + obj_frame_tiles(gFieldObjectPic_MeowthDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_ClefairyDoll[] = { + obj_frame_tiles(gFieldObjectPic_ClefairyDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_DittoDoll[] = { + obj_frame_tiles(gFieldObjectPic_DittoDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_SmoochumDoll[] = { + obj_frame_tiles(gFieldObjectPic_SmoochumDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_TreeckoDoll[] = { + obj_frame_tiles(gFieldObjectPic_TreeckoDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_TorchicDoll[] = { + obj_frame_tiles(gFieldObjectPic_TorchicDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_MudkipDoll[] = { + obj_frame_tiles(gFieldObjectPic_MudkipDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_DuskullDoll[] = { + obj_frame_tiles(gFieldObjectPic_DuskullDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_WynautDoll[] = { + obj_frame_tiles(gFieldObjectPic_WynautDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_BaltoyDoll[] = { + obj_frame_tiles(gFieldObjectPic_BaltoyDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_KecleonDoll[] = { + obj_frame_tiles(gFieldObjectPic_KecleonDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_AzurillDoll[] = { + obj_frame_tiles(gFieldObjectPic_AzurillDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_SkittyDoll[] = { + obj_frame_tiles(gFieldObjectPic_SkittyDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_SwabluDoll[] = { + obj_frame_tiles(gFieldObjectPic_SwabluDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_GulpinDoll[] = { + obj_frame_tiles(gFieldObjectPic_GulpinDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_LotadDoll[] = { + obj_frame_tiles(gFieldObjectPic_LotadDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_SeedotDoll[] = { + obj_frame_tiles(gFieldObjectPic_SeedotDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_PikaCushion[] = { + obj_frame_tiles(gFieldObjectPic_PikaCushion), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_RoundCushion[] = { + obj_frame_tiles(gFieldObjectPic_RoundCushion), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_KissCushion[] = { + obj_frame_tiles(gFieldObjectPic_KissCushion), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_ZigzagCushion[] = { + obj_frame_tiles(gFieldObjectPic_ZigzagCushion), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_SpinCushion[] = { + obj_frame_tiles(gFieldObjectPic_SpinCushion), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_DiamondCushion[] = { + obj_frame_tiles(gFieldObjectPic_DiamondCushion), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_BallCushion[] = { + obj_frame_tiles(gFieldObjectPic_BallCushion), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_GrassCushion[] = { + obj_frame_tiles(gFieldObjectPic_GrassCushion), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_FireCushion[] = { + obj_frame_tiles(gFieldObjectPic_FireCushion), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_WaterCushion[] = { + obj_frame_tiles(gFieldObjectPic_WaterCushion), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_BigSnorlaxDoll[] = { + obj_frame_tiles(gFieldObjectPic_BigSnorlaxDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_BigRhydonDoll[] = { + obj_frame_tiles(gFieldObjectPic_BigRhydonDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_BigLaprasDoll[] = { + obj_frame_tiles(gFieldObjectPic_BigLaprasDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_BigVenusaurDoll[] = { + obj_frame_tiles(gFieldObjectPic_BigVenusaurDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_BigCharizardDoll[] = { + obj_frame_tiles(gFieldObjectPic_BigCharizardDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_BigBlastoiseDoll[] = { + obj_frame_tiles(gFieldObjectPic_BigBlastoiseDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_BigWailmerDoll[] = { + obj_frame_tiles(gFieldObjectPic_BigWailmerDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_BigRegirockDoll[] = { + obj_frame_tiles(gFieldObjectPic_BigRegirockDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_BigRegiceDoll[] = { + obj_frame_tiles(gFieldObjectPic_BigRegiceDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_BigRegisteelDoll[] = { + obj_frame_tiles(gFieldObjectPic_BigRegisteelDoll), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_LatiasLatios[] = { + obj_frame_tiles(gFieldObjectPic_LatiasLatios_0), + obj_frame_tiles(gFieldObjectPic_LatiasLatios_0), + obj_frame_tiles(gFieldObjectPic_LatiasLatios_0), + obj_frame_tiles(gFieldObjectPic_LatiasLatios_1), + obj_frame_tiles(gFieldObjectPic_LatiasLatios_2), + obj_frame_tiles(gFieldObjectPic_LatiasLatios_1), + obj_frame_tiles(gFieldObjectPic_LatiasLatios_2), + obj_frame_tiles(gFieldObjectPic_LatiasLatios_1), + obj_frame_tiles(gFieldObjectPic_LatiasLatios_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Boy5[] = { + obj_frame_tiles(gFieldObjectPic_Boy5_0), + obj_frame_tiles(gFieldObjectPic_Boy5_1), + obj_frame_tiles(gFieldObjectPic_Boy5_2), + obj_frame_tiles(gFieldObjectPic_Boy5_0), + obj_frame_tiles(gFieldObjectPic_Boy5_0), + obj_frame_tiles(gFieldObjectPic_Boy5_1), + obj_frame_tiles(gFieldObjectPic_Boy5_1), + obj_frame_tiles(gFieldObjectPic_Boy5_2), + obj_frame_tiles(gFieldObjectPic_Boy5_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_ContestOldMan[] = { + obj_frame_tiles(gFieldObjectPic_ContestOldMan_0), + obj_frame_tiles(gFieldObjectPic_ContestOldMan_1), + obj_frame_tiles(gFieldObjectPic_ContestOldMan_2), + obj_frame_tiles(gFieldObjectPic_ContestOldMan_3), + obj_frame_tiles(gFieldObjectPic_ContestOldMan_4), + obj_frame_tiles(gFieldObjectPic_ContestOldMan_5), + obj_frame_tiles(gFieldObjectPic_ContestOldMan_6), + obj_frame_tiles(gFieldObjectPic_ContestOldMan_7), + obj_frame_tiles(gFieldObjectPic_ContestOldMan_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_BrendanWatering[] = { + obj_frame_tiles(gFieldObjectPic_BrendanWatering_0), + obj_frame_tiles(gFieldObjectPic_BrendanWatering_1), + obj_frame_tiles(gFieldObjectPic_BrendanWatering_2), + obj_frame_tiles(gFieldObjectPic_BrendanWatering_3), + obj_frame_tiles(gFieldObjectPic_BrendanWatering_3), + obj_frame_tiles(gFieldObjectPic_BrendanWatering_4), + obj_frame_tiles(gFieldObjectPic_BrendanWatering_4), + obj_frame_tiles(gFieldObjectPic_BrendanWatering_5), + obj_frame_tiles(gFieldObjectPic_BrendanWatering_5), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_MayWatering[] = { + obj_frame_tiles(gFieldObjectPic_MayWatering_0), + obj_frame_tiles(gFieldObjectPic_MayWatering_1), + obj_frame_tiles(gFieldObjectPic_MayWatering_2), + obj_frame_tiles(gFieldObjectPic_MayWatering_3), + obj_frame_tiles(gFieldObjectPic_MayWatering_3), + obj_frame_tiles(gFieldObjectPic_MayWatering_4), + obj_frame_tiles(gFieldObjectPic_MayWatering_4), + obj_frame_tiles(gFieldObjectPic_MayWatering_5), + obj_frame_tiles(gFieldObjectPic_MayWatering_5), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_BrendanDecorating[] = { + obj_frame_tiles(gFieldObjectPic_BrendanDecorating), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_MayDecorating[] = { + obj_frame_tiles(gFieldObjectPic_MayDecorating), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Archie[] = { + obj_frame_tiles(gFieldObjectPic_Archie_0), + obj_frame_tiles(gFieldObjectPic_Archie_1), + obj_frame_tiles(gFieldObjectPic_Archie_2), + obj_frame_tiles(gFieldObjectPic_Archie_3), + obj_frame_tiles(gFieldObjectPic_Archie_4), + obj_frame_tiles(gFieldObjectPic_Archie_5), + obj_frame_tiles(gFieldObjectPic_Archie_6), + obj_frame_tiles(gFieldObjectPic_Archie_7), + obj_frame_tiles(gFieldObjectPic_Archie_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Maxie[] = { + obj_frame_tiles(gFieldObjectPic_Maxie_0), + obj_frame_tiles(gFieldObjectPic_Maxie_1), + obj_frame_tiles(gFieldObjectPic_Maxie_2), + obj_frame_tiles(gFieldObjectPic_Maxie_3), + obj_frame_tiles(gFieldObjectPic_Maxie_4), + obj_frame_tiles(gFieldObjectPic_Maxie_5), + obj_frame_tiles(gFieldObjectPic_Maxie_6), + obj_frame_tiles(gFieldObjectPic_Maxie_7), + obj_frame_tiles(gFieldObjectPic_Maxie_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_KyogreFront[] = { + obj_frame_tiles(gFieldObjectPic_KyogreFront_0), + obj_frame_tiles(gFieldObjectPic_KyogreFront_0), + obj_frame_tiles(gFieldObjectPic_KyogreFront_0), + obj_frame_tiles(gFieldObjectPic_KyogreFront_1), + obj_frame_tiles(gFieldObjectPic_KyogreFront_1), + obj_frame_tiles(gFieldObjectPic_KyogreFront_1), + obj_frame_tiles(gFieldObjectPic_KyogreFront_1), + obj_frame_tiles(gFieldObjectPic_KyogreFront_1), + obj_frame_tiles(gFieldObjectPic_KyogreFront_1), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_GroudonFront[] = { + obj_frame_tiles(gFieldObjectPic_GroudonFront_0), + obj_frame_tiles(gFieldObjectPic_GroudonFront_0), + obj_frame_tiles(gFieldObjectPic_GroudonFront_0), + obj_frame_tiles(gFieldObjectPic_GroudonFront_1), + obj_frame_tiles(gFieldObjectPic_GroudonFront_1), + obj_frame_tiles(gFieldObjectPic_GroudonFront_1), + obj_frame_tiles(gFieldObjectPic_GroudonFront_1), + obj_frame_tiles(gFieldObjectPic_GroudonFront_1), + obj_frame_tiles(gFieldObjectPic_GroudonFront_1), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_KyogreSide[] = { + obj_frame_tiles(gFieldObjectPic_KyogreSide_0), + obj_frame_tiles(gFieldObjectPic_KyogreSide_0), + obj_frame_tiles(gFieldObjectPic_KyogreSide_0), + obj_frame_tiles(gFieldObjectPic_KyogreSide_1), + obj_frame_tiles(gFieldObjectPic_KyogreSide_1), + obj_frame_tiles(gFieldObjectPic_KyogreSide_1), + obj_frame_tiles(gFieldObjectPic_KyogreSide_1), + obj_frame_tiles(gFieldObjectPic_KyogreSide_1), + obj_frame_tiles(gFieldObjectPic_KyogreSide_1), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_GroudonSide[] = { + obj_frame_tiles(gFieldObjectPic_GroudonSide_0), + obj_frame_tiles(gFieldObjectPic_GroudonSide_0), + obj_frame_tiles(gFieldObjectPic_GroudonSide_0), + obj_frame_tiles(gFieldObjectPic_GroudonSide_1), + obj_frame_tiles(gFieldObjectPic_GroudonSide_1), + obj_frame_tiles(gFieldObjectPic_GroudonSide_1), + obj_frame_tiles(gFieldObjectPic_GroudonSide_1), + obj_frame_tiles(gFieldObjectPic_GroudonSide_1), + obj_frame_tiles(gFieldObjectPic_GroudonSide_1), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Fossil[] = { + obj_frame_tiles(gFieldObjectPic_Fossil), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Regi[] = { + obj_frame_tiles(gFieldObjectPic_Regi), + obj_frame_tiles(gFieldObjectPic_Regi), + obj_frame_tiles(gFieldObjectPic_Regi), + obj_frame_tiles(gFieldObjectPic_Regi), + obj_frame_tiles(gFieldObjectPic_Regi), + obj_frame_tiles(gFieldObjectPic_Regi), + obj_frame_tiles(gFieldObjectPic_Regi), + obj_frame_tiles(gFieldObjectPic_Regi), + obj_frame_tiles(gFieldObjectPic_Regi), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Skitty[] = { + obj_frame_tiles(gFieldObjectPic_Skitty_0), + obj_frame_tiles(gFieldObjectPic_Skitty_1), + obj_frame_tiles(gFieldObjectPic_Skitty_2), + obj_frame_tiles(gFieldObjectPic_Skitty_0), + obj_frame_tiles(gFieldObjectPic_Skitty_0), + obj_frame_tiles(gFieldObjectPic_Skitty_1), + obj_frame_tiles(gFieldObjectPic_Skitty_1), + obj_frame_tiles(gFieldObjectPic_Skitty_2), + obj_frame_tiles(gFieldObjectPic_Skitty_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Kecleon[] = { + obj_frame_tiles(gFieldObjectPic_Kecleon_0), + obj_frame_tiles(gFieldObjectPic_Kecleon_1), + obj_frame_tiles(gFieldObjectPic_Kecleon_2), + obj_frame_tiles(gFieldObjectPic_Kecleon_0), + obj_frame_tiles(gFieldObjectPic_Kecleon_0), + obj_frame_tiles(gFieldObjectPic_Kecleon_1), + obj_frame_tiles(gFieldObjectPic_Kecleon_1), + obj_frame_tiles(gFieldObjectPic_Kecleon_2), + obj_frame_tiles(gFieldObjectPic_Kecleon_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Rayquaza[] = { + obj_frame_tiles(gFieldObjectPic_Rayquaza_0), + obj_frame_tiles(gFieldObjectPic_Rayquaza_1), + obj_frame_tiles(gFieldObjectPic_Rayquaza_2), + obj_frame_tiles(gFieldObjectPic_Rayquaza_3), + obj_frame_tiles(gFieldObjectPic_Rayquaza_4), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_RayquazaStill[] = { + obj_frame_tiles(gFieldObjectPic_RayquazaStill), + obj_frame_tiles(gFieldObjectPic_RayquazaStill), + obj_frame_tiles(gFieldObjectPic_RayquazaStill), + obj_frame_tiles(gFieldObjectPic_RayquazaStill), + obj_frame_tiles(gFieldObjectPic_RayquazaStill), + obj_frame_tiles(gFieldObjectPic_RayquazaStill), + obj_frame_tiles(gFieldObjectPic_RayquazaStill), + obj_frame_tiles(gFieldObjectPic_RayquazaStill), + obj_frame_tiles(gFieldObjectPic_RayquazaStill), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Zigzagoon[] = { + obj_frame_tiles(gFieldObjectPic_Zigzagoon_0), + obj_frame_tiles(gFieldObjectPic_Zigzagoon_1), + obj_frame_tiles(gFieldObjectPic_Zigzagoon_2), + obj_frame_tiles(gFieldObjectPic_Zigzagoon_0), + obj_frame_tiles(gFieldObjectPic_Zigzagoon_0), + obj_frame_tiles(gFieldObjectPic_Zigzagoon_1), + obj_frame_tiles(gFieldObjectPic_Zigzagoon_1), + obj_frame_tiles(gFieldObjectPic_Zigzagoon_2), + obj_frame_tiles(gFieldObjectPic_Zigzagoon_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Pikachu[] = { + obj_frame_tiles(gFieldObjectPic_Pikachu_0), + obj_frame_tiles(gFieldObjectPic_Pikachu_1), + obj_frame_tiles(gFieldObjectPic_Pikachu_2), + obj_frame_tiles(gFieldObjectPic_Pikachu_0), + obj_frame_tiles(gFieldObjectPic_Pikachu_0), + obj_frame_tiles(gFieldObjectPic_Pikachu_1), + obj_frame_tiles(gFieldObjectPic_Pikachu_1), + obj_frame_tiles(gFieldObjectPic_Pikachu_2), + obj_frame_tiles(gFieldObjectPic_Pikachu_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Azumarill[] = { + obj_frame_tiles(gFieldObjectPic_Azumarill_0), + obj_frame_tiles(gFieldObjectPic_Azumarill_1), + obj_frame_tiles(gFieldObjectPic_Azumarill_2), + obj_frame_tiles(gFieldObjectPic_Azumarill_0), + obj_frame_tiles(gFieldObjectPic_Azumarill_0), + obj_frame_tiles(gFieldObjectPic_Azumarill_1), + obj_frame_tiles(gFieldObjectPic_Azumarill_1), + obj_frame_tiles(gFieldObjectPic_Azumarill_2), + obj_frame_tiles(gFieldObjectPic_Azumarill_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Wingull[] = { + obj_frame_tiles(gFieldObjectPic_Wingull_0), + obj_frame_tiles(gFieldObjectPic_Wingull_1), + obj_frame_tiles(gFieldObjectPic_Wingull_2), + obj_frame_tiles(gFieldObjectPic_Wingull_3), + obj_frame_tiles(gFieldObjectPic_Wingull_3), + obj_frame_tiles(gFieldObjectPic_Wingull_4), + obj_frame_tiles(gFieldObjectPic_Wingull_4), + obj_frame_tiles(gFieldObjectPic_Wingull_5), + obj_frame_tiles(gFieldObjectPic_Wingull_5), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_TuberMSwimming[] = { + obj_frame_tiles(gFieldObjectPic_TuberMSwimming_0), + obj_frame_tiles(gFieldObjectPic_TuberMSwimming_1), + obj_frame_tiles(gFieldObjectPic_TuberMSwimming_2), + obj_frame_tiles(gFieldObjectPic_TuberMSwimming_3), + obj_frame_tiles(gFieldObjectPic_TuberMSwimming_4), + obj_frame_tiles(gFieldObjectPic_TuberMSwimming_5), + obj_frame_tiles(gFieldObjectPic_TuberMSwimming_6), + obj_frame_tiles(gFieldObjectPic_TuberMSwimming_7), + obj_frame_tiles(gFieldObjectPic_TuberMSwimming_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Azurill[] = { + obj_frame_tiles(gFieldObjectPic_Azurill_0), + obj_frame_tiles(gFieldObjectPic_Azurill_1), + obj_frame_tiles(gFieldObjectPic_Azurill_2), + obj_frame_tiles(gFieldObjectPic_Azurill_0), + obj_frame_tiles(gFieldObjectPic_Azurill_0), + obj_frame_tiles(gFieldObjectPic_Azurill_1), + obj_frame_tiles(gFieldObjectPic_Azurill_1), + obj_frame_tiles(gFieldObjectPic_Azurill_2), + obj_frame_tiles(gFieldObjectPic_Azurill_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Mom[] = { + obj_frame_tiles(gFieldObjectPic_Mom_0), + obj_frame_tiles(gFieldObjectPic_Mom_1), + obj_frame_tiles(gFieldObjectPic_Mom_2), + obj_frame_tiles(gFieldObjectPic_Mom_3), + obj_frame_tiles(gFieldObjectPic_Mom_4), + obj_frame_tiles(gFieldObjectPic_Mom_5), + obj_frame_tiles(gFieldObjectPic_Mom_6), + obj_frame_tiles(gFieldObjectPic_Mom_7), + obj_frame_tiles(gFieldObjectPic_Mom_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Scott[] = { + obj_frame_tiles(gFieldObjectPic_Scott_0), + obj_frame_tiles(gFieldObjectPic_Scott_1), + obj_frame_tiles(gFieldObjectPic_Scott_2), + obj_frame_tiles(gFieldObjectPic_Scott_3), + obj_frame_tiles(gFieldObjectPic_Scott_4), + obj_frame_tiles(gFieldObjectPic_Scott_5), + obj_frame_tiles(gFieldObjectPic_Scott_6), + obj_frame_tiles(gFieldObjectPic_Scott_7), + obj_frame_tiles(gFieldObjectPic_Scott_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Juan[] = { + obj_frame_tiles(gFieldObjectPic_Juan_0), + obj_frame_tiles(gFieldObjectPic_Juan_1), + obj_frame_tiles(gFieldObjectPic_Juan_2), + obj_frame_tiles(gFieldObjectPic_Juan_3), + obj_frame_tiles(gFieldObjectPic_Juan_4), + obj_frame_tiles(gFieldObjectPic_Juan_5), + obj_frame_tiles(gFieldObjectPic_Juan_6), + obj_frame_tiles(gFieldObjectPic_Juan_7), + obj_frame_tiles(gFieldObjectPic_Juan_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_MysteryEventDeliveryman[] = { + obj_frame_tiles(gFieldObjectPic_MysteryEventDeliveryman_0), + obj_frame_tiles(gFieldObjectPic_MysteryEventDeliveryman_1), + obj_frame_tiles(gFieldObjectPic_MysteryEventDeliveryman_2), + obj_frame_tiles(gFieldObjectPic_MysteryEventDeliveryman_0), + obj_frame_tiles(gFieldObjectPic_MysteryEventDeliveryman_0), + obj_frame_tiles(gFieldObjectPic_MysteryEventDeliveryman_1), + obj_frame_tiles(gFieldObjectPic_MysteryEventDeliveryman_1), + obj_frame_tiles(gFieldObjectPic_MysteryEventDeliveryman_2), + obj_frame_tiles(gFieldObjectPic_MysteryEventDeliveryman_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Statue[] = { + obj_frame_tiles(gFieldObjectPic_Statue), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Dusclops[] = { + obj_frame_tiles(gFieldObjectPic_Dusclops_0), + obj_frame_tiles(gFieldObjectPic_Dusclops_1), + obj_frame_tiles(gFieldObjectPic_Dusclops_2), + obj_frame_tiles(gFieldObjectPic_Dusclops_3), + obj_frame_tiles(gFieldObjectPic_Dusclops_4), + obj_frame_tiles(gFieldObjectPic_Dusclops_5), + obj_frame_tiles(gFieldObjectPic_Dusclops_6), + obj_frame_tiles(gFieldObjectPic_Dusclops_7), + obj_frame_tiles(gFieldObjectPic_Dusclops_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Kirlia[] = { + obj_frame_tiles(gFieldObjectPic_Kirlia_0), + obj_frame_tiles(gFieldObjectPic_Kirlia_1), + obj_frame_tiles(gFieldObjectPic_Kirlia_2), + obj_frame_tiles(gFieldObjectPic_Kirlia_3), + obj_frame_tiles(gFieldObjectPic_Kirlia_4), + obj_frame_tiles(gFieldObjectPic_Kirlia_5), + obj_frame_tiles(gFieldObjectPic_Kirlia_6), + obj_frame_tiles(gFieldObjectPic_Kirlia_7), + obj_frame_tiles(gFieldObjectPic_Kirlia_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_UnionRoomAttendant[] = { + obj_frame_tiles(gFieldObjectPic_UnionRoomAttendant_0), + obj_frame_tiles(gFieldObjectPic_UnionRoomAttendant_1), + obj_frame_tiles(gFieldObjectPic_UnionRoomAttendant_2), + obj_frame_tiles(gFieldObjectPic_UnionRoomAttendant_0), + obj_frame_tiles(gFieldObjectPic_UnionRoomAttendant_0), + obj_frame_tiles(gFieldObjectPic_UnionRoomAttendant_1), + obj_frame_tiles(gFieldObjectPic_UnionRoomAttendant_1), + obj_frame_tiles(gFieldObjectPic_UnionRoomAttendant_2), + obj_frame_tiles(gFieldObjectPic_UnionRoomAttendant_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Sudowoodo[] = { + obj_frame_tiles(gFieldObjectPic_Sudowoodo_0), + obj_frame_tiles(gFieldObjectPic_Sudowoodo_0), + obj_frame_tiles(gFieldObjectPic_Sudowoodo_1), + obj_frame_tiles(gFieldObjectPic_Sudowoodo_0), + obj_frame_tiles(gFieldObjectPic_Sudowoodo_0), + obj_frame_tiles(gFieldObjectPic_Sudowoodo_0), + obj_frame_tiles(gFieldObjectPic_Sudowoodo_0), + obj_frame_tiles(gFieldObjectPic_Sudowoodo_1), + obj_frame_tiles(gFieldObjectPic_Sudowoodo_2), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Mew[] = { + obj_frame_tiles(gFieldObjectPic_Mew_0), + obj_frame_tiles(gFieldObjectPic_Mew_1), + obj_frame_tiles(gFieldObjectPic_Mew_2), + obj_frame_tiles(gFieldObjectPic_Mew_3), + obj_frame_tiles(gFieldObjectPic_Mew_4), + obj_frame_tiles(gFieldObjectPic_Mew_5), + obj_frame_tiles(gFieldObjectPic_Mew_6), + obj_frame_tiles(gFieldObjectPic_Mew_7), + obj_frame_tiles(gFieldObjectPic_Mew_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Red[] = { + obj_frame_tiles(gFieldObjectPic_Red_0), + obj_frame_tiles(gFieldObjectPic_Red_1), + obj_frame_tiles(gFieldObjectPic_Red_2), + obj_frame_tiles(gFieldObjectPic_Red_3), + obj_frame_tiles(gFieldObjectPic_Red_4), + obj_frame_tiles(gFieldObjectPic_Red_5), + obj_frame_tiles(gFieldObjectPic_Red_6), + obj_frame_tiles(gFieldObjectPic_Red_7), + obj_frame_tiles(gFieldObjectPic_Red_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Leaf[] = { + obj_frame_tiles(gFieldObjectPic_Leaf_0), + obj_frame_tiles(gFieldObjectPic_Leaf_1), + obj_frame_tiles(gFieldObjectPic_Leaf_2), + obj_frame_tiles(gFieldObjectPic_Leaf_3), + obj_frame_tiles(gFieldObjectPic_Leaf_4), + obj_frame_tiles(gFieldObjectPic_Leaf_5), + obj_frame_tiles(gFieldObjectPic_Leaf_6), + obj_frame_tiles(gFieldObjectPic_Leaf_7), + obj_frame_tiles(gFieldObjectPic_Leaf_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Deoxys[] = { + obj_frame_tiles(gFieldObjectPic_Deoxys_0), + obj_frame_tiles(gFieldObjectPic_Deoxys_0), + obj_frame_tiles(gFieldObjectPic_Deoxys_0), + obj_frame_tiles(gFieldObjectPic_Deoxys_0), + obj_frame_tiles(gFieldObjectPic_Deoxys_1), + obj_frame_tiles(gFieldObjectPic_Deoxys_0), + obj_frame_tiles(gFieldObjectPic_Deoxys_1), + obj_frame_tiles(gFieldObjectPic_Deoxys_0), + obj_frame_tiles(gFieldObjectPic_Deoxys_0), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_BirthIslandStone[] = { + obj_frame_tiles(gFieldObjectPic_BirthIslandStone), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Anabel[] = { + obj_frame_tiles(gFieldObjectPic_Anabel_0), + obj_frame_tiles(gFieldObjectPic_Anabel_1), + obj_frame_tiles(gFieldObjectPic_Anabel_2), + obj_frame_tiles(gFieldObjectPic_Anabel_3), + obj_frame_tiles(gFieldObjectPic_Anabel_4), + obj_frame_tiles(gFieldObjectPic_Anabel_5), + obj_frame_tiles(gFieldObjectPic_Anabel_6), + obj_frame_tiles(gFieldObjectPic_Anabel_7), + obj_frame_tiles(gFieldObjectPic_Anabel_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Tucker[] = { + obj_frame_tiles(gFieldObjectPic_Tucker_0), + obj_frame_tiles(gFieldObjectPic_Tucker_1), + obj_frame_tiles(gFieldObjectPic_Tucker_2), + obj_frame_tiles(gFieldObjectPic_Tucker_3), + obj_frame_tiles(gFieldObjectPic_Tucker_4), + obj_frame_tiles(gFieldObjectPic_Tucker_5), + obj_frame_tiles(gFieldObjectPic_Tucker_6), + obj_frame_tiles(gFieldObjectPic_Tucker_7), + obj_frame_tiles(gFieldObjectPic_Tucker_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Spenser[] = { + obj_frame_tiles(gFieldObjectPic_Spenser_0), + obj_frame_tiles(gFieldObjectPic_Spenser_1), + obj_frame_tiles(gFieldObjectPic_Spenser_2), + obj_frame_tiles(gFieldObjectPic_Spenser_3), + obj_frame_tiles(gFieldObjectPic_Spenser_4), + obj_frame_tiles(gFieldObjectPic_Spenser_5), + obj_frame_tiles(gFieldObjectPic_Spenser_6), + obj_frame_tiles(gFieldObjectPic_Spenser_7), + obj_frame_tiles(gFieldObjectPic_Spenser_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Greta[] = { + obj_frame_tiles(gFieldObjectPic_Greta_0), + obj_frame_tiles(gFieldObjectPic_Greta_1), + obj_frame_tiles(gFieldObjectPic_Greta_2), + obj_frame_tiles(gFieldObjectPic_Greta_3), + obj_frame_tiles(gFieldObjectPic_Greta_4), + obj_frame_tiles(gFieldObjectPic_Greta_5), + obj_frame_tiles(gFieldObjectPic_Greta_6), + obj_frame_tiles(gFieldObjectPic_Greta_7), + obj_frame_tiles(gFieldObjectPic_Greta_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Noland[] = { + obj_frame_tiles(gFieldObjectPic_Noland_0), + obj_frame_tiles(gFieldObjectPic_Noland_1), + obj_frame_tiles(gFieldObjectPic_Noland_2), + obj_frame_tiles(gFieldObjectPic_Noland_3), + obj_frame_tiles(gFieldObjectPic_Noland_4), + obj_frame_tiles(gFieldObjectPic_Noland_5), + obj_frame_tiles(gFieldObjectPic_Noland_6), + obj_frame_tiles(gFieldObjectPic_Noland_7), + obj_frame_tiles(gFieldObjectPic_Noland_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Lucy[] = { + obj_frame_tiles(gFieldObjectPic_Lucy_0), + obj_frame_tiles(gFieldObjectPic_Lucy_1), + obj_frame_tiles(gFieldObjectPic_Lucy_2), + obj_frame_tiles(gFieldObjectPic_Lucy_3), + obj_frame_tiles(gFieldObjectPic_Lucy_4), + obj_frame_tiles(gFieldObjectPic_Lucy_5), + obj_frame_tiles(gFieldObjectPic_Lucy_6), + obj_frame_tiles(gFieldObjectPic_Lucy_7), + obj_frame_tiles(gFieldObjectPic_Lucy_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Brandon[] = { + obj_frame_tiles(gFieldObjectPic_Brandon_0), + obj_frame_tiles(gFieldObjectPic_Brandon_1), + obj_frame_tiles(gFieldObjectPic_Brandon_2), + obj_frame_tiles(gFieldObjectPic_Brandon_3), + obj_frame_tiles(gFieldObjectPic_Brandon_4), + obj_frame_tiles(gFieldObjectPic_Brandon_5), + obj_frame_tiles(gFieldObjectPic_Brandon_6), + obj_frame_tiles(gFieldObjectPic_Brandon_7), + obj_frame_tiles(gFieldObjectPic_Brandon_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_Lugia[] = { + obj_frame_tiles(gFieldObjectPic_Lugia_0), + obj_frame_tiles(gFieldObjectPic_Lugia_0), + obj_frame_tiles(gFieldObjectPic_Lugia_0), + obj_frame_tiles(gFieldObjectPic_Lugia_0), + obj_frame_tiles(gFieldObjectPic_Lugia_1), + obj_frame_tiles(gFieldObjectPic_Lugia_0), + obj_frame_tiles(gFieldObjectPic_Lugia_1), + obj_frame_tiles(gFieldObjectPic_Lugia_0), + obj_frame_tiles(gFieldObjectPic_Lugia_1), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_HoOh[] = { + obj_frame_tiles(gFieldObjectPic_HoOh_0), + obj_frame_tiles(gFieldObjectPic_HoOh_0), + obj_frame_tiles(gFieldObjectPic_HoOh_0), + obj_frame_tiles(gFieldObjectPic_HoOh_0), + obj_frame_tiles(gFieldObjectPic_HoOh_1), + obj_frame_tiles(gFieldObjectPic_HoOh_0), + obj_frame_tiles(gFieldObjectPic_HoOh_1), + obj_frame_tiles(gFieldObjectPic_HoOh_0), + obj_frame_tiles(gFieldObjectPic_HoOh_1), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_RubySapphireBrendan[] = { + obj_frame_tiles(gFieldObjectPic_RubySapphireBrendan_0), + obj_frame_tiles(gFieldObjectPic_RubySapphireBrendan_1), + obj_frame_tiles(gFieldObjectPic_RubySapphireBrendan_2), + obj_frame_tiles(gFieldObjectPic_RubySapphireBrendan_3), + obj_frame_tiles(gFieldObjectPic_RubySapphireBrendan_4), + obj_frame_tiles(gFieldObjectPic_RubySapphireBrendan_5), + obj_frame_tiles(gFieldObjectPic_RubySapphireBrendan_6), + obj_frame_tiles(gFieldObjectPic_RubySapphireBrendan_7), + obj_frame_tiles(gFieldObjectPic_RubySapphireBrendan_8), +}; + +const struct SpriteFrameImage gFieldObjectPicTable_RubySapphireMay[] = { + obj_frame_tiles(gFieldObjectPic_RubySapphireMay_0), + obj_frame_tiles(gFieldObjectPic_RubySapphireMay_1), + obj_frame_tiles(gFieldObjectPic_RubySapphireMay_2), + obj_frame_tiles(gFieldObjectPic_RubySapphireMay_3), + obj_frame_tiles(gFieldObjectPic_RubySapphireMay_4), + obj_frame_tiles(gFieldObjectPic_RubySapphireMay_5), + obj_frame_tiles(gFieldObjectPic_RubySapphireMay_6), + obj_frame_tiles(gFieldObjectPic_RubySapphireMay_7), + obj_frame_tiles(gFieldObjectPic_RubySapphireMay_8), +}; + +#endif //GUARD_EVENT_OBJECT_PIC_TABLES_H diff --git a/src/data/field_event_obj/event_object_subsprites.h b/src/data/field_event_obj/event_object_subsprites.h new file mode 100755 index 0000000000..2ed9023fa3 --- /dev/null +++ b/src/data/field_event_obj/event_object_subsprites.h @@ -0,0 +1,342 @@ +#ifndef GUARD_EVENT_OBJECT_SUBSPRITES_H +#define GUARD_EVENT_OBJECT_SUBSPRITES_H + +const struct Subsprite gFieldObjectSpriteOamTable_16x16_0[] = { + { -8, -8, 0, 1, 0, 2} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_16x16_1[] = { + { -8, -8, 0, 1, 0, 1} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_16x16_2[] = { + { -8, -8, 1, 0, 0, 2}, + { -8, 0, 1, 0, 2, 3} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_16x16_3[] = { + { -8, -8, 0, 1, 0, 2}, + { -8, -8, 0, 1, 0, 3} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_16x16_4[] = { + { -8, -8, 0, 1, 0, 1}, + { -8, -8, 0, 1, 0, 3} +}; + +const struct SubspriteTable gFieldObjectSpriteOamTables_16x16[] = { + {0, NULL}, + {1, gFieldObjectSpriteOamTable_16x16_0}, + {1, gFieldObjectSpriteOamTable_16x16_1}, + {2, gFieldObjectSpriteOamTable_16x16_2}, + {2, gFieldObjectSpriteOamTable_16x16_3}, + {2, gFieldObjectSpriteOamTable_16x16_4} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_16x32_0[] = { + { -8, -16, 2, 2, 0, 2} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_16x32_1[] = { + { -8, -16, 2, 2, 0, 1} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_16x32_2[] = { + { -8, -16, 0, 1, 0, 2}, + { -8, 0, 1, 0, 4, 2}, + { -8, 8, 1, 0, 6, 3} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_16x32_3[] = { + { -8, -16, 0, 1, 0, 2}, + { -8, 0, 0, 1, 4, 3} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_16x32_4[] = { + { -8, -16, 0, 1, 0, 1}, + { -8, 0, 0, 1, 4, 3} +}; + +const struct SubspriteTable gFieldObjectSpriteOamTables_16x32[] = { + {0, NULL}, + {1, gFieldObjectSpriteOamTable_16x32_0}, + {1, gFieldObjectSpriteOamTable_16x32_1}, + {3, gFieldObjectSpriteOamTable_16x32_2}, + {2, gFieldObjectSpriteOamTable_16x32_3}, + {2, gFieldObjectSpriteOamTable_16x32_4} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_32x32_0[] = { + {-16, -16, 0, 2, 0, 2} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_32x32_1[] = { + {-16, -16, 0, 2, 0, 1} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_32x32_2[] = { + {-16, -16, 1, 2, 0, 2}, + {-16, 0, 1, 1, 8, 2}, + {-16, 8, 1, 1, 12, 3} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_32x32_3[] = { + {-16, -16, 1, 2, 0, 2}, + {-16, 0, 1, 2, 8, 3} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_32x32_4[] = { + {-16, -16, 1, 2, 0, 1}, + {-16, 0, 1, 2, 8, 3} +}; + +const struct SubspriteTable gFieldObjectSpriteOamTables_32x32[] = { + {0, NULL}, + {1, gFieldObjectSpriteOamTable_32x32_0}, + {1, gFieldObjectSpriteOamTable_32x32_1}, + {3, gFieldObjectSpriteOamTable_32x32_2}, + {2, gFieldObjectSpriteOamTable_32x32_3}, + {2, gFieldObjectSpriteOamTable_32x32_4} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_Truck_0[] = { + {-24, -24, 1, 1, 0, 2}, + { 8, -24, 1, 0, 4, 2}, + {-24, -16, 1, 1, 6, 2}, + { 8, -16, 1, 0, 10, 2}, + {-24, -8, 1, 1, 12, 2}, + { 8, -8, 1, 0, 16, 2}, + {-24, 0, 1, 1, 18, 2}, + { 8, 0, 1, 0, 22, 2}, + {-24, 8, 1, 1, 24, 2}, + { 8, 8, 1, 0, 28, 2}, + {-24, 16, 1, 1, 30, 2}, + { 8, 16, 1, 0, 34, 2} +}; + +const struct SubspriteTable gFieldObjectSpriteOamTables_Truck[] = { + {12, gFieldObjectSpriteOamTable_Truck_0}, + {12, gFieldObjectSpriteOamTable_Truck_0}, + {12, gFieldObjectSpriteOamTable_Truck_0}, + {12, gFieldObjectSpriteOamTable_Truck_0}, + {12, gFieldObjectSpriteOamTable_Truck_0}, + {12, gFieldObjectSpriteOamTable_Truck_0} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_Unused_0[] = { + {-32, -16, 1, 3, 0, 2} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_Unused_1[] = { + {-32, -16, 1, 3, 0, 1} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_Unused_2[] = { + {-32, -16, 1, 3, 0, 2} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_Unused_3[] = { + {-32, -16, 1, 3, 0, 2} +}; + +const struct SubspriteTable gFieldObjectSpriteOamTables_Unused[] = { + {0, NULL}, + {1, gFieldObjectSpriteOamTable_Unused_0}, + {1, gFieldObjectSpriteOamTable_Unused_1}, + {1, gFieldObjectSpriteOamTable_Unused_2}, + {1, gFieldObjectSpriteOamTable_Unused_3}, + {1, gFieldObjectSpriteOamTable_Unused_3} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_64x64_0[] = { + {-32, -32, 0, 3, 0, 2} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_64x64_1[] = { + {-32, -32, 0, 3, 0, 1} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_64x64_2[] = { + {-32, -32, 0, 3, 0, 2} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_64x64_3[] = { + {-32, -32, 0, 3, 0, 2} +}; + +const struct SubspriteTable gFieldObjectSpriteOamTables_64x64[] = { + {0, NULL}, + {1, gFieldObjectSpriteOamTable_64x64_0}, + {1, gFieldObjectSpriteOamTable_64x64_1}, + {1, gFieldObjectSpriteOamTable_64x64_2}, + {1, gFieldObjectSpriteOamTable_64x64_3}, + {1, gFieldObjectSpriteOamTable_64x64_3} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_0[] = { + {-48, -20, 1, 1, 0, 2}, + {-16, -20, 1, 1, 4, 2}, + { 16, -20, 1, 1, 8, 2}, + {-48, -12, 1, 1, 12, 2}, + {-16, -12, 1, 1, 16, 2}, + { 16, -12, 1, 1, 20, 2}, + {-48, -4, 1, 1, 24, 2}, + {-16, -4, 1, 1, 28, 2}, + { 16, -4, 1, 1, 32, 2}, + {-48, 4, 1, 1, 36, 2}, + {-16, 4, 1, 1, 40, 2}, + { 16, 4, 1, 1, 44, 2}, + {-48, 12, 1, 1, 48, 2}, + {-16, 12, 1, 1, 52, 2}, + { 16, 12, 1, 1, 56, 2} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_1[] = { + {-48, -20, 1, 1, 0, 1}, + {-16, -20, 1, 1, 4, 1}, + { 16, -20, 1, 1, 8, 1}, + {-48, -12, 1, 1, 12, 1}, + {-16, -12, 1, 1, 16, 1}, + { 16, -12, 1, 1, 20, 1}, + {-48, -4, 1, 1, 24, 1}, + {-16, -4, 1, 1, 28, 1}, + { 16, -4, 1, 1, 32, 1}, + {-48, 4, 1, 1, 36, 1}, + {-16, 4, 1, 1, 40, 1}, + { 16, 4, 1, 1, 44, 1}, + {-48, 12, 1, 1, 48, 1}, + {-16, 12, 1, 1, 52, 1}, + { 16, 12, 1, 1, 56, 1} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_2[] = { + {-48, -20, 1, 1, 0, 2}, + {-16, -20, 1, 1, 4, 2}, + { 16, -20, 1, 1, 8, 2}, + {-48, -12, 1, 1, 12, 2}, + {-16, -12, 1, 1, 16, 2}, + { 16, -12, 1, 1, 20, 2}, + {-48, -4, 1, 1, 24, 2}, + {-16, -4, 1, 1, 28, 2}, + { 16, -4, 1, 1, 32, 2}, + {-48, 4, 1, 1, 36, 2}, + {-16, 4, 1, 1, 40, 2}, + { 16, 4, 1, 1, 44, 2}, + {-48, 12, 1, 1, 48, 2}, + {-16, 12, 1, 1, 52, 2}, + { 16, 12, 1, 1, 56, 2} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_3[] = { + {-48, -20, 1, 1, 0, 1}, + {-16, -20, 1, 1, 4, 1}, + { 16, -20, 1, 1, 8, 1}, + {-48, -12, 1, 1, 12, 1}, + {-16, -12, 1, 1, 16, 1}, + { 16, -12, 1, 1, 20, 1}, + {-48, -4, 1, 1, 24, 2}, + {-16, -4, 1, 1, 28, 2}, + { 16, -4, 1, 1, 32, 2}, + {-48, 4, 1, 1, 36, 2}, + {-16, 4, 1, 1, 40, 2}, + { 16, 4, 1, 1, 44, 2}, + {-48, 12, 1, 1, 48, 2}, + {-16, 12, 1, 1, 52, 2}, + { 16, 12, 1, 1, 56, 2} +}; + +const struct SubspriteTable gFieldObjectSpriteOamTables_SSTidal[] = { + {15, gFieldObjectSpriteOamTable_SSTidal_0}, + {15, gFieldObjectSpriteOamTable_SSTidal_0}, + {15, gFieldObjectSpriteOamTable_SSTidal_1}, + {15, gFieldObjectSpriteOamTable_SSTidal_2}, + {15, gFieldObjectSpriteOamTable_SSTidal_3}, + {15, gFieldObjectSpriteOamTable_SSTidal_3} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_0[] = { + {-48, -20, 1, 1, 0, 2}, + {-16, -20, 1, 1, 4, 2}, + { 16, -20, 1, 0, 8, 2}, + { 32, -20, 0, 0, 10, 2}, + {-48, -12, 1, 1, 11, 2}, + {-16, -12, 1, 1, 15, 2}, + { 16, -12, 1, 0, 19, 2}, + { 32, -12, 0, 0, 21, 2}, + {-48, -4, 1, 1, 22, 2}, + {-16, -4, 1, 1, 26, 2}, + { 16, -4, 1, 0, 30, 2}, + { 32, -4, 0, 0, 32, 2}, + {-48, 4, 1, 1, 33, 2}, + {-16, 4, 1, 1, 37, 2}, + { 16, 4, 1, 0, 41, 2}, + { 32, 4, 0, 0, 43, 2} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_1[] = { + {-48, -20, 1, 1, 0, 1}, + {-16, -20, 1, 1, 4, 1}, + { 16, -20, 1, 0, 8, 1}, + { 32, -20, 0, 0, 10, 1}, + {-48, -12, 1, 1, 11, 1}, + {-16, -12, 1, 1, 15, 1}, + { 16, -12, 1, 0, 19, 1}, + { 32, -12, 0, 0, 21, 1}, + {-48, -4, 1, 1, 22, 1}, + {-16, -4, 1, 1, 26, 1}, + { 16, -4, 1, 0, 30, 1}, + { 32, -4, 0, 0, 32, 1}, + {-48, 4, 1, 1, 33, 1}, + {-16, 4, 1, 1, 37, 1}, + { 16, 4, 1, 0, 41, 1}, + { 32, 4, 0, 0, 43, 1} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_2[] = { + {-48, -20, 1, 1, 0, 2}, + {-16, -20, 1, 1, 4, 2}, + { 16, -20, 1, 0, 8, 2}, + { 32, -20, 0, 0, 10, 2}, + {-48, -12, 1, 1, 11, 2}, + {-16, -12, 1, 1, 15, 2}, + { 16, -12, 1, 0, 19, 2}, + { 32, -12, 0, 0, 21, 2}, + {-48, -4, 1, 1, 22, 2}, + {-16, -4, 1, 1, 26, 2}, + { 16, -4, 1, 0, 30, 2}, + { 32, -4, 0, 0, 32, 2}, + {-48, 4, 1, 1, 33, 2}, + {-16, 4, 1, 1, 37, 2}, + { 16, 4, 1, 0, 41, 2}, + { 32, 4, 0, 0, 43, 2} +}; + +const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_3[] = { + {-48, -20, 1, 1, 0, 1}, + {-16, -20, 1, 1, 4, 1}, + { 16, -20, 1, 0, 8, 1}, + { 32, -20, 0, 0, 10, 1}, + {-48, -12, 1, 1, 11, 1}, + {-16, -12, 1, 1, 15, 1}, + { 16, -12, 1, 0, 19, 1}, + { 32, -12, 0, 0, 21, 1}, + {-48, -4, 1, 1, 22, 2}, + {-16, -4, 1, 1, 26, 2}, + { 16, -4, 1, 0, 30, 2}, + { 32, -4, 0, 0, 32, 2}, + {-48, 4, 1, 1, 33, 2}, + {-16, 4, 1, 1, 37, 2}, + { 16, 4, 1, 0, 41, 2}, + { 32, 4, 0, 0, 43, 2} +}; + +const struct SubspriteTable gFieldObjectSpriteOamTables_SubmarineShadow[] = { + {16, gFieldObjectSpriteOamTable_SubmarineShadow_0}, + {16, gFieldObjectSpriteOamTable_SubmarineShadow_0}, + {16, gFieldObjectSpriteOamTable_SubmarineShadow_1}, + {16, gFieldObjectSpriteOamTable_SubmarineShadow_2}, + {16, gFieldObjectSpriteOamTable_SubmarineShadow_3}, + {16, gFieldObjectSpriteOamTable_SubmarineShadow_3} +}; + +#endif //GUARD_EVENT_OBJECT_SUBSPRITES_H diff --git a/src/data/field_event_obj/field_effect_object_template_pointers.h b/src/data/field_event_obj/field_effect_object_template_pointers.h new file mode 100755 index 0000000000..3b08a5ff1d --- /dev/null +++ b/src/data/field_event_obj/field_effect_object_template_pointers.h @@ -0,0 +1,82 @@ +#ifndef GUARD_FIELD_EFFECT_OBJECT_TEMPLATE_POINTERS_H +#define GUARD_FIELD_EFFECT_OBJECT_TEMPLATE_POINTERS_H + +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge; +const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass; +const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple; +const struct SpriteTemplate gFieldEffectObjectTemplate_Ash; +const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob; +const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow; +const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust; +const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopTallGrass; +const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints; +const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopBigSplash; +const struct SpriteTemplate gFieldEffectObjectTemplate_Splash; +const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopSmallSplash; +const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown16; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown17; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown18; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown19; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown20; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown21; +const struct SpriteTemplate gFieldEffectObjectTemplate_BerryTreeGrowthSparkle; +const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints; +const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise; +const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise; +const struct SpriteTemplate gFieldEffectObjectTemplate_Bird; +const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks; +const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown29; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass; +const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater; +const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown33; +const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown35; +const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza; + +const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[] = { + &gFieldEffectObjectTemplate_ShadowSmall, + &gFieldEffectObjectTemplate_ShadowMedium, + &gFieldEffectObjectTemplate_ShadowLarge, + &gFieldEffectObjectTemplate_ShadowExtraLarge, + &gFieldEffectObjectTemplate_TallGrass, + &gFieldEffectObjectTemplate_Ripple, + &gFieldEffectObjectTemplate_Ash, + &gFieldEffectObjectTemplate_SurfBlob, + &gFieldEffectObjectTemplate_Arrow, + &gFieldEffectObjectTemplate_GroundImpactDust, + &gFieldEffectObjectTemplate_BikeHopTallGrass, + &gFieldEffectObjectTemplate_SandFootprints, + &gFieldEffectObjectTemplate_BikeHopBigSplash, + &gFieldEffectObjectTemplate_Splash, + &gFieldEffectObjectTemplate_BikeHopSmallSplash, + &gFieldEffectObjectTemplate_LongGrass, + &gFieldEffectObjectTemplate_Unknown16, + &gFieldEffectObjectTemplate_Unknown17, + &gFieldEffectObjectTemplate_Unknown18, + &gFieldEffectObjectTemplate_Unknown19, + &gFieldEffectObjectTemplate_Unknown20, + &gFieldEffectObjectTemplate_Unknown21, + &gFieldEffectObjectTemplate_BerryTreeGrowthSparkle, + &gFieldEffectObjectTemplate_DeepSandFootprints, + &gFieldEffectObjectTemplate_TreeDisguise, + &gFieldEffectObjectTemplate_MountainDisguise, + &gFieldEffectObjectTemplate_Bird, + &gFieldEffectObjectTemplate_BikeTireTracks, + &gFieldEffectObjectTemplate_SandDisguisePlaceholder, + &gFieldEffectObjectTemplate_Unknown29, + &gFieldEffectObjectTemplate_ShortGrass, + &gFieldEffectObjectTemplate_HotSpringsWater, + &gFieldEffectObjectTemplate_JumpOutOfAsh, + &gFieldEffectObjectTemplate_Unknown33, + &gFieldEffectObjectTemplate_Bubbles, + &gFieldEffectObjectTemplate_Unknown35, + &gFieldEffectObjectTemplate_Rayquaza, +}; + +#endif //GUARD_FIELD_EFFECT_OBJECT_TEMPLATE_POINTERS_H diff --git a/src/data/field_event_obj/field_effect_objects.h b/src/data/field_event_obj/field_effect_objects.h new file mode 100755 index 0000000000..30a2297bd6 --- /dev/null +++ b/src/data/field_event_obj/field_effect_objects.h @@ -0,0 +1,997 @@ +#ifndef GUARD_FIELD_EFFECT_OBJECTS_H +#define GUARD_FIELD_EFFECT_OBJECTS_H + +const struct SpritePalette gFieldEffectObjectPaletteInfo0 = {gFieldEffectObjectPalette0, 0x1004}; + +const struct SpritePalette gFieldEffectObjectPaletteInfo1 = {gFieldEffectObjectPalette1, 0x1005}; + +const union AnimCmd gFieldEffectObjectImageAnim_850C9D0[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_Shadow[] = +{ + gFieldEffectObjectImageAnim_850C9D0, +}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowSmall[] = { + obj_frame_tiles(gFieldEffectObjectPic_ShadowSmall), +}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowMedium[] = { + obj_frame_tiles(gFieldEffectObjectPic_ShadowMedium), +}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowLarge[] = { + obj_frame_tiles(gFieldEffectObjectPic_ShadowLarge), +}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowExtraLarge[] = { + obj_frame_tiles(gFieldEffectObjectPic_ShadowExtraLarge), +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_8x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowSmall, gDummySpriteAffineAnimTable, oamc_shadow}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowMedium, gDummySpriteAffineAnimTable, oamc_shadow}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_32x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowLarge, gDummySpriteAffineAnimTable, oamc_shadow}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_64x32, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowExtraLarge, gDummySpriteAffineAnimTable, oamc_shadow}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_TallGrass[] = { + obj_frame_tiles(gFieldEffectObjectPic_TallGrass_0), + obj_frame_tiles(gFieldEffectObjectPic_TallGrass_1), + obj_frame_tiles(gFieldEffectObjectPic_TallGrass_2), + obj_frame_tiles(gFieldEffectObjectPic_TallGrass_3), + obj_frame_tiles(gFieldEffectObjectPic_TallGrass_4), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CA84[] = +{ + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(2, 10), + ANIMCMD_FRAME(3, 10), + ANIMCMD_FRAME(4, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_END, +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_TallGrass[] = +{ + gFieldEffectObjectImageAnim_850CA84, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_TallGrass, gFieldEffectObjectPicTable_TallGrass, gDummySpriteAffineAnimTable, unc_grass_normal}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_Ripple[] = { + obj_frame_tiles(gFieldEffectObjectPic_Ripple_0), + obj_frame_tiles(gFieldEffectObjectPic_Ripple_1), + obj_frame_tiles(gFieldEffectObjectPic_Ripple_2), + obj_frame_tiles(gFieldEffectObjectPic_Ripple_3), + obj_frame_tiles(gFieldEffectObjectPic_Ripple_4), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CAE0[] = +{ + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 9), + ANIMCMD_FRAME(2, 9), + ANIMCMD_FRAME(3, 9), + ANIMCMD_FRAME(0, 9), + ANIMCMD_FRAME(1, 9), + ANIMCMD_FRAME(2, 11), + ANIMCMD_FRAME(4, 11), + ANIMCMD_END, +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_Ripple[] = +{ + gFieldEffectObjectImageAnim_850CAE0, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ripple, gFieldEffectObjectPicTable_Ripple, gDummySpriteAffineAnimTable, sub_81561D0}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_Ash[] = { + obj_frame_tiles(gFieldEffectObjectPic_Ash_0), + obj_frame_tiles(gFieldEffectObjectPic_Ash_1), + obj_frame_tiles(gFieldEffectObjectPic_Ash_2), + obj_frame_tiles(gFieldEffectObjectPic_Ash_3), + obj_frame_tiles(gFieldEffectObjectPic_Ash_4), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CB48[] = +{ + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(3, 12), + ANIMCMD_FRAME(4, 12), + ANIMCMD_END, +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_Ash[] = +{ + gFieldEffectObjectImageAnim_850CB48, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ash, gFieldEffectObjectPicTable_Ash, gDummySpriteAffineAnimTable, sub_8155460}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_SurfBlob[] = { + obj_frame_tiles(gFieldEffectObjectPic_SurfBlob_0), + obj_frame_tiles(gFieldEffectObjectPic_SurfBlob_1), + obj_frame_tiles(gFieldEffectObjectPic_SurfBlob_2), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CB94[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CB9C[] = +{ + ANIMCMD_FRAME(1, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CBA4[] = +{ + ANIMCMD_FRAME(2, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CBAC[] = +{ + ANIMCMD_FRAME(2, 1, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_SurfBlob[] = +{ + gFieldEffectObjectImageAnim_850CB94, + gFieldEffectObjectImageAnim_850CB9C, + gFieldEffectObjectImageAnim_850CBA4, + gFieldEffectObjectImageAnim_850CBAC, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_SurfBlob, gFieldEffectObjectPicTable_SurfBlob, gDummySpriteAffineAnimTable, sub_8155658}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_Arrow[] = { + obj_frame_tiles(gFieldEffectObjectPic_Arrow_0), + obj_frame_tiles(gFieldEffectObjectPic_Arrow_1), + obj_frame_tiles(gFieldEffectObjectPic_Arrow_2), + obj_frame_tiles(gFieldEffectObjectPic_Arrow_3), + obj_frame_tiles(gFieldEffectObjectPic_Arrow_4), + obj_frame_tiles(gFieldEffectObjectPic_Arrow_5), + obj_frame_tiles(gFieldEffectObjectPic_Arrow_6), + obj_frame_tiles(gFieldEffectObjectPic_Arrow_7), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CC1C[] = +{ + ANIMCMD_FRAME(3, 32), + ANIMCMD_FRAME(7, 32), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CC28[] = +{ + ANIMCMD_FRAME(0, 32), + ANIMCMD_FRAME(4, 32), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CC34[] = +{ + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(5, 32), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CC40[] = +{ + ANIMCMD_FRAME(2, 32), + ANIMCMD_FRAME(6, 32), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_Arrow[] = +{ + gFieldEffectObjectImageAnim_850CC1C, + gFieldEffectObjectImageAnim_850CC28, + gFieldEffectObjectImageAnim_850CC34, + gFieldEffectObjectImageAnim_850CC40, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Arrow, gFieldEffectObjectPicTable_Arrow, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_GroundImpactDust[] = { + obj_frame_tiles(gFieldEffectObjectPic_GroundImpactDust_0), + obj_frame_tiles(gFieldEffectObjectPic_GroundImpactDust_1), + obj_frame_tiles(gFieldEffectObjectPic_GroundImpactDust_2), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CC8C[] = +{ + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_END, +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_GroundImpactDust[] = +{ + gFieldEffectObjectImageAnim_850CC8C, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_GroundImpactDust, gFieldEffectObjectPicTable_GroundImpactDust, gDummySpriteAffineAnimTable, sub_8156194}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopTallGrass[] = { + obj_frame_tiles(gFieldEffectObjectPic_BikeHopTallGrass_0), + obj_frame_tiles(gFieldEffectObjectPic_BikeHopTallGrass_1), + obj_frame_tiles(gFieldEffectObjectPic_BikeHopTallGrass_2), + obj_frame_tiles(gFieldEffectObjectPic_BikeHopTallGrass_3), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CCD8[] = +{ + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(3, 8), + ANIMCMD_END, +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopTallGrass[] = +{ + gFieldEffectObjectImageAnim_850CCD8, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopTallGrass = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopTallGrass, gFieldEffectObjectPicTable_BikeHopTallGrass, gDummySpriteAffineAnimTable, sub_8156194}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_SandFootprints[] = { + obj_frame_tiles(gFieldEffectObjectPic_SandFootprints_0), + obj_frame_tiles(gFieldEffectObjectPic_SandFootprints_1), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CD18[] = +{ + ANIMCMD_FRAME(0, 1, .vFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CD20[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CD28[] = +{ + ANIMCMD_FRAME(1, 1), + ANIMCMD_END, +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CD30[] = +{ + ANIMCMD_FRAME(1, 1, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_SandFootprints[] = +{ + gFieldEffectObjectImageAnim_850CD18, + gFieldEffectObjectImageAnim_850CD18, + gFieldEffectObjectImageAnim_850CD20, + gFieldEffectObjectImageAnim_850CD28, + gFieldEffectObjectImageAnim_850CD30, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_SandFootprints, gFieldEffectObjectPicTable_SandFootprints, gDummySpriteAffineAnimTable, sub_8154C60}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_DeepSandFootprints[] = { + obj_frame_tiles(gFieldEffectObjectPic_DeepSandFootprints_0), + obj_frame_tiles(gFieldEffectObjectPic_DeepSandFootprints_1), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CD74[] = +{ + ANIMCMD_FRAME(0, 1, .vFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CD7C[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CD84[] = +{ + ANIMCMD_FRAME(1, 1), + ANIMCMD_END, +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CD8C[] = +{ + ANIMCMD_FRAME(1, 1, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_DeepSandFootprints[] = +{ + gFieldEffectObjectImageAnim_850CD74, + gFieldEffectObjectImageAnim_850CD74, + gFieldEffectObjectImageAnim_850CD7C, + gFieldEffectObjectImageAnim_850CD84, + gFieldEffectObjectImageAnim_850CD8C, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_DeepSandFootprints, gFieldEffectObjectPicTable_DeepSandFootprints, gDummySpriteAffineAnimTable, sub_8154C60}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeTireTracks[] = { + obj_frame_tiles(gFieldEffectObjectPic_BikeTireTracks_0), + obj_frame_tiles(gFieldEffectObjectPic_BikeTireTracks_1), + obj_frame_tiles(gFieldEffectObjectPic_BikeTireTracks_2), + obj_frame_tiles(gFieldEffectObjectPic_BikeTireTracks_3), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CDE0[] = +{ + ANIMCMD_FRAME(2, 1), + ANIMCMD_END, +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CDE8[] = +{ + ANIMCMD_FRAME(2, 1), + ANIMCMD_END, +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CDF0[] = +{ + ANIMCMD_FRAME(1, 1), + ANIMCMD_END, +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CDF8[] = +{ + ANIMCMD_FRAME(1, 1), + ANIMCMD_END, +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CE00[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CE08[] = +{ + ANIMCMD_FRAME(0, 1, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CE10[] = +{ + ANIMCMD_FRAME(3, 1, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CE18[] = +{ + ANIMCMD_FRAME(3, 1), + ANIMCMD_END, +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeTireTracks[] = +{ + gFieldEffectObjectImageAnim_850CDE0, + gFieldEffectObjectImageAnim_850CDE0, + gFieldEffectObjectImageAnim_850CDE8, + gFieldEffectObjectImageAnim_850CDF0, + gFieldEffectObjectImageAnim_850CDF8, + gFieldEffectObjectImageAnim_850CE00, + gFieldEffectObjectImageAnim_850CE08, + gFieldEffectObjectImageAnim_850CE10, + gFieldEffectObjectImageAnim_850CE18, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeTireTracks, gFieldEffectObjectPicTable_BikeTireTracks, gDummySpriteAffineAnimTable, sub_8154C60}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopBigSplash[] = { + obj_frame_tiles(gFieldEffectObjectPic_BikeHopBigSplash_0), + obj_frame_tiles(gFieldEffectObjectPic_BikeHopBigSplash_1), + obj_frame_tiles(gFieldEffectObjectPic_BikeHopBigSplash_2), + obj_frame_tiles(gFieldEffectObjectPic_BikeHopBigSplash_3), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CE7C[] = +{ + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(3, 8), + ANIMCMD_END, +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopBigSplash[] = +{ + gFieldEffectObjectImageAnim_850CE7C, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopBigSplash = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeHopBigSplash, gFieldEffectObjectPicTable_BikeHopBigSplash, gDummySpriteAffineAnimTable, sub_8156194}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_Splash[] = { + obj_frame_tiles(gFieldEffectObjectPic_Splash_0), + obj_frame_tiles(gFieldEffectObjectPic_Splash_1), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CEBC[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_END, +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CEC8[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 6), + ANIMCMD_FRAME(1, 6), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 6), + ANIMCMD_FRAME(1, 6), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_Splash[] = +{ + gFieldEffectObjectImageAnim_850CEBC, + gFieldEffectObjectImageAnim_850CEC8, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Splash, gFieldEffectObjectPicTable_Splash, gDummySpriteAffineAnimTable, sub_8154D90}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopSmallSplash[] = { + obj_frame_tiles(gFieldEffectObjectPic_BikeHopSmallSplash_0), + obj_frame_tiles(gFieldEffectObjectPic_BikeHopSmallSplash_1), + obj_frame_tiles(gFieldEffectObjectPic_BikeHopSmallSplash_2), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CF24[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_END, +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopSmallSplash[] = +{ + gFieldEffectObjectImageAnim_850CF24, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopSmallSplash = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopSmallSplash, gFieldEffectObjectPicTable_BikeHopSmallSplash, gDummySpriteAffineAnimTable, sub_8156194}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_LongGrass[] = { + obj_frame_tiles(gFieldEffectObjectPic_LongGrass_0), + obj_frame_tiles(gFieldEffectObjectPic_LongGrass_1), + obj_frame_tiles(gFieldEffectObjectPic_LongGrass_2), + obj_frame_tiles(gFieldEffectObjectPic_LongGrass_3), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CF70[] = +{ + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(2, 3), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_END, +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_LongGrass[] = +{ + gFieldEffectObjectImageAnim_850CF70, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_LongGrass, gFieldEffectObjectPicTable_LongGrass, gDummySpriteAffineAnimTable, unc_grass_tall}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown16[] = { + obj_frame_tiles(gFieldEffectObjectPic_Unknown16_0), + obj_frame_tiles(gFieldEffectObjectPic_Unknown16_1), + obj_frame_tiles(gFieldEffectObjectPic_Unknown16_2), + obj_frame_tiles(gFieldEffectObjectPic_Unknown16_3), + obj_frame_tiles(gFieldEffectObjectPic_Unknown16_4), + obj_frame_tiles(gFieldEffectObjectPic_Unknown16_5), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850CFDC[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(3, 8), + ANIMCMD_FRAME(4, 8), + ANIMCMD_FRAME(5, 8), + ANIMCMD_END, +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown16[] = +{ + gFieldEffectObjectImageAnim_850CFDC, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown16 = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown16, gFieldEffectObjectPicTable_Unknown16, gDummySpriteAffineAnimTable, sub_8156194}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown17[] = { + obj_frame_tiles(gFieldEffectObjectPic_Unknown16_5), + obj_frame_tiles(gFieldEffectObjectPic_Unknown17_0), + obj_frame_tiles(gFieldEffectObjectPic_Unknown17_1), + obj_frame_tiles(gFieldEffectObjectPic_Unknown17_2), + obj_frame_tiles(gFieldEffectObjectPic_Unknown17_3), + obj_frame_tiles(gFieldEffectObjectPic_Unknown17_4), + obj_frame_tiles(gFieldEffectObjectPic_Unknown17_5), + obj_frame_tiles(gFieldEffectObjectPic_Unknown17_6), + obj_frame_tiles(gFieldEffectObjectPic_Unknown17_7), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850D05C[] = +{ + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(4, 4), + ANIMCMD_FRAME(5, 4), + ANIMCMD_FRAME(6, 4), + ANIMCMD_FRAME(7, 4), + ANIMCMD_FRAME(8, 4), + ANIMCMD_JUMP(7), +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown17[] = +{ + gFieldEffectObjectImageAnim_850D05C, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown17 = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown17, gFieldEffectObjectPicTable_Unknown17, gDummySpriteAffineAnimTable, sub_81561D0}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown18[] = { + obj_frame_tiles(gFieldEffectObjectPic_Unknown18_0), + obj_frame_tiles(gFieldEffectObjectPic_Unknown18_1), + obj_frame_tiles(gFieldEffectObjectPic_Unknown18_2), + obj_frame_tiles(gFieldEffectObjectPic_Unknown18_3), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850D0C0[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown18[] = +{ + gFieldEffectObjectImageAnim_850D0C0, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown18 = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown18, gFieldEffectObjectPicTable_Unknown18, gDummySpriteAffineAnimTable, sub_81561D0}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown19[] = { + obj_frame_tiles(gFieldEffectObjectPic_Unknown19_0), + obj_frame_tiles(gFieldEffectObjectPic_Unknown19_1), + obj_frame_tiles(gFieldEffectObjectPic_Unknown19_2), + obj_frame_tiles(gFieldEffectObjectPic_Unknown19_3), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850D118[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(3, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown19[] = +{ + gFieldEffectObjectImageAnim_850D118, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown19 = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown19, gFieldEffectObjectPicTable_Unknown19, gDummySpriteAffineAnimTable, sub_81561D0}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown29[] = { + obj_frame_tiles(gFieldEffectObjectPic_Unknown29_0), + obj_frame_tiles(gFieldEffectObjectPic_Unknown29_1), + obj_frame_tiles(gFieldEffectObjectPic_Unknown29_2), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850D160[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_END, +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown29[] = +{ + gFieldEffectObjectImageAnim_850D160, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown29 = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Unknown29, gFieldEffectObjectPicTable_Unknown29, gDummySpriteAffineAnimTable, sub_81559BC}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown20[] = { + obj_frame_tiles(gFieldEffectObjectPic_Unknown20_0), + obj_frame_tiles(gFieldEffectObjectPic_Unknown20_1), + obj_frame_tiles(gFieldEffectObjectPic_Unknown20_2), + obj_frame_tiles(gFieldEffectObjectPic_Unknown20_3), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850D1AC[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown20[] = +{ + gFieldEffectObjectImageAnim_850D1AC, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown20 = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown20, gFieldEffectObjectPicTable_Unknown20, gDummySpriteAffineAnimTable, sub_81561D0}; + +const union AffineAnimCmd gFieldEffectObjectRotScalAnim_850D1E4[] = +{ + AFFINEANIMCMD_FRAME(0xFF00, 0x100, -128, 0), + AFFINEANIMCMD_FRAME(0x1, 0x0, 0, 4), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8), + AFFINEANIMCMD_FRAME(0xFFFF, 0x0, 0, 4), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8), + AFFINEANIMCMD_FRAME(0xFFFF, 0x0, 0, 4), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8), + AFFINEANIMCMD_FRAME(0x1, 0x0, 0, 4), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8), + AFFINEANIMCMD_JUMP(1), +}; + +const union AffineAnimCmd gFieldEffectObjectRotScalAnim_850D234[] = +{ + AFFINEANIMCMD_FRAME(0x100, 0x100, -128, 0), + AFFINEANIMCMD_FRAME(0xFFFF, 0x0, 0, 4), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8), + AFFINEANIMCMD_FRAME(0x1, 0x0, 0, 4), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8), + AFFINEANIMCMD_FRAME(0x1, 0x0, 0, 4), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8), + AFFINEANIMCMD_FRAME(0xFFFF, 0x0, 0, 4), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8), + AFFINEANIMCMD_JUMP(1), +}; + +const union AffineAnimCmd *const gFieldEffectObjectRotScalAnimTable_Unknown21[] = +{ + gFieldEffectObjectRotScalAnim_850D1E4, + gFieldEffectObjectRotScalAnim_850D234, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown21 = {0x0, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gFieldEffectObjectRotScalAnimTable_Unknown21, SpriteCallbackDummy}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_BerryTreeGrowthSparkle[] = { + obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_0), + obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_1), + obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_2), + obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_3), + obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_4), + obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_5), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850D2D4[] = +{ + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(3, 8), + ANIMCMD_FRAME(4, 8), + ANIMCMD_FRAME(5, 8), + ANIMCMD_LOOP(0), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(4, 4), + ANIMCMD_FRAME(5, 4), + ANIMCMD_LOOP(3), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(3, 8), + ANIMCMD_FRAME(4, 8), + ANIMCMD_FRAME(5, 8), + ANIMCMD_END, +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle[] = +{ + gFieldEffectObjectImageAnim_850D2D4, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_BerryTreeGrowthSparkle = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle, gFieldEffectObjectPicTable_BerryTreeGrowthSparkle, gDummySpriteAffineAnimTable, sub_81561D0}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_TreeDisguise[] = { + obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_0), + obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_1), + obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_2), + obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_3), + obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_4), + obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_5), + obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_6), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850D37C[] = +{ + ANIMCMD_FRAME(0, 16), + ANIMCMD_END, +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850D384[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(4, 4), + ANIMCMD_FRAME(5, 4), + ANIMCMD_FRAME(6, 4), + ANIMCMD_END, +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_TreeDisguise[] = +{ + gFieldEffectObjectImageAnim_850D37C, + gFieldEffectObjectImageAnim_850D384, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_TreeDisguise, gDummySpriteAffineAnimTable, sub_8155C88}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_MountainDisguise[] = { + obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_0), + obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_1), + obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_2), + obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_3), + obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_4), + obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_5), + obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_6), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850D3FC[] = +{ + ANIMCMD_FRAME(0, 16), + ANIMCMD_END, +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850D404[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(4, 4), + ANIMCMD_FRAME(5, 4), + ANIMCMD_FRAME(6, 4), + ANIMCMD_END, +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_MountainDisguise[] = +{ + gFieldEffectObjectImageAnim_850D3FC, + gFieldEffectObjectImageAnim_850D404, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_MountainDisguise, gFieldEffectObjectPicTable_MountainDisguise, gDummySpriteAffineAnimTable, sub_8155C88}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_SandDisguisePlaceholder[] = { + obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_0), + obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_1), + obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_2), + obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_3), + obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_4), + obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_5), + obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_6), +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_SandDisguisePlaceholder, gDummySpriteAffineAnimTable, sub_8155C88}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_Bird[] = { + obj_frame_tiles(gFieldEffectObjectPic_Bird), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850D49C[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_Bird[] = +{ + gFieldEffectObjectImageAnim_850D49C, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Bird, gFieldEffectObjectPicTable_Bird, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_ShortGrass[] = { + obj_frame_tiles(gFieldEffectObjectPic_ShortGrass_0), + obj_frame_tiles(gFieldEffectObjectPic_ShortGrass_1), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850D4D0[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_END, +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_ShortGrass[] = +{ + gFieldEffectObjectImageAnim_850D4D0, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_ShortGrass, gFieldEffectObjectPicTable_ShortGrass, gDummySpriteAffineAnimTable, sub_8154A10}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_HotSpringsWater[] = { + obj_frame_tiles(gFieldEffectObjectPic_HotSpringsWater), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850D500[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_END, +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_HotSpringsWater[] = +{ + gFieldEffectObjectImageAnim_850D500, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_HotSpringsWater, gFieldEffectObjectPicTable_HotSpringsWater, gDummySpriteAffineAnimTable, sub_8155158}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_JumpOutOfAsh[] = { + obj_frame_tiles(gFieldEffectObjectPic_JumpOutOfAsh_0), + obj_frame_tiles(gFieldEffectObjectPic_JumpOutOfAsh_1), + obj_frame_tiles(gFieldEffectObjectPic_JumpOutOfAsh_2), + obj_frame_tiles(gFieldEffectObjectPic_JumpOutOfAsh_3), + obj_frame_tiles(gFieldEffectObjectPic_JumpOutOfAsh_4), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850D54C[] = +{ + ANIMCMD_FRAME(0, 6), + ANIMCMD_FRAME(1, 6), + ANIMCMD_FRAME(2, 6), + ANIMCMD_FRAME(3, 6), + ANIMCMD_FRAME(4, 6), + ANIMCMD_END, +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_JumpOutOfAsh[] = +{ + gFieldEffectObjectImageAnim_850D54C, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh = {0xFFFF, 0x100D, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_JumpOutOfAsh, gFieldEffectObjectPicTable_JumpOutOfAsh, gDummySpriteAffineAnimTable, sub_80B7CAC}; + +const struct SpritePalette gFieldEffectObjectPaletteInfo2 = {gFieldEffectObjectPalette2, 0x100D}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown33[] = { + obj_frame_tiles(gFieldEffectObjectPic_Unknown33_0), + obj_frame_tiles(gFieldEffectObjectPic_Unknown33_1), + obj_frame_tiles(gFieldEffectObjectPic_Unknown33_2), + obj_frame_tiles(gFieldEffectObjectPic_Unknown33_3), + obj_frame_tiles(gFieldEffectObjectPic_Unknown33_4), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850D5B0[] = +{ + ANIMCMD_FRAME(0, 6), + ANIMCMD_FRAME(1, 6), + ANIMCMD_FRAME(2, 6), + ANIMCMD_FRAME(3, 6), + ANIMCMD_FRAME(4, 6), + ANIMCMD_END, +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown33[] = +{ + gFieldEffectObjectImageAnim_850D5B0, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown33 = {0xFFFF, 0x100D, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown33, gFieldEffectObjectPicTable_Unknown33, gDummySpriteAffineAnimTable, sub_80B7A58}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_Bubbles[] = { + obj_frame_tiles(gFieldEffectObjectPic_Bubbles_0), + obj_frame_tiles(gFieldEffectObjectPic_Bubbles_1), + obj_frame_tiles(gFieldEffectObjectPic_Bubbles_2), + obj_frame_tiles(gFieldEffectObjectPic_Bubbles_3), + obj_frame_tiles(gFieldEffectObjectPic_Bubbles_4), + obj_frame_tiles(gFieldEffectObjectPic_Bubbles_5), + obj_frame_tiles(gFieldEffectObjectPic_Bubbles_6), + obj_frame_tiles(gFieldEffectObjectPic_Bubbles_7), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850D624[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(3, 6), + ANIMCMD_FRAME(4, 6), + ANIMCMD_FRAME(5, 4), + ANIMCMD_FRAME(6, 4), + ANIMCMD_FRAME(7, 4), + ANIMCMD_END, +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_Bubbles[] = +{ + gFieldEffectObjectImageAnim_850D624, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_Bubbles, gFieldEffectObjectPicTable_Bubbles, gDummySpriteAffineAnimTable, sub_8155AEC}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown35[] = { + obj_frame_tiles(gFieldEffectObjectPic_Unknown35_0), + obj_frame_tiles(gFieldEffectObjectPic_Unknown35_1), +}; + +const union AnimCmd gFieldEffectObjectImageAnim_850D674[] = +{ + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_END, +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown35[] = +{ + gFieldEffectObjectImageAnim_850D674, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown35 = {0xFFFF, 0x100F, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown35, gFieldEffectObjectPicTable_Unknown35, gDummySpriteAffineAnimTable, sub_8155E50}; + +const struct SpritePalette gFieldEffectObjectPaletteInfo3 = {gFieldEffectObjectPalette3, 0x100F}; + +const union AnimCmd gFieldEffectObjectImageAnim_850D6A8[] = { + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +const union AnimCmd *const gFieldEffectObjectImageAnimTable_Rayquaza[] = { + gFieldEffectObjectImageAnim_850D6A8, +}; + +const struct SpriteFrameImage gFieldEffectObjectPicTable_Rayquaza[] = { + {.data = (u8*)gFieldObjectPic_Rayquaza_0, .size = (sizeof gFieldObjectPic_Rayquaza_0) / 4} +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Rayquaza, gFieldEffectObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable, sub_8155F80}; + +const struct SpritePalette gFieldEffectObjectPaletteInfoUnused = {gFieldObjectPalette2, 0x1011}; + +#endif //GUARD_FIELD_EFFECT_OBJECTS_H diff --git a/src/data/field_event_obj/movement_action_func_tables.h b/src/data/field_event_obj/movement_action_func_tables.h new file mode 100755 index 0000000000..86dc613450 --- /dev/null +++ b/src/data/field_event_obj/movement_action_func_tables.h @@ -0,0 +1,1499 @@ +#ifndef GUARD_MOVEMENT_ACTION_FUNC_TABLES_H +#define GUARD_MOVEMENT_ACTION_FUNC_TABLES_H + +u8 MovementAction_FaceDown_Step0(struct MapObject *, struct Sprite *); +u8 sub_8093950(struct MapObject *, struct Sprite *); +u8 sub_80964BC(struct MapObject *, struct Sprite *); +u8 sub_8093960(struct MapObject *, struct Sprite *); +u8 sub_8093970(struct MapObject *, struct Sprite *); +u8 sub_8093980(struct MapObject *, struct Sprite *); +u8 sub_8093BC4(struct MapObject *, struct Sprite *); +u8 sub_8093BC4_2(struct MapObject *, struct Sprite *); +u8 sub_8093C04(struct MapObject *, struct Sprite *); +u8 sub_8093C04_2(struct MapObject *, struct Sprite *); +u8 sub_8093C44(struct MapObject *, struct Sprite *); +u8 sub_8093C44_2(struct MapObject *, struct Sprite *); +u8 sub_8093C84(struct MapObject *, struct Sprite *); +u8 sub_8093C84_2(struct MapObject *, struct Sprite *); +u8 sub_8093CC4(struct MapObject *, struct Sprite *); +u8 sub_8093CC4_2(struct MapObject *, struct Sprite *); +u8 sub_8093D04(struct MapObject *, struct Sprite *); +u8 sub_8093D04_2(struct MapObject *, struct Sprite *); +u8 sub_8093D44(struct MapObject *, struct Sprite *); +u8 sub_8093D44_2(struct MapObject *, struct Sprite *); +u8 sub_8093D84(struct MapObject *, struct Sprite *); +u8 sub_8093D84_2(struct MapObject *, struct Sprite *); +u8 sub_8093DC4(struct MapObject *, struct Sprite *); +u8 sub_8093DC4_2(struct MapObject *, struct Sprite *); +u8 sub_8093E04(struct MapObject *, struct Sprite *); +u8 sub_8093E04_2(struct MapObject *, struct Sprite *); +u8 sub_8093E44(struct MapObject *, struct Sprite *); +u8 sub_8093E44_2(struct MapObject *, struct Sprite *); +u8 sub_8093E84(struct MapObject *, struct Sprite *); +u8 sub_8093E84_2(struct MapObject *, struct Sprite *); +u8 sub_8093EC4(struct MapObject *, struct Sprite *); +u8 sub_8093EC4_2(struct MapObject *, struct Sprite *); +u8 sub_8093F04(struct MapObject *, struct Sprite *); +u8 sub_8093F04_2(struct MapObject *, struct Sprite *); +u8 sub_8093F44(struct MapObject *, struct Sprite *); +u8 sub_8093F44_2(struct MapObject *, struct Sprite *); +u8 sub_8093F84(struct MapObject *, struct Sprite *); +u8 sub_8093F84_2(struct MapObject *, struct Sprite *); +u8 sub_8094230(struct MapObject *, struct Sprite *); +u8 sub_8094230_2(struct MapObject *, struct Sprite *); +u8 sub_8094288(struct MapObject *, struct Sprite *); +u8 sub_8094288_2(struct MapObject *, struct Sprite *); +u8 sub_80942E0(struct MapObject *, struct Sprite *); +u8 sub_80942E0_2(struct MapObject *, struct Sprite *); +u8 sub_8094338(struct MapObject *, struct Sprite *); +u8 sub_8094338_2(struct MapObject *, struct Sprite *); +u8 sub_80943B4(struct MapObject *, struct Sprite *); +u8 sub_8094398(struct MapObject *, struct Sprite *); +u8 sub_80964B8(struct MapObject *, struct Sprite *); +u8 sub_80943D4(struct MapObject *, struct Sprite *); +u8 sub_80943F4(struct MapObject *, struct Sprite *); +u8 sub_8094414(struct MapObject *, struct Sprite *); +u8 sub_8094434(struct MapObject *, struct Sprite *); +u8 sub_8094454(struct MapObject *, struct Sprite *); +u8 sub_8094454_2(struct MapObject *, struct Sprite *); +u8 sub_8094494(struct MapObject *, struct Sprite *); +u8 sub_8094494_2(struct MapObject *, struct Sprite *); +u8 sub_80944D4(struct MapObject *, struct Sprite *); +u8 sub_80944D4_2(struct MapObject *, struct Sprite *); +u8 sub_8094514(struct MapObject *, struct Sprite *); +u8 sub_8094514_2(struct MapObject *, struct Sprite *); +u8 sub_8094600(struct MapObject *, struct Sprite *); +u8 sub_80945C4(struct MapObject *, struct Sprite *); +u8 sub_8094638(struct MapObject *, struct Sprite *); +u8 sub_8094670(struct MapObject *, struct Sprite *); +u8 sub_80946A8(struct MapObject *, struct Sprite *); +u8 sub_80946E0(struct MapObject *, struct Sprite *); +u8 sub_809459C(struct MapObject *, struct Sprite *); +u8 sub_8094718(struct MapObject *, struct Sprite *); +u8 sub_8094750(struct MapObject *, struct Sprite *); +u8 sub_8094788(struct MapObject *, struct Sprite *); +u8 sub_80947C0(struct MapObject *, struct Sprite *); +u8 sub_80947F8(struct MapObject *, struct Sprite *); +u8 sub_8094830(struct MapObject *, struct Sprite *); +u8 sub_8094868(struct MapObject *, struct Sprite *); +u8 sub_80948A0(struct MapObject *, struct Sprite *); +u8 sub_80948D8(struct MapObject *, struct Sprite *); +u8 sub_8094910(struct MapObject *, struct Sprite *); +u8 sub_8094948(struct MapObject *, struct Sprite *); +u8 sub_8094980(struct MapObject *, struct Sprite *); +u8 sub_8094980_2(struct MapObject *, struct Sprite *); +u8 sub_80949C0(struct MapObject *, struct Sprite *); +u8 sub_80949C0_2(struct MapObject *, struct Sprite *); +u8 sub_8094A00(struct MapObject *, struct Sprite *); +u8 sub_8094A00_2(struct MapObject *, struct Sprite *); +u8 sub_8094A40(struct MapObject *, struct Sprite *); +u8 sub_8094A40_2(struct MapObject *, struct Sprite *); +u8 sub_8094A80(struct MapObject *, struct Sprite *); +u8 sub_8094A80_2(struct MapObject *, struct Sprite *); +u8 sub_8094AC0(struct MapObject *, struct Sprite *); +u8 sub_8094AC0_2(struct MapObject *, struct Sprite *); +u8 sub_8094B00(struct MapObject *, struct Sprite *); +u8 sub_8094B00_2(struct MapObject *, struct Sprite *); +u8 sub_8094B40(struct MapObject *, struct Sprite *); +u8 sub_8094B40_2(struct MapObject *, struct Sprite *); +u8 sub_8094B80(struct MapObject *, struct Sprite *); +u8 sub_8094B80_2(struct MapObject *, struct Sprite *); +u8 sub_8094BC0(struct MapObject *, struct Sprite *); +u8 sub_8094BC0_2(struct MapObject *, struct Sprite *); +u8 sub_8094C00(struct MapObject *, struct Sprite *); +u8 sub_8094C00_2(struct MapObject *, struct Sprite *); +u8 sub_8094C40(struct MapObject *, struct Sprite *); +u8 sub_8094C40_2(struct MapObject *, struct Sprite *); +u8 sub_8094C80(struct MapObject *, struct Sprite *); +u8 sub_8094C80_2(struct MapObject *, struct Sprite *); +u8 sub_8094CC0(struct MapObject *, struct Sprite *); +u8 sub_8094CC0_2(struct MapObject *, struct Sprite *); +u8 sub_8094D00(struct MapObject *, struct Sprite *); +u8 sub_8094D00_2(struct MapObject *, struct Sprite *); +u8 sub_8094D40(struct MapObject *, struct Sprite *); +u8 sub_8094D40_2(struct MapObject *, struct Sprite *); +u8 sub_8094DAC(struct MapObject *, struct Sprite *); +u8 sub_8094DC4(struct MapObject *, struct Sprite *); +u8 sub_8094E18(struct MapObject *, struct Sprite *); +u8 sub_8094E18_2(struct MapObject *, struct Sprite *); +u8 sub_8094E60(struct MapObject *, struct Sprite *); +u8 sub_8094E60_2(struct MapObject *, struct Sprite *); +u8 sub_8094EB8(struct MapObject *, struct Sprite *); +u8 sub_8094EB8_2(struct MapObject *, struct Sprite *); +u8 sub_8094710(struct MapObject *, struct Sprite *); +u8 sub_8094710_2(struct MapObject *, struct Sprite *); +u8 sub_8094F38(struct MapObject *, struct Sprite *); +u8 sub_8094F94(struct MapObject *, struct Sprite *); +u8 sub_8094FF8(struct MapObject *, struct Sprite *); +u8 sub_8095008(struct MapObject *, struct Sprite *); +u8 sub_8095018(struct MapObject *, struct Sprite *); +u8 sub_8095018_2(struct MapObject *, struct Sprite *); +u8 sub_8095070(struct MapObject *, struct Sprite *); +u8 sub_8095070_2(struct MapObject *, struct Sprite *); +u8 sub_80950C8(struct MapObject *, struct Sprite *); +u8 sub_80950C8_2(struct MapObject *, struct Sprite *); +u8 sub_8095120(struct MapObject *, struct Sprite *); +u8 sub_8095120_2(struct MapObject *, struct Sprite *); +u8 sub_8095178(struct MapObject *, struct Sprite *); +u8 sub_8095178_2(struct MapObject *, struct Sprite *); +u8 sub_80951D0(struct MapObject *, struct Sprite *); +u8 sub_80951D0_2(struct MapObject *, struct Sprite *); +u8 sub_8095228(struct MapObject *, struct Sprite *); +u8 sub_8095228_2(struct MapObject *, struct Sprite *); +u8 sub_8095280(struct MapObject *, struct Sprite *); +u8 sub_8095280_2(struct MapObject *, struct Sprite *); +u8 sub_80952D8(struct MapObject *, struct Sprite *); +u8 sub_80952D8_2(struct MapObject *, struct Sprite *); +u8 sub_8095330(struct MapObject *, struct Sprite *); +u8 sub_8095330_2(struct MapObject *, struct Sprite *); +u8 sub_8095388(struct MapObject *, struct Sprite *); +u8 sub_8095388_2(struct MapObject *, struct Sprite *); +u8 sub_80953E0(struct MapObject *, struct Sprite *); +u8 sub_80953E0_2(struct MapObject *, struct Sprite *); +u8 sub_8095438(struct MapObject *, struct Sprite *); +u8 sub_8095450(struct MapObject *, struct Sprite *); +u8 sub_8095460(struct MapObject *, struct Sprite *); +u8 sub_8095470(struct MapObject *, struct Sprite *); +u8 sub_8095480(struct MapObject *, struct Sprite *); +u8 sub_8095490(struct MapObject *, struct Sprite *); +u8 sub_80954BC(struct MapObject *, struct Sprite *); +u8 sub_80954CC(struct MapObject *, struct Sprite *); +u8 do_exclamation_mark_bubble_1(struct MapObject *, struct Sprite *); +u8 do_exclamation_mark_bubble_2(struct MapObject *, struct Sprite *); +u8 do_heart_bubble(struct MapObject *, struct Sprite *); +u8 sub_8095548(struct MapObject *, struct Sprite *); +u8 sub_809558C(struct MapObject *, struct Sprite *); +u8 sub_80955AC(struct MapObject *, struct Sprite *); +u8 sub_80955C8(struct MapObject *, struct Sprite *); +u8 sub_80955EC(struct MapObject *, struct Sprite *); +u8 sub_8095628(struct MapObject *, struct Sprite *); +u8 sub_8095644(struct MapObject *, struct Sprite *); +u8 sub_8095668(struct MapObject *, struct Sprite *); +u8 sub_80956A4(struct MapObject *, struct Sprite *); +u8 sub_80956B4(struct MapObject *, struct Sprite *); +u8 sub_80956C4(struct MapObject *, struct Sprite *); +u8 sub_80956F4(struct MapObject *, struct Sprite *); +u8 sub_8095724(struct MapObject *, struct Sprite *); +u8 sub_8095730(struct MapObject *, struct Sprite *); +u8 sub_8095740(struct MapObject *, struct Sprite *); +u8 sub_8095740_2(struct MapObject *, struct Sprite *); +u8 sub_80957A0(struct MapObject *, struct Sprite *); +u8 sub_80957A0_2(struct MapObject *, struct Sprite *); +u8 sub_8095800(struct MapObject *, struct Sprite *); +u8 sub_8095800_2(struct MapObject *, struct Sprite *); +u8 sub_8095860(struct MapObject *, struct Sprite *); +u8 sub_8095860_2(struct MapObject *, struct Sprite *); +u8 sub_8095900(struct MapObject *, struct Sprite *); +u8 sub_8095910(struct MapObject *, struct Sprite *); +u8 sub_8095920(struct MapObject *, struct Sprite *); +u8 sub_8095930(struct MapObject *, struct Sprite *); +u8 sub_8095940(struct MapObject *, struct Sprite *); +u8 sub_8095964(struct MapObject *, struct Sprite *); +u8 sub_8095988(struct MapObject *, struct Sprite *); +u8 sub_80959AC(struct MapObject *, struct Sprite *); +u8 sub_80959D0(struct MapObject *, struct Sprite *); +u8 sub_80959F4(struct MapObject *, struct Sprite *); +u8 sub_8095A18(struct MapObject *, struct Sprite *); +u8 sub_8095A3C(struct MapObject *, struct Sprite *); +u8 sub_8095A60(struct MapObject *, struct Sprite *); +u8 sub_8095A84(struct MapObject *, struct Sprite *); +u8 sub_8095AA8(struct MapObject *, struct Sprite *); +u8 sub_8095ACC(struct MapObject *, struct Sprite *); +u8 sub_8095B44(struct MapObject *, struct Sprite *); +u8 sub_8095B64(struct MapObject *, struct Sprite *); +u8 sub_8095BC8(struct MapObject *, struct Sprite *); +u8 sub_8095BC8_2(struct MapObject *, struct Sprite *); +u8 sub_8095C20(struct MapObject *, struct Sprite *); +u8 sub_8095C20_2(struct MapObject *, struct Sprite *); +u8 sub_8095C78(struct MapObject *, struct Sprite *); +u8 sub_8095C78_2(struct MapObject *, struct Sprite *); +u8 sub_8095CD0(struct MapObject *, struct Sprite *); +u8 sub_8095CD0_2(struct MapObject *, struct Sprite *); +u8 sub_8095D28(struct MapObject *, struct Sprite *); +u8 sub_8095D28_2(struct MapObject *, struct Sprite *); +u8 sub_8095D80(struct MapObject *, struct Sprite *); +u8 sub_8095D80_2(struct MapObject *, struct Sprite *); +u8 sub_8095DD8(struct MapObject *, struct Sprite *); +u8 sub_8095DD8_2(struct MapObject *, struct Sprite *); +u8 sub_8095E30(struct MapObject *, struct Sprite *); +u8 sub_8095E30_2(struct MapObject *, struct Sprite *); +u8 sub_8095E88(struct MapObject *, struct Sprite *); +u8 sub_8095E88_2(struct MapObject *, struct Sprite *); +u8 sub_8095EE0(struct MapObject *, struct Sprite *); +u8 sub_8095EE0_2(struct MapObject *, struct Sprite *); +u8 sub_8095F38(struct MapObject *, struct Sprite *); +u8 sub_8095F38_2(struct MapObject *, struct Sprite *); +u8 sub_8095F90(struct MapObject *, struct Sprite *); +u8 sub_8095F90_2(struct MapObject *, struct Sprite *); +u8 sub_8095FE8(struct MapObject *, struct Sprite *); +u8 sub_8096020(struct MapObject *, struct Sprite *); +u8 sub_8096058(struct MapObject *, struct Sprite *); +u8 sub_8096090(struct MapObject *, struct Sprite *); +u8 sub_8096100(struct MapObject *, struct Sprite *); +u8 sub_8096100_2(struct MapObject *, struct Sprite *); +u8 sub_8096140(struct MapObject *, struct Sprite *); +u8 sub_8096140_2(struct MapObject *, struct Sprite *); +u8 sub_8096180(struct MapObject *, struct Sprite *); +u8 sub_8096180_2(struct MapObject *, struct Sprite *); +u8 sub_80961C0(struct MapObject *, struct Sprite *); +u8 sub_80961C0_2(struct MapObject *, struct Sprite *); +u8 sub_8096230(struct MapObject *, struct Sprite *); +u8 sub_8096230_2(struct MapObject *, struct Sprite *); +u8 sub_8096270(struct MapObject *, struct Sprite *); +u8 sub_8096270_2(struct MapObject *, struct Sprite *); +u8 sub_80962B0(struct MapObject *, struct Sprite *); +u8 sub_80962B0_2(struct MapObject *, struct Sprite *); +u8 sub_80962F0(struct MapObject *, struct Sprite *); +u8 sub_80962F0_2(struct MapObject *, struct Sprite *); +u8 sub_8096368(struct MapObject *, struct Sprite *); +u8 sub_8096368_2(struct MapObject *, struct Sprite *); +u8 sub_80963A8(struct MapObject *, struct Sprite *); +u8 sub_80963A8_2(struct MapObject *, struct Sprite *); +u8 sub_80963E8(struct MapObject *, struct Sprite *); +u8 sub_80963E8_2(struct MapObject *, struct Sprite *); +u8 sub_8096428(struct MapObject *, struct Sprite *); +u8 sub_8096428_2(struct MapObject *, struct Sprite *); +u8 sub_8096468(struct MapObject *, struct Sprite *); +u8 sub_809647C(struct MapObject *, struct Sprite *); +u8 sub_8096494(struct MapObject *, struct Sprite *); + + +u8 (*const gUnknown_0850DEC8[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850DED0[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850DED8[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850DEE0[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850DF2C[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850DF38[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850DF44[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850DF50[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850DF8C[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850DF98[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850DFA4[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850DFB0[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850DFC8[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850DFD4[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850DFE0[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850DFEC[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850DFF8[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E004[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E010[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E01C[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E028[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E034[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E040[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E04C[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E058[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E064[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E070[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E07C[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E088[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E094[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E0A0[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E0AC[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E0B8[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E0C4[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E0D0[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E0DC[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E0E8[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E0F4[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E100[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E10C[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E118[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E124[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E130[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E13C[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E148[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E154[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E160[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E16C[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E178[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E184[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E190[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E19C[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E1A8[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E1B4[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E1C0[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E1CC[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E1D8[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E1E4[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E1F0[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E1FC[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E208[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E214[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E220[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E228[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E230[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E238[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E240[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E24C[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E258[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E264[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E270[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E27C[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E288[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E294[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E2A0[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E2AC[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E2B8[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E2C4[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E2D0[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E2D8[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E2E4[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E2EC[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E2F4[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E2FC[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E304[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E30C[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E314[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E31C[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E324[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E32C[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E338[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E348[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E358[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E360[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E368[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E370[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E378[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E380[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E388[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E394[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E3B8[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E3C0[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E3C8[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E3D0[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E3D8[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E3E4[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E3F0[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E3FC[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E408[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E414[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E420[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E42C[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E474[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E480[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E48C[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E498[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E4A4[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E4B0[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E4BC[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E4C8[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E4D4[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E4E0[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E4EC[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E4F8[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E504[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E510[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E51C[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E528[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E534[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E540[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E54C[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E558[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E564[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E570[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E57C[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E588[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E594[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E5A0[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E5AC[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E5B8[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850DF5C[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850DF68[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850DF74[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850DF80[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850DEFC[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850DF08[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850DF14[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850DF20[])(struct MapObject *, struct Sprite *); +extern u8 (*const gUnknown_0850E854[])(struct MapObject *, struct Sprite *); +extern u8 (*const gUnknown_0850E85C[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E3A0[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E3AC[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E5C4[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E5CC[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E5D4[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E468[])(struct MapObject *, struct Sprite *); +extern u8 (*const gUnknown_0850E864[])(struct MapObject *, struct Sprite *); +extern u8 (*const gUnknown_0850E870[])(struct MapObject *, struct Sprite *); + +u8 (*const *const gUnknown_0850DC50[])(struct MapObject *, struct Sprite *) = { + gUnknown_0850DEC8, + gUnknown_0850DED0, + gUnknown_0850DED8, + gUnknown_0850DEE0, + gUnknown_0850DF2C, + gUnknown_0850DF38, + gUnknown_0850DF44, + gUnknown_0850DF50, + gUnknown_0850DF8C, + gUnknown_0850DF98, + gUnknown_0850DFA4, + gUnknown_0850DFB0, + gUnknown_0850DFC8, + gUnknown_0850DFD4, + gUnknown_0850DFE0, + gUnknown_0850DFEC, + gUnknown_0850DFF8, + gUnknown_0850E004, + gUnknown_0850E010, + gUnknown_0850E01C, + gUnknown_0850E028, + gUnknown_0850E034, + gUnknown_0850E040, + gUnknown_0850E04C, + gUnknown_0850E058, + gUnknown_0850E064, + gUnknown_0850E070, + gUnknown_0850E07C, + gUnknown_0850E088, + gUnknown_0850E094, + gUnknown_0850E0A0, + gUnknown_0850E0AC, + gUnknown_0850E0B8, + gUnknown_0850E0C4, + gUnknown_0850E0D0, + gUnknown_0850E0DC, + gUnknown_0850E0E8, + gUnknown_0850E0F4, + gUnknown_0850E100, + gUnknown_0850E10C, + gUnknown_0850E118, + gUnknown_0850E124, + gUnknown_0850E130, + gUnknown_0850E13C, + gUnknown_0850E148, + gUnknown_0850E154, + gUnknown_0850E160, + gUnknown_0850E16C, + gUnknown_0850E178, + gUnknown_0850E184, + gUnknown_0850E190, + gUnknown_0850E19C, + gUnknown_0850E1A8, + gUnknown_0850E1B4, + gUnknown_0850E1C0, + gUnknown_0850E1CC, + gUnknown_0850E1D8, + gUnknown_0850E1E4, + gUnknown_0850E1F0, + gUnknown_0850E1FC, + gUnknown_0850E208, + gUnknown_0850E214, + gUnknown_0850E220, + gUnknown_0850E228, + gUnknown_0850E230, + gUnknown_0850E238, + gUnknown_0850E240, + gUnknown_0850E24C, + gUnknown_0850E258, + gUnknown_0850E264, + gUnknown_0850E270, + gUnknown_0850E27C, + gUnknown_0850E288, + gUnknown_0850E294, + gUnknown_0850E2A0, + gUnknown_0850E2AC, + gUnknown_0850E2B8, + gUnknown_0850E2C4, + gUnknown_0850E2D0, + gUnknown_0850E2D8, + gUnknown_0850E2E4, + gUnknown_0850E2EC, + gUnknown_0850E2F4, + gUnknown_0850E2FC, + gUnknown_0850E304, + gUnknown_0850E30C, + gUnknown_0850E314, + gUnknown_0850E31C, + gUnknown_0850E324, + gUnknown_0850E32C, + gUnknown_0850E338, + gUnknown_0850E348, + gUnknown_0850E358, + gUnknown_0850E360, + gUnknown_0850E368, + gUnknown_0850E370, + gUnknown_0850E378, + gUnknown_0850E380, + gUnknown_0850E388, + gUnknown_0850E394, + gUnknown_0850E3B8, + gUnknown_0850E3C0, + gUnknown_0850E3C8, + gUnknown_0850E3D0, + gUnknown_0850E3D8, + gUnknown_0850E3E4, + gUnknown_0850E3F0, + gUnknown_0850E3FC, + gUnknown_0850E408, + gUnknown_0850E414, + gUnknown_0850E420, + gUnknown_0850E42C, + gUnknown_0850E474, + gUnknown_0850E480, + gUnknown_0850E48C, + gUnknown_0850E498, + gUnknown_0850E4A4, + gUnknown_0850E4B0, + gUnknown_0850E4BC, + gUnknown_0850E4C8, + gUnknown_0850E4D4, + gUnknown_0850E4E0, + gUnknown_0850E4EC, + gUnknown_0850E4F8, + gUnknown_0850E504, + gUnknown_0850E510, + gUnknown_0850E51C, + gUnknown_0850E528, + gUnknown_0850E534, + gUnknown_0850E540, + gUnknown_0850E54C, + gUnknown_0850E558, + gUnknown_0850E564, + gUnknown_0850E570, + gUnknown_0850E57C, + gUnknown_0850E588, + gUnknown_0850E594, + gUnknown_0850E5A0, + gUnknown_0850E5AC, + gUnknown_0850E5B8, + gUnknown_0850DF5C, + gUnknown_0850DF68, + gUnknown_0850DF74, + gUnknown_0850DF80, + gUnknown_0850DEFC, + gUnknown_0850DF08, + gUnknown_0850DF14, + gUnknown_0850DF20, + gUnknown_0850E854, + gUnknown_0850E85C, + gUnknown_0850E3A0, + gUnknown_0850E3AC, + gUnknown_0850E5C4, + gUnknown_0850E5CC, + gUnknown_0850E5D4, + gUnknown_0850E468, + gUnknown_0850E864, + gUnknown_0850E870, +}; + +u8 (*const gUnknown_0850DEC8[])(struct MapObject *, struct Sprite *) = { + sub_8093950, + sub_80964BC, +}; + +u8 (*const gUnknown_0850DED0[])(struct MapObject *, struct Sprite *) = { + sub_8093960, + sub_80964BC, +}; + +u8 (*const gUnknown_0850DED8[])(struct MapObject *, struct Sprite *) = { + sub_8093970, + sub_80964BC, +}; + +u8 (*const gUnknown_0850DEE0[])(struct MapObject *, struct Sprite *) = { + sub_8093980, + sub_80964BC, +}; + +u8 (*const gUnknown_0850DEE8[])(u8) = { + get_go_image_anim_num, + get_go_fast_image_anim_num, + get_go_fast_image_anim_num, + get_go_faster_image_anim_num, + get_go_fastest_image_anim_num, +}; + +u8 (*const gUnknown_0850DEFC[])(struct MapObject *, struct Sprite *) = { + sub_8093BC4, + sub_8093BC4_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850DF08[])(struct MapObject *, struct Sprite *) = { + sub_8093C04, + sub_8093C04_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850DF14[])(struct MapObject *, struct Sprite *) = { + sub_8093C44, + sub_8093C44_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850DF20[])(struct MapObject *, struct Sprite *) = { + sub_8093C84, + sub_8093C84_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850DF2C[])(struct MapObject *, struct Sprite *) = { + sub_8093CC4, + sub_8093CC4_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850DF38[])(struct MapObject *, struct Sprite *) = { + sub_8093D04, + sub_8093D04_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850DF44[])(struct MapObject *, struct Sprite *) = { + sub_8093D44, + sub_8093D44_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850DF50[])(struct MapObject *, struct Sprite *) = { + sub_8093D84, + sub_8093D84_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850DF5C[])(struct MapObject *, struct Sprite *) = { + sub_8093DC4, + sub_8093DC4_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850DF68[])(struct MapObject *, struct Sprite *) = { + sub_8093E04, + sub_8093E04_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850DF74[])(struct MapObject *, struct Sprite *) = { + sub_8093E44, + sub_8093E44_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850DF80[])(struct MapObject *, struct Sprite *) = { + sub_8093E84, + sub_8093E84_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850DF8C[])(struct MapObject *, struct Sprite *) = { + sub_8093EC4, + sub_8093EC4_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850DF98[])(struct MapObject *, struct Sprite *) = { + sub_8093F04, + sub_8093F04_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850DFA4[])(struct MapObject *, struct Sprite *) = { + sub_8093F44, + sub_8093F44_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850DFB0[])(struct MapObject *, struct Sprite *) = { + sub_8093F84, + sub_8093F84_2, + sub_80964BC, +}; + +const s16 gUnknown_0850DFBC[] = {0, 1, 1}; +const s16 gUnknown_0850DFC2[] = {0, 0, 1}; + +u8 (*const gUnknown_0850DFC8[])(struct MapObject *, struct Sprite *) = { + sub_8094230, + sub_8094230_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850DFD4[])(struct MapObject *, struct Sprite *) = { + sub_8094288, + sub_8094288_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850DFE0[])(struct MapObject *, struct Sprite *) = { + sub_80942E0, + sub_80942E0_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850DFEC[])(struct MapObject *, struct Sprite *) = { + sub_8094338, + sub_8094338_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850DFF8[])(struct MapObject *, struct Sprite *) = { + sub_80943B4, + sub_8094398, + sub_80964B8, +}; + +u8 (*const gUnknown_0850E004[])(struct MapObject *, struct Sprite *) = { + sub_80943D4, + sub_8094398, + sub_80964B8, +}; + +u8 (*const gUnknown_0850E010[])(struct MapObject *, struct Sprite *) = { + sub_80943F4, + sub_8094398, + sub_80964B8, +}; + +u8 (*const gUnknown_0850E01C[])(struct MapObject *, struct Sprite *) = { + sub_8094414, + sub_8094398, + sub_80964B8, +}; + +u8 (*const gUnknown_0850E028[])(struct MapObject *, struct Sprite *) = { + sub_8094434, + sub_8094398, + sub_80964B8, +}; + +u8 (*const gUnknown_0850E034[])(struct MapObject *, struct Sprite *) = { + sub_8094454, + sub_8094454_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E040[])(struct MapObject *, struct Sprite *) = { + sub_8094494, + sub_8094494_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E04C[])(struct MapObject *, struct Sprite *) = { + sub_80944D4, + sub_80944D4_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E058[])(struct MapObject *, struct Sprite *) = { + sub_8094514, + sub_8094514_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E064[])(struct MapObject *, struct Sprite *) = { + sub_8094600, + sub_80945C4, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E070[])(struct MapObject *, struct Sprite *) = { + sub_8094638, + sub_80945C4, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E07C[])(struct MapObject *, struct Sprite *) = { + sub_8094670, + sub_80945C4, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E088[])(struct MapObject *, struct Sprite *) = { + sub_80946A8, + sub_80945C4, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E094[])(struct MapObject *, struct Sprite *) = { + sub_80946E0, + sub_809459C, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E0A0[])(struct MapObject *, struct Sprite *) = { + sub_8094718, + sub_809459C, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E0AC[])(struct MapObject *, struct Sprite *) = { + sub_8094750, + sub_809459C, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E0B8[])(struct MapObject *, struct Sprite *) = { + sub_8094788, + sub_809459C, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E0C4[])(struct MapObject *, struct Sprite *) = { + sub_80947C0, + sub_809459C, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E0D0[])(struct MapObject *, struct Sprite *) = { + sub_80947F8, + sub_809459C, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E0DC[])(struct MapObject *, struct Sprite *) = { + sub_8094830, + sub_809459C, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E0E8[])(struct MapObject *, struct Sprite *) = { + sub_8094868, + sub_809459C, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E0F4[])(struct MapObject *, struct Sprite *) = { + sub_80948A0, + sub_809459C, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E100[])(struct MapObject *, struct Sprite *) = { + sub_80948D8, + sub_809459C, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E10C[])(struct MapObject *, struct Sprite *) = { + sub_8094910, + sub_809459C, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E118[])(struct MapObject *, struct Sprite *) = { + sub_8094948, + sub_809459C, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E124[])(struct MapObject *, struct Sprite *) = { + sub_8094980, + sub_8094980_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E130[])(struct MapObject *, struct Sprite *) = { + sub_80949C0, + sub_80949C0_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E13C[])(struct MapObject *, struct Sprite *) = { + sub_8094A00, + sub_8094A00_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E148[])(struct MapObject *, struct Sprite *) = { + sub_8094A40, + sub_8094A40_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E154[])(struct MapObject *, struct Sprite *) = { + sub_8094A80, + sub_8094A80_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E160[])(struct MapObject *, struct Sprite *) = { + sub_8094AC0, + sub_8094AC0_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E16C[])(struct MapObject *, struct Sprite *) = { + sub_8094B00, + sub_8094B00_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E178[])(struct MapObject *, struct Sprite *) = { + sub_8094B40, + sub_8094B40_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E184[])(struct MapObject *, struct Sprite *) = { + sub_8094B80, + sub_8094B80_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E190[])(struct MapObject *, struct Sprite *) = { + sub_8094BC0, + sub_8094BC0_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E19C[])(struct MapObject *, struct Sprite *) = { + sub_8094C00, + sub_8094C00_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E1A8[])(struct MapObject *, struct Sprite *) = { + sub_8094C40, + sub_8094C40_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E1B4[])(struct MapObject *, struct Sprite *) = { + sub_8094C80, + sub_8094C80_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E1C0[])(struct MapObject *, struct Sprite *) = { + sub_8094CC0, + sub_8094CC0_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E1CC[])(struct MapObject *, struct Sprite *) = { + sub_8094D00, + sub_8094D00_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E1D8[])(struct MapObject *, struct Sprite *) = { + sub_8094D40, + sub_8094D40_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E1E4[])(struct MapObject *, struct Sprite *) = { + sub_8094DAC, + sub_8094DC4, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E1F0[])(struct MapObject *, struct Sprite *) = { + sub_8094E18, + sub_8094E18_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E1FC[])(struct MapObject *, struct Sprite *) = { + sub_8094E60, + sub_8094E60_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E208[])(struct MapObject *, struct Sprite *) = { + sub_8094EB8, + sub_8094EB8_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E214[])(struct MapObject *, struct Sprite *) = { + sub_8094710, + sub_8094710_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E220[])(struct MapObject *, struct Sprite *) = { + sub_8094F38, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E228[])(struct MapObject *, struct Sprite *) = { + sub_8094F94, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E230[])(struct MapObject *, struct Sprite *) = { + sub_8094FF8, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E238[])(struct MapObject *, struct Sprite *) = { + sub_8095008, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E240[])(struct MapObject *, struct Sprite *) = { + sub_8095018, + sub_8095018_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E24C[])(struct MapObject *, struct Sprite *) = { + sub_8095070, + sub_8095070_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E258[])(struct MapObject *, struct Sprite *) = { + sub_80950C8, + sub_80950C8_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E264[])(struct MapObject *, struct Sprite *) = { + sub_8095120, + sub_8095120_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E270[])(struct MapObject *, struct Sprite *) = { + sub_8095178, + sub_8095178_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E27C[])(struct MapObject *, struct Sprite *) = { + sub_80951D0, + sub_80951D0_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E288[])(struct MapObject *, struct Sprite *) = { + sub_8095228, + sub_8095228_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E294[])(struct MapObject *, struct Sprite *) = { + sub_8095280, + sub_8095280_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E2A0[])(struct MapObject *, struct Sprite *) = { + sub_80952D8, + sub_80952D8_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E2AC[])(struct MapObject *, struct Sprite *) = { + sub_8095330, + sub_8095330_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E2B8[])(struct MapObject *, struct Sprite *) = { + sub_8095388, + sub_8095388_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E2C4[])(struct MapObject *, struct Sprite *) = { + sub_80953E0, + sub_80953E0_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E2D0[])(struct MapObject *, struct Sprite *) = { + sub_8095438, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E2D8[])(struct MapObject *, struct Sprite *) = { + sub_8095450, + sub_8094DC4, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E2E4[])(struct MapObject *, struct Sprite *) = { + sub_8095460, + sub_80964B8, +}; + +u8 (*const gUnknown_0850E2EC[])(struct MapObject *, struct Sprite *) = { + sub_8095470, + sub_80964B8, +}; + +u8 (*const gUnknown_0850E2F4[])(struct MapObject *, struct Sprite *) = { + sub_8095480, + sub_80964B8, +}; + +u8 (*const gUnknown_0850E2FC[])(struct MapObject *, struct Sprite *) = { + sub_8095490, + sub_80964B8, +}; + +u8 (*const gUnknown_0850E304[])(struct MapObject *, struct Sprite *) = { + sub_80954BC, + sub_80964B8, +}; + +u8 (*const gUnknown_0850E30C[])(struct MapObject *, struct Sprite *) = { + sub_80954CC, + sub_80964B8, +}; + +u8 (*const gUnknown_0850E314[])(struct MapObject *, struct Sprite *) = { + do_exclamation_mark_bubble_1, + sub_80964B8, +}; + +u8 (*const gUnknown_0850E31C[])(struct MapObject *, struct Sprite *) = { + do_exclamation_mark_bubble_2, + sub_80964B8, +}; + +u8 (*const gUnknown_0850E324[])(struct MapObject *, struct Sprite *) = { + do_heart_bubble, + sub_80964B8, +}; + +u8 (*const gUnknown_0850E32C[])(struct MapObject *, struct Sprite *) = { + sub_8095548, + sub_809558C, + sub_80964B8, +}; + +u8 (*const gUnknown_0850E338[])(struct MapObject *, struct Sprite *) = { + sub_80955AC, + sub_80955C8, + sub_80955EC, + sub_80964B8, +}; + +u8 (*const gUnknown_0850E348[])(struct MapObject *, struct Sprite *) = { + sub_8095628, + sub_8095644, + sub_8095668, + sub_80964B8, +}; + +u8 (*const gUnknown_0850E358[])(struct MapObject *, struct Sprite *) = { + sub_80956A4, + sub_80964B8, +}; + +u8 (*const gUnknown_0850E360[])(struct MapObject *, struct Sprite *) = { + sub_80956B4, + sub_80964B8, +}; + +u8 (*const gUnknown_0850E368[])(struct MapObject *, struct Sprite *) = { + sub_80956C4, + sub_80964B8, +}; + +u8 (*const gUnknown_0850E370[])(struct MapObject *, struct Sprite *) = { + sub_80956F4, + sub_80964B8, +}; + +u8 (*const gUnknown_0850E378[])(struct MapObject *, struct Sprite *) = { + sub_8095724, + sub_80964B8, +}; + +u8 (*const gUnknown_0850E380[])(struct MapObject *, struct Sprite *) = { + sub_8095730, + sub_80964B8, +}; + +u8 (*const gUnknown_0850E388[])(struct MapObject *, struct Sprite *) = { + sub_8095740, + sub_8095740_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E394[])(struct MapObject *, struct Sprite *) = { + sub_80957A0, + sub_80957A0_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E3A0[])(struct MapObject *, struct Sprite *) = { + sub_8095800, + sub_8095800_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E3AC[])(struct MapObject *, struct Sprite *) = { + sub_8095860, + sub_8095860_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E3B8[])(struct MapObject *, struct Sprite *) = { + sub_8095900, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E3C0[])(struct MapObject *, struct Sprite *) = { + sub_8095910, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E3C8[])(struct MapObject *, struct Sprite *) = { + sub_8095920, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E3D0[])(struct MapObject *, struct Sprite *) = { + sub_8095930, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E3D8[])(struct MapObject *, struct Sprite *) = { + sub_8095940, + sub_8094DC4, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E3E4[])(struct MapObject *, struct Sprite *) = { + sub_8095964, + sub_8094DC4, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E3F0[])(struct MapObject *, struct Sprite *) = { + sub_8095988, + sub_8094DC4, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E3FC[])(struct MapObject *, struct Sprite *) = { + sub_80959AC, + sub_8094DC4, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E408[])(struct MapObject *, struct Sprite *) = { + sub_80959D0, + sub_8094DC4, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E414[])(struct MapObject *, struct Sprite *) = { + sub_80959F4, + sub_8094DC4, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E420[])(struct MapObject *, struct Sprite *) = { + sub_8095A18, + sub_8094DC4, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E42C[])(struct MapObject *, struct Sprite *) = { + sub_8095A3C, + sub_8094DC4, + sub_80964BC, + sub_8095A60, + sub_8094DC4, + sub_80964BC, + sub_8095A84, + sub_8094DC4, + sub_80964BC, + sub_8095AA8, + sub_8094DC4, + sub_80964BC, + sub_8095ACC, + sub_8094DC4, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E468[])(struct MapObject *, struct Sprite *) = { + sub_8095B44, + sub_8095B64, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E474[])(struct MapObject *, struct Sprite *) = { + sub_8095BC8, + sub_8095BC8_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E480[])(struct MapObject *, struct Sprite *) = { + sub_8095C20, + sub_8095C20_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E48C[])(struct MapObject *, struct Sprite *) = { + sub_8095C78, + sub_8095C78_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E498[])(struct MapObject *, struct Sprite *) = { + sub_8095CD0, + sub_8095CD0_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E4A4[])(struct MapObject *, struct Sprite *) = { + sub_8095D28, + sub_8095D28_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E4B0[])(struct MapObject *, struct Sprite *) = { + sub_8095D80, + sub_8095D80_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E4BC[])(struct MapObject *, struct Sprite *) = { + sub_8095DD8, + sub_8095DD8_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E4C8[])(struct MapObject *, struct Sprite *) = { + sub_8095E30, + sub_8095E30_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E4D4[])(struct MapObject *, struct Sprite *) = { + sub_8095E88, + sub_8095E88_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E4E0[])(struct MapObject *, struct Sprite *) = { + sub_8095EE0, + sub_8095EE0_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E4EC[])(struct MapObject *, struct Sprite *) = { + sub_8095F38, + sub_8095F38_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E4F8[])(struct MapObject *, struct Sprite *) = { + sub_8095F90, + sub_8095F90_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E504[])(struct MapObject *, struct Sprite *) = { + sub_8095FE8, + sub_809459C, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E510[])(struct MapObject *, struct Sprite *) = { + sub_8096020, + sub_809459C, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E51C[])(struct MapObject *, struct Sprite *) = { + sub_8096058, + sub_809459C, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E528[])(struct MapObject *, struct Sprite *) = { + sub_8096090, + sub_809459C, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E534[])(struct MapObject *, struct Sprite *) = { + sub_8096100, + sub_8096100_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E540[])(struct MapObject *, struct Sprite *) = { + sub_8096140, + sub_8096140_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E54C[])(struct MapObject *, struct Sprite *) = { + sub_8096180, + sub_8096180_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E558[])(struct MapObject *, struct Sprite *) = { + sub_80961C0, + sub_80961C0_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E564[])(struct MapObject *, struct Sprite *) = { + sub_8096230, + sub_8096230_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E570[])(struct MapObject *, struct Sprite *) = { + sub_8096270, + sub_8096270_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E57C[])(struct MapObject *, struct Sprite *) = { + sub_80962B0, + sub_80962B0_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E588[])(struct MapObject *, struct Sprite *) = { + sub_80962F0, + sub_80962F0_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E594[])(struct MapObject *, struct Sprite *) = { + sub_8096368, + sub_8096368_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E5A0[])(struct MapObject *, struct Sprite *) = { + sub_80963A8, + sub_80963A8_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E5AC[])(struct MapObject *, struct Sprite *) = { + sub_80963E8, + sub_80963E8_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E5B8[])(struct MapObject *, struct Sprite *) = { + sub_8096428, + sub_8096428_2, + sub_80964BC, +}; + +u8 (*const gUnknown_0850E5C4[])(struct MapObject *, struct Sprite *) = { + sub_8096468, + sub_80964B8, +}; + +u8 (*const gUnknown_0850E5CC[])(struct MapObject *, struct Sprite *) = { + sub_809647C, + sub_80964B8, +}; + +u8 (*const gUnknown_0850E5D4[])(struct MapObject *, struct Sprite *) = { + sub_8096494, + sub_80964B8, +}; + +#endif //GUARD_MOVEMENT_ACTION_FUNC_TABLES_H diff --git a/src/data/field_event_obj/movement_type_func_tables.h b/src/data/field_event_obj/movement_type_func_tables.h new file mode 100755 index 0000000000..3334c4b5e7 --- /dev/null +++ b/src/data/field_event_obj/movement_type_func_tables.h @@ -0,0 +1,443 @@ +#ifndef GUARD_MOVEMENT_TYPE_FUNC_TABLES_H +#define GUARD_MOVEMENT_TYPE_FUNC_TABLES_H + +u8 (*const gUnknown_0850D6F4[])(struct MapObject *, struct Sprite *) = { + sub_808F44C, + sub_808F460, + sub_808F48C, + sub_808F4C8, + sub_808F4E8, + sub_808F534, + sub_808F564, +}; + +const u8 gUnknown_0850D710[] = {DIR_SOUTH, DIR_NORTH, DIR_WEST, DIR_EAST}; + +u8 (*const gUnknown_0850D714[])(s16, s16, s16, s16) = { + GetRegularRunningPastFacingDirection, + GetNorthSouthRunningPastFacingDirection, + GetEastWestRunningPastFacingDirection, + GetNorthEastRunningPastFacingDirection, + GetNorthWestRunningPastFacingDirection, + GetSouthEastRunningPastFacingDirection, + GetSouthWestRunningPastFacingDirection, + GetNonEastRunningPastFacingDirection, + GetNonWestRunningPastFacingDirection, + GetNonSouthRunningPastFacingDirection, + GetNonNorthRunningPastFacingDirection, +}; + +u8 (*const gUnknown_0850D740[])(struct MapObject *, struct Sprite *) = { + sub_808F988, + sub_808F99C, + sub_808F9C8, + sub_808FA0C, + sub_808FA3C, +}; + +u8 (*const gUnknown_0850D754[])(struct MapObject *, struct Sprite *) = { + sub_808FAC8, + sub_808FADC, + sub_808FB08, + sub_808FB44, + sub_808FB64, + sub_808FBB0, + sub_808FBE0, +}; + +const u8 gUnknown_0850D770[] = {DIR_SOUTH, DIR_NORTH}; + +u8 (*const gUnknown_0850D774[])(struct MapObject *, struct Sprite *) = { + sub_808FC4C, + sub_808FC60, + sub_808FC8C, + sub_808FCC8, + sub_808FCE8, + sub_808FD34, + sub_808FD64, +}; + +const u8 gUnknown_0850D790[] = {DIR_WEST, DIR_EAST}; + +u8 (*const gUnknown_0850D794[])(struct MapObject *, struct Sprite *) = { + sub_808FDD0, + sub_808FDFC, + sub_808FE1C, +}; + +u8 (*const gUnknown_0850D7A0[])(struct MapObject *, struct Sprite *) = { + do_berry_tree_growth_sparkle_1, + sub_808FF48, + do_berry_tree_growth_sparkle_2, + sub_808FFB4, + sub_8090004, +}; + +u8 (*const gUnknown_0850D7B4[])(struct MapObject *, struct Sprite *) = { + sub_8090094, + sub_80900A8, + sub_80900D4, + sub_8090118, + sub_8090148, +}; + +u8 (*const gUnknown_0850D7C8[])(struct MapObject *, struct Sprite *) = { + sub_80901D4, + sub_80901E8, + sub_8090214, + sub_8090258, + sub_8090288, +}; + +u8 (*const gUnknown_0850D7DC[])(struct MapObject *, struct Sprite *) = { + sub_8090314, + sub_8090328, + sub_8090354, + sub_8090398, + sub_80903C8, +}; + +const u8 gUnknown_0850D7F0[] = {DIR_NORTH, DIR_WEST}; + +u8 (*const gUnknown_0850D7F4[])(struct MapObject *, struct Sprite *) = { + sub_8090454, + sub_8090468, + sub_8090494, + sub_80904D8, + sub_8090508, +}; + +const u8 gUnknown_0850D808[] = {DIR_NORTH, DIR_EAST}; + +u8 (*const gUnknown_0850D80C[])(struct MapObject *, struct Sprite *) = { + sub_8090594, + sub_80905A8, + sub_80905D4, + sub_8090618, + sub_8090648, +}; + +const u8 gUnknown_0850D820[] = {DIR_SOUTH, DIR_WEST}; + +u8 (*const gUnknown_0850D824[])(struct MapObject *, struct Sprite *) = { + sub_80906D4, + sub_80906E8, + sub_8090714, + sub_8090758, + sub_8090788, +}; + +const u8 gUnknown_0850D838[] = {DIR_SOUTH, DIR_EAST}; + +u8 (*const gUnknown_0850D83C[])(struct MapObject *, struct Sprite *) = { + sub_8090814, + sub_8090828, + sub_8090854, + sub_8090898, + sub_80908C8, +}; + +const u8 gUnknown_0850D850[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_SOUTH}; + +u8 (*const gUnknown_0850D854[])(struct MapObject *, struct Sprite *) = { + sub_8090954, + sub_8090968, + sub_8090994, + sub_80909D8, + sub_8090A08, +}; + +const u8 gUnknown_0850D868[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_SOUTH}; + +u8 (*const gUnknown_0850D86C[])(struct MapObject *, struct Sprite *) = { + sub_8090A94, + sub_8090AA8, + sub_8090AD4, + sub_8090B18, + sub_8090B48, +}; + +const u8 gUnknown_0850D880[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_NORTH}; + +u8 (*const gUnknown_0850D884[])(struct MapObject *, struct Sprite *) = { + sub_8090BD4, + sub_8090BE8, + sub_8090C14, + sub_8090C58, + sub_8090C88, +}; + +const u8 gUnknown_0850D898[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_SOUTH}; + +u8 (*const gUnknown_0850D89C[])(struct MapObject *, struct Sprite *) = { + sub_8090D14, + sub_8090D40, + sub_8090D64, + sub_8090D90, +}; + +const u8 gUnknown_0850D8AC[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH}; + +u8 (*const gUnknown_0850D8B4[])(struct MapObject *, struct Sprite *) = { + sub_8090E18, + sub_8090E44, + sub_8090E68, + sub_8090E94, +}; + +const u8 gUnknown_0850D8C4[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; + +u8 (*const gUnknown_0850D8CC[])(struct MapObject *, struct Sprite *) = { + sub_8090F1C, + sub_8090F30, + sub_8090F68, + sub_8091020, +}; + +u8 (*const gUnknown_0850D8DC[])(struct MapObject *, struct Sprite *) = { + sub_8091048, + sub_809117C, + sub_8091110, +}; + +const u8 gUnknown_0850D8E8[] = {DIR_NORTH, DIR_EAST, DIR_WEST, DIR_SOUTH}; + +u8 (*const gUnknown_0850D8EC[])(struct MapObject *, struct Sprite *) = { + sub_8091048, + sub_8091208, + sub_8091110, +}; + +const u8 gUnknown_0850D8F8[] = {DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH}; + +u8 (*const gUnknown_0850D8FC[])(struct MapObject *, struct Sprite *) = { + sub_8091048, + sub_8091294, + sub_8091110, +}; + +const u8 gUnknown_0850D908[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_WEST}; + +u8 (*const gUnknown_0850D90C[])(struct MapObject *, struct Sprite *) = { + sub_8091048, + sub_8091320, + sub_8091110, +}; + +const u8 gUnknown_0850D918[] = {DIR_WEST, DIR_SOUTH, DIR_NORTH, DIR_EAST}; + +u8 (*const gUnknown_0850D91C[])(struct MapObject *, struct Sprite *) = { + sub_8091048, + sub_80913AC, + sub_8091110, +}; + +const u8 gUnknown_0850D928[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_SOUTH}; + +u8 (*const gUnknown_0850D92C[])(struct MapObject *, struct Sprite *) = { + sub_8091048, + sub_8091438, + sub_8091110, +}; + +const u8 gUnknown_0850D938[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_NORTH}; + +u8 (*const gUnknown_0850D93C[])(struct MapObject *, struct Sprite *) = { + sub_8091048, + sub_80914C4, + sub_8091110, +}; + +u8 (*const gUnknown_0850D948[])(struct MapObject *, struct Sprite *) = { + sub_8091048, + sub_8091550, + sub_8091110, +}; + +const u8 gUnknown_0850D954[] = {DIR_EAST, DIR_SOUTH, DIR_NORTH, DIR_WEST}; + +u8 (*const gUnknown_0850D958[])(struct MapObject *, struct Sprite *) = { + sub_8091048, + sub_80915DC, + sub_8091110, +}; + +const u8 gUnknown_0850D964[] = {DIR_WEST, DIR_NORTH, DIR_SOUTH, DIR_EAST}; + +u8 (*const gUnknown_0850D968[])(struct MapObject *, struct Sprite *) = { + sub_8091048, + sub_8091668, + sub_8091110, +}; + +const u8 gUnknown_0850D974[] = {DIR_NORTH, DIR_SOUTH, DIR_EAST, DIR_WEST}; + +u8 (*const gUnknown_0850D978[])(struct MapObject *, struct Sprite *) = { + sub_8091048, + sub_80916F4, + sub_8091110, +}; + +const u8 gUnknown_0850D984[] = {DIR_EAST, DIR_WEST, DIR_NORTH, DIR_SOUTH}; + +u8 (*const gUnknown_0850D988[])(struct MapObject *, struct Sprite *) = { + sub_8091048, + sub_8091780, + sub_8091110, +}; + +const u8 gUnknown_0850D994[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_NORTH}; + +u8 (*const gUnknown_0850D998[])(struct MapObject *, struct Sprite *) = { + sub_8091048, + sub_809180C, + sub_8091110, +}; + +const u8 gUnknown_0850D9A4[] = {DIR_EAST, DIR_NORTH, DIR_SOUTH, DIR_WEST}; + +u8 (*const gUnknown_0850D9A8[])(struct MapObject *, struct Sprite *) = { + sub_8091048, + sub_8091898, + sub_8091110, +}; + +const u8 gUnknown_0850D9B4[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST}; + +u8 (*const gUnknown_0850D9B8[])(struct MapObject *, struct Sprite *) = { + sub_8091048, + sub_8091924, + sub_8091110, +}; + +const u8 gUnknown_0850D9C4[] = {DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; + +u8 (*const gUnknown_0850D9C8[])(struct MapObject *, struct Sprite *) = { + sub_8091048, + sub_80919B0, + sub_8091110, +}; + +const u8 gUnknown_0850D9D4[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH}; + +u8 (*const gUnknown_0850D9D8[])(struct MapObject *, struct Sprite *) = { + sub_8091048, + sub_8091A3C, + sub_8091110, +}; + +const u8 gUnknown_0850D9E4[] = {DIR_NORTH, DIR_WEST, DIR_SOUTH, DIR_EAST}; + +u8 (*const gUnknown_0850D9E8[])(struct MapObject *, struct Sprite *) = { + sub_8091048, + sub_8091AC8, + sub_8091110, +}; + +const u8 gUnknown_0850D9F4[] = {DIR_SOUTH, DIR_EAST, DIR_NORTH, DIR_WEST}; + +u8 (*const gUnknown_0850D9F8[])(struct MapObject *, struct Sprite *) = { + sub_8091048, + sub_8091B54, + sub_8091110, +}; + +const u8 gUnknown_0850DA04[] = {DIR_WEST, DIR_SOUTH, DIR_EAST, DIR_NORTH}; + +u8 (*const gUnknown_0850DA08[])(struct MapObject *, struct Sprite *) = { + sub_8091048, + sub_8091BE0, + sub_8091110, +}; + +const u8 gUnknown_0850DA14[] = {DIR_EAST, DIR_NORTH, DIR_WEST, DIR_SOUTH}; + +u8 (*const gUnknown_0850DA18[])(struct MapObject *, struct Sprite *) = { + sub_8091048, + sub_8091C6C, + sub_8091110, +}; + +const u8 gUnknown_0850DA24[] = {DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WEST}; + +u8 (*const gUnknown_0850DA28[])(struct MapObject *, struct Sprite *) = { + sub_8091048, + sub_8091CF8, + sub_8091110, +}; + +const u8 gUnknown_0850DA34[] = {DIR_SOUTH, DIR_WEST, DIR_NORTH, DIR_EAST}; + +u8 (*const gUnknown_0850DA38[])(struct MapObject *, struct Sprite *) = { + sub_8091048, + sub_8091D84, + sub_8091110, +}; + +const u8 gUnknown_0850DA44[] = {DIR_WEST, DIR_NORTH, DIR_EAST, DIR_SOUTH}; + +u8 (*const gUnknown_0850DA48[])(struct MapObject *, struct Sprite *) = { + sub_8091048, + sub_8091E10, + sub_8091110, +}; + +const u8 gUnknown_0850DA54[] = {DIR_EAST, DIR_SOUTH, DIR_WEST, DIR_NORTH}; + +u8 (*const gUnknown_0850DA58[])(struct MapObject *, struct Sprite *) = { + mss_npc_reset_oampriv3_1_unk2_unk3, + sub_8091EC0, + sub_8091F20, +}; + +bool8 (*const gUnknown_0850DA64[])(struct MapObject *, struct Sprite *, u8, bool8(u8)) = { + sub_8091F48, + sub_8091F4C, + sub_8091F94, + sub_80920A4, + sub_809215C, + sub_8092214, + cph_IM_DIFFERENT, + sub_8092314, + oac_hopping, + sub_8091F48, + sub_8091F48, +}; + +u8 (*const gUnknown_0850DA90[])(struct MapObject *, struct Sprite *) = { + mss_npc_reset_oampriv3_1_unk2_unk3, + mss_08062EA4, + sub_8091F20, +}; + +u8 (*const gUnknown_0850DA9C[])(struct MapObject *, struct Sprite *) = { + sub_80926AC, +}; + +u8 (*const gUnknown_0850DAA0[])(struct MapObject *, struct Sprite *) = { + sub_8092718, + sub_80926B8, +}; + +u8 (*const gUnknown_0850DAA8[])(struct MapObject *, struct Sprite *) = { + sub_8092788, + sub_80926B8, +}; + +u8 (*const gUnknown_0850DAB0[])(struct MapObject *, struct Sprite *) = { + sub_80927F8, + sub_80926B8, +}; + +u8 (*const gUnknown_0850DAB8[])(struct MapObject *, struct Sprite *) = { + sub_8092868, + sub_80926B8, +}; + +u8 (*const gUnknown_0850DAC0[])(struct MapObject *, struct Sprite *) = { + sub_80928D8, + sub_809290C, + sub_809292C, +}; + +#endif //GUARD_MOVEMENT_TYPE_FUNC_TABLES_H diff --git a/src/event_object_movement.c b/src/event_object_movement.c index a935f20d6b..9943dd578c 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -13,7 +13,6 @@ #include "event_data.h" #include "rom_818CFC8.h" #include "rom_81BE66C.h" -#include "event_object_movement_helpers.h" #include "mauville_old_man.h" #include "metatile_behavior.h" #include "field_effect.h" @@ -24,6 +23,7 @@ #include "event_object_movement.h" #include "pokenav.h" #include "util.h" +#include "constants/map_objects.h" #define NUM_FIELD_MAP_OBJECT_TEMPLATES 0x51 @@ -70,6 +70,7 @@ bool8 sub(struct MapObject *mapObject, struct Sprite *sprite)\ extern u8 gUnknown_020375B4; extern u16 gUnknown_020375B6; +extern u8 *gUnknown_020375B8; // Static ROM declarations @@ -93,9 +94,10 @@ static u8 sub_808E8F4(const struct SpritePalette *); static u8 FindFieldObjectPaletteIndexByTag(u16); static void sub_808EAB0(u16, u8); static bool8 FieldObjectDoesZCoordMatch(struct MapObject *, u8); -//static void CameraObject_0(struct Sprite *); -/*static*/ void CameraObject_1(struct Sprite *); -//static void CameraObject_2(struct Sprite *); +static void ObjectCB_CameraObject(struct Sprite *); +static void CameraObject_0(struct Sprite *); +static void CameraObject_1(struct Sprite *); +static void CameraObject_2(struct Sprite *); /*static*/ struct MapObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 localId, struct MapObjectTemplate *templates, u8 count); void npc_reset(struct MapObject *, struct Sprite *); void FieldObjectSetRegularAnim(struct MapObject *, struct Sprite *, u8); @@ -129,52 +131,11 @@ static void npc_update_obj_anim_flag(struct MapObject *, struct Sprite *); // ROM data -extern void (*const gUnknown_08505438[NUM_FIELD_MAP_OBJECT_TEMPLATES])(struct Sprite *); -extern const u8 gRangedMovementTypes[NUM_FIELD_MAP_OBJECT_TEMPLATES]; -extern const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLATES]; -extern const struct MapObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[7]; -extern const struct MapObjectGraphicsInfo *const gFieldObjectGraphicsInfoPointers[0xEF]; -extern u8 (*const gUnknown_0850D714[11])(s16, s16, s16, s16); - struct PairedPalettes { u16 tag; const u16 *data; }; -extern const u8 gUnknown_084975C4[0x10]; -extern const struct SpriteTemplate gUnknown_084975D4; -extern void (*const gUnknown_084975EC[3])(struct Sprite *); -extern const struct SpritePalette gUnknown_0850BBC8[39]; -extern const struct PairedPalettes gUnknown_0850BD00[4]; -extern const struct PairedPalettes gUnknown_0850BD78[14]; -extern const u16 *const gUnknown_0850BE38[2]; -extern const s16 gUnknown_0850D6DC[4]; // {0x20, 0x40, 0x60, 0x80} -extern const s16 gUnknown_0850D6EC[4]; -extern const u8 gUnknown_0850D710[4]; // {DIR_SOUTH, DIR_NORTH, DIR_WEST, DIR_EAST} -extern const u8 gUnknown_0850D770[2]; // {DIR_SOUTH, DIR_NORTH} -extern const u8 gUnknown_0850D790[2]; // {DIR_WEST, DIR_EAST} -extern const u8 gUnknown_0850D7F0[2]; // {DIR_NORTH, DIR_WEST} -extern const u8 gUnknown_0850D808[2]; // {DIR_NORTH, DIR_EAST} -extern const u8 gUnknown_0850D820[2]; // {DIR_SOUTH, DIR_WEST} -extern const u8 gUnknown_0850D838[2]; // {DIR_SOUTH, DIR_EAST} -extern const u8 gUnknown_0850D850[4]; -extern const u8 gUnknown_0850D868[4]; -extern const u8 gUnknown_0850D880[4]; -extern const u8 gUnknown_0850D898[4]; -extern const u8 gUnknown_0850D8AC[5]; -extern const u8 gUnknown_0850D8C4[5]; -extern const u8 gUnknown_0850D8E8[4]; -extern bool8 (*const gUnknown_0850DA64[11])(struct MapObject *, struct Sprite *, u8, bool8(u8)); -extern bool8 (*const gUnknown_0850DB5C[4])(u8); -extern bool8 (*const gUnknown_0850DB6C[4])(u8); -extern const struct Coords16 gUnknown_0850DB7C[4]; -extern const u8 gUnknown_0850DC2F[4][4]; -extern const u8 gUnknown_0850DC3F[4][4]; -extern const u8 gUnknown_0850DBA0[5]; -extern bool8 (*const *const gUnknown_0850DC50[166])(struct MapObject *, struct Sprite *); -extern u8 (*const gUnknown_0850DEE8[5])(u8); -extern const s16 gUnknown_0850DFBC[3]; -extern const s16 gUnknown_0850DFC2[3]; typedef void (*SpriteStepFunc)(struct Sprite *sprite, u8 dir); @@ -189,35 +150,998 @@ extern s16 gUnknown_0850E84A[]; extern u8 gUnknown_0850E850[]; static void FieldObjectUpdateMetatileBehaviors(struct MapObject*); -/*static*/ void GetAllGroundEffectFlags_OnBeginStep(struct MapObject*, u32*); -/*static*/ void GetGroundEffectFlags_Reflection(struct MapObject*, u32*); -/*static*/ void GetGroundEffectFlags_TallGrassOnSpawn(struct MapObject*, u32*); -/*static*/ void GetGroundEffectFlags_LongGrassOnSpawn(struct MapObject*, u32*); -/*static*/ void GetGroundEffectFlags_SandHeap(struct MapObject*, u32*); -/*static*/ void GetGroundEffectFlags_ShallowFlowingWater(struct MapObject*, u32*); -/*static*/ void GetGroundEffectFlags_ShortGrass(struct MapObject*, u32*); -/*static*/ void GetGroundEffectFlags_HotSprings(struct MapObject*, u32*); -/*static*/ void GetGroundEffectFlags_TallGrassOnBeginStep(struct MapObject*, u32*); -/*static*/ void GetGroundEffectFlags_LongGrassOnBeginStep(struct MapObject*, u32*); -/*static*/ void GetGroundEffectFlags_Tracks(struct MapObject*, u32*); -/*static*/ void GetGroundEffectFlags_Puddle(struct MapObject*, u32*); -/*static*/ void GetGroundEffectFlags_Ripple(struct MapObject*, u32*); -/*static*/ void GetGroundEffectFlags_Seaweed(struct MapObject*, u32*); -/*static*/ void GetGroundEffectFlags_JumpLanding(struct MapObject*, u32*); -/*static*/ u8 FieldObjectCheckForReflectiveSurface(struct MapObject*); +static void GetGroundEffectFlags_Reflection(struct MapObject*, u32*); +static void GetGroundEffectFlags_TallGrassOnSpawn(struct MapObject*, u32*); +static void GetGroundEffectFlags_LongGrassOnSpawn(struct MapObject*, u32*); +static void GetGroundEffectFlags_SandHeap(struct MapObject*, u32*); +static void GetGroundEffectFlags_ShallowFlowingWater(struct MapObject*, u32*); +static void GetGroundEffectFlags_ShortGrass(struct MapObject*, u32*); +static void GetGroundEffectFlags_HotSprings(struct MapObject*, u32*); +static void GetGroundEffectFlags_TallGrassOnBeginStep(struct MapObject*, u32*); +static void GetGroundEffectFlags_LongGrassOnBeginStep(struct MapObject*, u32*); +static void GetGroundEffectFlags_Tracks(struct MapObject*, u32*); +static void GetGroundEffectFlags_Puddle(struct MapObject*, u32*); +static void GetGroundEffectFlags_Ripple(struct MapObject*, u32*); +static void GetGroundEffectFlags_Seaweed(struct MapObject*, u32*); +static void GetGroundEffectFlags_JumpLanding(struct MapObject*, u32*); +static u8 FieldObjectCheckForReflectiveSurface(struct MapObject*); static u8 GetReflectionTypeByMetatileBehavior(u32); static void InitObjectPriorityByZCoord(struct Sprite *sprite, u8 z); static void FieldObjectUpdateSubpriority(struct MapObject*, struct Sprite*); static void DoTracksGroundEffect_None(struct MapObject*, struct Sprite*, u8); static void DoTracksGroundEffect_Footprints(struct MapObject*, struct Sprite*, u8); static void DoTracksGroundEffect_BikeTireTracks(struct MapObject*, struct Sprite*, u8); -/*static*/ void DoRippleFieldEffect(struct MapObject*, struct Sprite*); +static void DoRippleFieldEffect(struct MapObject*, struct Sprite*); static void DoGroundEffects_OnSpawn(struct MapObject*, struct Sprite*); static void DoGroundEffects_OnBeginStep(struct MapObject*, struct Sprite*); static void DoGroundEffects_OnFinishStep(struct MapObject*, struct Sprite*); static void sub_8097D68(struct Sprite*); static void sub_8097FE4(u8); +const u8 gUnknown_084975C4[] = {1, 1, 6, 7, 8, 9, 6, 7, 8, 9, 11, 11, 0, 0, 0, 0}; + +const struct SpriteTemplate gCameraSpriteTemplate = {0, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject}; + +void (*const gCameraObjectFuncs[])(struct Sprite *) = { + CameraObject_0, + CameraObject_1, + CameraObject_2, +}; + +#include "data/field_event_obj/event_object_graphics.h" + +// movement type callbacks +void (*const gUnknown_08505438[])(struct Sprite *) = +{ + FieldObjectCB_NoMovement1, + FieldObjectCB_LookRandomDirections, + FieldObjectCB_GoRandomDirections, + FieldObjectCB_RandomlyGoNorthOrSouth, + FieldObjectCB_RandomlyGoNorthOrSouth, + FieldObjectCB_RandomlyGoEastOrWest, + FieldObjectCB_RandomlyGoEastOrWest, + FieldObjectCB_FaceFixedDirection, + FieldObjectCB_FaceFixedDirection, + FieldObjectCB_FaceFixedDirection, + FieldObjectCB_FaceFixedDirection, + FieldObjectCB_NoMovement2, + FieldObjectCB_BerryTree, + FieldObjectCB_RandomlyLookNorthOrSouth, + FieldObjectCB_RandomlyLookEastOrWest, + FieldObjectCB_RandomlyLookNorthOrWest, + FieldObjectCB_RandomlyLookNorthOrEast, + FieldObjectCB_RandomlyLookSouthOrWest, + FieldObjectCB_RandomlyLookSouthOrEast, + FieldObjectCB_RandomlyLookNorthOrSouthOrWest, + FieldObjectCB_RandomlyLookNorthOrSouthOrEast, + FieldObjectCB_RandomlyLookNorthOrEastOrWest, + FieldObjectCB_RandomlyLookSouthOrEastOrWest, + FieldObjectCB_LookAroundCounterclockwise, + FieldObjectCB_LookAroundClockwise, + FieldObjectCB_AlternatelyGoInOppositeDirections, + FieldObjectCB_AlternatelyGoInOppositeDirections, + FieldObjectCB_AlternatelyGoInOppositeDirections, + FieldObjectCB_AlternatelyGoInOppositeDirections, + FieldObjectCB_GoInDirectionSequence1, + FieldObjectCB_GoInDirectionSequence2, + FieldObjectCB_GoInDirectionSequence3, + FieldObjectCB_GoInDirectionSequence4, + FieldObjectCB_GoInDirectionSequence5, + FieldObjectCB_GoInDirectionSequence6, + FieldObjectCB_GoInDirectionSequence7, + FieldObjectCB_GoInDirectionSequence8, + FieldObjectCB_GoInDirectionSequence9, + FieldObjectCB_GoInDirectionSequence10, + FieldObjectCB_GoInDirectionSequence11, + FieldObjectCB_GoInDirectionSequence12, + FieldObjectCB_GoInDirectionSequence13, + FieldObjectCB_GoInDirectionSequence14, + FieldObjectCB_GoInDirectionSequence15, + FieldObjectCB_GoInDirectionSequence16, + FieldObjectCB_GoInDirectionSequence17, + FieldObjectCB_GoInDirectionSequence18, + FieldObjectCB_GoInDirectionSequence19, + FieldObjectCB_GoInDirectionSequence20, + FieldObjectCB_GoInDirectionSequence21, + FieldObjectCB_GoInDirectionSequence22, + FieldObjectCB_GoInDirectionSequence23, + FieldObjectCB_GoInDirectionSequence24, + FieldObjectCB_CopyPlayer1, + FieldObjectCB_CopyPlayer1, + FieldObjectCB_CopyPlayer1, + FieldObjectCB_CopyPlayer1, + FieldObjectCB_TreeDisguise, + FieldObjectCB_MountainDisguise, + FieldObjectCB_CopyPlayer2, + FieldObjectCB_CopyPlayer2, + FieldObjectCB_CopyPlayer2, + FieldObjectCB_CopyPlayer2, + FieldObjectCB_Hidden1, + FieldObjectCB_WalkInPlace1, + FieldObjectCB_WalkInPlace1, + FieldObjectCB_WalkInPlace1, + FieldObjectCB_WalkInPlace1, + FieldObjectCB_WalkInPlace2, + FieldObjectCB_WalkInPlace2, + FieldObjectCB_WalkInPlace2, + FieldObjectCB_WalkInPlace2, + FieldObjectCB_WalkInPlace3, + FieldObjectCB_WalkInPlace3, + FieldObjectCB_WalkInPlace3, + FieldObjectCB_WalkInPlace3, + FieldObjectCB_Hidden2, + FieldObjectCB_WalkInPlace4, + FieldObjectCB_WalkInPlace4, + FieldObjectCB_WalkInPlace4, + FieldObjectCB_WalkInPlace4, +}; + +const u8 gRangedMovementTypes[] = { + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, +}; + +const u8 gInitialMovementTypeFacingDirections[] = { + DIR_SOUTH, + DIR_SOUTH, + DIR_SOUTH, + DIR_NORTH, + DIR_SOUTH, + DIR_WEST, + DIR_EAST, + DIR_NORTH, + DIR_SOUTH, + DIR_WEST, + DIR_EAST, + DIR_SOUTH, + DIR_SOUTH, + DIR_SOUTH, + DIR_WEST, + DIR_NORTH, + DIR_NORTH, + DIR_SOUTH, + DIR_SOUTH, + DIR_SOUTH, + DIR_SOUTH, + DIR_NORTH, + DIR_SOUTH, + DIR_SOUTH, + DIR_SOUTH, + DIR_NORTH, + DIR_SOUTH, + DIR_WEST, + DIR_EAST, + DIR_NORTH, + DIR_EAST, + DIR_SOUTH, + DIR_WEST, + DIR_NORTH, + DIR_WEST, + DIR_SOUTH, + DIR_EAST, + DIR_WEST, + DIR_NORTH, + DIR_EAST, + DIR_SOUTH, + DIR_EAST, + DIR_NORTH, + DIR_WEST, + DIR_SOUTH, + DIR_NORTH, + DIR_SOUTH, + DIR_WEST, + DIR_EAST, + DIR_NORTH, + DIR_SOUTH, + DIR_WEST, + DIR_EAST, + DIR_NORTH, + DIR_SOUTH, + DIR_WEST, + DIR_EAST, + DIR_SOUTH, + DIR_SOUTH, + DIR_NORTH, + DIR_SOUTH, + DIR_WEST, + DIR_EAST, + DIR_SOUTH, + DIR_SOUTH, + DIR_NORTH, + DIR_WEST, + DIR_EAST, + DIR_SOUTH, + DIR_NORTH, + DIR_WEST, + DIR_EAST, + DIR_SOUTH, + DIR_NORTH, + DIR_WEST, + DIR_EAST, + DIR_SOUTH, + DIR_SOUTH, + DIR_NORTH, + DIR_WEST, + DIR_EAST, +}; + +#include "data/field_event_obj/event_object_graphics_info_pointers.h" +#include "data/field_event_obj/field_effect_object_template_pointers.h" +#include "data/field_event_obj/event_object_pic_tables.h" +#include "data/field_event_obj/event_object_anims.h" +#include "data/field_event_obj/base_oam.h" +#include "data/field_event_obj/event_object_subsprites.h" +#include "data/field_event_obj/event_object_graphics_info.h" + +const struct SpritePalette gUnknown_0850BBC8[] = { + {gFieldObjectPalette0, 0x1103}, + {gFieldObjectPalette1, 0x1104}, + {gFieldObjectPalette2, 0x1105}, + {gFieldObjectPalette3, 0x1106}, + {gFieldObjectPalette4, 0x1107}, + {gFieldObjectPalette5, 0x1108}, + {gFieldObjectPalette6, 0x1109}, + {gFieldObjectPalette7, 0x110A}, + {gFieldObjectPalette8, 0x1100}, + {gFieldObjectPalette9, 0x1101}, + {gFieldObjectPalette10, 0x1102}, + {gFieldObjectPalette11, 0x1115}, + {gFieldObjectPalette12, 0x110B}, + {gFieldObjectPalette13, 0x110C}, + {gFieldObjectPalette14, 0x110D}, + {gFieldObjectPalette15, 0x110E}, + {gFieldObjectPalette16, 0x110F}, + {gFieldObjectPalette17, 0x1110}, + {gFieldObjectPalette18, 0x1111}, + {gFieldObjectPalette19, 0x1112}, + {gFieldObjectPalette20, 0x1113}, + {gFieldObjectPalette21, 0x1114}, + {gFieldObjectPalette22, 0x1116}, + {gFieldObjectPalette23, 0x1117}, + {gFieldObjectPalette24, 0x1118}, + {gFieldObjectPalette25, 0x1119}, + {gFieldObjectPalette26, 0x111B}, + {gFieldObjectPalette27, 0x111C}, + {gFieldObjectPalette28, 0x111D}, + {gFieldObjectPalette29, 0x111E}, + {gFieldObjectPalette30, 0x111F}, + {gFieldObjectPalette31, 0x1120}, + {gFieldObjectPalette32, 0x1121}, + {gFieldObjectPalette33, 0x1122}, + {gFieldObjectPalette34, 0x1123}, + {NULL, 0x0000}, +}; + +const u16 Unknown_0850BCE8[] = { + 0x1101, + 0x1101, + 0x1101, + 0x1101, +}; + +const u16 Unknown_0850BCF0[] = { + 0x1111, + 0x1111, + 0x1111, + 0x1111, +}; + +const u16 Unknown_0850BCF8[] = { + 0x1115, + 0x1115, + 0x1115, + 0x1115, +}; + +const struct PairedPalettes gUnknown_0850BD00[] = { + {0x1100, Unknown_0850BCE8}, + {0x1110, Unknown_0850BCF0}, + {0x1115, Unknown_0850BCF8}, + {0x11FF, NULL}, +}; + +const u16 Unknown_0850BD20[] = { + 0x110C, + 0x110C, + 0x110C, + 0x110C, +}; + +const u16 Unknown_0850BD28[] = { + 0x110D, + 0x110D, + 0x110D, + 0x110D, +}; + +const u16 Unknown_0850BD30[] = { + 0x110E, + 0x110E, + 0x110E, + 0x110E, +}; + +const u16 Unknown_0850BD38[] = { + 0x1112, + 0x1112, + 0x1112, + 0x1112, +}; + +const u16 Unknown_0850BD40[] = { + 0x1113, + 0x1113, + 0x1113, + 0x1113, +}; + +const u16 Unknown_0850BD48[] = { + 0x1114, + 0x1114, + 0x1114, + 0x1114, +}; + +const u16 Unknown_0850BD50[] = { + 0x111B, + 0x111B, + 0x111B, + 0x111B, +}; + +const u16 Unknown_0850BD58[] = { + 0x1117, + 0x1117, + 0x1117, + 0x1117, +}; + +const u16 Unknown_0850BD60[] = { + 0x1119, + 0x1119, + 0x1119, + 0x1119, +}; + +const u16 Unknown_0850BD68[] = { + 0x1109, + 0x1109, + 0x1109, + 0x1109, +}; + +const u16 Unknown_0850BD70[] = { + 0x111D, + 0x111D, + 0x111D, + 0x111D, +}; + +const struct PairedPalettes gUnknown_0850BD78[] = { + {4352, Unknown_0850BCE8}, + {4368, Unknown_0850BCF0}, + {4363, Unknown_0850BD20}, + {4365, Unknown_0850BD28}, + {4366, Unknown_0850BD30}, + {4370, Unknown_0850BD38}, + {4371, Unknown_0850BD40}, + {4372, Unknown_0850BD48}, + {4374, Unknown_0850BD58}, + {4376, Unknown_0850BD60}, + {4357, Unknown_0850BD68}, + {4379, Unknown_0850BD50}, + {4381, Unknown_0850BD70}, + {4607, NULL}, +}; + +const u16 gUnknown_0850BDE8[] = { + 0x1100, + 0x1101, + 0x1103, + 0x1104, + 0x1105, + 0x1106, + 0x1107, + 0x1108, + 0x1109, + 0x110A, +}; + +const u16 gUnknown_0850BDFC[] = { + 0x1100, + 0x1101, + 0x1103, + 0x1104, + 0x1105, + 0x1106, + 0x1107, + 0x1108, + 0x1109, + 0x110A, +}; + +const u16 gUnknown_0850BE10[] = { + 0x1100, + 0x1101, + 0x1103, + 0x1104, + 0x1105, + 0x1106, + 0x1107, + 0x1108, + 0x1109, + 0x110A, +}; + +const u16 gUnknown_0850BE24[] = { + 0x1100, + 0x1101, + 0x1103, + 0x1104, + 0x1105, + 0x1106, + 0x1107, + 0x1108, + 0x1109, + 0x110A, +}; + + +const u16 *const gUnknown_0850BE38[] = { + gUnknown_0850BDE8, + gUnknown_0850BDFC, + gUnknown_0850BE10, + gUnknown_0850BE24, +}; + +#include "data/field_event_obj/berry_tree_graphics_tables.h" +#include "data/field_event_obj/field_effect_objects.h" + +const s16 gMovementDelaysMedium[] = {32, 64, 96, 128}; +const s16 gMovementDelaysLong[] = {32, 64, 128, 192}; +const s16 gMovementDelaysShort[] = {32, 48, 64, 80}; + +#include "data/field_event_obj/movement_type_func_tables.h" + +const u8 gUnknown_0850DACC[] = { + 0x00, + 0x00, + 0x01, + 0x02, + 0x03, + 0x00, + 0x00, + 0x01, + 0x01, +}; + +const u8 gUnknown_0850DAD5[] = { + 0x04, + 0x04, + 0x05, + 0x06, + 0x07, + 0x04, + 0x04, + 0x05, + 0x05, +}; + +const u8 gUnknown_0850DADE[] = { + 0x08, + 0x08, + 0x09, + 0x0a, + 0x0b, + 0x08, + 0x08, + 0x09, + 0x09, +}; + +const u8 gUnknown_0850DAE7[] = { + 0x0c, + 0x0c, + 0x0d, + 0x0e, + 0x0f, + 0x0c, + 0x0c, + 0x0d, + 0x0d, +}; + +const u8 gUnknown_0850DAF0[] = { + 0x10, + 0x10, + 0x11, + 0x12, + 0x13, + 0x10, + 0x10, + 0x11, + 0x11, +}; + +const u8 gUnknown_0850DAF9[] = { + 0x14, + 0x14, + 0x15, + 0x16, + 0x17, + 0x14, + 0x14, + 0x15, + 0x15, +}; + +const u8 gUnknown_0850DB02[] = { + 0x14, + 0x14, + 0x15, + 0x16, + 0x17, + 0x14, + 0x14, + 0x15, + 0x15, +}; + +const u8 gUnknown_0850DB0B[] = { + 0x18, + 0x18, + 0x19, + 0x1a, + 0x1b, + 0x18, + 0x18, + 0x19, + 0x19, +}; + +const u8 gUnknown_0850DB14[] = { + 0x1c, + 0x1c, + 0x1d, + 0x1e, + 0x1f, + 0x1c, + 0x1c, + 0x1d, + 0x1d, +}; + +const u8 gUnknown_0850DB1D[] = { + 0x20, + 0x20, + 0x21, + 0x22, + 0x23, + 0x20, + 0x20, + 0x21, + 0x21, +}; + +const u8 gUnknown_0850DB26[] = { + 0x24, + 0x24, + 0x25, + 0x26, + 0x27, + 0x24, + 0x24, + 0x25, + 0x25, +}; + +const u8 gUnknown_0850DB2F[] = { + 0x00, + 0x00, + 0x01, + 0x02, + 0x03, + 0x00, + 0x00, + 0x01, + 0x01, +}; + +const u8 gUnknown_0850DB38[] = { + 0x04, + 0x04, + 0x05, + 0x06, + 0x07, + 0x04, + 0x04, + 0x05, + 0x05, +}; + +const u8 gUnknown_0850DB41[] = { + 0x08, + 0x08, + 0x09, + 0x0a, + 0x0b, + 0x08, + 0x08, + 0x09, + 0x09, +}; + +const u8 gUnknown_0850DB4A[] = { + 0x14, + 0x14, + 0x15, + 0x16, + 0x17, + 0x14, + 0x14, + 0x15, + 0x15, +}; + +const u8 gUnknown_0850DB53[] = { + 0x08, + 0x08, + 0x07, + 0x09, + 0x0a, + 0x08, + 0x08, + 0x07, + 0x07, +}; + +bool8 (*const gOppositeDirectionBlockedMetatileFuncs[])(u8) = { + MetatileBehavior_IsSouthBlocked, + MetatileBehavior_IsNorthBlocked, + MetatileBehavior_IsWestBlocked, + MetatileBehavior_IsEastBlocked +}; + +bool8 (*const gDirectionBlockedMetatileFuncs[])(u8) = { + MetatileBehavior_IsNorthBlocked, + MetatileBehavior_IsSouthBlocked, + MetatileBehavior_IsEastBlocked, + MetatileBehavior_IsWestBlocked +}; + +const struct Coords16 gDirectionToVectors[] = { + { 0, 0}, + { 0, 1}, + { 0, -1}, + {-1, 0}, + { 1, 0}, + {-1, 1}, + { 1, 1}, + {-1, -1}, + { 1, -1} +}; + +const u8 gUnknown_0850DBA0[] = { + 0x00, + 0x00, + 0x01, + 0x02, + 0x03, +}; + +const u8 gUnknown_0850DBA5[] = { + 0x04, + 0x04, + 0x05, + 0x06, + 0x07, +}; + +const u8 gUnknown_0850DBAA[] = { + 0x08, + 0x08, + 0x09, + 0x0a, + 0x0b, +}; + +const u8 gUnknown_0850DBAF[] = { + 0x15, + 0x15, + 0x16, + 0x17, + 0x18, +}; + +const u8 gUnknown_0850DBB4[] = { + 0x29, + 0x29, + 0x2a, + 0x2b, + 0x2c, +}; + +const u8 gUnknown_0850DBB9[] = { + 0x2d, + 0x2d, + 0x2e, + 0x2f, + 0x30, +}; + +const u8 gUnknown_0850DBBE[] = { + 0x31, + 0x31, + 0x32, + 0x33, + 0x34, +}; + +const u8 gUnknown_0850DBC3[] = { + 0x35, + 0x35, + 0x36, + 0x37, + 0x38, +}; + +const u8 gUnknown_0850DBC8[] = { + 0x0c, + 0x0c, + 0x0d, + 0x0e, + 0x0f, +}; + +const u8 gUnknown_0850DBCD[] = { + 0x46, + 0x46, + 0x47, + 0x48, + 0x49, +}; + +const u8 gUnknown_0850DBD2[] = { + 0x4b, + 0x4b, + 0x4a, + 0x4d, + 0x4c, +}; + +const u8 gUnknown_0850DBD7[] = { + 0x42, + 0x42, + 0x43, + 0x44, + 0x45, +}; + +const u8 gUnknown_0850DBDC[] = { + 0x3a, + 0x3a, + 0x3b, + 0x3c, + 0x3d, +}; + +const u8 gUnknown_0850DBE1[] = { + 0x19, + 0x19, + 0x1a, + 0x1b, + 0x1c, +}; + +const u8 gUnknown_0850DBE6[] = { + 0x1d, + 0x1d, + 0x1e, + 0x1f, + 0x20, +}; + +const u8 gUnknown_0850DBEB[] = { + 0x21, + 0x21, + 0x22, + 0x23, + 0x24, +}; + +const u8 gUnknown_0850DBF0[] = { + 0x25, + 0x25, + 0x26, + 0x27, + 0x28, +}; + +const u8 gUnknown_0850DBF5[] = { + 0x64, + 0x64, + 0x65, + 0x66, + 0x67, +}; + +const u8 gUnknown_0850DBFA[] = { + 0x68, + 0x68, + 0x69, + 0x6a, + 0x6b, +}; + +const u8 gUnknown_0850DBFF[] = { + 0x6c, + 0x6c, + 0x6d, + 0x6e, + 0x6f, +}; + +const u8 gUnknown_0850DC04[] = { + 0x70, + 0x70, + 0x71, + 0x72, + 0x73, +}; + +const u8 gUnknown_0850DC09[] = { + 0x74, + 0x74, + 0x75, + 0x76, + 0x77, +}; + +const u8 gUnknown_0850DC0E[] = { + 0x78, + 0x78, + 0x79, + 0x7a, + 0x7b, +}; + +const u8 gUnknown_0850DC13[] = { + 0x7c, + 0x7c, + 0x7d, + 0x7e, + 0x7f, +}; + +const u8 gUnknown_0850DC18[] = { + 0x80, + 0x80, + 0x81, + 0x82, + 0x83, +}; + +const u8 gUnknown_0850DC1D[] = { + 0x84, + 0x84, + 0x85, + 0x86, + 0x87, +}; + +const u8 gUnknown_0850DC22[] = { + 0x88, + 0x88, + 0x89, + 0x8a, + 0x8b, +}; + +const u8 gOppositeDirections[] = { + DIR_NORTH, + DIR_SOUTH, + DIR_EAST, + DIR_WEST, + DIR_NORTHEAST, + DIR_NORTHWEST, + DIR_SOUTHEAST, + DIR_SOUTHWEST, +}; + +const u8 gUnknown_0850DC2F[][4] = { + {2, 1, 4, 3}, + {1, 2, 3, 4}, + {3, 4, 2, 1}, + {4, 3, 1, 2} +}; + +const u8 gUnknown_0850DC3F[][4] = { + {2, 1, 4, 3}, + {1, 2, 3, 4}, + {4, 3, 1, 2}, + {3, 4, 2, 1} +}; + +#include "data/field_event_obj/movement_action_func_tables.h" // Code @@ -1505,21 +2429,21 @@ u8 AddCameraObject(u8 linkedSpriteId) { u8 spriteId; - spriteId = CreateSprite(&gUnknown_084975D4, 0, 0, 4); + spriteId = CreateSprite(&gCameraSpriteTemplate, 0, 0, 4); gSprites[spriteId].invisible = TRUE; gSprites[spriteId].data[0] = linkedSpriteId; return spriteId; } -void ObjectCB_CameraObject(struct Sprite *sprite) +static void ObjectCB_CameraObject(struct Sprite *sprite) { - void (*callbacks[ARRAY_COUNT(gUnknown_084975EC)])(struct Sprite *); + void (*callbacks[ARRAY_COUNT(gCameraObjectFuncs)])(struct Sprite *); - memcpy(callbacks, gUnknown_084975EC, sizeof gUnknown_084975EC); + memcpy(callbacks, gCameraObjectFuncs, sizeof gCameraObjectFuncs); callbacks[sprite->data[1]](sprite); } -/*static*/ void CameraObject_0(struct Sprite *sprite) +static void CameraObject_0(struct Sprite *sprite) { sprite->pos1.x = gSprites[sprite->data[0]].pos1.x; sprite->pos1.y = gSprites[sprite->data[0]].pos1.y; @@ -1528,7 +2452,7 @@ void ObjectCB_CameraObject(struct Sprite *sprite) CameraObject_1(sprite); } -/*static*/ void CameraObject_1(struct Sprite *sprite) +static void CameraObject_1(struct Sprite *sprite) { s16 x; s16 y; @@ -1541,7 +2465,7 @@ void ObjectCB_CameraObject(struct Sprite *sprite) sprite->pos1.y = y; } -/*static*/ void CameraObject_2(struct Sprite *sprite) +static void CameraObject_2(struct Sprite *sprite) { sprite->pos1.x = gSprites[sprite->data[0]].pos1.x; sprite->pos1.y = gSprites[sprite->data[0]].pos1.y; @@ -1879,7 +2803,7 @@ bool8 sub_808F48C(struct MapObject *mapObject, struct Sprite *sprite) { return FALSE; } - SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]); + SetFieldObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]); sprite->data[1] = 3; return TRUE; } @@ -2199,7 +3123,7 @@ bool8 sub_808F9C8(struct MapObject *mapObject, struct Sprite *sprite) { if (FieldObjectExecRegularAnim(mapObject, sprite)) { - SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]); + SetFieldObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]); mapObject->singleMovementActive = FALSE; sprite->data[1] = 3; } @@ -2254,7 +3178,7 @@ bool8 sub_808FB08(struct MapObject *mapObject, struct Sprite *sprite) { return FALSE; } - SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]); + SetFieldObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]); sprite->data[1] = 3; return TRUE; } @@ -2325,7 +3249,7 @@ bool8 sub_808FC8C(struct MapObject *mapObject, struct Sprite *sprite) { return FALSE; } - SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]); + SetFieldObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]); sprite->data[1] = 3; return TRUE; } @@ -2527,7 +3451,7 @@ bool8 sub_80900D4 (struct MapObject *mapObject, struct Sprite *sprite) { if (FieldObjectExecRegularAnim(mapObject, sprite)) { - SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]); + SetFieldObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]); mapObject->singleMovementActive = FALSE; sprite->data[1] = 3; } @@ -2580,7 +3504,7 @@ bool8 sub_8090214 (struct MapObject *mapObject, struct Sprite *sprite) { if (FieldObjectExecRegularAnim(mapObject, sprite)) { - SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]); + SetFieldObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]); mapObject->singleMovementActive = FALSE; sprite->data[1] = 3; } @@ -2633,7 +3557,7 @@ bool8 sub_8090354 (struct MapObject *mapObject, struct Sprite *sprite) { if (FieldObjectExecRegularAnim(mapObject, sprite)) { - SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); + SetFieldObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); mapObject->singleMovementActive = FALSE; sprite->data[1] = 3; } @@ -2686,7 +3610,7 @@ bool8 sub_8090494 (struct MapObject *mapObject, struct Sprite *sprite) { if (FieldObjectExecRegularAnim(mapObject, sprite)) { - SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); + SetFieldObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); mapObject->singleMovementActive = FALSE; sprite->data[1] = 3; } @@ -2739,7 +3663,7 @@ bool8 sub_80905D4 (struct MapObject *mapObject, struct Sprite *sprite) { if (FieldObjectExecRegularAnim(mapObject, sprite)) { - SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); + SetFieldObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); mapObject->singleMovementActive = FALSE; sprite->data[1] = 3; } @@ -2792,7 +3716,7 @@ bool8 sub_8090714 (struct MapObject *mapObject, struct Sprite *sprite) { if (FieldObjectExecRegularAnim(mapObject, sprite)) { - SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); + SetFieldObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); mapObject->singleMovementActive = FALSE; sprite->data[1] = 3; } @@ -2845,7 +3769,7 @@ bool8 sub_8090854 (struct MapObject *mapObject, struct Sprite *sprite) { if (FieldObjectExecRegularAnim(mapObject, sprite)) { - SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); + SetFieldObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); mapObject->singleMovementActive = FALSE; sprite->data[1] = 3; } @@ -2898,7 +3822,7 @@ bool8 sub_8090994 (struct MapObject *mapObject, struct Sprite *sprite) { if (FieldObjectExecRegularAnim(mapObject, sprite)) { - SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); + SetFieldObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); mapObject->singleMovementActive = FALSE; sprite->data[1] = 3; } @@ -2951,7 +3875,7 @@ bool8 sub_8090AD4 (struct MapObject *mapObject, struct Sprite *sprite) { if (FieldObjectExecRegularAnim(mapObject, sprite)) { - SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); + SetFieldObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); mapObject->singleMovementActive = FALSE; sprite->data[1] = 3; } @@ -3004,7 +3928,7 @@ bool8 sub_8090C14 (struct MapObject *mapObject, struct Sprite *sprite) { if (FieldObjectExecRegularAnim(mapObject, sprite)) { - SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]); + SetFieldObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); mapObject->singleMovementActive = FALSE; sprite->data[1] = 3; } @@ -3609,7 +4533,6 @@ void npc_reset(struct MapObject *mapObject, struct Sprite *sprite) } #define dirn2anim(name, table)\ -extern const u8 table[4];\ u8 name(u8 direction)\ {\ return table[direction];\ @@ -3631,15 +4554,6 @@ dirn2anim(sub_8092A1C, gUnknown_0850DB38) dirn2anim(sub_8092A2C, gUnknown_0850DB41) dirn2anim(get_run_image_anim_num, gUnknown_0850DB4A) -// file boundary? - -struct UnkStruct_085094AC { - const union AnimCmd *const *anims; - u8 animPos[4]; -}; - -extern const struct UnkStruct_085094AC gUnknown_085094AC[]; - static const struct UnkStruct_085094AC *sub_8092A4C(const union AnimCmd *const *anims) { const struct UnkStruct_085094AC *retval; @@ -3822,7 +4736,7 @@ static bool8 IsCoordOutsideFieldObjectMovementRect(struct MapObject *mapObject, static bool8 IsMetatileDirectionallyImpassable(struct MapObject *mapObject, s16 x, s16 y, u8 direction) { - if (gUnknown_0850DB5C[direction - 1](mapObject->currentMetatileBehavior) || gUnknown_0850DB6C[direction - 1](MapGridGetMetatileBehaviorAt(x, y))) + if (gOppositeDirectionBlockedMetatileFuncs[direction - 1](mapObject->currentMetatileBehavior) || gDirectionBlockedMetatileFuncs[direction - 1](MapGridGetMetatileBehaviorAt(x, y))) { return TRUE; } @@ -3874,14 +4788,14 @@ void sub_8092EF0(u8 localId, u8 mapNum, u8 mapGroup) void MoveCoords(u8 direction, s16 *x, s16 *y) { - *x += gUnknown_0850DB7C[direction].x; - *y += gUnknown_0850DB7C[direction].y; + *x += gDirectionToVectors[direction].x; + *y += gDirectionToVectors[direction].y; } void sub_8092F60(u8 direction, s16 *x, s16 *y) { - *x += gUnknown_0850DB7C[direction].x << 4; - *y += gUnknown_0850DB7C[direction].y << 4; + *x += gDirectionToVectors[direction].x << 4; + *y += gDirectionToVectors[direction].y << 4; } void sub_8092F88(u32 dirn, s16 *x, s16 *y, s16 dx, s16 dy) @@ -3895,7 +4809,7 @@ void sub_8092F88(u32 dirn, s16 *x, s16 *y, s16 dx, s16 dy) direction = dirn; dx_2 = dx; dy_2 = dy; - cur_x = gUnknown_0850DB7C[direction].x; + cur_x = gDirectionToVectors[direction].x; if (cur_x > 0) { *x += dx_2; @@ -3904,7 +4818,7 @@ void sub_8092F88(u32 dirn, s16 *x, s16 *y, s16 dx, s16 dy) { *x -= dx_2; } - cur_y = gUnknown_0850DB7C[direction].y; + cur_y = gDirectionToVectors[direction].y; if (cur_y > 0) { *y += dy_2; @@ -4096,7 +5010,6 @@ void FieldObjectStep(struct MapObject *mapObject, struct Sprite *sprite, bool8 ( } #define dirn2anim_2(name, table) \ -extern const u8 table[5]; \ u8 name(u32 direction) \ { \ u8 dirn2; \ @@ -4144,14 +5057,12 @@ dirn2anim_2(sub_809377C, gUnknown_0850DC18); dirn2anim_2(sub_80937A8, gUnknown_0850DC1D); dirn2anim_2(d2s_08064034, gUnknown_0850DC22); -extern const u8 gUnknown_0850DC27[8]; - u8 GetOppositeDirection(u8 direction) { - u8 directions[sizeof gUnknown_0850DC27]; + u8 directions[sizeof gOppositeDirections]; - memcpy(directions, gUnknown_0850DC27, sizeof gUnknown_0850DC27); - if (direction < 1 || direction > (sizeof gUnknown_0850DC27)) + memcpy(directions, gOppositeDirections, sizeof gOppositeDirections); + if (direction < 1 || direction > (sizeof gOppositeDirections)) { return direction; } @@ -5174,7 +6085,7 @@ static void npc_update_obj_anim_flag(struct MapObject *mapObject, struct Sprite GetGroundEffectFlags_HotSprings(eventObj, flags); } -/*static*/ void GetAllGroundEffectFlags_OnBeginStep(struct MapObject *eventObj, u32 *flags) +static void GetAllGroundEffectFlags_OnBeginStep(struct MapObject *eventObj, u32 *flags) { FieldObjectUpdateMetatileBehaviors(eventObj); GetGroundEffectFlags_Reflection(eventObj, flags); @@ -5207,7 +6118,7 @@ static void FieldObjectUpdateMetatileBehaviors(struct MapObject *eventObj) eventObj->currentMetatileBehavior = MapGridGetMetatileBehaviorAt(eventObj->currentCoords.x, eventObj->currentCoords.y); } -void GetGroundEffectFlags_Reflection(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Reflection(struct MapObject *eventObj, u32 *flags) { u32 reflectionFlags[2] = { GROUND_EFFECT_FLAG_REFLECTION, GROUND_EFFECT_FLAG_ICE_REFLECTION }; u8 type = FieldObjectCheckForReflectiveSurface(eventObj); @@ -5227,31 +6138,31 @@ void GetGroundEffectFlags_Reflection(struct MapObject *eventObj, u32 *flags) } } -void GetGroundEffectFlags_TallGrassOnSpawn(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_TallGrassOnSpawn(struct MapObject *eventObj, u32 *flags) { if (MetatileBehavior_IsTallGrass(eventObj->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN; } -void GetGroundEffectFlags_TallGrassOnBeginStep(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_TallGrassOnBeginStep(struct MapObject *eventObj, u32 *flags) { if (MetatileBehavior_IsTallGrass(eventObj->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE; } -void GetGroundEffectFlags_LongGrassOnSpawn(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_LongGrassOnSpawn(struct MapObject *eventObj, u32 *flags) { if (MetatileBehavior_IsLongGrass(eventObj->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_LONG_GRASS_ON_SPAWN; } -void GetGroundEffectFlags_LongGrassOnBeginStep(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_LongGrassOnBeginStep(struct MapObject *eventObj, u32 *flags) { if (MetatileBehavior_IsLongGrass(eventObj->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_LONG_GRASS_ON_MOVE; } -void GetGroundEffectFlags_Tracks(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Tracks(struct MapObject *eventObj, u32 *flags) { if (MetatileBehavior_IsDeepSand(eventObj->previousMetatileBehavior)) { @@ -5264,7 +6175,7 @@ void GetGroundEffectFlags_Tracks(struct MapObject *eventObj, u32 *flags) } } -void GetGroundEffectFlags_SandHeap(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_SandHeap(struct MapObject *eventObj, u32 *flags) { if (MetatileBehavior_IsDeepSand(eventObj->currentMetatileBehavior) && MetatileBehavior_IsDeepSand(eventObj->previousMetatileBehavior)) @@ -5282,7 +6193,7 @@ void GetGroundEffectFlags_SandHeap(struct MapObject *eventObj, u32 *flags) } } -void GetGroundEffectFlags_ShallowFlowingWater(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_ShallowFlowingWater(struct MapObject *eventObj, u32 *flags) { if ((MetatileBehavior_IsShallowFlowingWater(eventObj->currentMetatileBehavior) && MetatileBehavior_IsShallowFlowingWater(eventObj->previousMetatileBehavior)) @@ -5302,7 +6213,7 @@ void GetGroundEffectFlags_ShallowFlowingWater(struct MapObject *eventObj, u32 *f } } -void GetGroundEffectFlags_Puddle(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Puddle(struct MapObject *eventObj, u32 *flags) { if (MetatileBehavior_IsPuddle(eventObj->currentMetatileBehavior) && MetatileBehavior_IsPuddle(eventObj->previousMetatileBehavior)) @@ -5311,13 +6222,13 @@ void GetGroundEffectFlags_Puddle(struct MapObject *eventObj, u32 *flags) } } -void GetGroundEffectFlags_Ripple(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Ripple(struct MapObject *eventObj, u32 *flags) { if (MetatileBehavior_HasRipples(eventObj->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_RIPPLES; } -void GetGroundEffectFlags_ShortGrass(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_ShortGrass(struct MapObject *eventObj, u32 *flags) { if (MetatileBehavior_IsShortGrass(eventObj->currentMetatileBehavior) && MetatileBehavior_IsShortGrass(eventObj->previousMetatileBehavior)) @@ -5335,7 +6246,7 @@ void GetGroundEffectFlags_ShortGrass(struct MapObject *eventObj, u32 *flags) } } -void GetGroundEffectFlags_HotSprings(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_HotSprings(struct MapObject *eventObj, u32 *flags) { if (MetatileBehavior_IsHotSprings(eventObj->currentMetatileBehavior) && MetatileBehavior_IsHotSprings(eventObj->previousMetatileBehavior)) @@ -5353,13 +6264,13 @@ void GetGroundEffectFlags_HotSprings(struct MapObject *eventObj, u32 *flags) } } -void GetGroundEffectFlags_Seaweed(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Seaweed(struct MapObject *eventObj, u32 *flags) { if (MetatileBehavior_IsSeaweed(eventObj->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_SEAWEED; } -void GetGroundEffectFlags_JumpLanding(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_JumpLanding(struct MapObject *eventObj, u32 *flags) { typedef bool8 (*MetatileFunc)(u8); @@ -5396,7 +6307,7 @@ void GetGroundEffectFlags_JumpLanding(struct MapObject *eventObj, u32 *flags) } } -u8 FieldObjectCheckForReflectiveSurface(struct MapObject *eventObj) +static u8 FieldObjectCheckForReflectiveSurface(struct MapObject *eventObj) { const struct MapObjectGraphicsInfo *info = GetFieldObjectGraphicsInfo(eventObj->graphicsId); @@ -5963,32 +6874,32 @@ void UnfreezeMapObjects(void) void little_step(struct Sprite *sprite, u8 dir) { - sprite->pos1.x += gUnknown_0850DB7C[dir].x; - sprite->pos1.y += gUnknown_0850DB7C[dir].y; + sprite->pos1.x += gDirectionToVectors[dir].x; + sprite->pos1.y += gDirectionToVectors[dir].y; } void double_little_steps(struct Sprite *sprite, u8 dir) { - sprite->pos1.x += 2 * (u16) gUnknown_0850DB7C[dir].x; - sprite->pos1.y += 2 * (u16) gUnknown_0850DB7C[dir].y; + sprite->pos1.x += 2 * (u16) gDirectionToVectors[dir].x; + sprite->pos1.y += 2 * (u16) gDirectionToVectors[dir].y; } void triple_little_steps(struct Sprite *sprite, u8 dir) { - sprite->pos1.x += 2 * (u16) gUnknown_0850DB7C[dir].x + (u16) gUnknown_0850DB7C[dir].x; - sprite->pos1.y += 2 * (u16) gUnknown_0850DB7C[dir].y + (u16) gUnknown_0850DB7C[dir].y; + sprite->pos1.x += 2 * (u16) gDirectionToVectors[dir].x + (u16) gDirectionToVectors[dir].x; + sprite->pos1.y += 2 * (u16) gDirectionToVectors[dir].y + (u16) gDirectionToVectors[dir].y; } void quad_little_steps(struct Sprite *sprite, u8 dir) { - sprite->pos1.x += 4 * (u16) gUnknown_0850DB7C[dir].x; - sprite->pos1.y += 4 * (u16) gUnknown_0850DB7C[dir].y; + sprite->pos1.x += 4 * (u16) gDirectionToVectors[dir].x; + sprite->pos1.y += 4 * (u16) gDirectionToVectors[dir].y; } void oct_little_steps(struct Sprite *sprite, u8 dir) { - sprite->pos1.x += 8 * (u16) gUnknown_0850DB7C[dir].x; - sprite->pos1.y += 8 * (u16) gUnknown_0850DB7C[dir].y; + sprite->pos1.x += 8 * (u16) gDirectionToVectors[dir].x; + sprite->pos1.y += 8 * (u16) gDirectionToVectors[dir].y; } void oamt_npc_ministep_reset(struct Sprite *sprite, u8 a2, u8 a3) @@ -6405,7 +7316,7 @@ void DoShadowFieldEffect(struct MapObject *mapObject) } } -void DoRippleFieldEffect(struct MapObject *mapObject, struct Sprite *sprite) +static void DoRippleFieldEffect(struct MapObject *mapObject, struct Sprite *sprite) { const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId); gFieldEffectArguments[0] = sprite->pos1.x; diff --git a/src/field_effect.c b/src/field_effect.c index b80f0b5eb9..71bce8f412 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -7,7 +7,6 @@ #include "field_camera.h" #include "field_effect_helpers.h" #include "event_object_movement.h" -#include "event_object_movement_helpers.h" #include "field_player_avatar.h" #include "field_screen.h" #include "field_weather.h" diff --git a/src/item_menu.c b/src/item_menu.c index 75465e2989..132f39c34d 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -9,7 +9,7 @@ #include "constants/songs.h" #include "decompress.h" #include "event_data.h" -#include "event_object_movement_helpers.h" +#include "event_object_movement.h" #include "field_player_avatar.h" #include "field_specials.h" #include "graphics.h" diff --git a/src/item_use.c b/src/item_use.c index 4318a930bd..82d96606a5 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -17,7 +17,6 @@ #include "field_screen.h" #include "field_weather.h" #include "item.h" -#include "event_object_movement_helpers.h" #include "mail.h" #include "metatile_behavior.h" #include "overworld.h" diff --git a/src/map_obj_lock.c b/src/map_obj_lock.c index d57cc5b86f..6647f629ba 100644 --- a/src/map_obj_lock.c +++ b/src/map_obj_lock.c @@ -1,7 +1,6 @@ #include "global.h" #include "event_data.h" #include "event_object_movement.h" -#include "event_object_movement_helpers.h" #include "field_player_avatar.h" #include "map_obj_lock.h" #include "script_movement.h" diff --git a/src/overworld.c b/src/overworld.c index 045ebb4fd3..85bdbc5eab 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -11,7 +11,6 @@ #include "field_effect.h" #include "field_fadetransition.h" #include "event_object_movement.h" -#include "event_object_movement_helpers.h" #include "field_message_box.h" #include "field_player_avatar.h" #include "field_screen_effect.h" diff --git a/src/scrcmd.c b/src/scrcmd.c index 68bcd49364..e36b60718d 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -14,7 +14,6 @@ #include "field_effect.h" #include "field_fadetransition.h" #include "event_object_movement.h" -#include "event_object_movement_helpers.h" #include "field_message_box.h" #include "field_player_avatar.h" #include "field_screen_effect.h" diff --git a/src/script_movement.c b/src/script_movement.c index 4d1e77d4a1..02ab55223e 100644 --- a/src/script_movement.c +++ b/src/script_movement.c @@ -1,7 +1,6 @@ #include "global.h" #include "script_movement.h" #include "event_object_movement.h" -#include "event_object_movement_helpers.h" #include "task.h" #include "util.h" diff --git a/src/start_menu.c b/src/start_menu.c index 355d0fa228..9ab8a69ba4 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -15,7 +15,7 @@ #include "battle_frontier_2.h" #include "rom_818CFC8.h" #include "field_specials.h" -#include "event_object_movement_helpers.h" +#include "event_object_movement.h" #include "script.h" #include "main.h" #include "sound.h" diff --git a/src/trainer_see.c b/src/trainer_see.c index 16520c27ac..db8cff8a1a 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -6,7 +6,6 @@ #include "field_effect.h" #include "event_object_movement.h" #include "field_player_avatar.h" -#include "event_object_movement_helpers.h" #include "pokenav.h" #include "task.h" #include "util.h" From ed245b677addbb7f5c748193301507de7fed6ec4 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 11 Jun 2018 18:17:31 -0500 Subject: [PATCH 08/55] Add remaining rodata to event_object_movement.c --- data/map_obj_8097404.s | 130 -------- include/event_object_movement.h | 44 ++- ld_script.txt | 1 - .../movement_action_func_tables.h | 17 +- src/event_object_movement.c | 295 +++++++++++------- 5 files changed, 239 insertions(+), 248 deletions(-) delete mode 100644 data/map_obj_8097404.s diff --git a/data/map_obj_8097404.s b/data/map_obj_8097404.s deleted file mode 100644 index b30e4b6d7f..0000000000 --- a/data/map_obj_8097404.s +++ /dev/null @@ -1,130 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 -gUnknown_0850E6C4:: @ 850E6C4 - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - - .align 2 -gUnknown_0850E704:: @ 850E704 - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - - .align 2 -gUnknown_0850E724:: @ 850E724 - .4byte double_little_steps - .4byte triple_little_steps - .4byte triple_little_steps - .4byte double_little_steps - .4byte triple_little_steps - .4byte triple_little_steps - - .align 2 -gUnknown_0850E73C:: @ 850E73C - .4byte quad_little_steps - .4byte quad_little_steps - .4byte quad_little_steps - .4byte quad_little_steps - - .align 2 -gUnknown_0850E74C:: @ 850E74C - .4byte oct_little_steps - .4byte oct_little_steps - - .align 2 -gUnknown_0850E754:: @ 850E754 - .4byte gUnknown_0850E6C4 - .4byte gUnknown_0850E704 - .4byte gUnknown_0850E724 - .4byte gUnknown_0850E73C - .4byte gUnknown_0850E74C - - .align 1 -gUnknown_0850E768:: @ 850E768 - .2byte 0x0010, 0x0008, 0x0006, 0x0004, 0x0002 - -gUnknown_0850E772:: @ 850E772 - .byte 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01 - .byte 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00 - .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -gUnknown_0850E7BA:: @ 850E7BA - .byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00 - .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe - -gUnknown_0850E802:: @ 850E802 - .byte 0xfc, 0xfa, 0xf8, 0xf6, 0xf5, 0xf4, 0xf4, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xfa, 0xfc, 0x00, 0x00 - -gUnknown_0850E812:: @ 850E812 - .byte 0x00, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xfa, 0xfa, 0xfb, 0xfb, 0xfc, 0xfd, 0xfe, 0x00, 0x00, 0x00 - -gUnknown_0850E822:: @ 850E822 - .byte 0xfe, 0xfc, 0xfa, 0xf8, 0xf7, 0xf6, 0xf6, 0xf6, 0xf7, 0xf8, 0xfa, 0xfb, 0xfd, 0xfe, 0x00, 0x00 - - .align 2 -gUnknown_0850E834:: @ 850E834 - .4byte gUnknown_0850E802 - .4byte gUnknown_0850E812 - .4byte gUnknown_0850E822 - - .align 1 -gUnknown_0850E840:: @ 850E840 - .byte 0x10, 0x00, 0x10, 0x00, 0x20, 0x00 - - .align 1 -gUnknown_0850E846:: @ 850E846 - .byte 0x00, 0x00, 0x01, 0x00 - - .align 1 -gUnknown_0850E84A:: @ 850E84A - .byte 0x20, 0x00, 0x20, 0x00, 0x40, 0x00 - - .align 1 -gUnknown_0850E850:: @ 850E850 - .byte 0x01, 0x01, 0x02, 0x00 - -// referenced in data/event_object_movement.s - .align 2 -gUnknown_0850E854:: - .4byte sub_8097E50 - .4byte sub_80964B8 - - .align 2 -gUnknown_0850E85C:: - .4byte sub_8097EF0 - .4byte sub_80964B8 - - .align 2 -gUnknown_0850E864:: - .4byte sub_80980C0 - .4byte sub_80980D0 - .4byte sub_8098124 - - .align 2 -gUnknown_0850E870:: - .4byte sub_80980F4 - .4byte sub_8098108 - .4byte sub_8098124 diff --git a/include/event_object_movement.h b/include/event_object_movement.h index a12032c930..293c2e3dcf 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -46,9 +46,47 @@ struct UnkStruct_085094AC { #define GROUND_EFFECT_FLAG_HOT_SPRINGS (1 << 18) #define GROUND_EFFECT_FLAG_SEAWEED (1 << 19) -// Exported RAM declarations +#define null_object_step(name, retval) \ +bool8 FieldObjectCB2_##name(struct MapObject *, struct Sprite *);\ +void FieldObjectCB_##name(struct Sprite *sprite)\ +{\ + FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, FieldObjectCB2_##name);\ +}\ +bool8 FieldObjectCB2_##name(struct MapObject *mapObject, struct Sprite *sprite)\ +{\ + return (retval);\ +} -// Exported ROM declarations +#define field_object_step(name, table) \ +extern bool8 (*const (table)[])(struct MapObject *, struct Sprite *);\ +bool8 FieldObjectCB2_##name(struct MapObject *, struct Sprite *);\ +void FieldObjectCB_##name(struct Sprite *sprite)\ +{\ + FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, FieldObjectCB2_##name);\ +}\ +bool8 FieldObjectCB2_##name(struct MapObject *mapObject, struct Sprite *sprite)\ +{\ + return (table)[sprite->data[1]](mapObject, sprite);\ +} + +#define field_object_path(idx, table, sub, path, catch, coord)\ +field_object_step(GoInDirectionSequence##idx, table)\ +extern const u8 path[4];\ +bool8 sub(struct MapObject *mapObject, struct Sprite *sprite)\ +{\ + u8 route[sizeof(path)];\ + memcpy(route, path, sizeof(path));\ + if (mapObject->directionSequenceIndex == (catch) && mapObject->initialCoords.coord == mapObject->currentCoords.coord)\ + {\ + mapObject->directionSequenceIndex = (catch) + 1;\ + }\ + return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, route);\ +}\ + +struct PairedPalettes { + u16 tag; + const u16 *data; +}; extern const struct SpriteFrameImage gFieldObjectPicTable_PechaBerryTree[]; @@ -111,6 +149,8 @@ const u8 *GetFieldObjectScriptPointerByFieldObjectId(u8 mapObjectId); u8 sub_8092C8C(struct MapObject *mapObject, s16 x, s16 y, u8 direction); u8 GetFaceDirectionAnimId(u32); u8 GetGoSpeed0AnimId(u32); +u8 GetGoSpeed1AnimId(u32); +u8 GetGoSpeed3AnimId(u32); u8 sub_80934BC(u32); bool8 FieldObjectSetSpecialAnim(struct MapObject *mapObject, u8 specialAnimId); bool8 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct MapObject *mapObject); diff --git a/ld_script.txt b/ld_script.txt index ec5e036fad..66af49175e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -396,7 +396,6 @@ SECTIONS { src/field_door.o(.rodata); data/field_player_avatar.o(.rodata); src/event_object_movement.o(.rodata); - data/map_obj_8097404.o(.rodata); src/text_window.o(.rodata); src/scrcmd.o(.rodata); src/coord_event_weather.o(.rodata); diff --git a/src/data/field_event_obj/movement_action_func_tables.h b/src/data/field_event_obj/movement_action_func_tables.h index 86dc613450..d5b7b89115 100755 --- a/src/data/field_event_obj/movement_action_func_tables.h +++ b/src/data/field_event_obj/movement_action_func_tables.h @@ -256,7 +256,14 @@ u8 sub_8096428_2(struct MapObject *, struct Sprite *); u8 sub_8096468(struct MapObject *, struct Sprite *); u8 sub_809647C(struct MapObject *, struct Sprite *); u8 sub_8096494(struct MapObject *, struct Sprite *); - +u8 sub_8097E50(struct MapObject *, struct Sprite *); +u8 sub_80964B8(struct MapObject *, struct Sprite *); +u8 sub_8097EF0(struct MapObject *, struct Sprite *); +u8 sub_80980C0(struct MapObject *, struct Sprite *); +u8 sub_80980D0(struct MapObject *, struct Sprite *); +u8 sub_8098124(struct MapObject *, struct Sprite *); +u8 sub_80980F4(struct MapObject *, struct Sprite *); +u8 sub_8098108(struct MapObject *, struct Sprite *); u8 (*const gUnknown_0850DEC8[])(struct MapObject *, struct Sprite *); u8 (*const gUnknown_0850DED0[])(struct MapObject *, struct Sprite *); @@ -406,16 +413,16 @@ u8 (*const gUnknown_0850DEFC[])(struct MapObject *, struct Sprite *); u8 (*const gUnknown_0850DF08[])(struct MapObject *, struct Sprite *); u8 (*const gUnknown_0850DF14[])(struct MapObject *, struct Sprite *); u8 (*const gUnknown_0850DF20[])(struct MapObject *, struct Sprite *); -extern u8 (*const gUnknown_0850E854[])(struct MapObject *, struct Sprite *); -extern u8 (*const gUnknown_0850E85C[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E854[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E85C[])(struct MapObject *, struct Sprite *); u8 (*const gUnknown_0850E3A0[])(struct MapObject *, struct Sprite *); u8 (*const gUnknown_0850E3AC[])(struct MapObject *, struct Sprite *); u8 (*const gUnknown_0850E5C4[])(struct MapObject *, struct Sprite *); u8 (*const gUnknown_0850E5CC[])(struct MapObject *, struct Sprite *); u8 (*const gUnknown_0850E5D4[])(struct MapObject *, struct Sprite *); u8 (*const gUnknown_0850E468[])(struct MapObject *, struct Sprite *); -extern u8 (*const gUnknown_0850E864[])(struct MapObject *, struct Sprite *); -extern u8 (*const gUnknown_0850E870[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E864[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850E870[])(struct MapObject *, struct Sprite *); u8 (*const *const gUnknown_0850DC50[])(struct MapObject *, struct Sprite *) = { gUnknown_0850DEC8, diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 9943dd578c..84900e48e6 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1,72 +1,29 @@ -// Includes - #include "global.h" -#include "malloc.h" -#include "sprite.h" -#include "overworld.h" -#include "random.h" -#include "event_scripts.h" +#include "event_object_movement.h" #include "berry.h" -#include "palette.h" -#include "field_player_avatar.h" -#include "fieldmap.h" +#include "decoration.h" #include "event_data.h" -#include "rom_818CFC8.h" -#include "rom_81BE66C.h" -#include "mauville_old_man.h" -#include "metatile_behavior.h" +#include "event_scripts.h" +#include "field_camera.h" #include "field_effect.h" #include "field_effect_helpers.h" -#include "field_camera.h" -#include "trainer_see.h" -#include "decoration.h" -#include "event_object_movement.h" +#include "field_player_avatar.h" +#include "fieldmap.h" +#include "malloc.h" +#include "mauville_old_man.h" +#include "metatile_behavior.h" +#include "overworld.h" +#include "palette.h" #include "pokenav.h" +#include "random.h" +#include "rom_818CFC8.h" +#include "rom_81BE66C.h" +#include "sprite.h" +#include "trainer_see.h" #include "util.h" #include "constants/map_objects.h" -#define NUM_FIELD_MAP_OBJECT_TEMPLATES 0x51 - -#define null_object_step(name, retval) \ -bool8 FieldObjectCB2_##name(struct MapObject *, struct Sprite *);\ -void FieldObjectCB_##name(struct Sprite *sprite)\ -{\ - FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, FieldObjectCB2_##name);\ -}\ -bool8 FieldObjectCB2_##name(struct MapObject *mapObject, struct Sprite *sprite)\ -{\ - return (retval);\ -} - -#define field_object_step(name, table) \ -extern bool8 (*const (table)[])(struct MapObject *, struct Sprite *);\ -bool8 FieldObjectCB2_##name(struct MapObject *, struct Sprite *);\ -void FieldObjectCB_##name(struct Sprite *sprite)\ -{\ - FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, FieldObjectCB2_##name);\ -}\ -bool8 FieldObjectCB2_##name(struct MapObject *mapObject, struct Sprite *sprite)\ -{\ - return (table)[sprite->data[1]](mapObject, sprite);\ -} - -#define field_object_path(idx, table, sub, path, catch, coord)\ -field_object_step(GoInDirectionSequence##idx, table)\ -extern const u8 path[4];\ -bool8 sub(struct MapObject *mapObject, struct Sprite *sprite)\ -{\ - u8 route[sizeof(path)];\ - memcpy(route, path, sizeof(path));\ - if (mapObject->directionSequenceIndex == (catch) && mapObject->initialCoords.coord == mapObject->currentCoords.coord)\ - {\ - mapObject->directionSequenceIndex = (catch) + 1;\ - }\ - return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, route);\ -}\ - -// Static struct declarations - -// Static RAM declarations +// this file was known as evobjmv.c in Game Freak's original source extern u8 gUnknown_020375B4; extern u16 gUnknown_020375B6; @@ -80,16 +37,16 @@ static u8 GetFieldObjectIdByLocalIdAndMapInternal(u8, u8, u8); static bool8 GetAvailableFieldObjectSlot(u16, u8, u8, u8 *); static void FieldObjectHandleDynamicGraphicsId(struct MapObject *); static void RemoveFieldObjectInternal (struct MapObject *); -/*static*/ u16 GetFieldObjectFlagIdByFieldObjectId(u8); -void sub_8096518(struct MapObject *, struct Sprite *); +static u16 GetFieldObjectFlagIdByFieldObjectId(u8); +static void sub_8096518(struct MapObject *, struct Sprite *); static void MakeObjectTemplateFromFieldObjectTemplate(struct MapObjectTemplate *, struct SpriteTemplate *, const struct SubspriteTable **); -/*static*/ void GetFieldObjectMovingCameraOffset(s16 *, s16 *); -/*static*/ struct MapObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8, u8, u8); +static void GetFieldObjectMovingCameraOffset(s16 *, s16 *); +static struct MapObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8, u8, u8); static void sub_808E894(u16); static void RemoveFieldObjectIfOutsideView(struct MapObject *); static void sub_808E1B8(u8, s16, s16); static void SetPlayerAvatarFieldObjectIdAndObjectId(u8, u8); -/*static*/ void sub_808E38C(struct MapObject *); +static void sub_808E38C(struct MapObject *); static u8 sub_808E8F4(const struct SpritePalette *); static u8 FindFieldObjectPaletteIndexByTag(u16); static void sub_808EAB0(u16, u8); @@ -98,14 +55,10 @@ static void ObjectCB_CameraObject(struct Sprite *); static void CameraObject_0(struct Sprite *); static void CameraObject_1(struct Sprite *); static void CameraObject_2(struct Sprite *); -/*static*/ struct MapObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 localId, struct MapObjectTemplate *templates, u8 count); -void npc_reset(struct MapObject *, struct Sprite *); -void FieldObjectSetRegularAnim(struct MapObject *, struct Sprite *, u8); +static struct MapObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 localId, struct MapObjectTemplate *templates, u8 count); +static void npc_reset(struct MapObject *, struct Sprite *); +static void FieldObjectSetRegularAnim(struct MapObject *, struct Sprite *, u8); -u8 GetFaceDirectionAnimId(u32); -u8 GetGoSpeed0AnimId(u32); -u8 GetGoSpeed1AnimId(u32); -u8 GetGoSpeed3AnimId(u32); u8 sub_8093438(u32); u8 sub_80934BC(u32); u8 sub_8093514(u32); @@ -128,27 +81,6 @@ bool8 sub_809558C(struct MapObject *, struct Sprite *); bool8 sub_8095B64(struct MapObject *, struct Sprite *); static void sub_8096530(struct MapObject *, struct Sprite *); static void npc_update_obj_anim_flag(struct MapObject *, struct Sprite *); - -// ROM data - -struct PairedPalettes { - u16 tag; - const u16 *data; -}; - - -typedef void (*SpriteStepFunc)(struct Sprite *sprite, u8 dir); - -extern s16 gUnknown_0850E768[]; -extern SpriteStepFunc *const gUnknown_0850E754[]; -extern const s8 gUnknown_0850E772[]; -extern const s8 gUnknown_0850E7BA[]; -extern const s8 *const gUnknown_0850E834[]; -extern s16 gUnknown_0850E840[]; -extern u8 gUnknown_0850E846[]; -extern s16 gUnknown_0850E84A[]; -extern u8 gUnknown_0850E850[]; - static void FieldObjectUpdateMetatileBehaviors(struct MapObject*); static void GetGroundEffectFlags_Reflection(struct MapObject*, u32*); static void GetGroundEffectFlags_TallGrassOnSpawn(struct MapObject*, u32*); @@ -1982,7 +1914,7 @@ static void sub_808E1B8(u8 mapObjectId, s16 x, s16 y) } } -/*static*/ void sub_808E38C(struct MapObject *mapObject) +static void sub_808E38C(struct MapObject *mapObject) { mapObject->singleMovementActive = FALSE; mapObject->triggerGroundEffectsOnMove = TRUE; @@ -2591,7 +2523,7 @@ static u16 GetFieldObjectFlagIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGrou return GetFieldObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->flagId; } -u16 GetFieldObjectFlagIdByFieldObjectId(u8 mapObjectId) +static u16 GetFieldObjectFlagIdByFieldObjectId(u8 mapObjectId) { return GetFieldObjectFlagIdByLocalIdAndMap(gMapObjects[mapObjectId].localId, gMapObjects[mapObjectId].mapNum, gMapObjects[mapObjectId].mapGroup); } @@ -2628,7 +2560,7 @@ u8 FieldObjectGetBerryTreeId(u8 mapObjectId) return gMapObjects[mapObjectId].trainerRange_berryTreeId; } -struct MapObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +static struct MapObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { struct MapObjectTemplate *templates; const struct MapHeader *mapHeader; @@ -2648,7 +2580,7 @@ struct MapObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8 localId, u8 m return FindFieldObjectTemplateInArrayByLocalId(localId, templates, count); } -struct MapObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 localId, struct MapObjectTemplate *templates, u8 count) +static struct MapObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 localId, struct MapObjectTemplate *templates, u8 count) { u8 i; @@ -4523,7 +4455,7 @@ bool8 sub_809292C(struct MapObject *mapObject, struct Sprite *sprite) return FALSE; } -void npc_reset(struct MapObject *mapObject, struct Sprite *sprite) +static void npc_reset(struct MapObject *mapObject, struct Sprite *sprite) { mapObject->singleMovementActive = FALSE; mapObject->heldMovementActive = FALSE; @@ -4871,7 +4803,7 @@ void sub_80930E0(s16 *x, s16 *y, s16 dx, s16 dy) *y += dy; } -void GetFieldObjectMovingCameraOffset(s16 *x, s16 *y) +static void GetFieldObjectMovingCameraOffset(s16 *x, s16 *y) { *x = 0; *y = 0; @@ -5109,7 +5041,7 @@ bool8 FieldObjectExecRegularAnim(struct MapObject *mapObject, struct Sprite *spr return FALSE; } -void FieldObjectSetRegularAnim(struct MapObject *mapObject, struct Sprite *sprite, u8 animId) +static void FieldObjectSetRegularAnim(struct MapObject *mapObject, struct Sprite *sprite, u8 animId) { mapObject->movementActionId = animId; sprite->data[2] = 0; @@ -5995,7 +5927,7 @@ bool8 sub_8096494(struct MapObject *mapObject, struct Sprite *sprite) return FALSE; } -bool8 sub_80964B8(struct MapObject *mapObject, struct Sprite *sprite) +u8 sub_80964B8(struct MapObject *mapObject, struct Sprite *sprite) { return TRUE; } @@ -6024,7 +5956,7 @@ void sub_80964E8(struct MapObject *mapObject, struct Sprite *sprite) } } -void sub_8096518(struct MapObject *mapObject, struct Sprite *sprite) +static void sub_8096518(struct MapObject *mapObject, struct Sprite *sprite) { sub_8096530(mapObject, sprite); npc_update_obj_anim_flag(mapObject, sprite); @@ -6909,6 +6841,71 @@ void oamt_npc_ministep_reset(struct Sprite *sprite, u8 a2, u8 a3) sprite->data[5] = 0; } +typedef void (*SpriteStepFunc)(struct Sprite *sprite, u8 dir); + +static const SpriteStepFunc gUnknown_0850E6C4[] = { + little_step, + little_step, + little_step, + little_step, + little_step, + little_step, + little_step, + little_step, + little_step, + little_step, + little_step, + little_step, + little_step, + little_step, + little_step, + little_step, +}; + +static const SpriteStepFunc gUnknown_0850E704[] = { + double_little_steps, + double_little_steps, + double_little_steps, + double_little_steps, + double_little_steps, + double_little_steps, + double_little_steps, + double_little_steps, +}; + +static const SpriteStepFunc gUnknown_0850E724[] = { + double_little_steps, + triple_little_steps, + triple_little_steps, + double_little_steps, + triple_little_steps, + triple_little_steps, +}; + +static const SpriteStepFunc gUnknown_0850E73C[] = { + quad_little_steps, + quad_little_steps, + quad_little_steps, + quad_little_steps, +}; + +static const SpriteStepFunc gUnknown_0850E74C[] = { + oct_little_steps, + oct_little_steps, +}; + +static const SpriteStepFunc *const gUnknown_0850E754[] = { + gUnknown_0850E6C4, + gUnknown_0850E704, + gUnknown_0850E724, + gUnknown_0850E73C, + gUnknown_0850E74C, +}; + +static const s16 gUnknown_0850E768[] = { + 16, 8, 6, 4, 2 +}; + bool8 obj_npc_ministep(struct Sprite *sprite) { if (sprite->data[5] >= gUnknown_0850E768[sprite->data[4]]) @@ -6947,7 +6944,29 @@ bool8 sub_80976EC(struct Sprite *sprite) return FALSE; } -// new helper added here in the middle. Perhaps Game Freak kept these organized in alphebetical order or some other heirarchy? +const s8 gUnknown_0850E772[] = { + 1, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 1, 2, 2, 1, 2, + 2, 1, 2, 2, 1, 2, 1, 1, + 2, 1, 1, 2, 1, 1, 2, 1, + 1, 2, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 0, 1, 1, 1, 0, 1, 1, 0, + 1, 0, 1, 0, 1, 0, 0, 0, + 0, 1, 0, 0, 0, 0, 0, 0, +}; + +const s8 gUnknown_0850E7BA[] = { + 0, 0, 1, 0, 0, 1, 0, 0, + 1, 0, 1, 1, 0, 1, 1, 0, + 1, 1, 0, 1, 1, 0, 1, 1, + 0, 0, 1, 0, 0, 1, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, -1, 0, 0, -1, 0, 0, + -1, 0, -1, -1, 0, -1, -1, 0, + -1, -1, -1, -1, -1, -1, -1, -2, +}; s16 sub_8097728(s16 a1) { @@ -7002,6 +7021,24 @@ bool8 sub_8097758(struct Sprite *sprite) return result; } +static const s8 gUnknown_0850E802[] = { + -4, -6, -8, -10, -11, -12, -12, -12, -11, -10, -9, -8, -6, -4, 0, 0 +}; + +static const s8 gUnknown_0850E812[] = { + 0, -2, -3, -4, -5, -6, -6, -6, -5, -5, -4, -3, -2, 0, 0, 0 +}; + +static const s8 gUnknown_0850E822[] = { + -2, -4, -6, -8, -9, -10, -10, -10, -9, -8, -6, -5, -3, -2, 0, 0 +}; + +static const s8 *const gUnknown_0850E834[] = { + gUnknown_0850E802, + gUnknown_0850E812, + gUnknown_0850E822 +}; + s16 sub_8097820(s16 a1, u8 a2) { return gUnknown_0850E834[a2][a1]; @@ -7015,6 +7052,14 @@ void sub_809783C(struct Sprite *sprite, u8 a2, u8 a3, u8 a4) sprite->data[6] = 0; } +static const s16 gUnknown_0850E840[] = { + 16, 16, 32, +}; + +static const u8 gUnknown_0850E846[] = { + 0, 0, 1, +}; + u8 sub_809785C(struct Sprite *sprite) { s16 v5[3]; @@ -7044,6 +7089,14 @@ u8 sub_809785C(struct Sprite *sprite) return v2; } +static const s16 gUnknown_0850E84A[] = { + 32, 32, 64, +}; + +static const u8 gUnknown_0850E850[] = { + 1, 1, 2, +}; + u8 sub_80978E4(struct Sprite *sprite) { s16 v5[3]; @@ -7326,7 +7379,29 @@ static void DoRippleFieldEffect(struct MapObject *mapObject, struct Sprite *spri FieldEffectStart(FLDEFF_RIPPLE); } -bool32 sub_8097E50(struct MapObject *mapObject, struct Sprite *sprite) +u8 (*const gUnknown_0850E854[])(struct MapObject *, struct Sprite *) = { + sub_8097E50, + sub_80964B8, +}; + +u8 (*const gUnknown_0850E85C[])(struct MapObject *, struct Sprite *) = { + sub_8097EF0, + sub_80964B8, +}; + +u8 (*const gUnknown_0850E864[])(struct MapObject *, struct Sprite *) = { + sub_80980C0, + sub_80980D0, + sub_8098124, +}; + +u8 (*const gUnknown_0850E870[])(struct MapObject *, struct Sprite *) = { + sub_80980F4, + sub_8098108, + sub_8098124, +}; + +u8 sub_8097E50(struct MapObject *mapObject, struct Sprite *sprite) { u32 one; bool32 ableToStore = FALSE; @@ -7373,7 +7448,7 @@ bool32 sub_8097E50(struct MapObject *mapObject, struct Sprite *sprite) return TRUE; } -bool32 sub_8097EF0(struct MapObject *mapObject, struct Sprite *sprite) +u8 sub_8097EF0(struct MapObject *mapObject, struct Sprite *sprite) { bool32 ableToStore; u8 id; @@ -7463,14 +7538,14 @@ void sub_8098074(u8 var1, u8 var2) } } -bool32 sub_80980C0(struct MapObject *mapObject, struct Sprite *sprite) +u8 sub_80980C0(struct MapObject *mapObject, struct Sprite *sprite) { sprite->pos2.y = 0; sprite->data[2]++; return FALSE; } -bool32 sub_80980D0(struct MapObject *mapObject, struct Sprite *sprite) +u8 sub_80980D0(struct MapObject *mapObject, struct Sprite *sprite) { sprite->pos2.y -= 8; @@ -7479,14 +7554,14 @@ bool32 sub_80980D0(struct MapObject *mapObject, struct Sprite *sprite) return FALSE; } -bool32 sub_80980F4(struct MapObject *mapObject, struct Sprite *sprite) +u8 sub_80980F4(struct MapObject *mapObject, struct Sprite *sprite) { sprite->pos2.y = -160; sprite->data[2]++; return FALSE; } -bool32 sub_8098108(struct MapObject *mapObject, struct Sprite *sprite) +u8 sub_8098108(struct MapObject *mapObject, struct Sprite *sprite) { sprite->pos2.y += 8; @@ -7496,7 +7571,7 @@ bool32 sub_8098108(struct MapObject *mapObject, struct Sprite *sprite) } // though this function returns TRUE without doing anything, this header is required due to being in an array of functions which needs it. -bool32 sub_8098124(struct MapObject *mapObject, struct Sprite *sprite) +u8 sub_8098124(struct MapObject *mapObject, struct Sprite *sprite) { return TRUE; } From aa9a45c16fbaee2fffc94e4741e0a1f203b244bc Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 11 Jun 2018 19:11:48 -0500 Subject: [PATCH 09/55] Rebrand 'map object' and 'field object' to 'event object' --- asm/battle_frontier_1.s | 10 +- asm/battle_frontier_2.s | 36 +- asm/cable_car.s | 6 +- asm/easy_chat.s | 4 +- asm/field_control_avatar.s | 62 +- asm/field_effect_helpers.s | 96 +- asm/field_player_avatar.s | 286 +- asm/field_screen.s | 60 +- asm/field_specials.s | 42 +- asm/fldeff_80F9BCC.s | 16 +- asm/pokenav.s | 38 +- asm/rom_8011DC0.s | 20 +- asm/script_pokemon_util_80F87D8.s | 12 +- asm/shop.s | 38 +- data/cable_car.s | 14 +- data/field_effect_misc.s | 6 +- data/map_events.s | 2 +- .../events/AbandonedShip_CaptainsOffice.inc | 8 +- .../events/AbandonedShip_Corridors_1F.inc | 8 +- .../events/AbandonedShip_Corridors_B1F.inc | 8 +- .../events/AbandonedShip_HiddenFloorRooms.inc | 12 +- data/maps/events/AbandonedShip_Room_B1F.inc | 6 +- data/maps/events/AbandonedShip_Rooms2_1F.inc | 14 +- data/maps/events/AbandonedShip_Rooms2_B1F.inc | 8 +- data/maps/events/AbandonedShip_Rooms_1F.inc | 12 +- data/maps/events/AbandonedShip_Rooms_B1F.inc | 8 +- data/maps/events/AncientTomb.inc | 6 +- data/maps/events/AquaHideout_1F.inc | 10 +- data/maps/events/AquaHideout_B1F.inc | 22 +- data/maps/events/AquaHideout_B2F.inc | 16 +- data/maps/events/ArtisanCave_1F.inc | 6 +- data/maps/events/ArtisanCave_B1F.inc | 6 +- .../BattleFrontier_BattleArenaBattleRoom.inc | 22 +- .../BattleFrontier_BattleArenaCorridor.inc | 6 +- .../BattleFrontier_BattleArenaLobby.inc | 14 +- .../BattleFrontier_BattleDomeBattleRoom.inc | 34 +- .../BattleFrontier_BattleDomeCorridor.inc | 6 +- .../events/BattleFrontier_BattleDomeLobby.inc | 16 +- ...BattleFrontier_BattleDomePreBattleRoom.inc | 6 +- ...BattleFrontier_BattleFactoryBattleRoom.inc | 18 +- .../BattleFrontier_BattleFactoryLobby.inc | 16 +- ...tleFrontier_BattleFactoryPreBattleRoom.inc | 6 +- .../BattleFrontier_BattlePalaceBattleRoom.inc | 14 +- .../BattleFrontier_BattlePalaceCorridor.inc | 18 +- .../BattleFrontier_BattlePalaceLobby.inc | 16 +- .../BattleFrontier_BattlePikeCorridor.inc | 6 +- .../events/BattleFrontier_BattlePikeLobby.inc | 12 +- .../BattleFrontier_BattlePikeRandomRoom1.inc | 8 +- .../BattleFrontier_BattlePikeRandomRoom2.inc | 6 +- ...BattleFrontier_BattlePikeThreePathRoom.inc | 8 +- ...ntier_BattlePointExchangeServiceCorner.inc | 22 +- ...attleFrontier_BattlePyramidEmptySquare.inc | 36 +- .../BattleFrontier_BattlePyramidLobby.inc | 12 +- .../BattleFrontier_BattlePyramidTop.inc | 8 +- .../BattleFrontier_BattleTowerBattleRoom.inc | 10 +- .../BattleFrontier_BattleTowerBattleRoom2.inc | 12 +- .../BattleFrontier_BattleTowerCorridor.inc | 6 +- .../BattleFrontier_BattleTowerCorridor2.inc | 8 +- .../BattleFrontier_BattleTowerElevator.inc | 6 +- .../BattleFrontier_BattleTowerLobby.inc | 22 +- ...tleFrontier_BattleTowerMultiBattleRoom.inc | 18 +- data/maps/events/BattleFrontier_Lounge1.inc | 10 +- data/maps/events/BattleFrontier_Lounge2.inc | 14 +- data/maps/events/BattleFrontier_Lounge3.inc | 14 +- data/maps/events/BattleFrontier_Lounge4.inc | 10 +- data/maps/events/BattleFrontier_Lounge5.inc | 12 +- data/maps/events/BattleFrontier_Lounge6.inc | 6 +- data/maps/events/BattleFrontier_Lounge7.inc | 12 +- data/maps/events/BattleFrontier_Lounge8.inc | 10 +- data/maps/events/BattleFrontier_Lounge9.inc | 6 +- data/maps/events/BattleFrontier_Mart.inc | 12 +- .../events/BattleFrontier_OutsideEast.inc | 56 +- .../events/BattleFrontier_OutsideWest.inc | 52 +- .../BattleFrontier_PokemonCenter_1F.inc | 14 +- .../BattleFrontier_PokemonCenter_2F.inc | 12 +- .../events/BattleFrontier_RankingHall.inc | 10 +- .../events/BattleFrontier_ReceptionGate.inc | 14 +- .../events/BattleFrontier_ScottsHouse.inc | 6 +- data/maps/events/BattlePyramidSquare01.inc | 18 +- data/maps/events/BattlePyramidSquare02.inc | 18 +- data/maps/events/BattlePyramidSquare03.inc | 18 +- data/maps/events/BattlePyramidSquare04.inc | 18 +- data/maps/events/BattlePyramidSquare05.inc | 18 +- data/maps/events/BattlePyramidSquare06.inc | 18 +- data/maps/events/BattlePyramidSquare07.inc | 18 +- data/maps/events/BattlePyramidSquare08.inc | 18 +- data/maps/events/BattlePyramidSquare09.inc | 18 +- data/maps/events/BattlePyramidSquare10.inc | 18 +- data/maps/events/BattlePyramidSquare11.inc | 18 +- data/maps/events/BattlePyramidSquare12.inc | 18 +- data/maps/events/BattlePyramidSquare13.inc | 18 +- data/maps/events/BattlePyramidSquare14.inc | 18 +- data/maps/events/BattlePyramidSquare15.inc | 18 +- data/maps/events/BattlePyramidSquare16.inc | 18 +- data/maps/events/BirthIsland_Exterior.inc | 8 +- data/maps/events/BirthIsland_Harbor.inc | 8 +- data/maps/events/CaveOfOrigin_B1F.inc | 6 +- data/maps/events/DesertRuins.inc | 6 +- data/maps/events/DesertUnderpass.inc | 6 +- data/maps/events/DewfordTown.inc | 14 +- data/maps/events/DewfordTown_Gym.inc | 20 +- data/maps/events/DewfordTown_Hall.inc | 22 +- data/maps/events/DewfordTown_House1.inc | 10 +- data/maps/events/DewfordTown_House2.inc | 8 +- .../events/DewfordTown_PokemonCenter_1F.inc | 10 +- .../events/DewfordTown_PokemonCenter_2F.inc | 12 +- .../events/EverGrandeCity_ChampionsRoom.inc | 10 +- .../maps/events/EverGrandeCity_DrakesRoom.inc | 6 +- .../events/EverGrandeCity_GlaciasRoom.inc | 6 +- .../maps/events/EverGrandeCity_HallOfFame.inc | 6 +- .../events/EverGrandeCity_PhoebesRoom.inc | 6 +- .../EverGrandeCity_PokemonCenter_1F.inc | 12 +- .../EverGrandeCity_PokemonCenter_2F.inc | 12 +- .../EverGrandeCity_PokemonLeague_1F.inc | 12 +- .../EverGrandeCity_PokemonLeague_2F.inc | 12 +- .../events/EverGrandeCity_SidneysRoom.inc | 6 +- data/maps/events/FallarborTown.inc | 12 +- .../FallarborTown_BattleTentBattleRoom.inc | 10 +- .../FallarborTown_BattleTentCorridor.inc | 6 +- .../events/FallarborTown_BattleTentLobby.inc | 14 +- data/maps/events/FallarborTown_House1.inc | 8 +- data/maps/events/FallarborTown_House2.inc | 6 +- data/maps/events/FallarborTown_Mart.inc | 14 +- .../events/FallarborTown_PokemonCenter_1F.inc | 12 +- .../events/FallarborTown_PokemonCenter_2F.inc | 12 +- data/maps/events/FarawayIsland_Entrance.inc | 8 +- data/maps/events/FarawayIsland_Interior.inc | 6 +- data/maps/events/FieryPath.inc | 20 +- data/maps/events/FortreeCity.inc | 18 +- .../events/FortreeCity_DecorationShop.inc | 12 +- data/maps/events/FortreeCity_Gym.inc | 20 +- data/maps/events/FortreeCity_House1.inc | 10 +- data/maps/events/FortreeCity_House2.inc | 8 +- data/maps/events/FortreeCity_House3.inc | 8 +- data/maps/events/FortreeCity_House4.inc | 10 +- data/maps/events/FortreeCity_House5.inc | 10 +- data/maps/events/FortreeCity_Mart.inc | 12 +- .../events/FortreeCity_PokemonCenter_1F.inc | 12 +- .../events/FortreeCity_PokemonCenter_2F.inc | 12 +- data/maps/events/GraniteCave_1F.inc | 8 +- data/maps/events/GraniteCave_B1F.inc | 6 +- data/maps/events/GraniteCave_B2F.inc | 22 +- data/maps/events/GraniteCave_StevensRoom.inc | 6 +- data/maps/events/InsideOfTruck.inc | 10 +- data/maps/events/IslandCave.inc | 6 +- data/maps/events/JaggedPass.inc | 18 +- data/maps/events/LavaridgeTown.inc | 22 +- data/maps/events/LavaridgeTown_Gym_1F.inc | 16 +- data/maps/events/LavaridgeTown_Gym_B1F.inc | 12 +- data/maps/events/LavaridgeTown_HerbShop.inc | 10 +- data/maps/events/LavaridgeTown_House.inc | 10 +- data/maps/events/LavaridgeTown_Mart.inc | 10 +- .../events/LavaridgeTown_PokemonCenter_1F.inc | 12 +- .../events/LavaridgeTown_PokemonCenter_2F.inc | 12 +- data/maps/events/LilycoveCity.inc | 48 +- data/maps/events/LilycoveCity_ContestHall.inc | 68 +- .../maps/events/LilycoveCity_ContestLobby.inc | 54 +- .../events/LilycoveCity_CoveLilyMotel_1F.inc | 6 +- .../events/LilycoveCity_CoveLilyMotel_2F.inc | 18 +- .../LilycoveCity_DepartmentStoreElevator.inc | 6 +- .../LilycoveCity_DepartmentStoreRooftop.inc | 12 +- .../LilycoveCity_DepartmentStore_1F.inc | 16 +- .../LilycoveCity_DepartmentStore_2F.inc | 14 +- .../LilycoveCity_DepartmentStore_3F.inc | 14 +- .../LilycoveCity_DepartmentStore_4F.inc | 14 +- .../LilycoveCity_DepartmentStore_5F.inc | 18 +- data/maps/events/LilycoveCity_Harbor.inc | 14 +- data/maps/events/LilycoveCity_House1.inc | 8 +- data/maps/events/LilycoveCity_House2.inc | 6 +- data/maps/events/LilycoveCity_House3.inc | 16 +- data/maps/events/LilycoveCity_House4.inc | 8 +- .../events/LilycoveCity_LilycoveMuseum_1F.inc | 24 +- .../events/LilycoveCity_LilycoveMuseum_2F.inc | 12 +- .../events/LilycoveCity_MoveDeletersHouse.inc | 6 +- .../events/LilycoveCity_PokemonCenter_1F.inc | 14 +- .../events/LilycoveCity_PokemonCenter_2F.inc | 12 +- .../LilycoveCity_PokemonTrainerFanClub.inc | 22 +- data/maps/events/LinkContestRoom1.inc | 22 +- data/maps/events/LittlerootTown.inc | 20 +- .../LittlerootTown_BrendansHouse_1F.inc | 18 +- .../LittlerootTown_BrendansHouse_2F.inc | 24 +- .../events/LittlerootTown_MaysHouse_1F.inc | 18 +- .../events/LittlerootTown_MaysHouse_2F.inc | 24 +- .../LittlerootTown_ProfessorBirchsLab.inc | 16 +- data/maps/events/MagmaHideout_1F.inc | 16 +- data/maps/events/MagmaHideout_2F_1R.inc | 12 +- data/maps/events/MagmaHideout_2F_2R.inc | 16 +- data/maps/events/MagmaHideout_3F_1R.inc | 10 +- data/maps/events/MagmaHideout_3F_2R.inc | 8 +- data/maps/events/MagmaHideout_3F_3R.inc | 6 +- data/maps/events/MagmaHideout_4F.inc | 20 +- data/maps/events/MarineCave_End.inc | 6 +- data/maps/events/MauvilleCity.inc | 26 +- data/maps/events/MauvilleCity_BikeShop.inc | 8 +- data/maps/events/MauvilleCity_GameCorner.inc | 28 +- data/maps/events/MauvilleCity_Gym.inc | 18 +- data/maps/events/MauvilleCity_House1.inc | 6 +- data/maps/events/MauvilleCity_House2.inc | 6 +- data/maps/events/MauvilleCity_Mart.inc | 10 +- .../events/MauvilleCity_PokemonCenter_1F.inc | 14 +- .../events/MauvilleCity_PokemonCenter_2F.inc | 14 +- data/maps/events/MeteorFalls_1F_1R.inc | 24 +- data/maps/events/MeteorFalls_1F_2R.inc | 10 +- data/maps/events/MeteorFalls_B1F_2R.inc | 6 +- data/maps/events/MeteorFalls_StevensCave.inc | 6 +- data/maps/events/MirageTower_3F.inc | 8 +- data/maps/events/MirageTower_4F.inc | 10 +- data/maps/events/MossdeepCity.inc | 38 +- .../events/MossdeepCity_GameCorner_1F.inc | 8 +- .../events/MossdeepCity_GameCorner_B1F.inc | 6 +- data/maps/events/MossdeepCity_Gym.inc | 76 +- data/maps/events/MossdeepCity_House1.inc | 8 +- data/maps/events/MossdeepCity_House2.inc | 10 +- data/maps/events/MossdeepCity_House3.inc | 6 +- data/maps/events/MossdeepCity_House4.inc | 10 +- data/maps/events/MossdeepCity_Mart.inc | 12 +- .../events/MossdeepCity_PokemonCenter_1F.inc | 10 +- .../events/MossdeepCity_PokemonCenter_2F.inc | 14 +- .../events/MossdeepCity_SpaceCenter_1F.inc | 26 +- .../events/MossdeepCity_SpaceCenter_2F.inc | 22 +- .../maps/events/MossdeepCity_StevensHouse.inc | 10 +- data/maps/events/MtChimney.inc | 64 +- .../maps/events/MtChimney_CableCarStation.inc | 8 +- data/maps/events/MtPyre_1F.inc | 10 +- data/maps/events/MtPyre_2F.inc | 20 +- data/maps/events/MtPyre_3F.inc | 12 +- data/maps/events/MtPyre_4F.inc | 8 +- data/maps/events/MtPyre_5F.inc | 8 +- data/maps/events/MtPyre_6F.inc | 10 +- data/maps/events/MtPyre_Exterior.inc | 8 +- data/maps/events/MtPyre_Summit.inc | 20 +- data/maps/events/NavelRock_Bottom.inc | 6 +- data/maps/events/NavelRock_Harbor.inc | 8 +- data/maps/events/NavelRock_Top.inc | 6 +- data/maps/events/NewMauville_Inside.inc | 20 +- data/maps/events/OldaleTown.inc | 12 +- data/maps/events/OldaleTown_House1.inc | 6 +- data/maps/events/OldaleTown_House2.inc | 8 +- data/maps/events/OldaleTown_Mart.inc | 10 +- .../events/OldaleTown_PokemonCenter_1F.inc | 12 +- .../events/OldaleTown_PokemonCenter_2F.inc | 12 +- data/maps/events/PacifidlogTown.inc | 10 +- data/maps/events/PacifidlogTown_House1.inc | 8 +- data/maps/events/PacifidlogTown_House2.inc | 10 +- data/maps/events/PacifidlogTown_House3.inc | 8 +- data/maps/events/PacifidlogTown_House4.inc | 10 +- data/maps/events/PacifidlogTown_House5.inc | 8 +- .../PacifidlogTown_PokemonCenter_1F.inc | 14 +- .../PacifidlogTown_PokemonCenter_2F.inc | 12 +- data/maps/events/PetalburgCity.inc | 22 +- data/maps/events/PetalburgCity_Gym.inc | 26 +- data/maps/events/PetalburgCity_House1.inc | 8 +- data/maps/events/PetalburgCity_House2.inc | 8 +- data/maps/events/PetalburgCity_Mart.inc | 12 +- .../events/PetalburgCity_PokemonCenter_1F.inc | 14 +- .../events/PetalburgCity_PokemonCenter_2F.inc | 12 +- .../maps/events/PetalburgCity_WallysHouse.inc | 8 +- data/maps/events/PetalburgWoods.inc | 30 +- data/maps/events/RecordCorner.inc | 6 +- data/maps/events/Route101.inc | 16 +- data/maps/events/Route102.inc | 22 +- data/maps/events/Route103.inc | 44 +- data/maps/events/Route104.inc | 72 +- data/maps/events/Route104_MrBrineysHouse.inc | 8 +- .../events/Route104_PrettyPetalFlowerShop.inc | 10 +- data/maps/events/Route105.inc | 20 +- data/maps/events/Route106.inc | 14 +- data/maps/events/Route107.inc | 18 +- data/maps/events/Route108.inc | 18 +- data/maps/events/Route109.inc | 52 +- data/maps/events/Route109_SeashoreHouse.inc | 12 +- data/maps/events/Route110.inc | 76 +- .../Route110_SeasideCyclingRoadEntrance1.inc | 6 +- .../Route110_SeasideCyclingRoadEntrance2.inc | 6 +- data/maps/events/Route110_TrickHouseEnd.inc | 6 +- .../events/Route110_TrickHouseEntrance.inc | 6 +- .../events/Route110_TrickHousePuzzle1.inc | 34 +- .../events/Route110_TrickHousePuzzle2.inc | 14 +- .../events/Route110_TrickHousePuzzle3.inc | 18 +- .../events/Route110_TrickHousePuzzle4.inc | 32 +- .../events/Route110_TrickHousePuzzle5.inc | 14 +- .../events/Route110_TrickHousePuzzle6.inc | 12 +- .../events/Route110_TrickHousePuzzle7.inc | 22 +- .../events/Route110_TrickHousePuzzle8.inc | 12 +- data/maps/events/Route111.inc | 96 +- .../maps/events/Route111_OldLadysRestStop.inc | 6 +- .../events/Route111_WinstrateFamilysHouse.inc | 12 +- data/maps/events/Route112.inc | 32 +- data/maps/events/Route112_CableCarStation.inc | 8 +- data/maps/events/Route113.inc | 36 +- data/maps/events/Route113_GlassWorkshop.inc | 8 +- data/maps/events/Route114.inc | 58 +- .../events/Route114_FossilManiacsHouse.inc | 6 +- .../events/Route114_FossilManiacsTunnel.inc | 6 +- data/maps/events/Route114_LanettesHouse.inc | 6 +- data/maps/events/Route115.inc | 50 +- data/maps/events/Route116.inc | 60 +- .../events/Route116_TunnelersRestHouse.inc | 10 +- data/maps/events/Route117.inc | 52 +- data/maps/events/Route117_PokemonDayCare.inc | 6 +- data/maps/events/Route118.inc | 46 +- data/maps/events/Route119.inc | 90 +- data/maps/events/Route119_House.inc | 18 +- .../events/Route119_WeatherInstitute_1F.inc | 14 +- .../events/Route119_WeatherInstitute_2F.inc | 20 +- data/maps/events/Route120.inc | 92 +- data/maps/events/Route121.inc | 62 +- .../events/Route121_SafariZoneEntrance.inc | 10 +- data/maps/events/Route123.inc | 90 +- .../events/Route123_BerryMastersHouse.inc | 8 +- data/maps/events/Route124.inc | 28 +- .../Route124_DivingTreasureHuntersHouse.inc | 6 +- data/maps/events/Route125.inc | 24 +- data/maps/events/Route126.inc | 22 +- data/maps/events/Route127.inc | 26 +- data/maps/events/Route128.inc | 24 +- data/maps/events/Route129.inc | 14 +- data/maps/events/Route130.inc | 12 +- data/maps/events/Route131.inc | 20 +- data/maps/events/Route132.inc | 24 +- data/maps/events/Route133.inc | 24 +- data/maps/events/Route134.inc | 26 +- data/maps/events/RustboroCity.inc | 36 +- .../maps/events/RustboroCity_CuttersHouse.inc | 8 +- .../maps/events/RustboroCity_DevonCorp_1F.inc | 10 +- .../maps/events/RustboroCity_DevonCorp_2F.inc | 16 +- .../maps/events/RustboroCity_DevonCorp_3F.inc | 10 +- data/maps/events/RustboroCity_Flat1_1F.inc | 8 +- data/maps/events/RustboroCity_Flat1_2F.inc | 20 +- data/maps/events/RustboroCity_Flat2_1F.inc | 8 +- data/maps/events/RustboroCity_Flat2_2F.inc | 8 +- data/maps/events/RustboroCity_Flat2_3F.inc | 8 +- data/maps/events/RustboroCity_Gym.inc | 14 +- data/maps/events/RustboroCity_House1.inc | 8 +- data/maps/events/RustboroCity_House2.inc | 8 +- data/maps/events/RustboroCity_House3.inc | 10 +- data/maps/events/RustboroCity_Mart.inc | 12 +- .../events/RustboroCity_PokemonCenter_1F.inc | 12 +- .../events/RustboroCity_PokemonCenter_2F.inc | 12 +- .../events/RustboroCity_PokemonSchool.inc | 18 +- data/maps/events/RusturfTunnel.inc | 24 +- data/maps/events/SSTidalCorridor.inc | 14 +- data/maps/events/SSTidalLowerDeck.inc | 8 +- data/maps/events/SSTidalRooms.inc | 20 +- data/maps/events/SafariZone_North.inc | 22 +- data/maps/events/SafariZone_Northeast.inc | 22 +- data/maps/events/SafariZone_Northwest.inc | 8 +- data/maps/events/SafariZone_RestHouse.inc | 10 +- data/maps/events/SafariZone_South.inc | 16 +- data/maps/events/SafariZone_Southeast.inc | 14 +- data/maps/events/SafariZone_Southwest.inc | 8 +- data/maps/events/ScorchedSlab.inc | 6 +- data/maps/events/SeafloorCavern_Entrance.inc | 6 +- data/maps/events/SeafloorCavern_Room1.inc | 14 +- data/maps/events/SeafloorCavern_Room2.inc | 20 +- data/maps/events/SeafloorCavern_Room3.inc | 22 +- data/maps/events/SeafloorCavern_Room4.inc | 8 +- data/maps/events/SeafloorCavern_Room5.inc | 16 +- data/maps/events/SeafloorCavern_Room8.inc | 28 +- data/maps/events/SeafloorCavern_Room9.inc | 18 +- data/maps/events/SecretBase_BlueCave1.inc | 16 +- data/maps/events/SecretBase_BlueCave2.inc | 16 +- data/maps/events/SecretBase_BlueCave3.inc | 16 +- data/maps/events/SecretBase_BlueCave4.inc | 16 +- data/maps/events/SecretBase_BrownCave1.inc | 16 +- data/maps/events/SecretBase_BrownCave2.inc | 16 +- data/maps/events/SecretBase_BrownCave3.inc | 16 +- data/maps/events/SecretBase_BrownCave4.inc | 16 +- data/maps/events/SecretBase_RedCave1.inc | 16 +- data/maps/events/SecretBase_RedCave2.inc | 16 +- data/maps/events/SecretBase_RedCave3.inc | 16 +- data/maps/events/SecretBase_RedCave4.inc | 16 +- data/maps/events/SecretBase_Shrub1.inc | 16 +- data/maps/events/SecretBase_Shrub2.inc | 16 +- data/maps/events/SecretBase_Shrub3.inc | 16 +- data/maps/events/SecretBase_Shrub4.inc | 16 +- data/maps/events/SecretBase_Tree1.inc | 16 +- data/maps/events/SecretBase_Tree2.inc | 16 +- data/maps/events/SecretBase_Tree3.inc | 16 +- data/maps/events/SecretBase_Tree4.inc | 16 +- data/maps/events/SecretBase_YellowCave1.inc | 16 +- data/maps/events/SecretBase_YellowCave2.inc | 16 +- data/maps/events/SecretBase_YellowCave3.inc | 16 +- data/maps/events/SecretBase_YellowCave4.inc | 16 +- .../events/ShoalCave_LowTideEntranceRoom.inc | 8 +- data/maps/events/ShoalCave_LowTideIceRoom.inc | 8 +- .../events/ShoalCave_LowTideInnerRoom.inc | 6 +- .../events/ShoalCave_LowTideLowerRoom.inc | 8 +- .../events/ShoalCave_LowTideStairsRoom.inc | 6 +- data/maps/events/SingleBattleColosseum.inc | 6 +- data/maps/events/SkyPillar_Outside.inc | 6 +- data/maps/events/SkyPillar_Top.inc | 8 +- data/maps/events/SlateportCity.inc | 74 +- .../SlateportCity_BattleTentBattleRoom.inc | 10 +- .../SlateportCity_BattleTentCorridor.inc | 6 +- .../events/SlateportCity_BattleTentLobby.inc | 14 +- data/maps/events/SlateportCity_Harbor.inc | 20 +- data/maps/events/SlateportCity_House1.inc | 6 +- data/maps/events/SlateportCity_House2.inc | 8 +- data/maps/events/SlateportCity_Mart.inc | 10 +- .../events/SlateportCity_OceanicMuseum_1F.inc | 32 +- .../events/SlateportCity_OceanicMuseum_2F.inc | 18 +- .../events/SlateportCity_PokemonCenter_1F.inc | 10 +- .../events/SlateportCity_PokemonCenter_2F.inc | 12 +- .../events/SlateportCity_PokemonFanClub.inc | 22 +- .../SlateportCity_SternsShipyard_1F.inc | 12 +- .../SlateportCity_SternsShipyard_2F.inc | 10 +- data/maps/events/SootopolisCity.inc | 40 +- data/maps/events/SootopolisCity_Gym_1F.inc | 8 +- data/maps/events/SootopolisCity_Gym_B1F.inc | 24 +- data/maps/events/SootopolisCity_House1.inc | 8 +- data/maps/events/SootopolisCity_House2.inc | 6 +- data/maps/events/SootopolisCity_House3.inc | 8 +- data/maps/events/SootopolisCity_House4.inc | 10 +- data/maps/events/SootopolisCity_House5.inc | 8 +- data/maps/events/SootopolisCity_House6.inc | 6 +- data/maps/events/SootopolisCity_House7.inc | 8 +- .../SootopolisCity_LotadAndSeedotHouse.inc | 8 +- data/maps/events/SootopolisCity_Mart.inc | 10 +- .../SootopolisCity_MysteryEventsHouse_1F.inc | 6 +- .../SootopolisCity_MysteryEventsHouse_B1F.inc | 6 +- .../SootopolisCity_PokemonCenter_1F.inc | 12 +- .../SootopolisCity_PokemonCenter_2F.inc | 12 +- data/maps/events/SouthernIsland_Exterior.inc | 8 +- data/maps/events/SouthernIsland_Interior.inc | 8 +- data/maps/events/TerraCave_End.inc | 6 +- data/maps/events/TradeCenter.inc | 6 +- data/maps/events/TrainerHill_Elevator.inc | 6 +- data/maps/events/TrainerHill_Entrance.inc | 14 +- data/maps/events/TrainerHill_Roof.inc | 6 +- .../maps/events/Underwater_SeafloorCavern.inc | 12 +- data/maps/events/UnionRoom.inc | 18 +- data/maps/events/UnknownMap_25_34.inc | 2 +- data/maps/events/VerdanturfTown.inc | 12 +- .../VerdanturfTown_BattleTentBattleRoom.inc | 10 +- .../VerdanturfTown_BattleTentCorridor.inc | 6 +- .../events/VerdanturfTown_BattleTentLobby.inc | 16 +- .../VerdanturfTown_FriendshipRatersHouse.inc | 8 +- data/maps/events/VerdanturfTown_House.inc | 8 +- data/maps/events/VerdanturfTown_Mart.inc | 12 +- .../VerdanturfTown_PokemonCenter_1F.inc | 12 +- .../VerdanturfTown_PokemonCenter_2F.inc | 12 +- .../events/VerdanturfTown_WandasHouse.inc | 14 +- data/maps/events/VictoryRoad_1F.inc | 22 +- data/maps/events/VictoryRoad_B1F.inc | 46 +- data/maps/events/VictoryRoad_B2F.inc | 18 +- data/scripts/berry_tree.inc | 30 +- data/scripts/gabby_and_ty.inc | 4 +- .../BattleFrontier_BattlePikeRandomRoom1.inc | 2 +- .../maps/BattleFrontier_BattlePyramidTop.inc | 4 +- .../maps/MauvilleCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/NavelRock_Top.inc | 4 +- data/scripts/maps/SkyPillar_Top.inc | 8 +- data/scripts/maps/SootopolisCity.inc | 28 +- data/scripts/maps/SouthernIsland_Interior.inc | 4 +- data/scripts/pokeblocks.inc | 2 +- data/specials.inc | 24 +- .../field_effect_object_palette_00.pal | 0 .../field_effect_object_palette_01.pal | 0 .../field_effect_object_palette_02.pal | 0 .../field_effect_object_palette_03.pal | 0 .../field_effect_object_palette_04.pal | 0 .../field_effect_object_palette_05.pal | 0 .../field_effect_object_palette_06.pal | 0 .../field_effect_object_palette_07.pal | 0 .../field_effect_object_palette_08.pal | 0 .../field_effect_object_palette_10.pal | 0 .../palettes/field_object_palette_00.pal | 0 .../palettes/field_object_palette_01.pal | 0 .../palettes/field_object_palette_02.pal | 0 .../palettes/field_object_palette_03.pal | 0 .../palettes/field_object_palette_04.pal | 0 .../palettes/field_object_palette_05.pal | 0 .../palettes/field_object_palette_06.pal | 0 .../palettes/field_object_palette_07.pal | 0 .../palettes/field_object_palette_08.pal | 0 .../palettes/field_object_palette_09.pal | 0 .../palettes/field_object_palette_10.pal | 0 .../palettes/field_object_palette_11.pal | 0 .../palettes/field_object_palette_12.pal | 0 .../palettes/field_object_palette_13.pal | 0 .../palettes/field_object_palette_14.pal | 0 .../palettes/field_object_palette_15.pal | 0 .../palettes/field_object_palette_16.pal | 0 .../palettes/field_object_palette_17.pal | 0 .../palettes/field_object_palette_18.pal | 0 .../palettes/field_object_palette_19.pal | 0 .../palettes/field_object_palette_20.pal | 0 .../palettes/field_object_palette_21.pal | 0 .../palettes/field_object_palette_22.pal | 0 .../palettes/field_object_palette_23.pal | 0 .../palettes/field_object_palette_24.pal | 0 .../palettes/field_object_palette_25.pal | 0 .../palettes/field_object_palette_26.pal | 0 .../palettes/field_object_palette_27.pal | 0 .../palettes/field_object_palette_28.pal | 0 .../palettes/field_object_palette_29.pal | 0 .../palettes/field_object_palette_30.pal | 0 .../palettes/field_object_palette_31.pal | 0 .../palettes/field_object_palette_32.pal | 0 .../palettes/field_object_palette_33.pal | 0 .../palettes/field_object_palette_34.pal | 0 .../palettes/unused_palette.pal | 0 .../pics/berry_trees/aguav/0.png | Bin .../pics/berry_trees/aguav/1.png | Bin .../pics/berry_trees/aguav/2.png | Bin .../pics/berry_trees/aguav/3.png | Bin .../pics/berry_trees/aguav/4.png | Bin .../pics/berry_trees/aguav/5.png | Bin .../pics/berry_trees/aspear/0.png | Bin .../pics/berry_trees/aspear/1.png | Bin .../pics/berry_trees/aspear/2.png | Bin .../pics/berry_trees/aspear/3.png | Bin .../pics/berry_trees/aspear/4.png | Bin .../pics/berry_trees/aspear/5.png | Bin .../pics/berry_trees/cheri/0.png | Bin .../pics/berry_trees/cheri/1.png | Bin .../pics/berry_trees/cheri/2.png | Bin .../pics/berry_trees/cheri/3.png | Bin .../pics/berry_trees/cheri/4.png | Bin .../pics/berry_trees/cheri/5.png | Bin .../pics/berry_trees/chesto/0.png | Bin .../pics/berry_trees/chesto/1.png | Bin .../pics/berry_trees/chesto/2.png | Bin .../pics/berry_trees/chesto/3.png | Bin .../pics/berry_trees/chesto/4.png | Bin .../pics/berry_trees/chesto/5.png | Bin .../pics/berry_trees/cornn/0.png | Bin .../pics/berry_trees/cornn/1.png | Bin .../pics/berry_trees/cornn/2.png | Bin .../pics/berry_trees/cornn/3.png | Bin .../pics/berry_trees/cornn/4.png | Bin .../pics/berry_trees/cornn/5.png | Bin .../pics/berry_trees/dirt_pile.png | Bin .../pics/berry_trees/durin/0.png | Bin .../pics/berry_trees/durin/1.png | Bin .../pics/berry_trees/durin/2.png | Bin .../pics/berry_trees/durin/3.png | Bin .../pics/berry_trees/durin/4.png | Bin .../pics/berry_trees/durin/5.png | Bin .../pics/berry_trees/figy/0.png | Bin .../pics/berry_trees/figy/1.png | Bin .../pics/berry_trees/figy/2.png | Bin .../pics/berry_trees/figy/3.png | Bin .../pics/berry_trees/figy/4.png | Bin .../pics/berry_trees/figy/5.png | Bin .../pics/berry_trees/grepa/0.png | Bin .../pics/berry_trees/grepa/1.png | Bin .../pics/berry_trees/grepa/2.png | Bin .../pics/berry_trees/grepa/3.png | Bin .../pics/berry_trees/grepa/4.png | Bin .../pics/berry_trees/grepa/5.png | Bin .../pics/berry_trees/hondew/0.png | Bin .../pics/berry_trees/hondew/1.png | Bin .../pics/berry_trees/hondew/2.png | Bin .../pics/berry_trees/hondew/3.png | Bin .../pics/berry_trees/hondew/4.png | Bin .../pics/berry_trees/hondew/5.png | Bin .../pics/berry_trees/iapapa/0.png | Bin .../pics/berry_trees/iapapa/1.png | Bin .../pics/berry_trees/iapapa/2.png | Bin .../pics/berry_trees/iapapa/3.png | Bin .../pics/berry_trees/iapapa/4.png | Bin .../pics/berry_trees/iapapa/5.png | Bin .../pics/berry_trees/kelpsy/0.png | Bin .../pics/berry_trees/kelpsy/1.png | Bin .../pics/berry_trees/kelpsy/2.png | Bin .../pics/berry_trees/kelpsy/3.png | Bin .../pics/berry_trees/kelpsy/4.png | Bin .../pics/berry_trees/kelpsy/5.png | Bin .../pics/berry_trees/lansat/0.png | Bin .../pics/berry_trees/lansat/1.png | Bin .../pics/berry_trees/lansat/2.png | Bin .../pics/berry_trees/lansat/3.png | Bin .../pics/berry_trees/lansat/4.png | Bin .../pics/berry_trees/lansat/5.png | Bin .../pics/berry_trees/leppa/0.png | Bin .../pics/berry_trees/leppa/1.png | Bin .../pics/berry_trees/leppa/2.png | Bin .../pics/berry_trees/leppa/3.png | Bin .../pics/berry_trees/leppa/4.png | Bin .../pics/berry_trees/leppa/5.png | Bin .../pics/berry_trees/liechi/0.png | Bin .../pics/berry_trees/liechi/1.png | Bin .../pics/berry_trees/liechi/2.png | Bin .../pics/berry_trees/liechi/3.png | Bin .../pics/berry_trees/liechi/4.png | Bin .../pics/berry_trees/liechi/5.png | Bin .../pics/berry_trees/lum/0.png | Bin .../pics/berry_trees/lum/1.png | Bin .../pics/berry_trees/lum/2.png | Bin .../pics/berry_trees/lum/3.png | Bin .../pics/berry_trees/lum/4.png | Bin .../pics/berry_trees/lum/5.png | Bin .../pics/berry_trees/mago/0.png | Bin .../pics/berry_trees/mago/1.png | Bin .../pics/berry_trees/mago/2.png | Bin .../pics/berry_trees/mago/3.png | Bin .../pics/berry_trees/mago/4.png | Bin .../pics/berry_trees/mago/5.png | Bin .../pics/berry_trees/nomel/0.png | Bin .../pics/berry_trees/nomel/1.png | Bin .../pics/berry_trees/nomel/2.png | Bin .../pics/berry_trees/nomel/3.png | Bin .../pics/berry_trees/nomel/4.png | Bin .../pics/berry_trees/nomel/5.png | Bin .../pics/berry_trees/oran/0.png | Bin .../pics/berry_trees/oran/1.png | Bin .../pics/berry_trees/oran/2.png | Bin .../pics/berry_trees/oran/3.png | Bin .../pics/berry_trees/oran/4.png | Bin .../pics/berry_trees/oran/5.png | Bin .../pics/berry_trees/pamtre/0.png | Bin .../pics/berry_trees/pamtre/1.png | Bin .../pics/berry_trees/pamtre/2.png | Bin .../pics/berry_trees/pamtre/3.png | Bin .../pics/berry_trees/pamtre/4.png | Bin .../pics/berry_trees/pamtre/5.png | Bin .../pics/berry_trees/pecha/0.png | Bin .../pics/berry_trees/pecha/1.png | Bin .../pics/berry_trees/pecha/2.png | Bin .../pics/berry_trees/pecha/3.png | Bin .../pics/berry_trees/pecha/4.png | Bin .../pics/berry_trees/pecha/5.png | Bin .../pics/berry_trees/persim/0.png | Bin .../pics/berry_trees/persim/1.png | Bin .../pics/berry_trees/persim/2.png | Bin .../pics/berry_trees/persim/3.png | Bin .../pics/berry_trees/persim/4.png | Bin .../pics/berry_trees/persim/5.png | Bin .../pics/berry_trees/pomeg/0.png | Bin .../pics/berry_trees/pomeg/1.png | Bin .../pics/berry_trees/pomeg/2.png | Bin .../pics/berry_trees/pomeg/3.png | Bin .../pics/berry_trees/pomeg/4.png | Bin .../pics/berry_trees/pomeg/5.png | Bin .../pics/berry_trees/rabuta/0.png | Bin .../pics/berry_trees/rabuta/1.png | Bin .../pics/berry_trees/rabuta/2.png | Bin .../pics/berry_trees/rabuta/3.png | Bin .../pics/berry_trees/rabuta/4.png | Bin .../pics/berry_trees/rabuta/5.png | Bin .../pics/berry_trees/rawst/0.png | Bin .../pics/berry_trees/rawst/1.png | Bin .../pics/berry_trees/rawst/2.png | Bin .../pics/berry_trees/rawst/3.png | Bin .../pics/berry_trees/rawst/4.png | Bin .../pics/berry_trees/rawst/5.png | Bin .../pics/berry_trees/razz/0.png | Bin .../pics/berry_trees/razz/1.png | Bin .../pics/berry_trees/razz/2.png | Bin .../pics/berry_trees/razz/3.png | Bin .../pics/berry_trees/razz/4.png | Bin .../pics/berry_trees/razz/5.png | Bin .../pics/berry_trees/sitrus/0.png | Bin .../pics/berry_trees/sitrus/1.png | Bin .../pics/berry_trees/sitrus/2.png | Bin .../pics/berry_trees/sitrus/3.png | Bin .../pics/berry_trees/sitrus/4.png | Bin .../pics/berry_trees/sitrus/5.png | Bin .../pics/berry_trees/spelon/0.png | Bin .../pics/berry_trees/spelon/1.png | Bin .../pics/berry_trees/spelon/2.png | Bin .../pics/berry_trees/spelon/3.png | Bin .../pics/berry_trees/spelon/4.png | Bin .../pics/berry_trees/spelon/5.png | Bin .../pics/berry_trees/sprout/0.png | Bin .../pics/berry_trees/sprout/1.png | Bin .../pics/berry_trees/tamato/0.png | Bin .../pics/berry_trees/tamato/1.png | Bin .../pics/berry_trees/tamato/2.png | Bin .../pics/berry_trees/tamato/3.png | Bin .../pics/berry_trees/tamato/4.png | Bin .../pics/berry_trees/tamato/5.png | Bin .../pics/berry_trees/wepear/0.png | Bin .../pics/berry_trees/wepear/1.png | Bin .../pics/berry_trees/wepear/2.png | Bin .../pics/berry_trees/wepear/3.png | Bin .../pics/berry_trees/wepear/4.png | Bin .../pics/berry_trees/wepear/5.png | Bin .../pics/berry_trees/wiki/0.png | Bin .../pics/berry_trees/wiki/1.png | Bin .../pics/berry_trees/wiki/2.png | Bin .../pics/berry_trees/wiki/3.png | Bin .../pics/berry_trees/wiki/4.png | Bin .../pics/berry_trees/wiki/5.png | Bin .../pics/cushions/ball_cushion.png | Bin .../pics/cushions/diamond_cushion.png | Bin .../pics/cushions/fire_cushion.png | Bin .../pics/cushions/grass_cushion.png | Bin .../pics/cushions/kiss_cushion.png | Bin .../pics/cushions/pika_cushion.png | Bin .../pics/cushions/round_cushion.png | Bin .../pics/cushions/spin_cushion.png | Bin .../pics/cushions/water_cushion.png | Bin .../pics/cushions/zigzag_cushion.png | Bin .../pics/dolls/azurill_doll.png | Bin .../pics/dolls/baltoy_doll.png | Bin .../pics/dolls/big_blastoise_doll.png | Bin .../pics/dolls/big_charizard_doll.png | Bin .../pics/dolls/big_lapras_doll.png | Bin .../pics/dolls/big_regice_doll.png | Bin .../pics/dolls/big_regirock_doll.png | Bin .../pics/dolls/big_registeel_doll.png | Bin .../pics/dolls/big_rhydon_doll.png | Bin .../pics/dolls/big_snorlax_doll.png | Bin .../pics/dolls/big_venusaur_doll.png | Bin .../pics/dolls/big_wailmer_doll.png | Bin .../pics/dolls/chikorita_doll.png | Bin .../pics/dolls/clefairy_doll.png | Bin .../pics/dolls/cyndaquil_doll.png | Bin .../pics/dolls/ditto_doll.png | Bin .../pics/dolls/duskull_doll.png | Bin .../pics/dolls/gulpin_doll.png | Bin .../pics/dolls/jigglypuff_doll.png | Bin .../pics/dolls/kecleon_doll.png | Bin .../pics/dolls/lotad_doll.png | Bin .../pics/dolls/marill_doll.png | Bin .../pics/dolls/meowth_doll.png | Bin .../pics/dolls/mudkip_doll.png | Bin .../pics/dolls/pichu_doll.png | Bin .../pics/dolls/pikachu_doll.png | Bin .../pics/dolls/seedot_doll.png | Bin .../pics/dolls/skitty_doll.png | Bin .../pics/dolls/smoochum_doll.png | Bin .../pics/dolls/swablu_doll.png | Bin .../pics/dolls/togepi_doll.png | Bin .../pics/dolls/torchic_doll.png | Bin .../pics/dolls/totodile_doll.png | Bin .../pics/dolls/treecko_doll.png | Bin .../pics/dolls/unused_magnemite_doll.png | Bin .../pics/dolls/unused_natu_doll.png | Bin .../pics/dolls/unused_pikachu_doll.png | Bin .../pics/dolls/unused_porygon2_doll.png | Bin .../pics/dolls/unused_squirtle_doll.png | Bin .../pics/dolls/unused_wooper_doll.png | Bin .../pics/dolls/wynaut_doll.png | Bin .../pics/effects/arrow/0.png | Bin .../pics/effects/arrow/1.png | Bin .../pics/effects/arrow/2.png | Bin .../pics/effects/arrow/3.png | Bin .../pics/effects/arrow/4.png | Bin .../pics/effects/arrow/5.png | Bin .../pics/effects/arrow/6.png | Bin .../pics/effects/arrow/7.png | Bin .../pics/effects/ash/0.png | Bin .../pics/effects/ash/1.png | Bin .../pics/effects/ash/2.png | Bin .../pics/effects/ash/3.png | Bin .../pics/effects/ash/4.png | Bin .../effects/berry_tree_growth_sparkle/0.png | Bin .../effects/berry_tree_growth_sparkle/1.png | Bin .../effects/berry_tree_growth_sparkle/2.png | Bin .../effects/berry_tree_growth_sparkle/3.png | Bin .../effects/berry_tree_growth_sparkle/4.png | Bin .../effects/berry_tree_growth_sparkle/5.png | Bin .../pics/effects/bike_hop_big_splash/0.png | Bin .../pics/effects/bike_hop_big_splash/1.png | Bin .../pics/effects/bike_hop_big_splash/2.png | Bin .../pics/effects/bike_hop_big_splash/3.png | Bin .../pics/effects/bike_hop_small_splash/0.png | Bin .../pics/effects/bike_hop_small_splash/1.png | Bin .../pics/effects/bike_hop_small_splash/2.png | Bin .../pics/effects/bike_hop_tall_grass/0.png | Bin .../pics/effects/bike_hop_tall_grass/1.png | Bin .../pics/effects/bike_hop_tall_grass/2.png | Bin .../pics/effects/bike_hop_tall_grass/3.png | Bin .../pics/effects/bike_tire_tracks/0.png | Bin .../pics/effects/bike_tire_tracks/1.png | Bin .../pics/effects/bike_tire_tracks/2.png | Bin .../pics/effects/bike_tire_tracks/3.png | Bin .../pics/effects/bird.png | Bin .../pics/effects/bubbles/0.png | Bin .../pics/effects/bubbles/1.png | Bin .../pics/effects/bubbles/2.png | Bin .../pics/effects/bubbles/3.png | Bin .../pics/effects/bubbles/4.png | Bin .../pics/effects/bubbles/5.png | Bin .../pics/effects/bubbles/6.png | Bin .../pics/effects/bubbles/7.png | Bin .../pics/effects/deep_sand_footprints/0.png | Bin .../pics/effects/deep_sand_footprints/1.png | Bin .../pics/effects/ground_impact_dust/0.png | Bin .../pics/effects/ground_impact_dust/1.png | Bin .../pics/effects/ground_impact_dust/2.png | Bin .../pics/effects/hot_springs_water.png | Bin .../pics/effects/jump_out_of_ash/0.png | Bin .../pics/effects/jump_out_of_ash/1.png | Bin .../pics/effects/jump_out_of_ash/2.png | Bin .../pics/effects/jump_out_of_ash/3.png | Bin .../pics/effects/jump_out_of_ash/4.png | Bin .../pics/effects/long_grass/0.png | Bin .../pics/effects/long_grass/1.png | Bin .../pics/effects/long_grass/2.png | Bin .../pics/effects/long_grass/3.png | Bin .../pics/effects/mountain_disguise/0.png | Bin .../pics/effects/mountain_disguise/1.png | Bin .../pics/effects/mountain_disguise/2.png | Bin .../pics/effects/mountain_disguise/3.png | Bin .../pics/effects/mountain_disguise/4.png | Bin .../pics/effects/mountain_disguise/5.png | Bin .../pics/effects/mountain_disguise/6.png | Bin .../pics/effects/ripple/0.png | Bin .../pics/effects/ripple/1.png | Bin .../pics/effects/ripple/2.png | Bin .../pics/effects/ripple/3.png | Bin .../pics/effects/ripple/4.png | Bin .../effects/sand_disguise_placeholder/0.png | Bin .../effects/sand_disguise_placeholder/1.png | Bin .../effects/sand_disguise_placeholder/2.png | Bin .../effects/sand_disguise_placeholder/3.png | Bin .../effects/sand_disguise_placeholder/4.png | Bin .../effects/sand_disguise_placeholder/5.png | Bin .../effects/sand_disguise_placeholder/6.png | Bin .../pics/effects/sand_footprints/0.png | Bin .../pics/effects/sand_footprints/1.png | Bin .../pics/effects/shadow_extra_large.png | Bin .../pics/effects/shadow_large.png | Bin .../pics/effects/shadow_medium.png | Bin .../pics/effects/shadow_small.png | Bin .../pics/effects/short_grass/0.png | Bin .../pics/effects/short_grass/1.png | Bin .../pics/effects/splash/0.png | Bin .../pics/effects/splash/1.png | Bin .../pics/effects/surf_blob/0.png | Bin .../pics/effects/surf_blob/1.png | Bin .../pics/effects/surf_blob/2.png | Bin .../pics/effects/tall_grass/0.png | Bin .../pics/effects/tall_grass/1.png | Bin .../pics/effects/tall_grass/2.png | Bin .../pics/effects/tall_grass/3.png | Bin .../pics/effects/tall_grass/4.png | Bin .../pics/effects/tree_disguise/0.png | Bin .../pics/effects/tree_disguise/1.png | Bin .../pics/effects/tree_disguise/2.png | Bin .../pics/effects/tree_disguise/3.png | Bin .../pics/effects/tree_disguise/4.png | Bin .../pics/effects/tree_disguise/5.png | Bin .../pics/effects/tree_disguise/6.png | Bin .../pics/effects/unknown_16/0.png | Bin .../pics/effects/unknown_16/1.png | Bin .../pics/effects/unknown_16/2.png | Bin .../pics/effects/unknown_16/3.png | Bin .../pics/effects/unknown_16/4.png | Bin .../pics/effects/unknown_16/5.png | Bin .../pics/effects/unknown_17/0.png | Bin .../pics/effects/unknown_17/1.png | Bin .../pics/effects/unknown_17/2.png | Bin .../pics/effects/unknown_17/3.png | Bin .../pics/effects/unknown_17/4.png | Bin .../pics/effects/unknown_17/5.png | Bin .../pics/effects/unknown_17/6.png | Bin .../pics/effects/unknown_17/7.png | Bin .../pics/effects/unknown_18/0.png | Bin .../pics/effects/unknown_18/1.png | Bin .../pics/effects/unknown_18/2.png | Bin .../pics/effects/unknown_18/3.png | Bin .../pics/effects/unknown_19/0.png | Bin .../pics/effects/unknown_19/1.png | Bin .../pics/effects/unknown_19/2.png | Bin .../pics/effects/unknown_19/3.png | Bin .../pics/effects/unknown_20/0.png | Bin .../pics/effects/unknown_20/1.png | Bin .../pics/effects/unknown_20/2.png | Bin .../pics/effects/unknown_20/3.png | Bin .../pics/effects/unknown_20/4.png | Bin .../pics/effects/unknown_29/0.png | Bin .../pics/effects/unknown_29/1.png | Bin .../pics/effects/unknown_29/2.png | Bin .../pics/effects/unknown_33/0.png | Bin .../pics/effects/unknown_33/1.png | Bin .../pics/effects/unknown_33/2.png | Bin .../pics/effects/unknown_33/3.png | Bin .../pics/effects/unknown_33/4.png | Bin .../pics/effects/unknown_35/0.png | Bin .../pics/effects/unknown_35/1.png | Bin .../pics/effects/unknown_4F6D38/0.png | Bin .../pics/effects/unknown_4F7E38/0.png | Bin .../pics/effects/unused_grass/0.png | Bin .../pics/effects/unused_grass/1.png | Bin .../pics/effects/unused_grass/2.png | Bin .../pics/effects/unused_grass/3.png | Bin .../pics/misc/birchs_bag.png | Bin .../pics/misc/birth_island_stone.png | Bin .../pics/misc/breakable_rock/0.png | Bin .../pics/misc/breakable_rock/1.png | Bin .../pics/misc/breakable_rock/2.png | Bin .../pics/misc/breakable_rock/3.png | Bin .../pics/misc/cable_car.png | Bin .../pics/misc/cuttable_tree/0.png | Bin .../pics/misc/cuttable_tree/1.png | Bin .../pics/misc/cuttable_tree/2.png | Bin .../pics/misc/cuttable_tree/3.png | Bin .../pics/misc/fossil.png | Bin .../pics/misc/item_ball.png | Bin .../pics/misc/moving_box.png | Bin .../pics/misc/mr_brineys_boat/0.png | Bin .../pics/misc/mr_brineys_boat/1.png | Bin .../pics/misc/mr_brineys_boat/2.png | Bin .../pics/misc/pushable_boulder.png | Bin .../pics/misc/ss_tidal.png | Bin .../pics/misc/statue.png | Bin .../pics/misc/submarine_shadow.png | Bin .../pics/misc/truck.png | Bin .../pics/people/anabel/0.png | Bin .../pics/people/anabel/1.png | Bin .../pics/people/anabel/2.png | Bin .../pics/people/anabel/3.png | Bin .../pics/people/anabel/4.png | Bin .../pics/people/anabel/5.png | Bin .../pics/people/anabel/6.png | Bin .../pics/people/anabel/7.png | Bin .../pics/people/anabel/8.png | Bin .../pics/people/aqua_member_f/0.png | Bin .../pics/people/aqua_member_f/1.png | Bin .../pics/people/aqua_member_f/2.png | Bin .../pics/people/aqua_member_f/3.png | Bin .../pics/people/aqua_member_f/4.png | Bin .../pics/people/aqua_member_f/5.png | Bin .../pics/people/aqua_member_f/6.png | Bin .../pics/people/aqua_member_f/7.png | Bin .../pics/people/aqua_member_f/8.png | Bin .../pics/people/aqua_member_m/0.png | Bin .../pics/people/aqua_member_m/1.png | Bin .../pics/people/aqua_member_m/2.png | Bin .../pics/people/aqua_member_m/3.png | Bin .../pics/people/aqua_member_m/4.png | Bin .../pics/people/aqua_member_m/5.png | Bin .../pics/people/aqua_member_m/6.png | Bin .../pics/people/aqua_member_m/7.png | Bin .../pics/people/aqua_member_m/8.png | Bin .../pics/people/archie/0.png | Bin .../pics/people/archie/1.png | Bin .../pics/people/archie/2.png | Bin .../pics/people/archie/3.png | Bin .../pics/people/archie/4.png | Bin .../pics/people/archie/5.png | Bin .../pics/people/archie/6.png | Bin .../pics/people/archie/7.png | Bin .../pics/people/archie/8.png | Bin .../pics/people/artist/0.png | Bin .../pics/people/artist/1.png | Bin .../pics/people/artist/2.png | Bin .../pics/people/artist/3.png | Bin .../pics/people/artist/4.png | Bin .../pics/people/artist/5.png | Bin .../pics/people/artist/6.png | Bin .../pics/people/artist/7.png | Bin .../pics/people/artist/8.png | Bin .../pics/people/beauty/0.png | Bin .../pics/people/beauty/1.png | Bin .../pics/people/beauty/2.png | Bin .../pics/people/beauty/3.png | Bin .../pics/people/beauty/4.png | Bin .../pics/people/beauty/5.png | Bin .../pics/people/beauty/6.png | Bin .../pics/people/beauty/7.png | Bin .../pics/people/beauty/8.png | Bin .../pics/people/black_belt/0.png | Bin .../pics/people/black_belt/1.png | Bin .../pics/people/black_belt/2.png | Bin .../pics/people/black_belt/3.png | Bin .../pics/people/black_belt/4.png | Bin .../pics/people/black_belt/5.png | Bin .../pics/people/black_belt/6.png | Bin .../pics/people/black_belt/7.png | Bin .../pics/people/black_belt/8.png | Bin .../pics/people/boy_1/0.png | Bin .../pics/people/boy_1/1.png | Bin .../pics/people/boy_1/2.png | Bin .../pics/people/boy_1/3.png | Bin .../pics/people/boy_1/4.png | Bin .../pics/people/boy_1/5.png | Bin .../pics/people/boy_1/6.png | Bin .../pics/people/boy_1/7.png | Bin .../pics/people/boy_1/8.png | Bin .../pics/people/boy_2/0.png | Bin .../pics/people/boy_2/1.png | Bin .../pics/people/boy_2/2.png | Bin .../pics/people/boy_2/3.png | Bin .../pics/people/boy_2/4.png | Bin .../pics/people/boy_2/5.png | Bin .../pics/people/boy_2/6.png | Bin .../pics/people/boy_2/7.png | Bin .../pics/people/boy_2/8.png | Bin .../pics/people/boy_3/0.png | Bin .../pics/people/boy_3/1.png | Bin .../pics/people/boy_3/2.png | Bin .../pics/people/boy_3/3.png | Bin .../pics/people/boy_3/4.png | Bin .../pics/people/boy_3/5.png | Bin .../pics/people/boy_3/6.png | Bin .../pics/people/boy_3/7.png | Bin .../pics/people/boy_3/8.png | Bin .../pics/people/boy_4/0.png | Bin .../pics/people/boy_4/1.png | Bin .../pics/people/boy_4/2.png | Bin .../pics/people/boy_4/3.png | Bin .../pics/people/boy_4/4.png | Bin .../pics/people/boy_4/5.png | Bin .../pics/people/boy_4/6.png | Bin .../pics/people/boy_4/7.png | Bin .../pics/people/boy_4/8.png | Bin .../pics/people/boy_5/0.png | Bin .../pics/people/boy_5/1.png | Bin .../pics/people/boy_5/2.png | Bin .../pics/people/brandon/0.png | Bin .../pics/people/brandon/1.png | Bin .../pics/people/brandon/2.png | Bin .../pics/people/brandon/3.png | Bin .../pics/people/brandon/4.png | Bin .../pics/people/brandon/5.png | Bin .../pics/people/brandon/6.png | Bin .../pics/people/brandon/7.png | Bin .../pics/people/brandon/8.png | Bin .../pics/people/brawly/0.png | Bin .../pics/people/brawly/1.png | Bin .../pics/people/brawly/2.png | Bin .../pics/people/brendan/acro_bike/00.png | Bin .../pics/people/brendan/acro_bike/01.png | Bin .../pics/people/brendan/acro_bike/02.png | Bin .../pics/people/brendan/acro_bike/03.png | Bin .../pics/people/brendan/acro_bike/04.png | Bin .../pics/people/brendan/acro_bike/05.png | Bin .../pics/people/brendan/acro_bike/06.png | Bin .../pics/people/brendan/acro_bike/07.png | Bin .../pics/people/brendan/acro_bike/08.png | Bin .../pics/people/brendan/acro_bike/09.png | Bin .../pics/people/brendan/acro_bike/10.png | Bin .../pics/people/brendan/acro_bike/11.png | Bin .../pics/people/brendan/acro_bike/12.png | Bin .../pics/people/brendan/acro_bike/13.png | Bin .../pics/people/brendan/acro_bike/14.png | Bin .../pics/people/brendan/acro_bike/15.png | Bin .../pics/people/brendan/acro_bike/16.png | Bin .../pics/people/brendan/acro_bike/17.png | Bin .../pics/people/brendan/acro_bike/18.png | Bin .../pics/people/brendan/acro_bike/19.png | Bin .../pics/people/brendan/acro_bike/20.png | Bin .../pics/people/brendan/acro_bike/21.png | Bin .../pics/people/brendan/acro_bike/22.png | Bin .../pics/people/brendan/acro_bike/23.png | Bin .../pics/people/brendan/acro_bike/24.png | Bin .../pics/people/brendan/acro_bike/25.png | Bin .../pics/people/brendan/acro_bike/26.png | Bin .../pics/people/brendan/decorating.png | Bin .../pics/people/brendan/field_move/0.png | Bin .../pics/people/brendan/field_move/1.png | Bin .../pics/people/brendan/field_move/2.png | Bin .../pics/people/brendan/field_move/3.png | Bin .../pics/people/brendan/field_move/4.png | Bin .../pics/people/brendan/fishing/00.png | Bin .../pics/people/brendan/fishing/01.png | Bin .../pics/people/brendan/fishing/02.png | Bin .../pics/people/brendan/fishing/03.png | Bin .../pics/people/brendan/fishing/04.png | Bin .../pics/people/brendan/fishing/05.png | Bin .../pics/people/brendan/fishing/06.png | Bin .../pics/people/brendan/fishing/07.png | Bin .../pics/people/brendan/fishing/08.png | Bin .../pics/people/brendan/fishing/09.png | Bin .../pics/people/brendan/fishing/10.png | Bin .../pics/people/brendan/fishing/11.png | Bin .../pics/people/brendan/mach_bike/0.png | Bin .../pics/people/brendan/mach_bike/1.png | Bin .../pics/people/brendan/mach_bike/2.png | Bin .../pics/people/brendan/mach_bike/3.png | Bin .../pics/people/brendan/mach_bike/4.png | Bin .../pics/people/brendan/mach_bike/5.png | Bin .../pics/people/brendan/mach_bike/6.png | Bin .../pics/people/brendan/mach_bike/7.png | Bin .../pics/people/brendan/mach_bike/8.png | Bin .../pics/people/brendan/normal/00.png | Bin .../pics/people/brendan/normal/01.png | Bin .../pics/people/brendan/normal/02.png | Bin .../pics/people/brendan/normal/03.png | Bin .../pics/people/brendan/normal/04.png | Bin .../pics/people/brendan/normal/05.png | Bin .../pics/people/brendan/normal/06.png | Bin .../pics/people/brendan/normal/07.png | Bin .../pics/people/brendan/normal/08.png | Bin .../pics/people/brendan/normal/09.png | Bin .../pics/people/brendan/normal/10.png | Bin .../pics/people/brendan/normal/11.png | Bin .../pics/people/brendan/normal/12.png | Bin .../pics/people/brendan/normal/13.png | Bin .../pics/people/brendan/normal/14.png | Bin .../pics/people/brendan/normal/15.png | Bin .../pics/people/brendan/normal/16.png | Bin .../pics/people/brendan/normal/17.png | Bin .../pics/people/brendan/surfing/0.png | Bin .../pics/people/brendan/surfing/1.png | Bin .../pics/people/brendan/surfing/2.png | Bin .../pics/people/brendan/surfing/3.png | Bin .../pics/people/brendan/surfing/4.png | Bin .../pics/people/brendan/surfing/5.png | Bin .../pics/people/brendan/underwater/0.png | Bin .../pics/people/brendan/underwater/1.png | Bin .../pics/people/brendan/underwater/2.png | Bin .../pics/people/brendan/underwater/3.png | Bin .../pics/people/brendan/watering/0.png | Bin .../pics/people/brendan/watering/1.png | Bin .../pics/people/brendan/watering/2.png | Bin .../pics/people/brendan/watering/3.png | Bin .../pics/people/brendan/watering/4.png | Bin .../pics/people/brendan/watering/5.png | Bin .../pics/people/bug_catcher/0.png | Bin .../pics/people/bug_catcher/1.png | Bin .../pics/people/bug_catcher/2.png | Bin .../pics/people/bug_catcher/3.png | Bin .../pics/people/bug_catcher/4.png | Bin .../pics/people/bug_catcher/5.png | Bin .../pics/people/bug_catcher/6.png | Bin .../pics/people/bug_catcher/7.png | Bin .../pics/people/bug_catcher/8.png | Bin .../pics/people/cameraman/0.png | Bin .../pics/people/cameraman/1.png | Bin .../pics/people/cameraman/2.png | Bin .../pics/people/cameraman/3.png | Bin .../pics/people/cameraman/4.png | Bin .../pics/people/cameraman/5.png | Bin .../pics/people/cameraman/6.png | Bin .../pics/people/cameraman/7.png | Bin .../pics/people/cameraman/8.png | Bin .../pics/people/camper/0.png | Bin .../pics/people/camper/1.png | Bin .../pics/people/camper/2.png | Bin .../pics/people/camper/3.png | Bin .../pics/people/camper/4.png | Bin .../pics/people/camper/5.png | Bin .../pics/people/camper/6.png | Bin .../pics/people/camper/7.png | Bin .../pics/people/camper/8.png | Bin .../pics/people/contest_old_man/0.png | Bin .../pics/people/contest_old_man/1.png | Bin .../pics/people/contest_old_man/2.png | Bin .../pics/people/contest_old_man/3.png | Bin .../pics/people/contest_old_man/4.png | Bin .../pics/people/contest_old_man/5.png | Bin .../pics/people/contest_old_man/6.png | Bin .../pics/people/contest_old_man/7.png | Bin .../pics/people/contest_old_man/8.png | Bin .../pics/people/cook/0.png | Bin .../pics/people/cook/1.png | Bin .../pics/people/cook/2.png | Bin .../pics/people/cycling_triathlete_f/0.png | Bin .../pics/people/cycling_triathlete_f/1.png | Bin .../pics/people/cycling_triathlete_f/2.png | Bin .../pics/people/cycling_triathlete_f/3.png | Bin .../pics/people/cycling_triathlete_f/4.png | Bin .../pics/people/cycling_triathlete_f/5.png | Bin .../pics/people/cycling_triathlete_f/6.png | Bin .../pics/people/cycling_triathlete_f/7.png | Bin .../pics/people/cycling_triathlete_f/8.png | Bin .../pics/people/cycling_triathlete_m/0.png | Bin .../pics/people/cycling_triathlete_m/1.png | Bin .../pics/people/cycling_triathlete_m/2.png | Bin .../pics/people/cycling_triathlete_m/3.png | Bin .../pics/people/cycling_triathlete_m/4.png | Bin .../pics/people/cycling_triathlete_m/5.png | Bin .../pics/people/cycling_triathlete_m/6.png | Bin .../pics/people/cycling_triathlete_m/7.png | Bin .../pics/people/cycling_triathlete_m/8.png | Bin .../pics/people/drake/0.png | Bin .../pics/people/drake/1.png | Bin .../pics/people/drake/2.png | Bin .../pics/people/fat_man/0.png | Bin .../pics/people/fat_man/1.png | Bin .../pics/people/fat_man/2.png | Bin .../pics/people/fat_man/3.png | Bin .../pics/people/fat_man/4.png | Bin .../pics/people/fat_man/5.png | Bin .../pics/people/fat_man/6.png | Bin .../pics/people/fat_man/7.png | Bin .../pics/people/fat_man/8.png | Bin .../pics/people/fisherman/0.png | Bin .../pics/people/fisherman/1.png | Bin .../pics/people/fisherman/2.png | Bin .../pics/people/fisherman/3.png | Bin .../pics/people/fisherman/4.png | Bin .../pics/people/fisherman/5.png | Bin .../pics/people/fisherman/6.png | Bin .../pics/people/fisherman/7.png | Bin .../pics/people/fisherman/8.png | Bin .../pics/people/flannery/0.png | Bin .../pics/people/flannery/1.png | Bin .../pics/people/flannery/2.png | Bin .../pics/people/gentleman/0.png | Bin .../pics/people/gentleman/1.png | Bin .../pics/people/gentleman/2.png | Bin .../pics/people/gentleman/3.png | Bin .../pics/people/gentleman/4.png | Bin .../pics/people/gentleman/5.png | Bin .../pics/people/gentleman/6.png | Bin .../pics/people/gentleman/7.png | Bin .../pics/people/gentleman/8.png | Bin .../pics/people/girl_1/0.png | Bin .../pics/people/girl_1/1.png | Bin .../pics/people/girl_1/2.png | Bin .../pics/people/girl_1/3.png | Bin .../pics/people/girl_1/4.png | Bin .../pics/people/girl_1/5.png | Bin .../pics/people/girl_1/6.png | Bin .../pics/people/girl_1/7.png | Bin .../pics/people/girl_1/8.png | Bin .../pics/people/girl_2/0.png | Bin .../pics/people/girl_2/1.png | Bin .../pics/people/girl_2/2.png | Bin .../pics/people/girl_2/3.png | Bin .../pics/people/girl_2/4.png | Bin .../pics/people/girl_2/5.png | Bin .../pics/people/girl_2/6.png | Bin .../pics/people/girl_2/7.png | Bin .../pics/people/girl_2/8.png | Bin .../pics/people/girl_3/0.png | Bin .../pics/people/girl_3/1.png | Bin .../pics/people/girl_3/2.png | Bin .../pics/people/girl_3/3.png | Bin .../pics/people/girl_3/4.png | Bin .../pics/people/girl_3/5.png | Bin .../pics/people/girl_3/6.png | Bin .../pics/people/girl_3/7.png | Bin .../pics/people/girl_3/8.png | Bin .../pics/people/glacia/0.png | Bin .../pics/people/glacia/1.png | Bin .../pics/people/glacia/2.png | Bin .../pics/people/greta/0.png | Bin .../pics/people/greta/1.png | Bin .../pics/people/greta/2.png | Bin .../pics/people/greta/3.png | Bin .../pics/people/greta/4.png | Bin .../pics/people/greta/5.png | Bin .../pics/people/greta/6.png | Bin .../pics/people/greta/7.png | Bin .../pics/people/greta/8.png | Bin .../pics/people/hex_maniac/0.png | Bin .../pics/people/hex_maniac/1.png | Bin .../pics/people/hex_maniac/2.png | Bin .../pics/people/hex_maniac/3.png | Bin .../pics/people/hex_maniac/4.png | Bin .../pics/people/hex_maniac/5.png | Bin .../pics/people/hex_maniac/6.png | Bin .../pics/people/hex_maniac/7.png | Bin .../pics/people/hex_maniac/8.png | Bin .../pics/people/hiker/0.png | Bin .../pics/people/hiker/1.png | Bin .../pics/people/hiker/2.png | Bin .../pics/people/hiker/3.png | Bin .../pics/people/hiker/4.png | Bin .../pics/people/hiker/5.png | Bin .../pics/people/hiker/6.png | Bin .../pics/people/hiker/7.png | Bin .../pics/people/hiker/8.png | Bin .../pics/people/hot_springs_old_woman/0.png | Bin .../pics/people/hot_springs_old_woman/1.png | Bin .../pics/people/hot_springs_old_woman/2.png | Bin .../pics/people/hot_springs_old_woman/3.png | Bin .../pics/people/hot_springs_old_woman/4.png | Bin .../pics/people/hot_springs_old_woman/5.png | Bin .../pics/people/hot_springs_old_woman/6.png | Bin .../pics/people/hot_springs_old_woman/7.png | Bin .../pics/people/hot_springs_old_woman/8.png | Bin .../pics/people/juan/0.png | Bin .../pics/people/juan/1.png | Bin .../pics/people/juan/2.png | Bin .../pics/people/juan/3.png | Bin .../pics/people/juan/4.png | Bin .../pics/people/juan/5.png | Bin .../pics/people/juan/6.png | Bin .../pics/people/juan/7.png | Bin .../pics/people/juan/8.png | Bin .../pics/people/lass/0.png | Bin .../pics/people/lass/1.png | Bin .../pics/people/lass/2.png | Bin .../pics/people/lass/3.png | Bin .../pics/people/lass/4.png | Bin .../pics/people/lass/5.png | Bin .../pics/people/lass/6.png | Bin .../pics/people/lass/7.png | Bin .../pics/people/lass/8.png | Bin .../pics/people/leaf/0.png | Bin .../pics/people/leaf/1.png | Bin .../pics/people/leaf/2.png | Bin .../pics/people/leaf/3.png | Bin .../pics/people/leaf/4.png | Bin .../pics/people/leaf/5.png | Bin .../pics/people/leaf/6.png | Bin .../pics/people/leaf/7.png | Bin .../pics/people/leaf/8.png | Bin .../pics/people/little_boy_1/0.png | Bin .../pics/people/little_boy_1/1.png | Bin .../pics/people/little_boy_1/2.png | Bin .../pics/people/little_boy_1/3.png | Bin .../pics/people/little_boy_1/4.png | Bin .../pics/people/little_boy_1/5.png | Bin .../pics/people/little_boy_1/6.png | Bin .../pics/people/little_boy_1/7.png | Bin .../pics/people/little_boy_1/8.png | Bin .../pics/people/little_boy_2/0.png | Bin .../pics/people/little_boy_2/1.png | Bin .../pics/people/little_boy_2/2.png | Bin .../pics/people/little_boy_2/3.png | Bin .../pics/people/little_boy_2/4.png | Bin .../pics/people/little_boy_2/5.png | Bin .../pics/people/little_boy_2/6.png | Bin .../pics/people/little_boy_2/7.png | Bin .../pics/people/little_boy_2/8.png | Bin .../pics/people/little_girl_1/0.png | Bin .../pics/people/little_girl_1/1.png | Bin .../pics/people/little_girl_1/2.png | Bin .../pics/people/little_girl_1/3.png | Bin .../pics/people/little_girl_1/4.png | Bin .../pics/people/little_girl_1/5.png | Bin .../pics/people/little_girl_1/6.png | Bin .../pics/people/little_girl_1/7.png | Bin .../pics/people/little_girl_1/8.png | Bin .../pics/people/little_girl_2/0.png | Bin .../pics/people/little_girl_2/1.png | Bin .../pics/people/little_girl_2/2.png | Bin .../pics/people/little_girl_2/3.png | Bin .../pics/people/little_girl_2/4.png | Bin .../pics/people/little_girl_2/5.png | Bin .../pics/people/little_girl_2/6.png | Bin .../pics/people/little_girl_2/7.png | Bin .../pics/people/little_girl_2/8.png | Bin .../pics/people/liza/0.png | Bin .../pics/people/liza/1.png | Bin .../pics/people/liza/2.png | Bin .../pics/people/lucy/0.png | Bin .../pics/people/lucy/1.png | Bin .../pics/people/lucy/2.png | Bin .../pics/people/lucy/3.png | Bin .../pics/people/lucy/4.png | Bin .../pics/people/lucy/5.png | Bin .../pics/people/lucy/6.png | Bin .../pics/people/lucy/7.png | Bin .../pics/people/lucy/8.png | Bin .../pics/people/magma_member_f/0.png | Bin .../pics/people/magma_member_f/1.png | Bin .../pics/people/magma_member_f/2.png | Bin .../pics/people/magma_member_f/3.png | Bin .../pics/people/magma_member_f/4.png | Bin .../pics/people/magma_member_f/5.png | Bin .../pics/people/magma_member_f/6.png | Bin .../pics/people/magma_member_f/7.png | Bin .../pics/people/magma_member_f/8.png | Bin .../pics/people/magma_member_m/0.png | Bin .../pics/people/magma_member_m/1.png | Bin .../pics/people/magma_member_m/2.png | Bin .../pics/people/magma_member_m/3.png | Bin .../pics/people/magma_member_m/4.png | Bin .../pics/people/magma_member_m/5.png | Bin .../pics/people/magma_member_m/6.png | Bin .../pics/people/magma_member_m/7.png | Bin .../pics/people/magma_member_m/8.png | Bin .../pics/people/man_1/0.png | Bin .../pics/people/man_1/1.png | Bin .../pics/people/man_1/2.png | Bin .../pics/people/man_1/3.png | Bin .../pics/people/man_1/4.png | Bin .../pics/people/man_1/5.png | Bin .../pics/people/man_1/6.png | Bin .../pics/people/man_1/7.png | Bin .../pics/people/man_1/8.png | Bin .../pics/people/man_2/0.png | Bin .../pics/people/man_2/1.png | Bin .../pics/people/man_2/2.png | Bin .../pics/people/man_2/3.png | Bin .../pics/people/man_2/4.png | Bin .../pics/people/man_2/5.png | Bin .../pics/people/man_2/6.png | Bin .../pics/people/man_2/7.png | Bin .../pics/people/man_2/8.png | Bin .../pics/people/man_3/0.png | Bin .../pics/people/man_3/1.png | Bin .../pics/people/man_3/2.png | Bin .../pics/people/man_3/3.png | Bin .../pics/people/man_3/4.png | Bin .../pics/people/man_3/5.png | Bin .../pics/people/man_3/6.png | Bin .../pics/people/man_3/7.png | Bin .../pics/people/man_3/8.png | Bin .../pics/people/man_4/0.png | Bin .../pics/people/man_4/1.png | Bin .../pics/people/man_4/2.png | Bin .../pics/people/man_4/3.png | Bin .../pics/people/man_4/4.png | Bin .../pics/people/man_4/5.png | Bin .../pics/people/man_4/6.png | Bin .../pics/people/man_4/7.png | Bin .../pics/people/man_4/8.png | Bin .../pics/people/man_5/0.png | Bin .../pics/people/man_5/1.png | Bin .../pics/people/man_5/2.png | Bin .../pics/people/man_5/3.png | Bin .../pics/people/man_5/4.png | Bin .../pics/people/man_5/5.png | Bin .../pics/people/man_5/6.png | Bin .../pics/people/man_5/7.png | Bin .../pics/people/man_5/8.png | Bin .../pics/people/man_6/0.png | Bin .../pics/people/man_6/1.png | Bin .../pics/people/man_6/2.png | Bin .../pics/people/man_6/3.png | Bin .../pics/people/man_6/4.png | Bin .../pics/people/man_6/5.png | Bin .../pics/people/man_6/6.png | Bin .../pics/people/man_6/7.png | Bin .../pics/people/man_6/8.png | Bin .../pics/people/man_7/0.png | Bin .../pics/people/man_7/1.png | Bin .../pics/people/man_7/2.png | Bin .../pics/people/man_7/3.png | Bin .../pics/people/man_7/4.png | Bin .../pics/people/man_7/5.png | Bin .../pics/people/man_7/6.png | Bin .../pics/people/man_7/7.png | Bin .../pics/people/man_7/8.png | Bin .../pics/people/maniac/0.png | Bin .../pics/people/maniac/1.png | Bin .../pics/people/maniac/2.png | Bin .../pics/people/maniac/3.png | Bin .../pics/people/maniac/4.png | Bin .../pics/people/maniac/5.png | Bin .../pics/people/maniac/6.png | Bin .../pics/people/maniac/7.png | Bin .../pics/people/maniac/8.png | Bin .../pics/people/mart_employee/0.png | Bin .../pics/people/mart_employee/1.png | Bin .../pics/people/mart_employee/2.png | Bin .../pics/people/mart_employee/3.png | Bin .../pics/people/mart_employee/4.png | Bin .../pics/people/mart_employee/5.png | Bin .../pics/people/mart_employee/6.png | Bin .../pics/people/mart_employee/7.png | Bin .../pics/people/mart_employee/8.png | Bin .../pics/people/mauville_old_man_1/0.png | Bin .../pics/people/mauville_old_man_1/1.png | Bin .../pics/people/mauville_old_man_1/2.png | Bin .../pics/people/mauville_old_man_1/3.png | Bin .../pics/people/mauville_old_man_1/4.png | Bin .../pics/people/mauville_old_man_1/5.png | Bin .../pics/people/mauville_old_man_1/6.png | Bin .../pics/people/mauville_old_man_1/7.png | Bin .../pics/people/mauville_old_man_1/8.png | Bin .../pics/people/mauville_old_man_2/0.png | Bin .../pics/people/mauville_old_man_2/1.png | Bin .../pics/people/mauville_old_man_2/2.png | Bin .../pics/people/mauville_old_man_2/3.png | Bin .../pics/people/mauville_old_man_2/4.png | Bin .../pics/people/mauville_old_man_2/5.png | Bin .../pics/people/mauville_old_man_2/6.png | Bin .../pics/people/mauville_old_man_2/7.png | Bin .../pics/people/mauville_old_man_2/8.png | Bin .../pics/people/maxie/0.png | Bin .../pics/people/maxie/1.png | Bin .../pics/people/maxie/2.png | Bin .../pics/people/maxie/3.png | Bin .../pics/people/maxie/4.png | Bin .../pics/people/maxie/5.png | Bin .../pics/people/maxie/6.png | Bin .../pics/people/maxie/7.png | Bin .../pics/people/maxie/8.png | Bin .../pics/people/may/acro_bike/00.png | Bin .../pics/people/may/acro_bike/01.png | Bin .../pics/people/may/acro_bike/02.png | Bin .../pics/people/may/acro_bike/03.png | Bin .../pics/people/may/acro_bike/04.png | Bin .../pics/people/may/acro_bike/05.png | Bin .../pics/people/may/acro_bike/06.png | Bin .../pics/people/may/acro_bike/07.png | Bin .../pics/people/may/acro_bike/08.png | Bin .../pics/people/may/acro_bike/09.png | Bin .../pics/people/may/acro_bike/10.png | Bin .../pics/people/may/acro_bike/11.png | Bin .../pics/people/may/acro_bike/12.png | Bin .../pics/people/may/acro_bike/13.png | Bin .../pics/people/may/acro_bike/14.png | Bin .../pics/people/may/acro_bike/15.png | Bin .../pics/people/may/acro_bike/16.png | Bin .../pics/people/may/acro_bike/17.png | Bin .../pics/people/may/acro_bike/18.png | Bin .../pics/people/may/acro_bike/19.png | Bin .../pics/people/may/acro_bike/20.png | Bin .../pics/people/may/acro_bike/21.png | Bin .../pics/people/may/acro_bike/22.png | Bin .../pics/people/may/acro_bike/23.png | Bin .../pics/people/may/acro_bike/24.png | Bin .../pics/people/may/acro_bike/25.png | Bin .../pics/people/may/acro_bike/26.png | Bin .../pics/people/may/decorating.png | Bin .../pics/people/may/field_move/0.png | Bin .../pics/people/may/field_move/1.png | Bin .../pics/people/may/field_move/2.png | Bin .../pics/people/may/field_move/3.png | Bin .../pics/people/may/field_move/4.png | Bin .../pics/people/may/fishing/00.png | Bin .../pics/people/may/fishing/01.png | Bin .../pics/people/may/fishing/02.png | Bin .../pics/people/may/fishing/03.png | Bin .../pics/people/may/fishing/04.png | Bin .../pics/people/may/fishing/05.png | Bin .../pics/people/may/fishing/06.png | Bin .../pics/people/may/fishing/07.png | Bin .../pics/people/may/fishing/08.png | Bin .../pics/people/may/fishing/09.png | Bin .../pics/people/may/fishing/10.png | Bin .../pics/people/may/fishing/11.png | Bin .../pics/people/may/mach_bike/0.png | Bin .../pics/people/may/mach_bike/1.png | Bin .../pics/people/may/mach_bike/2.png | Bin .../pics/people/may/mach_bike/3.png | Bin .../pics/people/may/mach_bike/4.png | Bin .../pics/people/may/mach_bike/5.png | Bin .../pics/people/may/mach_bike/6.png | Bin .../pics/people/may/mach_bike/7.png | Bin .../pics/people/may/mach_bike/8.png | Bin .../pics/people/may/normal/00.png | Bin .../pics/people/may/normal/01.png | Bin .../pics/people/may/normal/02.png | Bin .../pics/people/may/normal/03.png | Bin .../pics/people/may/normal/04.png | Bin .../pics/people/may/normal/05.png | Bin .../pics/people/may/normal/06.png | Bin .../pics/people/may/normal/07.png | Bin .../pics/people/may/normal/08.png | Bin .../pics/people/may/normal/09.png | Bin .../pics/people/may/normal/10.png | Bin .../pics/people/may/normal/11.png | Bin .../pics/people/may/normal/12.png | Bin .../pics/people/may/normal/13.png | Bin .../pics/people/may/normal/14.png | Bin .../pics/people/may/normal/15.png | Bin .../pics/people/may/normal/16.png | Bin .../pics/people/may/normal/17.png | Bin .../pics/people/may/surfing/0.png | Bin .../pics/people/may/surfing/1.png | Bin .../pics/people/may/surfing/2.png | Bin .../pics/people/may/surfing/3.png | Bin .../pics/people/may/surfing/4.png | Bin .../pics/people/may/surfing/5.png | Bin .../pics/people/may/underwater/0.png | Bin .../pics/people/may/underwater/1.png | Bin .../pics/people/may/underwater/2.png | Bin .../pics/people/may/underwater/3.png | Bin .../pics/people/may/watering/0.png | Bin .../pics/people/may/watering/1.png | Bin .../pics/people/may/watering/2.png | Bin .../pics/people/may/watering/3.png | Bin .../pics/people/may/watering/4.png | Bin .../pics/people/may/watering/5.png | Bin .../pics/people/mom/0.png | Bin .../pics/people/mom/1.png | Bin .../pics/people/mom/2.png | Bin .../pics/people/mom/3.png | Bin .../pics/people/mom/4.png | Bin .../pics/people/mom/5.png | Bin .../pics/people/mom/6.png | Bin .../pics/people/mom/7.png | Bin .../pics/people/mom/8.png | Bin .../people/mystery_event_deliveryman/0.png | Bin .../people/mystery_event_deliveryman/1.png | Bin .../people/mystery_event_deliveryman/2.png | Bin .../pics/people/noland/0.png | Bin .../pics/people/noland/1.png | Bin .../pics/people/noland/2.png | Bin .../pics/people/noland/3.png | Bin .../pics/people/noland/4.png | Bin .../pics/people/noland/5.png | Bin .../pics/people/noland/6.png | Bin .../pics/people/noland/7.png | Bin .../pics/people/noland/8.png | Bin .../pics/people/norman/0.png | Bin .../pics/people/norman/1.png | Bin .../pics/people/norman/2.png | Bin .../pics/people/norman/3.png | Bin .../pics/people/norman/4.png | Bin .../pics/people/norman/5.png | Bin .../pics/people/norman/6.png | Bin .../pics/people/norman/7.png | Bin .../pics/people/norman/8.png | Bin .../pics/people/nurse/0.png | Bin .../pics/people/nurse/1.png | Bin .../pics/people/nurse/2.png | Bin .../pics/people/nurse/3.png | Bin .../pics/people/old_man_1/0.png | Bin .../pics/people/old_man_1/1.png | Bin .../pics/people/old_man_1/2.png | Bin .../pics/people/old_man_1/3.png | Bin .../pics/people/old_man_1/4.png | Bin .../pics/people/old_man_1/5.png | Bin .../pics/people/old_man_1/6.png | Bin .../pics/people/old_man_1/7.png | Bin .../pics/people/old_man_1/8.png | Bin .../pics/people/old_man_2/0.png | Bin .../pics/people/old_man_2/1.png | Bin .../pics/people/old_man_2/2.png | Bin .../pics/people/old_woman_1/0.png | Bin .../pics/people/old_woman_1/1.png | Bin .../pics/people/old_woman_1/2.png | Bin .../pics/people/old_woman_1/3.png | Bin .../pics/people/old_woman_1/4.png | Bin .../pics/people/old_woman_1/5.png | Bin .../pics/people/old_woman_1/6.png | Bin .../pics/people/old_woman_1/7.png | Bin .../pics/people/old_woman_1/8.png | Bin .../pics/people/old_woman_2/0.png | Bin .../pics/people/old_woman_2/1.png | Bin .../pics/people/old_woman_2/2.png | Bin .../pics/people/old_woman_2/3.png | Bin .../pics/people/old_woman_2/4.png | Bin .../pics/people/old_woman_2/5.png | Bin .../pics/people/old_woman_2/6.png | Bin .../pics/people/old_woman_2/7.png | Bin .../pics/people/old_woman_2/8.png | Bin .../pics/people/phoebe/0.png | Bin .../pics/people/phoebe/1.png | Bin .../pics/people/phoebe/2.png | Bin .../pics/people/picnicker/0.png | Bin .../pics/people/picnicker/1.png | Bin .../pics/people/picnicker/2.png | Bin .../pics/people/picnicker/3.png | Bin .../pics/people/picnicker/4.png | Bin .../pics/people/picnicker/5.png | Bin .../pics/people/picnicker/6.png | Bin .../pics/people/picnicker/7.png | Bin .../pics/people/picnicker/8.png | Bin .../pics/people/prof_birch/0.png | Bin .../pics/people/prof_birch/1.png | Bin .../pics/people/prof_birch/2.png | Bin .../pics/people/prof_birch/3.png | Bin .../pics/people/prof_birch/4.png | Bin .../pics/people/prof_birch/5.png | Bin .../pics/people/prof_birch/6.png | Bin .../pics/people/prof_birch/7.png | Bin .../pics/people/prof_birch/8.png | Bin .../pics/people/psychic_m/0.png | Bin .../pics/people/psychic_m/1.png | Bin .../pics/people/psychic_m/2.png | Bin .../pics/people/psychic_m/3.png | Bin .../pics/people/psychic_m/4.png | Bin .../pics/people/psychic_m/5.png | Bin .../pics/people/psychic_m/6.png | Bin .../pics/people/psychic_m/7.png | Bin .../pics/people/psychic_m/8.png | Bin .../pics/people/quinty_plump/0.png | Bin .../pics/people/quinty_plump/1.png | Bin .../pics/people/quinty_plump/2.png | Bin .../pics/people/quinty_plump/3.png | Bin .../pics/people/quinty_plump/4.png | Bin .../pics/people/quinty_plump/5.png | Bin .../pics/people/quinty_plump/6.png | Bin .../pics/people/red/0.png | Bin .../pics/people/red/1.png | Bin .../pics/people/red/2.png | Bin .../pics/people/red/3.png | Bin .../pics/people/red/4.png | Bin .../pics/people/red/5.png | Bin .../pics/people/red/6.png | Bin .../pics/people/red/7.png | Bin .../pics/people/red/8.png | Bin .../pics/people/reporter_f/0.png | Bin .../pics/people/reporter_f/1.png | Bin .../pics/people/reporter_f/2.png | Bin .../pics/people/reporter_f/3.png | Bin .../pics/people/reporter_f/4.png | Bin .../pics/people/reporter_f/5.png | Bin .../pics/people/reporter_f/6.png | Bin .../pics/people/reporter_f/7.png | Bin .../pics/people/reporter_f/8.png | Bin .../pics/people/reporter_m/0.png | Bin .../pics/people/reporter_m/1.png | Bin .../pics/people/reporter_m/2.png | Bin .../pics/people/reporter_m/3.png | Bin .../pics/people/reporter_m/4.png | Bin .../pics/people/reporter_m/5.png | Bin .../pics/people/reporter_m/6.png | Bin .../pics/people/reporter_m/7.png | Bin .../pics/people/reporter_m/8.png | Bin .../pics/people/rooftop_sale_woman/0.png | Bin .../pics/people/rooftop_sale_woman/1.png | Bin .../pics/people/rooftop_sale_woman/2.png | Bin .../pics/people/rooftop_sale_woman/3.png | Bin .../pics/people/rooftop_sale_woman/4.png | Bin .../pics/people/rooftop_sale_woman/5.png | Bin .../pics/people/rooftop_sale_woman/6.png | Bin .../pics/people/rooftop_sale_woman/7.png | Bin .../pics/people/rooftop_sale_woman/8.png | Bin .../pics/people/roxanne/0.png | Bin .../pics/people/roxanne/1.png | Bin .../pics/people/roxanne/2.png | Bin .../pics/people/ruby_sapphire_brendan/00.png | Bin .../pics/people/ruby_sapphire_brendan/01.png | Bin .../pics/people/ruby_sapphire_brendan/02.png | Bin .../pics/people/ruby_sapphire_brendan/03.png | Bin .../pics/people/ruby_sapphire_brendan/04.png | Bin .../pics/people/ruby_sapphire_brendan/05.png | Bin .../pics/people/ruby_sapphire_brendan/06.png | Bin .../pics/people/ruby_sapphire_brendan/07.png | Bin .../pics/people/ruby_sapphire_brendan/08.png | Bin .../pics/people/ruby_sapphire_brendan/09.png | Bin .../pics/people/ruby_sapphire_brendan/10.png | Bin .../pics/people/ruby_sapphire_brendan/11.png | Bin .../pics/people/ruby_sapphire_brendan/12.png | Bin .../pics/people/ruby_sapphire_brendan/13.png | Bin .../pics/people/ruby_sapphire_brendan/14.png | Bin .../pics/people/ruby_sapphire_brendan/15.png | Bin .../pics/people/ruby_sapphire_brendan/16.png | Bin .../pics/people/ruby_sapphire_brendan/17.png | Bin .../people/ruby_sapphire_little_boy/0.png | Bin .../people/ruby_sapphire_little_boy/1.png | Bin .../people/ruby_sapphire_little_boy/2.png | Bin .../people/ruby_sapphire_little_boy/3.png | Bin .../people/ruby_sapphire_little_boy/4.png | Bin .../people/ruby_sapphire_little_boy/5.png | Bin .../people/ruby_sapphire_little_boy/6.png | Bin .../people/ruby_sapphire_little_boy/7.png | Bin .../people/ruby_sapphire_little_boy/8.png | Bin .../pics/people/ruby_sapphire_may/00.png | Bin .../pics/people/ruby_sapphire_may/01.png | Bin .../pics/people/ruby_sapphire_may/02.png | Bin .../pics/people/ruby_sapphire_may/03.png | Bin .../pics/people/ruby_sapphire_may/04.png | Bin .../pics/people/ruby_sapphire_may/05.png | Bin .../pics/people/ruby_sapphire_may/06.png | Bin .../pics/people/ruby_sapphire_may/07.png | Bin .../pics/people/ruby_sapphire_may/08.png | Bin .../pics/people/ruby_sapphire_may/09.png | Bin .../pics/people/ruby_sapphire_may/10.png | Bin .../pics/people/ruby_sapphire_may/11.png | Bin .../pics/people/ruby_sapphire_may/12.png | Bin .../pics/people/ruby_sapphire_may/13.png | Bin .../pics/people/ruby_sapphire_may/14.png | Bin .../pics/people/ruby_sapphire_may/15.png | Bin .../pics/people/ruby_sapphire_may/16.png | Bin .../pics/people/ruby_sapphire_may/17.png | Bin .../pics/people/running_triathlete_f/0.png | Bin .../pics/people/running_triathlete_f/1.png | Bin .../pics/people/running_triathlete_f/2.png | Bin .../pics/people/running_triathlete_f/3.png | Bin .../pics/people/running_triathlete_f/4.png | Bin .../pics/people/running_triathlete_f/5.png | Bin .../pics/people/running_triathlete_f/6.png | Bin .../pics/people/running_triathlete_f/7.png | Bin .../pics/people/running_triathlete_f/8.png | Bin .../pics/people/running_triathlete_m/0.png | Bin .../pics/people/running_triathlete_m/1.png | Bin .../pics/people/running_triathlete_m/2.png | Bin .../pics/people/running_triathlete_m/3.png | Bin .../pics/people/running_triathlete_m/4.png | Bin .../pics/people/running_triathlete_m/5.png | Bin .../pics/people/running_triathlete_m/6.png | Bin .../pics/people/running_triathlete_m/7.png | Bin .../pics/people/running_triathlete_m/8.png | Bin .../pics/people/sailor/0.png | Bin .../pics/people/sailor/1.png | Bin .../pics/people/sailor/2.png | Bin .../pics/people/sailor/3.png | Bin .../pics/people/sailor/4.png | Bin .../pics/people/sailor/5.png | Bin .../pics/people/sailor/6.png | Bin .../pics/people/sailor/7.png | Bin .../pics/people/sailor/8.png | Bin .../pics/people/school_kid_m/0.png | Bin .../pics/people/school_kid_m/1.png | Bin .../pics/people/school_kid_m/2.png | Bin .../pics/people/school_kid_m/3.png | Bin .../pics/people/school_kid_m/4.png | Bin .../pics/people/school_kid_m/5.png | Bin .../pics/people/school_kid_m/6.png | Bin .../pics/people/school_kid_m/7.png | Bin .../pics/people/school_kid_m/8.png | Bin .../pics/people/scientist_1/0.png | Bin .../pics/people/scientist_1/1.png | Bin .../pics/people/scientist_1/2.png | Bin .../pics/people/scientist_1/3.png | Bin .../pics/people/scientist_1/4.png | Bin .../pics/people/scientist_1/5.png | Bin .../pics/people/scientist_1/6.png | Bin .../pics/people/scientist_1/7.png | Bin .../pics/people/scientist_1/8.png | Bin .../pics/people/scientist_2/0.png | Bin .../pics/people/scientist_2/1.png | Bin .../pics/people/scientist_2/2.png | Bin .../pics/people/scientist_2/3.png | Bin .../pics/people/scientist_2/4.png | Bin .../pics/people/scientist_2/5.png | Bin .../pics/people/scientist_2/6.png | Bin .../pics/people/scientist_2/7.png | Bin .../pics/people/scientist_2/8.png | Bin .../pics/people/scott/0.png | Bin .../pics/people/scott/1.png | Bin .../pics/people/scott/2.png | Bin .../pics/people/scott/3.png | Bin .../pics/people/scott/4.png | Bin .../pics/people/scott/5.png | Bin .../pics/people/scott/6.png | Bin .../pics/people/scott/7.png | Bin .../pics/people/scott/8.png | Bin .../pics/people/sidney/0.png | Bin .../pics/people/sidney/1.png | Bin .../pics/people/sidney/2.png | Bin .../pics/people/spenser/0.png | Bin .../pics/people/spenser/1.png | Bin .../pics/people/spenser/2.png | Bin .../pics/people/spenser/3.png | Bin .../pics/people/spenser/4.png | Bin .../pics/people/spenser/5.png | Bin .../pics/people/spenser/6.png | Bin .../pics/people/spenser/7.png | Bin .../pics/people/spenser/8.png | Bin .../pics/people/steven/0.png | Bin .../pics/people/steven/1.png | Bin .../pics/people/steven/2.png | Bin .../pics/people/steven/3.png | Bin .../pics/people/steven/4.png | Bin .../pics/people/steven/5.png | Bin .../pics/people/steven/6.png | Bin .../pics/people/steven/7.png | Bin .../pics/people/steven/8.png | Bin .../pics/people/swimmer_f/0.png | Bin .../pics/people/swimmer_f/1.png | Bin .../pics/people/swimmer_f/2.png | Bin .../pics/people/swimmer_f/3.png | Bin .../pics/people/swimmer_f/4.png | Bin .../pics/people/swimmer_f/5.png | Bin .../pics/people/swimmer_f/6.png | Bin .../pics/people/swimmer_f/7.png | Bin .../pics/people/swimmer_f/8.png | Bin .../pics/people/swimmer_m/0.png | Bin .../pics/people/swimmer_m/1.png | Bin .../pics/people/swimmer_m/2.png | Bin .../pics/people/swimmer_m/3.png | Bin .../pics/people/swimmer_m/4.png | Bin .../pics/people/swimmer_m/5.png | Bin .../pics/people/swimmer_m/6.png | Bin .../pics/people/swimmer_m/7.png | Bin .../pics/people/swimmer_m/8.png | Bin .../pics/people/tate/0.png | Bin .../pics/people/tate/1.png | Bin .../pics/people/tate/2.png | Bin .../pics/people/teala/0.png | Bin .../pics/people/teala/1.png | Bin .../pics/people/teala/2.png | Bin .../pics/people/teala/3.png | Bin .../pics/people/teala/4.png | Bin .../pics/people/teala/5.png | Bin .../pics/people/teala/6.png | Bin .../pics/people/teala/7.png | Bin .../pics/people/teala/8.png | Bin .../pics/people/tuber_f/0.png | Bin .../pics/people/tuber_f/1.png | Bin .../pics/people/tuber_f/2.png | Bin .../pics/people/tuber_f/3.png | Bin .../pics/people/tuber_f/4.png | Bin .../pics/people/tuber_f/5.png | Bin .../pics/people/tuber_f/6.png | Bin .../pics/people/tuber_f/7.png | Bin .../pics/people/tuber_f/8.png | Bin .../pics/people/tuber_m/0.png | Bin .../pics/people/tuber_m/1.png | Bin .../pics/people/tuber_m/2.png | Bin .../pics/people/tuber_m/3.png | Bin .../pics/people/tuber_m/4.png | Bin .../pics/people/tuber_m/5.png | Bin .../pics/people/tuber_m/6.png | Bin .../pics/people/tuber_m/7.png | Bin .../pics/people/tuber_m/8.png | Bin .../pics/people/tuber_m_swimming/0.png | Bin .../pics/people/tuber_m_swimming/1.png | Bin .../pics/people/tuber_m_swimming/2.png | Bin .../pics/people/tuber_m_swimming/3.png | Bin .../pics/people/tuber_m_swimming/4.png | Bin .../pics/people/tuber_m_swimming/5.png | Bin .../pics/people/tuber_m_swimming/6.png | Bin .../pics/people/tuber_m_swimming/7.png | Bin .../pics/people/tuber_m_swimming/8.png | Bin .../pics/people/tucker/0.png | Bin .../pics/people/tucker/1.png | Bin .../pics/people/tucker/2.png | Bin .../pics/people/tucker/3.png | Bin .../pics/people/tucker/4.png | Bin .../pics/people/tucker/5.png | Bin .../pics/people/tucker/6.png | Bin .../pics/people/tucker/7.png | Bin .../pics/people/tucker/8.png | Bin .../pics/people/union_room_attendant/0.png | Bin .../pics/people/union_room_attendant/1.png | Bin .../pics/people/union_room_attendant/2.png | Bin .../pics/people/unused_woman/0.png | Bin .../pics/people/unused_woman/1.png | Bin .../pics/people/unused_woman/2.png | Bin .../pics/people/unused_woman/3.png | Bin .../pics/people/unused_woman/4.png | Bin .../pics/people/unused_woman/5.png | Bin .../pics/people/unused_woman/6.png | Bin .../pics/people/unused_woman/7.png | Bin .../pics/people/unused_woman/8.png | Bin .../pics/people/wallace/0.png | Bin .../pics/people/wallace/1.png | Bin .../pics/people/wallace/2.png | Bin .../pics/people/wallace/3.png | Bin .../pics/people/wallace/4.png | Bin .../pics/people/wallace/5.png | Bin .../pics/people/wallace/6.png | Bin .../pics/people/wallace/7.png | Bin .../pics/people/wallace/8.png | Bin .../pics/people/wally/0.png | Bin .../pics/people/wally/1.png | Bin .../pics/people/wally/2.png | Bin .../pics/people/wally/3.png | Bin .../pics/people/wally/4.png | Bin .../pics/people/wally/5.png | Bin .../pics/people/wally/6.png | Bin .../pics/people/wally/7.png | Bin .../pics/people/wally/8.png | Bin .../pics/people/wattson/0.png | Bin .../pics/people/wattson/1.png | Bin .../pics/people/wattson/2.png | Bin .../pics/people/winona/0.png | Bin .../pics/people/winona/1.png | Bin .../pics/people/winona/2.png | Bin .../pics/people/woman_1/0.png | Bin .../pics/people/woman_1/1.png | Bin .../pics/people/woman_1/2.png | Bin .../pics/people/woman_1/3.png | Bin .../pics/people/woman_1/4.png | Bin .../pics/people/woman_1/5.png | Bin .../pics/people/woman_1/6.png | Bin .../pics/people/woman_1/7.png | Bin .../pics/people/woman_1/8.png | Bin .../pics/people/woman_2/0.png | Bin .../pics/people/woman_2/1.png | Bin .../pics/people/woman_2/2.png | Bin .../pics/people/woman_2/3.png | Bin .../pics/people/woman_2/4.png | Bin .../pics/people/woman_2/5.png | Bin .../pics/people/woman_2/6.png | Bin .../pics/people/woman_2/7.png | Bin .../pics/people/woman_2/8.png | Bin .../pics/people/woman_3/0.png | Bin .../pics/people/woman_3/1.png | Bin .../pics/people/woman_3/2.png | Bin .../pics/people/woman_3/3.png | Bin .../pics/people/woman_3/4.png | Bin .../pics/people/woman_3/5.png | Bin .../pics/people/woman_3/6.png | Bin .../pics/people/woman_3/7.png | Bin .../pics/people/woman_3/8.png | Bin .../pics/people/woman_4/0.png | Bin .../pics/people/woman_4/1.png | Bin .../pics/people/woman_4/2.png | Bin .../pics/people/woman_4/3.png | Bin .../pics/people/woman_4/4.png | Bin .../pics/people/woman_4/5.png | Bin .../pics/people/woman_4/6.png | Bin .../pics/people/woman_4/7.png | Bin .../pics/people/woman_4/8.png | Bin .../pics/people/woman_5/0.png | Bin .../pics/people/woman_5/1.png | Bin .../pics/people/woman_5/2.png | Bin .../pics/people/woman_5/3.png | Bin .../pics/people/woman_5/4.png | Bin .../pics/people/woman_5/5.png | Bin .../pics/people/woman_5/6.png | Bin .../pics/people/woman_5/7.png | Bin .../pics/people/woman_5/8.png | Bin .../pics/people/woman_6/0.png | Bin .../pics/people/woman_6/1.png | Bin .../pics/people/woman_6/2.png | Bin .../pics/people/woman_6/3.png | Bin .../pics/people/woman_6/4.png | Bin .../pics/people/woman_6/5.png | Bin .../pics/people/woman_6/6.png | Bin .../pics/people/woman_6/7.png | Bin .../pics/people/woman_6/8.png | Bin .../pics/people/woman_7/0.png | Bin .../pics/people/woman_7/1.png | Bin .../pics/people/woman_7/2.png | Bin .../pics/people/woman_7/3.png | Bin .../pics/people/woman_7/4.png | Bin .../pics/people/woman_7/5.png | Bin .../pics/people/woman_7/6.png | Bin .../pics/people/woman_7/7.png | Bin .../pics/people/woman_7/8.png | Bin .../pics/people/youngster/0.png | Bin .../pics/people/youngster/1.png | Bin .../pics/people/youngster/2.png | Bin .../pics/people/youngster/3.png | Bin .../pics/people/youngster/4.png | Bin .../pics/people/youngster/5.png | Bin .../pics/people/youngster/6.png | Bin .../pics/people/youngster/7.png | Bin .../pics/people/youngster/8.png | Bin .../pics/pokemon/azumarill/0.png | Bin .../pics/pokemon/azumarill/1.png | Bin .../pics/pokemon/azumarill/2.png | Bin .../pics/pokemon/azurill/0.png | Bin .../pics/pokemon/azurill/1.png | Bin .../pics/pokemon/azurill/2.png | Bin .../pics/pokemon/deoxys/0.png | Bin .../pics/pokemon/deoxys/1.png | Bin .../pics/pokemon/dusclops/0.png | Bin .../pics/pokemon/dusclops/1.png | Bin .../pics/pokemon/dusclops/2.png | Bin .../pics/pokemon/dusclops/3.png | Bin .../pics/pokemon/dusclops/4.png | Bin .../pics/pokemon/dusclops/5.png | Bin .../pics/pokemon/dusclops/6.png | Bin .../pics/pokemon/dusclops/7.png | Bin .../pics/pokemon/dusclops/8.png | Bin .../pics/pokemon/enemy_zigzagoon/0.png | Bin .../pics/pokemon/enemy_zigzagoon/1.png | Bin .../pics/pokemon/enemy_zigzagoon/2.png | Bin .../pics/pokemon/enemy_zigzagoon/3.png | Bin .../pics/pokemon/enemy_zigzagoon/4.png | Bin .../pics/pokemon/enemy_zigzagoon/5.png | Bin .../pics/pokemon/enemy_zigzagoon/6.png | Bin .../pics/pokemon/enemy_zigzagoon/7.png | Bin .../pics/pokemon/enemy_zigzagoon/8.png | Bin .../pics/pokemon/groudon_front/0.png | Bin .../pics/pokemon/groudon_front/1.png | Bin .../pics/pokemon/groudon_side/0.png | Bin .../pics/pokemon/groudon_side/1.png | Bin .../pics/pokemon/ho_oh/0.png | Bin .../pics/pokemon/ho_oh/1.png | Bin .../pics/pokemon/kecleon/0.png | Bin .../pics/pokemon/kecleon/1.png | Bin .../pics/pokemon/kecleon/2.png | Bin .../pics/pokemon/kirlia/0.png | Bin .../pics/pokemon/kirlia/1.png | Bin .../pics/pokemon/kirlia/2.png | Bin .../pics/pokemon/kirlia/3.png | Bin .../pics/pokemon/kirlia/4.png | Bin .../pics/pokemon/kirlia/5.png | Bin .../pics/pokemon/kirlia/6.png | Bin .../pics/pokemon/kirlia/7.png | Bin .../pics/pokemon/kirlia/8.png | Bin .../pics/pokemon/kyogre_front/0.png | Bin .../pics/pokemon/kyogre_front/1.png | Bin .../pics/pokemon/kyogre_side/0.png | Bin .../pics/pokemon/kyogre_side/1.png | Bin .../pics/pokemon/latias_latios/0.png | Bin .../pics/pokemon/latias_latios/1.png | Bin .../pics/pokemon/latias_latios/2.png | Bin .../pics/pokemon/lugia/0.png | Bin .../pics/pokemon/lugia/1.png | Bin .../pics/pokemon/mew/0.png | Bin .../pics/pokemon/mew/1.png | Bin .../pics/pokemon/mew/2.png | Bin .../pics/pokemon/mew/3.png | Bin .../pics/pokemon/mew/4.png | Bin .../pics/pokemon/mew/5.png | Bin .../pics/pokemon/mew/6.png | Bin .../pics/pokemon/mew/7.png | Bin .../pics/pokemon/mew/8.png | Bin .../pics/pokemon/pikachu/0.png | Bin .../pics/pokemon/pikachu/1.png | Bin .../pics/pokemon/pikachu/2.png | Bin .../pics/pokemon/poochyena/0.png | Bin .../pics/pokemon/poochyena/1.png | Bin .../pics/pokemon/poochyena/2.png | Bin .../pics/pokemon/poochyena/3.png | Bin .../pics/pokemon/poochyena/4.png | Bin .../pics/pokemon/poochyena/5.png | Bin .../pics/pokemon/poochyena/6.png | Bin .../pics/pokemon/poochyena/7.png | Bin .../pics/pokemon/poochyena/8.png | Bin .../pics/pokemon/rayquaza/0.png | Bin .../pics/pokemon/rayquaza/1.png | Bin .../pics/pokemon/rayquaza/2.png | Bin .../pics/pokemon/rayquaza/3.png | Bin .../pics/pokemon/rayquaza/4.png | Bin .../pics/pokemon/rayquaza_still.png | Bin .../pics/pokemon/regi.png | Bin .../pics/pokemon/skitty/0.png | Bin .../pics/pokemon/skitty/1.png | Bin .../pics/pokemon/skitty/2.png | Bin .../pics/pokemon/sudowoodo/0.png | Bin .../pics/pokemon/sudowoodo/1.png | Bin .../pics/pokemon/sudowoodo/2.png | Bin .../pics/pokemon/vigoroth_carrying_box/0.png | Bin .../pics/pokemon/vigoroth_carrying_box/1.png | Bin .../pics/pokemon/vigoroth_carrying_box/2.png | Bin .../pics/pokemon/vigoroth_facing_away/0.png | Bin .../pics/pokemon/vigoroth_facing_away/1.png | Bin .../pics/pokemon/wingull/0.png | Bin .../pics/pokemon/wingull/1.png | Bin .../pics/pokemon/wingull/2.png | Bin .../pics/pokemon/wingull/3.png | Bin .../pics/pokemon/wingull/4.png | Bin .../pics/pokemon/wingull/5.png | Bin .../pics/pokemon/zigzagoon/0.png | Bin .../pics/pokemon/zigzagoon/1.png | Bin .../pics/pokemon/zigzagoon/2.png | Bin graphics_file_rules.mk | 4 +- include/battle_setup.h | 4 +- include/berry.h | 12 +- include/constants/event_objects.h | 263 ++ include/constants/map_objects.h | 263 -- include/constants/vars.h | 2 +- include/data/decoration/tiles.h | 90 +- include/event_data.h | 2 +- include/event_obj_lock.h | 11 + include/event_object_movement.h | 576 +-- include/field_control_avatar.h | 2 +- include/field_effect.h | 40 +- include/field_effect_helpers.h | 8 +- include/field_player_avatar.h | 2 +- include/global.fieldmap.h | 18 +- include/global.h | 6 +- include/load_save.h | 4 +- include/map_obj_lock.h | 11 - include/mauville_old_man.h | 2 +- include/overworld.h | 16 +- include/pokenav.h | 2 +- include/rom_81BE66C.h | 2 +- include/trainer_see.h | 8 +- ld_script.txt | 2 +- src/battle_setup.c | 60 +- src/battle_transition.c | 6 +- src/berry.c | 52 +- src/bike.c | 124 +- src/data/field_event_obj/base_oam.h | 16 +- .../berry_tree_graphics_tables.h | 784 ++-- src/data/field_event_obj/event_object_anims.h | 736 +-- .../field_event_obj/event_object_graphics.h | 3266 ++++++------- .../event_object_graphics_info.h | 490 +- .../event_object_graphics_info_pointers.h | 988 ++-- .../field_event_obj/event_object_pic_tables.h | 4124 ++++++++--------- .../field_event_obj/event_object_subsprites.h | 166 +- .../field_event_obj/field_effect_objects.h | 76 +- .../movement_action_func_tables.h | 1152 ++--- .../movement_type_func_tables.h | 104 +- src/decoration.c | 50 +- src/event_data.c | 2 +- src/{map_obj_lock.c => event_obj_lock.c} | 62 +- src/event_object_movement.c | 2942 ++++++------ src/field_camera.c | 4 +- src/field_effect.c | 404 +- src/field_special_scene.c | 8 +- src/fldeff_groundshake.c | 18 +- src/item_menu.c | 2 +- src/item_use.c | 14 +- src/load_save.c | 16 +- src/mauville_old_man.c | 10 +- src/naming_screen.c | 6 +- src/overworld.c | 316 +- src/rom6.c | 24 +- src/scrcmd.c | 44 +- src/script_movement.c | 44 +- src/secret_base.c | 18 +- src/start_menu.c | 2 +- src/trainer_see.c | 220 +- src/tv.c | 4 +- sym_common.txt | 2 +- sym_ewram.txt | 2 +- 2157 files changed, 12673 insertions(+), 12675 deletions(-) rename graphics/{map_objects => event_objects}/palettes/field_effect_object_palette_00.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_effect_object_palette_01.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_effect_object_palette_02.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_effect_object_palette_03.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_effect_object_palette_04.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_effect_object_palette_05.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_effect_object_palette_06.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_effect_object_palette_07.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_effect_object_palette_08.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_effect_object_palette_10.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_00.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_01.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_02.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_03.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_04.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_05.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_06.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_07.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_08.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_09.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_10.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_11.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_12.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_13.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_14.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_15.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_16.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_17.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_18.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_19.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_20.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_21.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_22.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_23.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_24.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_25.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_26.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_27.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_28.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_29.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_30.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_31.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_32.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_33.pal (100%) rename graphics/{map_objects => event_objects}/palettes/field_object_palette_34.pal (100%) rename graphics/{map_objects => event_objects}/palettes/unused_palette.pal (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/aguav/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/aguav/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/aguav/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/aguav/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/aguav/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/aguav/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/aspear/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/aspear/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/aspear/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/aspear/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/aspear/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/aspear/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/cheri/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/cheri/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/cheri/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/cheri/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/cheri/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/cheri/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/chesto/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/chesto/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/chesto/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/chesto/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/chesto/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/chesto/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/cornn/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/cornn/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/cornn/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/cornn/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/cornn/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/cornn/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/dirt_pile.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/durin/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/durin/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/durin/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/durin/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/durin/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/durin/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/figy/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/figy/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/figy/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/figy/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/figy/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/figy/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/grepa/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/grepa/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/grepa/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/grepa/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/grepa/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/grepa/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/hondew/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/hondew/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/hondew/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/hondew/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/hondew/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/hondew/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/iapapa/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/iapapa/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/iapapa/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/iapapa/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/iapapa/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/iapapa/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/kelpsy/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/kelpsy/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/kelpsy/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/kelpsy/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/kelpsy/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/kelpsy/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/lansat/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/lansat/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/lansat/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/lansat/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/lansat/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/lansat/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/leppa/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/leppa/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/leppa/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/leppa/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/leppa/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/leppa/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/liechi/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/liechi/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/liechi/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/liechi/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/liechi/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/liechi/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/lum/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/lum/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/lum/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/lum/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/lum/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/lum/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/mago/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/mago/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/mago/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/mago/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/mago/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/mago/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/nomel/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/nomel/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/nomel/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/nomel/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/nomel/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/nomel/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/oran/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/oran/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/oran/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/oran/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/oran/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/oran/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/pamtre/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/pamtre/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/pamtre/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/pamtre/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/pamtre/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/pamtre/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/pecha/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/pecha/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/pecha/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/pecha/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/pecha/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/pecha/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/persim/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/persim/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/persim/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/persim/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/persim/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/persim/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/pomeg/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/pomeg/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/pomeg/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/pomeg/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/pomeg/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/pomeg/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/rabuta/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/rabuta/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/rabuta/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/rabuta/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/rabuta/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/rabuta/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/rawst/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/rawst/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/rawst/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/rawst/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/rawst/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/rawst/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/razz/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/razz/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/razz/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/razz/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/razz/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/razz/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/sitrus/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/sitrus/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/sitrus/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/sitrus/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/sitrus/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/sitrus/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/spelon/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/spelon/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/spelon/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/spelon/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/spelon/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/spelon/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/sprout/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/sprout/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/tamato/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/tamato/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/tamato/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/tamato/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/tamato/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/tamato/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/wepear/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/wepear/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/wepear/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/wepear/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/wepear/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/wepear/5.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/wiki/0.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/wiki/1.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/wiki/2.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/wiki/3.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/wiki/4.png (100%) rename graphics/{map_objects => event_objects}/pics/berry_trees/wiki/5.png (100%) rename graphics/{map_objects => event_objects}/pics/cushions/ball_cushion.png (100%) rename graphics/{map_objects => event_objects}/pics/cushions/diamond_cushion.png (100%) rename graphics/{map_objects => event_objects}/pics/cushions/fire_cushion.png (100%) rename graphics/{map_objects => event_objects}/pics/cushions/grass_cushion.png (100%) rename graphics/{map_objects => event_objects}/pics/cushions/kiss_cushion.png (100%) rename graphics/{map_objects => event_objects}/pics/cushions/pika_cushion.png (100%) rename graphics/{map_objects => event_objects}/pics/cushions/round_cushion.png (100%) rename graphics/{map_objects => event_objects}/pics/cushions/spin_cushion.png (100%) rename graphics/{map_objects => event_objects}/pics/cushions/water_cushion.png (100%) rename graphics/{map_objects => event_objects}/pics/cushions/zigzag_cushion.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/azurill_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/baltoy_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/big_blastoise_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/big_charizard_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/big_lapras_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/big_regice_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/big_regirock_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/big_registeel_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/big_rhydon_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/big_snorlax_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/big_venusaur_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/big_wailmer_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/chikorita_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/clefairy_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/cyndaquil_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/ditto_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/duskull_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/gulpin_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/jigglypuff_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/kecleon_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/lotad_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/marill_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/meowth_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/mudkip_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/pichu_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/pikachu_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/seedot_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/skitty_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/smoochum_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/swablu_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/togepi_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/torchic_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/totodile_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/treecko_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/unused_magnemite_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/unused_natu_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/unused_pikachu_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/unused_porygon2_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/unused_squirtle_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/unused_wooper_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/dolls/wynaut_doll.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/arrow/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/arrow/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/arrow/2.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/arrow/3.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/arrow/4.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/arrow/5.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/arrow/6.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/arrow/7.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/ash/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/ash/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/ash/2.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/ash/3.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/ash/4.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/berry_tree_growth_sparkle/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/berry_tree_growth_sparkle/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/berry_tree_growth_sparkle/2.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/berry_tree_growth_sparkle/3.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/berry_tree_growth_sparkle/4.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/berry_tree_growth_sparkle/5.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/bike_hop_big_splash/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/bike_hop_big_splash/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/bike_hop_big_splash/2.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/bike_hop_big_splash/3.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/bike_hop_small_splash/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/bike_hop_small_splash/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/bike_hop_small_splash/2.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/bike_hop_tall_grass/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/bike_hop_tall_grass/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/bike_hop_tall_grass/2.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/bike_hop_tall_grass/3.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/bike_tire_tracks/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/bike_tire_tracks/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/bike_tire_tracks/2.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/bike_tire_tracks/3.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/bird.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/bubbles/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/bubbles/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/bubbles/2.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/bubbles/3.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/bubbles/4.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/bubbles/5.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/bubbles/6.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/bubbles/7.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/deep_sand_footprints/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/deep_sand_footprints/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/ground_impact_dust/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/ground_impact_dust/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/ground_impact_dust/2.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/hot_springs_water.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/jump_out_of_ash/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/jump_out_of_ash/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/jump_out_of_ash/2.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/jump_out_of_ash/3.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/jump_out_of_ash/4.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/long_grass/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/long_grass/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/long_grass/2.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/long_grass/3.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/mountain_disguise/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/mountain_disguise/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/mountain_disguise/2.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/mountain_disguise/3.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/mountain_disguise/4.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/mountain_disguise/5.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/mountain_disguise/6.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/ripple/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/ripple/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/ripple/2.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/ripple/3.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/ripple/4.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/sand_disguise_placeholder/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/sand_disguise_placeholder/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/sand_disguise_placeholder/2.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/sand_disguise_placeholder/3.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/sand_disguise_placeholder/4.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/sand_disguise_placeholder/5.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/sand_disguise_placeholder/6.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/sand_footprints/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/sand_footprints/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/shadow_extra_large.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/shadow_large.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/shadow_medium.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/shadow_small.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/short_grass/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/short_grass/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/splash/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/splash/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/surf_blob/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/surf_blob/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/surf_blob/2.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/tall_grass/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/tall_grass/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/tall_grass/2.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/tall_grass/3.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/tall_grass/4.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/tree_disguise/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/tree_disguise/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/tree_disguise/2.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/tree_disguise/3.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/tree_disguise/4.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/tree_disguise/5.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/tree_disguise/6.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_16/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_16/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_16/2.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_16/3.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_16/4.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_16/5.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_17/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_17/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_17/2.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_17/3.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_17/4.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_17/5.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_17/6.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_17/7.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_18/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_18/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_18/2.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_18/3.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_19/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_19/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_19/2.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_19/3.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_20/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_20/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_20/2.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_20/3.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_20/4.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_29/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_29/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_29/2.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_33/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_33/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_33/2.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_33/3.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_33/4.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_35/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_35/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_4F6D38/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unknown_4F7E38/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unused_grass/0.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unused_grass/1.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unused_grass/2.png (100%) rename graphics/{map_objects => event_objects}/pics/effects/unused_grass/3.png (100%) rename graphics/{map_objects => event_objects}/pics/misc/birchs_bag.png (100%) rename graphics/{map_objects => event_objects}/pics/misc/birth_island_stone.png (100%) rename graphics/{map_objects => event_objects}/pics/misc/breakable_rock/0.png (100%) rename graphics/{map_objects => event_objects}/pics/misc/breakable_rock/1.png (100%) rename graphics/{map_objects => event_objects}/pics/misc/breakable_rock/2.png (100%) rename graphics/{map_objects => event_objects}/pics/misc/breakable_rock/3.png (100%) rename graphics/{map_objects => event_objects}/pics/misc/cable_car.png (100%) rename graphics/{map_objects => event_objects}/pics/misc/cuttable_tree/0.png (100%) rename graphics/{map_objects => event_objects}/pics/misc/cuttable_tree/1.png (100%) rename graphics/{map_objects => event_objects}/pics/misc/cuttable_tree/2.png (100%) rename graphics/{map_objects => event_objects}/pics/misc/cuttable_tree/3.png (100%) rename graphics/{map_objects => event_objects}/pics/misc/fossil.png (100%) rename graphics/{map_objects => event_objects}/pics/misc/item_ball.png (100%) rename graphics/{map_objects => event_objects}/pics/misc/moving_box.png (100%) rename graphics/{map_objects => event_objects}/pics/misc/mr_brineys_boat/0.png (100%) rename graphics/{map_objects => event_objects}/pics/misc/mr_brineys_boat/1.png (100%) rename graphics/{map_objects => event_objects}/pics/misc/mr_brineys_boat/2.png (100%) rename graphics/{map_objects => event_objects}/pics/misc/pushable_boulder.png (100%) rename graphics/{map_objects => event_objects}/pics/misc/ss_tidal.png (100%) rename graphics/{map_objects => event_objects}/pics/misc/statue.png (100%) rename graphics/{map_objects => event_objects}/pics/misc/submarine_shadow.png (100%) rename graphics/{map_objects => event_objects}/pics/misc/truck.png (100%) rename graphics/{map_objects => event_objects}/pics/people/anabel/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/anabel/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/anabel/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/anabel/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/anabel/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/anabel/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/anabel/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/anabel/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/anabel/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/aqua_member_f/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/aqua_member_f/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/aqua_member_f/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/aqua_member_f/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/aqua_member_f/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/aqua_member_f/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/aqua_member_f/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/aqua_member_f/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/aqua_member_f/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/aqua_member_m/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/aqua_member_m/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/aqua_member_m/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/aqua_member_m/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/aqua_member_m/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/aqua_member_m/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/aqua_member_m/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/aqua_member_m/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/aqua_member_m/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/archie/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/archie/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/archie/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/archie/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/archie/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/archie/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/archie/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/archie/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/archie/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/artist/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/artist/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/artist/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/artist/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/artist/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/artist/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/artist/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/artist/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/artist/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/beauty/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/beauty/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/beauty/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/beauty/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/beauty/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/beauty/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/beauty/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/beauty/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/beauty/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/black_belt/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/black_belt/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/black_belt/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/black_belt/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/black_belt/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/black_belt/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/black_belt/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/black_belt/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/black_belt/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_1/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_1/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_1/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_1/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_1/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_1/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_1/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_1/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_1/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_2/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_2/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_2/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_2/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_2/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_2/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_2/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_2/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_2/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_3/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_3/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_3/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_3/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_3/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_3/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_3/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_3/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_3/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_4/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_4/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_4/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_4/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_4/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_4/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_4/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_4/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_4/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_5/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_5/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/boy_5/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brandon/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brandon/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brandon/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brandon/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brandon/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brandon/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brandon/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brandon/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brandon/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brawly/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brawly/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brawly/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/acro_bike/00.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/acro_bike/01.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/acro_bike/02.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/acro_bike/03.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/acro_bike/04.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/acro_bike/05.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/acro_bike/06.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/acro_bike/07.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/acro_bike/08.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/acro_bike/09.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/acro_bike/10.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/acro_bike/11.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/acro_bike/12.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/acro_bike/13.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/acro_bike/14.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/acro_bike/15.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/acro_bike/16.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/acro_bike/17.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/acro_bike/18.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/acro_bike/19.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/acro_bike/20.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/acro_bike/21.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/acro_bike/22.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/acro_bike/23.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/acro_bike/24.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/acro_bike/25.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/acro_bike/26.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/decorating.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/field_move/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/field_move/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/field_move/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/field_move/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/field_move/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/fishing/00.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/fishing/01.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/fishing/02.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/fishing/03.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/fishing/04.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/fishing/05.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/fishing/06.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/fishing/07.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/fishing/08.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/fishing/09.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/fishing/10.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/fishing/11.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/mach_bike/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/mach_bike/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/mach_bike/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/mach_bike/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/mach_bike/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/mach_bike/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/mach_bike/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/mach_bike/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/mach_bike/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/normal/00.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/normal/01.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/normal/02.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/normal/03.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/normal/04.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/normal/05.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/normal/06.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/normal/07.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/normal/08.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/normal/09.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/normal/10.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/normal/11.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/normal/12.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/normal/13.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/normal/14.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/normal/15.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/normal/16.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/normal/17.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/surfing/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/surfing/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/surfing/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/surfing/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/surfing/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/surfing/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/underwater/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/underwater/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/underwater/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/underwater/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/watering/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/watering/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/watering/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/watering/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/watering/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/brendan/watering/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/bug_catcher/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/bug_catcher/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/bug_catcher/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/bug_catcher/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/bug_catcher/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/bug_catcher/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/bug_catcher/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/bug_catcher/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/bug_catcher/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cameraman/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cameraman/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cameraman/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cameraman/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cameraman/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cameraman/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cameraman/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cameraman/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cameraman/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/camper/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/camper/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/camper/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/camper/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/camper/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/camper/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/camper/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/camper/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/camper/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/contest_old_man/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/contest_old_man/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/contest_old_man/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/contest_old_man/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/contest_old_man/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/contest_old_man/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/contest_old_man/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/contest_old_man/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/contest_old_man/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cook/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cook/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cook/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cycling_triathlete_f/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cycling_triathlete_f/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cycling_triathlete_f/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cycling_triathlete_f/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cycling_triathlete_f/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cycling_triathlete_f/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cycling_triathlete_f/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cycling_triathlete_f/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cycling_triathlete_f/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cycling_triathlete_m/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cycling_triathlete_m/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cycling_triathlete_m/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cycling_triathlete_m/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cycling_triathlete_m/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cycling_triathlete_m/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cycling_triathlete_m/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cycling_triathlete_m/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/cycling_triathlete_m/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/drake/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/drake/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/drake/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/fat_man/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/fat_man/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/fat_man/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/fat_man/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/fat_man/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/fat_man/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/fat_man/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/fat_man/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/fat_man/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/fisherman/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/fisherman/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/fisherman/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/fisherman/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/fisherman/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/fisherman/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/fisherman/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/fisherman/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/fisherman/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/flannery/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/flannery/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/flannery/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/gentleman/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/gentleman/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/gentleman/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/gentleman/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/gentleman/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/gentleman/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/gentleman/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/gentleman/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/gentleman/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/girl_1/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/girl_1/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/girl_1/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/girl_1/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/girl_1/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/girl_1/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/girl_1/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/girl_1/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/girl_1/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/girl_2/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/girl_2/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/girl_2/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/girl_2/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/girl_2/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/girl_2/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/girl_2/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/girl_2/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/girl_2/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/girl_3/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/girl_3/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/girl_3/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/girl_3/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/girl_3/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/girl_3/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/girl_3/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/girl_3/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/girl_3/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/glacia/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/glacia/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/glacia/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/greta/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/greta/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/greta/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/greta/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/greta/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/greta/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/greta/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/greta/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/greta/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/hex_maniac/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/hex_maniac/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/hex_maniac/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/hex_maniac/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/hex_maniac/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/hex_maniac/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/hex_maniac/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/hex_maniac/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/hex_maniac/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/hiker/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/hiker/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/hiker/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/hiker/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/hiker/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/hiker/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/hiker/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/hiker/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/hiker/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/hot_springs_old_woman/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/hot_springs_old_woman/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/hot_springs_old_woman/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/hot_springs_old_woman/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/hot_springs_old_woman/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/hot_springs_old_woman/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/hot_springs_old_woman/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/hot_springs_old_woman/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/hot_springs_old_woman/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/juan/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/juan/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/juan/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/juan/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/juan/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/juan/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/juan/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/juan/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/juan/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/lass/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/lass/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/lass/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/lass/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/lass/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/lass/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/lass/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/lass/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/lass/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/leaf/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/leaf/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/leaf/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/leaf/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/leaf/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/leaf/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/leaf/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/leaf/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/leaf/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_boy_1/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_boy_1/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_boy_1/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_boy_1/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_boy_1/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_boy_1/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_boy_1/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_boy_1/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_boy_1/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_boy_2/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_boy_2/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_boy_2/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_boy_2/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_boy_2/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_boy_2/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_boy_2/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_boy_2/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_boy_2/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_girl_1/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_girl_1/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_girl_1/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_girl_1/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_girl_1/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_girl_1/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_girl_1/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_girl_1/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_girl_1/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_girl_2/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_girl_2/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_girl_2/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_girl_2/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_girl_2/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_girl_2/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_girl_2/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_girl_2/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/little_girl_2/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/liza/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/liza/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/liza/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/lucy/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/lucy/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/lucy/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/lucy/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/lucy/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/lucy/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/lucy/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/lucy/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/lucy/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/magma_member_f/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/magma_member_f/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/magma_member_f/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/magma_member_f/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/magma_member_f/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/magma_member_f/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/magma_member_f/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/magma_member_f/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/magma_member_f/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/magma_member_m/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/magma_member_m/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/magma_member_m/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/magma_member_m/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/magma_member_m/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/magma_member_m/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/magma_member_m/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/magma_member_m/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/magma_member_m/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_1/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_1/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_1/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_1/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_1/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_1/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_1/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_1/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_1/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_2/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_2/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_2/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_2/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_2/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_2/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_2/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_2/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_2/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_3/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_3/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_3/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_3/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_3/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_3/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_3/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_3/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_3/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_4/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_4/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_4/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_4/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_4/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_4/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_4/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_4/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_4/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_5/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_5/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_5/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_5/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_5/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_5/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_5/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_5/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_5/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_6/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_6/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_6/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_6/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_6/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_6/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_6/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_6/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_6/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_7/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_7/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_7/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_7/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_7/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_7/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_7/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_7/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/man_7/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/maniac/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/maniac/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/maniac/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/maniac/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/maniac/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/maniac/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/maniac/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/maniac/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/maniac/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mart_employee/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mart_employee/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mart_employee/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mart_employee/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mart_employee/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mart_employee/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mart_employee/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mart_employee/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mart_employee/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mauville_old_man_1/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mauville_old_man_1/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mauville_old_man_1/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mauville_old_man_1/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mauville_old_man_1/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mauville_old_man_1/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mauville_old_man_1/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mauville_old_man_1/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mauville_old_man_1/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mauville_old_man_2/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mauville_old_man_2/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mauville_old_man_2/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mauville_old_man_2/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mauville_old_man_2/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mauville_old_man_2/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mauville_old_man_2/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mauville_old_man_2/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mauville_old_man_2/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/maxie/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/maxie/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/maxie/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/maxie/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/maxie/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/maxie/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/maxie/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/maxie/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/maxie/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/acro_bike/00.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/acro_bike/01.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/acro_bike/02.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/acro_bike/03.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/acro_bike/04.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/acro_bike/05.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/acro_bike/06.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/acro_bike/07.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/acro_bike/08.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/acro_bike/09.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/acro_bike/10.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/acro_bike/11.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/acro_bike/12.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/acro_bike/13.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/acro_bike/14.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/acro_bike/15.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/acro_bike/16.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/acro_bike/17.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/acro_bike/18.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/acro_bike/19.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/acro_bike/20.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/acro_bike/21.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/acro_bike/22.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/acro_bike/23.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/acro_bike/24.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/acro_bike/25.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/acro_bike/26.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/decorating.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/field_move/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/field_move/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/field_move/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/field_move/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/field_move/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/fishing/00.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/fishing/01.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/fishing/02.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/fishing/03.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/fishing/04.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/fishing/05.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/fishing/06.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/fishing/07.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/fishing/08.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/fishing/09.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/fishing/10.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/fishing/11.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/mach_bike/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/mach_bike/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/mach_bike/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/mach_bike/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/mach_bike/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/mach_bike/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/mach_bike/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/mach_bike/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/mach_bike/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/normal/00.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/normal/01.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/normal/02.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/normal/03.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/normal/04.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/normal/05.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/normal/06.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/normal/07.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/normal/08.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/normal/09.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/normal/10.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/normal/11.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/normal/12.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/normal/13.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/normal/14.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/normal/15.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/normal/16.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/normal/17.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/surfing/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/surfing/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/surfing/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/surfing/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/surfing/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/surfing/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/underwater/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/underwater/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/underwater/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/underwater/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/watering/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/watering/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/watering/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/watering/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/watering/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/may/watering/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mom/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mom/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mom/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mom/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mom/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mom/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mom/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mom/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mom/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mystery_event_deliveryman/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mystery_event_deliveryman/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/mystery_event_deliveryman/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/noland/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/noland/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/noland/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/noland/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/noland/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/noland/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/noland/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/noland/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/noland/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/norman/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/norman/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/norman/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/norman/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/norman/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/norman/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/norman/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/norman/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/norman/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/nurse/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/nurse/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/nurse/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/nurse/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_man_1/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_man_1/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_man_1/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_man_1/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_man_1/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_man_1/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_man_1/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_man_1/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_man_1/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_man_2/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_man_2/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_man_2/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_woman_1/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_woman_1/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_woman_1/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_woman_1/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_woman_1/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_woman_1/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_woman_1/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_woman_1/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_woman_1/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_woman_2/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_woman_2/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_woman_2/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_woman_2/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_woman_2/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_woman_2/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_woman_2/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_woman_2/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/old_woman_2/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/phoebe/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/phoebe/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/phoebe/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/picnicker/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/picnicker/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/picnicker/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/picnicker/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/picnicker/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/picnicker/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/picnicker/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/picnicker/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/picnicker/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/prof_birch/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/prof_birch/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/prof_birch/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/prof_birch/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/prof_birch/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/prof_birch/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/prof_birch/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/prof_birch/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/prof_birch/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/psychic_m/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/psychic_m/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/psychic_m/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/psychic_m/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/psychic_m/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/psychic_m/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/psychic_m/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/psychic_m/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/psychic_m/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/quinty_plump/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/quinty_plump/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/quinty_plump/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/quinty_plump/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/quinty_plump/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/quinty_plump/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/quinty_plump/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/red/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/red/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/red/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/red/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/red/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/red/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/red/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/red/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/red/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/reporter_f/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/reporter_f/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/reporter_f/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/reporter_f/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/reporter_f/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/reporter_f/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/reporter_f/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/reporter_f/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/reporter_f/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/reporter_m/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/reporter_m/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/reporter_m/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/reporter_m/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/reporter_m/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/reporter_m/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/reporter_m/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/reporter_m/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/reporter_m/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/rooftop_sale_woman/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/rooftop_sale_woman/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/rooftop_sale_woman/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/rooftop_sale_woman/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/rooftop_sale_woman/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/rooftop_sale_woman/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/rooftop_sale_woman/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/rooftop_sale_woman/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/rooftop_sale_woman/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/roxanne/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/roxanne/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/roxanne/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_brendan/00.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_brendan/01.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_brendan/02.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_brendan/03.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_brendan/04.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_brendan/05.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_brendan/06.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_brendan/07.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_brendan/08.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_brendan/09.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_brendan/10.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_brendan/11.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_brendan/12.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_brendan/13.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_brendan/14.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_brendan/15.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_brendan/16.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_brendan/17.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_little_boy/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_little_boy/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_little_boy/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_little_boy/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_little_boy/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_little_boy/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_little_boy/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_little_boy/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_little_boy/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_may/00.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_may/01.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_may/02.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_may/03.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_may/04.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_may/05.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_may/06.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_may/07.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_may/08.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_may/09.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_may/10.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_may/11.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_may/12.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_may/13.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_may/14.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_may/15.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_may/16.png (100%) rename graphics/{map_objects => event_objects}/pics/people/ruby_sapphire_may/17.png (100%) rename graphics/{map_objects => event_objects}/pics/people/running_triathlete_f/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/running_triathlete_f/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/running_triathlete_f/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/running_triathlete_f/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/running_triathlete_f/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/running_triathlete_f/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/running_triathlete_f/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/running_triathlete_f/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/running_triathlete_f/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/running_triathlete_m/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/running_triathlete_m/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/running_triathlete_m/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/running_triathlete_m/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/running_triathlete_m/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/running_triathlete_m/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/running_triathlete_m/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/running_triathlete_m/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/running_triathlete_m/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/sailor/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/sailor/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/sailor/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/sailor/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/sailor/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/sailor/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/sailor/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/sailor/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/sailor/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/school_kid_m/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/school_kid_m/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/school_kid_m/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/school_kid_m/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/school_kid_m/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/school_kid_m/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/school_kid_m/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/school_kid_m/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/school_kid_m/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/scientist_1/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/scientist_1/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/scientist_1/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/scientist_1/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/scientist_1/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/scientist_1/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/scientist_1/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/scientist_1/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/scientist_1/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/scientist_2/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/scientist_2/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/scientist_2/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/scientist_2/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/scientist_2/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/scientist_2/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/scientist_2/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/scientist_2/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/scientist_2/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/scott/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/scott/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/scott/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/scott/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/scott/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/scott/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/scott/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/scott/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/scott/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/sidney/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/sidney/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/sidney/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/spenser/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/spenser/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/spenser/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/spenser/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/spenser/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/spenser/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/spenser/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/spenser/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/spenser/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/steven/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/steven/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/steven/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/steven/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/steven/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/steven/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/steven/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/steven/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/steven/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/swimmer_f/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/swimmer_f/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/swimmer_f/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/swimmer_f/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/swimmer_f/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/swimmer_f/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/swimmer_f/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/swimmer_f/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/swimmer_f/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/swimmer_m/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/swimmer_m/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/swimmer_m/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/swimmer_m/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/swimmer_m/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/swimmer_m/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/swimmer_m/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/swimmer_m/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/swimmer_m/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tate/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tate/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tate/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/teala/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/teala/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/teala/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/teala/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/teala/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/teala/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/teala/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/teala/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/teala/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tuber_f/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tuber_f/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tuber_f/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tuber_f/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tuber_f/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tuber_f/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tuber_f/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tuber_f/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tuber_f/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tuber_m/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tuber_m/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tuber_m/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tuber_m/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tuber_m/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tuber_m/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tuber_m/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tuber_m/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tuber_m/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tuber_m_swimming/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tuber_m_swimming/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tuber_m_swimming/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tuber_m_swimming/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tuber_m_swimming/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tuber_m_swimming/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tuber_m_swimming/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tuber_m_swimming/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tuber_m_swimming/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tucker/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tucker/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tucker/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tucker/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tucker/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tucker/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tucker/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tucker/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/tucker/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/union_room_attendant/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/union_room_attendant/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/union_room_attendant/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/unused_woman/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/unused_woman/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/unused_woman/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/unused_woman/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/unused_woman/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/unused_woman/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/unused_woman/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/unused_woman/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/unused_woman/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/wallace/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/wallace/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/wallace/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/wallace/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/wallace/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/wallace/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/wallace/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/wallace/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/wallace/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/wally/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/wally/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/wally/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/wally/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/wally/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/wally/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/wally/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/wally/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/wally/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/wattson/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/wattson/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/wattson/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/winona/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/winona/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/winona/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_1/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_1/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_1/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_1/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_1/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_1/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_1/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_1/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_1/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_2/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_2/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_2/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_2/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_2/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_2/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_2/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_2/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_2/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_3/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_3/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_3/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_3/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_3/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_3/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_3/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_3/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_3/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_4/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_4/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_4/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_4/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_4/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_4/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_4/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_4/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_4/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_5/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_5/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_5/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_5/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_5/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_5/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_5/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_5/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_5/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_6/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_6/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_6/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_6/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_6/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_6/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_6/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_6/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_6/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_7/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_7/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_7/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_7/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_7/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_7/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_7/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_7/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/woman_7/8.png (100%) rename graphics/{map_objects => event_objects}/pics/people/youngster/0.png (100%) rename graphics/{map_objects => event_objects}/pics/people/youngster/1.png (100%) rename graphics/{map_objects => event_objects}/pics/people/youngster/2.png (100%) rename graphics/{map_objects => event_objects}/pics/people/youngster/3.png (100%) rename graphics/{map_objects => event_objects}/pics/people/youngster/4.png (100%) rename graphics/{map_objects => event_objects}/pics/people/youngster/5.png (100%) rename graphics/{map_objects => event_objects}/pics/people/youngster/6.png (100%) rename graphics/{map_objects => event_objects}/pics/people/youngster/7.png (100%) rename graphics/{map_objects => event_objects}/pics/people/youngster/8.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/azumarill/0.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/azumarill/1.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/azumarill/2.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/azurill/0.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/azurill/1.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/azurill/2.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/deoxys/0.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/deoxys/1.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/dusclops/0.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/dusclops/1.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/dusclops/2.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/dusclops/3.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/dusclops/4.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/dusclops/5.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/dusclops/6.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/dusclops/7.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/dusclops/8.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/enemy_zigzagoon/0.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/enemy_zigzagoon/1.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/enemy_zigzagoon/2.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/enemy_zigzagoon/3.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/enemy_zigzagoon/4.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/enemy_zigzagoon/5.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/enemy_zigzagoon/6.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/enemy_zigzagoon/7.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/enemy_zigzagoon/8.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/groudon_front/0.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/groudon_front/1.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/groudon_side/0.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/groudon_side/1.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/ho_oh/0.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/ho_oh/1.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/kecleon/0.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/kecleon/1.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/kecleon/2.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/kirlia/0.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/kirlia/1.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/kirlia/2.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/kirlia/3.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/kirlia/4.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/kirlia/5.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/kirlia/6.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/kirlia/7.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/kirlia/8.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/kyogre_front/0.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/kyogre_front/1.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/kyogre_side/0.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/kyogre_side/1.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/latias_latios/0.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/latias_latios/1.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/latias_latios/2.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/lugia/0.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/lugia/1.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/mew/0.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/mew/1.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/mew/2.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/mew/3.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/mew/4.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/mew/5.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/mew/6.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/mew/7.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/mew/8.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/pikachu/0.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/pikachu/1.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/pikachu/2.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/poochyena/0.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/poochyena/1.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/poochyena/2.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/poochyena/3.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/poochyena/4.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/poochyena/5.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/poochyena/6.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/poochyena/7.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/poochyena/8.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/rayquaza/0.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/rayquaza/1.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/rayquaza/2.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/rayquaza/3.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/rayquaza/4.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/rayquaza_still.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/regi.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/skitty/0.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/skitty/1.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/skitty/2.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/sudowoodo/0.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/sudowoodo/1.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/sudowoodo/2.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/vigoroth_carrying_box/0.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/vigoroth_carrying_box/1.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/vigoroth_carrying_box/2.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/vigoroth_facing_away/0.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/vigoroth_facing_away/1.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/wingull/0.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/wingull/1.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/wingull/2.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/wingull/3.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/wingull/4.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/wingull/5.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/zigzagoon/0.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/zigzagoon/1.png (100%) rename graphics/{map_objects => event_objects}/pics/pokemon/zigzagoon/2.png (100%) create mode 100644 include/constants/event_objects.h delete mode 100644 include/constants/map_objects.h create mode 100644 include/event_obj_lock.h delete mode 100644 include/map_obj_lock.h rename src/{map_obj_lock.c => event_obj_lock.c} (58%) diff --git a/asm/battle_frontier_1.s b/asm/battle_frontier_1.s index 7291408016..535bbbbbe4 100644 --- a/asm/battle_frontier_1.s +++ b/asm/battle_frontier_1.s @@ -13887,7 +13887,7 @@ task_prev_quest: @ 81960A8 cmp r0, 0 bne _081960C2 bl ScriptContext2_Enable - bl FreezeMapObjects + bl FreezeEventObjects bl sub_808B864 bl sub_808BCF4 _081960C2: @@ -14285,18 +14285,18 @@ sub_81963F0: @ 81963F0 movs r0, 0xFF movs r1, 0 movs r2, 0 - bl GetFieldObjectIdByLocalIdAndMap + bl GetEventObjectIdByLocalIdAndMap adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r0, r1 - bl FieldObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearAnimIfSpecialAnimFinished bl sub_80D338C - bl UnfreezeMapObjects + bl UnfreezeEventObjects bl ScriptContext2_Disable _08196446: movs r0, 0x1 diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s index 7f2dbcc73f..c42d966404 100644 --- a/asm/battle_frontier_2.s +++ b/asm/battle_frontier_2.s @@ -12444,7 +12444,7 @@ _081A0C8E: sub_81A0C9C: @ 81A0C9C push {lr} bl ScriptContext2_Enable - bl FreezeMapObjects + bl FreezeEventObjects bl sub_808B864 bl sub_808BCF4 movs r0, 0 @@ -27213,16 +27213,16 @@ _081A896E: movs r0, 0xFF movs r1, 0 movs r2, 0 - bl GetFieldObjectIdByLocalIdAndMap + bl GetEventObjectIdByLocalIdAndMap adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r0, r1 - bl FieldObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearAnimIfSpecialAnimFinished bl sub_80D338C pop {r4} pop {r0} @@ -27355,7 +27355,7 @@ _081A8A74: ldr r2, [r6] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] - bl GetFieldObjectIdByLocalIdAndMap + bl GetEventObjectIdByLocalIdAndMap lsls r0, 24 lsrs r0, 24 cmp r0, 0x10 @@ -27511,14 +27511,14 @@ _081A8BB4: ldr r2, [r1] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] - bl GetFieldObjectIdByLocalIdAndMap + bl GetEventObjectIdByLocalIdAndMap lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x10 bne _081A8BDC b _081A8D32 _081A8BDC: - ldr r0, =gMapObjects + ldr r0, =gEventObjects lsls r1, r2, 3 adds r1, r2 lsls r1, 2 @@ -28521,8 +28521,8 @@ sub_81A9424: @ 81A9424 lsls r1, 4 adds r1, r0 mov r8, r1 - ldr r2, =gMapObjects - ldr r0, =gSelectedMapObject + ldr r2, =gEventObjects + ldr r0, =gSelectedEventObject ldrb r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -28569,8 +28569,8 @@ _081A9488: mov r9, r0 _081A94AE: ldr r3, =gUnknown_08613ED8 - ldr r2, =gMapObjects - ldr r0, =gSelectedMapObject + ldr r2, =gEventObjects + ldr r0, =gSelectedEventObject ldrb r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -29181,7 +29181,7 @@ sub_81A9998: @ 81A9998 mov r8, r0 ldr r1, =0x0000028e mov r12, r1 - ldr r0, =gMapObjects + ldr r0, =gEventObjects mov r9, r0 _081A99CC: movs r2, 0 @@ -29194,7 +29194,7 @@ _081A99CE: cmp r0, r12 bne _081A9A8A adds r2, 0x7 - ldr r0, =gSelectedMapObject + ldr r0, =gSelectedEventObject ldrb r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -29322,7 +29322,7 @@ GetBattlePyramidTrainerFlag: @ 81A9AC4 ldr r1, =0x00000e2a adds r2, r1 ldr r4, =gBitTable - ldr r3, =gMapObjects + ldr r3, =gEventObjects lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -29354,8 +29354,8 @@ sub_81A9B04: @ 81A9B04 cmp r0, 0 beq _081A9B2E movs r0, 0x1 - bl GetChosenApproachingTrainerMapObjectId - ldr r1, =gSelectedMapObject + bl GetChosenApproachingTrainerEventObjectId + ldr r1, =gSelectedEventObject strb r0, [r1] ldr r0, =gTrainerBattleOpponent_B ldrh r0, [r0] @@ -29376,9 +29376,9 @@ sub_81A9B44: @ 81A9B44 lsls r0, 16 lsrs r5, r0, 16 movs r3, 0 - ldr r0, =gMapObjects + ldr r0, =gEventObjects mov r12, r0 - ldr r6, =gSelectedMapObject + ldr r6, =gSelectedEventObject ldr r1, =gSaveBlock1Ptr mov r10, r1 ldr r7, =gSaveBlock2Ptr diff --git a/asm/cable_car.s b/asm/cable_car.s index bfb96cb9b8..59245a1b20 100644 --- a/asm/cable_car.s +++ b/asm/cable_car.s @@ -1956,7 +1956,7 @@ _08150D86: str r2, [sp] movs r2, 0xC8 movs r3, 0x49 - bl AddPseudoFieldObject + bl AddPseudoEventObject lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 @@ -2062,7 +2062,7 @@ _08150E68: str r2, [sp] movs r2, 0x80 movs r3, 0x27 - bl AddPseudoFieldObject + bl AddPseudoEventObject lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 @@ -2195,7 +2195,7 @@ _08150F3E: ldrsh r3, [r3, r4] movs r4, 0x6A str r4, [sp] - bl AddPseudoFieldObject + bl AddPseudoEventObject lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 7f2a7ca88c..eb423cf4cf 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -8988,7 +8988,7 @@ _0811E852: adds r1, r5, 0 movs r2, 0x4C movs r3, 0x28 - bl AddPseudoFieldObject + bl AddPseudoEventObject lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 @@ -9019,7 +9019,7 @@ _0811E8A0: adds r1, r5, 0 movs r2, 0x34 movs r3, 0x28 - bl AddPseudoFieldObject + bl AddPseudoEventObject lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 7e25c45daf..ff10928cb7 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -187,7 +187,7 @@ sub_809C014: @ 809C014 ldr r0, =gSpecialVar_LastTalked movs r1, 0 strh r1, [r0] - ldr r0, =gSelectedMapObject + ldr r0, =gSelectedEventObject strb r1, [r0] bl player_get_direction_lower_nybble lsls r0, 24 @@ -479,13 +479,13 @@ TryGetScriptOnPressingA: @ 809C270 adds r7, r4, 0 adds r1, r5, 0 adds r2, r4, 0 - bl TryGetMapObjectScript + bl TryGetEventObjectScript cmp r0, 0 bne _0809C2BC adds r0, r6, 0 adds r1, r5, 0 adds r2, r4, 0 - bl TryGetInvisibleMapObjectScript + bl TryGetInvisibleEventObjectScript cmp r0, 0 bne _0809C2BC adds r0, r6, 0 @@ -547,12 +547,12 @@ _0809C2F0: lsrs r1, 16 _0809C30E: ldrb r2, [r4, 0x4] - bl GetFieldObjectIdByXYZ + bl GetEventObjectIdByXYZ lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x10 beq _0809C32E - ldr r1, =gMapObjects + ldr r1, =gEventObjects lsls r2, r3, 3 adds r0, r2, r3 lsls r0, 2 @@ -567,7 +567,7 @@ _0809C32E: .pool _0809C33C: movs r4, 0 - ldr r1, =gLinkPlayerMapObjects + ldr r1, =gLinkPlayerEventObjects _0809C340: ldrb r0, [r1] cmp r0, 0x1 @@ -580,7 +580,7 @@ _0809C34C: adds r4, 0x1 cmp r4, 0x3 ble _0809C340 - ldr r0, =gSelectedMapObject + ldr r0, =gSelectedEventObject strb r3, [r0] ldr r1, =gSpecialVar_LastTalked adds r0, r2, r3 @@ -591,7 +591,7 @@ _0809C34C: ldr r0, =gSpecialVar_Facing strh r6, [r0] adds r0, r3, 0 - bl GetFieldObjectScriptPointerByFieldObjectId + bl GetEventObjectScriptPointerByEventObjectId _0809C36E: pop {r4-r6} pop {r1} @@ -599,8 +599,8 @@ _0809C36E: .pool thumb_func_end sub_809C2C8 - thumb_func_start TryGetMapObjectScript -TryGetMapObjectScript: @ 809C384 + thumb_func_start TryGetEventObjectScript +TryGetEventObjectScript: @ 809C384 push {r4-r7,lr} adds r5, r0, 0 lsls r1, 24 @@ -610,12 +610,12 @@ TryGetMapObjectScript: @ 809C384 ldrh r0, [r5] ldrh r1, [r5, 0x2] ldrb r2, [r5, 0x4] - bl GetFieldObjectIdByXYZ + bl GetEventObjectIdByXYZ lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x10 beq _0809C3B4 - ldr r1, =gMapObjects + ldr r1, =gEventObjects lsls r2, r4, 3 adds r0, r2, r4 lsls r0, 2 @@ -647,12 +647,12 @@ _0809C3B4: lsls r1, 16 lsrs r1, 16 ldrb r2, [r5, 0x4] - bl GetFieldObjectIdByXYZ + bl GetEventObjectIdByXYZ lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x10 beq _0809C400 - ldr r1, =gMapObjects + ldr r1, =gEventObjects lsls r2, r4, 3 adds r0, r2, r4 lsls r0, 2 @@ -666,7 +666,7 @@ _0809C400: b _0809C44E .pool _0809C40C: - ldr r0, =gSelectedMapObject + ldr r0, =gSelectedEventObject strb r4, [r0] ldr r1, =gSpecialVar_LastTalked adds r0, r2, r4 @@ -684,7 +684,7 @@ _0809C40C: .pool _0809C43C: adds r0, r4, 0 - bl GetFieldObjectScriptPointerByFieldObjectId + bl GetEventObjectScriptPointerByEventObjectId _0809C442: adds r1, r0, 0 ldr r0, =gSpecialVar_LastTalked @@ -696,11 +696,11 @@ _0809C44E: pop {r1} bx r1 .pool - thumb_func_end TryGetMapObjectScript + thumb_func_end TryGetEventObjectScript - thumb_func_start TryGetInvisibleMapObjectScript -@ signed int TryGetInvisibleMapObjectScript(int a1, int a2, u8 playerFacingDirection) -TryGetInvisibleMapObjectScript: @ 809C458 + thumb_func_start TryGetInvisibleEventObjectScript +@ signed int TryGetInvisibleEventObjectScript(int a1, int a2, u8 playerFacingDirection) +TryGetInvisibleEventObjectScript: @ 809C458 push {r4,r5,lr} lsls r2, 24 lsrs r5, r2, 24 @@ -715,7 +715,7 @@ TryGetInvisibleMapObjectScript: @ 809C458 lsrs r2, 16 ldrb r3, [r0, 0x4] adds r0, r4, 0 - bl FindInvisibleMapObjectByPosition + bl FindInvisibleEventObjectByPosition cmp r0, 0 beq _0809C4CC ldr r2, [r0, 0x8] @@ -799,7 +799,7 @@ _0809C532: pop {r4,r5} pop {r1} bx r1 - thumb_func_end TryGetInvisibleMapObjectScript + thumb_func_end TryGetInvisibleEventObjectScript thumb_func_start TryGetMetatileBehaviorScript TryGetMetatileBehaviorScript: @ 809C538 @@ -2261,9 +2261,9 @@ sub_809D0F4: @ 809D0F4 .pool thumb_func_end sub_809D0F4 - thumb_func_start FindInvisibleMapObjectByPosition -@ int FindInvisibleMapObjectByPosition(struct mapheader *mapHeader, u16 x, u16 y, u8 elevation) -FindInvisibleMapObjectByPosition: @ 809D11C + thumb_func_start FindInvisibleEventObjectByPosition +@ int FindInvisibleEventObjectByPosition(struct mapheader *mapHeader, u16 x, u16 y, u8 elevation) +FindInvisibleEventObjectByPosition: @ 809D11C push {r4-r7,lr} lsls r1, 16 lsrs r7, r1, 16 @@ -2308,7 +2308,7 @@ _0809D164: pop {r4-r7} pop {r1} bx r1 - thumb_func_end FindInvisibleMapObjectByPosition + thumb_func_end FindInvisibleEventObjectByPosition thumb_func_start dive_warp dive_warp: @ 809D16C @@ -2447,9 +2447,9 @@ _0809D276: bx r1 thumb_func_end sub_809D1E8 - thumb_func_start GetFieldObjectScriptPointerForComparison -@ u8 *GetFieldObjectScriptPointerForComparison() -GetFieldObjectScriptPointerForComparison: @ 809D280 + thumb_func_start GetEventObjectScriptPointerForComparison +@ u8 *GetEventObjectScriptPointerForComparison() +GetEventObjectScriptPointerForComparison: @ 809D280 push {r4,r5,lr} sub sp, 0x8 bl player_get_direction_upper_nybble @@ -2470,12 +2470,12 @@ GetFieldObjectScriptPointerForComparison: @ 809D280 lsrs r1, 24 mov r0, sp adds r2, r4, 0 - bl TryGetMapObjectScript + bl TryGetEventObjectScript add sp, 0x8 pop {r4,r5} pop {r1} bx r1 - thumb_func_end GetFieldObjectScriptPointerForComparison + thumb_func_end GetEventObjectScriptPointerForComparison thumb_func_start sub_809D2BC sub_809D2BC: @ 809D2BC diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s index 77f8213b36..08df3215c2 100644 --- a/asm/field_effect_helpers.s +++ b/asm/field_effect_helpers.s @@ -100,7 +100,7 @@ _08153F7A: sub_8153F98: @ 8153F98 push {lr} ldrb r0, [r0, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetEventObjectGraphicsInfo ldrh r0, [r0, 0xA] subs r0, 0x2 lsls r0, 16 @@ -123,7 +123,7 @@ npc_pal_op: @ 8153FAC movs r0, 0 strh r0, [r4, 0x32] ldrb r0, [r5, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetEventObjectGraphicsInfo ldrb r1, [r0, 0xC] movs r0, 0x80 ands r0, r1 @@ -172,7 +172,7 @@ npc_pal_op_B: @ 815401C lsls r1, 24 lsrs r4, r1, 24 ldrb r0, [r0, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetEventObjectGraphicsInfo adds r2, r0, 0 ldrh r1, [r2, 0x4] ldr r0, =0x000011ff @@ -217,7 +217,7 @@ npc_pal_op_A: @ 8154078 lsls r1, 24 lsrs r4, r1, 24 ldrb r0, [r0, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetEventObjectGraphicsInfo adds r2, r0, 0 ldrh r1, [r2, 0x4] ldr r0, =0x000011ff @@ -248,7 +248,7 @@ objc_reflection_maybe: @ 81540A8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r7, r0, r1 ldrb r1, [r7, 0x4] lsls r0, r1, 4 @@ -578,16 +578,16 @@ oei_shadow: @ 8154340 ldrb r0, [r5] ldrb r1, [r5, 0x4] ldrb r2, [r5, 0x8] - bl GetFieldObjectIdByLocalIdAndMap + bl GetEventObjectIdByLocalIdAndMap lsls r0, 24 lsrs r0, 24 - ldr r2, =gMapObjects + ldr r2, =gEventObjects lsls r1, r0, 3 adds r1, r0 lsls r1, 2 adds r1, r2 ldrb r0, [r1, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetEventObjectGraphicsInfo adds r4, r0, 0 ldr r2, =gFieldEffectObjectTemplatePointers ldr r1, =gUnknown_085CDC3E @@ -659,7 +659,7 @@ oamc_shadow: @ 81543E4 lsls r2, 24 lsrs r2, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetEventObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 beq _08154412 @@ -673,7 +673,7 @@ _08154412: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r4, r0, r1 ldrb r0, [r4, 0x4] lsls r1, r0, 4 @@ -877,7 +877,7 @@ _0815459C: adds r1, r4, 0 adds r2, r7, 0 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetEventObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _081545F0 @@ -909,7 +909,7 @@ _08154604: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r2, r0, r1 ldr r0, [r2, 0x10] ldr r1, [r5, 0x30] @@ -1216,7 +1216,7 @@ _0815484C: adds r1, r7, 0 adds r2, r6, 0 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetEventObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _081548A0 @@ -1248,7 +1248,7 @@ _081548B4: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r2, r0, r1 ldr r0, [r2, 0x10] ldr r1, [r5, 0x30] @@ -1340,13 +1340,13 @@ sub_815496C: @ 815496C ldrb r0, [r6] ldrb r1, [r6, 0x4] ldrb r2, [r6, 0x8] - bl GetFieldObjectIdByLocalIdAndMap + bl GetEventObjectIdByLocalIdAndMap lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, =gMapObjects + ldr r0, =gEventObjects adds r5, r1, r0 ldr r0, =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x78] @@ -1428,11 +1428,11 @@ sub_8154A10: @ 8154A10 lsls r2, 24 lsrs r2, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetEventObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _08154A4E - ldr r5, =gMapObjects + ldr r5, =gEventObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -1451,7 +1451,7 @@ _08154A4E: .pool _08154A5C: ldrb r0, [r1, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetEventObjectGraphicsInfo mov r8, r0 mov r0, sp ldrb r1, [r0] @@ -1781,13 +1781,13 @@ sub_8154CEC: @ 8154CEC ldrb r0, [r6] ldrb r1, [r6, 0x4] ldrb r2, [r6, 0x8] - bl GetFieldObjectIdByLocalIdAndMap + bl GetEventObjectIdByLocalIdAndMap lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, =gMapObjects + ldr r0, =gEventObjects adds r5, r1, r0 ldr r0, =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x34] @@ -1800,7 +1800,7 @@ sub_8154CEC: @ 8154CEC cmp r4, 0x40 beq _08154D76 ldrb r0, [r5, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetEventObjectGraphicsInfo lsls r3, r4, 4 adds r3, r4 lsls r3, 2 @@ -1870,7 +1870,7 @@ sub_8154D90: @ 8154D90 lsls r2, 24 lsrs r2, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetEventObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 beq _08154DCA @@ -1881,7 +1881,7 @@ _08154DC0: b _08154E0A _08154DCA: ldr r3, =gSprites - ldr r2, =gMapObjects + ldr r2, =gEventObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -2034,13 +2034,13 @@ sub_8154EFC: @ 8154EFC ldrb r0, [r7] ldrb r1, [r7, 0x4] ldrb r2, [r7, 0x8] - bl GetFieldObjectIdByLocalIdAndMap + bl GetEventObjectIdByLocalIdAndMap lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, =gMapObjects + ldr r0, =gEventObjects adds r6, r1, r0 ldr r0, =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x34] @@ -2053,7 +2053,7 @@ sub_8154EFC: @ 8154EFC cmp r5, 0x40 beq _08154F92 ldrb r0, [r6, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetEventObjectGraphicsInfo adds r4, r0, 0 lsls r0, r5, 4 adds r0, r5 @@ -2123,11 +2123,11 @@ sub_8154FB4: @ 8154FB4 lsls r2, 24 lsrs r2, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetEventObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _08154FEE - ldr r2, =gMapObjects + ldr r2, =gEventObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -2242,13 +2242,13 @@ sub_81550B4: @ 81550B4 ldrb r0, [r6] ldrb r1, [r6, 0x4] ldrb r2, [r6, 0x8] - bl GetFieldObjectIdByLocalIdAndMap + bl GetEventObjectIdByLocalIdAndMap lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, =gMapObjects + ldr r0, =gEventObjects adds r5, r1, r0 ldr r0, =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x7C] @@ -2328,11 +2328,11 @@ sub_8155158: @ 8155158 lsls r2, 24 lsrs r2, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetEventObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _08155192 - ldr r5, =gMapObjects + ldr r5, =gEventObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -2351,7 +2351,7 @@ _08155192: .pool _081551A0: ldrb r0, [r1, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetEventObjectGraphicsInfo mov r1, sp ldrb r2, [r1] lsls r1, r2, 3 @@ -2765,7 +2765,7 @@ sub_81554AC: @ 81554AC movs r2, 0x32 ldrsh r1, [r4, r2] bl CurrentMapDrawMetatileAt - ldr r2, =gMapObjects + ldr r2, =gEventObjects ldr r0, =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -2972,7 +2972,7 @@ sub_8155658: @ 8155658 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, =gMapObjects + ldr r0, =gEventObjects adds r4, r0 ldrb r0, [r4, 0x4] lsls r5, r0, 4 @@ -3319,13 +3319,13 @@ sub_8155900: @ 8155900 ldrb r0, [r7] ldrb r1, [r7, 0x4] ldrb r2, [r7, 0x8] - bl GetFieldObjectIdByLocalIdAndMap + bl GetEventObjectIdByLocalIdAndMap lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, =gMapObjects + ldr r0, =gEventObjects adds r6, r1, r0 ldr r0, =gFieldEffectObjectTemplatePointers ldr r0, [r0, 0x74] @@ -3338,7 +3338,7 @@ sub_8155900: @ 8155900 cmp r4, 0x40 beq _081559A4 ldrb r0, [r6, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetEventObjectGraphicsInfo adds r5, r0, 0 lsls r0, r4, 4 adds r0, r4 @@ -3415,11 +3415,11 @@ sub_81559BC: @ 81559BC lsls r2, 24 lsrs r2, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetEventObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _081559F6 - ldr r2, =gMapObjects + ldr r2, =gEventObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -3474,7 +3474,7 @@ _08155A46: strh r6, [r4, 0x20] strh r5, [r4, 0x22] ldr r3, =gSprites - ldr r2, =gMapObjects + ldr r2, =gEventObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -3694,7 +3694,7 @@ ShowDisguiseFieldEffect: @ 8155BD0 ldrb r1, [r5, 0x4] ldrb r2, [r5, 0x8] mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetEventObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 beq _08155C08 @@ -3783,7 +3783,7 @@ sub_8155C88: @ 8155C88 lsls r2, 24 lsrs r2, 24 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetEventObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 beq _08155CB8 @@ -3793,7 +3793,7 @@ sub_8155C88: @ 8155C88 adds r0, r5, 0 bl FieldEffectStop _08155CB8: - ldr r4, =gMapObjects + ldr r4, =gEventObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -3801,7 +3801,7 @@ _08155CB8: lsls r0, 2 adds r0, r4 ldrb r0, [r0, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetEventObjectGraphicsInfo mov r1, sp ldrb r2, [r1] lsls r1, r2, 3 @@ -4514,14 +4514,14 @@ _08156212: lsls r0, r7, 3 adds r0, r7 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r4, r0, r1 ldrb r0, [r4] lsls r0, 31 cmp r0, 0 beq _081562B4 ldrb r0, [r4, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetEventObjectGraphicsInfo ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index f5acc1e3e4..3751773371 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -5,9 +5,9 @@ .text - thumb_func_start FieldObjectCB_NoMovement2 -@ void FieldObjectCB_NoMovement2(struct obj *object) -FieldObjectCB_NoMovement2: @ 808A998 + thumb_func_start EventObjectCB_NoMovement2 +@ void EventObjectCB_NoMovement2(struct obj *object) +EventObjectCB_NoMovement2: @ 808A998 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -15,20 +15,20 @@ FieldObjectCB_NoMovement2: @ 808A998 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, =gMapObjects + ldr r2, =gEventObjects adds r0, r2 - ldr r2, =FieldObjectCB2_NoMovement2 - bl FieldObjectStep + ldr r2, =EventObjectCB2_NoMovement2 + bl EventObjectStep pop {r0} bx r0 .pool - thumb_func_end FieldObjectCB_NoMovement2 + thumb_func_end EventObjectCB_NoMovement2 - thumb_func_start FieldObjectCB2_NoMovement2 -FieldObjectCB2_NoMovement2: @ 808A9BC + thumb_func_start EventObjectCB2_NoMovement2 +EventObjectCB2_NoMovement2: @ 808A9BC movs r0, 0 bx lr - thumb_func_end FieldObjectCB2_NoMovement2 + thumb_func_end EventObjectCB2_NoMovement2 thumb_func_start player_step @ void player_step(int dpad_direction, int buttons_new, int buttons_held) @@ -48,7 +48,7 @@ player_step: @ 808A9C0 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r5, r0, r1 adds r0, r5, 0 bl sub_808C280 @@ -60,7 +60,7 @@ player_step: @ 808A9C0 bl Bike_TryAcroBikeHistoryUpdate adds r0, r5, 0 mov r1, r8 - bl TryInterruptFieldObjectSpecialAnim + bl TryInterruptEventObjectSpecialAnim lsls r0, 24 cmp r0, 0 bne _0808AA26 @@ -85,25 +85,25 @@ _0808AA26: .pool thumb_func_end player_step - thumb_func_start TryInterruptFieldObjectSpecialAnim -@ bool8 TryInterruptFieldObjectSpecialAnim(struct npc_state *fieldObject, u8 direction) -TryInterruptFieldObjectSpecialAnim: @ 808AA38 + thumb_func_start TryInterruptEventObjectSpecialAnim +@ bool8 TryInterruptEventObjectSpecialAnim(struct npc_state *eventObject, u8 direction) +TryInterruptEventObjectSpecialAnim: @ 808AA38 push {r4-r6,lr} adds r4, r0, 0 lsls r1, 24 lsrs r5, r1, 24 adds r6, r5, 0 - bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive + bl EventObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 cmp r0, 0 beq _0808AA92 adds r0, r4, 0 - bl FieldObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 bne _0808AA92 adds r0, r4, 0 - bl FieldObjectGetSpecialAnim + bl EventObjectGetSpecialAnim lsls r0, 24 movs r1, 0xE7 lsls r1, 24 @@ -123,7 +123,7 @@ _0808AA74: beq _0808AA84 _0808AA7C: adds r0, r4, 0 - bl FieldObjectClearAnim + bl EventObjectClearAnim b _0808AA92 _0808AA84: adds r0, r6, 0 @@ -138,10 +138,10 @@ _0808AA94: pop {r4-r6} pop {r1} bx r1 - thumb_func_end TryInterruptFieldObjectSpecialAnim + thumb_func_end TryInterruptEventObjectSpecialAnim thumb_func_start npc_clear_strange_bits -@ void npc_clear_strange_bits(struct npc_state *fieldObject) +@ void npc_clear_strange_bits(struct npc_state *eventObject) npc_clear_strange_bits: @ 808AA9C ldrb r2, [r0, 0x1] movs r1, 0x11 @@ -240,7 +240,7 @@ GetForcedMovementByMetatileBehavior: @ 808AB38 ands r0, r1 cmp r0, 0 bne _0808AB8A - ldr r2, =gMapObjects + ldr r2, =gEventObjects ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -290,7 +290,7 @@ ForcedMovement_None: @ 808AB94 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r0, r1 ldrb r2, [r0, 0x1] movs r1, 0x3 @@ -302,7 +302,7 @@ ForcedMovement_None: @ 808AB94 ldrb r1, [r0, 0x18] lsls r1, 28 lsrs r1, 28 - bl FieldObjectSetDirection + bl EventObjectSetDirection ldrb r1, [r4] movs r0, 0xBF ands r0, r1 @@ -386,7 +386,7 @@ DoForcedMovementInCurrentDirection: @ 808AC58 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, =gMapObjects + ldr r2, =gEventObjects adds r0, r2 ldrb r2, [r0, 0x1] movs r3, 0x4 @@ -528,7 +528,7 @@ ForcedMovement_Slide: @ 808AD60 lsls r2, r3, 3 adds r2, r3 lsls r2, 2 - ldr r3, =gMapObjects + ldr r3, =gEventObjects adds r2, r3 ldrb r3, [r2, 0x1] movs r4, 0x4 @@ -623,7 +623,7 @@ ForcedMovement_MuddySlope: @ 808AE10 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r4, r0, r1 ldrb r1, [r4, 0x18] movs r0, 0xF0 @@ -809,7 +809,7 @@ _0808AF68: lsls r0, 24 cmp r0, 0 beq _0808AFB0 - ldr r2, =gMapObjects + ldr r2, =gEventObjects ldrb r1, [r4, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -848,7 +848,7 @@ CheckForPlayerAvatarCollision: @ 808AFBC lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, =gMapObjects + ldr r0, =gEventObjects adds r4, r0 ldrh r1, [r4, 0x10] add r0, sp, 0x4 @@ -877,7 +877,7 @@ CheckForPlayerAvatarCollision: @ 808AFBC str r0, [sp] adds r0, r4, 0 adds r3, r6, 0 - bl CheckForFieldObjectCollision + bl CheckForEventObjectCollision lsls r0, 24 lsrs r0, 24 add sp, 0x8 @@ -899,7 +899,7 @@ sub_808B028: @ 808B028 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, =gMapObjects + ldr r0, =gEventObjects adds r4, r0 ldrh r1, [r4, 0x10] add r0, sp, 0x4 @@ -938,9 +938,9 @@ sub_808B028: @ 808B028 .pool thumb_func_end sub_808B028 - thumb_func_start CheckForFieldObjectCollision -@ u8 CheckForFieldObjectCollision(struct npc_state *fieldObject, u16 x, u16 y, u8 direction, u8 metatileBehavior) -CheckForFieldObjectCollision: @ 808B094 + thumb_func_start CheckForEventObjectCollision +@ u8 CheckForEventObjectCollision(struct npc_state *eventObject, u16 x, u16 y, u8 direction, u8 metatileBehavior) +CheckForEventObjectCollision: @ 808B094 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -1043,7 +1043,7 @@ _0808B152: pop {r4-r7} pop {r1} bx r1 - thumb_func_end CheckForFieldObjectCollision + thumb_func_end CheckForEventObjectCollision thumb_func_start sub_808B164 sub_808B164: @ 808B164 @@ -1120,7 +1120,7 @@ sub_808B1BC: @ 808B1BC lsrs r0, r5, 16 lsrs r1, r4, 16 movs r2, 0x3 - bl GetFieldObjectIdByXYZ + bl GetEventObjectIdByXYZ lsls r0, 24 lsrs r0, 24 cmp r0, 0x10 @@ -1182,12 +1182,12 @@ sub_808B238: @ 808B238 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r5, r2] - bl GetFieldObjectIdByXY + bl GetEventObjectIdByXY lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x10 beq _0808B2D8 - ldr r0, =gMapObjects + ldr r0, =gEventObjects lsls r1, r6, 3 adds r1, r6 lsls r1, 2 @@ -1290,7 +1290,7 @@ IsPlayerCollidingWithFarawayIslandMew: @ 808B324 lsls r1, r2, 3 adds r1, r2 lsls r1, 2 - ldr r5, =gMapObjects + ldr r5, =gEventObjects adds r3, r1, r5 ldrh r2, [r3, 0x10] mov r1, sp @@ -1305,7 +1305,7 @@ IsPlayerCollidingWithFarawayIslandMew: @ 808B324 movs r0, 0x1 movs r1, 0x39 movs r2, 0x1A - bl GetFieldObjectIdByLocalIdAndMap + bl GetEventObjectIdByLocalIdAndMap lsls r0, 24 lsrs r1, r0, 24 adds r6, r4, 0 @@ -1401,7 +1401,7 @@ _0808B3F4: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r0, r1 ldr r1, [r2] bl _call_via_r1 @@ -1423,13 +1423,13 @@ _0808B428: thumb_func_end DoPlayerAvatarTransition thumb_func_start PlayerAvatarTransition_Dummy -@ void PlayerAvatarTransition_Dummy(struct npc_state *fieldObject) +@ void PlayerAvatarTransition_Dummy(struct npc_state *eventObject) PlayerAvatarTransition_Dummy: @ 808B43C bx lr thumb_func_end PlayerAvatarTransition_Dummy thumb_func_start PlayerAvatarTransition_Normal -@ void PlayerAvatarTransition_Normal(struct npc_state *fieldObject) +@ void PlayerAvatarTransition_Normal(struct npc_state *eventObject) PlayerAvatarTransition_Normal: @ 808B440 push {r4,lr} adds r4, r0, 0 @@ -1439,11 +1439,11 @@ PlayerAvatarTransition_Normal: @ 808B440 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetGraphicsId + bl EventObjectSetGraphicsId ldrb r1, [r4, 0x18] lsrs r1, 4 adds r0, r4, 0 - bl FieldObjectTurn + bl EventObjectTurn movs r0, 0x1 bl SetPlayerAvatarStateMask pop {r4} @@ -1452,7 +1452,7 @@ PlayerAvatarTransition_Normal: @ 808B440 thumb_func_end PlayerAvatarTransition_Normal thumb_func_start PlayerAvatarTransition_MachBike -@ void PlayerAvatarTransition_MachBike(struct npc_state *fieldObject) +@ void PlayerAvatarTransition_MachBike(struct npc_state *eventObject) PlayerAvatarTransition_MachBike: @ 808B46C push {r4,lr} adds r4, r0, 0 @@ -1462,11 +1462,11 @@ PlayerAvatarTransition_MachBike: @ 808B46C lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetGraphicsId + bl EventObjectSetGraphicsId ldrb r1, [r4, 0x18] lsrs r1, 4 adds r0, r4, 0 - bl FieldObjectTurn + bl EventObjectTurn movs r0, 0x2 bl SetPlayerAvatarStateMask movs r0, 0 @@ -1478,7 +1478,7 @@ PlayerAvatarTransition_MachBike: @ 808B46C thumb_func_end PlayerAvatarTransition_MachBike thumb_func_start PlayerAvatarTransition_AcroBike -@ void PlayerAvatarTransition_AcroBike(struct npc_state *fieldObject) +@ void PlayerAvatarTransition_AcroBike(struct npc_state *eventObject) PlayerAvatarTransition_AcroBike: @ 808B4A0 push {r4,lr} adds r4, r0, 0 @@ -1488,11 +1488,11 @@ PlayerAvatarTransition_AcroBike: @ 808B4A0 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetGraphicsId + bl EventObjectSetGraphicsId ldrb r1, [r4, 0x18] lsrs r1, 4 adds r0, r4, 0 - bl FieldObjectTurn + bl EventObjectTurn movs r0, 0x4 bl SetPlayerAvatarStateMask movs r0, 0 @@ -1505,7 +1505,7 @@ PlayerAvatarTransition_AcroBike: @ 808B4A0 thumb_func_end PlayerAvatarTransition_AcroBike thumb_func_start PlayerAvatarTransition_Surfing -@ void PlayerAvatarTransition_Surfing(struct npc_state *fieldObject) +@ void PlayerAvatarTransition_Surfing(struct npc_state *eventObject) PlayerAvatarTransition_Surfing: @ 808B4D8 push {r4,lr} adds r4, r0, 0 @@ -1515,11 +1515,11 @@ PlayerAvatarTransition_Surfing: @ 808B4D8 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetGraphicsId + bl EventObjectSetGraphicsId ldrb r1, [r4, 0x18] lsrs r1, 4 adds r0, r4, 0 - bl FieldObjectTurn + bl EventObjectTurn movs r0, 0x8 bl SetPlayerAvatarStateMask ldr r1, =gFieldEffectArguments @@ -1546,7 +1546,7 @@ PlayerAvatarTransition_Surfing: @ 808B4D8 thumb_func_end PlayerAvatarTransition_Surfing thumb_func_start PlayerAvatarTransition_Underwater -@ void PlayerAvatarTransition_Underwater(struct npc_state *fieldObject) +@ void PlayerAvatarTransition_Underwater(struct npc_state *eventObject) PlayerAvatarTransition_Underwater: @ 808B534 push {r4,lr} adds r4, r0, 0 @@ -1556,11 +1556,11 @@ PlayerAvatarTransition_Underwater: @ 808B534 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetGraphicsId + bl EventObjectSetGraphicsId ldrb r1, [r4, 0x18] lsrs r1, 4 adds r0, r4, 0 - bl FieldObjectTurn + bl EventObjectTurn movs r0, 0x10 bl SetPlayerAvatarStateMask ldrb r0, [r4, 0x4] @@ -1572,7 +1572,7 @@ PlayerAvatarTransition_Underwater: @ 808B534 thumb_func_end PlayerAvatarTransition_Underwater thumb_func_start PlayerAvatarTransition_ReturnToField -@ void PlayerAvatarTransition_ReturnToField(struct npc_state *fieldObject) +@ void PlayerAvatarTransition_ReturnToField(struct npc_state *eventObject) PlayerAvatarTransition_ReturnToField: @ 808B568 ldr r2, =gPlayerAvatar ldrb r1, [r2] @@ -1621,7 +1621,7 @@ _0808B5B6: thumb_func_start player_is_anim_in_certain_ranges player_is_anim_in_certain_ranges: @ 808B5BC push {lr} - ldr r2, =gMapObjects + ldr r2, =gEventObjects ldr r0, =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -1696,9 +1696,9 @@ PlayerIsAnimActive: @ 808B63C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r0, r1 - bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive + bl EventObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 lsrs r0, 24 pop {r1} @@ -1715,9 +1715,9 @@ PlayerCheckIfAnimFinishedOrInactive: @ 808B660 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r0, r1 - bl FieldObjectCheckIfSpecialAnimFinishedOrInactive + bl EventObjectCheckIfSpecialAnimFinishedOrInactive lsls r0, 24 lsrs r0, 24 pop {r1} @@ -1727,7 +1727,7 @@ PlayerCheckIfAnimFinishedOrInactive: @ 808B660 thumb_func_start player_set_x22 player_set_x22: @ 808B684 - ldr r3, =gMapObjects + ldr r3, =gEventObjects ldr r1, =gPlayerAvatar ldrb r2, [r1, 0x5] lsls r1, r2, 3 @@ -1742,7 +1742,7 @@ player_set_x22: @ 808B684 thumb_func_start player_get_x22 player_get_x22: @ 808B6A0 - ldr r2, =gMapObjects + ldr r2, =gEventObjects ldr r0, =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -1766,9 +1766,9 @@ sub_808B6BC: @ 808B6BC lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, =gMapObjects + ldr r2, =gEventObjects adds r0, r2 - bl FieldObjectForceSetSpecialAnim + bl EventObjectForceSetSpecialAnim pop {r0} bx r0 .pool @@ -1793,10 +1793,10 @@ PlayerSetAnimId: @ 808B6E4 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r0, r1 adds r1, r5, 0 - bl FieldObjectSetSpecialAnim + bl EventObjectSetSpecialAnim _0808B712: pop {r4,r5} pop {r0} @@ -2013,7 +2013,7 @@ _0808B872: lsls r0, 24 cmp r0, 0 beq _0808B89A - ldr r2, =gMapObjects + ldr r2, =gEventObjects ldrb r1, [r4, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2219,7 +2219,7 @@ PlayCollisionSoundIfNotFacingWarp: @ 808B9EC sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r2, =gMapObjects + ldr r2, =gEventObjects ldr r0, =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -2275,7 +2275,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 808BA68 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - ldr r3, =gMapObjects + ldr r3, =gEventObjects ldr r2, =gPlayerAvatar ldrb r1, [r2, 0x5] lsls r0, r1, 3 @@ -2307,7 +2307,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 808BA68 @ void PlayerGetDestCoords(u16 *x, u16 *y) PlayerGetDestCoords: @ 808BAAC push {r4,r5,lr} - ldr r5, =gMapObjects + ldr r5, =gEventObjects ldr r4, =gPlayerAvatar ldrb r3, [r4, 0x5] lsls r2, r3, 3 @@ -2339,7 +2339,7 @@ plaer_get_pos_including_state_based_drift: @ 808BADC lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r3, r0, r1 ldrb r1, [r3] movs r0, 0xC0 @@ -2465,7 +2465,7 @@ _0808BC30: thumb_func_start player_get_direction_lower_nybble @ u8 player_get_direction_lower_nybble() player_get_direction_lower_nybble: @ 808BC38 - ldr r2, =gMapObjects + ldr r2, =gEventObjects ldr r0, =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -2482,7 +2482,7 @@ player_get_direction_lower_nybble: @ 808BC38 thumb_func_start player_get_direction_upper_nybble @ u8 player_get_direction_upper_nybble() player_get_direction_upper_nybble: @ 808BC58 - ldr r2, =gMapObjects + ldr r2, =gEventObjects ldr r0, =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -2498,7 +2498,7 @@ player_get_direction_upper_nybble: @ 808BC58 thumb_func_start PlayerGetZCoord @ u8 PlayerGetZCoord() PlayerGetZCoord: @ 808BC74 - ldr r2, =gMapObjects + ldr r2, =gEventObjects ldr r0, =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -2521,7 +2521,7 @@ sub_808BC90: @ 808BC90 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r0, r1 lsls r3, 16 asrs r3, 16 @@ -2578,7 +2578,7 @@ sub_808BCF4: @ 808BCF4 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, =gMapObjects + ldr r0, =gEventObjects adds r4, r0 adds r0, r4, 0 bl npc_clear_strange_bits @@ -2586,7 +2586,7 @@ sub_808BCF4: @ 808BCF4 lsls r1, 28 lsrs r1, 28 adds r0, r4, 0 - bl FieldObjectSetDirection + bl EventObjectSetDirection movs r0, 0x6 bl TestPlayerAvatarFlags lsls r0, 24 @@ -2809,7 +2809,7 @@ IsPlayerFacingSurfableFishableWater: @ 808BE74 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, =gMapObjects + ldr r0, =gEventObjects adds r4, r0 ldrh r1, [r4, 0x10] mov r0, sp @@ -3053,14 +3053,14 @@ InitPlayerAvatar: @ 808BFE0 strh r3, [r0, 0xE] str r3, [sp, 0x10] strh r3, [r0, 0x14] - bl SpawnSpecialFieldObject + bl SpawnSpecialEventObject adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 lsls r4, r5, 3 adds r4, r5 lsls r4, 2 - ldr r0, =gMapObjects + ldr r0, =gEventObjects adds r4, r0 ldrb r0, [r4, 0x2] movs r1, 0x1 @@ -3070,7 +3070,7 @@ InitPlayerAvatar: @ 808BFE0 strb r0, [r4, 0x1B] adds r0, r4, 0 mov r1, r9 - bl FieldObjectTurn + bl EventObjectTurn bl ClearPlayerAvatarInfo ldr r0, =gPlayerAvatar strb r6, [r0, 0x2] @@ -3097,7 +3097,7 @@ sub_808C0A8: @ 808C0A8 push {r4-r6,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r6, =gMapObjects + ldr r6, =gEventObjects ldr r5, =gPlayerAvatar ldrb r0, [r5, 0x5] lsls r1, r0, 3 @@ -3152,7 +3152,7 @@ sub_808C114: @ 808C114 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, =gMapObjects + ldr r0, =gEventObjects adds r4, r0 movs r0, 0x5 bl GetPlayerAvatarGraphicsIdByStateId @@ -3160,7 +3160,7 @@ sub_808C114: @ 808C114 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetGraphicsId + bl EventObjectSetGraphicsId ldrb r1, [r5, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -3186,7 +3186,7 @@ sub_808C15C: @ 808C15C lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, =gMapObjects + ldr r0, =gEventObjects adds r4, r0 movs r0, 0x6 bl GetPlayerAvatarGraphicsIdByStateId @@ -3194,7 +3194,7 @@ sub_808C15C: @ 808C15C lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetGraphicsId + bl EventObjectSetGraphicsId ldrb r0, [r6, 0x4] lsls r4, r0, 4 adds r4, r0 @@ -3227,7 +3227,7 @@ sub_808C1B4: @ 808C1B4 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, =gMapObjects + ldr r0, =gEventObjects adds r4, r0 movs r0, 0x2 bl GetPlayerAvatarGraphicsIdByStateId @@ -3235,7 +3235,7 @@ sub_808C1B4: @ 808C1B4 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetGraphicsId + bl EventObjectSetGraphicsId ldrb r0, [r6, 0x4] lsls r4, r0, 4 adds r4, r0 @@ -3276,7 +3276,7 @@ sub_808C228: @ 808C228 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, =gMapObjects + ldr r0, =gEventObjects adds r4, r0 movs r0, 0x7 bl GetPlayerAvatarGraphicsIdByStateId @@ -3284,7 +3284,7 @@ sub_808C228: @ 808C228 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetGraphicsId + bl EventObjectSetGraphicsId ldrb r0, [r6, 0x4] lsls r4, r0, 4 adds r4, r0 @@ -3292,7 +3292,7 @@ sub_808C228: @ 808C228 ldr r0, =gSprites adds r4, r0 adds r0, r5, 0 - bl FieldObjectDirectionToImageAnimId + bl EventObjectDirectionToImageAnimId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -3414,7 +3414,7 @@ taskFF_bump_boulder: @ 808C34C lsrs r0, 24 ldr r6, =gUnknown_08497530 ldr r2, =gTasks - ldr r5, =gMapObjects + ldr r5, =gEventObjects lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3474,49 +3474,49 @@ do_boulder_dust: @ 808C3C4 adds r5, r1, 0 adds r4, r2, 0 adds r0, r5, 0 - bl FieldObjectIsSpecialAnimActive + bl EventObjectIsSpecialAnimActive lsls r0, 24 cmp r0, 0 beq _0808C3DE adds r0, r5, 0 - bl FieldObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearAnimIfSpecialAnimFinished _0808C3DE: adds r0, r4, 0 - bl FieldObjectIsSpecialAnimActive + bl EventObjectIsSpecialAnimActive lsls r0, 24 cmp r0, 0 beq _0808C3F0 adds r0, r4, 0 - bl FieldObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearAnimIfSpecialAnimFinished _0808C3F0: adds r0, r5, 0 - bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive + bl EventObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 cmp r0, 0 bne _0808C472 adds r0, r4, 0 - bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive + bl EventObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 cmp r0, 0 bne _0808C472 adds r0, r5, 0 - bl FieldObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearAnimIfSpecialAnimFinished adds r0, r4, 0 - bl FieldObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearAnimIfSpecialAnimFinished ldrb r0, [r6, 0xC] bl GetStepInPlaceDelay16AnimId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl FieldObjectSetSpecialAnim + bl EventObjectSetSpecialAnim ldrb r0, [r6, 0xC] bl GetSimpleGoAnimId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetSpecialAnim + bl EventObjectSetSpecialAnim ldr r2, =gFieldEffectArguments movs r1, 0x10 ldrsh r0, [r4, r1] @@ -3558,19 +3558,19 @@ sub_808C484: @ 808C484 adds r4, r1, 0 adds r5, r2, 0 adds r0, r4, 0 - bl FieldObjectCheckIfSpecialAnimFinishedOrInactive + bl EventObjectCheckIfSpecialAnimFinishedOrInactive lsls r0, 24 cmp r0, 0 beq _0808C4C6 adds r0, r5, 0 - bl FieldObjectCheckIfSpecialAnimFinishedOrInactive + bl EventObjectCheckIfSpecialAnimFinishedOrInactive lsls r0, 24 cmp r0, 0 beq _0808C4C6 adds r0, r4, 0 - bl FieldObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearAnimIfSpecialAnimFinished adds r0, r5, 0 - bl FieldObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearAnimIfSpecialAnimFinished ldr r1, =gPlayerAvatar movs r0, 0 strb r0, [r1, 0x6] @@ -3625,7 +3625,7 @@ _0808C50A: lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, =gMapObjects + ldr r0, =gEventObjects adds r1, r0 ldr r2, [r2] adds r0, r4, 0 @@ -3648,7 +3648,7 @@ sub_808C544: @ 808C544 movs r0, 0x1 strb r0, [r5, 0x6] adds r0, r4, 0 - bl FieldObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 beq _0808C5A0 @@ -3662,7 +3662,7 @@ sub_808C544: @ 808C544 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetSpecialAnim + bl EventObjectSetSpecialAnim ldrh r0, [r6, 0xA] adds r0, 0x1 strh r0, [r6, 0xA] @@ -3726,7 +3726,7 @@ _0808C5E2: lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, =gMapObjects + ldr r0, =gEventObjects adds r1, r0 ldr r2, [r2] adds r0, r4, 0 @@ -3772,7 +3772,7 @@ sub_808C644: @ 808C644 movs r2, 0x4 bl memcpy adds r0, r5, 0 - bl FieldObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 beq _0808C6AC @@ -3787,7 +3787,7 @@ sub_808C644: @ 808C644 lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl FieldObjectSetSpecialAnim + bl EventObjectSetSpecialAnim ldrb r0, [r4, 0xA] cmp r6, r0 bne _0808C68A @@ -3831,7 +3831,7 @@ sub_808C6BC: @ 808C6BC movs r2, 0x5 bl memcpy adds r0, r4, 0 - bl FieldObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 beq _0808C6EC @@ -3840,7 +3840,7 @@ sub_808C6BC: @ 808C6BC add r0, sp ldrb r1, [r0] adds r0, r4, 0 - bl FieldObjectSetSpecialAnim + bl EventObjectSetSpecialAnim movs r0, 0x1 strh r0, [r5, 0x8] _0808C6EC: @@ -3858,7 +3858,7 @@ sub_808C6FC: @ 808C6FC adds r4, r0, 0 adds r5, r1, 0 adds r0, r5, 0 - bl FieldObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 beq _0808C740 @@ -3871,7 +3871,7 @@ sub_808C6FC: @ 808C6FC lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl FieldObjectSetSpecialAnim + bl EventObjectSetSpecialAnim bl ScriptContext2_Disable ldr r1, =gPlayerAvatar movs r0, 0 @@ -3936,15 +3936,15 @@ taskFF_0805D1D4: @ 808C7A8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r5, r0, r1 adds r0, r5, 0 - bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive + bl EventObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 cmp r0, 0 beq _0808C7D4 adds r0, r5, 0 - bl FieldObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 beq _0808C7FC @@ -3963,7 +3963,7 @@ _0808C7D4: lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl FieldObjectSetSpecialAnim + bl EventObjectSetSpecialAnim ldr r0, =sub_808C814 str r0, [r4] _0808C7FC: @@ -3983,10 +3983,10 @@ sub_808C814: @ 808C814 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r4, r0, r1 adds r0, r4, 0 - bl FieldObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 beq _0808C87A @@ -3996,7 +3996,7 @@ sub_808C814: @ 808C814 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetGraphicsId + bl EventObjectSetGraphicsId ldrb r0, [r4, 0x18] lsls r0, 28 lsrs r0, 28 @@ -4005,7 +4005,7 @@ sub_808C814: @ 808C814 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetSpecialAnim + bl EventObjectSetSpecialAnim movs r0, 0 strb r0, [r6, 0x6] bl ScriptContext2_Disable @@ -4127,7 +4127,7 @@ fish1: @ 808C918 ldrh r1, [r6] adds r1, r0 strh r1, [r5, 0x22] - ldr r3, =gMapObjects + ldr r3, =gEventObjects ldr r2, =gPlayerAvatar ldrb r1, [r2, 0x5] lsls r0, r1, 3 @@ -4142,7 +4142,7 @@ fish1: @ 808C918 lsls r4, 2 adds r4, r3 adds r0, r4, 0 - bl FieldObjectClearAnimIfSpecialAnimActive + bl EventObjectClearAnimIfSpecialAnimActive ldrb r0, [r4, 0x1] movs r1, 0x8 orrs r0, r1 @@ -4579,18 +4579,18 @@ _0808CCBC: lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, =gMapObjects + ldr r0, =gEventObjects mov r8, r0 add r4, r8 ldrh r1, [r5, 0x24] lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetGraphicsId + bl EventObjectSetGraphicsId ldrb r1, [r4, 0x18] lsrs r1, 4 adds r0, r4, 0 - bl FieldObjectTurn + bl EventObjectTurn ldrb r1, [r7] movs r0, 0x8 ands r0, r1 @@ -4792,18 +4792,18 @@ fishE: @ 808CE8C lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, =gMapObjects + ldr r0, =gEventObjects mov r8, r0 add r4, r8 ldrh r1, [r6, 0x24] lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetGraphicsId + bl EventObjectSetGraphicsId ldrb r1, [r4, 0x18] lsrs r1, 4 adds r0, r4, 0 - bl FieldObjectTurn + bl EventObjectTurn ldrb r1, [r5] movs r0, 0x8 ands r0, r1 @@ -4858,7 +4858,7 @@ fishF: @ 808CF2C ldr r0, =gPlayerAvatar strb r1, [r0, 0x6] bl ScriptContext2_Disable - bl UnfreezeMapObjects + bl UnfreezeEventObjects movs r0, 0 movs r1, 0x1 bl sub_8197434 @@ -4984,7 +4984,7 @@ _0808D03A: ands r0, r1 cmp r0, 0 beq _0808D05E - ldr r2, =gMapObjects + ldr r2, =gEventObjects ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -5037,7 +5037,7 @@ sub_808D094: @ 808D094 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r4, r0, r1 ldrb r1, [r4, 0x4] lsls r0, r1, 4 @@ -5066,7 +5066,7 @@ _0808D0E8: b _0808D18A _0808D0EE: adds r0, r4, 0 - bl FieldObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 beq _0808D18A @@ -5217,7 +5217,7 @@ sub_808D1FC: @ 808D1FC lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r4, r0, r1 ldrb r1, [r4, 0x4] lsls r0, r1, 4 @@ -5262,7 +5262,7 @@ _0808D25E: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectForceSetSpecialAnim + bl EventObjectForceSetSpecialAnim movs r0, 0 mov r9, r0 strh r6, [r5, 0x2] @@ -5414,7 +5414,7 @@ sub_808D38C: @ 808D38C ble _0808D3E4 _0808D3A8: adds r0, r5, 0 - bl FieldObjectCheckIfSpecialAnimFinishedOrInactive + bl EventObjectCheckIfSpecialAnimFinishedOrInactive lsls r0, 24 cmp r0, 0 beq _0808D3E4 @@ -5429,7 +5429,7 @@ _0808D3A8: lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl FieldObjectForceSetSpecialAnim + bl EventObjectForceSetSpecialAnim movs r0, 0 strh r0, [r6] ldrb r0, [r5, 0x18] diff --git a/asm/field_screen.s b/asm/field_screen.s index e35c768dd4..5d5602b7f7 100644 --- a/asm/field_screen.s +++ b/asm/field_screen.s @@ -8382,7 +8382,7 @@ _080AF46C: _080AF480: movs r0, 0 bl sub_80AF0F4 - bl FreezeMapObjects + bl FreezeEventObjects adds r0, r6, 0 adds r1, r7, 0 bl PlayerGetDestCoords @@ -8403,17 +8403,17 @@ _080AF4A4: movs r0, 0xFF movs r1, 0 movs r2, 0 - bl GetFieldObjectIdByLocalIdAndMap + bl GetEventObjectIdByLocalIdAndMap adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r0, r1 movs r1, 0x8 - bl FieldObjectSetSpecialAnim + bl EventObjectSetSpecialAnim movs r0, 0x2 strh r0, [r5, 0x8] b _080AF54A @@ -8434,16 +8434,16 @@ _080AF4DC: movs r0, 0xFF movs r1, 0 movs r2, 0 - bl GetFieldObjectIdByLocalIdAndMap + bl GetEventObjectIdByLocalIdAndMap adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r0, r1 - bl FieldObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearAnimIfSpecialAnimFinished movs r0, 0x3 strh r0, [r5, 0x8] b _080AF54A @@ -8461,7 +8461,7 @@ _080AF520: cmp r0, 0x1 beq _080AF54A _080AF536: - bl UnfreezeMapObjects + bl UnfreezeEventObjects movs r0, 0x4 strh r0, [r5, 0x8] b _080AF54A @@ -8508,7 +8508,7 @@ _080AF580: _080AF58A: movs r0, 0 bl sub_80AF0F4 - bl FreezeMapObjects + bl FreezeEventObjects adds r0, r6, 0 adds r1, r7, 0 bl PlayerGetDestCoords @@ -8524,13 +8524,13 @@ _080AF5A2: movs r0, 0xFF movs r1, 0 movs r2, 0 - bl GetFieldObjectIdByLocalIdAndMap + bl GetEventObjectIdByLocalIdAndMap lsls r0, 24 lsrs r0, 24 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, =gMapObjects + ldr r0, =gEventObjects adds r4, r0 bl player_get_direction_lower_nybble lsls r0, 24 @@ -8540,7 +8540,7 @@ _080AF5A2: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetSpecialAnim + bl EventObjectSetSpecialAnim movs r0, 0x2 strh r0, [r5, 0x8] b _080AF60A @@ -8550,7 +8550,7 @@ _080AF5EC: lsls r0, 24 cmp r0, 0 beq _080AF60A - bl UnfreezeMapObjects + bl UnfreezeEventObjects movs r0, 0x3 strh r0, [r5, 0x8] b _080AF60A @@ -8583,7 +8583,7 @@ task_map_chg_seq_0807E2CC: @ 80AF610 b _080AF65A .pool _080AF634: - bl FreezeMapObjects + bl FreezeEventObjects bl ScriptContext2_Enable ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -8593,7 +8593,7 @@ _080AF644: bl sub_80AF71C cmp r0, 0 beq _080AF65A - bl UnfreezeMapObjects + bl UnfreezeEventObjects bl ScriptContext2_Disable adds r0, r5, 0 bl DestroyTask @@ -8861,7 +8861,7 @@ sub_80AF87C: @ 80AF87C movs r0, 0x1 bl sub_8085540 bl ScriptContext2_Enable - bl SaveMapObjects + bl SaveEventObjects bl music_something bl sub_80AF0B4 movs r0, 0x2D @@ -9062,7 +9062,7 @@ _080AFA34: beq _080AFA6C b _080AFA7C _080AFA3A: - bl FreezeMapObjects + bl FreezeEventObjects bl ScriptContext2_Enable b _080AFA64 _080AFA44: @@ -9133,7 +9133,7 @@ _080AFAC0: .4byte _080AFBB8 .4byte _080AFBD4 _080AFAD4: - bl FreezeMapObjects + bl FreezeEventObjects adds r0, r4, 0 adds r1, r6, 0 bl PlayerGetDestCoords @@ -9174,20 +9174,20 @@ _080AFB26: movs r0, 0xFF movs r1, 0 movs r2, 0 - bl GetFieldObjectIdByLocalIdAndMap + bl GetEventObjectIdByLocalIdAndMap adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r4, =gMapObjects + ldr r4, =gEventObjects adds r0, r4 - bl FieldObjectClearAnimIfSpecialAnimActive + bl EventObjectClearAnimIfSpecialAnimActive movs r0, 0xFF movs r1, 0 movs r2, 0 - bl GetFieldObjectIdByLocalIdAndMap + bl GetEventObjectIdByLocalIdAndMap adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -9196,7 +9196,7 @@ _080AFB26: lsls r0, 2 adds r0, r4 movs r1, 0x9 - bl FieldObjectSetSpecialAnim + bl EventObjectSetSpecialAnim movs r0, 0x2 strh r0, [r5, 0x8] b _080AFBE8 @@ -9218,16 +9218,16 @@ _080AFB6C: movs r0, 0xFF movs r1, 0 movs r2, 0 - bl GetFieldObjectIdByLocalIdAndMap + bl GetEventObjectIdByLocalIdAndMap adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r0, r1 - bl FieldObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearAnimIfSpecialAnimFinished movs r0, 0 bl sub_80AF0F4 movs r0, 0x3 @@ -9290,7 +9290,7 @@ _080AFC1C: beq _080AFC46 b _080AFC56 _080AFC22: - bl FreezeMapObjects + bl FreezeEventObjects bl ScriptContext2_Enable b _080AFC3E _080AFC2C: @@ -9982,7 +9982,7 @@ task0A_mpl_807E31C: @ 80B0160 b _080B01B6 .pool _080B0184: - bl FreezeMapObjects + bl FreezeEventObjects bl ScriptContext2_Enable bl sub_808D194 ldrh r0, [r4, 0x8] @@ -9996,7 +9996,7 @@ _080B0198: bl sub_808D1B4 cmp r0, 0x1 beq _080B01B6 - bl UnfreezeMapObjects + bl UnfreezeEventObjects bl ScriptContext2_Disable adds r0, r5, 0 bl DestroyTask @@ -10033,7 +10033,7 @@ _080B01E4: beq _080B022A b _080B023A _080B01EE: - bl FreezeMapObjects + bl FreezeEventObjects bl ScriptContext2_Enable movs r0, 0x2D bl PlaySE diff --git a/asm/field_specials.s b/asm/field_specials.s index 852d5ce7c2..6916fc6ead 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -741,8 +741,8 @@ _0813828A: .pool thumb_func_end GetLinkPartnerNames - thumb_func_start SpawnLinkPartnerFieldObject -SpawnLinkPartnerFieldObject: @ 81382A0 + thumb_func_start SpawnLinkPartnerEventObject +SpawnLinkPartnerEventObject: @ 81382A0 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -912,7 +912,7 @@ _0813839C: adds r0, r5, 0 adds r2, r4, 0 mov r3, r12 - bl SpawnSpecialFieldObjectParametrized + bl SpawnSpecialEventObjectParametrized adds r0, r5, 0 adds r1, r4, 0 adds r2, r6, 0 @@ -941,7 +941,7 @@ _08138410: pop {r0} bx r0 .pool - thumb_func_end SpawnLinkPartnerFieldObject + thumb_func_end SpawnLinkPartnerEventObject thumb_func_start sub_813842C sub_813842C: @ 813842C @@ -971,12 +971,12 @@ _08138454: ldrb r1, [r0, 0x5] ldrb r2, [r0, 0x4] adds r0, r3, 0 - bl GetFieldObjectIdByLocalIdAndMap + bl GetEventObjectIdByLocalIdAndMap lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x10 beq _081384E6 - ldr r1, =gMapObjects + ldr r1, =gEventObjects lsls r0, r2, 3 adds r0, r2 lsls r0, 2 @@ -1008,15 +1008,15 @@ _081384A8: beq _081384BC b _081384E6 _081384B2: - ldr r0, =gFieldObjectPalette33 + ldr r0, =gEventObjectPalette33 b _081384C6 .pool _081384BC: - ldr r0, =gFieldObjectPalette34 + ldr r0, =gEventObjectPalette34 b _081384C6 .pool _081384C4: - ldr r0, =gFieldObjectPalette8 + ldr r0, =gEventObjectPalette8 _081384C6: movs r2, 0x80 lsls r2, 1 @@ -1026,7 +1026,7 @@ _081384C6: b _081384E6 .pool _081384D8: - ldr r0, =gFieldObjectPalette17 + ldr r0, =gEventObjectPalette17 movs r2, 0x80 lsls r2, 1 adds r1, r3, r2 @@ -2537,8 +2537,8 @@ _0813914A: .pool thumb_func_end IsGrassTypeInParty - thumb_func_start SpawnScriptFieldObject -SpawnScriptFieldObject: @ 8139158 + thumb_func_start SpawnScriptEventObject +SpawnScriptEventObject: @ 8139158 push {lr} sub sp, 0x8 ldr r0, =gSaveBlock1Ptr @@ -2557,10 +2557,10 @@ SpawnScriptFieldObject: @ 8139158 movs r0, 0x7 movs r1, 0x8 movs r2, 0x7F - bl SpawnSpecialFieldObjectParametrized + bl SpawnSpecialEventObjectParametrized lsls r0, 24 lsrs r0, 24 - ldr r2, =gMapObjects + ldr r2, =gEventObjects lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -2575,10 +2575,10 @@ SpawnScriptFieldObject: @ 8139158 pop {r0} bx r0 .pool - thumb_func_end SpawnScriptFieldObject + thumb_func_end SpawnScriptEventObject - thumb_func_start RemoveScriptFieldObject -RemoveScriptFieldObject: @ 81391AC + thumb_func_start RemoveScriptEventObject +RemoveScriptEventObject: @ 81391AC push {lr} bl GetPlayerAvatarObjectId lsls r0, 24 @@ -2589,11 +2589,11 @@ RemoveScriptFieldObject: @ 81391AC ldrb r1, [r0, 0x5] ldrb r2, [r0, 0x4] movs r0, 0x7F - bl RemoveFieldObjectByLocalIdAndMap + bl RemoveEventObjectByLocalIdAndMap pop {r0} bx r0 .pool - thumb_func_end RemoveScriptFieldObject + thumb_func_end RemoveScriptEventObject thumb_func_start GetPokeblockNameByMonNature GetPokeblockNameByMonNature: @ 81391D0 @@ -6327,7 +6327,7 @@ sub_813B0B4: @ 813B0B4 ldrb r2, [r0, 0x4] movs r0, 0x1 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetEventObjectIdByLocalIdAndMap cmp r4, 0 bne _0813B0F0 movs r0, 0xC4 @@ -6377,7 +6377,7 @@ _0813B13A: adds r0, r5, r0 ldrb r2, [r0] movs r0, 0x1 - bl Overworld_SetMapObjTemplateCoords + bl Overworld_SetEventObjTemplateCoords add sp, 0x4 pop {r4,r5} pop {r0} diff --git a/asm/fldeff_80F9BCC.s b/asm/fldeff_80F9BCC.s index 8f1e198b8c..702852445e 100644 --- a/asm/fldeff_80F9BCC.s +++ b/asm/fldeff_80F9BCC.s @@ -1722,7 +1722,7 @@ _080FA9CA: sub_80FA9D0: @ 80FA9D0 push {r4,lr} sub sp, 0x4 - ldr r3, =gMapObjects + ldr r3, =gEventObjects ldr r2, =gPlayerAvatar ldrb r1, [r2, 0x5] lsls r0, r1, 3 @@ -2312,15 +2312,15 @@ sub_80FAEF0: @ 80FAEF0 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r4, r0, r1 adds r0, r4, 0 - bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive + bl EventObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 cmp r0, 0 beq _080FAF1C adds r0, r4, 0 - bl FieldObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 beq _080FAF4E @@ -2337,7 +2337,7 @@ _080FAF1C: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl FieldObjectSetSpecialAnim + bl EventObjectSetSpecialAnim ldr r1, =gTasks lsls r0, r5, 2 adds r0, r5 @@ -2362,10 +2362,10 @@ sub_80FAF64: @ 80FAF64 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r5, r0, r1 adds r0, r5, 0 - bl FieldObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 beq _080FAFC8 @@ -2389,7 +2389,7 @@ sub_80FAF64: @ 80FAF64 lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl FieldObjectSetSpecialAnim + bl EventObjectSetSpecialAnim b _080FAFC8 .pool _080FAFC4: diff --git a/asm/pokenav.s b/asm/pokenav.s index 2cc6435474..00c8c84488 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -25584,7 +25584,7 @@ sub_81D4258: @ 81D4258 ldrb r2, [r0, 0x4] movs r0, 0x1 mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetEventObjectIdByLocalIdAndMap mov r0, sp ldrb r0, [r0] add sp, 0x4 @@ -25606,7 +25606,7 @@ sub_81D427C: @ 81D427C lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r2, =gMapObjects + ldr r2, =gEventObjects adds r5, r1, r2 ldr r4, =gUnknown_030012F8 ldr r3, =gPlayerAvatar @@ -25644,7 +25644,7 @@ _081D42CA: mov r8, r0 cmp r0, 0x3 bls _081D42CA - ldr r2, =gMapObjects + ldr r2, =gEventObjects ldr r0, =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -25700,7 +25700,7 @@ _081D4356: _081D4360: movs r4, 0 mov r8, r4 - ldr r6, =gMapObjects + ldr r6, =gEventObjects mov r10, r6 _081D4368: ldr r3, =gPlayerAvatar @@ -25718,7 +25718,7 @@ _081D4368: ldrsh r2, [r4, r6] movs r6, 0 ldrsh r0, [r0, r6] - ldr r6, =gMapObjects + ldr r6, =gEventObjects mov r9, r6 mov r12, r3 adds r7, r1, 0 @@ -25866,7 +25866,7 @@ _081D449E: ldrsh r1, [r4, r3] movs r3, 0 ldrsh r0, [r0, r3] - ldr r3, =gMapObjects + ldr r3, =gEventObjects mov r9, r3 mov r12, r2 cmp r1, r0 @@ -26124,7 +26124,7 @@ _081D46D0: ldrsh r0, [r0, r3] cmp r0, 0 bne _081D476E - ldr r2, =gMapObjects + ldr r2, =gEventObjects ldr r0, =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -26149,7 +26149,7 @@ _081D46D0: beq _081D470C b _081D447C _081D470C: - ldr r2, =gMapObjects + ldr r2, =gEventObjects ldr r0, =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -26203,7 +26203,7 @@ _081D476E: ldrsh r0, [r0, r2] cmp r0, 0 bne _081D480C - ldr r2, =gMapObjects + ldr r2, =gEventObjects ldr r0, =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -26228,7 +26228,7 @@ _081D476E: beq _081D47AA b _081D45AA _081D47AA: - ldr r2, =gMapObjects + ldr r2, =gEventObjects ldr r0, =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -26299,7 +26299,7 @@ sub_81D4834: @ 81D4834 lsls r0, 16 lsls r1, 16 lsrs r4, r1, 16 - ldr r3, =gMapObjects + ldr r3, =gEventObjects ldr r1, =gPlayerAvatar ldrb r2, [r1, 0x5] lsls r1, r2, 3 @@ -26350,7 +26350,7 @@ sub_81D4890: @ 81D4890 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, =gMapObjects + ldr r0, =gEventObjects adds r4, r1, r0 movs r1, 0 ldr r3, =gUnknown_030012FC @@ -26503,9 +26503,9 @@ _081D49E0: bx r0 thumb_func_end sub_81D4998 - thumb_func_start FieldObjectIsFarawayIslandMew -@ bool8 FieldObjectIsFarawayIslandMew(struct npc_state *fieldObject) -FieldObjectIsFarawayIslandMew: @ 81D49E8 + thumb_func_start EventObjectIsFarawayIslandMew +@ bool8 EventObjectIsFarawayIslandMew(struct npc_state *eventObject) +EventObjectIsFarawayIslandMew: @ 81D49E8 push {lr} adds r2, r0, 0 ldr r0, =gSaveBlock1Ptr @@ -26525,7 +26525,7 @@ _081D4A0C: _081D4A0E: pop {r1} bx r1 - thumb_func_end FieldObjectIsFarawayIslandMew + thumb_func_end EventObjectIsFarawayIslandMew thumb_func_start unown_chamber_related unown_chamber_related: @ 81D4A14 @@ -26598,7 +26598,7 @@ sub_81D4A90: @ 81D4A90 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, =gMapObjects + ldr r0, =gEventObjects adds r5, r1, r0 ldrb r1, [r5, 0x1] movs r0, 0x21 @@ -29331,7 +29331,7 @@ sub_81D6180: @ 81D6180 thumb_func_end sub_81D6180 thumb_func_start GetTrainerHillTrainerFlag -@ u8 GetTrainerHillTrainerFlag(u8 fieldObjectId) +@ u8 GetTrainerHillTrainerFlag(u8 eventObjectId) GetTrainerHillTrainerFlag: @ 81D619C push {r4,lr} adds r4, r0, 0 @@ -29340,7 +29340,7 @@ GetTrainerHillTrainerFlag: @ 81D619C bl sub_81D5520 lsls r0, 24 lsrs r0, 23 - ldr r2, =gMapObjects + ldr r2, =gEventObjects lsls r1, r4, 3 adds r1, r4 lsls r1, 2 diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index b7f03739a9..14e418f1c6 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -10551,7 +10551,7 @@ _080181BC: sub_80181CC: @ 80181CC push {lr} bl ScriptContext2_Enable - bl ScriptFreezeMapObjects + bl ScriptFreezeEventObjects pop {r0} bx r0 thumb_func_end sub_80181CC @@ -13578,7 +13578,7 @@ sub_8019AB8: @ 8019AB8 ldr r2, [r1] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] - bl RemoveFieldObjectByLocalIdAndMap + bl RemoveEventObjectByLocalIdAndMap pop {r0} bx r0 .pool @@ -13597,7 +13597,7 @@ sub_8019AD8: @ 8019AD8 ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetEventObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _08019B30 @@ -13606,16 +13606,16 @@ sub_8019AD8: @ 8019AD8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r4, r0, r1 adds r0, r4, 0 - bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive + bl EventObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 cmp r0, 0 bne _08019B30 ldrb r1, [r5] adds r0, r4, 0 - bl FieldObjectSetSpecialAnim + bl EventObjectSetSpecialAnim lsls r0, 24 cmp r0, 0 bne _08019B30 @@ -13643,7 +13643,7 @@ sub_8019B3C: @ 8019B3C ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetEventObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _08019B9C @@ -13652,10 +13652,10 @@ sub_8019B3C: @ 8019B3C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r4, r0, r1 adds r0, r4, 0 - bl FieldObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 bne _08019B84 @@ -13672,7 +13672,7 @@ _08019B84: b _08019B9C _08019B96: adds r0, r4, 0 - bl FreezeMapObject + bl FreezeEventObject _08019B9C: movs r0, 0x1 _08019B9E: diff --git a/asm/script_pokemon_util_80F87D8.s b/asm/script_pokemon_util_80F87D8.s index b241e3778e..18a0cec886 100644 --- a/asm/script_pokemon_util_80F87D8.s +++ b/asm/script_pokemon_util_80F87D8.s @@ -505,10 +505,10 @@ _080F8BBA: ldr r2, [r1] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] - bl GetFieldObjectIdByLocalIdAndMap + bl GetEventObjectIdByLocalIdAndMap lsls r0, 24 lsrs r0, 24 - ldr r2, =gMapObjects + ldr r2, =gEventObjects lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -534,12 +534,12 @@ _080F8BBA: cmp r0, 0 bne _080F8C2C lsrs r1, r4, 16 - ldr r0, =gFieldObjectPalette33 + ldr r0, =gEventObjectPalette33 b _080F8C42 .pool _080F8C2C: lsrs r1, r4, 16 - ldr r0, =gFieldObjectPalette34 + ldr r0, =gEventObjectPalette34 b _080F8C42 .pool _080F8C38: @@ -547,7 +547,7 @@ _080F8C38: cmp r0, 0 bne _080F8C50 lsrs r1, r4, 16 - ldr r0, =gFieldObjectPalette8 + ldr r0, =gEventObjectPalette8 _080F8C42: movs r2, 0x20 bl LoadPalette @@ -555,7 +555,7 @@ _080F8C42: .pool _080F8C50: lsrs r1, r4, 16 - ldr r0, =gFieldObjectPalette17 + ldr r0, =gEventObjectPalette17 movs r2, 0x20 bl LoadPalette _080F8C5A: diff --git a/asm/shop.s b/asm/shop.s index a09d053232..b498da70d5 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -1277,8 +1277,8 @@ BuyMenuDrawGraphics: @ 80E0524 @ void BuyMenuDrawMapGraphics() BuyMenuDrawMapGraphics: @ 80E0570 push {lr} - bl BuyMenuCollectFieldObjectData - bl BuyMenuDrawFieldObjects + bl BuyMenuCollectEventObjectData + bl BuyMenuDrawEventObjects bl BuyMenuDrawMapBg pop {r0} bx r0 @@ -1525,9 +1525,9 @@ BuyMenuDrawMapMetatileLayer: @ 80E0734 bx lr thumb_func_end BuyMenuDrawMapMetatileLayer - thumb_func_start BuyMenuCollectFieldObjectData -@ void BuyMenuCollectFieldObjectData() -BuyMenuCollectFieldObjectData: @ 80E075C + thumb_func_start BuyMenuCollectEventObjectData +@ void BuyMenuCollectEventObjectData() +BuyMenuCollectEventObjectData: @ 80E075C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -1584,7 +1584,7 @@ _080E07AA: lsls r1, 16 asrs r1, 16 str r3, [sp, 0x10] - bl GetFieldObjectIdByXY + bl GetEventObjectIdByXY lsls r0, 24 lsrs r6, r0, 24 ldr r3, [sp, 0x10] @@ -1633,7 +1633,7 @@ _080E07AA: lsrs r0, 24 mov r1, r12 strh r0, [r1] - ldr r1, =gMapObjects + ldr r1, =gEventObjects lsls r0, r6, 3 adds r0, r6 lsls r0, 2 @@ -1716,11 +1716,11 @@ _080E08DA: pop {r0} bx r0 .pool - thumb_func_end BuyMenuCollectFieldObjectData + thumb_func_end BuyMenuCollectEventObjectData - thumb_func_start BuyMenuDrawFieldObjects -@ void BuyMenuDrawFieldObjects() -BuyMenuDrawFieldObjects: @ 80E08F0 + thumb_func_start BuyMenuDrawEventObjects +@ void BuyMenuDrawEventObjects() +BuyMenuDrawEventObjects: @ 80E08F0 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -1730,7 +1730,7 @@ BuyMenuDrawFieldObjects: @ 80E08F0 movs r7, 0 ldr r0, =gUnknown_02039F70 mov r8, r0 - ldr r1, =gMapObjects + ldr r1, =gEventObjects mov r10, r1 ldr r2, =gSprites mov r9, r2 @@ -1753,7 +1753,7 @@ _080E090A: lsls r0, 2 add r0, r10 ldrb r0, [r0, 0x5] - bl GetFieldObjectGraphicsInfo + bl GetEventObjectGraphicsInfo mov r4, r8 ldr r3, [r4] ldr r2, =0x00002010 @@ -1792,7 +1792,7 @@ _080E090A: str r0, [sp] adds r0, r4, 0 ldr r1, =SpriteCallbackDummy - bl AddPseudoFieldObject + bl AddPseudoEventObject lsls r0, 24 lsrs r4, r0, 24 adds r6, r4, 0 @@ -1801,7 +1801,7 @@ _080E090A: mov r3, r8 ldr r0, [r3] adds r0, r1 - bl BuyMenuCheckIfFieldObjectOverlapsMenuBg + bl BuyMenuCheckIfEventObjectOverlapsMenuBg lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1850,10 +1850,10 @@ _080E09D8: pop {r0} bx r0 .pool - thumb_func_end BuyMenuDrawFieldObjects + thumb_func_end BuyMenuDrawEventObjects - thumb_func_start BuyMenuCheckIfFieldObjectOverlapsMenuBg -BuyMenuCheckIfFieldObjectOverlapsMenuBg: @ 80E0A14 + thumb_func_start BuyMenuCheckIfEventObjectOverlapsMenuBg +BuyMenuCheckIfEventObjectOverlapsMenuBg: @ 80E0A14 push {r4,lr} adds r4, r0, 0 movs r1, 0x2 @@ -1877,7 +1877,7 @@ _080E0A3A: pop {r4} pop {r1} bx r1 - thumb_func_end BuyMenuCheckIfFieldObjectOverlapsMenuBg + thumb_func_end BuyMenuCheckIfEventObjectOverlapsMenuBg thumb_func_start BuyMenuCopyMenuBgToBg1TilemapBuffer @ void BuyMenuCopyMenuBgToBg1TilemapBuffer() diff --git a/data/cable_car.s b/data/cable_car.s index 32a265c97a..c141e593c3 100644 --- a/data/cable_car.s +++ b/data/cable_car.s @@ -1,4 +1,4 @@ -#include "constants/map_objects.h" +#include "constants/event_objects.h" .include "asm/macros.inc" .include "constants/constants.inc" @@ -80,14 +80,14 @@ gSpriteTemplate_85CDBCC:: @ 85CDBCC spr_template 3, 1, gOamData_85CDB94, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, nullsub_58 gCableCarPlayerGraphicsIDs:: @ 85CDBE4 - .byte MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL - .byte MAP_OBJ_GFX_RIVAL_MAY_NORMAL + .byte EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + .byte EVENT_OBJ_GFX_RIVAL_MAY_NORMAL gMtChimneyHikerGraphicsIDs:: @ 85CDBE6 - .byte MAP_OBJ_GFX_HIKER - .byte MAP_OBJ_GFX_CAMPER - .byte MAP_OBJ_GFX_PICNICKER - .byte MAP_OBJ_GFX_ZIGZAGOON_1 @ not used + .byte EVENT_OBJ_GFX_HIKER + .byte EVENT_OBJ_GFX_CAMPER + .byte EVENT_OBJ_GFX_PICNICKER + .byte EVENT_OBJ_GFX_ZIGZAGOON_1 @ not used .align 1 gMtChimneyHikerCoords:: @ 85CDBEA diff --git a/data/field_effect_misc.s b/data/field_effect_misc.s index ef73c32635..f1b28d9068 100644 --- a/data/field_effect_misc.s +++ b/data/field_effect_misc.s @@ -27,7 +27,7 @@ gSpriteImage_858DB78:: @ 858DB78 .align 2 gFieldEffectObjectPalette7:: @ 858DC18 - .incbin "graphics/map_objects/palettes/field_effect_object_palette_07.gbapal" + .incbin "graphics/event_objects/palettes/field_effect_object_palette_07.gbapal" .align 2 gSpriteImage_858DC38:: @ 858DC38 @@ -75,7 +75,7 @@ gSpriteImage_858E138:: @ 858E138 .align 2 gFieldEffectObjectPalette8:: @ 858E1B8 - .incbin "graphics/map_objects/palettes/field_effect_object_palette_08.gbapal" + .incbin "graphics/event_objects/palettes/field_effect_object_palette_08.gbapal" .align 2 gSpriteImage_858E1D8:: @ 858E1D8 @@ -240,5 +240,5 @@ gSpriteAnimTable_858E87C:: @ 858E87C .align 2 gUnknown_0858E880:: @ 858E880 - spr_template 0xffff, 0x1000, gFieldObjectBaseOam_32x8, gSpriteAnimTable_858E87C, gUnknown_0858E84C, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0xffff, 0x1000, gEventObjectBaseOam_32x8, gSpriteAnimTable_858E87C, gUnknown_0858E84C, gDummySpriteAffineAnimTable, SpriteCallbackDummy diff --git a/data/map_events.s b/data/map_events.s index 8784ee047a..228380e7b4 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,6 +1,6 @@ #include "constants/flags.h" #include "constants/items.h" -#include "constants/map_objects.h" +#include "constants/event_objects.h" #include "constants/vars.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.inc b/data/maps/events/AbandonedShip_CaptainsOffice.inc index b2bc10ebb8..ddfab5eab9 100644 --- a/data/maps/events/AbandonedShip_CaptainsOffice.inc +++ b/data/maps/events/AbandonedShip_CaptainsOffice.inc @@ -1,11 +1,11 @@ -AbandonedShip_CaptainsOffice_MapObjects: @ 8536A5C - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 6, 3, 1, 17, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100, 0, 0 +AbandonedShip_CaptainsOffice_EventObjects: @ 8536A5C + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 6, 3, 1, 17, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100, 0, 0 AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C warp_def 7, 6, 3, 4, ABANDONED_SHIP_DECK warp_def 8, 6, 3, 4, ABANDONED_SHIP_DECK AbandonedShip_CaptainsOffice_MapEvents:: @ 8536A9C - map_events AbandonedShip_CaptainsOffice_MapObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0 + map_events AbandonedShip_CaptainsOffice_EventObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Corridors_1F.inc b/data/maps/events/AbandonedShip_Corridors_1F.inc index a2b3b906fd..c3cf0f54df 100644 --- a/data/maps/events/AbandonedShip_Corridors_1F.inc +++ b/data/maps/events/AbandonedShip_Corridors_1F.inc @@ -1,6 +1,6 @@ -AbandonedShip_Corridors_1F_MapObjects: @ 85366C0 - object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 17, 7, 3, 2, 17, 0, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TUBER_M, 0, 0, 5, 10, 3, 45, 116, 0, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0, 0, 0 +AbandonedShip_Corridors_1F_EventObjects: @ 85366C0 + object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 17, 7, 3, 2, 17, 0, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 0, 5, 10, 3, 45, 116, 0, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0, 0, 0 AbandonedShip_Corridors_1F_MapWarps: @ 85366F0 warp_def 9, 11, 3, 2, ABANDONED_SHIP_DECK @@ -17,5 +17,5 @@ AbandonedShip_Corridors_1F_MapWarps: @ 85366F0 warp_def 3, 3, 3, 2, ABANDONED_SHIP_ROOMS_2_1F AbandonedShip_Corridors_1F_MapEvents:: @ 8536750 - map_events AbandonedShip_Corridors_1F_MapObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0 + map_events AbandonedShip_Corridors_1F_EventObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Corridors_B1F.inc b/data/maps/events/AbandonedShip_Corridors_B1F.inc index 637e658ce7..8903de1970 100644 --- a/data/maps/events/AbandonedShip_Corridors_B1F.inc +++ b/data/maps/events/AbandonedShip_Corridors_B1F.inc @@ -1,6 +1,6 @@ -AbandonedShip_Corridors_B1F_MapObjects: @ 8536808 - object_event 1, MAP_OBJ_GFX_TUBER_M, 0, 0, 2, 8, 3, 2, 17, 0, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 9, 6, 3, 14, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0, 0, 0 +AbandonedShip_Corridors_B1F_EventObjects: @ 8536808 + object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 0, 2, 8, 3, 2, 17, 0, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 9, 6, 3, 14, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0, 0, 0 AbandonedShip_Corridors_B1F_MapWarps: @ 8536838 warp_def 6, 4, 3, 2, ABANDONED_SHIP_ROOMS_2_B1F @@ -16,5 +16,5 @@ AbandonedShip_Corridors_B1F_MapBGEvents: @ 8536878 bg_event 11, 4, 3, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DC8 AbandonedShip_Corridors_B1F_MapEvents:: @ 8536884 - map_events AbandonedShip_Corridors_B1F_MapObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents + map_events AbandonedShip_Corridors_B1F_EventObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc index 21a4370ce0..27756e5a3a 100644 --- a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc +++ b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc @@ -1,8 +1,8 @@ -AbandonedShip_HiddenFloorRooms_MapObjects: @ 8536B40 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 41, 4, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 10, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 11, 3, 1, 17, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 11, 3, 1, 17, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101, 0, 0 +AbandonedShip_HiddenFloorRooms_EventObjects: @ 8536B40 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 41, 4, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 10, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 11, 3, 1, 17, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 11, 3, 1, 17, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101, 0, 0 AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0 warp_def 6, 14, 3, 0, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS @@ -28,5 +28,5 @@ AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8 bg_event 24, 6, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 AbandonedShip_HiddenFloorRooms_MapEvents:: @ 8536C60 - map_events AbandonedShip_HiddenFloorRooms_MapObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents + map_events AbandonedShip_HiddenFloorRooms_EventObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents diff --git a/data/maps/events/AbandonedShip_Room_B1F.inc b/data/maps/events/AbandonedShip_Room_B1F.inc index d22e24bde1..67411fcf91 100644 --- a/data/maps/events/AbandonedShip_Room_B1F.inc +++ b/data/maps/events/AbandonedShip_Room_B1F.inc @@ -1,10 +1,10 @@ -AbandonedShip_Room_B1F_MapObjects: @ 853697C - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 17, 0, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098, 0, 0 +AbandonedShip_Room_B1F_EventObjects: @ 853697C + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 17, 0, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098, 0, 0 AbandonedShip_Room_B1F_MapWarps: @ 8536994 warp_def 4, 7, 3, 5, ABANDONED_SHIP_CORRIDORS_B1F warp_def 5, 7, 3, 5, ABANDONED_SHIP_CORRIDORS_B1F AbandonedShip_Room_B1F_MapEvents:: @ 85369A4 - map_events AbandonedShip_Room_B1F_MapObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0 + map_events AbandonedShip_Room_B1F_EventObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.inc b/data/maps/events/AbandonedShip_Rooms2_1F.inc index ac5f57a53d..4791919f67 100644 --- a/data/maps/events/AbandonedShip_Rooms2_1F.inc +++ b/data/maps/events/AbandonedShip_Rooms2_1F.inc @@ -1,9 +1,9 @@ -AbandonedShip_Rooms2_1F_MapObjects: @ 85369B8 - object_event 1, MAP_OBJ_GFX_MAN_5, 0, 0, 7, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 0, 6, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099, 0, 0 - object_event 4, MAP_OBJ_GFX_HIKER, 0, 0, 3, 2, 3, 10, 17, 0, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_TUBER_F, 0, 0, 7, 2, 3, 9, 17, 0, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0, 0, 0 +AbandonedShip_Rooms2_1F_EventObjects: @ 85369B8 + object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 0, 7, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 6, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099, 0, 0 + object_event 4, EVENT_OBJ_GFX_HIKER, 0, 0, 3, 2, 3, 10, 17, 0, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 0, 7, 2, 3, 9, 17, 0, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0, 0, 0 AbandonedShip_Rooms2_1F_MapWarps: @ 8536A30 warp_def 4, 16, 3, 8, ABANDONED_SHIP_CORRIDORS_1F @@ -11,5 +11,5 @@ AbandonedShip_Rooms2_1F_MapWarps: @ 8536A30 warp_def 4, 1, 3, 11, ABANDONED_SHIP_CORRIDORS_1F AbandonedShip_Rooms2_1F_MapEvents:: @ 8536A48 - map_events AbandonedShip_Rooms2_1F_MapObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0 + map_events AbandonedShip_Rooms2_1F_EventObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.inc b/data/maps/events/AbandonedShip_Rooms2_B1F.inc index 08846936ab..e28a2ed5b8 100644 --- a/data/maps/events/AbandonedShip_Rooms2_B1F.inc +++ b/data/maps/events/AbandonedShip_Rooms2_B1F.inc @@ -1,6 +1,6 @@ -AbandonedShip_Rooms2_B1F_MapObjects: @ 85368F4 - object_event 1, MAP_OBJ_GFX_CAMPER, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 13, 3, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097, 0, 0 +AbandonedShip_Rooms2_B1F_EventObjects: @ 85368F4 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 3, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097, 0, 0 AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924 warp_def 4, 7, 3, 1, ABANDONED_SHIP_CORRIDORS_B1F @@ -9,5 +9,5 @@ AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924 warp_def 14, 7, 3, 0, ABANDONED_SHIP_CORRIDORS_B1F AbandonedShip_Rooms2_B1F_MapEvents:: @ 8536944 - map_events AbandonedShip_Rooms2_B1F_MapObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0 + map_events AbandonedShip_Rooms2_B1F_EventObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms_1F.inc b/data/maps/events/AbandonedShip_Rooms_1F.inc index 7e358ef75c..fe9b6f7daf 100644 --- a/data/maps/events/AbandonedShip_Rooms_1F.inc +++ b/data/maps/events/AbandonedShip_Rooms_1F.inc @@ -1,8 +1,8 @@ -AbandonedShip_Rooms_1F_MapObjects: @ 8536764 - object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 12, 5, 3, 2, 17, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 5, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095, 0, 0 - object_event 3, MAP_OBJ_GFX_BEAUTY, 0, 0, 10, 11, 3, 8, 17, 0, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 10, 16, 3, 16, 17, 0, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0, 0, 0 +AbandonedShip_Rooms_1F_EventObjects: @ 8536764 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 12, 5, 3, 2, 17, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 5, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095, 0, 0 + object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 0, 10, 11, 3, 8, 17, 0, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 10, 16, 3, 16, 17, 0, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0, 0, 0 AbandonedShip_Rooms_1F_MapWarps: @ 85367C4 warp_def 4, 16, 3, 4, ABANDONED_SHIP_CORRIDORS_1F @@ -13,5 +13,5 @@ AbandonedShip_Rooms_1F_MapWarps: @ 85367C4 warp_def 14, 16, 3, 5, ABANDONED_SHIP_CORRIDORS_1F AbandonedShip_Rooms_1F_MapEvents:: @ 85367F4 - map_events AbandonedShip_Rooms_1F_MapObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0 + map_events AbandonedShip_Rooms_1F_EventObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.inc b/data/maps/events/AbandonedShip_Rooms_B1F.inc index 4627c4ab73..631b33746d 100644 --- a/data/maps/events/AbandonedShip_Rooms_B1F.inc +++ b/data/maps/events/AbandonedShip_Rooms_B1F.inc @@ -1,6 +1,6 @@ -AbandonedShip_Rooms_B1F_MapObjects: @ 8536898 - object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 25, 6, 3, 9, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 7, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096, 0, 0 +AbandonedShip_Rooms_B1F_EventObjects: @ 8536898 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 25, 6, 3, 9, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 7, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096, 0, 0 AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8 warp_def 4, 1, 3, 2, ABANDONED_SHIP_CORRIDORS_B1F @@ -8,5 +8,5 @@ AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8 warp_def 22, 1, 3, 4, ABANDONED_SHIP_CORRIDORS_B1F AbandonedShip_Rooms_B1F_MapEvents:: @ 85368E0 - map_events AbandonedShip_Rooms_B1F_MapObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0 + map_events AbandonedShip_Rooms_B1F_EventObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AncientTomb.inc b/data/maps/events/AncientTomb.inc index 667ab38761..a0bde74e33 100644 --- a/data/maps/events/AncientTomb.inc +++ b/data/maps/events/AncientTomb.inc @@ -1,5 +1,5 @@ -AncientTomb_MapObjects: @ 8536CDC - object_event 1, MAP_OBJ_GFX_REGISTEEL, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937, 0, 0 +AncientTomb_EventObjects: @ 8536CDC + object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937, 0, 0 AncientTomb_MapWarps: @ 8536CF4 warp_def 8, 29, 3, 0, ROUTE_120 @@ -12,5 +12,5 @@ AncientTomb_MapBGEvents: @ 8536D0C bg_event 9, 20, 0, 0, 0, AncientTomb_EventScript_239050 AncientTomb_MapEvents:: @ 8536D30 - map_events AncientTomb_MapObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents + map_events AncientTomb_EventObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents diff --git a/data/maps/events/AquaHideout_1F.inc b/data/maps/events/AquaHideout_1F.inc index 4c418b286c..d5b9f17d6a 100644 --- a/data/maps/events/AquaHideout_1F.inc +++ b/data/maps/events/AquaHideout_1F.inc @@ -1,7 +1,7 @@ -AquaHideout_1F_MapObjects: @ 8535304 - object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821, 0, 0 - object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822, 0, 0 - object_event 3, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 20, 4, 3, 50, 93, 0, 1, 3, AquaHideout_1F_EventScript_2334F8, 924, 0, 0 +AquaHideout_1F_EventObjects: @ 8535304 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821, 0, 0 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822, 0, 0 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 20, 4, 3, 50, 93, 0, 1, 3, AquaHideout_1F_EventScript_2334F8, 924, 0, 0 AquaHideout_1F_MapWarps: @ 853534C warp_def 13, 27, 1, 6, LILYCOVE_CITY @@ -9,5 +9,5 @@ AquaHideout_1F_MapWarps: @ 853534C warp_def 22, 1, 3, 0, AQUA_HIDEOUT_B1F AquaHideout_1F_MapEvents:: @ 8535364 - map_events AquaHideout_1F_MapObjects, AquaHideout_1F_MapWarps, 0x0, 0x0 + map_events AquaHideout_1F_EventObjects, AquaHideout_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/events/AquaHideout_B1F.inc index b62157d6fe..c1b2f36b79 100644 --- a/data/maps/events/AquaHideout_B1F.inc +++ b/data/maps/events/AquaHideout_B1F.inc @@ -1,13 +1,13 @@ -AquaHideout_B1F_MapObjects: @ 8535378 - object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 28, 16, 3, 8, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924, 0, 0 - object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 6, 3, 9, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 29, 12, 3, 1, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071, 0, 0 - object_event 4, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 20, 18, 3, 23, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 15, 9, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_291358, 1124, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 9, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 15, 10, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_291365, 1132, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 10, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_233A38, 978, 0, 0 - object_event 9, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 28, 21, 3, 7, 17, 0, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924, 0, 0 +AquaHideout_B1F_EventObjects: @ 8535378 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 28, 16, 3, 8, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924, 0, 0 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 6, 3, 9, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 12, 3, 1, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071, 0, 0 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 20, 18, 3, 23, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 15, 9, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_291358, 1124, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 9, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 15, 10, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_291365, 1132, 0, 0 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 10, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_233A38, 978, 0, 0 + object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 28, 21, 3, 7, 17, 0, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924, 0, 0 AquaHideout_B1F_MapWarps: @ 8535450 warp_def 29, 1, 3, 2, AQUA_HIDEOUT_1F @@ -37,5 +37,5 @@ AquaHideout_B1F_MapWarps: @ 8535450 warp_def 48, 17, 3, 19, AQUA_HIDEOUT_B1F AquaHideout_B1F_MapEvents:: @ 8535518 - map_events AquaHideout_B1F_MapObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0 + map_events AquaHideout_B1F_EventObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/events/AquaHideout_B2F.inc index 24f97a1eac..54ef390fdd 100644 --- a/data/maps/events/AquaHideout_B2F.inc +++ b/data/maps/events/AquaHideout_B2F.inc @@ -1,10 +1,10 @@ -AquaHideout_B2F_MapObjects: @ 853552C - object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 19, 3, 9, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, 924, 0, 0 - object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 10, 3, 45, 52, 0, 1, 3, AquaHideout_B2F_EventScript_233E8A, 924, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072, 0, 0 - object_event 4, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 0, 19, 20, 1, 9, 0, 0, 0, 0, 0x0, 943, 0, 0 - object_event 5, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 7, 5, 3, 10, 17, 0, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924, 0, 0 - object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 5, 3, 9, 17, 0, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924, 0, 0 +AquaHideout_B2F_EventObjects: @ 853552C + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 19, 3, 9, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, 924, 0, 0 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 10, 3, 45, 52, 0, 1, 3, AquaHideout_B2F_EventScript_233E8A, 924, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072, 0, 0 + object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 0, 19, 20, 1, 9, 0, 0, 0, 0, 0x0, 943, 0, 0 + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 7, 5, 3, 10, 17, 0, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924, 0, 0 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 5, 3, 9, 17, 0, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924, 0, 0 AquaHideout_B2F_MapWarps: @ 85355BC warp_def 18, 1, 3, 1, AQUA_HIDEOUT_B1F @@ -23,5 +23,5 @@ AquaHideout_B2F_MapCoordEvents: @ 853560C coord_event 28, 16, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_233DE5 AquaHideout_B2F_MapEvents:: @ 853562C - map_events AquaHideout_B2F_MapObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0 + map_events AquaHideout_B2F_EventObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/events/ArtisanCave_1F.inc b/data/maps/events/ArtisanCave_1F.inc index 148408aa9f..e5899ef055 100644 --- a/data/maps/events/ArtisanCave_1F.inc +++ b/data/maps/events/ArtisanCave_1F.inc @@ -1,10 +1,10 @@ -ArtisanCave_1F_MapObjects: @ 8537774 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 5, 3, 1, 17, 0, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163, 0, 0 +ArtisanCave_1F_EventObjects: @ 8537774 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 5, 3, 1, 17, 0, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163, 0, 0 ArtisanCave_1F_MapWarps: @ 853778C warp_def 10, 17, 0, 13, BATTLE_FRONTIER_OUTSIDE_EAST warp_def 6, 5, 0, 1, ARTISAN_CAVE_B1F ArtisanCave_1F_MapEvents:: @ 853779C - map_events ArtisanCave_1F_MapObjects, ArtisanCave_1F_MapWarps, 0x0, 0x0 + map_events ArtisanCave_1F_EventObjects, ArtisanCave_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ArtisanCave_B1F.inc b/data/maps/events/ArtisanCave_B1F.inc index 38a978c9b9..af24f4b4ac 100644 --- a/data/maps/events/ArtisanCave_B1F.inc +++ b/data/maps/events/ArtisanCave_B1F.inc @@ -1,5 +1,5 @@ -ArtisanCave_B1F_MapObjects: @ 8537708 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 32, 38, 3, 1, 17, 0, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162, 0, 0 +ArtisanCave_B1F_EventObjects: @ 8537708 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 32, 38, 3, 1, 17, 0, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162, 0, 0 ArtisanCave_B1F_MapWarps: @ 8537720 warp_def 8, 48, 0, 10, BATTLE_FRONTIER_OUTSIDE_WEST @@ -12,5 +12,5 @@ ArtisanCave_B1F_MapBGEvents: @ 8537730 bg_event 19, 43, 0, 7, 0, ITEM_IRON, 104, 0 ArtisanCave_B1F_MapEvents:: @ 8537760 - map_events ArtisanCave_B1F_MapObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents + map_events ArtisanCave_B1F_EventObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents diff --git a/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc b/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc index fee53156b8..029a59b417 100644 --- a/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc @@ -1,14 +1,14 @@ -BattleFrontier_BattleArenaBattleRoom_MapObjects: @ 853C8EC - object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 5, 3, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 10, 3, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 5, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 10, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 4, 5, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 11, 5, 3, 9, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_HIPSTER, 0, 0, 15, 6, 3, 9, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_TRADER, 0, 0, 0, 6, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 7, 4, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattleArenaBattleRoom_EventObjects: @ 853C8EC + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 5, 3, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 10, 3, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 5, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 10, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 4, 5, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 11, 5, 3, 9, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 0, 15, 6, 3, 9, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 6, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 7, 4, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleArenaBattleRoom_MapEvents:: @ 853C9C4 - map_events BattleFrontier_BattleArenaBattleRoom_MapObjects, 0x0, 0x0, 0x0 + map_events BattleFrontier_BattleArenaBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleArenaCorridor.inc b/data/maps/events/BattleFrontier_BattleArenaCorridor.inc index d35c35ad07..657f912e33 100644 --- a/data/maps/events/BattleFrontier_BattleArenaCorridor.inc +++ b/data/maps/events/BattleFrontier_BattleArenaCorridor.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattleArenaCorridor_MapObjects: @ 853C8C0 - object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 9, 12, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattleArenaCorridor_EventObjects: @ 853C8C0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 9, 12, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleArenaCorridor_MapEvents:: @ 853C8D8 - map_events BattleFrontier_BattleArenaCorridor_MapObjects, 0x0, 0x0, 0x0 + map_events BattleFrontier_BattleArenaCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleArenaLobby.inc b/data/maps/events/BattleFrontier_BattleArenaLobby.inc index ec84dfb774..3add198815 100644 --- a/data/maps/events/BattleFrontier_BattleArenaLobby.inc +++ b/data/maps/events/BattleFrontier_BattleArenaLobby.inc @@ -1,9 +1,9 @@ -BattleFrontier_BattleArenaLobby_MapObjects: @ 853C814 - object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 7, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 2, 10, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_6, 0, 0, 14, 11, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_CAMPER, 0, 0, 14, 12, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 14, 10, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0, 0, 0 +BattleFrontier_BattleArenaLobby_EventObjects: @ 853C814 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 7, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 2, 10, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 0, 14, 11, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 0, 14, 12, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 14, 10, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0, 0, 0 BattleFrontier_BattleArenaLobby_MapWarps: @ 853C88C warp_def 7, 12, 3, 1, BATTLE_FRONTIER_OUTSIDE_EAST @@ -13,5 +13,5 @@ BattleFrontier_BattleArenaLobby_MapBGEvents: @ 853C894 bg_event 1, 7, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560CA BattleFrontier_BattleArenaLobby_MapEvents:: @ 853C8AC - map_events BattleFrontier_BattleArenaLobby_MapObjects, BattleFrontier_BattleArenaLobby_MapWarps, 0x0, BattleFrontier_BattleArenaLobby_MapBGEvents + map_events BattleFrontier_BattleArenaLobby_EventObjects, BattleFrontier_BattleArenaLobby_MapWarps, 0x0, BattleFrontier_BattleArenaLobby_MapBGEvents diff --git a/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc b/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc index 3f0429bf2e..595d14b607 100644 --- a/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc @@ -1,20 +1,20 @@ -BattleFrontier_BattleDomeBattleRoom_MapObjects: @ 853C1C4 - object_event 1, MAP_OBJ_GFX_REPORTER_M, 0, 0, 5, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 7, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 9, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 11, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 16, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_1, 0, 0, 4, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 16, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_CAMPER, 0, 0, 8, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_MAN_2, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_FAT_MAN, 0, 0, 12, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_GIRL_2, 0, 0, 13, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_GIRL_1, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_TRADER, 0, 0, 4, 9, 4, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_WOMAN_4, 0, 0, 14, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_HIPSTER, 0, 0, 11, 6, 0, 9, 17, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattleDomeBattleRoom_EventObjects: @ 853C1C4 + object_event 1, EVENT_OBJ_GFX_REPORTER_M, 0, 0, 5, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 7, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 9, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 11, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 16, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 0, 4, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 16, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_CAMPER, 0, 0, 8, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 12, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_GIRL_2, 0, 0, 13, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_TRADER, 0, 0, 4, 9, 4, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 14, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_HIPSTER, 0, 0, 11, 6, 0, 9, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleDomeBattleRoom_MapEvents:: @ 853C32C - map_events BattleFrontier_BattleDomeBattleRoom_MapObjects, 0x0, 0x0, 0x0 + map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleDomeCorridor.inc b/data/maps/events/BattleFrontier_BattleDomeCorridor.inc index 61b6e019de..9b3f387b1a 100644 --- a/data/maps/events/BattleFrontier_BattleDomeCorridor.inc +++ b/data/maps/events/BattleFrontier_BattleDomeCorridor.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleDomeCorridor_MapObjects: @ 853C14C - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 23, 5, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattleDomeCorridor_EventObjects: @ 853C14C + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 23, 5, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleDomeCorridor_MapWarps: @ 853C164 warp_def 6, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST warp_def 7, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_BattleDomeCorridor_MapEvents:: @ 853C174 - map_events BattleFrontier_BattleDomeCorridor_MapObjects, BattleFrontier_BattleDomeCorridor_MapWarps, 0x0, 0x0 + map_events BattleFrontier_BattleDomeCorridor_EventObjects, BattleFrontier_BattleDomeCorridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleDomeLobby.inc b/data/maps/events/BattleFrontier_BattleDomeLobby.inc index 09ebc903c6..59605010fe 100644 --- a/data/maps/events/BattleFrontier_BattleDomeLobby.inc +++ b/data/maps/events/BattleFrontier_BattleDomeLobby.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleDomeLobby_MapObjects: @ 853C068 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 5, 10, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 1, 11, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 14, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_FAT_MAN, 0, 0, 18, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MANIAC, 0, 0, 8, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_TEALA, 0, 0, 17, 10, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0, 0, 0 +BattleFrontier_BattleDomeLobby_EventObjects: @ 853C068 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 10, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 1, 11, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 14, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 18, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_TEALA, 0, 0, 17, 10, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0, 0, 0 BattleFrontier_BattleDomeLobby_MapWarps: @ 853C0F8 warp_def 11, 16, 0, 1, BATTLE_FRONTIER_OUTSIDE_WEST @@ -17,5 +17,5 @@ BattleFrontier_BattleDomeLobby_MapBGEvents: @ 853C108 bg_event 15, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E34 BattleFrontier_BattleDomeLobby_MapEvents:: @ 853C138 - map_events BattleFrontier_BattleDomeLobby_MapObjects, BattleFrontier_BattleDomeLobby_MapWarps, 0x0, BattleFrontier_BattleDomeLobby_MapBGEvents + map_events BattleFrontier_BattleDomeLobby_EventObjects, BattleFrontier_BattleDomeLobby_MapWarps, 0x0, BattleFrontier_BattleDomeLobby_MapBGEvents diff --git a/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc b/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc index 6d8a8abe86..82da39a634 100644 --- a/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleDomePreBattleRoom_MapObjects: @ 853C188 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 5, 2, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattleDomePreBattleRoom_EventObjects: @ 853C188 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 2, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleDomePreBattleRoom_MapWarps: @ 853C1A0 warp_def 6, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST warp_def 7, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_BattleDomePreBattleRoom_MapEvents:: @ 853C1B0 - map_events BattleFrontier_BattleDomePreBattleRoom_MapObjects, BattleFrontier_BattleDomePreBattleRoom_MapWarps, 0x0, 0x0 + map_events BattleFrontier_BattleDomePreBattleRoom_EventObjects, BattleFrontier_BattleDomePreBattleRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc b/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc index 65ce8b6840..48fd10c076 100644 --- a/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc @@ -1,13 +1,13 @@ -BattleFrontier_BattleFactoryBattleRoom_MapObjects: @ 853CADC - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 6, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 7, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 8, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 6, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 8, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 853CADC + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 6, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 7, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 8, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 6, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 8, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 object_event 8, 255, 0, 0, 5, 11, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleFactoryBattleRoom_MapEvents:: @ 853CB9C - map_events BattleFrontier_BattleFactoryBattleRoom_MapObjects, 0x0, 0x0, 0x0 + map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleFactoryLobby.inc b/data/maps/events/BattleFrontier_BattleFactoryLobby.inc index e9f54cb501..8d514f8a0d 100644 --- a/data/maps/events/BattleFrontier_BattleFactoryLobby.inc +++ b/data/maps/events/BattleFrontier_BattleFactoryLobby.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleFactoryLobby_MapObjects: @ 853C9D8 - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_1, 0, 0, 3, 11, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 14, 11, 0, 8, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 0, 13, 11, 0, 10, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_FAT_MAN, 0, 0, 6, 10, 0, 1, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0, 0, 0 +BattleFrontier_BattleFactoryLobby_EventObjects: @ 853C9D8 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 3, 11, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 14, 11, 0, 8, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 0, 13, 11, 0, 10, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 6, 10, 0, 1, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0, 0, 0 BattleFrontier_BattleFactoryLobby_MapWarps: @ 853CA68 warp_def 9, 11, 0, 2, BATTLE_FRONTIER_OUTSIDE_WEST @@ -16,5 +16,5 @@ BattleFrontier_BattleFactoryLobby_MapBGEvents: @ 853CA78 bg_event 9, 4, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258839 BattleFrontier_BattleFactoryLobby_MapEvents:: @ 853CA9C - map_events BattleFrontier_BattleFactoryLobby_MapObjects, BattleFrontier_BattleFactoryLobby_MapWarps, 0x0, BattleFrontier_BattleFactoryLobby_MapBGEvents + map_events BattleFrontier_BattleFactoryLobby_EventObjects, BattleFrontier_BattleFactoryLobby_MapWarps, 0x0, BattleFrontier_BattleFactoryLobby_MapBGEvents diff --git a/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc index de03d5945d..e1a0529fdc 100644 --- a/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattleFactoryPreBattleRoom_MapObjects: @ 853CAB0 - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 12, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattleFactoryPreBattleRoom_EventObjects: @ 853CAB0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 12, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleFactoryPreBattleRoom_MapEvents:: @ 853CAC8 - map_events BattleFrontier_BattleFactoryPreBattleRoom_MapObjects, 0x0, 0x0, 0x0 + map_events BattleFrontier_BattleFactoryPreBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc b/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc index 1314bbb407..b5fc138383 100644 --- a/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc @@ -1,14 +1,14 @@ -BattleFrontier_BattlePalaceBattleRoom_MapObjects: @ 853C4FC - object_event 1, MAP_OBJ_GFX_TRADER, 0, 0, 1, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 1, 4, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_DUSCLOPS, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_AZURILL, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC + object_event 1, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 1, 4, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattlePalaceBattleRoom_MapWarps: @ 853C574 warp_def 0, 9, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR warp_def 1, 9, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR BattleFrontier_BattlePalaceBattleRoom_MapEvents:: @ 853C584 - map_events BattleFrontier_BattlePalaceBattleRoom_MapObjects, BattleFrontier_BattlePalaceBattleRoom_MapWarps, 0x0, 0x0 + map_events BattleFrontier_BattlePalaceBattleRoom_EventObjects, BattleFrontier_BattlePalaceBattleRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc b/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc index dc86a54b8d..2b6f7f251b 100644 --- a/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc +++ b/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc @@ -1,11 +1,11 @@ -BattleFrontier_BattlePalaceCorridor_MapObjects: @ 853C420 - object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 8, 12, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_AZURILL, 0, 0, 3, 5, 0, 2, 1, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_KIRLIA, 0, 0, 12, 6, 0, 14, 32, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_PIKACHU, 0, 0, 15, 5, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 4, 9, 0, 14, 32, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_AZUMARILL, 0, 0, 13, 9, 0, 1, 16, 0, 0, 0, 0x0, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_WINGULL, 0, 0, 3, 10, 0, 2, 33, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattlePalaceCorridor_EventObjects: @ 853C420 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 8, 12, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 0, 3, 5, 0, 2, 1, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_KIRLIA, 0, 0, 12, 6, 0, 14, 32, 0, 0, 0, 0x0, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_PIKACHU, 0, 0, 15, 5, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 4, 9, 0, 14, 32, 0, 0, 0, 0x0, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 13, 9, 0, 1, 16, 0, 0, 0, 0x0, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 0, 3, 10, 0, 2, 33, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattlePalaceCorridor_MapWarps: @ 853C4C8 warp_def 8, 13, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_LOBBY @@ -14,5 +14,5 @@ BattleFrontier_BattlePalaceCorridor_MapWarps: @ 853C4C8 warp_def 10, 3, 3, 0, BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM BattleFrontier_BattlePalaceCorridor_MapEvents:: @ 853C4E8 - map_events BattleFrontier_BattlePalaceCorridor_MapObjects, BattleFrontier_BattlePalaceCorridor_MapWarps, 0x0, 0x0 + map_events BattleFrontier_BattlePalaceCorridor_EventObjects, BattleFrontier_BattlePalaceCorridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePalaceLobby.inc b/data/maps/events/BattleFrontier_BattlePalaceLobby.inc index 890d545aeb..318ac3c49b 100644 --- a/data/maps/events/BattleFrontier_BattlePalaceLobby.inc +++ b/data/maps/events/BattleFrontier_BattlePalaceLobby.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePalaceLobby_MapObjects: @ 853C340 - object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 6, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 11, 8, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MANIAC, 0, 0, 24, 5, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_4, 0, 0, 18, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BEAUTY, 0, 0, 2, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 19, 6, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0, 0, 0 +BattleFrontier_BattlePalaceLobby_EventObjects: @ 853C340 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 6, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 11, 8, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 0, 24, 5, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 18, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 0, 2, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 19, 6, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0, 0, 0 BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0 warp_def 12, 11, 0, 2, BATTLE_FRONTIER_OUTSIDE_EAST @@ -17,5 +17,5 @@ BattleFrontier_BattlePalaceLobby_MapBGEvents: @ 853C3E8 bg_event 10, 4, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DCA6 BattleFrontier_BattlePalaceLobby_MapEvents:: @ 853C40C - map_events BattleFrontier_BattlePalaceLobby_MapObjects, BattleFrontier_BattlePalaceLobby_MapWarps, 0x0, BattleFrontier_BattlePalaceLobby_MapBGEvents + map_events BattleFrontier_BattlePalaceLobby_EventObjects, BattleFrontier_BattlePalaceLobby_MapWarps, 0x0, BattleFrontier_BattlePalaceLobby_MapBGEvents diff --git a/data/maps/events/BattleFrontier_BattlePikeCorridor.inc b/data/maps/events/BattleFrontier_BattlePikeCorridor.inc index 2e6b8ecc7d..1960c0d63d 100644 --- a/data/maps/events/BattleFrontier_BattlePikeCorridor.inc +++ b/data/maps/events/BattleFrontier_BattlePikeCorridor.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattlePikeCorridor_MapObjects: @ 853CC54 - object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 6, 6, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattlePikeCorridor_EventObjects: @ 853CC54 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 6, 6, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattlePikeCorridor_MapEvents:: @ 853CC6C - map_events BattleFrontier_BattlePikeCorridor_MapObjects, 0x0, 0x0, 0x0 + map_events BattleFrontier_BattlePikeCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePikeLobby.inc b/data/maps/events/BattleFrontier_BattlePikeLobby.inc index 4580d03584..6def285280 100644 --- a/data/maps/events/BattleFrontier_BattlePikeLobby.inc +++ b/data/maps/events/BattleFrontier_BattlePikeLobby.inc @@ -1,8 +1,8 @@ -BattleFrontier_BattlePikeLobby_MapObjects: @ 853CBB0 - object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 5, 5, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_HIKER, 0, 0, 10, 9, 3, 7, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 0, 5, 3, 9, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 0, 8, 9, 3, 2, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0, 0, 0 +BattleFrontier_BattlePikeLobby_EventObjects: @ 853CBB0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 5, 5, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 10, 9, 3, 7, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 0, 5, 3, 9, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 0, 8, 9, 3, 2, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0, 0, 0 BattleFrontier_BattlePikeLobby_MapWarps: @ 853CC10 warp_def 5, 12, 0, 0, BATTLE_FRONTIER_OUTSIDE_WEST @@ -14,5 +14,5 @@ BattleFrontier_BattlePikeLobby_MapBGEvents: @ 853CC28 bg_event 1, 3, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAC6 BattleFrontier_BattlePikeLobby_MapEvents:: @ 853CC40 - map_events BattleFrontier_BattlePikeLobby_MapObjects, BattleFrontier_BattlePikeLobby_MapWarps, 0x0, BattleFrontier_BattlePikeLobby_MapBGEvents + map_events BattleFrontier_BattlePikeLobby_EventObjects, BattleFrontier_BattlePikeLobby_MapWarps, 0x0, BattleFrontier_BattlePikeLobby_MapBGEvents diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc b/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc index c7c3a36d09..03e0a15e41 100644 --- a/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc +++ b/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattlePikeRandomRoom1_MapObjects: @ 853CD54 - object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 4, 4, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TRADER, 0, 0, 3, 4, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0, 0, 0 +BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 853CD54 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 4, 4, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TRADER, 0, 0, 3, 4, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0, 0, 0 BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84 coord_event 4, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2 @@ -12,5 +12,5 @@ BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84 coord_event 5, 7, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D BattleFrontier_BattlePikeRandomRoom1_MapEvents:: @ 853CDF4 - map_events BattleFrontier_BattlePikeRandomRoom1_MapObjects, 0x0, BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents, 0x0 + map_events BattleFrontier_BattlePikeRandomRoom1_EventObjects, 0x0, BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc b/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc index 0788826172..69c2136065 100644 --- a/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc +++ b/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattlePikeRandomRoom2_MapObjects: @ 853CE08 - object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 2, 4, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattlePikeRandomRoom2_EventObjects: @ 853CE08 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 2, 4, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattlePikeRandomRoom2_MapEvents:: @ 853CE20 - map_events BattleFrontier_BattlePikeRandomRoom2_MapObjects, 0x0, 0x0, 0x0 + map_events BattleFrontier_BattlePikeRandomRoom2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc b/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc index 7894ab85a1..f2bca38c16 100644 --- a/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc +++ b/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattlePikeThreePathRoom_MapObjects: @ 853CC80 - object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 4, 10, 3, 10, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_6, 0, 0, 8, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0, 0, 0 +BattleFrontier_BattlePikeThreePathRoom_EventObjects: @ 853CC80 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 4, 10, 3, 10, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 8, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0, 0, 0 BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0 coord_event 2, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E @@ -14,5 +14,5 @@ BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0 coord_event 7, 10, 0, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D BattleFrontier_BattlePikeThreePathRoom_MapEvents:: @ 853CD40 - map_events BattleFrontier_BattlePikeThreePathRoom_MapObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0 + map_events BattleFrontier_BattlePikeThreePathRoom_EventObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc b/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc index 5e5a23fa4a..63e7f2acd8 100644 --- a/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc +++ b/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc @@ -1,13 +1,13 @@ -BattleFrontier_BattlePointExchangeServiceCorner_MapObjects: @ 853D018 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 4, 4, 0, 9, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_4, 0, 0, 0, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SAILOR, 0, 0, 14, 6, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_6, 0, 0, 1, 9, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_TEALA, 0, 0, 5, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_TEALA, 0, 0, 9, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_TEALA, 0, 0, 10, 4, 0, 10, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_GIRL_1, 0, 0, 12, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0, 0, 0 +BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: @ 853D018 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 4, 4, 0, 9, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 0, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 0, 14, 6, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 0, 1, 9, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_TEALA, 0, 0, 9, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 4, 0, 10, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 0, 12, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0, 0, 0 BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: @ 853D0F0 warp_def 7, 10, 0, 6, BATTLE_FRONTIER_OUTSIDE_EAST @@ -15,5 +15,5 @@ BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: @ 853D0F0 warp_def 8, 10, 0, 6, BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_BattlePointExchangeServiceCorner_MapEvents:: @ 853D108 - map_events BattleFrontier_BattlePointExchangeServiceCorner_MapObjects, BattleFrontier_BattlePointExchangeServiceCorner_MapWarps, 0x0, 0x0 + map_events BattleFrontier_BattlePointExchangeServiceCorner_EventObjects, BattleFrontier_BattlePointExchangeServiceCorner_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc b/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc index aba4f907de..7d531b54bc 100644 --- a/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc +++ b/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc @@ -1,21 +1,21 @@ -BattleFrontier_BattlePyramidEmptySquare_MapObjects: @ 853C62C - object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 0, 0, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 0, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 0, 1, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 1, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 3, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 4, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattlePyramidEmptySquare_EventObjects: @ 853C62C + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 0, 0, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 0, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 0, 1, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 1, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 3, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 4, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattlePyramidEmptySquare_MapEvents:: @ 853C7AC - map_events BattleFrontier_BattlePyramidEmptySquare_MapObjects, 0x0, 0x0, 0x0 + map_events BattleFrontier_BattlePyramidEmptySquare_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePyramidLobby.inc b/data/maps/events/BattleFrontier_BattlePyramidLobby.inc index eb56352ed9..fccb4abff9 100644 --- a/data/maps/events/BattleFrontier_BattlePyramidLobby.inc +++ b/data/maps/events/BattleFrontier_BattlePyramidLobby.inc @@ -1,8 +1,8 @@ -BattleFrontier_BattlePyramidLobby_MapObjects: @ 853C598 - object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 7, 12, 4, 8, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 14, 13, 4, 9, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 0, 2, 15, 4, 2, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_FAT_MAN, 0, 0, 12, 16, 4, 2, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0, 0, 0 +BattleFrontier_BattlePyramidLobby_EventObjects: @ 853C598 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 7, 12, 4, 8, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 14, 13, 4, 9, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 2, 15, 4, 2, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 12, 16, 4, 2, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0, 0, 0 BattleFrontier_BattlePyramidLobby_MapWarps: @ 853C5F8 warp_def 7, 17, 4, 3, BATTLE_FRONTIER_OUTSIDE_EAST @@ -12,5 +12,5 @@ BattleFrontier_BattlePyramidLobby_MapBGEvents: @ 853C600 bg_event 1, 12, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E95 BattleFrontier_BattlePyramidLobby_MapEvents:: @ 853C618 - map_events BattleFrontier_BattlePyramidLobby_MapObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_MapBGEvents + map_events BattleFrontier_BattlePyramidLobby_EventObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_MapBGEvents diff --git a/data/maps/events/BattleFrontier_BattlePyramidTop.inc b/data/maps/events/BattleFrontier_BattlePyramidTop.inc index 79e4770ea2..a6ca1adea6 100644 --- a/data/maps/events/BattleFrontier_BattlePyramidTop.inc +++ b/data/maps/events/BattleFrontier_BattlePyramidTop.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePyramidTop_MapObjects: @ 853C7C0 - object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 17, 11, 6, 8, 17, 0, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BRANDON, 0, 0, 17, 7, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattlePyramidTop_EventObjects: @ 853C7C0 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 17, 11, 6, 8, 17, 0, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 0, 17, 7, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattlePyramidTop_MapCoordEvents: @ 853C7F0 coord_event 17, 9, 4, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePyramidTop_EventScript_255256 BattleFrontier_BattlePyramidTop_MapEvents:: @ 853C800 - map_events BattleFrontier_BattlePyramidTop_MapObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0 + map_events BattleFrontier_BattlePyramidTop_EventObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc b/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc index c9b46f8ca4..af96775243 100644 --- a/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc @@ -1,12 +1,12 @@ -BattleFrontier_BattleTowerBattleRoom_MapObjects: @ 853B7D0 - object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleTowerBattleRoom_MapWarps: @ 853B818 warp_def 5, 8, 0, 2, BATTLE_FRONTIER_BATTLE_TOWER_LOBBY warp_def 6, 8, 0, 2, BATTLE_FRONTIER_BATTLE_TOWER_LOBBY BattleFrontier_BattleTowerBattleRoom_MapEvents:: @ 853B828 - map_events BattleFrontier_BattleTowerBattleRoom_MapObjects, BattleFrontier_BattleTowerBattleRoom_MapWarps, 0x0, 0x0 + map_events BattleFrontier_BattleTowerBattleRoom_EventObjects, BattleFrontier_BattleTowerBattleRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc b/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc index afab09840a..2d8dcaa07c 100644 --- a/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc +++ b/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc @@ -1,11 +1,11 @@ -BattleFrontier_BattleTowerBattleRoom2_MapObjects: @ 853BFC4 - object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 1, 4, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 1, 5, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_TRADER, 0, 0, 4, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0 +BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 4, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 5, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_TRADER, 0, 0, 4, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0 object_event 5, 255, 0, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 object_event 6, 254, 0, 0, 5, 8, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleTowerBattleRoom2_MapEvents:: @ 853C054 - map_events BattleFrontier_BattleTowerBattleRoom2_MapObjects, 0x0, 0x0, 0x0 + map_events BattleFrontier_BattleTowerBattleRoom2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleTowerCorridor.inc b/data/maps/events/BattleFrontier_BattleTowerCorridor.inc index 75d51fb28e..a363801f0c 100644 --- a/data/maps/events/BattleFrontier_BattleTowerCorridor.inc +++ b/data/maps/events/BattleFrontier_BattleTowerCorridor.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattleTowerCorridor_MapObjects: @ 853B7A4 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 9, 2, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattleTowerCorridor_EventObjects: @ 853B7A4 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 9, 2, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleTowerCorridor_MapEvents:: @ 853B7BC - map_events BattleFrontier_BattleTowerCorridor_MapObjects, 0x0, 0x0, 0x0 + map_events BattleFrontier_BattleTowerCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc b/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc index 083b877abc..c2f1e30bfc 100644 --- a/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc +++ b/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc @@ -1,9 +1,9 @@ -BattleFrontier_BattleTowerCorridor2_MapObjects: @ 853BF50 +BattleFrontier_BattleTowerCorridor2_EventObjects: @ 853BF50 object_event 1, 255, 0, 0, 1, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 14, 3, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 1, 3, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 14, 3, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 3, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 object_event 4, 254, 0, 0, 14, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleTowerCorridor2_MapEvents:: @ 853BFB0 - map_events BattleFrontier_BattleTowerCorridor2_MapObjects, 0x0, 0x0, 0x0 + map_events BattleFrontier_BattleTowerCorridor2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleTowerElevator.inc b/data/maps/events/BattleFrontier_BattleTowerElevator.inc index 4f2a32d896..a4dbc6afab 100644 --- a/data/maps/events/BattleFrontier_BattleTowerElevator.inc +++ b/data/maps/events/BattleFrontier_BattleTowerElevator.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattleTowerElevator_MapObjects: @ 853B778 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 1, 5, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattleTowerElevator_EventObjects: @ 853B778 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 5, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleTowerElevator_MapEvents:: @ 853B790 - map_events BattleFrontier_BattleTowerElevator_MapObjects, 0x0, 0x0, 0x0 + map_events BattleFrontier_BattleTowerElevator_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleTowerLobby.inc b/data/maps/events/BattleFrontier_BattleTowerLobby.inc index 35f6e6bcaa..2faa6a413f 100644 --- a/data/maps/events/BattleFrontier_BattleTowerLobby.inc +++ b/data/maps/events/BattleFrontier_BattleTowerLobby.inc @@ -1,13 +1,13 @@ -BattleFrontier_BattleTowerLobby_MapObjects: @ 853B638 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_5, 0, 0, 23, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 17, 8, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_1, 0, 0, 15, 9, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 0, 11, 9, 3, 10, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, 918, 0, 0 - object_event 6, MAP_OBJ_GFX_HIPSTER, 0, 0, 1, 5, 3, 8, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_2B688D, 701, 0, 0 - object_event 7, MAP_OBJ_GFX_TEALA, 0, 0, 10, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_TEALA, 0, 0, 14, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_TEALA, 0, 0, 18, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0, 0, 0 +BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 23, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 17, 8, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 0, 15, 9, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 11, 9, 3, 10, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, 918, 0, 0 + object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 0, 1, 5, 3, 8, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_2B688D, 701, 0, 0 + object_event 7, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_TEALA, 0, 0, 14, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_TEALA, 0, 0, 18, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0, 0, 0 BattleFrontier_BattleTowerLobby_MapWarps: @ 853B710 warp_def 12, 9, 3, 0, BATTLE_FRONTIER_OUTSIDE_EAST @@ -22,5 +22,5 @@ BattleFrontier_BattleTowerLobby_MapBGEvents: @ 853B728 bg_event 2, 1, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23F4BE BattleFrontier_BattleTowerLobby_MapEvents:: @ 853B764 - map_events BattleFrontier_BattleTowerLobby_MapObjects, BattleFrontier_BattleTowerLobby_MapWarps, 0x0, BattleFrontier_BattleTowerLobby_MapBGEvents + map_events BattleFrontier_BattleTowerLobby_EventObjects, BattleFrontier_BattleTowerLobby_MapWarps, 0x0, BattleFrontier_BattleTowerLobby_MapBGEvents diff --git a/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc index 0292088de8..3d2bb61279 100644 --- a/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc @@ -1,14 +1,14 @@ -BattleFrontier_BattleTowerMultiBattleRoom_MapObjects: @ 853BE64 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 11, 2, 3, 8, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 2, 10, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, 711, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 17, 11, 3, 14, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, 712, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 6, 9, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, 713, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 8, 13, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, 714, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 10, 11, 3, 7, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, 715, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 13, 10, 3, 10, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, 716, 0, 0 +BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 853BE64 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 2, 3, 8, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 2, 10, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, 711, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 17, 11, 3, 14, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, 712, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 6, 9, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, 713, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 8, 13, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, 714, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 10, 11, 3, 7, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, 715, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 13, 10, 3, 10, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, 716, 0, 0 object_event 8, 246, 0, 0, 15, 13, 3, 15, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, 864, 0, 0 object_event 9, 247, 0, 0, 4, 12, 3, 10, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, 865, 0, 0 BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: @ 853BF3C - map_events BattleFrontier_BattleTowerMultiBattleRoom_MapObjects, 0x0, 0x0, 0x0 + map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge1.inc b/data/maps/events/BattleFrontier_Lounge1.inc index 748d86b6c6..b00838290d 100644 --- a/data/maps/events/BattleFrontier_Lounge1.inc +++ b/data/maps/events/BattleFrontier_Lounge1.inc @@ -1,11 +1,11 @@ -BattleFrontier_Lounge1_MapObjects: @ 853CFB4 - object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 0, 6, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_3, 0, 0, 7, 6, 0, 2, 33, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_2, 0, 0, 5, 4, 0, 2, 18, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0, 0, 0 +BattleFrontier_Lounge1_EventObjects: @ 853CFB4 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 0, 6, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 0, 7, 6, 0, 2, 33, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 0, 5, 4, 0, 2, 18, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0, 0, 0 BattleFrontier_Lounge1_MapWarps: @ 853CFFC warp_def 4, 9, 0, 5, BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_Lounge1_MapEvents:: @ 853D004 - map_events BattleFrontier_Lounge1_MapObjects, BattleFrontier_Lounge1_MapWarps, 0x0, 0x0 + map_events BattleFrontier_Lounge1_EventObjects, BattleFrontier_Lounge1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge2.inc b/data/maps/events/BattleFrontier_Lounge2.inc index c31e86ab6d..0370b2a18d 100644 --- a/data/maps/events/BattleFrontier_Lounge2.inc +++ b/data/maps/events/BattleFrontier_Lounge2.inc @@ -1,14 +1,14 @@ -BattleFrontier_Lounge2_MapObjects: @ 853D11C - object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 8, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MANIAC, 0, 0, 10, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MANIAC, 0, 0, 10, 3, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 4, 6, 0, 2, 33, 0, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MANIAC, 0, 0, 10, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0, 0, 0 +BattleFrontier_Lounge2_EventObjects: @ 853D11C + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MANIAC, 0, 0, 10, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 0, 10, 3, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 4, 6, 0, 2, 33, 0, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 0, 10, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0, 0, 0 BattleFrontier_Lounge2_MapWarps: @ 853D194 warp_def 1, 7, 0, 3, BATTLE_FRONTIER_OUTSIDE_WEST warp_def 2, 7, 0, 3, BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_Lounge2_MapEvents:: @ 853D1A4 - map_events BattleFrontier_Lounge2_MapObjects, BattleFrontier_Lounge2_MapWarps, 0x0, 0x0 + map_events BattleFrontier_Lounge2_EventObjects, BattleFrontier_Lounge2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge3.inc b/data/maps/events/BattleFrontier_Lounge3.inc index 0655cea909..6349cd3812 100644 --- a/data/maps/events/BattleFrontier_Lounge3.inc +++ b/data/maps/events/BattleFrontier_Lounge3.inc @@ -1,13 +1,13 @@ -BattleFrontier_Lounge3_MapObjects: @ 853D1B8 - object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 4, 6, 0, 7, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 4, 4, 0, 8, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_3, 0, 0, 3, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 5, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_4, 0, 0, 0, 6, 0, 2, 48, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0, 0, 0 +BattleFrontier_Lounge3_EventObjects: @ 853D1B8 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 4, 6, 0, 7, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 4, 0, 8, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 0, 6, 0, 2, 48, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0, 0, 0 BattleFrontier_Lounge3_MapWarps: @ 853D230 warp_def 4, 9, 0, 9, BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_Lounge3_MapEvents:: @ 853D238 - map_events BattleFrontier_Lounge3_MapObjects, BattleFrontier_Lounge3_MapWarps, 0x0, 0x0 + map_events BattleFrontier_Lounge3_EventObjects, BattleFrontier_Lounge3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge4.inc b/data/maps/events/BattleFrontier_Lounge4.inc index ae4e7c4b70..2076faceea 100644 --- a/data/maps/events/BattleFrontier_Lounge4.inc +++ b/data/maps/events/BattleFrontier_Lounge4.inc @@ -1,11 +1,11 @@ -BattleFrontier_Lounge4_MapObjects: @ 853D24C - object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 0, 4, 4, 0, 7, 17, 0, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_COOK, 0, 0, 6, 6, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 0, 5, 0, 10, 18, 0, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0, 0, 0 +BattleFrontier_Lounge4_EventObjects: @ 853D24C + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 4, 4, 0, 7, 17, 0, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_COOK, 0, 0, 6, 6, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 0, 5, 0, 10, 18, 0, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0, 0, 0 BattleFrontier_Lounge4_MapWarps: @ 853D294 warp_def 4, 9, 0, 6, BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_Lounge4_MapEvents:: @ 853D29C - map_events BattleFrontier_Lounge4_MapObjects, BattleFrontier_Lounge4_MapWarps, 0x0, 0x0 + map_events BattleFrontier_Lounge4_EventObjects, BattleFrontier_Lounge4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge5.inc b/data/maps/events/BattleFrontier_Lounge5.inc index cc8759d1d1..a8e5f97f55 100644 --- a/data/maps/events/BattleFrontier_Lounge5.inc +++ b/data/maps/events/BattleFrontier_Lounge5.inc @@ -1,13 +1,13 @@ -BattleFrontier_Lounge5_MapObjects: @ 853D2EC - object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 12, 4, 4, 9, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 0, 4, 3, 10, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 6, 5, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 11, 7, 0, 1, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0, 0, 0 +BattleFrontier_Lounge5_EventObjects: @ 853D2EC + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 12, 4, 4, 9, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 0, 4, 3, 10, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 6, 5, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 11, 7, 0, 1, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0, 0, 0 BattleFrontier_Lounge5_MapWarps: @ 853D34C warp_def 1, 7, 0, 7, BATTLE_FRONTIER_OUTSIDE_EAST warp_def 2, 7, 0, 7, BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_Lounge5_MapEvents:: @ 853D35C - map_events BattleFrontier_Lounge5_MapObjects, BattleFrontier_Lounge5_MapWarps, 0x0, 0x0 + map_events BattleFrontier_Lounge5_EventObjects, BattleFrontier_Lounge5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge6.inc b/data/maps/events/BattleFrontier_Lounge6.inc index b2aa2b93fd..be0db4f080 100644 --- a/data/maps/events/BattleFrontier_Lounge6.inc +++ b/data/maps/events/BattleFrontier_Lounge6.inc @@ -1,9 +1,9 @@ -BattleFrontier_Lounge6_MapObjects: @ 853D370 - object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 2, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0, 0, 0 +BattleFrontier_Lounge6_EventObjects: @ 853D370 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 2, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0, 0, 0 BattleFrontier_Lounge6_MapWarps: @ 853D388 warp_def 4, 9, 0, 8, BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_Lounge6_MapEvents:: @ 853D390 - map_events BattleFrontier_Lounge6_MapObjects, BattleFrontier_Lounge6_MapWarps, 0x0, 0x0 + map_events BattleFrontier_Lounge6_EventObjects, BattleFrontier_Lounge6_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge7.inc b/data/maps/events/BattleFrontier_Lounge7.inc index 43cb50ddfe..b4e6cc5ebc 100644 --- a/data/maps/events/BattleFrontier_Lounge7.inc +++ b/data/maps/events/BattleFrontier_Lounge7.inc @@ -1,12 +1,12 @@ -BattleFrontier_Lounge7_MapObjects: @ 853D3A4 - object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 0, 7, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 2, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 6, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 8, 3, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0, 0, 0 +BattleFrontier_Lounge7_EventObjects: @ 853D3A4 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 0, 7, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 2, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 6, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 8, 3, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0, 0, 0 BattleFrontier_Lounge7_MapWarps: @ 853D404 warp_def 4, 9, 0, 7, BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_Lounge7_MapEvents:: @ 853D40C - map_events BattleFrontier_Lounge7_MapObjects, BattleFrontier_Lounge7_MapWarps, 0x0, 0x0 + map_events BattleFrontier_Lounge7_EventObjects, BattleFrontier_Lounge7_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge8.inc b/data/maps/events/BattleFrontier_Lounge8.inc index 0420a702f5..99aa3333ca 100644 --- a/data/maps/events/BattleFrontier_Lounge8.inc +++ b/data/maps/events/BattleFrontier_Lounge8.inc @@ -1,11 +1,11 @@ -BattleFrontier_Lounge8_MapObjects: @ 853D4BC - object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 4, 5, 0, 2, 34, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 8, 7, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0, 0, 0 +BattleFrontier_Lounge8_EventObjects: @ 853D4BC + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 4, 5, 0, 2, 34, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 8, 7, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0, 0, 0 BattleFrontier_Lounge8_MapWarps: @ 853D504 warp_def 4, 9, 0, 10, BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_Lounge8_MapEvents:: @ 853D50C - map_events BattleFrontier_Lounge8_MapObjects, BattleFrontier_Lounge8_MapWarps, 0x0, 0x0 + map_events BattleFrontier_Lounge8_EventObjects, BattleFrontier_Lounge8_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge9.inc b/data/maps/events/BattleFrontier_Lounge9.inc index ff96fc94fe..7c478fabec 100644 --- a/data/maps/events/BattleFrontier_Lounge9.inc +++ b/data/maps/events/BattleFrontier_Lounge9.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge9_MapObjects: @ 853D520 - object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 0, 6, 3, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_Lounge9_EventObjects: @ 853D520 + object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 0, 6, 3, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_Lounge9_MapWarps: @ 853D538 warp_def 1, 9, 0, 11, BATTLE_FRONTIER_OUTSIDE_EAST warp_def 2, 9, 0, 11, BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_Lounge9_MapEvents:: @ 853D548 - map_events BattleFrontier_Lounge9_MapObjects, BattleFrontier_Lounge9_MapWarps, 0x0, 0x0 + map_events BattleFrontier_Lounge9_EventObjects, BattleFrontier_Lounge9_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Mart.inc b/data/maps/events/BattleFrontier_Mart.inc index 5ce69f2ee6..969b548559 100644 --- a/data/maps/events/BattleFrontier_Mart.inc +++ b/data/maps/events/BattleFrontier_Mart.inc @@ -1,13 +1,13 @@ -BattleFrontier_Mart_MapObjects: @ 853D68C - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 8, 4, 3, 9, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0, 0, 0 +BattleFrontier_Mart_EventObjects: @ 853D68C + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 8, 4, 3, 9, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0, 0, 0 BattleFrontier_Mart_MapWarps: @ 853D6EC warp_def 3, 7, 0, 4, BATTLE_FRONTIER_OUTSIDE_WEST warp_def 4, 7, 0, 4, BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_Mart_MapEvents:: @ 853D6FC - map_events BattleFrontier_Mart_MapObjects, BattleFrontier_Mart_MapWarps, 0x0, 0x0 + map_events BattleFrontier_Mart_EventObjects, BattleFrontier_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_OutsideEast.inc b/data/maps/events/BattleFrontier_OutsideEast.inc index a99a7fcf0c..3d7c53493d 100644 --- a/data/maps/events/BattleFrontier_OutsideEast.inc +++ b/data/maps/events/BattleFrontier_OutsideEast.inc @@ -1,30 +1,30 @@ -BattleFrontier_OutsideEast_MapObjects: @ 853BB10 - object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 20, 17, 0, 27, 19, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 42, 15, 0, 2, 49, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_HIKER, 0, 0, 53, 6, 0, 8, 2, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 54, 16, 0, 2, 18, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C82, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 37, 32, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C8B, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_COOK, 0, 0, 41, 56, 3, 9, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C94, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 46, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CBB, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 34, 41, 0, 28, 19, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CE1, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BOY_4, 0, 0, 45, 47, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CB2, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 59, 35, 0, 26, 97, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CC4, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 18, 40, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_MAN_1, 0, 0, 17, 40, 0, 10, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 40, 56, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_SUDOWOODO, 0, 0, 54, 62, 3, 8, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, 842, 0, 0 - object_event 15, MAP_OBJ_GFX_MANIAC, 0, 0, 42, 34, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_GIRL_3, 0, 0, 51, 53, 3, 2, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 62, 18, 0, 46, 98, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_MAN_4, 0, 0, 11, 21, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_WOMAN_7, 0, 0, 10, 21, 0, 10, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_WOMAN_7, 0, 0, 16, 30, 0, 2, 35, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DA6, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 33, 14, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DAF, 0, 0, 0 - object_event 22, MAP_OBJ_GFX_MANIAC, 0, 0, 54, 31, 0, 9, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DB8, 0, 0, 0 - object_event 23, MAP_OBJ_GFX_WOMAN_5, 0, 0, 54, 32, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DC3, 0, 0, 0 - object_event 24, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 58, 55, 3, 17, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE9, 0, 0, 0 - object_event 25, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 48, 41, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0, 0, 0 - object_event 26, MAP_OBJ_GFX_CAMPER, 0, 0, 29, 14, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0, 0, 0 +BattleFrontier_OutsideEast_EventObjects: @ 853BB10 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 20, 17, 0, 27, 19, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 42, 15, 0, 2, 49, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_HIKER, 0, 0, 53, 6, 0, 8, 2, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 54, 16, 0, 2, 18, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C82, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 37, 32, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C8B, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_COOK, 0, 0, 41, 56, 3, 9, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C94, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 46, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CBB, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 34, 41, 0, 28, 19, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CE1, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_BOY_4, 0, 0, 45, 47, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CB2, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 59, 35, 0, 26, 97, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CC4, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 18, 40, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_MAN_1, 0, 0, 17, 40, 0, 10, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 40, 56, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_SUDOWOODO, 0, 0, 54, 62, 3, 8, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, 842, 0, 0 + object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 0, 42, 34, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_GIRL_3, 0, 0, 51, 53, 3, 2, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 62, 18, 0, 46, 98, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_MAN_4, 0, 0, 11, 21, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 10, 21, 0, 10, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 0, 0, 0 + object_event 20, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 16, 30, 0, 2, 35, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DA6, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 33, 14, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DAF, 0, 0, 0 + object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 0, 54, 31, 0, 9, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DB8, 0, 0, 0 + object_event 23, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 54, 32, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DC3, 0, 0, 0 + object_event 24, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 58, 55, 3, 17, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE9, 0, 0, 0 + object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 48, 41, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0, 0, 0 + object_event 26, EVENT_OBJ_GFX_CAMPER, 0, 0, 29, 14, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0, 0, 0 BattleFrontier_OutsideEast_MapWarps: @ 853BD80 warp_def 16, 14, 0, 0, BATTLE_FRONTIER_BATTLE_TOWER_LOBBY @@ -53,5 +53,5 @@ BattleFrontier_OutsideEast_MapBGEvents: @ 853BDF0 bg_event 5, 51, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_271E73 BattleFrontier_OutsideEast_MapEvents:: @ 853BE50 - map_events BattleFrontier_OutsideEast_MapObjects, BattleFrontier_OutsideEast_MapWarps, 0x0, BattleFrontier_OutsideEast_MapBGEvents + map_events BattleFrontier_OutsideEast_EventObjects, BattleFrontier_OutsideEast_MapWarps, 0x0, BattleFrontier_OutsideEast_MapBGEvents diff --git a/data/maps/events/BattleFrontier_OutsideWest.inc b/data/maps/events/BattleFrontier_OutsideWest.inc index e6f2eef7d3..7923af813b 100644 --- a/data/maps/events/BattleFrontier_OutsideWest.inc +++ b/data/maps/events/BattleFrontier_OutsideWest.inc @@ -1,28 +1,28 @@ -BattleFrontier_OutsideWest_MapObjects: @ 853B350 - object_event 1, MAP_OBJ_GFX_BOY_2, 0, 0, 26, 38, 0, 2, 34, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 20, 70, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BEAUTY, 0, 0, 19, 68, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 26, 20, 0, 5, 8, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D68B, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_4, 0, 0, 27, 30, 0, 2, 49, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_WOMAN_7, 0, 0, 33, 41, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_FAT_MAN, 0, 0, 28, 43, 0, 3, 48, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 17, 20, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_MANIAC, 0, 0, 13, 44, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_MANIAC, 0, 0, 14, 44, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_MAN_6, 0, 0, 23, 47, 0, 15, 34, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_GIRL_1, 0, 0, 38, 27, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_WOMAN_4, 0, 0, 45, 18, 0, 3, 49, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_CAMPER, 0, 0, 9, 47, 0, 15, 33, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_LASS, 0, 0, 35, 5, 0, 2, 18, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_MAN_2, 0, 0, 11, 66, 0, 9, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_FISHERMAN, 0, 0, 31, 31, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_FISHERMAN, 0, 0, 42, 48, 0, 18, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_FAT_MAN, 0, 0, 38, 22, 0, 3, 48, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_WOMAN_3, 0, 0, 12, 9, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_BOY_1, 0, 0, 12, 10, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 0, 0, 0 - object_event 22, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 11, 10, 0, 23, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0, 0, 0 - object_event 23, MAP_OBJ_GFX_MAN_5, 0, 0, 8, 5, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0, 0, 0 - object_event 24, MAP_OBJ_GFX_WOMAN_2, 0, 0, 4, 26, 0, 24, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0, 0, 0 +BattleFrontier_OutsideWest_EventObjects: @ 853B350 + object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 0, 26, 38, 0, 2, 34, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 20, 70, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 0, 19, 68, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 26, 20, 0, 5, 8, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D68B, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 27, 30, 0, 2, 49, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 33, 41, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 28, 43, 0, 3, 48, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 17, 20, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 0, 13, 44, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 0, 14, 44, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 0, 23, 47, 0, 15, 34, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 0, 38, 27, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 45, 18, 0, 3, 49, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 0, 9, 47, 0, 15, 33, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_LASS, 0, 0, 35, 5, 0, 2, 18, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_MAN_2, 0, 0, 11, 66, 0, 9, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 31, 31, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 42, 48, 0, 18, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 38, 22, 0, 3, 48, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 0, 0, 0 + object_event 20, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 12, 9, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_BOY_1, 0, 0, 12, 10, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 0, 0, 0 + object_event 22, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 11, 10, 0, 23, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0, 0, 0 + object_event 23, EVENT_OBJ_GFX_MAN_5, 0, 0, 8, 5, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0, 0, 0 + object_event 24, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 26, 0, 24, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0, 0, 0 BattleFrontier_OutsideWest_MapWarps: @ 853B590 warp_def 42, 27, 0, 0, BATTLE_FRONTIER_BATTLE_PIKE_LOBBY @@ -45,5 +45,5 @@ BattleFrontier_OutsideWest_MapBGEvents: @ 853B5E8 bg_event 53, 51, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_271E6A BattleFrontier_OutsideWest_MapEvents:: @ 853B624 - map_events BattleFrontier_OutsideWest_MapObjects, BattleFrontier_OutsideWest_MapWarps, 0x0, BattleFrontier_OutsideWest_MapBGEvents + map_events BattleFrontier_OutsideWest_EventObjects, BattleFrontier_OutsideWest_MapWarps, 0x0, BattleFrontier_OutsideWest_MapBGEvents diff --git a/data/maps/events/BattleFrontier_PokemonCenter_1F.inc b/data/maps/events/BattleFrontier_PokemonCenter_1F.inc index 0a89741358..262744ce1a 100644 --- a/data/maps/events/BattleFrontier_PokemonCenter_1F.inc +++ b/data/maps/events/BattleFrontier_PokemonCenter_1F.inc @@ -1,9 +1,9 @@ -BattleFrontier_PokemonCenter_1F_MapObjects: @ 853D55C - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 4, 5, 3, 14, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 11, 4, 3, 8, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 0, 2, 3, 3, 9, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_SKITTY, 0, 0, 1, 3, 3, 10, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0, 0, 0 +BattleFrontier_PokemonCenter_1F_EventObjects: @ 853D55C + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 4, 5, 3, 14, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 11, 4, 3, 8, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 0, 2, 3, 3, 9, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_SKITTY, 0, 0, 1, 3, 3, 10, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0, 0, 0 BattleFrontier_PokemonCenter_1F_MapWarps: @ 853D5D4 warp_def 7, 8, 3, 12, BATTLE_FRONTIER_OUTSIDE_EAST @@ -11,5 +11,5 @@ BattleFrontier_PokemonCenter_1F_MapWarps: @ 853D5D4 warp_def 1, 6, 4, 0, BATTLE_FRONTIER_POKEMON_CENTER_2F BattleFrontier_PokemonCenter_1F_MapEvents:: @ 853D5EC - map_events BattleFrontier_PokemonCenter_1F_MapObjects, BattleFrontier_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events BattleFrontier_PokemonCenter_1F_EventObjects, BattleFrontier_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_PokemonCenter_2F.inc b/data/maps/events/BattleFrontier_PokemonCenter_2F.inc index 44d40453f7..f9d9d408a9 100644 --- a/data/maps/events/BattleFrontier_PokemonCenter_2F.inc +++ b/data/maps/events/BattleFrontier_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -BattleFrontier_PokemonCenter_2F_MapObjects: @ 853D600 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +BattleFrontier_PokemonCenter_2F_EventObjects: @ 853D600 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660 warp_def 1, 6, 4, 2, BATTLE_FRONTIER_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660 warp_def 9, 1, 3, 0, TRADE_CENTER BattleFrontier_PokemonCenter_2F_MapEvents:: @ 853D678 - map_events BattleFrontier_PokemonCenter_2F_MapObjects, BattleFrontier_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events BattleFrontier_PokemonCenter_2F_EventObjects, BattleFrontier_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_RankingHall.inc b/data/maps/events/BattleFrontier_RankingHall.inc index 853f83ab75..81058b0429 100644 --- a/data/maps/events/BattleFrontier_RankingHall.inc +++ b/data/maps/events/BattleFrontier_RankingHall.inc @@ -1,7 +1,7 @@ -BattleFrontier_RankingHall_MapObjects: @ 853CEB8 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 24, 13, 3, 8, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 4, 10, 3, 2, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_3, 0, 0, 44, 11, 3, 2, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0, 0, 0 +BattleFrontier_RankingHall_EventObjects: @ 853CEB8 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 24, 13, 3, 8, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 4, 10, 3, 2, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 0, 44, 11, 3, 2, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0, 0, 0 BattleFrontier_RankingHall_MapWarps: @ 853CF00 warp_def 26, 14, 3, 4, BATTLE_FRONTIER_OUTSIDE_EAST @@ -22,5 +22,5 @@ BattleFrontier_RankingHall_MapBGEvents: @ 853CF10 bg_event 36, 8, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E541 BattleFrontier_RankingHall_MapEvents:: @ 853CFA0 - map_events BattleFrontier_RankingHall_MapObjects, BattleFrontier_RankingHall_MapWarps, 0x0, BattleFrontier_RankingHall_MapBGEvents + map_events BattleFrontier_RankingHall_EventObjects, BattleFrontier_RankingHall_MapWarps, 0x0, BattleFrontier_RankingHall_MapBGEvents diff --git a/data/maps/events/BattleFrontier_ReceptionGate.inc b/data/maps/events/BattleFrontier_ReceptionGate.inc index 6417232573..8984c44a02 100644 --- a/data/maps/events/BattleFrontier_ReceptionGate.inc +++ b/data/maps/events/BattleFrontier_ReceptionGate.inc @@ -1,14 +1,14 @@ -BattleFrontier_ReceptionGate_MapObjects: @ 853D420 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 0, 11, 0, 10, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 8, 11, 0, 9, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_2, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SCOTT, 0, 0, 4, 5, 3, 8, 17, 0, 0, 0, 0x0, 836, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_2, 0, 0, 0, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0, 0, 0 +BattleFrontier_ReceptionGate_EventObjects: @ 853D420 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 0, 11, 0, 10, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 8, 11, 0, 9, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_2, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 0, 4, 5, 3, 8, 17, 0, 0, 0, 0x0, 836, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 0, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0, 0, 0 BattleFrontier_ReceptionGate_MapWarps: @ 853D498 warp_def 4, 13, 0, 8, BATTLE_FRONTIER_OUTSIDE_WEST warp_def 4, 1, 0, 9, BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_ReceptionGate_MapEvents:: @ 853D4A8 - map_events BattleFrontier_ReceptionGate_MapObjects, BattleFrontier_ReceptionGate_MapWarps, 0x0, 0x0 + map_events BattleFrontier_ReceptionGate_EventObjects, BattleFrontier_ReceptionGate_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_ScottsHouse.inc b/data/maps/events/BattleFrontier_ScottsHouse.inc index fd9f2f522d..4ea329ab95 100644 --- a/data/maps/events/BattleFrontier_ScottsHouse.inc +++ b/data/maps/events/BattleFrontier_ScottsHouse.inc @@ -1,10 +1,10 @@ -BattleFrontier_ScottsHouse_MapObjects: @ 853D2B0 - object_event 1, MAP_OBJ_GFX_SCOTT, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, BattleFrontier_ScottsHouse_EventScript_2636A8, 0, 0, 0 +BattleFrontier_ScottsHouse_EventObjects: @ 853D2B0 + object_event 1, EVENT_OBJ_GFX_SCOTT, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, BattleFrontier_ScottsHouse_EventScript_2636A8, 0, 0, 0 BattleFrontier_ScottsHouse_MapWarps: @ 853D2C8 warp_def 2, 7, 3, 5, BATTLE_FRONTIER_OUTSIDE_WEST warp_def 3, 7, 3, 5, BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_ScottsHouse_MapEvents:: @ 853D2D8 - map_events BattleFrontier_ScottsHouse_MapObjects, BattleFrontier_ScottsHouse_MapWarps, 0x0, 0x0 + map_events BattleFrontier_ScottsHouse_EventObjects, BattleFrontier_ScottsHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare01.inc b/data/maps/events/BattlePyramidSquare01.inc index f3c2602432..0226b4fdba 100644 --- a/data/maps/events/BattlePyramidSquare01.inc +++ b/data/maps/events/BattlePyramidSquare01.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare01_MapObjects: @ 853A460 - object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 3, 4, 18, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 5, 3, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 6, 6, 4, 9, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare01_EventObjects: @ 853A460 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 3, 4, 18, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 3, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 6, 6, 4, 9, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare01_MapEvents:: @ 853A508 - map_events BattlePyramidSquare01_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare01_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare02.inc b/data/maps/events/BattlePyramidSquare02.inc index 790fb67a07..8b14a4a47b 100644 --- a/data/maps/events/BattlePyramidSquare02.inc +++ b/data/maps/events/BattlePyramidSquare02.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare02_MapObjects: @ 853A51C - object_event 1, MAP_OBJ_GFX_BOY_3, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 5, 6, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 1, 4, 17, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare02_EventObjects: @ 853A51C + object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 6, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 1, 4, 17, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare02_MapEvents:: @ 853A5C4 - map_events BattlePyramidSquare02_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare02_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare03.inc b/data/maps/events/BattlePyramidSquare03.inc index a8c8c59a70..4b7713426e 100644 --- a/data/maps/events/BattlePyramidSquare03.inc +++ b/data/maps/events/BattlePyramidSquare03.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare03_MapObjects: @ 853A5D8 - object_event 1, MAP_OBJ_GFX_BOY_1, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 1, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 0, 6, 4, 4, 15, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_4, 0, 0, 3, 4, 4, 18, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare03_EventObjects: @ 853A5D8 + object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 1, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 6, 4, 4, 15, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 3, 4, 4, 18, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare03_MapEvents:: @ 853A680 - map_events BattlePyramidSquare03_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare03_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare04.inc b/data/maps/events/BattlePyramidSquare04.inc index ca836e2b52..dd35fcc43d 100644 --- a/data/maps/events/BattlePyramidSquare04.inc +++ b/data/maps/events/BattlePyramidSquare04.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare04_MapObjects: @ 853A694 - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 7, 2, 4, 17, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 0, 7, 7, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 1, 4, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 6, 4, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare04_EventObjects: @ 853A694 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 7, 2, 4, 17, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 7, 7, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 0, 1, 4, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 6, 4, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare04_MapEvents:: @ 853A73C - map_events BattlePyramidSquare04_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare04_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare05.inc b/data/maps/events/BattlePyramidSquare05.inc index 0486f6283b..766ee76267 100644 --- a/data/maps/events/BattlePyramidSquare05.inc +++ b/data/maps/events/BattlePyramidSquare05.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare05_MapObjects: @ 853A750 - object_event 1, MAP_OBJ_GFX_BOY_2, 0, 0, 6, 4, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_2, 0, 0, 3, 7, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_2, 0, 0, 3, 1, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare05_EventObjects: @ 853A750 + object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 0, 6, 4, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 0, 3, 7, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 0, 3, 1, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare05_MapEvents:: @ 853A7F8 - map_events BattlePyramidSquare05_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare05_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare06.inc b/data/maps/events/BattlePyramidSquare06.inc index 65d2f25762..64ab2e2269 100644 --- a/data/maps/events/BattlePyramidSquare06.inc +++ b/data/maps/events/BattlePyramidSquare06.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare06_MapObjects: @ 853A80C - object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 0, 5, 2, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 0, 2, 5, 4, 16, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GIRL_2, 0, 0, 5, 5, 4, 15, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_GIRL_2, 0, 0, 2, 2, 4, 18, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare06_EventObjects: @ 853A80C + object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 0, 5, 2, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 0, 2, 5, 4, 16, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 0, 5, 5, 4, 15, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_2, 0, 0, 2, 2, 4, 18, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare06_MapEvents:: @ 853A8B4 - map_events BattlePyramidSquare06_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare06_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare07.inc b/data/maps/events/BattlePyramidSquare07.inc index 9a71e2a0b1..a3a0734f1e 100644 --- a/data/maps/events/BattlePyramidSquare07.inc +++ b/data/maps/events/BattlePyramidSquare07.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare07_MapObjects: @ 853A8C8 - object_event 1, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 0, 6, 4, 10, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 4, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 0, 4, 8, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 4, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare07_EventObjects: @ 853A8C8 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 0, 6, 4, 10, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 4, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 0, 4, 8, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 4, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare07_MapEvents:: @ 853A970 - map_events BattlePyramidSquare07_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare07_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare08.inc b/data/maps/events/BattlePyramidSquare08.inc index 52a8d4911b..dfcfdb4510 100644 --- a/data/maps/events/BattlePyramidSquare08.inc +++ b/data/maps/events/BattlePyramidSquare08.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare08_MapObjects: @ 853A984 - object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 2, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 5, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 5, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 2, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare08_EventObjects: @ 853A984 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 2, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 5, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 5, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 2, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare08_MapEvents:: @ 853AA2C - map_events BattlePyramidSquare08_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare08_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare09.inc b/data/maps/events/BattlePyramidSquare09.inc index bc90aa6493..dc4ab38ee4 100644 --- a/data/maps/events/BattlePyramidSquare09.inc +++ b/data/maps/events/BattlePyramidSquare09.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare09_MapObjects: @ 853AA40 - object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 3, 0, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 3, 5, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare09_EventObjects: @ 853AA40 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 3, 0, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 3, 5, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare09_MapEvents:: @ 853AAE8 - map_events BattlePyramidSquare09_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare09_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare10.inc b/data/maps/events/BattlePyramidSquare10.inc index 013cd7be6b..9e87c6b06b 100644 --- a/data/maps/events/BattlePyramidSquare10.inc +++ b/data/maps/events/BattlePyramidSquare10.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare10_MapObjects: @ 853AAFC - object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 0, 3, 0, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 0, 3, 4, 10, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 6, 5, 4, 9, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 0, 5, 4, 10, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare10_EventObjects: @ 853AAFC + object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 0, 3, 0, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 0, 3, 4, 10, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 6, 5, 4, 9, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 0, 5, 4, 10, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare10_MapEvents:: @ 853ABA4 - map_events BattlePyramidSquare10_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare10_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare11.inc b/data/maps/events/BattlePyramidSquare11.inc index 96dc118e5c..b0ce15fb56 100644 --- a/data/maps/events/BattlePyramidSquare11.inc +++ b/data/maps/events/BattlePyramidSquare11.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare11_MapObjects: @ 853ABB8 - object_event 1, MAP_OBJ_GFX_BOY_4, 0, 0, 3, 2, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_4, 0, 0, 3, 6, 4, 14, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 6, 4, 4, 8, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_4, 0, 0, 6, 7, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare11_EventObjects: @ 853ABB8 + object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 0, 3, 2, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 3, 6, 4, 14, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 0, 6, 4, 4, 8, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 0, 6, 7, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare11_MapEvents:: @ 853AC60 - map_events BattlePyramidSquare11_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare11_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare12.inc b/data/maps/events/BattlePyramidSquare12.inc index 10b301d6ca..08783200f2 100644 --- a/data/maps/events/BattlePyramidSquare12.inc +++ b/data/maps/events/BattlePyramidSquare12.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare12_MapObjects: @ 853AC74 - object_event 1, MAP_OBJ_GFX_WOMAN_1, 0, 0, 7, 5, 4, 9, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_1, 0, 0, 0, 5, 4, 10, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_1, 0, 0, 3, 0, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_1, 0, 0, 3, 3, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare12_EventObjects: @ 853AC74 + object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 7, 5, 4, 9, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 0, 5, 4, 10, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 3, 0, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 3, 3, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare12_MapEvents:: @ 853AD1C - map_events BattlePyramidSquare12_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare12_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare13.inc b/data/maps/events/BattlePyramidSquare13.inc index 0a83a54412..a930160cbb 100644 --- a/data/maps/events/BattlePyramidSquare13.inc +++ b/data/maps/events/BattlePyramidSquare13.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare13_MapObjects: @ 853AD30 - object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 5, 1, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 5, 6, 4, 7, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 1, 1, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_FAT_MAN, 0, 0, 1, 6, 4, 7, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare13_EventObjects: @ 853AD30 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 5, 1, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 5, 6, 4, 7, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 1, 1, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 1, 6, 4, 7, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare13_MapEvents:: @ 853ADD8 - map_events BattlePyramidSquare13_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare13_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare14.inc b/data/maps/events/BattlePyramidSquare14.inc index 599219cf1c..a81c9b5e0b 100644 --- a/data/maps/events/BattlePyramidSquare14.inc +++ b/data/maps/events/BattlePyramidSquare14.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare14_MapObjects: @ 853ADEC - object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 7, 1, 4, 17, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 1, 1, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 5, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 5, 4, 16, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare14_EventObjects: @ 853ADEC + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 7, 1, 4, 17, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 1, 1, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 5, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 0, 5, 4, 16, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare14_MapEvents:: @ 853AE94 - map_events BattlePyramidSquare14_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare14_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare15.inc b/data/maps/events/BattlePyramidSquare15.inc index ef92bec9a5..fe0d085bda 100644 --- a/data/maps/events/BattlePyramidSquare15.inc +++ b/data/maps/events/BattlePyramidSquare15.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare15_MapObjects: @ 853AEA8 - object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 2, 5, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 2, 1, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare15_EventObjects: @ 853AEA8 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 2, 5, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 2, 1, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare15_MapEvents:: @ 853AF50 - map_events BattlePyramidSquare15_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare15_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare16.inc b/data/maps/events/BattlePyramidSquare16.inc index 1d7e44f706..11abe791d1 100644 --- a/data/maps/events/BattlePyramidSquare16.inc +++ b/data/maps/events/BattlePyramidSquare16.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare16_MapObjects: @ 853AF64 - object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 6, 4, 16, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 1, 0, 0, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 7, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare16_EventObjects: @ 853AF64 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 0, 6, 4, 16, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 1, 0, 0, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 7, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare16_MapEvents:: @ 853B00C - map_events BattlePyramidSquare16_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare16_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BirthIsland_Exterior.inc b/data/maps/events/BirthIsland_Exterior.inc index 457d86314e..1d6238e8fb 100644 --- a/data/maps/events/BirthIsland_Exterior.inc +++ b/data/maps/events/BirthIsland_Exterior.inc @@ -1,10 +1,10 @@ -BirthIsland_Exterior_MapObjects: @ 853D7DC - object_event 1, MAP_OBJ_GFX_DEOXYS_TRIANGLE, 0, 0, 15, 12, 3, 8, 17, 0, 0, 0, BirthIsland_Exterior_EventScript_267F83, 764, 0, 0 - object_event 2, MAP_OBJ_GFX_DEOXYS, 0, 0, 15, 3, 0, 8, 17, 0, 0, 0, 0x0, 763, 0, 0 +BirthIsland_Exterior_EventObjects: @ 853D7DC + object_event 1, EVENT_OBJ_GFX_DEOXYS_TRIANGLE, 0, 0, 15, 12, 3, 8, 17, 0, 0, 0, BirthIsland_Exterior_EventScript_267F83, 764, 0, 0 + object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 0, 15, 3, 0, 8, 17, 0, 0, 0, 0x0, 763, 0, 0 BirthIsland_Exterior_MapWarps: @ 853D80C warp_def 15, 24, 0, 0, BIRTH_ISLAND_HARBOR BirthIsland_Exterior_MapEvents:: @ 853D814 - map_events BirthIsland_Exterior_MapObjects, BirthIsland_Exterior_MapWarps, 0x0, 0x0 + map_events BirthIsland_Exterior_EventObjects, BirthIsland_Exterior_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BirthIsland_Harbor.inc b/data/maps/events/BirthIsland_Harbor.inc index e035d2f442..bb2d6036d3 100644 --- a/data/maps/events/BirthIsland_Harbor.inc +++ b/data/maps/events/BirthIsland_Harbor.inc @@ -1,10 +1,10 @@ -BirthIsland_Harbor_MapObjects: @ 853D828 - object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 8, 5, 0, 7, 17, 0, 0, 0, BirthIsland_Harbor_EventScript_26805D, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 8, 7, 1, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 +BirthIsland_Harbor_EventObjects: @ 853D828 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 8, 5, 0, 7, 17, 0, 0, 0, BirthIsland_Harbor_EventScript_26805D, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 8, 7, 1, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 BirthIsland_Harbor_MapWarps: @ 853D858 warp_def 8, 2, 0, 0, BIRTH_ISLAND_EXTERIOR BirthIsland_Harbor_MapEvents:: @ 853D860 - map_events BirthIsland_Harbor_MapObjects, BirthIsland_Harbor_MapWarps, 0x0, 0x0 + map_events BirthIsland_Harbor_EventObjects, BirthIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/CaveOfOrigin_B1F.inc b/data/maps/events/CaveOfOrigin_B1F.inc index 9c6cc18c64..148bb22a62 100644 --- a/data/maps/events/CaveOfOrigin_B1F.inc +++ b/data/maps/events/CaveOfOrigin_B1F.inc @@ -1,9 +1,9 @@ -CaveOfOrigin_B1F_MapObjects: @ 8535DD0 - object_event 1, MAP_OBJ_GFX_WALLACE, 0, 0, 9, 13, 3, 7, 17, 0, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, 820, 0, 0 +CaveOfOrigin_B1F_EventObjects: @ 8535DD0 + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 0, 9, 13, 3, 7, 17, 0, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, 820, 0, 0 CaveOfOrigin_B1F_MapWarps: @ 8535DE8 warp_def 9, 3, 3, 1, CAVE_OF_ORIGIN_1F CaveOfOrigin_B1F_MapEvents:: @ 8535DF0 - map_events CaveOfOrigin_B1F_MapObjects, CaveOfOrigin_B1F_MapWarps, 0x0, 0x0 + map_events CaveOfOrigin_B1F_EventObjects, CaveOfOrigin_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DesertRuins.inc b/data/maps/events/DesertRuins.inc index 4a78cae40c..2253dec677 100644 --- a/data/maps/events/DesertRuins.inc +++ b/data/maps/events/DesertRuins.inc @@ -1,5 +1,5 @@ -DesertRuins_MapObjects: @ 8534354 - object_event 1, MAP_OBJ_GFX_REGIROCK, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, 935, 0, 0 +DesertRuins_EventObjects: @ 8534354 + object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, 935, 0, 0 DesertRuins_MapWarps: @ 853436C warp_def 8, 29, 3, 1, ROUTE_111 @@ -12,5 +12,5 @@ DesertRuins_MapBGEvents: @ 8534384 bg_event 9, 20, 0, 0, 0, DesertRuins_EventScript_22D9F8 DesertRuins_MapEvents:: @ 85343A8 - map_events DesertRuins_MapObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents + map_events DesertRuins_EventObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents diff --git a/data/maps/events/DesertUnderpass.inc b/data/maps/events/DesertUnderpass.inc index cb5c068748..deb440ff98 100644 --- a/data/maps/events/DesertUnderpass.inc +++ b/data/maps/events/DesertUnderpass.inc @@ -1,9 +1,9 @@ -DesertUnderpass_MapObjects: @ 85376D4 - object_event 1, MAP_OBJ_GFX_FOSSIL, 0, 0, 132, 10, 0, 8, 17, 0, 0, 0, DesertUnderpass_EventScript_23AF41, 874, 0, 0 +DesertUnderpass_EventObjects: @ 85376D4 + object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 0, 132, 10, 0, 8, 17, 0, 0, 0, DesertUnderpass_EventScript_23AF41, 874, 0, 0 DesertUnderpass_MapWarps: @ 85376EC warp_def 10, 12, 0, 2, ROUTE_114_FOSSIL_MANIACS_TUNNEL DesertUnderpass_MapEvents:: @ 85376F4 - map_events DesertUnderpass_MapObjects, DesertUnderpass_MapWarps, 0x0, 0x0 + map_events DesertUnderpass_EventObjects, DesertUnderpass_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DewfordTown.inc b/data/maps/events/DewfordTown.inc index 3a4e95de90..8bb8971253 100644 --- a/data/maps/events/DewfordTown.inc +++ b/data/maps/events/DewfordTown.inc @@ -1,9 +1,9 @@ -DewfordTown_MapObjects: @ 8527964 - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 7, 12, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 9, 3, 9, 16, 0, 0, 3, DewfordTown_EventScript_1E9511, 740, 0, 0 - object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 0, 12, 14, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 12, 8, 1, 8, 0, 0, 0, 0, 0x0, 743, 0, 0 - object_event 5, MAP_OBJ_GFX_BOY_1, 0, 0, 1, 6, 3, 1, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0, 0, 0 +DewfordTown_EventObjects: @ 8527964 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 7, 12, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 9, 3, 9, 16, 0, 0, 3, DewfordTown_EventScript_1E9511, 740, 0, 0 + object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 12, 14, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 12, 8, 1, 8, 0, 0, 0, 0, 0x0, 743, 0, 0 + object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 0, 1, 6, 3, 1, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0, 0, 0 DewfordTown_MapWarps: @ 85279DC warp_def 3, 3, 0, 0, DEWFORD_TOWN_HALL @@ -20,5 +20,5 @@ DewfordTown_MapBGEvents: @ 8527A04 bg_event 2, 4, 0, 0, 0, DewfordTown_EventScript_1E95CC DewfordTown_MapEvents:: @ 8527A40 - map_events DewfordTown_MapObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents + map_events DewfordTown_EventObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents diff --git a/data/maps/events/DewfordTown_Gym.inc b/data/maps/events/DewfordTown_Gym.inc index e9a6b64773..8d7a8e460b 100644 --- a/data/maps/events/DewfordTown_Gym.inc +++ b/data/maps/events/DewfordTown_Gym.inc @@ -1,12 +1,12 @@ -DewfordTown_Gym_MapObjects: @ 852DB34 - object_event 1, MAP_OBJ_GFX_BRAWLY, 0, 0, 4, 3, 0, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC7C2, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 2, 18, 0, 7, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8B7, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 15, 3, 3, 8, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8D9, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 12, 25, 3, 7, 0, 0, 1, 2, DewfordTown_Gym_EventScript_1FC8FB, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_2, 0, 0, 5, 24, 3, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC983, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 7, 8, 1, 10, 17, 0, 1, 3, DewfordTown_Gym_EventScript_1FC93F, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_GIRL_3, 0, 0, 16, 9, 3, 8, 17, 0, 1, 3, DewfordTown_Gym_EventScript_1FC961, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_SAILOR, 0, 0, 14, 12, 1, 10, 17, 0, 1, 2, DewfordTown_Gym_EventScript_1FC91D, 0, 0, 0 +DewfordTown_Gym_EventObjects: @ 852DB34 + object_event 1, EVENT_OBJ_GFX_BRAWLY, 0, 0, 4, 3, 0, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC7C2, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 2, 18, 0, 7, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8B7, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 15, 3, 3, 8, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8D9, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 12, 25, 3, 7, 0, 0, 1, 2, DewfordTown_Gym_EventScript_1FC8FB, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 5, 24, 3, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC983, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 7, 8, 1, 10, 17, 0, 1, 3, DewfordTown_Gym_EventScript_1FC93F, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 0, 16, 9, 3, 8, 17, 0, 1, 3, DewfordTown_Gym_EventScript_1FC961, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_SAILOR, 0, 0, 14, 12, 1, 10, 17, 0, 1, 2, DewfordTown_Gym_EventScript_1FC91D, 0, 0, 0 DewfordTown_Gym_MapWarps: @ 852DBF4 warp_def 5, 27, 0, 2, DEWFORD_TOWN @@ -19,5 +19,5 @@ DewfordTown_Gym_MapBGEvents: @ 852DC04 bg_event 7, 24, 0, 1, 0, DewfordTown_Gym_EventScript_1FC9B2 DewfordTown_Gym_MapEvents:: @ 852DC34 - map_events DewfordTown_Gym_MapObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents + map_events DewfordTown_Gym_EventObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents diff --git a/data/maps/events/DewfordTown_Hall.inc b/data/maps/events/DewfordTown_Hall.inc index f5af1fc3c0..c4b6600ecd 100644 --- a/data/maps/events/DewfordTown_Hall.inc +++ b/data/maps/events/DewfordTown_Hall.inc @@ -1,13 +1,13 @@ -DewfordTown_Hall_MapObjects: @ 852DC48 - object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 0, 4, 6, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4D0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 1, 5, 0, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4F9, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_1, 0, 0, 5, 4, 0, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD50A, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 3, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD547, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 2, 3, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD563, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 14, 7, 0, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD57F, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 12, 3, 3, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD62F, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 15, 3, 3, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_MANIAC, 0, 0, 8, 6, 3, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, 940, 0, 0 +DewfordTown_Hall_EventObjects: @ 852DC48 + object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 0, 4, 6, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4D0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 1, 5, 0, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4F9, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 0, 5, 4, 0, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD50A, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 3, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD547, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 2, 3, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD563, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 14, 7, 0, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD57F, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 12, 3, 3, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD62F, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 15, 3, 3, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 6, 3, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, 940, 0, 0 DewfordTown_Hall_MapWarps: @ 852DD20 warp_def 5, 8, 0, 0, DEWFORD_TOWN @@ -18,5 +18,5 @@ DewfordTown_Hall_MapBGEvents: @ 852DD30 bg_event 7, 1, 3, 0, 0, DewfordTown_Hall_EventScript_1FD5A0 DewfordTown_Hall_MapEvents:: @ 852DD48 - map_events DewfordTown_Hall_MapObjects, DewfordTown_Hall_MapWarps, 0x0, DewfordTown_Hall_MapBGEvents + map_events DewfordTown_Hall_EventObjects, DewfordTown_Hall_MapWarps, 0x0, DewfordTown_Hall_MapBGEvents diff --git a/data/maps/events/DewfordTown_House1.inc b/data/maps/events/DewfordTown_House1.inc index 1990975c5a..72b63dff30 100644 --- a/data/maps/events/DewfordTown_House1.inc +++ b/data/maps/events/DewfordTown_House1.inc @@ -1,12 +1,12 @@ -DewfordTown_House1_MapObjects: @ 852D9C8 - object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3D7, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3CE, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 4, 2, 3, 8, 19, 0, 0, 0, DewfordTown_House1_EventScript_1FC3E0, 0, 0, 0 +DewfordTown_House1_EventObjects: @ 852D9C8 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3D7, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3CE, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 4, 2, 3, 8, 19, 0, 0, 0, DewfordTown_House1_EventScript_1FC3E0, 0, 0, 0 DewfordTown_House1_MapWarps: @ 852DA10 warp_def 3, 7, 0, 3, DEWFORD_TOWN warp_def 4, 7, 0, 3, DEWFORD_TOWN DewfordTown_House1_MapEvents:: @ 852DA20 - map_events DewfordTown_House1_MapObjects, DewfordTown_House1_MapWarps, 0x0, 0x0 + map_events DewfordTown_House1_EventObjects, DewfordTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DewfordTown_House2.inc b/data/maps/events/DewfordTown_House2.inc index b487372f67..901046cbc5 100644 --- a/data/maps/events/DewfordTown_House2.inc +++ b/data/maps/events/DewfordTown_House2.inc @@ -1,11 +1,11 @@ -DewfordTown_House2_MapObjects: @ 852DD5C - object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 6, 5, 3, 10, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE22E, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_2, 0, 0, 2, 3, 3, 1, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE271, 0, 0, 0 +DewfordTown_House2_EventObjects: @ 852DD5C + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 6, 5, 3, 10, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE22E, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 0, 2, 3, 3, 1, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE271, 0, 0, 0 DewfordTown_House2_MapWarps: @ 852DD8C warp_def 3, 8, 0, 4, DEWFORD_TOWN warp_def 4, 8, 0, 4, DEWFORD_TOWN DewfordTown_House2_MapEvents:: @ 852DD9C - map_events DewfordTown_House2_MapObjects, DewfordTown_House2_MapWarps, 0x0, 0x0 + map_events DewfordTown_House2_EventObjects, DewfordTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DewfordTown_PokemonCenter_1F.inc b/data/maps/events/DewfordTown_PokemonCenter_1F.inc index c393ed795d..f61966b880 100644 --- a/data/maps/events/DewfordTown_PokemonCenter_1F.inc +++ b/data/maps/events/DewfordTown_PokemonCenter_1F.inc @@ -1,7 +1,7 @@ -DewfordTown_PokemonCenter_1F_MapObjects: @ 852DA34 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC537, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC545, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 5, 5, 0, 5, 18, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC54E, 0, 0, 0 +DewfordTown_PokemonCenter_1F_EventObjects: @ 852DA34 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC537, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC545, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 5, 0, 5, 18, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC54E, 0, 0, 0 DewfordTown_PokemonCenter_1F_MapWarps: @ 852DA7C warp_def 7, 8, 3, 1, DEWFORD_TOWN @@ -9,5 +9,5 @@ DewfordTown_PokemonCenter_1F_MapWarps: @ 852DA7C warp_def 1, 6, 4, 0, DEWFORD_TOWN_POKEMON_CENTER_2F DewfordTown_PokemonCenter_1F_MapEvents:: @ 852DA94 - map_events DewfordTown_PokemonCenter_1F_MapObjects, DewfordTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events DewfordTown_PokemonCenter_1F_EventObjects, DewfordTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DewfordTown_PokemonCenter_2F.inc b/data/maps/events/DewfordTown_PokemonCenter_2F.inc index 437441e08f..7098e6ed88 100644 --- a/data/maps/events/DewfordTown_PokemonCenter_2F.inc +++ b/data/maps/events/DewfordTown_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -DewfordTown_PokemonCenter_2F_MapObjects: @ 852DAA8 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +DewfordTown_PokemonCenter_2F_EventObjects: @ 852DAA8 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 DewfordTown_PokemonCenter_2F_MapWarps: @ 852DB08 warp_def 1, 6, 4, 2, DEWFORD_TOWN_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ DewfordTown_PokemonCenter_2F_MapWarps: @ 852DB08 warp_def 9, 1, 3, 0, TRADE_CENTER DewfordTown_PokemonCenter_2F_MapEvents:: @ 852DB20 - map_events DewfordTown_PokemonCenter_2F_MapObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events DewfordTown_PokemonCenter_2F_EventObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.inc b/data/maps/events/EverGrandeCity_ChampionsRoom.inc index e5fbb81c1a..269645dc6c 100644 --- a/data/maps/events/EverGrandeCity_ChampionsRoom.inc +++ b/data/maps/events/EverGrandeCity_ChampionsRoom.inc @@ -1,12 +1,12 @@ -EverGrandeCity_ChampionsRoom_MapObjects: @ 8533700 - object_event 1, MAP_OBJ_GFX_WALLACE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 920, 0, 0 - object_event 3, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 921, 0, 0 +EverGrandeCity_ChampionsRoom_EventObjects: @ 8533700 + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 920, 0, 0 + object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 921, 0, 0 EverGrandeCity_ChampionsRoom_MapWarps: @ 8533748 warp_def 6, 12, 3, 1, EVER_GRANDE_CITY_HALL_4 warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_OF_FAME EverGrandeCity_ChampionsRoom_MapEvents:: @ 8533758 - map_events EverGrandeCity_ChampionsRoom_MapObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0 + map_events EverGrandeCity_ChampionsRoom_EventObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_DrakesRoom.inc b/data/maps/events/EverGrandeCity_DrakesRoom.inc index 2db37957df..761e321d62 100644 --- a/data/maps/events/EverGrandeCity_DrakesRoom.inc +++ b/data/maps/events/EverGrandeCity_DrakesRoom.inc @@ -1,10 +1,10 @@ -EverGrandeCity_DrakesRoom_MapObjects: @ 85336C4 - object_event 1, MAP_OBJ_GFX_DRAKE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0, 0, 0 +EverGrandeCity_DrakesRoom_EventObjects: @ 85336C4 + object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0, 0, 0 EverGrandeCity_DrakesRoom_MapWarps: @ 85336DC warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_3 warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_4 EverGrandeCity_DrakesRoom_MapEvents:: @ 85336EC - map_events EverGrandeCity_DrakesRoom_MapObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0 + map_events EverGrandeCity_DrakesRoom_EventObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_GlaciasRoom.inc b/data/maps/events/EverGrandeCity_GlaciasRoom.inc index 7d97a2bc66..a8632b8c11 100644 --- a/data/maps/events/EverGrandeCity_GlaciasRoom.inc +++ b/data/maps/events/EverGrandeCity_GlaciasRoom.inc @@ -1,10 +1,10 @@ -EverGrandeCity_GlaciasRoom_MapObjects: @ 8533688 - object_event 1, MAP_OBJ_GFX_GLACIA, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0, 0, 0 +EverGrandeCity_GlaciasRoom_EventObjects: @ 8533688 + object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0, 0, 0 EverGrandeCity_GlaciasRoom_MapWarps: @ 85336A0 warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_2 warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_3 EverGrandeCity_GlaciasRoom_MapEvents:: @ 85336B0 - map_events EverGrandeCity_GlaciasRoom_MapObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0 + map_events EverGrandeCity_GlaciasRoom_EventObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_HallOfFame.inc b/data/maps/events/EverGrandeCity_HallOfFame.inc index 18ed3ebdb3..0d75ef5530 100644 --- a/data/maps/events/EverGrandeCity_HallOfFame.inc +++ b/data/maps/events/EverGrandeCity_HallOfFame.inc @@ -1,9 +1,9 @@ -EverGrandeCity_HallOfFame_MapObjects: @ 85338FC - object_event 1, MAP_OBJ_GFX_WALLACE, 0, 0, 6, 16, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 +EverGrandeCity_HallOfFame_EventObjects: @ 85338FC + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 0, 6, 16, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 EverGrandeCity_HallOfFame_MapWarps: @ 8533914 warp_def 7, 11, 3, 1, EVER_GRANDE_CITY_CHAMPIONS_ROOM EverGrandeCity_HallOfFame_MapEvents:: @ 853391C - map_events EverGrandeCity_HallOfFame_MapObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0 + map_events EverGrandeCity_HallOfFame_EventObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PhoebesRoom.inc b/data/maps/events/EverGrandeCity_PhoebesRoom.inc index 471bae1fc8..dd09ad4a16 100644 --- a/data/maps/events/EverGrandeCity_PhoebesRoom.inc +++ b/data/maps/events/EverGrandeCity_PhoebesRoom.inc @@ -1,10 +1,10 @@ -EverGrandeCity_PhoebesRoom_MapObjects: @ 853364C - object_event 1, MAP_OBJ_GFX_PHOEBE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0, 0, 0 +EverGrandeCity_PhoebesRoom_EventObjects: @ 853364C + object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0, 0, 0 EverGrandeCity_PhoebesRoom_MapWarps: @ 8533664 warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_1 warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_2 EverGrandeCity_PhoebesRoom_MapEvents:: @ 8533674 - map_events EverGrandeCity_PhoebesRoom_MapObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0 + map_events EverGrandeCity_PhoebesRoom_EventObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc index 28491f59b5..a758c4d731 100644 --- a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ -EverGrandeCity_PokemonCenter_1F_MapObjects: @ 8533930 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 5, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SCOTT, 0, 0, 9, 4, 3, 7, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, 793, 0, 0 +EverGrandeCity_PokemonCenter_1F_EventObjects: @ 8533930 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 5, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 0, 9, 4, 3, 7, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, 793, 0, 0 EverGrandeCity_PokemonCenter_1F_MapWarps: @ 8533990 warp_def 7, 8, 3, 1, EVER_GRANDE_CITY @@ -10,5 +10,5 @@ EverGrandeCity_PokemonCenter_1F_MapWarps: @ 8533990 warp_def 1, 6, 4, 0, EVER_GRANDE_CITY_POKEMON_CENTER_2F EverGrandeCity_PokemonCenter_1F_MapEvents:: @ 85339A8 - map_events EverGrandeCity_PokemonCenter_1F_MapObjects, EverGrandeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events EverGrandeCity_PokemonCenter_1F_EventObjects, EverGrandeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc index d34c8082f4..bbedf59d22 100644 --- a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc +++ b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -EverGrandeCity_PokemonCenter_2F_MapObjects: @ 85339BC - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +EverGrandeCity_PokemonCenter_2F_EventObjects: @ 85339BC + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 EverGrandeCity_PokemonCenter_2F_MapWarps: @ 8533A1C warp_def 1, 6, 4, 2, EVER_GRANDE_CITY_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ EverGrandeCity_PokemonCenter_2F_MapWarps: @ 8533A1C warp_def 9, 1, 3, 0, TRADE_CENTER EverGrandeCity_PokemonCenter_2F_MapEvents:: @ 8533A34 - map_events EverGrandeCity_PokemonCenter_2F_MapObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events EverGrandeCity_PokemonCenter_2F_EventObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc b/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc index ee368c6e13..a19984ea2d 100644 --- a/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc +++ b/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc @@ -1,8 +1,8 @@ -EverGrandeCity_PokemonLeague_1F_MapObjects: @ 8533860 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295FC, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 16, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_22960A, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 8, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_4, 0, 0, 11, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0, 0, 0 +EverGrandeCity_PokemonLeague_1F_EventObjects: @ 8533860 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295FC, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 16, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_22960A, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 8, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 11, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0, 0, 0 EverGrandeCity_PokemonLeague_1F_MapWarps: @ 85338C0 warp_def 9, 11, 3, 0, EVER_GRANDE_CITY @@ -12,5 +12,5 @@ EverGrandeCity_PokemonLeague_1F_MapWarps: @ 85338C0 warp_def 1, 7, 4, 0, EVER_GRANDE_CITY_POKEMON_LEAGUE_2F EverGrandeCity_PokemonLeague_1F_MapEvents:: @ 85338E8 - map_events EverGrandeCity_PokemonLeague_1F_MapObjects, EverGrandeCity_PokemonLeague_1F_MapWarps, 0x0, 0x0 + map_events EverGrandeCity_PokemonLeague_1F_EventObjects, EverGrandeCity_PokemonLeague_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc b/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc index 499aad1966..6b85a2fb0b 100644 --- a/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc +++ b/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc @@ -1,8 +1,8 @@ -EverGrandeCity_PokemonLeague_2F_MapObjects: @ 8533A48 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, 702, 0, 0 +EverGrandeCity_PokemonLeague_2F_EventObjects: @ 8533A48 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, 702, 0, 0 EverGrandeCity_PokemonLeague_2F_MapWarps: @ 8533AA8 warp_def 1, 6, 4, 4, EVER_GRANDE_CITY_POKEMON_LEAGUE_1F @@ -10,5 +10,5 @@ EverGrandeCity_PokemonLeague_2F_MapWarps: @ 8533AA8 warp_def 9, 1, 3, 0, TRADE_CENTER EverGrandeCity_PokemonLeague_2F_MapEvents:: @ 8533AC0 - map_events EverGrandeCity_PokemonLeague_2F_MapObjects, EverGrandeCity_PokemonLeague_2F_MapWarps, 0x0, 0x0 + map_events EverGrandeCity_PokemonLeague_2F_EventObjects, EverGrandeCity_PokemonLeague_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.inc b/data/maps/events/EverGrandeCity_SidneysRoom.inc index 9ff3d40cb6..93d9a879ec 100644 --- a/data/maps/events/EverGrandeCity_SidneysRoom.inc +++ b/data/maps/events/EverGrandeCity_SidneysRoom.inc @@ -1,10 +1,10 @@ -EverGrandeCity_SidneysRoom_MapObjects: @ 8533610 - object_event 1, MAP_OBJ_GFX_SIDNEY, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0, 0, 0 +EverGrandeCity_SidneysRoom_EventObjects: @ 8533610 + object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0, 0, 0 EverGrandeCity_SidneysRoom_MapWarps: @ 8533628 warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_5 warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_1 EverGrandeCity_SidneysRoom_MapEvents:: @ 8533638 - map_events EverGrandeCity_SidneysRoom_MapObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0 + map_events EverGrandeCity_SidneysRoom_EventObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown.inc b/data/maps/events/FallarborTown.inc index 28dab394b4..e9fb7579c7 100644 --- a/data/maps/events/FallarborTown.inc +++ b/data/maps/events/FallarborTown.inc @@ -1,8 +1,8 @@ -FallarborTown_MapObjects: @ 8527BE0 - object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 0, 8, 11, 3, 8, 16, 0, 0, 0, FallarborTown_EventScript_1EB22B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 11, 9, 3, 5, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 11, 15, 3, 3, 17, 0, 0, 0, FallarborTown_EventScript_1EB234, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_AZURILL, 0, 0, 8, 12, 3, 1, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, 907, 0, 0 +FallarborTown_EventObjects: @ 8527BE0 + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 0, 8, 11, 3, 8, 16, 0, 0, 0, FallarborTown_EventScript_1EB22B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 11, 9, 3, 5, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 11, 15, 3, 3, 17, 0, 0, 0, FallarborTown_EventScript_1EB234, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 0, 8, 12, 3, 1, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, 907, 0, 0 FallarborTown_MapWarps: @ 8527C40 warp_def 15, 15, 0, 0, FALLARBOR_TOWN_MART @@ -22,5 +22,5 @@ FallarborTown_MapBGEvents: @ 8527C68 bg_event 2, 15, 3, 7, 0, ITEM_NUGGET, 28, 0 FallarborTown_MapEvents:: @ 8527CC8 - map_events FallarborTown_MapObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents + map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents diff --git a/data/maps/events/FallarborTown_BattleTentBattleRoom.inc b/data/maps/events/FallarborTown_BattleTentBattleRoom.inc index bed082ccb3..7c5842ab87 100644 --- a/data/maps/events/FallarborTown_BattleTentBattleRoom.inc +++ b/data/maps/events/FallarborTown_BattleTentBattleRoom.inc @@ -1,8 +1,8 @@ -FallarborTown_BattleTentBattleRoom_MapObjects: @ 852E444 - object_event 1, MAP_OBJ_GFX_TRADER, 0, 0, 4, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 3, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 +FallarborTown_BattleTentBattleRoom_EventObjects: @ 852E444 + object_event 1, EVENT_OBJ_GFX_TRADER, 0, 0, 4, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 3, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 FallarborTown_BattleTentBattleRoom_MapEvents:: @ 852E48C - map_events FallarborTown_BattleTentBattleRoom_MapObjects, 0x0, 0x0, 0x0 + map_events FallarborTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_BattleTentCorridor.inc b/data/maps/events/FallarborTown_BattleTentCorridor.inc index 023ef7f0b0..35bca7b859 100644 --- a/data/maps/events/FallarborTown_BattleTentCorridor.inc +++ b/data/maps/events/FallarborTown_BattleTentCorridor.inc @@ -1,6 +1,6 @@ -FallarborTown_BattleTentCorridor_MapObjects: @ 852E418 - object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 2, 6, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 +FallarborTown_BattleTentCorridor_EventObjects: @ 852E418 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 2, 6, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 FallarborTown_BattleTentCorridor_MapEvents:: @ 852E430 - map_events FallarborTown_BattleTentCorridor_MapObjects, 0x0, 0x0, 0x0 + map_events FallarborTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_BattleTentLobby.inc b/data/maps/events/FallarborTown_BattleTentLobby.inc index 6c0d25020f..e261f185fe 100644 --- a/data/maps/events/FallarborTown_BattleTentLobby.inc +++ b/data/maps/events/FallarborTown_BattleTentLobby.inc @@ -1,9 +1,9 @@ -FallarborTown_BattleTentLobby_MapObjects: @ 852E370 - object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200001, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_HIKER, 0, 0, 1, 5, 3, 5, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 12, 6, 3, 3, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LASS, 0, 0, 10, 9, 3, 8, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_SCOTT, 0, 0, 0, 7, 3, 10, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, 767, 0, 0 +FallarborTown_BattleTentLobby_EventObjects: @ 852E370 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200001, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 1, 5, 3, 5, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 12, 6, 3, 3, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 0, 10, 9, 3, 8, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 0, 7, 3, 10, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, 767, 0, 0 FallarborTown_BattleTentLobby_MapWarps: @ 852E3E8 warp_def 6, 9, 0, 1, FALLARBOR_TOWN @@ -13,5 +13,5 @@ FallarborTown_BattleTentLobby_MapBGEvents: @ 852E3F8 bg_event 4, 5, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20024F FallarborTown_BattleTentLobby_MapEvents:: @ 852E404 - map_events FallarborTown_BattleTentLobby_MapObjects, FallarborTown_BattleTentLobby_MapWarps, 0x0, FallarborTown_BattleTentLobby_MapBGEvents + map_events FallarborTown_BattleTentLobby_EventObjects, FallarborTown_BattleTentLobby_MapWarps, 0x0, FallarborTown_BattleTentLobby_MapBGEvents diff --git a/data/maps/events/FallarborTown_House1.inc b/data/maps/events/FallarborTown_House1.inc index 9712368029..b3975685ca 100644 --- a/data/maps/events/FallarborTown_House1.inc +++ b/data/maps/events/FallarborTown_House1.inc @@ -1,11 +1,11 @@ -FallarborTown_House1_MapObjects: @ 852E5B8 - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, FallarborTown_House1_EventScript_200F13, 928, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 5, 6, 3, 5, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0, 0, 0 +FallarborTown_House1_EventObjects: @ 852E5B8 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, FallarborTown_House1_EventScript_200F13, 928, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 6, 3, 5, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0, 0, 0 FallarborTown_House1_MapWarps: @ 852E5E8 warp_def 3, 8, 0, 3, FALLARBOR_TOWN warp_def 4, 8, 0, 3, FALLARBOR_TOWN FallarborTown_House1_MapEvents:: @ 852E5F8 - map_events FallarborTown_House1_MapObjects, FallarborTown_House1_MapWarps, 0x0, 0x0 + map_events FallarborTown_House1_EventObjects, FallarborTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_House2.inc b/data/maps/events/FallarborTown_House2.inc index 058c4c5af2..d809bf4939 100644 --- a/data/maps/events/FallarborTown_House2.inc +++ b/data/maps/events/FallarborTown_House2.inc @@ -1,10 +1,10 @@ -FallarborTown_House2_MapObjects: @ 852E60C - object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, FallarborTown_House2_EventScript_201383, 0, 0, 0 +FallarborTown_House2_EventObjects: @ 852E60C + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, FallarborTown_House2_EventScript_201383, 0, 0, 0 FallarborTown_House2_MapWarps: @ 852E624 warp_def 3, 7, 0, 4, FALLARBOR_TOWN warp_def 4, 7, 0, 4, FALLARBOR_TOWN FallarborTown_House2_MapEvents:: @ 852E634 - map_events FallarborTown_House2_MapObjects, FallarborTown_House2_MapWarps, 0x0, 0x0 + map_events FallarborTown_House2_EventObjects, FallarborTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_Mart.inc b/data/maps/events/FallarborTown_Mart.inc index a59da4c669..762db16f9c 100644 --- a/data/maps/events/FallarborTown_Mart.inc +++ b/data/maps/events/FallarborTown_Mart.inc @@ -1,14 +1,14 @@ -FallarborTown_Mart_MapObjects: @ 852E2D4 - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCBF, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 5, 3, 3, 2, 17, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_3, 0, 0, 9, 6, 3, 8, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCFD, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SKITTY, 0, 0, 2, 5, 3, 1, 17, 0, 0, 0, FallarborTown_Mart_EventScript_1FFD06, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_GIRL_2, 0, 0, 7, 2, 3, 7, 0, 0, 0, 0, FallarborTown_Mart_EventScript_2C80B6, 0, 0, 0 +FallarborTown_Mart_EventObjects: @ 852E2D4 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCBF, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 3, 3, 2, 17, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 9, 6, 3, 8, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCFD, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 0, 2, 5, 3, 1, 17, 0, 0, 0, FallarborTown_Mart_EventScript_1FFD06, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 0, 7, 2, 3, 7, 0, 0, 0, 0, FallarborTown_Mart_EventScript_2C80B6, 0, 0, 0 FallarborTown_Mart_MapWarps: @ 852E34C warp_def 3, 7, 0, 0, FALLARBOR_TOWN warp_def 4, 7, 0, 0, FALLARBOR_TOWN FallarborTown_Mart_MapEvents:: @ 852E35C - map_events FallarborTown_Mart_MapObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0 + map_events FallarborTown_Mart_EventObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.inc b/data/maps/events/FallarborTown_PokemonCenter_1F.inc index 19421411e9..e6c91a736d 100644 --- a/data/maps/events/FallarborTown_PokemonCenter_1F.inc +++ b/data/maps/events/FallarborTown_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ -FallarborTown_PokemonCenter_1F_MapObjects: @ 852E4A0 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 0, 10, 2, 3, 7, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, 871, 0, 0 +FallarborTown_PokemonCenter_1F_EventObjects: @ 852E4A0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 10, 2, 3, 7, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, 871, 0, 0 FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500 warp_def 7, 8, 3, 2, FALLARBOR_TOWN @@ -10,5 +10,5 @@ FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500 warp_def 1, 6, 4, 0, FALLARBOR_TOWN_POKEMON_CENTER_2F FallarborTown_PokemonCenter_1F_MapEvents:: @ 852E518 - map_events FallarborTown_PokemonCenter_1F_MapObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events FallarborTown_PokemonCenter_1F_EventObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_PokemonCenter_2F.inc b/data/maps/events/FallarborTown_PokemonCenter_2F.inc index 408ecf9dbf..6ddb7e9c9b 100644 --- a/data/maps/events/FallarborTown_PokemonCenter_2F.inc +++ b/data/maps/events/FallarborTown_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -FallarborTown_PokemonCenter_2F_MapObjects: @ 852E52C - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +FallarborTown_PokemonCenter_2F_EventObjects: @ 852E52C + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 FallarborTown_PokemonCenter_2F_MapWarps: @ 852E58C warp_def 1, 6, 4, 2, FALLARBOR_TOWN_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ FallarborTown_PokemonCenter_2F_MapWarps: @ 852E58C warp_def 9, 1, 3, 0, TRADE_CENTER FallarborTown_PokemonCenter_2F_MapEvents:: @ 852E5A4 - map_events FallarborTown_PokemonCenter_2F_MapObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events FallarborTown_PokemonCenter_2F_EventObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FarawayIsland_Entrance.inc b/data/maps/events/FarawayIsland_Entrance.inc index cd321124f7..27d98189e6 100644 --- a/data/maps/events/FarawayIsland_Entrance.inc +++ b/data/maps/events/FarawayIsland_Entrance.inc @@ -1,6 +1,6 @@ -FarawayIsland_Entrance_MapObjects: @ 853D710 - object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 13, 39, 3, 7, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267CA2, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 13, 41, 1, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 +FarawayIsland_Entrance_EventObjects: @ 853D710 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 13, 39, 3, 7, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267CA2, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 13, 41, 1, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 FarawayIsland_Entrance_MapWarps: @ 853D740 warp_def 22, 7, 3, 0, FARAWAY_ISLAND_INTERIOR @@ -15,5 +15,5 @@ FarawayIsland_Entrance_MapBGEvents: @ 853D780 bg_event 3, 32, 0, 1, 0, FarawayIsland_Entrance_EventScript_267CF1 FarawayIsland_Entrance_MapEvents:: @ 853D78C - map_events FarawayIsland_Entrance_MapObjects, FarawayIsland_Entrance_MapWarps, FarawayIsland_Entrance_MapCoordEvents, FarawayIsland_Entrance_MapBGEvents + map_events FarawayIsland_Entrance_EventObjects, FarawayIsland_Entrance_MapWarps, FarawayIsland_Entrance_MapCoordEvents, FarawayIsland_Entrance_MapBGEvents diff --git a/data/maps/events/FarawayIsland_Interior.inc b/data/maps/events/FarawayIsland_Interior.inc index 6f13ca36e6..d74eb9d8f7 100644 --- a/data/maps/events/FarawayIsland_Interior.inc +++ b/data/maps/events/FarawayIsland_Interior.inc @@ -1,10 +1,10 @@ -FarawayIsland_Interior_MapObjects: @ 853D7A0 - object_event 1, MAP_OBJ_GFX_MEW, 0, 0, 13, 17, 3, 60, 255, 0, 0, 1, FarawayIsland_Interior_EventScript_267DF2, 718, 0, 0 +FarawayIsland_Interior_EventObjects: @ 853D7A0 + object_event 1, EVENT_OBJ_GFX_MEW, 0, 0, 13, 17, 3, 60, 255, 0, 0, 1, FarawayIsland_Interior_EventScript_267DF2, 718, 0, 0 FarawayIsland_Interior_MapWarps: @ 853D7B8 warp_def 12, 19, 0, 0, FARAWAY_ISLAND_ENTRANCE warp_def 13, 19, 0, 1, FARAWAY_ISLAND_ENTRANCE FarawayIsland_Interior_MapEvents:: @ 853D7C8 - map_events FarawayIsland_Interior_MapObjects, FarawayIsland_Interior_MapWarps, 0x0, 0x0 + map_events FarawayIsland_Interior_EventObjects, FarawayIsland_Interior_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FieryPath.inc b/data/maps/events/FieryPath.inc index cd360a75f5..3b68b12924 100644 --- a/data/maps/events/FieryPath.inc +++ b/data/maps/events/FieryPath.inc @@ -1,17 +1,17 @@ -FieryPath_MapObjects: @ 8534C80 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 3, 3, 1, 17, 0, 0, 0, FieryPath_EventScript_29119E, 1091, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 17, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 17, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 18, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 8, 11, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 19, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 12, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 20, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 23, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 21, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 24, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 22, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 32, 3, 1, 17, 0, 0, 0, FieryPath_EventScript_291191, 1111, 0, 0 +FieryPath_EventObjects: @ 8534C80 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 3, 3, 1, 17, 0, 0, 0, FieryPath_EventScript_29119E, 1091, 0, 0 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 17, 0, 0 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 17, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 18, 0, 0 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 8, 11, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 19, 0, 0 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 12, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 20, 0, 0 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 23, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 21, 0, 0 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 24, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 22, 0, 0 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 32, 3, 1, 17, 0, 0, 0, FieryPath_EventScript_291191, 1111, 0, 0 FieryPath_MapWarps: @ 8534D40 warp_def 26, 36, 3, 4, ROUTE_112 warp_def 26, 4, 3, 5, ROUTE_112 FieryPath_MapEvents:: @ 8534D50 - map_events FieryPath_MapObjects, FieryPath_MapWarps, 0x0, 0x0 + map_events FieryPath_EventObjects, FieryPath_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity.inc b/data/maps/events/FortreeCity.inc index 03ff20df1b..517d32d539 100644 --- a/data/maps/events/FortreeCity.inc +++ b/data/maps/events/FortreeCity.inc @@ -1,11 +1,11 @@ -FortreeCity_MapObjects: @ 8526B9C - object_event 1, MAP_OBJ_GFX_MAN_2, 0, 0, 31, 3, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25B6, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 0, 32, 16, 3, 2, 17, 0, 0, 0, FortreeCity_EventScript_1E25DE, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 32, 10, 3, 3, 16, 0, 0, 0, FortreeCity_EventScript_1E25BF, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_1, 0, 0, 11, 14, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25F0, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BOY_5, 0, 0, 9, 16, 3, 8, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_KECLEON_1, 0, 0, 25, 8, 3, 76, 17, 0, 0, 0, FortreeCity_EventScript_1E2614, 969, 0, 0 +FortreeCity_EventObjects: @ 8526B9C + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 0, 31, 3, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25B6, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 32, 16, 3, 2, 17, 0, 0, 0, FortreeCity_EventScript_1E25DE, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 32, 10, 3, 3, 16, 0, 0, 0, FortreeCity_EventScript_1E25BF, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 0, 11, 14, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25F0, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_BOY_5, 0, 0, 9, 16, 3, 8, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 25, 8, 3, 76, 17, 0, 0, 0, FortreeCity_EventScript_1E2614, 969, 0, 0 FortreeCity_MapWarps: @ 8526C44 warp_def 5, 6, 0, 0, FORTREE_CITY_POKEMON_CENTER_1F @@ -27,5 +27,5 @@ FortreeCity_MapBGEvents: @ 8526C8C bg_event 6, 14, 0, 1, 0, FortreeCity_EventScript_271E6A FortreeCity_MapEvents:: @ 8526CD4 - map_events FortreeCity_MapObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents + map_events FortreeCity_EventObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents diff --git a/data/maps/events/FortreeCity_DecorationShop.inc b/data/maps/events/FortreeCity_DecorationShop.inc index 7c25059bf1..6b7e0f39d0 100644 --- a/data/maps/events/FortreeCity_DecorationShop.inc +++ b/data/maps/events/FortreeCity_DecorationShop.inc @@ -1,13 +1,13 @@ -FortreeCity_DecorationShop_MapObjects: @ 85310B0 - object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 6, 5, 3, 1, 17, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21800E, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 0, 4, 3, 9, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218017, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218020, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 6, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21804C, 0, 0, 0 +FortreeCity_DecorationShop_EventObjects: @ 85310B0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 5, 3, 1, 17, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21800E, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 0, 4, 3, 9, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218017, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218020, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 6, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21804C, 0, 0, 0 FortreeCity_DecorationShop_MapWarps: @ 8531110 warp_def 3, 5, 0, 8, FORTREE_CITY warp_def 4, 5, 0, 8, FORTREE_CITY FortreeCity_DecorationShop_MapEvents:: @ 8531120 - map_events FortreeCity_DecorationShop_MapObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0 + map_events FortreeCity_DecorationShop_EventObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_Gym.inc b/data/maps/events/FortreeCity_Gym.inc index 6e3904b88f..a068827724 100644 --- a/data/maps/events/FortreeCity_Gym.inc +++ b/data/maps/events/FortreeCity_Gym.inc @@ -1,12 +1,12 @@ -FortreeCity_Gym_MapObjects: @ 8530C98 - object_event 1, MAP_OBJ_GFX_WINONA, 0, 0, 15, 2, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_2165C8, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_6, 0, 0, 4, 14, 3, 8, 0, 0, 1, 3, FortreeCity_Gym_EventScript_2166A8, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 10, 10, 3, 9, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166D6, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 0, 5, 17, 3, 9, 0, 0, 1, 1, FortreeCity_Gym_EventScript_2166ED, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_6, 0, 0, 9, 8, 3, 8, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166BF, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_2, 0, 0, 15, 21, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_216732, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_MAN_6, 0, 0, 4, 23, 3, 10, 17, 0, 1, 1, FortreeCity_Gym_EventScript_216704, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_MAN_6, 0, 0, 1, 10, 3, 7, 17, 0, 1, 3, FortreeCity_Gym_EventScript_21671B, 0, 0, 0 +FortreeCity_Gym_EventObjects: @ 8530C98 + object_event 1, EVENT_OBJ_GFX_WINONA, 0, 0, 15, 2, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_2165C8, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 4, 14, 3, 8, 0, 0, 1, 3, FortreeCity_Gym_EventScript_2166A8, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 10, 10, 3, 9, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166D6, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 0, 5, 17, 3, 9, 0, 0, 1, 1, FortreeCity_Gym_EventScript_2166ED, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 0, 9, 8, 3, 8, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166BF, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 0, 15, 21, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_216732, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 0, 4, 23, 3, 10, 17, 0, 1, 1, FortreeCity_Gym_EventScript_216704, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 0, 1, 10, 3, 7, 17, 0, 1, 3, FortreeCity_Gym_EventScript_21671B, 0, 0, 0 FortreeCity_Gym_MapWarps: @ 8530D58 warp_def 15, 24, 0, 2, FORTREE_CITY @@ -17,5 +17,5 @@ FortreeCity_Gym_MapBGEvents: @ 8530D68 bg_event 17, 21, 0, 1, 0, FortreeCity_Gym_EventScript_216761 FortreeCity_Gym_MapEvents:: @ 8530D80 - map_events FortreeCity_Gym_MapObjects, FortreeCity_Gym_MapWarps, 0x0, FortreeCity_Gym_MapBGEvents + map_events FortreeCity_Gym_EventObjects, FortreeCity_Gym_MapWarps, 0x0, FortreeCity_Gym_MapBGEvents diff --git a/data/maps/events/FortreeCity_House1.inc b/data/maps/events/FortreeCity_House1.inc index d1eecfdef3..abaae2d40f 100644 --- a/data/maps/events/FortreeCity_House1.inc +++ b/data/maps/events/FortreeCity_House1.inc @@ -1,12 +1,12 @@ -FortreeCity_House1_MapObjects: @ 8530C2C - object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House1_EventScript_2162BB, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 2, 3, 3, 9, 0, 0, 0, 0, FortreeCity_House1_EventScript_216368, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 7, 4, 3, 1, 17, 0, 0, 0, FortreeCity_House1_EventScript_21635F, 0, 0, 0 +FortreeCity_House1_EventObjects: @ 8530C2C + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House1_EventScript_2162BB, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 2, 3, 3, 9, 0, 0, 0, 0, FortreeCity_House1_EventScript_216368, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 7, 4, 3, 1, 17, 0, 0, 0, FortreeCity_House1_EventScript_21635F, 0, 0, 0 FortreeCity_House1_MapWarps: @ 8530C74 warp_def 3, 5, 0, 1, FORTREE_CITY warp_def 4, 5, 0, 1, FORTREE_CITY FortreeCity_House1_MapEvents:: @ 8530C84 - map_events FortreeCity_House1_MapObjects, FortreeCity_House1_MapWarps, 0x0, 0x0 + map_events FortreeCity_House1_EventObjects, FortreeCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House2.inc b/data/maps/events/FortreeCity_House2.inc index c54b42a6d1..5130975035 100644 --- a/data/maps/events/FortreeCity_House2.inc +++ b/data/maps/events/FortreeCity_House2.inc @@ -1,11 +1,11 @@ -FortreeCity_House2_MapObjects: @ 8530F30 - object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 2, 3, 3, 5, 1, 0, 0, 0, FortreeCity_House2_EventScript_2177CB, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 3, 3, 9, 1, 0, 0, 0, FortreeCity_House2_EventScript_2C811E, 0, 0, 0 +FortreeCity_House2_EventObjects: @ 8530F30 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 2, 3, 3, 5, 1, 0, 0, 0, FortreeCity_House2_EventScript_2177CB, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 3, 3, 9, 1, 0, 0, 0, FortreeCity_House2_EventScript_2C811E, 0, 0, 0 FortreeCity_House2_MapWarps: @ 8530F60 warp_def 3, 5, 0, 4, FORTREE_CITY warp_def 4, 5, 0, 4, FORTREE_CITY FortreeCity_House2_MapEvents:: @ 8530F70 - map_events FortreeCity_House2_MapObjects, FortreeCity_House2_MapWarps, 0x0, 0x0 + map_events FortreeCity_House2_EventObjects, FortreeCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House3.inc b/data/maps/events/FortreeCity_House3.inc index 7be1594935..1b788cbe28 100644 --- a/data/maps/events/FortreeCity_House3.inc +++ b/data/maps/events/FortreeCity_House3.inc @@ -1,11 +1,11 @@ -FortreeCity_House3_MapObjects: @ 8530F84 - object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 0, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House3_EventScript_217AE8, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 5, 4, 3, 2, 17, 0, 0, 0, FortreeCity_House3_EventScript_217AF1, 0, 0, 0 +FortreeCity_House3_EventObjects: @ 8530F84 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 0, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House3_EventScript_217AE8, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 5, 4, 3, 2, 17, 0, 0, 0, FortreeCity_House3_EventScript_217AF1, 0, 0, 0 FortreeCity_House3_MapWarps: @ 8530FB4 warp_def 3, 5, 0, 5, FORTREE_CITY warp_def 4, 5, 0, 5, FORTREE_CITY FortreeCity_House3_MapEvents:: @ 8530FC4 - map_events FortreeCity_House3_MapObjects, FortreeCity_House3_MapWarps, 0x0, 0x0 + map_events FortreeCity_House3_EventObjects, FortreeCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House4.inc b/data/maps/events/FortreeCity_House4.inc index d24c125205..a4050a5f67 100644 --- a/data/maps/events/FortreeCity_House4.inc +++ b/data/maps/events/FortreeCity_House4.inc @@ -1,12 +1,12 @@ -FortreeCity_House4_MapObjects: @ 8530FD8 - object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, FortreeCity_House4_EventScript_217C81, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_3, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WINGULL, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, 933, 0, 0 +FortreeCity_House4_EventObjects: @ 8530FD8 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, FortreeCity_House4_EventScript_217C81, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, 933, 0, 0 FortreeCity_House4_MapWarps: @ 8531020 warp_def 3, 5, 0, 6, FORTREE_CITY warp_def 4, 5, 0, 6, FORTREE_CITY FortreeCity_House4_MapEvents:: @ 8531030 - map_events FortreeCity_House4_MapObjects, FortreeCity_House4_MapWarps, 0x0, 0x0 + map_events FortreeCity_House4_EventObjects, FortreeCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House5.inc b/data/maps/events/FortreeCity_House5.inc index 3520e72494..b6bf343543 100644 --- a/data/maps/events/FortreeCity_House5.inc +++ b/data/maps/events/FortreeCity_House5.inc @@ -1,12 +1,12 @@ -FortreeCity_House5_MapObjects: @ 8531044 - object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 3, 20, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EF2, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 6, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House5_EventScript_217F04, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_1, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EFB, 0, 0, 0 +FortreeCity_House5_EventObjects: @ 8531044 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 3, 20, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EF2, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 6, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House5_EventScript_217F04, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EFB, 0, 0, 0 FortreeCity_House5_MapWarps: @ 853108C warp_def 3, 5, 0, 7, FORTREE_CITY warp_def 4, 5, 0, 7, FORTREE_CITY FortreeCity_House5_MapEvents:: @ 853109C - map_events FortreeCity_House5_MapObjects, FortreeCity_House5_MapWarps, 0x0, 0x0 + map_events FortreeCity_House5_EventObjects, FortreeCity_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_Mart.inc b/data/maps/events/FortreeCity_Mart.inc index acb1e94716..df48776637 100644 --- a/data/maps/events/FortreeCity_Mart.inc +++ b/data/maps/events/FortreeCity_Mart.inc @@ -1,13 +1,13 @@ -FortreeCity_Mart_MapObjects: @ 8530EAC - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217666, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 9, 3, 3, 7, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217698, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 8, 5, 3, 2, 17, 0, 0, 0, FortreeCity_Mart_EventScript_2176A1, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 5, 6, 3, 10, 17, 0, 0, 0, FortreeCity_Mart_EventScript_2176AA, 0, 0, 0 +FortreeCity_Mart_EventObjects: @ 8530EAC + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217666, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 9, 3, 3, 7, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217698, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 8, 5, 3, 2, 17, 0, 0, 0, FortreeCity_Mart_EventScript_2176A1, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 5, 6, 3, 10, 17, 0, 0, 0, FortreeCity_Mart_EventScript_2176AA, 0, 0, 0 FortreeCity_Mart_MapWarps: @ 8530F0C warp_def 3, 7, 0, 3, FORTREE_CITY warp_def 4, 7, 0, 3, FORTREE_CITY FortreeCity_Mart_MapEvents:: @ 8530F1C - map_events FortreeCity_Mart_MapObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0 + map_events FortreeCity_Mart_EventObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_PokemonCenter_1F.inc b/data/maps/events/FortreeCity_PokemonCenter_1F.inc index 922e825c78..b6b8cfdce9 100644 --- a/data/maps/events/FortreeCity_PokemonCenter_1F.inc +++ b/data/maps/events/FortreeCity_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ -FortreeCity_PokemonCenter_1F_MapObjects: @ 8530D94 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173E7, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173F5, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 8, 5, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173FE, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_3, 0, 0, 2, 3, 3, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_217407, 0, 0, 0 +FortreeCity_PokemonCenter_1F_EventObjects: @ 8530D94 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173E7, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173F5, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 8, 5, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173FE, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 0, 2, 3, 3, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_217407, 0, 0, 0 FortreeCity_PokemonCenter_1F_MapWarps: @ 8530DF4 warp_def 7, 8, 3, 0, FORTREE_CITY @@ -10,5 +10,5 @@ FortreeCity_PokemonCenter_1F_MapWarps: @ 8530DF4 warp_def 1, 6, 4, 0, FORTREE_CITY_POKEMON_CENTER_2F FortreeCity_PokemonCenter_1F_MapEvents:: @ 8530E0C - map_events FortreeCity_PokemonCenter_1F_MapObjects, FortreeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events FortreeCity_PokemonCenter_1F_EventObjects, FortreeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_PokemonCenter_2F.inc b/data/maps/events/FortreeCity_PokemonCenter_2F.inc index e5a3f1ac46..c8f2356c44 100644 --- a/data/maps/events/FortreeCity_PokemonCenter_2F.inc +++ b/data/maps/events/FortreeCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -FortreeCity_PokemonCenter_2F_MapObjects: @ 8530E20 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +FortreeCity_PokemonCenter_2F_EventObjects: @ 8530E20 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 FortreeCity_PokemonCenter_2F_MapWarps: @ 8530E80 warp_def 1, 6, 4, 2, FORTREE_CITY_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ FortreeCity_PokemonCenter_2F_MapWarps: @ 8530E80 warp_def 9, 1, 3, 0, TRADE_CENTER FortreeCity_PokemonCenter_2F_MapEvents:: @ 8530E98 - map_events FortreeCity_PokemonCenter_2F_MapObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events FortreeCity_PokemonCenter_2F_EventObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/GraniteCave_1F.inc b/data/maps/events/GraniteCave_1F.inc index 1bad3837f9..ed546c8dff 100644 --- a/data/maps/events/GraniteCave_1F.inc +++ b/data/maps/events/GraniteCave_1F.inc @@ -1,6 +1,6 @@ -GraniteCave_1F_MapObjects: @ 85343BC - object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 36, 9, 3, 1, 0, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 17, 7, 3, 8, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, 1050, 0, 0 +GraniteCave_1F_EventObjects: @ 85343BC + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 36, 9, 3, 1, 0, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 17, 7, 3, 8, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, 1050, 0, 0 GraniteCave_1F_MapWarps: @ 85343EC warp_def 37, 12, 3, 0, ROUTE_106 @@ -9,5 +9,5 @@ GraniteCave_1F_MapWarps: @ 85343EC warp_def 5, 10, 3, 0, GRANITE_CAVE_STEVENS_ROOM GraniteCave_1F_MapEvents:: @ 853440C - map_events GraniteCave_1F_MapObjects, GraniteCave_1F_MapWarps, 0x0, 0x0 + map_events GraniteCave_1F_EventObjects, GraniteCave_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/GraniteCave_B1F.inc b/data/maps/events/GraniteCave_B1F.inc index f5981fcbec..7f4e67f336 100644 --- a/data/maps/events/GraniteCave_B1F.inc +++ b/data/maps/events/GraniteCave_B1F.inc @@ -1,5 +1,5 @@ -GraniteCave_B1F_MapObjects: @ 8534420 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 15, 21, 3, 1, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, 1051, 0, 0 +GraniteCave_B1F_EventObjects: @ 8534420 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 15, 21, 3, 1, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, 1051, 0, 0 GraniteCave_B1F_MapWarps: @ 8534438 warp_def 25, 13, 3, 1, GRANITE_CAVE_1F @@ -11,5 +11,5 @@ GraniteCave_B1F_MapWarps: @ 8534438 warp_def 29, 2, 3, 4, GRANITE_CAVE_B2F GraniteCave_B1F_MapEvents:: @ 8534470 - map_events GraniteCave_B1F_MapObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0 + map_events GraniteCave_B1F_EventObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/events/GraniteCave_B2F.inc index ebc9467f45..7c484e9a97 100644 --- a/data/maps/events/GraniteCave_B2F.inc +++ b/data/maps/events/GraniteCave_B2F.inc @@ -1,13 +1,13 @@ -GraniteCave_B2F_MapObjects: @ 8534484 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, 1053, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 29, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, 1054, 0, 0 - object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 5, 14, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 17, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 14, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 18, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 2, 16, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 19, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 7, 12, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 20, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 4, 22, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 21, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 6, 22, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 22, 0, 0 - object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 21, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 23, 0, 0 +GraniteCave_B2F_EventObjects: @ 8534484 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, 1053, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, 1054, 0, 0 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 5, 14, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 17, 0, 0 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 14, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 18, 0, 0 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 2, 16, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 19, 0, 0 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 7, 12, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 20, 0, 0 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 4, 22, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 21, 0, 0 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 6, 22, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 22, 0, 0 + object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 21, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 23, 0, 0 GraniteCave_B2F_MapWarps: @ 853455C warp_def 29, 13, 3, 2, GRANITE_CAVE_B1F @@ -21,5 +21,5 @@ GraniteCave_B2F_MapBGEvents: @ 8534584 bg_event 15, 11, 3, 7, 0, ITEM_EVERSTONE, 49, 0 GraniteCave_B2F_MapEvents:: @ 853459C - map_events GraniteCave_B2F_MapObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents + map_events GraniteCave_B2F_EventObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents diff --git a/data/maps/events/GraniteCave_StevensRoom.inc b/data/maps/events/GraniteCave_StevensRoom.inc index eca46cd79a..65b343202b 100644 --- a/data/maps/events/GraniteCave_StevensRoom.inc +++ b/data/maps/events/GraniteCave_StevensRoom.inc @@ -1,9 +1,9 @@ -GraniteCave_StevensRoom_MapObjects: @ 85345B0 - object_event 1, MAP_OBJ_GFX_STEVEN, 0, 0, 7, 8, 3, 1, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, 833, 0, 0 +GraniteCave_StevensRoom_EventObjects: @ 85345B0 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 0, 7, 8, 3, 1, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, 833, 0, 0 GraniteCave_StevensRoom_MapWarps: @ 85345C8 warp_def 7, 3, 3, 3, GRANITE_CAVE_1F GraniteCave_StevensRoom_MapEvents:: @ 85345D0 - map_events GraniteCave_StevensRoom_MapObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0 + map_events GraniteCave_StevensRoom_EventObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/events/InsideOfTruck.inc index 3e888ec44a..4cf23e63d4 100644 --- a/data/maps/events/InsideOfTruck.inc +++ b/data/maps/events/InsideOfTruck.inc @@ -1,7 +1,7 @@ -InsideOfTruck_MapObjects: @ 853A078 - object_event 1, MAP_OBJ_GFX_MOVING_BOX, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MOVING_BOX, 0, 0, 0, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MOVING_BOX, 0, 0, 2, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0 +InsideOfTruck_EventObjects: @ 853A078 + object_event 1, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 2, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0 InsideOfTruck_MapWarps: @ 853A0C0 warp_def 4, 1, 0, 127, NONE @@ -21,5 +21,5 @@ InsideOfTruck_MapBGEvents: @ 853A108 bg_event 0, 2, 0, 0, 0, InsideOfTruck_EventScript_23BF6C InsideOfTruck_MapEvents:: @ 853A144 - map_events InsideOfTruck_MapObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents + map_events InsideOfTruck_EventObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents diff --git a/data/maps/events/IslandCave.inc b/data/maps/events/IslandCave.inc index 094852c5a9..da1f94173c 100644 --- a/data/maps/events/IslandCave.inc +++ b/data/maps/events/IslandCave.inc @@ -1,5 +1,5 @@ -IslandCave_MapObjects: @ 8536C74 - object_event 1, MAP_OBJ_GFX_REGICE, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, IslandCave_EventScript_238F58, 936, 0, 0 +IslandCave_EventObjects: @ 8536C74 + object_event 1, EVENT_OBJ_GFX_REGICE, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, IslandCave_EventScript_238F58, 936, 0, 0 IslandCave_MapWarps: @ 8536C8C warp_def 8, 29, 3, 0, ROUTE_105 @@ -12,5 +12,5 @@ IslandCave_MapBGEvents: @ 8536CA4 bg_event 9, 20, 0, 0, 0, IslandCave_EventScript_238F1D IslandCave_MapEvents:: @ 8536CC8 - map_events IslandCave_MapObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents + map_events IslandCave_EventObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents diff --git a/data/maps/events/JaggedPass.inc b/data/maps/events/JaggedPass.inc index cc862fed1c..5d970924db 100644 --- a/data/maps/events/JaggedPass.inc +++ b/data/maps/events/JaggedPass.inc @@ -1,11 +1,11 @@ -JaggedPass_MapObjects: @ 8534AE4 - object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 10, 8, 3, 10, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_CAMPER, 0, 0, 16, 35, 3, 14, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 23, 24, 3, 1, 0, 0, 0, 0, JaggedPass_EventScript_291184, 1070, 0, 0 - object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 0, 9, 21, 3, 16, 17, 0, 1, 3, JaggedPass_EventScript_23079C, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 16, 19, 3, 7, 17, 0, 0, 0, JaggedPass_EventScript_230718, 847, 0, 0 - object_event 6, MAP_OBJ_GFX_PICNICKER, 0, 0, 14, 25, 3, 10, 17, 0, 1, 3, JaggedPass_EventScript_230871, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 18, 25, 3, 9, 17, 0, 1, 3, JaggedPass_EventScript_23085A, 0, 0, 0 +JaggedPass_EventObjects: @ 8534AE4 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 10, 8, 3, 10, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 0, 16, 35, 3, 14, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 23, 24, 3, 1, 0, 0, 0, 0, JaggedPass_EventScript_291184, 1070, 0, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 0, 9, 21, 3, 16, 17, 0, 1, 3, JaggedPass_EventScript_23079C, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 16, 19, 3, 7, 17, 0, 0, 0, JaggedPass_EventScript_230718, 847, 0, 0 + object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 0, 14, 25, 3, 10, 17, 0, 1, 3, JaggedPass_EventScript_230871, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 18, 25, 3, 9, 17, 0, 1, 3, JaggedPass_EventScript_23085A, 0, 0, 0 JaggedPass_MapWarps: @ 8534B8C warp_def 14, 40, 3, 2, ROUTE_112 @@ -31,5 +31,5 @@ JaggedPass_MapBGEvents: @ 8534C54 bg_event 7, 29, 3, 7, 0, ITEM_GREAT_BALL, 76, 0 JaggedPass_MapEvents:: @ 8534C6C - map_events JaggedPass_MapObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents + map_events JaggedPass_EventObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents diff --git a/data/maps/events/LavaridgeTown.inc b/data/maps/events/LavaridgeTown.inc index 0e16fc60c5..6580567682 100644 --- a/data/maps/events/LavaridgeTown.inc +++ b/data/maps/events/LavaridgeTown.inc @@ -1,13 +1,13 @@ -LavaridgeTown_MapObjects: @ 8527A54 - object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 8, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 10, 13, 3, 3, 32, 0, 0, 0, LavaridgeTown_EventScript_1EA720, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 0, 4, 4, 3, 18, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA729, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 0, 5, 4, 3, 17, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA732, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_GIDDY, 0, 0, 6, 16, 3, 9, 0, 0, 0, 0, 0x0, 930, 0, 0 - object_event 8, MAP_OBJ_GFX_HIPSTER, 0, 0, 12, 15, 0, 8, 0, 0, 0, 0, 0x0, 929, 0, 0 - object_event 9, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 4, 7, 3, 8, 17, 0, 0, 0, LavaridgeTown_EventScript_1EA744, 0, 0, 0 +LavaridgeTown_EventObjects: @ 8527A54 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 8, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 10, 13, 3, 3, 32, 0, 0, 0, LavaridgeTown_EventScript_1EA720, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 0, 4, 4, 3, 18, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA729, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 0, 5, 4, 3, 17, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA732, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_GIDDY, 0, 0, 6, 16, 3, 9, 0, 0, 0, 0, 0x0, 930, 0, 0 + object_event 8, EVENT_OBJ_GFX_HIPSTER, 0, 0, 12, 15, 0, 8, 0, 0, 0, 0, 0x0, 929, 0, 0 + object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 4, 7, 3, 8, 17, 0, 0, 0, LavaridgeTown_EventScript_1EA744, 0, 0, 0 LavaridgeTown_MapWarps: @ 8527B2C warp_def 12, 15, 0, 0, LAVARIDGE_TOWN_HERB_SHOP @@ -31,5 +31,5 @@ LavaridgeTown_MapBGEvents: @ 8527B6C bg_event 4, 5, 3, 7, 0, ITEM_ICE_HEAL, 0, 0 LavaridgeTown_MapEvents:: @ 8527BCC - map_events LavaridgeTown_MapObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents + map_events LavaridgeTown_EventObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents diff --git a/data/maps/events/LavaridgeTown_Gym_1F.inc b/data/maps/events/LavaridgeTown_Gym_1F.inc index a67522cb87..501cab67fc 100644 --- a/data/maps/events/LavaridgeTown_Gym_1F.inc +++ b/data/maps/events/LavaridgeTown_Gym_1F.inc @@ -1,10 +1,10 @@ -LavaridgeTown_Gym_1F_MapObjects: @ 852DE1C - object_event 1, MAP_OBJ_GFX_FLANNERY, 0, 0, 13, 9, 3, 8, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE78C, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_6, 0, 0, 3, 14, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE87F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 2, 15, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE900, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_6, 0, 0, 3, 10, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8AF, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_GIRL_3, 0, 0, 5, 2, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8E5, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_2, 0, 0, 12, 16, 3, 10, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE96C, 0, 0, 0 +LavaridgeTown_Gym_1F_EventObjects: @ 852DE1C + object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 0, 13, 9, 3, 8, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE78C, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 3, 14, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE87F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 2, 15, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE900, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 0, 3, 10, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8AF, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 2, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8E5, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 0, 12, 16, 3, 10, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE96C, 0, 0, 0 LavaridgeTown_Gym_1F_MapWarps: @ 852DEAC warp_def 13, 18, 3, 1, LAVARIDGE_TOWN @@ -39,5 +39,5 @@ LavaridgeTown_Gym_1F_MapBGEvents: @ 852DF7C bg_event 16, 15, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_1FE99B LavaridgeTown_Gym_1F_MapEvents:: @ 852DF94 - map_events LavaridgeTown_Gym_1F_MapObjects, LavaridgeTown_Gym_1F_MapWarps, 0x0, LavaridgeTown_Gym_1F_MapBGEvents + map_events LavaridgeTown_Gym_1F_EventObjects, LavaridgeTown_Gym_1F_MapWarps, 0x0, LavaridgeTown_Gym_1F_MapBGEvents diff --git a/data/maps/events/LavaridgeTown_Gym_B1F.inc b/data/maps/events/LavaridgeTown_Gym_B1F.inc index 0c0c4adaa0..af1f166ce9 100644 --- a/data/maps/events/LavaridgeTown_Gym_B1F.inc +++ b/data/maps/events/LavaridgeTown_Gym_B1F.inc @@ -1,8 +1,8 @@ -LavaridgeTown_Gym_B1F_MapObjects: @ 852DFA8 - object_event 1, MAP_OBJ_GFX_MAN_6, 0, 0, 4, 18, 3, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE91B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_6, 0, 0, 3, 6, 0, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE8CA, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_6, 0, 0, 13, 17, 0, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE936, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_HIKER, 0, 0, 4, 16, 3, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE951, 0, 0, 0 +LavaridgeTown_Gym_B1F_EventObjects: @ 852DFA8 + object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 0, 4, 18, 3, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE91B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 3, 6, 0, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE8CA, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 0, 13, 17, 0, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE936, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_HIKER, 0, 0, 4, 16, 3, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE951, 0, 0, 0 LavaridgeTown_Gym_B1F_MapWarps: @ 852E008 warp_def 10, 18, 3, 2, LAVARIDGE_TOWN_GYM_1F @@ -31,5 +31,5 @@ LavaridgeTown_Gym_B1F_MapWarps: @ 852E008 warp_def 12, 12, 3, 25, LAVARIDGE_TOWN_GYM_1F LavaridgeTown_Gym_B1F_MapEvents:: @ 852E0C8 - map_events LavaridgeTown_Gym_B1F_MapObjects, LavaridgeTown_Gym_B1F_MapWarps, 0x0, 0x0 + map_events LavaridgeTown_Gym_B1F_EventObjects, LavaridgeTown_Gym_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_HerbShop.inc b/data/maps/events/LavaridgeTown_HerbShop.inc index 76b5ac368e..9fa4c6376c 100644 --- a/data/maps/events/LavaridgeTown_HerbShop.inc +++ b/data/maps/events/LavaridgeTown_HerbShop.inc @@ -1,12 +1,12 @@ -LavaridgeTown_HerbShop_MapObjects: @ 852DDB0 - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4D7, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 7, 5, 3, 1, 17, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE505, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 3, 3, 5, 17, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0, 0, 0 +LavaridgeTown_HerbShop_EventObjects: @ 852DDB0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4D7, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 7, 5, 3, 1, 17, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE505, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 3, 3, 5, 17, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0, 0, 0 LavaridgeTown_HerbShop_MapWarps: @ 852DDF8 warp_def 3, 7, 0, 0, LAVARIDGE_TOWN warp_def 4, 7, 0, 0, LAVARIDGE_TOWN LavaridgeTown_HerbShop_MapEvents:: @ 852DE08 - map_events LavaridgeTown_HerbShop_MapObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0 + map_events LavaridgeTown_HerbShop_EventObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_House.inc b/data/maps/events/LavaridgeTown_House.inc index 82ae945b46..669728b669 100644 --- a/data/maps/events/LavaridgeTown_House.inc +++ b/data/maps/events/LavaridgeTown_House.inc @@ -1,12 +1,12 @@ -LavaridgeTown_House_MapObjects: @ 852E0DC - object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, LavaridgeTown_House_EventScript_1FF912, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 6, 6, 3, 1, 17, 0, 0, 0, LavaridgeTown_House_EventScript_1FF91B, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 8, 4, 3, 2, 17, 0, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0, 0, 0 +LavaridgeTown_House_EventObjects: @ 852E0DC + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, LavaridgeTown_House_EventScript_1FF912, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 6, 6, 3, 1, 17, 0, 0, 0, LavaridgeTown_House_EventScript_1FF91B, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 8, 4, 3, 2, 17, 0, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0, 0, 0 LavaridgeTown_House_MapWarps: @ 852E124 warp_def 3, 7, 0, 4, LAVARIDGE_TOWN warp_def 4, 7, 0, 4, LAVARIDGE_TOWN LavaridgeTown_House_MapEvents:: @ 852E134 - map_events LavaridgeTown_House_MapObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0 + map_events LavaridgeTown_House_EventObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_Mart.inc b/data/maps/events/LavaridgeTown_Mart.inc index db9c02f5ef..5230cead9c 100644 --- a/data/maps/events/LavaridgeTown_Mart.inc +++ b/data/maps/events/LavaridgeTown_Mart.inc @@ -1,12 +1,12 @@ -LavaridgeTown_Mart_MapObjects: @ 852E148 - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9CE, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9FE, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 9, 5, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0, 0, 0 +LavaridgeTown_Mart_EventObjects: @ 852E148 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9CE, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9FE, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 9, 5, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0, 0, 0 LavaridgeTown_Mart_MapWarps: @ 852E190 warp_def 3, 7, 0, 2, LAVARIDGE_TOWN warp_def 4, 7, 0, 2, LAVARIDGE_TOWN LavaridgeTown_Mart_MapEvents:: @ 852E1A0 - map_events LavaridgeTown_Mart_MapObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0 + map_events LavaridgeTown_Mart_EventObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc index 11ed52f9ad..8ebf9f16a7 100644 --- a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc +++ b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ -LavaridgeTown_PokemonCenter_1F_MapObjects: @ 852E1B4 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 0, 10, 6, 0, 9, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E, 0, 0, 0 +LavaridgeTown_PokemonCenter_1F_EventObjects: @ 852E1B4 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 10, 6, 0, 9, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E, 0, 0, 0 LavaridgeTown_PokemonCenter_1F_MapWarps: @ 852E214 warp_def 7, 8, 3, 3, LAVARIDGE_TOWN @@ -11,5 +11,5 @@ LavaridgeTown_PokemonCenter_1F_MapWarps: @ 852E214 warp_def 2, 1, 0, 5, LAVARIDGE_TOWN LavaridgeTown_PokemonCenter_1F_MapEvents:: @ 852E234 - map_events LavaridgeTown_PokemonCenter_1F_MapObjects, LavaridgeTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events LavaridgeTown_PokemonCenter_1F_EventObjects, LavaridgeTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc index dc0acec14f..53fc2b2ccf 100644 --- a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc +++ b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -LavaridgeTown_PokemonCenter_2F_MapObjects: @ 852E248 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +LavaridgeTown_PokemonCenter_2F_EventObjects: @ 852E248 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 LavaridgeTown_PokemonCenter_2F_MapWarps: @ 852E2A8 warp_def 1, 6, 4, 2, LAVARIDGE_TOWN_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ LavaridgeTown_PokemonCenter_2F_MapWarps: @ 852E2A8 warp_def 9, 1, 3, 0, TRADE_CENTER LavaridgeTown_PokemonCenter_2F_MapEvents:: @ 852E2C0 - map_events LavaridgeTown_PokemonCenter_2F_MapObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events LavaridgeTown_PokemonCenter_2F_EventObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/events/LilycoveCity.inc index 63aed18f88..c7578bec38 100644 --- a/data/maps/events/LilycoveCity.inc +++ b/data/maps/events/LilycoveCity.inc @@ -1,26 +1,26 @@ -LilycoveCity_MapObjects: @ 8526CE8 - object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 32, 20, 3, 3, 16, 0, 0, 0, LilycoveCity_EventScript_1E2C53, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 0, 15, 18, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C2B, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_1, 0, 0, 28, 28, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C22, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_4, 0, 0, 21, 15, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C4A, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_2, 0, 0, 16, 9, 5, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2C91, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_WOMAN_3, 0, 0, 35, 27, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C72, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 35, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 34, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 57, 17, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 73, 15, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, 852, 0, 0 - object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 61, 36, 5, 1, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, 1042, 0, 0 - object_event 12, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 43, 18, 3, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, 852, 0, 0 - object_event 13, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 46, 12, 3, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, 852, 0, 0 - object_event 14, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 45, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, 852, 0, 0 - object_event 15, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 38, 9, 5, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, 852, 0, 0 - object_event 16, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 50, 7, 5, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2BD8, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_HIPSTER, 0, 0, 27, 7, 5, 8, 17, 0, 0, 0, LilycoveCity_EventScript_1E2DDE, 971, 0, 0 - object_event 18, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 16, 23, 3, 10, 17, 0, 0, 0, LilycoveCity_EventScript_1E302D, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_WOMAN_4, 0, 0, 41, 25, 3, 9, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CEE, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_MAN_2, 0, 0, 40, 25, 3, 10, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CDD, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_SAILOR, 0, 0, 16, 34, 3, 8, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CCB, 0, 0, 0 - object_event 22, MAP_OBJ_GFX_FAT_MAN, 0, 0, 16, 35, 3, 7, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CD4, 0, 0, 0 +LilycoveCity_EventObjects: @ 8526CE8 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 32, 20, 3, 3, 16, 0, 0, 0, LilycoveCity_EventScript_1E2C53, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 15, 18, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C2B, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 0, 28, 28, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C22, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 0, 21, 15, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C4A, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 16, 9, 5, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2C91, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 35, 27, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C72, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 35, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 34, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 57, 17, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 73, 15, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, 852, 0, 0 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 61, 36, 5, 1, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, 1042, 0, 0 + object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 43, 18, 3, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, 852, 0, 0 + object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 46, 12, 3, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, 852, 0, 0 + object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 45, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, 852, 0, 0 + object_event 15, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 38, 9, 5, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, 852, 0, 0 + object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 50, 7, 5, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2BD8, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_HIPSTER, 0, 0, 27, 7, 5, 8, 17, 0, 0, 0, LilycoveCity_EventScript_1E2DDE, 971, 0, 0 + object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 16, 23, 3, 10, 17, 0, 0, 0, LilycoveCity_EventScript_1E302D, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 41, 25, 3, 9, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CEE, 0, 0, 0 + object_event 20, EVENT_OBJ_GFX_MAN_2, 0, 0, 40, 25, 3, 10, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CDD, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_SAILOR, 0, 0, 16, 34, 3, 8, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CCB, 0, 0, 0 + object_event 22, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 16, 35, 3, 7, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CD4, 0, 0, 0 LilycoveCity_MapWarps: @ 8526EF8 warp_def 27, 6, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_1F @@ -54,5 +54,5 @@ LilycoveCity_MapBGEvents: @ 8526F68 bg_event 64, 31, 0, 7, 0, ITEM_POKE_BALL, 75, 0 LilycoveCity_MapEvents:: @ 8527004 - map_events LilycoveCity_MapObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents + map_events LilycoveCity_EventObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents diff --git a/data/maps/events/LilycoveCity_ContestHall.inc b/data/maps/events/LilycoveCity_ContestHall.inc index 15501ebfd4..c450b0cd3e 100644 --- a/data/maps/events/LilycoveCity_ContestHall.inc +++ b/data/maps/events/LilycoveCity_ContestHall.inc @@ -1,36 +1,36 @@ -LilycoveCity_ContestHall_MapObjects: @ 8531850 - object_event 1, MAP_OBJ_GFX_BOY_1, 0, 0, 30, 30, 3, 2, 68, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B485, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_3, 0, 0, 11, 7, 3, 2, 51, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B48E, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 40, 8, 3, 2, 34, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B497, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 0, 12, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A9, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 0, 15, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4C0, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 10, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4D7, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4EE, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_MANIAC, 0, 0, 14, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B505, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_WOMAN_6, 0, 0, 16, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B51C, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 24, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B533, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_WOMAN_7, 0, 0, 18, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B56A, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_BOY_1, 0, 0, 8, 22, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B53C, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_WOMAN_4, 0, 0, 24, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B581, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 0, 27, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B598, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_WOMAN_5, 0, 0, 22, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5AF, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 24, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5C6, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 26, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5DD, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_WOMAN_2, 0, 0, 28, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5F4, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_WOMAN_3, 0, 0, 20, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B60B, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_WOMAN_1, 0, 0, 30, 11, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B639, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_MAN_1, 0, 0, 26, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B622, 0, 0, 0 - object_event 22, MAP_OBJ_GFX_CAMPER, 0, 0, 13, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B553, 0, 0, 0 - object_event 23, MAP_OBJ_GFX_WOMAN_4, 0, 0, 36, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B650, 0, 0, 0 - object_event 24, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 0, 39, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B667, 0, 0, 0 - object_event 25, MAP_OBJ_GFX_BOY_2, 0, 0, 34, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B67E, 0, 0, 0 - object_event 26, MAP_OBJ_GFX_GIRL_2, 0, 0, 36, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B695, 0, 0, 0 - object_event 27, MAP_OBJ_GFX_BOY_3, 0, 0, 38, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6AC, 0, 0, 0 - object_event 28, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 40, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6C3, 0, 0, 0 - object_event 29, MAP_OBJ_GFX_WOMAN_3, 0, 0, 32, 23, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6DA, 0, 0, 0 - object_event 30, MAP_OBJ_GFX_MAN_1, 0, 0, 37, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B71C, 0, 0, 0 - object_event 31, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 42, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B705, 0, 0, 0 - object_event 32, MAP_OBJ_GFX_SAILOR, 0, 0, 23, 26, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A0, 0, 0, 0 +LilycoveCity_ContestHall_EventObjects: @ 8531850 + object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 0, 30, 30, 3, 2, 68, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B485, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 0, 11, 7, 3, 2, 51, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B48E, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 40, 8, 3, 2, 34, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B497, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 12, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A9, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 0, 15, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4C0, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 10, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4D7, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4EE, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 0, 14, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B505, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 16, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B51C, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 24, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B533, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 18, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B56A, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 0, 8, 22, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B53C, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 24, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B581, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 0, 27, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B598, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 22, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5AF, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 24, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5C6, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 26, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5DD, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 28, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5F4, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 20, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B60B, 0, 0, 0 + object_event 20, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 30, 11, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B639, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_MAN_1, 0, 0, 26, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B622, 0, 0, 0 + object_event 22, EVENT_OBJ_GFX_CAMPER, 0, 0, 13, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B553, 0, 0, 0 + object_event 23, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 36, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B650, 0, 0, 0 + object_event 24, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 0, 39, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B667, 0, 0, 0 + object_event 25, EVENT_OBJ_GFX_BOY_2, 0, 0, 34, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B67E, 0, 0, 0 + object_event 26, EVENT_OBJ_GFX_GIRL_2, 0, 0, 36, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B695, 0, 0, 0 + object_event 27, EVENT_OBJ_GFX_BOY_3, 0, 0, 38, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6AC, 0, 0, 0 + object_event 28, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 40, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6C3, 0, 0, 0 + object_event 29, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 32, 23, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6DA, 0, 0, 0 + object_event 30, EVENT_OBJ_GFX_MAN_1, 0, 0, 37, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B71C, 0, 0, 0 + object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 42, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B705, 0, 0, 0 + object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 0, 23, 26, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A0, 0, 0, 0 LilycoveCity_ContestHall_MapWarps: @ 8531B50 warp_def 19, 32, 0, 2, LILYCOVE_CITY_CONTEST_LOBBY @@ -47,5 +47,5 @@ LilycoveCity_ContestHall_MapBGEvents: @ 8531B70 bg_event 35, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B73C LilycoveCity_ContestHall_MapEvents:: @ 8531BB8 - map_events LilycoveCity_ContestHall_MapObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents + map_events LilycoveCity_ContestHall_EventObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents diff --git a/data/maps/events/LilycoveCity_ContestLobby.inc b/data/maps/events/LilycoveCity_ContestLobby.inc index 6fc324f760..c6e900a18a 100644 --- a/data/maps/events/LilycoveCity_ContestLobby.inc +++ b/data/maps/events/LilycoveCity_ContestLobby.inc @@ -1,29 +1,29 @@ -LilycoveCity_ContestLobby_MapObjects: @ 8531534 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 14, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 15, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_5, 0, 0, 26, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ARTIST, 0, 0, 9, 1, 0, 1, 0, 0, 0, 0, 0x0, 774, 0, 0 - object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 18, 8, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A708, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_GIRL_2, 0, 0, 4, 9, 3, 2, 34, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A711, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ARTIST, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A71A, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_REPORTER_M, 0, 0, 13, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, 802, 0, 0 - object_event 9, MAP_OBJ_GFX_BOY_1, 0, 0, 23, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A768, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 28, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FB4, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_ARTIST, 0, 0, 21, 1, 0, 8, 0, 0, 0, 0, 0x0, 895, 0, 0 - object_event 12, MAP_OBJ_GFX_FISHERMAN, 0, 0, 5, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A72C, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_FAT_MAN, 0, 0, 0, 8, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A723, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 8, 7, 3, 3, 16, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A735, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_WOMAN_2, 0, 0, 22, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 26, 5, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, 873, 0, 0 - object_event 17, MAP_OBJ_GFX_GIRL_1, 0, 0, 24, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A771, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_MAN_6, 0, 0, 27, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, 832, 0, 0 - object_event 19, MAP_OBJ_GFX_CAMPER, 0, 0, 28, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, 832, 0, 0 - object_event 20, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 28, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, 832, 0, 0 - object_event 21, MAP_OBJ_GFX_SCIENTIST_2, 0, 0, 26, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, 832, 0, 0 - object_event 22, MAP_OBJ_GFX_WOMAN_1, 0, 0, 27, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, 832, 0, 0 - object_event 23, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 26, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, 832, 0, 0 - object_event 24, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 26, 5, 3, 10, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, 832, 0, 0 - object_event 25, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 9, 10, 3, 10, 34, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0, 0, 0 +LilycoveCity_ContestLobby_EventObjects: @ 8531534 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 14, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 15, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 0, 26, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 0, 9, 1, 0, 1, 0, 0, 0, 0, 0x0, 774, 0, 0 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 18, 8, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A708, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 0, 4, 9, 3, 2, 34, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A711, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A71A, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 0, 13, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, 802, 0, 0 + object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 0, 23, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A768, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 28, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FB4, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 0, 21, 1, 0, 8, 0, 0, 0, 0, 0x0, 895, 0, 0 + object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 5, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A72C, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 0, 8, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A723, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 8, 7, 3, 3, 16, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A735, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 22, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 26, 5, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, 873, 0, 0 + object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 0, 24, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A771, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 0, 27, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, 832, 0, 0 + object_event 19, EVENT_OBJ_GFX_CAMPER, 0, 0, 28, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, 832, 0, 0 + object_event 20, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 28, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, 832, 0, 0 + object_event 21, EVENT_OBJ_GFX_SCIENTIST_2, 0, 0, 26, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, 832, 0, 0 + object_event 22, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 27, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, 832, 0, 0 + object_event 23, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 26, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, 832, 0, 0 + object_event 24, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 26, 5, 3, 10, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, 832, 0, 0 + object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 9, 10, 3, 10, 34, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0, 0, 0 LilycoveCity_ContestLobby_MapWarps: @ 853178C warp_def 14, 11, 0, 4, LILYCOVE_CITY @@ -46,5 +46,5 @@ LilycoveCity_ContestLobby_MapBGEvents: @ 85317AC bg_event 18, 3, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A784 LilycoveCity_ContestLobby_MapEvents:: @ 853183C - map_events LilycoveCity_ContestLobby_MapObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents + map_events LilycoveCity_ContestLobby_EventObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc index e765a7390c..d3e5374ff6 100644 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc @@ -1,5 +1,5 @@ -LilycoveCity_CoveLilyMotel_1F_MapObjects: @ 8531134 - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 10, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218189, 0, 0, 0 +LilycoveCity_CoveLilyMotel_1F_EventObjects: @ 8531134 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 10, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218189, 0, 0, 0 LilycoveCity_CoveLilyMotel_1F_MapWarps: @ 853114C warp_def 5, 8, 0, 1, LILYCOVE_CITY @@ -10,5 +10,5 @@ LilycoveCity_CoveLilyMotel_1F_MapCoordEvents: @ 8531164 coord_event 10, 2, 3, 0, VAR_TEMP_1, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218211 LilycoveCity_CoveLilyMotel_1F_MapEvents:: @ 8531174 - map_events LilycoveCity_CoveLilyMotel_1F_MapObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0 + map_events LilycoveCity_CoveLilyMotel_1F_EventObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0 diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc index dfc0d3bd0d..60016ffbf9 100644 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc @@ -1,15 +1,15 @@ -LilycoveCity_CoveLilyMotel_2F_MapObjects: @ 8531188 - object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, 925, 0, 0 - object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 4, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, 925, 0, 0 - object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 7, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, 925, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 10, 3, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, 925, 0, 0 - object_event 5, MAP_OBJ_GFX_BOY_5, 0, 0, 7, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, 925, 0, 0 - object_event 6, MAP_OBJ_GFX_WOMAN_3, 0, 0, 4, 4, 3, 9, 17, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, 925, 0, 0 - object_event 7, MAP_OBJ_GFX_SCOTT, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, 787, 0, 0 +LilycoveCity_CoveLilyMotel_2F_EventObjects: @ 8531188 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, 925, 0, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 4, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, 925, 0, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 7, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, 925, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 10, 3, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, 925, 0, 0 + object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 0, 7, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, 925, 0, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 4, 4, 3, 9, 17, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, 925, 0, 0 + object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, 787, 0, 0 LilycoveCity_CoveLilyMotel_2F_MapWarps: @ 8531230 warp_def 2, 1, 0, 2, LILYCOVE_CITY_COVE_LILY_MOTEL_1F LilycoveCity_CoveLilyMotel_2F_MapEvents:: @ 8531238 - map_events LilycoveCity_CoveLilyMotel_2F_MapObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0 + map_events LilycoveCity_CoveLilyMotel_2F_EventObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc index 6c572ce4da..d9d6b469e4 100644 --- a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc @@ -1,10 +1,10 @@ -LilycoveCity_DepartmentStoreElevator_MapObjects: @ 85324B0 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_220624, 0, 0, 0 +LilycoveCity_DepartmentStoreElevator_EventObjects: @ 85324B0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_220624, 0, 0, 0 LilycoveCity_DepartmentStoreElevator_MapWarps: @ 85324C8 warp_def 1, 5, 3, 127, NONE warp_def 2, 5, 3, 127, NONE LilycoveCity_DepartmentStoreElevator_MapEvents:: @ 85324D8 - map_events LilycoveCity_DepartmentStoreElevator_MapObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0 + map_events LilycoveCity_DepartmentStoreElevator_EventObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc index eb0ee1a96b..7a234183dd 100644 --- a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc @@ -1,8 +1,8 @@ -LilycoveCity_DepartmentStoreRooftop_MapObjects: @ 853241C - object_event 1, MAP_OBJ_GFX_MAN_2, 0, 0, 4, 4, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 7, 5, 3, 5, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 0, 6, 1, 3, 8, 17, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, 962, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 0, 15, 5, 3, 8, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0, 0, 0 +LilycoveCity_DepartmentStoreRooftop_EventObjects: @ 853241C + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 4, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 7, 5, 3, 5, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 0, 6, 1, 3, 8, 17, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, 962, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 15, 5, 3, 8, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0, 0, 0 LilycoveCity_DepartmentStoreRooftop_MapWarps: @ 853247C warp_def 13, 3, 0, 2, LILYCOVE_CITY_DEPARTMENT_STORE_5F @@ -12,5 +12,5 @@ LilycoveCity_DepartmentStoreRooftop_MapBGEvents: @ 8532484 bg_event 10, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220295 LilycoveCity_DepartmentStoreRooftop_MapEvents:: @ 853249C - map_events LilycoveCity_DepartmentStoreRooftop_MapObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents + map_events LilycoveCity_DepartmentStoreRooftop_EventObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents diff --git a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc index 10fb7f16ee..ad7d79ac52 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc @@ -1,10 +1,10 @@ -LilycoveCity_DepartmentStore_1F_MapObjects: @ 853208C - object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F693, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BEAUTY, 0, 0, 10, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F69C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 14, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F82F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 4, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F838, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_3, 0, 0, 3, 6, 3, 1, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F841, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_AZUMARILL, 0, 0, 2, 6, 3, 1, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F84A, 0, 0, 0 +LilycoveCity_DepartmentStore_1F_EventObjects: @ 853208C + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F693, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 0, 10, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F69C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 14, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F82F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 4, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F838, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 0, 3, 6, 3, 1, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F841, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 2, 6, 3, 1, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F84A, 0, 0, 0 LilycoveCity_DepartmentStore_1F_MapWarps: @ 853211C warp_def 8, 7, 0, 0, LILYCOVE_CITY @@ -16,5 +16,5 @@ LilycoveCity_DepartmentStore_1F_MapBGEvents: @ 853213C bg_event 0, 8, 0, 1, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F85D LilycoveCity_DepartmentStore_1F_MapEvents:: @ 8532148 - map_events LilycoveCity_DepartmentStore_1F_MapObjects, LilycoveCity_DepartmentStore_1F_MapWarps, 0x0, LilycoveCity_DepartmentStore_1F_MapBGEvents + map_events LilycoveCity_DepartmentStore_1F_EventObjects, LilycoveCity_DepartmentStore_1F_MapWarps, 0x0, LilycoveCity_DepartmentStore_1F_MapBGEvents diff --git a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc index 95c4daee06..29169a491b 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc @@ -1,9 +1,9 @@ -LilycoveCity_DepartmentStore_2F_MapObjects: @ 853215C - object_event 1, MAP_OBJ_GFX_COOK, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB2D, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB36, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SAILOR, 0, 0, 13, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB3F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 0, 10, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB7A, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0, 0, 0 +LilycoveCity_DepartmentStore_2F_EventObjects: @ 853215C + object_event 1, EVENT_OBJ_GFX_COOK, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB2D, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB36, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 0, 13, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB3F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 10, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB7A, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0, 0, 0 LilycoveCity_DepartmentStore_2F_MapWarps: @ 85321D4 warp_def 16, 1, 0, 2, LILYCOVE_CITY_DEPARTMENT_STORE_1F @@ -11,5 +11,5 @@ LilycoveCity_DepartmentStore_2F_MapWarps: @ 85321D4 warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_2F_MapEvents:: @ 85321EC - map_events LilycoveCity_DepartmentStore_2F_MapObjects, LilycoveCity_DepartmentStore_2F_MapWarps, 0x0, 0x0 + map_events LilycoveCity_DepartmentStore_2F_EventObjects, LilycoveCity_DepartmentStore_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc index d51060bbac..ff372e132d 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc @@ -1,9 +1,9 @@ -LilycoveCity_DepartmentStore_3F_MapObjects: @ 8532200 - object_event 1, MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCB6, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_3, 0, 0, 7, 7, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCBF, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 13, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCC8, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC65, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 0, 10, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0, 0, 0 +LilycoveCity_DepartmentStore_3F_EventObjects: @ 8532200 + object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCB6, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 0, 7, 7, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCBF, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 13, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCC8, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC65, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 10, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0, 0, 0 LilycoveCity_DepartmentStore_3F_MapWarps: @ 8532278 warp_def 13, 1, 0, 1, LILYCOVE_CITY_DEPARTMENT_STORE_2F @@ -11,5 +11,5 @@ LilycoveCity_DepartmentStore_3F_MapWarps: @ 8532278 warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_3F_MapEvents:: @ 8532290 - map_events LilycoveCity_DepartmentStore_3F_MapObjects, LilycoveCity_DepartmentStore_3F_MapWarps, 0x0, 0x0 + map_events LilycoveCity_DepartmentStore_3F_EventObjects, LilycoveCity_DepartmentStore_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc index 4b2f0f00cf..ba97f6a984 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc @@ -1,9 +1,9 @@ -LilycoveCity_DepartmentStore_4F_MapObjects: @ 85322A4 - object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 0, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDEB, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 6, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDF4, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 13, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDFD, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE06, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 0, 9, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0, 0, 0 +LilycoveCity_DepartmentStore_4F_EventObjects: @ 85322A4 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 0, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDEB, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 6, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDF4, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 13, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDFD, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE06, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 9, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0, 0, 0 LilycoveCity_DepartmentStore_4F_MapWarps: @ 853231C warp_def 16, 1, 0, 1, LILYCOVE_CITY_DEPARTMENT_STORE_3F @@ -11,5 +11,5 @@ LilycoveCity_DepartmentStore_4F_MapWarps: @ 853231C warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_4F_MapEvents:: @ 8532334 - map_events LilycoveCity_DepartmentStore_4F_MapObjects, LilycoveCity_DepartmentStore_4F_MapWarps, 0x0, 0x0 + map_events LilycoveCity_DepartmentStore_4F_EventObjects, LilycoveCity_DepartmentStore_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc index f459b4764b..85a6e871a6 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc @@ -1,11 +1,11 @@ -LilycoveCity_DepartmentStore_5F_MapObjects: @ 8532348 - object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_2200BC, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 7, 7, 3, 17, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22006C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFA6, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 0, 9, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFDC, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 0, 15, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22000A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_WOMAN_4, 0, 0, 17, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22003A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 0, 9, 5, 3, 10, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0, 0, 0 +LilycoveCity_DepartmentStore_5F_EventObjects: @ 8532348 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_2200BC, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 7, 7, 3, 17, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22006C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFA6, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 9, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFDC, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 15, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22000A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 17, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22003A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 9, 5, 3, 10, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0, 0, 0 LilycoveCity_DepartmentStore_5F_MapWarps: @ 85323F0 warp_def 13, 1, 0, 1, LILYCOVE_CITY_DEPARTMENT_STORE_4F @@ -13,5 +13,5 @@ LilycoveCity_DepartmentStore_5F_MapWarps: @ 85323F0 warp_def 16, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP LilycoveCity_DepartmentStore_5F_MapEvents:: @ 8532408 - map_events LilycoveCity_DepartmentStore_5F_MapObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0 + map_events LilycoveCity_DepartmentStore_5F_EventObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_Harbor.inc b/data/maps/events/LilycoveCity_Harbor.inc index f2088e9d2f..d12e31646f 100644 --- a/data/maps/events/LilycoveCity_Harbor.inc +++ b/data/maps/events/LilycoveCity_Harbor.inc @@ -1,14 +1,14 @@ -LilycoveCity_Harbor_MapObjects: @ 8531E1C - object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, 908, 0, 0 - object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 861, 0, 0 - object_event 3, MAP_OBJ_GFX_SAILOR, 0, 0, 3, 13, 3, 2, 17, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SAILOR, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, 0x0, 909, 0, 0 - object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 8, 10, 3, 8, 17, 0, 0, 0, 0x0, 748, 0, 0 +LilycoveCity_Harbor_EventObjects: @ 8531E1C + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, 908, 0, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 861, 0, 0 + object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 0, 3, 13, 3, 2, 17, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, 0x0, 909, 0, 0 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 8, 10, 3, 8, 17, 0, 0, 0, 0x0, 748, 0, 0 LilycoveCity_Harbor_MapWarps: @ 8531E94 warp_def 11, 14, 0, 12, LILYCOVE_CITY warp_def 12, 14, 0, 12, LILYCOVE_CITY LilycoveCity_Harbor_MapEvents:: @ 8531EA4 - map_events LilycoveCity_Harbor_MapObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0 + map_events LilycoveCity_Harbor_EventObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House1.inc b/data/maps/events/LilycoveCity_House1.inc index 1edca49043..f4bef7d8b0 100644 --- a/data/maps/events/LilycoveCity_House1.inc +++ b/data/maps/events/LilycoveCity_House1.inc @@ -1,11 +1,11 @@ -LilycoveCity_House1_MapObjects: @ 8531EF4 - object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 5, 3, 9, 17, 0, 0, 0, LilycoveCity_House1_EventScript_21ECCE, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_KECLEON_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House1_EventScript_21ECD7, 0, 0, 0 +LilycoveCity_House1_EventObjects: @ 8531EF4 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 5, 3, 9, 17, 0, 0, 0, LilycoveCity_House1_EventScript_21ECCE, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House1_EventScript_21ECD7, 0, 0, 0 LilycoveCity_House1_MapWarps: @ 8531F24 warp_def 3, 8, 0, 8, LILYCOVE_CITY warp_def 4, 8, 0, 8, LILYCOVE_CITY LilycoveCity_House1_MapEvents:: @ 8531F34 - map_events LilycoveCity_House1_MapObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0 + map_events LilycoveCity_House1_EventObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House2.inc b/data/maps/events/LilycoveCity_House2.inc index 2321844fab..36f9f50b21 100644 --- a/data/maps/events/LilycoveCity_House2.inc +++ b/data/maps/events/LilycoveCity_House2.inc @@ -1,10 +1,10 @@ -LilycoveCity_House2_MapObjects: @ 8531F48 - object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House2_EventScript_21ED75, 0, 0, 0 +LilycoveCity_House2_EventObjects: @ 8531F48 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House2_EventScript_21ED75, 0, 0, 0 LilycoveCity_House2_MapWarps: @ 8531F60 warp_def 2, 7, 0, 9, LILYCOVE_CITY warp_def 3, 7, 0, 9, LILYCOVE_CITY LilycoveCity_House2_MapEvents:: @ 8531F70 - map_events LilycoveCity_House2_MapObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0 + map_events LilycoveCity_House2_EventObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House3.inc b/data/maps/events/LilycoveCity_House3.inc index 05b36263a7..f7b2e561b6 100644 --- a/data/maps/events/LilycoveCity_House3.inc +++ b/data/maps/events/LilycoveCity_House3.inc @@ -1,15 +1,15 @@ -LilycoveCity_House3_MapObjects: @ 8531F84 - object_event 1, MAP_OBJ_GFX_BOY_5, 0, 0, 3, 4, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_5, 0, 0, 1, 4, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_5, 0, 0, 2, 5, 3, 7, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EF09, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BOY_5, 0, 0, 2, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EEA1, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_1, 0, 0, 7, 5, 3, 9, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EE8A, 0, 0, 0 +LilycoveCity_House3_EventObjects: @ 8531F84 + object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 0, 3, 4, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_5, 0, 0, 1, 4, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_5, 0, 0, 2, 5, 3, 7, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EF09, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 0, 2, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EEA1, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 5, 3, 9, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EE8A, 0, 0, 0 LilycoveCity_House3_MapWarps: @ 8532014 warp_def 3, 7, 0, 10, LILYCOVE_CITY warp_def 4, 7, 0, 10, LILYCOVE_CITY LilycoveCity_House3_MapEvents:: @ 8532024 - map_events LilycoveCity_House3_MapObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0 + map_events LilycoveCity_House3_EventObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House4.inc b/data/maps/events/LilycoveCity_House4.inc index 9212c1e0e1..ebf845f918 100644 --- a/data/maps/events/LilycoveCity_House4.inc +++ b/data/maps/events/LilycoveCity_House4.inc @@ -1,11 +1,11 @@ -LilycoveCity_House4_MapObjects: @ 8532038 - object_event 1, MAP_OBJ_GFX_MAN_5, 0, 0, 1, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_House4_EventScript_21F5B5, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_House4_EventScript_21F5BE, 0, 0, 0 +LilycoveCity_House4_EventObjects: @ 8532038 + object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 0, 1, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_House4_EventScript_21F5B5, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_House4_EventScript_21F5BE, 0, 0, 0 LilycoveCity_House4_MapWarps: @ 8532068 warp_def 3, 8, 0, 11, LILYCOVE_CITY warp_def 4, 8, 0, 11, LILYCOVE_CITY LilycoveCity_House4_MapEvents:: @ 8532078 - map_events LilycoveCity_House4_MapObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0 + map_events LilycoveCity_House4_EventObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc index 36b9b5ac25..297db79797 100644 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc @@ -1,14 +1,14 @@ -LilycoveCity_LilycoveMuseum_1F_MapObjects: @ 853124C - object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 5, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 16, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, 775, 0, 0 - object_event 3, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 13, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ARTIST, 0, 0, 13, 10, 3, 5, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E07, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_WOMAN_5, 0, 0, 3, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E10, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 0, 11, 3, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, 776, 0, 0 - object_event 8, MAP_OBJ_GFX_ARTIST, 0, 0, 19, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, 779, 0, 0 - object_event 9, MAP_OBJ_GFX_FAT_MAN, 0, 0, 2, 2, 3, 2, 34, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, 780, 0, 0 - object_event 10, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 6, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, 778, 0, 0 +LilycoveCity_LilycoveMuseum_1F_EventObjects: @ 853124C + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 5, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 16, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, 775, 0, 0 + object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 13, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 0, 13, 10, 3, 5, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E07, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 3, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E10, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 11, 3, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, 776, 0, 0 + object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 0, 19, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, 779, 0, 0 + object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 2, 2, 3, 2, 34, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, 780, 0, 0 + object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 6, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, 778, 0, 0 LilycoveCity_LilycoveMuseum_1F_MapWarps: @ 853133C warp_def 9, 13, 0, 3, LILYCOVE_CITY @@ -34,5 +34,5 @@ LilycoveCity_LilycoveMuseum_1F_MapBGEvents: @ 8531354 bg_event 16, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC LilycoveCity_LilycoveMuseum_1F_MapEvents:: @ 8531414 - map_events LilycoveCity_LilycoveMuseum_1F_MapObjects, LilycoveCity_LilycoveMuseum_1F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_1F_MapBGEvents + map_events LilycoveCity_LilycoveMuseum_1F_EventObjects, LilycoveCity_LilycoveMuseum_1F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_1F_MapBGEvents diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc index 829db7b360..3e85e20a14 100644 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc @@ -1,8 +1,8 @@ -LilycoveCity_LilycoveMuseum_2F_MapObjects: @ 8531428 - object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 10, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 0, 19, 10, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, 777, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 7, 3, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, 780, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_4, 0, 0, 14, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, 780, 0, 0 +LilycoveCity_LilycoveMuseum_2F_EventObjects: @ 8531428 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 10, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 0, 19, 10, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, 777, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 7, 3, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, 780, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 0, 14, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, 780, 0, 0 LilycoveCity_LilycoveMuseum_2F_MapWarps: @ 8531488 warp_def 13, 1, 0, 2, LILYCOVE_CITY_LILYCOVE_MUSEUM_1F @@ -22,5 +22,5 @@ LilycoveCity_LilycoveMuseum_2F_MapBGEvents: @ 8531490 bg_event 15, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA LilycoveCity_LilycoveMuseum_2F_MapEvents:: @ 8531520 - map_events LilycoveCity_LilycoveMuseum_2F_MapObjects, LilycoveCity_LilycoveMuseum_2F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_2F_MapBGEvents + map_events LilycoveCity_LilycoveMuseum_2F_EventObjects, LilycoveCity_LilycoveMuseum_2F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_2F_MapBGEvents diff --git a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc index 1b5f4bda5b..3f89c8aa9f 100644 --- a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc +++ b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc @@ -1,10 +1,10 @@ -LilycoveCity_MoveDeletersHouse_MapObjects: @ 8531EB8 - object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0, 0, 0 +LilycoveCity_MoveDeletersHouse_EventObjects: @ 8531EB8 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0, 0, 0 LilycoveCity_MoveDeletersHouse_MapWarps: @ 8531ED0 warp_def 3, 7, 0, 7, LILYCOVE_CITY warp_def 4, 7, 0, 7, LILYCOVE_CITY LilycoveCity_MoveDeletersHouse_MapEvents:: @ 8531EE0 - map_events LilycoveCity_MoveDeletersHouse_MapObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0 + map_events LilycoveCity_MoveDeletersHouse_EventObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc index ba8988b964..7418668439 100644 --- a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc +++ b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc @@ -1,9 +1,9 @@ -LilycoveCity_PokemonCenter_1F_MapObjects: @ 8531BCC - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5E8, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_1, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5F6, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MANIAC, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_HIPSTER, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_TRADER, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, 993, 0, 0 +LilycoveCity_PokemonCenter_1F_EventObjects: @ 8531BCC + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5E8, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5F6, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_TRADER, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, 993, 0, 0 LilycoveCity_PokemonCenter_1F_MapWarps: @ 8531C44 warp_def 7, 8, 3, 2, LILYCOVE_CITY @@ -11,5 +11,5 @@ LilycoveCity_PokemonCenter_1F_MapWarps: @ 8531C44 warp_def 1, 6, 4, 0, LILYCOVE_CITY_POKEMON_CENTER_2F LilycoveCity_PokemonCenter_1F_MapEvents:: @ 8531C5C - map_events LilycoveCity_PokemonCenter_1F_MapObjects, LilycoveCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events LilycoveCity_PokemonCenter_1F_EventObjects, LilycoveCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc index 024b564275..b8bd673684 100644 --- a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc +++ b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -LilycoveCity_PokemonCenter_2F_MapObjects: @ 8531C70 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +LilycoveCity_PokemonCenter_2F_EventObjects: @ 8531C70 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 LilycoveCity_PokemonCenter_2F_MapWarps: @ 8531CD0 warp_def 1, 6, 4, 2, LILYCOVE_CITY_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ LilycoveCity_PokemonCenter_2F_MapWarps: @ 8531CD0 warp_def 9, 1, 3, 0, TRADE_CENTER LilycoveCity_PokemonCenter_2F_MapEvents:: @ 8531CE8 - map_events LilycoveCity_PokemonCenter_2F_MapObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events LilycoveCity_PokemonCenter_2F_EventObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc index 886927d3ee..427d8bc423 100644 --- a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc @@ -1,18 +1,18 @@ -LilycoveCity_PokemonTrainerFanClub_MapObjects: @ 8531D20 - object_event 1, MAP_OBJ_GFX_LASS, 0, 0, 3, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_5, 0, 0, 8, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_3, 0, 0, 6, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 5, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 7, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, 791, 0, 0 - object_event 6, MAP_OBJ_GFX_BOY_2, 0, 0, 1, 9, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, 790, 0, 0 - object_event 7, MAP_OBJ_GFX_WOMAN_4, 0, 0, 3, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, 792, 0, 0 - object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 10, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, 789, 0, 0 - object_event 9, MAP_OBJ_GFX_BOY_1, 0, 0, 11, 5, 3, 8, 17, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, 730, 0, 0 +LilycoveCity_PokemonTrainerFanClub_EventObjects: @ 8531D20 + object_event 1, EVENT_OBJ_GFX_LASS, 0, 0, 3, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 8, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 5, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 7, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, 791, 0, 0 + object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 0, 1, 9, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, 790, 0, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 3, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, 792, 0, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 10, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, 789, 0, 0 + object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 0, 11, 5, 3, 8, 17, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, 730, 0, 0 LilycoveCity_PokemonTrainerFanClub_MapWarps: @ 8531DF8 warp_def 6, 13, 0, 5, LILYCOVE_CITY warp_def 5, 13, 0, 5, LILYCOVE_CITY LilycoveCity_PokemonTrainerFanClub_MapEvents:: @ 8531E08 - map_events LilycoveCity_PokemonTrainerFanClub_MapObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0 + map_events LilycoveCity_PokemonTrainerFanClub_EventObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LinkContestRoom1.inc b/data/maps/events/LinkContestRoom1.inc index 248ca948d4..641c1bdd13 100644 --- a/data/maps/events/LinkContestRoom1.inc +++ b/data/maps/events/LinkContestRoom1.inc @@ -1,18 +1,18 @@ -LinkContestRoom1_MapObjects: @ 8539EFC - object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 0, 6, 4, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 0, 7, 4, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_HIPSTER, 0, 0, 4, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_TRADER, 0, 0, 6, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_STORYTELLER, 0, 0, 8, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 2, 6, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 +LinkContestRoom1_EventObjects: @ 8539EFC + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 6, 4, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 0, 7, 4, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 0, 4, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_TRADER, 0, 0, 6, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 8, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 2, 6, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 object_event 7, 246, 0, 0, 4, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 object_event 8, 247, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 object_event 9, 248, 0, 0, 9, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 object_event 10, 249, 0, 0, 10, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 object_event 11, 250, 0, 0, 12, 5, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 2, 5, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 3, 1, 0, 0, 0, 0, 0x0, 86, 0, 0 - object_event 14, MAP_OBJ_GFX_GIDDY, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_ARTIST, 0, 0, 12, 6, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 2, 5, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 3, 1, 0, 0, 0, 0, 0x0, 86, 0, 0 + object_event 14, EVENT_OBJ_GFX_GIDDY, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 0, 12, 6, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0 LinkContestRoom1_MapEvents:: @ 853A064 diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/events/LittlerootTown.inc index 763391b098..7a2ed7c9fe 100644 --- a/data/maps/events/LittlerootTown.inc +++ b/data/maps/events/LittlerootTown.inc @@ -1,12 +1,12 @@ -LittlerootTown_MapObjects: @ 85276A8 - object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 16, 10, 3, 2, 33, 0, 0, 0, LittlerootTown_EventScript_1E8034, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 12, 13, 3, 2, 18, 0, 0, 0, LittlerootTown_EventScript_1E8022, 868, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_2, 0, 0, 14, 17, 3, 2, 18, 0, 0, 0, LittlerootTown_EventScript_1E802B, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MOM, 0, 0, 5, 8, 3, 7, 0, 0, 0, 0, LittlerootTown_EventScript_1E863D, 752, 0, 0 - object_event 5, MAP_OBJ_GFX_TRUCK, 0, 0, 2, 10, 4, 10, 0, 0, 0, 0, 0x0, 761, 0, 0 - object_event 6, MAP_OBJ_GFX_TRUCK, 0, 0, 11, 10, 4, 10, 0, 0, 0, 0, 0x0, 762, 0, 0 - object_event 7, MAP_OBJ_GFX_HIPSTER, 0, 0, 13, 10, 3, 7, 17, 0, 0, 0, 0x0, 794, 0, 0 - object_event 8, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 14, 10, 3, 7, 17, 0, 0, 0, 0x0, 795, 0, 0 +LittlerootTown_EventObjects: @ 85276A8 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 16, 10, 3, 2, 33, 0, 0, 0, LittlerootTown_EventScript_1E8034, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 12, 13, 3, 2, 18, 0, 0, 0, LittlerootTown_EventScript_1E8022, 868, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 0, 14, 17, 3, 2, 18, 0, 0, 0, LittlerootTown_EventScript_1E802B, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MOM, 0, 0, 5, 8, 3, 7, 0, 0, 0, 0, LittlerootTown_EventScript_1E863D, 752, 0, 0 + object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 0, 2, 10, 4, 10, 0, 0, 0, 0, 0x0, 761, 0, 0 + object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 0, 11, 10, 4, 10, 0, 0, 0, 0, 0x0, 762, 0, 0 + object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 0, 13, 10, 3, 7, 17, 0, 0, 0, 0x0, 794, 0, 0 + object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 14, 10, 3, 7, 17, 0, 0, 0, 0x0, 795, 0, 0 LittlerootTown_MapWarps: @ 8527768 warp_def 14, 8, 0, 1, LITTLEROOT_TOWN_MAYS_HOUSE_1F @@ -31,5 +31,5 @@ LittlerootTown_MapBGEvents: @ 8527810 bg_event 12, 8, 3, 0, 0, LittlerootTown_EventScript_1E818F LittlerootTown_MapEvents:: @ 8527840 - map_events LittlerootTown_MapObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents + map_events LittlerootTown_EventObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc index 6f6fc9df4d..f97d49985f 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc @@ -1,11 +1,11 @@ -LittlerootTown_BrendansHouse_1F_MapObjects: @ 852D08C - object_event 1, MAP_OBJ_GFX_MOM, 0, 0, 2, 6, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, 758, 0, 0 - object_event 2, MAP_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 0, 1, 3, 3, 28, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, 755, 0, 0 - object_event 3, MAP_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 0, 4, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, 754, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 0, 2, 7, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, 784, 0, 0 - object_event 5, MAP_OBJ_GFX_NORMAN, 0, 0, 5, 6, 3, 9, 17, 0, 0, 0, 0x0, 734, 0, 0 - object_event 6, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 5, 3, 5, 17, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, 735, 0, 0 - object_event 7, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 8, 8, 3, 7, 17, 0, 0, 0, 0x0, 745, 0, 0 +LittlerootTown_BrendansHouse_1F_EventObjects: @ 852D08C + object_event 1, EVENT_OBJ_GFX_MOM, 0, 0, 2, 6, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, 758, 0, 0 + object_event 2, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 0, 1, 3, 3, 28, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, 755, 0, 0 + object_event 3, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 0, 4, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, 754, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 2, 7, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, 784, 0, 0 + object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 0, 5, 6, 3, 9, 17, 0, 0, 0, 0x0, 734, 0, 0 + object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 5, 3, 5, 17, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, 735, 0, 0 + object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 8, 8, 3, 7, 17, 0, 0, 0, 0x0, 745, 0, 0 LittlerootTown_BrendansHouse_1F_MapWarps: @ 852D134 warp_def 9, 8, 0, 1, LITTLEROOT_TOWN @@ -19,5 +19,5 @@ LittlerootTown_BrendansHouse_1F_MapCoordEvents: @ 852D14C coord_event 9, 3, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F78D6 LittlerootTown_BrendansHouse_1F_MapEvents:: @ 852D18C - map_events LittlerootTown_BrendansHouse_1F_MapObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0 + map_events LittlerootTown_BrendansHouse_1F_EventObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc index af470cca5b..d7733b800c 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc @@ -1,20 +1,20 @@ -LittlerootTown_BrendansHouse_2F_MapObjects: @ 852D1A0 - object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 1, 0, 8, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, 760, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 1, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 1, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 0, 1, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 4, 1, 0, 0, 0, 0, 0x0, 179, 0, 0 +LittlerootTown_BrendansHouse_2F_EventObjects: @ 852D1A0 + object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 1, 0, 8, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, 760, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 1, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 1, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 0, 1, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 4, 1, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 2, 3, 1, 0, 0, 0, 0, 0x0, 182, 0, 0 object_event 11, 249, 0, 0, 1, 3, 3, 1, 0, 0, 0, 0, 0x0, 183, 0, 0 object_event 12, 250, 0, 0, 1, 4, 3, 1, 0, 0, 0, 0, 0x0, 184, 0, 0 object_event 13, 251, 0, 0, 1, 5, 0, 1, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, MAP_OBJ_GFX_MOM, 0, 0, 7, 1, 3, 8, 1, 0, 0, 0, 0x0, 757, 0, 0 - object_event 15, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 0, 1, 17, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, 817, 0, 0 - object_event 16, MAP_OBJ_GFX_SWABLU_DOLL, 0, 0, 5, 5, 3, 1, 17, 0, 0, 0, 0x0, 815, 0, 0 + object_event 14, EVENT_OBJ_GFX_MOM, 0, 0, 7, 1, 3, 8, 1, 0, 0, 0, 0x0, 757, 0, 0 + object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 0, 1, 17, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, 817, 0, 0 + object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 0, 5, 5, 3, 1, 17, 0, 0, 0, 0x0, 815, 0, 0 LittlerootTown_BrendansHouse_2F_MapWarps: @ 852D320 warp_def 7, 1, 0, 2, LITTLEROOT_TOWN_BRENDANS_HOUSE_1F @@ -26,5 +26,5 @@ LittlerootTown_BrendansHouse_2F_MapBGEvents: @ 852D328 bg_event 3, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F865F LittlerootTown_BrendansHouse_2F_MapEvents:: @ 852D358 - map_events LittlerootTown_BrendansHouse_2F_MapObjects, LittlerootTown_BrendansHouse_2F_MapWarps, 0x0, LittlerootTown_BrendansHouse_2F_MapBGEvents + map_events LittlerootTown_BrendansHouse_2F_EventObjects, LittlerootTown_BrendansHouse_2F_MapWarps, 0x0, LittlerootTown_BrendansHouse_2F_MapBGEvents diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/events/LittlerootTown_MaysHouse_1F.inc index 68bf13bcd5..ccee2d442d 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_1F.inc @@ -1,11 +1,11 @@ -LittlerootTown_MaysHouse_1F_MapObjects: @ 852D36C - object_event 1, MAP_OBJ_GFX_MOM, 0, 0, 8, 6, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, 759, 0, 0 - object_event 2, MAP_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 0, 6, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, 754, 0, 0 - object_event 3, MAP_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 0, 9, 3, 3, 27, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, 755, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 0, 8, 7, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, 785, 0, 0 - object_event 5, MAP_OBJ_GFX_NORMAN, 0, 0, 5, 6, 3, 10, 17, 0, 0, 0, 0x0, 734, 0, 0 - object_event 6, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 9, 5, 3, 5, 17, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, 736, 0, 0 - object_event 7, MAP_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 0, 2, 8, 3, 7, 17, 0, 0, 0, 0x0, 746, 0, 0 +LittlerootTown_MaysHouse_1F_EventObjects: @ 852D36C + object_event 1, EVENT_OBJ_GFX_MOM, 0, 0, 8, 6, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, 759, 0, 0 + object_event 2, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 0, 6, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, 754, 0, 0 + object_event 3, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 0, 9, 3, 3, 27, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, 755, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 8, 7, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, 785, 0, 0 + object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 0, 5, 6, 3, 10, 17, 0, 0, 0, 0x0, 734, 0, 0 + object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 9, 5, 3, 5, 17, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, 736, 0, 0 + object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 0, 2, 8, 3, 7, 17, 0, 0, 0, 0x0, 746, 0, 0 LittlerootTown_MaysHouse_1F_MapWarps: @ 852D414 warp_def 1, 8, 0, 0, LITTLEROOT_TOWN @@ -19,5 +19,5 @@ LittlerootTown_MaysHouse_1F_MapCoordEvents: @ 852D42C coord_event 3, 3, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A7F LittlerootTown_MaysHouse_1F_MapEvents:: @ 852D46C - map_events LittlerootTown_MaysHouse_1F_MapObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0 + map_events LittlerootTown_MaysHouse_1F_EventObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/events/LittlerootTown_MaysHouse_2F.inc index 4d26b70d7d..40d0f45dca 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_2F.inc @@ -1,20 +1,20 @@ -LittlerootTown_MaysHouse_2F_MapObjects: @ 852D480 - object_event 1, MAP_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 0, 1, 1, 0, 8, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, 722, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 6, 0, 1, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 1, 6, 3, 1, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 2, 6, 0, 1, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 3, 6, 3, 1, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 6, 3, 1, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 6, 3, 1, 0, 0, 0, 0, 0x0, 179, 0, 0 +LittlerootTown_MaysHouse_2F_EventObjects: @ 852D480 + object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 0, 1, 1, 0, 8, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, 722, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 6, 0, 1, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 6, 3, 1, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 6, 0, 1, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 6, 3, 1, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 6, 3, 1, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 6, 3, 1, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 7, 3, 1, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 7, 3, 1, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 2, 7, 3, 1, 0, 0, 0, 0, 0x0, 182, 0, 0 object_event 11, 249, 0, 0, 3, 7, 3, 1, 0, 0, 0, 0, 0x0, 183, 0, 0 object_event 12, 250, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, 0x0, 184, 0, 0 object_event 13, 251, 0, 0, 5, 7, 3, 1, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, MAP_OBJ_GFX_MOM, 0, 0, 1, 1, 3, 8, 1, 0, 0, 0, 0x0, 757, 0, 0 - object_event 15, MAP_OBJ_GFX_PICHU_DOLL, 0, 0, 3, 4, 4, 8, 17, 0, 0, 0, 0x0, 849, 0, 0 - object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 4, 0, 1, 17, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, 818, 0, 0 + object_event 14, EVENT_OBJ_GFX_MOM, 0, 0, 1, 1, 3, 8, 1, 0, 0, 0, 0x0, 757, 0, 0 + object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 0, 3, 4, 4, 8, 17, 0, 0, 0, 0x0, 849, 0, 0 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 4, 0, 1, 17, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, 818, 0, 0 LittlerootTown_MaysHouse_2F_MapWarps: @ 852D600 warp_def 1, 1, 0, 2, LITTLEROOT_TOWN_MAYS_HOUSE_1F @@ -26,5 +26,5 @@ LittlerootTown_MaysHouse_2F_MapBGEvents: @ 852D608 bg_event 8, 1, 0, 0, 0, gUnknown_081F9553 LittlerootTown_MaysHouse_2F_MapEvents:: @ 852D638 - map_events LittlerootTown_MaysHouse_2F_MapObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents + map_events LittlerootTown_MaysHouse_2F_EventObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc index cd004bcb72..7930d0f63f 100644 --- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc @@ -1,10 +1,10 @@ -LittlerootTown_ProfessorBirchsLab_MapObjects: @ 852D64C - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 8, 3, 2, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 6, 4, 3, 8, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, 721, 0, 0 - object_event 3, MAP_OBJ_GFX_HIPSTER, 0, 0, 7, 4, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, 889, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB, 811, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, 812, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, 838, 0, 0 +LittlerootTown_ProfessorBirchsLab_EventObjects: @ 852D64C + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 8, 3, 2, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 6, 4, 3, 8, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, 721, 0, 0 + object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 0, 7, 4, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, 889, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB, 811, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, 812, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, 838, 0, 0 LittlerootTown_ProfessorBirchsLab_MapWarps: @ 852D6DC warp_def 6, 12, 0, 2, LITTLEROOT_TOWN @@ -28,5 +28,5 @@ LittlerootTown_ProfessorBirchsLab_MapBGEvents: @ 852D6EC bg_event 11, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB LittlerootTown_ProfessorBirchsLab_MapEvents:: @ 852D7A0 - map_events LittlerootTown_ProfessorBirchsLab_MapObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents + map_events LittlerootTown_ProfessorBirchsLab_EventObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents diff --git a/data/maps/events/MagmaHideout_1F.inc b/data/maps/events/MagmaHideout_1F.inc index 33a8a4aa04..d590a6c987 100644 --- a/data/maps/events/MagmaHideout_1F.inc +++ b/data/maps/events/MagmaHideout_1F.inc @@ -1,10 +1,10 @@ -MagmaHideout_1F_MapObjects: @ 85371CC - object_event 1, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 4, 5, 0, 10, 17, 0, 1, 2, MagmaHideout_1F_EventScript_23988C, 857, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 20, 0, 1, 17, 0, 0, 0, MagmaHideout_1F_EventScript_2914DE, 1151, 0, 0 - object_event 3, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 30, 20, 3, 9, 17, 0, 1, 4, MagmaHideout_1F_EventScript_2398A3, 857, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 17, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 18, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 23, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 19, 0, 0 +MagmaHideout_1F_EventObjects: @ 85371CC + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 4, 5, 0, 10, 17, 0, 1, 2, MagmaHideout_1F_EventScript_23988C, 857, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 20, 0, 1, 17, 0, 0, 0, MagmaHideout_1F_EventScript_2914DE, 1151, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 30, 20, 3, 9, 17, 0, 1, 4, MagmaHideout_1F_EventScript_2398A3, 857, 0, 0 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 17, 0, 0 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 18, 0, 0 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 23, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 19, 0, 0 MagmaHideout_1F_MapWarps: @ 853725C warp_def 10, 34, 3, 4, JAGGED_PASS @@ -13,5 +13,5 @@ MagmaHideout_1F_MapWarps: @ 853725C warp_def 20, 22, 0, 0, MAGMA_HIDEOUT_2F_3R MagmaHideout_1F_MapEvents:: @ 853727C - map_events MagmaHideout_1F_MapObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0 + map_events MagmaHideout_1F_EventObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_2F_1R.inc b/data/maps/events/MagmaHideout_2F_1R.inc index 4ac6e0fde5..eb2cca275a 100644 --- a/data/maps/events/MagmaHideout_2F_1R.inc +++ b/data/maps/events/MagmaHideout_2F_1R.inc @@ -1,8 +1,8 @@ -MagmaHideout_2F_1R_MapObjects: @ 8537290 - object_event 1, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 18, 19, 3, 51, 69, 0, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, 857, 0, 0 - object_event 2, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 14, 3, 46, 103, 0, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, 857, 0, 0 - object_event 3, MAP_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 8, 8, 3, 10, 17, 0, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, 857, 0, 0 - object_event 4, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 21, 11, 3, 7, 17, 0, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, 857, 0, 0 +MagmaHideout_2F_1R_EventObjects: @ 8537290 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 18, 19, 3, 51, 69, 0, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, 857, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 14, 3, 46, 103, 0, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, 857, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 8, 8, 3, 10, 17, 0, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, 857, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 21, 11, 3, 7, 17, 0, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, 857, 0, 0 MagmaHideout_2F_1R_MapWarps: @ 85372F0 warp_def 11, 23, 0, 0, MAGMA_HIDEOUT_2F_2R @@ -10,5 +10,5 @@ MagmaHideout_2F_1R_MapWarps: @ 85372F0 warp_def 17, 33, 3, 2, MAGMA_HIDEOUT_3F_1R MagmaHideout_2F_1R_MapEvents:: @ 8537308 - map_events MagmaHideout_2F_1R_MapObjects, MagmaHideout_2F_1R_MapWarps, 0x0, 0x0 + map_events MagmaHideout_2F_1R_EventObjects, MagmaHideout_2F_1R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_2F_2R.inc b/data/maps/events/MagmaHideout_2F_2R.inc index 845da88b22..7d8fb6808e 100644 --- a/data/maps/events/MagmaHideout_2F_2R.inc +++ b/data/maps/events/MagmaHideout_2F_2R.inc @@ -1,15 +1,15 @@ -MagmaHideout_2F_2R_MapObjects: @ 853731C - object_event 1, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 29, 8, 3, 9, 17, 0, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, 857, 0, 0 - object_event 2, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 25, 11, 3, 10, 17, 0, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, 857, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 21, 7, 3, 1, 17, 0, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, 1164, 0, 0 - object_event 4, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 9, 3, 8, 17, 0, 1, 4, MagmaHideout_2F_2R_EventScript_239E1F, 857, 0, 0 - object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 7, 13, 3, 10, 17, 0, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, 857, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 6, 3, 1, 17, 0, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, 1165, 0, 0 +MagmaHideout_2F_2R_EventObjects: @ 853731C + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 29, 8, 3, 9, 17, 0, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, 857, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 25, 11, 3, 10, 17, 0, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, 857, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 21, 7, 3, 1, 17, 0, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, 1164, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 9, 3, 8, 17, 0, 1, 4, MagmaHideout_2F_2R_EventScript_239E1F, 857, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 7, 13, 3, 10, 17, 0, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, 857, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 6, 3, 1, 17, 0, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, 1165, 0, 0 MagmaHideout_2F_2R_MapWarps: @ 85373AC warp_def 10, 22, 3, 0, MAGMA_HIDEOUT_2F_1R warp_def 36, 4, 0, 2, MAGMA_HIDEOUT_1F MagmaHideout_2F_2R_MapEvents:: @ 85373BC - map_events MagmaHideout_2F_2R_MapObjects, MagmaHideout_2F_2R_MapWarps, 0x0, 0x0 + map_events MagmaHideout_2F_2R_EventObjects, MagmaHideout_2F_2R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_3F_1R.inc b/data/maps/events/MagmaHideout_3F_1R.inc index 07a53f4fb8..4d95b38c04 100644 --- a/data/maps/events/MagmaHideout_3F_1R.inc +++ b/data/maps/events/MagmaHideout_3F_1R.inc @@ -1,7 +1,7 @@ -MagmaHideout_3F_1R_MapObjects: @ 85373D0 - object_event 1, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 2, 7, 4, 10, 17, 0, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, 857, 0, 0 - object_event 2, MAP_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 21, 21, 0, 9, 17, 0, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, 857, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 9, 16, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_1R_EventScript_291505, 1166, 0, 0 +MagmaHideout_3F_1R_EventObjects: @ 85373D0 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 2, 7, 4, 10, 17, 0, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, 857, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 21, 21, 0, 9, 17, 0, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, 857, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 9, 16, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_1R_EventScript_291505, 1166, 0, 0 MagmaHideout_3F_1R_MapWarps: @ 8537418 warp_def 7, 21, 0, 0, MAGMA_HIDEOUT_4F @@ -9,5 +9,5 @@ MagmaHideout_3F_1R_MapWarps: @ 8537418 warp_def 23, 3, 0, 2, MAGMA_HIDEOUT_2F_1R MagmaHideout_3F_1R_MapEvents:: @ 8537430 - map_events MagmaHideout_3F_1R_MapObjects, MagmaHideout_3F_1R_MapWarps, 0x0, 0x0 + map_events MagmaHideout_3F_1R_EventObjects, MagmaHideout_3F_1R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_3F_2R.inc b/data/maps/events/MagmaHideout_3F_2R.inc index faeacbd12b..f653cb151c 100644 --- a/data/maps/events/MagmaHideout_3F_2R.inc +++ b/data/maps/events/MagmaHideout_3F_2R.inc @@ -1,10 +1,10 @@ -MagmaHideout_3F_2R_MapObjects: @ 8537444 - object_event 1, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 16, 3, 0, 17, 17, 0, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, 857, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 9, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_2R_EventScript_291512, 1167, 0, 0 +MagmaHideout_3F_2R_EventObjects: @ 8537444 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 16, 3, 0, 17, 17, 0, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, 857, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 9, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_2R_EventScript_291512, 1167, 0, 0 MagmaHideout_3F_2R_MapWarps: @ 8537474 warp_def 12, 15, 0, 1, MAGMA_HIDEOUT_3F_1R MagmaHideout_3F_2R_MapEvents:: @ 853747C - map_events MagmaHideout_3F_2R_MapObjects, MagmaHideout_3F_2R_MapWarps, 0x0, 0x0 + map_events MagmaHideout_3F_2R_EventObjects, MagmaHideout_3F_2R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_3F_3R.inc b/data/maps/events/MagmaHideout_3F_3R.inc index 386696d9c3..b662de7d95 100644 --- a/data/maps/events/MagmaHideout_3F_3R.inc +++ b/data/maps/events/MagmaHideout_3F_3R.inc @@ -1,10 +1,10 @@ -MagmaHideout_3F_3R_MapObjects: @ 8537574 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 9, 19, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, 1059, 0, 0 +MagmaHideout_3F_3R_EventObjects: @ 8537574 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 9, 19, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, 1059, 0, 0 MagmaHideout_3F_3R_MapWarps: @ 853758C warp_def 16, 1, 0, 1, MAGMA_HIDEOUT_2F_3R warp_def 16, 21, 0, 1, MAGMA_HIDEOUT_4F MagmaHideout_3F_3R_MapEvents:: @ 853759C - map_events MagmaHideout_3F_3R_MapObjects, MagmaHideout_3F_3R_MapWarps, 0x0, 0x0 + map_events MagmaHideout_3F_3R_EventObjects, MagmaHideout_3F_3R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_4F.inc b/data/maps/events/MagmaHideout_4F.inc index 545eeea92a..221775788f 100644 --- a/data/maps/events/MagmaHideout_4F.inc +++ b/data/maps/events/MagmaHideout_4F.inc @@ -1,17 +1,17 @@ -MagmaHideout_4F_MapObjects: @ 8537490 - object_event 1, MAP_OBJ_GFX_GROUDON_1, 0, 0, 16, 17, 0, 8, 17, 0, 0, 0, 0x0, 853, 0, 0 - object_event 2, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 31, 22, 0, 10, 17, 0, 1, 3, MagmaHideout_4F_EventScript_23A68C, 857, 0, 0 - object_event 3, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 30, 13, 0, 9, 17, 0, 1, 3, MagmaHideout_4F_EventScript_23A6A3, 857, 0, 0 - object_event 4, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 26, 13, 0, 10, 17, 0, 1, 3, MagmaHideout_4F_EventScript_23A6BA, 857, 0, 0 - object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 22, 4, 0, 8, 17, 0, 1, 4, MagmaHideout_4F_EventScript_23A6D1, 857, 0, 0 - object_event 6, MAP_OBJ_GFX_MAXIE, 0, 0, 16, 21, 0, 7, 17, 0, 0, 0, MagmaHideout_4F_EventScript_23A560, 857, 0, 0 - object_event 7, MAP_OBJ_GFX_GROUDON_2, 0, 0, 16, 17, 3, 8, 17, 0, 0, 0, 0x0, 850, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 7, 0, 1, 17, 0, 0, 0, MagmaHideout_4F_EventScript_29151F, 1168, 0, 0 +MagmaHideout_4F_EventObjects: @ 8537490 + object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 0, 16, 17, 0, 8, 17, 0, 0, 0, 0x0, 853, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 31, 22, 0, 10, 17, 0, 1, 3, MagmaHideout_4F_EventScript_23A68C, 857, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 30, 13, 0, 9, 17, 0, 1, 3, MagmaHideout_4F_EventScript_23A6A3, 857, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 26, 13, 0, 10, 17, 0, 1, 3, MagmaHideout_4F_EventScript_23A6BA, 857, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 22, 4, 0, 8, 17, 0, 1, 4, MagmaHideout_4F_EventScript_23A6D1, 857, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAXIE, 0, 0, 16, 21, 0, 7, 17, 0, 0, 0, MagmaHideout_4F_EventScript_23A560, 857, 0, 0 + object_event 7, EVENT_OBJ_GFX_GROUDON_2, 0, 0, 16, 17, 3, 8, 17, 0, 0, 0, 0x0, 850, 0, 0 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 7, 0, 1, 17, 0, 0, 0, MagmaHideout_4F_EventScript_29151F, 1168, 0, 0 MagmaHideout_4F_MapWarps: @ 8537550 warp_def 46, 7, 0, 0, MAGMA_HIDEOUT_3F_1R warp_def 20, 21, 0, 1, MAGMA_HIDEOUT_3F_3R MagmaHideout_4F_MapEvents:: @ 8537560 - map_events MagmaHideout_4F_MapObjects, MagmaHideout_4F_MapWarps, 0x0, 0x0 + map_events MagmaHideout_4F_EventObjects, MagmaHideout_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MarineCave_End.inc b/data/maps/events/MarineCave_End.inc index ad11733e18..b9f6bb0200 100644 --- a/data/maps/events/MarineCave_End.inc +++ b/data/maps/events/MarineCave_End.inc @@ -1,5 +1,5 @@ -MarineCave_End_MapObjects: @ 85377E8 - object_event 1, MAP_OBJ_GFX_KYOGRE_1, 0, 0, 9, 22, 1, 8, 17, 0, 0, 0, 0x0, 782, 0, 0 +MarineCave_End_EventObjects: @ 85377E8 + object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 0, 9, 22, 1, 8, 17, 0, 0, 0, 0x0, 782, 0, 0 MarineCave_End_MapWarps: @ 8537800 warp_def 20, 4, 0, 0, MARINE_CAVE_ENTRANCE @@ -8,5 +8,5 @@ MarineCave_End_MapCoordEvents: @ 8537808 coord_event 9, 26, 3, 0, VAR_TEMP_1, 1, 0, MarineCave_End_EventScript_23B01B MarineCave_End_MapEvents:: @ 8537818 - map_events MarineCave_End_MapObjects, MarineCave_End_MapWarps, MarineCave_End_MapCoordEvents, 0x0 + map_events MarineCave_End_EventObjects, MarineCave_End_MapWarps, MarineCave_End_MapCoordEvents, 0x0 diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/events/MauvilleCity.inc index c6da0eb612..6d89267c6e 100644 --- a/data/maps/events/MauvilleCity.inc +++ b/data/maps/events/MauvilleCity.inc @@ -1,15 +1,15 @@ -MauvilleCity_MapObjects: @ 852662C - object_event 1, MAP_OBJ_GFX_BOY_3, 0, 0, 29, 16, 3, 5, 17, 0, 0, 0, MauvilleCity_EventScript_1DF3B3, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_4, 0, 0, 24, 10, 3, 5, 1, 0, 0, 0, MauvilleCity_EventScript_1DF3CE, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MANIAC, 0, 0, 14, 11, 3, 10, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 0, 18, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3C5, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 17, 14, 3, 8, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3FB, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_WALLY, 0, 0, 8, 6, 3, 7, 0, 0, 0, 0, MauvilleCity_EventScript_1DF452, 804, 0, 0 - object_event 7, MAP_OBJ_GFX_MAN_3, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_1DF41D, 805, 0, 0 - object_event 8, MAP_OBJ_GFX_WATTSON, 0, 0, 29, 9, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF73A, 912, 0, 0 - object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 28, 19, 3, 1, 17, 0, 0, 0, MauvilleCity_EventScript_2910CE, 1116, 0, 0 - object_event 10, MAP_OBJ_GFX_FAT_MAN, 0, 0, 13, 7, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_SCOTT, 0, 0, 12, 14, 3, 7, 0, 0, 0, 0, 0x0, 765, 0, 0 +MauvilleCity_EventObjects: @ 852662C + object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 0, 29, 16, 3, 5, 17, 0, 0, 0, MauvilleCity_EventScript_1DF3B3, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 24, 10, 3, 5, 1, 0, 0, 0, MauvilleCity_EventScript_1DF3CE, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 0, 14, 11, 3, 10, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 18, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3C5, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 17, 14, 3, 8, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3FB, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_WALLY, 0, 0, 8, 6, 3, 7, 0, 0, 0, 0, MauvilleCity_EventScript_1DF452, 804, 0, 0 + object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_1DF41D, 805, 0, 0 + object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 0, 29, 9, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF73A, 912, 0, 0 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 28, 19, 3, 1, 17, 0, 0, 0, MauvilleCity_EventScript_2910CE, 1116, 0, 0 + object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 13, 7, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_SCOTT, 0, 0, 12, 14, 3, 7, 0, 0, 0, 0, 0x0, 765, 0, 0 MauvilleCity_MapWarps: @ 8526734 warp_def 8, 5, 0, 0, MAUVILLE_CITY_GYM @@ -31,5 +31,5 @@ MauvilleCity_MapBGEvents: @ 852676C bg_event 11, 15, 0, 0, 0, MauvilleCity_EventScript_1DF3F2 MauvilleCity_MapEvents:: @ 85267CC - map_events MauvilleCity_MapObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents + map_events MauvilleCity_EventObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents diff --git a/data/maps/events/MauvilleCity_BikeShop.inc b/data/maps/events/MauvilleCity_BikeShop.inc index e8e3ef7be1..0252834f47 100644 --- a/data/maps/events/MauvilleCity_BikeShop.inc +++ b/data/maps/events/MauvilleCity_BikeShop.inc @@ -1,6 +1,6 @@ -MauvilleCity_BikeShop_MapObjects: @ 852FE80 - object_event 1, MAP_OBJ_GFX_MAN_2, 0, 0, 2, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EBBC, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_6, 0, 0, 7, 6, 3, 2, 17, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0, 0, 0 +MauvilleCity_BikeShop_EventObjects: @ 852FE80 + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 0, 2, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EBBC, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 7, 6, 3, 2, 17, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0, 0, 0 MauvilleCity_BikeShop_MapWarps: @ 852FEB0 warp_def 3, 8, 0, 2, MAUVILLE_CITY @@ -11,5 +11,5 @@ MauvilleCity_BikeShop_MapBGEvents: @ 852FEC0 bg_event 11, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EDAE MauvilleCity_BikeShop_MapEvents:: @ 852FED8 - map_events MauvilleCity_BikeShop_MapObjects, MauvilleCity_BikeShop_MapWarps, 0x0, MauvilleCity_BikeShop_MapBGEvents + map_events MauvilleCity_BikeShop_EventObjects, MauvilleCity_BikeShop_MapWarps, 0x0, MauvilleCity_BikeShop_MapBGEvents diff --git a/data/maps/events/MauvilleCity_GameCorner.inc b/data/maps/events/MauvilleCity_GameCorner.inc index 1a84504f50..57e34caadc 100644 --- a/data/maps/events/MauvilleCity_GameCorner.inc +++ b/data/maps/events/MauvilleCity_GameCorner.inc @@ -1,16 +1,16 @@ -MauvilleCity_GameCorner_MapObjects: @ 852FF28 - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 12, 7, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210125, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 16, 5, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21012E, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BEAUTY, 0, 0, 11, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FBB9, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 0, 14, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FCF1, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_GIRL_2, 0, 0, 7, 3, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210137, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_3, 0, 0, 19, 4, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21021D, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 20, 8, 3, 9, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210279, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_COOK, 0, 0, 6, 8, 3, 10, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210289, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BEAUTY, 0, 0, 13, 2, 3, 8, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FE9F, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_MAN_4, 0, 0, 1, 7, 3, 10, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210299, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_MANIAC, 0, 0, 9, 8, 3, 9, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2102B6, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 6, 3, 9, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0, 0, 0 +MauvilleCity_GameCorner_EventObjects: @ 852FF28 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 12, 7, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210125, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 16, 5, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21012E, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 0, 11, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FBB9, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 0, 14, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FCF1, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 0, 7, 3, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210137, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 0, 19, 4, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21021D, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 20, 8, 3, 9, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210279, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_COOK, 0, 0, 6, 8, 3, 10, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210289, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_BEAUTY, 0, 0, 13, 2, 3, 8, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FE9F, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_MAN_4, 0, 0, 1, 7, 3, 10, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210299, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 0, 9, 8, 3, 9, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2102B6, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 6, 3, 9, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0, 0, 0 MauvilleCity_GameCorner_MapWarps: @ 8530048 warp_def 11, 10, 3, 5, MAUVILLE_CITY @@ -43,5 +43,5 @@ MauvilleCity_GameCorner_MapBGEvents: @ 8530058 bg_event 19, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF MauvilleCity_GameCorner_MapEvents:: @ 8530178 - map_events MauvilleCity_GameCorner_MapObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents + map_events MauvilleCity_GameCorner_EventObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/events/MauvilleCity_Gym.inc index 44ae416011..c493d4b8b5 100644 --- a/data/maps/events/MauvilleCity_Gym.inc +++ b/data/maps/events/MauvilleCity_Gym.inc @@ -1,11 +1,11 @@ -MauvilleCity_Gym_MapObjects: @ 852FD5C - object_event 1, MAP_OBJ_GFX_WATTSON, 0, 0, 5, 2, 0, 8, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, 913, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_6, 0, 0, 7, 8, 3, 8, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 1, 16, 0, 7, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 5, 10, 0, 9, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0E7, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_6, 0, 0, 1, 13, 0, 8, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0B9, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_2, 0, 0, 7, 20, 0, 9, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20E12C, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_MANIAC, 0, 0, 7, 10, 3, 7, 17, 0, 1, 1, MauvilleCity_Gym_EventScript_20E115, 0, 0, 0 +MauvilleCity_Gym_EventObjects: @ 852FD5C + object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 0, 5, 2, 0, 8, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, 913, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 7, 8, 3, 8, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 1, 16, 0, 7, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 5, 10, 0, 9, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0E7, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 0, 1, 13, 0, 8, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0B9, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 0, 7, 20, 0, 9, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20E12C, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 0, 7, 10, 3, 7, 17, 0, 1, 1, MauvilleCity_Gym_EventScript_20E115, 0, 0, 0 MauvilleCity_Gym_MapWarps: @ 852FE04 warp_def 4, 20, 0, 0, MAUVILLE_CITY @@ -22,5 +22,5 @@ MauvilleCity_Gym_MapBGEvents: @ 852FE54 bg_event 6, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_20E15B MauvilleCity_Gym_MapEvents:: @ 852FE6C - map_events MauvilleCity_Gym_MapObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents + map_events MauvilleCity_Gym_EventObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents diff --git a/data/maps/events/MauvilleCity_House1.inc b/data/maps/events/MauvilleCity_House1.inc index 9b30d31196..1a1f241b53 100644 --- a/data/maps/events/MauvilleCity_House1.inc +++ b/data/maps/events/MauvilleCity_House1.inc @@ -1,10 +1,10 @@ -MauvilleCity_House1_MapObjects: @ 852FEEC - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_House1_EventScript_20F976, 0, 0, 0 +MauvilleCity_House1_EventObjects: @ 852FEEC + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_House1_EventScript_20F976, 0, 0, 0 MauvilleCity_House1_MapWarps: @ 852FF04 warp_def 3, 7, 0, 4, MAUVILLE_CITY warp_def 4, 7, 0, 4, MAUVILLE_CITY MauvilleCity_House1_MapEvents:: @ 852FF14 - map_events MauvilleCity_House1_MapObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0 + map_events MauvilleCity_House1_EventObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_House2.inc b/data/maps/events/MauvilleCity_House2.inc index 5328de49fb..a514837709 100644 --- a/data/maps/events/MauvilleCity_House2.inc +++ b/data/maps/events/MauvilleCity_House2.inc @@ -1,10 +1,10 @@ -MauvilleCity_House2_MapObjects: @ 853018C - object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 0, 4, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0, 0, 0 +MauvilleCity_House2_EventObjects: @ 853018C + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 4, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0, 0, 0 MauvilleCity_House2_MapWarps: @ 85301A4 warp_def 3, 8, 0, 6, MAUVILLE_CITY warp_def 4, 8, 0, 6, MAUVILLE_CITY MauvilleCity_House2_MapEvents:: @ 85301B4 - map_events MauvilleCity_House2_MapObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0 + map_events MauvilleCity_House2_EventObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_Mart.inc b/data/maps/events/MauvilleCity_Mart.inc index 257d047cd5..866c0c3115 100644 --- a/data/maps/events/MauvilleCity_Mart.inc +++ b/data/maps/events/MauvilleCity_Mart.inc @@ -1,12 +1,12 @@ -MauvilleCity_Mart_MapObjects: @ 8530310 - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_2110E6, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_21111C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0, 0, 0 +MauvilleCity_Mart_EventObjects: @ 8530310 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_2110E6, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_21111C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0, 0, 0 MauvilleCity_Mart_MapWarps: @ 8530358 warp_def 3, 7, 0, 3, MAUVILLE_CITY warp_def 4, 7, 0, 3, MAUVILLE_CITY MauvilleCity_Mart_MapEvents:: @ 8530368 - map_events MauvilleCity_Mart_MapObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0 + map_events MauvilleCity_Mart_EventObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc index 725e52ef32..b8b7ed7d61 100644 --- a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc +++ b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc @@ -1,9 +1,9 @@ -MauvilleCity_PokemonCenter_1F_MapObjects: @ 85301C8 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E78, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 2, 3, 3, 9, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_28E066, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_1, 0, 0, 8, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E86, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_7, 0, 0, 11, 4, 3, 3, 16, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E8F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 2, 8, 3, 1, 17, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E98, 0, 0, 0 +MauvilleCity_PokemonCenter_1F_EventObjects: @ 85301C8 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E78, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 2, 3, 3, 9, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_28E066, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 8, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E86, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 11, 4, 3, 3, 16, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E8F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 2, 8, 3, 1, 17, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E98, 0, 0, 0 MauvilleCity_PokemonCenter_1F_MapWarps: @ 8530240 warp_def 7, 8, 3, 1, MAUVILLE_CITY @@ -11,5 +11,5 @@ MauvilleCity_PokemonCenter_1F_MapWarps: @ 8530240 warp_def 1, 6, 4, 0, MAUVILLE_CITY_POKEMON_CENTER_2F MauvilleCity_PokemonCenter_1F_MapEvents:: @ 8530258 - map_events MauvilleCity_PokemonCenter_1F_MapObjects, MauvilleCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events MauvilleCity_PokemonCenter_1F_EventObjects, MauvilleCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc index 9e5cb6e81c..9e8de4b75a 100644 --- a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc +++ b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc @@ -1,9 +1,9 @@ -MauvilleCity_PokemonCenter_2F_MapObjects: @ 853026C - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 - object_event 5, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 8, 8, 3, 7, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_21102F, 0, 0, 0 +MauvilleCity_PokemonCenter_2F_EventObjects: @ 853026C + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 + object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 8, 8, 3, 7, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_21102F, 0, 0, 0 MauvilleCity_PokemonCenter_2F_MapWarps: @ 85302E4 warp_def 1, 6, 4, 2, MAUVILLE_CITY_POKEMON_CENTER_1F @@ -11,5 +11,5 @@ MauvilleCity_PokemonCenter_2F_MapWarps: @ 85302E4 warp_def 9, 1, 3, 0, TRADE_CENTER MauvilleCity_PokemonCenter_2F_MapEvents:: @ 85302FC - map_events MauvilleCity_PokemonCenter_2F_MapObjects, MauvilleCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events MauvilleCity_PokemonCenter_2F_EventObjects, MauvilleCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/events/MeteorFalls_1F_1R.inc index 29ecbf043b..76eb4f6dd7 100644 --- a/data/maps/events/MeteorFalls_1F_1R.inc +++ b/data/maps/events/MeteorFalls_1F_1R.inc @@ -1,14 +1,14 @@ -MeteorFalls_1F_1R_MapObjects: @ 8533F74 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 4, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, 1044, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 14, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, 1046, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 27, 5, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, 1045, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 26, 32, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911D2, 1047, 0, 0 - object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 20, 3, 8, 0, 0, 0, 0, 0x0, 939, 0, 0 - object_event 6, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 14, 21, 3, 9, 0, 0, 0, 0, 0x0, 939, 0, 0 - object_event 7, MAP_OBJ_GFX_ARCHIE, 0, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938, 0, 0 - object_event 8, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938, 0, 0 - object_event 9, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 21, 3, 1, 0, 0, 0, 0, 0x0, 938, 0, 0 - object_event 10, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 13, 23, 3, 21, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, 942, 0, 0 +MeteorFalls_1F_1R_EventObjects: @ 8533F74 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 4, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, 1044, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 14, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, 1046, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 27, 5, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, 1045, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 26, 32, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911D2, 1047, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 20, 3, 8, 0, 0, 0, 0, 0x0, 939, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 14, 21, 3, 9, 0, 0, 0, 0, 0x0, 939, 0, 0 + object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938, 0, 0 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938, 0, 0 + object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 21, 3, 1, 0, 0, 0, 0, 0x0, 938, 0, 0 + object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 13, 23, 3, 21, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, 942, 0, 0 MeteorFalls_1F_1R_MapWarps: @ 8534064 warp_def 27, 18, 4, 0, ROUTE_114 @@ -25,5 +25,5 @@ MeteorFalls_1F_1R_MapBGEvents: @ 85340A4 bg_event 9, 58, 0, 0, 0, 0x0 MeteorFalls_1F_1R_MapEvents:: @ 85340B0 - map_events MeteorFalls_1F_1R_MapObjects, MeteorFalls_1F_1R_MapWarps, MeteorFalls_1F_1R_MapCoordEvents, MeteorFalls_1F_1R_MapBGEvents + map_events MeteorFalls_1F_1R_EventObjects, MeteorFalls_1F_1R_MapWarps, MeteorFalls_1F_1R_MapCoordEvents, MeteorFalls_1F_1R_MapBGEvents diff --git a/data/maps/events/MeteorFalls_1F_2R.inc b/data/maps/events/MeteorFalls_1F_2R.inc index 180b4f7229..1a85565fa1 100644 --- a/data/maps/events/MeteorFalls_1F_2R.inc +++ b/data/maps/events/MeteorFalls_1F_2R.inc @@ -1,7 +1,7 @@ -MeteorFalls_1F_2R_MapObjects: @ 85340C4 - object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 13, 2, 3, 8, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C4DE, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 12, 3, 8, 17, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C540, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 7, 12, 3, 8, 17, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0, 0, 0 +MeteorFalls_1F_2R_EventObjects: @ 85340C4 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 13, 2, 3, 8, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C4DE, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 12, 3, 8, 17, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C540, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 7, 12, 3, 8, 17, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0, 0, 0 MeteorFalls_1F_2R_MapWarps: @ 853410C warp_def 10, 29, 3, 2, METEOR_FALLS_1F_1R @@ -13,5 +13,5 @@ MeteorFalls_1F_2R_MapBGEvents: @ 853412C bg_event 9, 58, 0, 0, 0, 0x0 MeteorFalls_1F_2R_MapEvents:: @ 8534138 - map_events MeteorFalls_1F_2R_MapObjects, MeteorFalls_1F_2R_MapWarps, 0x0, MeteorFalls_1F_2R_MapBGEvents + map_events MeteorFalls_1F_2R_EventObjects, MeteorFalls_1F_2R_MapWarps, 0x0, MeteorFalls_1F_2R_MapBGEvents diff --git a/data/maps/events/MeteorFalls_B1F_2R.inc b/data/maps/events/MeteorFalls_B1F_2R.inc index e208273cf6..454946506a 100644 --- a/data/maps/events/MeteorFalls_B1F_2R.inc +++ b/data/maps/events/MeteorFalls_B1F_2R.inc @@ -1,9 +1,9 @@ -MeteorFalls_B1F_2R_MapObjects: @ 8534190 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 3, 1, 17, 0, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, 1080, 0, 0 +MeteorFalls_B1F_2R_EventObjects: @ 8534190 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 3, 1, 17, 0, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, 1080, 0, 0 MeteorFalls_B1F_2R_MapWarps: @ 85341A8 warp_def 5, 15, 3, 3, METEOR_FALLS_B1F_1R MeteorFalls_B1F_2R_MapEvents:: @ 85341B0 - map_events MeteorFalls_B1F_2R_MapObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0 + map_events MeteorFalls_B1F_2R_EventObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MeteorFalls_StevensCave.inc b/data/maps/events/MeteorFalls_StevensCave.inc index e9f3d0db67..e66dda1198 100644 --- a/data/maps/events/MeteorFalls_StevensCave.inc +++ b/data/maps/events/MeteorFalls_StevensCave.inc @@ -1,9 +1,9 @@ -MeteorFalls_StevensCave_MapObjects: @ 85378B0 - object_event 1, MAP_OBJ_GFX_STEVEN, 0, 0, 19, 3, 3, 7, 17, 0, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0, 0, 0 +MeteorFalls_StevensCave_EventObjects: @ 85378B0 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 0, 19, 3, 3, 7, 17, 0, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0, 0, 0 MeteorFalls_StevensCave_MapWarps: @ 85378C8 warp_def 10, 29, 3, 5, METEOR_FALLS_1F_1R MeteorFalls_StevensCave_MapEvents:: @ 85378D0 - map_events MeteorFalls_StevensCave_MapObjects, MeteorFalls_StevensCave_MapWarps, 0x0, 0x0 + map_events MeteorFalls_StevensCave_EventObjects, MeteorFalls_StevensCave_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MirageTower_3F.inc b/data/maps/events/MirageTower_3F.inc index 956965d5f1..fe6a0f73fd 100644 --- a/data/maps/events/MirageTower_3F.inc +++ b/data/maps/events/MirageTower_3F.inc @@ -1,11 +1,11 @@ -MirageTower_3F_MapObjects: @ 853761C - object_event 1, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 7, 3, 1, 17, 0, 0, 0, MirageTower_3F_EventScript_2907A6, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 4, 8, 3, 1, 17, 0, 0, 0, MirageTower_3F_EventScript_2907A6, 18, 0, 0 +MirageTower_3F_EventObjects: @ 853761C + object_event 1, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 7, 3, 1, 17, 0, 0, 0, MirageTower_3F_EventScript_2907A6, 17, 0, 0 + object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 4, 8, 3, 1, 17, 0, 0, 0, MirageTower_3F_EventScript_2907A6, 18, 0, 0 MirageTower_3F_MapWarps: @ 853764C warp_def 18, 12, 3, 0, MIRAGE_TOWER_2F warp_def 2, 4, 0, 0, MIRAGE_TOWER_4F MirageTower_3F_MapEvents:: @ 853765C - map_events MirageTower_3F_MapObjects, MirageTower_3F_MapWarps, 0x0, 0x0 + map_events MirageTower_3F_EventObjects, MirageTower_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MirageTower_4F.inc b/data/maps/events/MirageTower_4F.inc index 1042dc803a..4d07ff4c3d 100644 --- a/data/maps/events/MirageTower_4F.inc +++ b/data/maps/events/MirageTower_4F.inc @@ -1,11 +1,11 @@ -MirageTower_4F_MapObjects: @ 8537670 - object_event 1, MAP_OBJ_GFX_FOSSIL, 0, 0, 5, 4, 4, 8, 17, 0, 0, 0, MirageTower_4F_EventScript_23AD48, 963, 0, 0 - object_event 2, MAP_OBJ_GFX_FOSSIL, 0, 0, 7, 4, 0, 8, 17, 0, 0, 0, MirageTower_4F_EventScript_23AD89, 964, 0, 0 - object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 6, 7, 3, 1, 17, 0, 0, 0, MirageTower_4F_EventScript_2907A6, 17, 0, 0 +MirageTower_4F_EventObjects: @ 8537670 + object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 0, 5, 4, 4, 8, 17, 0, 0, 0, MirageTower_4F_EventScript_23AD48, 963, 0, 0 + object_event 2, EVENT_OBJ_GFX_FOSSIL, 0, 0, 7, 4, 0, 8, 17, 0, 0, 0, MirageTower_4F_EventScript_23AD89, 964, 0, 0 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 6, 7, 3, 1, 17, 0, 0, 0, MirageTower_4F_EventScript_2907A6, 17, 0, 0 MirageTower_4F_MapWarps: @ 85376B8 warp_def 1, 4, 3, 1, MIRAGE_TOWER_3F MirageTower_4F_MapEvents:: @ 85376C0 - map_events MirageTower_4F_MapObjects, MirageTower_4F_MapWarps, 0x0, 0x0 + map_events MirageTower_4F_EventObjects, MirageTower_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/events/MossdeepCity.inc index d048ecb5d3..a5dfb9df92 100644 --- a/data/maps/events/MossdeepCity.inc +++ b/data/maps/events/MossdeepCity.inc @@ -1,21 +1,21 @@ -MossdeepCity_MapObjects: @ 8527018 - object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 38, 12, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4AD1, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 50, 34, 5, 5, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 32, 12, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4AB2, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 26, 21, 5, 3, 16, 0, 0, 0, MossdeepCity_EventScript_1E4AF0, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_GIRL_1, 0, 0, 45, 18, 7, 9, 0, 0, 0, 0, MossdeepCity_EventScript_1E4B02, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 62, 35, 5, 1, 0, 0, 0, 0, MossdeepCity_EventScript_2910F5, 1043, 0, 0 - object_event 7, MAP_OBJ_GFX_MAN_1, 0, 0, 55, 5, 7, 7, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C10, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_WOMAN_1, 0, 0, 56, 21, 7, 10, 17, 0, 0, 0, MossdeepCity_EventScript_1E4B0B, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BOY_2, 0, 0, 23, 13, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4C26, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 23, 5, 8, 17, 0, 0, 0, 0x0, 823, 0, 0 - object_event 11, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 24, 5, 7, 17, 0, 0, 0, 0x0, 823, 0, 0 - object_event 12, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 25, 5, 8, 17, 0, 0, 0, 0x0, 823, 0, 0 - object_event 13, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 26, 5, 7, 17, 0, 0, 0, 0x0, 823, 0, 0 - object_event 14, MAP_OBJ_GFX_MAXIE, 0, 0, 45, 25, 5, 9, 17, 0, 0, 0, 0x0, 823, 0, 0 - object_event 15, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 19, 25, 3, 64, 51, 0, 0, 0, MossdeepCity_EventScript_2C81EE, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_SCOTT, 0, 0, 61, 29, 5, 17, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, 788, 0, 0 - object_event 17, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 31, 29, 3, 64, 51, 0, 0, 0, MossdeepCity_EventScript_1E4C7C, 0, 0, 0 +MossdeepCity_EventObjects: @ 8527018 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 38, 12, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4AD1, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 50, 34, 5, 5, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 32, 12, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4AB2, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 26, 21, 5, 3, 16, 0, 0, 0, MossdeepCity_EventScript_1E4AF0, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 0, 45, 18, 7, 9, 0, 0, 0, 0, MossdeepCity_EventScript_1E4B02, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 62, 35, 5, 1, 0, 0, 0, 0, MossdeepCity_EventScript_2910F5, 1043, 0, 0 + object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 0, 55, 5, 7, 7, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C10, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 56, 21, 7, 10, 17, 0, 0, 0, MossdeepCity_EventScript_1E4B0B, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 0, 23, 13, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4C26, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 23, 5, 8, 17, 0, 0, 0, 0x0, 823, 0, 0 + object_event 11, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 24, 5, 7, 17, 0, 0, 0, 0x0, 823, 0, 0 + object_event 12, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 25, 5, 8, 17, 0, 0, 0, 0x0, 823, 0, 0 + object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 26, 5, 7, 17, 0, 0, 0, 0x0, 823, 0, 0 + object_event 14, EVENT_OBJ_GFX_MAXIE, 0, 0, 45, 25, 5, 9, 17, 0, 0, 0, 0x0, 823, 0, 0 + object_event 15, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 19, 25, 3, 64, 51, 0, 0, 0, MossdeepCity_EventScript_2C81EE, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_SCOTT, 0, 0, 61, 29, 5, 17, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, 788, 0, 0 + object_event 17, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 31, 29, 3, 64, 51, 0, 0, 0, MossdeepCity_EventScript_1E4C7C, 0, 0, 0 MossdeepCity_MapWarps: @ 85271B0 warp_def 28, 9, 0, 0, MOSSDEEP_CITY_HOUSE_1 @@ -52,5 +52,5 @@ MossdeepCity_MapBGEvents: @ 85272A0 bg_event 57, 21, 7, 0, 0, MossdeepCity_EventScript_1E4B14 MossdeepCity_MapEvents:: @ 8527300 - map_events MossdeepCity_MapObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents + map_events MossdeepCity_EventObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents diff --git a/data/maps/events/MossdeepCity_GameCorner_1F.inc b/data/maps/events/MossdeepCity_GameCorner_1F.inc index c4477a44b8..cbcb8b76f9 100644 --- a/data/maps/events/MossdeepCity_GameCorner_1F.inc +++ b/data/maps/events/MossdeepCity_GameCorner_1F.inc @@ -1,6 +1,6 @@ -MossdeepCity_GameCorner_1F_MapObjects: @ 8532F40 - object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B54, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_5, 0, 0, 4, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0, 0, 0 +MossdeepCity_GameCorner_1F_EventObjects: @ 8532F40 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B54, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 4, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0, 0, 0 MossdeepCity_GameCorner_1F_MapWarps: @ 8532F70 warp_def 5, 9, 0, 9, MOSSDEEP_CITY @@ -13,5 +13,5 @@ MossdeepCity_GameCorner_1F_MapBGEvents: @ 8532F88 bg_event 1, 1, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_277E96 MossdeepCity_GameCorner_1F_MapEvents:: @ 8532FAC - map_events MossdeepCity_GameCorner_1F_MapObjects, MossdeepCity_GameCorner_1F_MapWarps, 0x0, MossdeepCity_GameCorner_1F_MapBGEvents + map_events MossdeepCity_GameCorner_1F_EventObjects, MossdeepCity_GameCorner_1F_MapWarps, 0x0, MossdeepCity_GameCorner_1F_MapBGEvents diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.inc b/data/maps/events/MossdeepCity_GameCorner_B1F.inc index ed9b4f6605..a043926a70 100644 --- a/data/maps/events/MossdeepCity_GameCorner_B1F.inc +++ b/data/maps/events/MossdeepCity_GameCorner_B1F.inc @@ -1,9 +1,9 @@ -MossdeepCity_GameCorner_B1F_MapObjects: @ 8532FC0 - object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 6, 5, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0 +MossdeepCity_GameCorner_B1F_EventObjects: @ 8532FC0 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 5, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0 MossdeepCity_GameCorner_B1F_MapWarps: @ 8532FD8 warp_def 3, 1, 0, 2, MOSSDEEP_CITY_GAME_CORNER_1F MossdeepCity_GameCorner_B1F_MapEvents:: @ 8532FE0 - map_events MossdeepCity_GameCorner_B1F_MapObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0 + map_events MossdeepCity_GameCorner_B1F_EventObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_Gym.inc b/data/maps/events/MossdeepCity_Gym.inc index 57a717638d..2a152d8f65 100644 --- a/data/maps/events/MossdeepCity_Gym.inc +++ b/data/maps/events/MossdeepCity_Gym.inc @@ -1,40 +1,40 @@ -MossdeepCity_Gym_MapObjects: @ 85324EC - object_event 1, MAP_OBJ_GFX_TATE, 0, 0, 23, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 1, 30, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220AFD, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 5, 20, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B2B, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LASS, 0, 0, 4, 29, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B70, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_LASS, 0, 0, 4, 23, 0, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B59, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 6, 9, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B14, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_LASS, 0, 0, 6, 3, 0, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B42, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_MAN_2, 0, 0, 5, 33, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220C11, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_LIZA, 0, 0, 24, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 2, 30, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 1, 29, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 30, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 5, 29, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 5, 21, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 7, 9, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 10, 8, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 9, 8, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220B9E, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 7, 5, 3, 10, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220B87, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 6, 6, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 11, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 22, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 11, 34, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 23, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 33, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 24, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 34, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 25, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 22, 25, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BCC, 0, 0, 0 - object_event 26, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 23, 26, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 27, MAP_OBJ_GFX_LASS, 0, 0, 25, 25, 0, 9, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BB5, 0, 0, 0 - object_event 28, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 22, 23, 3, 8, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BFA, 0, 0, 0 - object_event 29, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 21, 23, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 30, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 21, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 31, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 22, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 32, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 25, 22, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BE3, 0, 0, 0 - object_event 33, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 24, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 34, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 24, 23, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 35, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 6, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 36, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 23, 25, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 +MossdeepCity_Gym_EventObjects: @ 85324EC + object_event 1, EVENT_OBJ_GFX_TATE, 0, 0, 23, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 1, 30, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220AFD, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 5, 20, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B2B, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 0, 4, 29, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B70, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_LASS, 0, 0, 4, 23, 0, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B59, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 6, 9, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B14, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_LASS, 0, 0, 6, 3, 0, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B42, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_MAN_2, 0, 0, 5, 33, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220C11, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_LIZA, 0, 0, 24, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 2, 30, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 1, 29, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 30, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 5, 29, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 5, 21, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 7, 9, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 10, 8, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 9, 8, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220B9E, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 7, 5, 3, 10, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220B87, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 6, 6, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 20, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 11, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 22, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 11, 34, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 23, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 33, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 24, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 34, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 22, 25, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BCC, 0, 0, 0 + object_event 26, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 23, 26, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 27, EVENT_OBJ_GFX_LASS, 0, 0, 25, 25, 0, 9, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BB5, 0, 0, 0 + object_event 28, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 22, 23, 3, 8, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BFA, 0, 0, 0 + object_event 29, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 21, 23, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 30, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 21, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 31, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 22, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 32, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 25, 22, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BE3, 0, 0, 0 + object_event 33, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 24, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 34, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 24, 23, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 35, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 6, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 36, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 23, 25, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 MossdeepCity_Gym_MapWarps: @ 853284C warp_def 6, 35, 3, 1, MOSSDEEP_CITY @@ -68,5 +68,5 @@ MossdeepCity_Gym_MapBGEvents: @ 853294C bg_event 8, 34, 0, 1, 0, MossdeepCity_Gym_EventScript_220C43 MossdeepCity_Gym_MapEvents:: @ 8532964 - map_events MossdeepCity_Gym_MapObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents + map_events MossdeepCity_Gym_EventObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents diff --git a/data/maps/events/MossdeepCity_House1.inc b/data/maps/events/MossdeepCity_House1.inc index c83a09c5c5..bddde5c818 100644 --- a/data/maps/events/MossdeepCity_House1.inc +++ b/data/maps/events/MossdeepCity_House1.inc @@ -1,11 +1,11 @@ -MossdeepCity_House1_MapObjects: @ 8532978 - object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 3, 3, 3, 3, 17, 0, 0, 0, MossdeepCity_House1_EventScript_221FD6, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0, 0, 0 +MossdeepCity_House1_EventObjects: @ 8532978 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 3, 3, 3, 3, 17, 0, 0, 0, MossdeepCity_House1_EventScript_221FD6, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0, 0, 0 MossdeepCity_House1_MapWarps: @ 85329A8 warp_def 3, 7, 0, 0, MOSSDEEP_CITY warp_def 4, 7, 0, 0, MOSSDEEP_CITY MossdeepCity_House1_MapEvents:: @ 85329B8 - map_events MossdeepCity_House1_MapObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0 + map_events MossdeepCity_House1_EventObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_House2.inc b/data/maps/events/MossdeepCity_House2.inc index 08ab803488..e8e120c772 100644 --- a/data/maps/events/MossdeepCity_House2.inc +++ b/data/maps/events/MossdeepCity_House2.inc @@ -1,12 +1,12 @@ -MossdeepCity_House2_MapObjects: @ 85329CC - object_event 1, MAP_OBJ_GFX_MAN_5, 0, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WINGULL, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, 934, 0, 0 +MossdeepCity_House2_EventObjects: @ 85329CC + object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, 934, 0, 0 MossdeepCity_House2_MapWarps: @ 8532A14 warp_def 3, 8, 0, 3, MOSSDEEP_CITY warp_def 4, 8, 0, 3, MOSSDEEP_CITY MossdeepCity_House2_MapEvents:: @ 8532A24 - map_events MossdeepCity_House2_MapObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0 + map_events MossdeepCity_House2_EventObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_House3.inc b/data/maps/events/MossdeepCity_House3.inc index 21c008770d..5fec469e8a 100644 --- a/data/maps/events/MossdeepCity_House3.inc +++ b/data/maps/events/MossdeepCity_House3.inc @@ -1,10 +1,10 @@ -MossdeepCity_House3_MapObjects: @ 8532BD4 - object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, MossdeepCity_House3_EventScript_2225C3, 0, 0, 0 +MossdeepCity_House3_EventObjects: @ 8532BD4 + object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, MossdeepCity_House3_EventScript_2225C3, 0, 0, 0 MossdeepCity_House3_MapWarps: @ 8532BEC warp_def 3, 7, 0, 5, MOSSDEEP_CITY warp_def 4, 7, 0, 5, MOSSDEEP_CITY MossdeepCity_House3_MapEvents:: @ 8532BFC - map_events MossdeepCity_House3_MapObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0 + map_events MossdeepCity_House3_EventObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_House4.inc b/data/maps/events/MossdeepCity_House4.inc index 76245850f2..923bbe86d0 100644 --- a/data/maps/events/MossdeepCity_House4.inc +++ b/data/maps/events/MossdeepCity_House4.inc @@ -1,12 +1,12 @@ -MossdeepCity_House4_MapObjects: @ 8532CAC - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 6, 6, 3, 5, 1, 0, 0, 0, MossdeepCity_House4_EventScript_222DF7, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SKITTY, 0, 0, 2, 4, 3, 1, 17, 0, 0, 0, MossdeepCity_House4_EventScript_222E1E, 0, 0, 0 +MossdeepCity_House4_EventObjects: @ 8532CAC + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 6, 6, 3, 5, 1, 0, 0, 0, MossdeepCity_House4_EventScript_222DF7, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 0, 2, 4, 3, 1, 17, 0, 0, 0, MossdeepCity_House4_EventScript_222E1E, 0, 0, 0 MossdeepCity_House4_MapWarps: @ 8532CF4 warp_def 4, 7, 0, 7, MOSSDEEP_CITY warp_def 3, 7, 0, 7, MOSSDEEP_CITY MossdeepCity_House4_MapEvents:: @ 8532D04 - map_events MossdeepCity_House4_MapObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0 + map_events MossdeepCity_House4_EventObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_Mart.inc b/data/maps/events/MossdeepCity_Mart.inc index 4a49376bab..c8bbd0a418 100644 --- a/data/maps/events/MossdeepCity_Mart.inc +++ b/data/maps/events/MossdeepCity_Mart.inc @@ -1,13 +1,13 @@ -MossdeepCity_Mart_MapObjects: @ 8532B50 - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223C8, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 1, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_2, 0, 0, 8, 3, 3, 3, 16, 0, 0, 0, MossdeepCity_Mart_EventScript_2223FF, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SAILOR, 0, 0, 5, 3, 3, 2, 17, 0, 0, 0, MossdeepCity_Mart_EventScript_222408, 0, 0, 0 +MossdeepCity_Mart_EventObjects: @ 8532B50 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223C8, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 1, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 0, 8, 3, 3, 3, 16, 0, 0, 0, MossdeepCity_Mart_EventScript_2223FF, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 0, 5, 3, 3, 2, 17, 0, 0, 0, MossdeepCity_Mart_EventScript_222408, 0, 0, 0 MossdeepCity_Mart_MapWarps: @ 8532BB0 warp_def 3, 7, 0, 4, MOSSDEEP_CITY warp_def 4, 7, 0, 4, MOSSDEEP_CITY MossdeepCity_Mart_MapEvents:: @ 8532BC0 - map_events MossdeepCity_Mart_MapObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0 + map_events MossdeepCity_Mart_EventObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc index 30e5d395cd..17052105de 100644 --- a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc +++ b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc @@ -1,7 +1,7 @@ -MossdeepCity_PokemonCenter_1F_MapObjects: @ 8532A38 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22224E, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 8, 4, 3, 7, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22225C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GIRL_1, 0, 0, 3, 5, 3, 1, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_222265, 0, 0, 0 +MossdeepCity_PokemonCenter_1F_EventObjects: @ 8532A38 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22224E, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 8, 4, 3, 7, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22225C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 0, 3, 5, 3, 1, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_222265, 0, 0, 0 MossdeepCity_PokemonCenter_1F_MapWarps: @ 8532A80 warp_def 7, 8, 3, 2, MOSSDEEP_CITY @@ -9,5 +9,5 @@ MossdeepCity_PokemonCenter_1F_MapWarps: @ 8532A80 warp_def 1, 6, 4, 0, MOSSDEEP_CITY_POKEMON_CENTER_2F MossdeepCity_PokemonCenter_1F_MapEvents:: @ 8532A98 - map_events MossdeepCity_PokemonCenter_1F_MapObjects, MossdeepCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events MossdeepCity_PokemonCenter_1F_EventObjects, MossdeepCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc index 7eda9d522b..13a189b51f 100644 --- a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc +++ b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc @@ -1,9 +1,9 @@ -MossdeepCity_PokemonCenter_2F_MapObjects: @ 8532AAC - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 0, 11, 7, 3, 5, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0, 0, 0 +MossdeepCity_PokemonCenter_2F_EventObjects: @ 8532AAC + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 11, 7, 3, 5, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0, 0, 0 MossdeepCity_PokemonCenter_2F_MapWarps: @ 8532B24 warp_def 1, 6, 4, 2, MOSSDEEP_CITY_POKEMON_CENTER_1F @@ -11,5 +11,5 @@ MossdeepCity_PokemonCenter_2F_MapWarps: @ 8532B24 warp_def 9, 1, 3, 0, TRADE_CENTER MossdeepCity_PokemonCenter_2F_MapEvents:: @ 8532B3C - map_events MossdeepCity_PokemonCenter_2F_MapObjects, MossdeepCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events MossdeepCity_PokemonCenter_2F_EventObjects, MossdeepCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc index 4e2062365e..8352fe02ce 100644 --- a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc +++ b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc @@ -1,15 +1,15 @@ -MossdeepCity_SpaceCenter_1F_MapObjects: @ 8532D18 - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 7, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_222FD8, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 2, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223063, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SAILOR, 0, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 10, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223168, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 0, 14, 7, 3, 3, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22312D, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 12, 9, 3, 9, 17, 0, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231DA, 756, 0, 0 - object_event 7, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 11, 6, 3, 9, 17, 0, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231F1, 756, 0, 0 - object_event 8, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 10, 2, 3, 8, 17, 0, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_223208, 756, 0, 0 - object_event 9, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 13, 2, 3, 8, 17, 0, 1, 0, MossdeepCity_SpaceCenter_1F_EventScript_22321F, 756, 0, 0 - object_event 10, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 5, 0, 76, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, 737, 0, 0 - object_event 11, MAP_OBJ_GFX_STEVEN, 0, 0, 1, 4, 3, 8, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, 753, 0, 0 +MossdeepCity_SpaceCenter_1F_EventObjects: @ 8532D18 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 7, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_222FD8, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 2, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223063, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 10, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223168, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 14, 7, 3, 3, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22312D, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 12, 9, 3, 9, 17, 0, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231DA, 756, 0, 0 + object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 11, 6, 3, 9, 17, 0, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231F1, 756, 0, 0 + object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 10, 2, 3, 8, 17, 0, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_223208, 756, 0, 0 + object_event 9, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 13, 2, 3, 8, 17, 0, 1, 0, MossdeepCity_SpaceCenter_1F_EventScript_22321F, 756, 0, 0 + object_event 10, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 5, 0, 76, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, 737, 0, 0 + object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 0, 1, 4, 3, 8, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, 753, 0, 0 MossdeepCity_SpaceCenter_1F_MapWarps: @ 8532E20 warp_def 7, 9, 0, 8, MOSSDEEP_CITY @@ -17,5 +17,5 @@ MossdeepCity_SpaceCenter_1F_MapWarps: @ 8532E20 warp_def 13, 1, 0, 0, MOSSDEEP_CITY_SPACE_CENTER_2F MossdeepCity_SpaceCenter_1F_MapEvents:: @ 8532E38 - map_events MossdeepCity_SpaceCenter_1F_MapObjects, MossdeepCity_SpaceCenter_1F_MapWarps, 0x0, 0x0 + map_events MossdeepCity_SpaceCenter_1F_EventObjects, MossdeepCity_SpaceCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc index 3de11be87b..ac3bc8c7aa 100644 --- a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc +++ b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc @@ -1,17 +1,17 @@ -MossdeepCity_SpaceCenter_2F_MapObjects: @ 8532E4C - object_event 1, MAP_OBJ_GFX_BOY_4, 0, 0, 6, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 5, 6, 3, 2, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223E8D, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_STEVEN, 0, 0, 1, 8, 3, 8, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F7A, 863, 0, 0 - object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 2, 3, 10, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F3E, 862, 0, 0 - object_event 6, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 13, 3, 3, 7, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F50, 862, 0, 0 - object_event 7, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 14, 2, 3, 9, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F47, 862, 0, 0 - object_event 8, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 0, 8, 3, 10, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, 862, 0, 0 - object_event 9, MAP_OBJ_GFX_MAXIE, 0, 0, 1, 9, 3, 7, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, 862, 0, 0 +MossdeepCity_SpaceCenter_2F_EventObjects: @ 8532E4C + object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 0, 6, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 5, 6, 3, 2, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223E8D, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_STEVEN, 0, 0, 1, 8, 3, 8, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F7A, 863, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 2, 3, 10, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F3E, 862, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 13, 3, 3, 7, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F50, 862, 0, 0 + object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 14, 2, 3, 9, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F47, 862, 0, 0 + object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 0, 8, 3, 10, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, 862, 0, 0 + object_event 9, EVENT_OBJ_GFX_MAXIE, 0, 0, 1, 9, 3, 7, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, 862, 0, 0 MossdeepCity_SpaceCenter_2F_MapWarps: @ 8532F24 warp_def 13, 1, 0, 2, MOSSDEEP_CITY_SPACE_CENTER_1F MossdeepCity_SpaceCenter_2F_MapEvents:: @ 8532F2C - map_events MossdeepCity_SpaceCenter_2F_MapObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0 + map_events MossdeepCity_SpaceCenter_2F_EventObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/events/MossdeepCity_StevensHouse.inc index 523088c405..4d96583124 100644 --- a/data/maps/events/MossdeepCity_StevensHouse.inc +++ b/data/maps/events/MossdeepCity_StevensHouse.inc @@ -1,7 +1,7 @@ -MossdeepCity_StevensHouse_MapObjects: @ 8532C10 - object_event 1, MAP_OBJ_GFX_STEVEN, 0, 0, 9, 6, 3, 10, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, 967, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 3, 1, 17, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, 968, 0, 0 - object_event 3, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 6, 4, 3, 76, 17, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, 727, 0, 0 +MossdeepCity_StevensHouse_EventObjects: @ 8532C10 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 0, 9, 6, 3, 10, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, 967, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 3, 1, 17, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, 968, 0, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 6, 4, 3, 76, 17, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, 727, 0, 0 MossdeepCity_StevensHouse_MapWarps: @ 8532C58 warp_def 3, 7, 0, 6, MOSSDEEP_CITY @@ -14,5 +14,5 @@ MossdeepCity_StevensHouse_MapBGEvents: @ 8532C68 bg_event 10, 6, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_222909 MossdeepCity_StevensHouse_MapEvents:: @ 8532C98 - map_events MossdeepCity_StevensHouse_MapObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents + map_events MossdeepCity_StevensHouse_EventObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents diff --git a/data/maps/events/MtChimney.inc b/data/maps/events/MtChimney.inc index 5f026066ad..e4eeb764d9 100644 --- a/data/maps/events/MtChimney.inc +++ b/data/maps/events/MtChimney.inc @@ -1,34 +1,34 @@ -MtChimney_MapObjects: @ 85347C8 - object_event 1, MAP_OBJ_GFX_ARCHIE, 0, 0, 24, 19, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, 926, 0, 0 - object_event 2, MAP_OBJ_GFX_MAXIE, 0, 0, 13, 6, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, 927, 0, 0 - object_event 3, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 11, 3, 9, 0, 0, 1, 2, MtChimney_EventScript_22F06E, 927, 0, 0 - object_event 4, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 32, 5, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C0, 927, 0, 0 - object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 28, 12, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F0B7, 927, 0, 0 - object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F05C, 926, 0, 0 - object_event 7, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 29, 5, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F053, 926, 0, 0 - object_event 8, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 31, 12, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F065, 926, 0, 0 - object_event 9, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EEF3, 994, 0, 0 - object_event 10, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 22, 39, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C9, 927, 0, 0 - object_event 11, MAP_OBJ_GFX_POOCHYENA, 0, 0, 23, 19, 3, 74, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0 - object_event 12, MAP_OBJ_GFX_POOCHYENA, 0, 0, 23, 18, 3, 64, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 - object_event 13, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 23, 17, 3, 8, 0, 0, 0, 0, MtChimney_EventScript_22F0A5, 927, 0, 0 - object_event 14, MAP_OBJ_GFX_POOCHYENA, 0, 0, 23, 20, 3, 65, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 - object_event 15, MAP_OBJ_GFX_POOCHYENA, 0, 0, 22, 19, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 - object_event 16, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 23, 21, 3, 7, 0, 0, 0, 0, MtChimney_EventScript_22F0AE, 927, 0, 0 - object_event 17, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 21, 19, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F09C, 927, 0, 0 - object_event 18, MAP_OBJ_GFX_POOCHYENA, 0, 0, 30, 12, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0 - object_event 19, MAP_OBJ_GFX_POOCHYENA, 0, 0, 29, 12, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 - object_event 20, MAP_OBJ_GFX_POOCHYENA, 0, 0, 30, 5, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0 - object_event 21, MAP_OBJ_GFX_POOCHYENA, 0, 0, 31, 5, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 - object_event 22, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 9, 16, 3, 10, 0, 0, 1, 3, MtChimney_EventScript_22F085, 927, 0, 0 - object_event 23, MAP_OBJ_GFX_POOCHYENA, 0, 0, 20, 39, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0 - object_event 24, MAP_OBJ_GFX_POOCHYENA, 0, 0, 21, 39, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 - object_event 25, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 16, 18, 3, 13, 0, 0, 1, 3, MtChimney_EventScript_22F14A, 877, 0, 0 - object_event 26, MAP_OBJ_GFX_BEAUTY, 0, 0, 14, 7, 3, 70, 0, 0, 1, 6, MtChimney_EventScript_22F1AC, 877, 0, 0 - object_event 27, MAP_OBJ_GFX_BEAUTY, 0, 0, 29, 7, 3, 17, 17, 0, 1, 3, MtChimney_EventScript_22F1C3, 877, 0, 0 - object_event 28, MAP_OBJ_GFX_BEAUTY, 0, 0, 27, 17, 3, 16, 17, 0, 1, 3, MtChimney_EventScript_22F1DA, 877, 0, 0 - object_event 29, MAP_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 13, 16, 3, 9, 17, 0, 1, 3, MtChimney_EventScript_22F1F1, 927, 0, 0 - object_event 30, MAP_OBJ_GFX_HIKER, 0, 0, 7, 7, 3, 10, 17, 0, 1, 6, MtChimney_EventScript_22F208, 877, 0, 0 +MtChimney_EventObjects: @ 85347C8 + object_event 1, EVENT_OBJ_GFX_ARCHIE, 0, 0, 24, 19, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, 926, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAXIE, 0, 0, 13, 6, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, 927, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 11, 3, 9, 0, 0, 1, 2, MtChimney_EventScript_22F06E, 927, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 32, 5, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C0, 927, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 28, 12, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F0B7, 927, 0, 0 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F05C, 926, 0, 0 + object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 29, 5, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F053, 926, 0, 0 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 31, 12, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F065, 926, 0, 0 + object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EEF3, 994, 0, 0 + object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 22, 39, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C9, 927, 0, 0 + object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 23, 19, 3, 74, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0 + object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 23, 18, 3, 64, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 + object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 23, 17, 3, 8, 0, 0, 0, 0, MtChimney_EventScript_22F0A5, 927, 0, 0 + object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 23, 20, 3, 65, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 + object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 22, 19, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 + object_event 16, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 23, 21, 3, 7, 0, 0, 0, 0, MtChimney_EventScript_22F0AE, 927, 0, 0 + object_event 17, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 21, 19, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F09C, 927, 0, 0 + object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 30, 12, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0 + object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 29, 12, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 + object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 30, 5, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0 + object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 31, 5, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 + object_event 22, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 9, 16, 3, 10, 0, 0, 1, 3, MtChimney_EventScript_22F085, 927, 0, 0 + object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 20, 39, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0 + object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 21, 39, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 + object_event 25, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 16, 18, 3, 13, 0, 0, 1, 3, MtChimney_EventScript_22F14A, 877, 0, 0 + object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 0, 14, 7, 3, 70, 0, 0, 1, 6, MtChimney_EventScript_22F1AC, 877, 0, 0 + object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 0, 29, 7, 3, 17, 17, 0, 1, 3, MtChimney_EventScript_22F1C3, 877, 0, 0 + object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 0, 27, 17, 3, 16, 17, 0, 1, 3, MtChimney_EventScript_22F1DA, 877, 0, 0 + object_event 29, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 13, 16, 3, 9, 17, 0, 1, 3, MtChimney_EventScript_22F1F1, 927, 0, 0 + object_event 30, EVENT_OBJ_GFX_HIKER, 0, 0, 7, 7, 3, 10, 17, 0, 1, 6, MtChimney_EventScript_22F208, 877, 0, 0 MtChimney_MapWarps: @ 8534A98 warp_def 17, 36, 0, 0, MT_CHIMNEY_CABLE_CAR_STATION @@ -41,5 +41,5 @@ MtChimney_MapBGEvents: @ 8534AB8 bg_event 24, 37, 3, 0, 0, MtChimney_EventScript_22F141 MtChimney_MapEvents:: @ 8534AD0 - map_events MtChimney_MapObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents + map_events MtChimney_EventObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents diff --git a/data/maps/events/MtChimney_CableCarStation.inc b/data/maps/events/MtChimney_CableCarStation.inc index deb7541570..1c791072c6 100644 --- a/data/maps/events/MtChimney_CableCarStation.inc +++ b/data/maps/events/MtChimney_CableCarStation.inc @@ -1,11 +1,11 @@ -MtChimney_CableCarStation_MapObjects: @ 8533CA8 - object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 6, 6, 3, 8, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_22AC4B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_CABLE_CAR, 0, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0 +MtChimney_CableCarStation_EventObjects: @ 8533CA8 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 6, 6, 3, 8, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_22AC4B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0 MtChimney_CableCarStation_MapWarps: @ 8533CD8 warp_def 6, 11, 0, 0, MT_CHIMNEY warp_def 7, 11, 0, 1, MT_CHIMNEY MtChimney_CableCarStation_MapEvents:: @ 8533CE8 - map_events MtChimney_CableCarStation_MapObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0 + map_events MtChimney_CableCarStation_EventObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_1F.inc b/data/maps/events/MtPyre_1F.inc index 5270f92fdc..aedb94c2f0 100644 --- a/data/maps/events/MtPyre_1F.inc +++ b/data/maps/events/MtPyre_1F.inc @@ -1,7 +1,7 @@ -MtPyre_1F_MapObjects: @ 8534D64 - object_event 1, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 21, 2, 3, 8, 17, 0, 0, 0, MtPyre_1F_EventScript_230F3F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 17, 8, 3, 7, 17, 0, 0, 0, MtPyre_1F_EventScript_230F78, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_5, 0, 0, 13, 10, 3, 9, 17, 0, 0, 0, MtPyre_1F_EventScript_230F81, 0, 0, 0 +MtPyre_1F_EventObjects: @ 8534D64 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 21, 2, 3, 8, 17, 0, 0, 0, MtPyre_1F_EventScript_230F3F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 17, 8, 3, 7, 17, 0, 0, 0, MtPyre_1F_EventScript_230F78, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 0, 13, 10, 3, 9, 17, 0, 0, 0, MtPyre_1F_EventScript_230F81, 0, 0, 0 MtPyre_1F_MapWarps: @ 8534DAC warp_def 17, 18, 3, 0, ROUTE_122 @@ -12,5 +12,5 @@ MtPyre_1F_MapWarps: @ 8534DAC warp_def 20, 9, 3, 4, MT_PYRE_2F MtPyre_1F_MapEvents:: @ 8534DDC - map_events MtPyre_1F_MapObjects, MtPyre_1F_MapWarps, 0x0, 0x0 + map_events MtPyre_1F_EventObjects, MtPyre_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_2F.inc b/data/maps/events/MtPyre_2F.inc index 86659ac47e..d75442cd64 100644 --- a/data/maps/events/MtPyre_2F.inc +++ b/data/maps/events/MtPyre_2F.inc @@ -1,12 +1,12 @@ -MtPyre_2F_MapObjects: @ 8534DF0 - object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 3, 6, 3, 10, 17, 0, 1, 2, MtPyre_2F_EventScript_231128, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 10, 3, 1, 17, 0, 0, 0, MtPyre_2F_EventScript_2912FD, 1129, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_1, 0, 0, 9, 3, 3, 10, 17, 0, 0, 0, MtPyre_2F_EventScript_231116, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_3, 0, 0, 12, 10, 3, 8, 17, 0, 0, 0, MtPyre_2F_EventScript_23111F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 0, 2, 9, 3, 8, 17, 0, 1, 1, MtPyre_2F_EventScript_23115A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_5, 0, 0, 3, 9, 3, 8, 17, 0, 1, 1, MtPyre_2F_EventScript_23113F, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 6, 9, 3, 7, 17, 0, 1, 2, MtPyre_2F_EventScript_23118C, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 6, 6, 3, 17, 17, 0, 1, 2, MtPyre_2F_EventScript_231175, 0, 0, 0 +MtPyre_2F_EventObjects: @ 8534DF0 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 6, 3, 10, 17, 0, 1, 2, MtPyre_2F_EventScript_231128, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 10, 3, 1, 17, 0, 0, 0, MtPyre_2F_EventScript_2912FD, 1129, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 9, 3, 3, 10, 17, 0, 0, 0, MtPyre_2F_EventScript_231116, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 0, 12, 10, 3, 8, 17, 0, 0, 0, MtPyre_2F_EventScript_23111F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 2, 9, 3, 8, 17, 0, 1, 1, MtPyre_2F_EventScript_23115A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 0, 3, 9, 3, 8, 17, 0, 1, 1, MtPyre_2F_EventScript_23113F, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 6, 9, 3, 7, 17, 0, 1, 2, MtPyre_2F_EventScript_23118C, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 6, 6, 3, 17, 17, 0, 1, 2, MtPyre_2F_EventScript_231175, 0, 0, 0 MtPyre_2F_MapWarps: @ 8534EB0 warp_def 2, 1, 3, 4, MT_PYRE_1F @@ -16,5 +16,5 @@ MtPyre_2F_MapWarps: @ 8534EB0 warp_def 11, 9, 3, 5, MT_PYRE_1F MtPyre_2F_MapEvents:: @ 8534ED8 - map_events MtPyre_2F_MapObjects, MtPyre_2F_MapWarps, 0x0, 0x0 + map_events MtPyre_2F_EventObjects, MtPyre_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_3F.inc b/data/maps/events/MtPyre_3F.inc index 96dcae630c..e52cd546b7 100644 --- a/data/maps/events/MtPyre_3F.inc +++ b/data/maps/events/MtPyre_3F.inc @@ -1,8 +1,8 @@ -MtPyre_3F_MapObjects: @ 8534EEC - object_event 1, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 1, 4, 3, 18, 17, 0, 1, 4, MtPyre_3F_EventScript_231753, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LASS, 0, 0, 11, 4, 3, 17, 17, 0, 1, 4, MtPyre_3F_EventScript_23176A, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 3, 1, 17, 0, 0, 0, MtPyre_3F_EventScript_29130A, 1120, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 0, 6, 4, 3, 14, 17, 0, 1, 4, MtPyre_3F_EventScript_231781, 0, 0, 0 +MtPyre_3F_EventObjects: @ 8534EEC + object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 1, 4, 3, 18, 17, 0, 1, 4, MtPyre_3F_EventScript_231753, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LASS, 0, 0, 11, 4, 3, 17, 17, 0, 1, 4, MtPyre_3F_EventScript_23176A, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 3, 1, 17, 0, 0, 0, MtPyre_3F_EventScript_29130A, 1120, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 6, 4, 3, 14, 17, 0, 1, 4, MtPyre_3F_EventScript_231781, 0, 0, 0 MtPyre_3F_MapWarps: @ 8534F4C warp_def 10, 1, 3, 1, MT_PYRE_2F @@ -13,5 +13,5 @@ MtPyre_3F_MapWarps: @ 8534F4C warp_def 6, 12, 3, 3, MT_PYRE_2F MtPyre_3F_MapEvents:: @ 8534F7C - map_events MtPyre_3F_MapObjects, MtPyre_3F_MapWarps, 0x0, 0x0 + map_events MtPyre_3F_EventObjects, MtPyre_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_4F.inc b/data/maps/events/MtPyre_4F.inc index 2792fa422a..1804f46157 100644 --- a/data/maps/events/MtPyre_4F.inc +++ b/data/maps/events/MtPyre_4F.inc @@ -1,6 +1,6 @@ -MtPyre_4F_MapObjects: @ 8534F90 - object_event 1, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 11, 7, 3, 24, 17, 0, 1, 2, MtPyre_4F_EventScript_231C6E, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 11, 3, 1, 17, 0, 0, 0, MtPyre_4F_EventScript_291317, 1130, 0, 0 +MtPyre_4F_EventObjects: @ 8534F90 + object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 11, 7, 3, 24, 17, 0, 1, 2, MtPyre_4F_EventScript_231C6E, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 11, 3, 1, 17, 0, 0, 0, MtPyre_4F_EventScript_291317, 1130, 0, 0 MtPyre_4F_MapWarps: @ 8534FC0 warp_def 10, 1, 3, 1, MT_PYRE_5F @@ -11,5 +11,5 @@ MtPyre_4F_MapWarps: @ 8534FC0 warp_def 2, 12, 3, 3, MT_PYRE_3F MtPyre_4F_MapEvents:: @ 8534FF0 - map_events MtPyre_4F_MapObjects, MtPyre_4F_MapWarps, 0x0, 0x0 + map_events MtPyre_4F_EventObjects, MtPyre_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_5F.inc b/data/maps/events/MtPyre_5F.inc index f92f779653..ce7851f62f 100644 --- a/data/maps/events/MtPyre_5F.inc +++ b/data/maps/events/MtPyre_5F.inc @@ -1,6 +1,6 @@ -MtPyre_5F_MapObjects: @ 8535004 - object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 3, 7, 3, 17, 17, 0, 1, 2, MtPyre_5F_EventScript_231BC9, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 11, 3, 1, 17, 0, 0, 0, MtPyre_5F_EventScript_291324, 1052, 0, 0 +MtPyre_5F_EventObjects: @ 8535004 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 3, 7, 3, 17, 17, 0, 1, 2, MtPyre_5F_EventScript_231BC9, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 11, 3, 1, 17, 0, 0, 0, MtPyre_5F_EventScript_291324, 1052, 0, 0 MtPyre_5F_MapWarps: @ 8535034 warp_def 2, 1, 3, 0, MT_PYRE_6F @@ -10,5 +10,5 @@ MtPyre_5F_MapWarps: @ 8535034 warp_def 12, 12, 3, 3, MT_PYRE_4F MtPyre_5F_MapEvents:: @ 853505C - map_events MtPyre_5F_MapObjects, MtPyre_5F_MapWarps, 0x0, 0x0 + map_events MtPyre_5F_EventObjects, MtPyre_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_6F.inc b/data/maps/events/MtPyre_6F.inc index be64599819..b271e116cf 100644 --- a/data/maps/events/MtPyre_6F.inc +++ b/data/maps/events/MtPyre_6F.inc @@ -1,12 +1,12 @@ -MtPyre_6F_MapObjects: @ 8535070 - object_event 1, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 6, 3, 3, 23, 17, 0, 1, 3, MtPyre_6F_EventScript_231D3B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 9, 3, 1, 17, 0, 0, 0, MtPyre_6F_EventScript_291331, 1089, 0, 0 - object_event 3, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 10, 3, 3, 24, 17, 0, 1, 3, MtPyre_6F_EventScript_231D9D, 0, 0, 0 +MtPyre_6F_EventObjects: @ 8535070 + object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 6, 3, 3, 23, 17, 0, 1, 3, MtPyre_6F_EventScript_231D3B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 9, 3, 1, 17, 0, 0, 0, MtPyre_6F_EventScript_291331, 1089, 0, 0 + object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 10, 3, 3, 24, 17, 0, 1, 3, MtPyre_6F_EventScript_231D9D, 0, 0, 0 MtPyre_6F_MapWarps: @ 85350B8 warp_def 2, 1, 3, 0, MT_PYRE_5F warp_def 1, 10, 3, 2, MT_PYRE_5F MtPyre_6F_MapEvents:: @ 85350C8 - map_events MtPyre_6F_MapObjects, MtPyre_6F_MapWarps, 0x0, 0x0 + map_events MtPyre_6F_EventObjects, MtPyre_6F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_Exterior.inc b/data/maps/events/MtPyre_Exterior.inc index 5a6101968c..a45d2ec2ea 100644 --- a/data/maps/events/MtPyre_Exterior.inc +++ b/data/maps/events/MtPyre_Exterior.inc @@ -1,6 +1,6 @@ -MtPyre_Exterior_MapObjects: @ 85350DC - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 27, 15, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, 1073, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 19, 40, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, 1074, 0, 0 +MtPyre_Exterior_EventObjects: @ 85350DC + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 27, 15, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, 1073, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 19, 40, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, 1074, 0, 0 MtPyre_Exterior_MapWarps: @ 853510C warp_def 10, 42, 3, 1, MT_PYRE_1F @@ -19,5 +19,5 @@ MtPyre_Exterior_MapBGEvents: @ 8535174 bg_event 16, 22, 0, 7, 0, ITEM_MAX_ETHER, 78, 0 MtPyre_Exterior_MapEvents:: @ 853518C - map_events MtPyre_Exterior_MapObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents + map_events MtPyre_Exterior_EventObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/events/MtPyre_Summit.inc index 261721fb96..696d9ead39 100644 --- a/data/maps/events/MtPyre_Summit.inc +++ b/data/maps/events/MtPyre_Summit.inc @@ -1,12 +1,12 @@ -MtPyre_Summit_MapObjects: @ 85351A0 - object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 22, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ARCHIE, 0, 0, 23, 6, 3, 7, 0, 0, 0, 0, 0x0, 916, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 23, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 15, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, 917, 0, 0 - object_event 5, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 25, 18, 3, 9, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, 917, 0, 0 - object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 11, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, 917, 0, 0 - object_event 7, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 25, 11, 3, 9, 17, 0, 1, 3, MtPyre_Summit_EventScript_232442, 917, 0, 0 - object_event 8, MAP_OBJ_GFX_MAXIE, 0, 0, 23, 6, 3, 7, 17, 0, 0, 0, 0x0, 856, 0, 0 +MtPyre_Summit_EventObjects: @ 85351A0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 22, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 0, 23, 6, 3, 7, 0, 0, 0, 0, 0x0, 916, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 23, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 15, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, 917, 0, 0 + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 25, 18, 3, 9, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, 917, 0, 0 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 11, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, 917, 0, 0 + object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 25, 11, 3, 9, 17, 0, 1, 3, MtPyre_Summit_EventScript_232442, 917, 0, 0 + object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 0, 23, 6, 3, 7, 17, 0, 0, 0, 0x0, 856, 0, 0 MtPyre_Summit_MapWarps: @ 8535260 warp_def 22, 31, 3, 1, MT_PYRE_EXTERIOR @@ -26,5 +26,5 @@ MtPyre_Summit_MapBGEvents: @ 85352D8 bg_event 37, 7, 3, 7, 0, ITEM_RARE_CANDY, 80, 0 MtPyre_Summit_MapEvents:: @ 85352F0 - map_events MtPyre_Summit_MapObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents + map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents diff --git a/data/maps/events/NavelRock_Bottom.inc b/data/maps/events/NavelRock_Bottom.inc index 6de1313e9e..af7cffea3f 100644 --- a/data/maps/events/NavelRock_Bottom.inc +++ b/data/maps/events/NavelRock_Bottom.inc @@ -1,9 +1,9 @@ -NavelRock_Bottom_MapObjects: @ 853DD50 - object_event 1, MAP_OBJ_GFX_LUGIA, 0, 0, 11, 13, 0, 8, 17, 0, 0, 0, NavelRock_Bottom_EventScript_2692A2, 800, 0, 0 +NavelRock_Bottom_EventObjects: @ 853DD50 + object_event 1, EVENT_OBJ_GFX_LUGIA, 0, 0, 11, 13, 0, 8, 17, 0, 0, 0, NavelRock_Bottom_EventScript_2692A2, 800, 0, 0 NavelRock_Bottom_MapWarps: @ 853DD68 warp_def 14, 19, 0, 0, NAVEL_ROCK_DOWN_11 NavelRock_Bottom_MapEvents:: @ 853DD70 - map_events NavelRock_Bottom_MapObjects, NavelRock_Bottom_MapWarps, 0x0, 0x0 + map_events NavelRock_Bottom_EventObjects, NavelRock_Bottom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Harbor.inc b/data/maps/events/NavelRock_Harbor.inc index eab9c8fc66..21102a4749 100644 --- a/data/maps/events/NavelRock_Harbor.inc +++ b/data/maps/events/NavelRock_Harbor.inc @@ -1,10 +1,10 @@ -NavelRock_Harbor_MapObjects: @ 853DA24 - object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 8, 5, 0, 7, 17, 0, 0, 0, NavelRock_Harbor_EventScript_2690BD, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 8, 7, 1, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 +NavelRock_Harbor_EventObjects: @ 853DA24 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 8, 5, 0, 7, 17, 0, 0, 0, NavelRock_Harbor_EventScript_2690BD, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 8, 7, 1, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 NavelRock_Harbor_MapWarps: @ 853DA54 warp_def 8, 2, 0, 0, NAVEL_ROCK_EXTERIOR NavelRock_Harbor_MapEvents:: @ 853DA5C - map_events NavelRock_Harbor_MapObjects, NavelRock_Harbor_MapWarps, 0x0, 0x0 + map_events NavelRock_Harbor_EventObjects, NavelRock_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Top.inc b/data/maps/events/NavelRock_Top.inc index 6950113112..34e93223f5 100644 --- a/data/maps/events/NavelRock_Top.inc +++ b/data/maps/events/NavelRock_Top.inc @@ -1,5 +1,5 @@ -NavelRock_Top_MapObjects: @ 853DB74 - object_event 1, MAP_OBJ_GFX_HOOH, 0, 0, 12, 4, 0, 8, 17, 0, 0, 0, 0x0, 801, 0, 0 +NavelRock_Top_EventObjects: @ 853DB74 + object_event 1, EVENT_OBJ_GFX_HOOH, 0, 0, 12, 4, 0, 8, 17, 0, 0, 0, 0x0, 801, 0, 0 NavelRock_Top_MapWarps: @ 853DB8C warp_def 13, 20, 3, 1, NAVEL_ROCK_UP_4 @@ -11,5 +11,5 @@ NavelRock_Top_MapBGEvents: @ 853DBA4 bg_event 12, 9, 3, 7, 0, ITEM_SACRED_ASH, 109, 0 NavelRock_Top_MapEvents:: @ 853DBB0 - map_events NavelRock_Top_MapObjects, NavelRock_Top_MapWarps, NavelRock_Top_MapCoordEvents, NavelRock_Top_MapBGEvents + map_events NavelRock_Top_EventObjects, NavelRock_Top_MapWarps, NavelRock_Top_MapCoordEvents, NavelRock_Top_MapBGEvents diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/events/NewMauville_Inside.inc index a2d81c9c1e..141fd04d4b 100644 --- a/data/maps/events/NewMauville_Inside.inc +++ b/data/maps/events/NewMauville_Inside.inc @@ -1,12 +1,12 @@ -NewMauville_Inside_MapObjects: @ 85364A8 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 32, 25, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, 1075, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 22, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, 1076, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 39, 4, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291206, 1110, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 17, 10, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291213, 1122, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 11, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291220, 1123, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 25, 18, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_2377AF, 974, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 11, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_2377FC, 975, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 13, 10, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_237849, 976, 0, 0 +NewMauville_Inside_EventObjects: @ 85364A8 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 32, 25, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, 1075, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 22, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, 1076, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 39, 4, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291206, 1110, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 17, 10, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291213, 1122, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 11, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291220, 1123, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 25, 18, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_2377AF, 974, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 11, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_2377FC, 975, 0, 0 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 10, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_237849, 976, 0, 0 NewMauville_Inside_MapWarps: @ 8536568 warp_def 32, 33, 3, 1, NEW_MAUVILLE_ENTRANCE @@ -34,5 +34,5 @@ NewMauville_Inside_MapBGEvents: @ 8536610 bg_event 35, 2, 0, 0, 0, NewMauville_Inside_EventScript_23778F NewMauville_Inside_MapEvents:: @ 8536670 - map_events NewMauville_Inside_MapObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents + map_events NewMauville_Inside_EventObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents diff --git a/data/maps/events/OldaleTown.inc b/data/maps/events/OldaleTown.inc index 2f2929eb5f..6278db4281 100644 --- a/data/maps/events/OldaleTown.inc +++ b/data/maps/events/OldaleTown.inc @@ -1,8 +1,8 @@ -OldaleTown_MapObjects: @ 8527854 - object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 0, 16, 11, 3, 9, 0, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 13, 7, 3, 8, 0, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MANIAC, 0, 0, 8, 9, 3, 10, 0, 0, 0, 0, OldaleTown_EventScript_1E901F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_HIPSTER, 0, 0, 11, 19, 3, 7, 17, 0, 0, 0, OldaleTown_EventScript_1E9070, 979, 0, 0 +OldaleTown_EventObjects: @ 8527854 + object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 0, 16, 11, 3, 9, 0, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 13, 7, 3, 8, 0, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 9, 3, 10, 0, 0, 0, 0, OldaleTown_EventScript_1E901F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 0, 11, 19, 3, 7, 17, 0, 0, 0, OldaleTown_EventScript_1E9070, 979, 0, 0 OldaleTown_MapWarps: @ 85278B4 warp_def 5, 7, 0, 0, OLDALE_TOWN_HOUSE_1 @@ -24,5 +24,5 @@ OldaleTown_MapBGEvents: @ 8527914 bg_event 16, 6, 0, 1, 0, OldaleTown_EventScript_271E6A OldaleTown_MapEvents:: @ 8527950 - map_events OldaleTown_MapObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents + map_events OldaleTown_EventObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents diff --git a/data/maps/events/OldaleTown_House1.inc b/data/maps/events/OldaleTown_House1.inc index 1a8edcbc61..93ffb8d726 100644 --- a/data/maps/events/OldaleTown_House1.inc +++ b/data/maps/events/OldaleTown_House1.inc @@ -1,10 +1,10 @@ -OldaleTown_House1_MapObjects: @ 852D7B4 - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0, 0, 0 +OldaleTown_House1_EventObjects: @ 852D7B4 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0, 0, 0 OldaleTown_House1_MapWarps: @ 852D7CC warp_def 3, 8, 0, 0, OLDALE_TOWN warp_def 4, 8, 0, 0, OLDALE_TOWN OldaleTown_House1_MapEvents:: @ 852D7DC - map_events OldaleTown_House1_MapObjects, OldaleTown_House1_MapWarps, 0x0, 0x0 + map_events OldaleTown_House1_EventObjects, OldaleTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_House2.inc b/data/maps/events/OldaleTown_House2.inc index c86bc109c7..4744874236 100644 --- a/data/maps/events/OldaleTown_House2.inc +++ b/data/maps/events/OldaleTown_House2.inc @@ -1,11 +1,11 @@ -OldaleTown_House2_MapObjects: @ 852D7F0 - object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF5B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF64, 0, 0, 0 +OldaleTown_House2_EventObjects: @ 852D7F0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF5B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF64, 0, 0, 0 OldaleTown_House2_MapWarps: @ 852D820 warp_def 3, 7, 0, 1, OLDALE_TOWN warp_def 4, 7, 0, 1, OLDALE_TOWN OldaleTown_House2_MapEvents:: @ 852D830 - map_events OldaleTown_House2_MapObjects, OldaleTown_House2_MapWarps, 0x0, 0x0 + map_events OldaleTown_House2_EventObjects, OldaleTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_Mart.inc b/data/maps/events/OldaleTown_Mart.inc index 6a58118c8a..57e963cd59 100644 --- a/data/maps/events/OldaleTown_Mart.inc +++ b/data/maps/events/OldaleTown_Mart.inc @@ -1,12 +1,12 @@ -OldaleTown_Mart_MapObjects: @ 852D95C - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC240, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC28A, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 9, 4, 3, 3, 16, 0, 0, 0, OldaleTown_Mart_EventScript_1FC2A9, 0, 0, 0 +OldaleTown_Mart_EventObjects: @ 852D95C + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC240, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC28A, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 9, 4, 3, 3, 16, 0, 0, 0, OldaleTown_Mart_EventScript_1FC2A9, 0, 0, 0 OldaleTown_Mart_MapWarps: @ 852D9A4 warp_def 3, 7, 0, 3, OLDALE_TOWN warp_def 4, 7, 0, 3, OLDALE_TOWN OldaleTown_Mart_MapEvents:: @ 852D9B4 - map_events OldaleTown_Mart_MapObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0 + map_events OldaleTown_Mart_EventObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_PokemonCenter_1F.inc b/data/maps/events/OldaleTown_PokemonCenter_1F.inc index a6e424f276..65465578b3 100644 --- a/data/maps/events/OldaleTown_PokemonCenter_1F.inc +++ b/data/maps/events/OldaleTown_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ -OldaleTown_PokemonCenter_1F_MapObjects: @ 852D844 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC01A, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC028, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC031, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 3, 7, 3, 10, 17, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC03A, 0, 0, 0 +OldaleTown_PokemonCenter_1F_EventObjects: @ 852D844 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC01A, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC028, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC031, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 3, 7, 3, 10, 17, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC03A, 0, 0, 0 OldaleTown_PokemonCenter_1F_MapWarps: @ 852D8A4 warp_def 7, 8, 3, 2, OLDALE_TOWN @@ -10,5 +10,5 @@ OldaleTown_PokemonCenter_1F_MapWarps: @ 852D8A4 warp_def 1, 6, 4, 0, OLDALE_TOWN_POKEMON_CENTER_2F OldaleTown_PokemonCenter_1F_MapEvents:: @ 852D8BC - map_events OldaleTown_PokemonCenter_1F_MapObjects, OldaleTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events OldaleTown_PokemonCenter_1F_EventObjects, OldaleTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_PokemonCenter_2F.inc b/data/maps/events/OldaleTown_PokemonCenter_2F.inc index d520c6bcf3..cbf3356a0c 100644 --- a/data/maps/events/OldaleTown_PokemonCenter_2F.inc +++ b/data/maps/events/OldaleTown_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -OldaleTown_PokemonCenter_2F_MapObjects: @ 852D8D0 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +OldaleTown_PokemonCenter_2F_EventObjects: @ 852D8D0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 OldaleTown_PokemonCenter_2F_MapWarps: @ 852D930 warp_def 1, 6, 4, 2, OLDALE_TOWN_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ OldaleTown_PokemonCenter_2F_MapWarps: @ 852D930 warp_def 9, 1, 3, 0, TRADE_CENTER OldaleTown_PokemonCenter_2F_MapEvents:: @ 852D948 - map_events OldaleTown_PokemonCenter_2F_MapObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events OldaleTown_PokemonCenter_2F_EventObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown.inc b/data/maps/events/PacifidlogTown.inc index 1667ccc87e..b0df30af1b 100644 --- a/data/maps/events/PacifidlogTown.inc +++ b/data/maps/events/PacifidlogTown.inc @@ -1,7 +1,7 @@ -PacifidlogTown_MapObjects: @ 8527DE8 - object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 0, 10, 23, 3, 9, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBACC, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_FISHERMAN, 0, 0, 11, 14, 3, 10, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAD5, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 9, 16, 3, 8, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0, 0, 0 +PacifidlogTown_EventObjects: @ 8527DE8 + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 0, 10, 23, 3, 9, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBACC, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 11, 14, 3, 10, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAD5, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 9, 16, 3, 8, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0, 0, 0 PacifidlogTown_MapWarps: @ 8527E30 warp_def 8, 15, 0, 0, PACIFIDLOG_TOWN_POKEMON_CENTER_1F @@ -17,5 +17,5 @@ PacifidlogTown_MapBGEvents: @ 8527E60 bg_event 10, 15, 0, 1, 0, PacifidlogTown_EventScript_271E73 PacifidlogTown_MapEvents:: @ 8527E84 - map_events PacifidlogTown_MapObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents + map_events PacifidlogTown_EventObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents diff --git a/data/maps/events/PacifidlogTown_House1.inc b/data/maps/events/PacifidlogTown_House1.inc index 5f2c3b9052..a60d8eedc4 100644 --- a/data/maps/events/PacifidlogTown_House1.inc +++ b/data/maps/events/PacifidlogTown_House1.inc @@ -1,11 +1,11 @@ -PacifidlogTown_House1_MapObjects: @ 852EBA0 - object_event 1, MAP_OBJ_GFX_MAN_6, 0, 0, 3, 5, 3, 8, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 0, 6, 4, 3, 9, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0, 0, 0 +PacifidlogTown_House1_EventObjects: @ 852EBA0 + object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 0, 3, 5, 3, 8, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 6, 4, 3, 9, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0, 0, 0 PacifidlogTown_House1_MapWarps: @ 852EBD0 warp_def 4, 8, 0, 1, PACIFIDLOG_TOWN warp_def 5, 8, 0, 1, PACIFIDLOG_TOWN PacifidlogTown_House1_MapEvents:: @ 852EBE0 - map_events PacifidlogTown_House1_MapObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0 + map_events PacifidlogTown_House1_EventObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House2.inc b/data/maps/events/PacifidlogTown_House2.inc index 743395c723..26147f726d 100644 --- a/data/maps/events/PacifidlogTown_House2.inc +++ b/data/maps/events/PacifidlogTown_House2.inc @@ -1,12 +1,12 @@ -PacifidlogTown_House2_MapObjects: @ 852EBF4 - object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 3, 5, 3, 8, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_203792, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_AZURILL, 0, 0, 8, 6, 3, 1, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_203891, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_AZURILL, 0, 0, 1, 7, 3, 1, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_2038AC, 0, 0, 0 +PacifidlogTown_House2_EventObjects: @ 852EBF4 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 3, 5, 3, 8, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_203792, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 0, 8, 6, 3, 1, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_203891, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 0, 1, 7, 3, 1, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_2038AC, 0, 0, 0 PacifidlogTown_House2_MapWarps: @ 852EC3C warp_def 4, 8, 0, 2, PACIFIDLOG_TOWN warp_def 5, 8, 0, 2, PACIFIDLOG_TOWN PacifidlogTown_House2_MapEvents:: @ 852EC4C - map_events PacifidlogTown_House2_MapObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0 + map_events PacifidlogTown_House2_EventObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House3.inc b/data/maps/events/PacifidlogTown_House3.inc index 85d7c4f53f..8f32929366 100644 --- a/data/maps/events/PacifidlogTown_House3.inc +++ b/data/maps/events/PacifidlogTown_House3.inc @@ -1,11 +1,11 @@ -PacifidlogTown_House3_MapObjects: @ 852EC60 - object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 0, 3, 5, 3, 18, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_203CB5, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 2, 3, 10, 17, 0, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0, 0, 0 +PacifidlogTown_House3_EventObjects: @ 852EC60 + object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 0, 3, 5, 3, 18, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_203CB5, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 2, 3, 10, 17, 0, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0, 0, 0 PacifidlogTown_House3_MapWarps: @ 852EC90 warp_def 4, 8, 0, 3, PACIFIDLOG_TOWN warp_def 5, 8, 0, 3, PACIFIDLOG_TOWN PacifidlogTown_House3_MapEvents:: @ 852ECA0 - map_events PacifidlogTown_House3_MapObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0 + map_events PacifidlogTown_House3_EventObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House4.inc b/data/maps/events/PacifidlogTown_House4.inc index b552a566c2..1d88d3be79 100644 --- a/data/maps/events/PacifidlogTown_House4.inc +++ b/data/maps/events/PacifidlogTown_House4.inc @@ -1,12 +1,12 @@ -PacifidlogTown_House4_MapObjects: @ 852ECB4 - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_203F55, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 7, 5, 3, 2, 17, 0, 0, 0, PacifidlogTown_House4_EventScript_203F4C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, PacifidlogTown_House4_EventScript_203F5E, 0, 0, 0 +PacifidlogTown_House4_EventObjects: @ 852ECB4 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_203F55, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 7, 5, 3, 2, 17, 0, 0, 0, PacifidlogTown_House4_EventScript_203F4C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, PacifidlogTown_House4_EventScript_203F5E, 0, 0, 0 PacifidlogTown_House4_MapWarps: @ 852ECFC warp_def 4, 8, 0, 4, PACIFIDLOG_TOWN warp_def 5, 8, 0, 4, PACIFIDLOG_TOWN PacifidlogTown_House4_MapEvents:: @ 852ED0C - map_events PacifidlogTown_House4_MapObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0 + map_events PacifidlogTown_House4_EventObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House5.inc b/data/maps/events/PacifidlogTown_House5.inc index e078fc6127..51cbaaa392 100644 --- a/data/maps/events/PacifidlogTown_House5.inc +++ b/data/maps/events/PacifidlogTown_House5.inc @@ -1,11 +1,11 @@ -PacifidlogTown_House5_MapObjects: @ 852ED20 - object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204111, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 3, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204137, 0, 0, 0 +PacifidlogTown_House5_EventObjects: @ 852ED20 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204111, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 3, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204137, 0, 0, 0 PacifidlogTown_House5_MapWarps: @ 852ED50 warp_def 4, 8, 0, 5, PACIFIDLOG_TOWN warp_def 5, 8, 0, 5, PACIFIDLOG_TOWN PacifidlogTown_House5_MapEvents:: @ 852ED60 - map_events PacifidlogTown_House5_MapObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0 + map_events PacifidlogTown_House5_EventObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc index 3a28af3723..f67b4269e4 100644 --- a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc +++ b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc @@ -1,9 +1,9 @@ -PacifidlogTown_PokemonCenter_1F_MapObjects: @ 852EA70 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034B6, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 10, 6, 3, 9, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034D6, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GIRL_2, 0, 0, 2, 2, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034C4, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_1, 0, 0, 4, 5, 3, 1, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034CD, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_6, 0, 0, 12, 8, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0, 0, 0 +PacifidlogTown_PokemonCenter_1F_EventObjects: @ 852EA70 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034B6, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 10, 6, 3, 9, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034D6, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 0, 2, 2, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034C4, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 4, 5, 3, 1, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034CD, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 0, 12, 8, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0, 0, 0 PacifidlogTown_PokemonCenter_1F_MapWarps: @ 852EAE8 warp_def 7, 8, 3, 0, PACIFIDLOG_TOWN @@ -11,5 +11,5 @@ PacifidlogTown_PokemonCenter_1F_MapWarps: @ 852EAE8 warp_def 1, 6, 4, 0, PACIFIDLOG_TOWN_POKEMON_CENTER_2F PacifidlogTown_PokemonCenter_1F_MapEvents:: @ 852EB00 - map_events PacifidlogTown_PokemonCenter_1F_MapObjects, PacifidlogTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events PacifidlogTown_PokemonCenter_1F_EventObjects, PacifidlogTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc index 2ae1cc4809..26b9cf591b 100644 --- a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc +++ b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -PacifidlogTown_PokemonCenter_2F_MapObjects: @ 852EB14 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +PacifidlogTown_PokemonCenter_2F_EventObjects: @ 852EB14 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 PacifidlogTown_PokemonCenter_2F_MapWarps: @ 852EB74 warp_def 1, 6, 4, 2, PACIFIDLOG_TOWN_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ PacifidlogTown_PokemonCenter_2F_MapWarps: @ 852EB74 warp_def 9, 1, 3, 0, TRADE_CENTER PacifidlogTown_PokemonCenter_2F_MapEvents:: @ 852EB8C - map_events PacifidlogTown_PokemonCenter_2F_MapObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events PacifidlogTown_PokemonCenter_2F_EventObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/events/PetalburgCity.inc index ad696f7ffa..171790f567 100644 --- a/data/maps/events/PetalburgCity.inc +++ b/data/maps/events/PetalburgCity.inc @@ -1,13 +1,13 @@ -PetalburgCity_MapObjects: @ 8525FD0 - object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 0, 16, 18, 3, 2, 17, 0, 0, 0, PetalburgCity_EventScript_1DC3FD, 728, 0, 0 - object_event 2, MAP_OBJ_GFX_WALLY, 0, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 726, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 8, 22, 3, 8, 0, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 20, 10, 3, 3, 16, 0, 0, 0, PetalburgCity_EventScript_1DC488, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_3, 0, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 830, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 19, 2, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910B4, 1039, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 28, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910C1, 1040, 0, 0 - object_event 8, MAP_OBJ_GFX_BOY_2, 0, 0, 12, 15, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_SCOTT, 0, 0, 13, 12, 3, 1, 17, 0, 0, 0, 0x0, 995, 0, 0 +PetalburgCity_EventObjects: @ 8525FD0 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 16, 18, 3, 2, 17, 0, 0, 0, PetalburgCity_EventScript_1DC3FD, 728, 0, 0 + object_event 2, EVENT_OBJ_GFX_WALLY, 0, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 726, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 8, 22, 3, 8, 0, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 20, 10, 3, 3, 16, 0, 0, 0, PetalburgCity_EventScript_1DC488, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 830, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 19, 2, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910B4, 1039, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 28, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910C1, 1040, 0, 0 + object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 0, 12, 15, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_SCOTT, 0, 0, 13, 12, 3, 1, 17, 0, 0, 0, 0x0, 995, 0, 0 PetalburgCity_MapWarps: @ 85260A8 warp_def 10, 19, 0, 0, PETALBURG_CITY_HOUSE_1 @@ -38,5 +38,5 @@ PetalburgCity_MapBGEvents: @ 8526158 bg_event 11, 29, 3, 7, 0, ITEM_RARE_CANDY, 95, 0 PetalburgCity_MapEvents:: @ 85261B8 - map_events PetalburgCity_MapObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents + map_events PetalburgCity_EventObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents diff --git a/data/maps/events/PetalburgCity_Gym.inc b/data/maps/events/PetalburgCity_Gym.inc index 2ee8771a00..bdd6d2da42 100644 --- a/data/maps/events/PetalburgCity_Gym.inc +++ b/data/maps/events/PetalburgCity_Gym.inc @@ -1,15 +1,15 @@ -PetalburgCity_Gym_MapObjects: @ 852EDC8 - object_event 1, MAP_OBJ_GFX_NORMAN, 0, 0, 4, 2, 0, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, 772, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 94, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 81, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 42, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053F6, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 55, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054E6, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 68, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205432, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 16, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205522, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 29, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_20546E, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_MAN_2, 0, 0, 3, 109, 3, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_20574F, 781, 0, 0 - object_event 10, MAP_OBJ_GFX_WALLY, 0, 0, 4, 111, 3, 7, 0, 0, 0, 0, 0x0, 866, 0, 0 - object_event 11, MAP_OBJ_GFX_MAN_3, 0, 0, 1, 7, 3, 7, 17, 0, 0, 0, 0x0, 824, 0, 0 +PetalburgCity_Gym_EventObjects: @ 852EDC8 + object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 0, 4, 2, 0, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, 772, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 94, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 81, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 42, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053F6, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 55, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054E6, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 68, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205432, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 16, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205522, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 29, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_20546E, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 3, 109, 3, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_20574F, 781, 0, 0 + object_event 10, EVENT_OBJ_GFX_WALLY, 0, 0, 4, 111, 3, 7, 0, 0, 0, 0, 0x0, 866, 0, 0 + object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 0, 1, 7, 3, 7, 17, 0, 0, 0, 0x0, 824, 0, 0 PetalburgCity_Gym_MapWarps: @ 852EED0 warp_def 4, 111, 3, 2, PETALBURG_CITY @@ -68,5 +68,5 @@ PetalburgCity_Gym_MapBGEvents: @ 852F000 bg_event 7, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_20577E PetalburgCity_Gym_MapEvents:: @ 852F0A8 - map_events PetalburgCity_Gym_MapObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents + map_events PetalburgCity_Gym_EventObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents diff --git a/data/maps/events/PetalburgCity_House1.inc b/data/maps/events/PetalburgCity_House1.inc index 59ffd7eca9..c078d68763 100644 --- a/data/maps/events/PetalburgCity_House1.inc +++ b/data/maps/events/PetalburgCity_House1.inc @@ -1,11 +1,11 @@ -PetalburgCity_House1_MapObjects: @ 852F0BC - object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 0, 7, 4, 3, 2, 34, 0, 0, 0, PetalburgCity_House1_EventScript_2077A3, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0, 0, 0 +PetalburgCity_House1_EventObjects: @ 852F0BC + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 0, 7, 4, 3, 2, 34, 0, 0, 0, PetalburgCity_House1_EventScript_2077A3, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0, 0, 0 PetalburgCity_House1_MapWarps: @ 852F0EC warp_def 3, 8, 0, 0, PETALBURG_CITY warp_def 4, 8, 0, 0, PETALBURG_CITY PetalburgCity_House1_MapEvents:: @ 852F0FC - map_events PetalburgCity_House1_MapObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0 + map_events PetalburgCity_House1_EventObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_House2.inc b/data/maps/events/PetalburgCity_House2.inc index 14ca86ab83..b6570b5e95 100644 --- a/data/maps/events/PetalburgCity_House2.inc +++ b/data/maps/events/PetalburgCity_House2.inc @@ -1,11 +1,11 @@ -PetalburgCity_House2_MapObjects: @ 852F110 - object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 2, 5, 3, 2, 17, 0, 0, 0, PetalburgCity_House2_EventScript_2078F3, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, PetalburgCity_House2_EventScript_2078FC, 0, 0, 0 +PetalburgCity_House2_EventObjects: @ 852F110 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 2, 5, 3, 2, 17, 0, 0, 0, PetalburgCity_House2_EventScript_2078F3, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, PetalburgCity_House2_EventScript_2078FC, 0, 0, 0 PetalburgCity_House2_MapWarps: @ 852F140 warp_def 3, 7, 0, 4, PETALBURG_CITY warp_def 4, 7, 0, 4, PETALBURG_CITY PetalburgCity_House2_MapEvents:: @ 852F150 - map_events PetalburgCity_House2_MapObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0 + map_events PetalburgCity_House2_EventObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_Mart.inc b/data/maps/events/PetalburgCity_Mart.inc index e5f1a1d3d9..0413f795a0 100644 --- a/data/maps/events/PetalburgCity_Mart.inc +++ b/data/maps/events/PetalburgCity_Mart.inc @@ -1,13 +1,13 @@ -PetalburgCity_Mart_MapObjects: @ 852F294 - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207D69, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DE8, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 6, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DDF, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0, 0, 0 +PetalburgCity_Mart_EventObjects: @ 852F294 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207D69, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DE8, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 6, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DDF, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0, 0, 0 PetalburgCity_Mart_MapWarps: @ 852F2F4 warp_def 3, 7, 0, 5, PETALBURG_CITY warp_def 4, 7, 0, 5, PETALBURG_CITY PetalburgCity_Mart_MapEvents:: @ 852F304 - map_events PetalburgCity_Mart_MapObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0 + map_events PetalburgCity_Mart_EventObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc index 3395f43b4b..5c940de5ab 100644 --- a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc +++ b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc @@ -1,9 +1,9 @@ -PetalburgCity_PokemonCenter_1F_MapObjects: @ 852F164 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_2079FC, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_5, 0, 0, 11, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_291539, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A0A, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 9, 6, 3, 2, 17, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A13, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 0, 5, 4, 3, 1, 17, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0, 0, 0 +PetalburgCity_PokemonCenter_1F_EventObjects: @ 852F164 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_2079FC, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 11, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_291539, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A0A, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 9, 6, 3, 2, 17, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A13, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 5, 4, 3, 1, 17, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0, 0, 0 PetalburgCity_PokemonCenter_1F_MapWarps: @ 852F1DC warp_def 7, 8, 3, 3, PETALBURG_CITY @@ -11,5 +11,5 @@ PetalburgCity_PokemonCenter_1F_MapWarps: @ 852F1DC warp_def 1, 6, 4, 0, PETALBURG_CITY_POKEMON_CENTER_2F PetalburgCity_PokemonCenter_1F_MapEvents:: @ 852F1F4 - map_events PetalburgCity_PokemonCenter_1F_MapObjects, PetalburgCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events PetalburgCity_PokemonCenter_1F_EventObjects, PetalburgCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc index 5506670c57..99312ac964 100644 --- a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc +++ b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -PetalburgCity_PokemonCenter_2F_MapObjects: @ 852F208 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +PetalburgCity_PokemonCenter_2F_EventObjects: @ 852F208 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 PetalburgCity_PokemonCenter_2F_MapWarps: @ 852F268 warp_def 1, 6, 4, 2, PETALBURG_CITY_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ PetalburgCity_PokemonCenter_2F_MapWarps: @ 852F268 warp_def 9, 1, 3, 0, TRADE_CENTER PetalburgCity_PokemonCenter_2F_MapEvents:: @ 852F280 - map_events PetalburgCity_PokemonCenter_2F_MapObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events PetalburgCity_PokemonCenter_2F_EventObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_WallysHouse.inc b/data/maps/events/PetalburgCity_WallysHouse.inc index df04a06953..e7107f07a7 100644 --- a/data/maps/events/PetalburgCity_WallysHouse.inc +++ b/data/maps/events/PetalburgCity_WallysHouse.inc @@ -1,11 +1,11 @@ -PetalburgCity_WallysHouse_MapObjects: @ 852ED74 - object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 3, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0, 0, 0 +PetalburgCity_WallysHouse_EventObjects: @ 852ED74 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 3, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0, 0, 0 PetalburgCity_WallysHouse_MapWarps: @ 852EDA4 warp_def 3, 7, 0, 1, PETALBURG_CITY warp_def 4, 7, 0, 1, PETALBURG_CITY PetalburgCity_WallysHouse_MapEvents:: @ 852EDB4 - map_events PetalburgCity_WallysHouse_MapObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0 + map_events PetalburgCity_WallysHouse_EventObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc index 5d6c101490..bb9b69f35c 100644 --- a/data/maps/events/PetalburgWoods.inc +++ b/data/maps/events/PetalburgWoods.inc @@ -1,17 +1,17 @@ -PetalburgWoods_MapObjects: @ 85345E4 - object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 19, 10, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 19, 11, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 26, 17, 3, 10, 0, 0, 0, 0, 0x0, 725, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_2, 0, 0, 26, 20, 3, 1, 0, 0, 0, 0, 0x0, 724, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 45, 7, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_29110F, 1056, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 35, 20, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_291102, 1055, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_29111C, 1058, 0, 0 - object_event 8, MAP_OBJ_GFX_BOY_2, 0, 0, 15, 19, 3, 3, 33, 0, 0, 0, PetalburgWoods_EventScript_22E210, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 7, 32, 3, 22, 0, 0, 1, 3, PetalburgWoods_EventScript_22E26D, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 4, 14, 3, 20, 0, 0, 1, 3, PetalburgWoods_EventScript_22E284, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_BOY_3, 0, 0, 30, 34, 3, 2, 18, 0, 0, 0, PetalburgWoods_EventScript_22E219, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 26, 3, 1, 17, 0, 0, 0, PetalburgWoods_EventScript_291129, 1117, 0, 0 - object_event 13, MAP_OBJ_GFX_GIRL_2, 0, 0, 33, 5, 3, 1, 17, 0, 0, 0, PetalburgWoods_EventScript_22E222, 0, 0, 0 +PetalburgWoods_EventObjects: @ 85345E4 + object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 19, 10, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 17, 0, 0 + object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 19, 11, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 18, 0, 0 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 26, 17, 3, 10, 0, 0, 0, 0, 0x0, 725, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 0, 26, 20, 3, 1, 0, 0, 0, 0, 0x0, 724, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 45, 7, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_29110F, 1056, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 35, 20, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_291102, 1055, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_29111C, 1058, 0, 0 + object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 0, 15, 19, 3, 3, 33, 0, 0, 0, PetalburgWoods_EventScript_22E210, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 7, 32, 3, 22, 0, 0, 1, 3, PetalburgWoods_EventScript_22E26D, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 4, 14, 3, 20, 0, 0, 1, 3, PetalburgWoods_EventScript_22E284, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 0, 30, 34, 3, 2, 18, 0, 0, 0, PetalburgWoods_EventScript_22E219, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 26, 3, 1, 17, 0, 0, 0, PetalburgWoods_EventScript_291129, 1117, 0, 0 + object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 0, 33, 5, 3, 1, 17, 0, 0, 0, PetalburgWoods_EventScript_22E222, 0, 0, 0 PetalburgWoods_MapWarps: @ 853471C warp_def 14, 5, 0, 2, ROUTE_104 @@ -34,5 +34,5 @@ PetalburgWoods_MapBGEvents: @ 853476C bg_event 11, 8, 3, 0, 0, PetalburgWoods_EventScript_22E264 PetalburgWoods_MapEvents:: @ 85347B4 - map_events PetalburgWoods_MapObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents + map_events PetalburgWoods_EventObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents diff --git a/data/maps/events/RecordCorner.inc b/data/maps/events/RecordCorner.inc index 672abbbd4c..ad9f6625de 100644 --- a/data/maps/events/RecordCorner.inc +++ b/data/maps/events/RecordCorner.inc @@ -1,5 +1,5 @@ -RecordCorner_MapObjects: @ 8539DFC - object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 10, 5, 3, 8, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0, 0, 0 +RecordCorner_EventObjects: @ 8539DFC + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 10, 5, 3, 8, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0, 0, 0 RecordCorner_MapWarps: @ 8539E14 warp_def 8, 9, 3, 127, NONE @@ -14,5 +14,5 @@ RecordCorner_MapCoordEvents: @ 8539E34 coord_event 13, 6, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827745C RecordCorner_MapEvents:: @ 8539E74 - map_events RecordCorner_MapObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0 + map_events RecordCorner_EventObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0 diff --git a/data/maps/events/Route101.inc b/data/maps/events/Route101.inc index aa8389e292..e942526bae 100644 --- a/data/maps/events/Route101.inc +++ b/data/maps/events/Route101.inc @@ -1,10 +1,10 @@ -Route101_MapObjects: @ 8527E98 - object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 16, 8, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 9, 13, 0, 71, 0, 0, 0, 0, 0x0, 720, 0, 0 - object_event 3, MAP_OBJ_GFX_BIRCHS_BAG, 0, 0, 7, 14, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBE16, 700, 0, 0 - object_event 4, MAP_OBJ_GFX_ZIGZAGOON_1, 0, 0, 10, 13, 0, 70, 0, 0, 0, 0, 0x0, 750, 0, 0 - object_event 5, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 5, 11, 3, 1, 0, 0, 0, 0, Route101_EventScript_272141, 897, 0, 0 - object_event 6, MAP_OBJ_GFX_BOY_2, 0, 0, 2, 13, 3, 5, 17, 0, 0, 0, Route101_EventScript_1EBE04, 991, 0, 0 +Route101_EventObjects: @ 8527E98 + object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 16, 8, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 9, 13, 0, 71, 0, 0, 0, 0, 0x0, 720, 0, 0 + object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 0, 7, 14, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBE16, 700, 0, 0 + object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_1, 0, 0, 10, 13, 0, 70, 0, 0, 0, 0, 0x0, 750, 0, 0 + object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 5, 11, 3, 1, 0, 0, 0, 0, Route101_EventScript_272141, 897, 0, 0 + object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 0, 2, 13, 3, 5, 17, 0, 0, 0, Route101_EventScript_1EBE04, 991, 0, 0 Route101_MapCoordEvents: @ 8527F28 coord_event 10, 19, 3, 0, VAR_0x4060, 1, 0, Route101_EventScript_1EBCDE @@ -21,5 +21,5 @@ Route101_MapBGEvents: @ 8527FB8 bg_event 5, 9, 0, 0, 0, Route101_EventScript_1EBE0D Route101_MapEvents:: @ 8527FC4 - map_events Route101_MapObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents + map_events Route101_EventObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents diff --git a/data/maps/events/Route102.inc b/data/maps/events/Route102.inc index e128d9652d..8b1551f09d 100644 --- a/data/maps/events/Route102.inc +++ b/data/maps/events/Route102.inc @@ -1,18 +1,18 @@ -Route102_MapObjects: @ 8527FD8 - object_event 1, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 18, 11, 3, 1, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 33, 14, 3, 8, 0, 0, 1, 3, Route102_EventScript_1EC105, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 25, 15, 3, 7, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LASS, 0, 0, 8, 7, 3, 18, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BOY_1, 0, 0, 37, 4, 3, 2, 17, 0, 0, 0, Route102_EventScript_1EC0FC, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 11, 15, 3, 8, 0, 0, 0, 0, Route102_EventScript_290CD8, 1000, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 24, 2, 3, 12, 0, 0, 0, 2, BerryTreeScript, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 25, 2, 3, 12, 0, 0, 0, 1, BerryTreeScript, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 19, 4, 3, 8, 17, 0, 1, 3, Route102_EventScript_1EC1E1, 0, 0, 0 +Route102_EventObjects: @ 8527FD8 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 18, 11, 3, 1, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 33, 14, 3, 8, 0, 0, 1, 3, Route102_EventScript_1EC105, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 25, 15, 3, 7, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 0, 8, 7, 3, 18, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 0, 37, 4, 3, 2, 17, 0, 0, 0, Route102_EventScript_1EC0FC, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 11, 15, 3, 8, 0, 0, 0, 0, Route102_EventScript_290CD8, 1000, 0, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 24, 2, 3, 12, 0, 0, 0, 2, BerryTreeScript, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 25, 2, 3, 12, 0, 0, 0, 1, BerryTreeScript, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 19, 4, 3, 8, 17, 0, 1, 3, Route102_EventScript_1EC1E1, 0, 0, 0 Route102_MapBGEvents: @ 85280B0 bg_event 17, 2, 0, 0, 0, Route102_EventScript_1EC0F3 bg_event 40, 9, 0, 0, 0, Route102_EventScript_1EC0EA Route102_MapEvents:: @ 85280C8 - map_events Route102_MapObjects, 0x0, 0x0, Route102_MapBGEvents + map_events Route102_EventObjects, 0x0, 0x0, Route102_MapBGEvents diff --git a/data/maps/events/Route103.inc b/data/maps/events/Route103.inc index 0b1bae04ae..cdd07bab1d 100644 --- a/data/maps/events/Route103.inc +++ b/data/maps/events/Route103.inc @@ -1,24 +1,24 @@ -Route103_MapObjects: @ 85280DC - object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 49, 12, 3, 9, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 10, 3, 3, 10, 0, 0, 0, 0, Route103_EventScript_1EC3C1, 723, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_3, 0, 0, 71, 11, 3, 18, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 65, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 64, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 0, 50, 8, 3, 26, 16, 0, 1, 3, Route103_EventScript_1EC6D1, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 58, 5, 3, 12, 0, 0, 0, 5, BerryTreeScript, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 59, 5, 3, 12, 0, 0, 0, 6, BerryTreeScript, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 60, 5, 3, 12, 0, 0, 0, 7, BerryTreeScript, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BOY_1, 0, 0, 20, 10, 3, 2, 33, 0, 0, 0, Route103_EventScript_1EC5D9, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 7, 3, 3, 2, 17, 0, 0, 0, Route103_EventScript_272141, 898, 0, 0 - object_event 12, MAP_OBJ_GFX_MAN_3, 0, 0, 56, 13, 3, 10, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 50, 5, 3, 1, 17, 0, 0, 0, Route103_EventScript_290CE5, 1114, 0, 0 - object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 67, 7, 3, 1, 17, 0, 0, 0, Route103_EventScript_2906BB, 18, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 72, 8, 3, 1, 17, 0, 0, 0, Route103_EventScript_2906BB, 19, 0, 0 - object_event 16, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 67, 5, 3, 8, 17, 0, 1, 2, Route103_EventScript_1EC761, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_MAN_6, 0, 0, 67, 9, 3, 7, 17, 0, 1, 2, Route103_EventScript_1EC74A, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 36, 6, 1, 26, 49, 0, 1, 5, Route103_EventScript_1EC78F, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 36, 13, 1, 25, 49, 0, 1, 5, Route103_EventScript_1EC778, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 64, 7, 0, 1, 17, 0, 0, 0, Route103_EventScript_290CF2, 1137, 0, 0 +Route103_EventObjects: @ 85280DC + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 49, 12, 3, 9, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 10, 3, 3, 10, 0, 0, 0, 0, Route103_EventScript_1EC3C1, 723, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 71, 11, 3, 18, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 65, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 64, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 50, 8, 3, 26, 16, 0, 1, 3, Route103_EventScript_1EC6D1, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 58, 5, 3, 12, 0, 0, 0, 5, BerryTreeScript, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 59, 5, 3, 12, 0, 0, 0, 6, BerryTreeScript, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 60, 5, 3, 12, 0, 0, 0, 7, BerryTreeScript, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 0, 20, 10, 3, 2, 33, 0, 0, 0, Route103_EventScript_1EC5D9, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 7, 3, 3, 2, 17, 0, 0, 0, Route103_EventScript_272141, 898, 0, 0 + object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 0, 56, 13, 3, 10, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 50, 5, 3, 1, 17, 0, 0, 0, Route103_EventScript_290CE5, 1114, 0, 0 + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 67, 7, 3, 1, 17, 0, 0, 0, Route103_EventScript_2906BB, 18, 0, 0 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 72, 8, 3, 1, 17, 0, 0, 0, Route103_EventScript_2906BB, 19, 0, 0 + object_event 16, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 67, 5, 3, 8, 17, 0, 1, 2, Route103_EventScript_1EC761, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 0, 67, 9, 3, 7, 17, 0, 1, 2, Route103_EventScript_1EC74A, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 36, 6, 1, 26, 49, 0, 1, 5, Route103_EventScript_1EC78F, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 36, 13, 1, 25, 49, 0, 1, 5, Route103_EventScript_1EC778, 0, 0, 0 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 64, 7, 0, 1, 17, 0, 0, 0, Route103_EventScript_290CF2, 1137, 0, 0 Route103_MapWarps: @ 85282BC warp_def 45, 6, 0, 0, ALTERING_CAVE @@ -27,5 +27,5 @@ Route103_MapBGEvents: @ 85282C4 bg_event 11, 9, 0, 0, 0, Route103_EventScript_1EC5EB Route103_MapEvents:: @ 85282D0 - map_events Route103_MapObjects, Route103_MapWarps, 0x0, Route103_MapBGEvents + map_events Route103_EventObjects, Route103_MapWarps, 0x0, Route103_MapBGEvents diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc index 2913f96c4f..66a9e0edb9 100644 --- a/data/maps/events/Route104.inc +++ b/data/maps/events/Route104.inc @@ -1,38 +1,38 @@ -Route104_MapObjects: @ 85282E4 - object_event 1, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 15, 60, 3, 9, 0, 0, 0, 0, Route104_EventScript_1ED00F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 0, 25, 49, 3, 2, 17, 0, 0, 0, Route104_EventScript_1ED006, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 31, 24, 3, 9, 0, 0, 1, 7, Route104_EventScript_1ED38D, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_1, 0, 0, 27, 63, 3, 3, 16, 0, 0, 0, Route104_EventScript_1ED045, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 0, 30, 50, 3, 2, 17, 0, 0, 0, Route104_EventScript_1ED04E, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_GIRL_3, 0, 0, 28, 74, 3, 7, 0, 0, 0, 0, Route104_EventScript_1ED090, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 12, 54, 1, 7, 0, 0, 0, 0, 0x0, 742, 0, 0 - object_event 8, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 51, 4, 10, 0, 0, 0, 0, 0x0, 738, 0, 0 - object_event 9, MAP_OBJ_GFX_FISHERMAN, 0, 0, 29, 8, 3, 8, 0, 0, 1, 0, Route104_EventScript_1ED35F, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 34, 6, 3, 12, 0, 0, 0, 8, BerryTreeScript, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 35, 6, 3, 12, 0, 0, 0, 9, BerryTreeScript, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 36, 6, 3, 12, 0, 0, 0, 10, BerryTreeScript, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 22, 41, 3, 12, 0, 0, 0, 11, BerryTreeScript, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 23, 41, 3, 12, 0, 0, 0, 12, BerryTreeScript, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 24, 41, 3, 12, 0, 0, 0, 13, BerryTreeScript, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 37, 8, 3, 9, 17, 0, 0, 0, Route104_EventScript_1ECF8C, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 3, 22, 3, 12, 0, 0, 0, 3, BerryTreeScript, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 3, 23, 3, 12, 0, 0, 0, 4, BerryTreeScript, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 3, 24, 3, 12, 0, 0, 0, 75, BerryTreeScript, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 3, 25, 3, 12, 0, 0, 0, 76, BerryTreeScript, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 39, 15, 3, 1, 0, 0, 0, 0, Route104_EventScript_290CFF, 1002, 0, 0 - object_event 22, MAP_OBJ_GFX_WOMAN_7, 0, 0, 8, 19, 3, 5, 1, 0, 0, 0, Route104_EventScript_1ECFCD, 906, 0, 0 - object_event 23, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 27, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED597, 0, 0, 0 - object_event 24, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 28, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED5B6, 0, 0, 0 - object_event 25, MAP_OBJ_GFX_BOY_4, 0, 0, 21, 25, 3, 23, 0, 0, 1, 3, Route104_EventScript_1ED43B, 0, 0, 0 - object_event 26, MAP_OBJ_GFX_WOMAN_3, 0, 0, 11, 44, 3, 16, 0, 0, 1, 3, Route104_EventScript_1ED4E9, 0, 0, 0 - object_event 27, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 29, 53, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D0C, 1057, 0, 0 - object_event 28, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 18, 67, 3, 46, 101, 0, 1, 2, Route104_EventScript_1ED376, 0, 0, 0 - object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 37, 22, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D19, 1115, 0, 0 - object_event 30, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 35, 22, 3, 1, 17, 0, 0, 0, Route104_EventScript_2906BB, 17, 0, 0 - object_event 31, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 8, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D26, 1135, 0, 0 - object_event 32, MAP_OBJ_GFX_BOY_2, 0, 0, 5, 26, 3, 1, 17, 0, 0, 0, Route104_EventScript_1ED057, 0, 0, 0 - object_event 33, MAP_OBJ_GFX_FISHERMAN, 0, 0, 15, 59, 3, 9, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0, 0, 0 - object_event 34, MAP_OBJ_GFX_HIPSTER, 0, 0, 17, 50, 0, 1, 17, 0, 0, 0, Route104_EventScript_1ECC9E, 719, 0, 0 +Route104_EventObjects: @ 85282E4 + object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 15, 60, 3, 9, 0, 0, 0, 0, Route104_EventScript_1ED00F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 0, 25, 49, 3, 2, 17, 0, 0, 0, Route104_EventScript_1ED006, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 31, 24, 3, 9, 0, 0, 1, 7, Route104_EventScript_1ED38D, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 0, 27, 63, 3, 3, 16, 0, 0, 0, Route104_EventScript_1ED045, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 30, 50, 3, 2, 17, 0, 0, 0, Route104_EventScript_1ED04E, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 0, 28, 74, 3, 7, 0, 0, 0, 0, Route104_EventScript_1ED090, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 12, 54, 1, 7, 0, 0, 0, 0, 0x0, 742, 0, 0 + object_event 8, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 51, 4, 10, 0, 0, 0, 0, 0x0, 738, 0, 0 + object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 29, 8, 3, 8, 0, 0, 1, 0, Route104_EventScript_1ED35F, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 34, 6, 3, 12, 0, 0, 0, 8, BerryTreeScript, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 35, 6, 3, 12, 0, 0, 0, 9, BerryTreeScript, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 36, 6, 3, 12, 0, 0, 0, 10, BerryTreeScript, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 22, 41, 3, 12, 0, 0, 0, 11, BerryTreeScript, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 23, 41, 3, 12, 0, 0, 0, 12, BerryTreeScript, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 24, 41, 3, 12, 0, 0, 0, 13, BerryTreeScript, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 37, 8, 3, 9, 17, 0, 0, 0, Route104_EventScript_1ECF8C, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 3, 22, 3, 12, 0, 0, 0, 3, BerryTreeScript, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 3, 23, 3, 12, 0, 0, 0, 4, BerryTreeScript, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 3, 24, 3, 12, 0, 0, 0, 75, BerryTreeScript, 0, 0, 0 + object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 3, 25, 3, 12, 0, 0, 0, 76, BerryTreeScript, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 39, 15, 3, 1, 0, 0, 0, 0, Route104_EventScript_290CFF, 1002, 0, 0 + object_event 22, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 8, 19, 3, 5, 1, 0, 0, 0, Route104_EventScript_1ECFCD, 906, 0, 0 + object_event 23, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 27, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED597, 0, 0, 0 + object_event 24, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 28, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED5B6, 0, 0, 0 + object_event 25, EVENT_OBJ_GFX_BOY_4, 0, 0, 21, 25, 3, 23, 0, 0, 1, 3, Route104_EventScript_1ED43B, 0, 0, 0 + object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 11, 44, 3, 16, 0, 0, 1, 3, Route104_EventScript_1ED4E9, 0, 0, 0 + object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 53, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D0C, 1057, 0, 0 + object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 18, 67, 3, 46, 101, 0, 1, 2, Route104_EventScript_1ED376, 0, 0, 0 + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 22, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D19, 1115, 0, 0 + object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 35, 22, 3, 1, 17, 0, 0, 0, Route104_EventScript_2906BB, 17, 0, 0 + object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 8, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D26, 1135, 0, 0 + object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 0, 5, 26, 3, 1, 17, 0, 0, 0, Route104_EventScript_1ED057, 0, 0, 0 + object_event 33, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 15, 59, 3, 9, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0, 0, 0 + object_event 34, EVENT_OBJ_GFX_HIPSTER, 0, 0, 17, 50, 0, 1, 17, 0, 0, 0, Route104_EventScript_1ECC9E, 719, 0, 0 Route104_MapWarps: @ 8528614 warp_def 17, 50, 0, 0, ROUTE_104_MR_BRINEYS_HOUSE @@ -60,5 +60,5 @@ Route104_MapBGEvents: @ 8528664 bg_event 16, 64, 3, 7, 0, ITEM_HEART_SCALE, 88, 0 Route104_MapEvents:: @ 85286DC - map_events Route104_MapObjects, Route104_MapWarps, Route104_MapCoordEvents, Route104_MapBGEvents + map_events Route104_EventObjects, Route104_MapWarps, Route104_MapCoordEvents, Route104_MapBGEvents diff --git a/data/maps/events/Route104_MrBrineysHouse.inc b/data/maps/events/Route104_MrBrineysHouse.inc index c643b364b9..2088faf169 100644 --- a/data/maps/events/Route104_MrBrineysHouse.inc +++ b/data/maps/events/Route104_MrBrineysHouse.inc @@ -1,11 +1,11 @@ -Route104_MrBrineysHouse_MapObjects: @ 8533AD4 - object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 3, 3, 50, 51, 0, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, 739, 0, 0 - object_event 2, MAP_OBJ_GFX_WINGULL, 0, 0, 6, 3, 3, 8, 51, 0, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, 881, 0, 0 +Route104_MrBrineysHouse_EventObjects: @ 8533AD4 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 3, 3, 50, 51, 0, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, 739, 0, 0 + object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 0, 6, 3, 3, 8, 51, 0, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, 881, 0, 0 Route104_MrBrineysHouse_MapWarps: @ 8533B04 warp_def 5, 8, 0, 0, ROUTE_104 warp_def 6, 8, 0, 0, ROUTE_104 Route104_MrBrineysHouse_MapEvents:: @ 8533B14 - map_events Route104_MrBrineysHouse_MapObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0 + map_events Route104_MrBrineysHouse_EventObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route104_PrettyPetalFlowerShop.inc b/data/maps/events/Route104_PrettyPetalFlowerShop.inc index 08f2390c05..2d6d7fe376 100644 --- a/data/maps/events/Route104_PrettyPetalFlowerShop.inc +++ b/data/maps/events/Route104_PrettyPetalFlowerShop.inc @@ -1,12 +1,12 @@ -Route104_PrettyPetalFlowerShop_MapObjects: @ 8533B28 - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 0, 3, 3, 10, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A373, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 7, 3, 3, 5, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A40C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GIRL_1, 0, 0, 11, 6, 4, 2, 34, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A442, 0, 0, 0 +Route104_PrettyPetalFlowerShop_EventObjects: @ 8533B28 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 0, 3, 3, 10, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A373, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 7, 3, 3, 5, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A40C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 0, 11, 6, 4, 2, 34, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A442, 0, 0, 0 Route104_PrettyPetalFlowerShop_MapWarps: @ 8533B70 warp_def 2, 8, 0, 1, ROUTE_104 warp_def 3, 8, 0, 1, ROUTE_104 Route104_PrettyPetalFlowerShop_MapEvents:: @ 8533B80 - map_events Route104_PrettyPetalFlowerShop_MapObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0 + map_events Route104_PrettyPetalFlowerShop_EventObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route105.inc b/data/maps/events/Route105.inc index c27cff2621..b7583aabdc 100644 --- a/data/maps/events/Route105.inc +++ b/data/maps/events/Route105.inc @@ -1,12 +1,12 @@ -Route105_MapObjects: @ 85286F0 - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 19, 60, 1, 10, 0, 0, 1, 6, Route105_EventScript_1EE261, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 27, 36, 1, 27, 7, 0, 1, 3, Route105_EventScript_1EE278, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 8, 45, 1, 25, 112, 0, 1, 3, Route105_EventScript_1EE28F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 19, 9, 1, 24, 80, 0, 1, 3, Route105_EventScript_1EE2A6, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 73, 3, 1, 0, 0, 0, 0, Route105_EventScript_290D33, 1003, 0, 0 - object_event 6, MAP_OBJ_GFX_HIKER, 0, 0, 17, 48, 3, 26, 112, 0, 1, 3, Route105_EventScript_1EE24A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_MAN_6, 0, 0, 4, 54, 3, 8, 32, 0, 1, 2, Route105_EventScript_1EE2BD, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_HIKER, 0, 0, 4, 58, 3, 7, 32, 0, 1, 4, Route105_EventScript_1EE2D4, 0, 0, 0 +Route105_EventObjects: @ 85286F0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 19, 60, 1, 10, 0, 0, 1, 6, Route105_EventScript_1EE261, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 27, 36, 1, 27, 7, 0, 1, 3, Route105_EventScript_1EE278, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 8, 45, 1, 25, 112, 0, 1, 3, Route105_EventScript_1EE28F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 19, 9, 1, 24, 80, 0, 1, 3, Route105_EventScript_1EE2A6, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 73, 3, 1, 0, 0, 0, 0, Route105_EventScript_290D33, 1003, 0, 0 + object_event 6, EVENT_OBJ_GFX_HIKER, 0, 0, 17, 48, 3, 26, 112, 0, 1, 3, Route105_EventScript_1EE24A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 0, 4, 54, 3, 8, 32, 0, 1, 2, Route105_EventScript_1EE2BD, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_HIKER, 0, 0, 4, 58, 3, 7, 32, 0, 1, 4, Route105_EventScript_1EE2D4, 0, 0, 0 Route105_MapWarps: @ 85287B0 warp_def 9, 20, 0, 0, ISLAND_CAVE @@ -16,5 +16,5 @@ Route105_MapBGEvents: @ 85287B8 bg_event 5, 56, 3, 7, 0, ITEM_BIG_PEARL, 111, 0 Route105_MapEvents:: @ 85287D0 - map_events Route105_MapObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents + map_events Route105_EventObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents diff --git a/data/maps/events/Route106.inc b/data/maps/events/Route106.inc index ee4beeddde..866a894faa 100644 --- a/data/maps/events/Route106.inc +++ b/data/maps/events/Route106.inc @@ -1,9 +1,9 @@ -Route106_MapObjects: @ 85287E4 - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 18, 5, 1, 27, 4, 0, 1, 3, Route106_EventScript_1EE493, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 29, 10, 1, 1, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 0, 51, 14, 3, 10, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_FISHERMAN, 0, 0, 65, 14, 3, 1, 0, 0, 1, 3, Route106_EventScript_1EE523, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 29, 14, 3, 1, 0, 0, 0, 0, Route106_EventScript_290D40, 1004, 0, 0 +Route106_EventObjects: @ 85287E4 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 18, 5, 1, 27, 4, 0, 1, 3, Route106_EventScript_1EE493, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 29, 10, 1, 1, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 51, 14, 3, 10, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 65, 14, 3, 1, 0, 0, 1, 3, Route106_EventScript_1EE523, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 14, 3, 1, 0, 0, 0, 0, Route106_EventScript_290D40, 1004, 0, 0 Route106_MapWarps: @ 852885C warp_def 48, 16, 0, 0, GRANITE_CAVE_1F @@ -15,5 +15,5 @@ Route106_MapBGEvents: @ 8528864 bg_event 59, 13, 3, 0, 0, Route106_EventScript_1EE48A Route106_MapEvents:: @ 8528894 - map_events Route106_MapObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents + map_events Route106_EventObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents diff --git a/data/maps/events/Route107.inc b/data/maps/events/Route107.inc index 8498a0f426..87d734ed4e 100644 --- a/data/maps/events/Route107.inc +++ b/data/maps/events/Route107.inc @@ -1,12 +1,12 @@ -Route107_MapObjects: @ 85288A8 - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 41, 10, 1, 24, 17, 0, 1, 3, Route107_EventScript_1EE595, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 23, 11, 1, 52, 38, 0, 1, 2, Route107_EventScript_1EE5AC, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 16, 7, 1, 13, 0, 0, 1, 5, Route107_EventScript_1EE60E, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 50, 11, 1, 65, 17, 0, 1, 5, Route107_EventScript_1EE625, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 33, 4, 1, 8, 17, 0, 1, 1, Route107_EventScript_1EE63C, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 32, 4, 1, 8, 17, 0, 1, 1, Route107_EventScript_1EE657, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 50, 5, 1, 64, 17, 0, 1, 5, Route107_EventScript_1EE672, 0, 0, 0 +Route107_EventObjects: @ 85288A8 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 41, 10, 1, 24, 17, 0, 1, 3, Route107_EventScript_1EE595, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 23, 11, 1, 52, 38, 0, 1, 2, Route107_EventScript_1EE5AC, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 16, 7, 1, 13, 0, 0, 1, 5, Route107_EventScript_1EE60E, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 50, 11, 1, 65, 17, 0, 1, 5, Route107_EventScript_1EE625, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 33, 4, 1, 8, 17, 0, 1, 1, Route107_EventScript_1EE63C, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 32, 4, 1, 8, 17, 0, 1, 1, Route107_EventScript_1EE657, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 50, 5, 1, 64, 17, 0, 1, 5, Route107_EventScript_1EE672, 0, 0, 0 Route107_MapEvents:: @ 8528950 - map_events Route107_MapObjects, 0x0, 0x0, 0x0 + map_events Route107_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route108.inc b/data/maps/events/Route108.inc index 340a3bd3f5..61a4b521a6 100644 --- a/data/maps/events/Route108.inc +++ b/data/maps/events/Route108.inc @@ -1,11 +1,11 @@ -Route108_MapObjects: @ 8528964 - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 52, 13, 1, 45, 51, 0, 1, 3, Route108_EventScript_1EE68A, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 35, 12, 1, 13, 17, 0, 1, 3, Route108_EventScript_1EE6B8, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 13, 13, 1, 24, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 8, 7, 1, 20, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 0, 41, 5, 3, 10, 17, 0, 1, 1, Route108_EventScript_1EE6E6, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_SAILOR, 0, 0, 43, 5, 3, 9, 17, 0, 1, 1, Route108_EventScript_1EE6FD, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 42, 4, 3, 1, 17, 0, 0, 0, Route108_EventScript_290D4D, 1139, 0, 0 +Route108_EventObjects: @ 8528964 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 52, 13, 1, 45, 51, 0, 1, 3, Route108_EventScript_1EE68A, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 35, 12, 1, 13, 17, 0, 1, 3, Route108_EventScript_1EE6B8, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 13, 13, 1, 24, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 8, 7, 1, 20, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 41, 5, 3, 10, 17, 0, 1, 1, Route108_EventScript_1EE6E6, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 0, 43, 5, 3, 9, 17, 0, 1, 1, Route108_EventScript_1EE6FD, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 42, 4, 3, 1, 17, 0, 0, 0, Route108_EventScript_290D4D, 1139, 0, 0 Route108_MapWarps: @ 8528A0C warp_def 29, 6, 3, 0, ABANDONED_SHIP_DECK @@ -14,5 +14,5 @@ Route108_MapBGEvents: @ 8528A14 bg_event 38, 14, 3, 7, 0, ITEM_RARE_CANDY, 86, 0 Route108_MapEvents:: @ 8528A20 - map_events Route108_MapObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents + map_events Route108_EventObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents diff --git a/data/maps/events/Route109.inc b/data/maps/events/Route109.inc index aab8c40c00..d1e85b36c7 100644 --- a/data/maps/events/Route109.inc +++ b/data/maps/events/Route109.inc @@ -1,28 +1,28 @@ -Route109_MapObjects: @ 8528A34 - object_event 1, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 21, 26, 1, 7, 0, 0, 0, 0, 0x0, 744, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 21, 24, 3, 7, 0, 0, 0, 0, Route109_EventScript_1EE910, 741, 0, 0 - object_event 3, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 12, 36, 3, 10, 0, 0, 1, 5, Route109_EventScript_1EEA3D, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 25, 39, 1, 15, 0, 0, 1, 5, Route109_EventScript_1EEA54, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_SAILOR, 0, 0, 15, 17, 4, 8, 0, 0, 1, 1, Route109_EventScript_1EEA6B, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_SAILOR, 0, 0, 24, 13, 3, 9, 0, 0, 1, 6, Route109_EventScript_1EEA82, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_TUBER_M, 0, 0, 19, 10, 3, 8, 0, 0, 1, 3, Route109_EventScript_1EEA99, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_TUBER_F, 0, 0, 22, 7, 3, 80, 0, 0, 1, 4, Route109_EventScript_1EEAFB, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 11, 6, 3, 8, 0, 0, 0, 0, Route109_EventScript_1EE995, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 27, 46, 3, 1, 0, 0, 0, 0, Route109_EventScript_290D5A, 1005, 0, 0 - object_event 11, MAP_OBJ_GFX_TUBER_F, 0, 0, 29, 32, 3, 13, 0, 0, 1, 3, Route109_EventScript_1EEB74, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_TUBER_F, 0, 0, 28, 31, 3, 17, 0, 0, 1, 3, Route109_EventScript_1EEB5D, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 0, 21, 56, 0, 9, 0, 0, 1, 3, Route109_EventScript_1EEB8B, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_TUBER_M, 0, 0, 24, 18, 3, 10, 17, 0, 0, 0, Route109_EventScript_1EE99E, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_TUBER_F, 0, 0, 25, 18, 3, 9, 17, 0, 0, 0, Route109_EventScript_1EE9B5, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_WOMAN_2, 0, 0, 30, 32, 3, 8, 17, 0, 0, 0, Route109_EventScript_1EEA06, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_WOMAN_5, 0, 0, 8, 41, 3, 8, 17, 0, 1, 1, Route109_EventScript_1EEBBD, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_MAN_5, 0, 0, 9, 41, 3, 8, 17, 0, 1, 1, Route109_EventScript_1EEBA2, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 33, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_1EEA0F, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 32, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_1EEA18, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_TUBER_F, 0, 0, 17, 13, 3, 80, 17, 0, 1, 6, Route109_EventScript_1EEBEF, 0, 0, 0 - object_event 22, MAP_OBJ_GFX_TUBER_M, 0, 0, 27, 7, 3, 79, 17, 0, 1, 4, Route109_EventScript_1EEBD8, 0, 0, 0 - object_event 23, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 25, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_290D67, 1140, 0, 0 - object_event 24, MAP_OBJ_GFX_MAN_6, 0, 0, 17, 56, 3, 80, 17, 0, 1, 3, Route109_EventScript_1EEC06, 0, 0, 0 +Route109_EventObjects: @ 8528A34 + object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 21, 26, 1, 7, 0, 0, 0, 0, 0x0, 744, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 21, 24, 3, 7, 0, 0, 0, 0, Route109_EventScript_1EE910, 741, 0, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 12, 36, 3, 10, 0, 0, 1, 5, Route109_EventScript_1EEA3D, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 25, 39, 1, 15, 0, 0, 1, 5, Route109_EventScript_1EEA54, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 0, 15, 17, 4, 8, 0, 0, 1, 1, Route109_EventScript_1EEA6B, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 0, 24, 13, 3, 9, 0, 0, 1, 6, Route109_EventScript_1EEA82, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 0, 19, 10, 3, 8, 0, 0, 1, 3, Route109_EventScript_1EEA99, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 0, 22, 7, 3, 80, 0, 0, 1, 4, Route109_EventScript_1EEAFB, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 11, 6, 3, 8, 0, 0, 0, 0, Route109_EventScript_1EE995, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 27, 46, 3, 1, 0, 0, 0, 0, Route109_EventScript_290D5A, 1005, 0, 0 + object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 0, 29, 32, 3, 13, 0, 0, 1, 3, Route109_EventScript_1EEB74, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 0, 28, 31, 3, 17, 0, 0, 1, 3, Route109_EventScript_1EEB5D, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 21, 56, 0, 9, 0, 0, 1, 3, Route109_EventScript_1EEB8B, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_TUBER_M, 0, 0, 24, 18, 3, 10, 17, 0, 0, 0, Route109_EventScript_1EE99E, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_TUBER_F, 0, 0, 25, 18, 3, 9, 17, 0, 0, 0, Route109_EventScript_1EE9B5, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 30, 32, 3, 8, 17, 0, 0, 0, Route109_EventScript_1EEA06, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 8, 41, 3, 8, 17, 0, 1, 1, Route109_EventScript_1EEBBD, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 0, 9, 41, 3, 8, 17, 0, 1, 1, Route109_EventScript_1EEBA2, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 33, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_1EEA0F, 0, 0, 0 + object_event 20, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 32, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_1EEA18, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_TUBER_F, 0, 0, 17, 13, 3, 80, 17, 0, 1, 6, Route109_EventScript_1EEBEF, 0, 0, 0 + object_event 22, EVENT_OBJ_GFX_TUBER_M, 0, 0, 27, 7, 3, 79, 17, 0, 1, 4, Route109_EventScript_1EEBD8, 0, 0, 0 + object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 25, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_290D67, 1140, 0, 0 + object_event 24, EVENT_OBJ_GFX_MAN_6, 0, 0, 17, 56, 3, 80, 17, 0, 1, 3, Route109_EventScript_1EEC06, 0, 0, 0 Route109_MapWarps: @ 8528C74 warp_def 12, 5, 0, 0, ROUTE_109_SEASHORE_HOUSE @@ -38,5 +38,5 @@ Route109_MapBGEvents: @ 8528C7C bg_event 8, 42, 3, 7, 0, ITEM_HEART_SCALE, 91, 0 Route109_MapEvents:: @ 8528CDC - map_events Route109_MapObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents + map_events Route109_EventObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents diff --git a/data/maps/events/Route109_SeashoreHouse.inc b/data/maps/events/Route109_SeashoreHouse.inc index 1e2332451f..7ded7ed230 100644 --- a/data/maps/events/Route109_SeashoreHouse.inc +++ b/data/maps/events/Route109_SeashoreHouse.inc @@ -1,13 +1,13 @@ -Route109_SeashoreHouse_MapObjects: @ 853DDE8 - object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 6, 2, 3, 8, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_2693FE, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 2, 3, 3, 8, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694E2, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TUBER_M, 0, 0, 14, 9, 3, 9, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_269518, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 0, 10, 5, 3, 14, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694FD, 0, 0, 0 +Route109_SeashoreHouse_EventObjects: @ 853DDE8 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 2, 3, 8, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_2693FE, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 2, 3, 3, 8, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694E2, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 0, 14, 9, 3, 9, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_269518, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 0, 10, 5, 3, 14, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694FD, 0, 0, 0 Route109_SeashoreHouse_MapWarps: @ 853DE48 warp_def 6, 9, 0, 0, ROUTE_109 warp_def 7, 9, 0, 0, ROUTE_109 Route109_SeashoreHouse_MapEvents:: @ 853DE58 - map_events Route109_SeashoreHouse_MapObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0 + map_events Route109_SeashoreHouse_EventObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc index 2b8e1571dd..9dd5649fb8 100644 --- a/data/maps/events/Route110.inc +++ b/data/maps/events/Route110.inc @@ -1,40 +1,40 @@ -Route110_MapObjects: @ 8528CF0 - object_event 1, MAP_OBJ_GFX_CAMPER, 0, 0, 17, 90, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF338, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 29, 79, 4, 8, 0, 0, 0, 0, Route110_EventScript_1EF32F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 14, 69, 3, 3, 16, 0, 0, 0, Route110_EventScript_1EF326, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 9, 57, 4, 2, 17, 0, 0, 0, Route110_EventScript_1EF314, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 10, 11, 3, 2, 17, 0, 0, 0, Route110_EventScript_1EF31D, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 27, 24, 4, 2, 49, 0, 0, 0, Route110_EventScript_1EF30B, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BOY_3, 0, 0, 15, 7, 3, 2, 17, 0, 0, 0, Route110_EventScript_1EF302, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 16, 73, 4, 49, 226, 0, 1, 3, Route110_EventScript_1EF529, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 19, 31, 4, 51, 26, 0, 1, 3, Route110_EventScript_1EF4B0, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 30, 31, 4, 9, 17, 0, 1, 4, Route110_EventScript_1EF540, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 16, 55, 4, 45, 68, 0, 1, 3, Route110_EventScript_1EF4C7, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 3, 39, 3, 10, 0, 0, 1, 6, Route110_EventScript_1EF3F2, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_LASS, 0, 0, 33, 15, 3, 9, 0, 0, 1, 1, Route110_EventScript_1EF409, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_MANIAC, 0, 0, 34, 40, 3, 67, 0, 0, 1, 4, Route110_EventScript_1EF420, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 0, 10, 19, 3, 8, 0, 0, 1, 1, Route110_EventScript_1EF482, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 5, 11, 3, 12, 0, 0, 0, 16, BerryTreeScript, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 6, 11, 3, 12, 0, 0, 0, 17, BerryTreeScript, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 7, 11, 3, 12, 0, 0, 0, 18, BerryTreeScript, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 30, 69, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D81, 1007, 0, 0 - object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 26, 47, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D74, 1006, 0, 0 - object_event 21, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 27, 92, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF3B7, 0, 0, 0 - object_event 22, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 7, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2AA, 900, 0, 0 - object_event 23, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2C0, 900, 0, 0 - object_event 24, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 9, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2D6, 900, 0, 0 - object_event 25, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2EC, 900, 0, 0 - object_event 26, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 82, 3, 8, 0, 0, 0, 0, 0x0, 900, 0, 0 - object_event 27, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 21, 78, 4, 51, 23, 0, 1, 2, Route110_EventScript_1EF499, 0, 0, 0 - object_event 28, MAP_OBJ_GFX_HIPSTER, 0, 0, 34, 54, 3, 14, 0, 0, 0, 0, 0x0, 919, 0, 0 - object_event 29, MAP_OBJ_GFX_GIDDY, 0, 0, 34, 54, 3, 8, 0, 0, 0, 0, 0x0, 922, 0, 0 - object_event 30, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 33, 69, 3, 14, 0, 0, 1, 3, Route110_EventScript_1EF604, 0, 0, 0 - object_event 31, MAP_OBJ_GFX_WOMAN_2, 0, 0, 10, 76, 3, 9, 0, 0, 1, 2, Route110_EventScript_1EF5A2, 0, 0, 0 - object_event 32, MAP_OBJ_GFX_MAN_3, 0, 0, 7, 76, 3, 10, 17, 0, 1, 2, Route110_EventScript_1EF61C, 0, 0, 0 - object_event 33, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 10, 39, 3, 9, 17, 0, 1, 6, Route110_EventScript_1EF64A, 0, 0, 0 - object_event 34, MAP_OBJ_GFX_MAN_6, 0, 0, 36, 40, 3, 66, 17, 0, 1, 3, Route110_EventScript_1EF633, 0, 0, 0 - object_event 35, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 38, 3, 1, 17, 0, 0, 0, Route110_EventScript_290D8E, 1141, 0, 0 - object_event 36, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 9, 79, 3, 1, 17, 0, 0, 0, 0x0, 837, 0, 0 +Route110_EventObjects: @ 8528CF0 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 0, 17, 90, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF338, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 29, 79, 4, 8, 0, 0, 0, 0, Route110_EventScript_1EF32F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 14, 69, 3, 3, 16, 0, 0, 0, Route110_EventScript_1EF326, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 9, 57, 4, 2, 17, 0, 0, 0, Route110_EventScript_1EF314, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 10, 11, 3, 2, 17, 0, 0, 0, Route110_EventScript_1EF31D, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 27, 24, 4, 2, 49, 0, 0, 0, Route110_EventScript_1EF30B, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_BOY_3, 0, 0, 15, 7, 3, 2, 17, 0, 0, 0, Route110_EventScript_1EF302, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 16, 73, 4, 49, 226, 0, 1, 3, Route110_EventScript_1EF529, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 19, 31, 4, 51, 26, 0, 1, 3, Route110_EventScript_1EF4B0, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 30, 31, 4, 9, 17, 0, 1, 4, Route110_EventScript_1EF540, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 16, 55, 4, 45, 68, 0, 1, 3, Route110_EventScript_1EF4C7, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 3, 39, 3, 10, 0, 0, 1, 6, Route110_EventScript_1EF3F2, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_LASS, 0, 0, 33, 15, 3, 9, 0, 0, 1, 1, Route110_EventScript_1EF409, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_MANIAC, 0, 0, 34, 40, 3, 67, 0, 0, 1, 4, Route110_EventScript_1EF420, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 10, 19, 3, 8, 0, 0, 1, 1, Route110_EventScript_1EF482, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 5, 11, 3, 12, 0, 0, 0, 16, BerryTreeScript, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 6, 11, 3, 12, 0, 0, 0, 17, BerryTreeScript, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 7, 11, 3, 12, 0, 0, 0, 18, BerryTreeScript, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 30, 69, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D81, 1007, 0, 0 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 26, 47, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D74, 1006, 0, 0 + object_event 21, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 27, 92, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF3B7, 0, 0, 0 + object_event 22, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 7, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2AA, 900, 0, 0 + object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2C0, 900, 0, 0 + object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 9, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2D6, 900, 0, 0 + object_event 25, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2EC, 900, 0, 0 + object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 82, 3, 8, 0, 0, 0, 0, 0x0, 900, 0, 0 + object_event 27, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 21, 78, 4, 51, 23, 0, 1, 2, Route110_EventScript_1EF499, 0, 0, 0 + object_event 28, EVENT_OBJ_GFX_HIPSTER, 0, 0, 34, 54, 3, 14, 0, 0, 0, 0, 0x0, 919, 0, 0 + object_event 29, EVENT_OBJ_GFX_GIDDY, 0, 0, 34, 54, 3, 8, 0, 0, 0, 0, 0x0, 922, 0, 0 + object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 33, 69, 3, 14, 0, 0, 1, 3, Route110_EventScript_1EF604, 0, 0, 0 + object_event 31, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 10, 76, 3, 9, 0, 0, 1, 2, Route110_EventScript_1EF5A2, 0, 0, 0 + object_event 32, EVENT_OBJ_GFX_MAN_3, 0, 0, 7, 76, 3, 10, 17, 0, 1, 2, Route110_EventScript_1EF61C, 0, 0, 0 + object_event 33, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 10, 39, 3, 9, 17, 0, 1, 6, Route110_EventScript_1EF64A, 0, 0, 0 + object_event 34, EVENT_OBJ_GFX_MAN_6, 0, 0, 36, 40, 3, 66, 17, 0, 1, 3, Route110_EventScript_1EF633, 0, 0, 0 + object_event 35, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 38, 3, 1, 17, 0, 0, 0, Route110_EventScript_290D8E, 1141, 0, 0 + object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 9, 79, 3, 1, 17, 0, 0, 0, 0x0, 837, 0, 0 Route110_MapWarps: @ 8529050 warp_def 35, 24, 3, 0, NEW_MAUVILLE_ENTRANCE @@ -75,5 +75,5 @@ Route110_MapBGEvents: @ 8529110 bg_event 13, 16, 0, 0, 0, Route110_EventScript_1EF34A Route110_MapEvents:: @ 85291DC - map_events Route110_MapObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents + map_events Route110_EventObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents diff --git a/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc b/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc index 37d3065c52..23f896e4be 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc +++ b/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc @@ -1,5 +1,5 @@ -Route110_SeasideCyclingRoadEntrance1_MapObjects: @ 853E9A0 - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78, 0, 0, 0 +Route110_SeasideCyclingRoadEntrance1_EventObjects: @ 853E9A0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78, 0, 0, 0 Route110_SeasideCyclingRoadEntrance1_MapWarps: @ 853E9B8 warp_def 1, 5, 0, 4, ROUTE_110 @@ -12,5 +12,5 @@ Route110_SeasideCyclingRoadEntrance1_MapCoordEvents: @ 853E9D8 coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EAB6 Route110_SeasideCyclingRoadEntrance1_MapEvents:: @ 853E9F8 - map_events Route110_SeasideCyclingRoadEntrance1_MapObjects, Route110_SeasideCyclingRoadEntrance1_MapWarps, Route110_SeasideCyclingRoadEntrance1_MapCoordEvents, 0x0 + map_events Route110_SeasideCyclingRoadEntrance1_EventObjects, Route110_SeasideCyclingRoadEntrance1_MapWarps, Route110_SeasideCyclingRoadEntrance1_MapCoordEvents, 0x0 diff --git a/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc b/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc index 38e02b9cee..f988f97519 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc +++ b/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc @@ -1,5 +1,5 @@ -Route110_SeasideCyclingRoadEntrance2_MapObjects: @ 853EA0C - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4, 0, 0, 0 +Route110_SeasideCyclingRoadEntrance2_EventObjects: @ 853EA0C + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4, 0, 0, 0 Route110_SeasideCyclingRoadEntrance2_MapWarps: @ 853EA24 warp_def 1, 5, 0, 2, ROUTE_110 @@ -12,5 +12,5 @@ Route110_SeasideCyclingRoadEntrance2_MapCoordEvents: @ 853EA44 coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EC13 Route110_SeasideCyclingRoadEntrance2_MapEvents:: @ 853EA64 - map_events Route110_SeasideCyclingRoadEntrance2_MapObjects, Route110_SeasideCyclingRoadEntrance2_MapWarps, Route110_SeasideCyclingRoadEntrance2_MapCoordEvents, 0x0 + map_events Route110_SeasideCyclingRoadEntrance2_EventObjects, Route110_SeasideCyclingRoadEntrance2_MapWarps, Route110_SeasideCyclingRoadEntrance2_MapCoordEvents, 0x0 diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/events/Route110_TrickHouseEnd.inc index 34ebbc229c..62640ab29a 100644 --- a/data/maps/events/Route110_TrickHouseEnd.inc +++ b/data/maps/events/Route110_TrickHouseEnd.inc @@ -1,5 +1,5 @@ -Route110_TrickHouseEnd_MapObjects: @ 853DEFC - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, 899, 0, 0 +Route110_TrickHouseEnd_EventObjects: @ 853DEFC + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, 899, 0, 0 Route110_TrickHouseEnd_MapWarps: @ 853DF14 warp_def 10, 1, 3, 2, ROUTE_110_TRICK_HOUSE_PUZZLE_1 @@ -12,5 +12,5 @@ Route110_TrickHouseEnd_MapBGEvents: @ 853DF34 bg_event 4, 5, 3, 7, 0, ITEM_NUGGET, 1, 0 Route110_TrickHouseEnd_MapEvents:: @ 853DF40 - map_events Route110_TrickHouseEnd_MapObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents + map_events Route110_TrickHouseEnd_EventObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/events/Route110_TrickHouseEntrance.inc index a87df306b6..c6a31119f4 100644 --- a/data/maps/events/Route110_TrickHouseEntrance.inc +++ b/data/maps/events/Route110_TrickHouseEntrance.inc @@ -1,5 +1,5 @@ -Route110_TrickHouseEntrance_MapObjects: @ 853DE6C - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 6, 2, 3, 9, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, 872, 0, 0 +Route110_TrickHouseEntrance_EventObjects: @ 853DE6C + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 6, 2, 3, 9, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, 872, 0, 0 Route110_TrickHouseEntrance_MapWarps: @ 853DE84 warp_def 5, 7, 3, 1, ROUTE_110 @@ -16,5 +16,5 @@ Route110_TrickHouseEntrance_MapBGEvents: @ 853DEDC bg_event 5, 1, 0, 1, 0, Route110_TrickHouseEntrance_EventScript_26A0D3 Route110_TrickHouseEntrance_MapEvents:: @ 853DEE8 - map_events Route110_TrickHouseEntrance_MapObjects, Route110_TrickHouseEntrance_MapWarps, Route110_TrickHouseEntrance_MapCoordEvents, Route110_TrickHouseEntrance_MapBGEvents + map_events Route110_TrickHouseEntrance_EventObjects, Route110_TrickHouseEntrance_MapWarps, Route110_TrickHouseEntrance_MapCoordEvents, Route110_TrickHouseEntrance_MapBGEvents diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/events/Route110_TrickHousePuzzle1.inc index 002ad0532a..40da83bb84 100644 --- a/data/maps/events/Route110_TrickHousePuzzle1.inc +++ b/data/maps/events/Route110_TrickHousePuzzle1.inc @@ -1,19 +1,19 @@ -Route110_TrickHousePuzzle1_MapObjects: @ 853DF88 - object_event 1, MAP_OBJ_GFX_LASS, 0, 0, 14, 20, 3, 9, 0, 0, 1, 6, Route110_TrickHousePuzzle1_EventScript_26B948, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 14, 8, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B95F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 2, 15, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B976, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 19, 0, 0 - object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 13, 18, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 18, 0, 0 - object_event 6, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 14, 14, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 20, 0, 0 - object_event 7, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 23, 0, 0 - object_event 8, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 22, 0, 0 - object_event 9, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 21, 0, 0 - object_event 10, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 2, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 25, 0, 0 - object_event 11, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 13, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 24, 0, 0 - object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 27, 0, 0 - object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 9, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_29140E, 1060, 0, 0 - object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 28, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 2, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 30, 0, 0 +Route110_TrickHousePuzzle1_EventObjects: @ 853DF88 + object_event 1, EVENT_OBJ_GFX_LASS, 0, 0, 14, 20, 3, 9, 0, 0, 1, 6, Route110_TrickHousePuzzle1_EventScript_26B948, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 14, 8, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B95F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 2, 15, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B976, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 19, 0, 0 + object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 13, 18, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 18, 0, 0 + object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 14, 14, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 20, 0, 0 + object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 23, 0, 0 + object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 22, 0, 0 + object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 21, 0, 0 + object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 2, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 25, 0, 0 + object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 13, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 24, 0, 0 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 27, 0, 0 + object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 9, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_29140E, 1060, 0, 0 + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 28, 0, 0 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 2, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 30, 0, 0 Route110_TrickHousePuzzle1_MapWarps: @ 853E0F0 warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE @@ -24,5 +24,5 @@ Route110_TrickHousePuzzle1_MapBGEvents: @ 853E108 bg_event 3, 16, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_26B92B Route110_TrickHousePuzzle1_MapEvents:: @ 853E114 - map_events Route110_TrickHousePuzzle1_MapObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents + map_events Route110_TrickHousePuzzle1_EventObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/events/Route110_TrickHousePuzzle2.inc index 92f2bad01e..ed03f5d792 100644 --- a/data/maps/events/Route110_TrickHousePuzzle2.inc +++ b/data/maps/events/Route110_TrickHousePuzzle2.inc @@ -1,9 +1,9 @@ -Route110_TrickHousePuzzle2_MapObjects: @ 853E128 - object_event 1, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 13, 10, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_26BC75, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 10, 17, 3, 8, 0, 0, 1, 4, Route110_TrickHousePuzzle2_EventScript_26BC8C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 11, 9, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_26BCA3, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 17, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, 1062, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, 1061, 0, 0 +Route110_TrickHousePuzzle2_EventObjects: @ 853E128 + object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 13, 10, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_26BC75, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 10, 17, 3, 8, 0, 0, 1, 4, Route110_TrickHousePuzzle2_EventScript_26BC8C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 11, 9, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_26BCA3, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 17, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, 1062, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, 1061, 0, 0 Route110_TrickHousePuzzle2_MapWarps: @ 853E1A0 warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE @@ -20,5 +20,5 @@ Route110_TrickHousePuzzle2_MapBGEvents: @ 853E1F8 bg_event 14, 14, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BBC0 Route110_TrickHousePuzzle2_MapEvents:: @ 853E204 - map_events Route110_TrickHousePuzzle2_MapObjects, Route110_TrickHousePuzzle2_MapWarps, Route110_TrickHousePuzzle2_MapCoordEvents, Route110_TrickHousePuzzle2_MapBGEvents + map_events Route110_TrickHousePuzzle2_EventObjects, Route110_TrickHousePuzzle2_MapWarps, Route110_TrickHousePuzzle2_MapCoordEvents, Route110_TrickHousePuzzle2_MapBGEvents diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/events/Route110_TrickHousePuzzle3.inc index c3070fafec..0097717fa8 100644 --- a/data/maps/events/Route110_TrickHousePuzzle3.inc +++ b/data/maps/events/Route110_TrickHousePuzzle3.inc @@ -1,11 +1,11 @@ -Route110_TrickHousePuzzle3_MapObjects: @ 853E218 - object_event 1, MAP_OBJ_GFX_CAMPER, 0, 0, 7, 19, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle3_EventScript_26C5C4, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_PICNICKER, 0, 0, 4, 4, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5DB, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_HIKER, 0, 0, 10, 10, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5F2, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291442, 1064, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291435, 1063, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 1, 20, 3, 1, 17, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 21, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 2, 21, 3, 1, 17, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 22, 0, 0 +Route110_TrickHousePuzzle3_EventObjects: @ 853E218 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 0, 7, 19, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle3_EventScript_26C5C4, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 0, 4, 4, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5DB, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_HIKER, 0, 0, 10, 10, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5F2, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291442, 1064, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291435, 1063, 0, 0 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 1, 20, 3, 1, 17, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 21, 0, 0 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 2, 21, 3, 1, 17, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 22, 0, 0 Route110_TrickHousePuzzle3_MapWarps: @ 853E2C0 warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE @@ -22,5 +22,5 @@ Route110_TrickHousePuzzle3_MapBGEvents: @ 853E318 bg_event 0, 14, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C5A7 Route110_TrickHousePuzzle3_MapEvents:: @ 853E324 - map_events Route110_TrickHousePuzzle3_MapObjects, Route110_TrickHousePuzzle3_MapWarps, Route110_TrickHousePuzzle3_MapCoordEvents, Route110_TrickHousePuzzle3_MapBGEvents + map_events Route110_TrickHousePuzzle3_EventObjects, Route110_TrickHousePuzzle3_MapWarps, Route110_TrickHousePuzzle3_MapCoordEvents, Route110_TrickHousePuzzle3_MapBGEvents diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/events/Route110_TrickHousePuzzle4.inc index 79731353cb..b6e4b2f070 100644 --- a/data/maps/events/Route110_TrickHousePuzzle4.inc +++ b/data/maps/events/Route110_TrickHousePuzzle4.inc @@ -1,18 +1,18 @@ -Route110_TrickHousePuzzle4_MapObjects: @ 853E338 - object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 0, 2, 2, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_26C87E, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 14, 7, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C8AC, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 2, 14, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C895, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_29144F, 1065, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 17, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 18, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 19, 0, 0 - object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 20, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 21, 0, 0 - object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 7, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 22, 0, 0 - object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 9, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 23, 0, 0 - object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 24, 0, 0 - object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 14, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 25, 0, 0 - object_event 14, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 15, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 26, 0, 0 +Route110_TrickHousePuzzle4_EventObjects: @ 853E338 + object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 0, 2, 2, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_26C87E, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 14, 7, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C8AC, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 2, 14, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C895, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_29144F, 1065, 0, 0 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 17, 0, 0 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 18, 0, 0 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 19, 0, 0 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 20, 0, 0 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 21, 0, 0 + object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 7, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 22, 0, 0 + object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 9, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 23, 0, 0 + object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 24, 0, 0 + object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 14, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 25, 0, 0 + object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 15, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 26, 0, 0 Route110_TrickHousePuzzle4_MapWarps: @ 853E488 warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE @@ -23,5 +23,5 @@ Route110_TrickHousePuzzle4_MapBGEvents: @ 853E4A0 bg_event 14, 13, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_26C861 Route110_TrickHousePuzzle4_MapEvents:: @ 853E4AC - map_events Route110_TrickHousePuzzle4_MapObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents + map_events Route110_TrickHousePuzzle4_EventObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents diff --git a/data/maps/events/Route110_TrickHousePuzzle5.inc b/data/maps/events/Route110_TrickHousePuzzle5.inc index 801448b120..7ae53cdad9 100644 --- a/data/maps/events/Route110_TrickHousePuzzle5.inc +++ b/data/maps/events/Route110_TrickHousePuzzle5.inc @@ -1,9 +1,9 @@ -Route110_TrickHousePuzzle5_MapObjects: @ 853E4C0 - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 6, 17, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB32, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 0, 7, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB53, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_1, 0, 0, 14, 10, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB74, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_1, 0, 0, 14, 19, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB95, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_1, 0, 0, 10, 4, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBB6, 0, 0, 0 +Route110_TrickHousePuzzle5_EventObjects: @ 853E4C0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 6, 17, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB32, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 0, 7, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB53, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 0, 14, 10, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB74, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 0, 14, 19, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB95, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 0, 10, 4, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBB6, 0, 0, 0 Route110_TrickHousePuzzle5_MapWarps: @ 853E538 warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE @@ -38,5 +38,5 @@ Route110_TrickHousePuzzle5_MapBGEvents: @ 853E6B0 bg_event 11, 21, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB15 Route110_TrickHousePuzzle5_MapEvents:: @ 853E6BC - map_events Route110_TrickHousePuzzle5_MapObjects, Route110_TrickHousePuzzle5_MapWarps, Route110_TrickHousePuzzle5_MapCoordEvents, Route110_TrickHousePuzzle5_MapBGEvents + map_events Route110_TrickHousePuzzle5_EventObjects, Route110_TrickHousePuzzle5_MapWarps, Route110_TrickHousePuzzle5_MapCoordEvents, Route110_TrickHousePuzzle5_MapBGEvents diff --git a/data/maps/events/Route110_TrickHousePuzzle6.inc b/data/maps/events/Route110_TrickHousePuzzle6.inc index d08169a761..a36e7cd72d 100644 --- a/data/maps/events/Route110_TrickHousePuzzle6.inc +++ b/data/maps/events/Route110_TrickHousePuzzle6.inc @@ -1,8 +1,8 @@ -Route110_TrickHousePuzzle6_MapObjects: @ 853E6D0 - object_event 1, MAP_OBJ_GFX_PICNICKER, 0, 0, 7, 9, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_6, 0, 0, 11, 10, 3, 10, 0, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 4, 5, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 11, 21, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, 1067, 0, 0 +Route110_TrickHousePuzzle6_EventObjects: @ 853E6D0 + object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 0, 7, 9, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 11, 10, 3, 10, 0, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 4, 5, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 11, 21, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, 1067, 0, 0 Route110_TrickHousePuzzle6_MapWarps: @ 853E730 warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE @@ -13,5 +13,5 @@ Route110_TrickHousePuzzle6_MapBGEvents: @ 853E748 bg_event 0, 10, 3, 0, 0, Route110_TrickHousePuzzle6_EventScript_26DDC4 Route110_TrickHousePuzzle6_MapEvents:: @ 853E754 - map_events Route110_TrickHousePuzzle6_MapObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents + map_events Route110_TrickHousePuzzle6_EventObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/events/Route110_TrickHousePuzzle7.inc index 8da2bab858..39ee27853d 100644 --- a/data/maps/events/Route110_TrickHousePuzzle7.inc +++ b/data/maps/events/Route110_TrickHousePuzzle7.inc @@ -1,13 +1,13 @@ -Route110_TrickHousePuzzle7_MapObjects: @ 853E768 - object_event 1, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 9, 20, 0, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E389, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LASS, 0, 0, 10, 2, 0, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3B7, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 8, 17, 0, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3A0, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_291469, 1068, 0, 0 - object_event 5, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 9, 2, 3, 8, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3E5, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_LASS, 0, 0, 8, 13, 3, 7, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3CE, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 9, 12, 3, 9, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3FC, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 17, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 6, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 +Route110_TrickHousePuzzle7_EventObjects: @ 853E768 + object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 9, 20, 0, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E389, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LASS, 0, 0, 10, 2, 0, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3B7, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 8, 17, 0, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3A0, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_291469, 1068, 0, 0 + object_event 5, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 9, 2, 3, 8, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3E5, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_LASS, 0, 0, 8, 13, 3, 7, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3CE, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 9, 12, 3, 9, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3FC, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 17, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 6, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 Route110_TrickHousePuzzle7_MapWarps: @ 853E840 warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE @@ -34,5 +34,5 @@ Route110_TrickHousePuzzle7_MapBGEvents: @ 853E8E8 bg_event 6, 17, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E1D0 Route110_TrickHousePuzzle7_MapEvents:: @ 853E8F4 - map_events Route110_TrickHousePuzzle7_MapObjects, Route110_TrickHousePuzzle7_MapWarps, Route110_TrickHousePuzzle7_MapCoordEvents, Route110_TrickHousePuzzle7_MapBGEvents + map_events Route110_TrickHousePuzzle7_EventObjects, Route110_TrickHousePuzzle7_MapWarps, Route110_TrickHousePuzzle7_MapCoordEvents, Route110_TrickHousePuzzle7_MapBGEvents diff --git a/data/maps/events/Route110_TrickHousePuzzle8.inc b/data/maps/events/Route110_TrickHousePuzzle8.inc index 5d942affa0..2e44e5b74c 100644 --- a/data/maps/events/Route110_TrickHousePuzzle8.inc +++ b/data/maps/events/Route110_TrickHousePuzzle8.inc @@ -1,8 +1,8 @@ -Route110_TrickHousePuzzle8_MapObjects: @ 853E908 - object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 1, 10, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 2, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 8, 17, 3, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, 1069, 0, 0 +Route110_TrickHousePuzzle8_EventObjects: @ 853E908 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 1, 10, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 2, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 8, 17, 3, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, 1069, 0, 0 Route110_TrickHousePuzzle8_MapWarps: @ 853E968 warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE @@ -13,5 +13,5 @@ Route110_TrickHousePuzzle8_MapBGEvents: @ 853E980 bg_event 3, 21, 3, 0, 0, Route110_TrickHousePuzzle8_EventScript_26E802 Route110_TrickHousePuzzle8_MapEvents:: @ 853E98C - map_events Route110_TrickHousePuzzle8_MapObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents + map_events Route110_TrickHousePuzzle8_EventObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc index 9c79e2c52b..bfd09e58e8 100644 --- a/data/maps/events/Route111.inc +++ b/data/maps/events/Route111.inc @@ -1,50 +1,50 @@ -Route111_MapObjects: @ 85291F0 - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 13, 114, 3, 8, 0, 0, 0, 0, Route111_EventScript_1F0FC5, 768, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 769, 0, 0 - object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 13, 113, 0, 8, 1, 0, 0, 0, 0x0, 770, 0, 0 - object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 771, 0, 0 - object_event 5, MAP_OBJ_GFX_PICNICKER, 0, 0, 28, 51, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F121B, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 22, 5, 3, 12, 0, 0, 0, 19, BerryTreeScript, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 23, 5, 3, 12, 0, 0, 0, 20, BerryTreeScript, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_MAN_4, 0, 0, 8, 91, 3, 2, 17, 0, 0, 0, Route111_EventScript_1F1189, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_CAMPER, 0, 0, 29, 37, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1204, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_HIKER, 0, 0, 27, 69, 3, 50, 34, 0, 1, 2, Route111_EventScript_1F1260, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_CAMPER, 0, 0, 21, 47, 3, 9, 0, 0, 1, 4, Route111_EventScript_1F1232, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_PICNICKER, 0, 0, 32, 66, 3, 24, 0, 0, 1, 3, Route111_EventScript_1F1249, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDF6, 796, 0, 0 - object_event 14, MAP_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDD6, 796, 0, 0 - object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 18, 101, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 17, 0, 0 - object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 19, 100, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 18, 0, 0 - object_event 17, MAP_OBJ_GFX_GIRL_1, 0, 0, 23, 8, 3, 5, 1, 0, 0, 0, Route111_EventScript_1F0EB9, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 33, 104, 3, 1, 0, 0, 0, 0, Route111_EventScript_290D9B, 1008, 0, 0 - object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 18, 5, 3, 12, 0, 0, 0, 80, BerryTreeScript, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 19, 5, 3, 12, 0, 0, 0, 81, BerryTreeScript, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CE96, 799, 0, 0 - object_event 22, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CEB6, 799, 0, 0 - object_event 23, MAP_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF16, 903, 0, 0 - object_event 24, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF36, 903, 0, 0 - object_event 25, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 12, 54, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DA8, 1009, 0, 0 - object_event 26, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 114, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DB5, 1010, 0, 0 - object_event 27, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 22, 21, 3, 1, 0, 0, 0, 0, Route111_EventScript_2906BB, 19, 0, 0 - object_event 28, MAP_OBJ_GFX_PICNICKER, 0, 0, 10, 82, 3, 14, 0, 0, 1, 2, Route111_EventScript_1F12D9, 0, 0, 0 - object_event 29, MAP_OBJ_GFX_CAMPER, 0, 0, 11, 71, 3, 22, 0, 0, 1, 3, Route111_EventScript_1F12C2, 0, 0, 0 - object_event 30, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 32, 29, 3, 28, 1, 0, 1, 2, Route111_EventScript_1F12F0, 0, 0, 0 - object_event 31, MAP_OBJ_GFX_WOMAN_7, 0, 0, 11, 11, 3, 7, 4, 0, 1, 4, Route111_EventScript_1F1369, 0, 0, 0 - object_event 32, MAP_OBJ_GFX_MAN_4, 0, 0, 9, 27, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1307, 0, 0, 0 - object_event 33, MAP_OBJ_GFX_BOY_1, 0, 0, 13, 20, 3, 7, 17, 0, 0, 0, Route111_EventScript_2765FF, 960, 0, 0 - object_event 34, MAP_OBJ_GFX_MAN_5, 0, 0, 20, 114, 3, 2, 17, 0, 0, 0, Route111_EventScript_1F1192, 0, 0, 0 - object_event 35, MAP_OBJ_GFX_CAMPER, 0, 0, 26, 132, 3, 9, 17, 0, 1, 5, Route111_EventScript_1F13F9, 0, 0, 0 - object_event 36, MAP_OBJ_GFX_WOMAN_3, 0, 0, 20, 132, 3, 10, 17, 0, 1, 5, Route111_EventScript_1F1410, 0, 0, 0 - object_event 37, MAP_OBJ_GFX_PICNICKER, 0, 0, 19, 121, 3, 7, 17, 0, 1, 2, Route111_EventScript_1F13E2, 0, 0, 0 - object_event 38, MAP_OBJ_GFX_MAN_6, 0, 0, 16, 119, 3, 10, 17, 0, 1, 3, Route111_EventScript_1F13CB, 0, 0, 0 - object_event 39, MAP_OBJ_GFX_HIKER, 0, 0, 29, 77, 3, 14, 17, 0, 1, 7, Route111_EventScript_1F143E, 0, 0, 0 - object_event 40, MAP_OBJ_GFX_PICNICKER, 0, 0, 22, 77, 3, 10, 17, 0, 1, 6, Route111_EventScript_1F1427, 0, 0, 0 - object_event 41, MAP_OBJ_GFX_CAMPER, 0, 0, 37, 77, 3, 9, 17, 0, 1, 7, Route111_EventScript_1F1455, 0, 0, 0 - object_event 42, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 19, 118, 3, 1, 17, 0, 0, 0, Route111_EventScript_290DC2, 1142, 0, 0 - object_event 43, MAP_OBJ_GFX_HIKER, 0, 0, 14, 56, 3, 16, 17, 0, 0, 0, Route111_EventScript_1F119B, 0, 0, 0 - object_event 44, MAP_OBJ_GFX_FOSSIL, 0, 0, 20, 53, 3, 8, 17, 0, 0, 0, 0x0, 876, 0, 0 - object_event 45, MAP_OBJ_GFX_HIPSTER, 0, 0, 19, 53, 3, 8, 17, 0, 0, 0, 0x0, 875, 0, 0 - object_event 46, MAP_OBJ_GFX_FAT_MAN, 0, 0, 19, 101, 3, 7, 17, 0, 0, 0, Route111_EventScript_1F11E4, 843, 0, 0 +Route111_EventObjects: @ 85291F0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 13, 114, 3, 8, 0, 0, 0, 0, Route111_EventScript_1F0FC5, 768, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 769, 0, 0 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 13, 113, 0, 8, 1, 0, 0, 0, 0x0, 770, 0, 0 + object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 771, 0, 0 + object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 0, 28, 51, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F121B, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 22, 5, 3, 12, 0, 0, 0, 19, BerryTreeScript, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 23, 5, 3, 12, 0, 0, 0, 20, BerryTreeScript, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 0, 8, 91, 3, 2, 17, 0, 0, 0, Route111_EventScript_1F1189, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_CAMPER, 0, 0, 29, 37, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1204, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_HIKER, 0, 0, 27, 69, 3, 50, 34, 0, 1, 2, Route111_EventScript_1F1260, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 0, 21, 47, 3, 9, 0, 0, 1, 4, Route111_EventScript_1F1232, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_PICNICKER, 0, 0, 32, 66, 3, 24, 0, 0, 1, 3, Route111_EventScript_1F1249, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDF6, 796, 0, 0 + object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDD6, 796, 0, 0 + object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 18, 101, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 17, 0, 0 + object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 19, 100, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 18, 0, 0 + object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 0, 23, 8, 3, 5, 1, 0, 0, 0, Route111_EventScript_1F0EB9, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 33, 104, 3, 1, 0, 0, 0, 0, Route111_EventScript_290D9B, 1008, 0, 0 + object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 18, 5, 3, 12, 0, 0, 0, 80, BerryTreeScript, 0, 0, 0 + object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 19, 5, 3, 12, 0, 0, 0, 81, BerryTreeScript, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CE96, 799, 0, 0 + object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CEB6, 799, 0, 0 + object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF16, 903, 0, 0 + object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF36, 903, 0, 0 + object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 54, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DA8, 1009, 0, 0 + object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 114, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DB5, 1010, 0, 0 + object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 22, 21, 3, 1, 0, 0, 0, 0, Route111_EventScript_2906BB, 19, 0, 0 + object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 0, 10, 82, 3, 14, 0, 0, 1, 2, Route111_EventScript_1F12D9, 0, 0, 0 + object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 0, 11, 71, 3, 22, 0, 0, 1, 3, Route111_EventScript_1F12C2, 0, 0, 0 + object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 32, 29, 3, 28, 1, 0, 1, 2, Route111_EventScript_1F12F0, 0, 0, 0 + object_event 31, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 11, 11, 3, 7, 4, 0, 1, 4, Route111_EventScript_1F1369, 0, 0, 0 + object_event 32, EVENT_OBJ_GFX_MAN_4, 0, 0, 9, 27, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1307, 0, 0, 0 + object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 0, 13, 20, 3, 7, 17, 0, 0, 0, Route111_EventScript_2765FF, 960, 0, 0 + object_event 34, EVENT_OBJ_GFX_MAN_5, 0, 0, 20, 114, 3, 2, 17, 0, 0, 0, Route111_EventScript_1F1192, 0, 0, 0 + object_event 35, EVENT_OBJ_GFX_CAMPER, 0, 0, 26, 132, 3, 9, 17, 0, 1, 5, Route111_EventScript_1F13F9, 0, 0, 0 + object_event 36, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 20, 132, 3, 10, 17, 0, 1, 5, Route111_EventScript_1F1410, 0, 0, 0 + object_event 37, EVENT_OBJ_GFX_PICNICKER, 0, 0, 19, 121, 3, 7, 17, 0, 1, 2, Route111_EventScript_1F13E2, 0, 0, 0 + object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 0, 16, 119, 3, 10, 17, 0, 1, 3, Route111_EventScript_1F13CB, 0, 0, 0 + object_event 39, EVENT_OBJ_GFX_HIKER, 0, 0, 29, 77, 3, 14, 17, 0, 1, 7, Route111_EventScript_1F143E, 0, 0, 0 + object_event 40, EVENT_OBJ_GFX_PICNICKER, 0, 0, 22, 77, 3, 10, 17, 0, 1, 6, Route111_EventScript_1F1427, 0, 0, 0 + object_event 41, EVENT_OBJ_GFX_CAMPER, 0, 0, 37, 77, 3, 9, 17, 0, 1, 7, Route111_EventScript_1F1455, 0, 0, 0 + object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 19, 118, 3, 1, 17, 0, 0, 0, Route111_EventScript_290DC2, 1142, 0, 0 + object_event 43, EVENT_OBJ_GFX_HIKER, 0, 0, 14, 56, 3, 16, 17, 0, 0, 0, Route111_EventScript_1F119B, 0, 0, 0 + object_event 44, EVENT_OBJ_GFX_FOSSIL, 0, 0, 20, 53, 3, 8, 17, 0, 0, 0, 0x0, 876, 0, 0 + object_event 45, EVENT_OBJ_GFX_HIPSTER, 0, 0, 19, 53, 3, 8, 17, 0, 0, 0, 0x0, 875, 0, 0 + object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 19, 101, 3, 7, 17, 0, 0, 0, Route111_EventScript_1F11E4, 843, 0, 0 Route111_MapWarps: @ 8529640 warp_def 13, 113, 0, 0, ROUTE_111_WINSTRATE_FAMILYS_HOUSE @@ -110,5 +110,5 @@ Route111_MapBGEvents: @ 8529888 bg_event 24, 116, 0, 0, 0, Route111_EventScript_1F146C Route111_MapEvents:: @ 8529960 - map_events Route111_MapObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents + map_events Route111_EventObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents diff --git a/data/maps/events/Route111_OldLadysRestStop.inc b/data/maps/events/Route111_OldLadysRestStop.inc index 05510b62d4..3cb500bdc1 100644 --- a/data/maps/events/Route111_OldLadysRestStop.inc +++ b/data/maps/events/Route111_OldLadysRestStop.inc @@ -1,10 +1,10 @@ -Route111_OldLadysRestStop_MapObjects: @ 8533C18 - object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0, 0, 0 +Route111_OldLadysRestStop_EventObjects: @ 8533C18 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0, 0, 0 Route111_OldLadysRestStop_MapWarps: @ 8533C30 warp_def 3, 7, 0, 2, ROUTE_111 warp_def 4, 7, 0, 2, ROUTE_111 Route111_OldLadysRestStop_MapEvents:: @ 8533C40 - map_events Route111_OldLadysRestStop_MapObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0 + map_events Route111_OldLadysRestStop_EventObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route111_WinstrateFamilysHouse.inc b/data/maps/events/Route111_WinstrateFamilysHouse.inc index 402b6e180f..bd7567d814 100644 --- a/data/maps/events/Route111_WinstrateFamilysHouse.inc +++ b/data/maps/events/Route111_WinstrateFamilysHouse.inc @@ -1,13 +1,13 @@ -Route111_WinstrateFamilysHouse_MapObjects: @ 8533B94 - object_event 1, MAP_OBJ_GFX_LASS, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4E8, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A48D, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 7, 4, 3, 9, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0, 0, 0 +Route111_WinstrateFamilysHouse_EventObjects: @ 8533B94 + object_event 1, EVENT_OBJ_GFX_LASS, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4E8, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A48D, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 7, 4, 3, 9, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0, 0, 0 Route111_WinstrateFamilysHouse_MapWarps: @ 8533BF4 warp_def 3, 7, 0, 0, ROUTE_111 warp_def 4, 7, 0, 0, ROUTE_111 Route111_WinstrateFamilysHouse_MapEvents:: @ 8533C04 - map_events Route111_WinstrateFamilysHouse_MapObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0 + map_events Route111_WinstrateFamilysHouse_EventObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route112.inc b/data/maps/events/Route112.inc index 56bd169356..e2b26846e0 100644 --- a/data/maps/events/Route112.inc +++ b/data/maps/events/Route112.inc @@ -1,18 +1,18 @@ -Route112_MapObjects: @ 8529974 - object_event 1, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 26, 30, 3, 7, 17, 0, 0, 0, Route112_EventScript_1F1DB7, 819, 0, 0 - object_event 2, MAP_OBJ_GFX_HIKER, 0, 0, 24, 34, 3, 14, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 29, 49, 3, 8, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 0, 22, 46, 3, 23, 0, 0, 1, 3, Route112_EventScript_1F1EFA, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_HIKER, 0, 0, 15, 40, 3, 16, 0, 0, 1, 3, Route112_EventScript_1F1E81, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 27, 30, 3, 7, 0, 0, 0, 0, Route112_EventScript_1F1DB7, 819, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 27, 6, 0, 12, 0, 0, 0, 24, BerryTreeScript, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 28, 6, 0, 12, 0, 0, 0, 23, BerryTreeScript, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 29, 6, 0, 12, 0, 0, 0, 22, BerryTreeScript, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 30, 6, 3, 12, 0, 0, 0, 21, BerryTreeScript, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_HIKER, 0, 0, 8, 50, 3, 26, 48, 0, 0, 0, Route112_EventScript_1F1E61, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 43, 3, 1, 0, 0, 0, 0, Route112_EventScript_290DCF, 1011, 0, 0 - object_event 13, MAP_OBJ_GFX_MAN_6, 0, 0, 31, 7, 3, 18, 17, 0, 1, 3, Route112_EventScript_1F1F11, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_WOMAN_3, 0, 0, 31, 11, 3, 15, 17, 0, 1, 3, Route112_EventScript_1F1F28, 0, 0, 0 +Route112_EventObjects: @ 8529974 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 26, 30, 3, 7, 17, 0, 0, 0, Route112_EventScript_1F1DB7, 819, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 24, 34, 3, 14, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 29, 49, 3, 8, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 0, 22, 46, 3, 23, 0, 0, 1, 3, Route112_EventScript_1F1EFA, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_HIKER, 0, 0, 15, 40, 3, 16, 0, 0, 1, 3, Route112_EventScript_1F1E81, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 27, 30, 3, 7, 0, 0, 0, 0, Route112_EventScript_1F1DB7, 819, 0, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 27, 6, 0, 12, 0, 0, 0, 24, BerryTreeScript, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 28, 6, 0, 12, 0, 0, 0, 23, BerryTreeScript, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 29, 6, 0, 12, 0, 0, 0, 22, BerryTreeScript, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 30, 6, 3, 12, 0, 0, 0, 21, BerryTreeScript, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_HIKER, 0, 0, 8, 50, 3, 26, 48, 0, 0, 0, Route112_EventScript_1F1E61, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 43, 3, 1, 0, 0, 0, 0, Route112_EventScript_290DCF, 1011, 0, 0 + object_event 13, EVENT_OBJ_GFX_MAN_6, 0, 0, 31, 7, 3, 18, 17, 0, 1, 3, Route112_EventScript_1F1F11, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 31, 11, 3, 15, 17, 0, 1, 3, Route112_EventScript_1F1F28, 0, 0, 0 Route112_MapWarps: @ 8529AC4 warp_def 28, 27, 0, 0, ROUTE_112_CABLE_CAR_STATION @@ -28,5 +28,5 @@ Route112_MapBGEvents: @ 8529AF4 bg_event 4, 49, 0, 0, 0, Route112_EventScript_1F1E58 Route112_MapEvents:: @ 8529B18 - map_events Route112_MapObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents + map_events Route112_EventObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents diff --git a/data/maps/events/Route112_CableCarStation.inc b/data/maps/events/Route112_CableCarStation.inc index e1f001aad0..e33f6cb772 100644 --- a/data/maps/events/Route112_CableCarStation.inc +++ b/data/maps/events/Route112_CableCarStation.inc @@ -1,11 +1,11 @@ -Route112_CableCarStation_MapObjects: @ 8533C54 - object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 6, 6, 3, 8, 0, 0, 0, 0, Route112_CableCarStation_EventScript_22AB17, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_CABLE_CAR, 0, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0 +Route112_CableCarStation_EventObjects: @ 8533C54 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 6, 6, 3, 8, 0, 0, 0, 0, Route112_CableCarStation_EventScript_22AB17, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0 Route112_CableCarStation_MapWarps: @ 8533C84 warp_def 6, 11, 0, 0, ROUTE_112 warp_def 7, 11, 0, 1, ROUTE_112 Route112_CableCarStation_MapEvents:: @ 8533C94 - map_events Route112_CableCarStation_MapObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0 + map_events Route112_CableCarStation_EventObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route113.inc b/data/maps/events/Route113.inc index f1d07a6712..4d5376cce9 100644 --- a/data/maps/events/Route113.inc +++ b/data/maps/events/Route113.inc @@ -1,20 +1,20 @@ -Route113_MapObjects: @ 8529B2C - object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 66, 12, 3, 5, 1, 0, 0, 0, Route113_EventScript_1F2193, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 36, 10, 3, 3, 16, 0, 0, 0, Route113_EventScript_1F218A, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 62, 8, 3, 8, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 21, 11, 3, 17, 0, 0, 1, 3, Route113_EventScript_1F21D7, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 0, 51, 11, 3, 23, 0, 0, 1, 2, Route113_EventScript_1F21EE, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 53, 7, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DDC, 1012, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 79, 5, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DE9, 1013, 0, 0 - object_event 8, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 29, 6, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F2250, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 71, 2, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 45, 6, 3, 8, 17, 0, 1, 1, Route113_EventScript_1F22C9, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 46, 6, 3, 8, 17, 0, 1, 1, Route113_EventScript_1F22E4, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 15, 15, 3, 1, 17, 0, 0, 0, Route113_EventScript_290DF6, 1143, 0, 0 - object_event 13, MAP_OBJ_GFX_MANIAC, 0, 0, 75, 3, 3, 9, 17, 0, 1, 4, Route113_EventScript_1F2344, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_CAMPER, 0, 0, 71, 4, 3, 7, 17, 0, 1, 1, Route113_EventScript_1F232D, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_PICNICKER, 0, 0, 7, 6, 3, 26, 49, 0, 1, 6, Route113_EventScript_1F22FF, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_MAN_6, 0, 0, 7, 13, 3, 25, 49, 0, 1, 6, Route113_EventScript_1F2316, 0, 0, 0 +Route113_EventObjects: @ 8529B2C + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 66, 12, 3, 5, 1, 0, 0, 0, Route113_EventScript_1F2193, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 36, 10, 3, 3, 16, 0, 0, 0, Route113_EventScript_1F218A, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 62, 8, 3, 8, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 21, 11, 3, 17, 0, 0, 1, 3, Route113_EventScript_1F21D7, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 51, 11, 3, 23, 0, 0, 1, 2, Route113_EventScript_1F21EE, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 53, 7, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DDC, 1012, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 79, 5, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DE9, 1013, 0, 0 + object_event 8, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 29, 6, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F2250, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 71, 2, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 45, 6, 3, 8, 17, 0, 1, 1, Route113_EventScript_1F22C9, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 46, 6, 3, 8, 17, 0, 1, 1, Route113_EventScript_1F22E4, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 15, 15, 3, 1, 17, 0, 0, 0, Route113_EventScript_290DF6, 1143, 0, 0 + object_event 13, EVENT_OBJ_GFX_MANIAC, 0, 0, 75, 3, 3, 9, 17, 0, 1, 4, Route113_EventScript_1F2344, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 0, 71, 4, 3, 7, 17, 0, 1, 1, Route113_EventScript_1F232D, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_PICNICKER, 0, 0, 7, 6, 3, 26, 49, 0, 1, 6, Route113_EventScript_1F22FF, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 0, 7, 13, 3, 25, 49, 0, 1, 6, Route113_EventScript_1F2316, 0, 0, 0 Route113_MapWarps: @ 8529CAC warp_def 33, 5, 0, 0, ROUTE_113_GLASS_WORKSHOP @@ -53,5 +53,5 @@ Route113_MapBGEvents: @ 8529DF4 bg_event 73, 3, 3, 7, 0, ITEM_NUGGET, 98, 0 Route113_MapEvents:: @ 8529E54 - map_events Route113_MapObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents + map_events Route113_EventObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents diff --git a/data/maps/events/Route113_GlassWorkshop.inc b/data/maps/events/Route113_GlassWorkshop.inc index 0191f8578f..85d84324c2 100644 --- a/data/maps/events/Route113_GlassWorkshop.inc +++ b/data/maps/events/Route113_GlassWorkshop.inc @@ -1,11 +1,11 @@ -Route113_GlassWorkshop_MapObjects: @ 853EA78 - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_26ED1E, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 5, 4, 3, 2, 17, 0, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0, 0, 0 +Route113_GlassWorkshop_EventObjects: @ 853EA78 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_26ED1E, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 5, 4, 3, 2, 17, 0, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0, 0, 0 Route113_GlassWorkshop_MapWarps: @ 853EAA8 warp_def 3, 8, 0, 0, ROUTE_113 warp_def 4, 8, 0, 0, ROUTE_113 Route113_GlassWorkshop_MapEvents:: @ 853EAB8 - map_events Route113_GlassWorkshop_MapObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0 + map_events Route113_GlassWorkshop_EventObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route114.inc b/data/maps/events/Route114.inc index 800af012c0..1a7b582896 100644 --- a/data/maps/events/Route114.inc +++ b/data/maps/events/Route114.inc @@ -1,31 +1,31 @@ -Route114_MapObjects: @ 8529E68 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 31, 43, 3, 12, 0, 0, 0, 77, BerryTreeScript, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 31, 44, 3, 12, 0, 0, 0, 78, BerryTreeScript, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_HIKER, 0, 0, 15, 65, 7, 10, 0, 0, 1, 6, Route114_EventScript_1F2640, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_HIKER, 0, 0, 30, 72, 5, 9, 0, 0, 1, 4, Route114_EventScript_1F2657, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_CAMPER, 0, 0, 22, 50, 3, 10, 0, 0, 1, 3, Route114_EventScript_1F266E, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_PICNICKER, 0, 0, 19, 35, 3, 1, 0, 0, 1, 3, Route114_EventScript_1F2685, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_MANIAC, 0, 0, 20, 56, 3, 7, 0, 0, 1, 3, Route114_EventScript_1F269C, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 31, 45, 3, 12, 0, 0, 0, 68, BerryTreeScript, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 3, 1, 0, 0, 0, 0, Route114_EventScript_290E03, 1014, 0, 0 - object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 11, 37, 4, 1, 0, 0, 0, 0, Route114_EventScript_290E10, 1015, 0, 0 - object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 12, 43, 4, 1, 0, 0, 0, 0, Route114_EventScript_2907A6, 17, 0, 0 - object_event 12, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 19, 11, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F25D1, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_POOCHYENA, 0, 0, 19, 12, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F2612, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_MAN_5, 0, 0, 27, 42, 3, 3, 16, 0, 0, 0, Route114_EventScript_1F2582, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 0, 25, 6, 3, 8, 0, 0, 1, 0, Route114_EventScript_1F2777, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_FISHERMAN, 0, 0, 19, 26, 3, 9, 0, 0, 1, 0, Route114_EventScript_1F2760, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_MAN_6, 0, 0, 30, 58, 5, 23, 0, 0, 1, 3, Route114_EventScript_1F26FE, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 29, 53, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 18, 0, 0 - object_event 19, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 30, 54, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 19, 0, 0 - object_event 20, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 22, 69, 7, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 20, 0, 0 - object_event 21, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 11, 64, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 21, 0, 0 - object_event 22, MAP_OBJ_GFX_LASS, 0, 0, 24, 44, 3, 8, 17, 0, 1, 1, Route114_EventScript_1F27A9, 0, 0, 0 - object_event 23, MAP_OBJ_GFX_LASS, 0, 0, 23, 44, 3, 8, 17, 0, 1, 1, Route114_EventScript_1F278E, 0, 0, 0 - object_event 24, MAP_OBJ_GFX_PICNICKER, 0, 0, 28, 20, 3, 7, 17, 0, 1, 3, Route114_EventScript_1F27DB, 0, 0, 0 - object_event 25, MAP_OBJ_GFX_PICNICKER, 0, 0, 26, 72, 5, 18, 17, 0, 1, 4, Route114_EventScript_1F27C4, 0, 0, 0 - object_event 26, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 19, 3, 1, 17, 0, 0, 0, Route114_EventScript_290E1D, 1160, 0, 0 - object_event 27, MAP_OBJ_GFX_FISHERMAN, 0, 0, 28, 16, 3, 17, 17, 0, 1, 3, Route114_EventScript_1F27F2, 0, 0, 0 +Route114_EventObjects: @ 8529E68 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 31, 43, 3, 12, 0, 0, 0, 77, BerryTreeScript, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 31, 44, 3, 12, 0, 0, 0, 78, BerryTreeScript, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_HIKER, 0, 0, 15, 65, 7, 10, 0, 0, 1, 6, Route114_EventScript_1F2640, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_HIKER, 0, 0, 30, 72, 5, 9, 0, 0, 1, 4, Route114_EventScript_1F2657, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 0, 22, 50, 3, 10, 0, 0, 1, 3, Route114_EventScript_1F266E, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 0, 19, 35, 3, 1, 0, 0, 1, 3, Route114_EventScript_1F2685, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 0, 20, 56, 3, 7, 0, 0, 1, 3, Route114_EventScript_1F269C, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 31, 45, 3, 12, 0, 0, 0, 68, BerryTreeScript, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 3, 1, 0, 0, 0, 0, Route114_EventScript_290E03, 1014, 0, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 11, 37, 4, 1, 0, 0, 0, 0, Route114_EventScript_290E10, 1015, 0, 0 + object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 12, 43, 4, 1, 0, 0, 0, 0, Route114_EventScript_2907A6, 17, 0, 0 + object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 19, 11, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F25D1, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 19, 12, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F2612, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 0, 27, 42, 3, 3, 16, 0, 0, 0, Route114_EventScript_1F2582, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 25, 6, 3, 8, 0, 0, 1, 0, Route114_EventScript_1F2777, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 19, 26, 3, 9, 0, 0, 1, 0, Route114_EventScript_1F2760, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 0, 30, 58, 5, 23, 0, 0, 1, 3, Route114_EventScript_1F26FE, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 29, 53, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 18, 0, 0 + object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 30, 54, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 19, 0, 0 + object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 22, 69, 7, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 20, 0, 0 + object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 11, 64, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 21, 0, 0 + object_event 22, EVENT_OBJ_GFX_LASS, 0, 0, 24, 44, 3, 8, 17, 0, 1, 1, Route114_EventScript_1F27A9, 0, 0, 0 + object_event 23, EVENT_OBJ_GFX_LASS, 0, 0, 23, 44, 3, 8, 17, 0, 1, 1, Route114_EventScript_1F278E, 0, 0, 0 + object_event 24, EVENT_OBJ_GFX_PICNICKER, 0, 0, 28, 20, 3, 7, 17, 0, 1, 3, Route114_EventScript_1F27DB, 0, 0, 0 + object_event 25, EVENT_OBJ_GFX_PICNICKER, 0, 0, 26, 72, 5, 18, 17, 0, 1, 4, Route114_EventScript_1F27C4, 0, 0, 0 + object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 19, 3, 1, 17, 0, 0, 0, Route114_EventScript_290E1D, 1160, 0, 0 + object_event 27, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 28, 16, 3, 17, 17, 0, 1, 3, Route114_EventScript_1F27F2, 0, 0, 0 Route114_MapWarps: @ 852A0F0 warp_def 8, 63, 0, 0, METEOR_FALLS_1F_1R @@ -49,5 +49,5 @@ Route114_MapBGEvents: @ 852A118 bg_event 7, 30, 3, 7, 0, ITEM_REVIVE, 42, 0 Route114_MapEvents:: @ 852A1A8 - map_events Route114_MapObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents + map_events Route114_EventObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents diff --git a/data/maps/events/Route114_FossilManiacsHouse.inc b/data/maps/events/Route114_FossilManiacsHouse.inc index e20e9c54c3..ef9ad911a7 100644 --- a/data/maps/events/Route114_FossilManiacsHouse.inc +++ b/data/maps/events/Route114_FossilManiacsHouse.inc @@ -1,5 +1,5 @@ -Route114_FossilManiacsHouse_MapObjects: @ 8533CFC - object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 3, 2, 3, 8, 17, 0, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0, 0, 0 +Route114_FossilManiacsHouse_EventObjects: @ 8533CFC + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 3, 2, 3, 8, 17, 0, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0, 0, 0 Route114_FossilManiacsHouse_MapWarps: @ 8533D14 warp_def 4, 7, 0, 1, ROUTE_114 @@ -13,5 +13,5 @@ Route114_FossilManiacsHouse_MapBGEvents: @ 8533D2C bg_event 8, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_22AD7C Route114_FossilManiacsHouse_MapEvents:: @ 8533D5C - map_events Route114_FossilManiacsHouse_MapObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents + map_events Route114_FossilManiacsHouse_EventObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents diff --git a/data/maps/events/Route114_FossilManiacsTunnel.inc b/data/maps/events/Route114_FossilManiacsTunnel.inc index 3fb19d06e7..5521303f71 100644 --- a/data/maps/events/Route114_FossilManiacsTunnel.inc +++ b/data/maps/events/Route114_FossilManiacsTunnel.inc @@ -1,5 +1,5 @@ -Route114_FossilManiacsTunnel_MapObjects: @ 8533D70 - object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 5, 3, 3, 7, 17, 0, 0, 0, Route114_FossilManiacsTunnel_EventScript_22AF87, 0, 0, 0 +Route114_FossilManiacsTunnel_EventObjects: @ 8533D70 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 5, 3, 3, 7, 17, 0, 0, 0, Route114_FossilManiacsTunnel_EventScript_22AF87, 0, 0, 0 Route114_FossilManiacsTunnel_MapWarps: @ 8533D88 warp_def 6, 25, 3, 2, ROUTE_114_FOSSIL_MANIACS_HOUSE @@ -11,5 +11,5 @@ Route114_FossilManiacsTunnel_MapCoordEvents: @ 8533DA0 coord_event 6, 4, 3, 0, VAR_0x40CC, 1, 0, Route114_FossilManiacsTunnel_EventScript_22AF66 Route114_FossilManiacsTunnel_MapEvents:: @ 8533DC0 - map_events Route114_FossilManiacsTunnel_MapObjects, Route114_FossilManiacsTunnel_MapWarps, Route114_FossilManiacsTunnel_MapCoordEvents, 0x0 + map_events Route114_FossilManiacsTunnel_EventObjects, Route114_FossilManiacsTunnel_MapWarps, Route114_FossilManiacsTunnel_MapCoordEvents, 0x0 diff --git a/data/maps/events/Route114_LanettesHouse.inc b/data/maps/events/Route114_LanettesHouse.inc index c6e493c739..1182d95f22 100644 --- a/data/maps/events/Route114_LanettesHouse.inc +++ b/data/maps/events/Route114_LanettesHouse.inc @@ -1,5 +1,5 @@ -Route114_LanettesHouse_MapObjects: @ 8533DD4 - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 5, 4, 3, 1, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, 870, 0, 0 +Route114_LanettesHouse_EventObjects: @ 8533DD4 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 4, 3, 1, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, 870, 0, 0 Route114_LanettesHouse_MapWarps: @ 8533DEC warp_def 5, 7, 0, 2, ROUTE_114 @@ -11,5 +11,5 @@ Route114_LanettesHouse_MapBGEvents: @ 8533DFC bg_event 7, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_22B345 Route114_LanettesHouse_MapEvents:: @ 8533E20 - map_events Route114_LanettesHouse_MapObjects, Route114_LanettesHouse_MapWarps, 0x0, Route114_LanettesHouse_MapBGEvents + map_events Route114_LanettesHouse_EventObjects, Route114_LanettesHouse_MapWarps, 0x0, Route114_LanettesHouse_MapBGEvents diff --git a/data/maps/events/Route115.inc b/data/maps/events/Route115.inc index e59081620b..63924166c4 100644 --- a/data/maps/events/Route115.inc +++ b/data/maps/events/Route115.inc @@ -1,27 +1,27 @@ -Route115_MapObjects: @ 852A1BC - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 18, 68, 3, 2, 17, 0, 0, 0, Route115_EventScript_1F2973, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 15, 3, 10, 0, 0, 1, 6, Route115_EventScript_1F298E, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 27, 53, 3, 15, 17, 0, 1, 4, Route115_EventScript_1F2A07, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 12, 5, 3, 12, 0, 0, 0, 69, BerryTreeScript, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 13, 5, 3, 12, 0, 0, 0, 70, BerryTreeScript, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 14, 5, 3, 12, 0, 0, 0, 71, BerryTreeScript, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_GIRL_3, 0, 0, 15, 50, 3, 64, 0, 0, 1, 3, Route115_EventScript_1F2A69, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 19, 15, 3, 27, 5, 0, 1, 2, Route115_EventScript_1F29F0, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_MANIAC, 0, 0, 24, 62, 3, 18, 0, 0, 1, 4, Route115_EventScript_1F2ACB, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 20, 60, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E2A, 1016, 0, 0 - object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 18, 7, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E37, 1017, 0, 0 - object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 23, 29, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E44, 1018, 0, 0 - object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 31, 64, 3, 12, 0, 0, 0, 55, BerryTreeScript, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 31, 65, 3, 12, 0, 0, 0, 56, BerryTreeScript, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 29, 50, 3, 1, 17, 0, 0, 0, Route115_EventScript_2907A6, 17, 0, 0 - object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 56, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E51, 1118, 0, 0 - object_event 17, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 10, 15, 3, 46, 51, 0, 1, 2, Route115_EventScript_1F2AE2, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 11, 12, 3, 57, 17, 0, 1, 3, Route115_EventScript_1F2AF9, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_GIRL_3, 0, 0, 15, 7, 3, 9, 17, 0, 1, 4, Route115_EventScript_1F2B27, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_LASS, 0, 0, 10, 7, 3, 10, 17, 0, 1, 4, Route115_EventScript_1F2B10, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_LASS, 0, 0, 28, 62, 3, 9, 17, 0, 1, 4, Route115_EventScript_1F2B3E, 0, 0, 0 - object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 26, 67, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E6B, 1161, 0, 0 - object_event 23, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 12, 14, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E5E, 1144, 0, 0 +Route115_EventObjects: @ 852A1BC + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 18, 68, 3, 2, 17, 0, 0, 0, Route115_EventScript_1F2973, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 15, 3, 10, 0, 0, 1, 6, Route115_EventScript_1F298E, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 27, 53, 3, 15, 17, 0, 1, 4, Route115_EventScript_1F2A07, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 12, 5, 3, 12, 0, 0, 0, 69, BerryTreeScript, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 13, 5, 3, 12, 0, 0, 0, 70, BerryTreeScript, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 14, 5, 3, 12, 0, 0, 0, 71, BerryTreeScript, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 0, 15, 50, 3, 64, 0, 0, 1, 3, Route115_EventScript_1F2A69, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 19, 15, 3, 27, 5, 0, 1, 2, Route115_EventScript_1F29F0, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 0, 24, 62, 3, 18, 0, 0, 1, 4, Route115_EventScript_1F2ACB, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 20, 60, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E2A, 1016, 0, 0 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 18, 7, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E37, 1017, 0, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 23, 29, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E44, 1018, 0, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 31, 64, 3, 12, 0, 0, 0, 55, BerryTreeScript, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 31, 65, 3, 12, 0, 0, 0, 56, BerryTreeScript, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 29, 50, 3, 1, 17, 0, 0, 0, Route115_EventScript_2907A6, 17, 0, 0 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 56, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E51, 1118, 0, 0 + object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 10, 15, 3, 46, 51, 0, 1, 2, Route115_EventScript_1F2AE2, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 11, 12, 3, 57, 17, 0, 1, 3, Route115_EventScript_1F2AF9, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_GIRL_3, 0, 0, 15, 7, 3, 9, 17, 0, 1, 4, Route115_EventScript_1F2B27, 0, 0, 0 + object_event 20, EVENT_OBJ_GFX_LASS, 0, 0, 10, 7, 3, 10, 17, 0, 1, 4, Route115_EventScript_1F2B10, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_LASS, 0, 0, 28, 62, 3, 9, 17, 0, 1, 4, Route115_EventScript_1F2B3E, 0, 0, 0 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 26, 67, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E6B, 1161, 0, 0 + object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 14, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E5E, 1144, 0, 0 Route115_MapWarps: @ 852A3E4 warp_def 27, 37, 0, 1, METEOR_FALLS_1F_1R @@ -45,5 +45,5 @@ Route115_MapBGEvents: @ 852A3FC bg_event 15, 49, 3, 7, 0, ITEM_HEART_SCALE, 97, 0 Route115_MapEvents:: @ 852A4A4 - map_events Route115_MapObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents + map_events Route115_EventObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc index a28f44e921..25bc3891c1 100644 --- a/data/maps/events/Route116.inc +++ b/data/maps/events/Route116.inc @@ -1,32 +1,32 @@ -Route116_MapObjects: @ 852A4B8 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 18, 2, 3, 12, 0, 0, 0, 25, BerryTreeScript, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 19, 2, 3, 12, 0, 0, 0, 26, BerryTreeScript, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 12, 7, 3, 16, 0, 0, 1, 3, Route116_EventScript_1F2E89, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 21, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 17, 0, 0 - object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 32, 10, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 18, 0, 0 - object_event 6, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 13, 17, 3, 24, 0, 0, 1, 2, Route116_EventScript_1F2EA0, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 19, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E85, 1019, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 10, 17, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E92, 1020, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 20, 2, 3, 12, 0, 0, 0, 66, BerryTreeScript, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 21, 2, 3, 12, 0, 0, 0, 67, BerryTreeScript, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 46, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_1F2D84, 891, 0, 0 - object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 28, 11, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 19, 0, 0 - object_event 13, MAP_OBJ_GFX_HIKER, 0, 0, 36, 17, 3, 15, 0, 0, 1, 3, Route116_EventScript_1F2F65, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 24, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 20, 0, 0 - object_event 15, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 80, 8, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E9F, 1021, 0, 0 - object_event 16, MAP_OBJ_GFX_LASS, 0, 0, 26, 6, 3, 10, 0, 0, 1, 2, Route116_EventScript_1F2F7C, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_GIRL_3, 0, 0, 22, 16, 3, 13, 0, 0, 1, 3, Route116_EventScript_1F2F93, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 28, 8, 3, 7, 0, 0, 1, 4, Route116_EventScript_1F2EB7, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_MAN_2, 0, 0, 46, 11, 3, 1, 17, 0, 0, 0, Route116_EventScript_1F2CA2, 947, 0, 0 - object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 55, 12, 4, 1, 17, 0, 0, 0, Route116_EventScript_290E78, 1001, 0, 0 - object_event 21, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 38, 9, 3, 10, 17, 0, 0, 0, Route116_EventScript_1F2C70, 894, 0, 0 - object_event 22, MAP_OBJ_GFX_MANIAC, 0, 0, 74, 13, 3, 1, 17, 0, 0, 0, Route116_EventScript_1F2DB6, 813, 0, 0 - object_event 23, MAP_OBJ_GFX_WOMAN_3, 0, 0, 33, 8, 3, 7, 0, 0, 1, 1, Route116_EventScript_1F3041, 0, 0, 0 - object_event 24, MAP_OBJ_GFX_BOY_2, 0, 0, 33, 5, 3, 8, 0, 0, 1, 2, Route116_EventScript_1F3058, 0, 0, 0 - object_event 25, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 34, 7, 0, 1, 17, 0, 0, 0, Route116_EventScript_290EAC, 1146, 0, 0 - object_event 26, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 30, 5, 3, 1, 17, 0, 0, 0, Route116_EventScript_2906BB, 21, 0, 0 - object_event 27, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 36, 13, 3, 18, 17, 0, 1, 5, Route116_EventScript_1F3086, 0, 0, 0 - object_event 28, MAP_OBJ_GFX_HIKER, 0, 0, 42, 13, 3, 9, 17, 0, 1, 5, Route116_EventScript_1F306F, 0, 0, 0 +Route116_EventObjects: @ 852A4B8 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 18, 2, 3, 12, 0, 0, 0, 25, BerryTreeScript, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 19, 2, 3, 12, 0, 0, 0, 26, BerryTreeScript, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 12, 7, 3, 16, 0, 0, 1, 3, Route116_EventScript_1F2E89, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 21, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 17, 0, 0 + object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 32, 10, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 18, 0, 0 + object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 13, 17, 3, 24, 0, 0, 1, 2, Route116_EventScript_1F2EA0, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 19, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E85, 1019, 0, 0 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 17, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E92, 1020, 0, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 20, 2, 3, 12, 0, 0, 0, 66, BerryTreeScript, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 21, 2, 3, 12, 0, 0, 0, 67, BerryTreeScript, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 46, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_1F2D84, 891, 0, 0 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 28, 11, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 19, 0, 0 + object_event 13, EVENT_OBJ_GFX_HIKER, 0, 0, 36, 17, 3, 15, 0, 0, 1, 3, Route116_EventScript_1F2F65, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 24, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 20, 0, 0 + object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 80, 8, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E9F, 1021, 0, 0 + object_event 16, EVENT_OBJ_GFX_LASS, 0, 0, 26, 6, 3, 10, 0, 0, 1, 2, Route116_EventScript_1F2F7C, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 0, 22, 16, 3, 13, 0, 0, 1, 3, Route116_EventScript_1F2F93, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 28, 8, 3, 7, 0, 0, 1, 4, Route116_EventScript_1F2EB7, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 0, 46, 11, 3, 1, 17, 0, 0, 0, Route116_EventScript_1F2CA2, 947, 0, 0 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 55, 12, 4, 1, 17, 0, 0, 0, Route116_EventScript_290E78, 1001, 0, 0 + object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 38, 9, 3, 10, 17, 0, 0, 0, Route116_EventScript_1F2C70, 894, 0, 0 + object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 0, 74, 13, 3, 1, 17, 0, 0, 0, Route116_EventScript_1F2DB6, 813, 0, 0 + object_event 23, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 33, 8, 3, 7, 0, 0, 1, 1, Route116_EventScript_1F3041, 0, 0, 0 + object_event 24, EVENT_OBJ_GFX_BOY_2, 0, 0, 33, 5, 3, 8, 0, 0, 1, 2, Route116_EventScript_1F3058, 0, 0, 0 + object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 34, 7, 0, 1, 17, 0, 0, 0, Route116_EventScript_290EAC, 1146, 0, 0 + object_event 26, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 30, 5, 3, 1, 17, 0, 0, 0, Route116_EventScript_2906BB, 21, 0, 0 + object_event 27, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 36, 13, 3, 18, 17, 0, 1, 5, Route116_EventScript_1F3086, 0, 0, 0 + object_event 28, EVENT_OBJ_GFX_HIKER, 0, 0, 42, 13, 3, 9, 17, 0, 1, 5, Route116_EventScript_1F306F, 0, 0, 0 Route116_MapWarps: @ 852A758 warp_def 47, 8, 0, 0, RUSTURF_TUNNEL @@ -52,5 +52,5 @@ Route116_MapBGEvents: @ 852A790 bg_event 70, 13, 3, 7, 0, ITEM_BLACK_GLASSES, 96, 0 Route116_MapEvents:: @ 852A814 - map_events Route116_MapObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents + map_events Route116_EventObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents diff --git a/data/maps/events/Route116_TunnelersRestHouse.inc b/data/maps/events/Route116_TunnelersRestHouse.inc index bc159312ed..da8f9c1a05 100644 --- a/data/maps/events/Route116_TunnelersRestHouse.inc +++ b/data/maps/events/Route116_TunnelersRestHouse.inc @@ -1,12 +1,12 @@ -Route116_TunnelersRestHouse_MapObjects: @ 8533E34 - object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 6, 5, 3, 10, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_3, 0, 0, 3, 6, 3, 1, 17, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_3, 0, 0, 7, 2, 3, 7, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0, 0, 0 +Route116_TunnelersRestHouse_EventObjects: @ 8533E34 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 5, 3, 10, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 0, 3, 6, 3, 1, 17, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 7, 2, 3, 7, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0, 0, 0 Route116_TunnelersRestHouse_MapWarps: @ 8533E7C warp_def 4, 8, 0, 1, ROUTE_116 warp_def 5, 8, 0, 1, ROUTE_116 Route116_TunnelersRestHouse_MapEvents:: @ 8533E8C - map_events Route116_TunnelersRestHouse_MapObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0 + map_events Route116_TunnelersRestHouse_EventObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route117.inc b/data/maps/events/Route117.inc index 5b0e89239b..4478507ae7 100644 --- a/data/maps/events/Route117.inc +++ b/data/maps/events/Route117.inc @@ -1,28 +1,28 @@ -Route117_MapObjects: @ 852A828 - object_event 1, MAP_OBJ_GFX_WOMAN_1, 0, 0, 13, 13, 3, 8, 0, 0, 0, 0, Route117_EventScript_1F399A, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 25, 5, 3, 40, 34, 0, 0, 0, Route117_EventScript_1F39A3, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 47, 4, 3, 8, 0, 0, 0, 0, Route117_EventScript_291C18, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 33, 3, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_KECLEON_1, 0, 0, 39, 4, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_AZUMARILL, 0, 0, 42, 2, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_PIKACHU, 0, 0, 49, 2, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 38, 16, 3, 28, 8, 0, 1, 4, Route117_EventScript_1F3A94, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_WOMAN_3, 0, 0, 8, 10, 3, 23, 0, 0, 1, 3, Route117_EventScript_1F3A32, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_MAN_5, 0, 0, 33, 11, 3, 16, 0, 0, 1, 4, Route117_EventScript_1F39D0, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 41, 13, 3, 12, 0, 0, 0, 29, BerryTreeScript, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 42, 13, 3, 12, 0, 0, 0, 28, BerryTreeScript, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 43, 13, 3, 12, 0, 0, 0, 27, BerryTreeScript, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 18, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EB9, 1022, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 15, 2, 3, 1, 0, 0, 0, 0, Route117_EventScript_2906BB, 17, 0, 0 - object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 9, 1, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EC6, 1023, 0, 0 - object_event 17, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 26, 13, 3, 33, 34, 0, 1, 5, Route117_EventScript_1F3AF6, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_MANIAC, 0, 0, 17, 12, 3, 7, 17, 0, 1, 4, Route117_EventScript_1F3B58, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_LASS, 0, 0, 43, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3BD3, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_LASS, 0, 0, 42, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3B6F, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_GIRL_2, 0, 0, 48, 10, 3, 2, 17, 0, 0, 0, Route117_EventScript_1F39AC, 0, 0, 0 - object_event 22, MAP_OBJ_GFX_LASS, 0, 0, 15, 4, 3, 10, 17, 0, 1, 4, Route117_EventScript_1F3C4E, 0, 0, 0 - object_event 23, MAP_OBJ_GFX_GIRL_3, 0, 0, 21, 4, 3, 9, 17, 0, 1, 4, Route117_EventScript_1F3C65, 0, 0, 0 - object_event 24, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 16, 4, 3, 28, 20, 0, 1, 4, Route117_EventScript_1F3C37, 0, 0, 0 +Route117_EventObjects: @ 852A828 + object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 13, 13, 3, 8, 0, 0, 0, 0, Route117_EventScript_1F399A, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 25, 5, 3, 40, 34, 0, 0, 0, Route117_EventScript_1F39A3, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 47, 4, 3, 8, 0, 0, 0, 0, Route117_EventScript_291C18, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 33, 3, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 39, 4, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 42, 2, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_PIKACHU, 0, 0, 49, 2, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 38, 16, 3, 28, 8, 0, 1, 4, Route117_EventScript_1F3A94, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 8, 10, 3, 23, 0, 0, 1, 3, Route117_EventScript_1F3A32, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_MAN_5, 0, 0, 33, 11, 3, 16, 0, 0, 1, 4, Route117_EventScript_1F39D0, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 41, 13, 3, 12, 0, 0, 0, 29, BerryTreeScript, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 42, 13, 3, 12, 0, 0, 0, 28, BerryTreeScript, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 43, 13, 3, 12, 0, 0, 0, 27, BerryTreeScript, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 18, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EB9, 1022, 0, 0 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 15, 2, 3, 1, 0, 0, 0, 0, Route117_EventScript_2906BB, 17, 0, 0 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 9, 1, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EC6, 1023, 0, 0 + object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 26, 13, 3, 33, 34, 0, 1, 5, Route117_EventScript_1F3AF6, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_MANIAC, 0, 0, 17, 12, 3, 7, 17, 0, 1, 4, Route117_EventScript_1F3B58, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_LASS, 0, 0, 43, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3BD3, 0, 0, 0 + object_event 20, EVENT_OBJ_GFX_LASS, 0, 0, 42, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3B6F, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_GIRL_2, 0, 0, 48, 10, 3, 2, 17, 0, 0, 0, Route117_EventScript_1F39AC, 0, 0, 0 + object_event 22, EVENT_OBJ_GFX_LASS, 0, 0, 15, 4, 3, 10, 17, 0, 1, 4, Route117_EventScript_1F3C4E, 0, 0, 0 + object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 0, 21, 4, 3, 9, 17, 0, 1, 4, Route117_EventScript_1F3C65, 0, 0, 0 + object_event 24, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 16, 4, 3, 28, 20, 0, 1, 4, Route117_EventScript_1F3C37, 0, 0, 0 Route117_MapWarps: @ 852AA68 warp_def 51, 5, 0, 0, ROUTE_117_POKEMON_DAY_CARE @@ -34,5 +34,5 @@ Route117_MapBGEvents: @ 852AA70 bg_event 3, 18, 3, 7, 0, ITEM_REPEL, 72, 0 Route117_MapEvents:: @ 852AAA0 - map_events Route117_MapObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents + map_events Route117_EventObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents diff --git a/data/maps/events/Route117_PokemonDayCare.inc b/data/maps/events/Route117_PokemonDayCare.inc index e9625991f3..363c2132f0 100644 --- a/data/maps/events/Route117_PokemonDayCare.inc +++ b/data/maps/events/Route117_PokemonDayCare.inc @@ -1,10 +1,10 @@ -Route117_PokemonDayCare_MapObjects: @ 8533EA0 - object_event 1, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 2, 2, 3, 8, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0, 0, 0 +Route117_PokemonDayCare_EventObjects: @ 8533EA0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 2, 2, 3, 8, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0, 0, 0 Route117_PokemonDayCare_MapWarps: @ 8533EB8 warp_def 2, 8, 0, 0, ROUTE_117 warp_def 3, 8, 0, 0, ROUTE_117 Route117_PokemonDayCare_MapEvents:: @ 8533EC8 - map_events Route117_PokemonDayCare_MapObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0 + map_events Route117_PokemonDayCare_EventObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc index 40e1e4b709..73ba40dd2c 100644 --- a/data/maps/events/Route118.inc +++ b/data/maps/events/Route118.inc @@ -1,25 +1,25 @@ -Route118_MapObjects: @ 852AAB4 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 35, 5, 3, 12, 0, 0, 0, 31, BerryTreeScript, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 36, 5, 3, 12, 0, 0, 0, 32, BerryTreeScript, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 37, 5, 3, 12, 0, 0, 0, 33, BerryTreeScript, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_6, 0, 0, 64, 10, 3, 8, 0, 0, 1, 3, Route118_EventScript_1F4079, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE16, 797, 0, 0 - object_event 6, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE36, 797, 0, 0 - object_event 7, MAP_OBJ_GFX_GIRL_2, 0, 0, 12, 10, 3, 2, 17, 0, 0, 0, Route118_EventScript_1F3E73, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CED6, 901, 0, 0 - object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CEF6, 901, 0, 0 - object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF16, 904, 0, 0 - object_event 11, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF36, 904, 0, 0 - object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 38, 8, 3, 1, 0, 0, 0, 0, Route118_EventScript_2906BB, 17, 0, 0 - object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 0, 28, 8, 3, 9, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_WOMAN_3, 0, 0, 7, 12, 3, 7, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 0, 14, 14, 3, 8, 0, 0, 1, 0, Route118_EventScript_1F4000, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_MAN_6, 0, 0, 56, 7, 3, 16, 0, 0, 1, 3, Route118_EventScript_1F4090, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_FISHERMAN, 0, 0, 39, 15, 3, 1, 0, 0, 1, 2, Route118_EventScript_1F3FE9, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_MAN_6, 0, 0, 17, 11, 3, 15, 17, 0, 1, 3, Route118_EventScript_1F4017, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_STEVEN, 0, 0, 44, 7, 3, 8, 17, 0, 0, 0, 0x0, 966, 0, 0 - object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 69, 7, 3, 1, 17, 0, 0, 0, Route118_EventScript_290ED3, 1121, 0, 0 - object_event 21, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 7, 7, 3, 8, 17, 0, 1, 4, Route118_EventScript_1F40A7, 0, 0, 0 +Route118_EventObjects: @ 852AAB4 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 35, 5, 3, 12, 0, 0, 0, 31, BerryTreeScript, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 36, 5, 3, 12, 0, 0, 0, 32, BerryTreeScript, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 37, 5, 3, 12, 0, 0, 0, 33, BerryTreeScript, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 0, 64, 10, 3, 8, 0, 0, 1, 3, Route118_EventScript_1F4079, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE16, 797, 0, 0 + object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE36, 797, 0, 0 + object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 0, 12, 10, 3, 2, 17, 0, 0, 0, Route118_EventScript_1F3E73, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CED6, 901, 0, 0 + object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CEF6, 901, 0, 0 + object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF16, 904, 0, 0 + object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF36, 904, 0, 0 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 38, 8, 3, 1, 0, 0, 0, 0, Route118_EventScript_2906BB, 17, 0, 0 + object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 28, 8, 3, 9, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 7, 12, 3, 7, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 14, 14, 3, 8, 0, 0, 1, 0, Route118_EventScript_1F4000, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 0, 56, 7, 3, 16, 0, 0, 1, 3, Route118_EventScript_1F4090, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 39, 15, 3, 1, 0, 0, 1, 2, Route118_EventScript_1F3FE9, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 0, 17, 11, 3, 15, 17, 0, 1, 3, Route118_EventScript_1F4017, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 0, 44, 7, 3, 8, 17, 0, 0, 0, 0x0, 966, 0, 0 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 69, 7, 3, 1, 17, 0, 0, 0, Route118_EventScript_290ED3, 1121, 0, 0 + object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 7, 7, 3, 8, 17, 0, 1, 4, Route118_EventScript_1F40A7, 0, 0, 0 Route118_MapWarps: @ 852ACAC warp_def 42, 6, 0, 0, TERRA_CAVE_ENTRANCE @@ -42,5 +42,5 @@ Route118_MapBGEvents: @ 852ACEC bg_event 12, 14, 3, 7, 0, ITEM_HEART_SCALE, 66, 0 Route118_MapEvents:: @ 852AD58 - map_events Route118_MapObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_MapBGEvents + map_events Route118_EventObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_MapBGEvents diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc index e78006b3c4..96db2d9442 100644 --- a/data/maps/events/Route119.inc +++ b/data/maps/events/Route119.inc @@ -1,47 +1,47 @@ -Route119_MapObjects: @ 852AD6C - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 24, 5, 3, 12, 0, 0, 0, 34, BerryTreeScript, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 25, 5, 3, 12, 0, 0, 0, 35, BerryTreeScript, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 26, 5, 3, 12, 0, 0, 0, 36, BerryTreeScript, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 12, 123, 3, 59, 0, 0, 1, 1, Route119_EventScript_1F47E2, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MANIAC, 0, 0, 26, 123, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F47B4, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MANIAC, 0, 0, 5, 125, 3, 62, 0, 0, 1, 1, Route119_EventScript_1F479D, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_CAMPER, 0, 0, 7, 74, 3, 18, 0, 0, 1, 3, Route119_EventScript_1F4810, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_MANIAC, 0, 0, 28, 116, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F4786, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_PICNICKER, 0, 0, 35, 83, 4, 8, 0, 0, 1, 2, Route119_EventScript_1F4872, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 34, 122, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47CB, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 17, 128, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47F9, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 28, 14, 3, 57, 0, 0, 1, 1, Route119_EventScript_1F4902, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 19, 49, 3, 58, 0, 0, 1, 3, Route119_EventScript_1F4919, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_MAN_6, 0, 0, 10, 50, 4, 10, 0, 0, 1, 3, Route119_EventScript_1F48D4, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_MAN_6, 0, 0, 8, 63, 3, 8, 0, 0, 1, 5, Route119_EventScript_1F48EB, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_HIPSTER, 0, 0, 25, 32, 3, 7, 0, 0, 0, 0, 0x0, 851, 0, 0 - object_event 17, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 12, 121, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EE0, 1024, 0, 0 - object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 96, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EED, 1025, 0, 0 - object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 29, 53, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EFA, 1026, 0, 0 - object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 25, 76, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F07, 1027, 0, 0 - object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 18, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F14, 1028, 0, 0 - object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 33, 117, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F21, 1029, 0, 0 - object_event 23, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 33, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49A3, 890, 0, 0 - object_event 24, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 34, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49BA, 890, 0, 0 - object_event 25, MAP_OBJ_GFX_GIDDY, 0, 0, 17, 33, 4, 7, 0, 0, 0, 0, 0x0, 923, 0, 0 - object_event 26, MAP_OBJ_GFX_BOY_3, 0, 0, 31, 109, 3, 8, 17, 0, 0, 0, Route119_EventScript_1F49D1, 0, 0, 0 - object_event 27, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 8, 23, 3, 12, 0, 0, 0, 83, BerryTreeScript, 0, 0, 0 - object_event 28, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 9, 23, 3, 12, 0, 0, 0, 84, BerryTreeScript, 0, 0, 0 - object_event 29, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 29, 90, 3, 12, 0, 0, 0, 85, BerryTreeScript, 0, 0, 0 - object_event 30, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 30, 90, 3, 12, 0, 0, 0, 86, BerryTreeScript, 0, 0, 0 - object_event 31, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 19, 133, 3, 5, 18, 0, 0, 0, Route119_EventScript_1F476B, 0, 0, 0 - object_event 32, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 56, 3, 1, 17, 0, 0, 0, Route119_EventScript_290F2E, 1106, 0, 0 - object_event 33, MAP_OBJ_GFX_BOY_2, 0, 0, 35, 93, 4, 2, 17, 0, 0, 0, Route119_EventScript_1F49DA, 0, 0, 0 - object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 29, 6, 3, 57, 17, 0, 1, 3, Route119_EventScript_1F4930, 0, 0, 0 - object_event 35, MAP_OBJ_GFX_KECLEON_1, 0, 0, 31, 6, 3, 76, 17, 0, 0, 0, Route119_EventScript_27231C, 989, 0, 0 - object_event 36, MAP_OBJ_GFX_KECLEON_1, 0, 0, 25, 15, 3, 76, 17, 0, 0, 0, Route119_EventScript_272329, 990, 0, 0 - object_event 37, MAP_OBJ_GFX_FISHERMAN, 0, 0, 13, 104, 3, 10, 17, 0, 1, 0, Route119_EventScript_1F4947, 0, 0, 0 - object_event 38, MAP_OBJ_GFX_WOMAN_3, 0, 0, 8, 68, 3, 7, 17, 0, 1, 5, Route119_EventScript_1F498C, 0, 0, 0 - object_event 39, MAP_OBJ_GFX_MAN_6, 0, 0, 16, 52, 3, 10, 17, 0, 1, 3, Route119_EventScript_1F4975, 0, 0, 0 - object_event 40, MAP_OBJ_GFX_MAN_6, 0, 0, 32, 15, 3, 9, 17, 0, 1, 4, Route119_EventScript_1F495E, 0, 0, 0 - object_event 41, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 19, 5, 4, 1, 17, 0, 0, 0, Route119_EventScript_291399, 1134, 0, 0 - object_event 42, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 24, 42, 3, 1, 17, 0, 0, 0, Route119_EventScript_290F3B, 1147, 0, 0 - object_event 43, MAP_OBJ_GFX_SCOTT, 0, 0, 28, 25, 3, 8, 0, 0, 0, 0, 0x0, 786, 0, 0 +Route119_EventObjects: @ 852AD6C + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 24, 5, 3, 12, 0, 0, 0, 34, BerryTreeScript, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 25, 5, 3, 12, 0, 0, 0, 35, BerryTreeScript, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 26, 5, 3, 12, 0, 0, 0, 36, BerryTreeScript, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 12, 123, 3, 59, 0, 0, 1, 1, Route119_EventScript_1F47E2, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 0, 26, 123, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F47B4, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MANIAC, 0, 0, 5, 125, 3, 62, 0, 0, 1, 1, Route119_EventScript_1F479D, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_CAMPER, 0, 0, 7, 74, 3, 18, 0, 0, 1, 3, Route119_EventScript_1F4810, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 0, 28, 116, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F4786, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_PICNICKER, 0, 0, 35, 83, 4, 8, 0, 0, 1, 2, Route119_EventScript_1F4872, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 34, 122, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47CB, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 17, 128, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47F9, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 28, 14, 3, 57, 0, 0, 1, 1, Route119_EventScript_1F4902, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 19, 49, 3, 58, 0, 0, 1, 3, Route119_EventScript_1F4919, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_MAN_6, 0, 0, 10, 50, 4, 10, 0, 0, 1, 3, Route119_EventScript_1F48D4, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_MAN_6, 0, 0, 8, 63, 3, 8, 0, 0, 1, 5, Route119_EventScript_1F48EB, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_HIPSTER, 0, 0, 25, 32, 3, 7, 0, 0, 0, 0, 0x0, 851, 0, 0 + object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 121, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EE0, 1024, 0, 0 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 96, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EED, 1025, 0, 0 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 53, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EFA, 1026, 0, 0 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 25, 76, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F07, 1027, 0, 0 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 18, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F14, 1028, 0, 0 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 33, 117, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F21, 1029, 0, 0 + object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 33, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49A3, 890, 0, 0 + object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 34, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49BA, 890, 0, 0 + object_event 25, EVENT_OBJ_GFX_GIDDY, 0, 0, 17, 33, 4, 7, 0, 0, 0, 0, 0x0, 923, 0, 0 + object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 0, 31, 109, 3, 8, 17, 0, 0, 0, Route119_EventScript_1F49D1, 0, 0, 0 + object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 8, 23, 3, 12, 0, 0, 0, 83, BerryTreeScript, 0, 0, 0 + object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 9, 23, 3, 12, 0, 0, 0, 84, BerryTreeScript, 0, 0, 0 + object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 29, 90, 3, 12, 0, 0, 0, 85, BerryTreeScript, 0, 0, 0 + object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 30, 90, 3, 12, 0, 0, 0, 86, BerryTreeScript, 0, 0, 0 + object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 19, 133, 3, 5, 18, 0, 0, 0, Route119_EventScript_1F476B, 0, 0, 0 + object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 56, 3, 1, 17, 0, 0, 0, Route119_EventScript_290F2E, 1106, 0, 0 + object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 0, 35, 93, 4, 2, 17, 0, 0, 0, Route119_EventScript_1F49DA, 0, 0, 0 + object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 29, 6, 3, 57, 17, 0, 1, 3, Route119_EventScript_1F4930, 0, 0, 0 + object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 31, 6, 3, 76, 17, 0, 0, 0, Route119_EventScript_27231C, 989, 0, 0 + object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 25, 15, 3, 76, 17, 0, 0, 0, Route119_EventScript_272329, 990, 0, 0 + object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 13, 104, 3, 10, 17, 0, 1, 0, Route119_EventScript_1F4947, 0, 0, 0 + object_event 38, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 8, 68, 3, 7, 17, 0, 1, 5, Route119_EventScript_1F498C, 0, 0, 0 + object_event 39, EVENT_OBJ_GFX_MAN_6, 0, 0, 16, 52, 3, 10, 17, 0, 1, 3, Route119_EventScript_1F4975, 0, 0, 0 + object_event 40, EVENT_OBJ_GFX_MAN_6, 0, 0, 32, 15, 3, 9, 17, 0, 1, 4, Route119_EventScript_1F495E, 0, 0, 0 + object_event 41, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 19, 5, 4, 1, 17, 0, 0, 0, Route119_EventScript_291399, 1134, 0, 0 + object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 24, 42, 3, 1, 17, 0, 0, 0, Route119_EventScript_290F3B, 1147, 0, 0 + object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 0, 28, 25, 3, 8, 0, 0, 0, 0, 0x0, 786, 0, 0 Route119_MapWarps: @ 852B174 warp_def 6, 32, 0, 0, ROUTE_119_WEATHER_INSTITUTE_1F @@ -95,5 +95,5 @@ Route119_MapBGEvents: @ 852B2F4 bg_event 28, 9, 0, 0, 0, Route119_EventScript_1F49E3 Route119_MapEvents:: @ 852B3E4 - map_events Route119_MapObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents + map_events Route119_EventObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents diff --git a/data/maps/events/Route119_House.inc b/data/maps/events/Route119_House.inc index 7033c505ac..38c35b40a2 100644 --- a/data/maps/events/Route119_House.inc +++ b/data/maps/events/Route119_House.inc @@ -1,16 +1,16 @@ -Route119_House_MapObjects: @ 853ECD0 - object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route119_House_EventScript_270966, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WINGULL, 0, 0, 1, 6, 3, 2, 34, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WINGULL, 0, 0, 0, 4, 3, 2, 19, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WINGULL, 0, 0, 2, 2, 3, 2, 17, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WINGULL, 0, 0, 8, 5, 3, 2, 35, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_WINGULL, 0, 0, 6, 6, 3, 2, 34, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_WINGULL, 0, 0, 5, 3, 3, 2, 49, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 +Route119_House_EventObjects: @ 853ECD0 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route119_House_EventScript_270966, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 0, 1, 6, 3, 2, 34, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 0, 4, 3, 2, 19, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 0, 2, 2, 3, 2, 17, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WINGULL, 0, 0, 8, 5, 3, 2, 35, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 0, 6, 6, 3, 2, 34, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 0, 5, 3, 3, 2, 49, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 Route119_House_MapWarps: @ 853ED78 warp_def 3, 8, 0, 1, ROUTE_119 warp_def 4, 8, 0, 1, ROUTE_119 Route119_House_MapEvents:: @ 853ED88 - map_events Route119_House_MapObjects, Route119_House_MapWarps, 0x0, 0x0 + map_events Route119_House_EventObjects, Route119_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route119_WeatherInstitute_1F.inc b/data/maps/events/Route119_WeatherInstitute_1F.inc index 01a53d75a9..6fa459ac6a 100644 --- a/data/maps/events/Route119_WeatherInstitute_1F.inc +++ b/data/maps/events/Route119_WeatherInstitute_1F.inc @@ -1,9 +1,9 @@ -Route119_WeatherInstitute_1F_MapObjects: @ 853EB20 - object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 3, 3, 9, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, 890, 0, 0 - object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 10, 5, 3, 8, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, 890, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_5, 0, 0, 5, 4, 3, 8, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, 892, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 2, 11, 3, 1, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, 892, 0, 0 - object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 14, 11, 3, 2, 17, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0, 0, 0 +Route119_WeatherInstitute_1F_EventObjects: @ 853EB20 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 3, 3, 9, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, 890, 0, 0 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 10, 5, 3, 8, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, 890, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 0, 5, 4, 3, 8, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, 892, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 2, 11, 3, 1, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, 892, 0, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 14, 11, 3, 2, 17, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0, 0, 0 Route119_WeatherInstitute_1F_MapWarps: @ 853EB98 warp_def 9, 12, 0, 0, ROUTE_119 @@ -17,5 +17,5 @@ Route119_WeatherInstitute_1F_MapBGEvents: @ 853EBB0 bg_event 0, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB18 Route119_WeatherInstitute_1F_MapEvents:: @ 853EBE0 - map_events Route119_WeatherInstitute_1F_MapObjects, Route119_WeatherInstitute_1F_MapWarps, 0x0, Route119_WeatherInstitute_1F_MapBGEvents + map_events Route119_WeatherInstitute_1F_EventObjects, Route119_WeatherInstitute_1F_MapWarps, 0x0, Route119_WeatherInstitute_1F_MapBGEvents diff --git a/data/maps/events/Route119_WeatherInstitute_2F.inc b/data/maps/events/Route119_WeatherInstitute_2F.inc index 3a68ca8657..0f838709c4 100644 --- a/data/maps/events/Route119_WeatherInstitute_2F.inc +++ b/data/maps/events/Route119_WeatherInstitute_2F.inc @@ -1,16 +1,16 @@ -Route119_WeatherInstitute_2F_MapObjects: @ 853EBF4 - object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 6, 3, 10, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, 890, 0, 0 - object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 8, 3, 13, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, 890, 0, 0 - object_event 3, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 4, 6, 3, 10, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, 890, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 0, 6, 3, 10, 0, 0, 0, 0, 0x0, 893, 0, 0 - object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 18, 6, 3, 1, 18, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_27018B, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_5, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 893, 0, 0 - object_event 7, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 16, 6, 3, 9, 17, 0, 0, 0, 0x0, 992, 0, 0 - object_event 8, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 19, 6, 3, 9, 17, 0, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, 890, 0, 0 +Route119_WeatherInstitute_2F_EventObjects: @ 853EBF4 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 6, 3, 10, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, 890, 0, 0 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 8, 3, 13, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, 890, 0, 0 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 4, 6, 3, 10, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, 890, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 0, 6, 3, 10, 0, 0, 0, 0, 0x0, 893, 0, 0 + object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 18, 6, 3, 1, 18, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_27018B, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 893, 0, 0 + object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 16, 6, 3, 9, 17, 0, 0, 0, 0x0, 992, 0, 0 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 19, 6, 3, 9, 17, 0, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, 890, 0, 0 Route119_WeatherInstitute_2F_MapWarps: @ 853ECB4 warp_def 17, 1, 0, 2, ROUTE_119_WEATHER_INSTITUTE_1F Route119_WeatherInstitute_2F_MapEvents:: @ 853ECBC - map_events Route119_WeatherInstitute_2F_MapObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0 + map_events Route119_WeatherInstitute_2F_EventObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc index 6206e713f7..6f227115ca 100644 --- a/data/maps/events/Route120.inc +++ b/data/maps/events/Route120.inc @@ -1,48 +1,48 @@ -Route120_MapObjects: @ 852B3F8 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 4, 79, 3, 12, 0, 0, 0, 46, BerryTreeScript, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 5, 79, 3, 12, 0, 0, 0, 45, BerryTreeScript, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 6, 79, 3, 12, 0, 0, 0, 44, BerryTreeScript, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 7, 79, 3, 12, 0, 0, 0, 43, BerryTreeScript, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 34, 24, 3, 12, 0, 0, 0, 37, BerryTreeScript, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 35, 24, 3, 12, 0, 0, 0, 38, BerryTreeScript, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 36, 24, 3, 12, 0, 0, 0, 39, BerryTreeScript, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 9, 92, 5, 12, 0, 0, 0, 40, BerryTreeScript, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 10, 92, 5, 12, 0, 0, 0, 41, BerryTreeScript, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 11, 92, 5, 12, 0, 0, 0, 42, BerryTreeScript, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_MAN_6, 0, 0, 5, 22, 3, 14, 0, 0, 1, 3, Route120_EventScript_1F57D7, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_MAN_6, 0, 0, 32, 14, 3, 10, 0, 0, 1, 3, Route120_EventScript_1F57EE, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_CAMPER, 0, 0, 27, 51, 3, 9, 0, 0, 1, 7, Route120_EventScript_1F5850, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_PICNICKER, 0, 0, 36, 45, 3, 9, 0, 0, 1, 2, Route120_EventScript_1F5867, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_MANIAC, 0, 0, 19, 80, 5, 15, 0, 0, 1, 3, Route120_EventScript_1F587E, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 20, 55, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F48, 1030, 0, 0 - object_event 17, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE76, 798, 0, 0 - object_event 18, MAP_OBJ_GFX_REPORTER_F, 0, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE56, 798, 0, 0 - object_event 19, MAP_OBJ_GFX_REPORTER_F, 0, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF16, 902, 0, 0 - object_event 20, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF36, 902, 0, 0 - object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 35, 32, 3, 1, 0, 0, 0, 0, Route120_EventScript_2906BB, 17, 0, 0 - object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 89, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F55, 1031, 0, 0 - object_event 23, MAP_OBJ_GFX_BEAUTY, 0, 0, 14, 92, 5, 5, 1, 0, 0, 0, Route120_EventScript_1F5527, 0, 0, 0 - object_event 24, MAP_OBJ_GFX_WOMAN_7, 0, 0, 31, 37, 3, 15, 0, 0, 1, 4, Route120_EventScript_1F58E0, 0, 0, 0 - object_event 25, MAP_OBJ_GFX_HIKER, 0, 0, 9, 60, 3, 21, 0, 0, 1, 4, Route120_EventScript_1F58F7, 0, 0, 0 - object_event 26, MAP_OBJ_GFX_WOMAN_7, 0, 0, 16, 6, 3, 23, 0, 0, 1, 4, Route120_EventScript_1F590E, 0, 0, 0 - object_event 27, MAP_OBJ_GFX_WOMAN_7, 0, 0, 18, 34, 3, 9, 0, 0, 1, 3, Route120_EventScript_1F5925, 0, 0, 0 - object_event 28, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 22, 13, 3, 1, 17, 0, 0, 0, Route120_EventScript_290F6F, 1108, 0, 0 - object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 23, 82, 5, 1, 17, 0, 0, 0, Route120_EventScript_290F62, 1107, 0, 0 - object_event 30, MAP_OBJ_GFX_KECLEON_1, 0, 0, 12, 16, 4, 76, 17, 0, 0, 0, Route120_EventScript_1F57BC, 970, 0, 0 - object_event 31, MAP_OBJ_GFX_STEVEN, 0, 0, 13, 15, 4, 8, 17, 0, 0, 0, Route120_EventScript_1F5641, 972, 0, 0 - object_event 32, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 20, 1, 3, 1, 17, 0, 0, 0, Route120_EventScript_2906BB, 20, 0, 0 - object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 15, 1, 3, 1, 17, 0, 0, 0, Route120_EventScript_2906BB, 18, 0, 0 - object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 10, 72, 3, 58, 17, 0, 1, 3, Route120_EventScript_1F593C, 0, 0, 0 - object_event 35, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 19, 28, 3, 57, 17, 0, 1, 3, Route120_EventScript_1F5953, 0, 0, 0 - object_event 36, MAP_OBJ_GFX_KECLEON_2, 0, 0, 12, 16, 3, 8, 17, 0, 0, 0, 0x0, 981, 0, 0 - object_event 37, MAP_OBJ_GFX_KECLEON_1, 0, 0, 20, 11, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722DB, 982, 0, 0 - object_event 38, MAP_OBJ_GFX_KECLEON_1, 0, 0, 27, 2, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722E8, 985, 0, 0 - object_event 39, MAP_OBJ_GFX_KECLEON_1, 0, 0, 4, 77, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722F5, 986, 0, 0 - object_event 40, MAP_OBJ_GFX_KECLEON_1, 0, 0, 7, 51, 3, 76, 17, 0, 0, 0, Route120_EventScript_27230F, 988, 0, 0 - object_event 41, MAP_OBJ_GFX_KECLEON_1, 0, 0, 19, 48, 3, 76, 17, 0, 0, 0, Route120_EventScript_272302, 987, 0, 0 - object_event 42, MAP_OBJ_GFX_GIRL_3, 0, 0, 19, 32, 3, 7, 17, 0, 1, 3, Route120_EventScript_1F5981, 0, 0, 0 - object_event 43, MAP_OBJ_GFX_MAN_4, 0, 0, 14, 34, 3, 10, 17, 0, 1, 3, Route120_EventScript_1F596A, 0, 0, 0 - object_event 44, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 24, 33, 3, 1, 17, 0, 0, 0, Route120_EventScript_290F7C, 1148, 0, 0 +Route120_EventObjects: @ 852B3F8 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 4, 79, 3, 12, 0, 0, 0, 46, BerryTreeScript, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 5, 79, 3, 12, 0, 0, 0, 45, BerryTreeScript, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 6, 79, 3, 12, 0, 0, 0, 44, BerryTreeScript, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 7, 79, 3, 12, 0, 0, 0, 43, BerryTreeScript, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 34, 24, 3, 12, 0, 0, 0, 37, BerryTreeScript, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 35, 24, 3, 12, 0, 0, 0, 38, BerryTreeScript, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 36, 24, 3, 12, 0, 0, 0, 39, BerryTreeScript, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 9, 92, 5, 12, 0, 0, 0, 40, BerryTreeScript, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 10, 92, 5, 12, 0, 0, 0, 41, BerryTreeScript, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 11, 92, 5, 12, 0, 0, 0, 42, BerryTreeScript, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 0, 5, 22, 3, 14, 0, 0, 1, 3, Route120_EventScript_1F57D7, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_MAN_6, 0, 0, 32, 14, 3, 10, 0, 0, 1, 3, Route120_EventScript_1F57EE, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 0, 27, 51, 3, 9, 0, 0, 1, 7, Route120_EventScript_1F5850, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 0, 36, 45, 3, 9, 0, 0, 1, 2, Route120_EventScript_1F5867, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 0, 19, 80, 5, 15, 0, 0, 1, 3, Route120_EventScript_1F587E, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 20, 55, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F48, 1030, 0, 0 + object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE76, 798, 0, 0 + object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE56, 798, 0, 0 + object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF16, 902, 0, 0 + object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF36, 902, 0, 0 + object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 35, 32, 3, 1, 0, 0, 0, 0, Route120_EventScript_2906BB, 17, 0, 0 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 89, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F55, 1031, 0, 0 + object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 0, 14, 92, 5, 5, 1, 0, 0, 0, Route120_EventScript_1F5527, 0, 0, 0 + object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 31, 37, 3, 15, 0, 0, 1, 4, Route120_EventScript_1F58E0, 0, 0, 0 + object_event 25, EVENT_OBJ_GFX_HIKER, 0, 0, 9, 60, 3, 21, 0, 0, 1, 4, Route120_EventScript_1F58F7, 0, 0, 0 + object_event 26, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 16, 6, 3, 23, 0, 0, 1, 4, Route120_EventScript_1F590E, 0, 0, 0 + object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 18, 34, 3, 9, 0, 0, 1, 3, Route120_EventScript_1F5925, 0, 0, 0 + object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 22, 13, 3, 1, 17, 0, 0, 0, Route120_EventScript_290F6F, 1108, 0, 0 + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 23, 82, 5, 1, 17, 0, 0, 0, Route120_EventScript_290F62, 1107, 0, 0 + object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 12, 16, 4, 76, 17, 0, 0, 0, Route120_EventScript_1F57BC, 970, 0, 0 + object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 0, 13, 15, 4, 8, 17, 0, 0, 0, Route120_EventScript_1F5641, 972, 0, 0 + object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 20, 1, 3, 1, 17, 0, 0, 0, Route120_EventScript_2906BB, 20, 0, 0 + object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 15, 1, 3, 1, 17, 0, 0, 0, Route120_EventScript_2906BB, 18, 0, 0 + object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 10, 72, 3, 58, 17, 0, 1, 3, Route120_EventScript_1F593C, 0, 0, 0 + object_event 35, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 19, 28, 3, 57, 17, 0, 1, 3, Route120_EventScript_1F5953, 0, 0, 0 + object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 0, 12, 16, 3, 8, 17, 0, 0, 0, 0x0, 981, 0, 0 + object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 20, 11, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722DB, 982, 0, 0 + object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 27, 2, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722E8, 985, 0, 0 + object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 4, 77, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722F5, 986, 0, 0 + object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 7, 51, 3, 76, 17, 0, 0, 0, Route120_EventScript_27230F, 988, 0, 0 + object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 19, 48, 3, 76, 17, 0, 0, 0, Route120_EventScript_272302, 987, 0, 0 + object_event 42, EVENT_OBJ_GFX_GIRL_3, 0, 0, 19, 32, 3, 7, 17, 0, 1, 3, Route120_EventScript_1F5981, 0, 0, 0 + object_event 43, EVENT_OBJ_GFX_MAN_4, 0, 0, 14, 34, 3, 10, 17, 0, 1, 3, Route120_EventScript_1F596A, 0, 0, 0 + object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 24, 33, 3, 1, 17, 0, 0, 0, Route120_EventScript_290F7C, 1148, 0, 0 Route120_MapWarps: @ 852B818 warp_def 7, 55, 0, 0, ANCIENT_TOMB @@ -86,5 +86,5 @@ Route120_MapBGEvents: @ 852B958 bg_event 5, 76, 0, 8, 0, ITEM_HARD_STONE, 0, 0 Route120_MapEvents:: @ 852BA00 - map_events Route120_MapObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents + map_events Route120_EventObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc index b58fe48584..ec6ced043e 100644 --- a/data/maps/events/Route121.inc +++ b/data/maps/events/Route121.inc @@ -1,33 +1,33 @@ -Route121_MapObjects: @ 852BA14 - object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 0, 29, 14, 3, 10, 17, 0, 0, 0, Route121_EventScript_1F5DFD, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 14, 2, 3, 12, 0, 0, 0, 47, BerryTreeScript, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 15, 2, 3, 12, 0, 0, 0, 48, BerryTreeScript, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 16, 2, 3, 12, 0, 0, 0, 49, BerryTreeScript, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 17, 2, 3, 12, 0, 0, 0, 50, BerryTreeScript, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 64, 14, 3, 12, 0, 0, 0, 51, BerryTreeScript, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 65, 14, 3, 12, 0, 0, 0, 52, BerryTreeScript, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 66, 14, 3, 12, 0, 0, 0, 53, BerryTreeScript, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 67, 14, 3, 12, 0, 0, 0, 54, BerryTreeScript, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_LASS, 0, 0, 39, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F04, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_LASS, 0, 0, 40, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F1F, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 8, 3, 7, 0, 0, 0, 0, 0x0, 914, 0, 0 - object_event 13, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 7, 3, 10, 0, 0, 0, 0, 0x0, 914, 0, 0 - object_event 14, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 31, 7, 3, 9, 0, 0, 0, 0, 0x0, 914, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 32, 5, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 17, 0, 0 - object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 65, 4, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 18, 0, 0 - object_event 17, MAP_OBJ_GFX_WOMAN_2, 0, 0, 63, 5, 3, 9, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 55, 8, 3, 9, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 11, 11, 3, 7, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_BEAUTY, 0, 0, 22, 5, 3, 17, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 55, 10, 3, 1, 17, 0, 0, 0, Route121_EventScript_290F89, 1103, 0, 0 - object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 26, 12, 3, 1, 17, 0, 0, 0, Route121_EventScript_2906BB, 19, 0, 0 - object_event 23, MAP_OBJ_GFX_MANIAC, 0, 0, 11, 6, 3, 26, 65, 0, 1, 3, Route121_EventScript_1F5F9C, 0, 0, 0 - object_event 24, MAP_OBJ_GFX_MAN_5, 0, 0, 59, 8, 3, 8, 17, 0, 1, 4, Route121_EventScript_1F5FB3, 0, 0, 0 - object_event 25, MAP_OBJ_GFX_WOMAN_3, 0, 0, 59, 13, 3, 7, 17, 0, 1, 4, Route121_EventScript_1F5FCA, 0, 0, 0 - object_event 26, MAP_OBJ_GFX_MAN_4, 0, 0, 65, 9, 3, 18, 17, 0, 1, 6, Route121_EventScript_1F5FE1, 0, 0, 0 - object_event 27, MAP_OBJ_GFX_WOMAN_7, 0, 0, 72, 9, 3, 17, 17, 0, 1, 6, Route121_EventScript_1F5FF8, 0, 0, 0 - object_event 28, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 60, 10, 3, 1, 17, 0, 0, 0, Route121_EventScript_290F96, 1149, 0, 0 - object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 38, 13, 3, 1, 17, 0, 0, 0, Route121_EventScript_290FA3, 1150, 0, 0 +Route121_EventObjects: @ 852BA14 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 29, 14, 3, 10, 17, 0, 0, 0, Route121_EventScript_1F5DFD, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 14, 2, 3, 12, 0, 0, 0, 47, BerryTreeScript, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 15, 2, 3, 12, 0, 0, 0, 48, BerryTreeScript, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 16, 2, 3, 12, 0, 0, 0, 49, BerryTreeScript, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 17, 2, 3, 12, 0, 0, 0, 50, BerryTreeScript, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 64, 14, 3, 12, 0, 0, 0, 51, BerryTreeScript, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 65, 14, 3, 12, 0, 0, 0, 52, BerryTreeScript, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 66, 14, 3, 12, 0, 0, 0, 53, BerryTreeScript, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 67, 14, 3, 12, 0, 0, 0, 54, BerryTreeScript, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_LASS, 0, 0, 39, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F04, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_LASS, 0, 0, 40, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F1F, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 8, 3, 7, 0, 0, 0, 0, 0x0, 914, 0, 0 + object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 7, 3, 10, 0, 0, 0, 0, 0x0, 914, 0, 0 + object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 31, 7, 3, 9, 0, 0, 0, 0, 0x0, 914, 0, 0 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 32, 5, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 17, 0, 0 + object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 65, 4, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 18, 0, 0 + object_event 17, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 63, 5, 3, 9, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 55, 8, 3, 9, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 11, 11, 3, 7, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0, 0, 0 + object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 0, 22, 5, 3, 17, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 55, 10, 3, 1, 17, 0, 0, 0, Route121_EventScript_290F89, 1103, 0, 0 + object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 26, 12, 3, 1, 17, 0, 0, 0, Route121_EventScript_2906BB, 19, 0, 0 + object_event 23, EVENT_OBJ_GFX_MANIAC, 0, 0, 11, 6, 3, 26, 65, 0, 1, 3, Route121_EventScript_1F5F9C, 0, 0, 0 + object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 0, 59, 8, 3, 8, 17, 0, 1, 4, Route121_EventScript_1F5FB3, 0, 0, 0 + object_event 25, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 59, 13, 3, 7, 17, 0, 1, 4, Route121_EventScript_1F5FCA, 0, 0, 0 + object_event 26, EVENT_OBJ_GFX_MAN_4, 0, 0, 65, 9, 3, 18, 17, 0, 1, 6, Route121_EventScript_1F5FE1, 0, 0, 0 + object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 72, 9, 3, 17, 17, 0, 1, 6, Route121_EventScript_1F5FF8, 0, 0, 0 + object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 60, 10, 3, 1, 17, 0, 0, 0, Route121_EventScript_290F96, 1149, 0, 0 + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 38, 13, 3, 1, 17, 0, 0, 0, Route121_EventScript_290FA3, 1150, 0, 0 Route121_MapWarps: @ 852BCCC warp_def 37, 5, 0, 2, ROUTE_121_SAFARI_ZONE_ENTRANCE @@ -51,5 +51,5 @@ Route121_MapBGEvents: @ 852BD14 bg_event 68, 8, 3, 7, 0, ITEM_MAX_REVIVE, 100, 0 Route121_MapEvents:: @ 852BD8C - map_events Route121_MapObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents + map_events Route121_EventObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents diff --git a/data/maps/events/Route121_SafariZoneEntrance.inc b/data/maps/events/Route121_SafariZoneEntrance.inc index 258571e174..39bb6123c7 100644 --- a/data/maps/events/Route121_SafariZoneEntrance.inc +++ b/data/maps/events/Route121_SafariZoneEntrance.inc @@ -1,7 +1,7 @@ -Route121_SafariZoneEntrance_MapObjects: @ 8533EDC - object_event 1, MAP_OBJ_GFX_PICNICKER, 0, 0, 17, 9, 3, 9, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBE6, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_CAMPER, 0, 0, 10, 2, 3, 8, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBEF, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 +Route121_SafariZoneEntrance_EventObjects: @ 8533EDC + object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 0, 17, 9, 3, 9, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBE6, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 0, 10, 2, 3, 8, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBEF, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 Route121_SafariZoneEntrance_MapWarps: @ 8533F24 warp_def 2, 5, 0, 0, SAFARI_ZONE_SOUTH @@ -16,5 +16,5 @@ Route121_SafariZoneEntrance_MapBGEvents: @ 8533F54 bg_event 15, 1, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BD21 Route121_SafariZoneEntrance_MapEvents:: @ 8533F60 - map_events Route121_SafariZoneEntrance_MapObjects, Route121_SafariZoneEntrance_MapWarps, Route121_SafariZoneEntrance_MapCoordEvents, Route121_SafariZoneEntrance_MapBGEvents + map_events Route121_SafariZoneEntrance_EventObjects, Route121_SafariZoneEntrance_MapWarps, Route121_SafariZoneEntrance_MapCoordEvents, Route121_SafariZoneEntrance_MapBGEvents diff --git a/data/maps/events/Route123.inc b/data/maps/events/Route123.inc index cb60786c08..0521a0592f 100644 --- a/data/maps/events/Route123.inc +++ b/data/maps/events/Route123.inc @@ -1,47 +1,47 @@ -Route123_MapObjects: @ 852BDBC - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 11, 3, 3, 12, 0, 0, 0, 58, BerryTreeScript, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 12, 3, 3, 12, 0, 0, 0, 59, BerryTreeScript, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 14, 3, 3, 12, 0, 0, 0, 60, BerryTreeScript, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 15, 3, 3, 12, 0, 0, 0, 61, BerryTreeScript, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 81, 1, 3, 12, 0, 0, 0, 62, BerryTreeScript, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 82, 1, 3, 12, 0, 0, 0, 63, BerryTreeScript, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 83, 1, 3, 12, 0, 0, 0, 64, BerryTreeScript, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 0, 70, 12, 3, 24, 0, 0, 1, 1, Route123_EventScript_1F61C5, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_MAN_4, 0, 0, 58, 7, 3, 17, 0, 0, 1, 2, Route123_EventScript_1F61DC, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 14, 5, 3, 12, 0, 0, 0, 65, BerryTreeScript, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 15, 5, 3, 12, 0, 0, 0, 72, BerryTreeScript, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 17, 5, 3, 12, 0, 0, 0, 73, BerryTreeScript, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 18, 5, 3, 12, 0, 0, 0, 74, BerryTreeScript, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 17, 3, 3, 12, 0, 0, 0, 79, BerryTreeScript, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 18, 3, 3, 12, 0, 0, 0, 14, BerryTreeScript, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 11, 5, 3, 12, 0, 0, 0, 15, BerryTreeScript, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 12, 5, 3, 12, 0, 0, 0, 30, BerryTreeScript, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 101, 13, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 17, 0, 0 - object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 129, 14, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 18, 0, 0 - object_event 20, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 92, 9, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 19, 0, 0 - object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 8, 3, 1, 0, 0, 0, 0, Route123_EventScript_290FB0, 1032, 0, 0 - object_event 22, MAP_OBJ_GFX_GIRL_3, 0, 0, 108, 13, 3, 15, 0, 0, 0, 0, Route123_EventScript_1F6151, 0, 0, 0 - object_event 23, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 109, 13, 3, 12, 0, 0, 0, 87, BerryTreeScript, 0, 0, 0 - object_event 24, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 110, 13, 3, 12, 0, 0, 0, 88, BerryTreeScript, 0, 0, 0 - object_event 25, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 111, 13, 3, 12, 0, 0, 0, 89, BerryTreeScript, 0, 0, 0 - object_event 26, MAP_OBJ_GFX_WOMAN_3, 0, 0, 18, 9, 3, 23, 0, 0, 1, 2, Route123_EventScript_1F61F3, 0, 0, 0 - object_event 27, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 38, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62E9, 0, 0, 0 - object_event 28, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 37, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62CE, 0, 0, 0 - object_event 29, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 138, 12, 3, 9, 0, 0, 1, 7, Route123_EventScript_1F620A, 0, 0, 0 - object_event 30, MAP_OBJ_GFX_LASS, 0, 0, 49, 16, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F626C, 0, 0, 0 - object_event 31, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 87, 12, 3, 8, 0, 0, 1, 4, Route123_EventScript_1F6304, 0, 0, 0 - object_event 32, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 27, 18, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FBD, 1104, 0, 0 - object_event 33, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 75, 9, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FCA, 1109, 0, 0 - object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 138, 14, 3, 57, 17, 0, 1, 1, Route123_EventScript_1F6377, 0, 0, 0 - object_event 35, MAP_OBJ_GFX_WOMAN_3, 0, 0, 138, 16, 3, 7, 17, 0, 1, 1, Route123_EventScript_1F6360, 0, 0, 0 - object_event 36, MAP_OBJ_GFX_MANIAC, 0, 0, 87, 17, 3, 7, 17, 0, 1, 4, Route123_EventScript_1F6349, 0, 0, 0 - object_event 37, MAP_OBJ_GFX_MAN_6, 0, 0, 66, 16, 3, 8, 17, 0, 1, 2, Route123_EventScript_1F63BC, 0, 0, 0 - object_event 38, MAP_OBJ_GFX_MAN_6, 0, 0, 66, 19, 3, 7, 17, 0, 1, 2, Route123_EventScript_1F6332, 0, 0, 0 - object_event 39, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 49, 19, 3, 7, 17, 0, 1, 2, Route123_EventScript_1F631B, 0, 0, 0 - object_event 40, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 43, 15, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FD7, 1152, 0, 0 - object_event 41, MAP_OBJ_GFX_WOMAN_7, 0, 0, 14, 16, 3, 7, 17, 0, 1, 3, Route123_EventScript_1F638E, 0, 0, 0 - object_event 42, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 14, 12, 3, 26, 49, 0, 1, 3, Route123_EventScript_1F63A5, 0, 0, 0 - object_event 43, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 57, 16, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FE4, 1153, 0, 0 +Route123_EventObjects: @ 852BDBC + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 11, 3, 3, 12, 0, 0, 0, 58, BerryTreeScript, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 12, 3, 3, 12, 0, 0, 0, 59, BerryTreeScript, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 14, 3, 3, 12, 0, 0, 0, 60, BerryTreeScript, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 15, 3, 3, 12, 0, 0, 0, 61, BerryTreeScript, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 81, 1, 3, 12, 0, 0, 0, 62, BerryTreeScript, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 82, 1, 3, 12, 0, 0, 0, 63, BerryTreeScript, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 83, 1, 3, 12, 0, 0, 0, 64, BerryTreeScript, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 70, 12, 3, 24, 0, 0, 1, 1, Route123_EventScript_1F61C5, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 0, 58, 7, 3, 17, 0, 0, 1, 2, Route123_EventScript_1F61DC, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 14, 5, 3, 12, 0, 0, 0, 65, BerryTreeScript, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 15, 5, 3, 12, 0, 0, 0, 72, BerryTreeScript, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 17, 5, 3, 12, 0, 0, 0, 73, BerryTreeScript, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 18, 5, 3, 12, 0, 0, 0, 74, BerryTreeScript, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 17, 3, 3, 12, 0, 0, 0, 79, BerryTreeScript, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 18, 3, 3, 12, 0, 0, 0, 14, BerryTreeScript, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 11, 5, 3, 12, 0, 0, 0, 15, BerryTreeScript, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 12, 5, 3, 12, 0, 0, 0, 30, BerryTreeScript, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 101, 13, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 17, 0, 0 + object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 129, 14, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 18, 0, 0 + object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 92, 9, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 19, 0, 0 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 8, 3, 1, 0, 0, 0, 0, Route123_EventScript_290FB0, 1032, 0, 0 + object_event 22, EVENT_OBJ_GFX_GIRL_3, 0, 0, 108, 13, 3, 15, 0, 0, 0, 0, Route123_EventScript_1F6151, 0, 0, 0 + object_event 23, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 109, 13, 3, 12, 0, 0, 0, 87, BerryTreeScript, 0, 0, 0 + object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 110, 13, 3, 12, 0, 0, 0, 88, BerryTreeScript, 0, 0, 0 + object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 111, 13, 3, 12, 0, 0, 0, 89, BerryTreeScript, 0, 0, 0 + object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 18, 9, 3, 23, 0, 0, 1, 2, Route123_EventScript_1F61F3, 0, 0, 0 + object_event 27, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 38, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62E9, 0, 0, 0 + object_event 28, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 37, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62CE, 0, 0, 0 + object_event 29, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 138, 12, 3, 9, 0, 0, 1, 7, Route123_EventScript_1F620A, 0, 0, 0 + object_event 30, EVENT_OBJ_GFX_LASS, 0, 0, 49, 16, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F626C, 0, 0, 0 + object_event 31, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 87, 12, 3, 8, 0, 0, 1, 4, Route123_EventScript_1F6304, 0, 0, 0 + object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 27, 18, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FBD, 1104, 0, 0 + object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 75, 9, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FCA, 1109, 0, 0 + object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 138, 14, 3, 57, 17, 0, 1, 1, Route123_EventScript_1F6377, 0, 0, 0 + object_event 35, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 138, 16, 3, 7, 17, 0, 1, 1, Route123_EventScript_1F6360, 0, 0, 0 + object_event 36, EVENT_OBJ_GFX_MANIAC, 0, 0, 87, 17, 3, 7, 17, 0, 1, 4, Route123_EventScript_1F6349, 0, 0, 0 + object_event 37, EVENT_OBJ_GFX_MAN_6, 0, 0, 66, 16, 3, 8, 17, 0, 1, 2, Route123_EventScript_1F63BC, 0, 0, 0 + object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 0, 66, 19, 3, 7, 17, 0, 1, 2, Route123_EventScript_1F6332, 0, 0, 0 + object_event 39, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 49, 19, 3, 7, 17, 0, 1, 2, Route123_EventScript_1F631B, 0, 0, 0 + object_event 40, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 43, 15, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FD7, 1152, 0, 0 + object_event 41, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 14, 16, 3, 7, 17, 0, 1, 3, Route123_EventScript_1F638E, 0, 0, 0 + object_event 42, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 14, 12, 3, 26, 49, 0, 1, 3, Route123_EventScript_1F63A5, 0, 0, 0 + object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 57, 16, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FE4, 1153, 0, 0 Route123_MapWarps: @ 852C1C4 warp_def 22, 6, 0, 0, ROUTE_123_BERRY_MASTERS_HOUSE @@ -84,5 +84,5 @@ Route123_MapBGEvents: @ 852C32C bg_event 138, 18, 3, 7, 0, ITEM_RARE_CANDY, 110, 0 Route123_MapEvents:: @ 852C3B0 - map_events Route123_MapObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents + map_events Route123_EventObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents diff --git a/data/maps/events/Route123_BerryMastersHouse.inc b/data/maps/events/Route123_BerryMastersHouse.inc index cbe15cac1c..719dc55c76 100644 --- a/data/maps/events/Route123_BerryMastersHouse.inc +++ b/data/maps/events/Route123_BerryMastersHouse.inc @@ -1,11 +1,11 @@ -Route123_BerryMastersHouse_MapObjects: @ 853EACC - object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F845, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 7, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0, 0, 0 +Route123_BerryMastersHouse_EventObjects: @ 853EACC + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F845, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 7, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0, 0, 0 Route123_BerryMastersHouse_MapWarps: @ 853EAFC warp_def 3, 7, 0, 0, ROUTE_123 warp_def 4, 7, 0, 0, ROUTE_123 Route123_BerryMastersHouse_MapEvents:: @ 853EB0C - map_events Route123_BerryMastersHouse_MapObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0 + map_events Route123_BerryMastersHouse_EventObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route124.inc b/data/maps/events/Route124.inc index 6f40347e9c..8cd919a633 100644 --- a/data/maps/events/Route124.inc +++ b/data/maps/events/Route124.inc @@ -1,16 +1,16 @@ -Route124_MapObjects: @ 852C3C4 - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 34, 25, 1, 1, 5, 0, 1, 3, Route124_EventScript_1F6585, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 61, 74, 1, 67, 53, 0, 1, 7, Route124_EventScript_1F659C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 49, 45, 1, 24, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 7, 23, 1, 18, 134, 0, 1, 5, Route124_EventScript_1F6615, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 58, 58, 1, 28, 7, 0, 1, 2, Route124_EventScript_1F662C, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 28, 12, 3, 1, 17, 0, 0, 0, Route124_EventScript_290FF1, 1092, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 53, 3, 1, 17, 0, 0, 0, Route124_EventScript_290FFE, 1093, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 58, 11, 3, 1, 17, 0, 0, 0, Route124_EventScript_29100B, 1066, 0, 0 - object_event 9, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 18, 44, 1, 8, 17, 0, 1, 1, Route124_EventScript_1F6643, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 17, 44, 1, 8, 17, 0, 1, 1, Route124_EventScript_1F66A7, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 7, 29, 1, 7, 17, 0, 1, 5, Route124_EventScript_1F670B, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 69, 74, 1, 66, 17, 0, 1, 7, Route124_EventScript_1F6722, 0, 0, 0 +Route124_EventObjects: @ 852C3C4 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 34, 25, 1, 1, 5, 0, 1, 3, Route124_EventScript_1F6585, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 61, 74, 1, 67, 53, 0, 1, 7, Route124_EventScript_1F659C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 49, 45, 1, 24, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 7, 23, 1, 18, 134, 0, 1, 5, Route124_EventScript_1F6615, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 58, 58, 1, 28, 7, 0, 1, 2, Route124_EventScript_1F662C, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 28, 12, 3, 1, 17, 0, 0, 0, Route124_EventScript_290FF1, 1092, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 53, 3, 1, 17, 0, 0, 0, Route124_EventScript_290FFE, 1093, 0, 0 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 58, 11, 3, 1, 17, 0, 0, 0, Route124_EventScript_29100B, 1066, 0, 0 + object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 18, 44, 1, 8, 17, 0, 1, 1, Route124_EventScript_1F6643, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 17, 44, 1, 8, 17, 0, 1, 1, Route124_EventScript_1F66A7, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 7, 29, 1, 7, 17, 0, 1, 5, Route124_EventScript_1F670B, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 69, 74, 1, 66, 17, 0, 1, 7, Route124_EventScript_1F6722, 0, 0, 0 Route124_MapWarps: @ 852C4E4 warp_def 70, 48, 3, 0, ROUTE_124_DIVING_TREASURE_HUNTERS_HOUSE @@ -19,5 +19,5 @@ Route124_MapBGEvents: @ 852C4EC bg_event 73, 48, 3, 0, 0, Route124_EventScript_1F657C Route124_MapEvents:: @ 852C4F8 - map_events Route124_MapObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents + map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc index 43c364e8de..1916f36b72 100644 --- a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc +++ b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc @@ -1,5 +1,5 @@ -Route124_DivingTreasureHuntersHouse_MapObjects: @ 853ED9C - object_event 1, MAP_OBJ_GFX_MAN_6, 0, 0, 5, 4, 0, 9, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0, 0, 0 +Route124_DivingTreasureHuntersHouse_EventObjects: @ 853ED9C + object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 0, 5, 4, 0, 9, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0, 0, 0 Route124_DivingTreasureHuntersHouse_MapWarps: @ 853EDB4 warp_def 3, 8, 0, 0, ROUTE_124 @@ -9,4 +9,4 @@ Route124_DivingTreasureHuntersHouse_MapBGEvents: @ 853EDC4 bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270F63 Route124_DivingTreasureHuntersHouse_MapEvents:: @ 853EDD0 - map_events Route124_DivingTreasureHuntersHouse_MapObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents + map_events Route124_DivingTreasureHuntersHouse_EventObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents diff --git a/data/maps/events/Route125.inc b/data/maps/events/Route125.inc index 1211044f23..30fa1f18fb 100644 --- a/data/maps/events/Route125.inc +++ b/data/maps/events/Route125.inc @@ -1,14 +1,14 @@ -Route125_MapObjects: @ 852C50C - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 7, 31, 1, 28, 0, 0, 1, 2, Route125_EventScript_1F67A4, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 45, 9, 1, 10, 82, 0, 1, 2, Route125_EventScript_1F67BB, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 38, 24, 1, 28, 6, 0, 1, 3, Route125_EventScript_1F67D2, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 30, 28, 1, 52, 153, 0, 1, 3, Route125_EventScript_1F67E9, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_SAILOR, 0, 0, 21, 30, 3, 13, 0, 0, 1, 2, Route125_EventScript_1F6800, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_LASS, 0, 0, 17, 19, 3, 8, 17, 0, 1, 1, Route125_EventScript_1F6862, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_LASS, 0, 0, 18, 19, 3, 8, 17, 0, 1, 1, Route125_EventScript_1F687D, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_MAN_6, 0, 0, 43, 19, 3, 28, 18, 0, 1, 3, Route125_EventScript_1F6898, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 48, 19, 3, 27, 18, 0, 1, 3, Route125_EventScript_1F68AF, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 46, 17, 3, 1, 17, 0, 0, 0, Route125_EventScript_291018, 1154, 0, 0 +Route125_EventObjects: @ 852C50C + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 7, 31, 1, 28, 0, 0, 1, 2, Route125_EventScript_1F67A4, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 45, 9, 1, 10, 82, 0, 1, 2, Route125_EventScript_1F67BB, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 38, 24, 1, 28, 6, 0, 1, 3, Route125_EventScript_1F67D2, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 30, 28, 1, 52, 153, 0, 1, 3, Route125_EventScript_1F67E9, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 0, 21, 30, 3, 13, 0, 0, 1, 2, Route125_EventScript_1F6800, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_LASS, 0, 0, 17, 19, 3, 8, 17, 0, 1, 1, Route125_EventScript_1F6862, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_LASS, 0, 0, 18, 19, 3, 8, 17, 0, 1, 1, Route125_EventScript_1F687D, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 0, 43, 19, 3, 28, 18, 0, 1, 3, Route125_EventScript_1F6898, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 48, 19, 3, 27, 18, 0, 1, 3, Route125_EventScript_1F68AF, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 46, 17, 3, 1, 17, 0, 0, 0, Route125_EventScript_291018, 1154, 0, 0 Route125_MapWarps: @ 852C5FC warp_def 22, 19, 0, 0, SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM @@ -20,5 +20,5 @@ Route125_MapBGEvents: @ 852C604 bg_event 24, 32, 0, 8, 0, ITEM_PINAP_BERRY, 0, 0 Route125_MapEvents:: @ 852C634 - map_events Route125_MapObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents + map_events Route125_EventObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents diff --git a/data/maps/events/Route126.inc b/data/maps/events/Route126.inc index e8bfd1a5f1..f6d4a71a5e 100644 --- a/data/maps/events/Route126.inc +++ b/data/maps/events/Route126.inc @@ -1,14 +1,14 @@ -Route126_MapObjects: @ 852C648 - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 51, 65, 1, 51, 58, 0, 1, 3, Route126_EventScript_1F68D6, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 56, 22, 1, 28, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 63, 43, 1, 24, 0, 0, 1, 3, Route126_EventScript_1F6904, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 9, 48, 1, 7, 0, 0, 1, 3, Route126_EventScript_1F691B, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 1, 3, 1, 17, 0, 0, 0, Route126_EventScript_291025, 1105, 0, 0 - object_event 6, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 15, 66, 1, 66, 17, 0, 1, 7, Route126_EventScript_1F6960, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 7, 66, 1, 67, 17, 0, 1, 7, Route126_EventScript_1F6977, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 64, 5, 1, 66, 17, 0, 1, 7, Route126_EventScript_1F6949, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 56, 5, 1, 67, 17, 0, 1, 7, Route126_EventScript_1F6932, 0, 0, 0 +Route126_EventObjects: @ 852C648 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 51, 65, 1, 51, 58, 0, 1, 3, Route126_EventScript_1F68D6, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 56, 22, 1, 28, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 63, 43, 1, 24, 0, 0, 1, 3, Route126_EventScript_1F6904, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 9, 48, 1, 7, 0, 0, 1, 3, Route126_EventScript_1F691B, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 1, 3, 1, 17, 0, 0, 0, Route126_EventScript_291025, 1105, 0, 0 + object_event 6, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 15, 66, 1, 66, 17, 0, 1, 7, Route126_EventScript_1F6960, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 7, 66, 1, 67, 17, 0, 1, 7, Route126_EventScript_1F6977, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 64, 5, 1, 66, 17, 0, 1, 7, Route126_EventScript_1F6949, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 56, 5, 1, 67, 17, 0, 1, 7, Route126_EventScript_1F6932, 0, 0, 0 Route126_MapEvents:: @ 852C720 - map_events Route126_MapObjects, 0x0, 0x0, 0x0 + map_events Route126_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route127.inc b/data/maps/events/Route127.inc index 7a486263e6..b72a1d6297 100644 --- a/data/maps/events/Route127.inc +++ b/data/maps/events/Route127.inc @@ -1,15 +1,15 @@ -Route127_MapObjects: @ 852C734 - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 45, 42, 1, 14, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 18, 68, 1, 21, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 6, 3, 1, 0, 0, 0, 0, Route127_EventScript_291032, 1034, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 64, 39, 3, 1, 0, 0, 0, 0, Route127_EventScript_29103F, 1035, 0, 0 - object_event 5, MAP_OBJ_GFX_FISHERMAN, 0, 0, 42, 21, 3, 9, 17, 0, 1, 0, Route127_EventScript_1F6A63, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 0, 64, 19, 3, 10, 17, 0, 1, 0, Route127_EventScript_1F6A91, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_FISHERMAN, 0, 0, 54, 14, 3, 7, 17, 0, 1, 0, Route127_EventScript_1F6A7A, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_MAN_6, 0, 0, 15, 23, 3, 9, 17, 0, 1, 2, Route127_EventScript_1F6AA8, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 63, 63, 3, 1, 17, 0, 1, 3, Route127_EventScript_1F6AD6, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_WOMAN_7, 0, 0, 12, 23, 3, 10, 17, 0, 1, 2, Route127_EventScript_1F6ABF, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 13, 20, 3, 1, 0, 0, 0, 0, Route127_EventScript_29104C, 1155, 0, 0 +Route127_EventObjects: @ 852C734 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 45, 42, 1, 14, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 18, 68, 1, 21, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 6, 3, 1, 0, 0, 0, 0, Route127_EventScript_291032, 1034, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 64, 39, 3, 1, 0, 0, 0, 0, Route127_EventScript_29103F, 1035, 0, 0 + object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 42, 21, 3, 9, 17, 0, 1, 0, Route127_EventScript_1F6A63, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 64, 19, 3, 10, 17, 0, 1, 0, Route127_EventScript_1F6A91, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 54, 14, 3, 7, 17, 0, 1, 0, Route127_EventScript_1F6A7A, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 0, 15, 23, 3, 9, 17, 0, 1, 2, Route127_EventScript_1F6AA8, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 63, 63, 3, 1, 17, 0, 1, 3, Route127_EventScript_1F6AD6, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 12, 23, 3, 10, 17, 0, 1, 2, Route127_EventScript_1F6ABF, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 20, 3, 1, 0, 0, 0, 0, Route127_EventScript_29104C, 1155, 0, 0 Route127_MapBGEvents: @ 852C83C bg_event 59, 67, 0, 8, 0, ITEM_ENERGY_ROOT, 0, 0 @@ -19,5 +19,5 @@ Route127_MapBGEvents: @ 852C83C bg_event 45, 24, 0, 8, 0, ITEM_GLITTER_MAIL, 0, 0 Route127_MapEvents:: @ 852C878 - map_events Route127_MapObjects, 0x0, 0x0, Route127_MapBGEvents + map_events Route127_EventObjects, 0x0, 0x0, Route127_MapBGEvents diff --git a/data/maps/events/Route128.inc b/data/maps/events/Route128.inc index b48c8c4a24..e9efddf207 100644 --- a/data/maps/events/Route128.inc +++ b/data/maps/events/Route128.inc @@ -1,14 +1,14 @@ -Route128_MapObjects: @ 852C88C - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 35, 33, 1, 48, 85, 0, 1, 3, Route128_EventScript_1F6CBE, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 78, 24, 1, 28, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_STEVEN, 0, 0, 40, 22, 3, 8, 0, 0, 0, 0, 0x0, 834, 0, 0 - object_event 4, MAP_OBJ_GFX_ARCHIE, 0, 0, 37, 22, 3, 9, 17, 0, 0, 0, 0x0, 944, 0, 0 - object_event 5, MAP_OBJ_GFX_MAXIE, 0, 0, 38, 21, 3, 7, 17, 0, 0, 0, 0x0, 945, 0, 0 - object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 0, 63, 28, 3, 7, 17, 0, 1, 0, Route128_EventScript_1F6DB0, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_MAN_4, 0, 0, 47, 9, 3, 10, 17, 0, 1, 3, Route128_EventScript_1F6D99, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 0, 24, 8, 3, 17, 17, 0, 1, 3, Route128_EventScript_1F6D82, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 101, 29, 1, 25, 49, 0, 1, 4, Route128_EventScript_1F6DDE, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 101, 22, 1, 26, 49, 0, 1, 4, Route128_EventScript_1F6DC7, 0, 0, 0 +Route128_EventObjects: @ 852C88C + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 35, 33, 1, 48, 85, 0, 1, 3, Route128_EventScript_1F6CBE, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 78, 24, 1, 28, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 0, 40, 22, 3, 8, 0, 0, 0, 0, 0x0, 834, 0, 0 + object_event 4, EVENT_OBJ_GFX_ARCHIE, 0, 0, 37, 22, 3, 9, 17, 0, 0, 0, 0x0, 944, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAXIE, 0, 0, 38, 21, 3, 7, 17, 0, 0, 0, 0x0, 945, 0, 0 + object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 63, 28, 3, 7, 17, 0, 1, 0, Route128_EventScript_1F6DB0, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 0, 47, 9, 3, 10, 17, 0, 1, 3, Route128_EventScript_1F6D99, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 24, 8, 3, 17, 17, 0, 1, 3, Route128_EventScript_1F6D82, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 101, 29, 1, 25, 49, 0, 1, 4, Route128_EventScript_1F6DDE, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 101, 22, 1, 26, 49, 0, 1, 4, Route128_EventScript_1F6DC7, 0, 0, 0 Route128_MapBGEvents: @ 852C97C bg_event 49, 9, 3, 7, 0, ITEM_HEART_SCALE, 92, 0 @@ -16,5 +16,5 @@ Route128_MapBGEvents: @ 852C97C bg_event 31, 33, 3, 7, 0, ITEM_HEART_SCALE, 94, 0 Route128_MapEvents:: @ 852C9A0 - map_events Route128_MapObjects, 0x0, 0x0, Route128_MapBGEvents + map_events Route128_EventObjects, 0x0, 0x0, Route128_MapBGEvents diff --git a/data/maps/events/Route129.inc b/data/maps/events/Route129.inc index 38ac3513c3..297b9eeb25 100644 --- a/data/maps/events/Route129.inc +++ b/data/maps/events/Route129.inc @@ -1,10 +1,10 @@ -Route129_MapObjects: @ 852C9B4 - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 28, 16, 1, 50, 67, 0, 1, 3, Route129_EventScript_1F72EC, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 10, 14, 1, 52, 37, 0, 1, 2, Route129_EventScript_1F7303, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 13, 22, 1, 64, 17, 0, 1, 5, Route129_EventScript_1F7331, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 35, 9, 1, 24, 17, 0, 1, 2, Route129_EventScript_1F731A, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 13, 27, 1, 65, 17, 0, 1, 5, Route129_EventScript_1F7348, 0, 0, 0 +Route129_EventObjects: @ 852C9B4 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 28, 16, 1, 50, 67, 0, 1, 3, Route129_EventScript_1F72EC, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 10, 14, 1, 52, 37, 0, 1, 2, Route129_EventScript_1F7303, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 13, 22, 1, 64, 17, 0, 1, 5, Route129_EventScript_1F7331, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 35, 9, 1, 24, 17, 0, 1, 2, Route129_EventScript_1F731A, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 13, 27, 1, 65, 17, 0, 1, 5, Route129_EventScript_1F7348, 0, 0, 0 Route129_MapEvents:: @ 852CA2C - map_events Route129_MapObjects, 0x0, 0x0, 0x0 + map_events Route129_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route130.inc b/data/maps/events/Route130.inc index d5bd41cbd2..470fa9880d 100644 --- a/data/maps/events/Route130.inc +++ b/data/maps/events/Route130.inc @@ -1,9 +1,9 @@ -Route130_MapObjects: @ 852CA40 - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 70, 21, 1, 51, 99, 0, 1, 3, Route130_EventScript_1F73BF, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 7, 21, 1, 26, 65, 0, 1, 5, Route130_EventScript_1F73D6, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 52, 9, 3, 12, 0, 0, 0, 82, BerryTreeScript, 17, 0, 0 - object_event 4, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 7, 30, 1, 25, 65, 0, 1, 5, Route130_EventScript_1F73ED, 0, 0, 0 +Route130_EventObjects: @ 852CA40 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 70, 21, 1, 51, 99, 0, 1, 3, Route130_EventScript_1F73BF, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 7, 21, 1, 26, 65, 0, 1, 5, Route130_EventScript_1F73D6, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 52, 9, 3, 12, 0, 0, 0, 82, BerryTreeScript, 17, 0, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 7, 30, 1, 25, 65, 0, 1, 5, Route130_EventScript_1F73ED, 0, 0, 0 Route130_MapEvents:: @ 852CAA0 - map_events Route130_MapObjects, 0x0, 0x0, 0x0 + map_events Route130_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route131.inc b/data/maps/events/Route131.inc index 0f37a4c70e..b66f47867e 100644 --- a/data/maps/events/Route131.inc +++ b/data/maps/events/Route131.inc @@ -1,16 +1,16 @@ -Route131_MapObjects: @ 852CAB4 - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 41, 32, 1, 29, 117, 0, 1, 3, Route131_EventScript_1F7429, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 18, 19, 1, 22, 112, 0, 1, 4, Route131_EventScript_1F7440, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 10, 22, 1, 20, 6, 0, 1, 4, Route131_EventScript_1F7457, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 31, 25, 1, 47, 83, 0, 1, 3, Route131_EventScript_1F746E, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 9, 16, 1, 8, 17, 0, 1, 1, Route131_EventScript_1F7485, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 8, 16, 1, 8, 17, 0, 1, 1, Route131_EventScript_1F74A0, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 52, 20, 1, 26, 49, 0, 1, 5, Route131_EventScript_1F74D2, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 52, 27, 1, 25, 49, 0, 1, 5, Route131_EventScript_1F74BB, 0, 0, 0 +Route131_EventObjects: @ 852CAB4 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 41, 32, 1, 29, 117, 0, 1, 3, Route131_EventScript_1F7429, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 18, 19, 1, 22, 112, 0, 1, 4, Route131_EventScript_1F7440, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 10, 22, 1, 20, 6, 0, 1, 4, Route131_EventScript_1F7457, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 31, 25, 1, 47, 83, 0, 1, 3, Route131_EventScript_1F746E, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 9, 16, 1, 8, 17, 0, 1, 1, Route131_EventScript_1F7485, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 8, 16, 1, 8, 17, 0, 1, 1, Route131_EventScript_1F74A0, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 52, 20, 1, 26, 49, 0, 1, 5, Route131_EventScript_1F74D2, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 52, 27, 1, 25, 49, 0, 1, 5, Route131_EventScript_1F74BB, 0, 0, 0 Route131_MapWarps: @ 852CB74 warp_def 36, 6, 3, 0, SKY_PILLAR_ENTRANCE Route131_MapEvents:: @ 852CB7C - map_events Route131_MapObjects, Route131_MapWarps, 0x0, 0x0 + map_events Route131_EventObjects, Route131_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route132.inc b/data/maps/events/Route132.inc index 3e1287b7d9..825c6fc65f 100644 --- a/data/maps/events/Route132.inc +++ b/data/maps/events/Route132.inc @@ -1,15 +1,15 @@ -Route132_MapObjects: @ 852CB90 - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 40, 13, 1, 46, 51, 0, 1, 2, Route132_EventScript_1F74EA, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 10, 6, 1, 45, 51, 0, 1, 2, Route132_EventScript_1F7501, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 10, 11, 3, 1, 0, 0, 0, 0, Route132_EventScript_291059, 1036, 0, 0 - object_event 4, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 9, 15, 3, 8, 0, 0, 1, 4, Route132_EventScript_1F752F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_FISHERMAN, 0, 0, 49, 28, 3, 10, 0, 0, 1, 1, Route132_EventScript_1F7518, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 33, 26, 3, 8, 17, 0, 1, 4, Route132_EventScript_1F7546, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_WOMAN_7, 0, 0, 33, 31, 3, 25, 65, 0, 1, 4, Route132_EventScript_1F755D, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 21, 30, 3, 7, 17, 0, 1, 4, Route132_EventScript_1F758B, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_MAN_4, 0, 0, 21, 25, 3, 26, 65, 0, 1, 4, Route132_EventScript_1F7574, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 20, 27, 3, 1, 17, 0, 0, 0, Route132_EventScript_291066, 1156, 0, 0 +Route132_EventObjects: @ 852CB90 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 40, 13, 1, 46, 51, 0, 1, 2, Route132_EventScript_1F74EA, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 10, 6, 1, 45, 51, 0, 1, 2, Route132_EventScript_1F7501, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 11, 3, 1, 0, 0, 0, 0, Route132_EventScript_291059, 1036, 0, 0 + object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 9, 15, 3, 8, 0, 0, 1, 4, Route132_EventScript_1F752F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 49, 28, 3, 10, 0, 0, 1, 1, Route132_EventScript_1F7518, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 33, 26, 3, 8, 17, 0, 1, 4, Route132_EventScript_1F7546, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 33, 31, 3, 25, 65, 0, 1, 4, Route132_EventScript_1F755D, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 21, 30, 3, 7, 17, 0, 1, 4, Route132_EventScript_1F758B, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 0, 21, 25, 3, 26, 65, 0, 1, 4, Route132_EventScript_1F7574, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 20, 27, 3, 1, 17, 0, 0, 0, Route132_EventScript_291066, 1156, 0, 0 Route132_MapEvents:: @ 852CC80 - map_events Route132_MapObjects, 0x0, 0x0, 0x0 + map_events Route132_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route133.inc b/data/maps/events/Route133.inc index c6cb4ac3bb..6249ca026d 100644 --- a/data/maps/events/Route133.inc +++ b/data/maps/events/Route133.inc @@ -1,15 +1,15 @@ -Route133_MapObjects: @ 852CC94 - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 68, 27, 1, 25, 32, 0, 1, 3, Route133_EventScript_1F75A3, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 13, 3, 1, 8, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 68, 28, 1, 26, 32, 0, 1, 3, Route133_EventScript_1F75BA, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 53, 12, 3, 1, 0, 0, 0, 0, Route133_EventScript_291073, 1037, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route133_EventScript_291080, 1038, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_6, 0, 0, 7, 14, 3, 18, 17, 0, 1, 2, Route133_EventScript_1F75FF, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_MAN_4, 0, 0, 37, 15, 3, 18, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 56, 11, 3, 8, 17, 0, 1, 3, Route133_EventScript_1F7616, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 56, 15, 3, 16, 17, 0, 1, 3, Route133_EventScript_1F762D, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 48, 28, 3, 1, 17, 0, 0, 0, Route133_EventScript_29108D, 1157, 0, 0 +Route133_EventObjects: @ 852CC94 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 68, 27, 1, 25, 32, 0, 1, 3, Route133_EventScript_1F75A3, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 13, 3, 1, 8, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 68, 28, 1, 26, 32, 0, 1, 3, Route133_EventScript_1F75BA, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 53, 12, 3, 1, 0, 0, 0, 0, Route133_EventScript_291073, 1037, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route133_EventScript_291080, 1038, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_6, 0, 0, 7, 14, 3, 18, 17, 0, 1, 2, Route133_EventScript_1F75FF, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 0, 37, 15, 3, 18, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 56, 11, 3, 8, 17, 0, 1, 3, Route133_EventScript_1F7616, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 56, 15, 3, 16, 17, 0, 1, 3, Route133_EventScript_1F762D, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 48, 28, 3, 1, 17, 0, 0, 0, Route133_EventScript_29108D, 1157, 0, 0 Route133_MapEvents:: @ 852CD84 - map_events Route133_MapObjects, 0x0, 0x0, 0x0 + map_events Route133_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route134.inc b/data/maps/events/Route134.inc index 6905f533f7..6beb27ba5d 100644 --- a/data/maps/events/Route134.inc +++ b/data/maps/events/Route134.inc @@ -1,16 +1,16 @@ -Route134_MapObjects: @ 852CD98 - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 49, 9, 1, 49, 83, 0, 1, 2, Route134_EventScript_1F7653, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 58, 7, 1, 1, 0, 0, 1, 3, Route134_EventScript_1F766A, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 41, 23, 3, 10, 0, 0, 1, 2, Route134_EventScript_1F7698, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_6, 0, 0, 24, 23, 3, 26, 48, 0, 1, 6, Route134_EventScript_1F7681, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 49, 16, 3, 27, 6, 0, 1, 5, Route134_EventScript_1F76AF, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_WOMAN_7, 0, 0, 43, 23, 1, 9, 17, 0, 1, 2, Route134_EventScript_1F76F4, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_SAILOR, 0, 0, 24, 30, 3, 25, 48, 0, 1, 6, Route134_EventScript_1F770B, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_GIRL_3, 0, 0, 50, 16, 3, 28, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_SAILOR, 0, 0, 63, 14, 3, 18, 17, 0, 1, 3, Route134_EventScript_1F76C6, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 50, 17, 3, 1, 17, 0, 0, 0, Route134_EventScript_29109A, 1158, 0, 0 - object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 22, 27, 3, 1, 17, 0, 0, 0, Route134_EventScript_2910A7, 1159, 0, 0 +Route134_EventObjects: @ 852CD98 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 49, 9, 1, 49, 83, 0, 1, 2, Route134_EventScript_1F7653, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 58, 7, 1, 1, 0, 0, 1, 3, Route134_EventScript_1F766A, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 41, 23, 3, 10, 0, 0, 1, 2, Route134_EventScript_1F7698, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 0, 24, 23, 3, 26, 48, 0, 1, 6, Route134_EventScript_1F7681, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 49, 16, 3, 27, 6, 0, 1, 5, Route134_EventScript_1F76AF, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 43, 23, 1, 9, 17, 0, 1, 2, Route134_EventScript_1F76F4, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 0, 24, 30, 3, 25, 48, 0, 1, 6, Route134_EventScript_1F770B, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 0, 50, 16, 3, 28, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 0, 63, 14, 3, 18, 17, 0, 1, 3, Route134_EventScript_1F76C6, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 50, 17, 3, 1, 17, 0, 0, 0, Route134_EventScript_29109A, 1158, 0, 0 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 22, 27, 3, 1, 17, 0, 0, 0, Route134_EventScript_2910A7, 1159, 0, 0 Route134_MapEvents:: @ 852CEA0 - map_events Route134_MapObjects, 0x0, 0x0, 0x0 + map_events Route134_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity.inc b/data/maps/events/RustboroCity.inc index 26a0c1a11b..3efb9fac7c 100644 --- a/data/maps/events/RustboroCity.inc +++ b/data/maps/events/RustboroCity.inc @@ -1,20 +1,20 @@ -RustboroCity_MapObjects: @ 85267E0 - object_event 1, MAP_OBJ_GFX_WOMAN_7, 0, 0, 22, 34, 3, 3, 16, 0, 0, 0, RustboroCity_EventScript_1E088A, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 19, 13, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E085F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 25, 37, 3, 7, 0, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 21, 46, 3, 3, 16, 0, 0, 0, RustboroCity_EventScript_1E08D1, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BOY_2, 0, 0, 12, 45, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_1E08B2, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_4, 0, 0, 26, 23, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E0893, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 24, 51, 3, 10, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 25, 51, 3, 9, 0, 0, 0, 0, RustboroCity_EventScript_1E0938, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_MAN_2, 0, 0, 30, 10, 3, 10, 17, 0, 0, 0, RustboroCity_EventScript_1E0ADD, 732, 0, 0 - object_event 10, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 21, 3, 10, 0, 0, 0, 0, 0x0, 731, 0, 0 - object_event 11, MAP_OBJ_GFX_MAN_7, 0, 0, 13, 34, 3, 2, 17, 0, 0, 0, RustboroCity_EventScript_1E087E, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 36, 51, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, 1041, 0, 0 - object_event 13, MAP_OBJ_GFX_MAN_5, 0, 0, 19, 27, 3, 8, 16, 0, 0, 0, RustboroCity_EventScript_1E094E, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_HIPSTER, 0, 0, 16, 50, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E0DB8, 814, 0, 0 - object_event 15, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 11, 15, 0, 1, 17, 0, 0, 0, 0x0, 844, 0, 0 - object_event 16, MAP_OBJ_GFX_BOY_1, 0, 0, 31, 36, 3, 1, 16, 0, 0, 0, RustboroCity_EventScript_1E1236, 0, 0, 0 +RustboroCity_EventObjects: @ 85267E0 + object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 22, 34, 3, 3, 16, 0, 0, 0, RustboroCity_EventScript_1E088A, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 19, 13, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E085F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 25, 37, 3, 7, 0, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 21, 46, 3, 3, 16, 0, 0, 0, RustboroCity_EventScript_1E08D1, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BOY_2, 0, 0, 12, 45, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_1E08B2, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 0, 26, 23, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E0893, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 24, 51, 3, 10, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 25, 51, 3, 9, 0, 0, 0, 0, RustboroCity_EventScript_1E0938, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 30, 10, 3, 10, 17, 0, 0, 0, RustboroCity_EventScript_1E0ADD, 732, 0, 0 + object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 21, 3, 10, 0, 0, 0, 0, 0x0, 731, 0, 0 + object_event 11, EVENT_OBJ_GFX_MAN_7, 0, 0, 13, 34, 3, 2, 17, 0, 0, 0, RustboroCity_EventScript_1E087E, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 36, 51, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, 1041, 0, 0 + object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 0, 19, 27, 3, 8, 16, 0, 0, 0, RustboroCity_EventScript_1E094E, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_HIPSTER, 0, 0, 16, 50, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E0DB8, 814, 0, 0 + object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 11, 15, 0, 1, 17, 0, 0, 0, 0x0, 844, 0, 0 + object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 0, 31, 36, 3, 1, 16, 0, 0, 0, RustboroCity_EventScript_1E1236, 0, 0, 0 RustboroCity_MapWarps: @ 8526960 warp_def 27, 19, 0, 0, RUSTBORO_CITY_GYM @@ -66,5 +66,5 @@ RustboroCity_MapBGEvents: @ 8526B10 bg_event 12, 38, 3, 0, 0, RustboroCity_EventScript_1E0919 RustboroCity_MapEvents:: @ 8526B88 - map_events RustboroCity_MapObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents + map_events RustboroCity_EventObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents diff --git a/data/maps/events/RustboroCity_CuttersHouse.inc b/data/maps/events/RustboroCity_CuttersHouse.inc index 1e779cb1ec..bbed604789 100644 --- a/data/maps/events/RustboroCity_CuttersHouse.inc +++ b/data/maps/events/RustboroCity_CuttersHouse.inc @@ -1,11 +1,11 @@ -RustboroCity_CuttersHouse_MapObjects: @ 8530A1C - object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 7, 5, 3, 10, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215BD4, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LASS, 0, 0, 9, 2, 3, 5, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215C0A, 0, 0, 0 +RustboroCity_CuttersHouse_EventObjects: @ 8530A1C + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 7, 5, 3, 10, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215BD4, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LASS, 0, 0, 9, 2, 3, 5, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215C0A, 0, 0, 0 RustboroCity_CuttersHouse_MapWarps: @ 8530A4C warp_def 5, 8, 0, 8, RUSTBORO_CITY warp_def 6, 8, 0, 8, RUSTBORO_CITY RustboroCity_CuttersHouse_MapEvents:: @ 8530A5C - map_events RustboroCity_CuttersHouse_MapObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0 + map_events RustboroCity_CuttersHouse_EventObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_DevonCorp_1F.inc b/data/maps/events/RustboroCity_DevonCorp_1F.inc index 5a92ba2fce..034c44aa33 100644 --- a/data/maps/events/RustboroCity_DevonCorp_1F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_1F.inc @@ -1,7 +1,7 @@ -RustboroCity_DevonCorp_1F_MapObjects: @ 853037C - object_event 1, MAP_OBJ_GFX_MAN_7, 0, 0, 2, 6, 3, 2, 17, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211261, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_7, 0, 0, 15, 5, 3, 2, 18, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211293, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 0, 5, 3, 3, 8, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0, 0, 0 +RustboroCity_DevonCorp_1F_EventObjects: @ 853037C + object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 0, 2, 6, 3, 2, 17, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211261, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_7, 0, 0, 15, 5, 3, 2, 18, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211293, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 5, 3, 3, 8, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0, 0, 0 RustboroCity_DevonCorp_1F_MapWarps: @ 85303C4 warp_def 5, 8, 0, 5, RUSTBORO_CITY @@ -13,5 +13,5 @@ RustboroCity_DevonCorp_1F_MapBGEvents: @ 85303DC bg_event 8, 2, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211309 RustboroCity_DevonCorp_1F_MapEvents:: @ 85303F4 - map_events RustboroCity_DevonCorp_1F_MapObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, RustboroCity_DevonCorp_1F_MapBGEvents + map_events RustboroCity_DevonCorp_1F_EventObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, RustboroCity_DevonCorp_1F_MapBGEvents diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.inc b/data/maps/events/RustboroCity_DevonCorp_2F.inc index a84456e44e..f19ab8110b 100644 --- a/data/maps/events/RustboroCity_DevonCorp_2F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_2F.inc @@ -1,15 +1,15 @@ -RustboroCity_DevonCorp_2F_MapObjects: @ 8530408 - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 5, 3, 7, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_21186F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211886, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 2, 6, 3, 15, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118B0, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 5, 3, 7, 160, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118DA, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 8, 3, 7, 17, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118F1, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 5, 3, 7, 17, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211BCF, 0, 0, 0 +RustboroCity_DevonCorp_2F_EventObjects: @ 8530408 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 5, 3, 7, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_21186F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211886, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 2, 6, 3, 15, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118B0, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 5, 3, 7, 160, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118DA, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 8, 3, 7, 17, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118F1, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 5, 3, 7, 17, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211BCF, 0, 0, 0 RustboroCity_DevonCorp_2F_MapWarps: @ 8530498 warp_def 14, 1, 0, 2, RUSTBORO_CITY_DEVON_CORP_1F warp_def 2, 1, 0, 0, RUSTBORO_CITY_DEVON_CORP_3F RustboroCity_DevonCorp_2F_MapEvents:: @ 85304A8 - map_events RustboroCity_DevonCorp_2F_MapObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0 + map_events RustboroCity_DevonCorp_2F_EventObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.inc b/data/maps/events/RustboroCity_DevonCorp_3F.inc index ec2d227076..8422ef37ab 100644 --- a/data/maps/events/RustboroCity_DevonCorp_3F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_3F.inc @@ -1,7 +1,7 @@ -RustboroCity_DevonCorp_3F_MapObjects: @ 85304BC - object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 17, 5, 3, 9, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_2, 0, 0, 3, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, 949, 0, 0 - object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 15, 5, 3, 76, 17, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0, 0, 0 +RustboroCity_DevonCorp_3F_EventObjects: @ 85304BC + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 17, 5, 3, 9, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 0, 3, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, 949, 0, 0 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 15, 5, 3, 76, 17, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0, 0, 0 RustboroCity_DevonCorp_3F_MapWarps: @ 8530504 warp_def 2, 1, 0, 1, RUSTBORO_CITY_DEVON_CORP_2F @@ -11,5 +11,5 @@ RustboroCity_DevonCorp_3F_MapBGEvents: @ 853050C bg_event 1, 7, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_212600 RustboroCity_DevonCorp_3F_MapEvents:: @ 8530524 - map_events RustboroCity_DevonCorp_3F_MapObjects, RustboroCity_DevonCorp_3F_MapWarps, 0x0, RustboroCity_DevonCorp_3F_MapBGEvents + map_events RustboroCity_DevonCorp_3F_EventObjects, RustboroCity_DevonCorp_3F_MapWarps, 0x0, RustboroCity_DevonCorp_3F_MapBGEvents diff --git a/data/maps/events/RustboroCity_Flat1_1F.inc b/data/maps/events/RustboroCity_Flat1_1F.inc index 93185e0fdf..66786ea5b6 100644 --- a/data/maps/events/RustboroCity_Flat1_1F.inc +++ b/data/maps/events/RustboroCity_Flat1_1F.inc @@ -1,6 +1,6 @@ -RustboroCity_Flat1_1F_MapObjects: @ 8530890 - object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150CE, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 12, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0, 0, 0 +RustboroCity_Flat1_1F_EventObjects: @ 8530890 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150CE, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 12, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0, 0, 0 RustboroCity_Flat1_1F_MapWarps: @ 85308C0 warp_def 6, 7, 0, 1, RUSTBORO_CITY @@ -8,5 +8,5 @@ RustboroCity_Flat1_1F_MapWarps: @ 85308C0 warp_def 2, 1, 0, 0, RUSTBORO_CITY_FLAT_1_2F RustboroCity_Flat1_1F_MapEvents:: @ 85308D8 - map_events RustboroCity_Flat1_1F_MapObjects, RustboroCity_Flat1_1F_MapWarps, 0x0, 0x0 + map_events RustboroCity_Flat1_1F_EventObjects, RustboroCity_Flat1_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat1_2F.inc b/data/maps/events/RustboroCity_Flat1_2F.inc index 0fa012edac..e56741b496 100644 --- a/data/maps/events/RustboroCity_Flat1_2F.inc +++ b/data/maps/events/RustboroCity_Flat1_2F.inc @@ -1,16 +1,16 @@ -RustboroCity_Flat1_2F_MapObjects: @ 85308EC - object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 4, 6, 3, 5, 19, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_21523D, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 9, 5, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SKITTY_DOLL, 0, 0, 9, 4, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_TREECKO_DOLL, 0, 0, 10, 5, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_TORCHIC_DOLL, 0, 0, 10, 6, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_1, 0, 0, 8, 5, 3, 10, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_21513A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_MUDKIP_DOLL, 0, 0, 8, 6, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_PIKACHU_DOLL, 0, 0, 9, 7, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0 +RustboroCity_Flat1_2F_EventObjects: @ 85308EC + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 6, 3, 5, 19, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_21523D, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 9, 5, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SKITTY_DOLL, 0, 0, 9, 4, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_TREECKO_DOLL, 0, 0, 10, 5, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_TORCHIC_DOLL, 0, 0, 10, 6, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 0, 8, 5, 3, 10, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_21513A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_MUDKIP_DOLL, 0, 0, 8, 6, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_PIKACHU_DOLL, 0, 0, 9, 7, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0 RustboroCity_Flat1_2F_MapWarps: @ 85309AC warp_def 2, 1, 0, 2, RUSTBORO_CITY_FLAT_1_1F RustboroCity_Flat1_2F_MapEvents:: @ 85309B4 - map_events RustboroCity_Flat1_2F_MapObjects, RustboroCity_Flat1_2F_MapWarps, 0x0, 0x0 + map_events RustboroCity_Flat1_2F_EventObjects, RustboroCity_Flat1_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat2_1F.inc b/data/maps/events/RustboroCity_Flat2_1F.inc index 937d1afb9e..f31acb8b63 100644 --- a/data/maps/events/RustboroCity_Flat2_1F.inc +++ b/data/maps/events/RustboroCity_Flat2_1F.inc @@ -1,6 +1,6 @@ -RustboroCity_Flat2_1F_MapObjects: @ 8530AC4 - object_event 1, MAP_OBJ_GFX_SKITTY, 0, 0, 11, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F80, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 8, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0, 0, 0 +RustboroCity_Flat2_1F_EventObjects: @ 8530AC4 + object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 0, 11, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F80, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 8, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0, 0, 0 RustboroCity_Flat2_1F_MapWarps: @ 8530AF4 warp_def 2, 8, 0, 10, RUSTBORO_CITY @@ -8,5 +8,5 @@ RustboroCity_Flat2_1F_MapWarps: @ 8530AF4 warp_def 3, 1, 0, 0, RUSTBORO_CITY_FLAT_2_2F RustboroCity_Flat2_1F_MapEvents:: @ 8530B0C - map_events RustboroCity_Flat2_1F_MapObjects, RustboroCity_Flat2_1F_MapWarps, 0x0, 0x0 + map_events RustboroCity_Flat2_1F_EventObjects, RustboroCity_Flat2_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat2_2F.inc b/data/maps/events/RustboroCity_Flat2_2F.inc index 2ea886e544..3bed978e84 100644 --- a/data/maps/events/RustboroCity_Flat2_2F.inc +++ b/data/maps/events/RustboroCity_Flat2_2F.inc @@ -1,11 +1,11 @@ -RustboroCity_Flat2_2F_MapObjects: @ 8530B20 - object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 11, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FD8, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FE1, 0, 0, 0 +RustboroCity_Flat2_2F_EventObjects: @ 8530B20 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 11, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FD8, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FE1, 0, 0, 0 RustboroCity_Flat2_2F_MapWarps: @ 8530B50 warp_def 3, 1, 0, 2, RUSTBORO_CITY_FLAT_2_1F warp_def 1, 1, 0, 0, RUSTBORO_CITY_FLAT_2_3F RustboroCity_Flat2_2F_MapEvents:: @ 8530B60 - map_events RustboroCity_Flat2_2F_MapObjects, RustboroCity_Flat2_2F_MapWarps, 0x0, 0x0 + map_events RustboroCity_Flat2_2F_EventObjects, RustboroCity_Flat2_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat2_3F.inc b/data/maps/events/RustboroCity_Flat2_3F.inc index 44c5bc37ac..16f9aa3ea4 100644 --- a/data/maps/events/RustboroCity_Flat2_3F.inc +++ b/data/maps/events/RustboroCity_Flat2_3F.inc @@ -1,10 +1,10 @@ -RustboroCity_Flat2_3F_MapObjects: @ 8530B74 - object_event 1, MAP_OBJ_GFX_MAN_7, 0, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216117, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_1, 0, 0, 12, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216120, 0, 0, 0 +RustboroCity_Flat2_3F_EventObjects: @ 8530B74 + object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216117, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 12, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216120, 0, 0, 0 RustboroCity_Flat2_3F_MapWarps: @ 8530BA4 warp_def 1, 1, 0, 1, RUSTBORO_CITY_FLAT_2_2F RustboroCity_Flat2_3F_MapEvents:: @ 8530BAC - map_events RustboroCity_Flat2_3F_MapObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0 + map_events RustboroCity_Flat2_3F_EventObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Gym.inc b/data/maps/events/RustboroCity_Gym.inc index dc395c0648..d17c42d673 100644 --- a/data/maps/events/RustboroCity_Gym.inc +++ b/data/maps/events/RustboroCity_Gym.inc @@ -1,9 +1,9 @@ -RustboroCity_Gym_MapObjects: @ 8530538 - object_event 1, MAP_OBJ_GFX_ROXANNE, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_212F31, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 5, 13, 3, 8, 0, 0, 1, 2, RustboroCity_Gym_EventScript_212FE3, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 3, 9, 3, 9, 0, 0, 1, 3, RustboroCity_Gym_EventScript_212FFA, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_2, 0, 0, 3, 18, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_213028, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_HIKER, 0, 0, 1, 6, 3, 8, 17, 0, 1, 3, RustboroCity_Gym_EventScript_213011, 0, 0, 0 +RustboroCity_Gym_EventObjects: @ 8530538 + object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_212F31, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 5, 13, 3, 8, 0, 0, 1, 2, RustboroCity_Gym_EventScript_212FE3, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 3, 9, 3, 9, 0, 0, 1, 3, RustboroCity_Gym_EventScript_212FFA, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 0, 3, 18, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_213028, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_HIKER, 0, 0, 1, 6, 3, 8, 17, 0, 1, 3, RustboroCity_Gym_EventScript_213011, 0, 0, 0 RustboroCity_Gym_MapWarps: @ 85305B0 warp_def 5, 19, 0, 0, RUSTBORO_CITY @@ -14,5 +14,5 @@ RustboroCity_Gym_MapBGEvents: @ 85305C0 bg_event 8, 18, 0, 1, 0, RustboroCity_Gym_EventScript_213057 RustboroCity_Gym_MapEvents:: @ 85305D8 - map_events RustboroCity_Gym_MapObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents + map_events RustboroCity_Gym_EventObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents diff --git a/data/maps/events/RustboroCity_House1.inc b/data/maps/events/RustboroCity_House1.inc index eee616f8a4..d07456dc97 100644 --- a/data/maps/events/RustboroCity_House1.inc +++ b/data/maps/events/RustboroCity_House1.inc @@ -1,11 +1,11 @@ -RustboroCity_House1_MapObjects: @ 85309C8 - object_event 1, MAP_OBJ_GFX_CAMPER, 0, 0, 6, 4, 3, 9, 0, 0, 0, 0, RustboroCity_House1_EventScript_21593F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_HIKER, 0, 0, 9, 2, 3, 8, 0, 0, 0, 0, RustboroCity_House1_EventScript_2159DF, 0, 0, 0 +RustboroCity_House1_EventObjects: @ 85309C8 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 0, 6, 4, 3, 9, 0, 0, 0, 0, RustboroCity_House1_EventScript_21593F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 9, 2, 3, 8, 0, 0, 0, 0, RustboroCity_House1_EventScript_2159DF, 0, 0, 0 RustboroCity_House1_MapWarps: @ 85309F8 warp_def 5, 7, 0, 7, RUSTBORO_CITY warp_def 6, 7, 0, 7, RUSTBORO_CITY RustboroCity_House1_MapEvents:: @ 8530A08 - map_events RustboroCity_House1_MapObjects, RustboroCity_House1_MapWarps, 0x0, 0x0 + map_events RustboroCity_House1_EventObjects, RustboroCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_House2.inc b/data/maps/events/RustboroCity_House2.inc index b4a00970f2..5d45c64d01 100644 --- a/data/maps/events/RustboroCity_House2.inc +++ b/data/maps/events/RustboroCity_House2.inc @@ -1,11 +1,11 @@ -RustboroCity_House2_MapObjects: @ 8530A70 - object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EB4, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0, 0, 0 +RustboroCity_House2_EventObjects: @ 8530A70 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EB4, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0, 0, 0 RustboroCity_House2_MapWarps: @ 8530AA0 warp_def 5, 8, 0, 9, RUSTBORO_CITY warp_def 6, 8, 0, 9, RUSTBORO_CITY RustboroCity_House2_MapEvents:: @ 8530AB0 - map_events RustboroCity_House2_MapObjects, RustboroCity_House2_MapWarps, 0x0, 0x0 + map_events RustboroCity_House2_EventObjects, RustboroCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_House3.inc b/data/maps/events/RustboroCity_House3.inc index 09cf245e06..61a528cdc7 100644 --- a/data/maps/events/RustboroCity_House3.inc +++ b/data/maps/events/RustboroCity_House3.inc @@ -1,12 +1,12 @@ -RustboroCity_House3_MapObjects: @ 8530BC0 - object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, RustboroCity_House3_EventScript_216191, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, RustboroCity_House3_EventScript_21619A, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_PIKACHU, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House3_EventScript_2161A3, 0, 0, 0 +RustboroCity_House3_EventObjects: @ 8530BC0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, RustboroCity_House3_EventScript_216191, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, RustboroCity_House3_EventScript_21619A, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House3_EventScript_2161A3, 0, 0, 0 RustboroCity_House3_MapWarps: @ 8530C08 warp_def 5, 8, 0, 11, RUSTBORO_CITY warp_def 6, 8, 0, 11, RUSTBORO_CITY RustboroCity_House3_MapEvents:: @ 8530C18 - map_events RustboroCity_House3_MapObjects, RustboroCity_House3_MapWarps, 0x0, 0x0 + map_events RustboroCity_House3_EventObjects, RustboroCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Mart.inc b/data/maps/events/RustboroCity_Mart.inc index 28b614d478..e177ee10a6 100644 --- a/data/maps/events/RustboroCity_Mart.inc +++ b/data/maps/events/RustboroCity_Mart.inc @@ -1,13 +1,13 @@ -RustboroCity_Mart_MapObjects: @ 853080C - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F06, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_1, 0, 0, 2, 5, 3, 7, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F7D, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 8, 4, 3, 3, 16, 0, 0, 0, RustboroCity_Mart_EventScript_214F74, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 8, 2, 3, 7, 17, 0, 0, 0, RustboroCity_Mart_EventScript_214F86, 0, 0, 0 +RustboroCity_Mart_EventObjects: @ 853080C + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F06, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 0, 2, 5, 3, 7, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F7D, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 8, 4, 3, 3, 16, 0, 0, 0, RustboroCity_Mart_EventScript_214F74, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 8, 2, 3, 7, 17, 0, 0, 0, RustboroCity_Mart_EventScript_214F86, 0, 0, 0 RustboroCity_Mart_MapWarps: @ 853086C warp_def 3, 7, 0, 2, RUSTBORO_CITY warp_def 4, 7, 0, 2, RUSTBORO_CITY RustboroCity_Mart_MapEvents:: @ 853087C - map_events RustboroCity_Mart_MapObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0 + map_events RustboroCity_Mart_EventObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_PokemonCenter_1F.inc b/data/maps/events/RustboroCity_PokemonCenter_1F.inc index 9c44870ad7..56dd4ef839 100644 --- a/data/maps/events/RustboroCity_PokemonCenter_1F.inc +++ b/data/maps/events/RustboroCity_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ -RustboroCity_PokemonCenter_1F_MapObjects: @ 85306F4 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D76, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 11, 2, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D84, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D8D, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D96, 0, 0, 0 +RustboroCity_PokemonCenter_1F_EventObjects: @ 85306F4 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D76, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 11, 2, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D84, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D8D, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D96, 0, 0, 0 RustboroCity_PokemonCenter_1F_MapWarps: @ 8530754 warp_def 7, 8, 3, 3, RUSTBORO_CITY @@ -10,5 +10,5 @@ RustboroCity_PokemonCenter_1F_MapWarps: @ 8530754 warp_def 1, 6, 4, 0, RUSTBORO_CITY_POKEMON_CENTER_2F RustboroCity_PokemonCenter_1F_MapEvents:: @ 853076C - map_events RustboroCity_PokemonCenter_1F_MapObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events RustboroCity_PokemonCenter_1F_EventObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_PokemonCenter_2F.inc b/data/maps/events/RustboroCity_PokemonCenter_2F.inc index 71defda3d4..f9e00e26c2 100644 --- a/data/maps/events/RustboroCity_PokemonCenter_2F.inc +++ b/data/maps/events/RustboroCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -RustboroCity_PokemonCenter_2F_MapObjects: @ 8530780 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +RustboroCity_PokemonCenter_2F_EventObjects: @ 8530780 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 RustboroCity_PokemonCenter_2F_MapWarps: @ 85307E0 warp_def 1, 6, 4, 2, RUSTBORO_CITY_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ RustboroCity_PokemonCenter_2F_MapWarps: @ 85307E0 warp_def 9, 1, 3, 0, TRADE_CENTER RustboroCity_PokemonCenter_2F_MapEvents:: @ 85307F8 - map_events RustboroCity_PokemonCenter_2F_MapObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events RustboroCity_PokemonCenter_2F_EventObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_PokemonSchool.inc b/data/maps/events/RustboroCity_PokemonSchool.inc index 3facee89a1..ac0160e7b7 100644 --- a/data/maps/events/RustboroCity_PokemonSchool.inc +++ b/data/maps/events/RustboroCity_PokemonSchool.inc @@ -1,11 +1,11 @@ -RustboroCity_PokemonSchool_MapObjects: @ 85305EC - object_event 1, MAP_OBJ_GFX_BOY_5, 0, 0, 8, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_5, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 3, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F71, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LASS, 0, 0, 10, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F7A, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 3, 6, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F83, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 5, 3, 3, 8, 17, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_SCOTT, 0, 0, 0, 10, 0, 7, 17, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, 999, 0, 0 +RustboroCity_PokemonSchool_EventObjects: @ 85305EC + object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 0, 8, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BOY_5, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 0, 3, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F71, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 0, 10, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F7A, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 3, 6, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F83, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 5, 3, 3, 8, 17, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 0, 10, 0, 7, 17, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, 999, 0, 0 RustboroCity_PokemonSchool_MapWarps: @ 8530694 warp_def 5, 10, 0, 4, RUSTBORO_CITY @@ -19,5 +19,5 @@ RustboroCity_PokemonSchool_MapBGEvents: @ 85306A4 bg_event 3, 5, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F8C RustboroCity_PokemonSchool_MapEvents:: @ 85306E0 - map_events RustboroCity_PokemonSchool_MapObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents + map_events RustboroCity_PokemonSchool_EventObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc index 94846323a4..5c2a214b95 100644 --- a/data/maps/events/RusturfTunnel.inc +++ b/data/maps/events/RusturfTunnel.inc @@ -1,14 +1,14 @@ -RusturfTunnel_MapObjects: @ 85341C4 - object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 23, 5, 3, 10, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, 807, 0, 0 - object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 24, 5, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 931, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 1, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, 1048, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 30, 2, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, 1049, 0, 0 - object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, 0x0, 879, 0, 0 - object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 5, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, 878, 0, 0 - object_event 7, MAP_OBJ_GFX_WINGULL, 0, 0, 14, 4, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, 880, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 24, 4, 3, 8, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 932, 0, 0 - object_event 9, MAP_OBJ_GFX_HIKER, 0, 0, 32, 13, 3, 9, 17, 0, 1, 3, RusturfTunnel_EventScript_22D1B1, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_WOMAN_3, 0, 0, 25, 4, 3, 9, 17, 0, 0, 0, RusturfTunnel_EventScript_22CE5F, 983, 0, 0 +RusturfTunnel_EventObjects: @ 85341C4 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 23, 5, 3, 10, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, 807, 0, 0 + object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 24, 5, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 931, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 1, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, 1048, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 30, 2, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, 1049, 0, 0 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, 0x0, 879, 0, 0 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 5, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, 878, 0, 0 + object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 0, 14, 4, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, 880, 0, 0 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 24, 4, 3, 8, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 932, 0, 0 + object_event 9, EVENT_OBJ_GFX_HIKER, 0, 0, 32, 13, 3, 9, 17, 0, 1, 3, RusturfTunnel_EventScript_22D1B1, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 25, 4, 3, 9, 17, 0, 0, 0, RusturfTunnel_EventScript_22CE5F, 983, 0, 0 RusturfTunnel_MapWarps: @ 85342B4 warp_def 4, 10, 3, 0, ROUTE_116 @@ -23,5 +23,5 @@ RusturfTunnel_MapCoordEvents: @ 85342CC coord_event 25, 5, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_22D07D RusturfTunnel_MapEvents:: @ 853431C - map_events RusturfTunnel_MapObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0 + map_events RusturfTunnel_EventObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0 diff --git a/data/maps/events/SSTidalCorridor.inc b/data/maps/events/SSTidalCorridor.inc index 5d6d732885..1816412d64 100644 --- a/data/maps/events/SSTidalCorridor.inc +++ b/data/maps/events/SSTidalCorridor.inc @@ -1,9 +1,9 @@ -SSTidalCorridor_MapObjects: @ 853A158 - object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 1, 11, 3, 7, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 16, 7, 3, 3, 32, 0, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 2, 3, 8, 17, 0, 0, 0, SSTidalCorridor_EventScript_23C0D9, 950, 0, 0 - object_event 4, MAP_OBJ_GFX_WINGULL, 0, 0, 7, 2, 3, 1, 17, 0, 0, 0, SSTidalCorridor_EventScript_23C0E2, 950, 0, 0 - object_event 5, MAP_OBJ_GFX_SCOTT, 0, 0, 9, 10, 3, 9, 0, 0, 0, 0, 0x0, 810, 0, 0 +SSTidalCorridor_EventObjects: @ 853A158 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 1, 11, 3, 7, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 16, 7, 3, 3, 32, 0, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 2, 3, 8, 17, 0, 0, 0, SSTidalCorridor_EventScript_23C0D9, 950, 0, 0 + object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 0, 7, 2, 3, 1, 17, 0, 0, 0, SSTidalCorridor_EventScript_23C0E2, 950, 0, 0 + object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 9, 10, 3, 9, 0, 0, 0, 0, 0x0, 810, 0, 0 SSTidalCorridor_MapWarps: @ 853A1D0 warp_def 4, 9, 3, 0, SS_TIDAL_ROOMS @@ -31,5 +31,5 @@ SSTidalCorridor_MapBGEvents: @ 853A218 bg_event 14, 9, 0, 1, 0, SSTidalCorridor_EventScript_23C110 SSTidalCorridor_MapEvents:: @ 853A2A8 - map_events SSTidalCorridor_MapObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents + map_events SSTidalCorridor_EventObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents diff --git a/data/maps/events/SSTidalLowerDeck.inc b/data/maps/events/SSTidalLowerDeck.inc index 0ce76cf29a..e135eceaeb 100644 --- a/data/maps/events/SSTidalLowerDeck.inc +++ b/data/maps/events/SSTidalLowerDeck.inc @@ -1,6 +1,6 @@ -SSTidalLowerDeck_MapObjects: @ 853A2BC - object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 10, 4, 3, 46, 68, 0, 1, 3, SSTidalLowerDeck_EventScript_23C819, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 7, 4, 3, 50, 71, 0, 1, 3, SSTidalLowerDeck_EventScript_23C830, 0, 0, 0 +SSTidalLowerDeck_EventObjects: @ 853A2BC + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 10, 4, 3, 46, 68, 0, 1, 3, SSTidalLowerDeck_EventScript_23C819, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 7, 4, 3, 50, 71, 0, 1, 3, SSTidalLowerDeck_EventScript_23C830, 0, 0, 0 SSTidalLowerDeck_MapWarps: @ 853A2EC warp_def 15, 2, 3, 8, SS_TIDAL_CORRIDOR @@ -9,5 +9,5 @@ SSTidalLowerDeck_MapBGEvents: @ 853A2F4 bg_event 0, 2, 0, 7, 0, ITEM_LEFTOVERS, 35, 0 SSTidalLowerDeck_MapEvents:: @ 853A300 - map_events SSTidalLowerDeck_MapObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents + map_events SSTidalLowerDeck_EventObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents diff --git a/data/maps/events/SSTidalRooms.inc b/data/maps/events/SSTidalRooms.inc index 81648162b3..14aadda5f5 100644 --- a/data/maps/events/SSTidalRooms.inc +++ b/data/maps/events/SSTidalRooms.inc @@ -1,12 +1,12 @@ -SSTidalRooms_MapObjects: @ 853A314 - object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 4, 7, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA49, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 34, 11, 3, 9, 0, 0, 1, 3, SSTidalRooms_EventScript_23CA60, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 21, 5, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA77, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 5, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CA8E, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 0, 4, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CAA9, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BOY_4, 0, 0, 22, 11, 3, 8, 17, 0, 1, 3, SSTidalRooms_EventScript_23CAC4, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 0, 15, 6, 3, 9, 0, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_MANIAC, 0, 0, 28, 5, 3, 7, 17, 0, 0, 0, SSTidalRooms_EventScript_23C9F2, 951, 0, 0 +SSTidalRooms_EventObjects: @ 853A314 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 4, 7, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA49, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 34, 11, 3, 9, 0, 0, 1, 3, SSTidalRooms_EventScript_23CA60, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 21, 5, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA77, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 5, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CA8E, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 4, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CAA9, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_BOY_4, 0, 0, 22, 11, 3, 8, 17, 0, 1, 3, SSTidalRooms_EventScript_23CAC4, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 15, 6, 3, 9, 0, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 0, 28, 5, 3, 7, 17, 0, 0, 0, SSTidalRooms_EventScript_23C9F2, 951, 0, 0 SSTidalRooms_MapWarps: @ 853A3D4 warp_def 4, 16, 0, 0, SS_TIDAL_CORRIDOR @@ -27,5 +27,5 @@ SSTidalRooms_MapBGEvents: @ 853A434 bg_event 15, 12, 0, 0, 0, SSTidalRooms_EventScript_23CA33 SSTidalRooms_MapEvents:: @ 853A44C - map_events SSTidalRooms_MapObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents + map_events SSTidalRooms_EventObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents diff --git a/data/maps/events/SafariZone_North.inc b/data/maps/events/SafariZone_North.inc index e8ace64829..d11d31fe98 100644 --- a/data/maps/events/SafariZone_North.inc +++ b/data/maps/events/SafariZone_North.inc @@ -1,14 +1,14 @@ -SafariZone_North_MapObjects: @ 853B160 - object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 0, 22, 9, 3, 2, 17, 0, 0, 0, SafariZone_North_EventScript_23D254, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_5, 0, 0, 6, 29, 3, 2, 17, 0, 0, 0, SafariZone_North_EventScript_23D25D, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 25, 10, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 17, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 25, 13, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 18, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 28, 14, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 19, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 23, 6, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 20, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 7, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 21, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 27, 7, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 22, 0, 0 - object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2912C9, 1119, 0, 0 +SafariZone_North_EventObjects: @ 853B160 + object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 22, 9, 3, 2, 17, 0, 0, 0, SafariZone_North_EventScript_23D254, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 29, 3, 2, 17, 0, 0, 0, SafariZone_North_EventScript_23D25D, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 25, 10, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 17, 0, 0 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 25, 13, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 18, 0, 0 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 28, 14, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 19, 0, 0 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 23, 6, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 20, 0, 0 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 7, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 21, 0, 0 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 27, 7, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 22, 0, 0 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2912C9, 1119, 0, 0 SafariZone_North_MapEvents:: @ 853B238 - map_events SafariZone_North_MapObjects, 0x0, 0x0, 0x0 + map_events SafariZone_North_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_Northeast.inc b/data/maps/events/SafariZone_Northeast.inc index 84505d6e65..233b55da0e 100644 --- a/data/maps/events/SafariZone_Northeast.inc +++ b/data/maps/events/SafariZone_Northeast.inc @@ -1,18 +1,18 @@ -SafariZone_Northeast_MapObjects: @ 853B968 - object_event 1, MAP_OBJ_GFX_BOY_3, 0, 0, 8, 20, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3C6, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 30, 22, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3D8, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 11, 11, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 21, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_1, 0, 0, 13, 35, 0, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3CF, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 13, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 19, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 9, 7, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 17, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 10, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 20, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 12, 8, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 18, 0, 0 - object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 17, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2912E3, 1169, 0, 0 +SafariZone_Northeast_EventObjects: @ 853B968 + object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 0, 8, 20, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3C6, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 30, 22, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3D8, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 11, 11, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 21, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 13, 35, 0, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3CF, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 13, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 19, 0, 0 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 9, 7, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 17, 0, 0 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 10, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 20, 0, 0 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 12, 8, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 18, 0, 0 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 17, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2912E3, 1169, 0, 0 SafariZone_Northeast_MapBGEvents: @ 853BA40 bg_event 31, 35, 3, 7, 0, ITEM_RARE_CANDY, 106, 0 bg_event 21, 5, 3, 7, 0, ITEM_ZINC, 107, 0 SafariZone_Northeast_MapEvents:: @ 853BA58 - map_events SafariZone_Northeast_MapObjects, 0x0, 0x0, SafariZone_Northeast_MapBGEvents + map_events SafariZone_Northeast_EventObjects, 0x0, 0x0, SafariZone_Northeast_MapBGEvents diff --git a/data/maps/events/SafariZone_Northwest.inc b/data/maps/events/SafariZone_Northwest.inc index 64152d008a..41c2fe1985 100644 --- a/data/maps/events/SafariZone_Northwest.inc +++ b/data/maps/events/SafariZone_Northwest.inc @@ -1,7 +1,7 @@ -SafariZone_Northwest_MapObjects: @ 853B11C - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 8, 8, 5, 8, 0, 0, 0, 0, SafariZone_Northwest_EventScript_23D24A, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 33, 7, 3, 1, 17, 0, 0, 0, SafariZone_Northwest_EventScript_2912BC, 1094, 0, 0 +SafariZone_Northwest_EventObjects: @ 853B11C + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 8, 8, 5, 8, 0, 0, 0, 0, SafariZone_Northwest_EventScript_23D24A, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 33, 7, 3, 1, 17, 0, 0, 0, SafariZone_Northwest_EventScript_2912BC, 1094, 0, 0 SafariZone_Northwest_MapEvents:: @ 853B14C - map_events SafariZone_Northwest_MapObjects, 0x0, 0x0, 0x0 + map_events SafariZone_Northwest_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_RestHouse.inc b/data/maps/events/SafariZone_RestHouse.inc index 863c3113a9..1ab278781c 100644 --- a/data/maps/events/SafariZone_RestHouse.inc +++ b/data/maps/events/SafariZone_RestHouse.inc @@ -1,12 +1,12 @@ -SafariZone_RestHouse_MapObjects: @ 853B8FC - object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 7, 4, 0, 10, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BE7, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BF0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 2, 5, 3, 10, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BF9, 0, 0, 0 +SafariZone_RestHouse_EventObjects: @ 853B8FC + object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 7, 4, 0, 10, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BE7, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BF0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 2, 5, 3, 10, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BF9, 0, 0, 0 SafariZone_RestHouse_MapWarps: @ 853B944 warp_def 3, 8, 0, 0, SAFARI_ZONE_SOUTHWEST warp_def 4, 8, 0, 0, SAFARI_ZONE_SOUTHWEST SafariZone_RestHouse_MapEvents:: @ 853B954 - map_events SafariZone_RestHouse_MapObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0 + map_events SafariZone_RestHouse_EventObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_South.inc b/data/maps/events/SafariZone_South.inc index 4a0ead84c2..c1e293e6f5 100644 --- a/data/maps/events/SafariZone_South.inc +++ b/data/maps/events/SafariZone_South.inc @@ -1,14 +1,14 @@ -SafariZone_South_MapObjects: @ 853B2A4 - object_event 1, MAP_OBJ_GFX_CAMPER, 0, 0, 32, 34, 4, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2E5, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_1, 0, 0, 26, 28, 3, 2, 17, 0, 0, 0, SafariZone_South_EventScript_23D2CA, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_5, 0, 0, 16, 6, 5, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 15, 31, 3, 2, 17, 0, 0, 0, SafariZone_South_EventScript_23D2DC, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_CAMPER, 0, 0, 36, 16, 3, 9, 17, 0, 0, 0, SafariZone_South_EventScript_23D390, 717, 0, 0 - object_event 6, MAP_OBJ_GFX_CAMPER, 0, 0, 36, 17, 3, 9, 17, 0, 0, 0, SafariZone_South_EventScript_23D3A2, 717, 0, 0 +SafariZone_South_EventObjects: @ 853B2A4 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 0, 32, 34, 4, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2E5, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 0, 26, 28, 3, 2, 17, 0, 0, 0, SafariZone_South_EventScript_23D2CA, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 0, 16, 6, 5, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 15, 31, 3, 2, 17, 0, 0, 0, SafariZone_South_EventScript_23D2DC, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 0, 36, 16, 3, 9, 17, 0, 0, 0, SafariZone_South_EventScript_23D390, 717, 0, 0 + object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 0, 36, 17, 3, 9, 17, 0, 0, 0, SafariZone_South_EventScript_23D3A2, 717, 0, 0 SafariZone_South_MapWarps: @ 853B334 warp_def 32, 33, 0, 0, ROUTE_121_SAFARI_ZONE_ENTRANCE SafariZone_South_MapEvents:: @ 853B33C - map_events SafariZone_South_MapObjects, SafariZone_South_MapWarps, 0x0, 0x0 + map_events SafariZone_South_EventObjects, SafariZone_South_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_Southeast.inc b/data/maps/events/SafariZone_Southeast.inc index 3970e6eb04..61e6b93fe5 100644 --- a/data/maps/events/SafariZone_Southeast.inc +++ b/data/maps/events/SafariZone_Southeast.inc @@ -1,14 +1,14 @@ -SafariZone_Southeast_MapObjects: @ 853BA6C - object_event 1, MAP_OBJ_GFX_BOY_4, 0, 0, 7, 7, 3, 1, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 20, 30, 3, 2, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 8, 26, 3, 2, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 15, 3, 1, 17, 0, 0, 0, SafariZone_Southeast_EventScript_2912F0, 1170, 0, 0 - object_event 5, MAP_OBJ_GFX_CAMPER, 0, 0, 12, 16, 3, 9, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D399, 747, 0, 0 +SafariZone_Southeast_EventObjects: @ 853BA6C + object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 0, 7, 7, 3, 1, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 20, 30, 3, 2, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 8, 26, 3, 2, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 15, 3, 1, 17, 0, 0, 0, SafariZone_Southeast_EventScript_2912F0, 1170, 0, 0 + object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 0, 12, 16, 3, 9, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D399, 747, 0, 0 SafariZone_Southeast_MapBGEvents: @ 853BAE4 bg_event 19, 36, 3, 7, 0, ITEM_PP_UP, 108, 0 bg_event 32, 33, 0, 7, 0, ITEM_FULL_RESTORE, 105, 0 SafariZone_Southeast_MapEvents:: @ 853BAFC - map_events SafariZone_Southeast_MapObjects, 0x0, 0x0, SafariZone_Southeast_MapBGEvents + map_events SafariZone_Southeast_EventObjects, 0x0, 0x0, SafariZone_Southeast_MapBGEvents diff --git a/data/maps/events/SafariZone_Southwest.inc b/data/maps/events/SafariZone_Southwest.inc index 9edb33ddb3..eda3552eb9 100644 --- a/data/maps/events/SafariZone_Southwest.inc +++ b/data/maps/events/SafariZone_Southwest.inc @@ -1,6 +1,6 @@ -SafariZone_Southwest_MapObjects: @ 853B24C - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 22, 9, 3, 8, 0, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 37, 3, 1, 17, 0, 0, 0, SafariZone_Southwest_EventScript_2912D6, 1131, 0, 0 +SafariZone_Southwest_EventObjects: @ 853B24C + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 22, 9, 3, 8, 0, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 37, 3, 1, 17, 0, 0, 0, SafariZone_Southwest_EventScript_2912D6, 1131, 0, 0 SafariZone_Southwest_MapWarps: @ 853B27C warp_def 29, 7, 3, 0, SAFARI_ZONE_REST_HOUSE @@ -9,5 +9,5 @@ SafariZone_Southwest_MapBGEvents: @ 853B284 bg_event 32, 7, 3, 0, 0, SafariZone_Southwest_EventScript_23D270 SafariZone_Southwest_MapEvents:: @ 853B290 - map_events SafariZone_Southwest_MapObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents + map_events SafariZone_Southwest_EventObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents diff --git a/data/maps/events/ScorchedSlab.inc b/data/maps/events/ScorchedSlab.inc index f5c8784660..313423b511 100644 --- a/data/maps/events/ScorchedSlab.inc +++ b/data/maps/events/ScorchedSlab.inc @@ -1,9 +1,9 @@ -ScorchedSlab_MapObjects: @ 8536F88 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 3, 1, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, 1079, 0, 0 +ScorchedSlab_EventObjects: @ 8536F88 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 3, 1, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, 1079, 0, 0 ScorchedSlab_MapWarps: @ 8536FA0 warp_def 7, 16, 1, 1, ROUTE_120 ScorchedSlab_MapEvents:: @ 8536FA8 - map_events ScorchedSlab_MapObjects, ScorchedSlab_MapWarps, 0x0, 0x0 + map_events ScorchedSlab_EventObjects, ScorchedSlab_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Entrance.inc b/data/maps/events/SeafloorCavern_Entrance.inc index 3a41757e25..1118c0ab35 100644 --- a/data/maps/events/SeafloorCavern_Entrance.inc +++ b/data/maps/events/SeafloorCavern_Entrance.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Entrance_MapObjects: @ 85356BC - object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 2, 3, 7, 17, 0, 0, 0, SeafloorCavern_Entrance_EventScript_234485, 941, 0, 0 +SeafloorCavern_Entrance_EventObjects: @ 85356BC + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 2, 3, 7, 17, 0, 0, 0, SeafloorCavern_Entrance_EventScript_234485, 941, 0, 0 SeafloorCavern_Entrance_MapWarps: @ 85356D4 warp_def 10, 18, 3, 0, UNDERWATER_4 warp_def 10, 1, 3, 0, SEAFLOOR_CAVERN_ROOM_1 SeafloorCavern_Entrance_MapEvents:: @ 85356E4 - map_events SeafloorCavern_Entrance_MapObjects, SeafloorCavern_Entrance_MapWarps, 0x0, 0x0 + map_events SeafloorCavern_Entrance_EventObjects, SeafloorCavern_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/events/SeafloorCavern_Room1.inc index 4a219357c2..31fbb7d86e 100644 --- a/data/maps/events/SeafloorCavern_Room1.inc +++ b/data/maps/events/SeafloorCavern_Room1.inc @@ -1,9 +1,9 @@ -SeafloorCavern_Room1_MapObjects: @ 85356F8 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 5, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, 19, 0, 0 - object_event 4, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 6, 3, 1, 17, 0, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, 946, 0, 0 - object_event 5, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 10, 3, 16, 17, 0, 1, 3, SeafloorCavern_Room1_EventScript_234803, 946, 0, 0 +SeafloorCavern_Room1_EventObjects: @ 85356F8 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 17, 0, 0 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 18, 0, 0 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 5, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, 19, 0, 0 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 6, 3, 1, 17, 0, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, 946, 0, 0 + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 10, 3, 16, 17, 0, 1, 3, SeafloorCavern_Room1_EventScript_234803, 946, 0, 0 SeafloorCavern_Room1_MapWarps: @ 8535770 warp_def 5, 18, 3, 1, SEAFLOOR_CAVERN_ENTRANCE @@ -11,5 +11,5 @@ SeafloorCavern_Room1_MapWarps: @ 8535770 warp_def 6, 2, 3, 0, SEAFLOOR_CAVERN_ROOM_2 SeafloorCavern_Room1_MapEvents:: @ 8535788 - map_events SeafloorCavern_Room1_MapObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0 + map_events SeafloorCavern_Room1_EventObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/events/SeafloorCavern_Room2.inc index cf0c2dfad9..608b45e50e 100644 --- a/data/maps/events/SeafloorCavern_Room2.inc +++ b/data/maps/events/SeafloorCavern_Room2.inc @@ -1,12 +1,12 @@ -SeafloorCavern_Room2_MapObjects: @ 853579C - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 18, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 19, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 17, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 21, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 22, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 24, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 9, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 25, 0, 0 - object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 23, 0, 0 +SeafloorCavern_Room2_EventObjects: @ 853579C + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 18, 0, 0 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 19, 0, 0 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 17, 0, 0 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 21, 0, 0 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 22, 0, 0 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 24, 0, 0 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 9, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 25, 0, 0 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 23, 0, 0 SeafloorCavern_Room2_MapWarps: @ 853585C warp_def 10, 7, 3, 2, SEAFLOOR_CAVERN_ROOM_1 @@ -15,5 +15,5 @@ SeafloorCavern_Room2_MapWarps: @ 853585C warp_def 11, 1, 3, 0, SEAFLOOR_CAVERN_ROOM_7 SeafloorCavern_Room2_MapEvents:: @ 853587C - map_events SeafloorCavern_Room2_MapObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0 + map_events SeafloorCavern_Room2_EventObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/events/SeafloorCavern_Room3.inc index 964b45a6d4..f7c9191315 100644 --- a/data/maps/events/SeafloorCavern_Room3.inc +++ b/data/maps/events/SeafloorCavern_Room3.inc @@ -1,13 +1,13 @@ -SeafloorCavern_Room3_MapObjects: @ 8535890 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 18, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 20, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 9, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 21, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 22, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 23, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 24, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 25, 0, 0 - object_event 8, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 9, 5, 3, 9, 17, 0, 1, 6, SeafloorCavern_Room3_EventScript_234938, 946, 0, 0 - object_event 9, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 5, 5, 3, 10, 17, 0, 1, 4, SeafloorCavern_Room3_EventScript_23494F, 946, 0, 0 +SeafloorCavern_Room3_EventObjects: @ 8535890 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 18, 0, 0 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 20, 0, 0 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 9, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 21, 0, 0 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 22, 0, 0 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 23, 0, 0 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 24, 0, 0 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 25, 0, 0 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 9, 5, 3, 9, 17, 0, 1, 6, SeafloorCavern_Room3_EventScript_234938, 946, 0, 0 + object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 5, 5, 3, 10, 17, 0, 1, 4, SeafloorCavern_Room3_EventScript_23494F, 946, 0, 0 SeafloorCavern_Room3_MapWarps: @ 8535968 warp_def 8, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_8 @@ -15,5 +15,5 @@ SeafloorCavern_Room3_MapWarps: @ 8535968 warp_def 4, 15, 3, 1, SEAFLOOR_CAVERN_ROOM_6 SeafloorCavern_Room3_MapEvents:: @ 8535980 - map_events SeafloorCavern_Room3_MapObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0 + map_events SeafloorCavern_Room3_EventObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room4.inc b/data/maps/events/SeafloorCavern_Room4.inc index 79d57dd727..3b7f6f2ee6 100644 --- a/data/maps/events/SeafloorCavern_Room4.inc +++ b/data/maps/events/SeafloorCavern_Room4.inc @@ -1,6 +1,6 @@ -SeafloorCavern_Room4_MapObjects: @ 8535994 - object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 5, 8, 3, 17, 17, 0, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, 946, 0, 0 - object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 5, 12, 3, 7, 17, 0, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, 946, 0, 0 +SeafloorCavern_Room4_EventObjects: @ 8535994 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 5, 8, 3, 17, 17, 0, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, 946, 0, 0 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 5, 12, 3, 7, 17, 0, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, 946, 0, 0 SeafloorCavern_Room4_MapWarps: @ 85359C4 warp_def 13, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_2 @@ -9,5 +9,5 @@ SeafloorCavern_Room4_MapWarps: @ 85359C4 warp_def 10, 15, 3, 1, SEAFLOOR_CAVERN_ENTRANCE SeafloorCavern_Room4_MapEvents:: @ 85359E4 - map_events SeafloorCavern_Room4_MapObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0 + map_events SeafloorCavern_Room4_EventObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/events/SeafloorCavern_Room5.inc index b88a862abc..4fd74a9c7c 100644 --- a/data/maps/events/SeafloorCavern_Room5.inc +++ b/data/maps/events/SeafloorCavern_Room5.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room5_MapObjects: @ 85359F8 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 19, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 21, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 22, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 20, 0, 0 +SeafloorCavern_Room5_EventObjects: @ 85359F8 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 17, 0, 0 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 18, 0, 0 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 19, 0, 0 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 21, 0, 0 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 22, 0, 0 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 20, 0, 0 SeafloorCavern_Room5_MapWarps: @ 8535A88 warp_def 4, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_1 @@ -12,5 +12,5 @@ SeafloorCavern_Room5_MapWarps: @ 8535A88 warp_def 7, 17, 3, 2, SEAFLOOR_CAVERN_ROOM_4 SeafloorCavern_Room5_MapEvents:: @ 8535AA0 - map_events SeafloorCavern_Room5_MapObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0 + map_events SeafloorCavern_Room5_EventObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room8.inc b/data/maps/events/SeafloorCavern_Room8.inc index 7fd65fc087..65a1da0146 100644 --- a/data/maps/events/SeafloorCavern_Room8.inc +++ b/data/maps/events/SeafloorCavern_Room8.inc @@ -1,21 +1,21 @@ -SeafloorCavern_Room8_MapObjects: @ 8535B04 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 19, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 20, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 21, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 22, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 23, 0, 0 - object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 24, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 25, 0, 0 - object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 26, 0, 0 - object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 27, 0, 0 - object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 28, 0, 0 +SeafloorCavern_Room8_EventObjects: @ 8535B04 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 17, 0, 0 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 18, 0, 0 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 19, 0, 0 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 20, 0, 0 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 21, 0, 0 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 22, 0, 0 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 23, 0, 0 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 24, 0, 0 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 25, 0, 0 + object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 26, 0, 0 + object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 27, 0, 0 + object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 28, 0, 0 SeafloorCavern_Room8_MapWarps: @ 8535C24 warp_def 5, 2, 3, 0, SEAFLOOR_CAVERN_ROOM_9 warp_def 5, 12, 3, 0, SEAFLOOR_CAVERN_ROOM_3 SeafloorCavern_Room8_MapEvents:: @ 8535C34 - map_events SeafloorCavern_Room8_MapObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0 + map_events SeafloorCavern_Room8_EventObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/events/SeafloorCavern_Room9.inc index bcd27d0307..8c203021c1 100644 --- a/data/maps/events/SeafloorCavern_Room9.inc +++ b/data/maps/events/SeafloorCavern_Room9.inc @@ -1,11 +1,11 @@ -SeafloorCavern_Room9_MapObjects: @ 8535C48 - object_event 1, MAP_OBJ_GFX_KYOGRE_1, 0, 0, 17, 38, 3, 8, 0, 0, 0, 0, 0x0, 859, 0, 0 - object_event 2, MAP_OBJ_GFX_ARCHIE, 0, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 828, 0, 0 - object_event 3, MAP_OBJ_GFX_MAXIE, 0, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 829, 0, 0 - object_event 4, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 41, 3, 10, 0, 0, 0, 0, 0x0, 831, 0, 0 - object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 8, 42, 3, 10, 0, 0, 0, 0, 0x0, 831, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 5, 3, 1, 17, 0, 0, 0, SeafloorCavern_Room9_EventScript_291401, 1090, 0, 0 - object_event 7, MAP_OBJ_GFX_KYOGRE_2, 0, 0, 17, 38, 3, 8, 17, 0, 0, 0, 0x0, 733, 0, 0 +SeafloorCavern_Room9_EventObjects: @ 8535C48 + object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 0, 17, 38, 3, 8, 0, 0, 0, 0, 0x0, 859, 0, 0 + object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 828, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAXIE, 0, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 829, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 41, 3, 10, 0, 0, 0, 0, 0x0, 831, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 8, 42, 3, 10, 0, 0, 0, 0, 0x0, 831, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 5, 3, 1, 17, 0, 0, 0, SeafloorCavern_Room9_EventScript_291401, 1090, 0, 0 + object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 0, 17, 38, 3, 8, 17, 0, 0, 0, 0x0, 733, 0, 0 SeafloorCavern_Room9_MapWarps: @ 8535CF0 warp_def 5, 4, 3, 0, SEAFLOOR_CAVERN_ROOM_8 @@ -14,5 +14,5 @@ SeafloorCavern_Room9_MapCoordEvents: @ 8535CF8 coord_event 17, 42, 3, 0, VAR_0x40A2, 0, 0, SeafloorCavern_Room9_EventScript_234DC9 SeafloorCavern_Room9_MapEvents:: @ 8535D08 - map_events SeafloorCavern_Room9_MapObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0 + map_events SeafloorCavern_Room9_EventObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/events/SecretBase_BlueCave1.inc index eb92a3851c..301779af5a 100644 --- a/data/maps/events/SecretBase_BlueCave1.inc +++ b/data/maps/events/SecretBase_BlueCave1.inc @@ -1,11 +1,11 @@ -SecretBase_BlueCave1_MapObjects: @ 8537BEC +SecretBase_BlueCave1_EventObjects: @ 8537BEC object_event 1, 255, 0, 0, 4, 2, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_BlueCave1_MapWarps: @ 8537D54 warp_def 5, 7, 0, 126, NONE SecretBase_BlueCave1_MapEvents:: @ 8537D5C - map_events SecretBase_BlueCave1_MapObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0 + map_events SecretBase_BlueCave1_EventObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/events/SecretBase_BlueCave2.inc index e2db7471f1..f919cfae0c 100644 --- a/data/maps/events/SecretBase_BlueCave2.inc +++ b/data/maps/events/SecretBase_BlueCave2.inc @@ -1,11 +1,11 @@ -SecretBase_BlueCave2_MapObjects: @ 8538504 +SecretBase_BlueCave2_EventObjects: @ 8538504 object_event 1, 255, 0, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_BlueCave2_MapWarps: @ 853866C warp_def 7, 5, 0, 126, NONE SecretBase_BlueCave2_MapEvents:: @ 8538674 - map_events SecretBase_BlueCave2_MapObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0 + map_events SecretBase_BlueCave2_EventObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/events/SecretBase_BlueCave3.inc index cc5606ac43..ba2b28eb19 100644 --- a/data/maps/events/SecretBase_BlueCave3.inc +++ b/data/maps/events/SecretBase_BlueCave3.inc @@ -1,11 +1,11 @@ -SecretBase_BlueCave3_MapObjects: @ 8538E1C +SecretBase_BlueCave3_EventObjects: @ 8538E1C object_event 1, 255, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_BlueCave3_MapWarps: @ 8538F84 warp_def 4, 15, 0, 126, NONE SecretBase_BlueCave3_MapEvents:: @ 8538F8C - map_events SecretBase_BlueCave3_MapObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0 + map_events SecretBase_BlueCave3_EventObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/events/SecretBase_BlueCave4.inc index 0efdf765d8..cc79f44be2 100644 --- a/data/maps/events/SecretBase_BlueCave4.inc +++ b/data/maps/events/SecretBase_BlueCave4.inc @@ -1,11 +1,11 @@ -SecretBase_BlueCave4_MapObjects: @ 8539734 +SecretBase_BlueCave4_EventObjects: @ 8539734 object_event 1, 255, 0, 0, 5, 13, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_BlueCave4_MapWarps: @ 853989C warp_def 4, 15, 0, 126, NONE SecretBase_BlueCave4_MapEvents:: @ 85398A4 - map_events SecretBase_BlueCave4_MapObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0 + map_events SecretBase_BlueCave4_EventObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/events/SecretBase_BrownCave1.inc index 7755a5a095..e937ac1f43 100644 --- a/data/maps/events/SecretBase_BrownCave1.inc +++ b/data/maps/events/SecretBase_BrownCave1.inc @@ -1,11 +1,11 @@ -SecretBase_BrownCave1_MapObjects: @ 8537A68 +SecretBase_BrownCave1_EventObjects: @ 8537A68 object_event 1, 255, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_BrownCave1_MapWarps: @ 8537BD0 warp_def 5, 7, 0, 126, NONE SecretBase_BrownCave1_MapEvents:: @ 8537BD8 - map_events SecretBase_BrownCave1_MapObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0 + map_events SecretBase_BrownCave1_EventObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/events/SecretBase_BrownCave2.inc index 37a1387bf9..d3885cb0d4 100644 --- a/data/maps/events/SecretBase_BrownCave2.inc +++ b/data/maps/events/SecretBase_BrownCave2.inc @@ -1,11 +1,11 @@ -SecretBase_BrownCave2_MapObjects: @ 8538380 +SecretBase_BrownCave2_EventObjects: @ 8538380 object_event 1, 255, 0, 0, 11, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_BrownCave2_MapWarps: @ 85384E8 warp_def 1, 7, 0, 126, NONE SecretBase_BrownCave2_MapEvents:: @ 85384F0 - map_events SecretBase_BrownCave2_MapObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0 + map_events SecretBase_BrownCave2_EventObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/events/SecretBase_BrownCave3.inc index 14c9905a27..c0ec35e376 100644 --- a/data/maps/events/SecretBase_BrownCave3.inc +++ b/data/maps/events/SecretBase_BrownCave3.inc @@ -1,11 +1,11 @@ -SecretBase_BrownCave3_MapObjects: @ 8538C98 +SecretBase_BrownCave3_EventObjects: @ 8538C98 object_event 1, 255, 0, 0, 1, 7, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_BrownCave3_MapWarps: @ 8538E00 warp_def 11, 9, 0, 126, NONE SecretBase_BrownCave3_MapEvents:: @ 8538E08 - map_events SecretBase_BrownCave3_MapObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0 + map_events SecretBase_BrownCave3_EventObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/events/SecretBase_BrownCave4.inc index 543cb0072b..de9250cbb9 100644 --- a/data/maps/events/SecretBase_BrownCave4.inc +++ b/data/maps/events/SecretBase_BrownCave4.inc @@ -1,11 +1,11 @@ -SecretBase_BrownCave4_MapObjects: @ 85395B0 +SecretBase_BrownCave4_EventObjects: @ 85395B0 object_event 1, 255, 0, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_BrownCave4_MapWarps: @ 8539718 warp_def 2, 8, 0, 126, NONE SecretBase_BrownCave4_MapEvents:: @ 8539720 - map_events SecretBase_BrownCave4_MapObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0 + map_events SecretBase_BrownCave4_EventObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/events/SecretBase_RedCave1.inc index ebc15ecd72..aa664f45c9 100644 --- a/data/maps/events/SecretBase_RedCave1.inc +++ b/data/maps/events/SecretBase_RedCave1.inc @@ -1,11 +1,11 @@ -SecretBase_RedCave1_MapObjects: @ 85378E4 +SecretBase_RedCave1_EventObjects: @ 85378E4 object_event 1, 255, 0, 0, 7, 4, 3, 8, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_RedCave1_MapWarps: @ 8537A4C warp_def 5, 7, 0, 126, NONE SecretBase_RedCave1_MapEvents:: @ 8537A54 - map_events SecretBase_RedCave1_MapObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0 + map_events SecretBase_RedCave1_EventObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/events/SecretBase_RedCave2.inc index ef7958e9aa..956e3b03b4 100644 --- a/data/maps/events/SecretBase_RedCave2.inc +++ b/data/maps/events/SecretBase_RedCave2.inc @@ -1,11 +1,11 @@ -SecretBase_RedCave2_MapObjects: @ 85381FC +SecretBase_RedCave2_EventObjects: @ 85381FC object_event 1, 255, 0, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_RedCave2_MapWarps: @ 8538364 warp_def 3, 14, 0, 126, NONE SecretBase_RedCave2_MapEvents:: @ 853836C - map_events SecretBase_RedCave2_MapObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0 + map_events SecretBase_RedCave2_EventObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/events/SecretBase_RedCave3.inc index 65dc430267..dfdbec94c6 100644 --- a/data/maps/events/SecretBase_RedCave3.inc +++ b/data/maps/events/SecretBase_RedCave3.inc @@ -1,11 +1,11 @@ -SecretBase_RedCave3_MapObjects: @ 8538B14 +SecretBase_RedCave3_EventObjects: @ 8538B14 object_event 1, 255, 0, 0, 12, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_RedCave3_MapWarps: @ 8538C7C warp_def 3, 6, 0, 126, NONE SecretBase_RedCave3_MapEvents:: @ 8538C84 - map_events SecretBase_RedCave3_MapObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0 + map_events SecretBase_RedCave3_EventObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/events/SecretBase_RedCave4.inc index 274a459cd7..b485d0ad94 100644 --- a/data/maps/events/SecretBase_RedCave4.inc +++ b/data/maps/events/SecretBase_RedCave4.inc @@ -1,11 +1,11 @@ -SecretBase_RedCave4_MapObjects: @ 853942C +SecretBase_RedCave4_EventObjects: @ 853942C object_event 1, 255, 0, 0, 5, 8, 3, 8, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_RedCave4_MapWarps: @ 8539594 warp_def 2, 12, 0, 126, NONE SecretBase_RedCave4_MapEvents:: @ 853959C - map_events SecretBase_RedCave4_MapObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0 + map_events SecretBase_RedCave4_EventObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/events/SecretBase_Shrub1.inc index e20d76bc28..545426eea0 100644 --- a/data/maps/events/SecretBase_Shrub1.inc +++ b/data/maps/events/SecretBase_Shrub1.inc @@ -1,11 +1,11 @@ -SecretBase_Shrub1_MapObjects: @ 8538078 +SecretBase_Shrub1_EventObjects: @ 8538078 object_event 1, 255, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_Shrub1_MapWarps: @ 85381E0 warp_def 5, 7, 0, 126, NONE SecretBase_Shrub1_MapEvents:: @ 85381E8 - map_events SecretBase_Shrub1_MapObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0 + map_events SecretBase_Shrub1_EventObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/events/SecretBase_Shrub2.inc index 23d023b31d..0adb6b76d3 100644 --- a/data/maps/events/SecretBase_Shrub2.inc +++ b/data/maps/events/SecretBase_Shrub2.inc @@ -1,11 +1,11 @@ -SecretBase_Shrub2_MapObjects: @ 8538990 +SecretBase_Shrub2_EventObjects: @ 8538990 object_event 1, 255, 0, 0, 13, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_Shrub2_MapWarps: @ 8538AF8 warp_def 7, 5, 0, 126, NONE SecretBase_Shrub2_MapEvents:: @ 8538B00 - map_events SecretBase_Shrub2_MapObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0 + map_events SecretBase_Shrub2_EventObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/events/SecretBase_Shrub3.inc index 5fe624dc38..b8f4d4ed4a 100644 --- a/data/maps/events/SecretBase_Shrub3.inc +++ b/data/maps/events/SecretBase_Shrub3.inc @@ -1,11 +1,11 @@ -SecretBase_Shrub3_MapObjects: @ 85392A8 +SecretBase_Shrub3_EventObjects: @ 85392A8 object_event 1, 255, 0, 0, 5, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_Shrub3_MapWarps: @ 8539410 warp_def 6, 9, 0, 126, NONE SecretBase_Shrub3_MapEvents:: @ 8539418 - map_events SecretBase_Shrub3_MapObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0 + map_events SecretBase_Shrub3_EventObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/events/SecretBase_Shrub4.inc index ad432f6ffd..679b313d5a 100644 --- a/data/maps/events/SecretBase_Shrub4.inc +++ b/data/maps/events/SecretBase_Shrub4.inc @@ -1,11 +1,11 @@ -SecretBase_Shrub4_MapObjects: @ 8539BC0 +SecretBase_Shrub4_EventObjects: @ 8539BC0 object_event 1, 255, 0, 0, 9, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_Shrub4_MapWarps: @ 8539D28 warp_def 11, 8, 0, 126, NONE SecretBase_Shrub4_MapEvents:: @ 8539D30 - map_events SecretBase_Shrub4_MapObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0 + map_events SecretBase_Shrub4_EventObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/events/SecretBase_Tree1.inc index 149d5dea31..4020814509 100644 --- a/data/maps/events/SecretBase_Tree1.inc +++ b/data/maps/events/SecretBase_Tree1.inc @@ -1,11 +1,11 @@ -SecretBase_Tree1_MapObjects: @ 8537EF4 +SecretBase_Tree1_EventObjects: @ 8537EF4 object_event 1, 255, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree1_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_Tree1_MapWarps: @ 853805C warp_def 5, 7, 0, 126, NONE SecretBase_Tree1_MapEvents:: @ 8538064 - map_events SecretBase_Tree1_MapObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0 + map_events SecretBase_Tree1_EventObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/events/SecretBase_Tree2.inc index 16037e22fd..ddfbf094c6 100644 --- a/data/maps/events/SecretBase_Tree2.inc +++ b/data/maps/events/SecretBase_Tree2.inc @@ -1,11 +1,11 @@ -SecretBase_Tree2_MapObjects: @ 853880C +SecretBase_Tree2_EventObjects: @ 853880C object_event 1, 255, 0, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree2_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_Tree2_MapWarps: @ 8538974 warp_def 3, 14, 0, 126, NONE SecretBase_Tree2_MapEvents:: @ 853897C - map_events SecretBase_Tree2_MapObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0 + map_events SecretBase_Tree2_EventObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/events/SecretBase_Tree3.inc index 6fbd60683a..a13916bc7c 100644 --- a/data/maps/events/SecretBase_Tree3.inc +++ b/data/maps/events/SecretBase_Tree3.inc @@ -1,11 +1,11 @@ -SecretBase_Tree3_MapObjects: @ 8539124 +SecretBase_Tree3_EventObjects: @ 8539124 object_event 1, 255, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, SecretBase_Tree3_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_Tree3_MapWarps: @ 853928C warp_def 8, 6, 0, 126, NONE SecretBase_Tree3_MapEvents:: @ 8539294 - map_events SecretBase_Tree3_MapObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0 + map_events SecretBase_Tree3_EventObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/events/SecretBase_Tree4.inc index 4032d668a2..4511b236c2 100644 --- a/data/maps/events/SecretBase_Tree4.inc +++ b/data/maps/events/SecretBase_Tree4.inc @@ -1,11 +1,11 @@ -SecretBase_Tree4_MapObjects: @ 8539A3C +SecretBase_Tree4_EventObjects: @ 8539A3C object_event 1, 255, 0, 0, 10, 9, 3, 8, 0, 0, 0, 0, SecretBase_Tree4_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_Tree4_MapWarps: @ 8539BA4 warp_def 7, 12, 0, 126, NONE SecretBase_Tree4_MapEvents:: @ 8539BAC - map_events SecretBase_Tree4_MapObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0 + map_events SecretBase_Tree4_EventObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/events/SecretBase_YellowCave1.inc index 7d604b0933..6fc02d447e 100644 --- a/data/maps/events/SecretBase_YellowCave1.inc +++ b/data/maps/events/SecretBase_YellowCave1.inc @@ -1,11 +1,11 @@ -SecretBase_YellowCave1_MapObjects: @ 8537D70 +SecretBase_YellowCave1_EventObjects: @ 8537D70 object_event 1, 255, 0, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_YellowCave1_MapWarps: @ 8537ED8 warp_def 5, 7, 0, 126, NONE SecretBase_YellowCave1_MapEvents:: @ 8537EE0 - map_events SecretBase_YellowCave1_MapObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0 + map_events SecretBase_YellowCave1_EventObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/events/SecretBase_YellowCave2.inc index 592595aa8f..646176740f 100644 --- a/data/maps/events/SecretBase_YellowCave2.inc +++ b/data/maps/events/SecretBase_YellowCave2.inc @@ -1,11 +1,11 @@ -SecretBase_YellowCave2_MapObjects: @ 8538688 +SecretBase_YellowCave2_EventObjects: @ 8538688 object_event 1, 255, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_YellowCave2_MapWarps: @ 85387F0 warp_def 12, 7, 0, 126, NONE SecretBase_YellowCave2_MapEvents:: @ 85387F8 - map_events SecretBase_YellowCave2_MapObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0 + map_events SecretBase_YellowCave2_EventObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/events/SecretBase_YellowCave3.inc index bd1f69b1a5..32b71c477a 100644 --- a/data/maps/events/SecretBase_YellowCave3.inc +++ b/data/maps/events/SecretBase_YellowCave3.inc @@ -1,11 +1,11 @@ -SecretBase_YellowCave3_MapObjects: @ 8538FA0 +SecretBase_YellowCave3_EventObjects: @ 8538FA0 object_event 1, 255, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_YellowCave3_MapWarps: @ 8539108 warp_def 5, 9, 0, 126, NONE SecretBase_YellowCave3_MapEvents:: @ 8539110 - map_events SecretBase_YellowCave3_MapObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0 + map_events SecretBase_YellowCave3_EventObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/events/SecretBase_YellowCave4.inc index fe52f12bb9..187d0dff9c 100644 --- a/data/maps/events/SecretBase_YellowCave4.inc +++ b/data/maps/events/SecretBase_YellowCave4.inc @@ -1,11 +1,11 @@ -SecretBase_YellowCave4_MapObjects: @ 85398B8 +SecretBase_YellowCave4_EventObjects: @ 85398B8 object_event 1, 255, 0, 0, 9, 8, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_YellowCave4_MapWarps: @ 8539A20 warp_def 6, 12, 0, 126, NONE SecretBase_YellowCave4_MapEvents:: @ 8539A28 - map_events SecretBase_YellowCave4_MapObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0 + map_events SecretBase_YellowCave4_EventObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc index b19a293efb..dda65b0fe2 100644 --- a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc +++ b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc @@ -1,6 +1,6 @@ -ShoalCave_LowTideEntranceRoom_MapObjects: @ 853627C - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 30, 3, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, 1081, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 18, 15, 3, 9, 17, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0, 0, 0 +ShoalCave_LowTideEntranceRoom_EventObjects: @ 853627C + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 30, 3, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, 1081, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 18, 15, 3, 9, 17, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0, 0, 0 ShoalCave_LowTideEntranceRoom_MapWarps: @ 85362AC warp_def 20, 30, 3, 0, ROUTE_125 @@ -9,5 +9,5 @@ ShoalCave_LowTideEntranceRoom_MapWarps: @ 85362AC warp_def 27, 2, 3, 7, SHOAL_CAVE_LOW_TIDE_INNER_ROOM ShoalCave_LowTideEntranceRoom_MapEvents:: @ 85362CC - map_events ShoalCave_LowTideEntranceRoom_MapObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0 + map_events ShoalCave_LowTideEntranceRoom_EventObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.inc b/data/maps/events/ShoalCave_LowTideIceRoom.inc index a02a208643..809fb146c4 100644 --- a/data/maps/events/ShoalCave_LowTideIceRoom.inc +++ b/data/maps/events/ShoalCave_LowTideIceRoom.inc @@ -1,10 +1,10 @@ -ShoalCave_LowTideIceRoom_MapObjects: @ 8537100 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 12, 8, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, 1112, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 12, 21, 4, 1, 17, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, 1113, 0, 0 +ShoalCave_LowTideIceRoom_EventObjects: @ 8537100 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 8, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, 1112, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 21, 4, 1, 17, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, 1113, 0, 0 ShoalCave_LowTideIceRoom_MapWarps: @ 8537130 warp_def 17, 10, 3, 3, SHOAL_CAVE_LOW_TIDE_LOWER_ROOM ShoalCave_LowTideIceRoom_MapEvents:: @ 8537138 - map_events ShoalCave_LowTideIceRoom_MapObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0 + map_events ShoalCave_LowTideIceRoom_EventObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.inc b/data/maps/events/ShoalCave_LowTideInnerRoom.inc index 8fe34709ba..4d48e1aab1 100644 --- a/data/maps/events/ShoalCave_LowTideInnerRoom.inc +++ b/data/maps/events/ShoalCave_LowTideInnerRoom.inc @@ -1,5 +1,5 @@ -ShoalCave_LowTideInnerRoom_MapObjects: @ 85362E0 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 26, 14, 5, 1, 17, 0, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, 1082, 0, 0 +ShoalCave_LowTideInnerRoom_EventObjects: @ 85362E0 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 26, 14, 5, 1, 17, 0, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, 1082, 0, 0 ShoalCave_LowTideInnerRoom_MapWarps: @ 85362F8 warp_def 34, 29, 3, 1, SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM @@ -20,5 +20,5 @@ ShoalCave_LowTideInnerRoom_MapBGEvents: @ 8536338 bg_event 16, 13, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_23705A ShoalCave_LowTideInnerRoom_MapEvents:: @ 8536380 - map_events ShoalCave_LowTideInnerRoom_MapObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents + map_events ShoalCave_LowTideInnerRoom_EventObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/events/ShoalCave_LowTideLowerRoom.inc index 384b6570fd..d3484961ee 100644 --- a/data/maps/events/ShoalCave_LowTideLowerRoom.inc +++ b/data/maps/events/ShoalCave_LowTideLowerRoom.inc @@ -1,6 +1,6 @@ -ShoalCave_LowTideLowerRoom_MapObjects: @ 85363DC - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 25, 3, 3, 1, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 11, 4, 3, 2, 17, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2371B2, 0, 0, 0 +ShoalCave_LowTideLowerRoom_EventObjects: @ 85363DC + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 25, 3, 3, 1, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, 17, 0, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 11, 4, 3, 2, 17, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2371B2, 0, 0, 0 ShoalCave_LowTideLowerRoom_MapWarps: @ 853640C warp_def 7, 2, 3, 3, SHOAL_CAVE_LOW_TIDE_INNER_ROOM @@ -12,5 +12,5 @@ ShoalCave_LowTideLowerRoom_MapBGEvents: @ 853642C bg_event 18, 2, 3, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_237176 ShoalCave_LowTideLowerRoom_MapEvents:: @ 8536438 - map_events ShoalCave_LowTideLowerRoom_MapObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents + map_events ShoalCave_LowTideLowerRoom_EventObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.inc b/data/maps/events/ShoalCave_LowTideStairsRoom.inc index 6592f68d72..556524f057 100644 --- a/data/maps/events/ShoalCave_LowTideStairsRoom.inc +++ b/data/maps/events/ShoalCave_LowTideStairsRoom.inc @@ -1,5 +1,5 @@ -ShoalCave_LowTideStairsRoom_MapObjects: @ 8536394 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 13, 12, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, 1083, 0, 0 +ShoalCave_LowTideStairsRoom_EventObjects: @ 8536394 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 12, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, 1083, 0, 0 ShoalCave_LowTideStairsRoom_MapWarps: @ 85363AC warp_def 3, 12, 3, 1, SHOAL_CAVE_LOW_TIDE_INNER_ROOM @@ -9,5 +9,5 @@ ShoalCave_LowTideStairsRoom_MapBGEvents: @ 85363BC bg_event 11, 11, 3, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_23711A ShoalCave_LowTideStairsRoom_MapEvents:: @ 85363C8 - map_events ShoalCave_LowTideStairsRoom_MapObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents + map_events ShoalCave_LowTideStairsRoom_EventObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/events/SingleBattleColosseum.inc index ad8a393d61..382cafe164 100644 --- a/data/maps/events/SingleBattleColosseum.inc +++ b/data/maps/events/SingleBattleColosseum.inc @@ -1,5 +1,5 @@ -SingleBattleColosseum_MapObjects: @ 8539D44 - object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 9, 3, 3, 9, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0, 0, 0 +SingleBattleColosseum_EventObjects: @ 8539D44 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 9, 3, 3, 9, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0, 0, 0 SingleBattleColosseum_MapWarps: @ 8539D5C warp_def 6, 8, 3, 127, NONE @@ -10,5 +10,5 @@ SingleBattleColosseum_MapCoordEvents: @ 8539D6C coord_event 10, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827737E SingleBattleColosseum_MapEvents:: @ 8539D8C - map_events SingleBattleColosseum_MapObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0 + map_events SingleBattleColosseum_EventObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/events/SkyPillar_Outside.inc b/data/maps/events/SkyPillar_Outside.inc index 70a9c5c217..78991499c8 100644 --- a/data/maps/events/SkyPillar_Outside.inc +++ b/data/maps/events/SkyPillar_Outside.inc @@ -1,10 +1,10 @@ -SkyPillar_Outside_MapObjects: @ 853701C - object_event 1, MAP_OBJ_GFX_WALLACE, 0, 0, 13, 7, 3, 8, 17, 0, 0, 0, SkyPillar_Outside_EventScript_2393F8, 855, 0, 0 +SkyPillar_Outside_EventObjects: @ 853701C + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 0, 13, 7, 3, 8, 17, 0, 0, 0, SkyPillar_Outside_EventScript_2393F8, 855, 0, 0 SkyPillar_Outside_MapWarps: @ 8537034 warp_def 17, 13, 3, 1, SKY_PILLAR_ENTRANCE warp_def 14, 5, 0, 0, SKY_PILLAR_1F SkyPillar_Outside_MapEvents:: @ 8537044 - map_events SkyPillar_Outside_MapObjects, SkyPillar_Outside_MapWarps, 0x0, 0x0 + map_events SkyPillar_Outside_EventObjects, SkyPillar_Outside_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_Top.inc b/data/maps/events/SkyPillar_Top.inc index 8abe8401fc..792f350b8f 100644 --- a/data/maps/events/SkyPillar_Top.inc +++ b/data/maps/events/SkyPillar_Top.inc @@ -1,6 +1,6 @@ -SkyPillar_Top_MapObjects: @ 8537170 - object_event 1, MAP_OBJ_GFX_RAYQUAZA_2, 0, 0, 14, 7, 3, 8, 17, 0, 0, 0, 0x0, 773, 0, 0 - object_event 2, MAP_OBJ_GFX_RAYQUAZA_1, 0, 0, 14, 6, 3, 8, 17, 0, 0, 0, SkyPillar_Top_EventScript_239722, 80, 0, 0 +SkyPillar_Top_EventObjects: @ 8537170 + object_event 1, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 0, 14, 7, 3, 8, 17, 0, 0, 0, 0x0, 773, 0, 0 + object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 0, 14, 6, 3, 8, 17, 0, 0, 0, SkyPillar_Top_EventScript_239722, 80, 0, 0 SkyPillar_Top_MapWarps: @ 85371A0 warp_def 16, 14, 3, 1, SKY_PILLAR_5F @@ -9,5 +9,5 @@ SkyPillar_Top_MapCoordEvents: @ 85371A8 coord_event 14, 9, 3, 0, VAR_0x40D7, 0, 0, SkyPillar_Top_EventScript_23979A SkyPillar_Top_MapEvents:: @ 85371B8 - map_events SkyPillar_Top_MapObjects, SkyPillar_Top_MapWarps, SkyPillar_Top_MapCoordEvents, 0x0 + map_events SkyPillar_Top_EventObjects, SkyPillar_Top_MapWarps, SkyPillar_Top_MapCoordEvents, 0x0 diff --git a/data/maps/events/SlateportCity.inc b/data/maps/events/SlateportCity.inc index a187aaf1fd..c429ae7f53 100644 --- a/data/maps/events/SlateportCity.inc +++ b/data/maps/events/SlateportCity.inc @@ -1,39 +1,39 @@ -SlateportCity_MapObjects: @ 85261CC - object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 21, 11, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DCED9, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 34, 29, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCEF6, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 5, 13, 3, 2, 33, 0, 0, 0, SlateportCity_EventScript_1DCEB8, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 0, 26, 29, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCF17, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 31, 27, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD009, 882, 0, 0 - object_event 6, MAP_OBJ_GFX_COOK, 0, 0, 5, 43, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCE42, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 20, 37, 3, 1, 17, 0, 0, 0, SlateportCity_EventScript_1DCE63, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_GIRL_1, 0, 0, 8, 42, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DCE84, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 29, 13, 3, 9, 0, 0, 0, 0, SlateportCity_EventScript_1DD353, 835, 0, 0 - object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 0, 28, 14, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD35C, 835, 0, 0 - object_event 11, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 28, 13, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD1F8, 840, 0, 0 - object_event 12, MAP_OBJ_GFX_SAILOR, 0, 0, 37, 41, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DCFE5, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_SAILOR, 0, 0, 28, 46, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCFEE, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_WOMAN_2, 0, 0, 9, 50, 3, 3, 16, 0, 0, 0, SlateportCity_EventScript_1DCFF7, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_MAN_4, 0, 0, 16, 46, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DD000, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_MANIAC, 0, 0, 8, 24, 3, 3, 16, 0, 0, 0, SlateportCity_EventScript_1DCFBB, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_WOMAN_7, 0, 0, 15, 31, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCFDC, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD020, 882, 0, 0 - object_event 19, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 29, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD037, 882, 0, 0 - object_event 20, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 6, 38, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD198, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 5, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD16A, 0, 0, 0 - object_event 22, MAP_OBJ_GFX_MAN_6, 0, 0, 34, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD365, 0, 0, 0 - object_event 23, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 47, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCDE4, 0, 0, 0 - object_event 24, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 11, 47, 3, 8, 17, 0, 0, 0, SlateportCity_EventScript_1DD1D8, 948, 0, 0 - object_event 25, MAP_OBJ_GFX_MAN_3, 0, 0, 5, 47, 3, 8, 17, 0, 0, 0, SlateportCity_EventScript_1DCDBD, 0, 0, 0 - object_event 26, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 22, 27, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD04E, 882, 0, 0 - object_event 27, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD065, 882, 0, 0 - object_event 28, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 24, 27, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD07C, 882, 0, 0 - object_event 29, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 26, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD093, 882, 0, 0 - object_event 30, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 20, 26, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD0AA, 882, 0, 0 - object_event 31, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 26, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD0C1, 882, 0, 0 - object_event 32, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 28, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD14A, 882, 0, 0 - object_event 33, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 25, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD153, 882, 0, 0 - object_event 34, MAP_OBJ_GFX_WOMAN_2, 0, 0, 11, 37, 3, 9, 33, 0, 0, 0, SlateportCity_EventScript_1DD36E, 0, 0, 0 - object_event 35, MAP_OBJ_GFX_SCOTT, 0, 0, 10, 12, 0, 8, 33, 0, 0, 0, 0x0, 749, 0, 0 +SlateportCity_EventObjects: @ 85261CC + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 21, 11, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DCED9, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 34, 29, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCEF6, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 0, 5, 13, 3, 2, 33, 0, 0, 0, SlateportCity_EventScript_1DCEB8, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 26, 29, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCF17, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 31, 27, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD009, 882, 0, 0 + object_event 6, EVENT_OBJ_GFX_COOK, 0, 0, 5, 43, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCE42, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 20, 37, 3, 1, 17, 0, 0, 0, SlateportCity_EventScript_1DCE63, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 0, 8, 42, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DCE84, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 29, 13, 3, 9, 0, 0, 0, 0, SlateportCity_EventScript_1DD353, 835, 0, 0 + object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 28, 14, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD35C, 835, 0, 0 + object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 28, 13, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD1F8, 840, 0, 0 + object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 0, 37, 41, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DCFE5, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 0, 28, 46, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCFEE, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 9, 50, 3, 3, 16, 0, 0, 0, SlateportCity_EventScript_1DCFF7, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_MAN_4, 0, 0, 16, 46, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DD000, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 24, 3, 3, 16, 0, 0, 0, SlateportCity_EventScript_1DCFBB, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 15, 31, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCFDC, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD020, 882, 0, 0 + object_event 19, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 29, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD037, 882, 0, 0 + object_event 20, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 6, 38, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD198, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 5, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD16A, 0, 0, 0 + object_event 22, EVENT_OBJ_GFX_MAN_6, 0, 0, 34, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD365, 0, 0, 0 + object_event 23, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 47, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCDE4, 0, 0, 0 + object_event 24, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 11, 47, 3, 8, 17, 0, 0, 0, SlateportCity_EventScript_1DD1D8, 948, 0, 0 + object_event 25, EVENT_OBJ_GFX_MAN_3, 0, 0, 5, 47, 3, 8, 17, 0, 0, 0, SlateportCity_EventScript_1DCDBD, 0, 0, 0 + object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 22, 27, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD04E, 882, 0, 0 + object_event 27, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD065, 882, 0, 0 + object_event 28, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 24, 27, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD07C, 882, 0, 0 + object_event 29, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 26, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD093, 882, 0, 0 + object_event 30, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 20, 26, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD0AA, 882, 0, 0 + object_event 31, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 26, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD0C1, 882, 0, 0 + object_event 32, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 28, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD14A, 882, 0, 0 + object_event 33, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 25, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD153, 882, 0, 0 + object_event 34, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 11, 37, 3, 9, 33, 0, 0, 0, SlateportCity_EventScript_1DD36E, 0, 0, 0 + object_event 35, EVENT_OBJ_GFX_SCOTT, 0, 0, 10, 12, 0, 8, 33, 0, 0, 0, 0x0, 749, 0, 0 SlateportCity_MapWarps: @ 8526514 warp_def 19, 19, 0, 0, SLATEPORT_CITY_POKEMON_CENTER_1F @@ -67,5 +67,5 @@ SlateportCity_MapBGEvents: @ 852657C bg_event 10, 36, 0, 1, 0, SlateportCity_EventScript_1DD643 SlateportCity_MapEvents:: @ 8526618 - map_events SlateportCity_MapObjects, SlateportCity_MapWarps, SlateportCity_MapCoordEvents, SlateportCity_MapBGEvents + map_events SlateportCity_EventObjects, SlateportCity_MapWarps, SlateportCity_MapCoordEvents, SlateportCity_MapBGEvents diff --git a/data/maps/events/SlateportCity_BattleTentBattleRoom.inc b/data/maps/events/SlateportCity_BattleTentBattleRoom.inc index 8c13a223ac..f22969d2a1 100644 --- a/data/maps/events/SlateportCity_BattleTentBattleRoom.inc +++ b/data/maps/events/SlateportCity_BattleTentBattleRoom.inc @@ -1,8 +1,8 @@ -SlateportCity_BattleTentBattleRoom_MapObjects: @ 852F4DC - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 4, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 4, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 +SlateportCity_BattleTentBattleRoom_EventObjects: @ 852F4DC + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 4, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 4, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 SlateportCity_BattleTentBattleRoom_MapEvents:: @ 852F524 - map_events SlateportCity_BattleTentBattleRoom_MapObjects, 0x0, 0x0, 0x0 + map_events SlateportCity_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_BattleTentCorridor.inc b/data/maps/events/SlateportCity_BattleTentCorridor.inc index acd0f732c5..6b45c8e268 100644 --- a/data/maps/events/SlateportCity_BattleTentCorridor.inc +++ b/data/maps/events/SlateportCity_BattleTentCorridor.inc @@ -1,6 +1,6 @@ -SlateportCity_BattleTentCorridor_MapObjects: @ 852F4B0 - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 2, 6, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 +SlateportCity_BattleTentCorridor_EventObjects: @ 852F4B0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 2, 6, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 SlateportCity_BattleTentCorridor_MapEvents:: @ 852F4C8 - map_events SlateportCity_BattleTentCorridor_MapObjects, 0x0, 0x0, 0x0 + map_events SlateportCity_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_BattleTentLobby.inc b/data/maps/events/SlateportCity_BattleTentLobby.inc index 7b0f10331e..3368d1ba29 100644 --- a/data/maps/events/SlateportCity_BattleTentLobby.inc +++ b/data/maps/events/SlateportCity_BattleTentLobby.inc @@ -1,9 +1,9 @@ -SlateportCity_BattleTentLobby_MapObjects: @ 852F408 - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_2088AA, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 1, 5, 3, 2, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A3D, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 3, 7, 3, 7, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A7E, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_GIRL_1, 0, 0, 1, 8, 3, 1, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A87, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 0, 11, 8, 3, 9, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0, 0, 0 +SlateportCity_BattleTentLobby_EventObjects: @ 852F408 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_2088AA, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 1, 5, 3, 2, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A3D, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 3, 7, 3, 7, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A7E, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 0, 1, 8, 3, 1, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A87, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 11, 8, 3, 9, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0, 0, 0 SlateportCity_BattleTentLobby_MapWarps: @ 852F480 warp_def 6, 9, 0, 3, SLATEPORT_CITY @@ -13,5 +13,5 @@ SlateportCity_BattleTentLobby_MapBGEvents: @ 852F490 bg_event 4, 5, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A99 SlateportCity_BattleTentLobby_MapEvents:: @ 852F49C - map_events SlateportCity_BattleTentLobby_MapObjects, SlateportCity_BattleTentLobby_MapWarps, 0x0, SlateportCity_BattleTentLobby_MapBGEvents + map_events SlateportCity_BattleTentLobby_EventObjects, SlateportCity_BattleTentLobby_MapWarps, 0x0, SlateportCity_BattleTentLobby_MapBGEvents diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/events/SlateportCity_Harbor.inc index 307cfd1c28..b7a767f3c0 100644 --- a/data/maps/events/SlateportCity_Harbor.inc +++ b/data/maps/events/SlateportCity_Harbor.inc @@ -1,12 +1,12 @@ -SlateportCity_Harbor_MapObjects: @ 852FA68 - object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, 905, 0, 0 - object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 4, 12, 3, 9, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, 905, 0, 0 - object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 1, 12, 3, 10, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, 905, 0, 0 - object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 13, 3, 1, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CCA2, 841, 0, 0 - object_event 5, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 860, 0, 0 - object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 7, 10, 3, 10, 0, 0, 0, 0, 0x0, 845, 0, 0 - object_event 7, MAP_OBJ_GFX_ARCHIE, 0, 0, 8, 10, 3, 9, 0, 0, 0, 0, 0x0, 846, 0, 0 - object_event 8, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 0, 7, 9, 1, 10, 0, 0, 0, 0, 0x0, 848, 0, 0 +SlateportCity_Harbor_EventObjects: @ 852FA68 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, 905, 0, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 4, 12, 3, 9, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, 905, 0, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 1, 12, 3, 10, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, 905, 0, 0 + object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 13, 3, 1, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CCA2, 841, 0, 0 + object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 860, 0, 0 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 7, 10, 3, 10, 0, 0, 0, 0, 0x0, 845, 0, 0 + object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 0, 8, 10, 3, 9, 0, 0, 0, 0, 0x0, 846, 0, 0 + object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 0, 7, 9, 1, 10, 0, 0, 0, 0, 0x0, 848, 0, 0 SlateportCity_Harbor_MapWarps: @ 852FB28 warp_def 11, 14, 0, 8, SLATEPORT_CITY @@ -21,5 +21,5 @@ SlateportCity_Harbor_MapCoordEvents: @ 852FB48 coord_event 8, 14, 3, 0, VAR_0x40A0, 1, 0, SlateportCity_Harbor_EventScript_20C9DF SlateportCity_Harbor_MapEvents:: @ 852FB88 - map_events SlateportCity_Harbor_MapObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0 + map_events SlateportCity_Harbor_EventObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0 diff --git a/data/maps/events/SlateportCity_House1.inc b/data/maps/events/SlateportCity_House1.inc index d5151a0a1c..96bf5fba91 100644 --- a/data/maps/events/SlateportCity_House1.inc +++ b/data/maps/events/SlateportCity_House1.inc @@ -1,10 +1,10 @@ -SlateportCity_House1_MapObjects: @ 852F538 - object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0, 0, 0 +SlateportCity_House1_EventObjects: @ 852F538 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0, 0, 0 SlateportCity_House1_MapWarps: @ 852F550 warp_def 3, 7, 0, 6, SLATEPORT_CITY warp_def 4, 7, 0, 6, SLATEPORT_CITY SlateportCity_House1_MapEvents:: @ 852F560 - map_events SlateportCity_House1_MapObjects, SlateportCity_House1_MapWarps, 0x0, 0x0 + map_events SlateportCity_House1_EventObjects, SlateportCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_House2.inc b/data/maps/events/SlateportCity_House2.inc index f77f344563..4bd43a5d40 100644 --- a/data/maps/events/SlateportCity_House2.inc +++ b/data/maps/events/SlateportCity_House2.inc @@ -1,11 +1,11 @@ -SlateportCity_House2_MapObjects: @ 852FB9C - object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9AF, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9B8, 0, 0, 0 +SlateportCity_House2_EventObjects: @ 852FB9C + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9AF, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9B8, 0, 0, 0 SlateportCity_House2_MapWarps: @ 852FBCC warp_def 3, 7, 0, 10, SLATEPORT_CITY warp_def 4, 7, 0, 10, SLATEPORT_CITY SlateportCity_House2_MapEvents:: @ 852FBDC - map_events SlateportCity_House2_MapObjects, SlateportCity_House2_MapWarps, 0x0, 0x0 + map_events SlateportCity_House2_EventObjects, SlateportCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_Mart.inc b/data/maps/events/SlateportCity_Mart.inc index bab6768de8..c952cf34e9 100644 --- a/data/maps/events/SlateportCity_Mart.inc +++ b/data/maps/events/SlateportCity_Mart.inc @@ -1,12 +1,12 @@ -SlateportCity_Mart_MapObjects: @ 852FCF0 - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC49, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 4, 2, 3, 7, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC76, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 5, 5, 3, 1, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0, 0, 0 +SlateportCity_Mart_EventObjects: @ 852FCF0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC49, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 4, 2, 3, 7, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC76, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 5, 3, 1, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0, 0, 0 SlateportCity_Mart_MapWarps: @ 852FD38 warp_def 3, 7, 0, 1, SLATEPORT_CITY warp_def 4, 7, 0, 1, SLATEPORT_CITY SlateportCity_Mart_MapEvents:: @ 852FD48 - map_events SlateportCity_Mart_MapObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0 + map_events SlateportCity_Mart_EventObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc index 1ae29ed6f3..9f97d892d9 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc @@ -1,18 +1,18 @@ -SlateportCity_OceanicMuseum_1F_MapObjects: @ 852F670 - object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 7, 7, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 18, 5, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, 883, 0, 0 - object_event 3, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 12, 2, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, 883, 0, 0 - object_event 4, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 2, 8, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE56, 883, 0, 0 - object_event 5, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 3, 4, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE4D, 883, 0, 0 - object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 4, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE71, 883, 0, 0 - object_event 7, MAP_OBJ_GFX_BEAUTY, 0, 0, 12, 7, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 3, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE7A, 883, 0, 0 - object_event 9, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 2, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, 961, 0, 0 - object_event 10, MAP_OBJ_GFX_MANIAC, 0, 0, 10, 2, 3, 7, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, 961, 0, 0 - object_event 11, MAP_OBJ_GFX_MAN_3, 0, 0, 17, 7, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, 961, 0, 0 - object_event 12, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 18, 8, 3, 7, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, 961, 0, 0 - object_event 13, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 9, 4, 3, 21, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, 965, 0, 0 - object_event 14, MAP_OBJ_GFX_REPORTER_M, 0, 0, 7, 4, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, 961, 0, 0 +SlateportCity_OceanicMuseum_1F_EventObjects: @ 852F670 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 7, 7, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 18, 5, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, 883, 0, 0 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 12, 2, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, 883, 0, 0 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 2, 8, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE56, 883, 0, 0 + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 3, 4, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE4D, 883, 0, 0 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 4, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE71, 883, 0, 0 + object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 0, 12, 7, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 3, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE7A, 883, 0, 0 + object_event 9, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 2, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, 961, 0, 0 + object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 0, 10, 2, 3, 7, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, 961, 0, 0 + object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 0, 17, 7, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, 961, 0, 0 + object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 18, 8, 3, 7, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, 961, 0, 0 + object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 9, 4, 3, 21, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, 965, 0, 0 + object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 0, 7, 4, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, 961, 0, 0 SlateportCity_OceanicMuseum_1F_MapWarps: @ 852F7C0 warp_def 9, 8, 0, 5, SLATEPORT_CITY @@ -39,5 +39,5 @@ SlateportCity_OceanicMuseum_1F_MapBGEvents: @ 852F7F8 bg_event 17, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AECB SlateportCity_OceanicMuseum_1F_MapEvents:: @ 852F894 - map_events SlateportCity_OceanicMuseum_1F_MapObjects, SlateportCity_OceanicMuseum_1F_MapWarps, SlateportCity_OceanicMuseum_1F_MapCoordEvents, SlateportCity_OceanicMuseum_1F_MapBGEvents + map_events SlateportCity_OceanicMuseum_1F_EventObjects, SlateportCity_OceanicMuseum_1F_MapWarps, SlateportCity_OceanicMuseum_1F_MapCoordEvents, SlateportCity_OceanicMuseum_1F_MapBGEvents diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc index 5c3f7108d7..4bad8a43df 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc @@ -1,11 +1,11 @@ -SlateportCity_OceanicMuseum_2F_MapObjects: @ 852F8A8 - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 13, 6, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, 887, 0, 0 - object_event 2, MAP_OBJ_GFX_ARCHIE, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 886, 0, 0 - object_event 3, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 884, 0, 0 - object_event 4, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 885, 0, 0 - object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 12, 7, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, 961, 0, 0 - object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 0, 9, 6, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, 961, 0, 0 - object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 3, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, 961, 0, 0 +SlateportCity_OceanicMuseum_2F_EventObjects: @ 852F8A8 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 13, 6, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, 887, 0, 0 + object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 886, 0, 0 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 884, 0, 0 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 885, 0, 0 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 12, 7, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, 961, 0, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 9, 6, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, 961, 0, 0 + object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 3, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, 961, 0, 0 SlateportCity_OceanicMuseum_2F_MapWarps: @ 852F950 warp_def 6, 1, 0, 2, SLATEPORT_CITY_OCEANIC_MUSEUM_1F @@ -34,5 +34,5 @@ SlateportCity_OceanicMuseum_2F_MapBGEvents: @ 852F958 bg_event 4, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 SlateportCity_OceanicMuseum_2F_MapEvents:: @ 852FA54 - map_events SlateportCity_OceanicMuseum_2F_MapObjects, SlateportCity_OceanicMuseum_2F_MapWarps, 0x0, SlateportCity_OceanicMuseum_2F_MapBGEvents + map_events SlateportCity_OceanicMuseum_2F_EventObjects, SlateportCity_OceanicMuseum_2F_MapWarps, 0x0, SlateportCity_OceanicMuseum_2F_MapBGEvents diff --git a/data/maps/events/SlateportCity_PokemonCenter_1F.inc b/data/maps/events/SlateportCity_PokemonCenter_1F.inc index 52f406b718..4a63356959 100644 --- a/data/maps/events/SlateportCity_PokemonCenter_1F.inc +++ b/data/maps/events/SlateportCity_PokemonCenter_1F.inc @@ -1,7 +1,7 @@ -SlateportCity_PokemonCenter_1F_MapObjects: @ 852FBF0 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAD3, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAE1, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0, 0, 0 +SlateportCity_PokemonCenter_1F_EventObjects: @ 852FBF0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAD3, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAE1, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0, 0, 0 SlateportCity_PokemonCenter_1F_MapWarps: @ 852FC38 warp_def 7, 8, 3, 0, SLATEPORT_CITY @@ -9,5 +9,5 @@ SlateportCity_PokemonCenter_1F_MapWarps: @ 852FC38 warp_def 1, 6, 4, 0, SLATEPORT_CITY_POKEMON_CENTER_2F SlateportCity_PokemonCenter_1F_MapEvents:: @ 852FC50 - map_events SlateportCity_PokemonCenter_1F_MapObjects, SlateportCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events SlateportCity_PokemonCenter_1F_EventObjects, SlateportCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_PokemonCenter_2F.inc b/data/maps/events/SlateportCity_PokemonCenter_2F.inc index cd9f74d39a..43938e550b 100644 --- a/data/maps/events/SlateportCity_PokemonCenter_2F.inc +++ b/data/maps/events/SlateportCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -SlateportCity_PokemonCenter_2F_MapObjects: @ 852FC64 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +SlateportCity_PokemonCenter_2F_EventObjects: @ 852FC64 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 SlateportCity_PokemonCenter_2F_MapWarps: @ 852FCC4 warp_def 1, 6, 4, 2, SLATEPORT_CITY_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ SlateportCity_PokemonCenter_2F_MapWarps: @ 852FCC4 warp_def 9, 1, 3, 0, TRADE_CENTER SlateportCity_PokemonCenter_2F_MapEvents:: @ 852FCDC - map_events SlateportCity_PokemonCenter_2F_MapObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events SlateportCity_PokemonCenter_2F_EventObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_PokemonFanClub.inc b/data/maps/events/SlateportCity_PokemonFanClub.inc index ba18519ef9..db5a8b97c7 100644 --- a/data/maps/events/SlateportCity_PokemonFanClub.inc +++ b/data/maps/events/SlateportCity_PokemonFanClub.inc @@ -1,18 +1,18 @@ -SlateportCity_PokemonFanClub_MapObjects: @ 852F574 - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 11, 4, 0, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1E8, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 1, 5, 0, 3, 16, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1F1, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_REPORTER_F, 0, 0, 11, 5, 0, 7, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_28C943, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 0, 6, 2, 3, 1, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A17E, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 6, 5, 4, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_209E96, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 3, 9, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A20D, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_SKITTY, 0, 0, 8, 3, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1FA, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_AZUMARILL, 0, 0, 10, 8, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A220, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_MAN_5, 0, 0, 11, 8, 0, 9, 16, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0, 0, 0 +SlateportCity_PokemonFanClub_EventObjects: @ 852F574 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 11, 4, 0, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1E8, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 1, 5, 0, 3, 16, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1F1, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 11, 5, 0, 7, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_28C943, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 6, 2, 3, 1, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A17E, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 6, 5, 4, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_209E96, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 3, 9, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A20D, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_SKITTY, 0, 0, 8, 3, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1FA, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 10, 8, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A220, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_MAN_5, 0, 0, 11, 8, 0, 9, 16, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0, 0, 0 SlateportCity_PokemonFanClub_MapWarps: @ 852F64C warp_def 6, 10, 0, 4, SLATEPORT_CITY warp_def 7, 10, 0, 4, SLATEPORT_CITY SlateportCity_PokemonFanClub_MapEvents:: @ 852F65C - map_events SlateportCity_PokemonFanClub_MapObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0 + map_events SlateportCity_PokemonFanClub_EventObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.inc b/data/maps/events/SlateportCity_SternsShipyard_1F.inc index 07e93e516b..6169dad1bc 100644 --- a/data/maps/events/SlateportCity_SternsShipyard_1F.inc +++ b/data/maps/events/SlateportCity_SternsShipyard_1F.inc @@ -1,8 +1,8 @@ -SlateportCity_SternsShipyard_1F_MapObjects: @ 852F318 - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 5, 5, 3, 8, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207F40, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FED, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 18, 8, 3, 5, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FF6, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 11, 3, 2, 33, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, 869, 0, 0 +SlateportCity_SternsShipyard_1F_EventObjects: @ 852F318 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 5, 5, 3, 8, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207F40, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FED, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 18, 8, 3, 5, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FF6, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 11, 3, 2, 33, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, 869, 0, 0 SlateportCity_SternsShipyard_1F_MapWarps: @ 852F378 warp_def 2, 14, 0, 2, SLATEPORT_CITY @@ -10,5 +10,5 @@ SlateportCity_SternsShipyard_1F_MapWarps: @ 852F378 warp_def 3, 1, 0, 0, SLATEPORT_CITY_STERNS_SHIPYARD_2F SlateportCity_SternsShipyard_1F_MapEvents:: @ 852F390 - map_events SlateportCity_SternsShipyard_1F_MapObjects, SlateportCity_SternsShipyard_1F_MapWarps, 0x0, 0x0 + map_events SlateportCity_SternsShipyard_1F_EventObjects, SlateportCity_SternsShipyard_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_SternsShipyard_2F.inc b/data/maps/events/SlateportCity_SternsShipyard_2F.inc index d43e455687..8224ed8ff9 100644 --- a/data/maps/events/SlateportCity_SternsShipyard_2F.inc +++ b/data/maps/events/SlateportCity_SternsShipyard_2F.inc @@ -1,11 +1,11 @@ -SlateportCity_SternsShipyard_2F_MapObjects: @ 852F3A4 - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 4, 3, 10, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_20863E, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 9, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_208647, 0, 0, 0 +SlateportCity_SternsShipyard_2F_EventObjects: @ 852F3A4 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 4, 3, 10, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_20863E, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 9, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_208647, 0, 0, 0 SlateportCity_SternsShipyard_2F_MapWarps: @ 852F3EC warp_def 3, 1, 0, 2, SLATEPORT_CITY_STERNS_SHIPYARD_1F SlateportCity_SternsShipyard_2F_MapEvents:: @ 852F3F4 - map_events SlateportCity_SternsShipyard_2F_MapObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0 + map_events SlateportCity_SternsShipyard_2F_EventObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/events/SootopolisCity.inc index 6f3bb0111a..acb70f2856 100644 --- a/data/maps/events/SootopolisCity.inc +++ b/data/maps/events/SootopolisCity.inc @@ -1,22 +1,22 @@ -SootopolisCity_MapObjects: @ 8527314 - object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 31, 18, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 0, 47, 33, 0, 9, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, 854, 0, 0 - object_event 3, MAP_OBJ_GFX_GIRL_2, 0, 0, 9, 43, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E5ED8, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 51, 14, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E608E, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BOY_1, 0, 0, 43, 26, 3, 1, 0, 0, 0, 0, SootopolisCity_EventScript_1E60E3, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_1, 0, 0, 26, 4, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E6017, 839, 0, 0 - object_event 7, MAP_OBJ_GFX_STEVEN, 0, 0, 20, 36, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E6166, 973, 0, 0 - object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 0, 49, 34, 3, 3, 17, 0, 0, 0, SootopolisCity_EventScript_1E6038, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_GROUDON_3, 0, 0, 28, 44, 0, 80, 17, 0, 0, 0, 0x0, 998, 0, 0 - object_event 10, MAP_OBJ_GFX_KYOGRE_3, 0, 0, 34, 44, 1, 79, 17, 0, 0, 0, 0x0, 997, 0, 0 - object_event 11, MAP_OBJ_GFX_RAYQUAZA_2, 0, 0, 31, 41, 1, 10, 17, 0, 0, 0, 0x0, 996, 0, 0 - object_event 12, MAP_OBJ_GFX_MANIAC, 0, 0, 17, 44, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E6411, 854, 0, 0 - object_event 13, MAP_OBJ_GFX_GIRL_3, 0, 0, 14, 42, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E63DB, 854, 0, 0 - object_event 14, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 17, 40, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E6393, 854, 0, 0 - object_event 15, MAP_OBJ_GFX_BOY_2, 0, 0, 19, 37, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E635D, 854, 0, 0 - object_event 16, MAP_OBJ_GFX_MAXIE, 0, 0, 29, 33, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E64F2, 827, 0, 0 - object_event 17, MAP_OBJ_GFX_ARCHIE, 0, 0, 31, 33, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E651F, 826, 0, 0 - object_event 18, MAP_OBJ_GFX_WALLACE, 0, 0, 31, 18, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E6446, 816, 0, 0 +SootopolisCity_EventObjects: @ 8527314 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 31, 18, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 47, 33, 0, 9, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, 854, 0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 0, 9, 43, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E5ED8, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 51, 14, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E608E, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 0, 43, 26, 3, 1, 0, 0, 0, 0, SootopolisCity_EventScript_1E60E3, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 0, 26, 4, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E6017, 839, 0, 0 + object_event 7, EVENT_OBJ_GFX_STEVEN, 0, 0, 20, 36, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E6166, 973, 0, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 49, 34, 3, 3, 17, 0, 0, 0, SootopolisCity_EventScript_1E6038, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_GROUDON_3, 0, 0, 28, 44, 0, 80, 17, 0, 0, 0, 0x0, 998, 0, 0 + object_event 10, EVENT_OBJ_GFX_KYOGRE_3, 0, 0, 34, 44, 1, 79, 17, 0, 0, 0, 0x0, 997, 0, 0 + object_event 11, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 0, 31, 41, 1, 10, 17, 0, 0, 0, 0x0, 996, 0, 0 + object_event 12, EVENT_OBJ_GFX_MANIAC, 0, 0, 17, 44, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E6411, 854, 0, 0 + object_event 13, EVENT_OBJ_GFX_GIRL_3, 0, 0, 14, 42, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E63DB, 854, 0, 0 + object_event 14, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 17, 40, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E6393, 854, 0, 0 + object_event 15, EVENT_OBJ_GFX_BOY_2, 0, 0, 19, 37, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E635D, 854, 0, 0 + object_event 16, EVENT_OBJ_GFX_MAXIE, 0, 0, 29, 33, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E64F2, 827, 0, 0 + object_event 17, EVENT_OBJ_GFX_ARCHIE, 0, 0, 31, 33, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E651F, 826, 0, 0 + object_event 18, EVENT_OBJ_GFX_WALLACE, 0, 0, 31, 18, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E6446, 816, 0, 0 SootopolisCity_MapWarps: @ 85274C4 warp_def 43, 31, 0, 0, SOOTOPOLIS_CITY_POKEMON_CENTER_1F @@ -42,5 +42,5 @@ SootopolisCity_MapBGEvents: @ 852752C bg_event 41, 37, 0, 0, 0, SootopolisCity_EventScript_1E6154 SootopolisCity_MapEvents:: @ 8527574 - map_events SootopolisCity_MapObjects, SootopolisCity_MapWarps, 0x0, SootopolisCity_MapBGEvents + map_events SootopolisCity_EventObjects, SootopolisCity_MapWarps, 0x0, SootopolisCity_MapBGEvents diff --git a/data/maps/events/SootopolisCity_Gym_1F.inc b/data/maps/events/SootopolisCity_Gym_1F.inc index b348cebcfa..60e02f3fbd 100644 --- a/data/maps/events/SootopolisCity_Gym_1F.inc +++ b/data/maps/events/SootopolisCity_Gym_1F.inc @@ -1,6 +1,6 @@ -SootopolisCity_Gym_1F_MapObjects: @ 8532FF4 - object_event 1, MAP_OBJ_GFX_JUAN, 0, 0, 8, 2, 0, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_224F44, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_2, 0, 0, 7, 24, 3, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_225040, 0, 0, 0 +SootopolisCity_Gym_1F_EventObjects: @ 8532FF4 + object_event 1, EVENT_OBJ_GFX_JUAN, 0, 0, 8, 2, 0, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_224F44, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 0, 7, 24, 3, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_225040, 0, 0, 0 SootopolisCity_Gym_1F_MapWarps: @ 8533024 warp_def 8, 25, 0, 2, SOOTOPOLIS_CITY @@ -12,5 +12,5 @@ SootopolisCity_Gym_1F_MapBGEvents: @ 853303C bg_event 10, 24, 0, 1, 0, SootopolisCity_Gym_1F_EventScript_22506F SootopolisCity_Gym_1F_MapEvents:: @ 8533054 - map_events SootopolisCity_Gym_1F_MapObjects, SootopolisCity_Gym_1F_MapWarps, 0x0, SootopolisCity_Gym_1F_MapBGEvents + map_events SootopolisCity_Gym_1F_EventObjects, SootopolisCity_Gym_1F_MapWarps, 0x0, SootopolisCity_Gym_1F_MapBGEvents diff --git a/data/maps/events/SootopolisCity_Gym_B1F.inc b/data/maps/events/SootopolisCity_Gym_B1F.inc index 9e0dcbadd9..1d490490dc 100644 --- a/data/maps/events/SootopolisCity_Gym_B1F.inc +++ b/data/maps/events/SootopolisCity_Gym_B1F.inc @@ -1,18 +1,18 @@ -SootopolisCity_Gym_B1F_MapObjects: @ 8533068 - object_event 1, MAP_OBJ_GFX_LASS, 0, 0, 7, 17, 3, 10, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225C8B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BEAUTY, 0, 0, 9, 19, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CD0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_3, 0, 0, 12, 7, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CB9, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 0, 11, 9, 0, 7, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_225CE7, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BEAUTY, 0, 0, 5, 6, 3, 8, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_225D15, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 0, 7, 8, 3, 10, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225D2C, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_LASS, 0, 0, 4, 8, 3, 10, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225CA2, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BEAUTY, 0, 0, 9, 7, 3, 8, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225CFE, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_WOMAN_3, 0, 0, 6, 13, 3, 10, 17, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D5A, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_WOMAN_2, 0, 0, 10, 13, 3, 9, 17, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0, 0, 0 +SootopolisCity_Gym_B1F_EventObjects: @ 8533068 + object_event 1, EVENT_OBJ_GFX_LASS, 0, 0, 7, 17, 3, 10, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225C8B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 0, 9, 19, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CD0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 12, 7, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CB9, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 0, 11, 9, 0, 7, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_225CE7, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 0, 5, 6, 3, 8, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_225D15, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 7, 8, 3, 10, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225D2C, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_LASS, 0, 0, 4, 8, 3, 10, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225CA2, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_BEAUTY, 0, 0, 9, 7, 3, 8, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225CFE, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 6, 13, 3, 10, 17, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D5A, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 10, 13, 3, 9, 17, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0, 0, 0 SootopolisCity_Gym_B1F_MapWarps: @ 8533158 warp_def 11, 22, 3, 2, SOOTOPOLIS_CITY_GYM_1F SootopolisCity_Gym_B1F_MapEvents:: @ 8533160 - map_events SootopolisCity_Gym_B1F_MapObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0 + map_events SootopolisCity_Gym_B1F_EventObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House1.inc b/data/maps/events/SootopolisCity_House1.inc index b7eb626e01..eaaf2d3342 100644 --- a/data/maps/events/SootopolisCity_House1.inc +++ b/data/maps/events/SootopolisCity_House1.inc @@ -1,11 +1,11 @@ -SootopolisCity_House1_MapObjects: @ 85332F8 - object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22694D, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_KECLEON_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22698E, 0, 0, 0 +SootopolisCity_House1_EventObjects: @ 85332F8 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22694D, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22698E, 0, 0, 0 SootopolisCity_House1_MapWarps: @ 8533328 warp_def 3, 6, 0, 4, SOOTOPOLIS_CITY warp_def 4, 6, 0, 4, SOOTOPOLIS_CITY SootopolisCity_House1_MapEvents:: @ 8533338 - map_events SootopolisCity_House1_MapObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0 + map_events SootopolisCity_House1_EventObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House2.inc b/data/maps/events/SootopolisCity_House2.inc index 98b1b6712f..d00a1fa5f2 100644 --- a/data/maps/events/SootopolisCity_House2.inc +++ b/data/maps/events/SootopolisCity_House2.inc @@ -1,10 +1,10 @@ -SootopolisCity_House2_MapObjects: @ 853334C - object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0, 0, 0 +SootopolisCity_House2_EventObjects: @ 853334C + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0, 0, 0 SootopolisCity_House2_MapWarps: @ 8533364 warp_def 3, 6, 0, 5, SOOTOPOLIS_CITY warp_def 4, 6, 0, 5, SOOTOPOLIS_CITY SootopolisCity_House2_MapEvents:: @ 8533374 - map_events SootopolisCity_House2_MapObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0 + map_events SootopolisCity_House2_EventObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House3.inc b/data/maps/events/SootopolisCity_House3.inc index eaf48fd6e1..b6407478ce 100644 --- a/data/maps/events/SootopolisCity_House3.inc +++ b/data/maps/events/SootopolisCity_House3.inc @@ -1,11 +1,11 @@ -SootopolisCity_House3_MapObjects: @ 8533388 - object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 0, 2, 4, 3, 8, 0, 0, 0, 0, SootopolisCity_House3_EventScript_226B72, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_House3_EventScript_226B9B, 0, 0, 0 +SootopolisCity_House3_EventObjects: @ 8533388 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 2, 4, 3, 8, 0, 0, 0, 0, SootopolisCity_House3_EventScript_226B72, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_House3_EventScript_226B9B, 0, 0, 0 SootopolisCity_House3_MapWarps: @ 85333B8 warp_def 3, 6, 0, 6, SOOTOPOLIS_CITY warp_def 4, 6, 0, 6, SOOTOPOLIS_CITY SootopolisCity_House3_MapEvents:: @ 85333C8 - map_events SootopolisCity_House3_MapObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0 + map_events SootopolisCity_House3_EventObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House4.inc b/data/maps/events/SootopolisCity_House4.inc index eb41cbafbd..223cc4f0da 100644 --- a/data/maps/events/SootopolisCity_House4.inc +++ b/data/maps/events/SootopolisCity_House4.inc @@ -1,12 +1,12 @@ -SootopolisCity_House4_MapObjects: @ 85333DC - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House4_EventScript_226D16, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 0, 5, 2, 3, 7, 33, 0, 0, 0, SootopolisCity_House4_EventScript_226D1F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_AZUMARILL, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, SootopolisCity_House4_EventScript_226D28, 0, 0, 0 +SootopolisCity_House4_EventObjects: @ 85333DC + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House4_EventScript_226D16, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 5, 2, 3, 7, 33, 0, 0, 0, SootopolisCity_House4_EventScript_226D1F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, SootopolisCity_House4_EventScript_226D28, 0, 0, 0 SootopolisCity_House4_MapWarps: @ 8533424 warp_def 3, 6, 0, 7, SOOTOPOLIS_CITY warp_def 4, 6, 0, 7, SOOTOPOLIS_CITY SootopolisCity_House4_MapEvents:: @ 8533434 - map_events SootopolisCity_House4_MapObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0 + map_events SootopolisCity_House4_EventObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House5.inc b/data/maps/events/SootopolisCity_House5.inc index 5bffec9123..66a804c1aa 100644 --- a/data/maps/events/SootopolisCity_House5.inc +++ b/data/maps/events/SootopolisCity_House5.inc @@ -1,11 +1,11 @@ -SootopolisCity_House5_MapObjects: @ 8533448 - object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E94, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E9D, 0, 0, 0 +SootopolisCity_House5_EventObjects: @ 8533448 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E94, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E9D, 0, 0, 0 SootopolisCity_House5_MapWarps: @ 8533478 warp_def 3, 6, 0, 8, SOOTOPOLIS_CITY warp_def 4, 6, 0, 8, SOOTOPOLIS_CITY SootopolisCity_House5_MapEvents:: @ 8533488 - map_events SootopolisCity_House5_MapObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0 + map_events SootopolisCity_House5_EventObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House6.inc b/data/maps/events/SootopolisCity_House6.inc index 5f0f5d4307..2c27b4ef28 100644 --- a/data/maps/events/SootopolisCity_House6.inc +++ b/data/maps/events/SootopolisCity_House6.inc @@ -1,10 +1,10 @@ -SootopolisCity_House6_MapObjects: @ 853349C - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 4, 3, 3, 2, 17, 0, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0, 0, 0 +SootopolisCity_House6_EventObjects: @ 853349C + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 4, 3, 3, 2, 17, 0, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0, 0, 0 SootopolisCity_House6_MapWarps: @ 85334B4 warp_def 3, 6, 0, 9, SOOTOPOLIS_CITY warp_def 4, 6, 0, 9, SOOTOPOLIS_CITY SootopolisCity_House6_MapEvents:: @ 85334C4 - map_events SootopolisCity_House6_MapObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0 + map_events SootopolisCity_House6_EventObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House7.inc b/data/maps/events/SootopolisCity_House7.inc index 3a18508a24..fbbbc55793 100644 --- a/data/maps/events/SootopolisCity_House7.inc +++ b/data/maps/events/SootopolisCity_House7.inc @@ -1,11 +1,11 @@ -SootopolisCity_House7_MapObjects: @ 85334D8 - object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House7_EventScript_2270CC, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 1, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0, 0, 0 +SootopolisCity_House7_EventObjects: @ 85334D8 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House7_EventScript_2270CC, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 1, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0, 0, 0 SootopolisCity_House7_MapWarps: @ 8533508 warp_def 3, 6, 0, 10, SOOTOPOLIS_CITY warp_def 4, 6, 0, 10, SOOTOPOLIS_CITY SootopolisCity_House7_MapEvents:: @ 8533518 - map_events SootopolisCity_House7_MapObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0 + map_events SootopolisCity_House7_EventObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc b/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc index 0dcb79d1b3..ffd6fe203f 100644 --- a/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc +++ b/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc @@ -1,6 +1,6 @@ -SootopolisCity_LotadAndSeedotHouse_MapObjects: @ 853352C - object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_HIKER, 0, 0, 5, 4, 3, 9, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22722B, 0, 0, 0 +SootopolisCity_LotadAndSeedotHouse_EventObjects: @ 853352C + object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 5, 4, 3, 9, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22722B, 0, 0, 0 SootopolisCity_LotadAndSeedotHouse_MapWarps: @ 853355C warp_def 3, 6, 0, 11, SOOTOPOLIS_CITY @@ -11,5 +11,5 @@ SootopolisCity_LotadAndSeedotHouse_MapBGEvents: @ 853356C bg_event 2, 1, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22735B SootopolisCity_LotadAndSeedotHouse_MapEvents:: @ 8533584 - map_events SootopolisCity_LotadAndSeedotHouse_MapObjects, SootopolisCity_LotadAndSeedotHouse_MapWarps, 0x0, SootopolisCity_LotadAndSeedotHouse_MapBGEvents + map_events SootopolisCity_LotadAndSeedotHouse_EventObjects, SootopolisCity_LotadAndSeedotHouse_MapWarps, 0x0, SootopolisCity_LotadAndSeedotHouse_MapBGEvents diff --git a/data/maps/events/SootopolisCity_Mart.inc b/data/maps/events/SootopolisCity_Mart.inc index de29f556be..30ff856208 100644 --- a/data/maps/events/SootopolisCity_Mart.inc +++ b/data/maps/events/SootopolisCity_Mart.inc @@ -1,12 +1,12 @@ -SootopolisCity_Mart_MapObjects: @ 853328C - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_226795, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267C2, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 9, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267EC, 0, 0, 0 +SootopolisCity_Mart_EventObjects: @ 853328C + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_226795, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267C2, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 9, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267EC, 0, 0, 0 SootopolisCity_Mart_MapWarps: @ 85332D4 warp_def 3, 7, 0, 1, SOOTOPOLIS_CITY warp_def 4, 7, 0, 1, SOOTOPOLIS_CITY SootopolisCity_Mart_MapEvents:: @ 85332E4 - map_events SootopolisCity_Mart_MapObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0 + map_events SootopolisCity_Mart_EventObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc b/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc index 69865a2aae..f6efd8225e 100644 --- a/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc +++ b/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc @@ -1,5 +1,5 @@ -SootopolisCity_MysteryEventsHouse_1F_MapObjects: @ 8533598 - object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 6, 4, 0, 10, 0, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0, 0, 0 +SootopolisCity_MysteryEventsHouse_1F_EventObjects: @ 8533598 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 6, 4, 0, 10, 0, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0, 0, 0 SootopolisCity_MysteryEventsHouse_1F_MapWarps: @ 85335B0 warp_def 3, 7, 0, 12, SOOTOPOLIS_CITY @@ -7,5 +7,5 @@ SootopolisCity_MysteryEventsHouse_1F_MapWarps: @ 85335B0 warp_def 3, 1, 3, 0, SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F SootopolisCity_MysteryEventsHouse_1F_MapEvents:: @ 85335C8 - map_events SootopolisCity_MysteryEventsHouse_1F_MapObjects, SootopolisCity_MysteryEventsHouse_1F_MapWarps, 0x0, 0x0 + map_events SootopolisCity_MysteryEventsHouse_1F_EventObjects, SootopolisCity_MysteryEventsHouse_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc index 2a02e72f28..faec348c29 100644 --- a/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc +++ b/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc @@ -1,9 +1,9 @@ -SootopolisCity_MysteryEventsHouse_B1F_MapObjects: @ 85335DC - object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 6, 5, 0, 9, 17, 0, 0, 0, 0x0, 0, 0, 0 +SootopolisCity_MysteryEventsHouse_B1F_EventObjects: @ 85335DC + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 5, 0, 9, 17, 0, 0, 0, 0x0, 0, 0, 0 SootopolisCity_MysteryEventsHouse_B1F_MapWarps: @ 85335F4 warp_def 3, 1, 0, 2, SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F SootopolisCity_MysteryEventsHouse_B1F_MapEvents:: @ 85335FC - map_events SootopolisCity_MysteryEventsHouse_B1F_MapObjects, SootopolisCity_MysteryEventsHouse_B1F_MapWarps, 0x0, 0x0 + map_events SootopolisCity_MysteryEventsHouse_B1F_EventObjects, SootopolisCity_MysteryEventsHouse_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc index 669ce88ae1..afb2d586b2 100644 --- a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc +++ b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ -SootopolisCity_PokemonCenter_1F_MapObjects: @ 8533174 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226500, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 12, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_22650E, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 7, 3, 5, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226538, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_1, 0, 0, 2, 3, 3, 2, 17, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_2C8256, 0, 0, 0 +SootopolisCity_PokemonCenter_1F_EventObjects: @ 8533174 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226500, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 12, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_22650E, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 7, 3, 5, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226538, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 2, 3, 3, 2, 17, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_2C8256, 0, 0, 0 SootopolisCity_PokemonCenter_1F_MapWarps: @ 85331D4 warp_def 7, 8, 3, 0, SOOTOPOLIS_CITY @@ -10,5 +10,5 @@ SootopolisCity_PokemonCenter_1F_MapWarps: @ 85331D4 warp_def 1, 6, 4, 0, SOOTOPOLIS_CITY_POKEMON_CENTER_2F SootopolisCity_PokemonCenter_1F_MapEvents:: @ 85331EC - map_events SootopolisCity_PokemonCenter_1F_MapObjects, SootopolisCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events SootopolisCity_PokemonCenter_1F_EventObjects, SootopolisCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc index d063a7666f..21be152fae 100644 --- a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc +++ b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -SootopolisCity_PokemonCenter_2F_MapObjects: @ 8533200 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +SootopolisCity_PokemonCenter_2F_EventObjects: @ 8533200 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 SootopolisCity_PokemonCenter_2F_MapWarps: @ 8533260 warp_def 1, 6, 4, 2, SOOTOPOLIS_CITY_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ SootopolisCity_PokemonCenter_2F_MapWarps: @ 8533260 warp_def 9, 1, 3, 0, TRADE_CENTER SootopolisCity_PokemonCenter_2F_MapEvents:: @ 8533278 - map_events SootopolisCity_PokemonCenter_2F_MapObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events SootopolisCity_PokemonCenter_2F_EventObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SouthernIsland_Exterior.inc b/data/maps/events/SouthernIsland_Exterior.inc index 7c6bc41284..11cc35658e 100644 --- a/data/maps/events/SouthernIsland_Exterior.inc +++ b/data/maps/events/SouthernIsland_Exterior.inc @@ -1,6 +1,6 @@ -SouthernIsland_Exterior_MapObjects: @ 853B83C - object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 13, 23, 3, 7, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_2429D2, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 13, 25, 1, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 +SouthernIsland_Exterior_EventObjects: @ 853B83C + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 13, 23, 3, 7, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_2429D2, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 13, 25, 1, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 SouthernIsland_Exterior_MapWarps: @ 853B86C warp_def 14, 5, 3, 0, SOUTHERN_ISLAND_INTERIOR @@ -10,5 +10,5 @@ SouthernIsland_Exterior_MapBGEvents: @ 853B87C bg_event 16, 7, 3, 0, 0, SouthernIsland_Exterior_EventScript_242A3C SouthernIsland_Exterior_MapEvents:: @ 853B888 - map_events SouthernIsland_Exterior_MapObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents + map_events SouthernIsland_Exterior_EventObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents diff --git a/data/maps/events/SouthernIsland_Interior.inc b/data/maps/events/SouthernIsland_Interior.inc index a304f18327..6a89414b21 100644 --- a/data/maps/events/SouthernIsland_Interior.inc +++ b/data/maps/events/SouthernIsland_Interior.inc @@ -1,6 +1,6 @@ -SouthernIsland_Interior_MapObjects: @ 853B89C - object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 13, 12, 3, 7, 0, 0, 0, 0, 0x0, 910, 0, 0 - object_event 2, MAP_OBJ_GFX_TRADER, 0, 0, 13, 2, 0, 8, 0, 0, 0, 0, 0x0, 911, 0, 0 +SouthernIsland_Interior_EventObjects: @ 853B89C + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 13, 12, 3, 7, 0, 0, 0, 0, 0x0, 910, 0, 0 + object_event 2, EVENT_OBJ_GFX_TRADER, 0, 0, 13, 2, 0, 8, 0, 0, 0, 0, 0x0, 911, 0, 0 SouthernIsland_Interior_MapWarps: @ 853B8CC warp_def 13, 18, 3, 0, SOUTHERN_ISLAND_EXTERIOR @@ -10,5 +10,5 @@ SouthernIsland_Interior_MapBGEvents: @ 853B8DC bg_event 13, 11, 3, 1, 0, SouthernIsland_Interior_EventScript_242AC4 SouthernIsland_Interior_MapEvents:: @ 853B8E8 - map_events SouthernIsland_Interior_MapObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents + map_events SouthernIsland_Interior_EventObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents diff --git a/data/maps/events/TerraCave_End.inc b/data/maps/events/TerraCave_End.inc index 0e3c0f0bbb..88dbdf09a9 100644 --- a/data/maps/events/TerraCave_End.inc +++ b/data/maps/events/TerraCave_End.inc @@ -1,5 +1,5 @@ -TerraCave_End_MapObjects: @ 8537850 - object_event 1, MAP_OBJ_GFX_GROUDON_1, 0, 0, 17, 22, 1, 8, 17, 0, 0, 0, 0x0, 783, 0, 0 +TerraCave_End_EventObjects: @ 8537850 + object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 0, 17, 22, 1, 8, 17, 0, 0, 0, 0x0, 783, 0, 0 TerraCave_End_MapWarps: @ 8537868 warp_def 5, 4, 3, 1, TERRA_CAVE_ENTRANCE @@ -8,5 +8,5 @@ TerraCave_End_MapCoordEvents: @ 8537870 coord_event 17, 26, 3, 0, VAR_TEMP_1, 1, 0, TerraCave_End_EventScript_23B0EC TerraCave_End_MapEvents:: @ 8537880 - map_events TerraCave_End_MapObjects, TerraCave_End_MapWarps, TerraCave_End_MapCoordEvents, 0x0 + map_events TerraCave_End_EventObjects, TerraCave_End_MapWarps, TerraCave_End_MapCoordEvents, 0x0 diff --git a/data/maps/events/TradeCenter.inc b/data/maps/events/TradeCenter.inc index dea4f52c3f..25dbd31390 100644 --- a/data/maps/events/TradeCenter.inc +++ b/data/maps/events/TradeCenter.inc @@ -1,5 +1,5 @@ -TradeCenter_MapObjects: @ 8539DA0 - object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0, 0, 0 +TradeCenter_EventObjects: @ 8539DA0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0, 0, 0 TradeCenter_MapWarps: @ 8539DB8 warp_def 5, 8, 3, 127, NONE @@ -10,5 +10,5 @@ TradeCenter_MapCoordEvents: @ 8539DC8 coord_event 7, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773FF TradeCenter_MapEvents:: @ 8539DE8 - map_events TradeCenter_MapObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 + map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 diff --git a/data/maps/events/TrainerHill_Elevator.inc b/data/maps/events/TrainerHill_Elevator.inc index 8734958768..0a84d3b512 100644 --- a/data/maps/events/TrainerHill_Elevator.inc +++ b/data/maps/events/TrainerHill_Elevator.inc @@ -1,10 +1,10 @@ -TrainerHill_Elevator_MapObjects: @ 853DD84 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 0, 6, 3, 8, 17, 0, 0, 0, TrainerHill_Elevator_EventScript_26935F, 0, 0, 0 +TrainerHill_Elevator_EventObjects: @ 853DD84 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 0, 6, 3, 8, 17, 0, 0, 0, TrainerHill_Elevator_EventScript_26935F, 0, 0, 0 TrainerHill_Elevator_MapWarps: @ 853DD9C warp_def 1, 6, 3, 1, TRAINER_HILL_ROOF warp_def 2, 6, 3, 1, TRAINER_HILL_ROOF TrainerHill_Elevator_MapEvents:: @ 853DDAC - map_events TrainerHill_Elevator_MapObjects, TrainerHill_Elevator_MapWarps, 0x0, 0x0 + map_events TrainerHill_Elevator_EventObjects, TrainerHill_Elevator_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/TrainerHill_Entrance.inc b/data/maps/events/TrainerHill_Entrance.inc index a5574755b9..832ab58380 100644 --- a/data/maps/events/TrainerHill_Entrance.inc +++ b/data/maps/events/TrainerHill_Entrance.inc @@ -1,9 +1,9 @@ -TrainerHill_Entrance_MapObjects: @ 853D874 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 11, 6, 3, 9, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2681FD, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_NURSE, 0, 0, 4, 9, 3, 8, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2681EF, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 14, 9, 3, 8, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2683C7, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 5, 14, 3, 2, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2683AC, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_4, 0, 0, 14, 15, 3, 2, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_268391, 0, 0, 0 +TrainerHill_Entrance_EventObjects: @ 853D874 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 6, 3, 9, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2681FD, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_NURSE, 0, 0, 4, 9, 3, 8, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2681EF, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 14, 9, 3, 8, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2683C7, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 14, 3, 2, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2683AC, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 14, 15, 3, 2, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_268391, 0, 0, 0 TrainerHill_Entrance_MapWarps: @ 853D8EC warp_def 9, 16, 3, 4, ROUTE_111 @@ -17,5 +17,5 @@ TrainerHill_Entrance_MapBGEvents: @ 853D914 bg_event 8, 10, 0, 1, 0, TrainerHill_Entrance_EventScript_268388 TrainerHill_Entrance_MapEvents:: @ 853D920 - map_events TrainerHill_Entrance_MapObjects, TrainerHill_Entrance_MapWarps, TrainerHill_Entrance_MapCoordEvents, TrainerHill_Entrance_MapBGEvents + map_events TrainerHill_Entrance_EventObjects, TrainerHill_Entrance_MapWarps, TrainerHill_Entrance_MapCoordEvents, TrainerHill_Entrance_MapBGEvents diff --git a/data/maps/events/TrainerHill_Roof.inc b/data/maps/events/TrainerHill_Roof.inc index 4f48ef724f..1ae00b9a25 100644 --- a/data/maps/events/TrainerHill_Roof.inc +++ b/data/maps/events/TrainerHill_Roof.inc @@ -1,10 +1,10 @@ -TrainerHill_Roof_MapObjects: @ 853D9C4 - object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 12, 7, 3, 8, 17, 0, 0, 0, TrainerHill_Roof_EventScript_268FB2, 0, 0, 0 +TrainerHill_Roof_EventObjects: @ 853D9C4 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 12, 7, 3, 8, 17, 0, 0, 0, TrainerHill_Roof_EventScript_268FB2, 0, 0, 0 TrainerHill_Roof_MapWarps: @ 853D9DC warp_def 9, 5, 3, 1, TRAINER_HILL_4F warp_def 15, 5, 0, 1, TRAINER_HILL_ELEVATOR TrainerHill_Roof_MapEvents:: @ 853D9EC - map_events TrainerHill_Roof_MapObjects, TrainerHill_Roof_MapWarps, 0x0, 0x0 + map_events TrainerHill_Roof_EventObjects, TrainerHill_Roof_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Underwater_SeafloorCavern.inc b/data/maps/events/Underwater_SeafloorCavern.inc index b284db78f9..0bf82c2176 100644 --- a/data/maps/events/Underwater_SeafloorCavern.inc +++ b/data/maps/events/Underwater_SeafloorCavern.inc @@ -1,12 +1,12 @@ -Underwater_SeafloorCavern_MapObjects: @ 8535640 - object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0 - object_event 2, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0 - object_event 3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0 - object_event 4, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 8, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0 +Underwater_SeafloorCavern_EventObjects: @ 8535640 + object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0 + object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0 + object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0 + object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 8, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0 Underwater_SeafloorCavern_MapWarps: @ 85356A0 warp_def 6, 7, 0, 0, UNDERWATER_4 Underwater_SeafloorCavern_MapEvents:: @ 85356A8 - map_events Underwater_SeafloorCavern_MapObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0 + map_events Underwater_SeafloorCavern_EventObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/UnionRoom.inc b/data/maps/events/UnionRoom.inc index be9b402435..c79b11f5d4 100644 --- a/data/maps/events/UnionRoom.inc +++ b/data/maps/events/UnionRoom.inc @@ -1,18 +1,18 @@ -UnionRoom_MapObjects: @ 853B020 - object_event 1, MAP_OBJ_GFX_UNION_ROOM_NURSE, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIDDY, 0, 0, 1, 8, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D204, 706, 0, 0 +UnionRoom_EventObjects: @ 853B020 + object_event 1, EVENT_OBJ_GFX_UNION_ROOM_NURSE, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIDDY, 0, 0, 1, 8, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D204, 706, 0, 0 object_event 3, 247, 0, 0, 7, 8, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D22C, 710, 0, 0 object_event 4, 246, 0, 0, 1, 4, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D222, 709, 0, 0 - object_event 5, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D218, 708, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 13, 4, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D20E, 707, 0, 0 - object_event 7, MAP_OBJ_GFX_STORYTELLER, 0, 0, 10, 6, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1FA, 705, 0, 0 - object_event 8, MAP_OBJ_GFX_TRADER, 0, 0, 13, 8, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1F0, 704, 0, 0 - object_event 9, MAP_OBJ_GFX_HIPSTER, 0, 0, 4, 6, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1E6, 703, 0, 0 + object_event 5, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D218, 708, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 13, 4, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D20E, 707, 0, 0 + object_event 7, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 10, 6, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1FA, 705, 0, 0 + object_event 8, EVENT_OBJ_GFX_TRADER, 0, 0, 13, 8, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1F0, 704, 0, 0 + object_event 9, EVENT_OBJ_GFX_HIPSTER, 0, 0, 4, 6, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1E6, 703, 0, 0 UnionRoom_MapWarps: @ 853B0F8 warp_def 7, 11, 3, 127, NONE warp_def 8, 11, 3, 127, NONE UnionRoom_MapEvents:: @ 853B108 - map_events UnionRoom_MapObjects, UnionRoom_MapWarps, 0x0, 0x0 + map_events UnionRoom_EventObjects, UnionRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/UnknownMap_25_34.inc b/data/maps/events/UnknownMap_25_34.inc index 0fcbef3a3d..975f08470d 100644 --- a/data/maps/events/UnknownMap_25_34.inc +++ b/data/maps/events/UnknownMap_25_34.inc @@ -1,3 +1,3 @@ UnknownMap_25_34_MapEvents:: @ 853A064 - map_events LinkContestRoom1_MapObjects, 0x0, 0x0, 0x0 + map_events LinkContestRoom1_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown.inc b/data/maps/events/VerdanturfTown.inc index 7738701b2b..c309696574 100644 --- a/data/maps/events/VerdanturfTown.inc +++ b/data/maps/events/VerdanturfTown.inc @@ -1,8 +1,8 @@ -VerdanturfTown_MapObjects: @ 8527CDC - object_event 1, MAP_OBJ_GFX_MAN_2, 0, 0, 4, 17, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5A8, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 9, 2, 3, 9, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB575, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 7, 11, 3, 3, 16, 0, 0, 0, VerdanturfTown_EventScript_1EB5BA, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_CAMPER, 0, 0, 7, 6, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5B1, 0, 0, 0 +VerdanturfTown_EventObjects: @ 8527CDC + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 17, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5A8, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 9, 2, 3, 9, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB575, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 7, 11, 3, 3, 16, 0, 0, 0, VerdanturfTown_EventScript_1EB5BA, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 0, 7, 6, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5B1, 0, 0, 0 VerdanturfTown_MapWarps: @ 8527D3C warp_def 3, 7, 0, 0, VERDANTURF_TOWN_BATTLE_TENT_LOBBY @@ -24,5 +24,5 @@ VerdanturfTown_MapBGEvents: @ 8527D74 bg_event 7, 3, 0, 0, 0, VerdanturfTown_EventScript_1EB5F4 VerdanturfTown_MapEvents:: @ 8527DD4 - map_events VerdanturfTown_MapObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents + map_events VerdanturfTown_EventObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents diff --git a/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc b/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc index 0db3fc9201..20597089ae 100644 --- a/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc +++ b/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc @@ -1,8 +1,8 @@ -VerdanturfTown_BattleTentBattleRoom_MapObjects: @ 852E734 - object_event 1, MAP_OBJ_GFX_TRADER, 0, 0, 2, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 11, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 2, 4, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 +VerdanturfTown_BattleTentBattleRoom_EventObjects: @ 852E734 + object_event 1, EVENT_OBJ_GFX_TRADER, 0, 0, 2, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 11, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 2, 4, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 VerdanturfTown_BattleTentBattleRoom_MapEvents:: @ 852E77C - map_events VerdanturfTown_BattleTentBattleRoom_MapObjects, 0x0, 0x0, 0x0 + map_events VerdanturfTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_BattleTentCorridor.inc b/data/maps/events/VerdanturfTown_BattleTentCorridor.inc index 7ec4cee106..539cf8b110 100644 --- a/data/maps/events/VerdanturfTown_BattleTentCorridor.inc +++ b/data/maps/events/VerdanturfTown_BattleTentCorridor.inc @@ -1,6 +1,6 @@ -VerdanturfTown_BattleTentCorridor_MapObjects: @ 852E708 - object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 2, 6, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 +VerdanturfTown_BattleTentCorridor_EventObjects: @ 852E708 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 2, 6, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 VerdanturfTown_BattleTentCorridor_MapEvents:: @ 852E720 - map_events VerdanturfTown_BattleTentCorridor_MapObjects, 0x0, 0x0, 0x0 + map_events VerdanturfTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_BattleTentLobby.inc b/data/maps/events/VerdanturfTown_BattleTentLobby.inc index d6b5818da5..3f5ea9c68e 100644 --- a/data/maps/events/VerdanturfTown_BattleTentLobby.inc +++ b/data/maps/events/VerdanturfTown_BattleTentLobby.inc @@ -1,10 +1,10 @@ -VerdanturfTown_BattleTentLobby_MapObjects: @ 852E648 - object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201873, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_3, 0, 0, 9, 7, 3, 2, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 1, 8, 3, 10, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AC5, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_SCOTT, 0, 0, 12, 6, 3, 9, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, 766, 0, 0 - object_event 6, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 2, 8, 3, 9, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0, 0, 0 +VerdanturfTown_BattleTentLobby_EventObjects: @ 852E648 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201873, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 0, 9, 7, 3, 2, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 1, 8, 3, 10, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AC5, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 12, 6, 3, 9, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, 766, 0, 0 + object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 2, 8, 3, 9, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0, 0, 0 VerdanturfTown_BattleTentLobby_MapWarps: @ 852E6D8 warp_def 6, 9, 0, 0, VERDANTURF_TOWN @@ -14,5 +14,5 @@ VerdanturfTown_BattleTentLobby_MapBGEvents: @ 852E6E8 bg_event 4, 5, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201B02 VerdanturfTown_BattleTentLobby_MapEvents:: @ 852E6F4 - map_events VerdanturfTown_BattleTentLobby_MapObjects, VerdanturfTown_BattleTentLobby_MapWarps, 0x0, VerdanturfTown_BattleTentLobby_MapBGEvents + map_events VerdanturfTown_BattleTentLobby_EventObjects, VerdanturfTown_BattleTentLobby_MapWarps, 0x0, VerdanturfTown_BattleTentLobby_MapBGEvents diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc index 2441d8d41c..03cf2de7ac 100644 --- a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc +++ b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc @@ -1,11 +1,11 @@ -VerdanturfTown_FriendshipRatersHouse_MapObjects: @ 852E9C8 - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203031, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_PIKACHU, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA, 0, 0, 0 +VerdanturfTown_FriendshipRatersHouse_EventObjects: @ 852E9C8 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203031, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA, 0, 0, 0 VerdanturfTown_FriendshipRatersHouse_MapWarps: @ 852E9F8 warp_def 3, 7, 0, 5, VERDANTURF_TOWN warp_def 4, 7, 0, 5, VERDANTURF_TOWN VerdanturfTown_FriendshipRatersHouse_MapEvents:: @ 852EA08 - map_events VerdanturfTown_FriendshipRatersHouse_MapObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0 + map_events VerdanturfTown_FriendshipRatersHouse_EventObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_House.inc b/data/maps/events/VerdanturfTown_House.inc index 803f9f666c..0f37fe20b5 100644 --- a/data/maps/events/VerdanturfTown_House.inc +++ b/data/maps/events/VerdanturfTown_House.inc @@ -1,11 +1,11 @@ -VerdanturfTown_House_MapObjects: @ 852EA1C - object_event 1, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0, 0, 0 +VerdanturfTown_House_EventObjects: @ 852EA1C + object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0, 0, 0 VerdanturfTown_House_MapWarps: @ 852EA4C warp_def 3, 8, 0, 6, VERDANTURF_TOWN warp_def 4, 8, 0, 6, VERDANTURF_TOWN VerdanturfTown_House_MapEvents:: @ 852EA5C - map_events VerdanturfTown_House_MapObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0 + map_events VerdanturfTown_House_EventObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_Mart.inc b/data/maps/events/VerdanturfTown_Mart.inc index 6d6ca6a5d7..551126235a 100644 --- a/data/maps/events/VerdanturfTown_Mart.inc +++ b/data/maps/events/VerdanturfTown_Mart.inc @@ -1,13 +1,13 @@ -VerdanturfTown_Mart_MapObjects: @ 852E790 - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_202587, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_2, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025BA, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025C3, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LASS, 0, 0, 3, 2, 3, 9, 17, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025CC, 0, 0, 0 +VerdanturfTown_Mart_EventObjects: @ 852E790 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_202587, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025BA, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025C3, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 0, 3, 2, 3, 9, 17, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025CC, 0, 0, 0 VerdanturfTown_Mart_MapWarps: @ 852E7F0 warp_def 3, 7, 0, 1, VERDANTURF_TOWN warp_def 4, 7, 0, 1, VERDANTURF_TOWN VerdanturfTown_Mart_MapEvents:: @ 852E800 - map_events VerdanturfTown_Mart_MapObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0 + map_events VerdanturfTown_Mart_EventObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc index 9534ca9c7e..d17513fd55 100644 --- a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc +++ b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ -VerdanturfTown_PokemonCenter_1F_MapObjects: @ 852E814 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_20273A, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 4, 5, 3, 5, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202748, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 2, 3, 7, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202751, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 10, 6, 3, 9, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0, 0, 0 +VerdanturfTown_PokemonCenter_1F_EventObjects: @ 852E814 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_20273A, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 5, 3, 5, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202748, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 2, 3, 7, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202751, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 10, 6, 3, 9, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0, 0, 0 VerdanturfTown_PokemonCenter_1F_MapWarps: @ 852E874 warp_def 7, 8, 3, 2, VERDANTURF_TOWN @@ -10,5 +10,5 @@ VerdanturfTown_PokemonCenter_1F_MapWarps: @ 852E874 warp_def 1, 6, 4, 0, VERDANTURF_TOWN_POKEMON_CENTER_2F VerdanturfTown_PokemonCenter_1F_MapEvents:: @ 852E88C - map_events VerdanturfTown_PokemonCenter_1F_MapObjects, VerdanturfTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events VerdanturfTown_PokemonCenter_1F_EventObjects, VerdanturfTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc index 2649066d8f..4fcbd0e08d 100644 --- a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc +++ b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -VerdanturfTown_PokemonCenter_2F_MapObjects: @ 852E8A0 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +VerdanturfTown_PokemonCenter_2F_EventObjects: @ 852E8A0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 VerdanturfTown_PokemonCenter_2F_MapWarps: @ 852E900 warp_def 1, 6, 4, 2, VERDANTURF_TOWN_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ VerdanturfTown_PokemonCenter_2F_MapWarps: @ 852E900 warp_def 9, 1, 3, 0, TRADE_CENTER VerdanturfTown_PokemonCenter_2F_MapEvents:: @ 852E918 - map_events VerdanturfTown_PokemonCenter_2F_MapObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events VerdanturfTown_PokemonCenter_2F_EventObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/events/VerdanturfTown_WandasHouse.inc index 2089da649f..0700926795 100644 --- a/data/maps/events/VerdanturfTown_WandasHouse.inc +++ b/data/maps/events/VerdanturfTown_WandasHouse.inc @@ -1,14 +1,14 @@ -VerdanturfTown_WandasHouse_MapObjects: @ 852E92C - object_event 1, MAP_OBJ_GFX_WALLY, 0, 0, 14, 5, 3, 2, 17, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, 806, 0, 0 - object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 5, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, 808, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_3, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, 809, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 0, 5, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, 984, 0, 0 +VerdanturfTown_WandasHouse_EventObjects: @ 852E92C + object_event 1, EVENT_OBJ_GFX_WALLY, 0, 0, 14, 5, 3, 2, 17, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, 806, 0, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 5, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, 808, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, 809, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, 984, 0, 0 VerdanturfTown_WandasHouse_MapWarps: @ 852E9A4 warp_def 7, 7, 0, 3, VERDANTURF_TOWN warp_def 8, 7, 0, 3, VERDANTURF_TOWN VerdanturfTown_WandasHouse_MapEvents:: @ 852E9B4 - map_events VerdanturfTown_WandasHouse_MapObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0 + map_events VerdanturfTown_WandasHouse_EventObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/events/VictoryRoad_1F.inc index db3554ed4a..511782688a 100644 --- a/data/maps/events/VictoryRoad_1F.inc +++ b/data/maps/events/VictoryRoad_1F.inc @@ -1,13 +1,13 @@ -VictoryRoad_1F_MapObjects: @ 8535E04 - object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 33, 22, 3, 8, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 6, 15, 4, 9, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 27, 34, 3, 18, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WALLY, 0, 0, 12, 25, 4, 8, 17, 0, 0, 0, VictoryRoad_1F_EventScript_235E2C, 858, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 40, 26, 3, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_291483, 1084, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 37, 39, 4, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_291490, 1085, 0, 0 - object_event 7, MAP_OBJ_GFX_WALLY, 0, 0, 31, 9, 3, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_235E35, 751, 0, 0 - object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 0, 29, 17, 3, 10, 17, 0, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_MAN_4, 0, 0, 32, 17, 3, 9, 17, 0, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0, 0, 0 +VictoryRoad_1F_EventObjects: @ 8535E04 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 33, 22, 3, 8, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 6, 15, 4, 9, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 27, 34, 3, 18, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WALLY, 0, 0, 12, 25, 4, 8, 17, 0, 0, 0, VictoryRoad_1F_EventScript_235E2C, 858, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 40, 26, 3, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_291483, 1084, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 39, 4, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_291490, 1085, 0, 0 + object_event 7, EVENT_OBJ_GFX_WALLY, 0, 0, 31, 9, 3, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_235E35, 751, 0, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 29, 17, 3, 10, 17, 0, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 0, 32, 17, 3, 9, 17, 0, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0, 0, 0 VictoryRoad_1F_MapWarps: @ 8535EDC warp_def 15, 40, 3, 2, EVER_GRANDE_CITY @@ -24,5 +24,5 @@ VictoryRoad_1F_MapBGEvents: @ 8535F24 bg_event 30, 39, 4, 7, 0, ITEM_ULTRA_BALL, 81, 0 VictoryRoad_1F_MapEvents:: @ 8535F30 - map_events VictoryRoad_1F_MapObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents + map_events VictoryRoad_1F_EventObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/events/VictoryRoad_B1F.inc index 6c57f0662e..b251959ae9 100644 --- a/data/maps/events/VictoryRoad_B1F.inc +++ b/data/maps/events/VictoryRoad_B1F.inc @@ -1,25 +1,25 @@ -VictoryRoad_B1F_MapObjects: @ 8535F44 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 20, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 19, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 21, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 20, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 17, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 9, 10, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 18, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 20, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 23, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 21, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 22, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 35, 6, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 30, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 19, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 25, 0, 0 - object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 26, 0, 0 - object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 18, 12, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 27, 0, 0 - object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 28, 0, 0 - object_event 12, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 21, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 29, 0, 0 - object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 34, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 31, 0, 0 - object_event 14, MAP_OBJ_GFX_MAN_4, 0, 0, 37, 12, 3, 9, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_2364E5, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_WOMAN_7, 0, 0, 26, 16, 3, 7, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_2364FC, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_WOMAN_7, 0, 0, 5, 21, 3, 9, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_236513, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 34, 3, 3, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 21, 0, 0 - object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 42, 8, 4, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_29149D, 1086, 0, 0 - object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 32, 3, 3, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_2914AA, 1087, 0, 0 - object_event 20, MAP_OBJ_GFX_MAN_4, 0, 0, 14, 16, 3, 8, 17, 0, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_WOMAN_7, 0, 0, 14, 20, 3, 16, 17, 0, 1, 3, VictoryRoad_B1F_EventScript_236541, 0, 0, 0 +VictoryRoad_B1F_EventObjects: @ 8535F44 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 20, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 19, 0, 0 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 21, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 20, 0, 0 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 17, 0, 0 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 9, 10, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 18, 0, 0 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 20, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 23, 0, 0 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 21, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 22, 0, 0 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 35, 6, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 30, 0, 0 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 19, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 25, 0, 0 + object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 26, 0, 0 + object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 18, 12, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 27, 0, 0 + object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 28, 0, 0 + object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 21, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 29, 0, 0 + object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 34, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 31, 0, 0 + object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 0, 37, 12, 3, 9, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_2364E5, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 26, 16, 3, 7, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_2364FC, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 5, 21, 3, 9, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_236513, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 34, 3, 3, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 21, 0, 0 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 42, 8, 4, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_29149D, 1086, 0, 0 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 32, 3, 3, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_2914AA, 1087, 0, 0 + object_event 20, EVENT_OBJ_GFX_MAN_4, 0, 0, 14, 16, 3, 8, 17, 0, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 14, 20, 3, 16, 17, 0, 1, 3, VictoryRoad_B1F_EventScript_236541, 0, 0, 0 VictoryRoad_B1F_MapWarps: @ 853613C warp_def 30, 25, 3, 0, VICTORY_ROAD_B2F @@ -31,5 +31,5 @@ VictoryRoad_B1F_MapWarps: @ 853613C warp_def 5, 26, 3, 3, VICTORY_ROAD_B2F VictoryRoad_B1F_MapEvents:: @ 8536174 - map_events VictoryRoad_B1F_MapObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0 + map_events VictoryRoad_B1F_EventObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VictoryRoad_B2F.inc b/data/maps/events/VictoryRoad_B2F.inc index 09fdb466f3..5e702c0c3f 100644 --- a/data/maps/events/VictoryRoad_B2F.inc +++ b/data/maps/events/VictoryRoad_B2F.inc @@ -1,11 +1,11 @@ -VictoryRoad_B2F_MapObjects: @ 8536188 - object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 15, 6, 3, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 43, 14, 3, 7, 17, 0, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 2, 17, 3, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236903, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_7, 0, 0, 35, 22, 3, 9, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_23691A, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 13, 8, 3, 1, 17, 0, 0, 0, VictoryRoad_B2F_EventScript_2914B7, 1088, 0, 0 - object_event 6, MAP_OBJ_GFX_WOMAN_7, 0, 0, 25, 18, 4, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236948, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_MAN_4, 0, 0, 25, 21, 4, 7, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236931, 0, 0, 0 +VictoryRoad_B2F_EventObjects: @ 8536188 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 15, 6, 3, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 43, 14, 3, 7, 17, 0, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 2, 17, 3, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236903, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 35, 22, 3, 9, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_23691A, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 8, 3, 1, 17, 0, 0, 0, VictoryRoad_B2F_EventScript_2914B7, 1088, 0, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 25, 18, 4, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236948, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 0, 25, 21, 4, 7, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236931, 0, 0, 0 VictoryRoad_B2F_MapWarps: @ 8536230 warp_def 30, 25, 3, 0, VICTORY_ROAD_B1F @@ -18,5 +18,5 @@ VictoryRoad_B2F_MapBGEvents: @ 8536250 bg_event 37, 1, 3, 7, 0, ITEM_MAX_REPEL, 83, 0 VictoryRoad_B2F_MapEvents:: @ 8536268 - map_events VictoryRoad_B2F_MapObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents + map_events VictoryRoad_B2F_EventObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 2828036e01..1fda1133f5 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -1,5 +1,5 @@ BerryTreeScript:: @ 82742F9 - special FieldObjectInteractionGetBerryTreeData + special EventObjectInteractionGetBerryTreeData switch VAR_0x8004 case 255, Route102_EventScript_27434F case 0, Route102_EventScript_274359 @@ -54,7 +54,7 @@ Route102_EventScript_2743AF:: @ 82743AF Route102_EventScript_2743B1:: @ 82743B1 lockall - special FieldObjectInteractionGetBerryCountString + special EventObjectInteractionGetBerryCountString message Route102_Text_274560 waitmessage waitbuttonpress @@ -62,7 +62,7 @@ Route102_EventScript_2743B1:: @ 82743B1 Route102_EventScript_2743C1:: @ 82743C1 lockall - special FieldObjectInteractionGetBerryName + special EventObjectInteractionGetBerryName message Route102_Text_274579 waitmessage waitbuttonpress @@ -70,7 +70,7 @@ Route102_EventScript_2743C1:: @ 82743C1 Route102_EventScript_2743D1:: @ 82743D1 lockall - special FieldObjectInteractionGetBerryName + special EventObjectInteractionGetBerryName message Route102_Text_27458A waitmessage waitbuttonpress @@ -79,7 +79,7 @@ Route102_EventScript_2743D1:: @ 82743D1 Route102_EventScript_2743E1:: @ 82743E1 call Route102_EventScript_2743F6 lockall - special FieldObjectInteractionGetBerryName + special EventObjectInteractionGetBerryName message Route102_Text_2745AB waitmessage waitbuttonpress @@ -105,7 +105,7 @@ Route102_EventScript_274421:: @ 8274421 buffernumberstring 1, VAR_0x8006 lock faceplayer - special FieldObjectInteractionGetBerryCountString + special EventObjectInteractionGetBerryCountString msgbox Route102_Text_2745EE, 5 compare VAR_RESULT, 1 goto_eq Route102_EventScript_274448 @@ -113,11 +113,11 @@ Route102_EventScript_274421:: @ 8274421 goto_eq Route102_EventScript_274479 Route102_EventScript_274448:: @ 8274448 - special FieldObjectInteractionPickBerryTree + special EventObjectInteractionPickBerryTree compare VAR_0x8004, 0 goto_eq Route102_EventScript_274470 special sub_80EED34 - special FieldObjectInteractionRemoveBerryTree + special EventObjectInteractionRemoveBerryTree message Route102_Text_27461B playfanfare MUS_ME_KINOMI waitmessage @@ -145,7 +145,7 @@ Route102_EventScript_274479:: @ 8274479 Route102_EventScript_274482:: @ 8274482 lockall - special FieldObjectInteractionGetBerryTreeData + special EventObjectInteractionGetBerryTreeData call Route102_EventScript_2744DD releaseall end @@ -154,7 +154,7 @@ Route102_EventScript_27448D:: @ 827448D checkitem ITEM_WAILMER_PAIL, 1 compare VAR_RESULT, 0 goto_eq Route102_EventScript_2744BE - special FieldObjectInteractionGetBerryName + special EventObjectInteractionGetBerryName msgbox Route102_Text_2746E4, 5 compare VAR_RESULT, 1 goto_eq Route102_EventScript_2744C4 @@ -166,14 +166,14 @@ Route102_EventScript_2744BE:: @ 82744BE end Route102_EventScript_2744C0:: @ 82744C0 - special FieldObjectInteractionGetBerryTreeData + special EventObjectInteractionGetBerryTreeData lockall Route102_EventScript_2744C4:: @ 82744C4 - special FieldObjectInteractionGetBerryName + special EventObjectInteractionGetBerryName message Route102_Text_274710 waitmessage - special FieldObjectInteractionWaterBerryTree + special EventObjectInteractionWaterBerryTree special sub_80FAFF8 waitstate message Route102_Text_274723 @@ -183,10 +183,10 @@ Route102_EventScript_2744C4:: @ 82744C4 end Route102_EventScript_2744DD:: @ 82744DD - special FieldObjectInteractionPlantBerryTree + special EventObjectInteractionPlantBerryTree incrementgamestat 3 special sub_80EED10 - special FieldObjectInteractionGetBerryCountString + special EventObjectInteractionGetBerryCountString message Route102_Text_274535 waitmessage waitbuttonpress diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 269ef25300..0cf683bb88 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -213,7 +213,7 @@ Route120_EventScript_28CF36:: @ 828CF36 Route111_EventScript_28CF56:: @ 828CF56 special GabbyAndTyBeforeInterview - special GabbyAndTySetScriptVarsToFieldObjectLocalIds + special GabbyAndTySetScriptVarsToEventObjectLocalIds compare VAR_FACING, 2 call_if 1, Route111_EventScript_28CF94 compare VAR_FACING, 1 @@ -247,7 +247,7 @@ Route111_EventScript_28CFC3:: @ 828CFC3 Route118_EventScript_28CFC3:: @ 828CFC3 Route120_EventScript_28CFC3:: @ 828CFC3 special GabbyAndTyBeforeInterview - special GabbyAndTySetScriptVarsToFieldObjectLocalIds + special GabbyAndTySetScriptVarsToEventObjectLocalIds compare VAR_FACING, 2 call_if 1, Route111_EventScript_28CF94 compare VAR_FACING, 1 diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc index 3461f8275b..bcaa7dfe1b 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc @@ -112,7 +112,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF:: @ 825D2BF BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E311, 4 closemessage - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 127, BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0 applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E2 waitmovement 0 diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc index d071639f8f..05cee99b93 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc @@ -138,7 +138,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256 special sub_81A1780 compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2552D0 - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C waitmovement 0 msgbox BattleFrontier_BattlePyramidTop_Text_255669, 4 @@ -185,7 +185,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335 special sub_81A1780 compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255388 - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C waitmovement 0 msgbox BattleFrontier_BattlePyramidTop_Text_255951, 4 diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc index 03b7928aa4..fb76a5fc79 100644 --- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc @@ -10,7 +10,7 @@ MauvilleCity_PokemonCenter_1F_MapScript1_210E66: @ 8210E66 end MauvilleCity_PokemonCenter_1F_EventScript_210E74:: @ 8210E74 - special ScrSpecial_SetMauvilleOldManMapObjGfx + special ScrSpecial_SetMauvilleOldManEventObjGfx end MauvilleCity_PokemonCenter_1F_EventScript_210E78:: @ 8210E78 diff --git a/data/scripts/maps/NavelRock_Top.inc b/data/scripts/maps/NavelRock_Top.inc index 6193a092e4..c05d32088f 100644 --- a/data/scripts/maps/NavelRock_Top.inc +++ b/data/scripts/maps/NavelRock_Top.inc @@ -38,7 +38,7 @@ NavelRock_Top_EventScript_26915B:: @ 826915B NavelRock_Top_EventScript_26916F:: @ 826916F lockall setvar VAR_TEMP_1, 1 - special SpawnScriptFieldObject + special SpawnScriptEventObject setvar VAR_0x8004, 3 setvar VAR_0x8005, 35 special sub_813B80C @@ -59,7 +59,7 @@ NavelRock_Top_EventScript_26916F:: @ 826916F applymovement 127, NavelRock_Top_Movement_269234 applymovement 1, NavelRock_Top_Movement_26923A waitmovement 0 - special RemoveScriptFieldObject + special RemoveScriptEventObject setvar VAR_0x8004, 250 setvar VAR_0x8005, 70 setvar VAR_0x8006, 0 diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index a652c7897f..a2ea5ed1dc 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -98,10 +98,10 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A fadeoutbgm 1 applymovement 255, SkyPillar_Top_Movement_2725B2 waitmovement 0 - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 127, SkyPillar_Top_Movement_239858 waitmovement 0 - special RemoveScriptFieldObject + special RemoveScriptEventObject applymovement 1, SkyPillar_Top_Movement_23983A waitmovement 0 waitse @@ -128,10 +128,10 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A closemessage delay 20 fadeinbgm 1 - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 127, SkyPillar_Top_Movement_23985C waitmovement 0 - special RemoveScriptFieldObject + special RemoveScriptEventObject setvar VAR_0x405E, 5 setvar VAR_0x40CA, 1 setvar VAR_0x40D7, 1 diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 793b6f4fdb..6dac80f4bb 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -212,10 +212,10 @@ SootopolisCity_EventScript_1E5926:: @ 81E5926 SootopolisCity_EventScript_1E5946:: @ 81E5946 delay 60 - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 127, SootopolisCity_Movement_1E5A68 waitmovement 0 - special RemoveScriptFieldObject + special RemoveScriptEventObject delay 60 fadescreenspeed 1, 8 setweather 15 @@ -269,12 +269,12 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946 applymovement 10, SootopolisCity_Movement_1E5BCF applymovement 9, SootopolisCity_Movement_1E5BF0 waitmovement 0 - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 10, SootopolisCity_Movement_1E5BD6 applymovement 9, SootopolisCity_Movement_1E5BF7 applymovement 127, SootopolisCity_Movement_1E5A75 waitmovement 0 - special RemoveScriptFieldObject + special RemoveScriptEventObject setvar VAR_0x405E, 2 clearflag FLAG_SPECIAL_FLAG_0x4000 releaseall @@ -312,10 +312,10 @@ SootopolisCity_Movement_1E5A75: @ 81E5A75 SootopolisCity_EventScript_1E5A82:: @ 81E5A82 delay 60 - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 127, SootopolisCity_Movement_1E5BA4 waitmovement 0 - special RemoveScriptFieldObject + special RemoveScriptEventObject delay 60 fadescreenspeed 1, 8 setweather 15 @@ -369,12 +369,12 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82 applymovement 10, SootopolisCity_Movement_1E5BCF applymovement 9, SootopolisCity_Movement_1E5BF0 waitmovement 0 - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 10, SootopolisCity_Movement_1E5BD6 applymovement 9, SootopolisCity_Movement_1E5BF7 applymovement 127, SootopolisCity_Movement_1E5BAE waitmovement 0 - special RemoveScriptFieldObject + special RemoveScriptEventObject setvar VAR_0x405E, 2 clearflag FLAG_SPECIAL_FLAG_0x4000 releaseall @@ -502,10 +502,10 @@ SootopolisCity_EventScript_1E5BFE:: @ 81E5BFE SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E delay 60 - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 127, SootopolisCity_Movement_1E5A68 waitmovement 0 - special RemoveScriptFieldObject + special RemoveScriptEventObject delay 60 fadescreenspeed 1, 8 call SootopolisCity_EventScript_1E5D82 @@ -516,7 +516,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E special sub_813B7D8 waitstate playse SE_T_KAMI - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 127, SootopolisCity_Movement_1E5E63 waitmovement 0 waitse @@ -555,10 +555,10 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE delay 60 - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 127, SootopolisCity_Movement_1E5BA4 waitmovement 0 - special RemoveScriptFieldObject + special RemoveScriptEventObject delay 60 fadescreenspeed 1, 8 call SootopolisCity_EventScript_1E5D82 @@ -568,7 +568,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE setvar VAR_0x8004, 1 special sub_813B7D8 waitstate - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 127, SootopolisCity_Movement_1E5E63 applymovement 255, SootopolisCity_Movement_1E5E68 waitmovement 0 diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index b7d4e101cd..f78f938caa 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -66,7 +66,7 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 goto_if 0, SouthernIsland_Interior_EventScript_242B9A setflag FLAG_0x0CE setflag FLAG_0x002 - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 127, SouthernIsland_Interior_Movement_242BCA waitmovement 0 delay 50 @@ -80,7 +80,7 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 applymovement 2, SouthernIsland_Interior_Movement_242BDA waitmovement 0 delay 50 - special RemoveScriptFieldObject + special RemoveScriptEventObject setvar VAR_LAST_TALKED, 2 compare VAR_0x40D5, 0 call_if 1, SouthernIsland_Interior_EventScript_242BA4 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 39cca82444..9d4aa80b6c 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -683,7 +683,7 @@ LilycoveCity_ContestLobby_EventScript_2941AA:: @ 82941AA specialvar VAR_RESULT, GetLinkPartnerNames copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8004, VAR_0x8008 - special SpawnLinkPartnerFieldObject + special SpawnLinkPartnerEventObject goto LilycoveCity_ContestLobby_EventScript_2941C4 end diff --git a/data/specials.inc b/data/specials.inc index 1fa17b908a..939995150b 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -47,19 +47,19 @@ gSpecials:: @ 81DBA64 def_special sub_80B3254 def_special sub_80B2FD8 def_special GetLinkPartnerNames - def_special SpawnLinkPartnerFieldObject + def_special SpawnLinkPartnerEventObject def_special SavePlayerParty def_special LoadPlayerParty def_special sub_80F9438 def_special sp02A_crash_sound - def_special FieldObjectInteractionGetBerryTreeData - def_special FieldObjectInteractionGetBerryName - def_special FieldObjectInteractionGetBerryCountString + def_special EventObjectInteractionGetBerryTreeData + def_special EventObjectInteractionGetBerryName + def_special EventObjectInteractionGetBerryCountString def_special Bag_ChooseBerry - def_special FieldObjectInteractionPlantBerryTree - def_special FieldObjectInteractionPickBerryTree - def_special FieldObjectInteractionRemoveBerryTree - def_special FieldObjectInteractionWaterBerryTree + def_special EventObjectInteractionPlantBerryTree + def_special EventObjectInteractionPickBerryTree + def_special EventObjectInteractionRemoveBerryTree + def_special EventObjectInteractionWaterBerryTree def_special PlayerHasBerries def_special IsEnigmaBerryValid def_special GetTrainerBattleMode @@ -115,7 +115,7 @@ gSpecials:: @ 81DBA64 def_special ScrSpecial_SetHipsterSpokenFlag def_special ScrSpecial_HipsterTeachWord def_special ScrSpecial_PlayBardSong - def_special ScrSpecial_SetMauvilleOldManMapObjGfx + def_special ScrSpecial_SetMauvilleOldManEventObjGfx def_special ScrSpecial_GenerateGiddyLine def_special ScrSpecial_GiddyShouldTellAnotherTale def_special ScrSpecial_StorytellerGetFreeStorySlot @@ -190,7 +190,7 @@ gSpecials:: @ 81DBA64 def_special IsTVShowInSearchOfTrainersAiring def_special GabbyAndTyGetLastQuote def_special GabbyAndTyGetLastBattleTrivia - def_special GabbyAndTySetScriptVarsToFieldObjectLocalIds + def_special GabbyAndTySetScriptVarsToEventObjectLocalIds def_special sub_8138B80 def_special GetDaycareMonNicknames def_special GetDaycareState @@ -286,8 +286,8 @@ gSpecials:: @ 81DBA64 def_special GameClear def_special sub_8139A78 def_special nullsub_55 - def_special SpawnScriptFieldObject - def_special RemoveScriptFieldObject + def_special SpawnScriptEventObject + def_special RemoveScriptEventObject def_special GetPokeblockNameByMonNature def_special GetSecretBaseNearbyMapName def_special CheckRelicanthWailord diff --git a/graphics/map_objects/palettes/field_effect_object_palette_00.pal b/graphics/event_objects/palettes/field_effect_object_palette_00.pal similarity index 100% rename from graphics/map_objects/palettes/field_effect_object_palette_00.pal rename to graphics/event_objects/palettes/field_effect_object_palette_00.pal diff --git a/graphics/map_objects/palettes/field_effect_object_palette_01.pal b/graphics/event_objects/palettes/field_effect_object_palette_01.pal similarity index 100% rename from graphics/map_objects/palettes/field_effect_object_palette_01.pal rename to graphics/event_objects/palettes/field_effect_object_palette_01.pal diff --git a/graphics/map_objects/palettes/field_effect_object_palette_02.pal b/graphics/event_objects/palettes/field_effect_object_palette_02.pal similarity index 100% rename from graphics/map_objects/palettes/field_effect_object_palette_02.pal rename to graphics/event_objects/palettes/field_effect_object_palette_02.pal diff --git a/graphics/map_objects/palettes/field_effect_object_palette_03.pal b/graphics/event_objects/palettes/field_effect_object_palette_03.pal similarity index 100% rename from graphics/map_objects/palettes/field_effect_object_palette_03.pal rename to graphics/event_objects/palettes/field_effect_object_palette_03.pal diff --git a/graphics/map_objects/palettes/field_effect_object_palette_04.pal b/graphics/event_objects/palettes/field_effect_object_palette_04.pal similarity index 100% rename from graphics/map_objects/palettes/field_effect_object_palette_04.pal rename to graphics/event_objects/palettes/field_effect_object_palette_04.pal diff --git a/graphics/map_objects/palettes/field_effect_object_palette_05.pal b/graphics/event_objects/palettes/field_effect_object_palette_05.pal similarity index 100% rename from graphics/map_objects/palettes/field_effect_object_palette_05.pal rename to graphics/event_objects/palettes/field_effect_object_palette_05.pal diff --git a/graphics/map_objects/palettes/field_effect_object_palette_06.pal b/graphics/event_objects/palettes/field_effect_object_palette_06.pal similarity index 100% rename from graphics/map_objects/palettes/field_effect_object_palette_06.pal rename to graphics/event_objects/palettes/field_effect_object_palette_06.pal diff --git a/graphics/map_objects/palettes/field_effect_object_palette_07.pal b/graphics/event_objects/palettes/field_effect_object_palette_07.pal similarity index 100% rename from graphics/map_objects/palettes/field_effect_object_palette_07.pal rename to graphics/event_objects/palettes/field_effect_object_palette_07.pal diff --git a/graphics/map_objects/palettes/field_effect_object_palette_08.pal b/graphics/event_objects/palettes/field_effect_object_palette_08.pal similarity index 100% rename from graphics/map_objects/palettes/field_effect_object_palette_08.pal rename to graphics/event_objects/palettes/field_effect_object_palette_08.pal diff --git a/graphics/map_objects/palettes/field_effect_object_palette_10.pal b/graphics/event_objects/palettes/field_effect_object_palette_10.pal similarity index 100% rename from graphics/map_objects/palettes/field_effect_object_palette_10.pal rename to graphics/event_objects/palettes/field_effect_object_palette_10.pal diff --git a/graphics/map_objects/palettes/field_object_palette_00.pal b/graphics/event_objects/palettes/field_object_palette_00.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_00.pal rename to graphics/event_objects/palettes/field_object_palette_00.pal diff --git a/graphics/map_objects/palettes/field_object_palette_01.pal b/graphics/event_objects/palettes/field_object_palette_01.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_01.pal rename to graphics/event_objects/palettes/field_object_palette_01.pal diff --git a/graphics/map_objects/palettes/field_object_palette_02.pal b/graphics/event_objects/palettes/field_object_palette_02.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_02.pal rename to graphics/event_objects/palettes/field_object_palette_02.pal diff --git a/graphics/map_objects/palettes/field_object_palette_03.pal b/graphics/event_objects/palettes/field_object_palette_03.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_03.pal rename to graphics/event_objects/palettes/field_object_palette_03.pal diff --git a/graphics/map_objects/palettes/field_object_palette_04.pal b/graphics/event_objects/palettes/field_object_palette_04.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_04.pal rename to graphics/event_objects/palettes/field_object_palette_04.pal diff --git a/graphics/map_objects/palettes/field_object_palette_05.pal b/graphics/event_objects/palettes/field_object_palette_05.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_05.pal rename to graphics/event_objects/palettes/field_object_palette_05.pal diff --git a/graphics/map_objects/palettes/field_object_palette_06.pal b/graphics/event_objects/palettes/field_object_palette_06.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_06.pal rename to graphics/event_objects/palettes/field_object_palette_06.pal diff --git a/graphics/map_objects/palettes/field_object_palette_07.pal b/graphics/event_objects/palettes/field_object_palette_07.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_07.pal rename to graphics/event_objects/palettes/field_object_palette_07.pal diff --git a/graphics/map_objects/palettes/field_object_palette_08.pal b/graphics/event_objects/palettes/field_object_palette_08.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_08.pal rename to graphics/event_objects/palettes/field_object_palette_08.pal diff --git a/graphics/map_objects/palettes/field_object_palette_09.pal b/graphics/event_objects/palettes/field_object_palette_09.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_09.pal rename to graphics/event_objects/palettes/field_object_palette_09.pal diff --git a/graphics/map_objects/palettes/field_object_palette_10.pal b/graphics/event_objects/palettes/field_object_palette_10.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_10.pal rename to graphics/event_objects/palettes/field_object_palette_10.pal diff --git a/graphics/map_objects/palettes/field_object_palette_11.pal b/graphics/event_objects/palettes/field_object_palette_11.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_11.pal rename to graphics/event_objects/palettes/field_object_palette_11.pal diff --git a/graphics/map_objects/palettes/field_object_palette_12.pal b/graphics/event_objects/palettes/field_object_palette_12.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_12.pal rename to graphics/event_objects/palettes/field_object_palette_12.pal diff --git a/graphics/map_objects/palettes/field_object_palette_13.pal b/graphics/event_objects/palettes/field_object_palette_13.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_13.pal rename to graphics/event_objects/palettes/field_object_palette_13.pal diff --git a/graphics/map_objects/palettes/field_object_palette_14.pal b/graphics/event_objects/palettes/field_object_palette_14.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_14.pal rename to graphics/event_objects/palettes/field_object_palette_14.pal diff --git a/graphics/map_objects/palettes/field_object_palette_15.pal b/graphics/event_objects/palettes/field_object_palette_15.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_15.pal rename to graphics/event_objects/palettes/field_object_palette_15.pal diff --git a/graphics/map_objects/palettes/field_object_palette_16.pal b/graphics/event_objects/palettes/field_object_palette_16.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_16.pal rename to graphics/event_objects/palettes/field_object_palette_16.pal diff --git a/graphics/map_objects/palettes/field_object_palette_17.pal b/graphics/event_objects/palettes/field_object_palette_17.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_17.pal rename to graphics/event_objects/palettes/field_object_palette_17.pal diff --git a/graphics/map_objects/palettes/field_object_palette_18.pal b/graphics/event_objects/palettes/field_object_palette_18.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_18.pal rename to graphics/event_objects/palettes/field_object_palette_18.pal diff --git a/graphics/map_objects/palettes/field_object_palette_19.pal b/graphics/event_objects/palettes/field_object_palette_19.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_19.pal rename to graphics/event_objects/palettes/field_object_palette_19.pal diff --git a/graphics/map_objects/palettes/field_object_palette_20.pal b/graphics/event_objects/palettes/field_object_palette_20.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_20.pal rename to graphics/event_objects/palettes/field_object_palette_20.pal diff --git a/graphics/map_objects/palettes/field_object_palette_21.pal b/graphics/event_objects/palettes/field_object_palette_21.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_21.pal rename to graphics/event_objects/palettes/field_object_palette_21.pal diff --git a/graphics/map_objects/palettes/field_object_palette_22.pal b/graphics/event_objects/palettes/field_object_palette_22.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_22.pal rename to graphics/event_objects/palettes/field_object_palette_22.pal diff --git a/graphics/map_objects/palettes/field_object_palette_23.pal b/graphics/event_objects/palettes/field_object_palette_23.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_23.pal rename to graphics/event_objects/palettes/field_object_palette_23.pal diff --git a/graphics/map_objects/palettes/field_object_palette_24.pal b/graphics/event_objects/palettes/field_object_palette_24.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_24.pal rename to graphics/event_objects/palettes/field_object_palette_24.pal diff --git a/graphics/map_objects/palettes/field_object_palette_25.pal b/graphics/event_objects/palettes/field_object_palette_25.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_25.pal rename to graphics/event_objects/palettes/field_object_palette_25.pal diff --git a/graphics/map_objects/palettes/field_object_palette_26.pal b/graphics/event_objects/palettes/field_object_palette_26.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_26.pal rename to graphics/event_objects/palettes/field_object_palette_26.pal diff --git a/graphics/map_objects/palettes/field_object_palette_27.pal b/graphics/event_objects/palettes/field_object_palette_27.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_27.pal rename to graphics/event_objects/palettes/field_object_palette_27.pal diff --git a/graphics/map_objects/palettes/field_object_palette_28.pal b/graphics/event_objects/palettes/field_object_palette_28.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_28.pal rename to graphics/event_objects/palettes/field_object_palette_28.pal diff --git a/graphics/map_objects/palettes/field_object_palette_29.pal b/graphics/event_objects/palettes/field_object_palette_29.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_29.pal rename to graphics/event_objects/palettes/field_object_palette_29.pal diff --git a/graphics/map_objects/palettes/field_object_palette_30.pal b/graphics/event_objects/palettes/field_object_palette_30.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_30.pal rename to graphics/event_objects/palettes/field_object_palette_30.pal diff --git a/graphics/map_objects/palettes/field_object_palette_31.pal b/graphics/event_objects/palettes/field_object_palette_31.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_31.pal rename to graphics/event_objects/palettes/field_object_palette_31.pal diff --git a/graphics/map_objects/palettes/field_object_palette_32.pal b/graphics/event_objects/palettes/field_object_palette_32.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_32.pal rename to graphics/event_objects/palettes/field_object_palette_32.pal diff --git a/graphics/map_objects/palettes/field_object_palette_33.pal b/graphics/event_objects/palettes/field_object_palette_33.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_33.pal rename to graphics/event_objects/palettes/field_object_palette_33.pal diff --git a/graphics/map_objects/palettes/field_object_palette_34.pal b/graphics/event_objects/palettes/field_object_palette_34.pal similarity index 100% rename from graphics/map_objects/palettes/field_object_palette_34.pal rename to graphics/event_objects/palettes/field_object_palette_34.pal diff --git a/graphics/map_objects/palettes/unused_palette.pal b/graphics/event_objects/palettes/unused_palette.pal similarity index 100% rename from graphics/map_objects/palettes/unused_palette.pal rename to graphics/event_objects/palettes/unused_palette.pal diff --git a/graphics/map_objects/pics/berry_trees/aguav/0.png b/graphics/event_objects/pics/berry_trees/aguav/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/aguav/0.png rename to graphics/event_objects/pics/berry_trees/aguav/0.png diff --git a/graphics/map_objects/pics/berry_trees/aguav/1.png b/graphics/event_objects/pics/berry_trees/aguav/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/aguav/1.png rename to graphics/event_objects/pics/berry_trees/aguav/1.png diff --git a/graphics/map_objects/pics/berry_trees/aguav/2.png b/graphics/event_objects/pics/berry_trees/aguav/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/aguav/2.png rename to graphics/event_objects/pics/berry_trees/aguav/2.png diff --git a/graphics/map_objects/pics/berry_trees/aguav/3.png b/graphics/event_objects/pics/berry_trees/aguav/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/aguav/3.png rename to graphics/event_objects/pics/berry_trees/aguav/3.png diff --git a/graphics/map_objects/pics/berry_trees/aguav/4.png b/graphics/event_objects/pics/berry_trees/aguav/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/aguav/4.png rename to graphics/event_objects/pics/berry_trees/aguav/4.png diff --git a/graphics/map_objects/pics/berry_trees/aguav/5.png b/graphics/event_objects/pics/berry_trees/aguav/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/aguav/5.png rename to graphics/event_objects/pics/berry_trees/aguav/5.png diff --git a/graphics/map_objects/pics/berry_trees/aspear/0.png b/graphics/event_objects/pics/berry_trees/aspear/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/aspear/0.png rename to graphics/event_objects/pics/berry_trees/aspear/0.png diff --git a/graphics/map_objects/pics/berry_trees/aspear/1.png b/graphics/event_objects/pics/berry_trees/aspear/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/aspear/1.png rename to graphics/event_objects/pics/berry_trees/aspear/1.png diff --git a/graphics/map_objects/pics/berry_trees/aspear/2.png b/graphics/event_objects/pics/berry_trees/aspear/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/aspear/2.png rename to graphics/event_objects/pics/berry_trees/aspear/2.png diff --git a/graphics/map_objects/pics/berry_trees/aspear/3.png b/graphics/event_objects/pics/berry_trees/aspear/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/aspear/3.png rename to graphics/event_objects/pics/berry_trees/aspear/3.png diff --git a/graphics/map_objects/pics/berry_trees/aspear/4.png b/graphics/event_objects/pics/berry_trees/aspear/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/aspear/4.png rename to graphics/event_objects/pics/berry_trees/aspear/4.png diff --git a/graphics/map_objects/pics/berry_trees/aspear/5.png b/graphics/event_objects/pics/berry_trees/aspear/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/aspear/5.png rename to graphics/event_objects/pics/berry_trees/aspear/5.png diff --git a/graphics/map_objects/pics/berry_trees/cheri/0.png b/graphics/event_objects/pics/berry_trees/cheri/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/cheri/0.png rename to graphics/event_objects/pics/berry_trees/cheri/0.png diff --git a/graphics/map_objects/pics/berry_trees/cheri/1.png b/graphics/event_objects/pics/berry_trees/cheri/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/cheri/1.png rename to graphics/event_objects/pics/berry_trees/cheri/1.png diff --git a/graphics/map_objects/pics/berry_trees/cheri/2.png b/graphics/event_objects/pics/berry_trees/cheri/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/cheri/2.png rename to graphics/event_objects/pics/berry_trees/cheri/2.png diff --git a/graphics/map_objects/pics/berry_trees/cheri/3.png b/graphics/event_objects/pics/berry_trees/cheri/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/cheri/3.png rename to graphics/event_objects/pics/berry_trees/cheri/3.png diff --git a/graphics/map_objects/pics/berry_trees/cheri/4.png b/graphics/event_objects/pics/berry_trees/cheri/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/cheri/4.png rename to graphics/event_objects/pics/berry_trees/cheri/4.png diff --git a/graphics/map_objects/pics/berry_trees/cheri/5.png b/graphics/event_objects/pics/berry_trees/cheri/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/cheri/5.png rename to graphics/event_objects/pics/berry_trees/cheri/5.png diff --git a/graphics/map_objects/pics/berry_trees/chesto/0.png b/graphics/event_objects/pics/berry_trees/chesto/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/chesto/0.png rename to graphics/event_objects/pics/berry_trees/chesto/0.png diff --git a/graphics/map_objects/pics/berry_trees/chesto/1.png b/graphics/event_objects/pics/berry_trees/chesto/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/chesto/1.png rename to graphics/event_objects/pics/berry_trees/chesto/1.png diff --git a/graphics/map_objects/pics/berry_trees/chesto/2.png b/graphics/event_objects/pics/berry_trees/chesto/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/chesto/2.png rename to graphics/event_objects/pics/berry_trees/chesto/2.png diff --git a/graphics/map_objects/pics/berry_trees/chesto/3.png b/graphics/event_objects/pics/berry_trees/chesto/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/chesto/3.png rename to graphics/event_objects/pics/berry_trees/chesto/3.png diff --git a/graphics/map_objects/pics/berry_trees/chesto/4.png b/graphics/event_objects/pics/berry_trees/chesto/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/chesto/4.png rename to graphics/event_objects/pics/berry_trees/chesto/4.png diff --git a/graphics/map_objects/pics/berry_trees/chesto/5.png b/graphics/event_objects/pics/berry_trees/chesto/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/chesto/5.png rename to graphics/event_objects/pics/berry_trees/chesto/5.png diff --git a/graphics/map_objects/pics/berry_trees/cornn/0.png b/graphics/event_objects/pics/berry_trees/cornn/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/cornn/0.png rename to graphics/event_objects/pics/berry_trees/cornn/0.png diff --git a/graphics/map_objects/pics/berry_trees/cornn/1.png b/graphics/event_objects/pics/berry_trees/cornn/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/cornn/1.png rename to graphics/event_objects/pics/berry_trees/cornn/1.png diff --git a/graphics/map_objects/pics/berry_trees/cornn/2.png b/graphics/event_objects/pics/berry_trees/cornn/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/cornn/2.png rename to graphics/event_objects/pics/berry_trees/cornn/2.png diff --git a/graphics/map_objects/pics/berry_trees/cornn/3.png b/graphics/event_objects/pics/berry_trees/cornn/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/cornn/3.png rename to graphics/event_objects/pics/berry_trees/cornn/3.png diff --git a/graphics/map_objects/pics/berry_trees/cornn/4.png b/graphics/event_objects/pics/berry_trees/cornn/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/cornn/4.png rename to graphics/event_objects/pics/berry_trees/cornn/4.png diff --git a/graphics/map_objects/pics/berry_trees/cornn/5.png b/graphics/event_objects/pics/berry_trees/cornn/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/cornn/5.png rename to graphics/event_objects/pics/berry_trees/cornn/5.png diff --git a/graphics/map_objects/pics/berry_trees/dirt_pile.png b/graphics/event_objects/pics/berry_trees/dirt_pile.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/dirt_pile.png rename to graphics/event_objects/pics/berry_trees/dirt_pile.png diff --git a/graphics/map_objects/pics/berry_trees/durin/0.png b/graphics/event_objects/pics/berry_trees/durin/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/durin/0.png rename to graphics/event_objects/pics/berry_trees/durin/0.png diff --git a/graphics/map_objects/pics/berry_trees/durin/1.png b/graphics/event_objects/pics/berry_trees/durin/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/durin/1.png rename to graphics/event_objects/pics/berry_trees/durin/1.png diff --git a/graphics/map_objects/pics/berry_trees/durin/2.png b/graphics/event_objects/pics/berry_trees/durin/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/durin/2.png rename to graphics/event_objects/pics/berry_trees/durin/2.png diff --git a/graphics/map_objects/pics/berry_trees/durin/3.png b/graphics/event_objects/pics/berry_trees/durin/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/durin/3.png rename to graphics/event_objects/pics/berry_trees/durin/3.png diff --git a/graphics/map_objects/pics/berry_trees/durin/4.png b/graphics/event_objects/pics/berry_trees/durin/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/durin/4.png rename to graphics/event_objects/pics/berry_trees/durin/4.png diff --git a/graphics/map_objects/pics/berry_trees/durin/5.png b/graphics/event_objects/pics/berry_trees/durin/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/durin/5.png rename to graphics/event_objects/pics/berry_trees/durin/5.png diff --git a/graphics/map_objects/pics/berry_trees/figy/0.png b/graphics/event_objects/pics/berry_trees/figy/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/figy/0.png rename to graphics/event_objects/pics/berry_trees/figy/0.png diff --git a/graphics/map_objects/pics/berry_trees/figy/1.png b/graphics/event_objects/pics/berry_trees/figy/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/figy/1.png rename to graphics/event_objects/pics/berry_trees/figy/1.png diff --git a/graphics/map_objects/pics/berry_trees/figy/2.png b/graphics/event_objects/pics/berry_trees/figy/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/figy/2.png rename to graphics/event_objects/pics/berry_trees/figy/2.png diff --git a/graphics/map_objects/pics/berry_trees/figy/3.png b/graphics/event_objects/pics/berry_trees/figy/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/figy/3.png rename to graphics/event_objects/pics/berry_trees/figy/3.png diff --git a/graphics/map_objects/pics/berry_trees/figy/4.png b/graphics/event_objects/pics/berry_trees/figy/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/figy/4.png rename to graphics/event_objects/pics/berry_trees/figy/4.png diff --git a/graphics/map_objects/pics/berry_trees/figy/5.png b/graphics/event_objects/pics/berry_trees/figy/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/figy/5.png rename to graphics/event_objects/pics/berry_trees/figy/5.png diff --git a/graphics/map_objects/pics/berry_trees/grepa/0.png b/graphics/event_objects/pics/berry_trees/grepa/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/grepa/0.png rename to graphics/event_objects/pics/berry_trees/grepa/0.png diff --git a/graphics/map_objects/pics/berry_trees/grepa/1.png b/graphics/event_objects/pics/berry_trees/grepa/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/grepa/1.png rename to graphics/event_objects/pics/berry_trees/grepa/1.png diff --git a/graphics/map_objects/pics/berry_trees/grepa/2.png b/graphics/event_objects/pics/berry_trees/grepa/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/grepa/2.png rename to graphics/event_objects/pics/berry_trees/grepa/2.png diff --git a/graphics/map_objects/pics/berry_trees/grepa/3.png b/graphics/event_objects/pics/berry_trees/grepa/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/grepa/3.png rename to graphics/event_objects/pics/berry_trees/grepa/3.png diff --git a/graphics/map_objects/pics/berry_trees/grepa/4.png b/graphics/event_objects/pics/berry_trees/grepa/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/grepa/4.png rename to graphics/event_objects/pics/berry_trees/grepa/4.png diff --git a/graphics/map_objects/pics/berry_trees/grepa/5.png b/graphics/event_objects/pics/berry_trees/grepa/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/grepa/5.png rename to graphics/event_objects/pics/berry_trees/grepa/5.png diff --git a/graphics/map_objects/pics/berry_trees/hondew/0.png b/graphics/event_objects/pics/berry_trees/hondew/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/hondew/0.png rename to graphics/event_objects/pics/berry_trees/hondew/0.png diff --git a/graphics/map_objects/pics/berry_trees/hondew/1.png b/graphics/event_objects/pics/berry_trees/hondew/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/hondew/1.png rename to graphics/event_objects/pics/berry_trees/hondew/1.png diff --git a/graphics/map_objects/pics/berry_trees/hondew/2.png b/graphics/event_objects/pics/berry_trees/hondew/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/hondew/2.png rename to graphics/event_objects/pics/berry_trees/hondew/2.png diff --git a/graphics/map_objects/pics/berry_trees/hondew/3.png b/graphics/event_objects/pics/berry_trees/hondew/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/hondew/3.png rename to graphics/event_objects/pics/berry_trees/hondew/3.png diff --git a/graphics/map_objects/pics/berry_trees/hondew/4.png b/graphics/event_objects/pics/berry_trees/hondew/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/hondew/4.png rename to graphics/event_objects/pics/berry_trees/hondew/4.png diff --git a/graphics/map_objects/pics/berry_trees/hondew/5.png b/graphics/event_objects/pics/berry_trees/hondew/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/hondew/5.png rename to graphics/event_objects/pics/berry_trees/hondew/5.png diff --git a/graphics/map_objects/pics/berry_trees/iapapa/0.png b/graphics/event_objects/pics/berry_trees/iapapa/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/iapapa/0.png rename to graphics/event_objects/pics/berry_trees/iapapa/0.png diff --git a/graphics/map_objects/pics/berry_trees/iapapa/1.png b/graphics/event_objects/pics/berry_trees/iapapa/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/iapapa/1.png rename to graphics/event_objects/pics/berry_trees/iapapa/1.png diff --git a/graphics/map_objects/pics/berry_trees/iapapa/2.png b/graphics/event_objects/pics/berry_trees/iapapa/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/iapapa/2.png rename to graphics/event_objects/pics/berry_trees/iapapa/2.png diff --git a/graphics/map_objects/pics/berry_trees/iapapa/3.png b/graphics/event_objects/pics/berry_trees/iapapa/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/iapapa/3.png rename to graphics/event_objects/pics/berry_trees/iapapa/3.png diff --git a/graphics/map_objects/pics/berry_trees/iapapa/4.png b/graphics/event_objects/pics/berry_trees/iapapa/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/iapapa/4.png rename to graphics/event_objects/pics/berry_trees/iapapa/4.png diff --git a/graphics/map_objects/pics/berry_trees/iapapa/5.png b/graphics/event_objects/pics/berry_trees/iapapa/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/iapapa/5.png rename to graphics/event_objects/pics/berry_trees/iapapa/5.png diff --git a/graphics/map_objects/pics/berry_trees/kelpsy/0.png b/graphics/event_objects/pics/berry_trees/kelpsy/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/kelpsy/0.png rename to graphics/event_objects/pics/berry_trees/kelpsy/0.png diff --git a/graphics/map_objects/pics/berry_trees/kelpsy/1.png b/graphics/event_objects/pics/berry_trees/kelpsy/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/kelpsy/1.png rename to graphics/event_objects/pics/berry_trees/kelpsy/1.png diff --git a/graphics/map_objects/pics/berry_trees/kelpsy/2.png b/graphics/event_objects/pics/berry_trees/kelpsy/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/kelpsy/2.png rename to graphics/event_objects/pics/berry_trees/kelpsy/2.png diff --git a/graphics/map_objects/pics/berry_trees/kelpsy/3.png b/graphics/event_objects/pics/berry_trees/kelpsy/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/kelpsy/3.png rename to graphics/event_objects/pics/berry_trees/kelpsy/3.png diff --git a/graphics/map_objects/pics/berry_trees/kelpsy/4.png b/graphics/event_objects/pics/berry_trees/kelpsy/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/kelpsy/4.png rename to graphics/event_objects/pics/berry_trees/kelpsy/4.png diff --git a/graphics/map_objects/pics/berry_trees/kelpsy/5.png b/graphics/event_objects/pics/berry_trees/kelpsy/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/kelpsy/5.png rename to graphics/event_objects/pics/berry_trees/kelpsy/5.png diff --git a/graphics/map_objects/pics/berry_trees/lansat/0.png b/graphics/event_objects/pics/berry_trees/lansat/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/lansat/0.png rename to graphics/event_objects/pics/berry_trees/lansat/0.png diff --git a/graphics/map_objects/pics/berry_trees/lansat/1.png b/graphics/event_objects/pics/berry_trees/lansat/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/lansat/1.png rename to graphics/event_objects/pics/berry_trees/lansat/1.png diff --git a/graphics/map_objects/pics/berry_trees/lansat/2.png b/graphics/event_objects/pics/berry_trees/lansat/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/lansat/2.png rename to graphics/event_objects/pics/berry_trees/lansat/2.png diff --git a/graphics/map_objects/pics/berry_trees/lansat/3.png b/graphics/event_objects/pics/berry_trees/lansat/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/lansat/3.png rename to graphics/event_objects/pics/berry_trees/lansat/3.png diff --git a/graphics/map_objects/pics/berry_trees/lansat/4.png b/graphics/event_objects/pics/berry_trees/lansat/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/lansat/4.png rename to graphics/event_objects/pics/berry_trees/lansat/4.png diff --git a/graphics/map_objects/pics/berry_trees/lansat/5.png b/graphics/event_objects/pics/berry_trees/lansat/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/lansat/5.png rename to graphics/event_objects/pics/berry_trees/lansat/5.png diff --git a/graphics/map_objects/pics/berry_trees/leppa/0.png b/graphics/event_objects/pics/berry_trees/leppa/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/leppa/0.png rename to graphics/event_objects/pics/berry_trees/leppa/0.png diff --git a/graphics/map_objects/pics/berry_trees/leppa/1.png b/graphics/event_objects/pics/berry_trees/leppa/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/leppa/1.png rename to graphics/event_objects/pics/berry_trees/leppa/1.png diff --git a/graphics/map_objects/pics/berry_trees/leppa/2.png b/graphics/event_objects/pics/berry_trees/leppa/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/leppa/2.png rename to graphics/event_objects/pics/berry_trees/leppa/2.png diff --git a/graphics/map_objects/pics/berry_trees/leppa/3.png b/graphics/event_objects/pics/berry_trees/leppa/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/leppa/3.png rename to graphics/event_objects/pics/berry_trees/leppa/3.png diff --git a/graphics/map_objects/pics/berry_trees/leppa/4.png b/graphics/event_objects/pics/berry_trees/leppa/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/leppa/4.png rename to graphics/event_objects/pics/berry_trees/leppa/4.png diff --git a/graphics/map_objects/pics/berry_trees/leppa/5.png b/graphics/event_objects/pics/berry_trees/leppa/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/leppa/5.png rename to graphics/event_objects/pics/berry_trees/leppa/5.png diff --git a/graphics/map_objects/pics/berry_trees/liechi/0.png b/graphics/event_objects/pics/berry_trees/liechi/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/liechi/0.png rename to graphics/event_objects/pics/berry_trees/liechi/0.png diff --git a/graphics/map_objects/pics/berry_trees/liechi/1.png b/graphics/event_objects/pics/berry_trees/liechi/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/liechi/1.png rename to graphics/event_objects/pics/berry_trees/liechi/1.png diff --git a/graphics/map_objects/pics/berry_trees/liechi/2.png b/graphics/event_objects/pics/berry_trees/liechi/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/liechi/2.png rename to graphics/event_objects/pics/berry_trees/liechi/2.png diff --git a/graphics/map_objects/pics/berry_trees/liechi/3.png b/graphics/event_objects/pics/berry_trees/liechi/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/liechi/3.png rename to graphics/event_objects/pics/berry_trees/liechi/3.png diff --git a/graphics/map_objects/pics/berry_trees/liechi/4.png b/graphics/event_objects/pics/berry_trees/liechi/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/liechi/4.png rename to graphics/event_objects/pics/berry_trees/liechi/4.png diff --git a/graphics/map_objects/pics/berry_trees/liechi/5.png b/graphics/event_objects/pics/berry_trees/liechi/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/liechi/5.png rename to graphics/event_objects/pics/berry_trees/liechi/5.png diff --git a/graphics/map_objects/pics/berry_trees/lum/0.png b/graphics/event_objects/pics/berry_trees/lum/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/lum/0.png rename to graphics/event_objects/pics/berry_trees/lum/0.png diff --git a/graphics/map_objects/pics/berry_trees/lum/1.png b/graphics/event_objects/pics/berry_trees/lum/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/lum/1.png rename to graphics/event_objects/pics/berry_trees/lum/1.png diff --git a/graphics/map_objects/pics/berry_trees/lum/2.png b/graphics/event_objects/pics/berry_trees/lum/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/lum/2.png rename to graphics/event_objects/pics/berry_trees/lum/2.png diff --git a/graphics/map_objects/pics/berry_trees/lum/3.png b/graphics/event_objects/pics/berry_trees/lum/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/lum/3.png rename to graphics/event_objects/pics/berry_trees/lum/3.png diff --git a/graphics/map_objects/pics/berry_trees/lum/4.png b/graphics/event_objects/pics/berry_trees/lum/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/lum/4.png rename to graphics/event_objects/pics/berry_trees/lum/4.png diff --git a/graphics/map_objects/pics/berry_trees/lum/5.png b/graphics/event_objects/pics/berry_trees/lum/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/lum/5.png rename to graphics/event_objects/pics/berry_trees/lum/5.png diff --git a/graphics/map_objects/pics/berry_trees/mago/0.png b/graphics/event_objects/pics/berry_trees/mago/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/mago/0.png rename to graphics/event_objects/pics/berry_trees/mago/0.png diff --git a/graphics/map_objects/pics/berry_trees/mago/1.png b/graphics/event_objects/pics/berry_trees/mago/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/mago/1.png rename to graphics/event_objects/pics/berry_trees/mago/1.png diff --git a/graphics/map_objects/pics/berry_trees/mago/2.png b/graphics/event_objects/pics/berry_trees/mago/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/mago/2.png rename to graphics/event_objects/pics/berry_trees/mago/2.png diff --git a/graphics/map_objects/pics/berry_trees/mago/3.png b/graphics/event_objects/pics/berry_trees/mago/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/mago/3.png rename to graphics/event_objects/pics/berry_trees/mago/3.png diff --git a/graphics/map_objects/pics/berry_trees/mago/4.png b/graphics/event_objects/pics/berry_trees/mago/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/mago/4.png rename to graphics/event_objects/pics/berry_trees/mago/4.png diff --git a/graphics/map_objects/pics/berry_trees/mago/5.png b/graphics/event_objects/pics/berry_trees/mago/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/mago/5.png rename to graphics/event_objects/pics/berry_trees/mago/5.png diff --git a/graphics/map_objects/pics/berry_trees/nomel/0.png b/graphics/event_objects/pics/berry_trees/nomel/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/nomel/0.png rename to graphics/event_objects/pics/berry_trees/nomel/0.png diff --git a/graphics/map_objects/pics/berry_trees/nomel/1.png b/graphics/event_objects/pics/berry_trees/nomel/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/nomel/1.png rename to graphics/event_objects/pics/berry_trees/nomel/1.png diff --git a/graphics/map_objects/pics/berry_trees/nomel/2.png b/graphics/event_objects/pics/berry_trees/nomel/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/nomel/2.png rename to graphics/event_objects/pics/berry_trees/nomel/2.png diff --git a/graphics/map_objects/pics/berry_trees/nomel/3.png b/graphics/event_objects/pics/berry_trees/nomel/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/nomel/3.png rename to graphics/event_objects/pics/berry_trees/nomel/3.png diff --git a/graphics/map_objects/pics/berry_trees/nomel/4.png b/graphics/event_objects/pics/berry_trees/nomel/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/nomel/4.png rename to graphics/event_objects/pics/berry_trees/nomel/4.png diff --git a/graphics/map_objects/pics/berry_trees/nomel/5.png b/graphics/event_objects/pics/berry_trees/nomel/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/nomel/5.png rename to graphics/event_objects/pics/berry_trees/nomel/5.png diff --git a/graphics/map_objects/pics/berry_trees/oran/0.png b/graphics/event_objects/pics/berry_trees/oran/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/oran/0.png rename to graphics/event_objects/pics/berry_trees/oran/0.png diff --git a/graphics/map_objects/pics/berry_trees/oran/1.png b/graphics/event_objects/pics/berry_trees/oran/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/oran/1.png rename to graphics/event_objects/pics/berry_trees/oran/1.png diff --git a/graphics/map_objects/pics/berry_trees/oran/2.png b/graphics/event_objects/pics/berry_trees/oran/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/oran/2.png rename to graphics/event_objects/pics/berry_trees/oran/2.png diff --git a/graphics/map_objects/pics/berry_trees/oran/3.png b/graphics/event_objects/pics/berry_trees/oran/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/oran/3.png rename to graphics/event_objects/pics/berry_trees/oran/3.png diff --git a/graphics/map_objects/pics/berry_trees/oran/4.png b/graphics/event_objects/pics/berry_trees/oran/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/oran/4.png rename to graphics/event_objects/pics/berry_trees/oran/4.png diff --git a/graphics/map_objects/pics/berry_trees/oran/5.png b/graphics/event_objects/pics/berry_trees/oran/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/oran/5.png rename to graphics/event_objects/pics/berry_trees/oran/5.png diff --git a/graphics/map_objects/pics/berry_trees/pamtre/0.png b/graphics/event_objects/pics/berry_trees/pamtre/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/pamtre/0.png rename to graphics/event_objects/pics/berry_trees/pamtre/0.png diff --git a/graphics/map_objects/pics/berry_trees/pamtre/1.png b/graphics/event_objects/pics/berry_trees/pamtre/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/pamtre/1.png rename to graphics/event_objects/pics/berry_trees/pamtre/1.png diff --git a/graphics/map_objects/pics/berry_trees/pamtre/2.png b/graphics/event_objects/pics/berry_trees/pamtre/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/pamtre/2.png rename to graphics/event_objects/pics/berry_trees/pamtre/2.png diff --git a/graphics/map_objects/pics/berry_trees/pamtre/3.png b/graphics/event_objects/pics/berry_trees/pamtre/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/pamtre/3.png rename to graphics/event_objects/pics/berry_trees/pamtre/3.png diff --git a/graphics/map_objects/pics/berry_trees/pamtre/4.png b/graphics/event_objects/pics/berry_trees/pamtre/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/pamtre/4.png rename to graphics/event_objects/pics/berry_trees/pamtre/4.png diff --git a/graphics/map_objects/pics/berry_trees/pamtre/5.png b/graphics/event_objects/pics/berry_trees/pamtre/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/pamtre/5.png rename to graphics/event_objects/pics/berry_trees/pamtre/5.png diff --git a/graphics/map_objects/pics/berry_trees/pecha/0.png b/graphics/event_objects/pics/berry_trees/pecha/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/pecha/0.png rename to graphics/event_objects/pics/berry_trees/pecha/0.png diff --git a/graphics/map_objects/pics/berry_trees/pecha/1.png b/graphics/event_objects/pics/berry_trees/pecha/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/pecha/1.png rename to graphics/event_objects/pics/berry_trees/pecha/1.png diff --git a/graphics/map_objects/pics/berry_trees/pecha/2.png b/graphics/event_objects/pics/berry_trees/pecha/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/pecha/2.png rename to graphics/event_objects/pics/berry_trees/pecha/2.png diff --git a/graphics/map_objects/pics/berry_trees/pecha/3.png b/graphics/event_objects/pics/berry_trees/pecha/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/pecha/3.png rename to graphics/event_objects/pics/berry_trees/pecha/3.png diff --git a/graphics/map_objects/pics/berry_trees/pecha/4.png b/graphics/event_objects/pics/berry_trees/pecha/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/pecha/4.png rename to graphics/event_objects/pics/berry_trees/pecha/4.png diff --git a/graphics/map_objects/pics/berry_trees/pecha/5.png b/graphics/event_objects/pics/berry_trees/pecha/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/pecha/5.png rename to graphics/event_objects/pics/berry_trees/pecha/5.png diff --git a/graphics/map_objects/pics/berry_trees/persim/0.png b/graphics/event_objects/pics/berry_trees/persim/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/persim/0.png rename to graphics/event_objects/pics/berry_trees/persim/0.png diff --git a/graphics/map_objects/pics/berry_trees/persim/1.png b/graphics/event_objects/pics/berry_trees/persim/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/persim/1.png rename to graphics/event_objects/pics/berry_trees/persim/1.png diff --git a/graphics/map_objects/pics/berry_trees/persim/2.png b/graphics/event_objects/pics/berry_trees/persim/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/persim/2.png rename to graphics/event_objects/pics/berry_trees/persim/2.png diff --git a/graphics/map_objects/pics/berry_trees/persim/3.png b/graphics/event_objects/pics/berry_trees/persim/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/persim/3.png rename to graphics/event_objects/pics/berry_trees/persim/3.png diff --git a/graphics/map_objects/pics/berry_trees/persim/4.png b/graphics/event_objects/pics/berry_trees/persim/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/persim/4.png rename to graphics/event_objects/pics/berry_trees/persim/4.png diff --git a/graphics/map_objects/pics/berry_trees/persim/5.png b/graphics/event_objects/pics/berry_trees/persim/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/persim/5.png rename to graphics/event_objects/pics/berry_trees/persim/5.png diff --git a/graphics/map_objects/pics/berry_trees/pomeg/0.png b/graphics/event_objects/pics/berry_trees/pomeg/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/pomeg/0.png rename to graphics/event_objects/pics/berry_trees/pomeg/0.png diff --git a/graphics/map_objects/pics/berry_trees/pomeg/1.png b/graphics/event_objects/pics/berry_trees/pomeg/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/pomeg/1.png rename to graphics/event_objects/pics/berry_trees/pomeg/1.png diff --git a/graphics/map_objects/pics/berry_trees/pomeg/2.png b/graphics/event_objects/pics/berry_trees/pomeg/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/pomeg/2.png rename to graphics/event_objects/pics/berry_trees/pomeg/2.png diff --git a/graphics/map_objects/pics/berry_trees/pomeg/3.png b/graphics/event_objects/pics/berry_trees/pomeg/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/pomeg/3.png rename to graphics/event_objects/pics/berry_trees/pomeg/3.png diff --git a/graphics/map_objects/pics/berry_trees/pomeg/4.png b/graphics/event_objects/pics/berry_trees/pomeg/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/pomeg/4.png rename to graphics/event_objects/pics/berry_trees/pomeg/4.png diff --git a/graphics/map_objects/pics/berry_trees/pomeg/5.png b/graphics/event_objects/pics/berry_trees/pomeg/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/pomeg/5.png rename to graphics/event_objects/pics/berry_trees/pomeg/5.png diff --git a/graphics/map_objects/pics/berry_trees/rabuta/0.png b/graphics/event_objects/pics/berry_trees/rabuta/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/rabuta/0.png rename to graphics/event_objects/pics/berry_trees/rabuta/0.png diff --git a/graphics/map_objects/pics/berry_trees/rabuta/1.png b/graphics/event_objects/pics/berry_trees/rabuta/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/rabuta/1.png rename to graphics/event_objects/pics/berry_trees/rabuta/1.png diff --git a/graphics/map_objects/pics/berry_trees/rabuta/2.png b/graphics/event_objects/pics/berry_trees/rabuta/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/rabuta/2.png rename to graphics/event_objects/pics/berry_trees/rabuta/2.png diff --git a/graphics/map_objects/pics/berry_trees/rabuta/3.png b/graphics/event_objects/pics/berry_trees/rabuta/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/rabuta/3.png rename to graphics/event_objects/pics/berry_trees/rabuta/3.png diff --git a/graphics/map_objects/pics/berry_trees/rabuta/4.png b/graphics/event_objects/pics/berry_trees/rabuta/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/rabuta/4.png rename to graphics/event_objects/pics/berry_trees/rabuta/4.png diff --git a/graphics/map_objects/pics/berry_trees/rabuta/5.png b/graphics/event_objects/pics/berry_trees/rabuta/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/rabuta/5.png rename to graphics/event_objects/pics/berry_trees/rabuta/5.png diff --git a/graphics/map_objects/pics/berry_trees/rawst/0.png b/graphics/event_objects/pics/berry_trees/rawst/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/rawst/0.png rename to graphics/event_objects/pics/berry_trees/rawst/0.png diff --git a/graphics/map_objects/pics/berry_trees/rawst/1.png b/graphics/event_objects/pics/berry_trees/rawst/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/rawst/1.png rename to graphics/event_objects/pics/berry_trees/rawst/1.png diff --git a/graphics/map_objects/pics/berry_trees/rawst/2.png b/graphics/event_objects/pics/berry_trees/rawst/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/rawst/2.png rename to graphics/event_objects/pics/berry_trees/rawst/2.png diff --git a/graphics/map_objects/pics/berry_trees/rawst/3.png b/graphics/event_objects/pics/berry_trees/rawst/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/rawst/3.png rename to graphics/event_objects/pics/berry_trees/rawst/3.png diff --git a/graphics/map_objects/pics/berry_trees/rawst/4.png b/graphics/event_objects/pics/berry_trees/rawst/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/rawst/4.png rename to graphics/event_objects/pics/berry_trees/rawst/4.png diff --git a/graphics/map_objects/pics/berry_trees/rawst/5.png b/graphics/event_objects/pics/berry_trees/rawst/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/rawst/5.png rename to graphics/event_objects/pics/berry_trees/rawst/5.png diff --git a/graphics/map_objects/pics/berry_trees/razz/0.png b/graphics/event_objects/pics/berry_trees/razz/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/razz/0.png rename to graphics/event_objects/pics/berry_trees/razz/0.png diff --git a/graphics/map_objects/pics/berry_trees/razz/1.png b/graphics/event_objects/pics/berry_trees/razz/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/razz/1.png rename to graphics/event_objects/pics/berry_trees/razz/1.png diff --git a/graphics/map_objects/pics/berry_trees/razz/2.png b/graphics/event_objects/pics/berry_trees/razz/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/razz/2.png rename to graphics/event_objects/pics/berry_trees/razz/2.png diff --git a/graphics/map_objects/pics/berry_trees/razz/3.png b/graphics/event_objects/pics/berry_trees/razz/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/razz/3.png rename to graphics/event_objects/pics/berry_trees/razz/3.png diff --git a/graphics/map_objects/pics/berry_trees/razz/4.png b/graphics/event_objects/pics/berry_trees/razz/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/razz/4.png rename to graphics/event_objects/pics/berry_trees/razz/4.png diff --git a/graphics/map_objects/pics/berry_trees/razz/5.png b/graphics/event_objects/pics/berry_trees/razz/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/razz/5.png rename to graphics/event_objects/pics/berry_trees/razz/5.png diff --git a/graphics/map_objects/pics/berry_trees/sitrus/0.png b/graphics/event_objects/pics/berry_trees/sitrus/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/sitrus/0.png rename to graphics/event_objects/pics/berry_trees/sitrus/0.png diff --git a/graphics/map_objects/pics/berry_trees/sitrus/1.png b/graphics/event_objects/pics/berry_trees/sitrus/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/sitrus/1.png rename to graphics/event_objects/pics/berry_trees/sitrus/1.png diff --git a/graphics/map_objects/pics/berry_trees/sitrus/2.png b/graphics/event_objects/pics/berry_trees/sitrus/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/sitrus/2.png rename to graphics/event_objects/pics/berry_trees/sitrus/2.png diff --git a/graphics/map_objects/pics/berry_trees/sitrus/3.png b/graphics/event_objects/pics/berry_trees/sitrus/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/sitrus/3.png rename to graphics/event_objects/pics/berry_trees/sitrus/3.png diff --git a/graphics/map_objects/pics/berry_trees/sitrus/4.png b/graphics/event_objects/pics/berry_trees/sitrus/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/sitrus/4.png rename to graphics/event_objects/pics/berry_trees/sitrus/4.png diff --git a/graphics/map_objects/pics/berry_trees/sitrus/5.png b/graphics/event_objects/pics/berry_trees/sitrus/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/sitrus/5.png rename to graphics/event_objects/pics/berry_trees/sitrus/5.png diff --git a/graphics/map_objects/pics/berry_trees/spelon/0.png b/graphics/event_objects/pics/berry_trees/spelon/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/spelon/0.png rename to graphics/event_objects/pics/berry_trees/spelon/0.png diff --git a/graphics/map_objects/pics/berry_trees/spelon/1.png b/graphics/event_objects/pics/berry_trees/spelon/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/spelon/1.png rename to graphics/event_objects/pics/berry_trees/spelon/1.png diff --git a/graphics/map_objects/pics/berry_trees/spelon/2.png b/graphics/event_objects/pics/berry_trees/spelon/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/spelon/2.png rename to graphics/event_objects/pics/berry_trees/spelon/2.png diff --git a/graphics/map_objects/pics/berry_trees/spelon/3.png b/graphics/event_objects/pics/berry_trees/spelon/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/spelon/3.png rename to graphics/event_objects/pics/berry_trees/spelon/3.png diff --git a/graphics/map_objects/pics/berry_trees/spelon/4.png b/graphics/event_objects/pics/berry_trees/spelon/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/spelon/4.png rename to graphics/event_objects/pics/berry_trees/spelon/4.png diff --git a/graphics/map_objects/pics/berry_trees/spelon/5.png b/graphics/event_objects/pics/berry_trees/spelon/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/spelon/5.png rename to graphics/event_objects/pics/berry_trees/spelon/5.png diff --git a/graphics/map_objects/pics/berry_trees/sprout/0.png b/graphics/event_objects/pics/berry_trees/sprout/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/sprout/0.png rename to graphics/event_objects/pics/berry_trees/sprout/0.png diff --git a/graphics/map_objects/pics/berry_trees/sprout/1.png b/graphics/event_objects/pics/berry_trees/sprout/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/sprout/1.png rename to graphics/event_objects/pics/berry_trees/sprout/1.png diff --git a/graphics/map_objects/pics/berry_trees/tamato/0.png b/graphics/event_objects/pics/berry_trees/tamato/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/tamato/0.png rename to graphics/event_objects/pics/berry_trees/tamato/0.png diff --git a/graphics/map_objects/pics/berry_trees/tamato/1.png b/graphics/event_objects/pics/berry_trees/tamato/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/tamato/1.png rename to graphics/event_objects/pics/berry_trees/tamato/1.png diff --git a/graphics/map_objects/pics/berry_trees/tamato/2.png b/graphics/event_objects/pics/berry_trees/tamato/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/tamato/2.png rename to graphics/event_objects/pics/berry_trees/tamato/2.png diff --git a/graphics/map_objects/pics/berry_trees/tamato/3.png b/graphics/event_objects/pics/berry_trees/tamato/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/tamato/3.png rename to graphics/event_objects/pics/berry_trees/tamato/3.png diff --git a/graphics/map_objects/pics/berry_trees/tamato/4.png b/graphics/event_objects/pics/berry_trees/tamato/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/tamato/4.png rename to graphics/event_objects/pics/berry_trees/tamato/4.png diff --git a/graphics/map_objects/pics/berry_trees/tamato/5.png b/graphics/event_objects/pics/berry_trees/tamato/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/tamato/5.png rename to graphics/event_objects/pics/berry_trees/tamato/5.png diff --git a/graphics/map_objects/pics/berry_trees/wepear/0.png b/graphics/event_objects/pics/berry_trees/wepear/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/wepear/0.png rename to graphics/event_objects/pics/berry_trees/wepear/0.png diff --git a/graphics/map_objects/pics/berry_trees/wepear/1.png b/graphics/event_objects/pics/berry_trees/wepear/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/wepear/1.png rename to graphics/event_objects/pics/berry_trees/wepear/1.png diff --git a/graphics/map_objects/pics/berry_trees/wepear/2.png b/graphics/event_objects/pics/berry_trees/wepear/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/wepear/2.png rename to graphics/event_objects/pics/berry_trees/wepear/2.png diff --git a/graphics/map_objects/pics/berry_trees/wepear/3.png b/graphics/event_objects/pics/berry_trees/wepear/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/wepear/3.png rename to graphics/event_objects/pics/berry_trees/wepear/3.png diff --git a/graphics/map_objects/pics/berry_trees/wepear/4.png b/graphics/event_objects/pics/berry_trees/wepear/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/wepear/4.png rename to graphics/event_objects/pics/berry_trees/wepear/4.png diff --git a/graphics/map_objects/pics/berry_trees/wepear/5.png b/graphics/event_objects/pics/berry_trees/wepear/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/wepear/5.png rename to graphics/event_objects/pics/berry_trees/wepear/5.png diff --git a/graphics/map_objects/pics/berry_trees/wiki/0.png b/graphics/event_objects/pics/berry_trees/wiki/0.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/wiki/0.png rename to graphics/event_objects/pics/berry_trees/wiki/0.png diff --git a/graphics/map_objects/pics/berry_trees/wiki/1.png b/graphics/event_objects/pics/berry_trees/wiki/1.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/wiki/1.png rename to graphics/event_objects/pics/berry_trees/wiki/1.png diff --git a/graphics/map_objects/pics/berry_trees/wiki/2.png b/graphics/event_objects/pics/berry_trees/wiki/2.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/wiki/2.png rename to graphics/event_objects/pics/berry_trees/wiki/2.png diff --git a/graphics/map_objects/pics/berry_trees/wiki/3.png b/graphics/event_objects/pics/berry_trees/wiki/3.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/wiki/3.png rename to graphics/event_objects/pics/berry_trees/wiki/3.png diff --git a/graphics/map_objects/pics/berry_trees/wiki/4.png b/graphics/event_objects/pics/berry_trees/wiki/4.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/wiki/4.png rename to graphics/event_objects/pics/berry_trees/wiki/4.png diff --git a/graphics/map_objects/pics/berry_trees/wiki/5.png b/graphics/event_objects/pics/berry_trees/wiki/5.png similarity index 100% rename from graphics/map_objects/pics/berry_trees/wiki/5.png rename to graphics/event_objects/pics/berry_trees/wiki/5.png diff --git a/graphics/map_objects/pics/cushions/ball_cushion.png b/graphics/event_objects/pics/cushions/ball_cushion.png similarity index 100% rename from graphics/map_objects/pics/cushions/ball_cushion.png rename to graphics/event_objects/pics/cushions/ball_cushion.png diff --git a/graphics/map_objects/pics/cushions/diamond_cushion.png b/graphics/event_objects/pics/cushions/diamond_cushion.png similarity index 100% rename from graphics/map_objects/pics/cushions/diamond_cushion.png rename to graphics/event_objects/pics/cushions/diamond_cushion.png diff --git a/graphics/map_objects/pics/cushions/fire_cushion.png b/graphics/event_objects/pics/cushions/fire_cushion.png similarity index 100% rename from graphics/map_objects/pics/cushions/fire_cushion.png rename to graphics/event_objects/pics/cushions/fire_cushion.png diff --git a/graphics/map_objects/pics/cushions/grass_cushion.png b/graphics/event_objects/pics/cushions/grass_cushion.png similarity index 100% rename from graphics/map_objects/pics/cushions/grass_cushion.png rename to graphics/event_objects/pics/cushions/grass_cushion.png diff --git a/graphics/map_objects/pics/cushions/kiss_cushion.png b/graphics/event_objects/pics/cushions/kiss_cushion.png similarity index 100% rename from graphics/map_objects/pics/cushions/kiss_cushion.png rename to graphics/event_objects/pics/cushions/kiss_cushion.png diff --git a/graphics/map_objects/pics/cushions/pika_cushion.png b/graphics/event_objects/pics/cushions/pika_cushion.png similarity index 100% rename from graphics/map_objects/pics/cushions/pika_cushion.png rename to graphics/event_objects/pics/cushions/pika_cushion.png diff --git a/graphics/map_objects/pics/cushions/round_cushion.png b/graphics/event_objects/pics/cushions/round_cushion.png similarity index 100% rename from graphics/map_objects/pics/cushions/round_cushion.png rename to graphics/event_objects/pics/cushions/round_cushion.png diff --git a/graphics/map_objects/pics/cushions/spin_cushion.png b/graphics/event_objects/pics/cushions/spin_cushion.png similarity index 100% rename from graphics/map_objects/pics/cushions/spin_cushion.png rename to graphics/event_objects/pics/cushions/spin_cushion.png diff --git a/graphics/map_objects/pics/cushions/water_cushion.png b/graphics/event_objects/pics/cushions/water_cushion.png similarity index 100% rename from graphics/map_objects/pics/cushions/water_cushion.png rename to graphics/event_objects/pics/cushions/water_cushion.png diff --git a/graphics/map_objects/pics/cushions/zigzag_cushion.png b/graphics/event_objects/pics/cushions/zigzag_cushion.png similarity index 100% rename from graphics/map_objects/pics/cushions/zigzag_cushion.png rename to graphics/event_objects/pics/cushions/zigzag_cushion.png diff --git a/graphics/map_objects/pics/dolls/azurill_doll.png b/graphics/event_objects/pics/dolls/azurill_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/azurill_doll.png rename to graphics/event_objects/pics/dolls/azurill_doll.png diff --git a/graphics/map_objects/pics/dolls/baltoy_doll.png b/graphics/event_objects/pics/dolls/baltoy_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/baltoy_doll.png rename to graphics/event_objects/pics/dolls/baltoy_doll.png diff --git a/graphics/map_objects/pics/dolls/big_blastoise_doll.png b/graphics/event_objects/pics/dolls/big_blastoise_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/big_blastoise_doll.png rename to graphics/event_objects/pics/dolls/big_blastoise_doll.png diff --git a/graphics/map_objects/pics/dolls/big_charizard_doll.png b/graphics/event_objects/pics/dolls/big_charizard_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/big_charizard_doll.png rename to graphics/event_objects/pics/dolls/big_charizard_doll.png diff --git a/graphics/map_objects/pics/dolls/big_lapras_doll.png b/graphics/event_objects/pics/dolls/big_lapras_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/big_lapras_doll.png rename to graphics/event_objects/pics/dolls/big_lapras_doll.png diff --git a/graphics/map_objects/pics/dolls/big_regice_doll.png b/graphics/event_objects/pics/dolls/big_regice_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/big_regice_doll.png rename to graphics/event_objects/pics/dolls/big_regice_doll.png diff --git a/graphics/map_objects/pics/dolls/big_regirock_doll.png b/graphics/event_objects/pics/dolls/big_regirock_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/big_regirock_doll.png rename to graphics/event_objects/pics/dolls/big_regirock_doll.png diff --git a/graphics/map_objects/pics/dolls/big_registeel_doll.png b/graphics/event_objects/pics/dolls/big_registeel_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/big_registeel_doll.png rename to graphics/event_objects/pics/dolls/big_registeel_doll.png diff --git a/graphics/map_objects/pics/dolls/big_rhydon_doll.png b/graphics/event_objects/pics/dolls/big_rhydon_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/big_rhydon_doll.png rename to graphics/event_objects/pics/dolls/big_rhydon_doll.png diff --git a/graphics/map_objects/pics/dolls/big_snorlax_doll.png b/graphics/event_objects/pics/dolls/big_snorlax_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/big_snorlax_doll.png rename to graphics/event_objects/pics/dolls/big_snorlax_doll.png diff --git a/graphics/map_objects/pics/dolls/big_venusaur_doll.png b/graphics/event_objects/pics/dolls/big_venusaur_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/big_venusaur_doll.png rename to graphics/event_objects/pics/dolls/big_venusaur_doll.png diff --git a/graphics/map_objects/pics/dolls/big_wailmer_doll.png b/graphics/event_objects/pics/dolls/big_wailmer_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/big_wailmer_doll.png rename to graphics/event_objects/pics/dolls/big_wailmer_doll.png diff --git a/graphics/map_objects/pics/dolls/chikorita_doll.png b/graphics/event_objects/pics/dolls/chikorita_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/chikorita_doll.png rename to graphics/event_objects/pics/dolls/chikorita_doll.png diff --git a/graphics/map_objects/pics/dolls/clefairy_doll.png b/graphics/event_objects/pics/dolls/clefairy_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/clefairy_doll.png rename to graphics/event_objects/pics/dolls/clefairy_doll.png diff --git a/graphics/map_objects/pics/dolls/cyndaquil_doll.png b/graphics/event_objects/pics/dolls/cyndaquil_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/cyndaquil_doll.png rename to graphics/event_objects/pics/dolls/cyndaquil_doll.png diff --git a/graphics/map_objects/pics/dolls/ditto_doll.png b/graphics/event_objects/pics/dolls/ditto_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/ditto_doll.png rename to graphics/event_objects/pics/dolls/ditto_doll.png diff --git a/graphics/map_objects/pics/dolls/duskull_doll.png b/graphics/event_objects/pics/dolls/duskull_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/duskull_doll.png rename to graphics/event_objects/pics/dolls/duskull_doll.png diff --git a/graphics/map_objects/pics/dolls/gulpin_doll.png b/graphics/event_objects/pics/dolls/gulpin_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/gulpin_doll.png rename to graphics/event_objects/pics/dolls/gulpin_doll.png diff --git a/graphics/map_objects/pics/dolls/jigglypuff_doll.png b/graphics/event_objects/pics/dolls/jigglypuff_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/jigglypuff_doll.png rename to graphics/event_objects/pics/dolls/jigglypuff_doll.png diff --git a/graphics/map_objects/pics/dolls/kecleon_doll.png b/graphics/event_objects/pics/dolls/kecleon_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/kecleon_doll.png rename to graphics/event_objects/pics/dolls/kecleon_doll.png diff --git a/graphics/map_objects/pics/dolls/lotad_doll.png b/graphics/event_objects/pics/dolls/lotad_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/lotad_doll.png rename to graphics/event_objects/pics/dolls/lotad_doll.png diff --git a/graphics/map_objects/pics/dolls/marill_doll.png b/graphics/event_objects/pics/dolls/marill_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/marill_doll.png rename to graphics/event_objects/pics/dolls/marill_doll.png diff --git a/graphics/map_objects/pics/dolls/meowth_doll.png b/graphics/event_objects/pics/dolls/meowth_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/meowth_doll.png rename to graphics/event_objects/pics/dolls/meowth_doll.png diff --git a/graphics/map_objects/pics/dolls/mudkip_doll.png b/graphics/event_objects/pics/dolls/mudkip_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/mudkip_doll.png rename to graphics/event_objects/pics/dolls/mudkip_doll.png diff --git a/graphics/map_objects/pics/dolls/pichu_doll.png b/graphics/event_objects/pics/dolls/pichu_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/pichu_doll.png rename to graphics/event_objects/pics/dolls/pichu_doll.png diff --git a/graphics/map_objects/pics/dolls/pikachu_doll.png b/graphics/event_objects/pics/dolls/pikachu_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/pikachu_doll.png rename to graphics/event_objects/pics/dolls/pikachu_doll.png diff --git a/graphics/map_objects/pics/dolls/seedot_doll.png b/graphics/event_objects/pics/dolls/seedot_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/seedot_doll.png rename to graphics/event_objects/pics/dolls/seedot_doll.png diff --git a/graphics/map_objects/pics/dolls/skitty_doll.png b/graphics/event_objects/pics/dolls/skitty_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/skitty_doll.png rename to graphics/event_objects/pics/dolls/skitty_doll.png diff --git a/graphics/map_objects/pics/dolls/smoochum_doll.png b/graphics/event_objects/pics/dolls/smoochum_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/smoochum_doll.png rename to graphics/event_objects/pics/dolls/smoochum_doll.png diff --git a/graphics/map_objects/pics/dolls/swablu_doll.png b/graphics/event_objects/pics/dolls/swablu_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/swablu_doll.png rename to graphics/event_objects/pics/dolls/swablu_doll.png diff --git a/graphics/map_objects/pics/dolls/togepi_doll.png b/graphics/event_objects/pics/dolls/togepi_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/togepi_doll.png rename to graphics/event_objects/pics/dolls/togepi_doll.png diff --git a/graphics/map_objects/pics/dolls/torchic_doll.png b/graphics/event_objects/pics/dolls/torchic_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/torchic_doll.png rename to graphics/event_objects/pics/dolls/torchic_doll.png diff --git a/graphics/map_objects/pics/dolls/totodile_doll.png b/graphics/event_objects/pics/dolls/totodile_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/totodile_doll.png rename to graphics/event_objects/pics/dolls/totodile_doll.png diff --git a/graphics/map_objects/pics/dolls/treecko_doll.png b/graphics/event_objects/pics/dolls/treecko_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/treecko_doll.png rename to graphics/event_objects/pics/dolls/treecko_doll.png diff --git a/graphics/map_objects/pics/dolls/unused_magnemite_doll.png b/graphics/event_objects/pics/dolls/unused_magnemite_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/unused_magnemite_doll.png rename to graphics/event_objects/pics/dolls/unused_magnemite_doll.png diff --git a/graphics/map_objects/pics/dolls/unused_natu_doll.png b/graphics/event_objects/pics/dolls/unused_natu_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/unused_natu_doll.png rename to graphics/event_objects/pics/dolls/unused_natu_doll.png diff --git a/graphics/map_objects/pics/dolls/unused_pikachu_doll.png b/graphics/event_objects/pics/dolls/unused_pikachu_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/unused_pikachu_doll.png rename to graphics/event_objects/pics/dolls/unused_pikachu_doll.png diff --git a/graphics/map_objects/pics/dolls/unused_porygon2_doll.png b/graphics/event_objects/pics/dolls/unused_porygon2_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/unused_porygon2_doll.png rename to graphics/event_objects/pics/dolls/unused_porygon2_doll.png diff --git a/graphics/map_objects/pics/dolls/unused_squirtle_doll.png b/graphics/event_objects/pics/dolls/unused_squirtle_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/unused_squirtle_doll.png rename to graphics/event_objects/pics/dolls/unused_squirtle_doll.png diff --git a/graphics/map_objects/pics/dolls/unused_wooper_doll.png b/graphics/event_objects/pics/dolls/unused_wooper_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/unused_wooper_doll.png rename to graphics/event_objects/pics/dolls/unused_wooper_doll.png diff --git a/graphics/map_objects/pics/dolls/wynaut_doll.png b/graphics/event_objects/pics/dolls/wynaut_doll.png similarity index 100% rename from graphics/map_objects/pics/dolls/wynaut_doll.png rename to graphics/event_objects/pics/dolls/wynaut_doll.png diff --git a/graphics/map_objects/pics/effects/arrow/0.png b/graphics/event_objects/pics/effects/arrow/0.png similarity index 100% rename from graphics/map_objects/pics/effects/arrow/0.png rename to graphics/event_objects/pics/effects/arrow/0.png diff --git a/graphics/map_objects/pics/effects/arrow/1.png b/graphics/event_objects/pics/effects/arrow/1.png similarity index 100% rename from graphics/map_objects/pics/effects/arrow/1.png rename to graphics/event_objects/pics/effects/arrow/1.png diff --git a/graphics/map_objects/pics/effects/arrow/2.png b/graphics/event_objects/pics/effects/arrow/2.png similarity index 100% rename from graphics/map_objects/pics/effects/arrow/2.png rename to graphics/event_objects/pics/effects/arrow/2.png diff --git a/graphics/map_objects/pics/effects/arrow/3.png b/graphics/event_objects/pics/effects/arrow/3.png similarity index 100% rename from graphics/map_objects/pics/effects/arrow/3.png rename to graphics/event_objects/pics/effects/arrow/3.png diff --git a/graphics/map_objects/pics/effects/arrow/4.png b/graphics/event_objects/pics/effects/arrow/4.png similarity index 100% rename from graphics/map_objects/pics/effects/arrow/4.png rename to graphics/event_objects/pics/effects/arrow/4.png diff --git a/graphics/map_objects/pics/effects/arrow/5.png b/graphics/event_objects/pics/effects/arrow/5.png similarity index 100% rename from graphics/map_objects/pics/effects/arrow/5.png rename to graphics/event_objects/pics/effects/arrow/5.png diff --git a/graphics/map_objects/pics/effects/arrow/6.png b/graphics/event_objects/pics/effects/arrow/6.png similarity index 100% rename from graphics/map_objects/pics/effects/arrow/6.png rename to graphics/event_objects/pics/effects/arrow/6.png diff --git a/graphics/map_objects/pics/effects/arrow/7.png b/graphics/event_objects/pics/effects/arrow/7.png similarity index 100% rename from graphics/map_objects/pics/effects/arrow/7.png rename to graphics/event_objects/pics/effects/arrow/7.png diff --git a/graphics/map_objects/pics/effects/ash/0.png b/graphics/event_objects/pics/effects/ash/0.png similarity index 100% rename from graphics/map_objects/pics/effects/ash/0.png rename to graphics/event_objects/pics/effects/ash/0.png diff --git a/graphics/map_objects/pics/effects/ash/1.png b/graphics/event_objects/pics/effects/ash/1.png similarity index 100% rename from graphics/map_objects/pics/effects/ash/1.png rename to graphics/event_objects/pics/effects/ash/1.png diff --git a/graphics/map_objects/pics/effects/ash/2.png b/graphics/event_objects/pics/effects/ash/2.png similarity index 100% rename from graphics/map_objects/pics/effects/ash/2.png rename to graphics/event_objects/pics/effects/ash/2.png diff --git a/graphics/map_objects/pics/effects/ash/3.png b/graphics/event_objects/pics/effects/ash/3.png similarity index 100% rename from graphics/map_objects/pics/effects/ash/3.png rename to graphics/event_objects/pics/effects/ash/3.png diff --git a/graphics/map_objects/pics/effects/ash/4.png b/graphics/event_objects/pics/effects/ash/4.png similarity index 100% rename from graphics/map_objects/pics/effects/ash/4.png rename to graphics/event_objects/pics/effects/ash/4.png diff --git a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/0.png b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/0.png similarity index 100% rename from graphics/map_objects/pics/effects/berry_tree_growth_sparkle/0.png rename to graphics/event_objects/pics/effects/berry_tree_growth_sparkle/0.png diff --git a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/1.png b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/1.png similarity index 100% rename from graphics/map_objects/pics/effects/berry_tree_growth_sparkle/1.png rename to graphics/event_objects/pics/effects/berry_tree_growth_sparkle/1.png diff --git a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/2.png b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/2.png similarity index 100% rename from graphics/map_objects/pics/effects/berry_tree_growth_sparkle/2.png rename to graphics/event_objects/pics/effects/berry_tree_growth_sparkle/2.png diff --git a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/3.png b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/3.png similarity index 100% rename from graphics/map_objects/pics/effects/berry_tree_growth_sparkle/3.png rename to graphics/event_objects/pics/effects/berry_tree_growth_sparkle/3.png diff --git a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/4.png b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/4.png similarity index 100% rename from graphics/map_objects/pics/effects/berry_tree_growth_sparkle/4.png rename to graphics/event_objects/pics/effects/berry_tree_growth_sparkle/4.png diff --git a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/5.png b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/5.png similarity index 100% rename from graphics/map_objects/pics/effects/berry_tree_growth_sparkle/5.png rename to graphics/event_objects/pics/effects/berry_tree_growth_sparkle/5.png diff --git a/graphics/map_objects/pics/effects/bike_hop_big_splash/0.png b/graphics/event_objects/pics/effects/bike_hop_big_splash/0.png similarity index 100% rename from graphics/map_objects/pics/effects/bike_hop_big_splash/0.png rename to graphics/event_objects/pics/effects/bike_hop_big_splash/0.png diff --git a/graphics/map_objects/pics/effects/bike_hop_big_splash/1.png b/graphics/event_objects/pics/effects/bike_hop_big_splash/1.png similarity index 100% rename from graphics/map_objects/pics/effects/bike_hop_big_splash/1.png rename to graphics/event_objects/pics/effects/bike_hop_big_splash/1.png diff --git a/graphics/map_objects/pics/effects/bike_hop_big_splash/2.png b/graphics/event_objects/pics/effects/bike_hop_big_splash/2.png similarity index 100% rename from graphics/map_objects/pics/effects/bike_hop_big_splash/2.png rename to graphics/event_objects/pics/effects/bike_hop_big_splash/2.png diff --git a/graphics/map_objects/pics/effects/bike_hop_big_splash/3.png b/graphics/event_objects/pics/effects/bike_hop_big_splash/3.png similarity index 100% rename from graphics/map_objects/pics/effects/bike_hop_big_splash/3.png rename to graphics/event_objects/pics/effects/bike_hop_big_splash/3.png diff --git a/graphics/map_objects/pics/effects/bike_hop_small_splash/0.png b/graphics/event_objects/pics/effects/bike_hop_small_splash/0.png similarity index 100% rename from graphics/map_objects/pics/effects/bike_hop_small_splash/0.png rename to graphics/event_objects/pics/effects/bike_hop_small_splash/0.png diff --git a/graphics/map_objects/pics/effects/bike_hop_small_splash/1.png b/graphics/event_objects/pics/effects/bike_hop_small_splash/1.png similarity index 100% rename from graphics/map_objects/pics/effects/bike_hop_small_splash/1.png rename to graphics/event_objects/pics/effects/bike_hop_small_splash/1.png diff --git a/graphics/map_objects/pics/effects/bike_hop_small_splash/2.png b/graphics/event_objects/pics/effects/bike_hop_small_splash/2.png similarity index 100% rename from graphics/map_objects/pics/effects/bike_hop_small_splash/2.png rename to graphics/event_objects/pics/effects/bike_hop_small_splash/2.png diff --git a/graphics/map_objects/pics/effects/bike_hop_tall_grass/0.png b/graphics/event_objects/pics/effects/bike_hop_tall_grass/0.png similarity index 100% rename from graphics/map_objects/pics/effects/bike_hop_tall_grass/0.png rename to graphics/event_objects/pics/effects/bike_hop_tall_grass/0.png diff --git a/graphics/map_objects/pics/effects/bike_hop_tall_grass/1.png b/graphics/event_objects/pics/effects/bike_hop_tall_grass/1.png similarity index 100% rename from graphics/map_objects/pics/effects/bike_hop_tall_grass/1.png rename to graphics/event_objects/pics/effects/bike_hop_tall_grass/1.png diff --git a/graphics/map_objects/pics/effects/bike_hop_tall_grass/2.png b/graphics/event_objects/pics/effects/bike_hop_tall_grass/2.png similarity index 100% rename from graphics/map_objects/pics/effects/bike_hop_tall_grass/2.png rename to graphics/event_objects/pics/effects/bike_hop_tall_grass/2.png diff --git a/graphics/map_objects/pics/effects/bike_hop_tall_grass/3.png b/graphics/event_objects/pics/effects/bike_hop_tall_grass/3.png similarity index 100% rename from graphics/map_objects/pics/effects/bike_hop_tall_grass/3.png rename to graphics/event_objects/pics/effects/bike_hop_tall_grass/3.png diff --git a/graphics/map_objects/pics/effects/bike_tire_tracks/0.png b/graphics/event_objects/pics/effects/bike_tire_tracks/0.png similarity index 100% rename from graphics/map_objects/pics/effects/bike_tire_tracks/0.png rename to graphics/event_objects/pics/effects/bike_tire_tracks/0.png diff --git a/graphics/map_objects/pics/effects/bike_tire_tracks/1.png b/graphics/event_objects/pics/effects/bike_tire_tracks/1.png similarity index 100% rename from graphics/map_objects/pics/effects/bike_tire_tracks/1.png rename to graphics/event_objects/pics/effects/bike_tire_tracks/1.png diff --git a/graphics/map_objects/pics/effects/bike_tire_tracks/2.png b/graphics/event_objects/pics/effects/bike_tire_tracks/2.png similarity index 100% rename from graphics/map_objects/pics/effects/bike_tire_tracks/2.png rename to graphics/event_objects/pics/effects/bike_tire_tracks/2.png diff --git a/graphics/map_objects/pics/effects/bike_tire_tracks/3.png b/graphics/event_objects/pics/effects/bike_tire_tracks/3.png similarity index 100% rename from graphics/map_objects/pics/effects/bike_tire_tracks/3.png rename to graphics/event_objects/pics/effects/bike_tire_tracks/3.png diff --git a/graphics/map_objects/pics/effects/bird.png b/graphics/event_objects/pics/effects/bird.png similarity index 100% rename from graphics/map_objects/pics/effects/bird.png rename to graphics/event_objects/pics/effects/bird.png diff --git a/graphics/map_objects/pics/effects/bubbles/0.png b/graphics/event_objects/pics/effects/bubbles/0.png similarity index 100% rename from graphics/map_objects/pics/effects/bubbles/0.png rename to graphics/event_objects/pics/effects/bubbles/0.png diff --git a/graphics/map_objects/pics/effects/bubbles/1.png b/graphics/event_objects/pics/effects/bubbles/1.png similarity index 100% rename from graphics/map_objects/pics/effects/bubbles/1.png rename to graphics/event_objects/pics/effects/bubbles/1.png diff --git a/graphics/map_objects/pics/effects/bubbles/2.png b/graphics/event_objects/pics/effects/bubbles/2.png similarity index 100% rename from graphics/map_objects/pics/effects/bubbles/2.png rename to graphics/event_objects/pics/effects/bubbles/2.png diff --git a/graphics/map_objects/pics/effects/bubbles/3.png b/graphics/event_objects/pics/effects/bubbles/3.png similarity index 100% rename from graphics/map_objects/pics/effects/bubbles/3.png rename to graphics/event_objects/pics/effects/bubbles/3.png diff --git a/graphics/map_objects/pics/effects/bubbles/4.png b/graphics/event_objects/pics/effects/bubbles/4.png similarity index 100% rename from graphics/map_objects/pics/effects/bubbles/4.png rename to graphics/event_objects/pics/effects/bubbles/4.png diff --git a/graphics/map_objects/pics/effects/bubbles/5.png b/graphics/event_objects/pics/effects/bubbles/5.png similarity index 100% rename from graphics/map_objects/pics/effects/bubbles/5.png rename to graphics/event_objects/pics/effects/bubbles/5.png diff --git a/graphics/map_objects/pics/effects/bubbles/6.png b/graphics/event_objects/pics/effects/bubbles/6.png similarity index 100% rename from graphics/map_objects/pics/effects/bubbles/6.png rename to graphics/event_objects/pics/effects/bubbles/6.png diff --git a/graphics/map_objects/pics/effects/bubbles/7.png b/graphics/event_objects/pics/effects/bubbles/7.png similarity index 100% rename from graphics/map_objects/pics/effects/bubbles/7.png rename to graphics/event_objects/pics/effects/bubbles/7.png diff --git a/graphics/map_objects/pics/effects/deep_sand_footprints/0.png b/graphics/event_objects/pics/effects/deep_sand_footprints/0.png similarity index 100% rename from graphics/map_objects/pics/effects/deep_sand_footprints/0.png rename to graphics/event_objects/pics/effects/deep_sand_footprints/0.png diff --git a/graphics/map_objects/pics/effects/deep_sand_footprints/1.png b/graphics/event_objects/pics/effects/deep_sand_footprints/1.png similarity index 100% rename from graphics/map_objects/pics/effects/deep_sand_footprints/1.png rename to graphics/event_objects/pics/effects/deep_sand_footprints/1.png diff --git a/graphics/map_objects/pics/effects/ground_impact_dust/0.png b/graphics/event_objects/pics/effects/ground_impact_dust/0.png similarity index 100% rename from graphics/map_objects/pics/effects/ground_impact_dust/0.png rename to graphics/event_objects/pics/effects/ground_impact_dust/0.png diff --git a/graphics/map_objects/pics/effects/ground_impact_dust/1.png b/graphics/event_objects/pics/effects/ground_impact_dust/1.png similarity index 100% rename from graphics/map_objects/pics/effects/ground_impact_dust/1.png rename to graphics/event_objects/pics/effects/ground_impact_dust/1.png diff --git a/graphics/map_objects/pics/effects/ground_impact_dust/2.png b/graphics/event_objects/pics/effects/ground_impact_dust/2.png similarity index 100% rename from graphics/map_objects/pics/effects/ground_impact_dust/2.png rename to graphics/event_objects/pics/effects/ground_impact_dust/2.png diff --git a/graphics/map_objects/pics/effects/hot_springs_water.png b/graphics/event_objects/pics/effects/hot_springs_water.png similarity index 100% rename from graphics/map_objects/pics/effects/hot_springs_water.png rename to graphics/event_objects/pics/effects/hot_springs_water.png diff --git a/graphics/map_objects/pics/effects/jump_out_of_ash/0.png b/graphics/event_objects/pics/effects/jump_out_of_ash/0.png similarity index 100% rename from graphics/map_objects/pics/effects/jump_out_of_ash/0.png rename to graphics/event_objects/pics/effects/jump_out_of_ash/0.png diff --git a/graphics/map_objects/pics/effects/jump_out_of_ash/1.png b/graphics/event_objects/pics/effects/jump_out_of_ash/1.png similarity index 100% rename from graphics/map_objects/pics/effects/jump_out_of_ash/1.png rename to graphics/event_objects/pics/effects/jump_out_of_ash/1.png diff --git a/graphics/map_objects/pics/effects/jump_out_of_ash/2.png b/graphics/event_objects/pics/effects/jump_out_of_ash/2.png similarity index 100% rename from graphics/map_objects/pics/effects/jump_out_of_ash/2.png rename to graphics/event_objects/pics/effects/jump_out_of_ash/2.png diff --git a/graphics/map_objects/pics/effects/jump_out_of_ash/3.png b/graphics/event_objects/pics/effects/jump_out_of_ash/3.png similarity index 100% rename from graphics/map_objects/pics/effects/jump_out_of_ash/3.png rename to graphics/event_objects/pics/effects/jump_out_of_ash/3.png diff --git a/graphics/map_objects/pics/effects/jump_out_of_ash/4.png b/graphics/event_objects/pics/effects/jump_out_of_ash/4.png similarity index 100% rename from graphics/map_objects/pics/effects/jump_out_of_ash/4.png rename to graphics/event_objects/pics/effects/jump_out_of_ash/4.png diff --git a/graphics/map_objects/pics/effects/long_grass/0.png b/graphics/event_objects/pics/effects/long_grass/0.png similarity index 100% rename from graphics/map_objects/pics/effects/long_grass/0.png rename to graphics/event_objects/pics/effects/long_grass/0.png diff --git a/graphics/map_objects/pics/effects/long_grass/1.png b/graphics/event_objects/pics/effects/long_grass/1.png similarity index 100% rename from graphics/map_objects/pics/effects/long_grass/1.png rename to graphics/event_objects/pics/effects/long_grass/1.png diff --git a/graphics/map_objects/pics/effects/long_grass/2.png b/graphics/event_objects/pics/effects/long_grass/2.png similarity index 100% rename from graphics/map_objects/pics/effects/long_grass/2.png rename to graphics/event_objects/pics/effects/long_grass/2.png diff --git a/graphics/map_objects/pics/effects/long_grass/3.png b/graphics/event_objects/pics/effects/long_grass/3.png similarity index 100% rename from graphics/map_objects/pics/effects/long_grass/3.png rename to graphics/event_objects/pics/effects/long_grass/3.png diff --git a/graphics/map_objects/pics/effects/mountain_disguise/0.png b/graphics/event_objects/pics/effects/mountain_disguise/0.png similarity index 100% rename from graphics/map_objects/pics/effects/mountain_disguise/0.png rename to graphics/event_objects/pics/effects/mountain_disguise/0.png diff --git a/graphics/map_objects/pics/effects/mountain_disguise/1.png b/graphics/event_objects/pics/effects/mountain_disguise/1.png similarity index 100% rename from graphics/map_objects/pics/effects/mountain_disguise/1.png rename to graphics/event_objects/pics/effects/mountain_disguise/1.png diff --git a/graphics/map_objects/pics/effects/mountain_disguise/2.png b/graphics/event_objects/pics/effects/mountain_disguise/2.png similarity index 100% rename from graphics/map_objects/pics/effects/mountain_disguise/2.png rename to graphics/event_objects/pics/effects/mountain_disguise/2.png diff --git a/graphics/map_objects/pics/effects/mountain_disguise/3.png b/graphics/event_objects/pics/effects/mountain_disguise/3.png similarity index 100% rename from graphics/map_objects/pics/effects/mountain_disguise/3.png rename to graphics/event_objects/pics/effects/mountain_disguise/3.png diff --git a/graphics/map_objects/pics/effects/mountain_disguise/4.png b/graphics/event_objects/pics/effects/mountain_disguise/4.png similarity index 100% rename from graphics/map_objects/pics/effects/mountain_disguise/4.png rename to graphics/event_objects/pics/effects/mountain_disguise/4.png diff --git a/graphics/map_objects/pics/effects/mountain_disguise/5.png b/graphics/event_objects/pics/effects/mountain_disguise/5.png similarity index 100% rename from graphics/map_objects/pics/effects/mountain_disguise/5.png rename to graphics/event_objects/pics/effects/mountain_disguise/5.png diff --git a/graphics/map_objects/pics/effects/mountain_disguise/6.png b/graphics/event_objects/pics/effects/mountain_disguise/6.png similarity index 100% rename from graphics/map_objects/pics/effects/mountain_disguise/6.png rename to graphics/event_objects/pics/effects/mountain_disguise/6.png diff --git a/graphics/map_objects/pics/effects/ripple/0.png b/graphics/event_objects/pics/effects/ripple/0.png similarity index 100% rename from graphics/map_objects/pics/effects/ripple/0.png rename to graphics/event_objects/pics/effects/ripple/0.png diff --git a/graphics/map_objects/pics/effects/ripple/1.png b/graphics/event_objects/pics/effects/ripple/1.png similarity index 100% rename from graphics/map_objects/pics/effects/ripple/1.png rename to graphics/event_objects/pics/effects/ripple/1.png diff --git a/graphics/map_objects/pics/effects/ripple/2.png b/graphics/event_objects/pics/effects/ripple/2.png similarity index 100% rename from graphics/map_objects/pics/effects/ripple/2.png rename to graphics/event_objects/pics/effects/ripple/2.png diff --git a/graphics/map_objects/pics/effects/ripple/3.png b/graphics/event_objects/pics/effects/ripple/3.png similarity index 100% rename from graphics/map_objects/pics/effects/ripple/3.png rename to graphics/event_objects/pics/effects/ripple/3.png diff --git a/graphics/map_objects/pics/effects/ripple/4.png b/graphics/event_objects/pics/effects/ripple/4.png similarity index 100% rename from graphics/map_objects/pics/effects/ripple/4.png rename to graphics/event_objects/pics/effects/ripple/4.png diff --git a/graphics/map_objects/pics/effects/sand_disguise_placeholder/0.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/0.png similarity index 100% rename from graphics/map_objects/pics/effects/sand_disguise_placeholder/0.png rename to graphics/event_objects/pics/effects/sand_disguise_placeholder/0.png diff --git a/graphics/map_objects/pics/effects/sand_disguise_placeholder/1.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/1.png similarity index 100% rename from graphics/map_objects/pics/effects/sand_disguise_placeholder/1.png rename to graphics/event_objects/pics/effects/sand_disguise_placeholder/1.png diff --git a/graphics/map_objects/pics/effects/sand_disguise_placeholder/2.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/2.png similarity index 100% rename from graphics/map_objects/pics/effects/sand_disguise_placeholder/2.png rename to graphics/event_objects/pics/effects/sand_disguise_placeholder/2.png diff --git a/graphics/map_objects/pics/effects/sand_disguise_placeholder/3.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/3.png similarity index 100% rename from graphics/map_objects/pics/effects/sand_disguise_placeholder/3.png rename to graphics/event_objects/pics/effects/sand_disguise_placeholder/3.png diff --git a/graphics/map_objects/pics/effects/sand_disguise_placeholder/4.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/4.png similarity index 100% rename from graphics/map_objects/pics/effects/sand_disguise_placeholder/4.png rename to graphics/event_objects/pics/effects/sand_disguise_placeholder/4.png diff --git a/graphics/map_objects/pics/effects/sand_disguise_placeholder/5.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/5.png similarity index 100% rename from graphics/map_objects/pics/effects/sand_disguise_placeholder/5.png rename to graphics/event_objects/pics/effects/sand_disguise_placeholder/5.png diff --git a/graphics/map_objects/pics/effects/sand_disguise_placeholder/6.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/6.png similarity index 100% rename from graphics/map_objects/pics/effects/sand_disguise_placeholder/6.png rename to graphics/event_objects/pics/effects/sand_disguise_placeholder/6.png diff --git a/graphics/map_objects/pics/effects/sand_footprints/0.png b/graphics/event_objects/pics/effects/sand_footprints/0.png similarity index 100% rename from graphics/map_objects/pics/effects/sand_footprints/0.png rename to graphics/event_objects/pics/effects/sand_footprints/0.png diff --git a/graphics/map_objects/pics/effects/sand_footprints/1.png b/graphics/event_objects/pics/effects/sand_footprints/1.png similarity index 100% rename from graphics/map_objects/pics/effects/sand_footprints/1.png rename to graphics/event_objects/pics/effects/sand_footprints/1.png diff --git a/graphics/map_objects/pics/effects/shadow_extra_large.png b/graphics/event_objects/pics/effects/shadow_extra_large.png similarity index 100% rename from graphics/map_objects/pics/effects/shadow_extra_large.png rename to graphics/event_objects/pics/effects/shadow_extra_large.png diff --git a/graphics/map_objects/pics/effects/shadow_large.png b/graphics/event_objects/pics/effects/shadow_large.png similarity index 100% rename from graphics/map_objects/pics/effects/shadow_large.png rename to graphics/event_objects/pics/effects/shadow_large.png diff --git a/graphics/map_objects/pics/effects/shadow_medium.png b/graphics/event_objects/pics/effects/shadow_medium.png similarity index 100% rename from graphics/map_objects/pics/effects/shadow_medium.png rename to graphics/event_objects/pics/effects/shadow_medium.png diff --git a/graphics/map_objects/pics/effects/shadow_small.png b/graphics/event_objects/pics/effects/shadow_small.png similarity index 100% rename from graphics/map_objects/pics/effects/shadow_small.png rename to graphics/event_objects/pics/effects/shadow_small.png diff --git a/graphics/map_objects/pics/effects/short_grass/0.png b/graphics/event_objects/pics/effects/short_grass/0.png similarity index 100% rename from graphics/map_objects/pics/effects/short_grass/0.png rename to graphics/event_objects/pics/effects/short_grass/0.png diff --git a/graphics/map_objects/pics/effects/short_grass/1.png b/graphics/event_objects/pics/effects/short_grass/1.png similarity index 100% rename from graphics/map_objects/pics/effects/short_grass/1.png rename to graphics/event_objects/pics/effects/short_grass/1.png diff --git a/graphics/map_objects/pics/effects/splash/0.png b/graphics/event_objects/pics/effects/splash/0.png similarity index 100% rename from graphics/map_objects/pics/effects/splash/0.png rename to graphics/event_objects/pics/effects/splash/0.png diff --git a/graphics/map_objects/pics/effects/splash/1.png b/graphics/event_objects/pics/effects/splash/1.png similarity index 100% rename from graphics/map_objects/pics/effects/splash/1.png rename to graphics/event_objects/pics/effects/splash/1.png diff --git a/graphics/map_objects/pics/effects/surf_blob/0.png b/graphics/event_objects/pics/effects/surf_blob/0.png similarity index 100% rename from graphics/map_objects/pics/effects/surf_blob/0.png rename to graphics/event_objects/pics/effects/surf_blob/0.png diff --git a/graphics/map_objects/pics/effects/surf_blob/1.png b/graphics/event_objects/pics/effects/surf_blob/1.png similarity index 100% rename from graphics/map_objects/pics/effects/surf_blob/1.png rename to graphics/event_objects/pics/effects/surf_blob/1.png diff --git a/graphics/map_objects/pics/effects/surf_blob/2.png b/graphics/event_objects/pics/effects/surf_blob/2.png similarity index 100% rename from graphics/map_objects/pics/effects/surf_blob/2.png rename to graphics/event_objects/pics/effects/surf_blob/2.png diff --git a/graphics/map_objects/pics/effects/tall_grass/0.png b/graphics/event_objects/pics/effects/tall_grass/0.png similarity index 100% rename from graphics/map_objects/pics/effects/tall_grass/0.png rename to graphics/event_objects/pics/effects/tall_grass/0.png diff --git a/graphics/map_objects/pics/effects/tall_grass/1.png b/graphics/event_objects/pics/effects/tall_grass/1.png similarity index 100% rename from graphics/map_objects/pics/effects/tall_grass/1.png rename to graphics/event_objects/pics/effects/tall_grass/1.png diff --git a/graphics/map_objects/pics/effects/tall_grass/2.png b/graphics/event_objects/pics/effects/tall_grass/2.png similarity index 100% rename from graphics/map_objects/pics/effects/tall_grass/2.png rename to graphics/event_objects/pics/effects/tall_grass/2.png diff --git a/graphics/map_objects/pics/effects/tall_grass/3.png b/graphics/event_objects/pics/effects/tall_grass/3.png similarity index 100% rename from graphics/map_objects/pics/effects/tall_grass/3.png rename to graphics/event_objects/pics/effects/tall_grass/3.png diff --git a/graphics/map_objects/pics/effects/tall_grass/4.png b/graphics/event_objects/pics/effects/tall_grass/4.png similarity index 100% rename from graphics/map_objects/pics/effects/tall_grass/4.png rename to graphics/event_objects/pics/effects/tall_grass/4.png diff --git a/graphics/map_objects/pics/effects/tree_disguise/0.png b/graphics/event_objects/pics/effects/tree_disguise/0.png similarity index 100% rename from graphics/map_objects/pics/effects/tree_disguise/0.png rename to graphics/event_objects/pics/effects/tree_disguise/0.png diff --git a/graphics/map_objects/pics/effects/tree_disguise/1.png b/graphics/event_objects/pics/effects/tree_disguise/1.png similarity index 100% rename from graphics/map_objects/pics/effects/tree_disguise/1.png rename to graphics/event_objects/pics/effects/tree_disguise/1.png diff --git a/graphics/map_objects/pics/effects/tree_disguise/2.png b/graphics/event_objects/pics/effects/tree_disguise/2.png similarity index 100% rename from graphics/map_objects/pics/effects/tree_disguise/2.png rename to graphics/event_objects/pics/effects/tree_disguise/2.png diff --git a/graphics/map_objects/pics/effects/tree_disguise/3.png b/graphics/event_objects/pics/effects/tree_disguise/3.png similarity index 100% rename from graphics/map_objects/pics/effects/tree_disguise/3.png rename to graphics/event_objects/pics/effects/tree_disguise/3.png diff --git a/graphics/map_objects/pics/effects/tree_disguise/4.png b/graphics/event_objects/pics/effects/tree_disguise/4.png similarity index 100% rename from graphics/map_objects/pics/effects/tree_disguise/4.png rename to graphics/event_objects/pics/effects/tree_disguise/4.png diff --git a/graphics/map_objects/pics/effects/tree_disguise/5.png b/graphics/event_objects/pics/effects/tree_disguise/5.png similarity index 100% rename from graphics/map_objects/pics/effects/tree_disguise/5.png rename to graphics/event_objects/pics/effects/tree_disguise/5.png diff --git a/graphics/map_objects/pics/effects/tree_disguise/6.png b/graphics/event_objects/pics/effects/tree_disguise/6.png similarity index 100% rename from graphics/map_objects/pics/effects/tree_disguise/6.png rename to graphics/event_objects/pics/effects/tree_disguise/6.png diff --git a/graphics/map_objects/pics/effects/unknown_16/0.png b/graphics/event_objects/pics/effects/unknown_16/0.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_16/0.png rename to graphics/event_objects/pics/effects/unknown_16/0.png diff --git a/graphics/map_objects/pics/effects/unknown_16/1.png b/graphics/event_objects/pics/effects/unknown_16/1.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_16/1.png rename to graphics/event_objects/pics/effects/unknown_16/1.png diff --git a/graphics/map_objects/pics/effects/unknown_16/2.png b/graphics/event_objects/pics/effects/unknown_16/2.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_16/2.png rename to graphics/event_objects/pics/effects/unknown_16/2.png diff --git a/graphics/map_objects/pics/effects/unknown_16/3.png b/graphics/event_objects/pics/effects/unknown_16/3.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_16/3.png rename to graphics/event_objects/pics/effects/unknown_16/3.png diff --git a/graphics/map_objects/pics/effects/unknown_16/4.png b/graphics/event_objects/pics/effects/unknown_16/4.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_16/4.png rename to graphics/event_objects/pics/effects/unknown_16/4.png diff --git a/graphics/map_objects/pics/effects/unknown_16/5.png b/graphics/event_objects/pics/effects/unknown_16/5.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_16/5.png rename to graphics/event_objects/pics/effects/unknown_16/5.png diff --git a/graphics/map_objects/pics/effects/unknown_17/0.png b/graphics/event_objects/pics/effects/unknown_17/0.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_17/0.png rename to graphics/event_objects/pics/effects/unknown_17/0.png diff --git a/graphics/map_objects/pics/effects/unknown_17/1.png b/graphics/event_objects/pics/effects/unknown_17/1.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_17/1.png rename to graphics/event_objects/pics/effects/unknown_17/1.png diff --git a/graphics/map_objects/pics/effects/unknown_17/2.png b/graphics/event_objects/pics/effects/unknown_17/2.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_17/2.png rename to graphics/event_objects/pics/effects/unknown_17/2.png diff --git a/graphics/map_objects/pics/effects/unknown_17/3.png b/graphics/event_objects/pics/effects/unknown_17/3.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_17/3.png rename to graphics/event_objects/pics/effects/unknown_17/3.png diff --git a/graphics/map_objects/pics/effects/unknown_17/4.png b/graphics/event_objects/pics/effects/unknown_17/4.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_17/4.png rename to graphics/event_objects/pics/effects/unknown_17/4.png diff --git a/graphics/map_objects/pics/effects/unknown_17/5.png b/graphics/event_objects/pics/effects/unknown_17/5.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_17/5.png rename to graphics/event_objects/pics/effects/unknown_17/5.png diff --git a/graphics/map_objects/pics/effects/unknown_17/6.png b/graphics/event_objects/pics/effects/unknown_17/6.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_17/6.png rename to graphics/event_objects/pics/effects/unknown_17/6.png diff --git a/graphics/map_objects/pics/effects/unknown_17/7.png b/graphics/event_objects/pics/effects/unknown_17/7.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_17/7.png rename to graphics/event_objects/pics/effects/unknown_17/7.png diff --git a/graphics/map_objects/pics/effects/unknown_18/0.png b/graphics/event_objects/pics/effects/unknown_18/0.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_18/0.png rename to graphics/event_objects/pics/effects/unknown_18/0.png diff --git a/graphics/map_objects/pics/effects/unknown_18/1.png b/graphics/event_objects/pics/effects/unknown_18/1.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_18/1.png rename to graphics/event_objects/pics/effects/unknown_18/1.png diff --git a/graphics/map_objects/pics/effects/unknown_18/2.png b/graphics/event_objects/pics/effects/unknown_18/2.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_18/2.png rename to graphics/event_objects/pics/effects/unknown_18/2.png diff --git a/graphics/map_objects/pics/effects/unknown_18/3.png b/graphics/event_objects/pics/effects/unknown_18/3.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_18/3.png rename to graphics/event_objects/pics/effects/unknown_18/3.png diff --git a/graphics/map_objects/pics/effects/unknown_19/0.png b/graphics/event_objects/pics/effects/unknown_19/0.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_19/0.png rename to graphics/event_objects/pics/effects/unknown_19/0.png diff --git a/graphics/map_objects/pics/effects/unknown_19/1.png b/graphics/event_objects/pics/effects/unknown_19/1.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_19/1.png rename to graphics/event_objects/pics/effects/unknown_19/1.png diff --git a/graphics/map_objects/pics/effects/unknown_19/2.png b/graphics/event_objects/pics/effects/unknown_19/2.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_19/2.png rename to graphics/event_objects/pics/effects/unknown_19/2.png diff --git a/graphics/map_objects/pics/effects/unknown_19/3.png b/graphics/event_objects/pics/effects/unknown_19/3.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_19/3.png rename to graphics/event_objects/pics/effects/unknown_19/3.png diff --git a/graphics/map_objects/pics/effects/unknown_20/0.png b/graphics/event_objects/pics/effects/unknown_20/0.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_20/0.png rename to graphics/event_objects/pics/effects/unknown_20/0.png diff --git a/graphics/map_objects/pics/effects/unknown_20/1.png b/graphics/event_objects/pics/effects/unknown_20/1.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_20/1.png rename to graphics/event_objects/pics/effects/unknown_20/1.png diff --git a/graphics/map_objects/pics/effects/unknown_20/2.png b/graphics/event_objects/pics/effects/unknown_20/2.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_20/2.png rename to graphics/event_objects/pics/effects/unknown_20/2.png diff --git a/graphics/map_objects/pics/effects/unknown_20/3.png b/graphics/event_objects/pics/effects/unknown_20/3.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_20/3.png rename to graphics/event_objects/pics/effects/unknown_20/3.png diff --git a/graphics/map_objects/pics/effects/unknown_20/4.png b/graphics/event_objects/pics/effects/unknown_20/4.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_20/4.png rename to graphics/event_objects/pics/effects/unknown_20/4.png diff --git a/graphics/map_objects/pics/effects/unknown_29/0.png b/graphics/event_objects/pics/effects/unknown_29/0.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_29/0.png rename to graphics/event_objects/pics/effects/unknown_29/0.png diff --git a/graphics/map_objects/pics/effects/unknown_29/1.png b/graphics/event_objects/pics/effects/unknown_29/1.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_29/1.png rename to graphics/event_objects/pics/effects/unknown_29/1.png diff --git a/graphics/map_objects/pics/effects/unknown_29/2.png b/graphics/event_objects/pics/effects/unknown_29/2.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_29/2.png rename to graphics/event_objects/pics/effects/unknown_29/2.png diff --git a/graphics/map_objects/pics/effects/unknown_33/0.png b/graphics/event_objects/pics/effects/unknown_33/0.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_33/0.png rename to graphics/event_objects/pics/effects/unknown_33/0.png diff --git a/graphics/map_objects/pics/effects/unknown_33/1.png b/graphics/event_objects/pics/effects/unknown_33/1.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_33/1.png rename to graphics/event_objects/pics/effects/unknown_33/1.png diff --git a/graphics/map_objects/pics/effects/unknown_33/2.png b/graphics/event_objects/pics/effects/unknown_33/2.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_33/2.png rename to graphics/event_objects/pics/effects/unknown_33/2.png diff --git a/graphics/map_objects/pics/effects/unknown_33/3.png b/graphics/event_objects/pics/effects/unknown_33/3.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_33/3.png rename to graphics/event_objects/pics/effects/unknown_33/3.png diff --git a/graphics/map_objects/pics/effects/unknown_33/4.png b/graphics/event_objects/pics/effects/unknown_33/4.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_33/4.png rename to graphics/event_objects/pics/effects/unknown_33/4.png diff --git a/graphics/map_objects/pics/effects/unknown_35/0.png b/graphics/event_objects/pics/effects/unknown_35/0.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_35/0.png rename to graphics/event_objects/pics/effects/unknown_35/0.png diff --git a/graphics/map_objects/pics/effects/unknown_35/1.png b/graphics/event_objects/pics/effects/unknown_35/1.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_35/1.png rename to graphics/event_objects/pics/effects/unknown_35/1.png diff --git a/graphics/map_objects/pics/effects/unknown_4F6D38/0.png b/graphics/event_objects/pics/effects/unknown_4F6D38/0.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_4F6D38/0.png rename to graphics/event_objects/pics/effects/unknown_4F6D38/0.png diff --git a/graphics/map_objects/pics/effects/unknown_4F7E38/0.png b/graphics/event_objects/pics/effects/unknown_4F7E38/0.png similarity index 100% rename from graphics/map_objects/pics/effects/unknown_4F7E38/0.png rename to graphics/event_objects/pics/effects/unknown_4F7E38/0.png diff --git a/graphics/map_objects/pics/effects/unused_grass/0.png b/graphics/event_objects/pics/effects/unused_grass/0.png similarity index 100% rename from graphics/map_objects/pics/effects/unused_grass/0.png rename to graphics/event_objects/pics/effects/unused_grass/0.png diff --git a/graphics/map_objects/pics/effects/unused_grass/1.png b/graphics/event_objects/pics/effects/unused_grass/1.png similarity index 100% rename from graphics/map_objects/pics/effects/unused_grass/1.png rename to graphics/event_objects/pics/effects/unused_grass/1.png diff --git a/graphics/map_objects/pics/effects/unused_grass/2.png b/graphics/event_objects/pics/effects/unused_grass/2.png similarity index 100% rename from graphics/map_objects/pics/effects/unused_grass/2.png rename to graphics/event_objects/pics/effects/unused_grass/2.png diff --git a/graphics/map_objects/pics/effects/unused_grass/3.png b/graphics/event_objects/pics/effects/unused_grass/3.png similarity index 100% rename from graphics/map_objects/pics/effects/unused_grass/3.png rename to graphics/event_objects/pics/effects/unused_grass/3.png diff --git a/graphics/map_objects/pics/misc/birchs_bag.png b/graphics/event_objects/pics/misc/birchs_bag.png similarity index 100% rename from graphics/map_objects/pics/misc/birchs_bag.png rename to graphics/event_objects/pics/misc/birchs_bag.png diff --git a/graphics/map_objects/pics/misc/birth_island_stone.png b/graphics/event_objects/pics/misc/birth_island_stone.png similarity index 100% rename from graphics/map_objects/pics/misc/birth_island_stone.png rename to graphics/event_objects/pics/misc/birth_island_stone.png diff --git a/graphics/map_objects/pics/misc/breakable_rock/0.png b/graphics/event_objects/pics/misc/breakable_rock/0.png similarity index 100% rename from graphics/map_objects/pics/misc/breakable_rock/0.png rename to graphics/event_objects/pics/misc/breakable_rock/0.png diff --git a/graphics/map_objects/pics/misc/breakable_rock/1.png b/graphics/event_objects/pics/misc/breakable_rock/1.png similarity index 100% rename from graphics/map_objects/pics/misc/breakable_rock/1.png rename to graphics/event_objects/pics/misc/breakable_rock/1.png diff --git a/graphics/map_objects/pics/misc/breakable_rock/2.png b/graphics/event_objects/pics/misc/breakable_rock/2.png similarity index 100% rename from graphics/map_objects/pics/misc/breakable_rock/2.png rename to graphics/event_objects/pics/misc/breakable_rock/2.png diff --git a/graphics/map_objects/pics/misc/breakable_rock/3.png b/graphics/event_objects/pics/misc/breakable_rock/3.png similarity index 100% rename from graphics/map_objects/pics/misc/breakable_rock/3.png rename to graphics/event_objects/pics/misc/breakable_rock/3.png diff --git a/graphics/map_objects/pics/misc/cable_car.png b/graphics/event_objects/pics/misc/cable_car.png similarity index 100% rename from graphics/map_objects/pics/misc/cable_car.png rename to graphics/event_objects/pics/misc/cable_car.png diff --git a/graphics/map_objects/pics/misc/cuttable_tree/0.png b/graphics/event_objects/pics/misc/cuttable_tree/0.png similarity index 100% rename from graphics/map_objects/pics/misc/cuttable_tree/0.png rename to graphics/event_objects/pics/misc/cuttable_tree/0.png diff --git a/graphics/map_objects/pics/misc/cuttable_tree/1.png b/graphics/event_objects/pics/misc/cuttable_tree/1.png similarity index 100% rename from graphics/map_objects/pics/misc/cuttable_tree/1.png rename to graphics/event_objects/pics/misc/cuttable_tree/1.png diff --git a/graphics/map_objects/pics/misc/cuttable_tree/2.png b/graphics/event_objects/pics/misc/cuttable_tree/2.png similarity index 100% rename from graphics/map_objects/pics/misc/cuttable_tree/2.png rename to graphics/event_objects/pics/misc/cuttable_tree/2.png diff --git a/graphics/map_objects/pics/misc/cuttable_tree/3.png b/graphics/event_objects/pics/misc/cuttable_tree/3.png similarity index 100% rename from graphics/map_objects/pics/misc/cuttable_tree/3.png rename to graphics/event_objects/pics/misc/cuttable_tree/3.png diff --git a/graphics/map_objects/pics/misc/fossil.png b/graphics/event_objects/pics/misc/fossil.png similarity index 100% rename from graphics/map_objects/pics/misc/fossil.png rename to graphics/event_objects/pics/misc/fossil.png diff --git a/graphics/map_objects/pics/misc/item_ball.png b/graphics/event_objects/pics/misc/item_ball.png similarity index 100% rename from graphics/map_objects/pics/misc/item_ball.png rename to graphics/event_objects/pics/misc/item_ball.png diff --git a/graphics/map_objects/pics/misc/moving_box.png b/graphics/event_objects/pics/misc/moving_box.png similarity index 100% rename from graphics/map_objects/pics/misc/moving_box.png rename to graphics/event_objects/pics/misc/moving_box.png diff --git a/graphics/map_objects/pics/misc/mr_brineys_boat/0.png b/graphics/event_objects/pics/misc/mr_brineys_boat/0.png similarity index 100% rename from graphics/map_objects/pics/misc/mr_brineys_boat/0.png rename to graphics/event_objects/pics/misc/mr_brineys_boat/0.png diff --git a/graphics/map_objects/pics/misc/mr_brineys_boat/1.png b/graphics/event_objects/pics/misc/mr_brineys_boat/1.png similarity index 100% rename from graphics/map_objects/pics/misc/mr_brineys_boat/1.png rename to graphics/event_objects/pics/misc/mr_brineys_boat/1.png diff --git a/graphics/map_objects/pics/misc/mr_brineys_boat/2.png b/graphics/event_objects/pics/misc/mr_brineys_boat/2.png similarity index 100% rename from graphics/map_objects/pics/misc/mr_brineys_boat/2.png rename to graphics/event_objects/pics/misc/mr_brineys_boat/2.png diff --git a/graphics/map_objects/pics/misc/pushable_boulder.png b/graphics/event_objects/pics/misc/pushable_boulder.png similarity index 100% rename from graphics/map_objects/pics/misc/pushable_boulder.png rename to graphics/event_objects/pics/misc/pushable_boulder.png diff --git a/graphics/map_objects/pics/misc/ss_tidal.png b/graphics/event_objects/pics/misc/ss_tidal.png similarity index 100% rename from graphics/map_objects/pics/misc/ss_tidal.png rename to graphics/event_objects/pics/misc/ss_tidal.png diff --git a/graphics/map_objects/pics/misc/statue.png b/graphics/event_objects/pics/misc/statue.png similarity index 100% rename from graphics/map_objects/pics/misc/statue.png rename to graphics/event_objects/pics/misc/statue.png diff --git a/graphics/map_objects/pics/misc/submarine_shadow.png b/graphics/event_objects/pics/misc/submarine_shadow.png similarity index 100% rename from graphics/map_objects/pics/misc/submarine_shadow.png rename to graphics/event_objects/pics/misc/submarine_shadow.png diff --git a/graphics/map_objects/pics/misc/truck.png b/graphics/event_objects/pics/misc/truck.png similarity index 100% rename from graphics/map_objects/pics/misc/truck.png rename to graphics/event_objects/pics/misc/truck.png diff --git a/graphics/map_objects/pics/people/anabel/0.png b/graphics/event_objects/pics/people/anabel/0.png similarity index 100% rename from graphics/map_objects/pics/people/anabel/0.png rename to graphics/event_objects/pics/people/anabel/0.png diff --git a/graphics/map_objects/pics/people/anabel/1.png b/graphics/event_objects/pics/people/anabel/1.png similarity index 100% rename from graphics/map_objects/pics/people/anabel/1.png rename to graphics/event_objects/pics/people/anabel/1.png diff --git a/graphics/map_objects/pics/people/anabel/2.png b/graphics/event_objects/pics/people/anabel/2.png similarity index 100% rename from graphics/map_objects/pics/people/anabel/2.png rename to graphics/event_objects/pics/people/anabel/2.png diff --git a/graphics/map_objects/pics/people/anabel/3.png b/graphics/event_objects/pics/people/anabel/3.png similarity index 100% rename from graphics/map_objects/pics/people/anabel/3.png rename to graphics/event_objects/pics/people/anabel/3.png diff --git a/graphics/map_objects/pics/people/anabel/4.png b/graphics/event_objects/pics/people/anabel/4.png similarity index 100% rename from graphics/map_objects/pics/people/anabel/4.png rename to graphics/event_objects/pics/people/anabel/4.png diff --git a/graphics/map_objects/pics/people/anabel/5.png b/graphics/event_objects/pics/people/anabel/5.png similarity index 100% rename from graphics/map_objects/pics/people/anabel/5.png rename to graphics/event_objects/pics/people/anabel/5.png diff --git a/graphics/map_objects/pics/people/anabel/6.png b/graphics/event_objects/pics/people/anabel/6.png similarity index 100% rename from graphics/map_objects/pics/people/anabel/6.png rename to graphics/event_objects/pics/people/anabel/6.png diff --git a/graphics/map_objects/pics/people/anabel/7.png b/graphics/event_objects/pics/people/anabel/7.png similarity index 100% rename from graphics/map_objects/pics/people/anabel/7.png rename to graphics/event_objects/pics/people/anabel/7.png diff --git a/graphics/map_objects/pics/people/anabel/8.png b/graphics/event_objects/pics/people/anabel/8.png similarity index 100% rename from graphics/map_objects/pics/people/anabel/8.png rename to graphics/event_objects/pics/people/anabel/8.png diff --git a/graphics/map_objects/pics/people/aqua_member_f/0.png b/graphics/event_objects/pics/people/aqua_member_f/0.png similarity index 100% rename from graphics/map_objects/pics/people/aqua_member_f/0.png rename to graphics/event_objects/pics/people/aqua_member_f/0.png diff --git a/graphics/map_objects/pics/people/aqua_member_f/1.png b/graphics/event_objects/pics/people/aqua_member_f/1.png similarity index 100% rename from graphics/map_objects/pics/people/aqua_member_f/1.png rename to graphics/event_objects/pics/people/aqua_member_f/1.png diff --git a/graphics/map_objects/pics/people/aqua_member_f/2.png b/graphics/event_objects/pics/people/aqua_member_f/2.png similarity index 100% rename from graphics/map_objects/pics/people/aqua_member_f/2.png rename to graphics/event_objects/pics/people/aqua_member_f/2.png diff --git a/graphics/map_objects/pics/people/aqua_member_f/3.png b/graphics/event_objects/pics/people/aqua_member_f/3.png similarity index 100% rename from graphics/map_objects/pics/people/aqua_member_f/3.png rename to graphics/event_objects/pics/people/aqua_member_f/3.png diff --git a/graphics/map_objects/pics/people/aqua_member_f/4.png b/graphics/event_objects/pics/people/aqua_member_f/4.png similarity index 100% rename from graphics/map_objects/pics/people/aqua_member_f/4.png rename to graphics/event_objects/pics/people/aqua_member_f/4.png diff --git a/graphics/map_objects/pics/people/aqua_member_f/5.png b/graphics/event_objects/pics/people/aqua_member_f/5.png similarity index 100% rename from graphics/map_objects/pics/people/aqua_member_f/5.png rename to graphics/event_objects/pics/people/aqua_member_f/5.png diff --git a/graphics/map_objects/pics/people/aqua_member_f/6.png b/graphics/event_objects/pics/people/aqua_member_f/6.png similarity index 100% rename from graphics/map_objects/pics/people/aqua_member_f/6.png rename to graphics/event_objects/pics/people/aqua_member_f/6.png diff --git a/graphics/map_objects/pics/people/aqua_member_f/7.png b/graphics/event_objects/pics/people/aqua_member_f/7.png similarity index 100% rename from graphics/map_objects/pics/people/aqua_member_f/7.png rename to graphics/event_objects/pics/people/aqua_member_f/7.png diff --git a/graphics/map_objects/pics/people/aqua_member_f/8.png b/graphics/event_objects/pics/people/aqua_member_f/8.png similarity index 100% rename from graphics/map_objects/pics/people/aqua_member_f/8.png rename to graphics/event_objects/pics/people/aqua_member_f/8.png diff --git a/graphics/map_objects/pics/people/aqua_member_m/0.png b/graphics/event_objects/pics/people/aqua_member_m/0.png similarity index 100% rename from graphics/map_objects/pics/people/aqua_member_m/0.png rename to graphics/event_objects/pics/people/aqua_member_m/0.png diff --git a/graphics/map_objects/pics/people/aqua_member_m/1.png b/graphics/event_objects/pics/people/aqua_member_m/1.png similarity index 100% rename from graphics/map_objects/pics/people/aqua_member_m/1.png rename to graphics/event_objects/pics/people/aqua_member_m/1.png diff --git a/graphics/map_objects/pics/people/aqua_member_m/2.png b/graphics/event_objects/pics/people/aqua_member_m/2.png similarity index 100% rename from graphics/map_objects/pics/people/aqua_member_m/2.png rename to graphics/event_objects/pics/people/aqua_member_m/2.png diff --git a/graphics/map_objects/pics/people/aqua_member_m/3.png b/graphics/event_objects/pics/people/aqua_member_m/3.png similarity index 100% rename from graphics/map_objects/pics/people/aqua_member_m/3.png rename to graphics/event_objects/pics/people/aqua_member_m/3.png diff --git a/graphics/map_objects/pics/people/aqua_member_m/4.png b/graphics/event_objects/pics/people/aqua_member_m/4.png similarity index 100% rename from graphics/map_objects/pics/people/aqua_member_m/4.png rename to graphics/event_objects/pics/people/aqua_member_m/4.png diff --git a/graphics/map_objects/pics/people/aqua_member_m/5.png b/graphics/event_objects/pics/people/aqua_member_m/5.png similarity index 100% rename from graphics/map_objects/pics/people/aqua_member_m/5.png rename to graphics/event_objects/pics/people/aqua_member_m/5.png diff --git a/graphics/map_objects/pics/people/aqua_member_m/6.png b/graphics/event_objects/pics/people/aqua_member_m/6.png similarity index 100% rename from graphics/map_objects/pics/people/aqua_member_m/6.png rename to graphics/event_objects/pics/people/aqua_member_m/6.png diff --git a/graphics/map_objects/pics/people/aqua_member_m/7.png b/graphics/event_objects/pics/people/aqua_member_m/7.png similarity index 100% rename from graphics/map_objects/pics/people/aqua_member_m/7.png rename to graphics/event_objects/pics/people/aqua_member_m/7.png diff --git a/graphics/map_objects/pics/people/aqua_member_m/8.png b/graphics/event_objects/pics/people/aqua_member_m/8.png similarity index 100% rename from graphics/map_objects/pics/people/aqua_member_m/8.png rename to graphics/event_objects/pics/people/aqua_member_m/8.png diff --git a/graphics/map_objects/pics/people/archie/0.png b/graphics/event_objects/pics/people/archie/0.png similarity index 100% rename from graphics/map_objects/pics/people/archie/0.png rename to graphics/event_objects/pics/people/archie/0.png diff --git a/graphics/map_objects/pics/people/archie/1.png b/graphics/event_objects/pics/people/archie/1.png similarity index 100% rename from graphics/map_objects/pics/people/archie/1.png rename to graphics/event_objects/pics/people/archie/1.png diff --git a/graphics/map_objects/pics/people/archie/2.png b/graphics/event_objects/pics/people/archie/2.png similarity index 100% rename from graphics/map_objects/pics/people/archie/2.png rename to graphics/event_objects/pics/people/archie/2.png diff --git a/graphics/map_objects/pics/people/archie/3.png b/graphics/event_objects/pics/people/archie/3.png similarity index 100% rename from graphics/map_objects/pics/people/archie/3.png rename to graphics/event_objects/pics/people/archie/3.png diff --git a/graphics/map_objects/pics/people/archie/4.png b/graphics/event_objects/pics/people/archie/4.png similarity index 100% rename from graphics/map_objects/pics/people/archie/4.png rename to graphics/event_objects/pics/people/archie/4.png diff --git a/graphics/map_objects/pics/people/archie/5.png b/graphics/event_objects/pics/people/archie/5.png similarity index 100% rename from graphics/map_objects/pics/people/archie/5.png rename to graphics/event_objects/pics/people/archie/5.png diff --git a/graphics/map_objects/pics/people/archie/6.png b/graphics/event_objects/pics/people/archie/6.png similarity index 100% rename from graphics/map_objects/pics/people/archie/6.png rename to graphics/event_objects/pics/people/archie/6.png diff --git a/graphics/map_objects/pics/people/archie/7.png b/graphics/event_objects/pics/people/archie/7.png similarity index 100% rename from graphics/map_objects/pics/people/archie/7.png rename to graphics/event_objects/pics/people/archie/7.png diff --git a/graphics/map_objects/pics/people/archie/8.png b/graphics/event_objects/pics/people/archie/8.png similarity index 100% rename from graphics/map_objects/pics/people/archie/8.png rename to graphics/event_objects/pics/people/archie/8.png diff --git a/graphics/map_objects/pics/people/artist/0.png b/graphics/event_objects/pics/people/artist/0.png similarity index 100% rename from graphics/map_objects/pics/people/artist/0.png rename to graphics/event_objects/pics/people/artist/0.png diff --git a/graphics/map_objects/pics/people/artist/1.png b/graphics/event_objects/pics/people/artist/1.png similarity index 100% rename from graphics/map_objects/pics/people/artist/1.png rename to graphics/event_objects/pics/people/artist/1.png diff --git a/graphics/map_objects/pics/people/artist/2.png b/graphics/event_objects/pics/people/artist/2.png similarity index 100% rename from graphics/map_objects/pics/people/artist/2.png rename to graphics/event_objects/pics/people/artist/2.png diff --git a/graphics/map_objects/pics/people/artist/3.png b/graphics/event_objects/pics/people/artist/3.png similarity index 100% rename from graphics/map_objects/pics/people/artist/3.png rename to graphics/event_objects/pics/people/artist/3.png diff --git a/graphics/map_objects/pics/people/artist/4.png b/graphics/event_objects/pics/people/artist/4.png similarity index 100% rename from graphics/map_objects/pics/people/artist/4.png rename to graphics/event_objects/pics/people/artist/4.png diff --git a/graphics/map_objects/pics/people/artist/5.png b/graphics/event_objects/pics/people/artist/5.png similarity index 100% rename from graphics/map_objects/pics/people/artist/5.png rename to graphics/event_objects/pics/people/artist/5.png diff --git a/graphics/map_objects/pics/people/artist/6.png b/graphics/event_objects/pics/people/artist/6.png similarity index 100% rename from graphics/map_objects/pics/people/artist/6.png rename to graphics/event_objects/pics/people/artist/6.png diff --git a/graphics/map_objects/pics/people/artist/7.png b/graphics/event_objects/pics/people/artist/7.png similarity index 100% rename from graphics/map_objects/pics/people/artist/7.png rename to graphics/event_objects/pics/people/artist/7.png diff --git a/graphics/map_objects/pics/people/artist/8.png b/graphics/event_objects/pics/people/artist/8.png similarity index 100% rename from graphics/map_objects/pics/people/artist/8.png rename to graphics/event_objects/pics/people/artist/8.png diff --git a/graphics/map_objects/pics/people/beauty/0.png b/graphics/event_objects/pics/people/beauty/0.png similarity index 100% rename from graphics/map_objects/pics/people/beauty/0.png rename to graphics/event_objects/pics/people/beauty/0.png diff --git a/graphics/map_objects/pics/people/beauty/1.png b/graphics/event_objects/pics/people/beauty/1.png similarity index 100% rename from graphics/map_objects/pics/people/beauty/1.png rename to graphics/event_objects/pics/people/beauty/1.png diff --git a/graphics/map_objects/pics/people/beauty/2.png b/graphics/event_objects/pics/people/beauty/2.png similarity index 100% rename from graphics/map_objects/pics/people/beauty/2.png rename to graphics/event_objects/pics/people/beauty/2.png diff --git a/graphics/map_objects/pics/people/beauty/3.png b/graphics/event_objects/pics/people/beauty/3.png similarity index 100% rename from graphics/map_objects/pics/people/beauty/3.png rename to graphics/event_objects/pics/people/beauty/3.png diff --git a/graphics/map_objects/pics/people/beauty/4.png b/graphics/event_objects/pics/people/beauty/4.png similarity index 100% rename from graphics/map_objects/pics/people/beauty/4.png rename to graphics/event_objects/pics/people/beauty/4.png diff --git a/graphics/map_objects/pics/people/beauty/5.png b/graphics/event_objects/pics/people/beauty/5.png similarity index 100% rename from graphics/map_objects/pics/people/beauty/5.png rename to graphics/event_objects/pics/people/beauty/5.png diff --git a/graphics/map_objects/pics/people/beauty/6.png b/graphics/event_objects/pics/people/beauty/6.png similarity index 100% rename from graphics/map_objects/pics/people/beauty/6.png rename to graphics/event_objects/pics/people/beauty/6.png diff --git a/graphics/map_objects/pics/people/beauty/7.png b/graphics/event_objects/pics/people/beauty/7.png similarity index 100% rename from graphics/map_objects/pics/people/beauty/7.png rename to graphics/event_objects/pics/people/beauty/7.png diff --git a/graphics/map_objects/pics/people/beauty/8.png b/graphics/event_objects/pics/people/beauty/8.png similarity index 100% rename from graphics/map_objects/pics/people/beauty/8.png rename to graphics/event_objects/pics/people/beauty/8.png diff --git a/graphics/map_objects/pics/people/black_belt/0.png b/graphics/event_objects/pics/people/black_belt/0.png similarity index 100% rename from graphics/map_objects/pics/people/black_belt/0.png rename to graphics/event_objects/pics/people/black_belt/0.png diff --git a/graphics/map_objects/pics/people/black_belt/1.png b/graphics/event_objects/pics/people/black_belt/1.png similarity index 100% rename from graphics/map_objects/pics/people/black_belt/1.png rename to graphics/event_objects/pics/people/black_belt/1.png diff --git a/graphics/map_objects/pics/people/black_belt/2.png b/graphics/event_objects/pics/people/black_belt/2.png similarity index 100% rename from graphics/map_objects/pics/people/black_belt/2.png rename to graphics/event_objects/pics/people/black_belt/2.png diff --git a/graphics/map_objects/pics/people/black_belt/3.png b/graphics/event_objects/pics/people/black_belt/3.png similarity index 100% rename from graphics/map_objects/pics/people/black_belt/3.png rename to graphics/event_objects/pics/people/black_belt/3.png diff --git a/graphics/map_objects/pics/people/black_belt/4.png b/graphics/event_objects/pics/people/black_belt/4.png similarity index 100% rename from graphics/map_objects/pics/people/black_belt/4.png rename to graphics/event_objects/pics/people/black_belt/4.png diff --git a/graphics/map_objects/pics/people/black_belt/5.png b/graphics/event_objects/pics/people/black_belt/5.png similarity index 100% rename from graphics/map_objects/pics/people/black_belt/5.png rename to graphics/event_objects/pics/people/black_belt/5.png diff --git a/graphics/map_objects/pics/people/black_belt/6.png b/graphics/event_objects/pics/people/black_belt/6.png similarity index 100% rename from graphics/map_objects/pics/people/black_belt/6.png rename to graphics/event_objects/pics/people/black_belt/6.png diff --git a/graphics/map_objects/pics/people/black_belt/7.png b/graphics/event_objects/pics/people/black_belt/7.png similarity index 100% rename from graphics/map_objects/pics/people/black_belt/7.png rename to graphics/event_objects/pics/people/black_belt/7.png diff --git a/graphics/map_objects/pics/people/black_belt/8.png b/graphics/event_objects/pics/people/black_belt/8.png similarity index 100% rename from graphics/map_objects/pics/people/black_belt/8.png rename to graphics/event_objects/pics/people/black_belt/8.png diff --git a/graphics/map_objects/pics/people/boy_1/0.png b/graphics/event_objects/pics/people/boy_1/0.png similarity index 100% rename from graphics/map_objects/pics/people/boy_1/0.png rename to graphics/event_objects/pics/people/boy_1/0.png diff --git a/graphics/map_objects/pics/people/boy_1/1.png b/graphics/event_objects/pics/people/boy_1/1.png similarity index 100% rename from graphics/map_objects/pics/people/boy_1/1.png rename to graphics/event_objects/pics/people/boy_1/1.png diff --git a/graphics/map_objects/pics/people/boy_1/2.png b/graphics/event_objects/pics/people/boy_1/2.png similarity index 100% rename from graphics/map_objects/pics/people/boy_1/2.png rename to graphics/event_objects/pics/people/boy_1/2.png diff --git a/graphics/map_objects/pics/people/boy_1/3.png b/graphics/event_objects/pics/people/boy_1/3.png similarity index 100% rename from graphics/map_objects/pics/people/boy_1/3.png rename to graphics/event_objects/pics/people/boy_1/3.png diff --git a/graphics/map_objects/pics/people/boy_1/4.png b/graphics/event_objects/pics/people/boy_1/4.png similarity index 100% rename from graphics/map_objects/pics/people/boy_1/4.png rename to graphics/event_objects/pics/people/boy_1/4.png diff --git a/graphics/map_objects/pics/people/boy_1/5.png b/graphics/event_objects/pics/people/boy_1/5.png similarity index 100% rename from graphics/map_objects/pics/people/boy_1/5.png rename to graphics/event_objects/pics/people/boy_1/5.png diff --git a/graphics/map_objects/pics/people/boy_1/6.png b/graphics/event_objects/pics/people/boy_1/6.png similarity index 100% rename from graphics/map_objects/pics/people/boy_1/6.png rename to graphics/event_objects/pics/people/boy_1/6.png diff --git a/graphics/map_objects/pics/people/boy_1/7.png b/graphics/event_objects/pics/people/boy_1/7.png similarity index 100% rename from graphics/map_objects/pics/people/boy_1/7.png rename to graphics/event_objects/pics/people/boy_1/7.png diff --git a/graphics/map_objects/pics/people/boy_1/8.png b/graphics/event_objects/pics/people/boy_1/8.png similarity index 100% rename from graphics/map_objects/pics/people/boy_1/8.png rename to graphics/event_objects/pics/people/boy_1/8.png diff --git a/graphics/map_objects/pics/people/boy_2/0.png b/graphics/event_objects/pics/people/boy_2/0.png similarity index 100% rename from graphics/map_objects/pics/people/boy_2/0.png rename to graphics/event_objects/pics/people/boy_2/0.png diff --git a/graphics/map_objects/pics/people/boy_2/1.png b/graphics/event_objects/pics/people/boy_2/1.png similarity index 100% rename from graphics/map_objects/pics/people/boy_2/1.png rename to graphics/event_objects/pics/people/boy_2/1.png diff --git a/graphics/map_objects/pics/people/boy_2/2.png b/graphics/event_objects/pics/people/boy_2/2.png similarity index 100% rename from graphics/map_objects/pics/people/boy_2/2.png rename to graphics/event_objects/pics/people/boy_2/2.png diff --git a/graphics/map_objects/pics/people/boy_2/3.png b/graphics/event_objects/pics/people/boy_2/3.png similarity index 100% rename from graphics/map_objects/pics/people/boy_2/3.png rename to graphics/event_objects/pics/people/boy_2/3.png diff --git a/graphics/map_objects/pics/people/boy_2/4.png b/graphics/event_objects/pics/people/boy_2/4.png similarity index 100% rename from graphics/map_objects/pics/people/boy_2/4.png rename to graphics/event_objects/pics/people/boy_2/4.png diff --git a/graphics/map_objects/pics/people/boy_2/5.png b/graphics/event_objects/pics/people/boy_2/5.png similarity index 100% rename from graphics/map_objects/pics/people/boy_2/5.png rename to graphics/event_objects/pics/people/boy_2/5.png diff --git a/graphics/map_objects/pics/people/boy_2/6.png b/graphics/event_objects/pics/people/boy_2/6.png similarity index 100% rename from graphics/map_objects/pics/people/boy_2/6.png rename to graphics/event_objects/pics/people/boy_2/6.png diff --git a/graphics/map_objects/pics/people/boy_2/7.png b/graphics/event_objects/pics/people/boy_2/7.png similarity index 100% rename from graphics/map_objects/pics/people/boy_2/7.png rename to graphics/event_objects/pics/people/boy_2/7.png diff --git a/graphics/map_objects/pics/people/boy_2/8.png b/graphics/event_objects/pics/people/boy_2/8.png similarity index 100% rename from graphics/map_objects/pics/people/boy_2/8.png rename to graphics/event_objects/pics/people/boy_2/8.png diff --git a/graphics/map_objects/pics/people/boy_3/0.png b/graphics/event_objects/pics/people/boy_3/0.png similarity index 100% rename from graphics/map_objects/pics/people/boy_3/0.png rename to graphics/event_objects/pics/people/boy_3/0.png diff --git a/graphics/map_objects/pics/people/boy_3/1.png b/graphics/event_objects/pics/people/boy_3/1.png similarity index 100% rename from graphics/map_objects/pics/people/boy_3/1.png rename to graphics/event_objects/pics/people/boy_3/1.png diff --git a/graphics/map_objects/pics/people/boy_3/2.png b/graphics/event_objects/pics/people/boy_3/2.png similarity index 100% rename from graphics/map_objects/pics/people/boy_3/2.png rename to graphics/event_objects/pics/people/boy_3/2.png diff --git a/graphics/map_objects/pics/people/boy_3/3.png b/graphics/event_objects/pics/people/boy_3/3.png similarity index 100% rename from graphics/map_objects/pics/people/boy_3/3.png rename to graphics/event_objects/pics/people/boy_3/3.png diff --git a/graphics/map_objects/pics/people/boy_3/4.png b/graphics/event_objects/pics/people/boy_3/4.png similarity index 100% rename from graphics/map_objects/pics/people/boy_3/4.png rename to graphics/event_objects/pics/people/boy_3/4.png diff --git a/graphics/map_objects/pics/people/boy_3/5.png b/graphics/event_objects/pics/people/boy_3/5.png similarity index 100% rename from graphics/map_objects/pics/people/boy_3/5.png rename to graphics/event_objects/pics/people/boy_3/5.png diff --git a/graphics/map_objects/pics/people/boy_3/6.png b/graphics/event_objects/pics/people/boy_3/6.png similarity index 100% rename from graphics/map_objects/pics/people/boy_3/6.png rename to graphics/event_objects/pics/people/boy_3/6.png diff --git a/graphics/map_objects/pics/people/boy_3/7.png b/graphics/event_objects/pics/people/boy_3/7.png similarity index 100% rename from graphics/map_objects/pics/people/boy_3/7.png rename to graphics/event_objects/pics/people/boy_3/7.png diff --git a/graphics/map_objects/pics/people/boy_3/8.png b/graphics/event_objects/pics/people/boy_3/8.png similarity index 100% rename from graphics/map_objects/pics/people/boy_3/8.png rename to graphics/event_objects/pics/people/boy_3/8.png diff --git a/graphics/map_objects/pics/people/boy_4/0.png b/graphics/event_objects/pics/people/boy_4/0.png similarity index 100% rename from graphics/map_objects/pics/people/boy_4/0.png rename to graphics/event_objects/pics/people/boy_4/0.png diff --git a/graphics/map_objects/pics/people/boy_4/1.png b/graphics/event_objects/pics/people/boy_4/1.png similarity index 100% rename from graphics/map_objects/pics/people/boy_4/1.png rename to graphics/event_objects/pics/people/boy_4/1.png diff --git a/graphics/map_objects/pics/people/boy_4/2.png b/graphics/event_objects/pics/people/boy_4/2.png similarity index 100% rename from graphics/map_objects/pics/people/boy_4/2.png rename to graphics/event_objects/pics/people/boy_4/2.png diff --git a/graphics/map_objects/pics/people/boy_4/3.png b/graphics/event_objects/pics/people/boy_4/3.png similarity index 100% rename from graphics/map_objects/pics/people/boy_4/3.png rename to graphics/event_objects/pics/people/boy_4/3.png diff --git a/graphics/map_objects/pics/people/boy_4/4.png b/graphics/event_objects/pics/people/boy_4/4.png similarity index 100% rename from graphics/map_objects/pics/people/boy_4/4.png rename to graphics/event_objects/pics/people/boy_4/4.png diff --git a/graphics/map_objects/pics/people/boy_4/5.png b/graphics/event_objects/pics/people/boy_4/5.png similarity index 100% rename from graphics/map_objects/pics/people/boy_4/5.png rename to graphics/event_objects/pics/people/boy_4/5.png diff --git a/graphics/map_objects/pics/people/boy_4/6.png b/graphics/event_objects/pics/people/boy_4/6.png similarity index 100% rename from graphics/map_objects/pics/people/boy_4/6.png rename to graphics/event_objects/pics/people/boy_4/6.png diff --git a/graphics/map_objects/pics/people/boy_4/7.png b/graphics/event_objects/pics/people/boy_4/7.png similarity index 100% rename from graphics/map_objects/pics/people/boy_4/7.png rename to graphics/event_objects/pics/people/boy_4/7.png diff --git a/graphics/map_objects/pics/people/boy_4/8.png b/graphics/event_objects/pics/people/boy_4/8.png similarity index 100% rename from graphics/map_objects/pics/people/boy_4/8.png rename to graphics/event_objects/pics/people/boy_4/8.png diff --git a/graphics/map_objects/pics/people/boy_5/0.png b/graphics/event_objects/pics/people/boy_5/0.png similarity index 100% rename from graphics/map_objects/pics/people/boy_5/0.png rename to graphics/event_objects/pics/people/boy_5/0.png diff --git a/graphics/map_objects/pics/people/boy_5/1.png b/graphics/event_objects/pics/people/boy_5/1.png similarity index 100% rename from graphics/map_objects/pics/people/boy_5/1.png rename to graphics/event_objects/pics/people/boy_5/1.png diff --git a/graphics/map_objects/pics/people/boy_5/2.png b/graphics/event_objects/pics/people/boy_5/2.png similarity index 100% rename from graphics/map_objects/pics/people/boy_5/2.png rename to graphics/event_objects/pics/people/boy_5/2.png diff --git a/graphics/map_objects/pics/people/brandon/0.png b/graphics/event_objects/pics/people/brandon/0.png similarity index 100% rename from graphics/map_objects/pics/people/brandon/0.png rename to graphics/event_objects/pics/people/brandon/0.png diff --git a/graphics/map_objects/pics/people/brandon/1.png b/graphics/event_objects/pics/people/brandon/1.png similarity index 100% rename from graphics/map_objects/pics/people/brandon/1.png rename to graphics/event_objects/pics/people/brandon/1.png diff --git a/graphics/map_objects/pics/people/brandon/2.png b/graphics/event_objects/pics/people/brandon/2.png similarity index 100% rename from graphics/map_objects/pics/people/brandon/2.png rename to graphics/event_objects/pics/people/brandon/2.png diff --git a/graphics/map_objects/pics/people/brandon/3.png b/graphics/event_objects/pics/people/brandon/3.png similarity index 100% rename from graphics/map_objects/pics/people/brandon/3.png rename to graphics/event_objects/pics/people/brandon/3.png diff --git a/graphics/map_objects/pics/people/brandon/4.png b/graphics/event_objects/pics/people/brandon/4.png similarity index 100% rename from graphics/map_objects/pics/people/brandon/4.png rename to graphics/event_objects/pics/people/brandon/4.png diff --git a/graphics/map_objects/pics/people/brandon/5.png b/graphics/event_objects/pics/people/brandon/5.png similarity index 100% rename from graphics/map_objects/pics/people/brandon/5.png rename to graphics/event_objects/pics/people/brandon/5.png diff --git a/graphics/map_objects/pics/people/brandon/6.png b/graphics/event_objects/pics/people/brandon/6.png similarity index 100% rename from graphics/map_objects/pics/people/brandon/6.png rename to graphics/event_objects/pics/people/brandon/6.png diff --git a/graphics/map_objects/pics/people/brandon/7.png b/graphics/event_objects/pics/people/brandon/7.png similarity index 100% rename from graphics/map_objects/pics/people/brandon/7.png rename to graphics/event_objects/pics/people/brandon/7.png diff --git a/graphics/map_objects/pics/people/brandon/8.png b/graphics/event_objects/pics/people/brandon/8.png similarity index 100% rename from graphics/map_objects/pics/people/brandon/8.png rename to graphics/event_objects/pics/people/brandon/8.png diff --git a/graphics/map_objects/pics/people/brawly/0.png b/graphics/event_objects/pics/people/brawly/0.png similarity index 100% rename from graphics/map_objects/pics/people/brawly/0.png rename to graphics/event_objects/pics/people/brawly/0.png diff --git a/graphics/map_objects/pics/people/brawly/1.png b/graphics/event_objects/pics/people/brawly/1.png similarity index 100% rename from graphics/map_objects/pics/people/brawly/1.png rename to graphics/event_objects/pics/people/brawly/1.png diff --git a/graphics/map_objects/pics/people/brawly/2.png b/graphics/event_objects/pics/people/brawly/2.png similarity index 100% rename from graphics/map_objects/pics/people/brawly/2.png rename to graphics/event_objects/pics/people/brawly/2.png diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/00.png b/graphics/event_objects/pics/people/brendan/acro_bike/00.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/acro_bike/00.png rename to graphics/event_objects/pics/people/brendan/acro_bike/00.png diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/01.png b/graphics/event_objects/pics/people/brendan/acro_bike/01.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/acro_bike/01.png rename to graphics/event_objects/pics/people/brendan/acro_bike/01.png diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/02.png b/graphics/event_objects/pics/people/brendan/acro_bike/02.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/acro_bike/02.png rename to graphics/event_objects/pics/people/brendan/acro_bike/02.png diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/03.png b/graphics/event_objects/pics/people/brendan/acro_bike/03.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/acro_bike/03.png rename to graphics/event_objects/pics/people/brendan/acro_bike/03.png diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/04.png b/graphics/event_objects/pics/people/brendan/acro_bike/04.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/acro_bike/04.png rename to graphics/event_objects/pics/people/brendan/acro_bike/04.png diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/05.png b/graphics/event_objects/pics/people/brendan/acro_bike/05.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/acro_bike/05.png rename to graphics/event_objects/pics/people/brendan/acro_bike/05.png diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/06.png b/graphics/event_objects/pics/people/brendan/acro_bike/06.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/acro_bike/06.png rename to graphics/event_objects/pics/people/brendan/acro_bike/06.png diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/07.png b/graphics/event_objects/pics/people/brendan/acro_bike/07.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/acro_bike/07.png rename to graphics/event_objects/pics/people/brendan/acro_bike/07.png diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/08.png b/graphics/event_objects/pics/people/brendan/acro_bike/08.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/acro_bike/08.png rename to graphics/event_objects/pics/people/brendan/acro_bike/08.png diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/09.png b/graphics/event_objects/pics/people/brendan/acro_bike/09.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/acro_bike/09.png rename to graphics/event_objects/pics/people/brendan/acro_bike/09.png diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/10.png b/graphics/event_objects/pics/people/brendan/acro_bike/10.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/acro_bike/10.png rename to graphics/event_objects/pics/people/brendan/acro_bike/10.png diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/11.png b/graphics/event_objects/pics/people/brendan/acro_bike/11.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/acro_bike/11.png rename to graphics/event_objects/pics/people/brendan/acro_bike/11.png diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/12.png b/graphics/event_objects/pics/people/brendan/acro_bike/12.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/acro_bike/12.png rename to graphics/event_objects/pics/people/brendan/acro_bike/12.png diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/13.png b/graphics/event_objects/pics/people/brendan/acro_bike/13.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/acro_bike/13.png rename to graphics/event_objects/pics/people/brendan/acro_bike/13.png diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/14.png b/graphics/event_objects/pics/people/brendan/acro_bike/14.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/acro_bike/14.png rename to graphics/event_objects/pics/people/brendan/acro_bike/14.png diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/15.png b/graphics/event_objects/pics/people/brendan/acro_bike/15.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/acro_bike/15.png rename to graphics/event_objects/pics/people/brendan/acro_bike/15.png diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/16.png b/graphics/event_objects/pics/people/brendan/acro_bike/16.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/acro_bike/16.png rename to graphics/event_objects/pics/people/brendan/acro_bike/16.png diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/17.png b/graphics/event_objects/pics/people/brendan/acro_bike/17.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/acro_bike/17.png rename to graphics/event_objects/pics/people/brendan/acro_bike/17.png diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/18.png b/graphics/event_objects/pics/people/brendan/acro_bike/18.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/acro_bike/18.png rename to graphics/event_objects/pics/people/brendan/acro_bike/18.png diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/19.png b/graphics/event_objects/pics/people/brendan/acro_bike/19.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/acro_bike/19.png rename to graphics/event_objects/pics/people/brendan/acro_bike/19.png diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/20.png b/graphics/event_objects/pics/people/brendan/acro_bike/20.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/acro_bike/20.png rename to graphics/event_objects/pics/people/brendan/acro_bike/20.png diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/21.png b/graphics/event_objects/pics/people/brendan/acro_bike/21.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/acro_bike/21.png rename to graphics/event_objects/pics/people/brendan/acro_bike/21.png diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/22.png b/graphics/event_objects/pics/people/brendan/acro_bike/22.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/acro_bike/22.png rename to graphics/event_objects/pics/people/brendan/acro_bike/22.png diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/23.png b/graphics/event_objects/pics/people/brendan/acro_bike/23.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/acro_bike/23.png rename to graphics/event_objects/pics/people/brendan/acro_bike/23.png diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/24.png b/graphics/event_objects/pics/people/brendan/acro_bike/24.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/acro_bike/24.png rename to graphics/event_objects/pics/people/brendan/acro_bike/24.png diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/25.png b/graphics/event_objects/pics/people/brendan/acro_bike/25.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/acro_bike/25.png rename to graphics/event_objects/pics/people/brendan/acro_bike/25.png diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/26.png b/graphics/event_objects/pics/people/brendan/acro_bike/26.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/acro_bike/26.png rename to graphics/event_objects/pics/people/brendan/acro_bike/26.png diff --git a/graphics/map_objects/pics/people/brendan/decorating.png b/graphics/event_objects/pics/people/brendan/decorating.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/decorating.png rename to graphics/event_objects/pics/people/brendan/decorating.png diff --git a/graphics/map_objects/pics/people/brendan/field_move/0.png b/graphics/event_objects/pics/people/brendan/field_move/0.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/field_move/0.png rename to graphics/event_objects/pics/people/brendan/field_move/0.png diff --git a/graphics/map_objects/pics/people/brendan/field_move/1.png b/graphics/event_objects/pics/people/brendan/field_move/1.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/field_move/1.png rename to graphics/event_objects/pics/people/brendan/field_move/1.png diff --git a/graphics/map_objects/pics/people/brendan/field_move/2.png b/graphics/event_objects/pics/people/brendan/field_move/2.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/field_move/2.png rename to graphics/event_objects/pics/people/brendan/field_move/2.png diff --git a/graphics/map_objects/pics/people/brendan/field_move/3.png b/graphics/event_objects/pics/people/brendan/field_move/3.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/field_move/3.png rename to graphics/event_objects/pics/people/brendan/field_move/3.png diff --git a/graphics/map_objects/pics/people/brendan/field_move/4.png b/graphics/event_objects/pics/people/brendan/field_move/4.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/field_move/4.png rename to graphics/event_objects/pics/people/brendan/field_move/4.png diff --git a/graphics/map_objects/pics/people/brendan/fishing/00.png b/graphics/event_objects/pics/people/brendan/fishing/00.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/fishing/00.png rename to graphics/event_objects/pics/people/brendan/fishing/00.png diff --git a/graphics/map_objects/pics/people/brendan/fishing/01.png b/graphics/event_objects/pics/people/brendan/fishing/01.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/fishing/01.png rename to graphics/event_objects/pics/people/brendan/fishing/01.png diff --git a/graphics/map_objects/pics/people/brendan/fishing/02.png b/graphics/event_objects/pics/people/brendan/fishing/02.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/fishing/02.png rename to graphics/event_objects/pics/people/brendan/fishing/02.png diff --git a/graphics/map_objects/pics/people/brendan/fishing/03.png b/graphics/event_objects/pics/people/brendan/fishing/03.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/fishing/03.png rename to graphics/event_objects/pics/people/brendan/fishing/03.png diff --git a/graphics/map_objects/pics/people/brendan/fishing/04.png b/graphics/event_objects/pics/people/brendan/fishing/04.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/fishing/04.png rename to graphics/event_objects/pics/people/brendan/fishing/04.png diff --git a/graphics/map_objects/pics/people/brendan/fishing/05.png b/graphics/event_objects/pics/people/brendan/fishing/05.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/fishing/05.png rename to graphics/event_objects/pics/people/brendan/fishing/05.png diff --git a/graphics/map_objects/pics/people/brendan/fishing/06.png b/graphics/event_objects/pics/people/brendan/fishing/06.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/fishing/06.png rename to graphics/event_objects/pics/people/brendan/fishing/06.png diff --git a/graphics/map_objects/pics/people/brendan/fishing/07.png b/graphics/event_objects/pics/people/brendan/fishing/07.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/fishing/07.png rename to graphics/event_objects/pics/people/brendan/fishing/07.png diff --git a/graphics/map_objects/pics/people/brendan/fishing/08.png b/graphics/event_objects/pics/people/brendan/fishing/08.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/fishing/08.png rename to graphics/event_objects/pics/people/brendan/fishing/08.png diff --git a/graphics/map_objects/pics/people/brendan/fishing/09.png b/graphics/event_objects/pics/people/brendan/fishing/09.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/fishing/09.png rename to graphics/event_objects/pics/people/brendan/fishing/09.png diff --git a/graphics/map_objects/pics/people/brendan/fishing/10.png b/graphics/event_objects/pics/people/brendan/fishing/10.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/fishing/10.png rename to graphics/event_objects/pics/people/brendan/fishing/10.png diff --git a/graphics/map_objects/pics/people/brendan/fishing/11.png b/graphics/event_objects/pics/people/brendan/fishing/11.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/fishing/11.png rename to graphics/event_objects/pics/people/brendan/fishing/11.png diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/0.png b/graphics/event_objects/pics/people/brendan/mach_bike/0.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/mach_bike/0.png rename to graphics/event_objects/pics/people/brendan/mach_bike/0.png diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/1.png b/graphics/event_objects/pics/people/brendan/mach_bike/1.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/mach_bike/1.png rename to graphics/event_objects/pics/people/brendan/mach_bike/1.png diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/2.png b/graphics/event_objects/pics/people/brendan/mach_bike/2.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/mach_bike/2.png rename to graphics/event_objects/pics/people/brendan/mach_bike/2.png diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/3.png b/graphics/event_objects/pics/people/brendan/mach_bike/3.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/mach_bike/3.png rename to graphics/event_objects/pics/people/brendan/mach_bike/3.png diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/4.png b/graphics/event_objects/pics/people/brendan/mach_bike/4.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/mach_bike/4.png rename to graphics/event_objects/pics/people/brendan/mach_bike/4.png diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/5.png b/graphics/event_objects/pics/people/brendan/mach_bike/5.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/mach_bike/5.png rename to graphics/event_objects/pics/people/brendan/mach_bike/5.png diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/6.png b/graphics/event_objects/pics/people/brendan/mach_bike/6.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/mach_bike/6.png rename to graphics/event_objects/pics/people/brendan/mach_bike/6.png diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/7.png b/graphics/event_objects/pics/people/brendan/mach_bike/7.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/mach_bike/7.png rename to graphics/event_objects/pics/people/brendan/mach_bike/7.png diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/8.png b/graphics/event_objects/pics/people/brendan/mach_bike/8.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/mach_bike/8.png rename to graphics/event_objects/pics/people/brendan/mach_bike/8.png diff --git a/graphics/map_objects/pics/people/brendan/normal/00.png b/graphics/event_objects/pics/people/brendan/normal/00.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/normal/00.png rename to graphics/event_objects/pics/people/brendan/normal/00.png diff --git a/graphics/map_objects/pics/people/brendan/normal/01.png b/graphics/event_objects/pics/people/brendan/normal/01.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/normal/01.png rename to graphics/event_objects/pics/people/brendan/normal/01.png diff --git a/graphics/map_objects/pics/people/brendan/normal/02.png b/graphics/event_objects/pics/people/brendan/normal/02.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/normal/02.png rename to graphics/event_objects/pics/people/brendan/normal/02.png diff --git a/graphics/map_objects/pics/people/brendan/normal/03.png b/graphics/event_objects/pics/people/brendan/normal/03.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/normal/03.png rename to graphics/event_objects/pics/people/brendan/normal/03.png diff --git a/graphics/map_objects/pics/people/brendan/normal/04.png b/graphics/event_objects/pics/people/brendan/normal/04.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/normal/04.png rename to graphics/event_objects/pics/people/brendan/normal/04.png diff --git a/graphics/map_objects/pics/people/brendan/normal/05.png b/graphics/event_objects/pics/people/brendan/normal/05.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/normal/05.png rename to graphics/event_objects/pics/people/brendan/normal/05.png diff --git a/graphics/map_objects/pics/people/brendan/normal/06.png b/graphics/event_objects/pics/people/brendan/normal/06.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/normal/06.png rename to graphics/event_objects/pics/people/brendan/normal/06.png diff --git a/graphics/map_objects/pics/people/brendan/normal/07.png b/graphics/event_objects/pics/people/brendan/normal/07.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/normal/07.png rename to graphics/event_objects/pics/people/brendan/normal/07.png diff --git a/graphics/map_objects/pics/people/brendan/normal/08.png b/graphics/event_objects/pics/people/brendan/normal/08.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/normal/08.png rename to graphics/event_objects/pics/people/brendan/normal/08.png diff --git a/graphics/map_objects/pics/people/brendan/normal/09.png b/graphics/event_objects/pics/people/brendan/normal/09.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/normal/09.png rename to graphics/event_objects/pics/people/brendan/normal/09.png diff --git a/graphics/map_objects/pics/people/brendan/normal/10.png b/graphics/event_objects/pics/people/brendan/normal/10.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/normal/10.png rename to graphics/event_objects/pics/people/brendan/normal/10.png diff --git a/graphics/map_objects/pics/people/brendan/normal/11.png b/graphics/event_objects/pics/people/brendan/normal/11.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/normal/11.png rename to graphics/event_objects/pics/people/brendan/normal/11.png diff --git a/graphics/map_objects/pics/people/brendan/normal/12.png b/graphics/event_objects/pics/people/brendan/normal/12.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/normal/12.png rename to graphics/event_objects/pics/people/brendan/normal/12.png diff --git a/graphics/map_objects/pics/people/brendan/normal/13.png b/graphics/event_objects/pics/people/brendan/normal/13.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/normal/13.png rename to graphics/event_objects/pics/people/brendan/normal/13.png diff --git a/graphics/map_objects/pics/people/brendan/normal/14.png b/graphics/event_objects/pics/people/brendan/normal/14.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/normal/14.png rename to graphics/event_objects/pics/people/brendan/normal/14.png diff --git a/graphics/map_objects/pics/people/brendan/normal/15.png b/graphics/event_objects/pics/people/brendan/normal/15.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/normal/15.png rename to graphics/event_objects/pics/people/brendan/normal/15.png diff --git a/graphics/map_objects/pics/people/brendan/normal/16.png b/graphics/event_objects/pics/people/brendan/normal/16.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/normal/16.png rename to graphics/event_objects/pics/people/brendan/normal/16.png diff --git a/graphics/map_objects/pics/people/brendan/normal/17.png b/graphics/event_objects/pics/people/brendan/normal/17.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/normal/17.png rename to graphics/event_objects/pics/people/brendan/normal/17.png diff --git a/graphics/map_objects/pics/people/brendan/surfing/0.png b/graphics/event_objects/pics/people/brendan/surfing/0.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/surfing/0.png rename to graphics/event_objects/pics/people/brendan/surfing/0.png diff --git a/graphics/map_objects/pics/people/brendan/surfing/1.png b/graphics/event_objects/pics/people/brendan/surfing/1.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/surfing/1.png rename to graphics/event_objects/pics/people/brendan/surfing/1.png diff --git a/graphics/map_objects/pics/people/brendan/surfing/2.png b/graphics/event_objects/pics/people/brendan/surfing/2.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/surfing/2.png rename to graphics/event_objects/pics/people/brendan/surfing/2.png diff --git a/graphics/map_objects/pics/people/brendan/surfing/3.png b/graphics/event_objects/pics/people/brendan/surfing/3.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/surfing/3.png rename to graphics/event_objects/pics/people/brendan/surfing/3.png diff --git a/graphics/map_objects/pics/people/brendan/surfing/4.png b/graphics/event_objects/pics/people/brendan/surfing/4.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/surfing/4.png rename to graphics/event_objects/pics/people/brendan/surfing/4.png diff --git a/graphics/map_objects/pics/people/brendan/surfing/5.png b/graphics/event_objects/pics/people/brendan/surfing/5.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/surfing/5.png rename to graphics/event_objects/pics/people/brendan/surfing/5.png diff --git a/graphics/map_objects/pics/people/brendan/underwater/0.png b/graphics/event_objects/pics/people/brendan/underwater/0.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/underwater/0.png rename to graphics/event_objects/pics/people/brendan/underwater/0.png diff --git a/graphics/map_objects/pics/people/brendan/underwater/1.png b/graphics/event_objects/pics/people/brendan/underwater/1.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/underwater/1.png rename to graphics/event_objects/pics/people/brendan/underwater/1.png diff --git a/graphics/map_objects/pics/people/brendan/underwater/2.png b/graphics/event_objects/pics/people/brendan/underwater/2.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/underwater/2.png rename to graphics/event_objects/pics/people/brendan/underwater/2.png diff --git a/graphics/map_objects/pics/people/brendan/underwater/3.png b/graphics/event_objects/pics/people/brendan/underwater/3.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/underwater/3.png rename to graphics/event_objects/pics/people/brendan/underwater/3.png diff --git a/graphics/map_objects/pics/people/brendan/watering/0.png b/graphics/event_objects/pics/people/brendan/watering/0.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/watering/0.png rename to graphics/event_objects/pics/people/brendan/watering/0.png diff --git a/graphics/map_objects/pics/people/brendan/watering/1.png b/graphics/event_objects/pics/people/brendan/watering/1.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/watering/1.png rename to graphics/event_objects/pics/people/brendan/watering/1.png diff --git a/graphics/map_objects/pics/people/brendan/watering/2.png b/graphics/event_objects/pics/people/brendan/watering/2.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/watering/2.png rename to graphics/event_objects/pics/people/brendan/watering/2.png diff --git a/graphics/map_objects/pics/people/brendan/watering/3.png b/graphics/event_objects/pics/people/brendan/watering/3.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/watering/3.png rename to graphics/event_objects/pics/people/brendan/watering/3.png diff --git a/graphics/map_objects/pics/people/brendan/watering/4.png b/graphics/event_objects/pics/people/brendan/watering/4.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/watering/4.png rename to graphics/event_objects/pics/people/brendan/watering/4.png diff --git a/graphics/map_objects/pics/people/brendan/watering/5.png b/graphics/event_objects/pics/people/brendan/watering/5.png similarity index 100% rename from graphics/map_objects/pics/people/brendan/watering/5.png rename to graphics/event_objects/pics/people/brendan/watering/5.png diff --git a/graphics/map_objects/pics/people/bug_catcher/0.png b/graphics/event_objects/pics/people/bug_catcher/0.png similarity index 100% rename from graphics/map_objects/pics/people/bug_catcher/0.png rename to graphics/event_objects/pics/people/bug_catcher/0.png diff --git a/graphics/map_objects/pics/people/bug_catcher/1.png b/graphics/event_objects/pics/people/bug_catcher/1.png similarity index 100% rename from graphics/map_objects/pics/people/bug_catcher/1.png rename to graphics/event_objects/pics/people/bug_catcher/1.png diff --git a/graphics/map_objects/pics/people/bug_catcher/2.png b/graphics/event_objects/pics/people/bug_catcher/2.png similarity index 100% rename from graphics/map_objects/pics/people/bug_catcher/2.png rename to graphics/event_objects/pics/people/bug_catcher/2.png diff --git a/graphics/map_objects/pics/people/bug_catcher/3.png b/graphics/event_objects/pics/people/bug_catcher/3.png similarity index 100% rename from graphics/map_objects/pics/people/bug_catcher/3.png rename to graphics/event_objects/pics/people/bug_catcher/3.png diff --git a/graphics/map_objects/pics/people/bug_catcher/4.png b/graphics/event_objects/pics/people/bug_catcher/4.png similarity index 100% rename from graphics/map_objects/pics/people/bug_catcher/4.png rename to graphics/event_objects/pics/people/bug_catcher/4.png diff --git a/graphics/map_objects/pics/people/bug_catcher/5.png b/graphics/event_objects/pics/people/bug_catcher/5.png similarity index 100% rename from graphics/map_objects/pics/people/bug_catcher/5.png rename to graphics/event_objects/pics/people/bug_catcher/5.png diff --git a/graphics/map_objects/pics/people/bug_catcher/6.png b/graphics/event_objects/pics/people/bug_catcher/6.png similarity index 100% rename from graphics/map_objects/pics/people/bug_catcher/6.png rename to graphics/event_objects/pics/people/bug_catcher/6.png diff --git a/graphics/map_objects/pics/people/bug_catcher/7.png b/graphics/event_objects/pics/people/bug_catcher/7.png similarity index 100% rename from graphics/map_objects/pics/people/bug_catcher/7.png rename to graphics/event_objects/pics/people/bug_catcher/7.png diff --git a/graphics/map_objects/pics/people/bug_catcher/8.png b/graphics/event_objects/pics/people/bug_catcher/8.png similarity index 100% rename from graphics/map_objects/pics/people/bug_catcher/8.png rename to graphics/event_objects/pics/people/bug_catcher/8.png diff --git a/graphics/map_objects/pics/people/cameraman/0.png b/graphics/event_objects/pics/people/cameraman/0.png similarity index 100% rename from graphics/map_objects/pics/people/cameraman/0.png rename to graphics/event_objects/pics/people/cameraman/0.png diff --git a/graphics/map_objects/pics/people/cameraman/1.png b/graphics/event_objects/pics/people/cameraman/1.png similarity index 100% rename from graphics/map_objects/pics/people/cameraman/1.png rename to graphics/event_objects/pics/people/cameraman/1.png diff --git a/graphics/map_objects/pics/people/cameraman/2.png b/graphics/event_objects/pics/people/cameraman/2.png similarity index 100% rename from graphics/map_objects/pics/people/cameraman/2.png rename to graphics/event_objects/pics/people/cameraman/2.png diff --git a/graphics/map_objects/pics/people/cameraman/3.png b/graphics/event_objects/pics/people/cameraman/3.png similarity index 100% rename from graphics/map_objects/pics/people/cameraman/3.png rename to graphics/event_objects/pics/people/cameraman/3.png diff --git a/graphics/map_objects/pics/people/cameraman/4.png b/graphics/event_objects/pics/people/cameraman/4.png similarity index 100% rename from graphics/map_objects/pics/people/cameraman/4.png rename to graphics/event_objects/pics/people/cameraman/4.png diff --git a/graphics/map_objects/pics/people/cameraman/5.png b/graphics/event_objects/pics/people/cameraman/5.png similarity index 100% rename from graphics/map_objects/pics/people/cameraman/5.png rename to graphics/event_objects/pics/people/cameraman/5.png diff --git a/graphics/map_objects/pics/people/cameraman/6.png b/graphics/event_objects/pics/people/cameraman/6.png similarity index 100% rename from graphics/map_objects/pics/people/cameraman/6.png rename to graphics/event_objects/pics/people/cameraman/6.png diff --git a/graphics/map_objects/pics/people/cameraman/7.png b/graphics/event_objects/pics/people/cameraman/7.png similarity index 100% rename from graphics/map_objects/pics/people/cameraman/7.png rename to graphics/event_objects/pics/people/cameraman/7.png diff --git a/graphics/map_objects/pics/people/cameraman/8.png b/graphics/event_objects/pics/people/cameraman/8.png similarity index 100% rename from graphics/map_objects/pics/people/cameraman/8.png rename to graphics/event_objects/pics/people/cameraman/8.png diff --git a/graphics/map_objects/pics/people/camper/0.png b/graphics/event_objects/pics/people/camper/0.png similarity index 100% rename from graphics/map_objects/pics/people/camper/0.png rename to graphics/event_objects/pics/people/camper/0.png diff --git a/graphics/map_objects/pics/people/camper/1.png b/graphics/event_objects/pics/people/camper/1.png similarity index 100% rename from graphics/map_objects/pics/people/camper/1.png rename to graphics/event_objects/pics/people/camper/1.png diff --git a/graphics/map_objects/pics/people/camper/2.png b/graphics/event_objects/pics/people/camper/2.png similarity index 100% rename from graphics/map_objects/pics/people/camper/2.png rename to graphics/event_objects/pics/people/camper/2.png diff --git a/graphics/map_objects/pics/people/camper/3.png b/graphics/event_objects/pics/people/camper/3.png similarity index 100% rename from graphics/map_objects/pics/people/camper/3.png rename to graphics/event_objects/pics/people/camper/3.png diff --git a/graphics/map_objects/pics/people/camper/4.png b/graphics/event_objects/pics/people/camper/4.png similarity index 100% rename from graphics/map_objects/pics/people/camper/4.png rename to graphics/event_objects/pics/people/camper/4.png diff --git a/graphics/map_objects/pics/people/camper/5.png b/graphics/event_objects/pics/people/camper/5.png similarity index 100% rename from graphics/map_objects/pics/people/camper/5.png rename to graphics/event_objects/pics/people/camper/5.png diff --git a/graphics/map_objects/pics/people/camper/6.png b/graphics/event_objects/pics/people/camper/6.png similarity index 100% rename from graphics/map_objects/pics/people/camper/6.png rename to graphics/event_objects/pics/people/camper/6.png diff --git a/graphics/map_objects/pics/people/camper/7.png b/graphics/event_objects/pics/people/camper/7.png similarity index 100% rename from graphics/map_objects/pics/people/camper/7.png rename to graphics/event_objects/pics/people/camper/7.png diff --git a/graphics/map_objects/pics/people/camper/8.png b/graphics/event_objects/pics/people/camper/8.png similarity index 100% rename from graphics/map_objects/pics/people/camper/8.png rename to graphics/event_objects/pics/people/camper/8.png diff --git a/graphics/map_objects/pics/people/contest_old_man/0.png b/graphics/event_objects/pics/people/contest_old_man/0.png similarity index 100% rename from graphics/map_objects/pics/people/contest_old_man/0.png rename to graphics/event_objects/pics/people/contest_old_man/0.png diff --git a/graphics/map_objects/pics/people/contest_old_man/1.png b/graphics/event_objects/pics/people/contest_old_man/1.png similarity index 100% rename from graphics/map_objects/pics/people/contest_old_man/1.png rename to graphics/event_objects/pics/people/contest_old_man/1.png diff --git a/graphics/map_objects/pics/people/contest_old_man/2.png b/graphics/event_objects/pics/people/contest_old_man/2.png similarity index 100% rename from graphics/map_objects/pics/people/contest_old_man/2.png rename to graphics/event_objects/pics/people/contest_old_man/2.png diff --git a/graphics/map_objects/pics/people/contest_old_man/3.png b/graphics/event_objects/pics/people/contest_old_man/3.png similarity index 100% rename from graphics/map_objects/pics/people/contest_old_man/3.png rename to graphics/event_objects/pics/people/contest_old_man/3.png diff --git a/graphics/map_objects/pics/people/contest_old_man/4.png b/graphics/event_objects/pics/people/contest_old_man/4.png similarity index 100% rename from graphics/map_objects/pics/people/contest_old_man/4.png rename to graphics/event_objects/pics/people/contest_old_man/4.png diff --git a/graphics/map_objects/pics/people/contest_old_man/5.png b/graphics/event_objects/pics/people/contest_old_man/5.png similarity index 100% rename from graphics/map_objects/pics/people/contest_old_man/5.png rename to graphics/event_objects/pics/people/contest_old_man/5.png diff --git a/graphics/map_objects/pics/people/contest_old_man/6.png b/graphics/event_objects/pics/people/contest_old_man/6.png similarity index 100% rename from graphics/map_objects/pics/people/contest_old_man/6.png rename to graphics/event_objects/pics/people/contest_old_man/6.png diff --git a/graphics/map_objects/pics/people/contest_old_man/7.png b/graphics/event_objects/pics/people/contest_old_man/7.png similarity index 100% rename from graphics/map_objects/pics/people/contest_old_man/7.png rename to graphics/event_objects/pics/people/contest_old_man/7.png diff --git a/graphics/map_objects/pics/people/contest_old_man/8.png b/graphics/event_objects/pics/people/contest_old_man/8.png similarity index 100% rename from graphics/map_objects/pics/people/contest_old_man/8.png rename to graphics/event_objects/pics/people/contest_old_man/8.png diff --git a/graphics/map_objects/pics/people/cook/0.png b/graphics/event_objects/pics/people/cook/0.png similarity index 100% rename from graphics/map_objects/pics/people/cook/0.png rename to graphics/event_objects/pics/people/cook/0.png diff --git a/graphics/map_objects/pics/people/cook/1.png b/graphics/event_objects/pics/people/cook/1.png similarity index 100% rename from graphics/map_objects/pics/people/cook/1.png rename to graphics/event_objects/pics/people/cook/1.png diff --git a/graphics/map_objects/pics/people/cook/2.png b/graphics/event_objects/pics/people/cook/2.png similarity index 100% rename from graphics/map_objects/pics/people/cook/2.png rename to graphics/event_objects/pics/people/cook/2.png diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/0.png b/graphics/event_objects/pics/people/cycling_triathlete_f/0.png similarity index 100% rename from graphics/map_objects/pics/people/cycling_triathlete_f/0.png rename to graphics/event_objects/pics/people/cycling_triathlete_f/0.png diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/1.png b/graphics/event_objects/pics/people/cycling_triathlete_f/1.png similarity index 100% rename from graphics/map_objects/pics/people/cycling_triathlete_f/1.png rename to graphics/event_objects/pics/people/cycling_triathlete_f/1.png diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/2.png b/graphics/event_objects/pics/people/cycling_triathlete_f/2.png similarity index 100% rename from graphics/map_objects/pics/people/cycling_triathlete_f/2.png rename to graphics/event_objects/pics/people/cycling_triathlete_f/2.png diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/3.png b/graphics/event_objects/pics/people/cycling_triathlete_f/3.png similarity index 100% rename from graphics/map_objects/pics/people/cycling_triathlete_f/3.png rename to graphics/event_objects/pics/people/cycling_triathlete_f/3.png diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/4.png b/graphics/event_objects/pics/people/cycling_triathlete_f/4.png similarity index 100% rename from graphics/map_objects/pics/people/cycling_triathlete_f/4.png rename to graphics/event_objects/pics/people/cycling_triathlete_f/4.png diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/5.png b/graphics/event_objects/pics/people/cycling_triathlete_f/5.png similarity index 100% rename from graphics/map_objects/pics/people/cycling_triathlete_f/5.png rename to graphics/event_objects/pics/people/cycling_triathlete_f/5.png diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/6.png b/graphics/event_objects/pics/people/cycling_triathlete_f/6.png similarity index 100% rename from graphics/map_objects/pics/people/cycling_triathlete_f/6.png rename to graphics/event_objects/pics/people/cycling_triathlete_f/6.png diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/7.png b/graphics/event_objects/pics/people/cycling_triathlete_f/7.png similarity index 100% rename from graphics/map_objects/pics/people/cycling_triathlete_f/7.png rename to graphics/event_objects/pics/people/cycling_triathlete_f/7.png diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/8.png b/graphics/event_objects/pics/people/cycling_triathlete_f/8.png similarity index 100% rename from graphics/map_objects/pics/people/cycling_triathlete_f/8.png rename to graphics/event_objects/pics/people/cycling_triathlete_f/8.png diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/0.png b/graphics/event_objects/pics/people/cycling_triathlete_m/0.png similarity index 100% rename from graphics/map_objects/pics/people/cycling_triathlete_m/0.png rename to graphics/event_objects/pics/people/cycling_triathlete_m/0.png diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/1.png b/graphics/event_objects/pics/people/cycling_triathlete_m/1.png similarity index 100% rename from graphics/map_objects/pics/people/cycling_triathlete_m/1.png rename to graphics/event_objects/pics/people/cycling_triathlete_m/1.png diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/2.png b/graphics/event_objects/pics/people/cycling_triathlete_m/2.png similarity index 100% rename from graphics/map_objects/pics/people/cycling_triathlete_m/2.png rename to graphics/event_objects/pics/people/cycling_triathlete_m/2.png diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/3.png b/graphics/event_objects/pics/people/cycling_triathlete_m/3.png similarity index 100% rename from graphics/map_objects/pics/people/cycling_triathlete_m/3.png rename to graphics/event_objects/pics/people/cycling_triathlete_m/3.png diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/4.png b/graphics/event_objects/pics/people/cycling_triathlete_m/4.png similarity index 100% rename from graphics/map_objects/pics/people/cycling_triathlete_m/4.png rename to graphics/event_objects/pics/people/cycling_triathlete_m/4.png diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/5.png b/graphics/event_objects/pics/people/cycling_triathlete_m/5.png similarity index 100% rename from graphics/map_objects/pics/people/cycling_triathlete_m/5.png rename to graphics/event_objects/pics/people/cycling_triathlete_m/5.png diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/6.png b/graphics/event_objects/pics/people/cycling_triathlete_m/6.png similarity index 100% rename from graphics/map_objects/pics/people/cycling_triathlete_m/6.png rename to graphics/event_objects/pics/people/cycling_triathlete_m/6.png diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/7.png b/graphics/event_objects/pics/people/cycling_triathlete_m/7.png similarity index 100% rename from graphics/map_objects/pics/people/cycling_triathlete_m/7.png rename to graphics/event_objects/pics/people/cycling_triathlete_m/7.png diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/8.png b/graphics/event_objects/pics/people/cycling_triathlete_m/8.png similarity index 100% rename from graphics/map_objects/pics/people/cycling_triathlete_m/8.png rename to graphics/event_objects/pics/people/cycling_triathlete_m/8.png diff --git a/graphics/map_objects/pics/people/drake/0.png b/graphics/event_objects/pics/people/drake/0.png similarity index 100% rename from graphics/map_objects/pics/people/drake/0.png rename to graphics/event_objects/pics/people/drake/0.png diff --git a/graphics/map_objects/pics/people/drake/1.png b/graphics/event_objects/pics/people/drake/1.png similarity index 100% rename from graphics/map_objects/pics/people/drake/1.png rename to graphics/event_objects/pics/people/drake/1.png diff --git a/graphics/map_objects/pics/people/drake/2.png b/graphics/event_objects/pics/people/drake/2.png similarity index 100% rename from graphics/map_objects/pics/people/drake/2.png rename to graphics/event_objects/pics/people/drake/2.png diff --git a/graphics/map_objects/pics/people/fat_man/0.png b/graphics/event_objects/pics/people/fat_man/0.png similarity index 100% rename from graphics/map_objects/pics/people/fat_man/0.png rename to graphics/event_objects/pics/people/fat_man/0.png diff --git a/graphics/map_objects/pics/people/fat_man/1.png b/graphics/event_objects/pics/people/fat_man/1.png similarity index 100% rename from graphics/map_objects/pics/people/fat_man/1.png rename to graphics/event_objects/pics/people/fat_man/1.png diff --git a/graphics/map_objects/pics/people/fat_man/2.png b/graphics/event_objects/pics/people/fat_man/2.png similarity index 100% rename from graphics/map_objects/pics/people/fat_man/2.png rename to graphics/event_objects/pics/people/fat_man/2.png diff --git a/graphics/map_objects/pics/people/fat_man/3.png b/graphics/event_objects/pics/people/fat_man/3.png similarity index 100% rename from graphics/map_objects/pics/people/fat_man/3.png rename to graphics/event_objects/pics/people/fat_man/3.png diff --git a/graphics/map_objects/pics/people/fat_man/4.png b/graphics/event_objects/pics/people/fat_man/4.png similarity index 100% rename from graphics/map_objects/pics/people/fat_man/4.png rename to graphics/event_objects/pics/people/fat_man/4.png diff --git a/graphics/map_objects/pics/people/fat_man/5.png b/graphics/event_objects/pics/people/fat_man/5.png similarity index 100% rename from graphics/map_objects/pics/people/fat_man/5.png rename to graphics/event_objects/pics/people/fat_man/5.png diff --git a/graphics/map_objects/pics/people/fat_man/6.png b/graphics/event_objects/pics/people/fat_man/6.png similarity index 100% rename from graphics/map_objects/pics/people/fat_man/6.png rename to graphics/event_objects/pics/people/fat_man/6.png diff --git a/graphics/map_objects/pics/people/fat_man/7.png b/graphics/event_objects/pics/people/fat_man/7.png similarity index 100% rename from graphics/map_objects/pics/people/fat_man/7.png rename to graphics/event_objects/pics/people/fat_man/7.png diff --git a/graphics/map_objects/pics/people/fat_man/8.png b/graphics/event_objects/pics/people/fat_man/8.png similarity index 100% rename from graphics/map_objects/pics/people/fat_man/8.png rename to graphics/event_objects/pics/people/fat_man/8.png diff --git a/graphics/map_objects/pics/people/fisherman/0.png b/graphics/event_objects/pics/people/fisherman/0.png similarity index 100% rename from graphics/map_objects/pics/people/fisherman/0.png rename to graphics/event_objects/pics/people/fisherman/0.png diff --git a/graphics/map_objects/pics/people/fisherman/1.png b/graphics/event_objects/pics/people/fisherman/1.png similarity index 100% rename from graphics/map_objects/pics/people/fisherman/1.png rename to graphics/event_objects/pics/people/fisherman/1.png diff --git a/graphics/map_objects/pics/people/fisherman/2.png b/graphics/event_objects/pics/people/fisherman/2.png similarity index 100% rename from graphics/map_objects/pics/people/fisherman/2.png rename to graphics/event_objects/pics/people/fisherman/2.png diff --git a/graphics/map_objects/pics/people/fisherman/3.png b/graphics/event_objects/pics/people/fisherman/3.png similarity index 100% rename from graphics/map_objects/pics/people/fisherman/3.png rename to graphics/event_objects/pics/people/fisherman/3.png diff --git a/graphics/map_objects/pics/people/fisherman/4.png b/graphics/event_objects/pics/people/fisherman/4.png similarity index 100% rename from graphics/map_objects/pics/people/fisherman/4.png rename to graphics/event_objects/pics/people/fisherman/4.png diff --git a/graphics/map_objects/pics/people/fisherman/5.png b/graphics/event_objects/pics/people/fisherman/5.png similarity index 100% rename from graphics/map_objects/pics/people/fisherman/5.png rename to graphics/event_objects/pics/people/fisherman/5.png diff --git a/graphics/map_objects/pics/people/fisherman/6.png b/graphics/event_objects/pics/people/fisherman/6.png similarity index 100% rename from graphics/map_objects/pics/people/fisherman/6.png rename to graphics/event_objects/pics/people/fisherman/6.png diff --git a/graphics/map_objects/pics/people/fisherman/7.png b/graphics/event_objects/pics/people/fisherman/7.png similarity index 100% rename from graphics/map_objects/pics/people/fisherman/7.png rename to graphics/event_objects/pics/people/fisherman/7.png diff --git a/graphics/map_objects/pics/people/fisherman/8.png b/graphics/event_objects/pics/people/fisherman/8.png similarity index 100% rename from graphics/map_objects/pics/people/fisherman/8.png rename to graphics/event_objects/pics/people/fisherman/8.png diff --git a/graphics/map_objects/pics/people/flannery/0.png b/graphics/event_objects/pics/people/flannery/0.png similarity index 100% rename from graphics/map_objects/pics/people/flannery/0.png rename to graphics/event_objects/pics/people/flannery/0.png diff --git a/graphics/map_objects/pics/people/flannery/1.png b/graphics/event_objects/pics/people/flannery/1.png similarity index 100% rename from graphics/map_objects/pics/people/flannery/1.png rename to graphics/event_objects/pics/people/flannery/1.png diff --git a/graphics/map_objects/pics/people/flannery/2.png b/graphics/event_objects/pics/people/flannery/2.png similarity index 100% rename from graphics/map_objects/pics/people/flannery/2.png rename to graphics/event_objects/pics/people/flannery/2.png diff --git a/graphics/map_objects/pics/people/gentleman/0.png b/graphics/event_objects/pics/people/gentleman/0.png similarity index 100% rename from graphics/map_objects/pics/people/gentleman/0.png rename to graphics/event_objects/pics/people/gentleman/0.png diff --git a/graphics/map_objects/pics/people/gentleman/1.png b/graphics/event_objects/pics/people/gentleman/1.png similarity index 100% rename from graphics/map_objects/pics/people/gentleman/1.png rename to graphics/event_objects/pics/people/gentleman/1.png diff --git a/graphics/map_objects/pics/people/gentleman/2.png b/graphics/event_objects/pics/people/gentleman/2.png similarity index 100% rename from graphics/map_objects/pics/people/gentleman/2.png rename to graphics/event_objects/pics/people/gentleman/2.png diff --git a/graphics/map_objects/pics/people/gentleman/3.png b/graphics/event_objects/pics/people/gentleman/3.png similarity index 100% rename from graphics/map_objects/pics/people/gentleman/3.png rename to graphics/event_objects/pics/people/gentleman/3.png diff --git a/graphics/map_objects/pics/people/gentleman/4.png b/graphics/event_objects/pics/people/gentleman/4.png similarity index 100% rename from graphics/map_objects/pics/people/gentleman/4.png rename to graphics/event_objects/pics/people/gentleman/4.png diff --git a/graphics/map_objects/pics/people/gentleman/5.png b/graphics/event_objects/pics/people/gentleman/5.png similarity index 100% rename from graphics/map_objects/pics/people/gentleman/5.png rename to graphics/event_objects/pics/people/gentleman/5.png diff --git a/graphics/map_objects/pics/people/gentleman/6.png b/graphics/event_objects/pics/people/gentleman/6.png similarity index 100% rename from graphics/map_objects/pics/people/gentleman/6.png rename to graphics/event_objects/pics/people/gentleman/6.png diff --git a/graphics/map_objects/pics/people/gentleman/7.png b/graphics/event_objects/pics/people/gentleman/7.png similarity index 100% rename from graphics/map_objects/pics/people/gentleman/7.png rename to graphics/event_objects/pics/people/gentleman/7.png diff --git a/graphics/map_objects/pics/people/gentleman/8.png b/graphics/event_objects/pics/people/gentleman/8.png similarity index 100% rename from graphics/map_objects/pics/people/gentleman/8.png rename to graphics/event_objects/pics/people/gentleman/8.png diff --git a/graphics/map_objects/pics/people/girl_1/0.png b/graphics/event_objects/pics/people/girl_1/0.png similarity index 100% rename from graphics/map_objects/pics/people/girl_1/0.png rename to graphics/event_objects/pics/people/girl_1/0.png diff --git a/graphics/map_objects/pics/people/girl_1/1.png b/graphics/event_objects/pics/people/girl_1/1.png similarity index 100% rename from graphics/map_objects/pics/people/girl_1/1.png rename to graphics/event_objects/pics/people/girl_1/1.png diff --git a/graphics/map_objects/pics/people/girl_1/2.png b/graphics/event_objects/pics/people/girl_1/2.png similarity index 100% rename from graphics/map_objects/pics/people/girl_1/2.png rename to graphics/event_objects/pics/people/girl_1/2.png diff --git a/graphics/map_objects/pics/people/girl_1/3.png b/graphics/event_objects/pics/people/girl_1/3.png similarity index 100% rename from graphics/map_objects/pics/people/girl_1/3.png rename to graphics/event_objects/pics/people/girl_1/3.png diff --git a/graphics/map_objects/pics/people/girl_1/4.png b/graphics/event_objects/pics/people/girl_1/4.png similarity index 100% rename from graphics/map_objects/pics/people/girl_1/4.png rename to graphics/event_objects/pics/people/girl_1/4.png diff --git a/graphics/map_objects/pics/people/girl_1/5.png b/graphics/event_objects/pics/people/girl_1/5.png similarity index 100% rename from graphics/map_objects/pics/people/girl_1/5.png rename to graphics/event_objects/pics/people/girl_1/5.png diff --git a/graphics/map_objects/pics/people/girl_1/6.png b/graphics/event_objects/pics/people/girl_1/6.png similarity index 100% rename from graphics/map_objects/pics/people/girl_1/6.png rename to graphics/event_objects/pics/people/girl_1/6.png diff --git a/graphics/map_objects/pics/people/girl_1/7.png b/graphics/event_objects/pics/people/girl_1/7.png similarity index 100% rename from graphics/map_objects/pics/people/girl_1/7.png rename to graphics/event_objects/pics/people/girl_1/7.png diff --git a/graphics/map_objects/pics/people/girl_1/8.png b/graphics/event_objects/pics/people/girl_1/8.png similarity index 100% rename from graphics/map_objects/pics/people/girl_1/8.png rename to graphics/event_objects/pics/people/girl_1/8.png diff --git a/graphics/map_objects/pics/people/girl_2/0.png b/graphics/event_objects/pics/people/girl_2/0.png similarity index 100% rename from graphics/map_objects/pics/people/girl_2/0.png rename to graphics/event_objects/pics/people/girl_2/0.png diff --git a/graphics/map_objects/pics/people/girl_2/1.png b/graphics/event_objects/pics/people/girl_2/1.png similarity index 100% rename from graphics/map_objects/pics/people/girl_2/1.png rename to graphics/event_objects/pics/people/girl_2/1.png diff --git a/graphics/map_objects/pics/people/girl_2/2.png b/graphics/event_objects/pics/people/girl_2/2.png similarity index 100% rename from graphics/map_objects/pics/people/girl_2/2.png rename to graphics/event_objects/pics/people/girl_2/2.png diff --git a/graphics/map_objects/pics/people/girl_2/3.png b/graphics/event_objects/pics/people/girl_2/3.png similarity index 100% rename from graphics/map_objects/pics/people/girl_2/3.png rename to graphics/event_objects/pics/people/girl_2/3.png diff --git a/graphics/map_objects/pics/people/girl_2/4.png b/graphics/event_objects/pics/people/girl_2/4.png similarity index 100% rename from graphics/map_objects/pics/people/girl_2/4.png rename to graphics/event_objects/pics/people/girl_2/4.png diff --git a/graphics/map_objects/pics/people/girl_2/5.png b/graphics/event_objects/pics/people/girl_2/5.png similarity index 100% rename from graphics/map_objects/pics/people/girl_2/5.png rename to graphics/event_objects/pics/people/girl_2/5.png diff --git a/graphics/map_objects/pics/people/girl_2/6.png b/graphics/event_objects/pics/people/girl_2/6.png similarity index 100% rename from graphics/map_objects/pics/people/girl_2/6.png rename to graphics/event_objects/pics/people/girl_2/6.png diff --git a/graphics/map_objects/pics/people/girl_2/7.png b/graphics/event_objects/pics/people/girl_2/7.png similarity index 100% rename from graphics/map_objects/pics/people/girl_2/7.png rename to graphics/event_objects/pics/people/girl_2/7.png diff --git a/graphics/map_objects/pics/people/girl_2/8.png b/graphics/event_objects/pics/people/girl_2/8.png similarity index 100% rename from graphics/map_objects/pics/people/girl_2/8.png rename to graphics/event_objects/pics/people/girl_2/8.png diff --git a/graphics/map_objects/pics/people/girl_3/0.png b/graphics/event_objects/pics/people/girl_3/0.png similarity index 100% rename from graphics/map_objects/pics/people/girl_3/0.png rename to graphics/event_objects/pics/people/girl_3/0.png diff --git a/graphics/map_objects/pics/people/girl_3/1.png b/graphics/event_objects/pics/people/girl_3/1.png similarity index 100% rename from graphics/map_objects/pics/people/girl_3/1.png rename to graphics/event_objects/pics/people/girl_3/1.png diff --git a/graphics/map_objects/pics/people/girl_3/2.png b/graphics/event_objects/pics/people/girl_3/2.png similarity index 100% rename from graphics/map_objects/pics/people/girl_3/2.png rename to graphics/event_objects/pics/people/girl_3/2.png diff --git a/graphics/map_objects/pics/people/girl_3/3.png b/graphics/event_objects/pics/people/girl_3/3.png similarity index 100% rename from graphics/map_objects/pics/people/girl_3/3.png rename to graphics/event_objects/pics/people/girl_3/3.png diff --git a/graphics/map_objects/pics/people/girl_3/4.png b/graphics/event_objects/pics/people/girl_3/4.png similarity index 100% rename from graphics/map_objects/pics/people/girl_3/4.png rename to graphics/event_objects/pics/people/girl_3/4.png diff --git a/graphics/map_objects/pics/people/girl_3/5.png b/graphics/event_objects/pics/people/girl_3/5.png similarity index 100% rename from graphics/map_objects/pics/people/girl_3/5.png rename to graphics/event_objects/pics/people/girl_3/5.png diff --git a/graphics/map_objects/pics/people/girl_3/6.png b/graphics/event_objects/pics/people/girl_3/6.png similarity index 100% rename from graphics/map_objects/pics/people/girl_3/6.png rename to graphics/event_objects/pics/people/girl_3/6.png diff --git a/graphics/map_objects/pics/people/girl_3/7.png b/graphics/event_objects/pics/people/girl_3/7.png similarity index 100% rename from graphics/map_objects/pics/people/girl_3/7.png rename to graphics/event_objects/pics/people/girl_3/7.png diff --git a/graphics/map_objects/pics/people/girl_3/8.png b/graphics/event_objects/pics/people/girl_3/8.png similarity index 100% rename from graphics/map_objects/pics/people/girl_3/8.png rename to graphics/event_objects/pics/people/girl_3/8.png diff --git a/graphics/map_objects/pics/people/glacia/0.png b/graphics/event_objects/pics/people/glacia/0.png similarity index 100% rename from graphics/map_objects/pics/people/glacia/0.png rename to graphics/event_objects/pics/people/glacia/0.png diff --git a/graphics/map_objects/pics/people/glacia/1.png b/graphics/event_objects/pics/people/glacia/1.png similarity index 100% rename from graphics/map_objects/pics/people/glacia/1.png rename to graphics/event_objects/pics/people/glacia/1.png diff --git a/graphics/map_objects/pics/people/glacia/2.png b/graphics/event_objects/pics/people/glacia/2.png similarity index 100% rename from graphics/map_objects/pics/people/glacia/2.png rename to graphics/event_objects/pics/people/glacia/2.png diff --git a/graphics/map_objects/pics/people/greta/0.png b/graphics/event_objects/pics/people/greta/0.png similarity index 100% rename from graphics/map_objects/pics/people/greta/0.png rename to graphics/event_objects/pics/people/greta/0.png diff --git a/graphics/map_objects/pics/people/greta/1.png b/graphics/event_objects/pics/people/greta/1.png similarity index 100% rename from graphics/map_objects/pics/people/greta/1.png rename to graphics/event_objects/pics/people/greta/1.png diff --git a/graphics/map_objects/pics/people/greta/2.png b/graphics/event_objects/pics/people/greta/2.png similarity index 100% rename from graphics/map_objects/pics/people/greta/2.png rename to graphics/event_objects/pics/people/greta/2.png diff --git a/graphics/map_objects/pics/people/greta/3.png b/graphics/event_objects/pics/people/greta/3.png similarity index 100% rename from graphics/map_objects/pics/people/greta/3.png rename to graphics/event_objects/pics/people/greta/3.png diff --git a/graphics/map_objects/pics/people/greta/4.png b/graphics/event_objects/pics/people/greta/4.png similarity index 100% rename from graphics/map_objects/pics/people/greta/4.png rename to graphics/event_objects/pics/people/greta/4.png diff --git a/graphics/map_objects/pics/people/greta/5.png b/graphics/event_objects/pics/people/greta/5.png similarity index 100% rename from graphics/map_objects/pics/people/greta/5.png rename to graphics/event_objects/pics/people/greta/5.png diff --git a/graphics/map_objects/pics/people/greta/6.png b/graphics/event_objects/pics/people/greta/6.png similarity index 100% rename from graphics/map_objects/pics/people/greta/6.png rename to graphics/event_objects/pics/people/greta/6.png diff --git a/graphics/map_objects/pics/people/greta/7.png b/graphics/event_objects/pics/people/greta/7.png similarity index 100% rename from graphics/map_objects/pics/people/greta/7.png rename to graphics/event_objects/pics/people/greta/7.png diff --git a/graphics/map_objects/pics/people/greta/8.png b/graphics/event_objects/pics/people/greta/8.png similarity index 100% rename from graphics/map_objects/pics/people/greta/8.png rename to graphics/event_objects/pics/people/greta/8.png diff --git a/graphics/map_objects/pics/people/hex_maniac/0.png b/graphics/event_objects/pics/people/hex_maniac/0.png similarity index 100% rename from graphics/map_objects/pics/people/hex_maniac/0.png rename to graphics/event_objects/pics/people/hex_maniac/0.png diff --git a/graphics/map_objects/pics/people/hex_maniac/1.png b/graphics/event_objects/pics/people/hex_maniac/1.png similarity index 100% rename from graphics/map_objects/pics/people/hex_maniac/1.png rename to graphics/event_objects/pics/people/hex_maniac/1.png diff --git a/graphics/map_objects/pics/people/hex_maniac/2.png b/graphics/event_objects/pics/people/hex_maniac/2.png similarity index 100% rename from graphics/map_objects/pics/people/hex_maniac/2.png rename to graphics/event_objects/pics/people/hex_maniac/2.png diff --git a/graphics/map_objects/pics/people/hex_maniac/3.png b/graphics/event_objects/pics/people/hex_maniac/3.png similarity index 100% rename from graphics/map_objects/pics/people/hex_maniac/3.png rename to graphics/event_objects/pics/people/hex_maniac/3.png diff --git a/graphics/map_objects/pics/people/hex_maniac/4.png b/graphics/event_objects/pics/people/hex_maniac/4.png similarity index 100% rename from graphics/map_objects/pics/people/hex_maniac/4.png rename to graphics/event_objects/pics/people/hex_maniac/4.png diff --git a/graphics/map_objects/pics/people/hex_maniac/5.png b/graphics/event_objects/pics/people/hex_maniac/5.png similarity index 100% rename from graphics/map_objects/pics/people/hex_maniac/5.png rename to graphics/event_objects/pics/people/hex_maniac/5.png diff --git a/graphics/map_objects/pics/people/hex_maniac/6.png b/graphics/event_objects/pics/people/hex_maniac/6.png similarity index 100% rename from graphics/map_objects/pics/people/hex_maniac/6.png rename to graphics/event_objects/pics/people/hex_maniac/6.png diff --git a/graphics/map_objects/pics/people/hex_maniac/7.png b/graphics/event_objects/pics/people/hex_maniac/7.png similarity index 100% rename from graphics/map_objects/pics/people/hex_maniac/7.png rename to graphics/event_objects/pics/people/hex_maniac/7.png diff --git a/graphics/map_objects/pics/people/hex_maniac/8.png b/graphics/event_objects/pics/people/hex_maniac/8.png similarity index 100% rename from graphics/map_objects/pics/people/hex_maniac/8.png rename to graphics/event_objects/pics/people/hex_maniac/8.png diff --git a/graphics/map_objects/pics/people/hiker/0.png b/graphics/event_objects/pics/people/hiker/0.png similarity index 100% rename from graphics/map_objects/pics/people/hiker/0.png rename to graphics/event_objects/pics/people/hiker/0.png diff --git a/graphics/map_objects/pics/people/hiker/1.png b/graphics/event_objects/pics/people/hiker/1.png similarity index 100% rename from graphics/map_objects/pics/people/hiker/1.png rename to graphics/event_objects/pics/people/hiker/1.png diff --git a/graphics/map_objects/pics/people/hiker/2.png b/graphics/event_objects/pics/people/hiker/2.png similarity index 100% rename from graphics/map_objects/pics/people/hiker/2.png rename to graphics/event_objects/pics/people/hiker/2.png diff --git a/graphics/map_objects/pics/people/hiker/3.png b/graphics/event_objects/pics/people/hiker/3.png similarity index 100% rename from graphics/map_objects/pics/people/hiker/3.png rename to graphics/event_objects/pics/people/hiker/3.png diff --git a/graphics/map_objects/pics/people/hiker/4.png b/graphics/event_objects/pics/people/hiker/4.png similarity index 100% rename from graphics/map_objects/pics/people/hiker/4.png rename to graphics/event_objects/pics/people/hiker/4.png diff --git a/graphics/map_objects/pics/people/hiker/5.png b/graphics/event_objects/pics/people/hiker/5.png similarity index 100% rename from graphics/map_objects/pics/people/hiker/5.png rename to graphics/event_objects/pics/people/hiker/5.png diff --git a/graphics/map_objects/pics/people/hiker/6.png b/graphics/event_objects/pics/people/hiker/6.png similarity index 100% rename from graphics/map_objects/pics/people/hiker/6.png rename to graphics/event_objects/pics/people/hiker/6.png diff --git a/graphics/map_objects/pics/people/hiker/7.png b/graphics/event_objects/pics/people/hiker/7.png similarity index 100% rename from graphics/map_objects/pics/people/hiker/7.png rename to graphics/event_objects/pics/people/hiker/7.png diff --git a/graphics/map_objects/pics/people/hiker/8.png b/graphics/event_objects/pics/people/hiker/8.png similarity index 100% rename from graphics/map_objects/pics/people/hiker/8.png rename to graphics/event_objects/pics/people/hiker/8.png diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/0.png b/graphics/event_objects/pics/people/hot_springs_old_woman/0.png similarity index 100% rename from graphics/map_objects/pics/people/hot_springs_old_woman/0.png rename to graphics/event_objects/pics/people/hot_springs_old_woman/0.png diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/1.png b/graphics/event_objects/pics/people/hot_springs_old_woman/1.png similarity index 100% rename from graphics/map_objects/pics/people/hot_springs_old_woman/1.png rename to graphics/event_objects/pics/people/hot_springs_old_woman/1.png diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/2.png b/graphics/event_objects/pics/people/hot_springs_old_woman/2.png similarity index 100% rename from graphics/map_objects/pics/people/hot_springs_old_woman/2.png rename to graphics/event_objects/pics/people/hot_springs_old_woman/2.png diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/3.png b/graphics/event_objects/pics/people/hot_springs_old_woman/3.png similarity index 100% rename from graphics/map_objects/pics/people/hot_springs_old_woman/3.png rename to graphics/event_objects/pics/people/hot_springs_old_woman/3.png diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/4.png b/graphics/event_objects/pics/people/hot_springs_old_woman/4.png similarity index 100% rename from graphics/map_objects/pics/people/hot_springs_old_woman/4.png rename to graphics/event_objects/pics/people/hot_springs_old_woman/4.png diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/5.png b/graphics/event_objects/pics/people/hot_springs_old_woman/5.png similarity index 100% rename from graphics/map_objects/pics/people/hot_springs_old_woman/5.png rename to graphics/event_objects/pics/people/hot_springs_old_woman/5.png diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/6.png b/graphics/event_objects/pics/people/hot_springs_old_woman/6.png similarity index 100% rename from graphics/map_objects/pics/people/hot_springs_old_woman/6.png rename to graphics/event_objects/pics/people/hot_springs_old_woman/6.png diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/7.png b/graphics/event_objects/pics/people/hot_springs_old_woman/7.png similarity index 100% rename from graphics/map_objects/pics/people/hot_springs_old_woman/7.png rename to graphics/event_objects/pics/people/hot_springs_old_woman/7.png diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/8.png b/graphics/event_objects/pics/people/hot_springs_old_woman/8.png similarity index 100% rename from graphics/map_objects/pics/people/hot_springs_old_woman/8.png rename to graphics/event_objects/pics/people/hot_springs_old_woman/8.png diff --git a/graphics/map_objects/pics/people/juan/0.png b/graphics/event_objects/pics/people/juan/0.png similarity index 100% rename from graphics/map_objects/pics/people/juan/0.png rename to graphics/event_objects/pics/people/juan/0.png diff --git a/graphics/map_objects/pics/people/juan/1.png b/graphics/event_objects/pics/people/juan/1.png similarity index 100% rename from graphics/map_objects/pics/people/juan/1.png rename to graphics/event_objects/pics/people/juan/1.png diff --git a/graphics/map_objects/pics/people/juan/2.png b/graphics/event_objects/pics/people/juan/2.png similarity index 100% rename from graphics/map_objects/pics/people/juan/2.png rename to graphics/event_objects/pics/people/juan/2.png diff --git a/graphics/map_objects/pics/people/juan/3.png b/graphics/event_objects/pics/people/juan/3.png similarity index 100% rename from graphics/map_objects/pics/people/juan/3.png rename to graphics/event_objects/pics/people/juan/3.png diff --git a/graphics/map_objects/pics/people/juan/4.png b/graphics/event_objects/pics/people/juan/4.png similarity index 100% rename from graphics/map_objects/pics/people/juan/4.png rename to graphics/event_objects/pics/people/juan/4.png diff --git a/graphics/map_objects/pics/people/juan/5.png b/graphics/event_objects/pics/people/juan/5.png similarity index 100% rename from graphics/map_objects/pics/people/juan/5.png rename to graphics/event_objects/pics/people/juan/5.png diff --git a/graphics/map_objects/pics/people/juan/6.png b/graphics/event_objects/pics/people/juan/6.png similarity index 100% rename from graphics/map_objects/pics/people/juan/6.png rename to graphics/event_objects/pics/people/juan/6.png diff --git a/graphics/map_objects/pics/people/juan/7.png b/graphics/event_objects/pics/people/juan/7.png similarity index 100% rename from graphics/map_objects/pics/people/juan/7.png rename to graphics/event_objects/pics/people/juan/7.png diff --git a/graphics/map_objects/pics/people/juan/8.png b/graphics/event_objects/pics/people/juan/8.png similarity index 100% rename from graphics/map_objects/pics/people/juan/8.png rename to graphics/event_objects/pics/people/juan/8.png diff --git a/graphics/map_objects/pics/people/lass/0.png b/graphics/event_objects/pics/people/lass/0.png similarity index 100% rename from graphics/map_objects/pics/people/lass/0.png rename to graphics/event_objects/pics/people/lass/0.png diff --git a/graphics/map_objects/pics/people/lass/1.png b/graphics/event_objects/pics/people/lass/1.png similarity index 100% rename from graphics/map_objects/pics/people/lass/1.png rename to graphics/event_objects/pics/people/lass/1.png diff --git a/graphics/map_objects/pics/people/lass/2.png b/graphics/event_objects/pics/people/lass/2.png similarity index 100% rename from graphics/map_objects/pics/people/lass/2.png rename to graphics/event_objects/pics/people/lass/2.png diff --git a/graphics/map_objects/pics/people/lass/3.png b/graphics/event_objects/pics/people/lass/3.png similarity index 100% rename from graphics/map_objects/pics/people/lass/3.png rename to graphics/event_objects/pics/people/lass/3.png diff --git a/graphics/map_objects/pics/people/lass/4.png b/graphics/event_objects/pics/people/lass/4.png similarity index 100% rename from graphics/map_objects/pics/people/lass/4.png rename to graphics/event_objects/pics/people/lass/4.png diff --git a/graphics/map_objects/pics/people/lass/5.png b/graphics/event_objects/pics/people/lass/5.png similarity index 100% rename from graphics/map_objects/pics/people/lass/5.png rename to graphics/event_objects/pics/people/lass/5.png diff --git a/graphics/map_objects/pics/people/lass/6.png b/graphics/event_objects/pics/people/lass/6.png similarity index 100% rename from graphics/map_objects/pics/people/lass/6.png rename to graphics/event_objects/pics/people/lass/6.png diff --git a/graphics/map_objects/pics/people/lass/7.png b/graphics/event_objects/pics/people/lass/7.png similarity index 100% rename from graphics/map_objects/pics/people/lass/7.png rename to graphics/event_objects/pics/people/lass/7.png diff --git a/graphics/map_objects/pics/people/lass/8.png b/graphics/event_objects/pics/people/lass/8.png similarity index 100% rename from graphics/map_objects/pics/people/lass/8.png rename to graphics/event_objects/pics/people/lass/8.png diff --git a/graphics/map_objects/pics/people/leaf/0.png b/graphics/event_objects/pics/people/leaf/0.png similarity index 100% rename from graphics/map_objects/pics/people/leaf/0.png rename to graphics/event_objects/pics/people/leaf/0.png diff --git a/graphics/map_objects/pics/people/leaf/1.png b/graphics/event_objects/pics/people/leaf/1.png similarity index 100% rename from graphics/map_objects/pics/people/leaf/1.png rename to graphics/event_objects/pics/people/leaf/1.png diff --git a/graphics/map_objects/pics/people/leaf/2.png b/graphics/event_objects/pics/people/leaf/2.png similarity index 100% rename from graphics/map_objects/pics/people/leaf/2.png rename to graphics/event_objects/pics/people/leaf/2.png diff --git a/graphics/map_objects/pics/people/leaf/3.png b/graphics/event_objects/pics/people/leaf/3.png similarity index 100% rename from graphics/map_objects/pics/people/leaf/3.png rename to graphics/event_objects/pics/people/leaf/3.png diff --git a/graphics/map_objects/pics/people/leaf/4.png b/graphics/event_objects/pics/people/leaf/4.png similarity index 100% rename from graphics/map_objects/pics/people/leaf/4.png rename to graphics/event_objects/pics/people/leaf/4.png diff --git a/graphics/map_objects/pics/people/leaf/5.png b/graphics/event_objects/pics/people/leaf/5.png similarity index 100% rename from graphics/map_objects/pics/people/leaf/5.png rename to graphics/event_objects/pics/people/leaf/5.png diff --git a/graphics/map_objects/pics/people/leaf/6.png b/graphics/event_objects/pics/people/leaf/6.png similarity index 100% rename from graphics/map_objects/pics/people/leaf/6.png rename to graphics/event_objects/pics/people/leaf/6.png diff --git a/graphics/map_objects/pics/people/leaf/7.png b/graphics/event_objects/pics/people/leaf/7.png similarity index 100% rename from graphics/map_objects/pics/people/leaf/7.png rename to graphics/event_objects/pics/people/leaf/7.png diff --git a/graphics/map_objects/pics/people/leaf/8.png b/graphics/event_objects/pics/people/leaf/8.png similarity index 100% rename from graphics/map_objects/pics/people/leaf/8.png rename to graphics/event_objects/pics/people/leaf/8.png diff --git a/graphics/map_objects/pics/people/little_boy_1/0.png b/graphics/event_objects/pics/people/little_boy_1/0.png similarity index 100% rename from graphics/map_objects/pics/people/little_boy_1/0.png rename to graphics/event_objects/pics/people/little_boy_1/0.png diff --git a/graphics/map_objects/pics/people/little_boy_1/1.png b/graphics/event_objects/pics/people/little_boy_1/1.png similarity index 100% rename from graphics/map_objects/pics/people/little_boy_1/1.png rename to graphics/event_objects/pics/people/little_boy_1/1.png diff --git a/graphics/map_objects/pics/people/little_boy_1/2.png b/graphics/event_objects/pics/people/little_boy_1/2.png similarity index 100% rename from graphics/map_objects/pics/people/little_boy_1/2.png rename to graphics/event_objects/pics/people/little_boy_1/2.png diff --git a/graphics/map_objects/pics/people/little_boy_1/3.png b/graphics/event_objects/pics/people/little_boy_1/3.png similarity index 100% rename from graphics/map_objects/pics/people/little_boy_1/3.png rename to graphics/event_objects/pics/people/little_boy_1/3.png diff --git a/graphics/map_objects/pics/people/little_boy_1/4.png b/graphics/event_objects/pics/people/little_boy_1/4.png similarity index 100% rename from graphics/map_objects/pics/people/little_boy_1/4.png rename to graphics/event_objects/pics/people/little_boy_1/4.png diff --git a/graphics/map_objects/pics/people/little_boy_1/5.png b/graphics/event_objects/pics/people/little_boy_1/5.png similarity index 100% rename from graphics/map_objects/pics/people/little_boy_1/5.png rename to graphics/event_objects/pics/people/little_boy_1/5.png diff --git a/graphics/map_objects/pics/people/little_boy_1/6.png b/graphics/event_objects/pics/people/little_boy_1/6.png similarity index 100% rename from graphics/map_objects/pics/people/little_boy_1/6.png rename to graphics/event_objects/pics/people/little_boy_1/6.png diff --git a/graphics/map_objects/pics/people/little_boy_1/7.png b/graphics/event_objects/pics/people/little_boy_1/7.png similarity index 100% rename from graphics/map_objects/pics/people/little_boy_1/7.png rename to graphics/event_objects/pics/people/little_boy_1/7.png diff --git a/graphics/map_objects/pics/people/little_boy_1/8.png b/graphics/event_objects/pics/people/little_boy_1/8.png similarity index 100% rename from graphics/map_objects/pics/people/little_boy_1/8.png rename to graphics/event_objects/pics/people/little_boy_1/8.png diff --git a/graphics/map_objects/pics/people/little_boy_2/0.png b/graphics/event_objects/pics/people/little_boy_2/0.png similarity index 100% rename from graphics/map_objects/pics/people/little_boy_2/0.png rename to graphics/event_objects/pics/people/little_boy_2/0.png diff --git a/graphics/map_objects/pics/people/little_boy_2/1.png b/graphics/event_objects/pics/people/little_boy_2/1.png similarity index 100% rename from graphics/map_objects/pics/people/little_boy_2/1.png rename to graphics/event_objects/pics/people/little_boy_2/1.png diff --git a/graphics/map_objects/pics/people/little_boy_2/2.png b/graphics/event_objects/pics/people/little_boy_2/2.png similarity index 100% rename from graphics/map_objects/pics/people/little_boy_2/2.png rename to graphics/event_objects/pics/people/little_boy_2/2.png diff --git a/graphics/map_objects/pics/people/little_boy_2/3.png b/graphics/event_objects/pics/people/little_boy_2/3.png similarity index 100% rename from graphics/map_objects/pics/people/little_boy_2/3.png rename to graphics/event_objects/pics/people/little_boy_2/3.png diff --git a/graphics/map_objects/pics/people/little_boy_2/4.png b/graphics/event_objects/pics/people/little_boy_2/4.png similarity index 100% rename from graphics/map_objects/pics/people/little_boy_2/4.png rename to graphics/event_objects/pics/people/little_boy_2/4.png diff --git a/graphics/map_objects/pics/people/little_boy_2/5.png b/graphics/event_objects/pics/people/little_boy_2/5.png similarity index 100% rename from graphics/map_objects/pics/people/little_boy_2/5.png rename to graphics/event_objects/pics/people/little_boy_2/5.png diff --git a/graphics/map_objects/pics/people/little_boy_2/6.png b/graphics/event_objects/pics/people/little_boy_2/6.png similarity index 100% rename from graphics/map_objects/pics/people/little_boy_2/6.png rename to graphics/event_objects/pics/people/little_boy_2/6.png diff --git a/graphics/map_objects/pics/people/little_boy_2/7.png b/graphics/event_objects/pics/people/little_boy_2/7.png similarity index 100% rename from graphics/map_objects/pics/people/little_boy_2/7.png rename to graphics/event_objects/pics/people/little_boy_2/7.png diff --git a/graphics/map_objects/pics/people/little_boy_2/8.png b/graphics/event_objects/pics/people/little_boy_2/8.png similarity index 100% rename from graphics/map_objects/pics/people/little_boy_2/8.png rename to graphics/event_objects/pics/people/little_boy_2/8.png diff --git a/graphics/map_objects/pics/people/little_girl_1/0.png b/graphics/event_objects/pics/people/little_girl_1/0.png similarity index 100% rename from graphics/map_objects/pics/people/little_girl_1/0.png rename to graphics/event_objects/pics/people/little_girl_1/0.png diff --git a/graphics/map_objects/pics/people/little_girl_1/1.png b/graphics/event_objects/pics/people/little_girl_1/1.png similarity index 100% rename from graphics/map_objects/pics/people/little_girl_1/1.png rename to graphics/event_objects/pics/people/little_girl_1/1.png diff --git a/graphics/map_objects/pics/people/little_girl_1/2.png b/graphics/event_objects/pics/people/little_girl_1/2.png similarity index 100% rename from graphics/map_objects/pics/people/little_girl_1/2.png rename to graphics/event_objects/pics/people/little_girl_1/2.png diff --git a/graphics/map_objects/pics/people/little_girl_1/3.png b/graphics/event_objects/pics/people/little_girl_1/3.png similarity index 100% rename from graphics/map_objects/pics/people/little_girl_1/3.png rename to graphics/event_objects/pics/people/little_girl_1/3.png diff --git a/graphics/map_objects/pics/people/little_girl_1/4.png b/graphics/event_objects/pics/people/little_girl_1/4.png similarity index 100% rename from graphics/map_objects/pics/people/little_girl_1/4.png rename to graphics/event_objects/pics/people/little_girl_1/4.png diff --git a/graphics/map_objects/pics/people/little_girl_1/5.png b/graphics/event_objects/pics/people/little_girl_1/5.png similarity index 100% rename from graphics/map_objects/pics/people/little_girl_1/5.png rename to graphics/event_objects/pics/people/little_girl_1/5.png diff --git a/graphics/map_objects/pics/people/little_girl_1/6.png b/graphics/event_objects/pics/people/little_girl_1/6.png similarity index 100% rename from graphics/map_objects/pics/people/little_girl_1/6.png rename to graphics/event_objects/pics/people/little_girl_1/6.png diff --git a/graphics/map_objects/pics/people/little_girl_1/7.png b/graphics/event_objects/pics/people/little_girl_1/7.png similarity index 100% rename from graphics/map_objects/pics/people/little_girl_1/7.png rename to graphics/event_objects/pics/people/little_girl_1/7.png diff --git a/graphics/map_objects/pics/people/little_girl_1/8.png b/graphics/event_objects/pics/people/little_girl_1/8.png similarity index 100% rename from graphics/map_objects/pics/people/little_girl_1/8.png rename to graphics/event_objects/pics/people/little_girl_1/8.png diff --git a/graphics/map_objects/pics/people/little_girl_2/0.png b/graphics/event_objects/pics/people/little_girl_2/0.png similarity index 100% rename from graphics/map_objects/pics/people/little_girl_2/0.png rename to graphics/event_objects/pics/people/little_girl_2/0.png diff --git a/graphics/map_objects/pics/people/little_girl_2/1.png b/graphics/event_objects/pics/people/little_girl_2/1.png similarity index 100% rename from graphics/map_objects/pics/people/little_girl_2/1.png rename to graphics/event_objects/pics/people/little_girl_2/1.png diff --git a/graphics/map_objects/pics/people/little_girl_2/2.png b/graphics/event_objects/pics/people/little_girl_2/2.png similarity index 100% rename from graphics/map_objects/pics/people/little_girl_2/2.png rename to graphics/event_objects/pics/people/little_girl_2/2.png diff --git a/graphics/map_objects/pics/people/little_girl_2/3.png b/graphics/event_objects/pics/people/little_girl_2/3.png similarity index 100% rename from graphics/map_objects/pics/people/little_girl_2/3.png rename to graphics/event_objects/pics/people/little_girl_2/3.png diff --git a/graphics/map_objects/pics/people/little_girl_2/4.png b/graphics/event_objects/pics/people/little_girl_2/4.png similarity index 100% rename from graphics/map_objects/pics/people/little_girl_2/4.png rename to graphics/event_objects/pics/people/little_girl_2/4.png diff --git a/graphics/map_objects/pics/people/little_girl_2/5.png b/graphics/event_objects/pics/people/little_girl_2/5.png similarity index 100% rename from graphics/map_objects/pics/people/little_girl_2/5.png rename to graphics/event_objects/pics/people/little_girl_2/5.png diff --git a/graphics/map_objects/pics/people/little_girl_2/6.png b/graphics/event_objects/pics/people/little_girl_2/6.png similarity index 100% rename from graphics/map_objects/pics/people/little_girl_2/6.png rename to graphics/event_objects/pics/people/little_girl_2/6.png diff --git a/graphics/map_objects/pics/people/little_girl_2/7.png b/graphics/event_objects/pics/people/little_girl_2/7.png similarity index 100% rename from graphics/map_objects/pics/people/little_girl_2/7.png rename to graphics/event_objects/pics/people/little_girl_2/7.png diff --git a/graphics/map_objects/pics/people/little_girl_2/8.png b/graphics/event_objects/pics/people/little_girl_2/8.png similarity index 100% rename from graphics/map_objects/pics/people/little_girl_2/8.png rename to graphics/event_objects/pics/people/little_girl_2/8.png diff --git a/graphics/map_objects/pics/people/liza/0.png b/graphics/event_objects/pics/people/liza/0.png similarity index 100% rename from graphics/map_objects/pics/people/liza/0.png rename to graphics/event_objects/pics/people/liza/0.png diff --git a/graphics/map_objects/pics/people/liza/1.png b/graphics/event_objects/pics/people/liza/1.png similarity index 100% rename from graphics/map_objects/pics/people/liza/1.png rename to graphics/event_objects/pics/people/liza/1.png diff --git a/graphics/map_objects/pics/people/liza/2.png b/graphics/event_objects/pics/people/liza/2.png similarity index 100% rename from graphics/map_objects/pics/people/liza/2.png rename to graphics/event_objects/pics/people/liza/2.png diff --git a/graphics/map_objects/pics/people/lucy/0.png b/graphics/event_objects/pics/people/lucy/0.png similarity index 100% rename from graphics/map_objects/pics/people/lucy/0.png rename to graphics/event_objects/pics/people/lucy/0.png diff --git a/graphics/map_objects/pics/people/lucy/1.png b/graphics/event_objects/pics/people/lucy/1.png similarity index 100% rename from graphics/map_objects/pics/people/lucy/1.png rename to graphics/event_objects/pics/people/lucy/1.png diff --git a/graphics/map_objects/pics/people/lucy/2.png b/graphics/event_objects/pics/people/lucy/2.png similarity index 100% rename from graphics/map_objects/pics/people/lucy/2.png rename to graphics/event_objects/pics/people/lucy/2.png diff --git a/graphics/map_objects/pics/people/lucy/3.png b/graphics/event_objects/pics/people/lucy/3.png similarity index 100% rename from graphics/map_objects/pics/people/lucy/3.png rename to graphics/event_objects/pics/people/lucy/3.png diff --git a/graphics/map_objects/pics/people/lucy/4.png b/graphics/event_objects/pics/people/lucy/4.png similarity index 100% rename from graphics/map_objects/pics/people/lucy/4.png rename to graphics/event_objects/pics/people/lucy/4.png diff --git a/graphics/map_objects/pics/people/lucy/5.png b/graphics/event_objects/pics/people/lucy/5.png similarity index 100% rename from graphics/map_objects/pics/people/lucy/5.png rename to graphics/event_objects/pics/people/lucy/5.png diff --git a/graphics/map_objects/pics/people/lucy/6.png b/graphics/event_objects/pics/people/lucy/6.png similarity index 100% rename from graphics/map_objects/pics/people/lucy/6.png rename to graphics/event_objects/pics/people/lucy/6.png diff --git a/graphics/map_objects/pics/people/lucy/7.png b/graphics/event_objects/pics/people/lucy/7.png similarity index 100% rename from graphics/map_objects/pics/people/lucy/7.png rename to graphics/event_objects/pics/people/lucy/7.png diff --git a/graphics/map_objects/pics/people/lucy/8.png b/graphics/event_objects/pics/people/lucy/8.png similarity index 100% rename from graphics/map_objects/pics/people/lucy/8.png rename to graphics/event_objects/pics/people/lucy/8.png diff --git a/graphics/map_objects/pics/people/magma_member_f/0.png b/graphics/event_objects/pics/people/magma_member_f/0.png similarity index 100% rename from graphics/map_objects/pics/people/magma_member_f/0.png rename to graphics/event_objects/pics/people/magma_member_f/0.png diff --git a/graphics/map_objects/pics/people/magma_member_f/1.png b/graphics/event_objects/pics/people/magma_member_f/1.png similarity index 100% rename from graphics/map_objects/pics/people/magma_member_f/1.png rename to graphics/event_objects/pics/people/magma_member_f/1.png diff --git a/graphics/map_objects/pics/people/magma_member_f/2.png b/graphics/event_objects/pics/people/magma_member_f/2.png similarity index 100% rename from graphics/map_objects/pics/people/magma_member_f/2.png rename to graphics/event_objects/pics/people/magma_member_f/2.png diff --git a/graphics/map_objects/pics/people/magma_member_f/3.png b/graphics/event_objects/pics/people/magma_member_f/3.png similarity index 100% rename from graphics/map_objects/pics/people/magma_member_f/3.png rename to graphics/event_objects/pics/people/magma_member_f/3.png diff --git a/graphics/map_objects/pics/people/magma_member_f/4.png b/graphics/event_objects/pics/people/magma_member_f/4.png similarity index 100% rename from graphics/map_objects/pics/people/magma_member_f/4.png rename to graphics/event_objects/pics/people/magma_member_f/4.png diff --git a/graphics/map_objects/pics/people/magma_member_f/5.png b/graphics/event_objects/pics/people/magma_member_f/5.png similarity index 100% rename from graphics/map_objects/pics/people/magma_member_f/5.png rename to graphics/event_objects/pics/people/magma_member_f/5.png diff --git a/graphics/map_objects/pics/people/magma_member_f/6.png b/graphics/event_objects/pics/people/magma_member_f/6.png similarity index 100% rename from graphics/map_objects/pics/people/magma_member_f/6.png rename to graphics/event_objects/pics/people/magma_member_f/6.png diff --git a/graphics/map_objects/pics/people/magma_member_f/7.png b/graphics/event_objects/pics/people/magma_member_f/7.png similarity index 100% rename from graphics/map_objects/pics/people/magma_member_f/7.png rename to graphics/event_objects/pics/people/magma_member_f/7.png diff --git a/graphics/map_objects/pics/people/magma_member_f/8.png b/graphics/event_objects/pics/people/magma_member_f/8.png similarity index 100% rename from graphics/map_objects/pics/people/magma_member_f/8.png rename to graphics/event_objects/pics/people/magma_member_f/8.png diff --git a/graphics/map_objects/pics/people/magma_member_m/0.png b/graphics/event_objects/pics/people/magma_member_m/0.png similarity index 100% rename from graphics/map_objects/pics/people/magma_member_m/0.png rename to graphics/event_objects/pics/people/magma_member_m/0.png diff --git a/graphics/map_objects/pics/people/magma_member_m/1.png b/graphics/event_objects/pics/people/magma_member_m/1.png similarity index 100% rename from graphics/map_objects/pics/people/magma_member_m/1.png rename to graphics/event_objects/pics/people/magma_member_m/1.png diff --git a/graphics/map_objects/pics/people/magma_member_m/2.png b/graphics/event_objects/pics/people/magma_member_m/2.png similarity index 100% rename from graphics/map_objects/pics/people/magma_member_m/2.png rename to graphics/event_objects/pics/people/magma_member_m/2.png diff --git a/graphics/map_objects/pics/people/magma_member_m/3.png b/graphics/event_objects/pics/people/magma_member_m/3.png similarity index 100% rename from graphics/map_objects/pics/people/magma_member_m/3.png rename to graphics/event_objects/pics/people/magma_member_m/3.png diff --git a/graphics/map_objects/pics/people/magma_member_m/4.png b/graphics/event_objects/pics/people/magma_member_m/4.png similarity index 100% rename from graphics/map_objects/pics/people/magma_member_m/4.png rename to graphics/event_objects/pics/people/magma_member_m/4.png diff --git a/graphics/map_objects/pics/people/magma_member_m/5.png b/graphics/event_objects/pics/people/magma_member_m/5.png similarity index 100% rename from graphics/map_objects/pics/people/magma_member_m/5.png rename to graphics/event_objects/pics/people/magma_member_m/5.png diff --git a/graphics/map_objects/pics/people/magma_member_m/6.png b/graphics/event_objects/pics/people/magma_member_m/6.png similarity index 100% rename from graphics/map_objects/pics/people/magma_member_m/6.png rename to graphics/event_objects/pics/people/magma_member_m/6.png diff --git a/graphics/map_objects/pics/people/magma_member_m/7.png b/graphics/event_objects/pics/people/magma_member_m/7.png similarity index 100% rename from graphics/map_objects/pics/people/magma_member_m/7.png rename to graphics/event_objects/pics/people/magma_member_m/7.png diff --git a/graphics/map_objects/pics/people/magma_member_m/8.png b/graphics/event_objects/pics/people/magma_member_m/8.png similarity index 100% rename from graphics/map_objects/pics/people/magma_member_m/8.png rename to graphics/event_objects/pics/people/magma_member_m/8.png diff --git a/graphics/map_objects/pics/people/man_1/0.png b/graphics/event_objects/pics/people/man_1/0.png similarity index 100% rename from graphics/map_objects/pics/people/man_1/0.png rename to graphics/event_objects/pics/people/man_1/0.png diff --git a/graphics/map_objects/pics/people/man_1/1.png b/graphics/event_objects/pics/people/man_1/1.png similarity index 100% rename from graphics/map_objects/pics/people/man_1/1.png rename to graphics/event_objects/pics/people/man_1/1.png diff --git a/graphics/map_objects/pics/people/man_1/2.png b/graphics/event_objects/pics/people/man_1/2.png similarity index 100% rename from graphics/map_objects/pics/people/man_1/2.png rename to graphics/event_objects/pics/people/man_1/2.png diff --git a/graphics/map_objects/pics/people/man_1/3.png b/graphics/event_objects/pics/people/man_1/3.png similarity index 100% rename from graphics/map_objects/pics/people/man_1/3.png rename to graphics/event_objects/pics/people/man_1/3.png diff --git a/graphics/map_objects/pics/people/man_1/4.png b/graphics/event_objects/pics/people/man_1/4.png similarity index 100% rename from graphics/map_objects/pics/people/man_1/4.png rename to graphics/event_objects/pics/people/man_1/4.png diff --git a/graphics/map_objects/pics/people/man_1/5.png b/graphics/event_objects/pics/people/man_1/5.png similarity index 100% rename from graphics/map_objects/pics/people/man_1/5.png rename to graphics/event_objects/pics/people/man_1/5.png diff --git a/graphics/map_objects/pics/people/man_1/6.png b/graphics/event_objects/pics/people/man_1/6.png similarity index 100% rename from graphics/map_objects/pics/people/man_1/6.png rename to graphics/event_objects/pics/people/man_1/6.png diff --git a/graphics/map_objects/pics/people/man_1/7.png b/graphics/event_objects/pics/people/man_1/7.png similarity index 100% rename from graphics/map_objects/pics/people/man_1/7.png rename to graphics/event_objects/pics/people/man_1/7.png diff --git a/graphics/map_objects/pics/people/man_1/8.png b/graphics/event_objects/pics/people/man_1/8.png similarity index 100% rename from graphics/map_objects/pics/people/man_1/8.png rename to graphics/event_objects/pics/people/man_1/8.png diff --git a/graphics/map_objects/pics/people/man_2/0.png b/graphics/event_objects/pics/people/man_2/0.png similarity index 100% rename from graphics/map_objects/pics/people/man_2/0.png rename to graphics/event_objects/pics/people/man_2/0.png diff --git a/graphics/map_objects/pics/people/man_2/1.png b/graphics/event_objects/pics/people/man_2/1.png similarity index 100% rename from graphics/map_objects/pics/people/man_2/1.png rename to graphics/event_objects/pics/people/man_2/1.png diff --git a/graphics/map_objects/pics/people/man_2/2.png b/graphics/event_objects/pics/people/man_2/2.png similarity index 100% rename from graphics/map_objects/pics/people/man_2/2.png rename to graphics/event_objects/pics/people/man_2/2.png diff --git a/graphics/map_objects/pics/people/man_2/3.png b/graphics/event_objects/pics/people/man_2/3.png similarity index 100% rename from graphics/map_objects/pics/people/man_2/3.png rename to graphics/event_objects/pics/people/man_2/3.png diff --git a/graphics/map_objects/pics/people/man_2/4.png b/graphics/event_objects/pics/people/man_2/4.png similarity index 100% rename from graphics/map_objects/pics/people/man_2/4.png rename to graphics/event_objects/pics/people/man_2/4.png diff --git a/graphics/map_objects/pics/people/man_2/5.png b/graphics/event_objects/pics/people/man_2/5.png similarity index 100% rename from graphics/map_objects/pics/people/man_2/5.png rename to graphics/event_objects/pics/people/man_2/5.png diff --git a/graphics/map_objects/pics/people/man_2/6.png b/graphics/event_objects/pics/people/man_2/6.png similarity index 100% rename from graphics/map_objects/pics/people/man_2/6.png rename to graphics/event_objects/pics/people/man_2/6.png diff --git a/graphics/map_objects/pics/people/man_2/7.png b/graphics/event_objects/pics/people/man_2/7.png similarity index 100% rename from graphics/map_objects/pics/people/man_2/7.png rename to graphics/event_objects/pics/people/man_2/7.png diff --git a/graphics/map_objects/pics/people/man_2/8.png b/graphics/event_objects/pics/people/man_2/8.png similarity index 100% rename from graphics/map_objects/pics/people/man_2/8.png rename to graphics/event_objects/pics/people/man_2/8.png diff --git a/graphics/map_objects/pics/people/man_3/0.png b/graphics/event_objects/pics/people/man_3/0.png similarity index 100% rename from graphics/map_objects/pics/people/man_3/0.png rename to graphics/event_objects/pics/people/man_3/0.png diff --git a/graphics/map_objects/pics/people/man_3/1.png b/graphics/event_objects/pics/people/man_3/1.png similarity index 100% rename from graphics/map_objects/pics/people/man_3/1.png rename to graphics/event_objects/pics/people/man_3/1.png diff --git a/graphics/map_objects/pics/people/man_3/2.png b/graphics/event_objects/pics/people/man_3/2.png similarity index 100% rename from graphics/map_objects/pics/people/man_3/2.png rename to graphics/event_objects/pics/people/man_3/2.png diff --git a/graphics/map_objects/pics/people/man_3/3.png b/graphics/event_objects/pics/people/man_3/3.png similarity index 100% rename from graphics/map_objects/pics/people/man_3/3.png rename to graphics/event_objects/pics/people/man_3/3.png diff --git a/graphics/map_objects/pics/people/man_3/4.png b/graphics/event_objects/pics/people/man_3/4.png similarity index 100% rename from graphics/map_objects/pics/people/man_3/4.png rename to graphics/event_objects/pics/people/man_3/4.png diff --git a/graphics/map_objects/pics/people/man_3/5.png b/graphics/event_objects/pics/people/man_3/5.png similarity index 100% rename from graphics/map_objects/pics/people/man_3/5.png rename to graphics/event_objects/pics/people/man_3/5.png diff --git a/graphics/map_objects/pics/people/man_3/6.png b/graphics/event_objects/pics/people/man_3/6.png similarity index 100% rename from graphics/map_objects/pics/people/man_3/6.png rename to graphics/event_objects/pics/people/man_3/6.png diff --git a/graphics/map_objects/pics/people/man_3/7.png b/graphics/event_objects/pics/people/man_3/7.png similarity index 100% rename from graphics/map_objects/pics/people/man_3/7.png rename to graphics/event_objects/pics/people/man_3/7.png diff --git a/graphics/map_objects/pics/people/man_3/8.png b/graphics/event_objects/pics/people/man_3/8.png similarity index 100% rename from graphics/map_objects/pics/people/man_3/8.png rename to graphics/event_objects/pics/people/man_3/8.png diff --git a/graphics/map_objects/pics/people/man_4/0.png b/graphics/event_objects/pics/people/man_4/0.png similarity index 100% rename from graphics/map_objects/pics/people/man_4/0.png rename to graphics/event_objects/pics/people/man_4/0.png diff --git a/graphics/map_objects/pics/people/man_4/1.png b/graphics/event_objects/pics/people/man_4/1.png similarity index 100% rename from graphics/map_objects/pics/people/man_4/1.png rename to graphics/event_objects/pics/people/man_4/1.png diff --git a/graphics/map_objects/pics/people/man_4/2.png b/graphics/event_objects/pics/people/man_4/2.png similarity index 100% rename from graphics/map_objects/pics/people/man_4/2.png rename to graphics/event_objects/pics/people/man_4/2.png diff --git a/graphics/map_objects/pics/people/man_4/3.png b/graphics/event_objects/pics/people/man_4/3.png similarity index 100% rename from graphics/map_objects/pics/people/man_4/3.png rename to graphics/event_objects/pics/people/man_4/3.png diff --git a/graphics/map_objects/pics/people/man_4/4.png b/graphics/event_objects/pics/people/man_4/4.png similarity index 100% rename from graphics/map_objects/pics/people/man_4/4.png rename to graphics/event_objects/pics/people/man_4/4.png diff --git a/graphics/map_objects/pics/people/man_4/5.png b/graphics/event_objects/pics/people/man_4/5.png similarity index 100% rename from graphics/map_objects/pics/people/man_4/5.png rename to graphics/event_objects/pics/people/man_4/5.png diff --git a/graphics/map_objects/pics/people/man_4/6.png b/graphics/event_objects/pics/people/man_4/6.png similarity index 100% rename from graphics/map_objects/pics/people/man_4/6.png rename to graphics/event_objects/pics/people/man_4/6.png diff --git a/graphics/map_objects/pics/people/man_4/7.png b/graphics/event_objects/pics/people/man_4/7.png similarity index 100% rename from graphics/map_objects/pics/people/man_4/7.png rename to graphics/event_objects/pics/people/man_4/7.png diff --git a/graphics/map_objects/pics/people/man_4/8.png b/graphics/event_objects/pics/people/man_4/8.png similarity index 100% rename from graphics/map_objects/pics/people/man_4/8.png rename to graphics/event_objects/pics/people/man_4/8.png diff --git a/graphics/map_objects/pics/people/man_5/0.png b/graphics/event_objects/pics/people/man_5/0.png similarity index 100% rename from graphics/map_objects/pics/people/man_5/0.png rename to graphics/event_objects/pics/people/man_5/0.png diff --git a/graphics/map_objects/pics/people/man_5/1.png b/graphics/event_objects/pics/people/man_5/1.png similarity index 100% rename from graphics/map_objects/pics/people/man_5/1.png rename to graphics/event_objects/pics/people/man_5/1.png diff --git a/graphics/map_objects/pics/people/man_5/2.png b/graphics/event_objects/pics/people/man_5/2.png similarity index 100% rename from graphics/map_objects/pics/people/man_5/2.png rename to graphics/event_objects/pics/people/man_5/2.png diff --git a/graphics/map_objects/pics/people/man_5/3.png b/graphics/event_objects/pics/people/man_5/3.png similarity index 100% rename from graphics/map_objects/pics/people/man_5/3.png rename to graphics/event_objects/pics/people/man_5/3.png diff --git a/graphics/map_objects/pics/people/man_5/4.png b/graphics/event_objects/pics/people/man_5/4.png similarity index 100% rename from graphics/map_objects/pics/people/man_5/4.png rename to graphics/event_objects/pics/people/man_5/4.png diff --git a/graphics/map_objects/pics/people/man_5/5.png b/graphics/event_objects/pics/people/man_5/5.png similarity index 100% rename from graphics/map_objects/pics/people/man_5/5.png rename to graphics/event_objects/pics/people/man_5/5.png diff --git a/graphics/map_objects/pics/people/man_5/6.png b/graphics/event_objects/pics/people/man_5/6.png similarity index 100% rename from graphics/map_objects/pics/people/man_5/6.png rename to graphics/event_objects/pics/people/man_5/6.png diff --git a/graphics/map_objects/pics/people/man_5/7.png b/graphics/event_objects/pics/people/man_5/7.png similarity index 100% rename from graphics/map_objects/pics/people/man_5/7.png rename to graphics/event_objects/pics/people/man_5/7.png diff --git a/graphics/map_objects/pics/people/man_5/8.png b/graphics/event_objects/pics/people/man_5/8.png similarity index 100% rename from graphics/map_objects/pics/people/man_5/8.png rename to graphics/event_objects/pics/people/man_5/8.png diff --git a/graphics/map_objects/pics/people/man_6/0.png b/graphics/event_objects/pics/people/man_6/0.png similarity index 100% rename from graphics/map_objects/pics/people/man_6/0.png rename to graphics/event_objects/pics/people/man_6/0.png diff --git a/graphics/map_objects/pics/people/man_6/1.png b/graphics/event_objects/pics/people/man_6/1.png similarity index 100% rename from graphics/map_objects/pics/people/man_6/1.png rename to graphics/event_objects/pics/people/man_6/1.png diff --git a/graphics/map_objects/pics/people/man_6/2.png b/graphics/event_objects/pics/people/man_6/2.png similarity index 100% rename from graphics/map_objects/pics/people/man_6/2.png rename to graphics/event_objects/pics/people/man_6/2.png diff --git a/graphics/map_objects/pics/people/man_6/3.png b/graphics/event_objects/pics/people/man_6/3.png similarity index 100% rename from graphics/map_objects/pics/people/man_6/3.png rename to graphics/event_objects/pics/people/man_6/3.png diff --git a/graphics/map_objects/pics/people/man_6/4.png b/graphics/event_objects/pics/people/man_6/4.png similarity index 100% rename from graphics/map_objects/pics/people/man_6/4.png rename to graphics/event_objects/pics/people/man_6/4.png diff --git a/graphics/map_objects/pics/people/man_6/5.png b/graphics/event_objects/pics/people/man_6/5.png similarity index 100% rename from graphics/map_objects/pics/people/man_6/5.png rename to graphics/event_objects/pics/people/man_6/5.png diff --git a/graphics/map_objects/pics/people/man_6/6.png b/graphics/event_objects/pics/people/man_6/6.png similarity index 100% rename from graphics/map_objects/pics/people/man_6/6.png rename to graphics/event_objects/pics/people/man_6/6.png diff --git a/graphics/map_objects/pics/people/man_6/7.png b/graphics/event_objects/pics/people/man_6/7.png similarity index 100% rename from graphics/map_objects/pics/people/man_6/7.png rename to graphics/event_objects/pics/people/man_6/7.png diff --git a/graphics/map_objects/pics/people/man_6/8.png b/graphics/event_objects/pics/people/man_6/8.png similarity index 100% rename from graphics/map_objects/pics/people/man_6/8.png rename to graphics/event_objects/pics/people/man_6/8.png diff --git a/graphics/map_objects/pics/people/man_7/0.png b/graphics/event_objects/pics/people/man_7/0.png similarity index 100% rename from graphics/map_objects/pics/people/man_7/0.png rename to graphics/event_objects/pics/people/man_7/0.png diff --git a/graphics/map_objects/pics/people/man_7/1.png b/graphics/event_objects/pics/people/man_7/1.png similarity index 100% rename from graphics/map_objects/pics/people/man_7/1.png rename to graphics/event_objects/pics/people/man_7/1.png diff --git a/graphics/map_objects/pics/people/man_7/2.png b/graphics/event_objects/pics/people/man_7/2.png similarity index 100% rename from graphics/map_objects/pics/people/man_7/2.png rename to graphics/event_objects/pics/people/man_7/2.png diff --git a/graphics/map_objects/pics/people/man_7/3.png b/graphics/event_objects/pics/people/man_7/3.png similarity index 100% rename from graphics/map_objects/pics/people/man_7/3.png rename to graphics/event_objects/pics/people/man_7/3.png diff --git a/graphics/map_objects/pics/people/man_7/4.png b/graphics/event_objects/pics/people/man_7/4.png similarity index 100% rename from graphics/map_objects/pics/people/man_7/4.png rename to graphics/event_objects/pics/people/man_7/4.png diff --git a/graphics/map_objects/pics/people/man_7/5.png b/graphics/event_objects/pics/people/man_7/5.png similarity index 100% rename from graphics/map_objects/pics/people/man_7/5.png rename to graphics/event_objects/pics/people/man_7/5.png diff --git a/graphics/map_objects/pics/people/man_7/6.png b/graphics/event_objects/pics/people/man_7/6.png similarity index 100% rename from graphics/map_objects/pics/people/man_7/6.png rename to graphics/event_objects/pics/people/man_7/6.png diff --git a/graphics/map_objects/pics/people/man_7/7.png b/graphics/event_objects/pics/people/man_7/7.png similarity index 100% rename from graphics/map_objects/pics/people/man_7/7.png rename to graphics/event_objects/pics/people/man_7/7.png diff --git a/graphics/map_objects/pics/people/man_7/8.png b/graphics/event_objects/pics/people/man_7/8.png similarity index 100% rename from graphics/map_objects/pics/people/man_7/8.png rename to graphics/event_objects/pics/people/man_7/8.png diff --git a/graphics/map_objects/pics/people/maniac/0.png b/graphics/event_objects/pics/people/maniac/0.png similarity index 100% rename from graphics/map_objects/pics/people/maniac/0.png rename to graphics/event_objects/pics/people/maniac/0.png diff --git a/graphics/map_objects/pics/people/maniac/1.png b/graphics/event_objects/pics/people/maniac/1.png similarity index 100% rename from graphics/map_objects/pics/people/maniac/1.png rename to graphics/event_objects/pics/people/maniac/1.png diff --git a/graphics/map_objects/pics/people/maniac/2.png b/graphics/event_objects/pics/people/maniac/2.png similarity index 100% rename from graphics/map_objects/pics/people/maniac/2.png rename to graphics/event_objects/pics/people/maniac/2.png diff --git a/graphics/map_objects/pics/people/maniac/3.png b/graphics/event_objects/pics/people/maniac/3.png similarity index 100% rename from graphics/map_objects/pics/people/maniac/3.png rename to graphics/event_objects/pics/people/maniac/3.png diff --git a/graphics/map_objects/pics/people/maniac/4.png b/graphics/event_objects/pics/people/maniac/4.png similarity index 100% rename from graphics/map_objects/pics/people/maniac/4.png rename to graphics/event_objects/pics/people/maniac/4.png diff --git a/graphics/map_objects/pics/people/maniac/5.png b/graphics/event_objects/pics/people/maniac/5.png similarity index 100% rename from graphics/map_objects/pics/people/maniac/5.png rename to graphics/event_objects/pics/people/maniac/5.png diff --git a/graphics/map_objects/pics/people/maniac/6.png b/graphics/event_objects/pics/people/maniac/6.png similarity index 100% rename from graphics/map_objects/pics/people/maniac/6.png rename to graphics/event_objects/pics/people/maniac/6.png diff --git a/graphics/map_objects/pics/people/maniac/7.png b/graphics/event_objects/pics/people/maniac/7.png similarity index 100% rename from graphics/map_objects/pics/people/maniac/7.png rename to graphics/event_objects/pics/people/maniac/7.png diff --git a/graphics/map_objects/pics/people/maniac/8.png b/graphics/event_objects/pics/people/maniac/8.png similarity index 100% rename from graphics/map_objects/pics/people/maniac/8.png rename to graphics/event_objects/pics/people/maniac/8.png diff --git a/graphics/map_objects/pics/people/mart_employee/0.png b/graphics/event_objects/pics/people/mart_employee/0.png similarity index 100% rename from graphics/map_objects/pics/people/mart_employee/0.png rename to graphics/event_objects/pics/people/mart_employee/0.png diff --git a/graphics/map_objects/pics/people/mart_employee/1.png b/graphics/event_objects/pics/people/mart_employee/1.png similarity index 100% rename from graphics/map_objects/pics/people/mart_employee/1.png rename to graphics/event_objects/pics/people/mart_employee/1.png diff --git a/graphics/map_objects/pics/people/mart_employee/2.png b/graphics/event_objects/pics/people/mart_employee/2.png similarity index 100% rename from graphics/map_objects/pics/people/mart_employee/2.png rename to graphics/event_objects/pics/people/mart_employee/2.png diff --git a/graphics/map_objects/pics/people/mart_employee/3.png b/graphics/event_objects/pics/people/mart_employee/3.png similarity index 100% rename from graphics/map_objects/pics/people/mart_employee/3.png rename to graphics/event_objects/pics/people/mart_employee/3.png diff --git a/graphics/map_objects/pics/people/mart_employee/4.png b/graphics/event_objects/pics/people/mart_employee/4.png similarity index 100% rename from graphics/map_objects/pics/people/mart_employee/4.png rename to graphics/event_objects/pics/people/mart_employee/4.png diff --git a/graphics/map_objects/pics/people/mart_employee/5.png b/graphics/event_objects/pics/people/mart_employee/5.png similarity index 100% rename from graphics/map_objects/pics/people/mart_employee/5.png rename to graphics/event_objects/pics/people/mart_employee/5.png diff --git a/graphics/map_objects/pics/people/mart_employee/6.png b/graphics/event_objects/pics/people/mart_employee/6.png similarity index 100% rename from graphics/map_objects/pics/people/mart_employee/6.png rename to graphics/event_objects/pics/people/mart_employee/6.png diff --git a/graphics/map_objects/pics/people/mart_employee/7.png b/graphics/event_objects/pics/people/mart_employee/7.png similarity index 100% rename from graphics/map_objects/pics/people/mart_employee/7.png rename to graphics/event_objects/pics/people/mart_employee/7.png diff --git a/graphics/map_objects/pics/people/mart_employee/8.png b/graphics/event_objects/pics/people/mart_employee/8.png similarity index 100% rename from graphics/map_objects/pics/people/mart_employee/8.png rename to graphics/event_objects/pics/people/mart_employee/8.png diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/0.png b/graphics/event_objects/pics/people/mauville_old_man_1/0.png similarity index 100% rename from graphics/map_objects/pics/people/mauville_old_man_1/0.png rename to graphics/event_objects/pics/people/mauville_old_man_1/0.png diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/1.png b/graphics/event_objects/pics/people/mauville_old_man_1/1.png similarity index 100% rename from graphics/map_objects/pics/people/mauville_old_man_1/1.png rename to graphics/event_objects/pics/people/mauville_old_man_1/1.png diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/2.png b/graphics/event_objects/pics/people/mauville_old_man_1/2.png similarity index 100% rename from graphics/map_objects/pics/people/mauville_old_man_1/2.png rename to graphics/event_objects/pics/people/mauville_old_man_1/2.png diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/3.png b/graphics/event_objects/pics/people/mauville_old_man_1/3.png similarity index 100% rename from graphics/map_objects/pics/people/mauville_old_man_1/3.png rename to graphics/event_objects/pics/people/mauville_old_man_1/3.png diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/4.png b/graphics/event_objects/pics/people/mauville_old_man_1/4.png similarity index 100% rename from graphics/map_objects/pics/people/mauville_old_man_1/4.png rename to graphics/event_objects/pics/people/mauville_old_man_1/4.png diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/5.png b/graphics/event_objects/pics/people/mauville_old_man_1/5.png similarity index 100% rename from graphics/map_objects/pics/people/mauville_old_man_1/5.png rename to graphics/event_objects/pics/people/mauville_old_man_1/5.png diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/6.png b/graphics/event_objects/pics/people/mauville_old_man_1/6.png similarity index 100% rename from graphics/map_objects/pics/people/mauville_old_man_1/6.png rename to graphics/event_objects/pics/people/mauville_old_man_1/6.png diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/7.png b/graphics/event_objects/pics/people/mauville_old_man_1/7.png similarity index 100% rename from graphics/map_objects/pics/people/mauville_old_man_1/7.png rename to graphics/event_objects/pics/people/mauville_old_man_1/7.png diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/8.png b/graphics/event_objects/pics/people/mauville_old_man_1/8.png similarity index 100% rename from graphics/map_objects/pics/people/mauville_old_man_1/8.png rename to graphics/event_objects/pics/people/mauville_old_man_1/8.png diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/0.png b/graphics/event_objects/pics/people/mauville_old_man_2/0.png similarity index 100% rename from graphics/map_objects/pics/people/mauville_old_man_2/0.png rename to graphics/event_objects/pics/people/mauville_old_man_2/0.png diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/1.png b/graphics/event_objects/pics/people/mauville_old_man_2/1.png similarity index 100% rename from graphics/map_objects/pics/people/mauville_old_man_2/1.png rename to graphics/event_objects/pics/people/mauville_old_man_2/1.png diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/2.png b/graphics/event_objects/pics/people/mauville_old_man_2/2.png similarity index 100% rename from graphics/map_objects/pics/people/mauville_old_man_2/2.png rename to graphics/event_objects/pics/people/mauville_old_man_2/2.png diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/3.png b/graphics/event_objects/pics/people/mauville_old_man_2/3.png similarity index 100% rename from graphics/map_objects/pics/people/mauville_old_man_2/3.png rename to graphics/event_objects/pics/people/mauville_old_man_2/3.png diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/4.png b/graphics/event_objects/pics/people/mauville_old_man_2/4.png similarity index 100% rename from graphics/map_objects/pics/people/mauville_old_man_2/4.png rename to graphics/event_objects/pics/people/mauville_old_man_2/4.png diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/5.png b/graphics/event_objects/pics/people/mauville_old_man_2/5.png similarity index 100% rename from graphics/map_objects/pics/people/mauville_old_man_2/5.png rename to graphics/event_objects/pics/people/mauville_old_man_2/5.png diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/6.png b/graphics/event_objects/pics/people/mauville_old_man_2/6.png similarity index 100% rename from graphics/map_objects/pics/people/mauville_old_man_2/6.png rename to graphics/event_objects/pics/people/mauville_old_man_2/6.png diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/7.png b/graphics/event_objects/pics/people/mauville_old_man_2/7.png similarity index 100% rename from graphics/map_objects/pics/people/mauville_old_man_2/7.png rename to graphics/event_objects/pics/people/mauville_old_man_2/7.png diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/8.png b/graphics/event_objects/pics/people/mauville_old_man_2/8.png similarity index 100% rename from graphics/map_objects/pics/people/mauville_old_man_2/8.png rename to graphics/event_objects/pics/people/mauville_old_man_2/8.png diff --git a/graphics/map_objects/pics/people/maxie/0.png b/graphics/event_objects/pics/people/maxie/0.png similarity index 100% rename from graphics/map_objects/pics/people/maxie/0.png rename to graphics/event_objects/pics/people/maxie/0.png diff --git a/graphics/map_objects/pics/people/maxie/1.png b/graphics/event_objects/pics/people/maxie/1.png similarity index 100% rename from graphics/map_objects/pics/people/maxie/1.png rename to graphics/event_objects/pics/people/maxie/1.png diff --git a/graphics/map_objects/pics/people/maxie/2.png b/graphics/event_objects/pics/people/maxie/2.png similarity index 100% rename from graphics/map_objects/pics/people/maxie/2.png rename to graphics/event_objects/pics/people/maxie/2.png diff --git a/graphics/map_objects/pics/people/maxie/3.png b/graphics/event_objects/pics/people/maxie/3.png similarity index 100% rename from graphics/map_objects/pics/people/maxie/3.png rename to graphics/event_objects/pics/people/maxie/3.png diff --git a/graphics/map_objects/pics/people/maxie/4.png b/graphics/event_objects/pics/people/maxie/4.png similarity index 100% rename from graphics/map_objects/pics/people/maxie/4.png rename to graphics/event_objects/pics/people/maxie/4.png diff --git a/graphics/map_objects/pics/people/maxie/5.png b/graphics/event_objects/pics/people/maxie/5.png similarity index 100% rename from graphics/map_objects/pics/people/maxie/5.png rename to graphics/event_objects/pics/people/maxie/5.png diff --git a/graphics/map_objects/pics/people/maxie/6.png b/graphics/event_objects/pics/people/maxie/6.png similarity index 100% rename from graphics/map_objects/pics/people/maxie/6.png rename to graphics/event_objects/pics/people/maxie/6.png diff --git a/graphics/map_objects/pics/people/maxie/7.png b/graphics/event_objects/pics/people/maxie/7.png similarity index 100% rename from graphics/map_objects/pics/people/maxie/7.png rename to graphics/event_objects/pics/people/maxie/7.png diff --git a/graphics/map_objects/pics/people/maxie/8.png b/graphics/event_objects/pics/people/maxie/8.png similarity index 100% rename from graphics/map_objects/pics/people/maxie/8.png rename to graphics/event_objects/pics/people/maxie/8.png diff --git a/graphics/map_objects/pics/people/may/acro_bike/00.png b/graphics/event_objects/pics/people/may/acro_bike/00.png similarity index 100% rename from graphics/map_objects/pics/people/may/acro_bike/00.png rename to graphics/event_objects/pics/people/may/acro_bike/00.png diff --git a/graphics/map_objects/pics/people/may/acro_bike/01.png b/graphics/event_objects/pics/people/may/acro_bike/01.png similarity index 100% rename from graphics/map_objects/pics/people/may/acro_bike/01.png rename to graphics/event_objects/pics/people/may/acro_bike/01.png diff --git a/graphics/map_objects/pics/people/may/acro_bike/02.png b/graphics/event_objects/pics/people/may/acro_bike/02.png similarity index 100% rename from graphics/map_objects/pics/people/may/acro_bike/02.png rename to graphics/event_objects/pics/people/may/acro_bike/02.png diff --git a/graphics/map_objects/pics/people/may/acro_bike/03.png b/graphics/event_objects/pics/people/may/acro_bike/03.png similarity index 100% rename from graphics/map_objects/pics/people/may/acro_bike/03.png rename to graphics/event_objects/pics/people/may/acro_bike/03.png diff --git a/graphics/map_objects/pics/people/may/acro_bike/04.png b/graphics/event_objects/pics/people/may/acro_bike/04.png similarity index 100% rename from graphics/map_objects/pics/people/may/acro_bike/04.png rename to graphics/event_objects/pics/people/may/acro_bike/04.png diff --git a/graphics/map_objects/pics/people/may/acro_bike/05.png b/graphics/event_objects/pics/people/may/acro_bike/05.png similarity index 100% rename from graphics/map_objects/pics/people/may/acro_bike/05.png rename to graphics/event_objects/pics/people/may/acro_bike/05.png diff --git a/graphics/map_objects/pics/people/may/acro_bike/06.png b/graphics/event_objects/pics/people/may/acro_bike/06.png similarity index 100% rename from graphics/map_objects/pics/people/may/acro_bike/06.png rename to graphics/event_objects/pics/people/may/acro_bike/06.png diff --git a/graphics/map_objects/pics/people/may/acro_bike/07.png b/graphics/event_objects/pics/people/may/acro_bike/07.png similarity index 100% rename from graphics/map_objects/pics/people/may/acro_bike/07.png rename to graphics/event_objects/pics/people/may/acro_bike/07.png diff --git a/graphics/map_objects/pics/people/may/acro_bike/08.png b/graphics/event_objects/pics/people/may/acro_bike/08.png similarity index 100% rename from graphics/map_objects/pics/people/may/acro_bike/08.png rename to graphics/event_objects/pics/people/may/acro_bike/08.png diff --git a/graphics/map_objects/pics/people/may/acro_bike/09.png b/graphics/event_objects/pics/people/may/acro_bike/09.png similarity index 100% rename from graphics/map_objects/pics/people/may/acro_bike/09.png rename to graphics/event_objects/pics/people/may/acro_bike/09.png diff --git a/graphics/map_objects/pics/people/may/acro_bike/10.png b/graphics/event_objects/pics/people/may/acro_bike/10.png similarity index 100% rename from graphics/map_objects/pics/people/may/acro_bike/10.png rename to graphics/event_objects/pics/people/may/acro_bike/10.png diff --git a/graphics/map_objects/pics/people/may/acro_bike/11.png b/graphics/event_objects/pics/people/may/acro_bike/11.png similarity index 100% rename from graphics/map_objects/pics/people/may/acro_bike/11.png rename to graphics/event_objects/pics/people/may/acro_bike/11.png diff --git a/graphics/map_objects/pics/people/may/acro_bike/12.png b/graphics/event_objects/pics/people/may/acro_bike/12.png similarity index 100% rename from graphics/map_objects/pics/people/may/acro_bike/12.png rename to graphics/event_objects/pics/people/may/acro_bike/12.png diff --git a/graphics/map_objects/pics/people/may/acro_bike/13.png b/graphics/event_objects/pics/people/may/acro_bike/13.png similarity index 100% rename from graphics/map_objects/pics/people/may/acro_bike/13.png rename to graphics/event_objects/pics/people/may/acro_bike/13.png diff --git a/graphics/map_objects/pics/people/may/acro_bike/14.png b/graphics/event_objects/pics/people/may/acro_bike/14.png similarity index 100% rename from graphics/map_objects/pics/people/may/acro_bike/14.png rename to graphics/event_objects/pics/people/may/acro_bike/14.png diff --git a/graphics/map_objects/pics/people/may/acro_bike/15.png b/graphics/event_objects/pics/people/may/acro_bike/15.png similarity index 100% rename from graphics/map_objects/pics/people/may/acro_bike/15.png rename to graphics/event_objects/pics/people/may/acro_bike/15.png diff --git a/graphics/map_objects/pics/people/may/acro_bike/16.png b/graphics/event_objects/pics/people/may/acro_bike/16.png similarity index 100% rename from graphics/map_objects/pics/people/may/acro_bike/16.png rename to graphics/event_objects/pics/people/may/acro_bike/16.png diff --git a/graphics/map_objects/pics/people/may/acro_bike/17.png b/graphics/event_objects/pics/people/may/acro_bike/17.png similarity index 100% rename from graphics/map_objects/pics/people/may/acro_bike/17.png rename to graphics/event_objects/pics/people/may/acro_bike/17.png diff --git a/graphics/map_objects/pics/people/may/acro_bike/18.png b/graphics/event_objects/pics/people/may/acro_bike/18.png similarity index 100% rename from graphics/map_objects/pics/people/may/acro_bike/18.png rename to graphics/event_objects/pics/people/may/acro_bike/18.png diff --git a/graphics/map_objects/pics/people/may/acro_bike/19.png b/graphics/event_objects/pics/people/may/acro_bike/19.png similarity index 100% rename from graphics/map_objects/pics/people/may/acro_bike/19.png rename to graphics/event_objects/pics/people/may/acro_bike/19.png diff --git a/graphics/map_objects/pics/people/may/acro_bike/20.png b/graphics/event_objects/pics/people/may/acro_bike/20.png similarity index 100% rename from graphics/map_objects/pics/people/may/acro_bike/20.png rename to graphics/event_objects/pics/people/may/acro_bike/20.png diff --git a/graphics/map_objects/pics/people/may/acro_bike/21.png b/graphics/event_objects/pics/people/may/acro_bike/21.png similarity index 100% rename from graphics/map_objects/pics/people/may/acro_bike/21.png rename to graphics/event_objects/pics/people/may/acro_bike/21.png diff --git a/graphics/map_objects/pics/people/may/acro_bike/22.png b/graphics/event_objects/pics/people/may/acro_bike/22.png similarity index 100% rename from graphics/map_objects/pics/people/may/acro_bike/22.png rename to graphics/event_objects/pics/people/may/acro_bike/22.png diff --git a/graphics/map_objects/pics/people/may/acro_bike/23.png b/graphics/event_objects/pics/people/may/acro_bike/23.png similarity index 100% rename from graphics/map_objects/pics/people/may/acro_bike/23.png rename to graphics/event_objects/pics/people/may/acro_bike/23.png diff --git a/graphics/map_objects/pics/people/may/acro_bike/24.png b/graphics/event_objects/pics/people/may/acro_bike/24.png similarity index 100% rename from graphics/map_objects/pics/people/may/acro_bike/24.png rename to graphics/event_objects/pics/people/may/acro_bike/24.png diff --git a/graphics/map_objects/pics/people/may/acro_bike/25.png b/graphics/event_objects/pics/people/may/acro_bike/25.png similarity index 100% rename from graphics/map_objects/pics/people/may/acro_bike/25.png rename to graphics/event_objects/pics/people/may/acro_bike/25.png diff --git a/graphics/map_objects/pics/people/may/acro_bike/26.png b/graphics/event_objects/pics/people/may/acro_bike/26.png similarity index 100% rename from graphics/map_objects/pics/people/may/acro_bike/26.png rename to graphics/event_objects/pics/people/may/acro_bike/26.png diff --git a/graphics/map_objects/pics/people/may/decorating.png b/graphics/event_objects/pics/people/may/decorating.png similarity index 100% rename from graphics/map_objects/pics/people/may/decorating.png rename to graphics/event_objects/pics/people/may/decorating.png diff --git a/graphics/map_objects/pics/people/may/field_move/0.png b/graphics/event_objects/pics/people/may/field_move/0.png similarity index 100% rename from graphics/map_objects/pics/people/may/field_move/0.png rename to graphics/event_objects/pics/people/may/field_move/0.png diff --git a/graphics/map_objects/pics/people/may/field_move/1.png b/graphics/event_objects/pics/people/may/field_move/1.png similarity index 100% rename from graphics/map_objects/pics/people/may/field_move/1.png rename to graphics/event_objects/pics/people/may/field_move/1.png diff --git a/graphics/map_objects/pics/people/may/field_move/2.png b/graphics/event_objects/pics/people/may/field_move/2.png similarity index 100% rename from graphics/map_objects/pics/people/may/field_move/2.png rename to graphics/event_objects/pics/people/may/field_move/2.png diff --git a/graphics/map_objects/pics/people/may/field_move/3.png b/graphics/event_objects/pics/people/may/field_move/3.png similarity index 100% rename from graphics/map_objects/pics/people/may/field_move/3.png rename to graphics/event_objects/pics/people/may/field_move/3.png diff --git a/graphics/map_objects/pics/people/may/field_move/4.png b/graphics/event_objects/pics/people/may/field_move/4.png similarity index 100% rename from graphics/map_objects/pics/people/may/field_move/4.png rename to graphics/event_objects/pics/people/may/field_move/4.png diff --git a/graphics/map_objects/pics/people/may/fishing/00.png b/graphics/event_objects/pics/people/may/fishing/00.png similarity index 100% rename from graphics/map_objects/pics/people/may/fishing/00.png rename to graphics/event_objects/pics/people/may/fishing/00.png diff --git a/graphics/map_objects/pics/people/may/fishing/01.png b/graphics/event_objects/pics/people/may/fishing/01.png similarity index 100% rename from graphics/map_objects/pics/people/may/fishing/01.png rename to graphics/event_objects/pics/people/may/fishing/01.png diff --git a/graphics/map_objects/pics/people/may/fishing/02.png b/graphics/event_objects/pics/people/may/fishing/02.png similarity index 100% rename from graphics/map_objects/pics/people/may/fishing/02.png rename to graphics/event_objects/pics/people/may/fishing/02.png diff --git a/graphics/map_objects/pics/people/may/fishing/03.png b/graphics/event_objects/pics/people/may/fishing/03.png similarity index 100% rename from graphics/map_objects/pics/people/may/fishing/03.png rename to graphics/event_objects/pics/people/may/fishing/03.png diff --git a/graphics/map_objects/pics/people/may/fishing/04.png b/graphics/event_objects/pics/people/may/fishing/04.png similarity index 100% rename from graphics/map_objects/pics/people/may/fishing/04.png rename to graphics/event_objects/pics/people/may/fishing/04.png diff --git a/graphics/map_objects/pics/people/may/fishing/05.png b/graphics/event_objects/pics/people/may/fishing/05.png similarity index 100% rename from graphics/map_objects/pics/people/may/fishing/05.png rename to graphics/event_objects/pics/people/may/fishing/05.png diff --git a/graphics/map_objects/pics/people/may/fishing/06.png b/graphics/event_objects/pics/people/may/fishing/06.png similarity index 100% rename from graphics/map_objects/pics/people/may/fishing/06.png rename to graphics/event_objects/pics/people/may/fishing/06.png diff --git a/graphics/map_objects/pics/people/may/fishing/07.png b/graphics/event_objects/pics/people/may/fishing/07.png similarity index 100% rename from graphics/map_objects/pics/people/may/fishing/07.png rename to graphics/event_objects/pics/people/may/fishing/07.png diff --git a/graphics/map_objects/pics/people/may/fishing/08.png b/graphics/event_objects/pics/people/may/fishing/08.png similarity index 100% rename from graphics/map_objects/pics/people/may/fishing/08.png rename to graphics/event_objects/pics/people/may/fishing/08.png diff --git a/graphics/map_objects/pics/people/may/fishing/09.png b/graphics/event_objects/pics/people/may/fishing/09.png similarity index 100% rename from graphics/map_objects/pics/people/may/fishing/09.png rename to graphics/event_objects/pics/people/may/fishing/09.png diff --git a/graphics/map_objects/pics/people/may/fishing/10.png b/graphics/event_objects/pics/people/may/fishing/10.png similarity index 100% rename from graphics/map_objects/pics/people/may/fishing/10.png rename to graphics/event_objects/pics/people/may/fishing/10.png diff --git a/graphics/map_objects/pics/people/may/fishing/11.png b/graphics/event_objects/pics/people/may/fishing/11.png similarity index 100% rename from graphics/map_objects/pics/people/may/fishing/11.png rename to graphics/event_objects/pics/people/may/fishing/11.png diff --git a/graphics/map_objects/pics/people/may/mach_bike/0.png b/graphics/event_objects/pics/people/may/mach_bike/0.png similarity index 100% rename from graphics/map_objects/pics/people/may/mach_bike/0.png rename to graphics/event_objects/pics/people/may/mach_bike/0.png diff --git a/graphics/map_objects/pics/people/may/mach_bike/1.png b/graphics/event_objects/pics/people/may/mach_bike/1.png similarity index 100% rename from graphics/map_objects/pics/people/may/mach_bike/1.png rename to graphics/event_objects/pics/people/may/mach_bike/1.png diff --git a/graphics/map_objects/pics/people/may/mach_bike/2.png b/graphics/event_objects/pics/people/may/mach_bike/2.png similarity index 100% rename from graphics/map_objects/pics/people/may/mach_bike/2.png rename to graphics/event_objects/pics/people/may/mach_bike/2.png diff --git a/graphics/map_objects/pics/people/may/mach_bike/3.png b/graphics/event_objects/pics/people/may/mach_bike/3.png similarity index 100% rename from graphics/map_objects/pics/people/may/mach_bike/3.png rename to graphics/event_objects/pics/people/may/mach_bike/3.png diff --git a/graphics/map_objects/pics/people/may/mach_bike/4.png b/graphics/event_objects/pics/people/may/mach_bike/4.png similarity index 100% rename from graphics/map_objects/pics/people/may/mach_bike/4.png rename to graphics/event_objects/pics/people/may/mach_bike/4.png diff --git a/graphics/map_objects/pics/people/may/mach_bike/5.png b/graphics/event_objects/pics/people/may/mach_bike/5.png similarity index 100% rename from graphics/map_objects/pics/people/may/mach_bike/5.png rename to graphics/event_objects/pics/people/may/mach_bike/5.png diff --git a/graphics/map_objects/pics/people/may/mach_bike/6.png b/graphics/event_objects/pics/people/may/mach_bike/6.png similarity index 100% rename from graphics/map_objects/pics/people/may/mach_bike/6.png rename to graphics/event_objects/pics/people/may/mach_bike/6.png diff --git a/graphics/map_objects/pics/people/may/mach_bike/7.png b/graphics/event_objects/pics/people/may/mach_bike/7.png similarity index 100% rename from graphics/map_objects/pics/people/may/mach_bike/7.png rename to graphics/event_objects/pics/people/may/mach_bike/7.png diff --git a/graphics/map_objects/pics/people/may/mach_bike/8.png b/graphics/event_objects/pics/people/may/mach_bike/8.png similarity index 100% rename from graphics/map_objects/pics/people/may/mach_bike/8.png rename to graphics/event_objects/pics/people/may/mach_bike/8.png diff --git a/graphics/map_objects/pics/people/may/normal/00.png b/graphics/event_objects/pics/people/may/normal/00.png similarity index 100% rename from graphics/map_objects/pics/people/may/normal/00.png rename to graphics/event_objects/pics/people/may/normal/00.png diff --git a/graphics/map_objects/pics/people/may/normal/01.png b/graphics/event_objects/pics/people/may/normal/01.png similarity index 100% rename from graphics/map_objects/pics/people/may/normal/01.png rename to graphics/event_objects/pics/people/may/normal/01.png diff --git a/graphics/map_objects/pics/people/may/normal/02.png b/graphics/event_objects/pics/people/may/normal/02.png similarity index 100% rename from graphics/map_objects/pics/people/may/normal/02.png rename to graphics/event_objects/pics/people/may/normal/02.png diff --git a/graphics/map_objects/pics/people/may/normal/03.png b/graphics/event_objects/pics/people/may/normal/03.png similarity index 100% rename from graphics/map_objects/pics/people/may/normal/03.png rename to graphics/event_objects/pics/people/may/normal/03.png diff --git a/graphics/map_objects/pics/people/may/normal/04.png b/graphics/event_objects/pics/people/may/normal/04.png similarity index 100% rename from graphics/map_objects/pics/people/may/normal/04.png rename to graphics/event_objects/pics/people/may/normal/04.png diff --git a/graphics/map_objects/pics/people/may/normal/05.png b/graphics/event_objects/pics/people/may/normal/05.png similarity index 100% rename from graphics/map_objects/pics/people/may/normal/05.png rename to graphics/event_objects/pics/people/may/normal/05.png diff --git a/graphics/map_objects/pics/people/may/normal/06.png b/graphics/event_objects/pics/people/may/normal/06.png similarity index 100% rename from graphics/map_objects/pics/people/may/normal/06.png rename to graphics/event_objects/pics/people/may/normal/06.png diff --git a/graphics/map_objects/pics/people/may/normal/07.png b/graphics/event_objects/pics/people/may/normal/07.png similarity index 100% rename from graphics/map_objects/pics/people/may/normal/07.png rename to graphics/event_objects/pics/people/may/normal/07.png diff --git a/graphics/map_objects/pics/people/may/normal/08.png b/graphics/event_objects/pics/people/may/normal/08.png similarity index 100% rename from graphics/map_objects/pics/people/may/normal/08.png rename to graphics/event_objects/pics/people/may/normal/08.png diff --git a/graphics/map_objects/pics/people/may/normal/09.png b/graphics/event_objects/pics/people/may/normal/09.png similarity index 100% rename from graphics/map_objects/pics/people/may/normal/09.png rename to graphics/event_objects/pics/people/may/normal/09.png diff --git a/graphics/map_objects/pics/people/may/normal/10.png b/graphics/event_objects/pics/people/may/normal/10.png similarity index 100% rename from graphics/map_objects/pics/people/may/normal/10.png rename to graphics/event_objects/pics/people/may/normal/10.png diff --git a/graphics/map_objects/pics/people/may/normal/11.png b/graphics/event_objects/pics/people/may/normal/11.png similarity index 100% rename from graphics/map_objects/pics/people/may/normal/11.png rename to graphics/event_objects/pics/people/may/normal/11.png diff --git a/graphics/map_objects/pics/people/may/normal/12.png b/graphics/event_objects/pics/people/may/normal/12.png similarity index 100% rename from graphics/map_objects/pics/people/may/normal/12.png rename to graphics/event_objects/pics/people/may/normal/12.png diff --git a/graphics/map_objects/pics/people/may/normal/13.png b/graphics/event_objects/pics/people/may/normal/13.png similarity index 100% rename from graphics/map_objects/pics/people/may/normal/13.png rename to graphics/event_objects/pics/people/may/normal/13.png diff --git a/graphics/map_objects/pics/people/may/normal/14.png b/graphics/event_objects/pics/people/may/normal/14.png similarity index 100% rename from graphics/map_objects/pics/people/may/normal/14.png rename to graphics/event_objects/pics/people/may/normal/14.png diff --git a/graphics/map_objects/pics/people/may/normal/15.png b/graphics/event_objects/pics/people/may/normal/15.png similarity index 100% rename from graphics/map_objects/pics/people/may/normal/15.png rename to graphics/event_objects/pics/people/may/normal/15.png diff --git a/graphics/map_objects/pics/people/may/normal/16.png b/graphics/event_objects/pics/people/may/normal/16.png similarity index 100% rename from graphics/map_objects/pics/people/may/normal/16.png rename to graphics/event_objects/pics/people/may/normal/16.png diff --git a/graphics/map_objects/pics/people/may/normal/17.png b/graphics/event_objects/pics/people/may/normal/17.png similarity index 100% rename from graphics/map_objects/pics/people/may/normal/17.png rename to graphics/event_objects/pics/people/may/normal/17.png diff --git a/graphics/map_objects/pics/people/may/surfing/0.png b/graphics/event_objects/pics/people/may/surfing/0.png similarity index 100% rename from graphics/map_objects/pics/people/may/surfing/0.png rename to graphics/event_objects/pics/people/may/surfing/0.png diff --git a/graphics/map_objects/pics/people/may/surfing/1.png b/graphics/event_objects/pics/people/may/surfing/1.png similarity index 100% rename from graphics/map_objects/pics/people/may/surfing/1.png rename to graphics/event_objects/pics/people/may/surfing/1.png diff --git a/graphics/map_objects/pics/people/may/surfing/2.png b/graphics/event_objects/pics/people/may/surfing/2.png similarity index 100% rename from graphics/map_objects/pics/people/may/surfing/2.png rename to graphics/event_objects/pics/people/may/surfing/2.png diff --git a/graphics/map_objects/pics/people/may/surfing/3.png b/graphics/event_objects/pics/people/may/surfing/3.png similarity index 100% rename from graphics/map_objects/pics/people/may/surfing/3.png rename to graphics/event_objects/pics/people/may/surfing/3.png diff --git a/graphics/map_objects/pics/people/may/surfing/4.png b/graphics/event_objects/pics/people/may/surfing/4.png similarity index 100% rename from graphics/map_objects/pics/people/may/surfing/4.png rename to graphics/event_objects/pics/people/may/surfing/4.png diff --git a/graphics/map_objects/pics/people/may/surfing/5.png b/graphics/event_objects/pics/people/may/surfing/5.png similarity index 100% rename from graphics/map_objects/pics/people/may/surfing/5.png rename to graphics/event_objects/pics/people/may/surfing/5.png diff --git a/graphics/map_objects/pics/people/may/underwater/0.png b/graphics/event_objects/pics/people/may/underwater/0.png similarity index 100% rename from graphics/map_objects/pics/people/may/underwater/0.png rename to graphics/event_objects/pics/people/may/underwater/0.png diff --git a/graphics/map_objects/pics/people/may/underwater/1.png b/graphics/event_objects/pics/people/may/underwater/1.png similarity index 100% rename from graphics/map_objects/pics/people/may/underwater/1.png rename to graphics/event_objects/pics/people/may/underwater/1.png diff --git a/graphics/map_objects/pics/people/may/underwater/2.png b/graphics/event_objects/pics/people/may/underwater/2.png similarity index 100% rename from graphics/map_objects/pics/people/may/underwater/2.png rename to graphics/event_objects/pics/people/may/underwater/2.png diff --git a/graphics/map_objects/pics/people/may/underwater/3.png b/graphics/event_objects/pics/people/may/underwater/3.png similarity index 100% rename from graphics/map_objects/pics/people/may/underwater/3.png rename to graphics/event_objects/pics/people/may/underwater/3.png diff --git a/graphics/map_objects/pics/people/may/watering/0.png b/graphics/event_objects/pics/people/may/watering/0.png similarity index 100% rename from graphics/map_objects/pics/people/may/watering/0.png rename to graphics/event_objects/pics/people/may/watering/0.png diff --git a/graphics/map_objects/pics/people/may/watering/1.png b/graphics/event_objects/pics/people/may/watering/1.png similarity index 100% rename from graphics/map_objects/pics/people/may/watering/1.png rename to graphics/event_objects/pics/people/may/watering/1.png diff --git a/graphics/map_objects/pics/people/may/watering/2.png b/graphics/event_objects/pics/people/may/watering/2.png similarity index 100% rename from graphics/map_objects/pics/people/may/watering/2.png rename to graphics/event_objects/pics/people/may/watering/2.png diff --git a/graphics/map_objects/pics/people/may/watering/3.png b/graphics/event_objects/pics/people/may/watering/3.png similarity index 100% rename from graphics/map_objects/pics/people/may/watering/3.png rename to graphics/event_objects/pics/people/may/watering/3.png diff --git a/graphics/map_objects/pics/people/may/watering/4.png b/graphics/event_objects/pics/people/may/watering/4.png similarity index 100% rename from graphics/map_objects/pics/people/may/watering/4.png rename to graphics/event_objects/pics/people/may/watering/4.png diff --git a/graphics/map_objects/pics/people/may/watering/5.png b/graphics/event_objects/pics/people/may/watering/5.png similarity index 100% rename from graphics/map_objects/pics/people/may/watering/5.png rename to graphics/event_objects/pics/people/may/watering/5.png diff --git a/graphics/map_objects/pics/people/mom/0.png b/graphics/event_objects/pics/people/mom/0.png similarity index 100% rename from graphics/map_objects/pics/people/mom/0.png rename to graphics/event_objects/pics/people/mom/0.png diff --git a/graphics/map_objects/pics/people/mom/1.png b/graphics/event_objects/pics/people/mom/1.png similarity index 100% rename from graphics/map_objects/pics/people/mom/1.png rename to graphics/event_objects/pics/people/mom/1.png diff --git a/graphics/map_objects/pics/people/mom/2.png b/graphics/event_objects/pics/people/mom/2.png similarity index 100% rename from graphics/map_objects/pics/people/mom/2.png rename to graphics/event_objects/pics/people/mom/2.png diff --git a/graphics/map_objects/pics/people/mom/3.png b/graphics/event_objects/pics/people/mom/3.png similarity index 100% rename from graphics/map_objects/pics/people/mom/3.png rename to graphics/event_objects/pics/people/mom/3.png diff --git a/graphics/map_objects/pics/people/mom/4.png b/graphics/event_objects/pics/people/mom/4.png similarity index 100% rename from graphics/map_objects/pics/people/mom/4.png rename to graphics/event_objects/pics/people/mom/4.png diff --git a/graphics/map_objects/pics/people/mom/5.png b/graphics/event_objects/pics/people/mom/5.png similarity index 100% rename from graphics/map_objects/pics/people/mom/5.png rename to graphics/event_objects/pics/people/mom/5.png diff --git a/graphics/map_objects/pics/people/mom/6.png b/graphics/event_objects/pics/people/mom/6.png similarity index 100% rename from graphics/map_objects/pics/people/mom/6.png rename to graphics/event_objects/pics/people/mom/6.png diff --git a/graphics/map_objects/pics/people/mom/7.png b/graphics/event_objects/pics/people/mom/7.png similarity index 100% rename from graphics/map_objects/pics/people/mom/7.png rename to graphics/event_objects/pics/people/mom/7.png diff --git a/graphics/map_objects/pics/people/mom/8.png b/graphics/event_objects/pics/people/mom/8.png similarity index 100% rename from graphics/map_objects/pics/people/mom/8.png rename to graphics/event_objects/pics/people/mom/8.png diff --git a/graphics/map_objects/pics/people/mystery_event_deliveryman/0.png b/graphics/event_objects/pics/people/mystery_event_deliveryman/0.png similarity index 100% rename from graphics/map_objects/pics/people/mystery_event_deliveryman/0.png rename to graphics/event_objects/pics/people/mystery_event_deliveryman/0.png diff --git a/graphics/map_objects/pics/people/mystery_event_deliveryman/1.png b/graphics/event_objects/pics/people/mystery_event_deliveryman/1.png similarity index 100% rename from graphics/map_objects/pics/people/mystery_event_deliveryman/1.png rename to graphics/event_objects/pics/people/mystery_event_deliveryman/1.png diff --git a/graphics/map_objects/pics/people/mystery_event_deliveryman/2.png b/graphics/event_objects/pics/people/mystery_event_deliveryman/2.png similarity index 100% rename from graphics/map_objects/pics/people/mystery_event_deliveryman/2.png rename to graphics/event_objects/pics/people/mystery_event_deliveryman/2.png diff --git a/graphics/map_objects/pics/people/noland/0.png b/graphics/event_objects/pics/people/noland/0.png similarity index 100% rename from graphics/map_objects/pics/people/noland/0.png rename to graphics/event_objects/pics/people/noland/0.png diff --git a/graphics/map_objects/pics/people/noland/1.png b/graphics/event_objects/pics/people/noland/1.png similarity index 100% rename from graphics/map_objects/pics/people/noland/1.png rename to graphics/event_objects/pics/people/noland/1.png diff --git a/graphics/map_objects/pics/people/noland/2.png b/graphics/event_objects/pics/people/noland/2.png similarity index 100% rename from graphics/map_objects/pics/people/noland/2.png rename to graphics/event_objects/pics/people/noland/2.png diff --git a/graphics/map_objects/pics/people/noland/3.png b/graphics/event_objects/pics/people/noland/3.png similarity index 100% rename from graphics/map_objects/pics/people/noland/3.png rename to graphics/event_objects/pics/people/noland/3.png diff --git a/graphics/map_objects/pics/people/noland/4.png b/graphics/event_objects/pics/people/noland/4.png similarity index 100% rename from graphics/map_objects/pics/people/noland/4.png rename to graphics/event_objects/pics/people/noland/4.png diff --git a/graphics/map_objects/pics/people/noland/5.png b/graphics/event_objects/pics/people/noland/5.png similarity index 100% rename from graphics/map_objects/pics/people/noland/5.png rename to graphics/event_objects/pics/people/noland/5.png diff --git a/graphics/map_objects/pics/people/noland/6.png b/graphics/event_objects/pics/people/noland/6.png similarity index 100% rename from graphics/map_objects/pics/people/noland/6.png rename to graphics/event_objects/pics/people/noland/6.png diff --git a/graphics/map_objects/pics/people/noland/7.png b/graphics/event_objects/pics/people/noland/7.png similarity index 100% rename from graphics/map_objects/pics/people/noland/7.png rename to graphics/event_objects/pics/people/noland/7.png diff --git a/graphics/map_objects/pics/people/noland/8.png b/graphics/event_objects/pics/people/noland/8.png similarity index 100% rename from graphics/map_objects/pics/people/noland/8.png rename to graphics/event_objects/pics/people/noland/8.png diff --git a/graphics/map_objects/pics/people/norman/0.png b/graphics/event_objects/pics/people/norman/0.png similarity index 100% rename from graphics/map_objects/pics/people/norman/0.png rename to graphics/event_objects/pics/people/norman/0.png diff --git a/graphics/map_objects/pics/people/norman/1.png b/graphics/event_objects/pics/people/norman/1.png similarity index 100% rename from graphics/map_objects/pics/people/norman/1.png rename to graphics/event_objects/pics/people/norman/1.png diff --git a/graphics/map_objects/pics/people/norman/2.png b/graphics/event_objects/pics/people/norman/2.png similarity index 100% rename from graphics/map_objects/pics/people/norman/2.png rename to graphics/event_objects/pics/people/norman/2.png diff --git a/graphics/map_objects/pics/people/norman/3.png b/graphics/event_objects/pics/people/norman/3.png similarity index 100% rename from graphics/map_objects/pics/people/norman/3.png rename to graphics/event_objects/pics/people/norman/3.png diff --git a/graphics/map_objects/pics/people/norman/4.png b/graphics/event_objects/pics/people/norman/4.png similarity index 100% rename from graphics/map_objects/pics/people/norman/4.png rename to graphics/event_objects/pics/people/norman/4.png diff --git a/graphics/map_objects/pics/people/norman/5.png b/graphics/event_objects/pics/people/norman/5.png similarity index 100% rename from graphics/map_objects/pics/people/norman/5.png rename to graphics/event_objects/pics/people/norman/5.png diff --git a/graphics/map_objects/pics/people/norman/6.png b/graphics/event_objects/pics/people/norman/6.png similarity index 100% rename from graphics/map_objects/pics/people/norman/6.png rename to graphics/event_objects/pics/people/norman/6.png diff --git a/graphics/map_objects/pics/people/norman/7.png b/graphics/event_objects/pics/people/norman/7.png similarity index 100% rename from graphics/map_objects/pics/people/norman/7.png rename to graphics/event_objects/pics/people/norman/7.png diff --git a/graphics/map_objects/pics/people/norman/8.png b/graphics/event_objects/pics/people/norman/8.png similarity index 100% rename from graphics/map_objects/pics/people/norman/8.png rename to graphics/event_objects/pics/people/norman/8.png diff --git a/graphics/map_objects/pics/people/nurse/0.png b/graphics/event_objects/pics/people/nurse/0.png similarity index 100% rename from graphics/map_objects/pics/people/nurse/0.png rename to graphics/event_objects/pics/people/nurse/0.png diff --git a/graphics/map_objects/pics/people/nurse/1.png b/graphics/event_objects/pics/people/nurse/1.png similarity index 100% rename from graphics/map_objects/pics/people/nurse/1.png rename to graphics/event_objects/pics/people/nurse/1.png diff --git a/graphics/map_objects/pics/people/nurse/2.png b/graphics/event_objects/pics/people/nurse/2.png similarity index 100% rename from graphics/map_objects/pics/people/nurse/2.png rename to graphics/event_objects/pics/people/nurse/2.png diff --git a/graphics/map_objects/pics/people/nurse/3.png b/graphics/event_objects/pics/people/nurse/3.png similarity index 100% rename from graphics/map_objects/pics/people/nurse/3.png rename to graphics/event_objects/pics/people/nurse/3.png diff --git a/graphics/map_objects/pics/people/old_man_1/0.png b/graphics/event_objects/pics/people/old_man_1/0.png similarity index 100% rename from graphics/map_objects/pics/people/old_man_1/0.png rename to graphics/event_objects/pics/people/old_man_1/0.png diff --git a/graphics/map_objects/pics/people/old_man_1/1.png b/graphics/event_objects/pics/people/old_man_1/1.png similarity index 100% rename from graphics/map_objects/pics/people/old_man_1/1.png rename to graphics/event_objects/pics/people/old_man_1/1.png diff --git a/graphics/map_objects/pics/people/old_man_1/2.png b/graphics/event_objects/pics/people/old_man_1/2.png similarity index 100% rename from graphics/map_objects/pics/people/old_man_1/2.png rename to graphics/event_objects/pics/people/old_man_1/2.png diff --git a/graphics/map_objects/pics/people/old_man_1/3.png b/graphics/event_objects/pics/people/old_man_1/3.png similarity index 100% rename from graphics/map_objects/pics/people/old_man_1/3.png rename to graphics/event_objects/pics/people/old_man_1/3.png diff --git a/graphics/map_objects/pics/people/old_man_1/4.png b/graphics/event_objects/pics/people/old_man_1/4.png similarity index 100% rename from graphics/map_objects/pics/people/old_man_1/4.png rename to graphics/event_objects/pics/people/old_man_1/4.png diff --git a/graphics/map_objects/pics/people/old_man_1/5.png b/graphics/event_objects/pics/people/old_man_1/5.png similarity index 100% rename from graphics/map_objects/pics/people/old_man_1/5.png rename to graphics/event_objects/pics/people/old_man_1/5.png diff --git a/graphics/map_objects/pics/people/old_man_1/6.png b/graphics/event_objects/pics/people/old_man_1/6.png similarity index 100% rename from graphics/map_objects/pics/people/old_man_1/6.png rename to graphics/event_objects/pics/people/old_man_1/6.png diff --git a/graphics/map_objects/pics/people/old_man_1/7.png b/graphics/event_objects/pics/people/old_man_1/7.png similarity index 100% rename from graphics/map_objects/pics/people/old_man_1/7.png rename to graphics/event_objects/pics/people/old_man_1/7.png diff --git a/graphics/map_objects/pics/people/old_man_1/8.png b/graphics/event_objects/pics/people/old_man_1/8.png similarity index 100% rename from graphics/map_objects/pics/people/old_man_1/8.png rename to graphics/event_objects/pics/people/old_man_1/8.png diff --git a/graphics/map_objects/pics/people/old_man_2/0.png b/graphics/event_objects/pics/people/old_man_2/0.png similarity index 100% rename from graphics/map_objects/pics/people/old_man_2/0.png rename to graphics/event_objects/pics/people/old_man_2/0.png diff --git a/graphics/map_objects/pics/people/old_man_2/1.png b/graphics/event_objects/pics/people/old_man_2/1.png similarity index 100% rename from graphics/map_objects/pics/people/old_man_2/1.png rename to graphics/event_objects/pics/people/old_man_2/1.png diff --git a/graphics/map_objects/pics/people/old_man_2/2.png b/graphics/event_objects/pics/people/old_man_2/2.png similarity index 100% rename from graphics/map_objects/pics/people/old_man_2/2.png rename to graphics/event_objects/pics/people/old_man_2/2.png diff --git a/graphics/map_objects/pics/people/old_woman_1/0.png b/graphics/event_objects/pics/people/old_woman_1/0.png similarity index 100% rename from graphics/map_objects/pics/people/old_woman_1/0.png rename to graphics/event_objects/pics/people/old_woman_1/0.png diff --git a/graphics/map_objects/pics/people/old_woman_1/1.png b/graphics/event_objects/pics/people/old_woman_1/1.png similarity index 100% rename from graphics/map_objects/pics/people/old_woman_1/1.png rename to graphics/event_objects/pics/people/old_woman_1/1.png diff --git a/graphics/map_objects/pics/people/old_woman_1/2.png b/graphics/event_objects/pics/people/old_woman_1/2.png similarity index 100% rename from graphics/map_objects/pics/people/old_woman_1/2.png rename to graphics/event_objects/pics/people/old_woman_1/2.png diff --git a/graphics/map_objects/pics/people/old_woman_1/3.png b/graphics/event_objects/pics/people/old_woman_1/3.png similarity index 100% rename from graphics/map_objects/pics/people/old_woman_1/3.png rename to graphics/event_objects/pics/people/old_woman_1/3.png diff --git a/graphics/map_objects/pics/people/old_woman_1/4.png b/graphics/event_objects/pics/people/old_woman_1/4.png similarity index 100% rename from graphics/map_objects/pics/people/old_woman_1/4.png rename to graphics/event_objects/pics/people/old_woman_1/4.png diff --git a/graphics/map_objects/pics/people/old_woman_1/5.png b/graphics/event_objects/pics/people/old_woman_1/5.png similarity index 100% rename from graphics/map_objects/pics/people/old_woman_1/5.png rename to graphics/event_objects/pics/people/old_woman_1/5.png diff --git a/graphics/map_objects/pics/people/old_woman_1/6.png b/graphics/event_objects/pics/people/old_woman_1/6.png similarity index 100% rename from graphics/map_objects/pics/people/old_woman_1/6.png rename to graphics/event_objects/pics/people/old_woman_1/6.png diff --git a/graphics/map_objects/pics/people/old_woman_1/7.png b/graphics/event_objects/pics/people/old_woman_1/7.png similarity index 100% rename from graphics/map_objects/pics/people/old_woman_1/7.png rename to graphics/event_objects/pics/people/old_woman_1/7.png diff --git a/graphics/map_objects/pics/people/old_woman_1/8.png b/graphics/event_objects/pics/people/old_woman_1/8.png similarity index 100% rename from graphics/map_objects/pics/people/old_woman_1/8.png rename to graphics/event_objects/pics/people/old_woman_1/8.png diff --git a/graphics/map_objects/pics/people/old_woman_2/0.png b/graphics/event_objects/pics/people/old_woman_2/0.png similarity index 100% rename from graphics/map_objects/pics/people/old_woman_2/0.png rename to graphics/event_objects/pics/people/old_woman_2/0.png diff --git a/graphics/map_objects/pics/people/old_woman_2/1.png b/graphics/event_objects/pics/people/old_woman_2/1.png similarity index 100% rename from graphics/map_objects/pics/people/old_woman_2/1.png rename to graphics/event_objects/pics/people/old_woman_2/1.png diff --git a/graphics/map_objects/pics/people/old_woman_2/2.png b/graphics/event_objects/pics/people/old_woman_2/2.png similarity index 100% rename from graphics/map_objects/pics/people/old_woman_2/2.png rename to graphics/event_objects/pics/people/old_woman_2/2.png diff --git a/graphics/map_objects/pics/people/old_woman_2/3.png b/graphics/event_objects/pics/people/old_woman_2/3.png similarity index 100% rename from graphics/map_objects/pics/people/old_woman_2/3.png rename to graphics/event_objects/pics/people/old_woman_2/3.png diff --git a/graphics/map_objects/pics/people/old_woman_2/4.png b/graphics/event_objects/pics/people/old_woman_2/4.png similarity index 100% rename from graphics/map_objects/pics/people/old_woman_2/4.png rename to graphics/event_objects/pics/people/old_woman_2/4.png diff --git a/graphics/map_objects/pics/people/old_woman_2/5.png b/graphics/event_objects/pics/people/old_woman_2/5.png similarity index 100% rename from graphics/map_objects/pics/people/old_woman_2/5.png rename to graphics/event_objects/pics/people/old_woman_2/5.png diff --git a/graphics/map_objects/pics/people/old_woman_2/6.png b/graphics/event_objects/pics/people/old_woman_2/6.png similarity index 100% rename from graphics/map_objects/pics/people/old_woman_2/6.png rename to graphics/event_objects/pics/people/old_woman_2/6.png diff --git a/graphics/map_objects/pics/people/old_woman_2/7.png b/graphics/event_objects/pics/people/old_woman_2/7.png similarity index 100% rename from graphics/map_objects/pics/people/old_woman_2/7.png rename to graphics/event_objects/pics/people/old_woman_2/7.png diff --git a/graphics/map_objects/pics/people/old_woman_2/8.png b/graphics/event_objects/pics/people/old_woman_2/8.png similarity index 100% rename from graphics/map_objects/pics/people/old_woman_2/8.png rename to graphics/event_objects/pics/people/old_woman_2/8.png diff --git a/graphics/map_objects/pics/people/phoebe/0.png b/graphics/event_objects/pics/people/phoebe/0.png similarity index 100% rename from graphics/map_objects/pics/people/phoebe/0.png rename to graphics/event_objects/pics/people/phoebe/0.png diff --git a/graphics/map_objects/pics/people/phoebe/1.png b/graphics/event_objects/pics/people/phoebe/1.png similarity index 100% rename from graphics/map_objects/pics/people/phoebe/1.png rename to graphics/event_objects/pics/people/phoebe/1.png diff --git a/graphics/map_objects/pics/people/phoebe/2.png b/graphics/event_objects/pics/people/phoebe/2.png similarity index 100% rename from graphics/map_objects/pics/people/phoebe/2.png rename to graphics/event_objects/pics/people/phoebe/2.png diff --git a/graphics/map_objects/pics/people/picnicker/0.png b/graphics/event_objects/pics/people/picnicker/0.png similarity index 100% rename from graphics/map_objects/pics/people/picnicker/0.png rename to graphics/event_objects/pics/people/picnicker/0.png diff --git a/graphics/map_objects/pics/people/picnicker/1.png b/graphics/event_objects/pics/people/picnicker/1.png similarity index 100% rename from graphics/map_objects/pics/people/picnicker/1.png rename to graphics/event_objects/pics/people/picnicker/1.png diff --git a/graphics/map_objects/pics/people/picnicker/2.png b/graphics/event_objects/pics/people/picnicker/2.png similarity index 100% rename from graphics/map_objects/pics/people/picnicker/2.png rename to graphics/event_objects/pics/people/picnicker/2.png diff --git a/graphics/map_objects/pics/people/picnicker/3.png b/graphics/event_objects/pics/people/picnicker/3.png similarity index 100% rename from graphics/map_objects/pics/people/picnicker/3.png rename to graphics/event_objects/pics/people/picnicker/3.png diff --git a/graphics/map_objects/pics/people/picnicker/4.png b/graphics/event_objects/pics/people/picnicker/4.png similarity index 100% rename from graphics/map_objects/pics/people/picnicker/4.png rename to graphics/event_objects/pics/people/picnicker/4.png diff --git a/graphics/map_objects/pics/people/picnicker/5.png b/graphics/event_objects/pics/people/picnicker/5.png similarity index 100% rename from graphics/map_objects/pics/people/picnicker/5.png rename to graphics/event_objects/pics/people/picnicker/5.png diff --git a/graphics/map_objects/pics/people/picnicker/6.png b/graphics/event_objects/pics/people/picnicker/6.png similarity index 100% rename from graphics/map_objects/pics/people/picnicker/6.png rename to graphics/event_objects/pics/people/picnicker/6.png diff --git a/graphics/map_objects/pics/people/picnicker/7.png b/graphics/event_objects/pics/people/picnicker/7.png similarity index 100% rename from graphics/map_objects/pics/people/picnicker/7.png rename to graphics/event_objects/pics/people/picnicker/7.png diff --git a/graphics/map_objects/pics/people/picnicker/8.png b/graphics/event_objects/pics/people/picnicker/8.png similarity index 100% rename from graphics/map_objects/pics/people/picnicker/8.png rename to graphics/event_objects/pics/people/picnicker/8.png diff --git a/graphics/map_objects/pics/people/prof_birch/0.png b/graphics/event_objects/pics/people/prof_birch/0.png similarity index 100% rename from graphics/map_objects/pics/people/prof_birch/0.png rename to graphics/event_objects/pics/people/prof_birch/0.png diff --git a/graphics/map_objects/pics/people/prof_birch/1.png b/graphics/event_objects/pics/people/prof_birch/1.png similarity index 100% rename from graphics/map_objects/pics/people/prof_birch/1.png rename to graphics/event_objects/pics/people/prof_birch/1.png diff --git a/graphics/map_objects/pics/people/prof_birch/2.png b/graphics/event_objects/pics/people/prof_birch/2.png similarity index 100% rename from graphics/map_objects/pics/people/prof_birch/2.png rename to graphics/event_objects/pics/people/prof_birch/2.png diff --git a/graphics/map_objects/pics/people/prof_birch/3.png b/graphics/event_objects/pics/people/prof_birch/3.png similarity index 100% rename from graphics/map_objects/pics/people/prof_birch/3.png rename to graphics/event_objects/pics/people/prof_birch/3.png diff --git a/graphics/map_objects/pics/people/prof_birch/4.png b/graphics/event_objects/pics/people/prof_birch/4.png similarity index 100% rename from graphics/map_objects/pics/people/prof_birch/4.png rename to graphics/event_objects/pics/people/prof_birch/4.png diff --git a/graphics/map_objects/pics/people/prof_birch/5.png b/graphics/event_objects/pics/people/prof_birch/5.png similarity index 100% rename from graphics/map_objects/pics/people/prof_birch/5.png rename to graphics/event_objects/pics/people/prof_birch/5.png diff --git a/graphics/map_objects/pics/people/prof_birch/6.png b/graphics/event_objects/pics/people/prof_birch/6.png similarity index 100% rename from graphics/map_objects/pics/people/prof_birch/6.png rename to graphics/event_objects/pics/people/prof_birch/6.png diff --git a/graphics/map_objects/pics/people/prof_birch/7.png b/graphics/event_objects/pics/people/prof_birch/7.png similarity index 100% rename from graphics/map_objects/pics/people/prof_birch/7.png rename to graphics/event_objects/pics/people/prof_birch/7.png diff --git a/graphics/map_objects/pics/people/prof_birch/8.png b/graphics/event_objects/pics/people/prof_birch/8.png similarity index 100% rename from graphics/map_objects/pics/people/prof_birch/8.png rename to graphics/event_objects/pics/people/prof_birch/8.png diff --git a/graphics/map_objects/pics/people/psychic_m/0.png b/graphics/event_objects/pics/people/psychic_m/0.png similarity index 100% rename from graphics/map_objects/pics/people/psychic_m/0.png rename to graphics/event_objects/pics/people/psychic_m/0.png diff --git a/graphics/map_objects/pics/people/psychic_m/1.png b/graphics/event_objects/pics/people/psychic_m/1.png similarity index 100% rename from graphics/map_objects/pics/people/psychic_m/1.png rename to graphics/event_objects/pics/people/psychic_m/1.png diff --git a/graphics/map_objects/pics/people/psychic_m/2.png b/graphics/event_objects/pics/people/psychic_m/2.png similarity index 100% rename from graphics/map_objects/pics/people/psychic_m/2.png rename to graphics/event_objects/pics/people/psychic_m/2.png diff --git a/graphics/map_objects/pics/people/psychic_m/3.png b/graphics/event_objects/pics/people/psychic_m/3.png similarity index 100% rename from graphics/map_objects/pics/people/psychic_m/3.png rename to graphics/event_objects/pics/people/psychic_m/3.png diff --git a/graphics/map_objects/pics/people/psychic_m/4.png b/graphics/event_objects/pics/people/psychic_m/4.png similarity index 100% rename from graphics/map_objects/pics/people/psychic_m/4.png rename to graphics/event_objects/pics/people/psychic_m/4.png diff --git a/graphics/map_objects/pics/people/psychic_m/5.png b/graphics/event_objects/pics/people/psychic_m/5.png similarity index 100% rename from graphics/map_objects/pics/people/psychic_m/5.png rename to graphics/event_objects/pics/people/psychic_m/5.png diff --git a/graphics/map_objects/pics/people/psychic_m/6.png b/graphics/event_objects/pics/people/psychic_m/6.png similarity index 100% rename from graphics/map_objects/pics/people/psychic_m/6.png rename to graphics/event_objects/pics/people/psychic_m/6.png diff --git a/graphics/map_objects/pics/people/psychic_m/7.png b/graphics/event_objects/pics/people/psychic_m/7.png similarity index 100% rename from graphics/map_objects/pics/people/psychic_m/7.png rename to graphics/event_objects/pics/people/psychic_m/7.png diff --git a/graphics/map_objects/pics/people/psychic_m/8.png b/graphics/event_objects/pics/people/psychic_m/8.png similarity index 100% rename from graphics/map_objects/pics/people/psychic_m/8.png rename to graphics/event_objects/pics/people/psychic_m/8.png diff --git a/graphics/map_objects/pics/people/quinty_plump/0.png b/graphics/event_objects/pics/people/quinty_plump/0.png similarity index 100% rename from graphics/map_objects/pics/people/quinty_plump/0.png rename to graphics/event_objects/pics/people/quinty_plump/0.png diff --git a/graphics/map_objects/pics/people/quinty_plump/1.png b/graphics/event_objects/pics/people/quinty_plump/1.png similarity index 100% rename from graphics/map_objects/pics/people/quinty_plump/1.png rename to graphics/event_objects/pics/people/quinty_plump/1.png diff --git a/graphics/map_objects/pics/people/quinty_plump/2.png b/graphics/event_objects/pics/people/quinty_plump/2.png similarity index 100% rename from graphics/map_objects/pics/people/quinty_plump/2.png rename to graphics/event_objects/pics/people/quinty_plump/2.png diff --git a/graphics/map_objects/pics/people/quinty_plump/3.png b/graphics/event_objects/pics/people/quinty_plump/3.png similarity index 100% rename from graphics/map_objects/pics/people/quinty_plump/3.png rename to graphics/event_objects/pics/people/quinty_plump/3.png diff --git a/graphics/map_objects/pics/people/quinty_plump/4.png b/graphics/event_objects/pics/people/quinty_plump/4.png similarity index 100% rename from graphics/map_objects/pics/people/quinty_plump/4.png rename to graphics/event_objects/pics/people/quinty_plump/4.png diff --git a/graphics/map_objects/pics/people/quinty_plump/5.png b/graphics/event_objects/pics/people/quinty_plump/5.png similarity index 100% rename from graphics/map_objects/pics/people/quinty_plump/5.png rename to graphics/event_objects/pics/people/quinty_plump/5.png diff --git a/graphics/map_objects/pics/people/quinty_plump/6.png b/graphics/event_objects/pics/people/quinty_plump/6.png similarity index 100% rename from graphics/map_objects/pics/people/quinty_plump/6.png rename to graphics/event_objects/pics/people/quinty_plump/6.png diff --git a/graphics/map_objects/pics/people/red/0.png b/graphics/event_objects/pics/people/red/0.png similarity index 100% rename from graphics/map_objects/pics/people/red/0.png rename to graphics/event_objects/pics/people/red/0.png diff --git a/graphics/map_objects/pics/people/red/1.png b/graphics/event_objects/pics/people/red/1.png similarity index 100% rename from graphics/map_objects/pics/people/red/1.png rename to graphics/event_objects/pics/people/red/1.png diff --git a/graphics/map_objects/pics/people/red/2.png b/graphics/event_objects/pics/people/red/2.png similarity index 100% rename from graphics/map_objects/pics/people/red/2.png rename to graphics/event_objects/pics/people/red/2.png diff --git a/graphics/map_objects/pics/people/red/3.png b/graphics/event_objects/pics/people/red/3.png similarity index 100% rename from graphics/map_objects/pics/people/red/3.png rename to graphics/event_objects/pics/people/red/3.png diff --git a/graphics/map_objects/pics/people/red/4.png b/graphics/event_objects/pics/people/red/4.png similarity index 100% rename from graphics/map_objects/pics/people/red/4.png rename to graphics/event_objects/pics/people/red/4.png diff --git a/graphics/map_objects/pics/people/red/5.png b/graphics/event_objects/pics/people/red/5.png similarity index 100% rename from graphics/map_objects/pics/people/red/5.png rename to graphics/event_objects/pics/people/red/5.png diff --git a/graphics/map_objects/pics/people/red/6.png b/graphics/event_objects/pics/people/red/6.png similarity index 100% rename from graphics/map_objects/pics/people/red/6.png rename to graphics/event_objects/pics/people/red/6.png diff --git a/graphics/map_objects/pics/people/red/7.png b/graphics/event_objects/pics/people/red/7.png similarity index 100% rename from graphics/map_objects/pics/people/red/7.png rename to graphics/event_objects/pics/people/red/7.png diff --git a/graphics/map_objects/pics/people/red/8.png b/graphics/event_objects/pics/people/red/8.png similarity index 100% rename from graphics/map_objects/pics/people/red/8.png rename to graphics/event_objects/pics/people/red/8.png diff --git a/graphics/map_objects/pics/people/reporter_f/0.png b/graphics/event_objects/pics/people/reporter_f/0.png similarity index 100% rename from graphics/map_objects/pics/people/reporter_f/0.png rename to graphics/event_objects/pics/people/reporter_f/0.png diff --git a/graphics/map_objects/pics/people/reporter_f/1.png b/graphics/event_objects/pics/people/reporter_f/1.png similarity index 100% rename from graphics/map_objects/pics/people/reporter_f/1.png rename to graphics/event_objects/pics/people/reporter_f/1.png diff --git a/graphics/map_objects/pics/people/reporter_f/2.png b/graphics/event_objects/pics/people/reporter_f/2.png similarity index 100% rename from graphics/map_objects/pics/people/reporter_f/2.png rename to graphics/event_objects/pics/people/reporter_f/2.png diff --git a/graphics/map_objects/pics/people/reporter_f/3.png b/graphics/event_objects/pics/people/reporter_f/3.png similarity index 100% rename from graphics/map_objects/pics/people/reporter_f/3.png rename to graphics/event_objects/pics/people/reporter_f/3.png diff --git a/graphics/map_objects/pics/people/reporter_f/4.png b/graphics/event_objects/pics/people/reporter_f/4.png similarity index 100% rename from graphics/map_objects/pics/people/reporter_f/4.png rename to graphics/event_objects/pics/people/reporter_f/4.png diff --git a/graphics/map_objects/pics/people/reporter_f/5.png b/graphics/event_objects/pics/people/reporter_f/5.png similarity index 100% rename from graphics/map_objects/pics/people/reporter_f/5.png rename to graphics/event_objects/pics/people/reporter_f/5.png diff --git a/graphics/map_objects/pics/people/reporter_f/6.png b/graphics/event_objects/pics/people/reporter_f/6.png similarity index 100% rename from graphics/map_objects/pics/people/reporter_f/6.png rename to graphics/event_objects/pics/people/reporter_f/6.png diff --git a/graphics/map_objects/pics/people/reporter_f/7.png b/graphics/event_objects/pics/people/reporter_f/7.png similarity index 100% rename from graphics/map_objects/pics/people/reporter_f/7.png rename to graphics/event_objects/pics/people/reporter_f/7.png diff --git a/graphics/map_objects/pics/people/reporter_f/8.png b/graphics/event_objects/pics/people/reporter_f/8.png similarity index 100% rename from graphics/map_objects/pics/people/reporter_f/8.png rename to graphics/event_objects/pics/people/reporter_f/8.png diff --git a/graphics/map_objects/pics/people/reporter_m/0.png b/graphics/event_objects/pics/people/reporter_m/0.png similarity index 100% rename from graphics/map_objects/pics/people/reporter_m/0.png rename to graphics/event_objects/pics/people/reporter_m/0.png diff --git a/graphics/map_objects/pics/people/reporter_m/1.png b/graphics/event_objects/pics/people/reporter_m/1.png similarity index 100% rename from graphics/map_objects/pics/people/reporter_m/1.png rename to graphics/event_objects/pics/people/reporter_m/1.png diff --git a/graphics/map_objects/pics/people/reporter_m/2.png b/graphics/event_objects/pics/people/reporter_m/2.png similarity index 100% rename from graphics/map_objects/pics/people/reporter_m/2.png rename to graphics/event_objects/pics/people/reporter_m/2.png diff --git a/graphics/map_objects/pics/people/reporter_m/3.png b/graphics/event_objects/pics/people/reporter_m/3.png similarity index 100% rename from graphics/map_objects/pics/people/reporter_m/3.png rename to graphics/event_objects/pics/people/reporter_m/3.png diff --git a/graphics/map_objects/pics/people/reporter_m/4.png b/graphics/event_objects/pics/people/reporter_m/4.png similarity index 100% rename from graphics/map_objects/pics/people/reporter_m/4.png rename to graphics/event_objects/pics/people/reporter_m/4.png diff --git a/graphics/map_objects/pics/people/reporter_m/5.png b/graphics/event_objects/pics/people/reporter_m/5.png similarity index 100% rename from graphics/map_objects/pics/people/reporter_m/5.png rename to graphics/event_objects/pics/people/reporter_m/5.png diff --git a/graphics/map_objects/pics/people/reporter_m/6.png b/graphics/event_objects/pics/people/reporter_m/6.png similarity index 100% rename from graphics/map_objects/pics/people/reporter_m/6.png rename to graphics/event_objects/pics/people/reporter_m/6.png diff --git a/graphics/map_objects/pics/people/reporter_m/7.png b/graphics/event_objects/pics/people/reporter_m/7.png similarity index 100% rename from graphics/map_objects/pics/people/reporter_m/7.png rename to graphics/event_objects/pics/people/reporter_m/7.png diff --git a/graphics/map_objects/pics/people/reporter_m/8.png b/graphics/event_objects/pics/people/reporter_m/8.png similarity index 100% rename from graphics/map_objects/pics/people/reporter_m/8.png rename to graphics/event_objects/pics/people/reporter_m/8.png diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/0.png b/graphics/event_objects/pics/people/rooftop_sale_woman/0.png similarity index 100% rename from graphics/map_objects/pics/people/rooftop_sale_woman/0.png rename to graphics/event_objects/pics/people/rooftop_sale_woman/0.png diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/1.png b/graphics/event_objects/pics/people/rooftop_sale_woman/1.png similarity index 100% rename from graphics/map_objects/pics/people/rooftop_sale_woman/1.png rename to graphics/event_objects/pics/people/rooftop_sale_woman/1.png diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/2.png b/graphics/event_objects/pics/people/rooftop_sale_woman/2.png similarity index 100% rename from graphics/map_objects/pics/people/rooftop_sale_woman/2.png rename to graphics/event_objects/pics/people/rooftop_sale_woman/2.png diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/3.png b/graphics/event_objects/pics/people/rooftop_sale_woman/3.png similarity index 100% rename from graphics/map_objects/pics/people/rooftop_sale_woman/3.png rename to graphics/event_objects/pics/people/rooftop_sale_woman/3.png diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/4.png b/graphics/event_objects/pics/people/rooftop_sale_woman/4.png similarity index 100% rename from graphics/map_objects/pics/people/rooftop_sale_woman/4.png rename to graphics/event_objects/pics/people/rooftop_sale_woman/4.png diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/5.png b/graphics/event_objects/pics/people/rooftop_sale_woman/5.png similarity index 100% rename from graphics/map_objects/pics/people/rooftop_sale_woman/5.png rename to graphics/event_objects/pics/people/rooftop_sale_woman/5.png diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/6.png b/graphics/event_objects/pics/people/rooftop_sale_woman/6.png similarity index 100% rename from graphics/map_objects/pics/people/rooftop_sale_woman/6.png rename to graphics/event_objects/pics/people/rooftop_sale_woman/6.png diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/7.png b/graphics/event_objects/pics/people/rooftop_sale_woman/7.png similarity index 100% rename from graphics/map_objects/pics/people/rooftop_sale_woman/7.png rename to graphics/event_objects/pics/people/rooftop_sale_woman/7.png diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/8.png b/graphics/event_objects/pics/people/rooftop_sale_woman/8.png similarity index 100% rename from graphics/map_objects/pics/people/rooftop_sale_woman/8.png rename to graphics/event_objects/pics/people/rooftop_sale_woman/8.png diff --git a/graphics/map_objects/pics/people/roxanne/0.png b/graphics/event_objects/pics/people/roxanne/0.png similarity index 100% rename from graphics/map_objects/pics/people/roxanne/0.png rename to graphics/event_objects/pics/people/roxanne/0.png diff --git a/graphics/map_objects/pics/people/roxanne/1.png b/graphics/event_objects/pics/people/roxanne/1.png similarity index 100% rename from graphics/map_objects/pics/people/roxanne/1.png rename to graphics/event_objects/pics/people/roxanne/1.png diff --git a/graphics/map_objects/pics/people/roxanne/2.png b/graphics/event_objects/pics/people/roxanne/2.png similarity index 100% rename from graphics/map_objects/pics/people/roxanne/2.png rename to graphics/event_objects/pics/people/roxanne/2.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/00.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/00.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_brendan/00.png rename to graphics/event_objects/pics/people/ruby_sapphire_brendan/00.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/01.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/01.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_brendan/01.png rename to graphics/event_objects/pics/people/ruby_sapphire_brendan/01.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/02.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/02.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_brendan/02.png rename to graphics/event_objects/pics/people/ruby_sapphire_brendan/02.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/03.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/03.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_brendan/03.png rename to graphics/event_objects/pics/people/ruby_sapphire_brendan/03.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/04.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/04.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_brendan/04.png rename to graphics/event_objects/pics/people/ruby_sapphire_brendan/04.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/05.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/05.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_brendan/05.png rename to graphics/event_objects/pics/people/ruby_sapphire_brendan/05.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/06.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/06.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_brendan/06.png rename to graphics/event_objects/pics/people/ruby_sapphire_brendan/06.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/07.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/07.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_brendan/07.png rename to graphics/event_objects/pics/people/ruby_sapphire_brendan/07.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/08.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/08.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_brendan/08.png rename to graphics/event_objects/pics/people/ruby_sapphire_brendan/08.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/09.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/09.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_brendan/09.png rename to graphics/event_objects/pics/people/ruby_sapphire_brendan/09.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/10.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/10.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_brendan/10.png rename to graphics/event_objects/pics/people/ruby_sapphire_brendan/10.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/11.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/11.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_brendan/11.png rename to graphics/event_objects/pics/people/ruby_sapphire_brendan/11.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/12.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/12.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_brendan/12.png rename to graphics/event_objects/pics/people/ruby_sapphire_brendan/12.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/13.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/13.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_brendan/13.png rename to graphics/event_objects/pics/people/ruby_sapphire_brendan/13.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/14.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/14.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_brendan/14.png rename to graphics/event_objects/pics/people/ruby_sapphire_brendan/14.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/15.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/15.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_brendan/15.png rename to graphics/event_objects/pics/people/ruby_sapphire_brendan/15.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/16.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/16.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_brendan/16.png rename to graphics/event_objects/pics/people/ruby_sapphire_brendan/16.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/17.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/17.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_brendan/17.png rename to graphics/event_objects/pics/people/ruby_sapphire_brendan/17.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/0.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/0.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_little_boy/0.png rename to graphics/event_objects/pics/people/ruby_sapphire_little_boy/0.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/1.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/1.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_little_boy/1.png rename to graphics/event_objects/pics/people/ruby_sapphire_little_boy/1.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/2.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/2.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_little_boy/2.png rename to graphics/event_objects/pics/people/ruby_sapphire_little_boy/2.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/3.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/3.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_little_boy/3.png rename to graphics/event_objects/pics/people/ruby_sapphire_little_boy/3.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/4.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/4.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_little_boy/4.png rename to graphics/event_objects/pics/people/ruby_sapphire_little_boy/4.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/5.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/5.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_little_boy/5.png rename to graphics/event_objects/pics/people/ruby_sapphire_little_boy/5.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/6.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/6.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_little_boy/6.png rename to graphics/event_objects/pics/people/ruby_sapphire_little_boy/6.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/7.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/7.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_little_boy/7.png rename to graphics/event_objects/pics/people/ruby_sapphire_little_boy/7.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/8.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/8.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_little_boy/8.png rename to graphics/event_objects/pics/people/ruby_sapphire_little_boy/8.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/00.png b/graphics/event_objects/pics/people/ruby_sapphire_may/00.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_may/00.png rename to graphics/event_objects/pics/people/ruby_sapphire_may/00.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/01.png b/graphics/event_objects/pics/people/ruby_sapphire_may/01.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_may/01.png rename to graphics/event_objects/pics/people/ruby_sapphire_may/01.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/02.png b/graphics/event_objects/pics/people/ruby_sapphire_may/02.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_may/02.png rename to graphics/event_objects/pics/people/ruby_sapphire_may/02.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/03.png b/graphics/event_objects/pics/people/ruby_sapphire_may/03.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_may/03.png rename to graphics/event_objects/pics/people/ruby_sapphire_may/03.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/04.png b/graphics/event_objects/pics/people/ruby_sapphire_may/04.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_may/04.png rename to graphics/event_objects/pics/people/ruby_sapphire_may/04.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/05.png b/graphics/event_objects/pics/people/ruby_sapphire_may/05.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_may/05.png rename to graphics/event_objects/pics/people/ruby_sapphire_may/05.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/06.png b/graphics/event_objects/pics/people/ruby_sapphire_may/06.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_may/06.png rename to graphics/event_objects/pics/people/ruby_sapphire_may/06.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/07.png b/graphics/event_objects/pics/people/ruby_sapphire_may/07.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_may/07.png rename to graphics/event_objects/pics/people/ruby_sapphire_may/07.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/08.png b/graphics/event_objects/pics/people/ruby_sapphire_may/08.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_may/08.png rename to graphics/event_objects/pics/people/ruby_sapphire_may/08.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/09.png b/graphics/event_objects/pics/people/ruby_sapphire_may/09.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_may/09.png rename to graphics/event_objects/pics/people/ruby_sapphire_may/09.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/10.png b/graphics/event_objects/pics/people/ruby_sapphire_may/10.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_may/10.png rename to graphics/event_objects/pics/people/ruby_sapphire_may/10.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/11.png b/graphics/event_objects/pics/people/ruby_sapphire_may/11.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_may/11.png rename to graphics/event_objects/pics/people/ruby_sapphire_may/11.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/12.png b/graphics/event_objects/pics/people/ruby_sapphire_may/12.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_may/12.png rename to graphics/event_objects/pics/people/ruby_sapphire_may/12.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/13.png b/graphics/event_objects/pics/people/ruby_sapphire_may/13.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_may/13.png rename to graphics/event_objects/pics/people/ruby_sapphire_may/13.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/14.png b/graphics/event_objects/pics/people/ruby_sapphire_may/14.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_may/14.png rename to graphics/event_objects/pics/people/ruby_sapphire_may/14.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/15.png b/graphics/event_objects/pics/people/ruby_sapphire_may/15.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_may/15.png rename to graphics/event_objects/pics/people/ruby_sapphire_may/15.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/16.png b/graphics/event_objects/pics/people/ruby_sapphire_may/16.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_may/16.png rename to graphics/event_objects/pics/people/ruby_sapphire_may/16.png diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/17.png b/graphics/event_objects/pics/people/ruby_sapphire_may/17.png similarity index 100% rename from graphics/map_objects/pics/people/ruby_sapphire_may/17.png rename to graphics/event_objects/pics/people/ruby_sapphire_may/17.png diff --git a/graphics/map_objects/pics/people/running_triathlete_f/0.png b/graphics/event_objects/pics/people/running_triathlete_f/0.png similarity index 100% rename from graphics/map_objects/pics/people/running_triathlete_f/0.png rename to graphics/event_objects/pics/people/running_triathlete_f/0.png diff --git a/graphics/map_objects/pics/people/running_triathlete_f/1.png b/graphics/event_objects/pics/people/running_triathlete_f/1.png similarity index 100% rename from graphics/map_objects/pics/people/running_triathlete_f/1.png rename to graphics/event_objects/pics/people/running_triathlete_f/1.png diff --git a/graphics/map_objects/pics/people/running_triathlete_f/2.png b/graphics/event_objects/pics/people/running_triathlete_f/2.png similarity index 100% rename from graphics/map_objects/pics/people/running_triathlete_f/2.png rename to graphics/event_objects/pics/people/running_triathlete_f/2.png diff --git a/graphics/map_objects/pics/people/running_triathlete_f/3.png b/graphics/event_objects/pics/people/running_triathlete_f/3.png similarity index 100% rename from graphics/map_objects/pics/people/running_triathlete_f/3.png rename to graphics/event_objects/pics/people/running_triathlete_f/3.png diff --git a/graphics/map_objects/pics/people/running_triathlete_f/4.png b/graphics/event_objects/pics/people/running_triathlete_f/4.png similarity index 100% rename from graphics/map_objects/pics/people/running_triathlete_f/4.png rename to graphics/event_objects/pics/people/running_triathlete_f/4.png diff --git a/graphics/map_objects/pics/people/running_triathlete_f/5.png b/graphics/event_objects/pics/people/running_triathlete_f/5.png similarity index 100% rename from graphics/map_objects/pics/people/running_triathlete_f/5.png rename to graphics/event_objects/pics/people/running_triathlete_f/5.png diff --git a/graphics/map_objects/pics/people/running_triathlete_f/6.png b/graphics/event_objects/pics/people/running_triathlete_f/6.png similarity index 100% rename from graphics/map_objects/pics/people/running_triathlete_f/6.png rename to graphics/event_objects/pics/people/running_triathlete_f/6.png diff --git a/graphics/map_objects/pics/people/running_triathlete_f/7.png b/graphics/event_objects/pics/people/running_triathlete_f/7.png similarity index 100% rename from graphics/map_objects/pics/people/running_triathlete_f/7.png rename to graphics/event_objects/pics/people/running_triathlete_f/7.png diff --git a/graphics/map_objects/pics/people/running_triathlete_f/8.png b/graphics/event_objects/pics/people/running_triathlete_f/8.png similarity index 100% rename from graphics/map_objects/pics/people/running_triathlete_f/8.png rename to graphics/event_objects/pics/people/running_triathlete_f/8.png diff --git a/graphics/map_objects/pics/people/running_triathlete_m/0.png b/graphics/event_objects/pics/people/running_triathlete_m/0.png similarity index 100% rename from graphics/map_objects/pics/people/running_triathlete_m/0.png rename to graphics/event_objects/pics/people/running_triathlete_m/0.png diff --git a/graphics/map_objects/pics/people/running_triathlete_m/1.png b/graphics/event_objects/pics/people/running_triathlete_m/1.png similarity index 100% rename from graphics/map_objects/pics/people/running_triathlete_m/1.png rename to graphics/event_objects/pics/people/running_triathlete_m/1.png diff --git a/graphics/map_objects/pics/people/running_triathlete_m/2.png b/graphics/event_objects/pics/people/running_triathlete_m/2.png similarity index 100% rename from graphics/map_objects/pics/people/running_triathlete_m/2.png rename to graphics/event_objects/pics/people/running_triathlete_m/2.png diff --git a/graphics/map_objects/pics/people/running_triathlete_m/3.png b/graphics/event_objects/pics/people/running_triathlete_m/3.png similarity index 100% rename from graphics/map_objects/pics/people/running_triathlete_m/3.png rename to graphics/event_objects/pics/people/running_triathlete_m/3.png diff --git a/graphics/map_objects/pics/people/running_triathlete_m/4.png b/graphics/event_objects/pics/people/running_triathlete_m/4.png similarity index 100% rename from graphics/map_objects/pics/people/running_triathlete_m/4.png rename to graphics/event_objects/pics/people/running_triathlete_m/4.png diff --git a/graphics/map_objects/pics/people/running_triathlete_m/5.png b/graphics/event_objects/pics/people/running_triathlete_m/5.png similarity index 100% rename from graphics/map_objects/pics/people/running_triathlete_m/5.png rename to graphics/event_objects/pics/people/running_triathlete_m/5.png diff --git a/graphics/map_objects/pics/people/running_triathlete_m/6.png b/graphics/event_objects/pics/people/running_triathlete_m/6.png similarity index 100% rename from graphics/map_objects/pics/people/running_triathlete_m/6.png rename to graphics/event_objects/pics/people/running_triathlete_m/6.png diff --git a/graphics/map_objects/pics/people/running_triathlete_m/7.png b/graphics/event_objects/pics/people/running_triathlete_m/7.png similarity index 100% rename from graphics/map_objects/pics/people/running_triathlete_m/7.png rename to graphics/event_objects/pics/people/running_triathlete_m/7.png diff --git a/graphics/map_objects/pics/people/running_triathlete_m/8.png b/graphics/event_objects/pics/people/running_triathlete_m/8.png similarity index 100% rename from graphics/map_objects/pics/people/running_triathlete_m/8.png rename to graphics/event_objects/pics/people/running_triathlete_m/8.png diff --git a/graphics/map_objects/pics/people/sailor/0.png b/graphics/event_objects/pics/people/sailor/0.png similarity index 100% rename from graphics/map_objects/pics/people/sailor/0.png rename to graphics/event_objects/pics/people/sailor/0.png diff --git a/graphics/map_objects/pics/people/sailor/1.png b/graphics/event_objects/pics/people/sailor/1.png similarity index 100% rename from graphics/map_objects/pics/people/sailor/1.png rename to graphics/event_objects/pics/people/sailor/1.png diff --git a/graphics/map_objects/pics/people/sailor/2.png b/graphics/event_objects/pics/people/sailor/2.png similarity index 100% rename from graphics/map_objects/pics/people/sailor/2.png rename to graphics/event_objects/pics/people/sailor/2.png diff --git a/graphics/map_objects/pics/people/sailor/3.png b/graphics/event_objects/pics/people/sailor/3.png similarity index 100% rename from graphics/map_objects/pics/people/sailor/3.png rename to graphics/event_objects/pics/people/sailor/3.png diff --git a/graphics/map_objects/pics/people/sailor/4.png b/graphics/event_objects/pics/people/sailor/4.png similarity index 100% rename from graphics/map_objects/pics/people/sailor/4.png rename to graphics/event_objects/pics/people/sailor/4.png diff --git a/graphics/map_objects/pics/people/sailor/5.png b/graphics/event_objects/pics/people/sailor/5.png similarity index 100% rename from graphics/map_objects/pics/people/sailor/5.png rename to graphics/event_objects/pics/people/sailor/5.png diff --git a/graphics/map_objects/pics/people/sailor/6.png b/graphics/event_objects/pics/people/sailor/6.png similarity index 100% rename from graphics/map_objects/pics/people/sailor/6.png rename to graphics/event_objects/pics/people/sailor/6.png diff --git a/graphics/map_objects/pics/people/sailor/7.png b/graphics/event_objects/pics/people/sailor/7.png similarity index 100% rename from graphics/map_objects/pics/people/sailor/7.png rename to graphics/event_objects/pics/people/sailor/7.png diff --git a/graphics/map_objects/pics/people/sailor/8.png b/graphics/event_objects/pics/people/sailor/8.png similarity index 100% rename from graphics/map_objects/pics/people/sailor/8.png rename to graphics/event_objects/pics/people/sailor/8.png diff --git a/graphics/map_objects/pics/people/school_kid_m/0.png b/graphics/event_objects/pics/people/school_kid_m/0.png similarity index 100% rename from graphics/map_objects/pics/people/school_kid_m/0.png rename to graphics/event_objects/pics/people/school_kid_m/0.png diff --git a/graphics/map_objects/pics/people/school_kid_m/1.png b/graphics/event_objects/pics/people/school_kid_m/1.png similarity index 100% rename from graphics/map_objects/pics/people/school_kid_m/1.png rename to graphics/event_objects/pics/people/school_kid_m/1.png diff --git a/graphics/map_objects/pics/people/school_kid_m/2.png b/graphics/event_objects/pics/people/school_kid_m/2.png similarity index 100% rename from graphics/map_objects/pics/people/school_kid_m/2.png rename to graphics/event_objects/pics/people/school_kid_m/2.png diff --git a/graphics/map_objects/pics/people/school_kid_m/3.png b/graphics/event_objects/pics/people/school_kid_m/3.png similarity index 100% rename from graphics/map_objects/pics/people/school_kid_m/3.png rename to graphics/event_objects/pics/people/school_kid_m/3.png diff --git a/graphics/map_objects/pics/people/school_kid_m/4.png b/graphics/event_objects/pics/people/school_kid_m/4.png similarity index 100% rename from graphics/map_objects/pics/people/school_kid_m/4.png rename to graphics/event_objects/pics/people/school_kid_m/4.png diff --git a/graphics/map_objects/pics/people/school_kid_m/5.png b/graphics/event_objects/pics/people/school_kid_m/5.png similarity index 100% rename from graphics/map_objects/pics/people/school_kid_m/5.png rename to graphics/event_objects/pics/people/school_kid_m/5.png diff --git a/graphics/map_objects/pics/people/school_kid_m/6.png b/graphics/event_objects/pics/people/school_kid_m/6.png similarity index 100% rename from graphics/map_objects/pics/people/school_kid_m/6.png rename to graphics/event_objects/pics/people/school_kid_m/6.png diff --git a/graphics/map_objects/pics/people/school_kid_m/7.png b/graphics/event_objects/pics/people/school_kid_m/7.png similarity index 100% rename from graphics/map_objects/pics/people/school_kid_m/7.png rename to graphics/event_objects/pics/people/school_kid_m/7.png diff --git a/graphics/map_objects/pics/people/school_kid_m/8.png b/graphics/event_objects/pics/people/school_kid_m/8.png similarity index 100% rename from graphics/map_objects/pics/people/school_kid_m/8.png rename to graphics/event_objects/pics/people/school_kid_m/8.png diff --git a/graphics/map_objects/pics/people/scientist_1/0.png b/graphics/event_objects/pics/people/scientist_1/0.png similarity index 100% rename from graphics/map_objects/pics/people/scientist_1/0.png rename to graphics/event_objects/pics/people/scientist_1/0.png diff --git a/graphics/map_objects/pics/people/scientist_1/1.png b/graphics/event_objects/pics/people/scientist_1/1.png similarity index 100% rename from graphics/map_objects/pics/people/scientist_1/1.png rename to graphics/event_objects/pics/people/scientist_1/1.png diff --git a/graphics/map_objects/pics/people/scientist_1/2.png b/graphics/event_objects/pics/people/scientist_1/2.png similarity index 100% rename from graphics/map_objects/pics/people/scientist_1/2.png rename to graphics/event_objects/pics/people/scientist_1/2.png diff --git a/graphics/map_objects/pics/people/scientist_1/3.png b/graphics/event_objects/pics/people/scientist_1/3.png similarity index 100% rename from graphics/map_objects/pics/people/scientist_1/3.png rename to graphics/event_objects/pics/people/scientist_1/3.png diff --git a/graphics/map_objects/pics/people/scientist_1/4.png b/graphics/event_objects/pics/people/scientist_1/4.png similarity index 100% rename from graphics/map_objects/pics/people/scientist_1/4.png rename to graphics/event_objects/pics/people/scientist_1/4.png diff --git a/graphics/map_objects/pics/people/scientist_1/5.png b/graphics/event_objects/pics/people/scientist_1/5.png similarity index 100% rename from graphics/map_objects/pics/people/scientist_1/5.png rename to graphics/event_objects/pics/people/scientist_1/5.png diff --git a/graphics/map_objects/pics/people/scientist_1/6.png b/graphics/event_objects/pics/people/scientist_1/6.png similarity index 100% rename from graphics/map_objects/pics/people/scientist_1/6.png rename to graphics/event_objects/pics/people/scientist_1/6.png diff --git a/graphics/map_objects/pics/people/scientist_1/7.png b/graphics/event_objects/pics/people/scientist_1/7.png similarity index 100% rename from graphics/map_objects/pics/people/scientist_1/7.png rename to graphics/event_objects/pics/people/scientist_1/7.png diff --git a/graphics/map_objects/pics/people/scientist_1/8.png b/graphics/event_objects/pics/people/scientist_1/8.png similarity index 100% rename from graphics/map_objects/pics/people/scientist_1/8.png rename to graphics/event_objects/pics/people/scientist_1/8.png diff --git a/graphics/map_objects/pics/people/scientist_2/0.png b/graphics/event_objects/pics/people/scientist_2/0.png similarity index 100% rename from graphics/map_objects/pics/people/scientist_2/0.png rename to graphics/event_objects/pics/people/scientist_2/0.png diff --git a/graphics/map_objects/pics/people/scientist_2/1.png b/graphics/event_objects/pics/people/scientist_2/1.png similarity index 100% rename from graphics/map_objects/pics/people/scientist_2/1.png rename to graphics/event_objects/pics/people/scientist_2/1.png diff --git a/graphics/map_objects/pics/people/scientist_2/2.png b/graphics/event_objects/pics/people/scientist_2/2.png similarity index 100% rename from graphics/map_objects/pics/people/scientist_2/2.png rename to graphics/event_objects/pics/people/scientist_2/2.png diff --git a/graphics/map_objects/pics/people/scientist_2/3.png b/graphics/event_objects/pics/people/scientist_2/3.png similarity index 100% rename from graphics/map_objects/pics/people/scientist_2/3.png rename to graphics/event_objects/pics/people/scientist_2/3.png diff --git a/graphics/map_objects/pics/people/scientist_2/4.png b/graphics/event_objects/pics/people/scientist_2/4.png similarity index 100% rename from graphics/map_objects/pics/people/scientist_2/4.png rename to graphics/event_objects/pics/people/scientist_2/4.png diff --git a/graphics/map_objects/pics/people/scientist_2/5.png b/graphics/event_objects/pics/people/scientist_2/5.png similarity index 100% rename from graphics/map_objects/pics/people/scientist_2/5.png rename to graphics/event_objects/pics/people/scientist_2/5.png diff --git a/graphics/map_objects/pics/people/scientist_2/6.png b/graphics/event_objects/pics/people/scientist_2/6.png similarity index 100% rename from graphics/map_objects/pics/people/scientist_2/6.png rename to graphics/event_objects/pics/people/scientist_2/6.png diff --git a/graphics/map_objects/pics/people/scientist_2/7.png b/graphics/event_objects/pics/people/scientist_2/7.png similarity index 100% rename from graphics/map_objects/pics/people/scientist_2/7.png rename to graphics/event_objects/pics/people/scientist_2/7.png diff --git a/graphics/map_objects/pics/people/scientist_2/8.png b/graphics/event_objects/pics/people/scientist_2/8.png similarity index 100% rename from graphics/map_objects/pics/people/scientist_2/8.png rename to graphics/event_objects/pics/people/scientist_2/8.png diff --git a/graphics/map_objects/pics/people/scott/0.png b/graphics/event_objects/pics/people/scott/0.png similarity index 100% rename from graphics/map_objects/pics/people/scott/0.png rename to graphics/event_objects/pics/people/scott/0.png diff --git a/graphics/map_objects/pics/people/scott/1.png b/graphics/event_objects/pics/people/scott/1.png similarity index 100% rename from graphics/map_objects/pics/people/scott/1.png rename to graphics/event_objects/pics/people/scott/1.png diff --git a/graphics/map_objects/pics/people/scott/2.png b/graphics/event_objects/pics/people/scott/2.png similarity index 100% rename from graphics/map_objects/pics/people/scott/2.png rename to graphics/event_objects/pics/people/scott/2.png diff --git a/graphics/map_objects/pics/people/scott/3.png b/graphics/event_objects/pics/people/scott/3.png similarity index 100% rename from graphics/map_objects/pics/people/scott/3.png rename to graphics/event_objects/pics/people/scott/3.png diff --git a/graphics/map_objects/pics/people/scott/4.png b/graphics/event_objects/pics/people/scott/4.png similarity index 100% rename from graphics/map_objects/pics/people/scott/4.png rename to graphics/event_objects/pics/people/scott/4.png diff --git a/graphics/map_objects/pics/people/scott/5.png b/graphics/event_objects/pics/people/scott/5.png similarity index 100% rename from graphics/map_objects/pics/people/scott/5.png rename to graphics/event_objects/pics/people/scott/5.png diff --git a/graphics/map_objects/pics/people/scott/6.png b/graphics/event_objects/pics/people/scott/6.png similarity index 100% rename from graphics/map_objects/pics/people/scott/6.png rename to graphics/event_objects/pics/people/scott/6.png diff --git a/graphics/map_objects/pics/people/scott/7.png b/graphics/event_objects/pics/people/scott/7.png similarity index 100% rename from graphics/map_objects/pics/people/scott/7.png rename to graphics/event_objects/pics/people/scott/7.png diff --git a/graphics/map_objects/pics/people/scott/8.png b/graphics/event_objects/pics/people/scott/8.png similarity index 100% rename from graphics/map_objects/pics/people/scott/8.png rename to graphics/event_objects/pics/people/scott/8.png diff --git a/graphics/map_objects/pics/people/sidney/0.png b/graphics/event_objects/pics/people/sidney/0.png similarity index 100% rename from graphics/map_objects/pics/people/sidney/0.png rename to graphics/event_objects/pics/people/sidney/0.png diff --git a/graphics/map_objects/pics/people/sidney/1.png b/graphics/event_objects/pics/people/sidney/1.png similarity index 100% rename from graphics/map_objects/pics/people/sidney/1.png rename to graphics/event_objects/pics/people/sidney/1.png diff --git a/graphics/map_objects/pics/people/sidney/2.png b/graphics/event_objects/pics/people/sidney/2.png similarity index 100% rename from graphics/map_objects/pics/people/sidney/2.png rename to graphics/event_objects/pics/people/sidney/2.png diff --git a/graphics/map_objects/pics/people/spenser/0.png b/graphics/event_objects/pics/people/spenser/0.png similarity index 100% rename from graphics/map_objects/pics/people/spenser/0.png rename to graphics/event_objects/pics/people/spenser/0.png diff --git a/graphics/map_objects/pics/people/spenser/1.png b/graphics/event_objects/pics/people/spenser/1.png similarity index 100% rename from graphics/map_objects/pics/people/spenser/1.png rename to graphics/event_objects/pics/people/spenser/1.png diff --git a/graphics/map_objects/pics/people/spenser/2.png b/graphics/event_objects/pics/people/spenser/2.png similarity index 100% rename from graphics/map_objects/pics/people/spenser/2.png rename to graphics/event_objects/pics/people/spenser/2.png diff --git a/graphics/map_objects/pics/people/spenser/3.png b/graphics/event_objects/pics/people/spenser/3.png similarity index 100% rename from graphics/map_objects/pics/people/spenser/3.png rename to graphics/event_objects/pics/people/spenser/3.png diff --git a/graphics/map_objects/pics/people/spenser/4.png b/graphics/event_objects/pics/people/spenser/4.png similarity index 100% rename from graphics/map_objects/pics/people/spenser/4.png rename to graphics/event_objects/pics/people/spenser/4.png diff --git a/graphics/map_objects/pics/people/spenser/5.png b/graphics/event_objects/pics/people/spenser/5.png similarity index 100% rename from graphics/map_objects/pics/people/spenser/5.png rename to graphics/event_objects/pics/people/spenser/5.png diff --git a/graphics/map_objects/pics/people/spenser/6.png b/graphics/event_objects/pics/people/spenser/6.png similarity index 100% rename from graphics/map_objects/pics/people/spenser/6.png rename to graphics/event_objects/pics/people/spenser/6.png diff --git a/graphics/map_objects/pics/people/spenser/7.png b/graphics/event_objects/pics/people/spenser/7.png similarity index 100% rename from graphics/map_objects/pics/people/spenser/7.png rename to graphics/event_objects/pics/people/spenser/7.png diff --git a/graphics/map_objects/pics/people/spenser/8.png b/graphics/event_objects/pics/people/spenser/8.png similarity index 100% rename from graphics/map_objects/pics/people/spenser/8.png rename to graphics/event_objects/pics/people/spenser/8.png diff --git a/graphics/map_objects/pics/people/steven/0.png b/graphics/event_objects/pics/people/steven/0.png similarity index 100% rename from graphics/map_objects/pics/people/steven/0.png rename to graphics/event_objects/pics/people/steven/0.png diff --git a/graphics/map_objects/pics/people/steven/1.png b/graphics/event_objects/pics/people/steven/1.png similarity index 100% rename from graphics/map_objects/pics/people/steven/1.png rename to graphics/event_objects/pics/people/steven/1.png diff --git a/graphics/map_objects/pics/people/steven/2.png b/graphics/event_objects/pics/people/steven/2.png similarity index 100% rename from graphics/map_objects/pics/people/steven/2.png rename to graphics/event_objects/pics/people/steven/2.png diff --git a/graphics/map_objects/pics/people/steven/3.png b/graphics/event_objects/pics/people/steven/3.png similarity index 100% rename from graphics/map_objects/pics/people/steven/3.png rename to graphics/event_objects/pics/people/steven/3.png diff --git a/graphics/map_objects/pics/people/steven/4.png b/graphics/event_objects/pics/people/steven/4.png similarity index 100% rename from graphics/map_objects/pics/people/steven/4.png rename to graphics/event_objects/pics/people/steven/4.png diff --git a/graphics/map_objects/pics/people/steven/5.png b/graphics/event_objects/pics/people/steven/5.png similarity index 100% rename from graphics/map_objects/pics/people/steven/5.png rename to graphics/event_objects/pics/people/steven/5.png diff --git a/graphics/map_objects/pics/people/steven/6.png b/graphics/event_objects/pics/people/steven/6.png similarity index 100% rename from graphics/map_objects/pics/people/steven/6.png rename to graphics/event_objects/pics/people/steven/6.png diff --git a/graphics/map_objects/pics/people/steven/7.png b/graphics/event_objects/pics/people/steven/7.png similarity index 100% rename from graphics/map_objects/pics/people/steven/7.png rename to graphics/event_objects/pics/people/steven/7.png diff --git a/graphics/map_objects/pics/people/steven/8.png b/graphics/event_objects/pics/people/steven/8.png similarity index 100% rename from graphics/map_objects/pics/people/steven/8.png rename to graphics/event_objects/pics/people/steven/8.png diff --git a/graphics/map_objects/pics/people/swimmer_f/0.png b/graphics/event_objects/pics/people/swimmer_f/0.png similarity index 100% rename from graphics/map_objects/pics/people/swimmer_f/0.png rename to graphics/event_objects/pics/people/swimmer_f/0.png diff --git a/graphics/map_objects/pics/people/swimmer_f/1.png b/graphics/event_objects/pics/people/swimmer_f/1.png similarity index 100% rename from graphics/map_objects/pics/people/swimmer_f/1.png rename to graphics/event_objects/pics/people/swimmer_f/1.png diff --git a/graphics/map_objects/pics/people/swimmer_f/2.png b/graphics/event_objects/pics/people/swimmer_f/2.png similarity index 100% rename from graphics/map_objects/pics/people/swimmer_f/2.png rename to graphics/event_objects/pics/people/swimmer_f/2.png diff --git a/graphics/map_objects/pics/people/swimmer_f/3.png b/graphics/event_objects/pics/people/swimmer_f/3.png similarity index 100% rename from graphics/map_objects/pics/people/swimmer_f/3.png rename to graphics/event_objects/pics/people/swimmer_f/3.png diff --git a/graphics/map_objects/pics/people/swimmer_f/4.png b/graphics/event_objects/pics/people/swimmer_f/4.png similarity index 100% rename from graphics/map_objects/pics/people/swimmer_f/4.png rename to graphics/event_objects/pics/people/swimmer_f/4.png diff --git a/graphics/map_objects/pics/people/swimmer_f/5.png b/graphics/event_objects/pics/people/swimmer_f/5.png similarity index 100% rename from graphics/map_objects/pics/people/swimmer_f/5.png rename to graphics/event_objects/pics/people/swimmer_f/5.png diff --git a/graphics/map_objects/pics/people/swimmer_f/6.png b/graphics/event_objects/pics/people/swimmer_f/6.png similarity index 100% rename from graphics/map_objects/pics/people/swimmer_f/6.png rename to graphics/event_objects/pics/people/swimmer_f/6.png diff --git a/graphics/map_objects/pics/people/swimmer_f/7.png b/graphics/event_objects/pics/people/swimmer_f/7.png similarity index 100% rename from graphics/map_objects/pics/people/swimmer_f/7.png rename to graphics/event_objects/pics/people/swimmer_f/7.png diff --git a/graphics/map_objects/pics/people/swimmer_f/8.png b/graphics/event_objects/pics/people/swimmer_f/8.png similarity index 100% rename from graphics/map_objects/pics/people/swimmer_f/8.png rename to graphics/event_objects/pics/people/swimmer_f/8.png diff --git a/graphics/map_objects/pics/people/swimmer_m/0.png b/graphics/event_objects/pics/people/swimmer_m/0.png similarity index 100% rename from graphics/map_objects/pics/people/swimmer_m/0.png rename to graphics/event_objects/pics/people/swimmer_m/0.png diff --git a/graphics/map_objects/pics/people/swimmer_m/1.png b/graphics/event_objects/pics/people/swimmer_m/1.png similarity index 100% rename from graphics/map_objects/pics/people/swimmer_m/1.png rename to graphics/event_objects/pics/people/swimmer_m/1.png diff --git a/graphics/map_objects/pics/people/swimmer_m/2.png b/graphics/event_objects/pics/people/swimmer_m/2.png similarity index 100% rename from graphics/map_objects/pics/people/swimmer_m/2.png rename to graphics/event_objects/pics/people/swimmer_m/2.png diff --git a/graphics/map_objects/pics/people/swimmer_m/3.png b/graphics/event_objects/pics/people/swimmer_m/3.png similarity index 100% rename from graphics/map_objects/pics/people/swimmer_m/3.png rename to graphics/event_objects/pics/people/swimmer_m/3.png diff --git a/graphics/map_objects/pics/people/swimmer_m/4.png b/graphics/event_objects/pics/people/swimmer_m/4.png similarity index 100% rename from graphics/map_objects/pics/people/swimmer_m/4.png rename to graphics/event_objects/pics/people/swimmer_m/4.png diff --git a/graphics/map_objects/pics/people/swimmer_m/5.png b/graphics/event_objects/pics/people/swimmer_m/5.png similarity index 100% rename from graphics/map_objects/pics/people/swimmer_m/5.png rename to graphics/event_objects/pics/people/swimmer_m/5.png diff --git a/graphics/map_objects/pics/people/swimmer_m/6.png b/graphics/event_objects/pics/people/swimmer_m/6.png similarity index 100% rename from graphics/map_objects/pics/people/swimmer_m/6.png rename to graphics/event_objects/pics/people/swimmer_m/6.png diff --git a/graphics/map_objects/pics/people/swimmer_m/7.png b/graphics/event_objects/pics/people/swimmer_m/7.png similarity index 100% rename from graphics/map_objects/pics/people/swimmer_m/7.png rename to graphics/event_objects/pics/people/swimmer_m/7.png diff --git a/graphics/map_objects/pics/people/swimmer_m/8.png b/graphics/event_objects/pics/people/swimmer_m/8.png similarity index 100% rename from graphics/map_objects/pics/people/swimmer_m/8.png rename to graphics/event_objects/pics/people/swimmer_m/8.png diff --git a/graphics/map_objects/pics/people/tate/0.png b/graphics/event_objects/pics/people/tate/0.png similarity index 100% rename from graphics/map_objects/pics/people/tate/0.png rename to graphics/event_objects/pics/people/tate/0.png diff --git a/graphics/map_objects/pics/people/tate/1.png b/graphics/event_objects/pics/people/tate/1.png similarity index 100% rename from graphics/map_objects/pics/people/tate/1.png rename to graphics/event_objects/pics/people/tate/1.png diff --git a/graphics/map_objects/pics/people/tate/2.png b/graphics/event_objects/pics/people/tate/2.png similarity index 100% rename from graphics/map_objects/pics/people/tate/2.png rename to graphics/event_objects/pics/people/tate/2.png diff --git a/graphics/map_objects/pics/people/teala/0.png b/graphics/event_objects/pics/people/teala/0.png similarity index 100% rename from graphics/map_objects/pics/people/teala/0.png rename to graphics/event_objects/pics/people/teala/0.png diff --git a/graphics/map_objects/pics/people/teala/1.png b/graphics/event_objects/pics/people/teala/1.png similarity index 100% rename from graphics/map_objects/pics/people/teala/1.png rename to graphics/event_objects/pics/people/teala/1.png diff --git a/graphics/map_objects/pics/people/teala/2.png b/graphics/event_objects/pics/people/teala/2.png similarity index 100% rename from graphics/map_objects/pics/people/teala/2.png rename to graphics/event_objects/pics/people/teala/2.png diff --git a/graphics/map_objects/pics/people/teala/3.png b/graphics/event_objects/pics/people/teala/3.png similarity index 100% rename from graphics/map_objects/pics/people/teala/3.png rename to graphics/event_objects/pics/people/teala/3.png diff --git a/graphics/map_objects/pics/people/teala/4.png b/graphics/event_objects/pics/people/teala/4.png similarity index 100% rename from graphics/map_objects/pics/people/teala/4.png rename to graphics/event_objects/pics/people/teala/4.png diff --git a/graphics/map_objects/pics/people/teala/5.png b/graphics/event_objects/pics/people/teala/5.png similarity index 100% rename from graphics/map_objects/pics/people/teala/5.png rename to graphics/event_objects/pics/people/teala/5.png diff --git a/graphics/map_objects/pics/people/teala/6.png b/graphics/event_objects/pics/people/teala/6.png similarity index 100% rename from graphics/map_objects/pics/people/teala/6.png rename to graphics/event_objects/pics/people/teala/6.png diff --git a/graphics/map_objects/pics/people/teala/7.png b/graphics/event_objects/pics/people/teala/7.png similarity index 100% rename from graphics/map_objects/pics/people/teala/7.png rename to graphics/event_objects/pics/people/teala/7.png diff --git a/graphics/map_objects/pics/people/teala/8.png b/graphics/event_objects/pics/people/teala/8.png similarity index 100% rename from graphics/map_objects/pics/people/teala/8.png rename to graphics/event_objects/pics/people/teala/8.png diff --git a/graphics/map_objects/pics/people/tuber_f/0.png b/graphics/event_objects/pics/people/tuber_f/0.png similarity index 100% rename from graphics/map_objects/pics/people/tuber_f/0.png rename to graphics/event_objects/pics/people/tuber_f/0.png diff --git a/graphics/map_objects/pics/people/tuber_f/1.png b/graphics/event_objects/pics/people/tuber_f/1.png similarity index 100% rename from graphics/map_objects/pics/people/tuber_f/1.png rename to graphics/event_objects/pics/people/tuber_f/1.png diff --git a/graphics/map_objects/pics/people/tuber_f/2.png b/graphics/event_objects/pics/people/tuber_f/2.png similarity index 100% rename from graphics/map_objects/pics/people/tuber_f/2.png rename to graphics/event_objects/pics/people/tuber_f/2.png diff --git a/graphics/map_objects/pics/people/tuber_f/3.png b/graphics/event_objects/pics/people/tuber_f/3.png similarity index 100% rename from graphics/map_objects/pics/people/tuber_f/3.png rename to graphics/event_objects/pics/people/tuber_f/3.png diff --git a/graphics/map_objects/pics/people/tuber_f/4.png b/graphics/event_objects/pics/people/tuber_f/4.png similarity index 100% rename from graphics/map_objects/pics/people/tuber_f/4.png rename to graphics/event_objects/pics/people/tuber_f/4.png diff --git a/graphics/map_objects/pics/people/tuber_f/5.png b/graphics/event_objects/pics/people/tuber_f/5.png similarity index 100% rename from graphics/map_objects/pics/people/tuber_f/5.png rename to graphics/event_objects/pics/people/tuber_f/5.png diff --git a/graphics/map_objects/pics/people/tuber_f/6.png b/graphics/event_objects/pics/people/tuber_f/6.png similarity index 100% rename from graphics/map_objects/pics/people/tuber_f/6.png rename to graphics/event_objects/pics/people/tuber_f/6.png diff --git a/graphics/map_objects/pics/people/tuber_f/7.png b/graphics/event_objects/pics/people/tuber_f/7.png similarity index 100% rename from graphics/map_objects/pics/people/tuber_f/7.png rename to graphics/event_objects/pics/people/tuber_f/7.png diff --git a/graphics/map_objects/pics/people/tuber_f/8.png b/graphics/event_objects/pics/people/tuber_f/8.png similarity index 100% rename from graphics/map_objects/pics/people/tuber_f/8.png rename to graphics/event_objects/pics/people/tuber_f/8.png diff --git a/graphics/map_objects/pics/people/tuber_m/0.png b/graphics/event_objects/pics/people/tuber_m/0.png similarity index 100% rename from graphics/map_objects/pics/people/tuber_m/0.png rename to graphics/event_objects/pics/people/tuber_m/0.png diff --git a/graphics/map_objects/pics/people/tuber_m/1.png b/graphics/event_objects/pics/people/tuber_m/1.png similarity index 100% rename from graphics/map_objects/pics/people/tuber_m/1.png rename to graphics/event_objects/pics/people/tuber_m/1.png diff --git a/graphics/map_objects/pics/people/tuber_m/2.png b/graphics/event_objects/pics/people/tuber_m/2.png similarity index 100% rename from graphics/map_objects/pics/people/tuber_m/2.png rename to graphics/event_objects/pics/people/tuber_m/2.png diff --git a/graphics/map_objects/pics/people/tuber_m/3.png b/graphics/event_objects/pics/people/tuber_m/3.png similarity index 100% rename from graphics/map_objects/pics/people/tuber_m/3.png rename to graphics/event_objects/pics/people/tuber_m/3.png diff --git a/graphics/map_objects/pics/people/tuber_m/4.png b/graphics/event_objects/pics/people/tuber_m/4.png similarity index 100% rename from graphics/map_objects/pics/people/tuber_m/4.png rename to graphics/event_objects/pics/people/tuber_m/4.png diff --git a/graphics/map_objects/pics/people/tuber_m/5.png b/graphics/event_objects/pics/people/tuber_m/5.png similarity index 100% rename from graphics/map_objects/pics/people/tuber_m/5.png rename to graphics/event_objects/pics/people/tuber_m/5.png diff --git a/graphics/map_objects/pics/people/tuber_m/6.png b/graphics/event_objects/pics/people/tuber_m/6.png similarity index 100% rename from graphics/map_objects/pics/people/tuber_m/6.png rename to graphics/event_objects/pics/people/tuber_m/6.png diff --git a/graphics/map_objects/pics/people/tuber_m/7.png b/graphics/event_objects/pics/people/tuber_m/7.png similarity index 100% rename from graphics/map_objects/pics/people/tuber_m/7.png rename to graphics/event_objects/pics/people/tuber_m/7.png diff --git a/graphics/map_objects/pics/people/tuber_m/8.png b/graphics/event_objects/pics/people/tuber_m/8.png similarity index 100% rename from graphics/map_objects/pics/people/tuber_m/8.png rename to graphics/event_objects/pics/people/tuber_m/8.png diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/0.png b/graphics/event_objects/pics/people/tuber_m_swimming/0.png similarity index 100% rename from graphics/map_objects/pics/people/tuber_m_swimming/0.png rename to graphics/event_objects/pics/people/tuber_m_swimming/0.png diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/1.png b/graphics/event_objects/pics/people/tuber_m_swimming/1.png similarity index 100% rename from graphics/map_objects/pics/people/tuber_m_swimming/1.png rename to graphics/event_objects/pics/people/tuber_m_swimming/1.png diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/2.png b/graphics/event_objects/pics/people/tuber_m_swimming/2.png similarity index 100% rename from graphics/map_objects/pics/people/tuber_m_swimming/2.png rename to graphics/event_objects/pics/people/tuber_m_swimming/2.png diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/3.png b/graphics/event_objects/pics/people/tuber_m_swimming/3.png similarity index 100% rename from graphics/map_objects/pics/people/tuber_m_swimming/3.png rename to graphics/event_objects/pics/people/tuber_m_swimming/3.png diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/4.png b/graphics/event_objects/pics/people/tuber_m_swimming/4.png similarity index 100% rename from graphics/map_objects/pics/people/tuber_m_swimming/4.png rename to graphics/event_objects/pics/people/tuber_m_swimming/4.png diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/5.png b/graphics/event_objects/pics/people/tuber_m_swimming/5.png similarity index 100% rename from graphics/map_objects/pics/people/tuber_m_swimming/5.png rename to graphics/event_objects/pics/people/tuber_m_swimming/5.png diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/6.png b/graphics/event_objects/pics/people/tuber_m_swimming/6.png similarity index 100% rename from graphics/map_objects/pics/people/tuber_m_swimming/6.png rename to graphics/event_objects/pics/people/tuber_m_swimming/6.png diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/7.png b/graphics/event_objects/pics/people/tuber_m_swimming/7.png similarity index 100% rename from graphics/map_objects/pics/people/tuber_m_swimming/7.png rename to graphics/event_objects/pics/people/tuber_m_swimming/7.png diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/8.png b/graphics/event_objects/pics/people/tuber_m_swimming/8.png similarity index 100% rename from graphics/map_objects/pics/people/tuber_m_swimming/8.png rename to graphics/event_objects/pics/people/tuber_m_swimming/8.png diff --git a/graphics/map_objects/pics/people/tucker/0.png b/graphics/event_objects/pics/people/tucker/0.png similarity index 100% rename from graphics/map_objects/pics/people/tucker/0.png rename to graphics/event_objects/pics/people/tucker/0.png diff --git a/graphics/map_objects/pics/people/tucker/1.png b/graphics/event_objects/pics/people/tucker/1.png similarity index 100% rename from graphics/map_objects/pics/people/tucker/1.png rename to graphics/event_objects/pics/people/tucker/1.png diff --git a/graphics/map_objects/pics/people/tucker/2.png b/graphics/event_objects/pics/people/tucker/2.png similarity index 100% rename from graphics/map_objects/pics/people/tucker/2.png rename to graphics/event_objects/pics/people/tucker/2.png diff --git a/graphics/map_objects/pics/people/tucker/3.png b/graphics/event_objects/pics/people/tucker/3.png similarity index 100% rename from graphics/map_objects/pics/people/tucker/3.png rename to graphics/event_objects/pics/people/tucker/3.png diff --git a/graphics/map_objects/pics/people/tucker/4.png b/graphics/event_objects/pics/people/tucker/4.png similarity index 100% rename from graphics/map_objects/pics/people/tucker/4.png rename to graphics/event_objects/pics/people/tucker/4.png diff --git a/graphics/map_objects/pics/people/tucker/5.png b/graphics/event_objects/pics/people/tucker/5.png similarity index 100% rename from graphics/map_objects/pics/people/tucker/5.png rename to graphics/event_objects/pics/people/tucker/5.png diff --git a/graphics/map_objects/pics/people/tucker/6.png b/graphics/event_objects/pics/people/tucker/6.png similarity index 100% rename from graphics/map_objects/pics/people/tucker/6.png rename to graphics/event_objects/pics/people/tucker/6.png diff --git a/graphics/map_objects/pics/people/tucker/7.png b/graphics/event_objects/pics/people/tucker/7.png similarity index 100% rename from graphics/map_objects/pics/people/tucker/7.png rename to graphics/event_objects/pics/people/tucker/7.png diff --git a/graphics/map_objects/pics/people/tucker/8.png b/graphics/event_objects/pics/people/tucker/8.png similarity index 100% rename from graphics/map_objects/pics/people/tucker/8.png rename to graphics/event_objects/pics/people/tucker/8.png diff --git a/graphics/map_objects/pics/people/union_room_attendant/0.png b/graphics/event_objects/pics/people/union_room_attendant/0.png similarity index 100% rename from graphics/map_objects/pics/people/union_room_attendant/0.png rename to graphics/event_objects/pics/people/union_room_attendant/0.png diff --git a/graphics/map_objects/pics/people/union_room_attendant/1.png b/graphics/event_objects/pics/people/union_room_attendant/1.png similarity index 100% rename from graphics/map_objects/pics/people/union_room_attendant/1.png rename to graphics/event_objects/pics/people/union_room_attendant/1.png diff --git a/graphics/map_objects/pics/people/union_room_attendant/2.png b/graphics/event_objects/pics/people/union_room_attendant/2.png similarity index 100% rename from graphics/map_objects/pics/people/union_room_attendant/2.png rename to graphics/event_objects/pics/people/union_room_attendant/2.png diff --git a/graphics/map_objects/pics/people/unused_woman/0.png b/graphics/event_objects/pics/people/unused_woman/0.png similarity index 100% rename from graphics/map_objects/pics/people/unused_woman/0.png rename to graphics/event_objects/pics/people/unused_woman/0.png diff --git a/graphics/map_objects/pics/people/unused_woman/1.png b/graphics/event_objects/pics/people/unused_woman/1.png similarity index 100% rename from graphics/map_objects/pics/people/unused_woman/1.png rename to graphics/event_objects/pics/people/unused_woman/1.png diff --git a/graphics/map_objects/pics/people/unused_woman/2.png b/graphics/event_objects/pics/people/unused_woman/2.png similarity index 100% rename from graphics/map_objects/pics/people/unused_woman/2.png rename to graphics/event_objects/pics/people/unused_woman/2.png diff --git a/graphics/map_objects/pics/people/unused_woman/3.png b/graphics/event_objects/pics/people/unused_woman/3.png similarity index 100% rename from graphics/map_objects/pics/people/unused_woman/3.png rename to graphics/event_objects/pics/people/unused_woman/3.png diff --git a/graphics/map_objects/pics/people/unused_woman/4.png b/graphics/event_objects/pics/people/unused_woman/4.png similarity index 100% rename from graphics/map_objects/pics/people/unused_woman/4.png rename to graphics/event_objects/pics/people/unused_woman/4.png diff --git a/graphics/map_objects/pics/people/unused_woman/5.png b/graphics/event_objects/pics/people/unused_woman/5.png similarity index 100% rename from graphics/map_objects/pics/people/unused_woman/5.png rename to graphics/event_objects/pics/people/unused_woman/5.png diff --git a/graphics/map_objects/pics/people/unused_woman/6.png b/graphics/event_objects/pics/people/unused_woman/6.png similarity index 100% rename from graphics/map_objects/pics/people/unused_woman/6.png rename to graphics/event_objects/pics/people/unused_woman/6.png diff --git a/graphics/map_objects/pics/people/unused_woman/7.png b/graphics/event_objects/pics/people/unused_woman/7.png similarity index 100% rename from graphics/map_objects/pics/people/unused_woman/7.png rename to graphics/event_objects/pics/people/unused_woman/7.png diff --git a/graphics/map_objects/pics/people/unused_woman/8.png b/graphics/event_objects/pics/people/unused_woman/8.png similarity index 100% rename from graphics/map_objects/pics/people/unused_woman/8.png rename to graphics/event_objects/pics/people/unused_woman/8.png diff --git a/graphics/map_objects/pics/people/wallace/0.png b/graphics/event_objects/pics/people/wallace/0.png similarity index 100% rename from graphics/map_objects/pics/people/wallace/0.png rename to graphics/event_objects/pics/people/wallace/0.png diff --git a/graphics/map_objects/pics/people/wallace/1.png b/graphics/event_objects/pics/people/wallace/1.png similarity index 100% rename from graphics/map_objects/pics/people/wallace/1.png rename to graphics/event_objects/pics/people/wallace/1.png diff --git a/graphics/map_objects/pics/people/wallace/2.png b/graphics/event_objects/pics/people/wallace/2.png similarity index 100% rename from graphics/map_objects/pics/people/wallace/2.png rename to graphics/event_objects/pics/people/wallace/2.png diff --git a/graphics/map_objects/pics/people/wallace/3.png b/graphics/event_objects/pics/people/wallace/3.png similarity index 100% rename from graphics/map_objects/pics/people/wallace/3.png rename to graphics/event_objects/pics/people/wallace/3.png diff --git a/graphics/map_objects/pics/people/wallace/4.png b/graphics/event_objects/pics/people/wallace/4.png similarity index 100% rename from graphics/map_objects/pics/people/wallace/4.png rename to graphics/event_objects/pics/people/wallace/4.png diff --git a/graphics/map_objects/pics/people/wallace/5.png b/graphics/event_objects/pics/people/wallace/5.png similarity index 100% rename from graphics/map_objects/pics/people/wallace/5.png rename to graphics/event_objects/pics/people/wallace/5.png diff --git a/graphics/map_objects/pics/people/wallace/6.png b/graphics/event_objects/pics/people/wallace/6.png similarity index 100% rename from graphics/map_objects/pics/people/wallace/6.png rename to graphics/event_objects/pics/people/wallace/6.png diff --git a/graphics/map_objects/pics/people/wallace/7.png b/graphics/event_objects/pics/people/wallace/7.png similarity index 100% rename from graphics/map_objects/pics/people/wallace/7.png rename to graphics/event_objects/pics/people/wallace/7.png diff --git a/graphics/map_objects/pics/people/wallace/8.png b/graphics/event_objects/pics/people/wallace/8.png similarity index 100% rename from graphics/map_objects/pics/people/wallace/8.png rename to graphics/event_objects/pics/people/wallace/8.png diff --git a/graphics/map_objects/pics/people/wally/0.png b/graphics/event_objects/pics/people/wally/0.png similarity index 100% rename from graphics/map_objects/pics/people/wally/0.png rename to graphics/event_objects/pics/people/wally/0.png diff --git a/graphics/map_objects/pics/people/wally/1.png b/graphics/event_objects/pics/people/wally/1.png similarity index 100% rename from graphics/map_objects/pics/people/wally/1.png rename to graphics/event_objects/pics/people/wally/1.png diff --git a/graphics/map_objects/pics/people/wally/2.png b/graphics/event_objects/pics/people/wally/2.png similarity index 100% rename from graphics/map_objects/pics/people/wally/2.png rename to graphics/event_objects/pics/people/wally/2.png diff --git a/graphics/map_objects/pics/people/wally/3.png b/graphics/event_objects/pics/people/wally/3.png similarity index 100% rename from graphics/map_objects/pics/people/wally/3.png rename to graphics/event_objects/pics/people/wally/3.png diff --git a/graphics/map_objects/pics/people/wally/4.png b/graphics/event_objects/pics/people/wally/4.png similarity index 100% rename from graphics/map_objects/pics/people/wally/4.png rename to graphics/event_objects/pics/people/wally/4.png diff --git a/graphics/map_objects/pics/people/wally/5.png b/graphics/event_objects/pics/people/wally/5.png similarity index 100% rename from graphics/map_objects/pics/people/wally/5.png rename to graphics/event_objects/pics/people/wally/5.png diff --git a/graphics/map_objects/pics/people/wally/6.png b/graphics/event_objects/pics/people/wally/6.png similarity index 100% rename from graphics/map_objects/pics/people/wally/6.png rename to graphics/event_objects/pics/people/wally/6.png diff --git a/graphics/map_objects/pics/people/wally/7.png b/graphics/event_objects/pics/people/wally/7.png similarity index 100% rename from graphics/map_objects/pics/people/wally/7.png rename to graphics/event_objects/pics/people/wally/7.png diff --git a/graphics/map_objects/pics/people/wally/8.png b/graphics/event_objects/pics/people/wally/8.png similarity index 100% rename from graphics/map_objects/pics/people/wally/8.png rename to graphics/event_objects/pics/people/wally/8.png diff --git a/graphics/map_objects/pics/people/wattson/0.png b/graphics/event_objects/pics/people/wattson/0.png similarity index 100% rename from graphics/map_objects/pics/people/wattson/0.png rename to graphics/event_objects/pics/people/wattson/0.png diff --git a/graphics/map_objects/pics/people/wattson/1.png b/graphics/event_objects/pics/people/wattson/1.png similarity index 100% rename from graphics/map_objects/pics/people/wattson/1.png rename to graphics/event_objects/pics/people/wattson/1.png diff --git a/graphics/map_objects/pics/people/wattson/2.png b/graphics/event_objects/pics/people/wattson/2.png similarity index 100% rename from graphics/map_objects/pics/people/wattson/2.png rename to graphics/event_objects/pics/people/wattson/2.png diff --git a/graphics/map_objects/pics/people/winona/0.png b/graphics/event_objects/pics/people/winona/0.png similarity index 100% rename from graphics/map_objects/pics/people/winona/0.png rename to graphics/event_objects/pics/people/winona/0.png diff --git a/graphics/map_objects/pics/people/winona/1.png b/graphics/event_objects/pics/people/winona/1.png similarity index 100% rename from graphics/map_objects/pics/people/winona/1.png rename to graphics/event_objects/pics/people/winona/1.png diff --git a/graphics/map_objects/pics/people/winona/2.png b/graphics/event_objects/pics/people/winona/2.png similarity index 100% rename from graphics/map_objects/pics/people/winona/2.png rename to graphics/event_objects/pics/people/winona/2.png diff --git a/graphics/map_objects/pics/people/woman_1/0.png b/graphics/event_objects/pics/people/woman_1/0.png similarity index 100% rename from graphics/map_objects/pics/people/woman_1/0.png rename to graphics/event_objects/pics/people/woman_1/0.png diff --git a/graphics/map_objects/pics/people/woman_1/1.png b/graphics/event_objects/pics/people/woman_1/1.png similarity index 100% rename from graphics/map_objects/pics/people/woman_1/1.png rename to graphics/event_objects/pics/people/woman_1/1.png diff --git a/graphics/map_objects/pics/people/woman_1/2.png b/graphics/event_objects/pics/people/woman_1/2.png similarity index 100% rename from graphics/map_objects/pics/people/woman_1/2.png rename to graphics/event_objects/pics/people/woman_1/2.png diff --git a/graphics/map_objects/pics/people/woman_1/3.png b/graphics/event_objects/pics/people/woman_1/3.png similarity index 100% rename from graphics/map_objects/pics/people/woman_1/3.png rename to graphics/event_objects/pics/people/woman_1/3.png diff --git a/graphics/map_objects/pics/people/woman_1/4.png b/graphics/event_objects/pics/people/woman_1/4.png similarity index 100% rename from graphics/map_objects/pics/people/woman_1/4.png rename to graphics/event_objects/pics/people/woman_1/4.png diff --git a/graphics/map_objects/pics/people/woman_1/5.png b/graphics/event_objects/pics/people/woman_1/5.png similarity index 100% rename from graphics/map_objects/pics/people/woman_1/5.png rename to graphics/event_objects/pics/people/woman_1/5.png diff --git a/graphics/map_objects/pics/people/woman_1/6.png b/graphics/event_objects/pics/people/woman_1/6.png similarity index 100% rename from graphics/map_objects/pics/people/woman_1/6.png rename to graphics/event_objects/pics/people/woman_1/6.png diff --git a/graphics/map_objects/pics/people/woman_1/7.png b/graphics/event_objects/pics/people/woman_1/7.png similarity index 100% rename from graphics/map_objects/pics/people/woman_1/7.png rename to graphics/event_objects/pics/people/woman_1/7.png diff --git a/graphics/map_objects/pics/people/woman_1/8.png b/graphics/event_objects/pics/people/woman_1/8.png similarity index 100% rename from graphics/map_objects/pics/people/woman_1/8.png rename to graphics/event_objects/pics/people/woman_1/8.png diff --git a/graphics/map_objects/pics/people/woman_2/0.png b/graphics/event_objects/pics/people/woman_2/0.png similarity index 100% rename from graphics/map_objects/pics/people/woman_2/0.png rename to graphics/event_objects/pics/people/woman_2/0.png diff --git a/graphics/map_objects/pics/people/woman_2/1.png b/graphics/event_objects/pics/people/woman_2/1.png similarity index 100% rename from graphics/map_objects/pics/people/woman_2/1.png rename to graphics/event_objects/pics/people/woman_2/1.png diff --git a/graphics/map_objects/pics/people/woman_2/2.png b/graphics/event_objects/pics/people/woman_2/2.png similarity index 100% rename from graphics/map_objects/pics/people/woman_2/2.png rename to graphics/event_objects/pics/people/woman_2/2.png diff --git a/graphics/map_objects/pics/people/woman_2/3.png b/graphics/event_objects/pics/people/woman_2/3.png similarity index 100% rename from graphics/map_objects/pics/people/woman_2/3.png rename to graphics/event_objects/pics/people/woman_2/3.png diff --git a/graphics/map_objects/pics/people/woman_2/4.png b/graphics/event_objects/pics/people/woman_2/4.png similarity index 100% rename from graphics/map_objects/pics/people/woman_2/4.png rename to graphics/event_objects/pics/people/woman_2/4.png diff --git a/graphics/map_objects/pics/people/woman_2/5.png b/graphics/event_objects/pics/people/woman_2/5.png similarity index 100% rename from graphics/map_objects/pics/people/woman_2/5.png rename to graphics/event_objects/pics/people/woman_2/5.png diff --git a/graphics/map_objects/pics/people/woman_2/6.png b/graphics/event_objects/pics/people/woman_2/6.png similarity index 100% rename from graphics/map_objects/pics/people/woman_2/6.png rename to graphics/event_objects/pics/people/woman_2/6.png diff --git a/graphics/map_objects/pics/people/woman_2/7.png b/graphics/event_objects/pics/people/woman_2/7.png similarity index 100% rename from graphics/map_objects/pics/people/woman_2/7.png rename to graphics/event_objects/pics/people/woman_2/7.png diff --git a/graphics/map_objects/pics/people/woman_2/8.png b/graphics/event_objects/pics/people/woman_2/8.png similarity index 100% rename from graphics/map_objects/pics/people/woman_2/8.png rename to graphics/event_objects/pics/people/woman_2/8.png diff --git a/graphics/map_objects/pics/people/woman_3/0.png b/graphics/event_objects/pics/people/woman_3/0.png similarity index 100% rename from graphics/map_objects/pics/people/woman_3/0.png rename to graphics/event_objects/pics/people/woman_3/0.png diff --git a/graphics/map_objects/pics/people/woman_3/1.png b/graphics/event_objects/pics/people/woman_3/1.png similarity index 100% rename from graphics/map_objects/pics/people/woman_3/1.png rename to graphics/event_objects/pics/people/woman_3/1.png diff --git a/graphics/map_objects/pics/people/woman_3/2.png b/graphics/event_objects/pics/people/woman_3/2.png similarity index 100% rename from graphics/map_objects/pics/people/woman_3/2.png rename to graphics/event_objects/pics/people/woman_3/2.png diff --git a/graphics/map_objects/pics/people/woman_3/3.png b/graphics/event_objects/pics/people/woman_3/3.png similarity index 100% rename from graphics/map_objects/pics/people/woman_3/3.png rename to graphics/event_objects/pics/people/woman_3/3.png diff --git a/graphics/map_objects/pics/people/woman_3/4.png b/graphics/event_objects/pics/people/woman_3/4.png similarity index 100% rename from graphics/map_objects/pics/people/woman_3/4.png rename to graphics/event_objects/pics/people/woman_3/4.png diff --git a/graphics/map_objects/pics/people/woman_3/5.png b/graphics/event_objects/pics/people/woman_3/5.png similarity index 100% rename from graphics/map_objects/pics/people/woman_3/5.png rename to graphics/event_objects/pics/people/woman_3/5.png diff --git a/graphics/map_objects/pics/people/woman_3/6.png b/graphics/event_objects/pics/people/woman_3/6.png similarity index 100% rename from graphics/map_objects/pics/people/woman_3/6.png rename to graphics/event_objects/pics/people/woman_3/6.png diff --git a/graphics/map_objects/pics/people/woman_3/7.png b/graphics/event_objects/pics/people/woman_3/7.png similarity index 100% rename from graphics/map_objects/pics/people/woman_3/7.png rename to graphics/event_objects/pics/people/woman_3/7.png diff --git a/graphics/map_objects/pics/people/woman_3/8.png b/graphics/event_objects/pics/people/woman_3/8.png similarity index 100% rename from graphics/map_objects/pics/people/woman_3/8.png rename to graphics/event_objects/pics/people/woman_3/8.png diff --git a/graphics/map_objects/pics/people/woman_4/0.png b/graphics/event_objects/pics/people/woman_4/0.png similarity index 100% rename from graphics/map_objects/pics/people/woman_4/0.png rename to graphics/event_objects/pics/people/woman_4/0.png diff --git a/graphics/map_objects/pics/people/woman_4/1.png b/graphics/event_objects/pics/people/woman_4/1.png similarity index 100% rename from graphics/map_objects/pics/people/woman_4/1.png rename to graphics/event_objects/pics/people/woman_4/1.png diff --git a/graphics/map_objects/pics/people/woman_4/2.png b/graphics/event_objects/pics/people/woman_4/2.png similarity index 100% rename from graphics/map_objects/pics/people/woman_4/2.png rename to graphics/event_objects/pics/people/woman_4/2.png diff --git a/graphics/map_objects/pics/people/woman_4/3.png b/graphics/event_objects/pics/people/woman_4/3.png similarity index 100% rename from graphics/map_objects/pics/people/woman_4/3.png rename to graphics/event_objects/pics/people/woman_4/3.png diff --git a/graphics/map_objects/pics/people/woman_4/4.png b/graphics/event_objects/pics/people/woman_4/4.png similarity index 100% rename from graphics/map_objects/pics/people/woman_4/4.png rename to graphics/event_objects/pics/people/woman_4/4.png diff --git a/graphics/map_objects/pics/people/woman_4/5.png b/graphics/event_objects/pics/people/woman_4/5.png similarity index 100% rename from graphics/map_objects/pics/people/woman_4/5.png rename to graphics/event_objects/pics/people/woman_4/5.png diff --git a/graphics/map_objects/pics/people/woman_4/6.png b/graphics/event_objects/pics/people/woman_4/6.png similarity index 100% rename from graphics/map_objects/pics/people/woman_4/6.png rename to graphics/event_objects/pics/people/woman_4/6.png diff --git a/graphics/map_objects/pics/people/woman_4/7.png b/graphics/event_objects/pics/people/woman_4/7.png similarity index 100% rename from graphics/map_objects/pics/people/woman_4/7.png rename to graphics/event_objects/pics/people/woman_4/7.png diff --git a/graphics/map_objects/pics/people/woman_4/8.png b/graphics/event_objects/pics/people/woman_4/8.png similarity index 100% rename from graphics/map_objects/pics/people/woman_4/8.png rename to graphics/event_objects/pics/people/woman_4/8.png diff --git a/graphics/map_objects/pics/people/woman_5/0.png b/graphics/event_objects/pics/people/woman_5/0.png similarity index 100% rename from graphics/map_objects/pics/people/woman_5/0.png rename to graphics/event_objects/pics/people/woman_5/0.png diff --git a/graphics/map_objects/pics/people/woman_5/1.png b/graphics/event_objects/pics/people/woman_5/1.png similarity index 100% rename from graphics/map_objects/pics/people/woman_5/1.png rename to graphics/event_objects/pics/people/woman_5/1.png diff --git a/graphics/map_objects/pics/people/woman_5/2.png b/graphics/event_objects/pics/people/woman_5/2.png similarity index 100% rename from graphics/map_objects/pics/people/woman_5/2.png rename to graphics/event_objects/pics/people/woman_5/2.png diff --git a/graphics/map_objects/pics/people/woman_5/3.png b/graphics/event_objects/pics/people/woman_5/3.png similarity index 100% rename from graphics/map_objects/pics/people/woman_5/3.png rename to graphics/event_objects/pics/people/woman_5/3.png diff --git a/graphics/map_objects/pics/people/woman_5/4.png b/graphics/event_objects/pics/people/woman_5/4.png similarity index 100% rename from graphics/map_objects/pics/people/woman_5/4.png rename to graphics/event_objects/pics/people/woman_5/4.png diff --git a/graphics/map_objects/pics/people/woman_5/5.png b/graphics/event_objects/pics/people/woman_5/5.png similarity index 100% rename from graphics/map_objects/pics/people/woman_5/5.png rename to graphics/event_objects/pics/people/woman_5/5.png diff --git a/graphics/map_objects/pics/people/woman_5/6.png b/graphics/event_objects/pics/people/woman_5/6.png similarity index 100% rename from graphics/map_objects/pics/people/woman_5/6.png rename to graphics/event_objects/pics/people/woman_5/6.png diff --git a/graphics/map_objects/pics/people/woman_5/7.png b/graphics/event_objects/pics/people/woman_5/7.png similarity index 100% rename from graphics/map_objects/pics/people/woman_5/7.png rename to graphics/event_objects/pics/people/woman_5/7.png diff --git a/graphics/map_objects/pics/people/woman_5/8.png b/graphics/event_objects/pics/people/woman_5/8.png similarity index 100% rename from graphics/map_objects/pics/people/woman_5/8.png rename to graphics/event_objects/pics/people/woman_5/8.png diff --git a/graphics/map_objects/pics/people/woman_6/0.png b/graphics/event_objects/pics/people/woman_6/0.png similarity index 100% rename from graphics/map_objects/pics/people/woman_6/0.png rename to graphics/event_objects/pics/people/woman_6/0.png diff --git a/graphics/map_objects/pics/people/woman_6/1.png b/graphics/event_objects/pics/people/woman_6/1.png similarity index 100% rename from graphics/map_objects/pics/people/woman_6/1.png rename to graphics/event_objects/pics/people/woman_6/1.png diff --git a/graphics/map_objects/pics/people/woman_6/2.png b/graphics/event_objects/pics/people/woman_6/2.png similarity index 100% rename from graphics/map_objects/pics/people/woman_6/2.png rename to graphics/event_objects/pics/people/woman_6/2.png diff --git a/graphics/map_objects/pics/people/woman_6/3.png b/graphics/event_objects/pics/people/woman_6/3.png similarity index 100% rename from graphics/map_objects/pics/people/woman_6/3.png rename to graphics/event_objects/pics/people/woman_6/3.png diff --git a/graphics/map_objects/pics/people/woman_6/4.png b/graphics/event_objects/pics/people/woman_6/4.png similarity index 100% rename from graphics/map_objects/pics/people/woman_6/4.png rename to graphics/event_objects/pics/people/woman_6/4.png diff --git a/graphics/map_objects/pics/people/woman_6/5.png b/graphics/event_objects/pics/people/woman_6/5.png similarity index 100% rename from graphics/map_objects/pics/people/woman_6/5.png rename to graphics/event_objects/pics/people/woman_6/5.png diff --git a/graphics/map_objects/pics/people/woman_6/6.png b/graphics/event_objects/pics/people/woman_6/6.png similarity index 100% rename from graphics/map_objects/pics/people/woman_6/6.png rename to graphics/event_objects/pics/people/woman_6/6.png diff --git a/graphics/map_objects/pics/people/woman_6/7.png b/graphics/event_objects/pics/people/woman_6/7.png similarity index 100% rename from graphics/map_objects/pics/people/woman_6/7.png rename to graphics/event_objects/pics/people/woman_6/7.png diff --git a/graphics/map_objects/pics/people/woman_6/8.png b/graphics/event_objects/pics/people/woman_6/8.png similarity index 100% rename from graphics/map_objects/pics/people/woman_6/8.png rename to graphics/event_objects/pics/people/woman_6/8.png diff --git a/graphics/map_objects/pics/people/woman_7/0.png b/graphics/event_objects/pics/people/woman_7/0.png similarity index 100% rename from graphics/map_objects/pics/people/woman_7/0.png rename to graphics/event_objects/pics/people/woman_7/0.png diff --git a/graphics/map_objects/pics/people/woman_7/1.png b/graphics/event_objects/pics/people/woman_7/1.png similarity index 100% rename from graphics/map_objects/pics/people/woman_7/1.png rename to graphics/event_objects/pics/people/woman_7/1.png diff --git a/graphics/map_objects/pics/people/woman_7/2.png b/graphics/event_objects/pics/people/woman_7/2.png similarity index 100% rename from graphics/map_objects/pics/people/woman_7/2.png rename to graphics/event_objects/pics/people/woman_7/2.png diff --git a/graphics/map_objects/pics/people/woman_7/3.png b/graphics/event_objects/pics/people/woman_7/3.png similarity index 100% rename from graphics/map_objects/pics/people/woman_7/3.png rename to graphics/event_objects/pics/people/woman_7/3.png diff --git a/graphics/map_objects/pics/people/woman_7/4.png b/graphics/event_objects/pics/people/woman_7/4.png similarity index 100% rename from graphics/map_objects/pics/people/woman_7/4.png rename to graphics/event_objects/pics/people/woman_7/4.png diff --git a/graphics/map_objects/pics/people/woman_7/5.png b/graphics/event_objects/pics/people/woman_7/5.png similarity index 100% rename from graphics/map_objects/pics/people/woman_7/5.png rename to graphics/event_objects/pics/people/woman_7/5.png diff --git a/graphics/map_objects/pics/people/woman_7/6.png b/graphics/event_objects/pics/people/woman_7/6.png similarity index 100% rename from graphics/map_objects/pics/people/woman_7/6.png rename to graphics/event_objects/pics/people/woman_7/6.png diff --git a/graphics/map_objects/pics/people/woman_7/7.png b/graphics/event_objects/pics/people/woman_7/7.png similarity index 100% rename from graphics/map_objects/pics/people/woman_7/7.png rename to graphics/event_objects/pics/people/woman_7/7.png diff --git a/graphics/map_objects/pics/people/woman_7/8.png b/graphics/event_objects/pics/people/woman_7/8.png similarity index 100% rename from graphics/map_objects/pics/people/woman_7/8.png rename to graphics/event_objects/pics/people/woman_7/8.png diff --git a/graphics/map_objects/pics/people/youngster/0.png b/graphics/event_objects/pics/people/youngster/0.png similarity index 100% rename from graphics/map_objects/pics/people/youngster/0.png rename to graphics/event_objects/pics/people/youngster/0.png diff --git a/graphics/map_objects/pics/people/youngster/1.png b/graphics/event_objects/pics/people/youngster/1.png similarity index 100% rename from graphics/map_objects/pics/people/youngster/1.png rename to graphics/event_objects/pics/people/youngster/1.png diff --git a/graphics/map_objects/pics/people/youngster/2.png b/graphics/event_objects/pics/people/youngster/2.png similarity index 100% rename from graphics/map_objects/pics/people/youngster/2.png rename to graphics/event_objects/pics/people/youngster/2.png diff --git a/graphics/map_objects/pics/people/youngster/3.png b/graphics/event_objects/pics/people/youngster/3.png similarity index 100% rename from graphics/map_objects/pics/people/youngster/3.png rename to graphics/event_objects/pics/people/youngster/3.png diff --git a/graphics/map_objects/pics/people/youngster/4.png b/graphics/event_objects/pics/people/youngster/4.png similarity index 100% rename from graphics/map_objects/pics/people/youngster/4.png rename to graphics/event_objects/pics/people/youngster/4.png diff --git a/graphics/map_objects/pics/people/youngster/5.png b/graphics/event_objects/pics/people/youngster/5.png similarity index 100% rename from graphics/map_objects/pics/people/youngster/5.png rename to graphics/event_objects/pics/people/youngster/5.png diff --git a/graphics/map_objects/pics/people/youngster/6.png b/graphics/event_objects/pics/people/youngster/6.png similarity index 100% rename from graphics/map_objects/pics/people/youngster/6.png rename to graphics/event_objects/pics/people/youngster/6.png diff --git a/graphics/map_objects/pics/people/youngster/7.png b/graphics/event_objects/pics/people/youngster/7.png similarity index 100% rename from graphics/map_objects/pics/people/youngster/7.png rename to graphics/event_objects/pics/people/youngster/7.png diff --git a/graphics/map_objects/pics/people/youngster/8.png b/graphics/event_objects/pics/people/youngster/8.png similarity index 100% rename from graphics/map_objects/pics/people/youngster/8.png rename to graphics/event_objects/pics/people/youngster/8.png diff --git a/graphics/map_objects/pics/pokemon/azumarill/0.png b/graphics/event_objects/pics/pokemon/azumarill/0.png similarity index 100% rename from graphics/map_objects/pics/pokemon/azumarill/0.png rename to graphics/event_objects/pics/pokemon/azumarill/0.png diff --git a/graphics/map_objects/pics/pokemon/azumarill/1.png b/graphics/event_objects/pics/pokemon/azumarill/1.png similarity index 100% rename from graphics/map_objects/pics/pokemon/azumarill/1.png rename to graphics/event_objects/pics/pokemon/azumarill/1.png diff --git a/graphics/map_objects/pics/pokemon/azumarill/2.png b/graphics/event_objects/pics/pokemon/azumarill/2.png similarity index 100% rename from graphics/map_objects/pics/pokemon/azumarill/2.png rename to graphics/event_objects/pics/pokemon/azumarill/2.png diff --git a/graphics/map_objects/pics/pokemon/azurill/0.png b/graphics/event_objects/pics/pokemon/azurill/0.png similarity index 100% rename from graphics/map_objects/pics/pokemon/azurill/0.png rename to graphics/event_objects/pics/pokemon/azurill/0.png diff --git a/graphics/map_objects/pics/pokemon/azurill/1.png b/graphics/event_objects/pics/pokemon/azurill/1.png similarity index 100% rename from graphics/map_objects/pics/pokemon/azurill/1.png rename to graphics/event_objects/pics/pokemon/azurill/1.png diff --git a/graphics/map_objects/pics/pokemon/azurill/2.png b/graphics/event_objects/pics/pokemon/azurill/2.png similarity index 100% rename from graphics/map_objects/pics/pokemon/azurill/2.png rename to graphics/event_objects/pics/pokemon/azurill/2.png diff --git a/graphics/map_objects/pics/pokemon/deoxys/0.png b/graphics/event_objects/pics/pokemon/deoxys/0.png similarity index 100% rename from graphics/map_objects/pics/pokemon/deoxys/0.png rename to graphics/event_objects/pics/pokemon/deoxys/0.png diff --git a/graphics/map_objects/pics/pokemon/deoxys/1.png b/graphics/event_objects/pics/pokemon/deoxys/1.png similarity index 100% rename from graphics/map_objects/pics/pokemon/deoxys/1.png rename to graphics/event_objects/pics/pokemon/deoxys/1.png diff --git a/graphics/map_objects/pics/pokemon/dusclops/0.png b/graphics/event_objects/pics/pokemon/dusclops/0.png similarity index 100% rename from graphics/map_objects/pics/pokemon/dusclops/0.png rename to graphics/event_objects/pics/pokemon/dusclops/0.png diff --git a/graphics/map_objects/pics/pokemon/dusclops/1.png b/graphics/event_objects/pics/pokemon/dusclops/1.png similarity index 100% rename from graphics/map_objects/pics/pokemon/dusclops/1.png rename to graphics/event_objects/pics/pokemon/dusclops/1.png diff --git a/graphics/map_objects/pics/pokemon/dusclops/2.png b/graphics/event_objects/pics/pokemon/dusclops/2.png similarity index 100% rename from graphics/map_objects/pics/pokemon/dusclops/2.png rename to graphics/event_objects/pics/pokemon/dusclops/2.png diff --git a/graphics/map_objects/pics/pokemon/dusclops/3.png b/graphics/event_objects/pics/pokemon/dusclops/3.png similarity index 100% rename from graphics/map_objects/pics/pokemon/dusclops/3.png rename to graphics/event_objects/pics/pokemon/dusclops/3.png diff --git a/graphics/map_objects/pics/pokemon/dusclops/4.png b/graphics/event_objects/pics/pokemon/dusclops/4.png similarity index 100% rename from graphics/map_objects/pics/pokemon/dusclops/4.png rename to graphics/event_objects/pics/pokemon/dusclops/4.png diff --git a/graphics/map_objects/pics/pokemon/dusclops/5.png b/graphics/event_objects/pics/pokemon/dusclops/5.png similarity index 100% rename from graphics/map_objects/pics/pokemon/dusclops/5.png rename to graphics/event_objects/pics/pokemon/dusclops/5.png diff --git a/graphics/map_objects/pics/pokemon/dusclops/6.png b/graphics/event_objects/pics/pokemon/dusclops/6.png similarity index 100% rename from graphics/map_objects/pics/pokemon/dusclops/6.png rename to graphics/event_objects/pics/pokemon/dusclops/6.png diff --git a/graphics/map_objects/pics/pokemon/dusclops/7.png b/graphics/event_objects/pics/pokemon/dusclops/7.png similarity index 100% rename from graphics/map_objects/pics/pokemon/dusclops/7.png rename to graphics/event_objects/pics/pokemon/dusclops/7.png diff --git a/graphics/map_objects/pics/pokemon/dusclops/8.png b/graphics/event_objects/pics/pokemon/dusclops/8.png similarity index 100% rename from graphics/map_objects/pics/pokemon/dusclops/8.png rename to graphics/event_objects/pics/pokemon/dusclops/8.png diff --git a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/0.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/0.png similarity index 100% rename from graphics/map_objects/pics/pokemon/enemy_zigzagoon/0.png rename to graphics/event_objects/pics/pokemon/enemy_zigzagoon/0.png diff --git a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/1.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/1.png similarity index 100% rename from graphics/map_objects/pics/pokemon/enemy_zigzagoon/1.png rename to graphics/event_objects/pics/pokemon/enemy_zigzagoon/1.png diff --git a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/2.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/2.png similarity index 100% rename from graphics/map_objects/pics/pokemon/enemy_zigzagoon/2.png rename to graphics/event_objects/pics/pokemon/enemy_zigzagoon/2.png diff --git a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/3.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/3.png similarity index 100% rename from graphics/map_objects/pics/pokemon/enemy_zigzagoon/3.png rename to graphics/event_objects/pics/pokemon/enemy_zigzagoon/3.png diff --git a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/4.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/4.png similarity index 100% rename from graphics/map_objects/pics/pokemon/enemy_zigzagoon/4.png rename to graphics/event_objects/pics/pokemon/enemy_zigzagoon/4.png diff --git a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/5.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/5.png similarity index 100% rename from graphics/map_objects/pics/pokemon/enemy_zigzagoon/5.png rename to graphics/event_objects/pics/pokemon/enemy_zigzagoon/5.png diff --git a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/6.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/6.png similarity index 100% rename from graphics/map_objects/pics/pokemon/enemy_zigzagoon/6.png rename to graphics/event_objects/pics/pokemon/enemy_zigzagoon/6.png diff --git a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/7.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/7.png similarity index 100% rename from graphics/map_objects/pics/pokemon/enemy_zigzagoon/7.png rename to graphics/event_objects/pics/pokemon/enemy_zigzagoon/7.png diff --git a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/8.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/8.png similarity index 100% rename from graphics/map_objects/pics/pokemon/enemy_zigzagoon/8.png rename to graphics/event_objects/pics/pokemon/enemy_zigzagoon/8.png diff --git a/graphics/map_objects/pics/pokemon/groudon_front/0.png b/graphics/event_objects/pics/pokemon/groudon_front/0.png similarity index 100% rename from graphics/map_objects/pics/pokemon/groudon_front/0.png rename to graphics/event_objects/pics/pokemon/groudon_front/0.png diff --git a/graphics/map_objects/pics/pokemon/groudon_front/1.png b/graphics/event_objects/pics/pokemon/groudon_front/1.png similarity index 100% rename from graphics/map_objects/pics/pokemon/groudon_front/1.png rename to graphics/event_objects/pics/pokemon/groudon_front/1.png diff --git a/graphics/map_objects/pics/pokemon/groudon_side/0.png b/graphics/event_objects/pics/pokemon/groudon_side/0.png similarity index 100% rename from graphics/map_objects/pics/pokemon/groudon_side/0.png rename to graphics/event_objects/pics/pokemon/groudon_side/0.png diff --git a/graphics/map_objects/pics/pokemon/groudon_side/1.png b/graphics/event_objects/pics/pokemon/groudon_side/1.png similarity index 100% rename from graphics/map_objects/pics/pokemon/groudon_side/1.png rename to graphics/event_objects/pics/pokemon/groudon_side/1.png diff --git a/graphics/map_objects/pics/pokemon/ho_oh/0.png b/graphics/event_objects/pics/pokemon/ho_oh/0.png similarity index 100% rename from graphics/map_objects/pics/pokemon/ho_oh/0.png rename to graphics/event_objects/pics/pokemon/ho_oh/0.png diff --git a/graphics/map_objects/pics/pokemon/ho_oh/1.png b/graphics/event_objects/pics/pokemon/ho_oh/1.png similarity index 100% rename from graphics/map_objects/pics/pokemon/ho_oh/1.png rename to graphics/event_objects/pics/pokemon/ho_oh/1.png diff --git a/graphics/map_objects/pics/pokemon/kecleon/0.png b/graphics/event_objects/pics/pokemon/kecleon/0.png similarity index 100% rename from graphics/map_objects/pics/pokemon/kecleon/0.png rename to graphics/event_objects/pics/pokemon/kecleon/0.png diff --git a/graphics/map_objects/pics/pokemon/kecleon/1.png b/graphics/event_objects/pics/pokemon/kecleon/1.png similarity index 100% rename from graphics/map_objects/pics/pokemon/kecleon/1.png rename to graphics/event_objects/pics/pokemon/kecleon/1.png diff --git a/graphics/map_objects/pics/pokemon/kecleon/2.png b/graphics/event_objects/pics/pokemon/kecleon/2.png similarity index 100% rename from graphics/map_objects/pics/pokemon/kecleon/2.png rename to graphics/event_objects/pics/pokemon/kecleon/2.png diff --git a/graphics/map_objects/pics/pokemon/kirlia/0.png b/graphics/event_objects/pics/pokemon/kirlia/0.png similarity index 100% rename from graphics/map_objects/pics/pokemon/kirlia/0.png rename to graphics/event_objects/pics/pokemon/kirlia/0.png diff --git a/graphics/map_objects/pics/pokemon/kirlia/1.png b/graphics/event_objects/pics/pokemon/kirlia/1.png similarity index 100% rename from graphics/map_objects/pics/pokemon/kirlia/1.png rename to graphics/event_objects/pics/pokemon/kirlia/1.png diff --git a/graphics/map_objects/pics/pokemon/kirlia/2.png b/graphics/event_objects/pics/pokemon/kirlia/2.png similarity index 100% rename from graphics/map_objects/pics/pokemon/kirlia/2.png rename to graphics/event_objects/pics/pokemon/kirlia/2.png diff --git a/graphics/map_objects/pics/pokemon/kirlia/3.png b/graphics/event_objects/pics/pokemon/kirlia/3.png similarity index 100% rename from graphics/map_objects/pics/pokemon/kirlia/3.png rename to graphics/event_objects/pics/pokemon/kirlia/3.png diff --git a/graphics/map_objects/pics/pokemon/kirlia/4.png b/graphics/event_objects/pics/pokemon/kirlia/4.png similarity index 100% rename from graphics/map_objects/pics/pokemon/kirlia/4.png rename to graphics/event_objects/pics/pokemon/kirlia/4.png diff --git a/graphics/map_objects/pics/pokemon/kirlia/5.png b/graphics/event_objects/pics/pokemon/kirlia/5.png similarity index 100% rename from graphics/map_objects/pics/pokemon/kirlia/5.png rename to graphics/event_objects/pics/pokemon/kirlia/5.png diff --git a/graphics/map_objects/pics/pokemon/kirlia/6.png b/graphics/event_objects/pics/pokemon/kirlia/6.png similarity index 100% rename from graphics/map_objects/pics/pokemon/kirlia/6.png rename to graphics/event_objects/pics/pokemon/kirlia/6.png diff --git a/graphics/map_objects/pics/pokemon/kirlia/7.png b/graphics/event_objects/pics/pokemon/kirlia/7.png similarity index 100% rename from graphics/map_objects/pics/pokemon/kirlia/7.png rename to graphics/event_objects/pics/pokemon/kirlia/7.png diff --git a/graphics/map_objects/pics/pokemon/kirlia/8.png b/graphics/event_objects/pics/pokemon/kirlia/8.png similarity index 100% rename from graphics/map_objects/pics/pokemon/kirlia/8.png rename to graphics/event_objects/pics/pokemon/kirlia/8.png diff --git a/graphics/map_objects/pics/pokemon/kyogre_front/0.png b/graphics/event_objects/pics/pokemon/kyogre_front/0.png similarity index 100% rename from graphics/map_objects/pics/pokemon/kyogre_front/0.png rename to graphics/event_objects/pics/pokemon/kyogre_front/0.png diff --git a/graphics/map_objects/pics/pokemon/kyogre_front/1.png b/graphics/event_objects/pics/pokemon/kyogre_front/1.png similarity index 100% rename from graphics/map_objects/pics/pokemon/kyogre_front/1.png rename to graphics/event_objects/pics/pokemon/kyogre_front/1.png diff --git a/graphics/map_objects/pics/pokemon/kyogre_side/0.png b/graphics/event_objects/pics/pokemon/kyogre_side/0.png similarity index 100% rename from graphics/map_objects/pics/pokemon/kyogre_side/0.png rename to graphics/event_objects/pics/pokemon/kyogre_side/0.png diff --git a/graphics/map_objects/pics/pokemon/kyogre_side/1.png b/graphics/event_objects/pics/pokemon/kyogre_side/1.png similarity index 100% rename from graphics/map_objects/pics/pokemon/kyogre_side/1.png rename to graphics/event_objects/pics/pokemon/kyogre_side/1.png diff --git a/graphics/map_objects/pics/pokemon/latias_latios/0.png b/graphics/event_objects/pics/pokemon/latias_latios/0.png similarity index 100% rename from graphics/map_objects/pics/pokemon/latias_latios/0.png rename to graphics/event_objects/pics/pokemon/latias_latios/0.png diff --git a/graphics/map_objects/pics/pokemon/latias_latios/1.png b/graphics/event_objects/pics/pokemon/latias_latios/1.png similarity index 100% rename from graphics/map_objects/pics/pokemon/latias_latios/1.png rename to graphics/event_objects/pics/pokemon/latias_latios/1.png diff --git a/graphics/map_objects/pics/pokemon/latias_latios/2.png b/graphics/event_objects/pics/pokemon/latias_latios/2.png similarity index 100% rename from graphics/map_objects/pics/pokemon/latias_latios/2.png rename to graphics/event_objects/pics/pokemon/latias_latios/2.png diff --git a/graphics/map_objects/pics/pokemon/lugia/0.png b/graphics/event_objects/pics/pokemon/lugia/0.png similarity index 100% rename from graphics/map_objects/pics/pokemon/lugia/0.png rename to graphics/event_objects/pics/pokemon/lugia/0.png diff --git a/graphics/map_objects/pics/pokemon/lugia/1.png b/graphics/event_objects/pics/pokemon/lugia/1.png similarity index 100% rename from graphics/map_objects/pics/pokemon/lugia/1.png rename to graphics/event_objects/pics/pokemon/lugia/1.png diff --git a/graphics/map_objects/pics/pokemon/mew/0.png b/graphics/event_objects/pics/pokemon/mew/0.png similarity index 100% rename from graphics/map_objects/pics/pokemon/mew/0.png rename to graphics/event_objects/pics/pokemon/mew/0.png diff --git a/graphics/map_objects/pics/pokemon/mew/1.png b/graphics/event_objects/pics/pokemon/mew/1.png similarity index 100% rename from graphics/map_objects/pics/pokemon/mew/1.png rename to graphics/event_objects/pics/pokemon/mew/1.png diff --git a/graphics/map_objects/pics/pokemon/mew/2.png b/graphics/event_objects/pics/pokemon/mew/2.png similarity index 100% rename from graphics/map_objects/pics/pokemon/mew/2.png rename to graphics/event_objects/pics/pokemon/mew/2.png diff --git a/graphics/map_objects/pics/pokemon/mew/3.png b/graphics/event_objects/pics/pokemon/mew/3.png similarity index 100% rename from graphics/map_objects/pics/pokemon/mew/3.png rename to graphics/event_objects/pics/pokemon/mew/3.png diff --git a/graphics/map_objects/pics/pokemon/mew/4.png b/graphics/event_objects/pics/pokemon/mew/4.png similarity index 100% rename from graphics/map_objects/pics/pokemon/mew/4.png rename to graphics/event_objects/pics/pokemon/mew/4.png diff --git a/graphics/map_objects/pics/pokemon/mew/5.png b/graphics/event_objects/pics/pokemon/mew/5.png similarity index 100% rename from graphics/map_objects/pics/pokemon/mew/5.png rename to graphics/event_objects/pics/pokemon/mew/5.png diff --git a/graphics/map_objects/pics/pokemon/mew/6.png b/graphics/event_objects/pics/pokemon/mew/6.png similarity index 100% rename from graphics/map_objects/pics/pokemon/mew/6.png rename to graphics/event_objects/pics/pokemon/mew/6.png diff --git a/graphics/map_objects/pics/pokemon/mew/7.png b/graphics/event_objects/pics/pokemon/mew/7.png similarity index 100% rename from graphics/map_objects/pics/pokemon/mew/7.png rename to graphics/event_objects/pics/pokemon/mew/7.png diff --git a/graphics/map_objects/pics/pokemon/mew/8.png b/graphics/event_objects/pics/pokemon/mew/8.png similarity index 100% rename from graphics/map_objects/pics/pokemon/mew/8.png rename to graphics/event_objects/pics/pokemon/mew/8.png diff --git a/graphics/map_objects/pics/pokemon/pikachu/0.png b/graphics/event_objects/pics/pokemon/pikachu/0.png similarity index 100% rename from graphics/map_objects/pics/pokemon/pikachu/0.png rename to graphics/event_objects/pics/pokemon/pikachu/0.png diff --git a/graphics/map_objects/pics/pokemon/pikachu/1.png b/graphics/event_objects/pics/pokemon/pikachu/1.png similarity index 100% rename from graphics/map_objects/pics/pokemon/pikachu/1.png rename to graphics/event_objects/pics/pokemon/pikachu/1.png diff --git a/graphics/map_objects/pics/pokemon/pikachu/2.png b/graphics/event_objects/pics/pokemon/pikachu/2.png similarity index 100% rename from graphics/map_objects/pics/pokemon/pikachu/2.png rename to graphics/event_objects/pics/pokemon/pikachu/2.png diff --git a/graphics/map_objects/pics/pokemon/poochyena/0.png b/graphics/event_objects/pics/pokemon/poochyena/0.png similarity index 100% rename from graphics/map_objects/pics/pokemon/poochyena/0.png rename to graphics/event_objects/pics/pokemon/poochyena/0.png diff --git a/graphics/map_objects/pics/pokemon/poochyena/1.png b/graphics/event_objects/pics/pokemon/poochyena/1.png similarity index 100% rename from graphics/map_objects/pics/pokemon/poochyena/1.png rename to graphics/event_objects/pics/pokemon/poochyena/1.png diff --git a/graphics/map_objects/pics/pokemon/poochyena/2.png b/graphics/event_objects/pics/pokemon/poochyena/2.png similarity index 100% rename from graphics/map_objects/pics/pokemon/poochyena/2.png rename to graphics/event_objects/pics/pokemon/poochyena/2.png diff --git a/graphics/map_objects/pics/pokemon/poochyena/3.png b/graphics/event_objects/pics/pokemon/poochyena/3.png similarity index 100% rename from graphics/map_objects/pics/pokemon/poochyena/3.png rename to graphics/event_objects/pics/pokemon/poochyena/3.png diff --git a/graphics/map_objects/pics/pokemon/poochyena/4.png b/graphics/event_objects/pics/pokemon/poochyena/4.png similarity index 100% rename from graphics/map_objects/pics/pokemon/poochyena/4.png rename to graphics/event_objects/pics/pokemon/poochyena/4.png diff --git a/graphics/map_objects/pics/pokemon/poochyena/5.png b/graphics/event_objects/pics/pokemon/poochyena/5.png similarity index 100% rename from graphics/map_objects/pics/pokemon/poochyena/5.png rename to graphics/event_objects/pics/pokemon/poochyena/5.png diff --git a/graphics/map_objects/pics/pokemon/poochyena/6.png b/graphics/event_objects/pics/pokemon/poochyena/6.png similarity index 100% rename from graphics/map_objects/pics/pokemon/poochyena/6.png rename to graphics/event_objects/pics/pokemon/poochyena/6.png diff --git a/graphics/map_objects/pics/pokemon/poochyena/7.png b/graphics/event_objects/pics/pokemon/poochyena/7.png similarity index 100% rename from graphics/map_objects/pics/pokemon/poochyena/7.png rename to graphics/event_objects/pics/pokemon/poochyena/7.png diff --git a/graphics/map_objects/pics/pokemon/poochyena/8.png b/graphics/event_objects/pics/pokemon/poochyena/8.png similarity index 100% rename from graphics/map_objects/pics/pokemon/poochyena/8.png rename to graphics/event_objects/pics/pokemon/poochyena/8.png diff --git a/graphics/map_objects/pics/pokemon/rayquaza/0.png b/graphics/event_objects/pics/pokemon/rayquaza/0.png similarity index 100% rename from graphics/map_objects/pics/pokemon/rayquaza/0.png rename to graphics/event_objects/pics/pokemon/rayquaza/0.png diff --git a/graphics/map_objects/pics/pokemon/rayquaza/1.png b/graphics/event_objects/pics/pokemon/rayquaza/1.png similarity index 100% rename from graphics/map_objects/pics/pokemon/rayquaza/1.png rename to graphics/event_objects/pics/pokemon/rayquaza/1.png diff --git a/graphics/map_objects/pics/pokemon/rayquaza/2.png b/graphics/event_objects/pics/pokemon/rayquaza/2.png similarity index 100% rename from graphics/map_objects/pics/pokemon/rayquaza/2.png rename to graphics/event_objects/pics/pokemon/rayquaza/2.png diff --git a/graphics/map_objects/pics/pokemon/rayquaza/3.png b/graphics/event_objects/pics/pokemon/rayquaza/3.png similarity index 100% rename from graphics/map_objects/pics/pokemon/rayquaza/3.png rename to graphics/event_objects/pics/pokemon/rayquaza/3.png diff --git a/graphics/map_objects/pics/pokemon/rayquaza/4.png b/graphics/event_objects/pics/pokemon/rayquaza/4.png similarity index 100% rename from graphics/map_objects/pics/pokemon/rayquaza/4.png rename to graphics/event_objects/pics/pokemon/rayquaza/4.png diff --git a/graphics/map_objects/pics/pokemon/rayquaza_still.png b/graphics/event_objects/pics/pokemon/rayquaza_still.png similarity index 100% rename from graphics/map_objects/pics/pokemon/rayquaza_still.png rename to graphics/event_objects/pics/pokemon/rayquaza_still.png diff --git a/graphics/map_objects/pics/pokemon/regi.png b/graphics/event_objects/pics/pokemon/regi.png similarity index 100% rename from graphics/map_objects/pics/pokemon/regi.png rename to graphics/event_objects/pics/pokemon/regi.png diff --git a/graphics/map_objects/pics/pokemon/skitty/0.png b/graphics/event_objects/pics/pokemon/skitty/0.png similarity index 100% rename from graphics/map_objects/pics/pokemon/skitty/0.png rename to graphics/event_objects/pics/pokemon/skitty/0.png diff --git a/graphics/map_objects/pics/pokemon/skitty/1.png b/graphics/event_objects/pics/pokemon/skitty/1.png similarity index 100% rename from graphics/map_objects/pics/pokemon/skitty/1.png rename to graphics/event_objects/pics/pokemon/skitty/1.png diff --git a/graphics/map_objects/pics/pokemon/skitty/2.png b/graphics/event_objects/pics/pokemon/skitty/2.png similarity index 100% rename from graphics/map_objects/pics/pokemon/skitty/2.png rename to graphics/event_objects/pics/pokemon/skitty/2.png diff --git a/graphics/map_objects/pics/pokemon/sudowoodo/0.png b/graphics/event_objects/pics/pokemon/sudowoodo/0.png similarity index 100% rename from graphics/map_objects/pics/pokemon/sudowoodo/0.png rename to graphics/event_objects/pics/pokemon/sudowoodo/0.png diff --git a/graphics/map_objects/pics/pokemon/sudowoodo/1.png b/graphics/event_objects/pics/pokemon/sudowoodo/1.png similarity index 100% rename from graphics/map_objects/pics/pokemon/sudowoodo/1.png rename to graphics/event_objects/pics/pokemon/sudowoodo/1.png diff --git a/graphics/map_objects/pics/pokemon/sudowoodo/2.png b/graphics/event_objects/pics/pokemon/sudowoodo/2.png similarity index 100% rename from graphics/map_objects/pics/pokemon/sudowoodo/2.png rename to graphics/event_objects/pics/pokemon/sudowoodo/2.png diff --git a/graphics/map_objects/pics/pokemon/vigoroth_carrying_box/0.png b/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/0.png similarity index 100% rename from graphics/map_objects/pics/pokemon/vigoroth_carrying_box/0.png rename to graphics/event_objects/pics/pokemon/vigoroth_carrying_box/0.png diff --git a/graphics/map_objects/pics/pokemon/vigoroth_carrying_box/1.png b/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/1.png similarity index 100% rename from graphics/map_objects/pics/pokemon/vigoroth_carrying_box/1.png rename to graphics/event_objects/pics/pokemon/vigoroth_carrying_box/1.png diff --git a/graphics/map_objects/pics/pokemon/vigoroth_carrying_box/2.png b/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/2.png similarity index 100% rename from graphics/map_objects/pics/pokemon/vigoroth_carrying_box/2.png rename to graphics/event_objects/pics/pokemon/vigoroth_carrying_box/2.png diff --git a/graphics/map_objects/pics/pokemon/vigoroth_facing_away/0.png b/graphics/event_objects/pics/pokemon/vigoroth_facing_away/0.png similarity index 100% rename from graphics/map_objects/pics/pokemon/vigoroth_facing_away/0.png rename to graphics/event_objects/pics/pokemon/vigoroth_facing_away/0.png diff --git a/graphics/map_objects/pics/pokemon/vigoroth_facing_away/1.png b/graphics/event_objects/pics/pokemon/vigoroth_facing_away/1.png similarity index 100% rename from graphics/map_objects/pics/pokemon/vigoroth_facing_away/1.png rename to graphics/event_objects/pics/pokemon/vigoroth_facing_away/1.png diff --git a/graphics/map_objects/pics/pokemon/wingull/0.png b/graphics/event_objects/pics/pokemon/wingull/0.png similarity index 100% rename from graphics/map_objects/pics/pokemon/wingull/0.png rename to graphics/event_objects/pics/pokemon/wingull/0.png diff --git a/graphics/map_objects/pics/pokemon/wingull/1.png b/graphics/event_objects/pics/pokemon/wingull/1.png similarity index 100% rename from graphics/map_objects/pics/pokemon/wingull/1.png rename to graphics/event_objects/pics/pokemon/wingull/1.png diff --git a/graphics/map_objects/pics/pokemon/wingull/2.png b/graphics/event_objects/pics/pokemon/wingull/2.png similarity index 100% rename from graphics/map_objects/pics/pokemon/wingull/2.png rename to graphics/event_objects/pics/pokemon/wingull/2.png diff --git a/graphics/map_objects/pics/pokemon/wingull/3.png b/graphics/event_objects/pics/pokemon/wingull/3.png similarity index 100% rename from graphics/map_objects/pics/pokemon/wingull/3.png rename to graphics/event_objects/pics/pokemon/wingull/3.png diff --git a/graphics/map_objects/pics/pokemon/wingull/4.png b/graphics/event_objects/pics/pokemon/wingull/4.png similarity index 100% rename from graphics/map_objects/pics/pokemon/wingull/4.png rename to graphics/event_objects/pics/pokemon/wingull/4.png diff --git a/graphics/map_objects/pics/pokemon/wingull/5.png b/graphics/event_objects/pics/pokemon/wingull/5.png similarity index 100% rename from graphics/map_objects/pics/pokemon/wingull/5.png rename to graphics/event_objects/pics/pokemon/wingull/5.png diff --git a/graphics/map_objects/pics/pokemon/zigzagoon/0.png b/graphics/event_objects/pics/pokemon/zigzagoon/0.png similarity index 100% rename from graphics/map_objects/pics/pokemon/zigzagoon/0.png rename to graphics/event_objects/pics/pokemon/zigzagoon/0.png diff --git a/graphics/map_objects/pics/pokemon/zigzagoon/1.png b/graphics/event_objects/pics/pokemon/zigzagoon/1.png similarity index 100% rename from graphics/map_objects/pics/pokemon/zigzagoon/1.png rename to graphics/event_objects/pics/pokemon/zigzagoon/1.png diff --git a/graphics/map_objects/pics/pokemon/zigzagoon/2.png b/graphics/event_objects/pics/pokemon/zigzagoon/2.png similarity index 100% rename from graphics/map_objects/pics/pokemon/zigzagoon/2.png rename to graphics/event_objects/pics/pokemon/zigzagoon/2.png diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index dad4ea0261..fb250ad82a 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -18,7 +18,7 @@ SLOTMACHINEGFXDIR := graphics/slot_machine PKNAVGFXDIR := graphics/pokenav PKNAVOPTIONSGFXDIR := graphics/pokenav/options PSSGFXDIR := graphics/pokemon_storage -MAPOBJGFXDIR := graphics/map_objects +EVENTOBJGFXDIR := graphics/event_objects MISCGFXDIR := graphics/misc types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark @@ -628,7 +628,7 @@ $(PSSGFXDIR)/ludicolo.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/ludico $(PSSGFXDIR)/whiscash.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/whiscash_bg.4bpp @cat $^ >$@ -$(MAPOBJGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png +$(EVENTOBJGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 11 $(INTERFACEGFXDIR)/selector_outline.4bpp: %.4bpp: %.png diff --git a/include/battle_setup.h b/include/battle_setup.h index e4bae6fdb1..0caa3df27c 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -51,8 +51,8 @@ void ChooseStarter(void); void ResetTrainerOpponentIds(void); void SetMapVarsToTrainer(void); const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data); -void ConfigureAndSetUpOneTrainerBattle(u8 trainerMapObjId, const u8 *trainerScript); -void ConfigureTwoTrainersBattle(u8 trainerMapObjId, const u8 *trainerScript); +void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerScript); +void ConfigureTwoTrainersBattle(u8 trainerEventObjId, const u8 *trainerScript); void SetUpTwoTrainersBattle(void); bool32 GetTrainerFlagFromScriptPointer(const u8 *data); void sub_80B16D8(void); diff --git a/include/berry.h b/include/berry.h index b6926ef682..1a8b7fa256 100644 --- a/include/berry.h +++ b/include/berry.h @@ -23,7 +23,7 @@ enum #define NUM_BERRIES 44 -extern const u8 *const gBerryTreeFieldObjectGraphicsIdTablePointers[]; +extern const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[]; extern const struct SpriteFrameImage *const gBerryTreePicTablePointers[]; extern const u8 *const gBerryTreePaletteSlotTablePointers[]; @@ -33,7 +33,7 @@ u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry); bool32 IsEnigmaBerryValid(void); const struct Berry *GetBerryInfo(u8 berry); struct BerryTree *GetBerryTreeInfo(u8 id); -bool32 FieldObjectInteractionWaterBerryTree(void); +bool32 EventObjectInteractionWaterBerryTree(void); bool8 IsPlayerFacingPlantedBerryTree(void); bool8 TryToWaterBerryTree(void); void ClearBerryTrees(void); @@ -54,10 +54,10 @@ u8 CalcBerryYield(struct BerryTree *tree); u8 GetBerryCountByBerryTreeId(u8 id); u16 GetStageDurationByBerryType(u8); void Bag_ChooseBerry(void); -void FieldObjectInteractionGetBerryTreeData(void); -void FieldObjectInteractionPlantBerryTree(void); -void FieldObjectInteractionPickBerryTree(void); -void FieldObjectInteractionRemoveBerryTree(void); +void EventObjectInteractionGetBerryTreeData(void); +void EventObjectInteractionPlantBerryTree(void); +void EventObjectInteractionPickBerryTree(void); +void EventObjectInteractionRemoveBerryTree(void); u8 PlayerHasBerries(void); void ResetBerryTreeSparkleFlags(void); diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h new file mode 100644 index 0000000000..d04f0a1f96 --- /dev/null +++ b/include/constants/event_objects.h @@ -0,0 +1,263 @@ +#ifndef GUARD_CONSTANTS_EVENT_OBJECTS_H +#define GUARD_CONSTANTS_EVENT_OBJECTS_H + +#define EVENT_OBJ_GFX_BRENDAN_NORMAL 0 +#define EVENT_OBJ_GFX_BRENDAN_MACH_BIKE 1 +#define EVENT_OBJ_GFX_BRENDAN_SURFING 2 +#define EVENT_OBJ_GFX_BRENDAN_FIELD_MOVE 3 +#define EVENT_OBJ_GFX_QUINTY_PLUMP 4 +#define EVENT_OBJ_GFX_LITTLE_BOY_1 5 +#define EVENT_OBJ_GFX_LITTLE_GIRL_1 6 +#define EVENT_OBJ_GFX_BOY_1 7 +#define EVENT_OBJ_GFX_GIRL_1 8 +#define EVENT_OBJ_GFX_BOY_2 9 +#define EVENT_OBJ_GFX_GIRL_2 10 +#define EVENT_OBJ_GFX_LITTLE_BOY_2 11 +#define EVENT_OBJ_GFX_LITTLE_GIRL_2 12 +#define EVENT_OBJ_GFX_BOY_3 13 +#define EVENT_OBJ_GFX_GIRL_3 14 +#define EVENT_OBJ_GFX_BOY_4 15 +#define EVENT_OBJ_GFX_WOMAN_1 16 +#define EVENT_OBJ_GFX_FAT_MAN 17 +#define EVENT_OBJ_GFX_WOMAN_2 18 +#define EVENT_OBJ_GFX_MAN_1 19 +#define EVENT_OBJ_GFX_WOMAN_3 20 +#define EVENT_OBJ_GFX_OLD_MAN_1 21 +#define EVENT_OBJ_GFX_OLD_WOMAN_1 22 +#define EVENT_OBJ_GFX_MAN_2 23 +#define EVENT_OBJ_GFX_WOMAN_4 24 +#define EVENT_OBJ_GFX_MAN_3 25 +#define EVENT_OBJ_GFX_WOMAN_5 26 +#define EVENT_OBJ_GFX_COOK 27 +#define EVENT_OBJ_GFX_WOMAN_6 28 +#define EVENT_OBJ_GFX_OLD_MAN_2 29 +#define EVENT_OBJ_GFX_OLD_WOMAN_2 30 +#define EVENT_OBJ_GFX_CAMPER 31 +#define EVENT_OBJ_GFX_PICNICKER 32 +#define EVENT_OBJ_GFX_MAN_4 33 +#define EVENT_OBJ_GFX_WOMAN_7 34 +#define EVENT_OBJ_GFX_YOUNGSTER 35 +#define EVENT_OBJ_GFX_BUG_CATCHER 36 +#define EVENT_OBJ_GFX_PSYCHIC_M 37 +#define EVENT_OBJ_GFX_SCHOOL_KID_M 38 +#define EVENT_OBJ_GFX_MANIAC 39 +#define EVENT_OBJ_GFX_HEX_MANIAC 40 +#define EVENT_OBJ_GFX_RAYQUAZA_1 41 +#define EVENT_OBJ_GFX_SWIMMER_M 42 +#define EVENT_OBJ_GFX_SWIMMER_F 43 +#define EVENT_OBJ_GFX_BLACK_BELT 44 +#define EVENT_OBJ_GFX_BEAUTY 45 +#define EVENT_OBJ_GFX_SCIENTIST_1 46 +#define EVENT_OBJ_GFX_LASS 47 +#define EVENT_OBJ_GFX_GENTLEMAN 48 +#define EVENT_OBJ_GFX_SAILOR 49 +#define EVENT_OBJ_GFX_FISHERMAN 50 +#define EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M 51 +#define EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F 52 +#define EVENT_OBJ_GFX_TUBER_F 53 +#define EVENT_OBJ_GFX_TUBER_M 54 +#define EVENT_OBJ_GFX_HIKER 55 +#define EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M 56 +#define EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F 57 +#define EVENT_OBJ_GFX_NURSE 58 +#define EVENT_OBJ_GFX_ITEM_BALL 59 +#define EVENT_OBJ_GFX_BERRY_TREE 60 +#define EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES 61 +#define EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES 62 +#define EVENT_OBJ_GFX_BRENDAN_ACRO_BIKE 63 +#define EVENT_OBJ_GFX_PROF_BIRCH 64 +#define EVENT_OBJ_GFX_MAN_5 65 +#define EVENT_OBJ_GFX_MAN_6 66 +#define EVENT_OBJ_GFX_REPORTER_M 67 +#define EVENT_OBJ_GFX_REPORTER_F 68 +#define EVENT_OBJ_GFX_BARD 69 +#define EVENT_OBJ_GFX_ANABEL 70 +#define EVENT_OBJ_GFX_TUCKER 71 +#define EVENT_OBJ_GFX_GRETA 72 +#define EVENT_OBJ_GFX_SPENSER 73 +#define EVENT_OBJ_GFX_NOLAND 74 +#define EVENT_OBJ_GFX_LUCY 75 +#define EVENT_OBJ_GFX_UNUSED_NATU_DOLL 76 +#define EVENT_OBJ_GFX_UNUSED_MAGNEMITE_DOLL 77 +#define EVENT_OBJ_GFX_UNUSED_SQUIRTLE_DOLL 78 +#define EVENT_OBJ_GFX_UNUSED_WOOPER_DOLL 79 +#define EVENT_OBJ_GFX_UNUSED_PIKACHU_DOLL 80 +#define EVENT_OBJ_GFX_UNUSED_PORYGON2_DOLL 81 +#define EVENT_OBJ_GFX_CUTTABLE_TREE 82 +#define EVENT_OBJ_GFX_MART_EMPLOYEE 83 +#define EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN 84 +#define EVENT_OBJ_GFX_TEALA 85 +#define EVENT_OBJ_GFX_BREAKABLE_ROCK 86 +#define EVENT_OBJ_GFX_PUSHABLE_BOULDER 87 +#define EVENT_OBJ_GFX_MR_BRINEYS_BOAT 88 +#define EVENT_OBJ_GFX_MAY_NORMAL 89 +#define EVENT_OBJ_GFX_MAY_MACH_BIKE 90 +#define EVENT_OBJ_GFX_MAY_ACRO_BIKE 91 +#define EVENT_OBJ_GFX_MAY_SURFING 92 +#define EVENT_OBJ_GFX_MAY_FIELD_MOVE 93 +#define EVENT_OBJ_GFX_TRUCK 94 +#define EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX 95 +#define EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY 96 +#define EVENT_OBJ_GFX_BIRCHS_BAG 97 +#define EVENT_OBJ_GFX_ZIGZAGOON_1 98 +#define EVENT_OBJ_GFX_ARTIST 99 +#define EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL 100 +#define EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE 101 +#define EVENT_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE 102 +#define EVENT_OBJ_GFX_RIVAL_BRENDAN_SURFING 103 +#define EVENT_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE 104 +#define EVENT_OBJ_GFX_RIVAL_MAY_NORMAL 105 +#define EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE 106 +#define EVENT_OBJ_GFX_RIVAL_MAY_ACRO_BIKE 107 +#define EVENT_OBJ_GFX_RIVAL_MAY_SURFING 108 +#define EVENT_OBJ_GFX_RIVAL_MAY_FIELD_MOVE 109 +#define EVENT_OBJ_GFX_CAMERAMAN 110 +#define EVENT_OBJ_GFX_BRENDAN_UNDERWATER 111 +#define EVENT_OBJ_GFX_MAY_UNDERWATER 112 +#define EVENT_OBJ_GFX_MOVING_BOX 113 +#define EVENT_OBJ_GFX_CABLE_CAR 114 +#define EVENT_OBJ_GFX_SCIENTIST_2 115 +#define EVENT_OBJ_GFX_MAN_7 116 +#define EVENT_OBJ_GFX_AQUA_MEMBER_M 117 +#define EVENT_OBJ_GFX_AQUA_MEMBER_F 118 +#define EVENT_OBJ_GFX_MAGMA_MEMBER_M 119 +#define EVENT_OBJ_GFX_MAGMA_MEMBER_F 120 +#define EVENT_OBJ_GFX_SIDNEY 121 +#define EVENT_OBJ_GFX_PHOEBE 122 +#define EVENT_OBJ_GFX_GLACIA 123 +#define EVENT_OBJ_GFX_DRAKE 124 +#define EVENT_OBJ_GFX_ROXANNE 125 +#define EVENT_OBJ_GFX_BRAWLY 126 +#define EVENT_OBJ_GFX_WATTSON 127 +#define EVENT_OBJ_GFX_FLANNERY 128 +#define EVENT_OBJ_GFX_NORMAN 129 +#define EVENT_OBJ_GFX_WINONA 130 +#define EVENT_OBJ_GFX_LIZA 131 +#define EVENT_OBJ_GFX_TATE 132 +#define EVENT_OBJ_GFX_WALLACE 133 +#define EVENT_OBJ_GFX_STEVEN 134 +#define EVENT_OBJ_GFX_WALLY 135 +#define EVENT_OBJ_GFX_LITTLE_BOY_3 136 +#define EVENT_OBJ_GFX_BRENDAN_FISHING 137 +#define EVENT_OBJ_GFX_MAY_FISHING 138 +#define EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN 139 +#define EVENT_OBJ_GFX_SS_TIDAL 140 +#define EVENT_OBJ_GFX_SUBMARINE_SHADOW 141 +#define EVENT_OBJ_GFX_PICHU_DOLL 142 +#define EVENT_OBJ_GFX_PIKACHU_DOLL 143 +#define EVENT_OBJ_GFX_MARILL_DOLL 144 +#define EVENT_OBJ_GFX_TOGEPI_DOLL 145 +#define EVENT_OBJ_GFX_CYNDAQUIL_DOLL 146 +#define EVENT_OBJ_GFX_CHIKORITA_DOLL 147 +#define EVENT_OBJ_GFX_TOTODILE_DOLL 148 +#define EVENT_OBJ_GFX_JIGGLYPUFF_DOLL 149 +#define EVENT_OBJ_GFX_MEOWTH_DOLL 150 +#define EVENT_OBJ_GFX_CLEFAIRY_DOLL 151 +#define EVENT_OBJ_GFX_DITTO_DOLL 152 +#define EVENT_OBJ_GFX_SMOOCHUM_DOLL 153 +#define EVENT_OBJ_GFX_TREECKO_DOLL 154 +#define EVENT_OBJ_GFX_TORCHIC_DOLL 155 +#define EVENT_OBJ_GFX_MUDKIP_DOLL 156 +#define EVENT_OBJ_GFX_DUSKULL_DOLL 157 +#define EVENT_OBJ_GFX_WYNAUT_DOLL 158 +#define EVENT_OBJ_GFX_BALTOY_DOLL 159 +#define EVENT_OBJ_GFX_KECLEON_DOLL 160 +#define EVENT_OBJ_GFX_AZURILL_DOLL 161 +#define EVENT_OBJ_GFX_SKITTY_DOLL 162 +#define EVENT_OBJ_GFX_SWABLU_DOLL 163 +#define EVENT_OBJ_GFX_GULPIN_DOLL 164 +#define EVENT_OBJ_GFX_LOTAD_DOLL 165 +#define EVENT_OBJ_GFX_SEEDOT_DOLL 166 +#define EVENT_OBJ_GFX_PIKA_CUSHION 167 +#define EVENT_OBJ_GFX_ROUND_CUSHION 168 +#define EVENT_OBJ_GFX_KISS_CUSHION 169 +#define EVENT_OBJ_GFX_ZIGZAG_CUSHION 170 +#define EVENT_OBJ_GFX_SPIN_CUSHION 171 +#define EVENT_OBJ_GFX_DIAMOND_CUSHION 172 +#define EVENT_OBJ_GFX_BALL_CUSHION 173 +#define EVENT_OBJ_GFX_GRASS_CUSHION 174 +#define EVENT_OBJ_GFX_FIRE_CUSHION 175 +#define EVENT_OBJ_GFX_WATER_CUSHION 176 +#define EVENT_OBJ_GFX_BIG_SNORLAX_DOLL 177 +#define EVENT_OBJ_GFX_BIG_RHYDON_DOLL 178 +#define EVENT_OBJ_GFX_BIG_LAPRAS_DOLL 179 +#define EVENT_OBJ_GFX_BIG_VENUSAUR_DOLL 180 +#define EVENT_OBJ_GFX_BIG_CHARIZARD_DOLL 181 +#define EVENT_OBJ_GFX_BIG_BLASTOISE_DOLL 182 +#define EVENT_OBJ_GFX_BIG_WAILMER_DOLL 183 +#define EVENT_OBJ_GFX_BIG_REGIROCK_DOLL 184 +#define EVENT_OBJ_GFX_BIG_REGICE_DOLL 185 +#define EVENT_OBJ_GFX_BIG_REGISTEEL_DOLL 186 +#define EVENT_OBJ_GFX_LATIAS 187 +#define EVENT_OBJ_GFX_LATIOS 188 +#define EVENT_OBJ_GFX_BOY_5 189 +#define EVENT_OBJ_GFX_CONTEST_JUDGE 190 +#define EVENT_OBJ_GFX_BRENDAN_WATERING 191 +#define EVENT_OBJ_GFX_MAY_WATERING 192 +#define EVENT_OBJ_GFX_BRENDAN_DECORATING 193 +#define EVENT_OBJ_GFX_MAY_DECORATING 194 +#define EVENT_OBJ_GFX_ARCHIE 195 +#define EVENT_OBJ_GFX_MAXIE 196 +#define EVENT_OBJ_GFX_KYOGRE_1 197 +#define EVENT_OBJ_GFX_GROUDON_1 198 +#define EVENT_OBJ_GFX_FOSSIL 199 +#define EVENT_OBJ_GFX_REGIROCK 200 +#define EVENT_OBJ_GFX_REGICE 201 +#define EVENT_OBJ_GFX_REGISTEEL 202 +#define EVENT_OBJ_GFX_SKITTY 203 +#define EVENT_OBJ_GFX_KECLEON_1 204 +#define EVENT_OBJ_GFX_KYOGRE_2 205 +#define EVENT_OBJ_GFX_GROUDON_2 206 +#define EVENT_OBJ_GFX_RAYQUAZA_2 207 +#define EVENT_OBJ_GFX_ZIGZAGOON_2 208 +#define EVENT_OBJ_GFX_PIKACHU 209 +#define EVENT_OBJ_GFX_AZUMARILL 210 +#define EVENT_OBJ_GFX_WINGULL 211 +#define EVENT_OBJ_GFX_KECLEON_2 212 +#define EVENT_OBJ_GFX_TUBER_M_SWIMMING 213 +#define EVENT_OBJ_GFX_AZURILL 214 +#define EVENT_OBJ_GFX_MOM 215 +#define EVENT_OBJ_GFX_LINK_BRENDAN 216 +#define EVENT_OBJ_GFX_LINK_MAY 217 +#define EVENT_OBJ_GFX_JUAN 218 +#define EVENT_OBJ_GFX_SCOTT 219 +#define EVENT_OBJ_GFX_POOCHYENA 220 +#define EVENT_OBJ_GFX_KYOGRE_3 221 +#define EVENT_OBJ_GFX_GROUDON_3 222 +#define EVENT_OBJ_GFX_MYSTERY_GIFT_MAN 223 +#define EVENT_OBJ_GFX_TRICK_HOUSE_STATUE 224 +#define EVENT_OBJ_GFX_KIRLIA 225 +#define EVENT_OBJ_GFX_DUSCLOPS 226 +#define EVENT_OBJ_GFX_UNION_ROOM_NURSE 227 +#define EVENT_OBJ_GFX_SUDOWOODO 228 +#define EVENT_OBJ_GFX_MEW 229 +#define EVENT_OBJ_GFX_RED 230 +#define EVENT_OBJ_GFX_LEAF 231 +#define EVENT_OBJ_GFX_DEOXYS 232 +#define EVENT_OBJ_GFX_DEOXYS_TRIANGLE 233 +#define EVENT_OBJ_GFX_BRANDON 234 +#define EVENT_OBJ_GFX_LINK_RS_BRENDAN 235 +#define EVENT_OBJ_GFX_LINK_RS_MAY 236 +#define EVENT_OBJ_GFX_LUGIA 237 +#define EVENT_OBJ_GFX_HOOH 238 +#define EVENT_OBJ_GFX_BARD_2 239 +#define EVENT_OBJ_GFX_HIPSTER 240 +#define EVENT_OBJ_GFX_TRADER 241 +#define EVENT_OBJ_GFX_STORYTELLER 242 +#define EVENT_OBJ_GFX_GIDDY 243 +#define EVENT_OBJ_GFX_PLACEHOLDER_1 244 +#define EVENT_OBJ_GFX_PLACEHOLDER_2 245 + +#define SHADOW_SIZE_S 0 +#define SHADOW_SIZE_M 1 +#define SHADOW_SIZE_L 2 +#define SHADOW_SIZE_XL 3 + +#define F_INANIMATE (1 << 6) +#define F_DISABLE_REFLECTION_PALETTE_LOAD (1 << 7) + +#define TRACKS_NONE 0 +#define TRACKS_FOOT 1 +#define TRACKS_BIKE_TIRE 2 + +#endif // GUARD_CONSTANTS_EVENT_OBJECTS_H diff --git a/include/constants/map_objects.h b/include/constants/map_objects.h deleted file mode 100644 index d5b9830059..0000000000 --- a/include/constants/map_objects.h +++ /dev/null @@ -1,263 +0,0 @@ -#ifndef GUARD_CONSTANTS_MAP_OBJECTS_H -#define GUARD_CONSTANTS_MAP_OBJECTS_H - -#define MAP_OBJ_GFX_BRENDAN_NORMAL 0 -#define MAP_OBJ_GFX_BRENDAN_MACH_BIKE 1 -#define MAP_OBJ_GFX_BRENDAN_SURFING 2 -#define MAP_OBJ_GFX_BRENDAN_FIELD_MOVE 3 -#define MAP_OBJ_GFX_QUINTY_PLUMP 4 -#define MAP_OBJ_GFX_LITTLE_BOY_1 5 -#define MAP_OBJ_GFX_LITTLE_GIRL_1 6 -#define MAP_OBJ_GFX_BOY_1 7 -#define MAP_OBJ_GFX_GIRL_1 8 -#define MAP_OBJ_GFX_BOY_2 9 -#define MAP_OBJ_GFX_GIRL_2 10 -#define MAP_OBJ_GFX_LITTLE_BOY_2 11 -#define MAP_OBJ_GFX_LITTLE_GIRL_2 12 -#define MAP_OBJ_GFX_BOY_3 13 -#define MAP_OBJ_GFX_GIRL_3 14 -#define MAP_OBJ_GFX_BOY_4 15 -#define MAP_OBJ_GFX_WOMAN_1 16 -#define MAP_OBJ_GFX_FAT_MAN 17 -#define MAP_OBJ_GFX_WOMAN_2 18 -#define MAP_OBJ_GFX_MAN_1 19 -#define MAP_OBJ_GFX_WOMAN_3 20 -#define MAP_OBJ_GFX_OLD_MAN_1 21 -#define MAP_OBJ_GFX_OLD_WOMAN_1 22 -#define MAP_OBJ_GFX_MAN_2 23 -#define MAP_OBJ_GFX_WOMAN_4 24 -#define MAP_OBJ_GFX_MAN_3 25 -#define MAP_OBJ_GFX_WOMAN_5 26 -#define MAP_OBJ_GFX_COOK 27 -#define MAP_OBJ_GFX_WOMAN_6 28 -#define MAP_OBJ_GFX_OLD_MAN_2 29 -#define MAP_OBJ_GFX_OLD_WOMAN_2 30 -#define MAP_OBJ_GFX_CAMPER 31 -#define MAP_OBJ_GFX_PICNICKER 32 -#define MAP_OBJ_GFX_MAN_4 33 -#define MAP_OBJ_GFX_WOMAN_7 34 -#define MAP_OBJ_GFX_YOUNGSTER 35 -#define MAP_OBJ_GFX_BUG_CATCHER 36 -#define MAP_OBJ_GFX_PSYCHIC_M 37 -#define MAP_OBJ_GFX_SCHOOL_KID_M 38 -#define MAP_OBJ_GFX_MANIAC 39 -#define MAP_OBJ_GFX_HEX_MANIAC 40 -#define MAP_OBJ_GFX_RAYQUAZA_1 41 -#define MAP_OBJ_GFX_SWIMMER_M 42 -#define MAP_OBJ_GFX_SWIMMER_F 43 -#define MAP_OBJ_GFX_BLACK_BELT 44 -#define MAP_OBJ_GFX_BEAUTY 45 -#define MAP_OBJ_GFX_SCIENTIST_1 46 -#define MAP_OBJ_GFX_LASS 47 -#define MAP_OBJ_GFX_GENTLEMAN 48 -#define MAP_OBJ_GFX_SAILOR 49 -#define MAP_OBJ_GFX_FISHERMAN 50 -#define MAP_OBJ_GFX_RUNNING_TRIATHLETE_M 51 -#define MAP_OBJ_GFX_RUNNING_TRIATHLETE_F 52 -#define MAP_OBJ_GFX_TUBER_F 53 -#define MAP_OBJ_GFX_TUBER_M 54 -#define MAP_OBJ_GFX_HIKER 55 -#define MAP_OBJ_GFX_CYCLING_TRIATHLETE_M 56 -#define MAP_OBJ_GFX_CYCLING_TRIATHLETE_F 57 -#define MAP_OBJ_GFX_NURSE 58 -#define MAP_OBJ_GFX_ITEM_BALL 59 -#define MAP_OBJ_GFX_BERRY_TREE 60 -#define MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES 61 -#define MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES 62 -#define MAP_OBJ_GFX_BRENDAN_ACRO_BIKE 63 -#define MAP_OBJ_GFX_PROF_BIRCH 64 -#define MAP_OBJ_GFX_MAN_5 65 -#define MAP_OBJ_GFX_MAN_6 66 -#define MAP_OBJ_GFX_REPORTER_M 67 -#define MAP_OBJ_GFX_REPORTER_F 68 -#define MAP_OBJ_GFX_BARD 69 -#define MAP_OBJ_GFX_ANABEL 70 -#define MAP_OBJ_GFX_TUCKER 71 -#define MAP_OBJ_GFX_GRETA 72 -#define MAP_OBJ_GFX_SPENSER 73 -#define MAP_OBJ_GFX_NOLAND 74 -#define MAP_OBJ_GFX_LUCY 75 -#define MAP_OBJ_GFX_UNUSED_NATU_DOLL 76 -#define MAP_OBJ_GFX_UNUSED_MAGNEMITE_DOLL 77 -#define MAP_OBJ_GFX_UNUSED_SQUIRTLE_DOLL 78 -#define MAP_OBJ_GFX_UNUSED_WOOPER_DOLL 79 -#define MAP_OBJ_GFX_UNUSED_PIKACHU_DOLL 80 -#define MAP_OBJ_GFX_UNUSED_PORYGON2_DOLL 81 -#define MAP_OBJ_GFX_CUTTABLE_TREE 82 -#define MAP_OBJ_GFX_MART_EMPLOYEE 83 -#define MAP_OBJ_GFX_ROOFTOP_SALE_WOMAN 84 -#define MAP_OBJ_GFX_TEALA 85 -#define MAP_OBJ_GFX_BREAKABLE_ROCK 86 -#define MAP_OBJ_GFX_PUSHABLE_BOULDER 87 -#define MAP_OBJ_GFX_MR_BRINEYS_BOAT 88 -#define MAP_OBJ_GFX_MAY_NORMAL 89 -#define MAP_OBJ_GFX_MAY_MACH_BIKE 90 -#define MAP_OBJ_GFX_MAY_ACRO_BIKE 91 -#define MAP_OBJ_GFX_MAY_SURFING 92 -#define MAP_OBJ_GFX_MAY_FIELD_MOVE 93 -#define MAP_OBJ_GFX_TRUCK 94 -#define MAP_OBJ_GFX_VIGAROTH_CARRYING_BOX 95 -#define MAP_OBJ_GFX_VIGAROTH_FACING_AWAY 96 -#define MAP_OBJ_GFX_BIRCHS_BAG 97 -#define MAP_OBJ_GFX_ZIGZAGOON_1 98 -#define MAP_OBJ_GFX_ARTIST 99 -#define MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL 100 -#define MAP_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE 101 -#define MAP_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE 102 -#define MAP_OBJ_GFX_RIVAL_BRENDAN_SURFING 103 -#define MAP_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE 104 -#define MAP_OBJ_GFX_RIVAL_MAY_NORMAL 105 -#define MAP_OBJ_GFX_RIVAL_MAY_MACH_BIKE 106 -#define MAP_OBJ_GFX_RIVAL_MAY_ACRO_BIKE 107 -#define MAP_OBJ_GFX_RIVAL_MAY_SURFING 108 -#define MAP_OBJ_GFX_RIVAL_MAY_FIELD_MOVE 109 -#define MAP_OBJ_GFX_CAMERAMAN 110 -#define MAP_OBJ_GFX_BRENDAN_UNDERWATER 111 -#define MAP_OBJ_GFX_MAY_UNDERWATER 112 -#define MAP_OBJ_GFX_MOVING_BOX 113 -#define MAP_OBJ_GFX_CABLE_CAR 114 -#define MAP_OBJ_GFX_SCIENTIST_2 115 -#define MAP_OBJ_GFX_MAN_7 116 -#define MAP_OBJ_GFX_AQUA_MEMBER_M 117 -#define MAP_OBJ_GFX_AQUA_MEMBER_F 118 -#define MAP_OBJ_GFX_MAGMA_MEMBER_M 119 -#define MAP_OBJ_GFX_MAGMA_MEMBER_F 120 -#define MAP_OBJ_GFX_SIDNEY 121 -#define MAP_OBJ_GFX_PHOEBE 122 -#define MAP_OBJ_GFX_GLACIA 123 -#define MAP_OBJ_GFX_DRAKE 124 -#define MAP_OBJ_GFX_ROXANNE 125 -#define MAP_OBJ_GFX_BRAWLY 126 -#define MAP_OBJ_GFX_WATTSON 127 -#define MAP_OBJ_GFX_FLANNERY 128 -#define MAP_OBJ_GFX_NORMAN 129 -#define MAP_OBJ_GFX_WINONA 130 -#define MAP_OBJ_GFX_LIZA 131 -#define MAP_OBJ_GFX_TATE 132 -#define MAP_OBJ_GFX_WALLACE 133 -#define MAP_OBJ_GFX_STEVEN 134 -#define MAP_OBJ_GFX_WALLY 135 -#define MAP_OBJ_GFX_LITTLE_BOY_3 136 -#define MAP_OBJ_GFX_BRENDAN_FISHING 137 -#define MAP_OBJ_GFX_MAY_FISHING 138 -#define MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN 139 -#define MAP_OBJ_GFX_SS_TIDAL 140 -#define MAP_OBJ_GFX_SUBMARINE_SHADOW 141 -#define MAP_OBJ_GFX_PICHU_DOLL 142 -#define MAP_OBJ_GFX_PIKACHU_DOLL 143 -#define MAP_OBJ_GFX_MARILL_DOLL 144 -#define MAP_OBJ_GFX_TOGEPI_DOLL 145 -#define MAP_OBJ_GFX_CYNDAQUIL_DOLL 146 -#define MAP_OBJ_GFX_CHIKORITA_DOLL 147 -#define MAP_OBJ_GFX_TOTODILE_DOLL 148 -#define MAP_OBJ_GFX_JIGGLYPUFF_DOLL 149 -#define MAP_OBJ_GFX_MEOWTH_DOLL 150 -#define MAP_OBJ_GFX_CLEFAIRY_DOLL 151 -#define MAP_OBJ_GFX_DITTO_DOLL 152 -#define MAP_OBJ_GFX_SMOOCHUM_DOLL 153 -#define MAP_OBJ_GFX_TREECKO_DOLL 154 -#define MAP_OBJ_GFX_TORCHIC_DOLL 155 -#define MAP_OBJ_GFX_MUDKIP_DOLL 156 -#define MAP_OBJ_GFX_DUSKULL_DOLL 157 -#define MAP_OBJ_GFX_WYNAUT_DOLL 158 -#define MAP_OBJ_GFX_BALTOY_DOLL 159 -#define MAP_OBJ_GFX_KECLEON_DOLL 160 -#define MAP_OBJ_GFX_AZURILL_DOLL 161 -#define MAP_OBJ_GFX_SKITTY_DOLL 162 -#define MAP_OBJ_GFX_SWABLU_DOLL 163 -#define MAP_OBJ_GFX_GULPIN_DOLL 164 -#define MAP_OBJ_GFX_LOTAD_DOLL 165 -#define MAP_OBJ_GFX_SEEDOT_DOLL 166 -#define MAP_OBJ_GFX_PIKA_CUSHION 167 -#define MAP_OBJ_GFX_ROUND_CUSHION 168 -#define MAP_OBJ_GFX_KISS_CUSHION 169 -#define MAP_OBJ_GFX_ZIGZAG_CUSHION 170 -#define MAP_OBJ_GFX_SPIN_CUSHION 171 -#define MAP_OBJ_GFX_DIAMOND_CUSHION 172 -#define MAP_OBJ_GFX_BALL_CUSHION 173 -#define MAP_OBJ_GFX_GRASS_CUSHION 174 -#define MAP_OBJ_GFX_FIRE_CUSHION 175 -#define MAP_OBJ_GFX_WATER_CUSHION 176 -#define MAP_OBJ_GFX_BIG_SNORLAX_DOLL 177 -#define MAP_OBJ_GFX_BIG_RHYDON_DOLL 178 -#define MAP_OBJ_GFX_BIG_LAPRAS_DOLL 179 -#define MAP_OBJ_GFX_BIG_VENUSAUR_DOLL 180 -#define MAP_OBJ_GFX_BIG_CHARIZARD_DOLL 181 -#define MAP_OBJ_GFX_BIG_BLASTOISE_DOLL 182 -#define MAP_OBJ_GFX_BIG_WAILMER_DOLL 183 -#define MAP_OBJ_GFX_BIG_REGIROCK_DOLL 184 -#define MAP_OBJ_GFX_BIG_REGICE_DOLL 185 -#define MAP_OBJ_GFX_BIG_REGISTEEL_DOLL 186 -#define MAP_OBJ_GFX_LATIAS 187 -#define MAP_OBJ_GFX_LATIOS 188 -#define MAP_OBJ_GFX_BOY_5 189 -#define MAP_OBJ_GFX_CONTEST_JUDGE 190 -#define MAP_OBJ_GFX_BRENDAN_WATERING 191 -#define MAP_OBJ_GFX_MAY_WATERING 192 -#define MAP_OBJ_GFX_BRENDAN_DECORATING 193 -#define MAP_OBJ_GFX_MAY_DECORATING 194 -#define MAP_OBJ_GFX_ARCHIE 195 -#define MAP_OBJ_GFX_MAXIE 196 -#define MAP_OBJ_GFX_KYOGRE_1 197 -#define MAP_OBJ_GFX_GROUDON_1 198 -#define MAP_OBJ_GFX_FOSSIL 199 -#define MAP_OBJ_GFX_REGIROCK 200 -#define MAP_OBJ_GFX_REGICE 201 -#define MAP_OBJ_GFX_REGISTEEL 202 -#define MAP_OBJ_GFX_SKITTY 203 -#define MAP_OBJ_GFX_KECLEON_1 204 -#define MAP_OBJ_GFX_KYOGRE_2 205 -#define MAP_OBJ_GFX_GROUDON_2 206 -#define MAP_OBJ_GFX_RAYQUAZA_2 207 -#define MAP_OBJ_GFX_ZIGZAGOON_2 208 -#define MAP_OBJ_GFX_PIKACHU 209 -#define MAP_OBJ_GFX_AZUMARILL 210 -#define MAP_OBJ_GFX_WINGULL 211 -#define MAP_OBJ_GFX_KECLEON_2 212 -#define MAP_OBJ_GFX_TUBER_M_SWIMMING 213 -#define MAP_OBJ_GFX_AZURILL 214 -#define MAP_OBJ_GFX_MOM 215 -#define MAP_OBJ_GFX_LINK_BRENDAN 216 -#define MAP_OBJ_GFX_LINK_MAY 217 -#define MAP_OBJ_GFX_JUAN 218 -#define MAP_OBJ_GFX_SCOTT 219 -#define MAP_OBJ_GFX_POOCHYENA 220 -#define MAP_OBJ_GFX_KYOGRE_3 221 -#define MAP_OBJ_GFX_GROUDON_3 222 -#define MAP_OBJ_GFX_MYSTERY_GIFT_MAN 223 -#define MAP_OBJ_GFX_TRICK_HOUSE_STATUE 224 -#define MAP_OBJ_GFX_KIRLIA 225 -#define MAP_OBJ_GFX_DUSCLOPS 226 -#define MAP_OBJ_GFX_UNION_ROOM_NURSE 227 -#define MAP_OBJ_GFX_SUDOWOODO 228 -#define MAP_OBJ_GFX_MEW 229 -#define MAP_OBJ_GFX_RED 230 -#define MAP_OBJ_GFX_LEAF 231 -#define MAP_OBJ_GFX_DEOXYS 232 -#define MAP_OBJ_GFX_DEOXYS_TRIANGLE 233 -#define MAP_OBJ_GFX_BRANDON 234 -#define MAP_OBJ_GFX_LINK_RS_BRENDAN 235 -#define MAP_OBJ_GFX_LINK_RS_MAY 236 -#define MAP_OBJ_GFX_LUGIA 237 -#define MAP_OBJ_GFX_HOOH 238 -#define MAP_OBJ_GFX_BARD_2 239 -#define MAP_OBJ_GFX_HIPSTER 240 -#define MAP_OBJ_GFX_TRADER 241 -#define MAP_OBJ_GFX_STORYTELLER 242 -#define MAP_OBJ_GFX_GIDDY 243 -#define MAP_OBJ_GFX_PLACEHOLDER_1 244 -#define MAP_OBJ_GFX_PLACEHOLDER_2 245 - -#define SHADOW_SIZE_S 0 -#define SHADOW_SIZE_M 1 -#define SHADOW_SIZE_L 2 -#define SHADOW_SIZE_XL 3 - -#define F_INANIMATE (1 << 6) -#define F_DISABLE_REFLECTION_PALETTE_LOAD (1 << 7) - -#define TRACKS_NONE 0 -#define TRACKS_FOOT 1 -#define TRACKS_BIKE_TIRE 2 - -#endif // GUARD_CONSTANTS_MAP_OBJECTS_H diff --git a/include/constants/vars.h b/include/constants/vars.h index 976c6a739b..ed4a7797bb 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -27,7 +27,7 @@ // object gfx id vars // These 0x10 vars are used to dynamically control a map object's sprite. // For example, the rival's sprite id is dynamically set based on the player's gender. -// See VarGetFieldObjectGraphicsId(). +// See VarGetEventObjectGraphicsId(). #define VAR_OBJ_GFX_ID_0 0x4010 #define VAR_OBJ_GFX_ID_1 0x4011 #define VAR_OBJ_GFX_ID_2 0x4012 diff --git a/include/data/decoration/tiles.h b/include/data/decoration/tiles.h index 9a3f8a2225..6b3ed699f4 100644 --- a/include/data/decoration/tiles.h +++ b/include/data/decoration/tiles.h @@ -464,183 +464,183 @@ const u16 DecorGfx_KISS_POSTER[] = { }; const u16 DecorGfx_PICHU_DOLL[] = { - MAP_OBJ_GFX_PICHU_DOLL + EVENT_OBJ_GFX_PICHU_DOLL }; const u16 DecorGfx_PIKACHU_DOLL[] = { - MAP_OBJ_GFX_PIKACHU_DOLL + EVENT_OBJ_GFX_PIKACHU_DOLL }; const u16 DecorGfx_MARILL_DOLL[] = { - MAP_OBJ_GFX_MARILL_DOLL + EVENT_OBJ_GFX_MARILL_DOLL }; const u16 DecorGfx_TOGEPI_DOLL[] = { - MAP_OBJ_GFX_TOGEPI_DOLL + EVENT_OBJ_GFX_TOGEPI_DOLL }; const u16 DecorGfx_CYNDAQUIL_DOLL[] = { - MAP_OBJ_GFX_CYNDAQUIL_DOLL + EVENT_OBJ_GFX_CYNDAQUIL_DOLL }; const u16 DecorGfx_CHIKORITA_DOLL[] = { - MAP_OBJ_GFX_CHIKORITA_DOLL + EVENT_OBJ_GFX_CHIKORITA_DOLL }; const u16 DecorGfx_TOTODILE_DOLL[] = { - MAP_OBJ_GFX_TOTODILE_DOLL + EVENT_OBJ_GFX_TOTODILE_DOLL }; const u16 DecorGfx_JIGGLYPUFF_DOLL[] = { - MAP_OBJ_GFX_JIGGLYPUFF_DOLL + EVENT_OBJ_GFX_JIGGLYPUFF_DOLL }; const u16 DecorGfx_MEOWTH_DOLL[] = { - MAP_OBJ_GFX_MEOWTH_DOLL + EVENT_OBJ_GFX_MEOWTH_DOLL }; const u16 DecorGfx_CLEFAIRY_DOLL[] = { - MAP_OBJ_GFX_CLEFAIRY_DOLL + EVENT_OBJ_GFX_CLEFAIRY_DOLL }; const u16 DecorGfx_DITTO_DOLL[] = { - MAP_OBJ_GFX_DITTO_DOLL + EVENT_OBJ_GFX_DITTO_DOLL }; const u16 DecorGfx_SMOOCHUM_DOLL[] = { - MAP_OBJ_GFX_SMOOCHUM_DOLL + EVENT_OBJ_GFX_SMOOCHUM_DOLL }; const u16 DecorGfx_TREECKO_DOLL[] = { - MAP_OBJ_GFX_TREECKO_DOLL + EVENT_OBJ_GFX_TREECKO_DOLL }; const u16 DecorGfx_TORCHIC_DOLL[] = { - MAP_OBJ_GFX_TORCHIC_DOLL + EVENT_OBJ_GFX_TORCHIC_DOLL }; const u16 DecorGfx_MUDKIP_DOLL[] = { - MAP_OBJ_GFX_MUDKIP_DOLL + EVENT_OBJ_GFX_MUDKIP_DOLL }; const u16 DecorGfx_DUSKULL_DOLL[] = { - MAP_OBJ_GFX_DUSKULL_DOLL + EVENT_OBJ_GFX_DUSKULL_DOLL }; const u16 DecorGfx_WYNAUT_DOLL[] = { - MAP_OBJ_GFX_WYNAUT_DOLL + EVENT_OBJ_GFX_WYNAUT_DOLL }; const u16 DecorGfx_BALTOY_DOLL[] = { - MAP_OBJ_GFX_BALTOY_DOLL + EVENT_OBJ_GFX_BALTOY_DOLL }; const u16 DecorGfx_KECLEON_DOLL[] = { - MAP_OBJ_GFX_KECLEON_DOLL + EVENT_OBJ_GFX_KECLEON_DOLL }; const u16 DecorGfx_AZURILL_DOLL[] = { - MAP_OBJ_GFX_AZURILL_DOLL + EVENT_OBJ_GFX_AZURILL_DOLL }; const u16 DecorGfx_SKITTY_DOLL[] = { - MAP_OBJ_GFX_SKITTY_DOLL + EVENT_OBJ_GFX_SKITTY_DOLL }; const u16 DecorGfx_SWABLU_DOLL[] = { - MAP_OBJ_GFX_SWABLU_DOLL + EVENT_OBJ_GFX_SWABLU_DOLL }; const u16 DecorGfx_GULPIN_DOLL[] = { - MAP_OBJ_GFX_GULPIN_DOLL + EVENT_OBJ_GFX_GULPIN_DOLL }; const u16 DecorGfx_LOTAD_DOLL[] = { - MAP_OBJ_GFX_LOTAD_DOLL + EVENT_OBJ_GFX_LOTAD_DOLL }; const u16 DecorGfx_SEEDOT_DOLL[] = { - MAP_OBJ_GFX_SEEDOT_DOLL + EVENT_OBJ_GFX_SEEDOT_DOLL }; const u16 DecorGfx_PIKA_CUSHION[] = { - MAP_OBJ_GFX_PIKA_CUSHION + EVENT_OBJ_GFX_PIKA_CUSHION }; const u16 DecorGfx_ROUND_CUSHION[] = { - MAP_OBJ_GFX_ROUND_CUSHION + EVENT_OBJ_GFX_ROUND_CUSHION }; const u16 DecorGfx_KISS_CUSHION[] = { - MAP_OBJ_GFX_KISS_CUSHION + EVENT_OBJ_GFX_KISS_CUSHION }; const u16 DecorGfx_ZIGZAG_CUSHION[] = { - MAP_OBJ_GFX_ZIGZAG_CUSHION + EVENT_OBJ_GFX_ZIGZAG_CUSHION }; const u16 DecorGfx_SPIN_CUSHION[] = { - MAP_OBJ_GFX_SPIN_CUSHION + EVENT_OBJ_GFX_SPIN_CUSHION }; const u16 DecorGfx_DIAMOND_CUSHION[] = { - MAP_OBJ_GFX_DIAMOND_CUSHION + EVENT_OBJ_GFX_DIAMOND_CUSHION }; const u16 DecorGfx_BALL_CUSHION[] = { - MAP_OBJ_GFX_BALL_CUSHION + EVENT_OBJ_GFX_BALL_CUSHION }; const u16 DecorGfx_GRASS_CUSHION[] = { - MAP_OBJ_GFX_GRASS_CUSHION + EVENT_OBJ_GFX_GRASS_CUSHION }; const u16 DecorGfx_FIRE_CUSHION[] = { - MAP_OBJ_GFX_FIRE_CUSHION + EVENT_OBJ_GFX_FIRE_CUSHION }; const u16 DecorGfx_WATER_CUSHION[] = { - MAP_OBJ_GFX_WATER_CUSHION + EVENT_OBJ_GFX_WATER_CUSHION }; const u16 DecorGfx_SNORLAX_DOLL[] = { - MAP_OBJ_GFX_BIG_SNORLAX_DOLL + EVENT_OBJ_GFX_BIG_SNORLAX_DOLL }; const u16 DecorGfx_RHYDON_DOLL[] = { - MAP_OBJ_GFX_BIG_RHYDON_DOLL + EVENT_OBJ_GFX_BIG_RHYDON_DOLL }; const u16 DecorGfx_LAPRAS_DOLL[] = { - MAP_OBJ_GFX_BIG_LAPRAS_DOLL + EVENT_OBJ_GFX_BIG_LAPRAS_DOLL }; const u16 DecorGfx_VENUSAUR_DOLL[] = { - MAP_OBJ_GFX_BIG_VENUSAUR_DOLL + EVENT_OBJ_GFX_BIG_VENUSAUR_DOLL }; const u16 DecorGfx_CHARIZARD_DOLL[] = { - MAP_OBJ_GFX_BIG_CHARIZARD_DOLL + EVENT_OBJ_GFX_BIG_CHARIZARD_DOLL }; const u16 DecorGfx_BLASTOISE_DOLL[] = { - MAP_OBJ_GFX_BIG_BLASTOISE_DOLL + EVENT_OBJ_GFX_BIG_BLASTOISE_DOLL }; const u16 DecorGfx_WAILMER_DOLL[] = { - MAP_OBJ_GFX_BIG_WAILMER_DOLL + EVENT_OBJ_GFX_BIG_WAILMER_DOLL }; const u16 DecorGfx_REGIROCK_DOLL[] = { - MAP_OBJ_GFX_BIG_REGIROCK_DOLL + EVENT_OBJ_GFX_BIG_REGIROCK_DOLL }; const u16 DecorGfx_REGICE_DOLL[] = { - MAP_OBJ_GFX_BIG_REGICE_DOLL + EVENT_OBJ_GFX_BIG_REGICE_DOLL }; const u16 DecorGfx_REGISTEEL_DOLL[] = { - MAP_OBJ_GFX_BIG_REGISTEEL_DOLL + EVENT_OBJ_GFX_BIG_REGISTEEL_DOLL }; #endif // GUARD_DATA_DECORATION_TILES diff --git a/include/event_data.h b/include/event_data.h index f829d3b87c..e09b32d441 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -24,7 +24,7 @@ bool32 CanResetRTC(void); u16 *GetVarPointer(u16 id); u16 VarGet(u16 id); bool8 VarSet(u16 id, u16 value); -u8 VarGetFieldObjectGraphicsId(u8 id); +u8 VarGetEventObjectGraphicsId(u8 id); u8 *GetFlagPointer(u16 id); u8 FlagSet(u16 id); u8 FlagClear(u16 id); diff --git a/include/event_obj_lock.h b/include/event_obj_lock.h new file mode 100644 index 0000000000..59532fdcb2 --- /dev/null +++ b/include/event_obj_lock.h @@ -0,0 +1,11 @@ +#ifndef GUARD_EVENT_OBJ_LOCK_H +#define GUARD_EVENT_OBJ_LOCK_H + +bool8 sub_80983C4(void); +void ScriptFreezeEventObjects(void); +bool8 sub_809847C(void); +void LockSelectedEventObject(void); +void sub_8098630(void); +bool8 sub_8098734(void); + +#endif // GUARD_EVENT_OBJ_LOCK_H diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 293c2e3dcf..ca2449a6d7 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -1,5 +1,5 @@ -#ifndef GUARD_FIELD_MAP_OBJ_H -#define GUARD_FIELD_MAP_OBJ_H +#ifndef GUARD_FIELD_EVENT_OBJ_H +#define GUARD_FIELD_EVENT_OBJ_H #define NUM_OBJECT_GRAPHICS_INFO 239 #define SPRITE_VAR 240 @@ -47,40 +47,40 @@ struct UnkStruct_085094AC { #define GROUND_EFFECT_FLAG_SEAWEED (1 << 19) #define null_object_step(name, retval) \ -bool8 FieldObjectCB2_##name(struct MapObject *, struct Sprite *);\ -void FieldObjectCB_##name(struct Sprite *sprite)\ +bool8 EventObjectCB2_##name(struct EventObject *, struct Sprite *);\ +void EventObjectCB_##name(struct Sprite *sprite)\ {\ - FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, FieldObjectCB2_##name);\ + EventObjectStep(&gEventObjects[sprite->data[0]], sprite, EventObjectCB2_##name);\ }\ -bool8 FieldObjectCB2_##name(struct MapObject *mapObject, struct Sprite *sprite)\ +bool8 EventObjectCB2_##name(struct EventObject *eventObject, struct Sprite *sprite)\ {\ return (retval);\ } #define field_object_step(name, table) \ -extern bool8 (*const (table)[])(struct MapObject *, struct Sprite *);\ -bool8 FieldObjectCB2_##name(struct MapObject *, struct Sprite *);\ -void FieldObjectCB_##name(struct Sprite *sprite)\ +extern bool8 (*const (table)[])(struct EventObject *, struct Sprite *);\ +bool8 EventObjectCB2_##name(struct EventObject *, struct Sprite *);\ +void EventObjectCB_##name(struct Sprite *sprite)\ {\ - FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, FieldObjectCB2_##name);\ + EventObjectStep(&gEventObjects[sprite->data[0]], sprite, EventObjectCB2_##name);\ }\ -bool8 FieldObjectCB2_##name(struct MapObject *mapObject, struct Sprite *sprite)\ +bool8 EventObjectCB2_##name(struct EventObject *eventObject, struct Sprite *sprite)\ {\ - return (table)[sprite->data[1]](mapObject, sprite);\ + return (table)[sprite->data[1]](eventObject, sprite);\ } #define field_object_path(idx, table, sub, path, catch, coord)\ field_object_step(GoInDirectionSequence##idx, table)\ extern const u8 path[4];\ -bool8 sub(struct MapObject *mapObject, struct Sprite *sprite)\ +bool8 sub(struct EventObject *eventObject, struct Sprite *sprite)\ {\ u8 route[sizeof(path)];\ memcpy(route, path, sizeof(path));\ - if (mapObject->directionSequenceIndex == (catch) && mapObject->initialCoords.coord == mapObject->currentCoords.coord)\ + if (eventObject->directionSequenceIndex == (catch) && eventObject->initialCoords.coord == eventObject->currentCoords.coord)\ {\ - mapObject->directionSequenceIndex = (catch) + 1;\ + eventObject->directionSequenceIndex = (catch) + 1;\ }\ - return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, route);\ + return MoveEventObjectInNextDirectionInSequence(eventObject, sprite, route);\ }\ struct PairedPalettes { @@ -88,16 +88,16 @@ struct PairedPalettes { const u16 *data; }; -extern const struct SpriteFrameImage gFieldObjectPicTable_PechaBerryTree[]; +extern const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[]; void sub_808D438(void); u8 get_go_image_anim_num(u8); -u8 GetFieldObjectIdByLocalIdAndMap(u8, u8, u8); -bool8 TryGetFieldObjectIdByLocalIdAndMap(u8, u8, u8, u8 *); -u8 GetFieldObjectIdByXY(s16, s16); -void FieldObjectSetDirection(struct MapObject *, u8); +u8 GetEventObjectIdByLocalIdAndMap(u8, u8, u8); +bool8 TryGetEventObjectIdByLocalIdAndMap(u8, u8, u8, u8 *); +u8 GetEventObjectIdByXY(s16, s16); +void EventObjectSetDirection(struct EventObject *, u8); u8 sub_808D4F4(void); -void RemoveFieldObjectByLocalIdAndMap(u8, u8, u8); +void RemoveEventObjectByLocalIdAndMap(u8, u8, u8); void npc_load_two_palettes__no_record(u16, u8); void npc_load_two_palettes__and_record(u16, u8); void sub_808EBA8(u8, u8, u8, s16, s16); @@ -105,185 +105,185 @@ void pal_patch_for_npc(u16, u8); void sub_808E16C(s16, s16); void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat); void sub_8092FF0(s16, s16, s16 *, s16 *); -u8 FieldObjectDirectionToImageAnimId(u8); +u8 EventObjectDirectionToImageAnimId(u8); void sub_80930E0(s16 *, s16 *, s16, s16); -void FieldObjectClearAnim(struct MapObject *); -void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *); -void SpawnFieldObjectsInView(s16, s16); +void EventObjectClearAnim(struct EventObject *); +void EventObjectClearAnimIfSpecialAnimActive(struct EventObject *); +void SpawnEventObjectsInView(s16, s16); u8 sprite_new(u8, u8, s16, s16, u8, u8); -u8 AddPseudoFieldObject(u16, void (*)(struct Sprite *), s16, s16, u8); +u8 AddPseudoEventObject(u16, void (*)(struct Sprite *), s16, s16, u8); u8 show_sprite(u8, u8, u8); -u8 SpawnSpecialFieldObjectParametrized(u8, u8, u8, s16, s16, u8); -u8 SpawnSpecialFieldObject(struct MapObjectTemplate *); +u8 SpawnSpecialEventObjectParametrized(u8, u8, u8, s16, s16, u8); +u8 SpawnSpecialEventObject(struct EventObjectTemplate *); void sub_8093038(s16, s16, s16 *, s16 *); void CameraObjectReset1(void); -void FieldObjectSetGraphicsId(struct MapObject *, u8); -void FieldObjectTurn(struct MapObject *, u8); -void FieldObjectTurnByLocalIdAndMap(u8, u8, u8, u8); -const struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8); +void EventObjectSetGraphicsId(struct EventObject *, u8); +void EventObjectTurn(struct EventObject *, u8); +void EventObjectTurnByLocalIdAndMap(u8, u8, u8, u8); +const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(u8); void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8); void gpu_pal_allocator_reset__manage_upper_four(void); void sub_808E82C(u8, u8, u8, s16, s16); void sub_808E7E4(u8, u8, u8); void sub_808E78C(u8, u8, u8, u8); void sub_808E75C(s16, s16); -void FieldObjectGetLocalIdAndMap(struct MapObject *mapObject, void *localId, void *mapNum, void *mapGroup); -void npc_coords_shift(struct MapObject *, s16, s16); -void sub_808EB08(struct MapObject *, s16, s16); +void EventObjectGetLocalIdAndMap(struct EventObject *eventObject, void *localId, void *mapNum, void *mapGroup); +void npc_coords_shift(struct EventObject *, s16, s16); +void sub_808EB08(struct EventObject *, s16, s16); void sub_808F254(u8, u8, u8); -void FieldObjectStep(struct MapObject *, struct Sprite *, bool8(struct MapObject *, struct Sprite *)); -u8 FieldObjectFaceOppositeDirection(struct MapObject *, u8); +void EventObjectStep(struct EventObject *, struct Sprite *, bool8(struct EventObject *, struct Sprite *)); +u8 EventObjectFaceOppositeDirection(struct EventObject *, u8); u8 GetOppositeDirection(u8); u8 GetStepInPlaceDelay4AnimId(u32); u8 GetStepInPlaceDelay8AnimId(u32); u8 GetStepInPlaceDelay16AnimId(u32); u8 GetStepInPlaceDelay32AnimId(u32); -u8 npc_block_way(struct MapObject *, s16, s16, u32); +u8 npc_block_way(struct EventObject *, s16, s16, u32); void MoveCoords(u8, s16 *, s16 *); -bool8 FieldObjectIsSpecialAnimActive(struct MapObject *); -u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *); -u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z); -void npc_set_running_behaviour_etc(struct MapObject *mapObject, u8 movementType); +bool8 EventObjectIsSpecialAnimActive(struct EventObject *); +u8 EventObjectClearAnimIfSpecialAnimFinished(struct EventObject *); +u8 GetEventObjectIdByXYZ(u16 x, u16 y, u8 z); +void npc_set_running_behaviour_etc(struct EventObject *eventObject, u8 movementType); u8 npc_running_behaviour_by_direction(u8 direction); -const u8 *GetFieldObjectScriptPointerByFieldObjectId(u8 mapObjectId); -u8 sub_8092C8C(struct MapObject *mapObject, s16 x, s16 y, u8 direction); +const u8 *GetEventObjectScriptPointerByEventObjectId(u8 eventObjectId); +u8 sub_8092C8C(struct EventObject *eventObject, s16 x, s16 y, u8 direction); u8 GetFaceDirectionAnimId(u32); u8 GetGoSpeed0AnimId(u32); u8 GetGoSpeed1AnimId(u32); u8 GetGoSpeed3AnimId(u32); u8 sub_80934BC(u32); -bool8 FieldObjectSetSpecialAnim(struct MapObject *mapObject, u8 specialAnimId); -bool8 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct MapObject *mapObject); -u8 FieldObjectCheckIfSpecialAnimFinishedOrInactive(struct MapObject *mapObject); -void sub_808F23C(const struct MapObject *mapObject, u8 movementType); -void sub_808F208(const struct MapObject *mapObject); -void npc_coords_shift_still(struct MapObject *pObject); -void FieldObjectMoveDestCoords(struct MapObject *pObject, u32 unk_19, s16 *pInt, s16 *pInt1); +bool8 EventObjectSetSpecialAnim(struct EventObject *eventObject, u8 specialAnimId); +bool8 EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct EventObject *eventObject); +u8 EventObjectCheckIfSpecialAnimFinishedOrInactive(struct EventObject *eventObject); +void sub_808F23C(const struct EventObject *eventObject, u8 movementType); +void sub_808F208(const struct EventObject *eventObject); +void npc_coords_shift_still(struct EventObject *pObject); +void EventObjectMoveDestCoords(struct EventObject *pObject, u32 unk_19, s16 *pInt, s16 *pInt1); u8 AddCameraObject(u8 linkedSpriteId); -void UpdateFieldObjectsForCameraUpdate(s16 x, s16 y); +void UpdateEventObjectsForCameraUpdate(s16 x, s16 y); u8 GetSimpleGoAnimId(u32); u8 sub_8093514(u32); bool8 AreZCoordsCompatible(u8, u8); u8 ZCoordToPriority(u8); -void FieldObjectUpdateZCoord(struct MapObject *pObject); +void EventObjectUpdateZCoord(struct EventObject *pObject); void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8); bool8 IsZCoordMismatchAt(u8, s16, s16); void sub_8097AC8(struct Sprite *); -void npc_sync_anim_pause_bits(struct MapObject *); +void npc_sync_anim_pause_bits(struct EventObject *); void oamt_npc_ministep_reset(struct Sprite *, u8, u8); -u8 sub_8097F78(struct MapObject *); +u8 sub_8097F78(struct EventObject *); bool8 obj_npc_ministep(struct Sprite *sprite); bool8 sub_80976EC(struct Sprite *sprite); void sub_80976DC(struct Sprite *, u8); void sub_809783C(struct Sprite *, u8, u8, u8); -void DoShadowFieldEffect(struct MapObject *); +void DoShadowFieldEffect(struct EventObject *); u8 sub_809785C(struct Sprite *); u8 sub_80978E4(struct Sprite *); void obj_anim_image_set_and_seek(struct Sprite *, u8, u8); bool8 sub_80979BC(struct Sprite *); void sub_8097750(struct Sprite *); bool8 sub_8097758(struct Sprite *); -void sub_8097FA4(struct MapObject *); +void sub_8097FA4(struct EventObject *); void sub_8098044(u8); -void UnfreezeMapObjects(void); -void FreezeMapObjectsExceptOne(u8 mapObjectId); +void UnfreezeEventObjects(void); +void FreezeEventObjectsExceptOne(u8 eventObjectId); void sub_8097B78(u8, u8); void sub_8098074(u8 var1, u8 var2); -void FreezeMapObjects(void); -bool8 FreezeMapObject(struct MapObject *mapObject); +void FreezeEventObjects(void); +bool8 FreezeEventObject(struct EventObject *eventObject); u8 get_go_fast_image_anim_num(u8); u8 get_go_faster_image_anim_num(u8); u8 get_go_fastest_image_anim_num(u8); -void FieldObjectCB_NoMovement1(struct Sprite *); -void FieldObjectCB_LookRandomDirections(struct Sprite *); -void FieldObjectCB_GoRandomDirections(struct Sprite *); -void FieldObjectCB_RandomlyGoNorthOrSouth(struct Sprite *); -void FieldObjectCB_RandomlyGoNorthOrSouth(struct Sprite *); -void FieldObjectCB_RandomlyGoEastOrWest(struct Sprite *); -void FieldObjectCB_RandomlyGoEastOrWest(struct Sprite *); -void FieldObjectCB_FaceFixedDirection(struct Sprite *); -void FieldObjectCB_FaceFixedDirection(struct Sprite *); -void FieldObjectCB_FaceFixedDirection(struct Sprite *); -void FieldObjectCB_FaceFixedDirection(struct Sprite *); -void FieldObjectCB_NoMovement2(struct Sprite *); -void FieldObjectCB_BerryTree(struct Sprite *); -void FieldObjectCB_RandomlyLookNorthOrSouth(struct Sprite *); -void FieldObjectCB_RandomlyLookEastOrWest(struct Sprite *); -void FieldObjectCB_RandomlyLookNorthOrWest(struct Sprite *); -void FieldObjectCB_RandomlyLookNorthOrEast(struct Sprite *); -void FieldObjectCB_RandomlyLookSouthOrWest(struct Sprite *); -void FieldObjectCB_RandomlyLookSouthOrEast(struct Sprite *); -void FieldObjectCB_RandomlyLookNorthOrSouthOrWest(struct Sprite *); -void FieldObjectCB_RandomlyLookNorthOrSouthOrEast(struct Sprite *); -void FieldObjectCB_RandomlyLookNorthOrEastOrWest(struct Sprite *); -void FieldObjectCB_RandomlyLookSouthOrEastOrWest(struct Sprite *); -void FieldObjectCB_LookAroundCounterclockwise(struct Sprite *); -void FieldObjectCB_LookAroundClockwise(struct Sprite *); -void FieldObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *); -void FieldObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *); -void FieldObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *); -void FieldObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence1(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence2(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence3(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence4(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence5(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence6(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence7(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence8(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence9(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence10(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence11(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence12(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence13(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence14(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence15(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence16(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence17(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence18(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence19(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence20(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence21(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence22(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence23(struct Sprite *); -void FieldObjectCB_GoInDirectionSequence24(struct Sprite *); -void FieldObjectCB_CopyPlayer1(struct Sprite *); -void FieldObjectCB_CopyPlayer1(struct Sprite *); -void FieldObjectCB_CopyPlayer1(struct Sprite *); -void FieldObjectCB_CopyPlayer1(struct Sprite *); -void FieldObjectCB_TreeDisguise(struct Sprite *); -void FieldObjectCB_MountainDisguise(struct Sprite *); -void FieldObjectCB_CopyPlayer2(struct Sprite *); -void FieldObjectCB_CopyPlayer2(struct Sprite *); -void FieldObjectCB_CopyPlayer2(struct Sprite *); -void FieldObjectCB_CopyPlayer2(struct Sprite *); -void FieldObjectCB_Hidden1(struct Sprite *); -void FieldObjectCB_WalkInPlace1(struct Sprite *); -void FieldObjectCB_WalkInPlace1(struct Sprite *); -void FieldObjectCB_WalkInPlace1(struct Sprite *); -void FieldObjectCB_WalkInPlace1(struct Sprite *); -void FieldObjectCB_WalkInPlace2(struct Sprite *); -void FieldObjectCB_WalkInPlace2(struct Sprite *); -void FieldObjectCB_WalkInPlace2(struct Sprite *); -void FieldObjectCB_WalkInPlace2(struct Sprite *); -void FieldObjectCB_WalkInPlace3(struct Sprite *); -void FieldObjectCB_WalkInPlace3(struct Sprite *); -void FieldObjectCB_WalkInPlace3(struct Sprite *); -void FieldObjectCB_WalkInPlace3(struct Sprite *); -void FieldObjectCB_Hidden2(struct Sprite *); -void FieldObjectCB_WalkInPlace4(struct Sprite *); -void FieldObjectCB_WalkInPlace4(struct Sprite *); -void FieldObjectCB_WalkInPlace4(struct Sprite *); -void FieldObjectCB_WalkInPlace4(struct Sprite *); +void EventObjectCB_NoMovement1(struct Sprite *); +void EventObjectCB_LookRandomDirections(struct Sprite *); +void EventObjectCB_GoRandomDirections(struct Sprite *); +void EventObjectCB_RandomlyGoNorthOrSouth(struct Sprite *); +void EventObjectCB_RandomlyGoNorthOrSouth(struct Sprite *); +void EventObjectCB_RandomlyGoEastOrWest(struct Sprite *); +void EventObjectCB_RandomlyGoEastOrWest(struct Sprite *); +void EventObjectCB_FaceFixedDirection(struct Sprite *); +void EventObjectCB_FaceFixedDirection(struct Sprite *); +void EventObjectCB_FaceFixedDirection(struct Sprite *); +void EventObjectCB_FaceFixedDirection(struct Sprite *); +void EventObjectCB_NoMovement2(struct Sprite *); +void EventObjectCB_BerryTree(struct Sprite *); +void EventObjectCB_RandomlyLookNorthOrSouth(struct Sprite *); +void EventObjectCB_RandomlyLookEastOrWest(struct Sprite *); +void EventObjectCB_RandomlyLookNorthOrWest(struct Sprite *); +void EventObjectCB_RandomlyLookNorthOrEast(struct Sprite *); +void EventObjectCB_RandomlyLookSouthOrWest(struct Sprite *); +void EventObjectCB_RandomlyLookSouthOrEast(struct Sprite *); +void EventObjectCB_RandomlyLookNorthOrSouthOrWest(struct Sprite *); +void EventObjectCB_RandomlyLookNorthOrSouthOrEast(struct Sprite *); +void EventObjectCB_RandomlyLookNorthOrEastOrWest(struct Sprite *); +void EventObjectCB_RandomlyLookSouthOrEastOrWest(struct Sprite *); +void EventObjectCB_LookAroundCounterclockwise(struct Sprite *); +void EventObjectCB_LookAroundClockwise(struct Sprite *); +void EventObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *); +void EventObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *); +void EventObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *); +void EventObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *); +void EventObjectCB_GoInDirectionSequence1(struct Sprite *); +void EventObjectCB_GoInDirectionSequence2(struct Sprite *); +void EventObjectCB_GoInDirectionSequence3(struct Sprite *); +void EventObjectCB_GoInDirectionSequence4(struct Sprite *); +void EventObjectCB_GoInDirectionSequence5(struct Sprite *); +void EventObjectCB_GoInDirectionSequence6(struct Sprite *); +void EventObjectCB_GoInDirectionSequence7(struct Sprite *); +void EventObjectCB_GoInDirectionSequence8(struct Sprite *); +void EventObjectCB_GoInDirectionSequence9(struct Sprite *); +void EventObjectCB_GoInDirectionSequence10(struct Sprite *); +void EventObjectCB_GoInDirectionSequence11(struct Sprite *); +void EventObjectCB_GoInDirectionSequence12(struct Sprite *); +void EventObjectCB_GoInDirectionSequence13(struct Sprite *); +void EventObjectCB_GoInDirectionSequence14(struct Sprite *); +void EventObjectCB_GoInDirectionSequence15(struct Sprite *); +void EventObjectCB_GoInDirectionSequence16(struct Sprite *); +void EventObjectCB_GoInDirectionSequence17(struct Sprite *); +void EventObjectCB_GoInDirectionSequence18(struct Sprite *); +void EventObjectCB_GoInDirectionSequence19(struct Sprite *); +void EventObjectCB_GoInDirectionSequence20(struct Sprite *); +void EventObjectCB_GoInDirectionSequence21(struct Sprite *); +void EventObjectCB_GoInDirectionSequence22(struct Sprite *); +void EventObjectCB_GoInDirectionSequence23(struct Sprite *); +void EventObjectCB_GoInDirectionSequence24(struct Sprite *); +void EventObjectCB_CopyPlayer1(struct Sprite *); +void EventObjectCB_CopyPlayer1(struct Sprite *); +void EventObjectCB_CopyPlayer1(struct Sprite *); +void EventObjectCB_CopyPlayer1(struct Sprite *); +void EventObjectCB_TreeDisguise(struct Sprite *); +void EventObjectCB_MountainDisguise(struct Sprite *); +void EventObjectCB_CopyPlayer2(struct Sprite *); +void EventObjectCB_CopyPlayer2(struct Sprite *); +void EventObjectCB_CopyPlayer2(struct Sprite *); +void EventObjectCB_CopyPlayer2(struct Sprite *); +void EventObjectCB_Hidden1(struct Sprite *); +void EventObjectCB_WalkInPlace1(struct Sprite *); +void EventObjectCB_WalkInPlace1(struct Sprite *); +void EventObjectCB_WalkInPlace1(struct Sprite *); +void EventObjectCB_WalkInPlace1(struct Sprite *); +void EventObjectCB_WalkInPlace2(struct Sprite *); +void EventObjectCB_WalkInPlace2(struct Sprite *); +void EventObjectCB_WalkInPlace2(struct Sprite *); +void EventObjectCB_WalkInPlace2(struct Sprite *); +void EventObjectCB_WalkInPlace3(struct Sprite *); +void EventObjectCB_WalkInPlace3(struct Sprite *); +void EventObjectCB_WalkInPlace3(struct Sprite *); +void EventObjectCB_WalkInPlace3(struct Sprite *); +void EventObjectCB_Hidden2(struct Sprite *); +void EventObjectCB_WalkInPlace4(struct Sprite *); +void EventObjectCB_WalkInPlace4(struct Sprite *); +void EventObjectCB_WalkInPlace4(struct Sprite *); +void EventObjectCB_WalkInPlace4(struct Sprite *); -u8 sub_808F44C(struct MapObject *, struct Sprite *); -u8 sub_808F460(struct MapObject *, struct Sprite *); -u8 sub_808F48C(struct MapObject *, struct Sprite *); -u8 sub_808F4C8(struct MapObject *, struct Sprite *); -u8 sub_808F4E8(struct MapObject *, struct Sprite *); -u8 sub_808F534(struct MapObject *, struct Sprite *); -u8 sub_808F564(struct MapObject *, struct Sprite *); +u8 sub_808F44C(struct EventObject *, struct Sprite *); +u8 sub_808F460(struct EventObject *, struct Sprite *); +u8 sub_808F48C(struct EventObject *, struct Sprite *); +u8 sub_808F4C8(struct EventObject *, struct Sprite *); +u8 sub_808F4E8(struct EventObject *, struct Sprite *); +u8 sub_808F534(struct EventObject *, struct Sprite *); +u8 sub_808F564(struct EventObject *, struct Sprite *); u8 GetRegularRunningPastFacingDirection(s16, s16, s16, s16); u8 GetNorthSouthRunningPastFacingDirection(s16, s16, s16, s16); u8 GetEastWestRunningPastFacingDirection(s16, s16, s16, s16); @@ -295,146 +295,146 @@ u8 GetNonEastRunningPastFacingDirection(s16, s16, s16, s16); u8 GetNonWestRunningPastFacingDirection(s16, s16, s16, s16); u8 GetNonSouthRunningPastFacingDirection(s16, s16, s16, s16); u8 GetNonNorthRunningPastFacingDirection(s16, s16, s16, s16); -u8 sub_808F988(struct MapObject *, struct Sprite *); -u8 sub_808F99C(struct MapObject *, struct Sprite *); -u8 sub_808F9C8(struct MapObject *, struct Sprite *); -u8 sub_808FA0C(struct MapObject *, struct Sprite *); -u8 sub_808FA3C(struct MapObject *, struct Sprite *); -u8 sub_808FAC8(struct MapObject *, struct Sprite *); -u8 sub_808FADC(struct MapObject *, struct Sprite *); -u8 sub_808FB08(struct MapObject *, struct Sprite *); -u8 sub_808FB44(struct MapObject *, struct Sprite *); -u8 sub_808FB64(struct MapObject *, struct Sprite *); -u8 sub_808FBB0(struct MapObject *, struct Sprite *); -u8 sub_808FBE0(struct MapObject *, struct Sprite *); -u8 sub_808FC4C(struct MapObject *, struct Sprite *); -u8 sub_808FC60(struct MapObject *, struct Sprite *); -u8 sub_808FC8C(struct MapObject *, struct Sprite *); -u8 sub_808FCC8(struct MapObject *, struct Sprite *); -u8 sub_808FCE8(struct MapObject *, struct Sprite *); -u8 sub_808FD34(struct MapObject *, struct Sprite *); -u8 sub_808FD64(struct MapObject *, struct Sprite *); -u8 sub_808FDD0(struct MapObject *, struct Sprite *); -u8 sub_808FDFC(struct MapObject *, struct Sprite *); -u8 sub_808FE1C(struct MapObject *, struct Sprite *); -u8 do_berry_tree_growth_sparkle_1(struct MapObject *, struct Sprite *); -u8 sub_808FF48(struct MapObject *, struct Sprite *); -u8 do_berry_tree_growth_sparkle_2(struct MapObject *, struct Sprite *); -u8 sub_808FFB4(struct MapObject *, struct Sprite *); -u8 sub_8090004(struct MapObject *, struct Sprite *); -u8 sub_8090094(struct MapObject *, struct Sprite *); -u8 sub_80900A8(struct MapObject *, struct Sprite *); -u8 sub_80900D4(struct MapObject *, struct Sprite *); -u8 sub_8090118(struct MapObject *, struct Sprite *); -u8 sub_8090148(struct MapObject *, struct Sprite *); -u8 sub_80901D4(struct MapObject *, struct Sprite *); -u8 sub_80901E8(struct MapObject *, struct Sprite *); -u8 sub_8090214(struct MapObject *, struct Sprite *); -u8 sub_8090258(struct MapObject *, struct Sprite *); -u8 sub_8090288(struct MapObject *, struct Sprite *); -u8 sub_8090314(struct MapObject *, struct Sprite *); -u8 sub_8090328(struct MapObject *, struct Sprite *); -u8 sub_8090354(struct MapObject *, struct Sprite *); -u8 sub_8090398(struct MapObject *, struct Sprite *); -u8 sub_80903C8(struct MapObject *, struct Sprite *); -u8 sub_8090454(struct MapObject *, struct Sprite *); -u8 sub_8090468(struct MapObject *, struct Sprite *); -u8 sub_8090494(struct MapObject *, struct Sprite *); -u8 sub_80904D8(struct MapObject *, struct Sprite *); -u8 sub_8090508(struct MapObject *, struct Sprite *); -u8 sub_8090594(struct MapObject *, struct Sprite *); -u8 sub_80905A8(struct MapObject *, struct Sprite *); -u8 sub_80905D4(struct MapObject *, struct Sprite *); -u8 sub_8090618(struct MapObject *, struct Sprite *); -u8 sub_8090648(struct MapObject *, struct Sprite *); -u8 sub_80906D4(struct MapObject *, struct Sprite *); -u8 sub_80906E8(struct MapObject *, struct Sprite *); -u8 sub_8090714(struct MapObject *, struct Sprite *); -u8 sub_8090758(struct MapObject *, struct Sprite *); -u8 sub_8090788(struct MapObject *, struct Sprite *); -u8 sub_8090814(struct MapObject *, struct Sprite *); -u8 sub_8090828(struct MapObject *, struct Sprite *); -u8 sub_8090854(struct MapObject *, struct Sprite *); -u8 sub_8090898(struct MapObject *, struct Sprite *); -u8 sub_80908C8(struct MapObject *, struct Sprite *); -u8 sub_8090954(struct MapObject *, struct Sprite *); -u8 sub_8090968(struct MapObject *, struct Sprite *); -u8 sub_8090994(struct MapObject *, struct Sprite *); -u8 sub_80909D8(struct MapObject *, struct Sprite *); -u8 sub_8090A08(struct MapObject *, struct Sprite *); -u8 sub_8090A94(struct MapObject *, struct Sprite *); -u8 sub_8090AA8(struct MapObject *, struct Sprite *); -u8 sub_8090AD4(struct MapObject *, struct Sprite *); -u8 sub_8090B18(struct MapObject *, struct Sprite *); -u8 sub_8090B48(struct MapObject *, struct Sprite *); -u8 sub_8090BD4(struct MapObject *, struct Sprite *); -u8 sub_8090BE8(struct MapObject *, struct Sprite *); -u8 sub_8090C14(struct MapObject *, struct Sprite *); -u8 sub_8090C58(struct MapObject *, struct Sprite *); -u8 sub_8090C88(struct MapObject *, struct Sprite *); -u8 sub_8090D14(struct MapObject *, struct Sprite *); -u8 sub_8090D40(struct MapObject *, struct Sprite *); -u8 sub_8090D64(struct MapObject *, struct Sprite *); -u8 sub_8090D90(struct MapObject *, struct Sprite *); -u8 sub_8090E18(struct MapObject *, struct Sprite *); -u8 sub_8090E44(struct MapObject *, struct Sprite *); -u8 sub_8090E68(struct MapObject *, struct Sprite *); -u8 sub_8090E94(struct MapObject *, struct Sprite *); -u8 sub_8090F1C(struct MapObject *, struct Sprite *); -u8 sub_8090F30(struct MapObject *, struct Sprite *); -u8 sub_8090F68(struct MapObject *, struct Sprite *); -u8 sub_8091020(struct MapObject *, struct Sprite *); -u8 sub_8091048(struct MapObject *, struct Sprite *); -u8 sub_809117C(struct MapObject *, struct Sprite *); -u8 sub_8091110(struct MapObject *, struct Sprite *); -u8 sub_8091208(struct MapObject *, struct Sprite *); -u8 sub_8091294(struct MapObject *, struct Sprite *); -u8 sub_8091320(struct MapObject *, struct Sprite *); -u8 sub_80913AC(struct MapObject *, struct Sprite *); -u8 sub_8091438(struct MapObject *, struct Sprite *); -u8 sub_80914C4(struct MapObject *, struct Sprite *); -u8 sub_8091550(struct MapObject *, struct Sprite *); -u8 sub_80915DC(struct MapObject *, struct Sprite *); -u8 sub_8091668(struct MapObject *, struct Sprite *); -u8 sub_80916F4(struct MapObject *, struct Sprite *); -u8 sub_8091780(struct MapObject *, struct Sprite *); -u8 sub_809180C(struct MapObject *, struct Sprite *); -u8 sub_8091898(struct MapObject *, struct Sprite *); -u8 sub_8091924(struct MapObject *, struct Sprite *); -u8 sub_80919B0(struct MapObject *, struct Sprite *); -u8 sub_8091A3C(struct MapObject *, struct Sprite *); -u8 sub_8091AC8(struct MapObject *, struct Sprite *); -u8 sub_8091B54(struct MapObject *, struct Sprite *); -u8 sub_8091BE0(struct MapObject *, struct Sprite *); -u8 sub_8091C6C(struct MapObject *, struct Sprite *); -u8 sub_8091CF8(struct MapObject *, struct Sprite *); -u8 sub_8091D84(struct MapObject *, struct Sprite *); -u8 sub_8091E10(struct MapObject *, struct Sprite *); -u8 mss_npc_reset_oampriv3_1_unk2_unk3(struct MapObject *, struct Sprite *); -u8 sub_8091EC0(struct MapObject *, struct Sprite *); -u8 sub_8091F20(struct MapObject *, struct Sprite *); -bool8 sub_8091F48(struct MapObject *, struct Sprite *, u8, bool8(u8)); -bool8 sub_8091F4C(struct MapObject *, struct Sprite *, u8, bool8(u8)); -bool8 sub_8091F94(struct MapObject *, struct Sprite *, u8, bool8(u8)); -bool8 sub_80920A4(struct MapObject *, struct Sprite *, u8, bool8(u8)); -bool8 sub_809215C(struct MapObject *, struct Sprite *, u8, bool8(u8)); -bool8 sub_8092214(struct MapObject *, struct Sprite *, u8, bool8(u8)); -bool8 cph_IM_DIFFERENT(struct MapObject *, struct Sprite *, u8, bool8(u8)); -bool8 sub_8092314(struct MapObject *, struct Sprite *, u8, bool8(u8)); -bool8 oac_hopping(struct MapObject *, struct Sprite *, u8, bool8(u8)); -u8 mss_08062EA4(struct MapObject *, struct Sprite *); -u8 sub_80926AC(struct MapObject *, struct Sprite *); -u8 sub_8092718(struct MapObject *, struct Sprite *); -u8 sub_80926B8(struct MapObject *, struct Sprite *); -u8 sub_8092788(struct MapObject *, struct Sprite *); -u8 sub_80927F8(struct MapObject *, struct Sprite *); -u8 sub_8092868(struct MapObject *, struct Sprite *); -u8 sub_80928D8(struct MapObject *, struct Sprite *); -u8 sub_809290C(struct MapObject *, struct Sprite *); -u8 sub_809292C(struct MapObject *, struct Sprite *); +u8 sub_808F988(struct EventObject *, struct Sprite *); +u8 sub_808F99C(struct EventObject *, struct Sprite *); +u8 sub_808F9C8(struct EventObject *, struct Sprite *); +u8 sub_808FA0C(struct EventObject *, struct Sprite *); +u8 sub_808FA3C(struct EventObject *, struct Sprite *); +u8 sub_808FAC8(struct EventObject *, struct Sprite *); +u8 sub_808FADC(struct EventObject *, struct Sprite *); +u8 sub_808FB08(struct EventObject *, struct Sprite *); +u8 sub_808FB44(struct EventObject *, struct Sprite *); +u8 sub_808FB64(struct EventObject *, struct Sprite *); +u8 sub_808FBB0(struct EventObject *, struct Sprite *); +u8 sub_808FBE0(struct EventObject *, struct Sprite *); +u8 sub_808FC4C(struct EventObject *, struct Sprite *); +u8 sub_808FC60(struct EventObject *, struct Sprite *); +u8 sub_808FC8C(struct EventObject *, struct Sprite *); +u8 sub_808FCC8(struct EventObject *, struct Sprite *); +u8 sub_808FCE8(struct EventObject *, struct Sprite *); +u8 sub_808FD34(struct EventObject *, struct Sprite *); +u8 sub_808FD64(struct EventObject *, struct Sprite *); +u8 sub_808FDD0(struct EventObject *, struct Sprite *); +u8 sub_808FDFC(struct EventObject *, struct Sprite *); +u8 sub_808FE1C(struct EventObject *, struct Sprite *); +u8 do_berry_tree_growth_sparkle_1(struct EventObject *, struct Sprite *); +u8 sub_808FF48(struct EventObject *, struct Sprite *); +u8 do_berry_tree_growth_sparkle_2(struct EventObject *, struct Sprite *); +u8 sub_808FFB4(struct EventObject *, struct Sprite *); +u8 sub_8090004(struct EventObject *, struct Sprite *); +u8 sub_8090094(struct EventObject *, struct Sprite *); +u8 sub_80900A8(struct EventObject *, struct Sprite *); +u8 sub_80900D4(struct EventObject *, struct Sprite *); +u8 sub_8090118(struct EventObject *, struct Sprite *); +u8 sub_8090148(struct EventObject *, struct Sprite *); +u8 sub_80901D4(struct EventObject *, struct Sprite *); +u8 sub_80901E8(struct EventObject *, struct Sprite *); +u8 sub_8090214(struct EventObject *, struct Sprite *); +u8 sub_8090258(struct EventObject *, struct Sprite *); +u8 sub_8090288(struct EventObject *, struct Sprite *); +u8 sub_8090314(struct EventObject *, struct Sprite *); +u8 sub_8090328(struct EventObject *, struct Sprite *); +u8 sub_8090354(struct EventObject *, struct Sprite *); +u8 sub_8090398(struct EventObject *, struct Sprite *); +u8 sub_80903C8(struct EventObject *, struct Sprite *); +u8 sub_8090454(struct EventObject *, struct Sprite *); +u8 sub_8090468(struct EventObject *, struct Sprite *); +u8 sub_8090494(struct EventObject *, struct Sprite *); +u8 sub_80904D8(struct EventObject *, struct Sprite *); +u8 sub_8090508(struct EventObject *, struct Sprite *); +u8 sub_8090594(struct EventObject *, struct Sprite *); +u8 sub_80905A8(struct EventObject *, struct Sprite *); +u8 sub_80905D4(struct EventObject *, struct Sprite *); +u8 sub_8090618(struct EventObject *, struct Sprite *); +u8 sub_8090648(struct EventObject *, struct Sprite *); +u8 sub_80906D4(struct EventObject *, struct Sprite *); +u8 sub_80906E8(struct EventObject *, struct Sprite *); +u8 sub_8090714(struct EventObject *, struct Sprite *); +u8 sub_8090758(struct EventObject *, struct Sprite *); +u8 sub_8090788(struct EventObject *, struct Sprite *); +u8 sub_8090814(struct EventObject *, struct Sprite *); +u8 sub_8090828(struct EventObject *, struct Sprite *); +u8 sub_8090854(struct EventObject *, struct Sprite *); +u8 sub_8090898(struct EventObject *, struct Sprite *); +u8 sub_80908C8(struct EventObject *, struct Sprite *); +u8 sub_8090954(struct EventObject *, struct Sprite *); +u8 sub_8090968(struct EventObject *, struct Sprite *); +u8 sub_8090994(struct EventObject *, struct Sprite *); +u8 sub_80909D8(struct EventObject *, struct Sprite *); +u8 sub_8090A08(struct EventObject *, struct Sprite *); +u8 sub_8090A94(struct EventObject *, struct Sprite *); +u8 sub_8090AA8(struct EventObject *, struct Sprite *); +u8 sub_8090AD4(struct EventObject *, struct Sprite *); +u8 sub_8090B18(struct EventObject *, struct Sprite *); +u8 sub_8090B48(struct EventObject *, struct Sprite *); +u8 sub_8090BD4(struct EventObject *, struct Sprite *); +u8 sub_8090BE8(struct EventObject *, struct Sprite *); +u8 sub_8090C14(struct EventObject *, struct Sprite *); +u8 sub_8090C58(struct EventObject *, struct Sprite *); +u8 sub_8090C88(struct EventObject *, struct Sprite *); +u8 sub_8090D14(struct EventObject *, struct Sprite *); +u8 sub_8090D40(struct EventObject *, struct Sprite *); +u8 sub_8090D64(struct EventObject *, struct Sprite *); +u8 sub_8090D90(struct EventObject *, struct Sprite *); +u8 sub_8090E18(struct EventObject *, struct Sprite *); +u8 sub_8090E44(struct EventObject *, struct Sprite *); +u8 sub_8090E68(struct EventObject *, struct Sprite *); +u8 sub_8090E94(struct EventObject *, struct Sprite *); +u8 sub_8090F1C(struct EventObject *, struct Sprite *); +u8 sub_8090F30(struct EventObject *, struct Sprite *); +u8 sub_8090F68(struct EventObject *, struct Sprite *); +u8 sub_8091020(struct EventObject *, struct Sprite *); +u8 sub_8091048(struct EventObject *, struct Sprite *); +u8 sub_809117C(struct EventObject *, struct Sprite *); +u8 sub_8091110(struct EventObject *, struct Sprite *); +u8 sub_8091208(struct EventObject *, struct Sprite *); +u8 sub_8091294(struct EventObject *, struct Sprite *); +u8 sub_8091320(struct EventObject *, struct Sprite *); +u8 sub_80913AC(struct EventObject *, struct Sprite *); +u8 sub_8091438(struct EventObject *, struct Sprite *); +u8 sub_80914C4(struct EventObject *, struct Sprite *); +u8 sub_8091550(struct EventObject *, struct Sprite *); +u8 sub_80915DC(struct EventObject *, struct Sprite *); +u8 sub_8091668(struct EventObject *, struct Sprite *); +u8 sub_80916F4(struct EventObject *, struct Sprite *); +u8 sub_8091780(struct EventObject *, struct Sprite *); +u8 sub_809180C(struct EventObject *, struct Sprite *); +u8 sub_8091898(struct EventObject *, struct Sprite *); +u8 sub_8091924(struct EventObject *, struct Sprite *); +u8 sub_80919B0(struct EventObject *, struct Sprite *); +u8 sub_8091A3C(struct EventObject *, struct Sprite *); +u8 sub_8091AC8(struct EventObject *, struct Sprite *); +u8 sub_8091B54(struct EventObject *, struct Sprite *); +u8 sub_8091BE0(struct EventObject *, struct Sprite *); +u8 sub_8091C6C(struct EventObject *, struct Sprite *); +u8 sub_8091CF8(struct EventObject *, struct Sprite *); +u8 sub_8091D84(struct EventObject *, struct Sprite *); +u8 sub_8091E10(struct EventObject *, struct Sprite *); +u8 mss_npc_reset_oampriv3_1_unk2_unk3(struct EventObject *, struct Sprite *); +u8 sub_8091EC0(struct EventObject *, struct Sprite *); +u8 sub_8091F20(struct EventObject *, struct Sprite *); +bool8 sub_8091F48(struct EventObject *, struct Sprite *, u8, bool8(u8)); +bool8 sub_8091F4C(struct EventObject *, struct Sprite *, u8, bool8(u8)); +bool8 sub_8091F94(struct EventObject *, struct Sprite *, u8, bool8(u8)); +bool8 sub_80920A4(struct EventObject *, struct Sprite *, u8, bool8(u8)); +bool8 sub_809215C(struct EventObject *, struct Sprite *, u8, bool8(u8)); +bool8 sub_8092214(struct EventObject *, struct Sprite *, u8, bool8(u8)); +bool8 cph_IM_DIFFERENT(struct EventObject *, struct Sprite *, u8, bool8(u8)); +bool8 sub_8092314(struct EventObject *, struct Sprite *, u8, bool8(u8)); +bool8 oac_hopping(struct EventObject *, struct Sprite *, u8, bool8(u8)); +u8 mss_08062EA4(struct EventObject *, struct Sprite *); +u8 sub_80926AC(struct EventObject *, struct Sprite *); +u8 sub_8092718(struct EventObject *, struct Sprite *); +u8 sub_80926B8(struct EventObject *, struct Sprite *); +u8 sub_8092788(struct EventObject *, struct Sprite *); +u8 sub_80927F8(struct EventObject *, struct Sprite *); +u8 sub_8092868(struct EventObject *, struct Sprite *); +u8 sub_80928D8(struct EventObject *, struct Sprite *); +u8 sub_809290C(struct EventObject *, struct Sprite *); +u8 sub_809292C(struct EventObject *, struct Sprite *); // Exported data declarations extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; -#endif //GUARD_FIELD_MAP_OBJ_H +#endif //GUARD_FIELD_EVENT_OBJ_H diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h index b915d1419f..3c4ad030f7 100644 --- a/include/field_control_avatar.h +++ b/include/field_control_avatar.h @@ -30,7 +30,7 @@ u8 *sub_80682A8(struct MapPosition *, u8, u8); void overworld_poison_timer_set(void); void prev_quest_postbuffer_cursor_backup_reset(void); u8 *sub_8068E24(struct MapPosition *); -u8 *GetFieldObjectScriptPointerPlayerFacing(void); +u8 *GetEventObjectScriptPointerPlayerFacing(void); bool8 mapheader_trigger_activate_at__run_now(struct MapPosition *); bool8 sub_8068870(u16 a); bool8 sub_8068894(void); diff --git a/include/field_effect.h b/include/field_effect.h index b613df9265..5e7cec4cb4 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -148,33 +148,33 @@ bool8 sub_80B7270(struct Task *); bool8 sub_80B72D0(struct Task *); bool8 sub_80B72F4(struct Task *); -bool8 sub_80B73D0(struct Task *, struct MapObject *); -bool8 waterfall_1_do_anim_probably(struct Task *, struct MapObject *); -bool8 waterfall_2_wait_anim_finish_probably(struct Task *, struct MapObject *); -bool8 sub_80B7450(struct Task *, struct MapObject *); -bool8 sub_80B7478(struct Task *, struct MapObject *); +bool8 sub_80B73D0(struct Task *, struct EventObject *); +bool8 waterfall_1_do_anim_probably(struct Task *, struct EventObject *); +bool8 waterfall_2_wait_anim_finish_probably(struct Task *, struct EventObject *); +bool8 sub_80B7450(struct Task *, struct EventObject *); +bool8 sub_80B7478(struct Task *, struct EventObject *); bool8 dive_1_lock(struct Task *); bool8 dive_2_unknown(struct Task *); bool8 dive_3_unknown(struct Task *); -bool8 sub_80B764C(struct Task *, struct MapObject *, struct Sprite *); -bool8 sub_80B7684(struct Task *, struct MapObject *, struct Sprite *); -bool8 sub_80B76B8(struct Task *, struct MapObject *, struct Sprite *); -bool8 sub_80B7704(struct Task *, struct MapObject *, struct Sprite *); -bool8 sub_80B77F8(struct Task *, struct MapObject *, struct Sprite *); -bool8 sub_80B7814(struct Task *, struct MapObject *, struct Sprite *); +bool8 sub_80B764C(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80B7684(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80B76B8(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80B7704(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80B77F8(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80B7814(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80B78EC(struct Task *, struct MapObject *, struct Sprite *); -bool8 sub_80B791C(struct Task *, struct MapObject *, struct Sprite *); -bool8 sub_80B7968(struct Task *, struct MapObject *, struct Sprite *); -bool8 sub_80B79BC(struct Task *, struct MapObject *, struct Sprite *); +bool8 sub_80B78EC(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80B791C(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80B7968(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80B79BC(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80B7AE8(struct Task *, struct MapObject *, struct Sprite *); -bool8 sub_80B7B18(struct Task *, struct MapObject *, struct Sprite *); -bool8 sub_80B7B94(struct Task *, struct MapObject *, struct Sprite *); -bool8 sub_80B7BCC(struct Task *, struct MapObject *, struct Sprite *); -bool8 sub_80B7BF4(struct Task *, struct MapObject *, struct Sprite *); +bool8 sub_80B7AE8(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80B7B18(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80B7B94(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80B7BCC(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80B7BF4(struct Task *, struct EventObject *, struct Sprite *); void sub_80B7D14(struct Task *); void sub_80B7D34(struct Task *); diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index e7517acf17..547f515eb6 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -11,12 +11,12 @@ // Exported ROM declarations u8 sub_8154228(void); -bool8 sub_8155DA0(struct MapObject *); -void sub_8155D78(struct MapObject *); +bool8 sub_8155DA0(struct EventObject *); +void sub_8155D78(struct EventObject *); void sub_81555AC(u8, u8); void ash(s16, s16, u16, s16); -void SetUpReflection(struct MapObject*, struct Sprite*, u8); -u32 StartFieldEffectForEventObject(u8, struct MapObject*); +void SetUpReflection(struct EventObject*, struct Sprite*, u8); +u32 StartFieldEffectForEventObject(u8, struct EventObject*); u8 sub_81546C8(u8, u8, u8, s16, s16); void sub_8155F80(struct Sprite*); void oamc_shadow(struct Sprite*); diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 0b9ea385c4..970f47d5fc 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -29,7 +29,7 @@ void PlayerAcroTurnJump(u8 a); void PlayerSetAnimId(u8 a, u8 b); bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction); void PlayerOnBikeCollideWithFarawayIslandMew(u8 direction); -u8 CheckForFieldObjectCollision(struct MapObject *a, s16 b, s16 c, u8 d, u8 e); +u8 CheckForEventObjectCollision(struct EventObject *a, s16 b, s16 c, u8 d, u8 e); u8 PlayerGetZCoord(void); void SetPlayerAvatarTransitionFlags(u16 a); void sub_808BCE8(void); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 68277812d4..7b38f9ddc5 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -1,7 +1,7 @@ #ifndef GUARD_GLOBAL_FIELDMAP_H #define GUARD_GLOBAL_FIELDMAP_H -#define NUM_FIELD_OBJECTS 16 +#define NUM_EVENT_OBJECTS 16 enum { @@ -72,7 +72,7 @@ struct BackupMapData u16 *map; }; -struct MapObjectTemplate +struct EventObjectTemplate { /*0x00*/ u8 localId; /*0x01*/ u8 graphicsId; @@ -133,12 +133,12 @@ struct BgEvent struct MapEvents { - u8 mapObjectCount; + u8 eventObjectCount; u8 warpCount; u8 coordEventCount; u8 bgEventCount; - struct MapObjectTemplate *mapObjects; + struct EventObjectTemplate *eventObjects; struct WarpEvent *warps; struct CoordEvent *coordEvents; struct BgEvent *bgEvents; @@ -176,7 +176,7 @@ struct MapHeader /* 0x1B */ u8 battleType; }; -struct MapObject +struct EventObject { /*0x00*/ u32 active:1; u32 singleMovementActive:1; @@ -239,7 +239,7 @@ struct MapObject /*size = 0x24*/ }; -struct MapObjectGraphicsInfo +struct EventObjectGraphicsInfo { /*0x00*/ u16 tileTag; /*0x02*/ u16 paletteTag1; @@ -320,7 +320,7 @@ struct PlayerAvatar /*0x02*/ u8 runningState; // this is a static running state. 00 is not moving, 01 is turn direction, 02 is moving. /*0x03*/ u8 tileTransitionState; // this is a transition running state: 00 is not moving, 01 is transition between tiles, 02 means you are on the frame in which you have centered on a tile but are about to keep moving, even if changing directions. 2 is also used for a ledge hop, since you are transitioning. /*0x04*/ u8 spriteId; - /*0x05*/ u8 mapObjectId; + /*0x05*/ u8 eventObjectId; /*0x06*/ bool8 preventStep; /*0x07*/ u8 gender; /*0x08*/ u8 acroBikeState; // 00 is normal, 01 is turning, 02 is standing wheelie, 03 is hopping wheelie @@ -342,8 +342,8 @@ struct Camera s32 y; }; -extern struct MapObject gMapObjects[NUM_FIELD_OBJECTS]; -extern u8 gSelectedMapObject; +extern struct EventObject gEventObjects[NUM_EVENT_OBJECTS]; +extern u8 gSelectedEventObject; extern struct MapHeader gMapHeader; extern struct PlayerAvatar gPlayerAvatar; extern struct Camera gCamera; diff --git a/include/global.h b/include/global.h index 4a0fdb70af..d26184270a 100644 --- a/include/global.h +++ b/include/global.h @@ -101,7 +101,7 @@ enum LanguageId // capacities of various saveblock objects #define DAYCARE_MON_COUNT 2 #define POKEBLOCKS_COUNT 40 -#define MAP_OBJECTS_COUNT 16 +#define EVENT_OBJECTS_COUNT 16 #define BERRY_TREES_COUNT 128 #define FLAGS_COUNT 300 #define VARS_COUNT 256 @@ -796,8 +796,8 @@ struct SaveBlock1 /*0x9C2*/ u8 field_9C2[6]; /*0x9C8*/ u16 trainerRematchStepCounter; /*0x9CA*/ u8 trainerRematches[100]; - /*0xA30*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT]; - /*0xC70*/ struct MapObjectTemplate mapObjectTemplates[64]; + /*0xA30*/ struct EventObject eventObjects[EVENT_OBJECTS_COUNT]; + /*0xC70*/ struct EventObjectTemplate eventObjectTemplates[64]; /*0x1270*/ u8 flags[FLAGS_COUNT]; /*0x139C*/ u16 vars[VARS_COUNT]; /*0x159C*/ u32 gameStats[NUM_GAME_STATS]; diff --git a/include/load_save.h b/include/load_save.h index 0868316c89..5fb5f6c428 100644 --- a/include/load_save.h +++ b/include/load_save.h @@ -22,8 +22,8 @@ void sub_8076D5C(void); void sav2_gender2_inplace_and_xFE(void); void SavePlayerParty(void); void LoadPlayerParty(void); -void SaveMapObjects(void); -void LoadMapObjects(void); +void SaveEventObjects(void); +void LoadEventObjects(void); void SaveSerializedGame(void); void LoadSerializedGame(void); void LoadPlayerBag(void); diff --git a/include/map_obj_lock.h b/include/map_obj_lock.h deleted file mode 100644 index a10648f2f1..0000000000 --- a/include/map_obj_lock.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef GUARD_MAP_OBJ_LOCK_H -#define GUARD_MAP_OBJ_LOCK_H - -bool8 sub_80983C4(void); -void ScriptFreezeMapObjects(void); -bool8 sub_809847C(void); -void LockSelectedMapObject(void); -void sub_8098630(void); -bool8 sub_8098734(void); - -#endif // GUARD_MAP_OBJ_LOCK_H diff --git a/include/mauville_old_man.h b/include/mauville_old_man.h index e318ac8bb0..9d71e81aa5 100644 --- a/include/mauville_old_man.h +++ b/include/mauville_old_man.h @@ -15,7 +15,7 @@ extern struct BardSong gBardSong; void SetMauvilleOldMan(void); u8 GetCurrentMauvilleOldMan(void); -void ScrSpecial_SetMauvilleOldManMapObjGfx(void); +void ScrSpecial_SetMauvilleOldManEventObjGfx(void); u8 sub_81201C8(void); void sub_8120B70(OldMan *dest); void sub_8120670(void); diff --git a/include/overworld.h b/include/overworld.h index 15d7bb362c..ace988f4ee 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -7,17 +7,17 @@ struct UnkPlayerStruct u8 player_field_1; }; -struct LinkPlayerMapObject +struct LinkPlayerEventObject { u8 active; u8 linkPlayerId; - u8 mapObjId; + u8 eventObjId; u8 mode; }; // Exported RAM declarations extern struct WarpData gUnknown_020322DC; -extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4]; +extern struct LinkPlayerEventObject gLinkPlayerEventObjects[4]; extern u16 *gBGTilemapBuffers1; extern u16 *gBGTilemapBuffers2; @@ -37,10 +37,10 @@ void IncrementGameStat(u8 index); u32 GetGameStat(u8 index); void SetGameStat(u8 index, u32 value); void ApplyNewEncryptionKeyToGameStats(u32 newKey); -void LoadMapObjTemplatesFromHeader(void); -void LoadSaveblockMapObjScripts(void); -void Overworld_SetMapObjTemplateCoords(u8 localId, s16 x, s16 y); -void Overworld_SetMapObjTemplateMovementType(u8 localId, u8 movementType); +void LoadEventObjTemplatesFromHeader(void); +void LoadSaveblockEventObjScripts(void); +void Overworld_SetEventObjTemplateCoords(u8 localId, s16 x, s16 y); +void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType); const struct MapData *get_mapdata_header(void); void ApplyCurrentWarp(void); void set_warp2_warp3_to_neg_1(void); @@ -141,6 +141,6 @@ bool32 sub_8087598(void); bool32 sub_80875C8(void); bool32 sub_8087634(void); bool32 sub_808766C(void); -void ZeroAllLinkPlayerMapObjects(void); +void ZeroAllLinkPlayerEventObjects(void); #endif // GUARD_OVERWORLD_H diff --git a/include/pokenav.h b/include/pokenav.h index 734a1ec3f4..2bca4db941 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -21,7 +21,7 @@ void sub_81D1EC0(void); void sub_81D1D04(u8); bool8 sub_81D1C44(u8); void sub_81D5FB4(u16*); -bool8 sub_81D4A58(struct MapObject*); +bool8 sub_81D4A58(struct EventObject*); #endif //GUARD_POKENAV_H diff --git a/include/rom_81BE66C.h b/include/rom_81BE66C.h index 5b4f80249f..900daf4e73 100644 --- a/include/rom_81BE66C.h +++ b/include/rom_81BE66C.h @@ -6,7 +6,7 @@ #define GUARD_ROM_81BE66C_H bool32 InTrainerHill(void); -bool8 FieldObjectIsFarawayIslandMew(struct MapObject *); +bool8 EventObjectIsFarawayIslandMew(struct EventObject *); u32 sub_81D427C(void); #endif //GUARD_ROM_81BE66C_H diff --git a/include/trainer_see.h b/include/trainer_see.h index 8473807823..39f3cd8b07 100644 --- a/include/trainer_see.h +++ b/include/trainer_see.h @@ -3,7 +3,7 @@ struct ApproachingTrainer { - u8 mapObjectId; + u8 eventObjectId; u8 radius; // plus 1 const u8 *trainerScriptPtr; u8 taskId; @@ -17,14 +17,14 @@ extern u8 gUnknown_030060AC; extern u8 gApproachingTrainerId; bool8 CheckForTrainersWantingBattle(void); -void sub_80B4578(struct MapObject *var); +void sub_80B4578(struct EventObject *var); void EndTrainerApproach(void); void sub_80B45D0(void); u8 FldEff_ExclamationMarkIcon1(void); u8 FldEff_ExclamationMarkIcon2(void); u8 FldEff_HeartIcon(void); -u8 GetCurrentApproachingTrainerMapObjectId(void); -u8 GetChosenApproachingTrainerMapObjectId(u8 arrayId); +u8 GetCurrentApproachingTrainerEventObjectId(void); +u8 GetChosenApproachingTrainerEventObjectId(u8 arrayId); void sub_80B4808(void); #endif // GUARD_TRAINER_SEE_H diff --git a/ld_script.txt b/ld_script.txt index 66af49175e..1949d04809 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -94,7 +94,7 @@ SECTIONS { asm/field_player_avatar.o(.text); src/event_object_movement.o(.text); src/field_message_box.o(.text); - src/map_obj_lock.o(.text); + src/event_obj_lock.o(.text); src/text_window.o(.text); src/script.o(.text); src/scrcmd.o(.text); diff --git a/src/battle_setup.c b/src/battle_setup.c index bc79310258..2875aaff2f 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -62,8 +62,8 @@ extern void sub_80EECC8(void); extern void sub_80AF6F0(void); extern u16 sub_81A9AA8(u8 localId); extern u16 sub_81D6180(u8 localId); -extern bool8 GetBattlePyramidTrainerFlag(u8 mapObjId); -extern bool8 GetTrainerHillTrainerFlag(u8 mapObjId); +extern bool8 GetBattlePyramidTrainerFlag(u8 eventObjId); +extern bool8 GetTrainerHillTrainerFlag(u8 eventObjId); extern bool8 sub_81D5C18(void); extern void sub_816306C(u8 a0); extern void sub_8163048(u8 a0); @@ -101,7 +101,7 @@ EWRAM_DATA static u16 sTrainerBattleMode = 0; EWRAM_DATA u16 gTrainerBattleOpponent_A = 0; EWRAM_DATA u16 gTrainerBattleOpponent_B = 0; EWRAM_DATA u16 gPartnerTrainerId = 0; -EWRAM_DATA static u16 sTrainerMapObjectLocalId = 0; +EWRAM_DATA static u16 sTrainerEventObjectLocalId = 0; EWRAM_DATA static u8 *sTrainerAIntroSpeech = NULL; EWRAM_DATA static u8 *sTrainerBIntroSpeech = NULL; EWRAM_DATA static u8 *sTrainerADefeatSpeech = NULL; @@ -155,7 +155,7 @@ static const struct TrainerBattleParameter sOrdinaryBattleParams[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerMapObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -168,7 +168,7 @@ static const struct TrainerBattleParameter sContinueScriptBattleParams[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerMapObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -181,7 +181,7 @@ static const struct TrainerBattleParameter sDoubleBattleParams[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerMapObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -194,7 +194,7 @@ static const struct TrainerBattleParameter sOrdinaryNoIntroBattleParams[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerMapObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerAIntroSpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -207,7 +207,7 @@ static const struct TrainerBattleParameter sContinueScriptDoubleBattleParams[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerMapObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -220,7 +220,7 @@ static const struct TrainerBattleParameter sTrainerBOrdinaryBattleParams[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_B, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerMapObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerBIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerBDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -233,7 +233,7 @@ static const struct TrainerBattleParameter sTrainerBContinueScriptBattleParams[] { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_B, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerMapObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerBIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerBDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -387,7 +387,7 @@ void BattleSetup_StartBattlePikeWildBattle(void) static void DoStandardWildBattle(void) { ScriptContext2_Enable(); - FreezeMapObjects(); + FreezeEventObjects(); sub_808BCF4(); gMain.savedCallback = CB2_EndWildBattle; gBattleTypeFlags = 0; @@ -406,7 +406,7 @@ static void DoStandardWildBattle(void) void BattleSetup_StartRoamerBattle(void) { ScriptContext2_Enable(); - FreezeMapObjects(); + FreezeEventObjects(); sub_808BCF4(); gMain.savedCallback = CB2_EndWildBattle; gBattleTypeFlags = BATTLE_TYPE_ROAMER; @@ -420,7 +420,7 @@ void BattleSetup_StartRoamerBattle(void) static void DoSafariBattle(void) { ScriptContext2_Enable(); - FreezeMapObjects(); + FreezeEventObjects(); sub_808BCF4(); gMain.savedCallback = CB2_EndSafariBattle; gBattleTypeFlags = BATTLE_TYPE_SAFARI; @@ -430,7 +430,7 @@ static void DoSafariBattle(void) static void DoBattlePikeWildBattle(void) { ScriptContext2_Enable(); - FreezeMapObjects(); + FreezeEventObjects(); sub_808BCF4(); gMain.savedCallback = CB2_EndWildBattle; gBattleTypeFlags = BATTLE_TYPE_PIKE; @@ -1011,7 +1011,7 @@ static void InitTrainerBattleVariables(void) sTrainerBDefeatSpeech = NULL; sTrainerBBattleScriptRetAddr = NULL; } - sTrainerMapObjectLocalId = 0; + sTrainerEventObjectLocalId = 0; sTrainerVictorySpeech = NULL; sTrainerCannotBattleSpeech = NULL; sTrainerBattleEndScript = NULL; @@ -1074,10 +1074,10 @@ static void TrainerBattleLoadArgs(const struct TrainerBattleParameter *specs, co void SetMapVarsToTrainer(void) { - if (sTrainerMapObjectLocalId != 0) + if (sTrainerEventObjectLocalId != 0) { - gSpecialVar_LastTalked = sTrainerMapObjectLocalId; - gSelectedMapObject = GetFieldObjectIdByLocalIdAndMap(sTrainerMapObjectLocalId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + gSpecialVar_LastTalked = sTrainerEventObjectLocalId; + gSelectedEventObject = GetEventObjectIdByLocalIdAndMap(sTrainerEventObjectLocalId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } } @@ -1171,19 +1171,19 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) } } -void ConfigureAndSetUpOneTrainerBattle(u8 trainerMapObjId, const u8 *trainerScript) +void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerScript) { - gSelectedMapObject = trainerMapObjId; - gSpecialVar_LastTalked = gMapObjects[trainerMapObjId].localId; + gSelectedEventObject = trainerEventObjId; + gSpecialVar_LastTalked = gEventObjects[trainerEventObjId].localId; BattleSetup_ConfigureTrainerBattle(trainerScript + 1); ScriptContext1_SetupScript(EventScript_271354); ScriptContext2_Enable(); } -void ConfigureTwoTrainersBattle(u8 trainerMapObjId, const u8 *trainerScript) +void ConfigureTwoTrainersBattle(u8 trainerEventObjId, const u8 *trainerScript) { - gSelectedMapObject = trainerMapObjId; - gSpecialVar_LastTalked = gMapObjects[trainerMapObjId].localId; + gSelectedEventObject = trainerEventObjId; + gSpecialVar_LastTalked = gEventObjects[trainerEventObjId].localId; BattleSetup_ConfigureTrainerBattle(trainerScript + 1); } @@ -1201,9 +1201,9 @@ bool32 GetTrainerFlagFromScriptPointer(const u8 *data) void sub_80B16D8(void) { - struct MapObject *mapObject = &gMapObjects[gSelectedMapObject]; + struct EventObject *eventObject = &gEventObjects[gSelectedEventObject]; - npc_set_running_behaviour_etc(mapObject, npc_running_behaviour_by_direction(mapObject->facingDirection)); + npc_set_running_behaviour_etc(eventObject, npc_running_behaviour_by_direction(eventObject->facingDirection)); } u8 GetTrainerBattleMode(void) @@ -1214,9 +1214,9 @@ u8 GetTrainerBattleMode(void) bool8 GetTrainerFlag(void) { if (InBattlePyramid()) - return GetBattlePyramidTrainerFlag(gSelectedMapObject); + return GetBattlePyramidTrainerFlag(gSelectedEventObject); else if (InTrainerHill()) - return GetTrainerHillTrainerFlag(gSelectedMapObject); + return GetTrainerHillTrainerFlag(gSelectedEventObject); else return FlagGet(GetTrainerAFlag()); } @@ -1361,7 +1361,7 @@ void ShowTrainerIntroSpeech(void) if (gNoOfApproachingTrainers == 0 || gNoOfApproachingTrainers == 1) sub_81A9EDC(sub_81A9AA8(gSpecialVar_LastTalked)); else - sub_81A9EDC(sub_81A9AA8(gMapObjects[gApproachingTrainers[gApproachingTrainerId].mapObjectId].localId)); + sub_81A9EDC(sub_81A9AA8(gEventObjects[gApproachingTrainers[gApproachingTrainerId].eventObjectId].localId)); sub_80982B8(); } @@ -1370,7 +1370,7 @@ void ShowTrainerIntroSpeech(void) if (gNoOfApproachingTrainers == 0 || gNoOfApproachingTrainers == 1) sub_81D572C(2, sub_81D6180(gSpecialVar_LastTalked)); else - sub_81D572C(2, sub_81D6180(gMapObjects[gApproachingTrainers[gApproachingTrainerId].mapObjectId].localId)); + sub_81D572C(2, sub_81D6180(gEventObjects[gApproachingTrainers[gApproachingTrainerId].eventObjectId].localId)); sub_80982B8(); } diff --git a/src/battle_transition.c b/src/battle_transition.c index 8b9b50140d..41729eec9d 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -59,7 +59,7 @@ typedef bool8 (*TransitionSpriteCallback)(struct Sprite *sprite); extern u16 gBattle_BG0_X; extern u16 gBattle_BG0_Y; -extern const struct OamData gFieldObjectBaseOam_32x32; +extern const struct OamData gEventObjectBaseOam_32x32; extern void sub_80AC3D0(void); @@ -753,7 +753,7 @@ static const struct SpriteTemplate gUnknown_085C8E68 = { .tileTag = 0xFFFF, .paletteTag = 4105, - .oam = &gFieldObjectBaseOam_32x32, + .oam = &gEventObjectBaseOam_32x32, .anims = sSpriteAnimTable_85C8E3C, .images = sSpriteImageTable_85C8E2C, .affineAnims = sSpriteAffineAnimTable_85C8E60, @@ -820,7 +820,7 @@ static const struct SpriteTemplate sSpriteTemplate_85C8EBC = .callback = sub_8148380 }; -static const u16 gFieldEffectObjectPalette10[] = INCBIN_U16("graphics/map_objects/palettes/field_effect_object_palette_10.gbapal"); +static const u16 gFieldEffectObjectPalette10[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_10.gbapal"); const struct SpritePalette gFieldEffectObjectPaletteInfo10 = { diff --git a/src/berry.c b/src/berry.c index 3b5df1cc84..7b83743a72 100644 --- a/src/berry.c +++ b/src/berry.c @@ -8,10 +8,10 @@ #include "event_data.h" #include "fieldmap.h" -extern u8 FieldObjectGetBerryTreeId(u8 mapObjectId); +extern u8 EventObjectGetBerryTreeId(u8 eventObjectId); extern void sub_8092EF0(u8 mapId, u8 mapNumber, u8 mapGroup); extern void CB2_ChooseBerry(void); -extern const u8* GetFieldObjectScriptPointerForComparison(void); +extern const u8* GetEventObjectScriptPointerForComparison(void); extern bool8 sub_8092E9C(u8, u8, u8); extern u16 gSpecialVar_ItemId; @@ -904,9 +904,9 @@ struct BerryTree *GetBerryTreeInfo(u8 id) return &gSaveBlock1Ptr->berryTrees[id]; } -bool32 FieldObjectInteractionWaterBerryTree(void) +bool32 EventObjectInteractionWaterBerryTree(void) { - struct BerryTree *tree = GetBerryTreeInfo(FieldObjectGetBerryTreeId(gSelectedMapObject)); + struct BerryTree *tree = GetBerryTreeInfo(EventObjectGetBerryTreeId(gSelectedEventObject)); switch (tree->stage) { @@ -930,8 +930,8 @@ bool32 FieldObjectInteractionWaterBerryTree(void) bool8 IsPlayerFacingPlantedBerryTree(void) { - if (GetFieldObjectScriptPointerForComparison() == BerryTreeScript - && GetStageByBerryTreeId(FieldObjectGetBerryTreeId(gSelectedMapObject)) == 0) + if (GetEventObjectScriptPointerForComparison() == BerryTreeScript + && GetStageByBerryTreeId(EventObjectGetBerryTreeId(gSelectedEventObject)) == 0) return TRUE; else return FALSE; @@ -939,10 +939,10 @@ bool8 IsPlayerFacingPlantedBerryTree(void) bool8 TryToWaterBerryTree(void) { - if (GetFieldObjectScriptPointerForComparison() != BerryTreeScript) + if (GetEventObjectScriptPointerForComparison() != BerryTreeScript) return FALSE; else - return FieldObjectInteractionWaterBerryTree(); + return EventObjectInteractionWaterBerryTree(); } void ClearBerryTrees(void) @@ -1152,7 +1152,7 @@ u16 GetStageDurationByBerryType(u8 berry) return GetBerryInfo(berry)->stageDuration * 60; } -void FieldObjectInteractionGetBerryTreeData(void) +void EventObjectInteractionGetBerryTreeData(void) { u8 id; u8 berry; @@ -1160,7 +1160,7 @@ void FieldObjectInteractionGetBerryTreeData(void) u8 group; u8 num; - id = FieldObjectGetBerryTreeId(gSelectedMapObject); + id = EventObjectGetBerryTreeId(gSelectedEventObject); berry = GetBerryTypeByBerryTreeId(id); ResetBerryTreeSparkleFlag(id); unk = gSpecialVar_LastTalked; @@ -1175,15 +1175,15 @@ void FieldObjectInteractionGetBerryTreeData(void) GetBerryCountStringByBerryType(berry, gStringVar1, gSpecialVar_0x8006); } -void FieldObjectInteractionGetBerryName(void) +void EventObjectInteractionGetBerryName(void) { - u8 berryType = GetBerryTypeByBerryTreeId(FieldObjectGetBerryTreeId(gSelectedMapObject)); + u8 berryType = GetBerryTypeByBerryTreeId(EventObjectGetBerryTreeId(gSelectedEventObject)); GetBerryNameByBerryType(berryType, gStringVar1); } -void FieldObjectInteractionGetBerryCountString(void) +void EventObjectInteractionGetBerryCountString(void) { - u8 treeId = FieldObjectGetBerryTreeId(gSelectedMapObject); + u8 treeId = EventObjectGetBerryTreeId(gSelectedEventObject); u8 berry = GetBerryTypeByBerryTreeId(treeId); u8 count = GetBerryCountByBerryTreeId(treeId); GetBerryCountStringByBerryType(berry, gStringVar1, count); @@ -1194,25 +1194,25 @@ void Bag_ChooseBerry(void) SetMainCallback2(CB2_ChooseBerry); } -void FieldObjectInteractionPlantBerryTree(void) +void EventObjectInteractionPlantBerryTree(void) { u8 berry = ItemIdToBerryType(gSpecialVar_ItemId); - PlantBerryTree(FieldObjectGetBerryTreeId(gSelectedMapObject), berry, 1, TRUE); - FieldObjectInteractionGetBerryTreeData(); + PlantBerryTree(EventObjectGetBerryTreeId(gSelectedEventObject), berry, 1, TRUE); + EventObjectInteractionGetBerryTreeData(); } -void FieldObjectInteractionPickBerryTree(void) +void EventObjectInteractionPickBerryTree(void) { - u8 id = FieldObjectGetBerryTreeId(gSelectedMapObject); + u8 id = EventObjectGetBerryTreeId(gSelectedEventObject); u8 berry = GetBerryTypeByBerryTreeId(id); gSpecialVar_0x8004 = AddBagItem(BerryTypeToItemId(berry), GetBerryCountByBerryTreeId(id)); } -void FieldObjectInteractionRemoveBerryTree(void) +void EventObjectInteractionRemoveBerryTree(void) { - RemoveBerryTree(FieldObjectGetBerryTreeId(gSelectedMapObject)); + RemoveBerryTree(EventObjectGetBerryTreeId(gSelectedEventObject)); sub_8092EF0(gSpecialVar_LastTalked, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } @@ -1236,14 +1236,14 @@ void ResetBerryTreeSparkleFlags(void) top = cam_top + 3; right = cam_left + 14; bottom = top + 8; - for (i = 0; i < MAP_OBJECTS_COUNT; i++) + for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { - if (gMapObjects[i].active && gMapObjects[i].movementType == 12) + if (gEventObjects[i].active && gEventObjects[i].movementType == 12) { - cam_left = gMapObjects[i].currentCoords.x; - cam_top = gMapObjects[i].currentCoords.y; + cam_left = gEventObjects[i].currentCoords.x; + cam_top = gEventObjects[i].currentCoords.y; if (left <= cam_left && cam_left <= right && top <= cam_top && cam_top <= bottom) - ResetBerryTreeSparkleFlag(gMapObjects[i].trainerRange_berryTreeId); + ResetBerryTreeSparkleFlag(gEventObjects[i].trainerRange_berryTreeId); } } } diff --git a/src/bike.c b/src/bike.c index 92f4b8a60e..d44bb1043e 100644 --- a/src/bike.c +++ b/src/bike.c @@ -56,7 +56,7 @@ static void Bike_UpdateDirTimerHistory(u8); static void Bike_UpdateABStartSelectHistory(u8); static u8 Bike_DPadToDirection(u16); static u8 get_some_collision(u8); -static u8 Bike_CheckCollisionTryAdvanceCollisionCount(struct MapObject *, s16, s16, u8, u8); +static u8 Bike_CheckCollisionTryAdvanceCollisionCount(struct EventObject *, s16, s16, u8, u8); static bool8 IsRunningDisallowedByMetatile(u8); static void Bike_TryAdvanceCyclingRoadCollisions(); static u8 CanBikeFaceDirOnMetatile(u8, u8); @@ -196,31 +196,31 @@ static void MachBikeTransition_FaceDirection(u8 direction) static void MachBikeTransition_TurnDirection(u8 direction) { - struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior)) + if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior)) { PlayerTurnInPlace(direction); Bike_SetBikeStill(); } else { - MachBikeTransition_FaceDirection(playerMapObj->facingDirection); + MachBikeTransition_FaceDirection(playerEventObj->facingDirection); } } static void MachBikeTransition_TrySpeedUp(u8 direction) { - struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; u8 collision; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == FALSE) + if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == FALSE) { // we cannot go forward, so either slow down or, if we are stopped, idle face direction. if (gPlayerAvatar.bikeSpeed) - MachBikeTransition_TrySlowDown(playerMapObj->movementDirection); + MachBikeTransition_TrySlowDown(playerEventObj->movementDirection); else - MachBikeTransition_FaceDirection(playerMapObj->movementDirection); + MachBikeTransition_FaceDirection(playerEventObj->movementDirection); } else { @@ -376,10 +376,10 @@ static u8 AcroBikeHandleInputTurning(u8 *newDirection, u16 newKeys, u16 heldKeys static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16 heldKeys) { u8 direction; - struct MapObject *playerMapObj; + struct EventObject *playerEventObj; direction = player_get_direction_upper_nybble(); - playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; gPlayerAvatar.runningState = NOT_MOVING; if (heldKeys & B_BUTTON) @@ -388,7 +388,7 @@ static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16 { // B button was released. gPlayerAvatar.bikeFrameCounter = 0; - if (!MetatileBehavior_IsBumpySlope(playerMapObj->currentMetatileBehavior)) + if (!MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior)) { // Go back to normal on flat ground *newDirection = direction; @@ -423,15 +423,15 @@ static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16 static u8 AcroBikeHandleInputBunnyHop(u8 *newDirection, u16 newKeys, u16 heldKeys) { u8 direction; - struct MapObject *playerMapObj; + struct EventObject *playerEventObj; direction = player_get_direction_upper_nybble(); - playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; if (!(heldKeys & B_BUTTON)) { // B button was released Bike_SetBikeStill(); - if (MetatileBehavior_IsBumpySlope(playerMapObj->currentMetatileBehavior)) + if (MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior)) { // even though B was released, dont undo the wheelie on the bumpy slope. gPlayerAvatar.acroBikeState = ACRO_STATE_WHEELIE_STANDING; @@ -470,15 +470,15 @@ static u8 AcroBikeHandleInputBunnyHop(u8 *newDirection, u16 newKeys, u16 heldKey static u8 AcroBikeHandleInputWheelieMoving(u8 *newDirection, u16 newKeys, u16 heldKeys) { u8 direction; - struct MapObject *playerMapObj; + struct EventObject *playerEventObj; direction = player_get_direction_lower_nybble(); - playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; if (!(heldKeys & B_BUTTON)) { // we were moving on a wheelie, but we let go while moving. reset bike still status Bike_SetBikeStill(); - if (!MetatileBehavior_IsBumpySlope(playerMapObj->currentMetatileBehavior)) + if (!MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior)) { // we let go of B and arent on a bumpy slope, set state to normal because now we need to handle this gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL; @@ -524,10 +524,10 @@ static u8 AcroBikeHandleInputWheelieMoving(u8 *newDirection, u16 newKeys, u16 he static u8 AcroBikeHandleInputSidewaysJump(u8 *ptr, u16 newKeys, u16 heldKeys) { - struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - playerMapObj->facingDirectionLocked = 0; - FieldObjectSetDirection(playerMapObj, playerMapObj->facingDirection); + playerEventObj->facingDirectionLocked = 0; + EventObjectSetDirection(playerEventObj, playerEventObj->facingDirection); gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL; return CheckMovementInputAcroBike(ptr, newKeys, heldKeys); } @@ -545,21 +545,21 @@ static void AcroBikeTransition_FaceDirection(u8 direction) static void AcroBikeTransition_TurnDirection(u8 direction) { - struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) - direction = playerMapObj->movementDirection; + if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) + direction = playerEventObj->movementDirection; PlayerFaceDirection(direction); } static void AcroBikeTransition_Moving(u8 direction) { u8 collision; - struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) { - AcroBikeTransition_FaceDirection(playerMapObj->movementDirection); + AcroBikeTransition_FaceDirection(playerEventObj->movementDirection); return; } collision = get_some_collision(direction); @@ -580,48 +580,48 @@ static void AcroBikeTransition_Moving(u8 direction) static void AcroBikeTransition_NormalToWheelie(u8 direction) { - struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) - direction = playerMapObj->movementDirection; + if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) + direction = playerEventObj->movementDirection; PlayerStartWheelie(direction); } static void AcroBikeTransition_WheelieToNormal(u8 direction) { - struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) - direction = playerMapObj->movementDirection; + if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) + direction = playerEventObj->movementDirection; PlayerEndWheelie(direction); } static void AcroBikeTransition_WheelieIdle(u8 direction) { - struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) - direction = playerMapObj->movementDirection; + if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) + direction = playerEventObj->movementDirection; PlayerIdleWheelie(direction); } static void AcroBikeTransition_WheelieHoppingStanding(u8 direction) { - struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) - direction = playerMapObj->movementDirection; + if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) + direction = playerEventObj->movementDirection; PlayerStandingHoppingWheelie(direction); } static void AcroBikeTransition_WheelieHoppingMoving(u8 direction) { u8 collision; - struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) { - AcroBikeTransition_WheelieHoppingStanding(playerMapObj->movementDirection); + AcroBikeTransition_WheelieHoppingStanding(playerEventObj->movementDirection); return; } collision = get_some_collision(direction); @@ -651,7 +651,7 @@ static void AcroBikeTransition_WheelieHoppingMoving(u8 direction) static void AcroBikeTransition_SideJump(u8 direction) { u8 collision; - struct MapObject *playerMapObj; + struct EventObject *playerEventObj; collision = get_some_collision(direction); if (collision != 0) @@ -669,9 +669,9 @@ static void AcroBikeTransition_SideJump(u8 direction) return; } } - playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; PlaySE(SE_JITE_PYOKO); - playerMapObj->facingDirectionLocked = 1; + playerEventObj->facingDirectionLocked = 1; PlayerSetAnimId(sub_8093514(direction), 2); } @@ -683,11 +683,11 @@ static void AcroBikeTransition_TurnJump(u8 direction) static void AcroBikeTransition_WheelieMoving(u8 direction) { u8 collision; - struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) { - PlayerIdleWheelie(playerMapObj->movementDirection); + PlayerIdleWheelie(playerEventObj->movementDirection); return; } collision = get_some_collision(direction); @@ -703,7 +703,7 @@ static void AcroBikeTransition_WheelieMoving(u8 direction) } else if (collision <= 4) { - if (MetatileBehavior_IsBumpySlope(playerMapObj->currentMetatileBehavior)) + if (MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior)) PlayerIdleWheelie(direction); else sub_808B980(direction); //hit wall? @@ -717,11 +717,11 @@ static void AcroBikeTransition_WheelieMoving(u8 direction) static void AcroBikeTransition_WheelieRisingMoving(u8 direction) { u8 collision; - struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) { - PlayerStartWheelie(playerMapObj->movementDirection); + PlayerStartWheelie(playerEventObj->movementDirection); return; } collision = get_some_collision(direction); @@ -737,7 +737,7 @@ static void AcroBikeTransition_WheelieRisingMoving(u8 direction) } else if (collision <= 4) { - if (MetatileBehavior_IsBumpySlope(playerMapObj->currentMetatileBehavior)) + if (MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior)) PlayerIdleWheelie(direction); else sub_808B980(direction); //hit wall? @@ -751,11 +751,11 @@ static void AcroBikeTransition_WheelieRisingMoving(u8 direction) static void AcroBikeTransition_WheelieLoweringMoving(u8 direction) { u8 collision; - struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) { - PlayerEndWheelie(playerMapObj->movementDirection); + PlayerEndWheelie(playerEventObj->movementDirection); return; } collision = get_some_collision(direction); @@ -880,18 +880,18 @@ static u8 get_some_collision(u8 direction) s16 x; s16 y; u8 metatitleBehavior; - struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - x = playerMapObj->currentCoords.x; - y = playerMapObj->currentCoords.y; + x = playerEventObj->currentCoords.x; + y = playerEventObj->currentCoords.y; MoveCoords(direction, &x, &y); metatitleBehavior = MapGridGetMetatileBehaviorAt(x, y); - return Bike_CheckCollisionTryAdvanceCollisionCount(playerMapObj, x, y, direction, metatitleBehavior); + return Bike_CheckCollisionTryAdvanceCollisionCount(playerEventObj, x, y, direction, metatitleBehavior); } -static u8 Bike_CheckCollisionTryAdvanceCollisionCount(struct MapObject *mapObject, s16 x, s16 y, u8 direction, u8 metatitleBehavior) +static u8 Bike_CheckCollisionTryAdvanceCollisionCount(struct EventObject *eventObject, s16 x, s16 y, u8 direction, u8 metatitleBehavior) { - u8 collision = CheckForFieldObjectCollision(mapObject, x, y, direction, metatitleBehavior); + u8 collision = CheckForEventObjectCollision(eventObject, x, y, direction, metatitleBehavior); if (collision > 4) return collision; @@ -979,7 +979,7 @@ bool8 IsBikingDisallowedByPlayer(void) bool8 player_should_look_direction_be_enforced_upon_movement(void) { - if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE) != FALSE && MetatileBehavior_IsBumpySlope(gMapObjects[gPlayerAvatar.mapObjectId].currentMetatileBehavior) != FALSE) + if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE) != FALSE && MetatileBehavior_IsBumpySlope(gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior) != FALSE) return FALSE; else return TRUE; diff --git a/src/data/field_event_obj/base_oam.h b/src/data/field_event_obj/base_oam.h index 4558081e71..1aa6987c37 100755 --- a/src/data/field_event_obj/base_oam.h +++ b/src/data/field_event_obj/base_oam.h @@ -1,49 +1,49 @@ #ifndef GUARD_BASE_OAM_H #define GUARD_BASE_OAM_H -const struct OamData gFieldObjectBaseOam_8x8 = { +const struct OamData gEventObjectBaseOam_8x8 = { .shape = 0, .size = 0, .priority = 2 }; -const struct OamData gFieldObjectBaseOam_16x8 = { +const struct OamData gEventObjectBaseOam_16x8 = { .shape = 1, .size = 0, .priority = 2 }; -const struct OamData gFieldObjectBaseOam_16x16 = { +const struct OamData gEventObjectBaseOam_16x16 = { .shape = 0, .size = 1, .priority = 2 }; -const struct OamData gFieldObjectBaseOam_32x8 = { +const struct OamData gEventObjectBaseOam_32x8 = { .shape = 1, .size = 1, .priority = 2 }; -const struct OamData gFieldObjectBaseOam_64x32 = { +const struct OamData gEventObjectBaseOam_64x32 = { .shape = 1, .size = 3, .priority = 2 }; -const struct OamData gFieldObjectBaseOam_16x32 = { +const struct OamData gEventObjectBaseOam_16x32 = { .shape = 2, .size = 2, .priority = 2 }; -const struct OamData gFieldObjectBaseOam_32x32 = { +const struct OamData gEventObjectBaseOam_32x32 = { .shape = 0, .size = 2, .priority = 2 }; -const struct OamData gFieldObjectBaseOam_64x64 = { +const struct OamData gEventObjectBaseOam_64x64 = { .shape = 0, .size = 3, .priority = 2 diff --git a/src/data/field_event_obj/berry_tree_graphics_tables.h b/src/data/field_event_obj/berry_tree_graphics_tables.h index 9e899788ac..31d515a82f 100755 --- a/src/data/field_event_obj/berry_tree_graphics_tables.h +++ b/src/data/field_event_obj/berry_tree_graphics_tables.h @@ -1,474 +1,474 @@ #ifndef GUARD_BERRY_TREE_GRAPHICS_TABLES_H #define GUARD_BERRY_TREE_GRAPHICS_TABLES_H -const struct SpriteFrameImage gFieldObjectPicTable_PechaBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_PechaBerryTree_0), - obj_frame_tiles(gFieldObjectPic_PechaBerryTree_1), - obj_frame_tiles(gFieldObjectPic_PechaBerryTree_2), - obj_frame_tiles(gFieldObjectPic_PechaBerryTree_3), - obj_frame_tiles(gFieldObjectPic_PechaBerryTree_4), - obj_frame_tiles(gFieldObjectPic_PechaBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_PechaBerryTree_0), + obj_frame_tiles(gEventObjectPic_PechaBerryTree_1), + obj_frame_tiles(gEventObjectPic_PechaBerryTree_2), + obj_frame_tiles(gEventObjectPic_PechaBerryTree_3), + obj_frame_tiles(gEventObjectPic_PechaBerryTree_4), + obj_frame_tiles(gEventObjectPic_PechaBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Pecha[] = {3, 4, 4, 4, 4}; -const struct SpriteFrameImage gFieldObjectPicTable_KelpsyBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_KelpsyBerryTree_0), - obj_frame_tiles(gFieldObjectPic_KelpsyBerryTree_1), - obj_frame_tiles(gFieldObjectPic_KelpsyBerryTree_2), - obj_frame_tiles(gFieldObjectPic_KelpsyBerryTree_3), - obj_frame_tiles(gFieldObjectPic_KelpsyBerryTree_4), - obj_frame_tiles(gFieldObjectPic_KelpsyBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_KelpsyBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_0), + obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_1), + obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_2), + obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_3), + obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_4), + obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Kelpsy[] = {3, 4, 2, 2, 2}; -const struct SpriteFrameImage gFieldObjectPicTable_WepearBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_WepearBerryTree_0), - obj_frame_tiles(gFieldObjectPic_WepearBerryTree_1), - obj_frame_tiles(gFieldObjectPic_WepearBerryTree_2), - obj_frame_tiles(gFieldObjectPic_WepearBerryTree_3), - obj_frame_tiles(gFieldObjectPic_WepearBerryTree_4), - obj_frame_tiles(gFieldObjectPic_WepearBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_WepearBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_WepearBerryTree_0), + obj_frame_tiles(gEventObjectPic_WepearBerryTree_1), + obj_frame_tiles(gEventObjectPic_WepearBerryTree_2), + obj_frame_tiles(gEventObjectPic_WepearBerryTree_3), + obj_frame_tiles(gEventObjectPic_WepearBerryTree_4), + obj_frame_tiles(gEventObjectPic_WepearBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Wepear[] = {3, 4, 2, 2, 2}; -const struct SpriteFrameImage gFieldObjectPicTable_IapapaBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_IapapaBerryTree_0), - obj_frame_tiles(gFieldObjectPic_IapapaBerryTree_1), - obj_frame_tiles(gFieldObjectPic_IapapaBerryTree_2), - obj_frame_tiles(gFieldObjectPic_IapapaBerryTree_3), - obj_frame_tiles(gFieldObjectPic_IapapaBerryTree_4), - obj_frame_tiles(gFieldObjectPic_IapapaBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_IapapaBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_IapapaBerryTree_0), + obj_frame_tiles(gEventObjectPic_IapapaBerryTree_1), + obj_frame_tiles(gEventObjectPic_IapapaBerryTree_2), + obj_frame_tiles(gEventObjectPic_IapapaBerryTree_3), + obj_frame_tiles(gEventObjectPic_IapapaBerryTree_4), + obj_frame_tiles(gEventObjectPic_IapapaBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Iapapa[] = {3, 4, 3, 3, 3}; -const struct SpriteFrameImage gFieldObjectPicTable_CheriBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_CheriBerryTree_0), - obj_frame_tiles(gFieldObjectPic_CheriBerryTree_1), - obj_frame_tiles(gFieldObjectPic_CheriBerryTree_2), - obj_frame_tiles(gFieldObjectPic_CheriBerryTree_3), - obj_frame_tiles(gFieldObjectPic_CheriBerryTree_4), - obj_frame_tiles(gFieldObjectPic_CheriBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_CheriBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_CheriBerryTree_0), + obj_frame_tiles(gEventObjectPic_CheriBerryTree_1), + obj_frame_tiles(gEventObjectPic_CheriBerryTree_2), + obj_frame_tiles(gEventObjectPic_CheriBerryTree_3), + obj_frame_tiles(gEventObjectPic_CheriBerryTree_4), + obj_frame_tiles(gEventObjectPic_CheriBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Cheri[] = {3, 4, 4, 4, 4}; -const struct SpriteFrameImage gFieldObjectPicTable_FigyBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_FigyBerryTree_0), - obj_frame_tiles(gFieldObjectPic_FigyBerryTree_1), - obj_frame_tiles(gFieldObjectPic_FigyBerryTree_2), - obj_frame_tiles(gFieldObjectPic_FigyBerryTree_3), - obj_frame_tiles(gFieldObjectPic_FigyBerryTree_4), - obj_frame_tiles(gFieldObjectPic_FigyBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_FigyBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_FigyBerryTree_0), + obj_frame_tiles(gEventObjectPic_FigyBerryTree_1), + obj_frame_tiles(gEventObjectPic_FigyBerryTree_2), + obj_frame_tiles(gEventObjectPic_FigyBerryTree_3), + obj_frame_tiles(gEventObjectPic_FigyBerryTree_4), + obj_frame_tiles(gEventObjectPic_FigyBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Figy[] = {3, 4, 3, 3, 3}; -const struct SpriteFrameImage gFieldObjectPicTable_MagoBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_MagoBerryTree_0), - obj_frame_tiles(gFieldObjectPic_MagoBerryTree_1), - obj_frame_tiles(gFieldObjectPic_MagoBerryTree_2), - obj_frame_tiles(gFieldObjectPic_MagoBerryTree_3), - obj_frame_tiles(gFieldObjectPic_MagoBerryTree_4), - obj_frame_tiles(gFieldObjectPic_MagoBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_MagoBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_MagoBerryTree_0), + obj_frame_tiles(gEventObjectPic_MagoBerryTree_1), + obj_frame_tiles(gEventObjectPic_MagoBerryTree_2), + obj_frame_tiles(gEventObjectPic_MagoBerryTree_3), + obj_frame_tiles(gEventObjectPic_MagoBerryTree_4), + obj_frame_tiles(gEventObjectPic_MagoBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Mago[] = {3, 4, 3, 3, 3}; -const struct SpriteFrameImage gFieldObjectPicTable_LumBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_LumBerryTree_0), - obj_frame_tiles(gFieldObjectPic_LumBerryTree_1), - obj_frame_tiles(gFieldObjectPic_LumBerryTree_2), - obj_frame_tiles(gFieldObjectPic_LumBerryTree_3), - obj_frame_tiles(gFieldObjectPic_LumBerryTree_4), - obj_frame_tiles(gFieldObjectPic_LumBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_LumBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_LumBerryTree_0), + obj_frame_tiles(gEventObjectPic_LumBerryTree_1), + obj_frame_tiles(gEventObjectPic_LumBerryTree_2), + obj_frame_tiles(gEventObjectPic_LumBerryTree_3), + obj_frame_tiles(gEventObjectPic_LumBerryTree_4), + obj_frame_tiles(gEventObjectPic_LumBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Lum[] = {3, 4, 4, 4, 4}; -const struct SpriteFrameImage gFieldObjectPicTable_RazzBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_RazzBerryTree_0), - obj_frame_tiles(gFieldObjectPic_RazzBerryTree_1), - obj_frame_tiles(gFieldObjectPic_RazzBerryTree_2), - obj_frame_tiles(gFieldObjectPic_RazzBerryTree_3), - obj_frame_tiles(gFieldObjectPic_RazzBerryTree_4), - obj_frame_tiles(gFieldObjectPic_RazzBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_RazzBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_RazzBerryTree_0), + obj_frame_tiles(gEventObjectPic_RazzBerryTree_1), + obj_frame_tiles(gEventObjectPic_RazzBerryTree_2), + obj_frame_tiles(gEventObjectPic_RazzBerryTree_3), + obj_frame_tiles(gEventObjectPic_RazzBerryTree_4), + obj_frame_tiles(gEventObjectPic_RazzBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Razz[] = {3, 4, 4, 4, 4}; -const struct SpriteFrameImage gFieldObjectPicTable_GrepaBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_GrepaBerryTree_0), - obj_frame_tiles(gFieldObjectPic_GrepaBerryTree_1), - obj_frame_tiles(gFieldObjectPic_GrepaBerryTree_2), - obj_frame_tiles(gFieldObjectPic_GrepaBerryTree_3), - obj_frame_tiles(gFieldObjectPic_GrepaBerryTree_4), - obj_frame_tiles(gFieldObjectPic_GrepaBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_GrepaBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_GrepaBerryTree_0), + obj_frame_tiles(gEventObjectPic_GrepaBerryTree_1), + obj_frame_tiles(gEventObjectPic_GrepaBerryTree_2), + obj_frame_tiles(gEventObjectPic_GrepaBerryTree_3), + obj_frame_tiles(gEventObjectPic_GrepaBerryTree_4), + obj_frame_tiles(gEventObjectPic_GrepaBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Grepa[] = {3, 4, 3, 3, 3}; -const struct SpriteFrameImage gFieldObjectPicTable_RabutaBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_RabutaBerryTree_0), - obj_frame_tiles(gFieldObjectPic_RabutaBerryTree_1), - obj_frame_tiles(gFieldObjectPic_RabutaBerryTree_2), - obj_frame_tiles(gFieldObjectPic_RabutaBerryTree_3), - obj_frame_tiles(gFieldObjectPic_RabutaBerryTree_4), - obj_frame_tiles(gFieldObjectPic_RabutaBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_RabutaBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_RabutaBerryTree_0), + obj_frame_tiles(gEventObjectPic_RabutaBerryTree_1), + obj_frame_tiles(gEventObjectPic_RabutaBerryTree_2), + obj_frame_tiles(gEventObjectPic_RabutaBerryTree_3), + obj_frame_tiles(gEventObjectPic_RabutaBerryTree_4), + obj_frame_tiles(gEventObjectPic_RabutaBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Rabuta[] = {3, 4, 4, 4, 4}; -const struct SpriteFrameImage gFieldObjectPicTable_NomelBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_NomelBerryTree_0), - obj_frame_tiles(gFieldObjectPic_NomelBerryTree_1), - obj_frame_tiles(gFieldObjectPic_NomelBerryTree_2), - obj_frame_tiles(gFieldObjectPic_NomelBerryTree_3), - obj_frame_tiles(gFieldObjectPic_NomelBerryTree_4), - obj_frame_tiles(gFieldObjectPic_NomelBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_NomelBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_NomelBerryTree_0), + obj_frame_tiles(gEventObjectPic_NomelBerryTree_1), + obj_frame_tiles(gEventObjectPic_NomelBerryTree_2), + obj_frame_tiles(gEventObjectPic_NomelBerryTree_3), + obj_frame_tiles(gEventObjectPic_NomelBerryTree_4), + obj_frame_tiles(gEventObjectPic_NomelBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Nomel[] = {3, 4, 3, 3, 3}; -const struct SpriteFrameImage gFieldObjectPicTable_LeppaBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_LeppaBerryTree_0), - obj_frame_tiles(gFieldObjectPic_LeppaBerryTree_1), - obj_frame_tiles(gFieldObjectPic_LeppaBerryTree_2), - obj_frame_tiles(gFieldObjectPic_LeppaBerryTree_3), - obj_frame_tiles(gFieldObjectPic_LeppaBerryTree_4), - obj_frame_tiles(gFieldObjectPic_LeppaBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_LeppaBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_LeppaBerryTree_0), + obj_frame_tiles(gEventObjectPic_LeppaBerryTree_1), + obj_frame_tiles(gEventObjectPic_LeppaBerryTree_2), + obj_frame_tiles(gEventObjectPic_LeppaBerryTree_3), + obj_frame_tiles(gEventObjectPic_LeppaBerryTree_4), + obj_frame_tiles(gEventObjectPic_LeppaBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Leppa[] = {3, 4, 3, 3, 3}; -const struct SpriteFrameImage gFieldObjectPicTable_LiechiBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_LiechiBerryTree_0), - obj_frame_tiles(gFieldObjectPic_LiechiBerryTree_1), - obj_frame_tiles(gFieldObjectPic_LiechiBerryTree_2), - obj_frame_tiles(gFieldObjectPic_LiechiBerryTree_3), - obj_frame_tiles(gFieldObjectPic_LiechiBerryTree_4), - obj_frame_tiles(gFieldObjectPic_LiechiBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_LiechiBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_LiechiBerryTree_0), + obj_frame_tiles(gEventObjectPic_LiechiBerryTree_1), + obj_frame_tiles(gEventObjectPic_LiechiBerryTree_2), + obj_frame_tiles(gEventObjectPic_LiechiBerryTree_3), + obj_frame_tiles(gEventObjectPic_LiechiBerryTree_4), + obj_frame_tiles(gEventObjectPic_LiechiBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Liechi[] = {3, 4, 4, 4, 4}; -const struct SpriteFrameImage gFieldObjectPicTable_HondewBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_HondewBerryTree_0), - obj_frame_tiles(gFieldObjectPic_HondewBerryTree_1), - obj_frame_tiles(gFieldObjectPic_HondewBerryTree_2), - obj_frame_tiles(gFieldObjectPic_HondewBerryTree_3), - obj_frame_tiles(gFieldObjectPic_HondewBerryTree_4), - obj_frame_tiles(gFieldObjectPic_HondewBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_HondewBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_HondewBerryTree_0), + obj_frame_tiles(gEventObjectPic_HondewBerryTree_1), + obj_frame_tiles(gEventObjectPic_HondewBerryTree_2), + obj_frame_tiles(gEventObjectPic_HondewBerryTree_3), + obj_frame_tiles(gEventObjectPic_HondewBerryTree_4), + obj_frame_tiles(gEventObjectPic_HondewBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Hondew[] = {3, 4, 5, 5, 5}; -const struct SpriteFrameImage gFieldObjectPicTable_AguavBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_AguavBerryTree_0), - obj_frame_tiles(gFieldObjectPic_AguavBerryTree_1), - obj_frame_tiles(gFieldObjectPic_AguavBerryTree_2), - obj_frame_tiles(gFieldObjectPic_AguavBerryTree_3), - obj_frame_tiles(gFieldObjectPic_AguavBerryTree_4), - obj_frame_tiles(gFieldObjectPic_AguavBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_AguavBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_AguavBerryTree_0), + obj_frame_tiles(gEventObjectPic_AguavBerryTree_1), + obj_frame_tiles(gEventObjectPic_AguavBerryTree_2), + obj_frame_tiles(gEventObjectPic_AguavBerryTree_3), + obj_frame_tiles(gEventObjectPic_AguavBerryTree_4), + obj_frame_tiles(gEventObjectPic_AguavBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Aguav[] = {3, 4, 4, 4, 4}; -const struct SpriteFrameImage gFieldObjectPicTable_WikiBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_WikiBerryTree_0), - obj_frame_tiles(gFieldObjectPic_WikiBerryTree_1), - obj_frame_tiles(gFieldObjectPic_WikiBerryTree_2), - obj_frame_tiles(gFieldObjectPic_WikiBerryTree_3), - obj_frame_tiles(gFieldObjectPic_WikiBerryTree_4), - obj_frame_tiles(gFieldObjectPic_WikiBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_WikiBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_WikiBerryTree_0), + obj_frame_tiles(gEventObjectPic_WikiBerryTree_1), + obj_frame_tiles(gEventObjectPic_WikiBerryTree_2), + obj_frame_tiles(gEventObjectPic_WikiBerryTree_3), + obj_frame_tiles(gEventObjectPic_WikiBerryTree_4), + obj_frame_tiles(gEventObjectPic_WikiBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Wiki[] = {3, 4, 3, 3, 3}; -const struct SpriteFrameImage gFieldObjectPicTable_PomegBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_PomegBerryTree_0), - obj_frame_tiles(gFieldObjectPic_PomegBerryTree_1), - obj_frame_tiles(gFieldObjectPic_PomegBerryTree_2), - obj_frame_tiles(gFieldObjectPic_PomegBerryTree_3), - obj_frame_tiles(gFieldObjectPic_PomegBerryTree_4), - obj_frame_tiles(gFieldObjectPic_PomegBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_PomegBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_PomegBerryTree_0), + obj_frame_tiles(gEventObjectPic_PomegBerryTree_1), + obj_frame_tiles(gEventObjectPic_PomegBerryTree_2), + obj_frame_tiles(gEventObjectPic_PomegBerryTree_3), + obj_frame_tiles(gEventObjectPic_PomegBerryTree_4), + obj_frame_tiles(gEventObjectPic_PomegBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Pomeg[] = {3, 4, 3, 3, 3}; -const struct SpriteFrameImage gFieldObjectPicTable_RawstBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_RawstBerryTree_0), - obj_frame_tiles(gFieldObjectPic_RawstBerryTree_1), - obj_frame_tiles(gFieldObjectPic_RawstBerryTree_2), - obj_frame_tiles(gFieldObjectPic_RawstBerryTree_3), - obj_frame_tiles(gFieldObjectPic_RawstBerryTree_4), - obj_frame_tiles(gFieldObjectPic_RawstBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_RawstBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_RawstBerryTree_0), + obj_frame_tiles(gEventObjectPic_RawstBerryTree_1), + obj_frame_tiles(gEventObjectPic_RawstBerryTree_2), + obj_frame_tiles(gEventObjectPic_RawstBerryTree_3), + obj_frame_tiles(gEventObjectPic_RawstBerryTree_4), + obj_frame_tiles(gEventObjectPic_RawstBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Rawst[] = {3, 4, 4, 4, 4}; -const struct SpriteFrameImage gFieldObjectPicTable_SpelonBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_SpelonBerryTree_0), - obj_frame_tiles(gFieldObjectPic_SpelonBerryTree_1), - obj_frame_tiles(gFieldObjectPic_SpelonBerryTree_2), - obj_frame_tiles(gFieldObjectPic_SpelonBerryTree_3), - obj_frame_tiles(gFieldObjectPic_SpelonBerryTree_4), - obj_frame_tiles(gFieldObjectPic_SpelonBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_SpelonBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_SpelonBerryTree_0), + obj_frame_tiles(gEventObjectPic_SpelonBerryTree_1), + obj_frame_tiles(gEventObjectPic_SpelonBerryTree_2), + obj_frame_tiles(gEventObjectPic_SpelonBerryTree_3), + obj_frame_tiles(gEventObjectPic_SpelonBerryTree_4), + obj_frame_tiles(gEventObjectPic_SpelonBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Spelon[] = {3, 4, 3, 3, 3}; -const struct SpriteFrameImage gFieldObjectPicTable_ChestoBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_ChestoBerryTree_0), - obj_frame_tiles(gFieldObjectPic_ChestoBerryTree_1), - obj_frame_tiles(gFieldObjectPic_ChestoBerryTree_2), - obj_frame_tiles(gFieldObjectPic_ChestoBerryTree_3), - obj_frame_tiles(gFieldObjectPic_ChestoBerryTree_4), - obj_frame_tiles(gFieldObjectPic_ChestoBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_ChestoBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_ChestoBerryTree_0), + obj_frame_tiles(gEventObjectPic_ChestoBerryTree_1), + obj_frame_tiles(gEventObjectPic_ChestoBerryTree_2), + obj_frame_tiles(gEventObjectPic_ChestoBerryTree_3), + obj_frame_tiles(gEventObjectPic_ChestoBerryTree_4), + obj_frame_tiles(gEventObjectPic_ChestoBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Chesto[] = {3, 4, 2, 2, 2}; -const struct SpriteFrameImage gFieldObjectPicTable_OranBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_OranBerryTree_0), - obj_frame_tiles(gFieldObjectPic_OranBerryTree_1), - obj_frame_tiles(gFieldObjectPic_OranBerryTree_2), - obj_frame_tiles(gFieldObjectPic_OranBerryTree_3), - obj_frame_tiles(gFieldObjectPic_OranBerryTree_4), - obj_frame_tiles(gFieldObjectPic_OranBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_OranBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_OranBerryTree_0), + obj_frame_tiles(gEventObjectPic_OranBerryTree_1), + obj_frame_tiles(gEventObjectPic_OranBerryTree_2), + obj_frame_tiles(gEventObjectPic_OranBerryTree_3), + obj_frame_tiles(gEventObjectPic_OranBerryTree_4), + obj_frame_tiles(gEventObjectPic_OranBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Oran[] = {3, 4, 2, 2, 2}; -const struct SpriteFrameImage gFieldObjectPicTable_PersimBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_PersimBerryTree_0), - obj_frame_tiles(gFieldObjectPic_PersimBerryTree_1), - obj_frame_tiles(gFieldObjectPic_PersimBerryTree_2), - obj_frame_tiles(gFieldObjectPic_PersimBerryTree_3), - obj_frame_tiles(gFieldObjectPic_PersimBerryTree_4), - obj_frame_tiles(gFieldObjectPic_PersimBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_PersimBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_PersimBerryTree_0), + obj_frame_tiles(gEventObjectPic_PersimBerryTree_1), + obj_frame_tiles(gEventObjectPic_PersimBerryTree_2), + obj_frame_tiles(gEventObjectPic_PersimBerryTree_3), + obj_frame_tiles(gEventObjectPic_PersimBerryTree_4), + obj_frame_tiles(gEventObjectPic_PersimBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Persim[] = {3, 4, 2, 2, 2}; -const struct SpriteFrameImage gFieldObjectPicTable_SitrusBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_SitrusBerryTree_0), - obj_frame_tiles(gFieldObjectPic_SitrusBerryTree_1), - obj_frame_tiles(gFieldObjectPic_SitrusBerryTree_2), - obj_frame_tiles(gFieldObjectPic_SitrusBerryTree_3), - obj_frame_tiles(gFieldObjectPic_SitrusBerryTree_4), - obj_frame_tiles(gFieldObjectPic_SitrusBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_SitrusBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_SitrusBerryTree_0), + obj_frame_tiles(gEventObjectPic_SitrusBerryTree_1), + obj_frame_tiles(gEventObjectPic_SitrusBerryTree_2), + obj_frame_tiles(gEventObjectPic_SitrusBerryTree_3), + obj_frame_tiles(gEventObjectPic_SitrusBerryTree_4), + obj_frame_tiles(gEventObjectPic_SitrusBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Sitrus[] = {3, 4, 4, 4, 4}; -const struct SpriteFrameImage gFieldObjectPicTable_AspearBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_AspearBerryTree_0), - obj_frame_tiles(gFieldObjectPic_AspearBerryTree_1), - obj_frame_tiles(gFieldObjectPic_AspearBerryTree_2), - obj_frame_tiles(gFieldObjectPic_AspearBerryTree_3), - obj_frame_tiles(gFieldObjectPic_AspearBerryTree_4), - obj_frame_tiles(gFieldObjectPic_AspearBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_AspearBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_AspearBerryTree_0), + obj_frame_tiles(gEventObjectPic_AspearBerryTree_1), + obj_frame_tiles(gEventObjectPic_AspearBerryTree_2), + obj_frame_tiles(gEventObjectPic_AspearBerryTree_3), + obj_frame_tiles(gEventObjectPic_AspearBerryTree_4), + obj_frame_tiles(gEventObjectPic_AspearBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Aspear[] = {3, 4, 3, 3, 3}; -const struct SpriteFrameImage gFieldObjectPicTable_PamtreBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_PamtreBerryTree_0), - obj_frame_tiles(gFieldObjectPic_PamtreBerryTree_1), - obj_frame_tiles(gFieldObjectPic_PamtreBerryTree_2), - obj_frame_tiles(gFieldObjectPic_PamtreBerryTree_3), - obj_frame_tiles(gFieldObjectPic_PamtreBerryTree_4), - obj_frame_tiles(gFieldObjectPic_PamtreBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_PamtreBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_PamtreBerryTree_0), + obj_frame_tiles(gEventObjectPic_PamtreBerryTree_1), + obj_frame_tiles(gEventObjectPic_PamtreBerryTree_2), + obj_frame_tiles(gEventObjectPic_PamtreBerryTree_3), + obj_frame_tiles(gEventObjectPic_PamtreBerryTree_4), + obj_frame_tiles(gEventObjectPic_PamtreBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Pamtre[] = {3, 4, 2, 2, 2}; -const struct SpriteFrameImage gFieldObjectPicTable_CornnBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_CornnBerryTree_0), - obj_frame_tiles(gFieldObjectPic_CornnBerryTree_1), - obj_frame_tiles(gFieldObjectPic_CornnBerryTree_2), - obj_frame_tiles(gFieldObjectPic_CornnBerryTree_3), - obj_frame_tiles(gFieldObjectPic_CornnBerryTree_4), - obj_frame_tiles(gFieldObjectPic_CornnBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_CornnBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_CornnBerryTree_0), + obj_frame_tiles(gEventObjectPic_CornnBerryTree_1), + obj_frame_tiles(gEventObjectPic_CornnBerryTree_2), + obj_frame_tiles(gEventObjectPic_CornnBerryTree_3), + obj_frame_tiles(gEventObjectPic_CornnBerryTree_4), + obj_frame_tiles(gEventObjectPic_CornnBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Cornn[] = {3, 4, 2, 2, 2}; -const struct SpriteFrameImage gFieldObjectPicTable_LansatBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_LansatBerryTree_0), - obj_frame_tiles(gFieldObjectPic_LansatBerryTree_1), - obj_frame_tiles(gFieldObjectPic_LansatBerryTree_2), - obj_frame_tiles(gFieldObjectPic_LansatBerryTree_3), - obj_frame_tiles(gFieldObjectPic_LansatBerryTree_4), - obj_frame_tiles(gFieldObjectPic_LansatBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_LansatBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_LansatBerryTree_0), + obj_frame_tiles(gEventObjectPic_LansatBerryTree_1), + obj_frame_tiles(gEventObjectPic_LansatBerryTree_2), + obj_frame_tiles(gEventObjectPic_LansatBerryTree_3), + obj_frame_tiles(gEventObjectPic_LansatBerryTree_4), + obj_frame_tiles(gEventObjectPic_LansatBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Lansat[] = {3, 4, 2, 2, 2}; -const struct SpriteFrameImage gFieldObjectPicTable_DurinBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_DurinBerryTree_0), - obj_frame_tiles(gFieldObjectPic_DurinBerryTree_1), - obj_frame_tiles(gFieldObjectPic_DurinBerryTree_2), - obj_frame_tiles(gFieldObjectPic_DurinBerryTree_3), - obj_frame_tiles(gFieldObjectPic_DurinBerryTree_4), - obj_frame_tiles(gFieldObjectPic_DurinBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_DurinBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_DurinBerryTree_0), + obj_frame_tiles(gEventObjectPic_DurinBerryTree_1), + obj_frame_tiles(gEventObjectPic_DurinBerryTree_2), + obj_frame_tiles(gEventObjectPic_DurinBerryTree_3), + obj_frame_tiles(gEventObjectPic_DurinBerryTree_4), + obj_frame_tiles(gEventObjectPic_DurinBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Durin[] = {3, 4, 4, 4, 4}; -const struct SpriteFrameImage gFieldObjectPicTable_TamatoBerryTree[] = { - obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gFieldObjectPic_TamatoBerryTree_0), - obj_frame_tiles(gFieldObjectPic_TamatoBerryTree_1), - obj_frame_tiles(gFieldObjectPic_TamatoBerryTree_2), - obj_frame_tiles(gFieldObjectPic_TamatoBerryTree_3), - obj_frame_tiles(gFieldObjectPic_TamatoBerryTree_4), - obj_frame_tiles(gFieldObjectPic_TamatoBerryTree_5), +const struct SpriteFrameImage gEventObjectPicTable_TamatoBerryTree[] = { + obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), + obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), + obj_frame_tiles(gEventObjectPic_TamatoBerryTree_0), + obj_frame_tiles(gEventObjectPic_TamatoBerryTree_1), + obj_frame_tiles(gEventObjectPic_TamatoBerryTree_2), + obj_frame_tiles(gEventObjectPic_TamatoBerryTree_3), + obj_frame_tiles(gEventObjectPic_TamatoBerryTree_4), + obj_frame_tiles(gEventObjectPic_TamatoBerryTree_5), }; const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2}; -const u8 gDeadBerryTreeFieldObjectGraphicsIdTable[] = {MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES, MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES, MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES, MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES, MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES}; +const u8 gDeadBerryTreeEventObjectGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES}; -const u8 gBerryTreeFieldObjectGraphicsIdTable[] = {MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES, MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES, MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES, MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES, MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES}; +const u8 gBerryTreeEventObjectGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES}; const struct SpriteFrameImage *const gBerryTreePicTablePointers[] = { - gFieldObjectPicTable_CheriBerryTree, - gFieldObjectPicTable_ChestoBerryTree, - gFieldObjectPicTable_PechaBerryTree, - gFieldObjectPicTable_RawstBerryTree, - gFieldObjectPicTable_AspearBerryTree, - gFieldObjectPicTable_LeppaBerryTree, - gFieldObjectPicTable_OranBerryTree, - gFieldObjectPicTable_PersimBerryTree, - gFieldObjectPicTable_LumBerryTree, - gFieldObjectPicTable_SitrusBerryTree, - gFieldObjectPicTable_FigyBerryTree, - gFieldObjectPicTable_WikiBerryTree, - gFieldObjectPicTable_MagoBerryTree, - gFieldObjectPicTable_AguavBerryTree, - gFieldObjectPicTable_IapapaBerryTree, - gFieldObjectPicTable_RazzBerryTree, - gFieldObjectPicTable_RazzBerryTree, - gFieldObjectPicTable_MagoBerryTree, - gFieldObjectPicTable_WepearBerryTree, - gFieldObjectPicTable_IapapaBerryTree, - gFieldObjectPicTable_PomegBerryTree, - gFieldObjectPicTable_KelpsyBerryTree, - gFieldObjectPicTable_WepearBerryTree, - gFieldObjectPicTable_HondewBerryTree, - gFieldObjectPicTable_GrepaBerryTree, - gFieldObjectPicTable_TamatoBerryTree, - gFieldObjectPicTable_CornnBerryTree, - gFieldObjectPicTable_PomegBerryTree, - gFieldObjectPicTable_RabutaBerryTree, - gFieldObjectPicTable_NomelBerryTree, - gFieldObjectPicTable_SpelonBerryTree, - gFieldObjectPicTable_PamtreBerryTree, - gFieldObjectPicTable_RabutaBerryTree, - gFieldObjectPicTable_DurinBerryTree, - gFieldObjectPicTable_HondewBerryTree, - gFieldObjectPicTable_LiechiBerryTree, - gFieldObjectPicTable_HondewBerryTree, - gFieldObjectPicTable_AguavBerryTree, - gFieldObjectPicTable_PomegBerryTree, - gFieldObjectPicTable_GrepaBerryTree, - gFieldObjectPicTable_LansatBerryTree, - gFieldObjectPicTable_CornnBerryTree, - gFieldObjectPicTable_DurinBerryTree, + gEventObjectPicTable_CheriBerryTree, + gEventObjectPicTable_ChestoBerryTree, + gEventObjectPicTable_PechaBerryTree, + gEventObjectPicTable_RawstBerryTree, + gEventObjectPicTable_AspearBerryTree, + gEventObjectPicTable_LeppaBerryTree, + gEventObjectPicTable_OranBerryTree, + gEventObjectPicTable_PersimBerryTree, + gEventObjectPicTable_LumBerryTree, + gEventObjectPicTable_SitrusBerryTree, + gEventObjectPicTable_FigyBerryTree, + gEventObjectPicTable_WikiBerryTree, + gEventObjectPicTable_MagoBerryTree, + gEventObjectPicTable_AguavBerryTree, + gEventObjectPicTable_IapapaBerryTree, + gEventObjectPicTable_RazzBerryTree, + gEventObjectPicTable_RazzBerryTree, + gEventObjectPicTable_MagoBerryTree, + gEventObjectPicTable_WepearBerryTree, + gEventObjectPicTable_IapapaBerryTree, + gEventObjectPicTable_PomegBerryTree, + gEventObjectPicTable_KelpsyBerryTree, + gEventObjectPicTable_WepearBerryTree, + gEventObjectPicTable_HondewBerryTree, + gEventObjectPicTable_GrepaBerryTree, + gEventObjectPicTable_TamatoBerryTree, + gEventObjectPicTable_CornnBerryTree, + gEventObjectPicTable_PomegBerryTree, + gEventObjectPicTable_RabutaBerryTree, + gEventObjectPicTable_NomelBerryTree, + gEventObjectPicTable_SpelonBerryTree, + gEventObjectPicTable_PamtreBerryTree, + gEventObjectPicTable_RabutaBerryTree, + gEventObjectPicTable_DurinBerryTree, + gEventObjectPicTable_HondewBerryTree, + gEventObjectPicTable_LiechiBerryTree, + gEventObjectPicTable_HondewBerryTree, + gEventObjectPicTable_AguavBerryTree, + gEventObjectPicTable_PomegBerryTree, + gEventObjectPicTable_GrepaBerryTree, + gEventObjectPicTable_LansatBerryTree, + gEventObjectPicTable_CornnBerryTree, + gEventObjectPicTable_DurinBerryTree, }; const u8 *const gBerryTreePaletteSlotTablePointers[] = { @@ -517,53 +517,53 @@ const u8 *const gBerryTreePaletteSlotTablePointers[] = { gBerryTreePaletteSlotTable_Durin, }; -const u8 *const gBerryTreeFieldObjectGraphicsIdTablePointers[] = { - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, - gBerryTreeFieldObjectGraphicsIdTable, +const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[] = { + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, + gBerryTreeEventObjectGraphicsIdTable, }; diff --git a/src/data/field_event_obj/event_object_anims.h b/src/data/field_event_obj/event_object_anims.h index 3857bf815d..9b897651d5 100755 --- a/src/data/field_event_obj/event_object_anims.h +++ b/src/data/field_event_obj/event_object_anims.h @@ -1,7 +1,7 @@ #ifndef GUARD_EVENT_OBJECT_ANIMS_H #define GUARD_EVENT_OBJECT_ANIMS_H -const union AnimCmd gFieldObjectImageAnim_StayStill[] = +const union AnimCmd gEventObjectImageAnim_StayStill[] = { ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(0, 8), @@ -10,31 +10,31 @@ const union AnimCmd gFieldObjectImageAnim_StayStill[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_QuintyPlumpFaceSouth[] = +const union AnimCmd gEventObjectImageAnim_QuintyPlumpFaceSouth[] = { ANIMCMD_FRAME(0, 16), ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_QuintyPlumpFaceNorth[] = +const union AnimCmd gEventObjectImageAnim_QuintyPlumpFaceNorth[] = { ANIMCMD_FRAME(1, 16), ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_QuintyPlumpFaceWest[] = +const union AnimCmd gEventObjectImageAnim_QuintyPlumpFaceWest[] = { ANIMCMD_FRAME(2, 16), ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_QuintyPlumpFaceEast[] = +const union AnimCmd gEventObjectImageAnim_QuintyPlumpFaceEast[] = { ANIMCMD_FRAME(2, 16, .hFlip = TRUE), ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoSouth[] = +const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoSouth[] = { ANIMCMD_FRAME(3, 8), ANIMCMD_FRAME(0, 8), @@ -43,7 +43,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoSouth[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoNorth[] = +const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoNorth[] = { ANIMCMD_FRAME(4, 8), ANIMCMD_FRAME(1, 8), @@ -52,7 +52,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoNorth[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoWest[] = +const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoWest[] = { ANIMCMD_FRAME(5, 8), ANIMCMD_FRAME(2, 8), @@ -61,7 +61,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoWest[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoEast[] = +const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoEast[] = { ANIMCMD_FRAME(5, 8, .hFlip = TRUE), ANIMCMD_FRAME(2, 8, .hFlip = TRUE), @@ -70,7 +70,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoEast[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastSouth[] = +const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastSouth[] = { ANIMCMD_FRAME(3, 4), ANIMCMD_FRAME(0, 4), @@ -79,7 +79,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastSouth[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastNorth[] = +const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastNorth[] = { ANIMCMD_FRAME(4, 4), ANIMCMD_FRAME(1, 4), @@ -88,7 +88,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastNorth[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastWest[] = +const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastWest[] = { ANIMCMD_FRAME(5, 4), ANIMCMD_FRAME(2, 4), @@ -97,7 +97,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastWest[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastEast[] = +const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastEast[] = { ANIMCMD_FRAME(5, 4, .hFlip = TRUE), ANIMCMD_FRAME(2, 4, .hFlip = TRUE), @@ -106,7 +106,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastEast[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFasterSouth[] = +const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFasterSouth[] = { ANIMCMD_FRAME(3, 2), ANIMCMD_FRAME(0, 2), @@ -115,7 +115,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFasterSouth[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFasterNorth[] = +const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFasterNorth[] = { ANIMCMD_FRAME(4, 2), ANIMCMD_FRAME(1, 2), @@ -124,7 +124,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFasterNorth[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFasterWest[] = +const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFasterWest[] = { ANIMCMD_FRAME(5, 2), ANIMCMD_FRAME(2, 2), @@ -133,7 +133,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFasterWest[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFasterEast[] = +const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFasterEast[] = { ANIMCMD_FRAME(5, 2, .hFlip = TRUE), ANIMCMD_FRAME(2, 2, .hFlip = TRUE), @@ -142,7 +142,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFasterEast[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastestSouth[] = +const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastestSouth[] = { ANIMCMD_FRAME(3, 1), ANIMCMD_FRAME(0, 1), @@ -151,7 +151,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastestSouth[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastestNorth[] = +const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastestNorth[] = { ANIMCMD_FRAME(4, 1), ANIMCMD_FRAME(1, 1), @@ -160,7 +160,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastestNorth[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastestWest[] = +const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastestWest[] = { ANIMCMD_FRAME(5, 1), ANIMCMD_FRAME(2, 1), @@ -169,7 +169,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastestWest[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastestEast[] = +const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastestEast[] = { ANIMCMD_FRAME(5, 1, .hFlip = TRUE), ANIMCMD_FRAME(2, 1, .hFlip = TRUE), @@ -178,31 +178,31 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastestEast[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_FaceSouth[] = +const union AnimCmd gEventObjectImageAnim_FaceSouth[] = { ANIMCMD_FRAME(0, 16), ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_FaceNorth[] = +const union AnimCmd gEventObjectImageAnim_FaceNorth[] = { ANIMCMD_FRAME(1, 16), ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_FaceWest[] = +const union AnimCmd gEventObjectImageAnim_FaceWest[] = { ANIMCMD_FRAME(2, 16), ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_FaceEast[] = +const union AnimCmd gEventObjectImageAnim_FaceEast[] = { ANIMCMD_FRAME(2, 16, .hFlip = TRUE), ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_GoSouth[] = +const union AnimCmd gEventObjectImageAnim_GoSouth[] = { ANIMCMD_FRAME(3, 8), ANIMCMD_FRAME(0, 8), @@ -211,7 +211,7 @@ const union AnimCmd gFieldObjectImageAnim_GoSouth[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_GoNorth[] = +const union AnimCmd gEventObjectImageAnim_GoNorth[] = { ANIMCMD_FRAME(5, 8), ANIMCMD_FRAME(1, 8), @@ -220,7 +220,7 @@ const union AnimCmd gFieldObjectImageAnim_GoNorth[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_GoWest[] = +const union AnimCmd gEventObjectImageAnim_GoWest[] = { ANIMCMD_FRAME(7, 8), ANIMCMD_FRAME(2, 8), @@ -229,7 +229,7 @@ const union AnimCmd gFieldObjectImageAnim_GoWest[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_GoEast[] = +const union AnimCmd gEventObjectImageAnim_GoEast[] = { ANIMCMD_FRAME(7, 8, .hFlip = TRUE), ANIMCMD_FRAME(2, 8, .hFlip = TRUE), @@ -238,7 +238,7 @@ const union AnimCmd gFieldObjectImageAnim_GoEast[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_GoFastSouth[] = +const union AnimCmd gEventObjectImageAnim_GoFastSouth[] = { ANIMCMD_FRAME(3, 4), ANIMCMD_FRAME(0, 4), @@ -247,7 +247,7 @@ const union AnimCmd gFieldObjectImageAnim_GoFastSouth[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_GoFastNorth[] = +const union AnimCmd gEventObjectImageAnim_GoFastNorth[] = { ANIMCMD_FRAME(5, 4), ANIMCMD_FRAME(1, 4), @@ -256,7 +256,7 @@ const union AnimCmd gFieldObjectImageAnim_GoFastNorth[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_GoFastWest[] = +const union AnimCmd gEventObjectImageAnim_GoFastWest[] = { ANIMCMD_FRAME(7, 4), ANIMCMD_FRAME(2, 4), @@ -265,7 +265,7 @@ const union AnimCmd gFieldObjectImageAnim_GoFastWest[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_GoFastEast[] = +const union AnimCmd gEventObjectImageAnim_GoFastEast[] = { ANIMCMD_FRAME(7, 4, .hFlip = TRUE), ANIMCMD_FRAME(2, 4, .hFlip = TRUE), @@ -274,7 +274,7 @@ const union AnimCmd gFieldObjectImageAnim_GoFastEast[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_GoFasterSouth[] = +const union AnimCmd gEventObjectImageAnim_GoFasterSouth[] = { ANIMCMD_FRAME(3, 2), ANIMCMD_FRAME(0, 2), @@ -283,7 +283,7 @@ const union AnimCmd gFieldObjectImageAnim_GoFasterSouth[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_GoFasterNorth[] = +const union AnimCmd gEventObjectImageAnim_GoFasterNorth[] = { ANIMCMD_FRAME(5, 2), ANIMCMD_FRAME(1, 2), @@ -292,7 +292,7 @@ const union AnimCmd gFieldObjectImageAnim_GoFasterNorth[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_GoFasterWest[] = +const union AnimCmd gEventObjectImageAnim_GoFasterWest[] = { ANIMCMD_FRAME(7, 2), ANIMCMD_FRAME(2, 2), @@ -301,7 +301,7 @@ const union AnimCmd gFieldObjectImageAnim_GoFasterWest[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_GoFasterEast[] = +const union AnimCmd gEventObjectImageAnim_GoFasterEast[] = { ANIMCMD_FRAME(7, 2, .hFlip = TRUE), ANIMCMD_FRAME(2, 2, .hFlip = TRUE), @@ -310,7 +310,7 @@ const union AnimCmd gFieldObjectImageAnim_GoFasterEast[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_GoFastestSouth[] = +const union AnimCmd gEventObjectImageAnim_GoFastestSouth[] = { ANIMCMD_FRAME(3, 1), ANIMCMD_FRAME(0, 1), @@ -319,7 +319,7 @@ const union AnimCmd gFieldObjectImageAnim_GoFastestSouth[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_GoFastestNorth[] = +const union AnimCmd gEventObjectImageAnim_GoFastestNorth[] = { ANIMCMD_FRAME(5, 1), ANIMCMD_FRAME(1, 1), @@ -328,7 +328,7 @@ const union AnimCmd gFieldObjectImageAnim_GoFastestNorth[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_GoFastestWest[] = +const union AnimCmd gEventObjectImageAnim_GoFastestWest[] = { ANIMCMD_FRAME(7, 1), ANIMCMD_FRAME(2, 1), @@ -337,7 +337,7 @@ const union AnimCmd gFieldObjectImageAnim_GoFastestWest[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_GoFastestEast[] = +const union AnimCmd gEventObjectImageAnim_GoFastestEast[] = { ANIMCMD_FRAME(7, 1, .hFlip = TRUE), ANIMCMD_FRAME(2, 1, .hFlip = TRUE), @@ -346,7 +346,7 @@ const union AnimCmd gFieldObjectImageAnim_GoFastestEast[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_RunSouth[] = +const union AnimCmd gEventObjectImageAnim_RunSouth[] = { ANIMCMD_FRAME(12, 5), ANIMCMD_FRAME(9, 3), @@ -355,7 +355,7 @@ const union AnimCmd gFieldObjectImageAnim_RunSouth[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_RunNorth[] = +const union AnimCmd gEventObjectImageAnim_RunNorth[] = { ANIMCMD_FRAME(14, 5), ANIMCMD_FRAME(10, 3), @@ -364,7 +364,7 @@ const union AnimCmd gFieldObjectImageAnim_RunNorth[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_RunWest[] = +const union AnimCmd gEventObjectImageAnim_RunWest[] = { ANIMCMD_FRAME(16, 5), ANIMCMD_FRAME(11, 3), @@ -373,7 +373,7 @@ const union AnimCmd gFieldObjectImageAnim_RunWest[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_RunEast[] = +const union AnimCmd gEventObjectImageAnim_RunEast[] = { ANIMCMD_FRAME(16, 5, .hFlip = TRUE), ANIMCMD_FRAME(11, 3, .hFlip = TRUE), @@ -382,7 +382,7 @@ const union AnimCmd gFieldObjectImageAnim_RunEast[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_FieldMove[] = +const union AnimCmd gEventObjectImageAnim_FieldMove[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -392,143 +392,143 @@ const union AnimCmd gFieldObjectImageAnim_FieldMove[] = ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_GetOnOffSurfBlobSouth[] = +const union AnimCmd gEventObjectImageAnim_GetOnOffSurfBlobSouth[] = { ANIMCMD_FRAME(9, 32), ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_GetOnOffSurfBlobNorth[] = +const union AnimCmd gEventObjectImageAnim_GetOnOffSurfBlobNorth[] = { ANIMCMD_FRAME(10, 32), ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_GetOnOffSurfBlobWest[] = +const union AnimCmd gEventObjectImageAnim_GetOnOffSurfBlobWest[] = { ANIMCMD_FRAME(11, 32), ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_GetOnOffSurfBlobEast[] = +const union AnimCmd gEventObjectImageAnim_GetOnOffSurfBlobEast[] = { ANIMCMD_FRAME(11, 32, .hFlip = TRUE), ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_BunnyHoppyBackWheelSouth[] = +const union AnimCmd gEventObjectImageAnim_BunnyHoppyBackWheelSouth[] = { ANIMCMD_FRAME(9, 4), ANIMCMD_FRAME(10, 4), ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_BunnyHoppyBackWheelNorth[] = +const union AnimCmd gEventObjectImageAnim_BunnyHoppyBackWheelNorth[] = { ANIMCMD_FRAME(13, 4), ANIMCMD_FRAME(14, 4), ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_BunnyHoppyBackWheelWest[] = +const union AnimCmd gEventObjectImageAnim_BunnyHoppyBackWheelWest[] = { ANIMCMD_FRAME(17, 4), ANIMCMD_FRAME(18, 4), ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_BunnyHoppyBackWheelEast[] = +const union AnimCmd gEventObjectImageAnim_BunnyHoppyBackWheelEast[] = { ANIMCMD_FRAME(17, 4, .hFlip = TRUE), ANIMCMD_FRAME(18, 4, .hFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_BunnyHoppyFrontWheelSouth[] = +const union AnimCmd gEventObjectImageAnim_BunnyHoppyFrontWheelSouth[] = { ANIMCMD_FRAME(11, 4), ANIMCMD_FRAME(12, 4), ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_BunnyHoppyFrontWheelNorth[] = +const union AnimCmd gEventObjectImageAnim_BunnyHoppyFrontWheelNorth[] = { ANIMCMD_FRAME(15, 4), ANIMCMD_FRAME(16, 4), ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_BunnyHoppyFrontWheelWest[] = +const union AnimCmd gEventObjectImageAnim_BunnyHoppyFrontWheelWest[] = { ANIMCMD_FRAME(19, 4), ANIMCMD_FRAME(20, 4), ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_BunnyHoppyFrontWheelEast[] = +const union AnimCmd gEventObjectImageAnim_BunnyHoppyFrontWheelEast[] = { ANIMCMD_FRAME(19, 4, .hFlip = TRUE), ANIMCMD_FRAME(20, 4, .hFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_StandingWheelieBackWheelSouth[] = +const union AnimCmd gEventObjectImageAnim_StandingWheelieBackWheelSouth[] = { ANIMCMD_FRAME(9, 4), ANIMCMD_FRAME(0, 4), ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_StandingWheelieBackWheelNorth[] = +const union AnimCmd gEventObjectImageAnim_StandingWheelieBackWheelNorth[] = { ANIMCMD_FRAME(13, 4), ANIMCMD_FRAME(1, 4), ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_StandingWheelieBackWheelWest[] = +const union AnimCmd gEventObjectImageAnim_StandingWheelieBackWheelWest[] = { ANIMCMD_FRAME(17, 4), ANIMCMD_FRAME(2, 4), ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_StandingWheelieBackWheelEast[] = +const union AnimCmd gEventObjectImageAnim_StandingWheelieBackWheelEast[] = { ANIMCMD_FRAME(17, 4, .hFlip = TRUE), ANIMCMD_FRAME(2, 4, .hFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_StandingWheelieFrontWheelSouth[] = +const union AnimCmd gEventObjectImageAnim_StandingWheelieFrontWheelSouth[] = { ANIMCMD_FRAME(11, 4), ANIMCMD_FRAME(0, 4), ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_StandingWheelieFrontWheelNorth[] = +const union AnimCmd gEventObjectImageAnim_StandingWheelieFrontWheelNorth[] = { ANIMCMD_FRAME(15, 4), ANIMCMD_FRAME(1, 4), ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_StandingWheelieFrontWheelWest[] = +const union AnimCmd gEventObjectImageAnim_StandingWheelieFrontWheelWest[] = { ANIMCMD_FRAME(19, 4), ANIMCMD_FRAME(2, 4), ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_StandingWheelieFrontWheelEast[] = +const union AnimCmd gEventObjectImageAnim_StandingWheelieFrontWheelEast[] = { ANIMCMD_FRAME(19, 4, .hFlip = TRUE), ANIMCMD_FRAME(2, 4, .hFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_MovingWheelieSouth[] = +const union AnimCmd gEventObjectImageAnim_MovingWheelieSouth[] = { ANIMCMD_FRAME(21, 4), ANIMCMD_FRAME(10, 4), @@ -537,7 +537,7 @@ const union AnimCmd gFieldObjectImageAnim_MovingWheelieSouth[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_MovingWheelieNorth[] = +const union AnimCmd gEventObjectImageAnim_MovingWheelieNorth[] = { ANIMCMD_FRAME(23, 4), ANIMCMD_FRAME(14, 4), @@ -546,7 +546,7 @@ const union AnimCmd gFieldObjectImageAnim_MovingWheelieNorth[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_MovingWheelieWest[] = +const union AnimCmd gEventObjectImageAnim_MovingWheelieWest[] = { ANIMCMD_FRAME(25, 4), ANIMCMD_FRAME(18, 4), @@ -555,7 +555,7 @@ const union AnimCmd gFieldObjectImageAnim_MovingWheelieWest[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_MovingWheelieEast[] = +const union AnimCmd gEventObjectImageAnim_MovingWheelieEast[] = { ANIMCMD_FRAME(25, 4, .hFlip = TRUE), ANIMCMD_FRAME(18, 4, .hFlip = TRUE), @@ -564,27 +564,27 @@ const union AnimCmd gFieldObjectImageAnim_MovingWheelieEast[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_BerryTreeStage0[] = +const union AnimCmd gEventObjectImageAnim_BerryTreeStage0[] = { ANIMCMD_FRAME(0, 32), ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_BerryTreeStage1[] = +const union AnimCmd gEventObjectImageAnim_BerryTreeStage1[] = { ANIMCMD_FRAME(1, 32), ANIMCMD_FRAME(2, 32), ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_BerryTreeStage2[] = +const union AnimCmd gEventObjectImageAnim_BerryTreeStage2[] = { ANIMCMD_FRAME(3, 48), ANIMCMD_FRAME(4, 48), ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_BerryTreeStage3[] = +const union AnimCmd gEventObjectImageAnim_BerryTreeStage3[] = { ANIMCMD_FRAME(5, 32), ANIMCMD_FRAME(5, 32), @@ -593,7 +593,7 @@ const union AnimCmd gFieldObjectImageAnim_BerryTreeStage3[] = ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_BerryTreeStage4[] = +const union AnimCmd gEventObjectImageAnim_BerryTreeStage4[] = { ANIMCMD_FRAME(7, 48), ANIMCMD_FRAME(7, 48), @@ -602,7 +602,7 @@ const union AnimCmd gFieldObjectImageAnim_BerryTreeStage4[] = ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_NurseBow[] = +const union AnimCmd gEventObjectImageAnim_NurseBow[] = { ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(9, 32), @@ -610,7 +610,7 @@ const union AnimCmd gFieldObjectImageAnim_NurseBow[] = ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_RockBreak[] = +const union AnimCmd gEventObjectImageAnim_RockBreak[] = { ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(1, 8), @@ -619,7 +619,7 @@ const union AnimCmd gFieldObjectImageAnim_RockBreak[] = ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_TreeCut[] = +const union AnimCmd gEventObjectImageAnim_TreeCut[] = { ANIMCMD_FRAME(0, 6), ANIMCMD_FRAME(1, 6), @@ -628,7 +628,7 @@ const union AnimCmd gFieldObjectImageAnim_TreeCut[] = ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_TakeOutRodSouth[] = +const union AnimCmd gEventObjectImageAnim_TakeOutRodSouth[] = { ANIMCMD_FRAME(8, 4), ANIMCMD_FRAME(9, 4), @@ -637,7 +637,7 @@ const union AnimCmd gFieldObjectImageAnim_TakeOutRodSouth[] = ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_TakeOutRodNorth[] = +const union AnimCmd gEventObjectImageAnim_TakeOutRodNorth[] = { ANIMCMD_FRAME(4, 4), ANIMCMD_FRAME(5, 4), @@ -646,7 +646,7 @@ const union AnimCmd gFieldObjectImageAnim_TakeOutRodNorth[] = ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_TakeOutRodWest[] = +const union AnimCmd gEventObjectImageAnim_TakeOutRodWest[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -655,7 +655,7 @@ const union AnimCmd gFieldObjectImageAnim_TakeOutRodWest[] = ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_TakeOutRodEast[] = +const union AnimCmd gEventObjectImageAnim_TakeOutRodEast[] = { ANIMCMD_FRAME(0, 4, .hFlip = TRUE), ANIMCMD_FRAME(1, 4, .hFlip = TRUE), @@ -664,7 +664,7 @@ const union AnimCmd gFieldObjectImageAnim_TakeOutRodEast[] = ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_PutAwayRodSouth[] = +const union AnimCmd gEventObjectImageAnim_PutAwayRodSouth[] = { ANIMCMD_FRAME(11, 4), ANIMCMD_FRAME(10, 6), @@ -673,7 +673,7 @@ const union AnimCmd gFieldObjectImageAnim_PutAwayRodSouth[] = ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_PutAwayRodNorth[] = +const union AnimCmd gEventObjectImageAnim_PutAwayRodNorth[] = { ANIMCMD_FRAME(7, 4), ANIMCMD_FRAME(6, 6), @@ -682,7 +682,7 @@ const union AnimCmd gFieldObjectImageAnim_PutAwayRodNorth[] = ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_PutAwayRodWest[] = +const union AnimCmd gEventObjectImageAnim_PutAwayRodWest[] = { ANIMCMD_FRAME(3, 4), ANIMCMD_FRAME(2, 4), @@ -691,7 +691,7 @@ const union AnimCmd gFieldObjectImageAnim_PutAwayRodWest[] = ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_PutAwayRodEast[] = +const union AnimCmd gEventObjectImageAnim_PutAwayRodEast[] = { ANIMCMD_FRAME(3, 4, .hFlip = TRUE), ANIMCMD_FRAME(2, 4, .hFlip = TRUE), @@ -700,7 +700,7 @@ const union AnimCmd gFieldObjectImageAnim_PutAwayRodEast[] = ANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_HookedPokemonSouth[] = +const union AnimCmd gEventObjectImageAnim_HookedPokemonSouth[] = { ANIMCMD_FRAME(10, 6), ANIMCMD_FRAME(11, 6), @@ -709,7 +709,7 @@ const union AnimCmd gFieldObjectImageAnim_HookedPokemonSouth[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_HookedPokemonNorth[] = +const union AnimCmd gEventObjectImageAnim_HookedPokemonNorth[] = { ANIMCMD_FRAME(6, 6), ANIMCMD_FRAME(7, 6), @@ -718,7 +718,7 @@ const union AnimCmd gFieldObjectImageAnim_HookedPokemonNorth[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_HookedPokemonWest[] = +const union AnimCmd gEventObjectImageAnim_HookedPokemonWest[] = { ANIMCMD_FRAME(2, 6), ANIMCMD_FRAME(3, 6), @@ -727,7 +727,7 @@ const union AnimCmd gFieldObjectImageAnim_HookedPokemonWest[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_HookedPokemonEast[] = +const union AnimCmd gEventObjectImageAnim_HookedPokemonEast[] = { ANIMCMD_FRAME(2, 6, .hFlip = TRUE), ANIMCMD_FRAME(3, 6, .hFlip = TRUE), @@ -736,7 +736,7 @@ const union AnimCmd gFieldObjectImageAnim_HookedPokemonEast[] = ANIMCMD_JUMP(0), }; -const union AffineAnimCmd gFieldObjectRotScalAnim_8508FD8[] = +const union AffineAnimCmd gEventObjectRotScalAnim_8508FD8[] = { AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), @@ -746,7 +746,7 @@ const union AffineAnimCmd gFieldObjectRotScalAnim_8508FD8[] = AFFINEANIMCMD_JUMP(0), }; -const union AffineAnimCmd gFieldObjectRotScalAnim_8509008[] = +const union AffineAnimCmd gEventObjectRotScalAnim_8509008[] = { AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1), AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), @@ -757,33 +757,33 @@ const union AffineAnimCmd gFieldObjectRotScalAnim_8509008[] = AFFINEANIMCMD_JUMP(0), }; -const union AffineAnimCmd gFieldObjectRotScalAnim_8509040[] = +const union AffineAnimCmd gEventObjectRotScalAnim_8509040[] = { AFFINEANIMCMD_FRAME(0x100, 0x100, 10, 0), AFFINEANIMCMD_END, }; -const union AffineAnimCmd gFieldObjectRotScalAnim_8509050[] = +const union AffineAnimCmd gEventObjectRotScalAnim_8509050[] = { AFFINEANIMCMD_FRAME(0x100, 0x100, 10, 0), AFFINEANIMCMD_END, }; -const union AffineAnimCmd gFieldObjectRotScalAnim_8509060[] = +const union AffineAnimCmd gEventObjectRotScalAnim_8509060[] = { AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1), AFFINEANIMCMD_LOOP(8), AFFINEANIMCMD_END, }; -const union AffineAnimCmd gFieldObjectRotScalAnim_8509078[] = +const union AffineAnimCmd gEventObjectRotScalAnim_8509078[] = { AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), AFFINEANIMCMD_LOOP(8), AFFINEANIMCMD_END, }; -const union AnimCmd gFieldObjectImageAnim_HoOhFlapWings[] = +const union AnimCmd gEventObjectImageAnim_HoOhFlapWings[] = { ANIMCMD_FRAME(3, 8), ANIMCMD_FRAME(4, 8), @@ -792,379 +792,379 @@ const union AnimCmd gFieldObjectImageAnim_HoOhFlapWings[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_HoOhStayStill[] = +const union AnimCmd gEventObjectImageAnim_HoOhStayStill[] = { ANIMCMD_FRAME(3, 16), ANIMCMD_JUMP(0), }; -const union AnimCmd *const gFieldObjectImageAnimTable_Inanimate[] = { - gFieldObjectImageAnim_StayStill, +const union AnimCmd *const gEventObjectImageAnimTable_Inanimate[] = { + gEventObjectImageAnim_StayStill, }; -const union AnimCmd *const gFieldObjectImageAnimTable_QuintyPlump[] = { - gFieldObjectImageAnim_QuintyPlumpFaceSouth, - gFieldObjectImageAnim_QuintyPlumpFaceNorth, - gFieldObjectImageAnim_QuintyPlumpFaceWest, - gFieldObjectImageAnim_QuintyPlumpFaceEast, - gFieldObjectImageAnim_QuintyPlumpGoSouth, - gFieldObjectImageAnim_QuintyPlumpGoNorth, - gFieldObjectImageAnim_QuintyPlumpGoWest, - gFieldObjectImageAnim_QuintyPlumpGoEast, - gFieldObjectImageAnim_QuintyPlumpGoFastSouth, - gFieldObjectImageAnim_QuintyPlumpGoFastNorth, - gFieldObjectImageAnim_QuintyPlumpGoFastWest, - gFieldObjectImageAnim_QuintyPlumpGoFastEast, - gFieldObjectImageAnim_QuintyPlumpGoFasterSouth, - gFieldObjectImageAnim_QuintyPlumpGoFasterNorth, - gFieldObjectImageAnim_QuintyPlumpGoFasterWest, - gFieldObjectImageAnim_QuintyPlumpGoFasterEast, - gFieldObjectImageAnim_QuintyPlumpGoFastestSouth, - gFieldObjectImageAnim_QuintyPlumpGoFastestNorth, - gFieldObjectImageAnim_QuintyPlumpGoFastestWest, - gFieldObjectImageAnim_QuintyPlumpGoFastestEast, +const union AnimCmd *const gEventObjectImageAnimTable_QuintyPlump[] = { + gEventObjectImageAnim_QuintyPlumpFaceSouth, + gEventObjectImageAnim_QuintyPlumpFaceNorth, + gEventObjectImageAnim_QuintyPlumpFaceWest, + gEventObjectImageAnim_QuintyPlumpFaceEast, + gEventObjectImageAnim_QuintyPlumpGoSouth, + gEventObjectImageAnim_QuintyPlumpGoNorth, + gEventObjectImageAnim_QuintyPlumpGoWest, + gEventObjectImageAnim_QuintyPlumpGoEast, + gEventObjectImageAnim_QuintyPlumpGoFastSouth, + gEventObjectImageAnim_QuintyPlumpGoFastNorth, + gEventObjectImageAnim_QuintyPlumpGoFastWest, + gEventObjectImageAnim_QuintyPlumpGoFastEast, + gEventObjectImageAnim_QuintyPlumpGoFasterSouth, + gEventObjectImageAnim_QuintyPlumpGoFasterNorth, + gEventObjectImageAnim_QuintyPlumpGoFasterWest, + gEventObjectImageAnim_QuintyPlumpGoFasterEast, + gEventObjectImageAnim_QuintyPlumpGoFastestSouth, + gEventObjectImageAnim_QuintyPlumpGoFastestNorth, + gEventObjectImageAnim_QuintyPlumpGoFastestWest, + gEventObjectImageAnim_QuintyPlumpGoFastestEast, }; -const union AnimCmd *const gFieldObjectImageAnimTable_Standard[] = { - gFieldObjectImageAnim_FaceSouth, - gFieldObjectImageAnim_FaceNorth, - gFieldObjectImageAnim_FaceWest, - gFieldObjectImageAnim_FaceEast, - gFieldObjectImageAnim_GoSouth, - gFieldObjectImageAnim_GoNorth, - gFieldObjectImageAnim_GoWest, - gFieldObjectImageAnim_GoEast, - gFieldObjectImageAnim_GoFastSouth, - gFieldObjectImageAnim_GoFastNorth, - gFieldObjectImageAnim_GoFastWest, - gFieldObjectImageAnim_GoFastEast, - gFieldObjectImageAnim_GoFasterSouth, - gFieldObjectImageAnim_GoFasterNorth, - gFieldObjectImageAnim_GoFasterWest, - gFieldObjectImageAnim_GoFasterEast, - gFieldObjectImageAnim_GoFastestSouth, - gFieldObjectImageAnim_GoFastestNorth, - gFieldObjectImageAnim_GoFastestWest, - gFieldObjectImageAnim_GoFastestEast, +const union AnimCmd *const gEventObjectImageAnimTable_Standard[] = { + gEventObjectImageAnim_FaceSouth, + gEventObjectImageAnim_FaceNorth, + gEventObjectImageAnim_FaceWest, + gEventObjectImageAnim_FaceEast, + gEventObjectImageAnim_GoSouth, + gEventObjectImageAnim_GoNorth, + gEventObjectImageAnim_GoWest, + gEventObjectImageAnim_GoEast, + gEventObjectImageAnim_GoFastSouth, + gEventObjectImageAnim_GoFastNorth, + gEventObjectImageAnim_GoFastWest, + gEventObjectImageAnim_GoFastEast, + gEventObjectImageAnim_GoFasterSouth, + gEventObjectImageAnim_GoFasterNorth, + gEventObjectImageAnim_GoFasterWest, + gEventObjectImageAnim_GoFasterEast, + gEventObjectImageAnim_GoFastestSouth, + gEventObjectImageAnim_GoFastestNorth, + gEventObjectImageAnim_GoFastestWest, + gEventObjectImageAnim_GoFastestEast, }; -const union AnimCmd *const gFieldObjectImageAnimTable_HoOh[] = { - gFieldObjectImageAnim_FaceSouth, - gFieldObjectImageAnim_FaceNorth, - gFieldObjectImageAnim_FaceWest, - gFieldObjectImageAnim_FaceEast, - gFieldObjectImageAnim_HoOhFlapWings, - gFieldObjectImageAnim_HoOhStayStill, - gFieldObjectImageAnim_GoWest, - gFieldObjectImageAnim_GoEast, - gFieldObjectImageAnim_GoFastSouth, - gFieldObjectImageAnim_GoFastNorth, - gFieldObjectImageAnim_GoFastWest, - gFieldObjectImageAnim_GoFastEast, - gFieldObjectImageAnim_GoFasterSouth, - gFieldObjectImageAnim_GoFasterNorth, - gFieldObjectImageAnim_GoFasterWest, - gFieldObjectImageAnim_GoFasterEast, - gFieldObjectImageAnim_GoFastestSouth, - gFieldObjectImageAnim_GoFastestNorth, - gFieldObjectImageAnim_GoFastestWest, - gFieldObjectImageAnim_GoFastestEast, +const union AnimCmd *const gEventObjectImageAnimTable_HoOh[] = { + gEventObjectImageAnim_FaceSouth, + gEventObjectImageAnim_FaceNorth, + gEventObjectImageAnim_FaceWest, + gEventObjectImageAnim_FaceEast, + gEventObjectImageAnim_HoOhFlapWings, + gEventObjectImageAnim_HoOhStayStill, + gEventObjectImageAnim_GoWest, + gEventObjectImageAnim_GoEast, + gEventObjectImageAnim_GoFastSouth, + gEventObjectImageAnim_GoFastNorth, + gEventObjectImageAnim_GoFastWest, + gEventObjectImageAnim_GoFastEast, + gEventObjectImageAnim_GoFasterSouth, + gEventObjectImageAnim_GoFasterNorth, + gEventObjectImageAnim_GoFasterWest, + gEventObjectImageAnim_GoFasterEast, + gEventObjectImageAnim_GoFastestSouth, + gEventObjectImageAnim_GoFastestNorth, + gEventObjectImageAnim_GoFastestWest, + gEventObjectImageAnim_GoFastestEast, }; -const union AnimCmd *const gFieldObjectImageAnimTable_Groudon3[] = { - gFieldObjectImageAnim_FaceSouth, - gFieldObjectImageAnim_FaceNorth, - gFieldObjectImageAnim_FaceWest, - gFieldObjectImageAnim_FaceEast, - gFieldObjectImageAnim_GoSouth, - gFieldObjectImageAnim_GoEast, - gFieldObjectImageAnim_GoWest, - gFieldObjectImageAnim_GoEast, - gFieldObjectImageAnim_GoFastSouth, - gFieldObjectImageAnim_GoFastEast, - gFieldObjectImageAnim_GoFastWest, - gFieldObjectImageAnim_GoFastEast, - gFieldObjectImageAnim_GoFasterSouth, - gFieldObjectImageAnim_GoFasterEast, - gFieldObjectImageAnim_GoFasterWest, - gFieldObjectImageAnim_GoFasterEast, - gFieldObjectImageAnim_GoFastestSouth, - gFieldObjectImageAnim_GoFastestEast, - gFieldObjectImageAnim_GoFastestWest, - gFieldObjectImageAnim_GoFastestEast, +const union AnimCmd *const gEventObjectImageAnimTable_Groudon3[] = { + gEventObjectImageAnim_FaceSouth, + gEventObjectImageAnim_FaceNorth, + gEventObjectImageAnim_FaceWest, + gEventObjectImageAnim_FaceEast, + gEventObjectImageAnim_GoSouth, + gEventObjectImageAnim_GoEast, + gEventObjectImageAnim_GoWest, + gEventObjectImageAnim_GoEast, + gEventObjectImageAnim_GoFastSouth, + gEventObjectImageAnim_GoFastEast, + gEventObjectImageAnim_GoFastWest, + gEventObjectImageAnim_GoFastEast, + gEventObjectImageAnim_GoFasterSouth, + gEventObjectImageAnim_GoFasterEast, + gEventObjectImageAnim_GoFasterWest, + gEventObjectImageAnim_GoFasterEast, + gEventObjectImageAnim_GoFastestSouth, + gEventObjectImageAnim_GoFastestEast, + gEventObjectImageAnim_GoFastestWest, + gEventObjectImageAnim_GoFastestEast, }; -const union AnimCmd gFieldObjectImageAnim_85091F0[] = +const union AnimCmd gEventObjectImageAnim_85091F0[] = { ANIMCMD_FRAME(1, 1), ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_85091F8[] = +const union AnimCmd gEventObjectImageAnim_85091F8[] = { ANIMCMD_FRAME(4, 1), ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_8509200[] = +const union AnimCmd gEventObjectImageAnim_8509200[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_8509208[] = +const union AnimCmd gEventObjectImageAnim_8509208[] = { ANIMCMD_FRAME(2, 1), ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_8509210[] = +const union AnimCmd gEventObjectImageAnim_8509210[] = { ANIMCMD_FRAME(3, 1), ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_8509218[] = +const union AnimCmd gEventObjectImageAnim_8509218[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_8509220[] = +const union AnimCmd gEventObjectImageAnim_8509220[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_8509228[] = +const union AnimCmd gEventObjectImageAnim_8509228[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldObjectImageAnim_8509230[] = +const union AnimCmd gEventObjectImageAnim_8509230[] = { ANIMCMD_FRAME(3, 1), ANIMCMD_JUMP(0), }; -const union AnimCmd *const gFieldObjectImageAnimTable_Rayquaza2[] = { - gFieldObjectImageAnim_8509218, - gFieldObjectImageAnim_8509220, - gFieldObjectImageAnim_8509228, - gFieldObjectImageAnim_8509230, - gFieldObjectImageAnim_8509200, - gFieldObjectImageAnim_85091F8, - gFieldObjectImageAnim_8509208, - gFieldObjectImageAnim_8509210, - gFieldObjectImageAnim_8509200, - gFieldObjectImageAnim_85091F8, - gFieldObjectImageAnim_85091F0, - gFieldObjectImageAnim_8509210, - gFieldObjectImageAnim_8509200, - gFieldObjectImageAnim_85091F8, - gFieldObjectImageAnim_8509208, - gFieldObjectImageAnim_8509210, - gFieldObjectImageAnim_8509200, - gFieldObjectImageAnim_85091F8, - gFieldObjectImageAnim_8509208, - gFieldObjectImageAnim_8509210, +const union AnimCmd *const gEventObjectImageAnimTable_Rayquaza2[] = { + gEventObjectImageAnim_8509218, + gEventObjectImageAnim_8509220, + gEventObjectImageAnim_8509228, + gEventObjectImageAnim_8509230, + gEventObjectImageAnim_8509200, + gEventObjectImageAnim_85091F8, + gEventObjectImageAnim_8509208, + gEventObjectImageAnim_8509210, + gEventObjectImageAnim_8509200, + gEventObjectImageAnim_85091F8, + gEventObjectImageAnim_85091F0, + gEventObjectImageAnim_8509210, + gEventObjectImageAnim_8509200, + gEventObjectImageAnim_85091F8, + gEventObjectImageAnim_8509208, + gEventObjectImageAnim_8509210, + gEventObjectImageAnim_8509200, + gEventObjectImageAnim_85091F8, + gEventObjectImageAnim_8509208, + gEventObjectImageAnim_8509210, }; -const union AnimCmd *const gFieldObjectImageAnimTable_BrendanMayNormal[] = { - gFieldObjectImageAnim_FaceSouth, - gFieldObjectImageAnim_FaceNorth, - gFieldObjectImageAnim_FaceWest, - gFieldObjectImageAnim_FaceEast, - gFieldObjectImageAnim_GoSouth, - gFieldObjectImageAnim_GoNorth, - gFieldObjectImageAnim_GoWest, - gFieldObjectImageAnim_GoEast, - gFieldObjectImageAnim_GoFastSouth, - gFieldObjectImageAnim_GoFastNorth, - gFieldObjectImageAnim_GoFastWest, - gFieldObjectImageAnim_GoFastEast, - gFieldObjectImageAnim_GoFasterSouth, - gFieldObjectImageAnim_GoFasterNorth, - gFieldObjectImageAnim_GoFasterWest, - gFieldObjectImageAnim_GoFasterEast, - gFieldObjectImageAnim_GoFastestSouth, - gFieldObjectImageAnim_GoFastestNorth, - gFieldObjectImageAnim_GoFastestWest, - gFieldObjectImageAnim_GoFastestEast, - gFieldObjectImageAnim_RunSouth, - gFieldObjectImageAnim_RunNorth, - gFieldObjectImageAnim_RunWest, - gFieldObjectImageAnim_RunEast, +const union AnimCmd *const gEventObjectImageAnimTable_BrendanMayNormal[] = { + gEventObjectImageAnim_FaceSouth, + gEventObjectImageAnim_FaceNorth, + gEventObjectImageAnim_FaceWest, + gEventObjectImageAnim_FaceEast, + gEventObjectImageAnim_GoSouth, + gEventObjectImageAnim_GoNorth, + gEventObjectImageAnim_GoWest, + gEventObjectImageAnim_GoEast, + gEventObjectImageAnim_GoFastSouth, + gEventObjectImageAnim_GoFastNorth, + gEventObjectImageAnim_GoFastWest, + gEventObjectImageAnim_GoFastEast, + gEventObjectImageAnim_GoFasterSouth, + gEventObjectImageAnim_GoFasterNorth, + gEventObjectImageAnim_GoFasterWest, + gEventObjectImageAnim_GoFasterEast, + gEventObjectImageAnim_GoFastestSouth, + gEventObjectImageAnim_GoFastestNorth, + gEventObjectImageAnim_GoFastestWest, + gEventObjectImageAnim_GoFastestEast, + gEventObjectImageAnim_RunSouth, + gEventObjectImageAnim_RunNorth, + gEventObjectImageAnim_RunWest, + gEventObjectImageAnim_RunEast, }; -const union AnimCmd *const gFieldObjectImageAnimTable_AcroBike[] = { - gFieldObjectImageAnim_FaceSouth, - gFieldObjectImageAnim_FaceNorth, - gFieldObjectImageAnim_FaceWest, - gFieldObjectImageAnim_FaceEast, - gFieldObjectImageAnim_GoSouth, - gFieldObjectImageAnim_GoNorth, - gFieldObjectImageAnim_GoWest, - gFieldObjectImageAnim_GoEast, - gFieldObjectImageAnim_GoFastSouth, - gFieldObjectImageAnim_GoFastNorth, - gFieldObjectImageAnim_GoFastWest, - gFieldObjectImageAnim_GoFastEast, - gFieldObjectImageAnim_GoFasterSouth, - gFieldObjectImageAnim_GoFasterNorth, - gFieldObjectImageAnim_GoFasterWest, - gFieldObjectImageAnim_GoFasterEast, - gFieldObjectImageAnim_GoFastestSouth, - gFieldObjectImageAnim_GoFastestNorth, - gFieldObjectImageAnim_GoFastestWest, - gFieldObjectImageAnim_GoFastestEast, - gFieldObjectImageAnim_BunnyHoppyBackWheelSouth, - gFieldObjectImageAnim_BunnyHoppyBackWheelNorth, - gFieldObjectImageAnim_BunnyHoppyBackWheelWest, - gFieldObjectImageAnim_BunnyHoppyBackWheelEast, - gFieldObjectImageAnim_BunnyHoppyFrontWheelSouth, - gFieldObjectImageAnim_BunnyHoppyFrontWheelNorth, - gFieldObjectImageAnim_BunnyHoppyFrontWheelWest, - gFieldObjectImageAnim_BunnyHoppyFrontWheelEast, - gFieldObjectImageAnim_StandingWheelieBackWheelSouth, - gFieldObjectImageAnim_StandingWheelieBackWheelNorth, - gFieldObjectImageAnim_StandingWheelieBackWheelWest, - gFieldObjectImageAnim_StandingWheelieBackWheelEast, - gFieldObjectImageAnim_StandingWheelieFrontWheelSouth, - gFieldObjectImageAnim_StandingWheelieFrontWheelNorth, - gFieldObjectImageAnim_StandingWheelieFrontWheelWest, - gFieldObjectImageAnim_StandingWheelieFrontWheelEast, - gFieldObjectImageAnim_MovingWheelieSouth, - gFieldObjectImageAnim_MovingWheelieNorth, - gFieldObjectImageAnim_MovingWheelieWest, - gFieldObjectImageAnim_MovingWheelieEast, +const union AnimCmd *const gEventObjectImageAnimTable_AcroBike[] = { + gEventObjectImageAnim_FaceSouth, + gEventObjectImageAnim_FaceNorth, + gEventObjectImageAnim_FaceWest, + gEventObjectImageAnim_FaceEast, + gEventObjectImageAnim_GoSouth, + gEventObjectImageAnim_GoNorth, + gEventObjectImageAnim_GoWest, + gEventObjectImageAnim_GoEast, + gEventObjectImageAnim_GoFastSouth, + gEventObjectImageAnim_GoFastNorth, + gEventObjectImageAnim_GoFastWest, + gEventObjectImageAnim_GoFastEast, + gEventObjectImageAnim_GoFasterSouth, + gEventObjectImageAnim_GoFasterNorth, + gEventObjectImageAnim_GoFasterWest, + gEventObjectImageAnim_GoFasterEast, + gEventObjectImageAnim_GoFastestSouth, + gEventObjectImageAnim_GoFastestNorth, + gEventObjectImageAnim_GoFastestWest, + gEventObjectImageAnim_GoFastestEast, + gEventObjectImageAnim_BunnyHoppyBackWheelSouth, + gEventObjectImageAnim_BunnyHoppyBackWheelNorth, + gEventObjectImageAnim_BunnyHoppyBackWheelWest, + gEventObjectImageAnim_BunnyHoppyBackWheelEast, + gEventObjectImageAnim_BunnyHoppyFrontWheelSouth, + gEventObjectImageAnim_BunnyHoppyFrontWheelNorth, + gEventObjectImageAnim_BunnyHoppyFrontWheelWest, + gEventObjectImageAnim_BunnyHoppyFrontWheelEast, + gEventObjectImageAnim_StandingWheelieBackWheelSouth, + gEventObjectImageAnim_StandingWheelieBackWheelNorth, + gEventObjectImageAnim_StandingWheelieBackWheelWest, + gEventObjectImageAnim_StandingWheelieBackWheelEast, + gEventObjectImageAnim_StandingWheelieFrontWheelSouth, + gEventObjectImageAnim_StandingWheelieFrontWheelNorth, + gEventObjectImageAnim_StandingWheelieFrontWheelWest, + gEventObjectImageAnim_StandingWheelieFrontWheelEast, + gEventObjectImageAnim_MovingWheelieSouth, + gEventObjectImageAnim_MovingWheelieNorth, + gEventObjectImageAnim_MovingWheelieWest, + gEventObjectImageAnim_MovingWheelieEast, }; -const union AnimCmd *const gFieldObjectImageAnimTable_Surfing[] = { - gFieldObjectImageAnim_FaceSouth, - gFieldObjectImageAnim_FaceNorth, - gFieldObjectImageAnim_FaceWest, - gFieldObjectImageAnim_FaceEast, - gFieldObjectImageAnim_GoSouth, - gFieldObjectImageAnim_GoNorth, - gFieldObjectImageAnim_GoWest, - gFieldObjectImageAnim_GoEast, - gFieldObjectImageAnim_GoFastSouth, - gFieldObjectImageAnim_GoFastNorth, - gFieldObjectImageAnim_GoFastWest, - gFieldObjectImageAnim_GoFastEast, - gFieldObjectImageAnim_GoFasterSouth, - gFieldObjectImageAnim_GoFasterNorth, - gFieldObjectImageAnim_GoFasterWest, - gFieldObjectImageAnim_GoFasterEast, - gFieldObjectImageAnim_GoFastestSouth, - gFieldObjectImageAnim_GoFastestNorth, - gFieldObjectImageAnim_GoFastestWest, - gFieldObjectImageAnim_GoFastestEast, - gFieldObjectImageAnim_GetOnOffSurfBlobSouth, - gFieldObjectImageAnim_GetOnOffSurfBlobNorth, - gFieldObjectImageAnim_GetOnOffSurfBlobWest, - gFieldObjectImageAnim_GetOnOffSurfBlobEast, +const union AnimCmd *const gEventObjectImageAnimTable_Surfing[] = { + gEventObjectImageAnim_FaceSouth, + gEventObjectImageAnim_FaceNorth, + gEventObjectImageAnim_FaceWest, + gEventObjectImageAnim_FaceEast, + gEventObjectImageAnim_GoSouth, + gEventObjectImageAnim_GoNorth, + gEventObjectImageAnim_GoWest, + gEventObjectImageAnim_GoEast, + gEventObjectImageAnim_GoFastSouth, + gEventObjectImageAnim_GoFastNorth, + gEventObjectImageAnim_GoFastWest, + gEventObjectImageAnim_GoFastEast, + gEventObjectImageAnim_GoFasterSouth, + gEventObjectImageAnim_GoFasterNorth, + gEventObjectImageAnim_GoFasterWest, + gEventObjectImageAnim_GoFasterEast, + gEventObjectImageAnim_GoFastestSouth, + gEventObjectImageAnim_GoFastestNorth, + gEventObjectImageAnim_GoFastestWest, + gEventObjectImageAnim_GoFastestEast, + gEventObjectImageAnim_GetOnOffSurfBlobSouth, + gEventObjectImageAnim_GetOnOffSurfBlobNorth, + gEventObjectImageAnim_GetOnOffSurfBlobWest, + gEventObjectImageAnim_GetOnOffSurfBlobEast, }; -const union AnimCmd *const gFieldObjectImageAnimTable_Nurse[] = { - gFieldObjectImageAnim_FaceSouth, - gFieldObjectImageAnim_FaceNorth, - gFieldObjectImageAnim_FaceWest, - gFieldObjectImageAnim_FaceEast, - gFieldObjectImageAnim_GoSouth, - gFieldObjectImageAnim_GoNorth, - gFieldObjectImageAnim_GoWest, - gFieldObjectImageAnim_GoEast, - gFieldObjectImageAnim_GoFastSouth, - gFieldObjectImageAnim_GoFastNorth, - gFieldObjectImageAnim_GoFastWest, - gFieldObjectImageAnim_GoFastEast, - gFieldObjectImageAnim_GoFasterSouth, - gFieldObjectImageAnim_GoFasterNorth, - gFieldObjectImageAnim_GoFasterWest, - gFieldObjectImageAnim_GoFasterEast, - gFieldObjectImageAnim_GoFastestSouth, - gFieldObjectImageAnim_GoFastestNorth, - gFieldObjectImageAnim_GoFastestWest, - gFieldObjectImageAnim_GoFastestEast, - gFieldObjectImageAnim_NurseBow, +const union AnimCmd *const gEventObjectImageAnimTable_Nurse[] = { + gEventObjectImageAnim_FaceSouth, + gEventObjectImageAnim_FaceNorth, + gEventObjectImageAnim_FaceWest, + gEventObjectImageAnim_FaceEast, + gEventObjectImageAnim_GoSouth, + gEventObjectImageAnim_GoNorth, + gEventObjectImageAnim_GoWest, + gEventObjectImageAnim_GoEast, + gEventObjectImageAnim_GoFastSouth, + gEventObjectImageAnim_GoFastNorth, + gEventObjectImageAnim_GoFastWest, + gEventObjectImageAnim_GoFastEast, + gEventObjectImageAnim_GoFasterSouth, + gEventObjectImageAnim_GoFasterNorth, + gEventObjectImageAnim_GoFasterWest, + gEventObjectImageAnim_GoFasterEast, + gEventObjectImageAnim_GoFastestSouth, + gEventObjectImageAnim_GoFastestNorth, + gEventObjectImageAnim_GoFastestWest, + gEventObjectImageAnim_GoFastestEast, + gEventObjectImageAnim_NurseBow, }; -const union AnimCmd *const gFieldObjectImageAnimTable_FieldMove[] = { - gFieldObjectImageAnim_FieldMove, +const union AnimCmd *const gEventObjectImageAnimTable_FieldMove[] = { + gEventObjectImageAnim_FieldMove, }; -const union AnimCmd *const gFieldObjectImageAnimTable_BerryTree[] = { - gFieldObjectImageAnim_BerryTreeStage0, - gFieldObjectImageAnim_BerryTreeStage1, - gFieldObjectImageAnim_BerryTreeStage2, - gFieldObjectImageAnim_BerryTreeStage3, - gFieldObjectImageAnim_BerryTreeStage4, +const union AnimCmd *const gEventObjectImageAnimTable_BerryTree[] = { + gEventObjectImageAnim_BerryTreeStage0, + gEventObjectImageAnim_BerryTreeStage1, + gEventObjectImageAnim_BerryTreeStage2, + gEventObjectImageAnim_BerryTreeStage3, + gEventObjectImageAnim_BerryTreeStage4, }; -const union AnimCmd *const gFieldObjectImageAnimTable_BreakableRock[] = { - gFieldObjectImageAnim_StayStill, - gFieldObjectImageAnim_RockBreak, +const union AnimCmd *const gEventObjectImageAnimTable_BreakableRock[] = { + gEventObjectImageAnim_StayStill, + gEventObjectImageAnim_RockBreak, }; -const union AnimCmd *const gFieldObjectImageAnimTable_CuttableTree[] = { - gFieldObjectImageAnim_StayStill, - gFieldObjectImageAnim_TreeCut, +const union AnimCmd *const gEventObjectImageAnimTable_CuttableTree[] = { + gEventObjectImageAnim_StayStill, + gEventObjectImageAnim_TreeCut, }; -const union AnimCmd *const gFieldObjectImageAnimTable_Fishing[] = { - gFieldObjectImageAnim_TakeOutRodSouth, - gFieldObjectImageAnim_TakeOutRodNorth, - gFieldObjectImageAnim_TakeOutRodWest, - gFieldObjectImageAnim_TakeOutRodEast, - gFieldObjectImageAnim_PutAwayRodSouth, - gFieldObjectImageAnim_PutAwayRodNorth, - gFieldObjectImageAnim_PutAwayRodWest, - gFieldObjectImageAnim_PutAwayRodEast, - gFieldObjectImageAnim_HookedPokemonSouth, - gFieldObjectImageAnim_HookedPokemonNorth, - gFieldObjectImageAnim_HookedPokemonWest, - gFieldObjectImageAnim_HookedPokemonEast, +const union AnimCmd *const gEventObjectImageAnimTable_Fishing[] = { + gEventObjectImageAnim_TakeOutRodSouth, + gEventObjectImageAnim_TakeOutRodNorth, + gEventObjectImageAnim_TakeOutRodWest, + gEventObjectImageAnim_TakeOutRodEast, + gEventObjectImageAnim_PutAwayRodSouth, + gEventObjectImageAnim_PutAwayRodNorth, + gEventObjectImageAnim_PutAwayRodWest, + gEventObjectImageAnim_PutAwayRodEast, + gEventObjectImageAnim_HookedPokemonSouth, + gEventObjectImageAnim_HookedPokemonNorth, + gEventObjectImageAnim_HookedPokemonWest, + gEventObjectImageAnim_HookedPokemonEast, }; -const union AffineAnimCmd *const gFieldObjectRotScalAnimTable_KyogreGroudon[] = { - gFieldObjectRotScalAnim_8508FD8, - gFieldObjectRotScalAnim_8509008, - gFieldObjectRotScalAnim_8509050, - gFieldObjectRotScalAnim_8509040, - gFieldObjectRotScalAnim_8509078, - gFieldObjectRotScalAnim_8509060, +const union AffineAnimCmd *const gEventObjectRotScalAnimTable_KyogreGroudon[] = { + gEventObjectRotScalAnim_8508FD8, + gEventObjectRotScalAnim_8509008, + gEventObjectRotScalAnim_8509050, + gEventObjectRotScalAnim_8509040, + gEventObjectRotScalAnim_8509078, + gEventObjectRotScalAnim_8509060, }; const struct UnkStruct_085094AC gUnknown_085094AC[] = { { - .anims = gFieldObjectImageAnimTable_QuintyPlump, + .anims = gEventObjectImageAnimTable_QuintyPlump, .animPos = {1, 3, 0, 2}, }, { - .anims = gFieldObjectImageAnimTable_Standard, + .anims = gEventObjectImageAnimTable_Standard, .animPos = {1, 3, 0, 2}, }, { - .anims = gFieldObjectImageAnimTable_BrendanMayNormal, + .anims = gEventObjectImageAnimTable_BrendanMayNormal, .animPos = {1, 3, 0, 2}, }, { - .anims = gFieldObjectImageAnimTable_AcroBike, + .anims = gEventObjectImageAnimTable_AcroBike, .animPos = {1, 3, 0, 2}, }, { - .anims = gFieldObjectImageAnimTable_Surfing, + .anims = gEventObjectImageAnimTable_Surfing, .animPos = {1, 3, 0, 2}, }, { - .anims = gFieldObjectImageAnimTable_Nurse, + .anims = gEventObjectImageAnimTable_Nurse, .animPos = {1, 3, 0, 2}, }, { - .anims = gFieldObjectImageAnimTable_Fishing, + .anims = gEventObjectImageAnimTable_Fishing, .animPos = {1, 3, 0, 2}, }, { diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h index 9a9f096a21..3d4303189e 100755 --- a/src/data/field_event_obj/event_object_graphics.h +++ b/src/data/field_event_obj/event_object_graphics.h @@ -1,44 +1,44 @@ #ifndef GUARD_EVENT_OBJECT_GFX_H #define GUARD_EVENT_OBJECT_GFX_H -const u32 gFieldObjectPic_BrendanNormal_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/00.4bpp"); -const u32 gFieldObjectPic_BrendanNormal_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/01.4bpp"); -const u32 gFieldObjectPic_BrendanNormal_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/02.4bpp"); -const u32 gFieldObjectPic_BrendanNormal_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/03.4bpp"); -const u32 gFieldObjectPic_BrendanNormal_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/04.4bpp"); -const u32 gFieldObjectPic_BrendanNormal_5[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/05.4bpp"); -const u32 gFieldObjectPic_BrendanNormal_6[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/06.4bpp"); -const u32 gFieldObjectPic_BrendanNormal_7[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/07.4bpp"); -const u32 gFieldObjectPic_BrendanNormal_8[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/08.4bpp"); -const u32 gFieldObjectPic_BrendanNormal_9[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/09.4bpp"); -const u32 gFieldObjectPic_BrendanNormal_10[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/10.4bpp"); -const u32 gFieldObjectPic_BrendanNormal_11[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/11.4bpp"); -const u32 gFieldObjectPic_BrendanNormal_12[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/12.4bpp"); -const u32 gFieldObjectPic_BrendanNormal_13[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/13.4bpp"); -const u32 gFieldObjectPic_BrendanNormal_14[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/14.4bpp"); -const u32 gFieldObjectPic_BrendanNormal_15[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/15.4bpp"); -const u32 gFieldObjectPic_BrendanNormal_16[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/16.4bpp"); -const u32 gFieldObjectPic_BrendanNormal_17[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/17.4bpp"); -const u16 gFieldObjectPalette8[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_08.gbapal"); -const u32 gFieldObjectPic_RubySapphireBrendan_0[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/00.4bpp"); -const u32 gFieldObjectPic_RubySapphireBrendan_1[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/01.4bpp"); -const u32 gFieldObjectPic_RubySapphireBrendan_2[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/02.4bpp"); -const u32 gFieldObjectPic_RubySapphireBrendan_3[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/03.4bpp"); -const u32 gFieldObjectPic_RubySapphireBrendan_4[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/04.4bpp"); -const u32 gFieldObjectPic_RubySapphireBrendan_5[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/05.4bpp"); -const u32 gFieldObjectPic_RubySapphireBrendan_6[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/06.4bpp"); -const u32 gFieldObjectPic_RubySapphireBrendan_7[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/07.4bpp"); -const u32 gFieldObjectPic_RubySapphireBrendan_8[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/08.4bpp"); -const u32 gFieldObjectPic_RubySapphireBrendan_9[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/09.4bpp"); -const u32 gFieldObjectPic_RubySapphireBrendan_10[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/10.4bpp"); -const u32 gFieldObjectPic_RubySapphireBrendan_11[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/11.4bpp"); -const u32 gFieldObjectPic_RubySapphireBrendan_12[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/12.4bpp"); -const u32 gFieldObjectPic_RubySapphireBrendan_13[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/13.4bpp"); -const u32 gFieldObjectPic_RubySapphireBrendan_14[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/14.4bpp"); -const u32 gFieldObjectPic_RubySapphireBrendan_15[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/15.4bpp"); -const u32 gFieldObjectPic_RubySapphireBrendan_16[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/16.4bpp"); -const u32 gFieldObjectPic_RubySapphireBrendan_17[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/17.4bpp"); -const u16 gFieldObjectPalette33[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_33.gbapal"); +const u32 gEventObjectPic_BrendanNormal_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/00.4bpp"); +const u32 gEventObjectPic_BrendanNormal_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/01.4bpp"); +const u32 gEventObjectPic_BrendanNormal_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/02.4bpp"); +const u32 gEventObjectPic_BrendanNormal_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/03.4bpp"); +const u32 gEventObjectPic_BrendanNormal_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/04.4bpp"); +const u32 gEventObjectPic_BrendanNormal_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/05.4bpp"); +const u32 gEventObjectPic_BrendanNormal_6[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/06.4bpp"); +const u32 gEventObjectPic_BrendanNormal_7[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/07.4bpp"); +const u32 gEventObjectPic_BrendanNormal_8[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/08.4bpp"); +const u32 gEventObjectPic_BrendanNormal_9[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/09.4bpp"); +const u32 gEventObjectPic_BrendanNormal_10[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/10.4bpp"); +const u32 gEventObjectPic_BrendanNormal_11[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/11.4bpp"); +const u32 gEventObjectPic_BrendanNormal_12[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/12.4bpp"); +const u32 gEventObjectPic_BrendanNormal_13[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/13.4bpp"); +const u32 gEventObjectPic_BrendanNormal_14[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/14.4bpp"); +const u32 gEventObjectPic_BrendanNormal_15[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/15.4bpp"); +const u32 gEventObjectPic_BrendanNormal_16[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/16.4bpp"); +const u32 gEventObjectPic_BrendanNormal_17[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/17.4bpp"); +const u16 gEventObjectPalette8[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_08.gbapal"); +const u32 gEventObjectPic_RubySapphireBrendan_0[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/00.4bpp"); +const u32 gEventObjectPic_RubySapphireBrendan_1[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/01.4bpp"); +const u32 gEventObjectPic_RubySapphireBrendan_2[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/02.4bpp"); +const u32 gEventObjectPic_RubySapphireBrendan_3[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/03.4bpp"); +const u32 gEventObjectPic_RubySapphireBrendan_4[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/04.4bpp"); +const u32 gEventObjectPic_RubySapphireBrendan_5[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/05.4bpp"); +const u32 gEventObjectPic_RubySapphireBrendan_6[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/06.4bpp"); +const u32 gEventObjectPic_RubySapphireBrendan_7[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/07.4bpp"); +const u32 gEventObjectPic_RubySapphireBrendan_8[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/08.4bpp"); +const u32 gEventObjectPic_RubySapphireBrendan_9[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/09.4bpp"); +const u32 gEventObjectPic_RubySapphireBrendan_10[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/10.4bpp"); +const u32 gEventObjectPic_RubySapphireBrendan_11[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/11.4bpp"); +const u32 gEventObjectPic_RubySapphireBrendan_12[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/12.4bpp"); +const u32 gEventObjectPic_RubySapphireBrendan_13[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/13.4bpp"); +const u32 gEventObjectPic_RubySapphireBrendan_14[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/14.4bpp"); +const u32 gEventObjectPic_RubySapphireBrendan_15[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/15.4bpp"); +const u32 gEventObjectPic_RubySapphireBrendan_16[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/16.4bpp"); +const u32 gEventObjectPic_RubySapphireBrendan_17[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/17.4bpp"); +const u16 gEventObjectPalette33[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_33.gbapal"); const u16 NullPalette_8499A38[16] = {}; const u16 NullPalette_8499A58[16] = {}; const u16 NullPalette_8499A78[16] = {}; @@ -54,124 +54,124 @@ const u16 NullPalette_8499B98[16] = {}; const u16 NullPalette_8499BB8[16] = {}; const u16 NullPalette_8499BD8[16] = {}; const u16 NullPalette_8499BF8[16] = {}; -const u16 gFieldObjectPalette9[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_09.gbapal"); -const u16 gFieldObjectPalette10[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_10.gbapal"); -const u32 gFieldObjectPic_BrendanFieldMove_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/field_move/0.4bpp"); -const u32 gFieldObjectPic_BrendanFieldMove_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/field_move/1.4bpp"); -const u32 gFieldObjectPic_BrendanFieldMove_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/field_move/2.4bpp"); -const u32 gFieldObjectPic_BrendanFieldMove_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/field_move/3.4bpp"); -const u32 gFieldObjectPic_BrendanFieldMove_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/field_move/4.4bpp"); -const u32 gFieldObjectPic_BrendanSurfing_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/surfing/0.4bpp"); -const u32 gFieldObjectPic_BrendanSurfing_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/surfing/3.4bpp"); -const u32 gFieldObjectPic_BrendanSurfing_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/surfing/1.4bpp"); -const u32 gFieldObjectPic_BrendanSurfing_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/surfing/4.4bpp"); -const u32 gFieldObjectPic_BrendanSurfing_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/surfing/2.4bpp"); -const u32 gFieldObjectPic_BrendanSurfing_5[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/surfing/5.4bpp"); -const u32 gFieldObjectPic_BrendanMachBike_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/0.4bpp"); -const u32 gFieldObjectPic_BrendanMachBike_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/1.4bpp"); -const u32 gFieldObjectPic_BrendanMachBike_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/2.4bpp"); -const u32 gFieldObjectPic_BrendanMachBike_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/3.4bpp"); -const u32 gFieldObjectPic_BrendanMachBike_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/4.4bpp"); -const u32 gFieldObjectPic_BrendanMachBike_5[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/5.4bpp"); -const u32 gFieldObjectPic_BrendanMachBike_6[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/6.4bpp"); -const u32 gFieldObjectPic_BrendanMachBike_7[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/7.4bpp"); -const u32 gFieldObjectPic_BrendanMachBike_8[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/8.4bpp"); -const u32 gFieldObjectPic_BrendanAcroBike_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/00.4bpp"); -const u32 gFieldObjectPic_BrendanAcroBike_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/01.4bpp"); -const u32 gFieldObjectPic_BrendanAcroBike_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/02.4bpp"); -const u32 gFieldObjectPic_BrendanAcroBike_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/03.4bpp"); -const u32 gFieldObjectPic_BrendanAcroBike_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/04.4bpp"); -const u32 gFieldObjectPic_BrendanAcroBike_5[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/05.4bpp"); -const u32 gFieldObjectPic_BrendanAcroBike_6[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/06.4bpp"); -const u32 gFieldObjectPic_BrendanAcroBike_7[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/07.4bpp"); -const u32 gFieldObjectPic_BrendanAcroBike_8[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/08.4bpp"); -const u32 gFieldObjectPic_BrendanAcroBike_9[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/09.4bpp"); -const u32 gFieldObjectPic_BrendanAcroBike_10[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/10.4bpp"); -const u32 gFieldObjectPic_BrendanAcroBike_11[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/11.4bpp"); -const u32 gFieldObjectPic_BrendanAcroBike_12[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/12.4bpp"); -const u32 gFieldObjectPic_BrendanAcroBike_13[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/13.4bpp"); -const u32 gFieldObjectPic_BrendanAcroBike_14[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/14.4bpp"); -const u32 gFieldObjectPic_BrendanAcroBike_15[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/15.4bpp"); -const u32 gFieldObjectPic_BrendanAcroBike_16[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/16.4bpp"); -const u32 gFieldObjectPic_BrendanAcroBike_17[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/17.4bpp"); -const u32 gFieldObjectPic_BrendanAcroBike_18[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/18.4bpp"); -const u32 gFieldObjectPic_BrendanAcroBike_19[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/19.4bpp"); -const u32 gFieldObjectPic_BrendanAcroBike_20[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/20.4bpp"); -const u32 gFieldObjectPic_BrendanAcroBike_21[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/21.4bpp"); -const u32 gFieldObjectPic_BrendanAcroBike_22[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/22.4bpp"); -const u32 gFieldObjectPic_BrendanAcroBike_23[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/23.4bpp"); -const u32 gFieldObjectPic_BrendanAcroBike_24[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/24.4bpp"); -const u32 gFieldObjectPic_BrendanAcroBike_25[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/25.4bpp"); -const u32 gFieldObjectPic_BrendanAcroBike_26[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/26.4bpp"); -const u32 gFieldObjectPic_BrendanFishing_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/00.4bpp"); -const u32 gFieldObjectPic_BrendanFishing_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/01.4bpp"); -const u32 gFieldObjectPic_BrendanFishing_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/02.4bpp"); -const u32 gFieldObjectPic_BrendanFishing_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/03.4bpp"); -const u32 gFieldObjectPic_BrendanFishing_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/04.4bpp"); -const u32 gFieldObjectPic_BrendanFishing_5[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/05.4bpp"); -const u32 gFieldObjectPic_BrendanFishing_6[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/06.4bpp"); -const u32 gFieldObjectPic_BrendanFishing_7[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/07.4bpp"); -const u32 gFieldObjectPic_BrendanFishing_8[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/08.4bpp"); -const u32 gFieldObjectPic_BrendanFishing_9[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/09.4bpp"); -const u32 gFieldObjectPic_BrendanFishing_10[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/10.4bpp"); -const u32 gFieldObjectPic_BrendanFishing_11[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/11.4bpp"); -const u32 gFieldObjectPic_BrendanWatering_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/watering/0.4bpp"); -const u32 gFieldObjectPic_BrendanWatering_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/watering/3.4bpp"); -const u32 gFieldObjectPic_BrendanWatering_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/watering/1.4bpp"); -const u32 gFieldObjectPic_BrendanWatering_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/watering/4.4bpp"); -const u32 gFieldObjectPic_BrendanWatering_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/watering/2.4bpp"); -const u32 gFieldObjectPic_BrendanWatering_5[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/watering/5.4bpp"); -const u32 gFieldObjectPic_BrendanDecorating[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/decorating.4bpp"); -const u32 gFieldObjectPic_MayDecorating[] = INCBIN_U32("graphics/map_objects/pics/people/may/decorating.4bpp"); -const u32 gFieldObjectPic_BrendanUnderwater_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/underwater/0.4bpp"); -const u32 gFieldObjectPic_BrendanUnderwater_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/underwater/1.4bpp"); -const u32 gFieldObjectPic_BrendanUnderwater_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/underwater/2.4bpp"); -const u32 gFieldObjectPic_BrendanUnderwater_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/underwater/3.4bpp"); -const u32 gFieldObjectPic_MayUnderwater_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/underwater/0.4bpp"); -const u32 gFieldObjectPic_MayUnderwater_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/underwater/1.4bpp"); -const u32 gFieldObjectPic_MayUnderwater_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/underwater/2.4bpp"); -const u32 gFieldObjectPic_MayUnderwater_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/underwater/3.4bpp"); -const u16 gFieldObjectPalette11[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_11.gbapal"); -const u32 gFieldObjectPic_MayNormal_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/00.4bpp"); -const u32 gFieldObjectPic_MayNormal_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/01.4bpp"); -const u32 gFieldObjectPic_MayNormal_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/02.4bpp"); -const u32 gFieldObjectPic_MayNormal_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/03.4bpp"); -const u32 gFieldObjectPic_MayNormal_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/04.4bpp"); -const u32 gFieldObjectPic_MayNormal_5[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/05.4bpp"); -const u32 gFieldObjectPic_MayNormal_6[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/06.4bpp"); -const u32 gFieldObjectPic_MayNormal_7[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/07.4bpp"); -const u32 gFieldObjectPic_MayNormal_8[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/08.4bpp"); -const u32 gFieldObjectPic_MayNormal_9[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/09.4bpp"); -const u32 gFieldObjectPic_MayNormal_10[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/10.4bpp"); -const u32 gFieldObjectPic_MayNormal_11[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/11.4bpp"); -const u32 gFieldObjectPic_MayNormal_12[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/12.4bpp"); -const u32 gFieldObjectPic_MayNormal_13[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/13.4bpp"); -const u32 gFieldObjectPic_MayNormal_14[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/14.4bpp"); -const u32 gFieldObjectPic_MayNormal_15[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/15.4bpp"); -const u32 gFieldObjectPic_MayNormal_16[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/16.4bpp"); -const u32 gFieldObjectPic_MayNormal_17[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/17.4bpp"); -const u16 gFieldObjectPalette17[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_17.gbapal"); -const u16 gFieldObjectPalette18[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_18.gbapal"); -const u32 gFieldObjectPic_RubySapphireMay_0[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/00.4bpp"); -const u32 gFieldObjectPic_RubySapphireMay_1[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/01.4bpp"); -const u32 gFieldObjectPic_RubySapphireMay_2[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/02.4bpp"); -const u32 gFieldObjectPic_RubySapphireMay_3[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/03.4bpp"); -const u32 gFieldObjectPic_RubySapphireMay_4[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/04.4bpp"); -const u32 gFieldObjectPic_RubySapphireMay_5[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/05.4bpp"); -const u32 gFieldObjectPic_RubySapphireMay_6[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/06.4bpp"); -const u32 gFieldObjectPic_RubySapphireMay_7[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/07.4bpp"); -const u32 gFieldObjectPic_RubySapphireMay_8[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/08.4bpp"); -const u32 gFieldObjectPic_RubySapphireMay_9[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/09.4bpp"); -const u32 gFieldObjectPic_RubySapphireMay_10[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/10.4bpp"); -const u32 gFieldObjectPic_RubySapphireMay_11[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/11.4bpp"); -const u32 gFieldObjectPic_RubySapphireMay_12[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/12.4bpp"); -const u32 gFieldObjectPic_RubySapphireMay_13[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/13.4bpp"); -const u32 gFieldObjectPic_RubySapphireMay_14[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/14.4bpp"); -const u32 gFieldObjectPic_RubySapphireMay_15[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/15.4bpp"); -const u32 gFieldObjectPic_RubySapphireMay_16[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/16.4bpp"); -const u32 gFieldObjectPic_RubySapphireMay_17[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/17.4bpp"); -const u16 gFieldObjectPalette34[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_34.gbapal"); -const u16 gUnusedFieldObjectPalette[] = INCBIN_U16("graphics/map_objects/palettes/unused_palette.gbapal"); +const u16 gEventObjectPalette9[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_09.gbapal"); +const u16 gEventObjectPalette10[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_10.gbapal"); +const u32 gEventObjectPic_BrendanFieldMove_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/0.4bpp"); +const u32 gEventObjectPic_BrendanFieldMove_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/1.4bpp"); +const u32 gEventObjectPic_BrendanFieldMove_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/2.4bpp"); +const u32 gEventObjectPic_BrendanFieldMove_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/3.4bpp"); +const u32 gEventObjectPic_BrendanFieldMove_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/4.4bpp"); +const u32 gEventObjectPic_BrendanSurfing_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/0.4bpp"); +const u32 gEventObjectPic_BrendanSurfing_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/3.4bpp"); +const u32 gEventObjectPic_BrendanSurfing_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/1.4bpp"); +const u32 gEventObjectPic_BrendanSurfing_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/4.4bpp"); +const u32 gEventObjectPic_BrendanSurfing_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/2.4bpp"); +const u32 gEventObjectPic_BrendanSurfing_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/5.4bpp"); +const u32 gEventObjectPic_BrendanMachBike_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/0.4bpp"); +const u32 gEventObjectPic_BrendanMachBike_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/1.4bpp"); +const u32 gEventObjectPic_BrendanMachBike_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/2.4bpp"); +const u32 gEventObjectPic_BrendanMachBike_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/3.4bpp"); +const u32 gEventObjectPic_BrendanMachBike_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/4.4bpp"); +const u32 gEventObjectPic_BrendanMachBike_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/5.4bpp"); +const u32 gEventObjectPic_BrendanMachBike_6[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/6.4bpp"); +const u32 gEventObjectPic_BrendanMachBike_7[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/7.4bpp"); +const u32 gEventObjectPic_BrendanMachBike_8[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/8.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/00.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/01.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/02.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/03.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/04.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/05.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike_6[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/06.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike_7[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/07.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike_8[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/08.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike_9[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/09.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike_10[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/10.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike_11[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/11.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike_12[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/12.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike_13[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/13.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike_14[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/14.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike_15[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/15.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike_16[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/16.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike_17[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/17.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike_18[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/18.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike_19[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/19.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike_20[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/20.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike_21[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/21.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike_22[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/22.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike_23[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/23.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike_24[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/24.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike_25[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/25.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike_26[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/26.4bpp"); +const u32 gEventObjectPic_BrendanFishing_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/00.4bpp"); +const u32 gEventObjectPic_BrendanFishing_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/01.4bpp"); +const u32 gEventObjectPic_BrendanFishing_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/02.4bpp"); +const u32 gEventObjectPic_BrendanFishing_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/03.4bpp"); +const u32 gEventObjectPic_BrendanFishing_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/04.4bpp"); +const u32 gEventObjectPic_BrendanFishing_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/05.4bpp"); +const u32 gEventObjectPic_BrendanFishing_6[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/06.4bpp"); +const u32 gEventObjectPic_BrendanFishing_7[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/07.4bpp"); +const u32 gEventObjectPic_BrendanFishing_8[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/08.4bpp"); +const u32 gEventObjectPic_BrendanFishing_9[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/09.4bpp"); +const u32 gEventObjectPic_BrendanFishing_10[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/10.4bpp"); +const u32 gEventObjectPic_BrendanFishing_11[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/11.4bpp"); +const u32 gEventObjectPic_BrendanWatering_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/0.4bpp"); +const u32 gEventObjectPic_BrendanWatering_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/3.4bpp"); +const u32 gEventObjectPic_BrendanWatering_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/1.4bpp"); +const u32 gEventObjectPic_BrendanWatering_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/4.4bpp"); +const u32 gEventObjectPic_BrendanWatering_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/2.4bpp"); +const u32 gEventObjectPic_BrendanWatering_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/5.4bpp"); +const u32 gEventObjectPic_BrendanDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/decorating.4bpp"); +const u32 gEventObjectPic_MayDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/may/decorating.4bpp"); +const u32 gEventObjectPic_BrendanUnderwater_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/0.4bpp"); +const u32 gEventObjectPic_BrendanUnderwater_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/1.4bpp"); +const u32 gEventObjectPic_BrendanUnderwater_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/2.4bpp"); +const u32 gEventObjectPic_BrendanUnderwater_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/3.4bpp"); +const u32 gEventObjectPic_MayUnderwater_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/0.4bpp"); +const u32 gEventObjectPic_MayUnderwater_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/1.4bpp"); +const u32 gEventObjectPic_MayUnderwater_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/2.4bpp"); +const u32 gEventObjectPic_MayUnderwater_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/3.4bpp"); +const u16 gEventObjectPalette11[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_11.gbapal"); +const u32 gEventObjectPic_MayNormal_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/00.4bpp"); +const u32 gEventObjectPic_MayNormal_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/01.4bpp"); +const u32 gEventObjectPic_MayNormal_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/02.4bpp"); +const u32 gEventObjectPic_MayNormal_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/03.4bpp"); +const u32 gEventObjectPic_MayNormal_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/04.4bpp"); +const u32 gEventObjectPic_MayNormal_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/05.4bpp"); +const u32 gEventObjectPic_MayNormal_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/06.4bpp"); +const u32 gEventObjectPic_MayNormal_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/07.4bpp"); +const u32 gEventObjectPic_MayNormal_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/08.4bpp"); +const u32 gEventObjectPic_MayNormal_9[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/09.4bpp"); +const u32 gEventObjectPic_MayNormal_10[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/10.4bpp"); +const u32 gEventObjectPic_MayNormal_11[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/11.4bpp"); +const u32 gEventObjectPic_MayNormal_12[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/12.4bpp"); +const u32 gEventObjectPic_MayNormal_13[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/13.4bpp"); +const u32 gEventObjectPic_MayNormal_14[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/14.4bpp"); +const u32 gEventObjectPic_MayNormal_15[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/15.4bpp"); +const u32 gEventObjectPic_MayNormal_16[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/16.4bpp"); +const u32 gEventObjectPic_MayNormal_17[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/17.4bpp"); +const u16 gEventObjectPalette17[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_17.gbapal"); +const u16 gEventObjectPalette18[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_18.gbapal"); +const u32 gEventObjectPic_RubySapphireMay_0[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/00.4bpp"); +const u32 gEventObjectPic_RubySapphireMay_1[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/01.4bpp"); +const u32 gEventObjectPic_RubySapphireMay_2[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/02.4bpp"); +const u32 gEventObjectPic_RubySapphireMay_3[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/03.4bpp"); +const u32 gEventObjectPic_RubySapphireMay_4[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/04.4bpp"); +const u32 gEventObjectPic_RubySapphireMay_5[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/05.4bpp"); +const u32 gEventObjectPic_RubySapphireMay_6[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/06.4bpp"); +const u32 gEventObjectPic_RubySapphireMay_7[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/07.4bpp"); +const u32 gEventObjectPic_RubySapphireMay_8[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/08.4bpp"); +const u32 gEventObjectPic_RubySapphireMay_9[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/09.4bpp"); +const u32 gEventObjectPic_RubySapphireMay_10[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/10.4bpp"); +const u32 gEventObjectPic_RubySapphireMay_11[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/11.4bpp"); +const u32 gEventObjectPic_RubySapphireMay_12[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/12.4bpp"); +const u32 gEventObjectPic_RubySapphireMay_13[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/13.4bpp"); +const u32 gEventObjectPic_RubySapphireMay_14[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/14.4bpp"); +const u32 gEventObjectPic_RubySapphireMay_15[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/15.4bpp"); +const u32 gEventObjectPic_RubySapphireMay_16[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/16.4bpp"); +const u32 gEventObjectPic_RubySapphireMay_17[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/17.4bpp"); +const u16 gEventObjectPalette34[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_34.gbapal"); +const u16 gUnusedEventObjectPalette[] = INCBIN_U16("graphics/event_objects/palettes/unused_palette.gbapal"); const u16 NullPalette_84A54F8[16] = {}; const u16 NullPalette_84A5518[16] = {}; const u16 NullPalette_84A5538[16] = {}; @@ -186,1482 +186,1482 @@ const u16 NullPalette_84A5638[16] = {}; const u16 NullPalette_84A5658[16] = {}; const u16 NullPalette_84A5678[16] = {}; const u16 NullPalette_84A5698[16] = {}; -const u32 gFieldObjectPic_MayMachBike_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/0.4bpp"); -const u32 gFieldObjectPic_MayMachBike_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/1.4bpp"); -const u32 gFieldObjectPic_MayMachBike_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/2.4bpp"); -const u32 gFieldObjectPic_MayMachBike_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/3.4bpp"); -const u32 gFieldObjectPic_MayMachBike_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/4.4bpp"); -const u32 gFieldObjectPic_MayMachBike_5[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/5.4bpp"); -const u32 gFieldObjectPic_MayMachBike_6[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/6.4bpp"); -const u32 gFieldObjectPic_MayMachBike_7[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/7.4bpp"); -const u32 gFieldObjectPic_MayMachBike_8[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/8.4bpp"); -const u32 gFieldObjectPic_MayAcroBike_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/00.4bpp"); -const u32 gFieldObjectPic_MayAcroBike_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/01.4bpp"); -const u32 gFieldObjectPic_MayAcroBike_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/02.4bpp"); -const u32 gFieldObjectPic_MayAcroBike_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/03.4bpp"); -const u32 gFieldObjectPic_MayAcroBike_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/04.4bpp"); -const u32 gFieldObjectPic_MayAcroBike_5[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/05.4bpp"); -const u32 gFieldObjectPic_MayAcroBike_6[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/06.4bpp"); -const u32 gFieldObjectPic_MayAcroBike_7[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/07.4bpp"); -const u32 gFieldObjectPic_MayAcroBike_8[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/08.4bpp"); -const u32 gFieldObjectPic_MayAcroBike_9[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/09.4bpp"); -const u32 gFieldObjectPic_MayAcroBike_10[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/10.4bpp"); -const u32 gFieldObjectPic_MayAcroBike_11[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/11.4bpp"); -const u32 gFieldObjectPic_MayAcroBike_12[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/12.4bpp"); -const u32 gFieldObjectPic_MayAcroBike_13[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/13.4bpp"); -const u32 gFieldObjectPic_MayAcroBike_14[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/14.4bpp"); -const u32 gFieldObjectPic_MayAcroBike_15[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/15.4bpp"); -const u32 gFieldObjectPic_MayAcroBike_16[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/16.4bpp"); -const u32 gFieldObjectPic_MayAcroBike_17[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/17.4bpp"); -const u32 gFieldObjectPic_MayAcroBike_18[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/18.4bpp"); -const u32 gFieldObjectPic_MayAcroBike_19[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/19.4bpp"); -const u32 gFieldObjectPic_MayAcroBike_20[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/20.4bpp"); -const u32 gFieldObjectPic_MayAcroBike_21[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/21.4bpp"); -const u32 gFieldObjectPic_MayAcroBike_22[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/22.4bpp"); -const u32 gFieldObjectPic_MayAcroBike_23[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/23.4bpp"); -const u32 gFieldObjectPic_MayAcroBike_24[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/24.4bpp"); -const u32 gFieldObjectPic_MayAcroBike_25[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/25.4bpp"); -const u32 gFieldObjectPic_MayAcroBike_26[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/26.4bpp"); -const u32 gFieldObjectPic_MaySurfing_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/surfing/0.4bpp"); -const u32 gFieldObjectPic_MaySurfing_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/surfing/3.4bpp"); -const u32 gFieldObjectPic_MaySurfing_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/surfing/1.4bpp"); -const u32 gFieldObjectPic_MaySurfing_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/surfing/4.4bpp"); -const u32 gFieldObjectPic_MaySurfing_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/surfing/2.4bpp"); -const u32 gFieldObjectPic_MaySurfing_5[] = INCBIN_U32("graphics/map_objects/pics/people/may/surfing/5.4bpp"); -const u32 gFieldObjectPic_MayFieldMove_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/field_move/0.4bpp"); -const u32 gFieldObjectPic_MayFieldMove_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/field_move/1.4bpp"); -const u32 gFieldObjectPic_MayFieldMove_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/field_move/2.4bpp"); -const u32 gFieldObjectPic_MayFieldMove_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/field_move/3.4bpp"); -const u32 gFieldObjectPic_MayFieldMove_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/field_move/4.4bpp"); -const u32 gFieldObjectPic_MayFishing_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/00.4bpp"); -const u32 gFieldObjectPic_MayFishing_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/01.4bpp"); -const u32 gFieldObjectPic_MayFishing_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/02.4bpp"); -const u32 gFieldObjectPic_MayFishing_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/03.4bpp"); -const u32 gFieldObjectPic_MayFishing_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/04.4bpp"); -const u32 gFieldObjectPic_MayFishing_5[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/05.4bpp"); -const u32 gFieldObjectPic_MayFishing_6[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/06.4bpp"); -const u32 gFieldObjectPic_MayFishing_7[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/07.4bpp"); -const u32 gFieldObjectPic_MayFishing_8[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/08.4bpp"); -const u32 gFieldObjectPic_MayFishing_9[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/09.4bpp"); -const u32 gFieldObjectPic_MayFishing_10[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/10.4bpp"); -const u32 gFieldObjectPic_MayFishing_11[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/11.4bpp"); -const u32 gFieldObjectPic_MayWatering_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/watering/0.4bpp"); -const u32 gFieldObjectPic_MayWatering_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/watering/3.4bpp"); -const u32 gFieldObjectPic_MayWatering_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/watering/1.4bpp"); -const u32 gFieldObjectPic_MayWatering_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/watering/4.4bpp"); -const u32 gFieldObjectPic_MayWatering_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/watering/2.4bpp"); -const u32 gFieldObjectPic_MayWatering_5[] = INCBIN_U32("graphics/map_objects/pics/people/may/watering/5.4bpp"); -const u16 gFieldObjectPalette0[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_00.gbapal"); -const u16 gFieldObjectPalette1[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_01.gbapal"); -const u16 gFieldObjectPalette2[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_02.gbapal"); -const u16 gFieldObjectPalette3[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_03.gbapal"); -const u16 gFieldObjectPalette4[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_04.gbapal"); -const u16 gFieldObjectPalette5[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_05.gbapal"); -const u16 gFieldObjectPalette6[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_06.gbapal"); -const u16 gFieldObjectPalette7[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_07.gbapal"); -const u32 gFieldObjectPic_LittleBoy1_0[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/0.4bpp"); -const u32 gFieldObjectPic_LittleBoy1_1[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/1.4bpp"); -const u32 gFieldObjectPic_LittleBoy1_2[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/2.4bpp"); -const u32 gFieldObjectPic_LittleBoy1_3[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/3.4bpp"); -const u32 gFieldObjectPic_LittleBoy1_4[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/4.4bpp"); -const u32 gFieldObjectPic_LittleBoy1_5[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/5.4bpp"); -const u32 gFieldObjectPic_LittleBoy1_6[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/6.4bpp"); -const u32 gFieldObjectPic_LittleBoy1_7[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/7.4bpp"); -const u32 gFieldObjectPic_LittleBoy1_8[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/8.4bpp"); -const u32 gFieldObjectPic_LittleGirl1_0[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/0.4bpp"); -const u32 gFieldObjectPic_LittleGirl1_1[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/1.4bpp"); -const u32 gFieldObjectPic_LittleGirl1_2[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/2.4bpp"); -const u32 gFieldObjectPic_LittleGirl1_3[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/3.4bpp"); -const u32 gFieldObjectPic_LittleGirl1_4[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/4.4bpp"); -const u32 gFieldObjectPic_LittleGirl1_5[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/5.4bpp"); -const u32 gFieldObjectPic_LittleGirl1_6[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/6.4bpp"); -const u32 gFieldObjectPic_LittleGirl1_7[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/7.4bpp"); -const u32 gFieldObjectPic_LittleGirl1_8[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/8.4bpp"); -const u32 gFieldObjectPic_Boy1_0[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/0.4bpp"); -const u32 gFieldObjectPic_Boy1_1[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/1.4bpp"); -const u32 gFieldObjectPic_Boy1_2[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/2.4bpp"); -const u32 gFieldObjectPic_Boy1_3[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/3.4bpp"); -const u32 gFieldObjectPic_Boy1_4[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/4.4bpp"); -const u32 gFieldObjectPic_Boy1_5[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/5.4bpp"); -const u32 gFieldObjectPic_Boy1_6[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/6.4bpp"); -const u32 gFieldObjectPic_Boy1_7[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/7.4bpp"); -const u32 gFieldObjectPic_Boy1_8[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/8.4bpp"); -const u32 gFieldObjectPic_Girl1_0[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/0.4bpp"); -const u32 gFieldObjectPic_Girl1_1[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/1.4bpp"); -const u32 gFieldObjectPic_Girl1_2[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/2.4bpp"); -const u32 gFieldObjectPic_Girl1_3[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/3.4bpp"); -const u32 gFieldObjectPic_Girl1_4[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/4.4bpp"); -const u32 gFieldObjectPic_Girl1_5[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/5.4bpp"); -const u32 gFieldObjectPic_Girl1_6[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/6.4bpp"); -const u32 gFieldObjectPic_Girl1_7[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/7.4bpp"); -const u32 gFieldObjectPic_Girl1_8[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/8.4bpp"); -const u32 gFieldObjectPic_Boy2_0[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/0.4bpp"); -const u32 gFieldObjectPic_Boy2_1[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/1.4bpp"); -const u32 gFieldObjectPic_Boy2_2[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/2.4bpp"); -const u32 gFieldObjectPic_Boy2_3[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/3.4bpp"); -const u32 gFieldObjectPic_Boy2_4[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/4.4bpp"); -const u32 gFieldObjectPic_Boy2_5[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/5.4bpp"); -const u32 gFieldObjectPic_Boy2_6[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/6.4bpp"); -const u32 gFieldObjectPic_Boy2_7[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/7.4bpp"); -const u32 gFieldObjectPic_Boy2_8[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/8.4bpp"); -const u32 gFieldObjectPic_Girl2_0[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/0.4bpp"); -const u32 gFieldObjectPic_Girl2_1[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/1.4bpp"); -const u32 gFieldObjectPic_Girl2_2[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/2.4bpp"); -const u32 gFieldObjectPic_Girl2_3[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/3.4bpp"); -const u32 gFieldObjectPic_Girl2_4[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/4.4bpp"); -const u32 gFieldObjectPic_Girl2_5[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/5.4bpp"); -const u32 gFieldObjectPic_Girl2_6[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/6.4bpp"); -const u32 gFieldObjectPic_Girl2_7[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/7.4bpp"); -const u32 gFieldObjectPic_Girl2_8[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/8.4bpp"); -const u32 gFieldObjectPic_LittleBoy2_0[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/0.4bpp"); -const u32 gFieldObjectPic_LittleBoy2_1[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/1.4bpp"); -const u32 gFieldObjectPic_LittleBoy2_2[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/2.4bpp"); -const u32 gFieldObjectPic_LittleBoy2_3[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/3.4bpp"); -const u32 gFieldObjectPic_LittleBoy2_4[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/4.4bpp"); -const u32 gFieldObjectPic_LittleBoy2_5[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/5.4bpp"); -const u32 gFieldObjectPic_LittleBoy2_6[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/6.4bpp"); -const u32 gFieldObjectPic_LittleBoy2_7[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/7.4bpp"); -const u32 gFieldObjectPic_LittleBoy2_8[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/8.4bpp"); -const u32 gFieldObjectPic_LittleGirl2_0[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/0.4bpp"); -const u32 gFieldObjectPic_LittleGirl2_1[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/1.4bpp"); -const u32 gFieldObjectPic_LittleGirl2_2[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/2.4bpp"); -const u32 gFieldObjectPic_LittleGirl2_3[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/3.4bpp"); -const u32 gFieldObjectPic_LittleGirl2_4[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/4.4bpp"); -const u32 gFieldObjectPic_LittleGirl2_5[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/5.4bpp"); -const u32 gFieldObjectPic_LittleGirl2_6[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/6.4bpp"); -const u32 gFieldObjectPic_LittleGirl2_7[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/7.4bpp"); -const u32 gFieldObjectPic_LittleGirl2_8[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/8.4bpp"); -const u32 gFieldObjectPic_Boy3_0[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/0.4bpp"); -const u32 gFieldObjectPic_Boy3_1[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/1.4bpp"); -const u32 gFieldObjectPic_Boy3_2[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/2.4bpp"); -const u32 gFieldObjectPic_Boy3_3[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/3.4bpp"); -const u32 gFieldObjectPic_Boy3_4[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/4.4bpp"); -const u32 gFieldObjectPic_Boy3_5[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/5.4bpp"); -const u32 gFieldObjectPic_Boy3_6[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/6.4bpp"); -const u32 gFieldObjectPic_Boy3_7[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/7.4bpp"); -const u32 gFieldObjectPic_Boy3_8[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/8.4bpp"); -const u32 gFieldObjectPic_Girl3_0[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/0.4bpp"); -const u32 gFieldObjectPic_Girl3_1[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/1.4bpp"); -const u32 gFieldObjectPic_Girl3_2[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/2.4bpp"); -const u32 gFieldObjectPic_Girl3_3[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/3.4bpp"); -const u32 gFieldObjectPic_Girl3_4[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/4.4bpp"); -const u32 gFieldObjectPic_Girl3_5[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/5.4bpp"); -const u32 gFieldObjectPic_Girl3_6[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/6.4bpp"); -const u32 gFieldObjectPic_Girl3_7[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/7.4bpp"); -const u32 gFieldObjectPic_Girl3_8[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/8.4bpp"); -const u32 gFieldObjectPic_Boy4_0[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/0.4bpp"); -const u32 gFieldObjectPic_Boy4_1[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/1.4bpp"); -const u32 gFieldObjectPic_Boy4_2[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/2.4bpp"); -const u32 gFieldObjectPic_Boy4_3[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/3.4bpp"); -const u32 gFieldObjectPic_Boy4_4[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/4.4bpp"); -const u32 gFieldObjectPic_Boy4_5[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/5.4bpp"); -const u32 gFieldObjectPic_Boy4_6[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/6.4bpp"); -const u32 gFieldObjectPic_Boy4_7[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/7.4bpp"); -const u32 gFieldObjectPic_Boy4_8[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/8.4bpp"); -const u32 gFieldObjectPic_Woman1_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/0.4bpp"); -const u32 gFieldObjectPic_Woman1_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/1.4bpp"); -const u32 gFieldObjectPic_Woman1_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/2.4bpp"); -const u32 gFieldObjectPic_Woman1_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/3.4bpp"); -const u32 gFieldObjectPic_Woman1_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/4.4bpp"); -const u32 gFieldObjectPic_Woman1_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/5.4bpp"); -const u32 gFieldObjectPic_Woman1_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/6.4bpp"); -const u32 gFieldObjectPic_Woman1_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/7.4bpp"); -const u32 gFieldObjectPic_Woman1_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/8.4bpp"); -const u32 gFieldObjectPic_FatMan_0[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/0.4bpp"); -const u32 gFieldObjectPic_FatMan_1[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/1.4bpp"); -const u32 gFieldObjectPic_FatMan_2[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/2.4bpp"); -const u32 gFieldObjectPic_FatMan_3[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/3.4bpp"); -const u32 gFieldObjectPic_FatMan_4[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/4.4bpp"); -const u32 gFieldObjectPic_FatMan_5[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/5.4bpp"); -const u32 gFieldObjectPic_FatMan_6[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/6.4bpp"); -const u32 gFieldObjectPic_FatMan_7[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/7.4bpp"); -const u32 gFieldObjectPic_FatMan_8[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/8.4bpp"); -const u32 gFieldObjectPic_Woman2_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/0.4bpp"); -const u32 gFieldObjectPic_Woman2_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/1.4bpp"); -const u32 gFieldObjectPic_Woman2_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/2.4bpp"); -const u32 gFieldObjectPic_Woman2_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/3.4bpp"); -const u32 gFieldObjectPic_Woman2_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/4.4bpp"); -const u32 gFieldObjectPic_Woman2_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/5.4bpp"); -const u32 gFieldObjectPic_Woman2_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/6.4bpp"); -const u32 gFieldObjectPic_Woman2_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/7.4bpp"); -const u32 gFieldObjectPic_Woman2_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/8.4bpp"); -const u32 gFieldObjectPic_Man1_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/0.4bpp"); -const u32 gFieldObjectPic_Man1_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/1.4bpp"); -const u32 gFieldObjectPic_Man1_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/2.4bpp"); -const u32 gFieldObjectPic_Man1_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/3.4bpp"); -const u32 gFieldObjectPic_Man1_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/4.4bpp"); -const u32 gFieldObjectPic_Man1_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/5.4bpp"); -const u32 gFieldObjectPic_Man1_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/6.4bpp"); -const u32 gFieldObjectPic_Man1_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/7.4bpp"); -const u32 gFieldObjectPic_Man1_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/8.4bpp"); -const u32 gFieldObjectPic_Woman3_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/0.4bpp"); -const u32 gFieldObjectPic_Woman3_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/1.4bpp"); -const u32 gFieldObjectPic_Woman3_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/2.4bpp"); -const u32 gFieldObjectPic_Woman3_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/3.4bpp"); -const u32 gFieldObjectPic_Woman3_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/4.4bpp"); -const u32 gFieldObjectPic_Woman3_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/5.4bpp"); -const u32 gFieldObjectPic_Woman3_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/6.4bpp"); -const u32 gFieldObjectPic_Woman3_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/7.4bpp"); -const u32 gFieldObjectPic_Woman3_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/8.4bpp"); -const u32 gFieldObjectPic_OldMan1_0[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/0.4bpp"); -const u32 gFieldObjectPic_OldMan1_1[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/1.4bpp"); -const u32 gFieldObjectPic_OldMan1_2[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/2.4bpp"); -const u32 gFieldObjectPic_OldMan1_3[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/3.4bpp"); -const u32 gFieldObjectPic_OldMan1_4[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/4.4bpp"); -const u32 gFieldObjectPic_OldMan1_5[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/5.4bpp"); -const u32 gFieldObjectPic_OldMan1_6[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/6.4bpp"); -const u32 gFieldObjectPic_OldMan1_7[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/7.4bpp"); -const u32 gFieldObjectPic_OldMan1_8[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/8.4bpp"); -const u32 gFieldObjectPic_OldWoman1_0[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/0.4bpp"); -const u32 gFieldObjectPic_OldWoman1_1[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/1.4bpp"); -const u32 gFieldObjectPic_OldWoman1_2[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/2.4bpp"); -const u32 gFieldObjectPic_OldWoman1_3[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/3.4bpp"); -const u32 gFieldObjectPic_OldWoman1_4[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/4.4bpp"); -const u32 gFieldObjectPic_OldWoman1_5[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/5.4bpp"); -const u32 gFieldObjectPic_OldWoman1_6[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/6.4bpp"); -const u32 gFieldObjectPic_OldWoman1_7[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/7.4bpp"); -const u32 gFieldObjectPic_OldWoman1_8[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/8.4bpp"); -const u32 gFieldObjectPic_Man2_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/0.4bpp"); -const u32 gFieldObjectPic_Man2_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/1.4bpp"); -const u32 gFieldObjectPic_Man2_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/2.4bpp"); -const u32 gFieldObjectPic_Man2_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/3.4bpp"); -const u32 gFieldObjectPic_Man2_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/4.4bpp"); -const u32 gFieldObjectPic_Man2_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/5.4bpp"); -const u32 gFieldObjectPic_Man2_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/6.4bpp"); -const u32 gFieldObjectPic_Man2_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/7.4bpp"); -const u32 gFieldObjectPic_Man2_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/8.4bpp"); -const u32 gFieldObjectPic_Woman4_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/0.4bpp"); -const u32 gFieldObjectPic_Woman4_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/1.4bpp"); -const u32 gFieldObjectPic_Woman4_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/2.4bpp"); -const u32 gFieldObjectPic_Woman4_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/3.4bpp"); -const u32 gFieldObjectPic_Woman4_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/4.4bpp"); -const u32 gFieldObjectPic_Woman4_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/5.4bpp"); -const u32 gFieldObjectPic_Woman4_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/6.4bpp"); -const u32 gFieldObjectPic_Woman4_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/7.4bpp"); -const u32 gFieldObjectPic_Woman4_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/8.4bpp"); -const u32 gFieldObjectPic_Man3_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/0.4bpp"); -const u32 gFieldObjectPic_Man3_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/1.4bpp"); -const u32 gFieldObjectPic_Man3_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/2.4bpp"); -const u32 gFieldObjectPic_Man3_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/3.4bpp"); -const u32 gFieldObjectPic_Man3_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/4.4bpp"); -const u32 gFieldObjectPic_Man3_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/5.4bpp"); -const u32 gFieldObjectPic_Man3_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/6.4bpp"); -const u32 gFieldObjectPic_Man3_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/7.4bpp"); -const u32 gFieldObjectPic_Man3_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/8.4bpp"); -const u32 gFieldObjectPic_Woman5_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/0.4bpp"); -const u32 gFieldObjectPic_Woman5_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/1.4bpp"); -const u32 gFieldObjectPic_Woman5_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/2.4bpp"); -const u32 gFieldObjectPic_Woman5_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/3.4bpp"); -const u32 gFieldObjectPic_Woman5_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/4.4bpp"); -const u32 gFieldObjectPic_Woman5_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/5.4bpp"); -const u32 gFieldObjectPic_Woman5_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/6.4bpp"); -const u32 gFieldObjectPic_Woman5_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/7.4bpp"); -const u32 gFieldObjectPic_Woman5_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/8.4bpp"); -const u32 gFieldObjectPic_Cook_0[] = INCBIN_U32("graphics/map_objects/pics/people/cook/0.4bpp"); -const u32 gFieldObjectPic_Cook_1[] = INCBIN_U32("graphics/map_objects/pics/people/cook/1.4bpp"); -const u32 gFieldObjectPic_Cook_2[] = INCBIN_U32("graphics/map_objects/pics/people/cook/2.4bpp"); -const u32 gFieldObjectPic_Woman6_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/0.4bpp"); -const u32 gFieldObjectPic_Woman6_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/1.4bpp"); -const u32 gFieldObjectPic_Woman6_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/2.4bpp"); -const u32 gFieldObjectPic_Woman6_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/3.4bpp"); -const u32 gFieldObjectPic_Woman6_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/4.4bpp"); -const u32 gFieldObjectPic_Woman6_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/5.4bpp"); -const u32 gFieldObjectPic_Woman6_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/6.4bpp"); -const u32 gFieldObjectPic_Woman6_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/7.4bpp"); -const u32 gFieldObjectPic_Woman6_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/8.4bpp"); -const u32 gFieldObjectPic_OldMan2_0[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_2/0.4bpp"); -const u32 gFieldObjectPic_OldMan2_1[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_2/1.4bpp"); -const u32 gFieldObjectPic_OldMan2_2[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_2/2.4bpp"); -const u32 gFieldObjectPic_OldWoman2_0[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/0.4bpp"); -const u32 gFieldObjectPic_OldWoman2_1[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/1.4bpp"); -const u32 gFieldObjectPic_OldWoman2_2[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/2.4bpp"); -const u32 gFieldObjectPic_OldWoman2_3[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/3.4bpp"); -const u32 gFieldObjectPic_OldWoman2_4[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/4.4bpp"); -const u32 gFieldObjectPic_OldWoman2_5[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/5.4bpp"); -const u32 gFieldObjectPic_OldWoman2_6[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/6.4bpp"); -const u32 gFieldObjectPic_OldWoman2_7[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/7.4bpp"); -const u32 gFieldObjectPic_OldWoman2_8[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/8.4bpp"); -const u32 gFieldObjectPic_Camper_0[] = INCBIN_U32("graphics/map_objects/pics/people/camper/0.4bpp"); -const u32 gFieldObjectPic_Camper_1[] = INCBIN_U32("graphics/map_objects/pics/people/camper/1.4bpp"); -const u32 gFieldObjectPic_Camper_2[] = INCBIN_U32("graphics/map_objects/pics/people/camper/2.4bpp"); -const u32 gFieldObjectPic_Camper_3[] = INCBIN_U32("graphics/map_objects/pics/people/camper/3.4bpp"); -const u32 gFieldObjectPic_Camper_4[] = INCBIN_U32("graphics/map_objects/pics/people/camper/4.4bpp"); -const u32 gFieldObjectPic_Camper_5[] = INCBIN_U32("graphics/map_objects/pics/people/camper/5.4bpp"); -const u32 gFieldObjectPic_Camper_6[] = INCBIN_U32("graphics/map_objects/pics/people/camper/6.4bpp"); -const u32 gFieldObjectPic_Camper_7[] = INCBIN_U32("graphics/map_objects/pics/people/camper/7.4bpp"); -const u32 gFieldObjectPic_Camper_8[] = INCBIN_U32("graphics/map_objects/pics/people/camper/8.4bpp"); -const u32 gFieldObjectPic_Picnicker_0[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/0.4bpp"); -const u32 gFieldObjectPic_Picnicker_1[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/1.4bpp"); -const u32 gFieldObjectPic_Picnicker_2[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/2.4bpp"); -const u32 gFieldObjectPic_Picnicker_3[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/3.4bpp"); -const u32 gFieldObjectPic_Picnicker_4[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/4.4bpp"); -const u32 gFieldObjectPic_Picnicker_5[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/5.4bpp"); -const u32 gFieldObjectPic_Picnicker_6[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/6.4bpp"); -const u32 gFieldObjectPic_Picnicker_7[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/7.4bpp"); -const u32 gFieldObjectPic_Picnicker_8[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/8.4bpp"); -const u32 gFieldObjectPic_Man4_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/0.4bpp"); -const u32 gFieldObjectPic_Man4_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/1.4bpp"); -const u32 gFieldObjectPic_Man4_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/2.4bpp"); -const u32 gFieldObjectPic_Man4_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/3.4bpp"); -const u32 gFieldObjectPic_Man4_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/4.4bpp"); -const u32 gFieldObjectPic_Man4_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/5.4bpp"); -const u32 gFieldObjectPic_Man4_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/6.4bpp"); -const u32 gFieldObjectPic_Man4_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/7.4bpp"); -const u32 gFieldObjectPic_Man4_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/8.4bpp"); -const u32 gFieldObjectPic_Woman7_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/0.4bpp"); -const u32 gFieldObjectPic_Woman7_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/1.4bpp"); -const u32 gFieldObjectPic_Woman7_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/2.4bpp"); -const u32 gFieldObjectPic_Woman7_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/3.4bpp"); -const u32 gFieldObjectPic_Woman7_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/4.4bpp"); -const u32 gFieldObjectPic_Woman7_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/5.4bpp"); -const u32 gFieldObjectPic_Woman7_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/6.4bpp"); -const u32 gFieldObjectPic_Woman7_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/7.4bpp"); -const u32 gFieldObjectPic_Woman7_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/8.4bpp"); -const u32 gFieldObjectPic_Youngster_0[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/0.4bpp"); -const u32 gFieldObjectPic_Youngster_1[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/1.4bpp"); -const u32 gFieldObjectPic_Youngster_2[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/2.4bpp"); -const u32 gFieldObjectPic_Youngster_3[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/3.4bpp"); -const u32 gFieldObjectPic_Youngster_4[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/4.4bpp"); -const u32 gFieldObjectPic_Youngster_5[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/5.4bpp"); -const u32 gFieldObjectPic_Youngster_6[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/6.4bpp"); -const u32 gFieldObjectPic_Youngster_7[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/7.4bpp"); -const u32 gFieldObjectPic_Youngster_8[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/8.4bpp"); -const u32 gFieldObjectPic_BugCatcher_0[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/0.4bpp"); -const u32 gFieldObjectPic_BugCatcher_1[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/1.4bpp"); -const u32 gFieldObjectPic_BugCatcher_2[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/2.4bpp"); -const u32 gFieldObjectPic_BugCatcher_3[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/3.4bpp"); -const u32 gFieldObjectPic_BugCatcher_4[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/4.4bpp"); -const u32 gFieldObjectPic_BugCatcher_5[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/5.4bpp"); -const u32 gFieldObjectPic_BugCatcher_6[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/6.4bpp"); -const u32 gFieldObjectPic_BugCatcher_7[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/7.4bpp"); -const u32 gFieldObjectPic_BugCatcher_8[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/8.4bpp"); -const u32 gFieldObjectPic_PsychicM_0[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/0.4bpp"); -const u32 gFieldObjectPic_PsychicM_1[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/1.4bpp"); -const u32 gFieldObjectPic_PsychicM_2[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/2.4bpp"); -const u32 gFieldObjectPic_PsychicM_3[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/3.4bpp"); -const u32 gFieldObjectPic_PsychicM_4[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/4.4bpp"); -const u32 gFieldObjectPic_PsychicM_5[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/5.4bpp"); -const u32 gFieldObjectPic_PsychicM_6[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/6.4bpp"); -const u32 gFieldObjectPic_PsychicM_7[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/7.4bpp"); -const u32 gFieldObjectPic_PsychicM_8[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/8.4bpp"); -const u32 gFieldObjectPic_SchoolKidM_0[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/0.4bpp"); -const u32 gFieldObjectPic_SchoolKidM_1[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/1.4bpp"); -const u32 gFieldObjectPic_SchoolKidM_2[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/2.4bpp"); -const u32 gFieldObjectPic_SchoolKidM_3[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/3.4bpp"); -const u32 gFieldObjectPic_SchoolKidM_4[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/4.4bpp"); -const u32 gFieldObjectPic_SchoolKidM_5[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/5.4bpp"); -const u32 gFieldObjectPic_SchoolKidM_6[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/6.4bpp"); -const u32 gFieldObjectPic_SchoolKidM_7[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/7.4bpp"); -const u32 gFieldObjectPic_SchoolKidM_8[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/8.4bpp"); -const u32 gFieldObjectPic_Maniac_0[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/0.4bpp"); -const u32 gFieldObjectPic_Maniac_1[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/1.4bpp"); -const u32 gFieldObjectPic_Maniac_2[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/2.4bpp"); -const u32 gFieldObjectPic_Maniac_3[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/3.4bpp"); -const u32 gFieldObjectPic_Maniac_4[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/4.4bpp"); -const u32 gFieldObjectPic_Maniac_5[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/5.4bpp"); -const u32 gFieldObjectPic_Maniac_6[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/6.4bpp"); -const u32 gFieldObjectPic_Maniac_7[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/7.4bpp"); -const u32 gFieldObjectPic_Maniac_8[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/8.4bpp"); -const u32 gFieldObjectPic_HexManiac_0[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/0.4bpp"); -const u32 gFieldObjectPic_HexManiac_1[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/1.4bpp"); -const u32 gFieldObjectPic_HexManiac_2[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/2.4bpp"); -const u32 gFieldObjectPic_HexManiac_3[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/3.4bpp"); -const u32 gFieldObjectPic_HexManiac_4[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/4.4bpp"); -const u32 gFieldObjectPic_HexManiac_5[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/5.4bpp"); -const u32 gFieldObjectPic_HexManiac_6[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/6.4bpp"); -const u32 gFieldObjectPic_HexManiac_7[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/7.4bpp"); -const u32 gFieldObjectPic_HexManiac_8[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/8.4bpp"); -const u32 gFieldObjectPic_UnusedWoman_0[] = INCBIN_U32("graphics/map_objects/pics/people/unused_woman/0.4bpp"); -const u32 gFieldObjectPic_UnusedWoman_1[] = INCBIN_U32("graphics/map_objects/pics/people/unused_woman/1.4bpp"); -const u32 gFieldObjectPic_UnusedWoman_2[] = INCBIN_U32("graphics/map_objects/pics/people/unused_woman/2.4bpp"); -const u32 gFieldObjectPic_UnusedWoman_3[] = INCBIN_U32("graphics/map_objects/pics/people/unused_woman/3.4bpp"); -const u32 gFieldObjectPic_UnusedWoman_4[] = INCBIN_U32("graphics/map_objects/pics/people/unused_woman/4.4bpp"); -const u32 gFieldObjectPic_UnusedWoman_5[] = INCBIN_U32("graphics/map_objects/pics/people/unused_woman/5.4bpp"); -const u32 gFieldObjectPic_UnusedWoman_6[] = INCBIN_U32("graphics/map_objects/pics/people/unused_woman/6.4bpp"); -const u32 gFieldObjectPic_UnusedWoman_7[] = INCBIN_U32("graphics/map_objects/pics/people/unused_woman/7.4bpp"); -const u32 gFieldObjectPic_UnusedWoman_8[] = INCBIN_U32("graphics/map_objects/pics/people/unused_woman/8.4bpp"); -const u32 gFieldObjectPic_SwimmerM_0[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/0.4bpp"); -const u32 gFieldObjectPic_SwimmerM_1[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/1.4bpp"); -const u32 gFieldObjectPic_SwimmerM_2[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/2.4bpp"); -const u32 gFieldObjectPic_SwimmerM_3[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/3.4bpp"); -const u32 gFieldObjectPic_SwimmerM_4[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/4.4bpp"); -const u32 gFieldObjectPic_SwimmerM_5[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/5.4bpp"); -const u32 gFieldObjectPic_SwimmerM_6[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/6.4bpp"); -const u32 gFieldObjectPic_SwimmerM_7[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/7.4bpp"); -const u32 gFieldObjectPic_SwimmerM_8[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/8.4bpp"); -const u32 gFieldObjectPic_SwimmerF_0[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/0.4bpp"); -const u32 gFieldObjectPic_SwimmerF_1[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/1.4bpp"); -const u32 gFieldObjectPic_SwimmerF_2[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/2.4bpp"); -const u32 gFieldObjectPic_SwimmerF_3[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/3.4bpp"); -const u32 gFieldObjectPic_SwimmerF_4[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/4.4bpp"); -const u32 gFieldObjectPic_SwimmerF_5[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/5.4bpp"); -const u32 gFieldObjectPic_SwimmerF_6[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/6.4bpp"); -const u32 gFieldObjectPic_SwimmerF_7[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/7.4bpp"); -const u32 gFieldObjectPic_SwimmerF_8[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/8.4bpp"); -const u32 gFieldObjectPic_BlackBelt_0[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/0.4bpp"); -const u32 gFieldObjectPic_BlackBelt_1[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/1.4bpp"); -const u32 gFieldObjectPic_BlackBelt_2[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/2.4bpp"); -const u32 gFieldObjectPic_BlackBelt_3[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/3.4bpp"); -const u32 gFieldObjectPic_BlackBelt_4[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/4.4bpp"); -const u32 gFieldObjectPic_BlackBelt_5[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/5.4bpp"); -const u32 gFieldObjectPic_BlackBelt_6[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/6.4bpp"); -const u32 gFieldObjectPic_BlackBelt_7[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/7.4bpp"); -const u32 gFieldObjectPic_BlackBelt_8[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/8.4bpp"); -const u32 gFieldObjectPic_Beauty_0[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/0.4bpp"); -const u32 gFieldObjectPic_Beauty_1[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/1.4bpp"); -const u32 gFieldObjectPic_Beauty_2[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/2.4bpp"); -const u32 gFieldObjectPic_Beauty_3[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/3.4bpp"); -const u32 gFieldObjectPic_Beauty_4[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/4.4bpp"); -const u32 gFieldObjectPic_Beauty_5[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/5.4bpp"); -const u32 gFieldObjectPic_Beauty_6[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/6.4bpp"); -const u32 gFieldObjectPic_Beauty_7[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/7.4bpp"); -const u32 gFieldObjectPic_Beauty_8[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/8.4bpp"); -const u32 gFieldObjectPic_Scientist1_0[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/0.4bpp"); -const u32 gFieldObjectPic_Scientist1_1[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/1.4bpp"); -const u32 gFieldObjectPic_Scientist1_2[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/2.4bpp"); -const u32 gFieldObjectPic_Scientist1_3[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/3.4bpp"); -const u32 gFieldObjectPic_Scientist1_4[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/4.4bpp"); -const u32 gFieldObjectPic_Scientist1_5[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/5.4bpp"); -const u32 gFieldObjectPic_Scientist1_6[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/6.4bpp"); -const u32 gFieldObjectPic_Scientist1_7[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/7.4bpp"); -const u32 gFieldObjectPic_Scientist1_8[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/8.4bpp"); -const u32 gFieldObjectPic_Lass_0[] = INCBIN_U32("graphics/map_objects/pics/people/lass/0.4bpp"); -const u32 gFieldObjectPic_Lass_1[] = INCBIN_U32("graphics/map_objects/pics/people/lass/1.4bpp"); -const u32 gFieldObjectPic_Lass_2[] = INCBIN_U32("graphics/map_objects/pics/people/lass/2.4bpp"); -const u32 gFieldObjectPic_Lass_3[] = INCBIN_U32("graphics/map_objects/pics/people/lass/3.4bpp"); -const u32 gFieldObjectPic_Lass_4[] = INCBIN_U32("graphics/map_objects/pics/people/lass/4.4bpp"); -const u32 gFieldObjectPic_Lass_5[] = INCBIN_U32("graphics/map_objects/pics/people/lass/5.4bpp"); -const u32 gFieldObjectPic_Lass_6[] = INCBIN_U32("graphics/map_objects/pics/people/lass/6.4bpp"); -const u32 gFieldObjectPic_Lass_7[] = INCBIN_U32("graphics/map_objects/pics/people/lass/7.4bpp"); -const u32 gFieldObjectPic_Lass_8[] = INCBIN_U32("graphics/map_objects/pics/people/lass/8.4bpp"); -const u32 gFieldObjectPic_Gentleman_0[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/0.4bpp"); -const u32 gFieldObjectPic_Gentleman_1[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/1.4bpp"); -const u32 gFieldObjectPic_Gentleman_2[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/2.4bpp"); -const u32 gFieldObjectPic_Gentleman_3[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/3.4bpp"); -const u32 gFieldObjectPic_Gentleman_4[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/4.4bpp"); -const u32 gFieldObjectPic_Gentleman_5[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/5.4bpp"); -const u32 gFieldObjectPic_Gentleman_6[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/6.4bpp"); -const u32 gFieldObjectPic_Gentleman_7[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/7.4bpp"); -const u32 gFieldObjectPic_Gentleman_8[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/8.4bpp"); -const u32 gFieldObjectPic_Sailor_0[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/0.4bpp"); -const u32 gFieldObjectPic_Sailor_1[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/1.4bpp"); -const u32 gFieldObjectPic_Sailor_2[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/2.4bpp"); -const u32 gFieldObjectPic_Sailor_3[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/3.4bpp"); -const u32 gFieldObjectPic_Sailor_4[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/4.4bpp"); -const u32 gFieldObjectPic_Sailor_5[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/5.4bpp"); -const u32 gFieldObjectPic_Sailor_6[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/6.4bpp"); -const u32 gFieldObjectPic_Sailor_7[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/7.4bpp"); -const u32 gFieldObjectPic_Sailor_8[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/8.4bpp"); -const u32 gFieldObjectPic_Fisherman_0[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/0.4bpp"); -const u32 gFieldObjectPic_Fisherman_1[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/1.4bpp"); -const u32 gFieldObjectPic_Fisherman_2[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/2.4bpp"); -const u32 gFieldObjectPic_Fisherman_3[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/3.4bpp"); -const u32 gFieldObjectPic_Fisherman_4[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/4.4bpp"); -const u32 gFieldObjectPic_Fisherman_5[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/5.4bpp"); -const u32 gFieldObjectPic_Fisherman_6[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/6.4bpp"); -const u32 gFieldObjectPic_Fisherman_7[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/7.4bpp"); -const u32 gFieldObjectPic_Fisherman_8[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/8.4bpp"); -const u32 gFieldObjectPic_RunningTriathleteM_0[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/0.4bpp"); -const u32 gFieldObjectPic_RunningTriathleteM_1[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/1.4bpp"); -const u32 gFieldObjectPic_RunningTriathleteM_2[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/2.4bpp"); -const u32 gFieldObjectPic_RunningTriathleteM_3[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/3.4bpp"); -const u32 gFieldObjectPic_RunningTriathleteM_4[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/4.4bpp"); -const u32 gFieldObjectPic_RunningTriathleteM_5[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/5.4bpp"); -const u32 gFieldObjectPic_RunningTriathleteM_6[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/6.4bpp"); -const u32 gFieldObjectPic_RunningTriathleteM_7[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/7.4bpp"); -const u32 gFieldObjectPic_RunningTriathleteM_8[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/8.4bpp"); -const u32 gFieldObjectPic_RunningTriathleteF_0[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/0.4bpp"); -const u32 gFieldObjectPic_RunningTriathleteF_1[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/1.4bpp"); -const u32 gFieldObjectPic_RunningTriathleteF_2[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/2.4bpp"); -const u32 gFieldObjectPic_RunningTriathleteF_3[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/3.4bpp"); -const u32 gFieldObjectPic_RunningTriathleteF_4[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/4.4bpp"); -const u32 gFieldObjectPic_RunningTriathleteF_5[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/5.4bpp"); -const u32 gFieldObjectPic_RunningTriathleteF_6[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/6.4bpp"); -const u32 gFieldObjectPic_RunningTriathleteF_7[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/7.4bpp"); -const u32 gFieldObjectPic_RunningTriathleteF_8[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/8.4bpp"); -const u32 gFieldObjectPic_TuberF_0[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/0.4bpp"); -const u32 gFieldObjectPic_TuberF_1[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/1.4bpp"); -const u32 gFieldObjectPic_TuberF_2[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/2.4bpp"); -const u32 gFieldObjectPic_TuberF_3[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/3.4bpp"); -const u32 gFieldObjectPic_TuberF_4[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/4.4bpp"); -const u32 gFieldObjectPic_TuberF_5[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/5.4bpp"); -const u32 gFieldObjectPic_TuberF_6[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/6.4bpp"); -const u32 gFieldObjectPic_TuberF_7[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/7.4bpp"); -const u32 gFieldObjectPic_TuberF_8[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/8.4bpp"); -const u32 gFieldObjectPic_TuberM_0[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/0.4bpp"); -const u32 gFieldObjectPic_TuberM_1[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/1.4bpp"); -const u32 gFieldObjectPic_TuberM_2[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/2.4bpp"); -const u32 gFieldObjectPic_TuberM_3[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/3.4bpp"); -const u32 gFieldObjectPic_TuberM_4[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/4.4bpp"); -const u32 gFieldObjectPic_TuberM_5[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/5.4bpp"); -const u32 gFieldObjectPic_TuberM_6[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/6.4bpp"); -const u32 gFieldObjectPic_TuberM_7[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/7.4bpp"); -const u32 gFieldObjectPic_TuberM_8[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/8.4bpp"); -const u32 gFieldObjectPic_Hiker_0[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/0.4bpp"); -const u32 gFieldObjectPic_Hiker_1[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/1.4bpp"); -const u32 gFieldObjectPic_Hiker_2[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/2.4bpp"); -const u32 gFieldObjectPic_Hiker_3[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/3.4bpp"); -const u32 gFieldObjectPic_Hiker_4[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/4.4bpp"); -const u32 gFieldObjectPic_Hiker_5[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/5.4bpp"); -const u32 gFieldObjectPic_Hiker_6[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/6.4bpp"); -const u32 gFieldObjectPic_Hiker_7[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/7.4bpp"); -const u32 gFieldObjectPic_Hiker_8[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/8.4bpp"); -const u32 gFieldObjectPic_CyclingTriathleteM_0[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/0.4bpp"); -const u32 gFieldObjectPic_CyclingTriathleteM_1[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/1.4bpp"); -const u32 gFieldObjectPic_CyclingTriathleteM_2[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/2.4bpp"); -const u32 gFieldObjectPic_CyclingTriathleteM_3[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/3.4bpp"); -const u32 gFieldObjectPic_CyclingTriathleteM_4[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/4.4bpp"); -const u32 gFieldObjectPic_CyclingTriathleteM_5[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/5.4bpp"); -const u32 gFieldObjectPic_CyclingTriathleteM_6[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/6.4bpp"); -const u32 gFieldObjectPic_CyclingTriathleteM_7[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/7.4bpp"); -const u32 gFieldObjectPic_CyclingTriathleteM_8[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/8.4bpp"); -const u32 gFieldObjectPic_CyclingTriathleteF_0[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/0.4bpp"); -const u32 gFieldObjectPic_CyclingTriathleteF_1[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/1.4bpp"); -const u32 gFieldObjectPic_CyclingTriathleteF_2[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/2.4bpp"); -const u32 gFieldObjectPic_CyclingTriathleteF_3[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/3.4bpp"); -const u32 gFieldObjectPic_CyclingTriathleteF_4[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/4.4bpp"); -const u32 gFieldObjectPic_CyclingTriathleteF_5[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/5.4bpp"); -const u32 gFieldObjectPic_CyclingTriathleteF_6[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/6.4bpp"); -const u32 gFieldObjectPic_CyclingTriathleteF_7[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/7.4bpp"); -const u32 gFieldObjectPic_CyclingTriathleteF_8[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/8.4bpp"); -const u32 gFieldObjectPic_Man5_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/0.4bpp"); -const u32 gFieldObjectPic_Man5_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/1.4bpp"); -const u32 gFieldObjectPic_Man5_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/2.4bpp"); -const u32 gFieldObjectPic_Man5_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/3.4bpp"); -const u32 gFieldObjectPic_Man5_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/4.4bpp"); -const u32 gFieldObjectPic_Man5_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/5.4bpp"); -const u32 gFieldObjectPic_Man5_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/6.4bpp"); -const u32 gFieldObjectPic_Man5_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/7.4bpp"); -const u32 gFieldObjectPic_Man5_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/8.4bpp"); -const u32 gFieldObjectPic_Man6_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/0.4bpp"); -const u32 gFieldObjectPic_Man6_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/1.4bpp"); -const u32 gFieldObjectPic_Man6_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/2.4bpp"); -const u32 gFieldObjectPic_Man6_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/3.4bpp"); -const u32 gFieldObjectPic_Man6_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/4.4bpp"); -const u32 gFieldObjectPic_Man6_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/5.4bpp"); -const u32 gFieldObjectPic_Man6_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/6.4bpp"); -const u32 gFieldObjectPic_Man6_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/7.4bpp"); -const u32 gFieldObjectPic_Man6_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/8.4bpp"); -const u32 gFieldObjectPic_Nurse_0[] = INCBIN_U32("graphics/map_objects/pics/people/nurse/0.4bpp"); -const u32 gFieldObjectPic_Nurse_1[] = INCBIN_U32("graphics/map_objects/pics/people/nurse/1.4bpp"); -const u32 gFieldObjectPic_Nurse_2[] = INCBIN_U32("graphics/map_objects/pics/people/nurse/2.4bpp"); -const u32 gFieldObjectPic_Nurse_3[] = INCBIN_U32("graphics/map_objects/pics/people/nurse/3.4bpp"); -const u32 gFieldObjectPic_ItemBall[] = INCBIN_U32("graphics/map_objects/pics/misc/item_ball.4bpp"); -const u32 gFieldObjectPic_ProfBirch_0[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/0.4bpp"); -const u32 gFieldObjectPic_ProfBirch_1[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/1.4bpp"); -const u32 gFieldObjectPic_ProfBirch_2[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/2.4bpp"); -const u32 gFieldObjectPic_ProfBirch_3[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/3.4bpp"); -const u32 gFieldObjectPic_ProfBirch_4[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/4.4bpp"); -const u32 gFieldObjectPic_ProfBirch_5[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/5.4bpp"); -const u32 gFieldObjectPic_ProfBirch_6[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/6.4bpp"); -const u32 gFieldObjectPic_ProfBirch_7[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/7.4bpp"); -const u32 gFieldObjectPic_ProfBirch_8[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/8.4bpp"); -const u32 gFieldObjectPic_ReporterM_0[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/0.4bpp"); -const u32 gFieldObjectPic_ReporterM_1[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/1.4bpp"); -const u32 gFieldObjectPic_ReporterM_2[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/2.4bpp"); -const u32 gFieldObjectPic_ReporterM_3[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/3.4bpp"); -const u32 gFieldObjectPic_ReporterM_4[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/4.4bpp"); -const u32 gFieldObjectPic_ReporterM_5[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/5.4bpp"); -const u32 gFieldObjectPic_ReporterM_6[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/6.4bpp"); -const u32 gFieldObjectPic_ReporterM_7[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/7.4bpp"); -const u32 gFieldObjectPic_ReporterM_8[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/8.4bpp"); -const u32 gFieldObjectPic_ReporterF_0[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/0.4bpp"); -const u32 gFieldObjectPic_ReporterF_1[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/1.4bpp"); -const u32 gFieldObjectPic_ReporterF_2[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/2.4bpp"); -const u32 gFieldObjectPic_ReporterF_3[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/3.4bpp"); -const u32 gFieldObjectPic_ReporterF_4[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/4.4bpp"); -const u32 gFieldObjectPic_ReporterF_5[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/5.4bpp"); -const u32 gFieldObjectPic_ReporterF_6[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/6.4bpp"); -const u32 gFieldObjectPic_ReporterF_7[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/7.4bpp"); -const u32 gFieldObjectPic_ReporterF_8[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/8.4bpp"); -const u32 gFieldObjectPic_MauvilleOldMan1_0[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/0.4bpp"); -const u32 gFieldObjectPic_MauvilleOldMan1_1[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/1.4bpp"); -const u32 gFieldObjectPic_MauvilleOldMan1_2[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/2.4bpp"); -const u32 gFieldObjectPic_MauvilleOldMan1_3[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/3.4bpp"); -const u32 gFieldObjectPic_MauvilleOldMan1_4[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/4.4bpp"); -const u32 gFieldObjectPic_MauvilleOldMan1_5[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/5.4bpp"); -const u32 gFieldObjectPic_MauvilleOldMan1_6[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/6.4bpp"); -const u32 gFieldObjectPic_MauvilleOldMan1_7[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/7.4bpp"); -const u32 gFieldObjectPic_MauvilleOldMan1_8[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/8.4bpp"); -const u32 gFieldObjectPic_MauvilleOldMan2_0[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/0.4bpp"); -const u32 gFieldObjectPic_MauvilleOldMan2_1[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/1.4bpp"); -const u32 gFieldObjectPic_MauvilleOldMan2_2[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/2.4bpp"); -const u32 gFieldObjectPic_MauvilleOldMan2_3[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/3.4bpp"); -const u32 gFieldObjectPic_MauvilleOldMan2_4[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/4.4bpp"); -const u32 gFieldObjectPic_MauvilleOldMan2_5[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/5.4bpp"); -const u32 gFieldObjectPic_MauvilleOldMan2_6[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/6.4bpp"); -const u32 gFieldObjectPic_MauvilleOldMan2_7[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/7.4bpp"); -const u32 gFieldObjectPic_MauvilleOldMan2_8[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/8.4bpp"); -const u32 gFieldObjectPic_MartEmployee_0[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/0.4bpp"); -const u32 gFieldObjectPic_MartEmployee_1[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/1.4bpp"); -const u32 gFieldObjectPic_MartEmployee_2[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/2.4bpp"); -const u32 gFieldObjectPic_MartEmployee_3[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/3.4bpp"); -const u32 gFieldObjectPic_MartEmployee_4[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/4.4bpp"); -const u32 gFieldObjectPic_MartEmployee_5[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/5.4bpp"); -const u32 gFieldObjectPic_MartEmployee_6[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/6.4bpp"); -const u32 gFieldObjectPic_MartEmployee_7[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/7.4bpp"); -const u32 gFieldObjectPic_MartEmployee_8[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/8.4bpp"); -const u32 gFieldObjectPic_RooftopSaleWoman_0[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/0.4bpp"); -const u32 gFieldObjectPic_RooftopSaleWoman_1[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/1.4bpp"); -const u32 gFieldObjectPic_RooftopSaleWoman_2[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/2.4bpp"); -const u32 gFieldObjectPic_RooftopSaleWoman_3[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/3.4bpp"); -const u32 gFieldObjectPic_RooftopSaleWoman_4[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/4.4bpp"); -const u32 gFieldObjectPic_RooftopSaleWoman_5[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/5.4bpp"); -const u32 gFieldObjectPic_RooftopSaleWoman_6[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/6.4bpp"); -const u32 gFieldObjectPic_RooftopSaleWoman_7[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/7.4bpp"); -const u32 gFieldObjectPic_RooftopSaleWoman_8[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/8.4bpp"); -const u32 gFieldObjectPic_Teala_0[] = INCBIN_U32("graphics/map_objects/pics/people/teala/0.4bpp"); -const u32 gFieldObjectPic_Teala_1[] = INCBIN_U32("graphics/map_objects/pics/people/teala/1.4bpp"); -const u32 gFieldObjectPic_Teala_2[] = INCBIN_U32("graphics/map_objects/pics/people/teala/2.4bpp"); -const u32 gFieldObjectPic_Teala_3[] = INCBIN_U32("graphics/map_objects/pics/people/teala/3.4bpp"); -const u32 gFieldObjectPic_Teala_4[] = INCBIN_U32("graphics/map_objects/pics/people/teala/4.4bpp"); -const u32 gFieldObjectPic_Teala_5[] = INCBIN_U32("graphics/map_objects/pics/people/teala/5.4bpp"); -const u32 gFieldObjectPic_Teala_6[] = INCBIN_U32("graphics/map_objects/pics/people/teala/6.4bpp"); -const u32 gFieldObjectPic_Teala_7[] = INCBIN_U32("graphics/map_objects/pics/people/teala/7.4bpp"); -const u32 gFieldObjectPic_Teala_8[] = INCBIN_U32("graphics/map_objects/pics/people/teala/8.4bpp"); -const u32 gFieldObjectPic_Artist_0[] = INCBIN_U32("graphics/map_objects/pics/people/artist/0.4bpp"); -const u32 gFieldObjectPic_Artist_1[] = INCBIN_U32("graphics/map_objects/pics/people/artist/1.4bpp"); -const u32 gFieldObjectPic_Artist_2[] = INCBIN_U32("graphics/map_objects/pics/people/artist/2.4bpp"); -const u32 gFieldObjectPic_Artist_3[] = INCBIN_U32("graphics/map_objects/pics/people/artist/3.4bpp"); -const u32 gFieldObjectPic_Artist_4[] = INCBIN_U32("graphics/map_objects/pics/people/artist/4.4bpp"); -const u32 gFieldObjectPic_Artist_5[] = INCBIN_U32("graphics/map_objects/pics/people/artist/5.4bpp"); -const u32 gFieldObjectPic_Artist_6[] = INCBIN_U32("graphics/map_objects/pics/people/artist/6.4bpp"); -const u32 gFieldObjectPic_Artist_7[] = INCBIN_U32("graphics/map_objects/pics/people/artist/7.4bpp"); -const u32 gFieldObjectPic_Artist_8[] = INCBIN_U32("graphics/map_objects/pics/people/artist/8.4bpp"); -const u32 gFieldObjectPic_Cameraman_0[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/0.4bpp"); -const u32 gFieldObjectPic_Cameraman_1[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/1.4bpp"); -const u32 gFieldObjectPic_Cameraman_2[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/2.4bpp"); -const u32 gFieldObjectPic_Cameraman_3[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/3.4bpp"); -const u32 gFieldObjectPic_Cameraman_4[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/4.4bpp"); -const u32 gFieldObjectPic_Cameraman_5[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/5.4bpp"); -const u32 gFieldObjectPic_Cameraman_6[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/6.4bpp"); -const u32 gFieldObjectPic_Cameraman_7[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/7.4bpp"); -const u32 gFieldObjectPic_Cameraman_8[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/8.4bpp"); -const u32 gFieldObjectPic_Scientist2_0[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/0.4bpp"); -const u32 gFieldObjectPic_Scientist2_1[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/1.4bpp"); -const u32 gFieldObjectPic_Scientist2_2[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/2.4bpp"); -const u32 gFieldObjectPic_Scientist2_3[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/3.4bpp"); -const u32 gFieldObjectPic_Scientist2_4[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/4.4bpp"); -const u32 gFieldObjectPic_Scientist2_5[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/5.4bpp"); -const u32 gFieldObjectPic_Scientist2_6[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/6.4bpp"); -const u32 gFieldObjectPic_Scientist2_7[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/7.4bpp"); -const u32 gFieldObjectPic_Scientist2_8[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/8.4bpp"); -const u32 gFieldObjectPic_Man7_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/0.4bpp"); -const u32 gFieldObjectPic_Man7_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/1.4bpp"); -const u32 gFieldObjectPic_Man7_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/2.4bpp"); -const u32 gFieldObjectPic_Man7_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/3.4bpp"); -const u32 gFieldObjectPic_Man7_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/4.4bpp"); -const u32 gFieldObjectPic_Man7_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/5.4bpp"); -const u32 gFieldObjectPic_Man7_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/6.4bpp"); -const u32 gFieldObjectPic_Man7_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/7.4bpp"); -const u32 gFieldObjectPic_Man7_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/8.4bpp"); -const u32 gFieldObjectPic_AquaMemberM_0[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/0.4bpp"); -const u32 gFieldObjectPic_AquaMemberM_1[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/1.4bpp"); -const u32 gFieldObjectPic_AquaMemberM_2[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/2.4bpp"); -const u32 gFieldObjectPic_AquaMemberM_3[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/3.4bpp"); -const u32 gFieldObjectPic_AquaMemberM_4[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/4.4bpp"); -const u32 gFieldObjectPic_AquaMemberM_5[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/5.4bpp"); -const u32 gFieldObjectPic_AquaMemberM_6[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/6.4bpp"); -const u32 gFieldObjectPic_AquaMemberM_7[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/7.4bpp"); -const u32 gFieldObjectPic_AquaMemberM_8[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/8.4bpp"); -const u32 gFieldObjectPic_AquaMemberF_0[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/0.4bpp"); -const u32 gFieldObjectPic_AquaMemberF_1[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/1.4bpp"); -const u32 gFieldObjectPic_AquaMemberF_2[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/2.4bpp"); -const u32 gFieldObjectPic_AquaMemberF_3[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/3.4bpp"); -const u32 gFieldObjectPic_AquaMemberF_4[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/4.4bpp"); -const u32 gFieldObjectPic_AquaMemberF_5[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/5.4bpp"); -const u32 gFieldObjectPic_AquaMemberF_6[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/6.4bpp"); -const u32 gFieldObjectPic_AquaMemberF_7[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/7.4bpp"); -const u32 gFieldObjectPic_AquaMemberF_8[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/8.4bpp"); -const u32 gFieldObjectPic_MagmaMemberM_0[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/0.4bpp"); -const u32 gFieldObjectPic_MagmaMemberM_1[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/1.4bpp"); -const u32 gFieldObjectPic_MagmaMemberM_2[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/2.4bpp"); -const u32 gFieldObjectPic_MagmaMemberM_3[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/3.4bpp"); -const u32 gFieldObjectPic_MagmaMemberM_4[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/4.4bpp"); -const u32 gFieldObjectPic_MagmaMemberM_5[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/5.4bpp"); -const u32 gFieldObjectPic_MagmaMemberM_6[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/6.4bpp"); -const u32 gFieldObjectPic_MagmaMemberM_7[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/7.4bpp"); -const u32 gFieldObjectPic_MagmaMemberM_8[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/8.4bpp"); -const u32 gFieldObjectPic_MagmaMemberF_0[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/0.4bpp"); -const u32 gFieldObjectPic_MagmaMemberF_1[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/1.4bpp"); -const u32 gFieldObjectPic_MagmaMemberF_2[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/2.4bpp"); -const u32 gFieldObjectPic_MagmaMemberF_3[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/3.4bpp"); -const u32 gFieldObjectPic_MagmaMemberF_4[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/4.4bpp"); -const u32 gFieldObjectPic_MagmaMemberF_5[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/5.4bpp"); -const u32 gFieldObjectPic_MagmaMemberF_6[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/6.4bpp"); -const u32 gFieldObjectPic_MagmaMemberF_7[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/7.4bpp"); -const u32 gFieldObjectPic_MagmaMemberF_8[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/8.4bpp"); -const u32 gFieldObjectPic_Sidney_0[] = INCBIN_U32("graphics/map_objects/pics/people/sidney/0.4bpp"); -const u32 gFieldObjectPic_Sidney_1[] = INCBIN_U32("graphics/map_objects/pics/people/sidney/1.4bpp"); -const u32 gFieldObjectPic_Sidney_2[] = INCBIN_U32("graphics/map_objects/pics/people/sidney/2.4bpp"); -const u32 gFieldObjectPic_Phoebe_0[] = INCBIN_U32("graphics/map_objects/pics/people/phoebe/0.4bpp"); -const u32 gFieldObjectPic_Phoebe_1[] = INCBIN_U32("graphics/map_objects/pics/people/phoebe/1.4bpp"); -const u32 gFieldObjectPic_Phoebe_2[] = INCBIN_U32("graphics/map_objects/pics/people/phoebe/2.4bpp"); -const u32 gFieldObjectPic_Glacia_0[] = INCBIN_U32("graphics/map_objects/pics/people/glacia/0.4bpp"); -const u32 gFieldObjectPic_Glacia_1[] = INCBIN_U32("graphics/map_objects/pics/people/glacia/1.4bpp"); -const u32 gFieldObjectPic_Glacia_2[] = INCBIN_U32("graphics/map_objects/pics/people/glacia/2.4bpp"); -const u32 gFieldObjectPic_Drake_0[] = INCBIN_U32("graphics/map_objects/pics/people/drake/0.4bpp"); -const u32 gFieldObjectPic_Drake_1[] = INCBIN_U32("graphics/map_objects/pics/people/drake/1.4bpp"); -const u32 gFieldObjectPic_Drake_2[] = INCBIN_U32("graphics/map_objects/pics/people/drake/2.4bpp"); -const u32 gFieldObjectPic_Roxanne_0[] = INCBIN_U32("graphics/map_objects/pics/people/roxanne/0.4bpp"); -const u32 gFieldObjectPic_Roxanne_1[] = INCBIN_U32("graphics/map_objects/pics/people/roxanne/1.4bpp"); -const u32 gFieldObjectPic_Roxanne_2[] = INCBIN_U32("graphics/map_objects/pics/people/roxanne/2.4bpp"); -const u32 gFieldObjectPic_Brawly_0[] = INCBIN_U32("graphics/map_objects/pics/people/brawly/0.4bpp"); -const u32 gFieldObjectPic_Brawly_1[] = INCBIN_U32("graphics/map_objects/pics/people/brawly/1.4bpp"); -const u32 gFieldObjectPic_Brawly_2[] = INCBIN_U32("graphics/map_objects/pics/people/brawly/2.4bpp"); -const u32 gFieldObjectPic_Wattson_0[] = INCBIN_U32("graphics/map_objects/pics/people/wattson/0.4bpp"); -const u32 gFieldObjectPic_Wattson_1[] = INCBIN_U32("graphics/map_objects/pics/people/wattson/1.4bpp"); -const u32 gFieldObjectPic_Wattson_2[] = INCBIN_U32("graphics/map_objects/pics/people/wattson/2.4bpp"); -const u32 gFieldObjectPic_Flannery_0[] = INCBIN_U32("graphics/map_objects/pics/people/flannery/0.4bpp"); -const u32 gFieldObjectPic_Flannery_1[] = INCBIN_U32("graphics/map_objects/pics/people/flannery/1.4bpp"); -const u32 gFieldObjectPic_Flannery_2[] = INCBIN_U32("graphics/map_objects/pics/people/flannery/2.4bpp"); -const u32 gFieldObjectPic_Norman_0[] = INCBIN_U32("graphics/map_objects/pics/people/norman/0.4bpp"); -const u32 gFieldObjectPic_Norman_1[] = INCBIN_U32("graphics/map_objects/pics/people/norman/1.4bpp"); -const u32 gFieldObjectPic_Norman_2[] = INCBIN_U32("graphics/map_objects/pics/people/norman/2.4bpp"); -const u32 gFieldObjectPic_Norman_3[] = INCBIN_U32("graphics/map_objects/pics/people/norman/3.4bpp"); -const u32 gFieldObjectPic_Norman_4[] = INCBIN_U32("graphics/map_objects/pics/people/norman/4.4bpp"); -const u32 gFieldObjectPic_Norman_5[] = INCBIN_U32("graphics/map_objects/pics/people/norman/5.4bpp"); -const u32 gFieldObjectPic_Norman_6[] = INCBIN_U32("graphics/map_objects/pics/people/norman/6.4bpp"); -const u32 gFieldObjectPic_Norman_7[] = INCBIN_U32("graphics/map_objects/pics/people/norman/7.4bpp"); -const u32 gFieldObjectPic_Norman_8[] = INCBIN_U32("graphics/map_objects/pics/people/norman/8.4bpp"); -const u32 gFieldObjectPic_Winona_0[] = INCBIN_U32("graphics/map_objects/pics/people/winona/0.4bpp"); -const u32 gFieldObjectPic_Winona_1[] = INCBIN_U32("graphics/map_objects/pics/people/winona/1.4bpp"); -const u32 gFieldObjectPic_Winona_2[] = INCBIN_U32("graphics/map_objects/pics/people/winona/2.4bpp"); -const u32 gFieldObjectPic_Liza_0[] = INCBIN_U32("graphics/map_objects/pics/people/liza/0.4bpp"); -const u32 gFieldObjectPic_Liza_1[] = INCBIN_U32("graphics/map_objects/pics/people/liza/1.4bpp"); -const u32 gFieldObjectPic_Liza_2[] = INCBIN_U32("graphics/map_objects/pics/people/liza/2.4bpp"); -const u32 gFieldObjectPic_Tate_0[] = INCBIN_U32("graphics/map_objects/pics/people/tate/0.4bpp"); -const u32 gFieldObjectPic_Tate_1[] = INCBIN_U32("graphics/map_objects/pics/people/tate/1.4bpp"); -const u32 gFieldObjectPic_Tate_2[] = INCBIN_U32("graphics/map_objects/pics/people/tate/2.4bpp"); -const u32 gFieldObjectPic_Wallace_0[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/0.4bpp"); -const u32 gFieldObjectPic_Wallace_1[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/1.4bpp"); -const u32 gFieldObjectPic_Wallace_2[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/2.4bpp"); -const u32 gFieldObjectPic_Wallace_3[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/3.4bpp"); -const u32 gFieldObjectPic_Wallace_4[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/4.4bpp"); -const u32 gFieldObjectPic_Wallace_5[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/5.4bpp"); -const u32 gFieldObjectPic_Wallace_6[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/6.4bpp"); -const u32 gFieldObjectPic_Wallace_7[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/7.4bpp"); -const u32 gFieldObjectPic_Wallace_8[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/8.4bpp"); -const u32 gFieldObjectPic_Steven_0[] = INCBIN_U32("graphics/map_objects/pics/people/steven/0.4bpp"); -const u32 gFieldObjectPic_Steven_1[] = INCBIN_U32("graphics/map_objects/pics/people/steven/1.4bpp"); -const u32 gFieldObjectPic_Steven_2[] = INCBIN_U32("graphics/map_objects/pics/people/steven/2.4bpp"); -const u32 gFieldObjectPic_Steven_3[] = INCBIN_U32("graphics/map_objects/pics/people/steven/3.4bpp"); -const u32 gFieldObjectPic_Steven_4[] = INCBIN_U32("graphics/map_objects/pics/people/steven/4.4bpp"); -const u32 gFieldObjectPic_Steven_5[] = INCBIN_U32("graphics/map_objects/pics/people/steven/5.4bpp"); -const u32 gFieldObjectPic_Steven_6[] = INCBIN_U32("graphics/map_objects/pics/people/steven/6.4bpp"); -const u32 gFieldObjectPic_Steven_7[] = INCBIN_U32("graphics/map_objects/pics/people/steven/7.4bpp"); -const u32 gFieldObjectPic_Steven_8[] = INCBIN_U32("graphics/map_objects/pics/people/steven/8.4bpp"); -const u32 gFieldObjectPic_Wally_0[] = INCBIN_U32("graphics/map_objects/pics/people/wally/0.4bpp"); -const u32 gFieldObjectPic_Wally_1[] = INCBIN_U32("graphics/map_objects/pics/people/wally/1.4bpp"); -const u32 gFieldObjectPic_Wally_2[] = INCBIN_U32("graphics/map_objects/pics/people/wally/2.4bpp"); -const u32 gFieldObjectPic_Wally_3[] = INCBIN_U32("graphics/map_objects/pics/people/wally/3.4bpp"); -const u32 gFieldObjectPic_Wally_4[] = INCBIN_U32("graphics/map_objects/pics/people/wally/4.4bpp"); -const u32 gFieldObjectPic_Wally_5[] = INCBIN_U32("graphics/map_objects/pics/people/wally/5.4bpp"); -const u32 gFieldObjectPic_Wally_6[] = INCBIN_U32("graphics/map_objects/pics/people/wally/6.4bpp"); -const u32 gFieldObjectPic_Wally_7[] = INCBIN_U32("graphics/map_objects/pics/people/wally/7.4bpp"); -const u32 gFieldObjectPic_Wally_8[] = INCBIN_U32("graphics/map_objects/pics/people/wally/8.4bpp"); -const u32 gFieldObjectPic_RubySapphireLittleBoy_0[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_little_boy/0.4bpp"); -const u32 gFieldObjectPic_RubySapphireLittleBoy_1[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_little_boy/1.4bpp"); -const u32 gFieldObjectPic_RubySapphireLittleBoy_2[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_little_boy/2.4bpp"); -const u32 gFieldObjectPic_RubySapphireLittleBoy_3[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_little_boy/3.4bpp"); -const u32 gFieldObjectPic_RubySapphireLittleBoy_4[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_little_boy/4.4bpp"); -const u32 gFieldObjectPic_RubySapphireLittleBoy_5[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_little_boy/5.4bpp"); -const u32 gFieldObjectPic_RubySapphireLittleBoy_6[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_little_boy/6.4bpp"); -const u32 gFieldObjectPic_RubySapphireLittleBoy_7[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_little_boy/7.4bpp"); -const u32 gFieldObjectPic_RubySapphireLittleBoy_8[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_little_boy/8.4bpp"); -const u32 gFieldObjectPic_HotSpringsOldWoman_0[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/0.4bpp"); -const u32 gFieldObjectPic_HotSpringsOldWoman_1[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/1.4bpp"); -const u32 gFieldObjectPic_HotSpringsOldWoman_2[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/2.4bpp"); -const u32 gFieldObjectPic_HotSpringsOldWoman_3[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/3.4bpp"); -const u32 gFieldObjectPic_HotSpringsOldWoman_4[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/4.4bpp"); -const u32 gFieldObjectPic_HotSpringsOldWoman_5[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/5.4bpp"); -const u32 gFieldObjectPic_HotSpringsOldWoman_6[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/6.4bpp"); -const u32 gFieldObjectPic_HotSpringsOldWoman_7[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/7.4bpp"); -const u32 gFieldObjectPic_HotSpringsOldWoman_8[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/8.4bpp"); -const u32 gFieldObjectPic_LatiasLatios_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/latias_latios/0.4bpp"); -const u32 gFieldObjectPic_LatiasLatios_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/latias_latios/1.4bpp"); -const u32 gFieldObjectPic_LatiasLatios_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/latias_latios/2.4bpp"); -const u32 gFieldObjectPic_Boy5_0[] = INCBIN_U32("graphics/map_objects/pics/people/boy_5/0.4bpp"); -const u32 gFieldObjectPic_Boy5_1[] = INCBIN_U32("graphics/map_objects/pics/people/boy_5/1.4bpp"); -const u32 gFieldObjectPic_Boy5_2[] = INCBIN_U32("graphics/map_objects/pics/people/boy_5/2.4bpp"); -const u32 gFieldObjectPic_ContestOldMan_0[] = INCBIN_U32("graphics/map_objects/pics/people/contest_old_man/0.4bpp"); -const u32 gFieldObjectPic_ContestOldMan_1[] = INCBIN_U32("graphics/map_objects/pics/people/contest_old_man/1.4bpp"); -const u32 gFieldObjectPic_ContestOldMan_2[] = INCBIN_U32("graphics/map_objects/pics/people/contest_old_man/2.4bpp"); -const u32 gFieldObjectPic_ContestOldMan_3[] = INCBIN_U32("graphics/map_objects/pics/people/contest_old_man/3.4bpp"); -const u32 gFieldObjectPic_ContestOldMan_4[] = INCBIN_U32("graphics/map_objects/pics/people/contest_old_man/4.4bpp"); -const u32 gFieldObjectPic_ContestOldMan_5[] = INCBIN_U32("graphics/map_objects/pics/people/contest_old_man/5.4bpp"); -const u32 gFieldObjectPic_ContestOldMan_6[] = INCBIN_U32("graphics/map_objects/pics/people/contest_old_man/6.4bpp"); -const u32 gFieldObjectPic_ContestOldMan_7[] = INCBIN_U32("graphics/map_objects/pics/people/contest_old_man/7.4bpp"); -const u32 gFieldObjectPic_ContestOldMan_8[] = INCBIN_U32("graphics/map_objects/pics/people/contest_old_man/8.4bpp"); -const u32 gFieldObjectPic_Archie_0[] = INCBIN_U32("graphics/map_objects/pics/people/archie/0.4bpp"); -const u32 gFieldObjectPic_Archie_1[] = INCBIN_U32("graphics/map_objects/pics/people/archie/1.4bpp"); -const u32 gFieldObjectPic_Archie_2[] = INCBIN_U32("graphics/map_objects/pics/people/archie/2.4bpp"); -const u32 gFieldObjectPic_Archie_3[] = INCBIN_U32("graphics/map_objects/pics/people/archie/3.4bpp"); -const u32 gFieldObjectPic_Archie_4[] = INCBIN_U32("graphics/map_objects/pics/people/archie/4.4bpp"); -const u32 gFieldObjectPic_Archie_5[] = INCBIN_U32("graphics/map_objects/pics/people/archie/5.4bpp"); -const u32 gFieldObjectPic_Archie_6[] = INCBIN_U32("graphics/map_objects/pics/people/archie/6.4bpp"); -const u32 gFieldObjectPic_Archie_7[] = INCBIN_U32("graphics/map_objects/pics/people/archie/7.4bpp"); -const u32 gFieldObjectPic_Archie_8[] = INCBIN_U32("graphics/map_objects/pics/people/archie/8.4bpp"); -const u32 gFieldObjectPic_Maxie_0[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/0.4bpp"); -const u32 gFieldObjectPic_Maxie_1[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/1.4bpp"); -const u32 gFieldObjectPic_Maxie_2[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/2.4bpp"); -const u32 gFieldObjectPic_Maxie_3[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/3.4bpp"); -const u32 gFieldObjectPic_Maxie_4[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/4.4bpp"); -const u32 gFieldObjectPic_Maxie_5[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/5.4bpp"); -const u32 gFieldObjectPic_Maxie_6[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/6.4bpp"); -const u32 gFieldObjectPic_Maxie_7[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/7.4bpp"); -const u32 gFieldObjectPic_Maxie_8[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/8.4bpp"); -const u32 gFieldObjectPic_KyogreFront_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kyogre_front/0.4bpp"); -const u32 gFieldObjectPic_KyogreFront_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kyogre_front/1.4bpp"); -const u32 gFieldObjectPic_KyogreSide_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kyogre_side/0.4bpp"); -const u32 gFieldObjectPic_KyogreSide_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kyogre_side/1.4bpp"); -const u32 gFieldObjectPic_GroudonFront_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/groudon_front/0.4bpp"); -const u32 gFieldObjectPic_GroudonFront_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/groudon_front/1.4bpp"); -const u32 gFieldObjectPic_GroudonSide_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/groudon_side/0.4bpp"); -const u32 gFieldObjectPic_GroudonSide_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/groudon_side/1.4bpp"); -const u32 gFieldObjectPic_Regi[] = INCBIN_U32("graphics/map_objects/pics/pokemon/regi.4bpp"); -const u32 gFieldObjectPic_Skitty_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/skitty/0.4bpp"); -const u32 gFieldObjectPic_Skitty_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/skitty/1.4bpp"); -const u32 gFieldObjectPic_Skitty_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/skitty/2.4bpp"); -const u32 gFieldObjectPic_Kecleon_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kecleon/0.4bpp"); -const u32 gFieldObjectPic_Kecleon_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kecleon/1.4bpp"); -const u32 gFieldObjectPic_Kecleon_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kecleon/2.4bpp"); -const u32 gFieldObjectPic_Rayquaza_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/rayquaza/0.4bpp"); -const u32 gFieldObjectPic_Rayquaza_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/rayquaza/1.4bpp"); -const u32 gFieldObjectPic_Rayquaza_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/rayquaza/2.4bpp"); -const u32 gFieldObjectPic_Rayquaza_3[] = INCBIN_U32("graphics/map_objects/pics/pokemon/rayquaza/3.4bpp"); -const u32 gFieldObjectPic_Rayquaza_4[] = INCBIN_U32("graphics/map_objects/pics/pokemon/rayquaza/4.4bpp"); -const u32 gFieldObjectPic_RayquazaStill[] = INCBIN_U32("graphics/map_objects/pics/pokemon/rayquaza_still.4bpp"); -const u32 gFieldObjectPic_Zigzagoon_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/zigzagoon/0.4bpp"); -const u32 gFieldObjectPic_Zigzagoon_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/zigzagoon/1.4bpp"); -const u32 gFieldObjectPic_Zigzagoon_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/zigzagoon/2.4bpp"); -const u32 gFieldObjectPic_Pikachu_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/pikachu/0.4bpp"); -const u32 gFieldObjectPic_Pikachu_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/pikachu/1.4bpp"); -const u32 gFieldObjectPic_Pikachu_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/pikachu/2.4bpp"); -const u32 gFieldObjectPic_Azumarill_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/azumarill/0.4bpp"); -const u32 gFieldObjectPic_Azumarill_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/azumarill/1.4bpp"); -const u32 gFieldObjectPic_Azumarill_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/azumarill/2.4bpp"); -const u32 gFieldObjectPic_Wingull_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/wingull/0.4bpp"); -const u32 gFieldObjectPic_Wingull_3[] = INCBIN_U32("graphics/map_objects/pics/pokemon/wingull/3.4bpp"); -const u32 gFieldObjectPic_Wingull_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/wingull/1.4bpp"); -const u32 gFieldObjectPic_Wingull_4[] = INCBIN_U32("graphics/map_objects/pics/pokemon/wingull/4.4bpp"); -const u32 gFieldObjectPic_Wingull_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/wingull/2.4bpp"); -const u32 gFieldObjectPic_Wingull_5[] = INCBIN_U32("graphics/map_objects/pics/pokemon/wingull/5.4bpp"); -const u32 gFieldObjectPic_TuberMSwimming_0[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/0.4bpp"); -const u32 gFieldObjectPic_TuberMSwimming_1[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/1.4bpp"); -const u32 gFieldObjectPic_TuberMSwimming_2[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/2.4bpp"); -const u32 gFieldObjectPic_TuberMSwimming_3[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/3.4bpp"); -const u32 gFieldObjectPic_TuberMSwimming_4[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/4.4bpp"); -const u32 gFieldObjectPic_TuberMSwimming_5[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/5.4bpp"); -const u32 gFieldObjectPic_TuberMSwimming_6[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/6.4bpp"); -const u32 gFieldObjectPic_TuberMSwimming_7[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/7.4bpp"); -const u32 gFieldObjectPic_TuberMSwimming_8[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/8.4bpp"); -const u32 gFieldObjectPic_Azurill_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/azurill/0.4bpp"); -const u32 gFieldObjectPic_Azurill_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/azurill/1.4bpp"); -const u32 gFieldObjectPic_Azurill_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/azurill/2.4bpp"); -const u32 gFieldObjectPic_Mom_0[] = INCBIN_U32("graphics/map_objects/pics/people/mom/0.4bpp"); -const u32 gFieldObjectPic_Mom_1[] = INCBIN_U32("graphics/map_objects/pics/people/mom/1.4bpp"); -const u32 gFieldObjectPic_Mom_2[] = INCBIN_U32("graphics/map_objects/pics/people/mom/2.4bpp"); -const u32 gFieldObjectPic_Mom_3[] = INCBIN_U32("graphics/map_objects/pics/people/mom/3.4bpp"); -const u32 gFieldObjectPic_Mom_4[] = INCBIN_U32("graphics/map_objects/pics/people/mom/4.4bpp"); -const u32 gFieldObjectPic_Mom_5[] = INCBIN_U32("graphics/map_objects/pics/people/mom/5.4bpp"); -const u32 gFieldObjectPic_Mom_6[] = INCBIN_U32("graphics/map_objects/pics/people/mom/6.4bpp"); -const u32 gFieldObjectPic_Mom_7[] = INCBIN_U32("graphics/map_objects/pics/people/mom/7.4bpp"); -const u32 gFieldObjectPic_Mom_8[] = INCBIN_U32("graphics/map_objects/pics/people/mom/8.4bpp"); -const u16 gFieldObjectPalette22[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_22.gbapal"); -const u16 gFieldObjectPalette23[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_23.gbapal"); -const u16 gFieldObjectPalette24[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_24.gbapal"); -const u16 gFieldObjectPalette25[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_25.gbapal"); -const u32 gFieldObjectPic_UnusedNatuDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/unused_natu_doll.4bpp"); -const u32 gFieldObjectPic_UnusedMagnemiteDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/unused_magnemite_doll.4bpp"); -const u32 gFieldObjectPic_UnusedSquirtleDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/unused_squirtle_doll.4bpp"); -const u32 gFieldObjectPic_UnusedWooperDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/unused_wooper_doll.4bpp"); -const u32 gFieldObjectPic_UnusedPikachuDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/unused_pikachu_doll.4bpp"); -const u32 gFieldObjectPic_UnusedPorygon2Doll[] = INCBIN_U32("graphics/map_objects/pics/dolls/unused_porygon2_doll.4bpp"); -const u32 gFieldObjectPic_PichuDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/pichu_doll.4bpp"); -const u32 gFieldObjectPic_PikachuDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/pikachu_doll.4bpp"); -const u32 gFieldObjectPic_MarillDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/marill_doll.4bpp"); -const u32 gFieldObjectPic_TogepiDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/togepi_doll.4bpp"); -const u32 gFieldObjectPic_CyndaquilDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/cyndaquil_doll.4bpp"); -const u32 gFieldObjectPic_ChikoritaDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/chikorita_doll.4bpp"); -const u32 gFieldObjectPic_TotodileDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/totodile_doll.4bpp"); -const u32 gFieldObjectPic_JigglypuffDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/jigglypuff_doll.4bpp"); -const u32 gFieldObjectPic_MeowthDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/meowth_doll.4bpp"); -const u32 gFieldObjectPic_ClefairyDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/clefairy_doll.4bpp"); -const u32 gFieldObjectPic_DittoDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/ditto_doll.4bpp"); -const u32 gFieldObjectPic_SmoochumDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/smoochum_doll.4bpp"); -const u32 gFieldObjectPic_TreeckoDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/treecko_doll.4bpp"); -const u32 gFieldObjectPic_TorchicDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/torchic_doll.4bpp"); -const u32 gFieldObjectPic_MudkipDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/mudkip_doll.4bpp"); -const u32 gFieldObjectPic_DuskullDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/duskull_doll.4bpp"); -const u32 gFieldObjectPic_WynautDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/wynaut_doll.4bpp"); -const u32 gFieldObjectPic_BaltoyDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/baltoy_doll.4bpp"); -const u32 gFieldObjectPic_KecleonDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/kecleon_doll.4bpp"); -const u32 gFieldObjectPic_AzurillDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/azurill_doll.4bpp"); -const u32 gFieldObjectPic_SkittyDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/skitty_doll.4bpp"); -const u32 gFieldObjectPic_SwabluDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/swablu_doll.4bpp"); -const u32 gFieldObjectPic_GulpinDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/gulpin_doll.4bpp"); -const u32 gFieldObjectPic_LotadDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/lotad_doll.4bpp"); -const u32 gFieldObjectPic_SeedotDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/seedot_doll.4bpp"); -const u32 gFieldObjectPic_PikaCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/pika_cushion.4bpp"); -const u32 gFieldObjectPic_RoundCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/round_cushion.4bpp"); -const u32 gFieldObjectPic_KissCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/kiss_cushion.4bpp"); -const u32 gFieldObjectPic_ZigzagCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/zigzag_cushion.4bpp"); -const u32 gFieldObjectPic_SpinCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/spin_cushion.4bpp"); -const u32 gFieldObjectPic_DiamondCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/diamond_cushion.4bpp"); -const u32 gFieldObjectPic_BallCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/ball_cushion.4bpp"); -const u32 gFieldObjectPic_GrassCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/grass_cushion.4bpp"); -const u32 gFieldObjectPic_FireCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/fire_cushion.4bpp"); -const u32 gFieldObjectPic_WaterCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/water_cushion.4bpp"); -const u32 gFieldObjectPic_BigSnorlaxDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_snorlax_doll.4bpp"); -const u32 gFieldObjectPic_BigRhydonDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_rhydon_doll.4bpp"); -const u32 gFieldObjectPic_BigLaprasDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_lapras_doll.4bpp"); -const u32 gFieldObjectPic_BigVenusaurDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_venusaur_doll.4bpp"); -const u32 gFieldObjectPic_BigCharizardDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_charizard_doll.4bpp"); -const u32 gFieldObjectPic_BigBlastoiseDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_blastoise_doll.4bpp"); -const u32 gFieldObjectPic_BigWailmerDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_wailmer_doll.4bpp"); -const u32 gFieldObjectPic_BigRegirockDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_regirock_doll.4bpp"); -const u32 gFieldObjectPic_BigRegiceDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_regice_doll.4bpp"); -const u32 gFieldObjectPic_BigRegisteelDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_registeel_doll.4bpp"); -const u32 gFieldObjectPic_CuttableTree_0[] = INCBIN_U32("graphics/map_objects/pics/misc/cuttable_tree/0.4bpp"); -const u32 gFieldObjectPic_CuttableTree_1[] = INCBIN_U32("graphics/map_objects/pics/misc/cuttable_tree/1.4bpp"); -const u32 gFieldObjectPic_CuttableTree_2[] = INCBIN_U32("graphics/map_objects/pics/misc/cuttable_tree/2.4bpp"); -const u32 gFieldObjectPic_CuttableTree_3[] = INCBIN_U32("graphics/map_objects/pics/misc/cuttable_tree/3.4bpp"); -const u32 gFieldObjectPic_BreakableRock_0[] = INCBIN_U32("graphics/map_objects/pics/misc/breakable_rock/0.4bpp"); -const u32 gFieldObjectPic_BreakableRock_1[] = INCBIN_U32("graphics/map_objects/pics/misc/breakable_rock/1.4bpp"); -const u32 gFieldObjectPic_BreakableRock_2[] = INCBIN_U32("graphics/map_objects/pics/misc/breakable_rock/2.4bpp"); -const u32 gFieldObjectPic_BreakableRock_3[] = INCBIN_U32("graphics/map_objects/pics/misc/breakable_rock/3.4bpp"); -const u32 gFieldObjectPic_PushableBoulder[] = INCBIN_U32("graphics/map_objects/pics/misc/pushable_boulder.4bpp"); -const u32 gFieldObjectPic_MrBrineysBoat_0[] = INCBIN_U32("graphics/map_objects/pics/misc/mr_brineys_boat/0.4bpp"); -const u32 gFieldObjectPic_MrBrineysBoat_1[] = INCBIN_U32("graphics/map_objects/pics/misc/mr_brineys_boat/1.4bpp"); -const u32 gFieldObjectPic_MrBrineysBoat_2[] = INCBIN_U32("graphics/map_objects/pics/misc/mr_brineys_boat/2.4bpp"); -const u32 gFieldObjectPic_Fossil[] = INCBIN_U32("graphics/map_objects/pics/misc/fossil.4bpp"); -const u32 gFieldObjectPic_SubmarineShadow[] = INCBIN_U32("graphics/map_objects/pics/misc/submarine_shadow.4bpp"); -const u16 gFieldObjectPalette26[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_26.gbapal"); -const u32 gFieldObjectPic_Truck[] = INCBIN_U32("graphics/map_objects/pics/misc/truck.4bpp"); -const u16 gFieldObjectPalette14[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_14.gbapal"); -const u32 gFieldObjectPic_VigorothCarryingBox_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/vigoroth_carrying_box/0.4bpp"); -const u32 gFieldObjectPic_VigorothCarryingBox_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/vigoroth_carrying_box/1.4bpp"); -const u32 gFieldObjectPic_VigorothCarryingBox_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/vigoroth_carrying_box/2.4bpp"); -const u32 gFieldObjectPic_VigorothFacingAway_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/vigoroth_facing_away/0.4bpp"); -const u32 gFieldObjectPic_VigorothFacingAway_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/vigoroth_facing_away/1.4bpp"); -const u16 gFieldObjectPalette15[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_15.gbapal"); -const u32 gFieldObjectPic_BirchsBag[] = INCBIN_U32("graphics/map_objects/pics/misc/birchs_bag.4bpp"); -const u32 gFieldObjectPic_EnemyZigzagoon_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/enemy_zigzagoon/0.4bpp"); -const u32 gFieldObjectPic_EnemyZigzagoon_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/enemy_zigzagoon/1.4bpp"); -const u32 gFieldObjectPic_EnemyZigzagoon_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/enemy_zigzagoon/2.4bpp"); -const u32 gFieldObjectPic_EnemyZigzagoon_3[] = INCBIN_U32("graphics/map_objects/pics/pokemon/enemy_zigzagoon/3.4bpp"); -const u32 gFieldObjectPic_EnemyZigzagoon_4[] = INCBIN_U32("graphics/map_objects/pics/pokemon/enemy_zigzagoon/4.4bpp"); -const u32 gFieldObjectPic_EnemyZigzagoon_5[] = INCBIN_U32("graphics/map_objects/pics/pokemon/enemy_zigzagoon/5.4bpp"); -const u32 gFieldObjectPic_EnemyZigzagoon_6[] = INCBIN_U32("graphics/map_objects/pics/pokemon/enemy_zigzagoon/6.4bpp"); -const u32 gFieldObjectPic_EnemyZigzagoon_7[] = INCBIN_U32("graphics/map_objects/pics/pokemon/enemy_zigzagoon/7.4bpp"); -const u32 gFieldObjectPic_EnemyZigzagoon_8[] = INCBIN_U32("graphics/map_objects/pics/pokemon/enemy_zigzagoon/8.4bpp"); -const u16 gFieldObjectPalette16[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_16.gbapal"); -const u32 gFieldObjectPic_Poochyena_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/0.4bpp"); -const u32 gFieldObjectPic_Poochyena_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/1.4bpp"); -const u32 gFieldObjectPic_Poochyena_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/2.4bpp"); -const u32 gFieldObjectPic_Poochyena_3[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/3.4bpp"); -const u32 gFieldObjectPic_Poochyena_4[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/4.4bpp"); -const u32 gFieldObjectPic_Poochyena_5[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/5.4bpp"); -const u32 gFieldObjectPic_Poochyena_6[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/6.4bpp"); -const u32 gFieldObjectPic_Poochyena_7[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/7.4bpp"); -const u32 gFieldObjectPic_Poochyena_8[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/8.4bpp"); -const u16 gFieldObjectPalette27[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_27.gbapal"); -const u32 gFieldObjectPic_CableCar[] = INCBIN_U32("graphics/map_objects/pics/misc/cable_car.4bpp"); -const u16 gFieldObjectPalette20[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_20.gbapal"); -const u32 gFieldObjectPic_SSTidal[] = INCBIN_U32("graphics/map_objects/pics/misc/ss_tidal.4bpp"); -const u16 gFieldObjectPalette21[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_21.gbapal"); -const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_0[] = INCBIN_U32("graphics/map_objects/pics/effects/berry_tree_growth_sparkle/0.4bpp"); -const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_1[] = INCBIN_U32("graphics/map_objects/pics/effects/berry_tree_growth_sparkle/1.4bpp"); -const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_2[] = INCBIN_U32("graphics/map_objects/pics/effects/berry_tree_growth_sparkle/2.4bpp"); -const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_3[] = INCBIN_U32("graphics/map_objects/pics/effects/berry_tree_growth_sparkle/3.4bpp"); -const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_4[] = INCBIN_U32("graphics/map_objects/pics/effects/berry_tree_growth_sparkle/4.4bpp"); -const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_5[] = INCBIN_U32("graphics/map_objects/pics/effects/berry_tree_growth_sparkle/5.4bpp"); -const u32 gFieldObjectPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/dirt_pile.4bpp"); -const u32 gFieldObjectPic_BerryTreeSprout_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sprout/0.4bpp"); -const u32 gFieldObjectPic_BerryTreeSprout_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sprout/1.4bpp"); -const u32 gFieldObjectPic_PechaBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pecha/0.4bpp"); -const u32 gFieldObjectPic_PechaBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pecha/1.4bpp"); -const u32 gFieldObjectPic_PechaBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pecha/2.4bpp"); -const u32 gFieldObjectPic_PechaBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pecha/3.4bpp"); -const u32 gFieldObjectPic_PechaBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pecha/4.4bpp"); -const u32 gFieldObjectPic_PechaBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pecha/5.4bpp"); -const u32 gFieldObjectPic_KelpsyBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/kelpsy/0.4bpp"); -const u32 gFieldObjectPic_KelpsyBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/kelpsy/1.4bpp"); -const u32 gFieldObjectPic_KelpsyBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/kelpsy/2.4bpp"); -const u32 gFieldObjectPic_KelpsyBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/kelpsy/3.4bpp"); -const u32 gFieldObjectPic_KelpsyBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/kelpsy/4.4bpp"); -const u32 gFieldObjectPic_KelpsyBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/kelpsy/5.4bpp"); -const u32 gFieldObjectPic_WepearBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wepear/0.4bpp"); -const u32 gFieldObjectPic_WepearBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wepear/1.4bpp"); -const u32 gFieldObjectPic_WepearBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wepear/2.4bpp"); -const u32 gFieldObjectPic_WepearBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wepear/3.4bpp"); -const u32 gFieldObjectPic_WepearBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wepear/4.4bpp"); -const u32 gFieldObjectPic_WepearBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wepear/5.4bpp"); -const u32 gFieldObjectPic_IapapaBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/iapapa/0.4bpp"); -const u32 gFieldObjectPic_IapapaBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/iapapa/1.4bpp"); -const u32 gFieldObjectPic_IapapaBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/iapapa/2.4bpp"); -const u32 gFieldObjectPic_IapapaBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/iapapa/3.4bpp"); -const u32 gFieldObjectPic_IapapaBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/iapapa/4.4bpp"); -const u32 gFieldObjectPic_IapapaBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/iapapa/5.4bpp"); -const u32 gFieldObjectPic_CheriBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cheri/0.4bpp"); -const u32 gFieldObjectPic_CheriBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cheri/1.4bpp"); -const u32 gFieldObjectPic_CheriBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cheri/2.4bpp"); -const u32 gFieldObjectPic_CheriBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cheri/3.4bpp"); -const u32 gFieldObjectPic_CheriBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cheri/4.4bpp"); -const u32 gFieldObjectPic_CheriBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cheri/5.4bpp"); -const u32 gFieldObjectPic_FigyBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/figy/0.4bpp"); -const u32 gFieldObjectPic_FigyBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/figy/1.4bpp"); -const u32 gFieldObjectPic_FigyBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/figy/2.4bpp"); -const u32 gFieldObjectPic_FigyBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/figy/3.4bpp"); -const u32 gFieldObjectPic_FigyBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/figy/4.4bpp"); -const u32 gFieldObjectPic_FigyBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/figy/5.4bpp"); -const u32 gFieldObjectPic_MagoBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/mago/0.4bpp"); -const u32 gFieldObjectPic_MagoBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/mago/1.4bpp"); -const u32 gFieldObjectPic_MagoBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/mago/2.4bpp"); -const u32 gFieldObjectPic_MagoBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/mago/3.4bpp"); -const u32 gFieldObjectPic_MagoBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/mago/4.4bpp"); -const u32 gFieldObjectPic_MagoBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/mago/5.4bpp"); -const u32 gFieldObjectPic_LumBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lum/0.4bpp"); -const u32 gFieldObjectPic_LumBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lum/1.4bpp"); -const u32 gFieldObjectPic_LumBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lum/2.4bpp"); -const u32 gFieldObjectPic_LumBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lum/3.4bpp"); -const u32 gFieldObjectPic_LumBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lum/4.4bpp"); -const u32 gFieldObjectPic_LumBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lum/5.4bpp"); -const u32 gFieldObjectPic_RazzBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/razz/0.4bpp"); -const u32 gFieldObjectPic_RazzBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/razz/1.4bpp"); -const u32 gFieldObjectPic_RazzBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/razz/2.4bpp"); -const u32 gFieldObjectPic_RazzBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/razz/3.4bpp"); -const u32 gFieldObjectPic_RazzBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/razz/4.4bpp"); -const u32 gFieldObjectPic_RazzBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/razz/5.4bpp"); -const u32 gFieldObjectPic_GrepaBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/grepa/0.4bpp"); -const u32 gFieldObjectPic_GrepaBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/grepa/1.4bpp"); -const u32 gFieldObjectPic_GrepaBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/grepa/2.4bpp"); -const u32 gFieldObjectPic_GrepaBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/grepa/3.4bpp"); -const u32 gFieldObjectPic_GrepaBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/grepa/4.4bpp"); -const u32 gFieldObjectPic_GrepaBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/grepa/5.4bpp"); -const u32 gFieldObjectPic_RabutaBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rabuta/0.4bpp"); -const u32 gFieldObjectPic_RabutaBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rabuta/1.4bpp"); -const u32 gFieldObjectPic_RabutaBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rabuta/2.4bpp"); -const u32 gFieldObjectPic_RabutaBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rabuta/3.4bpp"); -const u32 gFieldObjectPic_RabutaBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rabuta/4.4bpp"); -const u32 gFieldObjectPic_RabutaBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rabuta/5.4bpp"); -const u32 gFieldObjectPic_NomelBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/nomel/0.4bpp"); -const u32 gFieldObjectPic_NomelBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/nomel/1.4bpp"); -const u32 gFieldObjectPic_NomelBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/nomel/2.4bpp"); -const u32 gFieldObjectPic_NomelBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/nomel/3.4bpp"); -const u32 gFieldObjectPic_NomelBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/nomel/4.4bpp"); -const u32 gFieldObjectPic_NomelBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/nomel/5.4bpp"); -const u32 gFieldObjectPic_LeppaBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/leppa/0.4bpp"); -const u32 gFieldObjectPic_LeppaBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/leppa/1.4bpp"); -const u32 gFieldObjectPic_LeppaBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/leppa/2.4bpp"); -const u32 gFieldObjectPic_LeppaBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/leppa/3.4bpp"); -const u32 gFieldObjectPic_LeppaBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/leppa/4.4bpp"); -const u32 gFieldObjectPic_LeppaBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/leppa/5.4bpp"); -const u32 gFieldObjectPic_LiechiBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/liechi/0.4bpp"); -const u32 gFieldObjectPic_LiechiBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/liechi/1.4bpp"); -const u32 gFieldObjectPic_LiechiBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/liechi/2.4bpp"); -const u32 gFieldObjectPic_LiechiBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/liechi/3.4bpp"); -const u32 gFieldObjectPic_LiechiBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/liechi/4.4bpp"); -const u32 gFieldObjectPic_LiechiBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/liechi/5.4bpp"); -const u32 gFieldObjectPic_HondewBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/hondew/0.4bpp"); -const u32 gFieldObjectPic_HondewBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/hondew/1.4bpp"); -const u32 gFieldObjectPic_HondewBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/hondew/2.4bpp"); -const u32 gFieldObjectPic_HondewBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/hondew/3.4bpp"); -const u32 gFieldObjectPic_HondewBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/hondew/4.4bpp"); -const u32 gFieldObjectPic_HondewBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/hondew/5.4bpp"); -const u32 gFieldObjectPic_AguavBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aguav/0.4bpp"); -const u32 gFieldObjectPic_AguavBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aguav/1.4bpp"); -const u32 gFieldObjectPic_AguavBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aguav/2.4bpp"); -const u32 gFieldObjectPic_AguavBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aguav/3.4bpp"); -const u32 gFieldObjectPic_AguavBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aguav/4.4bpp"); -const u32 gFieldObjectPic_AguavBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aguav/5.4bpp"); -const u32 gFieldObjectPic_WikiBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wiki/0.4bpp"); -const u32 gFieldObjectPic_WikiBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wiki/1.4bpp"); -const u32 gFieldObjectPic_WikiBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wiki/2.4bpp"); -const u32 gFieldObjectPic_WikiBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wiki/3.4bpp"); -const u32 gFieldObjectPic_WikiBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wiki/4.4bpp"); -const u32 gFieldObjectPic_WikiBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wiki/5.4bpp"); -const u32 gFieldObjectPic_PomegBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pomeg/0.4bpp"); -const u32 gFieldObjectPic_PomegBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pomeg/1.4bpp"); -const u32 gFieldObjectPic_PomegBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pomeg/2.4bpp"); -const u32 gFieldObjectPic_PomegBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pomeg/3.4bpp"); -const u32 gFieldObjectPic_PomegBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pomeg/4.4bpp"); -const u32 gFieldObjectPic_PomegBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pomeg/5.4bpp"); -const u32 gFieldObjectPic_RawstBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rawst/0.4bpp"); -const u32 gFieldObjectPic_RawstBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rawst/1.4bpp"); -const u32 gFieldObjectPic_RawstBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rawst/2.4bpp"); -const u32 gFieldObjectPic_RawstBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rawst/3.4bpp"); -const u32 gFieldObjectPic_RawstBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rawst/4.4bpp"); -const u32 gFieldObjectPic_RawstBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rawst/5.4bpp"); -const u32 gFieldObjectPic_SpelonBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/spelon/0.4bpp"); -const u32 gFieldObjectPic_SpelonBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/spelon/1.4bpp"); -const u32 gFieldObjectPic_SpelonBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/spelon/2.4bpp"); -const u32 gFieldObjectPic_SpelonBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/spelon/3.4bpp"); -const u32 gFieldObjectPic_SpelonBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/spelon/4.4bpp"); -const u32 gFieldObjectPic_SpelonBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/spelon/5.4bpp"); -const u32 gFieldObjectPic_ChestoBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/chesto/0.4bpp"); -const u32 gFieldObjectPic_ChestoBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/chesto/1.4bpp"); -const u32 gFieldObjectPic_ChestoBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/chesto/2.4bpp"); -const u32 gFieldObjectPic_ChestoBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/chesto/3.4bpp"); -const u32 gFieldObjectPic_ChestoBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/chesto/4.4bpp"); -const u32 gFieldObjectPic_ChestoBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/chesto/5.4bpp"); -const u32 gFieldObjectPic_OranBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/oran/0.4bpp"); -const u32 gFieldObjectPic_OranBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/oran/1.4bpp"); -const u32 gFieldObjectPic_OranBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/oran/2.4bpp"); -const u32 gFieldObjectPic_OranBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/oran/3.4bpp"); -const u32 gFieldObjectPic_OranBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/oran/4.4bpp"); -const u32 gFieldObjectPic_OranBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/oran/5.4bpp"); -const u32 gFieldObjectPic_PersimBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/persim/0.4bpp"); -const u32 gFieldObjectPic_PersimBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/persim/1.4bpp"); -const u32 gFieldObjectPic_PersimBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/persim/2.4bpp"); -const u32 gFieldObjectPic_PersimBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/persim/3.4bpp"); -const u32 gFieldObjectPic_PersimBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/persim/4.4bpp"); -const u32 gFieldObjectPic_PersimBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/persim/5.4bpp"); -const u32 gFieldObjectPic_SitrusBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sitrus/0.4bpp"); -const u32 gFieldObjectPic_SitrusBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sitrus/1.4bpp"); -const u32 gFieldObjectPic_SitrusBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sitrus/2.4bpp"); -const u32 gFieldObjectPic_SitrusBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sitrus/3.4bpp"); -const u32 gFieldObjectPic_SitrusBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sitrus/4.4bpp"); -const u32 gFieldObjectPic_SitrusBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sitrus/5.4bpp"); -const u32 gFieldObjectPic_AspearBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aspear/0.4bpp"); -const u32 gFieldObjectPic_AspearBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aspear/1.4bpp"); -const u32 gFieldObjectPic_AspearBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aspear/2.4bpp"); -const u32 gFieldObjectPic_AspearBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aspear/3.4bpp"); -const u32 gFieldObjectPic_AspearBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aspear/4.4bpp"); -const u32 gFieldObjectPic_AspearBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aspear/5.4bpp"); -const u32 gFieldObjectPic_PamtreBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pamtre/0.4bpp"); -const u32 gFieldObjectPic_PamtreBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pamtre/1.4bpp"); -const u32 gFieldObjectPic_PamtreBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pamtre/2.4bpp"); -const u32 gFieldObjectPic_PamtreBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pamtre/3.4bpp"); -const u32 gFieldObjectPic_PamtreBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pamtre/4.4bpp"); -const u32 gFieldObjectPic_PamtreBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pamtre/5.4bpp"); -const u32 gFieldObjectPic_CornnBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cornn/0.4bpp"); -const u32 gFieldObjectPic_CornnBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cornn/1.4bpp"); -const u32 gFieldObjectPic_CornnBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cornn/2.4bpp"); -const u32 gFieldObjectPic_CornnBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cornn/3.4bpp"); -const u32 gFieldObjectPic_CornnBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cornn/4.4bpp"); -const u32 gFieldObjectPic_CornnBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cornn/5.4bpp"); -const u32 gFieldObjectPic_LansatBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lansat/0.4bpp"); -const u32 gFieldObjectPic_LansatBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lansat/1.4bpp"); -const u32 gFieldObjectPic_LansatBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lansat/2.4bpp"); -const u32 gFieldObjectPic_LansatBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lansat/3.4bpp"); -const u32 gFieldObjectPic_LansatBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lansat/4.4bpp"); -const u32 gFieldObjectPic_LansatBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lansat/5.4bpp"); -const u32 gFieldObjectPic_DurinBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/durin/0.4bpp"); -const u32 gFieldObjectPic_DurinBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/durin/1.4bpp"); -const u32 gFieldObjectPic_DurinBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/durin/2.4bpp"); -const u32 gFieldObjectPic_DurinBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/durin/3.4bpp"); -const u32 gFieldObjectPic_DurinBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/durin/4.4bpp"); -const u32 gFieldObjectPic_DurinBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/durin/5.4bpp"); -const u32 gFieldObjectPic_TamatoBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/tamato/0.4bpp"); -const u32 gFieldObjectPic_TamatoBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/tamato/1.4bpp"); -const u32 gFieldObjectPic_TamatoBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/tamato/2.4bpp"); -const u32 gFieldObjectPic_TamatoBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/tamato/3.4bpp"); -const u32 gFieldObjectPic_TamatoBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/tamato/4.4bpp"); -const u32 gFieldObjectPic_TamatoBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/tamato/5.4bpp"); -const u32 gFieldEffectObjectPic_SurfBlob_0[] = INCBIN_U32("graphics/map_objects/pics/effects/surf_blob/0.4bpp"); -const u32 gFieldEffectObjectPic_SurfBlob_1[] = INCBIN_U32("graphics/map_objects/pics/effects/surf_blob/1.4bpp"); -const u32 gFieldEffectObjectPic_SurfBlob_2[] = INCBIN_U32("graphics/map_objects/pics/effects/surf_blob/2.4bpp"); -const u32 gFieldObjectPic_QuintyPlump_0[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/0.4bpp"); -const u32 gFieldObjectPic_QuintyPlump_1[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/1.4bpp"); -const u32 gFieldObjectPic_QuintyPlump_2[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/2.4bpp"); -const u32 gFieldObjectPic_QuintyPlump_3[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/3.4bpp"); -const u32 gFieldObjectPic_QuintyPlump_4[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/4.4bpp"); -const u32 gFieldObjectPic_QuintyPlump_5[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/5.4bpp"); -const u32 gFieldObjectPic_QuintyPlump_6[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/6.4bpp"); -const u16 gFieldObjectPalette12[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_12.gbapal"); -const u16 gFieldObjectPalette13[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_13.gbapal"); -const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/map_objects/pics/effects/shadow_small.4bpp"); -const u32 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U32("graphics/map_objects/pics/effects/shadow_medium.4bpp"); -const u32 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U32("graphics/map_objects/pics/effects/shadow_large.4bpp"); -const u32 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U32("graphics/map_objects/pics/effects/shadow_extra_large.4bpp"); -const u32 gUnknown_084F6D38[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_4F6D38/0.4bpp"); -const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/map_objects/palettes/field_effect_object_palette_06.gbapal"); -const u32 gFieldEffectObjectPic_Ripple_0[] = INCBIN_U32("graphics/map_objects/pics/effects/ripple/0.4bpp"); -const u32 gFieldEffectObjectPic_Ripple_1[] = INCBIN_U32("graphics/map_objects/pics/effects/ripple/1.4bpp"); -const u32 gFieldEffectObjectPic_Ripple_2[] = INCBIN_U32("graphics/map_objects/pics/effects/ripple/2.4bpp"); -const u32 gFieldEffectObjectPic_Ripple_3[] = INCBIN_U32("graphics/map_objects/pics/effects/ripple/3.4bpp"); -const u32 gFieldEffectObjectPic_Ripple_4[] = INCBIN_U32("graphics/map_objects/pics/effects/ripple/4.4bpp"); -const u32 gFieldEffectObjectPic_Ash_0[] = INCBIN_U32("graphics/map_objects/pics/effects/ash/0.4bpp"); -const u32 gFieldEffectObjectPic_Ash_1[] = INCBIN_U32("graphics/map_objects/pics/effects/ash/1.4bpp"); -const u32 gFieldEffectObjectPic_Ash_2[] = INCBIN_U32("graphics/map_objects/pics/effects/ash/2.4bpp"); -const u32 gFieldEffectObjectPic_Ash_3[] = INCBIN_U32("graphics/map_objects/pics/effects/ash/3.4bpp"); -const u32 gFieldEffectObjectPic_Ash_4[] = INCBIN_U32("graphics/map_objects/pics/effects/ash/4.4bpp"); -const u32 gFieldEffectObjectPic_Arrow_0[] = INCBIN_U32("graphics/map_objects/pics/effects/arrow/0.4bpp"); -const u32 gFieldEffectObjectPic_Arrow_1[] = INCBIN_U32("graphics/map_objects/pics/effects/arrow/1.4bpp"); -const u32 gFieldEffectObjectPic_Arrow_2[] = INCBIN_U32("graphics/map_objects/pics/effects/arrow/2.4bpp"); -const u32 gFieldEffectObjectPic_Arrow_3[] = INCBIN_U32("graphics/map_objects/pics/effects/arrow/3.4bpp"); -const u32 gFieldEffectObjectPic_Arrow_4[] = INCBIN_U32("graphics/map_objects/pics/effects/arrow/4.4bpp"); -const u32 gFieldEffectObjectPic_Arrow_5[] = INCBIN_U32("graphics/map_objects/pics/effects/arrow/5.4bpp"); -const u32 gFieldEffectObjectPic_Arrow_6[] = INCBIN_U32("graphics/map_objects/pics/effects/arrow/6.4bpp"); -const u32 gFieldEffectObjectPic_Arrow_7[] = INCBIN_U32("graphics/map_objects/pics/effects/arrow/7.4bpp"); -const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/map_objects/palettes/field_effect_object_palette_00.gbapal"); -const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/map_objects/palettes/field_effect_object_palette_01.gbapal"); -const u32 gFieldEffectObjectPic_GroundImpactDust_0[] = INCBIN_U32("graphics/map_objects/pics/effects/ground_impact_dust/0.4bpp"); -const u32 gFieldEffectObjectPic_GroundImpactDust_1[] = INCBIN_U32("graphics/map_objects/pics/effects/ground_impact_dust/1.4bpp"); -const u32 gFieldEffectObjectPic_GroundImpactDust_2[] = INCBIN_U32("graphics/map_objects/pics/effects/ground_impact_dust/2.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopTallGrass_0[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_tall_grass/0.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopTallGrass_1[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_tall_grass/1.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopTallGrass_2[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_tall_grass/2.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopTallGrass_3[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_tall_grass/3.4bpp"); -const u32 gUnusedGrass_0[] = INCBIN_U32("graphics/map_objects/pics/effects/unused_grass/0.4bpp"); -const u32 gUnusedGrass_1[] = INCBIN_U32("graphics/map_objects/pics/effects/unused_grass/1.4bpp"); -const u32 gUnusedGrass_2[] = INCBIN_U32("graphics/map_objects/pics/effects/unused_grass/2.4bpp"); -const u32 gUnusedGrass_3[] = INCBIN_U32("graphics/map_objects/pics/effects/unused_grass/3.4bpp"); -const u32 gFieldEffectObjectPic_Unknown16_0[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_16/0.4bpp"); -const u32 gFieldEffectObjectPic_Unknown16_1[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_16/1.4bpp"); -const u32 gFieldEffectObjectPic_Unknown16_2[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_16/2.4bpp"); -const u32 gFieldEffectObjectPic_Unknown16_3[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_16/3.4bpp"); -const u32 gFieldEffectObjectPic_Unknown16_4[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_16/4.4bpp"); -const u32 gUnknown_084F7E38[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_4F7E38/0.4bpp"); -const u32 gFieldEffectObjectPic_Unknown16_5[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_16/5.4bpp"); -const u32 gFieldEffectObjectPic_Unknown17_0[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_17/0.4bpp"); -const u32 gFieldEffectObjectPic_Unknown17_1[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_17/1.4bpp"); -const u32 gFieldEffectObjectPic_Unknown17_2[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_17/2.4bpp"); -const u32 gFieldEffectObjectPic_Unknown17_3[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_17/3.4bpp"); -const u32 gFieldEffectObjectPic_Unknown17_4[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_17/4.4bpp"); -const u32 gFieldEffectObjectPic_Unknown17_5[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_17/5.4bpp"); -const u32 gFieldEffectObjectPic_Unknown17_6[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_17/6.4bpp"); -const u32 gFieldEffectObjectPic_Unknown17_7[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_17/7.4bpp"); -const u32 gFieldEffectObjectPic_Unknown18_0[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_18/0.4bpp"); -const u32 gFieldEffectObjectPic_Unknown18_1[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_18/1.4bpp"); -const u32 gFieldEffectObjectPic_Unknown18_2[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_18/2.4bpp"); -const u32 gFieldEffectObjectPic_Unknown18_3[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_18/3.4bpp"); -const u32 gFieldEffectObjectPic_LongGrass_0[] = INCBIN_U32("graphics/map_objects/pics/effects/long_grass/0.4bpp"); -const u32 gFieldEffectObjectPic_LongGrass_1[] = INCBIN_U32("graphics/map_objects/pics/effects/long_grass/1.4bpp"); -const u32 gFieldEffectObjectPic_LongGrass_2[] = INCBIN_U32("graphics/map_objects/pics/effects/long_grass/2.4bpp"); -const u32 gFieldEffectObjectPic_LongGrass_3[] = INCBIN_U32("graphics/map_objects/pics/effects/long_grass/3.4bpp"); -const u32 gFieldEffectObjectPic_TallGrass_0[] = INCBIN_U32("graphics/map_objects/pics/effects/tall_grass/0.4bpp"); -const u32 gFieldEffectObjectPic_TallGrass_1[] = INCBIN_U32("graphics/map_objects/pics/effects/tall_grass/1.4bpp"); -const u32 gFieldEffectObjectPic_TallGrass_2[] = INCBIN_U32("graphics/map_objects/pics/effects/tall_grass/2.4bpp"); -const u32 gFieldEffectObjectPic_TallGrass_3[] = INCBIN_U32("graphics/map_objects/pics/effects/tall_grass/3.4bpp"); -const u32 gFieldEffectObjectPic_TallGrass_4[] = INCBIN_U32("graphics/map_objects/pics/effects/tall_grass/4.4bpp"); -const u32 gFieldEffectObjectPic_ShortGrass_0[] = INCBIN_U32("graphics/map_objects/pics/effects/short_grass/0.4bpp"); -const u32 gFieldEffectObjectPic_ShortGrass_1[] = INCBIN_U32("graphics/map_objects/pics/effects/short_grass/1.4bpp"); -const u32 gFieldEffectObjectPic_SandFootprints_0[] = INCBIN_U32("graphics/map_objects/pics/effects/sand_footprints/0.4bpp"); -const u32 gFieldEffectObjectPic_SandFootprints_1[] = INCBIN_U32("graphics/map_objects/pics/effects/sand_footprints/1.4bpp"); -const u32 gFieldEffectObjectPic_DeepSandFootprints_0[] = INCBIN_U32("graphics/map_objects/pics/effects/deep_sand_footprints/0.4bpp"); -const u32 gFieldEffectObjectPic_DeepSandFootprints_1[] = INCBIN_U32("graphics/map_objects/pics/effects/deep_sand_footprints/1.4bpp"); -const u32 gFieldEffectObjectPic_BikeTireTracks_0[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_tire_tracks/0.4bpp"); -const u32 gFieldEffectObjectPic_BikeTireTracks_1[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_tire_tracks/1.4bpp"); -const u32 gFieldEffectObjectPic_BikeTireTracks_2[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_tire_tracks/2.4bpp"); -const u32 gFieldEffectObjectPic_BikeTireTracks_3[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_tire_tracks/3.4bpp"); -const u32 gFieldEffectObjectPic_Unknown19_0[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_19/0.4bpp"); -const u32 gFieldEffectObjectPic_Unknown19_1[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_19/1.4bpp"); -const u32 gFieldEffectObjectPic_Unknown19_2[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_19/2.4bpp"); -const u32 gFieldEffectObjectPic_Unknown19_3[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_19/3.4bpp"); -const u32 gFieldEffectObjectPic_Unknown29_0[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_29/0.4bpp"); -const u32 gFieldEffectObjectPic_Unknown29_1[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_29/1.4bpp"); -const u32 gFieldEffectObjectPic_Unknown29_2[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_29/2.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopBigSplash_0[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_big_splash/0.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopBigSplash_1[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_big_splash/1.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopBigSplash_2[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_big_splash/2.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopBigSplash_3[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_big_splash/3.4bpp"); -const u32 gFieldEffectObjectPic_Splash_0[] = INCBIN_U32("graphics/map_objects/pics/effects/splash/0.4bpp"); -const u32 gFieldEffectObjectPic_Splash_1[] = INCBIN_U32("graphics/map_objects/pics/effects/splash/1.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopSmallSplash_0[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_small_splash/0.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopSmallSplash_1[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_small_splash/1.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopSmallSplash_2[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_small_splash/2.4bpp"); -const u32 gFieldEffectObjectPic_Unknown20_0[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_20/0.4bpp"); -const u32 gFieldEffectObjectPic_Unknown20_1[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_20/1.4bpp"); -const u32 gFieldEffectObjectPic_Unknown20_2[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_20/2.4bpp"); -const u32 gFieldEffectObjectPic_Unknown20_3[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_20/3.4bpp"); -const u32 gFieldEffectObjectPic_Unknown20_4[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_20/4.4bpp"); -const u32 gFieldEffectObjectPic_TreeDisguise_0[] = INCBIN_U32("graphics/map_objects/pics/effects/tree_disguise/0.4bpp"); -const u32 gFieldEffectObjectPic_TreeDisguise_1[] = INCBIN_U32("graphics/map_objects/pics/effects/tree_disguise/1.4bpp"); -const u32 gFieldEffectObjectPic_TreeDisguise_2[] = INCBIN_U32("graphics/map_objects/pics/effects/tree_disguise/2.4bpp"); -const u32 gFieldEffectObjectPic_TreeDisguise_3[] = INCBIN_U32("graphics/map_objects/pics/effects/tree_disguise/3.4bpp"); -const u32 gFieldEffectObjectPic_TreeDisguise_4[] = INCBIN_U32("graphics/map_objects/pics/effects/tree_disguise/4.4bpp"); -const u32 gFieldEffectObjectPic_TreeDisguise_5[] = INCBIN_U32("graphics/map_objects/pics/effects/tree_disguise/5.4bpp"); -const u32 gFieldEffectObjectPic_TreeDisguise_6[] = INCBIN_U32("graphics/map_objects/pics/effects/tree_disguise/6.4bpp"); -const u32 gFieldEffectObjectPic_MountainDisguise_0[] = INCBIN_U32("graphics/map_objects/pics/effects/mountain_disguise/0.4bpp"); -const u32 gFieldEffectObjectPic_MountainDisguise_1[] = INCBIN_U32("graphics/map_objects/pics/effects/mountain_disguise/1.4bpp"); -const u32 gFieldEffectObjectPic_MountainDisguise_2[] = INCBIN_U32("graphics/map_objects/pics/effects/mountain_disguise/2.4bpp"); -const u32 gFieldEffectObjectPic_MountainDisguise_3[] = INCBIN_U32("graphics/map_objects/pics/effects/mountain_disguise/3.4bpp"); -const u32 gFieldEffectObjectPic_MountainDisguise_4[] = INCBIN_U32("graphics/map_objects/pics/effects/mountain_disguise/4.4bpp"); -const u32 gFieldEffectObjectPic_MountainDisguise_5[] = INCBIN_U32("graphics/map_objects/pics/effects/mountain_disguise/5.4bpp"); -const u32 gFieldEffectObjectPic_MountainDisguise_6[] = INCBIN_U32("graphics/map_objects/pics/effects/mountain_disguise/6.4bpp"); -const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_0[] = INCBIN_U32("graphics/map_objects/pics/effects/sand_disguise_placeholder/0.4bpp"); -const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_1[] = INCBIN_U32("graphics/map_objects/pics/effects/sand_disguise_placeholder/1.4bpp"); -const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_2[] = INCBIN_U32("graphics/map_objects/pics/effects/sand_disguise_placeholder/2.4bpp"); -const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_3[] = INCBIN_U32("graphics/map_objects/pics/effects/sand_disguise_placeholder/3.4bpp"); -const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_4[] = INCBIN_U32("graphics/map_objects/pics/effects/sand_disguise_placeholder/4.4bpp"); -const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_5[] = INCBIN_U32("graphics/map_objects/pics/effects/sand_disguise_placeholder/5.4bpp"); -const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_6[] = INCBIN_U32("graphics/map_objects/pics/effects/sand_disguise_placeholder/6.4bpp"); -const u32 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U32("graphics/map_objects/pics/effects/hot_springs_water.4bpp"); -const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/map_objects/palettes/field_effect_object_palette_02.gbapal"); -const u32 gFieldEffectObjectPic_JumpOutOfAsh_0[] = INCBIN_U32("graphics/map_objects/pics/effects/jump_out_of_ash/0.4bpp"); -const u32 gFieldEffectObjectPic_JumpOutOfAsh_1[] = INCBIN_U32("graphics/map_objects/pics/effects/jump_out_of_ash/1.4bpp"); -const u32 gFieldEffectObjectPic_JumpOutOfAsh_2[] = INCBIN_U32("graphics/map_objects/pics/effects/jump_out_of_ash/2.4bpp"); -const u32 gFieldEffectObjectPic_JumpOutOfAsh_3[] = INCBIN_U32("graphics/map_objects/pics/effects/jump_out_of_ash/3.4bpp"); -const u32 gFieldEffectObjectPic_JumpOutOfAsh_4[] = INCBIN_U32("graphics/map_objects/pics/effects/jump_out_of_ash/4.4bpp"); -const u32 gFieldEffectObjectPic_Unknown33_0[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_33/0.4bpp"); -const u32 gFieldEffectObjectPic_Unknown33_1[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_33/1.4bpp"); -const u32 gFieldEffectObjectPic_Unknown33_2[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_33/2.4bpp"); -const u32 gFieldEffectObjectPic_Unknown33_3[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_33/3.4bpp"); -const u32 gFieldEffectObjectPic_Unknown33_4[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_33/4.4bpp"); -const u32 gFieldEffectObjectPic_Bubbles_0[] = INCBIN_U32("graphics/map_objects/pics/effects/bubbles/0.4bpp"); -const u32 gFieldEffectObjectPic_Bubbles_1[] = INCBIN_U32("graphics/map_objects/pics/effects/bubbles/1.4bpp"); -const u32 gFieldEffectObjectPic_Bubbles_2[] = INCBIN_U32("graphics/map_objects/pics/effects/bubbles/2.4bpp"); -const u32 gFieldEffectObjectPic_Bubbles_3[] = INCBIN_U32("graphics/map_objects/pics/effects/bubbles/3.4bpp"); -const u32 gFieldEffectObjectPic_Bubbles_4[] = INCBIN_U32("graphics/map_objects/pics/effects/bubbles/4.4bpp"); -const u32 gFieldEffectObjectPic_Bubbles_5[] = INCBIN_U32("graphics/map_objects/pics/effects/bubbles/5.4bpp"); -const u32 gFieldEffectObjectPic_Bubbles_6[] = INCBIN_U32("graphics/map_objects/pics/effects/bubbles/6.4bpp"); -const u32 gFieldEffectObjectPic_Bubbles_7[] = INCBIN_U32("graphics/map_objects/pics/effects/bubbles/7.4bpp"); -const u32 gFieldEffectObjectPic_Unknown35_0[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_35/0.4bpp"); -const u32 gFieldEffectObjectPic_Unknown35_1[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_35/1.4bpp"); -const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/map_objects/palettes/field_effect_object_palette_03.gbapal"); -const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/map_objects/pics/effects/bird.4bpp"); -const u32 gFieldObjectPic_Juan_0[] = INCBIN_U32("graphics/map_objects/pics/people/juan/0.4bpp"); -const u32 gFieldObjectPic_Juan_1[] = INCBIN_U32("graphics/map_objects/pics/people/juan/1.4bpp"); -const u32 gFieldObjectPic_Juan_2[] = INCBIN_U32("graphics/map_objects/pics/people/juan/2.4bpp"); -const u32 gFieldObjectPic_Juan_3[] = INCBIN_U32("graphics/map_objects/pics/people/juan/3.4bpp"); -const u32 gFieldObjectPic_Juan_4[] = INCBIN_U32("graphics/map_objects/pics/people/juan/4.4bpp"); -const u32 gFieldObjectPic_Juan_5[] = INCBIN_U32("graphics/map_objects/pics/people/juan/5.4bpp"); -const u32 gFieldObjectPic_Juan_6[] = INCBIN_U32("graphics/map_objects/pics/people/juan/6.4bpp"); -const u32 gFieldObjectPic_Juan_7[] = INCBIN_U32("graphics/map_objects/pics/people/juan/7.4bpp"); -const u32 gFieldObjectPic_Juan_8[] = INCBIN_U32("graphics/map_objects/pics/people/juan/8.4bpp"); -const u32 gFieldObjectPic_Scott_0[] = INCBIN_U32("graphics/map_objects/pics/people/scott/0.4bpp"); -const u32 gFieldObjectPic_Scott_1[] = INCBIN_U32("graphics/map_objects/pics/people/scott/1.4bpp"); -const u32 gFieldObjectPic_Scott_2[] = INCBIN_U32("graphics/map_objects/pics/people/scott/2.4bpp"); -const u32 gFieldObjectPic_Scott_3[] = INCBIN_U32("graphics/map_objects/pics/people/scott/3.4bpp"); -const u32 gFieldObjectPic_Scott_4[] = INCBIN_U32("graphics/map_objects/pics/people/scott/4.4bpp"); -const u32 gFieldObjectPic_Scott_5[] = INCBIN_U32("graphics/map_objects/pics/people/scott/5.4bpp"); -const u32 gFieldObjectPic_Scott_6[] = INCBIN_U32("graphics/map_objects/pics/people/scott/6.4bpp"); -const u32 gFieldObjectPic_Scott_7[] = INCBIN_U32("graphics/map_objects/pics/people/scott/7.4bpp"); -const u32 gFieldObjectPic_Scott_8[] = INCBIN_U32("graphics/map_objects/pics/people/scott/8.4bpp"); -const u32 gFieldObjectPic_Statue[] = INCBIN_U32("graphics/map_objects/pics/misc/statue.4bpp"); -const u32 gFieldObjectPic_Kirlia_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kirlia/0.4bpp"); -const u32 gFieldObjectPic_Kirlia_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kirlia/1.4bpp"); -const u32 gFieldObjectPic_Kirlia_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kirlia/2.4bpp"); -const u32 gFieldObjectPic_Kirlia_3[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kirlia/3.4bpp"); -const u32 gFieldObjectPic_Kirlia_4[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kirlia/4.4bpp"); -const u32 gFieldObjectPic_Kirlia_5[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kirlia/5.4bpp"); -const u32 gFieldObjectPic_Kirlia_6[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kirlia/6.4bpp"); -const u32 gFieldObjectPic_Kirlia_7[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kirlia/7.4bpp"); -const u32 gFieldObjectPic_Kirlia_8[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kirlia/8.4bpp"); -const u32 gFieldObjectPic_Dusclops_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/dusclops/0.4bpp"); -const u32 gFieldObjectPic_Dusclops_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/dusclops/1.4bpp"); -const u32 gFieldObjectPic_Dusclops_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/dusclops/2.4bpp"); -const u32 gFieldObjectPic_Dusclops_3[] = INCBIN_U32("graphics/map_objects/pics/pokemon/dusclops/3.4bpp"); -const u32 gFieldObjectPic_Dusclops_4[] = INCBIN_U32("graphics/map_objects/pics/pokemon/dusclops/4.4bpp"); -const u32 gFieldObjectPic_Dusclops_5[] = INCBIN_U32("graphics/map_objects/pics/pokemon/dusclops/5.4bpp"); -const u32 gFieldObjectPic_Dusclops_6[] = INCBIN_U32("graphics/map_objects/pics/pokemon/dusclops/6.4bpp"); -const u32 gFieldObjectPic_Dusclops_7[] = INCBIN_U32("graphics/map_objects/pics/pokemon/dusclops/7.4bpp"); -const u32 gFieldObjectPic_Dusclops_8[] = INCBIN_U32("graphics/map_objects/pics/pokemon/dusclops/8.4bpp"); -const u32 gFieldObjectPic_MysteryEventDeliveryman_0[] = INCBIN_U32("graphics/map_objects/pics/people/mystery_event_deliveryman/0.4bpp"); -const u32 gFieldObjectPic_MysteryEventDeliveryman_1[] = INCBIN_U32("graphics/map_objects/pics/people/mystery_event_deliveryman/1.4bpp"); -const u32 gFieldObjectPic_MysteryEventDeliveryman_2[] = INCBIN_U32("graphics/map_objects/pics/people/mystery_event_deliveryman/2.4bpp"); -const u32 gFieldObjectPic_UnionRoomAttendant_0[] = INCBIN_U32("graphics/map_objects/pics/people/union_room_attendant/0.4bpp"); -const u32 gFieldObjectPic_UnionRoomAttendant_1[] = INCBIN_U32("graphics/map_objects/pics/people/union_room_attendant/1.4bpp"); -const u32 gFieldObjectPic_UnionRoomAttendant_2[] = INCBIN_U32("graphics/map_objects/pics/people/union_room_attendant/2.4bpp"); -const u32 gFieldObjectPic_MovingBox[] = INCBIN_U32("graphics/map_objects/pics/misc/moving_box.4bpp"); -const u16 gFieldObjectPalette19[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_19.gbapal"); -const u32 gFieldObjectPic_Sudowoodo_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/sudowoodo/0.4bpp"); -const u32 gFieldObjectPic_Sudowoodo_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/sudowoodo/1.4bpp"); -const u32 gFieldObjectPic_Sudowoodo_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/sudowoodo/2.4bpp"); -const u32 gFieldObjectPic_Mew_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/mew/0.4bpp"); -const u32 gFieldObjectPic_Mew_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/mew/1.4bpp"); -const u32 gFieldObjectPic_Mew_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/mew/2.4bpp"); -const u32 gFieldObjectPic_Mew_3[] = INCBIN_U32("graphics/map_objects/pics/pokemon/mew/3.4bpp"); -const u32 gFieldObjectPic_Mew_4[] = INCBIN_U32("graphics/map_objects/pics/pokemon/mew/4.4bpp"); -const u32 gFieldObjectPic_Mew_5[] = INCBIN_U32("graphics/map_objects/pics/pokemon/mew/5.4bpp"); -const u32 gFieldObjectPic_Mew_6[] = INCBIN_U32("graphics/map_objects/pics/pokemon/mew/6.4bpp"); -const u32 gFieldObjectPic_Mew_7[] = INCBIN_U32("graphics/map_objects/pics/pokemon/mew/7.4bpp"); -const u32 gFieldObjectPic_Mew_8[] = INCBIN_U32("graphics/map_objects/pics/pokemon/mew/8.4bpp"); -const u16 gFieldObjectPalette28[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_28.gbapal"); -const u32 gFieldObjectPic_Red_0[] = INCBIN_U32("graphics/map_objects/pics/people/red/0.4bpp"); -const u32 gFieldObjectPic_Red_1[] = INCBIN_U32("graphics/map_objects/pics/people/red/1.4bpp"); -const u32 gFieldObjectPic_Red_2[] = INCBIN_U32("graphics/map_objects/pics/people/red/2.4bpp"); -const u32 gFieldObjectPic_Red_3[] = INCBIN_U32("graphics/map_objects/pics/people/red/3.4bpp"); -const u32 gFieldObjectPic_Red_4[] = INCBIN_U32("graphics/map_objects/pics/people/red/4.4bpp"); -const u32 gFieldObjectPic_Red_5[] = INCBIN_U32("graphics/map_objects/pics/people/red/5.4bpp"); -const u32 gFieldObjectPic_Red_6[] = INCBIN_U32("graphics/map_objects/pics/people/red/6.4bpp"); -const u32 gFieldObjectPic_Red_7[] = INCBIN_U32("graphics/map_objects/pics/people/red/7.4bpp"); -const u32 gFieldObjectPic_Red_8[] = INCBIN_U32("graphics/map_objects/pics/people/red/8.4bpp"); -const u32 gFieldObjectPic_Leaf_0[] = INCBIN_U32("graphics/map_objects/pics/people/leaf/0.4bpp"); -const u32 gFieldObjectPic_Leaf_1[] = INCBIN_U32("graphics/map_objects/pics/people/leaf/1.4bpp"); -const u32 gFieldObjectPic_Leaf_2[] = INCBIN_U32("graphics/map_objects/pics/people/leaf/2.4bpp"); -const u32 gFieldObjectPic_Leaf_3[] = INCBIN_U32("graphics/map_objects/pics/people/leaf/3.4bpp"); -const u32 gFieldObjectPic_Leaf_4[] = INCBIN_U32("graphics/map_objects/pics/people/leaf/4.4bpp"); -const u32 gFieldObjectPic_Leaf_5[] = INCBIN_U32("graphics/map_objects/pics/people/leaf/5.4bpp"); -const u32 gFieldObjectPic_Leaf_6[] = INCBIN_U32("graphics/map_objects/pics/people/leaf/6.4bpp"); -const u32 gFieldObjectPic_Leaf_7[] = INCBIN_U32("graphics/map_objects/pics/people/leaf/7.4bpp"); -const u32 gFieldObjectPic_Leaf_8[] = INCBIN_U32("graphics/map_objects/pics/people/leaf/8.4bpp"); -const u16 gFieldObjectPalette30[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_30.gbapal"); -const u32 gFieldObjectPic_BirthIslandStone[] = INCBIN_U32("graphics/map_objects/pics/misc/birth_island_stone.4bpp"); -const u16 gFieldObjectPalette29[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_29.gbapal"); -const u32 gFieldObjectPic_Deoxys_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/deoxys/0.4bpp"); -const u32 gFieldObjectPic_Deoxys_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/deoxys/1.4bpp"); -const u32 gFieldObjectPic_Anabel_0[] = INCBIN_U32("graphics/map_objects/pics/people/anabel/0.4bpp"); -const u32 gFieldObjectPic_Anabel_1[] = INCBIN_U32("graphics/map_objects/pics/people/anabel/1.4bpp"); -const u32 gFieldObjectPic_Anabel_2[] = INCBIN_U32("graphics/map_objects/pics/people/anabel/2.4bpp"); -const u32 gFieldObjectPic_Anabel_3[] = INCBIN_U32("graphics/map_objects/pics/people/anabel/3.4bpp"); -const u32 gFieldObjectPic_Anabel_4[] = INCBIN_U32("graphics/map_objects/pics/people/anabel/4.4bpp"); -const u32 gFieldObjectPic_Anabel_5[] = INCBIN_U32("graphics/map_objects/pics/people/anabel/5.4bpp"); -const u32 gFieldObjectPic_Anabel_6[] = INCBIN_U32("graphics/map_objects/pics/people/anabel/6.4bpp"); -const u32 gFieldObjectPic_Anabel_7[] = INCBIN_U32("graphics/map_objects/pics/people/anabel/7.4bpp"); -const u32 gFieldObjectPic_Anabel_8[] = INCBIN_U32("graphics/map_objects/pics/people/anabel/8.4bpp"); -const u32 gFieldObjectPic_Tucker_0[] = INCBIN_U32("graphics/map_objects/pics/people/tucker/0.4bpp"); -const u32 gFieldObjectPic_Tucker_1[] = INCBIN_U32("graphics/map_objects/pics/people/tucker/1.4bpp"); -const u32 gFieldObjectPic_Tucker_2[] = INCBIN_U32("graphics/map_objects/pics/people/tucker/2.4bpp"); -const u32 gFieldObjectPic_Tucker_3[] = INCBIN_U32("graphics/map_objects/pics/people/tucker/3.4bpp"); -const u32 gFieldObjectPic_Tucker_4[] = INCBIN_U32("graphics/map_objects/pics/people/tucker/4.4bpp"); -const u32 gFieldObjectPic_Tucker_5[] = INCBIN_U32("graphics/map_objects/pics/people/tucker/5.4bpp"); -const u32 gFieldObjectPic_Tucker_6[] = INCBIN_U32("graphics/map_objects/pics/people/tucker/6.4bpp"); -const u32 gFieldObjectPic_Tucker_7[] = INCBIN_U32("graphics/map_objects/pics/people/tucker/7.4bpp"); -const u32 gFieldObjectPic_Tucker_8[] = INCBIN_U32("graphics/map_objects/pics/people/tucker/8.4bpp"); -const u32 gFieldObjectPic_Spenser_0[] = INCBIN_U32("graphics/map_objects/pics/people/spenser/0.4bpp"); -const u32 gFieldObjectPic_Spenser_1[] = INCBIN_U32("graphics/map_objects/pics/people/spenser/1.4bpp"); -const u32 gFieldObjectPic_Spenser_2[] = INCBIN_U32("graphics/map_objects/pics/people/spenser/2.4bpp"); -const u32 gFieldObjectPic_Spenser_3[] = INCBIN_U32("graphics/map_objects/pics/people/spenser/3.4bpp"); -const u32 gFieldObjectPic_Spenser_4[] = INCBIN_U32("graphics/map_objects/pics/people/spenser/4.4bpp"); -const u32 gFieldObjectPic_Spenser_5[] = INCBIN_U32("graphics/map_objects/pics/people/spenser/5.4bpp"); -const u32 gFieldObjectPic_Spenser_6[] = INCBIN_U32("graphics/map_objects/pics/people/spenser/6.4bpp"); -const u32 gFieldObjectPic_Spenser_7[] = INCBIN_U32("graphics/map_objects/pics/people/spenser/7.4bpp"); -const u32 gFieldObjectPic_Spenser_8[] = INCBIN_U32("graphics/map_objects/pics/people/spenser/8.4bpp"); -const u32 gFieldObjectPic_Greta_0[] = INCBIN_U32("graphics/map_objects/pics/people/greta/0.4bpp"); -const u32 gFieldObjectPic_Greta_1[] = INCBIN_U32("graphics/map_objects/pics/people/greta/1.4bpp"); -const u32 gFieldObjectPic_Greta_2[] = INCBIN_U32("graphics/map_objects/pics/people/greta/2.4bpp"); -const u32 gFieldObjectPic_Greta_3[] = INCBIN_U32("graphics/map_objects/pics/people/greta/3.4bpp"); -const u32 gFieldObjectPic_Greta_4[] = INCBIN_U32("graphics/map_objects/pics/people/greta/4.4bpp"); -const u32 gFieldObjectPic_Greta_5[] = INCBIN_U32("graphics/map_objects/pics/people/greta/5.4bpp"); -const u32 gFieldObjectPic_Greta_6[] = INCBIN_U32("graphics/map_objects/pics/people/greta/6.4bpp"); -const u32 gFieldObjectPic_Greta_7[] = INCBIN_U32("graphics/map_objects/pics/people/greta/7.4bpp"); -const u32 gFieldObjectPic_Greta_8[] = INCBIN_U32("graphics/map_objects/pics/people/greta/8.4bpp"); -const u32 gFieldObjectPic_Noland_0[] = INCBIN_U32("graphics/map_objects/pics/people/noland/0.4bpp"); -const u32 gFieldObjectPic_Noland_1[] = INCBIN_U32("graphics/map_objects/pics/people/noland/1.4bpp"); -const u32 gFieldObjectPic_Noland_2[] = INCBIN_U32("graphics/map_objects/pics/people/noland/2.4bpp"); -const u32 gFieldObjectPic_Noland_3[] = INCBIN_U32("graphics/map_objects/pics/people/noland/3.4bpp"); -const u32 gFieldObjectPic_Noland_4[] = INCBIN_U32("graphics/map_objects/pics/people/noland/4.4bpp"); -const u32 gFieldObjectPic_Noland_5[] = INCBIN_U32("graphics/map_objects/pics/people/noland/5.4bpp"); -const u32 gFieldObjectPic_Noland_6[] = INCBIN_U32("graphics/map_objects/pics/people/noland/6.4bpp"); -const u32 gFieldObjectPic_Noland_7[] = INCBIN_U32("graphics/map_objects/pics/people/noland/7.4bpp"); -const u32 gFieldObjectPic_Noland_8[] = INCBIN_U32("graphics/map_objects/pics/people/noland/8.4bpp"); -const u32 gFieldObjectPic_Lucy_0[] = INCBIN_U32("graphics/map_objects/pics/people/lucy/0.4bpp"); -const u32 gFieldObjectPic_Lucy_1[] = INCBIN_U32("graphics/map_objects/pics/people/lucy/1.4bpp"); -const u32 gFieldObjectPic_Lucy_2[] = INCBIN_U32("graphics/map_objects/pics/people/lucy/2.4bpp"); -const u32 gFieldObjectPic_Lucy_3[] = INCBIN_U32("graphics/map_objects/pics/people/lucy/3.4bpp"); -const u32 gFieldObjectPic_Lucy_4[] = INCBIN_U32("graphics/map_objects/pics/people/lucy/4.4bpp"); -const u32 gFieldObjectPic_Lucy_5[] = INCBIN_U32("graphics/map_objects/pics/people/lucy/5.4bpp"); -const u32 gFieldObjectPic_Lucy_6[] = INCBIN_U32("graphics/map_objects/pics/people/lucy/6.4bpp"); -const u32 gFieldObjectPic_Lucy_7[] = INCBIN_U32("graphics/map_objects/pics/people/lucy/7.4bpp"); -const u32 gFieldObjectPic_Lucy_8[] = INCBIN_U32("graphics/map_objects/pics/people/lucy/8.4bpp"); -const u32 gFieldObjectPic_Brandon_0[] = INCBIN_U32("graphics/map_objects/pics/people/brandon/0.4bpp"); -const u32 gFieldObjectPic_Brandon_1[] = INCBIN_U32("graphics/map_objects/pics/people/brandon/1.4bpp"); -const u32 gFieldObjectPic_Brandon_2[] = INCBIN_U32("graphics/map_objects/pics/people/brandon/2.4bpp"); -const u32 gFieldObjectPic_Brandon_3[] = INCBIN_U32("graphics/map_objects/pics/people/brandon/3.4bpp"); -const u32 gFieldObjectPic_Brandon_4[] = INCBIN_U32("graphics/map_objects/pics/people/brandon/4.4bpp"); -const u32 gFieldObjectPic_Brandon_5[] = INCBIN_U32("graphics/map_objects/pics/people/brandon/5.4bpp"); -const u32 gFieldObjectPic_Brandon_6[] = INCBIN_U32("graphics/map_objects/pics/people/brandon/6.4bpp"); -const u32 gFieldObjectPic_Brandon_7[] = INCBIN_U32("graphics/map_objects/pics/people/brandon/7.4bpp"); -const u32 gFieldObjectPic_Brandon_8[] = INCBIN_U32("graphics/map_objects/pics/people/brandon/8.4bpp"); -const u32 gFieldObjectPic_Lugia_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/lugia/0.4bpp"); -const u32 gFieldObjectPic_Lugia_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/lugia/1.4bpp"); -const u16 gFieldObjectPalette32[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_32.gbapal"); -const u32 gFieldObjectPic_HoOh_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/ho_oh/0.4bpp"); -const u32 gFieldObjectPic_HoOh_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/ho_oh/1.4bpp"); -const u16 gFieldObjectPalette31[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_31.gbapal"); +const u32 gEventObjectPic_MayMachBike_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/0.4bpp"); +const u32 gEventObjectPic_MayMachBike_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/1.4bpp"); +const u32 gEventObjectPic_MayMachBike_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/2.4bpp"); +const u32 gEventObjectPic_MayMachBike_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/3.4bpp"); +const u32 gEventObjectPic_MayMachBike_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/4.4bpp"); +const u32 gEventObjectPic_MayMachBike_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/5.4bpp"); +const u32 gEventObjectPic_MayMachBike_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/6.4bpp"); +const u32 gEventObjectPic_MayMachBike_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/7.4bpp"); +const u32 gEventObjectPic_MayMachBike_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/8.4bpp"); +const u32 gEventObjectPic_MayAcroBike_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/00.4bpp"); +const u32 gEventObjectPic_MayAcroBike_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/01.4bpp"); +const u32 gEventObjectPic_MayAcroBike_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/02.4bpp"); +const u32 gEventObjectPic_MayAcroBike_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/03.4bpp"); +const u32 gEventObjectPic_MayAcroBike_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/04.4bpp"); +const u32 gEventObjectPic_MayAcroBike_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/05.4bpp"); +const u32 gEventObjectPic_MayAcroBike_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/06.4bpp"); +const u32 gEventObjectPic_MayAcroBike_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/07.4bpp"); +const u32 gEventObjectPic_MayAcroBike_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/08.4bpp"); +const u32 gEventObjectPic_MayAcroBike_9[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/09.4bpp"); +const u32 gEventObjectPic_MayAcroBike_10[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/10.4bpp"); +const u32 gEventObjectPic_MayAcroBike_11[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/11.4bpp"); +const u32 gEventObjectPic_MayAcroBike_12[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/12.4bpp"); +const u32 gEventObjectPic_MayAcroBike_13[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/13.4bpp"); +const u32 gEventObjectPic_MayAcroBike_14[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/14.4bpp"); +const u32 gEventObjectPic_MayAcroBike_15[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/15.4bpp"); +const u32 gEventObjectPic_MayAcroBike_16[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/16.4bpp"); +const u32 gEventObjectPic_MayAcroBike_17[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/17.4bpp"); +const u32 gEventObjectPic_MayAcroBike_18[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/18.4bpp"); +const u32 gEventObjectPic_MayAcroBike_19[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/19.4bpp"); +const u32 gEventObjectPic_MayAcroBike_20[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/20.4bpp"); +const u32 gEventObjectPic_MayAcroBike_21[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/21.4bpp"); +const u32 gEventObjectPic_MayAcroBike_22[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/22.4bpp"); +const u32 gEventObjectPic_MayAcroBike_23[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/23.4bpp"); +const u32 gEventObjectPic_MayAcroBike_24[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/24.4bpp"); +const u32 gEventObjectPic_MayAcroBike_25[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/25.4bpp"); +const u32 gEventObjectPic_MayAcroBike_26[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/26.4bpp"); +const u32 gEventObjectPic_MaySurfing_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/0.4bpp"); +const u32 gEventObjectPic_MaySurfing_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/3.4bpp"); +const u32 gEventObjectPic_MaySurfing_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/1.4bpp"); +const u32 gEventObjectPic_MaySurfing_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/4.4bpp"); +const u32 gEventObjectPic_MaySurfing_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/2.4bpp"); +const u32 gEventObjectPic_MaySurfing_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/5.4bpp"); +const u32 gEventObjectPic_MayFieldMove_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/0.4bpp"); +const u32 gEventObjectPic_MayFieldMove_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/1.4bpp"); +const u32 gEventObjectPic_MayFieldMove_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/2.4bpp"); +const u32 gEventObjectPic_MayFieldMove_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/3.4bpp"); +const u32 gEventObjectPic_MayFieldMove_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/4.4bpp"); +const u32 gEventObjectPic_MayFishing_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/00.4bpp"); +const u32 gEventObjectPic_MayFishing_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/01.4bpp"); +const u32 gEventObjectPic_MayFishing_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/02.4bpp"); +const u32 gEventObjectPic_MayFishing_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/03.4bpp"); +const u32 gEventObjectPic_MayFishing_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/04.4bpp"); +const u32 gEventObjectPic_MayFishing_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/05.4bpp"); +const u32 gEventObjectPic_MayFishing_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/06.4bpp"); +const u32 gEventObjectPic_MayFishing_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/07.4bpp"); +const u32 gEventObjectPic_MayFishing_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/08.4bpp"); +const u32 gEventObjectPic_MayFishing_9[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/09.4bpp"); +const u32 gEventObjectPic_MayFishing_10[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/10.4bpp"); +const u32 gEventObjectPic_MayFishing_11[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/11.4bpp"); +const u32 gEventObjectPic_MayWatering_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/0.4bpp"); +const u32 gEventObjectPic_MayWatering_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/3.4bpp"); +const u32 gEventObjectPic_MayWatering_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/1.4bpp"); +const u32 gEventObjectPic_MayWatering_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/4.4bpp"); +const u32 gEventObjectPic_MayWatering_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/2.4bpp"); +const u32 gEventObjectPic_MayWatering_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/5.4bpp"); +const u16 gEventObjectPalette0[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_00.gbapal"); +const u16 gEventObjectPalette1[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_01.gbapal"); +const u16 gEventObjectPalette2[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_02.gbapal"); +const u16 gEventObjectPalette3[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_03.gbapal"); +const u16 gEventObjectPalette4[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_04.gbapal"); +const u16 gEventObjectPalette5[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_05.gbapal"); +const u16 gEventObjectPalette6[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_06.gbapal"); +const u16 gEventObjectPalette7[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_07.gbapal"); +const u32 gEventObjectPic_LittleBoy1_0[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/0.4bpp"); +const u32 gEventObjectPic_LittleBoy1_1[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/1.4bpp"); +const u32 gEventObjectPic_LittleBoy1_2[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/2.4bpp"); +const u32 gEventObjectPic_LittleBoy1_3[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/3.4bpp"); +const u32 gEventObjectPic_LittleBoy1_4[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/4.4bpp"); +const u32 gEventObjectPic_LittleBoy1_5[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/5.4bpp"); +const u32 gEventObjectPic_LittleBoy1_6[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/6.4bpp"); +const u32 gEventObjectPic_LittleBoy1_7[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/7.4bpp"); +const u32 gEventObjectPic_LittleBoy1_8[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/8.4bpp"); +const u32 gEventObjectPic_LittleGirl1_0[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/0.4bpp"); +const u32 gEventObjectPic_LittleGirl1_1[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/1.4bpp"); +const u32 gEventObjectPic_LittleGirl1_2[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/2.4bpp"); +const u32 gEventObjectPic_LittleGirl1_3[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/3.4bpp"); +const u32 gEventObjectPic_LittleGirl1_4[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/4.4bpp"); +const u32 gEventObjectPic_LittleGirl1_5[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/5.4bpp"); +const u32 gEventObjectPic_LittleGirl1_6[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/6.4bpp"); +const u32 gEventObjectPic_LittleGirl1_7[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/7.4bpp"); +const u32 gEventObjectPic_LittleGirl1_8[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/8.4bpp"); +const u32 gEventObjectPic_Boy1_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/0.4bpp"); +const u32 gEventObjectPic_Boy1_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/1.4bpp"); +const u32 gEventObjectPic_Boy1_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/2.4bpp"); +const u32 gEventObjectPic_Boy1_3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/3.4bpp"); +const u32 gEventObjectPic_Boy1_4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/4.4bpp"); +const u32 gEventObjectPic_Boy1_5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/5.4bpp"); +const u32 gEventObjectPic_Boy1_6[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/6.4bpp"); +const u32 gEventObjectPic_Boy1_7[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/7.4bpp"); +const u32 gEventObjectPic_Boy1_8[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/8.4bpp"); +const u32 gEventObjectPic_Girl1_0[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/0.4bpp"); +const u32 gEventObjectPic_Girl1_1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/1.4bpp"); +const u32 gEventObjectPic_Girl1_2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/2.4bpp"); +const u32 gEventObjectPic_Girl1_3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/3.4bpp"); +const u32 gEventObjectPic_Girl1_4[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/4.4bpp"); +const u32 gEventObjectPic_Girl1_5[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/5.4bpp"); +const u32 gEventObjectPic_Girl1_6[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/6.4bpp"); +const u32 gEventObjectPic_Girl1_7[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/7.4bpp"); +const u32 gEventObjectPic_Girl1_8[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/8.4bpp"); +const u32 gEventObjectPic_Boy2_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/0.4bpp"); +const u32 gEventObjectPic_Boy2_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/1.4bpp"); +const u32 gEventObjectPic_Boy2_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/2.4bpp"); +const u32 gEventObjectPic_Boy2_3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/3.4bpp"); +const u32 gEventObjectPic_Boy2_4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/4.4bpp"); +const u32 gEventObjectPic_Boy2_5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/5.4bpp"); +const u32 gEventObjectPic_Boy2_6[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/6.4bpp"); +const u32 gEventObjectPic_Boy2_7[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/7.4bpp"); +const u32 gEventObjectPic_Boy2_8[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/8.4bpp"); +const u32 gEventObjectPic_Girl2_0[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/0.4bpp"); +const u32 gEventObjectPic_Girl2_1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/1.4bpp"); +const u32 gEventObjectPic_Girl2_2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/2.4bpp"); +const u32 gEventObjectPic_Girl2_3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/3.4bpp"); +const u32 gEventObjectPic_Girl2_4[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/4.4bpp"); +const u32 gEventObjectPic_Girl2_5[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/5.4bpp"); +const u32 gEventObjectPic_Girl2_6[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/6.4bpp"); +const u32 gEventObjectPic_Girl2_7[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/7.4bpp"); +const u32 gEventObjectPic_Girl2_8[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/8.4bpp"); +const u32 gEventObjectPic_LittleBoy2_0[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/0.4bpp"); +const u32 gEventObjectPic_LittleBoy2_1[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/1.4bpp"); +const u32 gEventObjectPic_LittleBoy2_2[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/2.4bpp"); +const u32 gEventObjectPic_LittleBoy2_3[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/3.4bpp"); +const u32 gEventObjectPic_LittleBoy2_4[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/4.4bpp"); +const u32 gEventObjectPic_LittleBoy2_5[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/5.4bpp"); +const u32 gEventObjectPic_LittleBoy2_6[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/6.4bpp"); +const u32 gEventObjectPic_LittleBoy2_7[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/7.4bpp"); +const u32 gEventObjectPic_LittleBoy2_8[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/8.4bpp"); +const u32 gEventObjectPic_LittleGirl2_0[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/0.4bpp"); +const u32 gEventObjectPic_LittleGirl2_1[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/1.4bpp"); +const u32 gEventObjectPic_LittleGirl2_2[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/2.4bpp"); +const u32 gEventObjectPic_LittleGirl2_3[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/3.4bpp"); +const u32 gEventObjectPic_LittleGirl2_4[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/4.4bpp"); +const u32 gEventObjectPic_LittleGirl2_5[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/5.4bpp"); +const u32 gEventObjectPic_LittleGirl2_6[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/6.4bpp"); +const u32 gEventObjectPic_LittleGirl2_7[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/7.4bpp"); +const u32 gEventObjectPic_LittleGirl2_8[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/8.4bpp"); +const u32 gEventObjectPic_Boy3_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/0.4bpp"); +const u32 gEventObjectPic_Boy3_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/1.4bpp"); +const u32 gEventObjectPic_Boy3_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/2.4bpp"); +const u32 gEventObjectPic_Boy3_3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/3.4bpp"); +const u32 gEventObjectPic_Boy3_4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/4.4bpp"); +const u32 gEventObjectPic_Boy3_5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/5.4bpp"); +const u32 gEventObjectPic_Boy3_6[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/6.4bpp"); +const u32 gEventObjectPic_Boy3_7[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/7.4bpp"); +const u32 gEventObjectPic_Boy3_8[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/8.4bpp"); +const u32 gEventObjectPic_Girl3_0[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/0.4bpp"); +const u32 gEventObjectPic_Girl3_1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/1.4bpp"); +const u32 gEventObjectPic_Girl3_2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/2.4bpp"); +const u32 gEventObjectPic_Girl3_3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/3.4bpp"); +const u32 gEventObjectPic_Girl3_4[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/4.4bpp"); +const u32 gEventObjectPic_Girl3_5[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/5.4bpp"); +const u32 gEventObjectPic_Girl3_6[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/6.4bpp"); +const u32 gEventObjectPic_Girl3_7[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/7.4bpp"); +const u32 gEventObjectPic_Girl3_8[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/8.4bpp"); +const u32 gEventObjectPic_Boy4_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/0.4bpp"); +const u32 gEventObjectPic_Boy4_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/1.4bpp"); +const u32 gEventObjectPic_Boy4_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/2.4bpp"); +const u32 gEventObjectPic_Boy4_3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/3.4bpp"); +const u32 gEventObjectPic_Boy4_4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/4.4bpp"); +const u32 gEventObjectPic_Boy4_5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/5.4bpp"); +const u32 gEventObjectPic_Boy4_6[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/6.4bpp"); +const u32 gEventObjectPic_Boy4_7[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/7.4bpp"); +const u32 gEventObjectPic_Boy4_8[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/8.4bpp"); +const u32 gEventObjectPic_Woman1_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/0.4bpp"); +const u32 gEventObjectPic_Woman1_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/1.4bpp"); +const u32 gEventObjectPic_Woman1_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/2.4bpp"); +const u32 gEventObjectPic_Woman1_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/3.4bpp"); +const u32 gEventObjectPic_Woman1_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/4.4bpp"); +const u32 gEventObjectPic_Woman1_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/5.4bpp"); +const u32 gEventObjectPic_Woman1_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/6.4bpp"); +const u32 gEventObjectPic_Woman1_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/7.4bpp"); +const u32 gEventObjectPic_Woman1_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/8.4bpp"); +const u32 gEventObjectPic_FatMan_0[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/0.4bpp"); +const u32 gEventObjectPic_FatMan_1[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/1.4bpp"); +const u32 gEventObjectPic_FatMan_2[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/2.4bpp"); +const u32 gEventObjectPic_FatMan_3[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/3.4bpp"); +const u32 gEventObjectPic_FatMan_4[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/4.4bpp"); +const u32 gEventObjectPic_FatMan_5[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/5.4bpp"); +const u32 gEventObjectPic_FatMan_6[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/6.4bpp"); +const u32 gEventObjectPic_FatMan_7[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/7.4bpp"); +const u32 gEventObjectPic_FatMan_8[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/8.4bpp"); +const u32 gEventObjectPic_Woman2_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/0.4bpp"); +const u32 gEventObjectPic_Woman2_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/1.4bpp"); +const u32 gEventObjectPic_Woman2_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/2.4bpp"); +const u32 gEventObjectPic_Woman2_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/3.4bpp"); +const u32 gEventObjectPic_Woman2_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/4.4bpp"); +const u32 gEventObjectPic_Woman2_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/5.4bpp"); +const u32 gEventObjectPic_Woman2_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/6.4bpp"); +const u32 gEventObjectPic_Woman2_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/7.4bpp"); +const u32 gEventObjectPic_Woman2_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/8.4bpp"); +const u32 gEventObjectPic_Man1_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/0.4bpp"); +const u32 gEventObjectPic_Man1_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/1.4bpp"); +const u32 gEventObjectPic_Man1_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/2.4bpp"); +const u32 gEventObjectPic_Man1_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/3.4bpp"); +const u32 gEventObjectPic_Man1_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/4.4bpp"); +const u32 gEventObjectPic_Man1_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/5.4bpp"); +const u32 gEventObjectPic_Man1_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/6.4bpp"); +const u32 gEventObjectPic_Man1_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/7.4bpp"); +const u32 gEventObjectPic_Man1_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/8.4bpp"); +const u32 gEventObjectPic_Woman3_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/0.4bpp"); +const u32 gEventObjectPic_Woman3_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/1.4bpp"); +const u32 gEventObjectPic_Woman3_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/2.4bpp"); +const u32 gEventObjectPic_Woman3_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/3.4bpp"); +const u32 gEventObjectPic_Woman3_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/4.4bpp"); +const u32 gEventObjectPic_Woman3_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/5.4bpp"); +const u32 gEventObjectPic_Woman3_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/6.4bpp"); +const u32 gEventObjectPic_Woman3_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/7.4bpp"); +const u32 gEventObjectPic_Woman3_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/8.4bpp"); +const u32 gEventObjectPic_OldMan1_0[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/0.4bpp"); +const u32 gEventObjectPic_OldMan1_1[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/1.4bpp"); +const u32 gEventObjectPic_OldMan1_2[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/2.4bpp"); +const u32 gEventObjectPic_OldMan1_3[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/3.4bpp"); +const u32 gEventObjectPic_OldMan1_4[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/4.4bpp"); +const u32 gEventObjectPic_OldMan1_5[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/5.4bpp"); +const u32 gEventObjectPic_OldMan1_6[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/6.4bpp"); +const u32 gEventObjectPic_OldMan1_7[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/7.4bpp"); +const u32 gEventObjectPic_OldMan1_8[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/8.4bpp"); +const u32 gEventObjectPic_OldWoman1_0[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/0.4bpp"); +const u32 gEventObjectPic_OldWoman1_1[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/1.4bpp"); +const u32 gEventObjectPic_OldWoman1_2[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/2.4bpp"); +const u32 gEventObjectPic_OldWoman1_3[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/3.4bpp"); +const u32 gEventObjectPic_OldWoman1_4[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/4.4bpp"); +const u32 gEventObjectPic_OldWoman1_5[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/5.4bpp"); +const u32 gEventObjectPic_OldWoman1_6[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/6.4bpp"); +const u32 gEventObjectPic_OldWoman1_7[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/7.4bpp"); +const u32 gEventObjectPic_OldWoman1_8[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/8.4bpp"); +const u32 gEventObjectPic_Man2_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/0.4bpp"); +const u32 gEventObjectPic_Man2_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/1.4bpp"); +const u32 gEventObjectPic_Man2_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/2.4bpp"); +const u32 gEventObjectPic_Man2_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/3.4bpp"); +const u32 gEventObjectPic_Man2_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/4.4bpp"); +const u32 gEventObjectPic_Man2_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/5.4bpp"); +const u32 gEventObjectPic_Man2_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/6.4bpp"); +const u32 gEventObjectPic_Man2_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/7.4bpp"); +const u32 gEventObjectPic_Man2_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/8.4bpp"); +const u32 gEventObjectPic_Woman4_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/0.4bpp"); +const u32 gEventObjectPic_Woman4_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/1.4bpp"); +const u32 gEventObjectPic_Woman4_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/2.4bpp"); +const u32 gEventObjectPic_Woman4_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/3.4bpp"); +const u32 gEventObjectPic_Woman4_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/4.4bpp"); +const u32 gEventObjectPic_Woman4_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/5.4bpp"); +const u32 gEventObjectPic_Woman4_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/6.4bpp"); +const u32 gEventObjectPic_Woman4_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/7.4bpp"); +const u32 gEventObjectPic_Woman4_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/8.4bpp"); +const u32 gEventObjectPic_Man3_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/0.4bpp"); +const u32 gEventObjectPic_Man3_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/1.4bpp"); +const u32 gEventObjectPic_Man3_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/2.4bpp"); +const u32 gEventObjectPic_Man3_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/3.4bpp"); +const u32 gEventObjectPic_Man3_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/4.4bpp"); +const u32 gEventObjectPic_Man3_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/5.4bpp"); +const u32 gEventObjectPic_Man3_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/6.4bpp"); +const u32 gEventObjectPic_Man3_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/7.4bpp"); +const u32 gEventObjectPic_Man3_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/8.4bpp"); +const u32 gEventObjectPic_Woman5_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/0.4bpp"); +const u32 gEventObjectPic_Woman5_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/1.4bpp"); +const u32 gEventObjectPic_Woman5_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/2.4bpp"); +const u32 gEventObjectPic_Woman5_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/3.4bpp"); +const u32 gEventObjectPic_Woman5_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/4.4bpp"); +const u32 gEventObjectPic_Woman5_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/5.4bpp"); +const u32 gEventObjectPic_Woman5_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/6.4bpp"); +const u32 gEventObjectPic_Woman5_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/7.4bpp"); +const u32 gEventObjectPic_Woman5_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/8.4bpp"); +const u32 gEventObjectPic_Cook_0[] = INCBIN_U32("graphics/event_objects/pics/people/cook/0.4bpp"); +const u32 gEventObjectPic_Cook_1[] = INCBIN_U32("graphics/event_objects/pics/people/cook/1.4bpp"); +const u32 gEventObjectPic_Cook_2[] = INCBIN_U32("graphics/event_objects/pics/people/cook/2.4bpp"); +const u32 gEventObjectPic_Woman6_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/0.4bpp"); +const u32 gEventObjectPic_Woman6_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/1.4bpp"); +const u32 gEventObjectPic_Woman6_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/2.4bpp"); +const u32 gEventObjectPic_Woman6_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/3.4bpp"); +const u32 gEventObjectPic_Woman6_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/4.4bpp"); +const u32 gEventObjectPic_Woman6_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/5.4bpp"); +const u32 gEventObjectPic_Woman6_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/6.4bpp"); +const u32 gEventObjectPic_Woman6_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/7.4bpp"); +const u32 gEventObjectPic_Woman6_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/8.4bpp"); +const u32 gEventObjectPic_OldMan2_0[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_2/0.4bpp"); +const u32 gEventObjectPic_OldMan2_1[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_2/1.4bpp"); +const u32 gEventObjectPic_OldMan2_2[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_2/2.4bpp"); +const u32 gEventObjectPic_OldWoman2_0[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/0.4bpp"); +const u32 gEventObjectPic_OldWoman2_1[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/1.4bpp"); +const u32 gEventObjectPic_OldWoman2_2[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/2.4bpp"); +const u32 gEventObjectPic_OldWoman2_3[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/3.4bpp"); +const u32 gEventObjectPic_OldWoman2_4[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/4.4bpp"); +const u32 gEventObjectPic_OldWoman2_5[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/5.4bpp"); +const u32 gEventObjectPic_OldWoman2_6[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/6.4bpp"); +const u32 gEventObjectPic_OldWoman2_7[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/7.4bpp"); +const u32 gEventObjectPic_OldWoman2_8[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/8.4bpp"); +const u32 gEventObjectPic_Camper_0[] = INCBIN_U32("graphics/event_objects/pics/people/camper/0.4bpp"); +const u32 gEventObjectPic_Camper_1[] = INCBIN_U32("graphics/event_objects/pics/people/camper/1.4bpp"); +const u32 gEventObjectPic_Camper_2[] = INCBIN_U32("graphics/event_objects/pics/people/camper/2.4bpp"); +const u32 gEventObjectPic_Camper_3[] = INCBIN_U32("graphics/event_objects/pics/people/camper/3.4bpp"); +const u32 gEventObjectPic_Camper_4[] = INCBIN_U32("graphics/event_objects/pics/people/camper/4.4bpp"); +const u32 gEventObjectPic_Camper_5[] = INCBIN_U32("graphics/event_objects/pics/people/camper/5.4bpp"); +const u32 gEventObjectPic_Camper_6[] = INCBIN_U32("graphics/event_objects/pics/people/camper/6.4bpp"); +const u32 gEventObjectPic_Camper_7[] = INCBIN_U32("graphics/event_objects/pics/people/camper/7.4bpp"); +const u32 gEventObjectPic_Camper_8[] = INCBIN_U32("graphics/event_objects/pics/people/camper/8.4bpp"); +const u32 gEventObjectPic_Picnicker_0[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/0.4bpp"); +const u32 gEventObjectPic_Picnicker_1[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/1.4bpp"); +const u32 gEventObjectPic_Picnicker_2[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/2.4bpp"); +const u32 gEventObjectPic_Picnicker_3[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/3.4bpp"); +const u32 gEventObjectPic_Picnicker_4[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/4.4bpp"); +const u32 gEventObjectPic_Picnicker_5[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/5.4bpp"); +const u32 gEventObjectPic_Picnicker_6[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/6.4bpp"); +const u32 gEventObjectPic_Picnicker_7[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/7.4bpp"); +const u32 gEventObjectPic_Picnicker_8[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/8.4bpp"); +const u32 gEventObjectPic_Man4_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/0.4bpp"); +const u32 gEventObjectPic_Man4_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/1.4bpp"); +const u32 gEventObjectPic_Man4_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/2.4bpp"); +const u32 gEventObjectPic_Man4_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/3.4bpp"); +const u32 gEventObjectPic_Man4_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/4.4bpp"); +const u32 gEventObjectPic_Man4_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/5.4bpp"); +const u32 gEventObjectPic_Man4_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/6.4bpp"); +const u32 gEventObjectPic_Man4_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/7.4bpp"); +const u32 gEventObjectPic_Man4_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/8.4bpp"); +const u32 gEventObjectPic_Woman7_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/0.4bpp"); +const u32 gEventObjectPic_Woman7_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/1.4bpp"); +const u32 gEventObjectPic_Woman7_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/2.4bpp"); +const u32 gEventObjectPic_Woman7_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/3.4bpp"); +const u32 gEventObjectPic_Woman7_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/4.4bpp"); +const u32 gEventObjectPic_Woman7_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/5.4bpp"); +const u32 gEventObjectPic_Woman7_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/6.4bpp"); +const u32 gEventObjectPic_Woman7_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/7.4bpp"); +const u32 gEventObjectPic_Woman7_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/8.4bpp"); +const u32 gEventObjectPic_Youngster_0[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/0.4bpp"); +const u32 gEventObjectPic_Youngster_1[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/1.4bpp"); +const u32 gEventObjectPic_Youngster_2[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/2.4bpp"); +const u32 gEventObjectPic_Youngster_3[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/3.4bpp"); +const u32 gEventObjectPic_Youngster_4[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/4.4bpp"); +const u32 gEventObjectPic_Youngster_5[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/5.4bpp"); +const u32 gEventObjectPic_Youngster_6[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/6.4bpp"); +const u32 gEventObjectPic_Youngster_7[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/7.4bpp"); +const u32 gEventObjectPic_Youngster_8[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/8.4bpp"); +const u32 gEventObjectPic_BugCatcher_0[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/0.4bpp"); +const u32 gEventObjectPic_BugCatcher_1[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/1.4bpp"); +const u32 gEventObjectPic_BugCatcher_2[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/2.4bpp"); +const u32 gEventObjectPic_BugCatcher_3[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/3.4bpp"); +const u32 gEventObjectPic_BugCatcher_4[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/4.4bpp"); +const u32 gEventObjectPic_BugCatcher_5[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/5.4bpp"); +const u32 gEventObjectPic_BugCatcher_6[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/6.4bpp"); +const u32 gEventObjectPic_BugCatcher_7[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/7.4bpp"); +const u32 gEventObjectPic_BugCatcher_8[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/8.4bpp"); +const u32 gEventObjectPic_PsychicM_0[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/0.4bpp"); +const u32 gEventObjectPic_PsychicM_1[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/1.4bpp"); +const u32 gEventObjectPic_PsychicM_2[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/2.4bpp"); +const u32 gEventObjectPic_PsychicM_3[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/3.4bpp"); +const u32 gEventObjectPic_PsychicM_4[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/4.4bpp"); +const u32 gEventObjectPic_PsychicM_5[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/5.4bpp"); +const u32 gEventObjectPic_PsychicM_6[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/6.4bpp"); +const u32 gEventObjectPic_PsychicM_7[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/7.4bpp"); +const u32 gEventObjectPic_PsychicM_8[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/8.4bpp"); +const u32 gEventObjectPic_SchoolKidM_0[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/0.4bpp"); +const u32 gEventObjectPic_SchoolKidM_1[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/1.4bpp"); +const u32 gEventObjectPic_SchoolKidM_2[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/2.4bpp"); +const u32 gEventObjectPic_SchoolKidM_3[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/3.4bpp"); +const u32 gEventObjectPic_SchoolKidM_4[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/4.4bpp"); +const u32 gEventObjectPic_SchoolKidM_5[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/5.4bpp"); +const u32 gEventObjectPic_SchoolKidM_6[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/6.4bpp"); +const u32 gEventObjectPic_SchoolKidM_7[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/7.4bpp"); +const u32 gEventObjectPic_SchoolKidM_8[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/8.4bpp"); +const u32 gEventObjectPic_Maniac_0[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/0.4bpp"); +const u32 gEventObjectPic_Maniac_1[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/1.4bpp"); +const u32 gEventObjectPic_Maniac_2[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/2.4bpp"); +const u32 gEventObjectPic_Maniac_3[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/3.4bpp"); +const u32 gEventObjectPic_Maniac_4[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/4.4bpp"); +const u32 gEventObjectPic_Maniac_5[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/5.4bpp"); +const u32 gEventObjectPic_Maniac_6[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/6.4bpp"); +const u32 gEventObjectPic_Maniac_7[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/7.4bpp"); +const u32 gEventObjectPic_Maniac_8[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/8.4bpp"); +const u32 gEventObjectPic_HexManiac_0[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/0.4bpp"); +const u32 gEventObjectPic_HexManiac_1[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/1.4bpp"); +const u32 gEventObjectPic_HexManiac_2[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/2.4bpp"); +const u32 gEventObjectPic_HexManiac_3[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/3.4bpp"); +const u32 gEventObjectPic_HexManiac_4[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/4.4bpp"); +const u32 gEventObjectPic_HexManiac_5[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/5.4bpp"); +const u32 gEventObjectPic_HexManiac_6[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/6.4bpp"); +const u32 gEventObjectPic_HexManiac_7[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/7.4bpp"); +const u32 gEventObjectPic_HexManiac_8[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/8.4bpp"); +const u32 gEventObjectPic_UnusedWoman_0[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman/0.4bpp"); +const u32 gEventObjectPic_UnusedWoman_1[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman/1.4bpp"); +const u32 gEventObjectPic_UnusedWoman_2[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman/2.4bpp"); +const u32 gEventObjectPic_UnusedWoman_3[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman/3.4bpp"); +const u32 gEventObjectPic_UnusedWoman_4[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman/4.4bpp"); +const u32 gEventObjectPic_UnusedWoman_5[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman/5.4bpp"); +const u32 gEventObjectPic_UnusedWoman_6[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman/6.4bpp"); +const u32 gEventObjectPic_UnusedWoman_7[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman/7.4bpp"); +const u32 gEventObjectPic_UnusedWoman_8[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman/8.4bpp"); +const u32 gEventObjectPic_SwimmerM_0[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/0.4bpp"); +const u32 gEventObjectPic_SwimmerM_1[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/1.4bpp"); +const u32 gEventObjectPic_SwimmerM_2[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/2.4bpp"); +const u32 gEventObjectPic_SwimmerM_3[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/3.4bpp"); +const u32 gEventObjectPic_SwimmerM_4[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/4.4bpp"); +const u32 gEventObjectPic_SwimmerM_5[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/5.4bpp"); +const u32 gEventObjectPic_SwimmerM_6[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/6.4bpp"); +const u32 gEventObjectPic_SwimmerM_7[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/7.4bpp"); +const u32 gEventObjectPic_SwimmerM_8[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/8.4bpp"); +const u32 gEventObjectPic_SwimmerF_0[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/0.4bpp"); +const u32 gEventObjectPic_SwimmerF_1[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/1.4bpp"); +const u32 gEventObjectPic_SwimmerF_2[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/2.4bpp"); +const u32 gEventObjectPic_SwimmerF_3[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/3.4bpp"); +const u32 gEventObjectPic_SwimmerF_4[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/4.4bpp"); +const u32 gEventObjectPic_SwimmerF_5[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/5.4bpp"); +const u32 gEventObjectPic_SwimmerF_6[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/6.4bpp"); +const u32 gEventObjectPic_SwimmerF_7[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/7.4bpp"); +const u32 gEventObjectPic_SwimmerF_8[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/8.4bpp"); +const u32 gEventObjectPic_BlackBelt_0[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/0.4bpp"); +const u32 gEventObjectPic_BlackBelt_1[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/1.4bpp"); +const u32 gEventObjectPic_BlackBelt_2[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/2.4bpp"); +const u32 gEventObjectPic_BlackBelt_3[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/3.4bpp"); +const u32 gEventObjectPic_BlackBelt_4[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/4.4bpp"); +const u32 gEventObjectPic_BlackBelt_5[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/5.4bpp"); +const u32 gEventObjectPic_BlackBelt_6[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/6.4bpp"); +const u32 gEventObjectPic_BlackBelt_7[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/7.4bpp"); +const u32 gEventObjectPic_BlackBelt_8[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/8.4bpp"); +const u32 gEventObjectPic_Beauty_0[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/0.4bpp"); +const u32 gEventObjectPic_Beauty_1[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/1.4bpp"); +const u32 gEventObjectPic_Beauty_2[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/2.4bpp"); +const u32 gEventObjectPic_Beauty_3[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/3.4bpp"); +const u32 gEventObjectPic_Beauty_4[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/4.4bpp"); +const u32 gEventObjectPic_Beauty_5[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/5.4bpp"); +const u32 gEventObjectPic_Beauty_6[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/6.4bpp"); +const u32 gEventObjectPic_Beauty_7[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/7.4bpp"); +const u32 gEventObjectPic_Beauty_8[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/8.4bpp"); +const u32 gEventObjectPic_Scientist1_0[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/0.4bpp"); +const u32 gEventObjectPic_Scientist1_1[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/1.4bpp"); +const u32 gEventObjectPic_Scientist1_2[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/2.4bpp"); +const u32 gEventObjectPic_Scientist1_3[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/3.4bpp"); +const u32 gEventObjectPic_Scientist1_4[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/4.4bpp"); +const u32 gEventObjectPic_Scientist1_5[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/5.4bpp"); +const u32 gEventObjectPic_Scientist1_6[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/6.4bpp"); +const u32 gEventObjectPic_Scientist1_7[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/7.4bpp"); +const u32 gEventObjectPic_Scientist1_8[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/8.4bpp"); +const u32 gEventObjectPic_Lass_0[] = INCBIN_U32("graphics/event_objects/pics/people/lass/0.4bpp"); +const u32 gEventObjectPic_Lass_1[] = INCBIN_U32("graphics/event_objects/pics/people/lass/1.4bpp"); +const u32 gEventObjectPic_Lass_2[] = INCBIN_U32("graphics/event_objects/pics/people/lass/2.4bpp"); +const u32 gEventObjectPic_Lass_3[] = INCBIN_U32("graphics/event_objects/pics/people/lass/3.4bpp"); +const u32 gEventObjectPic_Lass_4[] = INCBIN_U32("graphics/event_objects/pics/people/lass/4.4bpp"); +const u32 gEventObjectPic_Lass_5[] = INCBIN_U32("graphics/event_objects/pics/people/lass/5.4bpp"); +const u32 gEventObjectPic_Lass_6[] = INCBIN_U32("graphics/event_objects/pics/people/lass/6.4bpp"); +const u32 gEventObjectPic_Lass_7[] = INCBIN_U32("graphics/event_objects/pics/people/lass/7.4bpp"); +const u32 gEventObjectPic_Lass_8[] = INCBIN_U32("graphics/event_objects/pics/people/lass/8.4bpp"); +const u32 gEventObjectPic_Gentleman_0[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/0.4bpp"); +const u32 gEventObjectPic_Gentleman_1[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/1.4bpp"); +const u32 gEventObjectPic_Gentleman_2[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/2.4bpp"); +const u32 gEventObjectPic_Gentleman_3[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/3.4bpp"); +const u32 gEventObjectPic_Gentleman_4[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/4.4bpp"); +const u32 gEventObjectPic_Gentleman_5[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/5.4bpp"); +const u32 gEventObjectPic_Gentleman_6[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/6.4bpp"); +const u32 gEventObjectPic_Gentleman_7[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/7.4bpp"); +const u32 gEventObjectPic_Gentleman_8[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/8.4bpp"); +const u32 gEventObjectPic_Sailor_0[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/0.4bpp"); +const u32 gEventObjectPic_Sailor_1[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/1.4bpp"); +const u32 gEventObjectPic_Sailor_2[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/2.4bpp"); +const u32 gEventObjectPic_Sailor_3[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/3.4bpp"); +const u32 gEventObjectPic_Sailor_4[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/4.4bpp"); +const u32 gEventObjectPic_Sailor_5[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/5.4bpp"); +const u32 gEventObjectPic_Sailor_6[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/6.4bpp"); +const u32 gEventObjectPic_Sailor_7[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/7.4bpp"); +const u32 gEventObjectPic_Sailor_8[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/8.4bpp"); +const u32 gEventObjectPic_Fisherman_0[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/0.4bpp"); +const u32 gEventObjectPic_Fisherman_1[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/1.4bpp"); +const u32 gEventObjectPic_Fisherman_2[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/2.4bpp"); +const u32 gEventObjectPic_Fisherman_3[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/3.4bpp"); +const u32 gEventObjectPic_Fisherman_4[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/4.4bpp"); +const u32 gEventObjectPic_Fisherman_5[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/5.4bpp"); +const u32 gEventObjectPic_Fisherman_6[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/6.4bpp"); +const u32 gEventObjectPic_Fisherman_7[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/7.4bpp"); +const u32 gEventObjectPic_Fisherman_8[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/8.4bpp"); +const u32 gEventObjectPic_RunningTriathleteM_0[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/0.4bpp"); +const u32 gEventObjectPic_RunningTriathleteM_1[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/1.4bpp"); +const u32 gEventObjectPic_RunningTriathleteM_2[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/2.4bpp"); +const u32 gEventObjectPic_RunningTriathleteM_3[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/3.4bpp"); +const u32 gEventObjectPic_RunningTriathleteM_4[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/4.4bpp"); +const u32 gEventObjectPic_RunningTriathleteM_5[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/5.4bpp"); +const u32 gEventObjectPic_RunningTriathleteM_6[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/6.4bpp"); +const u32 gEventObjectPic_RunningTriathleteM_7[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/7.4bpp"); +const u32 gEventObjectPic_RunningTriathleteM_8[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/8.4bpp"); +const u32 gEventObjectPic_RunningTriathleteF_0[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/0.4bpp"); +const u32 gEventObjectPic_RunningTriathleteF_1[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/1.4bpp"); +const u32 gEventObjectPic_RunningTriathleteF_2[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/2.4bpp"); +const u32 gEventObjectPic_RunningTriathleteF_3[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/3.4bpp"); +const u32 gEventObjectPic_RunningTriathleteF_4[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/4.4bpp"); +const u32 gEventObjectPic_RunningTriathleteF_5[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/5.4bpp"); +const u32 gEventObjectPic_RunningTriathleteF_6[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/6.4bpp"); +const u32 gEventObjectPic_RunningTriathleteF_7[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/7.4bpp"); +const u32 gEventObjectPic_RunningTriathleteF_8[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/8.4bpp"); +const u32 gEventObjectPic_TuberF_0[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/0.4bpp"); +const u32 gEventObjectPic_TuberF_1[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/1.4bpp"); +const u32 gEventObjectPic_TuberF_2[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/2.4bpp"); +const u32 gEventObjectPic_TuberF_3[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/3.4bpp"); +const u32 gEventObjectPic_TuberF_4[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/4.4bpp"); +const u32 gEventObjectPic_TuberF_5[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/5.4bpp"); +const u32 gEventObjectPic_TuberF_6[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/6.4bpp"); +const u32 gEventObjectPic_TuberF_7[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/7.4bpp"); +const u32 gEventObjectPic_TuberF_8[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/8.4bpp"); +const u32 gEventObjectPic_TuberM_0[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/0.4bpp"); +const u32 gEventObjectPic_TuberM_1[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/1.4bpp"); +const u32 gEventObjectPic_TuberM_2[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/2.4bpp"); +const u32 gEventObjectPic_TuberM_3[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/3.4bpp"); +const u32 gEventObjectPic_TuberM_4[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/4.4bpp"); +const u32 gEventObjectPic_TuberM_5[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/5.4bpp"); +const u32 gEventObjectPic_TuberM_6[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/6.4bpp"); +const u32 gEventObjectPic_TuberM_7[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/7.4bpp"); +const u32 gEventObjectPic_TuberM_8[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/8.4bpp"); +const u32 gEventObjectPic_Hiker_0[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/0.4bpp"); +const u32 gEventObjectPic_Hiker_1[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/1.4bpp"); +const u32 gEventObjectPic_Hiker_2[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/2.4bpp"); +const u32 gEventObjectPic_Hiker_3[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/3.4bpp"); +const u32 gEventObjectPic_Hiker_4[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/4.4bpp"); +const u32 gEventObjectPic_Hiker_5[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/5.4bpp"); +const u32 gEventObjectPic_Hiker_6[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/6.4bpp"); +const u32 gEventObjectPic_Hiker_7[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/7.4bpp"); +const u32 gEventObjectPic_Hiker_8[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/8.4bpp"); +const u32 gEventObjectPic_CyclingTriathleteM_0[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/0.4bpp"); +const u32 gEventObjectPic_CyclingTriathleteM_1[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/1.4bpp"); +const u32 gEventObjectPic_CyclingTriathleteM_2[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/2.4bpp"); +const u32 gEventObjectPic_CyclingTriathleteM_3[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/3.4bpp"); +const u32 gEventObjectPic_CyclingTriathleteM_4[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/4.4bpp"); +const u32 gEventObjectPic_CyclingTriathleteM_5[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/5.4bpp"); +const u32 gEventObjectPic_CyclingTriathleteM_6[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/6.4bpp"); +const u32 gEventObjectPic_CyclingTriathleteM_7[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/7.4bpp"); +const u32 gEventObjectPic_CyclingTriathleteM_8[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/8.4bpp"); +const u32 gEventObjectPic_CyclingTriathleteF_0[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/0.4bpp"); +const u32 gEventObjectPic_CyclingTriathleteF_1[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/1.4bpp"); +const u32 gEventObjectPic_CyclingTriathleteF_2[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/2.4bpp"); +const u32 gEventObjectPic_CyclingTriathleteF_3[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/3.4bpp"); +const u32 gEventObjectPic_CyclingTriathleteF_4[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/4.4bpp"); +const u32 gEventObjectPic_CyclingTriathleteF_5[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/5.4bpp"); +const u32 gEventObjectPic_CyclingTriathleteF_6[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/6.4bpp"); +const u32 gEventObjectPic_CyclingTriathleteF_7[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/7.4bpp"); +const u32 gEventObjectPic_CyclingTriathleteF_8[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/8.4bpp"); +const u32 gEventObjectPic_Man5_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/0.4bpp"); +const u32 gEventObjectPic_Man5_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/1.4bpp"); +const u32 gEventObjectPic_Man5_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/2.4bpp"); +const u32 gEventObjectPic_Man5_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/3.4bpp"); +const u32 gEventObjectPic_Man5_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/4.4bpp"); +const u32 gEventObjectPic_Man5_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/5.4bpp"); +const u32 gEventObjectPic_Man5_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/6.4bpp"); +const u32 gEventObjectPic_Man5_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/7.4bpp"); +const u32 gEventObjectPic_Man5_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/8.4bpp"); +const u32 gEventObjectPic_Man6_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/0.4bpp"); +const u32 gEventObjectPic_Man6_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/1.4bpp"); +const u32 gEventObjectPic_Man6_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/2.4bpp"); +const u32 gEventObjectPic_Man6_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/3.4bpp"); +const u32 gEventObjectPic_Man6_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/4.4bpp"); +const u32 gEventObjectPic_Man6_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/5.4bpp"); +const u32 gEventObjectPic_Man6_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/6.4bpp"); +const u32 gEventObjectPic_Man6_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/7.4bpp"); +const u32 gEventObjectPic_Man6_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/8.4bpp"); +const u32 gEventObjectPic_Nurse_0[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/0.4bpp"); +const u32 gEventObjectPic_Nurse_1[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/1.4bpp"); +const u32 gEventObjectPic_Nurse_2[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/2.4bpp"); +const u32 gEventObjectPic_Nurse_3[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/3.4bpp"); +const u32 gEventObjectPic_ItemBall[] = INCBIN_U32("graphics/event_objects/pics/misc/item_ball.4bpp"); +const u32 gEventObjectPic_ProfBirch_0[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/0.4bpp"); +const u32 gEventObjectPic_ProfBirch_1[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/1.4bpp"); +const u32 gEventObjectPic_ProfBirch_2[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/2.4bpp"); +const u32 gEventObjectPic_ProfBirch_3[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/3.4bpp"); +const u32 gEventObjectPic_ProfBirch_4[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/4.4bpp"); +const u32 gEventObjectPic_ProfBirch_5[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/5.4bpp"); +const u32 gEventObjectPic_ProfBirch_6[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/6.4bpp"); +const u32 gEventObjectPic_ProfBirch_7[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/7.4bpp"); +const u32 gEventObjectPic_ProfBirch_8[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/8.4bpp"); +const u32 gEventObjectPic_ReporterM_0[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/0.4bpp"); +const u32 gEventObjectPic_ReporterM_1[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/1.4bpp"); +const u32 gEventObjectPic_ReporterM_2[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/2.4bpp"); +const u32 gEventObjectPic_ReporterM_3[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/3.4bpp"); +const u32 gEventObjectPic_ReporterM_4[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/4.4bpp"); +const u32 gEventObjectPic_ReporterM_5[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/5.4bpp"); +const u32 gEventObjectPic_ReporterM_6[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/6.4bpp"); +const u32 gEventObjectPic_ReporterM_7[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/7.4bpp"); +const u32 gEventObjectPic_ReporterM_8[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/8.4bpp"); +const u32 gEventObjectPic_ReporterF_0[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/0.4bpp"); +const u32 gEventObjectPic_ReporterF_1[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/1.4bpp"); +const u32 gEventObjectPic_ReporterF_2[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/2.4bpp"); +const u32 gEventObjectPic_ReporterF_3[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/3.4bpp"); +const u32 gEventObjectPic_ReporterF_4[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/4.4bpp"); +const u32 gEventObjectPic_ReporterF_5[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/5.4bpp"); +const u32 gEventObjectPic_ReporterF_6[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/6.4bpp"); +const u32 gEventObjectPic_ReporterF_7[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/7.4bpp"); +const u32 gEventObjectPic_ReporterF_8[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/8.4bpp"); +const u32 gEventObjectPic_MauvilleOldMan1_0[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/0.4bpp"); +const u32 gEventObjectPic_MauvilleOldMan1_1[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/1.4bpp"); +const u32 gEventObjectPic_MauvilleOldMan1_2[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/2.4bpp"); +const u32 gEventObjectPic_MauvilleOldMan1_3[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/3.4bpp"); +const u32 gEventObjectPic_MauvilleOldMan1_4[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/4.4bpp"); +const u32 gEventObjectPic_MauvilleOldMan1_5[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/5.4bpp"); +const u32 gEventObjectPic_MauvilleOldMan1_6[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/6.4bpp"); +const u32 gEventObjectPic_MauvilleOldMan1_7[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/7.4bpp"); +const u32 gEventObjectPic_MauvilleOldMan1_8[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/8.4bpp"); +const u32 gEventObjectPic_MauvilleOldMan2_0[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/0.4bpp"); +const u32 gEventObjectPic_MauvilleOldMan2_1[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/1.4bpp"); +const u32 gEventObjectPic_MauvilleOldMan2_2[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/2.4bpp"); +const u32 gEventObjectPic_MauvilleOldMan2_3[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/3.4bpp"); +const u32 gEventObjectPic_MauvilleOldMan2_4[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/4.4bpp"); +const u32 gEventObjectPic_MauvilleOldMan2_5[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/5.4bpp"); +const u32 gEventObjectPic_MauvilleOldMan2_6[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/6.4bpp"); +const u32 gEventObjectPic_MauvilleOldMan2_7[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/7.4bpp"); +const u32 gEventObjectPic_MauvilleOldMan2_8[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/8.4bpp"); +const u32 gEventObjectPic_MartEmployee_0[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/0.4bpp"); +const u32 gEventObjectPic_MartEmployee_1[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/1.4bpp"); +const u32 gEventObjectPic_MartEmployee_2[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/2.4bpp"); +const u32 gEventObjectPic_MartEmployee_3[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/3.4bpp"); +const u32 gEventObjectPic_MartEmployee_4[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/4.4bpp"); +const u32 gEventObjectPic_MartEmployee_5[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/5.4bpp"); +const u32 gEventObjectPic_MartEmployee_6[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/6.4bpp"); +const u32 gEventObjectPic_MartEmployee_7[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/7.4bpp"); +const u32 gEventObjectPic_MartEmployee_8[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/8.4bpp"); +const u32 gEventObjectPic_RooftopSaleWoman_0[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/0.4bpp"); +const u32 gEventObjectPic_RooftopSaleWoman_1[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/1.4bpp"); +const u32 gEventObjectPic_RooftopSaleWoman_2[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/2.4bpp"); +const u32 gEventObjectPic_RooftopSaleWoman_3[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/3.4bpp"); +const u32 gEventObjectPic_RooftopSaleWoman_4[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/4.4bpp"); +const u32 gEventObjectPic_RooftopSaleWoman_5[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/5.4bpp"); +const u32 gEventObjectPic_RooftopSaleWoman_6[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/6.4bpp"); +const u32 gEventObjectPic_RooftopSaleWoman_7[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/7.4bpp"); +const u32 gEventObjectPic_RooftopSaleWoman_8[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/8.4bpp"); +const u32 gEventObjectPic_Teala_0[] = INCBIN_U32("graphics/event_objects/pics/people/teala/0.4bpp"); +const u32 gEventObjectPic_Teala_1[] = INCBIN_U32("graphics/event_objects/pics/people/teala/1.4bpp"); +const u32 gEventObjectPic_Teala_2[] = INCBIN_U32("graphics/event_objects/pics/people/teala/2.4bpp"); +const u32 gEventObjectPic_Teala_3[] = INCBIN_U32("graphics/event_objects/pics/people/teala/3.4bpp"); +const u32 gEventObjectPic_Teala_4[] = INCBIN_U32("graphics/event_objects/pics/people/teala/4.4bpp"); +const u32 gEventObjectPic_Teala_5[] = INCBIN_U32("graphics/event_objects/pics/people/teala/5.4bpp"); +const u32 gEventObjectPic_Teala_6[] = INCBIN_U32("graphics/event_objects/pics/people/teala/6.4bpp"); +const u32 gEventObjectPic_Teala_7[] = INCBIN_U32("graphics/event_objects/pics/people/teala/7.4bpp"); +const u32 gEventObjectPic_Teala_8[] = INCBIN_U32("graphics/event_objects/pics/people/teala/8.4bpp"); +const u32 gEventObjectPic_Artist_0[] = INCBIN_U32("graphics/event_objects/pics/people/artist/0.4bpp"); +const u32 gEventObjectPic_Artist_1[] = INCBIN_U32("graphics/event_objects/pics/people/artist/1.4bpp"); +const u32 gEventObjectPic_Artist_2[] = INCBIN_U32("graphics/event_objects/pics/people/artist/2.4bpp"); +const u32 gEventObjectPic_Artist_3[] = INCBIN_U32("graphics/event_objects/pics/people/artist/3.4bpp"); +const u32 gEventObjectPic_Artist_4[] = INCBIN_U32("graphics/event_objects/pics/people/artist/4.4bpp"); +const u32 gEventObjectPic_Artist_5[] = INCBIN_U32("graphics/event_objects/pics/people/artist/5.4bpp"); +const u32 gEventObjectPic_Artist_6[] = INCBIN_U32("graphics/event_objects/pics/people/artist/6.4bpp"); +const u32 gEventObjectPic_Artist_7[] = INCBIN_U32("graphics/event_objects/pics/people/artist/7.4bpp"); +const u32 gEventObjectPic_Artist_8[] = INCBIN_U32("graphics/event_objects/pics/people/artist/8.4bpp"); +const u32 gEventObjectPic_Cameraman_0[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/0.4bpp"); +const u32 gEventObjectPic_Cameraman_1[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/1.4bpp"); +const u32 gEventObjectPic_Cameraman_2[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/2.4bpp"); +const u32 gEventObjectPic_Cameraman_3[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/3.4bpp"); +const u32 gEventObjectPic_Cameraman_4[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/4.4bpp"); +const u32 gEventObjectPic_Cameraman_5[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/5.4bpp"); +const u32 gEventObjectPic_Cameraman_6[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/6.4bpp"); +const u32 gEventObjectPic_Cameraman_7[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/7.4bpp"); +const u32 gEventObjectPic_Cameraman_8[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/8.4bpp"); +const u32 gEventObjectPic_Scientist2_0[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/0.4bpp"); +const u32 gEventObjectPic_Scientist2_1[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/1.4bpp"); +const u32 gEventObjectPic_Scientist2_2[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/2.4bpp"); +const u32 gEventObjectPic_Scientist2_3[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/3.4bpp"); +const u32 gEventObjectPic_Scientist2_4[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/4.4bpp"); +const u32 gEventObjectPic_Scientist2_5[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/5.4bpp"); +const u32 gEventObjectPic_Scientist2_6[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/6.4bpp"); +const u32 gEventObjectPic_Scientist2_7[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/7.4bpp"); +const u32 gEventObjectPic_Scientist2_8[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/8.4bpp"); +const u32 gEventObjectPic_Man7_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/0.4bpp"); +const u32 gEventObjectPic_Man7_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/1.4bpp"); +const u32 gEventObjectPic_Man7_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/2.4bpp"); +const u32 gEventObjectPic_Man7_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/3.4bpp"); +const u32 gEventObjectPic_Man7_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/4.4bpp"); +const u32 gEventObjectPic_Man7_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/5.4bpp"); +const u32 gEventObjectPic_Man7_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/6.4bpp"); +const u32 gEventObjectPic_Man7_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/7.4bpp"); +const u32 gEventObjectPic_Man7_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/8.4bpp"); +const u32 gEventObjectPic_AquaMemberM_0[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/0.4bpp"); +const u32 gEventObjectPic_AquaMemberM_1[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/1.4bpp"); +const u32 gEventObjectPic_AquaMemberM_2[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/2.4bpp"); +const u32 gEventObjectPic_AquaMemberM_3[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/3.4bpp"); +const u32 gEventObjectPic_AquaMemberM_4[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/4.4bpp"); +const u32 gEventObjectPic_AquaMemberM_5[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/5.4bpp"); +const u32 gEventObjectPic_AquaMemberM_6[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/6.4bpp"); +const u32 gEventObjectPic_AquaMemberM_7[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/7.4bpp"); +const u32 gEventObjectPic_AquaMemberM_8[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/8.4bpp"); +const u32 gEventObjectPic_AquaMemberF_0[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/0.4bpp"); +const u32 gEventObjectPic_AquaMemberF_1[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/1.4bpp"); +const u32 gEventObjectPic_AquaMemberF_2[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/2.4bpp"); +const u32 gEventObjectPic_AquaMemberF_3[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/3.4bpp"); +const u32 gEventObjectPic_AquaMemberF_4[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/4.4bpp"); +const u32 gEventObjectPic_AquaMemberF_5[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/5.4bpp"); +const u32 gEventObjectPic_AquaMemberF_6[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/6.4bpp"); +const u32 gEventObjectPic_AquaMemberF_7[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/7.4bpp"); +const u32 gEventObjectPic_AquaMemberF_8[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/8.4bpp"); +const u32 gEventObjectPic_MagmaMemberM_0[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/0.4bpp"); +const u32 gEventObjectPic_MagmaMemberM_1[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/1.4bpp"); +const u32 gEventObjectPic_MagmaMemberM_2[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/2.4bpp"); +const u32 gEventObjectPic_MagmaMemberM_3[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/3.4bpp"); +const u32 gEventObjectPic_MagmaMemberM_4[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/4.4bpp"); +const u32 gEventObjectPic_MagmaMemberM_5[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/5.4bpp"); +const u32 gEventObjectPic_MagmaMemberM_6[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/6.4bpp"); +const u32 gEventObjectPic_MagmaMemberM_7[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/7.4bpp"); +const u32 gEventObjectPic_MagmaMemberM_8[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/8.4bpp"); +const u32 gEventObjectPic_MagmaMemberF_0[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/0.4bpp"); +const u32 gEventObjectPic_MagmaMemberF_1[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/1.4bpp"); +const u32 gEventObjectPic_MagmaMemberF_2[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/2.4bpp"); +const u32 gEventObjectPic_MagmaMemberF_3[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/3.4bpp"); +const u32 gEventObjectPic_MagmaMemberF_4[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/4.4bpp"); +const u32 gEventObjectPic_MagmaMemberF_5[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/5.4bpp"); +const u32 gEventObjectPic_MagmaMemberF_6[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/6.4bpp"); +const u32 gEventObjectPic_MagmaMemberF_7[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/7.4bpp"); +const u32 gEventObjectPic_MagmaMemberF_8[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/8.4bpp"); +const u32 gEventObjectPic_Sidney_0[] = INCBIN_U32("graphics/event_objects/pics/people/sidney/0.4bpp"); +const u32 gEventObjectPic_Sidney_1[] = INCBIN_U32("graphics/event_objects/pics/people/sidney/1.4bpp"); +const u32 gEventObjectPic_Sidney_2[] = INCBIN_U32("graphics/event_objects/pics/people/sidney/2.4bpp"); +const u32 gEventObjectPic_Phoebe_0[] = INCBIN_U32("graphics/event_objects/pics/people/phoebe/0.4bpp"); +const u32 gEventObjectPic_Phoebe_1[] = INCBIN_U32("graphics/event_objects/pics/people/phoebe/1.4bpp"); +const u32 gEventObjectPic_Phoebe_2[] = INCBIN_U32("graphics/event_objects/pics/people/phoebe/2.4bpp"); +const u32 gEventObjectPic_Glacia_0[] = INCBIN_U32("graphics/event_objects/pics/people/glacia/0.4bpp"); +const u32 gEventObjectPic_Glacia_1[] = INCBIN_U32("graphics/event_objects/pics/people/glacia/1.4bpp"); +const u32 gEventObjectPic_Glacia_2[] = INCBIN_U32("graphics/event_objects/pics/people/glacia/2.4bpp"); +const u32 gEventObjectPic_Drake_0[] = INCBIN_U32("graphics/event_objects/pics/people/drake/0.4bpp"); +const u32 gEventObjectPic_Drake_1[] = INCBIN_U32("graphics/event_objects/pics/people/drake/1.4bpp"); +const u32 gEventObjectPic_Drake_2[] = INCBIN_U32("graphics/event_objects/pics/people/drake/2.4bpp"); +const u32 gEventObjectPic_Roxanne_0[] = INCBIN_U32("graphics/event_objects/pics/people/roxanne/0.4bpp"); +const u32 gEventObjectPic_Roxanne_1[] = INCBIN_U32("graphics/event_objects/pics/people/roxanne/1.4bpp"); +const u32 gEventObjectPic_Roxanne_2[] = INCBIN_U32("graphics/event_objects/pics/people/roxanne/2.4bpp"); +const u32 gEventObjectPic_Brawly_0[] = INCBIN_U32("graphics/event_objects/pics/people/brawly/0.4bpp"); +const u32 gEventObjectPic_Brawly_1[] = INCBIN_U32("graphics/event_objects/pics/people/brawly/1.4bpp"); +const u32 gEventObjectPic_Brawly_2[] = INCBIN_U32("graphics/event_objects/pics/people/brawly/2.4bpp"); +const u32 gEventObjectPic_Wattson_0[] = INCBIN_U32("graphics/event_objects/pics/people/wattson/0.4bpp"); +const u32 gEventObjectPic_Wattson_1[] = INCBIN_U32("graphics/event_objects/pics/people/wattson/1.4bpp"); +const u32 gEventObjectPic_Wattson_2[] = INCBIN_U32("graphics/event_objects/pics/people/wattson/2.4bpp"); +const u32 gEventObjectPic_Flannery_0[] = INCBIN_U32("graphics/event_objects/pics/people/flannery/0.4bpp"); +const u32 gEventObjectPic_Flannery_1[] = INCBIN_U32("graphics/event_objects/pics/people/flannery/1.4bpp"); +const u32 gEventObjectPic_Flannery_2[] = INCBIN_U32("graphics/event_objects/pics/people/flannery/2.4bpp"); +const u32 gEventObjectPic_Norman_0[] = INCBIN_U32("graphics/event_objects/pics/people/norman/0.4bpp"); +const u32 gEventObjectPic_Norman_1[] = INCBIN_U32("graphics/event_objects/pics/people/norman/1.4bpp"); +const u32 gEventObjectPic_Norman_2[] = INCBIN_U32("graphics/event_objects/pics/people/norman/2.4bpp"); +const u32 gEventObjectPic_Norman_3[] = INCBIN_U32("graphics/event_objects/pics/people/norman/3.4bpp"); +const u32 gEventObjectPic_Norman_4[] = INCBIN_U32("graphics/event_objects/pics/people/norman/4.4bpp"); +const u32 gEventObjectPic_Norman_5[] = INCBIN_U32("graphics/event_objects/pics/people/norman/5.4bpp"); +const u32 gEventObjectPic_Norman_6[] = INCBIN_U32("graphics/event_objects/pics/people/norman/6.4bpp"); +const u32 gEventObjectPic_Norman_7[] = INCBIN_U32("graphics/event_objects/pics/people/norman/7.4bpp"); +const u32 gEventObjectPic_Norman_8[] = INCBIN_U32("graphics/event_objects/pics/people/norman/8.4bpp"); +const u32 gEventObjectPic_Winona_0[] = INCBIN_U32("graphics/event_objects/pics/people/winona/0.4bpp"); +const u32 gEventObjectPic_Winona_1[] = INCBIN_U32("graphics/event_objects/pics/people/winona/1.4bpp"); +const u32 gEventObjectPic_Winona_2[] = INCBIN_U32("graphics/event_objects/pics/people/winona/2.4bpp"); +const u32 gEventObjectPic_Liza_0[] = INCBIN_U32("graphics/event_objects/pics/people/liza/0.4bpp"); +const u32 gEventObjectPic_Liza_1[] = INCBIN_U32("graphics/event_objects/pics/people/liza/1.4bpp"); +const u32 gEventObjectPic_Liza_2[] = INCBIN_U32("graphics/event_objects/pics/people/liza/2.4bpp"); +const u32 gEventObjectPic_Tate_0[] = INCBIN_U32("graphics/event_objects/pics/people/tate/0.4bpp"); +const u32 gEventObjectPic_Tate_1[] = INCBIN_U32("graphics/event_objects/pics/people/tate/1.4bpp"); +const u32 gEventObjectPic_Tate_2[] = INCBIN_U32("graphics/event_objects/pics/people/tate/2.4bpp"); +const u32 gEventObjectPic_Wallace_0[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/0.4bpp"); +const u32 gEventObjectPic_Wallace_1[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/1.4bpp"); +const u32 gEventObjectPic_Wallace_2[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/2.4bpp"); +const u32 gEventObjectPic_Wallace_3[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/3.4bpp"); +const u32 gEventObjectPic_Wallace_4[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/4.4bpp"); +const u32 gEventObjectPic_Wallace_5[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/5.4bpp"); +const u32 gEventObjectPic_Wallace_6[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/6.4bpp"); +const u32 gEventObjectPic_Wallace_7[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/7.4bpp"); +const u32 gEventObjectPic_Wallace_8[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/8.4bpp"); +const u32 gEventObjectPic_Steven_0[] = INCBIN_U32("graphics/event_objects/pics/people/steven/0.4bpp"); +const u32 gEventObjectPic_Steven_1[] = INCBIN_U32("graphics/event_objects/pics/people/steven/1.4bpp"); +const u32 gEventObjectPic_Steven_2[] = INCBIN_U32("graphics/event_objects/pics/people/steven/2.4bpp"); +const u32 gEventObjectPic_Steven_3[] = INCBIN_U32("graphics/event_objects/pics/people/steven/3.4bpp"); +const u32 gEventObjectPic_Steven_4[] = INCBIN_U32("graphics/event_objects/pics/people/steven/4.4bpp"); +const u32 gEventObjectPic_Steven_5[] = INCBIN_U32("graphics/event_objects/pics/people/steven/5.4bpp"); +const u32 gEventObjectPic_Steven_6[] = INCBIN_U32("graphics/event_objects/pics/people/steven/6.4bpp"); +const u32 gEventObjectPic_Steven_7[] = INCBIN_U32("graphics/event_objects/pics/people/steven/7.4bpp"); +const u32 gEventObjectPic_Steven_8[] = INCBIN_U32("graphics/event_objects/pics/people/steven/8.4bpp"); +const u32 gEventObjectPic_Wally_0[] = INCBIN_U32("graphics/event_objects/pics/people/wally/0.4bpp"); +const u32 gEventObjectPic_Wally_1[] = INCBIN_U32("graphics/event_objects/pics/people/wally/1.4bpp"); +const u32 gEventObjectPic_Wally_2[] = INCBIN_U32("graphics/event_objects/pics/people/wally/2.4bpp"); +const u32 gEventObjectPic_Wally_3[] = INCBIN_U32("graphics/event_objects/pics/people/wally/3.4bpp"); +const u32 gEventObjectPic_Wally_4[] = INCBIN_U32("graphics/event_objects/pics/people/wally/4.4bpp"); +const u32 gEventObjectPic_Wally_5[] = INCBIN_U32("graphics/event_objects/pics/people/wally/5.4bpp"); +const u32 gEventObjectPic_Wally_6[] = INCBIN_U32("graphics/event_objects/pics/people/wally/6.4bpp"); +const u32 gEventObjectPic_Wally_7[] = INCBIN_U32("graphics/event_objects/pics/people/wally/7.4bpp"); +const u32 gEventObjectPic_Wally_8[] = INCBIN_U32("graphics/event_objects/pics/people/wally/8.4bpp"); +const u32 gEventObjectPic_RubySapphireLittleBoy_0[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_little_boy/0.4bpp"); +const u32 gEventObjectPic_RubySapphireLittleBoy_1[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_little_boy/1.4bpp"); +const u32 gEventObjectPic_RubySapphireLittleBoy_2[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_little_boy/2.4bpp"); +const u32 gEventObjectPic_RubySapphireLittleBoy_3[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_little_boy/3.4bpp"); +const u32 gEventObjectPic_RubySapphireLittleBoy_4[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_little_boy/4.4bpp"); +const u32 gEventObjectPic_RubySapphireLittleBoy_5[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_little_boy/5.4bpp"); +const u32 gEventObjectPic_RubySapphireLittleBoy_6[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_little_boy/6.4bpp"); +const u32 gEventObjectPic_RubySapphireLittleBoy_7[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_little_boy/7.4bpp"); +const u32 gEventObjectPic_RubySapphireLittleBoy_8[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_little_boy/8.4bpp"); +const u32 gEventObjectPic_HotSpringsOldWoman_0[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/0.4bpp"); +const u32 gEventObjectPic_HotSpringsOldWoman_1[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/1.4bpp"); +const u32 gEventObjectPic_HotSpringsOldWoman_2[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/2.4bpp"); +const u32 gEventObjectPic_HotSpringsOldWoman_3[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/3.4bpp"); +const u32 gEventObjectPic_HotSpringsOldWoman_4[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/4.4bpp"); +const u32 gEventObjectPic_HotSpringsOldWoman_5[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/5.4bpp"); +const u32 gEventObjectPic_HotSpringsOldWoman_6[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/6.4bpp"); +const u32 gEventObjectPic_HotSpringsOldWoman_7[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/7.4bpp"); +const u32 gEventObjectPic_HotSpringsOldWoman_8[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/8.4bpp"); +const u32 gEventObjectPic_LatiasLatios_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios/0.4bpp"); +const u32 gEventObjectPic_LatiasLatios_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios/1.4bpp"); +const u32 gEventObjectPic_LatiasLatios_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios/2.4bpp"); +const u32 gEventObjectPic_Boy5_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_5/0.4bpp"); +const u32 gEventObjectPic_Boy5_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_5/1.4bpp"); +const u32 gEventObjectPic_Boy5_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_5/2.4bpp"); +const u32 gEventObjectPic_ContestOldMan_0[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man/0.4bpp"); +const u32 gEventObjectPic_ContestOldMan_1[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man/1.4bpp"); +const u32 gEventObjectPic_ContestOldMan_2[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man/2.4bpp"); +const u32 gEventObjectPic_ContestOldMan_3[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man/3.4bpp"); +const u32 gEventObjectPic_ContestOldMan_4[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man/4.4bpp"); +const u32 gEventObjectPic_ContestOldMan_5[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man/5.4bpp"); +const u32 gEventObjectPic_ContestOldMan_6[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man/6.4bpp"); +const u32 gEventObjectPic_ContestOldMan_7[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man/7.4bpp"); +const u32 gEventObjectPic_ContestOldMan_8[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man/8.4bpp"); +const u32 gEventObjectPic_Archie_0[] = INCBIN_U32("graphics/event_objects/pics/people/archie/0.4bpp"); +const u32 gEventObjectPic_Archie_1[] = INCBIN_U32("graphics/event_objects/pics/people/archie/1.4bpp"); +const u32 gEventObjectPic_Archie_2[] = INCBIN_U32("graphics/event_objects/pics/people/archie/2.4bpp"); +const u32 gEventObjectPic_Archie_3[] = INCBIN_U32("graphics/event_objects/pics/people/archie/3.4bpp"); +const u32 gEventObjectPic_Archie_4[] = INCBIN_U32("graphics/event_objects/pics/people/archie/4.4bpp"); +const u32 gEventObjectPic_Archie_5[] = INCBIN_U32("graphics/event_objects/pics/people/archie/5.4bpp"); +const u32 gEventObjectPic_Archie_6[] = INCBIN_U32("graphics/event_objects/pics/people/archie/6.4bpp"); +const u32 gEventObjectPic_Archie_7[] = INCBIN_U32("graphics/event_objects/pics/people/archie/7.4bpp"); +const u32 gEventObjectPic_Archie_8[] = INCBIN_U32("graphics/event_objects/pics/people/archie/8.4bpp"); +const u32 gEventObjectPic_Maxie_0[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/0.4bpp"); +const u32 gEventObjectPic_Maxie_1[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/1.4bpp"); +const u32 gEventObjectPic_Maxie_2[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/2.4bpp"); +const u32 gEventObjectPic_Maxie_3[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/3.4bpp"); +const u32 gEventObjectPic_Maxie_4[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/4.4bpp"); +const u32 gEventObjectPic_Maxie_5[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/5.4bpp"); +const u32 gEventObjectPic_Maxie_6[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/6.4bpp"); +const u32 gEventObjectPic_Maxie_7[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/7.4bpp"); +const u32 gEventObjectPic_Maxie_8[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/8.4bpp"); +const u32 gEventObjectPic_KyogreFront_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre_front/0.4bpp"); +const u32 gEventObjectPic_KyogreFront_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre_front/1.4bpp"); +const u32 gEventObjectPic_KyogreSide_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre_side/0.4bpp"); +const u32 gEventObjectPic_KyogreSide_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre_side/1.4bpp"); +const u32 gEventObjectPic_GroudonFront_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon_front/0.4bpp"); +const u32 gEventObjectPic_GroudonFront_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon_front/1.4bpp"); +const u32 gEventObjectPic_GroudonSide_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon_side/0.4bpp"); +const u32 gEventObjectPic_GroudonSide_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon_side/1.4bpp"); +const u32 gEventObjectPic_Regi[] = INCBIN_U32("graphics/event_objects/pics/pokemon/regi.4bpp"); +const u32 gEventObjectPic_Skitty_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty/0.4bpp"); +const u32 gEventObjectPic_Skitty_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty/1.4bpp"); +const u32 gEventObjectPic_Skitty_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty/2.4bpp"); +const u32 gEventObjectPic_Kecleon_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon/0.4bpp"); +const u32 gEventObjectPic_Kecleon_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon/1.4bpp"); +const u32 gEventObjectPic_Kecleon_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon/2.4bpp"); +const u32 gEventObjectPic_Rayquaza_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza/0.4bpp"); +const u32 gEventObjectPic_Rayquaza_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza/1.4bpp"); +const u32 gEventObjectPic_Rayquaza_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza/2.4bpp"); +const u32 gEventObjectPic_Rayquaza_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza/3.4bpp"); +const u32 gEventObjectPic_Rayquaza_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza/4.4bpp"); +const u32 gEventObjectPic_RayquazaStill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza_still.4bpp"); +const u32 gEventObjectPic_Zigzagoon_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon/0.4bpp"); +const u32 gEventObjectPic_Zigzagoon_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon/1.4bpp"); +const u32 gEventObjectPic_Zigzagoon_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon/2.4bpp"); +const u32 gEventObjectPic_Pikachu_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu/0.4bpp"); +const u32 gEventObjectPic_Pikachu_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu/1.4bpp"); +const u32 gEventObjectPic_Pikachu_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu/2.4bpp"); +const u32 gEventObjectPic_Azumarill_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill/0.4bpp"); +const u32 gEventObjectPic_Azumarill_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill/1.4bpp"); +const u32 gEventObjectPic_Azumarill_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill/2.4bpp"); +const u32 gEventObjectPic_Wingull_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/0.4bpp"); +const u32 gEventObjectPic_Wingull_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/3.4bpp"); +const u32 gEventObjectPic_Wingull_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/1.4bpp"); +const u32 gEventObjectPic_Wingull_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/4.4bpp"); +const u32 gEventObjectPic_Wingull_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/2.4bpp"); +const u32 gEventObjectPic_Wingull_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/5.4bpp"); +const u32 gEventObjectPic_TuberMSwimming_0[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/0.4bpp"); +const u32 gEventObjectPic_TuberMSwimming_1[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/1.4bpp"); +const u32 gEventObjectPic_TuberMSwimming_2[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/2.4bpp"); +const u32 gEventObjectPic_TuberMSwimming_3[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/3.4bpp"); +const u32 gEventObjectPic_TuberMSwimming_4[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/4.4bpp"); +const u32 gEventObjectPic_TuberMSwimming_5[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/5.4bpp"); +const u32 gEventObjectPic_TuberMSwimming_6[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/6.4bpp"); +const u32 gEventObjectPic_TuberMSwimming_7[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/7.4bpp"); +const u32 gEventObjectPic_TuberMSwimming_8[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/8.4bpp"); +const u32 gEventObjectPic_Azurill_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill/0.4bpp"); +const u32 gEventObjectPic_Azurill_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill/1.4bpp"); +const u32 gEventObjectPic_Azurill_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill/2.4bpp"); +const u32 gEventObjectPic_Mom_0[] = INCBIN_U32("graphics/event_objects/pics/people/mom/0.4bpp"); +const u32 gEventObjectPic_Mom_1[] = INCBIN_U32("graphics/event_objects/pics/people/mom/1.4bpp"); +const u32 gEventObjectPic_Mom_2[] = INCBIN_U32("graphics/event_objects/pics/people/mom/2.4bpp"); +const u32 gEventObjectPic_Mom_3[] = INCBIN_U32("graphics/event_objects/pics/people/mom/3.4bpp"); +const u32 gEventObjectPic_Mom_4[] = INCBIN_U32("graphics/event_objects/pics/people/mom/4.4bpp"); +const u32 gEventObjectPic_Mom_5[] = INCBIN_U32("graphics/event_objects/pics/people/mom/5.4bpp"); +const u32 gEventObjectPic_Mom_6[] = INCBIN_U32("graphics/event_objects/pics/people/mom/6.4bpp"); +const u32 gEventObjectPic_Mom_7[] = INCBIN_U32("graphics/event_objects/pics/people/mom/7.4bpp"); +const u32 gEventObjectPic_Mom_8[] = INCBIN_U32("graphics/event_objects/pics/people/mom/8.4bpp"); +const u16 gEventObjectPalette22[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_22.gbapal"); +const u16 gEventObjectPalette23[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_23.gbapal"); +const u16 gEventObjectPalette24[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_24.gbapal"); +const u16 gEventObjectPalette25[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_25.gbapal"); +const u32 gEventObjectPic_UnusedNatuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_natu_doll.4bpp"); +const u32 gEventObjectPic_UnusedMagnemiteDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_magnemite_doll.4bpp"); +const u32 gEventObjectPic_UnusedSquirtleDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_squirtle_doll.4bpp"); +const u32 gEventObjectPic_UnusedWooperDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_wooper_doll.4bpp"); +const u32 gEventObjectPic_UnusedPikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_pikachu_doll.4bpp"); +const u32 gEventObjectPic_UnusedPorygon2Doll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_porygon2_doll.4bpp"); +const u32 gEventObjectPic_PichuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pichu_doll.4bpp"); +const u32 gEventObjectPic_PikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pikachu_doll.4bpp"); +const u32 gEventObjectPic_MarillDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/marill_doll.4bpp"); +const u32 gEventObjectPic_TogepiDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/togepi_doll.4bpp"); +const u32 gEventObjectPic_CyndaquilDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/cyndaquil_doll.4bpp"); +const u32 gEventObjectPic_ChikoritaDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/chikorita_doll.4bpp"); +const u32 gEventObjectPic_TotodileDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/totodile_doll.4bpp"); +const u32 gEventObjectPic_JigglypuffDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/jigglypuff_doll.4bpp"); +const u32 gEventObjectPic_MeowthDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/meowth_doll.4bpp"); +const u32 gEventObjectPic_ClefairyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/clefairy_doll.4bpp"); +const u32 gEventObjectPic_DittoDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/ditto_doll.4bpp"); +const u32 gEventObjectPic_SmoochumDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/smoochum_doll.4bpp"); +const u32 gEventObjectPic_TreeckoDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/treecko_doll.4bpp"); +const u32 gEventObjectPic_TorchicDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/torchic_doll.4bpp"); +const u32 gEventObjectPic_MudkipDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/mudkip_doll.4bpp"); +const u32 gEventObjectPic_DuskullDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/duskull_doll.4bpp"); +const u32 gEventObjectPic_WynautDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/wynaut_doll.4bpp"); +const u32 gEventObjectPic_BaltoyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/baltoy_doll.4bpp"); +const u32 gEventObjectPic_KecleonDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/kecleon_doll.4bpp"); +const u32 gEventObjectPic_AzurillDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/azurill_doll.4bpp"); +const u32 gEventObjectPic_SkittyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/skitty_doll.4bpp"); +const u32 gEventObjectPic_SwabluDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/swablu_doll.4bpp"); +const u32 gEventObjectPic_GulpinDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/gulpin_doll.4bpp"); +const u32 gEventObjectPic_LotadDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/lotad_doll.4bpp"); +const u32 gEventObjectPic_SeedotDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/seedot_doll.4bpp"); +const u32 gEventObjectPic_PikaCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/pika_cushion.4bpp"); +const u32 gEventObjectPic_RoundCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/round_cushion.4bpp"); +const u32 gEventObjectPic_KissCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/kiss_cushion.4bpp"); +const u32 gEventObjectPic_ZigzagCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/zigzag_cushion.4bpp"); +const u32 gEventObjectPic_SpinCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/spin_cushion.4bpp"); +const u32 gEventObjectPic_DiamondCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/diamond_cushion.4bpp"); +const u32 gEventObjectPic_BallCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/ball_cushion.4bpp"); +const u32 gEventObjectPic_GrassCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/grass_cushion.4bpp"); +const u32 gEventObjectPic_FireCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/fire_cushion.4bpp"); +const u32 gEventObjectPic_WaterCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/water_cushion.4bpp"); +const u32 gEventObjectPic_BigSnorlaxDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_snorlax_doll.4bpp"); +const u32 gEventObjectPic_BigRhydonDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_rhydon_doll.4bpp"); +const u32 gEventObjectPic_BigLaprasDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_lapras_doll.4bpp"); +const u32 gEventObjectPic_BigVenusaurDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_venusaur_doll.4bpp"); +const u32 gEventObjectPic_BigCharizardDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_charizard_doll.4bpp"); +const u32 gEventObjectPic_BigBlastoiseDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_blastoise_doll.4bpp"); +const u32 gEventObjectPic_BigWailmerDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_wailmer_doll.4bpp"); +const u32 gEventObjectPic_BigRegirockDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regirock_doll.4bpp"); +const u32 gEventObjectPic_BigRegiceDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regice_doll.4bpp"); +const u32 gEventObjectPic_BigRegisteelDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_registeel_doll.4bpp"); +const u32 gEventObjectPic_CuttableTree_0[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/0.4bpp"); +const u32 gEventObjectPic_CuttableTree_1[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/1.4bpp"); +const u32 gEventObjectPic_CuttableTree_2[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/2.4bpp"); +const u32 gEventObjectPic_CuttableTree_3[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/3.4bpp"); +const u32 gEventObjectPic_BreakableRock_0[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/0.4bpp"); +const u32 gEventObjectPic_BreakableRock_1[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/1.4bpp"); +const u32 gEventObjectPic_BreakableRock_2[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/2.4bpp"); +const u32 gEventObjectPic_BreakableRock_3[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/3.4bpp"); +const u32 gEventObjectPic_PushableBoulder[] = INCBIN_U32("graphics/event_objects/pics/misc/pushable_boulder.4bpp"); +const u32 gEventObjectPic_MrBrineysBoat_0[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat/0.4bpp"); +const u32 gEventObjectPic_MrBrineysBoat_1[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat/1.4bpp"); +const u32 gEventObjectPic_MrBrineysBoat_2[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat/2.4bpp"); +const u32 gEventObjectPic_Fossil[] = INCBIN_U32("graphics/event_objects/pics/misc/fossil.4bpp"); +const u32 gEventObjectPic_SubmarineShadow[] = INCBIN_U32("graphics/event_objects/pics/misc/submarine_shadow.4bpp"); +const u16 gEventObjectPalette26[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_26.gbapal"); +const u32 gEventObjectPic_Truck[] = INCBIN_U32("graphics/event_objects/pics/misc/truck.4bpp"); +const u16 gEventObjectPalette14[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_14.gbapal"); +const u32 gEventObjectPic_VigorothCarryingBox_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth_carrying_box/0.4bpp"); +const u32 gEventObjectPic_VigorothCarryingBox_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth_carrying_box/1.4bpp"); +const u32 gEventObjectPic_VigorothCarryingBox_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth_carrying_box/2.4bpp"); +const u32 gEventObjectPic_VigorothFacingAway_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth_facing_away/0.4bpp"); +const u32 gEventObjectPic_VigorothFacingAway_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth_facing_away/1.4bpp"); +const u16 gEventObjectPalette15[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_15.gbapal"); +const u32 gEventObjectPic_BirchsBag[] = INCBIN_U32("graphics/event_objects/pics/misc/birchs_bag.4bpp"); +const u32 gEventObjectPic_EnemyZigzagoon_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/0.4bpp"); +const u32 gEventObjectPic_EnemyZigzagoon_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/1.4bpp"); +const u32 gEventObjectPic_EnemyZigzagoon_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/2.4bpp"); +const u32 gEventObjectPic_EnemyZigzagoon_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/3.4bpp"); +const u32 gEventObjectPic_EnemyZigzagoon_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/4.4bpp"); +const u32 gEventObjectPic_EnemyZigzagoon_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/5.4bpp"); +const u32 gEventObjectPic_EnemyZigzagoon_6[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/6.4bpp"); +const u32 gEventObjectPic_EnemyZigzagoon_7[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/7.4bpp"); +const u32 gEventObjectPic_EnemyZigzagoon_8[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/8.4bpp"); +const u16 gEventObjectPalette16[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_16.gbapal"); +const u32 gEventObjectPic_Poochyena_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/0.4bpp"); +const u32 gEventObjectPic_Poochyena_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/1.4bpp"); +const u32 gEventObjectPic_Poochyena_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/2.4bpp"); +const u32 gEventObjectPic_Poochyena_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/3.4bpp"); +const u32 gEventObjectPic_Poochyena_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/4.4bpp"); +const u32 gEventObjectPic_Poochyena_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/5.4bpp"); +const u32 gEventObjectPic_Poochyena_6[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/6.4bpp"); +const u32 gEventObjectPic_Poochyena_7[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/7.4bpp"); +const u32 gEventObjectPic_Poochyena_8[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/8.4bpp"); +const u16 gEventObjectPalette27[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_27.gbapal"); +const u32 gEventObjectPic_CableCar[] = INCBIN_U32("graphics/event_objects/pics/misc/cable_car.4bpp"); +const u16 gEventObjectPalette20[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_20.gbapal"); +const u32 gEventObjectPic_SSTidal[] = INCBIN_U32("graphics/event_objects/pics/misc/ss_tidal.4bpp"); +const u16 gEventObjectPalette21[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_21.gbapal"); +const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_0[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle/0.4bpp"); +const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_1[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle/1.4bpp"); +const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_2[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle/2.4bpp"); +const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_3[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle/3.4bpp"); +const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_4[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle/4.4bpp"); +const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_5[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle/5.4bpp"); +const u32 gEventObjectPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/dirt_pile.4bpp"); +const u32 gEventObjectPic_BerryTreeSprout_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout/0.4bpp"); +const u32 gEventObjectPic_BerryTreeSprout_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout/1.4bpp"); +const u32 gEventObjectPic_PechaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/0.4bpp"); +const u32 gEventObjectPic_PechaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/1.4bpp"); +const u32 gEventObjectPic_PechaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/2.4bpp"); +const u32 gEventObjectPic_PechaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/3.4bpp"); +const u32 gEventObjectPic_PechaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/4.4bpp"); +const u32 gEventObjectPic_PechaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/5.4bpp"); +const u32 gEventObjectPic_KelpsyBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/0.4bpp"); +const u32 gEventObjectPic_KelpsyBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/1.4bpp"); +const u32 gEventObjectPic_KelpsyBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/2.4bpp"); +const u32 gEventObjectPic_KelpsyBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/3.4bpp"); +const u32 gEventObjectPic_KelpsyBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/4.4bpp"); +const u32 gEventObjectPic_KelpsyBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/5.4bpp"); +const u32 gEventObjectPic_WepearBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/0.4bpp"); +const u32 gEventObjectPic_WepearBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/1.4bpp"); +const u32 gEventObjectPic_WepearBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/2.4bpp"); +const u32 gEventObjectPic_WepearBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/3.4bpp"); +const u32 gEventObjectPic_WepearBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/4.4bpp"); +const u32 gEventObjectPic_WepearBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/5.4bpp"); +const u32 gEventObjectPic_IapapaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/0.4bpp"); +const u32 gEventObjectPic_IapapaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/1.4bpp"); +const u32 gEventObjectPic_IapapaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/2.4bpp"); +const u32 gEventObjectPic_IapapaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/3.4bpp"); +const u32 gEventObjectPic_IapapaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/4.4bpp"); +const u32 gEventObjectPic_IapapaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/5.4bpp"); +const u32 gEventObjectPic_CheriBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/0.4bpp"); +const u32 gEventObjectPic_CheriBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/1.4bpp"); +const u32 gEventObjectPic_CheriBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/2.4bpp"); +const u32 gEventObjectPic_CheriBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/3.4bpp"); +const u32 gEventObjectPic_CheriBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/4.4bpp"); +const u32 gEventObjectPic_CheriBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/5.4bpp"); +const u32 gEventObjectPic_FigyBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/0.4bpp"); +const u32 gEventObjectPic_FigyBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/1.4bpp"); +const u32 gEventObjectPic_FigyBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/2.4bpp"); +const u32 gEventObjectPic_FigyBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/3.4bpp"); +const u32 gEventObjectPic_FigyBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/4.4bpp"); +const u32 gEventObjectPic_FigyBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/5.4bpp"); +const u32 gEventObjectPic_MagoBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/0.4bpp"); +const u32 gEventObjectPic_MagoBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/1.4bpp"); +const u32 gEventObjectPic_MagoBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/2.4bpp"); +const u32 gEventObjectPic_MagoBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/3.4bpp"); +const u32 gEventObjectPic_MagoBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/4.4bpp"); +const u32 gEventObjectPic_MagoBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/5.4bpp"); +const u32 gEventObjectPic_LumBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/0.4bpp"); +const u32 gEventObjectPic_LumBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/1.4bpp"); +const u32 gEventObjectPic_LumBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/2.4bpp"); +const u32 gEventObjectPic_LumBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/3.4bpp"); +const u32 gEventObjectPic_LumBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/4.4bpp"); +const u32 gEventObjectPic_LumBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/5.4bpp"); +const u32 gEventObjectPic_RazzBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/0.4bpp"); +const u32 gEventObjectPic_RazzBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/1.4bpp"); +const u32 gEventObjectPic_RazzBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/2.4bpp"); +const u32 gEventObjectPic_RazzBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/3.4bpp"); +const u32 gEventObjectPic_RazzBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/4.4bpp"); +const u32 gEventObjectPic_RazzBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/5.4bpp"); +const u32 gEventObjectPic_GrepaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/0.4bpp"); +const u32 gEventObjectPic_GrepaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/1.4bpp"); +const u32 gEventObjectPic_GrepaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/2.4bpp"); +const u32 gEventObjectPic_GrepaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/3.4bpp"); +const u32 gEventObjectPic_GrepaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/4.4bpp"); +const u32 gEventObjectPic_GrepaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/5.4bpp"); +const u32 gEventObjectPic_RabutaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/0.4bpp"); +const u32 gEventObjectPic_RabutaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/1.4bpp"); +const u32 gEventObjectPic_RabutaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/2.4bpp"); +const u32 gEventObjectPic_RabutaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/3.4bpp"); +const u32 gEventObjectPic_RabutaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/4.4bpp"); +const u32 gEventObjectPic_RabutaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/5.4bpp"); +const u32 gEventObjectPic_NomelBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/0.4bpp"); +const u32 gEventObjectPic_NomelBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/1.4bpp"); +const u32 gEventObjectPic_NomelBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/2.4bpp"); +const u32 gEventObjectPic_NomelBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/3.4bpp"); +const u32 gEventObjectPic_NomelBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/4.4bpp"); +const u32 gEventObjectPic_NomelBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/5.4bpp"); +const u32 gEventObjectPic_LeppaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/0.4bpp"); +const u32 gEventObjectPic_LeppaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/1.4bpp"); +const u32 gEventObjectPic_LeppaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/2.4bpp"); +const u32 gEventObjectPic_LeppaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/3.4bpp"); +const u32 gEventObjectPic_LeppaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/4.4bpp"); +const u32 gEventObjectPic_LeppaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/5.4bpp"); +const u32 gEventObjectPic_LiechiBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/0.4bpp"); +const u32 gEventObjectPic_LiechiBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/1.4bpp"); +const u32 gEventObjectPic_LiechiBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/2.4bpp"); +const u32 gEventObjectPic_LiechiBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/3.4bpp"); +const u32 gEventObjectPic_LiechiBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/4.4bpp"); +const u32 gEventObjectPic_LiechiBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/5.4bpp"); +const u32 gEventObjectPic_HondewBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/0.4bpp"); +const u32 gEventObjectPic_HondewBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/1.4bpp"); +const u32 gEventObjectPic_HondewBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/2.4bpp"); +const u32 gEventObjectPic_HondewBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/3.4bpp"); +const u32 gEventObjectPic_HondewBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/4.4bpp"); +const u32 gEventObjectPic_HondewBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/5.4bpp"); +const u32 gEventObjectPic_AguavBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/0.4bpp"); +const u32 gEventObjectPic_AguavBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/1.4bpp"); +const u32 gEventObjectPic_AguavBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/2.4bpp"); +const u32 gEventObjectPic_AguavBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/3.4bpp"); +const u32 gEventObjectPic_AguavBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/4.4bpp"); +const u32 gEventObjectPic_AguavBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/5.4bpp"); +const u32 gEventObjectPic_WikiBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/0.4bpp"); +const u32 gEventObjectPic_WikiBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/1.4bpp"); +const u32 gEventObjectPic_WikiBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/2.4bpp"); +const u32 gEventObjectPic_WikiBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/3.4bpp"); +const u32 gEventObjectPic_WikiBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/4.4bpp"); +const u32 gEventObjectPic_WikiBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/5.4bpp"); +const u32 gEventObjectPic_PomegBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/0.4bpp"); +const u32 gEventObjectPic_PomegBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/1.4bpp"); +const u32 gEventObjectPic_PomegBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/2.4bpp"); +const u32 gEventObjectPic_PomegBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/3.4bpp"); +const u32 gEventObjectPic_PomegBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/4.4bpp"); +const u32 gEventObjectPic_PomegBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/5.4bpp"); +const u32 gEventObjectPic_RawstBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/0.4bpp"); +const u32 gEventObjectPic_RawstBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/1.4bpp"); +const u32 gEventObjectPic_RawstBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/2.4bpp"); +const u32 gEventObjectPic_RawstBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/3.4bpp"); +const u32 gEventObjectPic_RawstBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/4.4bpp"); +const u32 gEventObjectPic_RawstBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/5.4bpp"); +const u32 gEventObjectPic_SpelonBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/0.4bpp"); +const u32 gEventObjectPic_SpelonBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/1.4bpp"); +const u32 gEventObjectPic_SpelonBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/2.4bpp"); +const u32 gEventObjectPic_SpelonBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/3.4bpp"); +const u32 gEventObjectPic_SpelonBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/4.4bpp"); +const u32 gEventObjectPic_SpelonBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/5.4bpp"); +const u32 gEventObjectPic_ChestoBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/0.4bpp"); +const u32 gEventObjectPic_ChestoBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/1.4bpp"); +const u32 gEventObjectPic_ChestoBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/2.4bpp"); +const u32 gEventObjectPic_ChestoBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/3.4bpp"); +const u32 gEventObjectPic_ChestoBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/4.4bpp"); +const u32 gEventObjectPic_ChestoBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/5.4bpp"); +const u32 gEventObjectPic_OranBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/0.4bpp"); +const u32 gEventObjectPic_OranBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/1.4bpp"); +const u32 gEventObjectPic_OranBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/2.4bpp"); +const u32 gEventObjectPic_OranBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/3.4bpp"); +const u32 gEventObjectPic_OranBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/4.4bpp"); +const u32 gEventObjectPic_OranBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/5.4bpp"); +const u32 gEventObjectPic_PersimBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/0.4bpp"); +const u32 gEventObjectPic_PersimBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/1.4bpp"); +const u32 gEventObjectPic_PersimBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/2.4bpp"); +const u32 gEventObjectPic_PersimBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/3.4bpp"); +const u32 gEventObjectPic_PersimBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/4.4bpp"); +const u32 gEventObjectPic_PersimBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/5.4bpp"); +const u32 gEventObjectPic_SitrusBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/0.4bpp"); +const u32 gEventObjectPic_SitrusBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/1.4bpp"); +const u32 gEventObjectPic_SitrusBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/2.4bpp"); +const u32 gEventObjectPic_SitrusBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/3.4bpp"); +const u32 gEventObjectPic_SitrusBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/4.4bpp"); +const u32 gEventObjectPic_SitrusBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/5.4bpp"); +const u32 gEventObjectPic_AspearBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/0.4bpp"); +const u32 gEventObjectPic_AspearBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/1.4bpp"); +const u32 gEventObjectPic_AspearBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/2.4bpp"); +const u32 gEventObjectPic_AspearBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/3.4bpp"); +const u32 gEventObjectPic_AspearBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/4.4bpp"); +const u32 gEventObjectPic_AspearBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/5.4bpp"); +const u32 gEventObjectPic_PamtreBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/0.4bpp"); +const u32 gEventObjectPic_PamtreBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/1.4bpp"); +const u32 gEventObjectPic_PamtreBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/2.4bpp"); +const u32 gEventObjectPic_PamtreBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/3.4bpp"); +const u32 gEventObjectPic_PamtreBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/4.4bpp"); +const u32 gEventObjectPic_PamtreBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/5.4bpp"); +const u32 gEventObjectPic_CornnBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/0.4bpp"); +const u32 gEventObjectPic_CornnBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/1.4bpp"); +const u32 gEventObjectPic_CornnBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/2.4bpp"); +const u32 gEventObjectPic_CornnBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/3.4bpp"); +const u32 gEventObjectPic_CornnBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/4.4bpp"); +const u32 gEventObjectPic_CornnBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/5.4bpp"); +const u32 gEventObjectPic_LansatBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/0.4bpp"); +const u32 gEventObjectPic_LansatBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/1.4bpp"); +const u32 gEventObjectPic_LansatBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/2.4bpp"); +const u32 gEventObjectPic_LansatBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/3.4bpp"); +const u32 gEventObjectPic_LansatBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/4.4bpp"); +const u32 gEventObjectPic_LansatBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/5.4bpp"); +const u32 gEventObjectPic_DurinBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/0.4bpp"); +const u32 gEventObjectPic_DurinBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/1.4bpp"); +const u32 gEventObjectPic_DurinBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/2.4bpp"); +const u32 gEventObjectPic_DurinBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/3.4bpp"); +const u32 gEventObjectPic_DurinBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/4.4bpp"); +const u32 gEventObjectPic_DurinBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/5.4bpp"); +const u32 gEventObjectPic_TamatoBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/0.4bpp"); +const u32 gEventObjectPic_TamatoBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/1.4bpp"); +const u32 gEventObjectPic_TamatoBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/2.4bpp"); +const u32 gEventObjectPic_TamatoBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/3.4bpp"); +const u32 gEventObjectPic_TamatoBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/4.4bpp"); +const u32 gEventObjectPic_TamatoBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/5.4bpp"); +const u32 gFieldEffectObjectPic_SurfBlob_0[] = INCBIN_U32("graphics/event_objects/pics/effects/surf_blob/0.4bpp"); +const u32 gFieldEffectObjectPic_SurfBlob_1[] = INCBIN_U32("graphics/event_objects/pics/effects/surf_blob/1.4bpp"); +const u32 gFieldEffectObjectPic_SurfBlob_2[] = INCBIN_U32("graphics/event_objects/pics/effects/surf_blob/2.4bpp"); +const u32 gEventObjectPic_QuintyPlump_0[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/0.4bpp"); +const u32 gEventObjectPic_QuintyPlump_1[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/1.4bpp"); +const u32 gEventObjectPic_QuintyPlump_2[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/2.4bpp"); +const u32 gEventObjectPic_QuintyPlump_3[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/3.4bpp"); +const u32 gEventObjectPic_QuintyPlump_4[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/4.4bpp"); +const u32 gEventObjectPic_QuintyPlump_5[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/5.4bpp"); +const u32 gEventObjectPic_QuintyPlump_6[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/6.4bpp"); +const u16 gEventObjectPalette12[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_12.gbapal"); +const u16 gEventObjectPalette13[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_13.gbapal"); +const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_small.4bpp"); +const u32 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_medium.4bpp"); +const u32 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_large.4bpp"); +const u32 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_extra_large.4bpp"); +const u32 gUnknown_084F6D38[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_4F6D38/0.4bpp"); +const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_06.gbapal"); +const u32 gFieldEffectObjectPic_Ripple_0[] = INCBIN_U32("graphics/event_objects/pics/effects/ripple/0.4bpp"); +const u32 gFieldEffectObjectPic_Ripple_1[] = INCBIN_U32("graphics/event_objects/pics/effects/ripple/1.4bpp"); +const u32 gFieldEffectObjectPic_Ripple_2[] = INCBIN_U32("graphics/event_objects/pics/effects/ripple/2.4bpp"); +const u32 gFieldEffectObjectPic_Ripple_3[] = INCBIN_U32("graphics/event_objects/pics/effects/ripple/3.4bpp"); +const u32 gFieldEffectObjectPic_Ripple_4[] = INCBIN_U32("graphics/event_objects/pics/effects/ripple/4.4bpp"); +const u32 gFieldEffectObjectPic_Ash_0[] = INCBIN_U32("graphics/event_objects/pics/effects/ash/0.4bpp"); +const u32 gFieldEffectObjectPic_Ash_1[] = INCBIN_U32("graphics/event_objects/pics/effects/ash/1.4bpp"); +const u32 gFieldEffectObjectPic_Ash_2[] = INCBIN_U32("graphics/event_objects/pics/effects/ash/2.4bpp"); +const u32 gFieldEffectObjectPic_Ash_3[] = INCBIN_U32("graphics/event_objects/pics/effects/ash/3.4bpp"); +const u32 gFieldEffectObjectPic_Ash_4[] = INCBIN_U32("graphics/event_objects/pics/effects/ash/4.4bpp"); +const u32 gFieldEffectObjectPic_Arrow_0[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/0.4bpp"); +const u32 gFieldEffectObjectPic_Arrow_1[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/1.4bpp"); +const u32 gFieldEffectObjectPic_Arrow_2[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/2.4bpp"); +const u32 gFieldEffectObjectPic_Arrow_3[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/3.4bpp"); +const u32 gFieldEffectObjectPic_Arrow_4[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/4.4bpp"); +const u32 gFieldEffectObjectPic_Arrow_5[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/5.4bpp"); +const u32 gFieldEffectObjectPic_Arrow_6[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/6.4bpp"); +const u32 gFieldEffectObjectPic_Arrow_7[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/7.4bpp"); +const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_00.gbapal"); +const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_01.gbapal"); +const u32 gFieldEffectObjectPic_GroundImpactDust_0[] = INCBIN_U32("graphics/event_objects/pics/effects/ground_impact_dust/0.4bpp"); +const u32 gFieldEffectObjectPic_GroundImpactDust_1[] = INCBIN_U32("graphics/event_objects/pics/effects/ground_impact_dust/1.4bpp"); +const u32 gFieldEffectObjectPic_GroundImpactDust_2[] = INCBIN_U32("graphics/event_objects/pics/effects/ground_impact_dust/2.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopTallGrass_0[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_tall_grass/0.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopTallGrass_1[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_tall_grass/1.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopTallGrass_2[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_tall_grass/2.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopTallGrass_3[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_tall_grass/3.4bpp"); +const u32 gUnusedGrass_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unused_grass/0.4bpp"); +const u32 gUnusedGrass_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unused_grass/1.4bpp"); +const u32 gUnusedGrass_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unused_grass/2.4bpp"); +const u32 gUnusedGrass_3[] = INCBIN_U32("graphics/event_objects/pics/effects/unused_grass/3.4bpp"); +const u32 gFieldEffectObjectPic_Unknown16_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_16/0.4bpp"); +const u32 gFieldEffectObjectPic_Unknown16_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_16/1.4bpp"); +const u32 gFieldEffectObjectPic_Unknown16_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_16/2.4bpp"); +const u32 gFieldEffectObjectPic_Unknown16_3[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_16/3.4bpp"); +const u32 gFieldEffectObjectPic_Unknown16_4[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_16/4.4bpp"); +const u32 gUnknown_084F7E38[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_4F7E38/0.4bpp"); +const u32 gFieldEffectObjectPic_Unknown16_5[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_16/5.4bpp"); +const u32 gFieldEffectObjectPic_Unknown17_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/0.4bpp"); +const u32 gFieldEffectObjectPic_Unknown17_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/1.4bpp"); +const u32 gFieldEffectObjectPic_Unknown17_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/2.4bpp"); +const u32 gFieldEffectObjectPic_Unknown17_3[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/3.4bpp"); +const u32 gFieldEffectObjectPic_Unknown17_4[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/4.4bpp"); +const u32 gFieldEffectObjectPic_Unknown17_5[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/5.4bpp"); +const u32 gFieldEffectObjectPic_Unknown17_6[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/6.4bpp"); +const u32 gFieldEffectObjectPic_Unknown17_7[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/7.4bpp"); +const u32 gFieldEffectObjectPic_Unknown18_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_18/0.4bpp"); +const u32 gFieldEffectObjectPic_Unknown18_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_18/1.4bpp"); +const u32 gFieldEffectObjectPic_Unknown18_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_18/2.4bpp"); +const u32 gFieldEffectObjectPic_Unknown18_3[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_18/3.4bpp"); +const u32 gFieldEffectObjectPic_LongGrass_0[] = INCBIN_U32("graphics/event_objects/pics/effects/long_grass/0.4bpp"); +const u32 gFieldEffectObjectPic_LongGrass_1[] = INCBIN_U32("graphics/event_objects/pics/effects/long_grass/1.4bpp"); +const u32 gFieldEffectObjectPic_LongGrass_2[] = INCBIN_U32("graphics/event_objects/pics/effects/long_grass/2.4bpp"); +const u32 gFieldEffectObjectPic_LongGrass_3[] = INCBIN_U32("graphics/event_objects/pics/effects/long_grass/3.4bpp"); +const u32 gFieldEffectObjectPic_TallGrass_0[] = INCBIN_U32("graphics/event_objects/pics/effects/tall_grass/0.4bpp"); +const u32 gFieldEffectObjectPic_TallGrass_1[] = INCBIN_U32("graphics/event_objects/pics/effects/tall_grass/1.4bpp"); +const u32 gFieldEffectObjectPic_TallGrass_2[] = INCBIN_U32("graphics/event_objects/pics/effects/tall_grass/2.4bpp"); +const u32 gFieldEffectObjectPic_TallGrass_3[] = INCBIN_U32("graphics/event_objects/pics/effects/tall_grass/3.4bpp"); +const u32 gFieldEffectObjectPic_TallGrass_4[] = INCBIN_U32("graphics/event_objects/pics/effects/tall_grass/4.4bpp"); +const u32 gFieldEffectObjectPic_ShortGrass_0[] = INCBIN_U32("graphics/event_objects/pics/effects/short_grass/0.4bpp"); +const u32 gFieldEffectObjectPic_ShortGrass_1[] = INCBIN_U32("graphics/event_objects/pics/effects/short_grass/1.4bpp"); +const u32 gFieldEffectObjectPic_SandFootprints_0[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_footprints/0.4bpp"); +const u32 gFieldEffectObjectPic_SandFootprints_1[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_footprints/1.4bpp"); +const u32 gFieldEffectObjectPic_DeepSandFootprints_0[] = INCBIN_U32("graphics/event_objects/pics/effects/deep_sand_footprints/0.4bpp"); +const u32 gFieldEffectObjectPic_DeepSandFootprints_1[] = INCBIN_U32("graphics/event_objects/pics/effects/deep_sand_footprints/1.4bpp"); +const u32 gFieldEffectObjectPic_BikeTireTracks_0[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_tire_tracks/0.4bpp"); +const u32 gFieldEffectObjectPic_BikeTireTracks_1[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_tire_tracks/1.4bpp"); +const u32 gFieldEffectObjectPic_BikeTireTracks_2[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_tire_tracks/2.4bpp"); +const u32 gFieldEffectObjectPic_BikeTireTracks_3[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_tire_tracks/3.4bpp"); +const u32 gFieldEffectObjectPic_Unknown19_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_19/0.4bpp"); +const u32 gFieldEffectObjectPic_Unknown19_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_19/1.4bpp"); +const u32 gFieldEffectObjectPic_Unknown19_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_19/2.4bpp"); +const u32 gFieldEffectObjectPic_Unknown19_3[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_19/3.4bpp"); +const u32 gFieldEffectObjectPic_Unknown29_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_29/0.4bpp"); +const u32 gFieldEffectObjectPic_Unknown29_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_29/1.4bpp"); +const u32 gFieldEffectObjectPic_Unknown29_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_29/2.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopBigSplash_0[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_big_splash/0.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopBigSplash_1[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_big_splash/1.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopBigSplash_2[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_big_splash/2.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopBigSplash_3[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_big_splash/3.4bpp"); +const u32 gFieldEffectObjectPic_Splash_0[] = INCBIN_U32("graphics/event_objects/pics/effects/splash/0.4bpp"); +const u32 gFieldEffectObjectPic_Splash_1[] = INCBIN_U32("graphics/event_objects/pics/effects/splash/1.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopSmallSplash_0[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_small_splash/0.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopSmallSplash_1[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_small_splash/1.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopSmallSplash_2[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_small_splash/2.4bpp"); +const u32 gFieldEffectObjectPic_Unknown20_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_20/0.4bpp"); +const u32 gFieldEffectObjectPic_Unknown20_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_20/1.4bpp"); +const u32 gFieldEffectObjectPic_Unknown20_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_20/2.4bpp"); +const u32 gFieldEffectObjectPic_Unknown20_3[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_20/3.4bpp"); +const u32 gFieldEffectObjectPic_Unknown20_4[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_20/4.4bpp"); +const u32 gFieldEffectObjectPic_TreeDisguise_0[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/0.4bpp"); +const u32 gFieldEffectObjectPic_TreeDisguise_1[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/1.4bpp"); +const u32 gFieldEffectObjectPic_TreeDisguise_2[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/2.4bpp"); +const u32 gFieldEffectObjectPic_TreeDisguise_3[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/3.4bpp"); +const u32 gFieldEffectObjectPic_TreeDisguise_4[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/4.4bpp"); +const u32 gFieldEffectObjectPic_TreeDisguise_5[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/5.4bpp"); +const u32 gFieldEffectObjectPic_TreeDisguise_6[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/6.4bpp"); +const u32 gFieldEffectObjectPic_MountainDisguise_0[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/0.4bpp"); +const u32 gFieldEffectObjectPic_MountainDisguise_1[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/1.4bpp"); +const u32 gFieldEffectObjectPic_MountainDisguise_2[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/2.4bpp"); +const u32 gFieldEffectObjectPic_MountainDisguise_3[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/3.4bpp"); +const u32 gFieldEffectObjectPic_MountainDisguise_4[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/4.4bpp"); +const u32 gFieldEffectObjectPic_MountainDisguise_5[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/5.4bpp"); +const u32 gFieldEffectObjectPic_MountainDisguise_6[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/6.4bpp"); +const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_0[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/0.4bpp"); +const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_1[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/1.4bpp"); +const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_2[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/2.4bpp"); +const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_3[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/3.4bpp"); +const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_4[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/4.4bpp"); +const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_5[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/5.4bpp"); +const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_6[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/6.4bpp"); +const u32 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U32("graphics/event_objects/pics/effects/hot_springs_water.4bpp"); +const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_02.gbapal"); +const u32 gFieldEffectObjectPic_JumpOutOfAsh_0[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash/0.4bpp"); +const u32 gFieldEffectObjectPic_JumpOutOfAsh_1[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash/1.4bpp"); +const u32 gFieldEffectObjectPic_JumpOutOfAsh_2[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash/2.4bpp"); +const u32 gFieldEffectObjectPic_JumpOutOfAsh_3[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash/3.4bpp"); +const u32 gFieldEffectObjectPic_JumpOutOfAsh_4[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash/4.4bpp"); +const u32 gFieldEffectObjectPic_Unknown33_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_33/0.4bpp"); +const u32 gFieldEffectObjectPic_Unknown33_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_33/1.4bpp"); +const u32 gFieldEffectObjectPic_Unknown33_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_33/2.4bpp"); +const u32 gFieldEffectObjectPic_Unknown33_3[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_33/3.4bpp"); +const u32 gFieldEffectObjectPic_Unknown33_4[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_33/4.4bpp"); +const u32 gFieldEffectObjectPic_Bubbles_0[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/0.4bpp"); +const u32 gFieldEffectObjectPic_Bubbles_1[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/1.4bpp"); +const u32 gFieldEffectObjectPic_Bubbles_2[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/2.4bpp"); +const u32 gFieldEffectObjectPic_Bubbles_3[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/3.4bpp"); +const u32 gFieldEffectObjectPic_Bubbles_4[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/4.4bpp"); +const u32 gFieldEffectObjectPic_Bubbles_5[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/5.4bpp"); +const u32 gFieldEffectObjectPic_Bubbles_6[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/6.4bpp"); +const u32 gFieldEffectObjectPic_Bubbles_7[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/7.4bpp"); +const u32 gFieldEffectObjectPic_Unknown35_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_35/0.4bpp"); +const u32 gFieldEffectObjectPic_Unknown35_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_35/1.4bpp"); +const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_03.gbapal"); +const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/event_objects/pics/effects/bird.4bpp"); +const u32 gEventObjectPic_Juan_0[] = INCBIN_U32("graphics/event_objects/pics/people/juan/0.4bpp"); +const u32 gEventObjectPic_Juan_1[] = INCBIN_U32("graphics/event_objects/pics/people/juan/1.4bpp"); +const u32 gEventObjectPic_Juan_2[] = INCBIN_U32("graphics/event_objects/pics/people/juan/2.4bpp"); +const u32 gEventObjectPic_Juan_3[] = INCBIN_U32("graphics/event_objects/pics/people/juan/3.4bpp"); +const u32 gEventObjectPic_Juan_4[] = INCBIN_U32("graphics/event_objects/pics/people/juan/4.4bpp"); +const u32 gEventObjectPic_Juan_5[] = INCBIN_U32("graphics/event_objects/pics/people/juan/5.4bpp"); +const u32 gEventObjectPic_Juan_6[] = INCBIN_U32("graphics/event_objects/pics/people/juan/6.4bpp"); +const u32 gEventObjectPic_Juan_7[] = INCBIN_U32("graphics/event_objects/pics/people/juan/7.4bpp"); +const u32 gEventObjectPic_Juan_8[] = INCBIN_U32("graphics/event_objects/pics/people/juan/8.4bpp"); +const u32 gEventObjectPic_Scott_0[] = INCBIN_U32("graphics/event_objects/pics/people/scott/0.4bpp"); +const u32 gEventObjectPic_Scott_1[] = INCBIN_U32("graphics/event_objects/pics/people/scott/1.4bpp"); +const u32 gEventObjectPic_Scott_2[] = INCBIN_U32("graphics/event_objects/pics/people/scott/2.4bpp"); +const u32 gEventObjectPic_Scott_3[] = INCBIN_U32("graphics/event_objects/pics/people/scott/3.4bpp"); +const u32 gEventObjectPic_Scott_4[] = INCBIN_U32("graphics/event_objects/pics/people/scott/4.4bpp"); +const u32 gEventObjectPic_Scott_5[] = INCBIN_U32("graphics/event_objects/pics/people/scott/5.4bpp"); +const u32 gEventObjectPic_Scott_6[] = INCBIN_U32("graphics/event_objects/pics/people/scott/6.4bpp"); +const u32 gEventObjectPic_Scott_7[] = INCBIN_U32("graphics/event_objects/pics/people/scott/7.4bpp"); +const u32 gEventObjectPic_Scott_8[] = INCBIN_U32("graphics/event_objects/pics/people/scott/8.4bpp"); +const u32 gEventObjectPic_Statue[] = INCBIN_U32("graphics/event_objects/pics/misc/statue.4bpp"); +const u32 gEventObjectPic_Kirlia_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/0.4bpp"); +const u32 gEventObjectPic_Kirlia_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/1.4bpp"); +const u32 gEventObjectPic_Kirlia_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/2.4bpp"); +const u32 gEventObjectPic_Kirlia_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/3.4bpp"); +const u32 gEventObjectPic_Kirlia_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/4.4bpp"); +const u32 gEventObjectPic_Kirlia_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/5.4bpp"); +const u32 gEventObjectPic_Kirlia_6[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/6.4bpp"); +const u32 gEventObjectPic_Kirlia_7[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/7.4bpp"); +const u32 gEventObjectPic_Kirlia_8[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/8.4bpp"); +const u32 gEventObjectPic_Dusclops_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/0.4bpp"); +const u32 gEventObjectPic_Dusclops_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/1.4bpp"); +const u32 gEventObjectPic_Dusclops_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/2.4bpp"); +const u32 gEventObjectPic_Dusclops_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/3.4bpp"); +const u32 gEventObjectPic_Dusclops_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/4.4bpp"); +const u32 gEventObjectPic_Dusclops_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/5.4bpp"); +const u32 gEventObjectPic_Dusclops_6[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/6.4bpp"); +const u32 gEventObjectPic_Dusclops_7[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/7.4bpp"); +const u32 gEventObjectPic_Dusclops_8[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/8.4bpp"); +const u32 gEventObjectPic_MysteryEventDeliveryman_0[] = INCBIN_U32("graphics/event_objects/pics/people/mystery_event_deliveryman/0.4bpp"); +const u32 gEventObjectPic_MysteryEventDeliveryman_1[] = INCBIN_U32("graphics/event_objects/pics/people/mystery_event_deliveryman/1.4bpp"); +const u32 gEventObjectPic_MysteryEventDeliveryman_2[] = INCBIN_U32("graphics/event_objects/pics/people/mystery_event_deliveryman/2.4bpp"); +const u32 gEventObjectPic_UnionRoomAttendant_0[] = INCBIN_U32("graphics/event_objects/pics/people/union_room_attendant/0.4bpp"); +const u32 gEventObjectPic_UnionRoomAttendant_1[] = INCBIN_U32("graphics/event_objects/pics/people/union_room_attendant/1.4bpp"); +const u32 gEventObjectPic_UnionRoomAttendant_2[] = INCBIN_U32("graphics/event_objects/pics/people/union_room_attendant/2.4bpp"); +const u32 gEventObjectPic_MovingBox[] = INCBIN_U32("graphics/event_objects/pics/misc/moving_box.4bpp"); +const u16 gEventObjectPalette19[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_19.gbapal"); +const u32 gEventObjectPic_Sudowoodo_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/sudowoodo/0.4bpp"); +const u32 gEventObjectPic_Sudowoodo_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/sudowoodo/1.4bpp"); +const u32 gEventObjectPic_Sudowoodo_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/sudowoodo/2.4bpp"); +const u32 gEventObjectPic_Mew_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/0.4bpp"); +const u32 gEventObjectPic_Mew_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/1.4bpp"); +const u32 gEventObjectPic_Mew_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/2.4bpp"); +const u32 gEventObjectPic_Mew_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/3.4bpp"); +const u32 gEventObjectPic_Mew_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/4.4bpp"); +const u32 gEventObjectPic_Mew_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/5.4bpp"); +const u32 gEventObjectPic_Mew_6[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/6.4bpp"); +const u32 gEventObjectPic_Mew_7[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/7.4bpp"); +const u32 gEventObjectPic_Mew_8[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/8.4bpp"); +const u16 gEventObjectPalette28[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_28.gbapal"); +const u32 gEventObjectPic_Red_0[] = INCBIN_U32("graphics/event_objects/pics/people/red/0.4bpp"); +const u32 gEventObjectPic_Red_1[] = INCBIN_U32("graphics/event_objects/pics/people/red/1.4bpp"); +const u32 gEventObjectPic_Red_2[] = INCBIN_U32("graphics/event_objects/pics/people/red/2.4bpp"); +const u32 gEventObjectPic_Red_3[] = INCBIN_U32("graphics/event_objects/pics/people/red/3.4bpp"); +const u32 gEventObjectPic_Red_4[] = INCBIN_U32("graphics/event_objects/pics/people/red/4.4bpp"); +const u32 gEventObjectPic_Red_5[] = INCBIN_U32("graphics/event_objects/pics/people/red/5.4bpp"); +const u32 gEventObjectPic_Red_6[] = INCBIN_U32("graphics/event_objects/pics/people/red/6.4bpp"); +const u32 gEventObjectPic_Red_7[] = INCBIN_U32("graphics/event_objects/pics/people/red/7.4bpp"); +const u32 gEventObjectPic_Red_8[] = INCBIN_U32("graphics/event_objects/pics/people/red/8.4bpp"); +const u32 gEventObjectPic_Leaf_0[] = INCBIN_U32("graphics/event_objects/pics/people/leaf/0.4bpp"); +const u32 gEventObjectPic_Leaf_1[] = INCBIN_U32("graphics/event_objects/pics/people/leaf/1.4bpp"); +const u32 gEventObjectPic_Leaf_2[] = INCBIN_U32("graphics/event_objects/pics/people/leaf/2.4bpp"); +const u32 gEventObjectPic_Leaf_3[] = INCBIN_U32("graphics/event_objects/pics/people/leaf/3.4bpp"); +const u32 gEventObjectPic_Leaf_4[] = INCBIN_U32("graphics/event_objects/pics/people/leaf/4.4bpp"); +const u32 gEventObjectPic_Leaf_5[] = INCBIN_U32("graphics/event_objects/pics/people/leaf/5.4bpp"); +const u32 gEventObjectPic_Leaf_6[] = INCBIN_U32("graphics/event_objects/pics/people/leaf/6.4bpp"); +const u32 gEventObjectPic_Leaf_7[] = INCBIN_U32("graphics/event_objects/pics/people/leaf/7.4bpp"); +const u32 gEventObjectPic_Leaf_8[] = INCBIN_U32("graphics/event_objects/pics/people/leaf/8.4bpp"); +const u16 gEventObjectPalette30[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_30.gbapal"); +const u32 gEventObjectPic_BirthIslandStone[] = INCBIN_U32("graphics/event_objects/pics/misc/birth_island_stone.4bpp"); +const u16 gEventObjectPalette29[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_29.gbapal"); +const u32 gEventObjectPic_Deoxys_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/deoxys/0.4bpp"); +const u32 gEventObjectPic_Deoxys_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/deoxys/1.4bpp"); +const u32 gEventObjectPic_Anabel_0[] = INCBIN_U32("graphics/event_objects/pics/people/anabel/0.4bpp"); +const u32 gEventObjectPic_Anabel_1[] = INCBIN_U32("graphics/event_objects/pics/people/anabel/1.4bpp"); +const u32 gEventObjectPic_Anabel_2[] = INCBIN_U32("graphics/event_objects/pics/people/anabel/2.4bpp"); +const u32 gEventObjectPic_Anabel_3[] = INCBIN_U32("graphics/event_objects/pics/people/anabel/3.4bpp"); +const u32 gEventObjectPic_Anabel_4[] = INCBIN_U32("graphics/event_objects/pics/people/anabel/4.4bpp"); +const u32 gEventObjectPic_Anabel_5[] = INCBIN_U32("graphics/event_objects/pics/people/anabel/5.4bpp"); +const u32 gEventObjectPic_Anabel_6[] = INCBIN_U32("graphics/event_objects/pics/people/anabel/6.4bpp"); +const u32 gEventObjectPic_Anabel_7[] = INCBIN_U32("graphics/event_objects/pics/people/anabel/7.4bpp"); +const u32 gEventObjectPic_Anabel_8[] = INCBIN_U32("graphics/event_objects/pics/people/anabel/8.4bpp"); +const u32 gEventObjectPic_Tucker_0[] = INCBIN_U32("graphics/event_objects/pics/people/tucker/0.4bpp"); +const u32 gEventObjectPic_Tucker_1[] = INCBIN_U32("graphics/event_objects/pics/people/tucker/1.4bpp"); +const u32 gEventObjectPic_Tucker_2[] = INCBIN_U32("graphics/event_objects/pics/people/tucker/2.4bpp"); +const u32 gEventObjectPic_Tucker_3[] = INCBIN_U32("graphics/event_objects/pics/people/tucker/3.4bpp"); +const u32 gEventObjectPic_Tucker_4[] = INCBIN_U32("graphics/event_objects/pics/people/tucker/4.4bpp"); +const u32 gEventObjectPic_Tucker_5[] = INCBIN_U32("graphics/event_objects/pics/people/tucker/5.4bpp"); +const u32 gEventObjectPic_Tucker_6[] = INCBIN_U32("graphics/event_objects/pics/people/tucker/6.4bpp"); +const u32 gEventObjectPic_Tucker_7[] = INCBIN_U32("graphics/event_objects/pics/people/tucker/7.4bpp"); +const u32 gEventObjectPic_Tucker_8[] = INCBIN_U32("graphics/event_objects/pics/people/tucker/8.4bpp"); +const u32 gEventObjectPic_Spenser_0[] = INCBIN_U32("graphics/event_objects/pics/people/spenser/0.4bpp"); +const u32 gEventObjectPic_Spenser_1[] = INCBIN_U32("graphics/event_objects/pics/people/spenser/1.4bpp"); +const u32 gEventObjectPic_Spenser_2[] = INCBIN_U32("graphics/event_objects/pics/people/spenser/2.4bpp"); +const u32 gEventObjectPic_Spenser_3[] = INCBIN_U32("graphics/event_objects/pics/people/spenser/3.4bpp"); +const u32 gEventObjectPic_Spenser_4[] = INCBIN_U32("graphics/event_objects/pics/people/spenser/4.4bpp"); +const u32 gEventObjectPic_Spenser_5[] = INCBIN_U32("graphics/event_objects/pics/people/spenser/5.4bpp"); +const u32 gEventObjectPic_Spenser_6[] = INCBIN_U32("graphics/event_objects/pics/people/spenser/6.4bpp"); +const u32 gEventObjectPic_Spenser_7[] = INCBIN_U32("graphics/event_objects/pics/people/spenser/7.4bpp"); +const u32 gEventObjectPic_Spenser_8[] = INCBIN_U32("graphics/event_objects/pics/people/spenser/8.4bpp"); +const u32 gEventObjectPic_Greta_0[] = INCBIN_U32("graphics/event_objects/pics/people/greta/0.4bpp"); +const u32 gEventObjectPic_Greta_1[] = INCBIN_U32("graphics/event_objects/pics/people/greta/1.4bpp"); +const u32 gEventObjectPic_Greta_2[] = INCBIN_U32("graphics/event_objects/pics/people/greta/2.4bpp"); +const u32 gEventObjectPic_Greta_3[] = INCBIN_U32("graphics/event_objects/pics/people/greta/3.4bpp"); +const u32 gEventObjectPic_Greta_4[] = INCBIN_U32("graphics/event_objects/pics/people/greta/4.4bpp"); +const u32 gEventObjectPic_Greta_5[] = INCBIN_U32("graphics/event_objects/pics/people/greta/5.4bpp"); +const u32 gEventObjectPic_Greta_6[] = INCBIN_U32("graphics/event_objects/pics/people/greta/6.4bpp"); +const u32 gEventObjectPic_Greta_7[] = INCBIN_U32("graphics/event_objects/pics/people/greta/7.4bpp"); +const u32 gEventObjectPic_Greta_8[] = INCBIN_U32("graphics/event_objects/pics/people/greta/8.4bpp"); +const u32 gEventObjectPic_Noland_0[] = INCBIN_U32("graphics/event_objects/pics/people/noland/0.4bpp"); +const u32 gEventObjectPic_Noland_1[] = INCBIN_U32("graphics/event_objects/pics/people/noland/1.4bpp"); +const u32 gEventObjectPic_Noland_2[] = INCBIN_U32("graphics/event_objects/pics/people/noland/2.4bpp"); +const u32 gEventObjectPic_Noland_3[] = INCBIN_U32("graphics/event_objects/pics/people/noland/3.4bpp"); +const u32 gEventObjectPic_Noland_4[] = INCBIN_U32("graphics/event_objects/pics/people/noland/4.4bpp"); +const u32 gEventObjectPic_Noland_5[] = INCBIN_U32("graphics/event_objects/pics/people/noland/5.4bpp"); +const u32 gEventObjectPic_Noland_6[] = INCBIN_U32("graphics/event_objects/pics/people/noland/6.4bpp"); +const u32 gEventObjectPic_Noland_7[] = INCBIN_U32("graphics/event_objects/pics/people/noland/7.4bpp"); +const u32 gEventObjectPic_Noland_8[] = INCBIN_U32("graphics/event_objects/pics/people/noland/8.4bpp"); +const u32 gEventObjectPic_Lucy_0[] = INCBIN_U32("graphics/event_objects/pics/people/lucy/0.4bpp"); +const u32 gEventObjectPic_Lucy_1[] = INCBIN_U32("graphics/event_objects/pics/people/lucy/1.4bpp"); +const u32 gEventObjectPic_Lucy_2[] = INCBIN_U32("graphics/event_objects/pics/people/lucy/2.4bpp"); +const u32 gEventObjectPic_Lucy_3[] = INCBIN_U32("graphics/event_objects/pics/people/lucy/3.4bpp"); +const u32 gEventObjectPic_Lucy_4[] = INCBIN_U32("graphics/event_objects/pics/people/lucy/4.4bpp"); +const u32 gEventObjectPic_Lucy_5[] = INCBIN_U32("graphics/event_objects/pics/people/lucy/5.4bpp"); +const u32 gEventObjectPic_Lucy_6[] = INCBIN_U32("graphics/event_objects/pics/people/lucy/6.4bpp"); +const u32 gEventObjectPic_Lucy_7[] = INCBIN_U32("graphics/event_objects/pics/people/lucy/7.4bpp"); +const u32 gEventObjectPic_Lucy_8[] = INCBIN_U32("graphics/event_objects/pics/people/lucy/8.4bpp"); +const u32 gEventObjectPic_Brandon_0[] = INCBIN_U32("graphics/event_objects/pics/people/brandon/0.4bpp"); +const u32 gEventObjectPic_Brandon_1[] = INCBIN_U32("graphics/event_objects/pics/people/brandon/1.4bpp"); +const u32 gEventObjectPic_Brandon_2[] = INCBIN_U32("graphics/event_objects/pics/people/brandon/2.4bpp"); +const u32 gEventObjectPic_Brandon_3[] = INCBIN_U32("graphics/event_objects/pics/people/brandon/3.4bpp"); +const u32 gEventObjectPic_Brandon_4[] = INCBIN_U32("graphics/event_objects/pics/people/brandon/4.4bpp"); +const u32 gEventObjectPic_Brandon_5[] = INCBIN_U32("graphics/event_objects/pics/people/brandon/5.4bpp"); +const u32 gEventObjectPic_Brandon_6[] = INCBIN_U32("graphics/event_objects/pics/people/brandon/6.4bpp"); +const u32 gEventObjectPic_Brandon_7[] = INCBIN_U32("graphics/event_objects/pics/people/brandon/7.4bpp"); +const u32 gEventObjectPic_Brandon_8[] = INCBIN_U32("graphics/event_objects/pics/people/brandon/8.4bpp"); +const u32 gEventObjectPic_Lugia_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/lugia/0.4bpp"); +const u32 gEventObjectPic_Lugia_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/lugia/1.4bpp"); +const u16 gEventObjectPalette32[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_32.gbapal"); +const u32 gEventObjectPic_HoOh_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/ho_oh/0.4bpp"); +const u32 gEventObjectPic_HoOh_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/ho_oh/1.4bpp"); +const u16 gEventObjectPalette31[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_31.gbapal"); #endif //GUARD_EVENT_OBJECT_GFX_H diff --git a/src/data/field_event_obj/event_object_graphics_info.h b/src/data/field_event_obj/event_object_graphics_info.h index 7741094728..14ef4983d2 100755 --- a/src/data/field_event_obj/event_object_graphics_info.h +++ b/src/data/field_event_obj/event_object_graphics_info.h @@ -1,250 +1,250 @@ #ifndef GUARD_EVENT_OBJECT_GRAPHICS_INFO_H #define GUARD_EVENT_OBJECT_GRAPHICS_INFO_H -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanNormal = {0xFFFF, 0x1100, 0x1102, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_BrendanMayNormal, gFieldObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanMachBike = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanAcroBike = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_AcroBike, gFieldObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanSurfing = {0xFFFF, 0x1100, 0x11FF, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Surfing, gFieldObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanFieldMove = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_FieldMove, gFieldObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_QuintyPlump = {0xFFFF, 0x110B, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_L, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_QuintyPlump, gFieldObjectPicTable_QuintyPlump, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LittleBoy1 = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_LittleBoy1, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LittleGirl1 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_LittleGirl1, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy1 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Boy1, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Girl1 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Girl1, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy2 = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Boy2, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Girl2 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Girl2, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LittleBoy2 = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_LittleBoy2, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LittleGirl2 = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_LittleGirl2, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy3 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Boy3, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Girl3 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Girl3, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy4 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Boy4, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman1 = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Woman1, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_FatMan = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_FatMan, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman2 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Woman2, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man1 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Man1, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman3 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Woman3, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_OldMan1 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_OldMan1, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_OldWoman1 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_OldWoman1, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man2 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Man2, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman4 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Woman4, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man3 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Man3, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman5 = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Woman5, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Cook = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Cook, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman6 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Woman6, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_OldMan2 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_OldMan2, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_OldWoman2 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_OldWoman2, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Camper = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Camper, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Picnicker = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Picnicker, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man4 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Man4, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman7 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Woman7, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Youngster = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Youngster, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BugCatcher = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_BugCatcher, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PsychicM = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_PsychicM, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SchoolKidM = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_SchoolKidM, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Maniac = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Maniac, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_HexManiac = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_HexManiac, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Rayquaza1 = {0xFFFF, 0x1105, 0x11FF, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldObjectBaseOam_64x64, gFieldObjectSpriteOamTables_64x64, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_RayquazaStill, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SwimmerM = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_SwimmerM, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SwimmerF = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_SwimmerF, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BlackBelt = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_BlackBelt, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Beauty = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Beauty, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Scientist1 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Scientist1, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Lass = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Lass, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Gentleman = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Gentleman, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Sailor = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Sailor, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Fisherman = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Fisherman, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RunningTriathleteM = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_RunningTriathleteM, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RunningTriathleteF = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_RunningTriathleteF, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TuberF = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_TuberF, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TuberM = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_TuberM, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Hiker = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Hiker, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CyclingTriathleteM = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_AcroBike, gFieldObjectPicTable_CyclingTriathleteM, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CyclingTriathleteF = {0xFFFF, 0x1103, 0x11FF, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_AcroBike, gFieldObjectPicTable_CyclingTriathleteF, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Nurse = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Nurse, gFieldObjectPicTable_Nurse, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ItemBall = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_ItemBall, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BerryTree = {0xFFFF, 0x1103, 0x11FF, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, NULL, gFieldObjectImageAnimTable_BerryTree, gFieldObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BerryTreeEarlyStages = {0xFFFF, 0x1103, 0x11FF, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_BerryTree, gFieldObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BerryTreeLateStages = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_BerryTree, gFieldObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ProfBirch = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_ProfBirch, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man5 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Man5, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man6 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Man6, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ReporterM = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_ReporterM, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ReporterF = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_ReporterF, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Bard = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Hipster = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Trader = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Storyteller = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Giddy = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedMauvilleOldMan1 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedMauvilleOldMan2 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedNatuDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_UnusedNatuDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedMagnemiteDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_UnusedMagnemiteDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedSquirtleDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_UnusedSquirtleDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedWooperDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_UnusedWooperDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedPikachuDoll = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_UnusedPikachuDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedPorygon2Doll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_UnusedPorygon2Doll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CuttableTree = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_CuttableTree, gFieldObjectPicTable_CuttableTree, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MartEmployee = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MartEmployee, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RooftopSaleWoman = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_RooftopSaleWoman, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Teala = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Teala, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BreakableRock = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_BreakableRock, gFieldObjectPicTable_BreakableRock, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PushableBoulder = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_PushableBoulder, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MrBrineysBoat = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MrBrineysBoat, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayNormal = {0xFFFF, 0x1110, 0x1102, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_BrendanMayNormal, gFieldObjectPicTable_MayNormal, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayMachBike = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MayMachBike, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayAcroBike = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_AcroBike, gFieldObjectPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MaySurfing = {0xFFFF, 0x1110, 0x11FF, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Surfing, gFieldObjectPicTable_MaySurfing, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayFieldMove = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_FieldMove, gFieldObjectPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Truck = {0xFFFF, 0x110D, 0x11FF, 1152, 48, 48, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_Truck, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_Truck, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_VigorothCarryingBox = {0xFFFF, 0x110E, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_VigorothCarryingBox, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_VigorothFacingAway = {0xFFFF, 0x110E, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_VigorothFacingAway, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BirchsBag = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BirchsBag, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_EnemyZigzagoon = {0xFFFF, 0x110F, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_EnemyZigzagoon, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Poochyena = {0xFFFF, 0x111C, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Poochyena, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Artist = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Artist, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanNormal = {0xFFFF, 0x1100, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_BrendanMayNormal, gFieldObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanMachBike = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanAcroBike = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_AcroBike, gFieldObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanSurfing = {0xFFFF, 0x1100, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Surfing, gFieldObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanFieldMove = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_FieldMove, gFieldObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMayNormal = {0xFFFF, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_BrendanMayNormal, gFieldObjectPicTable_MayNormal, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMayMachBike = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MayMachBike, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMayAcroBike = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_AcroBike, gFieldObjectPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMaySurfing = {0xFFFF, 0x1110, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Surfing, gFieldObjectPicTable_MaySurfing, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMayFieldMove = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_FieldMove, gFieldObjectPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Cameraman = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Cameraman, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanUnderwater = {0xFFFF, 0x1115, 0x11FF, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_BrendanUnderwater, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayUnderwater = {0xFFFF, 0x1115, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MayUnderwater, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MovingBox = {0xFFFF, 0x1112, 0x11FF, 128, 16, 16, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_MovingBox, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CableCar = {0xFFFF, 0x1113, 0x11FF, 2048, 64, 64, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_64x64, gFieldObjectSpriteOamTables_64x64, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_CableCar, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Scientist2 = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Scientist2, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man7 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Man7, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_AquaMemberM = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_AquaMemberM, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_AquaMemberF = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_AquaMemberF, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MagmaMemberM = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MagmaMemberM, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MagmaMemberF = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MagmaMemberF, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Sidney = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Sidney, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Phoebe = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Phoebe, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Glacia = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Glacia, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Drake = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Drake, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Roxanne = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Roxanne, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Brawly = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Brawly, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Wattson = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Wattson, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Flannery = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Flannery, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Norman = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Norman, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Winona = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Winona, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Liza = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Liza, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Tate = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Tate, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Wallace = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Wallace, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Steven = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Steven, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Wally = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Wally, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RubySapphireLittleBoy = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_RubySapphireLittleBoy, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanFishing = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Fishing, gFieldObjectPicTable_BrendanFishing, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayFishing = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Fishing, gFieldObjectPicTable_MayFishing, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_HotSpringsOldWoman = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_HotSpringsOldWoman, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SSTidal = {0xFFFF, 0x1114, 0x11FF, 1920, 96, 40, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_8x8, gFieldObjectSpriteOamTables_SSTidal, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_SSTidal, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SubmarineShadow = {0xFFFF, 0x111B, 0x11FF, 1408, 88, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_8x8, gFieldObjectSpriteOamTables_SubmarineShadow, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_SubmarineShadow, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PichuDoll = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_PichuDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PikachuDoll = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_PikachuDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MarillDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_MarillDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TogepiDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_TogepiDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CyndaquilDoll = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_CyndaquilDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ChikoritaDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_ChikoritaDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TotodileDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_TotodileDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_JigglypuffDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_JigglypuffDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MeowthDoll = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_MeowthDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ClefairyDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_ClefairyDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_DittoDoll = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_DittoDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SmoochumDoll = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_SmoochumDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TreeckoDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_TreeckoDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TorchicDoll = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_TorchicDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MudkipDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_MudkipDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_DuskullDoll = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_DuskullDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_WynautDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_WynautDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BaltoyDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BaltoyDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_KecleonDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_KecleonDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_AzurillDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_AzurillDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SkittyDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_SkittyDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SwabluDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_SwabluDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_GulpinDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_GulpinDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LotadDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_LotadDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SeedotDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_SeedotDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PikaCushion = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_PikaCushion, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RoundCushion = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_RoundCushion, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_KissCushion = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_KissCushion, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ZigzagCushion = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_ZigzagCushion, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SpinCushion = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_SpinCushion, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_DiamondCushion = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_DiamondCushion, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BallCushion = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BallCushion, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_GrassCushion = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_GrassCushion, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_FireCushion = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_FireCushion, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_WaterCushion = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_WaterCushion, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigSnorlaxDoll = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigSnorlaxDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigRhydonDoll = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigRhydonDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigLaprasDoll = {0xFFFF, 0x1103, 0x11FF, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigLaprasDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigVenusaurDoll = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigVenusaurDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigCharizardDoll = {0xFFFF, 0x1104, 0x11FF, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigCharizardDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigBlastoiseDoll = {0xFFFF, 0x1103, 0x11FF, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigBlastoiseDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigWailmerDoll = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigWailmerDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigRegirockDoll = {0xFFFF, 0x1103, 0x11FF, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigRegirockDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigRegiceDoll = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigRegiceDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigRegisteelDoll = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigRegisteelDoll, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Latias = {0xFFFF, 0x1104, 0x11FF, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Latios = {0xFFFF, 0x1103, 0x11FF, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy5 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Boy5, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ContestOldMan = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_ContestOldMan, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanWatering = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_BrendanWatering, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayWatering = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MayWatering, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanDecorating = {0xFFFF, 0x1100, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BrendanDecorating, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayDecorating = {0xFFFF, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_MayDecorating, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Archie = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Archie, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Maxie = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Maxie, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kyogre1 = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_KyogreFront, gFieldObjectRotScalAnimTable_KyogreGroudon}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Groudon1 = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_GroudonFront, gFieldObjectRotScalAnimTable_KyogreGroudon}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kyogre3 = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_KyogreSide, gFieldObjectRotScalAnimTable_KyogreGroudon}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Groudon3 = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Groudon3, gFieldObjectPicTable_GroudonSide, gFieldObjectRotScalAnimTable_KyogreGroudon}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Fossil = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_Fossil, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Regirock = {0xFFFF, 0x1104, 0x11FF, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Regi, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Regice = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Regi, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Registeel = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Regi, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Skitty = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Skitty, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kecleon1 = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Kecleon, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kyogre2 = {0xFFFF, 0x1116, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_KyogreFront, gFieldObjectRotScalAnimTable_KyogreGroudon}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Groudon2 = {0xFFFF, 0x1118, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_GroudonFront, gFieldObjectRotScalAnimTable_KyogreGroudon}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Rayquaza2 = {0xFFFF, 0x1105, 0x11FF, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldObjectBaseOam_64x64, gFieldObjectSpriteOamTables_64x64, gFieldObjectImageAnimTable_Rayquaza2, gFieldObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Zigzagoon = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Zigzagoon, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Pikachu = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Pikachu, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Azumarill = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Azumarill, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Wingull = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Wingull, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kecleon2 = {0xFFFF, 0x1105, 0x1102, 128, 16, 16, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Kecleon, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TuberMSwimming = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_TuberMSwimming, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Azurill = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Azurill, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Mom = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Mom, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LinkBrendan = {0xFFFF, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_BrendanMayNormal, gFieldObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LinkMay = {0xFFFF, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_BrendanMayNormal, gFieldObjectPicTable_MayNormal, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Juan = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Juan, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Scott = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Scott, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MysteryEventDeliveryman = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MysteryEventDeliveryman, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Statue = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_Statue, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kirlia = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_S, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Kirlia, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Dusclops = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Dusclops, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnionRoomAttendant = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_UnionRoomAttendant, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Red = {0xFFFF, 0x111D, 0x11FF, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Red, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Leaf = {0xFFFF, 0x111D, 0x11FF, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Leaf, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Sudowoodo = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Sudowoodo, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Mew = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Mew, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Deoxys = {0xFFFF, 0x111E, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Deoxys, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BirthIslandStone = {0xFFFF, 0x111F, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BirthIslandStone, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Anabel = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Anabel, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Tucker = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Tucker, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Greta = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Greta, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Spenser = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Spenser, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Noland = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Noland, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Lucy = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Lucy, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Brandon = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Brandon, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RubySapphireBrendan = {0xFFFF, 0x1122, 0x11FF, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_RubySapphireBrendan, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RubySapphireMay = {0xFFFF, 0x1123, 0x11FF, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_RubySapphireMay, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Lugia = {0xFFFF, 0x1121, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Lugia, gDummySpriteAffineAnimTable}; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_HoOh = {0xFFFF, 0x1120, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_HoOh, gFieldObjectPicTable_HoOh, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanNormal = {0xFFFF, 0x1100, 0x1102, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanMachBike = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanAcroBike = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanSurfing = {0xFFFF, 0x1100, 0x11FF, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFieldMove = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_QuintyPlump = {0xFFFF, 0x110B, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_L, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_QuintyPlump, gEventObjectPicTable_QuintyPlump, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy1 = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleBoy1, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl1 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleGirl1, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy1 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy1, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl1 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl1, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy2 = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy2, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl2 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl2, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy2 = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleBoy2, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl2 = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleGirl2, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy3, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl3, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy4 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy4, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1 = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman1, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_FatMan, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman2, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man1 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man1, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman3 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman3, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan1 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldMan1, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman1 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldWoman1, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man2 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man2, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman4 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman4, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man3 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man3, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman5 = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman5, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cook = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Cook, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman6 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman6, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan2 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldMan2, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman2 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldWoman2, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Camper = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Camper, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Picnicker = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Picnicker, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man4 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man4, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman7 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman7, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Youngster = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Youngster, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BugCatcher = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BugCatcher, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PsychicM = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_PsychicM, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SchoolKidM = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SchoolKidM, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maniac = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Maniac, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HexManiac = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_HexManiac, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza1 = {0xFFFF, 0x1105, 0x11FF, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_64x64, gEventObjectSpriteOamTables_64x64, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RayquazaStill, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerM = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SwimmerM, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerF = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SwimmerF, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BlackBelt = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BlackBelt, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Beauty = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Beauty, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist1 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Scientist1, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lass = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Lass, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Gentleman = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Gentleman, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sailor = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Sailor, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fisherman = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Fisherman, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteM = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RunningTriathleteM, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteF = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RunningTriathleteF, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberF = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_TuberF, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberM = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_TuberM, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hiker = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Hiker, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteM = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_CyclingTriathleteM, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteF = {0xFFFF, 0x1103, 0x11FF, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_CyclingTriathleteF, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Nurse = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Nurse, gEventObjectPicTable_Nurse, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ItemBall = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ItemBall, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTree = {0xFFFF, 0x1103, 0x11FF, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, NULL, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeEarlyStages = {0xFFFF, 0x1103, 0x11FF, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeLateStages = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ProfBirch = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ProfBirch, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man5 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man5, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man6 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man6, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterM = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ReporterM, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterF = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ReporterF, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Bard = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hipster = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Trader = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Storyteller = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Giddy = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan1 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan2 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedNatuDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedNatuDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMagnemiteDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedMagnemiteDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedSquirtleDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedSquirtleDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedWooperDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedWooperDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPikachuDoll = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedPikachuDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPorygon2Doll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedPorygon2Doll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CuttableTree = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_CuttableTree, gEventObjectPicTable_CuttableTree, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MartEmployee = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MartEmployee, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RooftopSaleWoman = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RooftopSaleWoman, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Teala = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Teala, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BreakableRock = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_BreakableRock, gEventObjectPicTable_BreakableRock, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PushableBoulder = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PushableBoulder, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MrBrineysBoat = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MrBrineysBoat, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayNormal = {0xFFFF, 0x1110, 0x1102, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_MayNormal, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayMachBike = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayMachBike, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayAcroBike = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MaySurfing = {0xFFFF, 0x1110, 0x11FF, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_MaySurfing, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFieldMove = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Truck = {0xFFFF, 0x110D, 0x11FF, 1152, 48, 48, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_Truck, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_Truck, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_VigorothCarryingBox = {0xFFFF, 0x110E, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_VigorothCarryingBox, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_VigorothFacingAway = {0xFFFF, 0x110E, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_VigorothFacingAway, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirchsBag = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BirchsBag, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_EnemyZigzagoon = {0xFFFF, 0x110F, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_EnemyZigzagoon, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Poochyena = {0xFFFF, 0x111C, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Poochyena, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Artist = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Artist, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanNormal = {0xFFFF, 0x1100, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanMachBike = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanAcroBike = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanSurfing = {0xFFFF, 0x1100, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanFieldMove = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayNormal = {0xFFFF, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_MayNormal, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayMachBike = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayMachBike, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayAcroBike = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMaySurfing = {0xFFFF, 0x1110, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_MaySurfing, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayFieldMove = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cameraman = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Cameraman, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanUnderwater = {0xFFFF, 0x1115, 0x11FF, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanUnderwater, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayUnderwater = {0xFFFF, 0x1115, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayUnderwater, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MovingBox = {0xFFFF, 0x1112, 0x11FF, 128, 16, 16, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MovingBox, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CableCar = {0xFFFF, 0x1113, 0x11FF, 2048, 64, 64, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_64x64, gEventObjectSpriteOamTables_64x64, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_CableCar, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist2 = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Scientist2, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man7 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man7, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberM = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_AquaMemberM, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberF = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_AquaMemberF, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberM = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MagmaMemberM, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberF = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MagmaMemberF, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sidney = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Sidney, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Phoebe = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Phoebe, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Glacia = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Glacia, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Drake = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Drake, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Roxanne = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Roxanne, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brawly = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Brawly, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wattson = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wattson, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Flannery = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Flannery, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Norman = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Norman, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Winona = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Winona, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Liza = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Liza, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tate = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Tate, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wallace = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wallace, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Steven = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Steven, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wally = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wally, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireLittleBoy = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RubySapphireLittleBoy, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFishing = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Fishing, gEventObjectPicTable_BrendanFishing, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFishing = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Fishing, gEventObjectPicTable_MayFishing, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HotSpringsOldWoman = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_HotSpringsOldWoman, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SSTidal = {0xFFFF, 0x1114, 0x11FF, 1920, 96, 40, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_8x8, gEventObjectSpriteOamTables_SSTidal, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SSTidal, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SubmarineShadow = {0xFFFF, 0x111B, 0x11FF, 1408, 88, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_8x8, gEventObjectSpriteOamTables_SubmarineShadow, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SubmarineShadow, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PichuDoll = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PichuDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikachuDoll = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PikachuDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MarillDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MarillDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TogepiDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TogepiDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyndaquilDoll = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_CyndaquilDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ChikoritaDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ChikoritaDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TotodileDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TotodileDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_JigglypuffDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_JigglypuffDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MeowthDoll = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MeowthDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ClefairyDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ClefairyDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DittoDoll = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_DittoDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SmoochumDoll = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SmoochumDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TreeckoDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TreeckoDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TorchicDoll = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TorchicDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MudkipDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MudkipDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DuskullDoll = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_DuskullDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WynautDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_WynautDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BaltoyDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BaltoyDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KecleonDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_KecleonDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AzurillDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_AzurillDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SkittyDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SkittyDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwabluDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SwabluDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GulpinDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_GulpinDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LotadDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_LotadDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SeedotDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SeedotDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikaCushion = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PikaCushion, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RoundCushion = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_RoundCushion, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KissCushion = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_KissCushion, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ZigzagCushion = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ZigzagCushion, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SpinCushion = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SpinCushion, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DiamondCushion = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_DiamondCushion, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BallCushion = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BallCushion, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GrassCushion = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_GrassCushion, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FireCushion = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_FireCushion, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WaterCushion = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_WaterCushion, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigSnorlaxDoll = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigSnorlaxDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRhydonDoll = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRhydonDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigLaprasDoll = {0xFFFF, 0x1103, 0x11FF, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigLaprasDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigVenusaurDoll = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigVenusaurDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigCharizardDoll = {0xFFFF, 0x1104, 0x11FF, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigCharizardDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigBlastoiseDoll = {0xFFFF, 0x1103, 0x11FF, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigBlastoiseDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigWailmerDoll = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigWailmerDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegirockDoll = {0xFFFF, 0x1103, 0x11FF, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegirockDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegiceDoll = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegiceDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegisteelDoll = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegisteelDoll, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latias = {0xFFFF, 0x1104, 0x11FF, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latios = {0xFFFF, 0x1103, 0x11FF, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy5 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy5, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ContestOldMan = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ContestOldMan, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanWatering = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanWatering, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayWatering = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayWatering, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanDecorating = {0xFFFF, 0x1100, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BrendanDecorating, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayDecorating = {0xFFFF, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MayDecorating, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Archie = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Archie, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maxie = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Maxie, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre1 = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_KyogreFront, gEventObjectRotScalAnimTable_KyogreGroudon}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon1 = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_GroudonFront, gEventObjectRotScalAnimTable_KyogreGroudon}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre3 = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_KyogreSide, gEventObjectRotScalAnimTable_KyogreGroudon}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon3 = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Groudon3, gEventObjectPicTable_GroudonSide, gEventObjectRotScalAnimTable_KyogreGroudon}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fossil = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_Fossil, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regirock = {0xFFFF, 0x1104, 0x11FF, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Regi, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regice = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Regi, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Registeel = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Regi, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Skitty = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Skitty, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon1 = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kecleon, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre2 = {0xFFFF, 0x1116, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_KyogreFront, gEventObjectRotScalAnimTable_KyogreGroudon}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon2 = {0xFFFF, 0x1118, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_GroudonFront, gEventObjectRotScalAnimTable_KyogreGroudon}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza2 = {0xFFFF, 0x1105, 0x11FF, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_64x64, gEventObjectSpriteOamTables_64x64, gEventObjectImageAnimTable_Rayquaza2, gEventObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Zigzagoon = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Zigzagoon, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Pikachu = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Pikachu, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azumarill = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Azumarill, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wingull = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wingull, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon2 = {0xFFFF, 0x1105, 0x1102, 128, 16, 16, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kecleon, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberMSwimming = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_TuberMSwimming, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azurill = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Azurill, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mom = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Mom, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkBrendan = {0xFFFF, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkMay = {0xFFFF, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_MayNormal, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Juan = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Juan, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scott = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Scott, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MysteryEventDeliveryman = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MysteryEventDeliveryman, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Statue = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_Statue, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kirlia = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_S, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kirlia, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Dusclops = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Dusclops, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnionRoomAttendant = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_UnionRoomAttendant, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Red = {0xFFFF, 0x111D, 0x11FF, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Red, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Leaf = {0xFFFF, 0x111D, 0x11FF, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Leaf, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sudowoodo = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Sudowoodo, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mew = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Mew, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Deoxys = {0xFFFF, 0x111E, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Deoxys, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirthIslandStone = {0xFFFF, 0x111F, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BirthIslandStone, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Anabel = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Anabel, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tucker = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Tucker, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Greta = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Greta, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Spenser = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Spenser, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Noland = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Noland, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lucy = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Lucy, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brandon = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Brandon, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireBrendan = {0xFFFF, 0x1122, 0x11FF, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RubySapphireBrendan, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireMay = {0xFFFF, 0x1123, 0x11FF, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RubySapphireMay, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lugia = {0xFFFF, 0x1121, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Lugia, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HoOh = {0xFFFF, 0x1120, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_HoOh, gEventObjectPicTable_HoOh, gDummySpriteAffineAnimTable}; #endif //GUARD_EVENT_OBJECT_GRAPHICS_INFO_H diff --git a/src/data/field_event_obj/event_object_graphics_info_pointers.h b/src/data/field_event_obj/event_object_graphics_info_pointers.h index 6793a94878..c0ca57b604 100755 --- a/src/data/field_event_obj/event_object_graphics_info_pointers.h +++ b/src/data/field_event_obj/event_object_graphics_info_pointers.h @@ -1,504 +1,504 @@ #ifndef GUARD_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H #define GUARD_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanNormal; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanMachBike; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanSurfing; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanFieldMove; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_QuintyPlump; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LittleBoy1; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LittleGirl1; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy1; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Girl1; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy2; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Girl2; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LittleBoy2; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LittleGirl2; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy3; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Girl3; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy4; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman1; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_FatMan; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman2; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man1; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman3; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_OldMan1; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_OldWoman1; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man2; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman4; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man3; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman5; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Cook; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman6; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_OldMan2; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_OldWoman2; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Camper; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Picnicker; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man4; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman7; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Youngster; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BugCatcher; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PsychicM; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SchoolKidM; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Maniac; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_HexManiac; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Rayquaza1; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SwimmerM; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SwimmerF; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BlackBelt; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Beauty; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Scientist1; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Lass; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Gentleman; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Sailor; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Fisherman; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RunningTriathleteM; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RunningTriathleteF; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TuberF; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TuberM; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Hiker; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CyclingTriathleteM; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CyclingTriathleteF; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Nurse; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ItemBall; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BerryTree; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BerryTreeEarlyStages; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BerryTreeLateStages; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanAcroBike; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ProfBirch; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man5; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man6; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ReporterM; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ReporterF; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Bard; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Anabel; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Tucker; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Greta; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Spenser; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Noland; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Lucy; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedNatuDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedMagnemiteDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedSquirtleDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedWooperDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedPikachuDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedPorygon2Doll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CuttableTree; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MartEmployee; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RooftopSaleWoman; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Teala; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BreakableRock; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PushableBoulder; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MrBrineysBoat; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayNormal; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayMachBike; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayAcroBike; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MaySurfing; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayFieldMove; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Truck; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_VigorothCarryingBox; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_VigorothFacingAway; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BirchsBag; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_EnemyZigzagoon; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Artist; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanNormal; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanMachBike; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanAcroBike; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanSurfing; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanFieldMove; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMayNormal; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMayMachBike; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMayAcroBike; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMaySurfing; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMayFieldMove; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Cameraman; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanUnderwater; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayUnderwater; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MovingBox; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CableCar; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Scientist2; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man7; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_AquaMemberM; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_AquaMemberF; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MagmaMemberM; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MagmaMemberF; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Sidney; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Phoebe; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Glacia; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Drake; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Roxanne; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Brawly; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Wattson; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Flannery; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Norman; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Winona; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Liza; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Tate; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Wallace; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Steven; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Wally; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RubySapphireLittleBoy; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanFishing; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayFishing; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_HotSpringsOldWoman; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SSTidal; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SubmarineShadow; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PichuDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PikachuDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MarillDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TogepiDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CyndaquilDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ChikoritaDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TotodileDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_JigglypuffDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MeowthDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ClefairyDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_DittoDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SmoochumDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TreeckoDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TorchicDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MudkipDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_DuskullDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_WynautDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BaltoyDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_KecleonDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_AzurillDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SkittyDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SwabluDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_GulpinDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LotadDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SeedotDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PikaCushion; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RoundCushion; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_KissCushion; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ZigzagCushion; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SpinCushion; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_DiamondCushion; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BallCushion; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_GrassCushion; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_FireCushion; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_WaterCushion; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigSnorlaxDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigRhydonDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigLaprasDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigVenusaurDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigCharizardDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigBlastoiseDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigWailmerDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigRegirockDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigRegiceDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigRegisteelDoll; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Latias; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Latios; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy5; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ContestOldMan; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanWatering; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayWatering; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanDecorating; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayDecorating; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Archie; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Maxie; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kyogre1; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Groudon1; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Fossil; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Regirock; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Regice; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Registeel; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Skitty; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kecleon1; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kyogre2; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Groudon2; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Rayquaza2; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Zigzagoon; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Pikachu; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Azumarill; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Wingull; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kecleon2; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TuberMSwimming; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Azurill; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Mom; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LinkBrendan; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LinkMay; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Juan; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Scott; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Poochyena; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kyogre3; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Groudon3; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MysteryEventDeliveryman; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Statue; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kirlia; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Dusclops; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnionRoomAttendant; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Sudowoodo; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Mew; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Red; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Leaf; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Deoxys; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BirthIslandStone; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Brandon; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RubySapphireBrendan; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RubySapphireMay; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Lugia; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_HoOh; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Bard; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Hipster; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Trader; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Storyteller; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Giddy; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedMauvilleOldMan1; -const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedMauvilleOldMan2; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanNormal; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanMachBike; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanSurfing; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFieldMove; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_QuintyPlump; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy1; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl1; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy1; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl1; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy2; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl2; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy2; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl2; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy4; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man1; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman3; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan1; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman1; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man2; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman4; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man3; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman5; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cook; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman6; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan2; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman2; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Camper; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Picnicker; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man4; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman7; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Youngster; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BugCatcher; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PsychicM; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SchoolKidM; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maniac; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HexManiac; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza1; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerM; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerF; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BlackBelt; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Beauty; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist1; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lass; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Gentleman; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sailor; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fisherman; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteM; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteF; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberF; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberM; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hiker; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteM; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteF; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Nurse; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ItemBall; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTree; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeEarlyStages; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeLateStages; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanAcroBike; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ProfBirch; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man5; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man6; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterM; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterF; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Bard; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Anabel; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tucker; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Greta; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Spenser; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Noland; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lucy; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedNatuDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMagnemiteDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedSquirtleDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedWooperDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPikachuDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPorygon2Doll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CuttableTree; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MartEmployee; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RooftopSaleWoman; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Teala; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BreakableRock; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PushableBoulder; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MrBrineysBoat; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayNormal; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayMachBike; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayAcroBike; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MaySurfing; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFieldMove; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Truck; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_VigorothCarryingBox; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_VigorothFacingAway; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirchsBag; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_EnemyZigzagoon; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Artist; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanNormal; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanMachBike; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanAcroBike; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanSurfing; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanFieldMove; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayNormal; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayMachBike; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayAcroBike; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMaySurfing; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayFieldMove; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cameraman; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanUnderwater; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayUnderwater; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MovingBox; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CableCar; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist2; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man7; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberM; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberF; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberM; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberF; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sidney; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Phoebe; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Glacia; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Drake; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Roxanne; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brawly; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wattson; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Flannery; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Norman; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Winona; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Liza; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tate; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wallace; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Steven; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wally; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireLittleBoy; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFishing; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFishing; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HotSpringsOldWoman; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SSTidal; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SubmarineShadow; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PichuDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikachuDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MarillDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TogepiDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyndaquilDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ChikoritaDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TotodileDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_JigglypuffDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MeowthDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ClefairyDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DittoDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SmoochumDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TreeckoDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TorchicDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MudkipDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DuskullDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WynautDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BaltoyDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KecleonDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AzurillDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SkittyDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwabluDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GulpinDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LotadDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SeedotDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikaCushion; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RoundCushion; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KissCushion; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ZigzagCushion; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SpinCushion; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DiamondCushion; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BallCushion; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GrassCushion; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FireCushion; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WaterCushion; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigSnorlaxDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRhydonDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigLaprasDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigVenusaurDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigCharizardDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigBlastoiseDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigWailmerDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegirockDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegiceDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegisteelDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latias; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latios; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy5; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ContestOldMan; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanWatering; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayWatering; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanDecorating; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayDecorating; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Archie; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maxie; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre1; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon1; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fossil; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regirock; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regice; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Registeel; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Skitty; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon1; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre2; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon2; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza2; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Zigzagoon; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Pikachu; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azumarill; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wingull; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon2; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberMSwimming; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azurill; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mom; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkBrendan; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkMay; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Juan; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scott; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Poochyena; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre3; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon3; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MysteryEventDeliveryman; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Statue; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kirlia; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Dusclops; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnionRoomAttendant; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sudowoodo; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mew; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Red; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Leaf; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Deoxys; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirthIslandStone; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brandon; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireBrendan; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireMay; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lugia; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HoOh; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Bard; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hipster; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Trader; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Storyteller; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Giddy; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan1; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan2; -const struct MapObjectGraphicsInfo *const gFieldObjectGraphicsInfoPointers[] = { - &gFieldObjectGraphicsInfo_BrendanNormal, - &gFieldObjectGraphicsInfo_BrendanMachBike, - &gFieldObjectGraphicsInfo_BrendanSurfing, - &gFieldObjectGraphicsInfo_BrendanFieldMove, - &gFieldObjectGraphicsInfo_QuintyPlump, - &gFieldObjectGraphicsInfo_LittleBoy1, - &gFieldObjectGraphicsInfo_LittleGirl1, - &gFieldObjectGraphicsInfo_Boy1, - &gFieldObjectGraphicsInfo_Girl1, - &gFieldObjectGraphicsInfo_Boy2, - &gFieldObjectGraphicsInfo_Girl2, - &gFieldObjectGraphicsInfo_LittleBoy2, - &gFieldObjectGraphicsInfo_LittleGirl2, - &gFieldObjectGraphicsInfo_Boy3, - &gFieldObjectGraphicsInfo_Girl3, - &gFieldObjectGraphicsInfo_Boy4, - &gFieldObjectGraphicsInfo_Woman1, - &gFieldObjectGraphicsInfo_FatMan, - &gFieldObjectGraphicsInfo_Woman2, - &gFieldObjectGraphicsInfo_Man1, - &gFieldObjectGraphicsInfo_Woman3, - &gFieldObjectGraphicsInfo_OldMan1, - &gFieldObjectGraphicsInfo_OldWoman1, - &gFieldObjectGraphicsInfo_Man2, - &gFieldObjectGraphicsInfo_Woman4, - &gFieldObjectGraphicsInfo_Man3, - &gFieldObjectGraphicsInfo_Woman5, - &gFieldObjectGraphicsInfo_Cook, - &gFieldObjectGraphicsInfo_Woman6, - &gFieldObjectGraphicsInfo_OldMan2, - &gFieldObjectGraphicsInfo_OldWoman2, - &gFieldObjectGraphicsInfo_Camper, - &gFieldObjectGraphicsInfo_Picnicker, - &gFieldObjectGraphicsInfo_Man4, - &gFieldObjectGraphicsInfo_Woman7, - &gFieldObjectGraphicsInfo_Youngster, - &gFieldObjectGraphicsInfo_BugCatcher, - &gFieldObjectGraphicsInfo_PsychicM, - &gFieldObjectGraphicsInfo_SchoolKidM, - &gFieldObjectGraphicsInfo_Maniac, - &gFieldObjectGraphicsInfo_HexManiac, - &gFieldObjectGraphicsInfo_Rayquaza1, - &gFieldObjectGraphicsInfo_SwimmerM, - &gFieldObjectGraphicsInfo_SwimmerF, - &gFieldObjectGraphicsInfo_BlackBelt, - &gFieldObjectGraphicsInfo_Beauty, - &gFieldObjectGraphicsInfo_Scientist1, - &gFieldObjectGraphicsInfo_Lass, - &gFieldObjectGraphicsInfo_Gentleman, - &gFieldObjectGraphicsInfo_Sailor, - &gFieldObjectGraphicsInfo_Fisherman, - &gFieldObjectGraphicsInfo_RunningTriathleteM, - &gFieldObjectGraphicsInfo_RunningTriathleteF, - &gFieldObjectGraphicsInfo_TuberF, - &gFieldObjectGraphicsInfo_TuberM, - &gFieldObjectGraphicsInfo_Hiker, - &gFieldObjectGraphicsInfo_CyclingTriathleteM, - &gFieldObjectGraphicsInfo_CyclingTriathleteF, - &gFieldObjectGraphicsInfo_Nurse, - &gFieldObjectGraphicsInfo_ItemBall, - &gFieldObjectGraphicsInfo_BerryTree, - &gFieldObjectGraphicsInfo_BerryTreeEarlyStages, - &gFieldObjectGraphicsInfo_BerryTreeLateStages, - &gFieldObjectGraphicsInfo_BrendanAcroBike, - &gFieldObjectGraphicsInfo_ProfBirch, - &gFieldObjectGraphicsInfo_Man5, - &gFieldObjectGraphicsInfo_Man6, - &gFieldObjectGraphicsInfo_ReporterM, - &gFieldObjectGraphicsInfo_ReporterF, - &gFieldObjectGraphicsInfo_Bard, - &gFieldObjectGraphicsInfo_Anabel, - &gFieldObjectGraphicsInfo_Tucker, - &gFieldObjectGraphicsInfo_Greta, - &gFieldObjectGraphicsInfo_Spenser, - &gFieldObjectGraphicsInfo_Noland, - &gFieldObjectGraphicsInfo_Lucy, - &gFieldObjectGraphicsInfo_UnusedNatuDoll, - &gFieldObjectGraphicsInfo_UnusedMagnemiteDoll, - &gFieldObjectGraphicsInfo_UnusedSquirtleDoll, - &gFieldObjectGraphicsInfo_UnusedWooperDoll, - &gFieldObjectGraphicsInfo_UnusedPikachuDoll, - &gFieldObjectGraphicsInfo_UnusedPorygon2Doll, - &gFieldObjectGraphicsInfo_CuttableTree, - &gFieldObjectGraphicsInfo_MartEmployee, - &gFieldObjectGraphicsInfo_RooftopSaleWoman, - &gFieldObjectGraphicsInfo_Teala, - &gFieldObjectGraphicsInfo_BreakableRock, - &gFieldObjectGraphicsInfo_PushableBoulder, - &gFieldObjectGraphicsInfo_MrBrineysBoat, - &gFieldObjectGraphicsInfo_MayNormal, - &gFieldObjectGraphicsInfo_MayMachBike, - &gFieldObjectGraphicsInfo_MayAcroBike, - &gFieldObjectGraphicsInfo_MaySurfing, - &gFieldObjectGraphicsInfo_MayFieldMove, - &gFieldObjectGraphicsInfo_Truck, - &gFieldObjectGraphicsInfo_VigorothCarryingBox, - &gFieldObjectGraphicsInfo_VigorothFacingAway, - &gFieldObjectGraphicsInfo_BirchsBag, - &gFieldObjectGraphicsInfo_EnemyZigzagoon, - &gFieldObjectGraphicsInfo_Artist, - &gFieldObjectGraphicsInfo_RivalBrendanNormal, - &gFieldObjectGraphicsInfo_RivalBrendanMachBike, - &gFieldObjectGraphicsInfo_RivalBrendanAcroBike, - &gFieldObjectGraphicsInfo_RivalBrendanSurfing, - &gFieldObjectGraphicsInfo_RivalBrendanFieldMove, - &gFieldObjectGraphicsInfo_RivalMayNormal, - &gFieldObjectGraphicsInfo_RivalMayMachBike, - &gFieldObjectGraphicsInfo_RivalMayAcroBike, - &gFieldObjectGraphicsInfo_RivalMaySurfing, - &gFieldObjectGraphicsInfo_RivalMayFieldMove, - &gFieldObjectGraphicsInfo_Cameraman, - &gFieldObjectGraphicsInfo_BrendanUnderwater, - &gFieldObjectGraphicsInfo_MayUnderwater, - &gFieldObjectGraphicsInfo_MovingBox, - &gFieldObjectGraphicsInfo_CableCar, - &gFieldObjectGraphicsInfo_Scientist2, - &gFieldObjectGraphicsInfo_Man7, - &gFieldObjectGraphicsInfo_AquaMemberM, - &gFieldObjectGraphicsInfo_AquaMemberF, - &gFieldObjectGraphicsInfo_MagmaMemberM, - &gFieldObjectGraphicsInfo_MagmaMemberF, - &gFieldObjectGraphicsInfo_Sidney, - &gFieldObjectGraphicsInfo_Phoebe, - &gFieldObjectGraphicsInfo_Glacia, - &gFieldObjectGraphicsInfo_Drake, - &gFieldObjectGraphicsInfo_Roxanne, - &gFieldObjectGraphicsInfo_Brawly, - &gFieldObjectGraphicsInfo_Wattson, - &gFieldObjectGraphicsInfo_Flannery, - &gFieldObjectGraphicsInfo_Norman, - &gFieldObjectGraphicsInfo_Winona, - &gFieldObjectGraphicsInfo_Liza, - &gFieldObjectGraphicsInfo_Tate, - &gFieldObjectGraphicsInfo_Wallace, - &gFieldObjectGraphicsInfo_Steven, - &gFieldObjectGraphicsInfo_Wally, - &gFieldObjectGraphicsInfo_RubySapphireLittleBoy, - &gFieldObjectGraphicsInfo_BrendanFishing, - &gFieldObjectGraphicsInfo_MayFishing, - &gFieldObjectGraphicsInfo_HotSpringsOldWoman, - &gFieldObjectGraphicsInfo_SSTidal, - &gFieldObjectGraphicsInfo_SubmarineShadow, - &gFieldObjectGraphicsInfo_PichuDoll, - &gFieldObjectGraphicsInfo_PikachuDoll, - &gFieldObjectGraphicsInfo_MarillDoll, - &gFieldObjectGraphicsInfo_TogepiDoll, - &gFieldObjectGraphicsInfo_CyndaquilDoll, - &gFieldObjectGraphicsInfo_ChikoritaDoll, - &gFieldObjectGraphicsInfo_TotodileDoll, - &gFieldObjectGraphicsInfo_JigglypuffDoll, - &gFieldObjectGraphicsInfo_MeowthDoll, - &gFieldObjectGraphicsInfo_ClefairyDoll, - &gFieldObjectGraphicsInfo_DittoDoll, - &gFieldObjectGraphicsInfo_SmoochumDoll, - &gFieldObjectGraphicsInfo_TreeckoDoll, - &gFieldObjectGraphicsInfo_TorchicDoll, - &gFieldObjectGraphicsInfo_MudkipDoll, - &gFieldObjectGraphicsInfo_DuskullDoll, - &gFieldObjectGraphicsInfo_WynautDoll, - &gFieldObjectGraphicsInfo_BaltoyDoll, - &gFieldObjectGraphicsInfo_KecleonDoll, - &gFieldObjectGraphicsInfo_AzurillDoll, - &gFieldObjectGraphicsInfo_SkittyDoll, - &gFieldObjectGraphicsInfo_SwabluDoll, - &gFieldObjectGraphicsInfo_GulpinDoll, - &gFieldObjectGraphicsInfo_LotadDoll, - &gFieldObjectGraphicsInfo_SeedotDoll, - &gFieldObjectGraphicsInfo_PikaCushion, - &gFieldObjectGraphicsInfo_RoundCushion, - &gFieldObjectGraphicsInfo_KissCushion, - &gFieldObjectGraphicsInfo_ZigzagCushion, - &gFieldObjectGraphicsInfo_SpinCushion, - &gFieldObjectGraphicsInfo_DiamondCushion, - &gFieldObjectGraphicsInfo_BallCushion, - &gFieldObjectGraphicsInfo_GrassCushion, - &gFieldObjectGraphicsInfo_FireCushion, - &gFieldObjectGraphicsInfo_WaterCushion, - &gFieldObjectGraphicsInfo_BigSnorlaxDoll, - &gFieldObjectGraphicsInfo_BigRhydonDoll, - &gFieldObjectGraphicsInfo_BigLaprasDoll, - &gFieldObjectGraphicsInfo_BigVenusaurDoll, - &gFieldObjectGraphicsInfo_BigCharizardDoll, - &gFieldObjectGraphicsInfo_BigBlastoiseDoll, - &gFieldObjectGraphicsInfo_BigWailmerDoll, - &gFieldObjectGraphicsInfo_BigRegirockDoll, - &gFieldObjectGraphicsInfo_BigRegiceDoll, - &gFieldObjectGraphicsInfo_BigRegisteelDoll, - &gFieldObjectGraphicsInfo_Latias, - &gFieldObjectGraphicsInfo_Latios, - &gFieldObjectGraphicsInfo_Boy5, - &gFieldObjectGraphicsInfo_ContestOldMan, - &gFieldObjectGraphicsInfo_BrendanWatering, - &gFieldObjectGraphicsInfo_MayWatering, - &gFieldObjectGraphicsInfo_BrendanDecorating, - &gFieldObjectGraphicsInfo_MayDecorating, - &gFieldObjectGraphicsInfo_Archie, - &gFieldObjectGraphicsInfo_Maxie, - &gFieldObjectGraphicsInfo_Kyogre1, - &gFieldObjectGraphicsInfo_Groudon1, - &gFieldObjectGraphicsInfo_Fossil, - &gFieldObjectGraphicsInfo_Regirock, - &gFieldObjectGraphicsInfo_Regice, - &gFieldObjectGraphicsInfo_Registeel, - &gFieldObjectGraphicsInfo_Skitty, - &gFieldObjectGraphicsInfo_Kecleon1, - &gFieldObjectGraphicsInfo_Kyogre2, - &gFieldObjectGraphicsInfo_Groudon2, - &gFieldObjectGraphicsInfo_Rayquaza2, - &gFieldObjectGraphicsInfo_Zigzagoon, - &gFieldObjectGraphicsInfo_Pikachu, - &gFieldObjectGraphicsInfo_Azumarill, - &gFieldObjectGraphicsInfo_Wingull, - &gFieldObjectGraphicsInfo_Kecleon2, - &gFieldObjectGraphicsInfo_TuberMSwimming, - &gFieldObjectGraphicsInfo_Azurill, - &gFieldObjectGraphicsInfo_Mom, - &gFieldObjectGraphicsInfo_LinkBrendan, - &gFieldObjectGraphicsInfo_LinkMay, - &gFieldObjectGraphicsInfo_Juan, - &gFieldObjectGraphicsInfo_Scott, - &gFieldObjectGraphicsInfo_Poochyena, - &gFieldObjectGraphicsInfo_Kyogre3, - &gFieldObjectGraphicsInfo_Groudon3, - &gFieldObjectGraphicsInfo_MysteryEventDeliveryman, - &gFieldObjectGraphicsInfo_Statue, - &gFieldObjectGraphicsInfo_Kirlia, - &gFieldObjectGraphicsInfo_Dusclops, - &gFieldObjectGraphicsInfo_UnionRoomAttendant, - &gFieldObjectGraphicsInfo_Sudowoodo, - &gFieldObjectGraphicsInfo_Mew, - &gFieldObjectGraphicsInfo_Red, - &gFieldObjectGraphicsInfo_Leaf, - &gFieldObjectGraphicsInfo_Deoxys, - &gFieldObjectGraphicsInfo_BirthIslandStone, - &gFieldObjectGraphicsInfo_Brandon, - &gFieldObjectGraphicsInfo_RubySapphireBrendan, - &gFieldObjectGraphicsInfo_RubySapphireMay, - &gFieldObjectGraphicsInfo_Lugia, - &gFieldObjectGraphicsInfo_HoOh, +const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] = { + &gEventObjectGraphicsInfo_BrendanNormal, + &gEventObjectGraphicsInfo_BrendanMachBike, + &gEventObjectGraphicsInfo_BrendanSurfing, + &gEventObjectGraphicsInfo_BrendanFieldMove, + &gEventObjectGraphicsInfo_QuintyPlump, + &gEventObjectGraphicsInfo_LittleBoy1, + &gEventObjectGraphicsInfo_LittleGirl1, + &gEventObjectGraphicsInfo_Boy1, + &gEventObjectGraphicsInfo_Girl1, + &gEventObjectGraphicsInfo_Boy2, + &gEventObjectGraphicsInfo_Girl2, + &gEventObjectGraphicsInfo_LittleBoy2, + &gEventObjectGraphicsInfo_LittleGirl2, + &gEventObjectGraphicsInfo_Boy3, + &gEventObjectGraphicsInfo_Girl3, + &gEventObjectGraphicsInfo_Boy4, + &gEventObjectGraphicsInfo_Woman1, + &gEventObjectGraphicsInfo_FatMan, + &gEventObjectGraphicsInfo_Woman2, + &gEventObjectGraphicsInfo_Man1, + &gEventObjectGraphicsInfo_Woman3, + &gEventObjectGraphicsInfo_OldMan1, + &gEventObjectGraphicsInfo_OldWoman1, + &gEventObjectGraphicsInfo_Man2, + &gEventObjectGraphicsInfo_Woman4, + &gEventObjectGraphicsInfo_Man3, + &gEventObjectGraphicsInfo_Woman5, + &gEventObjectGraphicsInfo_Cook, + &gEventObjectGraphicsInfo_Woman6, + &gEventObjectGraphicsInfo_OldMan2, + &gEventObjectGraphicsInfo_OldWoman2, + &gEventObjectGraphicsInfo_Camper, + &gEventObjectGraphicsInfo_Picnicker, + &gEventObjectGraphicsInfo_Man4, + &gEventObjectGraphicsInfo_Woman7, + &gEventObjectGraphicsInfo_Youngster, + &gEventObjectGraphicsInfo_BugCatcher, + &gEventObjectGraphicsInfo_PsychicM, + &gEventObjectGraphicsInfo_SchoolKidM, + &gEventObjectGraphicsInfo_Maniac, + &gEventObjectGraphicsInfo_HexManiac, + &gEventObjectGraphicsInfo_Rayquaza1, + &gEventObjectGraphicsInfo_SwimmerM, + &gEventObjectGraphicsInfo_SwimmerF, + &gEventObjectGraphicsInfo_BlackBelt, + &gEventObjectGraphicsInfo_Beauty, + &gEventObjectGraphicsInfo_Scientist1, + &gEventObjectGraphicsInfo_Lass, + &gEventObjectGraphicsInfo_Gentleman, + &gEventObjectGraphicsInfo_Sailor, + &gEventObjectGraphicsInfo_Fisherman, + &gEventObjectGraphicsInfo_RunningTriathleteM, + &gEventObjectGraphicsInfo_RunningTriathleteF, + &gEventObjectGraphicsInfo_TuberF, + &gEventObjectGraphicsInfo_TuberM, + &gEventObjectGraphicsInfo_Hiker, + &gEventObjectGraphicsInfo_CyclingTriathleteM, + &gEventObjectGraphicsInfo_CyclingTriathleteF, + &gEventObjectGraphicsInfo_Nurse, + &gEventObjectGraphicsInfo_ItemBall, + &gEventObjectGraphicsInfo_BerryTree, + &gEventObjectGraphicsInfo_BerryTreeEarlyStages, + &gEventObjectGraphicsInfo_BerryTreeLateStages, + &gEventObjectGraphicsInfo_BrendanAcroBike, + &gEventObjectGraphicsInfo_ProfBirch, + &gEventObjectGraphicsInfo_Man5, + &gEventObjectGraphicsInfo_Man6, + &gEventObjectGraphicsInfo_ReporterM, + &gEventObjectGraphicsInfo_ReporterF, + &gEventObjectGraphicsInfo_Bard, + &gEventObjectGraphicsInfo_Anabel, + &gEventObjectGraphicsInfo_Tucker, + &gEventObjectGraphicsInfo_Greta, + &gEventObjectGraphicsInfo_Spenser, + &gEventObjectGraphicsInfo_Noland, + &gEventObjectGraphicsInfo_Lucy, + &gEventObjectGraphicsInfo_UnusedNatuDoll, + &gEventObjectGraphicsInfo_UnusedMagnemiteDoll, + &gEventObjectGraphicsInfo_UnusedSquirtleDoll, + &gEventObjectGraphicsInfo_UnusedWooperDoll, + &gEventObjectGraphicsInfo_UnusedPikachuDoll, + &gEventObjectGraphicsInfo_UnusedPorygon2Doll, + &gEventObjectGraphicsInfo_CuttableTree, + &gEventObjectGraphicsInfo_MartEmployee, + &gEventObjectGraphicsInfo_RooftopSaleWoman, + &gEventObjectGraphicsInfo_Teala, + &gEventObjectGraphicsInfo_BreakableRock, + &gEventObjectGraphicsInfo_PushableBoulder, + &gEventObjectGraphicsInfo_MrBrineysBoat, + &gEventObjectGraphicsInfo_MayNormal, + &gEventObjectGraphicsInfo_MayMachBike, + &gEventObjectGraphicsInfo_MayAcroBike, + &gEventObjectGraphicsInfo_MaySurfing, + &gEventObjectGraphicsInfo_MayFieldMove, + &gEventObjectGraphicsInfo_Truck, + &gEventObjectGraphicsInfo_VigorothCarryingBox, + &gEventObjectGraphicsInfo_VigorothFacingAway, + &gEventObjectGraphicsInfo_BirchsBag, + &gEventObjectGraphicsInfo_EnemyZigzagoon, + &gEventObjectGraphicsInfo_Artist, + &gEventObjectGraphicsInfo_RivalBrendanNormal, + &gEventObjectGraphicsInfo_RivalBrendanMachBike, + &gEventObjectGraphicsInfo_RivalBrendanAcroBike, + &gEventObjectGraphicsInfo_RivalBrendanSurfing, + &gEventObjectGraphicsInfo_RivalBrendanFieldMove, + &gEventObjectGraphicsInfo_RivalMayNormal, + &gEventObjectGraphicsInfo_RivalMayMachBike, + &gEventObjectGraphicsInfo_RivalMayAcroBike, + &gEventObjectGraphicsInfo_RivalMaySurfing, + &gEventObjectGraphicsInfo_RivalMayFieldMove, + &gEventObjectGraphicsInfo_Cameraman, + &gEventObjectGraphicsInfo_BrendanUnderwater, + &gEventObjectGraphicsInfo_MayUnderwater, + &gEventObjectGraphicsInfo_MovingBox, + &gEventObjectGraphicsInfo_CableCar, + &gEventObjectGraphicsInfo_Scientist2, + &gEventObjectGraphicsInfo_Man7, + &gEventObjectGraphicsInfo_AquaMemberM, + &gEventObjectGraphicsInfo_AquaMemberF, + &gEventObjectGraphicsInfo_MagmaMemberM, + &gEventObjectGraphicsInfo_MagmaMemberF, + &gEventObjectGraphicsInfo_Sidney, + &gEventObjectGraphicsInfo_Phoebe, + &gEventObjectGraphicsInfo_Glacia, + &gEventObjectGraphicsInfo_Drake, + &gEventObjectGraphicsInfo_Roxanne, + &gEventObjectGraphicsInfo_Brawly, + &gEventObjectGraphicsInfo_Wattson, + &gEventObjectGraphicsInfo_Flannery, + &gEventObjectGraphicsInfo_Norman, + &gEventObjectGraphicsInfo_Winona, + &gEventObjectGraphicsInfo_Liza, + &gEventObjectGraphicsInfo_Tate, + &gEventObjectGraphicsInfo_Wallace, + &gEventObjectGraphicsInfo_Steven, + &gEventObjectGraphicsInfo_Wally, + &gEventObjectGraphicsInfo_RubySapphireLittleBoy, + &gEventObjectGraphicsInfo_BrendanFishing, + &gEventObjectGraphicsInfo_MayFishing, + &gEventObjectGraphicsInfo_HotSpringsOldWoman, + &gEventObjectGraphicsInfo_SSTidal, + &gEventObjectGraphicsInfo_SubmarineShadow, + &gEventObjectGraphicsInfo_PichuDoll, + &gEventObjectGraphicsInfo_PikachuDoll, + &gEventObjectGraphicsInfo_MarillDoll, + &gEventObjectGraphicsInfo_TogepiDoll, + &gEventObjectGraphicsInfo_CyndaquilDoll, + &gEventObjectGraphicsInfo_ChikoritaDoll, + &gEventObjectGraphicsInfo_TotodileDoll, + &gEventObjectGraphicsInfo_JigglypuffDoll, + &gEventObjectGraphicsInfo_MeowthDoll, + &gEventObjectGraphicsInfo_ClefairyDoll, + &gEventObjectGraphicsInfo_DittoDoll, + &gEventObjectGraphicsInfo_SmoochumDoll, + &gEventObjectGraphicsInfo_TreeckoDoll, + &gEventObjectGraphicsInfo_TorchicDoll, + &gEventObjectGraphicsInfo_MudkipDoll, + &gEventObjectGraphicsInfo_DuskullDoll, + &gEventObjectGraphicsInfo_WynautDoll, + &gEventObjectGraphicsInfo_BaltoyDoll, + &gEventObjectGraphicsInfo_KecleonDoll, + &gEventObjectGraphicsInfo_AzurillDoll, + &gEventObjectGraphicsInfo_SkittyDoll, + &gEventObjectGraphicsInfo_SwabluDoll, + &gEventObjectGraphicsInfo_GulpinDoll, + &gEventObjectGraphicsInfo_LotadDoll, + &gEventObjectGraphicsInfo_SeedotDoll, + &gEventObjectGraphicsInfo_PikaCushion, + &gEventObjectGraphicsInfo_RoundCushion, + &gEventObjectGraphicsInfo_KissCushion, + &gEventObjectGraphicsInfo_ZigzagCushion, + &gEventObjectGraphicsInfo_SpinCushion, + &gEventObjectGraphicsInfo_DiamondCushion, + &gEventObjectGraphicsInfo_BallCushion, + &gEventObjectGraphicsInfo_GrassCushion, + &gEventObjectGraphicsInfo_FireCushion, + &gEventObjectGraphicsInfo_WaterCushion, + &gEventObjectGraphicsInfo_BigSnorlaxDoll, + &gEventObjectGraphicsInfo_BigRhydonDoll, + &gEventObjectGraphicsInfo_BigLaprasDoll, + &gEventObjectGraphicsInfo_BigVenusaurDoll, + &gEventObjectGraphicsInfo_BigCharizardDoll, + &gEventObjectGraphicsInfo_BigBlastoiseDoll, + &gEventObjectGraphicsInfo_BigWailmerDoll, + &gEventObjectGraphicsInfo_BigRegirockDoll, + &gEventObjectGraphicsInfo_BigRegiceDoll, + &gEventObjectGraphicsInfo_BigRegisteelDoll, + &gEventObjectGraphicsInfo_Latias, + &gEventObjectGraphicsInfo_Latios, + &gEventObjectGraphicsInfo_Boy5, + &gEventObjectGraphicsInfo_ContestOldMan, + &gEventObjectGraphicsInfo_BrendanWatering, + &gEventObjectGraphicsInfo_MayWatering, + &gEventObjectGraphicsInfo_BrendanDecorating, + &gEventObjectGraphicsInfo_MayDecorating, + &gEventObjectGraphicsInfo_Archie, + &gEventObjectGraphicsInfo_Maxie, + &gEventObjectGraphicsInfo_Kyogre1, + &gEventObjectGraphicsInfo_Groudon1, + &gEventObjectGraphicsInfo_Fossil, + &gEventObjectGraphicsInfo_Regirock, + &gEventObjectGraphicsInfo_Regice, + &gEventObjectGraphicsInfo_Registeel, + &gEventObjectGraphicsInfo_Skitty, + &gEventObjectGraphicsInfo_Kecleon1, + &gEventObjectGraphicsInfo_Kyogre2, + &gEventObjectGraphicsInfo_Groudon2, + &gEventObjectGraphicsInfo_Rayquaza2, + &gEventObjectGraphicsInfo_Zigzagoon, + &gEventObjectGraphicsInfo_Pikachu, + &gEventObjectGraphicsInfo_Azumarill, + &gEventObjectGraphicsInfo_Wingull, + &gEventObjectGraphicsInfo_Kecleon2, + &gEventObjectGraphicsInfo_TuberMSwimming, + &gEventObjectGraphicsInfo_Azurill, + &gEventObjectGraphicsInfo_Mom, + &gEventObjectGraphicsInfo_LinkBrendan, + &gEventObjectGraphicsInfo_LinkMay, + &gEventObjectGraphicsInfo_Juan, + &gEventObjectGraphicsInfo_Scott, + &gEventObjectGraphicsInfo_Poochyena, + &gEventObjectGraphicsInfo_Kyogre3, + &gEventObjectGraphicsInfo_Groudon3, + &gEventObjectGraphicsInfo_MysteryEventDeliveryman, + &gEventObjectGraphicsInfo_Statue, + &gEventObjectGraphicsInfo_Kirlia, + &gEventObjectGraphicsInfo_Dusclops, + &gEventObjectGraphicsInfo_UnionRoomAttendant, + &gEventObjectGraphicsInfo_Sudowoodo, + &gEventObjectGraphicsInfo_Mew, + &gEventObjectGraphicsInfo_Red, + &gEventObjectGraphicsInfo_Leaf, + &gEventObjectGraphicsInfo_Deoxys, + &gEventObjectGraphicsInfo_BirthIslandStone, + &gEventObjectGraphicsInfo_Brandon, + &gEventObjectGraphicsInfo_RubySapphireBrendan, + &gEventObjectGraphicsInfo_RubySapphireMay, + &gEventObjectGraphicsInfo_Lugia, + &gEventObjectGraphicsInfo_HoOh, }; -const struct MapObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = { - &gFieldObjectGraphicsInfo_Bard, - &gFieldObjectGraphicsInfo_Hipster, - &gFieldObjectGraphicsInfo_Trader, - &gFieldObjectGraphicsInfo_Storyteller, - &gFieldObjectGraphicsInfo_Giddy, - &gFieldObjectGraphicsInfo_UnusedMauvilleOldMan1, - &gFieldObjectGraphicsInfo_UnusedMauvilleOldMan2, +const struct EventObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = { + &gEventObjectGraphicsInfo_Bard, + &gEventObjectGraphicsInfo_Hipster, + &gEventObjectGraphicsInfo_Trader, + &gEventObjectGraphicsInfo_Storyteller, + &gEventObjectGraphicsInfo_Giddy, + &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1, + &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2, }; #endif //GUARD_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H diff --git a/src/data/field_event_obj/event_object_pic_tables.h b/src/data/field_event_obj/event_object_pic_tables.h index f5d6a24c3b..892af7e9b6 100755 --- a/src/data/field_event_obj/event_object_pic_tables.h +++ b/src/data/field_event_obj/event_object_pic_tables.h @@ -1,2179 +1,2179 @@ #ifndef GUARD_EVENT_OBJECT_PIC_TABLES_H #define GUARD_EVENT_OBJECT_PIC_TABLES_H -const struct SpriteFrameImage gFieldObjectPicTable_BrendanNormal[] = { - obj_frame_tiles(gFieldObjectPic_BrendanNormal_0), - obj_frame_tiles(gFieldObjectPic_BrendanNormal_1), - obj_frame_tiles(gFieldObjectPic_BrendanNormal_2), - obj_frame_tiles(gFieldObjectPic_BrendanNormal_3), - obj_frame_tiles(gFieldObjectPic_BrendanNormal_4), - obj_frame_tiles(gFieldObjectPic_BrendanNormal_5), - obj_frame_tiles(gFieldObjectPic_BrendanNormal_6), - obj_frame_tiles(gFieldObjectPic_BrendanNormal_7), - obj_frame_tiles(gFieldObjectPic_BrendanNormal_8), - obj_frame_tiles(gFieldObjectPic_BrendanNormal_9), - obj_frame_tiles(gFieldObjectPic_BrendanNormal_10), - obj_frame_tiles(gFieldObjectPic_BrendanNormal_11), - obj_frame_tiles(gFieldObjectPic_BrendanNormal_12), - obj_frame_tiles(gFieldObjectPic_BrendanNormal_13), - obj_frame_tiles(gFieldObjectPic_BrendanNormal_14), - obj_frame_tiles(gFieldObjectPic_BrendanNormal_15), - obj_frame_tiles(gFieldObjectPic_BrendanNormal_16), - obj_frame_tiles(gFieldObjectPic_BrendanNormal_17), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_BrendanMachBike[] = { - obj_frame_tiles(gFieldObjectPic_BrendanMachBike_0), - obj_frame_tiles(gFieldObjectPic_BrendanMachBike_1), - obj_frame_tiles(gFieldObjectPic_BrendanMachBike_2), - obj_frame_tiles(gFieldObjectPic_BrendanMachBike_3), - obj_frame_tiles(gFieldObjectPic_BrendanMachBike_4), - obj_frame_tiles(gFieldObjectPic_BrendanMachBike_5), - obj_frame_tiles(gFieldObjectPic_BrendanMachBike_6), - obj_frame_tiles(gFieldObjectPic_BrendanMachBike_7), - obj_frame_tiles(gFieldObjectPic_BrendanMachBike_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_BrendanAcroBike[] = { - obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_0), - obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_1), - obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_2), - obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_3), - obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_4), - obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_5), - obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_6), - obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_7), - obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_8), - obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_9), - obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_10), - obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_11), - obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_12), - obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_13), - obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_14), - obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_15), - obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_16), - obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_17), - obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_18), - obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_19), - obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_20), - obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_21), - obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_22), - obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_23), - obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_24), - obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_25), - obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_26), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_BrendanSurfing[] = { - obj_frame_tiles(gFieldObjectPic_BrendanSurfing_0), - obj_frame_tiles(gFieldObjectPic_BrendanSurfing_1), - obj_frame_tiles(gFieldObjectPic_BrendanSurfing_2), - obj_frame_tiles(gFieldObjectPic_BrendanSurfing_0), - obj_frame_tiles(gFieldObjectPic_BrendanSurfing_0), - obj_frame_tiles(gFieldObjectPic_BrendanSurfing_1), - obj_frame_tiles(gFieldObjectPic_BrendanSurfing_1), - obj_frame_tiles(gFieldObjectPic_BrendanSurfing_2), - obj_frame_tiles(gFieldObjectPic_BrendanSurfing_2), - obj_frame_tiles(gFieldObjectPic_BrendanSurfing_3), - obj_frame_tiles(gFieldObjectPic_BrendanSurfing_4), - obj_frame_tiles(gFieldObjectPic_BrendanSurfing_5), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_BrendanUnderwater[] = { - obj_frame_tiles(gFieldObjectPic_BrendanUnderwater_0), - obj_frame_tiles(gFieldObjectPic_BrendanUnderwater_1), - obj_frame_tiles(gFieldObjectPic_BrendanUnderwater_2), - obj_frame_tiles(gFieldObjectPic_BrendanUnderwater_0), - obj_frame_tiles(gFieldObjectPic_BrendanUnderwater_0), - obj_frame_tiles(gFieldObjectPic_BrendanUnderwater_1), - obj_frame_tiles(gFieldObjectPic_BrendanUnderwater_1), - obj_frame_tiles(gFieldObjectPic_BrendanUnderwater_2), - obj_frame_tiles(gFieldObjectPic_BrendanUnderwater_2), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_BrendanFieldMove[] = { - obj_frame_tiles(gFieldObjectPic_BrendanFieldMove_0), - obj_frame_tiles(gFieldObjectPic_BrendanFieldMove_1), - obj_frame_tiles(gFieldObjectPic_BrendanFieldMove_2), - obj_frame_tiles(gFieldObjectPic_BrendanFieldMove_3), - obj_frame_tiles(gFieldObjectPic_BrendanFieldMove_4), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_QuintyPlump[] = { - obj_frame_tiles(gFieldObjectPic_QuintyPlump_0), - obj_frame_tiles(gFieldObjectPic_QuintyPlump_1), - obj_frame_tiles(gFieldObjectPic_QuintyPlump_2), - obj_frame_tiles(gFieldObjectPic_QuintyPlump_3), - obj_frame_tiles(gFieldObjectPic_QuintyPlump_4), - obj_frame_tiles(gFieldObjectPic_QuintyPlump_5), - obj_frame_tiles(gFieldObjectPic_QuintyPlump_6), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_LittleBoy1[] = { - obj_frame_tiles(gFieldObjectPic_LittleBoy1_0), - obj_frame_tiles(gFieldObjectPic_LittleBoy1_1), - obj_frame_tiles(gFieldObjectPic_LittleBoy1_2), - obj_frame_tiles(gFieldObjectPic_LittleBoy1_3), - obj_frame_tiles(gFieldObjectPic_LittleBoy1_4), - obj_frame_tiles(gFieldObjectPic_LittleBoy1_5), - obj_frame_tiles(gFieldObjectPic_LittleBoy1_6), - obj_frame_tiles(gFieldObjectPic_LittleBoy1_7), - obj_frame_tiles(gFieldObjectPic_LittleBoy1_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_LittleGirl1[] = { - obj_frame_tiles(gFieldObjectPic_LittleGirl1_0), - obj_frame_tiles(gFieldObjectPic_LittleGirl1_1), - obj_frame_tiles(gFieldObjectPic_LittleGirl1_2), - obj_frame_tiles(gFieldObjectPic_LittleGirl1_3), - obj_frame_tiles(gFieldObjectPic_LittleGirl1_4), - obj_frame_tiles(gFieldObjectPic_LittleGirl1_5), - obj_frame_tiles(gFieldObjectPic_LittleGirl1_6), - obj_frame_tiles(gFieldObjectPic_LittleGirl1_7), - obj_frame_tiles(gFieldObjectPic_LittleGirl1_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Boy1[] = { - obj_frame_tiles(gFieldObjectPic_Boy1_0), - obj_frame_tiles(gFieldObjectPic_Boy1_1), - obj_frame_tiles(gFieldObjectPic_Boy1_2), - obj_frame_tiles(gFieldObjectPic_Boy1_3), - obj_frame_tiles(gFieldObjectPic_Boy1_4), - obj_frame_tiles(gFieldObjectPic_Boy1_5), - obj_frame_tiles(gFieldObjectPic_Boy1_6), - obj_frame_tiles(gFieldObjectPic_Boy1_7), - obj_frame_tiles(gFieldObjectPic_Boy1_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Girl1[] = { - obj_frame_tiles(gFieldObjectPic_Girl1_0), - obj_frame_tiles(gFieldObjectPic_Girl1_1), - obj_frame_tiles(gFieldObjectPic_Girl1_2), - obj_frame_tiles(gFieldObjectPic_Girl1_3), - obj_frame_tiles(gFieldObjectPic_Girl1_4), - obj_frame_tiles(gFieldObjectPic_Girl1_5), - obj_frame_tiles(gFieldObjectPic_Girl1_6), - obj_frame_tiles(gFieldObjectPic_Girl1_7), - obj_frame_tiles(gFieldObjectPic_Girl1_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Boy2[] = { - obj_frame_tiles(gFieldObjectPic_Boy2_0), - obj_frame_tiles(gFieldObjectPic_Boy2_1), - obj_frame_tiles(gFieldObjectPic_Boy2_2), - obj_frame_tiles(gFieldObjectPic_Boy2_3), - obj_frame_tiles(gFieldObjectPic_Boy2_4), - obj_frame_tiles(gFieldObjectPic_Boy2_5), - obj_frame_tiles(gFieldObjectPic_Boy2_6), - obj_frame_tiles(gFieldObjectPic_Boy2_7), - obj_frame_tiles(gFieldObjectPic_Boy2_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Girl2[] = { - obj_frame_tiles(gFieldObjectPic_Girl2_0), - obj_frame_tiles(gFieldObjectPic_Girl2_1), - obj_frame_tiles(gFieldObjectPic_Girl2_2), - obj_frame_tiles(gFieldObjectPic_Girl2_3), - obj_frame_tiles(gFieldObjectPic_Girl2_4), - obj_frame_tiles(gFieldObjectPic_Girl2_5), - obj_frame_tiles(gFieldObjectPic_Girl2_6), - obj_frame_tiles(gFieldObjectPic_Girl2_7), - obj_frame_tiles(gFieldObjectPic_Girl2_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_LittleBoy2[] = { - obj_frame_tiles(gFieldObjectPic_LittleBoy2_0), - obj_frame_tiles(gFieldObjectPic_LittleBoy2_1), - obj_frame_tiles(gFieldObjectPic_LittleBoy2_2), - obj_frame_tiles(gFieldObjectPic_LittleBoy2_3), - obj_frame_tiles(gFieldObjectPic_LittleBoy2_4), - obj_frame_tiles(gFieldObjectPic_LittleBoy2_5), - obj_frame_tiles(gFieldObjectPic_LittleBoy2_6), - obj_frame_tiles(gFieldObjectPic_LittleBoy2_7), - obj_frame_tiles(gFieldObjectPic_LittleBoy2_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_LittleGirl2[] = { - obj_frame_tiles(gFieldObjectPic_LittleGirl2_0), - obj_frame_tiles(gFieldObjectPic_LittleGirl2_1), - obj_frame_tiles(gFieldObjectPic_LittleGirl2_2), - obj_frame_tiles(gFieldObjectPic_LittleGirl2_3), - obj_frame_tiles(gFieldObjectPic_LittleGirl2_4), - obj_frame_tiles(gFieldObjectPic_LittleGirl2_5), - obj_frame_tiles(gFieldObjectPic_LittleGirl2_6), - obj_frame_tiles(gFieldObjectPic_LittleGirl2_7), - obj_frame_tiles(gFieldObjectPic_LittleGirl2_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Boy3[] = { - obj_frame_tiles(gFieldObjectPic_Boy3_0), - obj_frame_tiles(gFieldObjectPic_Boy3_1), - obj_frame_tiles(gFieldObjectPic_Boy3_2), - obj_frame_tiles(gFieldObjectPic_Boy3_3), - obj_frame_tiles(gFieldObjectPic_Boy3_4), - obj_frame_tiles(gFieldObjectPic_Boy3_5), - obj_frame_tiles(gFieldObjectPic_Boy3_6), - obj_frame_tiles(gFieldObjectPic_Boy3_7), - obj_frame_tiles(gFieldObjectPic_Boy3_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Girl3[] = { - obj_frame_tiles(gFieldObjectPic_Girl3_0), - obj_frame_tiles(gFieldObjectPic_Girl3_1), - obj_frame_tiles(gFieldObjectPic_Girl3_2), - obj_frame_tiles(gFieldObjectPic_Girl3_3), - obj_frame_tiles(gFieldObjectPic_Girl3_4), - obj_frame_tiles(gFieldObjectPic_Girl3_5), - obj_frame_tiles(gFieldObjectPic_Girl3_6), - obj_frame_tiles(gFieldObjectPic_Girl3_7), - obj_frame_tiles(gFieldObjectPic_Girl3_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Boy4[] = { - obj_frame_tiles(gFieldObjectPic_Boy4_0), - obj_frame_tiles(gFieldObjectPic_Boy4_1), - obj_frame_tiles(gFieldObjectPic_Boy4_2), - obj_frame_tiles(gFieldObjectPic_Boy4_3), - obj_frame_tiles(gFieldObjectPic_Boy4_4), - obj_frame_tiles(gFieldObjectPic_Boy4_5), - obj_frame_tiles(gFieldObjectPic_Boy4_6), - obj_frame_tiles(gFieldObjectPic_Boy4_7), - obj_frame_tiles(gFieldObjectPic_Boy4_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Woman1[] = { - obj_frame_tiles(gFieldObjectPic_Woman1_0), - obj_frame_tiles(gFieldObjectPic_Woman1_1), - obj_frame_tiles(gFieldObjectPic_Woman1_2), - obj_frame_tiles(gFieldObjectPic_Woman1_3), - obj_frame_tiles(gFieldObjectPic_Woman1_4), - obj_frame_tiles(gFieldObjectPic_Woman1_5), - obj_frame_tiles(gFieldObjectPic_Woman1_6), - obj_frame_tiles(gFieldObjectPic_Woman1_7), - obj_frame_tiles(gFieldObjectPic_Woman1_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_FatMan[] = { - obj_frame_tiles(gFieldObjectPic_FatMan_0), - obj_frame_tiles(gFieldObjectPic_FatMan_1), - obj_frame_tiles(gFieldObjectPic_FatMan_2), - obj_frame_tiles(gFieldObjectPic_FatMan_3), - obj_frame_tiles(gFieldObjectPic_FatMan_4), - obj_frame_tiles(gFieldObjectPic_FatMan_5), - obj_frame_tiles(gFieldObjectPic_FatMan_6), - obj_frame_tiles(gFieldObjectPic_FatMan_7), - obj_frame_tiles(gFieldObjectPic_FatMan_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Woman2[] = { - obj_frame_tiles(gFieldObjectPic_Woman2_0), - obj_frame_tiles(gFieldObjectPic_Woman2_1), - obj_frame_tiles(gFieldObjectPic_Woman2_2), - obj_frame_tiles(gFieldObjectPic_Woman2_3), - obj_frame_tiles(gFieldObjectPic_Woman2_4), - obj_frame_tiles(gFieldObjectPic_Woman2_5), - obj_frame_tiles(gFieldObjectPic_Woman2_6), - obj_frame_tiles(gFieldObjectPic_Woman2_7), - obj_frame_tiles(gFieldObjectPic_Woman2_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Man1[] = { - obj_frame_tiles(gFieldObjectPic_Man1_0), - obj_frame_tiles(gFieldObjectPic_Man1_1), - obj_frame_tiles(gFieldObjectPic_Man1_2), - obj_frame_tiles(gFieldObjectPic_Man1_3), - obj_frame_tiles(gFieldObjectPic_Man1_4), - obj_frame_tiles(gFieldObjectPic_Man1_5), - obj_frame_tiles(gFieldObjectPic_Man1_6), - obj_frame_tiles(gFieldObjectPic_Man1_7), - obj_frame_tiles(gFieldObjectPic_Man1_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Woman3[] = { - obj_frame_tiles(gFieldObjectPic_Woman3_0), - obj_frame_tiles(gFieldObjectPic_Woman3_1), - obj_frame_tiles(gFieldObjectPic_Woman3_2), - obj_frame_tiles(gFieldObjectPic_Woman3_3), - obj_frame_tiles(gFieldObjectPic_Woman3_4), - obj_frame_tiles(gFieldObjectPic_Woman3_5), - obj_frame_tiles(gFieldObjectPic_Woman3_6), - obj_frame_tiles(gFieldObjectPic_Woman3_7), - obj_frame_tiles(gFieldObjectPic_Woman3_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_OldMan1[] = { - obj_frame_tiles(gFieldObjectPic_OldMan1_0), - obj_frame_tiles(gFieldObjectPic_OldMan1_1), - obj_frame_tiles(gFieldObjectPic_OldMan1_2), - obj_frame_tiles(gFieldObjectPic_OldMan1_3), - obj_frame_tiles(gFieldObjectPic_OldMan1_4), - obj_frame_tiles(gFieldObjectPic_OldMan1_5), - obj_frame_tiles(gFieldObjectPic_OldMan1_6), - obj_frame_tiles(gFieldObjectPic_OldMan1_7), - obj_frame_tiles(gFieldObjectPic_OldMan1_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_OldWoman1[] = { - obj_frame_tiles(gFieldObjectPic_OldWoman1_0), - obj_frame_tiles(gFieldObjectPic_OldWoman1_1), - obj_frame_tiles(gFieldObjectPic_OldWoman1_2), - obj_frame_tiles(gFieldObjectPic_OldWoman1_3), - obj_frame_tiles(gFieldObjectPic_OldWoman1_4), - obj_frame_tiles(gFieldObjectPic_OldWoman1_5), - obj_frame_tiles(gFieldObjectPic_OldWoman1_6), - obj_frame_tiles(gFieldObjectPic_OldWoman1_7), - obj_frame_tiles(gFieldObjectPic_OldWoman1_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Man2[] = { - obj_frame_tiles(gFieldObjectPic_Man2_0), - obj_frame_tiles(gFieldObjectPic_Man2_1), - obj_frame_tiles(gFieldObjectPic_Man2_2), - obj_frame_tiles(gFieldObjectPic_Man2_3), - obj_frame_tiles(gFieldObjectPic_Man2_4), - obj_frame_tiles(gFieldObjectPic_Man2_5), - obj_frame_tiles(gFieldObjectPic_Man2_6), - obj_frame_tiles(gFieldObjectPic_Man2_7), - obj_frame_tiles(gFieldObjectPic_Man2_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Woman4[] = { - obj_frame_tiles(gFieldObjectPic_Woman4_0), - obj_frame_tiles(gFieldObjectPic_Woman4_1), - obj_frame_tiles(gFieldObjectPic_Woman4_2), - obj_frame_tiles(gFieldObjectPic_Woman4_3), - obj_frame_tiles(gFieldObjectPic_Woman4_4), - obj_frame_tiles(gFieldObjectPic_Woman4_5), - obj_frame_tiles(gFieldObjectPic_Woman4_6), - obj_frame_tiles(gFieldObjectPic_Woman4_7), - obj_frame_tiles(gFieldObjectPic_Woman4_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Man3[] = { - obj_frame_tiles(gFieldObjectPic_Man3_0), - obj_frame_tiles(gFieldObjectPic_Man3_1), - obj_frame_tiles(gFieldObjectPic_Man3_2), - obj_frame_tiles(gFieldObjectPic_Man3_3), - obj_frame_tiles(gFieldObjectPic_Man3_4), - obj_frame_tiles(gFieldObjectPic_Man3_5), - obj_frame_tiles(gFieldObjectPic_Man3_6), - obj_frame_tiles(gFieldObjectPic_Man3_7), - obj_frame_tiles(gFieldObjectPic_Man3_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Woman5[] = { - obj_frame_tiles(gFieldObjectPic_Woman5_0), - obj_frame_tiles(gFieldObjectPic_Woman5_1), - obj_frame_tiles(gFieldObjectPic_Woman5_2), - obj_frame_tiles(gFieldObjectPic_Woman5_3), - obj_frame_tiles(gFieldObjectPic_Woman5_4), - obj_frame_tiles(gFieldObjectPic_Woman5_5), - obj_frame_tiles(gFieldObjectPic_Woman5_6), - obj_frame_tiles(gFieldObjectPic_Woman5_7), - obj_frame_tiles(gFieldObjectPic_Woman5_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Cook[] = { - obj_frame_tiles(gFieldObjectPic_Cook_0), - obj_frame_tiles(gFieldObjectPic_Cook_1), - obj_frame_tiles(gFieldObjectPic_Cook_2), - obj_frame_tiles(gFieldObjectPic_Cook_0), - obj_frame_tiles(gFieldObjectPic_Cook_0), - obj_frame_tiles(gFieldObjectPic_Cook_1), - obj_frame_tiles(gFieldObjectPic_Cook_1), - obj_frame_tiles(gFieldObjectPic_Cook_2), - obj_frame_tiles(gFieldObjectPic_Cook_2), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Woman6[] = { - obj_frame_tiles(gFieldObjectPic_Woman6_0), - obj_frame_tiles(gFieldObjectPic_Woman6_1), - obj_frame_tiles(gFieldObjectPic_Woman6_2), - obj_frame_tiles(gFieldObjectPic_Woman6_3), - obj_frame_tiles(gFieldObjectPic_Woman6_4), - obj_frame_tiles(gFieldObjectPic_Woman6_5), - obj_frame_tiles(gFieldObjectPic_Woman6_6), - obj_frame_tiles(gFieldObjectPic_Woman6_7), - obj_frame_tiles(gFieldObjectPic_Woman6_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_OldMan2[] = { - obj_frame_tiles(gFieldObjectPic_OldMan2_0), - obj_frame_tiles(gFieldObjectPic_OldMan2_1), - obj_frame_tiles(gFieldObjectPic_OldMan2_2), - obj_frame_tiles(gFieldObjectPic_OldMan2_0), - obj_frame_tiles(gFieldObjectPic_OldMan2_0), - obj_frame_tiles(gFieldObjectPic_OldMan2_1), - obj_frame_tiles(gFieldObjectPic_OldMan2_1), - obj_frame_tiles(gFieldObjectPic_OldMan2_2), - obj_frame_tiles(gFieldObjectPic_OldMan2_2), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_OldWoman2[] = { - obj_frame_tiles(gFieldObjectPic_OldWoman2_0), - obj_frame_tiles(gFieldObjectPic_OldWoman2_1), - obj_frame_tiles(gFieldObjectPic_OldWoman2_2), - obj_frame_tiles(gFieldObjectPic_OldWoman2_3), - obj_frame_tiles(gFieldObjectPic_OldWoman2_4), - obj_frame_tiles(gFieldObjectPic_OldWoman2_5), - obj_frame_tiles(gFieldObjectPic_OldWoman2_6), - obj_frame_tiles(gFieldObjectPic_OldWoman2_7), - obj_frame_tiles(gFieldObjectPic_OldWoman2_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Camper[] = { - obj_frame_tiles(gFieldObjectPic_Camper_0), - obj_frame_tiles(gFieldObjectPic_Camper_1), - obj_frame_tiles(gFieldObjectPic_Camper_2), - obj_frame_tiles(gFieldObjectPic_Camper_3), - obj_frame_tiles(gFieldObjectPic_Camper_4), - obj_frame_tiles(gFieldObjectPic_Camper_5), - obj_frame_tiles(gFieldObjectPic_Camper_6), - obj_frame_tiles(gFieldObjectPic_Camper_7), - obj_frame_tiles(gFieldObjectPic_Camper_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Picnicker[] = { - obj_frame_tiles(gFieldObjectPic_Picnicker_0), - obj_frame_tiles(gFieldObjectPic_Picnicker_1), - obj_frame_tiles(gFieldObjectPic_Picnicker_2), - obj_frame_tiles(gFieldObjectPic_Picnicker_3), - obj_frame_tiles(gFieldObjectPic_Picnicker_4), - obj_frame_tiles(gFieldObjectPic_Picnicker_5), - obj_frame_tiles(gFieldObjectPic_Picnicker_6), - obj_frame_tiles(gFieldObjectPic_Picnicker_7), - obj_frame_tiles(gFieldObjectPic_Picnicker_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Man4[] = { - obj_frame_tiles(gFieldObjectPic_Man4_0), - obj_frame_tiles(gFieldObjectPic_Man4_1), - obj_frame_tiles(gFieldObjectPic_Man4_2), - obj_frame_tiles(gFieldObjectPic_Man4_3), - obj_frame_tiles(gFieldObjectPic_Man4_4), - obj_frame_tiles(gFieldObjectPic_Man4_5), - obj_frame_tiles(gFieldObjectPic_Man4_6), - obj_frame_tiles(gFieldObjectPic_Man4_7), - obj_frame_tiles(gFieldObjectPic_Man4_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Woman7[] = { - obj_frame_tiles(gFieldObjectPic_Woman7_0), - obj_frame_tiles(gFieldObjectPic_Woman7_1), - obj_frame_tiles(gFieldObjectPic_Woman7_2), - obj_frame_tiles(gFieldObjectPic_Woman7_3), - obj_frame_tiles(gFieldObjectPic_Woman7_4), - obj_frame_tiles(gFieldObjectPic_Woman7_5), - obj_frame_tiles(gFieldObjectPic_Woman7_6), - obj_frame_tiles(gFieldObjectPic_Woman7_7), - obj_frame_tiles(gFieldObjectPic_Woman7_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Youngster[] = { - obj_frame_tiles(gFieldObjectPic_Youngster_0), - obj_frame_tiles(gFieldObjectPic_Youngster_1), - obj_frame_tiles(gFieldObjectPic_Youngster_2), - obj_frame_tiles(gFieldObjectPic_Youngster_3), - obj_frame_tiles(gFieldObjectPic_Youngster_4), - obj_frame_tiles(gFieldObjectPic_Youngster_5), - obj_frame_tiles(gFieldObjectPic_Youngster_6), - obj_frame_tiles(gFieldObjectPic_Youngster_7), - obj_frame_tiles(gFieldObjectPic_Youngster_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_BugCatcher[] = { - obj_frame_tiles(gFieldObjectPic_BugCatcher_0), - obj_frame_tiles(gFieldObjectPic_BugCatcher_1), - obj_frame_tiles(gFieldObjectPic_BugCatcher_2), - obj_frame_tiles(gFieldObjectPic_BugCatcher_3), - obj_frame_tiles(gFieldObjectPic_BugCatcher_4), - obj_frame_tiles(gFieldObjectPic_BugCatcher_5), - obj_frame_tiles(gFieldObjectPic_BugCatcher_6), - obj_frame_tiles(gFieldObjectPic_BugCatcher_7), - obj_frame_tiles(gFieldObjectPic_BugCatcher_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_PsychicM[] = { - obj_frame_tiles(gFieldObjectPic_PsychicM_0), - obj_frame_tiles(gFieldObjectPic_PsychicM_1), - obj_frame_tiles(gFieldObjectPic_PsychicM_2), - obj_frame_tiles(gFieldObjectPic_PsychicM_3), - obj_frame_tiles(gFieldObjectPic_PsychicM_4), - obj_frame_tiles(gFieldObjectPic_PsychicM_5), - obj_frame_tiles(gFieldObjectPic_PsychicM_6), - obj_frame_tiles(gFieldObjectPic_PsychicM_7), - obj_frame_tiles(gFieldObjectPic_PsychicM_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_SchoolKidM[] = { - obj_frame_tiles(gFieldObjectPic_SchoolKidM_0), - obj_frame_tiles(gFieldObjectPic_SchoolKidM_1), - obj_frame_tiles(gFieldObjectPic_SchoolKidM_2), - obj_frame_tiles(gFieldObjectPic_SchoolKidM_3), - obj_frame_tiles(gFieldObjectPic_SchoolKidM_4), - obj_frame_tiles(gFieldObjectPic_SchoolKidM_5), - obj_frame_tiles(gFieldObjectPic_SchoolKidM_6), - obj_frame_tiles(gFieldObjectPic_SchoolKidM_7), - obj_frame_tiles(gFieldObjectPic_SchoolKidM_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Maniac[] = { - obj_frame_tiles(gFieldObjectPic_Maniac_0), - obj_frame_tiles(gFieldObjectPic_Maniac_1), - obj_frame_tiles(gFieldObjectPic_Maniac_2), - obj_frame_tiles(gFieldObjectPic_Maniac_3), - obj_frame_tiles(gFieldObjectPic_Maniac_4), - obj_frame_tiles(gFieldObjectPic_Maniac_5), - obj_frame_tiles(gFieldObjectPic_Maniac_6), - obj_frame_tiles(gFieldObjectPic_Maniac_7), - obj_frame_tiles(gFieldObjectPic_Maniac_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_HexManiac[] = { - obj_frame_tiles(gFieldObjectPic_HexManiac_0), - obj_frame_tiles(gFieldObjectPic_HexManiac_1), - obj_frame_tiles(gFieldObjectPic_HexManiac_2), - obj_frame_tiles(gFieldObjectPic_HexManiac_3), - obj_frame_tiles(gFieldObjectPic_HexManiac_4), - obj_frame_tiles(gFieldObjectPic_HexManiac_5), - obj_frame_tiles(gFieldObjectPic_HexManiac_6), - obj_frame_tiles(gFieldObjectPic_HexManiac_7), - obj_frame_tiles(gFieldObjectPic_HexManiac_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_SwimmerM[] = { - obj_frame_tiles(gFieldObjectPic_SwimmerM_0), - obj_frame_tiles(gFieldObjectPic_SwimmerM_1), - obj_frame_tiles(gFieldObjectPic_SwimmerM_2), - obj_frame_tiles(gFieldObjectPic_SwimmerM_3), - obj_frame_tiles(gFieldObjectPic_SwimmerM_4), - obj_frame_tiles(gFieldObjectPic_SwimmerM_5), - obj_frame_tiles(gFieldObjectPic_SwimmerM_6), - obj_frame_tiles(gFieldObjectPic_SwimmerM_7), - obj_frame_tiles(gFieldObjectPic_SwimmerM_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_SwimmerF[] = { - obj_frame_tiles(gFieldObjectPic_SwimmerF_0), - obj_frame_tiles(gFieldObjectPic_SwimmerF_1), - obj_frame_tiles(gFieldObjectPic_SwimmerF_2), - obj_frame_tiles(gFieldObjectPic_SwimmerF_3), - obj_frame_tiles(gFieldObjectPic_SwimmerF_4), - obj_frame_tiles(gFieldObjectPic_SwimmerF_5), - obj_frame_tiles(gFieldObjectPic_SwimmerF_6), - obj_frame_tiles(gFieldObjectPic_SwimmerF_7), - obj_frame_tiles(gFieldObjectPic_SwimmerF_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_BlackBelt[] = { - obj_frame_tiles(gFieldObjectPic_BlackBelt_0), - obj_frame_tiles(gFieldObjectPic_BlackBelt_1), - obj_frame_tiles(gFieldObjectPic_BlackBelt_2), - obj_frame_tiles(gFieldObjectPic_BlackBelt_3), - obj_frame_tiles(gFieldObjectPic_BlackBelt_4), - obj_frame_tiles(gFieldObjectPic_BlackBelt_5), - obj_frame_tiles(gFieldObjectPic_BlackBelt_6), - obj_frame_tiles(gFieldObjectPic_BlackBelt_7), - obj_frame_tiles(gFieldObjectPic_BlackBelt_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Beauty[] = { - obj_frame_tiles(gFieldObjectPic_Beauty_0), - obj_frame_tiles(gFieldObjectPic_Beauty_1), - obj_frame_tiles(gFieldObjectPic_Beauty_2), - obj_frame_tiles(gFieldObjectPic_Beauty_3), - obj_frame_tiles(gFieldObjectPic_Beauty_4), - obj_frame_tiles(gFieldObjectPic_Beauty_5), - obj_frame_tiles(gFieldObjectPic_Beauty_6), - obj_frame_tiles(gFieldObjectPic_Beauty_7), - obj_frame_tiles(gFieldObjectPic_Beauty_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Scientist1[] = { - obj_frame_tiles(gFieldObjectPic_Scientist1_0), - obj_frame_tiles(gFieldObjectPic_Scientist1_1), - obj_frame_tiles(gFieldObjectPic_Scientist1_2), - obj_frame_tiles(gFieldObjectPic_Scientist1_3), - obj_frame_tiles(gFieldObjectPic_Scientist1_4), - obj_frame_tiles(gFieldObjectPic_Scientist1_5), - obj_frame_tiles(gFieldObjectPic_Scientist1_6), - obj_frame_tiles(gFieldObjectPic_Scientist1_7), - obj_frame_tiles(gFieldObjectPic_Scientist1_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Lass[] = { - obj_frame_tiles(gFieldObjectPic_Lass_0), - obj_frame_tiles(gFieldObjectPic_Lass_1), - obj_frame_tiles(gFieldObjectPic_Lass_2), - obj_frame_tiles(gFieldObjectPic_Lass_3), - obj_frame_tiles(gFieldObjectPic_Lass_4), - obj_frame_tiles(gFieldObjectPic_Lass_5), - obj_frame_tiles(gFieldObjectPic_Lass_6), - obj_frame_tiles(gFieldObjectPic_Lass_7), - obj_frame_tiles(gFieldObjectPic_Lass_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Gentleman[] = { - obj_frame_tiles(gFieldObjectPic_Gentleman_0), - obj_frame_tiles(gFieldObjectPic_Gentleman_1), - obj_frame_tiles(gFieldObjectPic_Gentleman_2), - obj_frame_tiles(gFieldObjectPic_Gentleman_3), - obj_frame_tiles(gFieldObjectPic_Gentleman_4), - obj_frame_tiles(gFieldObjectPic_Gentleman_5), - obj_frame_tiles(gFieldObjectPic_Gentleman_6), - obj_frame_tiles(gFieldObjectPic_Gentleman_7), - obj_frame_tiles(gFieldObjectPic_Gentleman_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Sailor[] = { - obj_frame_tiles(gFieldObjectPic_Sailor_0), - obj_frame_tiles(gFieldObjectPic_Sailor_1), - obj_frame_tiles(gFieldObjectPic_Sailor_2), - obj_frame_tiles(gFieldObjectPic_Sailor_3), - obj_frame_tiles(gFieldObjectPic_Sailor_4), - obj_frame_tiles(gFieldObjectPic_Sailor_5), - obj_frame_tiles(gFieldObjectPic_Sailor_6), - obj_frame_tiles(gFieldObjectPic_Sailor_7), - obj_frame_tiles(gFieldObjectPic_Sailor_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Fisherman[] = { - obj_frame_tiles(gFieldObjectPic_Fisherman_0), - obj_frame_tiles(gFieldObjectPic_Fisherman_1), - obj_frame_tiles(gFieldObjectPic_Fisherman_2), - obj_frame_tiles(gFieldObjectPic_Fisherman_3), - obj_frame_tiles(gFieldObjectPic_Fisherman_4), - obj_frame_tiles(gFieldObjectPic_Fisherman_5), - obj_frame_tiles(gFieldObjectPic_Fisherman_6), - obj_frame_tiles(gFieldObjectPic_Fisherman_7), - obj_frame_tiles(gFieldObjectPic_Fisherman_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_RunningTriathleteM[] = { - obj_frame_tiles(gFieldObjectPic_RunningTriathleteM_0), - obj_frame_tiles(gFieldObjectPic_RunningTriathleteM_1), - obj_frame_tiles(gFieldObjectPic_RunningTriathleteM_2), - obj_frame_tiles(gFieldObjectPic_RunningTriathleteM_3), - obj_frame_tiles(gFieldObjectPic_RunningTriathleteM_4), - obj_frame_tiles(gFieldObjectPic_RunningTriathleteM_5), - obj_frame_tiles(gFieldObjectPic_RunningTriathleteM_6), - obj_frame_tiles(gFieldObjectPic_RunningTriathleteM_7), - obj_frame_tiles(gFieldObjectPic_RunningTriathleteM_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_RunningTriathleteF[] = { - obj_frame_tiles(gFieldObjectPic_RunningTriathleteF_0), - obj_frame_tiles(gFieldObjectPic_RunningTriathleteF_1), - obj_frame_tiles(gFieldObjectPic_RunningTriathleteF_2), - obj_frame_tiles(gFieldObjectPic_RunningTriathleteF_3), - obj_frame_tiles(gFieldObjectPic_RunningTriathleteF_4), - obj_frame_tiles(gFieldObjectPic_RunningTriathleteF_5), - obj_frame_tiles(gFieldObjectPic_RunningTriathleteF_6), - obj_frame_tiles(gFieldObjectPic_RunningTriathleteF_7), - obj_frame_tiles(gFieldObjectPic_RunningTriathleteF_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_TuberF[] = { - obj_frame_tiles(gFieldObjectPic_TuberF_0), - obj_frame_tiles(gFieldObjectPic_TuberF_1), - obj_frame_tiles(gFieldObjectPic_TuberF_2), - obj_frame_tiles(gFieldObjectPic_TuberF_3), - obj_frame_tiles(gFieldObjectPic_TuberF_4), - obj_frame_tiles(gFieldObjectPic_TuberF_5), - obj_frame_tiles(gFieldObjectPic_TuberF_6), - obj_frame_tiles(gFieldObjectPic_TuberF_7), - obj_frame_tiles(gFieldObjectPic_TuberF_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_TuberM[] = { - obj_frame_tiles(gFieldObjectPic_TuberM_0), - obj_frame_tiles(gFieldObjectPic_TuberM_1), - obj_frame_tiles(gFieldObjectPic_TuberM_2), - obj_frame_tiles(gFieldObjectPic_TuberM_3), - obj_frame_tiles(gFieldObjectPic_TuberM_4), - obj_frame_tiles(gFieldObjectPic_TuberM_5), - obj_frame_tiles(gFieldObjectPic_TuberM_6), - obj_frame_tiles(gFieldObjectPic_TuberM_7), - obj_frame_tiles(gFieldObjectPic_TuberM_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Hiker[] = { - obj_frame_tiles(gFieldObjectPic_Hiker_0), - obj_frame_tiles(gFieldObjectPic_Hiker_1), - obj_frame_tiles(gFieldObjectPic_Hiker_2), - obj_frame_tiles(gFieldObjectPic_Hiker_3), - obj_frame_tiles(gFieldObjectPic_Hiker_4), - obj_frame_tiles(gFieldObjectPic_Hiker_5), - obj_frame_tiles(gFieldObjectPic_Hiker_6), - obj_frame_tiles(gFieldObjectPic_Hiker_7), - obj_frame_tiles(gFieldObjectPic_Hiker_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_CyclingTriathleteM[] = { - obj_frame_tiles(gFieldObjectPic_CyclingTriathleteM_0), - obj_frame_tiles(gFieldObjectPic_CyclingTriathleteM_1), - obj_frame_tiles(gFieldObjectPic_CyclingTriathleteM_2), - obj_frame_tiles(gFieldObjectPic_CyclingTriathleteM_3), - obj_frame_tiles(gFieldObjectPic_CyclingTriathleteM_4), - obj_frame_tiles(gFieldObjectPic_CyclingTriathleteM_5), - obj_frame_tiles(gFieldObjectPic_CyclingTriathleteM_6), - obj_frame_tiles(gFieldObjectPic_CyclingTriathleteM_7), - obj_frame_tiles(gFieldObjectPic_CyclingTriathleteM_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_CyclingTriathleteF[] = { - obj_frame_tiles(gFieldObjectPic_CyclingTriathleteF_0), - obj_frame_tiles(gFieldObjectPic_CyclingTriathleteF_1), - obj_frame_tiles(gFieldObjectPic_CyclingTriathleteF_2), - obj_frame_tiles(gFieldObjectPic_CyclingTriathleteF_3), - obj_frame_tiles(gFieldObjectPic_CyclingTriathleteF_4), - obj_frame_tiles(gFieldObjectPic_CyclingTriathleteF_5), - obj_frame_tiles(gFieldObjectPic_CyclingTriathleteF_6), - obj_frame_tiles(gFieldObjectPic_CyclingTriathleteF_7), - obj_frame_tiles(gFieldObjectPic_CyclingTriathleteF_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Nurse[] = { - obj_frame_tiles(gFieldObjectPic_Nurse_0), - obj_frame_tiles(gFieldObjectPic_Nurse_1), - obj_frame_tiles(gFieldObjectPic_Nurse_2), - obj_frame_tiles(gFieldObjectPic_Nurse_0), - obj_frame_tiles(gFieldObjectPic_Nurse_0), - obj_frame_tiles(gFieldObjectPic_Nurse_1), - obj_frame_tiles(gFieldObjectPic_Nurse_1), - obj_frame_tiles(gFieldObjectPic_Nurse_2), - obj_frame_tiles(gFieldObjectPic_Nurse_2), - obj_frame_tiles(gFieldObjectPic_Nurse_3), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_ItemBall[] = { - obj_frame_tiles(gFieldObjectPic_ItemBall), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_ProfBirch[] = { - obj_frame_tiles(gFieldObjectPic_ProfBirch_0), - obj_frame_tiles(gFieldObjectPic_ProfBirch_1), - obj_frame_tiles(gFieldObjectPic_ProfBirch_2), - obj_frame_tiles(gFieldObjectPic_ProfBirch_3), - obj_frame_tiles(gFieldObjectPic_ProfBirch_4), - obj_frame_tiles(gFieldObjectPic_ProfBirch_5), - obj_frame_tiles(gFieldObjectPic_ProfBirch_6), - obj_frame_tiles(gFieldObjectPic_ProfBirch_7), - obj_frame_tiles(gFieldObjectPic_ProfBirch_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Man5[] = { - obj_frame_tiles(gFieldObjectPic_Man5_0), - obj_frame_tiles(gFieldObjectPic_Man5_1), - obj_frame_tiles(gFieldObjectPic_Man5_2), - obj_frame_tiles(gFieldObjectPic_Man5_3), - obj_frame_tiles(gFieldObjectPic_Man5_4), - obj_frame_tiles(gFieldObjectPic_Man5_5), - obj_frame_tiles(gFieldObjectPic_Man5_6), - obj_frame_tiles(gFieldObjectPic_Man5_7), - obj_frame_tiles(gFieldObjectPic_Man5_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Man6[] = { - obj_frame_tiles(gFieldObjectPic_Man6_0), - obj_frame_tiles(gFieldObjectPic_Man6_1), - obj_frame_tiles(gFieldObjectPic_Man6_2), - obj_frame_tiles(gFieldObjectPic_Man6_3), - obj_frame_tiles(gFieldObjectPic_Man6_4), - obj_frame_tiles(gFieldObjectPic_Man6_5), - obj_frame_tiles(gFieldObjectPic_Man6_6), - obj_frame_tiles(gFieldObjectPic_Man6_7), - obj_frame_tiles(gFieldObjectPic_Man6_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_ReporterM[] = { - obj_frame_tiles(gFieldObjectPic_ReporterM_0), - obj_frame_tiles(gFieldObjectPic_ReporterM_1), - obj_frame_tiles(gFieldObjectPic_ReporterM_2), - obj_frame_tiles(gFieldObjectPic_ReporterM_3), - obj_frame_tiles(gFieldObjectPic_ReporterM_4), - obj_frame_tiles(gFieldObjectPic_ReporterM_5), - obj_frame_tiles(gFieldObjectPic_ReporterM_6), - obj_frame_tiles(gFieldObjectPic_ReporterM_7), - obj_frame_tiles(gFieldObjectPic_ReporterM_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_ReporterF[] = { - obj_frame_tiles(gFieldObjectPic_ReporterF_0), - obj_frame_tiles(gFieldObjectPic_ReporterF_1), - obj_frame_tiles(gFieldObjectPic_ReporterF_2), - obj_frame_tiles(gFieldObjectPic_ReporterF_3), - obj_frame_tiles(gFieldObjectPic_ReporterF_4), - obj_frame_tiles(gFieldObjectPic_ReporterF_5), - obj_frame_tiles(gFieldObjectPic_ReporterF_6), - obj_frame_tiles(gFieldObjectPic_ReporterF_7), - obj_frame_tiles(gFieldObjectPic_ReporterF_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_MauvilleOldMan1[] = { - obj_frame_tiles(gFieldObjectPic_MauvilleOldMan1_0), - obj_frame_tiles(gFieldObjectPic_MauvilleOldMan1_1), - obj_frame_tiles(gFieldObjectPic_MauvilleOldMan1_2), - obj_frame_tiles(gFieldObjectPic_MauvilleOldMan1_3), - obj_frame_tiles(gFieldObjectPic_MauvilleOldMan1_4), - obj_frame_tiles(gFieldObjectPic_MauvilleOldMan1_5), - obj_frame_tiles(gFieldObjectPic_MauvilleOldMan1_6), - obj_frame_tiles(gFieldObjectPic_MauvilleOldMan1_7), - obj_frame_tiles(gFieldObjectPic_MauvilleOldMan1_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_MauvilleOldMan2[] = { - obj_frame_tiles(gFieldObjectPic_MauvilleOldMan2_0), - obj_frame_tiles(gFieldObjectPic_MauvilleOldMan2_1), - obj_frame_tiles(gFieldObjectPic_MauvilleOldMan2_2), - obj_frame_tiles(gFieldObjectPic_MauvilleOldMan2_3), - obj_frame_tiles(gFieldObjectPic_MauvilleOldMan2_4), - obj_frame_tiles(gFieldObjectPic_MauvilleOldMan2_5), - obj_frame_tiles(gFieldObjectPic_MauvilleOldMan2_6), - obj_frame_tiles(gFieldObjectPic_MauvilleOldMan2_7), - obj_frame_tiles(gFieldObjectPic_MauvilleOldMan2_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_UnusedNatuDoll[] = { - obj_frame_tiles(gFieldObjectPic_UnusedNatuDoll), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_UnusedMagnemiteDoll[] = { - obj_frame_tiles(gFieldObjectPic_UnusedMagnemiteDoll), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_UnusedSquirtleDoll[] = { - obj_frame_tiles(gFieldObjectPic_UnusedSquirtleDoll), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_UnusedWooperDoll[] = { - obj_frame_tiles(gFieldObjectPic_UnusedWooperDoll), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_UnusedPikachuDoll[] = { - obj_frame_tiles(gFieldObjectPic_UnusedPikachuDoll), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_UnusedPorygon2Doll[] = { - obj_frame_tiles(gFieldObjectPic_UnusedPorygon2Doll), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_CuttableTree[] = { - obj_frame_tiles(gFieldObjectPic_CuttableTree_0), - obj_frame_tiles(gFieldObjectPic_CuttableTree_1), - obj_frame_tiles(gFieldObjectPic_CuttableTree_2), - obj_frame_tiles(gFieldObjectPic_CuttableTree_3), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_MartEmployee[] = { - obj_frame_tiles(gFieldObjectPic_MartEmployee_0), - obj_frame_tiles(gFieldObjectPic_MartEmployee_1), - obj_frame_tiles(gFieldObjectPic_MartEmployee_2), - obj_frame_tiles(gFieldObjectPic_MartEmployee_3), - obj_frame_tiles(gFieldObjectPic_MartEmployee_4), - obj_frame_tiles(gFieldObjectPic_MartEmployee_5), - obj_frame_tiles(gFieldObjectPic_MartEmployee_6), - obj_frame_tiles(gFieldObjectPic_MartEmployee_7), - obj_frame_tiles(gFieldObjectPic_MartEmployee_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_RooftopSaleWoman[] = { - obj_frame_tiles(gFieldObjectPic_RooftopSaleWoman_0), - obj_frame_tiles(gFieldObjectPic_RooftopSaleWoman_1), - obj_frame_tiles(gFieldObjectPic_RooftopSaleWoman_2), - obj_frame_tiles(gFieldObjectPic_RooftopSaleWoman_3), - obj_frame_tiles(gFieldObjectPic_RooftopSaleWoman_4), - obj_frame_tiles(gFieldObjectPic_RooftopSaleWoman_5), - obj_frame_tiles(gFieldObjectPic_RooftopSaleWoman_6), - obj_frame_tiles(gFieldObjectPic_RooftopSaleWoman_7), - obj_frame_tiles(gFieldObjectPic_RooftopSaleWoman_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Teala[] = { - obj_frame_tiles(gFieldObjectPic_Teala_0), - obj_frame_tiles(gFieldObjectPic_Teala_1), - obj_frame_tiles(gFieldObjectPic_Teala_2), - obj_frame_tiles(gFieldObjectPic_Teala_3), - obj_frame_tiles(gFieldObjectPic_Teala_4), - obj_frame_tiles(gFieldObjectPic_Teala_5), - obj_frame_tiles(gFieldObjectPic_Teala_6), - obj_frame_tiles(gFieldObjectPic_Teala_7), - obj_frame_tiles(gFieldObjectPic_Teala_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_BreakableRock[] = { - obj_frame_tiles(gFieldObjectPic_BreakableRock_0), - obj_frame_tiles(gFieldObjectPic_BreakableRock_1), - obj_frame_tiles(gFieldObjectPic_BreakableRock_2), - obj_frame_tiles(gFieldObjectPic_BreakableRock_3), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_PushableBoulder[] = { - obj_frame_tiles(gFieldObjectPic_PushableBoulder), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_MrBrineysBoat[] = { - obj_frame_tiles(gFieldObjectPic_MrBrineysBoat_0), - obj_frame_tiles(gFieldObjectPic_MrBrineysBoat_1), - obj_frame_tiles(gFieldObjectPic_MrBrineysBoat_2), - obj_frame_tiles(gFieldObjectPic_MrBrineysBoat_0), - obj_frame_tiles(gFieldObjectPic_MrBrineysBoat_0), - obj_frame_tiles(gFieldObjectPic_MrBrineysBoat_1), - obj_frame_tiles(gFieldObjectPic_MrBrineysBoat_1), - obj_frame_tiles(gFieldObjectPic_MrBrineysBoat_2), - obj_frame_tiles(gFieldObjectPic_MrBrineysBoat_2), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Truck[] = { - obj_frame_tiles(gFieldObjectPic_Truck), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_VigorothCarryingBox[] = { - obj_frame_tiles(gFieldObjectPic_VigorothCarryingBox_0), - obj_frame_tiles(gFieldObjectPic_VigorothCarryingBox_0), - obj_frame_tiles(gFieldObjectPic_VigorothCarryingBox_0), - obj_frame_tiles(gFieldObjectPic_VigorothCarryingBox_1), - obj_frame_tiles(gFieldObjectPic_VigorothCarryingBox_2), - obj_frame_tiles(gFieldObjectPic_VigorothCarryingBox_1), - obj_frame_tiles(gFieldObjectPic_VigorothCarryingBox_2), - obj_frame_tiles(gFieldObjectPic_VigorothCarryingBox_1), - obj_frame_tiles(gFieldObjectPic_VigorothCarryingBox_2), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_VigorothFacingAway[] = { - obj_frame_tiles(gFieldObjectPic_VigorothFacingAway_0), - obj_frame_tiles(gFieldObjectPic_VigorothFacingAway_0), - obj_frame_tiles(gFieldObjectPic_VigorothFacingAway_0), - obj_frame_tiles(gFieldObjectPic_VigorothFacingAway_1), - obj_frame_tiles(gFieldObjectPic_VigorothFacingAway_1), - obj_frame_tiles(gFieldObjectPic_VigorothFacingAway_1), - obj_frame_tiles(gFieldObjectPic_VigorothFacingAway_1), - obj_frame_tiles(gFieldObjectPic_VigorothFacingAway_1), - obj_frame_tiles(gFieldObjectPic_VigorothFacingAway_1), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_BirchsBag[] = { - obj_frame_tiles(gFieldObjectPic_BirchsBag), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_EnemyZigzagoon[] = { - obj_frame_tiles(gFieldObjectPic_EnemyZigzagoon_0), - obj_frame_tiles(gFieldObjectPic_EnemyZigzagoon_1), - obj_frame_tiles(gFieldObjectPic_EnemyZigzagoon_2), - obj_frame_tiles(gFieldObjectPic_EnemyZigzagoon_3), - obj_frame_tiles(gFieldObjectPic_EnemyZigzagoon_4), - obj_frame_tiles(gFieldObjectPic_EnemyZigzagoon_5), - obj_frame_tiles(gFieldObjectPic_EnemyZigzagoon_6), - obj_frame_tiles(gFieldObjectPic_EnemyZigzagoon_7), - obj_frame_tiles(gFieldObjectPic_EnemyZigzagoon_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Poochyena[] = { - obj_frame_tiles(gFieldObjectPic_Poochyena_0), - obj_frame_tiles(gFieldObjectPic_Poochyena_1), - obj_frame_tiles(gFieldObjectPic_Poochyena_2), - obj_frame_tiles(gFieldObjectPic_Poochyena_3), - obj_frame_tiles(gFieldObjectPic_Poochyena_4), - obj_frame_tiles(gFieldObjectPic_Poochyena_5), - obj_frame_tiles(gFieldObjectPic_Poochyena_6), - obj_frame_tiles(gFieldObjectPic_Poochyena_7), - obj_frame_tiles(gFieldObjectPic_Poochyena_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Artist[] = { - obj_frame_tiles(gFieldObjectPic_Artist_0), - obj_frame_tiles(gFieldObjectPic_Artist_1), - obj_frame_tiles(gFieldObjectPic_Artist_2), - obj_frame_tiles(gFieldObjectPic_Artist_3), - obj_frame_tiles(gFieldObjectPic_Artist_4), - obj_frame_tiles(gFieldObjectPic_Artist_5), - obj_frame_tiles(gFieldObjectPic_Artist_6), - obj_frame_tiles(gFieldObjectPic_Artist_7), - obj_frame_tiles(gFieldObjectPic_Artist_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_MayNormal[] = { - obj_frame_tiles(gFieldObjectPic_MayNormal_0), - obj_frame_tiles(gFieldObjectPic_MayNormal_1), - obj_frame_tiles(gFieldObjectPic_MayNormal_2), - obj_frame_tiles(gFieldObjectPic_MayNormal_3), - obj_frame_tiles(gFieldObjectPic_MayNormal_4), - obj_frame_tiles(gFieldObjectPic_MayNormal_5), - obj_frame_tiles(gFieldObjectPic_MayNormal_6), - obj_frame_tiles(gFieldObjectPic_MayNormal_7), - obj_frame_tiles(gFieldObjectPic_MayNormal_8), - obj_frame_tiles(gFieldObjectPic_MayNormal_9), - obj_frame_tiles(gFieldObjectPic_MayNormal_10), - obj_frame_tiles(gFieldObjectPic_MayNormal_11), - obj_frame_tiles(gFieldObjectPic_MayNormal_12), - obj_frame_tiles(gFieldObjectPic_MayNormal_13), - obj_frame_tiles(gFieldObjectPic_MayNormal_14), - obj_frame_tiles(gFieldObjectPic_MayNormal_15), - obj_frame_tiles(gFieldObjectPic_MayNormal_16), - obj_frame_tiles(gFieldObjectPic_MayNormal_17), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_MayMachBike[] = { - obj_frame_tiles(gFieldObjectPic_MayMachBike_0), - obj_frame_tiles(gFieldObjectPic_MayMachBike_1), - obj_frame_tiles(gFieldObjectPic_MayMachBike_2), - obj_frame_tiles(gFieldObjectPic_MayMachBike_3), - obj_frame_tiles(gFieldObjectPic_MayMachBike_4), - obj_frame_tiles(gFieldObjectPic_MayMachBike_5), - obj_frame_tiles(gFieldObjectPic_MayMachBike_6), - obj_frame_tiles(gFieldObjectPic_MayMachBike_7), - obj_frame_tiles(gFieldObjectPic_MayMachBike_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_MayAcroBike[] = { - obj_frame_tiles(gFieldObjectPic_MayAcroBike_0), - obj_frame_tiles(gFieldObjectPic_MayAcroBike_1), - obj_frame_tiles(gFieldObjectPic_MayAcroBike_2), - obj_frame_tiles(gFieldObjectPic_MayAcroBike_3), - obj_frame_tiles(gFieldObjectPic_MayAcroBike_4), - obj_frame_tiles(gFieldObjectPic_MayAcroBike_5), - obj_frame_tiles(gFieldObjectPic_MayAcroBike_6), - obj_frame_tiles(gFieldObjectPic_MayAcroBike_7), - obj_frame_tiles(gFieldObjectPic_MayAcroBike_8), - obj_frame_tiles(gFieldObjectPic_MayAcroBike_9), - obj_frame_tiles(gFieldObjectPic_MayAcroBike_10), - obj_frame_tiles(gFieldObjectPic_MayAcroBike_11), - obj_frame_tiles(gFieldObjectPic_MayAcroBike_12), - obj_frame_tiles(gFieldObjectPic_MayAcroBike_13), - obj_frame_tiles(gFieldObjectPic_MayAcroBike_14), - obj_frame_tiles(gFieldObjectPic_MayAcroBike_15), - obj_frame_tiles(gFieldObjectPic_MayAcroBike_16), - obj_frame_tiles(gFieldObjectPic_MayAcroBike_17), - obj_frame_tiles(gFieldObjectPic_MayAcroBike_18), - obj_frame_tiles(gFieldObjectPic_MayAcroBike_19), - obj_frame_tiles(gFieldObjectPic_MayAcroBike_20), - obj_frame_tiles(gFieldObjectPic_MayAcroBike_21), - obj_frame_tiles(gFieldObjectPic_MayAcroBike_22), - obj_frame_tiles(gFieldObjectPic_MayAcroBike_23), - obj_frame_tiles(gFieldObjectPic_MayAcroBike_24), - obj_frame_tiles(gFieldObjectPic_MayAcroBike_25), - obj_frame_tiles(gFieldObjectPic_MayAcroBike_26), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_MaySurfing[] = { - obj_frame_tiles(gFieldObjectPic_MaySurfing_0), - obj_frame_tiles(gFieldObjectPic_MaySurfing_1), - obj_frame_tiles(gFieldObjectPic_MaySurfing_2), - obj_frame_tiles(gFieldObjectPic_MaySurfing_0), - obj_frame_tiles(gFieldObjectPic_MaySurfing_0), - obj_frame_tiles(gFieldObjectPic_MaySurfing_1), - obj_frame_tiles(gFieldObjectPic_MaySurfing_1), - obj_frame_tiles(gFieldObjectPic_MaySurfing_2), - obj_frame_tiles(gFieldObjectPic_MaySurfing_2), - obj_frame_tiles(gFieldObjectPic_MaySurfing_3), - obj_frame_tiles(gFieldObjectPic_MaySurfing_4), - obj_frame_tiles(gFieldObjectPic_MaySurfing_5), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_MayUnderwater[] = { - obj_frame_tiles(gFieldObjectPic_MayUnderwater_0), - obj_frame_tiles(gFieldObjectPic_MayUnderwater_1), - obj_frame_tiles(gFieldObjectPic_MayUnderwater_2), - obj_frame_tiles(gFieldObjectPic_MayUnderwater_0), - obj_frame_tiles(gFieldObjectPic_MayUnderwater_0), - obj_frame_tiles(gFieldObjectPic_MayUnderwater_1), - obj_frame_tiles(gFieldObjectPic_MayUnderwater_1), - obj_frame_tiles(gFieldObjectPic_MayUnderwater_2), - obj_frame_tiles(gFieldObjectPic_MayUnderwater_2), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_MayFieldMove[] = { - obj_frame_tiles(gFieldObjectPic_MayFieldMove_0), - obj_frame_tiles(gFieldObjectPic_MayFieldMove_1), - obj_frame_tiles(gFieldObjectPic_MayFieldMove_2), - obj_frame_tiles(gFieldObjectPic_MayFieldMove_3), - obj_frame_tiles(gFieldObjectPic_MayFieldMove_4), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Cameraman[] = { - obj_frame_tiles(gFieldObjectPic_Cameraman_0), - obj_frame_tiles(gFieldObjectPic_Cameraman_1), - obj_frame_tiles(gFieldObjectPic_Cameraman_2), - obj_frame_tiles(gFieldObjectPic_Cameraman_3), - obj_frame_tiles(gFieldObjectPic_Cameraman_4), - obj_frame_tiles(gFieldObjectPic_Cameraman_5), - obj_frame_tiles(gFieldObjectPic_Cameraman_6), - obj_frame_tiles(gFieldObjectPic_Cameraman_7), - obj_frame_tiles(gFieldObjectPic_Cameraman_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_MovingBox[] = { - obj_frame_tiles(gFieldObjectPic_MovingBox), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_CableCar[] = { - obj_frame_tiles(gFieldObjectPic_CableCar), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Scientist2[] = { - obj_frame_tiles(gFieldObjectPic_Scientist2_0), - obj_frame_tiles(gFieldObjectPic_Scientist2_1), - obj_frame_tiles(gFieldObjectPic_Scientist2_2), - obj_frame_tiles(gFieldObjectPic_Scientist2_3), - obj_frame_tiles(gFieldObjectPic_Scientist2_4), - obj_frame_tiles(gFieldObjectPic_Scientist2_5), - obj_frame_tiles(gFieldObjectPic_Scientist2_6), - obj_frame_tiles(gFieldObjectPic_Scientist2_7), - obj_frame_tiles(gFieldObjectPic_Scientist2_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Man7[] = { - obj_frame_tiles(gFieldObjectPic_Man7_0), - obj_frame_tiles(gFieldObjectPic_Man7_1), - obj_frame_tiles(gFieldObjectPic_Man7_2), - obj_frame_tiles(gFieldObjectPic_Man7_3), - obj_frame_tiles(gFieldObjectPic_Man7_4), - obj_frame_tiles(gFieldObjectPic_Man7_5), - obj_frame_tiles(gFieldObjectPic_Man7_6), - obj_frame_tiles(gFieldObjectPic_Man7_7), - obj_frame_tiles(gFieldObjectPic_Man7_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_AquaMemberM[] = { - obj_frame_tiles(gFieldObjectPic_AquaMemberM_0), - obj_frame_tiles(gFieldObjectPic_AquaMemberM_1), - obj_frame_tiles(gFieldObjectPic_AquaMemberM_2), - obj_frame_tiles(gFieldObjectPic_AquaMemberM_3), - obj_frame_tiles(gFieldObjectPic_AquaMemberM_4), - obj_frame_tiles(gFieldObjectPic_AquaMemberM_5), - obj_frame_tiles(gFieldObjectPic_AquaMemberM_6), - obj_frame_tiles(gFieldObjectPic_AquaMemberM_7), - obj_frame_tiles(gFieldObjectPic_AquaMemberM_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_AquaMemberF[] = { - obj_frame_tiles(gFieldObjectPic_AquaMemberF_0), - obj_frame_tiles(gFieldObjectPic_AquaMemberF_1), - obj_frame_tiles(gFieldObjectPic_AquaMemberF_2), - obj_frame_tiles(gFieldObjectPic_AquaMemberF_3), - obj_frame_tiles(gFieldObjectPic_AquaMemberF_4), - obj_frame_tiles(gFieldObjectPic_AquaMemberF_5), - obj_frame_tiles(gFieldObjectPic_AquaMemberF_6), - obj_frame_tiles(gFieldObjectPic_AquaMemberF_7), - obj_frame_tiles(gFieldObjectPic_AquaMemberF_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_MagmaMemberM[] = { - obj_frame_tiles(gFieldObjectPic_MagmaMemberM_0), - obj_frame_tiles(gFieldObjectPic_MagmaMemberM_1), - obj_frame_tiles(gFieldObjectPic_MagmaMemberM_2), - obj_frame_tiles(gFieldObjectPic_MagmaMemberM_3), - obj_frame_tiles(gFieldObjectPic_MagmaMemberM_4), - obj_frame_tiles(gFieldObjectPic_MagmaMemberM_5), - obj_frame_tiles(gFieldObjectPic_MagmaMemberM_6), - obj_frame_tiles(gFieldObjectPic_MagmaMemberM_7), - obj_frame_tiles(gFieldObjectPic_MagmaMemberM_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_MagmaMemberF[] = { - obj_frame_tiles(gFieldObjectPic_MagmaMemberF_0), - obj_frame_tiles(gFieldObjectPic_MagmaMemberF_1), - obj_frame_tiles(gFieldObjectPic_MagmaMemberF_2), - obj_frame_tiles(gFieldObjectPic_MagmaMemberF_3), - obj_frame_tiles(gFieldObjectPic_MagmaMemberF_4), - obj_frame_tiles(gFieldObjectPic_MagmaMemberF_5), - obj_frame_tiles(gFieldObjectPic_MagmaMemberF_6), - obj_frame_tiles(gFieldObjectPic_MagmaMemberF_7), - obj_frame_tiles(gFieldObjectPic_MagmaMemberF_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Sidney[] = { - obj_frame_tiles(gFieldObjectPic_Sidney_0), - obj_frame_tiles(gFieldObjectPic_Sidney_1), - obj_frame_tiles(gFieldObjectPic_Sidney_2), - obj_frame_tiles(gFieldObjectPic_Sidney_0), - obj_frame_tiles(gFieldObjectPic_Sidney_0), - obj_frame_tiles(gFieldObjectPic_Sidney_1), - obj_frame_tiles(gFieldObjectPic_Sidney_1), - obj_frame_tiles(gFieldObjectPic_Sidney_2), - obj_frame_tiles(gFieldObjectPic_Sidney_2), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Phoebe[] = { - obj_frame_tiles(gFieldObjectPic_Phoebe_0), - obj_frame_tiles(gFieldObjectPic_Phoebe_1), - obj_frame_tiles(gFieldObjectPic_Phoebe_2), - obj_frame_tiles(gFieldObjectPic_Phoebe_0), - obj_frame_tiles(gFieldObjectPic_Phoebe_0), - obj_frame_tiles(gFieldObjectPic_Phoebe_1), - obj_frame_tiles(gFieldObjectPic_Phoebe_1), - obj_frame_tiles(gFieldObjectPic_Phoebe_2), - obj_frame_tiles(gFieldObjectPic_Phoebe_2), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Glacia[] = { - obj_frame_tiles(gFieldObjectPic_Glacia_0), - obj_frame_tiles(gFieldObjectPic_Glacia_1), - obj_frame_tiles(gFieldObjectPic_Glacia_2), - obj_frame_tiles(gFieldObjectPic_Glacia_0), - obj_frame_tiles(gFieldObjectPic_Glacia_0), - obj_frame_tiles(gFieldObjectPic_Glacia_1), - obj_frame_tiles(gFieldObjectPic_Glacia_1), - obj_frame_tiles(gFieldObjectPic_Glacia_2), - obj_frame_tiles(gFieldObjectPic_Glacia_2), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Drake[] = { - obj_frame_tiles(gFieldObjectPic_Drake_0), - obj_frame_tiles(gFieldObjectPic_Drake_1), - obj_frame_tiles(gFieldObjectPic_Drake_2), - obj_frame_tiles(gFieldObjectPic_Drake_0), - obj_frame_tiles(gFieldObjectPic_Drake_0), - obj_frame_tiles(gFieldObjectPic_Drake_1), - obj_frame_tiles(gFieldObjectPic_Drake_1), - obj_frame_tiles(gFieldObjectPic_Drake_2), - obj_frame_tiles(gFieldObjectPic_Drake_2), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Roxanne[] = { - obj_frame_tiles(gFieldObjectPic_Roxanne_0), - obj_frame_tiles(gFieldObjectPic_Roxanne_1), - obj_frame_tiles(gFieldObjectPic_Roxanne_2), - obj_frame_tiles(gFieldObjectPic_Roxanne_0), - obj_frame_tiles(gFieldObjectPic_Roxanne_0), - obj_frame_tiles(gFieldObjectPic_Roxanne_1), - obj_frame_tiles(gFieldObjectPic_Roxanne_1), - obj_frame_tiles(gFieldObjectPic_Roxanne_2), - obj_frame_tiles(gFieldObjectPic_Roxanne_2), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Brawly[] = { - obj_frame_tiles(gFieldObjectPic_Brawly_0), - obj_frame_tiles(gFieldObjectPic_Brawly_1), - obj_frame_tiles(gFieldObjectPic_Brawly_2), - obj_frame_tiles(gFieldObjectPic_Brawly_0), - obj_frame_tiles(gFieldObjectPic_Brawly_0), - obj_frame_tiles(gFieldObjectPic_Brawly_1), - obj_frame_tiles(gFieldObjectPic_Brawly_1), - obj_frame_tiles(gFieldObjectPic_Brawly_2), - obj_frame_tiles(gFieldObjectPic_Brawly_2), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Wattson[] = { - obj_frame_tiles(gFieldObjectPic_Wattson_0), - obj_frame_tiles(gFieldObjectPic_Wattson_1), - obj_frame_tiles(gFieldObjectPic_Wattson_2), - obj_frame_tiles(gFieldObjectPic_Wattson_0), - obj_frame_tiles(gFieldObjectPic_Wattson_0), - obj_frame_tiles(gFieldObjectPic_Wattson_1), - obj_frame_tiles(gFieldObjectPic_Wattson_1), - obj_frame_tiles(gFieldObjectPic_Wattson_2), - obj_frame_tiles(gFieldObjectPic_Wattson_2), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Flannery[] = { - obj_frame_tiles(gFieldObjectPic_Flannery_0), - obj_frame_tiles(gFieldObjectPic_Flannery_1), - obj_frame_tiles(gFieldObjectPic_Flannery_2), - obj_frame_tiles(gFieldObjectPic_Flannery_0), - obj_frame_tiles(gFieldObjectPic_Flannery_0), - obj_frame_tiles(gFieldObjectPic_Flannery_1), - obj_frame_tiles(gFieldObjectPic_Flannery_1), - obj_frame_tiles(gFieldObjectPic_Flannery_2), - obj_frame_tiles(gFieldObjectPic_Flannery_2), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Norman[] = { - obj_frame_tiles(gFieldObjectPic_Norman_0), - obj_frame_tiles(gFieldObjectPic_Norman_1), - obj_frame_tiles(gFieldObjectPic_Norman_2), - obj_frame_tiles(gFieldObjectPic_Norman_3), - obj_frame_tiles(gFieldObjectPic_Norman_4), - obj_frame_tiles(gFieldObjectPic_Norman_5), - obj_frame_tiles(gFieldObjectPic_Norman_6), - obj_frame_tiles(gFieldObjectPic_Norman_7), - obj_frame_tiles(gFieldObjectPic_Norman_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Winona[] = { - obj_frame_tiles(gFieldObjectPic_Winona_0), - obj_frame_tiles(gFieldObjectPic_Winona_1), - obj_frame_tiles(gFieldObjectPic_Winona_2), - obj_frame_tiles(gFieldObjectPic_Winona_0), - obj_frame_tiles(gFieldObjectPic_Winona_0), - obj_frame_tiles(gFieldObjectPic_Winona_1), - obj_frame_tiles(gFieldObjectPic_Winona_1), - obj_frame_tiles(gFieldObjectPic_Winona_2), - obj_frame_tiles(gFieldObjectPic_Winona_2), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Liza[] = { - obj_frame_tiles(gFieldObjectPic_Liza_0), - obj_frame_tiles(gFieldObjectPic_Liza_1), - obj_frame_tiles(gFieldObjectPic_Liza_2), - obj_frame_tiles(gFieldObjectPic_Liza_0), - obj_frame_tiles(gFieldObjectPic_Liza_0), - obj_frame_tiles(gFieldObjectPic_Liza_1), - obj_frame_tiles(gFieldObjectPic_Liza_1), - obj_frame_tiles(gFieldObjectPic_Liza_2), - obj_frame_tiles(gFieldObjectPic_Liza_2), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Tate[] = { - obj_frame_tiles(gFieldObjectPic_Tate_0), - obj_frame_tiles(gFieldObjectPic_Tate_1), - obj_frame_tiles(gFieldObjectPic_Tate_2), - obj_frame_tiles(gFieldObjectPic_Tate_0), - obj_frame_tiles(gFieldObjectPic_Tate_0), - obj_frame_tiles(gFieldObjectPic_Tate_1), - obj_frame_tiles(gFieldObjectPic_Tate_1), - obj_frame_tiles(gFieldObjectPic_Tate_2), - obj_frame_tiles(gFieldObjectPic_Tate_2), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Wallace[] = { - obj_frame_tiles(gFieldObjectPic_Wallace_0), - obj_frame_tiles(gFieldObjectPic_Wallace_1), - obj_frame_tiles(gFieldObjectPic_Wallace_2), - obj_frame_tiles(gFieldObjectPic_Wallace_3), - obj_frame_tiles(gFieldObjectPic_Wallace_4), - obj_frame_tiles(gFieldObjectPic_Wallace_5), - obj_frame_tiles(gFieldObjectPic_Wallace_6), - obj_frame_tiles(gFieldObjectPic_Wallace_7), - obj_frame_tiles(gFieldObjectPic_Wallace_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Steven[] = { - obj_frame_tiles(gFieldObjectPic_Steven_0), - obj_frame_tiles(gFieldObjectPic_Steven_1), - obj_frame_tiles(gFieldObjectPic_Steven_2), - obj_frame_tiles(gFieldObjectPic_Steven_3), - obj_frame_tiles(gFieldObjectPic_Steven_4), - obj_frame_tiles(gFieldObjectPic_Steven_5), - obj_frame_tiles(gFieldObjectPic_Steven_6), - obj_frame_tiles(gFieldObjectPic_Steven_7), - obj_frame_tiles(gFieldObjectPic_Steven_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Wally[] = { - obj_frame_tiles(gFieldObjectPic_Wally_0), - obj_frame_tiles(gFieldObjectPic_Wally_1), - obj_frame_tiles(gFieldObjectPic_Wally_2), - obj_frame_tiles(gFieldObjectPic_Wally_3), - obj_frame_tiles(gFieldObjectPic_Wally_4), - obj_frame_tiles(gFieldObjectPic_Wally_5), - obj_frame_tiles(gFieldObjectPic_Wally_6), - obj_frame_tiles(gFieldObjectPic_Wally_7), - obj_frame_tiles(gFieldObjectPic_Wally_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_RubySapphireLittleBoy[] = { - obj_frame_tiles(gFieldObjectPic_RubySapphireLittleBoy_0), - obj_frame_tiles(gFieldObjectPic_RubySapphireLittleBoy_1), - obj_frame_tiles(gFieldObjectPic_RubySapphireLittleBoy_2), - obj_frame_tiles(gFieldObjectPic_RubySapphireLittleBoy_3), - obj_frame_tiles(gFieldObjectPic_RubySapphireLittleBoy_4), - obj_frame_tiles(gFieldObjectPic_RubySapphireLittleBoy_5), - obj_frame_tiles(gFieldObjectPic_RubySapphireLittleBoy_6), - obj_frame_tiles(gFieldObjectPic_RubySapphireLittleBoy_7), - obj_frame_tiles(gFieldObjectPic_RubySapphireLittleBoy_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_BrendanFishing[] = { - obj_frame_tiles(gFieldObjectPic_BrendanFishing_0), - obj_frame_tiles(gFieldObjectPic_BrendanFishing_1), - obj_frame_tiles(gFieldObjectPic_BrendanFishing_2), - obj_frame_tiles(gFieldObjectPic_BrendanFishing_3), - obj_frame_tiles(gFieldObjectPic_BrendanFishing_4), - obj_frame_tiles(gFieldObjectPic_BrendanFishing_5), - obj_frame_tiles(gFieldObjectPic_BrendanFishing_6), - obj_frame_tiles(gFieldObjectPic_BrendanFishing_7), - obj_frame_tiles(gFieldObjectPic_BrendanFishing_8), - obj_frame_tiles(gFieldObjectPic_BrendanFishing_9), - obj_frame_tiles(gFieldObjectPic_BrendanFishing_10), - obj_frame_tiles(gFieldObjectPic_BrendanFishing_11), +const struct SpriteFrameImage gEventObjectPicTable_BrendanNormal[] = { + obj_frame_tiles(gEventObjectPic_BrendanNormal_0), + obj_frame_tiles(gEventObjectPic_BrendanNormal_1), + obj_frame_tiles(gEventObjectPic_BrendanNormal_2), + obj_frame_tiles(gEventObjectPic_BrendanNormal_3), + obj_frame_tiles(gEventObjectPic_BrendanNormal_4), + obj_frame_tiles(gEventObjectPic_BrendanNormal_5), + obj_frame_tiles(gEventObjectPic_BrendanNormal_6), + obj_frame_tiles(gEventObjectPic_BrendanNormal_7), + obj_frame_tiles(gEventObjectPic_BrendanNormal_8), + obj_frame_tiles(gEventObjectPic_BrendanNormal_9), + obj_frame_tiles(gEventObjectPic_BrendanNormal_10), + obj_frame_tiles(gEventObjectPic_BrendanNormal_11), + obj_frame_tiles(gEventObjectPic_BrendanNormal_12), + obj_frame_tiles(gEventObjectPic_BrendanNormal_13), + obj_frame_tiles(gEventObjectPic_BrendanNormal_14), + obj_frame_tiles(gEventObjectPic_BrendanNormal_15), + obj_frame_tiles(gEventObjectPic_BrendanNormal_16), + obj_frame_tiles(gEventObjectPic_BrendanNormal_17), +}; + +const struct SpriteFrameImage gEventObjectPicTable_BrendanMachBike[] = { + obj_frame_tiles(gEventObjectPic_BrendanMachBike_0), + obj_frame_tiles(gEventObjectPic_BrendanMachBike_1), + obj_frame_tiles(gEventObjectPic_BrendanMachBike_2), + obj_frame_tiles(gEventObjectPic_BrendanMachBike_3), + obj_frame_tiles(gEventObjectPic_BrendanMachBike_4), + obj_frame_tiles(gEventObjectPic_BrendanMachBike_5), + obj_frame_tiles(gEventObjectPic_BrendanMachBike_6), + obj_frame_tiles(gEventObjectPic_BrendanMachBike_7), + obj_frame_tiles(gEventObjectPic_BrendanMachBike_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_BrendanAcroBike[] = { + obj_frame_tiles(gEventObjectPic_BrendanAcroBike_0), + obj_frame_tiles(gEventObjectPic_BrendanAcroBike_1), + obj_frame_tiles(gEventObjectPic_BrendanAcroBike_2), + obj_frame_tiles(gEventObjectPic_BrendanAcroBike_3), + obj_frame_tiles(gEventObjectPic_BrendanAcroBike_4), + obj_frame_tiles(gEventObjectPic_BrendanAcroBike_5), + obj_frame_tiles(gEventObjectPic_BrendanAcroBike_6), + obj_frame_tiles(gEventObjectPic_BrendanAcroBike_7), + obj_frame_tiles(gEventObjectPic_BrendanAcroBike_8), + obj_frame_tiles(gEventObjectPic_BrendanAcroBike_9), + obj_frame_tiles(gEventObjectPic_BrendanAcroBike_10), + obj_frame_tiles(gEventObjectPic_BrendanAcroBike_11), + obj_frame_tiles(gEventObjectPic_BrendanAcroBike_12), + obj_frame_tiles(gEventObjectPic_BrendanAcroBike_13), + obj_frame_tiles(gEventObjectPic_BrendanAcroBike_14), + obj_frame_tiles(gEventObjectPic_BrendanAcroBike_15), + obj_frame_tiles(gEventObjectPic_BrendanAcroBike_16), + obj_frame_tiles(gEventObjectPic_BrendanAcroBike_17), + obj_frame_tiles(gEventObjectPic_BrendanAcroBike_18), + obj_frame_tiles(gEventObjectPic_BrendanAcroBike_19), + obj_frame_tiles(gEventObjectPic_BrendanAcroBike_20), + obj_frame_tiles(gEventObjectPic_BrendanAcroBike_21), + obj_frame_tiles(gEventObjectPic_BrendanAcroBike_22), + obj_frame_tiles(gEventObjectPic_BrendanAcroBike_23), + obj_frame_tiles(gEventObjectPic_BrendanAcroBike_24), + obj_frame_tiles(gEventObjectPic_BrendanAcroBike_25), + obj_frame_tiles(gEventObjectPic_BrendanAcroBike_26), +}; + +const struct SpriteFrameImage gEventObjectPicTable_BrendanSurfing[] = { + obj_frame_tiles(gEventObjectPic_BrendanSurfing_0), + obj_frame_tiles(gEventObjectPic_BrendanSurfing_1), + obj_frame_tiles(gEventObjectPic_BrendanSurfing_2), + obj_frame_tiles(gEventObjectPic_BrendanSurfing_0), + obj_frame_tiles(gEventObjectPic_BrendanSurfing_0), + obj_frame_tiles(gEventObjectPic_BrendanSurfing_1), + obj_frame_tiles(gEventObjectPic_BrendanSurfing_1), + obj_frame_tiles(gEventObjectPic_BrendanSurfing_2), + obj_frame_tiles(gEventObjectPic_BrendanSurfing_2), + obj_frame_tiles(gEventObjectPic_BrendanSurfing_3), + obj_frame_tiles(gEventObjectPic_BrendanSurfing_4), + obj_frame_tiles(gEventObjectPic_BrendanSurfing_5), +}; + +const struct SpriteFrameImage gEventObjectPicTable_BrendanUnderwater[] = { + obj_frame_tiles(gEventObjectPic_BrendanUnderwater_0), + obj_frame_tiles(gEventObjectPic_BrendanUnderwater_1), + obj_frame_tiles(gEventObjectPic_BrendanUnderwater_2), + obj_frame_tiles(gEventObjectPic_BrendanUnderwater_0), + obj_frame_tiles(gEventObjectPic_BrendanUnderwater_0), + obj_frame_tiles(gEventObjectPic_BrendanUnderwater_1), + obj_frame_tiles(gEventObjectPic_BrendanUnderwater_1), + obj_frame_tiles(gEventObjectPic_BrendanUnderwater_2), + obj_frame_tiles(gEventObjectPic_BrendanUnderwater_2), +}; + +const struct SpriteFrameImage gEventObjectPicTable_BrendanFieldMove[] = { + obj_frame_tiles(gEventObjectPic_BrendanFieldMove_0), + obj_frame_tiles(gEventObjectPic_BrendanFieldMove_1), + obj_frame_tiles(gEventObjectPic_BrendanFieldMove_2), + obj_frame_tiles(gEventObjectPic_BrendanFieldMove_3), + obj_frame_tiles(gEventObjectPic_BrendanFieldMove_4), +}; + +const struct SpriteFrameImage gEventObjectPicTable_QuintyPlump[] = { + obj_frame_tiles(gEventObjectPic_QuintyPlump_0), + obj_frame_tiles(gEventObjectPic_QuintyPlump_1), + obj_frame_tiles(gEventObjectPic_QuintyPlump_2), + obj_frame_tiles(gEventObjectPic_QuintyPlump_3), + obj_frame_tiles(gEventObjectPic_QuintyPlump_4), + obj_frame_tiles(gEventObjectPic_QuintyPlump_5), + obj_frame_tiles(gEventObjectPic_QuintyPlump_6), +}; + +const struct SpriteFrameImage gEventObjectPicTable_LittleBoy1[] = { + obj_frame_tiles(gEventObjectPic_LittleBoy1_0), + obj_frame_tiles(gEventObjectPic_LittleBoy1_1), + obj_frame_tiles(gEventObjectPic_LittleBoy1_2), + obj_frame_tiles(gEventObjectPic_LittleBoy1_3), + obj_frame_tiles(gEventObjectPic_LittleBoy1_4), + obj_frame_tiles(gEventObjectPic_LittleBoy1_5), + obj_frame_tiles(gEventObjectPic_LittleBoy1_6), + obj_frame_tiles(gEventObjectPic_LittleBoy1_7), + obj_frame_tiles(gEventObjectPic_LittleBoy1_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_LittleGirl1[] = { + obj_frame_tiles(gEventObjectPic_LittleGirl1_0), + obj_frame_tiles(gEventObjectPic_LittleGirl1_1), + obj_frame_tiles(gEventObjectPic_LittleGirl1_2), + obj_frame_tiles(gEventObjectPic_LittleGirl1_3), + obj_frame_tiles(gEventObjectPic_LittleGirl1_4), + obj_frame_tiles(gEventObjectPic_LittleGirl1_5), + obj_frame_tiles(gEventObjectPic_LittleGirl1_6), + obj_frame_tiles(gEventObjectPic_LittleGirl1_7), + obj_frame_tiles(gEventObjectPic_LittleGirl1_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Boy1[] = { + obj_frame_tiles(gEventObjectPic_Boy1_0), + obj_frame_tiles(gEventObjectPic_Boy1_1), + obj_frame_tiles(gEventObjectPic_Boy1_2), + obj_frame_tiles(gEventObjectPic_Boy1_3), + obj_frame_tiles(gEventObjectPic_Boy1_4), + obj_frame_tiles(gEventObjectPic_Boy1_5), + obj_frame_tiles(gEventObjectPic_Boy1_6), + obj_frame_tiles(gEventObjectPic_Boy1_7), + obj_frame_tiles(gEventObjectPic_Boy1_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Girl1[] = { + obj_frame_tiles(gEventObjectPic_Girl1_0), + obj_frame_tiles(gEventObjectPic_Girl1_1), + obj_frame_tiles(gEventObjectPic_Girl1_2), + obj_frame_tiles(gEventObjectPic_Girl1_3), + obj_frame_tiles(gEventObjectPic_Girl1_4), + obj_frame_tiles(gEventObjectPic_Girl1_5), + obj_frame_tiles(gEventObjectPic_Girl1_6), + obj_frame_tiles(gEventObjectPic_Girl1_7), + obj_frame_tiles(gEventObjectPic_Girl1_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Boy2[] = { + obj_frame_tiles(gEventObjectPic_Boy2_0), + obj_frame_tiles(gEventObjectPic_Boy2_1), + obj_frame_tiles(gEventObjectPic_Boy2_2), + obj_frame_tiles(gEventObjectPic_Boy2_3), + obj_frame_tiles(gEventObjectPic_Boy2_4), + obj_frame_tiles(gEventObjectPic_Boy2_5), + obj_frame_tiles(gEventObjectPic_Boy2_6), + obj_frame_tiles(gEventObjectPic_Boy2_7), + obj_frame_tiles(gEventObjectPic_Boy2_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Girl2[] = { + obj_frame_tiles(gEventObjectPic_Girl2_0), + obj_frame_tiles(gEventObjectPic_Girl2_1), + obj_frame_tiles(gEventObjectPic_Girl2_2), + obj_frame_tiles(gEventObjectPic_Girl2_3), + obj_frame_tiles(gEventObjectPic_Girl2_4), + obj_frame_tiles(gEventObjectPic_Girl2_5), + obj_frame_tiles(gEventObjectPic_Girl2_6), + obj_frame_tiles(gEventObjectPic_Girl2_7), + obj_frame_tiles(gEventObjectPic_Girl2_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_LittleBoy2[] = { + obj_frame_tiles(gEventObjectPic_LittleBoy2_0), + obj_frame_tiles(gEventObjectPic_LittleBoy2_1), + obj_frame_tiles(gEventObjectPic_LittleBoy2_2), + obj_frame_tiles(gEventObjectPic_LittleBoy2_3), + obj_frame_tiles(gEventObjectPic_LittleBoy2_4), + obj_frame_tiles(gEventObjectPic_LittleBoy2_5), + obj_frame_tiles(gEventObjectPic_LittleBoy2_6), + obj_frame_tiles(gEventObjectPic_LittleBoy2_7), + obj_frame_tiles(gEventObjectPic_LittleBoy2_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_LittleGirl2[] = { + obj_frame_tiles(gEventObjectPic_LittleGirl2_0), + obj_frame_tiles(gEventObjectPic_LittleGirl2_1), + obj_frame_tiles(gEventObjectPic_LittleGirl2_2), + obj_frame_tiles(gEventObjectPic_LittleGirl2_3), + obj_frame_tiles(gEventObjectPic_LittleGirl2_4), + obj_frame_tiles(gEventObjectPic_LittleGirl2_5), + obj_frame_tiles(gEventObjectPic_LittleGirl2_6), + obj_frame_tiles(gEventObjectPic_LittleGirl2_7), + obj_frame_tiles(gEventObjectPic_LittleGirl2_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Boy3[] = { + obj_frame_tiles(gEventObjectPic_Boy3_0), + obj_frame_tiles(gEventObjectPic_Boy3_1), + obj_frame_tiles(gEventObjectPic_Boy3_2), + obj_frame_tiles(gEventObjectPic_Boy3_3), + obj_frame_tiles(gEventObjectPic_Boy3_4), + obj_frame_tiles(gEventObjectPic_Boy3_5), + obj_frame_tiles(gEventObjectPic_Boy3_6), + obj_frame_tiles(gEventObjectPic_Boy3_7), + obj_frame_tiles(gEventObjectPic_Boy3_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Girl3[] = { + obj_frame_tiles(gEventObjectPic_Girl3_0), + obj_frame_tiles(gEventObjectPic_Girl3_1), + obj_frame_tiles(gEventObjectPic_Girl3_2), + obj_frame_tiles(gEventObjectPic_Girl3_3), + obj_frame_tiles(gEventObjectPic_Girl3_4), + obj_frame_tiles(gEventObjectPic_Girl3_5), + obj_frame_tiles(gEventObjectPic_Girl3_6), + obj_frame_tiles(gEventObjectPic_Girl3_7), + obj_frame_tiles(gEventObjectPic_Girl3_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Boy4[] = { + obj_frame_tiles(gEventObjectPic_Boy4_0), + obj_frame_tiles(gEventObjectPic_Boy4_1), + obj_frame_tiles(gEventObjectPic_Boy4_2), + obj_frame_tiles(gEventObjectPic_Boy4_3), + obj_frame_tiles(gEventObjectPic_Boy4_4), + obj_frame_tiles(gEventObjectPic_Boy4_5), + obj_frame_tiles(gEventObjectPic_Boy4_6), + obj_frame_tiles(gEventObjectPic_Boy4_7), + obj_frame_tiles(gEventObjectPic_Boy4_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Woman1[] = { + obj_frame_tiles(gEventObjectPic_Woman1_0), + obj_frame_tiles(gEventObjectPic_Woman1_1), + obj_frame_tiles(gEventObjectPic_Woman1_2), + obj_frame_tiles(gEventObjectPic_Woman1_3), + obj_frame_tiles(gEventObjectPic_Woman1_4), + obj_frame_tiles(gEventObjectPic_Woman1_5), + obj_frame_tiles(gEventObjectPic_Woman1_6), + obj_frame_tiles(gEventObjectPic_Woman1_7), + obj_frame_tiles(gEventObjectPic_Woman1_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_FatMan[] = { + obj_frame_tiles(gEventObjectPic_FatMan_0), + obj_frame_tiles(gEventObjectPic_FatMan_1), + obj_frame_tiles(gEventObjectPic_FatMan_2), + obj_frame_tiles(gEventObjectPic_FatMan_3), + obj_frame_tiles(gEventObjectPic_FatMan_4), + obj_frame_tiles(gEventObjectPic_FatMan_5), + obj_frame_tiles(gEventObjectPic_FatMan_6), + obj_frame_tiles(gEventObjectPic_FatMan_7), + obj_frame_tiles(gEventObjectPic_FatMan_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Woman2[] = { + obj_frame_tiles(gEventObjectPic_Woman2_0), + obj_frame_tiles(gEventObjectPic_Woman2_1), + obj_frame_tiles(gEventObjectPic_Woman2_2), + obj_frame_tiles(gEventObjectPic_Woman2_3), + obj_frame_tiles(gEventObjectPic_Woman2_4), + obj_frame_tiles(gEventObjectPic_Woman2_5), + obj_frame_tiles(gEventObjectPic_Woman2_6), + obj_frame_tiles(gEventObjectPic_Woman2_7), + obj_frame_tiles(gEventObjectPic_Woman2_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Man1[] = { + obj_frame_tiles(gEventObjectPic_Man1_0), + obj_frame_tiles(gEventObjectPic_Man1_1), + obj_frame_tiles(gEventObjectPic_Man1_2), + obj_frame_tiles(gEventObjectPic_Man1_3), + obj_frame_tiles(gEventObjectPic_Man1_4), + obj_frame_tiles(gEventObjectPic_Man1_5), + obj_frame_tiles(gEventObjectPic_Man1_6), + obj_frame_tiles(gEventObjectPic_Man1_7), + obj_frame_tiles(gEventObjectPic_Man1_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Woman3[] = { + obj_frame_tiles(gEventObjectPic_Woman3_0), + obj_frame_tiles(gEventObjectPic_Woman3_1), + obj_frame_tiles(gEventObjectPic_Woman3_2), + obj_frame_tiles(gEventObjectPic_Woman3_3), + obj_frame_tiles(gEventObjectPic_Woman3_4), + obj_frame_tiles(gEventObjectPic_Woman3_5), + obj_frame_tiles(gEventObjectPic_Woman3_6), + obj_frame_tiles(gEventObjectPic_Woman3_7), + obj_frame_tiles(gEventObjectPic_Woman3_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_OldMan1[] = { + obj_frame_tiles(gEventObjectPic_OldMan1_0), + obj_frame_tiles(gEventObjectPic_OldMan1_1), + obj_frame_tiles(gEventObjectPic_OldMan1_2), + obj_frame_tiles(gEventObjectPic_OldMan1_3), + obj_frame_tiles(gEventObjectPic_OldMan1_4), + obj_frame_tiles(gEventObjectPic_OldMan1_5), + obj_frame_tiles(gEventObjectPic_OldMan1_6), + obj_frame_tiles(gEventObjectPic_OldMan1_7), + obj_frame_tiles(gEventObjectPic_OldMan1_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_OldWoman1[] = { + obj_frame_tiles(gEventObjectPic_OldWoman1_0), + obj_frame_tiles(gEventObjectPic_OldWoman1_1), + obj_frame_tiles(gEventObjectPic_OldWoman1_2), + obj_frame_tiles(gEventObjectPic_OldWoman1_3), + obj_frame_tiles(gEventObjectPic_OldWoman1_4), + obj_frame_tiles(gEventObjectPic_OldWoman1_5), + obj_frame_tiles(gEventObjectPic_OldWoman1_6), + obj_frame_tiles(gEventObjectPic_OldWoman1_7), + obj_frame_tiles(gEventObjectPic_OldWoman1_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Man2[] = { + obj_frame_tiles(gEventObjectPic_Man2_0), + obj_frame_tiles(gEventObjectPic_Man2_1), + obj_frame_tiles(gEventObjectPic_Man2_2), + obj_frame_tiles(gEventObjectPic_Man2_3), + obj_frame_tiles(gEventObjectPic_Man2_4), + obj_frame_tiles(gEventObjectPic_Man2_5), + obj_frame_tiles(gEventObjectPic_Man2_6), + obj_frame_tiles(gEventObjectPic_Man2_7), + obj_frame_tiles(gEventObjectPic_Man2_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Woman4[] = { + obj_frame_tiles(gEventObjectPic_Woman4_0), + obj_frame_tiles(gEventObjectPic_Woman4_1), + obj_frame_tiles(gEventObjectPic_Woman4_2), + obj_frame_tiles(gEventObjectPic_Woman4_3), + obj_frame_tiles(gEventObjectPic_Woman4_4), + obj_frame_tiles(gEventObjectPic_Woman4_5), + obj_frame_tiles(gEventObjectPic_Woman4_6), + obj_frame_tiles(gEventObjectPic_Woman4_7), + obj_frame_tiles(gEventObjectPic_Woman4_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Man3[] = { + obj_frame_tiles(gEventObjectPic_Man3_0), + obj_frame_tiles(gEventObjectPic_Man3_1), + obj_frame_tiles(gEventObjectPic_Man3_2), + obj_frame_tiles(gEventObjectPic_Man3_3), + obj_frame_tiles(gEventObjectPic_Man3_4), + obj_frame_tiles(gEventObjectPic_Man3_5), + obj_frame_tiles(gEventObjectPic_Man3_6), + obj_frame_tiles(gEventObjectPic_Man3_7), + obj_frame_tiles(gEventObjectPic_Man3_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Woman5[] = { + obj_frame_tiles(gEventObjectPic_Woman5_0), + obj_frame_tiles(gEventObjectPic_Woman5_1), + obj_frame_tiles(gEventObjectPic_Woman5_2), + obj_frame_tiles(gEventObjectPic_Woman5_3), + obj_frame_tiles(gEventObjectPic_Woman5_4), + obj_frame_tiles(gEventObjectPic_Woman5_5), + obj_frame_tiles(gEventObjectPic_Woman5_6), + obj_frame_tiles(gEventObjectPic_Woman5_7), + obj_frame_tiles(gEventObjectPic_Woman5_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Cook[] = { + obj_frame_tiles(gEventObjectPic_Cook_0), + obj_frame_tiles(gEventObjectPic_Cook_1), + obj_frame_tiles(gEventObjectPic_Cook_2), + obj_frame_tiles(gEventObjectPic_Cook_0), + obj_frame_tiles(gEventObjectPic_Cook_0), + obj_frame_tiles(gEventObjectPic_Cook_1), + obj_frame_tiles(gEventObjectPic_Cook_1), + obj_frame_tiles(gEventObjectPic_Cook_2), + obj_frame_tiles(gEventObjectPic_Cook_2), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Woman6[] = { + obj_frame_tiles(gEventObjectPic_Woman6_0), + obj_frame_tiles(gEventObjectPic_Woman6_1), + obj_frame_tiles(gEventObjectPic_Woman6_2), + obj_frame_tiles(gEventObjectPic_Woman6_3), + obj_frame_tiles(gEventObjectPic_Woman6_4), + obj_frame_tiles(gEventObjectPic_Woman6_5), + obj_frame_tiles(gEventObjectPic_Woman6_6), + obj_frame_tiles(gEventObjectPic_Woman6_7), + obj_frame_tiles(gEventObjectPic_Woman6_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_OldMan2[] = { + obj_frame_tiles(gEventObjectPic_OldMan2_0), + obj_frame_tiles(gEventObjectPic_OldMan2_1), + obj_frame_tiles(gEventObjectPic_OldMan2_2), + obj_frame_tiles(gEventObjectPic_OldMan2_0), + obj_frame_tiles(gEventObjectPic_OldMan2_0), + obj_frame_tiles(gEventObjectPic_OldMan2_1), + obj_frame_tiles(gEventObjectPic_OldMan2_1), + obj_frame_tiles(gEventObjectPic_OldMan2_2), + obj_frame_tiles(gEventObjectPic_OldMan2_2), +}; + +const struct SpriteFrameImage gEventObjectPicTable_OldWoman2[] = { + obj_frame_tiles(gEventObjectPic_OldWoman2_0), + obj_frame_tiles(gEventObjectPic_OldWoman2_1), + obj_frame_tiles(gEventObjectPic_OldWoman2_2), + obj_frame_tiles(gEventObjectPic_OldWoman2_3), + obj_frame_tiles(gEventObjectPic_OldWoman2_4), + obj_frame_tiles(gEventObjectPic_OldWoman2_5), + obj_frame_tiles(gEventObjectPic_OldWoman2_6), + obj_frame_tiles(gEventObjectPic_OldWoman2_7), + obj_frame_tiles(gEventObjectPic_OldWoman2_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Camper[] = { + obj_frame_tiles(gEventObjectPic_Camper_0), + obj_frame_tiles(gEventObjectPic_Camper_1), + obj_frame_tiles(gEventObjectPic_Camper_2), + obj_frame_tiles(gEventObjectPic_Camper_3), + obj_frame_tiles(gEventObjectPic_Camper_4), + obj_frame_tiles(gEventObjectPic_Camper_5), + obj_frame_tiles(gEventObjectPic_Camper_6), + obj_frame_tiles(gEventObjectPic_Camper_7), + obj_frame_tiles(gEventObjectPic_Camper_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Picnicker[] = { + obj_frame_tiles(gEventObjectPic_Picnicker_0), + obj_frame_tiles(gEventObjectPic_Picnicker_1), + obj_frame_tiles(gEventObjectPic_Picnicker_2), + obj_frame_tiles(gEventObjectPic_Picnicker_3), + obj_frame_tiles(gEventObjectPic_Picnicker_4), + obj_frame_tiles(gEventObjectPic_Picnicker_5), + obj_frame_tiles(gEventObjectPic_Picnicker_6), + obj_frame_tiles(gEventObjectPic_Picnicker_7), + obj_frame_tiles(gEventObjectPic_Picnicker_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Man4[] = { + obj_frame_tiles(gEventObjectPic_Man4_0), + obj_frame_tiles(gEventObjectPic_Man4_1), + obj_frame_tiles(gEventObjectPic_Man4_2), + obj_frame_tiles(gEventObjectPic_Man4_3), + obj_frame_tiles(gEventObjectPic_Man4_4), + obj_frame_tiles(gEventObjectPic_Man4_5), + obj_frame_tiles(gEventObjectPic_Man4_6), + obj_frame_tiles(gEventObjectPic_Man4_7), + obj_frame_tiles(gEventObjectPic_Man4_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Woman7[] = { + obj_frame_tiles(gEventObjectPic_Woman7_0), + obj_frame_tiles(gEventObjectPic_Woman7_1), + obj_frame_tiles(gEventObjectPic_Woman7_2), + obj_frame_tiles(gEventObjectPic_Woman7_3), + obj_frame_tiles(gEventObjectPic_Woman7_4), + obj_frame_tiles(gEventObjectPic_Woman7_5), + obj_frame_tiles(gEventObjectPic_Woman7_6), + obj_frame_tiles(gEventObjectPic_Woman7_7), + obj_frame_tiles(gEventObjectPic_Woman7_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Youngster[] = { + obj_frame_tiles(gEventObjectPic_Youngster_0), + obj_frame_tiles(gEventObjectPic_Youngster_1), + obj_frame_tiles(gEventObjectPic_Youngster_2), + obj_frame_tiles(gEventObjectPic_Youngster_3), + obj_frame_tiles(gEventObjectPic_Youngster_4), + obj_frame_tiles(gEventObjectPic_Youngster_5), + obj_frame_tiles(gEventObjectPic_Youngster_6), + obj_frame_tiles(gEventObjectPic_Youngster_7), + obj_frame_tiles(gEventObjectPic_Youngster_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_BugCatcher[] = { + obj_frame_tiles(gEventObjectPic_BugCatcher_0), + obj_frame_tiles(gEventObjectPic_BugCatcher_1), + obj_frame_tiles(gEventObjectPic_BugCatcher_2), + obj_frame_tiles(gEventObjectPic_BugCatcher_3), + obj_frame_tiles(gEventObjectPic_BugCatcher_4), + obj_frame_tiles(gEventObjectPic_BugCatcher_5), + obj_frame_tiles(gEventObjectPic_BugCatcher_6), + obj_frame_tiles(gEventObjectPic_BugCatcher_7), + obj_frame_tiles(gEventObjectPic_BugCatcher_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_PsychicM[] = { + obj_frame_tiles(gEventObjectPic_PsychicM_0), + obj_frame_tiles(gEventObjectPic_PsychicM_1), + obj_frame_tiles(gEventObjectPic_PsychicM_2), + obj_frame_tiles(gEventObjectPic_PsychicM_3), + obj_frame_tiles(gEventObjectPic_PsychicM_4), + obj_frame_tiles(gEventObjectPic_PsychicM_5), + obj_frame_tiles(gEventObjectPic_PsychicM_6), + obj_frame_tiles(gEventObjectPic_PsychicM_7), + obj_frame_tiles(gEventObjectPic_PsychicM_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_SchoolKidM[] = { + obj_frame_tiles(gEventObjectPic_SchoolKidM_0), + obj_frame_tiles(gEventObjectPic_SchoolKidM_1), + obj_frame_tiles(gEventObjectPic_SchoolKidM_2), + obj_frame_tiles(gEventObjectPic_SchoolKidM_3), + obj_frame_tiles(gEventObjectPic_SchoolKidM_4), + obj_frame_tiles(gEventObjectPic_SchoolKidM_5), + obj_frame_tiles(gEventObjectPic_SchoolKidM_6), + obj_frame_tiles(gEventObjectPic_SchoolKidM_7), + obj_frame_tiles(gEventObjectPic_SchoolKidM_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Maniac[] = { + obj_frame_tiles(gEventObjectPic_Maniac_0), + obj_frame_tiles(gEventObjectPic_Maniac_1), + obj_frame_tiles(gEventObjectPic_Maniac_2), + obj_frame_tiles(gEventObjectPic_Maniac_3), + obj_frame_tiles(gEventObjectPic_Maniac_4), + obj_frame_tiles(gEventObjectPic_Maniac_5), + obj_frame_tiles(gEventObjectPic_Maniac_6), + obj_frame_tiles(gEventObjectPic_Maniac_7), + obj_frame_tiles(gEventObjectPic_Maniac_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_HexManiac[] = { + obj_frame_tiles(gEventObjectPic_HexManiac_0), + obj_frame_tiles(gEventObjectPic_HexManiac_1), + obj_frame_tiles(gEventObjectPic_HexManiac_2), + obj_frame_tiles(gEventObjectPic_HexManiac_3), + obj_frame_tiles(gEventObjectPic_HexManiac_4), + obj_frame_tiles(gEventObjectPic_HexManiac_5), + obj_frame_tiles(gEventObjectPic_HexManiac_6), + obj_frame_tiles(gEventObjectPic_HexManiac_7), + obj_frame_tiles(gEventObjectPic_HexManiac_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_SwimmerM[] = { + obj_frame_tiles(gEventObjectPic_SwimmerM_0), + obj_frame_tiles(gEventObjectPic_SwimmerM_1), + obj_frame_tiles(gEventObjectPic_SwimmerM_2), + obj_frame_tiles(gEventObjectPic_SwimmerM_3), + obj_frame_tiles(gEventObjectPic_SwimmerM_4), + obj_frame_tiles(gEventObjectPic_SwimmerM_5), + obj_frame_tiles(gEventObjectPic_SwimmerM_6), + obj_frame_tiles(gEventObjectPic_SwimmerM_7), + obj_frame_tiles(gEventObjectPic_SwimmerM_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_SwimmerF[] = { + obj_frame_tiles(gEventObjectPic_SwimmerF_0), + obj_frame_tiles(gEventObjectPic_SwimmerF_1), + obj_frame_tiles(gEventObjectPic_SwimmerF_2), + obj_frame_tiles(gEventObjectPic_SwimmerF_3), + obj_frame_tiles(gEventObjectPic_SwimmerF_4), + obj_frame_tiles(gEventObjectPic_SwimmerF_5), + obj_frame_tiles(gEventObjectPic_SwimmerF_6), + obj_frame_tiles(gEventObjectPic_SwimmerF_7), + obj_frame_tiles(gEventObjectPic_SwimmerF_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_BlackBelt[] = { + obj_frame_tiles(gEventObjectPic_BlackBelt_0), + obj_frame_tiles(gEventObjectPic_BlackBelt_1), + obj_frame_tiles(gEventObjectPic_BlackBelt_2), + obj_frame_tiles(gEventObjectPic_BlackBelt_3), + obj_frame_tiles(gEventObjectPic_BlackBelt_4), + obj_frame_tiles(gEventObjectPic_BlackBelt_5), + obj_frame_tiles(gEventObjectPic_BlackBelt_6), + obj_frame_tiles(gEventObjectPic_BlackBelt_7), + obj_frame_tiles(gEventObjectPic_BlackBelt_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Beauty[] = { + obj_frame_tiles(gEventObjectPic_Beauty_0), + obj_frame_tiles(gEventObjectPic_Beauty_1), + obj_frame_tiles(gEventObjectPic_Beauty_2), + obj_frame_tiles(gEventObjectPic_Beauty_3), + obj_frame_tiles(gEventObjectPic_Beauty_4), + obj_frame_tiles(gEventObjectPic_Beauty_5), + obj_frame_tiles(gEventObjectPic_Beauty_6), + obj_frame_tiles(gEventObjectPic_Beauty_7), + obj_frame_tiles(gEventObjectPic_Beauty_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Scientist1[] = { + obj_frame_tiles(gEventObjectPic_Scientist1_0), + obj_frame_tiles(gEventObjectPic_Scientist1_1), + obj_frame_tiles(gEventObjectPic_Scientist1_2), + obj_frame_tiles(gEventObjectPic_Scientist1_3), + obj_frame_tiles(gEventObjectPic_Scientist1_4), + obj_frame_tiles(gEventObjectPic_Scientist1_5), + obj_frame_tiles(gEventObjectPic_Scientist1_6), + obj_frame_tiles(gEventObjectPic_Scientist1_7), + obj_frame_tiles(gEventObjectPic_Scientist1_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Lass[] = { + obj_frame_tiles(gEventObjectPic_Lass_0), + obj_frame_tiles(gEventObjectPic_Lass_1), + obj_frame_tiles(gEventObjectPic_Lass_2), + obj_frame_tiles(gEventObjectPic_Lass_3), + obj_frame_tiles(gEventObjectPic_Lass_4), + obj_frame_tiles(gEventObjectPic_Lass_5), + obj_frame_tiles(gEventObjectPic_Lass_6), + obj_frame_tiles(gEventObjectPic_Lass_7), + obj_frame_tiles(gEventObjectPic_Lass_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Gentleman[] = { + obj_frame_tiles(gEventObjectPic_Gentleman_0), + obj_frame_tiles(gEventObjectPic_Gentleman_1), + obj_frame_tiles(gEventObjectPic_Gentleman_2), + obj_frame_tiles(gEventObjectPic_Gentleman_3), + obj_frame_tiles(gEventObjectPic_Gentleman_4), + obj_frame_tiles(gEventObjectPic_Gentleman_5), + obj_frame_tiles(gEventObjectPic_Gentleman_6), + obj_frame_tiles(gEventObjectPic_Gentleman_7), + obj_frame_tiles(gEventObjectPic_Gentleman_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Sailor[] = { + obj_frame_tiles(gEventObjectPic_Sailor_0), + obj_frame_tiles(gEventObjectPic_Sailor_1), + obj_frame_tiles(gEventObjectPic_Sailor_2), + obj_frame_tiles(gEventObjectPic_Sailor_3), + obj_frame_tiles(gEventObjectPic_Sailor_4), + obj_frame_tiles(gEventObjectPic_Sailor_5), + obj_frame_tiles(gEventObjectPic_Sailor_6), + obj_frame_tiles(gEventObjectPic_Sailor_7), + obj_frame_tiles(gEventObjectPic_Sailor_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Fisherman[] = { + obj_frame_tiles(gEventObjectPic_Fisherman_0), + obj_frame_tiles(gEventObjectPic_Fisherman_1), + obj_frame_tiles(gEventObjectPic_Fisherman_2), + obj_frame_tiles(gEventObjectPic_Fisherman_3), + obj_frame_tiles(gEventObjectPic_Fisherman_4), + obj_frame_tiles(gEventObjectPic_Fisherman_5), + obj_frame_tiles(gEventObjectPic_Fisherman_6), + obj_frame_tiles(gEventObjectPic_Fisherman_7), + obj_frame_tiles(gEventObjectPic_Fisherman_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_RunningTriathleteM[] = { + obj_frame_tiles(gEventObjectPic_RunningTriathleteM_0), + obj_frame_tiles(gEventObjectPic_RunningTriathleteM_1), + obj_frame_tiles(gEventObjectPic_RunningTriathleteM_2), + obj_frame_tiles(gEventObjectPic_RunningTriathleteM_3), + obj_frame_tiles(gEventObjectPic_RunningTriathleteM_4), + obj_frame_tiles(gEventObjectPic_RunningTriathleteM_5), + obj_frame_tiles(gEventObjectPic_RunningTriathleteM_6), + obj_frame_tiles(gEventObjectPic_RunningTriathleteM_7), + obj_frame_tiles(gEventObjectPic_RunningTriathleteM_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_RunningTriathleteF[] = { + obj_frame_tiles(gEventObjectPic_RunningTriathleteF_0), + obj_frame_tiles(gEventObjectPic_RunningTriathleteF_1), + obj_frame_tiles(gEventObjectPic_RunningTriathleteF_2), + obj_frame_tiles(gEventObjectPic_RunningTriathleteF_3), + obj_frame_tiles(gEventObjectPic_RunningTriathleteF_4), + obj_frame_tiles(gEventObjectPic_RunningTriathleteF_5), + obj_frame_tiles(gEventObjectPic_RunningTriathleteF_6), + obj_frame_tiles(gEventObjectPic_RunningTriathleteF_7), + obj_frame_tiles(gEventObjectPic_RunningTriathleteF_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_TuberF[] = { + obj_frame_tiles(gEventObjectPic_TuberF_0), + obj_frame_tiles(gEventObjectPic_TuberF_1), + obj_frame_tiles(gEventObjectPic_TuberF_2), + obj_frame_tiles(gEventObjectPic_TuberF_3), + obj_frame_tiles(gEventObjectPic_TuberF_4), + obj_frame_tiles(gEventObjectPic_TuberF_5), + obj_frame_tiles(gEventObjectPic_TuberF_6), + obj_frame_tiles(gEventObjectPic_TuberF_7), + obj_frame_tiles(gEventObjectPic_TuberF_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_TuberM[] = { + obj_frame_tiles(gEventObjectPic_TuberM_0), + obj_frame_tiles(gEventObjectPic_TuberM_1), + obj_frame_tiles(gEventObjectPic_TuberM_2), + obj_frame_tiles(gEventObjectPic_TuberM_3), + obj_frame_tiles(gEventObjectPic_TuberM_4), + obj_frame_tiles(gEventObjectPic_TuberM_5), + obj_frame_tiles(gEventObjectPic_TuberM_6), + obj_frame_tiles(gEventObjectPic_TuberM_7), + obj_frame_tiles(gEventObjectPic_TuberM_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Hiker[] = { + obj_frame_tiles(gEventObjectPic_Hiker_0), + obj_frame_tiles(gEventObjectPic_Hiker_1), + obj_frame_tiles(gEventObjectPic_Hiker_2), + obj_frame_tiles(gEventObjectPic_Hiker_3), + obj_frame_tiles(gEventObjectPic_Hiker_4), + obj_frame_tiles(gEventObjectPic_Hiker_5), + obj_frame_tiles(gEventObjectPic_Hiker_6), + obj_frame_tiles(gEventObjectPic_Hiker_7), + obj_frame_tiles(gEventObjectPic_Hiker_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_CyclingTriathleteM[] = { + obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_0), + obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_1), + obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_2), + obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_3), + obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_4), + obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_5), + obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_6), + obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_7), + obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_CyclingTriathleteF[] = { + obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_0), + obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_1), + obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_2), + obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_3), + obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_4), + obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_5), + obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_6), + obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_7), + obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Nurse[] = { + obj_frame_tiles(gEventObjectPic_Nurse_0), + obj_frame_tiles(gEventObjectPic_Nurse_1), + obj_frame_tiles(gEventObjectPic_Nurse_2), + obj_frame_tiles(gEventObjectPic_Nurse_0), + obj_frame_tiles(gEventObjectPic_Nurse_0), + obj_frame_tiles(gEventObjectPic_Nurse_1), + obj_frame_tiles(gEventObjectPic_Nurse_1), + obj_frame_tiles(gEventObjectPic_Nurse_2), + obj_frame_tiles(gEventObjectPic_Nurse_2), + obj_frame_tiles(gEventObjectPic_Nurse_3), +}; + +const struct SpriteFrameImage gEventObjectPicTable_ItemBall[] = { + obj_frame_tiles(gEventObjectPic_ItemBall), +}; + +const struct SpriteFrameImage gEventObjectPicTable_ProfBirch[] = { + obj_frame_tiles(gEventObjectPic_ProfBirch_0), + obj_frame_tiles(gEventObjectPic_ProfBirch_1), + obj_frame_tiles(gEventObjectPic_ProfBirch_2), + obj_frame_tiles(gEventObjectPic_ProfBirch_3), + obj_frame_tiles(gEventObjectPic_ProfBirch_4), + obj_frame_tiles(gEventObjectPic_ProfBirch_5), + obj_frame_tiles(gEventObjectPic_ProfBirch_6), + obj_frame_tiles(gEventObjectPic_ProfBirch_7), + obj_frame_tiles(gEventObjectPic_ProfBirch_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Man5[] = { + obj_frame_tiles(gEventObjectPic_Man5_0), + obj_frame_tiles(gEventObjectPic_Man5_1), + obj_frame_tiles(gEventObjectPic_Man5_2), + obj_frame_tiles(gEventObjectPic_Man5_3), + obj_frame_tiles(gEventObjectPic_Man5_4), + obj_frame_tiles(gEventObjectPic_Man5_5), + obj_frame_tiles(gEventObjectPic_Man5_6), + obj_frame_tiles(gEventObjectPic_Man5_7), + obj_frame_tiles(gEventObjectPic_Man5_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Man6[] = { + obj_frame_tiles(gEventObjectPic_Man6_0), + obj_frame_tiles(gEventObjectPic_Man6_1), + obj_frame_tiles(gEventObjectPic_Man6_2), + obj_frame_tiles(gEventObjectPic_Man6_3), + obj_frame_tiles(gEventObjectPic_Man6_4), + obj_frame_tiles(gEventObjectPic_Man6_5), + obj_frame_tiles(gEventObjectPic_Man6_6), + obj_frame_tiles(gEventObjectPic_Man6_7), + obj_frame_tiles(gEventObjectPic_Man6_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_ReporterM[] = { + obj_frame_tiles(gEventObjectPic_ReporterM_0), + obj_frame_tiles(gEventObjectPic_ReporterM_1), + obj_frame_tiles(gEventObjectPic_ReporterM_2), + obj_frame_tiles(gEventObjectPic_ReporterM_3), + obj_frame_tiles(gEventObjectPic_ReporterM_4), + obj_frame_tiles(gEventObjectPic_ReporterM_5), + obj_frame_tiles(gEventObjectPic_ReporterM_6), + obj_frame_tiles(gEventObjectPic_ReporterM_7), + obj_frame_tiles(gEventObjectPic_ReporterM_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_ReporterF[] = { + obj_frame_tiles(gEventObjectPic_ReporterF_0), + obj_frame_tiles(gEventObjectPic_ReporterF_1), + obj_frame_tiles(gEventObjectPic_ReporterF_2), + obj_frame_tiles(gEventObjectPic_ReporterF_3), + obj_frame_tiles(gEventObjectPic_ReporterF_4), + obj_frame_tiles(gEventObjectPic_ReporterF_5), + obj_frame_tiles(gEventObjectPic_ReporterF_6), + obj_frame_tiles(gEventObjectPic_ReporterF_7), + obj_frame_tiles(gEventObjectPic_ReporterF_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_MauvilleOldMan1[] = { + obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_0), + obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_1), + obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_2), + obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_3), + obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_4), + obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_5), + obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_6), + obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_7), + obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_MauvilleOldMan2[] = { + obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_0), + obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_1), + obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_2), + obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_3), + obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_4), + obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_5), + obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_6), + obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_7), + obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_UnusedNatuDoll[] = { + obj_frame_tiles(gEventObjectPic_UnusedNatuDoll), +}; + +const struct SpriteFrameImage gEventObjectPicTable_UnusedMagnemiteDoll[] = { + obj_frame_tiles(gEventObjectPic_UnusedMagnemiteDoll), +}; + +const struct SpriteFrameImage gEventObjectPicTable_UnusedSquirtleDoll[] = { + obj_frame_tiles(gEventObjectPic_UnusedSquirtleDoll), +}; + +const struct SpriteFrameImage gEventObjectPicTable_UnusedWooperDoll[] = { + obj_frame_tiles(gEventObjectPic_UnusedWooperDoll), +}; + +const struct SpriteFrameImage gEventObjectPicTable_UnusedPikachuDoll[] = { + obj_frame_tiles(gEventObjectPic_UnusedPikachuDoll), +}; + +const struct SpriteFrameImage gEventObjectPicTable_UnusedPorygon2Doll[] = { + obj_frame_tiles(gEventObjectPic_UnusedPorygon2Doll), +}; + +const struct SpriteFrameImage gEventObjectPicTable_CuttableTree[] = { + obj_frame_tiles(gEventObjectPic_CuttableTree_0), + obj_frame_tiles(gEventObjectPic_CuttableTree_1), + obj_frame_tiles(gEventObjectPic_CuttableTree_2), + obj_frame_tiles(gEventObjectPic_CuttableTree_3), +}; + +const struct SpriteFrameImage gEventObjectPicTable_MartEmployee[] = { + obj_frame_tiles(gEventObjectPic_MartEmployee_0), + obj_frame_tiles(gEventObjectPic_MartEmployee_1), + obj_frame_tiles(gEventObjectPic_MartEmployee_2), + obj_frame_tiles(gEventObjectPic_MartEmployee_3), + obj_frame_tiles(gEventObjectPic_MartEmployee_4), + obj_frame_tiles(gEventObjectPic_MartEmployee_5), + obj_frame_tiles(gEventObjectPic_MartEmployee_6), + obj_frame_tiles(gEventObjectPic_MartEmployee_7), + obj_frame_tiles(gEventObjectPic_MartEmployee_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_RooftopSaleWoman[] = { + obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_0), + obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_1), + obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_2), + obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_3), + obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_4), + obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_5), + obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_6), + obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_7), + obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Teala[] = { + obj_frame_tiles(gEventObjectPic_Teala_0), + obj_frame_tiles(gEventObjectPic_Teala_1), + obj_frame_tiles(gEventObjectPic_Teala_2), + obj_frame_tiles(gEventObjectPic_Teala_3), + obj_frame_tiles(gEventObjectPic_Teala_4), + obj_frame_tiles(gEventObjectPic_Teala_5), + obj_frame_tiles(gEventObjectPic_Teala_6), + obj_frame_tiles(gEventObjectPic_Teala_7), + obj_frame_tiles(gEventObjectPic_Teala_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_BreakableRock[] = { + obj_frame_tiles(gEventObjectPic_BreakableRock_0), + obj_frame_tiles(gEventObjectPic_BreakableRock_1), + obj_frame_tiles(gEventObjectPic_BreakableRock_2), + obj_frame_tiles(gEventObjectPic_BreakableRock_3), +}; + +const struct SpriteFrameImage gEventObjectPicTable_PushableBoulder[] = { + obj_frame_tiles(gEventObjectPic_PushableBoulder), +}; + +const struct SpriteFrameImage gEventObjectPicTable_MrBrineysBoat[] = { + obj_frame_tiles(gEventObjectPic_MrBrineysBoat_0), + obj_frame_tiles(gEventObjectPic_MrBrineysBoat_1), + obj_frame_tiles(gEventObjectPic_MrBrineysBoat_2), + obj_frame_tiles(gEventObjectPic_MrBrineysBoat_0), + obj_frame_tiles(gEventObjectPic_MrBrineysBoat_0), + obj_frame_tiles(gEventObjectPic_MrBrineysBoat_1), + obj_frame_tiles(gEventObjectPic_MrBrineysBoat_1), + obj_frame_tiles(gEventObjectPic_MrBrineysBoat_2), + obj_frame_tiles(gEventObjectPic_MrBrineysBoat_2), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Truck[] = { + obj_frame_tiles(gEventObjectPic_Truck), +}; + +const struct SpriteFrameImage gEventObjectPicTable_VigorothCarryingBox[] = { + obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_0), + obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_0), + obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_0), + obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_1), + obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_2), + obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_1), + obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_2), + obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_1), + obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_2), +}; + +const struct SpriteFrameImage gEventObjectPicTable_VigorothFacingAway[] = { + obj_frame_tiles(gEventObjectPic_VigorothFacingAway_0), + obj_frame_tiles(gEventObjectPic_VigorothFacingAway_0), + obj_frame_tiles(gEventObjectPic_VigorothFacingAway_0), + obj_frame_tiles(gEventObjectPic_VigorothFacingAway_1), + obj_frame_tiles(gEventObjectPic_VigorothFacingAway_1), + obj_frame_tiles(gEventObjectPic_VigorothFacingAway_1), + obj_frame_tiles(gEventObjectPic_VigorothFacingAway_1), + obj_frame_tiles(gEventObjectPic_VigorothFacingAway_1), + obj_frame_tiles(gEventObjectPic_VigorothFacingAway_1), +}; + +const struct SpriteFrameImage gEventObjectPicTable_BirchsBag[] = { + obj_frame_tiles(gEventObjectPic_BirchsBag), +}; + +const struct SpriteFrameImage gEventObjectPicTable_EnemyZigzagoon[] = { + obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_0), + obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_1), + obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_2), + obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_3), + obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_4), + obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_5), + obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_6), + obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_7), + obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Poochyena[] = { + obj_frame_tiles(gEventObjectPic_Poochyena_0), + obj_frame_tiles(gEventObjectPic_Poochyena_1), + obj_frame_tiles(gEventObjectPic_Poochyena_2), + obj_frame_tiles(gEventObjectPic_Poochyena_3), + obj_frame_tiles(gEventObjectPic_Poochyena_4), + obj_frame_tiles(gEventObjectPic_Poochyena_5), + obj_frame_tiles(gEventObjectPic_Poochyena_6), + obj_frame_tiles(gEventObjectPic_Poochyena_7), + obj_frame_tiles(gEventObjectPic_Poochyena_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Artist[] = { + obj_frame_tiles(gEventObjectPic_Artist_0), + obj_frame_tiles(gEventObjectPic_Artist_1), + obj_frame_tiles(gEventObjectPic_Artist_2), + obj_frame_tiles(gEventObjectPic_Artist_3), + obj_frame_tiles(gEventObjectPic_Artist_4), + obj_frame_tiles(gEventObjectPic_Artist_5), + obj_frame_tiles(gEventObjectPic_Artist_6), + obj_frame_tiles(gEventObjectPic_Artist_7), + obj_frame_tiles(gEventObjectPic_Artist_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_MayNormal[] = { + obj_frame_tiles(gEventObjectPic_MayNormal_0), + obj_frame_tiles(gEventObjectPic_MayNormal_1), + obj_frame_tiles(gEventObjectPic_MayNormal_2), + obj_frame_tiles(gEventObjectPic_MayNormal_3), + obj_frame_tiles(gEventObjectPic_MayNormal_4), + obj_frame_tiles(gEventObjectPic_MayNormal_5), + obj_frame_tiles(gEventObjectPic_MayNormal_6), + obj_frame_tiles(gEventObjectPic_MayNormal_7), + obj_frame_tiles(gEventObjectPic_MayNormal_8), + obj_frame_tiles(gEventObjectPic_MayNormal_9), + obj_frame_tiles(gEventObjectPic_MayNormal_10), + obj_frame_tiles(gEventObjectPic_MayNormal_11), + obj_frame_tiles(gEventObjectPic_MayNormal_12), + obj_frame_tiles(gEventObjectPic_MayNormal_13), + obj_frame_tiles(gEventObjectPic_MayNormal_14), + obj_frame_tiles(gEventObjectPic_MayNormal_15), + obj_frame_tiles(gEventObjectPic_MayNormal_16), + obj_frame_tiles(gEventObjectPic_MayNormal_17), +}; + +const struct SpriteFrameImage gEventObjectPicTable_MayMachBike[] = { + obj_frame_tiles(gEventObjectPic_MayMachBike_0), + obj_frame_tiles(gEventObjectPic_MayMachBike_1), + obj_frame_tiles(gEventObjectPic_MayMachBike_2), + obj_frame_tiles(gEventObjectPic_MayMachBike_3), + obj_frame_tiles(gEventObjectPic_MayMachBike_4), + obj_frame_tiles(gEventObjectPic_MayMachBike_5), + obj_frame_tiles(gEventObjectPic_MayMachBike_6), + obj_frame_tiles(gEventObjectPic_MayMachBike_7), + obj_frame_tiles(gEventObjectPic_MayMachBike_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_MayAcroBike[] = { + obj_frame_tiles(gEventObjectPic_MayAcroBike_0), + obj_frame_tiles(gEventObjectPic_MayAcroBike_1), + obj_frame_tiles(gEventObjectPic_MayAcroBike_2), + obj_frame_tiles(gEventObjectPic_MayAcroBike_3), + obj_frame_tiles(gEventObjectPic_MayAcroBike_4), + obj_frame_tiles(gEventObjectPic_MayAcroBike_5), + obj_frame_tiles(gEventObjectPic_MayAcroBike_6), + obj_frame_tiles(gEventObjectPic_MayAcroBike_7), + obj_frame_tiles(gEventObjectPic_MayAcroBike_8), + obj_frame_tiles(gEventObjectPic_MayAcroBike_9), + obj_frame_tiles(gEventObjectPic_MayAcroBike_10), + obj_frame_tiles(gEventObjectPic_MayAcroBike_11), + obj_frame_tiles(gEventObjectPic_MayAcroBike_12), + obj_frame_tiles(gEventObjectPic_MayAcroBike_13), + obj_frame_tiles(gEventObjectPic_MayAcroBike_14), + obj_frame_tiles(gEventObjectPic_MayAcroBike_15), + obj_frame_tiles(gEventObjectPic_MayAcroBike_16), + obj_frame_tiles(gEventObjectPic_MayAcroBike_17), + obj_frame_tiles(gEventObjectPic_MayAcroBike_18), + obj_frame_tiles(gEventObjectPic_MayAcroBike_19), + obj_frame_tiles(gEventObjectPic_MayAcroBike_20), + obj_frame_tiles(gEventObjectPic_MayAcroBike_21), + obj_frame_tiles(gEventObjectPic_MayAcroBike_22), + obj_frame_tiles(gEventObjectPic_MayAcroBike_23), + obj_frame_tiles(gEventObjectPic_MayAcroBike_24), + obj_frame_tiles(gEventObjectPic_MayAcroBike_25), + obj_frame_tiles(gEventObjectPic_MayAcroBike_26), +}; + +const struct SpriteFrameImage gEventObjectPicTable_MaySurfing[] = { + obj_frame_tiles(gEventObjectPic_MaySurfing_0), + obj_frame_tiles(gEventObjectPic_MaySurfing_1), + obj_frame_tiles(gEventObjectPic_MaySurfing_2), + obj_frame_tiles(gEventObjectPic_MaySurfing_0), + obj_frame_tiles(gEventObjectPic_MaySurfing_0), + obj_frame_tiles(gEventObjectPic_MaySurfing_1), + obj_frame_tiles(gEventObjectPic_MaySurfing_1), + obj_frame_tiles(gEventObjectPic_MaySurfing_2), + obj_frame_tiles(gEventObjectPic_MaySurfing_2), + obj_frame_tiles(gEventObjectPic_MaySurfing_3), + obj_frame_tiles(gEventObjectPic_MaySurfing_4), + obj_frame_tiles(gEventObjectPic_MaySurfing_5), +}; + +const struct SpriteFrameImage gEventObjectPicTable_MayUnderwater[] = { + obj_frame_tiles(gEventObjectPic_MayUnderwater_0), + obj_frame_tiles(gEventObjectPic_MayUnderwater_1), + obj_frame_tiles(gEventObjectPic_MayUnderwater_2), + obj_frame_tiles(gEventObjectPic_MayUnderwater_0), + obj_frame_tiles(gEventObjectPic_MayUnderwater_0), + obj_frame_tiles(gEventObjectPic_MayUnderwater_1), + obj_frame_tiles(gEventObjectPic_MayUnderwater_1), + obj_frame_tiles(gEventObjectPic_MayUnderwater_2), + obj_frame_tiles(gEventObjectPic_MayUnderwater_2), +}; + +const struct SpriteFrameImage gEventObjectPicTable_MayFieldMove[] = { + obj_frame_tiles(gEventObjectPic_MayFieldMove_0), + obj_frame_tiles(gEventObjectPic_MayFieldMove_1), + obj_frame_tiles(gEventObjectPic_MayFieldMove_2), + obj_frame_tiles(gEventObjectPic_MayFieldMove_3), + obj_frame_tiles(gEventObjectPic_MayFieldMove_4), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Cameraman[] = { + obj_frame_tiles(gEventObjectPic_Cameraman_0), + obj_frame_tiles(gEventObjectPic_Cameraman_1), + obj_frame_tiles(gEventObjectPic_Cameraman_2), + obj_frame_tiles(gEventObjectPic_Cameraman_3), + obj_frame_tiles(gEventObjectPic_Cameraman_4), + obj_frame_tiles(gEventObjectPic_Cameraman_5), + obj_frame_tiles(gEventObjectPic_Cameraman_6), + obj_frame_tiles(gEventObjectPic_Cameraman_7), + obj_frame_tiles(gEventObjectPic_Cameraman_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_MovingBox[] = { + obj_frame_tiles(gEventObjectPic_MovingBox), +}; + +const struct SpriteFrameImage gEventObjectPicTable_CableCar[] = { + obj_frame_tiles(gEventObjectPic_CableCar), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Scientist2[] = { + obj_frame_tiles(gEventObjectPic_Scientist2_0), + obj_frame_tiles(gEventObjectPic_Scientist2_1), + obj_frame_tiles(gEventObjectPic_Scientist2_2), + obj_frame_tiles(gEventObjectPic_Scientist2_3), + obj_frame_tiles(gEventObjectPic_Scientist2_4), + obj_frame_tiles(gEventObjectPic_Scientist2_5), + obj_frame_tiles(gEventObjectPic_Scientist2_6), + obj_frame_tiles(gEventObjectPic_Scientist2_7), + obj_frame_tiles(gEventObjectPic_Scientist2_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Man7[] = { + obj_frame_tiles(gEventObjectPic_Man7_0), + obj_frame_tiles(gEventObjectPic_Man7_1), + obj_frame_tiles(gEventObjectPic_Man7_2), + obj_frame_tiles(gEventObjectPic_Man7_3), + obj_frame_tiles(gEventObjectPic_Man7_4), + obj_frame_tiles(gEventObjectPic_Man7_5), + obj_frame_tiles(gEventObjectPic_Man7_6), + obj_frame_tiles(gEventObjectPic_Man7_7), + obj_frame_tiles(gEventObjectPic_Man7_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_AquaMemberM[] = { + obj_frame_tiles(gEventObjectPic_AquaMemberM_0), + obj_frame_tiles(gEventObjectPic_AquaMemberM_1), + obj_frame_tiles(gEventObjectPic_AquaMemberM_2), + obj_frame_tiles(gEventObjectPic_AquaMemberM_3), + obj_frame_tiles(gEventObjectPic_AquaMemberM_4), + obj_frame_tiles(gEventObjectPic_AquaMemberM_5), + obj_frame_tiles(gEventObjectPic_AquaMemberM_6), + obj_frame_tiles(gEventObjectPic_AquaMemberM_7), + obj_frame_tiles(gEventObjectPic_AquaMemberM_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_AquaMemberF[] = { + obj_frame_tiles(gEventObjectPic_AquaMemberF_0), + obj_frame_tiles(gEventObjectPic_AquaMemberF_1), + obj_frame_tiles(gEventObjectPic_AquaMemberF_2), + obj_frame_tiles(gEventObjectPic_AquaMemberF_3), + obj_frame_tiles(gEventObjectPic_AquaMemberF_4), + obj_frame_tiles(gEventObjectPic_AquaMemberF_5), + obj_frame_tiles(gEventObjectPic_AquaMemberF_6), + obj_frame_tiles(gEventObjectPic_AquaMemberF_7), + obj_frame_tiles(gEventObjectPic_AquaMemberF_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_MagmaMemberM[] = { + obj_frame_tiles(gEventObjectPic_MagmaMemberM_0), + obj_frame_tiles(gEventObjectPic_MagmaMemberM_1), + obj_frame_tiles(gEventObjectPic_MagmaMemberM_2), + obj_frame_tiles(gEventObjectPic_MagmaMemberM_3), + obj_frame_tiles(gEventObjectPic_MagmaMemberM_4), + obj_frame_tiles(gEventObjectPic_MagmaMemberM_5), + obj_frame_tiles(gEventObjectPic_MagmaMemberM_6), + obj_frame_tiles(gEventObjectPic_MagmaMemberM_7), + obj_frame_tiles(gEventObjectPic_MagmaMemberM_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_MagmaMemberF[] = { + obj_frame_tiles(gEventObjectPic_MagmaMemberF_0), + obj_frame_tiles(gEventObjectPic_MagmaMemberF_1), + obj_frame_tiles(gEventObjectPic_MagmaMemberF_2), + obj_frame_tiles(gEventObjectPic_MagmaMemberF_3), + obj_frame_tiles(gEventObjectPic_MagmaMemberF_4), + obj_frame_tiles(gEventObjectPic_MagmaMemberF_5), + obj_frame_tiles(gEventObjectPic_MagmaMemberF_6), + obj_frame_tiles(gEventObjectPic_MagmaMemberF_7), + obj_frame_tiles(gEventObjectPic_MagmaMemberF_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Sidney[] = { + obj_frame_tiles(gEventObjectPic_Sidney_0), + obj_frame_tiles(gEventObjectPic_Sidney_1), + obj_frame_tiles(gEventObjectPic_Sidney_2), + obj_frame_tiles(gEventObjectPic_Sidney_0), + obj_frame_tiles(gEventObjectPic_Sidney_0), + obj_frame_tiles(gEventObjectPic_Sidney_1), + obj_frame_tiles(gEventObjectPic_Sidney_1), + obj_frame_tiles(gEventObjectPic_Sidney_2), + obj_frame_tiles(gEventObjectPic_Sidney_2), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Phoebe[] = { + obj_frame_tiles(gEventObjectPic_Phoebe_0), + obj_frame_tiles(gEventObjectPic_Phoebe_1), + obj_frame_tiles(gEventObjectPic_Phoebe_2), + obj_frame_tiles(gEventObjectPic_Phoebe_0), + obj_frame_tiles(gEventObjectPic_Phoebe_0), + obj_frame_tiles(gEventObjectPic_Phoebe_1), + obj_frame_tiles(gEventObjectPic_Phoebe_1), + obj_frame_tiles(gEventObjectPic_Phoebe_2), + obj_frame_tiles(gEventObjectPic_Phoebe_2), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Glacia[] = { + obj_frame_tiles(gEventObjectPic_Glacia_0), + obj_frame_tiles(gEventObjectPic_Glacia_1), + obj_frame_tiles(gEventObjectPic_Glacia_2), + obj_frame_tiles(gEventObjectPic_Glacia_0), + obj_frame_tiles(gEventObjectPic_Glacia_0), + obj_frame_tiles(gEventObjectPic_Glacia_1), + obj_frame_tiles(gEventObjectPic_Glacia_1), + obj_frame_tiles(gEventObjectPic_Glacia_2), + obj_frame_tiles(gEventObjectPic_Glacia_2), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Drake[] = { + obj_frame_tiles(gEventObjectPic_Drake_0), + obj_frame_tiles(gEventObjectPic_Drake_1), + obj_frame_tiles(gEventObjectPic_Drake_2), + obj_frame_tiles(gEventObjectPic_Drake_0), + obj_frame_tiles(gEventObjectPic_Drake_0), + obj_frame_tiles(gEventObjectPic_Drake_1), + obj_frame_tiles(gEventObjectPic_Drake_1), + obj_frame_tiles(gEventObjectPic_Drake_2), + obj_frame_tiles(gEventObjectPic_Drake_2), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Roxanne[] = { + obj_frame_tiles(gEventObjectPic_Roxanne_0), + obj_frame_tiles(gEventObjectPic_Roxanne_1), + obj_frame_tiles(gEventObjectPic_Roxanne_2), + obj_frame_tiles(gEventObjectPic_Roxanne_0), + obj_frame_tiles(gEventObjectPic_Roxanne_0), + obj_frame_tiles(gEventObjectPic_Roxanne_1), + obj_frame_tiles(gEventObjectPic_Roxanne_1), + obj_frame_tiles(gEventObjectPic_Roxanne_2), + obj_frame_tiles(gEventObjectPic_Roxanne_2), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Brawly[] = { + obj_frame_tiles(gEventObjectPic_Brawly_0), + obj_frame_tiles(gEventObjectPic_Brawly_1), + obj_frame_tiles(gEventObjectPic_Brawly_2), + obj_frame_tiles(gEventObjectPic_Brawly_0), + obj_frame_tiles(gEventObjectPic_Brawly_0), + obj_frame_tiles(gEventObjectPic_Brawly_1), + obj_frame_tiles(gEventObjectPic_Brawly_1), + obj_frame_tiles(gEventObjectPic_Brawly_2), + obj_frame_tiles(gEventObjectPic_Brawly_2), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Wattson[] = { + obj_frame_tiles(gEventObjectPic_Wattson_0), + obj_frame_tiles(gEventObjectPic_Wattson_1), + obj_frame_tiles(gEventObjectPic_Wattson_2), + obj_frame_tiles(gEventObjectPic_Wattson_0), + obj_frame_tiles(gEventObjectPic_Wattson_0), + obj_frame_tiles(gEventObjectPic_Wattson_1), + obj_frame_tiles(gEventObjectPic_Wattson_1), + obj_frame_tiles(gEventObjectPic_Wattson_2), + obj_frame_tiles(gEventObjectPic_Wattson_2), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Flannery[] = { + obj_frame_tiles(gEventObjectPic_Flannery_0), + obj_frame_tiles(gEventObjectPic_Flannery_1), + obj_frame_tiles(gEventObjectPic_Flannery_2), + obj_frame_tiles(gEventObjectPic_Flannery_0), + obj_frame_tiles(gEventObjectPic_Flannery_0), + obj_frame_tiles(gEventObjectPic_Flannery_1), + obj_frame_tiles(gEventObjectPic_Flannery_1), + obj_frame_tiles(gEventObjectPic_Flannery_2), + obj_frame_tiles(gEventObjectPic_Flannery_2), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Norman[] = { + obj_frame_tiles(gEventObjectPic_Norman_0), + obj_frame_tiles(gEventObjectPic_Norman_1), + obj_frame_tiles(gEventObjectPic_Norman_2), + obj_frame_tiles(gEventObjectPic_Norman_3), + obj_frame_tiles(gEventObjectPic_Norman_4), + obj_frame_tiles(gEventObjectPic_Norman_5), + obj_frame_tiles(gEventObjectPic_Norman_6), + obj_frame_tiles(gEventObjectPic_Norman_7), + obj_frame_tiles(gEventObjectPic_Norman_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Winona[] = { + obj_frame_tiles(gEventObjectPic_Winona_0), + obj_frame_tiles(gEventObjectPic_Winona_1), + obj_frame_tiles(gEventObjectPic_Winona_2), + obj_frame_tiles(gEventObjectPic_Winona_0), + obj_frame_tiles(gEventObjectPic_Winona_0), + obj_frame_tiles(gEventObjectPic_Winona_1), + obj_frame_tiles(gEventObjectPic_Winona_1), + obj_frame_tiles(gEventObjectPic_Winona_2), + obj_frame_tiles(gEventObjectPic_Winona_2), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Liza[] = { + obj_frame_tiles(gEventObjectPic_Liza_0), + obj_frame_tiles(gEventObjectPic_Liza_1), + obj_frame_tiles(gEventObjectPic_Liza_2), + obj_frame_tiles(gEventObjectPic_Liza_0), + obj_frame_tiles(gEventObjectPic_Liza_0), + obj_frame_tiles(gEventObjectPic_Liza_1), + obj_frame_tiles(gEventObjectPic_Liza_1), + obj_frame_tiles(gEventObjectPic_Liza_2), + obj_frame_tiles(gEventObjectPic_Liza_2), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Tate[] = { + obj_frame_tiles(gEventObjectPic_Tate_0), + obj_frame_tiles(gEventObjectPic_Tate_1), + obj_frame_tiles(gEventObjectPic_Tate_2), + obj_frame_tiles(gEventObjectPic_Tate_0), + obj_frame_tiles(gEventObjectPic_Tate_0), + obj_frame_tiles(gEventObjectPic_Tate_1), + obj_frame_tiles(gEventObjectPic_Tate_1), + obj_frame_tiles(gEventObjectPic_Tate_2), + obj_frame_tiles(gEventObjectPic_Tate_2), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Wallace[] = { + obj_frame_tiles(gEventObjectPic_Wallace_0), + obj_frame_tiles(gEventObjectPic_Wallace_1), + obj_frame_tiles(gEventObjectPic_Wallace_2), + obj_frame_tiles(gEventObjectPic_Wallace_3), + obj_frame_tiles(gEventObjectPic_Wallace_4), + obj_frame_tiles(gEventObjectPic_Wallace_5), + obj_frame_tiles(gEventObjectPic_Wallace_6), + obj_frame_tiles(gEventObjectPic_Wallace_7), + obj_frame_tiles(gEventObjectPic_Wallace_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Steven[] = { + obj_frame_tiles(gEventObjectPic_Steven_0), + obj_frame_tiles(gEventObjectPic_Steven_1), + obj_frame_tiles(gEventObjectPic_Steven_2), + obj_frame_tiles(gEventObjectPic_Steven_3), + obj_frame_tiles(gEventObjectPic_Steven_4), + obj_frame_tiles(gEventObjectPic_Steven_5), + obj_frame_tiles(gEventObjectPic_Steven_6), + obj_frame_tiles(gEventObjectPic_Steven_7), + obj_frame_tiles(gEventObjectPic_Steven_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Wally[] = { + obj_frame_tiles(gEventObjectPic_Wally_0), + obj_frame_tiles(gEventObjectPic_Wally_1), + obj_frame_tiles(gEventObjectPic_Wally_2), + obj_frame_tiles(gEventObjectPic_Wally_3), + obj_frame_tiles(gEventObjectPic_Wally_4), + obj_frame_tiles(gEventObjectPic_Wally_5), + obj_frame_tiles(gEventObjectPic_Wally_6), + obj_frame_tiles(gEventObjectPic_Wally_7), + obj_frame_tiles(gEventObjectPic_Wally_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_RubySapphireLittleBoy[] = { + obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_0), + obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_1), + obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_2), + obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_3), + obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_4), + obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_5), + obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_6), + obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_7), + obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_BrendanFishing[] = { + obj_frame_tiles(gEventObjectPic_BrendanFishing_0), + obj_frame_tiles(gEventObjectPic_BrendanFishing_1), + obj_frame_tiles(gEventObjectPic_BrendanFishing_2), + obj_frame_tiles(gEventObjectPic_BrendanFishing_3), + obj_frame_tiles(gEventObjectPic_BrendanFishing_4), + obj_frame_tiles(gEventObjectPic_BrendanFishing_5), + obj_frame_tiles(gEventObjectPic_BrendanFishing_6), + obj_frame_tiles(gEventObjectPic_BrendanFishing_7), + obj_frame_tiles(gEventObjectPic_BrendanFishing_8), + obj_frame_tiles(gEventObjectPic_BrendanFishing_9), + obj_frame_tiles(gEventObjectPic_BrendanFishing_10), + obj_frame_tiles(gEventObjectPic_BrendanFishing_11), }; -const struct SpriteFrameImage gFieldObjectPicTable_MayFishing[] = { - obj_frame_tiles(gFieldObjectPic_MayFishing_0), - obj_frame_tiles(gFieldObjectPic_MayFishing_1), - obj_frame_tiles(gFieldObjectPic_MayFishing_2), - obj_frame_tiles(gFieldObjectPic_MayFishing_3), - obj_frame_tiles(gFieldObjectPic_MayFishing_4), - obj_frame_tiles(gFieldObjectPic_MayFishing_5), - obj_frame_tiles(gFieldObjectPic_MayFishing_6), - obj_frame_tiles(gFieldObjectPic_MayFishing_7), - obj_frame_tiles(gFieldObjectPic_MayFishing_8), - obj_frame_tiles(gFieldObjectPic_MayFishing_9), - obj_frame_tiles(gFieldObjectPic_MayFishing_10), - obj_frame_tiles(gFieldObjectPic_MayFishing_11), +const struct SpriteFrameImage gEventObjectPicTable_MayFishing[] = { + obj_frame_tiles(gEventObjectPic_MayFishing_0), + obj_frame_tiles(gEventObjectPic_MayFishing_1), + obj_frame_tiles(gEventObjectPic_MayFishing_2), + obj_frame_tiles(gEventObjectPic_MayFishing_3), + obj_frame_tiles(gEventObjectPic_MayFishing_4), + obj_frame_tiles(gEventObjectPic_MayFishing_5), + obj_frame_tiles(gEventObjectPic_MayFishing_6), + obj_frame_tiles(gEventObjectPic_MayFishing_7), + obj_frame_tiles(gEventObjectPic_MayFishing_8), + obj_frame_tiles(gEventObjectPic_MayFishing_9), + obj_frame_tiles(gEventObjectPic_MayFishing_10), + obj_frame_tiles(gEventObjectPic_MayFishing_11), }; -const struct SpriteFrameImage gFieldObjectPicTable_HotSpringsOldWoman[] = { - obj_frame_tiles(gFieldObjectPic_HotSpringsOldWoman_0), - obj_frame_tiles(gFieldObjectPic_HotSpringsOldWoman_1), - obj_frame_tiles(gFieldObjectPic_HotSpringsOldWoman_2), - obj_frame_tiles(gFieldObjectPic_HotSpringsOldWoman_3), - obj_frame_tiles(gFieldObjectPic_HotSpringsOldWoman_4), - obj_frame_tiles(gFieldObjectPic_HotSpringsOldWoman_5), - obj_frame_tiles(gFieldObjectPic_HotSpringsOldWoman_6), - obj_frame_tiles(gFieldObjectPic_HotSpringsOldWoman_7), - obj_frame_tiles(gFieldObjectPic_HotSpringsOldWoman_8), +const struct SpriteFrameImage gEventObjectPicTable_HotSpringsOldWoman[] = { + obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_0), + obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_1), + obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_2), + obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_3), + obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_4), + obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_5), + obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_6), + obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_7), + obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_8), }; -const struct SpriteFrameImage gFieldObjectPicTable_SSTidal[] = { - obj_frame_tiles(gFieldObjectPic_SSTidal), - obj_frame_tiles(gFieldObjectPic_SSTidal), - obj_frame_tiles(gFieldObjectPic_SSTidal), - obj_frame_tiles(gFieldObjectPic_SSTidal), - obj_frame_tiles(gFieldObjectPic_SSTidal), - obj_frame_tiles(gFieldObjectPic_SSTidal), - obj_frame_tiles(gFieldObjectPic_SSTidal), - obj_frame_tiles(gFieldObjectPic_SSTidal), - obj_frame_tiles(gFieldObjectPic_SSTidal), +const struct SpriteFrameImage gEventObjectPicTable_SSTidal[] = { + obj_frame_tiles(gEventObjectPic_SSTidal), + obj_frame_tiles(gEventObjectPic_SSTidal), + obj_frame_tiles(gEventObjectPic_SSTidal), + obj_frame_tiles(gEventObjectPic_SSTidal), + obj_frame_tiles(gEventObjectPic_SSTidal), + obj_frame_tiles(gEventObjectPic_SSTidal), + obj_frame_tiles(gEventObjectPic_SSTidal), + obj_frame_tiles(gEventObjectPic_SSTidal), + obj_frame_tiles(gEventObjectPic_SSTidal), }; -const struct SpriteFrameImage gFieldObjectPicTable_SubmarineShadow[] = { - obj_frame_tiles(gFieldObjectPic_SubmarineShadow), - obj_frame_tiles(gFieldObjectPic_SubmarineShadow), - obj_frame_tiles(gFieldObjectPic_SubmarineShadow), - obj_frame_tiles(gFieldObjectPic_SubmarineShadow), - obj_frame_tiles(gFieldObjectPic_SubmarineShadow), - obj_frame_tiles(gFieldObjectPic_SubmarineShadow), - obj_frame_tiles(gFieldObjectPic_SubmarineShadow), - obj_frame_tiles(gFieldObjectPic_SubmarineShadow), - obj_frame_tiles(gFieldObjectPic_SubmarineShadow), +const struct SpriteFrameImage gEventObjectPicTable_SubmarineShadow[] = { + obj_frame_tiles(gEventObjectPic_SubmarineShadow), + obj_frame_tiles(gEventObjectPic_SubmarineShadow), + obj_frame_tiles(gEventObjectPic_SubmarineShadow), + obj_frame_tiles(gEventObjectPic_SubmarineShadow), + obj_frame_tiles(gEventObjectPic_SubmarineShadow), + obj_frame_tiles(gEventObjectPic_SubmarineShadow), + obj_frame_tiles(gEventObjectPic_SubmarineShadow), + obj_frame_tiles(gEventObjectPic_SubmarineShadow), + obj_frame_tiles(gEventObjectPic_SubmarineShadow), }; -const struct SpriteFrameImage gFieldObjectPicTable_PichuDoll[] = { - obj_frame_tiles(gFieldObjectPic_PichuDoll), +const struct SpriteFrameImage gEventObjectPicTable_PichuDoll[] = { + obj_frame_tiles(gEventObjectPic_PichuDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_PikachuDoll[] = { - obj_frame_tiles(gFieldObjectPic_PikachuDoll), +const struct SpriteFrameImage gEventObjectPicTable_PikachuDoll[] = { + obj_frame_tiles(gEventObjectPic_PikachuDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_MarillDoll[] = { - obj_frame_tiles(gFieldObjectPic_MarillDoll), +const struct SpriteFrameImage gEventObjectPicTable_MarillDoll[] = { + obj_frame_tiles(gEventObjectPic_MarillDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_TogepiDoll[] = { - obj_frame_tiles(gFieldObjectPic_TogepiDoll), +const struct SpriteFrameImage gEventObjectPicTable_TogepiDoll[] = { + obj_frame_tiles(gEventObjectPic_TogepiDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_CyndaquilDoll[] = { - obj_frame_tiles(gFieldObjectPic_CyndaquilDoll), +const struct SpriteFrameImage gEventObjectPicTable_CyndaquilDoll[] = { + obj_frame_tiles(gEventObjectPic_CyndaquilDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_ChikoritaDoll[] = { - obj_frame_tiles(gFieldObjectPic_ChikoritaDoll), +const struct SpriteFrameImage gEventObjectPicTable_ChikoritaDoll[] = { + obj_frame_tiles(gEventObjectPic_ChikoritaDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_TotodileDoll[] = { - obj_frame_tiles(gFieldObjectPic_TotodileDoll), +const struct SpriteFrameImage gEventObjectPicTable_TotodileDoll[] = { + obj_frame_tiles(gEventObjectPic_TotodileDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_JigglypuffDoll[] = { - obj_frame_tiles(gFieldObjectPic_JigglypuffDoll), +const struct SpriteFrameImage gEventObjectPicTable_JigglypuffDoll[] = { + obj_frame_tiles(gEventObjectPic_JigglypuffDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_MeowthDoll[] = { - obj_frame_tiles(gFieldObjectPic_MeowthDoll), +const struct SpriteFrameImage gEventObjectPicTable_MeowthDoll[] = { + obj_frame_tiles(gEventObjectPic_MeowthDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_ClefairyDoll[] = { - obj_frame_tiles(gFieldObjectPic_ClefairyDoll), +const struct SpriteFrameImage gEventObjectPicTable_ClefairyDoll[] = { + obj_frame_tiles(gEventObjectPic_ClefairyDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_DittoDoll[] = { - obj_frame_tiles(gFieldObjectPic_DittoDoll), +const struct SpriteFrameImage gEventObjectPicTable_DittoDoll[] = { + obj_frame_tiles(gEventObjectPic_DittoDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_SmoochumDoll[] = { - obj_frame_tiles(gFieldObjectPic_SmoochumDoll), +const struct SpriteFrameImage gEventObjectPicTable_SmoochumDoll[] = { + obj_frame_tiles(gEventObjectPic_SmoochumDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_TreeckoDoll[] = { - obj_frame_tiles(gFieldObjectPic_TreeckoDoll), +const struct SpriteFrameImage gEventObjectPicTable_TreeckoDoll[] = { + obj_frame_tiles(gEventObjectPic_TreeckoDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_TorchicDoll[] = { - obj_frame_tiles(gFieldObjectPic_TorchicDoll), +const struct SpriteFrameImage gEventObjectPicTable_TorchicDoll[] = { + obj_frame_tiles(gEventObjectPic_TorchicDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_MudkipDoll[] = { - obj_frame_tiles(gFieldObjectPic_MudkipDoll), +const struct SpriteFrameImage gEventObjectPicTable_MudkipDoll[] = { + obj_frame_tiles(gEventObjectPic_MudkipDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_DuskullDoll[] = { - obj_frame_tiles(gFieldObjectPic_DuskullDoll), +const struct SpriteFrameImage gEventObjectPicTable_DuskullDoll[] = { + obj_frame_tiles(gEventObjectPic_DuskullDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_WynautDoll[] = { - obj_frame_tiles(gFieldObjectPic_WynautDoll), +const struct SpriteFrameImage gEventObjectPicTable_WynautDoll[] = { + obj_frame_tiles(gEventObjectPic_WynautDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_BaltoyDoll[] = { - obj_frame_tiles(gFieldObjectPic_BaltoyDoll), +const struct SpriteFrameImage gEventObjectPicTable_BaltoyDoll[] = { + obj_frame_tiles(gEventObjectPic_BaltoyDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_KecleonDoll[] = { - obj_frame_tiles(gFieldObjectPic_KecleonDoll), +const struct SpriteFrameImage gEventObjectPicTable_KecleonDoll[] = { + obj_frame_tiles(gEventObjectPic_KecleonDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_AzurillDoll[] = { - obj_frame_tiles(gFieldObjectPic_AzurillDoll), +const struct SpriteFrameImage gEventObjectPicTable_AzurillDoll[] = { + obj_frame_tiles(gEventObjectPic_AzurillDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_SkittyDoll[] = { - obj_frame_tiles(gFieldObjectPic_SkittyDoll), +const struct SpriteFrameImage gEventObjectPicTable_SkittyDoll[] = { + obj_frame_tiles(gEventObjectPic_SkittyDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_SwabluDoll[] = { - obj_frame_tiles(gFieldObjectPic_SwabluDoll), +const struct SpriteFrameImage gEventObjectPicTable_SwabluDoll[] = { + obj_frame_tiles(gEventObjectPic_SwabluDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_GulpinDoll[] = { - obj_frame_tiles(gFieldObjectPic_GulpinDoll), +const struct SpriteFrameImage gEventObjectPicTable_GulpinDoll[] = { + obj_frame_tiles(gEventObjectPic_GulpinDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_LotadDoll[] = { - obj_frame_tiles(gFieldObjectPic_LotadDoll), +const struct SpriteFrameImage gEventObjectPicTable_LotadDoll[] = { + obj_frame_tiles(gEventObjectPic_LotadDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_SeedotDoll[] = { - obj_frame_tiles(gFieldObjectPic_SeedotDoll), +const struct SpriteFrameImage gEventObjectPicTable_SeedotDoll[] = { + obj_frame_tiles(gEventObjectPic_SeedotDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_PikaCushion[] = { - obj_frame_tiles(gFieldObjectPic_PikaCushion), +const struct SpriteFrameImage gEventObjectPicTable_PikaCushion[] = { + obj_frame_tiles(gEventObjectPic_PikaCushion), }; -const struct SpriteFrameImage gFieldObjectPicTable_RoundCushion[] = { - obj_frame_tiles(gFieldObjectPic_RoundCushion), +const struct SpriteFrameImage gEventObjectPicTable_RoundCushion[] = { + obj_frame_tiles(gEventObjectPic_RoundCushion), }; -const struct SpriteFrameImage gFieldObjectPicTable_KissCushion[] = { - obj_frame_tiles(gFieldObjectPic_KissCushion), +const struct SpriteFrameImage gEventObjectPicTable_KissCushion[] = { + obj_frame_tiles(gEventObjectPic_KissCushion), }; -const struct SpriteFrameImage gFieldObjectPicTable_ZigzagCushion[] = { - obj_frame_tiles(gFieldObjectPic_ZigzagCushion), +const struct SpriteFrameImage gEventObjectPicTable_ZigzagCushion[] = { + obj_frame_tiles(gEventObjectPic_ZigzagCushion), }; -const struct SpriteFrameImage gFieldObjectPicTable_SpinCushion[] = { - obj_frame_tiles(gFieldObjectPic_SpinCushion), +const struct SpriteFrameImage gEventObjectPicTable_SpinCushion[] = { + obj_frame_tiles(gEventObjectPic_SpinCushion), }; -const struct SpriteFrameImage gFieldObjectPicTable_DiamondCushion[] = { - obj_frame_tiles(gFieldObjectPic_DiamondCushion), +const struct SpriteFrameImage gEventObjectPicTable_DiamondCushion[] = { + obj_frame_tiles(gEventObjectPic_DiamondCushion), }; -const struct SpriteFrameImage gFieldObjectPicTable_BallCushion[] = { - obj_frame_tiles(gFieldObjectPic_BallCushion), +const struct SpriteFrameImage gEventObjectPicTable_BallCushion[] = { + obj_frame_tiles(gEventObjectPic_BallCushion), }; -const struct SpriteFrameImage gFieldObjectPicTable_GrassCushion[] = { - obj_frame_tiles(gFieldObjectPic_GrassCushion), +const struct SpriteFrameImage gEventObjectPicTable_GrassCushion[] = { + obj_frame_tiles(gEventObjectPic_GrassCushion), }; -const struct SpriteFrameImage gFieldObjectPicTable_FireCushion[] = { - obj_frame_tiles(gFieldObjectPic_FireCushion), +const struct SpriteFrameImage gEventObjectPicTable_FireCushion[] = { + obj_frame_tiles(gEventObjectPic_FireCushion), }; -const struct SpriteFrameImage gFieldObjectPicTable_WaterCushion[] = { - obj_frame_tiles(gFieldObjectPic_WaterCushion), +const struct SpriteFrameImage gEventObjectPicTable_WaterCushion[] = { + obj_frame_tiles(gEventObjectPic_WaterCushion), }; -const struct SpriteFrameImage gFieldObjectPicTable_BigSnorlaxDoll[] = { - obj_frame_tiles(gFieldObjectPic_BigSnorlaxDoll), +const struct SpriteFrameImage gEventObjectPicTable_BigSnorlaxDoll[] = { + obj_frame_tiles(gEventObjectPic_BigSnorlaxDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_BigRhydonDoll[] = { - obj_frame_tiles(gFieldObjectPic_BigRhydonDoll), +const struct SpriteFrameImage gEventObjectPicTable_BigRhydonDoll[] = { + obj_frame_tiles(gEventObjectPic_BigRhydonDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_BigLaprasDoll[] = { - obj_frame_tiles(gFieldObjectPic_BigLaprasDoll), +const struct SpriteFrameImage gEventObjectPicTable_BigLaprasDoll[] = { + obj_frame_tiles(gEventObjectPic_BigLaprasDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_BigVenusaurDoll[] = { - obj_frame_tiles(gFieldObjectPic_BigVenusaurDoll), +const struct SpriteFrameImage gEventObjectPicTable_BigVenusaurDoll[] = { + obj_frame_tiles(gEventObjectPic_BigVenusaurDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_BigCharizardDoll[] = { - obj_frame_tiles(gFieldObjectPic_BigCharizardDoll), +const struct SpriteFrameImage gEventObjectPicTable_BigCharizardDoll[] = { + obj_frame_tiles(gEventObjectPic_BigCharizardDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_BigBlastoiseDoll[] = { - obj_frame_tiles(gFieldObjectPic_BigBlastoiseDoll), +const struct SpriteFrameImage gEventObjectPicTable_BigBlastoiseDoll[] = { + obj_frame_tiles(gEventObjectPic_BigBlastoiseDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_BigWailmerDoll[] = { - obj_frame_tiles(gFieldObjectPic_BigWailmerDoll), +const struct SpriteFrameImage gEventObjectPicTable_BigWailmerDoll[] = { + obj_frame_tiles(gEventObjectPic_BigWailmerDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_BigRegirockDoll[] = { - obj_frame_tiles(gFieldObjectPic_BigRegirockDoll), +const struct SpriteFrameImage gEventObjectPicTable_BigRegirockDoll[] = { + obj_frame_tiles(gEventObjectPic_BigRegirockDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_BigRegiceDoll[] = { - obj_frame_tiles(gFieldObjectPic_BigRegiceDoll), +const struct SpriteFrameImage gEventObjectPicTable_BigRegiceDoll[] = { + obj_frame_tiles(gEventObjectPic_BigRegiceDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_BigRegisteelDoll[] = { - obj_frame_tiles(gFieldObjectPic_BigRegisteelDoll), +const struct SpriteFrameImage gEventObjectPicTable_BigRegisteelDoll[] = { + obj_frame_tiles(gEventObjectPic_BigRegisteelDoll), }; -const struct SpriteFrameImage gFieldObjectPicTable_LatiasLatios[] = { - obj_frame_tiles(gFieldObjectPic_LatiasLatios_0), - obj_frame_tiles(gFieldObjectPic_LatiasLatios_0), - obj_frame_tiles(gFieldObjectPic_LatiasLatios_0), - obj_frame_tiles(gFieldObjectPic_LatiasLatios_1), - obj_frame_tiles(gFieldObjectPic_LatiasLatios_2), - obj_frame_tiles(gFieldObjectPic_LatiasLatios_1), - obj_frame_tiles(gFieldObjectPic_LatiasLatios_2), - obj_frame_tiles(gFieldObjectPic_LatiasLatios_1), - obj_frame_tiles(gFieldObjectPic_LatiasLatios_2), +const struct SpriteFrameImage gEventObjectPicTable_LatiasLatios[] = { + obj_frame_tiles(gEventObjectPic_LatiasLatios_0), + obj_frame_tiles(gEventObjectPic_LatiasLatios_0), + obj_frame_tiles(gEventObjectPic_LatiasLatios_0), + obj_frame_tiles(gEventObjectPic_LatiasLatios_1), + obj_frame_tiles(gEventObjectPic_LatiasLatios_2), + obj_frame_tiles(gEventObjectPic_LatiasLatios_1), + obj_frame_tiles(gEventObjectPic_LatiasLatios_2), + obj_frame_tiles(gEventObjectPic_LatiasLatios_1), + obj_frame_tiles(gEventObjectPic_LatiasLatios_2), }; -const struct SpriteFrameImage gFieldObjectPicTable_Boy5[] = { - obj_frame_tiles(gFieldObjectPic_Boy5_0), - obj_frame_tiles(gFieldObjectPic_Boy5_1), - obj_frame_tiles(gFieldObjectPic_Boy5_2), - obj_frame_tiles(gFieldObjectPic_Boy5_0), - obj_frame_tiles(gFieldObjectPic_Boy5_0), - obj_frame_tiles(gFieldObjectPic_Boy5_1), - obj_frame_tiles(gFieldObjectPic_Boy5_1), - obj_frame_tiles(gFieldObjectPic_Boy5_2), - obj_frame_tiles(gFieldObjectPic_Boy5_2), +const struct SpriteFrameImage gEventObjectPicTable_Boy5[] = { + obj_frame_tiles(gEventObjectPic_Boy5_0), + obj_frame_tiles(gEventObjectPic_Boy5_1), + obj_frame_tiles(gEventObjectPic_Boy5_2), + obj_frame_tiles(gEventObjectPic_Boy5_0), + obj_frame_tiles(gEventObjectPic_Boy5_0), + obj_frame_tiles(gEventObjectPic_Boy5_1), + obj_frame_tiles(gEventObjectPic_Boy5_1), + obj_frame_tiles(gEventObjectPic_Boy5_2), + obj_frame_tiles(gEventObjectPic_Boy5_2), }; -const struct SpriteFrameImage gFieldObjectPicTable_ContestOldMan[] = { - obj_frame_tiles(gFieldObjectPic_ContestOldMan_0), - obj_frame_tiles(gFieldObjectPic_ContestOldMan_1), - obj_frame_tiles(gFieldObjectPic_ContestOldMan_2), - obj_frame_tiles(gFieldObjectPic_ContestOldMan_3), - obj_frame_tiles(gFieldObjectPic_ContestOldMan_4), - obj_frame_tiles(gFieldObjectPic_ContestOldMan_5), - obj_frame_tiles(gFieldObjectPic_ContestOldMan_6), - obj_frame_tiles(gFieldObjectPic_ContestOldMan_7), - obj_frame_tiles(gFieldObjectPic_ContestOldMan_8), +const struct SpriteFrameImage gEventObjectPicTable_ContestOldMan[] = { + obj_frame_tiles(gEventObjectPic_ContestOldMan_0), + obj_frame_tiles(gEventObjectPic_ContestOldMan_1), + obj_frame_tiles(gEventObjectPic_ContestOldMan_2), + obj_frame_tiles(gEventObjectPic_ContestOldMan_3), + obj_frame_tiles(gEventObjectPic_ContestOldMan_4), + obj_frame_tiles(gEventObjectPic_ContestOldMan_5), + obj_frame_tiles(gEventObjectPic_ContestOldMan_6), + obj_frame_tiles(gEventObjectPic_ContestOldMan_7), + obj_frame_tiles(gEventObjectPic_ContestOldMan_8), }; -const struct SpriteFrameImage gFieldObjectPicTable_BrendanWatering[] = { - obj_frame_tiles(gFieldObjectPic_BrendanWatering_0), - obj_frame_tiles(gFieldObjectPic_BrendanWatering_1), - obj_frame_tiles(gFieldObjectPic_BrendanWatering_2), - obj_frame_tiles(gFieldObjectPic_BrendanWatering_3), - obj_frame_tiles(gFieldObjectPic_BrendanWatering_3), - obj_frame_tiles(gFieldObjectPic_BrendanWatering_4), - obj_frame_tiles(gFieldObjectPic_BrendanWatering_4), - obj_frame_tiles(gFieldObjectPic_BrendanWatering_5), - obj_frame_tiles(gFieldObjectPic_BrendanWatering_5), +const struct SpriteFrameImage gEventObjectPicTable_BrendanWatering[] = { + obj_frame_tiles(gEventObjectPic_BrendanWatering_0), + obj_frame_tiles(gEventObjectPic_BrendanWatering_1), + obj_frame_tiles(gEventObjectPic_BrendanWatering_2), + obj_frame_tiles(gEventObjectPic_BrendanWatering_3), + obj_frame_tiles(gEventObjectPic_BrendanWatering_3), + obj_frame_tiles(gEventObjectPic_BrendanWatering_4), + obj_frame_tiles(gEventObjectPic_BrendanWatering_4), + obj_frame_tiles(gEventObjectPic_BrendanWatering_5), + obj_frame_tiles(gEventObjectPic_BrendanWatering_5), }; -const struct SpriteFrameImage gFieldObjectPicTable_MayWatering[] = { - obj_frame_tiles(gFieldObjectPic_MayWatering_0), - obj_frame_tiles(gFieldObjectPic_MayWatering_1), - obj_frame_tiles(gFieldObjectPic_MayWatering_2), - obj_frame_tiles(gFieldObjectPic_MayWatering_3), - obj_frame_tiles(gFieldObjectPic_MayWatering_3), - obj_frame_tiles(gFieldObjectPic_MayWatering_4), - obj_frame_tiles(gFieldObjectPic_MayWatering_4), - obj_frame_tiles(gFieldObjectPic_MayWatering_5), - obj_frame_tiles(gFieldObjectPic_MayWatering_5), +const struct SpriteFrameImage gEventObjectPicTable_MayWatering[] = { + obj_frame_tiles(gEventObjectPic_MayWatering_0), + obj_frame_tiles(gEventObjectPic_MayWatering_1), + obj_frame_tiles(gEventObjectPic_MayWatering_2), + obj_frame_tiles(gEventObjectPic_MayWatering_3), + obj_frame_tiles(gEventObjectPic_MayWatering_3), + obj_frame_tiles(gEventObjectPic_MayWatering_4), + obj_frame_tiles(gEventObjectPic_MayWatering_4), + obj_frame_tiles(gEventObjectPic_MayWatering_5), + obj_frame_tiles(gEventObjectPic_MayWatering_5), }; -const struct SpriteFrameImage gFieldObjectPicTable_BrendanDecorating[] = { - obj_frame_tiles(gFieldObjectPic_BrendanDecorating), +const struct SpriteFrameImage gEventObjectPicTable_BrendanDecorating[] = { + obj_frame_tiles(gEventObjectPic_BrendanDecorating), }; - -const struct SpriteFrameImage gFieldObjectPicTable_MayDecorating[] = { - obj_frame_tiles(gFieldObjectPic_MayDecorating), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Archie[] = { - obj_frame_tiles(gFieldObjectPic_Archie_0), - obj_frame_tiles(gFieldObjectPic_Archie_1), - obj_frame_tiles(gFieldObjectPic_Archie_2), - obj_frame_tiles(gFieldObjectPic_Archie_3), - obj_frame_tiles(gFieldObjectPic_Archie_4), - obj_frame_tiles(gFieldObjectPic_Archie_5), - obj_frame_tiles(gFieldObjectPic_Archie_6), - obj_frame_tiles(gFieldObjectPic_Archie_7), - obj_frame_tiles(gFieldObjectPic_Archie_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Maxie[] = { - obj_frame_tiles(gFieldObjectPic_Maxie_0), - obj_frame_tiles(gFieldObjectPic_Maxie_1), - obj_frame_tiles(gFieldObjectPic_Maxie_2), - obj_frame_tiles(gFieldObjectPic_Maxie_3), - obj_frame_tiles(gFieldObjectPic_Maxie_4), - obj_frame_tiles(gFieldObjectPic_Maxie_5), - obj_frame_tiles(gFieldObjectPic_Maxie_6), - obj_frame_tiles(gFieldObjectPic_Maxie_7), - obj_frame_tiles(gFieldObjectPic_Maxie_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_KyogreFront[] = { - obj_frame_tiles(gFieldObjectPic_KyogreFront_0), - obj_frame_tiles(gFieldObjectPic_KyogreFront_0), - obj_frame_tiles(gFieldObjectPic_KyogreFront_0), - obj_frame_tiles(gFieldObjectPic_KyogreFront_1), - obj_frame_tiles(gFieldObjectPic_KyogreFront_1), - obj_frame_tiles(gFieldObjectPic_KyogreFront_1), - obj_frame_tiles(gFieldObjectPic_KyogreFront_1), - obj_frame_tiles(gFieldObjectPic_KyogreFront_1), - obj_frame_tiles(gFieldObjectPic_KyogreFront_1), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_GroudonFront[] = { - obj_frame_tiles(gFieldObjectPic_GroudonFront_0), - obj_frame_tiles(gFieldObjectPic_GroudonFront_0), - obj_frame_tiles(gFieldObjectPic_GroudonFront_0), - obj_frame_tiles(gFieldObjectPic_GroudonFront_1), - obj_frame_tiles(gFieldObjectPic_GroudonFront_1), - obj_frame_tiles(gFieldObjectPic_GroudonFront_1), - obj_frame_tiles(gFieldObjectPic_GroudonFront_1), - obj_frame_tiles(gFieldObjectPic_GroudonFront_1), - obj_frame_tiles(gFieldObjectPic_GroudonFront_1), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_KyogreSide[] = { - obj_frame_tiles(gFieldObjectPic_KyogreSide_0), - obj_frame_tiles(gFieldObjectPic_KyogreSide_0), - obj_frame_tiles(gFieldObjectPic_KyogreSide_0), - obj_frame_tiles(gFieldObjectPic_KyogreSide_1), - obj_frame_tiles(gFieldObjectPic_KyogreSide_1), - obj_frame_tiles(gFieldObjectPic_KyogreSide_1), - obj_frame_tiles(gFieldObjectPic_KyogreSide_1), - obj_frame_tiles(gFieldObjectPic_KyogreSide_1), - obj_frame_tiles(gFieldObjectPic_KyogreSide_1), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_GroudonSide[] = { - obj_frame_tiles(gFieldObjectPic_GroudonSide_0), - obj_frame_tiles(gFieldObjectPic_GroudonSide_0), - obj_frame_tiles(gFieldObjectPic_GroudonSide_0), - obj_frame_tiles(gFieldObjectPic_GroudonSide_1), - obj_frame_tiles(gFieldObjectPic_GroudonSide_1), - obj_frame_tiles(gFieldObjectPic_GroudonSide_1), - obj_frame_tiles(gFieldObjectPic_GroudonSide_1), - obj_frame_tiles(gFieldObjectPic_GroudonSide_1), - obj_frame_tiles(gFieldObjectPic_GroudonSide_1), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Fossil[] = { - obj_frame_tiles(gFieldObjectPic_Fossil), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Regi[] = { - obj_frame_tiles(gFieldObjectPic_Regi), - obj_frame_tiles(gFieldObjectPic_Regi), - obj_frame_tiles(gFieldObjectPic_Regi), - obj_frame_tiles(gFieldObjectPic_Regi), - obj_frame_tiles(gFieldObjectPic_Regi), - obj_frame_tiles(gFieldObjectPic_Regi), - obj_frame_tiles(gFieldObjectPic_Regi), - obj_frame_tiles(gFieldObjectPic_Regi), - obj_frame_tiles(gFieldObjectPic_Regi), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Skitty[] = { - obj_frame_tiles(gFieldObjectPic_Skitty_0), - obj_frame_tiles(gFieldObjectPic_Skitty_1), - obj_frame_tiles(gFieldObjectPic_Skitty_2), - obj_frame_tiles(gFieldObjectPic_Skitty_0), - obj_frame_tiles(gFieldObjectPic_Skitty_0), - obj_frame_tiles(gFieldObjectPic_Skitty_1), - obj_frame_tiles(gFieldObjectPic_Skitty_1), - obj_frame_tiles(gFieldObjectPic_Skitty_2), - obj_frame_tiles(gFieldObjectPic_Skitty_2), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Kecleon[] = { - obj_frame_tiles(gFieldObjectPic_Kecleon_0), - obj_frame_tiles(gFieldObjectPic_Kecleon_1), - obj_frame_tiles(gFieldObjectPic_Kecleon_2), - obj_frame_tiles(gFieldObjectPic_Kecleon_0), - obj_frame_tiles(gFieldObjectPic_Kecleon_0), - obj_frame_tiles(gFieldObjectPic_Kecleon_1), - obj_frame_tiles(gFieldObjectPic_Kecleon_1), - obj_frame_tiles(gFieldObjectPic_Kecleon_2), - obj_frame_tiles(gFieldObjectPic_Kecleon_2), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Rayquaza[] = { - obj_frame_tiles(gFieldObjectPic_Rayquaza_0), - obj_frame_tiles(gFieldObjectPic_Rayquaza_1), - obj_frame_tiles(gFieldObjectPic_Rayquaza_2), - obj_frame_tiles(gFieldObjectPic_Rayquaza_3), - obj_frame_tiles(gFieldObjectPic_Rayquaza_4), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_RayquazaStill[] = { - obj_frame_tiles(gFieldObjectPic_RayquazaStill), - obj_frame_tiles(gFieldObjectPic_RayquazaStill), - obj_frame_tiles(gFieldObjectPic_RayquazaStill), - obj_frame_tiles(gFieldObjectPic_RayquazaStill), - obj_frame_tiles(gFieldObjectPic_RayquazaStill), - obj_frame_tiles(gFieldObjectPic_RayquazaStill), - obj_frame_tiles(gFieldObjectPic_RayquazaStill), - obj_frame_tiles(gFieldObjectPic_RayquazaStill), - obj_frame_tiles(gFieldObjectPic_RayquazaStill), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Zigzagoon[] = { - obj_frame_tiles(gFieldObjectPic_Zigzagoon_0), - obj_frame_tiles(gFieldObjectPic_Zigzagoon_1), - obj_frame_tiles(gFieldObjectPic_Zigzagoon_2), - obj_frame_tiles(gFieldObjectPic_Zigzagoon_0), - obj_frame_tiles(gFieldObjectPic_Zigzagoon_0), - obj_frame_tiles(gFieldObjectPic_Zigzagoon_1), - obj_frame_tiles(gFieldObjectPic_Zigzagoon_1), - obj_frame_tiles(gFieldObjectPic_Zigzagoon_2), - obj_frame_tiles(gFieldObjectPic_Zigzagoon_2), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Pikachu[] = { - obj_frame_tiles(gFieldObjectPic_Pikachu_0), - obj_frame_tiles(gFieldObjectPic_Pikachu_1), - obj_frame_tiles(gFieldObjectPic_Pikachu_2), - obj_frame_tiles(gFieldObjectPic_Pikachu_0), - obj_frame_tiles(gFieldObjectPic_Pikachu_0), - obj_frame_tiles(gFieldObjectPic_Pikachu_1), - obj_frame_tiles(gFieldObjectPic_Pikachu_1), - obj_frame_tiles(gFieldObjectPic_Pikachu_2), - obj_frame_tiles(gFieldObjectPic_Pikachu_2), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Azumarill[] = { - obj_frame_tiles(gFieldObjectPic_Azumarill_0), - obj_frame_tiles(gFieldObjectPic_Azumarill_1), - obj_frame_tiles(gFieldObjectPic_Azumarill_2), - obj_frame_tiles(gFieldObjectPic_Azumarill_0), - obj_frame_tiles(gFieldObjectPic_Azumarill_0), - obj_frame_tiles(gFieldObjectPic_Azumarill_1), - obj_frame_tiles(gFieldObjectPic_Azumarill_1), - obj_frame_tiles(gFieldObjectPic_Azumarill_2), - obj_frame_tiles(gFieldObjectPic_Azumarill_2), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Wingull[] = { - obj_frame_tiles(gFieldObjectPic_Wingull_0), - obj_frame_tiles(gFieldObjectPic_Wingull_1), - obj_frame_tiles(gFieldObjectPic_Wingull_2), - obj_frame_tiles(gFieldObjectPic_Wingull_3), - obj_frame_tiles(gFieldObjectPic_Wingull_3), - obj_frame_tiles(gFieldObjectPic_Wingull_4), - obj_frame_tiles(gFieldObjectPic_Wingull_4), - obj_frame_tiles(gFieldObjectPic_Wingull_5), - obj_frame_tiles(gFieldObjectPic_Wingull_5), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_TuberMSwimming[] = { - obj_frame_tiles(gFieldObjectPic_TuberMSwimming_0), - obj_frame_tiles(gFieldObjectPic_TuberMSwimming_1), - obj_frame_tiles(gFieldObjectPic_TuberMSwimming_2), - obj_frame_tiles(gFieldObjectPic_TuberMSwimming_3), - obj_frame_tiles(gFieldObjectPic_TuberMSwimming_4), - obj_frame_tiles(gFieldObjectPic_TuberMSwimming_5), - obj_frame_tiles(gFieldObjectPic_TuberMSwimming_6), - obj_frame_tiles(gFieldObjectPic_TuberMSwimming_7), - obj_frame_tiles(gFieldObjectPic_TuberMSwimming_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Azurill[] = { - obj_frame_tiles(gFieldObjectPic_Azurill_0), - obj_frame_tiles(gFieldObjectPic_Azurill_1), - obj_frame_tiles(gFieldObjectPic_Azurill_2), - obj_frame_tiles(gFieldObjectPic_Azurill_0), - obj_frame_tiles(gFieldObjectPic_Azurill_0), - obj_frame_tiles(gFieldObjectPic_Azurill_1), - obj_frame_tiles(gFieldObjectPic_Azurill_1), - obj_frame_tiles(gFieldObjectPic_Azurill_2), - obj_frame_tiles(gFieldObjectPic_Azurill_2), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Mom[] = { - obj_frame_tiles(gFieldObjectPic_Mom_0), - obj_frame_tiles(gFieldObjectPic_Mom_1), - obj_frame_tiles(gFieldObjectPic_Mom_2), - obj_frame_tiles(gFieldObjectPic_Mom_3), - obj_frame_tiles(gFieldObjectPic_Mom_4), - obj_frame_tiles(gFieldObjectPic_Mom_5), - obj_frame_tiles(gFieldObjectPic_Mom_6), - obj_frame_tiles(gFieldObjectPic_Mom_7), - obj_frame_tiles(gFieldObjectPic_Mom_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Scott[] = { - obj_frame_tiles(gFieldObjectPic_Scott_0), - obj_frame_tiles(gFieldObjectPic_Scott_1), - obj_frame_tiles(gFieldObjectPic_Scott_2), - obj_frame_tiles(gFieldObjectPic_Scott_3), - obj_frame_tiles(gFieldObjectPic_Scott_4), - obj_frame_tiles(gFieldObjectPic_Scott_5), - obj_frame_tiles(gFieldObjectPic_Scott_6), - obj_frame_tiles(gFieldObjectPic_Scott_7), - obj_frame_tiles(gFieldObjectPic_Scott_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Juan[] = { - obj_frame_tiles(gFieldObjectPic_Juan_0), - obj_frame_tiles(gFieldObjectPic_Juan_1), - obj_frame_tiles(gFieldObjectPic_Juan_2), - obj_frame_tiles(gFieldObjectPic_Juan_3), - obj_frame_tiles(gFieldObjectPic_Juan_4), - obj_frame_tiles(gFieldObjectPic_Juan_5), - obj_frame_tiles(gFieldObjectPic_Juan_6), - obj_frame_tiles(gFieldObjectPic_Juan_7), - obj_frame_tiles(gFieldObjectPic_Juan_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_MysteryEventDeliveryman[] = { - obj_frame_tiles(gFieldObjectPic_MysteryEventDeliveryman_0), - obj_frame_tiles(gFieldObjectPic_MysteryEventDeliveryman_1), - obj_frame_tiles(gFieldObjectPic_MysteryEventDeliveryman_2), - obj_frame_tiles(gFieldObjectPic_MysteryEventDeliveryman_0), - obj_frame_tiles(gFieldObjectPic_MysteryEventDeliveryman_0), - obj_frame_tiles(gFieldObjectPic_MysteryEventDeliveryman_1), - obj_frame_tiles(gFieldObjectPic_MysteryEventDeliveryman_1), - obj_frame_tiles(gFieldObjectPic_MysteryEventDeliveryman_2), - obj_frame_tiles(gFieldObjectPic_MysteryEventDeliveryman_2), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Statue[] = { - obj_frame_tiles(gFieldObjectPic_Statue), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Dusclops[] = { - obj_frame_tiles(gFieldObjectPic_Dusclops_0), - obj_frame_tiles(gFieldObjectPic_Dusclops_1), - obj_frame_tiles(gFieldObjectPic_Dusclops_2), - obj_frame_tiles(gFieldObjectPic_Dusclops_3), - obj_frame_tiles(gFieldObjectPic_Dusclops_4), - obj_frame_tiles(gFieldObjectPic_Dusclops_5), - obj_frame_tiles(gFieldObjectPic_Dusclops_6), - obj_frame_tiles(gFieldObjectPic_Dusclops_7), - obj_frame_tiles(gFieldObjectPic_Dusclops_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Kirlia[] = { - obj_frame_tiles(gFieldObjectPic_Kirlia_0), - obj_frame_tiles(gFieldObjectPic_Kirlia_1), - obj_frame_tiles(gFieldObjectPic_Kirlia_2), - obj_frame_tiles(gFieldObjectPic_Kirlia_3), - obj_frame_tiles(gFieldObjectPic_Kirlia_4), - obj_frame_tiles(gFieldObjectPic_Kirlia_5), - obj_frame_tiles(gFieldObjectPic_Kirlia_6), - obj_frame_tiles(gFieldObjectPic_Kirlia_7), - obj_frame_tiles(gFieldObjectPic_Kirlia_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_UnionRoomAttendant[] = { - obj_frame_tiles(gFieldObjectPic_UnionRoomAttendant_0), - obj_frame_tiles(gFieldObjectPic_UnionRoomAttendant_1), - obj_frame_tiles(gFieldObjectPic_UnionRoomAttendant_2), - obj_frame_tiles(gFieldObjectPic_UnionRoomAttendant_0), - obj_frame_tiles(gFieldObjectPic_UnionRoomAttendant_0), - obj_frame_tiles(gFieldObjectPic_UnionRoomAttendant_1), - obj_frame_tiles(gFieldObjectPic_UnionRoomAttendant_1), - obj_frame_tiles(gFieldObjectPic_UnionRoomAttendant_2), - obj_frame_tiles(gFieldObjectPic_UnionRoomAttendant_2), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Sudowoodo[] = { - obj_frame_tiles(gFieldObjectPic_Sudowoodo_0), - obj_frame_tiles(gFieldObjectPic_Sudowoodo_0), - obj_frame_tiles(gFieldObjectPic_Sudowoodo_1), - obj_frame_tiles(gFieldObjectPic_Sudowoodo_0), - obj_frame_tiles(gFieldObjectPic_Sudowoodo_0), - obj_frame_tiles(gFieldObjectPic_Sudowoodo_0), - obj_frame_tiles(gFieldObjectPic_Sudowoodo_0), - obj_frame_tiles(gFieldObjectPic_Sudowoodo_1), - obj_frame_tiles(gFieldObjectPic_Sudowoodo_2), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Mew[] = { - obj_frame_tiles(gFieldObjectPic_Mew_0), - obj_frame_tiles(gFieldObjectPic_Mew_1), - obj_frame_tiles(gFieldObjectPic_Mew_2), - obj_frame_tiles(gFieldObjectPic_Mew_3), - obj_frame_tiles(gFieldObjectPic_Mew_4), - obj_frame_tiles(gFieldObjectPic_Mew_5), - obj_frame_tiles(gFieldObjectPic_Mew_6), - obj_frame_tiles(gFieldObjectPic_Mew_7), - obj_frame_tiles(gFieldObjectPic_Mew_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Red[] = { - obj_frame_tiles(gFieldObjectPic_Red_0), - obj_frame_tiles(gFieldObjectPic_Red_1), - obj_frame_tiles(gFieldObjectPic_Red_2), - obj_frame_tiles(gFieldObjectPic_Red_3), - obj_frame_tiles(gFieldObjectPic_Red_4), - obj_frame_tiles(gFieldObjectPic_Red_5), - obj_frame_tiles(gFieldObjectPic_Red_6), - obj_frame_tiles(gFieldObjectPic_Red_7), - obj_frame_tiles(gFieldObjectPic_Red_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Leaf[] = { - obj_frame_tiles(gFieldObjectPic_Leaf_0), - obj_frame_tiles(gFieldObjectPic_Leaf_1), - obj_frame_tiles(gFieldObjectPic_Leaf_2), - obj_frame_tiles(gFieldObjectPic_Leaf_3), - obj_frame_tiles(gFieldObjectPic_Leaf_4), - obj_frame_tiles(gFieldObjectPic_Leaf_5), - obj_frame_tiles(gFieldObjectPic_Leaf_6), - obj_frame_tiles(gFieldObjectPic_Leaf_7), - obj_frame_tiles(gFieldObjectPic_Leaf_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Deoxys[] = { - obj_frame_tiles(gFieldObjectPic_Deoxys_0), - obj_frame_tiles(gFieldObjectPic_Deoxys_0), - obj_frame_tiles(gFieldObjectPic_Deoxys_0), - obj_frame_tiles(gFieldObjectPic_Deoxys_0), - obj_frame_tiles(gFieldObjectPic_Deoxys_1), - obj_frame_tiles(gFieldObjectPic_Deoxys_0), - obj_frame_tiles(gFieldObjectPic_Deoxys_1), - obj_frame_tiles(gFieldObjectPic_Deoxys_0), - obj_frame_tiles(gFieldObjectPic_Deoxys_0), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_BirthIslandStone[] = { - obj_frame_tiles(gFieldObjectPic_BirthIslandStone), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Anabel[] = { - obj_frame_tiles(gFieldObjectPic_Anabel_0), - obj_frame_tiles(gFieldObjectPic_Anabel_1), - obj_frame_tiles(gFieldObjectPic_Anabel_2), - obj_frame_tiles(gFieldObjectPic_Anabel_3), - obj_frame_tiles(gFieldObjectPic_Anabel_4), - obj_frame_tiles(gFieldObjectPic_Anabel_5), - obj_frame_tiles(gFieldObjectPic_Anabel_6), - obj_frame_tiles(gFieldObjectPic_Anabel_7), - obj_frame_tiles(gFieldObjectPic_Anabel_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Tucker[] = { - obj_frame_tiles(gFieldObjectPic_Tucker_0), - obj_frame_tiles(gFieldObjectPic_Tucker_1), - obj_frame_tiles(gFieldObjectPic_Tucker_2), - obj_frame_tiles(gFieldObjectPic_Tucker_3), - obj_frame_tiles(gFieldObjectPic_Tucker_4), - obj_frame_tiles(gFieldObjectPic_Tucker_5), - obj_frame_tiles(gFieldObjectPic_Tucker_6), - obj_frame_tiles(gFieldObjectPic_Tucker_7), - obj_frame_tiles(gFieldObjectPic_Tucker_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Spenser[] = { - obj_frame_tiles(gFieldObjectPic_Spenser_0), - obj_frame_tiles(gFieldObjectPic_Spenser_1), - obj_frame_tiles(gFieldObjectPic_Spenser_2), - obj_frame_tiles(gFieldObjectPic_Spenser_3), - obj_frame_tiles(gFieldObjectPic_Spenser_4), - obj_frame_tiles(gFieldObjectPic_Spenser_5), - obj_frame_tiles(gFieldObjectPic_Spenser_6), - obj_frame_tiles(gFieldObjectPic_Spenser_7), - obj_frame_tiles(gFieldObjectPic_Spenser_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Greta[] = { - obj_frame_tiles(gFieldObjectPic_Greta_0), - obj_frame_tiles(gFieldObjectPic_Greta_1), - obj_frame_tiles(gFieldObjectPic_Greta_2), - obj_frame_tiles(gFieldObjectPic_Greta_3), - obj_frame_tiles(gFieldObjectPic_Greta_4), - obj_frame_tiles(gFieldObjectPic_Greta_5), - obj_frame_tiles(gFieldObjectPic_Greta_6), - obj_frame_tiles(gFieldObjectPic_Greta_7), - obj_frame_tiles(gFieldObjectPic_Greta_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Noland[] = { - obj_frame_tiles(gFieldObjectPic_Noland_0), - obj_frame_tiles(gFieldObjectPic_Noland_1), - obj_frame_tiles(gFieldObjectPic_Noland_2), - obj_frame_tiles(gFieldObjectPic_Noland_3), - obj_frame_tiles(gFieldObjectPic_Noland_4), - obj_frame_tiles(gFieldObjectPic_Noland_5), - obj_frame_tiles(gFieldObjectPic_Noland_6), - obj_frame_tiles(gFieldObjectPic_Noland_7), - obj_frame_tiles(gFieldObjectPic_Noland_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Lucy[] = { - obj_frame_tiles(gFieldObjectPic_Lucy_0), - obj_frame_tiles(gFieldObjectPic_Lucy_1), - obj_frame_tiles(gFieldObjectPic_Lucy_2), - obj_frame_tiles(gFieldObjectPic_Lucy_3), - obj_frame_tiles(gFieldObjectPic_Lucy_4), - obj_frame_tiles(gFieldObjectPic_Lucy_5), - obj_frame_tiles(gFieldObjectPic_Lucy_6), - obj_frame_tiles(gFieldObjectPic_Lucy_7), - obj_frame_tiles(gFieldObjectPic_Lucy_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Brandon[] = { - obj_frame_tiles(gFieldObjectPic_Brandon_0), - obj_frame_tiles(gFieldObjectPic_Brandon_1), - obj_frame_tiles(gFieldObjectPic_Brandon_2), - obj_frame_tiles(gFieldObjectPic_Brandon_3), - obj_frame_tiles(gFieldObjectPic_Brandon_4), - obj_frame_tiles(gFieldObjectPic_Brandon_5), - obj_frame_tiles(gFieldObjectPic_Brandon_6), - obj_frame_tiles(gFieldObjectPic_Brandon_7), - obj_frame_tiles(gFieldObjectPic_Brandon_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_Lugia[] = { - obj_frame_tiles(gFieldObjectPic_Lugia_0), - obj_frame_tiles(gFieldObjectPic_Lugia_0), - obj_frame_tiles(gFieldObjectPic_Lugia_0), - obj_frame_tiles(gFieldObjectPic_Lugia_0), - obj_frame_tiles(gFieldObjectPic_Lugia_1), - obj_frame_tiles(gFieldObjectPic_Lugia_0), - obj_frame_tiles(gFieldObjectPic_Lugia_1), - obj_frame_tiles(gFieldObjectPic_Lugia_0), - obj_frame_tiles(gFieldObjectPic_Lugia_1), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_HoOh[] = { - obj_frame_tiles(gFieldObjectPic_HoOh_0), - obj_frame_tiles(gFieldObjectPic_HoOh_0), - obj_frame_tiles(gFieldObjectPic_HoOh_0), - obj_frame_tiles(gFieldObjectPic_HoOh_0), - obj_frame_tiles(gFieldObjectPic_HoOh_1), - obj_frame_tiles(gFieldObjectPic_HoOh_0), - obj_frame_tiles(gFieldObjectPic_HoOh_1), - obj_frame_tiles(gFieldObjectPic_HoOh_0), - obj_frame_tiles(gFieldObjectPic_HoOh_1), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_RubySapphireBrendan[] = { - obj_frame_tiles(gFieldObjectPic_RubySapphireBrendan_0), - obj_frame_tiles(gFieldObjectPic_RubySapphireBrendan_1), - obj_frame_tiles(gFieldObjectPic_RubySapphireBrendan_2), - obj_frame_tiles(gFieldObjectPic_RubySapphireBrendan_3), - obj_frame_tiles(gFieldObjectPic_RubySapphireBrendan_4), - obj_frame_tiles(gFieldObjectPic_RubySapphireBrendan_5), - obj_frame_tiles(gFieldObjectPic_RubySapphireBrendan_6), - obj_frame_tiles(gFieldObjectPic_RubySapphireBrendan_7), - obj_frame_tiles(gFieldObjectPic_RubySapphireBrendan_8), -}; - -const struct SpriteFrameImage gFieldObjectPicTable_RubySapphireMay[] = { - obj_frame_tiles(gFieldObjectPic_RubySapphireMay_0), - obj_frame_tiles(gFieldObjectPic_RubySapphireMay_1), - obj_frame_tiles(gFieldObjectPic_RubySapphireMay_2), - obj_frame_tiles(gFieldObjectPic_RubySapphireMay_3), - obj_frame_tiles(gFieldObjectPic_RubySapphireMay_4), - obj_frame_tiles(gFieldObjectPic_RubySapphireMay_5), - obj_frame_tiles(gFieldObjectPic_RubySapphireMay_6), - obj_frame_tiles(gFieldObjectPic_RubySapphireMay_7), - obj_frame_tiles(gFieldObjectPic_RubySapphireMay_8), + +const struct SpriteFrameImage gEventObjectPicTable_MayDecorating[] = { + obj_frame_tiles(gEventObjectPic_MayDecorating), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Archie[] = { + obj_frame_tiles(gEventObjectPic_Archie_0), + obj_frame_tiles(gEventObjectPic_Archie_1), + obj_frame_tiles(gEventObjectPic_Archie_2), + obj_frame_tiles(gEventObjectPic_Archie_3), + obj_frame_tiles(gEventObjectPic_Archie_4), + obj_frame_tiles(gEventObjectPic_Archie_5), + obj_frame_tiles(gEventObjectPic_Archie_6), + obj_frame_tiles(gEventObjectPic_Archie_7), + obj_frame_tiles(gEventObjectPic_Archie_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Maxie[] = { + obj_frame_tiles(gEventObjectPic_Maxie_0), + obj_frame_tiles(gEventObjectPic_Maxie_1), + obj_frame_tiles(gEventObjectPic_Maxie_2), + obj_frame_tiles(gEventObjectPic_Maxie_3), + obj_frame_tiles(gEventObjectPic_Maxie_4), + obj_frame_tiles(gEventObjectPic_Maxie_5), + obj_frame_tiles(gEventObjectPic_Maxie_6), + obj_frame_tiles(gEventObjectPic_Maxie_7), + obj_frame_tiles(gEventObjectPic_Maxie_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_KyogreFront[] = { + obj_frame_tiles(gEventObjectPic_KyogreFront_0), + obj_frame_tiles(gEventObjectPic_KyogreFront_0), + obj_frame_tiles(gEventObjectPic_KyogreFront_0), + obj_frame_tiles(gEventObjectPic_KyogreFront_1), + obj_frame_tiles(gEventObjectPic_KyogreFront_1), + obj_frame_tiles(gEventObjectPic_KyogreFront_1), + obj_frame_tiles(gEventObjectPic_KyogreFront_1), + obj_frame_tiles(gEventObjectPic_KyogreFront_1), + obj_frame_tiles(gEventObjectPic_KyogreFront_1), +}; + +const struct SpriteFrameImage gEventObjectPicTable_GroudonFront[] = { + obj_frame_tiles(gEventObjectPic_GroudonFront_0), + obj_frame_tiles(gEventObjectPic_GroudonFront_0), + obj_frame_tiles(gEventObjectPic_GroudonFront_0), + obj_frame_tiles(gEventObjectPic_GroudonFront_1), + obj_frame_tiles(gEventObjectPic_GroudonFront_1), + obj_frame_tiles(gEventObjectPic_GroudonFront_1), + obj_frame_tiles(gEventObjectPic_GroudonFront_1), + obj_frame_tiles(gEventObjectPic_GroudonFront_1), + obj_frame_tiles(gEventObjectPic_GroudonFront_1), +}; + +const struct SpriteFrameImage gEventObjectPicTable_KyogreSide[] = { + obj_frame_tiles(gEventObjectPic_KyogreSide_0), + obj_frame_tiles(gEventObjectPic_KyogreSide_0), + obj_frame_tiles(gEventObjectPic_KyogreSide_0), + obj_frame_tiles(gEventObjectPic_KyogreSide_1), + obj_frame_tiles(gEventObjectPic_KyogreSide_1), + obj_frame_tiles(gEventObjectPic_KyogreSide_1), + obj_frame_tiles(gEventObjectPic_KyogreSide_1), + obj_frame_tiles(gEventObjectPic_KyogreSide_1), + obj_frame_tiles(gEventObjectPic_KyogreSide_1), +}; + +const struct SpriteFrameImage gEventObjectPicTable_GroudonSide[] = { + obj_frame_tiles(gEventObjectPic_GroudonSide_0), + obj_frame_tiles(gEventObjectPic_GroudonSide_0), + obj_frame_tiles(gEventObjectPic_GroudonSide_0), + obj_frame_tiles(gEventObjectPic_GroudonSide_1), + obj_frame_tiles(gEventObjectPic_GroudonSide_1), + obj_frame_tiles(gEventObjectPic_GroudonSide_1), + obj_frame_tiles(gEventObjectPic_GroudonSide_1), + obj_frame_tiles(gEventObjectPic_GroudonSide_1), + obj_frame_tiles(gEventObjectPic_GroudonSide_1), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Fossil[] = { + obj_frame_tiles(gEventObjectPic_Fossil), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Regi[] = { + obj_frame_tiles(gEventObjectPic_Regi), + obj_frame_tiles(gEventObjectPic_Regi), + obj_frame_tiles(gEventObjectPic_Regi), + obj_frame_tiles(gEventObjectPic_Regi), + obj_frame_tiles(gEventObjectPic_Regi), + obj_frame_tiles(gEventObjectPic_Regi), + obj_frame_tiles(gEventObjectPic_Regi), + obj_frame_tiles(gEventObjectPic_Regi), + obj_frame_tiles(gEventObjectPic_Regi), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Skitty[] = { + obj_frame_tiles(gEventObjectPic_Skitty_0), + obj_frame_tiles(gEventObjectPic_Skitty_1), + obj_frame_tiles(gEventObjectPic_Skitty_2), + obj_frame_tiles(gEventObjectPic_Skitty_0), + obj_frame_tiles(gEventObjectPic_Skitty_0), + obj_frame_tiles(gEventObjectPic_Skitty_1), + obj_frame_tiles(gEventObjectPic_Skitty_1), + obj_frame_tiles(gEventObjectPic_Skitty_2), + obj_frame_tiles(gEventObjectPic_Skitty_2), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Kecleon[] = { + obj_frame_tiles(gEventObjectPic_Kecleon_0), + obj_frame_tiles(gEventObjectPic_Kecleon_1), + obj_frame_tiles(gEventObjectPic_Kecleon_2), + obj_frame_tiles(gEventObjectPic_Kecleon_0), + obj_frame_tiles(gEventObjectPic_Kecleon_0), + obj_frame_tiles(gEventObjectPic_Kecleon_1), + obj_frame_tiles(gEventObjectPic_Kecleon_1), + obj_frame_tiles(gEventObjectPic_Kecleon_2), + obj_frame_tiles(gEventObjectPic_Kecleon_2), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Rayquaza[] = { + obj_frame_tiles(gEventObjectPic_Rayquaza_0), + obj_frame_tiles(gEventObjectPic_Rayquaza_1), + obj_frame_tiles(gEventObjectPic_Rayquaza_2), + obj_frame_tiles(gEventObjectPic_Rayquaza_3), + obj_frame_tiles(gEventObjectPic_Rayquaza_4), +}; + +const struct SpriteFrameImage gEventObjectPicTable_RayquazaStill[] = { + obj_frame_tiles(gEventObjectPic_RayquazaStill), + obj_frame_tiles(gEventObjectPic_RayquazaStill), + obj_frame_tiles(gEventObjectPic_RayquazaStill), + obj_frame_tiles(gEventObjectPic_RayquazaStill), + obj_frame_tiles(gEventObjectPic_RayquazaStill), + obj_frame_tiles(gEventObjectPic_RayquazaStill), + obj_frame_tiles(gEventObjectPic_RayquazaStill), + obj_frame_tiles(gEventObjectPic_RayquazaStill), + obj_frame_tiles(gEventObjectPic_RayquazaStill), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Zigzagoon[] = { + obj_frame_tiles(gEventObjectPic_Zigzagoon_0), + obj_frame_tiles(gEventObjectPic_Zigzagoon_1), + obj_frame_tiles(gEventObjectPic_Zigzagoon_2), + obj_frame_tiles(gEventObjectPic_Zigzagoon_0), + obj_frame_tiles(gEventObjectPic_Zigzagoon_0), + obj_frame_tiles(gEventObjectPic_Zigzagoon_1), + obj_frame_tiles(gEventObjectPic_Zigzagoon_1), + obj_frame_tiles(gEventObjectPic_Zigzagoon_2), + obj_frame_tiles(gEventObjectPic_Zigzagoon_2), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Pikachu[] = { + obj_frame_tiles(gEventObjectPic_Pikachu_0), + obj_frame_tiles(gEventObjectPic_Pikachu_1), + obj_frame_tiles(gEventObjectPic_Pikachu_2), + obj_frame_tiles(gEventObjectPic_Pikachu_0), + obj_frame_tiles(gEventObjectPic_Pikachu_0), + obj_frame_tiles(gEventObjectPic_Pikachu_1), + obj_frame_tiles(gEventObjectPic_Pikachu_1), + obj_frame_tiles(gEventObjectPic_Pikachu_2), + obj_frame_tiles(gEventObjectPic_Pikachu_2), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Azumarill[] = { + obj_frame_tiles(gEventObjectPic_Azumarill_0), + obj_frame_tiles(gEventObjectPic_Azumarill_1), + obj_frame_tiles(gEventObjectPic_Azumarill_2), + obj_frame_tiles(gEventObjectPic_Azumarill_0), + obj_frame_tiles(gEventObjectPic_Azumarill_0), + obj_frame_tiles(gEventObjectPic_Azumarill_1), + obj_frame_tiles(gEventObjectPic_Azumarill_1), + obj_frame_tiles(gEventObjectPic_Azumarill_2), + obj_frame_tiles(gEventObjectPic_Azumarill_2), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Wingull[] = { + obj_frame_tiles(gEventObjectPic_Wingull_0), + obj_frame_tiles(gEventObjectPic_Wingull_1), + obj_frame_tiles(gEventObjectPic_Wingull_2), + obj_frame_tiles(gEventObjectPic_Wingull_3), + obj_frame_tiles(gEventObjectPic_Wingull_3), + obj_frame_tiles(gEventObjectPic_Wingull_4), + obj_frame_tiles(gEventObjectPic_Wingull_4), + obj_frame_tiles(gEventObjectPic_Wingull_5), + obj_frame_tiles(gEventObjectPic_Wingull_5), +}; + +const struct SpriteFrameImage gEventObjectPicTable_TuberMSwimming[] = { + obj_frame_tiles(gEventObjectPic_TuberMSwimming_0), + obj_frame_tiles(gEventObjectPic_TuberMSwimming_1), + obj_frame_tiles(gEventObjectPic_TuberMSwimming_2), + obj_frame_tiles(gEventObjectPic_TuberMSwimming_3), + obj_frame_tiles(gEventObjectPic_TuberMSwimming_4), + obj_frame_tiles(gEventObjectPic_TuberMSwimming_5), + obj_frame_tiles(gEventObjectPic_TuberMSwimming_6), + obj_frame_tiles(gEventObjectPic_TuberMSwimming_7), + obj_frame_tiles(gEventObjectPic_TuberMSwimming_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Azurill[] = { + obj_frame_tiles(gEventObjectPic_Azurill_0), + obj_frame_tiles(gEventObjectPic_Azurill_1), + obj_frame_tiles(gEventObjectPic_Azurill_2), + obj_frame_tiles(gEventObjectPic_Azurill_0), + obj_frame_tiles(gEventObjectPic_Azurill_0), + obj_frame_tiles(gEventObjectPic_Azurill_1), + obj_frame_tiles(gEventObjectPic_Azurill_1), + obj_frame_tiles(gEventObjectPic_Azurill_2), + obj_frame_tiles(gEventObjectPic_Azurill_2), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Mom[] = { + obj_frame_tiles(gEventObjectPic_Mom_0), + obj_frame_tiles(gEventObjectPic_Mom_1), + obj_frame_tiles(gEventObjectPic_Mom_2), + obj_frame_tiles(gEventObjectPic_Mom_3), + obj_frame_tiles(gEventObjectPic_Mom_4), + obj_frame_tiles(gEventObjectPic_Mom_5), + obj_frame_tiles(gEventObjectPic_Mom_6), + obj_frame_tiles(gEventObjectPic_Mom_7), + obj_frame_tiles(gEventObjectPic_Mom_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Scott[] = { + obj_frame_tiles(gEventObjectPic_Scott_0), + obj_frame_tiles(gEventObjectPic_Scott_1), + obj_frame_tiles(gEventObjectPic_Scott_2), + obj_frame_tiles(gEventObjectPic_Scott_3), + obj_frame_tiles(gEventObjectPic_Scott_4), + obj_frame_tiles(gEventObjectPic_Scott_5), + obj_frame_tiles(gEventObjectPic_Scott_6), + obj_frame_tiles(gEventObjectPic_Scott_7), + obj_frame_tiles(gEventObjectPic_Scott_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Juan[] = { + obj_frame_tiles(gEventObjectPic_Juan_0), + obj_frame_tiles(gEventObjectPic_Juan_1), + obj_frame_tiles(gEventObjectPic_Juan_2), + obj_frame_tiles(gEventObjectPic_Juan_3), + obj_frame_tiles(gEventObjectPic_Juan_4), + obj_frame_tiles(gEventObjectPic_Juan_5), + obj_frame_tiles(gEventObjectPic_Juan_6), + obj_frame_tiles(gEventObjectPic_Juan_7), + obj_frame_tiles(gEventObjectPic_Juan_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_MysteryEventDeliveryman[] = { + obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_0), + obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_1), + obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_2), + obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_0), + obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_0), + obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_1), + obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_1), + obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_2), + obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_2), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Statue[] = { + obj_frame_tiles(gEventObjectPic_Statue), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Dusclops[] = { + obj_frame_tiles(gEventObjectPic_Dusclops_0), + obj_frame_tiles(gEventObjectPic_Dusclops_1), + obj_frame_tiles(gEventObjectPic_Dusclops_2), + obj_frame_tiles(gEventObjectPic_Dusclops_3), + obj_frame_tiles(gEventObjectPic_Dusclops_4), + obj_frame_tiles(gEventObjectPic_Dusclops_5), + obj_frame_tiles(gEventObjectPic_Dusclops_6), + obj_frame_tiles(gEventObjectPic_Dusclops_7), + obj_frame_tiles(gEventObjectPic_Dusclops_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Kirlia[] = { + obj_frame_tiles(gEventObjectPic_Kirlia_0), + obj_frame_tiles(gEventObjectPic_Kirlia_1), + obj_frame_tiles(gEventObjectPic_Kirlia_2), + obj_frame_tiles(gEventObjectPic_Kirlia_3), + obj_frame_tiles(gEventObjectPic_Kirlia_4), + obj_frame_tiles(gEventObjectPic_Kirlia_5), + obj_frame_tiles(gEventObjectPic_Kirlia_6), + obj_frame_tiles(gEventObjectPic_Kirlia_7), + obj_frame_tiles(gEventObjectPic_Kirlia_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_UnionRoomAttendant[] = { + obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_0), + obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_1), + obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_2), + obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_0), + obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_0), + obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_1), + obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_1), + obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_2), + obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_2), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Sudowoodo[] = { + obj_frame_tiles(gEventObjectPic_Sudowoodo_0), + obj_frame_tiles(gEventObjectPic_Sudowoodo_0), + obj_frame_tiles(gEventObjectPic_Sudowoodo_1), + obj_frame_tiles(gEventObjectPic_Sudowoodo_0), + obj_frame_tiles(gEventObjectPic_Sudowoodo_0), + obj_frame_tiles(gEventObjectPic_Sudowoodo_0), + obj_frame_tiles(gEventObjectPic_Sudowoodo_0), + obj_frame_tiles(gEventObjectPic_Sudowoodo_1), + obj_frame_tiles(gEventObjectPic_Sudowoodo_2), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Mew[] = { + obj_frame_tiles(gEventObjectPic_Mew_0), + obj_frame_tiles(gEventObjectPic_Mew_1), + obj_frame_tiles(gEventObjectPic_Mew_2), + obj_frame_tiles(gEventObjectPic_Mew_3), + obj_frame_tiles(gEventObjectPic_Mew_4), + obj_frame_tiles(gEventObjectPic_Mew_5), + obj_frame_tiles(gEventObjectPic_Mew_6), + obj_frame_tiles(gEventObjectPic_Mew_7), + obj_frame_tiles(gEventObjectPic_Mew_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Red[] = { + obj_frame_tiles(gEventObjectPic_Red_0), + obj_frame_tiles(gEventObjectPic_Red_1), + obj_frame_tiles(gEventObjectPic_Red_2), + obj_frame_tiles(gEventObjectPic_Red_3), + obj_frame_tiles(gEventObjectPic_Red_4), + obj_frame_tiles(gEventObjectPic_Red_5), + obj_frame_tiles(gEventObjectPic_Red_6), + obj_frame_tiles(gEventObjectPic_Red_7), + obj_frame_tiles(gEventObjectPic_Red_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Leaf[] = { + obj_frame_tiles(gEventObjectPic_Leaf_0), + obj_frame_tiles(gEventObjectPic_Leaf_1), + obj_frame_tiles(gEventObjectPic_Leaf_2), + obj_frame_tiles(gEventObjectPic_Leaf_3), + obj_frame_tiles(gEventObjectPic_Leaf_4), + obj_frame_tiles(gEventObjectPic_Leaf_5), + obj_frame_tiles(gEventObjectPic_Leaf_6), + obj_frame_tiles(gEventObjectPic_Leaf_7), + obj_frame_tiles(gEventObjectPic_Leaf_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Deoxys[] = { + obj_frame_tiles(gEventObjectPic_Deoxys_0), + obj_frame_tiles(gEventObjectPic_Deoxys_0), + obj_frame_tiles(gEventObjectPic_Deoxys_0), + obj_frame_tiles(gEventObjectPic_Deoxys_0), + obj_frame_tiles(gEventObjectPic_Deoxys_1), + obj_frame_tiles(gEventObjectPic_Deoxys_0), + obj_frame_tiles(gEventObjectPic_Deoxys_1), + obj_frame_tiles(gEventObjectPic_Deoxys_0), + obj_frame_tiles(gEventObjectPic_Deoxys_0), +}; + +const struct SpriteFrameImage gEventObjectPicTable_BirthIslandStone[] = { + obj_frame_tiles(gEventObjectPic_BirthIslandStone), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Anabel[] = { + obj_frame_tiles(gEventObjectPic_Anabel_0), + obj_frame_tiles(gEventObjectPic_Anabel_1), + obj_frame_tiles(gEventObjectPic_Anabel_2), + obj_frame_tiles(gEventObjectPic_Anabel_3), + obj_frame_tiles(gEventObjectPic_Anabel_4), + obj_frame_tiles(gEventObjectPic_Anabel_5), + obj_frame_tiles(gEventObjectPic_Anabel_6), + obj_frame_tiles(gEventObjectPic_Anabel_7), + obj_frame_tiles(gEventObjectPic_Anabel_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Tucker[] = { + obj_frame_tiles(gEventObjectPic_Tucker_0), + obj_frame_tiles(gEventObjectPic_Tucker_1), + obj_frame_tiles(gEventObjectPic_Tucker_2), + obj_frame_tiles(gEventObjectPic_Tucker_3), + obj_frame_tiles(gEventObjectPic_Tucker_4), + obj_frame_tiles(gEventObjectPic_Tucker_5), + obj_frame_tiles(gEventObjectPic_Tucker_6), + obj_frame_tiles(gEventObjectPic_Tucker_7), + obj_frame_tiles(gEventObjectPic_Tucker_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Spenser[] = { + obj_frame_tiles(gEventObjectPic_Spenser_0), + obj_frame_tiles(gEventObjectPic_Spenser_1), + obj_frame_tiles(gEventObjectPic_Spenser_2), + obj_frame_tiles(gEventObjectPic_Spenser_3), + obj_frame_tiles(gEventObjectPic_Spenser_4), + obj_frame_tiles(gEventObjectPic_Spenser_5), + obj_frame_tiles(gEventObjectPic_Spenser_6), + obj_frame_tiles(gEventObjectPic_Spenser_7), + obj_frame_tiles(gEventObjectPic_Spenser_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Greta[] = { + obj_frame_tiles(gEventObjectPic_Greta_0), + obj_frame_tiles(gEventObjectPic_Greta_1), + obj_frame_tiles(gEventObjectPic_Greta_2), + obj_frame_tiles(gEventObjectPic_Greta_3), + obj_frame_tiles(gEventObjectPic_Greta_4), + obj_frame_tiles(gEventObjectPic_Greta_5), + obj_frame_tiles(gEventObjectPic_Greta_6), + obj_frame_tiles(gEventObjectPic_Greta_7), + obj_frame_tiles(gEventObjectPic_Greta_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Noland[] = { + obj_frame_tiles(gEventObjectPic_Noland_0), + obj_frame_tiles(gEventObjectPic_Noland_1), + obj_frame_tiles(gEventObjectPic_Noland_2), + obj_frame_tiles(gEventObjectPic_Noland_3), + obj_frame_tiles(gEventObjectPic_Noland_4), + obj_frame_tiles(gEventObjectPic_Noland_5), + obj_frame_tiles(gEventObjectPic_Noland_6), + obj_frame_tiles(gEventObjectPic_Noland_7), + obj_frame_tiles(gEventObjectPic_Noland_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Lucy[] = { + obj_frame_tiles(gEventObjectPic_Lucy_0), + obj_frame_tiles(gEventObjectPic_Lucy_1), + obj_frame_tiles(gEventObjectPic_Lucy_2), + obj_frame_tiles(gEventObjectPic_Lucy_3), + obj_frame_tiles(gEventObjectPic_Lucy_4), + obj_frame_tiles(gEventObjectPic_Lucy_5), + obj_frame_tiles(gEventObjectPic_Lucy_6), + obj_frame_tiles(gEventObjectPic_Lucy_7), + obj_frame_tiles(gEventObjectPic_Lucy_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Brandon[] = { + obj_frame_tiles(gEventObjectPic_Brandon_0), + obj_frame_tiles(gEventObjectPic_Brandon_1), + obj_frame_tiles(gEventObjectPic_Brandon_2), + obj_frame_tiles(gEventObjectPic_Brandon_3), + obj_frame_tiles(gEventObjectPic_Brandon_4), + obj_frame_tiles(gEventObjectPic_Brandon_5), + obj_frame_tiles(gEventObjectPic_Brandon_6), + obj_frame_tiles(gEventObjectPic_Brandon_7), + obj_frame_tiles(gEventObjectPic_Brandon_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_Lugia[] = { + obj_frame_tiles(gEventObjectPic_Lugia_0), + obj_frame_tiles(gEventObjectPic_Lugia_0), + obj_frame_tiles(gEventObjectPic_Lugia_0), + obj_frame_tiles(gEventObjectPic_Lugia_0), + obj_frame_tiles(gEventObjectPic_Lugia_1), + obj_frame_tiles(gEventObjectPic_Lugia_0), + obj_frame_tiles(gEventObjectPic_Lugia_1), + obj_frame_tiles(gEventObjectPic_Lugia_0), + obj_frame_tiles(gEventObjectPic_Lugia_1), +}; + +const struct SpriteFrameImage gEventObjectPicTable_HoOh[] = { + obj_frame_tiles(gEventObjectPic_HoOh_0), + obj_frame_tiles(gEventObjectPic_HoOh_0), + obj_frame_tiles(gEventObjectPic_HoOh_0), + obj_frame_tiles(gEventObjectPic_HoOh_0), + obj_frame_tiles(gEventObjectPic_HoOh_1), + obj_frame_tiles(gEventObjectPic_HoOh_0), + obj_frame_tiles(gEventObjectPic_HoOh_1), + obj_frame_tiles(gEventObjectPic_HoOh_0), + obj_frame_tiles(gEventObjectPic_HoOh_1), +}; + +const struct SpriteFrameImage gEventObjectPicTable_RubySapphireBrendan[] = { + obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_0), + obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_1), + obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_2), + obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_3), + obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_4), + obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_5), + obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_6), + obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_7), + obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_RubySapphireMay[] = { + obj_frame_tiles(gEventObjectPic_RubySapphireMay_0), + obj_frame_tiles(gEventObjectPic_RubySapphireMay_1), + obj_frame_tiles(gEventObjectPic_RubySapphireMay_2), + obj_frame_tiles(gEventObjectPic_RubySapphireMay_3), + obj_frame_tiles(gEventObjectPic_RubySapphireMay_4), + obj_frame_tiles(gEventObjectPic_RubySapphireMay_5), + obj_frame_tiles(gEventObjectPic_RubySapphireMay_6), + obj_frame_tiles(gEventObjectPic_RubySapphireMay_7), + obj_frame_tiles(gEventObjectPic_RubySapphireMay_8), }; #endif //GUARD_EVENT_OBJECT_PIC_TABLES_H diff --git a/src/data/field_event_obj/event_object_subsprites.h b/src/data/field_event_obj/event_object_subsprites.h index 2ed9023fa3..db5fddf1e0 100755 --- a/src/data/field_event_obj/event_object_subsprites.h +++ b/src/data/field_event_obj/event_object_subsprites.h @@ -1,105 +1,105 @@ #ifndef GUARD_EVENT_OBJECT_SUBSPRITES_H #define GUARD_EVENT_OBJECT_SUBSPRITES_H -const struct Subsprite gFieldObjectSpriteOamTable_16x16_0[] = { +const struct Subsprite gEventObjectSpriteOamTable_16x16_0[] = { { -8, -8, 0, 1, 0, 2} }; -const struct Subsprite gFieldObjectSpriteOamTable_16x16_1[] = { +const struct Subsprite gEventObjectSpriteOamTable_16x16_1[] = { { -8, -8, 0, 1, 0, 1} }; -const struct Subsprite gFieldObjectSpriteOamTable_16x16_2[] = { +const struct Subsprite gEventObjectSpriteOamTable_16x16_2[] = { { -8, -8, 1, 0, 0, 2}, { -8, 0, 1, 0, 2, 3} }; -const struct Subsprite gFieldObjectSpriteOamTable_16x16_3[] = { +const struct Subsprite gEventObjectSpriteOamTable_16x16_3[] = { { -8, -8, 0, 1, 0, 2}, { -8, -8, 0, 1, 0, 3} }; -const struct Subsprite gFieldObjectSpriteOamTable_16x16_4[] = { +const struct Subsprite gEventObjectSpriteOamTable_16x16_4[] = { { -8, -8, 0, 1, 0, 1}, { -8, -8, 0, 1, 0, 3} }; -const struct SubspriteTable gFieldObjectSpriteOamTables_16x16[] = { +const struct SubspriteTable gEventObjectSpriteOamTables_16x16[] = { {0, NULL}, - {1, gFieldObjectSpriteOamTable_16x16_0}, - {1, gFieldObjectSpriteOamTable_16x16_1}, - {2, gFieldObjectSpriteOamTable_16x16_2}, - {2, gFieldObjectSpriteOamTable_16x16_3}, - {2, gFieldObjectSpriteOamTable_16x16_4} + {1, gEventObjectSpriteOamTable_16x16_0}, + {1, gEventObjectSpriteOamTable_16x16_1}, + {2, gEventObjectSpriteOamTable_16x16_2}, + {2, gEventObjectSpriteOamTable_16x16_3}, + {2, gEventObjectSpriteOamTable_16x16_4} }; -const struct Subsprite gFieldObjectSpriteOamTable_16x32_0[] = { +const struct Subsprite gEventObjectSpriteOamTable_16x32_0[] = { { -8, -16, 2, 2, 0, 2} }; -const struct Subsprite gFieldObjectSpriteOamTable_16x32_1[] = { +const struct Subsprite gEventObjectSpriteOamTable_16x32_1[] = { { -8, -16, 2, 2, 0, 1} }; -const struct Subsprite gFieldObjectSpriteOamTable_16x32_2[] = { +const struct Subsprite gEventObjectSpriteOamTable_16x32_2[] = { { -8, -16, 0, 1, 0, 2}, { -8, 0, 1, 0, 4, 2}, { -8, 8, 1, 0, 6, 3} }; -const struct Subsprite gFieldObjectSpriteOamTable_16x32_3[] = { +const struct Subsprite gEventObjectSpriteOamTable_16x32_3[] = { { -8, -16, 0, 1, 0, 2}, { -8, 0, 0, 1, 4, 3} }; -const struct Subsprite gFieldObjectSpriteOamTable_16x32_4[] = { +const struct Subsprite gEventObjectSpriteOamTable_16x32_4[] = { { -8, -16, 0, 1, 0, 1}, { -8, 0, 0, 1, 4, 3} }; -const struct SubspriteTable gFieldObjectSpriteOamTables_16x32[] = { +const struct SubspriteTable gEventObjectSpriteOamTables_16x32[] = { {0, NULL}, - {1, gFieldObjectSpriteOamTable_16x32_0}, - {1, gFieldObjectSpriteOamTable_16x32_1}, - {3, gFieldObjectSpriteOamTable_16x32_2}, - {2, gFieldObjectSpriteOamTable_16x32_3}, - {2, gFieldObjectSpriteOamTable_16x32_4} + {1, gEventObjectSpriteOamTable_16x32_0}, + {1, gEventObjectSpriteOamTable_16x32_1}, + {3, gEventObjectSpriteOamTable_16x32_2}, + {2, gEventObjectSpriteOamTable_16x32_3}, + {2, gEventObjectSpriteOamTable_16x32_4} }; -const struct Subsprite gFieldObjectSpriteOamTable_32x32_0[] = { +const struct Subsprite gEventObjectSpriteOamTable_32x32_0[] = { {-16, -16, 0, 2, 0, 2} }; -const struct Subsprite gFieldObjectSpriteOamTable_32x32_1[] = { +const struct Subsprite gEventObjectSpriteOamTable_32x32_1[] = { {-16, -16, 0, 2, 0, 1} }; -const struct Subsprite gFieldObjectSpriteOamTable_32x32_2[] = { +const struct Subsprite gEventObjectSpriteOamTable_32x32_2[] = { {-16, -16, 1, 2, 0, 2}, {-16, 0, 1, 1, 8, 2}, {-16, 8, 1, 1, 12, 3} }; -const struct Subsprite gFieldObjectSpriteOamTable_32x32_3[] = { +const struct Subsprite gEventObjectSpriteOamTable_32x32_3[] = { {-16, -16, 1, 2, 0, 2}, {-16, 0, 1, 2, 8, 3} }; -const struct Subsprite gFieldObjectSpriteOamTable_32x32_4[] = { +const struct Subsprite gEventObjectSpriteOamTable_32x32_4[] = { {-16, -16, 1, 2, 0, 1}, {-16, 0, 1, 2, 8, 3} }; -const struct SubspriteTable gFieldObjectSpriteOamTables_32x32[] = { +const struct SubspriteTable gEventObjectSpriteOamTables_32x32[] = { {0, NULL}, - {1, gFieldObjectSpriteOamTable_32x32_0}, - {1, gFieldObjectSpriteOamTable_32x32_1}, - {3, gFieldObjectSpriteOamTable_32x32_2}, - {2, gFieldObjectSpriteOamTable_32x32_3}, - {2, gFieldObjectSpriteOamTable_32x32_4} + {1, gEventObjectSpriteOamTable_32x32_0}, + {1, gEventObjectSpriteOamTable_32x32_1}, + {3, gEventObjectSpriteOamTable_32x32_2}, + {2, gEventObjectSpriteOamTable_32x32_3}, + {2, gEventObjectSpriteOamTable_32x32_4} }; -const struct Subsprite gFieldObjectSpriteOamTable_Truck_0[] = { +const struct Subsprite gEventObjectSpriteOamTable_Truck_0[] = { {-24, -24, 1, 1, 0, 2}, { 8, -24, 1, 0, 4, 2}, {-24, -16, 1, 1, 6, 2}, @@ -114,66 +114,66 @@ const struct Subsprite gFieldObjectSpriteOamTable_Truck_0[] = { { 8, 16, 1, 0, 34, 2} }; -const struct SubspriteTable gFieldObjectSpriteOamTables_Truck[] = { - {12, gFieldObjectSpriteOamTable_Truck_0}, - {12, gFieldObjectSpriteOamTable_Truck_0}, - {12, gFieldObjectSpriteOamTable_Truck_0}, - {12, gFieldObjectSpriteOamTable_Truck_0}, - {12, gFieldObjectSpriteOamTable_Truck_0}, - {12, gFieldObjectSpriteOamTable_Truck_0} +const struct SubspriteTable gEventObjectSpriteOamTables_Truck[] = { + {12, gEventObjectSpriteOamTable_Truck_0}, + {12, gEventObjectSpriteOamTable_Truck_0}, + {12, gEventObjectSpriteOamTable_Truck_0}, + {12, gEventObjectSpriteOamTable_Truck_0}, + {12, gEventObjectSpriteOamTable_Truck_0}, + {12, gEventObjectSpriteOamTable_Truck_0} }; -const struct Subsprite gFieldObjectSpriteOamTable_Unused_0[] = { +const struct Subsprite gEventObjectSpriteOamTable_Unused_0[] = { {-32, -16, 1, 3, 0, 2} }; -const struct Subsprite gFieldObjectSpriteOamTable_Unused_1[] = { +const struct Subsprite gEventObjectSpriteOamTable_Unused_1[] = { {-32, -16, 1, 3, 0, 1} }; -const struct Subsprite gFieldObjectSpriteOamTable_Unused_2[] = { +const struct Subsprite gEventObjectSpriteOamTable_Unused_2[] = { {-32, -16, 1, 3, 0, 2} }; -const struct Subsprite gFieldObjectSpriteOamTable_Unused_3[] = { +const struct Subsprite gEventObjectSpriteOamTable_Unused_3[] = { {-32, -16, 1, 3, 0, 2} }; -const struct SubspriteTable gFieldObjectSpriteOamTables_Unused[] = { +const struct SubspriteTable gEventObjectSpriteOamTables_Unused[] = { {0, NULL}, - {1, gFieldObjectSpriteOamTable_Unused_0}, - {1, gFieldObjectSpriteOamTable_Unused_1}, - {1, gFieldObjectSpriteOamTable_Unused_2}, - {1, gFieldObjectSpriteOamTable_Unused_3}, - {1, gFieldObjectSpriteOamTable_Unused_3} + {1, gEventObjectSpriteOamTable_Unused_0}, + {1, gEventObjectSpriteOamTable_Unused_1}, + {1, gEventObjectSpriteOamTable_Unused_2}, + {1, gEventObjectSpriteOamTable_Unused_3}, + {1, gEventObjectSpriteOamTable_Unused_3} }; -const struct Subsprite gFieldObjectSpriteOamTable_64x64_0[] = { +const struct Subsprite gEventObjectSpriteOamTable_64x64_0[] = { {-32, -32, 0, 3, 0, 2} }; -const struct Subsprite gFieldObjectSpriteOamTable_64x64_1[] = { +const struct Subsprite gEventObjectSpriteOamTable_64x64_1[] = { {-32, -32, 0, 3, 0, 1} }; -const struct Subsprite gFieldObjectSpriteOamTable_64x64_2[] = { +const struct Subsprite gEventObjectSpriteOamTable_64x64_2[] = { {-32, -32, 0, 3, 0, 2} }; -const struct Subsprite gFieldObjectSpriteOamTable_64x64_3[] = { +const struct Subsprite gEventObjectSpriteOamTable_64x64_3[] = { {-32, -32, 0, 3, 0, 2} }; -const struct SubspriteTable gFieldObjectSpriteOamTables_64x64[] = { +const struct SubspriteTable gEventObjectSpriteOamTables_64x64[] = { {0, NULL}, - {1, gFieldObjectSpriteOamTable_64x64_0}, - {1, gFieldObjectSpriteOamTable_64x64_1}, - {1, gFieldObjectSpriteOamTable_64x64_2}, - {1, gFieldObjectSpriteOamTable_64x64_3}, - {1, gFieldObjectSpriteOamTable_64x64_3} + {1, gEventObjectSpriteOamTable_64x64_0}, + {1, gEventObjectSpriteOamTable_64x64_1}, + {1, gEventObjectSpriteOamTable_64x64_2}, + {1, gEventObjectSpriteOamTable_64x64_3}, + {1, gEventObjectSpriteOamTable_64x64_3} }; -const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_0[] = { +const struct Subsprite gEventObjectSpriteOamTable_SSTidal_0[] = { {-48, -20, 1, 1, 0, 2}, {-16, -20, 1, 1, 4, 2}, { 16, -20, 1, 1, 8, 2}, @@ -191,7 +191,7 @@ const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_0[] = { { 16, 12, 1, 1, 56, 2} }; -const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_1[] = { +const struct Subsprite gEventObjectSpriteOamTable_SSTidal_1[] = { {-48, -20, 1, 1, 0, 1}, {-16, -20, 1, 1, 4, 1}, { 16, -20, 1, 1, 8, 1}, @@ -209,7 +209,7 @@ const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_1[] = { { 16, 12, 1, 1, 56, 1} }; -const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_2[] = { +const struct Subsprite gEventObjectSpriteOamTable_SSTidal_2[] = { {-48, -20, 1, 1, 0, 2}, {-16, -20, 1, 1, 4, 2}, { 16, -20, 1, 1, 8, 2}, @@ -227,7 +227,7 @@ const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_2[] = { { 16, 12, 1, 1, 56, 2} }; -const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_3[] = { +const struct Subsprite gEventObjectSpriteOamTable_SSTidal_3[] = { {-48, -20, 1, 1, 0, 1}, {-16, -20, 1, 1, 4, 1}, { 16, -20, 1, 1, 8, 1}, @@ -245,16 +245,16 @@ const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_3[] = { { 16, 12, 1, 1, 56, 2} }; -const struct SubspriteTable gFieldObjectSpriteOamTables_SSTidal[] = { - {15, gFieldObjectSpriteOamTable_SSTidal_0}, - {15, gFieldObjectSpriteOamTable_SSTidal_0}, - {15, gFieldObjectSpriteOamTable_SSTidal_1}, - {15, gFieldObjectSpriteOamTable_SSTidal_2}, - {15, gFieldObjectSpriteOamTable_SSTidal_3}, - {15, gFieldObjectSpriteOamTable_SSTidal_3} +const struct SubspriteTable gEventObjectSpriteOamTables_SSTidal[] = { + {15, gEventObjectSpriteOamTable_SSTidal_0}, + {15, gEventObjectSpriteOamTable_SSTidal_0}, + {15, gEventObjectSpriteOamTable_SSTidal_1}, + {15, gEventObjectSpriteOamTable_SSTidal_2}, + {15, gEventObjectSpriteOamTable_SSTidal_3}, + {15, gEventObjectSpriteOamTable_SSTidal_3} }; -const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_0[] = { +const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_0[] = { {-48, -20, 1, 1, 0, 2}, {-16, -20, 1, 1, 4, 2}, { 16, -20, 1, 0, 8, 2}, @@ -273,7 +273,7 @@ const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_0[] = { { 32, 4, 0, 0, 43, 2} }; -const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_1[] = { +const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_1[] = { {-48, -20, 1, 1, 0, 1}, {-16, -20, 1, 1, 4, 1}, { 16, -20, 1, 0, 8, 1}, @@ -292,7 +292,7 @@ const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_1[] = { { 32, 4, 0, 0, 43, 1} }; -const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_2[] = { +const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_2[] = { {-48, -20, 1, 1, 0, 2}, {-16, -20, 1, 1, 4, 2}, { 16, -20, 1, 0, 8, 2}, @@ -311,7 +311,7 @@ const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_2[] = { { 32, 4, 0, 0, 43, 2} }; -const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_3[] = { +const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_3[] = { {-48, -20, 1, 1, 0, 1}, {-16, -20, 1, 1, 4, 1}, { 16, -20, 1, 0, 8, 1}, @@ -330,13 +330,13 @@ const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_3[] = { { 32, 4, 0, 0, 43, 2} }; -const struct SubspriteTable gFieldObjectSpriteOamTables_SubmarineShadow[] = { - {16, gFieldObjectSpriteOamTable_SubmarineShadow_0}, - {16, gFieldObjectSpriteOamTable_SubmarineShadow_0}, - {16, gFieldObjectSpriteOamTable_SubmarineShadow_1}, - {16, gFieldObjectSpriteOamTable_SubmarineShadow_2}, - {16, gFieldObjectSpriteOamTable_SubmarineShadow_3}, - {16, gFieldObjectSpriteOamTable_SubmarineShadow_3} +const struct SubspriteTable gEventObjectSpriteOamTables_SubmarineShadow[] = { + {16, gEventObjectSpriteOamTable_SubmarineShadow_0}, + {16, gEventObjectSpriteOamTable_SubmarineShadow_0}, + {16, gEventObjectSpriteOamTable_SubmarineShadow_1}, + {16, gEventObjectSpriteOamTable_SubmarineShadow_2}, + {16, gEventObjectSpriteOamTable_SubmarineShadow_3}, + {16, gEventObjectSpriteOamTable_SubmarineShadow_3} }; #endif //GUARD_EVENT_OBJECT_SUBSPRITES_H diff --git a/src/data/field_event_obj/field_effect_objects.h b/src/data/field_event_obj/field_effect_objects.h index 30a2297bd6..c8633daa7a 100755 --- a/src/data/field_event_obj/field_effect_objects.h +++ b/src/data/field_event_obj/field_effect_objects.h @@ -32,13 +32,13 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowExtraLarge[] = { obj_frame_tiles(gFieldEffectObjectPic_ShadowExtraLarge), }; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_8x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowSmall, gDummySpriteAffineAnimTable, oamc_shadow}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_8x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowSmall, gDummySpriteAffineAnimTable, oamc_shadow}; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowMedium, gDummySpriteAffineAnimTable, oamc_shadow}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowMedium, gDummySpriteAffineAnimTable, oamc_shadow}; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_32x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowLarge, gDummySpriteAffineAnimTable, oamc_shadow}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowLarge, gDummySpriteAffineAnimTable, oamc_shadow}; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_64x32, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowExtraLarge, gDummySpriteAffineAnimTable, oamc_shadow}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_64x32, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowExtraLarge, gDummySpriteAffineAnimTable, oamc_shadow}; const struct SpriteFrameImage gFieldEffectObjectPicTable_TallGrass[] = { obj_frame_tiles(gFieldEffectObjectPic_TallGrass_0), @@ -63,7 +63,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_TallGrass[] = gFieldEffectObjectImageAnim_850CA84, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_TallGrass, gFieldEffectObjectPicTable_TallGrass, gDummySpriteAffineAnimTable, unc_grass_normal}; +const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_TallGrass, gFieldEffectObjectPicTable_TallGrass, gDummySpriteAffineAnimTable, unc_grass_normal}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Ripple[] = { obj_frame_tiles(gFieldEffectObjectPic_Ripple_0), @@ -91,7 +91,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Ripple[] = gFieldEffectObjectImageAnim_850CAE0, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ripple, gFieldEffectObjectPicTable_Ripple, gDummySpriteAffineAnimTable, sub_81561D0}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ripple, gFieldEffectObjectPicTable_Ripple, gDummySpriteAffineAnimTable, sub_81561D0}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Ash[] = { obj_frame_tiles(gFieldEffectObjectPic_Ash_0), @@ -116,7 +116,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Ash[] = gFieldEffectObjectImageAnim_850CB48, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ash, gFieldEffectObjectPicTable_Ash, gDummySpriteAffineAnimTable, sub_8155460}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ash, gFieldEffectObjectPicTable_Ash, gDummySpriteAffineAnimTable, sub_8155460}; const struct SpriteFrameImage gFieldEffectObjectPicTable_SurfBlob[] = { obj_frame_tiles(gFieldEffectObjectPic_SurfBlob_0), @@ -156,7 +156,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_SurfBlob[] = gFieldEffectObjectImageAnim_850CBAC, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_SurfBlob, gFieldEffectObjectPicTable_SurfBlob, gDummySpriteAffineAnimTable, sub_8155658}; +const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_SurfBlob, gFieldEffectObjectPicTable_SurfBlob, gDummySpriteAffineAnimTable, sub_8155658}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Arrow[] = { obj_frame_tiles(gFieldEffectObjectPic_Arrow_0), @@ -205,7 +205,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Arrow[] = gFieldEffectObjectImageAnim_850CC40, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Arrow, gFieldEffectObjectPicTable_Arrow, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Arrow, gFieldEffectObjectPicTable_Arrow, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; const struct SpriteFrameImage gFieldEffectObjectPicTable_GroundImpactDust[] = { obj_frame_tiles(gFieldEffectObjectPic_GroundImpactDust_0), @@ -226,7 +226,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_GroundImpactDust[] = gFieldEffectObjectImageAnim_850CC8C, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_GroundImpactDust, gFieldEffectObjectPicTable_GroundImpactDust, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_GroundImpactDust, gFieldEffectObjectPicTable_GroundImpactDust, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopTallGrass[] = { obj_frame_tiles(gFieldEffectObjectPic_BikeHopTallGrass_0), @@ -249,7 +249,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopTallGrass[] = gFieldEffectObjectImageAnim_850CCD8, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopTallGrass = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopTallGrass, gFieldEffectObjectPicTable_BikeHopTallGrass, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopTallGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopTallGrass, gFieldEffectObjectPicTable_BikeHopTallGrass, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_SandFootprints[] = { obj_frame_tiles(gFieldEffectObjectPic_SandFootprints_0), @@ -289,7 +289,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_SandFootprints[] = gFieldEffectObjectImageAnim_850CD30, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_SandFootprints, gFieldEffectObjectPicTable_SandFootprints, gDummySpriteAffineAnimTable, sub_8154C60}; +const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_SandFootprints, gFieldEffectObjectPicTable_SandFootprints, gDummySpriteAffineAnimTable, sub_8154C60}; const struct SpriteFrameImage gFieldEffectObjectPicTable_DeepSandFootprints[] = { obj_frame_tiles(gFieldEffectObjectPic_DeepSandFootprints_0), @@ -329,7 +329,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_DeepSandFootprints[] gFieldEffectObjectImageAnim_850CD8C, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_DeepSandFootprints, gFieldEffectObjectPicTable_DeepSandFootprints, gDummySpriteAffineAnimTable, sub_8154C60}; +const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_DeepSandFootprints, gFieldEffectObjectPicTable_DeepSandFootprints, gDummySpriteAffineAnimTable, sub_8154C60}; const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeTireTracks[] = { obj_frame_tiles(gFieldEffectObjectPic_BikeTireTracks_0), @@ -399,7 +399,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeTireTracks[] = gFieldEffectObjectImageAnim_850CE18, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeTireTracks, gFieldEffectObjectPicTable_BikeTireTracks, gDummySpriteAffineAnimTable, sub_8154C60}; +const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeTireTracks, gFieldEffectObjectPicTable_BikeTireTracks, gDummySpriteAffineAnimTable, sub_8154C60}; const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopBigSplash[] = { obj_frame_tiles(gFieldEffectObjectPic_BikeHopBigSplash_0), @@ -422,7 +422,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopBigSplash[] = gFieldEffectObjectImageAnim_850CE7C, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopBigSplash = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeHopBigSplash, gFieldEffectObjectPicTable_BikeHopBigSplash, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopBigSplash = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeHopBigSplash, gFieldEffectObjectPicTable_BikeHopBigSplash, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Splash[] = { obj_frame_tiles(gFieldEffectObjectPic_Splash_0), @@ -455,7 +455,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Splash[] = gFieldEffectObjectImageAnim_850CEC8, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Splash, gFieldEffectObjectPicTable_Splash, gDummySpriteAffineAnimTable, sub_8154D90}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Splash, gFieldEffectObjectPicTable_Splash, gDummySpriteAffineAnimTable, sub_8154D90}; const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopSmallSplash[] = { obj_frame_tiles(gFieldEffectObjectPic_BikeHopSmallSplash_0), @@ -476,7 +476,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopSmallSplash[] gFieldEffectObjectImageAnim_850CF24, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopSmallSplash = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopSmallSplash, gFieldEffectObjectPicTable_BikeHopSmallSplash, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopSmallSplash = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopSmallSplash, gFieldEffectObjectPicTable_BikeHopSmallSplash, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_LongGrass[] = { obj_frame_tiles(gFieldEffectObjectPic_LongGrass_0), @@ -502,7 +502,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_LongGrass[] = gFieldEffectObjectImageAnim_850CF70, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_LongGrass, gFieldEffectObjectPicTable_LongGrass, gDummySpriteAffineAnimTable, unc_grass_tall}; +const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_LongGrass, gFieldEffectObjectPicTable_LongGrass, gDummySpriteAffineAnimTable, unc_grass_tall}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown16[] = { obj_frame_tiles(gFieldEffectObjectPic_Unknown16_0), @@ -529,7 +529,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown16[] = gFieldEffectObjectImageAnim_850CFDC, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown16 = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown16, gFieldEffectObjectPicTable_Unknown16, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown16 = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown16, gFieldEffectObjectPicTable_Unknown16, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown17[] = { obj_frame_tiles(gFieldEffectObjectPic_Unknown16_5), @@ -562,7 +562,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown17[] = gFieldEffectObjectImageAnim_850D05C, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown17 = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown17, gFieldEffectObjectPicTable_Unknown17, gDummySpriteAffineAnimTable, sub_81561D0}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown17 = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown17, gFieldEffectObjectPicTable_Unknown17, gDummySpriteAffineAnimTable, sub_81561D0}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown18[] = { obj_frame_tiles(gFieldEffectObjectPic_Unknown18_0), @@ -587,7 +587,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown18[] = gFieldEffectObjectImageAnim_850D0C0, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown18 = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown18, gFieldEffectObjectPicTable_Unknown18, gDummySpriteAffineAnimTable, sub_81561D0}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown18 = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown18, gFieldEffectObjectPicTable_Unknown18, gDummySpriteAffineAnimTable, sub_81561D0}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown19[] = { obj_frame_tiles(gFieldEffectObjectPic_Unknown19_0), @@ -610,7 +610,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown19[] = gFieldEffectObjectImageAnim_850D118, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown19 = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown19, gFieldEffectObjectPicTable_Unknown19, gDummySpriteAffineAnimTable, sub_81561D0}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown19 = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown19, gFieldEffectObjectPicTable_Unknown19, gDummySpriteAffineAnimTable, sub_81561D0}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown29[] = { obj_frame_tiles(gFieldEffectObjectPic_Unknown29_0), @@ -631,7 +631,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown29[] = gFieldEffectObjectImageAnim_850D160, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown29 = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Unknown29, gFieldEffectObjectPicTable_Unknown29, gDummySpriteAffineAnimTable, sub_81559BC}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown29 = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Unknown29, gFieldEffectObjectPicTable_Unknown29, gDummySpriteAffineAnimTable, sub_81559BC}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown20[] = { obj_frame_tiles(gFieldEffectObjectPic_Unknown20_0), @@ -656,7 +656,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown20[] = gFieldEffectObjectImageAnim_850D1AC, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown20 = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown20, gFieldEffectObjectPicTable_Unknown20, gDummySpriteAffineAnimTable, sub_81561D0}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown20 = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown20, gFieldEffectObjectPicTable_Unknown20, gDummySpriteAffineAnimTable, sub_81561D0}; const union AffineAnimCmd gFieldEffectObjectRotScalAnim_850D1E4[] = { @@ -733,7 +733,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BerryTreeGrowthSpark gFieldEffectObjectImageAnim_850D2D4, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_BerryTreeGrowthSparkle = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle, gFieldEffectObjectPicTable_BerryTreeGrowthSparkle, gDummySpriteAffineAnimTable, sub_81561D0}; +const struct SpriteTemplate gFieldEffectObjectTemplate_BerryTreeGrowthSparkle = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle, gFieldEffectObjectPicTable_BerryTreeGrowthSparkle, gDummySpriteAffineAnimTable, sub_81561D0}; const struct SpriteFrameImage gFieldEffectObjectPicTable_TreeDisguise[] = { obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_0), @@ -769,7 +769,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_TreeDisguise[] = gFieldEffectObjectImageAnim_850D384, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_TreeDisguise, gDummySpriteAffineAnimTable, sub_8155C88}; +const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_TreeDisguise, gDummySpriteAffineAnimTable, sub_8155C88}; const struct SpriteFrameImage gFieldEffectObjectPicTable_MountainDisguise[] = { obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_0), @@ -805,7 +805,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_MountainDisguise[] = gFieldEffectObjectImageAnim_850D404, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_MountainDisguise, gFieldEffectObjectPicTable_MountainDisguise, gDummySpriteAffineAnimTable, sub_8155C88}; +const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_MountainDisguise, gFieldEffectObjectPicTable_MountainDisguise, gDummySpriteAffineAnimTable, sub_8155C88}; const struct SpriteFrameImage gFieldEffectObjectPicTable_SandDisguisePlaceholder[] = { obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_0), @@ -817,7 +817,7 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_SandDisguisePlaceholder obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_6), }; -const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_SandDisguisePlaceholder, gDummySpriteAffineAnimTable, sub_8155C88}; +const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_SandDisguisePlaceholder, gDummySpriteAffineAnimTable, sub_8155C88}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Bird[] = { obj_frame_tiles(gFieldEffectObjectPic_Bird), @@ -834,7 +834,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Bird[] = gFieldEffectObjectImageAnim_850D49C, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Bird, gFieldEffectObjectPicTable_Bird, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Bird, gFieldEffectObjectPicTable_Bird, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; const struct SpriteFrameImage gFieldEffectObjectPicTable_ShortGrass[] = { obj_frame_tiles(gFieldEffectObjectPic_ShortGrass_0), @@ -853,7 +853,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_ShortGrass[] = gFieldEffectObjectImageAnim_850D4D0, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_ShortGrass, gFieldEffectObjectPicTable_ShortGrass, gDummySpriteAffineAnimTable, sub_8154A10}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_ShortGrass, gFieldEffectObjectPicTable_ShortGrass, gDummySpriteAffineAnimTable, sub_8154A10}; const struct SpriteFrameImage gFieldEffectObjectPicTable_HotSpringsWater[] = { obj_frame_tiles(gFieldEffectObjectPic_HotSpringsWater), @@ -870,7 +870,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_HotSpringsWater[] = gFieldEffectObjectImageAnim_850D500, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_HotSpringsWater, gFieldEffectObjectPicTable_HotSpringsWater, gDummySpriteAffineAnimTable, sub_8155158}; +const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_HotSpringsWater, gFieldEffectObjectPicTable_HotSpringsWater, gDummySpriteAffineAnimTable, sub_8155158}; const struct SpriteFrameImage gFieldEffectObjectPicTable_JumpOutOfAsh[] = { obj_frame_tiles(gFieldEffectObjectPic_JumpOutOfAsh_0), @@ -895,7 +895,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_JumpOutOfAsh[] = gFieldEffectObjectImageAnim_850D54C, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh = {0xFFFF, 0x100D, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_JumpOutOfAsh, gFieldEffectObjectPicTable_JumpOutOfAsh, gDummySpriteAffineAnimTable, sub_80B7CAC}; +const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh = {0xFFFF, 0x100D, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_JumpOutOfAsh, gFieldEffectObjectPicTable_JumpOutOfAsh, gDummySpriteAffineAnimTable, sub_80B7CAC}; const struct SpritePalette gFieldEffectObjectPaletteInfo2 = {gFieldEffectObjectPalette2, 0x100D}; @@ -922,7 +922,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown33[] = gFieldEffectObjectImageAnim_850D5B0, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown33 = {0xFFFF, 0x100D, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown33, gFieldEffectObjectPicTable_Unknown33, gDummySpriteAffineAnimTable, sub_80B7A58}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown33 = {0xFFFF, 0x100D, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown33, gFieldEffectObjectPicTable_Unknown33, gDummySpriteAffineAnimTable, sub_80B7A58}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Bubbles[] = { obj_frame_tiles(gFieldEffectObjectPic_Bubbles_0), @@ -953,7 +953,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Bubbles[] = gFieldEffectObjectImageAnim_850D624, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_Bubbles, gFieldEffectObjectPicTable_Bubbles, gDummySpriteAffineAnimTable, sub_8155AEC}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_Bubbles, gFieldEffectObjectPicTable_Bubbles, gDummySpriteAffineAnimTable, sub_8155AEC}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown35[] = { obj_frame_tiles(gFieldEffectObjectPic_Unknown35_0), @@ -973,7 +973,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown35[] = gFieldEffectObjectImageAnim_850D674, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown35 = {0xFFFF, 0x100F, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown35, gFieldEffectObjectPicTable_Unknown35, gDummySpriteAffineAnimTable, sub_8155E50}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown35 = {0xFFFF, 0x100F, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown35, gFieldEffectObjectPicTable_Unknown35, gDummySpriteAffineAnimTable, sub_8155E50}; const struct SpritePalette gFieldEffectObjectPaletteInfo3 = {gFieldEffectObjectPalette3, 0x100F}; @@ -987,11 +987,11 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Rayquaza[] = { }; const struct SpriteFrameImage gFieldEffectObjectPicTable_Rayquaza[] = { - {.data = (u8*)gFieldObjectPic_Rayquaza_0, .size = (sizeof gFieldObjectPic_Rayquaza_0) / 4} + {.data = (u8*)gEventObjectPic_Rayquaza_0, .size = (sizeof gEventObjectPic_Rayquaza_0) / 4} }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Rayquaza, gFieldEffectObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable, sub_8155F80}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Rayquaza, gFieldEffectObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable, sub_8155F80}; -const struct SpritePalette gFieldEffectObjectPaletteInfoUnused = {gFieldObjectPalette2, 0x1011}; +const struct SpritePalette gFieldEffectObjectPaletteInfoUnused = {gEventObjectPalette2, 0x1011}; #endif //GUARD_FIELD_EFFECT_OBJECTS_H diff --git a/src/data/field_event_obj/movement_action_func_tables.h b/src/data/field_event_obj/movement_action_func_tables.h index d5b7b89115..519ca771aa 100755 --- a/src/data/field_event_obj/movement_action_func_tables.h +++ b/src/data/field_event_obj/movement_action_func_tables.h @@ -1,430 +1,430 @@ #ifndef GUARD_MOVEMENT_ACTION_FUNC_TABLES_H #define GUARD_MOVEMENT_ACTION_FUNC_TABLES_H -u8 MovementAction_FaceDown_Step0(struct MapObject *, struct Sprite *); -u8 sub_8093950(struct MapObject *, struct Sprite *); -u8 sub_80964BC(struct MapObject *, struct Sprite *); -u8 sub_8093960(struct MapObject *, struct Sprite *); -u8 sub_8093970(struct MapObject *, struct Sprite *); -u8 sub_8093980(struct MapObject *, struct Sprite *); -u8 sub_8093BC4(struct MapObject *, struct Sprite *); -u8 sub_8093BC4_2(struct MapObject *, struct Sprite *); -u8 sub_8093C04(struct MapObject *, struct Sprite *); -u8 sub_8093C04_2(struct MapObject *, struct Sprite *); -u8 sub_8093C44(struct MapObject *, struct Sprite *); -u8 sub_8093C44_2(struct MapObject *, struct Sprite *); -u8 sub_8093C84(struct MapObject *, struct Sprite *); -u8 sub_8093C84_2(struct MapObject *, struct Sprite *); -u8 sub_8093CC4(struct MapObject *, struct Sprite *); -u8 sub_8093CC4_2(struct MapObject *, struct Sprite *); -u8 sub_8093D04(struct MapObject *, struct Sprite *); -u8 sub_8093D04_2(struct MapObject *, struct Sprite *); -u8 sub_8093D44(struct MapObject *, struct Sprite *); -u8 sub_8093D44_2(struct MapObject *, struct Sprite *); -u8 sub_8093D84(struct MapObject *, struct Sprite *); -u8 sub_8093D84_2(struct MapObject *, struct Sprite *); -u8 sub_8093DC4(struct MapObject *, struct Sprite *); -u8 sub_8093DC4_2(struct MapObject *, struct Sprite *); -u8 sub_8093E04(struct MapObject *, struct Sprite *); -u8 sub_8093E04_2(struct MapObject *, struct Sprite *); -u8 sub_8093E44(struct MapObject *, struct Sprite *); -u8 sub_8093E44_2(struct MapObject *, struct Sprite *); -u8 sub_8093E84(struct MapObject *, struct Sprite *); -u8 sub_8093E84_2(struct MapObject *, struct Sprite *); -u8 sub_8093EC4(struct MapObject *, struct Sprite *); -u8 sub_8093EC4_2(struct MapObject *, struct Sprite *); -u8 sub_8093F04(struct MapObject *, struct Sprite *); -u8 sub_8093F04_2(struct MapObject *, struct Sprite *); -u8 sub_8093F44(struct MapObject *, struct Sprite *); -u8 sub_8093F44_2(struct MapObject *, struct Sprite *); -u8 sub_8093F84(struct MapObject *, struct Sprite *); -u8 sub_8093F84_2(struct MapObject *, struct Sprite *); -u8 sub_8094230(struct MapObject *, struct Sprite *); -u8 sub_8094230_2(struct MapObject *, struct Sprite *); -u8 sub_8094288(struct MapObject *, struct Sprite *); -u8 sub_8094288_2(struct MapObject *, struct Sprite *); -u8 sub_80942E0(struct MapObject *, struct Sprite *); -u8 sub_80942E0_2(struct MapObject *, struct Sprite *); -u8 sub_8094338(struct MapObject *, struct Sprite *); -u8 sub_8094338_2(struct MapObject *, struct Sprite *); -u8 sub_80943B4(struct MapObject *, struct Sprite *); -u8 sub_8094398(struct MapObject *, struct Sprite *); -u8 sub_80964B8(struct MapObject *, struct Sprite *); -u8 sub_80943D4(struct MapObject *, struct Sprite *); -u8 sub_80943F4(struct MapObject *, struct Sprite *); -u8 sub_8094414(struct MapObject *, struct Sprite *); -u8 sub_8094434(struct MapObject *, struct Sprite *); -u8 sub_8094454(struct MapObject *, struct Sprite *); -u8 sub_8094454_2(struct MapObject *, struct Sprite *); -u8 sub_8094494(struct MapObject *, struct Sprite *); -u8 sub_8094494_2(struct MapObject *, struct Sprite *); -u8 sub_80944D4(struct MapObject *, struct Sprite *); -u8 sub_80944D4_2(struct MapObject *, struct Sprite *); -u8 sub_8094514(struct MapObject *, struct Sprite *); -u8 sub_8094514_2(struct MapObject *, struct Sprite *); -u8 sub_8094600(struct MapObject *, struct Sprite *); -u8 sub_80945C4(struct MapObject *, struct Sprite *); -u8 sub_8094638(struct MapObject *, struct Sprite *); -u8 sub_8094670(struct MapObject *, struct Sprite *); -u8 sub_80946A8(struct MapObject *, struct Sprite *); -u8 sub_80946E0(struct MapObject *, struct Sprite *); -u8 sub_809459C(struct MapObject *, struct Sprite *); -u8 sub_8094718(struct MapObject *, struct Sprite *); -u8 sub_8094750(struct MapObject *, struct Sprite *); -u8 sub_8094788(struct MapObject *, struct Sprite *); -u8 sub_80947C0(struct MapObject *, struct Sprite *); -u8 sub_80947F8(struct MapObject *, struct Sprite *); -u8 sub_8094830(struct MapObject *, struct Sprite *); -u8 sub_8094868(struct MapObject *, struct Sprite *); -u8 sub_80948A0(struct MapObject *, struct Sprite *); -u8 sub_80948D8(struct MapObject *, struct Sprite *); -u8 sub_8094910(struct MapObject *, struct Sprite *); -u8 sub_8094948(struct MapObject *, struct Sprite *); -u8 sub_8094980(struct MapObject *, struct Sprite *); -u8 sub_8094980_2(struct MapObject *, struct Sprite *); -u8 sub_80949C0(struct MapObject *, struct Sprite *); -u8 sub_80949C0_2(struct MapObject *, struct Sprite *); -u8 sub_8094A00(struct MapObject *, struct Sprite *); -u8 sub_8094A00_2(struct MapObject *, struct Sprite *); -u8 sub_8094A40(struct MapObject *, struct Sprite *); -u8 sub_8094A40_2(struct MapObject *, struct Sprite *); -u8 sub_8094A80(struct MapObject *, struct Sprite *); -u8 sub_8094A80_2(struct MapObject *, struct Sprite *); -u8 sub_8094AC0(struct MapObject *, struct Sprite *); -u8 sub_8094AC0_2(struct MapObject *, struct Sprite *); -u8 sub_8094B00(struct MapObject *, struct Sprite *); -u8 sub_8094B00_2(struct MapObject *, struct Sprite *); -u8 sub_8094B40(struct MapObject *, struct Sprite *); -u8 sub_8094B40_2(struct MapObject *, struct Sprite *); -u8 sub_8094B80(struct MapObject *, struct Sprite *); -u8 sub_8094B80_2(struct MapObject *, struct Sprite *); -u8 sub_8094BC0(struct MapObject *, struct Sprite *); -u8 sub_8094BC0_2(struct MapObject *, struct Sprite *); -u8 sub_8094C00(struct MapObject *, struct Sprite *); -u8 sub_8094C00_2(struct MapObject *, struct Sprite *); -u8 sub_8094C40(struct MapObject *, struct Sprite *); -u8 sub_8094C40_2(struct MapObject *, struct Sprite *); -u8 sub_8094C80(struct MapObject *, struct Sprite *); -u8 sub_8094C80_2(struct MapObject *, struct Sprite *); -u8 sub_8094CC0(struct MapObject *, struct Sprite *); -u8 sub_8094CC0_2(struct MapObject *, struct Sprite *); -u8 sub_8094D00(struct MapObject *, struct Sprite *); -u8 sub_8094D00_2(struct MapObject *, struct Sprite *); -u8 sub_8094D40(struct MapObject *, struct Sprite *); -u8 sub_8094D40_2(struct MapObject *, struct Sprite *); -u8 sub_8094DAC(struct MapObject *, struct Sprite *); -u8 sub_8094DC4(struct MapObject *, struct Sprite *); -u8 sub_8094E18(struct MapObject *, struct Sprite *); -u8 sub_8094E18_2(struct MapObject *, struct Sprite *); -u8 sub_8094E60(struct MapObject *, struct Sprite *); -u8 sub_8094E60_2(struct MapObject *, struct Sprite *); -u8 sub_8094EB8(struct MapObject *, struct Sprite *); -u8 sub_8094EB8_2(struct MapObject *, struct Sprite *); -u8 sub_8094710(struct MapObject *, struct Sprite *); -u8 sub_8094710_2(struct MapObject *, struct Sprite *); -u8 sub_8094F38(struct MapObject *, struct Sprite *); -u8 sub_8094F94(struct MapObject *, struct Sprite *); -u8 sub_8094FF8(struct MapObject *, struct Sprite *); -u8 sub_8095008(struct MapObject *, struct Sprite *); -u8 sub_8095018(struct MapObject *, struct Sprite *); -u8 sub_8095018_2(struct MapObject *, struct Sprite *); -u8 sub_8095070(struct MapObject *, struct Sprite *); -u8 sub_8095070_2(struct MapObject *, struct Sprite *); -u8 sub_80950C8(struct MapObject *, struct Sprite *); -u8 sub_80950C8_2(struct MapObject *, struct Sprite *); -u8 sub_8095120(struct MapObject *, struct Sprite *); -u8 sub_8095120_2(struct MapObject *, struct Sprite *); -u8 sub_8095178(struct MapObject *, struct Sprite *); -u8 sub_8095178_2(struct MapObject *, struct Sprite *); -u8 sub_80951D0(struct MapObject *, struct Sprite *); -u8 sub_80951D0_2(struct MapObject *, struct Sprite *); -u8 sub_8095228(struct MapObject *, struct Sprite *); -u8 sub_8095228_2(struct MapObject *, struct Sprite *); -u8 sub_8095280(struct MapObject *, struct Sprite *); -u8 sub_8095280_2(struct MapObject *, struct Sprite *); -u8 sub_80952D8(struct MapObject *, struct Sprite *); -u8 sub_80952D8_2(struct MapObject *, struct Sprite *); -u8 sub_8095330(struct MapObject *, struct Sprite *); -u8 sub_8095330_2(struct MapObject *, struct Sprite *); -u8 sub_8095388(struct MapObject *, struct Sprite *); -u8 sub_8095388_2(struct MapObject *, struct Sprite *); -u8 sub_80953E0(struct MapObject *, struct Sprite *); -u8 sub_80953E0_2(struct MapObject *, struct Sprite *); -u8 sub_8095438(struct MapObject *, struct Sprite *); -u8 sub_8095450(struct MapObject *, struct Sprite *); -u8 sub_8095460(struct MapObject *, struct Sprite *); -u8 sub_8095470(struct MapObject *, struct Sprite *); -u8 sub_8095480(struct MapObject *, struct Sprite *); -u8 sub_8095490(struct MapObject *, struct Sprite *); -u8 sub_80954BC(struct MapObject *, struct Sprite *); -u8 sub_80954CC(struct MapObject *, struct Sprite *); -u8 do_exclamation_mark_bubble_1(struct MapObject *, struct Sprite *); -u8 do_exclamation_mark_bubble_2(struct MapObject *, struct Sprite *); -u8 do_heart_bubble(struct MapObject *, struct Sprite *); -u8 sub_8095548(struct MapObject *, struct Sprite *); -u8 sub_809558C(struct MapObject *, struct Sprite *); -u8 sub_80955AC(struct MapObject *, struct Sprite *); -u8 sub_80955C8(struct MapObject *, struct Sprite *); -u8 sub_80955EC(struct MapObject *, struct Sprite *); -u8 sub_8095628(struct MapObject *, struct Sprite *); -u8 sub_8095644(struct MapObject *, struct Sprite *); -u8 sub_8095668(struct MapObject *, struct Sprite *); -u8 sub_80956A4(struct MapObject *, struct Sprite *); -u8 sub_80956B4(struct MapObject *, struct Sprite *); -u8 sub_80956C4(struct MapObject *, struct Sprite *); -u8 sub_80956F4(struct MapObject *, struct Sprite *); -u8 sub_8095724(struct MapObject *, struct Sprite *); -u8 sub_8095730(struct MapObject *, struct Sprite *); -u8 sub_8095740(struct MapObject *, struct Sprite *); -u8 sub_8095740_2(struct MapObject *, struct Sprite *); -u8 sub_80957A0(struct MapObject *, struct Sprite *); -u8 sub_80957A0_2(struct MapObject *, struct Sprite *); -u8 sub_8095800(struct MapObject *, struct Sprite *); -u8 sub_8095800_2(struct MapObject *, struct Sprite *); -u8 sub_8095860(struct MapObject *, struct Sprite *); -u8 sub_8095860_2(struct MapObject *, struct Sprite *); -u8 sub_8095900(struct MapObject *, struct Sprite *); -u8 sub_8095910(struct MapObject *, struct Sprite *); -u8 sub_8095920(struct MapObject *, struct Sprite *); -u8 sub_8095930(struct MapObject *, struct Sprite *); -u8 sub_8095940(struct MapObject *, struct Sprite *); -u8 sub_8095964(struct MapObject *, struct Sprite *); -u8 sub_8095988(struct MapObject *, struct Sprite *); -u8 sub_80959AC(struct MapObject *, struct Sprite *); -u8 sub_80959D0(struct MapObject *, struct Sprite *); -u8 sub_80959F4(struct MapObject *, struct Sprite *); -u8 sub_8095A18(struct MapObject *, struct Sprite *); -u8 sub_8095A3C(struct MapObject *, struct Sprite *); -u8 sub_8095A60(struct MapObject *, struct Sprite *); -u8 sub_8095A84(struct MapObject *, struct Sprite *); -u8 sub_8095AA8(struct MapObject *, struct Sprite *); -u8 sub_8095ACC(struct MapObject *, struct Sprite *); -u8 sub_8095B44(struct MapObject *, struct Sprite *); -u8 sub_8095B64(struct MapObject *, struct Sprite *); -u8 sub_8095BC8(struct MapObject *, struct Sprite *); -u8 sub_8095BC8_2(struct MapObject *, struct Sprite *); -u8 sub_8095C20(struct MapObject *, struct Sprite *); -u8 sub_8095C20_2(struct MapObject *, struct Sprite *); -u8 sub_8095C78(struct MapObject *, struct Sprite *); -u8 sub_8095C78_2(struct MapObject *, struct Sprite *); -u8 sub_8095CD0(struct MapObject *, struct Sprite *); -u8 sub_8095CD0_2(struct MapObject *, struct Sprite *); -u8 sub_8095D28(struct MapObject *, struct Sprite *); -u8 sub_8095D28_2(struct MapObject *, struct Sprite *); -u8 sub_8095D80(struct MapObject *, struct Sprite *); -u8 sub_8095D80_2(struct MapObject *, struct Sprite *); -u8 sub_8095DD8(struct MapObject *, struct Sprite *); -u8 sub_8095DD8_2(struct MapObject *, struct Sprite *); -u8 sub_8095E30(struct MapObject *, struct Sprite *); -u8 sub_8095E30_2(struct MapObject *, struct Sprite *); -u8 sub_8095E88(struct MapObject *, struct Sprite *); -u8 sub_8095E88_2(struct MapObject *, struct Sprite *); -u8 sub_8095EE0(struct MapObject *, struct Sprite *); -u8 sub_8095EE0_2(struct MapObject *, struct Sprite *); -u8 sub_8095F38(struct MapObject *, struct Sprite *); -u8 sub_8095F38_2(struct MapObject *, struct Sprite *); -u8 sub_8095F90(struct MapObject *, struct Sprite *); -u8 sub_8095F90_2(struct MapObject *, struct Sprite *); -u8 sub_8095FE8(struct MapObject *, struct Sprite *); -u8 sub_8096020(struct MapObject *, struct Sprite *); -u8 sub_8096058(struct MapObject *, struct Sprite *); -u8 sub_8096090(struct MapObject *, struct Sprite *); -u8 sub_8096100(struct MapObject *, struct Sprite *); -u8 sub_8096100_2(struct MapObject *, struct Sprite *); -u8 sub_8096140(struct MapObject *, struct Sprite *); -u8 sub_8096140_2(struct MapObject *, struct Sprite *); -u8 sub_8096180(struct MapObject *, struct Sprite *); -u8 sub_8096180_2(struct MapObject *, struct Sprite *); -u8 sub_80961C0(struct MapObject *, struct Sprite *); -u8 sub_80961C0_2(struct MapObject *, struct Sprite *); -u8 sub_8096230(struct MapObject *, struct Sprite *); -u8 sub_8096230_2(struct MapObject *, struct Sprite *); -u8 sub_8096270(struct MapObject *, struct Sprite *); -u8 sub_8096270_2(struct MapObject *, struct Sprite *); -u8 sub_80962B0(struct MapObject *, struct Sprite *); -u8 sub_80962B0_2(struct MapObject *, struct Sprite *); -u8 sub_80962F0(struct MapObject *, struct Sprite *); -u8 sub_80962F0_2(struct MapObject *, struct Sprite *); -u8 sub_8096368(struct MapObject *, struct Sprite *); -u8 sub_8096368_2(struct MapObject *, struct Sprite *); -u8 sub_80963A8(struct MapObject *, struct Sprite *); -u8 sub_80963A8_2(struct MapObject *, struct Sprite *); -u8 sub_80963E8(struct MapObject *, struct Sprite *); -u8 sub_80963E8_2(struct MapObject *, struct Sprite *); -u8 sub_8096428(struct MapObject *, struct Sprite *); -u8 sub_8096428_2(struct MapObject *, struct Sprite *); -u8 sub_8096468(struct MapObject *, struct Sprite *); -u8 sub_809647C(struct MapObject *, struct Sprite *); -u8 sub_8096494(struct MapObject *, struct Sprite *); -u8 sub_8097E50(struct MapObject *, struct Sprite *); -u8 sub_80964B8(struct MapObject *, struct Sprite *); -u8 sub_8097EF0(struct MapObject *, struct Sprite *); -u8 sub_80980C0(struct MapObject *, struct Sprite *); -u8 sub_80980D0(struct MapObject *, struct Sprite *); -u8 sub_8098124(struct MapObject *, struct Sprite *); -u8 sub_80980F4(struct MapObject *, struct Sprite *); -u8 sub_8098108(struct MapObject *, struct Sprite *); +u8 MovementAction_FaceDown_Step0(struct EventObject *, struct Sprite *); +u8 sub_8093950(struct EventObject *, struct Sprite *); +u8 sub_80964BC(struct EventObject *, struct Sprite *); +u8 sub_8093960(struct EventObject *, struct Sprite *); +u8 sub_8093970(struct EventObject *, struct Sprite *); +u8 sub_8093980(struct EventObject *, struct Sprite *); +u8 sub_8093BC4(struct EventObject *, struct Sprite *); +u8 sub_8093BC4_2(struct EventObject *, struct Sprite *); +u8 sub_8093C04(struct EventObject *, struct Sprite *); +u8 sub_8093C04_2(struct EventObject *, struct Sprite *); +u8 sub_8093C44(struct EventObject *, struct Sprite *); +u8 sub_8093C44_2(struct EventObject *, struct Sprite *); +u8 sub_8093C84(struct EventObject *, struct Sprite *); +u8 sub_8093C84_2(struct EventObject *, struct Sprite *); +u8 sub_8093CC4(struct EventObject *, struct Sprite *); +u8 sub_8093CC4_2(struct EventObject *, struct Sprite *); +u8 sub_8093D04(struct EventObject *, struct Sprite *); +u8 sub_8093D04_2(struct EventObject *, struct Sprite *); +u8 sub_8093D44(struct EventObject *, struct Sprite *); +u8 sub_8093D44_2(struct EventObject *, struct Sprite *); +u8 sub_8093D84(struct EventObject *, struct Sprite *); +u8 sub_8093D84_2(struct EventObject *, struct Sprite *); +u8 sub_8093DC4(struct EventObject *, struct Sprite *); +u8 sub_8093DC4_2(struct EventObject *, struct Sprite *); +u8 sub_8093E04(struct EventObject *, struct Sprite *); +u8 sub_8093E04_2(struct EventObject *, struct Sprite *); +u8 sub_8093E44(struct EventObject *, struct Sprite *); +u8 sub_8093E44_2(struct EventObject *, struct Sprite *); +u8 sub_8093E84(struct EventObject *, struct Sprite *); +u8 sub_8093E84_2(struct EventObject *, struct Sprite *); +u8 sub_8093EC4(struct EventObject *, struct Sprite *); +u8 sub_8093EC4_2(struct EventObject *, struct Sprite *); +u8 sub_8093F04(struct EventObject *, struct Sprite *); +u8 sub_8093F04_2(struct EventObject *, struct Sprite *); +u8 sub_8093F44(struct EventObject *, struct Sprite *); +u8 sub_8093F44_2(struct EventObject *, struct Sprite *); +u8 sub_8093F84(struct EventObject *, struct Sprite *); +u8 sub_8093F84_2(struct EventObject *, struct Sprite *); +u8 sub_8094230(struct EventObject *, struct Sprite *); +u8 sub_8094230_2(struct EventObject *, struct Sprite *); +u8 sub_8094288(struct EventObject *, struct Sprite *); +u8 sub_8094288_2(struct EventObject *, struct Sprite *); +u8 sub_80942E0(struct EventObject *, struct Sprite *); +u8 sub_80942E0_2(struct EventObject *, struct Sprite *); +u8 sub_8094338(struct EventObject *, struct Sprite *); +u8 sub_8094338_2(struct EventObject *, struct Sprite *); +u8 sub_80943B4(struct EventObject *, struct Sprite *); +u8 sub_8094398(struct EventObject *, struct Sprite *); +u8 sub_80964B8(struct EventObject *, struct Sprite *); +u8 sub_80943D4(struct EventObject *, struct Sprite *); +u8 sub_80943F4(struct EventObject *, struct Sprite *); +u8 sub_8094414(struct EventObject *, struct Sprite *); +u8 sub_8094434(struct EventObject *, struct Sprite *); +u8 sub_8094454(struct EventObject *, struct Sprite *); +u8 sub_8094454_2(struct EventObject *, struct Sprite *); +u8 sub_8094494(struct EventObject *, struct Sprite *); +u8 sub_8094494_2(struct EventObject *, struct Sprite *); +u8 sub_80944D4(struct EventObject *, struct Sprite *); +u8 sub_80944D4_2(struct EventObject *, struct Sprite *); +u8 sub_8094514(struct EventObject *, struct Sprite *); +u8 sub_8094514_2(struct EventObject *, struct Sprite *); +u8 sub_8094600(struct EventObject *, struct Sprite *); +u8 sub_80945C4(struct EventObject *, struct Sprite *); +u8 sub_8094638(struct EventObject *, struct Sprite *); +u8 sub_8094670(struct EventObject *, struct Sprite *); +u8 sub_80946A8(struct EventObject *, struct Sprite *); +u8 sub_80946E0(struct EventObject *, struct Sprite *); +u8 sub_809459C(struct EventObject *, struct Sprite *); +u8 sub_8094718(struct EventObject *, struct Sprite *); +u8 sub_8094750(struct EventObject *, struct Sprite *); +u8 sub_8094788(struct EventObject *, struct Sprite *); +u8 sub_80947C0(struct EventObject *, struct Sprite *); +u8 sub_80947F8(struct EventObject *, struct Sprite *); +u8 sub_8094830(struct EventObject *, struct Sprite *); +u8 sub_8094868(struct EventObject *, struct Sprite *); +u8 sub_80948A0(struct EventObject *, struct Sprite *); +u8 sub_80948D8(struct EventObject *, struct Sprite *); +u8 sub_8094910(struct EventObject *, struct Sprite *); +u8 sub_8094948(struct EventObject *, struct Sprite *); +u8 sub_8094980(struct EventObject *, struct Sprite *); +u8 sub_8094980_2(struct EventObject *, struct Sprite *); +u8 sub_80949C0(struct EventObject *, struct Sprite *); +u8 sub_80949C0_2(struct EventObject *, struct Sprite *); +u8 sub_8094A00(struct EventObject *, struct Sprite *); +u8 sub_8094A00_2(struct EventObject *, struct Sprite *); +u8 sub_8094A40(struct EventObject *, struct Sprite *); +u8 sub_8094A40_2(struct EventObject *, struct Sprite *); +u8 sub_8094A80(struct EventObject *, struct Sprite *); +u8 sub_8094A80_2(struct EventObject *, struct Sprite *); +u8 sub_8094AC0(struct EventObject *, struct Sprite *); +u8 sub_8094AC0_2(struct EventObject *, struct Sprite *); +u8 sub_8094B00(struct EventObject *, struct Sprite *); +u8 sub_8094B00_2(struct EventObject *, struct Sprite *); +u8 sub_8094B40(struct EventObject *, struct Sprite *); +u8 sub_8094B40_2(struct EventObject *, struct Sprite *); +u8 sub_8094B80(struct EventObject *, struct Sprite *); +u8 sub_8094B80_2(struct EventObject *, struct Sprite *); +u8 sub_8094BC0(struct EventObject *, struct Sprite *); +u8 sub_8094BC0_2(struct EventObject *, struct Sprite *); +u8 sub_8094C00(struct EventObject *, struct Sprite *); +u8 sub_8094C00_2(struct EventObject *, struct Sprite *); +u8 sub_8094C40(struct EventObject *, struct Sprite *); +u8 sub_8094C40_2(struct EventObject *, struct Sprite *); +u8 sub_8094C80(struct EventObject *, struct Sprite *); +u8 sub_8094C80_2(struct EventObject *, struct Sprite *); +u8 sub_8094CC0(struct EventObject *, struct Sprite *); +u8 sub_8094CC0_2(struct EventObject *, struct Sprite *); +u8 sub_8094D00(struct EventObject *, struct Sprite *); +u8 sub_8094D00_2(struct EventObject *, struct Sprite *); +u8 sub_8094D40(struct EventObject *, struct Sprite *); +u8 sub_8094D40_2(struct EventObject *, struct Sprite *); +u8 sub_8094DAC(struct EventObject *, struct Sprite *); +u8 sub_8094DC4(struct EventObject *, struct Sprite *); +u8 sub_8094E18(struct EventObject *, struct Sprite *); +u8 sub_8094E18_2(struct EventObject *, struct Sprite *); +u8 sub_8094E60(struct EventObject *, struct Sprite *); +u8 sub_8094E60_2(struct EventObject *, struct Sprite *); +u8 sub_8094EB8(struct EventObject *, struct Sprite *); +u8 sub_8094EB8_2(struct EventObject *, struct Sprite *); +u8 sub_8094710(struct EventObject *, struct Sprite *); +u8 sub_8094710_2(struct EventObject *, struct Sprite *); +u8 sub_8094F38(struct EventObject *, struct Sprite *); +u8 sub_8094F94(struct EventObject *, struct Sprite *); +u8 sub_8094FF8(struct EventObject *, struct Sprite *); +u8 sub_8095008(struct EventObject *, struct Sprite *); +u8 sub_8095018(struct EventObject *, struct Sprite *); +u8 sub_8095018_2(struct EventObject *, struct Sprite *); +u8 sub_8095070(struct EventObject *, struct Sprite *); +u8 sub_8095070_2(struct EventObject *, struct Sprite *); +u8 sub_80950C8(struct EventObject *, struct Sprite *); +u8 sub_80950C8_2(struct EventObject *, struct Sprite *); +u8 sub_8095120(struct EventObject *, struct Sprite *); +u8 sub_8095120_2(struct EventObject *, struct Sprite *); +u8 sub_8095178(struct EventObject *, struct Sprite *); +u8 sub_8095178_2(struct EventObject *, struct Sprite *); +u8 sub_80951D0(struct EventObject *, struct Sprite *); +u8 sub_80951D0_2(struct EventObject *, struct Sprite *); +u8 sub_8095228(struct EventObject *, struct Sprite *); +u8 sub_8095228_2(struct EventObject *, struct Sprite *); +u8 sub_8095280(struct EventObject *, struct Sprite *); +u8 sub_8095280_2(struct EventObject *, struct Sprite *); +u8 sub_80952D8(struct EventObject *, struct Sprite *); +u8 sub_80952D8_2(struct EventObject *, struct Sprite *); +u8 sub_8095330(struct EventObject *, struct Sprite *); +u8 sub_8095330_2(struct EventObject *, struct Sprite *); +u8 sub_8095388(struct EventObject *, struct Sprite *); +u8 sub_8095388_2(struct EventObject *, struct Sprite *); +u8 sub_80953E0(struct EventObject *, struct Sprite *); +u8 sub_80953E0_2(struct EventObject *, struct Sprite *); +u8 sub_8095438(struct EventObject *, struct Sprite *); +u8 sub_8095450(struct EventObject *, struct Sprite *); +u8 sub_8095460(struct EventObject *, struct Sprite *); +u8 sub_8095470(struct EventObject *, struct Sprite *); +u8 sub_8095480(struct EventObject *, struct Sprite *); +u8 sub_8095490(struct EventObject *, struct Sprite *); +u8 sub_80954BC(struct EventObject *, struct Sprite *); +u8 sub_80954CC(struct EventObject *, struct Sprite *); +u8 do_exclamation_mark_bubble_1(struct EventObject *, struct Sprite *); +u8 do_exclamation_mark_bubble_2(struct EventObject *, struct Sprite *); +u8 do_heart_bubble(struct EventObject *, struct Sprite *); +u8 sub_8095548(struct EventObject *, struct Sprite *); +u8 sub_809558C(struct EventObject *, struct Sprite *); +u8 sub_80955AC(struct EventObject *, struct Sprite *); +u8 sub_80955C8(struct EventObject *, struct Sprite *); +u8 sub_80955EC(struct EventObject *, struct Sprite *); +u8 sub_8095628(struct EventObject *, struct Sprite *); +u8 sub_8095644(struct EventObject *, struct Sprite *); +u8 sub_8095668(struct EventObject *, struct Sprite *); +u8 sub_80956A4(struct EventObject *, struct Sprite *); +u8 sub_80956B4(struct EventObject *, struct Sprite *); +u8 sub_80956C4(struct EventObject *, struct Sprite *); +u8 sub_80956F4(struct EventObject *, struct Sprite *); +u8 sub_8095724(struct EventObject *, struct Sprite *); +u8 sub_8095730(struct EventObject *, struct Sprite *); +u8 sub_8095740(struct EventObject *, struct Sprite *); +u8 sub_8095740_2(struct EventObject *, struct Sprite *); +u8 sub_80957A0(struct EventObject *, struct Sprite *); +u8 sub_80957A0_2(struct EventObject *, struct Sprite *); +u8 sub_8095800(struct EventObject *, struct Sprite *); +u8 sub_8095800_2(struct EventObject *, struct Sprite *); +u8 sub_8095860(struct EventObject *, struct Sprite *); +u8 sub_8095860_2(struct EventObject *, struct Sprite *); +u8 sub_8095900(struct EventObject *, struct Sprite *); +u8 sub_8095910(struct EventObject *, struct Sprite *); +u8 sub_8095920(struct EventObject *, struct Sprite *); +u8 sub_8095930(struct EventObject *, struct Sprite *); +u8 sub_8095940(struct EventObject *, struct Sprite *); +u8 sub_8095964(struct EventObject *, struct Sprite *); +u8 sub_8095988(struct EventObject *, struct Sprite *); +u8 sub_80959AC(struct EventObject *, struct Sprite *); +u8 sub_80959D0(struct EventObject *, struct Sprite *); +u8 sub_80959F4(struct EventObject *, struct Sprite *); +u8 sub_8095A18(struct EventObject *, struct Sprite *); +u8 sub_8095A3C(struct EventObject *, struct Sprite *); +u8 sub_8095A60(struct EventObject *, struct Sprite *); +u8 sub_8095A84(struct EventObject *, struct Sprite *); +u8 sub_8095AA8(struct EventObject *, struct Sprite *); +u8 sub_8095ACC(struct EventObject *, struct Sprite *); +u8 sub_8095B44(struct EventObject *, struct Sprite *); +u8 sub_8095B64(struct EventObject *, struct Sprite *); +u8 sub_8095BC8(struct EventObject *, struct Sprite *); +u8 sub_8095BC8_2(struct EventObject *, struct Sprite *); +u8 sub_8095C20(struct EventObject *, struct Sprite *); +u8 sub_8095C20_2(struct EventObject *, struct Sprite *); +u8 sub_8095C78(struct EventObject *, struct Sprite *); +u8 sub_8095C78_2(struct EventObject *, struct Sprite *); +u8 sub_8095CD0(struct EventObject *, struct Sprite *); +u8 sub_8095CD0_2(struct EventObject *, struct Sprite *); +u8 sub_8095D28(struct EventObject *, struct Sprite *); +u8 sub_8095D28_2(struct EventObject *, struct Sprite *); +u8 sub_8095D80(struct EventObject *, struct Sprite *); +u8 sub_8095D80_2(struct EventObject *, struct Sprite *); +u8 sub_8095DD8(struct EventObject *, struct Sprite *); +u8 sub_8095DD8_2(struct EventObject *, struct Sprite *); +u8 sub_8095E30(struct EventObject *, struct Sprite *); +u8 sub_8095E30_2(struct EventObject *, struct Sprite *); +u8 sub_8095E88(struct EventObject *, struct Sprite *); +u8 sub_8095E88_2(struct EventObject *, struct Sprite *); +u8 sub_8095EE0(struct EventObject *, struct Sprite *); +u8 sub_8095EE0_2(struct EventObject *, struct Sprite *); +u8 sub_8095F38(struct EventObject *, struct Sprite *); +u8 sub_8095F38_2(struct EventObject *, struct Sprite *); +u8 sub_8095F90(struct EventObject *, struct Sprite *); +u8 sub_8095F90_2(struct EventObject *, struct Sprite *); +u8 sub_8095FE8(struct EventObject *, struct Sprite *); +u8 sub_8096020(struct EventObject *, struct Sprite *); +u8 sub_8096058(struct EventObject *, struct Sprite *); +u8 sub_8096090(struct EventObject *, struct Sprite *); +u8 sub_8096100(struct EventObject *, struct Sprite *); +u8 sub_8096100_2(struct EventObject *, struct Sprite *); +u8 sub_8096140(struct EventObject *, struct Sprite *); +u8 sub_8096140_2(struct EventObject *, struct Sprite *); +u8 sub_8096180(struct EventObject *, struct Sprite *); +u8 sub_8096180_2(struct EventObject *, struct Sprite *); +u8 sub_80961C0(struct EventObject *, struct Sprite *); +u8 sub_80961C0_2(struct EventObject *, struct Sprite *); +u8 sub_8096230(struct EventObject *, struct Sprite *); +u8 sub_8096230_2(struct EventObject *, struct Sprite *); +u8 sub_8096270(struct EventObject *, struct Sprite *); +u8 sub_8096270_2(struct EventObject *, struct Sprite *); +u8 sub_80962B0(struct EventObject *, struct Sprite *); +u8 sub_80962B0_2(struct EventObject *, struct Sprite *); +u8 sub_80962F0(struct EventObject *, struct Sprite *); +u8 sub_80962F0_2(struct EventObject *, struct Sprite *); +u8 sub_8096368(struct EventObject *, struct Sprite *); +u8 sub_8096368_2(struct EventObject *, struct Sprite *); +u8 sub_80963A8(struct EventObject *, struct Sprite *); +u8 sub_80963A8_2(struct EventObject *, struct Sprite *); +u8 sub_80963E8(struct EventObject *, struct Sprite *); +u8 sub_80963E8_2(struct EventObject *, struct Sprite *); +u8 sub_8096428(struct EventObject *, struct Sprite *); +u8 sub_8096428_2(struct EventObject *, struct Sprite *); +u8 sub_8096468(struct EventObject *, struct Sprite *); +u8 sub_809647C(struct EventObject *, struct Sprite *); +u8 sub_8096494(struct EventObject *, struct Sprite *); +u8 sub_8097E50(struct EventObject *, struct Sprite *); +u8 sub_80964B8(struct EventObject *, struct Sprite *); +u8 sub_8097EF0(struct EventObject *, struct Sprite *); +u8 sub_80980C0(struct EventObject *, struct Sprite *); +u8 sub_80980D0(struct EventObject *, struct Sprite *); +u8 sub_8098124(struct EventObject *, struct Sprite *); +u8 sub_80980F4(struct EventObject *, struct Sprite *); +u8 sub_8098108(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850DEC8[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850DED0[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850DED8[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850DEE0[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850DF2C[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850DF38[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850DF44[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850DF50[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850DF8C[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850DF98[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850DFA4[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850DFB0[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850DFC8[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850DFD4[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850DFE0[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850DFEC[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850DFF8[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E004[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E010[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E01C[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E028[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E034[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E040[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E04C[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E058[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E064[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E070[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E07C[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E088[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E094[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E0A0[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E0AC[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E0B8[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E0C4[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E0D0[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E0DC[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E0E8[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E0F4[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E100[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E10C[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E118[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E124[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E130[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E13C[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E148[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E154[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E160[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E16C[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E178[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E184[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E190[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E19C[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E1A8[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E1B4[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E1C0[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E1CC[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E1D8[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E1E4[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E1F0[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E1FC[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E208[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E214[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E220[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E228[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E230[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E238[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E240[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E24C[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E258[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E264[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E270[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E27C[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E288[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E294[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E2A0[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E2AC[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E2B8[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E2C4[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E2D0[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E2D8[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E2E4[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E2EC[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E2F4[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E2FC[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E304[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E30C[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E314[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E31C[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E324[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E32C[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E338[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E348[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E358[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E360[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E368[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E370[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E378[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E380[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E388[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E394[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E3B8[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E3C0[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E3C8[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E3D0[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E3D8[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E3E4[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E3F0[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E3FC[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E408[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E414[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E420[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E42C[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E474[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E480[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E48C[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E498[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E4A4[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E4B0[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E4BC[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E4C8[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E4D4[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E4E0[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E4EC[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E4F8[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E504[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E510[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E51C[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E528[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E534[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E540[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E54C[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E558[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E564[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E570[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E57C[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E588[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E594[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E5A0[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E5AC[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E5B8[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850DF5C[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850DF68[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850DF74[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850DF80[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850DEFC[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850DF08[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850DF14[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850DF20[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E854[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E85C[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E3A0[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E3AC[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E5C4[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E5CC[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E5D4[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E468[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E864[])(struct MapObject *, struct Sprite *); -u8 (*const gUnknown_0850E870[])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850DEC8[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850DED0[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850DED8[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850DEE0[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850DF2C[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850DF38[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850DF44[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850DF50[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850DF8C[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850DF98[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850DFA4[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850DFB0[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850DFC8[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850DFD4[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850DFE0[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850DFEC[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850DFF8[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E004[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E010[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E01C[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E028[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E034[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E040[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E04C[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E058[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E064[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E070[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E07C[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E088[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E094[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E0A0[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E0AC[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E0B8[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E0C4[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E0D0[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E0DC[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E0E8[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E0F4[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E100[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E10C[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E118[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E124[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E130[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E13C[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E148[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E154[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E160[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E16C[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E178[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E184[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E190[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E19C[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E1A8[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E1B4[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E1C0[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E1CC[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E1D8[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E1E4[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E1F0[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E1FC[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E208[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E214[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E220[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E228[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E230[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E238[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E240[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E24C[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E258[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E264[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E270[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E27C[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E288[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E294[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E2A0[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E2AC[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E2B8[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E2C4[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E2D0[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E2D8[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E2E4[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E2EC[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E2F4[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E2FC[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E304[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E30C[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E314[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E31C[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E324[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E32C[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E338[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E348[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E358[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E360[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E368[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E370[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E378[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E380[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E388[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E394[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E3B8[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E3C0[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E3C8[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E3D0[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E3D8[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E3E4[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E3F0[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E3FC[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E408[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E414[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E420[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E42C[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E474[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E480[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E48C[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E498[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E4A4[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E4B0[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E4BC[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E4C8[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E4D4[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E4E0[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E4EC[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E4F8[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E504[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E510[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E51C[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E528[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E534[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E540[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E54C[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E558[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E564[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E570[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E57C[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E588[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E594[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E5A0[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E5AC[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E5B8[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850DF5C[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850DF68[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850DF74[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850DF80[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850DEFC[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850DF08[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850DF14[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850DF20[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E854[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E85C[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E3A0[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E3AC[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E5C4[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E5CC[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E5D4[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E468[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E864[])(struct EventObject *, struct Sprite *); +u8 (*const gUnknown_0850E870[])(struct EventObject *, struct Sprite *); -u8 (*const *const gUnknown_0850DC50[])(struct MapObject *, struct Sprite *) = { +u8 (*const *const gUnknown_0850DC50[])(struct EventObject *, struct Sprite *) = { gUnknown_0850DEC8, gUnknown_0850DED0, gUnknown_0850DED8, @@ -585,22 +585,22 @@ u8 (*const *const gUnknown_0850DC50[])(struct MapObject *, struct Sprite *) = { gUnknown_0850E870, }; -u8 (*const gUnknown_0850DEC8[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DEC8[])(struct EventObject *, struct Sprite *) = { sub_8093950, sub_80964BC, }; -u8 (*const gUnknown_0850DED0[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DED0[])(struct EventObject *, struct Sprite *) = { sub_8093960, sub_80964BC, }; -u8 (*const gUnknown_0850DED8[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DED8[])(struct EventObject *, struct Sprite *) = { sub_8093970, sub_80964BC, }; -u8 (*const gUnknown_0850DEE0[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DEE0[])(struct EventObject *, struct Sprite *) = { sub_8093980, sub_80964BC, }; @@ -613,97 +613,97 @@ u8 (*const gUnknown_0850DEE8[])(u8) = { get_go_fastest_image_anim_num, }; -u8 (*const gUnknown_0850DEFC[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DEFC[])(struct EventObject *, struct Sprite *) = { sub_8093BC4, sub_8093BC4_2, sub_80964BC, }; -u8 (*const gUnknown_0850DF08[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DF08[])(struct EventObject *, struct Sprite *) = { sub_8093C04, sub_8093C04_2, sub_80964BC, }; -u8 (*const gUnknown_0850DF14[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DF14[])(struct EventObject *, struct Sprite *) = { sub_8093C44, sub_8093C44_2, sub_80964BC, }; -u8 (*const gUnknown_0850DF20[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DF20[])(struct EventObject *, struct Sprite *) = { sub_8093C84, sub_8093C84_2, sub_80964BC, }; -u8 (*const gUnknown_0850DF2C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DF2C[])(struct EventObject *, struct Sprite *) = { sub_8093CC4, sub_8093CC4_2, sub_80964BC, }; -u8 (*const gUnknown_0850DF38[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DF38[])(struct EventObject *, struct Sprite *) = { sub_8093D04, sub_8093D04_2, sub_80964BC, }; -u8 (*const gUnknown_0850DF44[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DF44[])(struct EventObject *, struct Sprite *) = { sub_8093D44, sub_8093D44_2, sub_80964BC, }; -u8 (*const gUnknown_0850DF50[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DF50[])(struct EventObject *, struct Sprite *) = { sub_8093D84, sub_8093D84_2, sub_80964BC, }; -u8 (*const gUnknown_0850DF5C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DF5C[])(struct EventObject *, struct Sprite *) = { sub_8093DC4, sub_8093DC4_2, sub_80964BC, }; -u8 (*const gUnknown_0850DF68[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DF68[])(struct EventObject *, struct Sprite *) = { sub_8093E04, sub_8093E04_2, sub_80964BC, }; -u8 (*const gUnknown_0850DF74[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DF74[])(struct EventObject *, struct Sprite *) = { sub_8093E44, sub_8093E44_2, sub_80964BC, }; -u8 (*const gUnknown_0850DF80[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DF80[])(struct EventObject *, struct Sprite *) = { sub_8093E84, sub_8093E84_2, sub_80964BC, }; -u8 (*const gUnknown_0850DF8C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DF8C[])(struct EventObject *, struct Sprite *) = { sub_8093EC4, sub_8093EC4_2, sub_80964BC, }; -u8 (*const gUnknown_0850DF98[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DF98[])(struct EventObject *, struct Sprite *) = { sub_8093F04, sub_8093F04_2, sub_80964BC, }; -u8 (*const gUnknown_0850DFA4[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DFA4[])(struct EventObject *, struct Sprite *) = { sub_8093F44, sub_8093F44_2, sub_80964BC, }; -u8 (*const gUnknown_0850DFB0[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DFB0[])(struct EventObject *, struct Sprite *) = { sub_8093F84, sub_8093F84_2, sub_80964BC, @@ -712,591 +712,591 @@ u8 (*const gUnknown_0850DFB0[])(struct MapObject *, struct Sprite *) = { const s16 gUnknown_0850DFBC[] = {0, 1, 1}; const s16 gUnknown_0850DFC2[] = {0, 0, 1}; -u8 (*const gUnknown_0850DFC8[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DFC8[])(struct EventObject *, struct Sprite *) = { sub_8094230, sub_8094230_2, sub_80964BC, }; -u8 (*const gUnknown_0850DFD4[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DFD4[])(struct EventObject *, struct Sprite *) = { sub_8094288, sub_8094288_2, sub_80964BC, }; -u8 (*const gUnknown_0850DFE0[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DFE0[])(struct EventObject *, struct Sprite *) = { sub_80942E0, sub_80942E0_2, sub_80964BC, }; -u8 (*const gUnknown_0850DFEC[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DFEC[])(struct EventObject *, struct Sprite *) = { sub_8094338, sub_8094338_2, sub_80964BC, }; -u8 (*const gUnknown_0850DFF8[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DFF8[])(struct EventObject *, struct Sprite *) = { sub_80943B4, sub_8094398, sub_80964B8, }; -u8 (*const gUnknown_0850E004[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E004[])(struct EventObject *, struct Sprite *) = { sub_80943D4, sub_8094398, sub_80964B8, }; -u8 (*const gUnknown_0850E010[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E010[])(struct EventObject *, struct Sprite *) = { sub_80943F4, sub_8094398, sub_80964B8, }; -u8 (*const gUnknown_0850E01C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E01C[])(struct EventObject *, struct Sprite *) = { sub_8094414, sub_8094398, sub_80964B8, }; -u8 (*const gUnknown_0850E028[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E028[])(struct EventObject *, struct Sprite *) = { sub_8094434, sub_8094398, sub_80964B8, }; -u8 (*const gUnknown_0850E034[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E034[])(struct EventObject *, struct Sprite *) = { sub_8094454, sub_8094454_2, sub_80964BC, }; -u8 (*const gUnknown_0850E040[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E040[])(struct EventObject *, struct Sprite *) = { sub_8094494, sub_8094494_2, sub_80964BC, }; -u8 (*const gUnknown_0850E04C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E04C[])(struct EventObject *, struct Sprite *) = { sub_80944D4, sub_80944D4_2, sub_80964BC, }; -u8 (*const gUnknown_0850E058[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E058[])(struct EventObject *, struct Sprite *) = { sub_8094514, sub_8094514_2, sub_80964BC, }; -u8 (*const gUnknown_0850E064[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E064[])(struct EventObject *, struct Sprite *) = { sub_8094600, sub_80945C4, sub_80964BC, }; -u8 (*const gUnknown_0850E070[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E070[])(struct EventObject *, struct Sprite *) = { sub_8094638, sub_80945C4, sub_80964BC, }; -u8 (*const gUnknown_0850E07C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E07C[])(struct EventObject *, struct Sprite *) = { sub_8094670, sub_80945C4, sub_80964BC, }; -u8 (*const gUnknown_0850E088[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E088[])(struct EventObject *, struct Sprite *) = { sub_80946A8, sub_80945C4, sub_80964BC, }; -u8 (*const gUnknown_0850E094[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E094[])(struct EventObject *, struct Sprite *) = { sub_80946E0, sub_809459C, sub_80964BC, }; -u8 (*const gUnknown_0850E0A0[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E0A0[])(struct EventObject *, struct Sprite *) = { sub_8094718, sub_809459C, sub_80964BC, }; -u8 (*const gUnknown_0850E0AC[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E0AC[])(struct EventObject *, struct Sprite *) = { sub_8094750, sub_809459C, sub_80964BC, }; -u8 (*const gUnknown_0850E0B8[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E0B8[])(struct EventObject *, struct Sprite *) = { sub_8094788, sub_809459C, sub_80964BC, }; -u8 (*const gUnknown_0850E0C4[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E0C4[])(struct EventObject *, struct Sprite *) = { sub_80947C0, sub_809459C, sub_80964BC, }; -u8 (*const gUnknown_0850E0D0[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E0D0[])(struct EventObject *, struct Sprite *) = { sub_80947F8, sub_809459C, sub_80964BC, }; -u8 (*const gUnknown_0850E0DC[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E0DC[])(struct EventObject *, struct Sprite *) = { sub_8094830, sub_809459C, sub_80964BC, }; -u8 (*const gUnknown_0850E0E8[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E0E8[])(struct EventObject *, struct Sprite *) = { sub_8094868, sub_809459C, sub_80964BC, }; -u8 (*const gUnknown_0850E0F4[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E0F4[])(struct EventObject *, struct Sprite *) = { sub_80948A0, sub_809459C, sub_80964BC, }; -u8 (*const gUnknown_0850E100[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E100[])(struct EventObject *, struct Sprite *) = { sub_80948D8, sub_809459C, sub_80964BC, }; -u8 (*const gUnknown_0850E10C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E10C[])(struct EventObject *, struct Sprite *) = { sub_8094910, sub_809459C, sub_80964BC, }; -u8 (*const gUnknown_0850E118[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E118[])(struct EventObject *, struct Sprite *) = { sub_8094948, sub_809459C, sub_80964BC, }; -u8 (*const gUnknown_0850E124[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E124[])(struct EventObject *, struct Sprite *) = { sub_8094980, sub_8094980_2, sub_80964BC, }; -u8 (*const gUnknown_0850E130[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E130[])(struct EventObject *, struct Sprite *) = { sub_80949C0, sub_80949C0_2, sub_80964BC, }; -u8 (*const gUnknown_0850E13C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E13C[])(struct EventObject *, struct Sprite *) = { sub_8094A00, sub_8094A00_2, sub_80964BC, }; -u8 (*const gUnknown_0850E148[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E148[])(struct EventObject *, struct Sprite *) = { sub_8094A40, sub_8094A40_2, sub_80964BC, }; -u8 (*const gUnknown_0850E154[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E154[])(struct EventObject *, struct Sprite *) = { sub_8094A80, sub_8094A80_2, sub_80964BC, }; -u8 (*const gUnknown_0850E160[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E160[])(struct EventObject *, struct Sprite *) = { sub_8094AC0, sub_8094AC0_2, sub_80964BC, }; -u8 (*const gUnknown_0850E16C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E16C[])(struct EventObject *, struct Sprite *) = { sub_8094B00, sub_8094B00_2, sub_80964BC, }; -u8 (*const gUnknown_0850E178[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E178[])(struct EventObject *, struct Sprite *) = { sub_8094B40, sub_8094B40_2, sub_80964BC, }; -u8 (*const gUnknown_0850E184[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E184[])(struct EventObject *, struct Sprite *) = { sub_8094B80, sub_8094B80_2, sub_80964BC, }; -u8 (*const gUnknown_0850E190[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E190[])(struct EventObject *, struct Sprite *) = { sub_8094BC0, sub_8094BC0_2, sub_80964BC, }; -u8 (*const gUnknown_0850E19C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E19C[])(struct EventObject *, struct Sprite *) = { sub_8094C00, sub_8094C00_2, sub_80964BC, }; -u8 (*const gUnknown_0850E1A8[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E1A8[])(struct EventObject *, struct Sprite *) = { sub_8094C40, sub_8094C40_2, sub_80964BC, }; -u8 (*const gUnknown_0850E1B4[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E1B4[])(struct EventObject *, struct Sprite *) = { sub_8094C80, sub_8094C80_2, sub_80964BC, }; -u8 (*const gUnknown_0850E1C0[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E1C0[])(struct EventObject *, struct Sprite *) = { sub_8094CC0, sub_8094CC0_2, sub_80964BC, }; -u8 (*const gUnknown_0850E1CC[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E1CC[])(struct EventObject *, struct Sprite *) = { sub_8094D00, sub_8094D00_2, sub_80964BC, }; -u8 (*const gUnknown_0850E1D8[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E1D8[])(struct EventObject *, struct Sprite *) = { sub_8094D40, sub_8094D40_2, sub_80964BC, }; -u8 (*const gUnknown_0850E1E4[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E1E4[])(struct EventObject *, struct Sprite *) = { sub_8094DAC, sub_8094DC4, sub_80964BC, }; -u8 (*const gUnknown_0850E1F0[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E1F0[])(struct EventObject *, struct Sprite *) = { sub_8094E18, sub_8094E18_2, sub_80964BC, }; -u8 (*const gUnknown_0850E1FC[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E1FC[])(struct EventObject *, struct Sprite *) = { sub_8094E60, sub_8094E60_2, sub_80964BC, }; -u8 (*const gUnknown_0850E208[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E208[])(struct EventObject *, struct Sprite *) = { sub_8094EB8, sub_8094EB8_2, sub_80964BC, }; -u8 (*const gUnknown_0850E214[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E214[])(struct EventObject *, struct Sprite *) = { sub_8094710, sub_8094710_2, sub_80964BC, }; -u8 (*const gUnknown_0850E220[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E220[])(struct EventObject *, struct Sprite *) = { sub_8094F38, sub_80964BC, }; -u8 (*const gUnknown_0850E228[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E228[])(struct EventObject *, struct Sprite *) = { sub_8094F94, sub_80964BC, }; -u8 (*const gUnknown_0850E230[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E230[])(struct EventObject *, struct Sprite *) = { sub_8094FF8, sub_80964BC, }; -u8 (*const gUnknown_0850E238[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E238[])(struct EventObject *, struct Sprite *) = { sub_8095008, sub_80964BC, }; -u8 (*const gUnknown_0850E240[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E240[])(struct EventObject *, struct Sprite *) = { sub_8095018, sub_8095018_2, sub_80964BC, }; -u8 (*const gUnknown_0850E24C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E24C[])(struct EventObject *, struct Sprite *) = { sub_8095070, sub_8095070_2, sub_80964BC, }; -u8 (*const gUnknown_0850E258[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E258[])(struct EventObject *, struct Sprite *) = { sub_80950C8, sub_80950C8_2, sub_80964BC, }; -u8 (*const gUnknown_0850E264[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E264[])(struct EventObject *, struct Sprite *) = { sub_8095120, sub_8095120_2, sub_80964BC, }; -u8 (*const gUnknown_0850E270[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E270[])(struct EventObject *, struct Sprite *) = { sub_8095178, sub_8095178_2, sub_80964BC, }; -u8 (*const gUnknown_0850E27C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E27C[])(struct EventObject *, struct Sprite *) = { sub_80951D0, sub_80951D0_2, sub_80964BC, }; -u8 (*const gUnknown_0850E288[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E288[])(struct EventObject *, struct Sprite *) = { sub_8095228, sub_8095228_2, sub_80964BC, }; -u8 (*const gUnknown_0850E294[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E294[])(struct EventObject *, struct Sprite *) = { sub_8095280, sub_8095280_2, sub_80964BC, }; -u8 (*const gUnknown_0850E2A0[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E2A0[])(struct EventObject *, struct Sprite *) = { sub_80952D8, sub_80952D8_2, sub_80964BC, }; -u8 (*const gUnknown_0850E2AC[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E2AC[])(struct EventObject *, struct Sprite *) = { sub_8095330, sub_8095330_2, sub_80964BC, }; -u8 (*const gUnknown_0850E2B8[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E2B8[])(struct EventObject *, struct Sprite *) = { sub_8095388, sub_8095388_2, sub_80964BC, }; -u8 (*const gUnknown_0850E2C4[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E2C4[])(struct EventObject *, struct Sprite *) = { sub_80953E0, sub_80953E0_2, sub_80964BC, }; -u8 (*const gUnknown_0850E2D0[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E2D0[])(struct EventObject *, struct Sprite *) = { sub_8095438, sub_80964BC, }; -u8 (*const gUnknown_0850E2D8[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E2D8[])(struct EventObject *, struct Sprite *) = { sub_8095450, sub_8094DC4, sub_80964BC, }; -u8 (*const gUnknown_0850E2E4[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E2E4[])(struct EventObject *, struct Sprite *) = { sub_8095460, sub_80964B8, }; -u8 (*const gUnknown_0850E2EC[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E2EC[])(struct EventObject *, struct Sprite *) = { sub_8095470, sub_80964B8, }; -u8 (*const gUnknown_0850E2F4[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E2F4[])(struct EventObject *, struct Sprite *) = { sub_8095480, sub_80964B8, }; -u8 (*const gUnknown_0850E2FC[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E2FC[])(struct EventObject *, struct Sprite *) = { sub_8095490, sub_80964B8, }; -u8 (*const gUnknown_0850E304[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E304[])(struct EventObject *, struct Sprite *) = { sub_80954BC, sub_80964B8, }; -u8 (*const gUnknown_0850E30C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E30C[])(struct EventObject *, struct Sprite *) = { sub_80954CC, sub_80964B8, }; -u8 (*const gUnknown_0850E314[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E314[])(struct EventObject *, struct Sprite *) = { do_exclamation_mark_bubble_1, sub_80964B8, }; -u8 (*const gUnknown_0850E31C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E31C[])(struct EventObject *, struct Sprite *) = { do_exclamation_mark_bubble_2, sub_80964B8, }; -u8 (*const gUnknown_0850E324[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E324[])(struct EventObject *, struct Sprite *) = { do_heart_bubble, sub_80964B8, }; -u8 (*const gUnknown_0850E32C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E32C[])(struct EventObject *, struct Sprite *) = { sub_8095548, sub_809558C, sub_80964B8, }; -u8 (*const gUnknown_0850E338[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E338[])(struct EventObject *, struct Sprite *) = { sub_80955AC, sub_80955C8, sub_80955EC, sub_80964B8, }; -u8 (*const gUnknown_0850E348[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E348[])(struct EventObject *, struct Sprite *) = { sub_8095628, sub_8095644, sub_8095668, sub_80964B8, }; -u8 (*const gUnknown_0850E358[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E358[])(struct EventObject *, struct Sprite *) = { sub_80956A4, sub_80964B8, }; -u8 (*const gUnknown_0850E360[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E360[])(struct EventObject *, struct Sprite *) = { sub_80956B4, sub_80964B8, }; -u8 (*const gUnknown_0850E368[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E368[])(struct EventObject *, struct Sprite *) = { sub_80956C4, sub_80964B8, }; -u8 (*const gUnknown_0850E370[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E370[])(struct EventObject *, struct Sprite *) = { sub_80956F4, sub_80964B8, }; -u8 (*const gUnknown_0850E378[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E378[])(struct EventObject *, struct Sprite *) = { sub_8095724, sub_80964B8, }; -u8 (*const gUnknown_0850E380[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E380[])(struct EventObject *, struct Sprite *) = { sub_8095730, sub_80964B8, }; -u8 (*const gUnknown_0850E388[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E388[])(struct EventObject *, struct Sprite *) = { sub_8095740, sub_8095740_2, sub_80964BC, }; -u8 (*const gUnknown_0850E394[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E394[])(struct EventObject *, struct Sprite *) = { sub_80957A0, sub_80957A0_2, sub_80964BC, }; -u8 (*const gUnknown_0850E3A0[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E3A0[])(struct EventObject *, struct Sprite *) = { sub_8095800, sub_8095800_2, sub_80964BC, }; -u8 (*const gUnknown_0850E3AC[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E3AC[])(struct EventObject *, struct Sprite *) = { sub_8095860, sub_8095860_2, sub_80964BC, }; -u8 (*const gUnknown_0850E3B8[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E3B8[])(struct EventObject *, struct Sprite *) = { sub_8095900, sub_80964BC, }; -u8 (*const gUnknown_0850E3C0[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E3C0[])(struct EventObject *, struct Sprite *) = { sub_8095910, sub_80964BC, }; -u8 (*const gUnknown_0850E3C8[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E3C8[])(struct EventObject *, struct Sprite *) = { sub_8095920, sub_80964BC, }; -u8 (*const gUnknown_0850E3D0[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E3D0[])(struct EventObject *, struct Sprite *) = { sub_8095930, sub_80964BC, }; -u8 (*const gUnknown_0850E3D8[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E3D8[])(struct EventObject *, struct Sprite *) = { sub_8095940, sub_8094DC4, sub_80964BC, }; -u8 (*const gUnknown_0850E3E4[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E3E4[])(struct EventObject *, struct Sprite *) = { sub_8095964, sub_8094DC4, sub_80964BC, }; -u8 (*const gUnknown_0850E3F0[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E3F0[])(struct EventObject *, struct Sprite *) = { sub_8095988, sub_8094DC4, sub_80964BC, }; -u8 (*const gUnknown_0850E3FC[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E3FC[])(struct EventObject *, struct Sprite *) = { sub_80959AC, sub_8094DC4, sub_80964BC, }; -u8 (*const gUnknown_0850E408[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E408[])(struct EventObject *, struct Sprite *) = { sub_80959D0, sub_8094DC4, sub_80964BC, }; -u8 (*const gUnknown_0850E414[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E414[])(struct EventObject *, struct Sprite *) = { sub_80959F4, sub_8094DC4, sub_80964BC, }; -u8 (*const gUnknown_0850E420[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E420[])(struct EventObject *, struct Sprite *) = { sub_8095A18, sub_8094DC4, sub_80964BC, }; -u8 (*const gUnknown_0850E42C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E42C[])(struct EventObject *, struct Sprite *) = { sub_8095A3C, sub_8094DC4, sub_80964BC, @@ -1314,191 +1314,191 @@ u8 (*const gUnknown_0850E42C[])(struct MapObject *, struct Sprite *) = { sub_80964BC, }; -u8 (*const gUnknown_0850E468[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E468[])(struct EventObject *, struct Sprite *) = { sub_8095B44, sub_8095B64, sub_80964BC, }; -u8 (*const gUnknown_0850E474[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E474[])(struct EventObject *, struct Sprite *) = { sub_8095BC8, sub_8095BC8_2, sub_80964BC, }; -u8 (*const gUnknown_0850E480[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E480[])(struct EventObject *, struct Sprite *) = { sub_8095C20, sub_8095C20_2, sub_80964BC, }; -u8 (*const gUnknown_0850E48C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E48C[])(struct EventObject *, struct Sprite *) = { sub_8095C78, sub_8095C78_2, sub_80964BC, }; -u8 (*const gUnknown_0850E498[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E498[])(struct EventObject *, struct Sprite *) = { sub_8095CD0, sub_8095CD0_2, sub_80964BC, }; -u8 (*const gUnknown_0850E4A4[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E4A4[])(struct EventObject *, struct Sprite *) = { sub_8095D28, sub_8095D28_2, sub_80964BC, }; -u8 (*const gUnknown_0850E4B0[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E4B0[])(struct EventObject *, struct Sprite *) = { sub_8095D80, sub_8095D80_2, sub_80964BC, }; -u8 (*const gUnknown_0850E4BC[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E4BC[])(struct EventObject *, struct Sprite *) = { sub_8095DD8, sub_8095DD8_2, sub_80964BC, }; -u8 (*const gUnknown_0850E4C8[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E4C8[])(struct EventObject *, struct Sprite *) = { sub_8095E30, sub_8095E30_2, sub_80964BC, }; -u8 (*const gUnknown_0850E4D4[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E4D4[])(struct EventObject *, struct Sprite *) = { sub_8095E88, sub_8095E88_2, sub_80964BC, }; -u8 (*const gUnknown_0850E4E0[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E4E0[])(struct EventObject *, struct Sprite *) = { sub_8095EE0, sub_8095EE0_2, sub_80964BC, }; -u8 (*const gUnknown_0850E4EC[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E4EC[])(struct EventObject *, struct Sprite *) = { sub_8095F38, sub_8095F38_2, sub_80964BC, }; -u8 (*const gUnknown_0850E4F8[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E4F8[])(struct EventObject *, struct Sprite *) = { sub_8095F90, sub_8095F90_2, sub_80964BC, }; -u8 (*const gUnknown_0850E504[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E504[])(struct EventObject *, struct Sprite *) = { sub_8095FE8, sub_809459C, sub_80964BC, }; -u8 (*const gUnknown_0850E510[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E510[])(struct EventObject *, struct Sprite *) = { sub_8096020, sub_809459C, sub_80964BC, }; -u8 (*const gUnknown_0850E51C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E51C[])(struct EventObject *, struct Sprite *) = { sub_8096058, sub_809459C, sub_80964BC, }; -u8 (*const gUnknown_0850E528[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E528[])(struct EventObject *, struct Sprite *) = { sub_8096090, sub_809459C, sub_80964BC, }; -u8 (*const gUnknown_0850E534[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E534[])(struct EventObject *, struct Sprite *) = { sub_8096100, sub_8096100_2, sub_80964BC, }; -u8 (*const gUnknown_0850E540[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E540[])(struct EventObject *, struct Sprite *) = { sub_8096140, sub_8096140_2, sub_80964BC, }; -u8 (*const gUnknown_0850E54C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E54C[])(struct EventObject *, struct Sprite *) = { sub_8096180, sub_8096180_2, sub_80964BC, }; -u8 (*const gUnknown_0850E558[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E558[])(struct EventObject *, struct Sprite *) = { sub_80961C0, sub_80961C0_2, sub_80964BC, }; -u8 (*const gUnknown_0850E564[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E564[])(struct EventObject *, struct Sprite *) = { sub_8096230, sub_8096230_2, sub_80964BC, }; -u8 (*const gUnknown_0850E570[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E570[])(struct EventObject *, struct Sprite *) = { sub_8096270, sub_8096270_2, sub_80964BC, }; -u8 (*const gUnknown_0850E57C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E57C[])(struct EventObject *, struct Sprite *) = { sub_80962B0, sub_80962B0_2, sub_80964BC, }; -u8 (*const gUnknown_0850E588[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E588[])(struct EventObject *, struct Sprite *) = { sub_80962F0, sub_80962F0_2, sub_80964BC, }; -u8 (*const gUnknown_0850E594[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E594[])(struct EventObject *, struct Sprite *) = { sub_8096368, sub_8096368_2, sub_80964BC, }; -u8 (*const gUnknown_0850E5A0[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E5A0[])(struct EventObject *, struct Sprite *) = { sub_80963A8, sub_80963A8_2, sub_80964BC, }; -u8 (*const gUnknown_0850E5AC[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E5AC[])(struct EventObject *, struct Sprite *) = { sub_80963E8, sub_80963E8_2, sub_80964BC, }; -u8 (*const gUnknown_0850E5B8[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E5B8[])(struct EventObject *, struct Sprite *) = { sub_8096428, sub_8096428_2, sub_80964BC, }; -u8 (*const gUnknown_0850E5C4[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E5C4[])(struct EventObject *, struct Sprite *) = { sub_8096468, sub_80964B8, }; -u8 (*const gUnknown_0850E5CC[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E5CC[])(struct EventObject *, struct Sprite *) = { sub_809647C, sub_80964B8, }; -u8 (*const gUnknown_0850E5D4[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E5D4[])(struct EventObject *, struct Sprite *) = { sub_8096494, sub_80964B8, }; diff --git a/src/data/field_event_obj/movement_type_func_tables.h b/src/data/field_event_obj/movement_type_func_tables.h index 3334c4b5e7..3b18c90d14 100755 --- a/src/data/field_event_obj/movement_type_func_tables.h +++ b/src/data/field_event_obj/movement_type_func_tables.h @@ -1,7 +1,7 @@ #ifndef GUARD_MOVEMENT_TYPE_FUNC_TABLES_H #define GUARD_MOVEMENT_TYPE_FUNC_TABLES_H -u8 (*const gUnknown_0850D6F4[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D6F4[])(struct EventObject *, struct Sprite *) = { sub_808F44C, sub_808F460, sub_808F48C, @@ -27,7 +27,7 @@ u8 (*const gUnknown_0850D714[])(s16, s16, s16, s16) = { GetNonNorthRunningPastFacingDirection, }; -u8 (*const gUnknown_0850D740[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D740[])(struct EventObject *, struct Sprite *) = { sub_808F988, sub_808F99C, sub_808F9C8, @@ -35,7 +35,7 @@ u8 (*const gUnknown_0850D740[])(struct MapObject *, struct Sprite *) = { sub_808FA3C, }; -u8 (*const gUnknown_0850D754[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D754[])(struct EventObject *, struct Sprite *) = { sub_808FAC8, sub_808FADC, sub_808FB08, @@ -47,7 +47,7 @@ u8 (*const gUnknown_0850D754[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D770[] = {DIR_SOUTH, DIR_NORTH}; -u8 (*const gUnknown_0850D774[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D774[])(struct EventObject *, struct Sprite *) = { sub_808FC4C, sub_808FC60, sub_808FC8C, @@ -59,13 +59,13 @@ u8 (*const gUnknown_0850D774[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D790[] = {DIR_WEST, DIR_EAST}; -u8 (*const gUnknown_0850D794[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D794[])(struct EventObject *, struct Sprite *) = { sub_808FDD0, sub_808FDFC, sub_808FE1C, }; -u8 (*const gUnknown_0850D7A0[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D7A0[])(struct EventObject *, struct Sprite *) = { do_berry_tree_growth_sparkle_1, sub_808FF48, do_berry_tree_growth_sparkle_2, @@ -73,7 +73,7 @@ u8 (*const gUnknown_0850D7A0[])(struct MapObject *, struct Sprite *) = { sub_8090004, }; -u8 (*const gUnknown_0850D7B4[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D7B4[])(struct EventObject *, struct Sprite *) = { sub_8090094, sub_80900A8, sub_80900D4, @@ -81,7 +81,7 @@ u8 (*const gUnknown_0850D7B4[])(struct MapObject *, struct Sprite *) = { sub_8090148, }; -u8 (*const gUnknown_0850D7C8[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D7C8[])(struct EventObject *, struct Sprite *) = { sub_80901D4, sub_80901E8, sub_8090214, @@ -89,7 +89,7 @@ u8 (*const gUnknown_0850D7C8[])(struct MapObject *, struct Sprite *) = { sub_8090288, }; -u8 (*const gUnknown_0850D7DC[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D7DC[])(struct EventObject *, struct Sprite *) = { sub_8090314, sub_8090328, sub_8090354, @@ -99,7 +99,7 @@ u8 (*const gUnknown_0850D7DC[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D7F0[] = {DIR_NORTH, DIR_WEST}; -u8 (*const gUnknown_0850D7F4[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D7F4[])(struct EventObject *, struct Sprite *) = { sub_8090454, sub_8090468, sub_8090494, @@ -109,7 +109,7 @@ u8 (*const gUnknown_0850D7F4[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D808[] = {DIR_NORTH, DIR_EAST}; -u8 (*const gUnknown_0850D80C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D80C[])(struct EventObject *, struct Sprite *) = { sub_8090594, sub_80905A8, sub_80905D4, @@ -119,7 +119,7 @@ u8 (*const gUnknown_0850D80C[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D820[] = {DIR_SOUTH, DIR_WEST}; -u8 (*const gUnknown_0850D824[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D824[])(struct EventObject *, struct Sprite *) = { sub_80906D4, sub_80906E8, sub_8090714, @@ -129,7 +129,7 @@ u8 (*const gUnknown_0850D824[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D838[] = {DIR_SOUTH, DIR_EAST}; -u8 (*const gUnknown_0850D83C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D83C[])(struct EventObject *, struct Sprite *) = { sub_8090814, sub_8090828, sub_8090854, @@ -139,7 +139,7 @@ u8 (*const gUnknown_0850D83C[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D850[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_SOUTH}; -u8 (*const gUnknown_0850D854[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D854[])(struct EventObject *, struct Sprite *) = { sub_8090954, sub_8090968, sub_8090994, @@ -149,7 +149,7 @@ u8 (*const gUnknown_0850D854[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D868[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_SOUTH}; -u8 (*const gUnknown_0850D86C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D86C[])(struct EventObject *, struct Sprite *) = { sub_8090A94, sub_8090AA8, sub_8090AD4, @@ -159,7 +159,7 @@ u8 (*const gUnknown_0850D86C[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D880[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_NORTH}; -u8 (*const gUnknown_0850D884[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D884[])(struct EventObject *, struct Sprite *) = { sub_8090BD4, sub_8090BE8, sub_8090C14, @@ -169,7 +169,7 @@ u8 (*const gUnknown_0850D884[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D898[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_SOUTH}; -u8 (*const gUnknown_0850D89C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D89C[])(struct EventObject *, struct Sprite *) = { sub_8090D14, sub_8090D40, sub_8090D64, @@ -178,7 +178,7 @@ u8 (*const gUnknown_0850D89C[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D8AC[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH}; -u8 (*const gUnknown_0850D8B4[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D8B4[])(struct EventObject *, struct Sprite *) = { sub_8090E18, sub_8090E44, sub_8090E68, @@ -187,14 +187,14 @@ u8 (*const gUnknown_0850D8B4[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D8C4[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; -u8 (*const gUnknown_0850D8CC[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D8CC[])(struct EventObject *, struct Sprite *) = { sub_8090F1C, sub_8090F30, sub_8090F68, sub_8091020, }; -u8 (*const gUnknown_0850D8DC[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D8DC[])(struct EventObject *, struct Sprite *) = { sub_8091048, sub_809117C, sub_8091110, @@ -202,7 +202,7 @@ u8 (*const gUnknown_0850D8DC[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D8E8[] = {DIR_NORTH, DIR_EAST, DIR_WEST, DIR_SOUTH}; -u8 (*const gUnknown_0850D8EC[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D8EC[])(struct EventObject *, struct Sprite *) = { sub_8091048, sub_8091208, sub_8091110, @@ -210,7 +210,7 @@ u8 (*const gUnknown_0850D8EC[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D8F8[] = {DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH}; -u8 (*const gUnknown_0850D8FC[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D8FC[])(struct EventObject *, struct Sprite *) = { sub_8091048, sub_8091294, sub_8091110, @@ -218,7 +218,7 @@ u8 (*const gUnknown_0850D8FC[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D908[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_WEST}; -u8 (*const gUnknown_0850D90C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D90C[])(struct EventObject *, struct Sprite *) = { sub_8091048, sub_8091320, sub_8091110, @@ -226,7 +226,7 @@ u8 (*const gUnknown_0850D90C[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D918[] = {DIR_WEST, DIR_SOUTH, DIR_NORTH, DIR_EAST}; -u8 (*const gUnknown_0850D91C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D91C[])(struct EventObject *, struct Sprite *) = { sub_8091048, sub_80913AC, sub_8091110, @@ -234,7 +234,7 @@ u8 (*const gUnknown_0850D91C[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D928[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_SOUTH}; -u8 (*const gUnknown_0850D92C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D92C[])(struct EventObject *, struct Sprite *) = { sub_8091048, sub_8091438, sub_8091110, @@ -242,13 +242,13 @@ u8 (*const gUnknown_0850D92C[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D938[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_NORTH}; -u8 (*const gUnknown_0850D93C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D93C[])(struct EventObject *, struct Sprite *) = { sub_8091048, sub_80914C4, sub_8091110, }; -u8 (*const gUnknown_0850D948[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D948[])(struct EventObject *, struct Sprite *) = { sub_8091048, sub_8091550, sub_8091110, @@ -256,7 +256,7 @@ u8 (*const gUnknown_0850D948[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D954[] = {DIR_EAST, DIR_SOUTH, DIR_NORTH, DIR_WEST}; -u8 (*const gUnknown_0850D958[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D958[])(struct EventObject *, struct Sprite *) = { sub_8091048, sub_80915DC, sub_8091110, @@ -264,7 +264,7 @@ u8 (*const gUnknown_0850D958[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D964[] = {DIR_WEST, DIR_NORTH, DIR_SOUTH, DIR_EAST}; -u8 (*const gUnknown_0850D968[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D968[])(struct EventObject *, struct Sprite *) = { sub_8091048, sub_8091668, sub_8091110, @@ -272,7 +272,7 @@ u8 (*const gUnknown_0850D968[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D974[] = {DIR_NORTH, DIR_SOUTH, DIR_EAST, DIR_WEST}; -u8 (*const gUnknown_0850D978[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D978[])(struct EventObject *, struct Sprite *) = { sub_8091048, sub_80916F4, sub_8091110, @@ -280,7 +280,7 @@ u8 (*const gUnknown_0850D978[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D984[] = {DIR_EAST, DIR_WEST, DIR_NORTH, DIR_SOUTH}; -u8 (*const gUnknown_0850D988[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D988[])(struct EventObject *, struct Sprite *) = { sub_8091048, sub_8091780, sub_8091110, @@ -288,7 +288,7 @@ u8 (*const gUnknown_0850D988[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D994[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_NORTH}; -u8 (*const gUnknown_0850D998[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D998[])(struct EventObject *, struct Sprite *) = { sub_8091048, sub_809180C, sub_8091110, @@ -296,7 +296,7 @@ u8 (*const gUnknown_0850D998[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D9A4[] = {DIR_EAST, DIR_NORTH, DIR_SOUTH, DIR_WEST}; -u8 (*const gUnknown_0850D9A8[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D9A8[])(struct EventObject *, struct Sprite *) = { sub_8091048, sub_8091898, sub_8091110, @@ -304,7 +304,7 @@ u8 (*const gUnknown_0850D9A8[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D9B4[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST}; -u8 (*const gUnknown_0850D9B8[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D9B8[])(struct EventObject *, struct Sprite *) = { sub_8091048, sub_8091924, sub_8091110, @@ -312,7 +312,7 @@ u8 (*const gUnknown_0850D9B8[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D9C4[] = {DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; -u8 (*const gUnknown_0850D9C8[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D9C8[])(struct EventObject *, struct Sprite *) = { sub_8091048, sub_80919B0, sub_8091110, @@ -320,7 +320,7 @@ u8 (*const gUnknown_0850D9C8[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D9D4[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH}; -u8 (*const gUnknown_0850D9D8[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D9D8[])(struct EventObject *, struct Sprite *) = { sub_8091048, sub_8091A3C, sub_8091110, @@ -328,7 +328,7 @@ u8 (*const gUnknown_0850D9D8[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D9E4[] = {DIR_NORTH, DIR_WEST, DIR_SOUTH, DIR_EAST}; -u8 (*const gUnknown_0850D9E8[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D9E8[])(struct EventObject *, struct Sprite *) = { sub_8091048, sub_8091AC8, sub_8091110, @@ -336,7 +336,7 @@ u8 (*const gUnknown_0850D9E8[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850D9F4[] = {DIR_SOUTH, DIR_EAST, DIR_NORTH, DIR_WEST}; -u8 (*const gUnknown_0850D9F8[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850D9F8[])(struct EventObject *, struct Sprite *) = { sub_8091048, sub_8091B54, sub_8091110, @@ -344,7 +344,7 @@ u8 (*const gUnknown_0850D9F8[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850DA04[] = {DIR_WEST, DIR_SOUTH, DIR_EAST, DIR_NORTH}; -u8 (*const gUnknown_0850DA08[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DA08[])(struct EventObject *, struct Sprite *) = { sub_8091048, sub_8091BE0, sub_8091110, @@ -352,7 +352,7 @@ u8 (*const gUnknown_0850DA08[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850DA14[] = {DIR_EAST, DIR_NORTH, DIR_WEST, DIR_SOUTH}; -u8 (*const gUnknown_0850DA18[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DA18[])(struct EventObject *, struct Sprite *) = { sub_8091048, sub_8091C6C, sub_8091110, @@ -360,7 +360,7 @@ u8 (*const gUnknown_0850DA18[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850DA24[] = {DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WEST}; -u8 (*const gUnknown_0850DA28[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DA28[])(struct EventObject *, struct Sprite *) = { sub_8091048, sub_8091CF8, sub_8091110, @@ -368,7 +368,7 @@ u8 (*const gUnknown_0850DA28[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850DA34[] = {DIR_SOUTH, DIR_WEST, DIR_NORTH, DIR_EAST}; -u8 (*const gUnknown_0850DA38[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DA38[])(struct EventObject *, struct Sprite *) = { sub_8091048, sub_8091D84, sub_8091110, @@ -376,7 +376,7 @@ u8 (*const gUnknown_0850DA38[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850DA44[] = {DIR_WEST, DIR_NORTH, DIR_EAST, DIR_SOUTH}; -u8 (*const gUnknown_0850DA48[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DA48[])(struct EventObject *, struct Sprite *) = { sub_8091048, sub_8091E10, sub_8091110, @@ -384,13 +384,13 @@ u8 (*const gUnknown_0850DA48[])(struct MapObject *, struct Sprite *) = { const u8 gUnknown_0850DA54[] = {DIR_EAST, DIR_SOUTH, DIR_WEST, DIR_NORTH}; -u8 (*const gUnknown_0850DA58[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DA58[])(struct EventObject *, struct Sprite *) = { mss_npc_reset_oampriv3_1_unk2_unk3, sub_8091EC0, sub_8091F20, }; -bool8 (*const gUnknown_0850DA64[])(struct MapObject *, struct Sprite *, u8, bool8(u8)) = { +bool8 (*const gUnknown_0850DA64[])(struct EventObject *, struct Sprite *, u8, bool8(u8)) = { sub_8091F48, sub_8091F4C, sub_8091F94, @@ -404,37 +404,37 @@ bool8 (*const gUnknown_0850DA64[])(struct MapObject *, struct Sprite *, u8, bool sub_8091F48, }; -u8 (*const gUnknown_0850DA90[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DA90[])(struct EventObject *, struct Sprite *) = { mss_npc_reset_oampriv3_1_unk2_unk3, mss_08062EA4, sub_8091F20, }; -u8 (*const gUnknown_0850DA9C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DA9C[])(struct EventObject *, struct Sprite *) = { sub_80926AC, }; -u8 (*const gUnknown_0850DAA0[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DAA0[])(struct EventObject *, struct Sprite *) = { sub_8092718, sub_80926B8, }; -u8 (*const gUnknown_0850DAA8[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DAA8[])(struct EventObject *, struct Sprite *) = { sub_8092788, sub_80926B8, }; -u8 (*const gUnknown_0850DAB0[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DAB0[])(struct EventObject *, struct Sprite *) = { sub_80927F8, sub_80926B8, }; -u8 (*const gUnknown_0850DAB8[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DAB8[])(struct EventObject *, struct Sprite *) = { sub_8092868, sub_80926B8, }; -u8 (*const gUnknown_0850DAC0[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850DAC0[])(struct EventObject *, struct Sprite *) = { sub_80928D8, sub_809290C, sub_809292C, diff --git a/src/decoration.c b/src/decoration.c index 2fbd247a6d..83030ccb78 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -32,7 +32,7 @@ #include "tilesets.h" #include "item_icon.h" #include "trader.h" -#include "constants/map_objects.h" +#include "constants/event_objects.h" #include "decoration_inventory.h" #include "decoration.h" #include "graphics.h" @@ -1202,15 +1202,15 @@ void sub_8127E18(void) if (FlagGet(0xAE + i) == TRUE) { FlagClear(0xAE + i); - for (j = 0; j < gMapHeader.events->mapObjectCount; j ++) + for (j = 0; j < gMapHeader.events->eventObjectCount; j ++) { - if (gMapHeader.events->mapObjects[j].flagId == 0xAE + i) + if (gMapHeader.events->eventObjects[j].flagId == 0xAE + i) { break; } } - VarSet(0x3F20 + gMapHeader.events->mapObjects[j].graphicsId, sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0]); - gSpecialVar_0x8005 = gMapHeader.events->mapObjects[j].localId; + VarSet(0x3F20 + gMapHeader.events->eventObjects[j].graphicsId, sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0]); + gSpecialVar_0x8005 = gMapHeader.events->eventObjects[j].localId; gSpecialVar_0x8006 = sCurDecorMapX; gSpecialVar_0x8007 = sCurDecorMapY; show_sprite(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); @@ -1321,11 +1321,11 @@ void SetUpPlacingDecorationPlayerAvatar(u8 taskId, struct PlaceDecorationGraphic } if (gSaveBlock2Ptr->playerGender == MALE) { - sDecor_CameraSpriteObjectIdx2 = AddPseudoFieldObject(0xC1, SpriteCallbackDummy, v0, 0x48, 0); + sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(0xC1, SpriteCallbackDummy, v0, 0x48, 0); } else { - sDecor_CameraSpriteObjectIdx2 = AddPseudoFieldObject(0xC2, SpriteCallbackDummy, v0, 0x48, 0); + sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(0xC2, SpriteCallbackDummy, v0, 0x48, 0); } gSprites[sDecor_CameraSpriteObjectIdx2].oam.priority = 1; DestroySprite(&gSprites[sDecor_CameraSpriteObjectIdx1]); @@ -1466,7 +1466,7 @@ bool8 sub_812853C(u8 taskId, const struct Decoration *decoration) { return FALSE; } - behaviorAt = GetFieldObjectIdByXYZ(curX, curY, 0); + behaviorAt = GetEventObjectIdByXYZ(curX, curY, 0); if (behaviorAt != 0 && behaviorAt != 16) { return FALSE; @@ -1491,7 +1491,7 @@ bool8 sub_812853C(u8 taskId, const struct Decoration *decoration) { return FALSE; } - if (GetFieldObjectIdByXYZ(curX, curY, 0) != 16) + if (GetEventObjectIdByXYZ(curX, curY, 0) != 16) { return FALSE; } @@ -1511,7 +1511,7 @@ bool8 sub_812853C(u8 taskId, const struct Decoration *decoration) { return FALSE; } - behaviorAt = GetFieldObjectIdByXYZ(curX, curY, 0); + behaviorAt = GetEventObjectIdByXYZ(curX, curY, 0); if (behaviorAt != 0 && behaviorAt != 16) { return FALSE; @@ -1556,7 +1556,7 @@ bool8 sub_812853C(u8 taskId, const struct Decoration *decoration) return FALSE; } } - if (GetFieldObjectIdByXYZ(curX, curY, 0) != 16) + if (GetEventObjectIdByXYZ(curX, curY, 0) != 16) { return FALSE; } @@ -1990,7 +1990,7 @@ u8 gpu_pal_decompress_alloc_tag_and_upload(struct PlaceDecorationGraphicsDataBuf data->decoration = &gDecorations[decor]; if (data->decoration->permission == DECORPERM_SOLID_MAT) { - return AddPseudoFieldObject(data->decoration->tiles[0], SpriteCallbackDummy, 0, 0, 1); + return AddPseudoEventObject(data->decoration->tiles[0], SpriteCallbackDummy, 0, 0, 1); } FreeSpritePaletteByTag(OVERWORLD_PLACE_DECOR_SELECTOR_PAL_TAG); sub_81291E8(data); @@ -2040,7 +2040,7 @@ const u8 *GetDecorationIconPicOrPalette(u16 decor, u8 mode) return gUnknown_085A6BE8[decor][mode]; } -u8 AddDecorationIconObjectFromFieldObject(u16 tilesTag, u16 paletteTag, u8 decor) +u8 AddDecorationIconObjectFromEventObject(u16 tilesTag, u16 paletteTag, u8 decor) { u8 spriteId; struct SpriteSheet sheet; @@ -2071,7 +2071,7 @@ u8 AddDecorationIconObjectFromFieldObject(u16 tilesTag, u16 paletteTag, u8 decor } else { - spriteId = AddPseudoFieldObject(sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0], SpriteCallbackDummy, 0, 0, 1); + spriteId = AddPseudoEventObject(sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0], SpriteCallbackDummy, 0, 0, 1); } return spriteId; } @@ -2092,7 +2092,7 @@ u8 AddDecorationIconObject(u8 decor, s16 x, s16 y, u8 priority, u16 tilesTag, u1 } else if (gUnknown_085A6BE8[decor][0] == NULL) { - spriteId = AddDecorationIconObjectFromFieldObject(tilesTag, paletteTag, decor); + spriteId = AddDecorationIconObjectFromEventObject(tilesTag, paletteTag, decor); if (spriteId == MAX_SPRITES) { return MAX_SPRITES; @@ -2141,11 +2141,11 @@ void sub_8129708(void) { gSpecialVar_0x8005 = sDecorRearrangementDataBuffer[gSpecialVar_0x8004].flagId; sub_81296EC(sDecorRearrangementDataBuffer[gSpecialVar_0x8004].idx); - for (i = 0; i < gMapHeader.events->mapObjectCount; i ++) + for (i = 0; i < gMapHeader.events->eventObjectCount; i ++) { - if (gMapHeader.events->mapObjects[i].flagId == gSpecialVar_0x8005) + if (gMapHeader.events->eventObjects[i].flagId == gSpecialVar_0x8005) { - gSpecialVar_0x8006 = gMapHeader.events->mapObjects[i].localId; + gSpecialVar_0x8006 = gMapHeader.events->eventObjects[i].localId; break; } } @@ -2156,11 +2156,11 @@ void sub_81297AC(void) { u8 i; - for (i = 0; i < gMapHeader.events->mapObjectCount; i ++) + for (i = 0; i < gMapHeader.events->eventObjectCount; i ++) { - if (gMapHeader.events->mapObjects[i].flagId == gSpecialVar_0x8004) + if (gMapHeader.events->eventObjects[i].flagId == gSpecialVar_0x8004) { - gSpecialVar_0x8005 = gMapHeader.events->mapObjects[i].localId; + gSpecialVar_0x8005 = gMapHeader.events->eventObjects[i].localId; break; } } @@ -2253,11 +2253,11 @@ void SetUpPuttingAwayDecorationPlayerAvatar(void) gUnknown_03005DD0.spriteId = CreateSprite(&gUnknown_085A7404, 0x78, 0x50, 0); if (gSaveBlock2Ptr->playerGender == MALE) { - sDecor_CameraSpriteObjectIdx2 = AddPseudoFieldObject(0xC1, SpriteCallbackDummy, 0x88, 0x48, 0); + sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(0xC1, SpriteCallbackDummy, 0x88, 0x48, 0); } else { - sDecor_CameraSpriteObjectIdx2 = AddPseudoFieldObject(0xC2, SpriteCallbackDummy, 0x88, 0x48, 0); + sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(0xC2, SpriteCallbackDummy, 0x88, 0x48, 0); } gSprites[sDecor_CameraSpriteObjectIdx2].oam.priority = 1; DestroySprite(&gSprites[sDecor_CameraSpriteObjectIdx1]); @@ -2451,9 +2451,9 @@ void sub_8129F20(void) yOff = gUnknown_0203A17C.pos[sDecorRearrangementDataBuffer[sCurDecorSelectedInRearrangement].idx] & 0x0F; for (i = 0; i < 0x40; i ++) { - if (gSaveBlock1Ptr->mapObjectTemplates[i].x == xOff && gSaveBlock1Ptr->mapObjectTemplates[i].y == yOff && !FlagGet(gSaveBlock1Ptr->mapObjectTemplates[i].flagId)) + if (gSaveBlock1Ptr->eventObjectTemplates[i].x == xOff && gSaveBlock1Ptr->eventObjectTemplates[i].y == yOff && !FlagGet(gSaveBlock1Ptr->eventObjectTemplates[i].flagId)) { - sDecorRearrangementDataBuffer[sCurDecorSelectedInRearrangement].flagId = gSaveBlock1Ptr->mapObjectTemplates[i].flagId; + sDecorRearrangementDataBuffer[sCurDecorSelectedInRearrangement].flagId = gSaveBlock1Ptr->eventObjectTemplates[i].flagId; break; } } diff --git a/src/event_data.c b/src/event_data.c index 9f1432f17a..efd439a3c4 100644 --- a/src/event_data.c +++ b/src/event_data.c @@ -190,7 +190,7 @@ bool8 VarSet(u16 id, u16 value) return TRUE; } -u8 VarGetFieldObjectGraphicsId(u8 id) +u8 VarGetEventObjectGraphicsId(u8 id) { return VarGet(0x4010 + id); } diff --git a/src/map_obj_lock.c b/src/event_obj_lock.c similarity index 58% rename from src/map_obj_lock.c rename to src/event_obj_lock.c index 6647f629ba..1582c00f8f 100644 --- a/src/map_obj_lock.c +++ b/src/event_obj_lock.c @@ -2,7 +2,7 @@ #include "event_data.h" #include "event_object_movement.h" #include "field_player_avatar.h" -#include "map_obj_lock.h" +#include "event_obj_lock.h" #include "script_movement.h" #include "task.h" #include "trainer_see.h" @@ -38,9 +38,9 @@ bool8 sub_80983C4(void) } -void ScriptFreezeMapObjects(void) +void ScriptFreezeEventObjects(void) { - FreezeMapObjects(); + FreezeEventObjects(); CreateTask(sub_80983A4, 80); } @@ -53,9 +53,9 @@ static void sub_8098400(u8 taskId) sub_808B864(); task->data[0] = 1; } - if (!task->data[1] && !gMapObjects[gSelectedMapObject].singleMovementActive) + if (!task->data[1] && !gEventObjects[gSelectedEventObject].singleMovementActive) { - FreezeMapObject(&gMapObjects[gSelectedMapObject]); + FreezeEventObject(&gEventObjects[gSelectedEventObject]); task->data[1] = 1; } if (task->data[0] && task->data[1]) @@ -75,61 +75,61 @@ bool8 sub_809847C(void) } } -void LockSelectedMapObject(void) +void LockSelectedEventObject(void) { u8 taskId; - FreezeMapObjectsExceptOne(gSelectedMapObject); + FreezeEventObjectsExceptOne(gSelectedEventObject); taskId = CreateTask(sub_8098400, 80); - if (!gMapObjects[gSelectedMapObject].singleMovementActive) + if (!gEventObjects[gSelectedEventObject].singleMovementActive) { - FreezeMapObject(&gMapObjects[gSelectedMapObject]); + FreezeEventObject(&gEventObjects[gSelectedEventObject]); gTasks[taskId].data[1] = 1; } } void sub_80984F4(void) { - u8 objectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0); - FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[objectId]); + u8 objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[objectId]); sub_80D338C(); - UnfreezeMapObjects(); + UnfreezeEventObjects(); } void sub_8098524(void) { u8 objectId; - if (gMapObjects[gSelectedMapObject].active) - FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[gSelectedMapObject]); - objectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0); - FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[objectId]); + if (gEventObjects[gSelectedEventObject].active) + EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[gSelectedEventObject]); + objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[objectId]); sub_80D338C(); - UnfreezeMapObjects(); + UnfreezeEventObjects(); } void sub_8098574(void) { - FieldObjectFaceOppositeDirection(&gMapObjects[gSelectedMapObject], gSpecialVar_Facing); + EventObjectFaceOppositeDirection(&gEventObjects[gSelectedEventObject], gSpecialVar_Facing); } void sub_809859C(void) { - FieldObjectClearAnimIfSpecialAnimActive(&gMapObjects[gSelectedMapObject]); + EventObjectClearAnimIfSpecialAnimActive(&gEventObjects[gSelectedEventObject]); } static void sub_80985BC(u8 taskId) { struct Task *task = &gTasks[taskId]; - u8 mapObjectId = task->data[2]; + u8 eventObjectId = task->data[2]; if (!task->data[0] && walkrun_is_standing_still() == TRUE) { sub_808B864(); task->data[0] = 1; } - if (!task->data[1] && !gMapObjects[mapObjectId].singleMovementActive) + if (!task->data[1] && !gEventObjects[eventObjectId].singleMovementActive) { - FreezeMapObject(&gMapObjects[mapObjectId]); + FreezeEventObject(&gEventObjects[eventObjectId]); task->data[1] = 1; } if (task->data[0] && task->data[1]) @@ -139,34 +139,34 @@ static void sub_80985BC(u8 taskId) void sub_8098630(void) { u8 trainerObjectId1, trainerObjectId2, taskId; - trainerObjectId1 = GetChosenApproachingTrainerMapObjectId(0); + trainerObjectId1 = GetChosenApproachingTrainerEventObjectId(0); if(gNoOfApproachingTrainers == 2) { - trainerObjectId2 = GetChosenApproachingTrainerMapObjectId(1); + trainerObjectId2 = GetChosenApproachingTrainerEventObjectId(1); sub_8098074(trainerObjectId1, trainerObjectId2); taskId = CreateTask(sub_80985BC, 80); gTasks[taskId].data[2] = trainerObjectId1; - if(!gMapObjects[trainerObjectId1].singleMovementActive) + if(!gEventObjects[trainerObjectId1].singleMovementActive) { - FreezeMapObject(&gMapObjects[trainerObjectId1]); + FreezeEventObject(&gEventObjects[trainerObjectId1]); gTasks[taskId].data[1] = 1; } taskId = CreateTask(sub_80985BC, 81); gTasks[taskId].data[2] = trainerObjectId2; - if(!gMapObjects[trainerObjectId2].singleMovementActive) + if(!gEventObjects[trainerObjectId2].singleMovementActive) { - FreezeMapObject(&gMapObjects[trainerObjectId2]); + FreezeEventObject(&gEventObjects[trainerObjectId2]); gTasks[taskId].data[1] = 1; } } else { - FreezeMapObjectsExceptOne(trainerObjectId1); + FreezeEventObjectsExceptOne(trainerObjectId1); taskId = CreateTask(sub_80985BC, 80); gTasks[taskId].data[2] = trainerObjectId1; - if(!gMapObjects[trainerObjectId1].singleMovementActive) + if(!gEventObjects[trainerObjectId1].singleMovementActive) { - FreezeMapObject(&gMapObjects[trainerObjectId1]); + FreezeEventObject(&gEventObjects[trainerObjectId1]); gTasks[taskId].data[1] = 1; } } diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 84900e48e6..d23bba92b2 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -21,7 +21,7 @@ #include "sprite.h" #include "trainer_see.h" #include "util.h" -#include "constants/map_objects.h" +#include "constants/event_objects.h" // this file was known as evobjmv.c in Game Freak's original source @@ -29,35 +29,33 @@ extern u8 gUnknown_020375B4; extern u16 gUnknown_020375B6; extern u8 *gUnknown_020375B8; -// Static ROM declarations - static void sub_808D450(void); -static u8 GetFieldObjectIdByLocalId(u8); -static u8 GetFieldObjectIdByLocalIdAndMapInternal(u8, u8, u8); -static bool8 GetAvailableFieldObjectSlot(u16, u8, u8, u8 *); -static void FieldObjectHandleDynamicGraphicsId(struct MapObject *); -static void RemoveFieldObjectInternal (struct MapObject *); -static u16 GetFieldObjectFlagIdByFieldObjectId(u8); -static void sub_8096518(struct MapObject *, struct Sprite *); -static void MakeObjectTemplateFromFieldObjectTemplate(struct MapObjectTemplate *, struct SpriteTemplate *, const struct SubspriteTable **); -static void GetFieldObjectMovingCameraOffset(s16 *, s16 *); -static struct MapObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8, u8, u8); +static u8 GetEventObjectIdByLocalId(u8); +static u8 GetEventObjectIdByLocalIdAndMapInternal(u8, u8, u8); +static bool8 GetAvailableEventObjectSlot(u16, u8, u8, u8 *); +static void EventObjectHandleDynamicGraphicsId(struct EventObject *); +static void RemoveEventObjectInternal (struct EventObject *); +static u16 GetEventObjectFlagIdByEventObjectId(u8); +static void sub_8096518(struct EventObject *, struct Sprite *); +static void MakeObjectTemplateFromEventObjectTemplate(struct EventObjectTemplate *, struct SpriteTemplate *, const struct SubspriteTable **); +static void GetEventObjectMovingCameraOffset(s16 *, s16 *); +static struct EventObjectTemplate *GetEventObjectTemplateByLocalIdAndMap(u8, u8, u8); static void sub_808E894(u16); -static void RemoveFieldObjectIfOutsideView(struct MapObject *); +static void RemoveEventObjectIfOutsideView(struct EventObject *); static void sub_808E1B8(u8, s16, s16); -static void SetPlayerAvatarFieldObjectIdAndObjectId(u8, u8); -static void sub_808E38C(struct MapObject *); +static void SetPlayerAvatarEventObjectIdAndObjectId(u8, u8); +static void sub_808E38C(struct EventObject *); static u8 sub_808E8F4(const struct SpritePalette *); -static u8 FindFieldObjectPaletteIndexByTag(u16); +static u8 FindEventObjectPaletteIndexByTag(u16); static void sub_808EAB0(u16, u8); -static bool8 FieldObjectDoesZCoordMatch(struct MapObject *, u8); +static bool8 EventObjectDoesZCoordMatch(struct EventObject *, u8); static void ObjectCB_CameraObject(struct Sprite *); static void CameraObject_0(struct Sprite *); static void CameraObject_1(struct Sprite *); static void CameraObject_2(struct Sprite *); -static struct MapObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 localId, struct MapObjectTemplate *templates, u8 count); -static void npc_reset(struct MapObject *, struct Sprite *); -static void FieldObjectSetRegularAnim(struct MapObject *, struct Sprite *, u8); +static struct EventObjectTemplate *FindEventObjectTemplateInArrayByLocalId(u8 localId, struct EventObjectTemplate *templates, u8 count); +static void npc_reset(struct EventObject *, struct Sprite *); +static void EventObjectSetRegularAnim(struct EventObject *, struct Sprite *, u8); u8 sub_8093438(u32); u8 sub_80934BC(u32); @@ -65,48 +63,48 @@ u8 sub_8093514(u32); u8 GetJumpLedgeAnimId(u32); void sub_8092F88(u32, s16 *, s16 *, s16, s16); -bool8 FieldObjectExecRegularAnim(struct MapObject *, struct Sprite *); -static void SetFieldObjectStepTimer(struct Sprite *, s16); -bool8 RunFieldObjectStepTimer(struct Sprite *); -bool8 npc_block_way__next_tile(struct MapObject *, u8); +bool8 EventObjectExecRegularAnim(struct EventObject *, struct Sprite *); +static void SetEventObjectStepTimer(struct Sprite *, s16); +bool8 RunEventObjectStepTimer(struct Sprite *); +bool8 npc_block_way__next_tile(struct EventObject *, u8); static u32 state_to_direction(u8, u32, u32); -/*static*/ void sub_80964E8(struct MapObject *, struct Sprite *); -static void FieldObjectExecSpecialAnim(struct MapObject *, struct Sprite *); -/*static*/ void npc_obj_transfer_image_anim_pause_flag(struct MapObject *, struct Sprite *); +/*static*/ void sub_80964E8(struct EventObject *, struct Sprite *); +static void EventObjectExecSpecialAnim(struct EventObject *, struct Sprite *); +/*static*/ void npc_obj_transfer_image_anim_pause_flag(struct EventObject *, struct Sprite *); -static bool8 IsCoordOutsideFieldObjectMovementRect(struct MapObject *, s16, s16); -static bool8 IsMetatileDirectionallyImpassable(struct MapObject *, s16, s16, u8); -static bool8 CheckForCollisionBetweenFieldObjects(struct MapObject *, s16, s16); -bool8 sub_809558C(struct MapObject *, struct Sprite *); -bool8 sub_8095B64(struct MapObject *, struct Sprite *); -static void sub_8096530(struct MapObject *, struct Sprite *); -static void npc_update_obj_anim_flag(struct MapObject *, struct Sprite *); -static void FieldObjectUpdateMetatileBehaviors(struct MapObject*); -static void GetGroundEffectFlags_Reflection(struct MapObject*, u32*); -static void GetGroundEffectFlags_TallGrassOnSpawn(struct MapObject*, u32*); -static void GetGroundEffectFlags_LongGrassOnSpawn(struct MapObject*, u32*); -static void GetGroundEffectFlags_SandHeap(struct MapObject*, u32*); -static void GetGroundEffectFlags_ShallowFlowingWater(struct MapObject*, u32*); -static void GetGroundEffectFlags_ShortGrass(struct MapObject*, u32*); -static void GetGroundEffectFlags_HotSprings(struct MapObject*, u32*); -static void GetGroundEffectFlags_TallGrassOnBeginStep(struct MapObject*, u32*); -static void GetGroundEffectFlags_LongGrassOnBeginStep(struct MapObject*, u32*); -static void GetGroundEffectFlags_Tracks(struct MapObject*, u32*); -static void GetGroundEffectFlags_Puddle(struct MapObject*, u32*); -static void GetGroundEffectFlags_Ripple(struct MapObject*, u32*); -static void GetGroundEffectFlags_Seaweed(struct MapObject*, u32*); -static void GetGroundEffectFlags_JumpLanding(struct MapObject*, u32*); -static u8 FieldObjectCheckForReflectiveSurface(struct MapObject*); +static bool8 IsCoordOutsideEventObjectMovementRect(struct EventObject *, s16, s16); +static bool8 IsMetatileDirectionallyImpassable(struct EventObject *, s16, s16, u8); +static bool8 CheckForCollisionBetweenEventObjects(struct EventObject *, s16, s16); +bool8 sub_809558C(struct EventObject *, struct Sprite *); +bool8 sub_8095B64(struct EventObject *, struct Sprite *); +static void sub_8096530(struct EventObject *, struct Sprite *); +static void npc_update_obj_anim_flag(struct EventObject *, struct Sprite *); +static void EventObjectUpdateMetatileBehaviors(struct EventObject*); +static void GetGroundEffectFlags_Reflection(struct EventObject*, u32*); +static void GetGroundEffectFlags_TallGrassOnSpawn(struct EventObject*, u32*); +static void GetGroundEffectFlags_LongGrassOnSpawn(struct EventObject*, u32*); +static void GetGroundEffectFlags_SandHeap(struct EventObject*, u32*); +static void GetGroundEffectFlags_ShallowFlowingWater(struct EventObject*, u32*); +static void GetGroundEffectFlags_ShortGrass(struct EventObject*, u32*); +static void GetGroundEffectFlags_HotSprings(struct EventObject*, u32*); +static void GetGroundEffectFlags_TallGrassOnBeginStep(struct EventObject*, u32*); +static void GetGroundEffectFlags_LongGrassOnBeginStep(struct EventObject*, u32*); +static void GetGroundEffectFlags_Tracks(struct EventObject*, u32*); +static void GetGroundEffectFlags_Puddle(struct EventObject*, u32*); +static void GetGroundEffectFlags_Ripple(struct EventObject*, u32*); +static void GetGroundEffectFlags_Seaweed(struct EventObject*, u32*); +static void GetGroundEffectFlags_JumpLanding(struct EventObject*, u32*); +static u8 EventObjectCheckForReflectiveSurface(struct EventObject*); static u8 GetReflectionTypeByMetatileBehavior(u32); static void InitObjectPriorityByZCoord(struct Sprite *sprite, u8 z); -static void FieldObjectUpdateSubpriority(struct MapObject*, struct Sprite*); -static void DoTracksGroundEffect_None(struct MapObject*, struct Sprite*, u8); -static void DoTracksGroundEffect_Footprints(struct MapObject*, struct Sprite*, u8); -static void DoTracksGroundEffect_BikeTireTracks(struct MapObject*, struct Sprite*, u8); -static void DoRippleFieldEffect(struct MapObject*, struct Sprite*); -static void DoGroundEffects_OnSpawn(struct MapObject*, struct Sprite*); -static void DoGroundEffects_OnBeginStep(struct MapObject*, struct Sprite*); -static void DoGroundEffects_OnFinishStep(struct MapObject*, struct Sprite*); +static void EventObjectUpdateSubpriority(struct EventObject*, struct Sprite*); +static void DoTracksGroundEffect_None(struct EventObject*, struct Sprite*, u8); +static void DoTracksGroundEffect_Footprints(struct EventObject*, struct Sprite*, u8); +static void DoTracksGroundEffect_BikeTireTracks(struct EventObject*, struct Sprite*, u8); +static void DoRippleFieldEffect(struct EventObject*, struct Sprite*); +static void DoGroundEffects_OnSpawn(struct EventObject*, struct Sprite*); +static void DoGroundEffects_OnBeginStep(struct EventObject*, struct Sprite*); +static void DoGroundEffects_OnFinishStep(struct EventObject*, struct Sprite*); static void sub_8097D68(struct Sprite*); static void sub_8097FE4(u8); @@ -125,87 +123,87 @@ void (*const gCameraObjectFuncs[])(struct Sprite *) = { // movement type callbacks void (*const gUnknown_08505438[])(struct Sprite *) = { - FieldObjectCB_NoMovement1, - FieldObjectCB_LookRandomDirections, - FieldObjectCB_GoRandomDirections, - FieldObjectCB_RandomlyGoNorthOrSouth, - FieldObjectCB_RandomlyGoNorthOrSouth, - FieldObjectCB_RandomlyGoEastOrWest, - FieldObjectCB_RandomlyGoEastOrWest, - FieldObjectCB_FaceFixedDirection, - FieldObjectCB_FaceFixedDirection, - FieldObjectCB_FaceFixedDirection, - FieldObjectCB_FaceFixedDirection, - FieldObjectCB_NoMovement2, - FieldObjectCB_BerryTree, - FieldObjectCB_RandomlyLookNorthOrSouth, - FieldObjectCB_RandomlyLookEastOrWest, - FieldObjectCB_RandomlyLookNorthOrWest, - FieldObjectCB_RandomlyLookNorthOrEast, - FieldObjectCB_RandomlyLookSouthOrWest, - FieldObjectCB_RandomlyLookSouthOrEast, - FieldObjectCB_RandomlyLookNorthOrSouthOrWest, - FieldObjectCB_RandomlyLookNorthOrSouthOrEast, - FieldObjectCB_RandomlyLookNorthOrEastOrWest, - FieldObjectCB_RandomlyLookSouthOrEastOrWest, - FieldObjectCB_LookAroundCounterclockwise, - FieldObjectCB_LookAroundClockwise, - FieldObjectCB_AlternatelyGoInOppositeDirections, - FieldObjectCB_AlternatelyGoInOppositeDirections, - FieldObjectCB_AlternatelyGoInOppositeDirections, - FieldObjectCB_AlternatelyGoInOppositeDirections, - FieldObjectCB_GoInDirectionSequence1, - FieldObjectCB_GoInDirectionSequence2, - FieldObjectCB_GoInDirectionSequence3, - FieldObjectCB_GoInDirectionSequence4, - FieldObjectCB_GoInDirectionSequence5, - FieldObjectCB_GoInDirectionSequence6, - FieldObjectCB_GoInDirectionSequence7, - FieldObjectCB_GoInDirectionSequence8, - FieldObjectCB_GoInDirectionSequence9, - FieldObjectCB_GoInDirectionSequence10, - FieldObjectCB_GoInDirectionSequence11, - FieldObjectCB_GoInDirectionSequence12, - FieldObjectCB_GoInDirectionSequence13, - FieldObjectCB_GoInDirectionSequence14, - FieldObjectCB_GoInDirectionSequence15, - FieldObjectCB_GoInDirectionSequence16, - FieldObjectCB_GoInDirectionSequence17, - FieldObjectCB_GoInDirectionSequence18, - FieldObjectCB_GoInDirectionSequence19, - FieldObjectCB_GoInDirectionSequence20, - FieldObjectCB_GoInDirectionSequence21, - FieldObjectCB_GoInDirectionSequence22, - FieldObjectCB_GoInDirectionSequence23, - FieldObjectCB_GoInDirectionSequence24, - FieldObjectCB_CopyPlayer1, - FieldObjectCB_CopyPlayer1, - FieldObjectCB_CopyPlayer1, - FieldObjectCB_CopyPlayer1, - FieldObjectCB_TreeDisguise, - FieldObjectCB_MountainDisguise, - FieldObjectCB_CopyPlayer2, - FieldObjectCB_CopyPlayer2, - FieldObjectCB_CopyPlayer2, - FieldObjectCB_CopyPlayer2, - FieldObjectCB_Hidden1, - FieldObjectCB_WalkInPlace1, - FieldObjectCB_WalkInPlace1, - FieldObjectCB_WalkInPlace1, - FieldObjectCB_WalkInPlace1, - FieldObjectCB_WalkInPlace2, - FieldObjectCB_WalkInPlace2, - FieldObjectCB_WalkInPlace2, - FieldObjectCB_WalkInPlace2, - FieldObjectCB_WalkInPlace3, - FieldObjectCB_WalkInPlace3, - FieldObjectCB_WalkInPlace3, - FieldObjectCB_WalkInPlace3, - FieldObjectCB_Hidden2, - FieldObjectCB_WalkInPlace4, - FieldObjectCB_WalkInPlace4, - FieldObjectCB_WalkInPlace4, - FieldObjectCB_WalkInPlace4, + EventObjectCB_NoMovement1, + EventObjectCB_LookRandomDirections, + EventObjectCB_GoRandomDirections, + EventObjectCB_RandomlyGoNorthOrSouth, + EventObjectCB_RandomlyGoNorthOrSouth, + EventObjectCB_RandomlyGoEastOrWest, + EventObjectCB_RandomlyGoEastOrWest, + EventObjectCB_FaceFixedDirection, + EventObjectCB_FaceFixedDirection, + EventObjectCB_FaceFixedDirection, + EventObjectCB_FaceFixedDirection, + EventObjectCB_NoMovement2, + EventObjectCB_BerryTree, + EventObjectCB_RandomlyLookNorthOrSouth, + EventObjectCB_RandomlyLookEastOrWest, + EventObjectCB_RandomlyLookNorthOrWest, + EventObjectCB_RandomlyLookNorthOrEast, + EventObjectCB_RandomlyLookSouthOrWest, + EventObjectCB_RandomlyLookSouthOrEast, + EventObjectCB_RandomlyLookNorthOrSouthOrWest, + EventObjectCB_RandomlyLookNorthOrSouthOrEast, + EventObjectCB_RandomlyLookNorthOrEastOrWest, + EventObjectCB_RandomlyLookSouthOrEastOrWest, + EventObjectCB_LookAroundCounterclockwise, + EventObjectCB_LookAroundClockwise, + EventObjectCB_AlternatelyGoInOppositeDirections, + EventObjectCB_AlternatelyGoInOppositeDirections, + EventObjectCB_AlternatelyGoInOppositeDirections, + EventObjectCB_AlternatelyGoInOppositeDirections, + EventObjectCB_GoInDirectionSequence1, + EventObjectCB_GoInDirectionSequence2, + EventObjectCB_GoInDirectionSequence3, + EventObjectCB_GoInDirectionSequence4, + EventObjectCB_GoInDirectionSequence5, + EventObjectCB_GoInDirectionSequence6, + EventObjectCB_GoInDirectionSequence7, + EventObjectCB_GoInDirectionSequence8, + EventObjectCB_GoInDirectionSequence9, + EventObjectCB_GoInDirectionSequence10, + EventObjectCB_GoInDirectionSequence11, + EventObjectCB_GoInDirectionSequence12, + EventObjectCB_GoInDirectionSequence13, + EventObjectCB_GoInDirectionSequence14, + EventObjectCB_GoInDirectionSequence15, + EventObjectCB_GoInDirectionSequence16, + EventObjectCB_GoInDirectionSequence17, + EventObjectCB_GoInDirectionSequence18, + EventObjectCB_GoInDirectionSequence19, + EventObjectCB_GoInDirectionSequence20, + EventObjectCB_GoInDirectionSequence21, + EventObjectCB_GoInDirectionSequence22, + EventObjectCB_GoInDirectionSequence23, + EventObjectCB_GoInDirectionSequence24, + EventObjectCB_CopyPlayer1, + EventObjectCB_CopyPlayer1, + EventObjectCB_CopyPlayer1, + EventObjectCB_CopyPlayer1, + EventObjectCB_TreeDisguise, + EventObjectCB_MountainDisguise, + EventObjectCB_CopyPlayer2, + EventObjectCB_CopyPlayer2, + EventObjectCB_CopyPlayer2, + EventObjectCB_CopyPlayer2, + EventObjectCB_Hidden1, + EventObjectCB_WalkInPlace1, + EventObjectCB_WalkInPlace1, + EventObjectCB_WalkInPlace1, + EventObjectCB_WalkInPlace1, + EventObjectCB_WalkInPlace2, + EventObjectCB_WalkInPlace2, + EventObjectCB_WalkInPlace2, + EventObjectCB_WalkInPlace2, + EventObjectCB_WalkInPlace3, + EventObjectCB_WalkInPlace3, + EventObjectCB_WalkInPlace3, + EventObjectCB_WalkInPlace3, + EventObjectCB_Hidden2, + EventObjectCB_WalkInPlace4, + EventObjectCB_WalkInPlace4, + EventObjectCB_WalkInPlace4, + EventObjectCB_WalkInPlace4, }; const u8 gRangedMovementTypes[] = { @@ -385,41 +383,41 @@ const u8 gInitialMovementTypeFacingDirections[] = { #include "data/field_event_obj/event_object_graphics_info.h" const struct SpritePalette gUnknown_0850BBC8[] = { - {gFieldObjectPalette0, 0x1103}, - {gFieldObjectPalette1, 0x1104}, - {gFieldObjectPalette2, 0x1105}, - {gFieldObjectPalette3, 0x1106}, - {gFieldObjectPalette4, 0x1107}, - {gFieldObjectPalette5, 0x1108}, - {gFieldObjectPalette6, 0x1109}, - {gFieldObjectPalette7, 0x110A}, - {gFieldObjectPalette8, 0x1100}, - {gFieldObjectPalette9, 0x1101}, - {gFieldObjectPalette10, 0x1102}, - {gFieldObjectPalette11, 0x1115}, - {gFieldObjectPalette12, 0x110B}, - {gFieldObjectPalette13, 0x110C}, - {gFieldObjectPalette14, 0x110D}, - {gFieldObjectPalette15, 0x110E}, - {gFieldObjectPalette16, 0x110F}, - {gFieldObjectPalette17, 0x1110}, - {gFieldObjectPalette18, 0x1111}, - {gFieldObjectPalette19, 0x1112}, - {gFieldObjectPalette20, 0x1113}, - {gFieldObjectPalette21, 0x1114}, - {gFieldObjectPalette22, 0x1116}, - {gFieldObjectPalette23, 0x1117}, - {gFieldObjectPalette24, 0x1118}, - {gFieldObjectPalette25, 0x1119}, - {gFieldObjectPalette26, 0x111B}, - {gFieldObjectPalette27, 0x111C}, - {gFieldObjectPalette28, 0x111D}, - {gFieldObjectPalette29, 0x111E}, - {gFieldObjectPalette30, 0x111F}, - {gFieldObjectPalette31, 0x1120}, - {gFieldObjectPalette32, 0x1121}, - {gFieldObjectPalette33, 0x1122}, - {gFieldObjectPalette34, 0x1123}, + {gEventObjectPalette0, 0x1103}, + {gEventObjectPalette1, 0x1104}, + {gEventObjectPalette2, 0x1105}, + {gEventObjectPalette3, 0x1106}, + {gEventObjectPalette4, 0x1107}, + {gEventObjectPalette5, 0x1108}, + {gEventObjectPalette6, 0x1109}, + {gEventObjectPalette7, 0x110A}, + {gEventObjectPalette8, 0x1100}, + {gEventObjectPalette9, 0x1101}, + {gEventObjectPalette10, 0x1102}, + {gEventObjectPalette11, 0x1115}, + {gEventObjectPalette12, 0x110B}, + {gEventObjectPalette13, 0x110C}, + {gEventObjectPalette14, 0x110D}, + {gEventObjectPalette15, 0x110E}, + {gEventObjectPalette16, 0x110F}, + {gEventObjectPalette17, 0x1110}, + {gEventObjectPalette18, 0x1111}, + {gEventObjectPalette19, 0x1112}, + {gEventObjectPalette20, 0x1113}, + {gEventObjectPalette21, 0x1114}, + {gEventObjectPalette22, 0x1116}, + {gEventObjectPalette23, 0x1117}, + {gEventObjectPalette24, 0x1118}, + {gEventObjectPalette25, 0x1119}, + {gEventObjectPalette26, 0x111B}, + {gEventObjectPalette27, 0x111C}, + {gEventObjectPalette28, 0x111D}, + {gEventObjectPalette29, 0x111E}, + {gEventObjectPalette30, 0x111F}, + {gEventObjectPalette31, 0x1120}, + {gEventObjectPalette32, 0x1121}, + {gEventObjectPalette33, 0x1122}, + {gEventObjectPalette34, 0x1123}, {NULL, 0x0000}, }; @@ -1077,28 +1075,28 @@ const u8 gUnknown_0850DC3F[][4] = { // Code -static void npc_clear_ids_and_state(struct MapObject *mapObject) +static void npc_clear_ids_and_state(struct EventObject *eventObject) { - *mapObject = (struct MapObject){}; - mapObject->localId = 0xFF; - mapObject->mapNum = -1; - mapObject->mapGroup = -1; - mapObject->movementActionId = -1; + *eventObject = (struct EventObject){}; + eventObject->localId = 0xFF; + eventObject->mapNum = -1; + eventObject->mapGroup = -1; + eventObject->movementActionId = -1; } static void npcs_clear_ids_and_state(void) { u8 i; - for (i = 0; i < NUM_FIELD_OBJECTS; i ++) + for (i = 0; i < NUM_EVENT_OBJECTS; i ++) { - npc_clear_ids_and_state(&gMapObjects[i]); + npc_clear_ids_and_state(&gEventObjects[i]); } } void sub_808D438(void) { - ZeroAllLinkPlayerMapObjects(); + ZeroAllLinkPlayerEventObjects(); npcs_clear_ids_and_state(); ClearPlayerAvatarInfo(); sub_808D450(); @@ -1125,9 +1123,9 @@ u8 sub_808D4F4(void) { u8 i; - for (i = 0; i < NUM_FIELD_OBJECTS; i ++) + for (i = 0; i < NUM_EVENT_OBJECTS; i ++) { - if (!gMapObjects[i].active) + if (!gEventObjects[i].active) { break; } @@ -1135,32 +1133,32 @@ u8 sub_808D4F4(void) return i; } -u8 GetFieldObjectIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId) +u8 GetEventObjectIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId) { if (localId < 0xff) { - return GetFieldObjectIdByLocalIdAndMapInternal(localId, mapId, mapGroupId); + return GetEventObjectIdByLocalIdAndMapInternal(localId, mapId, mapGroupId); } - return GetFieldObjectIdByLocalId(localId); + return GetEventObjectIdByLocalId(localId); } -bool8 TryGetFieldObjectIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId, u8 *fieldObjectId) +bool8 TryGetEventObjectIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId, u8 *eventObjectId) { - *fieldObjectId = GetFieldObjectIdByLocalIdAndMap(localId, mapId, mapGroupId); - if (*fieldObjectId == NUM_FIELD_OBJECTS) + *eventObjectId = GetEventObjectIdByLocalIdAndMap(localId, mapId, mapGroupId); + if (*eventObjectId == NUM_EVENT_OBJECTS) { return TRUE; } return FALSE; } -u8 GetFieldObjectIdByXY(s16 x, s16 y) +u8 GetEventObjectIdByXY(s16 x, s16 y) { u8 i; - for (i = 0; i < NUM_FIELD_OBJECTS; i ++) + for (i = 0; i < NUM_EVENT_OBJECTS; i ++) { - if (gMapObjects[i].active && gMapObjects[i].currentCoords.x == x && gMapObjects[i].currentCoords.y == y) + if (gEventObjects[i].active && gEventObjects[i].currentCoords.x == x && gEventObjects[i].currentCoords.y == y) { break; } @@ -1168,92 +1166,92 @@ u8 GetFieldObjectIdByXY(s16 x, s16 y) return i; } -static u8 GetFieldObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapId, u8 mapGroupId) +static u8 GetEventObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapId, u8 mapGroupId) { u8 i; - for (i = 0; i < NUM_FIELD_OBJECTS; i ++) + for (i = 0; i < NUM_EVENT_OBJECTS; i ++) { - if (gMapObjects[i].active && gMapObjects[i].localId == localId && gMapObjects[i].mapNum == mapId && gMapObjects[i].mapGroup == mapGroupId) + if (gEventObjects[i].active && gEventObjects[i].localId == localId && gEventObjects[i].mapNum == mapId && gEventObjects[i].mapGroup == mapGroupId) { return i; } } - return NUM_FIELD_OBJECTS; + return NUM_EVENT_OBJECTS; } -static u8 GetFieldObjectIdByLocalId(u8 localId) +static u8 GetEventObjectIdByLocalId(u8 localId) { u8 i; - for (i = 0; i < NUM_FIELD_OBJECTS; i ++) + for (i = 0; i < NUM_EVENT_OBJECTS; i ++) { - if (gMapObjects[i].active && gMapObjects[i].localId == localId) + if (gEventObjects[i].active && gEventObjects[i].localId == localId) { return i; } } - return NUM_FIELD_OBJECTS; + return NUM_EVENT_OBJECTS; } // This function has the same nonmatching quirk as in Ruby/Sapphire. #ifdef NONMATCHING -static u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 mapNum, u8 mapGroup) +static u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *template, u8 mapNum, u8 mapGroup) { - struct MapObject *mapObject; + struct EventObject *eventObject; s16 x; s16 y; u8 slot; // mapNum and mapGroup are in the wrong registers (r7/r6 instead of r6/r7) - if (GetAvailableFieldObjectSlot(template->localId, mapNum, mapGroup, &slot)) + if (GetAvailableEventObjectSlot(template->localId, mapNum, mapGroup, &slot)) { - return NUM_FIELD_OBJECTS; + return NUM_EVENT_OBJECTS; } - mapObject = &gMapObjects[slot]; - npc_clear_ids_and_state(mapObject); + eventObject = &gEventObjects[slot]; + npc_clear_ids_and_state(eventObject); x = template->x + 7; y = template->y + 7; - mapObject->active = TRUE; - mapObject->triggerGroundEffectsOnMove = TRUE; - mapObject->graphicsId = template->graphicsId; - mapObject->movementType = template->movementType; - mapObject->localId = template->localId; - mapObject->mapNum = mapNum; - mapObject->mapGroup = mapGroup; - mapObject->initialCoords.x = x; - mapObject->initialCoords.y = y; - mapObject->currentCoords.x = x; - mapObject->currentCoords.y = y; - mapObject->previousCoords.x = x; - mapObject->previousCoords.y = y; - mapObject->currentElevation = template->elevation; - mapObject->previousElevation = template->elevation; + eventObject->active = TRUE; + eventObject->triggerGroundEffectsOnMove = TRUE; + eventObject->graphicsId = template->graphicsId; + eventObject->movementType = template->movementType; + eventObject->localId = template->localId; + eventObject->mapNum = mapNum; + eventObject->mapGroup = mapGroup; + eventObject->initialCoords.x = x; + eventObject->initialCoords.y = y; + eventObject->currentCoords.x = x; + eventObject->currentCoords.y = y; + eventObject->previousCoords.x = x; + eventObject->previousCoords.y = y; + eventObject->currentElevation = template->elevation; + eventObject->previousElevation = template->elevation; // For some reason, 0x0F is placed in r9, to be used later - mapObject->range.as_nybbles.x = template->movementRangeX; - mapObject->range.as_nybbles.y = template->movementRangeY; - mapObject->trainerType = template->trainerType; - mapObject->trainerRange_berryTreeId = template->trainerRange_berryTreeId; - mapObject->previousMovementDirection = gInitialMovementTypeFacingDirections[template->movementType]; - FieldObjectSetDirection(mapObject, mapObject->previousMovementDirection); - FieldObjectHandleDynamicGraphicsId(mapObject); + eventObject->range.as_nybbles.x = template->movementRangeX; + eventObject->range.as_nybbles.y = template->movementRangeY; + eventObject->trainerType = template->trainerType; + eventObject->trainerRange_berryTreeId = template->trainerRange_berryTreeId; + eventObject->previousMovementDirection = gInitialMovementTypeFacingDirections[template->movementType]; + EventObjectSetDirection(eventObject, eventObject->previousMovementDirection); + EventObjectHandleDynamicGraphicsId(eventObject); - if (gRangedMovementTypes[mapObject->movementType]) + if (gRangedMovementTypes[eventObject->movementType]) { - if ((mapObject->range.as_nybbles.x) == 0) + if ((eventObject->range.as_nybbles.x) == 0) { // r9 is invoked here - mapObject->range.as_nybbles.x ++; + eventObject->range.as_nybbles.x ++; } - if ((mapObject->range.as_nybbles.y) == 0) + if ((eventObject->range.as_nybbles.y) == 0) { - mapObject->range.as_nybbles.y ++; + eventObject->range.as_nybbles.y ++; } } return slot; } #else -static NAKED u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 mapId, u8 mapGroupId) +static NAKED u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *template, u8 mapId, u8 mapGroupId) { asm_unified("\tpush {r4-r7,lr}\n" "\tmov r7, r9\n" @@ -1269,7 +1267,7 @@ static NAKED u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *templ "\tadds r1, r6, 0\n" "\tadds r2, r7, 0\n" "\tmov r3, sp\n" - "\tbl GetAvailableFieldObjectSlot\n" + "\tbl GetAvailableEventObjectSlot\n" "\tlsls r0, 24\n" "\tcmp r0, 0\n" "\tbeq _0808D66E\n" @@ -1281,7 +1279,7 @@ static NAKED u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *templ "\tlsls r0, r1, 3\n" "\tadds r0, r1\n" "\tlsls r0, 2\n" - "\tldr r1, =gMapObjects\n" + "\tldr r1, =gEventObjects\n" "\tadds r4, r0, r1\n" "\tadds r0, r4, 0\n" "\tbl npc_clear_ids_and_state\n" @@ -1358,9 +1356,9 @@ static NAKED u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *templ "\tstrb r1, [r0]\n" "\tldrb r1, [r0]\n" "\tadds r0, r4, 0\n" - "\tbl FieldObjectSetDirection\n" + "\tbl EventObjectSetDirection\n" "\tadds r0, r4, 0\n" - "\tbl FieldObjectHandleDynamicGraphicsId\n" + "\tbl EventObjectHandleDynamicGraphicsId\n" "\tldr r1, =gRangedMovementTypes\n" "\tldrb r0, [r4, 0x6]\n" "\tadds r0, r1\n" @@ -1413,7 +1411,7 @@ u8 unref_sub_808D77C(u8 localId) { u8 i; u8 nObjects; - struct MapObjectTemplate *template; + struct EventObjectTemplate *template; if (gMapHeader.events != NULL) { @@ -1427,21 +1425,21 @@ u8 unref_sub_808D77C(u8 localId) } else { - nObjects = gMapHeader.events->mapObjectCount; + nObjects = gMapHeader.events->eventObjectCount; } for (i = 0; i < nObjects; i ++) { - template = &gSaveBlock1Ptr->mapObjectTemplates[i]; + template = &gSaveBlock1Ptr->eventObjectTemplates[i]; if (template->localId == localId && !FlagGet(template->flagId)) { - return InitFieldObjectStateFromTemplate(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + return InitEventObjectStateFromTemplate(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } } } - return NUM_FIELD_OBJECTS; + return NUM_EVENT_OBJECTS; } -static bool8 GetAvailableFieldObjectSlot(u16 localId, u8 mapNum, u8 mapGroup, u8 *result) +static bool8 GetAvailableEventObjectSlot(u16 localId, u8 mapNum, u8 mapGroup, u8 *result) // Looks for an empty slot. // Returns FALSE and the location of the available slot // in *result. @@ -1450,78 +1448,78 @@ static bool8 GetAvailableFieldObjectSlot(u16 localId, u8 mapNum, u8 mapGroup, u8 { u8 i = 0; - for (i = 0; i < NUM_FIELD_OBJECTS; i ++) + for (i = 0; i < NUM_EVENT_OBJECTS; i ++) { - if (!gMapObjects[i].active) + if (!gEventObjects[i].active) break; - if (gMapObjects[i].localId == localId && gMapObjects[i].mapNum == mapNum && gMapObjects[i].mapGroup == mapGroup) + if (gEventObjects[i].localId == localId && gEventObjects[i].mapNum == mapNum && gEventObjects[i].mapGroup == mapGroup) return TRUE; } - if (i >= NUM_FIELD_OBJECTS) + if (i >= NUM_EVENT_OBJECTS) return TRUE; *result = i; do { - if (gMapObjects[i].active && gMapObjects[i].localId == localId && gMapObjects[i].mapNum == mapNum && gMapObjects[i].mapGroup == mapGroup) + if (gEventObjects[i].active && gEventObjects[i].localId == localId && gEventObjects[i].mapNum == mapNum && gEventObjects[i].mapGroup == mapGroup) return TRUE; i ++; - } while (i < NUM_FIELD_OBJECTS); + } while (i < NUM_EVENT_OBJECTS); return FALSE; } -static void RemoveFieldObject(struct MapObject *mapObject) +static void RemoveEventObject(struct EventObject *eventObject) { - mapObject->active = FALSE; - RemoveFieldObjectInternal(mapObject); + eventObject->active = FALSE; + RemoveEventObjectInternal(eventObject); } -void RemoveFieldObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +void RemoveEventObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { u8 index; - if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &index)) + if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &index)) { - FlagSet(GetFieldObjectFlagIdByFieldObjectId(index)); - RemoveFieldObject(&gMapObjects[index]); + FlagSet(GetEventObjectFlagIdByEventObjectId(index)); + RemoveEventObject(&gEventObjects[index]); } } -static void RemoveFieldObjectInternal(struct MapObject *mapObject) +static void RemoveEventObjectInternal(struct EventObject *eventObject) { struct SpriteFrameImage image; - image.size = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->size; - gSprites[mapObject->spriteId].images = ℑ - DestroySprite(&gSprites[mapObject->spriteId]); + image.size = GetEventObjectGraphicsInfo(eventObject->graphicsId)->size; + gSprites[eventObject->spriteId].images = ℑ + DestroySprite(&gSprites[eventObject->spriteId]); } void unref_sub_808D958(void) { u8 i; - for (i = 0; i < NUM_FIELD_OBJECTS; i ++) + for (i = 0; i < NUM_EVENT_OBJECTS; i ++) { - if (i != gPlayerAvatar.mapObjectId) + if (i != gPlayerAvatar.eventObjectId) { - RemoveFieldObject(&gMapObjects[i]); + RemoveEventObject(&gEventObjects[i]); } } } -static u8 SpawnFieldObjectInternal(struct MapObjectTemplate *mapObjectTemplate, struct SpriteTemplate *spriteTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY) +static u8 SpawnEventObjectInternal(struct EventObjectTemplate *eventObjectTemplate, struct SpriteTemplate *spriteTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY) { - struct MapObject *mapObject; - const struct MapObjectGraphicsInfo *graphicsInfo; + struct EventObject *eventObject; + const struct EventObjectGraphicsInfo *graphicsInfo; struct Sprite *sprite; - u8 mapObjectId; + u8 eventObjectId; u8 paletteSlot; u8 spriteId; - mapObjectId = InitFieldObjectStateFromTemplate(mapObjectTemplate, mapNum, mapGroup); - if (mapObjectId == NUM_FIELD_OBJECTS) + eventObjectId = InitEventObjectStateFromTemplate(eventObjectTemplate, mapNum, mapGroup); + if (eventObjectId == NUM_EVENT_OBJECTS) { - return NUM_FIELD_OBJECTS; + return NUM_EVENT_OBJECTS; } - mapObject = &gMapObjects[mapObjectId]; - graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId); + eventObject = &gEventObjects[eventObjectId]; + graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); paletteSlot = graphicsInfo->paletteSlot; if (paletteSlot == 0) { @@ -1536,110 +1534,110 @@ static u8 SpawnFieldObjectInternal(struct MapObjectTemplate *mapObjectTemplate, paletteSlot -= 16; sub_808EAB0(graphicsInfo->paletteTag1, paletteSlot); } - if (mapObject->movementType == 0x4c) + if (eventObject->movementType == 0x4c) { - mapObject->invisible = TRUE; + eventObject->invisible = TRUE; } *(u16 *)&spriteTemplate->paletteTag = 0xFFFF; spriteId = CreateSprite(spriteTemplate, 0, 0, 0); if (spriteId == MAX_SPRITES) { - gMapObjects[mapObjectId].active = FALSE; - return NUM_FIELD_OBJECTS; + gEventObjects[eventObjectId].active = FALSE; + return NUM_EVENT_OBJECTS; } sprite = &gSprites[spriteId]; - sub_8092FF0(mapObject->currentCoords.x + cameraX, mapObject->currentCoords.y + cameraY, &sprite->pos1.x, &sprite->pos1.y); + sub_8092FF0(eventObject->currentCoords.x + cameraX, eventObject->currentCoords.y + cameraY, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); sprite->pos1.x += 8; sprite->pos1.y += 16 + sprite->centerToCornerVecY; sprite->oam.paletteNum = paletteSlot; sprite->coordOffsetEnabled = TRUE; - sprite->data[0] = mapObjectId; - mapObject->spriteId = spriteId; - mapObject->inanimate = graphicsInfo->inanimate; - if (!mapObject->inanimate) + sprite->data[0] = eventObjectId; + eventObject->spriteId = spriteId; + eventObject->inanimate = graphicsInfo->inanimate; + if (!eventObject->inanimate) { - StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObject->facingDirection)); + StartSpriteAnim(sprite, EventObjectDirectionToImageAnimId(eventObject->facingDirection)); } - SetObjectSubpriorityByZCoord(mapObject->previousElevation, sprite, 1); - sub_8096518(mapObject, sprite); - return mapObjectId; + SetObjectSubpriorityByZCoord(eventObject->previousElevation, sprite, 1); + sub_8096518(eventObject, sprite); + return eventObjectId; } -static u8 SpawnFieldObject(struct MapObjectTemplate *mapObjectTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY) +static u8 SpawnEventObject(struct EventObjectTemplate *eventObjectTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY) { - const struct MapObjectGraphicsInfo *graphicsInfo; + const struct EventObjectGraphicsInfo *graphicsInfo; struct SpriteTemplate spriteTemplate; const struct SubspriteTable *subspriteTables; struct SpriteFrameImage spriteFrameImage; - u8 mapObjectId; + u8 eventObjectId; subspriteTables = NULL; - graphicsInfo = GetFieldObjectGraphicsInfo(mapObjectTemplate->graphicsId); - MakeObjectTemplateFromFieldObjectTemplate(mapObjectTemplate, &spriteTemplate, &subspriteTables); + graphicsInfo = GetEventObjectGraphicsInfo(eventObjectTemplate->graphicsId); + MakeObjectTemplateFromEventObjectTemplate(eventObjectTemplate, &spriteTemplate, &subspriteTables); spriteFrameImage.size = graphicsInfo->size; spriteTemplate.images = &spriteFrameImage; - mapObjectId = SpawnFieldObjectInternal(mapObjectTemplate, &spriteTemplate, mapNum, mapGroup, cameraX, cameraY); - if (mapObjectId == NUM_FIELD_OBJECTS) + eventObjectId = SpawnEventObjectInternal(eventObjectTemplate, &spriteTemplate, mapNum, mapGroup, cameraX, cameraY); + if (eventObjectId == NUM_EVENT_OBJECTS) { - return NUM_FIELD_OBJECTS; + return NUM_EVENT_OBJECTS; } - gSprites[gMapObjects[mapObjectId].spriteId].images = graphicsInfo->images; + gSprites[gEventObjects[eventObjectId].spriteId].images = graphicsInfo->images; if (subspriteTables != NULL) { - SetSubspriteTables(&gSprites[gMapObjects[mapObjectId].spriteId], subspriteTables); + SetSubspriteTables(&gSprites[gEventObjects[eventObjectId].spriteId], subspriteTables); } - return mapObjectId; + return eventObjectId; } -u8 SpawnSpecialFieldObject(struct MapObjectTemplate *mapObjectTemplate) +u8 SpawnSpecialEventObject(struct EventObjectTemplate *eventObjectTemplate) { s16 cameraX; s16 cameraY; - GetFieldObjectMovingCameraOffset(&cameraX, &cameraY); - return SpawnFieldObject(mapObjectTemplate, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY); + GetEventObjectMovingCameraOffset(&cameraX, &cameraY); + return SpawnEventObject(eventObjectTemplate, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY); } -u8 SpawnSpecialFieldObjectParametrized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z) +u8 SpawnSpecialEventObjectParametrized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z) { - struct MapObjectTemplate mapObjectTemplate; + struct EventObjectTemplate eventObjectTemplate; x -= 7; y -= 7; - mapObjectTemplate.localId = localId; - mapObjectTemplate.graphicsId = graphicsId; - mapObjectTemplate.unk2 = 0; - mapObjectTemplate.x = x; - mapObjectTemplate.y = y; - mapObjectTemplate.elevation = z; - mapObjectTemplate.movementType = movementBehavior; - mapObjectTemplate.movementRangeX = 0; - mapObjectTemplate.movementRangeY = 0; - mapObjectTemplate.trainerType = 0; - mapObjectTemplate.trainerRange_berryTreeId = 0; - return SpawnSpecialFieldObject(&mapObjectTemplate); + eventObjectTemplate.localId = localId; + eventObjectTemplate.graphicsId = graphicsId; + eventObjectTemplate.unk2 = 0; + eventObjectTemplate.x = x; + eventObjectTemplate.y = y; + eventObjectTemplate.elevation = z; + eventObjectTemplate.movementType = movementBehavior; + eventObjectTemplate.movementRangeX = 0; + eventObjectTemplate.movementRangeY = 0; + eventObjectTemplate.trainerType = 0; + eventObjectTemplate.trainerRange_berryTreeId = 0; + return SpawnSpecialEventObject(&eventObjectTemplate); } u8 show_sprite(u8 localId, u8 mapNum, u8 mapGroup) { - struct MapObjectTemplate *mapObjectTemplate; + struct EventObjectTemplate *eventObjectTemplate; s16 cameraX; s16 cameraY; - mapObjectTemplate = GetFieldObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup); - if (mapObjectTemplate == NULL) + eventObjectTemplate = GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup); + if (eventObjectTemplate == NULL) { - return NUM_FIELD_OBJECTS; + return NUM_EVENT_OBJECTS; } - GetFieldObjectMovingCameraOffset(&cameraX, &cameraY); - return SpawnFieldObject(mapObjectTemplate, mapNum, mapGroup, cameraX, cameraY); + GetEventObjectMovingCameraOffset(&cameraX, &cameraY); + return SpawnEventObject(eventObjectTemplate, mapNum, mapGroup, cameraX, cameraY); } -static void MakeObjectTemplateFromFieldObjectGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables) +static void MakeObjectTemplateFromEventObjectGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables) { - const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(graphicsId); + const struct EventObjectGraphicsInfo *gfxInfo = GetEventObjectGraphicsInfo(graphicsId); sprTemplate->tileTag = gfxInfo->tileTag; sprTemplate->paletteTag = gfxInfo->paletteTag1; @@ -1651,17 +1649,17 @@ static void MakeObjectTemplateFromFieldObjectGraphicsInfo(u16 graphicsId, void ( *subspriteTables = gfxInfo->subspriteTables; } -static void MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 callbackIndex, struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables) +static void MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 callbackIndex, struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables) { - MakeObjectTemplateFromFieldObjectGraphicsInfo(graphicsId, gUnknown_08505438[callbackIndex], sprTemplate, subspriteTables); + MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, gUnknown_08505438[callbackIndex], sprTemplate, subspriteTables); } -static void MakeObjectTemplateFromFieldObjectTemplate(struct MapObjectTemplate *mapObjectTemplate, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) +static void MakeObjectTemplateFromEventObjectTemplate(struct EventObjectTemplate *eventObjectTemplate, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) { - MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(mapObjectTemplate->graphicsId, mapObjectTemplate->movementType, spriteTemplate, subspriteTables); + MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(eventObjectTemplate->graphicsId, eventObjectTemplate->movementType, spriteTemplate, subspriteTables); } -u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority) +u8 AddPseudoEventObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority) { struct SpriteTemplate *spriteTemplate; const struct SubspriteTable *subspriteTables; @@ -1669,7 +1667,7 @@ u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x u8 spriteIdx; spriteTemplate = malloc(sizeof(struct SpriteTemplate)); - MakeObjectTemplateFromFieldObjectGraphicsInfo(graphicsId, callback, spriteTemplate, &subspriteTables); + MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, callback, spriteTemplate, &subspriteTables); if (spriteTemplate->paletteTag != 0xffff) { sub_808E894(spriteTemplate->paletteTag); @@ -1688,14 +1686,14 @@ u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction) { - const struct MapObjectGraphicsInfo *graphicsInfo; + const struct EventObjectGraphicsInfo *graphicsInfo; struct SpriteTemplate spriteTemplate; const struct SubspriteTable *subspriteTables; u8 spriteId; struct Sprite *sprite; - graphicsInfo = GetFieldObjectGraphicsInfo(graphicsId); - MakeObjectTemplateFromFieldObjectGraphicsInfo(graphicsId, sub_8097AC8, &spriteTemplate, &subspriteTables); + graphicsInfo = GetEventObjectGraphicsInfo(graphicsId); + MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, sub_8097AC8, &spriteTemplate, &subspriteTables); *(u16 *)&spriteTemplate.paletteTag = 0xffff; x += 7; y += 7; @@ -1730,12 +1728,12 @@ u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction) } InitObjectPriorityByZCoord(sprite, z); SetObjectSubpriorityByZCoord(z, sprite, 1); - StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(direction)); + StartSpriteAnim(sprite, EventObjectDirectionToImageAnimId(direction)); } return spriteId; } -void SpawnFieldObjectsInView(s16 cameraX, s16 cameraY) +void SpawnEventObjectsInView(s16 cameraX, s16 cameraY) { u8 i; s16 left; @@ -1763,47 +1761,47 @@ void SpawnFieldObjectsInView(s16 cameraX, s16 cameraY) } else { - objectCount = gMapHeader.events->mapObjectCount; + objectCount = gMapHeader.events->eventObjectCount; } for (i = 0; i < objectCount; i++) { - struct MapObjectTemplate *template = &gSaveBlock1Ptr->mapObjectTemplates[i]; + struct EventObjectTemplate *template = &gSaveBlock1Ptr->eventObjectTemplates[i]; npcX = template->x + 7; npcY = template->y + 7; if (top <= npcY && bottom >= npcY && left <= npcX && right >= npcX && !FlagGet(template->flagId)) - SpawnFieldObject(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY); + SpawnEventObject(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY); } } } -/*static*/ void RemoveFieldObjectsOutsideView(void) +/*static*/ void RemoveEventObjectsOutsideView(void) { u8 i; u8 j; bool8 isActiveLinkPlayer; - struct MapObject *mapObject; + struct EventObject *eventObject; - for (i = 0; i < NUM_FIELD_OBJECTS; i ++) + for (i = 0; i < NUM_EVENT_OBJECTS; i ++) { - for (j = 0, isActiveLinkPlayer = FALSE; j < ARRAY_COUNT(gLinkPlayerMapObjects); j ++) + for (j = 0, isActiveLinkPlayer = FALSE; j < ARRAY_COUNT(gLinkPlayerEventObjects); j ++) { - if (gLinkPlayerMapObjects[j].active && i == gLinkPlayerMapObjects[j].mapObjId) + if (gLinkPlayerEventObjects[j].active && i == gLinkPlayerEventObjects[j].eventObjId) isActiveLinkPlayer = TRUE; } if (!isActiveLinkPlayer) { - mapObject = &gMapObjects[i]; + eventObject = &gEventObjects[i]; - if (mapObject->active && !mapObject->isPlayer) - RemoveFieldObjectIfOutsideView(mapObject); + if (eventObject->active && !eventObject->isPlayer) + RemoveEventObjectIfOutsideView(eventObject); } } } -static void RemoveFieldObjectIfOutsideView(struct MapObject *mapObject) +static void RemoveEventObjectIfOutsideView(struct EventObject *eventObject) { s16 left; s16 right; @@ -1815,13 +1813,13 @@ static void RemoveFieldObjectIfOutsideView(struct MapObject *mapObject) top = gSaveBlock1Ptr->pos.y; bottom = gSaveBlock1Ptr->pos.y + 16; - if (mapObject->currentCoords.x >= left && mapObject->currentCoords.x <= right - && mapObject->currentCoords.y >= top && mapObject->currentCoords.y <= bottom) + if (eventObject->currentCoords.x >= left && eventObject->currentCoords.x <= right + && eventObject->currentCoords.y >= top && eventObject->currentCoords.y <= bottom) return; - if (mapObject->initialCoords.x >= left && mapObject->initialCoords.x <= right - && mapObject->initialCoords.y >= top && mapObject->initialCoords.y <= bottom) + if (eventObject->initialCoords.x >= left && eventObject->initialCoords.x <= right + && eventObject->initialCoords.y >= top && eventObject->initialCoords.y <= bottom) return; - RemoveFieldObject(mapObject); + RemoveEventObject(eventObject); } void sub_808E16C(s16 x, s16 y) @@ -1829,9 +1827,9 @@ void sub_808E16C(s16 x, s16 y) u8 i; ClearPlayerAvatarInfo(); - for (i = 0; i < NUM_FIELD_OBJECTS; i ++) + for (i = 0; i < NUM_EVENT_OBJECTS; i ++) { - if (gMapObjects[i].active) + if (gEventObjects[i].active) { sub_808E1B8(i, x, y); } @@ -1839,32 +1837,32 @@ void sub_808E16C(s16 x, s16 y) sub_808D450(); } -static void sub_808E1B8(u8 mapObjectId, s16 x, s16 y) +static void sub_808E1B8(u8 eventObjectId, s16 x, s16 y) { u8 spriteId; u8 paletteSlot; - struct MapObject *mapObject; + struct EventObject *eventObject; const struct SubspriteTable *subspriteTables; - const struct MapObjectGraphicsInfo *graphicsInfo; + const struct EventObjectGraphicsInfo *graphicsInfo; struct SpriteFrameImage spriteFrameImage; struct SpriteTemplate spriteTemplate; struct Sprite *sprite; #define i spriteId - for (i = 0; i < ARRAY_COUNT(gLinkPlayerMapObjects); i ++) + for (i = 0; i < ARRAY_COUNT(gLinkPlayerEventObjects); i ++) { - if (gLinkPlayerMapObjects[i].active && mapObjectId == gLinkPlayerMapObjects[i].mapObjId) + if (gLinkPlayerEventObjects[i].active && eventObjectId == gLinkPlayerEventObjects[i].eventObjId) { return; } } #undef i - mapObject = &gMapObjects[mapObjectId]; + eventObject = &gEventObjects[eventObjectId]; subspriteTables = NULL; - graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId); + graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); spriteFrameImage.size = graphicsInfo->size; - MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(mapObject->graphicsId, mapObject->movementType, &spriteTemplate, &subspriteTables); + MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(eventObject->graphicsId, eventObject->movementType, &spriteTemplate, &subspriteTables); spriteTemplate.images = &spriteFrameImage; *(u16 *)&spriteTemplate.paletteTag = 0xffff; paletteSlot = graphicsInfo->paletteSlot; @@ -1886,16 +1884,16 @@ static void sub_808E1B8(u8 mapObjectId, s16 x, s16 y) if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; - sub_8092FF0(x + mapObject->currentCoords.x, y + mapObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); + sub_8092FF0(x + eventObject->currentCoords.x, y + eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); sprite->pos1.x += 8; sprite->pos1.y += 16 + sprite->centerToCornerVecY; sprite->images = graphicsInfo->images; - if (mapObject->movementType == 0x0b) + if (eventObject->movementType == 0x0b) { - SetPlayerAvatarFieldObjectIdAndObjectId(mapObjectId, spriteId); - mapObject->warpArrowSpriteId = sub_8154228(); + SetPlayerAvatarEventObjectIdAndObjectId(eventObjectId, spriteId); + eventObject->warpArrowSpriteId = sub_8154228(); } if (subspriteTables != NULL) { @@ -1903,46 +1901,46 @@ static void sub_808E1B8(u8 mapObjectId, s16 x, s16 y) } sprite->oam.paletteNum = paletteSlot; sprite->coordOffsetEnabled = TRUE; - sprite->data[0] = mapObjectId; - mapObject->spriteId = spriteId; - if (!mapObject->inanimate && mapObject->movementType != 0x0b) + sprite->data[0] = eventObjectId; + eventObject->spriteId = spriteId; + if (!eventObject->inanimate && eventObject->movementType != 0x0b) { - StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObject->facingDirection)); + StartSpriteAnim(sprite, EventObjectDirectionToImageAnimId(eventObject->facingDirection)); } - sub_808E38C(mapObject); - SetObjectSubpriorityByZCoord(mapObject->previousElevation, sprite, 1); + sub_808E38C(eventObject); + SetObjectSubpriorityByZCoord(eventObject->previousElevation, sprite, 1); } } -static void sub_808E38C(struct MapObject *mapObject) +static void sub_808E38C(struct EventObject *eventObject) { - mapObject->singleMovementActive = FALSE; - mapObject->triggerGroundEffectsOnMove = TRUE; - mapObject->hasShadow = FALSE; - mapObject->hasReflection = FALSE; - mapObject->inShortGrass = FALSE; - mapObject->inShallowFlowingWater = FALSE; - mapObject->inSandPile = FALSE; - mapObject->inHotSprings = FALSE; - FieldObjectClearAnim(mapObject); + eventObject->singleMovementActive = FALSE; + eventObject->triggerGroundEffectsOnMove = TRUE; + eventObject->hasShadow = FALSE; + eventObject->hasReflection = FALSE; + eventObject->inShortGrass = FALSE; + eventObject->inShallowFlowingWater = FALSE; + eventObject->inSandPile = FALSE; + eventObject->inHotSprings = FALSE; + EventObjectClearAnim(eventObject); } -static void SetPlayerAvatarFieldObjectIdAndObjectId(u8 mapObjectId, u8 spriteId) +static void SetPlayerAvatarEventObjectIdAndObjectId(u8 eventObjectId, u8 spriteId) { - gPlayerAvatar.mapObjectId = mapObjectId; + gPlayerAvatar.eventObjectId = eventObjectId; gPlayerAvatar.spriteId = spriteId; - gPlayerAvatar.gender = GetPlayerAvatarGenderByGraphicsId(gMapObjects[mapObjectId].graphicsId); - SetPlayerAvatarExtraStateTransition(gMapObjects[mapObjectId].graphicsId, 0x20); + gPlayerAvatar.gender = GetPlayerAvatarGenderByGraphicsId(gEventObjects[eventObjectId].graphicsId); + SetPlayerAvatarExtraStateTransition(gEventObjects[eventObjectId].graphicsId, 0x20); } -void FieldObjectSetGraphicsId(struct MapObject *mapObject, u8 graphicsId) +void EventObjectSetGraphicsId(struct EventObject *eventObject, u8 graphicsId) { - const struct MapObjectGraphicsInfo *graphicsInfo; + const struct EventObjectGraphicsInfo *graphicsInfo; struct Sprite *sprite; u8 paletteSlot; - graphicsInfo = GetFieldObjectGraphicsInfo(graphicsId); - sprite = &gSprites[mapObject->spriteId]; + graphicsInfo = GetEventObjectGraphicsInfo(graphicsId); + sprite = &gSprites[eventObject->spriteId]; paletteSlot = graphicsInfo->paletteSlot; if (paletteSlot == 0) { @@ -1963,86 +1961,86 @@ void FieldObjectSetGraphicsId(struct MapObject *mapObject, u8 graphicsId) sprite->anims = graphicsInfo->anims; sprite->subspriteTables = graphicsInfo->subspriteTables; sprite->oam.paletteNum = paletteSlot; - mapObject->inanimate = graphicsInfo->inanimate; - mapObject->graphicsId = graphicsId; - sub_8093038(mapObject->currentCoords.x, mapObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); + eventObject->inanimate = graphicsInfo->inanimate; + eventObject->graphicsId = graphicsId; + sub_8093038(eventObject->currentCoords.x, eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); sprite->pos1.x += 8; sprite->pos1.y += 16 + sprite->centerToCornerVecY; - if (mapObject->trackedByCamera) + if (eventObject->trackedByCamera) { CameraObjectReset1(); } } -void FieldObjectSetGraphicsIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 graphicsId) +void EventObjectSetGraphicsIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 graphicsId) { - u8 mapObjectId; + u8 eventObjectId; - if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) + if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) { - FieldObjectSetGraphicsId(&gMapObjects[mapObjectId], graphicsId); + EventObjectSetGraphicsId(&gEventObjects[eventObjectId], graphicsId); } } -void FieldObjectTurn(struct MapObject *mapObject, u8 direction) +void EventObjectTurn(struct EventObject *eventObject, u8 direction) { - FieldObjectSetDirection(mapObject, direction); - if (!mapObject->inanimate) + EventObjectSetDirection(eventObject, direction); + if (!eventObject->inanimate) { - StartSpriteAnim(&gSprites[mapObject->spriteId], FieldObjectDirectionToImageAnimId(mapObject->facingDirection)); - SeekSpriteAnim(&gSprites[mapObject->spriteId], 0); + StartSpriteAnim(&gSprites[eventObject->spriteId], EventObjectDirectionToImageAnimId(eventObject->facingDirection)); + SeekSpriteAnim(&gSprites[eventObject->spriteId], 0); } } -void FieldObjectTurnByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 direction) +void EventObjectTurnByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 direction) { - u8 mapObjectId; + u8 eventObjectId; - if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) + if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) { - FieldObjectTurn(&gMapObjects[mapObjectId], direction); + EventObjectTurn(&gEventObjects[eventObjectId], direction); } } void PlayerObjectTurn(struct PlayerAvatar *playerAvatar, u8 direction) { - FieldObjectTurn(&gMapObjects[playerAvatar->mapObjectId], direction); + EventObjectTurn(&gEventObjects[playerAvatar->eventObjectId], direction); } -/*static*/ void get_berry_tree_graphics(struct MapObject *mapObject, struct Sprite *sprite) +/*static*/ void get_berry_tree_graphics(struct EventObject *eventObject, struct Sprite *sprite) { u8 berryStage; u8 berryId; - mapObject->invisible = TRUE; + eventObject->invisible = TRUE; sprite->invisible = TRUE; - berryStage = GetStageByBerryTreeId(mapObject->trainerRange_berryTreeId); + berryStage = GetStageByBerryTreeId(eventObject->trainerRange_berryTreeId); if (berryStage != 0) { - mapObject->invisible = FALSE; + eventObject->invisible = FALSE; sprite->invisible = FALSE; - berryId = GetBerryTypeByBerryTreeId(mapObject->trainerRange_berryTreeId) - 1; + berryId = GetBerryTypeByBerryTreeId(eventObject->trainerRange_berryTreeId) - 1; berryStage -= 1; if (berryId >= NUM_BERRIES) { berryId = 0; } - FieldObjectSetGraphicsId(mapObject, gBerryTreeFieldObjectGraphicsIdTablePointers[berryId][berryStage]); + EventObjectSetGraphicsId(eventObject, gBerryTreeEventObjectGraphicsIdTablePointers[berryId][berryStage]); sprite->images = gBerryTreePicTablePointers[berryId]; sprite->oam.paletteNum = gBerryTreePaletteSlotTablePointers[berryId][berryStage]; StartSpriteAnim(sprite, berryStage); } } -const struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8 graphicsId) +const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(u8 graphicsId) { u8 bard; if (graphicsId >= SPRITE_VAR) { - graphicsId = VarGetFieldObjectGraphicsId(graphicsId - SPRITE_VAR); + graphicsId = VarGetEventObjectGraphicsId(graphicsId - SPRITE_VAR); } if (graphicsId == 0x45) { @@ -2053,83 +2051,83 @@ const struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8 graphicsId) { graphicsId = 0x05; // LittleBoy1 } - return gFieldObjectGraphicsInfoPointers[graphicsId]; + return gEventObjectGraphicsInfoPointers[graphicsId]; } -static void FieldObjectHandleDynamicGraphicsId(struct MapObject *mapObject) +static void EventObjectHandleDynamicGraphicsId(struct EventObject *eventObject) { - if (mapObject->graphicsId >= SPRITE_VAR) + if (eventObject->graphicsId >= SPRITE_VAR) { - mapObject->graphicsId = VarGetFieldObjectGraphicsId(mapObject->graphicsId - SPRITE_VAR); + eventObject->graphicsId = VarGetEventObjectGraphicsId(eventObject->graphicsId - SPRITE_VAR); } } void npc_by_local_id_and_map_set_field_1_bit_x20(u8 localId, u8 mapNum, u8 mapGroup, u8 state) { - u8 mapObjectId; + u8 eventObjectId; - if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) + if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) { - gMapObjects[mapObjectId].invisible = state; + gEventObjects[eventObjectId].invisible = state; } } -void FieldObjectGetLocalIdAndMap(struct MapObject *mapObject, void *localId, void *mapNum, void *mapGroup) +void EventObjectGetLocalIdAndMap(struct EventObject *eventObject, void *localId, void *mapNum, void *mapGroup) { - *(u8*)(localId) = mapObject->localId; - *(u8*)(mapNum) = mapObject->mapNum; - *(u8*)(mapGroup) = mapObject->mapGroup; + *(u8*)(localId) = eventObject->localId; + *(u8*)(mapNum) = eventObject->mapNum; + *(u8*)(mapGroup) = eventObject->mapGroup; } void sub_808E75C(s16 x, s16 y) { - u8 mapObjectId; - struct MapObject *mapObject; + u8 eventObjectId; + struct EventObject *eventObject; - mapObjectId = GetFieldObjectIdByXY(x, y); - if (mapObjectId != NUM_FIELD_OBJECTS) + eventObjectId = GetEventObjectIdByXY(x, y); + if (eventObjectId != NUM_EVENT_OBJECTS) { - mapObject = &gMapObjects[mapObjectId]; - mapObject->triggerGroundEffectsOnMove = TRUE; + eventObject = &gEventObjects[eventObjectId]; + eventObject->triggerGroundEffectsOnMove = TRUE; } } void sub_808E78C(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority) { - u8 mapObjectId; - struct MapObject *mapObject; + u8 eventObjectId; + struct EventObject *eventObject; struct Sprite *sprite; - if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) + if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) { - mapObject = &gMapObjects[mapObjectId]; - sprite = &gSprites[mapObject->spriteId]; - mapObject->fixedPriority = TRUE; + eventObject = &gEventObjects[eventObjectId]; + sprite = &gSprites[eventObject->spriteId]; + eventObject->fixedPriority = TRUE; sprite->subpriority = subpriority; } } void sub_808E7E4(u8 localId, u8 mapNum, u8 mapGroup) { - u8 mapObjectId; - struct MapObject *mapObject; + u8 eventObjectId; + struct EventObject *eventObject; - if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) + if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) { - mapObject = &gMapObjects[mapObjectId]; - mapObject->fixedPriority = FALSE; - mapObject->triggerGroundEffectsOnMove = TRUE; + eventObject = &gEventObjects[eventObjectId]; + eventObject->fixedPriority = FALSE; + eventObject->triggerGroundEffectsOnMove = TRUE; } } void sub_808E82C(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) { - u8 mapObjectId; + u8 eventObjectId; struct Sprite *sprite; - if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) + if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) { - sprite = &gSprites[gMapObjects[mapObjectId].spriteId]; + sprite = &gSprites[gEventObjects[eventObjectId].spriteId]; sprite->pos2.x = x; sprite->pos2.y = y; } @@ -2145,7 +2143,7 @@ static void sub_808E894(u16 paletteTag) { u16 paletteSlot; - paletteSlot = FindFieldObjectPaletteIndexByTag(paletteTag); + paletteSlot = FindEventObjectPaletteIndexByTag(paletteTag); if (paletteSlot != 0x11ff) // always true { sub_808E8F4(&gUnknown_0850BBC8[paletteSlot]); @@ -2175,7 +2173,7 @@ void pal_patch_for_npc(u16 paletteTag, u8 paletteSlot) { u16 paletteIdx; - paletteIdx = FindFieldObjectPaletteIndexByTag(paletteTag); + paletteIdx = FindEventObjectPaletteIndexByTag(paletteTag); LoadPalette(gUnknown_0850BBC8[paletteIdx].data, 16 * paletteSlot + 256, 0x20); } @@ -2189,7 +2187,7 @@ void pal_patch_for_npc_range(const u16 *paletteTags, u8 minSlot, u8 maxSlot) } } -static u8 FindFieldObjectPaletteIndexByTag(u16 tag) +static u8 FindEventObjectPaletteIndexByTag(u16 tag) { u8 i; @@ -2239,45 +2237,45 @@ static void sub_808EAB0(u16 tag, u8 slot) pal_patch_for_npc(tag, slot); } -void unref_sub_808EAC4(struct MapObject *mapObject, s16 x, s16 y) +void unref_sub_808EAC4(struct EventObject *eventObject, s16 x, s16 y) { - mapObject->previousCoords.x = mapObject->currentCoords.x; - mapObject->previousCoords.y = mapObject->currentCoords.y; - mapObject->currentCoords.x += x; - mapObject->currentCoords.y += y; + eventObject->previousCoords.x = eventObject->currentCoords.x; + eventObject->previousCoords.y = eventObject->currentCoords.y; + eventObject->currentCoords.x += x; + eventObject->currentCoords.y += y; } -void npc_coords_shift(struct MapObject *mapObject, s16 x, s16 y) +void npc_coords_shift(struct EventObject *eventObject, s16 x, s16 y) { - mapObject->previousCoords.x = mapObject->currentCoords.x; - mapObject->previousCoords.y = mapObject->currentCoords.y; - mapObject->currentCoords.x = x; - mapObject->currentCoords.y = y; + eventObject->previousCoords.x = eventObject->currentCoords.x; + eventObject->previousCoords.y = eventObject->currentCoords.y; + eventObject->currentCoords.x = x; + eventObject->currentCoords.y = y; } -/*static*/ void npc_coords_set(struct MapObject *mapObject, s16 x, s16 y) +/*static*/ void npc_coords_set(struct EventObject *eventObject, s16 x, s16 y) { - mapObject->previousCoords.x = x; - mapObject->previousCoords.y = y; - mapObject->currentCoords.x = x; - mapObject->currentCoords.y = y; + eventObject->previousCoords.x = x; + eventObject->previousCoords.y = y; + eventObject->currentCoords.x = x; + eventObject->currentCoords.y = y; } -void sub_808EB08(struct MapObject *mapObject, s16 x, s16 y) +void sub_808EB08(struct EventObject *eventObject, s16 x, s16 y) { struct Sprite *sprite; - const struct MapObjectGraphicsInfo *graphicsInfo; + const struct EventObjectGraphicsInfo *graphicsInfo; - sprite = &gSprites[mapObject->spriteId]; - graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId); - npc_coords_set(mapObject, x, y); - sub_8093038(mapObject->currentCoords.x, mapObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); + sprite = &gSprites[eventObject->spriteId]; + graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + npc_coords_set(eventObject, x, y); + sub_8093038(eventObject->currentCoords.x, eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); sprite->pos1.x += 8; sprite->pos1.y += 16 + sprite->centerToCornerVecY; - sub_808E38C(mapObject); - if (mapObject->trackedByCamera) + sub_808E38C(eventObject); + if (eventObject->trackedByCamera) { CameraObjectReset1(); } @@ -2285,22 +2283,22 @@ void sub_808EB08(struct MapObject *mapObject, s16 x, s16 y) void sub_808EBA8(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) { - u8 mapObjectId; + u8 eventObjectId; - if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) + if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) { x += 7; y += 7; - sub_808EB08(&gMapObjects[mapObjectId], x, y); + sub_808EB08(&gEventObjects[eventObjectId], x, y); } } -void npc_coords_shift_still(struct MapObject *mapObject) +void npc_coords_shift_still(struct EventObject *eventObject) { - npc_coords_shift(mapObject, mapObject->currentCoords.x, mapObject->currentCoords.y); + npc_coords_shift(eventObject, eventObject->currentCoords.x, eventObject->currentCoords.y); } -void UpdateFieldObjectCoordsForCameraUpdate(void) +void UpdateEventObjectCoordsForCameraUpdate(void) { u8 i; s16 dx; @@ -2310,51 +2308,51 @@ void UpdateFieldObjectCoordsForCameraUpdate(void) { dx = gCamera.x; dy = gCamera.y; - for (i = 0; i < NUM_FIELD_OBJECTS; i ++) + for (i = 0; i < NUM_EVENT_OBJECTS; i ++) { - if (gMapObjects[i].active) + if (gEventObjects[i].active) { - gMapObjects[i].initialCoords.x -= dx; - gMapObjects[i].initialCoords.y -= dy; - gMapObjects[i].currentCoords.x -= dx; - gMapObjects[i].currentCoords.y -= dy; - gMapObjects[i].previousCoords.x -= dx; - gMapObjects[i].previousCoords.y -= dy; + gEventObjects[i].initialCoords.x -= dx; + gEventObjects[i].initialCoords.y -= dy; + gEventObjects[i].currentCoords.x -= dx; + gEventObjects[i].currentCoords.y -= dy; + gEventObjects[i].previousCoords.x -= dx; + gEventObjects[i].previousCoords.y -= dy; } } } } -u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z) +u8 GetEventObjectIdByXYZ(u16 x, u16 y, u8 z) { u8 i; - for (i = 0; i < NUM_FIELD_OBJECTS; i ++) + for (i = 0; i < NUM_EVENT_OBJECTS; i ++) { - if (gMapObjects[i].active) + if (gEventObjects[i].active) { - if (gMapObjects[i].currentCoords.x == x && gMapObjects[i].currentCoords.y == y && FieldObjectDoesZCoordMatch(&gMapObjects[i], z)) + if (gEventObjects[i].currentCoords.x == x && gEventObjects[i].currentCoords.y == y && EventObjectDoesZCoordMatch(&gEventObjects[i], z)) { return i; } } } - return NUM_FIELD_OBJECTS; + return NUM_EVENT_OBJECTS; } -static bool8 FieldObjectDoesZCoordMatch(struct MapObject *mapObject, u8 z) +static bool8 EventObjectDoesZCoordMatch(struct EventObject *eventObject, u8 z) { - if (mapObject->currentElevation != 0 && z != 0 && mapObject->currentElevation != z) + if (eventObject->currentElevation != 0 && z != 0 && eventObject->currentElevation != z) { return FALSE; } return TRUE; } -void UpdateFieldObjectsForCameraUpdate(s16 x, s16 y) +void UpdateEventObjectsForCameraUpdate(s16 x, s16 y) { - UpdateFieldObjectCoordsForCameraUpdate(); - SpawnFieldObjectsInView(x, y); - RemoveFieldObjectsOutsideView(); + UpdateEventObjectCoordsForCameraUpdate(); + SpawnEventObjectsInView(x, y); + RemoveEventObjectsOutsideView(); } u8 AddCameraObject(u8 linkedSpriteId) @@ -2496,91 +2494,91 @@ u8 obj_unfreeze(struct Sprite *sprite, s16 x, s16 y, u8 subpriority) return MAX_SPRITES; } -void FieldObjectSetDirection(struct MapObject *mapObject, u8 direction) +void EventObjectSetDirection(struct EventObject *eventObject, u8 direction) { s8 d2; - mapObject->previousMovementDirection = mapObject->facingDirection; - if (!mapObject->facingDirectionLocked) + eventObject->previousMovementDirection = eventObject->facingDirection; + if (!eventObject->facingDirectionLocked) { d2 = direction; - mapObject->facingDirection = d2; + eventObject->facingDirection = d2; } - mapObject->movementDirection = direction; + eventObject->movementDirection = direction; } -static const u8 *GetFieldObjectScriptPointerByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +static const u8 *GetEventObjectScriptPointerByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { - return GetFieldObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->script; + return GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->script; } -const u8 *GetFieldObjectScriptPointerByFieldObjectId(u8 mapObjectId) +const u8 *GetEventObjectScriptPointerByEventObjectId(u8 eventObjectId) { - return GetFieldObjectScriptPointerByLocalIdAndMap(gMapObjects[mapObjectId].localId, gMapObjects[mapObjectId].mapNum, gMapObjects[mapObjectId].mapGroup); + return GetEventObjectScriptPointerByLocalIdAndMap(gEventObjects[eventObjectId].localId, gEventObjects[eventObjectId].mapNum, gEventObjects[eventObjectId].mapGroup); } -static u16 GetFieldObjectFlagIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +static u16 GetEventObjectFlagIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { - return GetFieldObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->flagId; + return GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->flagId; } -static u16 GetFieldObjectFlagIdByFieldObjectId(u8 mapObjectId) +static u16 GetEventObjectFlagIdByEventObjectId(u8 eventObjectId) { - return GetFieldObjectFlagIdByLocalIdAndMap(gMapObjects[mapObjectId].localId, gMapObjects[mapObjectId].mapNum, gMapObjects[mapObjectId].mapGroup); + return GetEventObjectFlagIdByLocalIdAndMap(gEventObjects[eventObjectId].localId, gEventObjects[eventObjectId].mapNum, gEventObjects[eventObjectId].mapGroup); } u8 sub_808F080(u8 localId, u8 mapNum, u8 mapGroup) { - u8 mapObjectId; + u8 eventObjectId; - if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) + if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) { return 0xFF; } - return gMapObjects[mapObjectId].trainerType; + return gEventObjects[eventObjectId].trainerType; } -u8 sub_808F0BC(u8 mapObjectId) +u8 sub_808F0BC(u8 eventObjectId) { - return gMapObjects[mapObjectId].trainerType; + return gEventObjects[eventObjectId].trainerType; } u8 sub_808F0D4(u8 localId, u8 mapNum, u8 mapGroup) { - u8 mapObjectId; + u8 eventObjectId; - if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) + if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) { return 0xFF; } - return gMapObjects[mapObjectId].trainerRange_berryTreeId; + return gEventObjects[eventObjectId].trainerRange_berryTreeId; } -u8 FieldObjectGetBerryTreeId(u8 mapObjectId) +u8 EventObjectGetBerryTreeId(u8 eventObjectId) { - return gMapObjects[mapObjectId].trainerRange_berryTreeId; + return gEventObjects[eventObjectId].trainerRange_berryTreeId; } -static struct MapObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +static struct EventObjectTemplate *GetEventObjectTemplateByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { - struct MapObjectTemplate *templates; + struct EventObjectTemplate *templates; const struct MapHeader *mapHeader; u8 count; if (gSaveBlock1Ptr->location.mapNum == mapNum && gSaveBlock1Ptr->location.mapGroup == mapGroup) { - templates = gSaveBlock1Ptr->mapObjectTemplates; - count = gMapHeader.events->mapObjectCount; + templates = gSaveBlock1Ptr->eventObjectTemplates; + count = gMapHeader.events->eventObjectCount; } else { mapHeader = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum); - templates = mapHeader->events->mapObjects; - count = mapHeader->events->mapObjectCount; + templates = mapHeader->events->eventObjects; + count = mapHeader->events->eventObjectCount; } - return FindFieldObjectTemplateInArrayByLocalId(localId, templates, count); + return FindEventObjectTemplateInArrayByLocalId(localId, templates, count); } -static struct MapObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 localId, struct MapObjectTemplate *templates, u8 count) +static struct EventObjectTemplate *FindEventObjectTemplateInArrayByLocalId(u8 localId, struct EventObjectTemplate *templates, u8 count) { u8 i; @@ -2594,81 +2592,81 @@ static struct MapObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 loca return NULL; } -struct MapObjectTemplate *sub_808F1B4(const struct MapObject *mapObject) +struct EventObjectTemplate *sub_808F1B4(const struct EventObject *eventObject) { int i; - if (mapObject->mapNum != gSaveBlock1Ptr->location.mapNum || mapObject->mapGroup != gSaveBlock1Ptr->location.mapGroup) + if (eventObject->mapNum != gSaveBlock1Ptr->location.mapNum || eventObject->mapGroup != gSaveBlock1Ptr->location.mapGroup) { return NULL; } for (i = 0; i < 64; i ++) // Using ARRAY_COUNT here results in the wrong conditional branch instruction (bls instead of ble) { - if (mapObject->localId == gSaveBlock1Ptr->mapObjectTemplates[i].localId) + if (eventObject->localId == gSaveBlock1Ptr->eventObjectTemplates[i].localId) { - return &gSaveBlock1Ptr->mapObjectTemplates[i]; + return &gSaveBlock1Ptr->eventObjectTemplates[i]; } } return NULL; } -void sub_808F208(const struct MapObject *mapObject) +void sub_808F208(const struct EventObject *eventObject) { - struct MapObjectTemplate *mapObjectTemplate; + struct EventObjectTemplate *eventObjectTemplate; - mapObjectTemplate = sub_808F1B4(mapObject); - if (mapObjectTemplate != NULL) + eventObjectTemplate = sub_808F1B4(eventObject); + if (eventObjectTemplate != NULL) { - mapObjectTemplate->x = mapObject->currentCoords.x - 7; - mapObjectTemplate->y = mapObject->currentCoords.y - 7; + eventObjectTemplate->x = eventObject->currentCoords.x - 7; + eventObjectTemplate->y = eventObject->currentCoords.y - 7; } } -void sub_808F228(const struct MapObject *mapObject, const u8 *script) +void sub_808F228(const struct EventObject *eventObject, const u8 *script) { - struct MapObjectTemplate *mapObjectTemplate; + struct EventObjectTemplate *eventObjectTemplate; - mapObjectTemplate = sub_808F1B4(mapObject); - if (mapObjectTemplate != NULL) + eventObjectTemplate = sub_808F1B4(eventObject); + if (eventObjectTemplate != NULL) { - mapObjectTemplate->script = script; + eventObjectTemplate->script = script; } } -void sub_808F23C(const struct MapObject *mapObject, u8 movementType) +void sub_808F23C(const struct EventObject *eventObject, u8 movementType) { - struct MapObjectTemplate *mapObjectTemplate; + struct EventObjectTemplate *eventObjectTemplate; - mapObjectTemplate = sub_808F1B4(mapObject); - if (mapObjectTemplate != NULL) + eventObjectTemplate = sub_808F1B4(eventObject); + if (eventObjectTemplate != NULL) { - mapObjectTemplate->movementType = movementType; + eventObjectTemplate->movementType = movementType; } } void sub_808F254(u8 localId, u8 mapNum, u8 mapGroup) { - u8 mapObjectId; + u8 eventObjectId; - if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) + if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) { - sub_808F208(&gMapObjects[mapObjectId]); + sub_808F208(&gEventObjects[eventObjectId]); } } void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat) { - u8 mapObjectId; + u8 eventObjectId; - if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) + if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) { switch (decorCat) { case DECORCAT_DOLL: - sub_808F228(&gMapObjects[mapObjectId], EventScript_2766A2); + sub_808F228(&gEventObjects[eventObjectId], EventScript_2766A2); break; case DECORCAT_CUSHION: - sub_808F228(&gMapObjects[mapObjectId], EventScript_2766A6); + sub_808F228(&gEventObjects[eventObjectId], EventScript_2766A6); break; } } @@ -2715,34 +2713,34 @@ null_object_step(NoMovement1, FALSE) field_object_step(GoRandomDirections, gUnknown_0850D6F4) -bool8 sub_808F44C(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808F44C(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(mapObject, sprite); + npc_reset(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_808F460(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808F460(struct EventObject *eventObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_808F48C(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808F48C(struct EventObject *eventObject, struct Sprite *sprite) { - if (!FieldObjectExecRegularAnim(mapObject, sprite)) + if (!EventObjectExecRegularAnim(eventObject, sprite)) { return FALSE; } - SetFieldObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]); + SetEventObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]); sprite->data[1] = 3; return TRUE; } -bool8 sub_808F4C8(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808F4C8(struct EventObject *eventObject, struct Sprite *sprite) { - if (RunFieldObjectStepTimer(sprite)) + if (RunEventObjectStepTimer(sprite)) { sprite->data[1] = 4; return TRUE; @@ -2750,41 +2748,41 @@ bool8 sub_808F4C8(struct MapObject *mapObject, struct Sprite *sprite) return FALSE; } -bool8 sub_808F4E8(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808F4E8(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; u8 chosenDirection; memcpy(directions, gUnknown_0850D710, sizeof directions); chosenDirection = directions[Random() & 0x03]; - FieldObjectSetDirection(mapObject, chosenDirection); + EventObjectSetDirection(eventObject, chosenDirection); sprite->data[1] = 5; - if (npc_block_way__next_tile(mapObject, chosenDirection)) + if (npc_block_way__next_tile(eventObject, chosenDirection)) { sprite->data[1] = 1; } return TRUE; } -bool8 sub_808F534(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808F534(struct EventObject *eventObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->movementDirection)); - mapObject->singleMovementActive = TRUE; + EventObjectSetRegularAnim(eventObject, sprite, GetGoSpeed0AnimId(eventObject->movementDirection)); + eventObject->singleMovementActive = TRUE; sprite->data[1] = 6; return TRUE; } -bool8 sub_808F564(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808F564(struct EventObject *eventObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (EventObjectExecRegularAnim(eventObject, sprite)) { - mapObject->singleMovementActive = FALSE; + eventObject->singleMovementActive = FALSE; sprite->data[1] = 1; } return FALSE; } -bool8 FieldObjectIsTrainerAndCloseToPlayer(struct MapObject *mapObject) +bool8 EventObjectIsTrainerAndCloseToPlayer(struct EventObject *eventObject) { s16 playerX; s16 playerY; @@ -2799,17 +2797,17 @@ bool8 FieldObjectIsTrainerAndCloseToPlayer(struct MapObject *mapObject) { return FALSE; } - if (mapObject->trainerType != 1 && mapObject->trainerType != 3) + if (eventObject->trainerType != 1 && eventObject->trainerType != 3) { return FALSE; } PlayerGetDestCoords(&playerX, &playerY); - objX = mapObject->currentCoords.x; - objY = mapObject->currentCoords.y; - minX = objX - mapObject->trainerRange_berryTreeId; - minY = objY - mapObject->trainerRange_berryTreeId; - maxX = objX + mapObject->trainerRange_berryTreeId; - maxY = objY + mapObject->trainerRange_berryTreeId; + objX = eventObject->currentCoords.x; + objY = eventObject->currentCoords.y; + minX = objX - eventObject->trainerRange_berryTreeId; + minY = objY - eventObject->trainerRange_berryTreeId; + maxX = objX + eventObject->trainerRange_berryTreeId; + maxY = objY + eventObject->trainerRange_berryTreeId; if (minX > playerX || maxX < playerX || minY > playerY || maxY < playerY) { return FALSE; @@ -3008,20 +3006,20 @@ u8 GetNonNorthRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) return direction; } -u8 GetRunningPastFacingDirection(struct MapObject *mapObject, u8 movementType) +u8 GetRunningPastFacingDirection(struct EventObject *eventObject, u8 movementType) { s16 dx; s16 dy; s16 absdx; s16 absdy; - if (!FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + if (!EventObjectIsTrainerAndCloseToPlayer(eventObject)) { return 0; } PlayerGetDestCoords(&dx, &dy); - dx -= mapObject->currentCoords.x; - dy -= mapObject->currentCoords.y; + dx -= eventObject->currentCoords.x; + dy -= eventObject->currentCoords.y; absdx = dx; absdy = dy; if (absdx < 0) @@ -3037,34 +3035,34 @@ u8 GetRunningPastFacingDirection(struct MapObject *mapObject, u8 movementType) field_object_step(LookRandomDirections, gUnknown_0850D740) -bool8 sub_808F988(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808F988(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(mapObject, sprite); + npc_reset(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_808F99C(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808F99C(struct EventObject *eventObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_808F9C8(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808F9C8(struct EventObject *eventObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (EventObjectExecRegularAnim(eventObject, sprite)) { - SetFieldObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]); - mapObject->singleMovementActive = FALSE; + SetEventObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]); + eventObject->singleMovementActive = FALSE; sprite->data[1] = 3; } return FALSE; } -bool8 sub_808FA0C(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808FA0C(struct EventObject *eventObject, struct Sprite *sprite) { - if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; return TRUE; @@ -3072,52 +3070,52 @@ bool8 sub_808FA0C(struct MapObject *mapObject, struct Sprite *sprite) return FALSE; } -bool8 sub_808FA3C(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808FA3C(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; u8 direction; memcpy(directions, gUnknown_0850D710, sizeof directions); - direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_ANY); + direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_ANY); if (direction == 0) { direction = directions[Random() & 0x03]; } - FieldObjectSetDirection(mapObject, direction); + EventObjectSetDirection(eventObject, direction); sprite->data[1] = 1; return TRUE; } field_object_step(RandomlyGoNorthOrSouth, gUnknown_0850D754) -bool8 sub_808FAC8(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808FAC8(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(mapObject, sprite); + npc_reset(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_808FADC(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808FADC(struct EventObject *eventObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_808FB08(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808FB08(struct EventObject *eventObject, struct Sprite *sprite) { - if (!FieldObjectExecRegularAnim(mapObject, sprite)) + if (!EventObjectExecRegularAnim(eventObject, sprite)) { return FALSE; } - SetFieldObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]); + SetEventObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]); sprite->data[1] = 3; return TRUE; } -bool8 sub_808FB44(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808FB44(struct EventObject *eventObject, struct Sprite *sprite) { - if (RunFieldObjectStepTimer(sprite)) + if (RunEventObjectStepTimer(sprite)) { sprite->data[1] = 4; return TRUE; @@ -3125,35 +3123,35 @@ bool8 sub_808FB44(struct MapObject *mapObject, struct Sprite *sprite) return FALSE; } -bool8 sub_808FB64(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808FB64(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[2]; u8 direction; memcpy(directions, gUnknown_0850D770, sizeof directions); direction = directions[Random() & 0x01]; - FieldObjectSetDirection(mapObject, direction); + EventObjectSetDirection(eventObject, direction); sprite->data[1] = 5; - if (npc_block_way__next_tile(mapObject, direction)) + if (npc_block_way__next_tile(eventObject, direction)) { sprite->data[1] = 1; } return TRUE; } -bool8 sub_808FBB0(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808FBB0(struct EventObject *eventObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->movementDirection)); - mapObject->singleMovementActive = TRUE; + EventObjectSetRegularAnim(eventObject, sprite, GetGoSpeed0AnimId(eventObject->movementDirection)); + eventObject->singleMovementActive = TRUE; sprite->data[1] = 6; return TRUE; } -bool8 sub_808FBE0(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808FBE0(struct EventObject *eventObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (EventObjectExecRegularAnim(eventObject, sprite)) { - mapObject->singleMovementActive = FALSE; + eventObject->singleMovementActive = FALSE; sprite->data[1] = 1; } return FALSE; @@ -3161,34 +3159,34 @@ bool8 sub_808FBE0(struct MapObject *mapObject, struct Sprite *sprite) field_object_step(RandomlyGoEastOrWest, gUnknown_0850D774) -bool8 sub_808FC4C(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808FC4C(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(mapObject, sprite); + npc_reset(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_808FC60(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808FC60(struct EventObject *eventObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_808FC8C(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808FC8C(struct EventObject *eventObject, struct Sprite *sprite) { - if (!FieldObjectExecRegularAnim(mapObject, sprite)) + if (!EventObjectExecRegularAnim(eventObject, sprite)) { return FALSE; } - SetFieldObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]); + SetEventObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]); sprite->data[1] = 3; return TRUE; } -bool8 sub_808FCC8(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808FCC8(struct EventObject *eventObject, struct Sprite *sprite) { - if (RunFieldObjectStepTimer(sprite)) + if (RunEventObjectStepTimer(sprite)) { sprite->data[1] = 4; return TRUE; @@ -3196,35 +3194,35 @@ bool8 sub_808FCC8(struct MapObject *mapObject, struct Sprite *sprite) return FALSE; } -bool8 sub_808FCE8(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808FCE8(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[2]; u8 direction; memcpy(directions, gUnknown_0850D790, sizeof directions); direction = directions[Random() & 0x01]; - FieldObjectSetDirection(mapObject, direction); + EventObjectSetDirection(eventObject, direction); sprite->data[1] = 5; - if (npc_block_way__next_tile(mapObject, direction)) + if (npc_block_way__next_tile(eventObject, direction)) { sprite->data[1] = 1; } return TRUE; } -bool8 sub_808FD34(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808FD34(struct EventObject *eventObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->movementDirection)); - mapObject->singleMovementActive = TRUE; + EventObjectSetRegularAnim(eventObject, sprite, GetGoSpeed0AnimId(eventObject->movementDirection)); + eventObject->singleMovementActive = TRUE; sprite->data[1] = 6; return TRUE; } -bool8 sub_808FD64(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808FD64(struct EventObject *eventObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (EventObjectExecRegularAnim(eventObject, sprite)) { - mapObject->singleMovementActive = FALSE; + eventObject->singleMovementActive = FALSE; sprite->data[1] = 1; } return FALSE; @@ -3232,17 +3230,17 @@ bool8 sub_808FD64(struct MapObject *mapObject, struct Sprite *sprite) field_object_step(FaceFixedDirection, gUnknown_0850D794) -bool8 sub_808FDD0(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808FDD0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + npc_reset(eventObject, sprite); + EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); sprite->data[1] = 1; return TRUE; } -bool8 sub_808FDFC(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808FDFC(struct EventObject *eventObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (EventObjectExecRegularAnim(eventObject, sprite)) { sprite->data[1] = 2; return TRUE; @@ -3250,45 +3248,45 @@ bool8 sub_808FDFC(struct MapObject *mapObject, struct Sprite *sprite) return FALSE; } -bool8 sub_808FE1C(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808FE1C(struct EventObject *eventObject, struct Sprite *sprite) { - mapObject->singleMovementActive = FALSE; + eventObject->singleMovementActive = FALSE; return FALSE; } -static bool8 FieldObjectCB2_BerryTree(struct MapObject *mapObject, struct Sprite *sprite); -extern bool8 (*const gUnknown_0850D7A0[])(struct MapObject *mapObject, struct Sprite *sprite); -void FieldObjectCB_BerryTree(struct Sprite *sprite) +static bool8 EventObjectCB2_BerryTree(struct EventObject *eventObject, struct Sprite *sprite); +extern bool8 (*const gUnknown_0850D7A0[])(struct EventObject *eventObject, struct Sprite *sprite); +void EventObjectCB_BerryTree(struct Sprite *sprite) { - struct MapObject *mapObject; + struct EventObject *eventObject; - mapObject = &gMapObjects[sprite->data[0]]; + eventObject = &gEventObjects[sprite->data[0]]; if (!(sprite->data[7] & 0x0001)) { - get_berry_tree_graphics(mapObject, sprite); + get_berry_tree_graphics(eventObject, sprite); sprite->data[7] |= 0x0001; } - FieldObjectStep(mapObject, sprite, FieldObjectCB2_BerryTree); + EventObjectStep(eventObject, sprite, EventObjectCB2_BerryTree); } -static bool8 FieldObjectCB2_BerryTree(struct MapObject *mapObject, struct Sprite *sprite) +static bool8 EventObjectCB2_BerryTree(struct EventObject *eventObject, struct Sprite *sprite) { - return gUnknown_0850D7A0[sprite->data[1]](mapObject, sprite); + return gUnknown_0850D7A0[sprite->data[1]](eventObject, sprite); } -bool8 do_berry_tree_growth_sparkle_1 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 do_berry_tree_growth_sparkle_1 (struct EventObject *eventObject, struct Sprite *sprite) { u8 berryStage; - npc_reset(mapObject, sprite); - mapObject->invisible = TRUE; + npc_reset(eventObject, sprite); + eventObject->invisible = TRUE; sprite->invisible = TRUE; - berryStage = GetStageByBerryTreeId(mapObject->trainerRange_berryTreeId); + berryStage = GetStageByBerryTreeId(eventObject->trainerRange_berryTreeId); if (berryStage == 0) { if (!(sprite->data[7] & 0x0004) && sprite->animNum == 4) { - gFieldEffectArguments[0] = mapObject->currentCoords.x; - gFieldEffectArguments[1] = mapObject->currentCoords.y; + gFieldEffectArguments[0] = eventObject->currentCoords.x; + gFieldEffectArguments[1] = eventObject->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE); @@ -3296,7 +3294,7 @@ bool8 do_berry_tree_growth_sparkle_1 (struct MapObject *mapObject, struct Sprite } return FALSE; } - mapObject->invisible = FALSE; + eventObject->invisible = FALSE; sprite->invisible = FALSE; berryStage --; if (sprite->animNum != berryStage) @@ -3304,15 +3302,15 @@ bool8 do_berry_tree_growth_sparkle_1 (struct MapObject *mapObject, struct Sprite sprite->data[1] = 2; return TRUE; } - get_berry_tree_graphics(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, 0x39); + get_berry_tree_graphics(eventObject, sprite); + EventObjectSetRegularAnim(eventObject, sprite, 0x39); sprite->data[1] = 1; return TRUE; } -bool8 sub_808FF48 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808FF48 (struct EventObject *eventObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (EventObjectExecRegularAnim(eventObject, sprite)) { sprite->data[1] = 0; return TRUE; @@ -3320,28 +3318,28 @@ bool8 sub_808FF48 (struct MapObject *mapObject, struct Sprite *sprite) return FALSE; } -bool8 do_berry_tree_growth_sparkle_2 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 do_berry_tree_growth_sparkle_2 (struct EventObject *eventObject, struct Sprite *sprite) { - mapObject->singleMovementActive = TRUE; + eventObject->singleMovementActive = TRUE; sprite->data[1] = 3; sprite->data[2] = 0; sprite->data[7] |= 0x0002; - gFieldEffectArguments[0] = mapObject->currentCoords.x; - gFieldEffectArguments[1] = mapObject->currentCoords.y; + gFieldEffectArguments[0] = eventObject->currentCoords.x; + gFieldEffectArguments[1] = eventObject->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE); return TRUE; } -bool8 sub_808FFB4 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_808FFB4 (struct EventObject *eventObject, struct Sprite *sprite) { sprite->data[2] ++; - mapObject->invisible = (sprite->data[2] & 0x02) >> 1; + eventObject->invisible = (sprite->data[2] & 0x02) >> 1; sprite->animPaused = TRUE; if (sprite->data[2] > 64) { - get_berry_tree_graphics(mapObject, sprite); + get_berry_tree_graphics(eventObject, sprite); sprite->data[1] = 4; sprite->data[2] = 0; return TRUE; @@ -3349,10 +3347,10 @@ bool8 sub_808FFB4 (struct MapObject *mapObject, struct Sprite *sprite) return FALSE; } -bool8 sub_8090004 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090004 (struct EventObject *eventObject, struct Sprite *sprite) { sprite->data[2] ++; - mapObject->invisible = (sprite->data[2] & 0x02) >> 1; + eventObject->invisible = (sprite->data[2] & 0x02) >> 1; sprite->animPaused = TRUE; if (sprite->data[2] > 64) { @@ -3365,34 +3363,34 @@ bool8 sub_8090004 (struct MapObject *mapObject, struct Sprite *sprite) field_object_step(RandomlyLookNorthOrSouth, gUnknown_0850D7B4) -bool8 sub_8090094 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090094 (struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(mapObject, sprite); + npc_reset(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_80900A8 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80900A8 (struct EventObject *eventObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_80900D4 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80900D4 (struct EventObject *eventObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (EventObjectExecRegularAnim(eventObject, sprite)) { - SetFieldObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]); - mapObject->singleMovementActive = FALSE; + SetEventObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]); + eventObject->singleMovementActive = FALSE; sprite->data[1] = 3; } return FALSE; } -bool8 sub_8090118 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090118 (struct EventObject *eventObject, struct Sprite *sprite) { - if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; return TRUE; @@ -3400,52 +3398,52 @@ bool8 sub_8090118 (struct MapObject *mapObject, struct Sprite *sprite) return FALSE; } -bool8 sub_8090148 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090148 (struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[2]; u8 direction; memcpy(directions, gUnknown_0850D770, sizeof gUnknown_0850D770); - direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_SOUTH); + direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_NORTH_SOUTH); if (direction == 0) { direction = directions[Random() & 0x01]; } - FieldObjectSetDirection(mapObject, direction); + EventObjectSetDirection(eventObject, direction); sprite->data[1] = 1; return TRUE; } field_object_step(RandomlyLookEastOrWest, gUnknown_0850D7C8) -bool8 sub_80901D4 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80901D4 (struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(mapObject, sprite); + npc_reset(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_80901E8 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80901E8 (struct EventObject *eventObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_8090214 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090214 (struct EventObject *eventObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (EventObjectExecRegularAnim(eventObject, sprite)) { - SetFieldObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]); - mapObject->singleMovementActive = FALSE; + SetEventObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]); + eventObject->singleMovementActive = FALSE; sprite->data[1] = 3; } return FALSE; } -bool8 sub_8090258 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090258 (struct EventObject *eventObject, struct Sprite *sprite) { - if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; return TRUE; @@ -3453,52 +3451,52 @@ bool8 sub_8090258 (struct MapObject *mapObject, struct Sprite *sprite) return FALSE; } -bool8 sub_8090288 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090288 (struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[2]; u8 direction; memcpy(directions, gUnknown_0850D790, sizeof gUnknown_0850D790); - direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_EAST_WEST); + direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_EAST_WEST); if (direction == 0) { direction = directions[Random() & 0x01]; } - FieldObjectSetDirection(mapObject, direction); + EventObjectSetDirection(eventObject, direction); sprite->data[1] = 1; return TRUE; } field_object_step(RandomlyLookNorthOrWest, gUnknown_0850D7DC) -bool8 sub_8090314 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090314 (struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(mapObject, sprite); + npc_reset(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_8090328 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090328 (struct EventObject *eventObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_8090354 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090354 (struct EventObject *eventObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (EventObjectExecRegularAnim(eventObject, sprite)) { - SetFieldObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); - mapObject->singleMovementActive = FALSE; + SetEventObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); + eventObject->singleMovementActive = FALSE; sprite->data[1] = 3; } return FALSE; } -bool8 sub_8090398 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090398 (struct EventObject *eventObject, struct Sprite *sprite) { - if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; return TRUE; @@ -3506,52 +3504,52 @@ bool8 sub_8090398 (struct MapObject *mapObject, struct Sprite *sprite) return FALSE; } -bool8 sub_80903C8 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80903C8 (struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[2]; u8 direction; memcpy(directions, gUnknown_0850D7F0, sizeof gUnknown_0850D7F0); - direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_WEST); + direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_NORTH_WEST); if (direction == 0) { direction = directions[Random() & 0x01]; } - FieldObjectSetDirection(mapObject, direction); + EventObjectSetDirection(eventObject, direction); sprite->data[1] = 1; return TRUE; } field_object_step(RandomlyLookNorthOrEast, gUnknown_0850D7F4) -bool8 sub_8090454 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090454 (struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(mapObject, sprite); + npc_reset(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_8090468 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090468 (struct EventObject *eventObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_8090494 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090494 (struct EventObject *eventObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (EventObjectExecRegularAnim(eventObject, sprite)) { - SetFieldObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); - mapObject->singleMovementActive = FALSE; + SetEventObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); + eventObject->singleMovementActive = FALSE; sprite->data[1] = 3; } return FALSE; } -bool8 sub_80904D8 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80904D8 (struct EventObject *eventObject, struct Sprite *sprite) { - if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; return TRUE; @@ -3559,52 +3557,52 @@ bool8 sub_80904D8 (struct MapObject *mapObject, struct Sprite *sprite) return FALSE; } -bool8 sub_8090508 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090508 (struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[2]; u8 direction; memcpy(directions, gUnknown_0850D808, sizeof gUnknown_0850D808); - direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_EAST); + direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_NORTH_EAST); if (direction == 0) { direction = directions[Random() & 0x01]; } - FieldObjectSetDirection(mapObject, direction); + EventObjectSetDirection(eventObject, direction); sprite->data[1] = 1; return TRUE; } field_object_step(RandomlyLookSouthOrWest, gUnknown_0850D80C) -bool8 sub_8090594 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090594 (struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(mapObject, sprite); + npc_reset(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_80905A8 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80905A8 (struct EventObject *eventObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_80905D4 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80905D4 (struct EventObject *eventObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (EventObjectExecRegularAnim(eventObject, sprite)) { - SetFieldObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); - mapObject->singleMovementActive = FALSE; + SetEventObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); + eventObject->singleMovementActive = FALSE; sprite->data[1] = 3; } return FALSE; } -bool8 sub_8090618 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090618 (struct EventObject *eventObject, struct Sprite *sprite) { - if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; return TRUE; @@ -3612,52 +3610,52 @@ bool8 sub_8090618 (struct MapObject *mapObject, struct Sprite *sprite) return FALSE; } -bool8 sub_8090648 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090648 (struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[2]; u8 direction; memcpy(directions, gUnknown_0850D820, sizeof gUnknown_0850D820); - direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_SOUTH_WEST); + direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_SOUTH_WEST); if (direction == 0) { direction = directions[Random() & 0x01]; } - FieldObjectSetDirection(mapObject, direction); + EventObjectSetDirection(eventObject, direction); sprite->data[1] = 1; return TRUE; } field_object_step(RandomlyLookSouthOrEast, gUnknown_0850D824) -bool8 sub_80906D4 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80906D4 (struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(mapObject, sprite); + npc_reset(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_80906E8 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80906E8 (struct EventObject *eventObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_8090714 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090714 (struct EventObject *eventObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (EventObjectExecRegularAnim(eventObject, sprite)) { - SetFieldObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); - mapObject->singleMovementActive = FALSE; + SetEventObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); + eventObject->singleMovementActive = FALSE; sprite->data[1] = 3; } return FALSE; } -bool8 sub_8090758 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090758 (struct EventObject *eventObject, struct Sprite *sprite) { - if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; return TRUE; @@ -3665,52 +3663,52 @@ bool8 sub_8090758 (struct MapObject *mapObject, struct Sprite *sprite) return FALSE; } -bool8 sub_8090788 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090788 (struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[2]; u8 direction; memcpy(directions, gUnknown_0850D838, sizeof gUnknown_0850D838); - direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_SOUTH_EAST); + direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_SOUTH_EAST); if (direction == 0) { direction = directions[Random() & 0x01]; } - FieldObjectSetDirection(mapObject, direction); + EventObjectSetDirection(eventObject, direction); sprite->data[1] = 1; return TRUE; } field_object_step(RandomlyLookNorthOrSouthOrWest, gUnknown_0850D83C) -bool8 sub_8090814 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090814 (struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(mapObject, sprite); + npc_reset(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_8090828 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090828 (struct EventObject *eventObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_8090854 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090854 (struct EventObject *eventObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (EventObjectExecRegularAnim(eventObject, sprite)) { - SetFieldObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); - mapObject->singleMovementActive = FALSE; + SetEventObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); + eventObject->singleMovementActive = FALSE; sprite->data[1] = 3; } return FALSE; } -bool8 sub_8090898 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090898 (struct EventObject *eventObject, struct Sprite *sprite) { - if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; return TRUE; @@ -3718,52 +3716,52 @@ bool8 sub_8090898 (struct MapObject *mapObject, struct Sprite *sprite) return FALSE; } -bool8 sub_80908C8 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80908C8 (struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; u8 direction; memcpy(directions, gUnknown_0850D850, sizeof gUnknown_0850D850); - direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_SOUTH_WEST); + direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_NORTH_SOUTH_WEST); if (direction == 0) { direction = directions[Random() & 0x03]; } - FieldObjectSetDirection(mapObject, direction); + EventObjectSetDirection(eventObject, direction); sprite->data[1] = 1; return TRUE; } field_object_step(RandomlyLookNorthOrSouthOrEast, gUnknown_0850D854) -bool8 sub_8090954 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090954 (struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(mapObject, sprite); + npc_reset(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_8090968 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090968 (struct EventObject *eventObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_8090994 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090994 (struct EventObject *eventObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (EventObjectExecRegularAnim(eventObject, sprite)) { - SetFieldObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); - mapObject->singleMovementActive = FALSE; + SetEventObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); + eventObject->singleMovementActive = FALSE; sprite->data[1] = 3; } return FALSE; } -bool8 sub_80909D8 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80909D8 (struct EventObject *eventObject, struct Sprite *sprite) { - if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; return TRUE; @@ -3771,52 +3769,52 @@ bool8 sub_80909D8 (struct MapObject *mapObject, struct Sprite *sprite) return FALSE; } -bool8 sub_8090A08 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090A08 (struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; u8 direction; memcpy(directions, gUnknown_0850D868, sizeof gUnknown_0850D868); - direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_SOUTH_EAST); + direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_NORTH_SOUTH_EAST); if (direction == 0) { direction = directions[Random() & 0x03]; } - FieldObjectSetDirection(mapObject, direction); + EventObjectSetDirection(eventObject, direction); sprite->data[1] = 1; return TRUE; } field_object_step(RandomlyLookNorthOrEastOrWest, gUnknown_0850D86C) -bool8 sub_8090A94 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090A94 (struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(mapObject, sprite); + npc_reset(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_8090AA8 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090AA8 (struct EventObject *eventObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_8090AD4 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090AD4 (struct EventObject *eventObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (EventObjectExecRegularAnim(eventObject, sprite)) { - SetFieldObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); - mapObject->singleMovementActive = FALSE; + SetEventObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); + eventObject->singleMovementActive = FALSE; sprite->data[1] = 3; } return FALSE; } -bool8 sub_8090B18 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090B18 (struct EventObject *eventObject, struct Sprite *sprite) { - if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; return TRUE; @@ -3824,52 +3822,52 @@ bool8 sub_8090B18 (struct MapObject *mapObject, struct Sprite *sprite) return FALSE; } -bool8 sub_8090B48 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090B48 (struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; u8 direction; memcpy(directions, gUnknown_0850D880, sizeof gUnknown_0850D880); - direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_EAST_WEST); + direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_NORTH_EAST_WEST); if (direction == 0) { direction = directions[Random() & 0x03]; } - FieldObjectSetDirection(mapObject, direction); + EventObjectSetDirection(eventObject, direction); sprite->data[1] = 1; return TRUE; } field_object_step(RandomlyLookSouthOrEastOrWest, gUnknown_0850D884) -bool8 sub_8090BD4 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090BD4 (struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(mapObject, sprite); + npc_reset(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_8090BE8 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090BE8 (struct EventObject *eventObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_8090C14 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090C14 (struct EventObject *eventObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (EventObjectExecRegularAnim(eventObject, sprite)) { - SetFieldObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); - mapObject->singleMovementActive = FALSE; + SetEventObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); + eventObject->singleMovementActive = FALSE; sprite->data[1] = 3; } return FALSE; } -bool8 sub_8090C58 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090C58 (struct EventObject *eventObject, struct Sprite *sprite) { - if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; return TRUE; @@ -3877,215 +3875,215 @@ bool8 sub_8090C58 (struct MapObject *mapObject, struct Sprite *sprite) return FALSE; } -bool8 sub_8090C88 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090C88 (struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; u8 direction; memcpy(directions, gUnknown_0850D898, sizeof gUnknown_0850D898); - direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_SOUTH_EAST_WEST); + direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_SOUTH_EAST_WEST); if (direction == 0) { direction = directions[Random() & 0x03]; } - FieldObjectSetDirection(mapObject, direction); + EventObjectSetDirection(eventObject, direction); sprite->data[1] = 1; return TRUE; } field_object_step(LookAroundCounterclockwise, gUnknown_0850D89C) -bool8 sub_8090D14 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090D14 (struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + npc_reset(eventObject, sprite); + EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); sprite->data[1] = 1; return TRUE; } -bool8 sub_8090D40 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090D40 (struct EventObject *eventObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (EventObjectExecRegularAnim(eventObject, sprite)) { - SetFieldObjectStepTimer(sprite, 48); + SetEventObjectStepTimer(sprite, 48); sprite->data[1] = 2; } return FALSE; } -bool8 sub_8090D64 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090D64 (struct EventObject *eventObject, struct Sprite *sprite) { - if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 3; } return FALSE; } -bool8 sub_8090D90 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090D90 (struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[5]; u8 direction; memcpy(directions, gUnknown_0850D8AC, sizeof gUnknown_0850D8AC); - direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_ANY); + direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_ANY); if (direction == 0) { - direction = directions[mapObject->facingDirection]; + direction = directions[eventObject->facingDirection]; } - FieldObjectSetDirection(mapObject, direction); + EventObjectSetDirection(eventObject, direction); sprite->data[1] = 0; return TRUE; } field_object_step(LookAroundClockwise, gUnknown_0850D8B4) -bool8 sub_8090E18 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090E18 (struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + npc_reset(eventObject, sprite); + EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); sprite->data[1] = 1; return TRUE; } -bool8 sub_8090E44 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090E44 (struct EventObject *eventObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (EventObjectExecRegularAnim(eventObject, sprite)) { - SetFieldObjectStepTimer(sprite, 48); + SetEventObjectStepTimer(sprite, 48); sprite->data[1] = 2; } return FALSE; } -bool8 sub_8090E68 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090E68 (struct EventObject *eventObject, struct Sprite *sprite) { - if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) + if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 3; } return FALSE; } -bool8 sub_8090E94 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090E94 (struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[5]; u8 direction; memcpy(directions, gUnknown_0850D8C4, sizeof gUnknown_0850D8C4); - direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_ANY); + direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_ANY); if (direction == 0) { - direction = directions[mapObject->facingDirection]; + direction = directions[eventObject->facingDirection]; } - FieldObjectSetDirection(mapObject, direction); + EventObjectSetDirection(eventObject, direction); sprite->data[1] = 0; return TRUE; } field_object_step(AlternatelyGoInOppositeDirections, gUnknown_0850D8CC) -bool8 sub_8090F1C (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090F1C (struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(mapObject, sprite); + npc_reset(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_8090F30 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090F30 (struct EventObject *eventObject, struct Sprite *sprite) { u8 direction; - direction = gInitialMovementTypeFacingDirections[mapObject->movementType]; - if (mapObject->directionSequenceIndex) + direction = gInitialMovementTypeFacingDirections[eventObject->movementType]; + if (eventObject->directionSequenceIndex) { direction = GetOppositeDirection(direction); } - FieldObjectSetDirection(mapObject, direction); + EventObjectSetDirection(eventObject, direction); sprite->data[1] = 2; return TRUE; } -bool8 sub_8090F68 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8090F68 (struct EventObject *eventObject, struct Sprite *sprite) { bool8 blockingWay; u8 animId; - if (mapObject->directionSequenceIndex && mapObject->initialCoords.x == mapObject->currentCoords.x && mapObject->initialCoords.y == mapObject->currentCoords.y) + if (eventObject->directionSequenceIndex && eventObject->initialCoords.x == eventObject->currentCoords.x && eventObject->initialCoords.y == eventObject->currentCoords.y) { - mapObject->directionSequenceIndex = 0; - FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->movementDirection)); + eventObject->directionSequenceIndex = 0; + EventObjectSetDirection(eventObject, GetOppositeDirection(eventObject->movementDirection)); } - blockingWay = npc_block_way__next_tile(mapObject, mapObject->movementDirection); - animId = GetGoSpeed0AnimId(mapObject->movementDirection); + blockingWay = npc_block_way__next_tile(eventObject, eventObject->movementDirection); + animId = GetGoSpeed0AnimId(eventObject->movementDirection); if (blockingWay == TRUE) { - mapObject->directionSequenceIndex ++; - FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->movementDirection)); - animId = GetGoSpeed0AnimId(mapObject->movementDirection); - blockingWay = npc_block_way__next_tile(mapObject, mapObject->movementDirection); + eventObject->directionSequenceIndex ++; + EventObjectSetDirection(eventObject, GetOppositeDirection(eventObject->movementDirection)); + animId = GetGoSpeed0AnimId(eventObject->movementDirection); + blockingWay = npc_block_way__next_tile(eventObject, eventObject->movementDirection); } if (blockingWay) { - animId = GetStepInPlaceDelay16AnimId(mapObject->facingDirection); + animId = GetStepInPlaceDelay16AnimId(eventObject->facingDirection); } - FieldObjectSetRegularAnim(mapObject, sprite, animId); - mapObject->singleMovementActive = TRUE; + EventObjectSetRegularAnim(eventObject, sprite, animId); + eventObject->singleMovementActive = TRUE; sprite->data[1] = 3; return TRUE; } -bool8 sub_8091020 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8091020 (struct EventObject *eventObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (EventObjectExecRegularAnim(eventObject, sprite)) { - mapObject->singleMovementActive = FALSE; + eventObject->singleMovementActive = FALSE; sprite->data[1] = 1; } return FALSE; } -bool8 sub_8091048(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8091048(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(mapObject, sprite); + npc_reset(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MoveFieldObjectInNextDirectionInSequence(struct MapObject *mapObject, struct Sprite *sprite, u8 *route) +bool8 MoveEventObjectInNextDirectionInSequence(struct EventObject *eventObject, struct Sprite *sprite, u8 *route) { u8 blockingWay; u8 animId; - if (mapObject->directionSequenceIndex == 3 && mapObject->initialCoords.x == mapObject->currentCoords.x && mapObject->initialCoords.y == mapObject->currentCoords.y) + if (eventObject->directionSequenceIndex == 3 && eventObject->initialCoords.x == eventObject->currentCoords.x && eventObject->initialCoords.y == eventObject->currentCoords.y) { - mapObject->directionSequenceIndex = 0; + eventObject->directionSequenceIndex = 0; } - FieldObjectSetDirection(mapObject, route[mapObject->directionSequenceIndex]); - animId = GetGoSpeed0AnimId(mapObject->movementDirection); - blockingWay = npc_block_way__next_tile(mapObject, mapObject->movementDirection); + EventObjectSetDirection(eventObject, route[eventObject->directionSequenceIndex]); + animId = GetGoSpeed0AnimId(eventObject->movementDirection); + blockingWay = npc_block_way__next_tile(eventObject, eventObject->movementDirection); if (blockingWay == TRUE) { - mapObject->directionSequenceIndex ++; - FieldObjectSetDirection(mapObject, route[mapObject->directionSequenceIndex]); - animId = GetGoSpeed0AnimId(mapObject->movementDirection); - blockingWay = npc_block_way__next_tile(mapObject, mapObject->movementDirection); + eventObject->directionSequenceIndex ++; + EventObjectSetDirection(eventObject, route[eventObject->directionSequenceIndex]); + animId = GetGoSpeed0AnimId(eventObject->movementDirection); + blockingWay = npc_block_way__next_tile(eventObject, eventObject->movementDirection); } if (blockingWay) { - animId = GetStepInPlaceDelay16AnimId(mapObject->facingDirection); + animId = GetStepInPlaceDelay16AnimId(eventObject->facingDirection); } - FieldObjectSetRegularAnim(mapObject, sprite, animId); - mapObject->singleMovementActive = TRUE; + EventObjectSetRegularAnim(eventObject, sprite, animId); + eventObject->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 sub_8091110(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8091110(struct EventObject *eventObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (EventObjectExecRegularAnim(eventObject, sprite)) { - mapObject->singleMovementActive = FALSE; + eventObject->singleMovementActive = FALSE; sprite->data[1] = 1; } return FALSE; @@ -4118,271 +4116,271 @@ field_object_path(24, gUnknown_0850DA48, sub_8091E10, gUnknown_0850DA54, 2, x) field_object_step(CopyPlayer1, gUnknown_0850DA58) -bool8 mss_npc_reset_oampriv3_1_unk2_unk3(struct MapObject *mapObject, struct Sprite *sprite) +bool8 mss_npc_reset_oampriv3_1_unk2_unk3(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(mapObject, sprite); - if (mapObject->directionSequenceIndex == 0) + npc_reset(eventObject, sprite); + if (eventObject->directionSequenceIndex == 0) { - mapObject->directionSequenceIndex = player_get_direction_lower_nybble(); + eventObject->directionSequenceIndex = player_get_direction_lower_nybble(); } sprite->data[1] = 1; return TRUE; } -bool8 sub_8091EC0(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8091EC0(struct EventObject *eventObject, struct Sprite *sprite) { - if (gMapObjects[gPlayerAvatar.mapObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == 2) + if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == 2) { return FALSE; } - return gUnknown_0850DA64[player_get_x22()](mapObject, sprite, player_get_direction_upper_nybble(), NULL); + return gUnknown_0850DA64[player_get_x22()](eventObject, sprite, player_get_direction_upper_nybble(), NULL); } -bool8 sub_8091F20(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8091F20(struct EventObject *eventObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (EventObjectExecRegularAnim(eventObject, sprite)) { - mapObject->singleMovementActive = FALSE; + eventObject->singleMovementActive = FALSE; sprite->data[1] = 1; } return FALSE; } -bool8 sub_8091F48(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) +bool8 sub_8091F48(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) { return FALSE; } -bool8 sub_8091F4C(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) +bool8 sub_8091F4C(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, playerDirection))); - mapObject->singleMovementActive = TRUE; + EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, playerDirection))); + eventObject->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 sub_8091F94(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) +bool8 sub_8091F94(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - if (FieldObjectIsFarawayIslandMew(mapObject)) + if (EventObjectIsFarawayIslandMew(eventObject)) { direction = sub_81D427C(); if (direction == 0) { direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, direction); - FieldObjectMoveDestCoords(mapObject, direction, &x, &y); - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); - mapObject->singleMovementActive = TRUE; + direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); + EventObjectMoveDestCoords(eventObject, direction, &x, &y); + EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(direction)); + eventObject->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } } else { - direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, direction); + direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); } - FieldObjectMoveDestCoords(mapObject, direction, &x, &y); - FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(direction)); - if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) + EventObjectMoveDestCoords(eventObject, direction, &x, &y); + EventObjectSetRegularAnim(eventObject, sprite, GetGoSpeed0AnimId(direction)); + if (npc_block_way(eventObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); + EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(direction)); } - mapObject->singleMovementActive = TRUE; + eventObject->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 sub_80920A4(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) +bool8 sub_80920A4(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, direction); - FieldObjectMoveDestCoords(mapObject, direction, &x, &y); - FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed1AnimId(direction)); - if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) + direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); + EventObjectMoveDestCoords(eventObject, direction, &x, &y); + EventObjectSetRegularAnim(eventObject, sprite, GetGoSpeed1AnimId(direction)); + if (npc_block_way(eventObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); + EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(direction)); } - mapObject->singleMovementActive = TRUE; + eventObject->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 sub_809215C(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) +bool8 sub_809215C(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, direction); - FieldObjectMoveDestCoords(mapObject, direction, &x, &y); - FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed3AnimId(direction)); - if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) + direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); + EventObjectMoveDestCoords(eventObject, direction, &x, &y); + EventObjectSetRegularAnim(eventObject, sprite, GetGoSpeed3AnimId(direction)); + if (npc_block_way(eventObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); + EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(direction)); } - mapObject->singleMovementActive = TRUE; + eventObject->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 sub_8092214(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) +bool8 sub_8092214(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, direction); - FieldObjectMoveDestCoords(mapObject, direction, &x, &y); - FieldObjectSetRegularAnim(mapObject, sprite, sub_8093438(direction)); - if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) + direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); + EventObjectMoveDestCoords(eventObject, direction, &x, &y); + EventObjectSetRegularAnim(eventObject, sprite, sub_8093438(direction)); + if (npc_block_way(eventObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); + EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(direction)); } - mapObject->singleMovementActive = TRUE; + eventObject->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 cph_IM_DIFFERENT(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) +bool8 cph_IM_DIFFERENT(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) { u32 direction; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, direction); - FieldObjectSetRegularAnim(mapObject, sprite, sub_80934BC(direction)); - mapObject->singleMovementActive = TRUE; + direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); + EventObjectSetRegularAnim(eventObject, sprite, sub_80934BC(direction)); + eventObject->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 sub_8092314(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) +bool8 sub_8092314(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, direction); - FieldObjectMoveDestCoords(mapObject, direction, &x, &y); - FieldObjectSetRegularAnim(mapObject, sprite, sub_8093514(direction)); - if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) + direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); + EventObjectMoveDestCoords(eventObject, direction, &x, &y); + EventObjectSetRegularAnim(eventObject, sprite, sub_8093514(direction)); + if (npc_block_way(eventObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); + EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(direction)); } - mapObject->singleMovementActive = TRUE; + eventObject->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 oac_hopping(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) +bool8 oac_hopping(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, direction); - x = mapObject->currentCoords.x; - y = mapObject->currentCoords.y; + direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); + x = eventObject->currentCoords.x; + y = eventObject->currentCoords.y; sub_8092F88(direction, &x, &y, 2, 2); - FieldObjectSetRegularAnim(mapObject, sprite, GetJumpLedgeAnimId(direction)); - if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) + EventObjectSetRegularAnim(eventObject, sprite, GetJumpLedgeAnimId(direction)); + if (npc_block_way(eventObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); + EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(direction)); } - mapObject->singleMovementActive = TRUE; + eventObject->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } field_object_step(CopyPlayer2, gUnknown_0850DA90) -bool8 mss_08062EA4(struct MapObject *mapObject, struct Sprite *sprite) +bool8 mss_08062EA4(struct EventObject *eventObject, struct Sprite *sprite) { - if (gMapObjects[gPlayerAvatar.mapObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == 2) + if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == 2) { return FALSE; } - return gUnknown_0850DA64[player_get_x22()](mapObject, sprite, player_get_direction_upper_nybble(), MetatileBehavior_IsPokeGrass); + return gUnknown_0850DA64[player_get_x22()](eventObject, sprite, player_get_direction_upper_nybble(), MetatileBehavior_IsPokeGrass); } -bool8 sub_80925AC(struct MapObject *, struct Sprite *); +bool8 sub_80925AC(struct EventObject *, struct Sprite *); -void FieldObjectCB_TreeDisguise(struct Sprite *sprite) +void EventObjectCB_TreeDisguise(struct Sprite *sprite) { - struct MapObject *mapObject; + struct EventObject *eventObject; - mapObject = &gMapObjects[sprite->data[0]]; - if (mapObject->directionSequenceIndex == 0 || (mapObject->directionSequenceIndex == 1 && !sprite->data[7])) + eventObject = &gEventObjects[sprite->data[0]]; + if (eventObject->directionSequenceIndex == 0 || (eventObject->directionSequenceIndex == 1 && !sprite->data[7])) { - FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); - mapObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_TREE_DISGUISE); - mapObject->directionSequenceIndex = 1; + EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_TREE_DISGUISE); + eventObject->directionSequenceIndex = 1; sprite->data[7] ++; } - FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, sub_80925AC); + EventObjectStep(&gEventObjects[sprite->data[0]], sprite, sub_80925AC); } -bool8 sub_80925AC(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80925AC(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(mapObject, sprite); + npc_reset(eventObject, sprite); return FALSE; } -void FieldObjectCB_MountainDisguise(struct Sprite *sprite) +void EventObjectCB_MountainDisguise(struct Sprite *sprite) { - struct MapObject *mapObject; + struct EventObject *eventObject; - mapObject = &gMapObjects[sprite->data[0]]; - if (mapObject->directionSequenceIndex == 0 || (mapObject->directionSequenceIndex == 1 && !sprite->data[7])) + eventObject = &gEventObjects[sprite->data[0]]; + if (eventObject->directionSequenceIndex == 0 || (eventObject->directionSequenceIndex == 1 && !sprite->data[7])) { - FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); - mapObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE); - mapObject->directionSequenceIndex = 1; + EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE); + eventObject->directionSequenceIndex = 1; sprite->data[7] ++; } - FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, sub_80925AC); + EventObjectStep(&gEventObjects[sprite->data[0]], sprite, sub_80925AC); } -extern bool8 (*const gUnknown_0850DA9C[])(struct MapObject *, struct Sprite *); -bool8 sub_809268C(struct MapObject *, struct Sprite *); +extern bool8 (*const gUnknown_0850DA9C[])(struct EventObject *, struct Sprite *); +bool8 sub_809268C(struct EventObject *, struct Sprite *); -void FieldObjectCB_Hidden1(struct Sprite *sprite) +void EventObjectCB_Hidden1(struct Sprite *sprite) { if (!sprite->data[7]) { - gMapObjects[sprite->data[0]].fixedPriority = TRUE; + gEventObjects[sprite->data[0]].fixedPriority = TRUE; sprite->subspriteMode = 2; sprite->oam.priority = 3; sprite->data[7] ++; } - FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, sub_809268C); + EventObjectStep(&gEventObjects[sprite->data[0]], sprite, sub_809268C); } -bool8 sub_809268C(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_809268C(struct EventObject *eventObject, struct Sprite *sprite) { - return gUnknown_0850DA9C[sprite->data[1]](mapObject, sprite); + return gUnknown_0850DA9C[sprite->data[1]](eventObject, sprite); } -bool8 sub_80926AC (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80926AC (struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(mapObject, sprite); + npc_reset(eventObject, sprite); return FALSE; } -bool8 sub_80926B8 (struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80926B8 (struct EventObject *eventObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (EventObjectExecRegularAnim(eventObject, sprite)) { sprite->data[1] = 0; } @@ -4391,57 +4389,57 @@ bool8 sub_80926B8 (struct MapObject *mapObject, struct Sprite *sprite) field_object_step(WalkInPlace1, gUnknown_0850DAA0) -bool8 sub_8092718(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8092718(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay16AnimId(mapObject->facingDirection)); + npc_reset(eventObject, sprite); + EventObjectSetRegularAnim(eventObject, sprite, GetStepInPlaceDelay16AnimId(eventObject->facingDirection)); sprite->data[1] = 1; return TRUE; } field_object_step(WalkInPlace4, gUnknown_0850DAA8) -bool8 sub_8092788(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8092788(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay32AnimId(mapObject->facingDirection)); + npc_reset(eventObject, sprite); + EventObjectSetRegularAnim(eventObject, sprite, GetStepInPlaceDelay32AnimId(eventObject->facingDirection)); sprite->data[1] = 1; return TRUE; } field_object_step(WalkInPlace2, gUnknown_0850DAB0) -bool8 sub_80927F8(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80927F8(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay8AnimId(mapObject->facingDirection)); + npc_reset(eventObject, sprite); + EventObjectSetRegularAnim(eventObject, sprite, GetStepInPlaceDelay8AnimId(eventObject->facingDirection)); sprite->data[1] = 1; return TRUE; } field_object_step(WalkInPlace3, gUnknown_0850DAB8) -bool8 sub_8092868(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8092868(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay4AnimId(mapObject->facingDirection)); + npc_reset(eventObject, sprite); + EventObjectSetRegularAnim(eventObject, sprite, GetStepInPlaceDelay4AnimId(eventObject->facingDirection)); sprite->data[1] = 1; return TRUE; } field_object_step(Hidden2, gUnknown_0850DAC0) -bool8 sub_80928D8(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80928D8(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); - mapObject->invisible = TRUE; + npc_reset(eventObject, sprite); + EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); + eventObject->invisible = TRUE; sprite->data[1] = 1; return TRUE; } -bool8 sub_809290C(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_809290C(struct EventObject *eventObject, struct Sprite *sprite) { - if (FieldObjectExecRegularAnim(mapObject, sprite)) + if (EventObjectExecRegularAnim(eventObject, sprite)) { sprite->data[1] = 2; return TRUE; @@ -4449,18 +4447,18 @@ bool8 sub_809290C(struct MapObject *mapObject, struct Sprite *sprite) return FALSE; } -bool8 sub_809292C(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_809292C(struct EventObject *eventObject, struct Sprite *sprite) { - mapObject->singleMovementActive = FALSE; + eventObject->singleMovementActive = FALSE; return FALSE; } -static void npc_reset(struct MapObject *mapObject, struct Sprite *sprite) +static void npc_reset(struct EventObject *eventObject, struct Sprite *sprite) { - mapObject->singleMovementActive = FALSE; - mapObject->heldMovementActive = FALSE; - mapObject->heldMovementFinished = FALSE; - mapObject->movementActionId = 0xFF; + eventObject->singleMovementActive = FALSE; + eventObject->heldMovementActive = FALSE; + eventObject->heldMovementFinished = FALSE; + eventObject->movementActionId = 0xFF; sprite->data[1] = 0; } @@ -4470,7 +4468,7 @@ u8 name(u8 direction)\ return table[direction];\ } -dirn2anim(FieldObjectDirectionToImageAnimId, gUnknown_0850DACC) +dirn2anim(EventObjectDirectionToImageAnimId, gUnknown_0850DACC) dirn2anim(get_go_image_anim_num, gUnknown_0850DAD5) dirn2anim(get_go_fast_image_anim_num, gUnknown_0850DADE) dirn2anim(get_go_faster_image_anim_num, gUnknown_0850DAE7) @@ -4500,11 +4498,11 @@ static const struct UnkStruct_085094AC *sub_8092A4C(const union AnimCmd *const * return NULL; } -void npc_apply_anim_looping(struct MapObject *mapObject, struct Sprite *sprite, u8 animNum) +void npc_apply_anim_looping(struct EventObject *eventObject, struct Sprite *sprite, u8 animNum) { const struct UnkStruct_085094AC *unk85094AC; - if (!mapObject->inanimate) + if (!eventObject->inanimate) { sprite->animNum = animNum; unk85094AC = sub_8092A4C(sprite->anims); @@ -4523,11 +4521,11 @@ void npc_apply_anim_looping(struct MapObject *mapObject, struct Sprite *sprite, } } -void obj_npc_animation_step(struct MapObject *mapObject, struct Sprite *sprite, u8 animNum) +void obj_npc_animation_step(struct EventObject *eventObject, struct Sprite *sprite, u8 animNum) { const struct UnkStruct_085094AC *unk85094AC; - if (!mapObject->inanimate) + if (!eventObject->inanimate) { u8 animPos; @@ -4564,100 +4562,100 @@ u8 sub_8092AF8(s16 x1, s16 y1, s16 x2, s16 y2) return DIR_SOUTH; } -void npc_set_running_behaviour_etc(struct MapObject *mapObject, u8 movementType) +void npc_set_running_behaviour_etc(struct EventObject *eventObject, u8 movementType) { - mapObject->movementType = movementType; - mapObject->directionSequenceIndex = 0; - mapObject->playerCopyableMovement = 0; - gSprites[mapObject->spriteId].callback = gUnknown_08505438[movementType]; - gSprites[mapObject->spriteId].data[1] = 0; + eventObject->movementType = movementType; + eventObject->directionSequenceIndex = 0; + eventObject->playerCopyableMovement = 0; + gSprites[eventObject->spriteId].callback = gUnknown_08505438[movementType]; + gSprites[eventObject->spriteId].data[1] = 0; } dirn2anim(npc_running_behaviour_by_direction, gUnknown_0850DB53) -u8 npc_block_way__next_tile(struct MapObject *mapObject, u8 direction) +u8 npc_block_way__next_tile(struct EventObject *eventObject, u8 direction) { s16 x; s16 y; - x = mapObject->currentCoords.x; - y = mapObject->currentCoords.y; + x = eventObject->currentCoords.x; + y = eventObject->currentCoords.y; MoveCoords(direction, &x, &y); - return npc_block_way(mapObject, x, y, direction); + return npc_block_way(eventObject, x, y, direction); } -u8 npc_block_way(struct MapObject *mapObject, s16 x, s16 y, u32 dirn) +u8 npc_block_way(struct EventObject *eventObject, s16 x, s16 y, u32 dirn) { u8 direction; direction = dirn; - if (IsCoordOutsideFieldObjectMovementRect(mapObject, x, y)) + if (IsCoordOutsideEventObjectMovementRect(eventObject, x, y)) { return 1; } - if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(mapObject, x, y, direction)) + if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(eventObject, x, y, direction)) { return 2; } - if (mapObject->trackedByCamera && !CanCameraMoveInDirection(direction)) + if (eventObject->trackedByCamera && !CanCameraMoveInDirection(direction)) { return 2; } - if (IsZCoordMismatchAt(mapObject->currentElevation, x, y)) + if (IsZCoordMismatchAt(eventObject->currentElevation, x, y)) { return 3; } - if (CheckForCollisionBetweenFieldObjects(mapObject, x, y)) + if (CheckForCollisionBetweenEventObjects(eventObject, x, y)) { return 4; } return 0; } -u8 sub_8092C8C(struct MapObject *mapObject, s16 x, s16 y, u8 direction) +u8 sub_8092C8C(struct EventObject *eventObject, s16 x, s16 y, u8 direction) { u8 retval; retval = 0x00; - if (IsCoordOutsideFieldObjectMovementRect(mapObject, x, y)) + if (IsCoordOutsideEventObjectMovementRect(eventObject, x, y)) { retval |= 1; } - if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(mapObject, x, y, direction) || (mapObject->trackedByCamera && !CanCameraMoveInDirection(direction))) + if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(eventObject, x, y, direction) || (eventObject->trackedByCamera && !CanCameraMoveInDirection(direction))) { retval |= 2; } - if (IsZCoordMismatchAt(mapObject->currentElevation, x, y)) + if (IsZCoordMismatchAt(eventObject->currentElevation, x, y)) { retval |= 4; } - if (CheckForCollisionBetweenFieldObjects(mapObject, x, y)) + if (CheckForCollisionBetweenEventObjects(eventObject, x, y)) { retval |= 8; } return retval; } -static bool8 IsCoordOutsideFieldObjectMovementRect(struct MapObject *mapObject, s16 x, s16 y) +static bool8 IsCoordOutsideEventObjectMovementRect(struct EventObject *eventObject, s16 x, s16 y) { s16 left; s16 right; s16 top; s16 bottom; - if (mapObject->range.as_nybbles.x != 0) + if (eventObject->range.as_nybbles.x != 0) { - left = mapObject->initialCoords.x - mapObject->range.as_nybbles.x; - right = mapObject->initialCoords.x + mapObject->range.as_nybbles.x; + left = eventObject->initialCoords.x - eventObject->range.as_nybbles.x; + right = eventObject->initialCoords.x + eventObject->range.as_nybbles.x; if (left > x || right < x) { return TRUE; } } - if (mapObject->range.as_nybbles.y != 0) + if (eventObject->range.as_nybbles.y != 0) { - top = mapObject->initialCoords.y - mapObject->range.as_nybbles.y; - bottom = mapObject->initialCoords.y + mapObject->range.as_nybbles.y; + top = eventObject->initialCoords.y - eventObject->range.as_nybbles.y; + bottom = eventObject->initialCoords.y + eventObject->range.as_nybbles.y; if (top > y || bottom < y) { return TRUE; @@ -4666,28 +4664,28 @@ static bool8 IsCoordOutsideFieldObjectMovementRect(struct MapObject *mapObject, return FALSE; } -static bool8 IsMetatileDirectionallyImpassable(struct MapObject *mapObject, s16 x, s16 y, u8 direction) +static bool8 IsMetatileDirectionallyImpassable(struct EventObject *eventObject, s16 x, s16 y, u8 direction) { - if (gOppositeDirectionBlockedMetatileFuncs[direction - 1](mapObject->currentMetatileBehavior) || gDirectionBlockedMetatileFuncs[direction - 1](MapGridGetMetatileBehaviorAt(x, y))) + if (gOppositeDirectionBlockedMetatileFuncs[direction - 1](eventObject->currentMetatileBehavior) || gDirectionBlockedMetatileFuncs[direction - 1](MapGridGetMetatileBehaviorAt(x, y))) { return TRUE; } return FALSE; } -static bool8 CheckForCollisionBetweenFieldObjects(struct MapObject *mapObject, s16 x, s16 y) +static bool8 CheckForCollisionBetweenEventObjects(struct EventObject *eventObject, s16 x, s16 y) { u8 i; - struct MapObject *curObject; + struct EventObject *curObject; - for (i = 0; i < NUM_FIELD_OBJECTS; i ++) + for (i = 0; i < NUM_EVENT_OBJECTS; i ++) { - curObject = &gMapObjects[i]; - if (curObject->active && curObject != mapObject) + curObject = &gEventObjects[i]; + if (curObject->active && curObject != eventObject) { if ((curObject->currentCoords.x == x && curObject->currentCoords.y == y) || (curObject->previousCoords.x == x && curObject->previousCoords.y == y)) { - if (AreZCoordsCompatible(mapObject->currentElevation, curObject->currentElevation)) + if (AreZCoordsCompatible(eventObject->currentElevation, curObject->currentElevation)) { return TRUE; } @@ -4699,9 +4697,9 @@ static bool8 CheckForCollisionBetweenFieldObjects(struct MapObject *mapObject, s bool8 sub_8092E9C(u8 localId, u8 mapNum, u8 mapGroup) { - u8 mapObjectId; + u8 eventObjectId; - if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId) && gSprites[gMapObjects[mapObjectId].spriteId].data[7] & 0x02) + if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId) && gSprites[gEventObjects[eventObjectId].spriteId].data[7] & 0x02) { return TRUE; } @@ -4710,11 +4708,11 @@ bool8 sub_8092E9C(u8 localId, u8 mapNum, u8 mapGroup) void sub_8092EF0(u8 localId, u8 mapNum, u8 mapGroup) { - u8 mapObjectId; + u8 eventObjectId; - if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) + if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) { - gSprites[gMapObjects[mapObjectId].spriteId].data[7] |= 0x04; + gSprites[gEventObjects[eventObjectId].spriteId].data[7] |= 0x04; } } @@ -4803,7 +4801,7 @@ void sub_80930E0(s16 *x, s16 *y, s16 dx, s16 dy) *y += dy; } -static void GetFieldObjectMovingCameraOffset(s16 *x, s16 *y) +static void GetEventObjectMovingCameraOffset(s16 *x, s16 *y) { *x = 0; *y = 0; @@ -4825,120 +4823,120 @@ static void GetFieldObjectMovingCameraOffset(s16 *x, s16 *y) } } -void FieldObjectMoveDestCoords(struct MapObject *mapObject, u32 dirn, s16 *x, s16 *y) +void EventObjectMoveDestCoords(struct EventObject *eventObject, u32 dirn, s16 *x, s16 *y) { u8 direction; direction = dirn; - *x = mapObject->currentCoords.x; - *y = mapObject->currentCoords.y; + *x = eventObject->currentCoords.x; + *y = eventObject->currentCoords.y; MoveCoords(direction, x, y); } // file boundary? -bool8 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct MapObject *mapObject) +bool8 EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct EventObject *eventObject) { - if (mapObject->singleMovementActive || mapObject->heldMovementActive) + if (eventObject->singleMovementActive || eventObject->heldMovementActive) { return TRUE; } return FALSE; } -bool8 FieldObjectIsSpecialAnimActive(struct MapObject *mapObject) +bool8 EventObjectIsSpecialAnimActive(struct EventObject *eventObject) { - if (mapObject->heldMovementActive && mapObject->movementActionId != 0xFF) + if (eventObject->heldMovementActive && eventObject->movementActionId != 0xFF) { return TRUE; } return FALSE; } -bool8 FieldObjectSetSpecialAnim(struct MapObject *mapObject, u8 specialAnimId) +bool8 EventObjectSetSpecialAnim(struct EventObject *eventObject, u8 specialAnimId) { - if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject)) + if (EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(eventObject)) { return TRUE; } - npc_sync_anim_pause_bits(mapObject); - mapObject->movementActionId = specialAnimId; - mapObject->heldMovementActive = TRUE; - mapObject->heldMovementFinished = FALSE; - gSprites[mapObject->spriteId].data[2] = 0; + npc_sync_anim_pause_bits(eventObject); + eventObject->movementActionId = specialAnimId; + eventObject->heldMovementActive = TRUE; + eventObject->heldMovementFinished = FALSE; + gSprites[eventObject->spriteId].data[2] = 0; return FALSE; } -void FieldObjectForceSetSpecialAnim(struct MapObject *mapObject, u8 specialAnimId) +void EventObjectForceSetSpecialAnim(struct EventObject *eventObject, u8 specialAnimId) { - FieldObjectClearAnimIfSpecialAnimActive(mapObject); - FieldObjectSetSpecialAnim(mapObject, specialAnimId); + EventObjectClearAnimIfSpecialAnimActive(eventObject); + EventObjectSetSpecialAnim(eventObject, specialAnimId); } -void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *mapObject) +void EventObjectClearAnimIfSpecialAnimActive(struct EventObject *eventObject) { - if (mapObject->heldMovementActive) + if (eventObject->heldMovementActive) { - FieldObjectClearAnim(mapObject); + EventObjectClearAnim(eventObject); } } -void FieldObjectClearAnim(struct MapObject *mapObject) +void EventObjectClearAnim(struct EventObject *eventObject) { - mapObject->movementActionId = 0xFF; - mapObject->heldMovementActive = FALSE; - mapObject->heldMovementFinished = FALSE; - gSprites[mapObject->spriteId].data[1] = 0; - gSprites[mapObject->spriteId].data[2] = 0; + eventObject->movementActionId = 0xFF; + eventObject->heldMovementActive = FALSE; + eventObject->heldMovementFinished = FALSE; + gSprites[eventObject->spriteId].data[1] = 0; + gSprites[eventObject->spriteId].data[2] = 0; } -u8 FieldObjectCheckIfSpecialAnimFinishedOrInactive(struct MapObject *mapObject) +u8 EventObjectCheckIfSpecialAnimFinishedOrInactive(struct EventObject *eventObject) { - if (mapObject->heldMovementActive) + if (eventObject->heldMovementActive) { - return mapObject->heldMovementFinished; + return eventObject->heldMovementFinished; } return 0x10; } -u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *mapObject) +u8 EventObjectClearAnimIfSpecialAnimFinished(struct EventObject *eventObject) { u8 specialAnimState; - specialAnimState = FieldObjectCheckIfSpecialAnimFinishedOrInactive(mapObject); + specialAnimState = EventObjectCheckIfSpecialAnimFinishedOrInactive(eventObject); if (specialAnimState != 0 && specialAnimState != 16) { - FieldObjectClearAnimIfSpecialAnimActive(mapObject); + EventObjectClearAnimIfSpecialAnimActive(eventObject); } return specialAnimState; } -u8 FieldObjectGetSpecialAnim(struct MapObject *mapObject) +u8 EventObjectGetSpecialAnim(struct EventObject *eventObject) { - if (mapObject->heldMovementActive) + if (eventObject->heldMovementActive) { - return mapObject->movementActionId; + return eventObject->movementActionId; } return 0xFF; } -void FieldObjectStep(struct MapObject *mapObject, struct Sprite *sprite, bool8 (*callback)(struct MapObject *, struct Sprite *)) +void EventObjectStep(struct EventObject *eventObject, struct Sprite *sprite, bool8 (*callback)(struct EventObject *, struct Sprite *)) { - DoGroundEffects_OnSpawn(mapObject, sprite); - sub_80964E8(mapObject, sprite); - if (FieldObjectIsSpecialAnimActive(mapObject)) + DoGroundEffects_OnSpawn(eventObject, sprite); + sub_80964E8(eventObject, sprite); + if (EventObjectIsSpecialAnimActive(eventObject)) { - FieldObjectExecSpecialAnim(mapObject, sprite); + EventObjectExecSpecialAnim(eventObject, sprite); } - else if (!mapObject->frozen) + else if (!eventObject->frozen) { - while (callback(mapObject, sprite)); + while (callback(eventObject, sprite)); } - DoGroundEffects_OnBeginStep(mapObject, sprite); - DoGroundEffects_OnFinishStep(mapObject, sprite); - npc_obj_transfer_image_anim_pause_flag(mapObject, sprite); - sub_8096518(mapObject, sprite); - FieldObjectUpdateSubpriority(mapObject, sprite); + DoGroundEffects_OnBeginStep(eventObject, sprite); + DoGroundEffects_OnFinishStep(eventObject, sprite); + npc_obj_transfer_image_anim_pause_flag(eventObject, sprite); + sub_8096518(eventObject, sprite); + EventObjectUpdateSubpriority(eventObject, sprite); } #define dirn2anim_2(name, table) \ @@ -4973,9 +4971,9 @@ dirn2anim_2(GetStepInPlaceDelay16AnimId, gUnknown_0850DBE6); dirn2anim_2(GetStepInPlaceDelay8AnimId, gUnknown_0850DBEB); dirn2anim_2(GetStepInPlaceDelay4AnimId, gUnknown_0850DBF0); -bool8 FieldObjectFaceOppositeDirection(struct MapObject *mapObject, u8 direction) +bool8 EventObjectFaceOppositeDirection(struct EventObject *eventObject, u8 direction) { - return FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(GetOppositeDirection(direction))); + return EventObjectSetSpecialAnim(eventObject, GetFaceDirectionAnimId(GetOppositeDirection(direction))); } dirn2anim_2(sub_8093648, gUnknown_0850DBF5); @@ -5022,141 +5020,141 @@ static u32 state_to_direction(u8 a0, u32 a1, u32 a2) return gUnknown_0850DC3F[a0 - 1][zffuOffset - 1]; } -static void FieldObjectExecSpecialAnim(struct MapObject *mapObject, struct Sprite *sprite) +static void EventObjectExecSpecialAnim(struct EventObject *eventObject, struct Sprite *sprite) { - if (gUnknown_0850DC50[mapObject->movementActionId][sprite->data[2]](mapObject, sprite)) + if (gUnknown_0850DC50[eventObject->movementActionId][sprite->data[2]](eventObject, sprite)) { - mapObject->heldMovementFinished = TRUE; + eventObject->heldMovementFinished = TRUE; } } -bool8 FieldObjectExecRegularAnim(struct MapObject *mapObject, struct Sprite *sprite) +bool8 EventObjectExecRegularAnim(struct EventObject *eventObject, struct Sprite *sprite) { - if (gUnknown_0850DC50[mapObject->movementActionId][sprite->data[2]](mapObject, sprite)) + if (gUnknown_0850DC50[eventObject->movementActionId][sprite->data[2]](eventObject, sprite)) { - mapObject->movementActionId = 0xFF; + eventObject->movementActionId = 0xFF; sprite->data[2] = 0; return TRUE; } return FALSE; } -static void FieldObjectSetRegularAnim(struct MapObject *mapObject, struct Sprite *sprite, u8 animId) +static void EventObjectSetRegularAnim(struct EventObject *eventObject, struct Sprite *sprite, u8 animId) { - mapObject->movementActionId = animId; + eventObject->movementActionId = animId; sprite->data[2] = 0; } // file boundary? -void an_look_any(struct MapObject *mapObject, struct Sprite *sprite, u8 direction) +void an_look_any(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) { - FieldObjectSetDirection(mapObject, direction); - npc_coords_shift_still(mapObject); - obj_npc_animation_step(mapObject, sprite, get_go_image_anim_num(mapObject->facingDirection)); + EventObjectSetDirection(eventObject, direction); + npc_coords_shift_still(eventObject); + obj_npc_animation_step(eventObject, sprite, get_go_image_anim_num(eventObject->facingDirection)); sprite->animPaused = TRUE; sprite->data[2] = 1; } -bool8 sub_8093950(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8093950(struct EventObject *eventObject, struct Sprite *sprite) { - an_look_any(mapObject, sprite, DIR_SOUTH); + an_look_any(eventObject, sprite, DIR_SOUTH); return TRUE; } -bool8 sub_8093960(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8093960(struct EventObject *eventObject, struct Sprite *sprite) { - an_look_any(mapObject, sprite, DIR_NORTH); + an_look_any(eventObject, sprite, DIR_NORTH); return TRUE; } -bool8 sub_8093970(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8093970(struct EventObject *eventObject, struct Sprite *sprite) { - an_look_any(mapObject, sprite, DIR_WEST); + an_look_any(eventObject, sprite, DIR_WEST); return TRUE; } -bool8 sub_8093980(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8093980(struct EventObject *eventObject, struct Sprite *sprite) { - an_look_any(mapObject, sprite, DIR_EAST); + an_look_any(eventObject, sprite, DIR_EAST); return TRUE; } -void npc_apply_direction(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed) +void npc_apply_direction(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) { s16 x; s16 y; - x = mapObject->currentCoords.x; - y = mapObject->currentCoords.y; - FieldObjectSetDirection(mapObject, direction); + x = eventObject->currentCoords.x; + y = eventObject->currentCoords.y; + EventObjectSetDirection(eventObject, direction); MoveCoords(direction, &x, &y); - npc_coords_shift(mapObject, x, y); + npc_coords_shift(eventObject, x, y); oamt_npc_ministep_reset(sprite, direction, speed); sprite->animPaused = FALSE; - if (gUnknown_020375B8 != NULL && sub_8097F78(mapObject) != 0x10) + if (gUnknown_020375B8 != NULL && sub_8097F78(eventObject) != 0x10) { sprite->animPaused = TRUE; } - mapObject->triggerGroundEffectsOnMove = TRUE; + eventObject->triggerGroundEffectsOnMove = TRUE; sprite->data[2] = 1; } -void do_go_anim(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed) +void do_go_anim(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) { u8 (*functions[ARRAY_COUNT(gUnknown_0850DEE8)])(u8); memcpy(functions, gUnknown_0850DEE8, sizeof gUnknown_0850DEE8); - npc_apply_direction(mapObject, sprite, direction, speed); - npc_apply_anim_looping(mapObject, sprite, functions[speed](mapObject->facingDirection)); + npc_apply_direction(eventObject, sprite, direction, speed); + npc_apply_anim_looping(eventObject, sprite, functions[speed](eventObject->facingDirection)); } -void do_run_anim(struct MapObject *mapObject, struct Sprite *sprite, u8 direction) +void do_run_anim(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) { - npc_apply_direction(mapObject, sprite, direction, 1); - npc_apply_anim_looping(mapObject, sprite, get_run_image_anim_num(mapObject->facingDirection)); + npc_apply_direction(eventObject, sprite, direction, 1); + npc_apply_anim_looping(eventObject, sprite, get_run_image_anim_num(eventObject->facingDirection)); } -bool8 npc_obj_ministep_stop_on_arrival(struct MapObject *mapObject, struct Sprite *sprite) +bool8 npc_obj_ministep_stop_on_arrival(struct EventObject *eventObject, struct Sprite *sprite) { if (obj_npc_ministep(sprite)) { - npc_coords_shift_still(mapObject); - mapObject->triggerGroundEffectsOnStop = TRUE; + npc_coords_shift_still(eventObject); + eventObject->triggerGroundEffectsOnStop = TRUE; sprite->animPaused = TRUE; return TRUE; } return FALSE; } -void sub_8093AF0(struct MapObject *mapObject, struct Sprite *sprite, u8 direction) +void sub_8093AF0(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) { s16 x; s16 y; - x = mapObject->currentCoords.x; - y = mapObject->currentCoords.y; - FieldObjectSetDirection(mapObject, direction); + x = eventObject->currentCoords.x; + y = eventObject->currentCoords.y; + EventObjectSetDirection(eventObject, direction); MoveCoords(direction, &x, &y); - npc_coords_shift(mapObject, x, y); + npc_coords_shift(eventObject, x, y); sub_80976DC(sprite, direction); sprite->animPaused = FALSE; - mapObject->triggerGroundEffectsOnMove = TRUE; + eventObject->triggerGroundEffectsOnMove = TRUE; sprite->data[2] = 1; } -void sub_8093B60(struct MapObject *mapObject, struct Sprite *sprite, u8 direction) +void sub_8093B60(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) { - sub_8093AF0(mapObject, sprite, direction); - npc_apply_anim_looping(mapObject, sprite, get_go_image_anim_num(mapObject->facingDirection)); + sub_8093AF0(eventObject, sprite, direction); + npc_apply_anim_looping(eventObject, sprite, get_go_image_anim_num(eventObject->facingDirection)); } -bool8 an_walk_any_2(struct MapObject *mapObject, struct Sprite *sprite) +bool8 an_walk_any_2(struct EventObject *eventObject, struct Sprite *sprite) { if (sub_80976EC(sprite)) { - npc_coords_shift_still(mapObject); - mapObject->triggerGroundEffectsOnStop = TRUE; + npc_coords_shift_still(eventObject); + eventObject->triggerGroundEffectsOnStop = TRUE; sprite->animPaused = TRUE; return TRUE; } @@ -5164,15 +5162,15 @@ bool8 an_walk_any_2(struct MapObject *mapObject, struct Sprite *sprite) } #define an_walk_any_2_macro(name, fn1, fn2, ...) \ -bool8 name##_2(struct MapObject *, struct Sprite *);\ -bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\ +bool8 name##_2(struct EventObject *, struct Sprite *);\ +bool8 name(struct EventObject *eventObject, struct Sprite *sprite)\ {\ - fn1(mapObject, sprite, __VA_ARGS__);\ - return name##_2(mapObject, sprite);\ + fn1(eventObject, sprite, __VA_ARGS__);\ + return name##_2(eventObject, sprite);\ }\ -bool8 name##_2(struct MapObject *mapObject, struct Sprite *sprite)\ +bool8 name##_2(struct EventObject *eventObject, struct Sprite *sprite)\ {\ - if (fn2(mapObject, sprite))\ + if (fn2(eventObject, sprite))\ {\ sprite->data[2] = 2;\ return TRUE;\ @@ -5197,7 +5195,7 @@ an_walk_any_2_macro(sub_8093F04, do_go_anim, npc_obj_ministep_stop_on_arrival, 2 an_walk_any_2_macro(sub_8093F44, do_go_anim, npc_obj_ministep_stop_on_arrival, 3, 0) an_walk_any_2_macro(sub_8093F84, do_go_anim, npc_obj_ministep_stop_on_arrival, 4, 0) -void sub_8093FC4(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a5) +void sub_8093FC4(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a5) { s16 displacements[ARRAY_COUNT(gUnknown_0850DFBC)]; s16 x; @@ -5206,24 +5204,24 @@ void sub_8093FC4(struct MapObject *mapObject, struct Sprite *sprite, u8 directio memcpy(displacements, gUnknown_0850DFBC, sizeof gUnknown_0850DFBC); x = 0; y = 0; - FieldObjectSetDirection(mapObject, direction); + EventObjectSetDirection(eventObject, direction); sub_8092F88(direction, &x, &y, displacements[speed], displacements[speed]); - npc_coords_shift(mapObject, mapObject->currentCoords.x + x, mapObject->currentCoords.y + y); + npc_coords_shift(eventObject, eventObject->currentCoords.x + x, eventObject->currentCoords.y + y); sub_809783C(sprite, direction, speed, a5); sprite->data[2] = 1; sprite->animPaused = 0; - mapObject->triggerGroundEffectsOnMove = 1; - mapObject->disableCoveringGroundEffects = 1; + eventObject->triggerGroundEffectsOnMove = 1; + eventObject->disableCoveringGroundEffects = 1; } -void maybe_shadow_1(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a4) +void maybe_shadow_1(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a4) { - sub_8093FC4(mapObject, sprite, direction, speed, a4); - npc_apply_anim_looping(mapObject, sprite, get_go_image_anim_num(mapObject->facingDirection)); - DoShadowFieldEffect(mapObject); + sub_8093FC4(eventObject, sprite, direction, speed, a4); + npc_apply_anim_looping(eventObject, sprite, get_go_image_anim_num(eventObject->facingDirection)); + DoShadowFieldEffect(eventObject); } -u8 sub_80940C4(struct MapObject *mapObject, struct Sprite *sprite, u8 callback(struct Sprite *)) +u8 sub_80940C4(struct EventObject *eventObject, struct Sprite *sprite, u8 callback(struct Sprite *)) { s16 displacements[ARRAY_COUNT(gUnknown_0850DFC2)]; s16 x; @@ -5236,75 +5234,75 @@ u8 sub_80940C4(struct MapObject *mapObject, struct Sprite *sprite, u8 callback(s { x = 0; y = 0; - sub_8092F88(mapObject->movementDirection, &x, &y, displacements[sprite->data[4]], displacements[sprite->data[4]]); - npc_coords_shift(mapObject, mapObject->currentCoords.x + x, mapObject->currentCoords.y + y); - mapObject->triggerGroundEffectsOnMove = TRUE; - mapObject->disableCoveringGroundEffects = TRUE; + sub_8092F88(eventObject->movementDirection, &x, &y, displacements[sprite->data[4]], displacements[sprite->data[4]]); + npc_coords_shift(eventObject, eventObject->currentCoords.x + x, eventObject->currentCoords.y + y); + eventObject->triggerGroundEffectsOnMove = TRUE; + eventObject->disableCoveringGroundEffects = TRUE; } else if (result == 0xFF) { - npc_coords_shift_still(mapObject); - mapObject->triggerGroundEffectsOnStop = TRUE; - mapObject->landingJump = TRUE; + npc_coords_shift_still(eventObject); + eventObject->triggerGroundEffectsOnStop = TRUE; + eventObject->landingJump = TRUE; sprite->animPaused = TRUE; } return result; } -u8 sub_8094188(struct MapObject *mapObject, struct Sprite *sprite) +u8 sub_8094188(struct EventObject *eventObject, struct Sprite *sprite) { - return sub_80940C4(mapObject, sprite, sub_809785C); + return sub_80940C4(eventObject, sprite, sub_809785C); } -u8 sub_809419C(struct MapObject *mapObject, struct Sprite *sprite) +u8 sub_809419C(struct EventObject *eventObject, struct Sprite *sprite) { - return sub_80940C4(mapObject, sprite, sub_80978E4); + return sub_80940C4(eventObject, sprite, sub_80978E4); } -bool8 sub_80941B0(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80941B0(struct EventObject *eventObject, struct Sprite *sprite) { - if (sub_8094188(mapObject, sprite) == 0xFF) + if (sub_8094188(eventObject, sprite) == 0xFF) { return TRUE; } return FALSE; } -bool8 sub_80941C8(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80941C8(struct EventObject *eventObject, struct Sprite *sprite) { - if (sub_809419C(mapObject, sprite) == 0xFF) + if (sub_809419C(eventObject, sprite) == 0xFF) { return TRUE; } return FALSE; } -bool8 sub_80941E0(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80941E0(struct EventObject *eventObject, struct Sprite *sprite) { - switch (sub_8094188(mapObject, sprite)) + switch (sub_8094188(eventObject, sprite)) { case 255: return TRUE; case 1: - FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->movementDirection)); - obj_npc_animation_step(mapObject, sprite, get_go_image_anim_num(mapObject->facingDirection)); + EventObjectSetDirection(eventObject, GetOppositeDirection(eventObject->movementDirection)); + obj_npc_animation_step(eventObject, sprite, get_go_image_anim_num(eventObject->facingDirection)); default: return FALSE; } } #define maybe_shadow_1_macro(name, fn1, fn2, ...) \ -bool8 name##_2(struct MapObject *, struct Sprite *);\ -bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\ +bool8 name##_2(struct EventObject *, struct Sprite *);\ +bool8 name(struct EventObject *eventObject, struct Sprite *sprite)\ {\ - fn1(mapObject, sprite, __VA_ARGS__);\ - return name##_2(mapObject, sprite);\ + fn1(eventObject, sprite, __VA_ARGS__);\ + return name##_2(eventObject, sprite);\ }\ -bool8 name##_2(struct MapObject *mapObject, struct Sprite *sprite)\ +bool8 name##_2(struct EventObject *eventObject, struct Sprite *sprite)\ {\ - if (fn2(mapObject, sprite))\ + if (fn2(eventObject, sprite))\ {\ - mapObject->hasShadow = FALSE;\ + eventObject->hasShadow = FALSE;\ sprite->data[2] = 2;\ return TRUE;\ }\ @@ -5322,7 +5320,7 @@ void sub_8094390(struct Sprite *sprite, u16 duration) sprite->data[3] = duration; } -bool8 sub_8094398(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8094398(struct EventObject *eventObject, struct Sprite *sprite) { if (-- sprite->data[3] == 0) { @@ -5333,10 +5331,10 @@ bool8 sub_8094398(struct MapObject *mapObject, struct Sprite *sprite) } #define special_anim_with_timer(name, duration)\ -bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\ +bool8 name(struct EventObject *eventObject, struct Sprite *sprite)\ {\ sub_8094390(sprite, duration);\ - return sub_8094398(mapObject, sprite);\ + return sub_8094398(eventObject, sprite);\ } special_anim_with_timer(sub_80943B4, 1) @@ -5350,16 +5348,16 @@ an_walk_any_2_macro(sub_8094494, do_go_anim, npc_obj_ministep_stop_on_arrival, 2 an_walk_any_2_macro(sub_80944D4, do_go_anim, npc_obj_ministep_stop_on_arrival, 3, 1) an_walk_any_2_macro(sub_8094514, do_go_anim, npc_obj_ministep_stop_on_arrival, 4, 1) -void sub_8094554(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 animNum, u16 duration) +void sub_8094554(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 animNum, u16 duration) { - FieldObjectSetDirection(mapObject, direction); - npc_apply_anim_looping(mapObject, sprite, animNum); + EventObjectSetDirection(eventObject, direction); + npc_apply_anim_looping(eventObject, sprite, animNum); sprite->animPaused = FALSE; sprite->data[2] = 1; sprite->data[3] = duration; } -bool8 sub_809459C(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_809459C(struct EventObject *eventObject, struct Sprite *sprite) { if (-- sprite->data[3] == 0) { @@ -5370,22 +5368,22 @@ bool8 sub_809459C(struct MapObject *mapObject, struct Sprite *sprite) return FALSE; } -bool8 sub_80945C4(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80945C4(struct EventObject *eventObject, struct Sprite *sprite) { if (sprite->data[3] & 1) { sprite->animDelayCounter ++; } - return sub_809459C(mapObject, sprite); + return sub_809459C(eventObject, sprite); } #define special_anim_with_timer_2(name, direction, images, duration, timer) \ -bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\ +bool8 name(struct EventObject *eventObject, struct Sprite *sprite)\ {\ u8 animId;\ animId = images(DIR_##direction);\ - sub_8094554(mapObject, sprite, DIR_##direction, animId, duration);\ - return timer(mapObject, sprite);\ + sub_8094554(eventObject, sprite, DIR_##direction, animId, duration);\ + return timer(eventObject, sprite);\ } special_anim_with_timer_2(sub_8094600, SOUTH, get_go_image_anim_num, 32, sub_80945C4) @@ -5422,20 +5420,20 @@ an_walk_any_2_macro(sub_8094CC0, do_run_anim, npc_obj_ministep_stop_on_arrival, an_walk_any_2_macro(sub_8094D00, do_run_anim, npc_obj_ministep_stop_on_arrival, DIR_WEST) an_walk_any_2_macro(sub_8094D40, do_run_anim, npc_obj_ministep_stop_on_arrival, DIR_EAST) -void npc_set_direction_and_anim__an_proceed(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 animNum) +void npc_set_direction_and_anim__an_proceed(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 animNum) { obj_anim_image_set_and_seek(sprite, animNum, 0); - FieldObjectSetDirection(mapObject, direction); + EventObjectSetDirection(eventObject, direction); sprite->data[2] = 1; } -bool8 sub_8094DAC(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8094DAC(struct EventObject *eventObject, struct Sprite *sprite) { - npc_set_direction_and_anim__an_proceed(mapObject, sprite, mapObject->movementDirection, sprite->animNum); + npc_set_direction_and_anim__an_proceed(eventObject, sprite, eventObject->movementDirection, sprite->animNum); return FALSE; } -bool8 sub_8094DC4(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8094DC4(struct EventObject *eventObject, struct Sprite *sprite) { if (sub_80979BC(sprite)) { @@ -5445,25 +5443,25 @@ bool8 sub_8094DC4(struct MapObject *mapObject, struct Sprite *sprite) return FALSE; } -void sub_8094DE4(struct MapObject *mapObject, struct Sprite *sprite, u8 direction) +void sub_8094DE4(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) { - sub_8093FC4(mapObject, sprite, direction, 1, 0); + sub_8093FC4(eventObject, sprite, direction, 1, 0); StartSpriteAnim(sprite, sub_80929AC(direction)); } #define unk_macro_8094E18(name, direction)\ -bool8 name##_2(struct MapObject *, struct Sprite *);\ -bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\ +bool8 name##_2(struct EventObject *, struct Sprite *);\ +bool8 name(struct EventObject *eventObject, struct Sprite *sprite)\ {\ - sub_8094DE4(mapObject, sprite, direction);\ - return name##_2(mapObject, sprite);\ + sub_8094DE4(eventObject, sprite, direction);\ + return name##_2(eventObject, sprite);\ }\ -bool8 name##_2(struct MapObject *mapObject, struct Sprite *sprite)\ +bool8 name##_2(struct EventObject *eventObject, struct Sprite *sprite)\ {\ - if (sub_80941C8(mapObject, sprite))\ + if (sub_80941C8(eventObject, sprite))\ {\ sprite->data[2] = 2;\ - mapObject->landingJump = FALSE;\ + eventObject->landingJump = FALSE;\ return TRUE;\ }\ return FALSE;\ @@ -5474,40 +5472,40 @@ unk_macro_8094E18(sub_8094E60, DIR_NORTH) unk_macro_8094E18(sub_8094EB8, DIR_WEST) unk_macro_8094E18(sub_8094710, DIR_EAST) -bool8 sub_8094F38(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8094F38(struct EventObject *eventObject, struct Sprite *sprite) { - u8 mapObjectId; + u8 eventObjectId; - if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0, &mapObjectId)) + if (!TryGetEventObjectIdByLocalIdAndMap(0xFF, 0, 0, &eventObjectId)) { - an_look_any(mapObject, sprite, sub_8092AF8(mapObject->currentCoords.x, mapObject->currentCoords.y, gMapObjects[mapObjectId].currentCoords.x, gMapObjects[mapObjectId].currentCoords.y)); + an_look_any(eventObject, sprite, sub_8092AF8(eventObject->currentCoords.x, eventObject->currentCoords.y, gEventObjects[eventObjectId].currentCoords.x, gEventObjects[eventObjectId].currentCoords.y)); } sprite->data[2] = 1; return TRUE; } -bool8 sub_8094F94(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8094F94(struct EventObject *eventObject, struct Sprite *sprite) { - u8 mapObjectId; + u8 eventObjectId; - if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0, &mapObjectId)) + if (!TryGetEventObjectIdByLocalIdAndMap(0xFF, 0, 0, &eventObjectId)) { - an_look_any(mapObject, sprite, GetOppositeDirection(sub_8092AF8(mapObject->currentCoords.x, mapObject->currentCoords.y, gMapObjects[mapObjectId].currentCoords.x, gMapObjects[mapObjectId].currentCoords.y))); + an_look_any(eventObject, sprite, GetOppositeDirection(sub_8092AF8(eventObject->currentCoords.x, eventObject->currentCoords.y, gEventObjects[eventObjectId].currentCoords.x, gEventObjects[eventObjectId].currentCoords.y))); } sprite->data[2] = 1; return TRUE; } -bool8 sub_8094FF8(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8094FF8(struct EventObject *eventObject, struct Sprite *sprite) { - mapObject->facingDirectionLocked = TRUE; + eventObject->facingDirectionLocked = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 sub_8095008(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8095008(struct EventObject *eventObject, struct Sprite *sprite) { - mapObject->facingDirectionLocked = FALSE; + eventObject->facingDirectionLocked = FALSE; sprite->data[2] = 1; return TRUE; } @@ -5525,104 +5523,104 @@ maybe_shadow_1_macro(sub_8095330, maybe_shadow_1, sub_80941E0, DIR_NORTH, 0, 2) maybe_shadow_1_macro(sub_8095388, maybe_shadow_1, sub_80941E0, DIR_WEST, 0, 2) maybe_shadow_1_macro(sub_80953E0, maybe_shadow_1, sub_80941E0, DIR_EAST, 0, 2) -bool8 sub_8095438(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8095438(struct EventObject *eventObject, struct Sprite *sprite) { - an_look_any(mapObject, sprite, gInitialMovementTypeFacingDirections[mapObject->movementType]); + an_look_any(eventObject, sprite, gInitialMovementTypeFacingDirections[eventObject->movementType]); return TRUE; } -bool8 sub_8095450(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8095450(struct EventObject *eventObject, struct Sprite *sprite) { - npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_SOUTH, 0x14); + npc_set_direction_and_anim__an_proceed(eventObject, sprite, DIR_SOUTH, 0x14); return FALSE; } -bool8 sub_8095460(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8095460(struct EventObject *eventObject, struct Sprite *sprite) { - mapObject->disableJumpLandingGroundEffect = FALSE; + eventObject->disableJumpLandingGroundEffect = FALSE; sprite->data[2] = 1; return TRUE; } -bool8 sub_8095470(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8095470(struct EventObject *eventObject, struct Sprite *sprite) { - mapObject->disableJumpLandingGroundEffect = TRUE; + eventObject->disableJumpLandingGroundEffect = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 sub_8095480(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8095480(struct EventObject *eventObject, struct Sprite *sprite) { - mapObject->inanimate = TRUE; + eventObject->inanimate = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 sub_8095490(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8095490(struct EventObject *eventObject, struct Sprite *sprite) { - mapObject->inanimate = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->inanimate; + eventObject->inanimate = GetEventObjectGraphicsInfo(eventObject->graphicsId)->inanimate; sprite->data[2] = 1; return TRUE; } -bool8 sub_80954BC(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80954BC(struct EventObject *eventObject, struct Sprite *sprite) { - mapObject->invisible = TRUE; + eventObject->invisible = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 sub_80954CC(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80954CC(struct EventObject *eventObject, struct Sprite *sprite) { - mapObject->invisible = FALSE; + eventObject->invisible = FALSE; sprite->data[2] = 1; return TRUE; } -bool8 do_exclamation_mark_bubble_1(struct MapObject *mapObject, struct Sprite *sprite) +bool8 do_exclamation_mark_bubble_1(struct EventObject *eventObject, struct Sprite *sprite) { - FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1); sprite->data[2] = 1; return TRUE; } -bool8 do_exclamation_mark_bubble_2(struct MapObject *mapObject, struct Sprite *sprite) +bool8 do_exclamation_mark_bubble_2(struct EventObject *eventObject, struct Sprite *sprite) { - FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_2); sprite->data[2] = 1; return TRUE; } -bool8 do_heart_bubble(struct MapObject *mapObject, struct Sprite *sprite) +bool8 do_heart_bubble(struct EventObject *eventObject, struct Sprite *sprite) { - FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_HEART_ICON); sprite->data[2] = 1; return TRUE; } -bool8 sub_8095548(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8095548(struct EventObject *eventObject, struct Sprite *sprite) { - if (mapObject->movementType == 0x3F) + if (eventObject->movementType == 0x3F) { - sub_80B4578(mapObject); + sub_80B4578(eventObject); return FALSE; } - if (mapObject->movementType != 0x39 && mapObject->movementType != 0x3A) + if (eventObject->movementType != 0x39 && eventObject->movementType != 0x3A) { sprite->data[2] = 2; return TRUE; } - sub_8155D78(mapObject); + sub_8155D78(eventObject); sprite->data[2] = 1; - return sub_809558C(mapObject, sprite); + return sub_809558C(eventObject, sprite); } -bool8 sub_809558C(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_809558C(struct EventObject *eventObject, struct Sprite *sprite) { - if (sub_8155DA0(mapObject)) + if (sub_8155DA0(eventObject)) { sprite->data[2] = 2; return TRUE; @@ -5630,77 +5628,77 @@ bool8 sub_809558C(struct MapObject *mapObject, struct Sprite *sprite) return FALSE; } -bool8 sub_80955AC(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80955AC(struct EventObject *eventObject, struct Sprite *sprite) { obj_anim_image_set_and_seek(sprite, 1, 0); sprite->data[2] = 1; return FALSE; } -bool8 sub_80955C8(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80955C8(struct EventObject *eventObject, struct Sprite *sprite) { if (sub_80979BC(sprite)) { - SetFieldObjectStepTimer(sprite, 32); + SetEventObjectStepTimer(sprite, 32); sprite->data[2] = 2; } return FALSE; } -bool8 sub_80955EC(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80955EC(struct EventObject *eventObject, struct Sprite *sprite) { - mapObject->invisible ^= TRUE; - if (RunFieldObjectStepTimer(sprite)) + eventObject->invisible ^= TRUE; + if (RunEventObjectStepTimer(sprite)) { - mapObject->invisible = TRUE; + eventObject->invisible = TRUE; sprite->data[2] = 3; } return FALSE; } -bool8 sub_8095628(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8095628(struct EventObject *eventObject, struct Sprite *sprite) { obj_anim_image_set_and_seek(sprite, 1, 0); sprite->data[2] = 1; return FALSE; } -bool8 sub_8095644(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8095644(struct EventObject *eventObject, struct Sprite *sprite) { if (sub_80979BC(sprite)) { - SetFieldObjectStepTimer(sprite, 32); + SetEventObjectStepTimer(sprite, 32); sprite->data[2] = 2; } return FALSE; } -bool8 sub_8095668(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8095668(struct EventObject *eventObject, struct Sprite *sprite) { - mapObject->invisible ^= TRUE; - if (RunFieldObjectStepTimer(sprite)) + eventObject->invisible ^= TRUE; + if (RunEventObjectStepTimer(sprite)) { - mapObject->invisible = TRUE; + eventObject->invisible = TRUE; sprite->data[2] = 3; } return FALSE; } -bool8 sub_80956A4(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80956A4(struct EventObject *eventObject, struct Sprite *sprite) { - mapObject->fixedPriority = TRUE; + eventObject->fixedPriority = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 sub_80956B4(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80956B4(struct EventObject *eventObject, struct Sprite *sprite) { - mapObject->fixedPriority = FALSE; + eventObject->fixedPriority = FALSE; sprite->data[2] = 1; return TRUE; } -bool8 sub_80956C4(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80956C4(struct EventObject *eventObject, struct Sprite *sprite) { sprite->oam.affineMode = 3; InitSpriteAffineAnim(sprite); @@ -5709,7 +5707,7 @@ bool8 sub_80956C4(struct MapObject *mapObject, struct Sprite *sprite) return TRUE; } -bool8 sub_80956F4(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80956F4(struct EventObject *eventObject, struct Sprite *sprite) { FreeOamMatrix(sprite->oam.matrixNum); sprite->oam.affineMode = 0; @@ -5717,30 +5715,30 @@ bool8 sub_80956F4(struct MapObject *mapObject, struct Sprite *sprite) return TRUE; } -bool8 sub_8095724(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8095724(struct EventObject *eventObject, struct Sprite *sprite) { - mapObject->unk3_3 = TRUE; + eventObject->unk3_3 = TRUE; return TRUE; } -bool8 sub_8095730(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8095730(struct EventObject *eventObject, struct Sprite *sprite) { - mapObject->unk3_3 = FALSE; + eventObject->unk3_3 = FALSE; return TRUE; } #define affine_an_walk_any_2_macro(name, fn, fn2, action, anim, ...)\ -bool8 name##_2(struct MapObject *, struct Sprite *);\ -bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\ +bool8 name##_2(struct EventObject *, struct Sprite *);\ +bool8 name(struct EventObject *eventObject, struct Sprite *sprite)\ {\ - fn(mapObject, sprite, __VA_ARGS__);\ + fn(eventObject, sprite, __VA_ARGS__);\ sprite->affineAnimPaused = FALSE;\ action(sprite, anim);\ - return name##_2(mapObject, sprite);\ + return name##_2(eventObject, sprite);\ }\ -bool8 name##_2(struct MapObject *mapObject, struct Sprite *sprite)\ +bool8 name##_2(struct EventObject *eventObject, struct Sprite *sprite)\ {\ - if (fn2(mapObject, sprite))\ + if (fn2(eventObject, sprite))\ {\ sprite->affineAnimPaused = TRUE;\ sprite->data[2] = 2;\ @@ -5754,43 +5752,43 @@ affine_an_walk_any_2_macro(sub_80957A0, sub_8093B60, an_walk_any_2, ChangeSprite affine_an_walk_any_2_macro(sub_8095800, do_go_anim, npc_obj_ministep_stop_on_arrival, ChangeSpriteAffineAnimIfDifferent, 2, DIR_WEST, 1) affine_an_walk_any_2_macro(sub_8095860, do_go_anim, npc_obj_ministep_stop_on_arrival, ChangeSpriteAffineAnimIfDifferent, 3, DIR_EAST, 1) -static void sub_80958C0(struct MapObject *mapObject, struct Sprite *sprite, u8 direction) +static void sub_80958C0(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) { - FieldObjectSetDirection(mapObject, direction); - npc_coords_shift_still(mapObject); - obj_npc_animation_step(mapObject, sprite, sub_80929FC(direction)); + EventObjectSetDirection(eventObject, direction); + npc_coords_shift_still(eventObject); + obj_npc_animation_step(eventObject, sprite, sub_80929FC(direction)); sprite->animPaused = TRUE; sprite->data[2] = 1; } -bool8 sub_8095900(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8095900(struct EventObject *eventObject, struct Sprite *sprite) { - sub_80958C0(mapObject, sprite, DIR_SOUTH); + sub_80958C0(eventObject, sprite, DIR_SOUTH); return TRUE; } -bool8 sub_8095910(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8095910(struct EventObject *eventObject, struct Sprite *sprite) { - sub_80958C0(mapObject, sprite, DIR_NORTH); + sub_80958C0(eventObject, sprite, DIR_NORTH); return TRUE; } -bool8 sub_8095920(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8095920(struct EventObject *eventObject, struct Sprite *sprite) { - sub_80958C0(mapObject, sprite, DIR_WEST); + sub_80958C0(eventObject, sprite, DIR_WEST); return TRUE; } -bool8 sub_8095930(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8095930(struct EventObject *eventObject, struct Sprite *sprite) { - sub_80958C0(mapObject, sprite, DIR_EAST); + sub_80958C0(eventObject, sprite, DIR_EAST); return TRUE; } #define set_dirn_and_anim__an_proceed(name, direction, anims)\ -bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\ +bool8 name(struct EventObject *eventObject, struct Sprite *sprite)\ {\ - npc_set_direction_and_anim__an_proceed(mapObject, sprite, direction, anims(direction));\ + npc_set_direction_and_anim__an_proceed(eventObject, sprite, direction, anims(direction));\ return FALSE;\ } @@ -5807,34 +5805,34 @@ set_dirn_and_anim__an_proceed(sub_8095A84, DIR_NORTH, sub_80929EC) set_dirn_and_anim__an_proceed(sub_8095AA8, DIR_WEST, sub_80929EC) set_dirn_and_anim__an_proceed(sub_8095ACC, DIR_EAST, sub_80929EC) -void sub_8095AF0(struct MapObject *mapObject, struct Sprite *sprite) +void sub_8095AF0(struct EventObject *eventObject, struct Sprite *sprite) { sub_8097750(sprite); sprite->animPaused = FALSE; } -bool8 sub_8095B0C(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8095B0C(struct EventObject *eventObject, struct Sprite *sprite) { if (sub_8097758(sprite)) { - npc_coords_shift_still(mapObject); - mapObject->triggerGroundEffectsOnStop = TRUE; + npc_coords_shift_still(eventObject); + eventObject->triggerGroundEffectsOnStop = TRUE; sprite->animPaused = TRUE; return TRUE; } return FALSE; } -bool8 sub_8095B44(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8095B44(struct EventObject *eventObject, struct Sprite *sprite) { - sub_8095AF0(mapObject, sprite); + sub_8095AF0(eventObject, sprite); sprite->data[2] = 1; - return sub_8095B64(mapObject, sprite); + return sub_8095B64(eventObject, sprite); } -bool8 sub_8095B64(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8095B64(struct EventObject *eventObject, struct Sprite *sprite) { - if (sub_8095B0C(mapObject, sprite)) + if (sub_8095B0C(eventObject, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5842,11 +5840,11 @@ bool8 sub_8095B64(struct MapObject *mapObject, struct Sprite *sprite) return FALSE; } -void sub_8095B84(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a4) +void sub_8095B84(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a4) { - sub_8093FC4(mapObject, sprite, direction, speed, a4); + sub_8093FC4(eventObject, sprite, direction, speed, a4); StartSpriteAnimIfDifferent(sprite, sub_80929BC(direction)); - DoShadowFieldEffect(mapObject); + DoShadowFieldEffect(eventObject); } maybe_shadow_1_macro(sub_8095BC8, sub_8095B84, sub_80941B0, DIR_SOUTH, 0, 1) @@ -5867,10 +5865,10 @@ special_anim_with_timer_2(sub_8096020, NORTH, sub_80929FC, 8, sub_809459C) special_anim_with_timer_2(sub_8096058, WEST, sub_80929FC, 8, sub_809459C) special_anim_with_timer_2(sub_8096090, EAST, sub_80929FC, 8, sub_809459C) -void sub_80960C8(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed) +void sub_80960C8(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) { - npc_apply_direction(mapObject, sprite, direction, speed); - StartSpriteAnim(sprite, sub_80929BC(mapObject->facingDirection)); + npc_apply_direction(eventObject, sprite, direction, speed); + StartSpriteAnim(sprite, sub_80929BC(eventObject->facingDirection)); SeekSpriteAnim(sprite, 0); } @@ -5879,10 +5877,10 @@ an_walk_any_2_macro(sub_8096140, sub_80960C8, npc_obj_ministep_stop_on_arrival, an_walk_any_2_macro(sub_8096180, sub_80960C8, npc_obj_ministep_stop_on_arrival, DIR_WEST, 1) an_walk_any_2_macro(sub_80961C0, sub_80960C8, npc_obj_ministep_stop_on_arrival, DIR_EAST, 1) -void sub_8096200(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed) +void sub_8096200(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) { - npc_apply_direction(mapObject, sprite, direction, speed); - npc_apply_anim_looping(mapObject, sprite, sub_80929FC(mapObject->facingDirection)); + npc_apply_direction(eventObject, sprite, direction, speed); + npc_apply_anim_looping(eventObject, sprite, sub_80929FC(eventObject->facingDirection)); } an_walk_any_2_macro(sub_8096230, sub_8096200, npc_obj_ministep_stop_on_arrival, DIR_SOUTH, 1) @@ -5890,10 +5888,10 @@ an_walk_any_2_macro(sub_8096270, sub_8096200, npc_obj_ministep_stop_on_arrival, an_walk_any_2_macro(sub_80962B0, sub_8096200, npc_obj_ministep_stop_on_arrival, DIR_WEST, 1) an_walk_any_2_macro(sub_80962F0, sub_8096200, npc_obj_ministep_stop_on_arrival, DIR_EAST, 1) -void sub_8096330(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed) +void sub_8096330(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) { - npc_apply_direction(mapObject, sprite, direction, speed); - StartSpriteAnim(sprite, sub_80929DC(mapObject->facingDirection)); + npc_apply_direction(eventObject, sprite, direction, speed); + StartSpriteAnim(sprite, sub_80929DC(eventObject->facingDirection)); SeekSpriteAnim(sprite, 0); } an_walk_any_2_macro(sub_8096368, sub_8096330, npc_obj_ministep_stop_on_arrival, DIR_SOUTH, 1) @@ -5901,77 +5899,77 @@ an_walk_any_2_macro(sub_80963A8, sub_8096330, npc_obj_ministep_stop_on_arrival, an_walk_any_2_macro(sub_80963E8, sub_8096330, npc_obj_ministep_stop_on_arrival, DIR_WEST, 1) an_walk_any_2_macro(sub_8096428, sub_8096330, npc_obj_ministep_stop_on_arrival, DIR_EAST, 1) -bool8 sub_8096468(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8096468(struct EventObject *eventObject, struct Sprite *sprite) { - sub_8097FA4(mapObject); + sub_8097FA4(eventObject); sprite->data[2] = 1; return TRUE; } -bool8 sub_809647C(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_809647C(struct EventObject *eventObject, struct Sprite *sprite) { - sub_8098044(mapObject->warpArrowSpriteId); + sub_8098044(eventObject->warpArrowSpriteId); sprite->pos2.y = 0; sprite->data[2] = 1; return TRUE; } -bool8 sub_8096494(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_8096494(struct EventObject *eventObject, struct Sprite *sprite) { if (sprite->pos2.y == 0) { - sub_8098044(mapObject->warpArrowSpriteId); + sub_8098044(eventObject->warpArrowSpriteId); sprite->data[2] = 1; return TRUE; } return FALSE; } -u8 sub_80964B8(struct MapObject *mapObject, struct Sprite *sprite) +u8 sub_80964B8(struct EventObject *eventObject, struct Sprite *sprite) { return TRUE; } -bool8 sub_80964BC(struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80964BC(struct EventObject *eventObject, struct Sprite *sprite) { sprite->animPaused = TRUE; return TRUE; } -void npc_obj_transfer_image_anim_pause_flag(struct MapObject *mapObject, struct Sprite *sprite) +void npc_obj_transfer_image_anim_pause_flag(struct EventObject *eventObject, struct Sprite *sprite) { - if (mapObject->disableAnim) + if (eventObject->disableAnim) { sprite->animPaused = TRUE; } } -void sub_80964E8(struct MapObject *mapObject, struct Sprite *sprite) +void sub_80964E8(struct EventObject *eventObject, struct Sprite *sprite) { - if (mapObject->enableAnim) + if (eventObject->enableAnim) { sprite->animPaused = FALSE; - mapObject->disableAnim = FALSE; - mapObject->enableAnim = FALSE; + eventObject->disableAnim = FALSE; + eventObject->enableAnim = FALSE; } } -static void sub_8096518(struct MapObject *mapObject, struct Sprite *sprite) +static void sub_8096518(struct EventObject *eventObject, struct Sprite *sprite) { - sub_8096530(mapObject, sprite); - npc_update_obj_anim_flag(mapObject, sprite); + sub_8096530(eventObject, sprite); + npc_update_obj_anim_flag(eventObject, sprite); } -static void sub_8096530(struct MapObject *mapObject, struct Sprite *sprite) +static void sub_8096530(struct EventObject *eventObject, struct Sprite *sprite) { u16 x; u16 y; u16 x2; u16 y2; - const struct MapObjectGraphicsInfo *graphicsInfo; + const struct EventObjectGraphicsInfo *graphicsInfo; - mapObject->offScreen = FALSE; - graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId); + eventObject->offScreen = FALSE; + graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); if (sprite->coordOffsetEnabled) { x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX; @@ -5988,26 +5986,26 @@ static void sub_8096530(struct MapObject *mapObject, struct Sprite *sprite) y2 += graphicsInfo->height; if ((s16)x >= 0x100 || (s16)x2 < -0x10) { - mapObject->offScreen = TRUE; + eventObject->offScreen = TRUE; } if ((s16)y >= 0xB0 || (s16)y2 < -0x10) { - mapObject->offScreen = TRUE; + eventObject->offScreen = TRUE; } } -static void npc_update_obj_anim_flag(struct MapObject *mapObject, struct Sprite *sprite) +static void npc_update_obj_anim_flag(struct EventObject *eventObject, struct Sprite *sprite) { sprite->invisible = FALSE; - if (mapObject->invisible || mapObject->offScreen) + if (eventObject->invisible || eventObject->offScreen) { sprite->invisible = TRUE; } } -/*static*/ void GetAllGroundEffectFlags_OnSpawn(struct MapObject *eventObj, u32 *flags) +/*static*/ void GetAllGroundEffectFlags_OnSpawn(struct EventObject *eventObj, u32 *flags) { - FieldObjectUpdateMetatileBehaviors(eventObj); + EventObjectUpdateMetatileBehaviors(eventObj); GetGroundEffectFlags_Reflection(eventObj, flags); GetGroundEffectFlags_TallGrassOnSpawn(eventObj, flags); GetGroundEffectFlags_LongGrassOnSpawn(eventObj, flags); @@ -6017,9 +6015,9 @@ static void npc_update_obj_anim_flag(struct MapObject *mapObject, struct Sprite GetGroundEffectFlags_HotSprings(eventObj, flags); } -static void GetAllGroundEffectFlags_OnBeginStep(struct MapObject *eventObj, u32 *flags) +static void GetAllGroundEffectFlags_OnBeginStep(struct EventObject *eventObj, u32 *flags) { - FieldObjectUpdateMetatileBehaviors(eventObj); + EventObjectUpdateMetatileBehaviors(eventObj); GetGroundEffectFlags_Reflection(eventObj, flags); GetGroundEffectFlags_TallGrassOnBeginStep(eventObj, flags); GetGroundEffectFlags_LongGrassOnBeginStep(eventObj, flags); @@ -6031,9 +6029,9 @@ static void GetAllGroundEffectFlags_OnBeginStep(struct MapObject *eventObj, u32 GetGroundEffectFlags_HotSprings(eventObj, flags); } -/*static*/ void GetAllGroundEffectFlags_OnFinishStep(struct MapObject *eventObj, u32 *flags) +/*static*/ void GetAllGroundEffectFlags_OnFinishStep(struct EventObject *eventObj, u32 *flags) { - FieldObjectUpdateMetatileBehaviors(eventObj); + EventObjectUpdateMetatileBehaviors(eventObj); GetGroundEffectFlags_ShallowFlowingWater(eventObj, flags); GetGroundEffectFlags_SandHeap(eventObj, flags); GetGroundEffectFlags_Puddle(eventObj, flags); @@ -6044,16 +6042,16 @@ static void GetAllGroundEffectFlags_OnBeginStep(struct MapObject *eventObj, u32 GetGroundEffectFlags_JumpLanding(eventObj, flags); } -static void FieldObjectUpdateMetatileBehaviors(struct MapObject *eventObj) +static void EventObjectUpdateMetatileBehaviors(struct EventObject *eventObj) { eventObj->previousMetatileBehavior = MapGridGetMetatileBehaviorAt(eventObj->previousCoords.x, eventObj->previousCoords.y); eventObj->currentMetatileBehavior = MapGridGetMetatileBehaviorAt(eventObj->currentCoords.x, eventObj->currentCoords.y); } -static void GetGroundEffectFlags_Reflection(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Reflection(struct EventObject *eventObj, u32 *flags) { u32 reflectionFlags[2] = { GROUND_EFFECT_FLAG_REFLECTION, GROUND_EFFECT_FLAG_ICE_REFLECTION }; - u8 type = FieldObjectCheckForReflectiveSurface(eventObj); + u8 type = EventObjectCheckForReflectiveSurface(eventObj); if (type) { @@ -6070,31 +6068,31 @@ static void GetGroundEffectFlags_Reflection(struct MapObject *eventObj, u32 *fla } } -static void GetGroundEffectFlags_TallGrassOnSpawn(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_TallGrassOnSpawn(struct EventObject *eventObj, u32 *flags) { if (MetatileBehavior_IsTallGrass(eventObj->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN; } -static void GetGroundEffectFlags_TallGrassOnBeginStep(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_TallGrassOnBeginStep(struct EventObject *eventObj, u32 *flags) { if (MetatileBehavior_IsTallGrass(eventObj->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE; } -static void GetGroundEffectFlags_LongGrassOnSpawn(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_LongGrassOnSpawn(struct EventObject *eventObj, u32 *flags) { if (MetatileBehavior_IsLongGrass(eventObj->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_LONG_GRASS_ON_SPAWN; } -static void GetGroundEffectFlags_LongGrassOnBeginStep(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_LongGrassOnBeginStep(struct EventObject *eventObj, u32 *flags) { if (MetatileBehavior_IsLongGrass(eventObj->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_LONG_GRASS_ON_MOVE; } -static void GetGroundEffectFlags_Tracks(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Tracks(struct EventObject *eventObj, u32 *flags) { if (MetatileBehavior_IsDeepSand(eventObj->previousMetatileBehavior)) { @@ -6107,7 +6105,7 @@ static void GetGroundEffectFlags_Tracks(struct MapObject *eventObj, u32 *flags) } } -static void GetGroundEffectFlags_SandHeap(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_SandHeap(struct EventObject *eventObj, u32 *flags) { if (MetatileBehavior_IsDeepSand(eventObj->currentMetatileBehavior) && MetatileBehavior_IsDeepSand(eventObj->previousMetatileBehavior)) @@ -6125,7 +6123,7 @@ static void GetGroundEffectFlags_SandHeap(struct MapObject *eventObj, u32 *flags } } -static void GetGroundEffectFlags_ShallowFlowingWater(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_ShallowFlowingWater(struct EventObject *eventObj, u32 *flags) { if ((MetatileBehavior_IsShallowFlowingWater(eventObj->currentMetatileBehavior) && MetatileBehavior_IsShallowFlowingWater(eventObj->previousMetatileBehavior)) @@ -6145,7 +6143,7 @@ static void GetGroundEffectFlags_ShallowFlowingWater(struct MapObject *eventObj, } } -static void GetGroundEffectFlags_Puddle(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Puddle(struct EventObject *eventObj, u32 *flags) { if (MetatileBehavior_IsPuddle(eventObj->currentMetatileBehavior) && MetatileBehavior_IsPuddle(eventObj->previousMetatileBehavior)) @@ -6154,13 +6152,13 @@ static void GetGroundEffectFlags_Puddle(struct MapObject *eventObj, u32 *flags) } } -static void GetGroundEffectFlags_Ripple(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Ripple(struct EventObject *eventObj, u32 *flags) { if (MetatileBehavior_HasRipples(eventObj->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_RIPPLES; } -static void GetGroundEffectFlags_ShortGrass(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_ShortGrass(struct EventObject *eventObj, u32 *flags) { if (MetatileBehavior_IsShortGrass(eventObj->currentMetatileBehavior) && MetatileBehavior_IsShortGrass(eventObj->previousMetatileBehavior)) @@ -6178,7 +6176,7 @@ static void GetGroundEffectFlags_ShortGrass(struct MapObject *eventObj, u32 *fla } } -static void GetGroundEffectFlags_HotSprings(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_HotSprings(struct EventObject *eventObj, u32 *flags) { if (MetatileBehavior_IsHotSprings(eventObj->currentMetatileBehavior) && MetatileBehavior_IsHotSprings(eventObj->previousMetatileBehavior)) @@ -6196,13 +6194,13 @@ static void GetGroundEffectFlags_HotSprings(struct MapObject *eventObj, u32 *fla } } -static void GetGroundEffectFlags_Seaweed(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Seaweed(struct EventObject *eventObj, u32 *flags) { if (MetatileBehavior_IsSeaweed(eventObj->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_SEAWEED; } -static void GetGroundEffectFlags_JumpLanding(struct MapObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_JumpLanding(struct EventObject *eventObj, u32 *flags) { typedef bool8 (*MetatileFunc)(u8); @@ -6239,9 +6237,9 @@ static void GetGroundEffectFlags_JumpLanding(struct MapObject *eventObj, u32 *fl } } -static u8 FieldObjectCheckForReflectiveSurface(struct MapObject *eventObj) +static u8 EventObjectCheckForReflectiveSurface(struct EventObject *eventObj) { - const struct MapObjectGraphicsInfo *info = GetFieldObjectGraphicsInfo(eventObj->graphicsId); + const struct EventObjectGraphicsInfo *info = GetEventObjectGraphicsInfo(eventObj->graphicsId); // ceil div by tile width? s16 width = (info->width + 8) >> 4; @@ -6311,7 +6309,7 @@ u8 GetLedgeJumpDirection(s16 x, s16 y, u8 z) return 0; } -void FieldObjectSetSpriteOamTableForLongGrass(struct MapObject *eventObj, struct Sprite *sprite) +void EventObjectSetSpriteOamTableForLongGrass(struct EventObject *eventObj, struct Sprite *sprite) { if (eventObj->disableCoveringGroundEffects) return; @@ -6364,12 +6362,12 @@ static const u8 sEventObjectPriorities_08376070[] = { 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 0, 0, 1, }; -void FieldObjectUpdateZCoordAndPriority(struct MapObject *eventObj, struct Sprite *sprite) +void EventObjectUpdateZCoordAndPriority(struct EventObject *eventObj, struct Sprite *sprite) { if (eventObj->fixedPriority) return; - FieldObjectUpdateZCoord(eventObj); + EventObjectUpdateZCoord(eventObj); sprite->subspriteTableNum = sEventObjectPriorities_08376070[eventObj->previousElevation]; sprite->oam.priority = sEventObjectPriorities_08376060[eventObj->previousElevation]; @@ -6386,7 +6384,7 @@ u8 ZCoordToPriority(u8 z) return sEventObjectPriorities_08376060[z]; } -void FieldObjectUpdateZCoord(struct MapObject *eventObj) +void EventObjectUpdateZCoord(struct EventObject *eventObj) { u8 z = MapGridGetZCoordAt(eventObj->currentCoords.x, eventObj->currentCoords.y); u8 z2 = MapGridGetZCoordAt(eventObj->previousCoords.x, eventObj->previousCoords.y); @@ -6410,7 +6408,7 @@ void SetObjectSubpriorityByZCoord(u8 a, struct Sprite *sprite, u8 b) sprite->subpriority = tmp3 + sUnknown_08376050[a] + b; } -static void FieldObjectUpdateSubpriority(struct MapObject *eventObj, struct Sprite *sprite) +static void EventObjectUpdateSubpriority(struct EventObject *eventObj, struct Sprite *sprite) { if (eventObj->fixedPriority) return; @@ -6429,7 +6427,7 @@ bool8 AreZCoordsCompatible(u8 a, u8 b) return TRUE; } -void GroundEffect_SpawnOnTallGrass(struct MapObject *eventObj, struct Sprite *sprite) +void GroundEffect_SpawnOnTallGrass(struct EventObject *eventObj, struct Sprite *sprite) { gFieldEffectArguments[0] = eventObj->currentCoords.x; gFieldEffectArguments[1] = eventObj->currentCoords.y; @@ -6442,7 +6440,7 @@ void GroundEffect_SpawnOnTallGrass(struct MapObject *eventObj, struct Sprite *sp FieldEffectStart(FLDEFF_TALL_GRASS); } -void GroundEffect_StepOnTallGrass(struct MapObject *eventObj, struct Sprite *sprite) +void GroundEffect_StepOnTallGrass(struct EventObject *eventObj, struct Sprite *sprite) { gFieldEffectArguments[0] = eventObj->currentCoords.x; gFieldEffectArguments[1] = eventObj->currentCoords.y; @@ -6455,7 +6453,7 @@ void GroundEffect_StepOnTallGrass(struct MapObject *eventObj, struct Sprite *spr FieldEffectStart(FLDEFF_TALL_GRASS); } -void GroundEffect_SpawnOnLongGrass(struct MapObject *eventObj, struct Sprite *sprite) +void GroundEffect_SpawnOnLongGrass(struct EventObject *eventObj, struct Sprite *sprite) { gFieldEffectArguments[0] = eventObj->currentCoords.x; gFieldEffectArguments[1] = eventObj->currentCoords.y; @@ -6468,7 +6466,7 @@ void GroundEffect_SpawnOnLongGrass(struct MapObject *eventObj, struct Sprite *sp FieldEffectStart(FLDEFF_LONG_GRASS); } -void GroundEffect_StepOnLongGrass(struct MapObject *eventObj, struct Sprite *sprite) +void GroundEffect_StepOnLongGrass(struct EventObject *eventObj, struct Sprite *sprite) { gFieldEffectArguments[0] = eventObj->currentCoords.x; gFieldEffectArguments[1] = eventObj->currentCoords.y; @@ -6481,44 +6479,44 @@ void GroundEffect_StepOnLongGrass(struct MapObject *eventObj, struct Sprite *spr FieldEffectStart(FLDEFF_LONG_GRASS); } -void GroundEffect_WaterReflection(struct MapObject *eventObj, struct Sprite *sprite) +void GroundEffect_WaterReflection(struct EventObject *eventObj, struct Sprite *sprite) { SetUpReflection(eventObj, sprite, 0); } -void GroundEffect_IceReflection(struct MapObject *eventObj, struct Sprite *sprite) +void GroundEffect_IceReflection(struct EventObject *eventObj, struct Sprite *sprite) { SetUpReflection(eventObj, sprite, 1); } -void GroundEffect_FlowingWater(struct MapObject *eventObj, struct Sprite *sprite) +void GroundEffect_FlowingWater(struct EventObject *eventObj, struct Sprite *sprite) { StartFieldEffectForEventObject(FLDEFF_FEET_IN_FLOWING_WATER, eventObj); } -static void (*const sGroundEffectTracksFuncs[])(struct MapObject *eventObj, struct Sprite *sprite, u8 a) = { +static void (*const sGroundEffectTracksFuncs[])(struct EventObject *eventObj, struct Sprite *sprite, u8 a) = { DoTracksGroundEffect_None, DoTracksGroundEffect_Footprints, DoTracksGroundEffect_BikeTireTracks, }; -void GroundEffect_SandTracks(struct MapObject *eventObj, struct Sprite *sprite) +void GroundEffect_SandTracks(struct EventObject *eventObj, struct Sprite *sprite) { - const struct MapObjectGraphicsInfo *info = GetFieldObjectGraphicsInfo(eventObj->graphicsId); + const struct EventObjectGraphicsInfo *info = GetEventObjectGraphicsInfo(eventObj->graphicsId); sGroundEffectTracksFuncs[info->tracks](eventObj, sprite, 0); } -void GroundEffect_DeepSandTracks(struct MapObject *eventObj, struct Sprite *sprite) +void GroundEffect_DeepSandTracks(struct EventObject *eventObj, struct Sprite *sprite) { - const struct MapObjectGraphicsInfo *info = GetFieldObjectGraphicsInfo(eventObj->graphicsId); + const struct EventObjectGraphicsInfo *info = GetEventObjectGraphicsInfo(eventObj->graphicsId); sGroundEffectTracksFuncs[info->tracks](eventObj, sprite, 1); } -static void DoTracksGroundEffect_None(struct MapObject *eventObj, struct Sprite *sprite, u8 a) +static void DoTracksGroundEffect_None(struct EventObject *eventObj, struct Sprite *sprite, u8 a) { } -static void DoTracksGroundEffect_Footprints(struct MapObject *eventObj, struct Sprite *sprite, u8 a) +static void DoTracksGroundEffect_Footprints(struct EventObject *eventObj, struct Sprite *sprite, u8 a) { // First half-word is a Field Effect script id. (gFieldEffectScriptPointers) u16 sandFootprints_FieldEffectData[2] = { @@ -6534,7 +6532,7 @@ static void DoTracksGroundEffect_Footprints(struct MapObject *eventObj, struct S FieldEffectStart(sandFootprints_FieldEffectData[a]); } -static void DoTracksGroundEffect_BikeTireTracks(struct MapObject *eventObj, struct Sprite *sprite, u8 a) +static void DoTracksGroundEffect_BikeTireTracks(struct EventObject *eventObj, struct Sprite *sprite, u8 a) { // Specifies which bike track shape to show next. // For example, when the bike turns from up to right, it will show @@ -6561,22 +6559,22 @@ static void DoTracksGroundEffect_BikeTireTracks(struct MapObject *eventObj, stru } } -void GroundEffect_Ripple(struct MapObject *eventObj, struct Sprite *sprite) +void GroundEffect_Ripple(struct EventObject *eventObj, struct Sprite *sprite) { DoRippleFieldEffect(eventObj, sprite); } -void GroundEffect_StepOnPuddle(struct MapObject *eventObj, struct Sprite *sprite) +void GroundEffect_StepOnPuddle(struct EventObject *eventObj, struct Sprite *sprite) { StartFieldEffectForEventObject(FLDEFF_SPLASH, eventObj); } -void GroundEffect_SandHeap(struct MapObject *eventObj, struct Sprite *sprite) +void GroundEffect_SandHeap(struct EventObject *eventObj, struct Sprite *sprite) { StartFieldEffectForEventObject(FLDEFF_SAND_PILE, eventObj); } -void GroundEffect_JumpOnTallGrass(struct MapObject *eventObj, struct Sprite *sprite) +void GroundEffect_JumpOnTallGrass(struct EventObject *eventObj, struct Sprite *sprite) { u8 spriteId; @@ -6593,7 +6591,7 @@ void GroundEffect_JumpOnTallGrass(struct MapObject *eventObj, struct Sprite *spr GroundEffect_SpawnOnTallGrass(eventObj, sprite); } -void GroundEffect_JumpOnLongGrass(struct MapObject *eventObj, struct Sprite *sprite) +void GroundEffect_JumpOnLongGrass(struct EventObject *eventObj, struct Sprite *sprite) { gFieldEffectArguments[0] = eventObj->currentCoords.x; gFieldEffectArguments[1] = eventObj->currentCoords.y; @@ -6602,7 +6600,7 @@ void GroundEffect_JumpOnLongGrass(struct MapObject *eventObj, struct Sprite *spr FieldEffectStart(FLDEFF_JUMP_LONG_GRASS); } -void GroundEffect_JumpOnShallowWater(struct MapObject *eventObj, struct Sprite *sprite) +void GroundEffect_JumpOnShallowWater(struct EventObject *eventObj, struct Sprite *sprite) { gFieldEffectArguments[0] = eventObj->currentCoords.x; gFieldEffectArguments[1] = eventObj->currentCoords.y; @@ -6611,7 +6609,7 @@ void GroundEffect_JumpOnShallowWater(struct MapObject *eventObj, struct Sprite * FieldEffectStart(FLDEFF_JUMP_SMALL_SPLASH); } -void GroundEffect_JumpOnWater(struct MapObject *eventObj, struct Sprite *sprite) +void GroundEffect_JumpOnWater(struct EventObject *eventObj, struct Sprite *sprite) { gFieldEffectArguments[0] = eventObj->currentCoords.x; gFieldEffectArguments[1] = eventObj->currentCoords.y; @@ -6620,7 +6618,7 @@ void GroundEffect_JumpOnWater(struct MapObject *eventObj, struct Sprite *sprite) FieldEffectStart(FLDEFF_JUMP_BIG_SPLASH); } -void GroundEffect_JumpLandingDust(struct MapObject *eventObj, struct Sprite *sprite) +void GroundEffect_JumpLandingDust(struct EventObject *eventObj, struct Sprite *sprite) { gFieldEffectArguments[0] = eventObj->currentCoords.x; gFieldEffectArguments[1] = eventObj->currentCoords.y; @@ -6629,24 +6627,24 @@ void GroundEffect_JumpLandingDust(struct MapObject *eventObj, struct Sprite *spr FieldEffectStart(FLDEFF_DUST); } -void GroundEffect_ShortGrass(struct MapObject *eventObj, struct Sprite *sprite) +void GroundEffect_ShortGrass(struct EventObject *eventObj, struct Sprite *sprite) { StartFieldEffectForEventObject(FLDEFF_SHORT_GRASS, eventObj); } -void GroundEffect_HotSprings(struct MapObject *eventObj, struct Sprite *sprite) +void GroundEffect_HotSprings(struct EventObject *eventObj, struct Sprite *sprite) { StartFieldEffectForEventObject(FLDEFF_HOT_SPRINGS_WATER, eventObj); } -void GroundEffect_Seaweed(struct MapObject *eventObj, struct Sprite *sprite) +void GroundEffect_Seaweed(struct EventObject *eventObj, struct Sprite *sprite) { gFieldEffectArguments[0] = eventObj->currentCoords.x; gFieldEffectArguments[1] = eventObj->currentCoords.y; FieldEffectStart(FLDEFF_BUBBLES); } -static void (*const sGroundEffectFuncs[])(struct MapObject *eventObj, struct Sprite *sprite) = { +static void (*const sGroundEffectFuncs[])(struct EventObject *eventObj, struct Sprite *sprite) = { GroundEffect_SpawnOnTallGrass, GroundEffect_StepOnTallGrass, GroundEffect_SpawnOnLongGrass, @@ -6669,11 +6667,11 @@ static void (*const sGroundEffectFuncs[])(struct MapObject *eventObj, struct Spr GroundEffect_Seaweed }; -/*static*/ void DoFlaggedGroundEffects(struct MapObject *eventObj, struct Sprite *sprite, u32 flags) +/*static*/ void DoFlaggedGroundEffects(struct EventObject *eventObj, struct Sprite *sprite, u32 flags) { u8 i; - if (FieldObjectIsFarawayIslandMew(eventObj) == TRUE && !sub_81D4A58(eventObj)) + if (EventObjectIsFarawayIslandMew(eventObj) == TRUE && !sub_81D4A58(eventObj)) return; for (i = 0; i < ARRAY_COUNT(sGroundEffectFuncs); i++, flags >>= 1) @@ -6681,7 +6679,7 @@ static void (*const sGroundEffectFuncs[])(struct MapObject *eventObj, struct Spr sGroundEffectFuncs[i](eventObj, sprite); } -void filters_out_some_ground_effects(struct MapObject *eventObj, u32 *flags) +void filters_out_some_ground_effects(struct EventObject *eventObj, u32 *flags) { if (eventObj->disableCoveringGroundEffects) { @@ -6697,38 +6695,38 @@ void filters_out_some_ground_effects(struct MapObject *eventObj, u32 *flags) } } -void FilterOutStepOnPuddleGroundEffectIfJumping(struct MapObject *eventObj, u32 *flags) +void FilterOutStepOnPuddleGroundEffectIfJumping(struct EventObject *eventObj, u32 *flags) { if (eventObj->landingJump) *flags &= ~GROUND_EFFECT_FLAG_PUDDLE; } -static void DoGroundEffects_OnSpawn(struct MapObject *eventObj, struct Sprite *sprite) +static void DoGroundEffects_OnSpawn(struct EventObject *eventObj, struct Sprite *sprite) { u32 flags; if (eventObj->triggerGroundEffectsOnMove) { flags = 0; - FieldObjectUpdateZCoordAndPriority(eventObj, sprite); + EventObjectUpdateZCoordAndPriority(eventObj, sprite); GetAllGroundEffectFlags_OnSpawn(eventObj, &flags); - FieldObjectSetSpriteOamTableForLongGrass(eventObj, sprite); + EventObjectSetSpriteOamTableForLongGrass(eventObj, sprite); DoFlaggedGroundEffects(eventObj, sprite, flags); eventObj->triggerGroundEffectsOnMove = 0; eventObj->disableCoveringGroundEffects = 0; } } -static void DoGroundEffects_OnBeginStep(struct MapObject *eventObj, struct Sprite *sprite) +static void DoGroundEffects_OnBeginStep(struct EventObject *eventObj, struct Sprite *sprite) { u32 flags; if (eventObj->triggerGroundEffectsOnMove) { flags = 0; - FieldObjectUpdateZCoordAndPriority(eventObj, sprite); + EventObjectUpdateZCoordAndPriority(eventObj, sprite); GetAllGroundEffectFlags_OnBeginStep(eventObj, &flags); - FieldObjectSetSpriteOamTableForLongGrass(eventObj, sprite); + EventObjectSetSpriteOamTableForLongGrass(eventObj, sprite); filters_out_some_ground_effects(eventObj, &flags); DoFlaggedGroundEffects(eventObj, sprite, flags); eventObj->triggerGroundEffectsOnMove = 0; @@ -6736,16 +6734,16 @@ static void DoGroundEffects_OnBeginStep(struct MapObject *eventObj, struct Sprit } } -static void DoGroundEffects_OnFinishStep(struct MapObject *eventObj, struct Sprite *sprite) +static void DoGroundEffects_OnFinishStep(struct EventObject *eventObj, struct Sprite *sprite) { u32 flags; if (eventObj->triggerGroundEffectsOnStop) { flags = 0; - FieldObjectUpdateZCoordAndPriority(eventObj, sprite); + EventObjectUpdateZCoordAndPriority(eventObj, sprite); GetAllGroundEffectFlags_OnFinishStep(eventObj, &flags); - FieldObjectSetSpriteOamTableForLongGrass(eventObj, sprite); + EventObjectSetSpriteOamTableForLongGrass(eventObj, sprite); FilterOutStepOnPuddleGroundEffectIfJumping(eventObj, &flags); DoFlaggedGroundEffects(eventObj, sprite, flags); eventObj->triggerGroundEffectsOnStop = 0; @@ -6753,55 +6751,55 @@ static void DoGroundEffects_OnFinishStep(struct MapObject *eventObj, struct Spri } } -bool8 FreezeMapObject(struct MapObject *mapObject) +bool8 FreezeEventObject(struct EventObject *eventObject) { - if (mapObject->heldMovementActive || mapObject->frozen) + if (eventObject->heldMovementActive || eventObject->frozen) { return TRUE; } else { - mapObject->frozen = 1; - mapObject->spriteAnimPausedBackup = gSprites[mapObject->spriteId].animPaused; - mapObject->spriteAffineAnimPausedBackup = gSprites[mapObject->spriteId].affineAnimPaused; - gSprites[mapObject->spriteId].animPaused = 1; - gSprites[mapObject->spriteId].affineAnimPaused = 1; + eventObject->frozen = 1; + eventObject->spriteAnimPausedBackup = gSprites[eventObject->spriteId].animPaused; + eventObject->spriteAffineAnimPausedBackup = gSprites[eventObject->spriteId].affineAnimPaused; + gSprites[eventObject->spriteId].animPaused = 1; + gSprites[eventObject->spriteId].affineAnimPaused = 1; return FALSE; } } -void FreezeMapObjects(void) +void FreezeEventObjects(void) { u8 i; - for (i = 0; i < MAP_OBJECTS_COUNT; i++) - if (gMapObjects[i].active && i != gPlayerAvatar.mapObjectId) - FreezeMapObject(&gMapObjects[i]); + for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + if (gEventObjects[i].active && i != gPlayerAvatar.eventObjectId) + FreezeEventObject(&gEventObjects[i]); } -void FreezeMapObjectsExceptOne(u8 a1) +void FreezeEventObjectsExceptOne(u8 a1) { u8 i; - for (i = 0; i < MAP_OBJECTS_COUNT; i++) - if (i != a1 && gMapObjects[i].active && i != gPlayerAvatar.mapObjectId) - FreezeMapObject(&gMapObjects[i]); + for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + if (i != a1 && gEventObjects[i].active && i != gPlayerAvatar.eventObjectId) + FreezeEventObject(&gEventObjects[i]); } -void npc_sync_anim_pause_bits(struct MapObject *mapObject) +void npc_sync_anim_pause_bits(struct EventObject *eventObject) { - if (mapObject->active && mapObject->frozen) + if (eventObject->active && eventObject->frozen) { - mapObject->frozen = 0; - gSprites[mapObject->spriteId].animPaused = mapObject->spriteAnimPausedBackup; - gSprites[mapObject->spriteId].affineAnimPaused = mapObject->spriteAffineAnimPausedBackup; + eventObject->frozen = 0; + gSprites[eventObject->spriteId].animPaused = eventObject->spriteAnimPausedBackup; + gSprites[eventObject->spriteId].affineAnimPaused = eventObject->spriteAffineAnimPausedBackup; } } -void UnfreezeMapObjects(void) +void UnfreezeEventObjects(void) { u8 i; - for (i = 0; i < MAP_OBJECTS_COUNT; i++) - if (gMapObjects[i].active) - npc_sync_anim_pause_bits(&gMapObjects[i]); + for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + if (gEventObjects[i].active) + npc_sync_anim_pause_bits(&gEventObjects[i]); } void little_step(struct Sprite *sprite, u8 dir) @@ -7126,12 +7124,12 @@ u8 sub_80978E4(struct Sprite *sprite) return v2; } -void SetFieldObjectStepTimer(struct Sprite *sprite, s16 timer) +void SetEventObjectStepTimer(struct Sprite *sprite, s16 timer) { sprite->data[3] = timer; } -bool8 RunFieldObjectStepTimer(struct Sprite *sprite) +bool8 RunEventObjectStepTimer(struct Sprite *sprite) { sprite->data[3]--; @@ -7220,7 +7218,7 @@ void sub_8097B78(u8 var1, u8 var2) u8 spriteId = sub_8097B2C(var1); if(spriteId != MAX_SPRITES) - StartSpriteAnim(&gSprites[spriteId], FieldObjectDirectionToImageAnimId(var2)); + StartSpriteAnim(&gSprites[spriteId], EventObjectDirectionToImageAnimId(var2)); } void sub_8097BB4(u8 var1, u8 var2) @@ -7230,7 +7228,7 @@ void sub_8097BB4(u8 var1, u8 var2) if(spriteId != MAX_SPRITES) { struct Sprite *sprite = &gSprites[spriteId]; - const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(var2); + const struct EventObjectGraphicsInfo *gfxInfo = GetEventObjectGraphicsInfo(var2); u16 tileNum = sprite->oam.tileNum; sprite->oam = *gfxInfo->oam; @@ -7354,24 +7352,24 @@ bool32 sub_8097D9C(u8 var) return FALSE; } -u32 StartFieldEffectForEventObject(u8 fieldEffectId, struct MapObject *mapObject) +u32 StartFieldEffectForEventObject(u8 fieldEffectId, struct EventObject *eventObject) { - FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); return FieldEffectStart(fieldEffectId); } -void DoShadowFieldEffect(struct MapObject *mapObject) +void DoShadowFieldEffect(struct EventObject *eventObject) { - if (!mapObject->hasShadow) + if (!eventObject->hasShadow) { - mapObject->hasShadow = 1; - StartFieldEffectForEventObject(FLDEFF_SHADOW, mapObject); + eventObject->hasShadow = 1; + StartFieldEffectForEventObject(FLDEFF_SHADOW, eventObject); } } -static void DoRippleFieldEffect(struct MapObject *mapObject, struct Sprite *sprite) +static void DoRippleFieldEffect(struct EventObject *eventObject, struct Sprite *sprite) { - const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId); + const struct EventObjectGraphicsInfo *gfxInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); gFieldEffectArguments[0] = sprite->pos1.x; gFieldEffectArguments[1] = sprite->pos1.y + (gfxInfo->height >> 1) - 2; gFieldEffectArguments[2] = 151; @@ -7379,36 +7377,36 @@ static void DoRippleFieldEffect(struct MapObject *mapObject, struct Sprite *spri FieldEffectStart(FLDEFF_RIPPLE); } -u8 (*const gUnknown_0850E854[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E854[])(struct EventObject *, struct Sprite *) = { sub_8097E50, sub_80964B8, }; -u8 (*const gUnknown_0850E85C[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E85C[])(struct EventObject *, struct Sprite *) = { sub_8097EF0, sub_80964B8, }; -u8 (*const gUnknown_0850E864[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E864[])(struct EventObject *, struct Sprite *) = { sub_80980C0, sub_80980D0, sub_8098124, }; -u8 (*const gUnknown_0850E870[])(struct MapObject *, struct Sprite *) = { +u8 (*const gUnknown_0850E870[])(struct EventObject *, struct Sprite *) = { sub_80980F4, sub_8098108, sub_8098124, }; -u8 sub_8097E50(struct MapObject *mapObject, struct Sprite *sprite) +u8 sub_8097E50(struct EventObject *eventObject, struct Sprite *sprite) { u32 one; bool32 ableToStore = FALSE; if (gUnknown_020375B8 == NULL) { gUnknown_020375B8 = AllocZeroed(0x14); - gUnknown_020375B8[0] = mapObject->localId; + gUnknown_020375B8[0] = eventObject->localId; // needed to match gUnknown_020375B8[16] = (one = 1); ableToStore = one; @@ -7423,7 +7421,7 @@ u8 sub_8097E50(struct MapObject *mapObject, struct Sprite *sprite) if (firstFreeSlot == 16 && gUnknown_020375B8[i] == 0) firstFreeSlot = i; - if (gUnknown_020375B8[i] == mapObject->localId) + if (gUnknown_020375B8[i] == eventObject->localId) { found = TRUE; break; @@ -7432,7 +7430,7 @@ u8 sub_8097E50(struct MapObject *mapObject, struct Sprite *sprite) if (!found && firstFreeSlot != 16) { - gUnknown_020375B8[firstFreeSlot] = mapObject->localId; + gUnknown_020375B8[firstFreeSlot] = eventObject->localId; gUnknown_020375B8[16]++; ableToStore = TRUE; } @@ -7440,15 +7438,15 @@ u8 sub_8097E50(struct MapObject *mapObject, struct Sprite *sprite) if (ableToStore == TRUE) { - mapObject->inanimate = TRUE; - mapObject->facingDirectionLocked = TRUE; + eventObject->inanimate = TRUE; + eventObject->facingDirectionLocked = TRUE; } sprite->data[2] = 1; return TRUE; } -u8 sub_8097EF0(struct MapObject *mapObject, struct Sprite *sprite) +u8 sub_8097EF0(struct EventObject *eventObject, struct Sprite *sprite) { bool32 ableToStore; u8 id; @@ -7457,7 +7455,7 @@ u8 sub_8097EF0(struct MapObject *mapObject, struct Sprite *sprite) if (gUnknown_020375B8 != NULL) { ableToStore = FALSE; - id = sub_8097F78(mapObject); + id = sub_8097F78(eventObject); if (id != 16) { gUnknown_020375B8[id] = 0; @@ -7468,8 +7466,8 @@ u8 sub_8097EF0(struct MapObject *mapObject, struct Sprite *sprite) FREE_AND_SET_NULL(gUnknown_020375B8); if (ableToStore == TRUE) { - mapObject->inanimate = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->inanimate; - mapObject->facingDirectionLocked = 0; + eventObject->inanimate = GetEventObjectGraphicsInfo(eventObject->graphicsId)->inanimate; + eventObject->facingDirectionLocked = 0; sprite->animPaused = 0; } } @@ -7477,36 +7475,36 @@ u8 sub_8097EF0(struct MapObject *mapObject, struct Sprite *sprite) return TRUE; } -u8 sub_8097F78(struct MapObject *mapObject) +u8 sub_8097F78(struct EventObject *eventObject) { u8 i; - for(i = 0; i < MAP_OBJECTS_COUNT; i++) + for(i = 0; i < EVENT_OBJECTS_COUNT; i++) { - if(gUnknown_020375B8[i] == mapObject->localId) + if(gUnknown_020375B8[i] == eventObject->localId) return i; } - return MAP_OBJECTS_COUNT; + return EVENT_OBJECTS_COUNT; } -void sub_8097FA4(struct MapObject *mapObject) +void sub_8097FA4(struct EventObject *eventObject) { u8 taskId = CreateTask(sub_8097FE4, 0xFF); struct Task *task = &gTasks[taskId]; - StoreWordInTwoHalfwords(&task->data[0], (u32)mapObject); - mapObject->warpArrowSpriteId = taskId; + StoreWordInTwoHalfwords(&task->data[0], (u32)eventObject); + eventObject->warpArrowSpriteId = taskId; task->data[3] = 0xFFFF; } static void sub_8097FE4(u8 taskId) { - struct MapObject *mapObject; + struct EventObject *eventObject; struct Sprite *sprite; struct Task *task = &gTasks[taskId]; - LoadWordFromTwoHalfwords(&task->data[0], (u32 *)&mapObject); // load the map object pointer. - sprite = &gSprites[mapObject->spriteId]; + LoadWordFromTwoHalfwords(&task->data[0], (u32 *)&eventObject); // load the map object pointer. + sprite = &gSprites[eventObject->spriteId]; if(!(task->data[2] & 0x3)) sprite->pos2.y += task->data[3]; @@ -7530,22 +7528,22 @@ void sub_8098074(u8 var1, u8 var2) { u8 i; - for(i = 0; i < MAP_OBJECTS_COUNT; i++) + for(i = 0; i < EVENT_OBJECTS_COUNT; i++) { if(i != var1 && i != var2 && - gMapObjects[i].active && i != gPlayerAvatar.mapObjectId) - FreezeMapObject(&gMapObjects[i]); + gEventObjects[i].active && i != gPlayerAvatar.eventObjectId) + FreezeEventObject(&gEventObjects[i]); } } -u8 sub_80980C0(struct MapObject *mapObject, struct Sprite *sprite) +u8 sub_80980C0(struct EventObject *eventObject, struct Sprite *sprite) { sprite->pos2.y = 0; sprite->data[2]++; return FALSE; } -u8 sub_80980D0(struct MapObject *mapObject, struct Sprite *sprite) +u8 sub_80980D0(struct EventObject *eventObject, struct Sprite *sprite) { sprite->pos2.y -= 8; @@ -7554,14 +7552,14 @@ u8 sub_80980D0(struct MapObject *mapObject, struct Sprite *sprite) return FALSE; } -u8 sub_80980F4(struct MapObject *mapObject, struct Sprite *sprite) +u8 sub_80980F4(struct EventObject *eventObject, struct Sprite *sprite) { sprite->pos2.y = -160; sprite->data[2]++; return FALSE; } -u8 sub_8098108(struct MapObject *mapObject, struct Sprite *sprite) +u8 sub_8098108(struct EventObject *eventObject, struct Sprite *sprite) { sprite->pos2.y += 8; @@ -7571,7 +7569,7 @@ u8 sub_8098108(struct MapObject *mapObject, struct Sprite *sprite) } // though this function returns TRUE without doing anything, this header is required due to being in an array of functions which needs it. -u8 sub_8098124(struct MapObject *mapObject, struct Sprite *sprite) +u8 sub_8098124(struct EventObject *eventObject, struct Sprite *sprite) { return TRUE; } diff --git a/src/field_camera.c b/src/field_camera.c index b937f704b8..f4d9550a30 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -406,7 +406,7 @@ void CameraUpdate(void) if (deltaX != 0 || deltaY != 0) { CameraMove(deltaX, deltaY); - UpdateFieldObjectsForCameraUpdate(deltaX, deltaY); + UpdateEventObjectsForCameraUpdate(deltaX, deltaY); RotatingGatePuzzleCameraUpdate(deltaX, deltaY); ResetBerryTreeSparkleFlags(); tilemap_move_something(&gUnknown_03000E20, deltaX * 2, deltaY * 2); @@ -421,7 +421,7 @@ void CameraUpdate(void) void camera_move_and_redraw(int a, int b) //unused { CameraMove(a, b); - UpdateFieldObjectsForCameraUpdate(a, b); + UpdateEventObjectsForCameraUpdate(a, b); DrawWholeMapView(); gUnknown_03005DEC -= a * 16; gUnknown_03005DE8 -= b * 16; diff --git a/src/field_effect.c b/src/field_effect.c index 71bce8f412..4ad3bd9164 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -48,12 +48,12 @@ const u32 gNewGameBirchPic[] = INCBIN_U32("graphics/birch_speech/birch.4bpp"); const u32 gUnusedBirchBeauty[] = INCBIN_U32("graphics/unused/intro_birch_beauty.4bpp"); const u16 gNewGameBirchPalette[16] = INCBIN_U16("graphics/birch_speech/birch.gbapal"); const u32 gSpriteImage_855A970[] = INCBIN_U32("graphics/misc/pokeball_glow.4bpp"); -const u16 gFieldEffectObjectPalette4[16] = INCBIN_U16("graphics/map_objects/palettes/field_effect_object_palette_04.gbapal"); +const u16 gFieldEffectObjectPalette4[16] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_04.gbapal"); const u32 gSpriteImage_855A9B0[] = INCBIN_U32("graphics/misc/pokecenter_monitor/0.4bpp"); const u32 gSpriteImage_855AA70[] = INCBIN_U32("graphics/misc/pokecenter_monitor/1.4bpp"); const u32 gSpriteImage_855AB30[] = INCBIN_U32("graphics/misc/big_hof_monitor.4bpp"); const u8 gSpriteImage_855AD30[] = INCBIN_U8("graphics/misc/small_hof_monitor.4bpp"); -const u16 gFieldEffectObjectPalette5[16] = INCBIN_U16("graphics/map_objects/palettes/field_effect_object_palette_05.gbapal"); +const u16 gFieldEffectObjectPalette5[16] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_05.gbapal"); // Graphics for the lights streaking past your Pokemon when it uses a field move. const u32 gFieldMoveStreaksTiles[] = INCBIN_U32("graphics/misc/field_move_streaks.4bpp"); @@ -286,7 +286,7 @@ bool8 (*const gUnknown_0855C3FC[])(struct Task *) = { sub_80B72F4, }; -bool8 (*const gUnknown_0855C418[])(struct Task *, struct MapObject *) = { +bool8 (*const gUnknown_0855C418[])(struct Task *, struct EventObject *) = { sub_80B73D0, waterfall_1_do_anim_probably, waterfall_2_wait_anim_finish_probably, @@ -300,7 +300,7 @@ bool8 (*const gUnknown_0855C42C[])(struct Task *) = { dive_3_unknown, }; -bool8 (*const gUnknown_0855C438[])(struct Task *, struct MapObject *, struct Sprite *) = { +bool8 (*const gUnknown_0855C438[])(struct Task *, struct EventObject *, struct Sprite *) = { sub_80B764C, sub_80B7684, sub_80B76B8, @@ -309,14 +309,14 @@ bool8 (*const gUnknown_0855C438[])(struct Task *, struct MapObject *, struct Spr sub_80B7814, }; -bool8 (*const gUnknown_0855C450[])(struct Task *, struct MapObject *, struct Sprite *) = { +bool8 (*const gUnknown_0855C450[])(struct Task *, struct EventObject *, struct Sprite *) = { sub_80B78EC, sub_80B791C, sub_80B7968, sub_80B79BC, }; -bool8 (*const gUnknown_0855C460[])(struct Task *, struct MapObject *, struct Sprite *) = { +bool8 (*const gUnknown_0855C460[])(struct Task *, struct EventObject *, struct Sprite *) = { sub_80B7AE8, sub_80B7B18, sub_80B7B94, @@ -1147,7 +1147,7 @@ void mapldr_080842E8(void) pal_fill_black(); CreateTask(task00_8084310, 0); ScriptContext2_Enable(); - FreezeMapObjects(); + FreezeEventObjects(); gFieldCallback = NULL; } @@ -1184,13 +1184,13 @@ void mapldr_08084390(void) Overworld_PlaySpecialMapMusic(); pal_fill_black(); CreateTask(c3_080843F8, 0); - gMapObjects[gPlayerAvatar.mapObjectId].invisible = 1; + gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1; if (gPlayerAvatar.flags & 0x08) { - FieldObjectTurn(&gMapObjects[gPlayerAvatar.mapObjectId], DIR_WEST); + EventObjectTurn(&gEventObjects[gPlayerAvatar.eventObjectId], DIR_WEST); } ScriptContext2_Enable(); - FreezeMapObjects(); + FreezeEventObjects(); gFieldCallback = NULL; } @@ -1210,7 +1210,7 @@ void c3_080843F8(u8 taskId) if (!FieldEffectActiveListContains(FLDEFF_FLY_IN)) { ScriptContext2_Disable(); - UnfreezeMapObjects(); + UnfreezeEventObjects(); DestroyTask(taskId); } } @@ -1225,7 +1225,7 @@ void sub_80B6B68(void) Overworld_PlaySpecialMapMusic(); pal_fill_for_maplights(); ScriptContext2_Enable(); - FreezeMapObjects(); + FreezeEventObjects(); CreateTask(sub_80B6B94, 0); gFieldCallback = NULL; } @@ -1239,14 +1239,14 @@ void sub_80B6B94(u8 taskId) bool8 sub_80B6BCC(struct Task *task) // gUnknown_0855C3C8[0] { - struct MapObject *playerObject; + struct EventObject *playerObject; struct Sprite *playerSprite; - playerObject = &gMapObjects[gPlayerAvatar.mapObjectId]; + playerObject = &gEventObjects[gPlayerAvatar.eventObjectId]; playerSprite = &gSprites[gPlayerAvatar.spriteId]; CameraObjectReset2(); - gMapObjects[gPlayerAvatar.mapObjectId].invisible = 1; + gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1; gPlayerAvatar.preventStep = TRUE; - FieldObjectSetSpecialAnim(playerObject, GetFaceDirectionAnimId(player_get_direction_lower_nybble())); + EventObjectSetSpecialAnim(playerObject, GetFaceDirectionAnimId(player_get_direction_lower_nybble())); task->data[4] = playerSprite->subspriteMode; playerObject->fixedPriority = 1; playerSprite->oam.priority = 1; @@ -1273,7 +1273,7 @@ bool8 sub_80B6C90(struct Task *task) // gUnknown_0855C3C8[2] sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY); task->data[1] = 1; task->data[2] = 0; - gMapObjects[gPlayerAvatar.mapObjectId].invisible = 0; + gEventObjects[gPlayerAvatar.eventObjectId].invisible = 0; PlaySE(SE_RU_HYUU); task->data[0]++; return FALSE; @@ -1281,10 +1281,10 @@ bool8 sub_80B6C90(struct Task *task) // gUnknown_0855C3C8[2] bool8 sub_80B6D04(struct Task *task) { - struct MapObject *mapObject; + struct EventObject *eventObject; struct Sprite *sprite; - mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; + eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; sprite = &gSprites[gPlayerAvatar.spriteId]; sprite->pos2.y += task->data[1]; if (task->data[1] < 8) @@ -1298,15 +1298,15 @@ bool8 sub_80B6D04(struct Task *task) if (task->data[3] == 0 && sprite->pos2.y >= -16) { task->data[3]++; - mapObject->fixedPriority = 0; + eventObject->fixedPriority = 0; sprite->subspriteMode = task->data[4]; - mapObject->triggerGroundEffectsOnMove = 1; + eventObject->triggerGroundEffectsOnMove = 1; } if (sprite->pos2.y >= 0) { PlaySE(SE_W070); - mapObject->triggerGroundEffectsOnStop = 1; - mapObject->landingJump = 1; + eventObject->triggerGroundEffectsOnStop = 1; + eventObject->landingJump = 1; sprite->pos2.y = 0; task->data[0]++; } @@ -1343,7 +1343,7 @@ bool8 sub_80B6E18(struct Task *task) gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); CameraObjectReset1(); - UnfreezeMapObjects(); + UnfreezeEventObjects(); InstallCameraPanAheadCallback(); DestroyTask(FindTaskIdByFunc(sub_80B6B94)); return FALSE; @@ -1382,7 +1382,7 @@ void sub_80B6E88(u8 taskId) bool8 sub_80B6EC0(struct Task *task) { - FreezeMapObjects(); + FreezeEventObjects(); CameraObjectReset2(); sub_80E1558(task->data[1]); task->data[0]++; @@ -1391,11 +1391,11 @@ bool8 sub_80B6EC0(struct Task *task) bool8 sub_80B6EE0(struct Task *task) { - struct MapObject *mapObject; - mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) || FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + struct EventObject *eventObject; + eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + if (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(eventObject) || EventObjectClearAnimIfSpecialAnimFinished(eventObject)) { - FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(player_get_direction_lower_nybble())); + EventObjectSetSpecialAnim(eventObject, GetFaceDirectionAnimId(player_get_direction_lower_nybble())); task->data[0]++; task->data[2] = 0; task->data[3] = 0; @@ -1506,13 +1506,13 @@ void sub_80B70DC(u8 taskId) bool8 sub_80B7114(struct Task *task) { - struct MapObject *mapObject; + struct EventObject *eventObject; s16 x; s16 y; u8 behavior; CameraObjectReset2(); - mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(DIR_EAST)); + eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + EventObjectSetSpecialAnim(eventObject, GetFaceDirectionAnimId(DIR_EAST)); PlayerGetDestCoords(&x, &y); behavior = MapGridGetMetatileBehaviorAt(x, y); task->data[0]++; @@ -1604,13 +1604,13 @@ bool8 sub_80B72D0(struct Task *task) bool8 sub_80B72F4(struct Task *task) { - struct MapObject *mapObject; - mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + struct EventObject *eventObject; + eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + if (EventObjectClearAnimIfSpecialAnimFinished(eventObject)) { CameraObjectReset1(); ScriptContext2_Disable(); - FieldObjectSetSpecialAnim(mapObject, GetGoSpeed0AnimId(DIR_EAST)); + EventObjectSetSpecialAnim(eventObject, GetGoSpeed0AnimId(DIR_EAST)); DestroyTask(FindTaskIdByFunc(sub_80B70DC)); } return FALSE; @@ -1629,10 +1629,10 @@ bool8 FldEff_UseWaterfall(void) void sub_80B7384(u8 taskId) { - while (gUnknown_0855C418[gTasks[taskId].data[0]](&gTasks[taskId], &gMapObjects[gPlayerAvatar.mapObjectId])); + while (gUnknown_0855C418[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId])); } -bool8 sub_80B73D0(struct Task *task, struct MapObject *mapObject) +bool8 sub_80B73D0(struct Task *task, struct EventObject *eventObject) { ScriptContext2_Enable(); gPlayerAvatar.preventStep = TRUE; @@ -1640,12 +1640,12 @@ bool8 sub_80B73D0(struct Task *task, struct MapObject *mapObject) return FALSE; } -bool8 waterfall_1_do_anim_probably(struct Task *task, struct MapObject *mapObject) +bool8 waterfall_1_do_anim_probably(struct Task *task, struct EventObject *eventObject) { ScriptContext2_Enable(); - if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject)) + if (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(eventObject)) { - FieldObjectClearAnimIfSpecialAnimFinished(mapObject); + EventObjectClearAnimIfSpecialAnimFinished(eventObject); gFieldEffectArguments[0] = task->data[1]; FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); task->data[0]++; @@ -1653,7 +1653,7 @@ bool8 waterfall_1_do_anim_probably(struct Task *task, struct MapObject *mapObjec return FALSE; } -bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct MapObject *mapObject) +bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct EventObject *eventObject) { if (FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { @@ -1663,20 +1663,20 @@ bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct MapObject return TRUE; } -bool8 sub_80B7450(struct Task *task, struct MapObject *mapObject) +bool8 sub_80B7450(struct Task *task, struct EventObject *eventObject) { - FieldObjectSetSpecialAnim(mapObject, GetSimpleGoAnimId(DIR_NORTH)); + EventObjectSetSpecialAnim(eventObject, GetSimpleGoAnimId(DIR_NORTH)); task->data[0]++; return FALSE; } -bool8 sub_80B7478(struct Task *task, struct MapObject *mapObject) +bool8 sub_80B7478(struct Task *task, struct EventObject *eventObject) { - if (!FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + if (!EventObjectClearAnimIfSpecialAnimFinished(eventObject)) { return FALSE; } - if (MetatileBehavior_IsWaterfall(mapObject->currentMetatileBehavior)) + if (MetatileBehavior_IsWaterfall(eventObject->currentMetatileBehavior)) { task->data[0] = 3; return TRUE; @@ -1728,7 +1728,7 @@ bool8 dive_3_unknown(struct Task *task) PlayerGetDestCoords(&mapPosition.x, &mapPosition.y); if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { - dive_warp(&mapPosition, gMapObjects[gPlayerAvatar.mapObjectId].currentMetatileBehavior); + dive_warp(&mapPosition, gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior); DestroyTask(FindTaskIdByFunc(Task_Dive)); FieldEffectActiveListRemove(FLDEFF_USE_DIVE); } @@ -1745,22 +1745,22 @@ void sub_80B75D8(u8 priority) void sub_80B75F0(u8 taskId) { - while (gUnknown_0855C438[gTasks[taskId].data[0]](&gTasks[taskId], &gMapObjects[gPlayerAvatar.mapObjectId], &gSprites[gPlayerAvatar.spriteId])); + while (gUnknown_0855C438[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId])); } -bool8 sub_80B764C(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80B764C(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) { - FreezeMapObjects(); + FreezeEventObjects(); CameraObjectReset2(); SetCameraPanningCallback(NULL); gPlayerAvatar.preventStep = TRUE; - mapObject->fixedPriority = 1; + eventObject->fixedPriority = 1; task->data[1] = 1; task->data[0]++; return TRUE; } -bool8 sub_80B7684(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80B7684(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) { SetCameraPanning(0, task->data[1]); task->data[1] = -task->data[1]; @@ -1773,12 +1773,12 @@ bool8 sub_80B7684(struct Task *task, struct MapObject *mapObject, struct Sprite return FALSE; } -bool8 sub_80B76B8(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80B76B8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) { sprite->pos2.y = 0; task->data[3] = 1; - gFieldEffectArguments[0] = mapObject->currentCoords.x; - gFieldEffectArguments[1] = mapObject->currentCoords.y; + gFieldEffectArguments[0] = eventObject->currentCoords.x; + gFieldEffectArguments[1] = eventObject->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_LAVARIDGE_GYM_WARP); @@ -1787,7 +1787,7 @@ bool8 sub_80B76B8(struct Task *task, struct MapObject *mapObject, struct Sprite return TRUE; } -bool8 sub_80B7704(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80B7704(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) { s16 centerToCornerVecY; SetCameraPanning(0, task->data[1]); @@ -1819,7 +1819,7 @@ bool8 sub_80B7704(struct Task *task, struct MapObject *mapObject, struct Sprite if (task->data[5] == 0 && sprite->pos2.y < -0x10) { task->data[5]++; - mapObject->fixedPriority = 1; + eventObject->fixedPriority = 1; sprite->oam.priority = 1; sprite->subspriteMode = 2; } @@ -1830,7 +1830,7 @@ bool8 sub_80B7704(struct Task *task, struct MapObject *mapObject, struct Sprite return FALSE; } -bool8 sub_80B77F8(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80B77F8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) { music_something(); sub_80AF0B4(); @@ -1838,7 +1838,7 @@ bool8 sub_80B77F8(struct Task *task, struct MapObject *mapObject, struct Sprite return FALSE; } -bool8 sub_80B7814(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80B7814(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) { if (!gPaletteFade.active && sub_80859A0() == TRUE) { @@ -1863,25 +1863,25 @@ void mapldr_080851BC(void) void sub_80B7890(u8 taskId) { - while (gUnknown_0855C450[gTasks[taskId].data[0]](&gTasks[taskId], &gMapObjects[gPlayerAvatar.mapObjectId], &gSprites[gPlayerAvatar.spriteId])); + while (gUnknown_0855C450[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId])); } -bool8 sub_80B78EC(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80B78EC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) { CameraObjectReset2(); - FreezeMapObjects(); + FreezeEventObjects(); gPlayerAvatar.preventStep = TRUE; - mapObject->invisible = 1; + eventObject->invisible = 1; task->data[0]++; return FALSE; } -bool8 sub_80B791C(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80B791C(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) { if (IsWeatherNotFadingIn()) { - gFieldEffectArguments[0] = mapObject->currentCoords.x; - gFieldEffectArguments[1] = mapObject->currentCoords.y; + gFieldEffectArguments[0] = eventObject->currentCoords.x; + gFieldEffectArguments[1] = eventObject->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH); @@ -1890,27 +1890,27 @@ bool8 sub_80B791C(struct Task *task, struct MapObject *mapObject, struct Sprite return FALSE; } -bool8 sub_80B7968(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80B7968(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) { sprite = &gSprites[task->data[1]]; if (sprite->animCmdIndex > 1) { task->data[0]++; - mapObject->invisible = 0; + eventObject->invisible = 0; CameraObjectReset1(); PlaySE(SE_W091); - FieldObjectSetSpecialAnim(mapObject, sub_8093514(DIR_EAST)); + EventObjectSetSpecialAnim(eventObject, sub_8093514(DIR_EAST)); } return FALSE; } -bool8 sub_80B79BC(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80B79BC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) { - if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + if (EventObjectClearAnimIfSpecialAnimFinished(eventObject)) { gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); - UnfreezeMapObjects(); + UnfreezeEventObjects(); DestroyTask(FindTaskIdByFunc(sub_80B7890)); } return FALSE; @@ -1945,27 +1945,27 @@ void sub_80B7A74(u8 priority) void sub_80B7A8C(u8 taskId) { - while(gUnknown_0855C460[gTasks[taskId].data[0]](&gTasks[taskId], &gMapObjects[gPlayerAvatar.mapObjectId], &gSprites[gPlayerAvatar.spriteId])); + while(gUnknown_0855C460[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId])); } -bool8 sub_80B7AE8(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80B7AE8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) { - FreezeMapObjects(); + FreezeEventObjects(); CameraObjectReset2(); gPlayerAvatar.preventStep = TRUE; - mapObject->fixedPriority = 1; + eventObject->fixedPriority = 1; task->data[0]++; return FALSE; } -bool8 sub_80B7B18(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80B7B18(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) { - if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + if (EventObjectClearAnimIfSpecialAnimFinished(eventObject)) { if (task->data[1] > 3) { - gFieldEffectArguments[0] = mapObject->currentCoords.x; - gFieldEffectArguments[1] = mapObject->currentCoords.y; + gFieldEffectArguments[0] = eventObject->currentCoords.x; + gFieldEffectArguments[1] = eventObject->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH); @@ -1973,24 +1973,24 @@ bool8 sub_80B7B18(struct Task *task, struct MapObject *mapObject, struct Sprite } else { task->data[1]++; - FieldObjectSetSpecialAnim(mapObject, GetStepInPlaceDelay4AnimId(mapObject->facingDirection)); + EventObjectSetSpecialAnim(eventObject, GetStepInPlaceDelay4AnimId(eventObject->facingDirection)); PlaySE(SE_FU_ZUZUZU); } } return FALSE; } -bool8 sub_80B7B94(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80B7B94(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) { if (gSprites[task->data[1]].animCmdIndex == 2) { - mapObject->invisible = 1; + eventObject->invisible = 1; task->data[0]++; } return FALSE; } -bool8 sub_80B7BCC(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80B7BCC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) { if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) { @@ -2004,7 +2004,7 @@ bool8 sub_80B7BCC(struct Task *task, struct MapObject *mapObject, struct Sprite void sub_80B7CE4(u8); void mapldr_080859D4(void); -bool8 sub_80B7BF4(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite) +bool8 sub_80B7BF4(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) { if (!gPaletteFade.active && sub_80859A0() == TRUE) { @@ -2037,7 +2037,7 @@ void sub_80B7CAC(struct Sprite *sprite) void sub_80B7CC8(void) { ScriptContext2_Enable(); - FreezeMapObjects(); + FreezeEventObjects(); CreateTask(sub_80B7CE4, 0x50); } @@ -2055,19 +2055,19 @@ void sub_80B7D14(struct Task *task) void sub_80B7D34(struct Task *task) { - struct MapObject *mapObject; + struct EventObject *eventObject; u8 spinDirections[5] = {1, 3, 4, 2, 1}; if (task->data[14] != 0 && (--task->data[14]) == 0) { music_something(); sub_80AF0B4(); } - mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) || FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + if (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(eventObject) || EventObjectClearAnimIfSpecialAnimFinished(eventObject)) { if (task->data[14] == 0 && !gPaletteFade.active && sub_80859A0() == TRUE) { - FieldObjectSetDirection(mapObject, task->data[15]); + EventObjectSetDirection(eventObject, task->data[15]); sub_8084E14(); warp_in(); gFieldCallback = mapldr_080859D4; @@ -2075,7 +2075,7 @@ void sub_80B7D34(struct Task *task) DestroyTask(FindTaskIdByFunc(sub_80B7CE4)); } else if (task->data[1] == 0 || (--task->data[1]) == 0) { - FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(spinDirections[mapObject->facingDirection])); + EventObjectSetSpecialAnim(eventObject, GetFaceDirectionAnimId(spinDirections[eventObject->facingDirection])); if (task->data[2] < 12) { task->data[2]++; @@ -2097,9 +2097,9 @@ void mapldr_080859D4(void) Overworld_PlaySpecialMapMusic(); pal_fill_for_maplights(); ScriptContext2_Enable(); - FreezeMapObjects(); + FreezeEventObjects(); gFieldCallback = NULL; - gMapObjects[gPlayerAvatar.mapObjectId].invisible = 1; + gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1; CreateTask(sub_80B7E94, 0); } @@ -2120,29 +2120,29 @@ void sub_80B7EC4(struct Task *task) void sub_80B7EE8(struct Task *task) { u8 spinDirections[5] = {1, 3, 4, 2, 1}; - struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; + struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; if (task->data[1] == 0 || (--task->data[1]) == 0) { - if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) && !FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + if (EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(eventObject) && !EventObjectClearAnimIfSpecialAnimFinished(eventObject)) { return; } if (task->data[2] >= 32 && task->data[15] == player_get_direction_lower_nybble()) { - mapObject->invisible = 0; + eventObject->invisible = 0; ScriptContext2_Disable(); - UnfreezeMapObjects(); + UnfreezeEventObjects(); DestroyTask(FindTaskIdByFunc(sub_80B7E94)); return; } - FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(spinDirections[mapObject->facingDirection])); + EventObjectSetSpecialAnim(eventObject, GetFaceDirectionAnimId(spinDirections[eventObject->facingDirection])); if (task->data[2] < 32) { task->data[2]++; } task->data[1] = task->data[2] >> 2; } - mapObject->invisible ^= 1; + eventObject->invisible ^= 1; } static void ExecuteTeleportFieldEffectTask(u8); @@ -2172,7 +2172,7 @@ static void ExecuteTeleportFieldEffectTask(u8 taskId) static void TeleportFieldEffectTask1(struct Task *task) { ScriptContext2_Enable(); - FreezeMapObjects(); + FreezeEventObjects(); CameraObjectReset2(); task->data[15] = player_get_direction_lower_nybble(); task->data[0]++; @@ -2181,14 +2181,14 @@ static void TeleportFieldEffectTask1(struct Task *task) static void TeleportFieldEffectTask2(struct Task *task) { u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; - struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; + struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; if (task->data[1] == 0 || (--task->data[1]) == 0) { - FieldObjectTurn(mapObject, spinDirections[mapObject->facingDirection]); + EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]); task->data[1] = 8; task->data[2]++; } - if (task->data[2] > 7 && task->data[15] == mapObject->facingDirection) + if (task->data[2] > 7 && task->data[15] == eventObject->facingDirection) { task->data[0]++; task->data[1] = 4; @@ -2201,12 +2201,12 @@ static void TeleportFieldEffectTask2(struct Task *task) static void TeleportFieldEffectTask3(struct Task *task) { u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; - struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; + struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; struct Sprite *sprite = &gSprites[gPlayerAvatar.spriteId]; if ((--task->data[1]) <= 0) { task->data[1] = 4; - FieldObjectTurn(mapObject, spinDirections[mapObject->facingDirection]); + EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]); } sprite->pos1.y -= task->data[3]; task->data[4] += task->data[3]; @@ -2254,9 +2254,9 @@ static void mapldr_08085D88(void) Overworld_PlaySpecialMapMusic(); pal_fill_for_maplights(); ScriptContext2_Enable(); - FreezeMapObjects(); + FreezeEventObjects(); gFieldCallback = NULL; - gMapObjects[gPlayerAvatar.mapObjectId].invisible = 1; + gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1; CameraObjectReset2(); CreateTask(sub_80B8250, 0); } @@ -2281,7 +2281,7 @@ void sub_80B8280(struct Task *task) sprite = &gSprites[gPlayerAvatar.spriteId]; centerToCornerVecY = -(sprite->centerToCornerVecY << 1); sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY); - gMapObjects[gPlayerAvatar.mapObjectId].invisible = 0; + gEventObjects[gPlayerAvatar.eventObjectId].invisible = 0; task->data[0]++; task->data[1] = 8; task->data[2] = 1; @@ -2294,14 +2294,14 @@ void sub_80B8280(struct Task *task) void sub_80B830C(struct Task *task) { u8 spinDirections[5] = {1, 3, 4, 2, 1}; - struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; + struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; struct Sprite *sprite = &gSprites[gPlayerAvatar.spriteId]; if ((sprite->pos2.y += task->data[1]) >= -8) { if (task->data[13] == 0) { task->data[13]++; - mapObject->triggerGroundEffectsOnMove = 1; + eventObject->triggerGroundEffectsOnMove = 1; sprite->subspriteMode = task->data[14]; } } else @@ -2319,7 +2319,7 @@ void sub_80B830C(struct Task *task) if ((--task->data[2]) == 0) { task->data[2] = 4; - FieldObjectTurn(mapObject, spinDirections[mapObject->facingDirection]); + EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]); } if (sprite->pos2.y >= 0) { @@ -2333,16 +2333,16 @@ void sub_80B830C(struct Task *task) void sub_80B8410(struct Task *task) { u8 spinDirections[5] = {1, 3, 4, 2, 1}; - struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; + struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; if ((--task->data[1]) == 0) { - FieldObjectTurn(mapObject, spinDirections[mapObject->facingDirection]); + EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]); task->data[1] = 8; - if ((++task->data[2]) > 4 && task->data[14] == mapObject->facingDirection) + if ((++task->data[2]) > 4 && task->data[14] == eventObject->facingDirection) { ScriptContext2_Disable(); CameraObjectReset1(); - UnfreezeMapObjects(); + UnfreezeEventObjects(); DestroyTask(FindTaskIdByFunc(sub_80B8250)); } } @@ -2892,31 +2892,31 @@ void sub_80B8D84(u8 taskId) void sub_80B8DB4(struct Task *task) { ScriptContext2_Enable(); - FreezeMapObjects(); + FreezeEventObjects(); gPlayerAvatar.preventStep = TRUE; SetPlayerAvatarStateMask(8); PlayerGetDestCoords(&task->data[1], &task->data[2]); - MoveCoords(gMapObjects[gPlayerAvatar.mapObjectId].movementDirection, &task->data[1], &task->data[2]); + MoveCoords(gEventObjects[gPlayerAvatar.eventObjectId].movementDirection, &task->data[1], &task->data[2]); task->data[0]++; } void sub_80B8E14(struct Task *task) { - struct MapObject *mapObject; - mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) || FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + struct EventObject *eventObject; + eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + if (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(eventObject) || EventObjectClearAnimIfSpecialAnimFinished(eventObject)) { sub_808C114(); - FieldObjectSetSpecialAnim(mapObject, 0x39); + EventObjectSetSpecialAnim(eventObject, 0x39); task->data[0]++; } } void sub_80B8E60(struct Task *task) { - struct MapObject *mapObject; - mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(mapObject)) + struct EventObject *eventObject; + eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + if (EventObjectCheckIfSpecialAnimFinishedOrInactive(eventObject)) { gFieldEffectArguments[0] = task->data[15] | 0x80000000; FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); @@ -2926,32 +2926,32 @@ void sub_80B8E60(struct Task *task) void sub_80B8EA8(struct Task *task) { - struct MapObject *mapObject; + struct EventObject *eventObject; if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { - mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - FieldObjectSetGraphicsId(mapObject, GetPlayerAvatarGraphicsIdByStateId(3)); - FieldObjectClearAnimIfSpecialAnimFinished(mapObject); - FieldObjectSetSpecialAnim(mapObject, sub_8093540(mapObject->movementDirection)); + eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(3)); + EventObjectClearAnimIfSpecialAnimFinished(eventObject); + EventObjectSetSpecialAnim(eventObject, sub_8093540(eventObject->movementDirection)); gFieldEffectArguments[0] = task->data[1]; gFieldEffectArguments[1] = task->data[2]; - gFieldEffectArguments[2] = gPlayerAvatar.mapObjectId; - mapObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_SURF_BLOB); + gFieldEffectArguments[2] = gPlayerAvatar.eventObjectId; + eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_SURF_BLOB); task->data[0]++; } } void sub_80B8F24(struct Task *task) { - struct MapObject *mapObject; - mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + struct EventObject *eventObject; + eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + if (EventObjectClearAnimIfSpecialAnimFinished(eventObject)) { gPlayerAvatar.preventStep = FALSE; gPlayerAvatar.flags &= 0xdf; - FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(mapObject->movementDirection)); - sub_81555AC(mapObject->fieldEffectSpriteId, 1); - UnfreezeMapObjects(); + EventObjectSetSpecialAnim(eventObject, GetFaceDirectionAnimId(eventObject->movementDirection)); + sub_81555AC(eventObject->fieldEffectSpriteId, 1); + UnfreezeEventObjects(); ScriptContext2_Disable(); FieldEffectActiveListRemove(FLDEFF_USE_SURF); DestroyTask(FindTaskIdByFunc(sub_80B8D84)); @@ -3204,24 +3204,24 @@ void sub_80B91D4(u8 taskId) void sub_80B9204(struct Task *task) { - struct MapObject *mapObject; - mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) || FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + struct EventObject *eventObject; + eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + if (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(eventObject) || EventObjectClearAnimIfSpecialAnimFinished(eventObject)) { task->data[15] = gPlayerAvatar.flags; gPlayerAvatar.preventStep = TRUE; SetPlayerAvatarStateMask(1); sub_808C114(); - FieldObjectSetSpecialAnim(mapObject, 0x39); + EventObjectSetSpecialAnim(eventObject, 0x39); task->data[0]++; } } void sub_80B925C(struct Task *task) { - struct MapObject *mapObject; - mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + struct EventObject *eventObject; + eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + if (EventObjectClearAnimIfSpecialAnimFinished(eventObject)) { task->data[0]++; gFieldEffectArguments[0] = task->data[1]; @@ -3231,14 +3231,14 @@ void sub_80B925C(struct Task *task) void sub_80B92A0(struct Task *task) { - struct MapObject *mapObject; + struct EventObject *eventObject; if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { - mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; + eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; if (task->data[15] & 0x08) { - sub_81555AC(mapObject->fieldEffectSpriteId, 2); - sub_81555D8(mapObject->fieldEffectSpriteId, 0); + sub_81555AC(eventObject->fieldEffectSpriteId, 2); + sub_81555D8(eventObject->fieldEffectSpriteId, 0); } task->data[1] = sub_80B94C4(); task->data[0]++; @@ -3252,15 +3252,15 @@ void sub_80B92F8(struct Task *task) task->data[0]++; task->data[2] = 16; SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT); - FieldObjectSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], 0x02); + EventObjectSetSpecialAnim(&gEventObjects[gPlayerAvatar.eventObjectId], 0x02); } } void sub_80B933C(struct Task *task) { - struct MapObject *mapObject; - mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - if ((task->data[2] == 0 || (--task->data[2]) == 0) && FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + struct EventObject *eventObject; + eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + if ((task->data[2] == 0 || (--task->data[2]) == 0) && EventObjectClearAnimIfSpecialAnimFinished(eventObject)) { task->data[0]++; PlaySE(SE_W019); @@ -3270,17 +3270,17 @@ void sub_80B933C(struct Task *task) void sub_80B9390(struct Task *task) { - struct MapObject *mapObject; + struct EventObject *eventObject; if ((++task->data[2]) >= 8) { - mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - FieldObjectSetGraphicsId(mapObject, GetPlayerAvatarGraphicsIdByStateId(0x03)); - StartSpriteAnim(&gSprites[mapObject->spriteId], 0x16); - mapObject->inanimate = 1; - FieldObjectSetSpecialAnim(mapObject, 0x48); + eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(0x03)); + StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16); + eventObject->inanimate = 1; + EventObjectSetSpecialAnim(eventObject, 0x48); if (task->data[15] & 0x08) { - DestroySprite(&gSprites[mapObject->fieldEffectSpriteId]); + DestroySprite(&gSprites[eventObject->fieldEffectSpriteId]); } task->data[0]++; task->data[2] = 0; @@ -3289,14 +3289,14 @@ void sub_80B9390(struct Task *task) void sub_80B9418(struct Task *task) { - struct MapObject *mapObject; + struct EventObject *eventObject; if ((++task->data[2]) >= 10) { - mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - FieldObjectClearAnimIfSpecialAnimActive(mapObject); - mapObject->inanimate = 0; - mapObject->hasShadow = 0; - sub_80B9560(task->data[1], mapObject->spriteId); + eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + EventObjectClearAnimIfSpecialAnimActive(eventObject); + eventObject->inanimate = 0; + eventObject->hasShadow = 0; + sub_80B9560(task->data[1], eventObject->spriteId); CameraObjectReset2(); task->data[0]++; } @@ -3501,9 +3501,9 @@ void sub_80B97D4(u8 taskId) void sub_80B9804(struct Task *task) { - struct MapObject *mapObject; - mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) || FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + struct EventObject *eventObject; + eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + if (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(eventObject) || EventObjectClearAnimIfSpecialAnimFinished(eventObject)) { task->data[0]++; task->data[2] = 17; @@ -3512,27 +3512,27 @@ void sub_80B9804(struct Task *task) SetPlayerAvatarStateMask(0x01); if (task->data[15] & 0x08) { - sub_81555AC(mapObject->fieldEffectSpriteId, 0); + sub_81555AC(eventObject->fieldEffectSpriteId, 0); } - FieldObjectSetGraphicsId(mapObject, GetPlayerAvatarGraphicsIdByStateId(0x3)); + EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(0x3)); CameraObjectReset2(); - FieldObjectTurn(mapObject, DIR_WEST); - StartSpriteAnim(&gSprites[mapObject->spriteId], 0x16); - mapObject->invisible = 0; + EventObjectTurn(eventObject, DIR_WEST); + StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16); + eventObject->invisible = 0; task->data[1] = sub_80B94C4(); sub_80B9524(task->data[1]); - sub_80B9560(task->data[1], mapObject->spriteId); + sub_80B9560(task->data[1], eventObject->spriteId); } } void sub_80B98B8(struct Task *task) { - struct MapObject *mapObject; + struct EventObject *eventObject; struct Sprite *sprite; if (task->data[2] == 0 || (--task->data[2]) == 0) { - mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - sprite = &gSprites[mapObject->spriteId]; + eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + sprite = &gSprites[eventObject->spriteId]; sub_80B9560(task->data[1], 0x40); sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; @@ -3575,26 +3575,26 @@ void sub_80B9924(struct Task *task) void sub_80B9978(struct Task *task) { - struct MapObject *mapObject; + struct EventObject *eventObject; struct Sprite *sprite; if (sub_80B9508(task->data[1])) { - mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - sprite = &gSprites[mapObject->spriteId]; - mapObject->inanimate = 0; - sub_808EB08(mapObject, mapObject->currentCoords.x, mapObject->currentCoords.y); + eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + sprite = &gSprites[eventObject->spriteId]; + eventObject->inanimate = 0; + sub_808EB08(eventObject, eventObject->currentCoords.x, eventObject->currentCoords.y); sprite->pos2.x = 0; sprite->pos2.y = 0; sprite->coordOffsetEnabled = 1; sub_808C114(); - FieldObjectSetSpecialAnim(mapObject, 0x39); + EventObjectSetSpecialAnim(eventObject, 0x39); task->data[0]++; } } void sub_80B99F0(struct Task *task) { - if (FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[gPlayerAvatar.mapObjectId])) + if (EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[gPlayerAvatar.eventObjectId])) { task->data[0]++; sub_80B9794(task->data[1]); @@ -3614,18 +3614,18 @@ void sub_80B9A28(struct Task *task) void sub_80B9A60(struct Task *task) { u8 state; - struct MapObject *mapObject; + struct EventObject *eventObject; if ((--task->data[1]) == 0) { - mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; + eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; state = 0; if (task->data[15] & 0x08) { state = 3; - sub_81555AC(mapObject->fieldEffectSpriteId, 1); + sub_81555AC(eventObject->fieldEffectSpriteId, 1); } - FieldObjectSetGraphicsId(mapObject, GetPlayerAvatarGraphicsIdByStateId(state)); - FieldObjectTurn(mapObject, DIR_SOUTH); + EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(state)); + EventObjectTurn(eventObject, DIR_SOUTH); gPlayerAvatar.flags = task->data[15]; gPlayerAvatar.preventStep = FALSE; FieldEffectActiveListRemove(FLDEFF_FLY_IN); @@ -3638,11 +3638,11 @@ void sub_80B9BE8(u8 taskId); bool8 sub_80B9ADC(void) { u8 taskId; - u8 mapObjectIdBuffer; - if (!TryGetFieldObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &mapObjectIdBuffer)) + u8 eventObjectIdBuffer; + if (!TryGetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &eventObjectIdBuffer)) { taskId = CreateTask(sub_80B9BE8, 0x50); - gTasks[taskId].data[2] = mapObjectIdBuffer; + gTasks[taskId].data[2] = eventObjectIdBuffer; gTasks[taskId].data[6] = gFieldEffectArguments[0]; gTasks[taskId].data[7] = gFieldEffectArguments[1]; gTasks[taskId].data[8] = gFieldEffectArguments[2]; @@ -3721,8 +3721,8 @@ void sub_80B9C54(s16* data, u8 taskId) { if (++data[3] > 0x78) { - struct Sprite *sprite = &gSprites[gMapObjects[data[2]].spriteId]; - gMapObjects[data[2]].invisible = TRUE; + struct Sprite *sprite = &gSprites[gEventObjects[data[2]].spriteId]; + gEventObjects[data[2]].invisible = TRUE; BlendPalettes(0x0000FFFF, 0x10, RGB_WHITE); BeginNormalPaletteFade(0x0000FFFF, 0, 0x10, 0, RGB_WHITE); sub_80B9D24(sprite); @@ -3738,7 +3738,7 @@ void sub_80B9CDC(s16* a0, u8 taskId) if (!gPaletteFade.active && !FuncIsActiveTask(sub_80B9B3C)) { InstallCameraPanAheadCallback(); - RemoveFieldObjectByLocalIdAndMap(a0[6], a0[7], a0[8]); + RemoveEventObjectByLocalIdAndMap(a0[6], a0[7], a0[8]); FieldEffectActiveListRemove(0x41); DestroyTask(taskId); } @@ -3837,13 +3837,13 @@ void sub_80B9EDC(u8 taskId); bool8 sub_80B9E28(struct Sprite* sprite) { - u8 mapObjectIdBuffer; - if (!TryGetFieldObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &mapObjectIdBuffer)) + u8 eventObjectIdBuffer; + if (!TryGetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &eventObjectIdBuffer)) { - struct MapObject *object; + struct EventObject *object; int xPos, yPos; u8 taskId; - object = &gMapObjects[mapObjectIdBuffer]; + object = &gEventObjects[eventObjectIdBuffer]; xPos = object->currentCoords.x - 7; yPos = object->currentCoords.y - 7; xPos = (gFieldEffectArguments[3] - xPos) * 16; @@ -3854,7 +3854,7 @@ bool8 sub_80B9E28(struct Sprite* sprite) gTasks[taskId].data[2] = gSprites[object->spriteId].pos1.x + xPos; gTasks[taskId].data[3] = gSprites[object->spriteId].pos1.y + yPos; gTasks[taskId].data[8] = gFieldEffectArguments[5]; - gTasks[taskId].data[9] = mapObjectIdBuffer; + gTasks[taskId].data[9] = eventObjectIdBuffer; } return FALSE; } @@ -3883,7 +3883,7 @@ void sub_80B9EDC(u8 taskId) } else { - struct MapObject *object = &gMapObjects[data[9]]; + struct EventObject *object = &gEventObjects[data[9]]; sprite->pos1.x = data[2]; sprite->pos1.y = data[3]; npc_coords_shift_still(object); diff --git a/src/field_special_scene.c b/src/field_special_scene.c index 8a4fb7c694..a5058b3633 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -329,24 +329,24 @@ void Task_HandlePorthole(u8 taskId) void sub_80FB6EC(void) { - u8 spriteId = AddPseudoFieldObject(0x8C, SpriteCallbackDummy, 112, 80, 0); + u8 spriteId = AddPseudoEventObject(0x8C, SpriteCallbackDummy, 112, 80, 0); gSprites[spriteId].coordOffsetEnabled = FALSE; if (VarGet(0x40B4) == 2) { - StartSpriteAnim(&gSprites[spriteId], FieldObjectDirectionToImageAnimId(4)); + StartSpriteAnim(&gSprites[spriteId], EventObjectDirectionToImageAnimId(4)); } else { - StartSpriteAnim(&gSprites[spriteId], FieldObjectDirectionToImageAnimId(3)); + StartSpriteAnim(&gSprites[spriteId], EventObjectDirectionToImageAnimId(3)); } } void sub_80FB768(void) { sub_80FB6EC(); - gMapObjects[gPlayerAvatar.mapObjectId].invisible = TRUE; + gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE; pal_fill_black(); CreateTask(Task_HandlePorthole, 80); ScriptContext2_Enable(); diff --git a/src/fldeff_groundshake.c b/src/fldeff_groundshake.c index 6da529d003..60b078982b 100644 --- a/src/fldeff_groundshake.c +++ b/src/fldeff_groundshake.c @@ -179,17 +179,17 @@ void sub_81BE7F4(void) static void sub_81BE808(u8 taskId) { - u8 mapObjectIdBuffer; - struct MapObject *fieldMapObject; - struct MapObject *playerAvatarMapObject; + u8 eventObjectIdBuffer; + struct EventObject *fieldEventObject; + struct EventObject *playerAvatarEventObject; - TryGetFieldObjectIdByLocalIdAndMap(0x2D, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjectIdBuffer); - fieldMapObject = &(gMapObjects[mapObjectIdBuffer]); - gSprites[fieldMapObject->spriteId].pos2.y += 4; - playerAvatarMapObject = &(gMapObjects[gPlayerAvatar.mapObjectId]); + TryGetEventObjectIdByLocalIdAndMap(0x2D, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &eventObjectIdBuffer); + fieldEventObject = &(gEventObjects[eventObjectIdBuffer]); + gSprites[fieldEventObject->spriteId].pos2.y += 4; + playerAvatarEventObject = &(gEventObjects[gPlayerAvatar.eventObjectId]); - if((gSprites[fieldMapObject->spriteId].pos1.y + gSprites[fieldMapObject->spriteId].pos2.y) >= - (gSprites[playerAvatarMapObject->spriteId].pos1.y + gSprites[playerAvatarMapObject->spriteId].pos2.y)) + if((gSprites[fieldEventObject->spriteId].pos1.y + gSprites[fieldEventObject->spriteId].pos2.y) >= + (gSprites[playerAvatarEventObject->spriteId].pos1.y + gSprites[playerAvatarEventObject->spriteId].pos2.y)) { DestroyTask(taskId); EnableBothScriptContexts(); diff --git a/src/item_menu.c b/src/item_menu.c index 132f39c34d..0642c771e7 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -1716,7 +1716,7 @@ bool8 UseRegisteredKeyItemOnField(void) if (CheckBagHasItem(gSaveBlock1Ptr->registeredItem, 1) == TRUE) { ScriptContext2_Enable(); - FreezeMapObjects(); + FreezeEventObjects(); sub_808B864(); sub_808BCF4(); gSpecialVar_ItemId = gSaveBlock1Ptr->registeredItem; diff --git a/src/item_use.c b/src/item_use.c index 82d96606a5..2044a8c87d 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -579,15 +579,15 @@ u8 sub_80FD9B0(s16 itemX, s16 itemY) void sub_80FDA24(u8 direction) { - FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]); - FieldObjectClearAnim(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]); - npc_sync_anim_pause_bits(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]); + EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]); + EventObjectClearAnim(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]); + npc_sync_anim_pause_bits(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]); PlayerTurnInPlace(direction); } void sub_80FDA94(u8 taskId) { - if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE) + if (EventObjectCheckIfSpecialAnimFinishedOrInactive(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE) DisplayItemMessageOnField(taskId, gText_ItemFinderNearby, sub_80FD5CC); } @@ -595,7 +595,7 @@ void sub_80FDADC(u8 taskId) { s16 *data = gTasks[taskId].data; - if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE + if (EventObjectCheckIfSpecialAnimFinishedOrInactive(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE || data[2] == FALSE) { sub_80FDA24(gUnknown_085920E4[data[5]]); @@ -727,8 +727,8 @@ bool8 sub_80FDE2C(void) u8 objId; GetXYCoordsOneStepInFrontOfPlayer(&x, &y); z = PlayerGetZCoord(); - objId = GetFieldObjectIdByXYZ(x, y, z); - if (objId == 16 || gMapObjects[objId].graphicsId != 0xE4) + objId = GetEventObjectIdByXYZ(x, y, z); + if (objId == 16 || gEventObjects[objId].graphicsId != 0xE4) return FALSE; else return TRUE; diff --git a/src/load_save.c b/src/load_save.c index 917c1dfe19..0c6df76625 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -180,32 +180,32 @@ void LoadPlayerParty(void) gPlayerParty[i] = gSaveBlock1Ptr->playerParty[i]; } -void SaveMapObjects(void) +void SaveEventObjects(void) { int i; - for (i = 0; i < MAP_OBJECTS_COUNT; i++) - gSaveBlock1Ptr->mapObjects[i] = gMapObjects[i]; + for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + gSaveBlock1Ptr->eventObjects[i] = gEventObjects[i]; } -void LoadMapObjects(void) +void LoadEventObjects(void) { int i; - for (i = 0; i < MAP_OBJECTS_COUNT; i++) - gMapObjects[i] = gSaveBlock1Ptr->mapObjects[i]; + for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + gEventObjects[i] = gSaveBlock1Ptr->eventObjects[i]; } void SaveSerializedGame(void) { SavePlayerParty(); - SaveMapObjects(); + SaveEventObjects(); } void LoadSerializedGame(void) { LoadPlayerParty(); - LoadMapObjects(); + LoadEventObjects(); } void LoadPlayerBag(void) diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index 2ce8a271d1..591e3ad9a1 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -2,7 +2,7 @@ #include "main.h" #include "constants/songs.h" #include "constants/easy_chat.h" -#include "constants/map_objects.h" +#include "constants/event_objects.h" #include "constants/vars.h" #include "mauville_old_man.h" #include "event_data.h" @@ -136,7 +136,7 @@ void SetMauvilleOldMan(void) SetupGiddy(); break; } - ScrSpecial_SetMauvilleOldManMapObjGfx(); + ScrSpecial_SetMauvilleOldManEventObjGfx(); } u8 GetCurrentMauvilleOldMan(void) @@ -406,7 +406,7 @@ void ResetMauvilleOldManFlag(void) case MAUVILLE_MAN_GIDDY: break; } - ScrSpecial_SetMauvilleOldManMapObjGfx(); + ScrSpecial_SetMauvilleOldManEventObjGfx(); } @@ -671,9 +671,9 @@ static void Task_BardSong(u8 taskId) sub_8197224(); } -void ScrSpecial_SetMauvilleOldManMapObjGfx(void) +void ScrSpecial_SetMauvilleOldManEventObjGfx(void) { - VarSet(VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_BARD); + VarSet(VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BARD); } // Language fixers? diff --git a/src/naming_screen.c b/src/naming_screen.c index 9ad1a9742a..f99d23bc3d 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -25,7 +25,7 @@ #include "menu.h" #include "text_window.h" #include "overworld.h" -#include "constants/map_objects.h" +#include "constants/event_objects.h" EWRAM_DATA static struct NamingScreenData *gNamingScreenData = NULL; extern u16 gKeyRepeatStartDelay; @@ -1142,7 +1142,7 @@ static void NamingScreen_CreatePlayerIcon(void) u8 spriteId; rivalGfxId = GetRivalAvatarGraphicsIdByStateIdAndGender(0, gNamingScreenData->monSpecies); - spriteId = AddPseudoFieldObject(rivalGfxId, SpriteCallbackDummy, 0x38, 0x25, 0); + spriteId = AddPseudoEventObject(rivalGfxId, SpriteCallbackDummy, 0x38, 0x25, 0); gSprites[spriteId].oam.priority = 3; StartSpriteAnim(&gSprites[spriteId], 4); } @@ -1169,7 +1169,7 @@ static void NamingScreen_CreateWandaDadIcon(void) { u8 spriteId; - spriteId = AddPseudoFieldObject(MAP_OBJ_GFX_MAN_1, SpriteCallbackDummy, 0x38, 0x25, 0); + spriteId = AddPseudoEventObject(EVENT_OBJ_GFX_MAN_1, SpriteCallbackDummy, 0x38, 0x25, 0); gSprites[spriteId].oam.priority = 3; StartSpriteAnim(&gSprites[spriteId], 4); } diff --git a/src/overworld.c b/src/overworld.c index 85bdbc5eab..5b92b80235 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -204,7 +204,7 @@ static void sub_8086C90(void); static void sub_8086FA0(u16); static void sub_8086F38(u16*, s32); static u8 npc_something3(u8 a1, u8 a2); -static u8 LinkPlayerDetectCollision(u8 selfMapObjId, u8 a2, s16 x, s16 y); +static u8 LinkPlayerDetectCollision(u8 selfEventObjId, u8 a2, s16 x, s16 y); static void CreateLinkPlayerSprite(u8 linkPlayerId, u8 gameVersion); static void sub_8087878(u8 linkPlayerId, u16 *x, u16 *y); static u8 sub_80878A0(u8 linkPlayerId); @@ -212,15 +212,15 @@ static u8 sub_80878C0(u8 linkPlayerId); static s32 sub_80878E4(u8 linkPlayerId); static u8 GetLinkPlayerIdAt(s16 x, s16 y); static void sub_808796C(u8 linkPlayerId, u8 a2); -static void ZeroMapObject(struct MapObject *mapObj); -static void SpawnLinkPlayerMapObject(u8 linkPlayerId, s16 x, s16 y, u8 a4); -static void InitLinkPlayerMapObjectPos(struct MapObject *mapObj, s16 x, s16 y); +static void ZeroEventObject(struct EventObject *eventObj); +static void SpawnLinkPlayerEventObject(u8 linkPlayerId, s16 x, s16 y, u8 a4); +static void InitLinkPlayerEventObjectPos(struct EventObject *eventObj, s16 x, s16 y); static void sub_80877DC(u8 linkPlayerId, u8 a2); static void sub_808780C(u8 linkPlayerId); static u8 sub_8087858(u8 linkPlayerId); static void sub_8087584(void); static u32 sub_8087690(void); -static void ZeroLinkPlayerMapObject(struct LinkPlayerMapObject *linkPlayerMapObj); +static void ZeroLinkPlayerEventObject(struct LinkPlayerEventObject *linkPlayerEventObj); static const u8 *sub_80873B4(struct UnkStruct_8054FF8 *a1); static u16 sub_8087480(const u8 *script); static void sub_8087510(void); @@ -267,7 +267,7 @@ EWRAM_DATA static u16 sLastMapSectionId = 0; EWRAM_DATA static struct UnkPlayerStruct sUnknown_02032300 = {0}; EWRAM_DATA static u16 sAmbientCrySpecies = 0; EWRAM_DATA static bool8 sIsAmbientCryWaterMon = FALSE; -EWRAM_DATA struct LinkPlayerMapObject gLinkPlayerMapObjects[4] = {0}; +EWRAM_DATA struct LinkPlayerEventObject gLinkPlayerEventObjects[4] = {0}; // const rom data static const struct WarpData sDummyWarpData = @@ -352,22 +352,22 @@ static const struct ScanlineEffectParams gUnknown_08339DBC = 0, }; -static u8 sub_80879D8(struct LinkPlayerMapObject *, struct MapObject *, u8); -static u8 sub_80879F8(struct LinkPlayerMapObject *, struct MapObject *, u8); -static u8 sub_80879FC(struct LinkPlayerMapObject *, struct MapObject *, u8); +static u8 sub_80879D8(struct LinkPlayerEventObject *, struct EventObject *, u8); +static u8 sub_80879F8(struct LinkPlayerEventObject *, struct EventObject *, u8); +static u8 sub_80879FC(struct LinkPlayerEventObject *, struct EventObject *, u8); -static u8 (*const gUnknown_08339DC8[])(struct LinkPlayerMapObject *, struct MapObject *, u8) = +static u8 (*const gUnknown_08339DC8[])(struct LinkPlayerEventObject *, struct EventObject *, u8) = { sub_80879D8, sub_80879F8, sub_80879FC, }; -static u8 sub_8087A1C(struct LinkPlayerMapObject *, struct MapObject *, u8); -static u8 sub_8087A20(struct LinkPlayerMapObject *, struct MapObject *, u8); -static u8 sub_8087A88(struct LinkPlayerMapObject *, struct MapObject *, u8); +static u8 sub_8087A1C(struct LinkPlayerEventObject *, struct EventObject *, u8); +static u8 sub_8087A20(struct LinkPlayerEventObject *, struct EventObject *, u8); +static u8 sub_8087A88(struct LinkPlayerEventObject *, struct EventObject *, u8); -static u8 (*const gUnknown_08339DD4[])(struct LinkPlayerMapObject *, struct MapObject *, u8) = +static u8 (*const gUnknown_08339DD4[])(struct LinkPlayerEventObject *, struct EventObject *, u8) = { sub_8087A1C, sub_8087A20, @@ -382,10 +382,10 @@ static u8 (*const gUnknown_08339DD4[])(struct LinkPlayerMapObject *, struct MapO sub_8087A88, }; -static void sub_8087AA0(struct LinkPlayerMapObject *, struct MapObject *); -static void sub_8087AA8(struct LinkPlayerMapObject *, struct MapObject *); +static void sub_8087AA0(struct LinkPlayerEventObject *, struct EventObject *); +static void sub_8087AA8(struct LinkPlayerEventObject *, struct EventObject *); -static void (*const gUnknown_08339E00[])(struct LinkPlayerMapObject *, struct MapObject *) = +static void (*const gUnknown_08339E00[])(struct LinkPlayerEventObject *, struct EventObject *) = { sub_8087AA0, sub_8087AA8, @@ -501,55 +501,55 @@ void ApplyNewEncryptionKeyToGameStats(u32 newKey) ApplyNewEncryptionKeyToWord(&gSaveBlock1Ptr->gameStats[i], newKey); } -void LoadMapObjTemplatesFromHeader(void) +void LoadEventObjTemplatesFromHeader(void) { // Clear map object templates - CpuFill32(0, gSaveBlock1Ptr->mapObjectTemplates, sizeof(gSaveBlock1Ptr->mapObjectTemplates)); + CpuFill32(0, gSaveBlock1Ptr->eventObjectTemplates, sizeof(gSaveBlock1Ptr->eventObjectTemplates)); // Copy map header events to save block - CpuCopy32(gMapHeader.events->mapObjects, - gSaveBlock1Ptr->mapObjectTemplates, - gMapHeader.events->mapObjectCount * sizeof(struct MapObjectTemplate)); + CpuCopy32(gMapHeader.events->eventObjects, + gSaveBlock1Ptr->eventObjectTemplates, + gMapHeader.events->eventObjectCount * sizeof(struct EventObjectTemplate)); } -void LoadSaveblockMapObjScripts(void) +void LoadSaveblockEventObjScripts(void) { - struct MapObjectTemplate *mapHeaderObjTemplates = gMapHeader.events->mapObjects; - struct MapObjectTemplate *savObjTemplates = gSaveBlock1Ptr->mapObjectTemplates; + struct EventObjectTemplate *mapHeaderObjTemplates = gMapHeader.events->eventObjects; + struct EventObjectTemplate *savObjTemplates = gSaveBlock1Ptr->eventObjectTemplates; s32 i; for (i = 0; i < 64; i++) savObjTemplates[i].script = mapHeaderObjTemplates[i].script; } -void Overworld_SetMapObjTemplateCoords(u8 localId, s16 x, s16 y) +void Overworld_SetEventObjTemplateCoords(u8 localId, s16 x, s16 y) { s32 i; - struct MapObjectTemplate *savObjTemplates = gSaveBlock1Ptr->mapObjectTemplates; + struct EventObjectTemplate *savObjTemplates = gSaveBlock1Ptr->eventObjectTemplates; for (i = 0; i < 64; i++) { - struct MapObjectTemplate *mapObjectTemplate = &savObjTemplates[i]; - if (mapObjectTemplate->localId == localId) + struct EventObjectTemplate *eventObjectTemplate = &savObjTemplates[i]; + if (eventObjectTemplate->localId == localId) { - mapObjectTemplate->x = x; - mapObjectTemplate->y = y; + eventObjectTemplate->x = x; + eventObjectTemplate->y = y; return; } } } -void Overworld_SetMapObjTemplateMovementType(u8 localId, u8 movementType) +void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType) { s32 i; - struct MapObjectTemplate *savObjTemplates = gSaveBlock1Ptr->mapObjectTemplates; + struct EventObjectTemplate *savObjTemplates = gSaveBlock1Ptr->eventObjectTemplates; for (i = 0; i < 64; i++) { - struct MapObjectTemplate *mapObjectTemplate = &savObjTemplates[i]; - if (mapObjectTemplate->localId == localId) + struct EventObjectTemplate *eventObjectTemplate = &savObjTemplates[i]; + if (eventObjectTemplate->localId == localId) { - mapObjectTemplate->movementType = movementType; + eventObjectTemplate->movementType = movementType; return; } } @@ -824,7 +824,7 @@ void mliX_load_map(u8 mapGroup, u8 mapNum) ApplyCurrentWarp(); set_current_map_header_from_sav1_save_old_name(); - LoadMapObjTemplatesFromHeader(); + LoadEventObjTemplatesFromHeader(); TrySetMapSaveWarpStatus(); ClearTempFieldEventData(); ResetCyclingRoadChallengeData(); @@ -867,7 +867,7 @@ static void mli0_load_map(u32 a1) else if (InTrainerHill()) sub_81D5DF8(); else - LoadMapObjTemplatesFromHeader(); + LoadEventObjTemplatesFromHeader(); } v2 = is_map_type_1_2_3_5_or_6(gMapHeader.mapType); @@ -1734,9 +1734,9 @@ void CB2_ContinueSavedGame(void) else if (trainerHillMapId != 0 && trainerHillMapId != 6) sub_81D5F48(); else - LoadSaveblockMapObjScripts(); + LoadSaveblockEventObjScripts(); - UnfreezeMapObjects(); + UnfreezeEventObjects(); DoTimeBasedEvents(); sub_8084788(); if (gMapHeader.mapDataId == 0x169) @@ -2170,7 +2170,7 @@ static void sub_80869DC(void) gUnknown_03005DEC = 0; gUnknown_03005DE8 = 0; sub_808D438(); - SpawnFieldObjectsInView(0, 0); + SpawnEventObjectsInView(0, 0); mapheader_run_first_tag4_script_list_match(); } @@ -2187,7 +2187,7 @@ static void mli4_mapscripts_and_other(void) InitPlayerAvatar(x, y, player->player_field_1, gSaveBlock2Ptr->playerGender); SetPlayerAvatarTransitionFlags(player->player_field_0); player_avatar_init_params_reset(); - SpawnFieldObjectsInView(0, 0); + SpawnEventObjectsInView(0, 0); mapheader_run_first_tag4_script_list_match(); } @@ -2200,7 +2200,7 @@ static void sub_8086A68(void) static void sub_8086A80(void) { - gMapObjects[gPlayerAvatar.mapObjectId].trackedByCamera = 1; + gEventObjects[gPlayerAvatar.eventObjectId].trackedByCamera = 1; InitCameraUpdateCallback(gPlayerAvatar.spriteId); } @@ -2231,7 +2231,7 @@ static void sub_8086B14(void) for (i = 0; i < gFieldLinkPlayerCount; i++) { - SpawnLinkPlayerMapObject(i, i + x, y, gLinkPlayers[i].gender); + SpawnLinkPlayerEventObject(i, i + x, y, gLinkPlayers[i].gender); CreateLinkPlayerSprite(i, gLinkPlayers[i].version); } @@ -2676,7 +2676,7 @@ static void sub_80872D8(s32 linkPlayerId, s32 a2, struct UnkStruct_8054FF8 *a3) a3->a = linkPlayerId; a3->b = (linkPlayerId == a2) ? 1 : 0; - a3->c = gLinkPlayerMapObjects[linkPlayerId].mode; + a3->c = gLinkPlayerEventObjects[linkPlayerId].mode; a3->d = sub_80878A0(linkPlayerId); sub_8087878(linkPlayerId, &x, &y); a3->sub.x = x; @@ -2889,109 +2889,109 @@ static u32 sub_8087690(void) return gLink.sendQueue.count; } -static void ZeroLinkPlayerMapObject(struct LinkPlayerMapObject *linkPlayerMapObj) +static void ZeroLinkPlayerEventObject(struct LinkPlayerEventObject *linkPlayerEventObj) { - memset(linkPlayerMapObj, 0, sizeof(struct LinkPlayerMapObject)); + memset(linkPlayerEventObj, 0, sizeof(struct LinkPlayerEventObject)); } -void ZeroAllLinkPlayerMapObjects(void) +void ZeroAllLinkPlayerEventObjects(void) { - memset(gLinkPlayerMapObjects, 0, sizeof(gLinkPlayerMapObjects)); + memset(gLinkPlayerEventObjects, 0, sizeof(gLinkPlayerEventObjects)); } -static void ZeroMapObject(struct MapObject *mapObj) +static void ZeroEventObject(struct EventObject *eventObj) { - memset(mapObj, 0, sizeof(struct MapObject)); + memset(eventObj, 0, sizeof(struct EventObject)); } -static void SpawnLinkPlayerMapObject(u8 linkPlayerId, s16 x, s16 y, u8 a4) +static void SpawnLinkPlayerEventObject(u8 linkPlayerId, s16 x, s16 y, u8 a4) { - u8 mapObjId = sub_808D4F4(); - struct LinkPlayerMapObject *linkPlayerMapObj = &gLinkPlayerMapObjects[linkPlayerId]; - struct MapObject *mapObj = &gMapObjects[mapObjId]; + u8 eventObjId = sub_808D4F4(); + struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; + struct EventObject *eventObj = &gEventObjects[eventObjId]; - ZeroLinkPlayerMapObject(linkPlayerMapObj); - ZeroMapObject(mapObj); + ZeroLinkPlayerEventObject(linkPlayerEventObj); + ZeroEventObject(eventObj); - linkPlayerMapObj->active = 1; - linkPlayerMapObj->linkPlayerId = linkPlayerId; - linkPlayerMapObj->mapObjId = mapObjId; - linkPlayerMapObj->mode = 0; + linkPlayerEventObj->active = 1; + linkPlayerEventObj->linkPlayerId = linkPlayerId; + linkPlayerEventObj->eventObjId = eventObjId; + linkPlayerEventObj->mode = 0; - mapObj->active = 1; - mapObj->singleMovementActive = a4; - mapObj->range.as_byte = 2; - mapObj->spriteId = 64; + eventObj->active = 1; + eventObj->singleMovementActive = a4; + eventObj->range.as_byte = 2; + eventObj->spriteId = 64; - InitLinkPlayerMapObjectPos(mapObj, x, y); + InitLinkPlayerEventObjectPos(eventObj, x, y); } -static void InitLinkPlayerMapObjectPos(struct MapObject *mapObj, s16 x, s16 y) +static void InitLinkPlayerEventObjectPos(struct EventObject *eventObj, s16 x, s16 y) { - mapObj->currentCoords.x = x; - mapObj->currentCoords.y = y; - mapObj->previousCoords.x = x; - mapObj->previousCoords.y = y; - sub_8093038(x, y, &mapObj->initialCoords.x, &mapObj->initialCoords.y); - mapObj->initialCoords.x += 8; - FieldObjectUpdateZCoord(mapObj); + eventObj->currentCoords.x = x; + eventObj->currentCoords.y = y; + eventObj->previousCoords.x = x; + eventObj->previousCoords.y = y; + sub_8093038(x, y, &eventObj->initialCoords.x, &eventObj->initialCoords.y); + eventObj->initialCoords.x += 8; + EventObjectUpdateZCoord(eventObj); } static void sub_80877DC(u8 linkPlayerId, u8 a2) { - if (gLinkPlayerMapObjects[linkPlayerId].active) + if (gLinkPlayerEventObjects[linkPlayerId].active) { - u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId; - struct MapObject *mapObj = &gMapObjects[mapObjId]; - mapObj->range.as_byte = a2; + u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; + struct EventObject *eventObj = &gEventObjects[eventObjId]; + eventObj->range.as_byte = a2; } } static void sub_808780C(u8 linkPlayerId) { - struct LinkPlayerMapObject *linkPlayerMapObj = &gLinkPlayerMapObjects[linkPlayerId]; - u8 mapObjId = linkPlayerMapObj->mapObjId; - struct MapObject *mapObj = &gMapObjects[mapObjId]; - if (mapObj->spriteId != 64 ) - DestroySprite(&gSprites[mapObj->spriteId]); - linkPlayerMapObj->active = 0; - mapObj->active = 0; + struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; + u8 eventObjId = linkPlayerEventObj->eventObjId; + struct EventObject *eventObj = &gEventObjects[eventObjId]; + if (eventObj->spriteId != 64 ) + DestroySprite(&gSprites[eventObj->spriteId]); + linkPlayerEventObj->active = 0; + eventObj->active = 0; } static u8 sub_8087858(u8 linkPlayerId) { - u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId; - struct MapObject *mapObj = &gMapObjects[mapObjId]; - return mapObj->spriteId; + u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; + struct EventObject *eventObj = &gEventObjects[eventObjId]; + return eventObj->spriteId; } static void sub_8087878(u8 linkPlayerId, u16 *x, u16 *y) { - u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId; - struct MapObject *mapObj = &gMapObjects[mapObjId]; - *x = mapObj->currentCoords.x; - *y = mapObj->currentCoords.y; + u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; + struct EventObject *eventObj = &gEventObjects[eventObjId]; + *x = eventObj->currentCoords.x; + *y = eventObj->currentCoords.y; } static u8 sub_80878A0(u8 linkPlayerId) { - u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId; - struct MapObject *mapObj = &gMapObjects[mapObjId]; - return mapObj->range.as_byte; + u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; + struct EventObject *eventObj = &gEventObjects[eventObjId]; + return eventObj->range.as_byte; } static u8 sub_80878C0(u8 linkPlayerId) { - u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId; - struct MapObject *mapObj = &gMapObjects[mapObjId]; - return mapObj->currentElevation; + u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; + struct EventObject *eventObj = &gEventObjects[eventObjId]; + return eventObj->currentElevation; } static s32 sub_80878E4(u8 linkPlayerId) { - u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId; - struct MapObject *mapObj = &gMapObjects[mapObjId]; - return 16 - (s8)mapObj->directionSequenceIndex; + u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; + struct EventObject *eventObj = &gEventObjects[eventObjId]; + return 16 - (s8)eventObj->directionSequenceIndex; } static u8 GetLinkPlayerIdAt(s16 x, s16 y) @@ -2999,11 +2999,11 @@ static u8 GetLinkPlayerIdAt(s16 x, s16 y) u8 i; for (i = 0; i < 4; i++) { - if (gLinkPlayerMapObjects[i].active - && (gLinkPlayerMapObjects[i].mode == 0 || gLinkPlayerMapObjects[i].mode == 2)) + if (gLinkPlayerEventObjects[i].active + && (gLinkPlayerEventObjects[i].mode == 0 || gLinkPlayerEventObjects[i].mode == 2)) { - struct MapObject *mapObj = &gMapObjects[gLinkPlayerMapObjects[i].mapObjId]; - if (mapObj->currentCoords.x == x && mapObj->currentCoords.y == y) + struct EventObject *eventObj = &gEventObjects[gLinkPlayerEventObjects[i].eventObjId]; + if (eventObj->currentCoords.x == x && eventObj->currentCoords.y == y) return i; } } @@ -3012,79 +3012,79 @@ static u8 GetLinkPlayerIdAt(s16 x, s16 y) static void sub_808796C(u8 linkPlayerId, u8 a2) { - struct LinkPlayerMapObject *linkPlayerMapObj = &gLinkPlayerMapObjects[linkPlayerId]; - u8 mapObjId = linkPlayerMapObj->mapObjId; - struct MapObject *mapObj = &gMapObjects[mapObjId]; + struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; + u8 eventObjId = linkPlayerEventObj->eventObjId; + struct EventObject *eventObj = &gEventObjects[eventObjId]; - if (linkPlayerMapObj->active) + if (linkPlayerEventObj->active) { if (a2 > 10) - mapObj->triggerGroundEffectsOnMove = 1; + eventObj->triggerGroundEffectsOnMove = 1; else - gUnknown_08339E00[gUnknown_08339DC8[linkPlayerMapObj->mode](linkPlayerMapObj, mapObj, a2)](linkPlayerMapObj, mapObj); + gUnknown_08339E00[gUnknown_08339DC8[linkPlayerEventObj->mode](linkPlayerEventObj, eventObj, a2)](linkPlayerEventObj, eventObj); } } -static u8 sub_80879D8(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3) +static u8 sub_80879D8(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) { - return gUnknown_08339DD4[a3](linkPlayerMapObj, mapObj, a3); + return gUnknown_08339DD4[a3](linkPlayerEventObj, eventObj, a3); } -static u8 sub_80879F8(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3) +static u8 sub_80879F8(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) { return 1; } -static u8 sub_80879FC(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3) +static u8 sub_80879FC(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) { - return gUnknown_08339DD4[a3](linkPlayerMapObj, mapObj, a3); + return gUnknown_08339DD4[a3](linkPlayerEventObj, eventObj, a3); } -static u8 sub_8087A1C(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3) +static u8 sub_8087A1C(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) { return 0; } -static u8 sub_8087A20(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3) +static u8 sub_8087A20(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) { s16 x, y; - mapObj->range.as_byte = npc_something3(a3, mapObj->range.as_byte); - FieldObjectMoveDestCoords(mapObj, mapObj->range.as_byte, &x, &y); + eventObj->range.as_byte = npc_something3(a3, eventObj->range.as_byte); + EventObjectMoveDestCoords(eventObj, eventObj->range.as_byte, &x, &y); - if (LinkPlayerDetectCollision(linkPlayerMapObj->mapObjId, mapObj->range.as_byte, x, y)) + if (LinkPlayerDetectCollision(linkPlayerEventObj->eventObjId, eventObj->range.as_byte, x, y)) { return 0; } else { - mapObj->directionSequenceIndex = 16; - npc_coords_shift(mapObj, x, y); - FieldObjectUpdateZCoord(mapObj); + eventObj->directionSequenceIndex = 16; + npc_coords_shift(eventObj, x, y); + EventObjectUpdateZCoord(eventObj); return 1; } } -static u8 sub_8087A88(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3) +static u8 sub_8087A88(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) { - mapObj->range.as_byte = npc_something3(a3, mapObj->range.as_byte); + eventObj->range.as_byte = npc_something3(a3, eventObj->range.as_byte); return 0; } -static void sub_8087AA0(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj) +static void sub_8087AA0(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj) { - linkPlayerMapObj->mode = 0; + linkPlayerEventObj->mode = 0; } -static void sub_8087AA8(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj) +static void sub_8087AA8(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj) { - mapObj->directionSequenceIndex--; - linkPlayerMapObj->mode = 1; - MoveCoords(mapObj->range.as_byte, &mapObj->initialCoords.x, &mapObj->initialCoords.y); - if (!mapObj->directionSequenceIndex) + eventObj->directionSequenceIndex--; + linkPlayerEventObj->mode = 1; + MoveCoords(eventObj->range.as_byte, &eventObj->initialCoords.x, &eventObj->initialCoords.y); + if (!eventObj->directionSequenceIndex) { - npc_coords_shift_still(mapObj); - linkPlayerMapObj->mode = 2; + npc_coords_shift_still(eventObj); + linkPlayerEventObj->mode = 2; } } @@ -3108,15 +3108,15 @@ static u8 npc_something3(u8 a1, u8 a2) return a2; } -static u8 LinkPlayerDetectCollision(u8 selfMapObjId, u8 a2, s16 x, s16 y) +static u8 LinkPlayerDetectCollision(u8 selfEventObjId, u8 a2, s16 x, s16 y) { u8 i; for (i = 0; i < 16; i++) { - if (i != selfMapObjId) + if (i != selfEventObjId) { - if ((gMapObjects[i].currentCoords.x == x && gMapObjects[i].currentCoords.y == y) - || (gMapObjects[i].previousCoords.x == x && gMapObjects[i].previousCoords.y == y)) + if ((gEventObjects[i].currentCoords.x == x && gEventObjects[i].currentCoords.y == y) + || (gEventObjects[i].previousCoords.x == x && gEventObjects[i].previousCoords.y == y)) { return 1; } @@ -3127,51 +3127,51 @@ static u8 LinkPlayerDetectCollision(u8 selfMapObjId, u8 a2, s16 x, s16 y) static void CreateLinkPlayerSprite(u8 linkPlayerId, u8 gameVersion) { - struct LinkPlayerMapObject *linkPlayerMapObj = &gLinkPlayerMapObjects[linkPlayerId]; - u8 mapObjId = linkPlayerMapObj->mapObjId; - struct MapObject *mapObj = &gMapObjects[mapObjId]; + struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; + u8 eventObjId = linkPlayerEventObj->eventObjId; + struct EventObject *eventObj = &gEventObjects[eventObjId]; struct Sprite *sprite; - if (linkPlayerMapObj->active) + if (linkPlayerEventObj->active) { switch (gameVersion) { case VERSION_FIRE_RED: case VERSION_LEAF_GREEN: - mapObj->spriteId = AddPseudoFieldObject(sub_808BD6C(mapObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); + eventObj->spriteId = AddPseudoEventObject(sub_808BD6C(eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); break; case VERSION_RUBY: case VERSION_SAPPHIRE: - mapObj->spriteId = AddPseudoFieldObject(sub_808BD7C(mapObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); + eventObj->spriteId = AddPseudoEventObject(sub_808BD7C(eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); break; case VERSION_EMERALD: - mapObj->spriteId = AddPseudoFieldObject(GetRivalAvatarGraphicsIdByStateIdAndGender(0, mapObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); + eventObj->spriteId = AddPseudoEventObject(GetRivalAvatarGraphicsIdByStateIdAndGender(0, eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); break; } - sprite = &gSprites[mapObj->spriteId]; + sprite = &gSprites[eventObj->spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->data[0] = linkPlayerId; - mapObj->triggerGroundEffectsOnMove = 0; + eventObj->triggerGroundEffectsOnMove = 0; } } static void SpriteCB_LinkPlayer(struct Sprite *sprite) { - struct LinkPlayerMapObject *linkPlayerMapObj = &gLinkPlayerMapObjects[sprite->data[0]]; - struct MapObject *mapObj = &gMapObjects[linkPlayerMapObj->mapObjId]; - sprite->pos1.x = mapObj->initialCoords.x; - sprite->pos1.y = mapObj->initialCoords.y; - SetObjectSubpriorityByZCoord(mapObj->previousElevation, sprite, 1); - sprite->oam.priority = ZCoordToPriority(mapObj->previousElevation); + struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[sprite->data[0]]; + struct EventObject *eventObj = &gEventObjects[linkPlayerEventObj->eventObjId]; + sprite->pos1.x = eventObj->initialCoords.x; + sprite->pos1.y = eventObj->initialCoords.y; + SetObjectSubpriorityByZCoord(eventObj->previousElevation, sprite, 1); + sprite->oam.priority = ZCoordToPriority(eventObj->previousElevation); - if (!linkPlayerMapObj->mode) - StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObj->range.as_byte)); + if (!linkPlayerEventObj->mode) + StartSpriteAnim(sprite, EventObjectDirectionToImageAnimId(eventObj->range.as_byte)); else - StartSpriteAnimIfDifferent(sprite, get_go_image_anim_num(mapObj->range.as_byte)); + StartSpriteAnimIfDifferent(sprite, get_go_image_anim_num(eventObj->range.as_byte)); sub_80979D4(sprite, 0); - if (mapObj->triggerGroundEffectsOnMove) + if (eventObj->triggerGroundEffectsOnMove) { sprite->invisible = ((sprite->data[7] & 4) >> 2); sprite->data[7]++; diff --git a/src/rom6.c b/src/rom6.c index 9b505a2054..60447f6418 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -1,5 +1,5 @@ #include "global.h" -#include "constants/map_objects.h" +#include "constants/event_objects.h" #include "constants/songs.h" #include "rom6.h" #include "braille_puzzles.h" @@ -32,18 +32,18 @@ extern struct MapPosition gUnknown_0203AB40; // text bool8 npc_before_player_of_type(u8 a) { - u8 mapObjId; + u8 eventObjId; GetXYCoordsOneStepInFrontOfPlayer(&gUnknown_0203AB40.x, &gUnknown_0203AB40.y); gUnknown_0203AB40.height = PlayerGetZCoord(); - mapObjId = GetFieldObjectIdByXYZ(gUnknown_0203AB40.x, gUnknown_0203AB40.y, gUnknown_0203AB40.height); - if (gMapObjects[mapObjId].graphicsId != a) + eventObjId = GetEventObjectIdByXYZ(gUnknown_0203AB40.x, gUnknown_0203AB40.y, gUnknown_0203AB40.height); + if (gEventObjects[eventObjId].graphicsId != a) { return FALSE; } else { - gSpecialVar_LastTalked = gMapObjects[mapObjId].localId; + gSpecialVar_LastTalked = gEventObjects[eventObjId].localId; return TRUE; } } @@ -56,13 +56,13 @@ u8 oei_task_add(void) static void task08_080C9820(u8 taskId) { - u8 mapObjId; + u8 eventObjId; ScriptContext2_Enable(); gPlayerAvatar.preventStep = TRUE; - mapObjId = gPlayerAvatar.mapObjectId; - if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(&gMapObjects[mapObjId]) - || FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[mapObjId])) + eventObjId = gPlayerAvatar.eventObjectId; + if (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(&gEventObjects[eventObjId]) + || EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[eventObjId])) { if (gMapHeader.mapType == MAP_TYPE_UNDERWATER) { @@ -72,7 +72,7 @@ static void task08_080C9820(u8 taskId) else { sub_808C114(); - FieldObjectSetSpecialAnim(&gMapObjects[mapObjId], 0x39); + EventObjectSetSpecialAnim(&gEventObjects[eventObjId], 0x39); gTasks[taskId].func = sub_813552C; } } @@ -80,7 +80,7 @@ static void task08_080C9820(u8 taskId) static void sub_813552C(u8 taskId) { - if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[gPlayerAvatar.mapObjectId]) == TRUE) + if (EventObjectCheckIfSpecialAnimFinishedOrInactive(&gEventObjects[gPlayerAvatar.eventObjectId]) == TRUE) { FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); gTasks[taskId].func = sub_8135578; @@ -100,7 +100,7 @@ static void sub_8135578(u8 taskId) gFieldEffectArguments[2] = 2; if (gFieldEffectArguments[1] == 4) gFieldEffectArguments[2] = 3; - FieldObjectSetGraphicsId(&gMapObjects[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByCurrentState()); + EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByCurrentState()); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gFieldEffectArguments[2]); FieldEffectActiveListRemove(6); gTasks[taskId].func = sub_813561C; diff --git a/src/scrcmd.c b/src/scrcmd.c index e36b60718d..e3edb5abfc 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -24,7 +24,7 @@ #include "item.h" #include "lilycove_lady.h" #include "main.h" -#include "map_obj_lock.h" +#include "event_obj_lock.h" #include "menu.h" #include "money.h" #include "mystery_event_script.h" @@ -1051,7 +1051,7 @@ bool8 ScrCmd_removeobject(struct ScriptContext *ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); - RemoveFieldObjectByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + RemoveEventObjectByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); return FALSE; } @@ -1061,7 +1061,7 @@ bool8 ScrCmd_removeobject_at(struct ScriptContext *ctx) u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); - RemoveFieldObjectByLocalIdAndMap(objectId, mapNum, mapGroup); + RemoveEventObjectByLocalIdAndMap(objectId, mapNum, mapGroup); return FALSE; } @@ -1099,7 +1099,7 @@ bool8 ScrCmd_setobjectxyperm(struct ScriptContext *ctx) u16 x = VarGet(ScriptReadHalfword(ctx)); u16 y = VarGet(ScriptReadHalfword(ctx)); - Overworld_SetMapObjTemplateCoords(localId, x, y); + Overworld_SetEventObjTemplateCoords(localId, x, y); return FALSE; } @@ -1154,9 +1154,9 @@ bool8 ScrCmd_resetobjectpriority(struct ScriptContext *ctx) bool8 ScrCmd_faceplayer(struct ScriptContext *ctx) { - if (gMapObjects[gSelectedMapObject].active) + if (gEventObjects[gSelectedEventObject].active) { - FieldObjectFaceOppositeDirection(&gMapObjects[gSelectedMapObject], + EventObjectFaceOppositeDirection(&gEventObjects[gSelectedEventObject], player_get_direction_lower_nybble()); } return FALSE; @@ -1167,7 +1167,7 @@ bool8 ScrCmd_turnobject(struct ScriptContext *ctx) u16 localId = VarGet(ScriptReadHalfword(ctx)); u8 direction = ScriptReadByte(ctx); - FieldObjectTurnByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, direction); + EventObjectTurnByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, direction); return FALSE; } @@ -1176,7 +1176,7 @@ bool8 ScrCmd_setobjectmovementtype(struct ScriptContext *ctx) u16 localId = VarGet(ScriptReadHalfword(ctx)); u8 movementType = ScriptReadByte(ctx); - Overworld_SetMapObjTemplateMovementType(localId, movementType); + Overworld_SetEventObjTemplateMovementType(localId, movementType); return FALSE; } @@ -1210,7 +1210,7 @@ bool8 ScrCmd_lockall(struct ScriptContext *ctx) } else { - ScriptFreezeMapObjects(); + ScriptFreezeEventObjects(); SetupNativeScript(ctx, sub_80983C4); return TRUE; } @@ -1224,14 +1224,14 @@ bool8 ScrCmd_lock(struct ScriptContext *ctx) } else { - if (gMapObjects[gSelectedMapObject].active) + if (gEventObjects[gSelectedEventObject].active) { - LockSelectedMapObject(); + LockSelectedEventObject(); SetupNativeScript(ctx, sub_809847C); } else { - ScriptFreezeMapObjects(); + ScriptFreezeEventObjects(); SetupNativeScript(ctx, sub_80983C4); } return TRUE; @@ -1243,10 +1243,10 @@ bool8 ScrCmd_releaseall(struct ScriptContext *ctx) u8 objectId; HideFieldMessageBox(); - objectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0); - FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[objectId]); + objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[objectId]); sub_80D338C(); - UnfreezeMapObjects(); + UnfreezeEventObjects(); return FALSE; } @@ -1255,12 +1255,12 @@ bool8 ScrCmd_release(struct ScriptContext *ctx) u8 objectId; HideFieldMessageBox(); - if (gMapObjects[gSelectedMapObject].active) - FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[gSelectedMapObject]); - objectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0); - FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[objectId]); + if (gEventObjects[gSelectedEventObject].active) + EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[gSelectedEventObject]); + objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[objectId]); sub_80D338C(); - UnfreezeMapObjects(); + UnfreezeEventObjects(); return FALSE; } @@ -2178,7 +2178,7 @@ bool8 ScrCmd_mossdeepgym4(struct ScriptContext *ctx) bool8 ScrCmd_cmdD8(struct ScriptContext *ctx) { - gSelectedMapObject = GetCurrentApproachingTrainerMapObjectId(); + gSelectedEventObject = GetCurrentApproachingTrainerEventObjectId(); return FALSE; } @@ -2190,7 +2190,7 @@ bool8 ScrCmd_cmdD9(struct ScriptContext *ctx) } else { - if (gMapObjects[gSelectedMapObject].active) + if (gEventObjects[gSelectedEventObject].active) { sub_8098630(); SetupNativeScript(ctx, sub_8098734); diff --git a/src/script_movement.c b/src/script_movement.c index 02ab55223e..27280addf0 100644 --- a/src/script_movement.c +++ b/src/script_movement.c @@ -21,25 +21,25 @@ static EWRAM_DATA const u8 *gUnknown_02039D90[16] = {0}; // text bool8 ScriptMovement_StartObjectMovementScript(u8 localId, u8 mapNum, u8 mapGroup, const u8 *movementScript) { - u8 mapObjId; + u8 eventObjId; - if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjId)) + if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjId)) return TRUE; if (!FuncIsActiveTask(sub_80D3660)) sub_80D33AC(50); - return sub_80D3408(sub_80D33F4(), mapObjId, movementScript); + return sub_80D3408(sub_80D33F4(), eventObjId, movementScript); } bool8 ScriptMovement_IsObjectMovementFinished(u8 localId, u8 mapNum, u8 mapBank) { - u8 mapObjId; + u8 eventObjId; u8 r4; u8 r1; - if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapBank, &mapObjId)) + if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapBank, &eventObjId)) return TRUE; r4 = sub_80D33F4(); - r1 = sub_80D3474(r4, mapObjId); + r1 = sub_80D3474(r4, eventObjId); if (r1 == 16) return TRUE; return sub_80D3584(r4, r1); @@ -73,11 +73,11 @@ static u8 sub_80D33F4(void) return FindTaskIdByFunc(sub_80D3660); } -static bool8 sub_80D3408(u8 taskId, u8 mapObjId, const u8 *movementScript) +static bool8 sub_80D3408(u8 taskId, u8 eventObjId, const u8 *movementScript) { u8 r4; - r4 = sub_80D3474(taskId, mapObjId); + r4 = sub_80D3474(taskId, eventObjId); if (r4 != 16) { if (sub_80D3584(taskId, r4) == 0) @@ -86,7 +86,7 @@ static bool8 sub_80D3408(u8 taskId, u8 mapObjId, const u8 *movementScript) } else { - sub_80D35DC(taskId, r4, mapObjId, movementScript); + sub_80D35DC(taskId, r4, eventObjId, movementScript); return FALSE; } } @@ -97,7 +97,7 @@ static bool8 sub_80D3408(u8 taskId, u8 mapObjId, const u8 *movementScript) } else { - sub_80D35DC(taskId, r4, mapObjId, movementScript); + sub_80D35DC(taskId, r4, eventObjId, movementScript); return FALSE; } } @@ -173,23 +173,23 @@ static const u8 *sub_80D35CC(u8 a) return gUnknown_02039D90[a]; } -static void sub_80D35DC(u8 taskId, u8 b, u8 mapObjId, const u8 *movementScript) +static void sub_80D35DC(u8 taskId, u8 b, u8 eventObjId, const u8 *movementScript) { sub_80D352C(taskId, b); npc_obj_offscreen_culling_and_flag_update(b, movementScript); - sub_80D34E4(taskId, b, mapObjId); + sub_80D34E4(taskId, b, eventObjId); } static void UnfreezeObjects(u8 taskId) { - u8 *pMapObjId; + u8 *pEventObjId; u8 i; - pMapObjId = (u8 *)&gTasks[taskId].data[1]; - for (i = 0; i < 16; i++, pMapObjId++) + pEventObjId = (u8 *)&gTasks[taskId].data[1]; + for (i = 0; i < 16; i++, pEventObjId++) { - if (*pMapObjId != 0xFF) - npc_sync_anim_pause_bits(&gMapObjects[*pMapObjId]); + if (*pEventObjId != 0xFF) + npc_sync_anim_pause_bits(&gEventObjects[*pEventObjId]); } } @@ -206,23 +206,23 @@ static void sub_80D3660(u8 taskId) } } -static void sub_80A2490(u8 taskId, u8 b, u8 mapObjId, const u8 *d) +static void sub_80A2490(u8 taskId, u8 b, u8 eventObjId, const u8 *d) { u8 var; - if (FieldObjectIsSpecialAnimActive(&gMapObjects[mapObjId]) - && !FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[mapObjId])) + if (EventObjectIsSpecialAnimActive(&gEventObjects[eventObjId]) + && !EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[eventObjId])) return; var = *d; if (var == 0xFE) { sub_80D355C(taskId, b); - FreezeMapObject(&gMapObjects[mapObjId]); + FreezeEventObject(&gEventObjects[eventObjId]); } else { - if (!FieldObjectSetSpecialAnim(&gMapObjects[mapObjId], var)) + if (!EventObjectSetSpecialAnim(&gEventObjects[eventObjId], var)) { d++; npc_obj_offscreen_culling_and_flag_update(b, d); diff --git a/src/secret_base.c b/src/secret_base.c index 71cf3f1a64..d6f4e24a5e 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -412,7 +412,7 @@ bool8 sub_80E909C(void) void sub_80E90C8(u8 taskId) { - FieldObjectTurn(&gMapObjects[gPlayerAvatar.mapObjectId], DIR_NORTH); + EventObjectTurn(&gEventObjects[gPlayerAvatar.eventObjectId], DIR_NORTH); if (IsWeatherNotFadingIn() == TRUE) { EnableBothScriptContexts(); @@ -532,14 +532,14 @@ void sub_80E933C(void) category = gDecorations[roomDecor[decorIdx]].category; if (permission == DECORPERM_SOLID_MAT) { - for (objIdx = 0; objIdx < gMapHeader.events->mapObjectCount; objIdx ++) + for (objIdx = 0; objIdx < gMapHeader.events->eventObjectCount; objIdx ++) { - if (gMapHeader.events->mapObjects[objIdx].flagId == gSpecialVar_0x8004 + 0xAE) + if (gMapHeader.events->eventObjects[objIdx].flagId == gSpecialVar_0x8004 + 0xAE) { break; } } - if (objIdx == gMapHeader.events->mapObjectCount) + if (objIdx == gMapHeader.events->eventObjectCount) { continue; } @@ -548,9 +548,9 @@ void sub_80E933C(void) metatile = MapGridGetMetatileBehaviorAt(gSpecialVar_0x8006 + 7, gSpecialVar_0x8007 + 7); if (MetatileBehavior_IsMB_B5(metatile) == TRUE || MetatileBehavior_IsMB_C3(metatile) == TRUE) { - gSpecialVar_Result = gMapHeader.events->mapObjects[objIdx].graphicsId + VAR_0x3F20; + gSpecialVar_Result = gMapHeader.events->eventObjects[objIdx].graphicsId + VAR_0x3F20; VarSet(gSpecialVar_Result, gDecorations[roomDecor[decorIdx]].tiles[0]); - gSpecialVar_Result = gMapHeader.events->mapObjects[objIdx].localId; + gSpecialVar_Result = gMapHeader.events->eventObjects[objIdx].localId; FlagClear(gSpecialVar_0x8004 + 0xAE); show_sprite(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); sub_808EBA8(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007); @@ -578,12 +578,12 @@ void sub_80E9578(void) u8 objectEventIdx; u16 flagId; - for (objectEventIdx = 0; objectEventIdx < gMapHeader.events->mapObjectCount; objectEventIdx ++) + for (objectEventIdx = 0; objectEventIdx < gMapHeader.events->eventObjectCount; objectEventIdx ++) { - flagId = gMapHeader.events->mapObjects[objectEventIdx].flagId; + flagId = gMapHeader.events->eventObjects[objectEventIdx].flagId; if (flagId >= 0xAE && flagId <= 0xBB) { - RemoveFieldObjectByLocalIdAndMap(gMapHeader.events->mapObjects[objectEventIdx].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + RemoveEventObjectByLocalIdAndMap(gMapHeader.events->eventObjects[objectEventIdx].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); FlagSet(flagId); } } diff --git a/src/start_menu.c b/src/start_menu.c index 9ab8a69ba4..7080ae6a83 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -561,7 +561,7 @@ void ShowStartMenu(void) // Called from overworld.c and field_control_avatar.s { if (!is_c1_link_related_active()) { - FreezeMapObjects(); + FreezeEventObjects(); sub_808B864(); sub_808BCF4(); } diff --git a/src/trainer_see.c b/src/trainer_see.c index db8cff8a1a..cf47bbe2a2 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -15,36 +15,36 @@ extern bool8 InBattlePyramid(void); extern bool32 InTrainerHill(void); -extern bool8 GetBattlePyramidTrainerFlag(u8 mapObjectId); -extern bool8 GetTrainerHillTrainerFlag(u8 mapObjectId); +extern bool8 GetBattlePyramidTrainerFlag(u8 eventObjectId); +extern bool8 GetTrainerHillTrainerFlag(u8 eventObjectId); extern void sub_809BE48(u16 npcId); // this file's functions -static u8 CheckTrainer(u8 mapObjectId); -static u8 GetTrainerApproachDistance(struct MapObject *trainerObj); -static u8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 approachDistance, u8 direction); -static void TrainerApproachPlayer(struct MapObject *trainerObj, u8 range); +static u8 CheckTrainer(u8 eventObjectId); +static u8 GetTrainerApproachDistance(struct EventObject *trainerObj); +static u8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 approachDistance, u8 direction); +static void TrainerApproachPlayer(struct EventObject *trainerObj, u8 range); static void Task_RunTrainerSeeFuncList(u8 taskId); static void Task_DestroyTrainerApproachTask(u8 taskId); static void SetIconSpriteData(struct Sprite *sprite, u16 fldEffId, u8 spriteAnimNum); -static u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y); -static u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y); -static u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x, s16 y); -static u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x, s16 y); +static u8 GetTrainerApproachDistanceSouth(struct EventObject *trainerObj, s16 range, s16 x, s16 y); +static u8 GetTrainerApproachDistanceNorth(struct EventObject *trainerObj, s16 range, s16 x, s16 y); +static u8 GetTrainerApproachDistanceWest(struct EventObject *trainerObj, s16 range, s16 x, s16 y); +static u8 GetTrainerApproachDistanceEast(struct EventObject *trainerObj, s16 range, s16 x, s16 y); -static bool8 sub_80B4178(u8 taskId, struct Task *task, struct MapObject *trainerObj); -static bool8 sub_80B417C(u8 taskId, struct Task *task, struct MapObject *trainerObj); -static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct MapObject *trainerObj); -static bool8 sub_80B4200(u8 taskId, struct Task *task, struct MapObject *trainerObj); -static bool8 sub_80B425C(u8 taskId, struct Task *task, struct MapObject *trainerObj); -static bool8 sub_80B4318(u8 taskId, struct Task *task, struct MapObject *trainerObj); -static bool8 sub_80B435C(u8 taskId, struct Task *task, struct MapObject *trainerObj); -static bool8 sub_80B4390(u8 taskId, struct Task *task, struct MapObject *trainerObj); -static bool8 sub_80B43AC(u8 taskId, struct Task *task, struct MapObject *trainerObj); -static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct MapObject *trainerObj); -static bool8 sub_80B4438(u8 taskId, struct Task *task, struct MapObject *trainerObj); -static bool8 sub_80B44AC(u8 taskId, struct Task *task, struct MapObject *trainerObj); +static bool8 sub_80B4178(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 sub_80B417C(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 sub_80B4200(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 sub_80B425C(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 sub_80B4318(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 sub_80B435C(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 sub_80B4390(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 sub_80B43AC(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 sub_80B4438(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 sub_80B44AC(u8 taskId, struct Task *task, struct EventObject *trainerObj); static void SpriteCB_TrainerIcons(struct Sprite *sprite); @@ -63,7 +63,7 @@ static const u8 sEmotion_ExclamationMarkGfx[] = INCBIN_U8("graphics/misc/emotion static const u8 sEmotion_QuestionMarkGfx[] = INCBIN_U8("graphics/misc/emotion_question.4bpp"); static const u8 sEmotion_HeartGfx[] = INCBIN_U8("graphics/misc/emotion_heart.4bpp"); -static u8 (*const sDirectionalApproachDistanceFuncs[])(struct MapObject *trainerObj, s16 range, s16 x, s16 y) = +static u8 (*const sDirectionalApproachDistanceFuncs[])(struct EventObject *trainerObj, s16 range, s16 x, s16 y) = { GetTrainerApproachDistanceSouth, GetTrainerApproachDistanceNorth, @@ -71,7 +71,7 @@ static u8 (*const sDirectionalApproachDistanceFuncs[])(struct MapObject *trainer GetTrainerApproachDistanceEast, }; -static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct MapObject *trainerObj) = +static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) = { sub_80B4178, sub_80B417C, @@ -87,7 +87,7 @@ static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct sub_80B44AC }; -static bool8 (*const sTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct MapObject *trainerObj) = +static bool8 (*const sTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) = { sub_80B43AC, sub_80B43E0, @@ -171,13 +171,13 @@ bool8 CheckForTrainersWantingBattle(void) gNoOfApproachingTrainers = 0; gApproachingTrainerId = 0; - for (i = 0; i < MAP_OBJECTS_COUNT; i++) + for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { u8 retVal; - if (!gMapObjects[i].active) + if (!gEventObjects[i].active) continue; - if (gMapObjects[i].trainerType != 1 && gMapObjects[i].trainerType != 3) + if (gEventObjects[i].trainerType != 1 && gEventObjects[i].trainerType != 3) continue; retVal = CheckTrainer(i); @@ -196,7 +196,7 @@ bool8 CheckForTrainersWantingBattle(void) if (gNoOfApproachingTrainers == 1) { ResetTrainerOpponentIds(); - ConfigureAndSetUpOneTrainerBattle(gApproachingTrainers[gNoOfApproachingTrainers - 1].mapObjectId, + ConfigureAndSetUpOneTrainerBattle(gApproachingTrainers[gNoOfApproachingTrainers - 1].eventObjectId, gApproachingTrainers[gNoOfApproachingTrainers - 1].trainerScriptPtr); gUnknown_030060AC = 1; return TRUE; @@ -206,7 +206,7 @@ bool8 CheckForTrainersWantingBattle(void) ResetTrainerOpponentIds(); for (i = 0; i < gNoOfApproachingTrainers; i++, gApproachingTrainerId++) { - ConfigureTwoTrainersBattle(gApproachingTrainers[i].mapObjectId, + ConfigureTwoTrainersBattle(gApproachingTrainers[i].eventObjectId, gApproachingTrainers[i].trainerScriptPtr); } SetUpTwoTrainersBattle(); @@ -221,7 +221,7 @@ bool8 CheckForTrainersWantingBattle(void) } } -static u8 CheckTrainer(u8 mapObjectId) +static u8 CheckTrainer(u8 eventObjectId) { const u8 *scriptPtr; u8 ret = 1; @@ -230,16 +230,16 @@ static u8 CheckTrainer(u8 mapObjectId) if (InTrainerHill() == TRUE) scriptPtr = sub_81D62AC(); else - scriptPtr = GetFieldObjectScriptPointerByFieldObjectId(mapObjectId); + scriptPtr = GetEventObjectScriptPointerByEventObjectId(eventObjectId); if (InBattlePyramid()) { - if (GetBattlePyramidTrainerFlag(mapObjectId)) + if (GetBattlePyramidTrainerFlag(eventObjectId)) return 0; } else if (InTrainerHill() == TRUE) { - if (GetTrainerHillTrainerFlag(mapObjectId)) + if (GetTrainerHillTrainerFlag(eventObjectId)) return 0; } else @@ -248,7 +248,7 @@ static u8 CheckTrainer(u8 mapObjectId) return 0; } - approachDistance = GetTrainerApproachDistance(&gMapObjects[mapObjectId]); + approachDistance = GetTrainerApproachDistance(&gEventObjects[eventObjectId]); if (approachDistance != 0) { @@ -262,10 +262,10 @@ static u8 CheckTrainer(u8 mapObjectId) ret = 2; } - gApproachingTrainers[gNoOfApproachingTrainers].mapObjectId = mapObjectId; + gApproachingTrainers[gNoOfApproachingTrainers].eventObjectId = eventObjectId; gApproachingTrainers[gNoOfApproachingTrainers].trainerScriptPtr = scriptPtr; gApproachingTrainers[gNoOfApproachingTrainers].radius = approachDistance; - TrainerApproachPlayer(&gMapObjects[mapObjectId], approachDistance - 1); + TrainerApproachPlayer(&gEventObjects[eventObjectId], approachDistance - 1); gNoOfApproachingTrainers++; return ret; @@ -274,7 +274,7 @@ static u8 CheckTrainer(u8 mapObjectId) return 0; } -static u8 GetTrainerApproachDistance(struct MapObject *trainerObj) +static u8 GetTrainerApproachDistance(struct EventObject *trainerObj) { s16 x, y; u8 i; @@ -300,7 +300,7 @@ static u8 GetTrainerApproachDistance(struct MapObject *trainerObj) } // Returns how far south the player is from trainer. 0 if out of trainer's sight. -static u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y) +static u8 GetTrainerApproachDistanceSouth(struct EventObject *trainerObj, s16 range, s16 x, s16 y) { if (trainerObj->currentCoords.x == x && y > trainerObj->currentCoords.y @@ -311,7 +311,7 @@ static u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 rang } // Returns how far north the player is from trainer. 0 if out of trainer's sight. -static u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y) +static u8 GetTrainerApproachDistanceNorth(struct EventObject *trainerObj, s16 range, s16 x, s16 y) { if (trainerObj->currentCoords.x == x && y < trainerObj->currentCoords.y @@ -322,7 +322,7 @@ static u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 rang } // Returns how far west the player is from trainer. 0 if out of trainer's sight. -static u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x, s16 y) +static u8 GetTrainerApproachDistanceWest(struct EventObject *trainerObj, s16 range, s16 x, s16 y) { if (trainerObj->currentCoords.y == y && x < trainerObj->currentCoords.x @@ -333,7 +333,7 @@ static u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range } // Returns how far east the player is from trainer. 0 if out of trainer's sight. -static u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x, s16 y) +static u8 GetTrainerApproachDistanceEast(struct EventObject *trainerObj, s16 range, s16 x, s16 y) { if (trainerObj->currentCoords.y == y && x > trainerObj->currentCoords.x @@ -345,7 +345,7 @@ static u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range #define COLLISION_MASK (~1) -static u8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 approachDistance, u8 direction) +static u8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 approachDistance, u8 direction) { s16 x, y; u8 unk19_temp; @@ -386,16 +386,16 @@ static u8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 appr #define tFuncId data[0] #define tTrainerRange data[3] #define tOutOfAshSpriteId data[4] -#define tTrainerMapObjectId data[7] +#define tTrainerEventObjectId data[7] -static void TrainerApproachPlayer(struct MapObject *trainerObj, u8 range) +static void TrainerApproachPlayer(struct EventObject *trainerObj, u8 range) { struct Task *task; gApproachingTrainers[gNoOfApproachingTrainers].taskId = CreateTask(Task_RunTrainerSeeFuncList, 0x50); task = &gTasks[gApproachingTrainers[gNoOfApproachingTrainers].taskId]; task->tTrainerRange = range; - task->tTrainerMapObjectId = gApproachingTrainers[gNoOfApproachingTrainers].mapObjectId; + task->tTrainerEventObjectId = gApproachingTrainers[gNoOfApproachingTrainers].eventObjectId; } static void sub_80B40C8(TaskFunc followupFunc) @@ -417,7 +417,7 @@ static void sub_80B40C8(TaskFunc followupFunc) static void Task_RunTrainerSeeFuncList(u8 taskId) { struct Task *task = &gTasks[taskId]; - struct MapObject *trainerObj = &gMapObjects[task->tTrainerMapObjectId]; + struct EventObject *trainerObj = &gEventObjects[task->tTrainerEventObjectId]; if (!trainerObj->active) { @@ -429,24 +429,24 @@ static void Task_RunTrainerSeeFuncList(u8 taskId) } } -static bool8 sub_80B4178(u8 taskId, struct Task *task, struct MapObject *trainerObj) +static bool8 sub_80B4178(u8 taskId, struct Task *task, struct EventObject *trainerObj) { return FALSE; } -static bool8 sub_80B417C(u8 taskId, struct Task *task, struct MapObject *trainerObj) +static bool8 sub_80B417C(u8 taskId, struct Task *task, struct EventObject *trainerObj) { u8 direction; - FieldObjectGetLocalIdAndMap(trainerObj, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + EventObjectGetLocalIdAndMap(trainerObj, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1); direction = GetFaceDirectionAnimId(trainerObj->facingDirection); - FieldObjectSetSpecialAnim(trainerObj, direction); + EventObjectSetSpecialAnim(trainerObj, direction); task->tFuncId++; return TRUE; } -static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct MapObject *trainerObj) +static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct EventObject *trainerObj) { if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON_1)) { @@ -463,88 +463,88 @@ static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct MapObject *trainer } } -static bool8 sub_80B4200(u8 taskId, struct Task *task, struct MapObject *trainerObj) +static bool8 sub_80B4200(u8 taskId, struct Task *task, struct EventObject *trainerObj) { - if (!(FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)) || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj)) + if (!(EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)) || EventObjectClearAnimIfSpecialAnimFinished(trainerObj)) { if (task->tTrainerRange) { - FieldObjectSetSpecialAnim(trainerObj, GetGoSpeed0AnimId(trainerObj->facingDirection)); + EventObjectSetSpecialAnim(trainerObj, GetGoSpeed0AnimId(trainerObj->facingDirection)); task->tTrainerRange--; } else { - FieldObjectSetSpecialAnim(trainerObj, 0x3E); + EventObjectSetSpecialAnim(trainerObj, 0x3E); task->tFuncId++; } } return FALSE; } -static bool8 sub_80B425C(u8 taskId, struct Task *task, struct MapObject *trainerObj) +static bool8 sub_80B425C(u8 taskId, struct Task *task, struct EventObject *trainerObj) { - struct MapObject *playerObj; + struct EventObject *playerObj; - if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) && !FieldObjectClearAnimIfSpecialAnimFinished(trainerObj)) + if (EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) && !EventObjectClearAnimIfSpecialAnimFinished(trainerObj)) return FALSE; npc_set_running_behaviour_etc(trainerObj, npc_running_behaviour_by_direction(trainerObj->facingDirection)); sub_808F23C(trainerObj, npc_running_behaviour_by_direction(trainerObj->facingDirection)); sub_808F208(trainerObj); - playerObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj) && !FieldObjectClearAnimIfSpecialAnimFinished(playerObj)) + playerObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + if (EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj) && !EventObjectClearAnimIfSpecialAnimFinished(playerObj)) return FALSE; sub_808BCE8(); - FieldObjectSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->facingDirection))); + EventObjectSetSpecialAnim(&gEventObjects[gPlayerAvatar.eventObjectId], GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->facingDirection))); task->tFuncId++; return FALSE; } -static bool8 sub_80B4318(u8 taskId, struct Task *task, struct MapObject *trainerObj) +static bool8 sub_80B4318(u8 taskId, struct Task *task, struct EventObject *trainerObj) { - struct MapObject *playerObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + struct EventObject *playerObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj) - || FieldObjectClearAnimIfSpecialAnimFinished(playerObj)) + if (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj) + || EventObjectClearAnimIfSpecialAnimFinished(playerObj)) SwitchTaskToFollowupFunc(taskId); return FALSE; } -static bool8 sub_80B435C(u8 taskId, struct Task *task, struct MapObject *trainerObj) +static bool8 sub_80B435C(u8 taskId, struct Task *task, struct EventObject *trainerObj) { - if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) - || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj)) + if (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) + || EventObjectClearAnimIfSpecialAnimFinished(trainerObj)) { - FieldObjectSetSpecialAnim(trainerObj, 0x59); + EventObjectSetSpecialAnim(trainerObj, 0x59); task->tFuncId++; } return FALSE; } -static bool8 sub_80B4390(u8 taskId, struct Task *task, struct MapObject *trainerObj) +static bool8 sub_80B4390(u8 taskId, struct Task *task, struct EventObject *trainerObj) { - if (FieldObjectClearAnimIfSpecialAnimFinished(trainerObj)) + if (EventObjectClearAnimIfSpecialAnimFinished(trainerObj)) task->tFuncId = 3; return FALSE; } -static bool8 sub_80B43AC(u8 taskId, struct Task *task, struct MapObject *trainerObj) +static bool8 sub_80B43AC(u8 taskId, struct Task *task, struct EventObject *trainerObj) { - if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) - || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj)) + if (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) + || EventObjectClearAnimIfSpecialAnimFinished(trainerObj)) { - FieldObjectSetSpecialAnim(trainerObj, 0x3E); + EventObjectSetSpecialAnim(trainerObj, 0x3E); task->tFuncId++; } return FALSE; } -static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct MapObject *trainerObj) +static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct EventObject *trainerObj) { - if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(trainerObj)) + if (EventObjectCheckIfSpecialAnimFinishedOrInactive(trainerObj)) { gFieldEffectArguments[0] = trainerObj->currentCoords.x; gFieldEffectArguments[1] = trainerObj->currentCoords.y; @@ -556,7 +556,7 @@ static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct MapObject *trainer return FALSE; } -static bool8 sub_80B4438(u8 taskId, struct Task *task, struct MapObject *trainerObj) +static bool8 sub_80B4438(u8 taskId, struct Task *task, struct EventObject *trainerObj) { struct Sprite *sprite; @@ -567,15 +567,15 @@ static bool8 sub_80B4438(u8 taskId, struct Task *task, struct MapObject *trainer sprite = &gSprites[trainerObj->spriteId]; sprite->oam.priority = 2; - FieldObjectClearAnimIfSpecialAnimFinished(trainerObj); - FieldObjectSetSpecialAnim(trainerObj, sub_80934BC(trainerObj->facingDirection)); + EventObjectClearAnimIfSpecialAnimFinished(trainerObj); + EventObjectSetSpecialAnim(trainerObj, sub_80934BC(trainerObj->facingDirection)); task->tFuncId++; } return FALSE; } -static bool8 sub_80B44AC(u8 taskId, struct Task *task, struct MapObject *trainerObj) +static bool8 sub_80B44AC(u8 taskId, struct Task *task, struct EventObject *trainerObj) { if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) task->tFuncId = 3; @@ -586,34 +586,34 @@ static bool8 sub_80B44AC(u8 taskId, struct Task *task, struct MapObject *trainer #undef tFuncId #undef tTrainerRange #undef tOutOfAshSpriteId -#undef tTrainerMapObjectId +#undef tTrainerEventObjectId static void sub_80B44C8(u8 taskId) { struct Task *task = &gTasks[taskId]; - struct MapObject *mapObj; + struct EventObject *eventObj; - // another mapObj loaded into by loadword? - LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&mapObj); + // another eventObj loaded into by loadword? + LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&eventObj); if (!task->data[7]) { - FieldObjectClearAnim(mapObj); + EventObjectClearAnim(eventObj); task->data[7]++; } - sTrainerSeeFuncList2[task->data[0]](taskId, task, mapObj); + sTrainerSeeFuncList2[task->data[0]](taskId, task, eventObj); if (task->data[0] == 3 && !FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) { - npc_set_running_behaviour_etc(mapObj, npc_running_behaviour_by_direction(mapObj->facingDirection)); - sub_808F23C(mapObj, npc_running_behaviour_by_direction(mapObj->facingDirection)); + npc_set_running_behaviour_etc(eventObj, npc_running_behaviour_by_direction(eventObj->facingDirection)); + sub_808F23C(eventObj, npc_running_behaviour_by_direction(eventObj->facingDirection)); DestroyTask(taskId); } else { - mapObj->heldMovementFinished = 0; + eventObj->heldMovementFinished = 0; } } -void sub_80B4578(struct MapObject *var) +void sub_80B4578(struct EventObject *var) { StoreWordInTwoHalfwords(&gTasks[CreateTask(sub_80B44C8, 0)].data[1], (u32)var); } @@ -637,8 +637,8 @@ void sub_80B45D0(void) { gApproachingTrainerId++; gSpecialVar_Result = 1; - UnfreezeMapObjects(); - FreezeMapObjectsExceptOne(gApproachingTrainers[1].mapObjectId); + UnfreezeEventObjects(); + FreezeEventObjectsExceptOne(gApproachingTrainers[1].eventObjectId); } else { @@ -710,21 +710,21 @@ static void SetIconSpriteData(struct Sprite *sprite, u16 fldEffId, u8 spriteAnim static void SpriteCB_TrainerIcons(struct Sprite *sprite) { - u8 mapObjId; + u8 eventObjId; - if (TryGetFieldObjectIdByLocalIdAndMap(sprite->sLocalId, sprite->sMapNum, sprite->sMapGroup, &mapObjId) + if (TryGetEventObjectIdByLocalIdAndMap(sprite->sLocalId, sprite->sMapNum, sprite->sMapGroup, &eventObjId) || sprite->animEnded) { FieldEffectStop(sprite, sprite->sFldEffId); } else { - struct Sprite *mapObjSprite = &gSprites[gMapObjects[mapObjId].spriteId]; + struct Sprite *eventObjSprite = &gSprites[gEventObjects[eventObjId].spriteId]; sprite->sData4 += sprite->sData3; - sprite->pos1.x = mapObjSprite->pos1.x; - sprite->pos1.y = mapObjSprite->pos1.y - 16; - sprite->pos2.x = mapObjSprite->pos2.x; - sprite->pos2.y = mapObjSprite->pos2.y + sprite->sData4; + sprite->pos1.x = eventObjSprite->pos1.x; + sprite->pos1.y = eventObjSprite->pos1.y - 16; + sprite->pos2.x = eventObjSprite->pos2.x; + sprite->pos2.y = eventObjSprite->pos2.y + sprite->sData4; if (sprite->sData4) sprite->sData3++; else @@ -739,38 +739,38 @@ static void SpriteCB_TrainerIcons(struct Sprite *sprite) #undef sData4 #undef sFldEffId -u8 GetCurrentApproachingTrainerMapObjectId(void) +u8 GetCurrentApproachingTrainerEventObjectId(void) { if (gApproachingTrainerId == 0) - return gApproachingTrainers[0].mapObjectId; + return gApproachingTrainers[0].eventObjectId; else - return gApproachingTrainers[1].mapObjectId; + return gApproachingTrainers[1].eventObjectId; } -u8 GetChosenApproachingTrainerMapObjectId(u8 arrayId) +u8 GetChosenApproachingTrainerEventObjectId(u8 arrayId) { if (arrayId >= ARRAY_COUNT(gApproachingTrainers)) return 0; else if (arrayId == 0) - return gApproachingTrainers[0].mapObjectId; + return gApproachingTrainers[0].eventObjectId; else - return gApproachingTrainers[1].mapObjectId; + return gApproachingTrainers[1].eventObjectId; } void sub_80B4808(void) { - struct MapObject *trainerObj; + struct EventObject *trainerObj; if (gUnknown_030060AC == 1) { - trainerObj = &gMapObjects[gApproachingTrainers[gUnknown_03006080].mapObjectId]; + trainerObj = &gEventObjects[gApproachingTrainers[gUnknown_03006080].eventObjectId]; gUnknown_03006084[0] = GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->facingDirection)); gUnknown_03006084[1] = 0xFE; ScriptMovement_StartObjectMovementScript(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gUnknown_03006084); } else { - trainerObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + trainerObj = &gEventObjects[gPlayerAvatar.eventObjectId]; gUnknown_03006084[0] = GetFaceDirectionAnimId(trainerObj->facingDirection); gUnknown_03006084[1] = 0xFE; ScriptMovement_StartObjectMovementScript(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gUnknown_03006084); diff --git a/src/tv.c b/src/tv.c index 5c10372931..2219a720b6 100644 --- a/src/tv.c +++ b/src/tv.c @@ -1037,7 +1037,7 @@ u8 GabbyAndTyGetLastBattleTrivia(void) return 0; } -void GabbyAndTySetScriptVarsToFieldObjectLocalIds(void) +void GabbyAndTySetScriptVarsToEventObjectLocalIds(void) { switch (GabbyAndTyGetBattleNum()) { @@ -3602,7 +3602,7 @@ void GetMomOrDadStringForTVMessage(void) void sub_80F01B8(void) { VarSet(VAR_0x40BC, 0); - RemoveFieldObjectByLocalIdAndMap(5, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + RemoveEventObjectByLocalIdAndMap(5, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); FlagSet(0x396); } diff --git a/sym_common.txt b/sym_common.txt index 64bfa88ec3..3fa3029686 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -27,7 +27,7 @@ gBGTilemapBuffers3: @ 3005DA4 .include "fieldmap.o" .include "field_camera.o" -gSelectedMapObject: @ 3005DF0 +gSelectedEventObject: @ 3005DF0 .space 0x4 gMenuCallback: @ 3005DF4 diff --git a/sym_ewram.txt b/sym_ewram.txt index 49fef1ad86..17fe48f704 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -216,7 +216,7 @@ gUnknown_020322D5: @ 20322D5 gUnknown_0203734C: @ 203734C .space 0x4 -gMapObjects: @ 2037350 +gEventObjects: @ 2037350 .space 0x240 gPlayerAvatar: @ 2037590 From 223ee357f73c61abce9029fafbe2b123a16d82a2 Mon Sep 17 00:00:00 2001 From: Avara <31101124+Mother-Of-Dragons@users.noreply.github.com> Date: Tue, 12 Jun 2018 12:12:29 +0100 Subject: [PATCH 10/55] battle dome palette label update to graphics.s --- data/graphics.s | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/graphics.s b/data/graphics.s index 8527e570d0..fdfa76343e 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -2895,19 +2895,19 @@ gUnknown_08D85620:: @ 8D85620 @ dome anim pals .align 2 -gUnknown_08D85640:: @ 8D85640 +gTilesetAnims_BattleDomePals0_0:: @ 8D85640 .incbin "graphics/battle_frontier/dome_anim1.gbapal" .align 2 -gUnknown_08D85660:: @ 8D85660 +gTilesetAnims_BattleDomePals0_1:: @ 8D85660 .incbin "graphics/battle_frontier/dome_anim2.gbapal" .align 2 -gUnknown_08D85680:: @ 8D85680 +gTilesetAnims_BattleDomePals0_2:: @ 8D85680 .incbin "graphics/battle_frontier/dome_anim3.gbapal" .align 2 -gUnknown_08D856A0:: @ 8D856A0 +gTilesetAnims_BattleDomePals0_3:: @ 8D856A0 .incbin "graphics/battle_frontier/dome_anim4.gbapal" @ 8D856C0 From 4d13e3394ad44eaa5dab972e73985dd1820069ea Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 13 Jun 2018 17:51:26 -0500 Subject: [PATCH 11/55] Bring all movement function names up-to-date with pokeruby --- asm/battle_frontier_1.s | 2 +- asm/battle_frontier_2.s | 2 +- asm/field_control_avatar.s | 6 +- asm/field_effect_helpers.s | 26 +- asm/field_player_avatar.s | 218 +- asm/field_screen.s | 16 +- asm/field_specials.s | 6 +- asm/fldeff_80F9BCC.s | 26 +- asm/rom_8011DC0.s | 10 +- data/field_effect_scripts.s | 8 +- data/scripts/maps/LavaridgeTown.inc | 2 +- data/specials.inc | 2 +- include/event_object_movement.h | 834 ++- include/field_effect.h | 4 +- include/field_player_avatar.h | 8 +- include/overworld.h | 2 +- include/trainer_see.h | 4 +- src/battle_setup.c | 2 +- src/berry.c | 4 +- src/bike.c | 18 +- .../movement_action_func_tables.h | 2378 +++---- .../movement_type_func_tables.h | 592 +- src/decoration.c | 2 +- src/event_obj_lock.c | 8 +- src/event_object_movement.c | 5518 +++++++++++------ src/field_camera.c | 2 +- src/field_effect.c | 86 +- src/field_special_scene.c | 4 +- src/item_use.c | 12 +- src/overworld.c | 22 +- src/rom6.c | 10 +- src/scrcmd.c | 10 +- src/script_movement.c | 8 +- src/trainer_see.c | 72 +- sym_ewram.txt | 2 +- 35 files changed, 5867 insertions(+), 4059 deletions(-) diff --git a/asm/battle_frontier_1.s b/asm/battle_frontier_1.s index 535bbbbbe4..522c5d5f5e 100644 --- a/asm/battle_frontier_1.s +++ b/asm/battle_frontier_1.s @@ -14294,7 +14294,7 @@ sub_81963F0: @ 81963F0 lsls r0, 2 ldr r1, =gEventObjects adds r0, r1 - bl EventObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearHeldMovementIfFinished bl sub_80D338C bl UnfreezeEventObjects bl ScriptContext2_Disable diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s index c42d966404..b2b4542789 100644 --- a/asm/battle_frontier_2.s +++ b/asm/battle_frontier_2.s @@ -27222,7 +27222,7 @@ _081A896E: lsls r0, 2 ldr r1, =gEventObjects adds r0, r1 - bl EventObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearHeldMovementIfFinished bl sub_80D338C pop {r4} pop {r0} diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index ff10928cb7..c2b13e2bfc 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -189,7 +189,7 @@ sub_809C014: @ 809C014 strh r1, [r0] ldr r0, =gSelectedEventObject strb r1, [r0] - bl player_get_direction_lower_nybble + bl GetPlayerFacingDirection lsls r0, 24 lsrs r6, r0, 24 mov r4, sp @@ -2452,7 +2452,7 @@ _0809D276: GetEventObjectScriptPointerForComparison: @ 809D280 push {r4,r5,lr} sub sp, 0x8 - bl player_get_direction_upper_nybble + bl GetPlayerMovementDirection adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -2481,7 +2481,7 @@ GetEventObjectScriptPointerForComparison: @ 809D280 sub_809D2BC: @ 809D2BC push {r4,lr} sub sp, 0x8 - bl player_get_direction_upper_nybble + bl GetPlayerMovementDirection mov r4, sp mov r0, sp bl player_get_pos_to_and_height diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s index 08df3215c2..6cf62ba8bd 100644 --- a/asm/field_effect_helpers.s +++ b/asm/field_effect_helpers.s @@ -931,7 +931,7 @@ _08154624: _08154632: adds r0, r5, 0 movs r1, 0 - bl sub_80979D4 + bl UpdateEventObjectSpriteVisibility ldrh r1, [r5, 0x2E] lsls r1, 24 lsrs r1, 24 @@ -1262,7 +1262,7 @@ _081548B4: _081548D4: adds r0, r5, 0 movs r1, 0 - bl sub_80979D4 + bl UpdateEventObjectSpriteVisibility ldrh r1, [r5, 0x2E] lsls r1, 24 lsrs r1, 24 @@ -1523,7 +1523,7 @@ _08154AB2: lsls r1, 29 lsrs r1, 31 adds r0, r4, 0 - bl sub_80979D4 + bl UpdateEventObjectSpriteVisibility _08154AF2: add sp, 0x4 pop {r3} @@ -1729,7 +1729,7 @@ sub_8154C7C: @ 8154C7C _08154C92: adds r0, r1, 0 movs r1, 0 - bl sub_80979D4 + bl UpdateEventObjectSpriteVisibility pop {r0} bx r0 thumb_func_end sub_8154C7C @@ -1758,7 +1758,7 @@ sub_8154CA0: @ 8154CA0 lsls r1, 29 lsrs r1, 31 adds r0, r4, 0 - bl sub_80979D4 + bl UpdateEventObjectSpriteVisibility movs r1, 0x30 ldrsh r0, [r4, r1] cmp r0, 0x38 @@ -1910,7 +1910,7 @@ _08154DCA: strh r0, [r4, 0x22] adds r0, r4, 0 movs r1, 0 - bl sub_80979D4 + bl UpdateEventObjectSpriteVisibility _08154E0A: add sp, 0x4 pop {r4} @@ -2162,7 +2162,7 @@ _08154FFC: strb r0, [r1] adds r0, r4, 0 movs r1, 0 - bl sub_80979D4 + bl UpdateEventObjectSpriteVisibility ldr r1, [r5, 0x10] ldr r0, [r4, 0x34] cmp r1, r0 @@ -2381,7 +2381,7 @@ _081551A0: strb r0, [r1] adds r0, r4, 0 movs r1, 0 - bl sub_80979D4 + bl UpdateEventObjectSpriteVisibility _081551E4: add sp, 0x4 pop {r4,r5} @@ -2789,7 +2789,7 @@ sub_815550C: @ 815550C push {r4,lr} adds r4, r0, 0 movs r1, 0 - bl sub_80979D4 + bl UpdateEventObjectSpriteVisibility adds r0, r4, 0 adds r0, 0x3F ldrb r1, [r0] @@ -3493,7 +3493,7 @@ _08155A46: strb r0, [r1] adds r0, r4, 0 movs r1, 0 - bl sub_80979D4 + bl UpdateEventObjectSpriteVisibility _08155A76: add sp, 0x4 pop {r4-r6} @@ -3567,7 +3567,7 @@ sub_8155AEC: @ 8155AEC strh r1, [r4, 0x22] adds r0, r4, 0 movs r1, 0 - bl sub_80979D4 + bl UpdateEventObjectSpriteVisibility ldrh r1, [r4, 0x3E] ldr r0, =0x00001004 ands r0, r1 @@ -4460,7 +4460,7 @@ sub_8156194: @ 8156194 _081561B2: adds r0, r4, 0 movs r1, 0 - bl sub_80979D4 + bl UpdateEventObjectSpriteVisibility ldrh r0, [r4, 0x2E] lsls r0, 24 lsrs r0, 24 @@ -4492,7 +4492,7 @@ sub_81561D0: @ 81561D0 _081561EE: adds r0, r2, 0 movs r1, 0 - bl sub_80979D4 + bl UpdateEventObjectSpriteVisibility _081561F6: pop {r0} bx r0 diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index 3751773371..c0becc6da6 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -5,9 +5,9 @@ .text - thumb_func_start EventObjectCB_NoMovement2 -@ void EventObjectCB_NoMovement2(struct obj *object) -EventObjectCB_NoMovement2: @ 808A998 + thumb_func_start MovementType_Player +@ void MovementType_Player(struct obj *object) +MovementType_Player: @ 808A998 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -18,11 +18,11 @@ EventObjectCB_NoMovement2: @ 808A998 ldr r2, =gEventObjects adds r0, r2 ldr r2, =EventObjectCB2_NoMovement2 - bl EventObjectStep + bl UpdateEventObjectCurrentMovement pop {r0} bx r0 .pool - thumb_func_end EventObjectCB_NoMovement2 + thumb_func_end MovementType_Player thumb_func_start EventObjectCB2_NoMovement2 EventObjectCB2_NoMovement2: @ 808A9BC @@ -93,17 +93,17 @@ TryInterruptEventObjectSpecialAnim: @ 808AA38 lsls r1, 24 lsrs r5, r1, 24 adds r6, r5, 0 - bl EventObjectIsSpecialAnimOrDirectionSequenceAnimActive + bl EventObjectIsMovementOverridden lsls r0, 24 cmp r0, 0 beq _0808AA92 adds r0, r4, 0 - bl EventObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 bne _0808AA92 adds r0, r4, 0 - bl EventObjectGetSpecialAnim + bl EventObjectGetHeldMovementActionId lsls r0, 24 movs r1, 0xE7 lsls r1, 24 @@ -123,7 +123,7 @@ _0808AA74: beq _0808AA84 _0808AA7C: adds r0, r4, 0 - bl EventObjectClearAnim + bl EventObjectClearHeldMovement b _0808AA92 _0808AA84: adds r0, r6, 0 @@ -302,7 +302,7 @@ ForcedMovement_None: @ 808AB94 ldrb r1, [r0, 0x18] lsls r1, 28 lsrs r1, 28 - bl EventObjectSetDirection + bl SetEventObjectDirection ldrb r1, [r4] movs r0, 0xBF ands r0, r1 @@ -697,7 +697,7 @@ CheckMovementInputNotOnBike: @ 808AE98 b _0808AED2 .pool _0808AEB0: - bl player_get_direction_upper_nybble + bl GetPlayerMovementDirection lsls r0, 24 lsrs r0, 24 cmp r4, r0 @@ -725,7 +725,7 @@ _0808AED2: @ void PlayerNotOnBikeNotMoving(u8 direction, u8 heldKeys) PlayerNotOnBikeNotMoving: @ 808AEDC push {lr} - bl player_get_direction_lower_nybble + bl GetPlayerFacingDirection lsls r0, 24 lsrs r0, 24 bl PlayerFaceDirection @@ -963,7 +963,7 @@ CheckForEventObjectCollision: @ 808B094 adds r1, r5, 0 adds r2, r4, 0 adds r3, r6, 0 - bl npc_block_way + bl GetCollisionAtCoords lsls r0, 24 lsrs r0, 24 mov r1, sp @@ -1061,7 +1061,7 @@ sub_808B164: @ 808B164 adds r1, r5, 0 adds r2, r4, 0 adds r3, r6, 0 - bl npc_block_way + bl GetCollisionAtCoords lsls r0, 24 lsrs r0, 24 mov r1, sp @@ -1211,7 +1211,7 @@ sub_808B238: @ 808B238 ldrsh r2, [r5, r0] adds r0, r4, 0 adds r3, r7, 0 - bl npc_block_way + bl GetCollisionAtCoords lsls r0, 24 cmp r0, 0 bne _0808B2D8 @@ -1698,7 +1698,7 @@ PlayerIsAnimActive: @ 808B63C lsls r0, 2 ldr r1, =gEventObjects adds r0, r1 - bl EventObjectIsSpecialAnimOrDirectionSequenceAnimActive + bl EventObjectIsMovementOverridden lsls r0, 24 lsrs r0, 24 pop {r1} @@ -1717,7 +1717,7 @@ PlayerCheckIfAnimFinishedOrInactive: @ 808B660 lsls r0, 2 ldr r1, =gEventObjects adds r0, r1 - bl EventObjectCheckIfSpecialAnimFinishedOrInactive + bl EventObjectCheckHeldMovementStatus lsls r0, 24 lsrs r0, 24 pop {r1} @@ -1740,8 +1740,8 @@ player_set_x22: @ 808B684 .pool thumb_func_end player_set_x22 - thumb_func_start player_get_x22 -player_get_x22: @ 808B6A0 + thumb_func_start PlayerGetCopyableMovement +PlayerGetCopyableMovement: @ 808B6A0 ldr r2, =gEventObjects ldr r0, =gPlayerAvatar ldrb r1, [r0, 0x5] @@ -1753,7 +1753,7 @@ player_get_x22: @ 808B6A0 ldrb r0, [r0] bx lr .pool - thumb_func_end player_get_x22 + thumb_func_end PlayerGetCopyableMovement thumb_func_start sub_808B6BC sub_808B6BC: @ 808B6BC @@ -1768,7 +1768,7 @@ sub_808B6BC: @ 808B6BC lsls r0, 2 ldr r2, =gEventObjects adds r0, r2 - bl EventObjectForceSetSpecialAnim + bl EventObjectForceSetHeldMovement pop {r0} bx r0 .pool @@ -1796,7 +1796,7 @@ PlayerSetAnimId: @ 808B6E4 ldr r1, =gEventObjects adds r0, r1 adds r1, r5, 0 - bl EventObjectSetSpecialAnim + bl EventObjectSetHeldMovement _0808B712: pop {r4,r5} pop {r0} @@ -1810,7 +1810,7 @@ PlayerGoSpeed1: @ 808B720 push {lr} lsls r0, 24 lsrs r0, 24 - bl GetGoSpeed0AnimId + bl GetWalkNormalMovementAction lsls r0, 24 lsrs r0, 24 movs r1, 0x2 @@ -1825,7 +1825,7 @@ PlayerGoSpeed2: @ 808B738 push {lr} lsls r0, 24 lsrs r0, 24 - bl GetGoSpeed1AnimId + bl GetWalkFastMovementAction lsls r0, 24 lsrs r0, 24 movs r1, 0x2 @@ -1840,7 +1840,7 @@ PlayerGoSpeed3: @ 808B750 push {lr} lsls r0, 24 lsrs r0, 24 - bl GetGoSpeed2AnimId + bl GetRideWaterCurrentMovementAction lsls r0, 24 lsrs r0, 24 movs r1, 0x2 @@ -1855,7 +1855,7 @@ PlayerGoSpeed4: @ 808B768 push {lr} lsls r0, 24 lsrs r0, 24 - bl GetGoSpeed3AnimId + bl GetWalkFastestMovementAction lsls r0, 24 lsrs r0, 24 movs r1, 0x2 @@ -1870,7 +1870,7 @@ PlayerRun: @ 808B780 push {lr} lsls r0, 24 lsrs r0, 24 - bl GetRunAnimId + bl GetPlayerRunMovementAction lsls r0, 24 lsrs r0, 24 movs r1, 0x2 @@ -1889,7 +1889,7 @@ PlayerOnBikeCollide: @ 808B798 adds r0, r4, 0 bl PlayCollisionSoundIfNotFacingWarp adds r0, r4, 0 - bl GetStepInPlaceDelay16AnimId + bl GetWalkInPlaceNormalMovementAction lsls r0, 24 lsrs r0, 24 movs r1, 0x2 @@ -1905,7 +1905,7 @@ PlayerOnBikeCollideWithFarawayIslandMew: @ 808B7BC push {lr} lsls r0, 24 lsrs r0, 24 - bl GetStepInPlaceDelay16AnimId + bl GetWalkInPlaceNormalMovementAction lsls r0, 24 lsrs r0, 24 movs r1, 0x2 @@ -1924,7 +1924,7 @@ PlayerNotOnBikeCollide: @ 808B7D4 adds r0, r4, 0 bl PlayCollisionSoundIfNotFacingWarp adds r0, r4, 0 - bl GetStepInPlaceDelay32AnimId + bl GetWalkInPlaceSlowMovementAction lsls r0, 24 lsrs r0, 24 movs r1, 0x2 @@ -1940,7 +1940,7 @@ PlayerNotOnBikeCollideWithFarawayIslandMew: @ 808B7F8 push {lr} lsls r0, 24 lsrs r0, 24 - bl GetStepInPlaceDelay32AnimId + bl GetWalkInPlaceSlowMovementAction lsls r0, 24 lsrs r0, 24 movs r1, 0x2 @@ -1955,7 +1955,7 @@ PlayerFaceDirection: @ 808B810 push {lr} lsls r0, 24 lsrs r0, 24 - bl GetFaceDirectionAnimId + bl GetFaceDirectionMovementAction lsls r0, 24 lsrs r0, 24 movs r1, 0x1 @@ -1970,7 +1970,7 @@ PlayerTurnInPlace: @ 808B828 push {lr} lsls r0, 24 lsrs r0, 24 - bl GetStepInPlaceDelay8AnimId + bl GetWalkInPlaceFastMovementAction lsls r0, 24 lsrs r0, 24 movs r1, 0x1 @@ -1989,7 +1989,7 @@ PlayerJumpLedge: @ 808B840 movs r0, 0xA bl PlaySE adds r0, r4, 0 - bl GetJumpLedgeAnimId + bl GetJump2MovementAction lsls r0, 24 lsrs r0, 24 movs r1, 0x8 @@ -2022,7 +2022,7 @@ _0808B872: ldrb r0, [r0, 0x18] lsls r0, 28 lsrs r0, 28 - bl GetFaceDirectionAnimId + bl GetFaceDirectionMovementAction lsls r0, 24 lsrs r0, 24 bl sub_808B6BC @@ -2038,7 +2038,7 @@ PlayerIdleWheelie: @ 808B8A8 push {lr} lsls r0, 24 lsrs r0, 24 - bl sub_8093648 + bl GetAcroWheelieFaceDirectionMovementAction lsls r0, 24 lsrs r0, 24 movs r1, 0x1 @@ -2052,7 +2052,7 @@ PlayerStartWheelie: @ 808B8C0 push {lr} lsls r0, 24 lsrs r0, 24 - bl sub_8093674 + bl GetAcroPopWheelieFaceDirectionMovementAction lsls r0, 24 lsrs r0, 24 movs r1, 0x1 @@ -2066,7 +2066,7 @@ PlayerEndWheelie: @ 808B8D8 push {lr} lsls r0, 24 lsrs r0, 24 - bl sub_80936A0 + bl GetAcroEndWheelieFaceDirectionMovementAction lsls r0, 24 lsrs r0, 24 movs r1, 0x1 @@ -2084,7 +2084,7 @@ PlayerStandingHoppingWheelie: @ 808B8F0 movs r0, 0x22 bl PlaySE adds r0, r4, 0 - bl sub_80936CC + bl GetAcroWheelieHopFaceDirectionMovementAction lsls r0, 24 lsrs r0, 24 movs r1, 0x1 @@ -2103,7 +2103,7 @@ PlayerMovingHoppingWheelie: @ 808B914 movs r0, 0x22 bl PlaySE adds r0, r4, 0 - bl sub_80936F8 + bl GetAcroWheelieHopDirectionMovementAction lsls r0, 24 lsrs r0, 24 movs r1, 0x2 @@ -2122,7 +2122,7 @@ PlayerLedgeHoppingWheelie: @ 808B938 movs r0, 0x22 bl PlaySE adds r0, r4, 0 - bl sub_8093724 + bl GetAcroWheelieJumpDirectionMovementAction lsls r0, 24 lsrs r0, 24 movs r1, 0x8 @@ -2141,7 +2141,7 @@ PlayerAcroTurnJump: @ 808B95C movs r0, 0x22 bl PlaySE adds r0, r4, 0 - bl sub_80934E8 + bl GetJumpInPlaceTurnAroundMovementAction lsls r0, 24 lsrs r0, 24 movs r1, 0x1 @@ -2160,7 +2160,7 @@ sub_808B980: @ 808B980 movs r0, 0x7 bl PlaySE adds r0, r4, 0 - bl sub_8093750 + bl GetAcroWheelieInPlaceDirectionMovementAction lsls r0, 24 lsrs r0, 24 movs r1, 0x2 @@ -2175,7 +2175,7 @@ sub_808B9A4: @ 808B9A4 push {lr} lsls r0, 24 lsrs r0, 24 - bl sub_809377C + bl GetAcroPopWheelieMoveDirectionMovementAction lsls r0, 24 lsrs r0, 24 movs r1, 0x2 @@ -2189,7 +2189,7 @@ sub_808B9BC: @ 808B9BC push {lr} lsls r0, 24 lsrs r0, 24 - bl sub_80937A8 + bl GetAcroWheelieMoveDirectionMovementAction lsls r0, 24 lsrs r0, 24 movs r1, 0x2 @@ -2203,7 +2203,7 @@ npc_use_some_d2s: @ 808B9D4 push {lr} lsls r0, 24 lsrs r0, 24 - bl d2s_08064034 + bl GetAcroEndWheelieMoveDirectionMovementAction lsls r0, 24 lsrs r0, 24 movs r1, 0x2 @@ -2291,7 +2291,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 808BA68 adds r0, r3 ldrh r0, [r0, 0x12] strh r0, [r5] - bl player_get_direction_lower_nybble + bl GetPlayerFacingDirection lsls r0, 24 lsrs r0, 24 adds r1, r4, 0 @@ -2462,9 +2462,9 @@ _0808BC30: bx r1 thumb_func_end plaer_get_pos_including_state_based_drift - thumb_func_start player_get_direction_lower_nybble -@ u8 player_get_direction_lower_nybble() -player_get_direction_lower_nybble: @ 808BC38 + thumb_func_start GetPlayerFacingDirection +@ u8 GetPlayerFacingDirection() +GetPlayerFacingDirection: @ 808BC38 ldr r2, =gEventObjects ldr r0, =gPlayerAvatar ldrb r1, [r0, 0x5] @@ -2477,11 +2477,11 @@ player_get_direction_lower_nybble: @ 808BC38 lsrs r0, 28 bx lr .pool - thumb_func_end player_get_direction_lower_nybble + thumb_func_end GetPlayerFacingDirection - thumb_func_start player_get_direction_upper_nybble -@ u8 player_get_direction_upper_nybble() -player_get_direction_upper_nybble: @ 808BC58 + thumb_func_start GetPlayerMovementDirection +@ u8 GetPlayerMovementDirection() +GetPlayerMovementDirection: @ 808BC58 ldr r2, =gEventObjects ldr r0, =gPlayerAvatar ldrb r1, [r0, 0x5] @@ -2493,7 +2493,7 @@ player_get_direction_upper_nybble: @ 808BC58 lsrs r0, 4 bx lr .pool - thumb_func_end player_get_direction_upper_nybble + thumb_func_end GetPlayerMovementDirection thumb_func_start PlayerGetZCoord @ u8 PlayerGetZCoord() @@ -2586,7 +2586,7 @@ sub_808BCF4: @ 808BCF4 lsls r1, 28 lsrs r1, 28 adds r0, r4, 0 - bl EventObjectSetDirection + bl SetEventObjectDirection movs r0, 0x6 bl TestPlayerAvatarFlags lsls r0, 24 @@ -2780,7 +2780,7 @@ _0808BE46: @ bool8 IsPlayerSurfingNorth() IsPlayerSurfingNorth: @ 808BE50 push {lr} - bl player_get_direction_upper_nybble + bl GetPlayerMovementDirection lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 @@ -2833,7 +2833,7 @@ IsPlayerFacingSurfableFishableWater: @ 808BE74 lsls r3, 28 lsrs r3, 28 adds r0, r4, 0 - bl npc_block_way + bl GetCollisionAtCoords lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 @@ -3202,7 +3202,7 @@ sub_808C15C: @ 808C15C ldr r0, =gSprites adds r4, r0 adds r0, r5, 0 - bl sub_8092A0C + bl GetFishingDirectionAnimNum adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -3244,7 +3244,7 @@ sub_808C1B4: @ 808C1B4 mov r8, r0 add r4, r8 adds r0, r5, 0 - bl sub_80929BC + bl GetAcroWheelieDirectionAnimNum adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -3292,7 +3292,7 @@ sub_808C228: @ 808C228 ldr r0, =gSprites adds r4, r0 adds r0, r5, 0 - bl EventObjectDirectionToImageAnimId + bl GetFaceDirectionAnimNum adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -3474,49 +3474,49 @@ do_boulder_dust: @ 808C3C4 adds r5, r1, 0 adds r4, r2, 0 adds r0, r5, 0 - bl EventObjectIsSpecialAnimActive + bl EventObjectIsHeldMovementActive lsls r0, 24 cmp r0, 0 beq _0808C3DE adds r0, r5, 0 - bl EventObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearHeldMovementIfFinished _0808C3DE: adds r0, r4, 0 - bl EventObjectIsSpecialAnimActive + bl EventObjectIsHeldMovementActive lsls r0, 24 cmp r0, 0 beq _0808C3F0 adds r0, r4, 0 - bl EventObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearHeldMovementIfFinished _0808C3F0: adds r0, r5, 0 - bl EventObjectIsSpecialAnimOrDirectionSequenceAnimActive + bl EventObjectIsMovementOverridden lsls r0, 24 cmp r0, 0 bne _0808C472 adds r0, r4, 0 - bl EventObjectIsSpecialAnimOrDirectionSequenceAnimActive + bl EventObjectIsMovementOverridden lsls r0, 24 cmp r0, 0 bne _0808C472 adds r0, r5, 0 - bl EventObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearHeldMovementIfFinished adds r0, r4, 0 - bl EventObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearHeldMovementIfFinished ldrb r0, [r6, 0xC] - bl GetStepInPlaceDelay16AnimId + bl GetWalkInPlaceNormalMovementAction adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl EventObjectSetSpecialAnim + bl EventObjectSetHeldMovement ldrb r0, [r6, 0xC] - bl GetSimpleGoAnimId + bl GetWalkSlowMovementAction adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl EventObjectSetSpecialAnim + bl EventObjectSetHeldMovement ldr r2, =gFieldEffectArguments movs r1, 0x10 ldrsh r0, [r4, r1] @@ -3558,19 +3558,19 @@ sub_808C484: @ 808C484 adds r4, r1, 0 adds r5, r2, 0 adds r0, r4, 0 - bl EventObjectCheckIfSpecialAnimFinishedOrInactive + bl EventObjectCheckHeldMovementStatus lsls r0, 24 cmp r0, 0 beq _0808C4C6 adds r0, r5, 0 - bl EventObjectCheckIfSpecialAnimFinishedOrInactive + bl EventObjectCheckHeldMovementStatus lsls r0, 24 cmp r0, 0 beq _0808C4C6 adds r0, r4, 0 - bl EventObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearHeldMovementIfFinished adds r0, r5, 0 - bl EventObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearHeldMovementIfFinished ldr r1, =gPlayerAvatar movs r0, 0 strb r0, [r1, 0x6] @@ -3648,7 +3648,7 @@ sub_808C544: @ 808C544 movs r0, 0x1 strb r0, [r5, 0x6] adds r0, r4, 0 - bl EventObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _0808C5A0 @@ -3657,12 +3657,12 @@ sub_808C544: @ 808C544 ldrb r0, [r4, 0x18] lsls r0, 28 lsrs r0, 28 - bl sub_80934BC + bl GetJumpInPlaceMovementAction adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl EventObjectSetSpecialAnim + bl EventObjectSetHeldMovement ldrh r0, [r6, 0xA] adds r0, 0x1 strh r0, [r6, 0xA] @@ -3772,7 +3772,7 @@ sub_808C644: @ 808C644 movs r2, 0x4 bl memcpy adds r0, r5, 0 - bl EventObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _0808C6AC @@ -3782,12 +3782,12 @@ sub_808C644: @ 808C644 add r0, sp ldrb r6, [r0] adds r0, r6, 0 - bl GetFaceDirectionAnimId + bl GetFaceDirectionMovementAction adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl EventObjectSetSpecialAnim + bl EventObjectSetHeldMovement ldrb r0, [r4, 0xA] cmp r6, r0 bne _0808C68A @@ -3831,7 +3831,7 @@ sub_808C6BC: @ 808C6BC movs r2, 0x5 bl memcpy adds r0, r4, 0 - bl EventObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _0808C6EC @@ -3840,7 +3840,7 @@ sub_808C6BC: @ 808C6BC add r0, sp ldrb r1, [r0] adds r0, r4, 0 - bl EventObjectSetSpecialAnim + bl EventObjectSetHeldMovement movs r0, 0x1 strh r0, [r5, 0x8] _0808C6EC: @@ -3858,7 +3858,7 @@ sub_808C6FC: @ 808C6FC adds r4, r0, 0 adds r5, r1, 0 adds r0, r5, 0 - bl EventObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _0808C740 @@ -3866,12 +3866,12 @@ sub_808C6FC: @ 808C6FC bl GetOppositeDirection lsls r0, 24 lsrs r0, 24 - bl GetSimpleGoAnimId + bl GetWalkSlowMovementAction adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl EventObjectSetSpecialAnim + bl EventObjectSetHeldMovement bl ScriptContext2_Disable ldr r1, =gPlayerAvatar movs r0, 0 @@ -3939,12 +3939,12 @@ taskFF_0805D1D4: @ 808C7A8 ldr r1, =gEventObjects adds r5, r0, r1 adds r0, r5, 0 - bl EventObjectIsSpecialAnimOrDirectionSequenceAnimActive + bl EventObjectIsMovementOverridden lsls r0, 24 cmp r0, 0 beq _0808C7D4 adds r0, r5, 0 - bl EventObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _0808C7FC @@ -3958,12 +3958,12 @@ _0808C7D4: lsls r4, 3 adds r4, r0 ldrb r0, [r4, 0x8] - bl sub_8093540 + bl GetJumpSpecialMovementAction adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl EventObjectSetSpecialAnim + bl EventObjectSetHeldMovement ldr r0, =sub_808C814 str r0, [r4] _0808C7FC: @@ -3986,7 +3986,7 @@ sub_808C814: @ 808C814 ldr r1, =gEventObjects adds r4, r0, r1 adds r0, r4, 0 - bl EventObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _0808C87A @@ -4000,12 +4000,12 @@ sub_808C814: @ 808C814 ldrb r0, [r4, 0x18] lsls r0, 28 lsrs r0, 28 - bl GetFaceDirectionAnimId + bl GetFaceDirectionMovementAction adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl EventObjectSetSpecialAnim + bl EventObjectSetHeldMovement movs r0, 0 strb r0, [r6, 0x6] bl ScriptContext2_Disable @@ -4142,7 +4142,7 @@ fish1: @ 808C918 lsls r4, 2 adds r4, r3 adds r0, r4, 0 - bl EventObjectClearAnimIfSpecialAnimActive + bl EventObjectClearHeldMovementIfActive ldrb r0, [r4, 0x1] movs r1, 0x8 orrs r0, r1 @@ -4373,10 +4373,10 @@ _0808CB32: lsls r4, 2 ldr r0, =gSprites adds r4, r0 - bl player_get_direction_lower_nybble + bl GetPlayerFacingDirection lsls r0, 24 lsrs r0, 24 - bl sub_8092A2C + bl GetFishingBiteDirectionAnimNum adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -4671,10 +4671,10 @@ fishB: @ 808CD94 lsls r4, 2 ldr r0, =gSprites adds r4, r0 - bl player_get_direction_lower_nybble + bl GetPlayerFacingDirection lsls r0, 24 lsrs r0, 24 - bl sub_8092A1C + bl GetFishingNoCatchDirectionAnimNum adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -4719,10 +4719,10 @@ fishC: @ 808CE04 lsls r4, 2 ldr r0, =gSprites adds r4, r0 - bl player_get_direction_lower_nybble + bl GetPlayerFacingDirection lsls r0, 24 lsrs r0, 24 - bl sub_8092A1C + bl GetFishingNoCatchDirectionAnimNum adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -4956,7 +4956,7 @@ _0808CFF0: bhi _0808D022 movs r0, 0x8 strh r0, [r4, 0x24] - bl player_get_direction_lower_nybble + bl GetPlayerFacingDirection lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 @@ -5066,7 +5066,7 @@ _0808D0E8: b _0808D18A _0808D0EE: adds r0, r4, 0 - bl EventObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _0808D18A @@ -5257,12 +5257,12 @@ _0808D25E: ldrsh r0, [r5, r3] adds r0, r1 ldrb r0, [r0] - bl GetFaceDirectionAnimId + bl GetFaceDirectionMovementAction adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl EventObjectForceSetSpecialAnim + bl EventObjectForceSetHeldMovement movs r0, 0 mov r9, r0 strh r6, [r5, 0x2] @@ -5414,7 +5414,7 @@ sub_808D38C: @ 808D38C ble _0808D3E4 _0808D3A8: adds r0, r5, 0 - bl EventObjectCheckIfSpecialAnimFinishedOrInactive + bl EventObjectCheckHeldMovementStatus lsls r0, 24 cmp r0, 0 beq _0808D3E4 @@ -5424,12 +5424,12 @@ _0808D3A8: lsrs r0, 28 adds r0, r4 ldrb r0, [r0] - bl GetFaceDirectionAnimId + bl GetFaceDirectionMovementAction adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl EventObjectForceSetSpecialAnim + bl EventObjectForceSetHeldMovement movs r0, 0 strh r0, [r6] ldrb r0, [r5, 0x18] diff --git a/asm/field_screen.s b/asm/field_screen.s index 5d5602b7f7..08eaf949a6 100644 --- a/asm/field_screen.s +++ b/asm/field_screen.s @@ -8413,7 +8413,7 @@ _080AF4A4: ldr r1, =gEventObjects adds r0, r1 movs r1, 0x8 - bl EventObjectSetSpecialAnim + bl EventObjectSetHeldMovement movs r0, 0x2 strh r0, [r5, 0x8] b _080AF54A @@ -8443,7 +8443,7 @@ _080AF4DC: lsls r0, 2 ldr r1, =gEventObjects adds r0, r1 - bl EventObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearHeldMovementIfFinished movs r0, 0x3 strh r0, [r5, 0x8] b _080AF54A @@ -8532,15 +8532,15 @@ _080AF5A2: lsls r4, 2 ldr r0, =gEventObjects adds r4, r0 - bl player_get_direction_lower_nybble + bl GetPlayerFacingDirection lsls r0, 24 lsrs r0, 24 - bl GetGoSpeed0AnimId + bl GetWalkNormalMovementAction adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl EventObjectSetSpecialAnim + bl EventObjectSetHeldMovement movs r0, 0x2 strh r0, [r5, 0x8] b _080AF60A @@ -9183,7 +9183,7 @@ _080AFB26: lsls r0, 2 ldr r4, =gEventObjects adds r0, r4 - bl EventObjectClearAnimIfSpecialAnimActive + bl EventObjectClearHeldMovementIfActive movs r0, 0xFF movs r1, 0 movs r2, 0 @@ -9196,7 +9196,7 @@ _080AFB26: lsls r0, 2 adds r0, r4 movs r1, 0x9 - bl EventObjectSetSpecialAnim + bl EventObjectSetHeldMovement movs r0, 0x2 strh r0, [r5, 0x8] b _080AFBE8 @@ -9227,7 +9227,7 @@ _080AFB6C: lsls r0, 2 ldr r1, =gEventObjects adds r0, r1 - bl EventObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearHeldMovementIfFinished movs r0, 0 bl sub_80AF0F4 movs r0, 0x3 diff --git a/asm/field_specials.s b/asm/field_specials.s index 6916fc6ead..3db5080015 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -766,7 +766,7 @@ SpawnLinkPartnerEventObject: @ 81382A0 lsls r0, 24 lsrs r0, 24 mov r10, r0 - bl player_get_direction_lower_nybble + bl GetPlayerFacingDirection lsls r0, 24 lsrs r0, 24 adds r1, r0, 0 @@ -1989,7 +1989,7 @@ PCTurnOnEffect_0: @ 8138D10 cmp r0, 0x6 bne _08138D7C strh r5, [r4, 0xE] - bl player_get_direction_lower_nybble + bl GetPlayerFacingDirection lsls r0, 24 lsrs r0, 24 adds r1, r0, 0 @@ -2134,7 +2134,7 @@ PCTurnOffEffect: @ 8138E2C movs r6, 0 movs r5, 0 movs r4, 0 - bl player_get_direction_lower_nybble + bl GetPlayerFacingDirection lsls r0, 24 lsrs r0, 24 adds r1, r0, 0 diff --git a/asm/fldeff_80F9BCC.s b/asm/fldeff_80F9BCC.s index 702852445e..840d38f64e 100644 --- a/asm/fldeff_80F9BCC.s +++ b/asm/fldeff_80F9BCC.s @@ -567,7 +567,7 @@ sub_80FA004: @ 80FA004 ldrh r0, [r0] cmp r0, 0x1 beq _080FA0AE - bl player_get_direction_lower_nybble + bl GetPlayerFacingDirection lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 @@ -1493,7 +1493,7 @@ sub_80FA794: @ 80FA794 lsls r1, 16 lsrs r4, r1, 16 adds r6, r4, 0 - bl player_get_direction_lower_nybble + bl GetPlayerFacingDirection lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1815,7 +1815,7 @@ sub_80FAA7C: @ 80FAA7C movs r3, 0 ldrsh r0, [r4, r3] str r0, [r1, 0x18] - bl player_get_direction_lower_nybble + bl GetPlayerFacingDirection lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 @@ -2315,29 +2315,29 @@ sub_80FAEF0: @ 80FAEF0 ldr r1, =gEventObjects adds r4, r0, r1 adds r0, r4, 0 - bl EventObjectIsSpecialAnimOrDirectionSequenceAnimActive + bl EventObjectIsMovementOverridden lsls r0, 24 cmp r0, 0 beq _080FAF1C adds r0, r4, 0 - bl EventObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _080FAF4E _080FAF1C: - bl player_get_direction_lower_nybble + bl GetPlayerFacingDirection lsls r0, 24 lsrs r0, 24 bl sub_808C228 - bl player_get_direction_lower_nybble + bl GetPlayerFacingDirection lsls r0, 24 lsrs r0, 24 - bl GetStepInPlaceDelay16AnimId + bl GetWalkInPlaceNormalMovementAction adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl EventObjectSetSpecialAnim + bl EventObjectSetHeldMovement ldr r1, =gTasks lsls r0, r5, 2 adds r0, r5 @@ -2365,7 +2365,7 @@ sub_80FAF64: @ 80FAF64 ldr r1, =gEventObjects adds r5, r0, r1 adds r0, r5, 0 - bl EventObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 beq _080FAFC8 @@ -2381,15 +2381,15 @@ sub_80FAF64: @ 80FAF64 asrs r0, 16 cmp r0, 0x9 bgt _080FAFC4 - bl player_get_direction_lower_nybble + bl GetPlayerFacingDirection lsls r0, 24 lsrs r0, 24 - bl GetStepInPlaceDelay16AnimId + bl GetWalkInPlaceNormalMovementAction adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl EventObjectSetSpecialAnim + bl EventObjectSetHeldMovement b _080FAFC8 .pool _080FAFC4: diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index 14e418f1c6..f906304cad 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -13609,13 +13609,13 @@ sub_8019AD8: @ 8019AD8 ldr r1, =gEventObjects adds r4, r0, r1 adds r0, r4, 0 - bl EventObjectIsSpecialAnimOrDirectionSequenceAnimActive + bl EventObjectIsMovementOverridden lsls r0, 24 cmp r0, 0 bne _08019B30 ldrb r1, [r5] adds r0, r4, 0 - bl EventObjectSetSpecialAnim + bl EventObjectSetHeldMovement lsls r0, 24 cmp r0, 0 bne _08019B30 @@ -13655,7 +13655,7 @@ sub_8019B3C: @ 8019B3C ldr r1, =gEventObjects adds r4, r0, r1 adds r0, r4, 0 - bl EventObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 bne _08019B84 @@ -13668,7 +13668,7 @@ _08019B84: cmp r0, 0 bne _08019B96 adds r0, r4, 0 - bl npc_sync_anim_pause_bits + bl UnfreezeEventObject b _08019B9C _08019B96: adds r0, r4, 0 @@ -14619,7 +14619,7 @@ sub_801A2A8: @ 801A2A8 b _0801A396 _0801A2C4: ldr r4, =gUnknown_082F076A - bl player_get_direction_lower_nybble + bl GetPlayerFacingDirection lsls r0, 24 lsrs r0, 24 adds r0, r4 diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 8dfbd67822..581b72e430 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -38,7 +38,7 @@ gFieldEffectScriptPointers:: @ 82DB9D4 .4byte gFieldEffectScript_Unknown30 .4byte gFieldEffectScript_UseFly .4byte gFieldEffectScript_FlyIn - .4byte gFieldEffectScript_ExclamationMarkIcon2 + .4byte gFieldEffectScript_QuestionMarkIcon .4byte gFieldEffectScript_FeetInFlowingWater .4byte gFieldEffectScript_BikeTireTracks .4byte gFieldEffectScript_SandDisguisePlaceholder @@ -74,7 +74,7 @@ gFieldEffectScriptPointers:: @ 82DB9D4 .4byte gFieldEffectScript_Unknown66 gFieldEffectScript_ExclamationMarkIcon1:: @ 82DBAE0 - field_eff_callnative FldEff_ExclamationMarkIcon1 + field_eff_callnative FldEff_ExclamationMarkIcon field_eff_end gFieldEffectScript_UseCutOnTallGrass:: @ 82DBAE6 @@ -206,8 +206,8 @@ gFieldEffectScript_FlyIn:: @ 82DBBE9 field_eff_callnative FldEff_FlyIn field_eff_end -gFieldEffectScript_ExclamationMarkIcon2:: @ 82DBBEF - field_eff_callnative FldEff_ExclamationMarkIcon2 +gFieldEffectScript_QuestionMarkIcon:: @ 82DBBEF + field_eff_callnative FldEff_QuestionMarkIcon field_eff_end gFieldEffectScript_FeetInFlowingWater:: @ 82DBBF5 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 0631a5d33d..8a8e2baed8 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -212,7 +212,7 @@ LavaridgeTown_Movement_1EA6F8: @ 81EA6F8 step_end LavaridgeTown_EventScript_1EA6FA:: @ 81EA6FA - specialvar VAR_RESULT, player_get_direction_lower_nybble + specialvar VAR_RESULT, GetPlayerFacingDirection compare VAR_RESULT, 1 goto_eq LavaridgeTown_EventScript_1EA70B end diff --git a/data/specials.inc b/data/specials.inc index 939995150b..dfbac56faa 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -297,7 +297,7 @@ gSpecials:: @ 81DBA64 def_special WaitWeather def_special sub_8139238 def_special sub_8139248 - def_special player_get_direction_lower_nybble + def_special GetPlayerFacingDirection def_special sub_81392AC def_special sub_81392D4 def_special sub_81392F8 diff --git a/include/event_object_movement.h b/include/event_object_movement.h index ca2449a6d7..8a1749b0b1 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -4,9 +4,255 @@ #define NUM_OBJECT_GRAPHICS_INFO 239 #define SPRITE_VAR 240 -// Exported struct declarations +enum +{ + MOVEMENT_TYPE_NONE, + MOVEMENT_TYPE_LOOK_AROUND, + MOVEMENT_TYPE_WANDER_AROUND, + MOVEMENT_TYPE_WANDER_UP_AND_DOWN, + MOVEMENT_TYPE_WANDER_DOWN_AND_UP, + MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, + MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT, + MOVEMENT_TYPE_FACE_UP, + MOVEMENT_TYPE_FACE_DOWN, + MOVEMENT_TYPE_FACE_LEFT, + MOVEMENT_TYPE_FACE_RIGHT, + MOVEMENT_TYPE_PLAYER, + MOVEMENT_TYPE_BERRY_TREE_GROWTH, + MOVEMENT_TYPE_FACE_DOWN_AND_UP, + MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, + MOVEMENT_TYPE_FACE_UP_AND_LEFT, + MOVEMENT_TYPE_FACE_UP_AND_RIGHT, + MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, + MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, + MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT, + MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, + MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, + MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, + MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, + MOVEMENT_TYPE_ROTATE_CLOCKWISE, + MOVEMENT_TYPE_WALK_UP_AND_DOWN, + MOVEMENT_TYPE_WALK_DOWN_AND_UP, + MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, + MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, + MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN, + MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP, + MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT, + MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT, + MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN, + MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP, + MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT, + MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT, + MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT, + MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT, + MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN, + MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP, + MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT, + MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT, + MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN, + MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP, + MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, + MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, + MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP, + MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN, + MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, + MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, + MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, + MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, + MOVEMENT_TYPE_COPY_PLAYER, + MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE, + MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE, + MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE, + MOVEMENT_TYPE_TREE_DISGUISE, + MOVEMENT_TYPE_MOUNTAIN_DISGUISE, + MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS, + MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, + MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS, + MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS, + MOVEMENT_TYPE_HIDDEN, + MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, + MOVEMENT_TYPE_WALK_IN_PLACE_UP, + MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, + MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, + MOVEMENT_TYPE_JOG_IN_PLACE_DOWN, + MOVEMENT_TYPE_JOG_IN_PLACE_UP, + MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, + MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT, + MOVEMENT_TYPE_RUN_IN_PLACE_DOWN, + MOVEMENT_TYPE_RUN_IN_PLACE_UP, + MOVEMENT_TYPE_RUN_IN_PLACE_LEFT, + MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT, + MOVEMENT_TYPE_INVISIBLE, + MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN, + MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP, + MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT, + MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, +}; -enum SpinnerRunnerFollowPatterns { +enum +{ + MOVEMENT_ACTION_FACE_DOWN, + MOVEMENT_ACTION_FACE_UP, + MOVEMENT_ACTION_FACE_LEFT, + MOVEMENT_ACTION_FACE_RIGHT, + MOVEMENT_ACTION_WALK_SLOW_DOWN, + MOVEMENT_ACTION_WALK_SLOW_UP, + MOVEMENT_ACTION_WALK_SLOW_LEFT, + MOVEMENT_ACTION_WALK_SLOW_RIGHT, + MOVEMENT_ACTION_WALK_NORMAL_DOWN, + MOVEMENT_ACTION_WALK_NORMAL_UP, + MOVEMENT_ACTION_WALK_NORMAL_LEFT, + MOVEMENT_ACTION_WALK_NORMAL_RIGHT, + MOVEMENT_ACTION_JUMP_2_DOWN, + MOVEMENT_ACTION_JUMP_2_UP, + MOVEMENT_ACTION_JUMP_2_LEFT, + MOVEMENT_ACTION_JUMP_2_RIGHT, + MOVEMENT_ACTION_DELAY_1, + MOVEMENT_ACTION_DELAY_2, + MOVEMENT_ACTION_DELAY_4, + MOVEMENT_ACTION_DELAY_8, + MOVEMENT_ACTION_DELAY_16, + MOVEMENT_ACTION_WALK_FAST_DOWN, + MOVEMENT_ACTION_WALK_FAST_UP, + MOVEMENT_ACTION_WALK_FAST_LEFT, + MOVEMENT_ACTION_WALK_FAST_RIGHT, + MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN, + MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP, + MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT, + MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT, + MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN, + MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP, + MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT, + MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT, + MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN, + MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP, + MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT, + MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT, + MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN, + MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP, + MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT, + MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT, + MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN, + MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP, + MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT, + MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT, + MOVEMENT_ACTION_WALK_FASTEST_DOWN, + MOVEMENT_ACTION_WALK_FASTEST_UP, + MOVEMENT_ACTION_WALK_FASTEST_LEFT, + MOVEMENT_ACTION_WALK_FASTEST_RIGHT, + MOVEMENT_ACTION_SLIDE_DOWN, + MOVEMENT_ACTION_SLIDE_UP, + MOVEMENT_ACTION_SLIDE_LEFT, + MOVEMENT_ACTION_SLIDE_RIGHT, + MOVEMENT_ACTION_PLAYER_RUN_DOWN, + MOVEMENT_ACTION_PLAYER_RUN_UP, + MOVEMENT_ACTION_PLAYER_RUN_LEFT, + MOVEMENT_ACTION_PLAYER_RUN_RIGHT, + MOVEMENT_ACTION_START_ANIM_IN_DIRECTION, + MOVEMENT_ACTION_JUMP_SPECIAL_DOWN, + MOVEMENT_ACTION_JUMP_SPECIAL_UP, + MOVEMENT_ACTION_JUMP_SPECIAL_LEFT, + MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT, + MOVEMENT_ACTION_FACE_PLAYER, + MOVEMENT_ACTION_FACE_AWAY_PLAYER, + MOVEMENT_ACTION_LOCK_FACING_DIRECTION, + MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION, + MOVEMENT_ACTION_JUMP_DOWN, + MOVEMENT_ACTION_JUMP_UP, + MOVEMENT_ACTION_JUMP_LEFT, + MOVEMENT_ACTION_JUMP_RIGHT, + MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN, + MOVEMENT_ACTION_JUMP_IN_PLACE_UP, + MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT, + MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT, + MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP, + MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN, + MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT, + MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT, + MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION, + MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN, + MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT, + MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT, + MOVEMENT_ACTION_DISABLE_ANIMATION, + MOVEMENT_ACTION_RESTORE_ANIMATION, + MOVEMENT_ACTION_SET_INVISIBLE, + MOVEMENT_ACTION_SET_VISIBLE, + MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK, + MOVEMENT_ACTION_EMOTE_QUESTION_MARK, + MOVEMENT_ACTION_EMOTE_HEART, + MOVEMENT_ACTION_REVEAL_TRAINER, + MOVEMENT_ACTION_ROCK_SMASH_BREAK, + MOVEMENT_ACTION_CUT_TREE, + MOVEMENT_ACTION_SET_FIXED_PRIORITY, + MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY, + MOVEMENT_ACTION_INIT_AFFINE_ANIM, + MOVEMENT_ACTION_CLEAR_AFFINE_ANIM, + MOVEMENT_ACTION_UNKNOWN1, + MOVEMENT_ACTION_UNKNOWN2, + MOVEMENT_ACTION_WALK_DOWN_START_AFFINE, + MOVEMENT_ACTION_WALK_DOWN_AFFINE, + MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN, + MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP, + MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT, + MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT, + MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN, + MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP, + MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT, + MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT, + MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN, + MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP, + MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT, + MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT, + MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN, + MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP, + MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT, + MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT, + MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN, + MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP, + MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT, + MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT, + MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN, + MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP, + MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT, + MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT, + MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN, + MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP, + MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT, + MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT, + MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN, + MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP, + MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT, + MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT, + MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN, + MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP, + MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT, + MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT, + MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN, + MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP, + MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT, + MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT, + MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_LEFT, + MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_RIGHT, + MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_LEFT, + MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_RIGHT, + MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_LEFT, + MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT, + MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT, + MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT, + MOVEMENT_ACTION_STORE_AND_LOCK_ANIM, + MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM, + MOVEMENT_ACTION_WALK_LEFT_AFFINE, + MOVEMENT_ACTION_WALK_RIGHT_AFFINE, + MOVEMENT_ACTION_LEVITATE, + MOVEMENT_ACTION_STOP_LEVITATE, + MOVEMENT_ACTION_DESTROY_EXTRA_TASK_IF_AT_TOP, + MOVEMENT_ACTION_FIGURE_8, + MOVEMENT_ACTION_FLY_UP, + MOVEMENT_ACTION_FLY_DOWN, +}; + +enum SpinnerRunnerFollowPatterns +{ RUNFOLLOW_ANY, RUNFOLLOW_NORTH_SOUTH, RUNFOLLOW_EAST_WEST, @@ -46,57 +292,49 @@ struct UnkStruct_085094AC { #define GROUND_EFFECT_FLAG_HOT_SPRINGS (1 << 18) #define GROUND_EFFECT_FLAG_SEAWEED (1 << 19) -#define null_object_step(name, retval) \ -bool8 EventObjectCB2_##name(struct EventObject *, struct Sprite *);\ -void EventObjectCB_##name(struct Sprite *sprite)\ +#define movement_type_def(setup, table) \ +static u8 setup##_callback(struct EventObject *, struct Sprite *);\ +void setup(struct Sprite *sprite)\ {\ - EventObjectStep(&gEventObjects[sprite->data[0]], sprite, EventObjectCB2_##name);\ + UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, setup##_callback);\ }\ -bool8 EventObjectCB2_##name(struct EventObject *eventObject, struct Sprite *sprite)\ +static u8 setup##_callback(struct EventObject *eventObject, struct Sprite *sprite)\ {\ - return (retval);\ + return table[sprite->data[1]](eventObject, sprite);\ } -#define field_object_step(name, table) \ -extern bool8 (*const (table)[])(struct EventObject *, struct Sprite *);\ -bool8 EventObjectCB2_##name(struct EventObject *, struct Sprite *);\ -void EventObjectCB_##name(struct Sprite *sprite)\ +#define movement_type_empty_callback(setup) \ +static u8 setup##_callback(struct EventObject *, struct Sprite *);\ +void setup(struct Sprite *sprite)\ {\ - EventObjectStep(&gEventObjects[sprite->data[0]], sprite, EventObjectCB2_##name);\ + UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, setup##_callback);\ }\ -bool8 EventObjectCB2_##name(struct EventObject *eventObject, struct Sprite *sprite)\ +static u8 setup##_callback(struct EventObject *eventObject, struct Sprite *sprite)\ {\ - return (table)[sprite->data[1]](eventObject, sprite);\ + return 0;\ } -#define field_object_path(idx, table, sub, path, catch, coord)\ -field_object_step(GoInDirectionSequence##idx, table)\ -extern const u8 path[4];\ -bool8 sub(struct EventObject *eventObject, struct Sprite *sprite)\ -{\ - u8 route[sizeof(path)];\ - memcpy(route, path, sizeof(path));\ - if (eventObject->directionSequenceIndex == (catch) && eventObject->initialCoords.coord == eventObject->currentCoords.coord)\ - {\ - eventObject->directionSequenceIndex = (catch) + 1;\ - }\ - return MoveEventObjectInNextDirectionInSequence(eventObject, sprite, route);\ -}\ - -struct PairedPalettes { +struct PairedPalettes +{ u16 tag; const u16 *data; }; +struct LockedAnimEventObjects +{ + u8 eventObjectIds[NUM_EVENT_OBJECTS]; + u8 count; +}; + extern const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[]; void sub_808D438(void); -u8 get_go_image_anim_num(u8); +u8 GetMoveDirectionAnimNum(u8); u8 GetEventObjectIdByLocalIdAndMap(u8, u8, u8); bool8 TryGetEventObjectIdByLocalIdAndMap(u8, u8, u8, u8 *); u8 GetEventObjectIdByXY(s16, s16); -void EventObjectSetDirection(struct EventObject *, u8); -u8 sub_808D4F4(void); +void SetEventObjectDirection(struct EventObject *, u8); +u8 GetFirstInactiveEventObjectId(void); void RemoveEventObjectByLocalIdAndMap(u8, u8, u8); void npc_load_two_palettes__no_record(u16, u8); void npc_load_two_palettes__and_record(u16, u8); @@ -105,11 +343,11 @@ void pal_patch_for_npc(u16, u8); void sub_808E16C(s16, s16); void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat); void sub_8092FF0(s16, s16, s16 *, s16 *); -u8 EventObjectDirectionToImageAnimId(u8); +u8 GetFaceDirectionAnimNum(u8); void sub_80930E0(s16 *, s16 *, s16, s16); -void EventObjectClearAnim(struct EventObject *); -void EventObjectClearAnimIfSpecialAnimActive(struct EventObject *); -void SpawnEventObjectsInView(s16, s16); +void EventObjectClearHeldMovement(struct EventObject *); +void EventObjectClearHeldMovementIfActive(struct EventObject *); +void TrySpawnEventObjects(s16, s16); u8 sprite_new(u8, u8, s16, s16, u8, u8); u8 AddPseudoEventObject(u16, void (*)(struct Sprite *), s16, s16, u8); u8 show_sprite(u8, u8, u8); @@ -128,50 +366,50 @@ void sub_808E7E4(u8, u8, u8); void sub_808E78C(u8, u8, u8, u8); void sub_808E75C(s16, s16); void EventObjectGetLocalIdAndMap(struct EventObject *eventObject, void *localId, void *mapNum, void *mapGroup); -void npc_coords_shift(struct EventObject *, s16, s16); +void ShiftEventObjectCoords(struct EventObject *, s16, s16); void sub_808EB08(struct EventObject *, s16, s16); void sub_808F254(u8, u8, u8); -void EventObjectStep(struct EventObject *, struct Sprite *, bool8(struct EventObject *, struct Sprite *)); +void UpdateEventObjectCurrentMovement(struct EventObject *, struct Sprite *, bool8(struct EventObject *, struct Sprite *)); u8 EventObjectFaceOppositeDirection(struct EventObject *, u8); u8 GetOppositeDirection(u8); -u8 GetStepInPlaceDelay4AnimId(u32); -u8 GetStepInPlaceDelay8AnimId(u32); -u8 GetStepInPlaceDelay16AnimId(u32); -u8 GetStepInPlaceDelay32AnimId(u32); -u8 npc_block_way(struct EventObject *, s16, s16, u32); +u8 GetWalkInPlaceFastestMovementAction(u32); +u8 GetWalkInPlaceFastMovementAction(u32); +u8 GetWalkInPlaceNormalMovementAction(u32); +u8 GetWalkInPlaceSlowMovementAction(u32); +u8 GetCollisionAtCoords(struct EventObject *, s16, s16, u32); void MoveCoords(u8, s16 *, s16 *); -bool8 EventObjectIsSpecialAnimActive(struct EventObject *); -u8 EventObjectClearAnimIfSpecialAnimFinished(struct EventObject *); +bool8 EventObjectIsHeldMovementActive(struct EventObject *); +u8 EventObjectClearHeldMovementIfFinished(struct EventObject *); u8 GetEventObjectIdByXYZ(u16 x, u16 y, u8 z); -void npc_set_running_behaviour_etc(struct EventObject *eventObject, u8 movementType); -u8 npc_running_behaviour_by_direction(u8 direction); +void SetTrainerMovementType(struct EventObject *eventObject, u8 movementType); +u8 GetTrainerFacingDirectionMovementType(u8 direction); const u8 *GetEventObjectScriptPointerByEventObjectId(u8 eventObjectId); -u8 sub_8092C8C(struct EventObject *eventObject, s16 x, s16 y, u8 direction); -u8 GetFaceDirectionAnimId(u32); -u8 GetGoSpeed0AnimId(u32); -u8 GetGoSpeed1AnimId(u32); -u8 GetGoSpeed3AnimId(u32); -u8 sub_80934BC(u32); -bool8 EventObjectSetSpecialAnim(struct EventObject *eventObject, u8 specialAnimId); -bool8 EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct EventObject *eventObject); -u8 EventObjectCheckIfSpecialAnimFinishedOrInactive(struct EventObject *eventObject); -void sub_808F23C(const struct EventObject *eventObject, u8 movementType); -void sub_808F208(const struct EventObject *eventObject); -void npc_coords_shift_still(struct EventObject *pObject); +u8 GetCollisionFlagsAtCoords(struct EventObject *eventObject, s16 x, s16 y, u8 direction); +u8 GetFaceDirectionMovementAction(u32); +u8 GetWalkNormalMovementAction(u32); +u8 GetWalkFastMovementAction(u32); +u8 GetWalkFastestMovementAction(u32); +u8 GetJumpInPlaceMovementAction(u32); +bool8 EventObjectSetHeldMovement(struct EventObject *eventObject, u8 specialAnimId); +bool8 EventObjectIsMovementOverridden(struct EventObject *eventObject); +u8 EventObjectCheckHeldMovementStatus(struct EventObject *eventObject); +void TryOverrideTemplateCoordsForEventObject(const struct EventObject *eventObject, u8 movementType); +void OverrideTemplateCoordsForEventObject(const struct EventObject *eventObject); +void ShiftStillEventObjectCoords(struct EventObject *pObject); void EventObjectMoveDestCoords(struct EventObject *pObject, u32 unk_19, s16 *pInt, s16 *pInt1); u8 AddCameraObject(u8 linkedSpriteId); void UpdateEventObjectsForCameraUpdate(s16 x, s16 y); -u8 GetSimpleGoAnimId(u32); -u8 sub_8093514(u32); +u8 GetWalkSlowMovementAction(u32); +u8 GetJumpMovementAction(u32); bool8 AreZCoordsCompatible(u8, u8); u8 ZCoordToPriority(u8); void EventObjectUpdateZCoord(struct EventObject *pObject); void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8); bool8 IsZCoordMismatchAt(u8, s16, s16); -void sub_8097AC8(struct Sprite *); -void npc_sync_anim_pause_bits(struct EventObject *); +void UpdateEventObjectSpriteSubpriorityAndVisibility(struct Sprite *); +void UnfreezeEventObject(struct EventObject *); void oamt_npc_ministep_reset(struct Sprite *, u8, u8); -u8 sub_8097F78(struct EventObject *); +u8 FindLockedEventObjectIndex(struct EventObject *); bool8 obj_npc_ministep(struct Sprite *sprite); bool8 sub_80976EC(struct Sprite *sprite); void sub_80976DC(struct Sprite *, u8); @@ -179,262 +417,236 @@ void sub_809783C(struct Sprite *, u8, u8, u8); void DoShadowFieldEffect(struct EventObject *); u8 sub_809785C(struct Sprite *); u8 sub_80978E4(struct Sprite *); -void obj_anim_image_set_and_seek(struct Sprite *, u8, u8); -bool8 sub_80979BC(struct Sprite *); +void SetAndStartSpriteAnim(struct Sprite *, u8, u8); +bool8 SpriteAnimEnded(struct Sprite *); void sub_8097750(struct Sprite *); bool8 sub_8097758(struct Sprite *); -void sub_8097FA4(struct EventObject *); -void sub_8098044(u8); +void CreateLevitateMovementTask(struct EventObject *); +void DestroyExtraMovementTask(u8); void UnfreezeEventObjects(void); void FreezeEventObjectsExceptOne(u8 eventObjectId); void sub_8097B78(u8, u8); void sub_8098074(u8 var1, u8 var2); void FreezeEventObjects(void); bool8 FreezeEventObject(struct EventObject *eventObject); -u8 get_go_fast_image_anim_num(u8); -u8 get_go_faster_image_anim_num(u8); -u8 get_go_fastest_image_anim_num(u8); +u8 GetMoveDirectionFastAnimNum(u8); +u8 GetMoveDirectionFasterAnimNum(u8); +u8 GetMoveDirectionFastestAnimNum(u8); -void EventObjectCB_NoMovement1(struct Sprite *); -void EventObjectCB_LookRandomDirections(struct Sprite *); -void EventObjectCB_GoRandomDirections(struct Sprite *); -void EventObjectCB_RandomlyGoNorthOrSouth(struct Sprite *); -void EventObjectCB_RandomlyGoNorthOrSouth(struct Sprite *); -void EventObjectCB_RandomlyGoEastOrWest(struct Sprite *); -void EventObjectCB_RandomlyGoEastOrWest(struct Sprite *); -void EventObjectCB_FaceFixedDirection(struct Sprite *); -void EventObjectCB_FaceFixedDirection(struct Sprite *); -void EventObjectCB_FaceFixedDirection(struct Sprite *); -void EventObjectCB_FaceFixedDirection(struct Sprite *); -void EventObjectCB_NoMovement2(struct Sprite *); -void EventObjectCB_BerryTree(struct Sprite *); -void EventObjectCB_RandomlyLookNorthOrSouth(struct Sprite *); -void EventObjectCB_RandomlyLookEastOrWest(struct Sprite *); -void EventObjectCB_RandomlyLookNorthOrWest(struct Sprite *); -void EventObjectCB_RandomlyLookNorthOrEast(struct Sprite *); -void EventObjectCB_RandomlyLookSouthOrWest(struct Sprite *); -void EventObjectCB_RandomlyLookSouthOrEast(struct Sprite *); -void EventObjectCB_RandomlyLookNorthOrSouthOrWest(struct Sprite *); -void EventObjectCB_RandomlyLookNorthOrSouthOrEast(struct Sprite *); -void EventObjectCB_RandomlyLookNorthOrEastOrWest(struct Sprite *); -void EventObjectCB_RandomlyLookSouthOrEastOrWest(struct Sprite *); -void EventObjectCB_LookAroundCounterclockwise(struct Sprite *); -void EventObjectCB_LookAroundClockwise(struct Sprite *); -void EventObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *); -void EventObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *); -void EventObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *); -void EventObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *); -void EventObjectCB_GoInDirectionSequence1(struct Sprite *); -void EventObjectCB_GoInDirectionSequence2(struct Sprite *); -void EventObjectCB_GoInDirectionSequence3(struct Sprite *); -void EventObjectCB_GoInDirectionSequence4(struct Sprite *); -void EventObjectCB_GoInDirectionSequence5(struct Sprite *); -void EventObjectCB_GoInDirectionSequence6(struct Sprite *); -void EventObjectCB_GoInDirectionSequence7(struct Sprite *); -void EventObjectCB_GoInDirectionSequence8(struct Sprite *); -void EventObjectCB_GoInDirectionSequence9(struct Sprite *); -void EventObjectCB_GoInDirectionSequence10(struct Sprite *); -void EventObjectCB_GoInDirectionSequence11(struct Sprite *); -void EventObjectCB_GoInDirectionSequence12(struct Sprite *); -void EventObjectCB_GoInDirectionSequence13(struct Sprite *); -void EventObjectCB_GoInDirectionSequence14(struct Sprite *); -void EventObjectCB_GoInDirectionSequence15(struct Sprite *); -void EventObjectCB_GoInDirectionSequence16(struct Sprite *); -void EventObjectCB_GoInDirectionSequence17(struct Sprite *); -void EventObjectCB_GoInDirectionSequence18(struct Sprite *); -void EventObjectCB_GoInDirectionSequence19(struct Sprite *); -void EventObjectCB_GoInDirectionSequence20(struct Sprite *); -void EventObjectCB_GoInDirectionSequence21(struct Sprite *); -void EventObjectCB_GoInDirectionSequence22(struct Sprite *); -void EventObjectCB_GoInDirectionSequence23(struct Sprite *); -void EventObjectCB_GoInDirectionSequence24(struct Sprite *); -void EventObjectCB_CopyPlayer1(struct Sprite *); -void EventObjectCB_CopyPlayer1(struct Sprite *); -void EventObjectCB_CopyPlayer1(struct Sprite *); -void EventObjectCB_CopyPlayer1(struct Sprite *); -void EventObjectCB_TreeDisguise(struct Sprite *); -void EventObjectCB_MountainDisguise(struct Sprite *); -void EventObjectCB_CopyPlayer2(struct Sprite *); -void EventObjectCB_CopyPlayer2(struct Sprite *); -void EventObjectCB_CopyPlayer2(struct Sprite *); -void EventObjectCB_CopyPlayer2(struct Sprite *); -void EventObjectCB_Hidden1(struct Sprite *); -void EventObjectCB_WalkInPlace1(struct Sprite *); -void EventObjectCB_WalkInPlace1(struct Sprite *); -void EventObjectCB_WalkInPlace1(struct Sprite *); -void EventObjectCB_WalkInPlace1(struct Sprite *); -void EventObjectCB_WalkInPlace2(struct Sprite *); -void EventObjectCB_WalkInPlace2(struct Sprite *); -void EventObjectCB_WalkInPlace2(struct Sprite *); -void EventObjectCB_WalkInPlace2(struct Sprite *); -void EventObjectCB_WalkInPlace3(struct Sprite *); -void EventObjectCB_WalkInPlace3(struct Sprite *); -void EventObjectCB_WalkInPlace3(struct Sprite *); -void EventObjectCB_WalkInPlace3(struct Sprite *); -void EventObjectCB_Hidden2(struct Sprite *); -void EventObjectCB_WalkInPlace4(struct Sprite *); -void EventObjectCB_WalkInPlace4(struct Sprite *); -void EventObjectCB_WalkInPlace4(struct Sprite *); -void EventObjectCB_WalkInPlace4(struct Sprite *); +void MovementType_None(struct Sprite *); +void MovementType_LookAround(struct Sprite *); +void MovementType_WanderAround(struct Sprite *); +void MovementType_WanderUpAndDown(struct Sprite *); +void MovementType_WanderLeftAndRight(struct Sprite *); +void MovementType_FaceDirection(struct Sprite *); +void MovementType_Player(struct Sprite *); +void MovementType_BerryTreeGrowth(struct Sprite *); +void MovementType_FaceDownAndUp(struct Sprite *); +void MovementType_FaceLeftAndRight(struct Sprite *); +void MovementType_FaceUpAndLeft(struct Sprite *); +void MovementType_FaceUpAndRight(struct Sprite *); +void MovementType_FaceDownAndLeft(struct Sprite *); +void MovementType_FaceDownAndRight(struct Sprite *); +void MovementType_FaceDownUpAndLeft(struct Sprite *); +void MovementType_FaceDownUpAndRight(struct Sprite *); +void MovementType_FaceUpRightAndLeft(struct Sprite *); +void MovementType_FaceDownRightAndLeft(struct Sprite *); +void MovementType_RotateCounterclockwise(struct Sprite *); +void MovementType_RotateClockwise(struct Sprite *); +void MovementType_WalkBackAndForth(struct Sprite *); +void MovementType_WalkSequenceUpRightLeftDown(struct Sprite *); +void MovementType_WalkSequenceRightLeftDownUp(struct Sprite *); +void MovementType_WalkSequenceDownUpRightLeft(struct Sprite *); +void MovementType_WalkSequenceLeftDownUpRight(struct Sprite *); +void MovementType_WalkSequenceUpLeftRightDown(struct Sprite *); +void MovementType_WalkSequenceLeftRightDownUp(struct Sprite *); +void MovementType_WalkSequenceDownUpLeftRight(struct Sprite *); +void MovementType_WalkSequenceRightDownUpLeft(struct Sprite *); +void MovementType_WalkSequenceLeftUpDownRight(struct Sprite *); +void MovementType_WalkSequenceUpDownRightLeft(struct Sprite *); +void MovementType_WalkSequenceRightLeftUpDown(struct Sprite *); +void MovementType_WalkSequenceDownRightLeftUp(struct Sprite *); +void MovementType_WalkSequenceRightUpDownLeft(struct Sprite *); +void MovementType_WalkSequenceUpDownLeftRight(struct Sprite *); +void MovementType_WalkSequenceLeftRightUpDown(struct Sprite *); +void MovementType_WalkSequenceDownLeftRightUp(struct Sprite *); +void MovementType_WalkSequenceUpLeftDownRight(struct Sprite *); +void MovementType_WalkSequenceDownRightUpLeft(struct Sprite *); +void MovementType_WalkSequenceLeftDownRightUp(struct Sprite *); +void MovementType_WalkSequenceRightUpLeftDown(struct Sprite *); +void MovementType_WalkSequenceUpRightDownLeft(struct Sprite *); +void MovementType_WalkSequenceDownLeftUpRight(struct Sprite *); +void MovementType_WalkSequenceLeftUpRightDown(struct Sprite *); +void MovementType_WalkSequenceRightDownLeftUp(struct Sprite *); +void MovementType_CopyPlayer(struct Sprite *); +void MovementType_TreeDisguise(struct Sprite *); +void MovementType_MountainDisguise(struct Sprite *); +void MovementType_CopyPlayerInGrass(struct Sprite *); +void MovementType_Hidden(struct Sprite *); +void MovementType_WalkInPlace(struct Sprite *); +void MovementType_JogInPlace(struct Sprite *); +void MovementType_RunInPlace(struct Sprite *); +void MovementType_Invisible(struct Sprite *); +void MovementType_WalkSlowlyInPlace(struct Sprite *); +u8 GetSlideMovementAction(u32); +u8 GetJumpInPlaceMovementAction(u32); +u8 GetJumpMovementAction(u32); +u8 GetJump2MovementAction(u32); -u8 sub_808F44C(struct EventObject *, struct Sprite *); -u8 sub_808F460(struct EventObject *, struct Sprite *); -u8 sub_808F48C(struct EventObject *, struct Sprite *); -u8 sub_808F4C8(struct EventObject *, struct Sprite *); -u8 sub_808F4E8(struct EventObject *, struct Sprite *); -u8 sub_808F534(struct EventObject *, struct Sprite *); -u8 sub_808F564(struct EventObject *, struct Sprite *); -u8 GetRegularRunningPastFacingDirection(s16, s16, s16, s16); -u8 GetNorthSouthRunningPastFacingDirection(s16, s16, s16, s16); -u8 GetEastWestRunningPastFacingDirection(s16, s16, s16, s16); -u8 GetNorthEastRunningPastFacingDirection(s16, s16, s16, s16); -u8 GetNorthWestRunningPastFacingDirection(s16, s16, s16, s16); -u8 GetSouthEastRunningPastFacingDirection(s16, s16, s16, s16); -u8 GetSouthWestRunningPastFacingDirection(s16, s16, s16, s16); -u8 GetNonEastRunningPastFacingDirection(s16, s16, s16, s16); -u8 GetNonWestRunningPastFacingDirection(s16, s16, s16, s16); -u8 GetNonSouthRunningPastFacingDirection(s16, s16, s16, s16); -u8 GetNonNorthRunningPastFacingDirection(s16, s16, s16, s16); -u8 sub_808F988(struct EventObject *, struct Sprite *); -u8 sub_808F99C(struct EventObject *, struct Sprite *); -u8 sub_808F9C8(struct EventObject *, struct Sprite *); -u8 sub_808FA0C(struct EventObject *, struct Sprite *); -u8 sub_808FA3C(struct EventObject *, struct Sprite *); -u8 sub_808FAC8(struct EventObject *, struct Sprite *); -u8 sub_808FADC(struct EventObject *, struct Sprite *); -u8 sub_808FB08(struct EventObject *, struct Sprite *); -u8 sub_808FB44(struct EventObject *, struct Sprite *); -u8 sub_808FB64(struct EventObject *, struct Sprite *); -u8 sub_808FBB0(struct EventObject *, struct Sprite *); -u8 sub_808FBE0(struct EventObject *, struct Sprite *); -u8 sub_808FC4C(struct EventObject *, struct Sprite *); -u8 sub_808FC60(struct EventObject *, struct Sprite *); -u8 sub_808FC8C(struct EventObject *, struct Sprite *); -u8 sub_808FCC8(struct EventObject *, struct Sprite *); -u8 sub_808FCE8(struct EventObject *, struct Sprite *); -u8 sub_808FD34(struct EventObject *, struct Sprite *); -u8 sub_808FD64(struct EventObject *, struct Sprite *); -u8 sub_808FDD0(struct EventObject *, struct Sprite *); -u8 sub_808FDFC(struct EventObject *, struct Sprite *); -u8 sub_808FE1C(struct EventObject *, struct Sprite *); -u8 do_berry_tree_growth_sparkle_1(struct EventObject *, struct Sprite *); -u8 sub_808FF48(struct EventObject *, struct Sprite *); -u8 do_berry_tree_growth_sparkle_2(struct EventObject *, struct Sprite *); -u8 sub_808FFB4(struct EventObject *, struct Sprite *); -u8 sub_8090004(struct EventObject *, struct Sprite *); -u8 sub_8090094(struct EventObject *, struct Sprite *); -u8 sub_80900A8(struct EventObject *, struct Sprite *); -u8 sub_80900D4(struct EventObject *, struct Sprite *); -u8 sub_8090118(struct EventObject *, struct Sprite *); -u8 sub_8090148(struct EventObject *, struct Sprite *); -u8 sub_80901D4(struct EventObject *, struct Sprite *); -u8 sub_80901E8(struct EventObject *, struct Sprite *); -u8 sub_8090214(struct EventObject *, struct Sprite *); -u8 sub_8090258(struct EventObject *, struct Sprite *); -u8 sub_8090288(struct EventObject *, struct Sprite *); -u8 sub_8090314(struct EventObject *, struct Sprite *); -u8 sub_8090328(struct EventObject *, struct Sprite *); -u8 sub_8090354(struct EventObject *, struct Sprite *); -u8 sub_8090398(struct EventObject *, struct Sprite *); -u8 sub_80903C8(struct EventObject *, struct Sprite *); -u8 sub_8090454(struct EventObject *, struct Sprite *); -u8 sub_8090468(struct EventObject *, struct Sprite *); -u8 sub_8090494(struct EventObject *, struct Sprite *); -u8 sub_80904D8(struct EventObject *, struct Sprite *); -u8 sub_8090508(struct EventObject *, struct Sprite *); -u8 sub_8090594(struct EventObject *, struct Sprite *); -u8 sub_80905A8(struct EventObject *, struct Sprite *); -u8 sub_80905D4(struct EventObject *, struct Sprite *); -u8 sub_8090618(struct EventObject *, struct Sprite *); -u8 sub_8090648(struct EventObject *, struct Sprite *); -u8 sub_80906D4(struct EventObject *, struct Sprite *); -u8 sub_80906E8(struct EventObject *, struct Sprite *); -u8 sub_8090714(struct EventObject *, struct Sprite *); -u8 sub_8090758(struct EventObject *, struct Sprite *); -u8 sub_8090788(struct EventObject *, struct Sprite *); -u8 sub_8090814(struct EventObject *, struct Sprite *); -u8 sub_8090828(struct EventObject *, struct Sprite *); -u8 sub_8090854(struct EventObject *, struct Sprite *); -u8 sub_8090898(struct EventObject *, struct Sprite *); -u8 sub_80908C8(struct EventObject *, struct Sprite *); -u8 sub_8090954(struct EventObject *, struct Sprite *); -u8 sub_8090968(struct EventObject *, struct Sprite *); -u8 sub_8090994(struct EventObject *, struct Sprite *); -u8 sub_80909D8(struct EventObject *, struct Sprite *); -u8 sub_8090A08(struct EventObject *, struct Sprite *); -u8 sub_8090A94(struct EventObject *, struct Sprite *); -u8 sub_8090AA8(struct EventObject *, struct Sprite *); -u8 sub_8090AD4(struct EventObject *, struct Sprite *); -u8 sub_8090B18(struct EventObject *, struct Sprite *); -u8 sub_8090B48(struct EventObject *, struct Sprite *); -u8 sub_8090BD4(struct EventObject *, struct Sprite *); -u8 sub_8090BE8(struct EventObject *, struct Sprite *); -u8 sub_8090C14(struct EventObject *, struct Sprite *); -u8 sub_8090C58(struct EventObject *, struct Sprite *); -u8 sub_8090C88(struct EventObject *, struct Sprite *); -u8 sub_8090D14(struct EventObject *, struct Sprite *); -u8 sub_8090D40(struct EventObject *, struct Sprite *); -u8 sub_8090D64(struct EventObject *, struct Sprite *); -u8 sub_8090D90(struct EventObject *, struct Sprite *); -u8 sub_8090E18(struct EventObject *, struct Sprite *); -u8 sub_8090E44(struct EventObject *, struct Sprite *); -u8 sub_8090E68(struct EventObject *, struct Sprite *); -u8 sub_8090E94(struct EventObject *, struct Sprite *); -u8 sub_8090F1C(struct EventObject *, struct Sprite *); -u8 sub_8090F30(struct EventObject *, struct Sprite *); -u8 sub_8090F68(struct EventObject *, struct Sprite *); -u8 sub_8091020(struct EventObject *, struct Sprite *); -u8 sub_8091048(struct EventObject *, struct Sprite *); -u8 sub_809117C(struct EventObject *, struct Sprite *); -u8 sub_8091110(struct EventObject *, struct Sprite *); -u8 sub_8091208(struct EventObject *, struct Sprite *); -u8 sub_8091294(struct EventObject *, struct Sprite *); -u8 sub_8091320(struct EventObject *, struct Sprite *); -u8 sub_80913AC(struct EventObject *, struct Sprite *); -u8 sub_8091438(struct EventObject *, struct Sprite *); -u8 sub_80914C4(struct EventObject *, struct Sprite *); -u8 sub_8091550(struct EventObject *, struct Sprite *); -u8 sub_80915DC(struct EventObject *, struct Sprite *); -u8 sub_8091668(struct EventObject *, struct Sprite *); -u8 sub_80916F4(struct EventObject *, struct Sprite *); -u8 sub_8091780(struct EventObject *, struct Sprite *); -u8 sub_809180C(struct EventObject *, struct Sprite *); -u8 sub_8091898(struct EventObject *, struct Sprite *); -u8 sub_8091924(struct EventObject *, struct Sprite *); -u8 sub_80919B0(struct EventObject *, struct Sprite *); -u8 sub_8091A3C(struct EventObject *, struct Sprite *); -u8 sub_8091AC8(struct EventObject *, struct Sprite *); -u8 sub_8091B54(struct EventObject *, struct Sprite *); -u8 sub_8091BE0(struct EventObject *, struct Sprite *); -u8 sub_8091C6C(struct EventObject *, struct Sprite *); -u8 sub_8091CF8(struct EventObject *, struct Sprite *); -u8 sub_8091D84(struct EventObject *, struct Sprite *); -u8 sub_8091E10(struct EventObject *, struct Sprite *); -u8 mss_npc_reset_oampriv3_1_unk2_unk3(struct EventObject *, struct Sprite *); -u8 sub_8091EC0(struct EventObject *, struct Sprite *); -u8 sub_8091F20(struct EventObject *, struct Sprite *); -bool8 sub_8091F48(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 sub_8091F4C(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 sub_8091F94(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 sub_80920A4(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 sub_809215C(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 sub_8092214(struct EventObject *, struct Sprite *, u8, bool8(u8)); +u8 MovementType_WanderAround_Step0(struct EventObject *, struct Sprite *); +u8 MovementType_WanderAround_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WanderAround_Step2(struct EventObject *, struct Sprite *); +u8 MovementType_WanderAround_Step3(struct EventObject *, struct Sprite *); +u8 MovementType_WanderAround_Step4(struct EventObject *, struct Sprite *); +u8 MovementType_WanderAround_Step5(struct EventObject *, struct Sprite *); +u8 MovementType_WanderAround_Step6(struct EventObject *, struct Sprite *); +u8 GetVectorDirection(s16, s16, s16, s16); +u8 GetLimitedVectorDirection_SouthNorth(s16, s16, s16, s16); +u8 GetLimitedVectorDirection_WestEast(s16, s16, s16, s16); +u8 GetLimitedVectorDirection_WestNorth(s16, s16, s16, s16); +u8 GetLimitedVectorDirection_EastNorth(s16, s16, s16, s16); +u8 GetLimitedVectorDirection_WestSouth(s16, s16, s16, s16); +u8 GetLimitedVectorDirection_EastSouth(s16, s16, s16, s16); +u8 GetLimitedVectorDirection_SouthNorthWest(s16, s16, s16, s16); +u8 GetLimitedVectorDirection_SouthNorthEast(s16, s16, s16, s16); +u8 GetLimitedVectorDirection_NorthWestEast(s16, s16, s16, s16); +u8 GetLimitedVectorDirection_SouthWestEast(s16, s16, s16, s16); +u8 MovementType_LookAround_Step0(struct EventObject *, struct Sprite *); +u8 MovementType_LookAround_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_LookAround_Step2(struct EventObject *, struct Sprite *); +u8 MovementType_LookAround_Step3(struct EventObject *, struct Sprite *); +u8 MovementType_LookAround_Step4(struct EventObject *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step2(struct EventObject *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step3(struct EventObject *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step4(struct EventObject *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step5(struct EventObject *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step6(struct EventObject *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step2(struct EventObject *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step3(struct EventObject *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step4(struct EventObject *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step5(struct EventObject *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step6(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDirection_Step0(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDirection_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDirection_Step2(struct EventObject *, struct Sprite *); +u8 MovementType_BerryTreeGrowth_Step0(struct EventObject *, struct Sprite *); +u8 MovementType_BerryTreeGrowth_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_BerryTreeGrowth_Step2(struct EventObject *, struct Sprite *); +u8 MovementType_BerryTreeGrowth_Step3(struct EventObject *, struct Sprite *); +u8 MovementType_BerryTreeGrowth_Step4(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownAndUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownAndUp_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownAndUp_Step2(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownAndUp_Step3(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownAndUp_Step4(struct EventObject *, struct Sprite *); +u8 MovementType_FaceLeftAndRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementType_FaceLeftAndRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_FaceLeftAndRight_Step2(struct EventObject *, struct Sprite *); +u8 MovementType_FaceLeftAndRight_Step3(struct EventObject *, struct Sprite *); +u8 MovementType_FaceLeftAndRight_Step4(struct EventObject *, struct Sprite *); +u8 MovementType_FaceUpAndLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementType_FaceUpAndLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_FaceUpAndLeft_Step2(struct EventObject *, struct Sprite *); +u8 MovementType_FaceUpAndLeft_Step3(struct EventObject *, struct Sprite *); +u8 MovementType_FaceUpAndLeft_Step4(struct EventObject *, struct Sprite *); +u8 MovementType_FaceUpAndRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementType_FaceUpAndRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_FaceUpAndRight_Step2(struct EventObject *, struct Sprite *); +u8 MovementType_FaceUpAndRight_Step3(struct EventObject *, struct Sprite *); +u8 MovementType_FaceUpAndRight_Step4(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownAndLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownAndLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownAndLeft_Step2(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownAndLeft_Step3(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownAndLeft_Step4(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownAndRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownAndRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownAndRight_Step2(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownAndRight_Step3(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownAndRight_Step4(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownUpAndLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownUpAndLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownUpAndLeft_Step2(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownUpAndLeft_Step3(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownUpAndLeft_Step4(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownUpAndRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownUpAndRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownUpAndRight_Step2(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownUpAndRight_Step3(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownUpAndRight_Step4(struct EventObject *, struct Sprite *); +u8 MovementType_FaceUpLeftAndRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementType_FaceUpLeftAndRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_FaceUpLeftAndRight_Step2(struct EventObject *, struct Sprite *); +u8 MovementType_FaceUpLeftAndRight_Step3(struct EventObject *, struct Sprite *); +u8 MovementType_FaceUpLeftAndRight_Step4(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownLeftAndRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownLeftAndRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownLeftAndRight_Step2(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownLeftAndRight_Step3(struct EventObject *, struct Sprite *); +u8 MovementType_FaceDownLeftAndRight_Step4(struct EventObject *, struct Sprite *); +u8 MovementType_RotateCounterclockwise_Step0(struct EventObject *, struct Sprite *); +u8 MovementType_RotateCounterclockwise_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_RotateCounterclockwise_Step2(struct EventObject *, struct Sprite *); +u8 MovementType_RotateCounterclockwise_Step3(struct EventObject *, struct Sprite *); +u8 MovementType_RotateClockwise_Step0(struct EventObject *, struct Sprite *); +u8 MovementType_RotateClockwise_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_RotateClockwise_Step2(struct EventObject *, struct Sprite *); +u8 MovementType_RotateClockwise_Step3(struct EventObject *, struct Sprite *); +u8 MovementType_WalkBackAndForth_Step0(struct EventObject *, struct Sprite *); +u8 MovementType_WalkBackAndForth_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WalkBackAndForth_Step2(struct EventObject *, struct Sprite *); +u8 MovementType_WalkBackAndForth_Step3(struct EventObject *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); +u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_CopyPlayer_Step0(struct EventObject *, struct Sprite *); +u8 MovementType_CopyPlayer_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_CopyPlayer_Step2(struct EventObject *, struct Sprite *); +bool8 CopyablePlayerMovement_None(struct EventObject *, struct Sprite *, u8, bool8(u8)); +bool8 CopyablePlayerMovement_FaceDirection(struct EventObject *, struct Sprite *, u8, bool8(u8)); +bool8 CopyablePlayerMovement_GoSpeed0(struct EventObject *, struct Sprite *, u8, bool8(u8)); +bool8 CopyablePlayerMovement_GoSpeed1(struct EventObject *, struct Sprite *, u8, bool8(u8)); +bool8 CopyablePlayerMovement_GoSpeed2(struct EventObject *, struct Sprite *, u8, bool8(u8)); +bool8 CopyablePlayerMovement_Slide(struct EventObject *, struct Sprite *, u8, bool8(u8)); bool8 cph_IM_DIFFERENT(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 sub_8092314(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 oac_hopping(struct EventObject *, struct Sprite *, u8, bool8(u8)); -u8 mss_08062EA4(struct EventObject *, struct Sprite *); -u8 sub_80926AC(struct EventObject *, struct Sprite *); -u8 sub_8092718(struct EventObject *, struct Sprite *); -u8 sub_80926B8(struct EventObject *, struct Sprite *); -u8 sub_8092788(struct EventObject *, struct Sprite *); -u8 sub_80927F8(struct EventObject *, struct Sprite *); -u8 sub_8092868(struct EventObject *, struct Sprite *); -u8 sub_80928D8(struct EventObject *, struct Sprite *); -u8 sub_809290C(struct EventObject *, struct Sprite *); -u8 sub_809292C(struct EventObject *, struct Sprite *); - -// Exported data declarations - -extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; +bool8 CopyablePlayerMovement_GoSpeed4(struct EventObject *, struct Sprite *, u8, bool8(u8)); +bool8 CopyablePlayerMovement_Jump(struct EventObject *, struct Sprite *, u8, bool8(u8)); +u8 MovementType_CopyPlayerInGrass_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_Hidden_Step0(struct EventObject *, struct Sprite *); +u8 MovementType_WalkInPlace_Step0(struct EventObject *, struct Sprite *); +u8 MovementType_MoveInPlace_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_WalkSlowlyInPlace_Step0(struct EventObject *, struct Sprite *); +u8 MovementType_JogInPlace_Step0(struct EventObject *, struct Sprite *); +u8 MovementType_RunInPlace_Step0(struct EventObject *, struct Sprite *); +u8 MovementType_Invisible_Step0(struct EventObject *, struct Sprite *); +u8 MovementType_Invisible_Step1(struct EventObject *, struct Sprite *); +u8 MovementType_Invisible_Step2(struct EventObject *, struct Sprite *); #endif //GUARD_FIELD_EVENT_OBJ_H diff --git a/include/field_effect.h b/include/field_effect.h index 5e7cec4cb4..8000486057 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -11,7 +11,7 @@ extern const struct OamData gNewGameBirchOamAttributes; enum FieldEffectScriptIdx { - FLDEFF_EXCLAMATION_MARK_ICON_1, + FLDEFF_EXCLAMATION_MARK_ICON, FLDEFF_USE_CUT_ON_GRASS, FLDEFF_USE_CUT_ON_TREE, FLDEFF_SHADOW, @@ -44,7 +44,7 @@ enum FieldEffectScriptIdx FLDEFF_NPCFLY_OUT, FLDEFF_USE_FLY, FLDEFF_FLY_IN, - FLDEFF_EXCLAMATION_MARK_ICON_2, + FLDEFF_QUESTION_MARK_ICON, FLDEFF_FEET_IN_FLOWING_WATER, FLDEFF_BIKE_TIRE_TRACKS, FLDEFF_SAND_DISGUISE, diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 970f47d5fc..8cd6c275b9 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -8,9 +8,9 @@ u8 GetPlayerAvatarGenderByGraphicsId(u8); bool8 TestPlayerAvatarFlags(u8); u8 GetPlayerAvatarObjectId(void); void PlayerGetDestCoords(s16 *, s16 *); -u8 player_get_direction_lower_nybble(void); -u8 player_get_direction_upper_nybble(void); -u8 player_get_x22(void); +u8 GetPlayerFacingDirection(void); +u8 GetPlayerMovementDirection(void); +u8 PlayerGetCopyableMovement(void); void PlayerGoSpeed1(u8); void PlayerGoSpeed2(u8); void PlayerGoSpeed3(u8); @@ -43,6 +43,6 @@ void sub_808C114(void); u8 GetPlayerAvatarGraphicsIdByCurrentState(void); void SetPlayerAvatarStateMask(u8 a); u8 GetPlayerAvatarGraphicsIdByStateId(u8 a); -u8 sub_8093540(u32); +u8 GetJumpSpecialMovementAction(u32); #endif // GUARD_FIELD_PLAYER_AVATAR_H diff --git a/include/overworld.h b/include/overworld.h index ace988f4ee..a81f10b0d1 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -141,6 +141,6 @@ bool32 sub_8087598(void); bool32 sub_80875C8(void); bool32 sub_8087634(void); bool32 sub_808766C(void); -void ZeroAllLinkPlayerEventObjects(void); +void ClearLinkPlayerEventObjects(void); #endif // GUARD_OVERWORLD_H diff --git a/include/trainer_see.h b/include/trainer_see.h index 39f3cd8b07..43f8b82d24 100644 --- a/include/trainer_see.h +++ b/include/trainer_see.h @@ -20,8 +20,8 @@ bool8 CheckForTrainersWantingBattle(void); void sub_80B4578(struct EventObject *var); void EndTrainerApproach(void); void sub_80B45D0(void); -u8 FldEff_ExclamationMarkIcon1(void); -u8 FldEff_ExclamationMarkIcon2(void); +u8 FldEff_ExclamationMarkIcon(void); +u8 FldEff_QuestionMarkIcon(void); u8 FldEff_HeartIcon(void); u8 GetCurrentApproachingTrainerEventObjectId(void); u8 GetChosenApproachingTrainerEventObjectId(u8 arrayId); diff --git a/src/battle_setup.c b/src/battle_setup.c index 2875aaff2f..ccc36b7c27 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -1203,7 +1203,7 @@ void sub_80B16D8(void) { struct EventObject *eventObject = &gEventObjects[gSelectedEventObject]; - npc_set_running_behaviour_etc(eventObject, npc_running_behaviour_by_direction(eventObject->facingDirection)); + SetTrainerMovementType(eventObject, GetTrainerFacingDirectionMovementType(eventObject->facingDirection)); } u8 GetTrainerBattleMode(void) diff --git a/src/berry.c b/src/berry.c index 7b83743a72..f8a0204c44 100644 --- a/src/berry.c +++ b/src/berry.c @@ -12,7 +12,7 @@ extern u8 EventObjectGetBerryTreeId(u8 eventObjectId); extern void sub_8092EF0(u8 mapId, u8 mapNumber, u8 mapGroup); extern void CB2_ChooseBerry(void); extern const u8* GetEventObjectScriptPointerForComparison(void); -extern bool8 sub_8092E9C(u8, u8, u8); +extern bool8 IsBerryTreeSparkling(u8, u8, u8); extern u16 gSpecialVar_ItemId; @@ -1166,7 +1166,7 @@ void EventObjectInteractionGetBerryTreeData(void) unk = gSpecialVar_LastTalked; num = gSaveBlock1Ptr->location.mapNum; group = gSaveBlock1Ptr->location.mapGroup; - if (sub_8092E9C(unk, num, group)) + if (IsBerryTreeSparkling(unk, num, group)) gSpecialVar_0x8004 = 0xFF; else gSpecialVar_0x8004 = GetStageByBerryTreeId(id); diff --git a/src/bike.c b/src/bike.c index d44bb1043e..87110b87bc 100644 --- a/src/bike.c +++ b/src/bike.c @@ -152,7 +152,7 @@ static void MovePlayerOnMachBike(u8 direction, u16 newKeys, u16 heldKeys) static u8 GetMachBikeTransition(u8 *dirTraveling) { // if the dir updated before this function, get the relevent new direction to check later. - u8 direction = player_get_direction_upper_nybble(); + u8 direction = GetPlayerMovementDirection(); // is the player standing still? if (*dirTraveling == 0) @@ -296,7 +296,7 @@ static u8 CheckMovementInputAcroBike(u8 *newDirection, u16 newKeys, u16 heldKeys static u8 AcroBikeHandleInputNormal(u8 *newDirection, u16 newKeys, u16 heldKeys) { - u8 direction = player_get_direction_upper_nybble(); + u8 direction = GetPlayerMovementDirection(); gPlayerAvatar.bikeFrameCounter = 0; if (*newDirection == DIR_NONE) @@ -349,7 +349,7 @@ static u8 AcroBikeHandleInputTurning(u8 *newDirection, u16 newKeys, u16 heldKeys Bike_SetBikeStill(); return ACRO_TRANS_TURN_DIRECTION; } - direction = player_get_direction_upper_nybble(); + direction = GetPlayerMovementDirection(); if (*newDirection == AcroBike_GetJumpDirection()) { Bike_SetBikeStill(); // Bike_SetBikeStill sets speed to standing, but the next line immediately overrides it. could have just reset acroBikeState to 0 here instead of wasting a jump. @@ -378,7 +378,7 @@ static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16 u8 direction; struct EventObject *playerEventObj; - direction = player_get_direction_upper_nybble(); + direction = GetPlayerMovementDirection(); playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; gPlayerAvatar.runningState = NOT_MOVING; @@ -425,7 +425,7 @@ static u8 AcroBikeHandleInputBunnyHop(u8 *newDirection, u16 newKeys, u16 heldKey u8 direction; struct EventObject *playerEventObj; - direction = player_get_direction_upper_nybble(); + direction = GetPlayerMovementDirection(); playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; if (!(heldKeys & B_BUTTON)) { @@ -472,7 +472,7 @@ static u8 AcroBikeHandleInputWheelieMoving(u8 *newDirection, u16 newKeys, u16 he u8 direction; struct EventObject *playerEventObj; - direction = player_get_direction_lower_nybble(); + direction = GetPlayerFacingDirection(); playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; if (!(heldKeys & B_BUTTON)) { @@ -527,7 +527,7 @@ static u8 AcroBikeHandleInputSidewaysJump(u8 *ptr, u16 newKeys, u16 heldKeys) struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; playerEventObj->facingDirectionLocked = 0; - EventObjectSetDirection(playerEventObj, playerEventObj->facingDirection); + SetEventObjectDirection(playerEventObj, playerEventObj->facingDirection); gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL; return CheckMovementInputAcroBike(ptr, newKeys, heldKeys); } @@ -672,7 +672,7 @@ static void AcroBikeTransition_SideJump(u8 direction) playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; PlaySE(SE_JITE_PYOKO); playerEventObj->facingDirectionLocked = 1; - PlayerSetAnimId(sub_8093514(direction), 2); + PlayerSetAnimId(GetJumpMovementAction(direction), 2); } static void AcroBikeTransition_TurnJump(u8 direction) @@ -1062,7 +1062,7 @@ void Bike_HandleBumpySlopeJump(void) if (MetatileBehavior_IsBumpySlope(tileBehavior)) { gPlayerAvatar.acroBikeState = ACRO_STATE_WHEELIE_STANDING; - sub_808C1B4(player_get_direction_upper_nybble()); + sub_808C1B4(GetPlayerMovementDirection()); } } } diff --git a/src/data/field_event_obj/movement_action_func_tables.h b/src/data/field_event_obj/movement_action_func_tables.h index 519ca771aa..b24f5dea42 100755 --- a/src/data/field_event_obj/movement_action_func_tables.h +++ b/src/data/field_event_obj/movement_action_func_tables.h @@ -2,1505 +2,1517 @@ #define GUARD_MOVEMENT_ACTION_FUNC_TABLES_H u8 MovementAction_FaceDown_Step0(struct EventObject *, struct Sprite *); -u8 sub_8093950(struct EventObject *, struct Sprite *); -u8 sub_80964BC(struct EventObject *, struct Sprite *); -u8 sub_8093960(struct EventObject *, struct Sprite *); -u8 sub_8093970(struct EventObject *, struct Sprite *); -u8 sub_8093980(struct EventObject *, struct Sprite *); -u8 sub_8093BC4(struct EventObject *, struct Sprite *); -u8 sub_8093BC4_2(struct EventObject *, struct Sprite *); -u8 sub_8093C04(struct EventObject *, struct Sprite *); -u8 sub_8093C04_2(struct EventObject *, struct Sprite *); -u8 sub_8093C44(struct EventObject *, struct Sprite *); -u8 sub_8093C44_2(struct EventObject *, struct Sprite *); -u8 sub_8093C84(struct EventObject *, struct Sprite *); -u8 sub_8093C84_2(struct EventObject *, struct Sprite *); -u8 sub_8093CC4(struct EventObject *, struct Sprite *); -u8 sub_8093CC4_2(struct EventObject *, struct Sprite *); -u8 sub_8093D04(struct EventObject *, struct Sprite *); -u8 sub_8093D04_2(struct EventObject *, struct Sprite *); -u8 sub_8093D44(struct EventObject *, struct Sprite *); -u8 sub_8093D44_2(struct EventObject *, struct Sprite *); -u8 sub_8093D84(struct EventObject *, struct Sprite *); -u8 sub_8093D84_2(struct EventObject *, struct Sprite *); -u8 sub_8093DC4(struct EventObject *, struct Sprite *); -u8 sub_8093DC4_2(struct EventObject *, struct Sprite *); -u8 sub_8093E04(struct EventObject *, struct Sprite *); -u8 sub_8093E04_2(struct EventObject *, struct Sprite *); -u8 sub_8093E44(struct EventObject *, struct Sprite *); -u8 sub_8093E44_2(struct EventObject *, struct Sprite *); -u8 sub_8093E84(struct EventObject *, struct Sprite *); -u8 sub_8093E84_2(struct EventObject *, struct Sprite *); -u8 sub_8093EC4(struct EventObject *, struct Sprite *); -u8 sub_8093EC4_2(struct EventObject *, struct Sprite *); -u8 sub_8093F04(struct EventObject *, struct Sprite *); -u8 sub_8093F04_2(struct EventObject *, struct Sprite *); -u8 sub_8093F44(struct EventObject *, struct Sprite *); -u8 sub_8093F44_2(struct EventObject *, struct Sprite *); -u8 sub_8093F84(struct EventObject *, struct Sprite *); -u8 sub_8093F84_2(struct EventObject *, struct Sprite *); -u8 sub_8094230(struct EventObject *, struct Sprite *); -u8 sub_8094230_2(struct EventObject *, struct Sprite *); -u8 sub_8094288(struct EventObject *, struct Sprite *); -u8 sub_8094288_2(struct EventObject *, struct Sprite *); -u8 sub_80942E0(struct EventObject *, struct Sprite *); -u8 sub_80942E0_2(struct EventObject *, struct Sprite *); -u8 sub_8094338(struct EventObject *, struct Sprite *); -u8 sub_8094338_2(struct EventObject *, struct Sprite *); -u8 sub_80943B4(struct EventObject *, struct Sprite *); -u8 sub_8094398(struct EventObject *, struct Sprite *); -u8 sub_80964B8(struct EventObject *, struct Sprite *); -u8 sub_80943D4(struct EventObject *, struct Sprite *); -u8 sub_80943F4(struct EventObject *, struct Sprite *); -u8 sub_8094414(struct EventObject *, struct Sprite *); -u8 sub_8094434(struct EventObject *, struct Sprite *); -u8 sub_8094454(struct EventObject *, struct Sprite *); -u8 sub_8094454_2(struct EventObject *, struct Sprite *); -u8 sub_8094494(struct EventObject *, struct Sprite *); -u8 sub_8094494_2(struct EventObject *, struct Sprite *); -u8 sub_80944D4(struct EventObject *, struct Sprite *); -u8 sub_80944D4_2(struct EventObject *, struct Sprite *); -u8 sub_8094514(struct EventObject *, struct Sprite *); -u8 sub_8094514_2(struct EventObject *, struct Sprite *); -u8 sub_8094600(struct EventObject *, struct Sprite *); -u8 sub_80945C4(struct EventObject *, struct Sprite *); -u8 sub_8094638(struct EventObject *, struct Sprite *); -u8 sub_8094670(struct EventObject *, struct Sprite *); -u8 sub_80946A8(struct EventObject *, struct Sprite *); -u8 sub_80946E0(struct EventObject *, struct Sprite *); -u8 sub_809459C(struct EventObject *, struct Sprite *); -u8 sub_8094718(struct EventObject *, struct Sprite *); -u8 sub_8094750(struct EventObject *, struct Sprite *); -u8 sub_8094788(struct EventObject *, struct Sprite *); -u8 sub_80947C0(struct EventObject *, struct Sprite *); -u8 sub_80947F8(struct EventObject *, struct Sprite *); -u8 sub_8094830(struct EventObject *, struct Sprite *); -u8 sub_8094868(struct EventObject *, struct Sprite *); -u8 sub_80948A0(struct EventObject *, struct Sprite *); -u8 sub_80948D8(struct EventObject *, struct Sprite *); -u8 sub_8094910(struct EventObject *, struct Sprite *); -u8 sub_8094948(struct EventObject *, struct Sprite *); -u8 sub_8094980(struct EventObject *, struct Sprite *); -u8 sub_8094980_2(struct EventObject *, struct Sprite *); -u8 sub_80949C0(struct EventObject *, struct Sprite *); -u8 sub_80949C0_2(struct EventObject *, struct Sprite *); -u8 sub_8094A00(struct EventObject *, struct Sprite *); -u8 sub_8094A00_2(struct EventObject *, struct Sprite *); -u8 sub_8094A40(struct EventObject *, struct Sprite *); -u8 sub_8094A40_2(struct EventObject *, struct Sprite *); -u8 sub_8094A80(struct EventObject *, struct Sprite *); -u8 sub_8094A80_2(struct EventObject *, struct Sprite *); -u8 sub_8094AC0(struct EventObject *, struct Sprite *); -u8 sub_8094AC0_2(struct EventObject *, struct Sprite *); -u8 sub_8094B00(struct EventObject *, struct Sprite *); -u8 sub_8094B00_2(struct EventObject *, struct Sprite *); -u8 sub_8094B40(struct EventObject *, struct Sprite *); -u8 sub_8094B40_2(struct EventObject *, struct Sprite *); -u8 sub_8094B80(struct EventObject *, struct Sprite *); -u8 sub_8094B80_2(struct EventObject *, struct Sprite *); -u8 sub_8094BC0(struct EventObject *, struct Sprite *); -u8 sub_8094BC0_2(struct EventObject *, struct Sprite *); -u8 sub_8094C00(struct EventObject *, struct Sprite *); -u8 sub_8094C00_2(struct EventObject *, struct Sprite *); -u8 sub_8094C40(struct EventObject *, struct Sprite *); -u8 sub_8094C40_2(struct EventObject *, struct Sprite *); -u8 sub_8094C80(struct EventObject *, struct Sprite *); -u8 sub_8094C80_2(struct EventObject *, struct Sprite *); -u8 sub_8094CC0(struct EventObject *, struct Sprite *); -u8 sub_8094CC0_2(struct EventObject *, struct Sprite *); -u8 sub_8094D00(struct EventObject *, struct Sprite *); -u8 sub_8094D00_2(struct EventObject *, struct Sprite *); -u8 sub_8094D40(struct EventObject *, struct Sprite *); -u8 sub_8094D40_2(struct EventObject *, struct Sprite *); -u8 sub_8094DAC(struct EventObject *, struct Sprite *); -u8 sub_8094DC4(struct EventObject *, struct Sprite *); -u8 sub_8094E18(struct EventObject *, struct Sprite *); -u8 sub_8094E18_2(struct EventObject *, struct Sprite *); -u8 sub_8094E60(struct EventObject *, struct Sprite *); -u8 sub_8094E60_2(struct EventObject *, struct Sprite *); -u8 sub_8094EB8(struct EventObject *, struct Sprite *); -u8 sub_8094EB8_2(struct EventObject *, struct Sprite *); -u8 sub_8094710(struct EventObject *, struct Sprite *); -u8 sub_8094710_2(struct EventObject *, struct Sprite *); -u8 sub_8094F38(struct EventObject *, struct Sprite *); -u8 sub_8094F94(struct EventObject *, struct Sprite *); -u8 sub_8094FF8(struct EventObject *, struct Sprite *); -u8 sub_8095008(struct EventObject *, struct Sprite *); -u8 sub_8095018(struct EventObject *, struct Sprite *); -u8 sub_8095018_2(struct EventObject *, struct Sprite *); -u8 sub_8095070(struct EventObject *, struct Sprite *); -u8 sub_8095070_2(struct EventObject *, struct Sprite *); -u8 sub_80950C8(struct EventObject *, struct Sprite *); -u8 sub_80950C8_2(struct EventObject *, struct Sprite *); -u8 sub_8095120(struct EventObject *, struct Sprite *); -u8 sub_8095120_2(struct EventObject *, struct Sprite *); -u8 sub_8095178(struct EventObject *, struct Sprite *); -u8 sub_8095178_2(struct EventObject *, struct Sprite *); -u8 sub_80951D0(struct EventObject *, struct Sprite *); -u8 sub_80951D0_2(struct EventObject *, struct Sprite *); -u8 sub_8095228(struct EventObject *, struct Sprite *); -u8 sub_8095228_2(struct EventObject *, struct Sprite *); -u8 sub_8095280(struct EventObject *, struct Sprite *); -u8 sub_8095280_2(struct EventObject *, struct Sprite *); -u8 sub_80952D8(struct EventObject *, struct Sprite *); -u8 sub_80952D8_2(struct EventObject *, struct Sprite *); -u8 sub_8095330(struct EventObject *, struct Sprite *); -u8 sub_8095330_2(struct EventObject *, struct Sprite *); -u8 sub_8095388(struct EventObject *, struct Sprite *); -u8 sub_8095388_2(struct EventObject *, struct Sprite *); -u8 sub_80953E0(struct EventObject *, struct Sprite *); -u8 sub_80953E0_2(struct EventObject *, struct Sprite *); -u8 sub_8095438(struct EventObject *, struct Sprite *); -u8 sub_8095450(struct EventObject *, struct Sprite *); -u8 sub_8095460(struct EventObject *, struct Sprite *); -u8 sub_8095470(struct EventObject *, struct Sprite *); -u8 sub_8095480(struct EventObject *, struct Sprite *); -u8 sub_8095490(struct EventObject *, struct Sprite *); -u8 sub_80954BC(struct EventObject *, struct Sprite *); -u8 sub_80954CC(struct EventObject *, struct Sprite *); -u8 do_exclamation_mark_bubble_1(struct EventObject *, struct Sprite *); -u8 do_exclamation_mark_bubble_2(struct EventObject *, struct Sprite *); -u8 do_heart_bubble(struct EventObject *, struct Sprite *); -u8 sub_8095548(struct EventObject *, struct Sprite *); -u8 sub_809558C(struct EventObject *, struct Sprite *); -u8 sub_80955AC(struct EventObject *, struct Sprite *); -u8 sub_80955C8(struct EventObject *, struct Sprite *); -u8 sub_80955EC(struct EventObject *, struct Sprite *); -u8 sub_8095628(struct EventObject *, struct Sprite *); -u8 sub_8095644(struct EventObject *, struct Sprite *); -u8 sub_8095668(struct EventObject *, struct Sprite *); -u8 sub_80956A4(struct EventObject *, struct Sprite *); -u8 sub_80956B4(struct EventObject *, struct Sprite *); -u8 sub_80956C4(struct EventObject *, struct Sprite *); -u8 sub_80956F4(struct EventObject *, struct Sprite *); -u8 sub_8095724(struct EventObject *, struct Sprite *); -u8 sub_8095730(struct EventObject *, struct Sprite *); -u8 sub_8095740(struct EventObject *, struct Sprite *); -u8 sub_8095740_2(struct EventObject *, struct Sprite *); -u8 sub_80957A0(struct EventObject *, struct Sprite *); -u8 sub_80957A0_2(struct EventObject *, struct Sprite *); -u8 sub_8095800(struct EventObject *, struct Sprite *); -u8 sub_8095800_2(struct EventObject *, struct Sprite *); -u8 sub_8095860(struct EventObject *, struct Sprite *); -u8 sub_8095860_2(struct EventObject *, struct Sprite *); -u8 sub_8095900(struct EventObject *, struct Sprite *); -u8 sub_8095910(struct EventObject *, struct Sprite *); -u8 sub_8095920(struct EventObject *, struct Sprite *); -u8 sub_8095930(struct EventObject *, struct Sprite *); -u8 sub_8095940(struct EventObject *, struct Sprite *); -u8 sub_8095964(struct EventObject *, struct Sprite *); -u8 sub_8095988(struct EventObject *, struct Sprite *); -u8 sub_80959AC(struct EventObject *, struct Sprite *); -u8 sub_80959D0(struct EventObject *, struct Sprite *); -u8 sub_80959F4(struct EventObject *, struct Sprite *); -u8 sub_8095A18(struct EventObject *, struct Sprite *); -u8 sub_8095A3C(struct EventObject *, struct Sprite *); -u8 sub_8095A60(struct EventObject *, struct Sprite *); -u8 sub_8095A84(struct EventObject *, struct Sprite *); -u8 sub_8095AA8(struct EventObject *, struct Sprite *); -u8 sub_8095ACC(struct EventObject *, struct Sprite *); -u8 sub_8095B44(struct EventObject *, struct Sprite *); -u8 sub_8095B64(struct EventObject *, struct Sprite *); -u8 sub_8095BC8(struct EventObject *, struct Sprite *); -u8 sub_8095BC8_2(struct EventObject *, struct Sprite *); -u8 sub_8095C20(struct EventObject *, struct Sprite *); -u8 sub_8095C20_2(struct EventObject *, struct Sprite *); -u8 sub_8095C78(struct EventObject *, struct Sprite *); -u8 sub_8095C78_2(struct EventObject *, struct Sprite *); -u8 sub_8095CD0(struct EventObject *, struct Sprite *); -u8 sub_8095CD0_2(struct EventObject *, struct Sprite *); -u8 sub_8095D28(struct EventObject *, struct Sprite *); -u8 sub_8095D28_2(struct EventObject *, struct Sprite *); -u8 sub_8095D80(struct EventObject *, struct Sprite *); -u8 sub_8095D80_2(struct EventObject *, struct Sprite *); -u8 sub_8095DD8(struct EventObject *, struct Sprite *); -u8 sub_8095DD8_2(struct EventObject *, struct Sprite *); -u8 sub_8095E30(struct EventObject *, struct Sprite *); -u8 sub_8095E30_2(struct EventObject *, struct Sprite *); -u8 sub_8095E88(struct EventObject *, struct Sprite *); -u8 sub_8095E88_2(struct EventObject *, struct Sprite *); -u8 sub_8095EE0(struct EventObject *, struct Sprite *); -u8 sub_8095EE0_2(struct EventObject *, struct Sprite *); -u8 sub_8095F38(struct EventObject *, struct Sprite *); -u8 sub_8095F38_2(struct EventObject *, struct Sprite *); -u8 sub_8095F90(struct EventObject *, struct Sprite *); -u8 sub_8095F90_2(struct EventObject *, struct Sprite *); -u8 sub_8095FE8(struct EventObject *, struct Sprite *); -u8 sub_8096020(struct EventObject *, struct Sprite *); -u8 sub_8096058(struct EventObject *, struct Sprite *); -u8 sub_8096090(struct EventObject *, struct Sprite *); -u8 sub_8096100(struct EventObject *, struct Sprite *); -u8 sub_8096100_2(struct EventObject *, struct Sprite *); -u8 sub_8096140(struct EventObject *, struct Sprite *); -u8 sub_8096140_2(struct EventObject *, struct Sprite *); -u8 sub_8096180(struct EventObject *, struct Sprite *); -u8 sub_8096180_2(struct EventObject *, struct Sprite *); -u8 sub_80961C0(struct EventObject *, struct Sprite *); -u8 sub_80961C0_2(struct EventObject *, struct Sprite *); -u8 sub_8096230(struct EventObject *, struct Sprite *); -u8 sub_8096230_2(struct EventObject *, struct Sprite *); -u8 sub_8096270(struct EventObject *, struct Sprite *); -u8 sub_8096270_2(struct EventObject *, struct Sprite *); -u8 sub_80962B0(struct EventObject *, struct Sprite *); -u8 sub_80962B0_2(struct EventObject *, struct Sprite *); -u8 sub_80962F0(struct EventObject *, struct Sprite *); -u8 sub_80962F0_2(struct EventObject *, struct Sprite *); -u8 sub_8096368(struct EventObject *, struct Sprite *); -u8 sub_8096368_2(struct EventObject *, struct Sprite *); -u8 sub_80963A8(struct EventObject *, struct Sprite *); -u8 sub_80963A8_2(struct EventObject *, struct Sprite *); -u8 sub_80963E8(struct EventObject *, struct Sprite *); -u8 sub_80963E8_2(struct EventObject *, struct Sprite *); -u8 sub_8096428(struct EventObject *, struct Sprite *); -u8 sub_8096428_2(struct EventObject *, struct Sprite *); -u8 sub_8096468(struct EventObject *, struct Sprite *); -u8 sub_809647C(struct EventObject *, struct Sprite *); -u8 sub_8096494(struct EventObject *, struct Sprite *); -u8 sub_8097E50(struct EventObject *, struct Sprite *); -u8 sub_80964B8(struct EventObject *, struct Sprite *); -u8 sub_8097EF0(struct EventObject *, struct Sprite *); -u8 sub_80980C0(struct EventObject *, struct Sprite *); -u8 sub_80980D0(struct EventObject *, struct Sprite *); -u8 sub_8098124(struct EventObject *, struct Sprite *); -u8 sub_80980F4(struct EventObject *, struct Sprite *); -u8 sub_8098108(struct EventObject *, struct Sprite *); +u8 MovementAction_FaceDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_PauseSpriteAnim(struct EventObject *, struct Sprite *); +u8 MovementAction_FaceUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_FaceLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_FaceRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalUpLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalUpLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalUpRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalUpRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalDownLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalDownLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalDownRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalDownRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkSlowDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkSlowDown_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkSlowUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkSlowUp_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkSlowLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkSlowLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkSlowRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkSlowRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalUpLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalUpLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalUpRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalUpRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalDownLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalDownLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalDownRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalDownRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkNormalDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkNormalDown_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkNormalUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkNormalUp_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkNormalLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkNormalLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkNormalRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkNormalRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_Jump2Down_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_Jump2Down_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_Jump2Up_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_Jump2Up_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_Jump2Left_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_Jump2Left_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_Jump2Right_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_Jump2Right_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_Delay1_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_Delay_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_Finish(struct EventObject *, struct Sprite *); +u8 MovementAction_Delay2_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_Delay4_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_Delay8_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_Delay16_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkFastDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkFastDown_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkFastUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkFastUp_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkFastLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkFastLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkFastRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkFastRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkInPlaceSlowDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkInPlaceSlow_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkInPlaceSlowUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkInPlaceSlowLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkInPlaceSlowRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkInPlaceNormalDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkInPlace_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkInPlaceNormalUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkInPlaceNormalLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkInPlaceNormalRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastestDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastestUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastestLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastestRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_RideWaterCurrentDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_RideWaterCurrentDown_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_RideWaterCurrentUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_RideWaterCurrentUp_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_RideWaterCurrentLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_RideWaterCurrentLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_RideWaterCurrentRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_RideWaterCurrentRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkFastestDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkFastestDown_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkFastestUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkFastestUp_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkFastestLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkFastestLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkFastestRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkFastestRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_SlideDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_SlideDown_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_SlideUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_SlideUp_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_SlideLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_SlideLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_SlideRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_SlideRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_PlayerRunDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_PlayerRunDown_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_PlayerRunUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_PlayerRunUp_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_PlayerRunLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_PlayerRunLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_PlayerRunRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_PlayerRunRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_StartAnimInDirection_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WaitSpriteAnim(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpSpecialDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpSpecialDown_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpSpecialUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpSpecialUp_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpSpecialLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpSpecialLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpSpecialRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpSpecialRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_FacePlayer_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_FaceAwayPlayer_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_LockFacingDirection_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_UnlockFacingDirection_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpDown_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpUp_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpInPlaceDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpInPlaceDown_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpInPlaceUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpInPlaceUp_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpInPlaceLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpInPlaceLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpInPlaceRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpInPlaceRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpInPlaceDownUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpInPlaceDownUp_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpInPlaceUpDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpInPlaceUpDown_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpInPlaceLeftRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpInPlaceLeftRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpInPlaceRightLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_JumpInPlaceRightLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_FaceOriginalDirection_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_NurseJoyBowDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_EnableJumpLandingGroundEffect_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_DisableJumpLandingGroundEffect_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_DisableAnimation_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_RestoreAnimation_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_SetInvisible_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_SetVisible_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_EmoteExclamationMark_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_EmoteQuestionMark_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_EmoteHeart_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_RevealTrainer_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_RevealTrainer_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_RockSmashBreak_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_RockSmashBreak_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_RockSmashBreak_Step2(struct EventObject *, struct Sprite *); +u8 MovementAction_CutTree_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_CutTree_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_CutTree_Step2(struct EventObject *, struct Sprite *); +u8 MovementAction_SetFixedPriority_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_ClearFixedPriority_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_InitAffineAnim_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_ClearAffineAnim_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_Unknown1_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_Unknown2_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkDownStartAffine_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkDownAffine_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkDownAffine_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkLeftAffine_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkLeftAffine_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkRightAffine_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_WalkRightAffine_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieFaceDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieFaceUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieFaceLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieFaceRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroPopWheelieDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroPopWheelieUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroPopWheelieLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroPopWheelieRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroEndWheelieFaceDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroEndWheelieFaceUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroEndWheelieFaceLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroEndWheelieFaceRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_UnusedAcroActionDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_UnusedAcroActionUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_UnusedAcroActionLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_UnusedAcroActionRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_Figure8_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_Figure8_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceDown_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceUp_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieHopDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieHopDown_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieHopUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieHopUp_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieHopLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieHopLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieHopRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieHopRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpDown_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpUp_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieInPlaceDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieInPlaceUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieInPlaceRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveDown_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveUp_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveDown_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveUp_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveDown_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveUp_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveLeft_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveRight_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveRight_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_Levitate_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_StopLevitate_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_DestroyExtraTaskIfAtTop_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_StoreAndLockAnim_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_Finish(struct EventObject *, struct Sprite *); +u8 MovementAction_FreeAndUnlockAnim_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_FlyUp_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_FlyUp_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_Fly_Finish(struct EventObject *, struct Sprite *); +u8 MovementAction_FlyDown_Step0(struct EventObject *, struct Sprite *); +u8 MovementAction_FlyDown_Step1(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850DEC8[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850DED0[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850DED8[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850DEE0[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850DF2C[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850DF38[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850DF44[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850DF50[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850DF8C[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850DF98[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850DFA4[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850DFB0[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850DFC8[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850DFD4[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850DFE0[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850DFEC[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850DFF8[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E004[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E010[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E01C[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E028[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E034[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E040[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E04C[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E058[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E064[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E070[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E07C[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E088[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E094[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E0A0[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E0AC[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E0B8[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E0C4[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E0D0[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E0DC[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E0E8[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E0F4[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E100[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E10C[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E118[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E124[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E130[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E13C[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E148[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E154[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E160[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E16C[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E178[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E184[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E190[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E19C[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E1A8[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E1B4[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E1C0[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E1CC[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E1D8[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E1E4[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E1F0[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E1FC[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E208[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E214[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E220[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E228[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E230[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E238[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E240[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E24C[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E258[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E264[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E270[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E27C[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E288[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E294[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E2A0[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E2AC[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E2B8[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E2C4[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E2D0[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E2D8[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E2E4[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E2EC[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E2F4[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E2FC[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E304[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E30C[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E314[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E31C[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E324[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E32C[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E338[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E348[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E358[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E360[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E368[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E370[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E378[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E380[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E388[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E394[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E3B8[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E3C0[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E3C8[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E3D0[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E3D8[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E3E4[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E3F0[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E3FC[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E408[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E414[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E420[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E42C[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E474[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E480[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E48C[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E498[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E4A4[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E4B0[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E4BC[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E4C8[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E4D4[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E4E0[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E4EC[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E4F8[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E504[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E510[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E51C[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E528[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E534[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E540[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E54C[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E558[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E564[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E570[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E57C[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E588[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E594[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E5A0[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E5AC[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E5B8[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850DF5C[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850DF68[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850DF74[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850DF80[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850DEFC[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850DF08[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850DF14[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850DF20[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E854[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E85C[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E3A0[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E3AC[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E5C4[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E5CC[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E5D4[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E468[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E864[])(struct EventObject *, struct Sprite *); -u8 (*const gUnknown_0850E870[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceUp[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowUp[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalUp[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_Jump2Down[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_Jump2Up[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_Jump2Left[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_Jump2Right[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_Delay1[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_Delay2[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_Delay4[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_Delay8[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_Delay16[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastUp[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_SlideDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_SlideUp[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_SlideLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_SlideRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_StartAnimInDirection[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpSpecialDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_FacePlayer[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpUp[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_DisableAnimation[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_SetInvisible[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_SetVisible[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_EmoteHeart[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_RevealTrainer[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_CutTree[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_Unknown1[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_Unknown2[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceUp[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveUp[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownLeft[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownRight[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_StoreAndLockAnim[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_FreeAndUnlockAnim[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkLeftAffine[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkRightAffine[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_Levitate[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_StopLevitate[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_DestroyExtraTaskIfAtTop[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_Figure8[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_FlyUp[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_FlyDown[])(struct EventObject *, struct Sprite *); -u8 (*const *const gUnknown_0850DC50[])(struct EventObject *, struct Sprite *) = { - gUnknown_0850DEC8, - gUnknown_0850DED0, - gUnknown_0850DED8, - gUnknown_0850DEE0, - gUnknown_0850DF2C, - gUnknown_0850DF38, - gUnknown_0850DF44, - gUnknown_0850DF50, - gUnknown_0850DF8C, - gUnknown_0850DF98, - gUnknown_0850DFA4, - gUnknown_0850DFB0, - gUnknown_0850DFC8, - gUnknown_0850DFD4, - gUnknown_0850DFE0, - gUnknown_0850DFEC, - gUnknown_0850DFF8, - gUnknown_0850E004, - gUnknown_0850E010, - gUnknown_0850E01C, - gUnknown_0850E028, - gUnknown_0850E034, - gUnknown_0850E040, - gUnknown_0850E04C, - gUnknown_0850E058, - gUnknown_0850E064, - gUnknown_0850E070, - gUnknown_0850E07C, - gUnknown_0850E088, - gUnknown_0850E094, - gUnknown_0850E0A0, - gUnknown_0850E0AC, - gUnknown_0850E0B8, - gUnknown_0850E0C4, - gUnknown_0850E0D0, - gUnknown_0850E0DC, - gUnknown_0850E0E8, - gUnknown_0850E0F4, - gUnknown_0850E100, - gUnknown_0850E10C, - gUnknown_0850E118, - gUnknown_0850E124, - gUnknown_0850E130, - gUnknown_0850E13C, - gUnknown_0850E148, - gUnknown_0850E154, - gUnknown_0850E160, - gUnknown_0850E16C, - gUnknown_0850E178, - gUnknown_0850E184, - gUnknown_0850E190, - gUnknown_0850E19C, - gUnknown_0850E1A8, - gUnknown_0850E1B4, - gUnknown_0850E1C0, - gUnknown_0850E1CC, - gUnknown_0850E1D8, - gUnknown_0850E1E4, - gUnknown_0850E1F0, - gUnknown_0850E1FC, - gUnknown_0850E208, - gUnknown_0850E214, - gUnknown_0850E220, - gUnknown_0850E228, - gUnknown_0850E230, - gUnknown_0850E238, - gUnknown_0850E240, - gUnknown_0850E24C, - gUnknown_0850E258, - gUnknown_0850E264, - gUnknown_0850E270, - gUnknown_0850E27C, - gUnknown_0850E288, - gUnknown_0850E294, - gUnknown_0850E2A0, - gUnknown_0850E2AC, - gUnknown_0850E2B8, - gUnknown_0850E2C4, - gUnknown_0850E2D0, - gUnknown_0850E2D8, - gUnknown_0850E2E4, - gUnknown_0850E2EC, - gUnknown_0850E2F4, - gUnknown_0850E2FC, - gUnknown_0850E304, - gUnknown_0850E30C, - gUnknown_0850E314, - gUnknown_0850E31C, - gUnknown_0850E324, - gUnknown_0850E32C, - gUnknown_0850E338, - gUnknown_0850E348, - gUnknown_0850E358, - gUnknown_0850E360, - gUnknown_0850E368, - gUnknown_0850E370, - gUnknown_0850E378, - gUnknown_0850E380, - gUnknown_0850E388, - gUnknown_0850E394, - gUnknown_0850E3B8, - gUnknown_0850E3C0, - gUnknown_0850E3C8, - gUnknown_0850E3D0, - gUnknown_0850E3D8, - gUnknown_0850E3E4, - gUnknown_0850E3F0, - gUnknown_0850E3FC, - gUnknown_0850E408, - gUnknown_0850E414, - gUnknown_0850E420, - gUnknown_0850E42C, - gUnknown_0850E474, - gUnknown_0850E480, - gUnknown_0850E48C, - gUnknown_0850E498, - gUnknown_0850E4A4, - gUnknown_0850E4B0, - gUnknown_0850E4BC, - gUnknown_0850E4C8, - gUnknown_0850E4D4, - gUnknown_0850E4E0, - gUnknown_0850E4EC, - gUnknown_0850E4F8, - gUnknown_0850E504, - gUnknown_0850E510, - gUnknown_0850E51C, - gUnknown_0850E528, - gUnknown_0850E534, - gUnknown_0850E540, - gUnknown_0850E54C, - gUnknown_0850E558, - gUnknown_0850E564, - gUnknown_0850E570, - gUnknown_0850E57C, - gUnknown_0850E588, - gUnknown_0850E594, - gUnknown_0850E5A0, - gUnknown_0850E5AC, - gUnknown_0850E5B8, - gUnknown_0850DF5C, - gUnknown_0850DF68, - gUnknown_0850DF74, - gUnknown_0850DF80, - gUnknown_0850DEFC, - gUnknown_0850DF08, - gUnknown_0850DF14, - gUnknown_0850DF20, - gUnknown_0850E854, - gUnknown_0850E85C, - gUnknown_0850E3A0, - gUnknown_0850E3AC, - gUnknown_0850E5C4, - gUnknown_0850E5CC, - gUnknown_0850E5D4, - gUnknown_0850E468, - gUnknown_0850E864, - gUnknown_0850E870, +u8 (*const *const gMovementActionFuncs[])(struct EventObject *, struct Sprite *) = { + gMovementActionFuncs_FaceDown, // MOVEMENT_ACTION_FACE_DOWN + gMovementActionFuncs_FaceUp, // MOVEMENT_ACTION_FACE_UP + gMovementActionFuncs_FaceLeft, // MOVEMENT_ACTION_FACE_LEFT + gMovementActionFuncs_FaceRight, // MOVEMENT_ACTION_FACE_RIGHT + gMovementActionFuncs_WalkSlowDown, // MOVEMENT_ACTION_WALK_SLOW_DOWN + gMovementActionFuncs_WalkSlowUp, // MOVEMENT_ACTION_WALK_SLOW_UP + gMovementActionFuncs_WalkSlowLeft, // MOVEMENT_ACTION_WALK_SLOW_LEFT + gMovementActionFuncs_WalkSlowRight, // MOVEMENT_ACTION_WALK_SLOW_RIGHT + gMovementActionFuncs_WalkNormalDown, // MOVEMENT_ACTION_WALK_NORMAL_DOWN + gMovementActionFuncs_WalkNormalUp, // MOVEMENT_ACTION_WALK_NORMAL_UP + gMovementActionFuncs_WalkNormalLeft, // MOVEMENT_ACTION_WALK_NORMAL_LEFT + gMovementActionFuncs_WalkNormalRight, // MOVEMENT_ACTION_WALK_NORMAL_RIGHT + gMovementActionFuncs_Jump2Down, // MOVEMENT_ACTION_JUMP_2_DOWN + gMovementActionFuncs_Jump2Up, // MOVEMENT_ACTION_JUMP_2_UP + gMovementActionFuncs_Jump2Left, // MOVEMENT_ACTION_JUMP_2_LEFT + gMovementActionFuncs_Jump2Right, // MOVEMENT_ACTION_JUMP_2_RIGHT + gMovementActionFuncs_Delay1, // MOVEMENT_ACTION_DELAY_1 + gMovementActionFuncs_Delay2, // MOVEMENT_ACTION_DELAY_2 + gMovementActionFuncs_Delay4, // MOVEMENT_ACTION_DELAY_4 + gMovementActionFuncs_Delay8, // MOVEMENT_ACTION_DELAY_8 + gMovementActionFuncs_Delay16, // MOVEMENT_ACTION_DELAY_16 + gMovementActionFuncs_WalkFastDown, // MOVEMENT_ACTION_WALK_FAST_DOWN + gMovementActionFuncs_WalkFastUp, // MOVEMENT_ACTION_WALK_FAST_UP + gMovementActionFuncs_WalkFastLeft, // MOVEMENT_ACTION_WALK_FAST_LEFT + gMovementActionFuncs_WalkFastRight, // MOVEMENT_ACTION_WALK_FAST_RIGHT + gMovementActionFuncs_WalkInPlaceSlowDown, // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN + gMovementActionFuncs_WalkInPlaceSlowUp, // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP + gMovementActionFuncs_WalkInPlaceSlowLeft, // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT + gMovementActionFuncs_WalkInPlaceSlowRight, // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT + gMovementActionFuncs_WalkInPlaceNormalDown, // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN + gMovementActionFuncs_WalkInPlaceNormalUp, // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP + gMovementActionFuncs_WalkInPlaceNormalLeft, // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT + gMovementActionFuncs_WalkInPlaceNormalRight, // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT + gMovementActionFuncs_WalkInPlaceFastDown, // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN + gMovementActionFuncs_WalkInPlaceFastUp, // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP + gMovementActionFuncs_WalkInPlaceFastLeft, // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT + gMovementActionFuncs_WalkInPlaceFastRight, // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT + gMovementActionFuncs_WalkInPlaceFastestDown, // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN + gMovementActionFuncs_WalkInPlaceFastestUp, // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP + gMovementActionFuncs_WalkInPlaceFastestLeft, // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT + gMovementActionFuncs_WalkInPlaceFastestRight, // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT + gMovementActionFuncs_RideWaterCurrentDown, // MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN + gMovementActionFuncs_RideWaterCurrentUp, // MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP + gMovementActionFuncs_RideWaterCurrentLeft, // MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT + gMovementActionFuncs_RideWaterCurrentRight, // MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT + gMovementActionFuncs_WalkFastestDown, // MOVEMENT_ACTION_WALK_FASTEST_DOWN + gMovementActionFuncs_WalkFastestUp, // MOVEMENT_ACTION_WALK_FASTEST_UP + gMovementActionFuncs_WalkFastestLeft, // MOVEMENT_ACTION_WALK_FASTEST_LEFT + gMovementActionFuncs_WalkFastestRight, // MOVEMENT_ACTION_WALK_FASTEST_RIGHT + gMovementActionFuncs_SlideDown, // MOVEMENT_ACTION_SLIDE_DOWN + gMovementActionFuncs_SlideUp, // MOVEMENT_ACTION_SLIDE_UP + gMovementActionFuncs_SlideLeft, // MOVEMENT_ACTION_SLIDE_LEFT + gMovementActionFuncs_SlideRight, // MOVEMENT_ACTION_SLIDE_RIGHT + gMovementActionFuncs_PlayerRunDown, // MOVEMENT_ACTION_PLAYER_RUN_DOWN + gMovementActionFuncs_PlayerRunUp, // MOVEMENT_ACTION_PLAYER_RUN_UP + gMovementActionFuncs_PlayerRunLeft, // MOVEMENT_ACTION_PLAYER_RUN_LEFT + gMovementActionFuncs_PlayerRunRight, // MOVEMENT_ACTION_PLAYER_RUN_RIGHT + gMovementActionFuncs_StartAnimInDirection, // MOVEMENT_ACTION_START_ANIM_IN_DIRECTION + gMovementActionFuncs_JumpSpecialDown, // MOVEMENT_ACTION_JUMP_SPECIAL_DOWN + gMovementActionFuncs_JumpSpecialUp, // MOVEMENT_ACTION_JUMP_SPECIAL_UP + gMovementActionFuncs_JumpSpecialLeft, // MOVEMENT_ACTION_JUMP_SPECIAL_LEFT + gMovementActionFuncs_JumpSpecialRight, // MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT + gMovementActionFuncs_FacePlayer, // MOVEMENT_ACTION_FACE_PLAYER + gMovementActionFuncs_FaceAwayPlayer, // MOVEMENT_ACTION_FACE_AWAY_PLAYER + gMovementActionFuncs_LockFacingDirection, // MOVEMENT_ACTION_LOCK_FACING_DIRECTION + gMovementActionFuncs_UnlockFacingDirection, // MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION + gMovementActionFuncs_JumpDown, // MOVEMENT_ACTION_JUMP_DOWN + gMovementActionFuncs_JumpUp, // MOVEMENT_ACTION_JUMP_UP + gMovementActionFuncs_JumpLeft, // MOVEMENT_ACTION_JUMP_LEFT + gMovementActionFuncs_JumpRight, // MOVEMENT_ACTION_JUMP_RIGHT + gMovementActionFuncs_JumpInPlaceDown, // MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN + gMovementActionFuncs_JumpInPlaceUp, // MOVEMENT_ACTION_JUMP_IN_PLACE_UP + gMovementActionFuncs_JumpInPlaceLeft, // MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT + gMovementActionFuncs_JumpInPlaceRight, // MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT + gMovementActionFuncs_JumpInPlaceDownUp, // MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP + gMovementActionFuncs_JumpInPlaceUpDown, // MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN + gMovementActionFuncs_JumpInPlaceLeftRight, // MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT + gMovementActionFuncs_JumpInPlaceRightLeft, // MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT + gMovementActionFuncs_FaceOriginalDirection, // MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION + gMovementActionFuncs_NurseJoyBowDown, // MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN + gMovementActionFuncs_EnableJumpLandingGroundEffect, // MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT + gMovementActionFuncs_DisableJumpLandingGroundEffect, // MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT + gMovementActionFuncs_DisableAnimation, // MOVEMENT_ACTION_DISABLE_ANIMATION + gMovementActionFuncs_RestoreAnimation, // MOVEMENT_ACTION_RESTORE_ANIMATION + gMovementActionFuncs_SetInvisible, // MOVEMENT_ACTION_SET_INVISIBLE + gMovementActionFuncs_SetVisible, // MOVEMENT_ACTION_SET_VISIBLE + gMovementActionFuncs_EmoteExclamationMark, // MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK + gMovementActionFuncs_EmoteQuestionMark, // MOVEMENT_ACTION_EMOTE_QUESTION_MARK + gMovementActionFuncs_EmoteHeart, // MOVEMENT_ACTION_EMOTE_HEART + gMovementActionFuncs_RevealTrainer, // MOVEMENT_ACTION_REVEAL_TRAINER + gMovementActionFuncs_RockSmashBreak, // MOVEMENT_ACTION_ROCK_SMASH_BREAK + gMovementActionFuncs_CutTree, // MOVEMENT_ACTION_CUT_TREE + gMovementActionFuncs_SetFixedPriority, // MOVEMENT_ACTION_SET_FIXED_PRIORITY + gMovementActionFuncs_ClearFixedPriority, // MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY + gMovementActionFuncs_InitAffineAnim, // MOVEMENT_ACTION_INIT_AFFINE_ANIM + gMovementActionFuncs_ClearAffineAnim, // MOVEMENT_ACTION_CLEAR_AFFINE_ANIM + gMovementActionFuncs_Unknown1, // MOVEMENT_ACTION_UNKNOWN1 + gMovementActionFuncs_Unknown2, // MOVEMENT_ACTION_UNKNOWN2 + gMovementActionFuncs_WalkDownStartAffine, // MOVEMENT_ACTION_WALK_DOWN_START_AFFINE + gMovementActionFuncs_WalkDownAffine, // MOVEMENT_ACTION_WALK_DOWN_AFFINE + gMovementActionFuncs_AcroWheelieFaceDown, // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN + gMovementActionFuncs_AcroWheelieFaceUp, // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP + gMovementActionFuncs_AcroWheelieFaceLeft, // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT + gMovementActionFuncs_AcroWheelieFaceRight, // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT + gMovementActionFuncs_AcroPopWheelieDown, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN + gMovementActionFuncs_AcroPopWheelieUp, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP + gMovementActionFuncs_AcroPopWheelieLeft, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT + gMovementActionFuncs_AcroPopWheelieRight, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT + gMovementActionFuncs_AcroEndWheelieFaceDown, // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN + gMovementActionFuncs_AcroEndWheelieFaceUp, // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP + gMovementActionFuncs_AcroEndWheelieFaceLeft, // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT + gMovementActionFuncs_AcroEndWheelieFaceRight, // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT + gMovementActionFuncs_AcroWheelieHopFaceDown, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN + gMovementActionFuncs_AcroWheelieHopFaceUp, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP + gMovementActionFuncs_AcroWheelieHopFaceLeft, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT + gMovementActionFuncs_AcroWheelieHopFaceRight, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT + gMovementActionFuncs_AcroWheelieHopDown, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN + gMovementActionFuncs_AcroWheelieHopUp, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP + gMovementActionFuncs_AcroWheelieHopLeft, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT + gMovementActionFuncs_AcroWheelieHopRight, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT + gMovementActionFuncs_AcroWheelieJumpDown, // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN + gMovementActionFuncs_AcroWheelieJumpUp, // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP + gMovementActionFuncs_AcroWheelieJumpLeft, // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT + gMovementActionFuncs_AcroWheelieJumpRight, // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT + gMovementActionFuncs_AcroWheelieInPlaceDown, // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN + gMovementActionFuncs_AcroWheelieInPlaceUp, // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP + gMovementActionFuncs_AcroWheelieInPlaceLeft, // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT + gMovementActionFuncs_AcroWheelieInPlaceRight, // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT + gMovementActionFuncs_AcroPopWheelieMoveDown, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN + gMovementActionFuncs_AcroPopWheelieMoveUp, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP + gMovementActionFuncs_AcroPopWheelieMoveLeft, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT + gMovementActionFuncs_AcroPopWheelieMoveRight, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT + gMovementActionFuncs_AcroWheelieMoveDown, // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN + gMovementActionFuncs_AcroWheelieMoveUp, // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP + gMovementActionFuncs_AcroWheelieMoveLeft, // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT + gMovementActionFuncs_AcroWheelieMoveRight, // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT + gMovementActionFuncs_AcroEndWheelieMoveDown, // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN + gMovementActionFuncs_AcroEndWheelieMoveUp, // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP + gMovementActionFuncs_AcroEndWheelieMoveLeft, // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT + gMovementActionFuncs_AcroEndWheelieMoveRight, // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT + gMovementActionFuncs_WalkNormalDiagonalUpLeft, // MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_LEFT + gMovementActionFuncs_WalkNormalDiagonalUpRight, // MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_RIGHT + gMovementActionFuncs_WalkNormalDiagonalDownLeft, // MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_LEFT + gMovementActionFuncs_WalkNormalDiagonalDownRight, // MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_RIGHT + gMovementActionFuncs_WalkSlowDiagonalUpLeft, // MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_LEFT + gMovementActionFuncs_WalkSlowDiagonalUpRight, // MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT + gMovementActionFuncs_WalkSlowDiagonalDownLeft, // MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT + gMovementActionFuncs_WalkSlowDiagonalDownRight, // MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT + gMovementActionFuncs_StoreAndLockAnim, // MOVEMENT_ACTION_STORE_AND_LOCK_ANIM + gMovementActionFuncs_FreeAndUnlockAnim, // MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM + gMovementActionFuncs_WalkLeftAffine, // MOVEMENT_ACTION_WALK_LEFT_AFFINE + gMovementActionFuncs_WalkRightAffine, // MOVEMENT_ACTION_WALK_RIGHT_AFFINE + gMovementActionFuncs_Levitate, // MOVEMENT_ACTION_LEVITATE + gMovementActionFuncs_StopLevitate, // MOVEMENT_ACTION_STOP_LEVITATE + gMovementActionFuncs_DestroyExtraTaskIfAtTop, // MOVEMENT_ACTION_DESTROY_EXTRA_TASK_IF_AT_TOP + gMovementActionFuncs_Figure8, // MOVEMENT_ACTION_FIGURE_8 + gMovementActionFuncs_FlyUp, // MOVEMENT_ACTION_FLY_UP + gMovementActionFuncs_FlyDown, // MOVEMENT_ACTION_FLY_DOWN }; -u8 (*const gUnknown_0850DEC8[])(struct EventObject *, struct Sprite *) = { - sub_8093950, - sub_80964BC, +u8 (*const gMovementActionFuncs_FaceDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_FaceDown_Step0, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850DED0[])(struct EventObject *, struct Sprite *) = { - sub_8093960, - sub_80964BC, +u8 (*const gMovementActionFuncs_FaceUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_FaceUp_Step0, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850DED8[])(struct EventObject *, struct Sprite *) = { - sub_8093970, - sub_80964BC, +u8 (*const gMovementActionFuncs_FaceLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_FaceLeft_Step0, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850DEE0[])(struct EventObject *, struct Sprite *) = { - sub_8093980, - sub_80964BC, +u8 (*const gMovementActionFuncs_FaceRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_FaceRight_Step0, + MovementAction_PauseSpriteAnim, }; u8 (*const gUnknown_0850DEE8[])(u8) = { - get_go_image_anim_num, - get_go_fast_image_anim_num, - get_go_fast_image_anim_num, - get_go_faster_image_anim_num, - get_go_fastest_image_anim_num, + GetMoveDirectionAnimNum, + GetMoveDirectionFastAnimNum, + GetMoveDirectionFastAnimNum, + GetMoveDirectionFasterAnimNum, + GetMoveDirectionFastestAnimNum, }; -u8 (*const gUnknown_0850DEFC[])(struct EventObject *, struct Sprite *) = { - sub_8093BC4, - sub_8093BC4_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkSlowDiagonalUpLeft_Step0, + MovementAction_WalkSlowDiagonalUpLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850DF08[])(struct EventObject *, struct Sprite *) = { - sub_8093C04, - sub_8093C04_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkSlowDiagonalUpRight_Step0, + MovementAction_WalkSlowDiagonalUpRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850DF14[])(struct EventObject *, struct Sprite *) = { - sub_8093C44, - sub_8093C44_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkSlowDiagonalDownLeft_Step0, + MovementAction_WalkSlowDiagonalDownLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850DF20[])(struct EventObject *, struct Sprite *) = { - sub_8093C84, - sub_8093C84_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkSlowDiagonalDownRight_Step0, + MovementAction_WalkSlowDiagonalDownRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850DF2C[])(struct EventObject *, struct Sprite *) = { - sub_8093CC4, - sub_8093CC4_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkSlowDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkSlowDown_Step0, + MovementAction_WalkSlowDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850DF38[])(struct EventObject *, struct Sprite *) = { - sub_8093D04, - sub_8093D04_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkSlowUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkSlowUp_Step0, + MovementAction_WalkSlowUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850DF44[])(struct EventObject *, struct Sprite *) = { - sub_8093D44, - sub_8093D44_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkSlowLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkSlowLeft_Step0, + MovementAction_WalkSlowLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850DF50[])(struct EventObject *, struct Sprite *) = { - sub_8093D84, - sub_8093D84_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkSlowRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkSlowRight_Step0, + MovementAction_WalkSlowRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850DF5C[])(struct EventObject *, struct Sprite *) = { - sub_8093DC4, - sub_8093DC4_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkNormalDiagonalUpLeft_Step0, + MovementAction_WalkNormalDiagonalUpLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850DF68[])(struct EventObject *, struct Sprite *) = { - sub_8093E04, - sub_8093E04_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkNormalDiagonalUpRight_Step0, + MovementAction_WalkNormalDiagonalUpRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850DF74[])(struct EventObject *, struct Sprite *) = { - sub_8093E44, - sub_8093E44_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkNormalDiagonalDownLeft_Step0, + MovementAction_WalkNormalDiagonalDownLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850DF80[])(struct EventObject *, struct Sprite *) = { - sub_8093E84, - sub_8093E84_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkNormalDiagonalDownRight_Step0, + MovementAction_WalkNormalDiagonalDownRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850DF8C[])(struct EventObject *, struct Sprite *) = { - sub_8093EC4, - sub_8093EC4_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkNormalDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkNormalDown_Step0, + MovementAction_WalkNormalDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850DF98[])(struct EventObject *, struct Sprite *) = { - sub_8093F04, - sub_8093F04_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkNormalUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkNormalUp_Step0, + MovementAction_WalkNormalUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850DFA4[])(struct EventObject *, struct Sprite *) = { - sub_8093F44, - sub_8093F44_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkNormalLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkNormalLeft_Step0, + MovementAction_WalkNormalLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850DFB0[])(struct EventObject *, struct Sprite *) = { - sub_8093F84, - sub_8093F84_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkNormalRight_Step0, + MovementAction_WalkNormalRight_Step1, + MovementAction_PauseSpriteAnim, }; const s16 gUnknown_0850DFBC[] = {0, 1, 1}; const s16 gUnknown_0850DFC2[] = {0, 0, 1}; -u8 (*const gUnknown_0850DFC8[])(struct EventObject *, struct Sprite *) = { - sub_8094230, - sub_8094230_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_Jump2Down[])(struct EventObject *, struct Sprite *) = { + MovementAction_Jump2Down_Step0, + MovementAction_Jump2Down_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850DFD4[])(struct EventObject *, struct Sprite *) = { - sub_8094288, - sub_8094288_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_Jump2Up[])(struct EventObject *, struct Sprite *) = { + MovementAction_Jump2Up_Step0, + MovementAction_Jump2Up_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850DFE0[])(struct EventObject *, struct Sprite *) = { - sub_80942E0, - sub_80942E0_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_Jump2Left[])(struct EventObject *, struct Sprite *) = { + MovementAction_Jump2Left_Step0, + MovementAction_Jump2Left_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850DFEC[])(struct EventObject *, struct Sprite *) = { - sub_8094338, - sub_8094338_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_Jump2Right[])(struct EventObject *, struct Sprite *) = { + MovementAction_Jump2Right_Step0, + MovementAction_Jump2Right_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850DFF8[])(struct EventObject *, struct Sprite *) = { - sub_80943B4, - sub_8094398, - sub_80964B8, +u8 (*const gMovementActionFuncs_Delay1[])(struct EventObject *, struct Sprite *) = { + MovementAction_Delay1_Step0, + MovementAction_Delay_Step1, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E004[])(struct EventObject *, struct Sprite *) = { - sub_80943D4, - sub_8094398, - sub_80964B8, +u8 (*const gMovementActionFuncs_Delay2[])(struct EventObject *, struct Sprite *) = { + MovementAction_Delay2_Step0, + MovementAction_Delay_Step1, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E010[])(struct EventObject *, struct Sprite *) = { - sub_80943F4, - sub_8094398, - sub_80964B8, +u8 (*const gMovementActionFuncs_Delay4[])(struct EventObject *, struct Sprite *) = { + MovementAction_Delay4_Step0, + MovementAction_Delay_Step1, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E01C[])(struct EventObject *, struct Sprite *) = { - sub_8094414, - sub_8094398, - sub_80964B8, +u8 (*const gMovementActionFuncs_Delay8[])(struct EventObject *, struct Sprite *) = { + MovementAction_Delay8_Step0, + MovementAction_Delay_Step1, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E028[])(struct EventObject *, struct Sprite *) = { - sub_8094434, - sub_8094398, - sub_80964B8, +u8 (*const gMovementActionFuncs_Delay16[])(struct EventObject *, struct Sprite *) = { + MovementAction_Delay16_Step0, + MovementAction_Delay_Step1, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E034[])(struct EventObject *, struct Sprite *) = { - sub_8094454, - sub_8094454_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkFastDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkFastDown_Step0, + MovementAction_WalkFastDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E040[])(struct EventObject *, struct Sprite *) = { - sub_8094494, - sub_8094494_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkFastUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkFastUp_Step0, + MovementAction_WalkFastUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E04C[])(struct EventObject *, struct Sprite *) = { - sub_80944D4, - sub_80944D4_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkFastLeft_Step0, + MovementAction_WalkFastLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E058[])(struct EventObject *, struct Sprite *) = { - sub_8094514, - sub_8094514_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkFastRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkFastRight_Step0, + MovementAction_WalkFastRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E064[])(struct EventObject *, struct Sprite *) = { - sub_8094600, - sub_80945C4, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceSlowDown_Step0, + MovementAction_WalkInPlaceSlow_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E070[])(struct EventObject *, struct Sprite *) = { - sub_8094638, - sub_80945C4, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceSlowUp_Step0, + MovementAction_WalkInPlaceSlow_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E07C[])(struct EventObject *, struct Sprite *) = { - sub_8094670, - sub_80945C4, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceSlowLeft_Step0, + MovementAction_WalkInPlaceSlow_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E088[])(struct EventObject *, struct Sprite *) = { - sub_80946A8, - sub_80945C4, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceSlowRight_Step0, + MovementAction_WalkInPlaceSlow_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E094[])(struct EventObject *, struct Sprite *) = { - sub_80946E0, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceNormalDown_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E0A0[])(struct EventObject *, struct Sprite *) = { - sub_8094718, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceNormalUp_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E0AC[])(struct EventObject *, struct Sprite *) = { - sub_8094750, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceNormalLeft_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E0B8[])(struct EventObject *, struct Sprite *) = { - sub_8094788, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceNormalRight_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E0C4[])(struct EventObject *, struct Sprite *) = { - sub_80947C0, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceFastDown_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E0D0[])(struct EventObject *, struct Sprite *) = { - sub_80947F8, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceFastUp_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E0DC[])(struct EventObject *, struct Sprite *) = { - sub_8094830, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceFastLeft_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E0E8[])(struct EventObject *, struct Sprite *) = { - sub_8094868, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceFastRight_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E0F4[])(struct EventObject *, struct Sprite *) = { - sub_80948A0, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceFastestDown_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E100[])(struct EventObject *, struct Sprite *) = { - sub_80948D8, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceFastestUp_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E10C[])(struct EventObject *, struct Sprite *) = { - sub_8094910, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceFastestLeft_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E118[])(struct EventObject *, struct Sprite *) = { - sub_8094948, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkInPlaceFastestRight_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E124[])(struct EventObject *, struct Sprite *) = { - sub_8094980, - sub_8094980_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_RideWaterCurrentDown_Step0, + MovementAction_RideWaterCurrentDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E130[])(struct EventObject *, struct Sprite *) = { - sub_80949C0, - sub_80949C0_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_RideWaterCurrentUp_Step0, + MovementAction_RideWaterCurrentUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E13C[])(struct EventObject *, struct Sprite *) = { - sub_8094A00, - sub_8094A00_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_RideWaterCurrentLeft_Step0, + MovementAction_RideWaterCurrentLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E148[])(struct EventObject *, struct Sprite *) = { - sub_8094A40, - sub_8094A40_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_RideWaterCurrentRight_Step0, + MovementAction_RideWaterCurrentRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E154[])(struct EventObject *, struct Sprite *) = { - sub_8094A80, - sub_8094A80_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkFastestDown_Step0, + MovementAction_WalkFastestDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E160[])(struct EventObject *, struct Sprite *) = { - sub_8094AC0, - sub_8094AC0_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkFastestUp_Step0, + MovementAction_WalkFastestUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E16C[])(struct EventObject *, struct Sprite *) = { - sub_8094B00, - sub_8094B00_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkFastestLeft_Step0, + MovementAction_WalkFastestLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E178[])(struct EventObject *, struct Sprite *) = { - sub_8094B40, - sub_8094B40_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkFastestRight_Step0, + MovementAction_WalkFastestRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E184[])(struct EventObject *, struct Sprite *) = { - sub_8094B80, - sub_8094B80_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_SlideDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_SlideDown_Step0, + MovementAction_SlideDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E190[])(struct EventObject *, struct Sprite *) = { - sub_8094BC0, - sub_8094BC0_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_SlideUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_SlideUp_Step0, + MovementAction_SlideUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E19C[])(struct EventObject *, struct Sprite *) = { - sub_8094C00, - sub_8094C00_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_SlideLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_SlideLeft_Step0, + MovementAction_SlideLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E1A8[])(struct EventObject *, struct Sprite *) = { - sub_8094C40, - sub_8094C40_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_SlideRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_SlideRight_Step0, + MovementAction_SlideRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E1B4[])(struct EventObject *, struct Sprite *) = { - sub_8094C80, - sub_8094C80_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_PlayerRunDown_Step0, + MovementAction_PlayerRunDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E1C0[])(struct EventObject *, struct Sprite *) = { - sub_8094CC0, - sub_8094CC0_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_PlayerRunUp_Step0, + MovementAction_PlayerRunUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E1CC[])(struct EventObject *, struct Sprite *) = { - sub_8094D00, - sub_8094D00_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_PlayerRunLeft_Step0, + MovementAction_PlayerRunLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E1D8[])(struct EventObject *, struct Sprite *) = { - sub_8094D40, - sub_8094D40_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_PlayerRunRight_Step0, + MovementAction_PlayerRunRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E1E4[])(struct EventObject *, struct Sprite *) = { - sub_8094DAC, - sub_8094DC4, - sub_80964BC, +u8 (*const gMovementActionFuncs_StartAnimInDirection[])(struct EventObject *, struct Sprite *) = { + MovementAction_StartAnimInDirection_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E1F0[])(struct EventObject *, struct Sprite *) = { - sub_8094E18, - sub_8094E18_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpSpecialDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpSpecialDown_Step0, + MovementAction_JumpSpecialDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E1FC[])(struct EventObject *, struct Sprite *) = { - sub_8094E60, - sub_8094E60_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpSpecialUp_Step0, + MovementAction_JumpSpecialUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E208[])(struct EventObject *, struct Sprite *) = { - sub_8094EB8, - sub_8094EB8_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpSpecialLeft_Step0, + MovementAction_JumpSpecialLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E214[])(struct EventObject *, struct Sprite *) = { - sub_8094710, - sub_8094710_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpSpecialRight_Step0, + MovementAction_JumpSpecialRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E220[])(struct EventObject *, struct Sprite *) = { - sub_8094F38, - sub_80964BC, +u8 (*const gMovementActionFuncs_FacePlayer[])(struct EventObject *, struct Sprite *) = { + MovementAction_FacePlayer_Step0, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E228[])(struct EventObject *, struct Sprite *) = { - sub_8094F94, - sub_80964BC, +u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct EventObject *, struct Sprite *) = { + MovementAction_FaceAwayPlayer_Step0, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E230[])(struct EventObject *, struct Sprite *) = { - sub_8094FF8, - sub_80964BC, +u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct EventObject *, struct Sprite *) = { + MovementAction_LockFacingDirection_Step0, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E238[])(struct EventObject *, struct Sprite *) = { - sub_8095008, - sub_80964BC, +u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct EventObject *, struct Sprite *) = { + MovementAction_UnlockFacingDirection_Step0, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E240[])(struct EventObject *, struct Sprite *) = { - sub_8095018, - sub_8095018_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpDown_Step0, + MovementAction_JumpDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E24C[])(struct EventObject *, struct Sprite *) = { - sub_8095070, - sub_8095070_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpUp_Step0, + MovementAction_JumpUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E258[])(struct EventObject *, struct Sprite *) = { - sub_80950C8, - sub_80950C8_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpLeft_Step0, + MovementAction_JumpLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E264[])(struct EventObject *, struct Sprite *) = { - sub_8095120, - sub_8095120_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpRight_Step0, + MovementAction_JumpRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E270[])(struct EventObject *, struct Sprite *) = { - sub_8095178, - sub_8095178_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpInPlaceDown_Step0, + MovementAction_JumpInPlaceDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E27C[])(struct EventObject *, struct Sprite *) = { - sub_80951D0, - sub_80951D0_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpInPlaceUp_Step0, + MovementAction_JumpInPlaceUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E288[])(struct EventObject *, struct Sprite *) = { - sub_8095228, - sub_8095228_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpInPlaceLeft_Step0, + MovementAction_JumpInPlaceLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E294[])(struct EventObject *, struct Sprite *) = { - sub_8095280, - sub_8095280_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpInPlaceRight_Step0, + MovementAction_JumpInPlaceRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E2A0[])(struct EventObject *, struct Sprite *) = { - sub_80952D8, - sub_80952D8_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpInPlaceDownUp_Step0, + MovementAction_JumpInPlaceDownUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E2AC[])(struct EventObject *, struct Sprite *) = { - sub_8095330, - sub_8095330_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpInPlaceUpDown_Step0, + MovementAction_JumpInPlaceUpDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E2B8[])(struct EventObject *, struct Sprite *) = { - sub_8095388, - sub_8095388_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpInPlaceLeftRight_Step0, + MovementAction_JumpInPlaceLeftRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E2C4[])(struct EventObject *, struct Sprite *) = { - sub_80953E0, - sub_80953E0_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_JumpInPlaceRightLeft_Step0, + MovementAction_JumpInPlaceRightLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E2D0[])(struct EventObject *, struct Sprite *) = { - sub_8095438, - sub_80964BC, +u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct EventObject *, struct Sprite *) = { + MovementAction_FaceOriginalDirection_Step0, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E2D8[])(struct EventObject *, struct Sprite *) = { - sub_8095450, - sub_8094DC4, - sub_80964BC, +u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_NurseJoyBowDown_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E2E4[])(struct EventObject *, struct Sprite *) = { - sub_8095460, - sub_80964B8, +u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *) = { + MovementAction_EnableJumpLandingGroundEffect_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E2EC[])(struct EventObject *, struct Sprite *) = { - sub_8095470, - sub_80964B8, +u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *) = { + MovementAction_DisableJumpLandingGroundEffect_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E2F4[])(struct EventObject *, struct Sprite *) = { - sub_8095480, - sub_80964B8, +u8 (*const gMovementActionFuncs_DisableAnimation[])(struct EventObject *, struct Sprite *) = { + MovementAction_DisableAnimation_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E2FC[])(struct EventObject *, struct Sprite *) = { - sub_8095490, - sub_80964B8, +u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct EventObject *, struct Sprite *) = { + MovementAction_RestoreAnimation_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E304[])(struct EventObject *, struct Sprite *) = { - sub_80954BC, - sub_80964B8, +u8 (*const gMovementActionFuncs_SetInvisible[])(struct EventObject *, struct Sprite *) = { + MovementAction_SetInvisible_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E30C[])(struct EventObject *, struct Sprite *) = { - sub_80954CC, - sub_80964B8, +u8 (*const gMovementActionFuncs_SetVisible[])(struct EventObject *, struct Sprite *) = { + MovementAction_SetVisible_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E314[])(struct EventObject *, struct Sprite *) = { - do_exclamation_mark_bubble_1, - sub_80964B8, +u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct EventObject *, struct Sprite *) = { + MovementAction_EmoteExclamationMark_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E31C[])(struct EventObject *, struct Sprite *) = { - do_exclamation_mark_bubble_2, - sub_80964B8, +u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct EventObject *, struct Sprite *) = { + MovementAction_EmoteQuestionMark_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E324[])(struct EventObject *, struct Sprite *) = { - do_heart_bubble, - sub_80964B8, +u8 (*const gMovementActionFuncs_EmoteHeart[])(struct EventObject *, struct Sprite *) = { + MovementAction_EmoteHeart_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E32C[])(struct EventObject *, struct Sprite *) = { - sub_8095548, - sub_809558C, - sub_80964B8, +u8 (*const gMovementActionFuncs_RevealTrainer[])(struct EventObject *, struct Sprite *) = { + MovementAction_RevealTrainer_Step0, + MovementAction_RevealTrainer_Step1, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E338[])(struct EventObject *, struct Sprite *) = { - sub_80955AC, - sub_80955C8, - sub_80955EC, - sub_80964B8, +u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct EventObject *, struct Sprite *) = { + MovementAction_RockSmashBreak_Step0, + MovementAction_RockSmashBreak_Step1, + MovementAction_RockSmashBreak_Step2, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E348[])(struct EventObject *, struct Sprite *) = { - sub_8095628, - sub_8095644, - sub_8095668, - sub_80964B8, +u8 (*const gMovementActionFuncs_CutTree[])(struct EventObject *, struct Sprite *) = { + MovementAction_CutTree_Step0, + MovementAction_CutTree_Step1, + MovementAction_CutTree_Step2, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E358[])(struct EventObject *, struct Sprite *) = { - sub_80956A4, - sub_80964B8, +u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct EventObject *, struct Sprite *) = { + MovementAction_SetFixedPriority_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E360[])(struct EventObject *, struct Sprite *) = { - sub_80956B4, - sub_80964B8, +u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct EventObject *, struct Sprite *) = { + MovementAction_ClearFixedPriority_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E368[])(struct EventObject *, struct Sprite *) = { - sub_80956C4, - sub_80964B8, +u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct EventObject *, struct Sprite *) = { + MovementAction_InitAffineAnim_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E370[])(struct EventObject *, struct Sprite *) = { - sub_80956F4, - sub_80964B8, +u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct EventObject *, struct Sprite *) = { + MovementAction_ClearAffineAnim_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E378[])(struct EventObject *, struct Sprite *) = { - sub_8095724, - sub_80964B8, +u8 (*const gMovementActionFuncs_Unknown1[])(struct EventObject *, struct Sprite *) = { + MovementAction_Unknown1_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E380[])(struct EventObject *, struct Sprite *) = { - sub_8095730, - sub_80964B8, +u8 (*const gMovementActionFuncs_Unknown2[])(struct EventObject *, struct Sprite *) = { + MovementAction_Unknown2_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E388[])(struct EventObject *, struct Sprite *) = { - sub_8095740, - sub_8095740_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkDownStartAffine_Step0, + MovementAction_WalkDownStartAffine_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E394[])(struct EventObject *, struct Sprite *) = { - sub_80957A0, - sub_80957A0_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkDownAffine_Step0, + MovementAction_WalkDownAffine_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E3A0[])(struct EventObject *, struct Sprite *) = { - sub_8095800, - sub_8095800_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkLeftAffine[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkLeftAffine_Step0, + MovementAction_WalkLeftAffine_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E3AC[])(struct EventObject *, struct Sprite *) = { - sub_8095860, - sub_8095860_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_WalkRightAffine[])(struct EventObject *, struct Sprite *) = { + MovementAction_WalkRightAffine_Step0, + MovementAction_WalkRightAffine_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E3B8[])(struct EventObject *, struct Sprite *) = { - sub_8095900, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieFaceDown_Step0, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E3C0[])(struct EventObject *, struct Sprite *) = { - sub_8095910, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieFaceUp_Step0, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E3C8[])(struct EventObject *, struct Sprite *) = { - sub_8095920, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieFaceLeft_Step0, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E3D0[])(struct EventObject *, struct Sprite *) = { - sub_8095930, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieFaceRight_Step0, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E3D8[])(struct EventObject *, struct Sprite *) = { - sub_8095940, - sub_8094DC4, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroPopWheelieDown_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E3E4[])(struct EventObject *, struct Sprite *) = { - sub_8095964, - sub_8094DC4, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroPopWheelieUp_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E3F0[])(struct EventObject *, struct Sprite *) = { - sub_8095988, - sub_8094DC4, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroPopWheelieLeft_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E3FC[])(struct EventObject *, struct Sprite *) = { - sub_80959AC, - sub_8094DC4, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroPopWheelieRight_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E408[])(struct EventObject *, struct Sprite *) = { - sub_80959D0, - sub_8094DC4, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroEndWheelieFaceDown_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E414[])(struct EventObject *, struct Sprite *) = { - sub_80959F4, - sub_8094DC4, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroEndWheelieFaceUp_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E420[])(struct EventObject *, struct Sprite *) = { - sub_8095A18, - sub_8094DC4, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroEndWheelieFaceLeft_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E42C[])(struct EventObject *, struct Sprite *) = { - sub_8095A3C, - sub_8094DC4, - sub_80964BC, - sub_8095A60, - sub_8094DC4, - sub_80964BC, - sub_8095A84, - sub_8094DC4, - sub_80964BC, - sub_8095AA8, - sub_8094DC4, - sub_80964BC, - sub_8095ACC, - sub_8094DC4, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroEndWheelieFaceRight_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E468[])(struct EventObject *, struct Sprite *) = { - sub_8095B44, - sub_8095B64, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroUnusedAcroActionDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_UnusedAcroActionDown_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E474[])(struct EventObject *, struct Sprite *) = { - sub_8095BC8, - sub_8095BC8_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroUnusedAcroActionUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_UnusedAcroActionUp_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E480[])(struct EventObject *, struct Sprite *) = { - sub_8095C20, - sub_8095C20_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroUnusedAcroActionLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_UnusedAcroActionLeft_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E48C[])(struct EventObject *, struct Sprite *) = { - sub_8095C78, - sub_8095C78_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroUnusedAcroActionRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_UnusedAcroActionRight_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E498[])(struct EventObject *, struct Sprite *) = { - sub_8095CD0, - sub_8095CD0_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_Figure8[])(struct EventObject *, struct Sprite *) = { + MovementAction_Figure8_Step0, + MovementAction_Figure8_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E4A4[])(struct EventObject *, struct Sprite *) = { - sub_8095D28, - sub_8095D28_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieHopFaceDown_Step0, + MovementAction_AcroWheelieHopFaceDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E4B0[])(struct EventObject *, struct Sprite *) = { - sub_8095D80, - sub_8095D80_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieHopFaceUp_Step0, + MovementAction_AcroWheelieHopFaceUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E4BC[])(struct EventObject *, struct Sprite *) = { - sub_8095DD8, - sub_8095DD8_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieHopFaceLeft_Step0, + MovementAction_AcroWheelieHopFaceLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E4C8[])(struct EventObject *, struct Sprite *) = { - sub_8095E30, - sub_8095E30_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieHopFaceRight_Step0, + MovementAction_AcroWheelieHopFaceRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E4D4[])(struct EventObject *, struct Sprite *) = { - sub_8095E88, - sub_8095E88_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieHopDown_Step0, + MovementAction_AcroWheelieHopDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E4E0[])(struct EventObject *, struct Sprite *) = { - sub_8095EE0, - sub_8095EE0_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieHopUp_Step0, + MovementAction_AcroWheelieHopUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E4EC[])(struct EventObject *, struct Sprite *) = { - sub_8095F38, - sub_8095F38_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieHopLeft_Step0, + MovementAction_AcroWheelieHopLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E4F8[])(struct EventObject *, struct Sprite *) = { - sub_8095F90, - sub_8095F90_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieHopRight_Step0, + MovementAction_AcroWheelieHopRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E504[])(struct EventObject *, struct Sprite *) = { - sub_8095FE8, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieJumpDown_Step0, + MovementAction_AcroWheelieJumpDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E510[])(struct EventObject *, struct Sprite *) = { - sub_8096020, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieJumpUp_Step0, + MovementAction_AcroWheelieJumpUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E51C[])(struct EventObject *, struct Sprite *) = { - sub_8096058, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieJumpLeft_Step0, + MovementAction_AcroWheelieJumpLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E528[])(struct EventObject *, struct Sprite *) = { - sub_8096090, - sub_809459C, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieJumpRight_Step0, + MovementAction_AcroWheelieJumpRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E534[])(struct EventObject *, struct Sprite *) = { - sub_8096100, - sub_8096100_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieInPlaceDown_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E540[])(struct EventObject *, struct Sprite *) = { - sub_8096140, - sub_8096140_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieInPlaceUp_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E54C[])(struct EventObject *, struct Sprite *) = { - sub_8096180, - sub_8096180_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieInPlaceLeft_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E558[])(struct EventObject *, struct Sprite *) = { - sub_80961C0, - sub_80961C0_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieInPlaceRight_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E564[])(struct EventObject *, struct Sprite *) = { - sub_8096230, - sub_8096230_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroPopWheelieMoveDown_Step0, + MovementAction_AcroPopWheelieMoveDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E570[])(struct EventObject *, struct Sprite *) = { - sub_8096270, - sub_8096270_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroPopWheelieMoveUp_Step0, + MovementAction_AcroPopWheelieMoveUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E57C[])(struct EventObject *, struct Sprite *) = { - sub_80962B0, - sub_80962B0_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroPopWheelieMoveLeft_Step0, + MovementAction_AcroPopWheelieMoveLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E588[])(struct EventObject *, struct Sprite *) = { - sub_80962F0, - sub_80962F0_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroPopWheelieMoveRight_Step0, + MovementAction_AcroPopWheelieMoveRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E594[])(struct EventObject *, struct Sprite *) = { - sub_8096368, - sub_8096368_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieMoveDown_Step0, + MovementAction_AcroWheelieMoveDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E5A0[])(struct EventObject *, struct Sprite *) = { - sub_80963A8, - sub_80963A8_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieMoveUp_Step0, + MovementAction_AcroWheelieMoveUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E5AC[])(struct EventObject *, struct Sprite *) = { - sub_80963E8, - sub_80963E8_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieMoveLeft_Step0, + MovementAction_AcroWheelieMoveLeft_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E5B8[])(struct EventObject *, struct Sprite *) = { - sub_8096428, - sub_8096428_2, - sub_80964BC, +u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroWheelieMoveRight_Step0, + MovementAction_AcroWheelieMoveRight_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E5C4[])(struct EventObject *, struct Sprite *) = { - sub_8096468, - sub_80964B8, +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroEndWheelieMoveDown_Step0, + MovementAction_AcroEndWheelieMoveDown_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E5CC[])(struct EventObject *, struct Sprite *) = { - sub_809647C, - sub_80964B8, +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroEndWheelieMoveUp_Step0, + MovementAction_AcroEndWheelieMoveUp_Step1, + MovementAction_PauseSpriteAnim, }; -u8 (*const gUnknown_0850E5D4[])(struct EventObject *, struct Sprite *) = { - sub_8096494, - sub_80964B8, +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroEndWheelieMoveLeft_Step0, + MovementAction_AcroEndWheelieMoveLeft_Step1, + MovementAction_PauseSpriteAnim, +}; + +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveRight[])(struct EventObject *, struct Sprite *) = { + MovementAction_AcroEndWheelieMoveRight_Step0, + MovementAction_AcroEndWheelieMoveRight_Step1, + MovementAction_PauseSpriteAnim, +}; + +u8 (*const gMovementActionFuncs_Levitate[])(struct EventObject *, struct Sprite *) = { + MovementAction_Levitate_Step0, + MovementAction_Finish, +}; + +u8 (*const gMovementActionFuncs_StopLevitate[])(struct EventObject *, struct Sprite *) = { + MovementAction_StopLevitate_Step0, + MovementAction_Finish, +}; + +u8 (*const gMovementActionFuncs_DestroyExtraTaskIfAtTop[])(struct EventObject *, struct Sprite *) = { + MovementAction_DestroyExtraTaskIfAtTop_Step0, + MovementAction_Finish, }; #endif //GUARD_MOVEMENT_ACTION_FUNC_TABLES_H diff --git a/src/data/field_event_obj/movement_type_func_tables.h b/src/data/field_event_obj/movement_type_func_tables.h index 3b18c90d14..165e96220a 100755 --- a/src/data/field_event_obj/movement_type_func_tables.h +++ b/src/data/field_event_obj/movement_type_func_tables.h @@ -1,443 +1,443 @@ #ifndef GUARD_MOVEMENT_TYPE_FUNC_TABLES_H #define GUARD_MOVEMENT_TYPE_FUNC_TABLES_H -u8 (*const gUnknown_0850D6F4[])(struct EventObject *, struct Sprite *) = { - sub_808F44C, - sub_808F460, - sub_808F48C, - sub_808F4C8, - sub_808F4E8, - sub_808F534, - sub_808F564, +u8 (*const gMovementTypeFuncs_WanderAround[])(struct EventObject *, struct Sprite *) = { + MovementType_WanderAround_Step0, + MovementType_WanderAround_Step1, + MovementType_WanderAround_Step2, + MovementType_WanderAround_Step3, + MovementType_WanderAround_Step4, + MovementType_WanderAround_Step5, + MovementType_WanderAround_Step6, }; -const u8 gUnknown_0850D710[] = {DIR_SOUTH, DIR_NORTH, DIR_WEST, DIR_EAST}; +const u8 gStandardDirections[] = {DIR_SOUTH, DIR_NORTH, DIR_WEST, DIR_EAST}; -u8 (*const gUnknown_0850D714[])(s16, s16, s16, s16) = { - GetRegularRunningPastFacingDirection, - GetNorthSouthRunningPastFacingDirection, - GetEastWestRunningPastFacingDirection, - GetNorthEastRunningPastFacingDirection, - GetNorthWestRunningPastFacingDirection, - GetSouthEastRunningPastFacingDirection, - GetSouthWestRunningPastFacingDirection, - GetNonEastRunningPastFacingDirection, - GetNonWestRunningPastFacingDirection, - GetNonSouthRunningPastFacingDirection, - GetNonNorthRunningPastFacingDirection, +u8 (*const gGetVectorDirectionFuncs[])(s16, s16, s16, s16) = { + GetVectorDirection, + GetLimitedVectorDirection_SouthNorth, + GetLimitedVectorDirection_WestEast, + GetLimitedVectorDirection_WestNorth, + GetLimitedVectorDirection_EastNorth, + GetLimitedVectorDirection_WestSouth, + GetLimitedVectorDirection_EastSouth, + GetLimitedVectorDirection_SouthNorthWest, + GetLimitedVectorDirection_SouthNorthEast, + GetLimitedVectorDirection_NorthWestEast, + GetLimitedVectorDirection_SouthWestEast, }; -u8 (*const gUnknown_0850D740[])(struct EventObject *, struct Sprite *) = { - sub_808F988, - sub_808F99C, - sub_808F9C8, - sub_808FA0C, - sub_808FA3C, +u8 (*const gMovementTypeFuncs_LookAround[])(struct EventObject *, struct Sprite *) = { + MovementType_LookAround_Step0, + MovementType_LookAround_Step1, + MovementType_LookAround_Step2, + MovementType_LookAround_Step3, + MovementType_LookAround_Step4, }; -u8 (*const gUnknown_0850D754[])(struct EventObject *, struct Sprite *) = { - sub_808FAC8, - sub_808FADC, - sub_808FB08, - sub_808FB44, - sub_808FB64, - sub_808FBB0, - sub_808FBE0, +u8 (*const gMovementTypeFuncs_WanderUpAndDown[])(struct EventObject *, struct Sprite *) = { + MovementType_WanderUpAndDown_Step0, + MovementType_WanderUpAndDown_Step1, + MovementType_WanderUpAndDown_Step2, + MovementType_WanderUpAndDown_Step3, + MovementType_WanderUpAndDown_Step4, + MovementType_WanderUpAndDown_Step5, + MovementType_WanderUpAndDown_Step6, }; -const u8 gUnknown_0850D770[] = {DIR_SOUTH, DIR_NORTH}; +const u8 gUpAndDownDirections[] = {DIR_SOUTH, DIR_NORTH}; -u8 (*const gUnknown_0850D774[])(struct EventObject *, struct Sprite *) = { - sub_808FC4C, - sub_808FC60, - sub_808FC8C, - sub_808FCC8, - sub_808FCE8, - sub_808FD34, - sub_808FD64, +u8 (*const gMovementTypeFuncs_WanderLeftAndRight[])(struct EventObject *, struct Sprite *) = { + MovementType_WanderLeftAndRight_Step0, + MovementType_WanderLeftAndRight_Step1, + MovementType_WanderLeftAndRight_Step2, + MovementType_WanderLeftAndRight_Step3, + MovementType_WanderLeftAndRight_Step4, + MovementType_WanderLeftAndRight_Step5, + MovementType_WanderLeftAndRight_Step6, }; -const u8 gUnknown_0850D790[] = {DIR_WEST, DIR_EAST}; +const u8 gLeftAndRightDirections[] = {DIR_WEST, DIR_EAST}; -u8 (*const gUnknown_0850D794[])(struct EventObject *, struct Sprite *) = { - sub_808FDD0, - sub_808FDFC, - sub_808FE1C, +u8 (*const gMovementTypeFuncs_FaceDirection[])(struct EventObject *, struct Sprite *) = { + MovementType_FaceDirection_Step0, + MovementType_FaceDirection_Step1, + MovementType_FaceDirection_Step2, }; -u8 (*const gUnknown_0850D7A0[])(struct EventObject *, struct Sprite *) = { - do_berry_tree_growth_sparkle_1, - sub_808FF48, - do_berry_tree_growth_sparkle_2, - sub_808FFB4, - sub_8090004, +u8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct EventObject *, struct Sprite *) = { + MovementType_BerryTreeGrowth_Step0, + MovementType_BerryTreeGrowth_Step1, + MovementType_BerryTreeGrowth_Step2, + MovementType_BerryTreeGrowth_Step3, + MovementType_BerryTreeGrowth_Step4, }; -u8 (*const gUnknown_0850D7B4[])(struct EventObject *, struct Sprite *) = { - sub_8090094, - sub_80900A8, - sub_80900D4, - sub_8090118, - sub_8090148, +u8 (*const gMovementTypeFuncs_FaceDownAndUp[])(struct EventObject *, struct Sprite *) = { + MovementType_FaceDownAndUp_Step0, + MovementType_FaceDownAndUp_Step1, + MovementType_FaceDownAndUp_Step2, + MovementType_FaceDownAndUp_Step3, + MovementType_FaceDownAndUp_Step4, }; -u8 (*const gUnknown_0850D7C8[])(struct EventObject *, struct Sprite *) = { - sub_80901D4, - sub_80901E8, - sub_8090214, - sub_8090258, - sub_8090288, +u8 (*const gMovementTypeFuncs_FaceLeftAndRight[])(struct EventObject *, struct Sprite *) = { + MovementType_FaceLeftAndRight_Step0, + MovementType_FaceLeftAndRight_Step1, + MovementType_FaceLeftAndRight_Step2, + MovementType_FaceLeftAndRight_Step3, + MovementType_FaceLeftAndRight_Step4, }; -u8 (*const gUnknown_0850D7DC[])(struct EventObject *, struct Sprite *) = { - sub_8090314, - sub_8090328, - sub_8090354, - sub_8090398, - sub_80903C8, +u8 (*const gMovementTypeFuncs_FaceUpAndLeft[])(struct EventObject *, struct Sprite *) = { + MovementType_FaceUpAndLeft_Step0, + MovementType_FaceUpAndLeft_Step1, + MovementType_FaceUpAndLeft_Step2, + MovementType_FaceUpAndLeft_Step3, + MovementType_FaceUpAndLeft_Step4, }; -const u8 gUnknown_0850D7F0[] = {DIR_NORTH, DIR_WEST}; +const u8 gUpAndLeftDirections[] = {DIR_NORTH, DIR_WEST}; -u8 (*const gUnknown_0850D7F4[])(struct EventObject *, struct Sprite *) = { - sub_8090454, - sub_8090468, - sub_8090494, - sub_80904D8, - sub_8090508, +u8 (*const gMovementTypeFuncs_FaceUpAndRight[])(struct EventObject *, struct Sprite *) = { + MovementType_FaceUpAndRight_Step0, + MovementType_FaceUpAndRight_Step1, + MovementType_FaceUpAndRight_Step2, + MovementType_FaceUpAndRight_Step3, + MovementType_FaceUpAndRight_Step4, }; -const u8 gUnknown_0850D808[] = {DIR_NORTH, DIR_EAST}; +const u8 gUpAndRightDirections[] = {DIR_NORTH, DIR_EAST}; -u8 (*const gUnknown_0850D80C[])(struct EventObject *, struct Sprite *) = { - sub_8090594, - sub_80905A8, - sub_80905D4, - sub_8090618, - sub_8090648, +u8 (*const gMovementTypeFuncs_FaceDownAndLeft[])(struct EventObject *, struct Sprite *) = { + MovementType_FaceDownAndLeft_Step0, + MovementType_FaceDownAndLeft_Step1, + MovementType_FaceDownAndLeft_Step2, + MovementType_FaceDownAndLeft_Step3, + MovementType_FaceDownAndLeft_Step4, }; -const u8 gUnknown_0850D820[] = {DIR_SOUTH, DIR_WEST}; +const u8 gDownAndLeftDirections[] = {DIR_SOUTH, DIR_WEST}; -u8 (*const gUnknown_0850D824[])(struct EventObject *, struct Sprite *) = { - sub_80906D4, - sub_80906E8, - sub_8090714, - sub_8090758, - sub_8090788, +u8 (*const gMovementTypeFuncs_FaceDownAndRight[])(struct EventObject *, struct Sprite *) = { + MovementType_FaceDownAndRight_Step0, + MovementType_FaceDownAndRight_Step1, + MovementType_FaceDownAndRight_Step2, + MovementType_FaceDownAndRight_Step3, + MovementType_FaceDownAndRight_Step4, }; -const u8 gUnknown_0850D838[] = {DIR_SOUTH, DIR_EAST}; +const u8 gDownAndRightDirections[] = {DIR_SOUTH, DIR_EAST}; -u8 (*const gUnknown_0850D83C[])(struct EventObject *, struct Sprite *) = { - sub_8090814, - sub_8090828, - sub_8090854, - sub_8090898, - sub_80908C8, +u8 (*const gMovementTypeFuncs_FaceDownUpAndLeft[])(struct EventObject *, struct Sprite *) = { + MovementType_FaceDownUpAndLeft_Step0, + MovementType_FaceDownUpAndLeft_Step1, + MovementType_FaceDownUpAndLeft_Step2, + MovementType_FaceDownUpAndLeft_Step3, + MovementType_FaceDownUpAndLeft_Step4, }; -const u8 gUnknown_0850D850[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_SOUTH}; +const u8 gDownUpAndLeftDirections[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_SOUTH}; -u8 (*const gUnknown_0850D854[])(struct EventObject *, struct Sprite *) = { - sub_8090954, - sub_8090968, - sub_8090994, - sub_80909D8, - sub_8090A08, +u8 (*const gMovementTypeFuncs_FaceDownUpAndRight[])(struct EventObject *, struct Sprite *) = { + MovementType_FaceDownUpAndRight_Step0, + MovementType_FaceDownUpAndRight_Step1, + MovementType_FaceDownUpAndRight_Step2, + MovementType_FaceDownUpAndRight_Step3, + MovementType_FaceDownUpAndRight_Step4, }; -const u8 gUnknown_0850D868[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_SOUTH}; +const u8 gDownUpAndRightDirections[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_SOUTH}; -u8 (*const gUnknown_0850D86C[])(struct EventObject *, struct Sprite *) = { - sub_8090A94, - sub_8090AA8, - sub_8090AD4, - sub_8090B18, - sub_8090B48, +u8 (*const gMovementTypeFuncs_FaceUpLeftAndRight[])(struct EventObject *, struct Sprite *) = { + MovementType_FaceUpLeftAndRight_Step0, + MovementType_FaceUpLeftAndRight_Step1, + MovementType_FaceUpLeftAndRight_Step2, + MovementType_FaceUpLeftAndRight_Step3, + MovementType_FaceUpLeftAndRight_Step4, }; -const u8 gUnknown_0850D880[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_NORTH}; +const u8 gUpLeftAndRightDirections[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_NORTH}; -u8 (*const gUnknown_0850D884[])(struct EventObject *, struct Sprite *) = { - sub_8090BD4, - sub_8090BE8, - sub_8090C14, - sub_8090C58, - sub_8090C88, +u8 (*const gMovementTypeFuncs_FaceDownLeftAndRight[])(struct EventObject *, struct Sprite *) = { + MovementType_FaceDownLeftAndRight_Step0, + MovementType_FaceDownLeftAndRight_Step1, + MovementType_FaceDownLeftAndRight_Step2, + MovementType_FaceDownLeftAndRight_Step3, + MovementType_FaceDownLeftAndRight_Step4, }; -const u8 gUnknown_0850D898[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_SOUTH}; +const u8 gDownLeftAndRightDirections[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_SOUTH}; -u8 (*const gUnknown_0850D89C[])(struct EventObject *, struct Sprite *) = { - sub_8090D14, - sub_8090D40, - sub_8090D64, - sub_8090D90, +u8 (*const gMovementTypeFuncs_RotateCounterclockwise[])(struct EventObject *, struct Sprite *) = { + MovementType_RotateCounterclockwise_Step0, + MovementType_RotateCounterclockwise_Step1, + MovementType_RotateCounterclockwise_Step2, + MovementType_RotateCounterclockwise_Step3, }; -const u8 gUnknown_0850D8AC[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH}; +const u8 gCounterclockwiseDirections[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH}; -u8 (*const gUnknown_0850D8B4[])(struct EventObject *, struct Sprite *) = { - sub_8090E18, - sub_8090E44, - sub_8090E68, - sub_8090E94, +u8 (*const gMovementTypeFuncs_RotateClockwise[])(struct EventObject *, struct Sprite *) = { + MovementType_RotateClockwise_Step0, + MovementType_RotateClockwise_Step1, + MovementType_RotateClockwise_Step2, + MovementType_RotateClockwise_Step3, }; -const u8 gUnknown_0850D8C4[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; +const u8 gClockwiseDirections[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; -u8 (*const gUnknown_0850D8CC[])(struct EventObject *, struct Sprite *) = { - sub_8090F1C, - sub_8090F30, - sub_8090F68, - sub_8091020, +u8 (*const gMovementTypeFuncs_WalkBackAndForth[])(struct EventObject *, struct Sprite *) = { + MovementType_WalkBackAndForth_Step0, + MovementType_WalkBackAndForth_Step1, + MovementType_WalkBackAndForth_Step2, + MovementType_WalkBackAndForth_Step3, }; -u8 (*const gUnknown_0850D8DC[])(struct EventObject *, struct Sprite *) = { - sub_8091048, - sub_809117C, - sub_8091110, +u8 (*const gMovementTypeFuncs_WalkSequenceUpRightLeftDown[])(struct EventObject *, struct Sprite *) = { + MovementType_WalkSequence_Step0, + MovementType_WalkSequenceUpRightLeftDown_Step1, + MovementType_WalkSequence_Step2, }; -const u8 gUnknown_0850D8E8[] = {DIR_NORTH, DIR_EAST, DIR_WEST, DIR_SOUTH}; +const u8 gUpRightLeftDownDirections[] = {DIR_NORTH, DIR_EAST, DIR_WEST, DIR_SOUTH}; -u8 (*const gUnknown_0850D8EC[])(struct EventObject *, struct Sprite *) = { - sub_8091048, - sub_8091208, - sub_8091110, +u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftDownUp[])(struct EventObject *, struct Sprite *) = { + MovementType_WalkSequence_Step0, + MovementType_WalkSequenceRightLeftDownUp_Step1, + MovementType_WalkSequence_Step2, }; -const u8 gUnknown_0850D8F8[] = {DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH}; +const u8 gRightLeftDownUpDirections[] = {DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH}; -u8 (*const gUnknown_0850D8FC[])(struct EventObject *, struct Sprite *) = { - sub_8091048, - sub_8091294, - sub_8091110, +u8 (*const gMovementTypeFuncs_WalkSequenceDownUpRightLeft[])(struct EventObject *, struct Sprite *) = { + MovementType_WalkSequence_Step0, + MovementType_WalkSequenceDownUpRightLeft_Step1, + MovementType_WalkSequence_Step2, }; -const u8 gUnknown_0850D908[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_WEST}; +const u8 gDownUpRightLeftDirections[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_WEST}; -u8 (*const gUnknown_0850D90C[])(struct EventObject *, struct Sprite *) = { - sub_8091048, - sub_8091320, - sub_8091110, +u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownUpRight[])(struct EventObject *, struct Sprite *) = { + MovementType_WalkSequence_Step0, + MovementType_WalkSequenceLeftDownUpRight_Step1, + MovementType_WalkSequence_Step2, }; -const u8 gUnknown_0850D918[] = {DIR_WEST, DIR_SOUTH, DIR_NORTH, DIR_EAST}; +const u8 gLeftDownUpRightDirections[] = {DIR_WEST, DIR_SOUTH, DIR_NORTH, DIR_EAST}; -u8 (*const gUnknown_0850D91C[])(struct EventObject *, struct Sprite *) = { - sub_8091048, - sub_80913AC, - sub_8091110, +u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftRightDown[])(struct EventObject *, struct Sprite *) = { + MovementType_WalkSequence_Step0, + MovementType_WalkSequenceUpLeftRightDown_Step1, + MovementType_WalkSequence_Step2, }; -const u8 gUnknown_0850D928[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_SOUTH}; +const u8 gUpLeftRightDownDirections[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_SOUTH}; -u8 (*const gUnknown_0850D92C[])(struct EventObject *, struct Sprite *) = { - sub_8091048, - sub_8091438, - sub_8091110, +u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightDownUp[])(struct EventObject *, struct Sprite *) = { + MovementType_WalkSequence_Step0, + MovementType_WalkSequenceLeftRightDownUp_Step1, + MovementType_WalkSequence_Step2, }; -const u8 gUnknown_0850D938[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_NORTH}; +const u8 gLeftRightDownUpDirections[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_NORTH}; -u8 (*const gUnknown_0850D93C[])(struct EventObject *, struct Sprite *) = { - sub_8091048, - sub_80914C4, - sub_8091110, +u8 (*const gMovementTypeFuncs_WalkSequenceDownUpLeftRight[])(struct EventObject *, struct Sprite *) = { + MovementType_WalkSequence_Step0, + MovementType_WalkSequenceDownUpLeftRight_Step1, + MovementType_WalkSequence_Step2, }; -u8 (*const gUnknown_0850D948[])(struct EventObject *, struct Sprite *) = { - sub_8091048, - sub_8091550, - sub_8091110, +u8 (*const gMovementTypeFuncs_WalkSequenceRightDownUpLeft[])(struct EventObject *, struct Sprite *) = { + MovementType_WalkSequence_Step0, + MovementType_WalkSequenceRightDownUpLeft_Step1, + MovementType_WalkSequence_Step2, }; -const u8 gUnknown_0850D954[] = {DIR_EAST, DIR_SOUTH, DIR_NORTH, DIR_WEST}; +const u8 gRightDownUpLeftDirections[] = {DIR_EAST, DIR_SOUTH, DIR_NORTH, DIR_WEST}; -u8 (*const gUnknown_0850D958[])(struct EventObject *, struct Sprite *) = { - sub_8091048, - sub_80915DC, - sub_8091110, +u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpDownRight[])(struct EventObject *, struct Sprite *) = { + MovementType_WalkSequence_Step0, + MovementType_WalkSequenceLeftUpDownRight_Step1, + MovementType_WalkSequence_Step2, }; -const u8 gUnknown_0850D964[] = {DIR_WEST, DIR_NORTH, DIR_SOUTH, DIR_EAST}; +const u8 gLeftUpDownRightDirections[] = {DIR_WEST, DIR_NORTH, DIR_SOUTH, DIR_EAST}; -u8 (*const gUnknown_0850D968[])(struct EventObject *, struct Sprite *) = { - sub_8091048, - sub_8091668, - sub_8091110, +u8 (*const gMovementTypeFuncs_WalkSequenceUpDownRightLeft[])(struct EventObject *, struct Sprite *) = { + MovementType_WalkSequence_Step0, + MovementType_WalkSequenceUpDownRightLeft_Step1, + MovementType_WalkSequence_Step2, }; -const u8 gUnknown_0850D974[] = {DIR_NORTH, DIR_SOUTH, DIR_EAST, DIR_WEST}; +const u8 gUpDownRightLeftDirections[] = {DIR_NORTH, DIR_SOUTH, DIR_EAST, DIR_WEST}; -u8 (*const gUnknown_0850D978[])(struct EventObject *, struct Sprite *) = { - sub_8091048, - sub_80916F4, - sub_8091110, +u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftUpDown[])(struct EventObject *, struct Sprite *) = { + MovementType_WalkSequence_Step0, + MovementType_WalkSequenceRightLeftUpDown_Step1, + MovementType_WalkSequence_Step2, }; -const u8 gUnknown_0850D984[] = {DIR_EAST, DIR_WEST, DIR_NORTH, DIR_SOUTH}; +const u8 gRightLeftUpDownDirections[] = {DIR_EAST, DIR_WEST, DIR_NORTH, DIR_SOUTH}; -u8 (*const gUnknown_0850D988[])(struct EventObject *, struct Sprite *) = { - sub_8091048, - sub_8091780, - sub_8091110, +u8 (*const gMovementTypeFuncs_WalkSequenceDownRightLeftUp[])(struct EventObject *, struct Sprite *) = { + MovementType_WalkSequence_Step0, + MovementType_WalkSequenceDownRightLeftUp_Step1, + MovementType_WalkSequence_Step2, }; -const u8 gUnknown_0850D994[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_NORTH}; +const u8 gDownRightLeftUpDirections[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_NORTH}; -u8 (*const gUnknown_0850D998[])(struct EventObject *, struct Sprite *) = { - sub_8091048, - sub_809180C, - sub_8091110, +u8 (*const gMovementTypeFuncs_WalkSequenceRightUpDownLeft[])(struct EventObject *, struct Sprite *) = { + MovementType_WalkSequence_Step0, + MovementType_WalkSequenceRightUpDownLeft_Step1, + MovementType_WalkSequence_Step2, }; -const u8 gUnknown_0850D9A4[] = {DIR_EAST, DIR_NORTH, DIR_SOUTH, DIR_WEST}; +const u8 gRightUpDownLeftDirections[] = {DIR_EAST, DIR_NORTH, DIR_SOUTH, DIR_WEST}; -u8 (*const gUnknown_0850D9A8[])(struct EventObject *, struct Sprite *) = { - sub_8091048, - sub_8091898, - sub_8091110, +u8 (*const gMovementTypeFuncs_WalkSequenceUpDownLeftRight[])(struct EventObject *, struct Sprite *) = { + MovementType_WalkSequence_Step0, + MovementType_WalkSequenceUpDownLeftRight_Step1, + MovementType_WalkSequence_Step2, }; -const u8 gUnknown_0850D9B4[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST}; +const u8 gUpDownLeftRightDirections[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST}; -u8 (*const gUnknown_0850D9B8[])(struct EventObject *, struct Sprite *) = { - sub_8091048, - sub_8091924, - sub_8091110, +u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightUpDown[])(struct EventObject *, struct Sprite *) = { + MovementType_WalkSequence_Step0, + MovementType_WalkSequenceLeftRightUpDown_Step1, + MovementType_WalkSequence_Step2, }; -const u8 gUnknown_0850D9C4[] = {DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; +const u8 gLeftRightUpDownDirections[] = {DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; -u8 (*const gUnknown_0850D9C8[])(struct EventObject *, struct Sprite *) = { - sub_8091048, - sub_80919B0, - sub_8091110, +u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftRightUp[])(struct EventObject *, struct Sprite *) = { + MovementType_WalkSequence_Step0, + MovementType_WalkSequenceDownLeftRightUp_Step1, + MovementType_WalkSequence_Step2, }; -const u8 gUnknown_0850D9D4[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH}; +const u8 gDownLeftRightUpDirections[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH}; -u8 (*const gUnknown_0850D9D8[])(struct EventObject *, struct Sprite *) = { - sub_8091048, - sub_8091A3C, - sub_8091110, +u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftDownRight[])(struct EventObject *, struct Sprite *) = { + MovementType_WalkSequence_Step0, + MovementType_WalkSequenceUpLeftDownRight_Step1, + MovementType_WalkSequence_Step2, }; -const u8 gUnknown_0850D9E4[] = {DIR_NORTH, DIR_WEST, DIR_SOUTH, DIR_EAST}; +const u8 gUpLeftDownRightDirections[] = {DIR_NORTH, DIR_WEST, DIR_SOUTH, DIR_EAST}; -u8 (*const gUnknown_0850D9E8[])(struct EventObject *, struct Sprite *) = { - sub_8091048, - sub_8091AC8, - sub_8091110, +u8 (*const gMovementTypeFuncs_WalkSequenceDownRightUpLeft[])(struct EventObject *, struct Sprite *) = { + MovementType_WalkSequence_Step0, + MovementType_WalkSequenceDownRightUpLeft_Step1, + MovementType_WalkSequence_Step2, }; -const u8 gUnknown_0850D9F4[] = {DIR_SOUTH, DIR_EAST, DIR_NORTH, DIR_WEST}; +const u8 gDownRightUpLeftDirections[] = {DIR_SOUTH, DIR_EAST, DIR_NORTH, DIR_WEST}; -u8 (*const gUnknown_0850D9F8[])(struct EventObject *, struct Sprite *) = { - sub_8091048, - sub_8091B54, - sub_8091110, +u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownRightUp[])(struct EventObject *, struct Sprite *) = { + MovementType_WalkSequence_Step0, + MovementType_WalkSequenceLeftDownRightUp_Step1, + MovementType_WalkSequence_Step2, }; -const u8 gUnknown_0850DA04[] = {DIR_WEST, DIR_SOUTH, DIR_EAST, DIR_NORTH}; +const u8 gLeftDownRightUpDirections[] = {DIR_WEST, DIR_SOUTH, DIR_EAST, DIR_NORTH}; -u8 (*const gUnknown_0850DA08[])(struct EventObject *, struct Sprite *) = { - sub_8091048, - sub_8091BE0, - sub_8091110, +u8 (*const gMovementTypeFuncs_WalkSequenceRightUpLeftDown[])(struct EventObject *, struct Sprite *) = { + MovementType_WalkSequence_Step0, + MovementType_WalkSequenceRightUpLeftDown_Step1, + MovementType_WalkSequence_Step2, }; -const u8 gUnknown_0850DA14[] = {DIR_EAST, DIR_NORTH, DIR_WEST, DIR_SOUTH}; +const u8 gRightUpLeftDownDirections[] = {DIR_EAST, DIR_NORTH, DIR_WEST, DIR_SOUTH}; -u8 (*const gUnknown_0850DA18[])(struct EventObject *, struct Sprite *) = { - sub_8091048, - sub_8091C6C, - sub_8091110, +u8 (*const gMovementTypeFuncs_WalkSequenceUpRightDownLeft[])(struct EventObject *, struct Sprite *) = { + MovementType_WalkSequence_Step0, + MovementType_WalkSequenceUpRightDownLeft_Step1, + MovementType_WalkSequence_Step2, }; -const u8 gUnknown_0850DA24[] = {DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WEST}; +const u8 gUpRightDownLeftDirections[] = {DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WEST}; -u8 (*const gUnknown_0850DA28[])(struct EventObject *, struct Sprite *) = { - sub_8091048, - sub_8091CF8, - sub_8091110, +u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftUpRight[])(struct EventObject *, struct Sprite *) = { + MovementType_WalkSequence_Step0, + MovementType_WalkSequenceDownLeftUpRight_Step1, + MovementType_WalkSequence_Step2, }; -const u8 gUnknown_0850DA34[] = {DIR_SOUTH, DIR_WEST, DIR_NORTH, DIR_EAST}; +const u8 gDownLeftUpRightDirections[] = {DIR_SOUTH, DIR_WEST, DIR_NORTH, DIR_EAST}; -u8 (*const gUnknown_0850DA38[])(struct EventObject *, struct Sprite *) = { - sub_8091048, - sub_8091D84, - sub_8091110, +u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpRightDown[])(struct EventObject *, struct Sprite *) = { + MovementType_WalkSequence_Step0, + MovementType_WalkSequenceLeftUpRightDown_Step1, + MovementType_WalkSequence_Step2, }; -const u8 gUnknown_0850DA44[] = {DIR_WEST, DIR_NORTH, DIR_EAST, DIR_SOUTH}; +const u8 gLeftUpRightDownDirections[] = {DIR_WEST, DIR_NORTH, DIR_EAST, DIR_SOUTH}; -u8 (*const gUnknown_0850DA48[])(struct EventObject *, struct Sprite *) = { - sub_8091048, - sub_8091E10, - sub_8091110, +u8 (*const gMovementTypeFuncs_WalkSequenceRightDownLeftUp[])(struct EventObject *, struct Sprite *) = { + MovementType_WalkSequence_Step0, + MovementType_WalkSequenceRightDownLeftUp_Step1, + MovementType_WalkSequence_Step2, }; -const u8 gUnknown_0850DA54[] = {DIR_EAST, DIR_SOUTH, DIR_WEST, DIR_NORTH}; +const u8 gRightDownLeftUpDirections[] = {DIR_EAST, DIR_SOUTH, DIR_WEST, DIR_NORTH}; -u8 (*const gUnknown_0850DA58[])(struct EventObject *, struct Sprite *) = { - mss_npc_reset_oampriv3_1_unk2_unk3, - sub_8091EC0, - sub_8091F20, +u8 (*const gMovementTypeFuncs_CopyPlayer[])(struct EventObject *, struct Sprite *) = { + MovementType_CopyPlayer_Step0, + MovementType_CopyPlayer_Step1, + MovementType_CopyPlayer_Step2, }; -bool8 (*const gUnknown_0850DA64[])(struct EventObject *, struct Sprite *, u8, bool8(u8)) = { - sub_8091F48, - sub_8091F4C, - sub_8091F94, - sub_80920A4, - sub_809215C, - sub_8092214, +bool8 (*const gCopyPlayerMovementFuncs[])(struct EventObject *, struct Sprite *, u8, bool8(u8)) = { + CopyablePlayerMovement_None, + CopyablePlayerMovement_FaceDirection, + CopyablePlayerMovement_GoSpeed0, + CopyablePlayerMovement_GoSpeed1, + CopyablePlayerMovement_GoSpeed2, + CopyablePlayerMovement_Slide, cph_IM_DIFFERENT, - sub_8092314, - oac_hopping, - sub_8091F48, - sub_8091F48, + CopyablePlayerMovement_GoSpeed4, + CopyablePlayerMovement_Jump, + CopyablePlayerMovement_None, + CopyablePlayerMovement_None, }; -u8 (*const gUnknown_0850DA90[])(struct EventObject *, struct Sprite *) = { - mss_npc_reset_oampriv3_1_unk2_unk3, - mss_08062EA4, - sub_8091F20, +u8 (*const gMovementTypeFuncs_CopyPlayerInGrass[])(struct EventObject *, struct Sprite *) = { + MovementType_CopyPlayer_Step0, + MovementType_CopyPlayerInGrass_Step1, + MovementType_CopyPlayer_Step2, }; -u8 (*const gUnknown_0850DA9C[])(struct EventObject *, struct Sprite *) = { - sub_80926AC, +u8 (*const gMovementTypeFuncs_Hidden[])(struct EventObject *, struct Sprite *) = { + MovementType_Hidden_Step0, }; -u8 (*const gUnknown_0850DAA0[])(struct EventObject *, struct Sprite *) = { - sub_8092718, - sub_80926B8, +u8 (*const gMovementTypeFuncs_WalkInPlace[])(struct EventObject *, struct Sprite *) = { + MovementType_WalkInPlace_Step0, + MovementType_MoveInPlace_Step1, }; -u8 (*const gUnknown_0850DAA8[])(struct EventObject *, struct Sprite *) = { - sub_8092788, - sub_80926B8, +u8 (*const gMovementTypeFuncs_WalkSlowlyInPlace[])(struct EventObject *, struct Sprite *) = { + MovementType_WalkSlowlyInPlace_Step0, + MovementType_MoveInPlace_Step1, }; -u8 (*const gUnknown_0850DAB0[])(struct EventObject *, struct Sprite *) = { - sub_80927F8, - sub_80926B8, +u8 (*const gMovementTypeFuncs_JogInPlace[])(struct EventObject *, struct Sprite *) = { + MovementType_JogInPlace_Step0, + MovementType_MoveInPlace_Step1, }; -u8 (*const gUnknown_0850DAB8[])(struct EventObject *, struct Sprite *) = { - sub_8092868, - sub_80926B8, +u8 (*const gMovementTypeFuncs_RunInPlace[])(struct EventObject *, struct Sprite *) = { + MovementType_RunInPlace_Step0, + MovementType_MoveInPlace_Step1, }; -u8 (*const gUnknown_0850DAC0[])(struct EventObject *, struct Sprite *) = { - sub_80928D8, - sub_809290C, - sub_809292C, +u8 (*const gMovementTypeFuncs_Invisible[])(struct EventObject *, struct Sprite *) = { + MovementType_Invisible_Step0, + MovementType_Invisible_Step1, + MovementType_Invisible_Step2, }; #endif //GUARD_MOVEMENT_TYPE_FUNC_TABLES_H diff --git a/src/decoration.c b/src/decoration.c index 83030ccb78..ad2cdfa30e 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -2247,7 +2247,7 @@ bool8 sub_81299AC(u8 taskId) void SetUpPuttingAwayDecorationPlayerAvatar(void) { - player_get_direction_lower_nybble(); + GetPlayerFacingDirection(); sDecor_CameraSpriteObjectIdx1 = gSprites[gUnknown_03005DD0.spriteId].data[0]; sub_812A39C(); gUnknown_03005DD0.spriteId = CreateSprite(&gUnknown_085A7404, 0x78, 0x50, 0); diff --git a/src/event_obj_lock.c b/src/event_obj_lock.c index 1582c00f8f..efa498c0f8 100644 --- a/src/event_obj_lock.c +++ b/src/event_obj_lock.c @@ -90,7 +90,7 @@ void LockSelectedEventObject(void) void sub_80984F4(void) { u8 objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[objectId]); + EventObjectClearHeldMovementIfFinished(&gEventObjects[objectId]); sub_80D338C(); UnfreezeEventObjects(); } @@ -100,9 +100,9 @@ void sub_8098524(void) u8 objectId; if (gEventObjects[gSelectedEventObject].active) - EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[gSelectedEventObject]); + EventObjectClearHeldMovementIfFinished(&gEventObjects[gSelectedEventObject]); objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[objectId]); + EventObjectClearHeldMovementIfFinished(&gEventObjects[objectId]); sub_80D338C(); UnfreezeEventObjects(); } @@ -114,7 +114,7 @@ void sub_8098574(void) void sub_809859C(void) { - EventObjectClearAnimIfSpecialAnimActive(&gEventObjects[gSelectedEventObject]); + EventObjectClearHeldMovementIfActive(&gEventObjects[gSelectedEventObject]); } static void sub_80985BC(u8 taskId) diff --git a/src/event_object_movement.c b/src/event_object_movement.c index d23bba92b2..35b04ea1e5 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1,8 +1,8 @@ #include "global.h" -#include "event_object_movement.h" #include "berry.h" #include "decoration.h" #include "event_data.h" +#include "event_object_movement.h" #include "event_scripts.h" #include "field_camera.h" #include "field_effect.h" @@ -27,56 +27,20 @@ extern u8 gUnknown_020375B4; extern u16 gUnknown_020375B6; -extern u8 *gUnknown_020375B8; +extern struct LockedAnimEventObjects *gLockedAnimEventObjects; -static void sub_808D450(void); -static u8 GetEventObjectIdByLocalId(u8); -static u8 GetEventObjectIdByLocalIdAndMapInternal(u8, u8, u8); -static bool8 GetAvailableEventObjectSlot(u16, u8, u8, u8 *); -static void EventObjectHandleDynamicGraphicsId(struct EventObject *); -static void RemoveEventObjectInternal (struct EventObject *); -static u16 GetEventObjectFlagIdByEventObjectId(u8); -static void sub_8096518(struct EventObject *, struct Sprite *); -static void MakeObjectTemplateFromEventObjectTemplate(struct EventObjectTemplate *, struct SpriteTemplate *, const struct SubspriteTable **); -static void GetEventObjectMovingCameraOffset(s16 *, s16 *); -static struct EventObjectTemplate *GetEventObjectTemplateByLocalIdAndMap(u8, u8, u8); -static void sub_808E894(u16); -static void RemoveEventObjectIfOutsideView(struct EventObject *); -static void sub_808E1B8(u8, s16, s16); -static void SetPlayerAvatarEventObjectIdAndObjectId(u8, u8); -static void sub_808E38C(struct EventObject *); -static u8 sub_808E8F4(const struct SpritePalette *); -static u8 FindEventObjectPaletteIndexByTag(u16); -static void sub_808EAB0(u16, u8); -static bool8 EventObjectDoesZCoordMatch(struct EventObject *, u8); -static void ObjectCB_CameraObject(struct Sprite *); -static void CameraObject_0(struct Sprite *); -static void CameraObject_1(struct Sprite *); -static void CameraObject_2(struct Sprite *); -static struct EventObjectTemplate *FindEventObjectTemplateInArrayByLocalId(u8 localId, struct EventObjectTemplate *templates, u8 count); -static void npc_reset(struct EventObject *, struct Sprite *); -static void EventObjectSetRegularAnim(struct EventObject *, struct Sprite *, u8); - -u8 sub_8093438(u32); -u8 sub_80934BC(u32); -u8 sub_8093514(u32); -u8 GetJumpLedgeAnimId(u32); -void sub_8092F88(u32, s16 *, s16 *, s16, s16); - -bool8 EventObjectExecRegularAnim(struct EventObject *, struct Sprite *); -static void SetEventObjectStepTimer(struct Sprite *, s16); -bool8 RunEventObjectStepTimer(struct Sprite *); -bool8 npc_block_way__next_tile(struct EventObject *, u8); +static void MoveCoordsInDirection(u32, s16 *, s16 *, s16, s16); +static bool8 EventObjectExecSingleMovementAction(struct EventObject *, struct Sprite *); +static void SetMovementDelay(struct Sprite *, s16); +static bool8 WaitForMovementDelay(struct Sprite *); +static u8 GetCollisionInDirection(struct EventObject *, u8); static u32 state_to_direction(u8, u32, u32); -/*static*/ void sub_80964E8(struct EventObject *, struct Sprite *); -static void EventObjectExecSpecialAnim(struct EventObject *, struct Sprite *); -/*static*/ void npc_obj_transfer_image_anim_pause_flag(struct EventObject *, struct Sprite *); - -static bool8 IsCoordOutsideEventObjectMovementRect(struct EventObject *, s16, s16); +static void TryEnableEventObjectAnim(struct EventObject *, struct Sprite *); +static void EventObjectExecHeldMovementAction(struct EventObject *, struct Sprite *); +static void UpdateEventObjectSpriteAnimPause(struct EventObject *, struct Sprite *); +static bool8 IsCoordOutsideEventObjectMovementRange(struct EventObject *, s16, s16); static bool8 IsMetatileDirectionallyImpassable(struct EventObject *, s16, s16, u8); -static bool8 CheckForCollisionBetweenEventObjects(struct EventObject *, s16, s16); -bool8 sub_809558C(struct EventObject *, struct Sprite *); -bool8 sub_8095B64(struct EventObject *, struct Sprite *); +static bool8 DoesObjectCollideWithObjectAt(struct EventObject *, s16, s16); static void sub_8096530(struct EventObject *, struct Sprite *); static void npc_update_obj_anim_flag(struct EventObject *, struct Sprite *); static void EventObjectUpdateMetatileBehaviors(struct EventObject*); @@ -106,7 +70,36 @@ static void DoGroundEffects_OnSpawn(struct EventObject*, struct Sprite*); static void DoGroundEffects_OnBeginStep(struct EventObject*, struct Sprite*); static void DoGroundEffects_OnFinishStep(struct EventObject*, struct Sprite*); static void sub_8097D68(struct Sprite*); -static void sub_8097FE4(u8); +static void ApplyLevitateMovement(u8); +static bool8 MovementType_Disguise_Callback(struct EventObject *, struct Sprite *); +static bool8 MovementType_Hidden_Callback(struct EventObject *, struct Sprite *); +static void sub_808D450(void); +static u8 GetEventObjectIdByLocalId(u8); +static u8 GetEventObjectIdByLocalIdAndMapInternal(u8, u8, u8); +static bool8 GetAvailableEventObjectId(u16, u8, u8, u8 *); +static void SetEventObjectDynamicGraphicsId(struct EventObject *); +static void RemoveEventObjectInternal(struct EventObject *); +static u16 GetEventObjectFlagIdByEventObjectId(u8); +static void UpdateEventObjectVisibility(struct EventObject *, struct Sprite *); +static void MakeObjectTemplateFromEventObjectTemplate(struct EventObjectTemplate *, struct SpriteTemplate *, const struct SubspriteTable **); +static void GetEventObjectMovingCameraOffset(s16 *, s16 *); +static struct EventObjectTemplate *GetEventObjectTemplateByLocalIdAndMap(u8, u8, u8); +static void sub_808E894(u16); +static void RemoveEventObjectIfOutsideView(struct EventObject *); +static void sub_808E1B8(u8, s16, s16); +static void SetPlayerAvatarEventObjectIdAndObjectId(u8, u8); +static void sub_808E38C(struct EventObject *); +static u8 sub_808E8F4(const struct SpritePalette *); +static u8 FindEventObjectPaletteIndexByTag(u16); +static void sub_808EAB0(u16, u8); +static bool8 EventObjectDoesZCoordMatch(struct EventObject *, u8); +static void ObjectCB_CameraObject(struct Sprite *); +static void CameraObject_0(struct Sprite *); +static void CameraObject_1(struct Sprite *); +static void CameraObject_2(struct Sprite *); +static struct EventObjectTemplate *FindEventObjectTemplateByLocalId(u8 localId, struct EventObjectTemplate *templates, u8 count); +static void ClearEventObjectMovement(struct EventObject *, struct Sprite *); +static void EventObjectSetSingleMovement(struct EventObject *, struct Sprite *, u8); const u8 gUnknown_084975C4[] = {1, 1, 6, 7, 8, 9, 6, 7, 8, 9, 11, 11, 0, 0, 0, 0}; @@ -121,257 +114,257 @@ void (*const gCameraObjectFuncs[])(struct Sprite *) = { #include "data/field_event_obj/event_object_graphics.h" // movement type callbacks -void (*const gUnknown_08505438[])(struct Sprite *) = +static void (*const sMovementTypeCallbacks[])(struct Sprite *) = { - EventObjectCB_NoMovement1, - EventObjectCB_LookRandomDirections, - EventObjectCB_GoRandomDirections, - EventObjectCB_RandomlyGoNorthOrSouth, - EventObjectCB_RandomlyGoNorthOrSouth, - EventObjectCB_RandomlyGoEastOrWest, - EventObjectCB_RandomlyGoEastOrWest, - EventObjectCB_FaceFixedDirection, - EventObjectCB_FaceFixedDirection, - EventObjectCB_FaceFixedDirection, - EventObjectCB_FaceFixedDirection, - EventObjectCB_NoMovement2, - EventObjectCB_BerryTree, - EventObjectCB_RandomlyLookNorthOrSouth, - EventObjectCB_RandomlyLookEastOrWest, - EventObjectCB_RandomlyLookNorthOrWest, - EventObjectCB_RandomlyLookNorthOrEast, - EventObjectCB_RandomlyLookSouthOrWest, - EventObjectCB_RandomlyLookSouthOrEast, - EventObjectCB_RandomlyLookNorthOrSouthOrWest, - EventObjectCB_RandomlyLookNorthOrSouthOrEast, - EventObjectCB_RandomlyLookNorthOrEastOrWest, - EventObjectCB_RandomlyLookSouthOrEastOrWest, - EventObjectCB_LookAroundCounterclockwise, - EventObjectCB_LookAroundClockwise, - EventObjectCB_AlternatelyGoInOppositeDirections, - EventObjectCB_AlternatelyGoInOppositeDirections, - EventObjectCB_AlternatelyGoInOppositeDirections, - EventObjectCB_AlternatelyGoInOppositeDirections, - EventObjectCB_GoInDirectionSequence1, - EventObjectCB_GoInDirectionSequence2, - EventObjectCB_GoInDirectionSequence3, - EventObjectCB_GoInDirectionSequence4, - EventObjectCB_GoInDirectionSequence5, - EventObjectCB_GoInDirectionSequence6, - EventObjectCB_GoInDirectionSequence7, - EventObjectCB_GoInDirectionSequence8, - EventObjectCB_GoInDirectionSequence9, - EventObjectCB_GoInDirectionSequence10, - EventObjectCB_GoInDirectionSequence11, - EventObjectCB_GoInDirectionSequence12, - EventObjectCB_GoInDirectionSequence13, - EventObjectCB_GoInDirectionSequence14, - EventObjectCB_GoInDirectionSequence15, - EventObjectCB_GoInDirectionSequence16, - EventObjectCB_GoInDirectionSequence17, - EventObjectCB_GoInDirectionSequence18, - EventObjectCB_GoInDirectionSequence19, - EventObjectCB_GoInDirectionSequence20, - EventObjectCB_GoInDirectionSequence21, - EventObjectCB_GoInDirectionSequence22, - EventObjectCB_GoInDirectionSequence23, - EventObjectCB_GoInDirectionSequence24, - EventObjectCB_CopyPlayer1, - EventObjectCB_CopyPlayer1, - EventObjectCB_CopyPlayer1, - EventObjectCB_CopyPlayer1, - EventObjectCB_TreeDisguise, - EventObjectCB_MountainDisguise, - EventObjectCB_CopyPlayer2, - EventObjectCB_CopyPlayer2, - EventObjectCB_CopyPlayer2, - EventObjectCB_CopyPlayer2, - EventObjectCB_Hidden1, - EventObjectCB_WalkInPlace1, - EventObjectCB_WalkInPlace1, - EventObjectCB_WalkInPlace1, - EventObjectCB_WalkInPlace1, - EventObjectCB_WalkInPlace2, - EventObjectCB_WalkInPlace2, - EventObjectCB_WalkInPlace2, - EventObjectCB_WalkInPlace2, - EventObjectCB_WalkInPlace3, - EventObjectCB_WalkInPlace3, - EventObjectCB_WalkInPlace3, - EventObjectCB_WalkInPlace3, - EventObjectCB_Hidden2, - EventObjectCB_WalkInPlace4, - EventObjectCB_WalkInPlace4, - EventObjectCB_WalkInPlace4, - EventObjectCB_WalkInPlace4, + MovementType_None, // MOVEMENT_TYPE_NONE + MovementType_LookAround, // MOVEMENT_TYPE_LOOK_AROUND + MovementType_WanderAround, // MOVEMENT_TYPE_WANDER_AROUND + MovementType_WanderUpAndDown, // MOVEMENT_TYPE_WANDER_UP_AND_DOWN + MovementType_WanderUpAndDown, // MOVEMENT_TYPE_WANDER_DOWN_AND_UP + MovementType_WanderLeftAndRight, // MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT + MovementType_WanderLeftAndRight, // MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT + MovementType_FaceDirection, // MOVEMENT_TYPE_FACE_UP + MovementType_FaceDirection, // MOVEMENT_TYPE_FACE_DOWN + MovementType_FaceDirection, // MOVEMENT_TYPE_FACE_LEFT + MovementType_FaceDirection, // MOVEMENT_TYPE_FACE_RIGHT + MovementType_Player, // MOVEMENT_TYPE_PLAYER + MovementType_BerryTreeGrowth, // MOVEMENT_TYPE_BERRY_TREE_GROWTH + MovementType_FaceDownAndUp, // MOVEMENT_TYPE_FACE_DOWN_AND_UP + MovementType_FaceLeftAndRight, // MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT + MovementType_FaceUpAndLeft, // MOVEMENT_TYPE_FACE_UP_AND_LEFT + MovementType_FaceUpAndRight, // MOVEMENT_TYPE_FACE_UP_AND_RIGHT + MovementType_FaceDownAndLeft, // MOVEMENT_TYPE_FACE_DOWN_AND_LEFT + MovementType_FaceDownAndRight, // MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT + MovementType_FaceDownUpAndLeft, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT + MovementType_FaceDownUpAndRight, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT + MovementType_FaceUpRightAndLeft, // MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT + MovementType_FaceDownRightAndLeft, // MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT + MovementType_RotateCounterclockwise, // MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE + MovementType_RotateClockwise, // MOVEMENT_TYPE_ROTATE_CLOCKWISE + MovementType_WalkBackAndForth, // MOVEMENT_TYPE_WALK_UP_AND_DOWN + MovementType_WalkBackAndForth, // MOVEMENT_TYPE_WALK_DOWN_AND_UP + MovementType_WalkBackAndForth, // MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT + MovementType_WalkBackAndForth, // MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT + MovementType_WalkSequenceUpRightLeftDown, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN + MovementType_WalkSequenceRightLeftDownUp, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP + MovementType_WalkSequenceDownUpRightLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT + MovementType_WalkSequenceLeftDownUpRight, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT + MovementType_WalkSequenceUpLeftRightDown, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN + MovementType_WalkSequenceLeftRightDownUp, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP + MovementType_WalkSequenceDownUpLeftRight, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT + MovementType_WalkSequenceRightDownUpLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT + MovementType_WalkSequenceLeftUpDownRight, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT + MovementType_WalkSequenceUpDownRightLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT + MovementType_WalkSequenceRightLeftUpDown, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN + MovementType_WalkSequenceDownRightLeftUp, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP + MovementType_WalkSequenceRightUpDownLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT + MovementType_WalkSequenceUpDownLeftRight, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT + MovementType_WalkSequenceLeftRightUpDown, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN + MovementType_WalkSequenceDownLeftRightUp, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP + MovementType_WalkSequenceUpLeftDownRight, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT + MovementType_WalkSequenceDownRightUpLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT + MovementType_WalkSequenceLeftDownRightUp, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP + MovementType_WalkSequenceRightUpLeftDown, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN + MovementType_WalkSequenceUpRightDownLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT + MovementType_WalkSequenceDownLeftUpRight, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT + MovementType_WalkSequenceLeftUpRightDown, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN + MovementType_WalkSequenceRightDownLeftUp, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP + MovementType_CopyPlayer, // MOVEMENT_TYPE_COPY_PLAYER + MovementType_CopyPlayer, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE + MovementType_CopyPlayer, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE + MovementType_CopyPlayer, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE + MovementType_TreeDisguise, // MOVEMENT_TYPE_TREE_DISGUISE + MovementType_MountainDisguise, // MOVEMENT_TYPE_MOUNTAIN_DISGUISE + MovementType_CopyPlayerInGrass, // MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS + MovementType_CopyPlayerInGrass, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS + MovementType_CopyPlayerInGrass, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS + MovementType_CopyPlayerInGrass, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS + MovementType_Hidden, // MOVEMENT_TYPE_HIDDEN + MovementType_WalkInPlace, // MOVEMENT_TYPE_WALK_IN_PLACE_DOWN + MovementType_WalkInPlace, // MOVEMENT_TYPE_WALK_IN_PLACE_UP + MovementType_WalkInPlace, // MOVEMENT_TYPE_WALK_IN_PLACE_LEFT + MovementType_WalkInPlace, // MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT + MovementType_JogInPlace, // MOVEMENT_TYPE_JOG_IN_PLACE_DOWN + MovementType_JogInPlace, // MOVEMENT_TYPE_JOG_IN_PLACE_UP + MovementType_JogInPlace, // MOVEMENT_TYPE_JOG_IN_PLACE_LEFT + MovementType_JogInPlace, // MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT + MovementType_RunInPlace, // MOVEMENT_TYPE_RUN_IN_PLACE_DOWN + MovementType_RunInPlace, // MOVEMENT_TYPE_RUN_IN_PLACE_UP + MovementType_RunInPlace, // MOVEMENT_TYPE_RUN_IN_PLACE_LEFT + MovementType_RunInPlace, // MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT + MovementType_Invisible, // MOVEMENT_TYPE_INVISIBLE + MovementType_WalkSlowlyInPlace, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN + MovementType_WalkSlowlyInPlace, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP + MovementType_WalkSlowlyInPlace, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT + MovementType_WalkSlowlyInPlace, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT }; const u8 gRangedMovementTypes[] = { - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 0, // MOVEMENT_TYPE_NONE + 0, // MOVEMENT_TYPE_LOOK_AROUND + 1, // MOVEMENT_TYPE_WANDER_AROUND + 1, // MOVEMENT_TYPE_WANDER_UP_AND_DOWN + 1, // MOVEMENT_TYPE_WANDER_DOWN_AND_UP + 1, // MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT + 1, // MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT + 0, // MOVEMENT_TYPE_FACE_UP + 0, // MOVEMENT_TYPE_FACE_DOWN + 0, // MOVEMENT_TYPE_FACE_LEFT + 0, // MOVEMENT_TYPE_FACE_RIGHT + 0, // MOVEMENT_TYPE_PLAYER + 0, // MOVEMENT_TYPE_BERRY_TREE_GROWTH + 0, // MOVEMENT_TYPE_FACE_DOWN_AND_UP + 0, // MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT + 0, // MOVEMENT_TYPE_FACE_UP_AND_LEFT + 0, // MOVEMENT_TYPE_FACE_UP_AND_RIGHT + 0, // MOVEMENT_TYPE_FACE_DOWN_AND_LEFT + 0, // MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT + 0, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT + 0, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT + 0, // MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT + 0, // MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT + 0, // MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE + 0, // MOVEMENT_TYPE_ROTATE_CLOCKWISE + 1, // MOVEMENT_TYPE_WALK_UP_AND_DOWN + 1, // MOVEMENT_TYPE_WALK_DOWN_AND_UP + 1, // MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT + 1, // MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT + 1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN + 1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP + 1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT + 1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT + 1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN + 1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP + 1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT + 1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT + 1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT + 1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT + 1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN + 1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP + 1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT + 1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT + 1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN + 1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP + 1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT + 1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT + 1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP + 1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN + 1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT + 1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT + 1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN + 1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP + 1, // MOVEMENT_TYPE_COPY_PLAYER + 1, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE + 1, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE + 1, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE + 0, // MOVEMENT_TYPE_TREE_DISGUISE + 0, // MOVEMENT_TYPE_MOUNTAIN_DISGUISE + 1, // MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS + 1, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS + 1, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS + 1, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS + 0, // MOVEMENT_TYPE_HIDDEN + 0, // MOVEMENT_TYPE_WALK_IN_PLACE_DOWN + 0, // MOVEMENT_TYPE_WALK_IN_PLACE_UP + 0, // MOVEMENT_TYPE_WALK_IN_PLACE_LEFT + 0, // MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT + 0, // MOVEMENT_TYPE_JOG_IN_PLACE_DOWN + 0, // MOVEMENT_TYPE_JOG_IN_PLACE_UP + 0, // MOVEMENT_TYPE_JOG_IN_PLACE_LEFT + 0, // MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT + 0, // MOVEMENT_TYPE_RUN_IN_PLACE_DOWN + 0, // MOVEMENT_TYPE_RUN_IN_PLACE_UP + 0, // MOVEMENT_TYPE_RUN_IN_PLACE_LEFT + 0, // MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT + 0, // MOVEMENT_TYPE_INVISIBLE + 0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN + 0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP + 0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT + 0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT }; const u8 gInitialMovementTypeFacingDirections[] = { - DIR_SOUTH, - DIR_SOUTH, - DIR_SOUTH, - DIR_NORTH, - DIR_SOUTH, - DIR_WEST, - DIR_EAST, - DIR_NORTH, - DIR_SOUTH, - DIR_WEST, - DIR_EAST, - DIR_SOUTH, - DIR_SOUTH, - DIR_SOUTH, - DIR_WEST, - DIR_NORTH, - DIR_NORTH, - DIR_SOUTH, - DIR_SOUTH, - DIR_SOUTH, - DIR_SOUTH, - DIR_NORTH, - DIR_SOUTH, - DIR_SOUTH, - DIR_SOUTH, - DIR_NORTH, - DIR_SOUTH, - DIR_WEST, - DIR_EAST, - DIR_NORTH, - DIR_EAST, - DIR_SOUTH, - DIR_WEST, - DIR_NORTH, - DIR_WEST, - DIR_SOUTH, - DIR_EAST, - DIR_WEST, - DIR_NORTH, - DIR_EAST, - DIR_SOUTH, - DIR_EAST, - DIR_NORTH, - DIR_WEST, - DIR_SOUTH, - DIR_NORTH, - DIR_SOUTH, - DIR_WEST, - DIR_EAST, - DIR_NORTH, - DIR_SOUTH, - DIR_WEST, - DIR_EAST, - DIR_NORTH, - DIR_SOUTH, - DIR_WEST, - DIR_EAST, - DIR_SOUTH, - DIR_SOUTH, - DIR_NORTH, - DIR_SOUTH, - DIR_WEST, - DIR_EAST, - DIR_SOUTH, - DIR_SOUTH, - DIR_NORTH, - DIR_WEST, - DIR_EAST, - DIR_SOUTH, - DIR_NORTH, - DIR_WEST, - DIR_EAST, - DIR_SOUTH, - DIR_NORTH, - DIR_WEST, - DIR_EAST, - DIR_SOUTH, - DIR_SOUTH, - DIR_NORTH, - DIR_WEST, - DIR_EAST, + DIR_SOUTH, // MOVEMENT_TYPE_NONE + DIR_SOUTH, // MOVEMENT_TYPE_LOOK_AROUND + DIR_SOUTH, // MOVEMENT_TYPE_WANDER_AROUND + DIR_NORTH, // MOVEMENT_TYPE_WANDER_UP_AND_DOWN + DIR_SOUTH, // MOVEMENT_TYPE_WANDER_DOWN_AND_UP + DIR_WEST, // MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT + DIR_EAST, // MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT + DIR_NORTH, // MOVEMENT_TYPE_FACE_UP + DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN + DIR_WEST, // MOVEMENT_TYPE_FACE_LEFT + DIR_EAST, // MOVEMENT_TYPE_FACE_RIGHT + DIR_SOUTH, // MOVEMENT_TYPE_PLAYER + DIR_SOUTH, // MOVEMENT_TYPE_BERRY_TREE_GROWTH + DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_AND_UP + DIR_WEST, // MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT + DIR_NORTH, // MOVEMENT_TYPE_FACE_UP_AND_LEFT + DIR_NORTH, // MOVEMENT_TYPE_FACE_UP_AND_RIGHT + DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_AND_LEFT + DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT + DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT + DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT + DIR_NORTH, // MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT + DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT + DIR_SOUTH, // MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE + DIR_SOUTH, // MOVEMENT_TYPE_ROTATE_CLOCKWISE + DIR_NORTH, // MOVEMENT_TYPE_WALK_UP_AND_DOWN + DIR_SOUTH, // MOVEMENT_TYPE_WALK_DOWN_AND_UP + DIR_WEST, // MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT + DIR_EAST, // MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT + DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN + DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP + DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT + DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT + DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN + DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP + DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT + DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT + DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT + DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT + DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN + DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP + DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT + DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT + DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN + DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP + DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT + DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT + DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP + DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN + DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT + DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT + DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN + DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP + DIR_NORTH, // MOVEMENT_TYPE_COPY_PLAYER + DIR_SOUTH, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE + DIR_WEST, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE + DIR_EAST, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE + DIR_SOUTH, // MOVEMENT_TYPE_TREE_DISGUISE + DIR_SOUTH, // MOVEMENT_TYPE_MOUNTAIN_DISGUISE + DIR_NORTH, // MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS + DIR_SOUTH, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS + DIR_WEST, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS + DIR_EAST, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS + DIR_SOUTH, // MOVEMENT_TYPE_HIDDEN + DIR_SOUTH, // MOVEMENT_TYPE_WALK_IN_PLACE_DOWN + DIR_NORTH, // MOVEMENT_TYPE_WALK_IN_PLACE_UP + DIR_WEST, // MOVEMENT_TYPE_WALK_IN_PLACE_LEFT + DIR_EAST, // MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT + DIR_SOUTH, // MOVEMENT_TYPE_JOG_IN_PLACE_DOWN + DIR_NORTH, // MOVEMENT_TYPE_JOG_IN_PLACE_UP + DIR_WEST, // MOVEMENT_TYPE_JOG_IN_PLACE_LEFT + DIR_EAST, // MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT + DIR_SOUTH, // MOVEMENT_TYPE_RUN_IN_PLACE_DOWN + DIR_NORTH, // MOVEMENT_TYPE_RUN_IN_PLACE_UP + DIR_WEST, // MOVEMENT_TYPE_RUN_IN_PLACE_LEFT + DIR_EAST, // MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT + DIR_SOUTH, // MOVEMENT_TYPE_INVISIBLE + DIR_SOUTH, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN + DIR_NORTH, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP + DIR_WEST, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT + DIR_EAST, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT }; #include "data/field_event_obj/event_object_graphics_info_pointers.h" @@ -612,196 +605,182 @@ const s16 gMovementDelaysShort[] = {32, 48, 64, 80}; #include "data/field_event_obj/movement_type_func_tables.h" -const u8 gUnknown_0850DACC[] = { - 0x00, - 0x00, - 0x01, - 0x02, - 0x03, - 0x00, - 0x00, - 0x01, - 0x01, +const u8 gFaceDirectionAnimNums[] = { + 0, // DIR_NONE + 0, // DIR_SOUTH + 1, // DIR_NORTH + 2, // DIR_WEST + 3, // DIR_EAST + 0, // DIR_SOUTHWEST + 0, // DIR_SOUTHEAST + 1, // DIR_NORTHWEST + 1, // DIR_NORTHEAST +}; +const u8 gMoveDirectionAnimNums[] = { + 4, // DIR_NONE + 4, // DIR_SOUTH + 5, // DIR_NORTH + 6, // DIR_WEST + 7, // DIR_EAST + 4, // DIR_SOUTHWEST + 4, // DIR_SOUTHEAST + 5, // DIR_NORTHWEST + 5, // DIR_NORTHEAST +}; +const u8 gMoveDirectionFastAnimNums[] = { + 8, // DIR_NONE + 8, // DIR_SOUTH + 9, // DIR_NORTH + 10, // DIR_WEST + 11, // DIR_EAST + 8, // DIR_SOUTHWEST + 8, // DIR_SOUTHEAST + 9, // DIR_NORTHWEST + 9, // DIR_NORTHEAST +}; +const u8 gMoveDirectionFasterAnimNums[] = { + 12, // DIR_NONE + 12, // DIR_SOUTH + 13, // DIR_NORTH + 14, // DIR_WEST + 15, // DIR_EAST + 12, // DIR_SOUTHWEST + 12, // DIR_SOUTHEAST + 13, // DIR_NORTHWEST + 13, // DIR_NORTHEAST +}; +const u8 gMoveDirectionFastestAnimNums[] = { + 16, // DIR_NONE + 16, // DIR_SOUTH + 17, // DIR_NORTH + 18, // DIR_WEST + 19, // DIR_EAST + 16, // DIR_SOUTHWEST + 16, // DIR_SOUTHEAST + 17, // DIR_NORTHWEST + 17, // DIR_NORTHEAST +}; +const u8 gJumpSpecialDirectionAnimNums[] = { // used for jumping onto surf mon + 20, // DIR_NONE + 20, // DIR_SOUTH + 21, // DIR_NORTH + 22, // DIR_WEST + 23, // DIR_EAST + 20, // DIR_SOUTHWEST + 20, // DIR_SOUTHEAST + 21, // DIR_NORTHWEST + 21, // DIR_NORTHEAST +}; +const u8 gAcroWheelieDirectionAnimNums[] = { + 20, // DIR_NONE + 20, // DIR_SOUTH + 21, // DIR_NORTH + 22, // DIR_WEST + 23, // DIR_EAST + 20, // DIR_SOUTHWEST + 20, // DIR_SOUTHEAST + 21, // DIR_NORTHWEST + 21, // DIR_NORTHEAST +}; +const u8 gUnrefAnimNums_08375633[] = { + 24, // DIR_NONE + 24, // DIR_SOUTH + 25, // DIR_NORTH + 26, // DIR_WEST + 27, // DIR_EAST + 24, // DIR_SOUTHWEST + 24, // DIR_SOUTHEAST + 25, // DIR_NORTHWEST + 25, // DIR_NORTHEAST +}; +const u8 gAcroEndWheelieDirectionAnimNums[] = { + 28, // DIR_NONE + 28, // DIR_SOUTH + 29, // DIR_NORTH + 30, // DIR_WEST + 31, // DIR_EAST + 28, // DIR_SOUTHWEST + 28, // DIR_SOUTHEAST + 29, // DIR_NORTHWEST + 29, // DIR_NORTHEAST +}; +const u8 gAcroUnusedActionDirectionAnimNums[] = { + 32, // DIR_NONE + 32, // DIR_SOUTH + 33, // DIR_NORTH + 34, // DIR_WEST + 35, // DIR_EAST + 32, // DIR_SOUTHWEST + 32, // DIR_SOUTHEAST + 33, // DIR_NORTHWEST + 33, // DIR_NORTHEAST +}; +const u8 gAcroWheeliePedalDirectionAnimNums[] = { + 36, // DIR_NONE + 36, // DIR_SOUTH + 37, // DIR_NORTH + 38, // DIR_WEST + 39, // DIR_EAST + 36, // DIR_SOUTHWEST + 36, // DIR_SOUTHEAST + 37, // DIR_NORTHWEST + 37, // DIR_NORTHEAST +}; +const u8 gFishingDirectionAnimNums[] = { + 0, // DIR_NONE + 0, // DIR_SOUTH + 1, // DIR_NORTH + 2, // DIR_WEST + 3, // DIR_EAST + 0, // DIR_SOUTHWEST + 0, // DIR_SOUTHEAST + 1, // DIR_NORTHWEST + 1, // DIR_NORTHEAST +}; +const u8 gFishingNoCatchDirectionAnimNums[] = { + 4, // DIR_NONE + 4, // DIR_SOUTH + 5, // DIR_NORTH + 6, // DIR_WEST + 7, // DIR_EAST + 4, // DIR_SOUTHWEST + 4, // DIR_SOUTHEAST + 5, // DIR_NORTHWEST + 5, // DIR_NORTHEAST +}; +const u8 gFishingBiteDirectionAnimNums[] = { + 8, // DIR_NONE + 8, // DIR_SOUTH + 9, // DIR_NORTH + 10, // DIR_WEST + 11, // DIR_EAST + 8, // DIR_SOUTHWEST + 8, // DIR_SOUTHEAST + 9, // DIR_NORTHWEST + 9, // DIR_NORTHEAST +}; +const u8 gRunningDirectionAnimNums[] = { + 20, // DIR_NONE + 20, // DIR_SOUTH + 21, // DIR_NORTH + 22, // DIR_WEST + 23, // DIR_EAST + 20, // DIR_SOUTHWEST + 20, // DIR_SOUTHEAST + 21, // DIR_NORTHWEST + 21, // DIR_NORTHEAST }; -const u8 gUnknown_0850DAD5[] = { - 0x04, - 0x04, - 0x05, - 0x06, - 0x07, - 0x04, - 0x04, - 0x05, - 0x05, -}; - -const u8 gUnknown_0850DADE[] = { - 0x08, - 0x08, - 0x09, - 0x0a, - 0x0b, - 0x08, - 0x08, - 0x09, - 0x09, -}; - -const u8 gUnknown_0850DAE7[] = { - 0x0c, - 0x0c, - 0x0d, - 0x0e, - 0x0f, - 0x0c, - 0x0c, - 0x0d, - 0x0d, -}; - -const u8 gUnknown_0850DAF0[] = { - 0x10, - 0x10, - 0x11, - 0x12, - 0x13, - 0x10, - 0x10, - 0x11, - 0x11, -}; - -const u8 gUnknown_0850DAF9[] = { - 0x14, - 0x14, - 0x15, - 0x16, - 0x17, - 0x14, - 0x14, - 0x15, - 0x15, -}; - -const u8 gUnknown_0850DB02[] = { - 0x14, - 0x14, - 0x15, - 0x16, - 0x17, - 0x14, - 0x14, - 0x15, - 0x15, -}; - -const u8 gUnknown_0850DB0B[] = { - 0x18, - 0x18, - 0x19, - 0x1a, - 0x1b, - 0x18, - 0x18, - 0x19, - 0x19, -}; - -const u8 gUnknown_0850DB14[] = { - 0x1c, - 0x1c, - 0x1d, - 0x1e, - 0x1f, - 0x1c, - 0x1c, - 0x1d, - 0x1d, -}; - -const u8 gUnknown_0850DB1D[] = { - 0x20, - 0x20, - 0x21, - 0x22, - 0x23, - 0x20, - 0x20, - 0x21, - 0x21, -}; - -const u8 gUnknown_0850DB26[] = { - 0x24, - 0x24, - 0x25, - 0x26, - 0x27, - 0x24, - 0x24, - 0x25, - 0x25, -}; - -const u8 gUnknown_0850DB2F[] = { - 0x00, - 0x00, - 0x01, - 0x02, - 0x03, - 0x00, - 0x00, - 0x01, - 0x01, -}; - -const u8 gUnknown_0850DB38[] = { - 0x04, - 0x04, - 0x05, - 0x06, - 0x07, - 0x04, - 0x04, - 0x05, - 0x05, -}; - -const u8 gUnknown_0850DB41[] = { - 0x08, - 0x08, - 0x09, - 0x0a, - 0x0b, - 0x08, - 0x08, - 0x09, - 0x09, -}; - -const u8 gUnknown_0850DB4A[] = { - 0x14, - 0x14, - 0x15, - 0x16, - 0x17, - 0x14, - 0x14, - 0x15, - 0x15, -}; - -const u8 gUnknown_0850DB53[] = { - 0x08, - 0x08, - 0x07, - 0x09, - 0x0a, - 0x08, - 0x08, - 0x07, - 0x07, +const u8 gTrainerFacingDirectionMovementTypes[] = { + MOVEMENT_TYPE_FACE_DOWN, // DIR_NONE + MOVEMENT_TYPE_FACE_DOWN, // DIR_SOUTH + MOVEMENT_TYPE_FACE_UP, // DIR_NORTH + MOVEMENT_TYPE_FACE_LEFT, // DIR_WEST + MOVEMENT_TYPE_FACE_RIGHT, // DIR_EAST + MOVEMENT_TYPE_FACE_DOWN, // DIR_SOUTHWEST + MOVEMENT_TYPE_FACE_DOWN, // DIR_SOUTHEAST + MOVEMENT_TYPE_FACE_UP, // DIR_NORTHWEST + MOVEMENT_TYPE_FACE_UP, // DIR_NORTHEAST }; bool8 (*const gOppositeDirectionBlockedMetatileFuncs[])(u8) = { @@ -830,220 +809,194 @@ const struct Coords16 gDirectionToVectors[] = { { 1, -1} }; -const u8 gUnknown_0850DBA0[] = { - 0x00, - 0x00, - 0x01, - 0x02, - 0x03, +const u8 gFaceDirectionMovementActions[] = { + MOVEMENT_ACTION_FACE_DOWN, + MOVEMENT_ACTION_FACE_DOWN, + MOVEMENT_ACTION_FACE_UP, + MOVEMENT_ACTION_FACE_LEFT, + MOVEMENT_ACTION_FACE_RIGHT, }; - -const u8 gUnknown_0850DBA5[] = { - 0x04, - 0x04, - 0x05, - 0x06, - 0x07, +const u8 gWalkSlowMovementActions[] = { + MOVEMENT_ACTION_WALK_SLOW_DOWN, + MOVEMENT_ACTION_WALK_SLOW_DOWN, + MOVEMENT_ACTION_WALK_SLOW_UP, + MOVEMENT_ACTION_WALK_SLOW_LEFT, + MOVEMENT_ACTION_WALK_SLOW_RIGHT, }; - -const u8 gUnknown_0850DBAA[] = { - 0x08, - 0x08, - 0x09, - 0x0a, - 0x0b, +const u8 gWalkNormalMovementActions[] = { + MOVEMENT_ACTION_WALK_NORMAL_DOWN, + MOVEMENT_ACTION_WALK_NORMAL_DOWN, + MOVEMENT_ACTION_WALK_NORMAL_UP, + MOVEMENT_ACTION_WALK_NORMAL_LEFT, + MOVEMENT_ACTION_WALK_NORMAL_RIGHT, }; - -const u8 gUnknown_0850DBAF[] = { - 0x15, - 0x15, - 0x16, - 0x17, - 0x18, +const u8 gWalkFastMovementActions[] = { + MOVEMENT_ACTION_WALK_FAST_DOWN, + MOVEMENT_ACTION_WALK_FAST_DOWN, + MOVEMENT_ACTION_WALK_FAST_UP, + MOVEMENT_ACTION_WALK_FAST_LEFT, + MOVEMENT_ACTION_WALK_FAST_RIGHT, }; - -const u8 gUnknown_0850DBB4[] = { - 0x29, - 0x29, - 0x2a, - 0x2b, - 0x2c, +const u8 gRideWaterCurrentMovementActions[] = { + MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN, + MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN, + MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP, + MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT, + MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT, }; - -const u8 gUnknown_0850DBB9[] = { - 0x2d, - 0x2d, - 0x2e, - 0x2f, - 0x30, +const u8 gWalkFastestMovementActions[] = { + MOVEMENT_ACTION_WALK_FASTEST_DOWN, + MOVEMENT_ACTION_WALK_FASTEST_DOWN, + MOVEMENT_ACTION_WALK_FASTEST_UP, + MOVEMENT_ACTION_WALK_FASTEST_LEFT, + MOVEMENT_ACTION_WALK_FASTEST_RIGHT, }; - -const u8 gUnknown_0850DBBE[] = { - 0x31, - 0x31, - 0x32, - 0x33, - 0x34, +const u8 gSlideMovementActions[] = { + MOVEMENT_ACTION_SLIDE_DOWN, + MOVEMENT_ACTION_SLIDE_DOWN, + MOVEMENT_ACTION_SLIDE_UP, + MOVEMENT_ACTION_SLIDE_LEFT, + MOVEMENT_ACTION_SLIDE_RIGHT, }; - -const u8 gUnknown_0850DBC3[] = { - 0x35, - 0x35, - 0x36, - 0x37, - 0x38, +const u8 gPlayerRunMovementActions[] = { + MOVEMENT_ACTION_PLAYER_RUN_DOWN, + MOVEMENT_ACTION_PLAYER_RUN_DOWN, + MOVEMENT_ACTION_PLAYER_RUN_UP, + MOVEMENT_ACTION_PLAYER_RUN_LEFT, + MOVEMENT_ACTION_PLAYER_RUN_RIGHT, }; - -const u8 gUnknown_0850DBC8[] = { - 0x0c, - 0x0c, - 0x0d, - 0x0e, - 0x0f, +const u8 gJump2MovementActions[] = { + MOVEMENT_ACTION_JUMP_2_DOWN, + MOVEMENT_ACTION_JUMP_2_DOWN, + MOVEMENT_ACTION_JUMP_2_UP, + MOVEMENT_ACTION_JUMP_2_LEFT, + MOVEMENT_ACTION_JUMP_2_RIGHT, }; - -const u8 gUnknown_0850DBCD[] = { - 0x46, - 0x46, - 0x47, - 0x48, - 0x49, +const u8 gJumpInPlaceMovementActions[] = { + MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN, + MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN, + MOVEMENT_ACTION_JUMP_IN_PLACE_UP, + MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT, + MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT, }; - -const u8 gUnknown_0850DBD2[] = { - 0x4b, - 0x4b, - 0x4a, - 0x4d, - 0x4c, +const u8 gJumpInPlaceTurnAroundMovementActions[] = { + MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN, + MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN, + MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP, + MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT, + MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT, }; - -const u8 gUnknown_0850DBD7[] = { - 0x42, - 0x42, - 0x43, - 0x44, - 0x45, +const u8 gJumpMovementActions[] = { + MOVEMENT_ACTION_JUMP_DOWN, + MOVEMENT_ACTION_JUMP_DOWN, + MOVEMENT_ACTION_JUMP_UP, + MOVEMENT_ACTION_JUMP_LEFT, + MOVEMENT_ACTION_JUMP_RIGHT, }; - -const u8 gUnknown_0850DBDC[] = { - 0x3a, - 0x3a, - 0x3b, - 0x3c, - 0x3d, +const u8 gJumpSpecialMovementActions[] = { + MOVEMENT_ACTION_JUMP_SPECIAL_DOWN, + MOVEMENT_ACTION_JUMP_SPECIAL_DOWN, + MOVEMENT_ACTION_JUMP_SPECIAL_UP, + MOVEMENT_ACTION_JUMP_SPECIAL_LEFT, + MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT, }; - -const u8 gUnknown_0850DBE1[] = { - 0x19, - 0x19, - 0x1a, - 0x1b, - 0x1c, +const u8 gWalkInPlaceSlowMovementActions[] = { + MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN, + MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN, + MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP, + MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT, + MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT, }; - -const u8 gUnknown_0850DBE6[] = { - 0x1d, - 0x1d, - 0x1e, - 0x1f, - 0x20, +const u8 gWalkInPlaceNormalMovementActions[] = { + MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN, + MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN, + MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP, + MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT, + MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT, }; - -const u8 gUnknown_0850DBEB[] = { - 0x21, - 0x21, - 0x22, - 0x23, - 0x24, +const u8 gWalkInPlaceFastMovementActions[] = { + MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN, + MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN, + MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP, + MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT, + MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT, }; - -const u8 gUnknown_0850DBF0[] = { - 0x25, - 0x25, - 0x26, - 0x27, - 0x28, +const u8 gWalkInPlaceFastestMovementActions[] = { + MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN, + MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN, + MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP, + MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT, + MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT, }; - -const u8 gUnknown_0850DBF5[] = { - 0x64, - 0x64, - 0x65, - 0x66, - 0x67, +const u8 gAcroWheelieFaceDirectionMovementActions[] = { + MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN, + MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN, + MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP, + MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT, + MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT, }; - -const u8 gUnknown_0850DBFA[] = { - 0x68, - 0x68, - 0x69, - 0x6a, - 0x6b, +const u8 gAcroPopWheelieFaceDirectionMovementActions[] = { + MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN, + MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN, + MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP, + MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT, + MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT, }; - -const u8 gUnknown_0850DBFF[] = { - 0x6c, - 0x6c, - 0x6d, - 0x6e, - 0x6f, +const u8 gAcroEndWheelieFaceDirectionMovementActions[] = { + MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN, + MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN, + MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP, + MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT, + MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT, }; - -const u8 gUnknown_0850DC04[] = { - 0x70, - 0x70, - 0x71, - 0x72, - 0x73, +const u8 gAcroWheelieHopFaceDirectionMovementActions[] = { + MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN, + MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN, + MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP, + MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT, + MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT, }; - -const u8 gUnknown_0850DC09[] = { - 0x74, - 0x74, - 0x75, - 0x76, - 0x77, +const u8 gAcroWheelieHopDirectionMovementActions[] = { + MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN, + MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN, + MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP, + MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT, + MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT, }; - -const u8 gUnknown_0850DC0E[] = { - 0x78, - 0x78, - 0x79, - 0x7a, - 0x7b, +const u8 gAcroWheelieJumpDirectionMovementActions[] = { + MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN, + MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN, + MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP, + MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT, + MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT, }; - -const u8 gUnknown_0850DC13[] = { - 0x7c, - 0x7c, - 0x7d, - 0x7e, - 0x7f, +const u8 gAcroWheelieInPlaceDirectionMovementActions[] = { + MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN, + MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN, + MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP, + MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT, + MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT, }; - -const u8 gUnknown_0850DC18[] = { - 0x80, - 0x80, - 0x81, - 0x82, - 0x83, +const u8 gAcroPopWheelieMoveDirectionMovementActions[] = { + MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN, + MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN, + MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP, + MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT, + MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT, }; - -const u8 gUnknown_0850DC1D[] = { - 0x84, - 0x84, - 0x85, - 0x86, - 0x87, +const u8 gAcroWheelieMoveDirectionMovementActions[] = { + MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN, + MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN, + MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP, + MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT, + MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT, }; - -const u8 gUnknown_0850DC22[] = { - 0x88, - 0x88, - 0x89, - 0x8a, - 0x8b, +const u8 gAcroEndWheelieMoveDirectionMovementActions[] = { + MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN, + MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN, + MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP, + MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT, + MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT, }; const u8 gOppositeDirections[] = { @@ -1075,122 +1028,109 @@ const u8 gUnknown_0850DC3F[][4] = { // Code -static void npc_clear_ids_and_state(struct EventObject *eventObject) +static void ClearEventObject(struct EventObject *eventObject) { *eventObject = (struct EventObject){}; eventObject->localId = 0xFF; - eventObject->mapNum = -1; - eventObject->mapGroup = -1; - eventObject->movementActionId = -1; + eventObject->mapNum = 0xFF; + eventObject->mapGroup = 0xFF; + eventObject->movementActionId = 0xFF; } -static void npcs_clear_ids_and_state(void) +static void ClearAllEventObjects(void) { u8 i; - for (i = 0; i < NUM_EVENT_OBJECTS; i ++) - { - npc_clear_ids_and_state(&gEventObjects[i]); - } + for (i = 0; i < NUM_EVENT_OBJECTS; i++) + ClearEventObject(&gEventObjects[i]); } void sub_808D438(void) { - ZeroAllLinkPlayerEventObjects(); - npcs_clear_ids_and_state(); + ClearLinkPlayerEventObjects(); + ClearAllEventObjects(); ClearPlayerAvatarInfo(); sub_808D450(); } static void sub_808D450(void) { - u8 spriteIdx; + u8 spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[21], 0, 0, 31); + gSprites[spriteId].oam.affineMode = 1; + InitSpriteAffineAnim(&gSprites[spriteId]); + StartSpriteAffineAnim(&gSprites[spriteId], 0); + gSprites[spriteId].invisible = 1; - spriteIdx = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[21], 0, 0, 31); - gSprites[spriteIdx].oam.affineMode = 1; - InitSpriteAffineAnim(&gSprites[spriteIdx]); - StartSpriteAffineAnim(&gSprites[spriteIdx], 0); - gSprites[spriteIdx].invisible = TRUE; - - spriteIdx = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[21], 0, 0, 31); - gSprites[spriteIdx].oam.affineMode = 1; - InitSpriteAffineAnim(&gSprites[spriteIdx]); - StartSpriteAffineAnim(&gSprites[spriteIdx], 1); - gSprites[spriteIdx].invisible = TRUE; + spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[21], 0, 0, 31); + gSprites[spriteId].oam.affineMode = 1; + InitSpriteAffineAnim(&gSprites[spriteId]); + StartSpriteAffineAnim(&gSprites[spriteId], 1); + gSprites[spriteId].invisible = 1; } -u8 sub_808D4F4(void) +u8 GetFirstInactiveEventObjectId(void) { u8 i; - - for (i = 0; i < NUM_EVENT_OBJECTS; i ++) + for (i = 0; i < NUM_EVENT_OBJECTS; i++) { if (!gEventObjects[i].active) - { break; - } } + return i; } -u8 GetEventObjectIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId) +u8 GetEventObjectIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroupId) { if (localId < 0xff) { - return GetEventObjectIdByLocalIdAndMapInternal(localId, mapId, mapGroupId); + return GetEventObjectIdByLocalIdAndMapInternal(localId, mapNum, mapGroupId); } return GetEventObjectIdByLocalId(localId); } -bool8 TryGetEventObjectIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId, u8 *eventObjectId) +bool8 TryGetEventObjectIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroupId, u8 *eventObjectId) { - *eventObjectId = GetEventObjectIdByLocalIdAndMap(localId, mapId, mapGroupId); + *eventObjectId = GetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroupId); if (*eventObjectId == NUM_EVENT_OBJECTS) - { return TRUE; - } - return FALSE; + else + return FALSE; } u8 GetEventObjectIdByXY(s16 x, s16 y) { u8 i; - - for (i = 0; i < NUM_EVENT_OBJECTS; i ++) + for (i = 0; i < NUM_EVENT_OBJECTS; i++) { if (gEventObjects[i].active && gEventObjects[i].currentCoords.x == x && gEventObjects[i].currentCoords.y == y) - { break; - } } + return i; } -static u8 GetEventObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapId, u8 mapGroupId) +static u8 GetEventObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapNum, u8 mapGroupId) { u8 i; - - for (i = 0; i < NUM_EVENT_OBJECTS; i ++) + for (i = 0; i < NUM_EVENT_OBJECTS; i++) { - if (gEventObjects[i].active && gEventObjects[i].localId == localId && gEventObjects[i].mapNum == mapId && gEventObjects[i].mapGroup == mapGroupId) - { + if (gEventObjects[i].active && gEventObjects[i].localId == localId && gEventObjects[i].mapNum == mapNum && gEventObjects[i].mapGroup == mapGroupId) return i; - } } + return NUM_EVENT_OBJECTS; } static u8 GetEventObjectIdByLocalId(u8 localId) { u8 i; - - for (i = 0; i < NUM_EVENT_OBJECTS; i ++) + for (i = 0; i < NUM_EVENT_OBJECTS; i++) { if (gEventObjects[i].active && gEventObjects[i].localId == localId) - { return i; - } } + return NUM_EVENT_OBJECTS; } @@ -1199,17 +1139,17 @@ static u8 GetEventObjectIdByLocalId(u8 localId) static u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *template, u8 mapNum, u8 mapGroup) { struct EventObject *eventObject; + u8 eventObjectId; s16 x; s16 y; - u8 slot; // mapNum and mapGroup are in the wrong registers (r7/r6 instead of r6/r7) - if (GetAvailableEventObjectSlot(template->localId, mapNum, mapGroup, &slot)) + if (GetAvailableEventObjectId(template->localId, mapNum, mapGroup, &eventObjectId)) { return NUM_EVENT_OBJECTS; } - eventObject = &gEventObjects[slot]; - npc_clear_ids_and_state(eventObject); + eventObject = &gEventObjects[eventObjectId]; + ClearEventObject(eventObject); x = template->x + 7; y = template->y + 7; eventObject->active = TRUE; @@ -1233,22 +1173,22 @@ static u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *template, eventObject->trainerType = template->trainerType; eventObject->trainerRange_berryTreeId = template->trainerRange_berryTreeId; eventObject->previousMovementDirection = gInitialMovementTypeFacingDirections[template->movementType]; - EventObjectSetDirection(eventObject, eventObject->previousMovementDirection); - EventObjectHandleDynamicGraphicsId(eventObject); + SetEventObjectDirection(eventObject, eventObject->previousMovementDirection); + SetEventObjectDynamicGraphicsId(eventObject); if (gRangedMovementTypes[eventObject->movementType]) { if ((eventObject->range.as_nybbles.x) == 0) { // r9 is invoked here - eventObject->range.as_nybbles.x ++; + eventObject->range.as_nybbles.x++; } if ((eventObject->range.as_nybbles.y) == 0) { - eventObject->range.as_nybbles.y ++; + eventObject->range.as_nybbles.y++; } } - return slot; + return eventObjectId; } #else static NAKED u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *template, u8 mapId, u8 mapGroupId) @@ -1267,7 +1207,7 @@ static NAKED u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *tem "\tadds r1, r6, 0\n" "\tadds r2, r7, 0\n" "\tmov r3, sp\n" - "\tbl GetAvailableEventObjectSlot\n" + "\tbl GetAvailableEventObjectId\n" "\tlsls r0, 24\n" "\tcmp r0, 0\n" "\tbeq _0808D66E\n" @@ -1282,7 +1222,7 @@ static NAKED u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *tem "\tldr r1, =gEventObjects\n" "\tadds r4, r0, r1\n" "\tadds r0, r4, 0\n" - "\tbl npc_clear_ids_and_state\n" + "\tbl ClearEventObject\n" "\tldrh r3, [r5, 0x4]\n" "\tadds r3, 0x7\n" "\tlsls r3, 16\n" @@ -1356,9 +1296,9 @@ static NAKED u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *tem "\tstrb r1, [r0]\n" "\tldrb r1, [r0]\n" "\tadds r0, r4, 0\n" - "\tbl EventObjectSetDirection\n" + "\tbl SetEventObjectDirection\n" "\tadds r0, r4, 0\n" - "\tbl EventObjectHandleDynamicGraphicsId\n" + "\tbl SetEventObjectDynamicGraphicsId\n" "\tldr r1, =gRangedMovementTypes\n" "\tldrb r0, [r4, 0x6]\n" "\tadds r0, r1\n" @@ -1407,7 +1347,7 @@ static NAKED u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *tem } #endif -u8 unref_sub_808D77C(u8 localId) +u8 Unref_TryInitLocalEventObject(u8 localId) { u8 i; u8 nObjects; @@ -1427,7 +1367,7 @@ u8 unref_sub_808D77C(u8 localId) { nObjects = gMapHeader.events->eventObjectCount; } - for (i = 0; i < nObjects; i ++) + for (i = 0; i < nObjects; i++) { template = &gSaveBlock1Ptr->eventObjectTemplates[i]; if (template->localId == localId && !FlagGet(template->flagId)) @@ -1439,16 +1379,16 @@ u8 unref_sub_808D77C(u8 localId) return NUM_EVENT_OBJECTS; } -static bool8 GetAvailableEventObjectSlot(u16 localId, u8 mapNum, u8 mapGroup, u8 *result) +static bool8 GetAvailableEventObjectId(u16 localId, u8 mapNum, u8 mapGroup, u8 *eventObjectId) // Looks for an empty slot. // Returns FALSE and the location of the available slot -// in *result. +// in *eventObjectId. // If no slots are available, or if the object is already // loaded, returns TRUE. { u8 i = 0; - for (i = 0; i < NUM_EVENT_OBJECTS; i ++) + for (i = 0; i < NUM_EVENT_OBJECTS; i++) { if (!gEventObjects[i].active) break; @@ -1457,12 +1397,12 @@ static bool8 GetAvailableEventObjectSlot(u16 localId, u8 mapNum, u8 mapGroup, u8 } if (i >= NUM_EVENT_OBJECTS) return TRUE; - *result = i; + *eventObjectId = i; do { if (gEventObjects[i].active && gEventObjects[i].localId == localId && gEventObjects[i].mapNum == mapNum && gEventObjects[i].mapGroup == mapGroup) return TRUE; - i ++; + i++; } while (i < NUM_EVENT_OBJECTS); return FALSE; } @@ -1475,11 +1415,11 @@ static void RemoveEventObject(struct EventObject *eventObject) void RemoveEventObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { - u8 index; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &index)) + u8 eventObjectId; + if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) { - FlagSet(GetEventObjectFlagIdByEventObjectId(index)); - RemoveEventObject(&gEventObjects[index]); + FlagSet(GetEventObjectFlagIdByEventObjectId(eventObjectId)); + RemoveEventObject(&gEventObjects[eventObjectId]); } } @@ -1491,20 +1431,18 @@ static void RemoveEventObjectInternal(struct EventObject *eventObject) DestroySprite(&gSprites[eventObject->spriteId]); } -void unref_sub_808D958(void) +void RemoveAllEventObjectsExceptPlayer(void) { u8 i; - for (i = 0; i < NUM_EVENT_OBJECTS; i ++) + for (i = 0; i < NUM_EVENT_OBJECTS; i++) { if (i != gPlayerAvatar.eventObjectId) - { RemoveEventObject(&gEventObjects[i]); - } } } -static u8 SpawnEventObjectInternal(struct EventObjectTemplate *eventObjectTemplate, struct SpriteTemplate *spriteTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY) +static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTemplate, struct SpriteTemplate *spriteTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY) { struct EventObject *eventObject; const struct EventObjectGraphicsInfo *graphicsInfo; @@ -1515,9 +1453,8 @@ static u8 SpawnEventObjectInternal(struct EventObjectTemplate *eventObjectTempla eventObjectId = InitEventObjectStateFromTemplate(eventObjectTemplate, mapNum, mapGroup); if (eventObjectId == NUM_EVENT_OBJECTS) - { return NUM_EVENT_OBJECTS; - } + eventObject = &gEventObjects[eventObjectId]; graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); paletteSlot = graphicsInfo->paletteSlot; @@ -1558,14 +1495,14 @@ static u8 SpawnEventObjectInternal(struct EventObjectTemplate *eventObjectTempla eventObject->inanimate = graphicsInfo->inanimate; if (!eventObject->inanimate) { - StartSpriteAnim(sprite, EventObjectDirectionToImageAnimId(eventObject->facingDirection)); + StartSpriteAnim(sprite, GetFaceDirectionAnimNum(eventObject->facingDirection)); } SetObjectSubpriorityByZCoord(eventObject->previousElevation, sprite, 1); - sub_8096518(eventObject, sprite); + UpdateEventObjectVisibility(eventObject, sprite); return eventObjectId; } -static u8 SpawnEventObject(struct EventObjectTemplate *eventObjectTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY) +static u8 TrySpawnEventObject(struct EventObjectTemplate *eventObjectTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY) { const struct EventObjectGraphicsInfo *graphicsInfo; struct SpriteTemplate spriteTemplate; @@ -1578,7 +1515,7 @@ static u8 SpawnEventObject(struct EventObjectTemplate *eventObjectTemplate, u8 m MakeObjectTemplateFromEventObjectTemplate(eventObjectTemplate, &spriteTemplate, &subspriteTables); spriteFrameImage.size = graphicsInfo->size; spriteTemplate.images = &spriteFrameImage; - eventObjectId = SpawnEventObjectInternal(eventObjectTemplate, &spriteTemplate, mapNum, mapGroup, cameraX, cameraY); + eventObjectId = TrySetupEventObjectSprite(eventObjectTemplate, &spriteTemplate, mapNum, mapGroup, cameraX, cameraY); if (eventObjectId == NUM_EVENT_OBJECTS) { return NUM_EVENT_OBJECTS; @@ -1597,7 +1534,7 @@ u8 SpawnSpecialEventObject(struct EventObjectTemplate *eventObjectTemplate) s16 cameraY; GetEventObjectMovingCameraOffset(&cameraX, &cameraY); - return SpawnEventObject(eventObjectTemplate, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY); + return TrySpawnEventObject(eventObjectTemplate, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY); } u8 SpawnSpecialEventObjectParametrized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z) @@ -1632,7 +1569,7 @@ u8 show_sprite(u8 localId, u8 mapNum, u8 mapGroup) return NUM_EVENT_OBJECTS; } GetEventObjectMovingCameraOffset(&cameraX, &cameraY); - return SpawnEventObject(eventObjectTemplate, mapNum, mapGroup, cameraX, cameraY); + return TrySpawnEventObject(eventObjectTemplate, mapNum, mapGroup, cameraX, cameraY); } static void MakeObjectTemplateFromEventObjectGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables) @@ -1651,7 +1588,7 @@ static void MakeObjectTemplateFromEventObjectGraphicsInfo(u16 graphicsId, void ( static void MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 callbackIndex, struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables) { - MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, gUnknown_08505438[callbackIndex], sprTemplate, subspriteTables); + MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, sMovementTypeCallbacks[callbackIndex], sprTemplate, subspriteTables); } static void MakeObjectTemplateFromEventObjectTemplate(struct EventObjectTemplate *eventObjectTemplate, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) @@ -1693,7 +1630,7 @@ u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction) struct Sprite *sprite; graphicsInfo = GetEventObjectGraphicsInfo(graphicsId); - MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, sub_8097AC8, &spriteTemplate, &subspriteTables); + MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, UpdateEventObjectSpriteSubpriorityAndVisibility, &spriteTemplate, &subspriteTables); *(u16 *)&spriteTemplate.paletteTag = 0xffff; x += 7; y += 7; @@ -1728,12 +1665,12 @@ u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction) } InitObjectPriorityByZCoord(sprite, z); SetObjectSubpriorityByZCoord(z, sprite, 1); - StartSpriteAnim(sprite, EventObjectDirectionToImageAnimId(direction)); + StartSpriteAnim(sprite, GetFaceDirectionAnimNum(direction)); } return spriteId; } -void SpawnEventObjectsInView(s16 cameraX, s16 cameraY) +void TrySpawnEventObjects(s16 cameraX, s16 cameraY) { u8 i; s16 left; @@ -1772,21 +1709,21 @@ void SpawnEventObjectsInView(s16 cameraX, s16 cameraY) if (top <= npcY && bottom >= npcY && left <= npcX && right >= npcX && !FlagGet(template->flagId)) - SpawnEventObject(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY); + TrySpawnEventObject(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY); } } } -/*static*/ void RemoveEventObjectsOutsideView(void) +void RemoveEventObjectsOutsideView(void) { u8 i; u8 j; bool8 isActiveLinkPlayer; struct EventObject *eventObject; - for (i = 0; i < NUM_EVENT_OBJECTS; i ++) + for (i = 0; i < NUM_EVENT_OBJECTS; i++) { - for (j = 0, isActiveLinkPlayer = FALSE; j < ARRAY_COUNT(gLinkPlayerEventObjects); j ++) + for (j = 0, isActiveLinkPlayer = FALSE; j < ARRAY_COUNT(gLinkPlayerEventObjects); j++) { if (gLinkPlayerEventObjects[j].active && i == gLinkPlayerEventObjects[j].eventObjId) isActiveLinkPlayer = TRUE; @@ -1827,7 +1764,7 @@ void sub_808E16C(s16 x, s16 y) u8 i; ClearPlayerAvatarInfo(); - for (i = 0; i < NUM_EVENT_OBJECTS; i ++) + for (i = 0; i < NUM_EVENT_OBJECTS; i++) { if (gEventObjects[i].active) { @@ -1849,7 +1786,7 @@ static void sub_808E1B8(u8 eventObjectId, s16 x, s16 y) struct Sprite *sprite; #define i spriteId - for (i = 0; i < ARRAY_COUNT(gLinkPlayerEventObjects); i ++) + for (i = 0; i < ARRAY_COUNT(gLinkPlayerEventObjects); i++) { if (gLinkPlayerEventObjects[i].active && eventObjectId == gLinkPlayerEventObjects[i].eventObjId) { @@ -1905,7 +1842,7 @@ static void sub_808E1B8(u8 eventObjectId, s16 x, s16 y) eventObject->spriteId = spriteId; if (!eventObject->inanimate && eventObject->movementType != 0x0b) { - StartSpriteAnim(sprite, EventObjectDirectionToImageAnimId(eventObject->facingDirection)); + StartSpriteAnim(sprite, GetFaceDirectionAnimNum(eventObject->facingDirection)); } sub_808E38C(eventObject); SetObjectSubpriorityByZCoord(eventObject->previousElevation, sprite, 1); @@ -1914,7 +1851,7 @@ static void sub_808E1B8(u8 eventObjectId, s16 x, s16 y) static void sub_808E38C(struct EventObject *eventObject) { - eventObject->singleMovementActive = FALSE; + eventObject->singleMovementActive = 0; eventObject->triggerGroundEffectsOnMove = TRUE; eventObject->hasShadow = FALSE; eventObject->hasReflection = FALSE; @@ -1922,7 +1859,7 @@ static void sub_808E38C(struct EventObject *eventObject) eventObject->inShallowFlowingWater = FALSE; eventObject->inSandPile = FALSE; eventObject->inHotSprings = FALSE; - EventObjectClearAnim(eventObject); + EventObjectClearHeldMovement(eventObject); } static void SetPlayerAvatarEventObjectIdAndObjectId(u8 eventObjectId, u8 spriteId) @@ -1986,10 +1923,10 @@ void EventObjectSetGraphicsIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, void EventObjectTurn(struct EventObject *eventObject, u8 direction) { - EventObjectSetDirection(eventObject, direction); + SetEventObjectDirection(eventObject, direction); if (!eventObject->inanimate) { - StartSpriteAnim(&gSprites[eventObject->spriteId], EventObjectDirectionToImageAnimId(eventObject->facingDirection)); + StartSpriteAnim(&gSprites[eventObject->spriteId], GetFaceDirectionAnimNum(eventObject->facingDirection)); SeekSpriteAnim(&gSprites[eventObject->spriteId], 0); } } @@ -2054,7 +1991,7 @@ const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(u8 graphicsId) return gEventObjectGraphicsInfoPointers[graphicsId]; } -static void EventObjectHandleDynamicGraphicsId(struct EventObject *eventObject) +static void SetEventObjectDynamicGraphicsId(struct EventObject *eventObject) { if (eventObject->graphicsId >= SPRITE_VAR) { @@ -2154,7 +2091,7 @@ void sub_808E8C0(u16 *paletteTags) { u8 i; - for (i = 0; paletteTags[i] != 0x11ff; i ++) + for (i = 0; paletteTags[i] != 0x11ff; i++) { sub_808E894(paletteTags[i]); } @@ -2182,8 +2119,8 @@ void pal_patch_for_npc_range(const u16 *paletteTags, u8 minSlot, u8 maxSlot) while (minSlot < maxSlot) { pal_patch_for_npc(*paletteTags, minSlot); - paletteTags ++; - minSlot ++; + paletteTags++; + minSlot++; } } @@ -2191,7 +2128,7 @@ static u8 FindEventObjectPaletteIndexByTag(u16 tag) { u8 i; - for (i = 0; gUnknown_0850BBC8[i].tag != 0x11ff; i ++) + for (i = 0; gUnknown_0850BBC8[i].tag != 0x11ff; i++) { if (gUnknown_0850BBC8[i].tag == tag) { @@ -2206,7 +2143,7 @@ void npc_load_two_palettes__no_record(u16 tag, u8 slot) u8 i; pal_patch_for_npc(tag, slot); - for (i = 0; gUnknown_0850BD00[i].tag != 0x11ff; i ++) + for (i = 0; gUnknown_0850BD00[i].tag != 0x11ff; i++) { if (gUnknown_0850BD00[i].tag == tag) { @@ -2222,7 +2159,7 @@ void npc_load_two_palettes__and_record(u16 tag, u8 slot) gUnknown_020375B6 = tag; pal_patch_for_npc(tag, slot); - for (i = 0; gUnknown_0850BD78[i].tag != 0x11ff; i ++) + for (i = 0; gUnknown_0850BD78[i].tag != 0x11ff; i++) { if (gUnknown_0850BD78[i].tag == tag) { @@ -2245,7 +2182,7 @@ void unref_sub_808EAC4(struct EventObject *eventObject, s16 x, s16 y) eventObject->currentCoords.y += y; } -void npc_coords_shift(struct EventObject *eventObject, s16 x, s16 y) +void ShiftEventObjectCoords(struct EventObject *eventObject, s16 x, s16 y) { eventObject->previousCoords.x = eventObject->currentCoords.x; eventObject->previousCoords.y = eventObject->currentCoords.y; @@ -2293,9 +2230,9 @@ void sub_808EBA8(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) } } -void npc_coords_shift_still(struct EventObject *eventObject) +void ShiftStillEventObjectCoords(struct EventObject *eventObject) { - npc_coords_shift(eventObject, eventObject->currentCoords.x, eventObject->currentCoords.y); + ShiftEventObjectCoords(eventObject, eventObject->currentCoords.x, eventObject->currentCoords.y); } void UpdateEventObjectCoordsForCameraUpdate(void) @@ -2308,7 +2245,7 @@ void UpdateEventObjectCoordsForCameraUpdate(void) { dx = gCamera.x; dy = gCamera.y; - for (i = 0; i < NUM_EVENT_OBJECTS; i ++) + for (i = 0; i < NUM_EVENT_OBJECTS; i++) { if (gEventObjects[i].active) { @@ -2326,7 +2263,7 @@ void UpdateEventObjectCoordsForCameraUpdate(void) u8 GetEventObjectIdByXYZ(u16 x, u16 y, u8 z) { u8 i; - for (i = 0; i < NUM_EVENT_OBJECTS; i ++) + for (i = 0; i < NUM_EVENT_OBJECTS; i++) { if (gEventObjects[i].active) { @@ -2351,7 +2288,7 @@ static bool8 EventObjectDoesZCoordMatch(struct EventObject *eventObject, u8 z) void UpdateEventObjectsForCameraUpdate(s16 x, s16 y) { UpdateEventObjectCoordsForCameraUpdate(); - SpawnEventObjectsInView(x, y); + TrySpawnEventObjects(x, y); RemoveEventObjectsOutsideView(); } @@ -2407,7 +2344,7 @@ static struct Sprite *FindCameraObject(void) { u8 spriteId; - for (spriteId = 0; spriteId < MAX_SPRITES; spriteId ++) + for (spriteId = 0; spriteId < MAX_SPRITES; spriteId++) { if (gSprites[spriteId].inUse && gSprites[spriteId].callback == ObjectCB_CameraObject) { @@ -2462,7 +2399,7 @@ u8 CopySprite(struct Sprite *sprite, s16 x, s16 y, u8 subpriority) { u8 i; - for (i = 0; i < MAX_SPRITES; i ++) + for (i = 0; i < MAX_SPRITES; i++) { if (!gSprites[i].inUse) { @@ -2494,7 +2431,7 @@ u8 obj_unfreeze(struct Sprite *sprite, s16 x, s16 y, u8 subpriority) return MAX_SPRITES; } -void EventObjectSetDirection(struct EventObject *eventObject, u8 direction) +void SetEventObjectDirection(struct EventObject *eventObject, u8 direction) { s8 d2; eventObject->previousMovementDirection = eventObject->facingDirection; @@ -2575,14 +2512,14 @@ static struct EventObjectTemplate *GetEventObjectTemplateByLocalIdAndMap(u8 loca templates = mapHeader->events->eventObjects; count = mapHeader->events->eventObjectCount; } - return FindEventObjectTemplateInArrayByLocalId(localId, templates, count); + return FindEventObjectTemplateByLocalId(localId, templates, count); } -static struct EventObjectTemplate *FindEventObjectTemplateInArrayByLocalId(u8 localId, struct EventObjectTemplate *templates, u8 count) +static struct EventObjectTemplate *FindEventObjectTemplateByLocalId(u8 localId, struct EventObjectTemplate *templates, u8 count) { u8 i; - for (i = 0; i < count; i ++) + for (i = 0; i < count; i++) { if (templates[i].localId == localId) { @@ -2592,7 +2529,7 @@ static struct EventObjectTemplate *FindEventObjectTemplateInArrayByLocalId(u8 lo return NULL; } -struct EventObjectTemplate *sub_808F1B4(const struct EventObject *eventObject) +struct EventObjectTemplate *GetBaseTemplateForEventObject(const struct EventObject *eventObject) { int i; @@ -2600,7 +2537,7 @@ struct EventObjectTemplate *sub_808F1B4(const struct EventObject *eventObject) { return NULL; } - for (i = 0; i < 64; i ++) // Using ARRAY_COUNT here results in the wrong conditional branch instruction (bls instead of ble) + for (i = 0; i < 64; i++) // Using ARRAY_COUNT here results in the wrong conditional branch instruction (bls instead of ble) { if (eventObject->localId == gSaveBlock1Ptr->eventObjectTemplates[i].localId) { @@ -2610,11 +2547,11 @@ struct EventObjectTemplate *sub_808F1B4(const struct EventObject *eventObject) return NULL; } -void sub_808F208(const struct EventObject *eventObject) +void OverrideTemplateCoordsForEventObject(const struct EventObject *eventObject) { struct EventObjectTemplate *eventObjectTemplate; - eventObjectTemplate = sub_808F1B4(eventObject); + eventObjectTemplate = GetBaseTemplateForEventObject(eventObject); if (eventObjectTemplate != NULL) { eventObjectTemplate->x = eventObject->currentCoords.x - 7; @@ -2622,22 +2559,22 @@ void sub_808F208(const struct EventObject *eventObject) } } -void sub_808F228(const struct EventObject *eventObject, const u8 *script) +void OverrideMovementTypeForEventObject(const struct EventObject *eventObject, const u8 *script) { struct EventObjectTemplate *eventObjectTemplate; - eventObjectTemplate = sub_808F1B4(eventObject); + eventObjectTemplate = GetBaseTemplateForEventObject(eventObject); if (eventObjectTemplate != NULL) { eventObjectTemplate->script = script; } } -void sub_808F23C(const struct EventObject *eventObject, u8 movementType) +void TryOverrideTemplateCoordsForEventObject(const struct EventObject *eventObject, u8 movementType) { struct EventObjectTemplate *eventObjectTemplate; - eventObjectTemplate = sub_808F1B4(eventObject); + eventObjectTemplate = GetBaseTemplateForEventObject(eventObject); if (eventObjectTemplate != NULL) { eventObjectTemplate->movementType = movementType; @@ -2650,7 +2587,7 @@ void sub_808F254(u8 localId, u8 mapNum, u8 mapGroup) if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) { - sub_808F208(&gEventObjects[eventObjectId]); + OverrideTemplateCoordsForEventObject(&gEventObjects[eventObjectId]); } } @@ -2663,10 +2600,10 @@ void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat) switch (decorCat) { case DECORCAT_DOLL: - sub_808F228(&gEventObjects[eventObjectId], EventScript_2766A2); + OverrideMovementTypeForEventObject(&gEventObjects[eventObjectId], EventScript_2766A2); break; case DECORCAT_CUSHION: - sub_808F228(&gEventObjects[eventObjectId], EventScript_2766A6); + OverrideMovementTypeForEventObject(&gEventObjects[eventObjectId], EventScript_2766A6); break; } } @@ -2696,7 +2633,7 @@ u16 npc_paltag_by_palslot(u8 palSlot) { return gUnknown_0850BE38[gUnknown_020375B4][palSlot]; } - for (i = 0; gUnknown_0850BD78[i].tag != 0x11ff; i ++) + for (i = 0; gUnknown_0850BD78[i].tag != 0x11ff; i++) { if (gUnknown_0850BD78[i].tag == gUnknown_020375B6) { @@ -2706,41 +2643,37 @@ u16 npc_paltag_by_palslot(u8 palSlot) return 0x11ff; } -// Map Object Step Callbacks -// file boundary? +movement_type_empty_callback(MovementType_None) +movement_type_def(MovementType_WanderAround, gMovementTypeFuncs_WanderAround) -null_object_step(NoMovement1, FALSE) - -field_object_step(GoRandomDirections, gUnknown_0850D6F4) - -bool8 sub_808F44C(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(eventObject, sprite); + ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_808F460(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); + EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_808F48C(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step2(struct EventObject *eventObject, struct Sprite *sprite) { - if (!EventObjectExecRegularAnim(eventObject, sprite)) + if (!EventObjectExecSingleMovementAction(eventObject, sprite)) { return FALSE; } - SetEventObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]); + SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]); sprite->data[1] = 3; return TRUE; } -bool8 sub_808F4C8(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step3(struct EventObject *eventObject, struct Sprite *sprite) { - if (RunEventObjectStepTimer(sprite)) + if (WaitForMovementDelay(sprite)) { sprite->data[1] = 4; return TRUE; @@ -2748,35 +2681,35 @@ bool8 sub_808F4C8(struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -bool8 sub_808F4E8(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step4(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; u8 chosenDirection; - memcpy(directions, gUnknown_0850D710, sizeof directions); - chosenDirection = directions[Random() & 0x03]; - EventObjectSetDirection(eventObject, chosenDirection); + memcpy(directions, gStandardDirections, sizeof directions); + chosenDirection = directions[Random() & 3]; + SetEventObjectDirection(eventObject, chosenDirection); sprite->data[1] = 5; - if (npc_block_way__next_tile(eventObject, chosenDirection)) + if (GetCollisionInDirection(eventObject, chosenDirection)) { sprite->data[1] = 1; } return TRUE; } -bool8 sub_808F534(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step5(struct EventObject *eventObject, struct Sprite *sprite) { - EventObjectSetRegularAnim(eventObject, sprite, GetGoSpeed0AnimId(eventObject->movementDirection)); - eventObject->singleMovementActive = TRUE; + EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(eventObject->movementDirection)); + eventObject->singleMovementActive = 1; sprite->data[1] = 6; return TRUE; } -bool8 sub_808F564(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step6(struct EventObject *eventObject, struct Sprite *sprite) { - if (EventObjectExecRegularAnim(eventObject, sprite)) + if (EventObjectExecSingleMovementAction(eventObject, sprite)) { - eventObject->singleMovementActive = FALSE; + eventObject->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; @@ -2793,7 +2726,7 @@ bool8 EventObjectIsTrainerAndCloseToPlayer(struct EventObject *eventObject) s16 minY; s16 maxY; - if (!TestPlayerAvatarFlags(0x80)) + if (!TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_DASH)) { return FALSE; } @@ -2815,7 +2748,7 @@ bool8 EventObjectIsTrainerAndCloseToPlayer(struct EventObject *eventObject) return TRUE; } -u8 GetRegularRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) +u8 GetVectorDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) { u8 direction; @@ -2838,7 +2771,7 @@ u8 GetRegularRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) return direction; } -u8 GetNorthSouthRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) +u8 GetLimitedVectorDirection_SouthNorth(s16 dx, s16 dy, s16 absdx, s16 absdy) { u8 direction; @@ -2850,7 +2783,7 @@ u8 GetNorthSouthRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) return direction; } -u8 GetEastWestRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) +u8 GetLimitedVectorDirection_WestEast(s16 dx, s16 dy, s16 absdx, s16 absdy) { u8 direction; @@ -2862,14 +2795,14 @@ u8 GetEastWestRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) return direction; } -u8 GetNorthEastRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) +u8 GetLimitedVectorDirection_WestNorth(s16 dx, s16 dy, s16 absdx, s16 absdy) { u8 direction; - direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy); + direction = GetVectorDirection(dx, dy, absdx, absdy); if (direction == DIR_SOUTH) { - direction = GetEastWestRunningPastFacingDirection(dx, dy, absdx, absdy); + direction = GetLimitedVectorDirection_WestEast(dx, dy, absdx, absdy); if (direction == DIR_EAST) { direction = DIR_NORTH; @@ -2877,7 +2810,7 @@ u8 GetNorthEastRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) } else if (direction == DIR_EAST) { - direction = GetNorthSouthRunningPastFacingDirection(dx, dy, absdx, absdy); + direction = GetLimitedVectorDirection_SouthNorth(dx, dy, absdx, absdy); if (direction == DIR_SOUTH) { direction = DIR_NORTH; @@ -2886,14 +2819,14 @@ u8 GetNorthEastRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) return direction; } -u8 GetNorthWestRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) +u8 GetLimitedVectorDirection_EastNorth(s16 dx, s16 dy, s16 absdx, s16 absdy) { u8 direction; - direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy); + direction = GetVectorDirection(dx, dy, absdx, absdy); if (direction == DIR_SOUTH) { - direction = GetEastWestRunningPastFacingDirection(dx, dy, absdx, absdy); + direction = GetLimitedVectorDirection_WestEast(dx, dy, absdx, absdy); if (direction == DIR_WEST) { direction = DIR_NORTH; @@ -2901,7 +2834,7 @@ u8 GetNorthWestRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) } else if (direction == DIR_WEST) { - direction = GetNorthSouthRunningPastFacingDirection(dx, dy, absdx, absdy); + direction = GetLimitedVectorDirection_SouthNorth(dx, dy, absdx, absdy); if (direction == DIR_SOUTH) { direction = DIR_NORTH; @@ -2910,14 +2843,14 @@ u8 GetNorthWestRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) return direction; } -u8 GetSouthEastRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) +u8 GetLimitedVectorDirection_WestSouth(s16 dx, s16 dy, s16 absdx, s16 absdy) { u8 direction; - direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy); + direction = GetVectorDirection(dx, dy, absdx, absdy); if (direction == DIR_NORTH) { - direction = GetEastWestRunningPastFacingDirection(dx, dy, absdx, absdy); + direction = GetLimitedVectorDirection_WestEast(dx, dy, absdx, absdy); if (direction == DIR_EAST) { direction = DIR_SOUTH; @@ -2925,7 +2858,7 @@ u8 GetSouthEastRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) } else if (direction == DIR_EAST) { - direction = GetNorthSouthRunningPastFacingDirection(dx, dy, absdx, absdy); + direction = GetLimitedVectorDirection_SouthNorth(dx, dy, absdx, absdy); if (direction == DIR_NORTH) { direction = DIR_SOUTH; @@ -2934,14 +2867,14 @@ u8 GetSouthEastRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) return direction; } -u8 GetSouthWestRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) +u8 GetLimitedVectorDirection_EastSouth(s16 dx, s16 dy, s16 absdx, s16 absdy) { u8 direction; - direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy); + direction = GetVectorDirection(dx, dy, absdx, absdy); if (direction == DIR_NORTH) { - direction = GetEastWestRunningPastFacingDirection(dx, dy, absdx, absdy); + direction = GetLimitedVectorDirection_WestEast(dx, dy, absdx, absdy); if (direction == DIR_WEST) { direction = DIR_SOUTH; @@ -2949,7 +2882,7 @@ u8 GetSouthWestRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) } else if (direction == DIR_WEST) { - direction = GetNorthSouthRunningPastFacingDirection(dx, dy, absdx, absdy); + direction = GetLimitedVectorDirection_SouthNorth(dx, dy, absdx, absdy); if (direction == DIR_NORTH) { direction = DIR_SOUTH; @@ -2958,55 +2891,55 @@ u8 GetSouthWestRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) return direction; } -u8 GetNonEastRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) +u8 GetLimitedVectorDirection_SouthNorthWest(s16 dx, s16 dy, s16 absdx, s16 absdy) { u8 direction; - direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy); + direction = GetVectorDirection(dx, dy, absdx, absdy); if (direction == DIR_EAST) { - direction = GetNorthSouthRunningPastFacingDirection(dx, dy, absdx, absdy); + direction = GetLimitedVectorDirection_SouthNorth(dx, dy, absdx, absdy); } return direction; } -u8 GetNonWestRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) +u8 GetLimitedVectorDirection_SouthNorthEast(s16 dx, s16 dy, s16 absdx, s16 absdy) { u8 direction; - direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy); + direction = GetVectorDirection(dx, dy, absdx, absdy); if (direction == DIR_WEST) { - direction = GetNorthSouthRunningPastFacingDirection(dx, dy, absdx, absdy); + direction = GetLimitedVectorDirection_SouthNorth(dx, dy, absdx, absdy); } return direction; } -u8 GetNonSouthRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) +u8 GetLimitedVectorDirection_NorthWestEast(s16 dx, s16 dy, s16 absdx, s16 absdy) { u8 direction; - direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy); + direction = GetVectorDirection(dx, dy, absdx, absdy); if (direction == DIR_SOUTH) { - direction = GetEastWestRunningPastFacingDirection(dx, dy, absdx, absdy); + direction = GetLimitedVectorDirection_WestEast(dx, dy, absdx, absdy); } return direction; } -u8 GetNonNorthRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy) +u8 GetLimitedVectorDirection_SouthWestEast(s16 dx, s16 dy, s16 absdx, s16 absdy) { u8 direction; - direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy); + direction = GetVectorDirection(dx, dy, absdx, absdy); if (direction == DIR_NORTH) { - direction = GetEastWestRunningPastFacingDirection(dx, dy, absdx, absdy); + direction = GetLimitedVectorDirection_WestEast(dx, dy, absdx, absdy); } return direction; } -u8 GetRunningPastFacingDirection(struct EventObject *eventObject, u8 movementType) +u8 TryGetTrainerEncounterDirection(struct EventObject *eventObject, u8 movementType) { s16 dx; s16 dy; @@ -3030,39 +2963,39 @@ u8 GetRunningPastFacingDirection(struct EventObject *eventObject, u8 movementTyp { absdy = -absdy; } - return gUnknown_0850D714[movementType](dx, dy, absdx, absdy); + return gGetVectorDirectionFuncs[movementType](dx, dy, absdx, absdy); } -field_object_step(LookRandomDirections, gUnknown_0850D740) +movement_type_def(MovementType_LookAround, gMovementTypeFuncs_LookAround) -bool8 sub_808F988(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(eventObject, sprite); + ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_808F99C(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); + EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_808F9C8(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step2(struct EventObject *eventObject, struct Sprite *sprite) { - if (EventObjectExecRegularAnim(eventObject, sprite)) + if (EventObjectExecSingleMovementAction(eventObject, sprite)) { - SetEventObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]); - eventObject->singleMovementActive = FALSE; + SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]); + eventObject->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 sub_808FA0C(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step3(struct EventObject *eventObject, struct Sprite *sprite) { - if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; return TRUE; @@ -3070,52 +3003,50 @@ bool8 sub_808FA0C(struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -bool8 sub_808FA3C(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step4(struct EventObject *eventObject, struct Sprite *sprite) { + u8 direction; u8 directions[4]; - u8 direction; + memcpy(directions, gStandardDirections, sizeof directions); + direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_ANY); + if (direction == DIR_NONE) + direction = directions[Random() & 3]; - memcpy(directions, gUnknown_0850D710, sizeof directions); - direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_ANY); - if (direction == 0) - { - direction = directions[Random() & 0x03]; - } - EventObjectSetDirection(eventObject, direction); + SetEventObjectDirection(eventObject, direction); sprite->data[1] = 1; return TRUE; } -field_object_step(RandomlyGoNorthOrSouth, gUnknown_0850D754) +movement_type_def(MovementType_WanderUpAndDown, gMovementTypeFuncs_WanderUpAndDown) -bool8 sub_808FAC8(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(eventObject, sprite); + ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_808FADC(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); + EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_808FB08(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step2(struct EventObject *eventObject, struct Sprite *sprite) { - if (!EventObjectExecRegularAnim(eventObject, sprite)) + if (!EventObjectExecSingleMovementAction(eventObject, sprite)) { return FALSE; } - SetEventObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]); + SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]); sprite->data[1] = 3; return TRUE; } -bool8 sub_808FB44(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step3(struct EventObject *eventObject, struct Sprite *sprite) { - if (RunEventObjectStepTimer(sprite)) + if (WaitForMovementDelay(sprite)) { sprite->data[1] = 4; return TRUE; @@ -3123,70 +3054,69 @@ bool8 sub_808FB44(struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -bool8 sub_808FB64(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step4(struct EventObject *eventObject, struct Sprite *sprite) { - u8 directions[2]; u8 direction; - - memcpy(directions, gUnknown_0850D770, sizeof directions); - direction = directions[Random() & 0x01]; - EventObjectSetDirection(eventObject, direction); + u8 directions[2]; + memcpy(directions, gUpAndDownDirections, sizeof directions); + direction = directions[Random() & 1]; + SetEventObjectDirection(eventObject, direction); sprite->data[1] = 5; - if (npc_block_way__next_tile(eventObject, direction)) + if (GetCollisionInDirection(eventObject, direction)) { sprite->data[1] = 1; } return TRUE; } -bool8 sub_808FBB0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step5(struct EventObject *eventObject, struct Sprite *sprite) { - EventObjectSetRegularAnim(eventObject, sprite, GetGoSpeed0AnimId(eventObject->movementDirection)); - eventObject->singleMovementActive = TRUE; + EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(eventObject->movementDirection)); + eventObject->singleMovementActive = 1; sprite->data[1] = 6; return TRUE; } -bool8 sub_808FBE0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step6(struct EventObject *eventObject, struct Sprite *sprite) { - if (EventObjectExecRegularAnim(eventObject, sprite)) + if (EventObjectExecSingleMovementAction(eventObject, sprite)) { - eventObject->singleMovementActive = FALSE; + eventObject->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; } -field_object_step(RandomlyGoEastOrWest, gUnknown_0850D774) +movement_type_def(MovementType_WanderLeftAndRight, gMovementTypeFuncs_WanderLeftAndRight) -bool8 sub_808FC4C(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(eventObject, sprite); + ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_808FC60(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); + EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_808FC8C(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) { - if (!EventObjectExecRegularAnim(eventObject, sprite)) + if (!EventObjectExecSingleMovementAction(eventObject, sprite)) { return FALSE; } - SetEventObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]); + SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]); sprite->data[1] = 3; return TRUE; } -bool8 sub_808FCC8(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) { - if (RunEventObjectStepTimer(sprite)) + if (WaitForMovementDelay(sprite)) { sprite->data[1] = 4; return TRUE; @@ -3194,53 +3124,52 @@ bool8 sub_808FCC8(struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -bool8 sub_808FCE8(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) { - u8 directions[2]; u8 direction; - - memcpy(directions, gUnknown_0850D790, sizeof directions); - direction = directions[Random() & 0x01]; - EventObjectSetDirection(eventObject, direction); + u8 directions[2]; + memcpy(directions, gLeftAndRightDirections, sizeof directions); + direction = directions[Random() & 1]; + SetEventObjectDirection(eventObject, direction); sprite->data[1] = 5; - if (npc_block_way__next_tile(eventObject, direction)) + if (GetCollisionInDirection(eventObject, direction)) { sprite->data[1] = 1; } return TRUE; } -bool8 sub_808FD34(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step5(struct EventObject *eventObject, struct Sprite *sprite) { - EventObjectSetRegularAnim(eventObject, sprite, GetGoSpeed0AnimId(eventObject->movementDirection)); - eventObject->singleMovementActive = TRUE; + EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(eventObject->movementDirection)); + eventObject->singleMovementActive = 1; sprite->data[1] = 6; return TRUE; } -bool8 sub_808FD64(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step6(struct EventObject *eventObject, struct Sprite *sprite) { - if (EventObjectExecRegularAnim(eventObject, sprite)) + if (EventObjectExecSingleMovementAction(eventObject, sprite)) { - eventObject->singleMovementActive = FALSE; + eventObject->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; } -field_object_step(FaceFixedDirection, gUnknown_0850D794) +movement_type_def(MovementType_FaceDirection, gMovementTypeFuncs_FaceDirection) -bool8 sub_808FDD0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(eventObject, sprite); - EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); + ClearEventObjectMovement(eventObject, sprite); + EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 1; return TRUE; } -bool8 sub_808FDFC(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDirection_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - if (EventObjectExecRegularAnim(eventObject, sprite)) + if (EventObjectExecSingleMovementAction(eventObject, sprite)) { sprite->data[1] = 2; return TRUE; @@ -3248,42 +3177,41 @@ bool8 sub_808FDFC(struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -bool8 sub_808FE1C(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDirection_Step2(struct EventObject *eventObject, struct Sprite *sprite) { - eventObject->singleMovementActive = FALSE; + eventObject->singleMovementActive = 0; return FALSE; } static bool8 EventObjectCB2_BerryTree(struct EventObject *eventObject, struct Sprite *sprite); -extern bool8 (*const gUnknown_0850D7A0[])(struct EventObject *eventObject, struct Sprite *sprite); -void EventObjectCB_BerryTree(struct Sprite *sprite) +extern bool8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct EventObject *eventObject, struct Sprite *sprite); +void MovementType_BerryTreeGrowth(struct Sprite *sprite) { struct EventObject *eventObject; eventObject = &gEventObjects[sprite->data[0]]; - if (!(sprite->data[7] & 0x0001)) + if (!(sprite->data[7] & 1)) { get_berry_tree_graphics(eventObject, sprite); - sprite->data[7] |= 0x0001; + sprite->data[7] |= 1; } - EventObjectStep(eventObject, sprite, EventObjectCB2_BerryTree); + UpdateEventObjectCurrentMovement(eventObject, sprite, EventObjectCB2_BerryTree); } static bool8 EventObjectCB2_BerryTree(struct EventObject *eventObject, struct Sprite *sprite) { - return gUnknown_0850D7A0[sprite->data[1]](eventObject, sprite); + return gMovementTypeFuncs_BerryTreeGrowth[sprite->data[1]](eventObject, sprite); } -bool8 do_berry_tree_growth_sparkle_1 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step0(struct EventObject *eventObject, struct Sprite *sprite) { u8 berryStage; - - npc_reset(eventObject, sprite); + ClearEventObjectMovement(eventObject, sprite); eventObject->invisible = TRUE; sprite->invisible = TRUE; berryStage = GetStageByBerryTreeId(eventObject->trainerRange_berryTreeId); if (berryStage == 0) { - if (!(sprite->data[7] & 0x0004) && sprite->animNum == 4) + if (!(sprite->data[7] & 4) && sprite->animNum == 4) { gFieldEffectArguments[0] = eventObject->currentCoords.x; gFieldEffectArguments[1] = eventObject->currentCoords.y; @@ -3303,14 +3231,14 @@ bool8 do_berry_tree_growth_sparkle_1 (struct EventObject *eventObject, struct Sp return TRUE; } get_berry_tree_graphics(eventObject, sprite); - EventObjectSetRegularAnim(eventObject, sprite, 0x39); + EventObjectSetSingleMovement(eventObject, sprite, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); sprite->data[1] = 1; return TRUE; } -bool8 sub_808FF48 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - if (EventObjectExecRegularAnim(eventObject, sprite)) + if (EventObjectExecSingleMovementAction(eventObject, sprite)) { sprite->data[1] = 0; return TRUE; @@ -3318,12 +3246,12 @@ bool8 sub_808FF48 (struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -bool8 do_berry_tree_growth_sparkle_2 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step2(struct EventObject *eventObject, struct Sprite *sprite) { - eventObject->singleMovementActive = TRUE; + eventObject->singleMovementActive = 1; sprite->data[1] = 3; sprite->data[2] = 0; - sprite->data[7] |= 0x0002; + sprite->data[7] |= 2; gFieldEffectArguments[0] = eventObject->currentCoords.x; gFieldEffectArguments[1] = eventObject->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; @@ -3332,9 +3260,9 @@ bool8 do_berry_tree_growth_sparkle_2 (struct EventObject *eventObject, struct Sp return TRUE; } -bool8 sub_808FFB4 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step3(struct EventObject *eventObject, struct Sprite *sprite) { - sprite->data[2] ++; + sprite->data[2]++; eventObject->invisible = (sprite->data[2] & 0x02) >> 1; sprite->animPaused = TRUE; if (sprite->data[2] > 64) @@ -3347,9 +3275,9 @@ bool8 sub_808FFB4 (struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -bool8 sub_8090004 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step4(struct EventObject *eventObject, struct Sprite *sprite) { - sprite->data[2] ++; + sprite->data[2]++; eventObject->invisible = (sprite->data[2] & 0x02) >> 1; sprite->animPaused = TRUE; if (sprite->data[2] > 64) @@ -3361,36 +3289,36 @@ bool8 sub_8090004 (struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -field_object_step(RandomlyLookNorthOrSouth, gUnknown_0850D7B4) +movement_type_def(MovementType_FaceDownAndUp, gMovementTypeFuncs_FaceDownAndUp) -bool8 sub_8090094 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(eventObject, sprite); + ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_80900A8 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); + EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_80900D4 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndUp_Step2(struct EventObject *eventObject, struct Sprite *sprite) { - if (EventObjectExecRegularAnim(eventObject, sprite)) + if (EventObjectExecSingleMovementAction(eventObject, sprite)) { - SetEventObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]); - eventObject->singleMovementActive = FALSE; + SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]); + eventObject->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 sub_8090118 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndUp_Step3(struct EventObject *eventObject, struct Sprite *sprite) { - if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; return TRUE; @@ -3398,52 +3326,51 @@ bool8 sub_8090118 (struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -bool8 sub_8090148 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndUp_Step4(struct EventObject *eventObject, struct Sprite *sprite) { - u8 directions[2]; u8 direction; - - memcpy(directions, gUnknown_0850D770, sizeof gUnknown_0850D770); - direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_NORTH_SOUTH); + u8 directions[2]; + memcpy(directions, gUpAndDownDirections, sizeof gUpAndDownDirections); + direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_SOUTH); if (direction == 0) { - direction = directions[Random() & 0x01]; + direction = directions[Random() & 1]; } - EventObjectSetDirection(eventObject, direction); + SetEventObjectDirection(eventObject, direction); sprite->data[1] = 1; return TRUE; } -field_object_step(RandomlyLookEastOrWest, gUnknown_0850D7C8) +movement_type_def(MovementType_FaceLeftAndRight, gMovementTypeFuncs_FaceLeftAndRight) -bool8 sub_80901D4 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(eventObject, sprite); + ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_80901E8 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); + EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_8090214 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) { - if (EventObjectExecRegularAnim(eventObject, sprite)) + if (EventObjectExecSingleMovementAction(eventObject, sprite)) { - SetEventObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]); - eventObject->singleMovementActive = FALSE; + SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]); + eventObject->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 sub_8090258 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) { - if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; return TRUE; @@ -3451,52 +3378,51 @@ bool8 sub_8090258 (struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -bool8 sub_8090288 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) { - u8 directions[2]; u8 direction; - - memcpy(directions, gUnknown_0850D790, sizeof gUnknown_0850D790); - direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_EAST_WEST); + u8 directions[2]; + memcpy(directions, gLeftAndRightDirections, sizeof gLeftAndRightDirections); + direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_EAST_WEST); if (direction == 0) { - direction = directions[Random() & 0x01]; + direction = directions[Random() & 1]; } - EventObjectSetDirection(eventObject, direction); + SetEventObjectDirection(eventObject, direction); sprite->data[1] = 1; return TRUE; } -field_object_step(RandomlyLookNorthOrWest, gUnknown_0850D7DC) +movement_type_def(MovementType_FaceUpAndLeft, gMovementTypeFuncs_FaceUpAndLeft) -bool8 sub_8090314 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(eventObject, sprite); + ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_8090328 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); + EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_8090354 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step2(struct EventObject *eventObject, struct Sprite *sprite) { - if (EventObjectExecRegularAnim(eventObject, sprite)) + if (EventObjectExecSingleMovementAction(eventObject, sprite)) { - SetEventObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); - eventObject->singleMovementActive = FALSE; + SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); + eventObject->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 sub_8090398 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step3(struct EventObject *eventObject, struct Sprite *sprite) { - if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; return TRUE; @@ -3504,52 +3430,51 @@ bool8 sub_8090398 (struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -bool8 sub_80903C8 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step4(struct EventObject *eventObject, struct Sprite *sprite) { - u8 directions[2]; u8 direction; - - memcpy(directions, gUnknown_0850D7F0, sizeof gUnknown_0850D7F0); - direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_NORTH_WEST); + u8 directions[2]; + memcpy(directions, gUpAndLeftDirections, sizeof gUpAndLeftDirections); + direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_WEST); if (direction == 0) { - direction = directions[Random() & 0x01]; + direction = directions[Random() & 1]; } - EventObjectSetDirection(eventObject, direction); + SetEventObjectDirection(eventObject, direction); sprite->data[1] = 1; return TRUE; } -field_object_step(RandomlyLookNorthOrEast, gUnknown_0850D7F4) +movement_type_def(MovementType_FaceUpAndRight, gMovementTypeFuncs_FaceUpAndRight) -bool8 sub_8090454 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(eventObject, sprite); + ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_8090468 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); + EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_8090494 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) { - if (EventObjectExecRegularAnim(eventObject, sprite)) + if (EventObjectExecSingleMovementAction(eventObject, sprite)) { - SetEventObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); - eventObject->singleMovementActive = FALSE; + SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); + eventObject->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 sub_80904D8 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) { - if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; return TRUE; @@ -3557,52 +3482,51 @@ bool8 sub_80904D8 (struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -bool8 sub_8090508 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) { - u8 directions[2]; u8 direction; - - memcpy(directions, gUnknown_0850D808, sizeof gUnknown_0850D808); - direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_NORTH_EAST); + u8 directions[2]; + memcpy(directions, gUpAndRightDirections, sizeof gUpAndRightDirections); + direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_EAST); if (direction == 0) { - direction = directions[Random() & 0x01]; + direction = directions[Random() & 1]; } - EventObjectSetDirection(eventObject, direction); + SetEventObjectDirection(eventObject, direction); sprite->data[1] = 1; return TRUE; } -field_object_step(RandomlyLookSouthOrWest, gUnknown_0850D80C) +movement_type_def(MovementType_FaceDownAndLeft, gMovementTypeFuncs_FaceDownAndLeft) -bool8 sub_8090594 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(eventObject, sprite); + ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_80905A8 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); + EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_80905D4 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step2(struct EventObject *eventObject, struct Sprite *sprite) { - if (EventObjectExecRegularAnim(eventObject, sprite)) + if (EventObjectExecSingleMovementAction(eventObject, sprite)) { - SetEventObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); - eventObject->singleMovementActive = FALSE; + SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); + eventObject->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 sub_8090618 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step3(struct EventObject *eventObject, struct Sprite *sprite) { - if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; return TRUE; @@ -3610,52 +3534,51 @@ bool8 sub_8090618 (struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -bool8 sub_8090648 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step4(struct EventObject *eventObject, struct Sprite *sprite) { - u8 directions[2]; u8 direction; - - memcpy(directions, gUnknown_0850D820, sizeof gUnknown_0850D820); - direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_SOUTH_WEST); + u8 directions[2]; + memcpy(directions, gDownAndLeftDirections, sizeof gDownAndLeftDirections); + direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_SOUTH_WEST); if (direction == 0) { - direction = directions[Random() & 0x01]; + direction = directions[Random() & 1]; } - EventObjectSetDirection(eventObject, direction); + SetEventObjectDirection(eventObject, direction); sprite->data[1] = 1; return TRUE; } -field_object_step(RandomlyLookSouthOrEast, gUnknown_0850D824) +movement_type_def(MovementType_FaceDownAndRight, gMovementTypeFuncs_FaceDownAndRight) -bool8 sub_80906D4 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(eventObject, sprite); + ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_80906E8 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); + EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_8090714 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) { - if (EventObjectExecRegularAnim(eventObject, sprite)) + if (EventObjectExecSingleMovementAction(eventObject, sprite)) { - SetEventObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); - eventObject->singleMovementActive = FALSE; + SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); + eventObject->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 sub_8090758 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) { - if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; return TRUE; @@ -3663,52 +3586,51 @@ bool8 sub_8090758 (struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -bool8 sub_8090788 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) { - u8 directions[2]; u8 direction; - - memcpy(directions, gUnknown_0850D838, sizeof gUnknown_0850D838); - direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_SOUTH_EAST); + u8 directions[2]; + memcpy(directions, gDownAndRightDirections, sizeof gDownAndRightDirections); + direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_SOUTH_EAST); if (direction == 0) { - direction = directions[Random() & 0x01]; + direction = directions[Random() & 1]; } - EventObjectSetDirection(eventObject, direction); + SetEventObjectDirection(eventObject, direction); sprite->data[1] = 1; return TRUE; } -field_object_step(RandomlyLookNorthOrSouthOrWest, gUnknown_0850D83C) +movement_type_def(MovementType_FaceDownUpAndLeft, gMovementTypeFuncs_FaceDownUpAndLeft) -bool8 sub_8090814 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(eventObject, sprite); + ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_8090828 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); + EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_8090854 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step2(struct EventObject *eventObject, struct Sprite *sprite) { - if (EventObjectExecRegularAnim(eventObject, sprite)) + if (EventObjectExecSingleMovementAction(eventObject, sprite)) { - SetEventObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); - eventObject->singleMovementActive = FALSE; + SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); + eventObject->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 sub_8090898 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step3(struct EventObject *eventObject, struct Sprite *sprite) { - if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; return TRUE; @@ -3716,52 +3638,51 @@ bool8 sub_8090898 (struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -bool8 sub_80908C8 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step4(struct EventObject *eventObject, struct Sprite *sprite) { + u8 direction; u8 directions[4]; - u8 direction; - - memcpy(directions, gUnknown_0850D850, sizeof gUnknown_0850D850); - direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_NORTH_SOUTH_WEST); + memcpy(directions, gDownUpAndLeftDirections, sizeof gDownUpAndLeftDirections); + direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_SOUTH_WEST); if (direction == 0) { - direction = directions[Random() & 0x03]; + direction = directions[Random() & 3]; } - EventObjectSetDirection(eventObject, direction); + SetEventObjectDirection(eventObject, direction); sprite->data[1] = 1; return TRUE; } -field_object_step(RandomlyLookNorthOrSouthOrEast, gUnknown_0850D854) +movement_type_def(MovementType_FaceDownUpAndRight, gMovementTypeFuncs_FaceDownUpAndRight) -bool8 sub_8090954 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(eventObject, sprite); + ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_8090968 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); + EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_8090994 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) { - if (EventObjectExecRegularAnim(eventObject, sprite)) + if (EventObjectExecSingleMovementAction(eventObject, sprite)) { - SetEventObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); - eventObject->singleMovementActive = FALSE; + SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); + eventObject->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 sub_80909D8 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) { - if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; return TRUE; @@ -3769,52 +3690,51 @@ bool8 sub_80909D8 (struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -bool8 sub_8090A08 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) { - u8 directions[4]; u8 direction; - - memcpy(directions, gUnknown_0850D868, sizeof gUnknown_0850D868); - direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_NORTH_SOUTH_EAST); + u8 directions[4]; + memcpy(directions, gDownUpAndRightDirections, sizeof gDownUpAndRightDirections); + direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_SOUTH_EAST); if (direction == 0) { - direction = directions[Random() & 0x03]; + direction = directions[Random() & 3]; } - EventObjectSetDirection(eventObject, direction); + SetEventObjectDirection(eventObject, direction); sprite->data[1] = 1; return TRUE; } -field_object_step(RandomlyLookNorthOrEastOrWest, gUnknown_0850D86C) +movement_type_def(MovementType_FaceUpRightAndLeft, gMovementTypeFuncs_FaceUpLeftAndRight) -bool8 sub_8090A94 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(eventObject, sprite); + ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_8090AA8 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); + EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_8090AD4 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) { - if (EventObjectExecRegularAnim(eventObject, sprite)) + if (EventObjectExecSingleMovementAction(eventObject, sprite)) { - SetEventObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); - eventObject->singleMovementActive = FALSE; + SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); + eventObject->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 sub_8090B18 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) { - if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; return TRUE; @@ -3822,52 +3742,51 @@ bool8 sub_8090B18 (struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -bool8 sub_8090B48 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) { - u8 directions[4]; u8 direction; - - memcpy(directions, gUnknown_0850D880, sizeof gUnknown_0850D880); - direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_NORTH_EAST_WEST); + u8 directions[4]; + memcpy(directions, gUpLeftAndRightDirections, sizeof gUpLeftAndRightDirections); + direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_EAST_WEST); if (direction == 0) { - direction = directions[Random() & 0x03]; + direction = directions[Random() & 3]; } - EventObjectSetDirection(eventObject, direction); + SetEventObjectDirection(eventObject, direction); sprite->data[1] = 1; return TRUE; } -field_object_step(RandomlyLookSouthOrEastOrWest, gUnknown_0850D884) +movement_type_def(MovementType_FaceDownRightAndLeft, gMovementTypeFuncs_FaceDownLeftAndRight) -bool8 sub_8090BD4 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(eventObject, sprite); + ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_8090BE8 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); + EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 sub_8090C14 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) { - if (EventObjectExecRegularAnim(eventObject, sprite)) + if (EventObjectExecSingleMovementAction(eventObject, sprite)) { - SetEventObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]); - eventObject->singleMovementActive = FALSE; + SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); + eventObject->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 sub_8090C58 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) { - if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; return TRUE; @@ -3875,122 +3794,119 @@ bool8 sub_8090C58 (struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -bool8 sub_8090C88 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) { - u8 directions[4]; u8 direction; - - memcpy(directions, gUnknown_0850D898, sizeof gUnknown_0850D898); - direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_SOUTH_EAST_WEST); + u8 directions[4]; + memcpy(directions, gDownLeftAndRightDirections, sizeof gDownLeftAndRightDirections); + direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_SOUTH_EAST_WEST); if (direction == 0) { - direction = directions[Random() & 0x03]; + direction = directions[Random() & 3]; } - EventObjectSetDirection(eventObject, direction); + SetEventObjectDirection(eventObject, direction); sprite->data[1] = 1; return TRUE; } -field_object_step(LookAroundCounterclockwise, gUnknown_0850D89C) +movement_type_def(MovementType_RotateCounterclockwise, gMovementTypeFuncs_RotateCounterclockwise) -bool8 sub_8090D14 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateCounterclockwise_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(eventObject, sprite); - EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); + ClearEventObjectMovement(eventObject, sprite); + EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 1; return TRUE; } -bool8 sub_8090D40 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateCounterclockwise_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - if (EventObjectExecRegularAnim(eventObject, sprite)) + if (EventObjectExecSingleMovementAction(eventObject, sprite)) { - SetEventObjectStepTimer(sprite, 48); + SetMovementDelay(sprite, 48); sprite->data[1] = 2; } return FALSE; } -bool8 sub_8090D64 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateCounterclockwise_Step2(struct EventObject *eventObject, struct Sprite *sprite) { - if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 3; } return FALSE; } -bool8 sub_8090D90 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateCounterclockwise_Step3(struct EventObject *eventObject, struct Sprite *sprite) { - u8 directions[5]; u8 direction; - - memcpy(directions, gUnknown_0850D8AC, sizeof gUnknown_0850D8AC); - direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_ANY); + u8 directions[5]; + memcpy(directions, gCounterclockwiseDirections, sizeof gCounterclockwiseDirections); + direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_ANY); if (direction == 0) { direction = directions[eventObject->facingDirection]; } - EventObjectSetDirection(eventObject, direction); + SetEventObjectDirection(eventObject, direction); sprite->data[1] = 0; return TRUE; } -field_object_step(LookAroundClockwise, gUnknown_0850D8B4) +movement_type_def(MovementType_RotateClockwise, gMovementTypeFuncs_RotateClockwise) -bool8 sub_8090E18 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateClockwise_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(eventObject, sprite); - EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); + ClearEventObjectMovement(eventObject, sprite); + EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 1; return TRUE; } -bool8 sub_8090E44 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateClockwise_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - if (EventObjectExecRegularAnim(eventObject, sprite)) + if (EventObjectExecSingleMovementAction(eventObject, sprite)) { - SetEventObjectStepTimer(sprite, 48); + SetMovementDelay(sprite, 48); sprite->data[1] = 2; } return FALSE; } -bool8 sub_8090E68 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateClockwise_Step2(struct EventObject *eventObject, struct Sprite *sprite) { - if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 3; } return FALSE; } -bool8 sub_8090E94 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateClockwise_Step3(struct EventObject *eventObject, struct Sprite *sprite) { - u8 directions[5]; u8 direction; - - memcpy(directions, gUnknown_0850D8C4, sizeof gUnknown_0850D8C4); - direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_ANY); + u8 directions[5]; + memcpy(directions, gClockwiseDirections, sizeof gClockwiseDirections); + direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_ANY); if (direction == 0) { direction = directions[eventObject->facingDirection]; } - EventObjectSetDirection(eventObject, direction); + SetEventObjectDirection(eventObject, direction); sprite->data[1] = 0; return TRUE; } -field_object_step(AlternatelyGoInOppositeDirections, gUnknown_0850D8CC) +movement_type_def(MovementType_WalkBackAndForth, gMovementTypeFuncs_WalkBackAndForth) -bool8 sub_8090F1C (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkBackAndForth_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(eventObject, sprite); + ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 sub_8090F30 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkBackAndForth_Step1(struct EventObject *eventObject, struct Sprite *sprite) { u8 direction; @@ -3999,167 +3915,454 @@ bool8 sub_8090F30 (struct EventObject *eventObject, struct Sprite *sprite) { direction = GetOppositeDirection(direction); } - EventObjectSetDirection(eventObject, direction); + SetEventObjectDirection(eventObject, direction); sprite->data[1] = 2; return TRUE; } -bool8 sub_8090F68 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkBackAndForth_Step2(struct EventObject *eventObject, struct Sprite *sprite) { - bool8 blockingWay; - u8 animId; + bool8 collisionState; + u8 movementActionId; if (eventObject->directionSequenceIndex && eventObject->initialCoords.x == eventObject->currentCoords.x && eventObject->initialCoords.y == eventObject->currentCoords.y) { eventObject->directionSequenceIndex = 0; - EventObjectSetDirection(eventObject, GetOppositeDirection(eventObject->movementDirection)); + SetEventObjectDirection(eventObject, GetOppositeDirection(eventObject->movementDirection)); } - blockingWay = npc_block_way__next_tile(eventObject, eventObject->movementDirection); - animId = GetGoSpeed0AnimId(eventObject->movementDirection); - if (blockingWay == TRUE) + collisionState = GetCollisionInDirection(eventObject, eventObject->movementDirection); + movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection); + if (collisionState == TRUE) { - eventObject->directionSequenceIndex ++; - EventObjectSetDirection(eventObject, GetOppositeDirection(eventObject->movementDirection)); - animId = GetGoSpeed0AnimId(eventObject->movementDirection); - blockingWay = npc_block_way__next_tile(eventObject, eventObject->movementDirection); + eventObject->directionSequenceIndex++; + SetEventObjectDirection(eventObject, GetOppositeDirection(eventObject->movementDirection)); + movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection); + collisionState = GetCollisionInDirection(eventObject, eventObject->movementDirection); } - if (blockingWay) + if (collisionState) { - animId = GetStepInPlaceDelay16AnimId(eventObject->facingDirection); + movementActionId = GetWalkInPlaceNormalMovementAction(eventObject->facingDirection); } - EventObjectSetRegularAnim(eventObject, sprite, animId); - eventObject->singleMovementActive = TRUE; + EventObjectSetSingleMovement(eventObject, sprite, movementActionId); + eventObject->singleMovementActive = 1; sprite->data[1] = 3; return TRUE; } -bool8 sub_8091020 (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkBackAndForth_Step3(struct EventObject *eventObject, struct Sprite *sprite) { - if (EventObjectExecRegularAnim(eventObject, sprite)) + if (EventObjectExecSingleMovementAction(eventObject, sprite)) { - eventObject->singleMovementActive = FALSE; + eventObject->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; } -bool8 sub_8091048(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkSequence_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(eventObject, sprite); + ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MoveEventObjectInNextDirectionInSequence(struct EventObject *eventObject, struct Sprite *sprite, u8 *route) +bool8 MoveNextDirectionInSequence(struct EventObject *eventObject, struct Sprite *sprite, u8 *route) { - u8 blockingWay; - u8 animId; + u8 collisionState; + u8 movementActionId; if (eventObject->directionSequenceIndex == 3 && eventObject->initialCoords.x == eventObject->currentCoords.x && eventObject->initialCoords.y == eventObject->currentCoords.y) { eventObject->directionSequenceIndex = 0; } - EventObjectSetDirection(eventObject, route[eventObject->directionSequenceIndex]); - animId = GetGoSpeed0AnimId(eventObject->movementDirection); - blockingWay = npc_block_way__next_tile(eventObject, eventObject->movementDirection); - if (blockingWay == TRUE) + SetEventObjectDirection(eventObject, route[eventObject->directionSequenceIndex]); + movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection); + collisionState = GetCollisionInDirection(eventObject, eventObject->movementDirection); + if (collisionState == TRUE) { - eventObject->directionSequenceIndex ++; - EventObjectSetDirection(eventObject, route[eventObject->directionSequenceIndex]); - animId = GetGoSpeed0AnimId(eventObject->movementDirection); - blockingWay = npc_block_way__next_tile(eventObject, eventObject->movementDirection); + eventObject->directionSequenceIndex++; + SetEventObjectDirection(eventObject, route[eventObject->directionSequenceIndex]); + movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection); + collisionState = GetCollisionInDirection(eventObject, eventObject->movementDirection); } - if (blockingWay) + if (collisionState) { - animId = GetStepInPlaceDelay16AnimId(eventObject->facingDirection); + movementActionId = GetWalkInPlaceNormalMovementAction(eventObject->facingDirection); } - EventObjectSetRegularAnim(eventObject, sprite, animId); - eventObject->singleMovementActive = TRUE; + EventObjectSetSingleMovement(eventObject, sprite, movementActionId); + eventObject->singleMovementActive = 1; sprite->data[1] = 2; return TRUE; } -bool8 sub_8091110(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkSequence_Step2(struct EventObject *eventObject, struct Sprite *sprite) { - if (EventObjectExecRegularAnim(eventObject, sprite)) + if (EventObjectExecSingleMovementAction(eventObject, sprite)) { - eventObject->singleMovementActive = FALSE; + eventObject->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; } -field_object_path( 1, gUnknown_0850D8DC, sub_809117C, gUnknown_0850D8E8, 2, x) -field_object_path( 2, gUnknown_0850D8EC, sub_8091208, gUnknown_0850D8F8, 1, x) -field_object_path( 3, gUnknown_0850D8FC, sub_8091294, gUnknown_0850D908, 1, y) -field_object_path( 4, gUnknown_0850D90C, sub_8091320, gUnknown_0850D918, 2, y) -field_object_path( 5, gUnknown_0850D91C, sub_80913AC, gUnknown_0850D928, 2, x) -field_object_path( 6, gUnknown_0850D92C, sub_8091438, gUnknown_0850D938, 1, x) -field_object_path( 7, gUnknown_0850D93C, sub_80914C4, gUnknown_0850D710, 1, y) -field_object_path( 8, gUnknown_0850D948, sub_8091550, gUnknown_0850D954, 2, y) -field_object_path( 9, gUnknown_0850D958, sub_80915DC, gUnknown_0850D964, 2, y) -field_object_path(10, gUnknown_0850D968, sub_8091668, gUnknown_0850D974, 1, y) -field_object_path(11, gUnknown_0850D978, sub_80916F4, gUnknown_0850D984, 1, x) -field_object_path(12, gUnknown_0850D988, sub_8091780, gUnknown_0850D994, 2, x) -field_object_path(13, gUnknown_0850D998, sub_809180C, gUnknown_0850D9A4, 2, y) -field_object_path(14, gUnknown_0850D9A8, sub_8091898, gUnknown_0850D9B4, 1, y) -field_object_path(15, gUnknown_0850D9B8, sub_8091924, gUnknown_0850D9C4, 1, x) -field_object_path(16, gUnknown_0850D9C8, sub_80919B0, gUnknown_0850D9D4, 2, x) -field_object_path(17, gUnknown_0850D9D8, sub_8091A3C, gUnknown_0850D9E4, 2, y) -field_object_path(18, gUnknown_0850D9E8, sub_8091AC8, gUnknown_0850D9F4, 2, y) -field_object_path(19, gUnknown_0850D9F8, sub_8091B54, gUnknown_0850DA04, 2, x) -field_object_path(20, gUnknown_0850DA08, sub_8091BE0, gUnknown_0850DA14, 2, x) -field_object_path(21, gUnknown_0850DA18, sub_8091C6C, gUnknown_0850DA24, 2, y) -field_object_path(22, gUnknown_0850DA28, sub_8091CF8, gUnknown_0850DA34, 2, y) -field_object_path(23, gUnknown_0850DA38, sub_8091D84, gUnknown_0850DA44, 2, x) -field_object_path(24, gUnknown_0850DA48, sub_8091E10, gUnknown_0850DA54, 2, x) +movement_type_def(MovementType_WalkSequenceUpRightLeftDown, gMovementTypeFuncs_WalkSequenceUpRightLeftDown) -field_object_step(CopyPlayer1, gUnknown_0850DA58) - -bool8 mss_npc_reset_oampriv3_1_unk2_unk3(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(eventObject, sprite); + u8 directions[sizeof(gUpRightLeftDownDirections)]; + memcpy(directions, gUpRightLeftDownDirections, sizeof(gUpRightLeftDownDirections)); + if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + { + eventObject->directionSequenceIndex = 3; + } + return MoveNextDirectionInSequence(eventObject, sprite, directions); +} + +movement_type_def(MovementType_WalkSequenceRightLeftDownUp, gMovementTypeFuncs_WalkSequenceRightLeftDownUp) + +u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + u8 directions[sizeof(gRightLeftDownUpDirections)]; + memcpy(directions, gRightLeftDownUpDirections, sizeof(gRightLeftDownUpDirections)); + if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x) + { + eventObject->directionSequenceIndex = 2; + } + return MoveNextDirectionInSequence(eventObject, sprite, directions); +} + +movement_type_def(MovementType_WalkSequenceDownUpRightLeft, gMovementTypeFuncs_WalkSequenceDownUpRightLeft) + +u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + u8 directions[sizeof(gDownUpRightLeftDirections)]; + memcpy(directions, gDownUpRightLeftDirections, sizeof(gDownUpRightLeftDirections)); + if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y) + { + eventObject->directionSequenceIndex = 2; + } + return MoveNextDirectionInSequence(eventObject, sprite, directions); +} + +movement_type_def(MovementType_WalkSequenceLeftDownUpRight, gMovementTypeFuncs_WalkSequenceLeftDownUpRight) + +u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + u8 directions[sizeof(gLeftDownUpRightDirections)]; + memcpy(directions, gLeftDownUpRightDirections, sizeof(gLeftDownUpRightDirections)); + if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + { + eventObject->directionSequenceIndex = 3; + } + return MoveNextDirectionInSequence(eventObject, sprite, directions); +} + +movement_type_def(MovementType_WalkSequenceUpLeftRightDown, gMovementTypeFuncs_WalkSequenceUpLeftRightDown) + +u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + u8 directions[sizeof(gUpLeftRightDownDirections)]; + memcpy(directions, gUpLeftRightDownDirections, sizeof(gUpLeftRightDownDirections)); + if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + { + eventObject->directionSequenceIndex = 3; + } + return MoveNextDirectionInSequence(eventObject, sprite, directions); +} + +movement_type_def(MovementType_WalkSequenceLeftRightDownUp, gMovementTypeFuncs_WalkSequenceLeftRightDownUp) + +u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + u8 directions[sizeof(gLeftRightDownUpDirections)]; + memcpy(directions, gLeftRightDownUpDirections, sizeof(gLeftRightDownUpDirections)); + if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x) + { + eventObject->directionSequenceIndex = 2; + } + return MoveNextDirectionInSequence(eventObject, sprite, directions); +} + +movement_type_def(MovementType_WalkSequenceDownUpLeftRight, gMovementTypeFuncs_WalkSequenceDownUpLeftRight) + +u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + u8 directions[sizeof(gStandardDirections)]; + memcpy(directions, gStandardDirections, sizeof(gStandardDirections)); + if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y) + { + eventObject->directionSequenceIndex = 2; + } + return MoveNextDirectionInSequence(eventObject, sprite, directions); +} + +movement_type_def(MovementType_WalkSequenceRightDownUpLeft, gMovementTypeFuncs_WalkSequenceRightDownUpLeft) + +u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + u8 directions[sizeof(gRightDownUpLeftDirections)]; + memcpy(directions, gRightDownUpLeftDirections, sizeof(gRightDownUpLeftDirections)); + if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + { + eventObject->directionSequenceIndex = 3; + } + return MoveNextDirectionInSequence(eventObject, sprite, directions); +} + +movement_type_def(MovementType_WalkSequenceLeftUpDownRight, gMovementTypeFuncs_WalkSequenceLeftUpDownRight) + +u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + u8 directions[sizeof(gLeftUpDownRightDirections)]; + memcpy(directions, gLeftUpDownRightDirections, sizeof(gLeftUpDownRightDirections)); + if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + { + eventObject->directionSequenceIndex = 3; + } + return MoveNextDirectionInSequence(eventObject, sprite, directions); +} + +movement_type_def(MovementType_WalkSequenceUpDownRightLeft, gMovementTypeFuncs_WalkSequenceUpDownRightLeft) + +u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + u8 directions[sizeof(gUpDownRightLeftDirections)]; + memcpy(directions, gUpDownRightLeftDirections, sizeof(gUpDownRightLeftDirections)); + if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y) + { + eventObject->directionSequenceIndex = 2; + } + return MoveNextDirectionInSequence(eventObject, sprite, directions); +} + +movement_type_def(MovementType_WalkSequenceRightLeftUpDown, gMovementTypeFuncs_WalkSequenceRightLeftUpDown) + +u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + u8 directions[sizeof(gRightLeftUpDownDirections)]; + memcpy(directions, gRightLeftUpDownDirections, sizeof(gRightLeftUpDownDirections)); + if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x) + { + eventObject->directionSequenceIndex = 2; + } + return MoveNextDirectionInSequence(eventObject, sprite, directions); +} + +movement_type_def(MovementType_WalkSequenceDownRightLeftUp, gMovementTypeFuncs_WalkSequenceDownRightLeftUp) + +u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + u8 directions[sizeof(gDownRightLeftUpDirections)]; + memcpy(directions, gDownRightLeftUpDirections, sizeof(gDownRightLeftUpDirections)); + if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + { + eventObject->directionSequenceIndex = 3; + } + return MoveNextDirectionInSequence(eventObject, sprite, directions); +} + +movement_type_def(MovementType_WalkSequenceRightUpDownLeft, gMovementTypeFuncs_WalkSequenceRightUpDownLeft) + +u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + u8 directions[sizeof(gRightUpDownLeftDirections)]; + memcpy(directions, gRightUpDownLeftDirections, sizeof(gRightUpDownLeftDirections)); + if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + { + eventObject->directionSequenceIndex = 3; + } + return MoveNextDirectionInSequence(eventObject, sprite, directions); +} + +movement_type_def(MovementType_WalkSequenceUpDownLeftRight, gMovementTypeFuncs_WalkSequenceUpDownLeftRight) + +u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + u8 directions[sizeof(gUpDownLeftRightDirections)]; + memcpy(directions, gUpDownLeftRightDirections, sizeof(gUpDownLeftRightDirections)); + if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y) + { + eventObject->directionSequenceIndex = 2; + } + return MoveNextDirectionInSequence(eventObject, sprite, directions); +} + +movement_type_def(MovementType_WalkSequenceLeftRightUpDown, gMovementTypeFuncs_WalkSequenceLeftRightUpDown) + +u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + u8 directions[sizeof(gLeftRightUpDownDirections)]; + memcpy(directions, gLeftRightUpDownDirections, sizeof(gLeftRightUpDownDirections)); + if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x) + { + eventObject->directionSequenceIndex = 2; + } + return MoveNextDirectionInSequence(eventObject, sprite, directions); +} + +movement_type_def(MovementType_WalkSequenceDownLeftRightUp, gMovementTypeFuncs_WalkSequenceDownLeftRightUp) + +u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + u8 directions[sizeof(gDownLeftRightUpDirections)]; + memcpy(directions, gDownLeftRightUpDirections, sizeof(gDownLeftRightUpDirections)); + if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + { + eventObject->directionSequenceIndex = 3; + } + return MoveNextDirectionInSequence(eventObject, sprite, directions); +} + +movement_type_def(MovementType_WalkSequenceUpLeftDownRight, gMovementTypeFuncs_WalkSequenceUpLeftDownRight) + +u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + u8 directions[sizeof(gUpLeftDownRightDirections)]; + memcpy(directions, gUpLeftDownRightDirections, sizeof(gUpLeftDownRightDirections)); + if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + { + eventObject->directionSequenceIndex = 3; + } + return MoveNextDirectionInSequence(eventObject, sprite, directions); +} + +movement_type_def(MovementType_WalkSequenceDownRightUpLeft, gMovementTypeFuncs_WalkSequenceDownRightUpLeft) + +u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + u8 directions[sizeof(gDownRightUpLeftDirections)]; + memcpy(directions, gDownRightUpLeftDirections, sizeof(gDownRightUpLeftDirections)); + if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + { + eventObject->directionSequenceIndex = 3; + } + return MoveNextDirectionInSequence(eventObject, sprite, directions); +} + +movement_type_def(MovementType_WalkSequenceLeftDownRightUp, gMovementTypeFuncs_WalkSequenceLeftDownRightUp) + +u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + u8 directions[sizeof(gLeftDownRightUpDirections)]; + memcpy(directions, gLeftDownRightUpDirections, sizeof(gLeftDownRightUpDirections)); + if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + { + eventObject->directionSequenceIndex = 3; + } + return MoveNextDirectionInSequence(eventObject, sprite, directions); +} + +movement_type_def(MovementType_WalkSequenceRightUpLeftDown, gMovementTypeFuncs_WalkSequenceRightUpLeftDown) + +u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + u8 directions[sizeof(gRightUpLeftDownDirections)]; + memcpy(directions, gRightUpLeftDownDirections, sizeof(gRightUpLeftDownDirections)); + if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + { + eventObject->directionSequenceIndex = 3; + } + return MoveNextDirectionInSequence(eventObject, sprite, directions); +} + +movement_type_def(MovementType_WalkSequenceUpRightDownLeft, gMovementTypeFuncs_WalkSequenceUpRightDownLeft) + +u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + u8 directions[sizeof(gUpRightDownLeftDirections)]; + memcpy(directions, gUpRightDownLeftDirections, sizeof(gUpRightDownLeftDirections)); + if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + { + eventObject->directionSequenceIndex = 3; + } + return MoveNextDirectionInSequence(eventObject, sprite, directions); +} + +movement_type_def(MovementType_WalkSequenceDownLeftUpRight, gMovementTypeFuncs_WalkSequenceDownLeftUpRight) + +u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + u8 directions[sizeof(gDownLeftUpRightDirections)]; + memcpy(directions, gDownLeftUpRightDirections, sizeof(gDownLeftUpRightDirections)); + if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + { + eventObject->directionSequenceIndex = 3; + } + return MoveNextDirectionInSequence(eventObject, sprite, directions); +} + +movement_type_def(MovementType_WalkSequenceLeftUpRightDown, gMovementTypeFuncs_WalkSequenceLeftUpRightDown) + +u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + u8 directions[sizeof(gLeftUpRightDownDirections)]; + memcpy(directions, gLeftUpRightDownDirections, sizeof(gLeftUpRightDownDirections)); + if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + { + eventObject->directionSequenceIndex = 3; + } + return MoveNextDirectionInSequence(eventObject, sprite, directions); +} + +movement_type_def(MovementType_WalkSequenceRightDownLeftUp, gMovementTypeFuncs_WalkSequenceRightDownLeftUp) + +u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + u8 directions[sizeof(gRightDownLeftUpDirections)]; + memcpy(directions, gRightDownLeftUpDirections, sizeof(gRightDownLeftUpDirections)); + if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + { + eventObject->directionSequenceIndex = 3; + } + return MoveNextDirectionInSequence(eventObject, sprite, directions); +} + +movement_type_def(MovementType_CopyPlayer, gMovementTypeFuncs_CopyPlayer) + +bool8 MovementType_CopyPlayer_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + ClearEventObjectMovement(eventObject, sprite); if (eventObject->directionSequenceIndex == 0) { - eventObject->directionSequenceIndex = player_get_direction_lower_nybble(); + eventObject->directionSequenceIndex = GetPlayerFacingDirection(); } sprite->data[1] = 1; return TRUE; } -bool8 sub_8091EC0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_CopyPlayer_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == 2) + if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) { return FALSE; } - return gUnknown_0850DA64[player_get_x22()](eventObject, sprite, player_get_direction_upper_nybble(), NULL); + return gCopyPlayerMovementFuncs[PlayerGetCopyableMovement()](eventObject, sprite, GetPlayerMovementDirection(), NULL); } -bool8 sub_8091F20(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_CopyPlayer_Step2(struct EventObject *eventObject, struct Sprite *sprite) { - if (EventObjectExecRegularAnim(eventObject, sprite)) + if (EventObjectExecSingleMovementAction(eventObject, sprite)) { - eventObject->singleMovementActive = FALSE; + eventObject->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; } -bool8 sub_8091F48(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) +bool8 CopyablePlayerMovement_None(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { return FALSE; } -bool8 sub_8091F4C(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) +bool8 CopyablePlayerMovement_FaceDirection(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { - EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, playerDirection))); - eventObject->singleMovementActive = TRUE; + EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, playerDirection))); + eventObject->singleMovementActive = 1; sprite->data[1] = 2; return TRUE; } -bool8 sub_8091F94(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) +bool8 CopyablePlayerMovement_GoSpeed0(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; @@ -4174,8 +4377,8 @@ bool8 sub_8091F94(struct EventObject *eventObject, struct Sprite *sprite, u8 pla direction = playerDirection; direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(direction)); - eventObject->singleMovementActive = TRUE; + EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); + eventObject->singleMovementActive = 1; sprite->data[1] = 2; return TRUE; } @@ -4185,17 +4388,17 @@ bool8 sub_8091F94(struct EventObject *eventObject, struct Sprite *sprite, u8 pla direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); } EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetRegularAnim(eventObject, sprite, GetGoSpeed0AnimId(direction)); - if (npc_block_way(eventObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) + EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(direction)); + if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(direction)); + EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = TRUE; + eventObject->singleMovementActive = 1; sprite->data[1] = 2; return TRUE; } -bool8 sub_80920A4(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) +bool8 CopyablePlayerMovement_GoSpeed1(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; @@ -4204,17 +4407,17 @@ bool8 sub_80920A4(struct EventObject *eventObject, struct Sprite *sprite, u8 pla direction = playerDirection; direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetRegularAnim(eventObject, sprite, GetGoSpeed1AnimId(direction)); - if (npc_block_way(eventObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) + EventObjectSetSingleMovement(eventObject, sprite, GetWalkFastMovementAction(direction)); + if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(direction)); + EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = TRUE; + eventObject->singleMovementActive = 1; sprite->data[1] = 2; return TRUE; } -bool8 sub_809215C(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) +bool8 CopyablePlayerMovement_GoSpeed2(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; @@ -4223,17 +4426,17 @@ bool8 sub_809215C(struct EventObject *eventObject, struct Sprite *sprite, u8 pla direction = playerDirection; direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetRegularAnim(eventObject, sprite, GetGoSpeed3AnimId(direction)); - if (npc_block_way(eventObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) + EventObjectSetSingleMovement(eventObject, sprite, GetWalkFastestMovementAction(direction)); + if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(direction)); + EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = TRUE; + eventObject->singleMovementActive = 1; sprite->data[1] = 2; return TRUE; } -bool8 sub_8092214(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) +bool8 CopyablePlayerMovement_Slide(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; @@ -4242,29 +4445,29 @@ bool8 sub_8092214(struct EventObject *eventObject, struct Sprite *sprite, u8 pla direction = playerDirection; direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetRegularAnim(eventObject, sprite, sub_8093438(direction)); - if (npc_block_way(eventObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) + EventObjectSetSingleMovement(eventObject, sprite, GetSlideMovementAction(direction)); + if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(direction)); + EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = TRUE; + eventObject->singleMovementActive = 1; sprite->data[1] = 2; return TRUE; } -bool8 cph_IM_DIFFERENT(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) +bool8 cph_IM_DIFFERENT(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; direction = playerDirection; direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - EventObjectSetRegularAnim(eventObject, sprite, sub_80934BC(direction)); - eventObject->singleMovementActive = TRUE; + EventObjectSetSingleMovement(eventObject, sprite, GetJumpInPlaceMovementAction(direction)); + eventObject->singleMovementActive = 1; sprite->data[1] = 2; return TRUE; } -bool8 sub_8092314(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) +bool8 CopyablePlayerMovement_GoSpeed4(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; @@ -4273,17 +4476,17 @@ bool8 sub_8092314(struct EventObject *eventObject, struct Sprite *sprite, u8 pla direction = playerDirection; direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetRegularAnim(eventObject, sprite, sub_8093514(direction)); - if (npc_block_way(eventObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) + EventObjectSetSingleMovement(eventObject, sprite, GetJumpMovementAction(direction)); + if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(direction)); + EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = TRUE; + eventObject->singleMovementActive = 1; sprite->data[1] = 2; return TRUE; } -bool8 oac_hopping(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8)) +bool8 CopyablePlayerMovement_Jump(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; @@ -4293,31 +4496,29 @@ bool8 oac_hopping(struct EventObject *eventObject, struct Sprite *sprite, u8 pla direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); x = eventObject->currentCoords.x; y = eventObject->currentCoords.y; - sub_8092F88(direction, &x, &y, 2, 2); - EventObjectSetRegularAnim(eventObject, sprite, GetJumpLedgeAnimId(direction)); - if (npc_block_way(eventObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) + MoveCoordsInDirection(direction, &x, &y, 2, 2); + EventObjectSetSingleMovement(eventObject, sprite, GetJump2MovementAction(direction)); + if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(direction)); + EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = TRUE; + eventObject->singleMovementActive = 1; sprite->data[1] = 2; return TRUE; } -field_object_step(CopyPlayer2, gUnknown_0850DA90) +movement_type_def(MovementType_CopyPlayerInGrass, gMovementTypeFuncs_CopyPlayerInGrass) -bool8 mss_08062EA4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_CopyPlayerInGrass_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == 2) + if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) { return FALSE; } - return gUnknown_0850DA64[player_get_x22()](eventObject, sprite, player_get_direction_upper_nybble(), MetatileBehavior_IsPokeGrass); + return gCopyPlayerMovementFuncs[PlayerGetCopyableMovement()](eventObject, sprite, GetPlayerMovementDirection(), MetatileBehavior_IsPokeGrass); } -bool8 sub_80925AC(struct EventObject *, struct Sprite *); - -void EventObjectCB_TreeDisguise(struct Sprite *sprite) +void MovementType_TreeDisguise(struct Sprite *sprite) { struct EventObject *eventObject; @@ -4327,18 +4528,18 @@ void EventObjectCB_TreeDisguise(struct Sprite *sprite) EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_TREE_DISGUISE); eventObject->directionSequenceIndex = 1; - sprite->data[7] ++; + sprite->data[7]++; } - EventObjectStep(&gEventObjects[sprite->data[0]], sprite, sub_80925AC); + UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Disguise_Callback); } -bool8 sub_80925AC(struct EventObject *eventObject, struct Sprite *sprite) +static bool8 MovementType_Disguise_Callback(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(eventObject, sprite); + ClearEventObjectMovement(eventObject, sprite); return FALSE; } -void EventObjectCB_MountainDisguise(struct Sprite *sprite) +void MovementType_MountainDisguise(struct Sprite *sprite) { struct EventObject *eventObject; @@ -4348,98 +4549,96 @@ void EventObjectCB_MountainDisguise(struct Sprite *sprite) EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE); eventObject->directionSequenceIndex = 1; - sprite->data[7] ++; + sprite->data[7]++; } - EventObjectStep(&gEventObjects[sprite->data[0]], sprite, sub_80925AC); + UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Disguise_Callback); } -extern bool8 (*const gUnknown_0850DA9C[])(struct EventObject *, struct Sprite *); -bool8 sub_809268C(struct EventObject *, struct Sprite *); - -void EventObjectCB_Hidden1(struct Sprite *sprite) +void MovementType_Hidden(struct Sprite *sprite) { if (!sprite->data[7]) { gEventObjects[sprite->data[0]].fixedPriority = TRUE; sprite->subspriteMode = 2; sprite->oam.priority = 3; - sprite->data[7] ++; + sprite->data[7]++; } - EventObjectStep(&gEventObjects[sprite->data[0]], sprite, sub_809268C); + UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Hidden_Callback); } -bool8 sub_809268C(struct EventObject *eventObject, struct Sprite *sprite) +static bool8 MovementType_Hidden_Callback(struct EventObject *eventObject, struct Sprite *sprite) { - return gUnknown_0850DA9C[sprite->data[1]](eventObject, sprite); + return gMovementTypeFuncs_Hidden[sprite->data[1]](eventObject, sprite); } -bool8 sub_80926AC (struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_Hidden_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(eventObject, sprite); + ClearEventObjectMovement(eventObject, sprite); return FALSE; } -bool8 sub_80926B8 (struct EventObject *eventObject, struct Sprite *sprite) + +bool8 MovementType_MoveInPlace_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - if (EventObjectExecRegularAnim(eventObject, sprite)) + if (EventObjectExecSingleMovementAction(eventObject, sprite)) { sprite->data[1] = 0; } return FALSE; } -field_object_step(WalkInPlace1, gUnknown_0850DAA0) +movement_type_def(MovementType_WalkInPlace, gMovementTypeFuncs_WalkInPlace) -bool8 sub_8092718(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(eventObject, sprite); - EventObjectSetRegularAnim(eventObject, sprite, GetStepInPlaceDelay16AnimId(eventObject->facingDirection)); + ClearEventObjectMovement(eventObject, sprite); + EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceNormalMovementAction(eventObject->facingDirection)); sprite->data[1] = 1; return TRUE; } -field_object_step(WalkInPlace4, gUnknown_0850DAA8) +movement_type_def(MovementType_WalkSlowlyInPlace, gMovementTypeFuncs_WalkSlowlyInPlace) -bool8 sub_8092788(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkSlowlyInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(eventObject, sprite); - EventObjectSetRegularAnim(eventObject, sprite, GetStepInPlaceDelay32AnimId(eventObject->facingDirection)); + ClearEventObjectMovement(eventObject, sprite); + EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceSlowMovementAction(eventObject->facingDirection)); sprite->data[1] = 1; return TRUE; } -field_object_step(WalkInPlace2, gUnknown_0850DAB0) +movement_type_def(MovementType_JogInPlace, gMovementTypeFuncs_JogInPlace) -bool8 sub_80927F8(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_JogInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(eventObject, sprite); - EventObjectSetRegularAnim(eventObject, sprite, GetStepInPlaceDelay8AnimId(eventObject->facingDirection)); + ClearEventObjectMovement(eventObject, sprite); + EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceFastMovementAction(eventObject->facingDirection)); sprite->data[1] = 1; return TRUE; } -field_object_step(WalkInPlace3, gUnknown_0850DAB8) +movement_type_def(MovementType_RunInPlace, gMovementTypeFuncs_RunInPlace) -bool8 sub_8092868(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RunInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(eventObject, sprite); - EventObjectSetRegularAnim(eventObject, sprite, GetStepInPlaceDelay4AnimId(eventObject->facingDirection)); + ClearEventObjectMovement(eventObject, sprite); + EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceFastestMovementAction(eventObject->facingDirection)); sprite->data[1] = 1; return TRUE; } -field_object_step(Hidden2, gUnknown_0850DAC0) +movement_type_def(MovementType_Invisible, gMovementTypeFuncs_Invisible) -bool8 sub_80928D8(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_Invisible_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_reset(eventObject, sprite); - EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection)); + ClearEventObjectMovement(eventObject, sprite); + EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); eventObject->invisible = TRUE; sprite->data[1] = 1; return TRUE; } -bool8 sub_809290C(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_Invisible_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - if (EventObjectExecRegularAnim(eventObject, sprite)) + if (EventObjectExecSingleMovementAction(eventObject, sprite)) { sprite->data[1] = 2; return TRUE; @@ -4447,48 +4646,101 @@ bool8 sub_809290C(struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -bool8 sub_809292C(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_Invisible_Step2(struct EventObject *eventObject, struct Sprite *sprite) { - eventObject->singleMovementActive = FALSE; + eventObject->singleMovementActive = 0; return FALSE; } -static void npc_reset(struct EventObject *eventObject, struct Sprite *sprite) +static void ClearEventObjectMovement(struct EventObject *eventObject, struct Sprite *sprite) { - eventObject->singleMovementActive = FALSE; + eventObject->singleMovementActive = 0; eventObject->heldMovementActive = FALSE; eventObject->heldMovementFinished = FALSE; eventObject->movementActionId = 0xFF; sprite->data[1] = 0; } -#define dirn2anim(name, table)\ -u8 name(u8 direction)\ -{\ - return table[direction];\ +u8 GetFaceDirectionAnimNum(u8 direction) +{ + return gFaceDirectionAnimNums[direction]; } -dirn2anim(EventObjectDirectionToImageAnimId, gUnknown_0850DACC) -dirn2anim(get_go_image_anim_num, gUnknown_0850DAD5) -dirn2anim(get_go_fast_image_anim_num, gUnknown_0850DADE) -dirn2anim(get_go_faster_image_anim_num, gUnknown_0850DAE7) -dirn2anim(get_go_fastest_image_anim_num, gUnknown_0850DAF0) -dirn2anim(sub_80929AC, gUnknown_0850DAF9) -dirn2anim(sub_80929BC, gUnknown_0850DB02) -dirn2anim(sub_80929CC, gUnknown_0850DB0B) -dirn2anim(sub_80929DC, gUnknown_0850DB14) -dirn2anim(sub_80929EC, gUnknown_0850DB1D) -dirn2anim(sub_80929FC, gUnknown_0850DB26) -dirn2anim(sub_8092A0C, gUnknown_0850DB2F) -dirn2anim(sub_8092A1C, gUnknown_0850DB38) -dirn2anim(sub_8092A2C, gUnknown_0850DB41) -dirn2anim(get_run_image_anim_num, gUnknown_0850DB4A) +u8 GetMoveDirectionAnimNum(u8 direction) +{ + return gMoveDirectionAnimNums[direction]; +} + +u8 GetMoveDirectionFastAnimNum(u8 direction) +{ + return gMoveDirectionFastAnimNums[direction]; +} + +u8 GetMoveDirectionFasterAnimNum(u8 direction) +{ + return gMoveDirectionFasterAnimNums[direction]; +} + +u8 GetMoveDirectionFastestAnimNum(u8 direction) +{ + return gMoveDirectionFastestAnimNums[direction]; +} + +u8 GetJumpSpecialDirectionAnimNum(u8 direction) +{ + return gJumpSpecialDirectionAnimNums[direction]; +} + +u8 GetAcroWheelieDirectionAnimNum(u8 direction) +{ + return gAcroWheelieDirectionAnimNums[direction]; +} + +u8 Unref_GetAnimNums_08375633(u8 direction) +{ + return gUnrefAnimNums_08375633[direction]; +} + +u8 GetAcroEndWheelieDirectionAnimNum(u8 direction) +{ + return gAcroEndWheelieDirectionAnimNums[direction]; +} + +u8 GetAcroUnusedActionDirectionAnimNum(u8 direction) +{ + return gAcroUnusedActionDirectionAnimNums[direction]; +} + +u8 GetAcroWheeliePedalDirectionAnimNum(u8 direction) +{ + return gAcroWheeliePedalDirectionAnimNums[direction]; +} + +u8 GetFishingDirectionAnimNum(u8 direction) +{ + return gFishingDirectionAnimNums[direction]; +} + +u8 GetFishingNoCatchDirectionAnimNum(u8 direction) +{ + return gFishingNoCatchDirectionAnimNums[direction]; +} + +u8 GetFishingBiteDirectionAnimNum(u8 direction) +{ + return gFishingBiteDirectionAnimNums[direction]; +} + +u8 GetRunningDirectionAnimNum(u8 direction) +{ + return gRunningDirectionAnimNums[direction]; +} static const struct UnkStruct_085094AC *sub_8092A4C(const union AnimCmd *const *anims) { const struct UnkStruct_085094AC *retval; - for (retval = gUnknown_085094AC; retval->anims != NULL; retval ++) + for (retval = gUnknown_085094AC; retval->anims != NULL; retval++) { if (retval->anims == anims) { @@ -4545,7 +4797,7 @@ void obj_npc_animation_step(struct EventObject *eventObject, struct Sprite *spri // file boundary? -u8 sub_8092AF8(s16 x1, s16 y1, s16 x2, s16 y2) +u8 GetDirectionToFace(s16 x1, s16 y1, s16 x2, s16 y2) { if (x1 > x2) { @@ -4562,81 +4814,64 @@ u8 sub_8092AF8(s16 x1, s16 y1, s16 x2, s16 y2) return DIR_SOUTH; } -void npc_set_running_behaviour_etc(struct EventObject *eventObject, u8 movementType) +void SetTrainerMovementType(struct EventObject *eventObject, u8 movementType) { eventObject->movementType = movementType; eventObject->directionSequenceIndex = 0; eventObject->playerCopyableMovement = 0; - gSprites[eventObject->spriteId].callback = gUnknown_08505438[movementType]; + gSprites[eventObject->spriteId].callback = sMovementTypeCallbacks[movementType]; gSprites[eventObject->spriteId].data[1] = 0; } -dirn2anim(npc_running_behaviour_by_direction, gUnknown_0850DB53) +u8 GetTrainerFacingDirectionMovementType(u8 direction) +{ + return gTrainerFacingDirectionMovementTypes[direction]; +} -u8 npc_block_way__next_tile(struct EventObject *eventObject, u8 direction) +static u8 GetCollisionInDirection(struct EventObject *eventObject, u8 direction) { s16 x; s16 y; - x = eventObject->currentCoords.x; y = eventObject->currentCoords.y; MoveCoords(direction, &x, &y); - return npc_block_way(eventObject, x, y, direction); + return GetCollisionAtCoords(eventObject, x, y, direction); } -u8 npc_block_way(struct EventObject *eventObject, s16 x, s16 y, u32 dirn) +u8 GetCollisionAtCoords(struct EventObject *eventObject, s16 x, s16 y, u32 dirn) { u8 direction; direction = dirn; - if (IsCoordOutsideEventObjectMovementRect(eventObject, x, y)) - { + if (IsCoordOutsideEventObjectMovementRange(eventObject, x, y)) return 1; - } - if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(eventObject, x, y, direction)) - { + else if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(eventObject, x, y, direction)) return 2; - } - if (eventObject->trackedByCamera && !CanCameraMoveInDirection(direction)) - { + else if (eventObject->trackedByCamera && !CanCameraMoveInDirection(direction)) return 2; - } - if (IsZCoordMismatchAt(eventObject->currentElevation, x, y)) - { + else if (IsZCoordMismatchAt(eventObject->currentElevation, x, y)) return 3; - } - if (CheckForCollisionBetweenEventObjects(eventObject, x, y)) - { + else if (DoesObjectCollideWithObjectAt(eventObject, x, y)) return 4; - } return 0; } -u8 sub_8092C8C(struct EventObject *eventObject, s16 x, s16 y, u8 direction) +u8 GetCollisionFlagsAtCoords(struct EventObject *eventObject, s16 x, s16 y, u8 direction) { - u8 retval; + u8 flags = 0; - retval = 0x00; - if (IsCoordOutsideEventObjectMovementRect(eventObject, x, y)) - { - retval |= 1; - } + if (IsCoordOutsideEventObjectMovementRange(eventObject, x, y)) + flags |= 1; if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(eventObject, x, y, direction) || (eventObject->trackedByCamera && !CanCameraMoveInDirection(direction))) - { - retval |= 2; - } + flags |= 2; if (IsZCoordMismatchAt(eventObject->currentElevation, x, y)) - { - retval |= 4; - } - if (CheckForCollisionBetweenEventObjects(eventObject, x, y)) - { - retval |= 8; - } - return retval; + flags |= 4; + if (DoesObjectCollideWithObjectAt(eventObject, x, y)) + flags |= 8; + return flags; } -static bool8 IsCoordOutsideEventObjectMovementRect(struct EventObject *eventObject, s16 x, s16 y) +static bool8 IsCoordOutsideEventObjectMovementRange(struct EventObject *eventObject, s16 x, s16 y) { s16 left; s16 right; @@ -4666,19 +4901,20 @@ static bool8 IsCoordOutsideEventObjectMovementRect(struct EventObject *eventObje static bool8 IsMetatileDirectionallyImpassable(struct EventObject *eventObject, s16 x, s16 y, u8 direction) { - if (gOppositeDirectionBlockedMetatileFuncs[direction - 1](eventObject->currentMetatileBehavior) || gDirectionBlockedMetatileFuncs[direction - 1](MapGridGetMetatileBehaviorAt(x, y))) + if (gOppositeDirectionBlockedMetatileFuncs[direction - 1](eventObject->currentMetatileBehavior) + || gDirectionBlockedMetatileFuncs[direction - 1](MapGridGetMetatileBehaviorAt(x, y))) { return TRUE; } return FALSE; } -static bool8 CheckForCollisionBetweenEventObjects(struct EventObject *eventObject, s16 x, s16 y) +static bool8 DoesObjectCollideWithObjectAt(struct EventObject *eventObject, s16 x, s16 y) { u8 i; struct EventObject *curObject; - for (i = 0; i < NUM_EVENT_OBJECTS; i ++) + for (i = 0; i < NUM_EVENT_OBJECTS; i++) { curObject = &gEventObjects[i]; if (curObject->active && curObject != eventObject) @@ -4695,14 +4931,16 @@ static bool8 CheckForCollisionBetweenEventObjects(struct EventObject *eventObjec return FALSE; } -bool8 sub_8092E9C(u8 localId, u8 mapNum, u8 mapGroup) +bool8 IsBerryTreeSparkling(u8 localId, u8 mapNum, u8 mapGroup) { u8 eventObjectId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId) && gSprites[gEventObjects[eventObjectId].spriteId].data[7] & 0x02) + if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId) + && gSprites[gEventObjects[eventObjectId].spriteId].data[7] & 2) { return TRUE; } + return FALSE; } @@ -4728,35 +4966,19 @@ void sub_8092F60(u8 direction, s16 *x, s16 *y) *y += gDirectionToVectors[direction].y << 4; } -void sub_8092F88(u32 dirn, s16 *x, s16 *y, s16 dx, s16 dy) +static void MoveCoordsInDirection(u32 dir, s16 *x, s16 *y, s16 deltaX, s16 deltaY) { - u8 direction; - s16 dx_2; - s16 dy_2; - s16 cur_x; - s16 cur_y; - - direction = dirn; - dx_2 = dx; - dy_2 = dy; - cur_x = gDirectionToVectors[direction].x; - if (cur_x > 0) - { - *x += dx_2; - } - if (cur_x < 0) - { - *x -= dx_2; - } - cur_y = gDirectionToVectors[direction].y; - if (cur_y > 0) - { - *y += dy_2; - } - if (cur_y < 0) - { - *y -= dy_2; - } + u8 direction = dir; + s16 dx2 = (u16)deltaX; + s16 dy2 = (u16)deltaY; + if (gDirectionToVectors[direction].x > 0) + *x += dx2; + if (gDirectionToVectors[direction].x < 0) + *x -= dx2; + if (gDirectionToVectors[direction].y > 0) + *y += dy2; + if (gDirectionToVectors[direction].y < 0) + *y -= dy2; } void sub_8092FF0(s16 x, s16 y, s16 *dest_x, s16 *dest_y) @@ -4807,7 +5029,7 @@ static void GetEventObjectMovingCameraOffset(s16 *x, s16 *y) *y = 0; if (gUnknown_03005DD0.x > 0) { - (*x) ++; + (*x)++; } if (gUnknown_03005DD0.x < 0) { @@ -4815,7 +5037,7 @@ static void GetEventObjectMovingCameraOffset(s16 *x, s16 *y) } if (gUnknown_03005DD0.y > 0) { - (*y) ++; + (*y)++; } if (gUnknown_03005DD0.y < 0) { @@ -4823,65 +5045,56 @@ static void GetEventObjectMovingCameraOffset(s16 *x, s16 *y) } } -void EventObjectMoveDestCoords(struct EventObject *eventObject, u32 dirn, s16 *x, s16 *y) +void EventObjectMoveDestCoords(struct EventObject *eventObject, u32 direction, s16 *x, s16 *y) { - u8 direction; - - direction = dirn; + u8 newDirn = direction; *x = eventObject->currentCoords.x; *y = eventObject->currentCoords.y; - MoveCoords(direction, x, y); + MoveCoords(newDirn, x, y); } -// file boundary? - -bool8 EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct EventObject *eventObject) +bool8 EventObjectIsMovementOverridden(struct EventObject *eventObject) { if (eventObject->singleMovementActive || eventObject->heldMovementActive) - { return TRUE; - } + return FALSE; } -bool8 EventObjectIsSpecialAnimActive(struct EventObject *eventObject) +bool8 EventObjectIsHeldMovementActive(struct EventObject *eventObject) { if (eventObject->heldMovementActive && eventObject->movementActionId != 0xFF) - { return TRUE; - } + return FALSE; } -bool8 EventObjectSetSpecialAnim(struct EventObject *eventObject, u8 specialAnimId) +bool8 EventObjectSetHeldMovement(struct EventObject *eventObject, u8 movementActionId) { - if (EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(eventObject)) - { + if (EventObjectIsMovementOverridden(eventObject)) return TRUE; - } - npc_sync_anim_pause_bits(eventObject); - eventObject->movementActionId = specialAnimId; + + UnfreezeEventObject(eventObject); + eventObject->movementActionId = movementActionId; eventObject->heldMovementActive = TRUE; eventObject->heldMovementFinished = FALSE; gSprites[eventObject->spriteId].data[2] = 0; return FALSE; } -void EventObjectForceSetSpecialAnim(struct EventObject *eventObject, u8 specialAnimId) +void EventObjectForceSetHeldMovement(struct EventObject *eventObject, u8 movementActionId) { - EventObjectClearAnimIfSpecialAnimActive(eventObject); - EventObjectSetSpecialAnim(eventObject, specialAnimId); + EventObjectClearHeldMovementIfActive(eventObject); + EventObjectSetHeldMovement(eventObject, movementActionId); } -void EventObjectClearAnimIfSpecialAnimActive(struct EventObject *eventObject) +void EventObjectClearHeldMovementIfActive(struct EventObject *eventObject) { if (eventObject->heldMovementActive) - { - EventObjectClearAnim(eventObject); - } + EventObjectClearHeldMovement(eventObject); } -void EventObjectClearAnim(struct EventObject *eventObject) +void EventObjectClearHeldMovement(struct EventObject *eventObject) { eventObject->movementActionId = 0xFF; eventObject->heldMovementActive = FALSE; @@ -4890,43 +5103,38 @@ void EventObjectClearAnim(struct EventObject *eventObject) gSprites[eventObject->spriteId].data[2] = 0; } -u8 EventObjectCheckIfSpecialAnimFinishedOrInactive(struct EventObject *eventObject) +u8 EventObjectCheckHeldMovementStatus(struct EventObject *eventObject) { if (eventObject->heldMovementActive) - { return eventObject->heldMovementFinished; - } - return 0x10; + + return 16; } -u8 EventObjectClearAnimIfSpecialAnimFinished(struct EventObject *eventObject) +u8 EventObjectClearHeldMovementIfFinished(struct EventObject *eventObject) { - u8 specialAnimState; + u8 heldMovementStatus = EventObjectCheckHeldMovementStatus(eventObject); + if (heldMovementStatus != 0 && heldMovementStatus != 16) + EventObjectClearHeldMovementIfActive(eventObject); - specialAnimState = EventObjectCheckIfSpecialAnimFinishedOrInactive(eventObject); - if (specialAnimState != 0 && specialAnimState != 16) - { - EventObjectClearAnimIfSpecialAnimActive(eventObject); - } - return specialAnimState; + return heldMovementStatus; } -u8 EventObjectGetSpecialAnim(struct EventObject *eventObject) +u8 EventObjectGetHeldMovementActionId(struct EventObject *eventObject) { if (eventObject->heldMovementActive) - { return eventObject->movementActionId; - } + return 0xFF; } -void EventObjectStep(struct EventObject *eventObject, struct Sprite *sprite, bool8 (*callback)(struct EventObject *, struct Sprite *)) +void UpdateEventObjectCurrentMovement(struct EventObject *eventObject, struct Sprite *sprite, bool8 (*callback)(struct EventObject *, struct Sprite *)) { DoGroundEffects_OnSpawn(eventObject, sprite); - sub_80964E8(eventObject, sprite); - if (EventObjectIsSpecialAnimActive(eventObject)) + TryEnableEventObjectAnim(eventObject, sprite); + if (EventObjectIsHeldMovementActive(eventObject)) { - EventObjectExecSpecialAnim(eventObject, sprite); + EventObjectExecHeldMovementAction(eventObject, sprite); } else if (!eventObject->frozen) { @@ -4934,58 +5142,55 @@ void EventObjectStep(struct EventObject *eventObject, struct Sprite *sprite, boo } DoGroundEffects_OnBeginStep(eventObject, sprite); DoGroundEffects_OnFinishStep(eventObject, sprite); - npc_obj_transfer_image_anim_pause_flag(eventObject, sprite); - sub_8096518(eventObject, sprite); + UpdateEventObjectSpriteAnimPause(eventObject, sprite); + UpdateEventObjectVisibility(eventObject, sprite); EventObjectUpdateSubpriority(eventObject, sprite); } -#define dirn2anim_2(name, table) \ -u8 name(u32 direction) \ -{ \ - u8 dirn2; \ - u8 animIds[5]; \ - dirn2 = direction; \ - memcpy(animIds, table, 5); \ - if (dirn2 > DIR_EAST) \ - { \ - dirn2 = 0; \ - } \ - return animIds[dirn2]; \ +#define dirn_to_anim(name, table)\ +u8 name(u32 idx)\ +{\ + u8 direction;\ + u8 animIds[sizeof(table)];\ + direction = idx;\ + memcpy(animIds, (table), sizeof(table));\ + if (direction > DIR_EAST) direction = 0;\ + return animIds[direction];\ } -dirn2anim_2(GetFaceDirectionAnimId, gUnknown_0850DBA0); -dirn2anim_2(GetSimpleGoAnimId, gUnknown_0850DBA5); -dirn2anim_2(GetGoSpeed0AnimId, gUnknown_0850DBAA); -dirn2anim_2(GetGoSpeed1AnimId, gUnknown_0850DBAF); -dirn2anim_2(GetGoSpeed2AnimId, gUnknown_0850DBB4); -dirn2anim_2(GetGoSpeed3AnimId, gUnknown_0850DBB9); -dirn2anim_2(sub_8093438, gUnknown_0850DBBE); -dirn2anim_2(GetRunAnimId, gUnknown_0850DBC3); -dirn2anim_2(GetJumpLedgeAnimId, gUnknown_0850DBC8); -dirn2anim_2(sub_80934BC, gUnknown_0850DBCD); -dirn2anim_2(sub_80934E8, gUnknown_0850DBD2); -dirn2anim_2(sub_8093514, gUnknown_0850DBD7); -dirn2anim_2(sub_8093540, gUnknown_0850DBDC); -dirn2anim_2(GetStepInPlaceDelay32AnimId, gUnknown_0850DBE1); -dirn2anim_2(GetStepInPlaceDelay16AnimId, gUnknown_0850DBE6); -dirn2anim_2(GetStepInPlaceDelay8AnimId, gUnknown_0850DBEB); -dirn2anim_2(GetStepInPlaceDelay4AnimId, gUnknown_0850DBF0); +dirn_to_anim(GetFaceDirectionMovementAction, gFaceDirectionMovementActions); +dirn_to_anim(GetWalkSlowMovementAction, gWalkSlowMovementActions); +dirn_to_anim(GetWalkNormalMovementAction, gWalkNormalMovementActions); +dirn_to_anim(GetWalkFastMovementAction, gWalkFastMovementActions); +dirn_to_anim(GetRideWaterCurrentMovementAction, gRideWaterCurrentMovementActions); +dirn_to_anim(GetWalkFastestMovementAction, gWalkFastestMovementActions); +dirn_to_anim(GetSlideMovementAction, gSlideMovementActions); +dirn_to_anim(GetPlayerRunMovementAction, gPlayerRunMovementActions); +dirn_to_anim(GetJump2MovementAction, gJump2MovementActions); +dirn_to_anim(GetJumpInPlaceMovementAction, gJumpInPlaceMovementActions); +dirn_to_anim(GetJumpInPlaceTurnAroundMovementAction, gJumpInPlaceTurnAroundMovementActions); +dirn_to_anim(GetJumpMovementAction, gJumpMovementActions); +dirn_to_anim(GetJumpSpecialMovementAction, gJumpSpecialMovementActions); +dirn_to_anim(GetWalkInPlaceSlowMovementAction, gWalkInPlaceSlowMovementActions); +dirn_to_anim(GetWalkInPlaceNormalMovementAction, gWalkInPlaceNormalMovementActions); +dirn_to_anim(GetWalkInPlaceFastMovementAction, gWalkInPlaceFastMovementActions); +dirn_to_anim(GetWalkInPlaceFastestMovementAction, gWalkInPlaceFastestMovementActions); bool8 EventObjectFaceOppositeDirection(struct EventObject *eventObject, u8 direction) { - return EventObjectSetSpecialAnim(eventObject, GetFaceDirectionAnimId(GetOppositeDirection(direction))); + return EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(GetOppositeDirection(direction))); } -dirn2anim_2(sub_8093648, gUnknown_0850DBF5); -dirn2anim_2(sub_8093674, gUnknown_0850DBFA); -dirn2anim_2(sub_80936A0, gUnknown_0850DBFF); -dirn2anim_2(sub_80936CC, gUnknown_0850DC04); -dirn2anim_2(sub_80936F8, gUnknown_0850DC09); -dirn2anim_2(sub_8093724, gUnknown_0850DC0E); -dirn2anim_2(sub_8093750, gUnknown_0850DC13); -dirn2anim_2(sub_809377C, gUnknown_0850DC18); -dirn2anim_2(sub_80937A8, gUnknown_0850DC1D); -dirn2anim_2(d2s_08064034, gUnknown_0850DC22); +dirn_to_anim(GetAcroWheelieFaceDirectionMovementAction, gAcroWheelieFaceDirectionMovementActions); +dirn_to_anim(GetAcroPopWheelieFaceDirectionMovementAction, gAcroPopWheelieFaceDirectionMovementActions); +dirn_to_anim(GetAcroEndWheelieFaceDirectionMovementAction, gAcroEndWheelieFaceDirectionMovementActions); +dirn_to_anim(GetAcroWheelieHopFaceDirectionMovementAction, gAcroWheelieHopFaceDirectionMovementActions); +dirn_to_anim(GetAcroWheelieHopDirectionMovementAction, gAcroWheelieHopDirectionMovementActions); +dirn_to_anim(GetAcroWheelieJumpDirectionMovementAction, gAcroWheelieJumpDirectionMovementActions); +dirn_to_anim(GetAcroWheelieInPlaceDirectionMovementAction, gAcroWheelieInPlaceDirectionMovementActions); +dirn_to_anim(GetAcroPopWheelieMoveDirectionMovementAction, gAcroPopWheelieMoveDirectionMovementActions); +dirn_to_anim(GetAcroWheelieMoveDirectionMovementAction, gAcroWheelieMoveDirectionMovementActions); +dirn_to_anim(GetAcroEndWheelieMoveDirectionMovementAction, gAcroEndWheelieMoveDirectionMovementActions); u8 GetOppositeDirection(u8 direction) { @@ -5020,17 +5225,17 @@ static u32 state_to_direction(u8 a0, u32 a1, u32 a2) return gUnknown_0850DC3F[a0 - 1][zffuOffset - 1]; } -static void EventObjectExecSpecialAnim(struct EventObject *eventObject, struct Sprite *sprite) +static void EventObjectExecHeldMovementAction(struct EventObject *eventObject, struct Sprite *sprite) { - if (gUnknown_0850DC50[eventObject->movementActionId][sprite->data[2]](eventObject, sprite)) + if (gMovementActionFuncs[eventObject->movementActionId][sprite->data[2]](eventObject, sprite)) { eventObject->heldMovementFinished = TRUE; } } -bool8 EventObjectExecRegularAnim(struct EventObject *eventObject, struct Sprite *sprite) +static bool8 EventObjectExecSingleMovementAction(struct EventObject *eventObject, struct Sprite *sprite) { - if (gUnknown_0850DC50[eventObject->movementActionId][sprite->data[2]](eventObject, sprite)) + if (gMovementActionFuncs[eventObject->movementActionId][sprite->data[2]](eventObject, sprite)) { eventObject->movementActionId = 0xFF; sprite->data[2] = 0; @@ -5039,44 +5244,42 @@ bool8 EventObjectExecRegularAnim(struct EventObject *eventObject, struct Sprite return FALSE; } -static void EventObjectSetRegularAnim(struct EventObject *eventObject, struct Sprite *sprite, u8 animId) +static void EventObjectSetSingleMovement(struct EventObject *eventObject, struct Sprite *sprite, u8 animId) { eventObject->movementActionId = animId; sprite->data[2] = 0; } -// file boundary? - -void an_look_any(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +static void FaceDirection(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) { - EventObjectSetDirection(eventObject, direction); - npc_coords_shift_still(eventObject); - obj_npc_animation_step(eventObject, sprite, get_go_image_anim_num(eventObject->facingDirection)); + SetEventObjectDirection(eventObject, direction); + ShiftStillEventObjectCoords(eventObject); + obj_npc_animation_step(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection)); sprite->animPaused = TRUE; sprite->data[2] = 1; } -bool8 sub_8093950(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - an_look_any(eventObject, sprite, DIR_SOUTH); + FaceDirection(eventObject, sprite, DIR_SOUTH); return TRUE; } -bool8 sub_8093960(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - an_look_any(eventObject, sprite, DIR_NORTH); + FaceDirection(eventObject, sprite, DIR_NORTH); return TRUE; } -bool8 sub_8093970(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - an_look_any(eventObject, sprite, DIR_WEST); + FaceDirection(eventObject, sprite, DIR_WEST); return TRUE; } -bool8 sub_8093980(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - an_look_any(eventObject, sprite, DIR_EAST); + FaceDirection(eventObject, sprite, DIR_EAST); return TRUE; } @@ -5087,12 +5290,12 @@ void npc_apply_direction(struct EventObject *eventObject, struct Sprite *sprite, x = eventObject->currentCoords.x; y = eventObject->currentCoords.y; - EventObjectSetDirection(eventObject, direction); + SetEventObjectDirection(eventObject, direction); MoveCoords(direction, &x, &y); - npc_coords_shift(eventObject, x, y); + ShiftEventObjectCoords(eventObject, x, y); oamt_npc_ministep_reset(sprite, direction, speed); sprite->animPaused = FALSE; - if (gUnknown_020375B8 != NULL && sub_8097F78(eventObject) != 0x10) + if (gLockedAnimEventObjects != NULL && FindLockedEventObjectIndex(eventObject) != NUM_EVENT_OBJECTS) { sprite->animPaused = TRUE; } @@ -5109,17 +5312,17 @@ void do_go_anim(struct EventObject *eventObject, struct Sprite *sprite, u8 direc npc_apply_anim_looping(eventObject, sprite, functions[speed](eventObject->facingDirection)); } -void do_run_anim(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +void StartRunningAnim(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) { npc_apply_direction(eventObject, sprite, direction, 1); - npc_apply_anim_looping(eventObject, sprite, get_run_image_anim_num(eventObject->facingDirection)); + npc_apply_anim_looping(eventObject, sprite, GetRunningDirectionAnimNum(eventObject->facingDirection)); } bool8 npc_obj_ministep_stop_on_arrival(struct EventObject *eventObject, struct Sprite *sprite) { if (obj_npc_ministep(sprite)) { - npc_coords_shift_still(eventObject); + ShiftStillEventObjectCoords(eventObject); eventObject->triggerGroundEffectsOnStop = TRUE; sprite->animPaused = TRUE; return TRUE; @@ -5134,9 +5337,9 @@ void sub_8093AF0(struct EventObject *eventObject, struct Sprite *sprite, u8 dire x = eventObject->currentCoords.x; y = eventObject->currentCoords.y; - EventObjectSetDirection(eventObject, direction); + SetEventObjectDirection(eventObject, direction); MoveCoords(direction, &x, &y); - npc_coords_shift(eventObject, x, y); + ShiftEventObjectCoords(eventObject, x, y); sub_80976DC(sprite, direction); sprite->animPaused = FALSE; eventObject->triggerGroundEffectsOnMove = TRUE; @@ -5146,14 +5349,14 @@ void sub_8093AF0(struct EventObject *eventObject, struct Sprite *sprite, u8 dire void sub_8093B60(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) { sub_8093AF0(eventObject, sprite, direction); - npc_apply_anim_looping(eventObject, sprite, get_go_image_anim_num(eventObject->facingDirection)); + npc_apply_anim_looping(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection)); } bool8 an_walk_any_2(struct EventObject *eventObject, struct Sprite *sprite) { if (sub_80976EC(sprite)) { - npc_coords_shift_still(eventObject); + ShiftStillEventObjectCoords(eventObject); eventObject->triggerGroundEffectsOnStop = TRUE; sprite->animPaused = TRUE; return TRUE; @@ -5161,39 +5364,261 @@ bool8 an_walk_any_2(struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -#define an_walk_any_2_macro(name, fn1, fn2, ...) \ -bool8 name##_2(struct EventObject *, struct Sprite *);\ -bool8 name(struct EventObject *eventObject, struct Sprite *sprite)\ -{\ - fn1(eventObject, sprite, __VA_ARGS__);\ - return name##_2(eventObject, sprite);\ -}\ -bool8 name##_2(struct EventObject *eventObject, struct Sprite *sprite)\ -{\ - if (fn2(eventObject, sprite))\ - {\ - sprite->data[2] = 2;\ - return TRUE;\ - }\ - return FALSE;\ +bool8 MovementAction_WalkSlowDiagonalUpLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8093B60(eventObject, sprite, DIR_NORTHWEST); + return MovementAction_WalkSlowDiagonalUpLeft_Step1(eventObject, sprite); } -an_walk_any_2_macro(sub_8093BC4, sub_8093B60, an_walk_any_2, 7) -an_walk_any_2_macro(sub_8093C04, sub_8093B60, an_walk_any_2, 8) -an_walk_any_2_macro(sub_8093C44, sub_8093B60, an_walk_any_2, 5) -an_walk_any_2_macro(sub_8093C84, sub_8093B60, an_walk_any_2, 6) -an_walk_any_2_macro(sub_8093CC4, sub_8093B60, an_walk_any_2, 1) -an_walk_any_2_macro(sub_8093D04, sub_8093B60, an_walk_any_2, 2) -an_walk_any_2_macro(sub_8093D44, sub_8093B60, an_walk_any_2, 3) -an_walk_any_2_macro(sub_8093D84, sub_8093B60, an_walk_any_2, 4) -an_walk_any_2_macro(sub_8093DC4, do_go_anim, npc_obj_ministep_stop_on_arrival, 7, 0) -an_walk_any_2_macro(sub_8093E04, do_go_anim, npc_obj_ministep_stop_on_arrival, 8, 0) -an_walk_any_2_macro(sub_8093E44, do_go_anim, npc_obj_ministep_stop_on_arrival, 5, 0) -an_walk_any_2_macro(sub_8093E84, do_go_anim, npc_obj_ministep_stop_on_arrival, 6, 0) -an_walk_any_2_macro(sub_8093EC4, do_go_anim, npc_obj_ministep_stop_on_arrival, 1, 0) -an_walk_any_2_macro(sub_8093F04, do_go_anim, npc_obj_ministep_stop_on_arrival, 2, 0) -an_walk_any_2_macro(sub_8093F44, do_go_anim, npc_obj_ministep_stop_on_arrival, 3, 0) -an_walk_any_2_macro(sub_8093F84, do_go_anim, npc_obj_ministep_stop_on_arrival, 4, 0) +bool8 MovementAction_WalkSlowDiagonalUpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (an_walk_any_2(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_WalkSlowDiagonalUpRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8093B60(eventObject, sprite, DIR_NORTHEAST); + return MovementAction_WalkSlowDiagonalUpRight_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkSlowDiagonalUpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (an_walk_any_2(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_WalkSlowDiagonalDownLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8093B60(eventObject, sprite, DIR_SOUTHWEST); + return MovementAction_WalkSlowDiagonalDownLeft_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkSlowDiagonalDownLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (an_walk_any_2(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_WalkSlowDiagonalDownRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8093B60(eventObject, sprite, DIR_SOUTHEAST); + return MovementAction_WalkSlowDiagonalDownRight_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkSlowDiagonalDownRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (an_walk_any_2(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_WalkSlowDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8093B60(eventObject, sprite, DIR_SOUTH); + return MovementAction_WalkSlowDown_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkSlowDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (an_walk_any_2(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_WalkSlowUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8093B60(eventObject, sprite, DIR_NORTH); + return MovementAction_WalkSlowUp_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkSlowUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (an_walk_any_2(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_WalkSlowLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8093B60(eventObject, sprite, DIR_WEST); + return MovementAction_WalkSlowLeft_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkSlowLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (an_walk_any_2(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_WalkSlowRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8093B60(eventObject, sprite, DIR_EAST); + return MovementAction_WalkSlowRight_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkSlowRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (an_walk_any_2(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_WalkNormalDiagonalUpLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + do_go_anim(eventObject, sprite, DIR_NORTHWEST, 0); + return MovementAction_WalkNormalDiagonalUpLeft_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkNormalDiagonalUpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_WalkNormalDiagonalUpRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + do_go_anim(eventObject, sprite, DIR_NORTHEAST, 0); + return MovementAction_WalkNormalDiagonalUpRight_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkNormalDiagonalUpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_WalkNormalDiagonalDownLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + do_go_anim(eventObject, sprite, DIR_SOUTHWEST, 0); + return MovementAction_WalkNormalDiagonalDownLeft_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkNormalDiagonalDownLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_WalkNormalDiagonalDownRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + do_go_anim(eventObject, sprite, DIR_SOUTHEAST, 0); + return MovementAction_WalkNormalDiagonalDownRight_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkNormalDiagonalDownRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_WalkNormalDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + do_go_anim(eventObject, sprite, DIR_SOUTH, 0); + return MovementAction_WalkNormalDown_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkNormalDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_WalkNormalUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + do_go_anim(eventObject, sprite, DIR_NORTH, 0); + return MovementAction_WalkNormalUp_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkNormalUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_WalkNormalLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + do_go_anim(eventObject, sprite, DIR_WEST, 0); + return MovementAction_WalkNormalLeft_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkNormalLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_WalkNormalRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + do_go_anim(eventObject, sprite, DIR_EAST, 0); + return MovementAction_WalkNormalRight_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkNormalRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} void sub_8093FC4(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a5) { @@ -5204,9 +5629,9 @@ void sub_8093FC4(struct EventObject *eventObject, struct Sprite *sprite, u8 dire memcpy(displacements, gUnknown_0850DFBC, sizeof gUnknown_0850DFBC); x = 0; y = 0; - EventObjectSetDirection(eventObject, direction); - sub_8092F88(direction, &x, &y, displacements[speed], displacements[speed]); - npc_coords_shift(eventObject, eventObject->currentCoords.x + x, eventObject->currentCoords.y + y); + SetEventObjectDirection(eventObject, direction); + MoveCoordsInDirection(direction, &x, &y, displacements[speed], displacements[speed]); + ShiftEventObjectCoords(eventObject, eventObject->currentCoords.x + x, eventObject->currentCoords.y + y); sub_809783C(sprite, direction, speed, a5); sprite->data[2] = 1; sprite->animPaused = 0; @@ -5217,7 +5642,7 @@ void sub_8093FC4(struct EventObject *eventObject, struct Sprite *sprite, u8 dire void maybe_shadow_1(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a4) { sub_8093FC4(eventObject, sprite, direction, speed, a4); - npc_apply_anim_looping(eventObject, sprite, get_go_image_anim_num(eventObject->facingDirection)); + npc_apply_anim_looping(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection)); DoShadowFieldEffect(eventObject); } @@ -5234,14 +5659,14 @@ u8 sub_80940C4(struct EventObject *eventObject, struct Sprite *sprite, u8 callba { x = 0; y = 0; - sub_8092F88(eventObject->movementDirection, &x, &y, displacements[sprite->data[4]], displacements[sprite->data[4]]); - npc_coords_shift(eventObject, eventObject->currentCoords.x + x, eventObject->currentCoords.y + y); + MoveCoordsInDirection(eventObject->movementDirection, &x, &y, displacements[sprite->data[4]], displacements[sprite->data[4]]); + ShiftEventObjectCoords(eventObject, eventObject->currentCoords.x + x, eventObject->currentCoords.y + y); eventObject->triggerGroundEffectsOnMove = TRUE; eventObject->disableCoveringGroundEffects = TRUE; } else if (result == 0xFF) { - npc_coords_shift_still(eventObject); + ShiftStillEventObjectCoords(eventObject); eventObject->triggerGroundEffectsOnStop = TRUE; eventObject->landingJump = TRUE; sprite->animPaused = TRUE; @@ -5284,35 +5709,81 @@ bool8 sub_80941E0(struct EventObject *eventObject, struct Sprite *sprite) case 255: return TRUE; case 1: - EventObjectSetDirection(eventObject, GetOppositeDirection(eventObject->movementDirection)); - obj_npc_animation_step(eventObject, sprite, get_go_image_anim_num(eventObject->facingDirection)); + SetEventObjectDirection(eventObject, GetOppositeDirection(eventObject->movementDirection)); + obj_npc_animation_step(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection)); default: return FALSE; } } -#define maybe_shadow_1_macro(name, fn1, fn2, ...) \ -bool8 name##_2(struct EventObject *, struct Sprite *);\ -bool8 name(struct EventObject *eventObject, struct Sprite *sprite)\ -{\ - fn1(eventObject, sprite, __VA_ARGS__);\ - return name##_2(eventObject, sprite);\ -}\ -bool8 name##_2(struct EventObject *eventObject, struct Sprite *sprite)\ -{\ - if (fn2(eventObject, sprite))\ - {\ - eventObject->hasShadow = FALSE;\ - sprite->data[2] = 2;\ - return TRUE;\ - }\ - return FALSE;\ +bool8 MovementAction_Jump2Down_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 2, 0); + return MovementAction_Jump2Down_Step1(eventObject, sprite); +} + +bool8 MovementAction_Jump2Down_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = FALSE; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_Jump2Up_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + maybe_shadow_1(eventObject, sprite, DIR_NORTH, 2, 0); + return MovementAction_Jump2Up_Step1(eventObject, sprite); +} + +bool8 MovementAction_Jump2Up_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = FALSE; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_Jump2Left_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + maybe_shadow_1(eventObject, sprite, DIR_WEST, 2, 0); + return MovementAction_Jump2Left_Step1(eventObject, sprite); +} + +bool8 MovementAction_Jump2Left_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = FALSE; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_Jump2Right_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + maybe_shadow_1(eventObject, sprite, DIR_EAST, 2, 0); + return MovementAction_Jump2Right_Step1(eventObject, sprite); +} + +bool8 MovementAction_Jump2Right_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = FALSE; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; } -maybe_shadow_1_macro(sub_8094230, maybe_shadow_1, sub_80941B0, DIR_SOUTH, 2, 0) -maybe_shadow_1_macro(sub_8094288, maybe_shadow_1, sub_80941B0, DIR_NORTH, 2, 0) -maybe_shadow_1_macro(sub_80942E0, maybe_shadow_1, sub_80941B0, DIR_WEST, 2, 0) -maybe_shadow_1_macro(sub_8094338, maybe_shadow_1, sub_80941B0, DIR_EAST, 2, 0) void sub_8094390(struct Sprite *sprite, u16 duration) { @@ -5320,7 +5791,7 @@ void sub_8094390(struct Sprite *sprite, u16 duration) sprite->data[3] = duration; } -bool8 sub_8094398(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Delay_Step1(struct EventObject *eventObject, struct Sprite *sprite) { if (-- sprite->data[3] == 0) { @@ -5330,34 +5801,111 @@ bool8 sub_8094398(struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -#define special_anim_with_timer(name, duration)\ -bool8 name(struct EventObject *eventObject, struct Sprite *sprite)\ -{\ - sub_8094390(sprite, duration);\ - return sub_8094398(eventObject, sprite);\ +bool8 MovementAction_Delay1_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094390(sprite, 1); + return MovementAction_Delay_Step1(eventObject, sprite); } -special_anim_with_timer(sub_80943B4, 1) -special_anim_with_timer(sub_80943D4, 2) -special_anim_with_timer(sub_80943F4, 4) -special_anim_with_timer(sub_8094414, 8) -special_anim_with_timer(sub_8094434, 16) +bool8 MovementAction_Delay2_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094390(sprite, 2); + return MovementAction_Delay_Step1(eventObject, sprite); +} + +bool8 MovementAction_Delay4_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094390(sprite, 4); + return MovementAction_Delay_Step1(eventObject, sprite); +} + +bool8 MovementAction_Delay8_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094390(sprite, 8); + return MovementAction_Delay_Step1(eventObject, sprite); +} + +bool8 MovementAction_Delay16_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094390(sprite, 16); + return MovementAction_Delay_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkFastDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + do_go_anim(eventObject, sprite, DIR_SOUTH, 1); + return MovementAction_WalkFastDown_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkFastDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_WalkFastUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + do_go_anim(eventObject, sprite, DIR_NORTH, 1); + return MovementAction_WalkFastUp_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkFastUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_WalkFastLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + do_go_anim(eventObject, sprite, DIR_WEST, 1); + return MovementAction_WalkFastLeft_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkFastLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_WalkFastRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + do_go_anim(eventObject, sprite, DIR_EAST, 1); + return MovementAction_WalkFastRight_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkFastRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} -an_walk_any_2_macro(sub_8094454, do_go_anim, npc_obj_ministep_stop_on_arrival, 1, 1) -an_walk_any_2_macro(sub_8094494, do_go_anim, npc_obj_ministep_stop_on_arrival, 2, 1) -an_walk_any_2_macro(sub_80944D4, do_go_anim, npc_obj_ministep_stop_on_arrival, 3, 1) -an_walk_any_2_macro(sub_8094514, do_go_anim, npc_obj_ministep_stop_on_arrival, 4, 1) void sub_8094554(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 animNum, u16 duration) { - EventObjectSetDirection(eventObject, direction); + SetEventObjectDirection(eventObject, direction); npc_apply_anim_looping(eventObject, sprite, animNum); sprite->animPaused = FALSE; sprite->data[2] = 1; sprite->data[3] = duration; } -bool8 sub_809459C(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlace_Step1(struct EventObject *eventObject, struct Sprite *sprite) { if (-- sprite->data[3] == 0) { @@ -5368,74 +5916,383 @@ bool8 sub_809459C(struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -bool8 sub_80945C4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceSlow_Step1(struct EventObject *eventObject, struct Sprite *sprite) { if (sprite->data[3] & 1) { - sprite->animDelayCounter ++; + sprite->animDelayCounter++; } - return sub_809459C(eventObject, sprite); + return MovementAction_WalkInPlace_Step1(eventObject, sprite); } -#define special_anim_with_timer_2(name, direction, images, duration, timer) \ -bool8 name(struct EventObject *eventObject, struct Sprite *sprite)\ -{\ - u8 animId;\ - animId = images(DIR_##direction);\ - sub_8094554(eventObject, sprite, DIR_##direction, animId, duration);\ - return timer(eventObject, sprite);\ -} - -special_anim_with_timer_2(sub_8094600, SOUTH, get_go_image_anim_num, 32, sub_80945C4) -special_anim_with_timer_2(sub_8094638, NORTH, get_go_image_anim_num, 32, sub_80945C4) -special_anim_with_timer_2(sub_8094670, WEST, get_go_image_anim_num, 32, sub_80945C4) -special_anim_with_timer_2(sub_80946A8, EAST, get_go_image_anim_num, 32, sub_80945C4) -special_anim_with_timer_2(sub_80946E0, SOUTH, get_go_image_anim_num, 16, sub_809459C) -special_anim_with_timer_2(sub_8094718, NORTH, get_go_image_anim_num, 16, sub_809459C) -special_anim_with_timer_2(sub_8094750, WEST, get_go_image_anim_num, 16, sub_809459C) -special_anim_with_timer_2(sub_8094788, EAST, get_go_image_anim_num, 16, sub_809459C) -special_anim_with_timer_2(sub_80947C0, SOUTH, get_go_fast_image_anim_num, 8, sub_809459C) -special_anim_with_timer_2(sub_80947F8, NORTH, get_go_fast_image_anim_num, 8, sub_809459C) -special_anim_with_timer_2(sub_8094830, WEST, get_go_fast_image_anim_num, 8, sub_809459C) -special_anim_with_timer_2(sub_8094868, EAST, get_go_fast_image_anim_num, 8, sub_809459C) -special_anim_with_timer_2(sub_80948A0, SOUTH, get_go_faster_image_anim_num, 4, sub_809459C) -special_anim_with_timer_2(sub_80948D8, NORTH, get_go_faster_image_anim_num, 4, sub_809459C) -special_anim_with_timer_2(sub_8094910, WEST, get_go_faster_image_anim_num, 4, sub_809459C) -special_anim_with_timer_2(sub_8094948, EAST, get_go_faster_image_anim_num, 4, sub_809459C) - -an_walk_any_2_macro(sub_8094980, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_SOUTH, 2) -an_walk_any_2_macro(sub_80949C0, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_NORTH, 2) -an_walk_any_2_macro(sub_8094A00, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_WEST, 2) -an_walk_any_2_macro(sub_8094A40, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_EAST, 2) -an_walk_any_2_macro(sub_8094A80, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_SOUTH, 3) -an_walk_any_2_macro(sub_8094AC0, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_NORTH, 3) -an_walk_any_2_macro(sub_8094B00, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_WEST, 3) -an_walk_any_2_macro(sub_8094B40, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_EAST, 3) -an_walk_any_2_macro(sub_8094B80, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_SOUTH, 4) -an_walk_any_2_macro(sub_8094BC0, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_NORTH, 4) -an_walk_any_2_macro(sub_8094C00, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_WEST, 4) -an_walk_any_2_macro(sub_8094C40, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_EAST, 4) -an_walk_any_2_macro(sub_8094C80, do_run_anim, npc_obj_ministep_stop_on_arrival, DIR_SOUTH) -an_walk_any_2_macro(sub_8094CC0, do_run_anim, npc_obj_ministep_stop_on_arrival, DIR_NORTH) -an_walk_any_2_macro(sub_8094D00, do_run_anim, npc_obj_ministep_stop_on_arrival, DIR_WEST) -an_walk_any_2_macro(sub_8094D40, do_run_anim, npc_obj_ministep_stop_on_arrival, DIR_EAST) - -void npc_set_direction_and_anim__an_proceed(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 animNum) +bool8 MovementAction_WalkInPlaceSlowDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - obj_anim_image_set_and_seek(sprite, animNum, 0); - EventObjectSetDirection(eventObject, direction); - sprite->data[2] = 1; + sub_8094554(eventObject, sprite, DIR_SOUTH, GetMoveDirectionAnimNum(DIR_SOUTH), 32); + return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite); } -bool8 sub_8094DAC(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceSlowUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - npc_set_direction_and_anim__an_proceed(eventObject, sprite, eventObject->movementDirection, sprite->animNum); + sub_8094554(eventObject, sprite, DIR_NORTH, GetMoveDirectionAnimNum(DIR_NORTH), 32); + return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkInPlaceSlowLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094554(eventObject, sprite, DIR_WEST, GetMoveDirectionAnimNum(DIR_WEST), 32); + return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkInPlaceSlowRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094554(eventObject, sprite, DIR_EAST, GetMoveDirectionAnimNum(DIR_EAST), 32); + return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkInPlaceNormalDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094554(eventObject, sprite, DIR_SOUTH, GetMoveDirectionAnimNum(DIR_SOUTH), 16); + return MovementAction_WalkInPlace_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkInPlaceNormalUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094554(eventObject, sprite, DIR_NORTH, GetMoveDirectionAnimNum(DIR_NORTH), 16); + return MovementAction_WalkInPlace_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkInPlaceNormalLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094554(eventObject, sprite, DIR_WEST, GetMoveDirectionAnimNum(DIR_WEST), 16); + return MovementAction_WalkInPlace_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkInPlaceNormalRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094554(eventObject, sprite, DIR_EAST, GetMoveDirectionAnimNum(DIR_EAST), 16); + return MovementAction_WalkInPlace_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkInPlaceFastDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094554(eventObject, sprite, DIR_SOUTH, GetMoveDirectionFastAnimNum(DIR_SOUTH), 8); + return MovementAction_WalkInPlace_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkInPlaceFastUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094554(eventObject, sprite, DIR_NORTH, GetMoveDirectionFastAnimNum(DIR_NORTH), 8); + return MovementAction_WalkInPlace_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkInPlaceFastLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094554(eventObject, sprite, DIR_WEST, GetMoveDirectionFastAnimNum(DIR_WEST), 8); + return MovementAction_WalkInPlace_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkInPlaceFastRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094554(eventObject, sprite, DIR_EAST, GetMoveDirectionFastAnimNum(DIR_EAST), 8); + return MovementAction_WalkInPlace_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkInPlaceFastestDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094554(eventObject, sprite, DIR_SOUTH, GetMoveDirectionFasterAnimNum(DIR_SOUTH), 4); + return MovementAction_WalkInPlace_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkInPlaceFastestUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094554(eventObject, sprite, DIR_NORTH, GetMoveDirectionFasterAnimNum(DIR_NORTH), 4); + return MovementAction_WalkInPlace_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkInPlaceFastestLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094554(eventObject, sprite, DIR_WEST, GetMoveDirectionFasterAnimNum(DIR_WEST), 4); + return MovementAction_WalkInPlace_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkInPlaceFastestRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094554(eventObject, sprite, DIR_EAST, GetMoveDirectionFasterAnimNum(DIR_EAST), 4); + return MovementAction_WalkInPlace_Step1(eventObject, sprite); +} + +bool8 MovementAction_RideWaterCurrentDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + do_go_anim(eventObject, sprite, DIR_SOUTH, 2); + return MovementAction_RideWaterCurrentDown_Step1(eventObject, sprite); +} + +bool8 MovementAction_RideWaterCurrentDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } return FALSE; } -bool8 sub_8094DC4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - if (sub_80979BC(sprite)) + do_go_anim(eventObject, sprite, DIR_NORTH, 2); + return MovementAction_RideWaterCurrentUp_Step1(eventObject, sprite); +} + +bool8 MovementAction_RideWaterCurrentUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_RideWaterCurrentLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + do_go_anim(eventObject, sprite, DIR_WEST, 2); + return MovementAction_RideWaterCurrentLeft_Step1(eventObject, sprite); +} + +bool8 MovementAction_RideWaterCurrentLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_RideWaterCurrentRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + do_go_anim(eventObject, sprite, DIR_EAST, 2); + return MovementAction_RideWaterCurrentRight_Step1(eventObject, sprite); +} + +bool8 MovementAction_RideWaterCurrentRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_WalkFastestDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + do_go_anim(eventObject, sprite, DIR_SOUTH, 3); + return MovementAction_WalkFastestDown_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkFastestDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_WalkFastestUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + do_go_anim(eventObject, sprite, DIR_NORTH, 3); + return MovementAction_WalkFastestUp_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkFastestUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_WalkFastestLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + do_go_anim(eventObject, sprite, DIR_WEST, 3); + return MovementAction_WalkFastestLeft_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkFastestLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_WalkFastestRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + do_go_anim(eventObject, sprite, DIR_EAST, 3); + return MovementAction_WalkFastestRight_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkFastestRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_SlideDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + do_go_anim(eventObject, sprite, DIR_SOUTH, 4); + return MovementAction_SlideDown_Step1(eventObject, sprite); +} + +bool8 MovementAction_SlideDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_SlideUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + do_go_anim(eventObject, sprite, DIR_NORTH, 4); + return MovementAction_SlideUp_Step1(eventObject, sprite); +} + +bool8 MovementAction_SlideUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_SlideLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + do_go_anim(eventObject, sprite, DIR_WEST, 4); + return MovementAction_SlideLeft_Step1(eventObject, sprite); +} + +bool8 MovementAction_SlideLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_SlideRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + do_go_anim(eventObject, sprite, DIR_EAST, 4); + return MovementAction_SlideRight_Step1(eventObject, sprite); +} + +bool8 MovementAction_SlideRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_PlayerRunDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + StartRunningAnim(eventObject, sprite, DIR_SOUTH); + return MovementAction_PlayerRunDown_Step1(eventObject, sprite); +} + +bool8 MovementAction_PlayerRunDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_PlayerRunUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + StartRunningAnim(eventObject, sprite, DIR_NORTH); + return MovementAction_PlayerRunUp_Step1(eventObject, sprite); +} + +bool8 MovementAction_PlayerRunUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_PlayerRunLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + StartRunningAnim(eventObject, sprite, DIR_WEST); + return MovementAction_PlayerRunLeft_Step1(eventObject, sprite); +} + +bool8 MovementAction_PlayerRunLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_PlayerRunRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + StartRunningAnim(eventObject, sprite, DIR_EAST); + return MovementAction_PlayerRunRight_Step1(eventObject, sprite); +} + +bool8 MovementAction_PlayerRunRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +void StartSpriteAnimInDirection(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 animNum) +{ + SetAndStartSpriteAnim(sprite, animNum, 0); + SetEventObjectDirection(eventObject, direction); + sprite->data[2] = 1; +} + +bool8 MovementAction_StartAnimInDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + StartSpriteAnimInDirection(eventObject, sprite, eventObject->movementDirection, sprite->animNum); + return FALSE; +} + +bool8 MovementAction_WaitSpriteAnim(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (SpriteAnimEnded(sprite)) { sprite->data[2] = 2; return TRUE; @@ -5446,154 +6303,390 @@ bool8 sub_8094DC4(struct EventObject *eventObject, struct Sprite *sprite) void sub_8094DE4(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) { sub_8093FC4(eventObject, sprite, direction, 1, 0); - StartSpriteAnim(sprite, sub_80929AC(direction)); + StartSpriteAnim(sprite, GetJumpSpecialDirectionAnimNum(direction)); } -#define unk_macro_8094E18(name, direction)\ -bool8 name##_2(struct EventObject *, struct Sprite *);\ -bool8 name(struct EventObject *eventObject, struct Sprite *sprite)\ -{\ - sub_8094DE4(eventObject, sprite, direction);\ - return name##_2(eventObject, sprite);\ -}\ -bool8 name##_2(struct EventObject *eventObject, struct Sprite *sprite)\ -{\ - if (sub_80941C8(eventObject, sprite))\ - {\ - sprite->data[2] = 2;\ - eventObject->landingJump = FALSE;\ - return TRUE;\ - }\ - return FALSE;\ -} - -unk_macro_8094E18(sub_8094E18, DIR_SOUTH) -unk_macro_8094E18(sub_8094E60, DIR_NORTH) -unk_macro_8094E18(sub_8094EB8, DIR_WEST) -unk_macro_8094E18(sub_8094710, DIR_EAST) - -bool8 sub_8094F38(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - u8 eventObjectId; + sub_8094DE4(eventObject, sprite, DIR_SOUTH); + return MovementAction_JumpSpecialDown_Step1(eventObject, sprite); +} - if (!TryGetEventObjectIdByLocalIdAndMap(0xFF, 0, 0, &eventObjectId)) +bool8 MovementAction_JumpSpecialDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941C8(eventObject, sprite)) { - an_look_any(eventObject, sprite, sub_8092AF8(eventObject->currentCoords.x, eventObject->currentCoords.y, gEventObjects[eventObjectId].currentCoords.x, gEventObjects[eventObjectId].currentCoords.y)); + sprite->data[2] = 2; + eventObject->landingJump = FALSE; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_JumpSpecialUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094DE4(eventObject, sprite, DIR_NORTH); + return MovementAction_JumpSpecialUp_Step1(eventObject, sprite); +} + +bool8 MovementAction_JumpSpecialUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941C8(eventObject, sprite)) + { + sprite->data[2] = 2; + eventObject->landingJump = FALSE; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_JumpSpecialLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094DE4(eventObject, sprite, DIR_WEST); + return MovementAction_JumpSpecialLeft_Step1(eventObject, sprite); +} + +bool8 MovementAction_JumpSpecialLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941C8(eventObject, sprite)) + { + sprite->data[2] = 2; + eventObject->landingJump = FALSE; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_JumpSpecialRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094DE4(eventObject, sprite, DIR_EAST); + return MovementAction_JumpSpecialRight_Step1(eventObject, sprite); +} + +bool8 MovementAction_JumpSpecialRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941C8(eventObject, sprite)) + { + sprite->data[2] = 2; + eventObject->landingJump = FALSE; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_FacePlayer_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + u8 playerObjectId; + + if (!TryGetEventObjectIdByLocalIdAndMap(0xFF, 0, 0, &playerObjectId)) + { + FaceDirection(eventObject, sprite, GetDirectionToFace(eventObject->currentCoords.x, eventObject->currentCoords.y, gEventObjects[playerObjectId].currentCoords.x, gEventObjects[playerObjectId].currentCoords.y)); } sprite->data[2] = 1; return TRUE; } -bool8 sub_8094F94(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceAwayPlayer_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - u8 eventObjectId; + u8 playerObjectId; - if (!TryGetEventObjectIdByLocalIdAndMap(0xFF, 0, 0, &eventObjectId)) + if (!TryGetEventObjectIdByLocalIdAndMap(0xFF, 0, 0, &playerObjectId)) { - an_look_any(eventObject, sprite, GetOppositeDirection(sub_8092AF8(eventObject->currentCoords.x, eventObject->currentCoords.y, gEventObjects[eventObjectId].currentCoords.x, gEventObjects[eventObjectId].currentCoords.y))); + FaceDirection(eventObject, sprite, GetOppositeDirection(GetDirectionToFace(eventObject->currentCoords.x, eventObject->currentCoords.y, gEventObjects[playerObjectId].currentCoords.x, gEventObjects[playerObjectId].currentCoords.y))); } sprite->data[2] = 1; return TRUE; } -bool8 sub_8094FF8(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_LockFacingDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) { eventObject->facingDirectionLocked = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 sub_8095008(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_UnlockFacingDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) { eventObject->facingDirectionLocked = FALSE; sprite->data[2] = 1; return TRUE; } -maybe_shadow_1_macro(sub_8095018, maybe_shadow_1, sub_80941B0, DIR_SOUTH, 1, 2) -maybe_shadow_1_macro(sub_8095070, maybe_shadow_1, sub_80941B0, DIR_NORTH, 1, 2) -maybe_shadow_1_macro(sub_80950C8, maybe_shadow_1, sub_80941B0, DIR_WEST, 1, 2) -maybe_shadow_1_macro(sub_8095120, maybe_shadow_1, sub_80941B0, DIR_EAST, 1, 2) -maybe_shadow_1_macro(sub_8095178, maybe_shadow_1, sub_80941B0, DIR_SOUTH, 0, 0) -maybe_shadow_1_macro(sub_80951D0, maybe_shadow_1, sub_80941B0, DIR_NORTH, 0, 0) -maybe_shadow_1_macro(sub_8095228, maybe_shadow_1, sub_80941B0, DIR_WEST, 0, 0) -maybe_shadow_1_macro(sub_8095280, maybe_shadow_1, sub_80941B0, DIR_EAST, 0, 0) -maybe_shadow_1_macro(sub_80952D8, maybe_shadow_1, sub_80941E0, DIR_SOUTH, 0, 2) -maybe_shadow_1_macro(sub_8095330, maybe_shadow_1, sub_80941E0, DIR_NORTH, 0, 2) -maybe_shadow_1_macro(sub_8095388, maybe_shadow_1, sub_80941E0, DIR_WEST, 0, 2) -maybe_shadow_1_macro(sub_80953E0, maybe_shadow_1, sub_80941E0, DIR_EAST, 0, 2) - -bool8 sub_8095438(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - an_look_any(eventObject, sprite, gInitialMovementTypeFacingDirections[eventObject->movementType]); - return TRUE; + maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 1, 2); + return MovementAction_JumpDown_Step1(eventObject, sprite); } -bool8 sub_8095450(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - npc_set_direction_and_anim__an_proceed(eventObject, sprite, DIR_SOUTH, 0x14); + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = 0; + sprite->data[2] = 2; + return TRUE; + } return FALSE; } -bool8 sub_8095460(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + maybe_shadow_1(eventObject, sprite, DIR_NORTH, 1, 2); + return MovementAction_JumpUp_Step1(eventObject, sprite); +} + +bool8 MovementAction_JumpUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = 0; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_JumpLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + maybe_shadow_1(eventObject, sprite, DIR_WEST, 1, 2); + return MovementAction_JumpLeft_Step1(eventObject, sprite); +} + +bool8 MovementAction_JumpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = 0; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_JumpRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + maybe_shadow_1(eventObject, sprite, DIR_EAST, 1, 2); + return MovementAction_JumpRight_Step1(eventObject, sprite); +} + +bool8 MovementAction_JumpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = 0; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_JumpInPlaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 0, 0); + return MovementAction_JumpInPlaceDown_Step1(eventObject, sprite); +} + +bool8 MovementAction_JumpInPlaceDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = 0; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_JumpInPlaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + maybe_shadow_1(eventObject, sprite, DIR_NORTH, 0, 0); + return MovementAction_JumpInPlaceUp_Step1(eventObject, sprite); +} + +bool8 MovementAction_JumpInPlaceUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = 0; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_JumpInPlaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + maybe_shadow_1(eventObject, sprite, DIR_WEST, 0, 0); + return MovementAction_JumpInPlaceLeft_Step1(eventObject, sprite); +} + +bool8 MovementAction_JumpInPlaceLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = 0; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_JumpInPlaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + maybe_shadow_1(eventObject, sprite, DIR_EAST, 0, 0); + return MovementAction_JumpInPlaceRight_Step1(eventObject, sprite); +} + +bool8 MovementAction_JumpInPlaceRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = 0; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_JumpInPlaceDownUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 0, 2); + return MovementAction_JumpInPlaceDownUp_Step1(eventObject, sprite); +} + +bool8 MovementAction_JumpInPlaceDownUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941E0(eventObject, sprite)) + { + eventObject->hasShadow = 0; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_JumpInPlaceUpDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + maybe_shadow_1(eventObject, sprite, DIR_NORTH, 0, 2); + return MovementAction_JumpInPlaceUpDown_Step1(eventObject, sprite); +} + +bool8 MovementAction_JumpInPlaceUpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941E0(eventObject, sprite)) + { + eventObject->hasShadow = 0; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_JumpInPlaceLeftRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + maybe_shadow_1(eventObject, sprite, DIR_WEST, 0, 2); + return MovementAction_JumpInPlaceLeftRight_Step1(eventObject, sprite); +} + +bool8 MovementAction_JumpInPlaceLeftRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941E0(eventObject, sprite)) + { + eventObject->hasShadow = 0; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_JumpInPlaceRightLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + maybe_shadow_1(eventObject, sprite, DIR_EAST, 0, 2); + return MovementAction_JumpInPlaceRightLeft_Step1(eventObject, sprite); +} + +bool8 MovementAction_JumpInPlaceRightLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941E0(eventObject, sprite)) + { + eventObject->hasShadow = 0; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_FaceOriginalDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + FaceDirection(eventObject, sprite, gInitialMovementTypeFacingDirections[eventObject->movementType]); + return TRUE; +} + +bool8 MovementAction_NurseJoyBowDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, 0x14); + return FALSE; +} + +bool8 MovementAction_EnableJumpLandingGroundEffect_Step0(struct EventObject *eventObject, struct Sprite *sprite) { eventObject->disableJumpLandingGroundEffect = FALSE; sprite->data[2] = 1; return TRUE; } -bool8 sub_8095470(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_DisableJumpLandingGroundEffect_Step0(struct EventObject *eventObject, struct Sprite *sprite) { eventObject->disableJumpLandingGroundEffect = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 sub_8095480(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_DisableAnimation_Step0(struct EventObject *eventObject, struct Sprite *sprite) { eventObject->inanimate = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 sub_8095490(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RestoreAnimation_Step0(struct EventObject *eventObject, struct Sprite *sprite) { eventObject->inanimate = GetEventObjectGraphicsInfo(eventObject->graphicsId)->inanimate; sprite->data[2] = 1; return TRUE; } -bool8 sub_80954BC(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SetInvisible_Step0(struct EventObject *eventObject, struct Sprite *sprite) { eventObject->invisible = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 sub_80954CC(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SetVisible_Step0(struct EventObject *eventObject, struct Sprite *sprite) { eventObject->invisible = FALSE; sprite->data[2] = 1; return TRUE; } -bool8 do_exclamation_mark_bubble_1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_EmoteExclamationMark_Step0(struct EventObject *eventObject, struct Sprite *sprite) { EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); - FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1); + FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON); sprite->data[2] = 1; return TRUE; } -bool8 do_exclamation_mark_bubble_2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_EmoteQuestionMark_Step0(struct EventObject *eventObject, struct Sprite *sprite) { EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); - FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_2); + FieldEffectStart(FLDEFF_QUESTION_MARK_ICON); sprite->data[2] = 1; return TRUE; } -bool8 do_heart_bubble(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_EmoteHeart_Step0(struct EventObject *eventObject, struct Sprite *sprite) { EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_HEART_ICON); @@ -5601,24 +6694,24 @@ bool8 do_heart_bubble(struct EventObject *eventObject, struct Sprite *sprite) return TRUE; } -bool8 sub_8095548(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RevealTrainer_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - if (eventObject->movementType == 0x3F) + if (eventObject->movementType == MOVEMENT_TYPE_HIDDEN) { sub_80B4578(eventObject); return FALSE; } - if (eventObject->movementType != 0x39 && eventObject->movementType != 0x3A) + if (eventObject->movementType != MOVEMENT_TYPE_TREE_DISGUISE && eventObject->movementType != MOVEMENT_TYPE_MOUNTAIN_DISGUISE) { sprite->data[2] = 2; return TRUE; } sub_8155D78(eventObject); sprite->data[2] = 1; - return sub_809558C(eventObject, sprite); + return MovementAction_RevealTrainer_Step1(eventObject, sprite); } -bool8 sub_809558C(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RevealTrainer_Step1(struct EventObject *eventObject, struct Sprite *sprite) { if (sub_8155DA0(eventObject)) { @@ -5628,27 +6721,27 @@ bool8 sub_809558C(struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -bool8 sub_80955AC(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RockSmashBreak_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - obj_anim_image_set_and_seek(sprite, 1, 0); + SetAndStartSpriteAnim(sprite, 1, 0); sprite->data[2] = 1; return FALSE; } -bool8 sub_80955C8(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RockSmashBreak_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - if (sub_80979BC(sprite)) + if (SpriteAnimEnded(sprite)) { - SetEventObjectStepTimer(sprite, 32); + SetMovementDelay(sprite, 32); sprite->data[2] = 2; } return FALSE; } -bool8 sub_80955EC(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RockSmashBreak_Step2(struct EventObject *eventObject, struct Sprite *sprite) { eventObject->invisible ^= TRUE; - if (RunEventObjectStepTimer(sprite)) + if (WaitForMovementDelay(sprite)) { eventObject->invisible = TRUE; sprite->data[2] = 3; @@ -5656,27 +6749,27 @@ bool8 sub_80955EC(struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -bool8 sub_8095628(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_CutTree_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - obj_anim_image_set_and_seek(sprite, 1, 0); + SetAndStartSpriteAnim(sprite, 1, 0); sprite->data[2] = 1; return FALSE; } -bool8 sub_8095644(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_CutTree_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - if (sub_80979BC(sprite)) + if (SpriteAnimEnded(sprite)) { - SetEventObjectStepTimer(sprite, 32); + SetMovementDelay(sprite, 32); sprite->data[2] = 2; } return FALSE; } -bool8 sub_8095668(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_CutTree_Step2(struct EventObject *eventObject, struct Sprite *sprite) { eventObject->invisible ^= TRUE; - if (RunEventObjectStepTimer(sprite)) + if (WaitForMovementDelay(sprite)) { eventObject->invisible = TRUE; sprite->data[2] = 3; @@ -5684,126 +6777,229 @@ bool8 sub_8095668(struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -bool8 sub_80956A4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SetFixedPriority_Step0(struct EventObject *eventObject, struct Sprite *sprite) { eventObject->fixedPriority = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 sub_80956B4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_ClearFixedPriority_Step0(struct EventObject *eventObject, struct Sprite *sprite) { eventObject->fixedPriority = FALSE; sprite->data[2] = 1; return TRUE; } -bool8 sub_80956C4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_InitAffineAnim_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - sprite->oam.affineMode = 3; + sprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE; InitSpriteAffineAnim(sprite); sprite->affineAnimPaused = TRUE; sprite->subspriteMode = 0; return TRUE; } -bool8 sub_80956F4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_ClearAffineAnim_Step0(struct EventObject *eventObject, struct Sprite *sprite) { FreeOamMatrix(sprite->oam.matrixNum); - sprite->oam.affineMode = 0; + sprite->oam.affineMode = ST_OAM_AFFINE_OFF; CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode); return TRUE; } -bool8 sub_8095724(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Unknown1_Step0(struct EventObject *eventObject, struct Sprite *sprite) { eventObject->unk3_3 = TRUE; return TRUE; } -bool8 sub_8095730(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Unknown2_Step0(struct EventObject *eventObject, struct Sprite *sprite) { eventObject->unk3_3 = FALSE; return TRUE; } -#define affine_an_walk_any_2_macro(name, fn, fn2, action, anim, ...)\ -bool8 name##_2(struct EventObject *, struct Sprite *);\ -bool8 name(struct EventObject *eventObject, struct Sprite *sprite)\ -{\ - fn(eventObject, sprite, __VA_ARGS__);\ - sprite->affineAnimPaused = FALSE;\ - action(sprite, anim);\ - return name##_2(eventObject, sprite);\ -}\ -bool8 name##_2(struct EventObject *eventObject, struct Sprite *sprite)\ -{\ - if (fn2(eventObject, sprite))\ - {\ - sprite->affineAnimPaused = TRUE;\ - sprite->data[2] = 2;\ - return TRUE;\ - }\ - return FALSE;\ -}\ +bool8 MovementAction_WalkDownStartAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8093B60(eventObject, sprite, DIR_SOUTH); + sprite->affineAnimPaused = FALSE; + StartSpriteAffineAnimIfDifferent(sprite, 0); + return MovementAction_WalkDownStartAffine_Step1(eventObject, sprite); +} -affine_an_walk_any_2_macro(sub_8095740, sub_8093B60, an_walk_any_2, StartSpriteAffineAnimIfDifferent, 0, DIR_SOUTH) -affine_an_walk_any_2_macro(sub_80957A0, sub_8093B60, an_walk_any_2, ChangeSpriteAffineAnimIfDifferent, 1, DIR_SOUTH) -affine_an_walk_any_2_macro(sub_8095800, do_go_anim, npc_obj_ministep_stop_on_arrival, ChangeSpriteAffineAnimIfDifferent, 2, DIR_WEST, 1) -affine_an_walk_any_2_macro(sub_8095860, do_go_anim, npc_obj_ministep_stop_on_arrival, ChangeSpriteAffineAnimIfDifferent, 3, DIR_EAST, 1) +bool8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (an_walk_any_2(eventObject, sprite)) + { + sprite->affineAnimPaused = TRUE; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_WalkDownAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8093B60(eventObject, sprite, DIR_SOUTH); + sprite->affineAnimPaused = FALSE; + ChangeSpriteAffineAnimIfDifferent(sprite, 1); + return MovementAction_WalkDownAffine_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkDownAffine_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (an_walk_any_2(eventObject, sprite)) + { + sprite->affineAnimPaused = TRUE; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_WalkLeftAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + do_go_anim(eventObject, sprite, DIR_WEST, 1); + sprite->affineAnimPaused = FALSE; + ChangeSpriteAffineAnimIfDifferent(sprite, 2); + return MovementAction_WalkLeftAffine_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkLeftAffine_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->affineAnimPaused = TRUE; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_WalkRightAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + do_go_anim(eventObject, sprite, DIR_EAST, 1); + sprite->affineAnimPaused = FALSE; + ChangeSpriteAffineAnimIfDifferent(sprite, 3); + return MovementAction_WalkRightAffine_Step1(eventObject, sprite); +} + +bool8 MovementAction_WalkRightAffine_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->affineAnimPaused = TRUE; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} static void sub_80958C0(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) { - EventObjectSetDirection(eventObject, direction); - npc_coords_shift_still(eventObject); - obj_npc_animation_step(eventObject, sprite, sub_80929FC(direction)); + SetEventObjectDirection(eventObject, direction); + ShiftStillEventObjectCoords(eventObject); + obj_npc_animation_step(eventObject, sprite, GetAcroWheeliePedalDirectionAnimNum(direction)); sprite->animPaused = TRUE; sprite->data[2] = 1; } -bool8 sub_8095900(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieFaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) { sub_80958C0(eventObject, sprite, DIR_SOUTH); return TRUE; } -bool8 sub_8095910(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieFaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) { sub_80958C0(eventObject, sprite, DIR_NORTH); return TRUE; } -bool8 sub_8095920(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieFaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) { sub_80958C0(eventObject, sprite, DIR_WEST); return TRUE; } -bool8 sub_8095930(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieFaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) { sub_80958C0(eventObject, sprite, DIR_EAST); return TRUE; } -#define set_dirn_and_anim__an_proceed(name, direction, anims)\ -bool8 name(struct EventObject *eventObject, struct Sprite *sprite)\ -{\ - npc_set_direction_and_anim__an_proceed(eventObject, sprite, direction, anims(direction));\ - return FALSE;\ +bool8 MovementAction_AcroPopWheelieDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, GetAcroWheelieDirectionAnimNum(DIR_SOUTH)); + return FALSE; } -set_dirn_and_anim__an_proceed(sub_8095940, DIR_SOUTH, sub_80929BC) -set_dirn_and_anim__an_proceed(sub_8095964, DIR_NORTH, sub_80929BC) -set_dirn_and_anim__an_proceed(sub_8095988, DIR_WEST, sub_80929BC) -set_dirn_and_anim__an_proceed(sub_80959AC, DIR_EAST, sub_80929BC) -set_dirn_and_anim__an_proceed(sub_80959D0, DIR_SOUTH, sub_80929DC) -set_dirn_and_anim__an_proceed(sub_80959F4, DIR_NORTH, sub_80929DC) -set_dirn_and_anim__an_proceed(sub_8095A18, DIR_WEST, sub_80929DC) -set_dirn_and_anim__an_proceed(sub_8095A3C, DIR_EAST, sub_80929DC) -set_dirn_and_anim__an_proceed(sub_8095A60, DIR_SOUTH, sub_80929EC) -set_dirn_and_anim__an_proceed(sub_8095A84, DIR_NORTH, sub_80929EC) -set_dirn_and_anim__an_proceed(sub_8095AA8, DIR_WEST, sub_80929EC) -set_dirn_and_anim__an_proceed(sub_8095ACC, DIR_EAST, sub_80929EC) +bool8 MovementAction_AcroPopWheelieUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + StartSpriteAnimInDirection(eventObject, sprite, DIR_NORTH, GetAcroWheelieDirectionAnimNum(DIR_NORTH)); + return FALSE; +} + +bool8 MovementAction_AcroPopWheelieLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + StartSpriteAnimInDirection(eventObject, sprite, DIR_WEST, GetAcroWheelieDirectionAnimNum(DIR_WEST)); + return FALSE; +} + +bool8 MovementAction_AcroPopWheelieRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + StartSpriteAnimInDirection(eventObject, sprite, DIR_EAST, GetAcroWheelieDirectionAnimNum(DIR_EAST)); + return FALSE; +} + +bool8 MovementAction_AcroEndWheelieFaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, GetAcroEndWheelieDirectionAnimNum(DIR_SOUTH)); + return FALSE; +} + +bool8 MovementAction_AcroEndWheelieFaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + StartSpriteAnimInDirection(eventObject, sprite, DIR_NORTH, GetAcroEndWheelieDirectionAnimNum(DIR_NORTH)); + return FALSE; +} + +bool8 MovementAction_AcroEndWheelieFaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + StartSpriteAnimInDirection(eventObject, sprite, DIR_WEST, GetAcroEndWheelieDirectionAnimNum(DIR_WEST)); + return FALSE; +} + +bool8 MovementAction_AcroEndWheelieFaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + StartSpriteAnimInDirection(eventObject, sprite, DIR_EAST, GetAcroEndWheelieDirectionAnimNum(DIR_EAST)); + return FALSE; +} + +bool8 MovementAction_UnusedAcroActionDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, GetAcroUnusedActionDirectionAnimNum(DIR_SOUTH)); + return FALSE; +} + +bool8 MovementAction_UnusedAcroActionUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + StartSpriteAnimInDirection(eventObject, sprite, DIR_NORTH, GetAcroUnusedActionDirectionAnimNum(DIR_NORTH)); + return FALSE; +} + +bool8 MovementAction_UnusedAcroActionLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + StartSpriteAnimInDirection(eventObject, sprite, DIR_WEST, GetAcroUnusedActionDirectionAnimNum(DIR_WEST)); + return FALSE; +} + +bool8 MovementAction_UnusedAcroActionRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + StartSpriteAnimInDirection(eventObject, sprite, DIR_EAST, GetAcroUnusedActionDirectionAnimNum(DIR_EAST)); + return FALSE; +} void sub_8095AF0(struct EventObject *eventObject, struct Sprite *sprite) { @@ -5815,7 +7011,7 @@ bool8 sub_8095B0C(struct EventObject *eventObject, struct Sprite *sprite) { if (sub_8097758(sprite)) { - npc_coords_shift_still(eventObject); + ShiftStillEventObjectCoords(eventObject); eventObject->triggerGroundEffectsOnStop = TRUE; sprite->animPaused = TRUE; return TRUE; @@ -5823,14 +7019,14 @@ bool8 sub_8095B0C(struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -bool8 sub_8095B44(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Figure8_Step0(struct EventObject *eventObject, struct Sprite *sprite) { sub_8095AF0(eventObject, sprite); sprite->data[2] = 1; - return sub_8095B64(eventObject, sprite); + return MovementAction_Figure8_Step1(eventObject, sprite); } -bool8 sub_8095B64(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Figure8_Step1(struct EventObject *eventObject, struct Sprite *sprite) { if (sub_8095B0C(eventObject, sprite)) { @@ -5843,100 +7039,488 @@ bool8 sub_8095B64(struct EventObject *eventObject, struct Sprite *sprite) void sub_8095B84(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a4) { sub_8093FC4(eventObject, sprite, direction, speed, a4); - StartSpriteAnimIfDifferent(sprite, sub_80929BC(direction)); + StartSpriteAnimIfDifferent(sprite, GetAcroWheelieDirectionAnimNum(direction)); DoShadowFieldEffect(eventObject); } -maybe_shadow_1_macro(sub_8095BC8, sub_8095B84, sub_80941B0, DIR_SOUTH, 0, 1) -maybe_shadow_1_macro(sub_8095C20, sub_8095B84, sub_80941B0, DIR_NORTH, 0, 1) -maybe_shadow_1_macro(sub_8095C78, sub_8095B84, sub_80941B0, DIR_WEST, 0, 1) -maybe_shadow_1_macro(sub_8095CD0, sub_8095B84, sub_80941B0, DIR_EAST, 0, 1) -maybe_shadow_1_macro(sub_8095D28, sub_8095B84, sub_80941B0, DIR_SOUTH, 1, 1) -maybe_shadow_1_macro(sub_8095D80, sub_8095B84, sub_80941B0, DIR_NORTH, 1, 1) -maybe_shadow_1_macro(sub_8095DD8, sub_8095B84, sub_80941B0, DIR_WEST, 1, 1) -maybe_shadow_1_macro(sub_8095E30, sub_8095B84, sub_80941B0, DIR_EAST, 1, 1) -maybe_shadow_1_macro(sub_8095E88, sub_8095B84, sub_80941B0, DIR_SOUTH, 2, 0) -maybe_shadow_1_macro(sub_8095EE0, sub_8095B84, sub_80941B0, DIR_NORTH, 2, 0) -maybe_shadow_1_macro(sub_8095F38, sub_8095B84, sub_80941B0, DIR_WEST, 2, 0) -maybe_shadow_1_macro(sub_8095F90, sub_8095B84, sub_80941B0, DIR_EAST, 2, 0) +bool8 MovementAction_AcroWheelieHopFaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8095B84(eventObject, sprite, DIR_SOUTH, 0, 1); + return MovementAction_AcroWheelieHopFaceDown_Step1(eventObject, sprite); +} -special_anim_with_timer_2(sub_8095FE8, SOUTH, sub_80929FC, 8, sub_809459C) -special_anim_with_timer_2(sub_8096020, NORTH, sub_80929FC, 8, sub_809459C) -special_anim_with_timer_2(sub_8096058, WEST, sub_80929FC, 8, sub_809459C) -special_anim_with_timer_2(sub_8096090, EAST, sub_80929FC, 8, sub_809459C) +bool8 MovementAction_AcroWheelieHopFaceDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = FALSE; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_AcroWheelieHopFaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8095B84(eventObject, sprite, DIR_NORTH, 0, 1); + return MovementAction_AcroWheelieHopFaceUp_Step1(eventObject, sprite); +} + +bool8 MovementAction_AcroWheelieHopFaceUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = FALSE; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8095B84(eventObject, sprite, DIR_WEST, 0, 1); + return MovementAction_AcroWheelieHopFaceLeft_Step1(eventObject, sprite); +} + +bool8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = FALSE; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_AcroWheelieHopFaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8095B84(eventObject, sprite, DIR_EAST, 0, 1); + return MovementAction_AcroWheelieHopFaceRight_Step1(eventObject, sprite); +} + +bool8 MovementAction_AcroWheelieHopFaceRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = FALSE; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_AcroWheelieHopDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8095B84(eventObject, sprite, DIR_SOUTH, 1, 1); + return MovementAction_AcroWheelieHopDown_Step1(eventObject, sprite); +} + +bool8 MovementAction_AcroWheelieHopDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = FALSE; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_AcroWheelieHopUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8095B84(eventObject, sprite, DIR_NORTH, 1, 1); + return MovementAction_AcroWheelieHopUp_Step1(eventObject, sprite); +} + +bool8 MovementAction_AcroWheelieHopUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = FALSE; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_AcroWheelieHopLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8095B84(eventObject, sprite, DIR_WEST, 1, 1); + return MovementAction_AcroWheelieHopLeft_Step1(eventObject, sprite); +} + +bool8 MovementAction_AcroWheelieHopLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = FALSE; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_AcroWheelieHopRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8095B84(eventObject, sprite, DIR_EAST, 1, 1); + return MovementAction_AcroWheelieHopRight_Step1(eventObject, sprite); +} + +bool8 MovementAction_AcroWheelieHopRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = FALSE; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_AcroWheelieJumpDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8095B84(eventObject, sprite, DIR_SOUTH, 2, 0); + return MovementAction_AcroWheelieJumpDown_Step1(eventObject, sprite); +} + +bool8 MovementAction_AcroWheelieJumpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = FALSE; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_AcroWheelieJumpUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8095B84(eventObject, sprite, DIR_NORTH, 2, 0); + return MovementAction_AcroWheelieJumpUp_Step1(eventObject, sprite); +} + +bool8 MovementAction_AcroWheelieJumpUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = FALSE; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_AcroWheelieJumpLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8095B84(eventObject, sprite, DIR_WEST, 2, 0); + return MovementAction_AcroWheelieJumpLeft_Step1(eventObject, sprite); +} + +bool8 MovementAction_AcroWheelieJumpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = FALSE; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_AcroWheelieJumpRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8095B84(eventObject, sprite, DIR_EAST, 2, 0); + return MovementAction_AcroWheelieJumpRight_Step1(eventObject, sprite); +} + +bool8 MovementAction_AcroWheelieJumpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (sub_80941B0(eventObject, sprite)) + { + eventObject->hasShadow = FALSE; + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_AcroWheelieInPlaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094554(eventObject, sprite, DIR_SOUTH, GetAcroWheeliePedalDirectionAnimNum(DIR_SOUTH), 8); + return MovementAction_WalkInPlace_Step1(eventObject, sprite); +} + +bool8 MovementAction_AcroWheelieInPlaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094554(eventObject, sprite, DIR_NORTH, GetAcroWheeliePedalDirectionAnimNum(DIR_NORTH), 8); + return MovementAction_WalkInPlace_Step1(eventObject, sprite); +} + +bool8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094554(eventObject, sprite, DIR_WEST, GetAcroWheeliePedalDirectionAnimNum(DIR_WEST), 8); + return MovementAction_WalkInPlace_Step1(eventObject, sprite); +} + +bool8 MovementAction_AcroWheelieInPlaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8094554(eventObject, sprite, DIR_EAST, GetAcroWheeliePedalDirectionAnimNum(DIR_EAST), 8); + return MovementAction_WalkInPlace_Step1(eventObject, sprite); +} void sub_80960C8(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) { npc_apply_direction(eventObject, sprite, direction, speed); - StartSpriteAnim(sprite, sub_80929BC(eventObject->facingDirection)); + StartSpriteAnim(sprite, GetAcroWheelieDirectionAnimNum(eventObject->facingDirection)); SeekSpriteAnim(sprite, 0); } -an_walk_any_2_macro(sub_8096100, sub_80960C8, npc_obj_ministep_stop_on_arrival, DIR_SOUTH, 1) -an_walk_any_2_macro(sub_8096140, sub_80960C8, npc_obj_ministep_stop_on_arrival, DIR_NORTH, 1) -an_walk_any_2_macro(sub_8096180, sub_80960C8, npc_obj_ministep_stop_on_arrival, DIR_WEST, 1) -an_walk_any_2_macro(sub_80961C0, sub_80960C8, npc_obj_ministep_stop_on_arrival, DIR_EAST, 1) +bool8 MovementAction_AcroPopWheelieMoveDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_80960C8(eventObject, sprite, DIR_SOUTH, 1); + return MovementAction_AcroPopWheelieMoveDown_Step1(eventObject, sprite); +} + +bool8 MovementAction_AcroPopWheelieMoveDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_AcroPopWheelieMoveUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_80960C8(eventObject, sprite, DIR_NORTH, 1); + return MovementAction_AcroPopWheelieMoveUp_Step1(eventObject, sprite); +} + +bool8 MovementAction_AcroPopWheelieMoveUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_80960C8(eventObject, sprite, DIR_WEST, 1); + return MovementAction_AcroPopWheelieMoveLeft_Step1(eventObject, sprite); +} + +bool8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_AcroPopWheelieMoveRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_80960C8(eventObject, sprite, DIR_EAST, 1); + return MovementAction_AcroPopWheelieMoveRight_Step1(eventObject, sprite); +} + +bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} void sub_8096200(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) { npc_apply_direction(eventObject, sprite, direction, speed); - npc_apply_anim_looping(eventObject, sprite, sub_80929FC(eventObject->facingDirection)); + npc_apply_anim_looping(eventObject, sprite, GetAcroWheeliePedalDirectionAnimNum(eventObject->facingDirection)); } -an_walk_any_2_macro(sub_8096230, sub_8096200, npc_obj_ministep_stop_on_arrival, DIR_SOUTH, 1) -an_walk_any_2_macro(sub_8096270, sub_8096200, npc_obj_ministep_stop_on_arrival, DIR_NORTH, 1) -an_walk_any_2_macro(sub_80962B0, sub_8096200, npc_obj_ministep_stop_on_arrival, DIR_WEST, 1) -an_walk_any_2_macro(sub_80962F0, sub_8096200, npc_obj_ministep_stop_on_arrival, DIR_EAST, 1) +bool8 MovementAction_AcroWheelieMoveDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8096200(eventObject, sprite, DIR_SOUTH, 1); + return MovementAction_AcroWheelieMoveDown_Step1(eventObject, sprite); +} + +bool8 MovementAction_AcroWheelieMoveDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_AcroWheelieMoveUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8096200(eventObject, sprite, DIR_NORTH, 1); + return MovementAction_AcroWheelieMoveUp_Step1(eventObject, sprite); +} + +bool8 MovementAction_AcroWheelieMoveUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_AcroWheelieMoveLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8096200(eventObject, sprite, DIR_WEST, 1); + return MovementAction_AcroWheelieMoveLeft_Step1(eventObject, sprite); +} + +bool8 MovementAction_AcroWheelieMoveLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_AcroWheelieMoveRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8096200(eventObject, sprite, DIR_EAST, 1); + return MovementAction_AcroWheelieMoveRight_Step1(eventObject, sprite); +} + +bool8 MovementAction_AcroWheelieMoveRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} void sub_8096330(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) { npc_apply_direction(eventObject, sprite, direction, speed); - StartSpriteAnim(sprite, sub_80929DC(eventObject->facingDirection)); + StartSpriteAnim(sprite, GetAcroEndWheelieDirectionAnimNum(eventObject->facingDirection)); SeekSpriteAnim(sprite, 0); } -an_walk_any_2_macro(sub_8096368, sub_8096330, npc_obj_ministep_stop_on_arrival, DIR_SOUTH, 1) -an_walk_any_2_macro(sub_80963A8, sub_8096330, npc_obj_ministep_stop_on_arrival, DIR_NORTH, 1) -an_walk_any_2_macro(sub_80963E8, sub_8096330, npc_obj_ministep_stop_on_arrival, DIR_WEST, 1) -an_walk_any_2_macro(sub_8096428, sub_8096330, npc_obj_ministep_stop_on_arrival, DIR_EAST, 1) -bool8 sub_8096468(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - sub_8097FA4(eventObject); + sub_8096330(eventObject, sprite, DIR_SOUTH, 1); + return MovementAction_AcroEndWheelieMoveDown_Step1(eventObject, sprite); +} + +bool8 MovementAction_AcroEndWheelieMoveDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_AcroEndWheelieMoveUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8096330(eventObject, sprite, DIR_NORTH, 1); + return MovementAction_AcroEndWheelieMoveUp_Step1(eventObject, sprite); +} + +bool8 MovementAction_AcroEndWheelieMoveUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_AcroEndWheelieMoveLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8096330(eventObject, sprite, DIR_WEST, 1); + return MovementAction_AcroEndWheelieMoveLeft_Step1(eventObject, sprite); +} + +bool8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_AcroEndWheelieMoveRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + sub_8096330(eventObject, sprite, DIR_EAST, 1); + return MovementAction_AcroEndWheelieMoveRight_Step1(eventObject, sprite); +} + +bool8 MovementAction_AcroEndWheelieMoveRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +{ + if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + { + sprite->data[2] = 2; + return TRUE; + } + return FALSE; +} + +bool8 MovementAction_Levitate_Step0(struct EventObject *eventObject, struct Sprite *sprite) +{ + CreateLevitateMovementTask(eventObject); sprite->data[2] = 1; return TRUE; } -bool8 sub_809647C(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_StopLevitate_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - sub_8098044(eventObject->warpArrowSpriteId); + DestroyExtraMovementTask(eventObject->warpArrowSpriteId); sprite->pos2.y = 0; sprite->data[2] = 1; return TRUE; } -bool8 sub_8096494(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_DestroyExtraTaskIfAtTop_Step0(struct EventObject *eventObject, struct Sprite *sprite) { if (sprite->pos2.y == 0) { - sub_8098044(eventObject->warpArrowSpriteId); + DestroyExtraMovementTask(eventObject->warpArrowSpriteId); sprite->data[2] = 1; return TRUE; } return FALSE; } -u8 sub_80964B8(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_Finish(struct EventObject *eventObject, struct Sprite *sprite) { return TRUE; } -bool8 sub_80964BC(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PauseSpriteAnim(struct EventObject *eventObject, struct Sprite *sprite) { sprite->animPaused = TRUE; return TRUE; } -void npc_obj_transfer_image_anim_pause_flag(struct EventObject *eventObject, struct Sprite *sprite) +static void UpdateEventObjectSpriteAnimPause(struct EventObject *eventObject, struct Sprite *sprite) { if (eventObject->disableAnim) { @@ -5944,7 +7528,7 @@ void npc_obj_transfer_image_anim_pause_flag(struct EventObject *eventObject, str } } -void sub_80964E8(struct EventObject *eventObject, struct Sprite *sprite) +static void TryEnableEventObjectAnim(struct EventObject *eventObject, struct Sprite *sprite) { if (eventObject->enableAnim) { @@ -5954,7 +7538,7 @@ void sub_80964E8(struct EventObject *eventObject, struct Sprite *sprite) } } -static void sub_8096518(struct EventObject *eventObject, struct Sprite *sprite) +static void UpdateEventObjectVisibility(struct EventObject *eventObject, struct Sprite *sprite) { sub_8096530(eventObject, sprite); npc_update_obj_anim_flag(eventObject, sprite); @@ -6784,7 +8368,7 @@ void FreezeEventObjectsExceptOne(u8 a1) FreezeEventObject(&gEventObjects[i]); } -void npc_sync_anim_pause_bits(struct EventObject *eventObject) +void UnfreezeEventObject(struct EventObject *eventObject) { if (eventObject->active && eventObject->frozen) { @@ -6799,34 +8383,34 @@ void UnfreezeEventObjects(void) u8 i; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) if (gEventObjects[i].active) - npc_sync_anim_pause_bits(&gEventObjects[i]); + UnfreezeEventObject(&gEventObjects[i]); } -void little_step(struct Sprite *sprite, u8 dir) +void Step1(struct Sprite *sprite, u8 dir) { sprite->pos1.x += gDirectionToVectors[dir].x; sprite->pos1.y += gDirectionToVectors[dir].y; } -void double_little_steps(struct Sprite *sprite, u8 dir) +void Step2(struct Sprite *sprite, u8 dir) { sprite->pos1.x += 2 * (u16) gDirectionToVectors[dir].x; sprite->pos1.y += 2 * (u16) gDirectionToVectors[dir].y; } -void triple_little_steps(struct Sprite *sprite, u8 dir) +void Step3(struct Sprite *sprite, u8 dir) { sprite->pos1.x += 2 * (u16) gDirectionToVectors[dir].x + (u16) gDirectionToVectors[dir].x; sprite->pos1.y += 2 * (u16) gDirectionToVectors[dir].y + (u16) gDirectionToVectors[dir].y; } -void quad_little_steps(struct Sprite *sprite, u8 dir) +void Step4(struct Sprite *sprite, u8 dir) { sprite->pos1.x += 4 * (u16) gDirectionToVectors[dir].x; sprite->pos1.y += 4 * (u16) gDirectionToVectors[dir].y; } -void oct_little_steps(struct Sprite *sprite, u8 dir) +void Step8(struct Sprite *sprite, u8 dir) { sprite->pos1.x += 8 * (u16) gDirectionToVectors[dir].x; sprite->pos1.y += 8 * (u16) gDirectionToVectors[dir].y; @@ -6842,54 +8426,54 @@ void oamt_npc_ministep_reset(struct Sprite *sprite, u8 a2, u8 a3) typedef void (*SpriteStepFunc)(struct Sprite *sprite, u8 dir); static const SpriteStepFunc gUnknown_0850E6C4[] = { - little_step, - little_step, - little_step, - little_step, - little_step, - little_step, - little_step, - little_step, - little_step, - little_step, - little_step, - little_step, - little_step, - little_step, - little_step, - little_step, + Step1, + Step1, + Step1, + Step1, + Step1, + Step1, + Step1, + Step1, + Step1, + Step1, + Step1, + Step1, + Step1, + Step1, + Step1, + Step1, }; static const SpriteStepFunc gUnknown_0850E704[] = { - double_little_steps, - double_little_steps, - double_little_steps, - double_little_steps, - double_little_steps, - double_little_steps, - double_little_steps, - double_little_steps, + Step2, + Step2, + Step2, + Step2, + Step2, + Step2, + Step2, + Step2, }; static const SpriteStepFunc gUnknown_0850E724[] = { - double_little_steps, - triple_little_steps, - triple_little_steps, - double_little_steps, - triple_little_steps, - triple_little_steps, + Step2, + Step3, + Step3, + Step2, + Step3, + Step3, }; static const SpriteStepFunc gUnknown_0850E73C[] = { - quad_little_steps, - quad_little_steps, - quad_little_steps, - quad_little_steps, + Step4, + Step4, + Step4, + Step4, }; static const SpriteStepFunc gUnknown_0850E74C[] = { - oct_little_steps, - oct_little_steps, + Step8, + Step8, }; static const SpriteStepFunc *const gUnknown_0850E754[] = { @@ -6930,7 +8514,7 @@ bool8 sub_80976EC(struct Sprite *sprite) { if (!(sprite->data[4] & 1)) { - little_step(sprite, sprite->data[3]); + Step1(sprite, sprite->data[3]); sprite->data[5]++; } @@ -7069,7 +8653,7 @@ u8 sub_809785C(struct Sprite *sprite) v2 = 0; if (sprite->data[4]) - little_step(sprite, sprite->data[3]); + Step1(sprite, sprite->data[3]); sprite->pos2.y = sub_8097820(sprite->data[6] >> v6[sprite->data[4]], sprite->data[5]); @@ -7106,7 +8690,7 @@ u8 sub_80978E4(struct Sprite *sprite) v2 = 0; if (sprite->data[4] && !(sprite->data[6] & 1)) - little_step(sprite, sprite->data[3]); + Step1(sprite, sprite->data[3]); sprite->pos2.y = sub_8097820(sprite->data[6] >> v6[sprite->data[4]], sprite->data[5]); @@ -7124,12 +8708,12 @@ u8 sub_80978E4(struct Sprite *sprite) return v2; } -void SetEventObjectStepTimer(struct Sprite *sprite, s16 timer) +void SetMovementDelay(struct Sprite *sprite, s16 timer) { sprite->data[3] = timer; } -bool8 RunEventObjectStepTimer(struct Sprite *sprite) +static bool8 WaitForMovementDelay(struct Sprite *sprite) { sprite->data[3]--; @@ -7139,14 +8723,14 @@ bool8 RunEventObjectStepTimer(struct Sprite *sprite) return FALSE; } -void obj_anim_image_set_and_seek(struct Sprite *sprite, u8 a2, u8 a3) +void SetAndStartSpriteAnim(struct Sprite *sprite, u8 a2, u8 a3) { sprite->animNum = a2; sprite->animPaused = 0 ; SeekSpriteAnim(sprite, a3); } -bool8 sub_80979BC(struct Sprite *sprite) +bool8 SpriteAnimEnded(struct Sprite *sprite) { if (sprite->animEnded) return TRUE; @@ -7154,7 +8738,7 @@ bool8 sub_80979BC(struct Sprite *sprite) return FALSE; } -void sub_80979D4(struct Sprite *sprite, bool8 invisible) +void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible) { u16 x, y; s16 x2, y2; @@ -7181,11 +8765,11 @@ void sub_80979D4(struct Sprite *sprite, bool8 invisible) sprite->invisible = 1; } -void sub_8097AC8(struct Sprite *sprite) +void UpdateEventObjectSpriteSubpriorityAndVisibility(struct Sprite *sprite) { sub_8097D68(sprite); SetObjectSubpriorityByZCoord(sprite->data[1], sprite, 1); - sub_80979D4(sprite, sprite->data[2]); + UpdateEventObjectSpriteVisibility(sprite, sprite->data[2]); } void sub_8097AF0(void) @@ -7195,7 +8779,7 @@ void sub_8097AF0(void) for(i = 0; i < MAX_SPRITES; i++) { struct Sprite *sprite = &gSprites[i]; - if(sprite->inUse && sprite->callback == sub_8097AC8) + if(sprite->inUse && sprite->callback == UpdateEventObjectSpriteSubpriorityAndVisibility) DestroySprite(sprite); } } @@ -7207,7 +8791,7 @@ int sub_8097B2C(u8 var) // this should return a u8, because all that call this s for(i = 0; i < MAX_SPRITES; i++) { struct Sprite *sprite = &gSprites[i]; - if(sprite->inUse && sprite->callback == sub_8097AC8 && (u8)sprite->data[0] == var) + if(sprite->inUse && sprite->callback == UpdateEventObjectSpriteSubpriorityAndVisibility && (u8)sprite->data[0] == var) return i; } return MAX_SPRITES; @@ -7218,7 +8802,7 @@ void sub_8097B78(u8 var1, u8 var2) u8 spriteId = sub_8097B2C(var1); if(spriteId != MAX_SPRITES) - StartSpriteAnim(&gSprites[spriteId], EventObjectDirectionToImageAnimId(var2)); + StartSpriteAnim(&gSprites[spriteId], GetFaceDirectionAnimNum(var2)); } void sub_8097BB4(u8 var1, u8 var2) @@ -7377,38 +8961,38 @@ static void DoRippleFieldEffect(struct EventObject *eventObject, struct Sprite * FieldEffectStart(FLDEFF_RIPPLE); } -u8 (*const gUnknown_0850E854[])(struct EventObject *, struct Sprite *) = { - sub_8097E50, - sub_80964B8, +u8 (*const gMovementActionFuncs_StoreAndLockAnim[])(struct EventObject *, struct Sprite *) = { + MovementAction_StoreAndLockAnim_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E85C[])(struct EventObject *, struct Sprite *) = { - sub_8097EF0, - sub_80964B8, +u8 (*const gMovementActionFuncs_FreeAndUnlockAnim[])(struct EventObject *, struct Sprite *) = { + MovementAction_FreeAndUnlockAnim_Step0, + MovementAction_Finish, }; -u8 (*const gUnknown_0850E864[])(struct EventObject *, struct Sprite *) = { - sub_80980C0, - sub_80980D0, - sub_8098124, +u8 (*const gMovementActionFuncs_FlyUp[])(struct EventObject *, struct Sprite *) = { + MovementAction_FlyUp_Step0, + MovementAction_FlyUp_Step1, + MovementAction_Fly_Finish, }; -u8 (*const gUnknown_0850E870[])(struct EventObject *, struct Sprite *) = { - sub_80980F4, - sub_8098108, - sub_8098124, +u8 (*const gMovementActionFuncs_FlyDown[])(struct EventObject *, struct Sprite *) = { + MovementAction_FlyDown_Step0, + MovementAction_FlyDown_Step1, + MovementAction_Fly_Finish, }; -u8 sub_8097E50(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_StoreAndLockAnim_Step0(struct EventObject *eventObject, struct Sprite *sprite) { u32 one; bool32 ableToStore = FALSE; - if (gUnknown_020375B8 == NULL) + if (gLockedAnimEventObjects == NULL) { - gUnknown_020375B8 = AllocZeroed(0x14); - gUnknown_020375B8[0] = eventObject->localId; + gLockedAnimEventObjects = AllocZeroed(sizeof(struct LockedAnimEventObjects)); + gLockedAnimEventObjects->eventObjectIds[0] = eventObject->localId; // needed to match - gUnknown_020375B8[16] = (one = 1); + gLockedAnimEventObjects->count = (one = 1); ableToStore = one; } else @@ -7418,10 +9002,10 @@ u8 sub_8097E50(struct EventObject *eventObject, struct Sprite *sprite) bool32 found; for (firstFreeSlot = 16, found = FALSE, i = 0; i < 16; i++) { - if (firstFreeSlot == 16 && gUnknown_020375B8[i] == 0) + if (firstFreeSlot == 16 && gLockedAnimEventObjects->eventObjectIds[i] == 0) firstFreeSlot = i; - if (gUnknown_020375B8[i] == eventObject->localId) + if (gLockedAnimEventObjects->eventObjectIds[i] == eventObject->localId) { found = TRUE; break; @@ -7430,8 +9014,8 @@ u8 sub_8097E50(struct EventObject *eventObject, struct Sprite *sprite) if (!found && firstFreeSlot != 16) { - gUnknown_020375B8[firstFreeSlot] = eventObject->localId; - gUnknown_020375B8[16]++; + gLockedAnimEventObjects->eventObjectIds[firstFreeSlot] = eventObject->localId; + gLockedAnimEventObjects->count++; ableToStore = TRUE; } } @@ -7446,28 +9030,28 @@ u8 sub_8097E50(struct EventObject *eventObject, struct Sprite *sprite) return TRUE; } -u8 sub_8097EF0(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_FreeAndUnlockAnim_Step0(struct EventObject *eventObject, struct Sprite *sprite) { bool32 ableToStore; - u8 id; + u8 index; sprite->data[2] = 1; - if (gUnknown_020375B8 != NULL) + if (gLockedAnimEventObjects != NULL) { ableToStore = FALSE; - id = sub_8097F78(eventObject); - if (id != 16) + index = FindLockedEventObjectIndex(eventObject); + if (index != 16) { - gUnknown_020375B8[id] = 0; - gUnknown_020375B8[16]--; + gLockedAnimEventObjects->eventObjectIds[index] = 0; + gLockedAnimEventObjects->count--; ableToStore = TRUE; } - if (gUnknown_020375B8[16] == 0) - FREE_AND_SET_NULL(gUnknown_020375B8); + if (gLockedAnimEventObjects->count == 0) + FREE_AND_SET_NULL(gLockedAnimEventObjects); if (ableToStore == TRUE) { eventObject->inanimate = GetEventObjectGraphicsInfo(eventObject->graphicsId)->inanimate; - eventObject->facingDirectionLocked = 0; + eventObject->facingDirectionLocked = FALSE; sprite->animPaused = 0; } } @@ -7475,21 +9059,21 @@ u8 sub_8097EF0(struct EventObject *eventObject, struct Sprite *sprite) return TRUE; } -u8 sub_8097F78(struct EventObject *eventObject) +u8 FindLockedEventObjectIndex(struct EventObject *eventObject) { u8 i; - for(i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { - if(gUnknown_020375B8[i] == eventObject->localId) + if (gLockedAnimEventObjects->eventObjectIds[i] == eventObject->localId) return i; } return EVENT_OBJECTS_COUNT; } -void sub_8097FA4(struct EventObject *eventObject) +void CreateLevitateMovementTask(struct EventObject *eventObject) { - u8 taskId = CreateTask(sub_8097FE4, 0xFF); + u8 taskId = CreateTask(ApplyLevitateMovement, 0xFF); struct Task *task = &gTasks[taskId]; StoreWordInTwoHalfwords(&task->data[0], (u32)eventObject); @@ -7497,7 +9081,7 @@ void sub_8097FA4(struct EventObject *eventObject) task->data[3] = 0xFFFF; } -static void sub_8097FE4(u8 taskId) +static void ApplyLevitateMovement(u8 taskId) { struct EventObject *eventObject; struct Sprite *sprite; @@ -7515,12 +9099,12 @@ static void sub_8097FE4(u8 taskId) task->data[2]++; } -void sub_8098044(u8 taskId) +void DestroyExtraMovementTask(u8 taskId) { - u32 word; + struct EventObject *eventObject; struct Task *task = &gTasks[taskId]; - LoadWordFromTwoHalfwords(&task->data[0], &word); // huh??? why does it load a word that never gets used??? + LoadWordFromTwoHalfwords(&task->data[0], (u32 *)&eventObject); // unused eventObject DestroyTask(taskId); } @@ -7536,14 +9120,14 @@ void sub_8098074(u8 var1, u8 var2) } } -u8 sub_80980C0(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_FlyUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) { sprite->pos2.y = 0; sprite->data[2]++; return FALSE; } -u8 sub_80980D0(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_FlyUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) { sprite->pos2.y -= 8; @@ -7552,14 +9136,14 @@ u8 sub_80980D0(struct EventObject *eventObject, struct Sprite *sprite) return FALSE; } -u8 sub_80980F4(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_FlyDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) { sprite->pos2.y = -160; sprite->data[2]++; return FALSE; } -u8 sub_8098108(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_FlyDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) { sprite->pos2.y += 8; @@ -7569,7 +9153,7 @@ u8 sub_8098108(struct EventObject *eventObject, struct Sprite *sprite) } // though this function returns TRUE without doing anything, this header is required due to being in an array of functions which needs it. -u8 sub_8098124(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_Fly_Finish(struct EventObject *eventObject, struct Sprite *sprite) { return TRUE; } diff --git a/src/field_camera.c b/src/field_camera.c index f4d9550a30..d7063bd89a 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -477,7 +477,7 @@ static void CameraPanningCB_PanAhead(void) gUnknown_03000E2C = 0; } - var = player_get_direction_upper_nybble(); + var = GetPlayerMovementDirection(); if (var == 2) { if (gUnknown_03000E2A > -8) diff --git a/src/field_effect.c b/src/field_effect.c index 4ad3bd9164..00814192ec 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -1246,7 +1246,7 @@ bool8 sub_80B6BCC(struct Task *task) // gUnknown_0855C3C8[0] CameraObjectReset2(); gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1; gPlayerAvatar.preventStep = TRUE; - EventObjectSetSpecialAnim(playerObject, GetFaceDirectionAnimId(player_get_direction_lower_nybble())); + EventObjectSetHeldMovement(playerObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection())); task->data[4] = playerSprite->subspriteMode; playerObject->fixedPriority = 1; playerSprite->oam.priority = 1; @@ -1393,9 +1393,9 @@ bool8 sub_80B6EE0(struct Task *task) { struct EventObject *eventObject; eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(eventObject) || EventObjectClearAnimIfSpecialAnimFinished(eventObject)) + if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) { - EventObjectSetSpecialAnim(eventObject, GetFaceDirectionAnimId(player_get_direction_lower_nybble())); + EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection())); task->data[0]++; task->data[2] = 0; task->data[3] = 0; @@ -1512,7 +1512,7 @@ bool8 sub_80B7114(struct Task *task) u8 behavior; CameraObjectReset2(); eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectSetSpecialAnim(eventObject, GetFaceDirectionAnimId(DIR_EAST)); + EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(DIR_EAST)); PlayerGetDestCoords(&x, &y); behavior = MapGridGetMetatileBehaviorAt(x, y); task->data[0]++; @@ -1606,11 +1606,11 @@ bool8 sub_80B72F4(struct Task *task) { struct EventObject *eventObject; eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectClearAnimIfSpecialAnimFinished(eventObject)) + if (EventObjectClearHeldMovementIfFinished(eventObject)) { CameraObjectReset1(); ScriptContext2_Disable(); - EventObjectSetSpecialAnim(eventObject, GetGoSpeed0AnimId(DIR_EAST)); + EventObjectSetHeldMovement(eventObject, GetWalkNormalMovementAction(DIR_EAST)); DestroyTask(FindTaskIdByFunc(sub_80B70DC)); } return FALSE; @@ -1643,9 +1643,9 @@ bool8 sub_80B73D0(struct Task *task, struct EventObject *eventObject) bool8 waterfall_1_do_anim_probably(struct Task *task, struct EventObject *eventObject) { ScriptContext2_Enable(); - if (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(eventObject)) + if (!EventObjectIsMovementOverridden(eventObject)) { - EventObjectClearAnimIfSpecialAnimFinished(eventObject); + EventObjectClearHeldMovementIfFinished(eventObject); gFieldEffectArguments[0] = task->data[1]; FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); task->data[0]++; @@ -1665,14 +1665,14 @@ bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct EventObjec bool8 sub_80B7450(struct Task *task, struct EventObject *eventObject) { - EventObjectSetSpecialAnim(eventObject, GetSimpleGoAnimId(DIR_NORTH)); + EventObjectSetHeldMovement(eventObject, GetWalkSlowMovementAction(DIR_NORTH)); task->data[0]++; return FALSE; } bool8 sub_80B7478(struct Task *task, struct EventObject *eventObject) { - if (!EventObjectClearAnimIfSpecialAnimFinished(eventObject)) + if (!EventObjectClearHeldMovementIfFinished(eventObject)) { return FALSE; } @@ -1899,14 +1899,14 @@ bool8 sub_80B7968(struct Task *task, struct EventObject *eventObject, struct Spr eventObject->invisible = 0; CameraObjectReset1(); PlaySE(SE_W091); - EventObjectSetSpecialAnim(eventObject, sub_8093514(DIR_EAST)); + EventObjectSetHeldMovement(eventObject, GetJumpMovementAction(DIR_EAST)); } return FALSE; } bool8 sub_80B79BC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) { - if (EventObjectClearAnimIfSpecialAnimFinished(eventObject)) + if (EventObjectClearHeldMovementIfFinished(eventObject)) { gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); @@ -1960,7 +1960,7 @@ bool8 sub_80B7AE8(struct Task *task, struct EventObject *eventObject, struct Spr bool8 sub_80B7B18(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) { - if (EventObjectClearAnimIfSpecialAnimFinished(eventObject)) + if (EventObjectClearHeldMovementIfFinished(eventObject)) { if (task->data[1] > 3) { @@ -1973,7 +1973,7 @@ bool8 sub_80B7B18(struct Task *task, struct EventObject *eventObject, struct Spr } else { task->data[1]++; - EventObjectSetSpecialAnim(eventObject, GetStepInPlaceDelay4AnimId(eventObject->facingDirection)); + EventObjectSetHeldMovement(eventObject, GetWalkInPlaceFastestMovementAction(eventObject->facingDirection)); PlaySE(SE_FU_ZUZUZU); } } @@ -2050,7 +2050,7 @@ void sub_80B7D14(struct Task *task) { task->data[0]++; task->data[14] = 64; - task->data[15] = player_get_direction_lower_nybble(); + task->data[15] = GetPlayerFacingDirection(); } void sub_80B7D34(struct Task *task) @@ -2063,11 +2063,11 @@ void sub_80B7D34(struct Task *task) sub_80AF0B4(); } eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(eventObject) || EventObjectClearAnimIfSpecialAnimFinished(eventObject)) + if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) { if (task->data[14] == 0 && !gPaletteFade.active && sub_80859A0() == TRUE) { - EventObjectSetDirection(eventObject, task->data[15]); + SetEventObjectDirection(eventObject, task->data[15]); sub_8084E14(); warp_in(); gFieldCallback = mapldr_080859D4; @@ -2075,7 +2075,7 @@ void sub_80B7D34(struct Task *task) DestroyTask(FindTaskIdByFunc(sub_80B7CE4)); } else if (task->data[1] == 0 || (--task->data[1]) == 0) { - EventObjectSetSpecialAnim(eventObject, GetFaceDirectionAnimId(spinDirections[eventObject->facingDirection])); + EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(spinDirections[eventObject->facingDirection])); if (task->data[2] < 12) { task->data[2]++; @@ -2113,7 +2113,7 @@ void sub_80B7EC4(struct Task *task) if (IsWeatherNotFadingIn()) { task->data[0]++; - task->data[15] = player_get_direction_lower_nybble(); + task->data[15] = GetPlayerFacingDirection(); } } @@ -2123,11 +2123,11 @@ void sub_80B7EE8(struct Task *task) struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; if (task->data[1] == 0 || (--task->data[1]) == 0) { - if (EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(eventObject) && !EventObjectClearAnimIfSpecialAnimFinished(eventObject)) + if (EventObjectIsMovementOverridden(eventObject) && !EventObjectClearHeldMovementIfFinished(eventObject)) { return; } - if (task->data[2] >= 32 && task->data[15] == player_get_direction_lower_nybble()) + if (task->data[2] >= 32 && task->data[15] == GetPlayerFacingDirection()) { eventObject->invisible = 0; ScriptContext2_Disable(); @@ -2135,7 +2135,7 @@ void sub_80B7EE8(struct Task *task) DestroyTask(FindTaskIdByFunc(sub_80B7E94)); return; } - EventObjectSetSpecialAnim(eventObject, GetFaceDirectionAnimId(spinDirections[eventObject->facingDirection])); + EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(spinDirections[eventObject->facingDirection])); if (task->data[2] < 32) { task->data[2]++; @@ -2174,7 +2174,7 @@ static void TeleportFieldEffectTask1(struct Task *task) ScriptContext2_Enable(); FreezeEventObjects(); CameraObjectReset2(); - task->data[15] = player_get_direction_lower_nybble(); + task->data[15] = GetPlayerFacingDirection(); task->data[0]++; } @@ -2286,7 +2286,7 @@ void sub_80B8280(struct Task *task) task->data[1] = 8; task->data[2] = 1; task->data[14] = sprite->subspriteMode; - task->data[15] = player_get_direction_lower_nybble(); + task->data[15] = GetPlayerFacingDirection(); PlaySE(SE_TK_WARPIN); } } @@ -2904,10 +2904,10 @@ void sub_80B8E14(struct Task *task) { struct EventObject *eventObject; eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(eventObject) || EventObjectClearAnimIfSpecialAnimFinished(eventObject)) + if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) { sub_808C114(); - EventObjectSetSpecialAnim(eventObject, 0x39); + EventObjectSetHeldMovement(eventObject, 0x39); task->data[0]++; } } @@ -2916,7 +2916,7 @@ void sub_80B8E60(struct Task *task) { struct EventObject *eventObject; eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectCheckIfSpecialAnimFinishedOrInactive(eventObject)) + if (EventObjectCheckHeldMovementStatus(eventObject)) { gFieldEffectArguments[0] = task->data[15] | 0x80000000; FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); @@ -2931,8 +2931,8 @@ void sub_80B8EA8(struct Task *task) { eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(3)); - EventObjectClearAnimIfSpecialAnimFinished(eventObject); - EventObjectSetSpecialAnim(eventObject, sub_8093540(eventObject->movementDirection)); + EventObjectClearHeldMovementIfFinished(eventObject); + EventObjectSetHeldMovement(eventObject, GetJumpSpecialMovementAction(eventObject->movementDirection)); gFieldEffectArguments[0] = task->data[1]; gFieldEffectArguments[1] = task->data[2]; gFieldEffectArguments[2] = gPlayerAvatar.eventObjectId; @@ -2945,11 +2945,11 @@ void sub_80B8F24(struct Task *task) { struct EventObject *eventObject; eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectClearAnimIfSpecialAnimFinished(eventObject)) + if (EventObjectClearHeldMovementIfFinished(eventObject)) { gPlayerAvatar.preventStep = FALSE; gPlayerAvatar.flags &= 0xdf; - EventObjectSetSpecialAnim(eventObject, GetFaceDirectionAnimId(eventObject->movementDirection)); + EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(eventObject->movementDirection)); sub_81555AC(eventObject->fieldEffectSpriteId, 1); UnfreezeEventObjects(); ScriptContext2_Disable(); @@ -3206,13 +3206,13 @@ void sub_80B9204(struct Task *task) { struct EventObject *eventObject; eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(eventObject) || EventObjectClearAnimIfSpecialAnimFinished(eventObject)) + if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) { task->data[15] = gPlayerAvatar.flags; gPlayerAvatar.preventStep = TRUE; SetPlayerAvatarStateMask(1); sub_808C114(); - EventObjectSetSpecialAnim(eventObject, 0x39); + EventObjectSetHeldMovement(eventObject, 0x39); task->data[0]++; } } @@ -3221,7 +3221,7 @@ void sub_80B925C(struct Task *task) { struct EventObject *eventObject; eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectClearAnimIfSpecialAnimFinished(eventObject)) + if (EventObjectClearHeldMovementIfFinished(eventObject)) { task->data[0]++; gFieldEffectArguments[0] = task->data[1]; @@ -3252,7 +3252,7 @@ void sub_80B92F8(struct Task *task) task->data[0]++; task->data[2] = 16; SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT); - EventObjectSetSpecialAnim(&gEventObjects[gPlayerAvatar.eventObjectId], 0x02); + EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], 0x02); } } @@ -3260,7 +3260,7 @@ void sub_80B933C(struct Task *task) { struct EventObject *eventObject; eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if ((task->data[2] == 0 || (--task->data[2]) == 0) && EventObjectClearAnimIfSpecialAnimFinished(eventObject)) + if ((task->data[2] == 0 || (--task->data[2]) == 0) && EventObjectClearHeldMovementIfFinished(eventObject)) { task->data[0]++; PlaySE(SE_W019); @@ -3277,7 +3277,7 @@ void sub_80B9390(struct Task *task) EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(0x03)); StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16); eventObject->inanimate = 1; - EventObjectSetSpecialAnim(eventObject, 0x48); + EventObjectSetHeldMovement(eventObject, 0x48); if (task->data[15] & 0x08) { DestroySprite(&gSprites[eventObject->fieldEffectSpriteId]); @@ -3293,7 +3293,7 @@ void sub_80B9418(struct Task *task) if ((++task->data[2]) >= 10) { eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectClearAnimIfSpecialAnimActive(eventObject); + EventObjectClearHeldMovementIfActive(eventObject); eventObject->inanimate = 0; eventObject->hasShadow = 0; sub_80B9560(task->data[1], eventObject->spriteId); @@ -3503,7 +3503,7 @@ void sub_80B9804(struct Task *task) { struct EventObject *eventObject; eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(eventObject) || EventObjectClearAnimIfSpecialAnimFinished(eventObject)) + if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) { task->data[0]++; task->data[2] = 17; @@ -3587,14 +3587,14 @@ void sub_80B9978(struct Task *task) sprite->pos2.y = 0; sprite->coordOffsetEnabled = 1; sub_808C114(); - EventObjectSetSpecialAnim(eventObject, 0x39); + EventObjectSetHeldMovement(eventObject, 0x39); task->data[0]++; } } void sub_80B99F0(struct Task *task) { - if (EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[gPlayerAvatar.eventObjectId])) + if (EventObjectClearHeldMovementIfFinished(&gEventObjects[gPlayerAvatar.eventObjectId])) { task->data[0]++; sub_80B9794(task->data[1]); @@ -3848,7 +3848,7 @@ bool8 sub_80B9E28(struct Sprite* sprite) yPos = object->currentCoords.y - 7; xPos = (gFieldEffectArguments[3] - xPos) * 16; yPos = (gFieldEffectArguments[4] - yPos) * 16; - npc_coords_shift(object, gFieldEffectArguments[3] + 7, gFieldEffectArguments[4] + 7); + ShiftEventObjectCoords(object, gFieldEffectArguments[3] + 7, gFieldEffectArguments[4] + 7); taskId = CreateTask(sub_80B9EDC, 0x50); gTasks[taskId].data[1] = object->spriteId; gTasks[taskId].data[2] = gSprites[object->spriteId].pos1.x + xPos; @@ -3886,7 +3886,7 @@ void sub_80B9EDC(u8 taskId) struct EventObject *object = &gEventObjects[data[9]]; sprite->pos1.x = data[2]; sprite->pos1.y = data[3]; - npc_coords_shift_still(object); + ShiftStillEventObjectCoords(object); object->triggerGroundEffectsOnStop = TRUE; FieldEffectActiveListRemove(0x42); DestroyTask(taskId); diff --git a/src/field_special_scene.c b/src/field_special_scene.c index a5058b3633..39977808fd 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -335,11 +335,11 @@ void sub_80FB6EC(void) if (VarGet(0x40B4) == 2) { - StartSpriteAnim(&gSprites[spriteId], EventObjectDirectionToImageAnimId(4)); + StartSpriteAnim(&gSprites[spriteId], GetFaceDirectionAnimNum(4)); } else { - StartSpriteAnim(&gSprites[spriteId], EventObjectDirectionToImageAnimId(3)); + StartSpriteAnim(&gSprites[spriteId], GetFaceDirectionAnimNum(3)); } } diff --git a/src/item_use.c b/src/item_use.c index 2044a8c87d..96f63ee3ec 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -337,7 +337,7 @@ void sub_80FD504(u8 taskId) } else { - playerDir = player_get_direction_lower_nybble(); + playerDir = GetPlayerFacingDirection(); for (i = 0; i < 4; i++) { if (playerDir == gUnknown_085920E4[i]) @@ -579,15 +579,15 @@ u8 sub_80FD9B0(s16 itemX, s16 itemY) void sub_80FDA24(u8 direction) { - EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]); - EventObjectClearAnim(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]); - npc_sync_anim_pause_bits(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]); + EventObjectClearHeldMovementIfFinished(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]); + EventObjectClearHeldMovement(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]); + UnfreezeEventObject(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]); PlayerTurnInPlace(direction); } void sub_80FDA94(u8 taskId) { - if (EventObjectCheckIfSpecialAnimFinishedOrInactive(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE) + if (EventObjectCheckHeldMovementStatus(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE) DisplayItemMessageOnField(taskId, gText_ItemFinderNearby, sub_80FD5CC); } @@ -595,7 +595,7 @@ void sub_80FDADC(u8 taskId) { s16 *data = gTasks[taskId].data; - if (EventObjectCheckIfSpecialAnimFinishedOrInactive(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE + if (EventObjectCheckHeldMovementStatus(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE || data[2] == FALSE) { sub_80FDA24(gUnknown_085920E4[data[5]]); diff --git a/src/overworld.c b/src/overworld.c index 5b92b80235..1e41160536 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -169,7 +169,7 @@ extern const u8* sub_809C2C8(struct MapPosition *a1, u8, u8); extern u8 *sub_809D0F4(void*); extern u8 sub_808BD6C(u8); extern u8 sub_808BD7C(u8); -extern void sub_80979D4(struct Sprite*, u8); +extern void UpdateEventObjectSpriteVisibility(struct Sprite*, u8); // this file's functions static void Overworld_ResetStateAfterWhiteOut(void); @@ -912,7 +912,7 @@ void player_avatar_init_params_reset(void) void walkrun_find_lowest_active_bit_in_bitfield(void) { - sUnknown_02032300.player_field_1 = player_get_direction_lower_nybble(); + sUnknown_02032300.player_field_1 = GetPlayerFacingDirection(); if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE)) sUnknown_02032300.player_field_0 = 2; @@ -2170,7 +2170,7 @@ static void sub_80869DC(void) gUnknown_03005DEC = 0; gUnknown_03005DE8 = 0; sub_808D438(); - SpawnEventObjectsInView(0, 0); + TrySpawnEventObjects(0, 0); mapheader_run_first_tag4_script_list_match(); } @@ -2187,7 +2187,7 @@ static void mli4_mapscripts_and_other(void) InitPlayerAvatar(x, y, player->player_field_1, gSaveBlock2Ptr->playerGender); SetPlayerAvatarTransitionFlags(player->player_field_0); player_avatar_init_params_reset(); - SpawnEventObjectsInView(0, 0); + TrySpawnEventObjects(0, 0); mapheader_run_first_tag4_script_list_match(); } @@ -2894,7 +2894,7 @@ static void ZeroLinkPlayerEventObject(struct LinkPlayerEventObject *linkPlayerEv memset(linkPlayerEventObj, 0, sizeof(struct LinkPlayerEventObject)); } -void ZeroAllLinkPlayerEventObjects(void) +void ClearLinkPlayerEventObjects(void) { memset(gLinkPlayerEventObjects, 0, sizeof(gLinkPlayerEventObjects)); } @@ -2906,7 +2906,7 @@ static void ZeroEventObject(struct EventObject *eventObj) static void SpawnLinkPlayerEventObject(u8 linkPlayerId, s16 x, s16 y, u8 a4) { - u8 eventObjId = sub_808D4F4(); + u8 eventObjId = GetFirstInactiveEventObjectId(); struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; struct EventObject *eventObj = &gEventObjects[eventObjId]; @@ -3059,7 +3059,7 @@ static u8 sub_8087A20(struct LinkPlayerEventObject *linkPlayerEventObj, struct E else { eventObj->directionSequenceIndex = 16; - npc_coords_shift(eventObj, x, y); + ShiftEventObjectCoords(eventObj, x, y); EventObjectUpdateZCoord(eventObj); return 1; } @@ -3083,7 +3083,7 @@ static void sub_8087AA8(struct LinkPlayerEventObject *linkPlayerEventObj, struct MoveCoords(eventObj->range.as_byte, &eventObj->initialCoords.x, &eventObj->initialCoords.y); if (!eventObj->directionSequenceIndex) { - npc_coords_shift_still(eventObj); + ShiftStillEventObjectCoords(eventObj); linkPlayerEventObj->mode = 2; } } @@ -3166,11 +3166,11 @@ static void SpriteCB_LinkPlayer(struct Sprite *sprite) sprite->oam.priority = ZCoordToPriority(eventObj->previousElevation); if (!linkPlayerEventObj->mode) - StartSpriteAnim(sprite, EventObjectDirectionToImageAnimId(eventObj->range.as_byte)); + StartSpriteAnim(sprite, GetFaceDirectionAnimNum(eventObj->range.as_byte)); else - StartSpriteAnimIfDifferent(sprite, get_go_image_anim_num(eventObj->range.as_byte)); + StartSpriteAnimIfDifferent(sprite, GetMoveDirectionAnimNum(eventObj->range.as_byte)); - sub_80979D4(sprite, 0); + UpdateEventObjectSpriteVisibility(sprite, 0); if (eventObj->triggerGroundEffectsOnMove) { sprite->invisible = ((sprite->data[7] & 4) >> 2); diff --git a/src/rom6.c b/src/rom6.c index 60447f6418..cdc1064ddf 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -61,8 +61,8 @@ static void task08_080C9820(u8 taskId) ScriptContext2_Enable(); gPlayerAvatar.preventStep = TRUE; eventObjId = gPlayerAvatar.eventObjectId; - if (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(&gEventObjects[eventObjId]) - || EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[eventObjId])) + if (!EventObjectIsMovementOverridden(&gEventObjects[eventObjId]) + || EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId])) { if (gMapHeader.mapType == MAP_TYPE_UNDERWATER) { @@ -72,7 +72,7 @@ static void task08_080C9820(u8 taskId) else { sub_808C114(); - EventObjectSetSpecialAnim(&gEventObjects[eventObjId], 0x39); + EventObjectSetHeldMovement(&gEventObjects[eventObjId], 0x39); gTasks[taskId].func = sub_813552C; } } @@ -80,7 +80,7 @@ static void task08_080C9820(u8 taskId) static void sub_813552C(u8 taskId) { - if (EventObjectCheckIfSpecialAnimFinishedOrInactive(&gEventObjects[gPlayerAvatar.eventObjectId]) == TRUE) + if (EventObjectCheckHeldMovementStatus(&gEventObjects[gPlayerAvatar.eventObjectId]) == TRUE) { FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); gTasks[taskId].func = sub_8135578; @@ -91,7 +91,7 @@ static void sub_8135578(u8 taskId) { if (!FieldEffectActiveListContains(6)) { - gFieldEffectArguments[1] = player_get_direction_lower_nybble(); + gFieldEffectArguments[1] = GetPlayerFacingDirection(); if (gFieldEffectArguments[1] == 1) gFieldEffectArguments[2] = 0; if (gFieldEffectArguments[1] == 2) diff --git a/src/scrcmd.c b/src/scrcmd.c index e3edb5abfc..4e3fceb10b 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1157,7 +1157,7 @@ bool8 ScrCmd_faceplayer(struct ScriptContext *ctx) if (gEventObjects[gSelectedEventObject].active) { EventObjectFaceOppositeDirection(&gEventObjects[gSelectedEventObject], - player_get_direction_lower_nybble()); + GetPlayerFacingDirection()); } return FALSE; } @@ -1244,7 +1244,7 @@ bool8 ScrCmd_releaseall(struct ScriptContext *ctx) HideFieldMessageBox(); objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[objectId]); + EventObjectClearHeldMovementIfFinished(&gEventObjects[objectId]); sub_80D338C(); UnfreezeEventObjects(); return FALSE; @@ -1256,9 +1256,9 @@ bool8 ScrCmd_release(struct ScriptContext *ctx) HideFieldMessageBox(); if (gEventObjects[gSelectedEventObject].active) - EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[gSelectedEventObject]); + EventObjectClearHeldMovementIfFinished(&gEventObjects[gSelectedEventObject]); objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[objectId]); + EventObjectClearHeldMovementIfFinished(&gEventObjects[objectId]); sub_80D338C(); UnfreezeEventObjects(); return FALSE; @@ -2238,7 +2238,7 @@ bool8 ScrCmd_warpD1(struct ScriptContext *ctx) u16 y = VarGet(ScriptReadHalfword(ctx)); Overworld_SetWarpDestination(mapGroup, mapNum, warpId, x, y); - sub_808D074(player_get_direction_lower_nybble()); + sub_808D074(GetPlayerFacingDirection()); sub_80B0244(); player_avatar_init_params_reset(); return TRUE; diff --git a/src/script_movement.c b/src/script_movement.c index 27280addf0..9fee9e0600 100644 --- a/src/script_movement.c +++ b/src/script_movement.c @@ -189,7 +189,7 @@ static void UnfreezeObjects(u8 taskId) for (i = 0; i < 16; i++, pEventObjId++) { if (*pEventObjId != 0xFF) - npc_sync_anim_pause_bits(&gEventObjects[*pEventObjId]); + UnfreezeEventObject(&gEventObjects[*pEventObjId]); } } @@ -210,8 +210,8 @@ static void sub_80A2490(u8 taskId, u8 b, u8 eventObjId, const u8 *d) { u8 var; - if (EventObjectIsSpecialAnimActive(&gEventObjects[eventObjId]) - && !EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[eventObjId])) + if (EventObjectIsHeldMovementActive(&gEventObjects[eventObjId]) + && !EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId])) return; var = *d; @@ -222,7 +222,7 @@ static void sub_80A2490(u8 taskId, u8 b, u8 eventObjId, const u8 *d) } else { - if (!EventObjectSetSpecialAnim(&gEventObjects[eventObjId], var)) + if (!EventObjectSetHeldMovement(&gEventObjects[eventObjId], var)) { d++; npc_obj_offscreen_culling_and_flag_update(b, d); diff --git a/src/trainer_see.c b/src/trainer_see.c index cf47bbe2a2..f5e9c300e8 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -362,7 +362,7 @@ static u8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 ap MoveCoords(direction, &x, &y); for (i = 0; i < approachDistance - 1; i++, MoveCoords(direction, &x, &y)) { - collision = sub_8092C8C(trainerObj, x, y, direction); + collision = GetCollisionFlagsAtCoords(trainerObj, x, y, direction); if (collision != 0 && (collision & COLLISION_MASK)) return 0; } @@ -373,7 +373,7 @@ static u8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 ap trainerObj->range.as_nybbles.x = 0; trainerObj->range.as_nybbles.y = 0; - collision = npc_block_way(trainerObj, x, y, direction); + collision = GetCollisionAtCoords(trainerObj, x, y, direction); trainerObj->range.as_nybbles.x = unk19_temp; trainerObj->range.as_nybbles.y = unk19b_temp; @@ -439,16 +439,16 @@ static bool8 sub_80B417C(u8 taskId, struct Task *task, struct EventObject *train u8 direction; EventObjectGetLocalIdAndMap(trainerObj, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); - FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1); - direction = GetFaceDirectionAnimId(trainerObj->facingDirection); - EventObjectSetSpecialAnim(trainerObj, direction); + FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON); + direction = GetFaceDirectionMovementAction(trainerObj->facingDirection); + EventObjectSetHeldMovement(trainerObj, direction); task->tFuncId++; return TRUE; } static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct EventObject *trainerObj) { - if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON_1)) + if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON)) { return FALSE; } @@ -465,16 +465,16 @@ static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct EventObject *train static bool8 sub_80B4200(u8 taskId, struct Task *task, struct EventObject *trainerObj) { - if (!(EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)) || EventObjectClearAnimIfSpecialAnimFinished(trainerObj)) + if (!(EventObjectIsMovementOverridden(trainerObj)) || EventObjectClearHeldMovementIfFinished(trainerObj)) { if (task->tTrainerRange) { - EventObjectSetSpecialAnim(trainerObj, GetGoSpeed0AnimId(trainerObj->facingDirection)); + EventObjectSetHeldMovement(trainerObj, GetWalkNormalMovementAction(trainerObj->facingDirection)); task->tTrainerRange--; } else { - EventObjectSetSpecialAnim(trainerObj, 0x3E); + EventObjectSetHeldMovement(trainerObj, 0x3E); task->tFuncId++; } } @@ -485,19 +485,19 @@ static bool8 sub_80B425C(u8 taskId, struct Task *task, struct EventObject *train { struct EventObject *playerObj; - if (EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) && !EventObjectClearAnimIfSpecialAnimFinished(trainerObj)) + if (EventObjectIsMovementOverridden(trainerObj) && !EventObjectClearHeldMovementIfFinished(trainerObj)) return FALSE; - npc_set_running_behaviour_etc(trainerObj, npc_running_behaviour_by_direction(trainerObj->facingDirection)); - sub_808F23C(trainerObj, npc_running_behaviour_by_direction(trainerObj->facingDirection)); - sub_808F208(trainerObj); + SetTrainerMovementType(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection)); + TryOverrideTemplateCoordsForEventObject(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection)); + OverrideTemplateCoordsForEventObject(trainerObj); playerObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj) && !EventObjectClearAnimIfSpecialAnimFinished(playerObj)) + if (EventObjectIsMovementOverridden(playerObj) && !EventObjectClearHeldMovementIfFinished(playerObj)) return FALSE; sub_808BCE8(); - EventObjectSetSpecialAnim(&gEventObjects[gPlayerAvatar.eventObjectId], GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->facingDirection))); + EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], GetFaceDirectionMovementAction(GetOppositeDirection(trainerObj->facingDirection))); task->tFuncId++; return FALSE; } @@ -506,18 +506,18 @@ static bool8 sub_80B4318(u8 taskId, struct Task *task, struct EventObject *train { struct EventObject *playerObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj) - || EventObjectClearAnimIfSpecialAnimFinished(playerObj)) + if (!EventObjectIsMovementOverridden(playerObj) + || EventObjectClearHeldMovementIfFinished(playerObj)) SwitchTaskToFollowupFunc(taskId); return FALSE; } static bool8 sub_80B435C(u8 taskId, struct Task *task, struct EventObject *trainerObj) { - if (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) - || EventObjectClearAnimIfSpecialAnimFinished(trainerObj)) + if (!EventObjectIsMovementOverridden(trainerObj) + || EventObjectClearHeldMovementIfFinished(trainerObj)) { - EventObjectSetSpecialAnim(trainerObj, 0x59); + EventObjectSetHeldMovement(trainerObj, 0x59); task->tFuncId++; } return FALSE; @@ -525,7 +525,7 @@ static bool8 sub_80B435C(u8 taskId, struct Task *task, struct EventObject *train static bool8 sub_80B4390(u8 taskId, struct Task *task, struct EventObject *trainerObj) { - if (EventObjectClearAnimIfSpecialAnimFinished(trainerObj)) + if (EventObjectClearHeldMovementIfFinished(trainerObj)) task->tFuncId = 3; return FALSE; @@ -533,10 +533,10 @@ static bool8 sub_80B4390(u8 taskId, struct Task *task, struct EventObject *train static bool8 sub_80B43AC(u8 taskId, struct Task *task, struct EventObject *trainerObj) { - if (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) - || EventObjectClearAnimIfSpecialAnimFinished(trainerObj)) + if (!EventObjectIsMovementOverridden(trainerObj) + || EventObjectClearHeldMovementIfFinished(trainerObj)) { - EventObjectSetSpecialAnim(trainerObj, 0x3E); + EventObjectSetHeldMovement(trainerObj, 0x3E); task->tFuncId++; } return FALSE; @@ -544,7 +544,7 @@ static bool8 sub_80B43AC(u8 taskId, struct Task *task, struct EventObject *train static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct EventObject *trainerObj) { - if (EventObjectCheckIfSpecialAnimFinishedOrInactive(trainerObj)) + if (EventObjectCheckHeldMovementStatus(trainerObj)) { gFieldEffectArguments[0] = trainerObj->currentCoords.x; gFieldEffectArguments[1] = trainerObj->currentCoords.y; @@ -567,8 +567,8 @@ static bool8 sub_80B4438(u8 taskId, struct Task *task, struct EventObject *train sprite = &gSprites[trainerObj->spriteId]; sprite->oam.priority = 2; - EventObjectClearAnimIfSpecialAnimFinished(trainerObj); - EventObjectSetSpecialAnim(trainerObj, sub_80934BC(trainerObj->facingDirection)); + EventObjectClearHeldMovementIfFinished(trainerObj); + EventObjectSetHeldMovement(trainerObj, GetJumpInPlaceMovementAction(trainerObj->facingDirection)); task->tFuncId++; } @@ -597,14 +597,14 @@ static void sub_80B44C8(u8 taskId) LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&eventObj); if (!task->data[7]) { - EventObjectClearAnim(eventObj); + EventObjectClearHeldMovement(eventObj); task->data[7]++; } sTrainerSeeFuncList2[task->data[0]](taskId, task, eventObj); if (task->data[0] == 3 && !FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) { - npc_set_running_behaviour_etc(eventObj, npc_running_behaviour_by_direction(eventObj->facingDirection)); - sub_808F23C(eventObj, npc_running_behaviour_by_direction(eventObj->facingDirection)); + SetTrainerMovementType(eventObj, GetTrainerFacingDirectionMovementType(eventObj->facingDirection)); + TryOverrideTemplateCoordsForEventObject(eventObj, GetTrainerFacingDirectionMovementType(eventObj->facingDirection)); DestroyTask(taskId); } else @@ -659,22 +659,22 @@ void sub_80B45D0(void) #define sData4 data[4] #define sFldEffId data[7] -u8 FldEff_ExclamationMarkIcon1(void) +u8 FldEff_ExclamationMarkIcon(void) { u8 spriteId = CreateSpriteAtEnd(&sSpriteTemplate_ExclamationQuestionMark, 0, 0, 0x53); if (spriteId != MAX_SPRITES) - SetIconSpriteData(&gSprites[spriteId], FLDEFF_EXCLAMATION_MARK_ICON_1, 0); + SetIconSpriteData(&gSprites[spriteId], FLDEFF_EXCLAMATION_MARK_ICON, 0); return 0; } -u8 FldEff_ExclamationMarkIcon2(void) +u8 FldEff_QuestionMarkIcon(void) { u8 spriteId = CreateSpriteAtEnd(&sSpriteTemplate_ExclamationQuestionMark, 0, 0, 0x52); if (spriteId != MAX_SPRITES) - SetIconSpriteData(&gSprites[spriteId], FLDEFF_EXCLAMATION_MARK_ICON_2, 1); + SetIconSpriteData(&gSprites[spriteId], FLDEFF_QUESTION_MARK_ICON, 1); return 0; } @@ -764,14 +764,14 @@ void sub_80B4808(void) if (gUnknown_030060AC == 1) { trainerObj = &gEventObjects[gApproachingTrainers[gUnknown_03006080].eventObjectId]; - gUnknown_03006084[0] = GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->facingDirection)); + gUnknown_03006084[0] = GetFaceDirectionMovementAction(GetOppositeDirection(trainerObj->facingDirection)); gUnknown_03006084[1] = 0xFE; ScriptMovement_StartObjectMovementScript(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gUnknown_03006084); } else { trainerObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - gUnknown_03006084[0] = GetFaceDirectionAnimId(trainerObj->facingDirection); + gUnknown_03006084[0] = GetFaceDirectionMovementAction(trainerObj->facingDirection); gUnknown_03006084[1] = 0xFE; ScriptMovement_StartObjectMovementScript(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gUnknown_03006084); } diff --git a/sym_ewram.txt b/sym_ewram.txt index 17fe48f704..7ea9bef797 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -234,7 +234,7 @@ gUnknown_020375B4: @ 20375B4 gUnknown_020375B6: @ 20375B6 .space 0x2 -gUnknown_020375B8: @ 20375B8 +gLockedAnimEventObjects: @ 20375B8 .space 0x4 .include "src/field_message_box.o" From e01dd90bb36f850fe88f2b1edae65c74b3bc48b1 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 13 Jun 2018 18:19:19 -0500 Subject: [PATCH 12/55] Update applymovement actions to reflect movement action names --- asm/macros/movement.inc | 234 ++--- data/battle_frontier_2.s | 32 +- data/event_scripts.s | 194 ++--- data/scripts/cable_club.inc | 40 +- data/scripts/contest_hall.inc | 174 ++-- data/scripts/day_care.inc | 38 +- data/scripts/field_move_scripts.inc | 4 +- data/scripts/gabby_and_ty.inc | 6 +- data/scripts/maps/AquaHideout_B2F.inc | 16 +- .../BattleFrontier_BattleArenaBattleRoom.inc | 84 +- .../BattleFrontier_BattleArenaCorridor.inc | 90 +- .../maps/BattleFrontier_BattleArenaLobby.inc | 82 +- .../BattleFrontier_BattleDomeBattleRoom.inc | 416 ++++----- .../BattleFrontier_BattleDomeCorridor.inc | 158 ++-- .../maps/BattleFrontier_BattleDomeLobby.inc | 20 +- ...BattleFrontier_BattleDomePreBattleRoom.inc | 18 +- ...BattleFrontier_BattleFactoryBattleRoom.inc | 34 +- .../BattleFrontier_BattleFactoryLobby.inc | 16 +- ...tleFrontier_BattleFactoryPreBattleRoom.inc | 76 +- .../BattleFrontier_BattlePalaceBattleRoom.inc | 126 +-- .../BattleFrontier_BattlePalaceCorridor.inc | 62 +- .../maps/BattleFrontier_BattlePalaceLobby.inc | 12 +- .../BattleFrontier_BattlePikeCorridor.inc | 18 +- .../maps/BattleFrontier_BattlePikeLobby.inc | 8 +- .../BattleFrontier_BattlePikeRandomRoom1.inc | 136 +-- .../BattleFrontier_BattlePikeRandomRoom2.inc | 4 +- ...BattleFrontier_BattlePikeThreePathRoom.inc | 26 +- .../BattleFrontier_BattlePyramidLobby.inc | 38 +- .../maps/BattleFrontier_BattlePyramidTop.inc | 28 +- .../BattleFrontier_BattleTowerBattleRoom.inc | 100 +-- .../BattleFrontier_BattleTowerBattleRoom2.inc | 72 +- .../BattleFrontier_BattleTowerCorridor.inc | 18 +- .../BattleFrontier_BattleTowerCorridor2.inc | 74 +- .../BattleFrontier_BattleTowerElevator.inc | 24 +- .../maps/BattleFrontier_BattleTowerLobby.inc | 28 +- ...tleFrontier_BattleTowerMultiBattleRoom.inc | 58 +- .../maps/BattleFrontier_OutsideEast.inc | 30 +- .../maps/BattleFrontier_OutsideWest.inc | 16 +- .../maps/BattleFrontier_ReceptionGate.inc | 70 +- data/scripts/maps/BirthIsland_Exterior.inc | 14 +- data/scripts/maps/DewfordTown.inc | 754 ++++++++-------- data/scripts/maps/DewfordTown_Hall.inc | 4 +- .../maps/EverGrandeCity_ChampionsRoom.inc | 82 +- .../maps/EverGrandeCity_HallOfFame.inc | 22 +- .../maps/EverGrandeCity_PokemonCenter_1F.inc | 24 +- .../maps/EverGrandeCity_PokemonLeague_1F.inc | 20 +- .../FallarborTown_BattleTentBattleRoom.inc | 52 +- .../maps/FallarborTown_BattleTentCorridor.inc | 14 +- .../maps/FallarborTown_BattleTentLobby.inc | 22 +- .../maps/FallarborTown_PokemonCenter_1F.inc | 44 +- data/scripts/maps/FarawayIsland_Interior.inc | 60 +- data/scripts/maps/FortreeCity.inc | 2 +- data/scripts/maps/FortreeCity_House4.inc | 10 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 36 +- data/scripts/maps/LavaridgeTown.inc | 64 +- .../maps/LilycoveCity_ContestLobby.inc | 216 ++--- .../maps/LilycoveCity_CoveLilyMotel_1F.inc | 16 +- data/scripts/maps/LilycoveCity_Harbor.inc | 72 +- .../maps/LilycoveCity_LilycoveMuseum_1F.inc | 14 +- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 6 +- .../LilycoveCity_PokemonTrainerFanClub.inc | 40 +- data/scripts/maps/LittlerootTown.inc | 298 +++---- .../maps/LittlerootTown_BrendansHouse_1F.inc | 110 +-- .../maps/LittlerootTown_BrendansHouse_2F.inc | 136 +-- .../maps/LittlerootTown_MaysHouse_1F.inc | 110 +-- .../maps/LittlerootTown_MaysHouse_2F.inc | 138 +-- .../LittlerootTown_ProfessorBirchsLab.inc | 84 +- data/scripts/maps/MagmaHideout_4F.inc | 46 +- data/scripts/maps/MarineCave_End.inc | 16 +- data/scripts/maps/MauvilleCity.inc | 250 +++--- data/scripts/maps/MeteorFalls_1F_1R.inc | 176 ++-- data/scripts/maps/MossdeepCity.inc | 228 ++--- data/scripts/maps/MossdeepCity_Gym.inc | 4 +- data/scripts/maps/MossdeepCity_House2.inc | 20 +- .../maps/MossdeepCity_SpaceCenter_1F.inc | 20 +- .../maps/MossdeepCity_SpaceCenter_2F.inc | 56 +- .../maps/MossdeepCity_StevensHouse.inc | 24 +- data/scripts/maps/MtChimney.inc | 378 ++++---- .../maps/MtChimney_CableCarStation.inc | 32 +- data/scripts/maps/MtPyre_Summit.inc | 150 ++-- data/scripts/maps/NavelRock_Top.inc | 44 +- data/scripts/maps/OldaleTown.inc | 190 ++-- data/scripts/maps/PetalburgCity.inc | 596 ++++++------- data/scripts/maps/PetalburgCity_Gym.inc | 318 +++---- data/scripts/maps/PetalburgWoods.inc | 160 ++-- data/scripts/maps/Route101.inc | 188 ++-- data/scripts/maps/Route103.inc | 42 +- data/scripts/maps/Route104.inc | 816 +++++++++--------- data/scripts/maps/Route109.inc | 372 ++++---- data/scripts/maps/Route110.inc | 130 +-- .../Route110_SeasideCyclingRoadEntrance1.inc | 2 +- .../Route110_SeasideCyclingRoadEntrance2.inc | 2 +- data/scripts/maps/Route110_TrickHouseEnd.inc | 4 +- .../maps/Route110_TrickHouseEntrance.inc | 34 +- .../maps/Route110_TrickHousePuzzle5.inc | 150 ++-- data/scripts/maps/Route111.inc | 34 +- .../scripts/maps/Route112_CableCarStation.inc | 32 +- data/scripts/maps/Route116.inc | 74 +- data/scripts/maps/Route118.inc | 68 +- data/scripts/maps/Route119.inc | 136 +-- .../maps/Route119_WeatherInstitute_2F.inc | 46 +- data/scripts/maps/Route120.inc | 4 +- data/scripts/maps/Route121.inc | 48 +- .../maps/Route121_SafariZoneEntrance.inc | 34 +- data/scripts/maps/Route128.inc | 120 +-- data/scripts/maps/RustboroCity.inc | 230 ++--- .../maps/RustboroCity_DevonCorp_3F.inc | 108 +-- .../maps/RustboroCity_PokemonSchool.inc | 92 +- data/scripts/maps/RusturfTunnel.inc | 256 +++--- data/scripts/maps/SSTidalCorridor.inc | 58 +- data/scripts/maps/SafariZone_South.inc | 20 +- data/scripts/maps/SeafloorCavern_Room9.inc | 84 +- data/scripts/maps/SkyPillar_Outside.inc | 68 +- data/scripts/maps/SkyPillar_Top.inc | 68 +- data/scripts/maps/SlateportCity.inc | 200 ++--- .../SlateportCity_BattleTentBattleRoom.inc | 18 +- .../maps/SlateportCity_BattleTentCorridor.inc | 28 +- .../maps/SlateportCity_BattleTentLobby.inc | 30 +- data/scripts/maps/SlateportCity_Harbor.inc | 74 +- .../maps/SlateportCity_OceanicMuseum_1F.inc | 38 +- .../maps/SlateportCity_OceanicMuseum_2F.inc | 128 +-- data/scripts/maps/SootopolisCity.inc | 782 ++++++++--------- data/scripts/maps/SootopolisCity_Gym_1F.inc | 2 +- .../SootopolisCity_MysteryEventsHouse_1F.inc | 32 +- .../SootopolisCity_MysteryEventsHouse_B1F.inc | 24 +- data/scripts/maps/SouthernIsland_Exterior.inc | 6 +- data/scripts/maps/SouthernIsland_Interior.inc | 50 +- data/scripts/maps/TerraCave_End.inc | 16 +- data/scripts/maps/TrainerHill_Elevator.inc | 26 +- data/scripts/maps/TrainerHill_Entrance.inc | 10 +- .../VerdanturfTown_BattleTentBattleRoom.inc | 30 +- .../VerdanturfTown_BattleTentCorridor.inc | 14 +- .../maps/VerdanturfTown_BattleTentLobby.inc | 16 +- data/scripts/maps/VictoryRoad_1F.inc | 42 +- data/scripts/players_house.inc | 240 +++--- data/scripts/pokeblocks.inc | 2 +- data/scripts/secret_power_tm.inc | 44 +- 137 files changed, 6516 insertions(+), 6508 deletions(-) diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc index 5a810c497a..99b5c8f840 100644 --- a/asm/macros/movement.inc +++ b/asm/macros/movement.inc @@ -1,4 +1,4 @@ - .macro create_movement name + .macro create_movement_action name enum _\name .macro \name .byte _\name @@ -6,118 +6,126 @@ .endm enum_start - create_movement step_00 - create_movement step_01 - create_movement step_02 - create_movement step_03 - create_movement slow_step_down - create_movement slow_step_up - create_movement slow_step_left - create_movement slow_step_right - create_movement step_down - create_movement step_up - create_movement step_left - create_movement step_right - create_movement fast_step_down - create_movement fast_step_up - create_movement fast_step_left - create_movement fast_step_right - create_movement step_10 - create_movement step_11 - create_movement step_12 - create_movement step_13 - create_movement step_14 - create_movement step_15 - create_movement step_16 - create_movement step_17 - create_movement step_18 - create_movement step_19 - create_movement step_1a - create_movement step_1b - create_movement step_1c - create_movement step_1d - create_movement step_1e - create_movement step_1f - create_movement step_20 - create_movement step_21 - create_movement step_22 - create_movement step_23 - create_movement step_24 - create_movement step_25 - create_movement step_26 - create_movement step_27 - create_movement step_28 - create_movement step_29 - create_movement step_2a - create_movement step_2b - create_movement step_2c - create_movement step_2d - create_movement step_2e - create_movement step_2f - create_movement step_30 - create_movement step_31 - create_movement step_32 - create_movement step_33 - create_movement step_34 - create_movement step_35 - create_movement step_36 - create_movement step_37 - create_movement step_38 - create_movement step_39 - create_movement step_3a - create_movement step_3b - create_movement step_3c - create_movement step_3d - create_movement step_3e - create_movement step_3f - create_movement step_40 - create_movement step_41 - create_movement step_42 - create_movement step_43 - create_movement step_44 - create_movement step_45 - create_movement step_46 - create_movement step_47 - create_movement step_48 - create_movement step_49 - create_movement step_4a - create_movement step_4b - create_movement step_4c - create_movement step_4d - create_movement step_4e - create_movement step_4f - create_movement step_50 - create_movement step_51 - create_movement step_52 - create_movement step_53 - create_movement step_54 - create_movement step_55 - create_movement step_56 - create_movement step_57 - create_movement step_58 - create_movement step_59 - create_movement step_5a - create_movement step_5b - create_movement step_5c - create_movement step_5d - create_movement step_5e - create_movement step_5f - create_movement step_60 - create_movement step_61 - create_movement step_62 - create_movement step_63 + create_movement_action face_down + create_movement_action face_up + create_movement_action face_left + create_movement_action face_right + create_movement_action walk_slow_down + create_movement_action walk_slow_up + create_movement_action walk_slow_left + create_movement_action walk_slow_right + create_movement_action walk_down + create_movement_action walk_up + create_movement_action walk_left + create_movement_action walk_right + create_movement_action jump_2_down + create_movement_action jump_2_up + create_movement_action jump_2_left + create_movement_action jump_2_right + create_movement_action delay_1 + create_movement_action delay_2 + create_movement_action delay_4 + create_movement_action delay_8 + create_movement_action delay_16 + create_movement_action walk_fast_down + create_movement_action walk_fast_up + create_movement_action walk_fast_left + create_movement_action walk_fast_right + create_movement_action walk_in_place_slow_down + create_movement_action walk_in_place_slow_up + create_movement_action walk_in_place_slow_left + create_movement_action walk_in_place_slow_right + create_movement_action walk_in_place_down + create_movement_action walk_in_place_up + create_movement_action walk_in_place_left + create_movement_action walk_in_place_right + create_movement_action walk_in_place_fast_down + create_movement_action walk_in_place_fast_up + create_movement_action walk_in_place_fast_left + create_movement_action walk_in_place_fast_right + create_movement_action walk_in_place_fastest_down + create_movement_action walk_in_place_fastest_up + create_movement_action walk_in_place_fastest_left + create_movement_action walk_in_place_fastest_right + create_movement_action ride_water_current_down + create_movement_action ride_water_current_up + create_movement_action ride_water_current_left + create_movement_action ride_water_current_right + create_movement_action walk_fastest_down + create_movement_action walk_fastest_up + create_movement_action walk_fastest_left + create_movement_action walk_fastest_right + create_movement_action slide_down + create_movement_action slide_up + create_movement_action slide_left + create_movement_action slide_right + create_movement_action player_run_down + create_movement_action player_run_up + create_movement_action player_run_left + create_movement_action player_run_right + create_movement_action start_anim_in_direction + create_movement_action jump_special_down + create_movement_action jump_special_up + create_movement_action jump_special_left + create_movement_action jump_special_right + create_movement_action face_player + create_movement_action face_away_player + create_movement_action lock_facing_direction + create_movement_action unlock_facing_direction + create_movement_action jump_down + create_movement_action jump_up + create_movement_action jump_left + create_movement_action jump_right + create_movement_action jump_in_place_down + create_movement_action jump_in_place_up + create_movement_action jump_in_place_left + create_movement_action jump_in_place_right + create_movement_action jump_in_place_down_up + create_movement_action jump_in_place_up_down + create_movement_action jump_in_place_left_right + create_movement_action jump_in_place_right_left + create_movement_action face_original_direction + create_movement_action nurse_joy_bow + create_movement_action enable_jump_landing_ground_effect + create_movement_action disable_jump_landing_ground_effect + create_movement_action disable_anim + create_movement_action restore_anim + create_movement_action set_invisible + create_movement_action set_visible + create_movement_action emote_exclamation_mark + create_movement_action emote_question_mark + create_movement_action emote_heart + create_movement_action reveal_trainer + create_movement_action rock_smash_break + create_movement_action cut_tree + create_movement_action set_fixed_priority + create_movement_action clear_fixed_priority + create_movement_action init_affine_anim + create_movement_action clear_affine_anim + create_movement_action unknown_movement_1 + create_movement_action unknown_movement_2 + create_movement_action walk_down_start_affine + create_movement_action walk_down_affine - enum_start 0x91 - create_movement step_91 - create_movement step_92 - create_movement step_93 - create_movement step_94 - create_movement step_95 - create_movement step_96 - create_movement step_97 - create_movement step_98 - create_movement step_99 - create_movement step_9A + enum_start 0x8C + create_movement_action walk_diag_northwest + create_movement_action walk_diag_northeast + create_movement_action walk_diag_southwest + create_movement_action walk_diag_southeast + create_movement_action walk_slow_diag_northwest + create_movement_action walk_slow_diag_northeast + create_movement_action walk_slow_diag_southwest + create_movement_action walk_slow_diag_southeast + create_movement_action store_lock_anim + create_movement_action free_unlock_anim + create_movement_action walk_left_affine + create_movement_action walk_right_affine + create_movement_action levitate + create_movement_action stop_levitate + create_movement_action destroy_extra_task + create_movement_action figure_8 + create_movement_action fly_up + create_movement_action fly_down enum_start 0xfe - create_movement step_end + create_movement_action step_end diff --git a/data/battle_frontier_2.s b/data/battle_frontier_2.s index 8fc2939c6d..ce24905794 100644 --- a/data/battle_frontier_2.s +++ b/data/battle_frontier_2.s @@ -1454,43 +1454,43 @@ gUnknown_08612690:: @ 8612690 .4byte 0x00000400, 0x00000800 gUnknown_08612698:: @ 8612698 - step_94 - step_right - step_95 + store_lock_anim + walk_right + free_unlock_anim step_end gUnknown_0861269C:: @ 861269C - step_94 - step_down - step_95 + store_lock_anim + walk_down + free_unlock_anim step_end gUnknown_086126A0:: @ 86126A0 - step_94 - step_left - step_95 + store_lock_anim + walk_left + free_unlock_anim step_end gUnknown_086126A4:: @ 86126A4 - step_94 - step_up - step_95 + store_lock_anim + walk_up + free_unlock_anim step_end gUnknown_086126A8:: @ 86126A8 - step_03 + face_right step_end gUnknown_086126AA:: @ 86126AA - step_00 + face_down step_end gUnknown_086126AC:: @ 86126AC - step_02 + face_left step_end gUnknown_086126AE:: @ 86126AE - step_01 + face_up step_end @ 86126B0 diff --git a/data/event_scripts.s b/data/event_scripts.s index 841a9935c1..ec9ddb86a0 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -946,7 +946,7 @@ EventScript_27142F:: @ 827142F return Movement_27143A: @ 827143A - step_59 + reveal_trainer step_end EventScript_ShowTrainerIntroMsg:: @ 827143C @@ -1523,8 +1523,8 @@ OldaleTown_PokemonCenter_1F_EventScript_271AC5:: @ 8271AC5 end OldaleTown_PokemonCenter_1F_Movement_271AD0: @ 8271AD0 - step_4f - step_12 + nurse_joy_bow + delay_4 step_end Std_ObtainItem:: @ 8271AD3 @@ -2329,13 +2329,13 @@ SlateportCity_Harbor_EventScript_2721E2:: @ 82721E2 return SlateportCity_Harbor_Movement_2721F0: @ 82721F0 - slow_step_right - slow_step_right - slow_step_right - step_right - step_right - step_right - step_right + walk_slow_right + walk_slow_right + walk_slow_right + walk_right + walk_right + walk_right + walk_right step_end PetalburgCity_Gym_EventScript_2721F8:: @ 82721F8 @@ -2371,7 +2371,7 @@ EventScript_27222B:: @ 827222B return Movement_27224E: @ 827224E - step_up + walk_up step_end BattleFrontier_OutsideWest_EventScript_272250:: @ 8272250 @@ -2533,27 +2533,27 @@ Route119_EventScript_2723C1:: @ 82723C1 FortreeCity_Movement_2723C7: @ 82723C7 Route119_Movement_2723C7: @ 82723C7 Route120_Movement_2723C7: @ 82723C7 - step_55 - step_12 - step_54 - step_12 - step_55 - step_12 - step_54 - step_12 - step_55 - step_13 - step_54 - step_13 - step_55 - step_13 - step_54 - step_13 - step_55 - step_14 - step_54 - step_14 - step_55 + set_visible + delay_4 + set_invisible + delay_4 + set_visible + delay_4 + set_invisible + delay_4 + set_visible + delay_8 + set_invisible + delay_8 + set_visible + delay_8 + set_invisible + delay_8 + set_visible + delay_16 + set_invisible + delay_16 + set_visible step_end LittlerootTown_ProfessorBirchsLab_EventScript_2723DD:: @ 82723DD @@ -2652,7 +2652,7 @@ EverGrandeCity_SidneysRoom_EventScript_27255F:: @ 827255F return SlateportCity_Movement_272596: @ 8272596 - step_57 + emote_question_mark step_end AquaHideout_B2F_Movement_272598: @ 8272598 @@ -2697,7 +2697,7 @@ SeafloorCavern_Room9_Movement_272598: @ 8272598 SlateportCity_Movement_272598: @ 8272598 SlateportCity_OceanicMuseum_1F_Movement_272598: @ 8272598 SlateportCity_PokemonFanClub_Movement_272598: @ 8272598 - step_56 + emote_exclamation_mark step_end BattleFrontier_BattleTowerBattleRoom_Movement_27259A: @ 827259A @@ -2738,9 +2738,9 @@ SeafloorCavern_Room9_Movement_27259A: @ 827259A SlateportCity_Movement_27259A: @ 827259A SlateportCity_OceanicMuseum_1F_Movement_27259A: @ 827259A SlateportCity_PokemonFanClub_Movement_27259A: @ 827259A - step_14 - step_14 - step_14 + delay_16 + delay_16 + delay_16 step_end AquaHideout_B2F_Movement_27259E: @ 827259E @@ -2784,11 +2784,11 @@ SeafloorCavern_Room9_Movement_27259E: @ 827259E SlateportCity_Movement_27259E: @ 827259E SlateportCity_SternsShipyard_1F_Movement_27259E: @ 827259E SootopolisCity_Movement_27259E: @ 827259E - step_3e + face_player step_end BattleFrontier_OutsideWest_Movement_2725A0: @ 82725A0 - step_3f + face_away_player step_end BattleFrontier_Lounge3_Movement_2725A2: @ 82725A2 @@ -2825,7 +2825,7 @@ SlateportCity_OceanicMuseum_2F_Movement_2725A2: @ 82725A2 SlateportCity_SternsShipyard_1F_Movement_2725A2: @ 82725A2 SootopolisCity_Movement_2725A2: @ 82725A2 VerdanturfTown_Movement_2725A2: @ 82725A2 - step_4e + face_original_direction step_end AquaHideout_B2F_Movement_2725A4: @ 82725A4 @@ -2869,7 +2869,7 @@ SlateportCity_Movement_2725A4: @ 82725A4 SlateportCity_OceanicMuseum_1F_Movement_2725A4: @ 82725A4 SlateportCity_OceanicMuseum_2F_Movement_2725A4: @ 82725A4 SootopolisCity_Movement_2725A4: @ 82725A4 - step_27 + walk_in_place_fastest_left step_end BattleFrontier_BattleTowerCorridor2_Movement_2725A6: @ 82725A6 @@ -2916,7 +2916,7 @@ SlateportCity_Movement_2725A6: @ 82725A6 SlateportCity_OceanicMuseum_2F_Movement_2725A6: @ 82725A6 SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6: @ 82725A6 VerdanturfTown_BattleTentBattleRoom_Movement_2725A6: @ 82725A6 - step_26 + walk_in_place_fastest_up step_end BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8: @ 82725A8 @@ -2959,7 +2959,7 @@ SlateportCity_OceanicMuseum_1F_Movement_2725A8: @ 82725A8 SlateportCity_OceanicMuseum_2F_Movement_2725A8: @ 82725A8 SootopolisCity_Movement_2725A8: @ 82725A8 VerdanturfTown_BattleTentBattleRoom_Movement_2725A8: @ 82725A8 - step_28 + walk_in_place_fastest_right step_end BattleFrontier_OutsideWest_Movement_2725AA: @ 82725AA @@ -3003,20 +3003,20 @@ SlateportCity_OceanicMuseum_2F_Movement_2725AA: @ 82725AA SouthernIsland_Exterior_Movement_2725AA: @ 82725AA VerdanturfTown_BattleTentBattleRoom_Movement_2725AA: @ 82725AA VictoryRoad_1F_Movement_2725AA: @ 82725AA - step_25 + walk_in_place_fastest_down step_end RustboroCity_Movement_2725AC: @ 82725AC - step_03 + face_right step_end RustboroCity_Movement_2725AE: @ 82725AE - step_02 + face_left step_end BattleFrontier_Mart_Movement_2725B0: @ 82725B0 MeteorFalls_1F_1R_Movement_2725B0: @ 82725B0 - step_00 + face_down step_end MarineCave_End_Movement_2725B2: @ 82725B2 @@ -3025,51 +3025,51 @@ Route118_Movement_2725B2: @ 82725B2 SkyPillar_Top_Movement_2725B2: @ 82725B2 SlateportCity_Movement_2725B2: @ 82725B2 TerraCave_End_Movement_2725B2: @ 82725B2 - step_01 + face_up step_end BattleFrontier_BattleDomeBattleRoom_Movement_2725B4: @ 82725B4 MeteorFalls_1F_1R_Movement_2725B4: @ 82725B4 - step_1d + walk_in_place_down step_end BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6: @ 82725B6 BattleFrontier_BattleTowerBattleRoom_Movement_2725B6: @ 82725B6 - step_1f + walk_in_place_left step_end Route121_Movement_2725B8: @ 82725B8 - step_20 + walk_in_place_right step_end EverGrandeCity_SidneysRoom_Movement_2725BA: @ 82725BA - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end EverGrandeCity_ChampionsRoom_Movement_2725C1: @ 82725C1 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end EverGrandeCity_SidneysRoom_Movement_2725C6: @ 82725C6 - step_14 - step_14 + delay_16 + delay_16 step_end Route110_TrickHouseEntrance_Movement_2725C9: @ 82725C9 - step_up + walk_up step_end Movement_2725CB:: @ 82725CB - step_up - step_up + walk_up + walk_up step_end EventScript_2725CE:: @ 82725CE @@ -4564,8 +4564,8 @@ SecretBase_RedCave1_EventScript_275BAB:: @ 8275BAB end SecretBase_RedCave1_Movement_275BB4: @ 8275BB4 - step_up - step_up + walk_up + walk_up step_end EventScript_275BB7:: @ 8275BB7 @@ -6041,7 +6041,7 @@ gUnknown_082A8350:: @ 82A8350 end GraniteCave_B1F_Movement_2A8369: @ 82A8369 - step_54 + set_invisible step_end LilycoveCity_PokemonCenter_1F_EventScript_2A836B:: @ 82A836B @@ -6549,28 +6549,28 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A89AE:: @ 82A89AE end LilycoveCity_PokemonCenter_1F_Movement_2A89B8: @ 82A89B8 - step_03 - step_13 + face_right + delay_8 step_end LilycoveCity_PokemonCenter_1F_Movement_2A89BB: @ 82A89BB - step_02 - step_13 + face_left + delay_8 step_end LilycoveCity_PokemonCenter_1F_Movement_2A89BE: @ 82A89BE - step_00 + face_down step_end LilycoveCity_PokemonCenter_1F_Movement_2A89C0: @ 82A89C0 - step_3e + face_player step_end LilycoveCity_PokemonCenter_1F_Movement_2A89C2: @ 82A89C2 - step_51 - step_48 - step_51 - step_48 + disable_jump_landing_ground_effect + jump_in_place_left + disable_jump_landing_ground_effect + jump_in_place_left step_end LilycoveCity_PokemonCenter_1F_EventScript_2A89C7:: @ 82A89C7 @@ -10280,24 +10280,24 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6E93:: @ 82B6E93 end BattleFrontier_BattleTowerLobby_Movement_2B6E94: @ 82B6E94 - step_18 + walk_fast_right BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 - step_15 - step_15 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_54 - step_31 - step_31 - step_31 + walk_fast_down + walk_fast_down + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + set_invisible + slide_down + slide_down + slide_down step_end gText_082B6EA5:: @ 82B6EA5 @@ -13480,7 +13480,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271:: @ 82C4271 BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A: @ 82C427A BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A: @ 82C427A - step_54 + set_invisible step_end LilycoveCity_ContestLobby_Text_2C427C: @ 82C427C @@ -14701,7 +14701,7 @@ TrainerHill_Entrance_EventScript_2C83DF:: @ 82C83DF end TrainerHill_1F_Movement_2C83EE:: @ 82C83EE - step_54 + set_invisible step_end EventScript_2C83F0:: @ 82C83F0 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 9a34d2e61d..523aa67cae 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -342,8 +342,8 @@ OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0 end OldaleTown_PokemonCenter_2F_Movement_276E10: @ 8276E10 - step_up - step_up + walk_up + walk_up step_end OldaleTown_PokemonCenter_2F_EventScript_276E13:: @ 8276E13 @@ -736,52 +736,52 @@ OldaleTown_PokemonCenter_2F_EventScript_27733F:: @ 827733F end OldaleTown_PokemonCenter_2F_Movement_277349: @ 8277349 - step_00 + face_down step_end OldaleTown_PokemonCenter_2F_Movement_27734B: @ 827734B - step_03 + face_right step_end MossdeepCity_GameCorner_1F_Movement_27734D: @ 827734D OldaleTown_PokemonCenter_2F_Movement_27734D: @ 827734D - step_02 + face_left step_end OldaleTown_PokemonCenter_2F_Movement_27734F: @ 827734F - step_down - step_down + walk_down + walk_down step_end Movement_277352: @ 8277352 - step_right - step_up - step_up + walk_right + walk_up + walk_up step_end OldaleTown_PokemonCenter_2F_Movement_277356: @ 8277356 - step_left - step_up - step_up + walk_left + walk_up + walk_up step_end OldaleTown_PokemonCenter_2F_Movement_27735A: @ 827735A - step_up + walk_up step_end OldaleTown_PokemonCenter_2F_Movement_27735C: @ 827735C - step_02 + face_left step_end OldaleTown_PokemonCenter_2F_Movement_27735E: @ 827735E - step_03 + face_right step_end MossdeepCity_GameCorner_1F_Movement_277360: @ 8277360 - step_left - step_up - step_up - step_up + walk_left + walk_up + walk_up + walk_up step_end gUnknown_08277365:: @ 8277365 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index a6a0ebcc24..6a13f39ba7 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -1248,186 +1248,186 @@ LinkContestRoom1_EventScript_27ACDF:: @ 827ACDF return LinkContestRoom1_Movement_27AD09: @ 827AD09 - step_down + walk_down step_end LinkContestRoom1_Movement_27AD0B: @ 827AD0B - step_40 - step_up - step_41 + lock_facing_direction + walk_up + unlock_facing_direction step_end LinkContestRoom1_Movement_27AD0F: @ 827AD0F - step_28 + walk_in_place_fastest_right step_end LinkContestRoom1_Movement_27AD11: @ 827AD11 - step_58 + emote_heart step_end LinkContestRoom1_Movement_27AD13: @ 827AD13 - step_25 + walk_in_place_fastest_down step_end LinkContestRoom1_Movement_27AD15: @ 827AD15 - step_left - step_left - step_25 + walk_left + walk_left + walk_in_place_fastest_down step_end LinkContestRoom1_Movement_27AD19: @ 827AD19 - step_right - step_right - step_25 + walk_right + walk_right + walk_in_place_fastest_down step_end LinkContestRoom1_Movement_27AD1D: @ 827AD1D - step_up - step_25 + walk_up + walk_in_place_fastest_down step_end LinkContestRoom1_Movement_27AD20: @ 827AD20 - step_14 - step_14 + delay_16 + delay_16 step_end LinkContestRoom1_Movement_27AD23: @ 827AD23 - step_28 + walk_in_place_fastest_right step_end LinkContestRoom1_Movement_27AD25: @ 827AD25 - step_27 + walk_in_place_fastest_left step_end LinkContestRoom1_Movement_27AD27: @ 827AD27 - step_25 + walk_in_place_fastest_down step_end LinkContestRoom1_Movement_27AD29: @ 827AD29 - step_left - step_left - step_up + walk_left + walk_left + walk_up step_end LinkContestRoom1_Movement_27AD2D: @ 827AD2D - step_left - step_left - step_left - step_left - step_up + walk_left + walk_left + walk_left + walk_left + walk_up step_end LinkContestRoom1_Movement_27AD33: @ 827AD33 - step_02 - step_14 - step_4e + face_left + delay_16 + face_original_direction step_end LinkContestRoom1_Movement_27AD37: @ 827AD37 - step_01 - step_14 - step_4e + face_up + delay_16 + face_original_direction step_end LinkContestRoom1_Movement_27AD3B: @ 827AD3B - step_03 - step_14 - step_4e + face_right + delay_16 + face_original_direction step_end LinkContestRoom1_Movement_27AD3F: @ 827AD3F - step_00 - step_14 - step_4e + face_down + delay_16 + face_original_direction step_end LinkContestRoom1_Movement_27AD43: @ 827AD43 - step_01 + face_up step_end LinkContestRoom1_Movement_27AD45: @ 827AD45 - step_01 - step_14 - step_28 + face_up + delay_16 + walk_in_place_fastest_right step_end LinkContestRoom1_Movement_27AD49: @ 827AD49 - step_27 - step_14 - step_14 - step_25 + walk_in_place_fastest_left + delay_16 + delay_16 + walk_in_place_fastest_down step_end LinkContestRoom1_Movement_27AD4E: @ 827AD4E - step_14 - step_14 - step_25 + delay_16 + delay_16 + walk_in_place_fastest_down step_end LinkContestRoom1_Movement_27AD52: @ 827AD52 - step_up - step_right - step_right - step_right - step_26 + walk_up + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end LinkContestRoom1_Movement_27AD58: @ 827AD58 - step_17 - step_17 - step_17 - step_15 - step_26 + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_down + walk_in_place_fastest_up step_end LinkContestRoom1_Movement_27AD5E: @ 827AD5E - step_up - step_right - step_26 + walk_up + walk_right + walk_in_place_fastest_up step_end LinkContestRoom1_Movement_27AD62: @ 827AD62 - step_17 - step_15 - step_26 + walk_fast_left + walk_fast_down + walk_in_place_fastest_up step_end LinkContestRoom1_Movement_27AD66: @ 827AD66 - step_up - step_left - step_26 + walk_up + walk_left + walk_in_place_fastest_up step_end LinkContestRoom1_Movement_27AD6A: @ 827AD6A - step_18 - step_15 - step_26 + walk_fast_right + walk_fast_down + walk_in_place_fastest_up step_end LinkContestRoom1_Movement_27AD6E: @ 827AD6E - step_up - step_left - step_left - step_left - step_26 + walk_up + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end LinkContestRoom1_Movement_27AD74: @ 827AD74 - step_18 - step_18 - step_18 - step_15 - step_26 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_in_place_fastest_up step_end LinkContestRoom1_Movement_27AD7A: @ 827AD7A - step_right - step_right - step_up + walk_right + walk_right + walk_up step_end LinkContestRoom1_Movement_27AD7E: @ 827AD7E - step_up + walk_up step_end LinkContestRoom1_EventScript_27AD80:: @ 827AD80 diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 07ed1b82d5..d9b8a89ac3 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -240,25 +240,25 @@ Route117_PokemonDayCare_EventScript_291F3D:: @ 8291F3D end Route117_PokemonDayCare_Movement_291F47: @ 8291F47 - step_14 - step_14 - step_02 - step_14 - step_14 - step_03 - step_14 - step_14 - step_01 - slow_step_up - step_54 - step_14 - step_14 - step_14 - step_14 - step_14 - step_00 - step_55 - slow_step_down + delay_16 + delay_16 + face_left + delay_16 + delay_16 + face_right + delay_16 + delay_16 + face_up + walk_slow_up + set_invisible + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + face_down + set_visible + walk_slow_down step_end Route117_PokemonDayCare_EventScript_291F5B:: @ 8291F5B diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index 44631cc20f..df25056ea0 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -43,7 +43,7 @@ Route103_EventScript_290710:: @ 8290710 end Route103_Movement_29071F: @ 829071F - step_5b + cut_tree step_end Route103_EventScript_290721:: @ 8290721 @@ -128,7 +128,7 @@ Route111_EventScript_290829:: @ 8290829 end Route111_Movement_29082B: @ 829082B - step_5a + rock_smash_break step_end Route111_EventScript_29082D:: @ 829082D diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 0cf683bb88..5a03a0e98b 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -270,15 +270,15 @@ Route120_EventScript_28CFC3:: @ 828CFC3 end Route111_Movement_28D04D: @ 828D04D - step_1d + walk_in_place_down step_end Route111_Movement_28D04F: @ 828D04F - step_1e + walk_in_place_up step_end Route111_Movement_28D051: @ 828D051 - step_1f + walk_in_place_left step_end Route111_EventScript_28D053:: @ 828D053 diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index ccf8997d77..fd38685125 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -53,17 +53,17 @@ AquaHideout_B2F_EventScript_233E25:: @ 8233E25 end AquaHideout_B2F_Movement_233E80: @ 8233E80 - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left step_end AquaHideout_B2F_Movement_233E85: @ 8233E85 - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right step_end AquaHideout_B2F_EventScript_233E8A:: @ 8233E8A diff --git a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc index 2f952936ff..27ea23b59a 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc @@ -457,75 +457,75 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9:: @ 8257BA9 return BattleFrontier_BattleArenaBattleRoom_Movement_257BE2: @ 8257BE2 - step_right - step_right + walk_right + walk_right BattleFrontier_BattleArenaBattleRoom_Movement_257BE4: @ 8257BE4 - step_right + walk_right BattleFrontier_BattleArenaBattleRoom_Movement_257BE5: @ 8257BE5 - step_right + walk_right step_end BattleFrontier_BattleArenaBattleRoom_Movement_257BE7: @ 8257BE7 - step_left - step_left - step_28 + walk_left + walk_left + walk_in_place_fastest_right step_end BattleFrontier_BattleArenaBattleRoom_Movement_257BEB: @ 8257BEB - step_26 + walk_in_place_fastest_up step_end BattleFrontier_BattleArenaBattleRoom_Movement_257BED: @ 8257BED - step_28 + walk_in_place_fastest_right step_end BattleFrontier_BattleArenaBattleRoom_Movement_257BEF: @ 8257BEF - step_left - step_left + walk_left + walk_left BattleFrontier_BattleArenaBattleRoom_Movement_257BF1: @ 8257BF1 - step_left + walk_left BattleFrontier_BattleArenaBattleRoom_Movement_257BF2: @ 8257BF2 - step_left + walk_left step_end BattleFrontier_BattleArenaBattleRoom_Movement_257BF4: @ 8257BF4 - step_17 - step_17 - step_17 - step_17 - step_17 + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left step_end BattleFrontier_BattleArenaBattleRoom_Movement_257BFA: @ 8257BFA - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end BattleFrontier_BattleArenaBattleRoom_Movement_257C02: @ 8257C02 - step_51 - step_46 + disable_jump_landing_ground_effect + jump_in_place_down step_end BattleFrontier_BattleArenaBattleRoom_Movement_257C05: @ 8257C05 - step_51 - step_47 + disable_jump_landing_ground_effect + jump_in_place_up step_end BattleFrontier_BattleArenaBattleRoom_Movement_257C08: @ 8257C08 - step_25 + walk_in_place_fastest_down step_end BattleFrontier_BattleArenaBattleRoom_Movement_257C0A: @ 8257C0A - step_28 + walk_in_place_fastest_right step_end BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C: @ 8257C0C @@ -541,20 +541,20 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257C16:: @ 8257C16 end BattleFrontier_BattleArenaBattleRoom_Movement_257C30: @ 8257C30 - step_down - step_27 - step_14 - step_14 - step_14 - step_14 - step_up - step_up - step_27 + walk_down + walk_in_place_fastest_left + delay_16 + delay_16 + delay_16 + delay_16 + walk_up + walk_up + walk_in_place_fastest_left step_end BattleFrontier_BattleArenaBattleRoom_Movement_257C3A: @ 8257C3A - step_down - step_27 + walk_down + walk_in_place_fastest_left step_end BattleFrontier_BattleArenaBattleRoom_Text_257C3D: @ 8257C3D diff --git a/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc b/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc index cecd5b44c5..83b602fc44 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc @@ -25,63 +25,63 @@ BattleFrontier_BattleArenaCorridor_EventScript_2573C9:: @ 82573C9 end BattleFrontier_BattleArenaCorridor_Movement_257417: @ 8257417 - step_up - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_right - step_right - step_right + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + walk_right step_end BattleFrontier_BattleArenaCorridor_Movement_25742C: @ 825742C - step_right - step_54 + walk_right + set_invisible step_end BattleFrontier_BattleArenaCorridor_Movement_25742F: @ 825742F - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_right - step_right - step_right - step_right + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right step_end BattleFrontier_BattleArenaCorridor_Movement_257444: @ 8257444 - step_27 + walk_in_place_fastest_left step_end BattleFrontier_BattleArenaCorridor_Movement_257446: @ 8257446 - step_up - step_25 + walk_up + walk_in_place_fastest_down step_end BattleFrontier_BattleArenaCorridor_Text_257449: @ 8257449 diff --git a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc b/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc index 68ac57fcd7..7a0695445d 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc @@ -271,39 +271,39 @@ BattleFrontier_BattleArenaLobby_EventScript_256005:: @ 8256005 return BattleFrontier_BattleArenaLobby_Movement_256034: @ 8256034 - step_up - step_up - step_up - step_left - step_left - step_left - step_left - step_left - step_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up step_end BattleFrontier_BattleArenaLobby_Movement_25603E: @ 825603E - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattleArenaLobby_Movement_256041: @ 8256041 - step_up - step_up - step_up - step_up - step_left - step_left - step_left - step_left - step_left - step_26 + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end BattleFrontier_BattleArenaLobby_Movement_25604C: @ 825604C - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleArenaLobby_EventScript_256050:: @ 8256050 @@ -320,26 +320,26 @@ BattleFrontier_BattleArenaLobby_EventScript_256050:: @ 8256050 return BattleFrontier_BattleArenaLobby_Movement_25607F: @ 825607F - step_up - step_up - step_up - step_right - step_right - step_right - step_right - step_up + walk_up + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_up step_end BattleFrontier_BattleArenaLobby_Movement_256088: @ 8256088 - step_up - step_up - step_up - step_up - step_right - step_right - step_right - step_right - step_26 + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end BattleFrontier_BattleArenaLobby_EventScript_256092:: @ 8256092 diff --git a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc index 52981a07df..c46358aede 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc @@ -669,214 +669,214 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C652:: @ 824C652 BattleFrontier_BattleArenaBattleRoom_Movement_24C773: @ 824C773 BattleFrontier_BattleDomeBattleRoom_Movement_24C773: @ 824C773 - step_54 + set_invisible step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C775: @ 824C775 - step_55 - step_14 - step_up - step_up - step_up - step_right + set_visible + delay_16 + walk_up + walk_up + walk_up + walk_right BattleFrontier_BattleDomeBattleRoom_Movement_24C77B: @ 824C77B - step_right + walk_right step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C77D: @ 824C77D - step_up + walk_up step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C77F: @ 824C77F - step_55 - step_14 - step_up - step_up - step_up - step_right - step_right + set_visible + delay_16 + walk_up + walk_up + walk_up + walk_right + walk_right step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C787: @ 824C787 - step_right + walk_right step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C789: @ 824C789 - step_left + walk_left step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C78B: @ 824C78B - step_01 - step_54 + face_up + set_invisible step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C78E: @ 824C78E - step_55 - step_up - step_up - step_up - step_02 - step_13 - step_12 - step_00 - step_13 - step_12 - step_03 - step_13 - step_12 - step_01 - step_13 - step_12 - step_02 - step_14 - step_16 - step_16 - step_02 - step_13 - step_12 - step_00 - step_13 - step_12 - step_03 - step_13 - step_12 - step_01 - step_13 - step_12 - step_02 - fast_step_left - step_41 - step_01 - step_40 - fast_step_left - fast_step_left - step_41 - step_03 - step_40 - fast_step_left - step_41 - step_00 - step_11 - step_02 - step_13 - step_12 - step_01 - step_13 - step_12 - step_03 - step_13 - step_12 - step_00 - step_13 - step_12 - step_02 - step_12 - step_01 - step_12 - step_03 - step_12 - step_00 - step_12 - step_02 - step_11 - step_01 - step_11 - step_03 - step_11 - step_00 - step_11 - step_02 - step_40 - step_right - slow_step_right - step_right - slow_step_right - step_41 - step_01 - step_14 - step_47 - step_47 - step_14 - step_right - step_right - step_right - step_47 - step_14 - step_right - step_down - step_down - step_02 - step_11 - step_01 - step_11 - step_03 - step_11 - step_00 - step_11 - step_02 - step_12 - step_left - step_left + set_visible + walk_up + walk_up + walk_up + face_left + delay_8 + delay_4 + face_down + delay_8 + delay_4 + face_right + delay_8 + delay_4 + face_up + delay_8 + delay_4 + face_left + delay_16 + walk_fast_up + walk_fast_up + face_left + delay_8 + delay_4 + face_down + delay_8 + delay_4 + face_right + delay_8 + delay_4 + face_up + delay_8 + delay_4 + face_left + jump_2_left + unlock_facing_direction + face_up + lock_facing_direction + jump_2_left + jump_2_left + unlock_facing_direction + face_right + lock_facing_direction + jump_2_left + unlock_facing_direction + face_down + delay_2 + face_left + delay_8 + delay_4 + face_up + delay_8 + delay_4 + face_right + delay_8 + delay_4 + face_down + delay_8 + delay_4 + face_left + delay_4 + face_up + delay_4 + face_right + delay_4 + face_down + delay_4 + face_left + delay_2 + face_up + delay_2 + face_right + delay_2 + face_down + delay_2 + face_left + lock_facing_direction + walk_right + walk_slow_right + walk_right + walk_slow_right + unlock_facing_direction + face_up + delay_16 + jump_in_place_up + jump_in_place_up + delay_16 + walk_right + walk_right + walk_right + jump_in_place_up + delay_16 + walk_right + walk_down + walk_down + face_left + delay_2 + face_up + delay_2 + face_right + delay_2 + face_down + delay_2 + face_left + delay_4 + walk_left + walk_left step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C7F9: @ 824C7F9 - step_14 - step_14 - step_left - step_left - step_28 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_right - step_right - step_25 + delay_16 + delay_16 + walk_left + walk_left + walk_in_place_fastest_right + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_right + walk_right + walk_in_place_fastest_down step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C829: @ 824C829 - step_left + walk_left step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C82B: @ 824C82B - step_left - step_left + walk_left + walk_left step_end BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E:: @ 824C82E @@ -978,50 +978,50 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938 return BattleFrontier_BattleDomeBattleRoom_Movement_24C94B: @ 824C94B - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_13 - step_51 - step_46 - step_12 - step_46 - step_50 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_8 + disable_jump_landing_ground_effect + jump_in_place_down + delay_4 + jump_in_place_down + enable_jump_landing_ground_effect step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C95E: @ 824C95E - step_down - step_down - step_right - step_right - step_25 + walk_down + walk_down + walk_right + walk_right + walk_in_place_fastest_down step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C964: @ 824C964 - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C969: @ 824C969 - step_27 + walk_in_place_fastest_left step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C96B: @ 824C96B - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left step_end BattleFrontier_BattleDomeBattleRoom_Text_24C970: @ 824C970 diff --git a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc b/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc index ad6204fd5c..6a97382d4b 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc @@ -46,107 +46,107 @@ BattleFrontier_BattleDomeCorridor_EventScript_24B18F:: @ 824B18F end BattleFrontier_BattleDomeCorridor_Movement_24B1A1: @ 824B1A1 - step_up - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_26 + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end BattleFrontier_BattleDomeCorridor_Movement_24B1AE: @ 824B1AE - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleDomeCorridor_Movement_24B1B2: @ 824B1B2 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up step_end BattleFrontier_BattleDomeCorridor_Movement_24B1BE: @ 824B1BE - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattleDomeCorridor_Movement_24B1C1: @ 824B1C1 - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_26 + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end BattleFrontier_BattleDomeCorridor_Movement_24B1D2: @ 824B1D2 - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleDomeCorridor_Movement_24B1D6: @ 824B1D6 - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up step_end BattleFrontier_BattleDomeCorridor_Movement_24B1E6: @ 824B1E6 - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattleDomeCorridor_Movement_24B1E9: @ 824B1E9 - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_54 + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + set_invisible step_end diff --git a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc b/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc index 35bf3f5a6e..b08d0ca89c 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc @@ -390,22 +390,22 @@ BattleFrontier_BattleDomeLobby_EventScript_249D3F:: @ 8249D3F return BattleFrontier_BattleDomeLobby_Movement_249D45: @ 8249D45 - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattleDomeLobby_Movement_249D4B: @ 8249D4B - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattleDomeLobby_Movement_249D4E: @ 8249D4E - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleDomeLobby_EventScript_249D52:: @ 8249D52 diff --git a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc index f3693e1795..d19b4b999a 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc @@ -280,24 +280,24 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B646:: @ 824B646 return BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F: @ 824B64F - step_right - step_02 + walk_right + face_left step_end BattleFrontier_BattleDomePreBattleRoom_Movement_24B652: @ 824B652 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattleDomePreBattleRoom_Movement_24B657: @ 824B657 - step_up + walk_up step_end BattleFrontier_BattleDomePreBattleRoom_Movement_24B659: @ 824B659 - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattleDomePreBattleRoom_Text_24B65C: @ 824B65C diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc index bd76e111d5..cdfd6edd60 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc @@ -261,32 +261,32 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105 end BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B: @ 825B17B - step_up - step_up - step_up - step_up - step_up - step_03 + walk_up + walk_up + walk_up + walk_up + walk_up + face_right step_end BattleFrontier_BattleFactoryBattleRoom_Movement_25B182: @ 825B182 - step_right + walk_right step_end BattleFrontier_BattleFactoryBattleRoom_Movement_25B184: @ 825B184 - step_down - step_down - step_down - step_down - step_down - step_02 + walk_down + walk_down + walk_down + walk_down + walk_down + face_left step_end BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B: @ 825B18B - step_up - step_up - step_up - step_02 + walk_up + walk_up + walk_up + face_left step_end BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190:: @ 825B190 diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc b/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc index 640e96b4d7..4f2dea3431 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc @@ -261,17 +261,17 @@ BattleFrontier_BattleFactoryLobby_EventScript_25879D:: @ 825879D end BattleFrontier_BattleFactoryLobby_Movement_2587A7: @ 82587A7 - step_up - step_up - step_up - step_54 + walk_up + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleFactoryLobby_Movement_2587AC: @ 82587AC - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattleFactoryLobby_EventScript_2587B1:: @ 82587B1 diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc index 93a5f2cafb..875a3a2202 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc @@ -457,65 +457,65 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B:: @ 825A18B return BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A: @ 825A19A - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A0: @ 825A1A0 - step_up - step_left - step_left - step_up - step_up + walk_up + walk_left + walk_left + walk_up + walk_up step_end BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A6: @ 825A1A6 - step_up - step_right - step_right - step_up - step_up + walk_up + walk_right + walk_right + walk_up + walk_up step_end BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1AC: @ 825A1AC - step_up - step_up - step_up - step_up - step_up - step_00 + walk_up + walk_up + walk_up + walk_up + walk_up + face_down step_end BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B3: @ 825A1B3 - step_left - step_left - step_up - step_up - step_54 + walk_left + walk_left + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B9: @ 825A1B9 - step_right - step_right - step_up - step_up - step_54 + walk_right + walk_right + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1BF: @ 825A1BF - step_left - step_left - step_left + walk_left + walk_left + walk_left step_end BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1C3: @ 825A1C3 - step_right - step_right - step_right - step_00 + walk_right + walk_right + walk_right + face_down step_end BattleFrontier_BattleFactoryPreBattleRoom_Text_25A1C8: @ 825A1C8 diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc index 5aff5ad814..07ccbe79de 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc @@ -394,68 +394,68 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE89:: @ 824FE89 return BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90: @ 824FE90 - step_54 + set_invisible step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FE92: @ 824FE92 - step_55 - step_up - step_up - step_up - step_up + set_visible + walk_up + walk_up + walk_up + walk_up BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97: @ 824FE97 - step_03 + face_right step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99: @ 824FE99 - step_01 + face_up step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B: @ 824FE9B - step_55 - step_up - step_up - step_up - step_up + set_visible + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA1: @ 824FEA1 - step_down - step_down - step_down - step_down - step_02 + walk_down + walk_down + walk_down + walk_down + face_left step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA7: @ 824FEA7 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC: @ 824FEAC - step_00 + face_down step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAE: @ 824FEAE - step_55 - slow_step_down - slow_step_down - step_02 + set_visible + walk_slow_down + walk_slow_down + face_left step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB3: @ 824FEB3 - step_55 - slow_step_down + set_visible + walk_slow_down step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB6: @ 824FEB6 - slow_step_down - slow_step_down - slow_step_down - step_02 + walk_slow_down + walk_slow_down + walk_slow_down + face_left step_end BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB:: @ 824FEBB @@ -472,42 +472,42 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5:: @ 824FED5 end BattleFrontier_BattlePalaceBattleRoom_Movement_24FEDF: @ 824FEDF - step_14 - step_14 - step_55 - step_down - step_right - step_down - step_27 + delay_16 + delay_16 + set_visible + walk_down + walk_right + walk_down + walk_in_place_fastest_left step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FEE7: @ 824FEE7 - step_55 - step_15 - step_18 - step_15 - step_15 - step_15 - step_15 - step_15 - step_27 - step_14 + set_visible + walk_fast_down + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_in_place_fastest_left + delay_16 step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FEF2: @ 824FEF2 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_55 - slow_step_down - slow_step_down - slow_step_down - slow_step_down - step_02 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + set_visible + walk_slow_down + walk_slow_down + walk_slow_down + walk_slow_down + face_left step_end BattleFrontier_BattlePalaceBattleRoom_Text_24FF00: @ 824FF00 diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc b/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc index 91fb31ad3e..89697ff33e 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc @@ -80,54 +80,54 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF:: @ 824F5AF return BattleFrontier_BattlePalaceCorridor_Movement_24F5B8: @ 824F5B8 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattlePalaceCorridor_Movement_24F5BD: @ 824F5BD - step_up - step_up - step_left - step_left - step_up - step_up + walk_up + walk_up + walk_left + walk_left + walk_up + walk_up step_end BattleFrontier_BattlePalaceCorridor_Movement_24F5C4: @ 824F5C4 - step_up - step_up - step_up - step_left - step_left - step_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_up step_end BattleFrontier_BattlePalaceCorridor_Movement_24F5CB: @ 824F5CB - step_up - step_right - step_right - step_up - step_up - step_up + walk_up + walk_right + walk_right + walk_up + walk_up + walk_up step_end BattleFrontier_BattlePalaceCorridor_Movement_24F5D2: @ 824F5D2 - step_up - step_up - step_right - step_right - step_up - step_up + walk_up + walk_up + walk_right + walk_right + walk_up + walk_up step_end BattleFrontier_BattlePalaceCorridor_Movement_24F5D9: @ 824F5D9 - step_up + walk_up BattleFrontier_BattlePalaceCorridor_Movement_24F5DA: @ 824F5DA - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattlePalaceCorridor_Text_24F5DD: @ 824F5DD diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc b/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc index 067e18fa21..a5cb110816 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc @@ -345,18 +345,18 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DC41:: @ 824DC41 return BattleFrontier_BattlePalaceLobby_Movement_24DC47: @ 824DC47 - step_up + walk_up step_end BattleFrontier_BattlePalaceLobby_Movement_24DC49: @ 824DC49 - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattlePalaceLobby_Movement_24DC4C: @ 824DC4C - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattlePalaceLobby_EventScript_24DC50:: @ 824DC50 diff --git a/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc b/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc index 5293b6cfa2..4171da314b 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc @@ -46,21 +46,21 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C801:: @ 825C801 end BattleFrontier_BattlePikeCorridor_Movement_25C80B: @ 825C80B - step_up - step_up + walk_up + walk_up step_end BattleFrontier_BattlePikeCorridor_Movement_25C80E: @ 825C80E - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattlePikeCorridor_Movement_25C812: @ 825C812 - step_up - step_up - step_left - step_00 + walk_up + walk_up + walk_left + face_down step_end BattleFrontier_BattlePikeCorridor_Text_25C817: @ 825C817 diff --git a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc b/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc index 0cee283471..74bdb1d782 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc @@ -268,12 +268,12 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA94:: @ 825BA94 return BattleFrontier_BattlePikeLobby_Movement_25BAA6: @ 825BAA6 - step_up + walk_up BattleFrontier_BattlePikeLobby_Movement_25BAA7: @ 825BAA7 - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattlePikeLobby_EventScript_25BAAB:: @ 825BAAB diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc index bcaa7dfe1b..fd5fd81e05 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc @@ -440,141 +440,141 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B:: @ 825D77B return BattleFrontier_BattlePikeRandomRoom1_Movement_25D795: @ 825D795 - step_down - step_down + walk_down + walk_down step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D798: @ 825D798 - step_up - step_up - step_up - step_54 - step_up + walk_up + walk_up + walk_up + set_invisible + walk_up step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D79E: @ 825D79E - step_up - step_54 - step_up + walk_up + set_invisible + walk_up step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2: @ 825D7A2 - step_down + walk_down step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4: @ 825D7A4 - step_down - step_02 - step_14 - step_14 - step_00 + walk_down + face_left + delay_16 + delay_16 + face_down step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7AA: @ 825D7AA - step_15 - step_18 - step_18 - step_15 - step_17 - step_00 + walk_fast_down + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_left + face_down step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B1: @ 825D7B1 - step_01 + face_up step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3: @ 825D7B3 - step_left + walk_left BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B4: @ 825D7B4 - step_03 + face_right step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B6: @ 825D7B6 - step_down - step_down - step_right - step_00 + walk_down + walk_down + walk_right + face_down step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB: @ 825D7BB - step_02 + face_left step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD: @ 825D7BD - step_03 + face_right step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BF: @ 825D7BF - step_01 + face_up step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C1: @ 825D7C1 - step_right + walk_right step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C3: @ 825D7C3 - step_left + walk_left step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C5: @ 825D7C5 - step_down - step_down + walk_down + walk_down step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C8: @ 825D7C8 - step_03 + face_right step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CA: @ 825D7CA - step_02 + face_left step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CC: @ 825D7CC - step_up - step_up - step_up - step_right - step_up - step_54 - step_up + walk_up + walk_up + walk_up + walk_right + walk_up + set_invisible + walk_up step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7D4: @ 825D7D4 - step_up - step_up - step_up - step_left - step_up - step_54 - step_up + walk_up + walk_up + walk_up + walk_left + walk_up + set_invisible + walk_up step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC: @ 825D7DC - step_up - step_up + walk_up + walk_up step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DF: @ 825D7DF - step_down - step_down + walk_down + walk_down step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E2: @ 825D7E2 - step_up - step_up - step_up - step_54 + walk_up + walk_up + walk_up + set_invisible step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E7: @ 825D7E7 - step_55 - step_down + set_visible + walk_down step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA: @ 825D7EA - step_left - step_03 + walk_left + face_right step_end BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED:: @ 825D7ED @@ -689,13 +689,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D96D:: @ 825D96D return BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0: @ 825D9B0 - step_up - step_up + walk_up + walk_up step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B3: @ 825D9B3 - step_down - step_down + walk_down + walk_down step_end BattleFrontier_BattlePikeRandomRoom1_Text_25D9B6: @ 825D9B6 diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc index 14f543284d..39045c3178 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc @@ -24,8 +24,8 @@ BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7:: @ 825E3A7 end BattleFrontier_BattlePikeRandomRoom2_Movement_25E3DB: @ 825E3DB - step_down - step_down + walk_down + walk_down step_end BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE: @ 825E3DE diff --git a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc b/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc index 6952412f24..6bef7ba122 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc @@ -267,22 +267,22 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2:: @ 825CBC2 end BattleFrontier_BattlePikeThreePathRoom_Movement_25CBCE: @ 825CBCE - step_left - step_left - step_down - step_down - step_down - step_down + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down step_end BattleFrontier_BattlePikeThreePathRoom_Movement_25CBD5: @ 825CBD5 - step_up - step_up - step_up - step_up - step_right - step_right - step_00 + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + face_down step_end BattleFrontier_BattlePikeThreePathRoom_Text_25CBDD: @ 825CBDD diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc b/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc index 2862722ce8..e92c8d97fc 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc @@ -462,34 +462,34 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D9C:: @ 8250D9C return BattleFrontier_BattlePyramidLobby_Movement_250DC4: @ 8250DC4 - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_00 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + face_down step_end BattleFrontier_BattlePyramidLobby_Movement_250DCD: @ 8250DCD - step_up - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattlePyramidLobby_Movement_250DD5: @ 8250DD5 - step_right - step_02 + walk_right + face_left step_end BattleFrontier_BattlePyramidLobby_Movement_250DD8: @ 8250DD8 - step_up - step_up + walk_up + walk_up step_end BattleFrontier_BattlePyramidLobby_EventScript_250DDB:: @ 8250DDB diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc index 05cee99b93..9d83ab4e00 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc @@ -235,32 +235,32 @@ BattleFrontier_BattlePyramidTop_EventScript_2553ED:: @ 82553ED return BattleFrontier_BattlePyramidTop_Movement_2553FD: @ 82553FD - step_right - step_27 + walk_right + walk_in_place_fastest_left step_end BattleFrontier_BattlePyramidTop_Movement_255400: @ 8255400 - step_left - step_26 + walk_left + walk_in_place_fastest_up step_end BattleFrontier_BattlePyramidTop_Movement_255403: @ 8255403 - step_up - step_up - step_up - step_up - step_up - step_25 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down step_end BattleFrontier_BattlePyramidTop_Movement_25540A: @ 825540A - step_15 + walk_fast_down step_end BattleFrontier_BattlePyramidTop_Movement_25540C: @ 825540C - slow_step_up - slow_step_up - step_14 + walk_slow_up + walk_slow_up + delay_16 step_end BattleFrontier_BattlePyramidTop_Text_255410: @ 8255410 diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc index 63306af2a1..087752d8fb 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc @@ -394,92 +394,92 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242170:: @ 8242170 return BattleFrontier_BattleTowerBattleRoom_Movement_242179: @ 8242179 - step_up - step_up - step_up - step_03 + walk_up + walk_up + walk_up + face_right step_end BattleFrontier_BattleTowerBattleRoom_Movement_24217E: @ 824217E - step_00 + face_down step_end BattleFrontier_BattleTowerBattleRoom_Movement_242180: @ 8242180 - step_03 + face_right step_end BattleFrontier_BattleTowerBattleRoom_Movement_242182: @ 8242182 - step_down - step_down - step_down - step_down - step_02 + walk_down + walk_down + walk_down + walk_down + face_left step_end BattleFrontier_BattleTowerBattleRoom_Movement_242188: @ 8242188 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattleTowerBattleRoom_Movement_24218D: @ 824218D - step_right - step_right - step_right - step_up + walk_right + walk_right + walk_right + walk_up step_end BattleFrontier_BattleTowerBattleRoom_Movement_242192: @ 8242192 - step_down - step_left - step_left - step_left - step_03 + walk_down + walk_left + walk_left + walk_left + face_right step_end BattleFrontier_BattleTowerBattleRoom_Movement_242198: @ 8242198 - step_54 + set_invisible step_end BattleFrontier_BattleTowerBattleRoom_Movement_24219A: @ 824219A - step_55 - step_14 - step_up - step_left - step_left - step_13 + set_visible + delay_16 + walk_up + walk_left + walk_left + delay_8 step_end BattleFrontier_BattleTowerBattleRoom_Movement_2421A1: @ 82421A1 - step_right - step_right - step_down - step_54 + walk_right + walk_right + walk_down + set_invisible step_end BattleFrontier_BattleTowerBattleRoom_Movement_2421A6: @ 82421A6 - step_14 - step_14 - step_14 - step_14 + delay_16 + delay_16 + delay_16 + delay_16 step_end BattleFrontier_BattleTowerBattleRoom_Movement_2421AB: @ 82421AB - step_03 - step_14 - step_14 - step_14 - step_14 - step_20 + face_right + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_right step_end BattleFrontier_BattleTowerBattleRoom_Movement_2421B2: @ 82421B2 - slow_step_down - slow_step_down - slow_step_down - slow_step_down - step_02 + walk_slow_down + walk_slow_down + walk_slow_down + walk_slow_down + face_left step_end BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8:: @ 82421B8 diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc index f22b0de26a..81c2dd563c 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc @@ -415,72 +415,72 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249514:: @ 8249514 return BattleFrontier_BattleTowerBattleRoom2_Movement_249518: @ 8249518 - step_up - step_up - step_up - step_up - step_03 + walk_up + walk_up + walk_up + walk_up + face_right step_end BattleFrontier_BattleTowerBattleRoom2_Movement_24951E: @ 824951E - step_left - step_up - step_up - step_up - step_03 + walk_left + walk_up + walk_up + walk_up + face_right step_end BattleFrontier_BattleTowerBattleRoom2_Movement_249524: @ 8249524 - step_02 + face_left step_end BattleFrontier_BattleTowerBattleRoom2_Movement_249526: @ 8249526 - step_28 + walk_in_place_fastest_right step_end BattleFrontier_BattleTowerBattleRoom2_Movement_249528: @ 8249528 - step_down - step_down - step_down - step_down - step_02 + walk_down + walk_down + walk_down + walk_down + face_left step_end BattleFrontier_BattleTowerBattleRoom2_Movement_24952E: @ 824952E - step_right - step_down - step_down - step_down - step_02 + walk_right + walk_down + walk_down + walk_down + face_left step_end BattleFrontier_BattleTowerBattleRoom2_Movement_249534: @ 8249534 - step_up - step_up - step_up - step_54 + walk_up + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleTowerBattleRoom2_Movement_249539: @ 8249539 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattleTowerBattleRoom2_Movement_24953E: @ 824953E - step_right - step_right + walk_right + walk_right step_end BattleFrontier_BattleTowerBattleRoom2_Movement_249541: @ 8249541 - step_left - step_left - step_28 + walk_left + walk_left + walk_in_place_fastest_right step_end BattleFrontier_BattleTowerBattleRoom2_Movement_249545: @ 8249545 - step_1f + walk_in_place_left step_end BattleFrontier_BattleTowerBattleRoom2_Text_249547: @ 8249547 diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc b/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc index a1dfa2abc3..ef11021759 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc @@ -40,20 +40,20 @@ BattleFrontier_BattleTowerCorridor_EventScript_241B27:: @ 8241B27 end BattleFrontier_BattleTowerCorridor_Movement_241B36: @ 8241B36 - step_right + walk_right BattleFrontier_BattleTowerCorridor_Movement_241B37: @ 8241B37 - step_right - step_right + walk_right + walk_right BattleFrontier_BattleTowerCorridor_Movement_241B39: @ 8241B39 - step_right + walk_right BattleFrontier_BattleTowerCorridor_Movement_241B3A: @ 8241B3A - step_right - step_right - step_right - step_up - step_54 + walk_right + walk_right + walk_right + walk_up + set_invisible step_end diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc b/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc index af2c67eaca..39157609e8 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc @@ -113,60 +113,60 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248EB2:: @ 8248EB2 return BattleFrontier_BattleTowerCorridor2_Movement_248EBC: @ 8248EBC - step_down - step_right - step_right - step_right - step_right - step_right - step_right + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end BattleFrontier_BattleTowerCorridor2_Movement_248EC4: @ 8248EC4 - step_down - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end BattleFrontier_BattleTowerCorridor2_Movement_248ECC: @ 8248ECC - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_28 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_in_place_fastest_right step_end BattleFrontier_BattleTowerCorridor2_Movement_248ED5: @ 8248ED5 - step_left - step_left - step_left - step_left - step_left - step_left - step_up - step_27 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_in_place_fastest_left step_end BattleFrontier_BattleTowerCorridor2_Movement_248EDE: @ 8248EDE - step_14 - step_up - step_up - step_54 + delay_16 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleTowerCorridor2_Movement_248EE3: @ 8248EE3 - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattleTowerCorridor2_Movement_248EE6: @ 8248EE6 - step_down + walk_down step_end diff --git a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc b/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc index 095e75394c..433d8e1814 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc @@ -57,27 +57,27 @@ BattleFrontier_BattleTowerElevator_EventScript_241A7C:: @ 8241A7C return BattleFrontier_BattleTowerElevator_Movement_241A86: @ 8241A86 - step_up - step_right - step_00 + walk_up + walk_right + face_down step_end BattleFrontier_BattleTowerElevator_Movement_241A8A: @ 8241A8A - step_up - step_up - step_00 + walk_up + walk_up + face_down step_end BattleFrontier_BattleTowerElevator_Movement_241A8E: @ 8241A8E - step_down - step_down - step_54 + walk_down + walk_down + set_invisible step_end BattleFrontier_BattleTowerElevator_Movement_241A92: @ 8241A92 - step_right - step_down - step_down + walk_right + walk_down + walk_down step_end BattleFrontier_BattleTowerElevator_MapScript2_241A96: @ 8241A96 diff --git a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc index 9f2099b32b..d899b1cbe2 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc @@ -781,29 +781,29 @@ BattleFrontier_BattleTowerLobby_EventScript_23F15B:: @ 823F15B return BattleFrontier_BattleTowerLobby_Movement_23F195: @ 823F195 - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattleTowerLobby_Movement_23F199: @ 823F199 - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattleTowerLobby_Movement_23F19C: @ 823F19C - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleTowerLobby_Movement_23F1A0: @ 823F1A0 - step_16 - step_16 - step_16 - step_16 - step_16 - step_54 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + set_invisible step_end BattleFrontier_BattleTowerLobby_EventScript_23F1A7:: @ 823F1A7 diff --git a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc index e6c99541d8..c1d3534d30 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc @@ -74,12 +74,12 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41 end BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E75: @ 8243E75 - step_down + walk_down step_end BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77: @ 8243E77 - step_left - step_25 + walk_left + walk_in_place_fastest_down step_end BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A:: @ 8243E7A @@ -136,26 +136,26 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F08: @ 8243F08 return BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1A: @ 8243F1A - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1E: @ 8243F1E - step_right - step_up - step_54 + walk_right + walk_up + set_invisible step_end BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F22: @ 8243F22 - step_left - step_up - step_54 + walk_left + walk_up + set_invisible step_end BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26: @ 8243F26 - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29:: @ 8243F29 @@ -223,24 +223,24 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF:: @ 8243FDF return BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FEA: @ 8243FEA - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FF2: @ 8243FF2 - step_17 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB:: @ 8243FFB diff --git a/data/scripts/maps/BattleFrontier_OutsideEast.inc b/data/scripts/maps/BattleFrontier_OutsideEast.inc index bf0d3ff166..dff56322a3 100644 --- a/data/scripts/maps/BattleFrontier_OutsideEast.inc +++ b/data/scripts/maps/BattleFrontier_OutsideEast.inc @@ -151,21 +151,21 @@ BattleFrontier_OutsideEast_EventScript_242D60:: @ 8242D60 end BattleFrontier_OutsideEast_Movement_242D69: @ 8242D69 - step_03 - step_13 - step_00 - step_13 - step_02 - step_13 - step_00 - step_13 - step_03 - step_13 - step_00 - step_13 - step_02 - step_13 - step_00 + face_right + delay_8 + face_down + delay_8 + face_left + delay_8 + face_down + delay_8 + face_right + delay_8 + face_down + delay_8 + face_left + delay_8 + face_down step_end BattleFrontier_OutsideEast_EventScript_242D79:: @ 8242D79 diff --git a/data/scripts/maps/BattleFrontier_OutsideWest.inc b/data/scripts/maps/BattleFrontier_OutsideWest.inc index f5886bfffc..fa2ff7e36e 100644 --- a/data/scripts/maps/BattleFrontier_OutsideWest.inc +++ b/data/scripts/maps/BattleFrontier_OutsideWest.inc @@ -202,23 +202,23 @@ BattleFrontier_OutsideWest_EventScript_23D61E:: @ 823D61E return BattleFrontier_OutsideWest_Movement_23D629: @ 823D629 - step_25 - step_25 + walk_in_place_fastest_down + walk_in_place_fastest_down step_end BattleFrontier_OutsideWest_Movement_23D62C: @ 823D62C - step_26 - step_26 + walk_in_place_fastest_up + walk_in_place_fastest_up step_end BattleFrontier_OutsideWest_Movement_23D62F: @ 823D62F - step_28 - step_28 + walk_in_place_fastest_right + walk_in_place_fastest_right step_end BattleFrontier_OutsideWest_Movement_23D632: @ 823D632 - step_27 - step_27 + walk_in_place_fastest_left + walk_in_place_fastest_left step_end BattleFrontier_OutsideWest_EventScript_23D635:: @ 823D635 diff --git a/data/scripts/maps/BattleFrontier_ReceptionGate.inc b/data/scripts/maps/BattleFrontier_ReceptionGate.inc index eca861f85c..ec38c3e9dc 100644 --- a/data/scripts/maps/BattleFrontier_ReceptionGate.inc +++ b/data/scripts/maps/BattleFrontier_ReceptionGate.inc @@ -63,59 +63,59 @@ BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229 end BattleFrontier_ReceptionGate_Movement_2662D2: @ 82662D2 - step_up - step_up - step_left - step_left + walk_up + walk_up + walk_left + walk_left step_end BattleFrontier_ReceptionGate_Movement_2662D7: @ 82662D7 - step_14 - step_14 - step_14 - step_13 - step_28 + delay_16 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_right step_end BattleFrontier_ReceptionGate_Movement_2662DD: @ 82662DD - step_down - step_down + walk_down + walk_down step_end BattleFrontier_ReceptionGate_Movement_2662E0: @ 82662E0 - step_down - step_down - step_down - step_down - step_down - step_down - step_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_left step_end BattleFrontier_ReceptionGate_Movement_2662E8: @ 82662E8 - step_right - step_up - step_up - step_up - step_up - step_up - step_up + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_ReceptionGate_Movement_2662F0: @ 82662F0 - step_14 - step_14 - step_14 - step_13 - step_28 + delay_16 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_right step_end BattleFrontier_ReceptionGate_Movement_2662F6: @ 82662F6 - step_14 - step_14 - step_14 - step_13 - step_27 + delay_16 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_left step_end BattleFrontier_ReceptionGate_EventScript_2662FC:: @ 82662FC diff --git a/data/scripts/maps/BirthIsland_Exterior.inc b/data/scripts/maps/BirthIsland_Exterior.inc index 6fd6374616..b2427e95da 100644 --- a/data/scripts/maps/BirthIsland_Exterior.inc +++ b/data/scripts/maps/BirthIsland_Exterior.inc @@ -114,12 +114,12 @@ BirthIsland_Exterior_EventScript_268049:: @ 8268049 end BirthIsland_Exterior_Movement_268054: @ 8268054 - slow_step_down - slow_step_down - slow_step_down - slow_step_down - slow_step_down - slow_step_down - slow_step_down + walk_slow_down + walk_slow_down + walk_slow_down + walk_slow_down + walk_slow_down + walk_slow_down + walk_slow_down step_end diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index f78d4ea15a..1edc1407d7 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -197,401 +197,401 @@ DewfordTown_EventScript_1E9799:: @ 81E9799 return DewfordTown_Movement_1E97A2: @ 81E97A2 - step_up - step_up - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_up - step_up - step_left - step_left - step_17 - step_17 - step_17 - step_17 - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_17 - step_17 - step_17 - step_17 - step_16 - step_16 - step_16 - step_16 - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_16 - step_16 - step_16 - step_16 - step_17 - step_17 - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_17 - step_17 - step_16 - step_16 - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_16 - step_16 - step_16 - step_16 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_up + walk_up + walk_left + walk_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_left + walk_fast_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_up + walk_up + walk_up + walk_up step_end DewfordTown_Movement_1E9865: @ 81E9865 - step_right - step_18 - step_18 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_18 - step_18 - step_16 - step_16 - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_right + walk_fast_right + walk_fast_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end DewfordTown_Movement_1E9911: @ 81E9911 - step_right - step_up + walk_right + walk_up step_end DewfordTown_Movement_1E9914: @ 81E9914 - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end DewfordTown_Movement_1E9918: @ 81E9918 - step_up - step_up - step_up - step_25 + walk_up + walk_up + walk_up + walk_in_place_fastest_down step_end DewfordTown_Movement_1E991D: @ 81E991D - step_up + walk_up step_end DewfordTown_Movement_1E991F: @ 81E991F - step_up - step_up + walk_up + walk_up step_end DewfordTown_EventScript_1E9922:: @ 81E9922 diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 4d4c3732d4..37122a6403 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -241,11 +241,11 @@ DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0 return DewfordTown_Hall_Movement_1FD7D6: @ 81FD7D6 - step_1f + walk_in_place_left step_end DewfordTown_Hall_Movement_1FD7D8: @ 81FD7D8 - step_20 + walk_in_place_right step_end DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 71410a43f5..bed242a2b5 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -33,8 +33,8 @@ EverGrandeCity_ChampionsRoom_EventScript_228A1E:: @ 8228A1E end EverGrandeCity_ChampionsRoom_Movement_228A42: @ 8228A42 - step_up - step_up + walk_up + walk_up step_end EverGrandeCity_ChampionsRoom_EventScript_228A45:: @ 8228A45 @@ -163,66 +163,66 @@ EverGrandeCity_ChampionsRoom_EventScript_228C12:: @ 8228C12 return EverGrandeCity_ChampionsRoom_Movement_228C1D: @ 8228C1D - step_up - step_up + walk_up + walk_up step_end EverGrandeCity_ChampionsRoom_Movement_228C20: @ 8228C20 - step_up - step_14 - step_up - step_13 - step_54 + walk_up + delay_16 + walk_up + delay_8 + set_invisible step_end EverGrandeCity_ChampionsRoom_Movement_228C26: @ 8228C26 - step_up - step_up - step_up - step_up - step_up - step_left - step_up - step_28 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_up + walk_in_place_fastest_right step_end EverGrandeCity_ChampionsRoom_Movement_228C2F: @ 8228C2F - step_26 - step_14 - step_28 - step_14 - step_26 - step_13 - step_28 - step_14 + walk_in_place_fastest_up + delay_16 + walk_in_place_fastest_right + delay_16 + walk_in_place_fastest_up + delay_8 + walk_in_place_fastest_right + delay_16 step_end EverGrandeCity_ChampionsRoom_Movement_228C38: @ 8228C38 - step_right - step_up + walk_right + walk_up step_end EverGrandeCity_ChampionsRoom_Movement_228C3B: @ 8228C3B - step_up - step_up - step_25 + walk_up + walk_up + walk_in_place_fastest_down step_end EverGrandeCity_ChampionsRoom_Movement_228C3F: @ 8228C3F - step_up - step_13 - step_54 + walk_up + delay_8 + set_invisible step_end EverGrandeCity_ChampionsRoom_Movement_228C43: @ 8228C43 - step_up - step_up - step_up - step_up - step_up - step_right - step_up - step_27 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_up + walk_in_place_fastest_left step_end EverGrandeCity_ChampionsRoom_Text_228C4C: @ 8228C4C diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index de29dca0f4..60f0dd1ad1 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -67,20 +67,20 @@ EverGrandeCity_HallOfFame_EventScript_2298F5:: @ 82298F5 end EverGrandeCity_HallOfFame_Movement_229901: @ 8229901 - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end EverGrandeCity_HallOfFame_Movement_229908: @ 8229908 - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end EverGrandeCity_HallOfFame_Text_22990E: @ 822990E diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc index a9e27ec73a..ed6e6a4977 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc @@ -61,21 +61,21 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229AC1:: @ 8229AC1 return EverGrandeCity_PokemonCenter_1F_Movement_229ACC: @ 8229ACC - step_left - step_down - step_down - step_left - step_down - step_down + walk_left + walk_down + walk_down + walk_left + walk_down + walk_down step_end EverGrandeCity_PokemonCenter_1F_Movement_229AD3: @ 8229AD3 - step_down - step_down - step_left - step_left - step_down - step_down + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down step_end EverGrandeCity_PokemonCenter_1F_Text_229ADA: @ 8229ADA diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc index 4fd73b3bfc..f1a6ce17fa 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc @@ -103,25 +103,25 @@ EverGrandeCity_PokemonLeague_1F_EventScript_2296BB:: @ 82296BB end EverGrandeCity_PokemonLeague_1F_Movement_2296DA: @ 82296DA - step_down - step_left - step_26 + walk_down + walk_left + walk_in_place_fastest_up step_end EverGrandeCity_PokemonLeague_1F_Movement_2296DE: @ 82296DE - step_down - step_right - step_26 + walk_down + walk_right + walk_in_place_fastest_up step_end EverGrandeCity_PokemonLeague_1F_Movement_2296E2: @ 82296E2 - step_left - step_25 + walk_left + walk_in_place_fastest_down step_end EverGrandeCity_PokemonLeague_1F_Movement_2296E5: @ 82296E5 - step_right - step_25 + walk_right + walk_in_place_fastest_down step_end EverGrandeCity_PokemonLeague_1F_Text_2296E8: @ 82296E8 diff --git a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc index f6750009dd..48703897e9 100644 --- a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc +++ b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc @@ -203,56 +203,56 @@ FallarborTown_BattleTentBattleRoom_EventScript_200B73:: @ 8200B73 end FallarborTown_BattleTentBattleRoom_Movement_200B8D: @ 8200B8D - step_up - step_up - step_up - step_28 + walk_up + walk_up + walk_up + walk_in_place_fastest_right step_end FallarborTown_BattleTentBattleRoom_Movement_200B92: @ 8200B92 - step_28 + walk_in_place_fastest_right step_end FallarborTown_BattleTentBattleRoom_Movement_200B94: @ 8200B94 - step_27 + walk_in_place_fastest_left step_end FallarborTown_BattleTentBattleRoom_Movement_200B96: @ 8200B96 - step_down - step_down - step_down - step_down - step_27 + walk_down + walk_down + walk_down + walk_down + walk_in_place_fastest_left step_end FallarborTown_BattleTentBattleRoom_Movement_200B9C: @ 8200B9C - step_left + walk_left step_end FallarborTown_BattleTentBattleRoom_Movement_200B9E: @ 8200B9E - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end FallarborTown_BattleTentBattleRoom_Movement_200BA3: @ 8200BA3 - step_51 - step_46 + disable_jump_landing_ground_effect + jump_in_place_down step_end FallarborTown_BattleTentBattleRoom_Movement_200BA6: @ 8200BA6 - step_down - step_down - step_down - step_28 + walk_down + walk_down + walk_down + walk_in_place_fastest_right step_end FallarborTown_BattleTentBattleRoom_Movement_200BAB: @ 8200BAB - step_up - step_up - step_up - step_25 + walk_up + walk_up + walk_up + walk_in_place_fastest_down step_end FallarborTown_BattleTentBattleRoom_MapScript2_200BB0: @ 8200BB0 diff --git a/data/scripts/maps/FallarborTown_BattleTentCorridor.inc b/data/scripts/maps/FallarborTown_BattleTentCorridor.inc index 1325b03327..f1d3024c04 100644 --- a/data/scripts/maps/FallarborTown_BattleTentCorridor.inc +++ b/data/scripts/maps/FallarborTown_BattleTentCorridor.inc @@ -26,18 +26,18 @@ FallarborTown_BattleTentCorridor_EventScript_2006B7:: @ 82006B7 end FallarborTown_BattleTentCorridor_Movement_2006FB: @ 82006FB - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end FallarborTown_BattleTentCorridor_Movement_200700: @ 8200700 - step_up + walk_up FallarborTown_BattleTentCorridor_Movement_200701: @ 8200701 - step_up - step_54 + walk_up + set_invisible step_end FallarborTown_BattleTentCorridor_Text_200704: @ 8200704 diff --git a/data/scripts/maps/FallarborTown_BattleTentLobby.inc b/data/scripts/maps/FallarborTown_BattleTentLobby.inc index 3272211200..1bde88e7d1 100644 --- a/data/scripts/maps/FallarborTown_BattleTentLobby.inc +++ b/data/scripts/maps/FallarborTown_BattleTentLobby.inc @@ -257,26 +257,26 @@ FallarborTown_BattleTentLobby_EventScript_2001CF:: @ 82001CF return FallarborTown_BattleTentLobby_Movement_2001FE: @ 82001FE - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end FallarborTown_BattleTentLobby_Movement_200202: @ 8200202 - step_up - step_54 + walk_up + set_invisible step_end FallarborTown_BattleTentLobby_Movement_200205: @ 8200205 - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end FallarborTown_BattleTentLobby_Movement_200209: @ 8200209 - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end FallarborTown_BattleTentLobby_EventScript_20020D:: @ 820020D diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 1cc3999f70..15f5d2b9e6 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -54,31 +54,31 @@ FallarborTown_PokemonCenter_1F_EventScript_200C48:: @ 8200C48 end FallarborTown_PokemonCenter_1F_Movement_200C53: @ 8200C53 - step_right - step_down - step_down - step_left - step_left - step_left - step_left - step_down - step_down - step_down - step_down - step_13 + walk_right + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + delay_8 step_end FallarborTown_PokemonCenter_1F_Movement_200C60: @ 8200C60 - step_down - step_down - step_left - step_left - step_left - step_down - step_down - step_down - step_down - step_13 + walk_down + walk_down + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + delay_8 step_end FallarborTown_PokemonCenter_1F_Text_200C6B: @ 8200C6B diff --git a/data/scripts/maps/FarawayIsland_Interior.inc b/data/scripts/maps/FarawayIsland_Interior.inc index 42b18983fc..e7d67431d5 100644 --- a/data/scripts/maps/FarawayIsland_Interior.inc +++ b/data/scripts/maps/FarawayIsland_Interior.inc @@ -72,51 +72,51 @@ FarawayIsland_Interior_EventScript_267DA2:: @ 8267DA2 end FarawayIsland_Interior_Movement_267DCE: @ 8267DCE - step_up - step_up - step_up - step_25 - step_54 + walk_up + walk_up + walk_up + walk_in_place_fastest_down + set_invisible step_end FarawayIsland_Interior_Movement_267DD4: @ 8267DD4 - step_55 + set_visible step_end FarawayIsland_Interior_Movement_267DD6: @ 8267DD6 - step_40 - step_16 - step_16 - step_41 - step_1d - step_1d + lock_facing_direction + walk_fast_up + walk_fast_up + unlock_facing_direction + walk_in_place_down + walk_in_place_down step_end FarawayIsland_Interior_Movement_267DDD: @ 8267DDD - step_40 - step_16 - step_16 - step_41 - step_1e - step_1e + lock_facing_direction + walk_fast_up + walk_fast_up + unlock_facing_direction + walk_in_place_up + walk_in_place_up step_end FarawayIsland_Interior_Movement_267DE4: @ 8267DE4 - step_40 - step_16 - step_16 - step_41 - step_20 - step_20 + lock_facing_direction + walk_fast_up + walk_fast_up + unlock_facing_direction + walk_in_place_right + walk_in_place_right step_end FarawayIsland_Interior_Movement_267DEB: @ 8267DEB - step_40 - step_16 - step_16 - step_41 - step_1f - step_1f + lock_facing_direction + walk_fast_up + walk_fast_up + unlock_facing_direction + walk_in_place_left + walk_in_place_left step_end FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2 diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index 0b4b71c2ba..4a28a180bf 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -87,7 +87,7 @@ FortreeCity_EventScript_1E2645:: @ 81E2645 end FortreeCity_Movement_1E2674: @ 81E2674 - step_right + walk_right step_end FortreeCity_Text_1E2676: @ 81E2676 diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index 521e990218..27ead9ec29 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -49,11 +49,11 @@ FortreeCity_House4_EventScript_217D06:: @ 8217D06 end FortreeCity_House4_Movement_217D1A: @ 8217D1A - step_15 - step_15 - step_18 - step_25 - step_13 + walk_fast_down + walk_fast_down + walk_fast_right + walk_in_place_fastest_down + delay_8 step_end FortreeCity_House4_EventScript_217D20:: @ 8217D20 diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 9d61bc1a55..b057a05481 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -58,30 +58,30 @@ GraniteCave_StevensRoom_EventScript_22DD3C:: @ 822DD3C return GraniteCave_StevensRoom_Movement_22DD45: @ 822DD45 - step_up - step_up - step_up - step_up - step_up - step_13 + walk_up + walk_up + walk_up + walk_up + walk_up + delay_8 step_end GraniteCave_StevensRoom_Movement_22DD4C: @ 822DD4C - step_14 - step_14 - step_14 - step_26 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_up step_end GraniteCave_StevensRoom_Movement_22DD51: @ 822DD51 - step_left - step_up - step_up - step_up - step_right - step_up - step_up - step_13 + walk_left + walk_up + walk_up + walk_up + walk_right + walk_up + walk_up + delay_8 step_end GraniteCave_StevensRoom_Text_22DD5A: @ 822DD5A diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 8a8e2baed8..5670d9b6e4 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -162,53 +162,53 @@ LavaridgeTown_EventScript_1EA6C9:: @ 81EA6C9 return LavaridgeTown_Movement_1EA6D4: @ 81EA6D4 - step_18 - step_18 - step_18 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end LavaridgeTown_Movement_1EA6DF: @ 81EA6DF - step_14 - step_13 - step_28 + delay_16 + delay_8 + walk_in_place_fastest_right step_end LavaridgeTown_Movement_1EA6E3: @ 81EA6E3 - step_15 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 + walk_fast_down + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right step_end LavaridgeTown_Movement_1EA6ED: @ 81EA6ED - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end LavaridgeTown_Movement_1EA6F4: @ 81EA6F4 - step_left - step_left - step_up + walk_left + walk_left + walk_up step_end LavaridgeTown_Movement_1EA6F8: @ 81EA6F8 - step_down + walk_down step_end LavaridgeTown_EventScript_1EA6FA:: @ 81EA6FA diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 1c4d21970d..1f65b88fd7 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -160,45 +160,45 @@ LilycoveCity_ContestLobby_EventScript_21A403:: @ 821A403 return LilycoveCity_ContestLobby_Movement_21A407: @ 821A407 - step_down - step_down - step_down - step_right - step_right - step_right - step_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right step_end LilycoveCity_ContestLobby_Movement_21A40F: @ 821A40F - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end LilycoveCity_ContestLobby_Movement_21A418: @ 821A418 - step_27 + walk_in_place_fastest_left step_end LilycoveCity_ContestLobby_Movement_21A41A: @ 821A41A - step_down - step_down - step_down + walk_down + walk_down + walk_down step_end LilycoveCity_ContestLobby_Movement_21A41E: @ 821A41E - step_14 - step_14 - step_14 - step_14 - step_16 - step_16 - step_16 - step_28 + delay_16 + delay_16 + delay_16 + delay_16 + walk_fast_up + walk_fast_up + walk_fast_up + walk_in_place_fastest_right step_end LilycoveCity_ContestLobby_EventScript_21A427:: @ 821A427 @@ -275,46 +275,46 @@ LilycoveCity_ContestLobby_EventScript_21A4E4:: @ 821A4E4 return LilycoveCity_ContestLobby_Movement_21A533: @ 821A533 - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left step_end LilycoveCity_ContestLobby_Movement_21A53C: @ 821A53C - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end LilycoveCity_ContestLobby_Movement_21A545: @ 821A545 - step_28 + walk_in_place_fastest_right step_end LilycoveCity_ContestLobby_Movement_21A547: @ 821A547 - step_down - step_down - step_down + walk_down + walk_down + walk_down step_end LilycoveCity_ContestLobby_Movement_21A54B: @ 821A54B - step_14 - step_14 - step_14 - step_14 - step_16 - step_16 - step_16 - step_27 + delay_16 + delay_16 + delay_16 + delay_16 + walk_fast_up + walk_fast_up + walk_fast_up + walk_in_place_fastest_left step_end LilycoveCity_ContestLobby_EventScript_21A554:: @ 821A554 @@ -433,47 +433,47 @@ LilycoveCity_ContestLobby_EventScript_21A670:: @ 821A670 return LilycoveCity_ContestLobby_Movement_21A6E8: @ 821A6E8 - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_13 - step_54 + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible step_end LilycoveCity_ContestLobby_Movement_21A6F2: @ 821A6F2 - step_27 - step_left + walk_in_place_fastest_left + walk_left step_end LilycoveCity_ContestLobby_Movement_21A6F5: @ 821A6F5 - step_left - step_left - step_25 + walk_left + walk_left + walk_in_place_fastest_down step_end LilycoveCity_ContestLobby_Movement_21A6F9: @ 821A6F9 - step_down - step_down - step_26 + walk_down + walk_down + walk_in_place_fastest_up step_end LilycoveCity_ContestLobby_Movement_21A6FD: @ 821A6FD - step_left - step_left - step_left - step_up - step_up - step_up - step_13 - step_54 + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible step_end LilycoveCity_ContestLobby_Movement_21A706: @ 821A706 - step_28 + walk_in_place_fastest_right step_end LilycoveCity_ContestLobby_EventScript_21A708:: @ 821A708 @@ -959,48 +959,48 @@ LilycoveCity_ContestLobby_EventScript_21AC49:: @ 821AC49 return LilycoveCity_ContestLobby_Movement_21ACD0: @ 821ACD0 - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_up - step_13 - step_54 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_up + delay_8 + set_invisible step_end LilycoveCity_ContestLobby_Movement_21ACDB: @ 821ACDB - step_right + walk_right step_end LilycoveCity_ContestLobby_Movement_21ACDD: @ 821ACDD - step_right - step_right - step_25 + walk_right + walk_right + walk_in_place_fastest_down step_end LilycoveCity_ContestLobby_Movement_21ACE1: @ 821ACE1 - step_down - step_down - step_26 + walk_down + walk_down + walk_in_place_fastest_up step_end LilycoveCity_ContestLobby_Movement_21ACE5: @ 821ACE5 - step_right - step_right - step_right - step_right - step_up - step_up - step_up - step_13 - step_54 + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_up + delay_8 + set_invisible step_end LilycoveCity_ContestLobby_Movement_21ACEF: @ 821ACEF - step_27 + walk_in_place_fastest_left step_end LilycoveCity_ContestLobby_EventScript_21ACF1:: @ 821ACF1 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc index 5f2b79a5d0..3468299a9f 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc @@ -59,20 +59,20 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211 end LilycoveCity_CoveLilyMotel_1F_Movement_218259: @ 8218259 - step_03 - step_40 - step_left - step_41 + face_right + lock_facing_direction + walk_left + unlock_facing_direction step_end LilycoveCity_CoveLilyMotel_1F_Movement_21825E: @ 821825E - step_up + walk_up step_end LilycoveCity_CoveLilyMotel_1F_Movement_218260: @ 8218260 - step_00 - step_down - step_01 + face_down + walk_down + face_up step_end LilycoveCity_CoveLilyMotel_1F_Text_218264: @ 8218264 diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index f57ca14b5a..6357326c1e 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -454,16 +454,16 @@ LilycoveCity_Harbor_EventScript_21E626:: @ 821E626 end LilycoveCity_Harbor_Movement_21E630: @ 821E630 - step_right - step_26 + walk_right + walk_in_place_fastest_up step_end LilycoveCity_Harbor_Movement_21E633: @ 821E633 - step_up + walk_up step_end LilycoveCity_Harbor_Movement_21E635: @ 821E635 - step_up + walk_up step_end LilycoveCity_Harbor_EventScript_21E637:: @ 821E637 @@ -491,16 +491,16 @@ LilycoveCity_Harbor_EventScript_21E661:: @ 821E661 return LilycoveCity_Harbor_Movement_21E66C: @ 821E66C - step_28 - step_40 - step_left - step_41 + walk_in_place_fastest_right + lock_facing_direction + walk_left + unlock_facing_direction step_end LilycoveCity_Harbor_Movement_21E671: @ 821E671 - step_40 - step_down - step_41 + lock_facing_direction + walk_down + unlock_facing_direction step_end LilycoveCity_Harbor_EventScript_21E675:: @ 821E675 @@ -538,43 +538,43 @@ LilycoveCity_Harbor_EventScript_21E6BA:: @ 821E6BA return LilycoveCity_Harbor_Movement_21E6D3: @ 821E6D3 - step_26 - step_13 - step_54 + walk_in_place_fastest_up + delay_8 + set_invisible step_end LilycoveCity_Harbor_Movement_21E6D7: @ 821E6D7 - step_14 - step_up - step_14 - step_54 + delay_16 + walk_up + delay_16 + set_invisible step_end LilycoveCity_Harbor_Movement_21E6DC: @ 821E6DC - step_14 - step_14 - step_14 - step_right - step_26 - step_14 - step_54 + delay_16 + delay_16 + delay_16 + walk_right + walk_in_place_fastest_up + delay_16 + set_invisible step_end LilycoveCity_Harbor_Movement_21E6E4: @ 821E6E4 - step_14 - step_right - step_26 - step_14 - step_54 + delay_16 + walk_right + walk_in_place_fastest_up + delay_16 + set_invisible step_end LilycoveCity_Harbor_Movement_21E6EA: @ 821E6EA - step_14 - step_14 - step_14 - step_up - step_14 - step_54 + delay_16 + delay_16 + delay_16 + walk_up + delay_16 + set_invisible step_end LilycoveCity_Harbor_Text_21E6F1: @ 821E6F1 diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index 8103a623c7..507997416a 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -70,22 +70,22 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218D84:: @ 8218D84 end LilycoveCity_LilycoveMuseum_1F_Movement_218D99: @ 8218D99 - step_up + walk_up step_end LilycoveCity_LilycoveMuseum_1F_Movement_218D9B: @ 8218D9B - step_left - step_up + walk_left + walk_up step_end LilycoveCity_LilycoveMuseum_1F_Movement_218D9E: @ 8218D9E - step_right - step_up + walk_right + walk_up step_end LilycoveCity_LilycoveMuseum_1F_Movement_218DA1: @ 8218DA1 - step_up - step_up + walk_up + walk_up step_end LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4:: @ 8218DA4 diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index 97dba47044..6b4f0f3dad 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -86,12 +86,12 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808 end LilycoveCity_LilycoveMuseum_2F_Movement_219861: @ 8219861 - step_27 + walk_in_place_fastest_left step_end LilycoveCity_LilycoveMuseum_2F_Movement_219863: @ 8219863 - step_01 - step_14 + face_up + delay_16 step_end LilycoveCity_LilycoveMuseum_2F_EventScript_219866:: @ 8219866 diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index cdcef8e9ac..74146fc7e2 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -29,35 +29,35 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A end LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5: @ 821C7F5 - step_13 - step_25 - step_down - step_down - step_down - step_left - step_left + delay_8 + walk_in_place_fastest_down + walk_down + walk_down + walk_down + walk_left + walk_left step_end LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD: @ 821C7FD - step_17 - step_17 - step_15 - step_15 - step_17 - step_15 + walk_fast_left + walk_fast_left + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_down step_end LilycoveCity_PokemonTrainerFanClub_Movement_21C804: @ 821C804 - step_down - step_28 + walk_down + walk_in_place_fastest_right step_end LilycoveCity_PokemonTrainerFanClub_Movement_21C807: @ 821C807 - step_49 - step_16 - step_16 - step_18 - step_25 + jump_in_place_right + walk_fast_up + walk_fast_up + walk_fast_right + walk_in_place_fastest_down step_end LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D: @ 821C80D diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 0fcdc46d55..67b1f9381c 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -146,42 +146,42 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17 return LittlerootTown_Movement_1E7F98: @ 81E7F98 - step_down + walk_down step_end LittlerootTown_Movement_1E7F9A: @ 81E7F9A - step_down - step_27 + walk_down + walk_in_place_fastest_left step_end LittlerootTown_Movement_1E7F9D: @ 81E7F9D - step_14 - step_13 - step_up + delay_16 + delay_8 + walk_up step_end LittlerootTown_Movement_1E7FA1: @ 81E7FA1 - step_up - step_54 + walk_up + set_invisible step_end LittlerootTown_Movement_1E7FA4: @ 81E7FA4 - step_14 - step_13 - step_right - step_26 + delay_16 + delay_8 + walk_right + walk_in_place_fastest_up step_end LittlerootTown_Movement_1E7FA9: @ 81E7FA9 - step_up - step_up + walk_up + walk_up step_end LittlerootTown_Movement_1E7FAC: @ 81E7FAC - step_45 - step_14 - step_14 - step_14 + jump_right + delay_16 + delay_16 + delay_16 step_end LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1 @@ -287,41 +287,41 @@ LittlerootTown_EventScript_1E80AD:: @ 81E80AD return LittlerootTown_Movement_1E80D1: @ 81E80D1 - step_03 - step_13 - step_51 - step_49 - step_13 - step_18 - step_18 - step_18 - step_18 - step_16 - step_16 - step_17 - step_00 + face_right + delay_8 + disable_jump_landing_ground_effect + jump_in_place_right + delay_8 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_left + face_down step_end LittlerootTown_Movement_1E80DF: @ 81E80DF - step_down + walk_down step_end LittlerootTown_Movement_1E80E1: @ 81E80E1 - step_right - step_down - step_down - step_left - step_left - step_left - step_left - step_up - step_25 + walk_right + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_up + walk_in_place_fastest_down step_end LittlerootTown_Movement_1E80EB: @ 81E80EB - step_40 - step_down - step_41 + lock_facing_direction + walk_down + unlock_facing_direction step_end LittlerootTown_EventScript_1E80EF:: @ 81E80EF @@ -335,27 +335,27 @@ LittlerootTown_EventScript_1E80EF:: @ 81E80EF end LittlerootTown_Movement_1E810B: @ 81E810B - step_03 - step_13 - step_51 - step_49 - step_13 - step_18 - step_18 - step_18 - step_16 - step_16 - step_18 - step_00 + face_right + delay_8 + disable_jump_landing_ground_effect + jump_in_place_right + delay_8 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_right + face_down step_end LittlerootTown_Movement_1E8118: @ 81E8118 - step_left - step_down - step_left - step_left - step_left - step_25 + walk_left + walk_down + walk_left + walk_left + walk_left + walk_in_place_fastest_down step_end LittlerootTown_EventScript_1E811F:: @ 81E811F @@ -739,153 +739,153 @@ LittlerootTown_EventScript_1E85AB:: @ 81E85AB return LittlerootTown_Movement_1E85D1: @ 81E85D1 - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end LittlerootTown_Movement_1E85D8: @ 81E85D8 - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end LittlerootTown_Movement_1E85DF: @ 81E85DF - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right step_end LittlerootTown_Movement_1E85E4: @ 81E85E4 - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end LittlerootTown_Movement_1E85EA: @ 81E85EA - step_right - step_right + walk_right + walk_right step_end LittlerootTown_Movement_1E85ED: @ 81E85ED - step_right - step_right - step_right + walk_right + walk_right + walk_right step_end LittlerootTown_Movement_1E85F1: @ 81E85F1 - step_left - step_left - step_left + walk_left + walk_left + walk_left step_end LittlerootTown_Movement_1E85F5: @ 81E85F5 - step_left - step_left + walk_left + walk_left step_end LittlerootTown_Movement_1E85F8: @ 81E85F8 - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end LittlerootTown_Movement_1E85FE: @ 81E85FE - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left step_end LittlerootTown_Movement_1E8603: @ 81E8603 - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end LittlerootTown_Movement_1E8609: @ 81E8609 - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end LittlerootTown_Movement_1E860F: @ 81E860F - step_left - step_left - step_left - step_left - step_26 + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end LittlerootTown_Movement_1E8615: @ 81E8615 - step_left - step_left - step_left - step_left - step_left - step_26 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end LittlerootTown_Movement_1E861C: @ 81E861C - step_left - step_left - step_26 + walk_left + walk_left + walk_in_place_fastest_up step_end LittlerootTown_Movement_1E8620: @ 81E8620 - step_left - step_left - step_left - step_26 + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end LittlerootTown_Movement_1E8625: @ 81E8625 - step_right - step_right - step_right - step_26 + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end LittlerootTown_Movement_1E862A: @ 81E862A - step_right - step_right - step_26 + walk_right + walk_right + walk_in_place_fastest_up step_end LittlerootTown_Movement_1E862E: @ 81E862E - step_right - step_right - step_right - step_right - step_right - step_26 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end LittlerootTown_Movement_1E8635: @ 81E8635 - step_right - step_right - step_right - step_right - step_26 + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end LittlerootTown_Movement_1E863B: @ 81E863B - step_up + walk_up step_end LittlerootTown_EventScript_1E863D:: @ 81E863D diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 0f3fa1a0e7..53825a84c2 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -71,7 +71,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F7814:: @ 81F7814 end LittlerootTown_BrendansHouse_1F_Movement_1F783A: @ 81F783A - step_up + walk_up step_end LittlerootTown_BrendansHouse_1F_EventScript_1F783C:: @ 81F783C @@ -106,12 +106,12 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E end LittlerootTown_BrendansHouse_1F_Movement_1F789C: @ 81F789C - step_down - step_right - step_right - step_right - step_right - step_right + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right step_end LittlerootTown_BrendansHouse_1F_EventScript_1F78A3:: @ 81F78A3 @@ -202,29 +202,29 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F79A2:: @ 81F79A2 return LittlerootTown_BrendansHouse_1F_Movement_1F79AD: @ 81F79AD - step_27 - step_left - step_26 - step_up - step_up - step_up - step_up + walk_in_place_fastest_left + walk_left + walk_in_place_fastest_up + walk_up + walk_up + walk_up + walk_up step_end LittlerootTown_BrendansHouse_1F_Movement_1F79B5: @ 81F79B5 - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end LittlerootTown_BrendansHouse_1F_Movement_1F79B9: @ 81F79B9 - step_28 - step_right - step_26 - step_up - step_up - step_up - step_up + walk_in_place_fastest_right + walk_right + walk_in_place_fastest_up + walk_up + walk_up + walk_up + walk_up step_end LittlerootTown_BrendansHouse_1F_EventScript_1F79C1:: @ 81F79C1 @@ -246,52 +246,52 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F79E5:: @ 81F79E5 return LittlerootTown_BrendansHouse_1F_Movement_1F79F7: @ 81F79F7 - step_14 - step_13 - step_28 + delay_16 + delay_8 + walk_in_place_fastest_right step_end LittlerootTown_BrendansHouse_1F_Movement_1F79FB: @ 81F79FB - step_14 - step_13 - step_28 - step_14 - step_14 - step_26 + delay_16 + delay_8 + walk_in_place_fastest_right + delay_16 + delay_16 + walk_in_place_fastest_up step_end LittlerootTown_BrendansHouse_1F_Movement_1F7A02: @ 81F7A02 - step_14 - step_13 - step_27 + delay_16 + delay_8 + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_1F_Movement_1F7A06: @ 81F7A06 - step_28 - step_right - step_26 - step_up - step_up + walk_in_place_fastest_right + walk_right + walk_in_place_fastest_up + walk_up + walk_up step_end LittlerootTown_BrendansHouse_1F_Movement_1F7A0C: @ 81F7A0C - step_28 - step_right - step_26 - step_up - step_up - step_27 - step_left - step_26 - step_up + walk_in_place_fastest_right + walk_right + walk_in_place_fastest_up + walk_up + walk_up + walk_in_place_fastest_left + walk_left + walk_in_place_fastest_up + walk_up step_end LittlerootTown_BrendansHouse_1F_Movement_1F7A16: @ 81F7A16 - step_27 - step_left - step_26 - step_up - step_up + walk_in_place_fastest_left + walk_left + walk_in_place_fastest_up + walk_up + walk_up step_end LittlerootTown_BrendansHouse_1F_Text_1F7A1C: @ 81F7A1C diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index a5223d38a0..429c933fc1 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -139,110 +139,110 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8594:: @ 81F8594 return LittlerootTown_BrendansHouse_2F_Movement_1F85BC: @ 81F85BC - step_down - step_down - step_27 + walk_down + walk_down + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_2F_Movement_1F85C0: @ 81F85C0 - step_left - step_left - step_down - step_down - step_left + walk_left + walk_left + walk_down + walk_down + walk_left step_end LittlerootTown_BrendansHouse_2F_Movement_1F85C6: @ 81F85C6 - step_up - step_up - step_up - step_left - step_left - step_left - step_left - step_26 + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end LittlerootTown_BrendansHouse_2F_Movement_1F85CF: @ 81F85CF - step_14 - step_26 - step_14 - step_14 - step_14 - step_14 - step_27 + delay_16 + walk_in_place_fastest_up + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_2F_Movement_1F85D7: @ 81F85D7 - step_left - step_left - step_left + walk_left + walk_left + walk_left step_end LittlerootTown_BrendansHouse_2F_Movement_1F85DB: @ 81F85DB - step_up - step_left - step_left - step_left - step_left - step_26 + walk_up + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end LittlerootTown_BrendansHouse_2F_Movement_1F85E2: @ 81F85E2 - step_14 - step_26 - step_14 - step_14 - step_27 + delay_16 + walk_in_place_fastest_up + delay_16 + delay_16 + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_2F_Movement_1F85E8: @ 81F85E8 - step_left - step_left - step_down - step_27 + walk_left + walk_left + walk_down + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_2F_Movement_1F85ED: @ 81F85ED - step_up - step_up - step_left - step_left - step_left - step_left - step_left - step_26 + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end LittlerootTown_BrendansHouse_2F_Movement_1F85F6: @ 81F85F6 - step_13 - step_14 - step_26 - step_14 - step_14 - step_27 + delay_8 + delay_16 + walk_in_place_fastest_up + delay_16 + delay_16 + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_2F_Movement_1F85FD: @ 81F85FD - step_left - step_left - step_left - step_left - step_left - step_25 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_down step_end LittlerootTown_BrendansHouse_2F_Movement_1F8604: @ 81F8604 - step_up - step_left - step_left - step_26 + walk_up + walk_left + walk_left + walk_in_place_fastest_up step_end LittlerootTown_BrendansHouse_2F_Movement_1F8609: @ 81F8609 - step_14 - step_14 - step_27 + delay_16 + delay_16 + walk_in_place_fastest_left step_end gUnknown_081F860D:: @ 81F860D diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index e0229b9eaa..9fc2fe53e5 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -71,7 +71,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8964:: @ 81F8964 end LittlerootTown_MaysHouse_1F_Movement_1F898A: @ 81F898A - step_up + walk_up step_end LittlerootTown_MaysHouse_1F_EventScript_1F898C:: @ 81F898C @@ -106,12 +106,12 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE end LittlerootTown_MaysHouse_1F_Movement_1F89EC: @ 81F89EC - step_down - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left step_end LittlerootTown_BrendansHouse_1F_EventScript_1F89F3:: @ 81F89F3 @@ -241,29 +241,29 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8B4B:: @ 81F8B4B return LittlerootTown_MaysHouse_1F_Movement_1F8B56: @ 81F8B56 - step_27 - step_left - step_26 - step_up - step_up - step_up - step_up + walk_in_place_fastest_left + walk_left + walk_in_place_fastest_up + walk_up + walk_up + walk_up + walk_up step_end LittlerootTown_MaysHouse_1F_Movement_1F8B5E: @ 81F8B5E - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end LittlerootTown_MaysHouse_1F_Movement_1F8B62: @ 81F8B62 - step_28 - step_right - step_26 - step_up - step_up - step_up - step_up + walk_in_place_fastest_right + walk_right + walk_in_place_fastest_up + walk_up + walk_up + walk_up + walk_up step_end LittlerootTown_MaysHouse_1F_EventScript_1F8B6A:: @ 81F8B6A @@ -285,52 +285,52 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8B8E:: @ 81F8B8E return LittlerootTown_MaysHouse_1F_Movement_1F8BA0: @ 81F8BA0 - step_14 - step_13 - step_28 + delay_16 + delay_8 + walk_in_place_fastest_right step_end LittlerootTown_MaysHouse_1F_Movement_1F8BA4: @ 81F8BA4 - step_14 - step_13 - step_28 - step_14 - step_14 - step_26 + delay_16 + delay_8 + walk_in_place_fastest_right + delay_16 + delay_16 + walk_in_place_fastest_up step_end LittlerootTown_MaysHouse_1F_Movement_1F8BAB: @ 81F8BAB - step_14 - step_13 - step_27 + delay_16 + delay_8 + walk_in_place_fastest_left step_end LittlerootTown_MaysHouse_1F_Movement_1F8BAF: @ 81F8BAF - step_28 - step_right - step_26 - step_up - step_up + walk_in_place_fastest_right + walk_right + walk_in_place_fastest_up + walk_up + walk_up step_end LittlerootTown_MaysHouse_1F_Movement_1F8BB5: @ 81F8BB5 - step_28 - step_right - step_26 - step_up - step_up - step_27 - step_left - step_26 - step_up + walk_in_place_fastest_right + walk_right + walk_in_place_fastest_up + walk_up + walk_up + walk_in_place_fastest_left + walk_left + walk_in_place_fastest_up + walk_up step_end LittlerootTown_MaysHouse_1F_Movement_1F8BBF: @ 81F8BBF - step_27 - step_left - step_26 - step_up - step_up + walk_in_place_fastest_left + walk_left + walk_in_place_fastest_up + walk_up + walk_up step_end LittlerootTown_BrendansHouse_1F_Text_1F8BC5: @ 81F8BC5 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index f300b58492..5501f5ad5a 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -140,111 +140,111 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9440:: @ 81F9440 return LittlerootTown_MaysHouse_2F_Movement_1F946F: @ 81F946F - step_down - step_down - step_28 + walk_down + walk_down + walk_in_place_fastest_right step_end LittlerootTown_MaysHouse_2F_Movement_1F9473: @ 81F9473 - step_right - step_right - step_down - step_down - step_right + walk_right + walk_right + walk_down + walk_down + walk_right step_end LittlerootTown_MaysHouse_2F_Movement_1F9479: @ 81F9479 - step_up - step_up - step_up - step_28 - step_right - step_right - step_right - step_right - step_26 + walk_up + walk_up + walk_up + walk_in_place_fastest_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end LittlerootTown_MaysHouse_2F_Movement_1F9483: @ 81F9483 - step_14 - step_26 - step_14 - step_14 - step_14 - step_14 - step_28 + delay_16 + walk_in_place_fastest_up + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_right step_end LittlerootTown_MaysHouse_2F_Movement_1F948B: @ 81F948B - step_right - step_right - step_right + walk_right + walk_right + walk_right step_end LittlerootTown_MaysHouse_2F_Movement_1F948F: @ 81F948F - step_up - step_28 - step_right - step_right - step_right - step_right - step_26 + walk_up + walk_in_place_fastest_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end LittlerootTown_MaysHouse_2F_Movement_1F9497: @ 81F9497 - step_14 - step_26 - step_14 - step_14 - step_28 + delay_16 + walk_in_place_fastest_up + delay_16 + delay_16 + walk_in_place_fastest_right step_end LittlerootTown_MaysHouse_2F_Movement_1F949D: @ 81F949D - step_right - step_right - step_right - step_right - step_right - step_25 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_down step_end LittlerootTown_MaysHouse_2F_Movement_1F94A4: @ 81F94A4 - step_up - step_right - step_right - step_26 + walk_up + walk_right + walk_right + walk_in_place_fastest_up step_end LittlerootTown_MaysHouse_2F_Movement_1F94A9: @ 81F94A9 - step_14 - step_14 - step_28 + delay_16 + delay_16 + walk_in_place_fastest_right step_end LittlerootTown_MaysHouse_2F_Movement_1F94AD: @ 81F94AD - step_right - step_right - step_down - step_28 + walk_right + walk_right + walk_down + walk_in_place_fastest_right step_end LittlerootTown_MaysHouse_2F_Movement_1F94B2: @ 81F94B2 - step_up - step_up - step_right - step_right - step_right - step_right - step_right - step_26 + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end LittlerootTown_MaysHouse_2F_Movement_1F94BB: @ 81F94BB - step_14 - step_26 - step_14 - step_14 - step_28 + delay_16 + walk_in_place_fastest_up + delay_16 + delay_16 + walk_in_place_fastest_right step_end LittlerootTown_BrendansHouse_2F_EventScript_1F94C1:: @ 81F94C1 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index c7d968d787..75b83b6a19 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -142,13 +142,13 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67:: @ 81F9E67 end LittlerootTown_ProfessorBirchsLab_Movement_1F9E78: @ 81F9E78 - step_up - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 @@ -211,35 +211,35 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C:: @ 81F9F3C return LittlerootTown_ProfessorBirchsLab_Movement_1F9F46: @ 81F9F46 - step_left - step_25 - step_14 - step_14 - step_right - step_25 - step_14 - step_14 - step_right - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_26 + walk_left + walk_in_place_fastest_down + delay_16 + delay_16 + walk_right + walk_in_place_fastest_down + delay_16 + delay_16 + walk_right + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end LittlerootTown_ProfessorBirchsLab_Movement_1F9F58: @ 81F9F58 - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_left - step_25 + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_in_place_fastest_down step_end LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62:: @ 81F9F62 @@ -252,13 +252,13 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62:: @ 81F9F62 end LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C: @ 81F9F7C - step_up - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84:: @ 81F9F84 @@ -591,8 +591,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7:: @ 81FA3D7 return LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0: @ 81FA3E0 - step_down - step_27 + walk_down + walk_in_place_fastest_left step_end LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3:: @ 81FA3E3 diff --git a/data/scripts/maps/MagmaHideout_4F.inc b/data/scripts/maps/MagmaHideout_4F.inc index cb05805800..0cc0fea56f 100644 --- a/data/scripts/maps/MagmaHideout_4F.inc +++ b/data/scripts/maps/MagmaHideout_4F.inc @@ -77,35 +77,35 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 end MagmaHideout_4F_Movement_23A672: @ 823A672 - step_14 - step_14 - slow_step_down - step_14 - step_14 - step_14 - slow_step_down - step_14 - step_14 - step_14 + delay_16 + delay_16 + walk_slow_down + delay_16 + delay_16 + delay_16 + walk_slow_down + delay_16 + delay_16 + delay_16 step_end MagmaHideout_4F_Movement_23A67D: @ 823A67D - step_32 - step_32 + slide_up + slide_up step_end MagmaHideout_4F_Movement_23A680: @ 823A680 - step_02 - step_14 - step_03 - step_14 - step_02 - step_14 - step_03 - step_14 - step_01 - step_14 - step_14 + face_left + delay_16 + face_right + delay_16 + face_left + delay_16 + face_right + delay_16 + face_up + delay_16 + delay_16 step_end MagmaHideout_4F_EventScript_23A68C:: @ 823A68C diff --git a/data/scripts/maps/MarineCave_End.inc b/data/scripts/maps/MarineCave_End.inc index c8e7c6fad9..9c821e14fb 100644 --- a/data/scripts/maps/MarineCave_End.inc +++ b/data/scripts/maps/MarineCave_End.inc @@ -66,13 +66,13 @@ MarineCave_End_EventScript_23B092:: @ 823B092 end MarineCave_End_Movement_23B09D: @ 823B09D - step_5e - step_62 - step_14 - step_14 - step_63 - step_14 - step_14 - step_63 + init_affine_anim + walk_down_start_affine + delay_16 + delay_16 + walk_down_affine + delay_16 + delay_16 + walk_down_affine step_end diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 40578a9073..abb527d7f6 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -234,191 +234,191 @@ MauvilleCity_EventScript_1DF690:: @ 81DF690 end MauvilleCity_Movement_1DF6A8: @ 81DF6A8 - step_left - step_left - step_down - step_down - step_left + walk_left + walk_left + walk_down + walk_down + walk_left step_end MauvilleCity_Movement_1DF6AE: @ 81DF6AE - step_down - step_down - step_left - step_left - step_left + walk_down + walk_down + walk_left + walk_left + walk_left step_end MauvilleCity_Movement_1DF6B4: @ 81DF6B4 - step_14 - step_14 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_13 + delay_16 + delay_16 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + delay_8 step_end MauvilleCity_Movement_1DF6C0: @ 81DF6C0 - step_14 - step_14 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_13 + delay_16 + delay_16 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + delay_8 step_end MauvilleCity_Movement_1DF6CC: @ 81DF6CC - step_14 - step_13 - step_27 + delay_16 + delay_8 + walk_in_place_fastest_left step_end MauvilleCity_Movement_1DF6D0: @ 81DF6D0 - step_14 - step_14 - step_14 - step_27 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_left step_end MauvilleCity_Movement_1DF6D5: @ 81DF6D5 - step_14 - step_27 + delay_16 + walk_in_place_fastest_left step_end MauvilleCity_Movement_1DF6D8: @ 81DF6D8 - step_14 - step_14 - step_27 + delay_16 + delay_16 + walk_in_place_fastest_left step_end MauvilleCity_Movement_1DF6DC: @ 81DF6DC - step_14 - step_25 + delay_16 + walk_in_place_fastest_down step_end MauvilleCity_Movement_1DF6DF: @ 81DF6DF - step_14 - step_27 + delay_16 + walk_in_place_fastest_left step_end MauvilleCity_Movement_1DF6E2: @ 81DF6E2 - step_left - step_left - step_left - step_down - step_down + walk_left + walk_left + walk_left + walk_down + walk_down step_end MauvilleCity_Movement_1DF6E8: @ 81DF6E8 - step_left - step_down - step_down - step_left - step_left + walk_left + walk_down + walk_down + walk_left + walk_left step_end MauvilleCity_Movement_1DF6EE: @ 81DF6EE - step_14 - step_13 - step_12 - step_25 + delay_16 + delay_8 + delay_4 + walk_in_place_fastest_down step_end MauvilleCity_Movement_1DF6F3: @ 81DF6F3 - step_right - step_right - step_26 + walk_right + walk_right + walk_in_place_fastest_up step_end MauvilleCity_Movement_1DF6F7: @ 81DF6F7 - step_right - step_up + walk_right + walk_up step_end MauvilleCity_Movement_1DF6FA: @ 81DF6FA - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end MauvilleCity_Movement_1DF703: @ 81DF703 - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end MauvilleCity_Movement_1DF70D: @ 81DF70D - step_up - step_up - step_up - step_up - step_up - step_up - step_left - step_left - step_left - step_left - step_26 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end MauvilleCity_Movement_1DF719: @ 81DF719 - step_up - step_up - step_up - step_up - step_up - step_left - step_left - step_left - step_left - step_left - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up step_end MauvilleCity_Movement_1DF725: @ 81DF725 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end MauvilleCity_Movement_1DF72F: @ 81DF72F - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end MauvilleCity_EventScript_1DF73A:: @ 81DF73A diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index 50b218f041..b786dc9610 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -92,130 +92,130 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F end MeteorFalls_1F_1R_Movement_22BEC0: @ 822BEC0 - step_right - step_right - step_26 + walk_right + walk_right + walk_in_place_fastest_up step_end MeteorFalls_1F_1R_Movement_22BEC4: @ 822BEC4 - step_16 - step_16 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right step_end MeteorFalls_1F_1R_Movement_22BECE: @ 822BECE - step_16 - step_16 - step_16 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right step_end MeteorFalls_1F_1R_Movement_22BED9: @ 822BED9 - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end MeteorFalls_1F_1R_Movement_22BEE0: @ 822BEE0 - step_14 - step_14 - step_right - step_right - step_right - step_right - step_right + delay_16 + delay_16 + walk_right + walk_right + walk_right + walk_right + walk_right step_end MeteorFalls_1F_1R_Movement_22BEE8: @ 822BEE8 - step_14 - step_14 - step_right - step_right - step_right - step_right - step_right + delay_16 + delay_16 + walk_right + walk_right + walk_right + walk_right + walk_right step_end MeteorFalls_1F_1R_Movement_22BEF0: @ 822BEF0 - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end MeteorFalls_1F_1R_Movement_22BEF8: @ 822BEF8 - step_right - step_right - step_up - step_up - step_27 + walk_right + walk_right + walk_up + walk_up + walk_in_place_fastest_left step_end MeteorFalls_1F_1R_Movement_22BEFE: @ 822BEFE - step_up - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end MeteorFalls_1F_1R_Movement_22BF08: @ 822BF08 - step_right - step_right - step_right - step_26 + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end MeteorFalls_1F_1R_Movement_22BF0D: @ 822BF0D - step_up - step_up - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_up + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end MeteorFalls_1F_1R_Movement_22BF18: @ 822BF18 - step_right - step_right - step_right - step_26 + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end MeteorFalls_1F_1R_Movement_22BF1D: @ 822BF1D - step_25 - step_12 - step_28 - step_40 - step_left - step_41 - step_03 + walk_in_place_fastest_down + delay_4 + walk_in_place_fastest_right + lock_facing_direction + walk_left + unlock_facing_direction + face_right step_end MeteorFalls_1F_1R_EventScript_22BF25:: @ 822BF25 diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index 4e8531a4e5..8cce8efeb4 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -103,116 +103,116 @@ MossdeepCity_EventScript_1E4B41:: @ 81E4B41 end MossdeepCity_Movement_1E4BAD: @ 81E4BAD - step_14 - step_03 - step_14 - step_14 - step_14 - step_14 - step_02 - step_14 - step_14 + delay_16 + face_right + delay_16 + delay_16 + delay_16 + delay_16 + face_left + delay_16 + delay_16 step_end MossdeepCity_Movement_1E4BB7: @ 81E4BB7 - step_03 - step_14 - step_14 - step_14 + face_right + delay_16 + delay_16 + delay_16 step_end MossdeepCity_Movement_1E4BBC: @ 81E4BBC - step_down - step_right - step_right - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_down + walk_right + walk_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end MossdeepCity_Movement_1E4BCA: @ 81E4BCA - step_14 - step_13 - step_down - step_down - step_down - step_right - step_right - step_right - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right + delay_16 + delay_8 + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end MossdeepCity_Movement_1E4BDD: @ 81E4BDD - step_14 - step_13 - step_down - step_down - step_right - step_right - step_right - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right + delay_16 + delay_8 + walk_down + walk_down + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end MossdeepCity_Movement_1E4BEF: @ 81E4BEF - step_14 - step_13 - step_down - step_right - step_right - step_right - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right + delay_16 + delay_8 + walk_down + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end MossdeepCity_Movement_1E4C00: @ 81E4C00 - step_14 - step_13 - step_right - step_right - step_right - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right + delay_16 + delay_8 + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end MossdeepCity_EventScript_1E4C10:: @ 81E4C10 @@ -281,34 +281,34 @@ MossdeepCity_EventScript_1E4CC2:: @ 81E4CC2 return MossdeepCity_Movement_1E4CD4: @ 81E4CD4 - step_14 - step_14 - step_27 + delay_16 + delay_16 + walk_in_place_fastest_left step_end MossdeepCity_Movement_1E4CD8: @ 81E4CD8 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end MossdeepCity_Movement_1E4CE2: @ 81E4CE2 - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end MossdeepCity_Text_1E4CED: @ 81E4CED diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 972d5f4e8d..bb6bfd9dee 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -285,8 +285,8 @@ MossdeepCity_Gym_EventScript_220C26:: @ 8220C26 end MossdeepCity_Gym_Movement_220C30: @ 8220C30 - step_14 - step_14 + delay_16 + delay_16 step_end MossdeepCity_Gym_EventScript_220C33:: @ 8220C33 diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index 7707690fb1..c61f74d99b 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -38,19 +38,19 @@ MossdeepCity_House2_EventScript_22212F:: @ 822212F return MossdeepCity_House2_Movement_22213A: @ 822213A - step_18 - step_15 - step_15 - step_17 - step_15 - step_13 + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_down + delay_8 step_end MossdeepCity_House2_Movement_222141: @ 8222141 - step_15 - step_15 - step_15 - step_13 + walk_fast_down + walk_fast_down + walk_fast_down + delay_8 step_end MossdeepCity_House2_Text_222146: @ 8222146 diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index 8fc55295f8..2edf6d2515 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -271,22 +271,22 @@ MossdeepCity_SpaceCenter_1F_EventScript_223289:: @ 8223289 end MossdeepCity_SpaceCenter_1F_Movement_22329A: @ 822329A - step_40 - step_left - step_41 + lock_facing_direction + walk_left + unlock_facing_direction step_end MossdeepCity_SpaceCenter_1F_Movement_22329E: @ 822329E - step_40 - step_right - step_41 + lock_facing_direction + walk_right + unlock_facing_direction step_end MossdeepCity_SpaceCenter_1F_Movement_2232A2: @ 82232A2 - step_02 - step_40 - step_right - step_41 + face_left + lock_facing_direction + walk_right + unlock_facing_direction step_end MossdeepCity_SpaceCenter_1F_Text_2232A7: @ 82232A7 diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc index cee99c4d5d..52d01db6c8 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc @@ -49,7 +49,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF end MossdeepCity_SpaceCenter_2F_Movement_223E07: @ 8223E07 - step_up + walk_up step_end MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09 @@ -77,21 +77,21 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09 end MossdeepCity_SpaceCenter_2F_Movement_223E81: @ 8223E81 - step_40 - step_left - step_41 + lock_facing_direction + walk_left + unlock_facing_direction step_end MossdeepCity_SpaceCenter_2F_Movement_223E85: @ 8223E85 - step_40 - step_down - step_41 + lock_facing_direction + walk_down + unlock_facing_direction step_end MossdeepCity_SpaceCenter_2F_Movement_223E89: @ 8223E89 - step_40 - step_right - step_41 + lock_facing_direction + walk_right + unlock_facing_direction step_end MossdeepCity_SpaceCenter_2F_EventScript_223E8D:: @ 8223E8D @@ -211,27 +211,27 @@ MossdeepCity_SpaceCenter_2F_EventScript_223FBA:: @ 8223FBA end MossdeepCity_SpaceCenter_2F_Movement_223FC6: @ 8223FC6 - step_40 - step_16 - step_16 - step_41 - step_14 - step_14 - slow_step_down - slow_step_down + lock_facing_direction + walk_fast_up + walk_fast_up + unlock_facing_direction + delay_16 + delay_16 + walk_slow_down + walk_slow_down step_end MossdeepCity_SpaceCenter_2F_Movement_223FCF: @ 8223FCF - step_02 - step_40 - step_18 - step_18 - step_41 - step_14 - step_14 - slow_step_left - slow_step_left - step_00 + face_left + lock_facing_direction + walk_fast_right + walk_fast_right + unlock_facing_direction + delay_16 + delay_16 + walk_slow_left + walk_slow_left + face_down step_end MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index fb2665e8b1..14d0cd5c77 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -54,21 +54,21 @@ MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA end MossdeepCity_StevensHouse_Movement_222833: @ 8222833 - step_left - step_left - step_left - step_left - step_left - step_left - step_25 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_down step_end MossdeepCity_StevensHouse_Movement_22283B: @ 822283B - step_up - step_right - step_right - step_right - step_26 + walk_up + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end MossdeepCity_StevensHouse_EventScript_222841:: @ 8222841 diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index b4825579cf..28135bb1e8 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -153,249 +153,249 @@ MtChimney_EventScript_22EF76:: @ 822EF76 end MtChimney_Movement_22EF83: @ 822EF83 - step_up - step_up - step_up - step_up - step_up - step_up - step_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right step_end MtChimney_Movement_22EF8B: @ 822EF8B - step_left - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end MtChimney_Movement_22EF94: @ 822EF94 - step_up - step_up - step_up - step_up - step_up - step_right - step_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right step_end MtChimney_Movement_22EF9C: @ 822EF9C - step_left - step_left - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end MtChimney_Movement_22EFA6: @ 822EFA6 - step_down - step_down - step_down - step_down - step_down - step_left - step_left - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down step_end MtChimney_Movement_22EFB8: @ 822EFB8 - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_down + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_down step_end MtChimney_Movement_22EFC1: @ 822EFC1 - step_right - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_down - step_down - step_down - step_down + walk_right + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down step_end MtChimney_Movement_22EFD0: @ 822EFD0 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_left - step_left - step_down - step_down - step_down - step_left - step_left - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_left + walk_left + walk_down + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down step_end MtChimney_Movement_22EFE9: @ 822EFE9 - step_14 - step_14 - step_14 - step_down - step_down - step_down - step_left - step_left - step_left - step_down + delay_16 + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_down step_end MtChimney_Movement_22EFF4: @ 822EFF4 - step_14 - step_left - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_down - step_down - step_down - step_down + delay_16 + walk_left + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down step_end MtChimney_Movement_22F004: @ 822F004 - step_14 - step_left - step_left - step_down - step_down - step_down - step_left - step_left - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_down + delay_16 + walk_left + walk_left + walk_down + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down step_end MtChimney_Movement_22F015: @ 822F015 - step_14 - step_down - step_left - step_left - step_left - step_left - step_25 + delay_16 + walk_down + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_down step_end MtChimney_Movement_22F01D: @ 822F01D - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down step_end MtChimney_Movement_22F02B: @ 822F02B - step_down + walk_down step_end MtChimney_Movement_22F02D: @ 822F02D - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end MtChimney_Movement_22F035: @ 822F035 - step_14 - step_14 - step_27 - step_14 - step_down - step_down - step_down - step_down - step_down + delay_16 + delay_16 + walk_in_place_fastest_left + delay_16 + walk_down + walk_down + walk_down + walk_down + walk_down step_end MtChimney_Movement_22F03F: @ 822F03F - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_27 - step_14 - step_down - step_down + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_left + delay_16 + walk_down + walk_down step_end MtChimney_Movement_22F04A: @ 822F04A - step_40 - step_17 - step_41 - step_03 + lock_facing_direction + walk_fast_left + unlock_facing_direction + face_right step_end MtChimney_Movement_22F04F: @ 822F04F - step_left - step_28 - step_14 + walk_left + walk_in_place_fastest_right + delay_16 step_end MtChimney_EventScript_22F053:: @ 822F053 diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 1dd9c27255..b6c2118db5 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -59,31 +59,31 @@ MtChimney_CableCarStation_EventScript_22AC9B:: @ 822AC9B end MtChimney_CableCarStation_Movement_22ACA5: @ 822ACA5 - step_up - step_up - step_left - step_28 + walk_up + walk_up + walk_left + walk_in_place_fastest_right step_end MtChimney_CableCarStation_Movement_22ACAA: @ 822ACAA - step_14 - step_right - step_down - step_down + delay_16 + walk_right + walk_down + walk_down step_end MtChimney_CableCarStation_Movement_22ACAF: @ 822ACAF - step_up - step_up - step_up - step_14 + walk_up + walk_up + walk_up + delay_16 step_end MtChimney_CableCarStation_Movement_22ACB4: @ 822ACB4 - step_down - step_down - step_down - step_14 + walk_down + walk_down + walk_down + delay_16 step_end MtChimney_CableCarStation_Text_22ACB9: @ 822ACB9 diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index fed63f0e05..fe39e9d48d 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -103,29 +103,29 @@ MtPyre_Summit_EventScript_232117:: @ 8232117 return MtPyre_Summit_Movement_23212C: @ 823212C - step_down - step_down - step_27 + walk_down + walk_down + walk_in_place_fastest_left step_end MtPyre_Summit_Movement_232130: @ 8232130 - step_down + walk_down step_end MtPyre_Summit_Movement_232132: @ 8232132 - step_down - step_down - step_28 + walk_down + walk_down + walk_in_place_fastest_right step_end MtPyre_Summit_Movement_232136: @ 8232136 - step_left - step_25 + walk_left + walk_in_place_fastest_down step_end MtPyre_Summit_Movement_232139: @ 8232139 - step_right - step_25 + walk_right + walk_in_place_fastest_down step_end MtPyre_Summit_EventScript_23213C:: @ 823213C @@ -316,112 +316,112 @@ MtPyre_Summit_EventScript_232392:: @ 8232392 return MtPyre_Summit_Movement_2323AE: @ 82323AE - step_14 - step_14 - step_28 + delay_16 + delay_16 + walk_in_place_fastest_right step_end MtPyre_Summit_Movement_2323B2: @ 82323B2 - step_14 - step_14 - step_27 + delay_16 + delay_16 + walk_in_place_fastest_left step_end MtPyre_Summit_Movement_2323B6: @ 82323B6 - step_down - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end MtPyre_Summit_Movement_2323BD: @ 82323BD - step_down - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end MtPyre_Summit_Movement_2323C4: @ 82323C4 - step_14 - step_13 - step_left - step_28 - step_14 - step_25 + delay_16 + delay_8 + walk_left + walk_in_place_fastest_right + delay_16 + walk_in_place_fastest_down step_end MtPyre_Summit_Movement_2323CB: @ 82323CB - step_14 - step_13 - step_right - step_27 - step_14 - step_25 + delay_16 + delay_8 + walk_right + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_down step_end MtPyre_Summit_Movement_2323D2: @ 82323D2 - step_14 - step_13 - step_27 - step_14 - step_25 + delay_16 + delay_8 + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_down step_end MtPyre_Summit_Movement_2323D8: @ 82323D8 - step_up - step_up - step_up - step_left + walk_up + walk_up + walk_up + walk_left step_end MtPyre_Summit_Movement_2323DD: @ 82323DD - step_up - step_up - step_up - step_28 + walk_up + walk_up + walk_up + walk_in_place_fastest_right step_end MtPyre_Summit_Movement_2323E2: @ 82323E2 - step_up - step_up - step_up - step_28 + walk_up + walk_up + walk_up + walk_in_place_fastest_right step_end MtPyre_Summit_Movement_2323E7: @ 82323E7 - step_14 - step_26 + delay_16 + walk_in_place_fastest_up step_end MtPyre_Summit_Movement_2323EA: @ 82323EA - step_14 - step_25 + delay_16 + walk_in_place_fastest_down step_end MtPyre_Summit_Movement_2323ED: @ 82323ED - step_down - step_right - step_down - step_down - step_27 + walk_down + walk_right + walk_down + walk_down + walk_in_place_fastest_left step_end MtPyre_Summit_Movement_2323F3: @ 82323F3 - step_down - step_down - step_down - step_27 + walk_down + walk_down + walk_down + walk_in_place_fastest_left step_end MtPyre_Summit_Movement_2323F8: @ 82323F8 - step_down - step_down - step_down - step_27 + walk_down + walk_down + walk_down + walk_in_place_fastest_left step_end MtPyre_Summit_EventScript_2323FD:: @ 82323FD diff --git a/data/scripts/maps/NavelRock_Top.inc b/data/scripts/maps/NavelRock_Top.inc index c05d32088f..67ddbc373e 100644 --- a/data/scripts/maps/NavelRock_Top.inc +++ b/data/scripts/maps/NavelRock_Top.inc @@ -92,36 +92,36 @@ NavelRock_Top_EventScript_269225:: @ 8269225 end NavelRock_Top_Movement_269230: @ 8269230 - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end NavelRock_Top_Movement_269234: @ 8269234 - step_14 - step_14 - step_down - step_down - step_down + delay_16 + delay_16 + walk_down + walk_down + walk_down step_end NavelRock_Top_Movement_26923A: @ 826923A - step_down - step_down - step_down - step_down - step_down - step_1d - step_14 - step_14 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_in_place_down + delay_16 + delay_16 step_end NavelRock_Top_Movement_269243: @ 8269243 - step_14 - step_14 - step_1d - step_1d - step_1d - step_1d + delay_16 + delay_16 + walk_in_place_down + walk_in_place_down + walk_in_place_down + walk_in_place_down step_end diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 3c075cad0c..32bca3703e 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -96,100 +96,100 @@ OldaleTown_EventScript_1E8FC3:: @ 81E8FC3 end OldaleTown_Movement_1E8FCE: @ 81E8FCE - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_25 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down step_end OldaleTown_Movement_1E8FD7: @ 81E8FD7 - step_left - step_up - step_up - step_right - step_up - step_up - step_up - step_up - step_up - step_25 + walk_left + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down step_end OldaleTown_Movement_1E8FE2: @ 81E8FE2 - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_25 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down step_end OldaleTown_Movement_1E8FEB: @ 81E8FEB - step_up - step_up - step_right - step_right - step_right - step_right - step_up - step_up - step_up - step_up - step_up - step_13 - step_25 + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + delay_8 + walk_in_place_fastest_down step_end OldaleTown_Movement_1E8FF9: @ 81E8FF9 - step_right - step_up - step_up - step_up - step_up - step_up - step_up + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end OldaleTown_Movement_1E9001: @ 81E9001 - step_14 - step_14 - step_14 - step_14 - step_up - step_up - step_up - step_up - step_up + delay_16 + delay_16 + delay_16 + delay_16 + walk_up + walk_up + walk_up + walk_up + walk_up step_end OldaleTown_Movement_1E900B: @ 81E900B - step_up - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end OldaleTown_Movement_1E9013: @ 81E9013 - step_left - step_up - step_up - step_right - step_right - step_right - step_right - step_up - step_up - step_up - step_up + walk_left + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_up + walk_up step_end OldaleTown_EventScript_1E901F:: @ 81E901F @@ -305,49 +305,49 @@ OldaleTown_EventScript_1E915E:: @ 81E915E return OldaleTown_Movement_1E9170: @ 81E9170 - step_left - step_left + walk_left + walk_left step_end OldaleTown_Movement_1E9173: @ 81E9173 - step_left + walk_left step_end OldaleTown_Movement_1E9175: @ 81E9175 - step_02 + face_left step_end OldaleTown_Movement_1E9177: @ 81E9177 - step_down - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end OldaleTown_Movement_1E917E: @ 81E917E - step_13 - step_12 - step_25 + delay_8 + delay_4 + walk_in_place_fastest_down step_end OldaleTown_Movement_1E9182: @ 81E9182 - step_13 - step_right + delay_8 + walk_right step_end OldaleTown_Movement_1E9185: @ 81E9185 - step_16 - step_27 - step_40 - step_right - step_41 + walk_fast_up + walk_in_place_fastest_left + lock_facing_direction + walk_right + unlock_facing_direction step_end OldaleTown_Movement_1E918B: @ 81E918B - step_down - step_left + walk_down + walk_left step_end OldaleTown_Text_1E918E: @ 81E918E diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index c297d61a76..891b5a25ae 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -94,127 +94,127 @@ PetalburgCity_EventScript_1DC3FD:: @ 81DC3FD end PetalburgCity_Movement_1DC406: @ 81DC406 - step_13 - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_up + delay_8 + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up step_end PetalburgCity_Movement_1DC418: @ 81DC418 - step_up - step_up + walk_up + walk_up step_end PetalburgCity_Movement_1DC41B: @ 81DC41B - step_13 - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_up - step_up + delay_8 + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end PetalburgCity_Movement_1DC42D: @ 81DC42D - step_up - step_54 + walk_up + set_invisible step_end PetalburgCity_Movement_1DC430: @ 81DC430 - step_13 - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_28 + delay_8 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_in_place_fastest_right step_end PetalburgCity_Movement_1DC451: @ 81DC451 - step_13 - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_right - step_14 - step_26 - step_14 - step_14 - step_28 + delay_8 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_right + delay_16 + walk_in_place_fastest_up + delay_16 + delay_16 + walk_in_place_fastest_right step_end PetalburgCity_EventScript_1DC476:: @ 81DC476 @@ -347,159 +347,159 @@ PetalburgCity_EventScript_1DC5FF:: @ 81DC5FF return PetalburgCity_Movement_1DC611:: @ 81DC611 - step_14 - step_14 - step_14 + delay_16 + delay_16 + delay_16 step_end PetalburgCity_Movement_1DC615: @ 81DC615 - step_right - step_right - step_right - step_26 + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end PetalburgCity_Movement_1DC61A: @ 81DC61A - step_right - step_right + walk_right + walk_right step_end PetalburgCity_Movement_1DC61D: @ 81DC61D - step_right - step_right - step_right - step_25 + walk_right + walk_right + walk_right + walk_in_place_fastest_down step_end PetalburgCity_Movement_1DC622: @ 81DC622 - step_down - step_right - step_right - step_right - step_25 + walk_down + walk_right + walk_right + walk_right + walk_in_place_fastest_down step_end PetalburgCity_Movement_1DC628: @ 81DC628 - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_right - step_26 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_right + walk_in_place_fastest_up step_end PetalburgCity_Movement_1DC633: @ 81DC633 - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_right - step_26 + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_right + walk_in_place_fastest_up step_end PetalburgCity_Movement_1DC641: @ 81DC641 - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_right - step_26 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_right + walk_in_place_fastest_up step_end PetalburgCity_Movement_1DC64C: @ 81DC64C - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_right - step_26 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_right + walk_in_place_fastest_up step_end PetalburgCity_Movement_1DC658: @ 81DC658 - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end PetalburgCity_Movement_1DC665: @ 81DC665 - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up step_end PetalburgCity_Movement_1DC66F: @ 81DC66F - step_14 - step_14 - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up + delay_16 + delay_16 + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up step_end PetalburgCity_Movement_1DC67C: @ 81DC67C - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up step_end PetalburgCity_Movement_1DC686: @ 81DC686 - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up step_end PetalburgCity_EventScript_1DC691:: @ 81DC691 @@ -597,111 +597,111 @@ PetalburgCity_EventScript_1DC7C4:: @ 81DC7C4 return PetalburgCity_Movement_1DC7D6: @ 81DC7D6 - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left step_end PetalburgCity_Movement_1DC7DB: @ 81DC7DB - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left step_end PetalburgCity_Movement_1DC7E0: @ 81DC7E0 - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end PetalburgCity_Movement_1DC7EE: @ 81DC7EE - step_14 - step_25 - step_14 - step_14 - step_13 - step_27 + delay_16 + walk_in_place_fastest_down + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_left step_end PetalburgCity_Movement_1DC7F5: @ 81DC7F5 - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end PetalburgCity_Movement_1DC802: @ 81DC802 - step_14 - step_25 - step_14 - step_13 - step_27 + delay_16 + walk_in_place_fastest_down + delay_16 + delay_8 + walk_in_place_fastest_left step_end PetalburgCity_Movement_1DC808: @ 81DC808 - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end PetalburgCity_Movement_1DC815: @ 81DC815 - step_14 - step_25 - step_14 - step_13 - step_27 + delay_16 + walk_in_place_fastest_down + delay_16 + delay_8 + walk_in_place_fastest_left step_end PetalburgCity_Movement_1DC81B: @ 81DC81B - step_up - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end PetalburgCity_Movement_1DC828: @ 81DC828 - step_14 - step_26 - step_14 - step_13 - step_27 + delay_16 + walk_in_place_fastest_up + delay_16 + delay_8 + walk_in_place_fastest_left step_end PetalburgCity_EventScript_1DC82E:: @ 81DC82E diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 2751e345e8..6631656112 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -106,10 +106,10 @@ PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4 end PetalburgCity_Gym_Movement_2049EC: @ 82049EC - step_down - step_down - step_down - step_14 + walk_down + walk_down + walk_down + delay_16 step_end PetalburgCity_Gym_EventScript_2049F1:: @ 82049F1 @@ -565,218 +565,218 @@ PetalburgCity_Gym_EventScript_20506C:: @ 820506C return PetalburgCity_Gym_Movement_20507E: @ 820507E - step_down - step_down - step_left - step_left - step_down - step_down - step_26 - step_13 - step_1d - step_54 + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down + walk_in_place_fastest_up + delay_8 + walk_in_place_down + set_invisible step_end PetalburgCity_Gym_Movement_205089: @ 8205089 - step_down - step_down - step_left - step_left - step_down - step_down - step_26 - step_13 - step_1d - step_54 + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down + walk_in_place_fastest_up + delay_8 + walk_in_place_down + set_invisible step_end PetalburgCity_Gym_Movement_205094: @ 8205094 - step_down - step_down - step_left - step_left - step_left - step_left - step_down - step_down - step_26 - step_13 - step_1d - step_54 + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_in_place_fastest_up + delay_8 + walk_in_place_down + set_invisible step_end PetalburgCity_Gym_Movement_2050A1: @ 82050A1 - step_14 - step_down - step_down - step_left - step_left - step_down - step_down + delay_16 + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down step_end PetalburgCity_Gym_Movement_2050A9: @ 82050A9 - step_14 - step_down - step_down - step_left - step_down - step_down - step_down + delay_16 + walk_down + walk_down + walk_left + walk_down + walk_down + walk_down step_end PetalburgCity_Gym_Movement_2050B1: @ 82050B1 - step_14 - step_down - step_down - step_down - step_left - step_left - step_left - step_down - step_down + delay_16 + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_down + walk_down step_end PetalburgCity_Gym_Movement_2050BB: @ 82050BB - step_up - step_13 - step_28 - step_13 - step_27 - step_14 - step_26 + walk_up + delay_8 + walk_in_place_fastest_right + delay_8 + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_up step_end PetalburgCity_Gym_Movement_2050C3: @ 82050C3 - step_right - step_right - step_up - step_up - step_up - step_28 + walk_right + walk_right + walk_up + walk_up + walk_up + walk_in_place_fastest_right step_end PetalburgCity_Gym_Movement_2050CA: @ 82050CA - step_right - step_right - step_up - step_up - step_up + walk_right + walk_right + walk_up + walk_up + walk_up step_end PetalburgCity_Gym_Movement_2050D0: @ 82050D0 - step_right - step_right - step_up - step_up - step_right - step_right - step_up + walk_right + walk_right + walk_up + walk_up + walk_right + walk_right + walk_up step_end PetalburgCity_Gym_Movement_2050D8: @ 82050D8 - step_26 - step_14 - step_14 - step_14 - step_14 - step_14 - step_13 - step_25 + walk_in_place_fastest_up + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_down step_end PetalburgCity_Gym_Movement_2050E1: @ 82050E1 - step_14 - step_up - step_14 - step_13 - step_up - step_right - step_up - step_up - step_27 + delay_16 + walk_up + delay_16 + delay_8 + walk_up + walk_right + walk_up + walk_up + walk_in_place_fastest_left step_end PetalburgCity_Gym_Movement_2050EB: @ 82050EB - step_14 - step_up - step_14 - step_13 - step_up - step_up + delay_16 + walk_up + delay_16 + delay_8 + walk_up + walk_up step_end PetalburgCity_Gym_Movement_2050F2: @ 82050F2 - step_down - step_down - step_down - step_down - step_26 - step_14 - step_1d + walk_down + walk_down + walk_down + walk_down + walk_in_place_fastest_up + delay_16 + walk_in_place_down step_end PetalburgCity_Gym_Movement_2050FA: @ 82050FA - step_down - step_down - step_right - step_down - step_26 - step_14 - step_1d + walk_down + walk_down + walk_right + walk_down + walk_in_place_fastest_up + delay_16 + walk_in_place_down step_end PetalburgCity_Gym_Movement_205102: @ 8205102 - step_down - step_down - step_down - step_26 - step_14 - step_1d + walk_down + walk_down + walk_down + walk_in_place_fastest_up + delay_16 + walk_in_place_down step_end PetalburgCity_Gym_Movement_205109: @ 8205109 - step_14 - step_14 - step_14 - step_down - step_down - step_down - step_13 + delay_16 + delay_16 + delay_16 + walk_down + walk_down + walk_down + delay_8 step_end PetalburgCity_Gym_Movement_205111: @ 8205111 - step_14 - step_14 - step_right - step_down - step_down - step_down - step_down - step_down - step_13 + delay_16 + delay_16 + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + delay_8 step_end PetalburgCity_Gym_Movement_20511B: @ 820511B - step_14 - step_14 - step_down - step_down - step_down - step_down - step_13 + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_down + delay_8 step_end PetalburgCity_Gym_Movement_205123: @ 8205123 - step_25 - step_14 - step_14 - step_down - step_down - step_down - step_right - step_down - step_13 + walk_in_place_fastest_down + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_right + walk_down + delay_8 step_end PetalburgCity_Gym_EventScript_20512D:: @ 820512D diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 907f07623b..7c9a1ae497 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -114,128 +114,128 @@ PetalburgWoods_EventScript_22E1A7:: @ 822E1A7 end PetalburgWoods_Movement_22E1B1: @ 822E1B1 - step_01 - step_14 - step_12 - step_03 - step_14 - step_13 - step_02 - step_14 - step_13 - step_00 - step_14 - step_03 - step_14 - step_13 - step_01 - step_14 + face_up + delay_16 + delay_4 + face_right + delay_16 + delay_8 + face_left + delay_16 + delay_8 + face_down + delay_16 + face_right + delay_16 + delay_8 + face_up + delay_16 step_end PetalburgWoods_Movement_22E1C2: @ 822E1C2 - step_18 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end PetalburgWoods_Movement_22E1CB: @ 822E1CB - step_14 - step_3e - step_down - step_down + delay_16 + face_player + walk_down + walk_down step_end PetalburgWoods_Movement_22E1D0: @ 822E1D0 - step_14 - step_3e - step_down - step_down - step_down - step_28 + delay_16 + face_player + walk_down + walk_down + walk_down + walk_in_place_fastest_right step_end PetalburgWoods_Movement_22E1D7: @ 822E1D7 - step_17 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end PetalburgWoods_Movement_22E1E0: @ 822E1E0 - step_14 - step_14 - step_26 + delay_16 + delay_16 + walk_in_place_fastest_up step_end PetalburgWoods_Movement_22E1E4: @ 822E1E4 - step_18 - step_15 - step_15 - step_17 - step_26 + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_in_place_fastest_up step_end PetalburgWoods_Movement_22E1EA: @ 822E1EA - step_15 - step_18 - step_26 + walk_fast_down + walk_fast_right + walk_in_place_fastest_up step_end PetalburgWoods_Movement_22E1EE: @ 822E1EE - step_25 - step_14 - step_14 - step_14 - step_14 - step_14 - step_01 + walk_in_place_fastest_down + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + face_up step_end PetalburgWoods_Movement_22E1F6: @ 822E1F6 - step_15 - step_15 + walk_fast_down + walk_fast_down step_end PetalburgWoods_Movement_22E1F9: @ 822E1F9 - step_40 - step_up - step_41 + lock_facing_direction + walk_up + unlock_facing_direction step_end PetalburgWoods_Movement_22E1FD: @ 822E1FD - step_16 - step_16 - step_16 - step_16 - step_16 - step_14 - step_14 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + delay_16 + delay_16 step_end PetalburgWoods_Movement_22E205: @ 822E205 - step_15 - step_15 - step_15 + walk_fast_down + walk_fast_down + walk_fast_down step_end PetalburgWoods_Movement_22E209: @ 822E209 - step_down - step_down - step_14 - step_14 + walk_down + walk_down + delay_16 + delay_16 step_end PetalburgWoods_Movement_22E20E: @ 822E20E - step_down + walk_down step_end PetalburgWoods_EventScript_22E210:: @ 822E210 diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 4d4334acaf..c2807d50b8 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -69,138 +69,138 @@ Route101_EventScript_1EBD7A:: @ 81EBD7A end Route101_Movement_1EBD90: @ 81EBD90 - step_up + walk_up step_end Route101_Movement_1EBD92: @ 81EBD92 - step_right + walk_right step_end Route101_Movement_1EBD94: @ 81EBD94 - step_down + walk_down step_end Route101_Movement_1EBD96: @ 81EBD96 - step_16 - step_16 - step_16 - step_18 - step_18 - step_18 - step_15 - step_15 - step_17 - step_17 - step_17 - step_16 - step_16 - step_18 - step_18 - step_18 - step_15 - step_15 - step_17 - step_17 - step_17 - step_16 - step_16 - step_18 - step_18 - step_18 - step_15 - step_15 - step_17 - step_17 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left step_end Route101_Movement_1EBDB5: @ 81EBDB5 - step_16 - step_18 - step_18 - step_18 - step_18 - step_16 + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up step_end Route101_Movement_1EBDBC: @ 81EBDBC step_end Route101_Movement_1EBDBD: @ 81EBDBD - step_23 - step_23 - step_23 - step_23 + walk_in_place_fast_left + walk_in_place_fast_left + walk_in_place_fast_left + walk_in_place_fast_left step_end Route101_Movement_1EBDC2: @ 81EBDC2 - step_16 - step_16 - step_16 - step_16 - step_27 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_in_place_fastest_left step_end Route101_Movement_1EBDC8: @ 81EBDC8 - step_16 - step_16 - step_18 - step_18 - step_18 - step_15 - step_15 - step_17 - step_17 - step_17 - step_16 - step_16 - step_18 - step_18 - step_18 - step_15 - step_15 - step_17 - step_17 - step_17 - step_16 - step_16 - step_18 - step_18 - step_18 - step_15 - step_15 - step_17 - step_17 - step_17 + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fast_left step_end Route101_Movement_1EBDE7: @ 81EBDE7 - step_18 - step_18 - step_18 - step_18 - step_16 - step_16 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up step_end Route101_Movement_1EBDEE: @ 81EBDEE step_end Route101_Movement_1EBDEF: @ 81EBDEF - step_24 - step_24 - step_24 - step_24 + walk_in_place_fast_right + walk_in_place_fast_right + walk_in_place_fast_right + walk_in_place_fast_right step_end Route101_Movement_1EBDF4: @ 81EBDF4 - step_up - step_up + walk_up + walk_up step_end Route101_Movement_1EBDF7: @ 81EBDF7 - step_up - step_left - step_up + walk_up + walk_left + walk_up step_end Route101_EventScript_1EBDFB:: @ 81EBDFB @@ -256,7 +256,7 @@ Route101_EventScript_1EBE89:: @ 81EBE89 return Route101_Movement_1EBE8D: @ 81EBE8D - step_right + walk_right step_end Route101_Text_1EBE8F: @ 81EBE8F diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index d71ec729ca..8bf5979025 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -152,42 +152,42 @@ Route103_EventScript_1EC5A2:: @ 81EC5A2 end Route103_Movement_1EC5BE: @ 81EC5BE - step_left - step_down + walk_left + walk_down step_end Route103_Movement_1EC5C1: @ 81EC5C1 - fast_step_down - step_14 - step_down - step_down - step_down - step_down + jump_2_down + delay_16 + walk_down + walk_down + walk_down + walk_down step_end Route103_Movement_1EC5C8: @ 81EC5C8 - step_14 - step_12 - step_27 - step_14 - step_25 + delay_16 + delay_4 + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_down step_end Route103_Movement_1EC5CE: @ 81EC5CE - step_down + walk_down step_end Route103_Movement_1EC5D0: @ 81EC5D0 - fast_step_down - step_14 - step_down - step_down - step_down + jump_2_down + delay_16 + walk_down + walk_down + walk_down step_end Route103_Movement_1EC5D6: @ 81EC5D6 - step_14 - step_25 + delay_16 + walk_in_place_fastest_down step_end Route103_EventScript_1EC5D9:: @ 81EC5D9 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 314b47e1de..a432f0d947 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -130,17 +130,17 @@ Route104_EventScript_1ECD4B:: @ 81ECD4B end Route104_Movement_1ECDC8: @ 81ECDC8 - slow_step_left + walk_slow_left step_end Route104_Movement_1ECDCA: @ 81ECDCA - step_down - step_03 + walk_down + face_right step_end Route104_Movement_1ECDCD: @ 81ECDCD - step_12 - step_27 + delay_4 + walk_in_place_fastest_left step_end Route104_EventScript_1ECDD0:: @ 81ECDD0 @@ -262,13 +262,13 @@ Route104_EventScript_1ECF73:: @ 81ECF73 end Route104_Movement_1ECF86: @ 81ECF86 - step_40 - step_down - step_41 + lock_facing_direction + walk_down + unlock_facing_direction step_end Route104_Movement_1ECF8A: @ 81ECF8A - step_down + walk_down step_end Route104_EventScript_1ECF8C:: @ 81ECF8C @@ -448,426 +448,426 @@ Route104_EventScript_1ED1BE:: @ 81ED1BE end Route104_Movement_1ED1C8: @ 81ED1C8 - step_down - step_down - step_down - step_down - step_15 - step_15 - step_15 - step_15 - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_15 - step_15 - step_15 - step_15 - step_18 - step_18 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_18 - step_18 - step_15 - step_15 - step_15 - step_15 - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d + walk_down + walk_down + walk_down + walk_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_right + walk_fast_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down step_end Route104_Movement_1ED22A: @ 81ED22A - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_15 - step_15 - step_15 - step_15 - step_18 - step_18 - step_18 - step_18 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_18 - step_18 - step_18 - step_18 - step_right - step_right - step_down - step_down - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_down - step_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_right + walk_right + walk_down + walk_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_down + walk_down step_end Route104_Movement_1ED28C: @ 81ED28C - step_down - step_down - step_down - step_down - step_15 - step_15 - step_15 - step_15 - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_15 - step_15 - step_15 - step_15 - step_18 - step_18 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_18 - step_18 - step_15 - step_15 - step_15 - step_15 - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_15 - step_15 - step_15 - step_15 - step_18 - step_18 - step_18 - step_18 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_18 - step_18 - step_18 - step_18 - step_right - step_right - step_down - step_down - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_right + walk_fast_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_right + walk_right + walk_down + walk_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_down + walk_down step_end Route104_Movement_1ED34F: @ 81ED34F - step_left - step_down - step_down + walk_left + walk_down + walk_down step_end Route104_Movement_1ED353: @ 81ED353 - step_down + walk_down step_end Route104_Movement_1ED355: @ 81ED355 - step_down - step_left - step_28 + walk_down + walk_left + walk_in_place_fastest_right step_end Route104_Movement_1ED359: @ 81ED359 - step_down - step_down + walk_down + walk_down step_end Route104_Movement_1ED35C: @ 81ED35C - step_down - step_27 + walk_down + walk_in_place_fastest_left step_end Route104_EventScript_1ED35F:: @ 81ED35F diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 123f78db1f..b1ac87e30f 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -63,210 +63,210 @@ Route109_EventScript_1EE7D5:: @ 81EE7D5 end Route109_Movement_1EE84F: @ 81EE84F - step_25 - step_down - step_down - step_15 - step_15 - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_15 - step_15 - step_17 - step_17 - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_left - step_left - step_25 + walk_in_place_fastest_down + walk_down + walk_down + walk_fast_down + walk_fast_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_left + walk_left + walk_in_place_fastest_down step_end Route109_Movement_1EE8FD: @ 81EE8FD - step_down - step_down + walk_down + walk_down step_end Route109_Movement_1EE900: @ 81EE900 - step_down - step_down - step_left - step_28 + walk_down + walk_down + walk_left + walk_in_place_fastest_right step_end Route109_Movement_1EE905: @ 81EE905 - step_right - step_down + walk_right + walk_down step_end Route109_Movement_1EE908: @ 81EE908 - step_left - step_down + walk_left + walk_down step_end Route109_Movement_1EE90B: @ 81EE90B - step_down + walk_down step_end Route109_Movement_1EE90D: @ 81EE90D - step_down - step_27 + walk_down + walk_in_place_fastest_left step_end Route109_EventScript_1EE910:: @ 81EE910 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 9d00303c99..40d6a2e69e 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -557,50 +557,50 @@ Route110_EventScript_1EF9A0:: @ 81EF9A0 return Route110_Movement_1EF9A8: @ 81EF9A8 - step_down - step_left - step_25 + walk_down + walk_left + walk_in_place_fastest_down step_end Route110_Movement_1EF9AC: @ 81EF9AC - step_down + walk_down step_end Route110_Movement_1EF9AE: @ 81EF9AE - step_down - step_right - step_25 + walk_down + walk_right + walk_in_place_fastest_down step_end Route110_Movement_1EF9B2: @ 81EF9B2 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end Route110_Movement_1EF9BA: @ 81EF9BA - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_15 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_down step_end Route110_Movement_1EF9C3: @ 81EF9C3 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end Route110_EventScript_1EF9CB:: @ 81EF9CB @@ -717,66 +717,66 @@ Route110_EventScript_1EFB25:: @ 81EFB25 return Route110_Movement_1EFB30: @ 81EFB30 - step_down - step_down - step_down + walk_down + walk_down + walk_down step_end Route110_Movement_1EFB34: @ 81EFB34 - step_down - step_left - step_left - step_down + walk_down + walk_left + walk_left + walk_down step_end Route110_Movement_1EFB39: @ 81EFB39 - step_down - step_left - step_down + walk_down + walk_left + walk_down step_end Route110_Movement_1EFB3D: @ 81EFB3D - step_down - step_down + walk_down + walk_down step_end Route110_Movement_1EFB40: @ 81EFB40 - step_down - step_right - step_down + walk_down + walk_right + walk_down step_end Route110_Movement_1EFB44: @ 81EFB44 - step_up - step_up - step_right - step_up - step_up - step_up + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up step_end Route110_Movement_1EFB4B: @ 81EFB4B - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end Route110_Movement_1EFB51: @ 81EFB51 - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end Route110_Movement_1EFB57: @ 81EFB57 - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end Route110_Text_1EFB5D: @ 81EFB5D diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc index 5087d304cd..9579df56c5 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc @@ -27,7 +27,7 @@ Route110_SeasideCyclingRoadEntrance1_EventScript_26EA9F:: @ 826EA9F end Route110_SeasideCyclingRoadEntrance1_Movement_26EAB4: @ 826EAB4 - step_left + walk_left step_end Route110_SeasideCyclingRoadEntrance1_EventScript_26EAB6:: @ 826EAB6 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc index 97e7452ec4..499969d6eb 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc @@ -45,7 +45,7 @@ Route110_SeasideCyclingRoadEntrance2_EventScript_26EBFC:: @ 826EBFC end Route110_SeasideCyclingRoadEntrance2_Movement_26EC11: @ 826EC11 - step_left + walk_left step_end Route110_SeasideCyclingRoadEntrance2_EventScript_26EC13:: @ 826EC13 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index b8db4697b9..a2997a49b0 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -253,11 +253,11 @@ Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041 end Route110_TrickHouseEnd_Movement_26B089: @ 826B089 - step_down + walk_down step_end Route110_TrickHouseEnd_Movement_26B08B: @ 826B08B - step_48 + jump_in_place_left step_end Route110_TrickHouseEnd_Text_26B08D: @ 826B08D diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 4bf7eb10af..5e03fa1651 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -304,26 +304,26 @@ Route110_TrickHouseEntrance_EventScript_269E2D:: @ 8269E2D Route110_TrickHouseEnd_Movement_269E36: @ 8269E36 Route110_TrickHouseEntrance_Movement_269E36: @ 8269E36 - step_01 - step_12 - step_02 - step_12 - step_00 - step_12 - step_03 - step_12 + face_up + delay_4 + face_left + delay_4 + face_down + delay_4 + face_right + delay_4 step_end Route110_TrickHouseEnd_Movement_269E3F: @ 8269E3F Route110_TrickHouseEntrance_Movement_269E3F: @ 8269E3F - step_01 - step_52 - step_32 - step_32 - step_32 - step_32 - step_32 - step_32 + face_up + disable_anim + slide_up + slide_up + slide_up + slide_up + slide_up + slide_up step_end Route110_TrickHouseEntrance_EventScript_269E48:: @ 8269E48 @@ -529,7 +529,7 @@ Route110_TrickHouseEntrance_EventScript_26A126:: @ 826A126 end Route110_TrickHouseEntrance_Movement_26A1A7: @ 826A1A7 - step_54 + set_invisible step_end Route110_TrickHouseEntrance_EventScript_26A1A9:: @ 826A1A9 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index cd14f00603..3bdf93b12b 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -855,113 +855,113 @@ Route110_TrickHousePuzzle5_EventScript_26D5FF:: @ 826D5FF return Route110_TrickHousePuzzle5_Movement_26D60A: @ 826D60A - step_left + walk_left step_end Route110_TrickHousePuzzle5_Movement_26D60C: @ 826D60C - step_left - step_left + walk_left + walk_left step_end Route110_TrickHousePuzzle5_Movement_26D60F: @ 826D60F - step_left - step_left - step_left + walk_left + walk_left + walk_left step_end Route110_TrickHousePuzzle5_Movement_26D613: @ 826D613 - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left step_end Movement_26D618: @ 826D618 - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end Route110_TrickHousePuzzle5_Movement_26D61E: @ 826D61E - step_right + walk_right step_end Route110_TrickHousePuzzle5_Movement_26D620: @ 826D620 - step_right - step_right + walk_right + walk_right step_end Route110_TrickHousePuzzle5_Movement_26D623: @ 826D623 - step_right - step_right - step_right + walk_right + walk_right + walk_right step_end Route110_TrickHousePuzzle5_Movement_26D627: @ 826D627 - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right step_end Route110_TrickHousePuzzle5_Movement_26D62C: @ 826D62C - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Route110_TrickHouseEntrance_Movement_26D632: @ 826D632 Route110_TrickHousePuzzle5_Movement_26D632: @ 826D632 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_00 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_down step_end Route110_TrickHousePuzzle5_Text_26D660: @ 826D660 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 37d77d0953..094a528952 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -150,13 +150,13 @@ Route111_EventScript_1F0EA7:: @ 81F0EA7 end Route111_Movement_1F0EB1:: @ 81F0EB1 - step_94 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 + store_lock_anim + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down step_end Route111_EventScript_1F0EB9:: @ 81F0EB9 @@ -247,19 +247,19 @@ Route111_EventScript_1F0F9D:: @ 81F0F9D return Route111_Movement_1F0FA8: @ 81F0FA8 - step_up + walk_up step_end Route111_Movement_1F0FAA: @ 81F0FAA - step_down + walk_down step_end Route111_Movement_1F0FAC: @ 81F0FAC - step_left + walk_left step_end Route111_Movement_1F0FAE: @ 81F0FAE - step_right + walk_right step_end Route111_EventScript_1F0FB0:: @ 81F0FB0 @@ -366,18 +366,18 @@ Route111_EventScript_1F1143:: @ 81F1143 return Route111_Movement_1F114A: @ 81F114A - step_26 - step_up + walk_in_place_fastest_up + walk_up step_end Route111_Movement_1F114D: @ 81F114D - step_down + walk_down step_end Route111_Movement_1F114F: @ 81F114F - step_14 - step_14 - step_14 + delay_16 + delay_16 + delay_16 step_end Route111_EventScript_1F1153:: @ 81F1153 diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index 72c003d992..94e442a48d 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -60,31 +60,31 @@ Route112_CableCarStation_EventScript_22AB67:: @ 822AB67 end Route112_CableCarStation_Movement_22AB71: @ 822AB71 - step_up - step_up - step_right - step_27 + walk_up + walk_up + walk_right + walk_in_place_fastest_left step_end Route112_CableCarStation_Movement_22AB76: @ 822AB76 - step_14 - step_left - step_down - step_down + delay_16 + walk_left + walk_down + walk_down step_end Route112_CableCarStation_Movement_22AB7B: @ 822AB7B - step_up - step_up - step_up - step_14 + walk_up + walk_up + walk_up + delay_16 step_end Route112_CableCarStation_Movement_22AB80: @ 822AB80 - step_down - step_down - step_down - step_14 + walk_down + walk_down + walk_down + delay_16 step_end Route112_CableCarStation_Text_22AB85: @ 822AB85 diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index a8d73397cc..68a32c3b53 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -102,27 +102,27 @@ Route116_EventScript_1F2D39:: @ 81F2D39 end Route116_Movement_1F2D43: @ 81F2D43 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end Route116_Movement_1F2D4C: @ 81F2D4C - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end Route116_EventScript_1F2D57:: @ 81F2D57 @@ -223,28 +223,28 @@ Route116_EventScript_1F2E69:: @ 81F2E69 return Route116_Movement_1F2E74: @ 81F2E74 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end Route116_Movement_1F2E7E: @ 81F2E7E - step_up - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end Route116_EventScript_1F2E89:: @ 81F2E89 diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 27a2539e1f..818111b812 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -132,58 +132,58 @@ Route118_EventScript_1F3F4C:: @ 81F3F4C return Route118_Movement_1F3F5E: @ 81F3F5E - step_14 - step_28 + delay_16 + walk_in_place_fastest_right step_end Route118_Movement_1F3F61: @ 81F3F61 - step_left + walk_left step_end Route118_Movement_1F3F63: @ 81F3F63 - step_right + walk_right step_end Route118_Movement_1F3F65: @ 81F3F65 - fast_step_down - step_14 - step_down + jump_2_down + delay_16 + walk_down step_end Route118_Movement_1F3F69: @ 81F3F69 - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Route118_Movement_1F3F74: @ 81F3F74 - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Route118_Movement_1F3F7E: @ 81F3F7E - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Route118_EventScript_1F3F87:: @ 81F3F87 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 41e0fbbfe1..a4b6a5fb13 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -230,98 +230,98 @@ Route119_EventScript_1F470F:: @ 81F470F return Route119_Movement_1F471E: @ 81F471E - step_14 - step_28 - step_13 - step_26 + delay_16 + walk_in_place_fastest_right + delay_8 + walk_in_place_fastest_up step_end Route119_Movement_1F4723: @ 81F4723 - step_14 - step_27 - step_13 - step_26 + delay_16 + walk_in_place_fastest_left + delay_8 + walk_in_place_fastest_up step_end Route119_Movement_1F4728: @ 81F4728 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_16 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up step_end Route119_Movement_1F4732: @ 81F4732 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_16 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up step_end Route119_Movement_1F473D: @ 81F473D - step_18 - step_16 - step_16 - step_16 - step_18 - step_16 - step_16 - step_16 - step_16 + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end Route119_Movement_1F4747: @ 81F4747 - step_17 - step_16 - step_16 - step_16 - step_18 - step_18 - step_16 - step_16 - step_16 - step_16 + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end Route119_Movement_1F4752: @ 81F4752 - step_down - step_down - step_down - step_down - step_left - step_left - step_down + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_down step_end Route119_Movement_1F475A: @ 81F475A - step_up - step_right - step_right - step_up - step_up - step_up - step_up - step_up + walk_up + walk_right + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up step_end Route119_Movement_1F4763: @ 81F4763 - step_up - step_right - step_up - step_up - step_up - step_up - step_up + walk_up + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up step_end Route119_EventScript_1F476B:: @ 81F476B diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 0bd6c12f23..b2341bf3dc 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -175,38 +175,38 @@ Route119_WeatherInstitute_2F_EventScript_270166:: @ 8270166 end Route119_WeatherInstitute_2F_Movement_270170: @ 8270170 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left step_end Route119_WeatherInstitute_2F_Movement_27017C: @ 827017C - step_14 - step_14 - step_14 - step_14 - step_14 - step_2a - step_25 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + ride_water_current_up + walk_in_place_fastest_down step_end Route119_WeatherInstitute_2F_Movement_270184: @ 8270184 - step_31 - step_27 + slide_down + walk_in_place_fastest_left step_end Route119_WeatherInstitute_2F_Movement_270187: @ 8270187 - step_right - step_right - step_right + walk_right + walk_right + walk_right step_end Route119_WeatherInstitute_2F_EventScript_27018B:: @ 827018B diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 461823e47f..7d6876aebd 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -274,8 +274,8 @@ Route120_EventScript_1F57AE:: @ 81F57AE return Route120_Movement_1F57B9: @ 81F57B9 - step_down - step_left + walk_down + walk_left step_end Route120_EventScript_1F57BC:: @ 81F57BC diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index d579401b87..f133ffe56f 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -33,36 +33,36 @@ Route121_EventScript_1F5E18:: @ 81F5E18 end Route121_Movement_1F5E59: @ 81F5E59 - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end Route121_Movement_1F5E62: @ 81F5E62 - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end Route121_Movement_1F5E6B: @ 81F5E6B - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end Route121_EventScript_1F5E74:: @ 81F5E74 diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 1369b57217..0e9cf9636d 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -15,14 +15,14 @@ Route121_SafariZoneEntrance_EventScript_22BBCB:: @ 822BBCB end Route121_SafariZoneEntrance_Movement_22BBDD: @ 822BBDD - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Route121_SafariZoneEntrance_EventScript_22BBE6:: @ 822BBE6 @@ -122,18 +122,18 @@ Route121_SafariZoneEntrance_EventScript_22BD06:: @ 822BD06 end Route121_SafariZoneEntrance_Movement_22BD16: @ 822BD16 - step_right + walk_right step_end Route121_SafariZoneEntrance_Movement_22BD18: @ 822BD18 - step_left - step_left - step_left - step_left - step_left - step_left - step_down - step_14 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + delay_16 step_end Route121_SafariZoneEntrance_EventScript_22BD21:: @ 822BD21 diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index f62f784045..8e2742ff53 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -80,99 +80,99 @@ Route128_EventScript_1F6B57:: @ 81F6B57 end Route128_Movement_1F6C76: @ 81F6C76 - step_17 + walk_fast_left step_end Route128_Movement_1F6C78: @ 81F6C78 - step_left - step_left - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_up - step_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end Route128_Movement_1F6C85: @ 81F6C85 - step_up + walk_up step_end Route128_Movement_1F6C87: @ 81F6C87 - step_17 + walk_fast_left step_end Route128_Movement_1F6C89: @ 81F6C89 - step_15 - step_27 - step_14 - step_28 - step_14 - step_14 - step_25 + walk_fast_down + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_right + delay_16 + delay_16 + walk_in_place_fastest_down step_end Route128_Movement_1F6C91: @ 81F6C91 - step_40 - slow_step_up - step_14 - step_41 + lock_facing_direction + walk_slow_up + delay_16 + unlock_facing_direction step_end Route128_Movement_1F6C96: @ 81F6C96 - step_17 - step_17 - step_17 - step_28 + walk_fast_left + walk_fast_left + walk_fast_left + walk_in_place_fastest_right step_end Route128_Movement_1F6C9B: @ 81F6C9B - step_14 - step_14 - step_16 - step_17 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + delay_16 + delay_16 + walk_fast_up + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end Route128_Movement_1F6CA8: @ 81F6CA8 - step_left - step_left - step_13 - step_12 + walk_left + walk_left + delay_8 + delay_4 step_end Route128_Movement_1F6CAD: @ 81F6CAD - step_left - step_25 + walk_left + walk_in_place_fastest_down step_end Route128_Movement_1F6CB0: @ 81F6CB0 - step_17 - step_17 - step_17 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end Route128_Movement_1F6CBB: @ 81F6CBB - step_right - step_25 + walk_right + walk_in_place_fastest_down step_end Route128_EventScript_1F6CBE:: @ 81F6CBE diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index f8426a7eb2..5e323211ac 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -105,30 +105,30 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD end RustboroCity_Movement_1E084E: @ 81E084E - step_1d + walk_in_place_down step_end RustboroCity_Movement_1E0850: @ 81E0850 - step_down + walk_down step_end RustboroCity_Movement_1E0852: @ 81E0852 - step_down - step_14 + walk_down + delay_16 step_end RustboroCity_Movement_1E0855: @ 81E0855 - step_14 - step_left - step_down - step_down - step_right - step_26 - step_14 + delay_16 + walk_left + walk_down + walk_down + walk_right + walk_in_place_fastest_up + delay_16 step_end RustboroCity_Movement_1E085D: @ 81E085D - step_up + walk_up step_end RustboroCity_EventScript_1E085F:: @ 81E085F @@ -352,100 +352,100 @@ RustboroCity_EventScript_1E0A79:: @ 81E0A79 return RustboroCity_Movement_1E0A8E: @ 81E0A8E - step_30 - step_30 - step_18 - step_18 - step_18 - step_18 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end RustboroCity_Movement_1E0AA0: @ 81E0AA0 - step_30 - step_30 - step_18 - step_18 - step_18 - step_18 - step_18 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end RustboroCity_Movement_1E0AB1: @ 81E0AB1 - step_right - step_right - step_right - step_right - step_right - step_right - step_26 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end RustboroCity_Movement_1E0AB9: @ 81E0AB9 - step_up - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end RustboroCity_Movement_1E0AC1: @ 81E0AC1 - step_down - step_right - step_right + walk_down + walk_right + walk_right step_end RustboroCity_Movement_1E0AC5: @ 81E0AC5 - step_down - step_down - step_right - step_right + walk_down + walk_down + walk_right + walk_right step_end RustboroCity_Movement_1E0ACA: @ 81E0ACA - step_down - step_down - step_right - step_right + walk_down + walk_down + walk_right + walk_right step_end RustboroCity_Movement_1E0ACF: @ 81E0ACF - step_down - step_down - step_down - step_right - step_right + walk_down + walk_down + walk_down + walk_right + walk_right step_end RustboroCity_Movement_1E0AD5: @ 81E0AD5 - step_down - step_down - step_down - step_right - step_right - step_right - step_25 + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_in_place_fastest_down step_end RustboroCity_EventScript_1E0ADD:: @ 81E0ADD @@ -554,7 +554,7 @@ RustboroCity_EventScript_1E0BF3:: @ 81E0BF3 return RustboroCity_Movement_1E0C29: @ 81E0C29 - step_down + walk_down step_end RustboroCity_EventScript_1E0C2B:: @ 81E0C2B @@ -972,59 +972,59 @@ RustboroCity_EventScript_1E11FB:: @ 81E11FB end RustboroCity_Movement_1E120E: @ 81E120E - step_down - step_left - step_left - step_left - step_left - step_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_down step_end RustboroCity_Movement_1E1215: @ 81E1215 - step_down - step_left - step_left - step_left - step_down + walk_down + walk_left + walk_left + walk_left + walk_down step_end RustboroCity_Movement_1E121B: @ 81E121B - step_down - step_left - step_left - step_down + walk_down + walk_left + walk_left + walk_down step_end RustboroCity_Movement_1E1220: @ 81E1220 - step_down - step_left - step_down + walk_down + walk_left + walk_down step_end RustboroCity_Movement_1E1224: @ 81E1224 - step_down - step_down + walk_down + walk_down step_end RustboroCity_Movement_1E1227: @ 81E1227 - step_down - step_right - step_down + walk_down + walk_right + walk_down step_end RustboroCity_Movement_1E122B: @ 81E122B - step_down - step_right - step_right - step_down + walk_down + walk_right + walk_right + walk_down step_end RustboroCity_Movement_1E1230: @ 81E1230 - step_down - step_right - step_right - step_right - step_down + walk_down + walk_right + walk_right + walk_right + walk_down step_end RustboroCity_EventScript_1E1236:: @ 81E1236 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 9547fbd67f..ffc2614cb5 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -73,78 +73,78 @@ RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E end RustboroCity_DevonCorp_3F_Movement_21252F: @ 821252F - step_up - step_up - step_up - step_27 + walk_up + walk_up + walk_up + walk_in_place_fastest_left step_end RustboroCity_DevonCorp_3F_Movement_212534: @ 8212534 - step_right - step_right - step_right - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_27 + walk_right + walk_right + walk_right + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_left step_end RustboroCity_DevonCorp_3F_Movement_212543: @ 8212543 - step_14 - step_25 + delay_16 + walk_in_place_fastest_down step_end RustboroCity_DevonCorp_3F_Movement_212546: @ 8212546 - step_right - step_right - step_right - step_down - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_down + walk_right + walk_right + walk_right + walk_right step_end RustboroCity_DevonCorp_3F_Movement_21254F: @ 821254F - step_left - step_left - step_left - step_left - step_up - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_left + walk_left + walk_left step_end RustboroCity_DevonCorp_3F_Movement_212558: @ 8212558 - step_right - step_right - step_right - step_right - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end RustboroCity_DevonCorp_3F_Movement_212566: @ 8212566 - step_14 - step_14 - step_down - step_down - step_28 + delay_16 + delay_16 + walk_down + walk_down + walk_in_place_fastest_right step_end RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index 46887b9c61..f5030facd3 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -113,55 +113,55 @@ RustboroCity_PokemonSchool_EventScript_213FFB:: @ 8213FFB end RustboroCity_PokemonSchool_Movement_214010: @ 8214010 - step_left - step_down - step_down - step_right - step_25 - step_14 - step_14 - step_14 - step_down - step_27 - step_14 - step_14 - step_right - step_14 - step_14 - step_13 - step_up - step_left - step_left - step_up - step_up - step_right + walk_left + walk_down + walk_down + walk_right + walk_in_place_fastest_down + delay_16 + delay_16 + delay_16 + walk_down + walk_in_place_fastest_left + delay_16 + delay_16 + walk_right + delay_16 + delay_16 + delay_8 + walk_up + walk_left + walk_left + walk_up + walk_up + walk_right step_end RustboroCity_PokemonSchool_Movement_214027: @ 8214027 - step_right - step_right - step_down - step_down - step_left - step_left - step_25 - step_14 - step_14 - step_14 - step_down - step_27 - step_14 - step_14 - step_right - step_14 - step_14 - step_13 - step_up - step_right - step_up - step_up - step_left - step_left + walk_right + walk_right + walk_down + walk_down + walk_left + walk_left + walk_in_place_fastest_down + delay_16 + delay_16 + delay_16 + walk_down + walk_in_place_fastest_left + delay_16 + delay_16 + walk_right + delay_16 + delay_16 + delay_8 + walk_up + walk_right + walk_up + walk_up + walk_left + walk_left step_end RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040 diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 52dca4c95f..5e42be78d2 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -150,121 +150,121 @@ RusturfTunnel_EventScript_22CFFF:: @ 822CFFF return RusturfTunnel_Movement_22D017: @ 822D017 - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end RusturfTunnel_Movement_22D023: @ 822D023 - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end RusturfTunnel_Movement_22D02F: @ 822D02F - step_13 - step_26 - step_14 - step_14 - step_28 + delay_8 + walk_in_place_fastest_up + delay_16 + delay_16 + walk_in_place_fastest_right step_end RusturfTunnel_Movement_22D035: @ 822D035 - step_left - step_28 + walk_left + walk_in_place_fastest_right step_end RusturfTunnel_Movement_22D038: @ 822D038 - step_down - step_26 - step_13 - step_28 + walk_down + walk_in_place_fastest_up + delay_8 + walk_in_place_fastest_right step_end RusturfTunnel_Movement_22D03D: @ 822D03D - step_up - step_25 - step_13 - step_28 + walk_up + walk_in_place_fastest_down + delay_8 + walk_in_place_fastest_right step_end RusturfTunnel_Movement_22D042: @ 822D042 - step_left - step_28 + walk_left + walk_in_place_fastest_right step_end RusturfTunnel_Movement_22D045: @ 822D045 - step_right - step_27 + walk_right + walk_in_place_fastest_left step_end RusturfTunnel_Movement_22D048: @ 822D048 - step_up - step_28 + walk_up + walk_in_place_fastest_right step_end RusturfTunnel_Movement_22D04B: @ 822D04B - step_right - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end RusturfTunnel_Movement_22D058: @ 822D058 - step_up - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_up + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end RusturfTunnel_Movement_22D065: @ 822D065 - step_right + walk_right step_end RusturfTunnel_Movement_22D067: @ 822D067 - step_22 - step_22 - step_16 - step_18 + walk_in_place_fast_up + walk_in_place_fast_up + walk_fast_up + walk_fast_right step_end RusturfTunnel_Movement_22D06C: @ 822D06C - step_24 - step_24 - step_18 - step_26 + walk_in_place_fast_right + walk_in_place_fast_right + walk_fast_right + walk_in_place_fastest_up step_end RusturfTunnel_EventScript_22D071:: @ 822D071 @@ -293,9 +293,9 @@ RusturfTunnel_EventScript_22D083:: @ 822D083 end RusturfTunnel_Movement_22D0AB: @ 822D0AB - step_40 - step_right - step_41 + lock_facing_direction + walk_right + unlock_facing_direction step_end RusturfTunnel_EventScript_22D0AF:: @ 822D0AF @@ -353,76 +353,76 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 end RusturfTunnel_Movement_22D178: @ 822D178 - step_00 - step_40 - step_up - step_41 - step_27 + face_down + lock_facing_direction + walk_up + unlock_facing_direction + walk_in_place_fastest_left step_end RusturfTunnel_Movement_22D17E: @ 822D17E - step_down - step_26 + walk_down + walk_in_place_fastest_up step_end RusturfTunnel_Movement_22D181: @ 822D181 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left step_end RusturfTunnel_Movement_22D18B: @ 822D18B - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end RusturfTunnel_Movement_22D193: @ 822D193 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end RusturfTunnel_Movement_22D19F: @ 822D19F - step_14 - step_13 - step_12 - step_27 + delay_16 + delay_8 + delay_4 + walk_in_place_fastest_left step_end RusturfTunnel_Movement_22D1A4: @ 822D1A4 - step_14 - step_right + delay_16 + walk_right step_end RusturfTunnel_Movement_22D1A7: @ 822D1A7 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end RusturfTunnel_EventScript_22D1B1:: @ 822D1B1 diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index ad10e2669b..6d83c8841b 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -224,47 +224,47 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219 end SSTidalCorridor_Movement_23C26D: @ 823C26D - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end SSTidalCorridor_Movement_23C275: @ 823C275 - step_25 - step_14 - step_14 - step_14 - step_14 - step_down - step_left + walk_in_place_fastest_down + delay_16 + delay_16 + delay_16 + delay_16 + walk_down + walk_left step_end SSTidalCorridor_Movement_23C27D: @ 823C27D - step_14 - step_14 - step_14 - step_14 - step_13 - step_25 + delay_16 + delay_16 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_down step_end SSTidalCorridor_Movement_23C284: @ 823C284 - step_14 - step_right - step_right - step_26 - step_14 - step_27 + delay_16 + walk_right + walk_right + walk_in_place_fastest_up + delay_16 + walk_in_place_fastest_left step_end SSTidalCorridor_Movement_23C28B: @ 823C28B - step_left - step_left - step_26 + walk_left + walk_left + walk_in_place_fastest_up step_end SSTidalCorridor_Text_23C28F: @ 823C28F diff --git a/data/scripts/maps/SafariZone_South.inc b/data/scripts/maps/SafariZone_South.inc index 4be06d00b4..239a2efdaa 100644 --- a/data/scripts/maps/SafariZone_South.inc +++ b/data/scripts/maps/SafariZone_South.inc @@ -28,12 +28,12 @@ SafariZone_South_EventScript_23D2BD:: @ 823D2BD return SafariZone_South_Movement_23D2C5: @ 823D2C5 - step_down + walk_down step_end SafariZone_South_Movement_23D2C7: @ 823D2C7 - step_right - step_25 + walk_right + walk_in_place_fastest_down step_end SafariZone_South_EventScript_23D2CA:: @ 823D2CA @@ -98,22 +98,22 @@ SafariZone_South_EventScript_23D373:: @ 823D373 end SafariZone_South_Movement_23D385: @ 823D385 - step_up + walk_up step_end SafariZone_South_Movement_23D387: @ 823D387 - step_right - step_26 + walk_right + walk_in_place_fastest_up step_end SafariZone_South_Movement_23D38A: @ 823D38A - step_left - step_28 + walk_left + walk_in_place_fastest_right step_end SafariZone_South_Movement_23D38D: @ 823D38D - step_down - step_26 + walk_down + walk_in_place_fastest_up step_end SafariZone_South_EventScript_23D390:: @ 823D390 diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index a2247286c4..e8f6323c15 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -147,78 +147,78 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 end SeafloorCavern_Room9_Movement_23502A: @ 823502A - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end SeafloorCavern_Room9_Movement_235032: @ 8235032 - step_left - step_left + walk_left + walk_left step_end SeafloorCavern_Room9_Movement_235035: @ 8235035 - step_left - step_14 + walk_left + delay_16 step_end SeafloorCavern_Room9_Movement_235038: @ 8235038 - step_right + walk_right step_end SeafloorCavern_Room9_Movement_23503A: @ 823503A - step_01 - step_40 - step_down - step_41 - step_28 + face_up + lock_facing_direction + walk_down + unlock_facing_direction + walk_in_place_fastest_right step_end SeafloorCavern_Room9_Movement_235040: @ 8235040 - step_14 - step_14 - slow_step_down - step_14 - step_14 - step_14 - slow_step_down - step_14 - step_14 - step_14 + delay_16 + delay_16 + walk_slow_down + delay_16 + delay_16 + delay_16 + walk_slow_down + delay_16 + delay_16 + delay_16 step_end SeafloorCavern_Room9_Movement_23504B: @ 823504B - step_32 - step_32 + slide_up + slide_up step_end SeafloorCavern_Room9_Movement_23504E: @ 823504E - step_18 - step_18 - step_18 - step_18 - step_18 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right step_end SeafloorCavern_Room9_Movement_235054: @ 8235054 - step_right - step_right + walk_right + walk_right step_end SeafloorCavern_Room9_Movement_235057: @ 8235057 - step_18 - step_18 - step_18 - step_18 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right step_end SeafloorCavern_Room9_Movement_23505C: @ 823505C - step_14 - step_14 + delay_16 + delay_16 step_end SeafloorCavern_Room9_Text_23505F: @ 823505F diff --git a/data/scripts/maps/SkyPillar_Outside.inc b/data/scripts/maps/SkyPillar_Outside.inc index cced073aa9..e9fbf4ad68 100644 --- a/data/scripts/maps/SkyPillar_Outside.inc +++ b/data/scripts/maps/SkyPillar_Outside.inc @@ -92,46 +92,46 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 end SkyPillar_Outside_Movement_2393D3: @ 82393D3 - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_right - step_right - step_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right step_end SkyPillar_Outside_Movement_2393DE: @ 82393DE - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_right - step_up - step_up - step_up - step_up + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up + walk_up step_end SkyPillar_Outside_Movement_2393EB: @ 82393EB - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_right - step_up - step_up - step_up + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up step_end SkyPillar_Outside_EventScript_2393F8:: @ 82393F8 diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index a2ea5ed1dc..334acc8ac6 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -139,49 +139,49 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A end SkyPillar_Top_Movement_23983A: @ 823983A - step_14 - step_23 - step_14 - step_14 - step_14 - step_14 - step_14 - step_1f - step_14 - step_20 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 + delay_16 + walk_in_place_fast_left + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_left + delay_16 + walk_in_place_right + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 step_end SkyPillar_Top_Movement_23984B: @ 823984B - step_14 - step_1d - step_13 - step_20 - step_13 - step_2e - step_32 - step_32 - step_32 - step_32 - step_32 - step_32 + delay_16 + walk_in_place_down + delay_8 + walk_in_place_right + delay_8 + walk_fastest_up + slide_up + slide_up + slide_up + slide_up + slide_up + slide_up step_end SkyPillar_Top_Movement_239858: @ 8239858 - slow_step_up - slow_step_up - slow_step_up + walk_slow_up + walk_slow_up + walk_slow_up step_end SkyPillar_Top_Movement_23985C: @ 823985C - slow_step_down - slow_step_down - slow_step_down + walk_slow_down + walk_slow_down + walk_slow_down step_end SkyPillar_Top_Text_239860: @ 8239860 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index fe7cfc0fd8..d860e6e7c4 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -90,30 +90,30 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C end SlateportCity_Movement_1DCDA8: @ 81DCDA8 - step_14 - step_13 - step_27 + delay_16 + delay_8 + walk_in_place_fastest_left step_end SlateportCity_Movement_1DCDAC: @ 81DCDAC - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end SlateportCity_Movement_1DCDB4: @ 81DCDB4 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end SlateportCity_EventScript_1DCDBD:: @ 81DCDBD @@ -473,8 +473,8 @@ SlateportCity_EventScript_1DD0C1:: @ 81DD0C1 end SlateportCity_Movement_1DD147: @ 81DD147 - step_14 - step_14 + delay_16 + delay_16 step_end SlateportCity_EventScript_1DD14A:: @ 81DD14A @@ -622,95 +622,95 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 end SlateportCity_Movement_1DD309: @ 81DD309 - step_14 - step_14 - step_57 - step_28 - step_14 - step_14 - step_27 + delay_16 + delay_16 + emote_question_mark + walk_in_place_fastest_right + delay_16 + delay_16 + walk_in_place_fastest_left step_end SlateportCity_Movement_1DD311: @ 81DD311 - step_57 - step_26 - step_14 - step_25 - step_14 - step_14 - step_27 + emote_question_mark + walk_in_place_fastest_up + delay_16 + walk_in_place_fastest_down + delay_16 + delay_16 + walk_in_place_fastest_left step_end SlateportCity_Movement_1DD319: @ 81DD319 - step_14 - step_left - step_left - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + delay_16 + walk_left + walk_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end SlateportCity_Movement_1DD326: @ 81DD326 - step_down - step_left - step_left - step_left - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end SlateportCity_Movement_1DD334: @ 81DD334 - step_down - step_26 + walk_down + walk_in_place_fastest_up step_end SlateportCity_Movement_1DD337: @ 81DD337 - step_right - step_up - step_up - step_54 + walk_right + walk_up + walk_up + set_invisible step_end SlateportCity_Movement_1DD33C: @ 81DD33C - step_14 - step_14 - step_14 - step_14 - step_14 - step_down - step_left + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_down + walk_left step_end SlateportCity_Movement_1DD344: @ 81DD344 - step_28 - step_14 - step_14 - step_right - step_up + walk_in_place_fastest_right + delay_16 + delay_16 + walk_right + walk_up step_end SlateportCity_Movement_1DD34A: @ 81DD34A - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_25 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_down step_end SlateportCity_EventScript_1DD353:: @ 81DD353 @@ -914,30 +914,30 @@ SlateportCity_EventScript_1DD5DC:: @ 81DD5DC end SlateportCity_Movement_1DD630: @ 81DD630 - step_40 - step_down - step_41 + lock_facing_direction + walk_down + unlock_facing_direction step_end SlateportCity_Movement_1DD634: @ 81DD634 - step_14 - step_28 + delay_16 + walk_in_place_fastest_right step_end SlateportCity_Movement_1DD637: @ 81DD637 - step_13 - step_down + delay_8 + walk_down step_end SlateportCity_Movement_1DD63A: @ 81DD63A - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end SlateportCity_EventScript_1DD643:: @ 81DD643 diff --git a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc b/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc index 4c5aa0371f..d79849a6c7 100644 --- a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc +++ b/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc @@ -99,17 +99,17 @@ SlateportCity_BattleTentCorridor_EventScript_209A7B:: @ 8209A7B @ forced stop SlateportCity_BattleTentBattleRoom_Movement_209A99: @ 8209A99 - step_up - step_up - step_up - step_28 + walk_up + walk_up + walk_up + walk_in_place_fastest_right step_end SlateportCity_BattleTentBattleRoom_Movement_209A9E: @ 8209A9E - step_down - step_down - step_down - step_down - step_27 + walk_down + walk_down + walk_down + walk_down + walk_in_place_fastest_left step_end diff --git a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc index 47ca641ce8..7446c10020 100644 --- a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc +++ b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc @@ -147,29 +147,29 @@ SlateportCity_BattleTentCorridor_EventScript_209044:: @ 8209044 goto SlateportCity_BattleTentCorridor_EventScript_208F0D SlateportCity_BattleTentCorridor_Movement_209059: @ 8209059 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end SlateportCity_BattleTentCorridor_Movement_20905E: @ 820905E - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end SlateportCity_BattleTentCorridor_Movement_209062: @ 8209062 - step_up - step_up - step_up - step_up - step_25 + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down step_end SlateportCity_BattleTentCorridor_Movement_209068: @ 8209068 - step_up - step_54 + walk_up + set_invisible step_end SlateportCity_BattleTentCorridor_Text_20906B: @ 820906B diff --git a/data/scripts/maps/SlateportCity_BattleTentLobby.inc b/data/scripts/maps/SlateportCity_BattleTentLobby.inc index 6353856e35..187ed0751f 100644 --- a/data/scripts/maps/SlateportCity_BattleTentLobby.inc +++ b/data/scripts/maps/SlateportCity_BattleTentLobby.inc @@ -194,26 +194,26 @@ SlateportCity_BattleTentLobby_EventScript_2089C9:: @ 82089C9 return SlateportCity_BattleTentLobby_Movement_2089F8: @ 82089F8 - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end SlateportCity_BattleTentLobby_Movement_2089FC: @ 82089FC - step_up - step_54 + walk_up + set_invisible step_end SlateportCity_BattleTentLobby_Movement_2089FF: @ 82089FF - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end SlateportCity_BattleTentLobby_Movement_208A03: @ 8208A03 - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end SlateportCity_BattleTentLobby_EventScript_208A07:: @ 8208A07 @@ -236,10 +236,10 @@ SlateportCity_BattleTentLobby_EventScript_208A2E:: @ 8208A2E end SlateportCity_BattleTentLobby_Movement_208A38:: @ 8208A38 - step_up - step_up - step_up - step_54 + walk_up + walk_up + walk_up + set_invisible step_end SlateportCity_BattleTentLobby_EventScript_208A3D:: @ 8208A3D diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index a66e0e6d9a..ca6ab50b55 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -105,58 +105,58 @@ SlateportCity_Harbor_EventScript_20CAB3:: @ 820CAB3 return SlateportCity_Harbor_Movement_20CAC8: @ 820CAC8 - step_14 - step_14 - step_43 - step_54 + delay_16 + delay_16 + jump_up + set_invisible step_end SlateportCity_Harbor_Movement_20CACD: @ 820CACD - step_14 - step_14 - step_43 - step_54 + delay_16 + delay_16 + jump_up + set_invisible step_end SlateportCity_Harbor_Movement_20CAD2: @ 820CAD2 - step_14 - step_14 - step_14 - step_14 - step_right - step_right - step_right - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 + delay_16 + delay_16 + delay_16 + delay_16 + walk_right + walk_right + walk_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right step_end SlateportCity_Harbor_Movement_20CAE0: @ 820CAE0 - step_left - step_left - step_left - step_left - step_up + walk_left + walk_left + walk_left + walk_left + walk_up step_end SlateportCity_Harbor_Movement_20CAE6: @ 820CAE6 - step_left - step_left - step_up - step_left + walk_left + walk_left + walk_up + walk_left step_end SlateportCity_Harbor_Movement_20CAEB: @ 820CAEB - step_left - step_left - step_left + walk_left + walk_left + walk_left step_end SlateportCity_Harbor_Movement_20CAEF: @ 820CAEF - step_up + walk_up step_end SlateportCity_Harbor_EventScript_20CAF1:: @ 820CAF1 @@ -259,12 +259,12 @@ SlateportCity_Harbor_EventScript_20CC42:: @ 820CC42 return SlateportCity_Harbor_Movement_20CC4D: @ 820CC4D - step_right - step_26 + walk_right + walk_in_place_fastest_up step_end SlateportCity_Harbor_Movement_20CC50: @ 820CC50 - step_up + walk_up step_end SlateportCity_Harbor_EventScript_20CC52:: @ 820CC52 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index ba8575c66c..4464ee5826 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -72,7 +72,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AE39:: @ 820AE39 end SlateportCity_OceanicMuseum_1F_Movement_20AE4B: @ 820AE4B - step_down + walk_down step_end SlateportCity_OceanicMuseum_1F_EventScript_20AE4D:: @ 820AE4D @@ -210,33 +210,33 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AFB5:: @ 820AFB5 end SlateportCity_OceanicMuseum_1F_Movement_20AFBF: @ 820AFBF - step_14 - step_13 - step_12 - step_25 + delay_16 + delay_8 + delay_4 + walk_in_place_fastest_down step_end SlateportCity_OceanicMuseum_1F_Movement_20AFC4: @ 820AFC4 - step_14 - step_25 + delay_16 + walk_in_place_fastest_down step_end SlateportCity_OceanicMuseum_1F_Movement_20AFC7: @ 820AFC7 - step_00 - step_15 - step_15 - step_15 - step_15 - step_13 + face_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + delay_8 step_end SlateportCity_OceanicMuseum_1F_Movement_20AFCE: @ 820AFCE - step_18 - step_15 - step_15 - step_15 - step_15 - step_13 + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + delay_8 step_end SlateportCity_OceanicMuseum_1F_Text_20AFD5: @ 820AFD5 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index a7a24757fc..4172c47ef3 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -116,103 +116,103 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BCB3:: @ 820BCB3 return SlateportCity_OceanicMuseum_2F_Movement_20BCBE: @ 820BCBE - step_left - step_down - step_27 + walk_left + walk_down + walk_in_place_fastest_left step_end SlateportCity_OceanicMuseum_2F_Movement_20BCC2: @ 820BCC2 - step_up - step_left - step_left - step_down - step_27 + walk_up + walk_left + walk_left + walk_down + walk_in_place_fastest_left step_end SlateportCity_OceanicMuseum_2F_Movement_20BCC8: @ 820BCC8 - step_up - step_left - step_left - step_left - step_left - step_left - step_up - step_up - step_left - step_left - step_up - step_up - step_13 + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_left + walk_left + walk_up + walk_up + delay_8 step_end SlateportCity_OceanicMuseum_2F_Movement_20BCD6: @ 820BCD6 - step_right + walk_right step_end SlateportCity_OceanicMuseum_2F_Movement_20BCD8: @ 820BCD8 - step_down - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right step_end SlateportCity_OceanicMuseum_2F_Movement_20BCE2: @ 820BCE2 - step_right + walk_right step_end SlateportCity_OceanicMuseum_2F_Movement_20BCE4: @ 820BCE4 - step_down - step_right - step_25 + walk_down + walk_right + walk_in_place_fastest_down step_end SlateportCity_OceanicMuseum_2F_Movement_20BCE8: @ 820BCE8 - step_down - step_down - step_down - step_right - step_right - step_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right step_end SlateportCity_OceanicMuseum_2F_Movement_20BCEF: @ 820BCEF - step_40 - step_left - step_41 + lock_facing_direction + walk_left + unlock_facing_direction step_end SlateportCity_OceanicMuseum_2F_Movement_20BCF3: @ 820BCF3 - step_down + walk_down step_end SlateportCity_OceanicMuseum_2F_Movement_20BCF5: @ 820BCF5 - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right step_end SlateportCity_OceanicMuseum_2F_Movement_20BCFE: @ 820BCFE - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_13 - step_15 - step_26 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_8 + walk_fast_down + walk_in_place_fastest_up step_end SlateportCity_OceanicMuseum_2F_EventScript_20BD0A:: @ 820BD0A diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 6dac80f4bb..6a26ee0ff7 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -281,33 +281,33 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946 end SootopolisCity_Movement_1E5A68: @ 81E5A68 - step_92 - step_92 - step_92 - step_92 - step_92 - step_92 - step_92 - step_92 - step_92 - step_92 - step_92 - step_92 + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest step_end SootopolisCity_Movement_1E5A75: @ 81E5A75 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast step_end SootopolisCity_EventScript_1E5A82:: @ 81E5A82 @@ -381,113 +381,113 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82 end SootopolisCity_Movement_1E5BA4: @ 81E5BA4 - step_91 - step_91 - step_up - step_up - step_up - step_up - step_up - step_up - step_up + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end SootopolisCity_Movement_1E5BAE: @ 81E5BAE - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_92 - step_92 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_slow_diag_southwest + walk_slow_diag_southwest step_end SootopolisCity_Movement_1E5BB8: @ 81E5BB8 - step_1b - step_1b - step_1b - step_14 - step_14 - step_14 - step_5e - step_96 - step_5f + walk_in_place_slow_left + walk_in_place_slow_left + walk_in_place_slow_left + delay_16 + delay_16 + delay_16 + init_affine_anim + walk_left_affine + clear_affine_anim step_end SootopolisCity_Movement_1E5BC2: @ 81E5BC2 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_5e - step_96 - step_5f + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + init_affine_anim + walk_left_affine + clear_affine_anim step_end SootopolisCity_Movement_1E5BCF: @ 81E5BCF - step_40 - step_right - step_14 - step_14 - step_14 - step_41 + lock_facing_direction + walk_right + delay_16 + delay_16 + delay_16 + unlock_facing_direction step_end SootopolisCity_Movement_1E5BD6: @ 81E5BD6 - step_1b - step_1b - step_1b - step_1b - step_1b - step_1b + walk_in_place_slow_left + walk_in_place_slow_left + walk_in_place_slow_left + walk_in_place_slow_left + walk_in_place_slow_left + walk_in_place_slow_left step_end SootopolisCity_Movement_1E5BDD: @ 81E5BDD - step_1c - step_1c - step_1c - step_14 - step_14 - step_14 - step_18 + walk_in_place_slow_right + walk_in_place_slow_right + walk_in_place_slow_right + delay_16 + delay_16 + delay_16 + walk_fast_right step_end SootopolisCity_Movement_1E5BE5: @ 81E5BE5 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_18 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_fast_right step_end SootopolisCity_Movement_1E5BF0: @ 81E5BF0 - step_40 - step_left - step_14 - step_14 - step_14 - step_41 + lock_facing_direction + walk_left + delay_16 + delay_16 + delay_16 + unlock_facing_direction step_end SootopolisCity_Movement_1E5BF7: @ 81E5BF7 - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c + walk_in_place_slow_right + walk_in_place_slow_right + walk_in_place_slow_right + walk_in_place_slow_right + walk_in_place_slow_right + walk_in_place_slow_right step_end SootopolisCity_EventScript_1E5BFE:: @ 81E5BFE @@ -634,65 +634,65 @@ SootopolisCity_EventScript_1E5D82:: @ 81E5D82 return SootopolisCity_Movement_1E5E5B: @ 81E5E5B - step_16 - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e + walk_fast_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up step_end SootopolisCity_Movement_1E5E63: @ 81E5E63 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end SootopolisCity_Movement_1E5E68: @ 81E5E68 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end SootopolisCity_Movement_1E5E6D: @ 81E5E6D - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down step_end SootopolisCity_Movement_1E5E72: @ 81E5E72 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 - step_right - step_right - step_right - step_right + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_right + walk_right + walk_right + walk_right step_end SootopolisCity_Movement_1E5E7F: @ 81E5E7F - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_92 - step_92 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_slow_diag_southwest + walk_slow_diag_southwest step_end SootopolisCity_EventScript_1E5E8D:: @ 81E5E8D @@ -1004,267 +1004,267 @@ SootopolisCity_EventScript_1E6255:: @ 81E6255 return SootopolisCity_Movement_1E6267: @ 81E6267 - step_up - step_up - step_up - step_right - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_left - step_up - step_up - step_up - step_up - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_25 + walk_up + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down step_end SootopolisCity_Movement_1E628C: @ 81E628C - step_left - step_up - step_up - step_up - step_right - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_left - step_up - step_up - step_up - step_up - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up + walk_left + walk_up + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end SootopolisCity_Movement_1E62B0: @ 81E62B0 - step_up - step_up - step_up - step_up - step_right - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_left - step_up - step_up - step_up - step_up - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end SootopolisCity_Movement_1E62D4: @ 81E62D4 - step_up - step_up - step_right - step_right - step_right - step_right - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_up - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_12 - step_27 - step_14 - step_14 - step_right - step_up - step_up + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + delay_4 + walk_in_place_fastest_left + delay_16 + delay_16 + walk_right + walk_up + walk_up step_end SootopolisCity_Movement_1E630E: @ 81E630E - step_up - step_up - step_up - step_right - step_right - step_right - step_right - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_up - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_right - step_right - step_right + walk_up + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right step_end SootopolisCity_Movement_1E6341: @ 81E6341 - slow_step_left - step_28 + walk_slow_left + walk_in_place_fastest_right step_end SootopolisCity_Movement_1E6344: @ 81E6344 - step_down - step_down - step_left - step_13 - step_right - step_up - step_up - step_up - step_right - step_27 + walk_down + walk_down + walk_left + delay_8 + walk_right + walk_up + walk_up + walk_up + walk_right + walk_in_place_fastest_left step_end SootopolisCity_Movement_1E634F: @ 81E634F - step_14 - step_14 - step_14 - step_13 - step_right - step_right - step_up - step_up - step_up - step_28 + delay_16 + delay_16 + delay_16 + delay_8 + walk_right + walk_right + walk_up + walk_up + walk_up + walk_in_place_fastest_right step_end SootopolisCity_Movement_1E635A: @ 81E635A - step_up - step_up + walk_up + walk_up step_end SootopolisCity_EventScript_1E635D:: @ 81E635D @@ -1398,13 +1398,13 @@ SootopolisCity_EventScript_1E64E2:: @ 81E64E2 end SootopolisCity_Movement_1E64EC: @ 81E64EC - step_right - step_25 + walk_right + walk_in_place_fastest_down step_end SootopolisCity_Movement_1E64EF: @ 81E64EF - step_left - step_25 + walk_left + walk_in_place_fastest_down step_end SootopolisCity_EventScript_1E64F2:: @ 81E64F2 @@ -1454,11 +1454,11 @@ SootopolisCity_EventScript_1E654C:: @ 81E654C end SootopolisCity_Movement_1E656B:: @ 81E656B - step_98 + levitate step_end SootopolisCity_Movement_1E656D:: @ 81E656D - step_9A + destroy_extra_task step_end SootopolisCity_Text_1E656F: @ 81E656F diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 6a53dc57ca..02ac01f2b8 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -82,7 +82,7 @@ SootopolisCity_Gym_1F_EventScript_224F29:: @ 8224F29 end SootopolisCity_Gym_1F_Movement_224F42: @ 8224F42 - step_54 + set_invisible step_end SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44 diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc index 54ade51813..8d6b4631f4 100644 --- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc +++ b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc @@ -63,12 +63,12 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16:: @ 8227A16 return SootopolisCity_MysteryEventsHouse_1F_Movement_227A1F: @ 8227A1F - step_down + walk_down step_end SootopolisCity_MysteryEventsHouse_1F_Movement_227A21: @ 8227A21 - step_right - step_25 + walk_right + walk_in_place_fastest_down step_end SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24:: @ 8227A24 @@ -152,31 +152,31 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22:: @ 8227B22 return SootopolisCity_MysteryEventsHouse_1F_Movement_227B34: @ 8227B34 - step_14 - step_up - step_up + delay_16 + walk_up + walk_up step_end SootopolisCity_MysteryEventsHouse_1F_Movement_227B38: @ 8227B38 - step_14 - step_right - step_up + delay_16 + walk_right + walk_up step_end SootopolisCity_MysteryEventsHouse_1F_Movement_227B3C: @ 8227B3C - step_14 - step_left - step_up + delay_16 + walk_left + walk_up step_end SootopolisCity_MysteryEventsHouse_1F_Movement_227B40: @ 8227B40 - step_left - step_28 + walk_left + walk_in_place_fastest_right step_end SootopolisCity_MysteryEventsHouse_1F_Movement_227B43: @ 8227B43 - step_right - step_27 + walk_right + walk_in_place_fastest_left step_end SootopolisCity_MysteryEventsHouse_1F_Text_227B46: @ 8227B46 diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc index 5a4a097354..142a8e70e3 100644 --- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc +++ b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc @@ -59,20 +59,20 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8:: @ 8227EE8 return SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3: @ 8227EF3 - step_down - step_down - step_down - step_right - step_right + walk_down + walk_down + walk_down + walk_right + walk_right step_end SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9: @ 8227EF9 - step_left - step_left - step_up - step_up - step_up - step_up - step_13 + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + delay_8 step_end diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index 8784a6424f..bf57aa9ce6 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -41,12 +41,12 @@ BattleFrontier_OutsideWest_EventScript_242A2C:: @ 8242A2C return BattleFrontier_OutsideWest_Movement_242A37: @ 8242A37 - step_down + walk_down step_end BattleFrontier_OutsideWest_Movement_242A39: @ 8242A39 - step_left - step_25 + walk_left + walk_in_place_fastest_down step_end SouthernIsland_Exterior_EventScript_242A3C:: @ 8242A3C diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index f78f938caa..432667cc96 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -132,36 +132,36 @@ SouthernIsland_Interior_EventScript_242BB7:: @ 8242BB7 return SouthernIsland_Interior_Movement_242BCA: @ 8242BCA - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end SouthernIsland_Interior_Movement_242BCE: @ 8242BCE - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_down - step_down - step_down - step_26 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_in_place_fastest_up step_end SouthernIsland_Interior_Movement_242BDA: @ 8242BDA - step_down - step_down - step_down - step_down - step_down - step_14 - step_14 - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_down step_end diff --git a/data/scripts/maps/TerraCave_End.inc b/data/scripts/maps/TerraCave_End.inc index be532733d3..5152f85cf1 100644 --- a/data/scripts/maps/TerraCave_End.inc +++ b/data/scripts/maps/TerraCave_End.inc @@ -66,13 +66,13 @@ TerraCave_End_EventScript_23B163:: @ 823B163 end TerraCave_End_Movement_23B16E: @ 823B16E - step_5e - step_62 - step_14 - step_14 - step_63 - step_14 - step_14 - step_63 + init_affine_anim + walk_down_start_affine + delay_16 + delay_16 + walk_down_affine + delay_16 + delay_16 + walk_down_affine step_end diff --git a/data/scripts/maps/TrainerHill_Elevator.inc b/data/scripts/maps/TrainerHill_Elevator.inc index 7886f91b85..155c31877f 100644 --- a/data/scripts/maps/TrainerHill_Elevator.inc +++ b/data/scripts/maps/TrainerHill_Elevator.inc @@ -55,33 +55,33 @@ TrainerHill_Elevator_EventScript_2693D9:: @ 82693D9 return TrainerHill_Elevator_Movement_2693DF: @ 82693DF - step_up - step_up - step_right - step_00 + walk_up + walk_up + walk_right + face_down step_end TrainerHill_Elevator_Movement_2693E4: @ 82693E4 - step_14 - step_left + delay_16 + walk_left step_end TrainerHill_Elevator_Movement_2693E7: @ 82693E7 - step_14 - step_down - step_down + delay_16 + walk_down + walk_down step_end TrainerHill_Elevator_Movement_2693EB: @ 82693EB - step_00 - step_14 + face_down + delay_16 step_end TrainerHill_Elevator_Movement_2693EE: @ 82693EE - step_03 + face_right step_end TrainerHill_Elevator_Movement_2693F0: @ 82693F0 - step_00 + face_down step_end diff --git a/data/scripts/maps/TrainerHill_Entrance.inc b/data/scripts/maps/TrainerHill_Entrance.inc index 6dc934f3c5..84543ff2ba 100644 --- a/data/scripts/maps/TrainerHill_Entrance.inc +++ b/data/scripts/maps/TrainerHill_Entrance.inc @@ -217,20 +217,20 @@ TrainerHill_Entrance_EventScript_26836A:: @ 826836A end TrainerHill_Entrance_Movement_26837F: @ 826837F - step_03 + face_right step_end TrainerHill_Entrance_Movement_268381: @ 8268381 - step_down + walk_down step_end TrainerHill_Entrance_Movement_268383: @ 8268383 - step_01 + face_up step_end TrainerHill_Entrance_Movement_268385: @ 8268385 - step_down - step_down + walk_down + walk_down step_end TrainerHill_Entrance_EventScript_268388:: @ 8268388 diff --git a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc index 24c319337b..d7233a3aaf 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc @@ -172,29 +172,29 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20256C:: @ 820256C return VerdanturfTown_BattleTentBattleRoom_Movement_202573: @ 8202573 - step_54 + set_invisible step_end VerdanturfTown_BattleTentBattleRoom_Movement_202575: @ 8202575 - step_55 - step_up - step_up - step_up - step_03 + set_visible + walk_up + walk_up + walk_up + face_right step_end VerdanturfTown_BattleTentBattleRoom_Movement_20257B: @ 820257B - step_down - step_down - step_down - step_down - step_02 + walk_down + walk_down + walk_down + walk_down + face_left step_end VerdanturfTown_BattleTentBattleRoom_Movement_202581: @ 8202581 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end diff --git a/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc b/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc index 0d0470fc16..96bd1f1141 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc @@ -26,18 +26,18 @@ VerdanturfTown_BattleTentCorridor_EventScript_20209A:: @ 820209A end VerdanturfTown_BattleTentCorridor_Movement_2020DE: @ 82020DE - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end VerdanturfTown_BattleTentCorridor_Movement_2020E3: @ 82020E3 - step_up + walk_up VerdanturfTown_BattleTentCorridor_Movement_2020E4: @ 82020E4 - step_up - step_54 + walk_up + set_invisible step_end VerdanturfTown_BattleTentCorridor_Text_2020E7: @ 82020E7 diff --git a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc index 85c5f33c7c..468a34991c 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc @@ -258,20 +258,20 @@ VerdanturfTown_BattleTentLobby_EventScript_201A41:: @ 8201A41 return VerdanturfTown_BattleTentLobby_Movement_201A70: @ 8201A70 - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end VerdanturfTown_BattleTentLobby_Movement_201A74: @ 8201A74 - step_up - step_54 + walk_up + set_invisible step_end VerdanturfTown_BattleTentLobby_Movement_201A77: @ 8201A77 - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end VerdanturfTown_BattleTentLobby_EventScript_201A7B:: @ 8201A7B diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index 4dd00035ab..2ed1c6baff 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -51,30 +51,30 @@ VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1 end VictoryRoad_1F_Movement_235E15: @ 8235E15 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up step_end VictoryRoad_1F_Movement_235E21: @ 8235E21 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up step_end VictoryRoad_1F_EventScript_235E2C:: @ 8235E2C diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 8f8d493f8f..734831f7f6 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -32,7 +32,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292758:: @ 8292758 return LittlerootTown_BrendansHouse_1F_Movement_292763: @ 8292763 - step_up + walk_up step_end LittlerootTown_BrendansHouse_1F_EventScript_292765:: @ 8292765 @@ -119,33 +119,33 @@ LittlerootTown_BrendansHouse_2F_EventScript_292849:: @ 8292849 return LittlerootTown_BrendansHouse_2F_Movement_292850: @ 8292850 - step_13 - step_down - step_27 - step_14 - step_13 - step_left + delay_8 + walk_down + walk_in_place_fastest_left + delay_16 + delay_8 + walk_left step_end LittlerootTown_BrendansHouse_2F_Movement_292857: @ 8292857 - step_right - step_up - step_13 + walk_right + walk_up + delay_8 step_end LittlerootTown_BrendansHouse_2F_Movement_29285B: @ 829285B - step_13 - step_down - step_28 - step_14 - step_13 - step_right + delay_8 + walk_down + walk_in_place_fastest_right + delay_16 + delay_8 + walk_right step_end LittlerootTown_BrendansHouse_2F_Movement_292862: @ 8292862 - step_left - step_up - step_13 + walk_left + walk_up + delay_8 step_end LittlerootTown_BrendansHouse_1F_EventScript_292866:: @ 8292866 @@ -227,87 +227,87 @@ LittlerootTown_MaysHouse_1F_EventScript_29296C:: @ 829296C return LittlerootTown_BrendansHouse_1F_Movement_292989: @ 8292989 - step_up - step_right - step_right - step_right - step_right - step_down - step_28 + walk_up + walk_right + walk_right + walk_right + walk_right + walk_down + walk_in_place_fastest_right step_end LittlerootTown_BrendansHouse_1F_Movement_292991: @ 8292991 - step_up - step_left - step_left - step_left - step_left - step_down - step_27 + walk_up + walk_left + walk_left + walk_left + walk_left + walk_down + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_1F_Movement_292999: @ 8292999 - step_right + walk_right step_end LittlerootTown_BrendansHouse_1F_Movement_29299B: @ 829299B - step_left + walk_left step_end LittlerootTown_BrendansHouse_1F_Movement_29299D: @ 829299D - step_27 - step_14 - step_14 - step_14 - step_14 - step_28 - step_14 - step_14 + walk_in_place_fastest_left + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_right + delay_16 + delay_16 step_end LittlerootTown_BrendansHouse_1F_Movement_2929A6: @ 82929A6 - step_28 - step_14 - step_14 - step_14 - step_14 - step_27 - step_14 - step_14 + walk_in_place_fastest_right + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_left + delay_16 + delay_16 step_end LittlerootTown_BrendansHouse_1F_Movement_2929AF: @ 82929AF - step_up - step_left - step_left + walk_up + walk_left + walk_left step_end LittlerootTown_BrendansHouse_1F_Movement_2929B3: @ 82929B3 - step_up - step_right - step_right + walk_up + walk_right + walk_right step_end LittlerootTown_BrendansHouse_1F_Movement_2929B7: @ 82929B7 - step_left - step_28 + walk_left + walk_in_place_fastest_right step_end LittlerootTown_MaysHouse_1F_Movement_2929BA: @ 82929BA - step_right - step_27 + walk_right + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_1F_Movement_2929BD: @ 82929BD - step_left - step_down - step_28 + walk_left + walk_down + walk_in_place_fastest_right step_end LittlerootTown_MaysHouse_1F_Movement_2929C1: @ 82929C1 - step_right - step_down - step_27 + walk_right + walk_down + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_1F_EventScript_2929C5:: @ 82929C5 @@ -413,31 +413,31 @@ LittlerootTown_MaysHouse_1F_EventScript_292ACD:: @ 8292ACD end LittlerootTown_BrendansHouse_1F_Movement_292AE0: @ 8292AE0 - step_down - step_down - step_left - step_left - step_left + walk_down + walk_down + walk_left + walk_left + walk_left step_end LittlerootTown_BrendansHouse_1F_Movement_292AE6: @ 8292AE6 - step_left + walk_left step_end LittlerootTown_MaysHouse_1F_Movement_292AE8: @ 8292AE8 - step_down - step_down - step_right - step_right - step_right + walk_down + walk_down + walk_right + walk_right + walk_right step_end LittlerootTown_MaysHouse_1F_Movement_292AEE: @ 8292AEE - step_right + walk_right step_end LittlerootTown_BrendansHouse_1F_Movement_292AF0: @ 8292AF0 - step_up + walk_up step_end LittlerootTown_BrendansHouse_1F_EventScript_292AF2:: @ 8292AF2 @@ -641,74 +641,74 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D9D:: @ 8292D9D return LittlerootTown_BrendansHouse_1F_Movement_292DB2: @ 8292DB2 - step_right - step_right + walk_right + walk_right step_end LittlerootTown_BrendansHouse_1F_Movement_292DB5: @ 8292DB5 - step_left - step_left + walk_left + walk_left step_end LittlerootTown_BrendansHouse_1F_Movement_292DB8: @ 8292DB8 - step_02 + face_left step_end LittlerootTown_BrendansHouse_1F_Movement_292DBA: @ 8292DBA - step_03 + face_right step_end LittlerootTown_BrendansHouse_1F_Movement_292DBC: @ 8292DBC - step_down - step_right - step_down - step_13 + walk_down + walk_right + walk_down + delay_8 step_end LittlerootTown_BrendansHouse_1F_Movement_292DC1: @ 8292DC1 - step_down - step_left - step_down - step_13 + walk_down + walk_left + walk_down + delay_8 step_end LittlerootTown_BrendansHouse_1F_Movement_292DC6: @ 8292DC6 - step_14 - step_down - step_down - step_down - step_27 + delay_16 + walk_down + walk_down + walk_down + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_1F_Movement_292DCC: @ 8292DCC - step_13 - step_14 - step_14 - step_25 + delay_8 + delay_16 + delay_16 + walk_in_place_fastest_down step_end LittlerootTown_BrendansHouse_1F_Movement_292DD1: @ 8292DD1 - step_14 - step_down - step_down - step_down - step_28 + delay_16 + walk_down + walk_down + walk_down + walk_in_place_fastest_right step_end LittlerootTown_BrendansHouse_1F_Movement_292DD7: @ 8292DD7 - step_up - step_left - step_left - step_left - step_left - step_26 + walk_up + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end LittlerootTown_BrendansHouse_1F_Movement_292DDE: @ 8292DDE - step_up - step_right - step_right - step_right - step_right - step_26 + walk_up + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 9d4aa80b6c..9c4b46ae21 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -559,7 +559,7 @@ LilycoveCity_ContestLobby_EventScript_294032:: @ 8294032 end LilycoveCity_ContestLobby_Movement_294053: @ 8294053 - step_28 + walk_in_place_fastest_right step_end LilycoveCity_ContestLobby_EventScript_294055:: @ 8294055 diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index c75fb9b483..76a4ee8f14 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -77,31 +77,31 @@ Route111_EventScript_276680:: @ 8276680 end Route111_Movement_27668A: @ 827668A - step_down - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down step_end Route111_Movement_276696: @ 8276696 - step_left - step_down - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_down - step_down + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_down + walk_down step_end EventScript_2766A2:: @ 82766A2 From 7a9c9bee854a77adf2e06ba4608ebc770a431a5f Mon Sep 17 00:00:00 2001 From: Avara <31101124+Mother-Of-Dragons@users.noreply.github.com> Date: Thu, 14 Jun 2018 14:34:19 +0100 Subject: [PATCH 13/55] tileset_anims.c typo fix --- src/tileset_anims.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tileset_anims.c b/src/tileset_anims.c index ebdea4b867..aaa05bcc82 100644 --- a/src/tileset_anims.c +++ b/src/tileset_anims.c @@ -121,13 +121,13 @@ const u16 gTilesetAnims_General4_Frame1[] = INCBIN_U16("data/tilesets/primary/ge const u16 gTilesetAnims_General4_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/4/2.4bpp"); -const u16 gTilesetAnims_General4_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/4/3.4bpp"); +const u16 gTilesetAnims_General4_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/4/3.4bpp"); const u16 *const gTilesetAnims_General4[] = { gTilesetAnims_General4_Frame0, gTilesetAnims_General4_Frame1, gTilesetAnims_General4_Frame2, - gTilesetAnims_General4_Frame4 + gTilesetAnims_General4_Frame3 }; const u16 gTilesetAnims_Lavaridge0_Frame0[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/0.4bpp"); From acc1a5d4461476567facf08ee0fa64e28cdd3c76 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 14 Jun 2018 22:00:09 -0500 Subject: [PATCH 14/55] Get all map constants from include/ rather than constants/ --- asm/macros/map.inc | 43 +- constants/constants.inc | 1 - constants/map_constants.inc | 588 ------------------ data/event_scripts.s | 41 +- data/map_events.s | 3 +- data/maps.s | 1 + .../connections.inc | 2 +- .../connections.inc | 2 +- data/maps/DewfordTown/connections.inc | 4 +- data/maps/EverGrandeCity/connections.inc | 2 +- data/maps/FallarborTown/connections.inc | 4 +- data/maps/FortreeCity/connections.inc | 4 +- data/maps/LavaridgeTown/connections.inc | 2 +- data/maps/LilycoveCity/connections.inc | 4 +- data/maps/LittlerootTown/connections.inc | 2 +- data/maps/MauvilleCity/connections.inc | 8 +- data/maps/MossdeepCity/connections.inc | 6 +- data/maps/OldaleTown/connections.inc | 6 +- data/maps/PacifidlogTown/connections.inc | 4 +- data/maps/PetalburgCity/connections.inc | 4 +- data/maps/Route101/connections.inc | 4 +- data/maps/Route102/connections.inc | 4 +- data/maps/Route103/connections.inc | 4 +- data/maps/Route104/connections.inc | 6 +- data/maps/Route105/connections.inc | 6 +- data/maps/Route106/connections.inc | 4 +- data/maps/Route107/connections.inc | 4 +- data/maps/Route108/connections.inc | 4 +- data/maps/Route109/connections.inc | 4 +- data/maps/Route110/connections.inc | 6 +- data/maps/Route111/connections.inc | 6 +- data/maps/Route112/connections.inc | 6 +- data/maps/Route113/connections.inc | 6 +- data/maps/Route114/connections.inc | 4 +- data/maps/Route115/connections.inc | 4 +- data/maps/Route116/connections.inc | 4 +- data/maps/Route117/connections.inc | 4 +- data/maps/Route118/connections.inc | 6 +- data/maps/Route119/connections.inc | 4 +- data/maps/Route120/connections.inc | 4 +- data/maps/Route121/connections.inc | 6 +- data/maps/Route122/connections.inc | 4 +- data/maps/Route123/connections.inc | 4 +- data/maps/Route124/connections.inc | 10 +- data/maps/Route125/connections.inc | 6 +- data/maps/Route126/connections.inc | 6 +- data/maps/Route127/connections.inc | 8 +- data/maps/Route128/connections.inc | 8 +- data/maps/Route129/connections.inc | 6 +- data/maps/Route130/connections.inc | 4 +- data/maps/Route131/connections.inc | 4 +- data/maps/Route132/connections.inc | 4 +- data/maps/Route133/connections.inc | 4 +- data/maps/Route134/connections.inc | 4 +- data/maps/RustboroCity/connections.inc | 6 +- data/maps/SafariZone_North/connections.inc | 6 +- .../maps/SafariZone_Northeast/connections.inc | 4 +- .../maps/SafariZone_Northwest/connections.inc | 4 +- data/maps/SafariZone_South/connections.inc | 6 +- .../maps/SafariZone_Southeast/connections.inc | 4 +- .../maps/SafariZone_Southwest/connections.inc | 4 +- data/maps/SlateportCity/connections.inc | 6 +- data/maps/Underwater1/connections.inc | 4 +- data/maps/Underwater2/connections.inc | 6 +- data/maps/Underwater3/connections.inc | 6 +- data/maps/Underwater4/connections.inc | 4 +- data/maps/Underwater5/connections.inc | 2 +- data/maps/Underwater6/connections.inc | 2 +- data/maps/Underwater7/connections.inc | 2 +- data/maps/VerdanturfTown/connections.inc | 4 +- .../events/AbandonedShip_CaptainsOffice.inc | 4 +- .../events/AbandonedShip_Corridors_1F.inc | 24 +- .../events/AbandonedShip_Corridors_B1F.inc | 16 +- data/maps/events/AbandonedShip_Deck.inc | 10 +- .../AbandonedShip_HiddenFloorCorridors.inc | 12 +- .../events/AbandonedShip_HiddenFloorRooms.inc | 18 +- data/maps/events/AbandonedShip_Room_B1F.inc | 4 +- data/maps/events/AbandonedShip_Rooms2_1F.inc | 6 +- data/maps/events/AbandonedShip_Rooms2_B1F.inc | 8 +- data/maps/events/AbandonedShip_Rooms_1F.inc | 12 +- data/maps/events/AbandonedShip_Rooms_B1F.inc | 6 +- .../maps/events/AbandonedShip_Underwater1.inc | 4 +- .../maps/events/AbandonedShip_Underwater2.inc | 2 +- data/maps/events/AlteringCave.inc | 2 +- data/maps/events/AncientTomb.inc | 6 +- data/maps/events/AquaHideout_1F.inc | 6 +- data/maps/events/AquaHideout_B1F.inc | 50 +- data/maps/events/AquaHideout_B2F.inc | 20 +- data/maps/events/ArtisanCave_1F.inc | 4 +- data/maps/events/ArtisanCave_B1F.inc | 4 +- .../BattleFrontier_BattleArenaLobby.inc | 2 +- .../BattleFrontier_BattleDomeCorridor.inc | 4 +- .../events/BattleFrontier_BattleDomeLobby.inc | 4 +- ...BattleFrontier_BattleDomePreBattleRoom.inc | 4 +- .../BattleFrontier_BattleFactoryLobby.inc | 4 +- .../BattleFrontier_BattlePalaceBattleRoom.inc | 4 +- .../BattleFrontier_BattlePalaceCorridor.inc | 8 +- .../BattleFrontier_BattlePalaceLobby.inc | 6 +- .../events/BattleFrontier_BattlePikeLobby.inc | 6 +- ...ntier_BattlePointExchangeServiceCorner.inc | 6 +- .../BattleFrontier_BattlePyramidLobby.inc | 2 +- .../BattleFrontier_BattleTowerBattleRoom.inc | 4 +- .../BattleFrontier_BattleTowerLobby.inc | 6 +- data/maps/events/BattleFrontier_Lounge1.inc | 2 +- data/maps/events/BattleFrontier_Lounge2.inc | 4 +- data/maps/events/BattleFrontier_Lounge3.inc | 2 +- data/maps/events/BattleFrontier_Lounge4.inc | 2 +- data/maps/events/BattleFrontier_Lounge5.inc | 4 +- data/maps/events/BattleFrontier_Lounge6.inc | 2 +- data/maps/events/BattleFrontier_Lounge7.inc | 2 +- data/maps/events/BattleFrontier_Lounge8.inc | 2 +- data/maps/events/BattleFrontier_Lounge9.inc | 4 +- data/maps/events/BattleFrontier_Mart.inc | 4 +- .../events/BattleFrontier_OutsideEast.inc | 28 +- .../events/BattleFrontier_OutsideWest.inc | 22 +- .../BattleFrontier_PokemonCenter_1F.inc | 6 +- .../BattleFrontier_PokemonCenter_2F.inc | 6 +- .../events/BattleFrontier_RankingHall.inc | 4 +- .../events/BattleFrontier_ReceptionGate.inc | 4 +- .../events/BattleFrontier_ScottsHouse.inc | 4 +- data/maps/events/BirthIsland_Exterior.inc | 2 +- data/maps/events/BirthIsland_Harbor.inc | 2 +- data/maps/events/CaveOfOrigin_1F.inc | 4 +- data/maps/events/CaveOfOrigin_B1F.inc | 2 +- data/maps/events/CaveOfOrigin_Entrance.inc | 4 +- .../CaveOfOrigin_UnusedRubySapphireMap1.inc | 4 +- .../CaveOfOrigin_UnusedRubySapphireMap2.inc | 4 +- .../CaveOfOrigin_UnusedRubySapphireMap3.inc | 4 +- data/maps/events/DesertRuins.inc | 6 +- data/maps/events/DesertUnderpass.inc | 2 +- data/maps/events/DewfordTown.inc | 10 +- data/maps/events/DewfordTown_Gym.inc | 4 +- data/maps/events/DewfordTown_Hall.inc | 4 +- data/maps/events/DewfordTown_House1.inc | 4 +- data/maps/events/DewfordTown_House2.inc | 4 +- .../events/DewfordTown_PokemonCenter_1F.inc | 6 +- .../events/DewfordTown_PokemonCenter_2F.inc | 6 +- data/maps/events/DoubleBattleColosseum.inc | 8 +- data/maps/events/EverGrandeCity.inc | 8 +- .../events/EverGrandeCity_ChampionsRoom.inc | 4 +- .../maps/events/EverGrandeCity_DrakesRoom.inc | 4 +- .../events/EverGrandeCity_GlaciasRoom.inc | 4 +- data/maps/events/EverGrandeCity_Hall1.inc | 8 +- data/maps/events/EverGrandeCity_Hall2.inc | 8 +- data/maps/events/EverGrandeCity_Hall3.inc | 8 +- data/maps/events/EverGrandeCity_Hall4.inc | 4 +- data/maps/events/EverGrandeCity_Hall5.inc | 8 +- .../maps/events/EverGrandeCity_HallOfFame.inc | 2 +- .../events/EverGrandeCity_PhoebesRoom.inc | 4 +- .../EverGrandeCity_PokemonCenter_1F.inc | 6 +- .../EverGrandeCity_PokemonCenter_2F.inc | 6 +- .../EverGrandeCity_PokemonLeague_1F.inc | 10 +- .../EverGrandeCity_PokemonLeague_2F.inc | 6 +- .../events/EverGrandeCity_SidneysRoom.inc | 4 +- data/maps/events/FallarborTown.inc | 10 +- .../events/FallarborTown_BattleTentLobby.inc | 4 +- data/maps/events/FallarborTown_House1.inc | 4 +- data/maps/events/FallarborTown_House2.inc | 4 +- data/maps/events/FallarborTown_Mart.inc | 4 +- .../events/FallarborTown_PokemonCenter_1F.inc | 6 +- .../events/FallarborTown_PokemonCenter_2F.inc | 6 +- data/maps/events/FarawayIsland_Entrance.inc | 4 +- data/maps/events/FarawayIsland_Interior.inc | 4 +- data/maps/events/FieryPath.inc | 4 +- data/maps/events/FortreeCity.inc | 18 +- .../events/FortreeCity_DecorationShop.inc | 4 +- data/maps/events/FortreeCity_Gym.inc | 4 +- data/maps/events/FortreeCity_House1.inc | 4 +- data/maps/events/FortreeCity_House2.inc | 4 +- data/maps/events/FortreeCity_House3.inc | 4 +- data/maps/events/FortreeCity_House4.inc | 4 +- data/maps/events/FortreeCity_House5.inc | 4 +- data/maps/events/FortreeCity_Mart.inc | 4 +- .../events/FortreeCity_PokemonCenter_1F.inc | 6 +- .../events/FortreeCity_PokemonCenter_2F.inc | 6 +- data/maps/events/GraniteCave_1F.inc | 8 +- data/maps/events/GraniteCave_B1F.inc | 14 +- data/maps/events/GraniteCave_B2F.inc | 10 +- data/maps/events/GraniteCave_StevensRoom.inc | 2 +- data/maps/events/InsideOfTruck.inc | 6 +- data/maps/events/IslandCave.inc | 6 +- data/maps/events/JaggedPass.inc | 10 +- data/maps/events/LavaridgeTown.inc | 12 +- data/maps/events/LavaridgeTown_Gym_1F.inc | 52 +- data/maps/events/LavaridgeTown_Gym_B1F.inc | 48 +- data/maps/events/LavaridgeTown_HerbShop.inc | 4 +- data/maps/events/LavaridgeTown_House.inc | 4 +- data/maps/events/LavaridgeTown_Mart.inc | 4 +- .../events/LavaridgeTown_PokemonCenter_1F.inc | 8 +- .../events/LavaridgeTown_PokemonCenter_2F.inc | 6 +- data/maps/events/LilycoveCity.inc | 28 +- data/maps/events/LilycoveCity_ContestHall.inc | 8 +- .../maps/events/LilycoveCity_ContestLobby.inc | 8 +- .../events/LilycoveCity_CoveLilyMotel_1F.inc | 6 +- .../events/LilycoveCity_CoveLilyMotel_2F.inc | 2 +- .../LilycoveCity_DepartmentStoreElevator.inc | 4 +- .../LilycoveCity_DepartmentStoreRooftop.inc | 2 +- .../LilycoveCity_DepartmentStore_1F.inc | 8 +- .../LilycoveCity_DepartmentStore_2F.inc | 6 +- .../LilycoveCity_DepartmentStore_3F.inc | 6 +- .../LilycoveCity_DepartmentStore_4F.inc | 6 +- .../LilycoveCity_DepartmentStore_5F.inc | 6 +- data/maps/events/LilycoveCity_Harbor.inc | 4 +- data/maps/events/LilycoveCity_House1.inc | 4 +- data/maps/events/LilycoveCity_House2.inc | 4 +- data/maps/events/LilycoveCity_House3.inc | 4 +- data/maps/events/LilycoveCity_House4.inc | 4 +- .../events/LilycoveCity_LilycoveMuseum_1F.inc | 6 +- .../events/LilycoveCity_LilycoveMuseum_2F.inc | 2 +- .../events/LilycoveCity_MoveDeletersHouse.inc | 4 +- .../events/LilycoveCity_PokemonCenter_1F.inc | 6 +- .../events/LilycoveCity_PokemonCenter_2F.inc | 6 +- .../LilycoveCity_PokemonTrainerFanClub.inc | 4 +- data/maps/events/LilycoveCity_UnusedMart.inc | 4 +- data/maps/events/LittlerootTown.inc | 6 +- .../LittlerootTown_BrendansHouse_1F.inc | 6 +- .../LittlerootTown_BrendansHouse_2F.inc | 2 +- .../events/LittlerootTown_MaysHouse_1F.inc | 6 +- .../events/LittlerootTown_MaysHouse_2F.inc | 2 +- .../LittlerootTown_ProfessorBirchsLab.inc | 4 +- data/maps/events/MagmaHideout_1F.inc | 8 +- data/maps/events/MagmaHideout_2F_1R.inc | 6 +- data/maps/events/MagmaHideout_2F_2R.inc | 4 +- data/maps/events/MagmaHideout_2F_3R.inc | 4 +- data/maps/events/MagmaHideout_3F_1R.inc | 6 +- data/maps/events/MagmaHideout_3F_2R.inc | 2 +- data/maps/events/MagmaHideout_3F_3R.inc | 4 +- data/maps/events/MagmaHideout_4F.inc | 4 +- data/maps/events/MarineCave_End.inc | 2 +- data/maps/events/MarineCave_Entrance.inc | 2 +- data/maps/events/MauvilleCity.inc | 14 +- data/maps/events/MauvilleCity_BikeShop.inc | 4 +- data/maps/events/MauvilleCity_GameCorner.inc | 4 +- data/maps/events/MauvilleCity_Gym.inc | 4 +- data/maps/events/MauvilleCity_House1.inc | 4 +- data/maps/events/MauvilleCity_House2.inc | 4 +- data/maps/events/MauvilleCity_Mart.inc | 4 +- .../events/MauvilleCity_PokemonCenter_1F.inc | 6 +- .../events/MauvilleCity_PokemonCenter_2F.inc | 6 +- data/maps/events/MeteorFalls_1F_1R.inc | 12 +- data/maps/events/MeteorFalls_1F_2R.inc | 8 +- data/maps/events/MeteorFalls_B1F_1R.inc | 12 +- data/maps/events/MeteorFalls_B1F_2R.inc | 2 +- data/maps/events/MeteorFalls_StevensCave.inc | 2 +- data/maps/events/MirageTower_1F.inc | 4 +- data/maps/events/MirageTower_2F.inc | 4 +- data/maps/events/MirageTower_3F.inc | 4 +- data/maps/events/MirageTower_4F.inc | 2 +- data/maps/events/MossdeepCity.inc | 20 +- .../events/MossdeepCity_GameCorner_1F.inc | 6 +- .../events/MossdeepCity_GameCorner_B1F.inc | 2 +- data/maps/events/MossdeepCity_Gym.inc | 28 +- data/maps/events/MossdeepCity_House1.inc | 4 +- data/maps/events/MossdeepCity_House2.inc | 4 +- data/maps/events/MossdeepCity_House3.inc | 4 +- data/maps/events/MossdeepCity_House4.inc | 4 +- data/maps/events/MossdeepCity_Mart.inc | 4 +- .../events/MossdeepCity_PokemonCenter_1F.inc | 6 +- .../events/MossdeepCity_PokemonCenter_2F.inc | 6 +- .../events/MossdeepCity_SpaceCenter_1F.inc | 6 +- .../events/MossdeepCity_SpaceCenter_2F.inc | 2 +- .../maps/events/MossdeepCity_StevensHouse.inc | 4 +- data/maps/events/MtChimney.inc | 8 +- .../maps/events/MtChimney_CableCarStation.inc | 4 +- data/maps/events/MtPyre_1F.inc | 12 +- data/maps/events/MtPyre_2F.inc | 10 +- data/maps/events/MtPyre_3F.inc | 12 +- data/maps/events/MtPyre_4F.inc | 12 +- data/maps/events/MtPyre_5F.inc | 10 +- data/maps/events/MtPyre_6F.inc | 4 +- data/maps/events/MtPyre_Exterior.inc | 6 +- data/maps/events/MtPyre_Summit.inc | 6 +- data/maps/events/NavelRock_B1F.inc | 4 +- data/maps/events/NavelRock_Bottom.inc | 2 +- data/maps/events/NavelRock_Down01.inc | 4 +- data/maps/events/NavelRock_Down02.inc | 4 +- data/maps/events/NavelRock_Down03.inc | 4 +- data/maps/events/NavelRock_Down04.inc | 4 +- data/maps/events/NavelRock_Down05.inc | 4 +- data/maps/events/NavelRock_Down06.inc | 4 +- data/maps/events/NavelRock_Down07.inc | 4 +- data/maps/events/NavelRock_Down08.inc | 4 +- data/maps/events/NavelRock_Down09.inc | 4 +- data/maps/events/NavelRock_Down10.inc | 4 +- data/maps/events/NavelRock_Down11.inc | 4 +- data/maps/events/NavelRock_Entrance.inc | 4 +- data/maps/events/NavelRock_Exterior.inc | 4 +- data/maps/events/NavelRock_Fork.inc | 6 +- data/maps/events/NavelRock_Harbor.inc | 2 +- data/maps/events/NavelRock_Top.inc | 2 +- data/maps/events/NavelRock_Up1.inc | 4 +- data/maps/events/NavelRock_Up2.inc | 4 +- data/maps/events/NavelRock_Up3.inc | 4 +- data/maps/events/NavelRock_Up4.inc | 4 +- data/maps/events/NewMauville_Entrance.inc | 4 +- data/maps/events/NewMauville_Inside.inc | 2 +- data/maps/events/OldaleTown.inc | 8 +- data/maps/events/OldaleTown_House1.inc | 4 +- data/maps/events/OldaleTown_House2.inc | 4 +- data/maps/events/OldaleTown_Mart.inc | 4 +- .../events/OldaleTown_PokemonCenter_1F.inc | 6 +- .../events/OldaleTown_PokemonCenter_2F.inc | 6 +- data/maps/events/PacifidlogTown.inc | 12 +- data/maps/events/PacifidlogTown_House1.inc | 4 +- data/maps/events/PacifidlogTown_House2.inc | 4 +- data/maps/events/PacifidlogTown_House3.inc | 4 +- data/maps/events/PacifidlogTown_House4.inc | 4 +- data/maps/events/PacifidlogTown_House5.inc | 4 +- .../PacifidlogTown_PokemonCenter_1F.inc | 6 +- .../PacifidlogTown_PokemonCenter_2F.inc | 6 +- data/maps/events/PetalburgCity.inc | 12 +- data/maps/events/PetalburgCity_Gym.inc | 76 +-- data/maps/events/PetalburgCity_House1.inc | 4 +- data/maps/events/PetalburgCity_House2.inc | 4 +- data/maps/events/PetalburgCity_Mart.inc | 4 +- .../events/PetalburgCity_PokemonCenter_1F.inc | 6 +- .../events/PetalburgCity_PokemonCenter_2F.inc | 6 +- .../maps/events/PetalburgCity_WallysHouse.inc | 4 +- data/maps/events/PetalburgWoods.inc | 12 +- data/maps/events/RecordCorner.inc | 8 +- data/maps/events/Route103.inc | 2 +- data/maps/events/Route104.inc | 16 +- data/maps/events/Route104_MrBrineysHouse.inc | 4 +- .../events/Route104_PrettyPetalFlowerShop.inc | 4 +- data/maps/events/Route105.inc | 2 +- data/maps/events/Route106.inc | 2 +- data/maps/events/Route108.inc | 2 +- data/maps/events/Route109.inc | 2 +- data/maps/events/Route109_SeashoreHouse.inc | 4 +- data/maps/events/Route110.inc | 12 +- .../Route110_SeasideCyclingRoadEntrance1.inc | 8 +- .../Route110_SeasideCyclingRoadEntrance2.inc | 8 +- .../events/Route110_TrickHouseCorridor.inc | 8 +- data/maps/events/Route110_TrickHouseEnd.inc | 4 +- .../events/Route110_TrickHouseEntrance.inc | 6 +- .../events/Route110_TrickHousePuzzle1.inc | 6 +- .../events/Route110_TrickHousePuzzle2.inc | 6 +- .../events/Route110_TrickHousePuzzle3.inc | 6 +- .../events/Route110_TrickHousePuzzle4.inc | 6 +- .../events/Route110_TrickHousePuzzle5.inc | 6 +- .../events/Route110_TrickHousePuzzle6.inc | 6 +- .../events/Route110_TrickHousePuzzle7.inc | 26 +- .../events/Route110_TrickHousePuzzle8.inc | 6 +- data/maps/events/Route111.inc | 10 +- .../maps/events/Route111_OldLadysRestStop.inc | 4 +- .../events/Route111_WinstrateFamilysHouse.inc | 4 +- data/maps/events/Route112.inc | 12 +- data/maps/events/Route112_CableCarStation.inc | 4 +- data/maps/events/Route113.inc | 6 +- data/maps/events/Route113_GlassWorkshop.inc | 4 +- data/maps/events/Route114.inc | 10 +- .../events/Route114_FossilManiacsHouse.inc | 6 +- .../events/Route114_FossilManiacsTunnel.inc | 6 +- data/maps/events/Route114_LanettesHouse.inc | 4 +- data/maps/events/Route115.inc | 6 +- data/maps/events/Route116.inc | 10 +- .../events/Route116_TunnelersRestHouse.inc | 4 +- data/maps/events/Route117.inc | 2 +- data/maps/events/Route117_PokemonDayCare.inc | 4 +- data/maps/events/Route118.inc | 4 +- data/maps/events/Route119.inc | 4 +- data/maps/events/Route119_House.inc | 4 +- .../events/Route119_WeatherInstitute_1F.inc | 6 +- .../events/Route119_WeatherInstitute_2F.inc | 2 +- data/maps/events/Route120.inc | 4 +- data/maps/events/Route121.inc | 2 +- .../events/Route121_SafariZoneEntrance.inc | 8 +- data/maps/events/Route122.inc | 2 +- data/maps/events/Route123.inc | 2 +- .../events/Route123_BerryMastersHouse.inc | 4 +- data/maps/events/Route124.inc | 2 +- .../Route124_DivingTreasureHuntersHouse.inc | 4 +- data/maps/events/Route125.inc | 2 +- data/maps/events/Route131.inc | 2 +- data/maps/events/RustboroCity.inc | 24 +- .../maps/events/RustboroCity_CuttersHouse.inc | 4 +- .../maps/events/RustboroCity_DevonCorp_1F.inc | 6 +- .../maps/events/RustboroCity_DevonCorp_2F.inc | 4 +- .../maps/events/RustboroCity_DevonCorp_3F.inc | 2 +- data/maps/events/RustboroCity_Flat1_1F.inc | 6 +- data/maps/events/RustboroCity_Flat1_2F.inc | 2 +- data/maps/events/RustboroCity_Flat2_1F.inc | 6 +- data/maps/events/RustboroCity_Flat2_2F.inc | 4 +- data/maps/events/RustboroCity_Flat2_3F.inc | 2 +- data/maps/events/RustboroCity_Gym.inc | 4 +- data/maps/events/RustboroCity_House1.inc | 4 +- data/maps/events/RustboroCity_House2.inc | 4 +- data/maps/events/RustboroCity_House3.inc | 4 +- data/maps/events/RustboroCity_Mart.inc | 4 +- .../events/RustboroCity_PokemonCenter_1F.inc | 6 +- .../events/RustboroCity_PokemonCenter_2F.inc | 6 +- .../events/RustboroCity_PokemonSchool.inc | 4 +- data/maps/events/RusturfTunnel.inc | 6 +- data/maps/events/SSTidalCorridor.inc | 18 +- data/maps/events/SSTidalLowerDeck.inc | 2 +- data/maps/events/SSTidalRooms.inc | 24 +- data/maps/events/SafariZone_RestHouse.inc | 4 +- data/maps/events/SafariZone_South.inc | 2 +- data/maps/events/SafariZone_Southwest.inc | 2 +- data/maps/events/ScorchedSlab.inc | 2 +- data/maps/events/SeafloorCavern_Entrance.inc | 4 +- data/maps/events/SeafloorCavern_Room1.inc | 6 +- data/maps/events/SeafloorCavern_Room2.inc | 8 +- data/maps/events/SeafloorCavern_Room3.inc | 6 +- data/maps/events/SeafloorCavern_Room4.inc | 8 +- data/maps/events/SeafloorCavern_Room5.inc | 6 +- data/maps/events/SeafloorCavern_Room6.inc | 6 +- data/maps/events/SeafloorCavern_Room7.inc | 4 +- data/maps/events/SeafloorCavern_Room8.inc | 4 +- data/maps/events/SeafloorCavern_Room9.inc | 2 +- data/maps/events/SealedChamber_InnerRoom.inc | 2 +- data/maps/events/SealedChamber_OuterRoom.inc | 2 +- data/maps/events/SecretBase_BlueCave1.inc | 2 +- data/maps/events/SecretBase_BlueCave2.inc | 2 +- data/maps/events/SecretBase_BlueCave3.inc | 2 +- data/maps/events/SecretBase_BlueCave4.inc | 2 +- data/maps/events/SecretBase_BrownCave1.inc | 2 +- data/maps/events/SecretBase_BrownCave2.inc | 2 +- data/maps/events/SecretBase_BrownCave3.inc | 2 +- data/maps/events/SecretBase_BrownCave4.inc | 2 +- data/maps/events/SecretBase_RedCave1.inc | 2 +- data/maps/events/SecretBase_RedCave2.inc | 2 +- data/maps/events/SecretBase_RedCave3.inc | 2 +- data/maps/events/SecretBase_RedCave4.inc | 2 +- data/maps/events/SecretBase_Shrub1.inc | 2 +- data/maps/events/SecretBase_Shrub2.inc | 2 +- data/maps/events/SecretBase_Shrub3.inc | 2 +- data/maps/events/SecretBase_Shrub4.inc | 2 +- data/maps/events/SecretBase_Tree1.inc | 2 +- data/maps/events/SecretBase_Tree2.inc | 2 +- data/maps/events/SecretBase_Tree3.inc | 2 +- data/maps/events/SecretBase_Tree4.inc | 2 +- data/maps/events/SecretBase_YellowCave1.inc | 2 +- data/maps/events/SecretBase_YellowCave2.inc | 2 +- data/maps/events/SecretBase_YellowCave3.inc | 2 +- data/maps/events/SecretBase_YellowCave4.inc | 2 +- .../events/ShoalCave_LowTideEntranceRoom.inc | 8 +- data/maps/events/ShoalCave_LowTideIceRoom.inc | 2 +- .../events/ShoalCave_LowTideInnerRoom.inc | 16 +- .../events/ShoalCave_LowTideLowerRoom.inc | 8 +- .../events/ShoalCave_LowTideStairsRoom.inc | 4 +- data/maps/events/SingleBattleColosseum.inc | 4 +- data/maps/events/SkyPillar_1F.inc | 6 +- data/maps/events/SkyPillar_2F.inc | 4 +- data/maps/events/SkyPillar_3F.inc | 6 +- data/maps/events/SkyPillar_4F.inc | 6 +- data/maps/events/SkyPillar_5F.inc | 4 +- data/maps/events/SkyPillar_Entrance.inc | 4 +- data/maps/events/SkyPillar_Outside.inc | 4 +- data/maps/events/SkyPillar_Top.inc | 2 +- data/maps/events/SlateportCity.inc | 22 +- .../events/SlateportCity_BattleTentLobby.inc | 4 +- data/maps/events/SlateportCity_Harbor.inc | 8 +- data/maps/events/SlateportCity_House1.inc | 4 +- data/maps/events/SlateportCity_House2.inc | 4 +- data/maps/events/SlateportCity_Mart.inc | 4 +- .../events/SlateportCity_OceanicMuseum_1F.inc | 6 +- .../events/SlateportCity_OceanicMuseum_2F.inc | 2 +- .../events/SlateportCity_PokemonCenter_1F.inc | 6 +- .../events/SlateportCity_PokemonCenter_2F.inc | 6 +- .../events/SlateportCity_PokemonFanClub.inc | 4 +- .../SlateportCity_SternsShipyard_1F.inc | 6 +- .../SlateportCity_SternsShipyard_2F.inc | 2 +- data/maps/events/SootopolisCity.inc | 26 +- data/maps/events/SootopolisCity_Gym_1F.inc | 6 +- data/maps/events/SootopolisCity_Gym_B1F.inc | 2 +- data/maps/events/SootopolisCity_House1.inc | 4 +- data/maps/events/SootopolisCity_House2.inc | 4 +- data/maps/events/SootopolisCity_House3.inc | 4 +- data/maps/events/SootopolisCity_House4.inc | 4 +- data/maps/events/SootopolisCity_House5.inc | 4 +- data/maps/events/SootopolisCity_House6.inc | 4 +- data/maps/events/SootopolisCity_House7.inc | 4 +- .../SootopolisCity_LotadAndSeedotHouse.inc | 4 +- data/maps/events/SootopolisCity_Mart.inc | 4 +- .../SootopolisCity_MysteryEventsHouse_1F.inc | 6 +- .../SootopolisCity_MysteryEventsHouse_B1F.inc | 2 +- .../SootopolisCity_PokemonCenter_1F.inc | 6 +- .../SootopolisCity_PokemonCenter_2F.inc | 6 +- data/maps/events/SouthernIsland_Exterior.inc | 4 +- data/maps/events/SouthernIsland_Interior.inc | 4 +- data/maps/events/TerraCave_End.inc | 2 +- data/maps/events/TerraCave_Entrance.inc | 4 +- data/maps/events/TradeCenter.inc | 4 +- data/maps/events/TrainerHill_1F.inc | 4 +- data/maps/events/TrainerHill_2F.inc | 4 +- data/maps/events/TrainerHill_3F.inc | 4 +- data/maps/events/TrainerHill_4F.inc | 4 +- data/maps/events/TrainerHill_Elevator.inc | 4 +- data/maps/events/TrainerHill_Entrance.inc | 6 +- data/maps/events/TrainerHill_Roof.inc | 4 +- data/maps/events/Underwater2.inc | 2 +- data/maps/events/Underwater3.inc | 4 +- data/maps/events/Underwater4.inc | 2 +- data/maps/events/Underwater5.inc | 4 +- data/maps/events/Underwater6.inc | 4 +- data/maps/events/Underwater7.inc | 4 +- data/maps/events/Underwater_MarineCave.inc | 2 +- data/maps/events/Underwater_Route134.inc | 2 +- .../maps/events/Underwater_SeafloorCavern.inc | 2 +- data/maps/events/Underwater_SealedChamber.inc | 2 +- .../maps/events/Underwater_SootopolisCity.inc | 4 +- data/maps/events/UnionRoom.inc | 4 +- data/maps/events/VerdanturfTown.inc | 14 +- .../events/VerdanturfTown_BattleTentLobby.inc | 4 +- .../VerdanturfTown_FriendshipRatersHouse.inc | 4 +- data/maps/events/VerdanturfTown_House.inc | 4 +- data/maps/events/VerdanturfTown_Mart.inc | 4 +- .../VerdanturfTown_PokemonCenter_1F.inc | 6 +- .../VerdanturfTown_PokemonCenter_2F.inc | 6 +- .../events/VerdanturfTown_WandasHouse.inc | 4 +- data/maps/events/VictoryRoad_1F.inc | 10 +- data/maps/events/VictoryRoad_B1F.inc | 14 +- data/maps/events/VictoryRoad_B2F.inc | 8 +- data/scripts/cable_club.inc | 22 +- .../maps/AbandonedShip_Corridors_B1F.inc | 2 +- .../AbandonedShip_HiddenFloorCorridors.inc | 2 +- data/scripts/maps/AbandonedShip_Rooms_B1F.inc | 2 +- .../maps/AbandonedShip_Underwater1.inc | 2 +- .../maps/AbandonedShip_Underwater2.inc | 2 +- .../BattleFrontier_BattleArenaBattleRoom.inc | 8 +- .../BattleFrontier_BattleArenaCorridor.inc | 2 +- .../maps/BattleFrontier_BattleArenaLobby.inc | 2 +- .../BattleFrontier_BattleDomeBattleRoom.inc | 10 +- .../BattleFrontier_BattleDomeCorridor.inc | 2 +- .../maps/BattleFrontier_BattleDomeLobby.inc | 2 +- ...BattleFrontier_BattleDomePreBattleRoom.inc | 2 +- ...BattleFrontier_BattleFactoryBattleRoom.inc | 10 +- .../BattleFrontier_BattleFactoryLobby.inc | 2 +- ...tleFrontier_BattleFactoryPreBattleRoom.inc | 2 +- .../BattleFrontier_BattlePalaceBattleRoom.inc | 10 +- .../BattleFrontier_BattlePalaceCorridor.inc | 2 +- .../maps/BattleFrontier_BattlePalaceLobby.inc | 2 +- .../BattleFrontier_BattlePikeCorridor.inc | 2 +- .../maps/BattleFrontier_BattlePikeLobby.inc | 2 +- .../BattleFrontier_BattlePikeRandomRoom1.inc | 4 +- .../BattleFrontier_BattlePikeRandomRoom2.inc | 2 +- .../BattleFrontier_BattlePikeRandomRoom3.inc | 2 +- ...BattleFrontier_BattlePikeThreePathRoom.inc | 2 +- ...attleFrontier_BattlePyramidEmptySquare.inc | 6 +- .../BattleFrontier_BattlePyramidLobby.inc | 2 +- .../maps/BattleFrontier_BattlePyramidTop.inc | 2 +- .../BattleFrontier_BattleTowerBattleRoom.inc | 8 +- .../BattleFrontier_BattleTowerBattleRoom2.inc | 2 +- .../BattleFrontier_BattleTowerCorridor.inc | 2 +- .../BattleFrontier_BattleTowerCorridor2.inc | 16 +- .../BattleFrontier_BattleTowerElevator.inc | 8 +- .../maps/BattleFrontier_BattleTowerLobby.inc | 2 +- ...tleFrontier_BattleTowerMultiBattleRoom.inc | 4 +- .../maps/BattleFrontier_OutsideWest.inc | 6 +- data/scripts/maps/BirthIsland_Harbor.inc | 4 +- data/scripts/maps/CaveOfOrigin_Entrance.inc | 2 +- data/scripts/maps/DewfordTown.inc | 32 +- .../maps/EverGrandeCity_ChampionsRoom.inc | 2 +- .../FallarborTown_BattleTentBattleRoom.inc | 10 +- .../maps/FallarborTown_BattleTentCorridor.inc | 2 +- .../maps/FallarborTown_BattleTentLobby.inc | 2 +- data/scripts/maps/FarawayIsland_Entrance.inc | 4 +- data/scripts/maps/GraniteCave_B1F.inc | 2 +- data/scripts/maps/InsideOfTruck.inc | 4 +- .../maps/LilycoveCity_ContestLobby.inc | 10 +- .../LilycoveCity_DepartmentStoreElevator.inc | 10 +- data/scripts/maps/LilycoveCity_Harbor.inc | 38 +- .../maps/LilycoveCity_LilycoveMuseum_1F.inc | 6 +- data/scripts/maps/LittlerootTown.inc | 26 +- .../maps/LittlerootTown_BrendansHouse_1F.inc | 2 +- .../maps/LittlerootTown_MaysHouse_1F.inc | 2 +- data/scripts/maps/MarineCave_Entrance.inc | 2 +- data/scripts/maps/MirageTower_2F.inc | 2 +- data/scripts/maps/MirageTower_3F.inc | 2 +- data/scripts/maps/MirageTower_4F.inc | 2 +- data/scripts/maps/MossdeepCity_Gym.inc | 2 +- .../maps/MossdeepCity_SpaceCenter_2F.inc | 2 +- data/scripts/maps/MtPyre_2F.inc | 2 +- data/scripts/maps/NavelRock_Harbor.inc | 4 +- data/scripts/maps/PetalburgCity.inc | 10 +- data/scripts/maps/PetalburgCity_Gym.inc | 6 +- data/scripts/maps/Route101.inc | 2 +- data/scripts/maps/Route104.inc | 20 +- data/scripts/maps/Route104_MrBrineysHouse.inc | 2 +- data/scripts/maps/Route109.inc | 16 +- data/scripts/maps/Route110_TrickHouseEnd.inc | 2 +- .../maps/Route110_TrickHouseEntrance.inc | 22 +- .../maps/Route110_TrickHousePuzzle5.inc | 2 +- .../maps/Route110_TrickHousePuzzle7.inc | 2 +- data/scripts/maps/Route111.inc | 4 +- .../scripts/maps/Route112_CableCarStation.inc | 2 +- .../maps/Route121_SafariZoneEntrance.inc | 2 +- data/scripts/maps/Route134.inc | 2 +- data/scripts/maps/RustboroCity.inc | 2 +- data/scripts/maps/SSTidalCorridor.inc | 4 +- data/scripts/maps/SafariZone_South.inc | 2 +- data/scripts/maps/SeafloorCavern_Entrance.inc | 4 +- data/scripts/maps/SeafloorCavern_Room9.inc | 2 +- data/scripts/maps/SealedChamber_OuterRoom.inc | 4 +- data/scripts/maps/SkyPillar_2F.inc | 2 +- data/scripts/maps/SkyPillar_4F.inc | 2 +- data/scripts/maps/SlateportCity.inc | 2 +- .../SlateportCity_BattleTentBattleRoom.inc | 10 +- .../maps/SlateportCity_BattleTentCorridor.inc | 2 +- .../maps/SlateportCity_BattleTentLobby.inc | 2 +- data/scripts/maps/SlateportCity_Harbor.inc | 10 +- data/scripts/maps/SootopolisCity.inc | 10 +- data/scripts/maps/SootopolisCity_Gym_1F.inc | 2 +- .../SootopolisCity_MysteryEventsHouse_1F.inc | 2 +- .../SootopolisCity_MysteryEventsHouse_B1F.inc | 2 +- data/scripts/maps/SouthernIsland_Exterior.inc | 4 +- data/scripts/maps/TrainerHill_Elevator.inc | 4 +- data/scripts/maps/Underwater_MarineCave.inc | 2 +- data/scripts/maps/Underwater_Route134.inc | 2 +- .../maps/Underwater_SeafloorCavern.inc | 2 +- .../scripts/maps/Underwater_SealedChamber.inc | 4 +- .../maps/Underwater_SootopolisCity.inc | 2 +- data/scripts/maps/UnknownMap_25_34.inc | 12 +- .../VerdanturfTown_BattleTentBattleRoom.inc | 8 +- .../VerdanturfTown_BattleTentCorridor.inc | 2 +- .../maps/VerdanturfTown_BattleTentLobby.inc | 2 +- data/scripts/safari_zone.inc | 4 +- include/constants/maps.h | 134 ++-- src/field_door.c | 2 +- src/wild_encounter.c | 16 +- 621 files changed, 1839 insertions(+), 2454 deletions(-) delete mode 100644 constants/map_constants.inc diff --git a/asm/macros/map.inc b/asm/macros/map.inc index 5367ad7125..a6f9f2daee 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -1,38 +1,8 @@ - .macro new_map_group - inc cur_map_group - .set cur_map_num, 0 + .macro map map_id + .byte \map_id >> 8 @ map group + .byte \map_id & 0xFF @ map num .endm - .macro map_group map_name - .set GROUP_\map_name, cur_map_group - .set MAP_\map_name, cur_map_num - inc cur_map_num - .endm - - .macro map map_name - .byte GROUP_\map_name - .byte MAP_\map_name - .endm - - .macro warp_map map_name - .byte MAP_\map_name - .byte GROUP_\map_name - .endm - - .macro heal_location map_name, x, y - .byte GROUP_\map_name - .byte MAP_\map_name - .2byte \x - .2byte \y - .space 2 - .endm - - .equiv GROUP_NONE, 0x7f - .equiv MAP_NONE, 0x7f - - .equiv GROUP_UNDEFINED, 0xff - .equiv MAP_UNDEFINED, 0xff - .macro map_script type, address .byte \type .4byte \address @@ -56,10 +26,11 @@ inc _num_npcs .endm - .macro warp_def x, y, byte, warp, map + .macro warp_def x, y, byte, warp, map_id .2byte \x, \y .byte \byte, \warp - warp_map \map + .byte \map_id & 0xFF @ map num + .byte \map_id >> 8 @ map group inc _num_warps .endm @@ -107,7 +78,7 @@ .equiv connection_dive, 5 .equiv connection_emerge, 6 - .macro connection direction, offset, map, filler + .macro connection direction, offset, map .4byte connection_\direction .4byte \offset map \map diff --git a/constants/constants.inc b/constants/constants.inc index 5e133bba40..27d554ad07 100644 --- a/constants/constants.inc +++ b/constants/constants.inc @@ -3,6 +3,5 @@ .include "constants/contest_constants.inc" .include "constants/pokemon_data_constants.inc" .include "constants/battle_frontier_constants.inc" - .include "constants/map_constants.inc" .include "constants/berry_constants.inc" .include "constants/contest_move_effects.inc" diff --git a/constants/map_constants.inc b/constants/map_constants.inc deleted file mode 100644 index a061d2501a..0000000000 --- a/constants/map_constants.inc +++ /dev/null @@ -1,588 +0,0 @@ -@ TODO: these need to match the names in include/constants/maps.h - .set cur_map_group, -1 - - new_map_group - map_group PETALBURG_CITY @ 0.0 - map_group SLATEPORT_CITY @ 0.1 - map_group MAUVILLE_CITY @ 0.2 - map_group RUSTBORO_CITY @ 0.3 - map_group FORTREE_CITY @ 0.4 - map_group LILYCOVE_CITY @ 0.5 - map_group MOSSDEEP_CITY @ 0.6 - map_group SOOTOPOLIS_CITY @ 0.7 - map_group EVER_GRANDE_CITY @ 0.8 - map_group LITTLEROOT_TOWN @ 0.9 - map_group OLDALE_TOWN @ 0.10 - map_group DEWFORD_TOWN @ 0.11 - map_group LAVARIDGE_TOWN @ 0.12 - map_group FALLARBOR_TOWN @ 0.13 - map_group VERDANTURF_TOWN @ 0.14 - map_group PACIFIDLOG_TOWN @ 0.15 - map_group ROUTE_101 @ 0.16 - map_group ROUTE_102 @ 0.17 - map_group ROUTE_103 @ 0.18 - map_group ROUTE_104 @ 0.19 - map_group ROUTE_105 @ 0.20 - map_group ROUTE_106 @ 0.21 - map_group ROUTE_107 @ 0.22 - map_group ROUTE_108 @ 0.23 - map_group ROUTE_109 @ 0.24 - map_group ROUTE_110 @ 0.25 - map_group ROUTE_111 @ 0.26 - map_group ROUTE_112 @ 0.27 - map_group ROUTE_113 @ 0.28 - map_group ROUTE_114 @ 0.29 - map_group ROUTE_115 @ 0.30 - map_group ROUTE_116 @ 0.31 - map_group ROUTE_117 @ 0.32 - map_group ROUTE_118 @ 0.33 - map_group ROUTE_119 @ 0.34 - map_group ROUTE_120 @ 0.35 - map_group ROUTE_121 @ 0.36 - map_group ROUTE_122 @ 0.37 - map_group ROUTE_123 @ 0.38 - map_group ROUTE_124 @ 0.39 - map_group ROUTE_125 @ 0.40 - map_group ROUTE_126 @ 0.41 - map_group ROUTE_127 @ 0.42 - map_group ROUTE_128 @ 0.43 - map_group ROUTE_129 @ 0.44 - map_group ROUTE_130 @ 0.45 - map_group ROUTE_131 @ 0.46 - map_group ROUTE_132 @ 0.47 - map_group ROUTE_133 @ 0.48 - map_group ROUTE_134 @ 0.49 - map_group UNDERWATER_1 @ 0.50 - map_group UNDERWATER_2 @ 0.51 - map_group UNDERWATER_3 @ 0.52 - map_group UNDERWATER_4 @ 0.53 - map_group UNDERWATER_5 @ 0.54 - map_group UNDERWATER_6 @ 0.55 - map_group UNDERWATER_7 @ 0.56 - - new_map_group - map_group LITTLEROOT_TOWN_BRENDANS_HOUSE_1F @ 1.0 - map_group LITTLEROOT_TOWN_BRENDANS_HOUSE_2F @ 1.1 - map_group LITTLEROOT_TOWN_MAYS_HOUSE_1F @ 1.2 - map_group LITTLEROOT_TOWN_MAYS_HOUSE_2F @ 1.3 - map_group LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB @ 1.4 - - new_map_group - map_group OLDALE_TOWN_HOUSE_1 @ 2.0 - map_group OLDALE_TOWN_HOUSE_2 @ 2.1 - map_group OLDALE_TOWN_POKEMON_CENTER_1F @ 2.2 - map_group OLDALE_TOWN_POKEMON_CENTER_2F @ 2.3 - map_group OLDALE_TOWN_MART @ 2.4 - - new_map_group - map_group DEWFORD_TOWN_HOUSE_1 @ 3.0 - map_group DEWFORD_TOWN_POKEMON_CENTER_1F @ 3.1 - map_group DEWFORD_TOWN_POKEMON_CENTER_2F @ 3.2 - map_group DEWFORD_TOWN_GYM @ 3.3 - map_group DEWFORD_TOWN_HALL @ 3.4 - map_group DEWFORD_TOWN_HOUSE_2 @ 3.5 - - new_map_group - map_group LAVARIDGE_TOWN_HERB_SHOP @ 4.0 - map_group LAVARIDGE_TOWN_GYM_1F @ 4.1 - map_group LAVARIDGE_TOWN_GYM_B1F @ 4.2 - map_group LAVARIDGE_TOWN_HOUSE @ 4.3 - map_group LAVARIDGE_TOWN_MART @ 4.4 - map_group LAVARIDGE_TOWN_POKEMON_CENTER_1F @ 4.5 - map_group LAVARIDGE_TOWN_POKEMON_CENTER_2F @ 4.6 - - new_map_group - map_group FALLARBOR_TOWN_MART @ 5.0 - map_group FALLARBOR_TOWN_BATTLE_TENT_LOBBY @ 5.1 - map_group FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR @ 5.2 - map_group FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM @ 5.3 - map_group FALLARBOR_TOWN_POKEMON_CENTER_1F @ 5.4 - map_group FALLARBOR_TOWN_POKEMON_CENTER_2F @ 5.5 - map_group FALLARBOR_TOWN_HOUSE_1 @ 5.6 - map_group FALLARBOR_TOWN_HOUSE_2 @ 5.7 - - new_map_group - map_group VERDANTURF_TOWN_BATTLE_TENT_LOBBY @ 6.0 - map_group VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR @ 6.1 - map_group VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM @ 6.2 - map_group VERDANTURF_TOWN_MART @ 6.3 - map_group VERDANTURF_TOWN_POKEMON_CENTER_1F @ 6.4 - map_group VERDANTURF_TOWN_POKEMON_CENTER_2F @ 6.5 - map_group VERDANTURF_TOWN_WANDAS_HOUSE @ 6.6 - map_group VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE @ 6.7 - map_group VERDANTURF_TOWN_HOUSE @ 6.8 - - new_map_group - map_group PACIFIDLOG_TOWN_POKEMON_CENTER_1F @ 7.0 - map_group PACIFIDLOG_TOWN_POKEMON_CENTER_2F @ 7.1 - map_group PACIFIDLOG_TOWN_HOUSE_1 @ 7.2 - map_group PACIFIDLOG_TOWN_HOUSE_2 @ 7.3 - map_group PACIFIDLOG_TOWN_HOUSE_3 @ 7.4 - map_group PACIFIDLOG_TOWN_HOUSE_4 @ 7.5 - map_group PACIFIDLOG_TOWN_HOUSE_5 @ 7.6 - - new_map_group - map_group PETALBURG_CITY_WALLYS_HOUSE @ 8.0 - map_group PETALBURG_CITY_GYM @ 8.1 - map_group PETALBURG_CITY_HOUSE_1 @ 8.2 - map_group PETALBURG_CITY_HOUSE_2 @ 8.3 - map_group PETALBURG_CITY_POKEMON_CENTER_1F @ 8.4 - map_group PETALBURG_CITY_POKEMON_CENTER_2F @ 8.5 - map_group PETALBURG_CITY_MART @ 8.6 - - new_map_group - map_group SLATEPORT_CITY_STERNS_SHIPYARD_1F @ 9.0 - map_group SLATEPORT_CITY_STERNS_SHIPYARD_2F @ 9.1 - map_group SLATEPORT_CITY_BATTLE_TENT_LOBBY @ 9.2 - map_group SLATEPORT_CITY_BATTLE_TENT_CORRIDOR @ 9.3 - map_group SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM @ 9.4 - map_group SLATEPORT_CITY_HOUSE_1 @ 9.5 - map_group SLATEPORT_CITY_POKEMON_FAN_CLUB @ 9.6 - map_group SLATEPORT_CITY_OCEANIC_MUSEUM_1F @ 9.7 - map_group SLATEPORT_CITY_OCEANIC_MUSEUM_2F @ 9.8 - map_group SLATEPORT_CITY_HARBOR @ 9.9 - map_group SLATEPORT_CITY_HOUSE_2 @ 9.10 - map_group SLATEPORT_CITY_POKEMON_CENTER_1F @ 9.11 - map_group SLATEPORT_CITY_POKEMON_CENTER_2F @ 9.12 - map_group SLATEPORT_CITY_MART @ 9.13 - - new_map_group - map_group MAUVILLE_CITY_GYM @ 10.0 - map_group MAUVILLE_CITY_BIKE_SHOP @ 10.1 - map_group MAUVILLE_CITY_HOUSE_1 @ 10.2 - map_group MAUVILLE_CITY_GAME_CORNER @ 10.3 - map_group MAUVILLE_CITY_HOUSE_2 @ 10.4 - map_group MAUVILLE_CITY_POKEMON_CENTER_1F @ 10.5 - map_group MAUVILLE_CITY_POKEMON_CENTER_2F @ 10.6 - map_group MAUVILLE_CITY_MART @ 10.7 - - new_map_group - map_group RUSTBORO_CITY_DEVON_CORP_1F @ 11.0 - map_group RUSTBORO_CITY_DEVON_CORP_2F @ 11.1 - map_group RUSTBORO_CITY_DEVON_CORP_3F @ 11.2 - map_group RUSTBORO_CITY_GYM @ 11.3 - map_group RUSTBORO_CITY_POKEMON_SCHOOL @ 11.4 - map_group RUSTBORO_CITY_POKEMON_CENTER_1F @ 11.5 - map_group RUSTBORO_CITY_POKEMON_CENTER_2F @ 11.6 - map_group RUSTBORO_CITY_MART @ 11.7 - map_group RUSTBORO_CITY_FLAT_1_1F @ 11.8 - map_group RUSTBORO_CITY_FLAT_1_2F @ 11.9 - map_group RUSTBORO_CITY_HOUSE_1 @ 11.10 - map_group RUSTBORO_CITY_CUTTERS_HOUSE @ 11.11 - map_group RUSTBORO_CITY_HOUSE_2 @ 11.12 - map_group RUSTBORO_CITY_FLAT_2_1F @ 11.13 - map_group RUSTBORO_CITY_FLAT_2_2F @ 11.14 - map_group RUSTBORO_CITY_FLAT_2_3F @ 11.15 - map_group RUSTBORO_CITY_HOUSE_3 @ 11.16 - - new_map_group - map_group FORTREE_CITY_HOUSE_1 @ 12.0 - map_group FORTREE_CITY_GYM @ 12.1 - map_group FORTREE_CITY_POKEMON_CENTER_1F @ 12.2 - map_group FORTREE_CITY_POKEMON_CENTER_2F @ 12.3 - map_group FORTREE_CITY_MART @ 12.4 - map_group FORTREE_CITY_HOUSE_2 @ 12.5 - map_group FORTREE_CITY_HOUSE_3 @ 12.6 - map_group FORTREE_CITY_HOUSE_4 @ 12.7 - map_group FORTREE_CITY_HOUSE_5 @ 12.8 - map_group FORTREE_CITY_DECORATION_SHOP @ 12.9 - - new_map_group - map_group LILYCOVE_CITY_COVE_LILY_MOTEL_1F @ 13.0 - map_group LILYCOVE_CITY_COVE_LILY_MOTEL_2F @ 13.1 - map_group LILYCOVE_CITY_LILYCOVE_MUSEUM_1F @ 13.2 - map_group LILYCOVE_CITY_LILYCOVE_MUSEUM_2F @ 13.3 - map_group LILYCOVE_CITY_CONTEST_LOBBY @ 13.4 - map_group LILYCOVE_CITY_CONTEST_HALL @ 13.5 - map_group LILYCOVE_CITY_POKEMON_CENTER_1F @ 13.6 - map_group LILYCOVE_CITY_POKEMON_CENTER_2F @ 13.7 - map_group LILYCOVE_CITY_UNUSED_MART @ 13.8 - map_group LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB @ 13.9 - map_group LILYCOVE_CITY_HARBOR @ 13.10 - map_group LILYCOVE_CITY_MOVE_DELETERS_HOUSE @ 13.11 - map_group LILYCOVE_CITY_HOUSE_1 @ 13.12 - map_group LILYCOVE_CITY_HOUSE_2 @ 13.13 - map_group LILYCOVE_CITY_HOUSE_3 @ 13.14 - map_group LILYCOVE_CITY_HOUSE_4 @ 13.15 - map_group LILYCOVE_CITY_DEPARTMENT_STORE_1F @ 13.16 - map_group LILYCOVE_CITY_DEPARTMENT_STORE_2F @ 13.17 - map_group LILYCOVE_CITY_DEPARTMENT_STORE_3F @ 13.18 - map_group LILYCOVE_CITY_DEPARTMENT_STORE_4F @ 13.19 - map_group LILYCOVE_CITY_DEPARTMENT_STORE_5F @ 13.20 - map_group LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP @ 13.21 - map_group LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR @ 13.22 - - new_map_group - map_group MOSSDEEP_CITY_GYM @ 14.0 - map_group MOSSDEEP_CITY_HOUSE_1 @ 14.1 - map_group MOSSDEEP_CITY_HOUSE_2 @ 14.2 - map_group MOSSDEEP_CITY_POKEMON_CENTER_1F @ 14.3 - map_group MOSSDEEP_CITY_POKEMON_CENTER_2F @ 14.4 - map_group MOSSDEEP_CITY_MART @ 14.5 - map_group MOSSDEEP_CITY_HOUSE_3 @ 14.6 - map_group MOSSDEEP_CITY_STEVENS_HOUSE @ 14.7 - map_group MOSSDEEP_CITY_HOUSE_4 @ 14.8 - map_group MOSSDEEP_CITY_SPACE_CENTER_1F @ 14.9 - map_group MOSSDEEP_CITY_SPACE_CENTER_2F @ 14.10 - map_group MOSSDEEP_CITY_GAME_CORNER_1F @ 14.11 - map_group MOSSDEEP_CITY_GAME_CORNER_B1F @ 14.12 - - new_map_group - map_group SOOTOPOLIS_CITY_GYM_1F @ 15.0 - map_group SOOTOPOLIS_CITY_GYM_B1F @ 15.1 - map_group SOOTOPOLIS_CITY_POKEMON_CENTER_1F @ 15.2 - map_group SOOTOPOLIS_CITY_POKEMON_CENTER_2F @ 15.3 - map_group SOOTOPOLIS_CITY_MART @ 15.4 - map_group SOOTOPOLIS_CITY_HOUSE_1 @ 15.5 - map_group SOOTOPOLIS_CITY_HOUSE_2 @ 15.6 - map_group SOOTOPOLIS_CITY_HOUSE_3 @ 15.7 - map_group SOOTOPOLIS_CITY_HOUSE_4 @ 15.8 - map_group SOOTOPOLIS_CITY_HOUSE_5 @ 15.9 - map_group SOOTOPOLIS_CITY_HOUSE_6 @ 15.10 - map_group SOOTOPOLIS_CITY_HOUSE_7 @ 15.11 - map_group SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE @ 15.12 - map_group SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F @ 15.13 - map_group SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F @ 15.14 - - new_map_group - map_group EVER_GRANDE_CITY_SIDNEYS_ROOM @ 16.0 - map_group EVER_GRANDE_CITY_PHOEBES_ROOM @ 16.1 - map_group EVER_GRANDE_CITY_GLACIAS_ROOM @ 16.2 - map_group EVER_GRANDE_CITY_DRAKES_ROOM @ 16.3 - map_group EVER_GRANDE_CITY_CHAMPIONS_ROOM @ 16.4 - map_group EVER_GRANDE_CITY_HALL_1 @ 16.5 - map_group EVER_GRANDE_CITY_HALL_2 @ 16.6 - map_group EVER_GRANDE_CITY_HALL_3 @ 16.7 - map_group EVER_GRANDE_CITY_HALL_4 @ 16.8 - map_group EVER_GRANDE_CITY_HALL_5 @ 16.9 - map_group EVER_GRANDE_CITY_POKEMON_LEAGUE_1F @ 16.10 - map_group EVER_GRANDE_CITY_HALL_OF_FAME @ 16.11 - map_group EVER_GRANDE_CITY_POKEMON_CENTER_1F @ 16.12 - map_group EVER_GRANDE_CITY_POKEMON_CENTER_2F @ 16.13 - map_group EVER_GRANDE_CITY_POKEMON_LEAGUE_2F @ 16.14 - - new_map_group - map_group ROUTE_104_MR_BRINEYS_HOUSE @ 17.0 - map_group ROUTE_104_PRETTY_PETAL_FLOWER_SHOP @ 17.1 - - new_map_group - map_group ROUTE_111_WINSTRATE_FAMILYS_HOUSE @ 18.0 - map_group ROUTE_111_OLD_LADYS_REST_STOP @ 18.1 - - new_map_group - map_group ROUTE_112_CABLE_CAR_STATION @ 19.0 - map_group MT_CHIMNEY_CABLE_CAR_STATION @ 19.1 - - new_map_group - map_group ROUTE_114_FOSSIL_MANIACS_HOUSE @ 20.0 - map_group ROUTE_114_FOSSIL_MANIACS_TUNNEL @ 20.1 - map_group ROUTE_114_LANETTES_HOUSE @ 20.2 - - new_map_group - map_group ROUTE_116_TUNNELERS_REST_HOUSE @ 21.0 - - new_map_group - map_group ROUTE_117_POKEMON_DAY_CARE @ 22.0 - - new_map_group - map_group ROUTE_121_SAFARI_ZONE_ENTRANCE @ 23.0 - - new_map_group - map_group METEOR_FALLS_1F_1R @ 24.0 - map_group METEOR_FALLS_1F_2R @ 24.1 - map_group METEOR_FALLS_B1F_1R @ 24.2 - map_group METEOR_FALLS_B1F_2R @ 24.3 - map_group RUSTURF_TUNNEL @ 24.4 - map_group UNDERWATER_SOOTOPOLIS_CITY @ 24.5 - map_group DESERT_RUINS @ 24.6 - map_group GRANITE_CAVE_1F @ 24.7 - map_group GRANITE_CAVE_B1F @ 24.8 - map_group GRANITE_CAVE_B2F @ 24.9 - map_group GRANITE_CAVE_STEVENS_ROOM @ 24.10 - map_group PETALBURG_WOODS @ 24.11 - map_group MT_CHIMNEY @ 24.12 - map_group JAGGED_PASS @ 24.13 - map_group FIERY_PATH @ 24.14 - map_group MT_PYRE_1F @ 24.15 - map_group MT_PYRE_2F @ 24.16 - map_group MT_PYRE_3F @ 24.17 - map_group MT_PYRE_4F @ 24.18 - map_group MT_PYRE_5F @ 24.19 - map_group MT_PYRE_6F @ 24.20 - map_group MT_PYRE_EXTERIOR @ 24.21 - map_group MT_PYRE_SUMMIT @ 24.22 - map_group AQUA_HIDEOUT_1F @ 24.23 - map_group AQUA_HIDEOUT_B1F @ 24.24 - map_group AQUA_HIDEOUT_B2F @ 24.25 - map_group UNDERWATER_SEAFLOOR_CAVERN @ 24.26 - map_group SEAFLOOR_CAVERN_ENTRANCE @ 24.27 - map_group SEAFLOOR_CAVERN_ROOM_1 @ 24.28 - map_group SEAFLOOR_CAVERN_ROOM_2 @ 24.29 - map_group SEAFLOOR_CAVERN_ROOM_3 @ 24.30 - map_group SEAFLOOR_CAVERN_ROOM_4 @ 24.31 - map_group SEAFLOOR_CAVERN_ROOM_5 @ 24.32 - map_group SEAFLOOR_CAVERN_ROOM_6 @ 24.33 - map_group SEAFLOOR_CAVERN_ROOM_7 @ 24.34 - map_group SEAFLOOR_CAVERN_ROOM_8 @ 24.35 - map_group SEAFLOOR_CAVERN_ROOM_9 @ 24.36 - map_group CAVE_OF_ORIGIN_ENTRANCE @ 24.37 - map_group CAVE_OF_ORIGIN_1F @ 24.38 - map_group CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_1 @ 24.39 - map_group CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_2 @ 24.40 - map_group CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_3 @ 24.41 - map_group CAVE_OF_ORIGIN_B1F @ 24.42 - map_group VICTORY_ROAD_1F @ 24.43 - map_group VICTORY_ROAD_B1F @ 24.44 - map_group VICTORY_ROAD_B2F @ 24.45 - map_group SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM @ 24.46 - map_group SHOAL_CAVE_LOW_TIDE_INNER_ROOM @ 24.47 - map_group SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM @ 24.48 - map_group SHOAL_CAVE_LOW_TIDE_LOWER_ROOM @ 24.49 - map_group SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM @ 24.50 - map_group SHOAL_CAVE_HIGH_TIDE_INNER_ROOM @ 24.51 - map_group NEW_MAUVILLE_ENTRANCE @ 24.52 - map_group NEW_MAUVILLE_INSIDE @ 24.53 - map_group ABANDONED_SHIP_DECK @ 24.54 - map_group ABANDONED_SHIP_CORRIDORS_1F @ 24.55 - map_group ABANDONED_SHIP_ROOMS_1F @ 24.56 - map_group ABANDONED_SHIP_CORRIDORS_B1F @ 24.57 - map_group ABANDONED_SHIP_ROOMS_B1F @ 24.58 - map_group ABANDONED_SHIP_ROOMS_2_B1F @ 24.59 - map_group ABANDONED_SHIP_UNDERWATER_1 @ 24.60 - map_group ABANDONED_SHIP_ROOM_B1F @ 24.61 - map_group ABANDONED_SHIP_ROOMS_2_1F @ 24.62 - map_group ABANDONED_SHIP_CAPTAINS_OFFICE @ 24.63 - map_group ABANDONED_SHIP_UNDERWATER_2 @ 24.64 - map_group ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS @ 24.65 - map_group ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS @ 24.66 - map_group ISLAND_CAVE @ 24.67 - map_group ANCIENT_TOMB @ 24.68 - map_group UNDERWATER_ROUTE_134 @ 24.69 - map_group UNDERWATER_SEALED_CHAMBER @ 24.70 - map_group SEALED_CHAMBER_OUTER_ROOM @ 24.71 - map_group SEALED_CHAMBER_INNER_ROOM @ 24.72 - map_group SCORCHED_SLAB @ 24.73 - map_group AQUA_HIDEOUT_UNUSED_RUBY_MAP_1 @ 24.74 - map_group AQUA_HIDEOUT_UNUSED_RUBY_MAP_2 @ 24.75 - map_group AQUA_HIDEOUT_UNUSED_RUBY_MAP_3 @ 24.76 - map_group SKY_PILLAR_ENTRANCE @ 24.77 - map_group SKY_PILLAR_OUTSIDE @ 24.78 - map_group SKY_PILLAR_1F @ 24.79 - map_group SKY_PILLAR_2F @ 24.80 - map_group SKY_PILLAR_3F @ 24.81 - map_group SKY_PILLAR_4F @ 24.82 - map_group SHOAL_CAVE_LOW_TIDE_ICE_ROOM @ 24.83 - map_group SKY_PILLAR_5F @ 24.84 - map_group SKY_PILLAR_TOP @ 24.85 - map_group MAGMA_HIDEOUT_1F @ 24.86 - map_group MAGMA_HIDEOUT_2F_1R @ 24.87 - map_group MAGMA_HIDEOUT_2F_2R @ 24.88 - map_group MAGMA_HIDEOUT_3F_1R @ 24.89 - map_group MAGMA_HIDEOUT_3F_2R @ 24.90 - map_group MAGMA_HIDEOUT_4F @ 24.91 - map_group MAGMA_HIDEOUT_3F_3R @ 24.92 - map_group MAGMA_HIDEOUT_2F_3R @ 24.93 - map_group MIRAGE_TOWER_1F @ 24.94 - map_group MIRAGE_TOWER_2F @ 24.95 - map_group MIRAGE_TOWER_3F @ 24.96 - map_group MIRAGE_TOWER_4F @ 24.97 - map_group DESERT_UNDERPASS @ 24.98 - map_group ARTISAN_CAVE_B1F @ 24.99 - map_group ARTISAN_CAVE_1F @ 24.100 - map_group UNDERWATER_MARINE_CAVE @ 24.101 - map_group MARINE_CAVE_ENTRANCE @ 24.102 - map_group MARINE_CAVE_END @ 24.103 - map_group TERRA_CAVE_ENTRANCE @ 24.104 - map_group TERRA_CAVE_END @ 24.105 - map_group ALTERING_CAVE @ 24.106 - map_group METEOR_FALLS_STEVENS_CAVE @ 24.107 - - new_map_group - map_group SECRET_BASE_RED_CAVE_1 @ 25.0 - map_group SECRET_BASE_BROWN_CAVE_1 @ 25.1 - map_group SECRET_BASE_BLUE_CAVE_1 @ 25.2 - map_group SECRET_BASE_YELLOW_CAVE_1 @ 25.3 - map_group SECRET_BASE_TREE_1 @ 25.4 - map_group SECRET_BASE_SHRUB_1 @ 25.5 - map_group SECRET_BASE_RED_CAVE_2 @ 25.6 - map_group SECRET_BASE_BROWN_CAVE_2 @ 25.7 - map_group SECRET_BASE_BLUE_CAVE_2 @ 25.8 - map_group SECRET_BASE_YELLOW_CAVE_2 @ 25.9 - map_group SECRET_BASE_TREE_2 @ 25.10 - map_group SECRET_BASE_SHRUB_2 @ 25.11 - map_group SECRET_BASE_RED_CAVE_3 @ 25.12 - map_group SECRET_BASE_BROWN_CAVE_3 @ 25.13 - map_group SECRET_BASE_BLUE_CAVE_3 @ 25.14 - map_group SECRET_BASE_YELLOW_CAVE_3 @ 25.15 - map_group SECRET_BASE_TREE_3 @ 25.16 - map_group SECRET_BASE_SHRUB_3 @ 25.17 - map_group SECRET_BASE_RED_CAVE_4 @ 25.18 - map_group SECRET_BASE_BROWN_CAVE_4 @ 25.19 - map_group SECRET_BASE_BLUE_CAVE_4 @ 25.20 - map_group SECRET_BASE_YELLOW_CAVE_4 @ 25.21 - map_group SECRET_BASE_TREE_4 @ 25.22 - map_group SECRET_BASE_SHRUB_4 @ 25.23 - map_group SINGLE_BATTLE_COLOSSEUM @ 25.24 - map_group TRADE_CENTER @ 25.25 - map_group RECORD_CORNER @ 25.26 - map_group DOUBLE_BATTLE_COLOSSEUM @ 25.27 - map_group LINK_CONTEST_ROOM_1 @ 25.28 - map_group UNKNOWN_MAP_25_29 @ 25.29 - map_group UNKNOWN_MAP_25_30 @ 25.30 - map_group UNKNOWN_MAP_25_31 @ 25.31 - map_group UNKNOWN_MAP_25_32 @ 25.32 - map_group UNKNOWN_MAP_25_33 @ 25.33 - map_group UNKNOWN_MAP_25_34 @ 25.34 - map_group LINK_CONTEST_ROOM_2 @ 25.35 - map_group LINK_CONTEST_ROOM_3 @ 25.36 - map_group LINK_CONTEST_ROOM_4 @ 25.37 - map_group LINK_CONTEST_ROOM_5 @ 25.38 - map_group LINK_CONTEST_ROOM_6 @ 25.39 - map_group INSIDE_OF_TRUCK @ 25.40 - map_group SS_TIDAL_CORRIDOR @ 25.41 - map_group SS_TIDAL_LOWER_DECK @ 25.42 - map_group SS_TIDAL_ROOMS @ 25.43 - map_group BATTLE_PYRAMID_SQUARE_01 @ 25.44 - map_group BATTLE_PYRAMID_SQUARE_02 @ 25.45 - map_group BATTLE_PYRAMID_SQUARE_03 @ 25.46 - map_group BATTLE_PYRAMID_SQUARE_04 @ 25.47 - map_group BATTLE_PYRAMID_SQUARE_05 @ 25.48 - map_group BATTLE_PYRAMID_SQUARE_06 @ 25.49 - map_group BATTLE_PYRAMID_SQUARE_07 @ 25.50 - map_group BATTLE_PYRAMID_SQUARE_08 @ 25.51 - map_group BATTLE_PYRAMID_SQUARE_09 @ 25.52 - map_group BATTLE_PYRAMID_SQUARE_10 @ 25.53 - map_group BATTLE_PYRAMID_SQUARE_11 @ 25.54 - map_group BATTLE_PYRAMID_SQUARE_12 @ 25.55 - map_group BATTLE_PYRAMID_SQUARE_13 @ 25.56 - map_group BATTLE_PYRAMID_SQUARE_14 @ 25.57 - map_group BATTLE_PYRAMID_SQUARE_15 @ 25.58 - map_group BATTLE_PYRAMID_SQUARE_16 @ 25.59 - map_group UNION_ROOM @ 25.60 - - new_map_group - map_group SAFARI_ZONE_NORTHWEST @ 26.0 - map_group SAFARI_ZONE_NORTH @ 26.1 - map_group SAFARI_ZONE_SOUTHWEST @ 26.2 - map_group SAFARI_ZONE_SOUTH @ 26.3 - map_group BATTLE_FRONTIER_OUTSIDE_WEST @ 26.4 - map_group BATTLE_FRONTIER_BATTLE_TOWER_LOBBY @ 26.5 - map_group BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR @ 26.6 - map_group BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR @ 26.7 - map_group BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM @ 26.8 - map_group SOUTHERN_ISLAND_EXTERIOR @ 26.9 - map_group SOUTHERN_ISLAND_INTERIOR @ 26.10 - map_group SAFARI_ZONE_REST_HOUSE @ 26.11 - map_group SAFARI_ZONE_NORTHEAST @ 26.12 - map_group SAFARI_ZONE_SOUTHEAST @ 26.13 - map_group BATTLE_FRONTIER_OUTSIDE_EAST @ 26.14 - map_group BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM @ 26.15 - map_group BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2 @ 26.16 - map_group BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM_2 @ 26.17 - map_group BATTLE_FRONTIER_BATTLE_DOME_LOBBY @ 26.18 - map_group BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR @ 26.19 - map_group BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM @ 26.20 - map_group BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM @ 26.21 - map_group BATTLE_FRONTIER_BATTLE_PALACE_LOBBY @ 26.22 - map_group BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR @ 26.23 - map_group BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM @ 26.24 - map_group BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY @ 26.25 - map_group BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE @ 26.26 - map_group BATTLE_FRONTIER_BATTLE_PYRAMID_TOP @ 26.27 - map_group BATTLE_FRONTIER_BATTLE_ARENA_LOBBY @ 26.28 - map_group BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR @ 26.29 - map_group BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM @ 26.30 - map_group BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY @ 26.31 - map_group BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM @ 26.32 - map_group BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM @ 26.33 - map_group BATTLE_FRONTIER_BATTLE_PIKE_LOBBY @ 26.34 - map_group BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR @ 26.35 - map_group BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM @ 26.36 - map_group BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_1 @ 26.37 - map_group BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_2 @ 26.38 - map_group BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_3 @ 26.39 - map_group BATTLE_FRONTIER_RANKING_HALL @ 26.40 - map_group BATTLE_FRONTIER_LOUNGE_1 @ 26.41 - map_group BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER @ 26.42 - map_group BATTLE_FRONTIER_LOUNGE_2 @ 26.43 - map_group BATTLE_FRONTIER_LOUNGE_3 @ 26.44 - map_group BATTLE_FRONTIER_LOUNGE_4 @ 26.45 - map_group BATTLE_FRONTIER_SCOTTS_HOUSE @ 26.46 - map_group BATTLE_FRONTIER_LOUNGE_5 @ 26.47 - map_group BATTLE_FRONTIER_LOUNGE_6 @ 26.48 - map_group BATTLE_FRONTIER_LOUNGE_7 @ 26.49 - map_group BATTLE_FRONTIER_RECEPTION_GATE @ 26.50 - map_group BATTLE_FRONTIER_LOUNGE_8 @ 26.51 - map_group BATTLE_FRONTIER_LOUNGE_9 @ 26.52 - map_group BATTLE_FRONTIER_POKEMON_CENTER_1F @ 26.53 - map_group BATTLE_FRONTIER_POKEMON_CENTER_2F @ 26.54 - map_group BATTLE_FRONTIER_MART @ 26.55 - map_group FARAWAY_ISLAND_ENTRANCE @ 26.56 - map_group FARAWAY_ISLAND_INTERIOR @ 26.57 - map_group BIRTH_ISLAND_EXTERIOR @ 26.58 - map_group BIRTH_ISLAND_HARBOR @ 26.59 - map_group TRAINER_HILL_ENTRANCE @ 26.60 - map_group TRAINER_HILL_1F @ 26.61 - map_group TRAINER_HILL_2F @ 26.62 - map_group TRAINER_HILL_3F @ 26.63 - map_group TRAINER_HILL_4F @ 26.64 - map_group TRAINER_HILL_ROOF @ 26.65 - map_group NAVEL_ROCK_EXTERIOR @ 26.66 - map_group NAVEL_ROCK_HARBOR @ 26.67 - map_group NAVEL_ROCK_ENTRANCE @ 26.68 - map_group NAVEL_ROCK_B1F @ 26.69 - map_group NAVEL_ROCK_FORK @ 26.70 - map_group NAVEL_ROCK_UP_1 @ 26.71 - map_group NAVEL_ROCK_UP_2 @ 26.72 - map_group NAVEL_ROCK_UP_3 @ 26.73 - map_group NAVEL_ROCK_UP_4 @ 26.74 - map_group NAVEL_ROCK_TOP @ 26.75 - map_group NAVEL_ROCK_DOWN_01 @ 26.76 - map_group NAVEL_ROCK_DOWN_02 @ 26.77 - map_group NAVEL_ROCK_DOWN_03 @ 26.78 - map_group NAVEL_ROCK_DOWN_04 @ 26.79 - map_group NAVEL_ROCK_DOWN_05 @ 26.80 - map_group NAVEL_ROCK_DOWN_06 @ 26.81 - map_group NAVEL_ROCK_DOWN_07 @ 26.82 - map_group NAVEL_ROCK_DOWN_08 @ 26.83 - map_group NAVEL_ROCK_DOWN_09 @ 26.84 - map_group NAVEL_ROCK_DOWN_10 @ 26.85 - map_group NAVEL_ROCK_DOWN_11 @ 26.86 - map_group NAVEL_ROCK_BOTTOM @ 26.87 - map_group TRAINER_HILL_ELEVATOR @ 26.88 - - new_map_group - map_group ROUTE_104_PROTOTYPE @ 27.0 - map_group ROUTE_104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP @ 27.1 - - new_map_group - map_group ROUTE_109_SEASHORE_HOUSE @ 28.0 - - new_map_group - map_group ROUTE_110_TRICK_HOUSE_ENTRANCE @ 29.0 - map_group ROUTE_110_TRICK_HOUSE_END @ 29.1 - map_group ROUTE_110_TRICK_HOUSE_CORRIDOR @ 29.2 - map_group ROUTE_110_TRICK_HOUSE_PUZZLE_1 @ 29.3 - map_group ROUTE_110_TRICK_HOUSE_PUZZLE_2 @ 29.4 - map_group ROUTE_110_TRICK_HOUSE_PUZZLE_3 @ 29.5 - map_group ROUTE_110_TRICK_HOUSE_PUZZLE_4 @ 29.6 - map_group ROUTE_110_TRICK_HOUSE_PUZZLE_5 @ 29.7 - map_group ROUTE_110_TRICK_HOUSE_PUZZLE_6 @ 29.8 - map_group ROUTE_110_TRICK_HOUSE_PUZZLE_7 @ 29.9 - map_group ROUTE_110_TRICK_HOUSE_PUZZLE_8 @ 29.10 - map_group ROUTE_110_SEASIDE_CYCLING_ROAD_ENTRANCE_1 @ 29.11 - map_group ROUTE_110_SEASIDE_CYCLING_ROAD_ENTRANCE_2 @ 29.12 - - new_map_group - map_group ROUTE_113_GLASS_WORKSHOP @ 30.0 - - new_map_group - map_group ROUTE_123_BERRY_MASTERS_HOUSE @ 31.0 - - new_map_group - map_group ROUTE_119_WEATHER_INSTITUTE_1F @ 32.0 - map_group ROUTE_119_WEATHER_INSTITUTE_2F @ 32.1 - map_group ROUTE_119_HOUSE @ 32.2 - - new_map_group - map_group ROUTE_124_DIVING_TREASURE_HUNTERS_HOUSE @ 33.0 diff --git a/data/event_scripts.s b/data/event_scripts.s index ec9ddb86a0..e18dec8360 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,5 +1,6 @@ #include "constants/flags.h" #include "constants/items.h" +#include "constants/maps.h" #include "constants/moves.h" #include "constants/songs.h" #include "constants/species.h" @@ -2363,7 +2364,7 @@ EventScript_27222B:: @ 827222B delay 30 applymovement 255, PetalburgCity_Movement_2725A6 waitmovement 0 - showobjectat 255, PETALBURG_CITY + showobjectat 255, MAP_PETALBURG_CITY delay 30 applymovement 255, Movement_27224E waitmovement 0 @@ -2384,7 +2385,7 @@ SouthernIsland_Exterior_EventScript_272250:: @ 8272250 compare VAR_FACING, 3 call_if 1, BattleFrontier_OutsideWest_EventScript_242A2C delay 30 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY call BattleFrontier_OutsideWest_EventScript_2721E2 return @@ -4044,35 +4045,35 @@ Underwater7_EventScript_274223:: @ 8274223 return Underwater3_EventScript_274281:: @ 8274281 - setescapewarp ROUTE_105, 255, 11, 29 + setescapewarp MAP_ROUTE105, 255, 11, 29 return Underwater3_EventScript_27428A:: @ 827428A - setescapewarp ROUTE_105, 255, 21, 54 + setescapewarp MAP_ROUTE105, 255, 21, 54 return Underwater3_EventScript_274293:: @ 8274293 - setescapewarp ROUTE_125, 255, 9, 17 + setescapewarp MAP_ROUTE125, 255, 9, 17 return Underwater3_EventScript_27429C:: @ 827429C - setescapewarp ROUTE_125, 255, 54, 19 + setescapewarp MAP_ROUTE125, 255, 54, 19 return Underwater3_EventScript_2742A5:: @ 82742A5 - setescapewarp ROUTE_127, 255, 58, 10 + setescapewarp MAP_ROUTE127, 255, 58, 10 return Underwater3_EventScript_2742AE:: @ 82742AE - setescapewarp ROUTE_127, 255, 62, 31 + setescapewarp MAP_ROUTE127, 255, 62, 31 return Underwater3_EventScript_2742B7:: @ 82742B7 - setescapewarp ROUTE_129, 255, 17, 15 + setescapewarp MAP_ROUTE129, 255, 17, 15 return Underwater3_EventScript_2742C0:: @ 82742C0 - setescapewarp ROUTE_129, 255, 43, 20 + setescapewarp MAP_ROUTE129, 255, 43, 20 return Std_RegisteredInMatchCall:: @ 82742C9 @@ -6025,7 +6026,7 @@ gUnknown_082A8337:: @ 82A8337 waitmovement 0 playse SE_RU_HYUU delay 60 - warphole UNDEFINED + warphole MAP_UNDEFINED waitstate end @@ -13232,7 +13233,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8 goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 compare VAR_RESULT, 8 goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F - hideobjectat 2, BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_1 + hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 setvar VAR_TEMP_4, 1 turnobject 255, 2 end @@ -13245,7 +13246,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35:: @ 82C3F35 BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F:: @ 82C3F3F setvar VAR_TEMP_4, 1 turnobject 255, 2 - hideobjectat 1, BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_1 + hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 end BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E:: @ 82C3F4E @@ -13300,7 +13301,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030:: @ 82C4030 applymovement 255, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A waitmovement 0 call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49 - warpsilent BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_1, 255, 4, 7 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1, 255, 4, 7 waitstate end @@ -13308,7 +13309,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4049:: @ 82C4049 applymovement 255, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A waitmovement 0 call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49 - warpsilent BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_3, 255, 4, 19 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3, 255, 4, 19 waitstate end @@ -13389,7 +13390,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144:: @ 82C4144 applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A waitmovement 0 call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49 - warpsilent BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_2, 255, 2, 7 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2, 255, 2, 7 return BattleFrontier_BattlePikeRandomRoom1_EventScript_2C415C:: @ 82C415C @@ -13397,7 +13398,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C:: @ 82C415C applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A waitmovement 0 call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49 - warpsilent BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 return BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174 @@ -13452,7 +13453,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222:: @ 82C4222 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special sub_81A1780 - warp BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 waitstate end @@ -14681,7 +14682,7 @@ TrainerHill_1F_EventScript_2C83A6:: @ 82C83A6 end TrainerHill_1F_EventScript_2C83BF:: @ 82C83BF - warpsilent TRAINER_HILL_ENTRANCE, 255, 9, 6 + warpsilent MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6 waitstate end @@ -14696,7 +14697,7 @@ TrainerHill_1F_EventScript_2C83C9:: @ 82C83C9 TrainerHill_1F_EventScript_2C83DF:: @ 82C83DF TrainerHill_Entrance_EventScript_2C83DF:: @ 82C83DF setvar VAR_TEMP_1, 0 - warp TRAINER_HILL_ENTRANCE, 255, 9, 6 + warp MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6 waitstate end diff --git a/data/map_events.s b/data/map_events.s index 228380e7b4..31b4b00d23 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,6 +1,7 @@ +#include "constants/event_objects.h" #include "constants/flags.h" #include "constants/items.h" -#include "constants/event_objects.h" +#include "constants/maps.h" #include "constants/vars.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/maps.s b/data/maps.s index 8848ac242b..92f5544a19 100644 --- a/data/maps.s +++ b/data/maps.s @@ -1,3 +1,4 @@ +#include "constants/maps.h" #include "constants/songs.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/maps/BattleFrontier_OutsideEast/connections.inc b/data/maps/BattleFrontier_OutsideEast/connections.inc index 5bc70f3b44..5a2d13f7f4 100644 --- a/data/maps/BattleFrontier_OutsideEast/connections.inc +++ b/data/maps/BattleFrontier_OutsideEast/connections.inc @@ -1,5 +1,5 @@ BattleFrontier_OutsideEast_MapConnectionsList: @ 8486EE4 - connection left, 0, BATTLE_FRONTIER_OUTSIDE_WEST, 0 + connection left, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_OutsideEast_MapConnections: @ 8486EF0 .4byte 0x1 diff --git a/data/maps/BattleFrontier_OutsideWest/connections.inc b/data/maps/BattleFrontier_OutsideWest/connections.inc index 2ec2e4348d..1d20172f2b 100644 --- a/data/maps/BattleFrontier_OutsideWest/connections.inc +++ b/data/maps/BattleFrontier_OutsideWest/connections.inc @@ -1,5 +1,5 @@ BattleFrontier_OutsideWest_MapConnectionsList: @ 8486ED0 - connection right, 0, BATTLE_FRONTIER_OUTSIDE_EAST, 0 + connection right, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_OutsideWest_MapConnections: @ 8486EDC .4byte 0x1 diff --git a/data/maps/DewfordTown/connections.inc b/data/maps/DewfordTown/connections.inc index 4386e22958..d030049226 100644 --- a/data/maps/DewfordTown/connections.inc +++ b/data/maps/DewfordTown/connections.inc @@ -1,6 +1,6 @@ DewfordTown_MapConnectionsList: @ 8486640 - connection up, -60, ROUTE_106, 0 - connection right, 0, ROUTE_107, 0 + connection up, -60, MAP_ROUTE106 + connection right, 0, MAP_ROUTE107 DewfordTown_MapConnections: @ 8486658 .4byte 0x2 diff --git a/data/maps/EverGrandeCity/connections.inc b/data/maps/EverGrandeCity/connections.inc index a472e456a8..830240b078 100644 --- a/data/maps/EverGrandeCity/connections.inc +++ b/data/maps/EverGrandeCity/connections.inc @@ -1,5 +1,5 @@ EverGrandeCity_MapConnectionsList: @ 84867F8 - connection left, 40, ROUTE_128, 0 + connection left, 40, MAP_ROUTE128 EverGrandeCity_MapConnections: @ 8486804 .4byte 0x1 diff --git a/data/maps/FallarborTown/connections.inc b/data/maps/FallarborTown/connections.inc index 27b654f905..3808099d88 100644 --- a/data/maps/FallarborTown/connections.inc +++ b/data/maps/FallarborTown/connections.inc @@ -1,6 +1,6 @@ FallarborTown_MapConnectionsList: @ 8486674 - connection left, 0, ROUTE_114, 0 - connection right, 0, ROUTE_113, 0 + connection left, 0, MAP_ROUTE114 + connection right, 0, MAP_ROUTE113 FallarborTown_MapConnections: @ 848668C .4byte 0x2 diff --git a/data/maps/FortreeCity/connections.inc b/data/maps/FortreeCity/connections.inc index 08541215c4..83b48c0ad3 100644 --- a/data/maps/FortreeCity/connections.inc +++ b/data/maps/FortreeCity/connections.inc @@ -1,6 +1,6 @@ FortreeCity_MapConnectionsList: @ 8486784 - connection left, 0, ROUTE_119, 0 - connection right, 0, ROUTE_120, 0 + connection left, 0, MAP_ROUTE119 + connection right, 0, MAP_ROUTE120 FortreeCity_MapConnections: @ 848679C .4byte 0x2 diff --git a/data/maps/LavaridgeTown/connections.inc b/data/maps/LavaridgeTown/connections.inc index c522a3460b..0b8181615c 100644 --- a/data/maps/LavaridgeTown/connections.inc +++ b/data/maps/LavaridgeTown/connections.inc @@ -1,5 +1,5 @@ LavaridgeTown_MapConnectionsList: @ 8486660 - connection right, -40, ROUTE_112, 0 + connection right, -40, MAP_ROUTE112 LavaridgeTown_MapConnections: @ 848666C .4byte 0x1 diff --git a/data/maps/LilycoveCity/connections.inc b/data/maps/LilycoveCity/connections.inc index e19e028291..d5469e561b 100644 --- a/data/maps/LilycoveCity/connections.inc +++ b/data/maps/LilycoveCity/connections.inc @@ -1,6 +1,6 @@ LilycoveCity_MapConnectionsList: @ 84867A4 - connection left, 10, ROUTE_121, 0 - connection right, -10, ROUTE_124, 0 + connection left, 10, MAP_ROUTE121 + connection right, -10, MAP_ROUTE124 LilycoveCity_MapConnections: @ 84867BC .4byte 0x2 diff --git a/data/maps/LittlerootTown/connections.inc b/data/maps/LittlerootTown/connections.inc index 3f8f421f54..0fed8d8e1c 100644 --- a/data/maps/LittlerootTown/connections.inc +++ b/data/maps/LittlerootTown/connections.inc @@ -1,5 +1,5 @@ LittlerootTown_MapConnectionsList: @ 8486600 - connection up, 0, ROUTE_101, 0 + connection up, 0, MAP_ROUTE101 LittlerootTown_MapConnections: @ 848660C .4byte 0x1 diff --git a/data/maps/MauvilleCity/connections.inc b/data/maps/MauvilleCity/connections.inc index 172a7bc058..ee1f4e72a0 100644 --- a/data/maps/MauvilleCity/connections.inc +++ b/data/maps/MauvilleCity/connections.inc @@ -1,8 +1,8 @@ MauvilleCity_MapConnectionsList: @ 8486720 - connection up, 0, ROUTE_111, 0 - connection down, 0, ROUTE_110, 0 - connection left, 0, ROUTE_117, 0 - connection right, 0, ROUTE_118, 0 + connection up, 0, MAP_ROUTE111 + connection down, 0, MAP_ROUTE110 + connection left, 0, MAP_ROUTE117 + connection right, 0, MAP_ROUTE118 MauvilleCity_MapConnections: @ 8486750 .4byte 0x4 diff --git a/data/maps/MossdeepCity/connections.inc b/data/maps/MossdeepCity/connections.inc index 04a3f0c4bb..a1845c04c9 100644 --- a/data/maps/MossdeepCity/connections.inc +++ b/data/maps/MossdeepCity/connections.inc @@ -1,7 +1,7 @@ MossdeepCity_MapConnectionsList: @ 84867C4 - connection up, 0, ROUTE_125, 0 - connection down, 0, ROUTE_127, 0 - connection left, -40, ROUTE_124, 0 + connection up, 0, MAP_ROUTE125 + connection down, 0, MAP_ROUTE127 + connection left, -40, MAP_ROUTE124 MossdeepCity_MapConnections: @ 84867E8 .4byte 0x3 diff --git a/data/maps/OldaleTown/connections.inc b/data/maps/OldaleTown/connections.inc index f6b5336bb8..db0232f834 100644 --- a/data/maps/OldaleTown/connections.inc +++ b/data/maps/OldaleTown/connections.inc @@ -1,7 +1,7 @@ OldaleTown_MapConnectionsList: @ 8486614 - connection up, 0, ROUTE_103, 0 - connection down, 0, ROUTE_101, 0 - connection left, 0, ROUTE_102, 0 + connection up, 0, MAP_ROUTE103 + connection down, 0, MAP_ROUTE101 + connection left, 0, MAP_ROUTE102 OldaleTown_MapConnections: @ 8486638 .4byte 0x3 diff --git a/data/maps/PacifidlogTown/connections.inc b/data/maps/PacifidlogTown/connections.inc index fcbdec008c..5c84301bf5 100644 --- a/data/maps/PacifidlogTown/connections.inc +++ b/data/maps/PacifidlogTown/connections.inc @@ -1,6 +1,6 @@ PacifidlogTown_MapConnectionsList: @ 84866B4 - connection left, 0, ROUTE_132, 0 - connection right, 0, ROUTE_131, 0 + connection left, 0, MAP_ROUTE132 + connection right, 0, MAP_ROUTE131 PacifidlogTown_MapConnections: @ 84866CC .4byte 0x2 diff --git a/data/maps/PetalburgCity/connections.inc b/data/maps/PetalburgCity/connections.inc index 4a75eea3a9..96bd6cbce1 100644 --- a/data/maps/PetalburgCity/connections.inc +++ b/data/maps/PetalburgCity/connections.inc @@ -1,6 +1,6 @@ PetalburgCity_MapConnectionsList: @ 84866D4 - connection left, -50, ROUTE_104, 0 - connection right, 10, ROUTE_102, 0 + connection left, -50, MAP_ROUTE104 + connection right, 10, MAP_ROUTE102 PetalburgCity_MapConnections: @ 84866EC .4byte 0x2 diff --git a/data/maps/Route101/connections.inc b/data/maps/Route101/connections.inc index aee6303526..f5f35e974c 100644 --- a/data/maps/Route101/connections.inc +++ b/data/maps/Route101/connections.inc @@ -1,6 +1,6 @@ Route101_MapConnectionsList: @ 848680C - connection up, 0, OLDALE_TOWN, 0 - connection down, 0, LITTLEROOT_TOWN, 0 + connection up, 0, MAP_OLDALE_TOWN + connection down, 0, MAP_LITTLEROOT_TOWN Route101_MapConnections: @ 8486824 .4byte 0x2 diff --git a/data/maps/Route102/connections.inc b/data/maps/Route102/connections.inc index 7fa2d516f1..419cfeec95 100644 --- a/data/maps/Route102/connections.inc +++ b/data/maps/Route102/connections.inc @@ -1,6 +1,6 @@ Route102_MapConnectionsList: @ 848682C - connection left, -10, PETALBURG_CITY, 0 - connection right, 0, OLDALE_TOWN, 0 + connection left, -10, MAP_PETALBURG_CITY + connection right, 0, MAP_OLDALE_TOWN Route102_MapConnections: @ 8486844 .4byte 0x2 diff --git a/data/maps/Route103/connections.inc b/data/maps/Route103/connections.inc index 10d98cec76..0759d872f4 100644 --- a/data/maps/Route103/connections.inc +++ b/data/maps/Route103/connections.inc @@ -1,6 +1,6 @@ Route103_MapConnectionsList: @ 848684C - connection down, 0, OLDALE_TOWN, 0 - connection right, -60, ROUTE_110, 0 + connection down, 0, MAP_OLDALE_TOWN + connection right, -60, MAP_ROUTE110 Route103_MapConnections: @ 8486864 .4byte 0x2 diff --git a/data/maps/Route104/connections.inc b/data/maps/Route104/connections.inc index 0486aba984..ce605c828f 100644 --- a/data/maps/Route104/connections.inc +++ b/data/maps/Route104/connections.inc @@ -1,7 +1,7 @@ Route104_MapConnectionsList: @ 848686C - connection up, 0, RUSTBORO_CITY, 0 - connection down, 0, ROUTE_105, 0 - connection right, 50, PETALBURG_CITY, 0 + connection up, 0, MAP_RUSTBORO_CITY + connection down, 0, MAP_ROUTE105 + connection right, 50, MAP_PETALBURG_CITY Route104_MapConnections: @ 8486890 .4byte 0x3 diff --git a/data/maps/Route105/connections.inc b/data/maps/Route105/connections.inc index 44357db1e9..ac03944b76 100644 --- a/data/maps/Route105/connections.inc +++ b/data/maps/Route105/connections.inc @@ -1,7 +1,7 @@ Route105_MapConnectionsList: @ 8486898 - connection up, 0, ROUTE_104, 0 - connection down, 0, ROUTE_106, 0 - connection dive, 0, UNDERWATER_6, 0 + connection up, 0, MAP_ROUTE104 + connection down, 0, MAP_ROUTE106 + connection dive, 0, MAP_UNDERWATER6 Route105_MapConnections: @ 84868BC .4byte 0x3 diff --git a/data/maps/Route106/connections.inc b/data/maps/Route106/connections.inc index a3b16c4528..18f181d2b2 100644 --- a/data/maps/Route106/connections.inc +++ b/data/maps/Route106/connections.inc @@ -1,6 +1,6 @@ Route106_MapConnectionsList: @ 84868C4 - connection up, 0, ROUTE_105, 0 - connection down, 60, DEWFORD_TOWN, 0 + connection up, 0, MAP_ROUTE105 + connection down, 60, MAP_DEWFORD_TOWN Route106_MapConnections: @ 84868DC .4byte 0x2 diff --git a/data/maps/Route107/connections.inc b/data/maps/Route107/connections.inc index 2e17530d6c..04ad13b07a 100644 --- a/data/maps/Route107/connections.inc +++ b/data/maps/Route107/connections.inc @@ -1,6 +1,6 @@ Route107_MapConnectionsList: @ 84868E4 - connection left, 0, DEWFORD_TOWN, 0 - connection right, 0, ROUTE_108, 0 + connection left, 0, MAP_DEWFORD_TOWN + connection right, 0, MAP_ROUTE108 Route107_MapConnections: @ 84868FC .4byte 0x2 diff --git a/data/maps/Route108/connections.inc b/data/maps/Route108/connections.inc index 1208a2138c..f80d0ade2c 100644 --- a/data/maps/Route108/connections.inc +++ b/data/maps/Route108/connections.inc @@ -1,6 +1,6 @@ Route108_MapConnectionsList: @ 8486904 - connection left, 0, ROUTE_107, 0 - connection right, -40, ROUTE_109, 0 + connection left, 0, MAP_ROUTE107 + connection right, -40, MAP_ROUTE109 Route108_MapConnections: @ 848691C .4byte 0x2 diff --git a/data/maps/Route109/connections.inc b/data/maps/Route109/connections.inc index 8e1ff175f4..25a7a0e919 100644 --- a/data/maps/Route109/connections.inc +++ b/data/maps/Route109/connections.inc @@ -1,6 +1,6 @@ Route109_MapConnectionsList: @ 8486924 - connection up, 0, SLATEPORT_CITY, 0 - connection left, 40, ROUTE_108, 0 + connection up, 0, MAP_SLATEPORT_CITY + connection left, 40, MAP_ROUTE108 Route109_MapConnections: @ 848693C .4byte 0x2 diff --git a/data/maps/Route110/connections.inc b/data/maps/Route110/connections.inc index 92a12b42a2..22000354f5 100644 --- a/data/maps/Route110/connections.inc +++ b/data/maps/Route110/connections.inc @@ -1,7 +1,7 @@ Route110_MapConnectionsList: @ 8486944 - connection up, 0, MAUVILLE_CITY, 0 - connection down, 0, SLATEPORT_CITY, 0 - connection left, 60, ROUTE_103, 0 + connection up, 0, MAP_MAUVILLE_CITY + connection down, 0, MAP_SLATEPORT_CITY + connection left, 60, MAP_ROUTE103 Route110_MapConnections: @ 8486968 .4byte 0x3 diff --git a/data/maps/Route111/connections.inc b/data/maps/Route111/connections.inc index 8133a0b78c..6a57d275e3 100644 --- a/data/maps/Route111/connections.inc +++ b/data/maps/Route111/connections.inc @@ -1,7 +1,7 @@ Route111_MapConnectionsList: @ 8486970 - connection down, 0, MAUVILLE_CITY, 0 - connection left, 0, ROUTE_113, 0 - connection left, 20, ROUTE_112, 0 + connection down, 0, MAP_MAUVILLE_CITY + connection left, 0, MAP_ROUTE113 + connection left, 20, MAP_ROUTE112 Route111_MapConnections: @ 8486994 .4byte 0x3 diff --git a/data/maps/Route112/connections.inc b/data/maps/Route112/connections.inc index a8d94d7104..132c4ff76e 100644 --- a/data/maps/Route112/connections.inc +++ b/data/maps/Route112/connections.inc @@ -1,7 +1,7 @@ Route112_MapConnectionsList: @ 848699C - connection up, -60, ROUTE_113, 0 - connection left, 40, LAVARIDGE_TOWN, 0 - connection right, -20, ROUTE_111, 0 + connection up, -60, MAP_ROUTE113 + connection left, 40, MAP_LAVARIDGE_TOWN + connection right, -20, MAP_ROUTE111 Route112_MapConnections: @ 84869C0 .4byte 0x3 diff --git a/data/maps/Route113/connections.inc b/data/maps/Route113/connections.inc index 1ba0cf64c3..3067ee23be 100644 --- a/data/maps/Route113/connections.inc +++ b/data/maps/Route113/connections.inc @@ -1,7 +1,7 @@ Route113_MapConnectionsList: @ 84869C8 - connection down, 60, ROUTE_112, 0 - connection left, 0, FALLARBOR_TOWN, 0 - connection right, 0, ROUTE_111, 0 + connection down, 60, MAP_ROUTE112 + connection left, 0, MAP_FALLARBOR_TOWN + connection right, 0, MAP_ROUTE111 Route113_MapConnections: @ 84869EC .4byte 0x3 diff --git a/data/maps/Route114/connections.inc b/data/maps/Route114/connections.inc index 8569b143f3..760c2ddc00 100644 --- a/data/maps/Route114/connections.inc +++ b/data/maps/Route114/connections.inc @@ -1,6 +1,6 @@ Route114_MapConnectionsList: @ 84869F4 - connection left, 40, ROUTE_115, 0 - connection right, 0, FALLARBOR_TOWN, 0 + connection left, 40, MAP_ROUTE115 + connection right, 0, MAP_FALLARBOR_TOWN Route114_MapConnections: @ 8486A0C .4byte 0x2 diff --git a/data/maps/Route115/connections.inc b/data/maps/Route115/connections.inc index 3f283eb91a..4518e31fab 100644 --- a/data/maps/Route115/connections.inc +++ b/data/maps/Route115/connections.inc @@ -1,6 +1,6 @@ Route115_MapConnectionsList: @ 8486A14 - connection down, 0, RUSTBORO_CITY, 0 - connection right, -40, ROUTE_114, 0 + connection down, 0, MAP_RUSTBORO_CITY + connection right, -40, MAP_ROUTE114 Route115_MapConnections: @ 8486A2C .4byte 0x2 diff --git a/data/maps/Route116/connections.inc b/data/maps/Route116/connections.inc index e037bff3bb..fef193c0fc 100644 --- a/data/maps/Route116/connections.inc +++ b/data/maps/Route116/connections.inc @@ -1,6 +1,6 @@ Route116_MapConnectionsList: @ 8486A34 - connection down, 80, VERDANTURF_TOWN, 0 - connection left, 0, RUSTBORO_CITY, 0 + connection down, 80, MAP_VERDANTURF_TOWN + connection left, 0, MAP_RUSTBORO_CITY Route116_MapConnections: @ 8486A4C .4byte 0x2 diff --git a/data/maps/Route117/connections.inc b/data/maps/Route117/connections.inc index ab64dd3b67..2780eac5a4 100644 --- a/data/maps/Route117/connections.inc +++ b/data/maps/Route117/connections.inc @@ -1,6 +1,6 @@ Route117_MapConnectionsList: @ 8486A54 - connection left, 0, VERDANTURF_TOWN, 0 - connection right, 0, MAUVILLE_CITY, 0 + connection left, 0, MAP_VERDANTURF_TOWN + connection right, 0, MAP_MAUVILLE_CITY Route117_MapConnections: @ 8486A6C .4byte 0x2 diff --git a/data/maps/Route118/connections.inc b/data/maps/Route118/connections.inc index fe473be527..8069f036e1 100644 --- a/data/maps/Route118/connections.inc +++ b/data/maps/Route118/connections.inc @@ -1,7 +1,7 @@ Route118_MapConnectionsList: @ 8486A74 - connection up, 40, ROUTE_119, 0 - connection left, 0, MAUVILLE_CITY, 0 - connection right, 0, ROUTE_123, 0 + connection up, 40, MAP_ROUTE119 + connection left, 0, MAP_MAUVILLE_CITY + connection right, 0, MAP_ROUTE123 Route118_MapConnections: @ 8486A98 .4byte 0x3 diff --git a/data/maps/Route119/connections.inc b/data/maps/Route119/connections.inc index 20dd274988..4987e049e2 100644 --- a/data/maps/Route119/connections.inc +++ b/data/maps/Route119/connections.inc @@ -1,6 +1,6 @@ Route119_MapConnectionsList: @ 8486AA0 - connection down, -40, ROUTE_118, 0 - connection right, 0, FORTREE_CITY, 0 + connection down, -40, MAP_ROUTE118 + connection right, 0, MAP_FORTREE_CITY Route119_MapConnections: @ 8486AB8 .4byte 0x2 diff --git a/data/maps/Route120/connections.inc b/data/maps/Route120/connections.inc index f05e657395..c599e6a2cc 100644 --- a/data/maps/Route120/connections.inc +++ b/data/maps/Route120/connections.inc @@ -1,6 +1,6 @@ Route120_MapConnectionsList: @ 8486AC0 - connection left, 0, FORTREE_CITY, 0 - connection right, 80, ROUTE_121, 0 + connection left, 0, MAP_FORTREE_CITY + connection right, 80, MAP_ROUTE121 Route120_MapConnections: @ 8486AD8 .4byte 0x2 diff --git a/data/maps/Route121/connections.inc b/data/maps/Route121/connections.inc index 47d55b65dd..94116a03e0 100644 --- a/data/maps/Route121/connections.inc +++ b/data/maps/Route121/connections.inc @@ -1,7 +1,7 @@ Route121_MapConnectionsList: @ 8486AE0 - connection down, 20, ROUTE_122, 0 - connection left, -80, ROUTE_120, 0 - connection right, -10, LILYCOVE_CITY, 0 + connection down, 20, MAP_ROUTE122 + connection left, -80, MAP_ROUTE120 + connection right, -10, MAP_LILYCOVE_CITY Route121_MapConnections: @ 8486B04 .4byte 0x3 diff --git a/data/maps/Route122/connections.inc b/data/maps/Route122/connections.inc index 2d6f53859e..2a0442a05e 100644 --- a/data/maps/Route122/connections.inc +++ b/data/maps/Route122/connections.inc @@ -1,6 +1,6 @@ Route122_MapConnectionsList: @ 8486B0C - connection up, -20, ROUTE_121, 0 - connection down, -100, ROUTE_123, 0 + connection up, -20, MAP_ROUTE121 + connection down, -100, MAP_ROUTE123 Route122_MapConnections: @ 8486B24 .4byte 0x2 diff --git a/data/maps/Route123/connections.inc b/data/maps/Route123/connections.inc index ef10fb9740..616c365ef3 100644 --- a/data/maps/Route123/connections.inc +++ b/data/maps/Route123/connections.inc @@ -1,6 +1,6 @@ Route123_MapConnectionsList: @ 8486B2C - connection up, 100, ROUTE_122, 0 - connection left, 0, ROUTE_118, 0 + connection up, 100, MAP_ROUTE122 + connection left, 0, MAP_ROUTE118 Route123_MapConnections: @ 8486B44 .4byte 0x2 diff --git a/data/maps/Route124/connections.inc b/data/maps/Route124/connections.inc index 72e358f4cf..ed10daab9c 100644 --- a/data/maps/Route124/connections.inc +++ b/data/maps/Route124/connections.inc @@ -1,9 +1,9 @@ Route124_MapConnectionsList: @ 8486B4C - connection down, 0, ROUTE_126, 0 - connection left, 10, LILYCOVE_CITY, 0 - connection right, 0, ROUTE_125, 0 - connection right, 40, MOSSDEEP_CITY, 0 - connection dive, 0, UNDERWATER_1, 0 + connection down, 0, MAP_ROUTE126 + connection left, 10, MAP_LILYCOVE_CITY + connection right, 0, MAP_ROUTE125 + connection right, 40, MAP_MOSSDEEP_CITY + connection dive, 0, MAP_UNDERWATER1 Route124_MapConnections: @ 8486B88 .4byte 0x5 diff --git a/data/maps/Route125/connections.inc b/data/maps/Route125/connections.inc index 1abbf09791..2b5f944c9a 100644 --- a/data/maps/Route125/connections.inc +++ b/data/maps/Route125/connections.inc @@ -1,7 +1,7 @@ Route125_MapConnectionsList: @ 8486B90 - connection down, 0, MOSSDEEP_CITY, 0 - connection left, 0, ROUTE_124, 0 - connection dive, 0, UNDERWATER_7, 0 + connection down, 0, MAP_MOSSDEEP_CITY + connection left, 0, MAP_ROUTE124 + connection dive, 0, MAP_UNDERWATER7 Route125_MapConnections: @ 8486BB4 .4byte 0x3 diff --git a/data/maps/Route126/connections.inc b/data/maps/Route126/connections.inc index c2beee1d8a..b1f0f6d819 100644 --- a/data/maps/Route126/connections.inc +++ b/data/maps/Route126/connections.inc @@ -1,7 +1,7 @@ Route126_MapConnectionsList: @ 8486BBC - connection up, 0, ROUTE_124, 0 - connection right, 0, ROUTE_127, 0 - connection dive, 0, UNDERWATER_2, 0 + connection up, 0, MAP_ROUTE124 + connection right, 0, MAP_ROUTE127 + connection dive, 0, MAP_UNDERWATER2 Route126_MapConnections: @ 8486BE0 .4byte 0x3 diff --git a/data/maps/Route127/connections.inc b/data/maps/Route127/connections.inc index 2b4136c3c9..3ad7057a3e 100644 --- a/data/maps/Route127/connections.inc +++ b/data/maps/Route127/connections.inc @@ -1,8 +1,8 @@ Route127_MapConnectionsList: @ 8486BE8 - connection up, 0, MOSSDEEP_CITY, 0 - connection down, 0, ROUTE_128, 0 - connection left, 0, ROUTE_126, 0 - connection dive, 0, UNDERWATER_3, 0 + connection up, 0, MAP_MOSSDEEP_CITY + connection down, 0, MAP_ROUTE128 + connection left, 0, MAP_ROUTE126 + connection dive, 0, MAP_UNDERWATER3 Route127_MapConnections: @ 8486C18 .4byte 0x4 diff --git a/data/maps/Route128/connections.inc b/data/maps/Route128/connections.inc index 5355677de5..5b2f0665d4 100644 --- a/data/maps/Route128/connections.inc +++ b/data/maps/Route128/connections.inc @@ -1,8 +1,8 @@ Route128_MapConnectionsList: @ 8486C20 - connection up, 0, ROUTE_127, 0 - connection down, 0, ROUTE_129, 0 - connection right, -40, EVER_GRANDE_CITY, 0 - connection dive, 0, UNDERWATER_4, 0 + connection up, 0, MAP_ROUTE127 + connection down, 0, MAP_ROUTE129 + connection right, -40, MAP_EVER_GRANDE_CITY + connection dive, 0, MAP_UNDERWATER4 Route128_MapConnections: @ 8486C50 .4byte 0x4 diff --git a/data/maps/Route129/connections.inc b/data/maps/Route129/connections.inc index f373faff21..1293e82353 100644 --- a/data/maps/Route129/connections.inc +++ b/data/maps/Route129/connections.inc @@ -1,7 +1,7 @@ Route129_MapConnectionsList: @ 8486C58 - connection up, 0, ROUTE_128, 0 - connection left, 0, ROUTE_130, 0 - connection dive, 0, UNDERWATER_5, 0 + connection up, 0, MAP_ROUTE128 + connection left, 0, MAP_ROUTE130 + connection dive, 0, MAP_UNDERWATER5 Route129_MapConnections: @ 8486C7C .4byte 0x3 diff --git a/data/maps/Route130/connections.inc b/data/maps/Route130/connections.inc index f4972fa38f..b977d43bca 100644 --- a/data/maps/Route130/connections.inc +++ b/data/maps/Route130/connections.inc @@ -1,6 +1,6 @@ Route130_MapConnectionsList: @ 8486C84 - connection left, 0, ROUTE_131, 0 - connection right, 0, ROUTE_129, 0 + connection left, 0, MAP_ROUTE131 + connection right, 0, MAP_ROUTE129 Route130_MapConnections: @ 8486C9C .4byte 0x2 diff --git a/data/maps/Route131/connections.inc b/data/maps/Route131/connections.inc index 4470802dd2..150ea7023c 100644 --- a/data/maps/Route131/connections.inc +++ b/data/maps/Route131/connections.inc @@ -1,6 +1,6 @@ Route131_MapConnectionsList: @ 8486CA4 - connection left, 0, PACIFIDLOG_TOWN, 0 - connection right, 0, ROUTE_130, 0 + connection left, 0, MAP_PACIFIDLOG_TOWN + connection right, 0, MAP_ROUTE130 Route131_MapConnections: @ 8486CBC .4byte 0x2 diff --git a/data/maps/Route132/connections.inc b/data/maps/Route132/connections.inc index 0e18aa2f2f..5a70e34717 100644 --- a/data/maps/Route132/connections.inc +++ b/data/maps/Route132/connections.inc @@ -1,6 +1,6 @@ Route132_MapConnectionsList: @ 8486CC4 - connection left, 0, ROUTE_133, 0 - connection right, 0, PACIFIDLOG_TOWN, 0 + connection left, 0, MAP_ROUTE133 + connection right, 0, MAP_PACIFIDLOG_TOWN Route132_MapConnections: @ 8486CDC .4byte 0x2 diff --git a/data/maps/Route133/connections.inc b/data/maps/Route133/connections.inc index b133d8804a..1f22ea9605 100644 --- a/data/maps/Route133/connections.inc +++ b/data/maps/Route133/connections.inc @@ -1,6 +1,6 @@ Route133_MapConnectionsList: @ 8486CE4 - connection left, 0, ROUTE_134, 0 - connection right, 0, ROUTE_132, 0 + connection left, 0, MAP_ROUTE134 + connection right, 0, MAP_ROUTE132 Route133_MapConnections: @ 8486CFC .4byte 0x2 diff --git a/data/maps/Route134/connections.inc b/data/maps/Route134/connections.inc index 8429378e4e..861c82b4d1 100644 --- a/data/maps/Route134/connections.inc +++ b/data/maps/Route134/connections.inc @@ -1,6 +1,6 @@ Route134_MapConnectionsList: @ 8486D04 - connection left, 0, SLATEPORT_CITY, 0 - connection right, 0, ROUTE_133, 0 + connection left, 0, MAP_SLATEPORT_CITY + connection right, 0, MAP_ROUTE133 Route134_MapConnections: @ 8486D1C .4byte 0x2 diff --git a/data/maps/RustboroCity/connections.inc b/data/maps/RustboroCity/connections.inc index 01e5aff355..dbca1662d0 100644 --- a/data/maps/RustboroCity/connections.inc +++ b/data/maps/RustboroCity/connections.inc @@ -1,7 +1,7 @@ RustboroCity_MapConnectionsList: @ 8486758 - connection up, 0, ROUTE_115, 0 - connection down, 0, ROUTE_104, 0 - connection right, 0, ROUTE_116, 0 + connection up, 0, MAP_ROUTE115 + connection down, 0, MAP_ROUTE104 + connection right, 0, MAP_ROUTE116 RustboroCity_MapConnections: @ 848677C .4byte 0x3 diff --git a/data/maps/SafariZone_North/connections.inc b/data/maps/SafariZone_North/connections.inc index c2052ea074..d99826f0d3 100644 --- a/data/maps/SafariZone_North/connections.inc +++ b/data/maps/SafariZone_North/connections.inc @@ -1,7 +1,7 @@ SafariZone_North_MapConnectionsList: @ 8486E18 - connection left, 0, SAFARI_ZONE_NORTHWEST, 0 - connection down, 0, SAFARI_ZONE_SOUTH, 0 - connection right, 0, SAFARI_ZONE_NORTHEAST, 0 + connection left, 0, MAP_SAFARI_ZONE_NORTHWEST + connection down, 0, MAP_SAFARI_ZONE_SOUTH + connection right, 0, MAP_SAFARI_ZONE_NORTHEAST SafariZone_North_MapConnections: @ 8486E3C .4byte 0x3 diff --git a/data/maps/SafariZone_Northeast/connections.inc b/data/maps/SafariZone_Northeast/connections.inc index c23dd3e4c7..c762c485ae 100644 --- a/data/maps/SafariZone_Northeast/connections.inc +++ b/data/maps/SafariZone_Northeast/connections.inc @@ -1,6 +1,6 @@ SafariZone_Northeast_MapConnectionsList: @ 8486E90 - connection left, 0, SAFARI_ZONE_NORTH, 0 - connection down, 0, SAFARI_ZONE_SOUTHEAST, 0 + connection left, 0, MAP_SAFARI_ZONE_NORTH + connection down, 0, MAP_SAFARI_ZONE_SOUTHEAST SafariZone_Northeast_MapConnections: @ 8486EA8 .4byte 0x2 diff --git a/data/maps/SafariZone_Northwest/connections.inc b/data/maps/SafariZone_Northwest/connections.inc index 9a466f082f..010a13cc23 100644 --- a/data/maps/SafariZone_Northwest/connections.inc +++ b/data/maps/SafariZone_Northwest/connections.inc @@ -1,6 +1,6 @@ SafariZone_Northwest_MapConnectionsList: @ 8486DF8 - connection right, 0, SAFARI_ZONE_NORTH, 0 - connection down, 0, SAFARI_ZONE_SOUTHWEST, 0 + connection right, 0, MAP_SAFARI_ZONE_NORTH + connection down, 0, MAP_SAFARI_ZONE_SOUTHWEST SafariZone_Northwest_MapConnections: @ 8486E10 .4byte 0x2 diff --git a/data/maps/SafariZone_South/connections.inc b/data/maps/SafariZone_South/connections.inc index 79ba1a0109..856bb30aba 100644 --- a/data/maps/SafariZone_South/connections.inc +++ b/data/maps/SafariZone_South/connections.inc @@ -1,7 +1,7 @@ SafariZone_South_MapConnectionsList: @ 8486E64 - connection up, 0, SAFARI_ZONE_NORTH, 0 - connection left, 0, SAFARI_ZONE_SOUTHWEST, 0 - connection right, 0, SAFARI_ZONE_SOUTHEAST, 0 + connection up, 0, MAP_SAFARI_ZONE_NORTH + connection left, 0, MAP_SAFARI_ZONE_SOUTHWEST + connection right, 0, MAP_SAFARI_ZONE_SOUTHEAST SafariZone_South_MapConnections: @ 8486E88 .4byte 0x3 diff --git a/data/maps/SafariZone_Southeast/connections.inc b/data/maps/SafariZone_Southeast/connections.inc index 4855182e9a..16b39e87b7 100644 --- a/data/maps/SafariZone_Southeast/connections.inc +++ b/data/maps/SafariZone_Southeast/connections.inc @@ -1,6 +1,6 @@ SafariZone_Southeast_MapConnectionsList: @ 8486EB0 - connection left, 0, SAFARI_ZONE_SOUTH, 0 - connection up, 0, SAFARI_ZONE_NORTHEAST, 0 + connection left, 0, MAP_SAFARI_ZONE_SOUTH + connection up, 0, MAP_SAFARI_ZONE_NORTHEAST SafariZone_Southeast_MapConnections: @ 8486EC8 .4byte 0x2 diff --git a/data/maps/SafariZone_Southwest/connections.inc b/data/maps/SafariZone_Southwest/connections.inc index 936a1dc822..83398e3a3d 100644 --- a/data/maps/SafariZone_Southwest/connections.inc +++ b/data/maps/SafariZone_Southwest/connections.inc @@ -1,6 +1,6 @@ SafariZone_Southwest_MapConnectionsList: @ 8486E44 - connection up, 0, SAFARI_ZONE_NORTHWEST, 0 - connection right, 0, SAFARI_ZONE_SOUTH, 0 + connection up, 0, MAP_SAFARI_ZONE_NORTHWEST + connection right, 0, MAP_SAFARI_ZONE_SOUTH SafariZone_Southwest_MapConnections: @ 8486E5C .4byte 0x2 diff --git a/data/maps/SlateportCity/connections.inc b/data/maps/SlateportCity/connections.inc index d8544954af..1485b313b6 100644 --- a/data/maps/SlateportCity/connections.inc +++ b/data/maps/SlateportCity/connections.inc @@ -1,7 +1,7 @@ SlateportCity_MapConnectionsList: @ 84866F4 - connection up, 0, ROUTE_110, 0 - connection down, 0, ROUTE_109, 0 - connection right, 0, ROUTE_134, 0 + connection up, 0, MAP_ROUTE110 + connection down, 0, MAP_ROUTE109 + connection right, 0, MAP_ROUTE134 SlateportCity_MapConnections: @ 8486718 .4byte 0x3 diff --git a/data/maps/Underwater1/connections.inc b/data/maps/Underwater1/connections.inc index 6215c5e88a..b0b1aa108a 100644 --- a/data/maps/Underwater1/connections.inc +++ b/data/maps/Underwater1/connections.inc @@ -1,6 +1,6 @@ Underwater1_MapConnectionsList: @ 8486D38 - connection down, 0, UNDERWATER_2, 0 - connection emerge, 0, ROUTE_124, 0 + connection down, 0, MAP_UNDERWATER2 + connection emerge, 0, MAP_ROUTE124 Underwater1_MapConnections: @ 8486D50 .4byte 0x2 diff --git a/data/maps/Underwater2/connections.inc b/data/maps/Underwater2/connections.inc index 20ef02321d..11df3eaec0 100644 --- a/data/maps/Underwater2/connections.inc +++ b/data/maps/Underwater2/connections.inc @@ -1,7 +1,7 @@ Underwater2_MapConnectionsList: @ 8486D6C - connection up, 0, UNDERWATER_1, 0 - connection right, 0, UNDERWATER_3, 0 - connection emerge, 0, ROUTE_126, 0 + connection up, 0, MAP_UNDERWATER1 + connection right, 0, MAP_UNDERWATER3 + connection emerge, 0, MAP_ROUTE126 Underwater2_MapConnections: @ 8486D90 .4byte 0x3 diff --git a/data/maps/Underwater3/connections.inc b/data/maps/Underwater3/connections.inc index 30ab15908a..db8b0947b8 100644 --- a/data/maps/Underwater3/connections.inc +++ b/data/maps/Underwater3/connections.inc @@ -1,7 +1,7 @@ Underwater3_MapConnectionsList: @ 8486D98 - connection emerge, 0, ROUTE_127, 0 - connection left, 0, UNDERWATER_2, 0 - connection down, 0, UNDERWATER_4, 0 + connection emerge, 0, MAP_ROUTE127 + connection left, 0, MAP_UNDERWATER2 + connection down, 0, MAP_UNDERWATER4 Underwater3_MapConnections: @ 8486DBC .4byte 0x3 diff --git a/data/maps/Underwater4/connections.inc b/data/maps/Underwater4/connections.inc index 61880749bd..8a63d54a46 100644 --- a/data/maps/Underwater4/connections.inc +++ b/data/maps/Underwater4/connections.inc @@ -1,6 +1,6 @@ Underwater4_MapConnectionsList: @ 8486DC4 - connection up, 0, UNDERWATER_3, 0 - connection emerge, 0, ROUTE_128, 0 + connection up, 0, MAP_UNDERWATER3 + connection emerge, 0, MAP_ROUTE128 Underwater4_MapConnections: @ 8486DDC .4byte 0x2 diff --git a/data/maps/Underwater5/connections.inc b/data/maps/Underwater5/connections.inc index 6eafa49d67..15a3322edb 100644 --- a/data/maps/Underwater5/connections.inc +++ b/data/maps/Underwater5/connections.inc @@ -1,5 +1,5 @@ Underwater5_MapConnectionsList: @ 8486DE4 - connection emerge, 0, ROUTE_129, 0 + connection emerge, 0, MAP_ROUTE129 Underwater5_MapConnections: @ 8486DF0 .4byte 0x1 diff --git a/data/maps/Underwater6/connections.inc b/data/maps/Underwater6/connections.inc index 4d2960b366..432ab625f9 100644 --- a/data/maps/Underwater6/connections.inc +++ b/data/maps/Underwater6/connections.inc @@ -1,5 +1,5 @@ Underwater6_MapConnectionsList: @ 8486D24 - connection emerge, 0, ROUTE_105, 0 + connection emerge, 0, MAP_ROUTE105 Underwater6_MapConnections: @ 8486D30 .4byte 0x1 diff --git a/data/maps/Underwater7/connections.inc b/data/maps/Underwater7/connections.inc index 16d0e47e55..82803997c1 100644 --- a/data/maps/Underwater7/connections.inc +++ b/data/maps/Underwater7/connections.inc @@ -1,5 +1,5 @@ Underwater7_MapConnectionsList: @ 8486D58 - connection emerge, 0, ROUTE_125, 0 + connection emerge, 0, MAP_ROUTE125 Underwater7_MapConnections: @ 8486D64 .4byte 0x1 diff --git a/data/maps/VerdanturfTown/connections.inc b/data/maps/VerdanturfTown/connections.inc index 0e2abd0af5..de6fdface3 100644 --- a/data/maps/VerdanturfTown/connections.inc +++ b/data/maps/VerdanturfTown/connections.inc @@ -1,6 +1,6 @@ VerdanturfTown_MapConnectionsList: @ 8486694 - connection up, -80, ROUTE_116, 0 - connection right, 0, ROUTE_117, 0 + connection up, -80, MAP_ROUTE116 + connection right, 0, MAP_ROUTE117 VerdanturfTown_MapConnections: @ 84866AC .4byte 0x2 diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.inc b/data/maps/events/AbandonedShip_CaptainsOffice.inc index ddfab5eab9..c66185abf7 100644 --- a/data/maps/events/AbandonedShip_CaptainsOffice.inc +++ b/data/maps/events/AbandonedShip_CaptainsOffice.inc @@ -3,8 +3,8 @@ AbandonedShip_CaptainsOffice_EventObjects: @ 8536A5C object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 6, 3, 1, 17, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100, 0, 0 AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C - warp_def 7, 6, 3, 4, ABANDONED_SHIP_DECK - warp_def 8, 6, 3, 4, ABANDONED_SHIP_DECK + warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK + warp_def 8, 6, 3, 4, MAP_ABANDONED_SHIP_DECK AbandonedShip_CaptainsOffice_MapEvents:: @ 8536A9C map_events AbandonedShip_CaptainsOffice_EventObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Corridors_1F.inc b/data/maps/events/AbandonedShip_Corridors_1F.inc index c3cf0f54df..60e5a0f4f8 100644 --- a/data/maps/events/AbandonedShip_Corridors_1F.inc +++ b/data/maps/events/AbandonedShip_Corridors_1F.inc @@ -3,18 +3,18 @@ AbandonedShip_Corridors_1F_EventObjects: @ 85366C0 object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 0, 5, 10, 3, 45, 116, 0, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0, 0, 0 AbandonedShip_Corridors_1F_MapWarps: @ 85366F0 - warp_def 9, 11, 3, 2, ABANDONED_SHIP_DECK - warp_def 8, 11, 3, 2, ABANDONED_SHIP_DECK - warp_def 0, 11, 3, 3, ABANDONED_SHIP_DECK - warp_def 1, 11, 3, 3, ABANDONED_SHIP_DECK - warp_def 11, 9, 3, 0, ABANDONED_SHIP_ROOMS_1F - warp_def 14, 9, 3, 3, ABANDONED_SHIP_ROOMS_1F - warp_def 11, 3, 3, 2, ABANDONED_SHIP_ROOMS_1F - warp_def 14, 3, 3, 4, ABANDONED_SHIP_ROOMS_1F - warp_def 3, 9, 3, 0, ABANDONED_SHIP_ROOMS_2_1F - warp_def 16, 2, 3, 7, ABANDONED_SHIP_CORRIDORS_B1F - warp_def 5, 2, 3, 6, ABANDONED_SHIP_CORRIDORS_B1F - warp_def 3, 3, 3, 2, ABANDONED_SHIP_ROOMS_2_1F + warp_def 9, 11, 3, 2, MAP_ABANDONED_SHIP_DECK + warp_def 8, 11, 3, 2, MAP_ABANDONED_SHIP_DECK + warp_def 0, 11, 3, 3, MAP_ABANDONED_SHIP_DECK + warp_def 1, 11, 3, 3, MAP_ABANDONED_SHIP_DECK + warp_def 11, 9, 3, 0, MAP_ABANDONED_SHIP_ROOMS_1F + warp_def 14, 9, 3, 3, MAP_ABANDONED_SHIP_ROOMS_1F + warp_def 11, 3, 3, 2, MAP_ABANDONED_SHIP_ROOMS_1F + warp_def 14, 3, 3, 4, MAP_ABANDONED_SHIP_ROOMS_1F + warp_def 3, 9, 3, 0, MAP_ABANDONED_SHIP_ROOMS2_1F + warp_def 16, 2, 3, 7, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 5, 2, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 3, 3, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_1F AbandonedShip_Corridors_1F_MapEvents:: @ 8536750 map_events AbandonedShip_Corridors_1F_EventObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Corridors_B1F.inc b/data/maps/events/AbandonedShip_Corridors_B1F.inc index 8903de1970..7fb31aca0a 100644 --- a/data/maps/events/AbandonedShip_Corridors_B1F.inc +++ b/data/maps/events/AbandonedShip_Corridors_B1F.inc @@ -3,14 +3,14 @@ AbandonedShip_Corridors_B1F_EventObjects: @ 8536808 object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 9, 6, 3, 14, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0, 0, 0 AbandonedShip_Corridors_B1F_MapWarps: @ 8536838 - warp_def 6, 4, 3, 2, ABANDONED_SHIP_ROOMS_2_B1F - warp_def 3, 4, 3, 0, ABANDONED_SHIP_ROOMS_2_B1F - warp_def 5, 7, 3, 0, ABANDONED_SHIP_ROOMS_B1F - warp_def 8, 7, 3, 1, ABANDONED_SHIP_ROOMS_B1F - warp_def 11, 7, 3, 2, ABANDONED_SHIP_ROOMS_B1F - warp_def 11, 4, 3, 0, ABANDONED_SHIP_ROOM_B1F - warp_def 0, 2, 3, 10, ABANDONED_SHIP_CORRIDORS_1F - warp_def 8, 2, 3, 9, ABANDONED_SHIP_CORRIDORS_1F + warp_def 6, 4, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_B1F + warp_def 3, 4, 3, 0, MAP_ABANDONED_SHIP_ROOMS2_B1F + warp_def 5, 7, 3, 0, MAP_ABANDONED_SHIP_ROOMS_B1F + warp_def 8, 7, 3, 1, MAP_ABANDONED_SHIP_ROOMS_B1F + warp_def 11, 7, 3, 2, MAP_ABANDONED_SHIP_ROOMS_B1F + warp_def 11, 4, 3, 0, MAP_ABANDONED_SHIP_ROOM_B1F + warp_def 0, 2, 3, 10, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 8, 2, 3, 9, MAP_ABANDONED_SHIP_CORRIDORS_1F AbandonedShip_Corridors_B1F_MapBGEvents: @ 8536878 bg_event 11, 4, 3, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DC8 diff --git a/data/maps/events/AbandonedShip_Deck.inc b/data/maps/events/AbandonedShip_Deck.inc index ca01ccec8f..289f917af4 100644 --- a/data/maps/events/AbandonedShip_Deck.inc +++ b/data/maps/events/AbandonedShip_Deck.inc @@ -1,9 +1,9 @@ AbandonedShip_Deck_MapWarps: @ 8536684 - warp_def 13, 15, 3, 0, ROUTE_108 - warp_def 14, 15, 3, 0, ROUTE_108 - warp_def 13, 9, 3, 1, ABANDONED_SHIP_CORRIDORS_1F - warp_def 8, 9, 3, 2, ABANDONED_SHIP_CORRIDORS_1F - warp_def 12, 5, 3, 0, ABANDONED_SHIP_CAPTAINS_OFFICE + warp_def 13, 15, 3, 0, MAP_ROUTE108 + warp_def 14, 15, 3, 0, MAP_ROUTE108 + warp_def 13, 9, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 8, 9, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 12, 5, 3, 0, MAP_ABANDONED_SHIP_CAPTAINS_OFFICE AbandonedShip_Deck_MapEvents:: @ 85366AC map_events 0x0, AbandonedShip_Deck_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc b/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc index 3bff540763..fd5cb4ac83 100644 --- a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc @@ -1,10 +1,10 @@ AbandonedShip_HiddenFloorCorridors_MapWarps: @ 8536ACC - warp_def 3, 8, 3, 0, ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - warp_def 6, 8, 3, 2, ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - warp_def 9, 8, 3, 4, ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - warp_def 3, 3, 3, 6, ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - warp_def 6, 3, 3, 7, ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - warp_def 9, 3, 3, 8, ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS + warp_def 3, 8, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS + warp_def 6, 8, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS + warp_def 9, 8, 3, 4, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS + warp_def 3, 3, 3, 6, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS + warp_def 6, 3, 3, 7, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS + warp_def 9, 3, 3, 8, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS AbandonedShip_HiddenFloorCorridors_MapBGEvents: @ 8536AFC bg_event 3, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A19 diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc index 27756e5a3a..239d6a4558 100644 --- a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc +++ b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc @@ -5,15 +5,15 @@ AbandonedShip_HiddenFloorRooms_EventObjects: @ 8536B40 object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 11, 3, 1, 17, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101, 0, 0 AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0 - warp_def 6, 14, 3, 0, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 7, 14, 3, 0, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 21, 14, 3, 1, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 22, 14, 3, 1, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 36, 14, 3, 2, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 37, 14, 3, 2, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 6, 1, 3, 3, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 21, 1, 3, 4, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 36, 1, 3, 5, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 7, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 21, 14, 3, 1, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 22, 14, 3, 1, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 36, 14, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 37, 14, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 6, 1, 3, 3, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 21, 1, 3, 4, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 36, 1, 3, 5, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8 bg_event 42, 10, 3, 7, 0, ITEM_ROOM_1_KEY, 31, 0 diff --git a/data/maps/events/AbandonedShip_Room_B1F.inc b/data/maps/events/AbandonedShip_Room_B1F.inc index 67411fcf91..10bcc33dd0 100644 --- a/data/maps/events/AbandonedShip_Room_B1F.inc +++ b/data/maps/events/AbandonedShip_Room_B1F.inc @@ -2,8 +2,8 @@ AbandonedShip_Room_B1F_EventObjects: @ 853697C object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 17, 0, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098, 0, 0 AbandonedShip_Room_B1F_MapWarps: @ 8536994 - warp_def 4, 7, 3, 5, ABANDONED_SHIP_CORRIDORS_B1F - warp_def 5, 7, 3, 5, ABANDONED_SHIP_CORRIDORS_B1F + warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 5, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F AbandonedShip_Room_B1F_MapEvents:: @ 85369A4 map_events AbandonedShip_Room_B1F_EventObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.inc b/data/maps/events/AbandonedShip_Rooms2_1F.inc index 4791919f67..18b2b031d1 100644 --- a/data/maps/events/AbandonedShip_Rooms2_1F.inc +++ b/data/maps/events/AbandonedShip_Rooms2_1F.inc @@ -6,9 +6,9 @@ AbandonedShip_Rooms2_1F_EventObjects: @ 85369B8 object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 0, 7, 2, 3, 9, 17, 0, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0, 0, 0 AbandonedShip_Rooms2_1F_MapWarps: @ 8536A30 - warp_def 4, 16, 3, 8, ABANDONED_SHIP_CORRIDORS_1F - warp_def 5, 16, 3, 8, ABANDONED_SHIP_CORRIDORS_1F - warp_def 4, 1, 3, 11, ABANDONED_SHIP_CORRIDORS_1F + warp_def 4, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 5, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 4, 1, 3, 11, MAP_ABANDONED_SHIP_CORRIDORS_1F AbandonedShip_Rooms2_1F_MapEvents:: @ 8536A48 map_events AbandonedShip_Rooms2_1F_EventObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.inc b/data/maps/events/AbandonedShip_Rooms2_B1F.inc index e28a2ed5b8..4bd68449cd 100644 --- a/data/maps/events/AbandonedShip_Rooms2_B1F.inc +++ b/data/maps/events/AbandonedShip_Rooms2_B1F.inc @@ -3,10 +3,10 @@ AbandonedShip_Rooms2_B1F_EventObjects: @ 85368F4 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 3, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097, 0, 0 AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924 - warp_def 4, 7, 3, 1, ABANDONED_SHIP_CORRIDORS_B1F - warp_def 5, 7, 3, 1, ABANDONED_SHIP_CORRIDORS_B1F - warp_def 13, 7, 3, 0, ABANDONED_SHIP_CORRIDORS_B1F - warp_def 14, 7, 3, 0, ABANDONED_SHIP_CORRIDORS_B1F + warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 5, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 13, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 14, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F AbandonedShip_Rooms2_B1F_MapEvents:: @ 8536944 map_events AbandonedShip_Rooms2_B1F_EventObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms_1F.inc b/data/maps/events/AbandonedShip_Rooms_1F.inc index fe9b6f7daf..a3b61b7e9e 100644 --- a/data/maps/events/AbandonedShip_Rooms_1F.inc +++ b/data/maps/events/AbandonedShip_Rooms_1F.inc @@ -5,12 +5,12 @@ AbandonedShip_Rooms_1F_EventObjects: @ 8536764 object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 10, 16, 3, 16, 17, 0, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0, 0, 0 AbandonedShip_Rooms_1F_MapWarps: @ 85367C4 - warp_def 4, 16, 3, 4, ABANDONED_SHIP_CORRIDORS_1F - warp_def 5, 16, 3, 4, ABANDONED_SHIP_CORRIDORS_1F - warp_def 4, 1, 3, 6, ABANDONED_SHIP_CORRIDORS_1F - warp_def 13, 16, 3, 5, ABANDONED_SHIP_CORRIDORS_1F - warp_def 13, 1, 3, 7, ABANDONED_SHIP_CORRIDORS_1F - warp_def 14, 16, 3, 5, ABANDONED_SHIP_CORRIDORS_1F + warp_def 4, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 5, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 4, 1, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 13, 16, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 13, 1, 3, 7, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 14, 16, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_1F AbandonedShip_Rooms_1F_MapEvents:: @ 85367F4 map_events AbandonedShip_Rooms_1F_EventObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.inc b/data/maps/events/AbandonedShip_Rooms_B1F.inc index 631b33746d..03690b801d 100644 --- a/data/maps/events/AbandonedShip_Rooms_B1F.inc +++ b/data/maps/events/AbandonedShip_Rooms_B1F.inc @@ -3,9 +3,9 @@ AbandonedShip_Rooms_B1F_EventObjects: @ 8536898 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 7, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096, 0, 0 AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8 - warp_def 4, 1, 3, 2, ABANDONED_SHIP_CORRIDORS_B1F - warp_def 13, 1, 3, 3, ABANDONED_SHIP_CORRIDORS_B1F - warp_def 22, 1, 3, 4, ABANDONED_SHIP_CORRIDORS_B1F + warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 13, 1, 3, 3, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 22, 1, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_B1F AbandonedShip_Rooms_B1F_MapEvents:: @ 85368E0 map_events AbandonedShip_Rooms_B1F_EventObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Underwater1.inc b/data/maps/events/AbandonedShip_Underwater1.inc index a92bed4222..5c9af3c107 100644 --- a/data/maps/events/AbandonedShip_Underwater1.inc +++ b/data/maps/events/AbandonedShip_Underwater1.inc @@ -1,6 +1,6 @@ AbandonedShip_Underwater1_MapWarps: @ 8536958 - warp_def 3, 7, 3, 0, ABANDONED_SHIP_UNDERWATER_2 - warp_def 4, 7, 3, 0, ABANDONED_SHIP_UNDERWATER_2 + warp_def 3, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2 + warp_def 4, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2 AbandonedShip_Underwater1_MapEvents:: @ 8536968 map_events 0x0, AbandonedShip_Underwater1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Underwater2.inc b/data/maps/events/AbandonedShip_Underwater2.inc index de84626f3d..f06c21b2a0 100644 --- a/data/maps/events/AbandonedShip_Underwater2.inc +++ b/data/maps/events/AbandonedShip_Underwater2.inc @@ -1,5 +1,5 @@ AbandonedShip_Underwater2_MapWarps: @ 8536AB0 - warp_def 3, 1, 3, 0, ABANDONED_SHIP_UNDERWATER_1 + warp_def 3, 1, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER1 AbandonedShip_Underwater2_MapEvents:: @ 8536AB8 map_events 0x0, AbandonedShip_Underwater2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AlteringCave.inc b/data/maps/events/AlteringCave.inc index 2960769323..898038715d 100644 --- a/data/maps/events/AlteringCave.inc +++ b/data/maps/events/AlteringCave.inc @@ -1,5 +1,5 @@ AlteringCave_MapWarps: @ 8537894 - warp_def 18, 22, 0, 0, ROUTE_103 + warp_def 18, 22, 0, 0, MAP_ROUTE103 AlteringCave_MapEvents:: @ 853789C map_events 0x0, AlteringCave_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AncientTomb.inc b/data/maps/events/AncientTomb.inc index a0bde74e33..31d31ccbc8 100644 --- a/data/maps/events/AncientTomb.inc +++ b/data/maps/events/AncientTomb.inc @@ -2,9 +2,9 @@ AncientTomb_EventObjects: @ 8536CDC object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937, 0, 0 AncientTomb_MapWarps: @ 8536CF4 - warp_def 8, 29, 3, 0, ROUTE_120 - warp_def 8, 20, 0, 2, ANCIENT_TOMB - warp_def 8, 11, 3, 1, ANCIENT_TOMB + warp_def 8, 29, 3, 0, MAP_ROUTE120 + warp_def 8, 20, 0, 2, MAP_ANCIENT_TOMB + warp_def 8, 11, 3, 1, MAP_ANCIENT_TOMB AncientTomb_MapBGEvents: @ 8536D0C bg_event 8, 20, 0, 0, 0, AncientTomb_EventScript_239033 diff --git a/data/maps/events/AquaHideout_1F.inc b/data/maps/events/AquaHideout_1F.inc index d5b9f17d6a..6e4ef50683 100644 --- a/data/maps/events/AquaHideout_1F.inc +++ b/data/maps/events/AquaHideout_1F.inc @@ -4,9 +4,9 @@ AquaHideout_1F_EventObjects: @ 8535304 object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 20, 4, 3, 50, 93, 0, 1, 3, AquaHideout_1F_EventScript_2334F8, 924, 0, 0 AquaHideout_1F_MapWarps: @ 853534C - warp_def 13, 27, 1, 6, LILYCOVE_CITY - warp_def 14, 27, 1, 6, LILYCOVE_CITY - warp_def 22, 1, 3, 0, AQUA_HIDEOUT_B1F + warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY + warp_def 14, 27, 1, 6, MAP_LILYCOVE_CITY + warp_def 22, 1, 3, 0, MAP_AQUA_HIDEOUT_B1F AquaHideout_1F_MapEvents:: @ 8535364 map_events AquaHideout_1F_EventObjects, AquaHideout_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/events/AquaHideout_B1F.inc index c1b2f36b79..1ad010c288 100644 --- a/data/maps/events/AquaHideout_B1F.inc +++ b/data/maps/events/AquaHideout_B1F.inc @@ -10,31 +10,31 @@ AquaHideout_B1F_EventObjects: @ 8535378 object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 28, 21, 3, 7, 17, 0, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924, 0, 0 AquaHideout_B1F_MapWarps: @ 8535450 - warp_def 29, 1, 3, 2, AQUA_HIDEOUT_1F - warp_def 18, 1, 3, 0, AQUA_HIDEOUT_B2F - warp_def 12, 1, 3, 1, AQUA_HIDEOUT_B2F - warp_def 3, 3, 3, 2, AQUA_HIDEOUT_B2F - warp_def 31, 4, 3, 7, AQUA_HIDEOUT_B1F - warp_def 27, 4, 3, 8, AQUA_HIDEOUT_B1F - warp_def 20, 4, 3, 10, AQUA_HIDEOUT_B1F - warp_def 27, 12, 3, 4, AQUA_HIDEOUT_B1F - warp_def 3, 15, 3, 5, AQUA_HIDEOUT_B1F - warp_def 3, 20, 3, 12, AQUA_HIDEOUT_B1F - warp_def 32, 19, 3, 6, AQUA_HIDEOUT_B1F - warp_def 23, 10, 3, 22, AQUA_HIDEOUT_B1F - warp_def 45, 3, 3, 9, AQUA_HIDEOUT_B1F - warp_def 42, 5, 3, 18, AQUA_HIDEOUT_B1F - warp_def 45, 5, 3, 12, AQUA_HIDEOUT_B1F - warp_def 48, 5, 3, 16, AQUA_HIDEOUT_B1F - warp_def 42, 9, 3, 15, AQUA_HIDEOUT_B1F - warp_def 45, 9, 3, 20, AQUA_HIDEOUT_B1F - warp_def 48, 9, 3, 13, AQUA_HIDEOUT_B1F - warp_def 42, 13, 3, 24, AQUA_HIDEOUT_B1F - warp_def 45, 13, 3, 17, AQUA_HIDEOUT_B1F - warp_def 48, 13, 3, 12, AQUA_HIDEOUT_B1F - warp_def 42, 17, 3, 11, AQUA_HIDEOUT_B1F - warp_def 45, 17, 3, 17, AQUA_HIDEOUT_B1F - warp_def 48, 17, 3, 19, AQUA_HIDEOUT_B1F + warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F + warp_def 18, 1, 3, 0, MAP_AQUA_HIDEOUT_B2F + warp_def 12, 1, 3, 1, MAP_AQUA_HIDEOUT_B2F + warp_def 3, 3, 3, 2, MAP_AQUA_HIDEOUT_B2F + warp_def 31, 4, 3, 7, MAP_AQUA_HIDEOUT_B1F + warp_def 27, 4, 3, 8, MAP_AQUA_HIDEOUT_B1F + warp_def 20, 4, 3, 10, MAP_AQUA_HIDEOUT_B1F + warp_def 27, 12, 3, 4, MAP_AQUA_HIDEOUT_B1F + warp_def 3, 15, 3, 5, MAP_AQUA_HIDEOUT_B1F + warp_def 3, 20, 3, 12, MAP_AQUA_HIDEOUT_B1F + warp_def 32, 19, 3, 6, MAP_AQUA_HIDEOUT_B1F + warp_def 23, 10, 3, 22, MAP_AQUA_HIDEOUT_B1F + warp_def 45, 3, 3, 9, MAP_AQUA_HIDEOUT_B1F + warp_def 42, 5, 3, 18, MAP_AQUA_HIDEOUT_B1F + warp_def 45, 5, 3, 12, MAP_AQUA_HIDEOUT_B1F + warp_def 48, 5, 3, 16, MAP_AQUA_HIDEOUT_B1F + warp_def 42, 9, 3, 15, MAP_AQUA_HIDEOUT_B1F + warp_def 45, 9, 3, 20, MAP_AQUA_HIDEOUT_B1F + warp_def 48, 9, 3, 13, MAP_AQUA_HIDEOUT_B1F + warp_def 42, 13, 3, 24, MAP_AQUA_HIDEOUT_B1F + warp_def 45, 13, 3, 17, MAP_AQUA_HIDEOUT_B1F + warp_def 48, 13, 3, 12, MAP_AQUA_HIDEOUT_B1F + warp_def 42, 17, 3, 11, MAP_AQUA_HIDEOUT_B1F + warp_def 45, 17, 3, 17, MAP_AQUA_HIDEOUT_B1F + warp_def 48, 17, 3, 19, MAP_AQUA_HIDEOUT_B1F AquaHideout_B1F_MapEvents:: @ 8535518 map_events AquaHideout_B1F_EventObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/events/AquaHideout_B2F.inc index 54ef390fdd..9cfd51a10c 100644 --- a/data/maps/events/AquaHideout_B2F.inc +++ b/data/maps/events/AquaHideout_B2F.inc @@ -7,16 +7,16 @@ AquaHideout_B2F_EventObjects: @ 853552C object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 5, 3, 9, 17, 0, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924, 0, 0 AquaHideout_B2F_MapWarps: @ 85355BC - warp_def 18, 1, 3, 1, AQUA_HIDEOUT_B1F - warp_def 12, 1, 3, 2, AQUA_HIDEOUT_B1F - warp_def 3, 3, 3, 3, AQUA_HIDEOUT_B1F - warp_def 31, 8, 3, 5, AQUA_HIDEOUT_B2F - warp_def 8, 8, 3, 8, AQUA_HIDEOUT_B2F - warp_def 5, 8, 3, 3, AQUA_HIDEOUT_B2F - warp_def 18, 13, 3, 7, AQUA_HIDEOUT_B2F - warp_def 12, 13, 3, 6, AQUA_HIDEOUT_B2F - warp_def 31, 17, 3, 4, AQUA_HIDEOUT_B2F - warp_def 32, 20, 3, 4, AQUA_HIDEOUT_B1F + warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F + warp_def 12, 1, 3, 2, MAP_AQUA_HIDEOUT_B1F + warp_def 3, 3, 3, 3, MAP_AQUA_HIDEOUT_B1F + warp_def 31, 8, 3, 5, MAP_AQUA_HIDEOUT_B2F + warp_def 8, 8, 3, 8, MAP_AQUA_HIDEOUT_B2F + warp_def 5, 8, 3, 3, MAP_AQUA_HIDEOUT_B2F + warp_def 18, 13, 3, 7, MAP_AQUA_HIDEOUT_B2F + warp_def 12, 13, 3, 6, MAP_AQUA_HIDEOUT_B2F + warp_def 31, 17, 3, 4, MAP_AQUA_HIDEOUT_B2F + warp_def 32, 20, 3, 4, MAP_AQUA_HIDEOUT_B1F AquaHideout_B2F_MapCoordEvents: @ 853560C coord_event 28, 17, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_233DE5 diff --git a/data/maps/events/ArtisanCave_1F.inc b/data/maps/events/ArtisanCave_1F.inc index e5899ef055..e6752fc3ad 100644 --- a/data/maps/events/ArtisanCave_1F.inc +++ b/data/maps/events/ArtisanCave_1F.inc @@ -2,8 +2,8 @@ ArtisanCave_1F_EventObjects: @ 8537774 object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 5, 3, 1, 17, 0, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163, 0, 0 ArtisanCave_1F_MapWarps: @ 853778C - warp_def 10, 17, 0, 13, BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 6, 5, 0, 1, ARTISAN_CAVE_B1F + warp_def 10, 17, 0, 13, MAP_BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 6, 5, 0, 1, MAP_ARTISAN_CAVE_B1F ArtisanCave_1F_MapEvents:: @ 853779C map_events ArtisanCave_1F_EventObjects, ArtisanCave_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ArtisanCave_B1F.inc b/data/maps/events/ArtisanCave_B1F.inc index af24f4b4ac..e91c3211fd 100644 --- a/data/maps/events/ArtisanCave_B1F.inc +++ b/data/maps/events/ArtisanCave_B1F.inc @@ -2,8 +2,8 @@ ArtisanCave_B1F_EventObjects: @ 8537708 object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 32, 38, 3, 1, 17, 0, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162, 0, 0 ArtisanCave_B1F_MapWarps: @ 8537720 - warp_def 8, 48, 0, 10, BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 38, 5, 0, 1, ARTISAN_CAVE_1F + warp_def 8, 48, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 38, 5, 0, 1, MAP_ARTISAN_CAVE_1F ArtisanCave_B1F_MapBGEvents: @ 8537730 bg_event 32, 29, 0, 7, 0, ITEM_ZINC, 102, 0 diff --git a/data/maps/events/BattleFrontier_BattleArenaLobby.inc b/data/maps/events/BattleFrontier_BattleArenaLobby.inc index 3add198815..9c7d333a07 100644 --- a/data/maps/events/BattleFrontier_BattleArenaLobby.inc +++ b/data/maps/events/BattleFrontier_BattleArenaLobby.inc @@ -6,7 +6,7 @@ BattleFrontier_BattleArenaLobby_EventObjects: @ 853C814 object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 14, 10, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0, 0, 0 BattleFrontier_BattleArenaLobby_MapWarps: @ 853C88C - warp_def 7, 12, 3, 1, BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 7, 12, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_BattleArenaLobby_MapBGEvents: @ 853C894 bg_event 5, 9, 3, 1, 0, BattleFrontier_BattleArenaLobby_EventScript_256092 diff --git a/data/maps/events/BattleFrontier_BattleDomeCorridor.inc b/data/maps/events/BattleFrontier_BattleDomeCorridor.inc index 9b3f387b1a..34f39fa0ea 100644 --- a/data/maps/events/BattleFrontier_BattleDomeCorridor.inc +++ b/data/maps/events/BattleFrontier_BattleDomeCorridor.inc @@ -2,8 +2,8 @@ BattleFrontier_BattleDomeCorridor_EventObjects: @ 853C14C object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 23, 5, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleDomeCorridor_MapWarps: @ 853C164 - warp_def 6, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 7, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 7, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_BattleDomeCorridor_MapEvents:: @ 853C174 map_events BattleFrontier_BattleDomeCorridor_EventObjects, BattleFrontier_BattleDomeCorridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleDomeLobby.inc b/data/maps/events/BattleFrontier_BattleDomeLobby.inc index 59605010fe..c91db74297 100644 --- a/data/maps/events/BattleFrontier_BattleDomeLobby.inc +++ b/data/maps/events/BattleFrontier_BattleDomeLobby.inc @@ -7,8 +7,8 @@ BattleFrontier_BattleDomeLobby_EventObjects: @ 853C068 object_event 6, EVENT_OBJ_GFX_TEALA, 0, 0, 17, 10, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0, 0, 0 BattleFrontier_BattleDomeLobby_MapWarps: @ 853C0F8 - warp_def 11, 16, 0, 1, BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 12, 16, 0, 1, BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 11, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 12, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_BattleDomeLobby_MapBGEvents: @ 853C108 bg_event 4, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249D52 diff --git a/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc b/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc index 82da39a634..be18e491a5 100644 --- a/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc @@ -2,8 +2,8 @@ BattleFrontier_BattleDomePreBattleRoom_EventObjects: @ 853C188 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 2, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleDomePreBattleRoom_MapWarps: @ 853C1A0 - warp_def 6, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 7, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 7, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_BattleDomePreBattleRoom_MapEvents:: @ 853C1B0 map_events BattleFrontier_BattleDomePreBattleRoom_EventObjects, BattleFrontier_BattleDomePreBattleRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleFactoryLobby.inc b/data/maps/events/BattleFrontier_BattleFactoryLobby.inc index 8d514f8a0d..322a2e66e8 100644 --- a/data/maps/events/BattleFrontier_BattleFactoryLobby.inc +++ b/data/maps/events/BattleFrontier_BattleFactoryLobby.inc @@ -7,8 +7,8 @@ BattleFrontier_BattleFactoryLobby_EventObjects: @ 853C9D8 object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0, 0, 0 BattleFrontier_BattleFactoryLobby_MapWarps: @ 853CA68 - warp_def 9, 11, 0, 2, BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 10, 11, 0, 2, BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 9, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 10, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_BattleFactoryLobby_MapBGEvents: @ 853CA78 bg_event 2, 7, 0, 1, 0, BattleFrontier_BattleFactoryLobby_EventScript_2587E1 diff --git a/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc b/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc index b5fc138383..520f928389 100644 --- a/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc @@ -6,8 +6,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattlePalaceBattleRoom_MapWarps: @ 853C574 - warp_def 0, 9, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR - warp_def 1, 9, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR + warp_def 0, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR + warp_def 1, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR BattleFrontier_BattlePalaceBattleRoom_MapEvents:: @ 853C584 map_events BattleFrontier_BattlePalaceBattleRoom_EventObjects, BattleFrontier_BattlePalaceBattleRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc b/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc index 2b6f7f251b..a605a89ea3 100644 --- a/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc +++ b/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc @@ -8,10 +8,10 @@ BattleFrontier_BattlePalaceCorridor_EventObjects: @ 853C420 object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 0, 3, 10, 0, 2, 33, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattlePalaceCorridor_MapWarps: @ 853C4C8 - warp_def 8, 13, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_LOBBY - warp_def 9, 13, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_LOBBY - warp_def 6, 3, 3, 0, BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM - warp_def 10, 3, 3, 0, BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM + warp_def 8, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY + warp_def 9, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY + warp_def 6, 3, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM + warp_def 10, 3, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM BattleFrontier_BattlePalaceCorridor_MapEvents:: @ 853C4E8 map_events BattleFrontier_BattlePalaceCorridor_EventObjects, BattleFrontier_BattlePalaceCorridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePalaceLobby.inc b/data/maps/events/BattleFrontier_BattlePalaceLobby.inc index 318ac3c49b..a333fa1001 100644 --- a/data/maps/events/BattleFrontier_BattlePalaceLobby.inc +++ b/data/maps/events/BattleFrontier_BattlePalaceLobby.inc @@ -7,9 +7,9 @@ BattleFrontier_BattlePalaceLobby_EventObjects: @ 853C340 object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 19, 6, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0, 0, 0 BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0 - warp_def 12, 11, 0, 2, BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 13, 11, 0, 2, BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 5, 4, 3, 0, BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR + warp_def 12, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 13, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 5, 4, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR BattleFrontier_BattlePalaceLobby_MapBGEvents: @ 853C3E8 bg_event 2, 7, 0, 1, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC50 diff --git a/data/maps/events/BattleFrontier_BattlePikeLobby.inc b/data/maps/events/BattleFrontier_BattlePikeLobby.inc index 6def285280..e9aa089178 100644 --- a/data/maps/events/BattleFrontier_BattlePikeLobby.inc +++ b/data/maps/events/BattleFrontier_BattlePikeLobby.inc @@ -5,9 +5,9 @@ BattleFrontier_BattlePikeLobby_EventObjects: @ 853CBB0 object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 0, 8, 9, 3, 2, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0, 0, 0 BattleFrontier_BattlePikeLobby_MapWarps: @ 853CC10 - warp_def 5, 12, 0, 0, BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 4, 12, 0, 0, BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 6, 12, 0, 0, BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 5, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 4, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 6, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_BattlePikeLobby_MapBGEvents: @ 853CC28 bg_event 8, 3, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BA80 diff --git a/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc b/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc index 63e7f2acd8..8dce267b4e 100644 --- a/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc +++ b/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc @@ -10,9 +10,9 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: @ 853D018 object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 0, 12, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0, 0, 0 BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: @ 853D0F0 - warp_def 7, 10, 0, 6, BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 6, 10, 0, 6, BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 8, 10, 0, 6, BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 7, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 6, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 8, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_BattlePointExchangeServiceCorner_MapEvents:: @ 853D108 map_events BattleFrontier_BattlePointExchangeServiceCorner_EventObjects, BattleFrontier_BattlePointExchangeServiceCorner_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePyramidLobby.inc b/data/maps/events/BattleFrontier_BattlePyramidLobby.inc index fccb4abff9..0fc086feb0 100644 --- a/data/maps/events/BattleFrontier_BattlePyramidLobby.inc +++ b/data/maps/events/BattleFrontier_BattlePyramidLobby.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePyramidLobby_EventObjects: @ 853C598 object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 12, 16, 4, 2, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0, 0, 0 BattleFrontier_BattlePyramidLobby_MapWarps: @ 853C5F8 - warp_def 7, 17, 4, 3, BATTLE_FRONTIER_OUTSIDE_EAST + 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 diff --git a/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc b/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc index af96775243..bea8a64847 100644 --- a/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc @@ -4,8 +4,8 @@ BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleTowerBattleRoom_MapWarps: @ 853B818 - warp_def 5, 8, 0, 2, BATTLE_FRONTIER_BATTLE_TOWER_LOBBY - warp_def 6, 8, 0, 2, BATTLE_FRONTIER_BATTLE_TOWER_LOBBY + warp_def 5, 8, 0, 2, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY + warp_def 6, 8, 0, 2, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY BattleFrontier_BattleTowerBattleRoom_MapEvents:: @ 853B828 map_events BattleFrontier_BattleTowerBattleRoom_EventObjects, BattleFrontier_BattleTowerBattleRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleTowerLobby.inc b/data/maps/events/BattleFrontier_BattleTowerLobby.inc index 2faa6a413f..34c8082681 100644 --- a/data/maps/events/BattleFrontier_BattleTowerLobby.inc +++ b/data/maps/events/BattleFrontier_BattleTowerLobby.inc @@ -10,9 +10,9 @@ BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638 object_event 9, EVENT_OBJ_GFX_TEALA, 0, 0, 18, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0, 0, 0 BattleFrontier_BattleTowerLobby_MapWarps: @ 853B710 - warp_def 12, 9, 3, 0, BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 13, 9, 3, 0, BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 6, 1, 0, 0, BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM + warp_def 12, 9, 3, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 13, 9, 3, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 6, 1, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM BattleFrontier_BattleTowerLobby_MapBGEvents: @ 853B728 bg_event 4, 5, 0, 1, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFC7 diff --git a/data/maps/events/BattleFrontier_Lounge1.inc b/data/maps/events/BattleFrontier_Lounge1.inc index b00838290d..a026f17346 100644 --- a/data/maps/events/BattleFrontier_Lounge1.inc +++ b/data/maps/events/BattleFrontier_Lounge1.inc @@ -4,7 +4,7 @@ BattleFrontier_Lounge1_EventObjects: @ 853CFB4 object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 0, 5, 4, 0, 2, 18, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0, 0, 0 BattleFrontier_Lounge1_MapWarps: @ 853CFFC - warp_def 4, 9, 0, 5, BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 4, 9, 0, 5, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_Lounge1_MapEvents:: @ 853D004 map_events BattleFrontier_Lounge1_EventObjects, BattleFrontier_Lounge1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge2.inc b/data/maps/events/BattleFrontier_Lounge2.inc index 0370b2a18d..a04ee9bec1 100644 --- a/data/maps/events/BattleFrontier_Lounge2.inc +++ b/data/maps/events/BattleFrontier_Lounge2.inc @@ -6,8 +6,8 @@ BattleFrontier_Lounge2_EventObjects: @ 853D11C object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 0, 10, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0, 0, 0 BattleFrontier_Lounge2_MapWarps: @ 853D194 - warp_def 1, 7, 0, 3, BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 2, 7, 0, 3, BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 1, 7, 0, 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 2, 7, 0, 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_Lounge2_MapEvents:: @ 853D1A4 map_events BattleFrontier_Lounge2_EventObjects, BattleFrontier_Lounge2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge3.inc b/data/maps/events/BattleFrontier_Lounge3.inc index 6349cd3812..529e42c664 100644 --- a/data/maps/events/BattleFrontier_Lounge3.inc +++ b/data/maps/events/BattleFrontier_Lounge3.inc @@ -6,7 +6,7 @@ BattleFrontier_Lounge3_EventObjects: @ 853D1B8 object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 0, 6, 0, 2, 48, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0, 0, 0 BattleFrontier_Lounge3_MapWarps: @ 853D230 - warp_def 4, 9, 0, 9, BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 4, 9, 0, 9, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_Lounge3_MapEvents:: @ 853D238 map_events BattleFrontier_Lounge3_EventObjects, BattleFrontier_Lounge3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge4.inc b/data/maps/events/BattleFrontier_Lounge4.inc index 2076faceea..5bdfa4e12c 100644 --- a/data/maps/events/BattleFrontier_Lounge4.inc +++ b/data/maps/events/BattleFrontier_Lounge4.inc @@ -4,7 +4,7 @@ BattleFrontier_Lounge4_EventObjects: @ 853D24C object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 0, 5, 0, 10, 18, 0, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0, 0, 0 BattleFrontier_Lounge4_MapWarps: @ 853D294 - warp_def 4, 9, 0, 6, BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 4, 9, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_Lounge4_MapEvents:: @ 853D29C map_events BattleFrontier_Lounge4_EventObjects, BattleFrontier_Lounge4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge5.inc b/data/maps/events/BattleFrontier_Lounge5.inc index a8e5f97f55..1d68986cc2 100644 --- a/data/maps/events/BattleFrontier_Lounge5.inc +++ b/data/maps/events/BattleFrontier_Lounge5.inc @@ -5,8 +5,8 @@ BattleFrontier_Lounge5_EventObjects: @ 853D2EC object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 11, 7, 0, 1, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0, 0, 0 BattleFrontier_Lounge5_MapWarps: @ 853D34C - warp_def 1, 7, 0, 7, BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 2, 7, 0, 7, BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 1, 7, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 2, 7, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_Lounge5_MapEvents:: @ 853D35C map_events BattleFrontier_Lounge5_EventObjects, BattleFrontier_Lounge5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge6.inc b/data/maps/events/BattleFrontier_Lounge6.inc index be0db4f080..12853012e3 100644 --- a/data/maps/events/BattleFrontier_Lounge6.inc +++ b/data/maps/events/BattleFrontier_Lounge6.inc @@ -2,7 +2,7 @@ BattleFrontier_Lounge6_EventObjects: @ 853D370 object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 2, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0, 0, 0 BattleFrontier_Lounge6_MapWarps: @ 853D388 - warp_def 4, 9, 0, 8, BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 4, 9, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_Lounge6_MapEvents:: @ 853D390 map_events BattleFrontier_Lounge6_EventObjects, BattleFrontier_Lounge6_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge7.inc b/data/maps/events/BattleFrontier_Lounge7.inc index b4e6cc5ebc..bfe0ae7e80 100644 --- a/data/maps/events/BattleFrontier_Lounge7.inc +++ b/data/maps/events/BattleFrontier_Lounge7.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge7_EventObjects: @ 853D3A4 object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 8, 3, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0, 0, 0 BattleFrontier_Lounge7_MapWarps: @ 853D404 - warp_def 4, 9, 0, 7, BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 4, 9, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_Lounge7_MapEvents:: @ 853D40C map_events BattleFrontier_Lounge7_EventObjects, BattleFrontier_Lounge7_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge8.inc b/data/maps/events/BattleFrontier_Lounge8.inc index 99aa3333ca..be16a61070 100644 --- a/data/maps/events/BattleFrontier_Lounge8.inc +++ b/data/maps/events/BattleFrontier_Lounge8.inc @@ -4,7 +4,7 @@ BattleFrontier_Lounge8_EventObjects: @ 853D4BC object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0, 0, 0 BattleFrontier_Lounge8_MapWarps: @ 853D504 - warp_def 4, 9, 0, 10, BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 4, 9, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_Lounge8_MapEvents:: @ 853D50C map_events BattleFrontier_Lounge8_EventObjects, BattleFrontier_Lounge8_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge9.inc b/data/maps/events/BattleFrontier_Lounge9.inc index 7c478fabec..5e294b384b 100644 --- a/data/maps/events/BattleFrontier_Lounge9.inc +++ b/data/maps/events/BattleFrontier_Lounge9.inc @@ -2,8 +2,8 @@ BattleFrontier_Lounge9_EventObjects: @ 853D520 object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 0, 6, 3, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_Lounge9_MapWarps: @ 853D538 - warp_def 1, 9, 0, 11, BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 2, 9, 0, 11, BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 1, 9, 0, 11, MAP_BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 2, 9, 0, 11, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_Lounge9_MapEvents:: @ 853D548 map_events BattleFrontier_Lounge9_EventObjects, BattleFrontier_Lounge9_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Mart.inc b/data/maps/events/BattleFrontier_Mart.inc index 969b548559..495be5f634 100644 --- a/data/maps/events/BattleFrontier_Mart.inc +++ b/data/maps/events/BattleFrontier_Mart.inc @@ -5,8 +5,8 @@ BattleFrontier_Mart_EventObjects: @ 853D68C object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 8, 4, 3, 9, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0, 0, 0 BattleFrontier_Mart_MapWarps: @ 853D6EC - warp_def 3, 7, 0, 4, BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 4, 7, 0, 4, BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 3, 7, 0, 4, MAP_BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 4, 7, 0, 4, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_Mart_MapEvents:: @ 853D6FC map_events BattleFrontier_Mart_EventObjects, BattleFrontier_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_OutsideEast.inc b/data/maps/events/BattleFrontier_OutsideEast.inc index 3d7c53493d..62423b9c11 100644 --- a/data/maps/events/BattleFrontier_OutsideEast.inc +++ b/data/maps/events/BattleFrontier_OutsideEast.inc @@ -27,20 +27,20 @@ BattleFrontier_OutsideEast_EventObjects: @ 853BB10 object_event 26, EVENT_OBJ_GFX_CAMPER, 0, 0, 29, 14, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0, 0, 0 BattleFrontier_OutsideEast_MapWarps: @ 853BD80 - warp_def 16, 14, 0, 0, BATTLE_FRONTIER_BATTLE_TOWER_LOBBY - warp_def 39, 29, 0, 0, BATTLE_FRONTIER_BATTLE_ARENA_LOBBY - warp_def 45, 56, 0, 0, BATTLE_FRONTIER_BATTLE_PALACE_LOBBY - warp_def 58, 14, 0, 0, BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY - warp_def 35, 12, 3, 0, BATTLE_FRONTIER_RANKING_HALL - warp_def 4, 44, 0, 0, BATTLE_FRONTIER_LOUNGE_1 - warp_def 10, 28, 0, 0, BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER - warp_def 22, 51, 0, 0, BATTLE_FRONTIER_LOUNGE_5 - warp_def 5, 8, 0, 0, BATTLE_FRONTIER_LOUNGE_6 - warp_def 65, 31, 0, 0, BATTLE_FRONTIER_LOUNGE_3 - warp_def 14, 51, 0, 0, BATTLE_FRONTIER_LOUNGE_8 - warp_def 21, 45, 0, 0, BATTLE_FRONTIER_LOUNGE_9 - warp_def 3, 51, 0, 0, BATTLE_FRONTIER_POKEMON_CENTER_1F - warp_def 28, 7, 0, 0, ARTISAN_CAVE_1F + warp_def 16, 14, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY + warp_def 39, 29, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY + warp_def 45, 56, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY + warp_def 58, 14, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY + warp_def 35, 12, 3, 0, MAP_BATTLE_FRONTIER_RANKING_HALL + warp_def 4, 44, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE1 + warp_def 10, 28, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER + warp_def 22, 51, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE5 + warp_def 5, 8, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE6 + warp_def 65, 31, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE3 + warp_def 14, 51, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE8 + warp_def 21, 45, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE9 + warp_def 3, 51, 0, 0, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F + warp_def 28, 7, 0, 0, MAP_ARTISAN_CAVE_1F BattleFrontier_OutsideEast_MapBGEvents: @ 853BDF0 bg_event 13, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C43 diff --git a/data/maps/events/BattleFrontier_OutsideWest.inc b/data/maps/events/BattleFrontier_OutsideWest.inc index 7923af813b..60f10c8b5a 100644 --- a/data/maps/events/BattleFrontier_OutsideWest.inc +++ b/data/maps/events/BattleFrontier_OutsideWest.inc @@ -25,17 +25,17 @@ BattleFrontier_OutsideWest_EventObjects: @ 853B350 object_event 24, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 26, 0, 24, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0, 0, 0 BattleFrontier_OutsideWest_MapWarps: @ 853B590 - warp_def 42, 27, 0, 0, BATTLE_FRONTIER_BATTLE_PIKE_LOBBY - warp_def 19, 17, 0, 0, BATTLE_FRONTIER_BATTLE_DOME_LOBBY - warp_def 11, 38, 0, 0, BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY - warp_def 45, 44, 0, 0, BATTLE_FRONTIER_LOUNGE_2 - warp_def 51, 51, 0, 0, BATTLE_FRONTIER_MART - warp_def 44, 5, 0, 0, BATTLE_FRONTIER_SCOTTS_HOUSE - warp_def 53, 44, 0, 0, BATTLE_FRONTIER_LOUNGE_4 - warp_def 5, 20, 0, 0, BATTLE_FRONTIER_LOUNGE_7 - warp_def 26, 65, 0, 0, BATTLE_FRONTIER_RECEPTION_GATE - warp_def 26, 61, 0, 1, BATTLE_FRONTIER_RECEPTION_GATE - warp_def 39, 55, 0, 0, ARTISAN_CAVE_B1F + warp_def 42, 27, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY + warp_def 19, 17, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY + warp_def 11, 38, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY + warp_def 45, 44, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE2 + warp_def 51, 51, 0, 0, MAP_BATTLE_FRONTIER_MART + warp_def 44, 5, 0, 0, MAP_BATTLE_FRONTIER_SCOTTS_HOUSE + warp_def 53, 44, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE4 + warp_def 5, 20, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE7 + warp_def 26, 65, 0, 0, MAP_BATTLE_FRONTIER_RECEPTION_GATE + warp_def 26, 61, 0, 1, MAP_BATTLE_FRONTIER_RECEPTION_GATE + warp_def 39, 55, 0, 0, MAP_ARTISAN_CAVE_B1F BattleFrontier_OutsideWest_MapBGEvents: @ 853B5E8 bg_event 15, 18, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D4E2 diff --git a/data/maps/events/BattleFrontier_PokemonCenter_1F.inc b/data/maps/events/BattleFrontier_PokemonCenter_1F.inc index 262744ce1a..79b37aead1 100644 --- a/data/maps/events/BattleFrontier_PokemonCenter_1F.inc +++ b/data/maps/events/BattleFrontier_PokemonCenter_1F.inc @@ -6,9 +6,9 @@ BattleFrontier_PokemonCenter_1F_EventObjects: @ 853D55C object_event 5, EVENT_OBJ_GFX_SKITTY, 0, 0, 1, 3, 3, 10, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0, 0, 0 BattleFrontier_PokemonCenter_1F_MapWarps: @ 853D5D4 - warp_def 7, 8, 3, 12, BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 6, 8, 3, 12, BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 1, 6, 4, 0, BATTLE_FRONTIER_POKEMON_CENTER_2F + warp_def 7, 8, 3, 12, MAP_BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 6, 8, 3, 12, MAP_BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 1, 6, 4, 0, MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F BattleFrontier_PokemonCenter_1F_MapEvents:: @ 853D5EC map_events BattleFrontier_PokemonCenter_1F_EventObjects, BattleFrontier_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_PokemonCenter_2F.inc b/data/maps/events/BattleFrontier_PokemonCenter_2F.inc index f9d9d408a9..f94c24b004 100644 --- a/data/maps/events/BattleFrontier_PokemonCenter_2F.inc +++ b/data/maps/events/BattleFrontier_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ BattleFrontier_PokemonCenter_2F_EventObjects: @ 853D600 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660 - warp_def 1, 6, 4, 2, BATTLE_FRONTIER_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER BattleFrontier_PokemonCenter_2F_MapEvents:: @ 853D678 map_events BattleFrontier_PokemonCenter_2F_EventObjects, BattleFrontier_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_RankingHall.inc b/data/maps/events/BattleFrontier_RankingHall.inc index 81058b0429..bfe61cda1d 100644 --- a/data/maps/events/BattleFrontier_RankingHall.inc +++ b/data/maps/events/BattleFrontier_RankingHall.inc @@ -4,8 +4,8 @@ BattleFrontier_RankingHall_EventObjects: @ 853CEB8 object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 0, 44, 11, 3, 2, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0, 0, 0 BattleFrontier_RankingHall_MapWarps: @ 853CF00 - warp_def 26, 14, 3, 4, BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 27, 14, 3, 4, BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 26, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 27, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_RankingHall_MapBGEvents: @ 853CF10 bg_event 26, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4AA diff --git a/data/maps/events/BattleFrontier_ReceptionGate.inc b/data/maps/events/BattleFrontier_ReceptionGate.inc index 8984c44a02..aca73394cb 100644 --- a/data/maps/events/BattleFrontier_ReceptionGate.inc +++ b/data/maps/events/BattleFrontier_ReceptionGate.inc @@ -6,8 +6,8 @@ BattleFrontier_ReceptionGate_EventObjects: @ 853D420 object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 0, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0, 0, 0 BattleFrontier_ReceptionGate_MapWarps: @ 853D498 - warp_def 4, 13, 0, 8, BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 4, 1, 0, 9, BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 4, 13, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 4, 1, 0, 9, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_ReceptionGate_MapEvents:: @ 853D4A8 map_events BattleFrontier_ReceptionGate_EventObjects, BattleFrontier_ReceptionGate_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_ScottsHouse.inc b/data/maps/events/BattleFrontier_ScottsHouse.inc index 4ea329ab95..5e9ff19122 100644 --- a/data/maps/events/BattleFrontier_ScottsHouse.inc +++ b/data/maps/events/BattleFrontier_ScottsHouse.inc @@ -2,8 +2,8 @@ BattleFrontier_ScottsHouse_EventObjects: @ 853D2B0 object_event 1, EVENT_OBJ_GFX_SCOTT, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, BattleFrontier_ScottsHouse_EventScript_2636A8, 0, 0, 0 BattleFrontier_ScottsHouse_MapWarps: @ 853D2C8 - warp_def 2, 7, 3, 5, BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 3, 7, 3, 5, BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 2, 7, 3, 5, MAP_BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 3, 7, 3, 5, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_ScottsHouse_MapEvents:: @ 853D2D8 map_events BattleFrontier_ScottsHouse_EventObjects, BattleFrontier_ScottsHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BirthIsland_Exterior.inc b/data/maps/events/BirthIsland_Exterior.inc index 1d6238e8fb..e61935ebe8 100644 --- a/data/maps/events/BirthIsland_Exterior.inc +++ b/data/maps/events/BirthIsland_Exterior.inc @@ -3,7 +3,7 @@ BirthIsland_Exterior_EventObjects: @ 853D7DC object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 0, 15, 3, 0, 8, 17, 0, 0, 0, 0x0, 763, 0, 0 BirthIsland_Exterior_MapWarps: @ 853D80C - warp_def 15, 24, 0, 0, BIRTH_ISLAND_HARBOR + warp_def 15, 24, 0, 0, MAP_BIRTH_ISLAND_HARBOR BirthIsland_Exterior_MapEvents:: @ 853D814 map_events BirthIsland_Exterior_EventObjects, BirthIsland_Exterior_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BirthIsland_Harbor.inc b/data/maps/events/BirthIsland_Harbor.inc index bb2d6036d3..fe4a55b25d 100644 --- a/data/maps/events/BirthIsland_Harbor.inc +++ b/data/maps/events/BirthIsland_Harbor.inc @@ -3,7 +3,7 @@ BirthIsland_Harbor_EventObjects: @ 853D828 object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 8, 7, 1, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 BirthIsland_Harbor_MapWarps: @ 853D858 - warp_def 8, 2, 0, 0, BIRTH_ISLAND_EXTERIOR + warp_def 8, 2, 0, 0, MAP_BIRTH_ISLAND_EXTERIOR BirthIsland_Harbor_MapEvents:: @ 853D860 map_events BirthIsland_Harbor_EventObjects, BirthIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/CaveOfOrigin_1F.inc b/data/maps/events/CaveOfOrigin_1F.inc index 8dfdb78d00..bdc6298463 100644 --- a/data/maps/events/CaveOfOrigin_1F.inc +++ b/data/maps/events/CaveOfOrigin_1F.inc @@ -1,6 +1,6 @@ CaveOfOrigin_1F_MapWarps: @ 8535D40 - warp_def 11, 17, 3, 1, CAVE_OF_ORIGIN_ENTRANCE - warp_def 14, 5, 3, 0, CAVE_OF_ORIGIN_B1F + warp_def 11, 17, 3, 1, MAP_CAVE_OF_ORIGIN_ENTRANCE + warp_def 14, 5, 3, 0, MAP_CAVE_OF_ORIGIN_B1F CaveOfOrigin_1F_MapEvents:: @ 8535D50 map_events 0x0, CaveOfOrigin_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/CaveOfOrigin_B1F.inc b/data/maps/events/CaveOfOrigin_B1F.inc index 148bb22a62..1c951f240d 100644 --- a/data/maps/events/CaveOfOrigin_B1F.inc +++ b/data/maps/events/CaveOfOrigin_B1F.inc @@ -2,7 +2,7 @@ CaveOfOrigin_B1F_EventObjects: @ 8535DD0 object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 0, 9, 13, 3, 7, 17, 0, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, 820, 0, 0 CaveOfOrigin_B1F_MapWarps: @ 8535DE8 - warp_def 9, 3, 3, 1, CAVE_OF_ORIGIN_1F + warp_def 9, 3, 3, 1, MAP_CAVE_OF_ORIGIN_1F CaveOfOrigin_B1F_MapEvents:: @ 8535DF0 map_events CaveOfOrigin_B1F_EventObjects, CaveOfOrigin_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/CaveOfOrigin_Entrance.inc b/data/maps/events/CaveOfOrigin_Entrance.inc index 96946936b4..5a5ad59f7c 100644 --- a/data/maps/events/CaveOfOrigin_Entrance.inc +++ b/data/maps/events/CaveOfOrigin_Entrance.inc @@ -1,6 +1,6 @@ CaveOfOrigin_Entrance_MapWarps: @ 8535D1C - warp_def 9, 20, 3, 3, SOOTOPOLIS_CITY - warp_def 9, 5, 3, 0, CAVE_OF_ORIGIN_1F + warp_def 9, 20, 3, 3, MAP_SOOTOPOLIS_CITY + warp_def 9, 5, 3, 0, MAP_CAVE_OF_ORIGIN_1F CaveOfOrigin_Entrance_MapEvents:: @ 8535D2C map_events 0x0, CaveOfOrigin_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc b/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc index f60a5e1a2f..c9eeaff22b 100644 --- a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc +++ b/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc @@ -1,6 +1,6 @@ CaveOfOrigin_UnusedRubySapphireMap1_MapWarps: @ 8535D64 - warp_def 13, 5, 3, 1, CAVE_OF_ORIGIN_1F - warp_def 5, 11, 3, 0, CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_2 + warp_def 13, 5, 3, 1, MAP_CAVE_OF_ORIGIN_1F + warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RS_B2F CaveOfOrigin_UnusedRubySapphireMap1_MapEvents:: @ 8535D74 map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc b/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc index 256b6179ed..c8e9bbeeba 100644 --- a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc +++ b/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc @@ -1,6 +1,6 @@ CaveOfOrigin_UnusedRubySapphireMap2_MapWarps: @ 8535D88 - warp_def 5, 10, 3, 1, CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_1 - warp_def 8, 14, 3, 0, CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_3 + warp_def 5, 10, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RS_B1F + warp_def 8, 14, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RS_B3F CaveOfOrigin_UnusedRubySapphireMap2_MapEvents:: @ 8535D98 map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc b/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc index 87a99e5d21..953eef5581 100644 --- a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc +++ b/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc @@ -1,6 +1,6 @@ CaveOfOrigin_UnusedRubySapphireMap3_MapWarps: @ 8535DAC - warp_def 7, 14, 3, 1, CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_2 - warp_def 12, 6, 3, 0, CAVE_OF_ORIGIN_B1F + warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RS_B2F + warp_def 12, 6, 3, 0, MAP_CAVE_OF_ORIGIN_B1F CaveOfOrigin_UnusedRubySapphireMap3_MapEvents:: @ 8535DBC map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DesertRuins.inc b/data/maps/events/DesertRuins.inc index 2253dec677..510a189980 100644 --- a/data/maps/events/DesertRuins.inc +++ b/data/maps/events/DesertRuins.inc @@ -2,9 +2,9 @@ DesertRuins_EventObjects: @ 8534354 object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, 935, 0, 0 DesertRuins_MapWarps: @ 853436C - warp_def 8, 29, 3, 1, ROUTE_111 - warp_def 8, 20, 0, 2, DESERT_RUINS - warp_def 8, 11, 3, 1, DESERT_RUINS + warp_def 8, 29, 3, 1, MAP_ROUTE111 + warp_def 8, 20, 0, 2, MAP_DESERT_RUINS + warp_def 8, 11, 3, 1, MAP_DESERT_RUINS DesertRuins_MapBGEvents: @ 8534384 bg_event 8, 20, 0, 0, 0, DesertRuins_EventScript_22D9DB diff --git a/data/maps/events/DesertUnderpass.inc b/data/maps/events/DesertUnderpass.inc index deb440ff98..ea53189ad8 100644 --- a/data/maps/events/DesertUnderpass.inc +++ b/data/maps/events/DesertUnderpass.inc @@ -2,7 +2,7 @@ DesertUnderpass_EventObjects: @ 85376D4 object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 0, 132, 10, 0, 8, 17, 0, 0, 0, DesertUnderpass_EventScript_23AF41, 874, 0, 0 DesertUnderpass_MapWarps: @ 85376EC - warp_def 10, 12, 0, 2, ROUTE_114_FOSSIL_MANIACS_TUNNEL + warp_def 10, 12, 0, 2, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL DesertUnderpass_MapEvents:: @ 85376F4 map_events DesertUnderpass_EventObjects, DesertUnderpass_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DewfordTown.inc b/data/maps/events/DewfordTown.inc index 8bb8971253..9d2c34dc9f 100644 --- a/data/maps/events/DewfordTown.inc +++ b/data/maps/events/DewfordTown.inc @@ -6,11 +6,11 @@ DewfordTown_EventObjects: @ 8527964 object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 0, 1, 6, 3, 1, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0, 0, 0 DewfordTown_MapWarps: @ 85279DC - warp_def 3, 3, 0, 0, DEWFORD_TOWN_HALL - warp_def 2, 10, 0, 0, DEWFORD_TOWN_POKEMON_CENTER_1F - warp_def 8, 17, 0, 0, DEWFORD_TOWN_GYM - warp_def 17, 14, 0, 0, DEWFORD_TOWN_HOUSE_1 - warp_def 8, 8, 0, 0, DEWFORD_TOWN_HOUSE_2 + warp_def 3, 3, 0, 0, MAP_DEWFORD_TOWN_HALL + warp_def 2, 10, 0, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F + warp_def 8, 17, 0, 0, MAP_DEWFORD_TOWN_GYM + warp_def 17, 14, 0, 0, MAP_DEWFORD_TOWN_HOUSE1 + warp_def 8, 8, 0, 0, MAP_DEWFORD_TOWN_HOUSE2 DewfordTown_MapBGEvents: @ 8527A04 bg_event 10, 10, 0, 0, 0, DewfordTown_EventScript_1E95BA diff --git a/data/maps/events/DewfordTown_Gym.inc b/data/maps/events/DewfordTown_Gym.inc index 8d7a8e460b..f5a4452bb6 100644 --- a/data/maps/events/DewfordTown_Gym.inc +++ b/data/maps/events/DewfordTown_Gym.inc @@ -9,8 +9,8 @@ DewfordTown_Gym_EventObjects: @ 852DB34 object_event 8, EVENT_OBJ_GFX_SAILOR, 0, 0, 14, 12, 1, 10, 17, 0, 1, 2, DewfordTown_Gym_EventScript_1FC91D, 0, 0, 0 DewfordTown_Gym_MapWarps: @ 852DBF4 - warp_def 5, 27, 0, 2, DEWFORD_TOWN - warp_def 6, 27, 0, 2, DEWFORD_TOWN + warp_def 5, 27, 0, 2, MAP_DEWFORD_TOWN + warp_def 6, 27, 0, 2, MAP_DEWFORD_TOWN DewfordTown_Gym_MapBGEvents: @ 852DC04 bg_event 4, 23, 3, 1, 0, DewfordTown_Gym_EventScript_1FC9A2 diff --git a/data/maps/events/DewfordTown_Hall.inc b/data/maps/events/DewfordTown_Hall.inc index c4b6600ecd..39f4fad75d 100644 --- a/data/maps/events/DewfordTown_Hall.inc +++ b/data/maps/events/DewfordTown_Hall.inc @@ -10,8 +10,8 @@ DewfordTown_Hall_EventObjects: @ 852DC48 object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 6, 3, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, 940, 0, 0 DewfordTown_Hall_MapWarps: @ 852DD20 - warp_def 5, 8, 0, 0, DEWFORD_TOWN - warp_def 6, 8, 0, 0, DEWFORD_TOWN + warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN + warp_def 6, 8, 0, 0, MAP_DEWFORD_TOWN DewfordTown_Hall_MapBGEvents: @ 852DD30 bg_event 0, 1, 3, 0, 0, DewfordTown_Hall_EventScript_1FD590 diff --git a/data/maps/events/DewfordTown_House1.inc b/data/maps/events/DewfordTown_House1.inc index 72b63dff30..887165b822 100644 --- a/data/maps/events/DewfordTown_House1.inc +++ b/data/maps/events/DewfordTown_House1.inc @@ -4,8 +4,8 @@ DewfordTown_House1_EventObjects: @ 852D9C8 object_event 3, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 4, 2, 3, 8, 19, 0, 0, 0, DewfordTown_House1_EventScript_1FC3E0, 0, 0, 0 DewfordTown_House1_MapWarps: @ 852DA10 - warp_def 3, 7, 0, 3, DEWFORD_TOWN - warp_def 4, 7, 0, 3, DEWFORD_TOWN + warp_def 3, 7, 0, 3, MAP_DEWFORD_TOWN + warp_def 4, 7, 0, 3, MAP_DEWFORD_TOWN DewfordTown_House1_MapEvents:: @ 852DA20 map_events DewfordTown_House1_EventObjects, DewfordTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DewfordTown_House2.inc b/data/maps/events/DewfordTown_House2.inc index 901046cbc5..9cacd146da 100644 --- a/data/maps/events/DewfordTown_House2.inc +++ b/data/maps/events/DewfordTown_House2.inc @@ -3,8 +3,8 @@ DewfordTown_House2_EventObjects: @ 852DD5C object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 0, 2, 3, 3, 1, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE271, 0, 0, 0 DewfordTown_House2_MapWarps: @ 852DD8C - warp_def 3, 8, 0, 4, DEWFORD_TOWN - warp_def 4, 8, 0, 4, DEWFORD_TOWN + warp_def 3, 8, 0, 4, MAP_DEWFORD_TOWN + warp_def 4, 8, 0, 4, MAP_DEWFORD_TOWN DewfordTown_House2_MapEvents:: @ 852DD9C map_events DewfordTown_House2_EventObjects, DewfordTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DewfordTown_PokemonCenter_1F.inc b/data/maps/events/DewfordTown_PokemonCenter_1F.inc index f61966b880..ab2f8c74a1 100644 --- a/data/maps/events/DewfordTown_PokemonCenter_1F.inc +++ b/data/maps/events/DewfordTown_PokemonCenter_1F.inc @@ -4,9 +4,9 @@ DewfordTown_PokemonCenter_1F_EventObjects: @ 852DA34 object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 5, 0, 5, 18, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC54E, 0, 0, 0 DewfordTown_PokemonCenter_1F_MapWarps: @ 852DA7C - warp_def 7, 8, 3, 1, DEWFORD_TOWN - warp_def 6, 8, 3, 1, DEWFORD_TOWN - warp_def 1, 6, 4, 0, DEWFORD_TOWN_POKEMON_CENTER_2F + warp_def 7, 8, 3, 1, MAP_DEWFORD_TOWN + warp_def 6, 8, 3, 1, MAP_DEWFORD_TOWN + warp_def 1, 6, 4, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_2F DewfordTown_PokemonCenter_1F_MapEvents:: @ 852DA94 map_events DewfordTown_PokemonCenter_1F_EventObjects, DewfordTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DewfordTown_PokemonCenter_2F.inc b/data/maps/events/DewfordTown_PokemonCenter_2F.inc index 7098e6ed88..b2147e4f0c 100644 --- a/data/maps/events/DewfordTown_PokemonCenter_2F.inc +++ b/data/maps/events/DewfordTown_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ DewfordTown_PokemonCenter_2F_EventObjects: @ 852DAA8 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 DewfordTown_PokemonCenter_2F_MapWarps: @ 852DB08 - warp_def 1, 6, 4, 2, DEWFORD_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER DewfordTown_PokemonCenter_2F_MapEvents:: @ 852DB20 map_events DewfordTown_PokemonCenter_2F_EventObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DoubleBattleColosseum.inc b/data/maps/events/DoubleBattleColosseum.inc index d1d4f0fef9..f28e9e3e1c 100644 --- a/data/maps/events/DoubleBattleColosseum.inc +++ b/data/maps/events/DoubleBattleColosseum.inc @@ -1,8 +1,8 @@ DoubleBattleColosseum_MapWarps: @ 8539E88 - warp_def 5, 8, 3, 127, NONE - warp_def 6, 8, 3, 127, NONE - warp_def 7, 8, 3, 127, NONE - warp_def 8, 8, 3, 127, NONE + warp_def 5, 8, 3, 127, MAP_NONE + warp_def 6, 8, 3, 127, MAP_NONE + warp_def 7, 8, 3, 127, MAP_NONE + warp_def 8, 8, 3, 127, MAP_NONE DoubleBattleColosseum_MapCoordEvents: @ 8539EA8 coord_event 3, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277388 diff --git a/data/maps/events/EverGrandeCity.inc b/data/maps/events/EverGrandeCity.inc index fb471b4ff9..b8ca9eea47 100644 --- a/data/maps/events/EverGrandeCity.inc +++ b/data/maps/events/EverGrandeCity.inc @@ -1,8 +1,8 @@ EverGrandeCity_MapWarps: @ 8527588 - warp_def 18, 5, 0, 0, EVER_GRANDE_CITY_POKEMON_LEAGUE_1F - warp_def 27, 48, 0, 0, EVER_GRANDE_CITY_POKEMON_CENTER_1F - warp_def 18, 41, 0, 0, VICTORY_ROAD_1F - warp_def 18, 27, 0, 1, VICTORY_ROAD_1F + warp_def 18, 5, 0, 0, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F + warp_def 27, 48, 0, 0, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F + warp_def 18, 41, 0, 0, MAP_VICTORY_ROAD_1F + warp_def 18, 27, 0, 1, MAP_VICTORY_ROAD_1F EverGrandeCity_MapCoordEvents: @ 85275A8 coord_event 17, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.inc b/data/maps/events/EverGrandeCity_ChampionsRoom.inc index 269645dc6c..6318c7bb79 100644 --- a/data/maps/events/EverGrandeCity_ChampionsRoom.inc +++ b/data/maps/events/EverGrandeCity_ChampionsRoom.inc @@ -4,8 +4,8 @@ EverGrandeCity_ChampionsRoom_EventObjects: @ 8533700 object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 921, 0, 0 EverGrandeCity_ChampionsRoom_MapWarps: @ 8533748 - warp_def 6, 12, 3, 1, EVER_GRANDE_CITY_HALL_4 - warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_OF_FAME + warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR4 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL_OF_FAME EverGrandeCity_ChampionsRoom_MapEvents:: @ 8533758 map_events EverGrandeCity_ChampionsRoom_EventObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_DrakesRoom.inc b/data/maps/events/EverGrandeCity_DrakesRoom.inc index 761e321d62..823965d787 100644 --- a/data/maps/events/EverGrandeCity_DrakesRoom.inc +++ b/data/maps/events/EverGrandeCity_DrakesRoom.inc @@ -2,8 +2,8 @@ EverGrandeCity_DrakesRoom_EventObjects: @ 85336C4 object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0, 0, 0 EverGrandeCity_DrakesRoom_MapWarps: @ 85336DC - warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_3 - warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_4 + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR3 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR4 EverGrandeCity_DrakesRoom_MapEvents:: @ 85336EC map_events EverGrandeCity_DrakesRoom_EventObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_GlaciasRoom.inc b/data/maps/events/EverGrandeCity_GlaciasRoom.inc index a8632b8c11..dd2e33d521 100644 --- a/data/maps/events/EverGrandeCity_GlaciasRoom.inc +++ b/data/maps/events/EverGrandeCity_GlaciasRoom.inc @@ -2,8 +2,8 @@ EverGrandeCity_GlaciasRoom_EventObjects: @ 8533688 object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0, 0, 0 EverGrandeCity_GlaciasRoom_MapWarps: @ 85336A0 - warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_2 - warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_3 + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR2 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR3 EverGrandeCity_GlaciasRoom_MapEvents:: @ 85336B0 map_events EverGrandeCity_GlaciasRoom_EventObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Hall1.inc b/data/maps/events/EverGrandeCity_Hall1.inc index 8f9e791a8f..3351b42e04 100644 --- a/data/maps/events/EverGrandeCity_Hall1.inc +++ b/data/maps/events/EverGrandeCity_Hall1.inc @@ -1,8 +1,8 @@ EverGrandeCity_Hall1_MapWarps: @ 853376C - warp_def 5, 12, 3, 1, EVER_GRANDE_CITY_SIDNEYS_ROOM - warp_def 5, 2, 0, 0, EVER_GRANDE_CITY_PHOEBES_ROOM - warp_def 4, 12, 3, 1, EVER_GRANDE_CITY_SIDNEYS_ROOM - warp_def 6, 12, 3, 1, EVER_GRANDE_CITY_SIDNEYS_ROOM + warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM + warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM + warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM + warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM EverGrandeCity_Hall1_MapEvents:: @ 853378C map_events 0x0, EverGrandeCity_Hall1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Hall2.inc b/data/maps/events/EverGrandeCity_Hall2.inc index c9426ceeaa..e3eacab10f 100644 --- a/data/maps/events/EverGrandeCity_Hall2.inc +++ b/data/maps/events/EverGrandeCity_Hall2.inc @@ -1,8 +1,8 @@ EverGrandeCity_Hall2_MapWarps: @ 85337A0 - warp_def 5, 12, 3, 1, EVER_GRANDE_CITY_PHOEBES_ROOM - warp_def 5, 2, 0, 0, EVER_GRANDE_CITY_GLACIAS_ROOM - warp_def 4, 12, 3, 1, EVER_GRANDE_CITY_PHOEBES_ROOM - warp_def 6, 12, 3, 1, EVER_GRANDE_CITY_PHOEBES_ROOM + warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM + warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM + warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM + warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM EverGrandeCity_Hall2_MapEvents:: @ 85337C0 map_events 0x0, EverGrandeCity_Hall2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Hall3.inc b/data/maps/events/EverGrandeCity_Hall3.inc index 68f506d001..e44182b4fc 100644 --- a/data/maps/events/EverGrandeCity_Hall3.inc +++ b/data/maps/events/EverGrandeCity_Hall3.inc @@ -1,8 +1,8 @@ EverGrandeCity_Hall3_MapWarps: @ 85337D4 - warp_def 5, 12, 3, 1, EVER_GRANDE_CITY_GLACIAS_ROOM - warp_def 5, 2, 0, 0, EVER_GRANDE_CITY_DRAKES_ROOM - warp_def 4, 12, 3, 1, EVER_GRANDE_CITY_GLACIAS_ROOM - warp_def 6, 12, 3, 1, EVER_GRANDE_CITY_GLACIAS_ROOM + warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM + warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_DRAKES_ROOM + warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM + warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM EverGrandeCity_Hall3_MapEvents:: @ 85337F4 map_events 0x0, EverGrandeCity_Hall3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Hall4.inc b/data/maps/events/EverGrandeCity_Hall4.inc index 4e7c4f7e6f..b2d0112349 100644 --- a/data/maps/events/EverGrandeCity_Hall4.inc +++ b/data/maps/events/EverGrandeCity_Hall4.inc @@ -1,6 +1,6 @@ EverGrandeCity_Hall4_MapWarps: @ 8533808 - warp_def 5, 33, 3, 1, EVER_GRANDE_CITY_DRAKES_ROOM - warp_def 5, 2, 0, 0, EVER_GRANDE_CITY_CHAMPIONS_ROOM + warp_def 5, 33, 3, 1, MAP_EVER_GRANDE_CITY_DRAKES_ROOM + warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM EverGrandeCity_Hall4_MapEvents:: @ 8533818 map_events 0x0, EverGrandeCity_Hall4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Hall5.inc b/data/maps/events/EverGrandeCity_Hall5.inc index 69fa9a6290..687920b71b 100644 --- a/data/maps/events/EverGrandeCity_Hall5.inc +++ b/data/maps/events/EverGrandeCity_Hall5.inc @@ -1,8 +1,8 @@ EverGrandeCity_Hall5_MapWarps: @ 853382C - warp_def 5, 12, 3, 2, EVER_GRANDE_CITY_POKEMON_LEAGUE_1F - warp_def 5, 2, 0, 0, EVER_GRANDE_CITY_SIDNEYS_ROOM - warp_def 4, 12, 3, 2, EVER_GRANDE_CITY_POKEMON_LEAGUE_1F - warp_def 6, 12, 3, 2, EVER_GRANDE_CITY_POKEMON_LEAGUE_1F + warp_def 5, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F + warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM + warp_def 4, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F + warp_def 6, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F EverGrandeCity_Hall5_MapEvents:: @ 853384C map_events 0x0, EverGrandeCity_Hall5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_HallOfFame.inc b/data/maps/events/EverGrandeCity_HallOfFame.inc index 0d75ef5530..671c312243 100644 --- a/data/maps/events/EverGrandeCity_HallOfFame.inc +++ b/data/maps/events/EverGrandeCity_HallOfFame.inc @@ -2,7 +2,7 @@ EverGrandeCity_HallOfFame_EventObjects: @ 85338FC object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 0, 6, 16, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 EverGrandeCity_HallOfFame_MapWarps: @ 8533914 - warp_def 7, 11, 3, 1, EVER_GRANDE_CITY_CHAMPIONS_ROOM + warp_def 7, 11, 3, 1, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM EverGrandeCity_HallOfFame_MapEvents:: @ 853391C map_events EverGrandeCity_HallOfFame_EventObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PhoebesRoom.inc b/data/maps/events/EverGrandeCity_PhoebesRoom.inc index dd09ad4a16..0a8d48d29a 100644 --- a/data/maps/events/EverGrandeCity_PhoebesRoom.inc +++ b/data/maps/events/EverGrandeCity_PhoebesRoom.inc @@ -2,8 +2,8 @@ EverGrandeCity_PhoebesRoom_EventObjects: @ 853364C object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0, 0, 0 EverGrandeCity_PhoebesRoom_MapWarps: @ 8533664 - warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_1 - warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_2 + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR1 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR2 EverGrandeCity_PhoebesRoom_MapEvents:: @ 8533674 map_events EverGrandeCity_PhoebesRoom_EventObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc index a758c4d731..745c23309b 100644 --- a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ EverGrandeCity_PokemonCenter_1F_EventObjects: @ 8533930 object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 0, 9, 4, 3, 7, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, 793, 0, 0 EverGrandeCity_PokemonCenter_1F_MapWarps: @ 8533990 - warp_def 7, 8, 3, 1, EVER_GRANDE_CITY - warp_def 6, 8, 3, 1, EVER_GRANDE_CITY - warp_def 1, 6, 4, 0, EVER_GRANDE_CITY_POKEMON_CENTER_2F + warp_def 7, 8, 3, 1, MAP_EVER_GRANDE_CITY + warp_def 6, 8, 3, 1, MAP_EVER_GRANDE_CITY + warp_def 1, 6, 4, 0, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F EverGrandeCity_PokemonCenter_1F_MapEvents:: @ 85339A8 map_events EverGrandeCity_PokemonCenter_1F_EventObjects, EverGrandeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc index bbedf59d22..19741159a8 100644 --- a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc +++ b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ EverGrandeCity_PokemonCenter_2F_EventObjects: @ 85339BC object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 EverGrandeCity_PokemonCenter_2F_MapWarps: @ 8533A1C - warp_def 1, 6, 4, 2, EVER_GRANDE_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER EverGrandeCity_PokemonCenter_2F_MapEvents:: @ 8533A34 map_events EverGrandeCity_PokemonCenter_2F_EventObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc b/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc index a19984ea2d..129de15cc2 100644 --- a/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc +++ b/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc @@ -5,11 +5,11 @@ EverGrandeCity_PokemonLeague_1F_EventObjects: @ 8533860 object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 11, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0, 0, 0 EverGrandeCity_PokemonLeague_1F_MapWarps: @ 85338C0 - warp_def 9, 11, 3, 0, EVER_GRANDE_CITY - warp_def 10, 11, 3, 0, EVER_GRANDE_CITY - warp_def 9, 1, 3, 0, EVER_GRANDE_CITY_HALL_5 - warp_def 10, 1, 3, 0, EVER_GRANDE_CITY_HALL_5 - warp_def 1, 7, 4, 0, EVER_GRANDE_CITY_POKEMON_LEAGUE_2F + warp_def 9, 11, 3, 0, MAP_EVER_GRANDE_CITY + warp_def 10, 11, 3, 0, MAP_EVER_GRANDE_CITY + warp_def 9, 1, 3, 0, MAP_EVER_GRANDE_CITY_CORRIDOR5 + warp_def 10, 1, 3, 0, MAP_EVER_GRANDE_CITY_CORRIDOR5 + warp_def 1, 7, 4, 0, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F EverGrandeCity_PokemonLeague_1F_MapEvents:: @ 85338E8 map_events EverGrandeCity_PokemonLeague_1F_EventObjects, EverGrandeCity_PokemonLeague_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc b/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc index 6b85a2fb0b..3e453781a0 100644 --- a/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc +++ b/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc @@ -5,9 +5,9 @@ EverGrandeCity_PokemonLeague_2F_EventObjects: @ 8533A48 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, 702, 0, 0 EverGrandeCity_PokemonLeague_2F_MapWarps: @ 8533AA8 - warp_def 1, 6, 4, 4, EVER_GRANDE_CITY_POKEMON_LEAGUE_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 4, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER EverGrandeCity_PokemonLeague_2F_MapEvents:: @ 8533AC0 map_events EverGrandeCity_PokemonLeague_2F_EventObjects, EverGrandeCity_PokemonLeague_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.inc b/data/maps/events/EverGrandeCity_SidneysRoom.inc index 93d9a879ec..295633242d 100644 --- a/data/maps/events/EverGrandeCity_SidneysRoom.inc +++ b/data/maps/events/EverGrandeCity_SidneysRoom.inc @@ -2,8 +2,8 @@ EverGrandeCity_SidneysRoom_EventObjects: @ 8533610 object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0, 0, 0 EverGrandeCity_SidneysRoom_MapWarps: @ 8533628 - warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_5 - warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_1 + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR5 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR1 EverGrandeCity_SidneysRoom_MapEvents:: @ 8533638 map_events EverGrandeCity_SidneysRoom_EventObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown.inc b/data/maps/events/FallarborTown.inc index e9fb7579c7..abe98828c3 100644 --- a/data/maps/events/FallarborTown.inc +++ b/data/maps/events/FallarborTown.inc @@ -5,11 +5,11 @@ FallarborTown_EventObjects: @ 8527BE0 object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 0, 8, 12, 3, 1, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, 907, 0, 0 FallarborTown_MapWarps: @ 8527C40 - warp_def 15, 15, 0, 0, FALLARBOR_TOWN_MART - warp_def 8, 7, 0, 0, FALLARBOR_TOWN_BATTLE_TENT_LOBBY - warp_def 14, 7, 0, 0, FALLARBOR_TOWN_POKEMON_CENTER_1F - warp_def 6, 17, 0, 0, FALLARBOR_TOWN_HOUSE_1 - warp_def 1, 6, 0, 0, FALLARBOR_TOWN_HOUSE_2 + warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART + warp_def 8, 7, 0, 0, MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY + warp_def 14, 7, 0, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F + warp_def 6, 17, 0, 0, MAP_FALLARBOR_TOWN_HOUSE1 + warp_def 1, 6, 0, 0, MAP_FALLARBOR_TOWN_HOUSE2 FallarborTown_MapBGEvents: @ 8527C68 bg_event 16, 15, 0, 1, 0, FallarborTown_EventScript_271E6A diff --git a/data/maps/events/FallarborTown_BattleTentLobby.inc b/data/maps/events/FallarborTown_BattleTentLobby.inc index e261f185fe..cdc525c0a3 100644 --- a/data/maps/events/FallarborTown_BattleTentLobby.inc +++ b/data/maps/events/FallarborTown_BattleTentLobby.inc @@ -6,8 +6,8 @@ FallarborTown_BattleTentLobby_EventObjects: @ 852E370 object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 0, 7, 3, 10, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, 767, 0, 0 FallarborTown_BattleTentLobby_MapWarps: @ 852E3E8 - warp_def 6, 9, 0, 1, FALLARBOR_TOWN - warp_def 7, 9, 0, 1, FALLARBOR_TOWN + warp_def 6, 9, 0, 1, MAP_FALLARBOR_TOWN + warp_def 7, 9, 0, 1, MAP_FALLARBOR_TOWN FallarborTown_BattleTentLobby_MapBGEvents: @ 852E3F8 bg_event 4, 5, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20024F diff --git a/data/maps/events/FallarborTown_House1.inc b/data/maps/events/FallarborTown_House1.inc index b3975685ca..42f5e1950d 100644 --- a/data/maps/events/FallarborTown_House1.inc +++ b/data/maps/events/FallarborTown_House1.inc @@ -3,8 +3,8 @@ FallarborTown_House1_EventObjects: @ 852E5B8 object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 6, 3, 5, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0, 0, 0 FallarborTown_House1_MapWarps: @ 852E5E8 - warp_def 3, 8, 0, 3, FALLARBOR_TOWN - warp_def 4, 8, 0, 3, FALLARBOR_TOWN + warp_def 3, 8, 0, 3, MAP_FALLARBOR_TOWN + warp_def 4, 8, 0, 3, MAP_FALLARBOR_TOWN FallarborTown_House1_MapEvents:: @ 852E5F8 map_events FallarborTown_House1_EventObjects, FallarborTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_House2.inc b/data/maps/events/FallarborTown_House2.inc index d809bf4939..853aa5d2b8 100644 --- a/data/maps/events/FallarborTown_House2.inc +++ b/data/maps/events/FallarborTown_House2.inc @@ -2,8 +2,8 @@ FallarborTown_House2_EventObjects: @ 852E60C object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, FallarborTown_House2_EventScript_201383, 0, 0, 0 FallarborTown_House2_MapWarps: @ 852E624 - warp_def 3, 7, 0, 4, FALLARBOR_TOWN - warp_def 4, 7, 0, 4, FALLARBOR_TOWN + warp_def 3, 7, 0, 4, MAP_FALLARBOR_TOWN + warp_def 4, 7, 0, 4, MAP_FALLARBOR_TOWN FallarborTown_House2_MapEvents:: @ 852E634 map_events FallarborTown_House2_EventObjects, FallarborTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_Mart.inc b/data/maps/events/FallarborTown_Mart.inc index 762db16f9c..fee24d963f 100644 --- a/data/maps/events/FallarborTown_Mart.inc +++ b/data/maps/events/FallarborTown_Mart.inc @@ -6,8 +6,8 @@ FallarborTown_Mart_EventObjects: @ 852E2D4 object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 0, 7, 2, 3, 7, 0, 0, 0, 0, FallarborTown_Mart_EventScript_2C80B6, 0, 0, 0 FallarborTown_Mart_MapWarps: @ 852E34C - warp_def 3, 7, 0, 0, FALLARBOR_TOWN - warp_def 4, 7, 0, 0, FALLARBOR_TOWN + warp_def 3, 7, 0, 0, MAP_FALLARBOR_TOWN + warp_def 4, 7, 0, 0, MAP_FALLARBOR_TOWN FallarborTown_Mart_MapEvents:: @ 852E35C map_events FallarborTown_Mart_EventObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.inc b/data/maps/events/FallarborTown_PokemonCenter_1F.inc index e6c91a736d..1be0bd7834 100644 --- a/data/maps/events/FallarborTown_PokemonCenter_1F.inc +++ b/data/maps/events/FallarborTown_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ FallarborTown_PokemonCenter_1F_EventObjects: @ 852E4A0 object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 10, 2, 3, 7, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, 871, 0, 0 FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500 - warp_def 7, 8, 3, 2, FALLARBOR_TOWN - warp_def 6, 8, 3, 2, FALLARBOR_TOWN - warp_def 1, 6, 4, 0, FALLARBOR_TOWN_POKEMON_CENTER_2F + warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN + warp_def 6, 8, 3, 2, MAP_FALLARBOR_TOWN + warp_def 1, 6, 4, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F FallarborTown_PokemonCenter_1F_MapEvents:: @ 852E518 map_events FallarborTown_PokemonCenter_1F_EventObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_PokemonCenter_2F.inc b/data/maps/events/FallarborTown_PokemonCenter_2F.inc index 6ddb7e9c9b..c72ccf88a2 100644 --- a/data/maps/events/FallarborTown_PokemonCenter_2F.inc +++ b/data/maps/events/FallarborTown_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ FallarborTown_PokemonCenter_2F_EventObjects: @ 852E52C object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 FallarborTown_PokemonCenter_2F_MapWarps: @ 852E58C - warp_def 1, 6, 4, 2, FALLARBOR_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER FallarborTown_PokemonCenter_2F_MapEvents:: @ 852E5A4 map_events FallarborTown_PokemonCenter_2F_EventObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FarawayIsland_Entrance.inc b/data/maps/events/FarawayIsland_Entrance.inc index 27d98189e6..2c6a007bf3 100644 --- a/data/maps/events/FarawayIsland_Entrance.inc +++ b/data/maps/events/FarawayIsland_Entrance.inc @@ -3,8 +3,8 @@ FarawayIsland_Entrance_EventObjects: @ 853D710 object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 13, 41, 1, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 FarawayIsland_Entrance_MapWarps: @ 853D740 - warp_def 22, 7, 3, 0, FARAWAY_ISLAND_INTERIOR - warp_def 23, 7, 3, 1, FARAWAY_ISLAND_INTERIOR + warp_def 22, 7, 3, 0, MAP_FARAWAY_ISLAND_INTERIOR + warp_def 23, 7, 3, 1, MAP_FARAWAY_ISLAND_INTERIOR FarawayIsland_Entrance_MapCoordEvents: @ 853D750 coord_event 9, 18, 3, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267C98 diff --git a/data/maps/events/FarawayIsland_Interior.inc b/data/maps/events/FarawayIsland_Interior.inc index d74eb9d8f7..5d41d11d13 100644 --- a/data/maps/events/FarawayIsland_Interior.inc +++ b/data/maps/events/FarawayIsland_Interior.inc @@ -2,8 +2,8 @@ FarawayIsland_Interior_EventObjects: @ 853D7A0 object_event 1, EVENT_OBJ_GFX_MEW, 0, 0, 13, 17, 3, 60, 255, 0, 0, 1, FarawayIsland_Interior_EventScript_267DF2, 718, 0, 0 FarawayIsland_Interior_MapWarps: @ 853D7B8 - warp_def 12, 19, 0, 0, FARAWAY_ISLAND_ENTRANCE - warp_def 13, 19, 0, 1, FARAWAY_ISLAND_ENTRANCE + warp_def 12, 19, 0, 0, MAP_FARAWAY_ISLAND_ENTRANCE + warp_def 13, 19, 0, 1, MAP_FARAWAY_ISLAND_ENTRANCE FarawayIsland_Interior_MapEvents:: @ 853D7C8 map_events FarawayIsland_Interior_EventObjects, FarawayIsland_Interior_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FieryPath.inc b/data/maps/events/FieryPath.inc index 3b68b12924..6979786aae 100644 --- a/data/maps/events/FieryPath.inc +++ b/data/maps/events/FieryPath.inc @@ -9,8 +9,8 @@ FieryPath_EventObjects: @ 8534C80 object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 32, 3, 1, 17, 0, 0, 0, FieryPath_EventScript_291191, 1111, 0, 0 FieryPath_MapWarps: @ 8534D40 - warp_def 26, 36, 3, 4, ROUTE_112 - warp_def 26, 4, 3, 5, ROUTE_112 + warp_def 26, 36, 3, 4, MAP_ROUTE112 + warp_def 26, 4, 3, 5, MAP_ROUTE112 FieryPath_MapEvents:: @ 8534D50 map_events FieryPath_EventObjects, FieryPath_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity.inc b/data/maps/events/FortreeCity.inc index 517d32d539..cb9e70e07c 100644 --- a/data/maps/events/FortreeCity.inc +++ b/data/maps/events/FortreeCity.inc @@ -8,15 +8,15 @@ FortreeCity_EventObjects: @ 8526B9C object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 25, 8, 3, 76, 17, 0, 0, 0, FortreeCity_EventScript_1E2614, 969, 0, 0 FortreeCity_MapWarps: @ 8526C44 - warp_def 5, 6, 0, 0, FORTREE_CITY_POKEMON_CENTER_1F - warp_def 10, 3, 0, 0, FORTREE_CITY_HOUSE_1 - warp_def 22, 11, 0, 0, FORTREE_CITY_GYM - warp_def 4, 14, 0, 0, FORTREE_CITY_MART - warp_def 17, 3, 0, 0, FORTREE_CITY_HOUSE_2 - warp_def 25, 3, 0, 0, FORTREE_CITY_HOUSE_3 - warp_def 32, 2, 0, 0, FORTREE_CITY_HOUSE_4 - warp_def 12, 13, 0, 0, FORTREE_CITY_HOUSE_5 - warp_def 37, 13, 0, 0, FORTREE_CITY_DECORATION_SHOP + warp_def 5, 6, 0, 0, MAP_FORTREE_CITY_POKEMON_CENTER_1F + warp_def 10, 3, 0, 0, MAP_FORTREE_CITY_HOUSE1 + warp_def 22, 11, 0, 0, MAP_FORTREE_CITY_GYM + warp_def 4, 14, 0, 0, MAP_FORTREE_CITY_MART + warp_def 17, 3, 0, 0, MAP_FORTREE_CITY_HOUSE2 + warp_def 25, 3, 0, 0, MAP_FORTREE_CITY_HOUSE3 + warp_def 32, 2, 0, 0, MAP_FORTREE_CITY_HOUSE4 + warp_def 12, 13, 0, 0, MAP_FORTREE_CITY_HOUSE5 + warp_def 37, 13, 0, 0, MAP_FORTREE_CITY_DECORATION_SHOP FortreeCity_MapBGEvents: @ 8526C8C bg_event 6, 9, 0, 0, 0, FortreeCity_EventScript_1E2602 diff --git a/data/maps/events/FortreeCity_DecorationShop.inc b/data/maps/events/FortreeCity_DecorationShop.inc index 6b7e0f39d0..7abb73fed4 100644 --- a/data/maps/events/FortreeCity_DecorationShop.inc +++ b/data/maps/events/FortreeCity_DecorationShop.inc @@ -5,8 +5,8 @@ FortreeCity_DecorationShop_EventObjects: @ 85310B0 object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 6, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21804C, 0, 0, 0 FortreeCity_DecorationShop_MapWarps: @ 8531110 - warp_def 3, 5, 0, 8, FORTREE_CITY - warp_def 4, 5, 0, 8, FORTREE_CITY + warp_def 3, 5, 0, 8, MAP_FORTREE_CITY + warp_def 4, 5, 0, 8, MAP_FORTREE_CITY FortreeCity_DecorationShop_MapEvents:: @ 8531120 map_events FortreeCity_DecorationShop_EventObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_Gym.inc b/data/maps/events/FortreeCity_Gym.inc index a068827724..3f8e8d6344 100644 --- a/data/maps/events/FortreeCity_Gym.inc +++ b/data/maps/events/FortreeCity_Gym.inc @@ -9,8 +9,8 @@ FortreeCity_Gym_EventObjects: @ 8530C98 object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 0, 1, 10, 3, 7, 17, 0, 1, 3, FortreeCity_Gym_EventScript_21671B, 0, 0, 0 FortreeCity_Gym_MapWarps: @ 8530D58 - warp_def 15, 24, 0, 2, FORTREE_CITY - warp_def 16, 24, 0, 2, FORTREE_CITY + warp_def 15, 24, 0, 2, MAP_FORTREE_CITY + warp_def 16, 24, 0, 2, MAP_FORTREE_CITY FortreeCity_Gym_MapBGEvents: @ 8530D68 bg_event 14, 21, 0, 1, 0, FortreeCity_Gym_EventScript_216751 diff --git a/data/maps/events/FortreeCity_House1.inc b/data/maps/events/FortreeCity_House1.inc index abaae2d40f..754758c5cc 100644 --- a/data/maps/events/FortreeCity_House1.inc +++ b/data/maps/events/FortreeCity_House1.inc @@ -4,8 +4,8 @@ FortreeCity_House1_EventObjects: @ 8530C2C object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 7, 4, 3, 1, 17, 0, 0, 0, FortreeCity_House1_EventScript_21635F, 0, 0, 0 FortreeCity_House1_MapWarps: @ 8530C74 - warp_def 3, 5, 0, 1, FORTREE_CITY - warp_def 4, 5, 0, 1, FORTREE_CITY + warp_def 3, 5, 0, 1, MAP_FORTREE_CITY + warp_def 4, 5, 0, 1, MAP_FORTREE_CITY FortreeCity_House1_MapEvents:: @ 8530C84 map_events FortreeCity_House1_EventObjects, FortreeCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House2.inc b/data/maps/events/FortreeCity_House2.inc index 5130975035..742688c1d7 100644 --- a/data/maps/events/FortreeCity_House2.inc +++ b/data/maps/events/FortreeCity_House2.inc @@ -3,8 +3,8 @@ FortreeCity_House2_EventObjects: @ 8530F30 object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 3, 3, 9, 1, 0, 0, 0, FortreeCity_House2_EventScript_2C811E, 0, 0, 0 FortreeCity_House2_MapWarps: @ 8530F60 - warp_def 3, 5, 0, 4, FORTREE_CITY - warp_def 4, 5, 0, 4, FORTREE_CITY + warp_def 3, 5, 0, 4, MAP_FORTREE_CITY + warp_def 4, 5, 0, 4, MAP_FORTREE_CITY FortreeCity_House2_MapEvents:: @ 8530F70 map_events FortreeCity_House2_EventObjects, FortreeCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House3.inc b/data/maps/events/FortreeCity_House3.inc index 1b788cbe28..13d1e079ea 100644 --- a/data/maps/events/FortreeCity_House3.inc +++ b/data/maps/events/FortreeCity_House3.inc @@ -3,8 +3,8 @@ FortreeCity_House3_EventObjects: @ 8530F84 object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 5, 4, 3, 2, 17, 0, 0, 0, FortreeCity_House3_EventScript_217AF1, 0, 0, 0 FortreeCity_House3_MapWarps: @ 8530FB4 - warp_def 3, 5, 0, 5, FORTREE_CITY - warp_def 4, 5, 0, 5, FORTREE_CITY + warp_def 3, 5, 0, 5, MAP_FORTREE_CITY + warp_def 4, 5, 0, 5, MAP_FORTREE_CITY FortreeCity_House3_MapEvents:: @ 8530FC4 map_events FortreeCity_House3_EventObjects, FortreeCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House4.inc b/data/maps/events/FortreeCity_House4.inc index a4050a5f67..3c6886e3ce 100644 --- a/data/maps/events/FortreeCity_House4.inc +++ b/data/maps/events/FortreeCity_House4.inc @@ -4,8 +4,8 @@ FortreeCity_House4_EventObjects: @ 8530FD8 object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, 933, 0, 0 FortreeCity_House4_MapWarps: @ 8531020 - warp_def 3, 5, 0, 6, FORTREE_CITY - warp_def 4, 5, 0, 6, FORTREE_CITY + warp_def 3, 5, 0, 6, MAP_FORTREE_CITY + warp_def 4, 5, 0, 6, MAP_FORTREE_CITY FortreeCity_House4_MapEvents:: @ 8531030 map_events FortreeCity_House4_EventObjects, FortreeCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House5.inc b/data/maps/events/FortreeCity_House5.inc index b6bf343543..7849df43e0 100644 --- a/data/maps/events/FortreeCity_House5.inc +++ b/data/maps/events/FortreeCity_House5.inc @@ -4,8 +4,8 @@ FortreeCity_House5_EventObjects: @ 8531044 object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EFB, 0, 0, 0 FortreeCity_House5_MapWarps: @ 853108C - warp_def 3, 5, 0, 7, FORTREE_CITY - warp_def 4, 5, 0, 7, FORTREE_CITY + warp_def 3, 5, 0, 7, MAP_FORTREE_CITY + warp_def 4, 5, 0, 7, MAP_FORTREE_CITY FortreeCity_House5_MapEvents:: @ 853109C map_events FortreeCity_House5_EventObjects, FortreeCity_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_Mart.inc b/data/maps/events/FortreeCity_Mart.inc index df48776637..450007097e 100644 --- a/data/maps/events/FortreeCity_Mart.inc +++ b/data/maps/events/FortreeCity_Mart.inc @@ -5,8 +5,8 @@ FortreeCity_Mart_EventObjects: @ 8530EAC object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 5, 6, 3, 10, 17, 0, 0, 0, FortreeCity_Mart_EventScript_2176AA, 0, 0, 0 FortreeCity_Mart_MapWarps: @ 8530F0C - warp_def 3, 7, 0, 3, FORTREE_CITY - warp_def 4, 7, 0, 3, FORTREE_CITY + warp_def 3, 7, 0, 3, MAP_FORTREE_CITY + warp_def 4, 7, 0, 3, MAP_FORTREE_CITY FortreeCity_Mart_MapEvents:: @ 8530F1C map_events FortreeCity_Mart_EventObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_PokemonCenter_1F.inc b/data/maps/events/FortreeCity_PokemonCenter_1F.inc index b6b8cfdce9..e2555bd2c2 100644 --- a/data/maps/events/FortreeCity_PokemonCenter_1F.inc +++ b/data/maps/events/FortreeCity_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ FortreeCity_PokemonCenter_1F_EventObjects: @ 8530D94 object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 0, 2, 3, 3, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_217407, 0, 0, 0 FortreeCity_PokemonCenter_1F_MapWarps: @ 8530DF4 - warp_def 7, 8, 3, 0, FORTREE_CITY - warp_def 6, 8, 3, 0, FORTREE_CITY - warp_def 1, 6, 4, 0, FORTREE_CITY_POKEMON_CENTER_2F + warp_def 7, 8, 3, 0, MAP_FORTREE_CITY + warp_def 6, 8, 3, 0, MAP_FORTREE_CITY + warp_def 1, 6, 4, 0, MAP_FORTREE_CITY_POKEMON_CENTER_2F FortreeCity_PokemonCenter_1F_MapEvents:: @ 8530E0C map_events FortreeCity_PokemonCenter_1F_EventObjects, FortreeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_PokemonCenter_2F.inc b/data/maps/events/FortreeCity_PokemonCenter_2F.inc index c8f2356c44..b03f27efad 100644 --- a/data/maps/events/FortreeCity_PokemonCenter_2F.inc +++ b/data/maps/events/FortreeCity_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ FortreeCity_PokemonCenter_2F_EventObjects: @ 8530E20 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 FortreeCity_PokemonCenter_2F_MapWarps: @ 8530E80 - warp_def 1, 6, 4, 2, FORTREE_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER FortreeCity_PokemonCenter_2F_MapEvents:: @ 8530E98 map_events FortreeCity_PokemonCenter_2F_EventObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/GraniteCave_1F.inc b/data/maps/events/GraniteCave_1F.inc index ed546c8dff..d14cf38ca5 100644 --- a/data/maps/events/GraniteCave_1F.inc +++ b/data/maps/events/GraniteCave_1F.inc @@ -3,10 +3,10 @@ GraniteCave_1F_EventObjects: @ 85343BC object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 17, 7, 3, 8, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, 1050, 0, 0 GraniteCave_1F_MapWarps: @ 85343EC - warp_def 37, 12, 3, 0, ROUTE_106 - warp_def 35, 3, 3, 0, GRANITE_CAVE_B1F - warp_def 17, 11, 3, 1, GRANITE_CAVE_B1F - warp_def 5, 10, 3, 0, GRANITE_CAVE_STEVENS_ROOM + warp_def 37, 12, 3, 0, MAP_ROUTE106 + warp_def 35, 3, 3, 0, MAP_GRANITE_CAVE_B1F + warp_def 17, 11, 3, 1, MAP_GRANITE_CAVE_B1F + warp_def 5, 10, 3, 0, MAP_GRANITE_CAVE_STEVENS_ROOM GraniteCave_1F_MapEvents:: @ 853440C map_events GraniteCave_1F_EventObjects, GraniteCave_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/GraniteCave_B1F.inc b/data/maps/events/GraniteCave_B1F.inc index 7f4e67f336..f393dd7201 100644 --- a/data/maps/events/GraniteCave_B1F.inc +++ b/data/maps/events/GraniteCave_B1F.inc @@ -2,13 +2,13 @@ GraniteCave_B1F_EventObjects: @ 8534420 object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 15, 21, 3, 1, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, 1051, 0, 0 GraniteCave_B1F_MapWarps: @ 8534438 - warp_def 25, 13, 3, 1, GRANITE_CAVE_1F - warp_def 4, 21, 3, 2, GRANITE_CAVE_1F - warp_def 29, 13, 3, 0, GRANITE_CAVE_B2F - warp_def 28, 21, 3, 1, GRANITE_CAVE_B2F - warp_def 8, 5, 3, 2, GRANITE_CAVE_B2F - warp_def 12, 3, 3, 3, GRANITE_CAVE_B2F - warp_def 29, 2, 3, 4, GRANITE_CAVE_B2F + warp_def 25, 13, 3, 1, MAP_GRANITE_CAVE_1F + warp_def 4, 21, 3, 2, MAP_GRANITE_CAVE_1F + warp_def 29, 13, 3, 0, MAP_GRANITE_CAVE_B2F + warp_def 28, 21, 3, 1, MAP_GRANITE_CAVE_B2F + warp_def 8, 5, 3, 2, MAP_GRANITE_CAVE_B2F + warp_def 12, 3, 3, 3, MAP_GRANITE_CAVE_B2F + warp_def 29, 2, 3, 4, MAP_GRANITE_CAVE_B2F GraniteCave_B1F_MapEvents:: @ 8534470 map_events GraniteCave_B1F_EventObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/events/GraniteCave_B2F.inc index 7c484e9a97..7765201961 100644 --- a/data/maps/events/GraniteCave_B2F.inc +++ b/data/maps/events/GraniteCave_B2F.inc @@ -10,11 +10,11 @@ GraniteCave_B2F_EventObjects: @ 8534484 object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 21, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 23, 0, 0 GraniteCave_B2F_MapWarps: @ 853455C - warp_def 29, 13, 3, 2, GRANITE_CAVE_B1F - warp_def 28, 21, 3, 3, GRANITE_CAVE_B1F - warp_def 8, 5, 3, 4, GRANITE_CAVE_B1F - warp_def 12, 3, 3, 5, GRANITE_CAVE_B1F - warp_def 29, 2, 3, 6, GRANITE_CAVE_B1F + warp_def 29, 13, 3, 2, MAP_GRANITE_CAVE_B1F + warp_def 28, 21, 3, 3, MAP_GRANITE_CAVE_B1F + warp_def 8, 5, 3, 4, MAP_GRANITE_CAVE_B1F + warp_def 12, 3, 3, 5, MAP_GRANITE_CAVE_B1F + warp_def 29, 2, 3, 6, MAP_GRANITE_CAVE_B1F GraniteCave_B2F_MapBGEvents: @ 8534584 bg_event 28, 6, 3, 7, 0, ITEM_EVERSTONE, 48, 0 diff --git a/data/maps/events/GraniteCave_StevensRoom.inc b/data/maps/events/GraniteCave_StevensRoom.inc index 65b343202b..26233c0d74 100644 --- a/data/maps/events/GraniteCave_StevensRoom.inc +++ b/data/maps/events/GraniteCave_StevensRoom.inc @@ -2,7 +2,7 @@ GraniteCave_StevensRoom_EventObjects: @ 85345B0 object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 0, 7, 8, 3, 1, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, 833, 0, 0 GraniteCave_StevensRoom_MapWarps: @ 85345C8 - warp_def 7, 3, 3, 3, GRANITE_CAVE_1F + warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F GraniteCave_StevensRoom_MapEvents:: @ 85345D0 map_events GraniteCave_StevensRoom_EventObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/events/InsideOfTruck.inc index 4cf23e63d4..60d8fc7bd0 100644 --- a/data/maps/events/InsideOfTruck.inc +++ b/data/maps/events/InsideOfTruck.inc @@ -4,9 +4,9 @@ InsideOfTruck_EventObjects: @ 853A078 object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 2, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0 InsideOfTruck_MapWarps: @ 853A0C0 - warp_def 4, 1, 0, 127, NONE - warp_def 4, 2, 0, 127, NONE - warp_def 4, 3, 0, 127, NONE + warp_def 4, 1, 0, 127, MAP_NONE + warp_def 4, 2, 0, 127, MAP_NONE + warp_def 4, 3, 0, 127, MAP_NONE InsideOfTruck_MapCoordEvents: @ 853A0D8 coord_event 3, 1, 3, 0, VAR_0x4092, 0, 0, InsideOfTruck_EventScript_23BF04 diff --git a/data/maps/events/IslandCave.inc b/data/maps/events/IslandCave.inc index da1f94173c..71d94e0cdb 100644 --- a/data/maps/events/IslandCave.inc +++ b/data/maps/events/IslandCave.inc @@ -2,9 +2,9 @@ IslandCave_EventObjects: @ 8536C74 object_event 1, EVENT_OBJ_GFX_REGICE, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, IslandCave_EventScript_238F58, 936, 0, 0 IslandCave_MapWarps: @ 8536C8C - warp_def 8, 29, 3, 0, ROUTE_105 - warp_def 8, 20, 0, 2, ISLAND_CAVE - warp_def 8, 11, 3, 1, ISLAND_CAVE + warp_def 8, 29, 3, 0, MAP_ROUTE105 + warp_def 8, 20, 0, 2, MAP_ISLAND_CAVE + warp_def 8, 11, 3, 1, MAP_ISLAND_CAVE IslandCave_MapBGEvents: @ 8536CA4 bg_event 8, 20, 0, 0, 0, IslandCave_EventScript_238EEF diff --git a/data/maps/events/JaggedPass.inc b/data/maps/events/JaggedPass.inc index 5d970924db..fa6dabcffc 100644 --- a/data/maps/events/JaggedPass.inc +++ b/data/maps/events/JaggedPass.inc @@ -8,11 +8,11 @@ JaggedPass_EventObjects: @ 8534AE4 object_event 7, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 18, 25, 3, 9, 17, 0, 1, 3, JaggedPass_EventScript_23085A, 0, 0, 0 JaggedPass_MapWarps: @ 8534B8C - warp_def 14, 40, 3, 2, ROUTE_112 - warp_def 15, 40, 3, 3, ROUTE_112 - warp_def 13, 5, 3, 2, MT_CHIMNEY - warp_def 14, 5, 3, 3, MT_CHIMNEY - warp_def 16, 18, 0, 0, MAGMA_HIDEOUT_1F + warp_def 14, 40, 3, 2, MAP_ROUTE112 + warp_def 15, 40, 3, 3, MAP_ROUTE112 + warp_def 13, 5, 3, 2, MAP_MT_CHIMNEY + warp_def 14, 5, 3, 3, MAP_MT_CHIMNEY + warp_def 16, 18, 0, 0, MAP_MAGMA_HIDEOUT_1F JaggedPass_MapCoordEvents: @ 8534BB4 coord_event 13, 15, 3, 0, 2, 0, 0, 0x0 diff --git a/data/maps/events/LavaridgeTown.inc b/data/maps/events/LavaridgeTown.inc index 6580567682..7419f67d69 100644 --- a/data/maps/events/LavaridgeTown.inc +++ b/data/maps/events/LavaridgeTown.inc @@ -10,12 +10,12 @@ LavaridgeTown_EventObjects: @ 8527A54 object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 4, 7, 3, 8, 17, 0, 0, 0, LavaridgeTown_EventScript_1EA744, 0, 0, 0 LavaridgeTown_MapWarps: @ 8527B2C - warp_def 12, 15, 0, 0, LAVARIDGE_TOWN_HERB_SHOP - warp_def 5, 15, 0, 0, LAVARIDGE_TOWN_GYM_1F - warp_def 15, 5, 0, 0, LAVARIDGE_TOWN_MART - warp_def 9, 6, 0, 0, LAVARIDGE_TOWN_POKEMON_CENTER_1F - warp_def 16, 15, 0, 0, LAVARIDGE_TOWN_HOUSE - warp_def 9, 2, 3, 3, LAVARIDGE_TOWN_POKEMON_CENTER_1F + warp_def 12, 15, 0, 0, MAP_LAVARIDGE_TOWN_HERB_SHOP + warp_def 5, 15, 0, 0, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 15, 5, 0, 0, MAP_LAVARIDGE_TOWN_MART + warp_def 9, 6, 0, 0, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F + warp_def 16, 15, 0, 0, MAP_LAVARIDGE_TOWN_HOUSE + warp_def 9, 2, 3, 3, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F LavaridgeTown_MapCoordEvents: @ 8527B5C coord_event 6, 3, 3, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA6FA diff --git a/data/maps/events/LavaridgeTown_Gym_1F.inc b/data/maps/events/LavaridgeTown_Gym_1F.inc index 501cab67fc..784b7b857e 100644 --- a/data/maps/events/LavaridgeTown_Gym_1F.inc +++ b/data/maps/events/LavaridgeTown_Gym_1F.inc @@ -7,32 +7,32 @@ LavaridgeTown_Gym_1F_EventObjects: @ 852DE1C object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 0, 12, 16, 3, 10, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE96C, 0, 0, 0 LavaridgeTown_Gym_1F_MapWarps: @ 852DEAC - warp_def 13, 18, 3, 1, LAVARIDGE_TOWN - warp_def 14, 18, 3, 1, LAVARIDGE_TOWN - warp_def 10, 18, 3, 0, LAVARIDGE_TOWN_GYM_B1F - warp_def 8, 9, 3, 2, LAVARIDGE_TOWN_GYM_B1F - warp_def 4, 18, 3, 4, LAVARIDGE_TOWN_GYM_B1F - warp_def 5, 14, 3, 3, LAVARIDGE_TOWN_GYM_B1F - warp_def 0, 17, 3, 1, LAVARIDGE_TOWN_GYM_B1F - warp_def 5, 9, 3, 5, LAVARIDGE_TOWN_GYM_B1F - warp_def 2, 15, 3, 6, LAVARIDGE_TOWN_GYM_B1F - warp_def 3, 14, 3, 7, LAVARIDGE_TOWN_GYM_B1F - warp_def 1, 14, 3, 8, LAVARIDGE_TOWN_GYM_B1F - warp_def 0, 10, 3, 9, LAVARIDGE_TOWN_GYM_B1F - warp_def 3, 10, 3, 10, LAVARIDGE_TOWN_GYM_B1F - warp_def 0, 6, 3, 11, LAVARIDGE_TOWN_GYM_B1F - warp_def 3, 6, 3, 12, LAVARIDGE_TOWN_GYM_B1F - warp_def 5, 6, 3, 13, LAVARIDGE_TOWN_GYM_B1F - warp_def 2, 3, 3, 14, LAVARIDGE_TOWN_GYM_B1F - warp_def 5, 2, 3, 15, LAVARIDGE_TOWN_GYM_B1F - warp_def 7, 2, 3, 16, LAVARIDGE_TOWN_GYM_B1F - warp_def 8, 6, 3, 17, LAVARIDGE_TOWN_GYM_B1F - warp_def 10, 6, 3, 18, LAVARIDGE_TOWN_GYM_B1F - warp_def 4, 16, 0, 20, LAVARIDGE_TOWN_GYM_B1F - warp_def 12, 3, 3, 19, LAVARIDGE_TOWN_GYM_B1F - warp_def 14, 6, 3, 21, LAVARIDGE_TOWN_GYM_B1F - warp_def 13, 17, 3, 22, LAVARIDGE_TOWN_GYM_B1F - warp_def 12, 12, 3, 23, LAVARIDGE_TOWN_GYM_B1F + warp_def 13, 18, 3, 1, MAP_LAVARIDGE_TOWN + warp_def 14, 18, 3, 1, MAP_LAVARIDGE_TOWN + warp_def 10, 18, 3, 0, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 8, 9, 3, 2, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 4, 18, 3, 4, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 5, 14, 3, 3, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 0, 17, 3, 1, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 5, 9, 3, 5, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 2, 15, 3, 6, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 3, 14, 3, 7, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 1, 14, 3, 8, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 0, 10, 3, 9, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 3, 10, 3, 10, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 0, 6, 3, 11, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 3, 6, 3, 12, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 5, 6, 3, 13, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 2, 3, 3, 14, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 5, 2, 3, 15, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 7, 2, 3, 16, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 8, 6, 3, 17, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 10, 6, 3, 18, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 4, 16, 0, 20, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 12, 3, 3, 19, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 14, 6, 3, 21, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 13, 17, 3, 22, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 12, 12, 3, 23, MAP_LAVARIDGE_TOWN_GYM_B1F LavaridgeTown_Gym_1F_MapBGEvents: @ 852DF7C bg_event 10, 15, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_1FE98B diff --git a/data/maps/events/LavaridgeTown_Gym_B1F.inc b/data/maps/events/LavaridgeTown_Gym_B1F.inc index af1f166ce9..88dae4c5ec 100644 --- a/data/maps/events/LavaridgeTown_Gym_B1F.inc +++ b/data/maps/events/LavaridgeTown_Gym_B1F.inc @@ -5,30 +5,30 @@ LavaridgeTown_Gym_B1F_EventObjects: @ 852DFA8 object_event 4, EVENT_OBJ_GFX_HIKER, 0, 0, 4, 16, 3, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE951, 0, 0, 0 LavaridgeTown_Gym_B1F_MapWarps: @ 852E008 - warp_def 10, 18, 3, 2, LAVARIDGE_TOWN_GYM_1F - warp_def 0, 17, 3, 6, LAVARIDGE_TOWN_GYM_1F - warp_def 8, 9, 3, 3, LAVARIDGE_TOWN_GYM_1F - warp_def 5, 14, 3, 5, LAVARIDGE_TOWN_GYM_1F - warp_def 4, 18, 3, 4, LAVARIDGE_TOWN_GYM_1F - warp_def 5, 9, 3, 7, LAVARIDGE_TOWN_GYM_1F - warp_def 2, 15, 3, 8, LAVARIDGE_TOWN_GYM_1F - warp_def 3, 14, 3, 9, LAVARIDGE_TOWN_GYM_1F - warp_def 1, 14, 3, 10, LAVARIDGE_TOWN_GYM_1F - warp_def 0, 10, 3, 11, LAVARIDGE_TOWN_GYM_1F - warp_def 3, 10, 3, 12, LAVARIDGE_TOWN_GYM_1F - warp_def 0, 6, 3, 13, LAVARIDGE_TOWN_GYM_1F - warp_def 3, 6, 3, 14, LAVARIDGE_TOWN_GYM_1F - warp_def 5, 6, 3, 15, LAVARIDGE_TOWN_GYM_1F - warp_def 2, 3, 3, 16, LAVARIDGE_TOWN_GYM_1F - warp_def 5, 2, 3, 17, LAVARIDGE_TOWN_GYM_1F - warp_def 7, 2, 3, 18, LAVARIDGE_TOWN_GYM_1F - warp_def 8, 6, 3, 19, LAVARIDGE_TOWN_GYM_1F - warp_def 10, 6, 3, 20, LAVARIDGE_TOWN_GYM_1F - warp_def 12, 3, 3, 22, LAVARIDGE_TOWN_GYM_1F - warp_def 4, 16, 3, 21, LAVARIDGE_TOWN_GYM_1F - warp_def 14, 6, 3, 23, LAVARIDGE_TOWN_GYM_1F - warp_def 13, 17, 3, 24, LAVARIDGE_TOWN_GYM_1F - warp_def 12, 12, 3, 25, LAVARIDGE_TOWN_GYM_1F + warp_def 10, 18, 3, 2, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 0, 17, 3, 6, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 8, 9, 3, 3, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 5, 14, 3, 5, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 4, 18, 3, 4, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 5, 9, 3, 7, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 2, 15, 3, 8, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 3, 14, 3, 9, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 1, 14, 3, 10, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 0, 10, 3, 11, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 3, 10, 3, 12, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 0, 6, 3, 13, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 3, 6, 3, 14, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 5, 6, 3, 15, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 2, 3, 3, 16, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 5, 2, 3, 17, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 7, 2, 3, 18, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 8, 6, 3, 19, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 10, 6, 3, 20, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 12, 3, 3, 22, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 4, 16, 3, 21, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 14, 6, 3, 23, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 13, 17, 3, 24, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 12, 12, 3, 25, MAP_LAVARIDGE_TOWN_GYM_1F LavaridgeTown_Gym_B1F_MapEvents:: @ 852E0C8 map_events LavaridgeTown_Gym_B1F_EventObjects, LavaridgeTown_Gym_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_HerbShop.inc b/data/maps/events/LavaridgeTown_HerbShop.inc index 9fa4c6376c..939a8752e8 100644 --- a/data/maps/events/LavaridgeTown_HerbShop.inc +++ b/data/maps/events/LavaridgeTown_HerbShop.inc @@ -4,8 +4,8 @@ LavaridgeTown_HerbShop_EventObjects: @ 852DDB0 object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 3, 3, 5, 17, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0, 0, 0 LavaridgeTown_HerbShop_MapWarps: @ 852DDF8 - warp_def 3, 7, 0, 0, LAVARIDGE_TOWN - warp_def 4, 7, 0, 0, LAVARIDGE_TOWN + warp_def 3, 7, 0, 0, MAP_LAVARIDGE_TOWN + warp_def 4, 7, 0, 0, MAP_LAVARIDGE_TOWN LavaridgeTown_HerbShop_MapEvents:: @ 852DE08 map_events LavaridgeTown_HerbShop_EventObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_House.inc b/data/maps/events/LavaridgeTown_House.inc index 669728b669..c97aea86a8 100644 --- a/data/maps/events/LavaridgeTown_House.inc +++ b/data/maps/events/LavaridgeTown_House.inc @@ -4,8 +4,8 @@ LavaridgeTown_House_EventObjects: @ 852E0DC object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 8, 4, 3, 2, 17, 0, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0, 0, 0 LavaridgeTown_House_MapWarps: @ 852E124 - warp_def 3, 7, 0, 4, LAVARIDGE_TOWN - warp_def 4, 7, 0, 4, LAVARIDGE_TOWN + warp_def 3, 7, 0, 4, MAP_LAVARIDGE_TOWN + warp_def 4, 7, 0, 4, MAP_LAVARIDGE_TOWN LavaridgeTown_House_MapEvents:: @ 852E134 map_events LavaridgeTown_House_EventObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_Mart.inc b/data/maps/events/LavaridgeTown_Mart.inc index 5230cead9c..77f372aa29 100644 --- a/data/maps/events/LavaridgeTown_Mart.inc +++ b/data/maps/events/LavaridgeTown_Mart.inc @@ -4,8 +4,8 @@ LavaridgeTown_Mart_EventObjects: @ 852E148 object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 9, 5, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0, 0, 0 LavaridgeTown_Mart_MapWarps: @ 852E190 - warp_def 3, 7, 0, 2, LAVARIDGE_TOWN - warp_def 4, 7, 0, 2, LAVARIDGE_TOWN + warp_def 3, 7, 0, 2, MAP_LAVARIDGE_TOWN + warp_def 4, 7, 0, 2, MAP_LAVARIDGE_TOWN LavaridgeTown_Mart_MapEvents:: @ 852E1A0 map_events LavaridgeTown_Mart_EventObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc index 8ebf9f16a7..07ca2e7c07 100644 --- a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc +++ b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc @@ -5,10 +5,10 @@ LavaridgeTown_PokemonCenter_1F_EventObjects: @ 852E1B4 object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E, 0, 0, 0 LavaridgeTown_PokemonCenter_1F_MapWarps: @ 852E214 - warp_def 7, 8, 3, 3, LAVARIDGE_TOWN - warp_def 6, 8, 3, 3, LAVARIDGE_TOWN - warp_def 1, 6, 4, 0, LAVARIDGE_TOWN_POKEMON_CENTER_2F - warp_def 2, 1, 0, 5, LAVARIDGE_TOWN + warp_def 7, 8, 3, 3, MAP_LAVARIDGE_TOWN + warp_def 6, 8, 3, 3, MAP_LAVARIDGE_TOWN + warp_def 1, 6, 4, 0, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F + warp_def 2, 1, 0, 5, MAP_LAVARIDGE_TOWN LavaridgeTown_PokemonCenter_1F_MapEvents:: @ 852E234 map_events LavaridgeTown_PokemonCenter_1F_EventObjects, LavaridgeTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc index 53fc2b2ccf..27d0f6fec2 100644 --- a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc +++ b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ LavaridgeTown_PokemonCenter_2F_EventObjects: @ 852E248 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 LavaridgeTown_PokemonCenter_2F_MapWarps: @ 852E2A8 - warp_def 1, 6, 4, 2, LAVARIDGE_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER LavaridgeTown_PokemonCenter_2F_MapEvents:: @ 852E2C0 map_events LavaridgeTown_PokemonCenter_2F_EventObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/events/LilycoveCity.inc index c7578bec38..5020993d8a 100644 --- a/data/maps/events/LilycoveCity.inc +++ b/data/maps/events/LilycoveCity.inc @@ -23,20 +23,20 @@ LilycoveCity_EventObjects: @ 8526CE8 object_event 22, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 16, 35, 3, 7, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CD4, 0, 0, 0 LilycoveCity_MapWarps: @ 8526EF8 - warp_def 27, 6, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_1F - warp_def 37, 24, 0, 0, LILYCOVE_CITY_COVE_LILY_MOTEL_1F - warp_def 24, 14, 0, 0, LILYCOVE_CITY_POKEMON_CENTER_1F - warp_def 11, 5, 0, 0, LILYCOVE_CITY_LILYCOVE_MUSEUM_1F - warp_def 23, 24, 0, 0, LILYCOVE_CITY_CONTEST_LOBBY - warp_def 39, 14, 0, 1, LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB - warp_def 70, 5, 1, 0, AQUA_HIDEOUT_1F - warp_def 36, 6, 0, 0, LILYCOVE_CITY_MOVE_DELETERS_HOUSE - warp_def 42, 6, 0, 0, LILYCOVE_CITY_HOUSE_1 - warp_def 55, 15, 0, 0, LILYCOVE_CITY_HOUSE_2 - warp_def 11, 22, 0, 0, LILYCOVE_CITY_HOUSE_3 - warp_def 12, 14, 0, 0, LILYCOVE_CITY_HOUSE_4 - warp_def 12, 32, 0, 0, LILYCOVE_CITY_HARBOR - warp_def 12, 5, 0, 1, LILYCOVE_CITY_LILYCOVE_MUSEUM_1F + warp_def 27, 6, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F + warp_def 37, 24, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F + warp_def 24, 14, 0, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F + warp_def 11, 5, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F + warp_def 23, 24, 0, 0, MAP_LILYCOVE_CITY_CONTEST_LOBBY + warp_def 39, 14, 0, 1, MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB + warp_def 70, 5, 1, 0, MAP_AQUA_HIDEOUT_1F + warp_def 36, 6, 0, 0, MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE + warp_def 42, 6, 0, 0, MAP_LILYCOVE_CITY_HOUSE1 + warp_def 55, 15, 0, 0, MAP_LILYCOVE_CITY_HOUSE2 + warp_def 11, 22, 0, 0, MAP_LILYCOVE_CITY_HOUSE3 + warp_def 12, 14, 0, 0, MAP_LILYCOVE_CITY_HOUSE4 + warp_def 12, 32, 0, 0, MAP_LILYCOVE_CITY_HARBOR + warp_def 12, 5, 0, 1, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F LilycoveCity_MapBGEvents: @ 8526F68 bg_event 19, 7, 0, 0, 0, LilycoveCity_EventScript_1E2D1A diff --git a/data/maps/events/LilycoveCity_ContestHall.inc b/data/maps/events/LilycoveCity_ContestHall.inc index c450b0cd3e..615f2682c2 100644 --- a/data/maps/events/LilycoveCity_ContestHall.inc +++ b/data/maps/events/LilycoveCity_ContestHall.inc @@ -33,10 +33,10 @@ LilycoveCity_ContestHall_EventObjects: @ 8531850 object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 0, 23, 26, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A0, 0, 0, 0 LilycoveCity_ContestHall_MapWarps: @ 8531B50 - warp_def 19, 32, 0, 2, LILYCOVE_CITY_CONTEST_LOBBY - warp_def 30, 32, 0, 3, LILYCOVE_CITY_CONTEST_LOBBY - warp_def 20, 32, 0, 2, LILYCOVE_CITY_CONTEST_LOBBY - warp_def 31, 32, 0, 3, LILYCOVE_CITY_CONTEST_LOBBY + warp_def 19, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY + warp_def 30, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY + warp_def 20, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY + warp_def 31, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY LilycoveCity_ContestHall_MapBGEvents: @ 8531B70 bg_event 27, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B733 diff --git a/data/maps/events/LilycoveCity_ContestLobby.inc b/data/maps/events/LilycoveCity_ContestLobby.inc index c6e900a18a..b183b4f165 100644 --- a/data/maps/events/LilycoveCity_ContestLobby.inc +++ b/data/maps/events/LilycoveCity_ContestLobby.inc @@ -26,10 +26,10 @@ LilycoveCity_ContestLobby_EventObjects: @ 8531534 object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 9, 10, 3, 10, 34, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0, 0, 0 LilycoveCity_ContestLobby_MapWarps: @ 853178C - warp_def 14, 11, 0, 4, LILYCOVE_CITY - warp_def 15, 11, 0, 4, LILYCOVE_CITY - warp_def 9, 1, 0, 0, LILYCOVE_CITY_CONTEST_HALL - warp_def 21, 1, 0, 1, LILYCOVE_CITY_CONTEST_HALL + warp_def 14, 11, 0, 4, MAP_LILYCOVE_CITY + warp_def 15, 11, 0, 4, MAP_LILYCOVE_CITY + warp_def 9, 1, 0, 0, MAP_LILYCOVE_CITY_CONTEST_HALL + warp_def 21, 1, 0, 1, MAP_LILYCOVE_CITY_CONTEST_HALL LilycoveCity_ContestLobby_MapBGEvents: @ 85317AC bg_event 23, 5, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_294055 diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc index d3e5374ff6..77d0750343 100644 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc @@ -2,9 +2,9 @@ LilycoveCity_CoveLilyMotel_1F_EventObjects: @ 8531134 object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 10, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218189, 0, 0, 0 LilycoveCity_CoveLilyMotel_1F_MapWarps: @ 853114C - warp_def 5, 8, 0, 1, LILYCOVE_CITY - warp_def 6, 8, 0, 1, LILYCOVE_CITY - warp_def 2, 1, 0, 0, LILYCOVE_CITY_COVE_LILY_MOTEL_2F + warp_def 5, 8, 0, 1, MAP_LILYCOVE_CITY + warp_def 6, 8, 0, 1, MAP_LILYCOVE_CITY + warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F LilycoveCity_CoveLilyMotel_1F_MapCoordEvents: @ 8531164 coord_event 10, 2, 3, 0, VAR_TEMP_1, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218211 diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc index 60016ffbf9..48aae9c0c3 100644 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc @@ -8,7 +8,7 @@ LilycoveCity_CoveLilyMotel_2F_EventObjects: @ 8531188 object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, 787, 0, 0 LilycoveCity_CoveLilyMotel_2F_MapWarps: @ 8531230 - warp_def 2, 1, 0, 2, LILYCOVE_CITY_COVE_LILY_MOTEL_1F + warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F LilycoveCity_CoveLilyMotel_2F_MapEvents:: @ 8531238 map_events LilycoveCity_CoveLilyMotel_2F_EventObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc index d9d6b469e4..ef97e90c68 100644 --- a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc @@ -2,8 +2,8 @@ LilycoveCity_DepartmentStoreElevator_EventObjects: @ 85324B0 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_220624, 0, 0, 0 LilycoveCity_DepartmentStoreElevator_MapWarps: @ 85324C8 - warp_def 1, 5, 3, 127, NONE - warp_def 2, 5, 3, 127, NONE + warp_def 1, 5, 3, 127, MAP_NONE + warp_def 2, 5, 3, 127, MAP_NONE LilycoveCity_DepartmentStoreElevator_MapEvents:: @ 85324D8 map_events LilycoveCity_DepartmentStoreElevator_EventObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc index 7a234183dd..095b201d98 100644 --- a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStoreRooftop_EventObjects: @ 853241C object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 15, 5, 3, 8, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0, 0, 0 LilycoveCity_DepartmentStoreRooftop_MapWarps: @ 853247C - warp_def 13, 3, 0, 2, LILYCOVE_CITY_DEPARTMENT_STORE_5F + warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F LilycoveCity_DepartmentStoreRooftop_MapBGEvents: @ 8532484 bg_event 9, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220295 diff --git a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc index ad7d79ac52..0a8bd70b82 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc @@ -7,10 +7,10 @@ LilycoveCity_DepartmentStore_1F_EventObjects: @ 853208C object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 2, 6, 3, 1, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F84A, 0, 0, 0 LilycoveCity_DepartmentStore_1F_MapWarps: @ 853211C - warp_def 8, 7, 0, 0, LILYCOVE_CITY - warp_def 9, 7, 0, 0, LILYCOVE_CITY - warp_def 16, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_2F - warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR + warp_def 8, 7, 0, 0, MAP_LILYCOVE_CITY + warp_def 9, 7, 0, 0, MAP_LILYCOVE_CITY + warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F + warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_1F_MapBGEvents: @ 853213C bg_event 0, 8, 0, 1, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F85D diff --git a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc index 29169a491b..9356a7ae09 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc @@ -6,9 +6,9 @@ LilycoveCity_DepartmentStore_2F_EventObjects: @ 853215C object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0, 0, 0 LilycoveCity_DepartmentStore_2F_MapWarps: @ 85321D4 - warp_def 16, 1, 0, 2, LILYCOVE_CITY_DEPARTMENT_STORE_1F - warp_def 13, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_3F - warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR + warp_def 16, 1, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F + warp_def 13, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F + warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_2F_MapEvents:: @ 85321EC map_events LilycoveCity_DepartmentStore_2F_EventObjects, LilycoveCity_DepartmentStore_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc index ff372e132d..a26dc39d26 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc @@ -6,9 +6,9 @@ LilycoveCity_DepartmentStore_3F_EventObjects: @ 8532200 object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 10, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0, 0, 0 LilycoveCity_DepartmentStore_3F_MapWarps: @ 8532278 - warp_def 13, 1, 0, 1, LILYCOVE_CITY_DEPARTMENT_STORE_2F - warp_def 16, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_4F - warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR + warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F + warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F + warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_3F_MapEvents:: @ 8532290 map_events LilycoveCity_DepartmentStore_3F_EventObjects, LilycoveCity_DepartmentStore_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc index ba97f6a984..dd5a87e99d 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc @@ -6,9 +6,9 @@ LilycoveCity_DepartmentStore_4F_EventObjects: @ 85322A4 object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 9, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0, 0, 0 LilycoveCity_DepartmentStore_4F_MapWarps: @ 853231C - warp_def 16, 1, 0, 1, LILYCOVE_CITY_DEPARTMENT_STORE_3F - warp_def 13, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_5F - warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR + warp_def 16, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F + warp_def 13, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F + warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_4F_MapEvents:: @ 8532334 map_events LilycoveCity_DepartmentStore_4F_EventObjects, LilycoveCity_DepartmentStore_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc index 85a6e871a6..63ddcdb356 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc @@ -8,9 +8,9 @@ LilycoveCity_DepartmentStore_5F_EventObjects: @ 8532348 object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 9, 5, 3, 10, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0, 0, 0 LilycoveCity_DepartmentStore_5F_MapWarps: @ 85323F0 - warp_def 13, 1, 0, 1, LILYCOVE_CITY_DEPARTMENT_STORE_4F - warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR - warp_def 16, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP + warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F + warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR + warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP LilycoveCity_DepartmentStore_5F_MapEvents:: @ 8532408 map_events LilycoveCity_DepartmentStore_5F_EventObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_Harbor.inc b/data/maps/events/LilycoveCity_Harbor.inc index d12e31646f..0f786ca84e 100644 --- a/data/maps/events/LilycoveCity_Harbor.inc +++ b/data/maps/events/LilycoveCity_Harbor.inc @@ -6,8 +6,8 @@ LilycoveCity_Harbor_EventObjects: @ 8531E1C object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 8, 10, 3, 8, 17, 0, 0, 0, 0x0, 748, 0, 0 LilycoveCity_Harbor_MapWarps: @ 8531E94 - warp_def 11, 14, 0, 12, LILYCOVE_CITY - warp_def 12, 14, 0, 12, LILYCOVE_CITY + warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY + warp_def 12, 14, 0, 12, MAP_LILYCOVE_CITY LilycoveCity_Harbor_MapEvents:: @ 8531EA4 map_events LilycoveCity_Harbor_EventObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House1.inc b/data/maps/events/LilycoveCity_House1.inc index f4bef7d8b0..64ad5ea1b2 100644 --- a/data/maps/events/LilycoveCity_House1.inc +++ b/data/maps/events/LilycoveCity_House1.inc @@ -3,8 +3,8 @@ LilycoveCity_House1_EventObjects: @ 8531EF4 object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House1_EventScript_21ECD7, 0, 0, 0 LilycoveCity_House1_MapWarps: @ 8531F24 - warp_def 3, 8, 0, 8, LILYCOVE_CITY - warp_def 4, 8, 0, 8, LILYCOVE_CITY + warp_def 3, 8, 0, 8, MAP_LILYCOVE_CITY + warp_def 4, 8, 0, 8, MAP_LILYCOVE_CITY LilycoveCity_House1_MapEvents:: @ 8531F34 map_events LilycoveCity_House1_EventObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House2.inc b/data/maps/events/LilycoveCity_House2.inc index 36f9f50b21..037b195add 100644 --- a/data/maps/events/LilycoveCity_House2.inc +++ b/data/maps/events/LilycoveCity_House2.inc @@ -2,8 +2,8 @@ LilycoveCity_House2_EventObjects: @ 8531F48 object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House2_EventScript_21ED75, 0, 0, 0 LilycoveCity_House2_MapWarps: @ 8531F60 - warp_def 2, 7, 0, 9, LILYCOVE_CITY - warp_def 3, 7, 0, 9, LILYCOVE_CITY + warp_def 2, 7, 0, 9, MAP_LILYCOVE_CITY + warp_def 3, 7, 0, 9, MAP_LILYCOVE_CITY LilycoveCity_House2_MapEvents:: @ 8531F70 map_events LilycoveCity_House2_EventObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House3.inc b/data/maps/events/LilycoveCity_House3.inc index f7b2e561b6..25d2cb3336 100644 --- a/data/maps/events/LilycoveCity_House3.inc +++ b/data/maps/events/LilycoveCity_House3.inc @@ -7,8 +7,8 @@ LilycoveCity_House3_EventObjects: @ 8531F84 object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 5, 3, 9, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EE8A, 0, 0, 0 LilycoveCity_House3_MapWarps: @ 8532014 - warp_def 3, 7, 0, 10, LILYCOVE_CITY - warp_def 4, 7, 0, 10, LILYCOVE_CITY + warp_def 3, 7, 0, 10, MAP_LILYCOVE_CITY + warp_def 4, 7, 0, 10, MAP_LILYCOVE_CITY LilycoveCity_House3_MapEvents:: @ 8532024 map_events LilycoveCity_House3_EventObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House4.inc b/data/maps/events/LilycoveCity_House4.inc index ebf845f918..7556d0092e 100644 --- a/data/maps/events/LilycoveCity_House4.inc +++ b/data/maps/events/LilycoveCity_House4.inc @@ -3,8 +3,8 @@ LilycoveCity_House4_EventObjects: @ 8532038 object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_House4_EventScript_21F5BE, 0, 0, 0 LilycoveCity_House4_MapWarps: @ 8532068 - warp_def 3, 8, 0, 11, LILYCOVE_CITY - warp_def 4, 8, 0, 11, LILYCOVE_CITY + warp_def 3, 8, 0, 11, MAP_LILYCOVE_CITY + warp_def 4, 8, 0, 11, MAP_LILYCOVE_CITY LilycoveCity_House4_MapEvents:: @ 8532078 map_events LilycoveCity_House4_EventObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc index 297db79797..6780d3f189 100644 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc @@ -11,9 +11,9 @@ LilycoveCity_LilycoveMuseum_1F_EventObjects: @ 853124C object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 6, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, 778, 0, 0 LilycoveCity_LilycoveMuseum_1F_MapWarps: @ 853133C - warp_def 9, 13, 0, 3, LILYCOVE_CITY - warp_def 10, 13, 0, 13, LILYCOVE_CITY - warp_def 16, 1, 0, 0, LILYCOVE_CITY_LILYCOVE_MUSEUM_2F + warp_def 9, 13, 0, 3, MAP_LILYCOVE_CITY + warp_def 10, 13, 0, 13, MAP_LILYCOVE_CITY + warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F LilycoveCity_LilycoveMuseum_1F_MapBGEvents: @ 8531354 bg_event 1, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc index 3e85e20a14..e95ec1075b 100644 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc @@ -5,7 +5,7 @@ LilycoveCity_LilycoveMuseum_2F_EventObjects: @ 8531428 object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 0, 14, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, 780, 0, 0 LilycoveCity_LilycoveMuseum_2F_MapWarps: @ 8531488 - warp_def 13, 1, 0, 2, LILYCOVE_CITY_LILYCOVE_MUSEUM_1F + warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F LilycoveCity_LilycoveMuseum_2F_MapBGEvents: @ 8531490 bg_event 14, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B diff --git a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc index 3f89c8aa9f..83fbf02880 100644 --- a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc +++ b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc @@ -2,8 +2,8 @@ LilycoveCity_MoveDeletersHouse_EventObjects: @ 8531EB8 object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0, 0, 0 LilycoveCity_MoveDeletersHouse_MapWarps: @ 8531ED0 - warp_def 3, 7, 0, 7, LILYCOVE_CITY - warp_def 4, 7, 0, 7, LILYCOVE_CITY + warp_def 3, 7, 0, 7, MAP_LILYCOVE_CITY + warp_def 4, 7, 0, 7, MAP_LILYCOVE_CITY LilycoveCity_MoveDeletersHouse_MapEvents:: @ 8531EE0 map_events LilycoveCity_MoveDeletersHouse_EventObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc index 7418668439..fb2e41948e 100644 --- a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc +++ b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc @@ -6,9 +6,9 @@ LilycoveCity_PokemonCenter_1F_EventObjects: @ 8531BCC object_event 5, EVENT_OBJ_GFX_TRADER, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, 993, 0, 0 LilycoveCity_PokemonCenter_1F_MapWarps: @ 8531C44 - warp_def 7, 8, 3, 2, LILYCOVE_CITY - warp_def 6, 8, 3, 2, LILYCOVE_CITY - warp_def 1, 6, 4, 0, LILYCOVE_CITY_POKEMON_CENTER_2F + warp_def 7, 8, 3, 2, MAP_LILYCOVE_CITY + warp_def 6, 8, 3, 2, MAP_LILYCOVE_CITY + warp_def 1, 6, 4, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_2F LilycoveCity_PokemonCenter_1F_MapEvents:: @ 8531C5C map_events LilycoveCity_PokemonCenter_1F_EventObjects, LilycoveCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc index b8bd673684..6522dc7992 100644 --- a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc +++ b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ LilycoveCity_PokemonCenter_2F_EventObjects: @ 8531C70 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 LilycoveCity_PokemonCenter_2F_MapWarps: @ 8531CD0 - warp_def 1, 6, 4, 2, LILYCOVE_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER LilycoveCity_PokemonCenter_2F_MapEvents:: @ 8531CE8 map_events LilycoveCity_PokemonCenter_2F_EventObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc index 427d8bc423..476a6ebab0 100644 --- a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc @@ -10,8 +10,8 @@ LilycoveCity_PokemonTrainerFanClub_EventObjects: @ 8531D20 object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 0, 11, 5, 3, 8, 17, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, 730, 0, 0 LilycoveCity_PokemonTrainerFanClub_MapWarps: @ 8531DF8 - warp_def 6, 13, 0, 5, LILYCOVE_CITY - warp_def 5, 13, 0, 5, LILYCOVE_CITY + warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY + warp_def 5, 13, 0, 5, MAP_LILYCOVE_CITY LilycoveCity_PokemonTrainerFanClub_MapEvents:: @ 8531E08 map_events LilycoveCity_PokemonTrainerFanClub_EventObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_UnusedMart.inc b/data/maps/events/LilycoveCity_UnusedMart.inc index 9affe49bd3..0481a1c0b3 100644 --- a/data/maps/events/LilycoveCity_UnusedMart.inc +++ b/data/maps/events/LilycoveCity_UnusedMart.inc @@ -1,6 +1,6 @@ LilycoveCity_UnusedMart_MapWarps: @ 8531CFC - warp_def 3, 7, 0, 0, LILYCOVE_CITY - warp_def 4, 7, 0, 0, LILYCOVE_CITY + warp_def 3, 7, 0, 0, MAP_LILYCOVE_CITY + warp_def 4, 7, 0, 0, MAP_LILYCOVE_CITY LilycoveCity_UnusedMart_MapEvents:: @ 8531D0C map_events 0x0, LilycoveCity_UnusedMart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/events/LittlerootTown.inc index 7a2ed7c9fe..d4388bc33c 100644 --- a/data/maps/events/LittlerootTown.inc +++ b/data/maps/events/LittlerootTown.inc @@ -9,9 +9,9 @@ LittlerootTown_EventObjects: @ 85276A8 object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 14, 10, 3, 7, 17, 0, 0, 0, 0x0, 795, 0, 0 LittlerootTown_MapWarps: @ 8527768 - warp_def 14, 8, 0, 1, LITTLEROOT_TOWN_MAYS_HOUSE_1F - warp_def 5, 8, 0, 1, LITTLEROOT_TOWN_BRENDANS_HOUSE_1F - warp_def 7, 16, 0, 0, LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB + warp_def 14, 8, 0, 1, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F + warp_def 5, 8, 0, 1, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F + warp_def 7, 16, 0, 0, MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB LittlerootTown_MapCoordEvents: @ 8527780 coord_event 10, 1, 3, 0, VAR_0x4050, 0, 0, LittlerootTown_EventScript_1E8091 diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc index f97d49985f..e5320f071c 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc @@ -8,9 +8,9 @@ LittlerootTown_BrendansHouse_1F_EventObjects: @ 852D08C object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 8, 8, 3, 7, 17, 0, 0, 0, 0x0, 745, 0, 0 LittlerootTown_BrendansHouse_1F_MapWarps: @ 852D134 - warp_def 9, 8, 0, 1, LITTLEROOT_TOWN - warp_def 8, 8, 0, 1, LITTLEROOT_TOWN - warp_def 8, 2, 0, 0, LITTLEROOT_TOWN_BRENDANS_HOUSE_2F + warp_def 9, 8, 0, 1, MAP_LITTLEROOT_TOWN + warp_def 8, 8, 0, 1, MAP_LITTLEROOT_TOWN + warp_def 8, 2, 0, 0, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F LittlerootTown_BrendansHouse_1F_MapCoordEvents: @ 852D14C coord_event 8, 8, 0, 0, VAR_0x4092, 4, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F78A3 diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc index d7733b800c..0ed661234b 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc @@ -17,7 +17,7 @@ LittlerootTown_BrendansHouse_2F_EventObjects: @ 852D1A0 object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 0, 5, 5, 3, 1, 17, 0, 0, 0, 0x0, 815, 0, 0 LittlerootTown_BrendansHouse_2F_MapWarps: @ 852D320 - warp_def 7, 1, 0, 2, LITTLEROOT_TOWN_BRENDANS_HOUSE_1F + warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F LittlerootTown_BrendansHouse_2F_MapBGEvents: @ 852D328 bg_event 0, 1, 0, 1, 0, gUnknown_081F860D diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/events/LittlerootTown_MaysHouse_1F.inc index ccee2d442d..2ceb34c8e1 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_1F.inc @@ -8,9 +8,9 @@ LittlerootTown_MaysHouse_1F_EventObjects: @ 852D36C object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 0, 2, 8, 3, 7, 17, 0, 0, 0, 0x0, 746, 0, 0 LittlerootTown_MaysHouse_1F_MapWarps: @ 852D414 - warp_def 1, 8, 0, 0, LITTLEROOT_TOWN - warp_def 2, 8, 0, 0, LITTLEROOT_TOWN - warp_def 2, 2, 0, 0, LITTLEROOT_TOWN_MAYS_HOUSE_2F + warp_def 1, 8, 0, 0, MAP_LITTLEROOT_TOWN + warp_def 2, 8, 0, 0, MAP_LITTLEROOT_TOWN + warp_def 2, 2, 0, 0, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F LittlerootTown_MaysHouse_1F_MapCoordEvents: @ 852D42C coord_event 2, 8, 0, 0, VAR_0x4092, 4, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A4C diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/events/LittlerootTown_MaysHouse_2F.inc index 40d0f45dca..121c6164bb 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_2F.inc @@ -17,7 +17,7 @@ LittlerootTown_MaysHouse_2F_EventObjects: @ 852D480 object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 4, 0, 1, 17, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, 818, 0, 0 LittlerootTown_MaysHouse_2F_MapWarps: @ 852D600 - warp_def 1, 1, 0, 2, LITTLEROOT_TOWN_MAYS_HOUSE_1F + warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F LittlerootTown_MaysHouse_2F_MapBGEvents: @ 852D608 bg_event 5, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F865F diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc index 7930d0f63f..bbae39ce8f 100644 --- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc @@ -7,8 +7,8 @@ LittlerootTown_ProfessorBirchsLab_EventObjects: @ 852D64C object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, 838, 0, 0 LittlerootTown_ProfessorBirchsLab_MapWarps: @ 852D6DC - warp_def 6, 12, 0, 2, LITTLEROOT_TOWN - warp_def 7, 12, 0, 2, LITTLEROOT_TOWN + warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN + warp_def 7, 12, 0, 2, MAP_LITTLEROOT_TOWN LittlerootTown_ProfessorBirchsLab_MapBGEvents: @ 852D6EC bg_event 10, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3 diff --git a/data/maps/events/MagmaHideout_1F.inc b/data/maps/events/MagmaHideout_1F.inc index d590a6c987..8462b47316 100644 --- a/data/maps/events/MagmaHideout_1F.inc +++ b/data/maps/events/MagmaHideout_1F.inc @@ -7,10 +7,10 @@ MagmaHideout_1F_EventObjects: @ 85371CC object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 23, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 19, 0, 0 MagmaHideout_1F_MapWarps: @ 853725C - warp_def 10, 34, 3, 4, JAGGED_PASS - warp_def 25, 34, 3, 1, MAGMA_HIDEOUT_2F_1R - warp_def 31, 3, 0, 1, MAGMA_HIDEOUT_2F_2R - warp_def 20, 22, 0, 0, MAGMA_HIDEOUT_2F_3R + warp_def 10, 34, 3, 4, MAP_JAGGED_PASS + warp_def 25, 34, 3, 1, MAP_MAGMA_HIDEOUT_2F_1R + warp_def 31, 3, 0, 1, MAP_MAGMA_HIDEOUT_2F_2R + warp_def 20, 22, 0, 0, MAP_MAGMA_HIDEOUT_2F_3R MagmaHideout_1F_MapEvents:: @ 853727C map_events MagmaHideout_1F_EventObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_2F_1R.inc b/data/maps/events/MagmaHideout_2F_1R.inc index eb2cca275a..1073518f2a 100644 --- a/data/maps/events/MagmaHideout_2F_1R.inc +++ b/data/maps/events/MagmaHideout_2F_1R.inc @@ -5,9 +5,9 @@ MagmaHideout_2F_1R_EventObjects: @ 8537290 object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 21, 11, 3, 7, 17, 0, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, 857, 0, 0 MagmaHideout_2F_1R_MapWarps: @ 85372F0 - warp_def 11, 23, 0, 0, MAGMA_HIDEOUT_2F_2R - warp_def 8, 2, 0, 1, MAGMA_HIDEOUT_1F - warp_def 17, 33, 3, 2, MAGMA_HIDEOUT_3F_1R + warp_def 11, 23, 0, 0, MAP_MAGMA_HIDEOUT_2F_2R + warp_def 8, 2, 0, 1, MAP_MAGMA_HIDEOUT_1F + warp_def 17, 33, 3, 2, MAP_MAGMA_HIDEOUT_3F_1R MagmaHideout_2F_1R_MapEvents:: @ 8537308 map_events MagmaHideout_2F_1R_EventObjects, MagmaHideout_2F_1R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_2F_2R.inc b/data/maps/events/MagmaHideout_2F_2R.inc index 7d8fb6808e..e27fc5dc16 100644 --- a/data/maps/events/MagmaHideout_2F_2R.inc +++ b/data/maps/events/MagmaHideout_2F_2R.inc @@ -7,8 +7,8 @@ MagmaHideout_2F_2R_EventObjects: @ 853731C object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 6, 3, 1, 17, 0, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, 1165, 0, 0 MagmaHideout_2F_2R_MapWarps: @ 85373AC - warp_def 10, 22, 3, 0, MAGMA_HIDEOUT_2F_1R - warp_def 36, 4, 0, 2, MAGMA_HIDEOUT_1F + warp_def 10, 22, 3, 0, MAP_MAGMA_HIDEOUT_2F_1R + warp_def 36, 4, 0, 2, MAP_MAGMA_HIDEOUT_1F MagmaHideout_2F_2R_MapEvents:: @ 85373BC map_events MagmaHideout_2F_2R_EventObjects, MagmaHideout_2F_2R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_2F_3R.inc b/data/maps/events/MagmaHideout_2F_3R.inc index 3795ef568f..ca379a0c7e 100644 --- a/data/maps/events/MagmaHideout_2F_3R.inc +++ b/data/maps/events/MagmaHideout_2F_3R.inc @@ -1,6 +1,6 @@ MagmaHideout_2F_3R_MapWarps: @ 85375B0 - warp_def 16, 1, 0, 3, MAGMA_HIDEOUT_1F - warp_def 16, 13, 0, 0, MAGMA_HIDEOUT_3F_3R + warp_def 16, 1, 0, 3, MAP_MAGMA_HIDEOUT_1F + warp_def 16, 13, 0, 0, MAP_MAGMA_HIDEOUT_3F_3R MagmaHideout_2F_3R_MapEvents:: @ 85375C0 map_events 0x0, MagmaHideout_2F_3R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_3F_1R.inc b/data/maps/events/MagmaHideout_3F_1R.inc index 4d95b38c04..baf5359848 100644 --- a/data/maps/events/MagmaHideout_3F_1R.inc +++ b/data/maps/events/MagmaHideout_3F_1R.inc @@ -4,9 +4,9 @@ MagmaHideout_3F_1R_EventObjects: @ 85373D0 object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 9, 16, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_1R_EventScript_291505, 1166, 0, 0 MagmaHideout_3F_1R_MapWarps: @ 8537418 - warp_def 7, 21, 0, 0, MAGMA_HIDEOUT_4F - warp_def 21, 9, 0, 0, MAGMA_HIDEOUT_3F_2R - warp_def 23, 3, 0, 2, MAGMA_HIDEOUT_2F_1R + warp_def 7, 21, 0, 0, MAP_MAGMA_HIDEOUT_4F + warp_def 21, 9, 0, 0, MAP_MAGMA_HIDEOUT_3F_2R + warp_def 23, 3, 0, 2, MAP_MAGMA_HIDEOUT_2F_1R MagmaHideout_3F_1R_MapEvents:: @ 8537430 map_events MagmaHideout_3F_1R_EventObjects, MagmaHideout_3F_1R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_3F_2R.inc b/data/maps/events/MagmaHideout_3F_2R.inc index f653cb151c..e643a1c3fe 100644 --- a/data/maps/events/MagmaHideout_3F_2R.inc +++ b/data/maps/events/MagmaHideout_3F_2R.inc @@ -3,7 +3,7 @@ MagmaHideout_3F_2R_EventObjects: @ 8537444 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 9, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_2R_EventScript_291512, 1167, 0, 0 MagmaHideout_3F_2R_MapWarps: @ 8537474 - warp_def 12, 15, 0, 1, MAGMA_HIDEOUT_3F_1R + warp_def 12, 15, 0, 1, MAP_MAGMA_HIDEOUT_3F_1R MagmaHideout_3F_2R_MapEvents:: @ 853747C map_events MagmaHideout_3F_2R_EventObjects, MagmaHideout_3F_2R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_3F_3R.inc b/data/maps/events/MagmaHideout_3F_3R.inc index b662de7d95..e40619a49f 100644 --- a/data/maps/events/MagmaHideout_3F_3R.inc +++ b/data/maps/events/MagmaHideout_3F_3R.inc @@ -2,8 +2,8 @@ MagmaHideout_3F_3R_EventObjects: @ 8537574 object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 9, 19, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, 1059, 0, 0 MagmaHideout_3F_3R_MapWarps: @ 853758C - warp_def 16, 1, 0, 1, MAGMA_HIDEOUT_2F_3R - warp_def 16, 21, 0, 1, MAGMA_HIDEOUT_4F + warp_def 16, 1, 0, 1, MAP_MAGMA_HIDEOUT_2F_3R + warp_def 16, 21, 0, 1, MAP_MAGMA_HIDEOUT_4F MagmaHideout_3F_3R_MapEvents:: @ 853759C map_events MagmaHideout_3F_3R_EventObjects, MagmaHideout_3F_3R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_4F.inc b/data/maps/events/MagmaHideout_4F.inc index 221775788f..808f1b7daf 100644 --- a/data/maps/events/MagmaHideout_4F.inc +++ b/data/maps/events/MagmaHideout_4F.inc @@ -9,8 +9,8 @@ MagmaHideout_4F_EventObjects: @ 8537490 object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 7, 0, 1, 17, 0, 0, 0, MagmaHideout_4F_EventScript_29151F, 1168, 0, 0 MagmaHideout_4F_MapWarps: @ 8537550 - warp_def 46, 7, 0, 0, MAGMA_HIDEOUT_3F_1R - warp_def 20, 21, 0, 1, MAGMA_HIDEOUT_3F_3R + warp_def 46, 7, 0, 0, MAP_MAGMA_HIDEOUT_3F_1R + warp_def 20, 21, 0, 1, MAP_MAGMA_HIDEOUT_3F_3R MagmaHideout_4F_MapEvents:: @ 8537560 map_events MagmaHideout_4F_EventObjects, MagmaHideout_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MarineCave_End.inc b/data/maps/events/MarineCave_End.inc index b9f6bb0200..199465a691 100644 --- a/data/maps/events/MarineCave_End.inc +++ b/data/maps/events/MarineCave_End.inc @@ -2,7 +2,7 @@ MarineCave_End_EventObjects: @ 85377E8 object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 0, 9, 22, 1, 8, 17, 0, 0, 0, 0x0, 782, 0, 0 MarineCave_End_MapWarps: @ 8537800 - warp_def 20, 4, 0, 0, MARINE_CAVE_ENTRANCE + warp_def 20, 4, 0, 0, MAP_MARINE_CAVE_ENTRANCE MarineCave_End_MapCoordEvents: @ 8537808 coord_event 9, 26, 3, 0, VAR_TEMP_1, 1, 0, MarineCave_End_EventScript_23B01B diff --git a/data/maps/events/MarineCave_Entrance.inc b/data/maps/events/MarineCave_Entrance.inc index e00290acbc..4db3e1ddcb 100644 --- a/data/maps/events/MarineCave_Entrance.inc +++ b/data/maps/events/MarineCave_Entrance.inc @@ -1,5 +1,5 @@ MarineCave_Entrance_MapWarps: @ 85377CC - warp_def 14, 1, 3, 0, MARINE_CAVE_END + warp_def 14, 1, 3, 0, MAP_MARINE_CAVE_END MarineCave_Entrance_MapEvents:: @ 85377D4 map_events 0x0, MarineCave_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/events/MauvilleCity.inc index 6d89267c6e..a73145ae2b 100644 --- a/data/maps/events/MauvilleCity.inc +++ b/data/maps/events/MauvilleCity.inc @@ -12,13 +12,13 @@ MauvilleCity_EventObjects: @ 852662C object_event 11, EVENT_OBJ_GFX_SCOTT, 0, 0, 12, 14, 3, 7, 0, 0, 0, 0, 0x0, 765, 0, 0 MauvilleCity_MapWarps: @ 8526734 - warp_def 8, 5, 0, 0, MAUVILLE_CITY_GYM - warp_def 22, 5, 0, 0, MAUVILLE_CITY_POKEMON_CENTER_1F - warp_def 35, 5, 0, 0, MAUVILLE_CITY_BIKE_SHOP - warp_def 23, 14, 0, 0, MAUVILLE_CITY_MART - warp_def 32, 14, 0, 0, MAUVILLE_CITY_HOUSE_1 - warp_def 8, 13, 0, 0, MAUVILLE_CITY_GAME_CORNER - warp_def 19, 14, 0, 0, MAUVILLE_CITY_HOUSE_2 + warp_def 8, 5, 0, 0, MAP_MAUVILLE_CITY_GYM + warp_def 22, 5, 0, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F + warp_def 35, 5, 0, 0, MAP_MAUVILLE_CITY_BIKE_SHOP + warp_def 23, 14, 0, 0, MAP_MAUVILLE_CITY_MART + warp_def 32, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE1 + warp_def 8, 13, 0, 0, MAP_MAUVILLE_CITY_GAME_CORNER + warp_def 19, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE2 MauvilleCity_MapBGEvents: @ 852676C bg_event 23, 5, 0, 1, 0, MauvilleCity_EventScript_271E73 diff --git a/data/maps/events/MauvilleCity_BikeShop.inc b/data/maps/events/MauvilleCity_BikeShop.inc index 0252834f47..cd4f43bb3e 100644 --- a/data/maps/events/MauvilleCity_BikeShop.inc +++ b/data/maps/events/MauvilleCity_BikeShop.inc @@ -3,8 +3,8 @@ MauvilleCity_BikeShop_EventObjects: @ 852FE80 object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 7, 6, 3, 2, 17, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0, 0, 0 MauvilleCity_BikeShop_MapWarps: @ 852FEB0 - warp_def 3, 8, 0, 2, MAUVILLE_CITY - warp_def 4, 8, 0, 2, MAUVILLE_CITY + warp_def 3, 8, 0, 2, MAP_MAUVILLE_CITY + warp_def 4, 8, 0, 2, MAP_MAUVILLE_CITY MauvilleCity_BikeShop_MapBGEvents: @ 852FEC0 bg_event 8, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20ED3A diff --git a/data/maps/events/MauvilleCity_GameCorner.inc b/data/maps/events/MauvilleCity_GameCorner.inc index 57e34caadc..18e12ac652 100644 --- a/data/maps/events/MauvilleCity_GameCorner.inc +++ b/data/maps/events/MauvilleCity_GameCorner.inc @@ -13,8 +13,8 @@ MauvilleCity_GameCorner_EventObjects: @ 852FF28 object_event 12, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 6, 3, 9, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0, 0, 0 MauvilleCity_GameCorner_MapWarps: @ 8530048 - warp_def 11, 10, 3, 5, MAUVILLE_CITY - warp_def 12, 10, 3, 5, MAUVILLE_CITY + warp_def 11, 10, 3, 5, MAP_MAUVILLE_CITY + warp_def 12, 10, 3, 5, MAP_MAUVILLE_CITY MauvilleCity_GameCorner_MapBGEvents: @ 8530058 bg_event 2, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_2102D6 diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/events/MauvilleCity_Gym.inc index c493d4b8b5..0a931723e0 100644 --- a/data/maps/events/MauvilleCity_Gym.inc +++ b/data/maps/events/MauvilleCity_Gym.inc @@ -8,8 +8,8 @@ MauvilleCity_Gym_EventObjects: @ 852FD5C object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 0, 7, 10, 3, 7, 17, 0, 1, 1, MauvilleCity_Gym_EventScript_20E115, 0, 0, 0 MauvilleCity_Gym_MapWarps: @ 852FE04 - warp_def 4, 20, 0, 0, MAUVILLE_CITY - warp_def 5, 20, 0, 0, MAUVILLE_CITY + warp_def 4, 20, 0, 0, MAP_MAUVILLE_CITY + warp_def 5, 20, 0, 0, MAP_MAUVILLE_CITY MauvilleCity_Gym_MapCoordEvents: @ 852FE14 coord_event 4, 12, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_20E01E diff --git a/data/maps/events/MauvilleCity_House1.inc b/data/maps/events/MauvilleCity_House1.inc index 1a1f241b53..b3ff72929b 100644 --- a/data/maps/events/MauvilleCity_House1.inc +++ b/data/maps/events/MauvilleCity_House1.inc @@ -2,8 +2,8 @@ MauvilleCity_House1_EventObjects: @ 852FEEC object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_House1_EventScript_20F976, 0, 0, 0 MauvilleCity_House1_MapWarps: @ 852FF04 - warp_def 3, 7, 0, 4, MAUVILLE_CITY - warp_def 4, 7, 0, 4, MAUVILLE_CITY + warp_def 3, 7, 0, 4, MAP_MAUVILLE_CITY + warp_def 4, 7, 0, 4, MAP_MAUVILLE_CITY MauvilleCity_House1_MapEvents:: @ 852FF14 map_events MauvilleCity_House1_EventObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_House2.inc b/data/maps/events/MauvilleCity_House2.inc index a514837709..d96a2cd5d9 100644 --- a/data/maps/events/MauvilleCity_House2.inc +++ b/data/maps/events/MauvilleCity_House2.inc @@ -2,8 +2,8 @@ MauvilleCity_House2_EventObjects: @ 853018C object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 4, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0, 0, 0 MauvilleCity_House2_MapWarps: @ 85301A4 - warp_def 3, 8, 0, 6, MAUVILLE_CITY - warp_def 4, 8, 0, 6, MAUVILLE_CITY + warp_def 3, 8, 0, 6, MAP_MAUVILLE_CITY + warp_def 4, 8, 0, 6, MAP_MAUVILLE_CITY MauvilleCity_House2_MapEvents:: @ 85301B4 map_events MauvilleCity_House2_EventObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_Mart.inc b/data/maps/events/MauvilleCity_Mart.inc index 866c0c3115..bc22e5bb0a 100644 --- a/data/maps/events/MauvilleCity_Mart.inc +++ b/data/maps/events/MauvilleCity_Mart.inc @@ -4,8 +4,8 @@ MauvilleCity_Mart_EventObjects: @ 8530310 object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0, 0, 0 MauvilleCity_Mart_MapWarps: @ 8530358 - warp_def 3, 7, 0, 3, MAUVILLE_CITY - warp_def 4, 7, 0, 3, MAUVILLE_CITY + warp_def 3, 7, 0, 3, MAP_MAUVILLE_CITY + warp_def 4, 7, 0, 3, MAP_MAUVILLE_CITY MauvilleCity_Mart_MapEvents:: @ 8530368 map_events MauvilleCity_Mart_EventObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc index b8b7ed7d61..fc76f6b760 100644 --- a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc +++ b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc @@ -6,9 +6,9 @@ MauvilleCity_PokemonCenter_1F_EventObjects: @ 85301C8 object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 2, 8, 3, 1, 17, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E98, 0, 0, 0 MauvilleCity_PokemonCenter_1F_MapWarps: @ 8530240 - warp_def 7, 8, 3, 1, MAUVILLE_CITY - warp_def 6, 8, 3, 1, MAUVILLE_CITY - warp_def 1, 6, 4, 0, MAUVILLE_CITY_POKEMON_CENTER_2F + warp_def 7, 8, 3, 1, MAP_MAUVILLE_CITY + warp_def 6, 8, 3, 1, MAP_MAUVILLE_CITY + warp_def 1, 6, 4, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_2F MauvilleCity_PokemonCenter_1F_MapEvents:: @ 8530258 map_events MauvilleCity_PokemonCenter_1F_EventObjects, MauvilleCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc index 9e8de4b75a..f22b9f0570 100644 --- a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc +++ b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc @@ -6,9 +6,9 @@ MauvilleCity_PokemonCenter_2F_EventObjects: @ 853026C object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 8, 8, 3, 7, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_21102F, 0, 0, 0 MauvilleCity_PokemonCenter_2F_MapWarps: @ 85302E4 - warp_def 1, 6, 4, 2, MAUVILLE_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER MauvilleCity_PokemonCenter_2F_MapEvents:: @ 85302FC map_events MauvilleCity_PokemonCenter_2F_EventObjects, MauvilleCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/events/MeteorFalls_1F_1R.inc index 76eb4f6dd7..2e6195b607 100644 --- a/data/maps/events/MeteorFalls_1F_1R.inc +++ b/data/maps/events/MeteorFalls_1F_1R.inc @@ -11,12 +11,12 @@ MeteorFalls_1F_1R_EventObjects: @ 8533F74 object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 13, 23, 3, 21, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, 942, 0, 0 MeteorFalls_1F_1R_MapWarps: @ 8534064 - warp_def 27, 18, 4, 0, ROUTE_114 - warp_def 6, 39, 3, 0, ROUTE_115 - warp_def 10, 3, 3, 0, METEOR_FALLS_1F_2R - warp_def 5, 4, 3, 4, METEOR_FALLS_B1F_1R - warp_def 26, 28, 3, 5, METEOR_FALLS_B1F_1R - warp_def 4, 2, 0, 0, METEOR_FALLS_STEVENS_CAVE + warp_def 27, 18, 4, 0, MAP_ROUTE114 + warp_def 6, 39, 3, 0, MAP_ROUTE115 + warp_def 10, 3, 3, 0, MAP_METEOR_FALLS_1F_2R + warp_def 5, 4, 3, 4, MAP_METEOR_FALLS_B1F_1R + warp_def 26, 28, 3, 5, MAP_METEOR_FALLS_B1F_1R + warp_def 4, 2, 0, 0, MAP_METEOR_FALLS_STEVENS_CAVE MeteorFalls_1F_1R_MapCoordEvents: @ 8534094 coord_event 14, 18, 4, 0, VAR_0x40BF, 0, 0, MeteorFalls_1F_1R_EventScript_22BD5F diff --git a/data/maps/events/MeteorFalls_1F_2R.inc b/data/maps/events/MeteorFalls_1F_2R.inc index 1a85565fa1..3561e7c5eb 100644 --- a/data/maps/events/MeteorFalls_1F_2R.inc +++ b/data/maps/events/MeteorFalls_1F_2R.inc @@ -4,10 +4,10 @@ MeteorFalls_1F_2R_EventObjects: @ 85340C4 object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 7, 12, 3, 8, 17, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0, 0, 0 MeteorFalls_1F_2R_MapWarps: @ 853410C - warp_def 10, 29, 3, 2, METEOR_FALLS_1F_1R - warp_def 4, 14, 3, 0, METEOR_FALLS_B1F_1R - warp_def 7, 20, 3, 1, METEOR_FALLS_B1F_1R - warp_def 21, 23, 3, 2, METEOR_FALLS_B1F_1R + warp_def 10, 29, 3, 2, MAP_METEOR_FALLS_1F_1R + warp_def 4, 14, 3, 0, MAP_METEOR_FALLS_B1F_1R + warp_def 7, 20, 3, 1, MAP_METEOR_FALLS_B1F_1R + warp_def 21, 23, 3, 2, MAP_METEOR_FALLS_B1F_1R MeteorFalls_1F_2R_MapBGEvents: @ 853412C bg_event 9, 58, 0, 0, 0, 0x0 diff --git a/data/maps/events/MeteorFalls_B1F_1R.inc b/data/maps/events/MeteorFalls_B1F_1R.inc index 410dd90c0c..039f316d97 100644 --- a/data/maps/events/MeteorFalls_B1F_1R.inc +++ b/data/maps/events/MeteorFalls_B1F_1R.inc @@ -1,10 +1,10 @@ MeteorFalls_B1F_1R_MapWarps: @ 853414C - warp_def 5, 6, 4, 1, METEOR_FALLS_1F_2R - warp_def 7, 11, 5, 2, METEOR_FALLS_1F_2R - warp_def 18, 15, 4, 3, METEOR_FALLS_1F_2R - warp_def 17, 3, 3, 0, METEOR_FALLS_B1F_2R - warp_def 3, 23, 5, 3, METEOR_FALLS_1F_1R - warp_def 20, 36, 3, 4, METEOR_FALLS_1F_1R + warp_def 5, 6, 4, 1, MAP_METEOR_FALLS_1F_2R + warp_def 7, 11, 5, 2, MAP_METEOR_FALLS_1F_2R + warp_def 18, 15, 4, 3, MAP_METEOR_FALLS_1F_2R + warp_def 17, 3, 3, 0, MAP_METEOR_FALLS_B1F_2R + warp_def 3, 23, 5, 3, MAP_METEOR_FALLS_1F_1R + warp_def 20, 36, 3, 4, MAP_METEOR_FALLS_1F_1R MeteorFalls_B1F_1R_MapEvents:: @ 853417C map_events 0x0, MeteorFalls_B1F_1R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MeteorFalls_B1F_2R.inc b/data/maps/events/MeteorFalls_B1F_2R.inc index 454946506a..92d60a60a6 100644 --- a/data/maps/events/MeteorFalls_B1F_2R.inc +++ b/data/maps/events/MeteorFalls_B1F_2R.inc @@ -2,7 +2,7 @@ MeteorFalls_B1F_2R_EventObjects: @ 8534190 object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 3, 1, 17, 0, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, 1080, 0, 0 MeteorFalls_B1F_2R_MapWarps: @ 85341A8 - warp_def 5, 15, 3, 3, METEOR_FALLS_B1F_1R + warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R MeteorFalls_B1F_2R_MapEvents:: @ 85341B0 map_events MeteorFalls_B1F_2R_EventObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MeteorFalls_StevensCave.inc b/data/maps/events/MeteorFalls_StevensCave.inc index e66dda1198..9a2556e8a6 100644 --- a/data/maps/events/MeteorFalls_StevensCave.inc +++ b/data/maps/events/MeteorFalls_StevensCave.inc @@ -2,7 +2,7 @@ MeteorFalls_StevensCave_EventObjects: @ 85378B0 object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 0, 19, 3, 3, 7, 17, 0, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0, 0, 0 MeteorFalls_StevensCave_MapWarps: @ 85378C8 - warp_def 10, 29, 3, 5, METEOR_FALLS_1F_1R + warp_def 10, 29, 3, 5, MAP_METEOR_FALLS_1F_1R MeteorFalls_StevensCave_MapEvents:: @ 85378D0 map_events MeteorFalls_StevensCave_EventObjects, MeteorFalls_StevensCave_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MirageTower_1F.inc b/data/maps/events/MirageTower_1F.inc index 5bf9568bbe..f35ce6d2a1 100644 --- a/data/maps/events/MirageTower_1F.inc +++ b/data/maps/events/MirageTower_1F.inc @@ -1,6 +1,6 @@ MirageTower_1F_MapWarps: @ 85375D4 - warp_def 10, 14, 3, 3, ROUTE_111 - warp_def 15, 2, 3, 1, MIRAGE_TOWER_2F + warp_def 10, 14, 3, 3, MAP_ROUTE111 + warp_def 15, 2, 3, 1, MAP_MIRAGE_TOWER_2F MirageTower_1F_MapEvents:: @ 85375E4 map_events 0x0, MirageTower_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MirageTower_2F.inc b/data/maps/events/MirageTower_2F.inc index 07814433a9..fdbafbe068 100644 --- a/data/maps/events/MirageTower_2F.inc +++ b/data/maps/events/MirageTower_2F.inc @@ -1,6 +1,6 @@ MirageTower_2F_MapWarps: @ 85375F8 - warp_def 18, 12, 3, 0, MIRAGE_TOWER_3F - warp_def 15, 2, 3, 1, MIRAGE_TOWER_1F + warp_def 18, 12, 3, 0, MAP_MIRAGE_TOWER_3F + warp_def 15, 2, 3, 1, MAP_MIRAGE_TOWER_1F MirageTower_2F_MapEvents:: @ 8537608 map_events 0x0, MirageTower_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MirageTower_3F.inc b/data/maps/events/MirageTower_3F.inc index fe6a0f73fd..062a137fcf 100644 --- a/data/maps/events/MirageTower_3F.inc +++ b/data/maps/events/MirageTower_3F.inc @@ -3,8 +3,8 @@ MirageTower_3F_EventObjects: @ 853761C object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 4, 8, 3, 1, 17, 0, 0, 0, MirageTower_3F_EventScript_2907A6, 18, 0, 0 MirageTower_3F_MapWarps: @ 853764C - warp_def 18, 12, 3, 0, MIRAGE_TOWER_2F - warp_def 2, 4, 0, 0, MIRAGE_TOWER_4F + warp_def 18, 12, 3, 0, MAP_MIRAGE_TOWER_2F + warp_def 2, 4, 0, 0, MAP_MIRAGE_TOWER_4F MirageTower_3F_MapEvents:: @ 853765C map_events MirageTower_3F_EventObjects, MirageTower_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MirageTower_4F.inc b/data/maps/events/MirageTower_4F.inc index 4d07ff4c3d..848eeb88e2 100644 --- a/data/maps/events/MirageTower_4F.inc +++ b/data/maps/events/MirageTower_4F.inc @@ -4,7 +4,7 @@ MirageTower_4F_EventObjects: @ 8537670 object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 6, 7, 3, 1, 17, 0, 0, 0, MirageTower_4F_EventScript_2907A6, 17, 0, 0 MirageTower_4F_MapWarps: @ 85376B8 - warp_def 1, 4, 3, 1, MIRAGE_TOWER_3F + warp_def 1, 4, 3, 1, MAP_MIRAGE_TOWER_3F MirageTower_4F_MapEvents:: @ 85376C0 map_events MirageTower_4F_EventObjects, MirageTower_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/events/MossdeepCity.inc index a5dfb9df92..531fb141b3 100644 --- a/data/maps/events/MossdeepCity.inc +++ b/data/maps/events/MossdeepCity.inc @@ -18,16 +18,16 @@ MossdeepCity_EventObjects: @ 8527018 object_event 17, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 31, 29, 3, 64, 51, 0, 0, 0, MossdeepCity_EventScript_1E4C7C, 0, 0, 0 MossdeepCity_MapWarps: @ 85271B0 - warp_def 28, 9, 0, 0, MOSSDEEP_CITY_HOUSE_1 - warp_def 38, 9, 0, 0, MOSSDEEP_CITY_GYM - warp_def 28, 16, 0, 0, MOSSDEEP_CITY_POKEMON_CENTER_1F - warp_def 67, 25, 0, 0, MOSSDEEP_CITY_HOUSE_2 - warp_def 37, 18, 0, 0, MOSSDEEP_CITY_MART - warp_def 49, 6, 0, 0, MOSSDEEP_CITY_HOUSE_3 - warp_def 19, 10, 0, 0, MOSSDEEP_CITY_STEVENS_HOUSE - warp_def 18, 16, 0, 1, MOSSDEEP_CITY_HOUSE_4 - warp_def 64, 15, 0, 0, MOSSDEEP_CITY_SPACE_CENTER_1F - warp_def 36, 24, 0, 0, MOSSDEEP_CITY_GAME_CORNER_1F + warp_def 28, 9, 0, 0, MAP_MOSSDEEP_CITY_HOUSE1 + warp_def 38, 9, 0, 0, MAP_MOSSDEEP_CITY_GYM + warp_def 28, 16, 0, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F + warp_def 67, 25, 0, 0, MAP_MOSSDEEP_CITY_HOUSE2 + warp_def 37, 18, 0, 0, MAP_MOSSDEEP_CITY_MART + warp_def 49, 6, 0, 0, MAP_MOSSDEEP_CITY_HOUSE3 + warp_def 19, 10, 0, 0, MAP_MOSSDEEP_CITY_STEVENS_HOUSE + warp_def 18, 16, 0, 1, MAP_MOSSDEEP_CITY_HOUSE4 + warp_def 64, 15, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F + warp_def 36, 24, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_1F MossdeepCity_MapCoordEvents: @ 8527200 coord_event 25, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_1E4B38 diff --git a/data/maps/events/MossdeepCity_GameCorner_1F.inc b/data/maps/events/MossdeepCity_GameCorner_1F.inc index cbcb8b76f9..a271897b74 100644 --- a/data/maps/events/MossdeepCity_GameCorner_1F.inc +++ b/data/maps/events/MossdeepCity_GameCorner_1F.inc @@ -3,9 +3,9 @@ MossdeepCity_GameCorner_1F_EventObjects: @ 8532F40 object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 4, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0, 0, 0 MossdeepCity_GameCorner_1F_MapWarps: @ 8532F70 - warp_def 5, 9, 0, 9, MOSSDEEP_CITY - warp_def 6, 9, 0, 9, MOSSDEEP_CITY - warp_def 2, 0, 0, 0, MOSSDEEP_CITY_GAME_CORNER_B1F + warp_def 5, 9, 0, 9, MAP_MOSSDEEP_CITY + warp_def 6, 9, 0, 9, MAP_MOSSDEEP_CITY + warp_def 2, 0, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_B1F MossdeepCity_GameCorner_1F_MapBGEvents: @ 8532F88 bg_event 3, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B5D diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.inc b/data/maps/events/MossdeepCity_GameCorner_B1F.inc index a043926a70..2955da0b01 100644 --- a/data/maps/events/MossdeepCity_GameCorner_B1F.inc +++ b/data/maps/events/MossdeepCity_GameCorner_B1F.inc @@ -2,7 +2,7 @@ MossdeepCity_GameCorner_B1F_EventObjects: @ 8532FC0 object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 5, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0 MossdeepCity_GameCorner_B1F_MapWarps: @ 8532FD8 - warp_def 3, 1, 0, 2, MOSSDEEP_CITY_GAME_CORNER_1F + warp_def 3, 1, 0, 2, MAP_MOSSDEEP_CITY_GAME_CORNER_1F MossdeepCity_GameCorner_B1F_MapEvents:: @ 8532FE0 map_events MossdeepCity_GameCorner_B1F_EventObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_Gym.inc b/data/maps/events/MossdeepCity_Gym.inc index 2a152d8f65..23951059d7 100644 --- a/data/maps/events/MossdeepCity_Gym.inc +++ b/data/maps/events/MossdeepCity_Gym.inc @@ -37,20 +37,20 @@ MossdeepCity_Gym_EventObjects: @ 85324EC object_event 36, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 23, 25, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 MossdeepCity_Gym_MapWarps: @ 853284C - warp_def 6, 35, 3, 1, MOSSDEEP_CITY - warp_def 7, 35, 3, 1, MOSSDEEP_CITY - warp_def 3, 28, 0, 3, MOSSDEEP_CITY_GYM - warp_def 1, 23, 3, 2, MOSSDEEP_CITY_GYM - warp_def 7, 18, 0, 5, MOSSDEEP_CITY_GYM - warp_def 8, 12, 0, 4, MOSSDEEP_CITY_GYM - warp_def 9, 18, 0, 7, MOSSDEEP_CITY_GYM - warp_def 23, 20, 0, 6, MOSSDEEP_CITY_GYM - warp_def 1, 33, 3, 9, MOSSDEEP_CITY_GYM - warp_def 20, 24, 0, 8, MOSSDEEP_CITY_GYM - warp_def 11, 3, 0, 11, MOSSDEEP_CITY_GYM - warp_def 11, 35, 3, 10, MOSSDEEP_CITY_GYM - warp_def 13, 32, 0, 13, MOSSDEEP_CITY_GYM - warp_def 21, 10, 0, 12, MOSSDEEP_CITY_GYM + warp_def 6, 35, 3, 1, MAP_MOSSDEEP_CITY + warp_def 7, 35, 3, 1, MAP_MOSSDEEP_CITY + warp_def 3, 28, 0, 3, MAP_MOSSDEEP_CITY_GYM + warp_def 1, 23, 3, 2, MAP_MOSSDEEP_CITY_GYM + warp_def 7, 18, 0, 5, MAP_MOSSDEEP_CITY_GYM + warp_def 8, 12, 0, 4, MAP_MOSSDEEP_CITY_GYM + warp_def 9, 18, 0, 7, MAP_MOSSDEEP_CITY_GYM + warp_def 23, 20, 0, 6, MAP_MOSSDEEP_CITY_GYM + warp_def 1, 33, 3, 9, MAP_MOSSDEEP_CITY_GYM + warp_def 20, 24, 0, 8, MAP_MOSSDEEP_CITY_GYM + warp_def 11, 3, 0, 11, MAP_MOSSDEEP_CITY_GYM + warp_def 11, 35, 3, 10, MAP_MOSSDEEP_CITY_GYM + warp_def 13, 32, 0, 13, MAP_MOSSDEEP_CITY_GYM + warp_def 21, 10, 0, 12, MAP_MOSSDEEP_CITY_GYM MossdeepCity_Gym_MapCoordEvents: @ 85328BC coord_event 2, 21, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220C67 diff --git a/data/maps/events/MossdeepCity_House1.inc b/data/maps/events/MossdeepCity_House1.inc index bddde5c818..6342bcc55e 100644 --- a/data/maps/events/MossdeepCity_House1.inc +++ b/data/maps/events/MossdeepCity_House1.inc @@ -3,8 +3,8 @@ MossdeepCity_House1_EventObjects: @ 8532978 object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0, 0, 0 MossdeepCity_House1_MapWarps: @ 85329A8 - warp_def 3, 7, 0, 0, MOSSDEEP_CITY - warp_def 4, 7, 0, 0, MOSSDEEP_CITY + warp_def 3, 7, 0, 0, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 0, MAP_MOSSDEEP_CITY MossdeepCity_House1_MapEvents:: @ 85329B8 map_events MossdeepCity_House1_EventObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_House2.inc b/data/maps/events/MossdeepCity_House2.inc index e8e120c772..9596aa7bd0 100644 --- a/data/maps/events/MossdeepCity_House2.inc +++ b/data/maps/events/MossdeepCity_House2.inc @@ -4,8 +4,8 @@ MossdeepCity_House2_EventObjects: @ 85329CC object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, 934, 0, 0 MossdeepCity_House2_MapWarps: @ 8532A14 - warp_def 3, 8, 0, 3, MOSSDEEP_CITY - warp_def 4, 8, 0, 3, MOSSDEEP_CITY + warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY + warp_def 4, 8, 0, 3, MAP_MOSSDEEP_CITY MossdeepCity_House2_MapEvents:: @ 8532A24 map_events MossdeepCity_House2_EventObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_House3.inc b/data/maps/events/MossdeepCity_House3.inc index 5fec469e8a..19933fb6ad 100644 --- a/data/maps/events/MossdeepCity_House3.inc +++ b/data/maps/events/MossdeepCity_House3.inc @@ -2,8 +2,8 @@ MossdeepCity_House3_EventObjects: @ 8532BD4 object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, MossdeepCity_House3_EventScript_2225C3, 0, 0, 0 MossdeepCity_House3_MapWarps: @ 8532BEC - warp_def 3, 7, 0, 5, MOSSDEEP_CITY - warp_def 4, 7, 0, 5, MOSSDEEP_CITY + warp_def 3, 7, 0, 5, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 5, MAP_MOSSDEEP_CITY MossdeepCity_House3_MapEvents:: @ 8532BFC map_events MossdeepCity_House3_EventObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_House4.inc b/data/maps/events/MossdeepCity_House4.inc index 923bbe86d0..fc72039508 100644 --- a/data/maps/events/MossdeepCity_House4.inc +++ b/data/maps/events/MossdeepCity_House4.inc @@ -4,8 +4,8 @@ MossdeepCity_House4_EventObjects: @ 8532CAC object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 0, 2, 4, 3, 1, 17, 0, 0, 0, MossdeepCity_House4_EventScript_222E1E, 0, 0, 0 MossdeepCity_House4_MapWarps: @ 8532CF4 - warp_def 4, 7, 0, 7, MOSSDEEP_CITY - warp_def 3, 7, 0, 7, MOSSDEEP_CITY + warp_def 4, 7, 0, 7, MAP_MOSSDEEP_CITY + warp_def 3, 7, 0, 7, MAP_MOSSDEEP_CITY MossdeepCity_House4_MapEvents:: @ 8532D04 map_events MossdeepCity_House4_EventObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_Mart.inc b/data/maps/events/MossdeepCity_Mart.inc index c8bbd0a418..91811e9e9f 100644 --- a/data/maps/events/MossdeepCity_Mart.inc +++ b/data/maps/events/MossdeepCity_Mart.inc @@ -5,8 +5,8 @@ MossdeepCity_Mart_EventObjects: @ 8532B50 object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 0, 5, 3, 3, 2, 17, 0, 0, 0, MossdeepCity_Mart_EventScript_222408, 0, 0, 0 MossdeepCity_Mart_MapWarps: @ 8532BB0 - warp_def 3, 7, 0, 4, MOSSDEEP_CITY - warp_def 4, 7, 0, 4, MOSSDEEP_CITY + warp_def 3, 7, 0, 4, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 4, MAP_MOSSDEEP_CITY MossdeepCity_Mart_MapEvents:: @ 8532BC0 map_events MossdeepCity_Mart_EventObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc index 17052105de..7c8b8b7028 100644 --- a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc +++ b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc @@ -4,9 +4,9 @@ MossdeepCity_PokemonCenter_1F_EventObjects: @ 8532A38 object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 0, 3, 5, 3, 1, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_222265, 0, 0, 0 MossdeepCity_PokemonCenter_1F_MapWarps: @ 8532A80 - warp_def 7, 8, 3, 2, MOSSDEEP_CITY - warp_def 6, 8, 3, 2, MOSSDEEP_CITY - warp_def 1, 6, 4, 0, MOSSDEEP_CITY_POKEMON_CENTER_2F + warp_def 7, 8, 3, 2, MAP_MOSSDEEP_CITY + warp_def 6, 8, 3, 2, MAP_MOSSDEEP_CITY + warp_def 1, 6, 4, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F MossdeepCity_PokemonCenter_1F_MapEvents:: @ 8532A98 map_events MossdeepCity_PokemonCenter_1F_EventObjects, MossdeepCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc index 13a189b51f..4fa7dff998 100644 --- a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc +++ b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc @@ -6,9 +6,9 @@ MossdeepCity_PokemonCenter_2F_EventObjects: @ 8532AAC object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 11, 7, 3, 5, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0, 0, 0 MossdeepCity_PokemonCenter_2F_MapWarps: @ 8532B24 - warp_def 1, 6, 4, 2, MOSSDEEP_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER MossdeepCity_PokemonCenter_2F_MapEvents:: @ 8532B3C map_events MossdeepCity_PokemonCenter_2F_EventObjects, MossdeepCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc index 8352fe02ce..d3b27947ab 100644 --- a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc +++ b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc @@ -12,9 +12,9 @@ MossdeepCity_SpaceCenter_1F_EventObjects: @ 8532D18 object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 0, 1, 4, 3, 8, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, 753, 0, 0 MossdeepCity_SpaceCenter_1F_MapWarps: @ 8532E20 - warp_def 7, 9, 0, 8, MOSSDEEP_CITY - warp_def 8, 9, 0, 8, MOSSDEEP_CITY - warp_def 13, 1, 0, 0, MOSSDEEP_CITY_SPACE_CENTER_2F + warp_def 7, 9, 0, 8, MAP_MOSSDEEP_CITY + warp_def 8, 9, 0, 8, MAP_MOSSDEEP_CITY + warp_def 13, 1, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_2F MossdeepCity_SpaceCenter_1F_MapEvents:: @ 8532E38 map_events MossdeepCity_SpaceCenter_1F_EventObjects, MossdeepCity_SpaceCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc index ac3bc8c7aa..e2f778bec3 100644 --- a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc +++ b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc @@ -10,7 +10,7 @@ MossdeepCity_SpaceCenter_2F_EventObjects: @ 8532E4C object_event 9, EVENT_OBJ_GFX_MAXIE, 0, 0, 1, 9, 3, 7, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, 862, 0, 0 MossdeepCity_SpaceCenter_2F_MapWarps: @ 8532F24 - warp_def 13, 1, 0, 2, MOSSDEEP_CITY_SPACE_CENTER_1F + warp_def 13, 1, 0, 2, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F MossdeepCity_SpaceCenter_2F_MapEvents:: @ 8532F2C map_events MossdeepCity_SpaceCenter_2F_EventObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/events/MossdeepCity_StevensHouse.inc index 4d96583124..2b0562d342 100644 --- a/data/maps/events/MossdeepCity_StevensHouse.inc +++ b/data/maps/events/MossdeepCity_StevensHouse.inc @@ -4,8 +4,8 @@ MossdeepCity_StevensHouse_EventObjects: @ 8532C10 object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 6, 4, 3, 76, 17, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, 727, 0, 0 MossdeepCity_StevensHouse_MapWarps: @ 8532C58 - warp_def 3, 7, 0, 6, MOSSDEEP_CITY - warp_def 4, 7, 0, 6, MOSSDEEP_CITY + warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 6, MAP_MOSSDEEP_CITY MossdeepCity_StevensHouse_MapBGEvents: @ 8532C68 bg_event 0, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222909 diff --git a/data/maps/events/MtChimney.inc b/data/maps/events/MtChimney.inc index e4eeb764d9..a260258302 100644 --- a/data/maps/events/MtChimney.inc +++ b/data/maps/events/MtChimney.inc @@ -31,10 +31,10 @@ MtChimney_EventObjects: @ 85347C8 object_event 30, EVENT_OBJ_GFX_HIKER, 0, 0, 7, 7, 3, 10, 17, 0, 1, 6, MtChimney_EventScript_22F208, 877, 0, 0 MtChimney_MapWarps: @ 8534A98 - warp_def 17, 36, 0, 0, MT_CHIMNEY_CABLE_CAR_STATION - warp_def 18, 36, 0, 1, MT_CHIMNEY_CABLE_CAR_STATION - warp_def 20, 41, 3, 2, JAGGED_PASS - warp_def 21, 41, 3, 3, JAGGED_PASS + warp_def 17, 36, 0, 0, MAP_MT_CHIMNEY_CABLE_CAR_STATION + warp_def 18, 36, 0, 1, MAP_MT_CHIMNEY_CABLE_CAR_STATION + warp_def 20, 41, 3, 2, MAP_JAGGED_PASS + warp_def 21, 41, 3, 3, MAP_JAGGED_PASS MtChimney_MapBGEvents: @ 8534AB8 bg_event 14, 6, 0, 0, 0, MtChimney_EventScript_22F0E4 diff --git a/data/maps/events/MtChimney_CableCarStation.inc b/data/maps/events/MtChimney_CableCarStation.inc index 1c791072c6..e519d5281d 100644 --- a/data/maps/events/MtChimney_CableCarStation.inc +++ b/data/maps/events/MtChimney_CableCarStation.inc @@ -3,8 +3,8 @@ MtChimney_CableCarStation_EventObjects: @ 8533CA8 object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0 MtChimney_CableCarStation_MapWarps: @ 8533CD8 - warp_def 6, 11, 0, 0, MT_CHIMNEY - warp_def 7, 11, 0, 1, MT_CHIMNEY + warp_def 6, 11, 0, 0, MAP_MT_CHIMNEY + warp_def 7, 11, 0, 1, MAP_MT_CHIMNEY MtChimney_CableCarStation_MapEvents:: @ 8533CE8 map_events MtChimney_CableCarStation_EventObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_1F.inc b/data/maps/events/MtPyre_1F.inc index aedb94c2f0..99e6e88d27 100644 --- a/data/maps/events/MtPyre_1F.inc +++ b/data/maps/events/MtPyre_1F.inc @@ -4,12 +4,12 @@ MtPyre_1F_EventObjects: @ 8534D64 object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 0, 13, 10, 3, 9, 17, 0, 0, 0, MtPyre_1F_EventScript_230F81, 0, 0, 0 MtPyre_1F_MapWarps: @ 8534DAC - warp_def 17, 18, 3, 0, ROUTE_122 - warp_def 3, 6, 3, 0, MT_PYRE_EXTERIOR - warp_def 18, 18, 3, 0, ROUTE_122 - warp_def 4, 6, 3, 0, MT_PYRE_EXTERIOR - warp_def 11, 1, 3, 0, MT_PYRE_2F - warp_def 20, 9, 3, 4, MT_PYRE_2F + warp_def 17, 18, 3, 0, MAP_ROUTE122 + warp_def 3, 6, 3, 0, MAP_MT_PYRE_EXTERIOR + warp_def 18, 18, 3, 0, MAP_ROUTE122 + warp_def 4, 6, 3, 0, MAP_MT_PYRE_EXTERIOR + warp_def 11, 1, 3, 0, MAP_MT_PYRE_2F + warp_def 20, 9, 3, 4, MAP_MT_PYRE_2F MtPyre_1F_MapEvents:: @ 8534DDC map_events MtPyre_1F_EventObjects, MtPyre_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_2F.inc b/data/maps/events/MtPyre_2F.inc index d75442cd64..89e8dd5534 100644 --- a/data/maps/events/MtPyre_2F.inc +++ b/data/maps/events/MtPyre_2F.inc @@ -9,11 +9,11 @@ MtPyre_2F_EventObjects: @ 8534DF0 object_event 8, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 6, 6, 3, 17, 17, 0, 1, 2, MtPyre_2F_EventScript_231175, 0, 0, 0 MtPyre_2F_MapWarps: @ 8534EB0 - warp_def 2, 1, 3, 4, MT_PYRE_1F - warp_def 10, 1, 3, 0, MT_PYRE_3F - warp_def 10, 12, 3, 4, MT_PYRE_3F - warp_def 6, 12, 3, 5, MT_PYRE_3F - warp_def 11, 9, 3, 5, MT_PYRE_1F + warp_def 2, 1, 3, 4, MAP_MT_PYRE_1F + warp_def 10, 1, 3, 0, MAP_MT_PYRE_3F + warp_def 10, 12, 3, 4, MAP_MT_PYRE_3F + warp_def 6, 12, 3, 5, MAP_MT_PYRE_3F + warp_def 11, 9, 3, 5, MAP_MT_PYRE_1F MtPyre_2F_MapEvents:: @ 8534ED8 map_events MtPyre_2F_EventObjects, MtPyre_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_3F.inc b/data/maps/events/MtPyre_3F.inc index e52cd546b7..a60b1cec05 100644 --- a/data/maps/events/MtPyre_3F.inc +++ b/data/maps/events/MtPyre_3F.inc @@ -5,12 +5,12 @@ MtPyre_3F_EventObjects: @ 8534EEC object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 6, 4, 3, 14, 17, 0, 1, 4, MtPyre_3F_EventScript_231781, 0, 0, 0 MtPyre_3F_MapWarps: @ 8534F4C - warp_def 10, 1, 3, 1, MT_PYRE_2F - warp_def 2, 1, 3, 1, MT_PYRE_4F - warp_def 9, 10, 3, 4, MT_PYRE_4F - warp_def 1, 12, 3, 5, MT_PYRE_4F - warp_def 10, 12, 3, 2, MT_PYRE_2F - warp_def 6, 12, 3, 3, MT_PYRE_2F + warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F + warp_def 2, 1, 3, 1, MAP_MT_PYRE_4F + warp_def 9, 10, 3, 4, MAP_MT_PYRE_4F + warp_def 1, 12, 3, 5, MAP_MT_PYRE_4F + warp_def 10, 12, 3, 2, MAP_MT_PYRE_2F + warp_def 6, 12, 3, 3, MAP_MT_PYRE_2F MtPyre_3F_MapEvents:: @ 8534F7C map_events MtPyre_3F_EventObjects, MtPyre_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_4F.inc b/data/maps/events/MtPyre_4F.inc index 1804f46157..4cb8ccd6f8 100644 --- a/data/maps/events/MtPyre_4F.inc +++ b/data/maps/events/MtPyre_4F.inc @@ -3,12 +3,12 @@ MtPyre_4F_EventObjects: @ 8534F90 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 11, 3, 1, 17, 0, 0, 0, MtPyre_4F_EventScript_291317, 1130, 0, 0 MtPyre_4F_MapWarps: @ 8534FC0 - warp_def 10, 1, 3, 1, MT_PYRE_5F - warp_def 2, 5, 3, 1, MT_PYRE_3F - warp_def 12, 10, 3, 3, MT_PYRE_5F - warp_def 12, 12, 3, 4, MT_PYRE_5F - warp_def 9, 10, 3, 2, MT_PYRE_3F - warp_def 2, 12, 3, 3, MT_PYRE_3F + warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F + warp_def 2, 5, 3, 1, MAP_MT_PYRE_3F + warp_def 12, 10, 3, 3, MAP_MT_PYRE_5F + warp_def 12, 12, 3, 4, MAP_MT_PYRE_5F + warp_def 9, 10, 3, 2, MAP_MT_PYRE_3F + warp_def 2, 12, 3, 3, MAP_MT_PYRE_3F MtPyre_4F_MapEvents:: @ 8534FF0 map_events MtPyre_4F_EventObjects, MtPyre_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_5F.inc b/data/maps/events/MtPyre_5F.inc index ce7851f62f..4bd96526e7 100644 --- a/data/maps/events/MtPyre_5F.inc +++ b/data/maps/events/MtPyre_5F.inc @@ -3,11 +3,11 @@ MtPyre_5F_EventObjects: @ 8535004 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 11, 3, 1, 17, 0, 0, 0, MtPyre_5F_EventScript_291324, 1052, 0, 0 MtPyre_5F_MapWarps: @ 8535034 - warp_def 2, 1, 3, 0, MT_PYRE_6F - warp_def 10, 5, 3, 0, MT_PYRE_4F - warp_def 1, 10, 3, 1, MT_PYRE_6F - warp_def 12, 10, 3, 2, MT_PYRE_4F - warp_def 12, 12, 3, 3, MT_PYRE_4F + warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F + warp_def 10, 5, 3, 0, MAP_MT_PYRE_4F + warp_def 1, 10, 3, 1, MAP_MT_PYRE_6F + warp_def 12, 10, 3, 2, MAP_MT_PYRE_4F + warp_def 12, 12, 3, 3, MAP_MT_PYRE_4F MtPyre_5F_MapEvents:: @ 853505C map_events MtPyre_5F_EventObjects, MtPyre_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_6F.inc b/data/maps/events/MtPyre_6F.inc index b271e116cf..b160f48968 100644 --- a/data/maps/events/MtPyre_6F.inc +++ b/data/maps/events/MtPyre_6F.inc @@ -4,8 +4,8 @@ MtPyre_6F_EventObjects: @ 8535070 object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 10, 3, 3, 24, 17, 0, 1, 3, MtPyre_6F_EventScript_231D9D, 0, 0, 0 MtPyre_6F_MapWarps: @ 85350B8 - warp_def 2, 1, 3, 0, MT_PYRE_5F - warp_def 1, 10, 3, 2, MT_PYRE_5F + warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F + warp_def 1, 10, 3, 2, MAP_MT_PYRE_5F MtPyre_6F_MapEvents:: @ 85350C8 map_events MtPyre_6F_EventObjects, MtPyre_6F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_Exterior.inc b/data/maps/events/MtPyre_Exterior.inc index a45d2ec2ea..446e040721 100644 --- a/data/maps/events/MtPyre_Exterior.inc +++ b/data/maps/events/MtPyre_Exterior.inc @@ -3,9 +3,9 @@ MtPyre_Exterior_EventObjects: @ 85350DC object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 19, 40, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, 1074, 0, 0 MtPyre_Exterior_MapWarps: @ 853510C - warp_def 10, 42, 3, 1, MT_PYRE_1F - warp_def 19, 10, 3, 1, MT_PYRE_SUMMIT - warp_def 20, 10, 3, 1, MT_PYRE_SUMMIT + warp_def 10, 42, 3, 1, MAP_MT_PYRE_1F + warp_def 19, 10, 3, 1, MAP_MT_PYRE_SUMMIT + warp_def 20, 10, 3, 1, MAP_MT_PYRE_SUMMIT MtPyre_Exterior_MapCoordEvents: @ 8535124 coord_event 24, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_231FED diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/events/MtPyre_Summit.inc index 696d9ead39..e2512c586a 100644 --- a/data/maps/events/MtPyre_Summit.inc +++ b/data/maps/events/MtPyre_Summit.inc @@ -9,9 +9,9 @@ MtPyre_Summit_EventObjects: @ 85351A0 object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 0, 23, 6, 3, 7, 17, 0, 0, 0, 0x0, 856, 0, 0 MtPyre_Summit_MapWarps: @ 8535260 - warp_def 22, 31, 3, 1, MT_PYRE_EXTERIOR - warp_def 23, 31, 3, 1, MT_PYRE_EXTERIOR - warp_def 24, 31, 3, 1, MT_PYRE_EXTERIOR + warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR + warp_def 23, 31, 3, 1, MAP_MT_PYRE_EXTERIOR + warp_def 24, 31, 3, 1, MAP_MT_PYRE_EXTERIOR MtPyre_Summit_MapCoordEvents: @ 8535278 coord_event 22, 7, 3, 0, VAR_0x40B9, 0, 0, MtPyre_Summit_EventScript_232018 diff --git a/data/maps/events/NavelRock_B1F.inc b/data/maps/events/NavelRock_B1F.inc index 541b11fcac..e83d221ddd 100644 --- a/data/maps/events/NavelRock_B1F.inc +++ b/data/maps/events/NavelRock_B1F.inc @@ -1,6 +1,6 @@ NavelRock_B1F_MapWarps: @ 853DA94 - warp_def 4, 3, 3, 0, NAVEL_ROCK_ENTRANCE - warp_def 18, 9, 3, 1, NAVEL_ROCK_FORK + warp_def 4, 3, 3, 0, MAP_NAVEL_ROCK_ENTRANCE + warp_def 18, 9, 3, 1, MAP_NAVEL_ROCK_FORK NavelRock_B1F_MapEvents:: @ 853DAA4 map_events 0x0, NavelRock_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Bottom.inc b/data/maps/events/NavelRock_Bottom.inc index af7cffea3f..ae5c36cf1d 100644 --- a/data/maps/events/NavelRock_Bottom.inc +++ b/data/maps/events/NavelRock_Bottom.inc @@ -2,7 +2,7 @@ NavelRock_Bottom_EventObjects: @ 853DD50 object_event 1, EVENT_OBJ_GFX_LUGIA, 0, 0, 11, 13, 0, 8, 17, 0, 0, 0, NavelRock_Bottom_EventScript_2692A2, 800, 0, 0 NavelRock_Bottom_MapWarps: @ 853DD68 - warp_def 14, 19, 0, 0, NAVEL_ROCK_DOWN_11 + warp_def 14, 19, 0, 0, MAP_NAVEL_ROCK_DOWN11 NavelRock_Bottom_MapEvents:: @ 853DD70 map_events NavelRock_Bottom_EventObjects, NavelRock_Bottom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Down01.inc b/data/maps/events/NavelRock_Down01.inc index b644f47ad8..3a60452154 100644 --- a/data/maps/events/NavelRock_Down01.inc +++ b/data/maps/events/NavelRock_Down01.inc @@ -1,6 +1,6 @@ NavelRock_Down01_MapWarps: @ 853DBC4 - warp_def 3, 3, 3, 2, NAVEL_ROCK_FORK - warp_def 5, 5, 3, 0, NAVEL_ROCK_DOWN_02 + warp_def 3, 3, 3, 2, MAP_NAVEL_ROCK_FORK + warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN02 NavelRock_Down01_MapEvents:: @ 853DBD4 map_events 0x0, NavelRock_Down01_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Down02.inc b/data/maps/events/NavelRock_Down02.inc index dfa088f49e..7441539c91 100644 --- a/data/maps/events/NavelRock_Down02.inc +++ b/data/maps/events/NavelRock_Down02.inc @@ -1,6 +1,6 @@ NavelRock_Down02_MapWarps: @ 853DBE8 - warp_def 5, 5, 3, 1, NAVEL_ROCK_DOWN_01 - warp_def 3, 3, 3, 0, NAVEL_ROCK_DOWN_03 + warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN01 + warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN03 NavelRock_Down02_MapEvents:: @ 853DBF8 map_events 0x0, NavelRock_Down02_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Down03.inc b/data/maps/events/NavelRock_Down03.inc index 723bc8934b..20dabdfaf9 100644 --- a/data/maps/events/NavelRock_Down03.inc +++ b/data/maps/events/NavelRock_Down03.inc @@ -1,6 +1,6 @@ NavelRock_Down03_MapWarps: @ 853DC0C - warp_def 3, 3, 3, 1, NAVEL_ROCK_DOWN_02 - warp_def 5, 5, 3, 0, NAVEL_ROCK_DOWN_04 + warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN02 + warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN04 NavelRock_Down03_MapEvents:: @ 853DC1C map_events 0x0, NavelRock_Down03_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Down04.inc b/data/maps/events/NavelRock_Down04.inc index 9f51486111..e50f6fe230 100644 --- a/data/maps/events/NavelRock_Down04.inc +++ b/data/maps/events/NavelRock_Down04.inc @@ -1,6 +1,6 @@ NavelRock_Down04_MapWarps: @ 853DC30 - warp_def 5, 5, 3, 1, NAVEL_ROCK_DOWN_03 - warp_def 3, 3, 3, 0, NAVEL_ROCK_DOWN_05 + warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN03 + warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN05 NavelRock_Down04_MapEvents:: @ 853DC40 map_events 0x0, NavelRock_Down04_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Down05.inc b/data/maps/events/NavelRock_Down05.inc index df8981e2af..500d38e9bd 100644 --- a/data/maps/events/NavelRock_Down05.inc +++ b/data/maps/events/NavelRock_Down05.inc @@ -1,6 +1,6 @@ NavelRock_Down05_MapWarps: @ 853DC54 - warp_def 3, 3, 3, 1, NAVEL_ROCK_DOWN_04 - warp_def 5, 5, 3, 0, NAVEL_ROCK_DOWN_06 + warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN04 + warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN06 NavelRock_Down05_MapEvents:: @ 853DC64 map_events 0x0, NavelRock_Down05_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Down06.inc b/data/maps/events/NavelRock_Down06.inc index c32dc9500b..0773677477 100644 --- a/data/maps/events/NavelRock_Down06.inc +++ b/data/maps/events/NavelRock_Down06.inc @@ -1,6 +1,6 @@ NavelRock_Down06_MapWarps: @ 853DC78 - warp_def 5, 5, 3, 1, NAVEL_ROCK_DOWN_05 - warp_def 3, 3, 3, 0, NAVEL_ROCK_DOWN_07 + warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN05 + warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN07 NavelRock_Down06_MapEvents:: @ 853DC88 map_events 0x0, NavelRock_Down06_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Down07.inc b/data/maps/events/NavelRock_Down07.inc index 35191f0baf..83f7ce9a68 100644 --- a/data/maps/events/NavelRock_Down07.inc +++ b/data/maps/events/NavelRock_Down07.inc @@ -1,6 +1,6 @@ NavelRock_Down07_MapWarps: @ 853DC9C - warp_def 3, 3, 3, 1, NAVEL_ROCK_DOWN_06 - warp_def 5, 5, 3, 0, NAVEL_ROCK_DOWN_08 + warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN06 + warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN08 NavelRock_Down07_MapEvents:: @ 853DCAC map_events 0x0, NavelRock_Down07_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Down08.inc b/data/maps/events/NavelRock_Down08.inc index a55307cfa4..38bef10e88 100644 --- a/data/maps/events/NavelRock_Down08.inc +++ b/data/maps/events/NavelRock_Down08.inc @@ -1,6 +1,6 @@ NavelRock_Down08_MapWarps: @ 853DCC0 - warp_def 5, 5, 3, 1, NAVEL_ROCK_DOWN_07 - warp_def 3, 3, 3, 0, NAVEL_ROCK_DOWN_09 + warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN07 + warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN09 NavelRock_Down08_MapEvents:: @ 853DCD0 map_events 0x0, NavelRock_Down08_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Down09.inc b/data/maps/events/NavelRock_Down09.inc index 7816eb358a..e3843e7591 100644 --- a/data/maps/events/NavelRock_Down09.inc +++ b/data/maps/events/NavelRock_Down09.inc @@ -1,6 +1,6 @@ NavelRock_Down09_MapWarps: @ 853DCE4 - warp_def 3, 3, 3, 1, NAVEL_ROCK_DOWN_08 - warp_def 5, 5, 3, 0, NAVEL_ROCK_DOWN_10 + warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN08 + warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN10 NavelRock_Down09_MapEvents:: @ 853DCF4 map_events 0x0, NavelRock_Down09_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Down10.inc b/data/maps/events/NavelRock_Down10.inc index 20e7ac6cd1..805e399b48 100644 --- a/data/maps/events/NavelRock_Down10.inc +++ b/data/maps/events/NavelRock_Down10.inc @@ -1,6 +1,6 @@ NavelRock_Down10_MapWarps: @ 853DD08 - warp_def 5, 5, 3, 1, NAVEL_ROCK_DOWN_09 - warp_def 3, 3, 3, 1, NAVEL_ROCK_DOWN_11 + warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN09 + warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN11 NavelRock_Down10_MapEvents:: @ 853DD18 map_events 0x0, NavelRock_Down10_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Down11.inc b/data/maps/events/NavelRock_Down11.inc index eea34db90a..505a6ed6d4 100644 --- a/data/maps/events/NavelRock_Down11.inc +++ b/data/maps/events/NavelRock_Down11.inc @@ -1,6 +1,6 @@ NavelRock_Down11_MapWarps: @ 853DD2C - warp_def 5, 5, 3, 0, NAVEL_ROCK_BOTTOM - warp_def 3, 3, 3, 1, NAVEL_ROCK_DOWN_10 + warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_BOTTOM + warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN10 NavelRock_Down11_MapEvents:: @ 853DD3C map_events 0x0, NavelRock_Down11_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Entrance.inc b/data/maps/events/NavelRock_Entrance.inc index 9d470a8640..ee45485a72 100644 --- a/data/maps/events/NavelRock_Entrance.inc +++ b/data/maps/events/NavelRock_Entrance.inc @@ -1,6 +1,6 @@ NavelRock_Entrance_MapWarps: @ 853DA70 - warp_def 10, 5, 3, 0, NAVEL_ROCK_B1F - warp_def 10, 26, 3, 1, NAVEL_ROCK_EXTERIOR + warp_def 10, 5, 3, 0, MAP_NAVEL_ROCK_B1F + warp_def 10, 26, 3, 1, MAP_NAVEL_ROCK_EXTERIOR NavelRock_Entrance_MapEvents:: @ 853DA80 map_events 0x0, NavelRock_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Exterior.inc b/data/maps/events/NavelRock_Exterior.inc index 57a6d5a6e5..66bbf376f1 100644 --- a/data/maps/events/NavelRock_Exterior.inc +++ b/data/maps/events/NavelRock_Exterior.inc @@ -1,6 +1,6 @@ NavelRock_Exterior_MapWarps: @ 853DA00 - warp_def 10, 18, 0, 0, NAVEL_ROCK_HARBOR - warp_def 10, 10, 0, 1, NAVEL_ROCK_ENTRANCE + warp_def 10, 18, 0, 0, MAP_NAVEL_ROCK_HARBOR + warp_def 10, 10, 0, 1, MAP_NAVEL_ROCK_ENTRANCE NavelRock_Exterior_MapEvents:: @ 853DA10 map_events 0x0, NavelRock_Exterior_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Fork.inc b/data/maps/events/NavelRock_Fork.inc index 4e3f5a8018..869dc0f089 100644 --- a/data/maps/events/NavelRock_Fork.inc +++ b/data/maps/events/NavelRock_Fork.inc @@ -1,7 +1,7 @@ NavelRock_Fork_MapWarps: @ 853DAB8 - warp_def 4, 6, 3, 0, NAVEL_ROCK_UP_1 - warp_def 11, 79, 3, 1, NAVEL_ROCK_B1F - warp_def 22, 6, 3, 0, NAVEL_ROCK_DOWN_01 + warp_def 4, 6, 3, 0, MAP_NAVEL_ROCK_UP1 + warp_def 11, 79, 3, 1, MAP_NAVEL_ROCK_B1F + warp_def 22, 6, 3, 0, MAP_NAVEL_ROCK_DOWN01 NavelRock_Fork_MapEvents:: @ 853DAD0 map_events 0x0, NavelRock_Fork_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Harbor.inc b/data/maps/events/NavelRock_Harbor.inc index 21102a4749..04b452b4ed 100644 --- a/data/maps/events/NavelRock_Harbor.inc +++ b/data/maps/events/NavelRock_Harbor.inc @@ -3,7 +3,7 @@ NavelRock_Harbor_EventObjects: @ 853DA24 object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 8, 7, 1, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 NavelRock_Harbor_MapWarps: @ 853DA54 - warp_def 8, 2, 0, 0, NAVEL_ROCK_EXTERIOR + warp_def 8, 2, 0, 0, MAP_NAVEL_ROCK_EXTERIOR NavelRock_Harbor_MapEvents:: @ 853DA5C map_events NavelRock_Harbor_EventObjects, NavelRock_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Top.inc b/data/maps/events/NavelRock_Top.inc index 34e93223f5..65618f8ea5 100644 --- a/data/maps/events/NavelRock_Top.inc +++ b/data/maps/events/NavelRock_Top.inc @@ -2,7 +2,7 @@ NavelRock_Top_EventObjects: @ 853DB74 object_event 1, EVENT_OBJ_GFX_HOOH, 0, 0, 12, 4, 0, 8, 17, 0, 0, 0, 0x0, 801, 0, 0 NavelRock_Top_MapWarps: @ 853DB8C - warp_def 13, 20, 3, 1, NAVEL_ROCK_UP_4 + warp_def 13, 20, 3, 1, MAP_NAVEL_ROCK_UP4 NavelRock_Top_MapCoordEvents: @ 853DB94 coord_event 12, 10, 3, 0, VAR_TEMP_1, 0, 0, NavelRock_Top_EventScript_26916F diff --git a/data/maps/events/NavelRock_Up1.inc b/data/maps/events/NavelRock_Up1.inc index 292278a856..fd0741a6a9 100644 --- a/data/maps/events/NavelRock_Up1.inc +++ b/data/maps/events/NavelRock_Up1.inc @@ -1,6 +1,6 @@ NavelRock_Up1_MapWarps: @ 853DAE4 - warp_def 5, 5, 3, 0, NAVEL_ROCK_FORK - warp_def 3, 3, 3, 0, NAVEL_ROCK_UP_2 + warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_FORK + warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_UP2 NavelRock_Up1_MapEvents:: @ 853DAF4 map_events 0x0, NavelRock_Up1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Up2.inc b/data/maps/events/NavelRock_Up2.inc index 55c4b4315e..bd142b9972 100644 --- a/data/maps/events/NavelRock_Up2.inc +++ b/data/maps/events/NavelRock_Up2.inc @@ -1,6 +1,6 @@ NavelRock_Up2_MapWarps: @ 853DB08 - warp_def 3, 3, 3, 1, NAVEL_ROCK_UP_1 - warp_def 5, 5, 3, 0, NAVEL_ROCK_UP_3 + warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_UP1 + warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_UP3 NavelRock_Up2_MapEvents:: @ 853DB18 map_events 0x0, NavelRock_Up2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Up3.inc b/data/maps/events/NavelRock_Up3.inc index c67cc7b179..9491e5dac2 100644 --- a/data/maps/events/NavelRock_Up3.inc +++ b/data/maps/events/NavelRock_Up3.inc @@ -1,6 +1,6 @@ NavelRock_Up3_MapWarps: @ 853DB2C - warp_def 5, 5, 3, 1, NAVEL_ROCK_UP_2 - warp_def 3, 3, 3, 0, NAVEL_ROCK_UP_4 + warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_UP2 + warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_UP4 NavelRock_Up3_MapEvents:: @ 853DB3C map_events 0x0, NavelRock_Up3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Up4.inc b/data/maps/events/NavelRock_Up4.inc index c1091ae52a..3d81f15231 100644 --- a/data/maps/events/NavelRock_Up4.inc +++ b/data/maps/events/NavelRock_Up4.inc @@ -1,6 +1,6 @@ NavelRock_Up4_MapWarps: @ 853DB50 - warp_def 3, 3, 3, 1, NAVEL_ROCK_UP_3 - warp_def 5, 5, 3, 0, NAVEL_ROCK_TOP + warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_UP3 + warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_TOP NavelRock_Up4_MapEvents:: @ 853DB60 map_events 0x0, NavelRock_Up4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NewMauville_Entrance.inc b/data/maps/events/NewMauville_Entrance.inc index 876841b6d4..29f46af201 100644 --- a/data/maps/events/NewMauville_Entrance.inc +++ b/data/maps/events/NewMauville_Entrance.inc @@ -1,6 +1,6 @@ NewMauville_Entrance_MapWarps: @ 8536474 - warp_def 4, 6, 3, 0, ROUTE_110 - warp_def 4, 1, 3, 0, NEW_MAUVILLE_INSIDE + warp_def 4, 6, 3, 0, MAP_ROUTE110 + warp_def 4, 1, 3, 0, MAP_NEW_MAUVILLE_INSIDE NewMauville_Entrance_MapCoordEvents: @ 8536484 coord_event 4, 2, 3, 0, VAR_0x40BA, 0, 0, NewMauville_Entrance_EventScript_2372FF diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/events/NewMauville_Inside.inc index 141fd04d4b..41ef85fcee 100644 --- a/data/maps/events/NewMauville_Inside.inc +++ b/data/maps/events/NewMauville_Inside.inc @@ -9,7 +9,7 @@ NewMauville_Inside_EventObjects: @ 85364A8 object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 10, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_237849, 976, 0, 0 NewMauville_Inside_MapWarps: @ 8536568 - warp_def 32, 33, 3, 1, NEW_MAUVILLE_ENTRANCE + warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE NewMauville_Inside_MapCoordEvents: @ 8536570 coord_event 30, 38, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_237459 diff --git a/data/maps/events/OldaleTown.inc b/data/maps/events/OldaleTown.inc index 6278db4281..46fc07609a 100644 --- a/data/maps/events/OldaleTown.inc +++ b/data/maps/events/OldaleTown.inc @@ -5,10 +5,10 @@ OldaleTown_EventObjects: @ 8527854 object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 0, 11, 19, 3, 7, 17, 0, 0, 0, OldaleTown_EventScript_1E9070, 979, 0, 0 OldaleTown_MapWarps: @ 85278B4 - warp_def 5, 7, 0, 0, OLDALE_TOWN_HOUSE_1 - warp_def 15, 16, 0, 0, OLDALE_TOWN_HOUSE_2 - warp_def 6, 16, 0, 0, OLDALE_TOWN_POKEMON_CENTER_1F - warp_def 14, 6, 0, 0, OLDALE_TOWN_MART + warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1 + warp_def 15, 16, 0, 0, MAP_OLDALE_TOWN_HOUSE2 + warp_def 6, 16, 0, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_1F + warp_def 14, 6, 0, 0, MAP_OLDALE_TOWN_MART OldaleTown_MapCoordEvents: @ 85278D4 coord_event 0, 10, 3, 0, VAR_0x4051, 0, 0, OldaleTown_EventScript_1E903F diff --git a/data/maps/events/OldaleTown_House1.inc b/data/maps/events/OldaleTown_House1.inc index 93ffb8d726..6b8cf653bf 100644 --- a/data/maps/events/OldaleTown_House1.inc +++ b/data/maps/events/OldaleTown_House1.inc @@ -2,8 +2,8 @@ OldaleTown_House1_EventObjects: @ 852D7B4 object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0, 0, 0 OldaleTown_House1_MapWarps: @ 852D7CC - warp_def 3, 8, 0, 0, OLDALE_TOWN - warp_def 4, 8, 0, 0, OLDALE_TOWN + warp_def 3, 8, 0, 0, MAP_OLDALE_TOWN + warp_def 4, 8, 0, 0, MAP_OLDALE_TOWN OldaleTown_House1_MapEvents:: @ 852D7DC map_events OldaleTown_House1_EventObjects, OldaleTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_House2.inc b/data/maps/events/OldaleTown_House2.inc index 4744874236..b083217ced 100644 --- a/data/maps/events/OldaleTown_House2.inc +++ b/data/maps/events/OldaleTown_House2.inc @@ -3,8 +3,8 @@ OldaleTown_House2_EventObjects: @ 852D7F0 object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF64, 0, 0, 0 OldaleTown_House2_MapWarps: @ 852D820 - warp_def 3, 7, 0, 1, OLDALE_TOWN - warp_def 4, 7, 0, 1, OLDALE_TOWN + warp_def 3, 7, 0, 1, MAP_OLDALE_TOWN + warp_def 4, 7, 0, 1, MAP_OLDALE_TOWN OldaleTown_House2_MapEvents:: @ 852D830 map_events OldaleTown_House2_EventObjects, OldaleTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_Mart.inc b/data/maps/events/OldaleTown_Mart.inc index 57e963cd59..ac5678a51b 100644 --- a/data/maps/events/OldaleTown_Mart.inc +++ b/data/maps/events/OldaleTown_Mart.inc @@ -4,8 +4,8 @@ OldaleTown_Mart_EventObjects: @ 852D95C object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 9, 4, 3, 3, 16, 0, 0, 0, OldaleTown_Mart_EventScript_1FC2A9, 0, 0, 0 OldaleTown_Mart_MapWarps: @ 852D9A4 - warp_def 3, 7, 0, 3, OLDALE_TOWN - warp_def 4, 7, 0, 3, OLDALE_TOWN + warp_def 3, 7, 0, 3, MAP_OLDALE_TOWN + warp_def 4, 7, 0, 3, MAP_OLDALE_TOWN OldaleTown_Mart_MapEvents:: @ 852D9B4 map_events OldaleTown_Mart_EventObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_PokemonCenter_1F.inc b/data/maps/events/OldaleTown_PokemonCenter_1F.inc index 65465578b3..f8e16522c4 100644 --- a/data/maps/events/OldaleTown_PokemonCenter_1F.inc +++ b/data/maps/events/OldaleTown_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ OldaleTown_PokemonCenter_1F_EventObjects: @ 852D844 object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 3, 7, 3, 10, 17, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC03A, 0, 0, 0 OldaleTown_PokemonCenter_1F_MapWarps: @ 852D8A4 - warp_def 7, 8, 3, 2, OLDALE_TOWN - warp_def 6, 8, 3, 2, OLDALE_TOWN - warp_def 1, 6, 4, 0, OLDALE_TOWN_POKEMON_CENTER_2F + warp_def 7, 8, 3, 2, MAP_OLDALE_TOWN + warp_def 6, 8, 3, 2, MAP_OLDALE_TOWN + warp_def 1, 6, 4, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_2F OldaleTown_PokemonCenter_1F_MapEvents:: @ 852D8BC map_events OldaleTown_PokemonCenter_1F_EventObjects, OldaleTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_PokemonCenter_2F.inc b/data/maps/events/OldaleTown_PokemonCenter_2F.inc index cbf3356a0c..c71b8608de 100644 --- a/data/maps/events/OldaleTown_PokemonCenter_2F.inc +++ b/data/maps/events/OldaleTown_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ OldaleTown_PokemonCenter_2F_EventObjects: @ 852D8D0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 OldaleTown_PokemonCenter_2F_MapWarps: @ 852D930 - warp_def 1, 6, 4, 2, OLDALE_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_OLDALE_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER OldaleTown_PokemonCenter_2F_MapEvents:: @ 852D948 map_events OldaleTown_PokemonCenter_2F_EventObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown.inc b/data/maps/events/PacifidlogTown.inc index b0df30af1b..1430294e24 100644 --- a/data/maps/events/PacifidlogTown.inc +++ b/data/maps/events/PacifidlogTown.inc @@ -4,12 +4,12 @@ PacifidlogTown_EventObjects: @ 8527DE8 object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 9, 16, 3, 8, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0, 0, 0 PacifidlogTown_MapWarps: @ 8527E30 - warp_def 8, 15, 0, 0, PACIFIDLOG_TOWN_POKEMON_CENTER_1F - warp_def 16, 13, 0, 0, PACIFIDLOG_TOWN_HOUSE_1 - warp_def 3, 22, 0, 0, PACIFIDLOG_TOWN_HOUSE_2 - warp_def 12, 24, 0, 0, PACIFIDLOG_TOWN_HOUSE_3 - warp_def 2, 12, 0, 0, PACIFIDLOG_TOWN_HOUSE_4 - warp_def 17, 21, 0, 0, PACIFIDLOG_TOWN_HOUSE_5 + warp_def 8, 15, 0, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F + warp_def 16, 13, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE1 + warp_def 3, 22, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE2 + warp_def 12, 24, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE3 + warp_def 2, 12, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE4 + warp_def 17, 21, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE5 PacifidlogTown_MapBGEvents: @ 8527E60 bg_event 9, 15, 0, 1, 0, PacifidlogTown_EventScript_271E73 diff --git a/data/maps/events/PacifidlogTown_House1.inc b/data/maps/events/PacifidlogTown_House1.inc index a60d8eedc4..5734b534a9 100644 --- a/data/maps/events/PacifidlogTown_House1.inc +++ b/data/maps/events/PacifidlogTown_House1.inc @@ -3,8 +3,8 @@ PacifidlogTown_House1_EventObjects: @ 852EBA0 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 6, 4, 3, 9, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0, 0, 0 PacifidlogTown_House1_MapWarps: @ 852EBD0 - warp_def 4, 8, 0, 1, PACIFIDLOG_TOWN - warp_def 5, 8, 0, 1, PACIFIDLOG_TOWN + warp_def 4, 8, 0, 1, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 1, MAP_PACIFIDLOG_TOWN PacifidlogTown_House1_MapEvents:: @ 852EBE0 map_events PacifidlogTown_House1_EventObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House2.inc b/data/maps/events/PacifidlogTown_House2.inc index 26147f726d..1933cc143e 100644 --- a/data/maps/events/PacifidlogTown_House2.inc +++ b/data/maps/events/PacifidlogTown_House2.inc @@ -4,8 +4,8 @@ PacifidlogTown_House2_EventObjects: @ 852EBF4 object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 0, 1, 7, 3, 1, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_2038AC, 0, 0, 0 PacifidlogTown_House2_MapWarps: @ 852EC3C - warp_def 4, 8, 0, 2, PACIFIDLOG_TOWN - warp_def 5, 8, 0, 2, PACIFIDLOG_TOWN + warp_def 4, 8, 0, 2, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 2, MAP_PACIFIDLOG_TOWN PacifidlogTown_House2_MapEvents:: @ 852EC4C map_events PacifidlogTown_House2_EventObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House3.inc b/data/maps/events/PacifidlogTown_House3.inc index 8f32929366..b8573a4347 100644 --- a/data/maps/events/PacifidlogTown_House3.inc +++ b/data/maps/events/PacifidlogTown_House3.inc @@ -3,8 +3,8 @@ PacifidlogTown_House3_EventObjects: @ 852EC60 object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 2, 3, 10, 17, 0, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0, 0, 0 PacifidlogTown_House3_MapWarps: @ 852EC90 - warp_def 4, 8, 0, 3, PACIFIDLOG_TOWN - warp_def 5, 8, 0, 3, PACIFIDLOG_TOWN + warp_def 4, 8, 0, 3, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 3, MAP_PACIFIDLOG_TOWN PacifidlogTown_House3_MapEvents:: @ 852ECA0 map_events PacifidlogTown_House3_EventObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House4.inc b/data/maps/events/PacifidlogTown_House4.inc index 1d88d3be79..8363ff2aeb 100644 --- a/data/maps/events/PacifidlogTown_House4.inc +++ b/data/maps/events/PacifidlogTown_House4.inc @@ -4,8 +4,8 @@ PacifidlogTown_House4_EventObjects: @ 852ECB4 object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, PacifidlogTown_House4_EventScript_203F5E, 0, 0, 0 PacifidlogTown_House4_MapWarps: @ 852ECFC - warp_def 4, 8, 0, 4, PACIFIDLOG_TOWN - warp_def 5, 8, 0, 4, PACIFIDLOG_TOWN + warp_def 4, 8, 0, 4, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 4, MAP_PACIFIDLOG_TOWN PacifidlogTown_House4_MapEvents:: @ 852ED0C map_events PacifidlogTown_House4_EventObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House5.inc b/data/maps/events/PacifidlogTown_House5.inc index 51cbaaa392..9c8ce51fa6 100644 --- a/data/maps/events/PacifidlogTown_House5.inc +++ b/data/maps/events/PacifidlogTown_House5.inc @@ -3,8 +3,8 @@ PacifidlogTown_House5_EventObjects: @ 852ED20 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 3, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204137, 0, 0, 0 PacifidlogTown_House5_MapWarps: @ 852ED50 - warp_def 4, 8, 0, 5, PACIFIDLOG_TOWN - warp_def 5, 8, 0, 5, PACIFIDLOG_TOWN + warp_def 4, 8, 0, 5, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 5, MAP_PACIFIDLOG_TOWN PacifidlogTown_House5_MapEvents:: @ 852ED60 map_events PacifidlogTown_House5_EventObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc index f67b4269e4..6448139c35 100644 --- a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc +++ b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc @@ -6,9 +6,9 @@ PacifidlogTown_PokemonCenter_1F_EventObjects: @ 852EA70 object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 0, 12, 8, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0, 0, 0 PacifidlogTown_PokemonCenter_1F_MapWarps: @ 852EAE8 - warp_def 7, 8, 3, 0, PACIFIDLOG_TOWN - warp_def 6, 8, 3, 0, PACIFIDLOG_TOWN - warp_def 1, 6, 4, 0, PACIFIDLOG_TOWN_POKEMON_CENTER_2F + warp_def 7, 8, 3, 0, MAP_PACIFIDLOG_TOWN + warp_def 6, 8, 3, 0, MAP_PACIFIDLOG_TOWN + warp_def 1, 6, 4, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F PacifidlogTown_PokemonCenter_1F_MapEvents:: @ 852EB00 map_events PacifidlogTown_PokemonCenter_1F_EventObjects, PacifidlogTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc index 26b9cf591b..2750b18300 100644 --- a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc +++ b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ PacifidlogTown_PokemonCenter_2F_EventObjects: @ 852EB14 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 PacifidlogTown_PokemonCenter_2F_MapWarps: @ 852EB74 - warp_def 1, 6, 4, 2, PACIFIDLOG_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER PacifidlogTown_PokemonCenter_2F_MapEvents:: @ 852EB8C map_events PacifidlogTown_PokemonCenter_2F_EventObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/events/PetalburgCity.inc index 171790f567..b8baf44377 100644 --- a/data/maps/events/PetalburgCity.inc +++ b/data/maps/events/PetalburgCity.inc @@ -10,12 +10,12 @@ PetalburgCity_EventObjects: @ 8525FD0 object_event 9, EVENT_OBJ_GFX_SCOTT, 0, 0, 13, 12, 3, 1, 17, 0, 0, 0, 0x0, 995, 0, 0 PetalburgCity_MapWarps: @ 85260A8 - warp_def 10, 19, 0, 0, PETALBURG_CITY_HOUSE_1 - warp_def 7, 5, 0, 0, PETALBURG_CITY_WALLYS_HOUSE - warp_def 15, 8, 0, 0, PETALBURG_CITY_GYM - warp_def 20, 16, 0, 0, PETALBURG_CITY_POKEMON_CENTER_1F - warp_def 20, 24, 0, 0, PETALBURG_CITY_HOUSE_2 - warp_def 25, 12, 0, 0, PETALBURG_CITY_MART + warp_def 10, 19, 0, 0, MAP_PETALBURG_CITY_HOUSE1 + warp_def 7, 5, 0, 0, MAP_PETALBURG_CITY_WALLYS_HOUSE + warp_def 15, 8, 0, 0, MAP_PETALBURG_CITY_GYM + warp_def 20, 16, 0, 0, MAP_PETALBURG_CITY_POKEMON_CENTER_1F + warp_def 20, 24, 0, 0, MAP_PETALBURG_CITY_HOUSE2 + warp_def 25, 12, 0, 0, MAP_PETALBURG_CITY_MART PetalburgCity_MapCoordEvents: @ 85260D8 coord_event 8, 10, 3, 0, VAR_0x4057, 0, 0, PetalburgCity_EventScript_1DC49A diff --git a/data/maps/events/PetalburgCity_Gym.inc b/data/maps/events/PetalburgCity_Gym.inc index bdd6d2da42..051c825490 100644 --- a/data/maps/events/PetalburgCity_Gym.inc +++ b/data/maps/events/PetalburgCity_Gym.inc @@ -12,44 +12,44 @@ PetalburgCity_Gym_EventObjects: @ 852EDC8 object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 0, 1, 7, 3, 7, 17, 0, 0, 0, 0x0, 824, 0, 0 PetalburgCity_Gym_MapWarps: @ 852EED0 - warp_def 4, 111, 3, 2, PETALBURG_CITY - warp_def 5, 111, 3, 2, PETALBURG_CITY - warp_def 1, 105, 3, 3, PETALBURG_CITY_GYM - warp_def 7, 85, 3, 2, PETALBURG_CITY_GYM - warp_def 6, 85, 3, 2, PETALBURG_CITY_GYM - warp_def 7, 105, 3, 6, PETALBURG_CITY_GYM - warp_def 1, 98, 3, 5, PETALBURG_CITY_GYM - warp_def 2, 98, 3, 5, PETALBURG_CITY_GYM - warp_def 1, 79, 3, 10, PETALBURG_CITY_GYM - warp_def 7, 79, 3, 12, PETALBURG_CITY_GYM - warp_def 7, 46, 3, 8, PETALBURG_CITY_GYM - warp_def 6, 46, 3, 8, PETALBURG_CITY_GYM - warp_def 1, 59, 3, 9, PETALBURG_CITY_GYM - warp_def 2, 59, 3, 9, PETALBURG_CITY_GYM - warp_def 1, 92, 3, 16, PETALBURG_CITY_GYM - warp_def 7, 92, 3, 18, PETALBURG_CITY_GYM - warp_def 7, 59, 3, 14, PETALBURG_CITY_GYM - warp_def 6, 59, 3, 14, PETALBURG_CITY_GYM - warp_def 1, 72, 3, 15, PETALBURG_CITY_GYM - warp_def 2, 72, 3, 15, PETALBURG_CITY_GYM - warp_def 7, 40, 3, 24, PETALBURG_CITY_GYM - warp_def 1, 53, 3, 26, PETALBURG_CITY_GYM - warp_def 7, 53, 3, 28, PETALBURG_CITY_GYM - warp_def 1, 66, 3, 30, PETALBURG_CITY_GYM - warp_def 1, 20, 3, 20, PETALBURG_CITY_GYM - warp_def 2, 20, 3, 20, PETALBURG_CITY_GYM - warp_def 7, 20, 3, 21, PETALBURG_CITY_GYM - warp_def 6, 20, 3, 21, PETALBURG_CITY_GYM - warp_def 1, 33, 3, 22, PETALBURG_CITY_GYM - warp_def 2, 33, 3, 22, PETALBURG_CITY_GYM - warp_def 7, 33, 3, 23, PETALBURG_CITY_GYM - warp_def 6, 33, 3, 23, PETALBURG_CITY_GYM - warp_def 7, 14, 3, 34, PETALBURG_CITY_GYM - warp_def 1, 27, 3, 36, PETALBURG_CITY_GYM - warp_def 1, 7, 3, 32, PETALBURG_CITY_GYM - warp_def 2, 7, 3, 32, PETALBURG_CITY_GYM - warp_def 7, 7, 3, 33, PETALBURG_CITY_GYM - warp_def 6, 7, 3, 33, PETALBURG_CITY_GYM + warp_def 4, 111, 3, 2, MAP_PETALBURG_CITY + warp_def 5, 111, 3, 2, MAP_PETALBURG_CITY + warp_def 1, 105, 3, 3, MAP_PETALBURG_CITY_GYM + warp_def 7, 85, 3, 2, MAP_PETALBURG_CITY_GYM + warp_def 6, 85, 3, 2, MAP_PETALBURG_CITY_GYM + warp_def 7, 105, 3, 6, MAP_PETALBURG_CITY_GYM + warp_def 1, 98, 3, 5, MAP_PETALBURG_CITY_GYM + warp_def 2, 98, 3, 5, MAP_PETALBURG_CITY_GYM + warp_def 1, 79, 3, 10, MAP_PETALBURG_CITY_GYM + warp_def 7, 79, 3, 12, MAP_PETALBURG_CITY_GYM + warp_def 7, 46, 3, 8, MAP_PETALBURG_CITY_GYM + warp_def 6, 46, 3, 8, MAP_PETALBURG_CITY_GYM + warp_def 1, 59, 3, 9, MAP_PETALBURG_CITY_GYM + warp_def 2, 59, 3, 9, MAP_PETALBURG_CITY_GYM + warp_def 1, 92, 3, 16, MAP_PETALBURG_CITY_GYM + warp_def 7, 92, 3, 18, MAP_PETALBURG_CITY_GYM + warp_def 7, 59, 3, 14, MAP_PETALBURG_CITY_GYM + warp_def 6, 59, 3, 14, MAP_PETALBURG_CITY_GYM + warp_def 1, 72, 3, 15, MAP_PETALBURG_CITY_GYM + warp_def 2, 72, 3, 15, MAP_PETALBURG_CITY_GYM + warp_def 7, 40, 3, 24, MAP_PETALBURG_CITY_GYM + warp_def 1, 53, 3, 26, MAP_PETALBURG_CITY_GYM + warp_def 7, 53, 3, 28, MAP_PETALBURG_CITY_GYM + warp_def 1, 66, 3, 30, MAP_PETALBURG_CITY_GYM + warp_def 1, 20, 3, 20, MAP_PETALBURG_CITY_GYM + warp_def 2, 20, 3, 20, MAP_PETALBURG_CITY_GYM + warp_def 7, 20, 3, 21, MAP_PETALBURG_CITY_GYM + warp_def 6, 20, 3, 21, MAP_PETALBURG_CITY_GYM + warp_def 1, 33, 3, 22, MAP_PETALBURG_CITY_GYM + warp_def 2, 33, 3, 22, MAP_PETALBURG_CITY_GYM + warp_def 7, 33, 3, 23, MAP_PETALBURG_CITY_GYM + warp_def 6, 33, 3, 23, MAP_PETALBURG_CITY_GYM + warp_def 7, 14, 3, 34, MAP_PETALBURG_CITY_GYM + warp_def 1, 27, 3, 36, MAP_PETALBURG_CITY_GYM + warp_def 1, 7, 3, 32, MAP_PETALBURG_CITY_GYM + warp_def 2, 7, 3, 32, MAP_PETALBURG_CITY_GYM + warp_def 7, 7, 3, 33, MAP_PETALBURG_CITY_GYM + warp_def 6, 7, 3, 33, MAP_PETALBURG_CITY_GYM PetalburgCity_Gym_MapBGEvents: @ 852F000 bg_event 1, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_205137 diff --git a/data/maps/events/PetalburgCity_House1.inc b/data/maps/events/PetalburgCity_House1.inc index c078d68763..2727161ff5 100644 --- a/data/maps/events/PetalburgCity_House1.inc +++ b/data/maps/events/PetalburgCity_House1.inc @@ -3,8 +3,8 @@ PetalburgCity_House1_EventObjects: @ 852F0BC object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0, 0, 0 PetalburgCity_House1_MapWarps: @ 852F0EC - warp_def 3, 8, 0, 0, PETALBURG_CITY - warp_def 4, 8, 0, 0, PETALBURG_CITY + warp_def 3, 8, 0, 0, MAP_PETALBURG_CITY + warp_def 4, 8, 0, 0, MAP_PETALBURG_CITY PetalburgCity_House1_MapEvents:: @ 852F0FC map_events PetalburgCity_House1_EventObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_House2.inc b/data/maps/events/PetalburgCity_House2.inc index b6570b5e95..26cc075682 100644 --- a/data/maps/events/PetalburgCity_House2.inc +++ b/data/maps/events/PetalburgCity_House2.inc @@ -3,8 +3,8 @@ PetalburgCity_House2_EventObjects: @ 852F110 object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, PetalburgCity_House2_EventScript_2078FC, 0, 0, 0 PetalburgCity_House2_MapWarps: @ 852F140 - warp_def 3, 7, 0, 4, PETALBURG_CITY - warp_def 4, 7, 0, 4, PETALBURG_CITY + warp_def 3, 7, 0, 4, MAP_PETALBURG_CITY + warp_def 4, 7, 0, 4, MAP_PETALBURG_CITY PetalburgCity_House2_MapEvents:: @ 852F150 map_events PetalburgCity_House2_EventObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_Mart.inc b/data/maps/events/PetalburgCity_Mart.inc index 0413f795a0..d717f14d1a 100644 --- a/data/maps/events/PetalburgCity_Mart.inc +++ b/data/maps/events/PetalburgCity_Mart.inc @@ -5,8 +5,8 @@ PetalburgCity_Mart_EventObjects: @ 852F294 object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0, 0, 0 PetalburgCity_Mart_MapWarps: @ 852F2F4 - warp_def 3, 7, 0, 5, PETALBURG_CITY - warp_def 4, 7, 0, 5, PETALBURG_CITY + warp_def 3, 7, 0, 5, MAP_PETALBURG_CITY + warp_def 4, 7, 0, 5, MAP_PETALBURG_CITY PetalburgCity_Mart_MapEvents:: @ 852F304 map_events PetalburgCity_Mart_EventObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc index 5c940de5ab..fcb50b871a 100644 --- a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc +++ b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc @@ -6,9 +6,9 @@ PetalburgCity_PokemonCenter_1F_EventObjects: @ 852F164 object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 5, 4, 3, 1, 17, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0, 0, 0 PetalburgCity_PokemonCenter_1F_MapWarps: @ 852F1DC - warp_def 7, 8, 3, 3, PETALBURG_CITY - warp_def 6, 8, 3, 3, PETALBURG_CITY - warp_def 1, 6, 4, 0, PETALBURG_CITY_POKEMON_CENTER_2F + warp_def 7, 8, 3, 3, MAP_PETALBURG_CITY + warp_def 6, 8, 3, 3, MAP_PETALBURG_CITY + warp_def 1, 6, 4, 0, MAP_PETALBURG_CITY_POKEMON_CENTER_2F PetalburgCity_PokemonCenter_1F_MapEvents:: @ 852F1F4 map_events PetalburgCity_PokemonCenter_1F_EventObjects, PetalburgCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc index 99312ac964..3bdcdfb12d 100644 --- a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc +++ b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ PetalburgCity_PokemonCenter_2F_EventObjects: @ 852F208 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 PetalburgCity_PokemonCenter_2F_MapWarps: @ 852F268 - warp_def 1, 6, 4, 2, PETALBURG_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_PETALBURG_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER PetalburgCity_PokemonCenter_2F_MapEvents:: @ 852F280 map_events PetalburgCity_PokemonCenter_2F_EventObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_WallysHouse.inc b/data/maps/events/PetalburgCity_WallysHouse.inc index e7107f07a7..7516e89e17 100644 --- a/data/maps/events/PetalburgCity_WallysHouse.inc +++ b/data/maps/events/PetalburgCity_WallysHouse.inc @@ -3,8 +3,8 @@ PetalburgCity_WallysHouse_EventObjects: @ 852ED74 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0, 0, 0 PetalburgCity_WallysHouse_MapWarps: @ 852EDA4 - warp_def 3, 7, 0, 1, PETALBURG_CITY - warp_def 4, 7, 0, 1, PETALBURG_CITY + warp_def 3, 7, 0, 1, MAP_PETALBURG_CITY + warp_def 4, 7, 0, 1, MAP_PETALBURG_CITY PetalburgCity_WallysHouse_MapEvents:: @ 852EDB4 map_events PetalburgCity_WallysHouse_EventObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc index bb9b69f35c..70153850ce 100644 --- a/data/maps/events/PetalburgWoods.inc +++ b/data/maps/events/PetalburgWoods.inc @@ -14,12 +14,12 @@ PetalburgWoods_EventObjects: @ 85345E4 object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 0, 33, 5, 3, 1, 17, 0, 0, 0, PetalburgWoods_EventScript_22E222, 0, 0, 0 PetalburgWoods_MapWarps: @ 853471C - warp_def 14, 5, 0, 2, ROUTE_104 - warp_def 15, 5, 0, 3, ROUTE_104 - warp_def 16, 38, 0, 4, ROUTE_104 - warp_def 17, 38, 0, 5, ROUTE_104 - warp_def 36, 38, 0, 6, ROUTE_104 - warp_def 37, 38, 0, 7, ROUTE_104 + warp_def 14, 5, 0, 2, MAP_ROUTE104 + warp_def 15, 5, 0, 3, MAP_ROUTE104 + warp_def 16, 38, 0, 4, MAP_ROUTE104 + warp_def 17, 38, 0, 5, MAP_ROUTE104 + warp_def 36, 38, 0, 6, MAP_ROUTE104 + warp_def 37, 38, 0, 7, MAP_ROUTE104 PetalburgWoods_MapCoordEvents: @ 853474C coord_event 26, 23, 3, 0, VAR_0x4098, 0, 0, PetalburgWoods_EventScript_22DFD7 diff --git a/data/maps/events/RecordCorner.inc b/data/maps/events/RecordCorner.inc index ad9f6625de..f10ac533e4 100644 --- a/data/maps/events/RecordCorner.inc +++ b/data/maps/events/RecordCorner.inc @@ -2,10 +2,10 @@ RecordCorner_EventObjects: @ 8539DFC object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 10, 5, 3, 8, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0, 0, 0 RecordCorner_MapWarps: @ 8539E14 - warp_def 8, 9, 3, 127, NONE - warp_def 9, 9, 3, 127, NONE - warp_def 11, 9, 3, 127, NONE - warp_def 10, 9, 3, 127, NONE + warp_def 8, 9, 3, 127, MAP_NONE + warp_def 9, 9, 3, 127, MAP_NONE + warp_def 11, 9, 3, 127, MAP_NONE + warp_def 10, 9, 3, 127, MAP_NONE RecordCorner_MapCoordEvents: @ 8539E34 coord_event 6, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827741D diff --git a/data/maps/events/Route103.inc b/data/maps/events/Route103.inc index cdd07bab1d..6d8ab1306b 100644 --- a/data/maps/events/Route103.inc +++ b/data/maps/events/Route103.inc @@ -21,7 +21,7 @@ Route103_EventObjects: @ 85280DC object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 64, 7, 0, 1, 17, 0, 0, 0, Route103_EventScript_290CF2, 1137, 0, 0 Route103_MapWarps: @ 85282BC - warp_def 45, 6, 0, 0, ALTERING_CAVE + warp_def 45, 6, 0, 0, MAP_ALTERING_CAVE Route103_MapBGEvents: @ 85282C4 bg_event 11, 9, 0, 0, 0, Route103_EventScript_1EC5EB diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc index 66a9e0edb9..d4dd12b70d 100644 --- a/data/maps/events/Route104.inc +++ b/data/maps/events/Route104.inc @@ -35,14 +35,14 @@ Route104_EventObjects: @ 85282E4 object_event 34, EVENT_OBJ_GFX_HIPSTER, 0, 0, 17, 50, 0, 1, 17, 0, 0, 0, Route104_EventScript_1ECC9E, 719, 0, 0 Route104_MapWarps: @ 8528614 - warp_def 17, 50, 0, 0, ROUTE_104_MR_BRINEYS_HOUSE - warp_def 5, 18, 0, 0, ROUTE_104_PRETTY_PETAL_FLOWER_SHOP - warp_def 10, 30, 3, 0, PETALBURG_WOODS - warp_def 11, 30, 3, 1, PETALBURG_WOODS - warp_def 10, 38, 3, 2, PETALBURG_WOODS - warp_def 11, 38, 3, 3, PETALBURG_WOODS - warp_def 32, 42, 3, 4, PETALBURG_WOODS - warp_def 33, 42, 3, 5, PETALBURG_WOODS + warp_def 17, 50, 0, 0, MAP_ROUTE104_MR_BRINEYS_HOUSE + warp_def 5, 18, 0, 0, MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP + warp_def 10, 30, 3, 0, MAP_PETALBURG_WOODS + warp_def 11, 30, 3, 1, MAP_PETALBURG_WOODS + warp_def 10, 38, 3, 2, MAP_PETALBURG_WOODS + warp_def 11, 38, 3, 3, MAP_PETALBURG_WOODS + warp_def 32, 42, 3, 4, MAP_PETALBURG_WOODS + warp_def 33, 42, 3, 5, MAP_PETALBURG_WOODS Route104_MapCoordEvents: @ 8528654 coord_event 17, 51, 3, 0, VAR_0x4063, 1, 0, Route104_EventScript_1ECCB3 diff --git a/data/maps/events/Route104_MrBrineysHouse.inc b/data/maps/events/Route104_MrBrineysHouse.inc index 2088faf169..a1240dba4c 100644 --- a/data/maps/events/Route104_MrBrineysHouse.inc +++ b/data/maps/events/Route104_MrBrineysHouse.inc @@ -3,8 +3,8 @@ Route104_MrBrineysHouse_EventObjects: @ 8533AD4 object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 0, 6, 3, 3, 8, 51, 0, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, 881, 0, 0 Route104_MrBrineysHouse_MapWarps: @ 8533B04 - warp_def 5, 8, 0, 0, ROUTE_104 - warp_def 6, 8, 0, 0, ROUTE_104 + warp_def 5, 8, 0, 0, MAP_ROUTE104 + warp_def 6, 8, 0, 0, MAP_ROUTE104 Route104_MrBrineysHouse_MapEvents:: @ 8533B14 map_events Route104_MrBrineysHouse_EventObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route104_PrettyPetalFlowerShop.inc b/data/maps/events/Route104_PrettyPetalFlowerShop.inc index 2d6d7fe376..8464ada1d5 100644 --- a/data/maps/events/Route104_PrettyPetalFlowerShop.inc +++ b/data/maps/events/Route104_PrettyPetalFlowerShop.inc @@ -4,8 +4,8 @@ Route104_PrettyPetalFlowerShop_EventObjects: @ 8533B28 object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 0, 11, 6, 4, 2, 34, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A442, 0, 0, 0 Route104_PrettyPetalFlowerShop_MapWarps: @ 8533B70 - warp_def 2, 8, 0, 1, ROUTE_104 - warp_def 3, 8, 0, 1, ROUTE_104 + warp_def 2, 8, 0, 1, MAP_ROUTE104 + warp_def 3, 8, 0, 1, MAP_ROUTE104 Route104_PrettyPetalFlowerShop_MapEvents:: @ 8533B80 map_events Route104_PrettyPetalFlowerShop_EventObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route105.inc b/data/maps/events/Route105.inc index b7583aabdc..67a1c72bb6 100644 --- a/data/maps/events/Route105.inc +++ b/data/maps/events/Route105.inc @@ -9,7 +9,7 @@ Route105_EventObjects: @ 85286F0 object_event 8, EVENT_OBJ_GFX_HIKER, 0, 0, 4, 58, 3, 7, 32, 0, 1, 4, Route105_EventScript_1EE2D4, 0, 0, 0 Route105_MapWarps: @ 85287B0 - warp_def 9, 20, 0, 0, ISLAND_CAVE + warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE Route105_MapBGEvents: @ 85287B8 bg_event 15, 68, 3, 7, 0, ITEM_HEART_SCALE, 89, 0 diff --git a/data/maps/events/Route106.inc b/data/maps/events/Route106.inc index 866a894faa..aac7938118 100644 --- a/data/maps/events/Route106.inc +++ b/data/maps/events/Route106.inc @@ -6,7 +6,7 @@ Route106_EventObjects: @ 85287E4 object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 14, 3, 1, 0, 0, 0, 0, Route106_EventScript_290D40, 1004, 0, 0 Route106_MapWarps: @ 852885C - warp_def 48, 16, 0, 0, GRANITE_CAVE_1F + warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F Route106_MapBGEvents: @ 8528864 bg_event 41, 11, 3, 7, 0, ITEM_POKE_BALL, 63, 0 diff --git a/data/maps/events/Route108.inc b/data/maps/events/Route108.inc index 61a4b521a6..81c1fb79c3 100644 --- a/data/maps/events/Route108.inc +++ b/data/maps/events/Route108.inc @@ -8,7 +8,7 @@ Route108_EventObjects: @ 8528964 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 42, 4, 3, 1, 17, 0, 0, 0, Route108_EventScript_290D4D, 1139, 0, 0 Route108_MapWarps: @ 8528A0C - warp_def 29, 6, 3, 0, ABANDONED_SHIP_DECK + warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK Route108_MapBGEvents: @ 8528A14 bg_event 38, 14, 3, 7, 0, ITEM_RARE_CANDY, 86, 0 diff --git a/data/maps/events/Route109.inc b/data/maps/events/Route109.inc index d1e85b36c7..a5e210b51b 100644 --- a/data/maps/events/Route109.inc +++ b/data/maps/events/Route109.inc @@ -25,7 +25,7 @@ Route109_EventObjects: @ 8528A34 object_event 24, EVENT_OBJ_GFX_MAN_6, 0, 0, 17, 56, 3, 80, 17, 0, 1, 3, Route109_EventScript_1EEC06, 0, 0, 0 Route109_MapWarps: @ 8528C74 - warp_def 12, 5, 0, 0, ROUTE_109_SEASHORE_HOUSE + warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE Route109_MapBGEvents: @ 8528C7C bg_event 15, 5, 0, 0, 0, Route109_EventScript_1EEA2B diff --git a/data/maps/events/Route109_SeashoreHouse.inc b/data/maps/events/Route109_SeashoreHouse.inc index 7ded7ed230..d7d9ab49ad 100644 --- a/data/maps/events/Route109_SeashoreHouse.inc +++ b/data/maps/events/Route109_SeashoreHouse.inc @@ -5,8 +5,8 @@ Route109_SeashoreHouse_EventObjects: @ 853DDE8 object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 0, 10, 5, 3, 14, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694FD, 0, 0, 0 Route109_SeashoreHouse_MapWarps: @ 853DE48 - warp_def 6, 9, 0, 0, ROUTE_109 - warp_def 7, 9, 0, 0, ROUTE_109 + warp_def 6, 9, 0, 0, MAP_ROUTE109 + warp_def 7, 9, 0, 0, MAP_ROUTE109 Route109_SeashoreHouse_MapEvents:: @ 853DE58 map_events Route109_SeashoreHouse_EventObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc index 9dd5649fb8..5ba0484828 100644 --- a/data/maps/events/Route110.inc +++ b/data/maps/events/Route110.inc @@ -37,12 +37,12 @@ Route110_EventObjects: @ 8528CF0 object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 9, 79, 3, 1, 17, 0, 0, 0, 0x0, 837, 0, 0 Route110_MapWarps: @ 8529050 - warp_def 35, 24, 3, 0, NEW_MAUVILLE_ENTRANCE - warp_def 11, 66, 0, 0, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 15, 16, 0, 0, ROUTE_110_SEASIDE_CYCLING_ROAD_ENTRANCE_2 - warp_def 18, 16, 0, 2, ROUTE_110_SEASIDE_CYCLING_ROAD_ENTRANCE_2 - warp_def 16, 88, 0, 0, ROUTE_110_SEASIDE_CYCLING_ROAD_ENTRANCE_1 - warp_def 19, 88, 0, 2, ROUTE_110_SEASIDE_CYCLING_ROAD_ENTRANCE_1 + warp_def 35, 24, 3, 0, MAP_NEW_MAUVILLE_ENTRANCE + warp_def 11, 66, 0, 0, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 15, 16, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE + warp_def 18, 16, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE + warp_def 16, 88, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE + warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE Route110_MapCoordEvents: @ 8529080 coord_event 28, 92, 3, 0, VAR_0x40A9, 2, 0, Route110_EventScript_1EF661 diff --git a/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc b/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc index 23f896e4be..86f8883a36 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc +++ b/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc @@ -2,10 +2,10 @@ Route110_SeasideCyclingRoadEntrance1_EventObjects: @ 853E9A0 object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78, 0, 0, 0 Route110_SeasideCyclingRoadEntrance1_MapWarps: @ 853E9B8 - warp_def 1, 5, 0, 4, ROUTE_110 - warp_def 2, 5, 0, 4, ROUTE_110 - warp_def 12, 5, 0, 5, ROUTE_110 - warp_def 13, 5, 0, 5, ROUTE_110 + warp_def 1, 5, 0, 4, MAP_ROUTE110 + warp_def 2, 5, 0, 4, MAP_ROUTE110 + warp_def 12, 5, 0, 5, MAP_ROUTE110 + warp_def 13, 5, 0, 5, MAP_ROUTE110 Route110_SeasideCyclingRoadEntrance1_MapCoordEvents: @ 853E9D8 coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EA84 diff --git a/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc b/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc index f988f97519..245dc0eaf2 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc +++ b/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc @@ -2,10 +2,10 @@ Route110_SeasideCyclingRoadEntrance2_EventObjects: @ 853EA0C object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4, 0, 0, 0 Route110_SeasideCyclingRoadEntrance2_MapWarps: @ 853EA24 - warp_def 1, 5, 0, 2, ROUTE_110 - warp_def 2, 5, 0, 2, ROUTE_110 - warp_def 12, 5, 0, 3, ROUTE_110 - warp_def 13, 5, 0, 3, ROUTE_110 + warp_def 1, 5, 0, 2, MAP_ROUTE110 + warp_def 2, 5, 0, 2, MAP_ROUTE110 + warp_def 12, 5, 0, 3, MAP_ROUTE110 + warp_def 13, 5, 0, 3, MAP_ROUTE110 Route110_SeasideCyclingRoadEntrance2_MapCoordEvents: @ 853EA44 coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBD0 diff --git a/data/maps/events/Route110_TrickHouseCorridor.inc b/data/maps/events/Route110_TrickHouseCorridor.inc index eaef9c9a23..e9d84d56bd 100644 --- a/data/maps/events/Route110_TrickHouseCorridor.inc +++ b/data/maps/events/Route110_TrickHouseCorridor.inc @@ -1,8 +1,8 @@ Route110_TrickHouseCorridor_MapWarps: @ 853DF54 - warp_def 13, 3, 3, 1, ROUTE_110_TRICK_HOUSE_END - warp_def 14, 3, 3, 1, ROUTE_110_TRICK_HOUSE_END - warp_def 4, 23, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 5, 23, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE + warp_def 13, 3, 3, 1, MAP_ROUTE110_TRICK_HOUSE_END + warp_def 14, 3, 3, 1, MAP_ROUTE110_TRICK_HOUSE_END + warp_def 4, 23, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 5, 23, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE Route110_TrickHouseCorridor_MapEvents:: @ 853DF74 map_events 0x0, Route110_TrickHouseCorridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/events/Route110_TrickHouseEnd.inc index 62640ab29a..5acd3d9fb5 100644 --- a/data/maps/events/Route110_TrickHouseEnd.inc +++ b/data/maps/events/Route110_TrickHouseEnd.inc @@ -2,8 +2,8 @@ Route110_TrickHouseEnd_EventObjects: @ 853DEFC object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, 899, 0, 0 Route110_TrickHouseEnd_MapWarps: @ 853DF14 - warp_def 10, 1, 3, 2, ROUTE_110_TRICK_HOUSE_PUZZLE_1 - warp_def 2, 1, 3, 0, ROUTE_110_TRICK_HOUSE_CORRIDOR + warp_def 10, 1, 3, 2, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 + warp_def 2, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_CORRIDOR Route110_TrickHouseEnd_MapCoordEvents: @ 853DF24 coord_event 2, 2, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHouseEnd_EventScript_26B041 diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/events/Route110_TrickHouseEntrance.inc index c6a31119f4..ff7c2182e0 100644 --- a/data/maps/events/Route110_TrickHouseEntrance.inc +++ b/data/maps/events/Route110_TrickHouseEntrance.inc @@ -2,9 +2,9 @@ Route110_TrickHouseEntrance_EventObjects: @ 853DE6C object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 6, 2, 3, 9, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, 872, 0, 0 Route110_TrickHouseEntrance_MapWarps: @ 853DE84 - warp_def 5, 7, 3, 1, ROUTE_110 - warp_def 6, 7, 3, 1, ROUTE_110 - warp_def 5, 2, 3, 0, ROUTE_110_TRICK_HOUSE_PUZZLE_1 + warp_def 5, 7, 3, 1, MAP_ROUTE110 + warp_def 6, 7, 3, 1, MAP_ROUTE110 + warp_def 5, 2, 3, 0, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 Route110_TrickHouseEntrance_MapCoordEvents: @ 853DE9C coord_event 4, 7, 3, 0, VAR_0x40A5, 0, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/events/Route110_TrickHousePuzzle1.inc index 40da83bb84..56ec5beaa8 100644 --- a/data/maps/events/Route110_TrickHousePuzzle1.inc +++ b/data/maps/events/Route110_TrickHousePuzzle1.inc @@ -16,9 +16,9 @@ Route110_TrickHousePuzzle1_EventObjects: @ 853DF88 object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 2, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 30, 0, 0 Route110_TrickHousePuzzle1_MapWarps: @ 853E0F0 - warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle1_MapBGEvents: @ 853E108 bg_event 3, 16, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_26B92B diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/events/Route110_TrickHousePuzzle2.inc index ed03f5d792..dcc1f5efe4 100644 --- a/data/maps/events/Route110_TrickHousePuzzle2.inc +++ b/data/maps/events/Route110_TrickHousePuzzle2.inc @@ -6,9 +6,9 @@ Route110_TrickHousePuzzle2_EventObjects: @ 853E128 object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, 1061, 0, 0 Route110_TrickHousePuzzle2_MapWarps: @ 853E1A0 - warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle2_MapCoordEvents: @ 853E1B8 coord_event 11, 12, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BBDD diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/events/Route110_TrickHousePuzzle3.inc index 0097717fa8..3fb140aa7c 100644 --- a/data/maps/events/Route110_TrickHousePuzzle3.inc +++ b/data/maps/events/Route110_TrickHousePuzzle3.inc @@ -8,9 +8,9 @@ Route110_TrickHousePuzzle3_EventObjects: @ 853E218 object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 2, 21, 3, 1, 17, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 22, 0, 0 Route110_TrickHousePuzzle3_MapWarps: @ 853E2C0 - warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle3_MapCoordEvents: @ 853E2D8 coord_event 4, 14, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4CD diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/events/Route110_TrickHousePuzzle4.inc index b6e4b2f070..652974cf7a 100644 --- a/data/maps/events/Route110_TrickHousePuzzle4.inc +++ b/data/maps/events/Route110_TrickHousePuzzle4.inc @@ -15,9 +15,9 @@ Route110_TrickHousePuzzle4_EventObjects: @ 853E338 object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 15, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 26, 0, 0 Route110_TrickHousePuzzle4_MapWarps: @ 853E488 - warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle4_MapBGEvents: @ 853E4A0 bg_event 14, 13, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_26C861 diff --git a/data/maps/events/Route110_TrickHousePuzzle5.inc b/data/maps/events/Route110_TrickHousePuzzle5.inc index 7ae53cdad9..004c71506f 100644 --- a/data/maps/events/Route110_TrickHousePuzzle5.inc +++ b/data/maps/events/Route110_TrickHousePuzzle5.inc @@ -6,9 +6,9 @@ Route110_TrickHousePuzzle5_EventObjects: @ 853E4C0 object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 0, 10, 4, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBB6, 0, 0, 0 Route110_TrickHousePuzzle5_MapWarps: @ 853E538 - warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle5_MapCoordEvents: @ 853E550 coord_event 5, 17, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBD7 diff --git a/data/maps/events/Route110_TrickHousePuzzle6.inc b/data/maps/events/Route110_TrickHousePuzzle6.inc index a36e7cd72d..0da7ac6197 100644 --- a/data/maps/events/Route110_TrickHousePuzzle6.inc +++ b/data/maps/events/Route110_TrickHousePuzzle6.inc @@ -5,9 +5,9 @@ Route110_TrickHousePuzzle6_EventObjects: @ 853E6D0 object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 11, 21, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, 1067, 0, 0 Route110_TrickHousePuzzle6_MapWarps: @ 853E730 - warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle6_MapBGEvents: @ 853E748 bg_event 0, 10, 3, 0, 0, Route110_TrickHousePuzzle6_EventScript_26DDC4 diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/events/Route110_TrickHousePuzzle7.inc index 39ee27853d..fd5748a76e 100644 --- a/data/maps/events/Route110_TrickHousePuzzle7.inc +++ b/data/maps/events/Route110_TrickHousePuzzle7.inc @@ -10,19 +10,19 @@ Route110_TrickHousePuzzle7_EventObjects: @ 853E768 object_event 9, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 6, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 Route110_TrickHousePuzzle7_MapWarps: @ 853E840 - warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END - warp_def 13, 4, 0, 4, ROUTE_110_TRICK_HOUSE_PUZZLE_7 - warp_def 7, 3, 0, 3, ROUTE_110_TRICK_HOUSE_PUZZLE_7 - warp_def 13, 11, 0, 6, ROUTE_110_TRICK_HOUSE_PUZZLE_7 - warp_def 4, 3, 0, 5, ROUTE_110_TRICK_HOUSE_PUZZLE_7 - warp_def 1, 17, 0, 8, ROUTE_110_TRICK_HOUSE_PUZZLE_7 - warp_def 0, 11, 0, 7, ROUTE_110_TRICK_HOUSE_PUZZLE_7 - warp_def 2, 3, 0, 10, ROUTE_110_TRICK_HOUSE_PUZZLE_7 - warp_def 4, 13, 0, 9, ROUTE_110_TRICK_HOUSE_PUZZLE_7 - warp_def 1, 3, 0, 12, ROUTE_110_TRICK_HOUSE_PUZZLE_7 - warp_def 8, 12, 0, 11, ROUTE_110_TRICK_HOUSE_PUZZLE_7 + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END + warp_def 13, 4, 0, 4, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 + warp_def 7, 3, 0, 3, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 + warp_def 13, 11, 0, 6, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 + warp_def 4, 3, 0, 5, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 + warp_def 1, 17, 0, 8, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 + warp_def 0, 11, 0, 7, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 + warp_def 2, 3, 0, 10, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 + warp_def 4, 13, 0, 9, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 + warp_def 1, 3, 0, 12, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 + warp_def 8, 12, 0, 11, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 Route110_TrickHousePuzzle7_MapCoordEvents: @ 853E8A8 coord_event 8, 19, 0, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E31B diff --git a/data/maps/events/Route110_TrickHousePuzzle8.inc b/data/maps/events/Route110_TrickHousePuzzle8.inc index 2e44e5b74c..821801eac7 100644 --- a/data/maps/events/Route110_TrickHousePuzzle8.inc +++ b/data/maps/events/Route110_TrickHousePuzzle8.inc @@ -5,9 +5,9 @@ Route110_TrickHousePuzzle8_EventObjects: @ 853E908 object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, 1069, 0, 0 Route110_TrickHousePuzzle8_MapWarps: @ 853E968 - warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 0, 0, ROUTE_110_TRICK_HOUSE_END + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 0, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle8_MapBGEvents: @ 853E980 bg_event 3, 21, 3, 0, 0, Route110_TrickHousePuzzle8_EventScript_26E802 diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc index bfd09e58e8..e259215de0 100644 --- a/data/maps/events/Route111.inc +++ b/data/maps/events/Route111.inc @@ -47,11 +47,11 @@ Route111_EventObjects: @ 85291F0 object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 19, 101, 3, 7, 17, 0, 0, 0, Route111_EventScript_1F11E4, 843, 0, 0 Route111_MapWarps: @ 8529640 - warp_def 13, 113, 0, 0, ROUTE_111_WINSTRATE_FAMILYS_HOUSE - warp_def 29, 87, 0, 0, DESERT_RUINS - warp_def 26, 18, 0, 0, ROUTE_111_OLD_LADYS_REST_STOP - warp_def 19, 58, 0, 0, MIRAGE_TOWER_1F - warp_def 31, 113, 0, 0, TRAINER_HILL_ENTRANCE + warp_def 13, 113, 0, 0, MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE + warp_def 29, 87, 0, 0, MAP_DESERT_RUINS + warp_def 26, 18, 0, 0, MAP_ROUTE111_OLD_LADYS_REST_STOP + warp_def 19, 58, 0, 0, MAP_MIRAGE_TOWER_1F + warp_def 31, 113, 0, 0, MAP_TRAINER_HILL_ENTRANCE Route111_MapCoordEvents: @ 8529668 coord_event 12, 62, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD diff --git a/data/maps/events/Route111_OldLadysRestStop.inc b/data/maps/events/Route111_OldLadysRestStop.inc index 3cb500bdc1..ecb54bda31 100644 --- a/data/maps/events/Route111_OldLadysRestStop.inc +++ b/data/maps/events/Route111_OldLadysRestStop.inc @@ -2,8 +2,8 @@ Route111_OldLadysRestStop_EventObjects: @ 8533C18 object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0, 0, 0 Route111_OldLadysRestStop_MapWarps: @ 8533C30 - warp_def 3, 7, 0, 2, ROUTE_111 - warp_def 4, 7, 0, 2, ROUTE_111 + warp_def 3, 7, 0, 2, MAP_ROUTE111 + warp_def 4, 7, 0, 2, MAP_ROUTE111 Route111_OldLadysRestStop_MapEvents:: @ 8533C40 map_events Route111_OldLadysRestStop_EventObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route111_WinstrateFamilysHouse.inc b/data/maps/events/Route111_WinstrateFamilysHouse.inc index bd7567d814..62961b46c5 100644 --- a/data/maps/events/Route111_WinstrateFamilysHouse.inc +++ b/data/maps/events/Route111_WinstrateFamilysHouse.inc @@ -5,8 +5,8 @@ Route111_WinstrateFamilysHouse_EventObjects: @ 8533B94 object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0, 0, 0 Route111_WinstrateFamilysHouse_MapWarps: @ 8533BF4 - warp_def 3, 7, 0, 0, ROUTE_111 - warp_def 4, 7, 0, 0, ROUTE_111 + warp_def 3, 7, 0, 0, MAP_ROUTE111 + warp_def 4, 7, 0, 0, MAP_ROUTE111 Route111_WinstrateFamilysHouse_MapEvents:: @ 8533C04 map_events Route111_WinstrateFamilysHouse_EventObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route112.inc b/data/maps/events/Route112.inc index e2b26846e0..e063a12837 100644 --- a/data/maps/events/Route112.inc +++ b/data/maps/events/Route112.inc @@ -15,12 +15,12 @@ Route112_EventObjects: @ 8529974 object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 31, 11, 3, 15, 17, 0, 1, 3, Route112_EventScript_1F1F28, 0, 0, 0 Route112_MapWarps: @ 8529AC4 - warp_def 28, 27, 0, 0, ROUTE_112_CABLE_CAR_STATION - warp_def 29, 27, 0, 1, ROUTE_112_CABLE_CAR_STATION - warp_def 6, 46, 3, 0, JAGGED_PASS - warp_def 7, 46, 3, 1, JAGGED_PASS - warp_def 11, 36, 0, 0, FIERY_PATH - warp_def 22, 10, 0, 1, FIERY_PATH + warp_def 28, 27, 0, 0, MAP_ROUTE112_CABLE_CAR_STATION + warp_def 29, 27, 0, 1, MAP_ROUTE112_CABLE_CAR_STATION + warp_def 6, 46, 3, 0, MAP_JAGGED_PASS + warp_def 7, 46, 3, 1, MAP_JAGGED_PASS + warp_def 11, 36, 0, 0, MAP_FIERY_PATH + warp_def 22, 10, 0, 1, MAP_FIERY_PATH Route112_MapBGEvents: @ 8529AF4 bg_event 19, 44, 3, 0, 0, Route112_EventScript_1F1E4F diff --git a/data/maps/events/Route112_CableCarStation.inc b/data/maps/events/Route112_CableCarStation.inc index e33f6cb772..15df206a0f 100644 --- a/data/maps/events/Route112_CableCarStation.inc +++ b/data/maps/events/Route112_CableCarStation.inc @@ -3,8 +3,8 @@ Route112_CableCarStation_EventObjects: @ 8533C54 object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0 Route112_CableCarStation_MapWarps: @ 8533C84 - warp_def 6, 11, 0, 0, ROUTE_112 - warp_def 7, 11, 0, 1, ROUTE_112 + warp_def 6, 11, 0, 0, MAP_ROUTE112 + warp_def 7, 11, 0, 1, MAP_ROUTE112 Route112_CableCarStation_MapEvents:: @ 8533C94 map_events Route112_CableCarStation_EventObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route113.inc b/data/maps/events/Route113.inc index 4d5376cce9..269aeac3e6 100644 --- a/data/maps/events/Route113.inc +++ b/data/maps/events/Route113.inc @@ -17,9 +17,9 @@ Route113_EventObjects: @ 8529B2C object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 0, 7, 13, 3, 25, 49, 0, 1, 6, Route113_EventScript_1F2316, 0, 0, 0 Route113_MapWarps: @ 8529CAC - warp_def 33, 5, 0, 0, ROUTE_113_GLASS_WORKSHOP - warp_def 41, 12, 0, 0, TERRA_CAVE_ENTRANCE - warp_def 88, 5, 0, 0, TERRA_CAVE_ENTRANCE + warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP + warp_def 41, 12, 0, 0, MAP_TERRA_CAVE_ENTRANCE + warp_def 88, 5, 0, 0, MAP_TERRA_CAVE_ENTRANCE Route113_MapCoordEvents: @ 8529CC4 coord_event 19, 11, 3, 0, 8, 0, 0, 0x0 diff --git a/data/maps/events/Route113_GlassWorkshop.inc b/data/maps/events/Route113_GlassWorkshop.inc index 85d84324c2..7701918e3c 100644 --- a/data/maps/events/Route113_GlassWorkshop.inc +++ b/data/maps/events/Route113_GlassWorkshop.inc @@ -3,8 +3,8 @@ Route113_GlassWorkshop_EventObjects: @ 853EA78 object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 5, 4, 3, 2, 17, 0, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0, 0, 0 Route113_GlassWorkshop_MapWarps: @ 853EAA8 - warp_def 3, 8, 0, 0, ROUTE_113 - warp_def 4, 8, 0, 0, ROUTE_113 + warp_def 3, 8, 0, 0, MAP_ROUTE113 + warp_def 4, 8, 0, 0, MAP_ROUTE113 Route113_GlassWorkshop_MapEvents:: @ 853EAB8 map_events Route113_GlassWorkshop_EventObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route114.inc b/data/maps/events/Route114.inc index 1a7b582896..b785fd55a7 100644 --- a/data/maps/events/Route114.inc +++ b/data/maps/events/Route114.inc @@ -28,11 +28,11 @@ Route114_EventObjects: @ 8529E68 object_event 27, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 28, 16, 3, 17, 17, 0, 1, 3, Route114_EventScript_1F27F2, 0, 0, 0 Route114_MapWarps: @ 852A0F0 - warp_def 8, 63, 0, 0, METEOR_FALLS_1F_1R - warp_def 29, 5, 0, 0, ROUTE_114_FOSSIL_MANIACS_HOUSE - warp_def 27, 36, 0, 0, ROUTE_114_LANETTES_HOUSE - warp_def 6, 46, 0, 0, TERRA_CAVE_ENTRANCE - warp_def 7, 4, 0, 0, TERRA_CAVE_ENTRANCE + warp_def 8, 63, 0, 0, MAP_METEOR_FALLS_1F_1R + warp_def 29, 5, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE + warp_def 27, 36, 0, 0, MAP_ROUTE114_LANETTES_HOUSE + warp_def 6, 46, 0, 0, MAP_TERRA_CAVE_ENTRANCE + warp_def 7, 4, 0, 0, MAP_TERRA_CAVE_ENTRANCE Route114_MapBGEvents: @ 852A118 bg_event 7, 64, 0, 0, 0, Route114_EventScript_1F2625 diff --git a/data/maps/events/Route114_FossilManiacsHouse.inc b/data/maps/events/Route114_FossilManiacsHouse.inc index ef9ad911a7..87f2e8a51d 100644 --- a/data/maps/events/Route114_FossilManiacsHouse.inc +++ b/data/maps/events/Route114_FossilManiacsHouse.inc @@ -2,9 +2,9 @@ Route114_FossilManiacsHouse_EventObjects: @ 8533CFC object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 3, 2, 3, 8, 17, 0, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0, 0, 0 Route114_FossilManiacsHouse_MapWarps: @ 8533D14 - warp_def 4, 7, 0, 1, ROUTE_114 - warp_def 5, 7, 0, 1, ROUTE_114 - warp_def 4, 1, 0, 0, ROUTE_114_FOSSIL_MANIACS_TUNNEL + warp_def 4, 7, 0, 1, MAP_ROUTE114 + warp_def 5, 7, 0, 1, MAP_ROUTE114 + warp_def 4, 1, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL Route114_FossilManiacsHouse_MapBGEvents: @ 8533D2C bg_event 5, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_22AD73 diff --git a/data/maps/events/Route114_FossilManiacsTunnel.inc b/data/maps/events/Route114_FossilManiacsTunnel.inc index 5521303f71..f14e6cd65b 100644 --- a/data/maps/events/Route114_FossilManiacsTunnel.inc +++ b/data/maps/events/Route114_FossilManiacsTunnel.inc @@ -2,9 +2,9 @@ Route114_FossilManiacsTunnel_EventObjects: @ 8533D70 object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 5, 3, 3, 7, 17, 0, 0, 0, Route114_FossilManiacsTunnel_EventScript_22AF87, 0, 0, 0 Route114_FossilManiacsTunnel_MapWarps: @ 8533D88 - warp_def 6, 25, 3, 2, ROUTE_114_FOSSIL_MANIACS_HOUSE - warp_def 7, 25, 3, 2, ROUTE_114_FOSSIL_MANIACS_HOUSE - warp_def 6, 2, 0, 0, DESERT_UNDERPASS + warp_def 6, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE + warp_def 7, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE + warp_def 6, 2, 0, 0, MAP_DESERT_UNDERPASS Route114_FossilManiacsTunnel_MapCoordEvents: @ 8533DA0 coord_event 5, 4, 3, 0, VAR_0x40CC, 1, 0, Route114_FossilManiacsTunnel_EventScript_22AF66 diff --git a/data/maps/events/Route114_LanettesHouse.inc b/data/maps/events/Route114_LanettesHouse.inc index 1182d95f22..c7b2fdfefb 100644 --- a/data/maps/events/Route114_LanettesHouse.inc +++ b/data/maps/events/Route114_LanettesHouse.inc @@ -2,8 +2,8 @@ Route114_LanettesHouse_EventObjects: @ 8533DD4 object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 4, 3, 1, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, 870, 0, 0 Route114_LanettesHouse_MapWarps: @ 8533DEC - warp_def 5, 7, 0, 2, ROUTE_114 - warp_def 6, 7, 0, 2, ROUTE_114 + warp_def 5, 7, 0, 2, MAP_ROUTE114 + warp_def 6, 7, 0, 2, MAP_ROUTE114 Route114_LanettesHouse_MapBGEvents: @ 8533DFC bg_event 5, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_22B309 diff --git a/data/maps/events/Route115.inc b/data/maps/events/Route115.inc index 63924166c4..5ff749096f 100644 --- a/data/maps/events/Route115.inc +++ b/data/maps/events/Route115.inc @@ -24,9 +24,9 @@ Route115_EventObjects: @ 852A1BC object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 14, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E5E, 1144, 0, 0 Route115_MapWarps: @ 852A3E4 - warp_def 27, 37, 0, 1, METEOR_FALLS_1F_1R - warp_def 21, 6, 0, 0, TERRA_CAVE_ENTRANCE - warp_def 36, 10, 0, 0, TERRA_CAVE_ENTRANCE + warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R + warp_def 21, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE + warp_def 36, 10, 0, 0, MAP_TERRA_CAVE_ENTRANCE Route115_MapBGEvents: @ 852A3FC bg_event 32, 6, 0, 8, 0, 72, 0, 0 diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc index 25bc3891c1..a1c706e451 100644 --- a/data/maps/events/Route116.inc +++ b/data/maps/events/Route116.inc @@ -29,11 +29,11 @@ Route116_EventObjects: @ 852A4B8 object_event 28, EVENT_OBJ_GFX_HIKER, 0, 0, 42, 13, 3, 9, 17, 0, 1, 5, Route116_EventScript_1F306F, 0, 0, 0 Route116_MapWarps: @ 852A758 - warp_def 47, 8, 0, 0, RUSTURF_TUNNEL - warp_def 38, 8, 0, 0, ROUTE_116_TUNNELERS_REST_HOUSE - warp_def 65, 10, 0, 2, RUSTURF_TUNNEL - warp_def 59, 13, 0, 0, TERRA_CAVE_ENTRANCE - warp_def 79, 6, 0, 0, TERRA_CAVE_ENTRANCE + warp_def 47, 8, 0, 0, MAP_RUSTURF_TUNNEL + warp_def 38, 8, 0, 0, MAP_ROUTE116_TUNNELERS_REST_HOUSE + warp_def 65, 10, 0, 2, MAP_RUSTURF_TUNNEL + warp_def 59, 13, 0, 0, MAP_TERRA_CAVE_ENTRANCE + warp_def 79, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE Route116_MapCoordEvents: @ 852A780 coord_event 47, 9, 3, 0, VAR_0x406F, 1, 0, Route116_EventScript_1F2D95 diff --git a/data/maps/events/Route116_TunnelersRestHouse.inc b/data/maps/events/Route116_TunnelersRestHouse.inc index da8f9c1a05..d84600bf62 100644 --- a/data/maps/events/Route116_TunnelersRestHouse.inc +++ b/data/maps/events/Route116_TunnelersRestHouse.inc @@ -4,8 +4,8 @@ Route116_TunnelersRestHouse_EventObjects: @ 8533E34 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 7, 2, 3, 7, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0, 0, 0 Route116_TunnelersRestHouse_MapWarps: @ 8533E7C - warp_def 4, 8, 0, 1, ROUTE_116 - warp_def 5, 8, 0, 1, ROUTE_116 + warp_def 4, 8, 0, 1, MAP_ROUTE116 + warp_def 5, 8, 0, 1, MAP_ROUTE116 Route116_TunnelersRestHouse_MapEvents:: @ 8533E8C map_events Route116_TunnelersRestHouse_EventObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route117.inc b/data/maps/events/Route117.inc index 4478507ae7..628ac7aabc 100644 --- a/data/maps/events/Route117.inc +++ b/data/maps/events/Route117.inc @@ -25,7 +25,7 @@ Route117_EventObjects: @ 852A828 object_event 24, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 16, 4, 3, 28, 20, 0, 1, 4, Route117_EventScript_1F3C37, 0, 0, 0 Route117_MapWarps: @ 852AA68 - warp_def 51, 5, 0, 0, ROUTE_117_POKEMON_DAY_CARE + warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE Route117_MapBGEvents: @ 852AA70 bg_event 16, 6, 0, 0, 0, Route117_EventScript_1F39B5 diff --git a/data/maps/events/Route117_PokemonDayCare.inc b/data/maps/events/Route117_PokemonDayCare.inc index 363c2132f0..b5b1a19602 100644 --- a/data/maps/events/Route117_PokemonDayCare.inc +++ b/data/maps/events/Route117_PokemonDayCare.inc @@ -2,8 +2,8 @@ Route117_PokemonDayCare_EventObjects: @ 8533EA0 object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 2, 2, 3, 8, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0, 0, 0 Route117_PokemonDayCare_MapWarps: @ 8533EB8 - warp_def 2, 8, 0, 0, ROUTE_117 - warp_def 3, 8, 0, 0, ROUTE_117 + warp_def 2, 8, 0, 0, MAP_ROUTE117 + warp_def 3, 8, 0, 0, MAP_ROUTE117 Route117_PokemonDayCare_MapEvents:: @ 8533EC8 map_events Route117_PokemonDayCare_EventObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc index 73ba40dd2c..dcd27a75df 100644 --- a/data/maps/events/Route118.inc +++ b/data/maps/events/Route118.inc @@ -22,8 +22,8 @@ Route118_EventObjects: @ 852AAB4 object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 7, 7, 3, 8, 17, 0, 1, 4, Route118_EventScript_1F40A7, 0, 0, 0 Route118_MapWarps: @ 852ACAC - warp_def 42, 6, 0, 0, TERRA_CAVE_ENTRANCE - warp_def 9, 6, 0, 0, TERRA_CAVE_ENTRANCE + warp_def 42, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE + warp_def 9, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE Route118_MapCoordEvents: @ 852ACBC coord_event 43, 11, 3, 0, VAR_0x4071, 0, 0, Route118_EventScript_1F3E8E diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc index 96db2d9442..c057150a41 100644 --- a/data/maps/events/Route119.inc +++ b/data/maps/events/Route119.inc @@ -44,8 +44,8 @@ Route119_EventObjects: @ 852AD6C object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 0, 28, 25, 3, 8, 0, 0, 0, 0, 0x0, 786, 0, 0 Route119_MapWarps: @ 852B174 - warp_def 6, 32, 0, 0, ROUTE_119_WEATHER_INSTITUTE_1F - warp_def 33, 109, 0, 0, ROUTE_119_HOUSE + warp_def 6, 32, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_1F + warp_def 33, 109, 0, 0, MAP_ROUTE119_HOUSE Route119_MapCoordEvents: @ 852B184 coord_event 25, 31, 0, 0, VAR_0x4072, 0, 0, Route119_EventScript_1F4472 diff --git a/data/maps/events/Route119_House.inc b/data/maps/events/Route119_House.inc index 38c35b40a2..9b5dbb2d8e 100644 --- a/data/maps/events/Route119_House.inc +++ b/data/maps/events/Route119_House.inc @@ -8,8 +8,8 @@ Route119_House_EventObjects: @ 853ECD0 object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 0, 5, 3, 3, 2, 49, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 Route119_House_MapWarps: @ 853ED78 - warp_def 3, 8, 0, 1, ROUTE_119 - warp_def 4, 8, 0, 1, ROUTE_119 + warp_def 3, 8, 0, 1, MAP_ROUTE119 + warp_def 4, 8, 0, 1, MAP_ROUTE119 Route119_House_MapEvents:: @ 853ED88 map_events Route119_House_EventObjects, Route119_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route119_WeatherInstitute_1F.inc b/data/maps/events/Route119_WeatherInstitute_1F.inc index 6fa459ac6a..d06f52da9c 100644 --- a/data/maps/events/Route119_WeatherInstitute_1F.inc +++ b/data/maps/events/Route119_WeatherInstitute_1F.inc @@ -6,9 +6,9 @@ Route119_WeatherInstitute_1F_EventObjects: @ 853EB20 object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 14, 11, 3, 2, 17, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0, 0, 0 Route119_WeatherInstitute_1F_MapWarps: @ 853EB98 - warp_def 9, 12, 0, 0, ROUTE_119 - warp_def 10, 12, 0, 0, ROUTE_119 - warp_def 17, 1, 0, 0, ROUTE_119_WEATHER_INSTITUTE_2F + warp_def 9, 12, 0, 0, MAP_ROUTE119 + warp_def 10, 12, 0, 0, MAP_ROUTE119 + warp_def 17, 1, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_2F Route119_WeatherInstitute_1F_MapBGEvents: @ 853EBB0 bg_event 1, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB18 diff --git a/data/maps/events/Route119_WeatherInstitute_2F.inc b/data/maps/events/Route119_WeatherInstitute_2F.inc index 0f838709c4..6a9d375eda 100644 --- a/data/maps/events/Route119_WeatherInstitute_2F.inc +++ b/data/maps/events/Route119_WeatherInstitute_2F.inc @@ -9,7 +9,7 @@ Route119_WeatherInstitute_2F_EventObjects: @ 853EBF4 object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 19, 6, 3, 9, 17, 0, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, 890, 0, 0 Route119_WeatherInstitute_2F_MapWarps: @ 853ECB4 - warp_def 17, 1, 0, 2, ROUTE_119_WEATHER_INSTITUTE_1F + warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F Route119_WeatherInstitute_2F_MapEvents:: @ 853ECBC map_events Route119_WeatherInstitute_2F_EventObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc index 6f227115ca..6060c20da0 100644 --- a/data/maps/events/Route120.inc +++ b/data/maps/events/Route120.inc @@ -45,8 +45,8 @@ Route120_EventObjects: @ 852B3F8 object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 24, 33, 3, 1, 17, 0, 0, 0, Route120_EventScript_290F7C, 1148, 0, 0 Route120_MapWarps: @ 852B818 - warp_def 7, 55, 0, 0, ANCIENT_TOMB - warp_def 19, 23, 1, 0, SCORCHED_SLAB + warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB + warp_def 19, 23, 1, 0, MAP_SCORCHED_SLAB Route120_MapCoordEvents: @ 852B828 coord_event 7, 15, 0, 0, 3, 0, 0, 0x0 diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc index ec6ced043e..5446772bfc 100644 --- a/data/maps/events/Route121.inc +++ b/data/maps/events/Route121.inc @@ -30,7 +30,7 @@ Route121_EventObjects: @ 852BA14 object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 38, 13, 3, 1, 17, 0, 0, 0, Route121_EventScript_290FA3, 1150, 0, 0 Route121_MapWarps: @ 852BCCC - warp_def 37, 5, 0, 2, ROUTE_121_SAFARI_ZONE_ENTRANCE + warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE Route121_MapCoordEvents: @ 852BCD4 coord_event 25, 5, 3, 0, VAR_0x4074, 0, 0, Route121_EventScript_1F5E18 diff --git a/data/maps/events/Route121_SafariZoneEntrance.inc b/data/maps/events/Route121_SafariZoneEntrance.inc index 39bb6123c7..b19240c8dc 100644 --- a/data/maps/events/Route121_SafariZoneEntrance.inc +++ b/data/maps/events/Route121_SafariZoneEntrance.inc @@ -4,10 +4,10 @@ Route121_SafariZoneEntrance_EventObjects: @ 8533EDC object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 Route121_SafariZoneEntrance_MapWarps: @ 8533F24 - warp_def 2, 5, 0, 0, SAFARI_ZONE_SOUTH - warp_def 3, 5, 0, 0, SAFARI_ZONE_SOUTH - warp_def 14, 13, 0, 0, ROUTE_121 - warp_def 15, 13, 0, 0, ROUTE_121 + warp_def 2, 5, 0, 0, MAP_SAFARI_ZONE_SOUTH + warp_def 3, 5, 0, 0, MAP_SAFARI_ZONE_SOUTH + warp_def 14, 13, 0, 0, MAP_ROUTE121 + warp_def 15, 13, 0, 0, MAP_ROUTE121 Route121_SafariZoneEntrance_MapCoordEvents: @ 8533F44 coord_event 8, 4, 3, 0, VAR_TEMP_1, 0, 0, Route121_SafariZoneEntrance_EventScript_22BC18 diff --git a/data/maps/events/Route122.inc b/data/maps/events/Route122.inc index 10330d8e32..4c5b9b4647 100644 --- a/data/maps/events/Route122.inc +++ b/data/maps/events/Route122.inc @@ -1,5 +1,5 @@ Route122_MapWarps: @ 852BDA0 - warp_def 22, 29, 0, 0, MT_PYRE_1F + warp_def 22, 29, 0, 0, MAP_MT_PYRE_1F Route122_MapEvents:: @ 852BDA8 map_events 0x0, Route122_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route123.inc b/data/maps/events/Route123.inc index 0521a0592f..f6d8f986db 100644 --- a/data/maps/events/Route123.inc +++ b/data/maps/events/Route123.inc @@ -44,7 +44,7 @@ Route123_EventObjects: @ 852BDBC object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 57, 16, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FE4, 1153, 0, 0 Route123_MapWarps: @ 852C1C4 - warp_def 22, 6, 0, 0, ROUTE_123_BERRY_MASTERS_HOUSE + warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE Route123_MapCoordEvents: @ 852C1CC coord_event 90, 16, 3, 0, 21, 0, 0, 0x0 diff --git a/data/maps/events/Route123_BerryMastersHouse.inc b/data/maps/events/Route123_BerryMastersHouse.inc index 719dc55c76..d250f8f392 100644 --- a/data/maps/events/Route123_BerryMastersHouse.inc +++ b/data/maps/events/Route123_BerryMastersHouse.inc @@ -3,8 +3,8 @@ Route123_BerryMastersHouse_EventObjects: @ 853EACC object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 7, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0, 0, 0 Route123_BerryMastersHouse_MapWarps: @ 853EAFC - warp_def 3, 7, 0, 0, ROUTE_123 - warp_def 4, 7, 0, 0, ROUTE_123 + warp_def 3, 7, 0, 0, MAP_ROUTE123 + warp_def 4, 7, 0, 0, MAP_ROUTE123 Route123_BerryMastersHouse_MapEvents:: @ 853EB0C map_events Route123_BerryMastersHouse_EventObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route124.inc b/data/maps/events/Route124.inc index 8cd919a633..dc4adebc47 100644 --- a/data/maps/events/Route124.inc +++ b/data/maps/events/Route124.inc @@ -13,7 +13,7 @@ Route124_EventObjects: @ 852C3C4 object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 69, 74, 1, 66, 17, 0, 1, 7, Route124_EventScript_1F6722, 0, 0, 0 Route124_MapWarps: @ 852C4E4 - warp_def 70, 48, 3, 0, ROUTE_124_DIVING_TREASURE_HUNTERS_HOUSE + warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE Route124_MapBGEvents: @ 852C4EC bg_event 73, 48, 3, 0, 0, Route124_EventScript_1F657C diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc index 1916f36b72..d4fb69d74e 100644 --- a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc +++ b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc @@ -2,8 +2,8 @@ Route124_DivingTreasureHuntersHouse_EventObjects: @ 853ED9C object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 0, 5, 4, 0, 9, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0, 0, 0 Route124_DivingTreasureHuntersHouse_MapWarps: @ 853EDB4 - warp_def 3, 8, 0, 0, ROUTE_124 - warp_def 4, 8, 0, 0, ROUTE_124 + warp_def 3, 8, 0, 0, MAP_ROUTE124 + warp_def 4, 8, 0, 0, MAP_ROUTE124 Route124_DivingTreasureHuntersHouse_MapBGEvents: @ 853EDC4 bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270F63 diff --git a/data/maps/events/Route125.inc b/data/maps/events/Route125.inc index 30fa1f18fb..81a9dbcead 100644 --- a/data/maps/events/Route125.inc +++ b/data/maps/events/Route125.inc @@ -11,7 +11,7 @@ Route125_EventObjects: @ 852C50C object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 46, 17, 3, 1, 17, 0, 0, 0, Route125_EventScript_291018, 1154, 0, 0 Route125_MapWarps: @ 852C5FC - warp_def 22, 19, 0, 0, SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM + warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM Route125_MapBGEvents: @ 852C604 bg_event 53, 10, 0, 8, 0, ITEM_ULTRA_BALL, 0, 0 diff --git a/data/maps/events/Route131.inc b/data/maps/events/Route131.inc index b66f47867e..bea728a70a 100644 --- a/data/maps/events/Route131.inc +++ b/data/maps/events/Route131.inc @@ -9,7 +9,7 @@ Route131_EventObjects: @ 852CAB4 object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 52, 27, 1, 25, 49, 0, 1, 5, Route131_EventScript_1F74BB, 0, 0, 0 Route131_MapWarps: @ 852CB74 - warp_def 36, 6, 3, 0, SKY_PILLAR_ENTRANCE + warp_def 36, 6, 3, 0, MAP_SKY_PILLAR_ENTRANCE Route131_MapEvents:: @ 852CB7C map_events Route131_EventObjects, Route131_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity.inc b/data/maps/events/RustboroCity.inc index 3efb9fac7c..355539f00f 100644 --- a/data/maps/events/RustboroCity.inc +++ b/data/maps/events/RustboroCity.inc @@ -17,18 +17,18 @@ RustboroCity_EventObjects: @ 85267E0 object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 0, 31, 36, 3, 1, 16, 0, 0, 0, RustboroCity_EventScript_1E1236, 0, 0, 0 RustboroCity_MapWarps: @ 8526960 - warp_def 27, 19, 0, 0, RUSTBORO_CITY_GYM - warp_def 13, 30, 0, 0, RUSTBORO_CITY_FLAT_1_1F - warp_def 16, 45, 0, 0, RUSTBORO_CITY_MART - warp_def 16, 38, 0, 0, RUSTBORO_CITY_POKEMON_CENTER_1F - warp_def 27, 34, 0, 0, RUSTBORO_CITY_POKEMON_SCHOOL - warp_def 11, 15, 0, 0, RUSTBORO_CITY_DEVON_CORP_1F - warp_def 12, 15, 0, 1, RUSTBORO_CITY_DEVON_CORP_1F - warp_def 33, 19, 0, 0, RUSTBORO_CITY_HOUSE_1 - warp_def 9, 38, 0, 0, RUSTBORO_CITY_CUTTERS_HOUSE - warp_def 30, 28, 0, 0, RUSTBORO_CITY_HOUSE_2 - warp_def 5, 51, 0, 0, RUSTBORO_CITY_FLAT_2_1F - warp_def 26, 46, 0, 0, RUSTBORO_CITY_HOUSE_3 + warp_def 27, 19, 0, 0, MAP_RUSTBORO_CITY_GYM + warp_def 13, 30, 0, 0, MAP_RUSTBORO_CITY_FLAT1_1F + warp_def 16, 45, 0, 0, MAP_RUSTBORO_CITY_MART + warp_def 16, 38, 0, 0, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F + warp_def 27, 34, 0, 0, MAP_RUSTBORO_CITY_POKEMON_SCHOOL + warp_def 11, 15, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_1F + warp_def 12, 15, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_1F + warp_def 33, 19, 0, 0, MAP_RUSTBORO_CITY_HOUSE1 + warp_def 9, 38, 0, 0, MAP_RUSTBORO_CITY_CUTTERS_HOUSE + warp_def 30, 28, 0, 0, MAP_RUSTBORO_CITY_HOUSE2 + warp_def 5, 51, 0, 0, MAP_RUSTBORO_CITY_FLAT2_1F + warp_def 26, 46, 0, 0, MAP_RUSTBORO_CITY_HOUSE3 RustboroCity_MapCoordEvents: @ 85269C0 coord_event 23, 20, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E095A diff --git a/data/maps/events/RustboroCity_CuttersHouse.inc b/data/maps/events/RustboroCity_CuttersHouse.inc index bbed604789..34d6c282d8 100644 --- a/data/maps/events/RustboroCity_CuttersHouse.inc +++ b/data/maps/events/RustboroCity_CuttersHouse.inc @@ -3,8 +3,8 @@ RustboroCity_CuttersHouse_EventObjects: @ 8530A1C object_event 2, EVENT_OBJ_GFX_LASS, 0, 0, 9, 2, 3, 5, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215C0A, 0, 0, 0 RustboroCity_CuttersHouse_MapWarps: @ 8530A4C - warp_def 5, 8, 0, 8, RUSTBORO_CITY - warp_def 6, 8, 0, 8, RUSTBORO_CITY + warp_def 5, 8, 0, 8, MAP_RUSTBORO_CITY + warp_def 6, 8, 0, 8, MAP_RUSTBORO_CITY RustboroCity_CuttersHouse_MapEvents:: @ 8530A5C map_events RustboroCity_CuttersHouse_EventObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_DevonCorp_1F.inc b/data/maps/events/RustboroCity_DevonCorp_1F.inc index 034c44aa33..b36e7c1c7f 100644 --- a/data/maps/events/RustboroCity_DevonCorp_1F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_1F.inc @@ -4,9 +4,9 @@ RustboroCity_DevonCorp_1F_EventObjects: @ 853037C object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 5, 3, 3, 8, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0, 0, 0 RustboroCity_DevonCorp_1F_MapWarps: @ 85303C4 - warp_def 5, 8, 0, 5, RUSTBORO_CITY - warp_def 6, 8, 0, 6, RUSTBORO_CITY - warp_def 14, 1, 0, 0, RUSTBORO_CITY_DEVON_CORP_2F + warp_def 5, 8, 0, 5, MAP_RUSTBORO_CITY + warp_def 6, 8, 0, 6, MAP_RUSTBORO_CITY + warp_def 14, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_2F RustboroCity_DevonCorp_1F_MapBGEvents: @ 85303DC bg_event 3, 2, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211312 diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.inc b/data/maps/events/RustboroCity_DevonCorp_2F.inc index f19ab8110b..35fb23324a 100644 --- a/data/maps/events/RustboroCity_DevonCorp_2F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_2F.inc @@ -7,8 +7,8 @@ RustboroCity_DevonCorp_2F_EventObjects: @ 8530408 object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 5, 3, 7, 17, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211BCF, 0, 0, 0 RustboroCity_DevonCorp_2F_MapWarps: @ 8530498 - warp_def 14, 1, 0, 2, RUSTBORO_CITY_DEVON_CORP_1F - warp_def 2, 1, 0, 0, RUSTBORO_CITY_DEVON_CORP_3F + warp_def 14, 1, 0, 2, MAP_RUSTBORO_CITY_DEVON_CORP_1F + warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_3F RustboroCity_DevonCorp_2F_MapEvents:: @ 85304A8 map_events RustboroCity_DevonCorp_2F_EventObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.inc b/data/maps/events/RustboroCity_DevonCorp_3F.inc index 8422ef37ab..0d4687ad56 100644 --- a/data/maps/events/RustboroCity_DevonCorp_3F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_3F.inc @@ -4,7 +4,7 @@ RustboroCity_DevonCorp_3F_EventObjects: @ 85304BC object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 15, 5, 3, 76, 17, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0, 0, 0 RustboroCity_DevonCorp_3F_MapWarps: @ 8530504 - warp_def 2, 1, 0, 1, RUSTBORO_CITY_DEVON_CORP_2F + warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F RustboroCity_DevonCorp_3F_MapBGEvents: @ 853050C bg_event 1, 5, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_212600 diff --git a/data/maps/events/RustboroCity_Flat1_1F.inc b/data/maps/events/RustboroCity_Flat1_1F.inc index 66786ea5b6..f7e7cacdbf 100644 --- a/data/maps/events/RustboroCity_Flat1_1F.inc +++ b/data/maps/events/RustboroCity_Flat1_1F.inc @@ -3,9 +3,9 @@ RustboroCity_Flat1_1F_EventObjects: @ 8530890 object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 12, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0, 0, 0 RustboroCity_Flat1_1F_MapWarps: @ 85308C0 - warp_def 6, 7, 0, 1, RUSTBORO_CITY - warp_def 7, 7, 0, 1, RUSTBORO_CITY - warp_def 2, 1, 0, 0, RUSTBORO_CITY_FLAT_1_2F + warp_def 6, 7, 0, 1, MAP_RUSTBORO_CITY + warp_def 7, 7, 0, 1, MAP_RUSTBORO_CITY + warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT1_2F RustboroCity_Flat1_1F_MapEvents:: @ 85308D8 map_events RustboroCity_Flat1_1F_EventObjects, RustboroCity_Flat1_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat1_2F.inc b/data/maps/events/RustboroCity_Flat1_2F.inc index e56741b496..c7ed5e5586 100644 --- a/data/maps/events/RustboroCity_Flat1_2F.inc +++ b/data/maps/events/RustboroCity_Flat1_2F.inc @@ -9,7 +9,7 @@ RustboroCity_Flat1_2F_EventObjects: @ 85308EC object_event 8, EVENT_OBJ_GFX_PIKACHU_DOLL, 0, 0, 9, 7, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0 RustboroCity_Flat1_2F_MapWarps: @ 85309AC - warp_def 2, 1, 0, 2, RUSTBORO_CITY_FLAT_1_1F + warp_def 2, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT1_1F RustboroCity_Flat1_2F_MapEvents:: @ 85309B4 map_events RustboroCity_Flat1_2F_EventObjects, RustboroCity_Flat1_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat2_1F.inc b/data/maps/events/RustboroCity_Flat2_1F.inc index f31acb8b63..bb5e5b11dc 100644 --- a/data/maps/events/RustboroCity_Flat2_1F.inc +++ b/data/maps/events/RustboroCity_Flat2_1F.inc @@ -3,9 +3,9 @@ RustboroCity_Flat2_1F_EventObjects: @ 8530AC4 object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 8, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0, 0, 0 RustboroCity_Flat2_1F_MapWarps: @ 8530AF4 - warp_def 2, 8, 0, 10, RUSTBORO_CITY - warp_def 3, 8, 0, 10, RUSTBORO_CITY - warp_def 3, 1, 0, 0, RUSTBORO_CITY_FLAT_2_2F + warp_def 2, 8, 0, 10, MAP_RUSTBORO_CITY + warp_def 3, 8, 0, 10, MAP_RUSTBORO_CITY + warp_def 3, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_2F RustboroCity_Flat2_1F_MapEvents:: @ 8530B0C map_events RustboroCity_Flat2_1F_EventObjects, RustboroCity_Flat2_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat2_2F.inc b/data/maps/events/RustboroCity_Flat2_2F.inc index 3bed978e84..e0a4419d3c 100644 --- a/data/maps/events/RustboroCity_Flat2_2F.inc +++ b/data/maps/events/RustboroCity_Flat2_2F.inc @@ -3,8 +3,8 @@ RustboroCity_Flat2_2F_EventObjects: @ 8530B20 object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FE1, 0, 0, 0 RustboroCity_Flat2_2F_MapWarps: @ 8530B50 - warp_def 3, 1, 0, 2, RUSTBORO_CITY_FLAT_2_1F - warp_def 1, 1, 0, 0, RUSTBORO_CITY_FLAT_2_3F + warp_def 3, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT2_1F + warp_def 1, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_3F RustboroCity_Flat2_2F_MapEvents:: @ 8530B60 map_events RustboroCity_Flat2_2F_EventObjects, RustboroCity_Flat2_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat2_3F.inc b/data/maps/events/RustboroCity_Flat2_3F.inc index 16f9aa3ea4..1b487cb0f3 100644 --- a/data/maps/events/RustboroCity_Flat2_3F.inc +++ b/data/maps/events/RustboroCity_Flat2_3F.inc @@ -3,7 +3,7 @@ RustboroCity_Flat2_3F_EventObjects: @ 8530B74 object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 12, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216120, 0, 0, 0 RustboroCity_Flat2_3F_MapWarps: @ 8530BA4 - warp_def 1, 1, 0, 1, RUSTBORO_CITY_FLAT_2_2F + warp_def 1, 1, 0, 1, MAP_RUSTBORO_CITY_FLAT2_2F RustboroCity_Flat2_3F_MapEvents:: @ 8530BAC map_events RustboroCity_Flat2_3F_EventObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Gym.inc b/data/maps/events/RustboroCity_Gym.inc index d17c42d673..5285e5b381 100644 --- a/data/maps/events/RustboroCity_Gym.inc +++ b/data/maps/events/RustboroCity_Gym.inc @@ -6,8 +6,8 @@ RustboroCity_Gym_EventObjects: @ 8530538 object_event 5, EVENT_OBJ_GFX_HIKER, 0, 0, 1, 6, 3, 8, 17, 0, 1, 3, RustboroCity_Gym_EventScript_213011, 0, 0, 0 RustboroCity_Gym_MapWarps: @ 85305B0 - warp_def 5, 19, 0, 0, RUSTBORO_CITY - warp_def 6, 19, 0, 0, RUSTBORO_CITY + warp_def 5, 19, 0, 0, MAP_RUSTBORO_CITY + warp_def 6, 19, 0, 0, MAP_RUSTBORO_CITY RustboroCity_Gym_MapBGEvents: @ 85305C0 bg_event 2, 18, 0, 1, 0, RustboroCity_Gym_EventScript_213047 diff --git a/data/maps/events/RustboroCity_House1.inc b/data/maps/events/RustboroCity_House1.inc index d07456dc97..9702820dfd 100644 --- a/data/maps/events/RustboroCity_House1.inc +++ b/data/maps/events/RustboroCity_House1.inc @@ -3,8 +3,8 @@ RustboroCity_House1_EventObjects: @ 85309C8 object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 9, 2, 3, 8, 0, 0, 0, 0, RustboroCity_House1_EventScript_2159DF, 0, 0, 0 RustboroCity_House1_MapWarps: @ 85309F8 - warp_def 5, 7, 0, 7, RUSTBORO_CITY - warp_def 6, 7, 0, 7, RUSTBORO_CITY + warp_def 5, 7, 0, 7, MAP_RUSTBORO_CITY + warp_def 6, 7, 0, 7, MAP_RUSTBORO_CITY RustboroCity_House1_MapEvents:: @ 8530A08 map_events RustboroCity_House1_EventObjects, RustboroCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_House2.inc b/data/maps/events/RustboroCity_House2.inc index 5d45c64d01..2e9cd945b1 100644 --- a/data/maps/events/RustboroCity_House2.inc +++ b/data/maps/events/RustboroCity_House2.inc @@ -3,8 +3,8 @@ RustboroCity_House2_EventObjects: @ 8530A70 object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0, 0, 0 RustboroCity_House2_MapWarps: @ 8530AA0 - warp_def 5, 8, 0, 9, RUSTBORO_CITY - warp_def 6, 8, 0, 9, RUSTBORO_CITY + warp_def 5, 8, 0, 9, MAP_RUSTBORO_CITY + warp_def 6, 8, 0, 9, MAP_RUSTBORO_CITY RustboroCity_House2_MapEvents:: @ 8530AB0 map_events RustboroCity_House2_EventObjects, RustboroCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_House3.inc b/data/maps/events/RustboroCity_House3.inc index 61a528cdc7..0cbb78d183 100644 --- a/data/maps/events/RustboroCity_House3.inc +++ b/data/maps/events/RustboroCity_House3.inc @@ -4,8 +4,8 @@ RustboroCity_House3_EventObjects: @ 8530BC0 object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House3_EventScript_2161A3, 0, 0, 0 RustboroCity_House3_MapWarps: @ 8530C08 - warp_def 5, 8, 0, 11, RUSTBORO_CITY - warp_def 6, 8, 0, 11, RUSTBORO_CITY + warp_def 5, 8, 0, 11, MAP_RUSTBORO_CITY + warp_def 6, 8, 0, 11, MAP_RUSTBORO_CITY RustboroCity_House3_MapEvents:: @ 8530C18 map_events RustboroCity_House3_EventObjects, RustboroCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Mart.inc b/data/maps/events/RustboroCity_Mart.inc index e177ee10a6..1780ce5015 100644 --- a/data/maps/events/RustboroCity_Mart.inc +++ b/data/maps/events/RustboroCity_Mart.inc @@ -5,8 +5,8 @@ RustboroCity_Mart_EventObjects: @ 853080C object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 8, 2, 3, 7, 17, 0, 0, 0, RustboroCity_Mart_EventScript_214F86, 0, 0, 0 RustboroCity_Mart_MapWarps: @ 853086C - warp_def 3, 7, 0, 2, RUSTBORO_CITY - warp_def 4, 7, 0, 2, RUSTBORO_CITY + warp_def 3, 7, 0, 2, MAP_RUSTBORO_CITY + warp_def 4, 7, 0, 2, MAP_RUSTBORO_CITY RustboroCity_Mart_MapEvents:: @ 853087C map_events RustboroCity_Mart_EventObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_PokemonCenter_1F.inc b/data/maps/events/RustboroCity_PokemonCenter_1F.inc index 56dd4ef839..f287000ba0 100644 --- a/data/maps/events/RustboroCity_PokemonCenter_1F.inc +++ b/data/maps/events/RustboroCity_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ RustboroCity_PokemonCenter_1F_EventObjects: @ 85306F4 object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D96, 0, 0, 0 RustboroCity_PokemonCenter_1F_MapWarps: @ 8530754 - warp_def 7, 8, 3, 3, RUSTBORO_CITY - warp_def 6, 8, 3, 3, RUSTBORO_CITY - warp_def 1, 6, 4, 0, RUSTBORO_CITY_POKEMON_CENTER_2F + warp_def 7, 8, 3, 3, MAP_RUSTBORO_CITY + warp_def 6, 8, 3, 3, MAP_RUSTBORO_CITY + warp_def 1, 6, 4, 0, MAP_RUSTBORO_CITY_POKEMON_CENTER_2F RustboroCity_PokemonCenter_1F_MapEvents:: @ 853076C map_events RustboroCity_PokemonCenter_1F_EventObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_PokemonCenter_2F.inc b/data/maps/events/RustboroCity_PokemonCenter_2F.inc index f9e00e26c2..2d3ff87774 100644 --- a/data/maps/events/RustboroCity_PokemonCenter_2F.inc +++ b/data/maps/events/RustboroCity_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ RustboroCity_PokemonCenter_2F_EventObjects: @ 8530780 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 RustboroCity_PokemonCenter_2F_MapWarps: @ 85307E0 - warp_def 1, 6, 4, 2, RUSTBORO_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER RustboroCity_PokemonCenter_2F_MapEvents:: @ 85307F8 map_events RustboroCity_PokemonCenter_2F_EventObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_PokemonSchool.inc b/data/maps/events/RustboroCity_PokemonSchool.inc index ac0160e7b7..3a5ab14161 100644 --- a/data/maps/events/RustboroCity_PokemonSchool.inc +++ b/data/maps/events/RustboroCity_PokemonSchool.inc @@ -8,8 +8,8 @@ RustboroCity_PokemonSchool_EventObjects: @ 85305EC object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 0, 10, 0, 7, 17, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, 999, 0, 0 RustboroCity_PokemonSchool_MapWarps: @ 8530694 - warp_def 5, 10, 0, 4, RUSTBORO_CITY - warp_def 6, 10, 0, 4, RUSTBORO_CITY + warp_def 5, 10, 0, 4, MAP_RUSTBORO_CITY + warp_def 6, 10, 0, 4, MAP_RUSTBORO_CITY RustboroCity_PokemonSchool_MapBGEvents: @ 85306A4 bg_event 5, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213EA9 diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc index 5c2a214b95..38b3885b4a 100644 --- a/data/maps/events/RusturfTunnel.inc +++ b/data/maps/events/RusturfTunnel.inc @@ -11,9 +11,9 @@ RusturfTunnel_EventObjects: @ 85341C4 object_event 10, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 25, 4, 3, 9, 17, 0, 0, 0, RusturfTunnel_EventScript_22CE5F, 983, 0, 0 RusturfTunnel_MapWarps: @ 85342B4 - warp_def 4, 10, 3, 0, ROUTE_116 - warp_def 29, 16, 3, 4, VERDANTURF_TOWN - warp_def 18, 20, 3, 2, ROUTE_116 + warp_def 4, 10, 3, 0, MAP_ROUTE116 + warp_def 29, 16, 3, 4, MAP_VERDANTURF_TOWN + warp_def 18, 20, 3, 2, MAP_ROUTE116 RusturfTunnel_MapCoordEvents: @ 85342CC coord_event 23, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_22D071 diff --git a/data/maps/events/SSTidalCorridor.inc b/data/maps/events/SSTidalCorridor.inc index 1816412d64..80e65eb94f 100644 --- a/data/maps/events/SSTidalCorridor.inc +++ b/data/maps/events/SSTidalCorridor.inc @@ -6,15 +6,15 @@ SSTidalCorridor_EventObjects: @ 853A158 object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 9, 10, 3, 9, 0, 0, 0, 0, 0x0, 810, 0, 0 SSTidalCorridor_MapWarps: @ 853A1D0 - warp_def 4, 9, 3, 0, SS_TIDAL_ROOMS - warp_def 7, 9, 3, 2, SS_TIDAL_ROOMS - warp_def 10, 9, 3, 4, SS_TIDAL_ROOMS - warp_def 13, 9, 3, 6, SS_TIDAL_ROOMS - warp_def 4, 3, 3, 8, SS_TIDAL_ROOMS - warp_def 7, 3, 3, 9, SS_TIDAL_ROOMS - warp_def 10, 3, 3, 10, SS_TIDAL_ROOMS - warp_def 13, 3, 3, 11, SS_TIDAL_ROOMS - warp_def 16, 2, 3, 0, SS_TIDAL_LOWER_DECK + warp_def 4, 9, 3, 0, MAP_SS_TIDAL_ROOMS + warp_def 7, 9, 3, 2, MAP_SS_TIDAL_ROOMS + warp_def 10, 9, 3, 4, MAP_SS_TIDAL_ROOMS + warp_def 13, 9, 3, 6, MAP_SS_TIDAL_ROOMS + warp_def 4, 3, 3, 8, MAP_SS_TIDAL_ROOMS + warp_def 7, 3, 3, 9, MAP_SS_TIDAL_ROOMS + warp_def 10, 3, 3, 10, MAP_SS_TIDAL_ROOMS + warp_def 13, 3, 3, 11, MAP_SS_TIDAL_ROOMS + warp_def 16, 2, 3, 0, MAP_SS_TIDAL_LOWER_DECK SSTidalCorridor_MapBGEvents: @ 853A218 bg_event 2, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D diff --git a/data/maps/events/SSTidalLowerDeck.inc b/data/maps/events/SSTidalLowerDeck.inc index e135eceaeb..3cf22e65f6 100644 --- a/data/maps/events/SSTidalLowerDeck.inc +++ b/data/maps/events/SSTidalLowerDeck.inc @@ -3,7 +3,7 @@ SSTidalLowerDeck_EventObjects: @ 853A2BC object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 7, 4, 3, 50, 71, 0, 1, 3, SSTidalLowerDeck_EventScript_23C830, 0, 0, 0 SSTidalLowerDeck_MapWarps: @ 853A2EC - warp_def 15, 2, 3, 8, SS_TIDAL_CORRIDOR + warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR SSTidalLowerDeck_MapBGEvents: @ 853A2F4 bg_event 0, 2, 0, 7, 0, ITEM_LEFTOVERS, 35, 0 diff --git a/data/maps/events/SSTidalRooms.inc b/data/maps/events/SSTidalRooms.inc index 14aadda5f5..0eb0017b36 100644 --- a/data/maps/events/SSTidalRooms.inc +++ b/data/maps/events/SSTidalRooms.inc @@ -9,18 +9,18 @@ SSTidalRooms_EventObjects: @ 853A314 object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 0, 28, 5, 3, 7, 17, 0, 0, 0, SSTidalRooms_EventScript_23C9F2, 951, 0, 0 SSTidalRooms_MapWarps: @ 853A3D4 - warp_def 4, 16, 0, 0, SS_TIDAL_CORRIDOR - warp_def 5, 16, 0, 0, SS_TIDAL_CORRIDOR - warp_def 13, 16, 0, 1, SS_TIDAL_CORRIDOR - warp_def 14, 16, 0, 1, SS_TIDAL_CORRIDOR - warp_def 22, 16, 0, 2, SS_TIDAL_CORRIDOR - warp_def 23, 16, 0, 2, SS_TIDAL_CORRIDOR - warp_def 31, 16, 0, 3, SS_TIDAL_CORRIDOR - warp_def 32, 16, 0, 3, SS_TIDAL_CORRIDOR - warp_def 4, 1, 0, 4, SS_TIDAL_CORRIDOR - warp_def 13, 1, 0, 5, SS_TIDAL_CORRIDOR - warp_def 22, 1, 0, 6, SS_TIDAL_CORRIDOR - warp_def 31, 1, 0, 7, SS_TIDAL_CORRIDOR + warp_def 4, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR + warp_def 5, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR + warp_def 13, 16, 0, 1, MAP_SS_TIDAL_CORRIDOR + warp_def 14, 16, 0, 1, MAP_SS_TIDAL_CORRIDOR + warp_def 22, 16, 0, 2, MAP_SS_TIDAL_CORRIDOR + warp_def 23, 16, 0, 2, MAP_SS_TIDAL_CORRIDOR + warp_def 31, 16, 0, 3, MAP_SS_TIDAL_CORRIDOR + warp_def 32, 16, 0, 3, MAP_SS_TIDAL_CORRIDOR + warp_def 4, 1, 0, 4, MAP_SS_TIDAL_CORRIDOR + warp_def 13, 1, 0, 5, MAP_SS_TIDAL_CORRIDOR + warp_def 22, 1, 0, 6, MAP_SS_TIDAL_CORRIDOR + warp_def 31, 1, 0, 7, MAP_SS_TIDAL_CORRIDOR SSTidalRooms_MapBGEvents: @ 853A434 bg_event 15, 11, 0, 0, 0, SSTidalRooms_EventScript_23CA33 diff --git a/data/maps/events/SafariZone_RestHouse.inc b/data/maps/events/SafariZone_RestHouse.inc index 1ab278781c..7f7e66bf6e 100644 --- a/data/maps/events/SafariZone_RestHouse.inc +++ b/data/maps/events/SafariZone_RestHouse.inc @@ -4,8 +4,8 @@ SafariZone_RestHouse_EventObjects: @ 853B8FC object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 2, 5, 3, 10, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BF9, 0, 0, 0 SafariZone_RestHouse_MapWarps: @ 853B944 - warp_def 3, 8, 0, 0, SAFARI_ZONE_SOUTHWEST - warp_def 4, 8, 0, 0, SAFARI_ZONE_SOUTHWEST + warp_def 3, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST + warp_def 4, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST SafariZone_RestHouse_MapEvents:: @ 853B954 map_events SafariZone_RestHouse_EventObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_South.inc b/data/maps/events/SafariZone_South.inc index c1e293e6f5..1415cf9e69 100644 --- a/data/maps/events/SafariZone_South.inc +++ b/data/maps/events/SafariZone_South.inc @@ -7,7 +7,7 @@ SafariZone_South_EventObjects: @ 853B2A4 object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 0, 36, 17, 3, 9, 17, 0, 0, 0, SafariZone_South_EventScript_23D3A2, 717, 0, 0 SafariZone_South_MapWarps: @ 853B334 - warp_def 32, 33, 0, 0, ROUTE_121_SAFARI_ZONE_ENTRANCE + warp_def 32, 33, 0, 0, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE SafariZone_South_MapEvents:: @ 853B33C map_events SafariZone_South_EventObjects, SafariZone_South_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_Southwest.inc b/data/maps/events/SafariZone_Southwest.inc index eda3552eb9..da88db1c30 100644 --- a/data/maps/events/SafariZone_Southwest.inc +++ b/data/maps/events/SafariZone_Southwest.inc @@ -3,7 +3,7 @@ SafariZone_Southwest_EventObjects: @ 853B24C object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 37, 3, 1, 17, 0, 0, 0, SafariZone_Southwest_EventScript_2912D6, 1131, 0, 0 SafariZone_Southwest_MapWarps: @ 853B27C - warp_def 29, 7, 3, 0, SAFARI_ZONE_REST_HOUSE + warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE SafariZone_Southwest_MapBGEvents: @ 853B284 bg_event 32, 7, 3, 0, 0, SafariZone_Southwest_EventScript_23D270 diff --git a/data/maps/events/ScorchedSlab.inc b/data/maps/events/ScorchedSlab.inc index 313423b511..d55facfabd 100644 --- a/data/maps/events/ScorchedSlab.inc +++ b/data/maps/events/ScorchedSlab.inc @@ -2,7 +2,7 @@ ScorchedSlab_EventObjects: @ 8536F88 object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 3, 1, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, 1079, 0, 0 ScorchedSlab_MapWarps: @ 8536FA0 - warp_def 7, 16, 1, 1, ROUTE_120 + warp_def 7, 16, 1, 1, MAP_ROUTE120 ScorchedSlab_MapEvents:: @ 8536FA8 map_events ScorchedSlab_EventObjects, ScorchedSlab_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Entrance.inc b/data/maps/events/SeafloorCavern_Entrance.inc index 1118c0ab35..7f2619b0f1 100644 --- a/data/maps/events/SeafloorCavern_Entrance.inc +++ b/data/maps/events/SeafloorCavern_Entrance.inc @@ -2,8 +2,8 @@ SeafloorCavern_Entrance_EventObjects: @ 85356BC object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 2, 3, 7, 17, 0, 0, 0, SeafloorCavern_Entrance_EventScript_234485, 941, 0, 0 SeafloorCavern_Entrance_MapWarps: @ 85356D4 - warp_def 10, 18, 3, 0, UNDERWATER_4 - warp_def 10, 1, 3, 0, SEAFLOOR_CAVERN_ROOM_1 + warp_def 10, 18, 3, 0, MAP_UNDERWATER4 + warp_def 10, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM1 SeafloorCavern_Entrance_MapEvents:: @ 85356E4 map_events SeafloorCavern_Entrance_EventObjects, SeafloorCavern_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/events/SeafloorCavern_Room1.inc index 31fbb7d86e..b8f21b4de2 100644 --- a/data/maps/events/SeafloorCavern_Room1.inc +++ b/data/maps/events/SeafloorCavern_Room1.inc @@ -6,9 +6,9 @@ SeafloorCavern_Room1_EventObjects: @ 85356F8 object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 10, 3, 16, 17, 0, 1, 3, SeafloorCavern_Room1_EventScript_234803, 946, 0, 0 SeafloorCavern_Room1_MapWarps: @ 8535770 - warp_def 5, 18, 3, 1, SEAFLOOR_CAVERN_ENTRANCE - warp_def 17, 13, 3, 0, SEAFLOOR_CAVERN_ROOM_5 - warp_def 6, 2, 3, 0, SEAFLOOR_CAVERN_ROOM_2 + warp_def 5, 18, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE + warp_def 17, 13, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM5 + warp_def 6, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM2 SeafloorCavern_Room1_MapEvents:: @ 8535788 map_events SeafloorCavern_Room1_EventObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/events/SeafloorCavern_Room2.inc index 608b45e50e..0c5a8dd487 100644 --- a/data/maps/events/SeafloorCavern_Room2.inc +++ b/data/maps/events/SeafloorCavern_Room2.inc @@ -9,10 +9,10 @@ SeafloorCavern_Room2_EventObjects: @ 853579C object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 23, 0, 0 SeafloorCavern_Room2_MapWarps: @ 853585C - warp_def 10, 7, 3, 2, SEAFLOOR_CAVERN_ROOM_1 - warp_def 4, 10, 3, 0, SEAFLOOR_CAVERN_ROOM_4 - warp_def 6, 1, 3, 0, SEAFLOOR_CAVERN_ROOM_6 - warp_def 11, 1, 3, 0, SEAFLOOR_CAVERN_ROOM_7 + warp_def 10, 7, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1 + warp_def 4, 10, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM4 + warp_def 6, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM6 + warp_def 11, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM7 SeafloorCavern_Room2_MapEvents:: @ 853587C map_events SeafloorCavern_Room2_EventObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/events/SeafloorCavern_Room3.inc index f7c9191315..a49565f4da 100644 --- a/data/maps/events/SeafloorCavern_Room3.inc +++ b/data/maps/events/SeafloorCavern_Room3.inc @@ -10,9 +10,9 @@ SeafloorCavern_Room3_EventObjects: @ 8535890 object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 5, 5, 3, 10, 17, 0, 1, 4, SeafloorCavern_Room3_EventScript_23494F, 946, 0, 0 SeafloorCavern_Room3_MapWarps: @ 8535968 - warp_def 8, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_8 - warp_def 9, 13, 3, 1, SEAFLOOR_CAVERN_ROOM_7 - warp_def 4, 15, 3, 1, SEAFLOOR_CAVERN_ROOM_6 + warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8 + warp_def 9, 13, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM7 + warp_def 4, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM6 SeafloorCavern_Room3_MapEvents:: @ 8535980 map_events SeafloorCavern_Room3_EventObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room4.inc b/data/maps/events/SeafloorCavern_Room4.inc index 3b7f6f2ee6..ca44cc403c 100644 --- a/data/maps/events/SeafloorCavern_Room4.inc +++ b/data/maps/events/SeafloorCavern_Room4.inc @@ -3,10 +3,10 @@ SeafloorCavern_Room4_EventObjects: @ 8535994 object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 5, 12, 3, 7, 17, 0, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, 946, 0, 0 SeafloorCavern_Room4_MapWarps: @ 85359C4 - warp_def 13, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_2 - warp_def 4, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_5 - warp_def 9, 10, 3, 2, SEAFLOOR_CAVERN_ROOM_5 - warp_def 10, 15, 3, 1, SEAFLOOR_CAVERN_ENTRANCE + warp_def 13, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM2 + warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM5 + warp_def 9, 10, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM5 + warp_def 10, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE SeafloorCavern_Room4_MapEvents:: @ 85359E4 map_events SeafloorCavern_Room4_EventObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/events/SeafloorCavern_Room5.inc index 4fd74a9c7c..b9fa6997da 100644 --- a/data/maps/events/SeafloorCavern_Room5.inc +++ b/data/maps/events/SeafloorCavern_Room5.inc @@ -7,9 +7,9 @@ SeafloorCavern_Room5_EventObjects: @ 85359F8 object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 20, 0, 0 SeafloorCavern_Room5_MapWarps: @ 8535A88 - warp_def 4, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_1 - warp_def 15, 12, 3, 1, SEAFLOOR_CAVERN_ROOM_4 - warp_def 7, 17, 3, 2, SEAFLOOR_CAVERN_ROOM_4 + warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM1 + warp_def 15, 12, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM4 + warp_def 7, 17, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM4 SeafloorCavern_Room5_MapEvents:: @ 8535AA0 map_events SeafloorCavern_Room5_EventObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room6.inc b/data/maps/events/SeafloorCavern_Room6.inc index 2293f359dc..99c10d87eb 100644 --- a/data/maps/events/SeafloorCavern_Room6.inc +++ b/data/maps/events/SeafloorCavern_Room6.inc @@ -1,7 +1,7 @@ SeafloorCavern_Room6_MapWarps: @ 8535AB4 - warp_def 11, 21, 3, 2, SEAFLOOR_CAVERN_ROOM_2 - warp_def 4, 1, 3, 2, SEAFLOOR_CAVERN_ROOM_3 - warp_def 14, 8, 1, 1, SEAFLOOR_CAVERN_ENTRANCE + warp_def 11, 21, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM2 + warp_def 4, 1, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM3 + warp_def 14, 8, 1, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE SeafloorCavern_Room6_MapEvents:: @ 8535ACC map_events 0x0, SeafloorCavern_Room6_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room7.inc b/data/maps/events/SeafloorCavern_Room7.inc index 002154473c..2d8fca9995 100644 --- a/data/maps/events/SeafloorCavern_Room7.inc +++ b/data/maps/events/SeafloorCavern_Room7.inc @@ -1,6 +1,6 @@ SeafloorCavern_Room7_MapWarps: @ 8535AE0 - warp_def 3, 23, 3, 3, SEAFLOOR_CAVERN_ROOM_2 - warp_def 5, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_3 + warp_def 3, 23, 3, 3, MAP_SEAFLOOR_CAVERN_ROOM2 + warp_def 5, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM3 SeafloorCavern_Room7_MapEvents:: @ 8535AF0 map_events 0x0, SeafloorCavern_Room7_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room8.inc b/data/maps/events/SeafloorCavern_Room8.inc index 65a1da0146..8049afd965 100644 --- a/data/maps/events/SeafloorCavern_Room8.inc +++ b/data/maps/events/SeafloorCavern_Room8.inc @@ -13,8 +13,8 @@ SeafloorCavern_Room8_EventObjects: @ 8535B04 object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 28, 0, 0 SeafloorCavern_Room8_MapWarps: @ 8535C24 - warp_def 5, 2, 3, 0, SEAFLOOR_CAVERN_ROOM_9 - warp_def 5, 12, 3, 0, SEAFLOOR_CAVERN_ROOM_3 + warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9 + warp_def 5, 12, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM3 SeafloorCavern_Room8_MapEvents:: @ 8535C34 map_events SeafloorCavern_Room8_EventObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/events/SeafloorCavern_Room9.inc index 8c203021c1..ffa9830edc 100644 --- a/data/maps/events/SeafloorCavern_Room9.inc +++ b/data/maps/events/SeafloorCavern_Room9.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room9_EventObjects: @ 8535C48 object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 0, 17, 38, 3, 8, 17, 0, 0, 0, 0x0, 733, 0, 0 SeafloorCavern_Room9_MapWarps: @ 8535CF0 - warp_def 5, 4, 3, 0, SEAFLOOR_CAVERN_ROOM_8 + warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 SeafloorCavern_Room9_MapCoordEvents: @ 8535CF8 coord_event 17, 42, 3, 0, VAR_0x40A2, 0, 0, SeafloorCavern_Room9_EventScript_234DC9 diff --git a/data/maps/events/SealedChamber_InnerRoom.inc b/data/maps/events/SealedChamber_InnerRoom.inc index 753d6dbfb5..dd331570ea 100644 --- a/data/maps/events/SealedChamber_InnerRoom.inc +++ b/data/maps/events/SealedChamber_InnerRoom.inc @@ -1,5 +1,5 @@ SealedChamber_InnerRoom_MapWarps: @ 8536F00 - warp_def 10, 19, 3, 0, SEALED_CHAMBER_OUTER_ROOM + warp_def 10, 19, 3, 0, MAP_SEALED_CHAMBER_OUTER_ROOM SealedChamber_InnerRoom_MapBGEvents: @ 8536F08 bg_event 10, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_2391F8 diff --git a/data/maps/events/SealedChamber_OuterRoom.inc b/data/maps/events/SealedChamber_OuterRoom.inc index 21be37675f..0181f31937 100644 --- a/data/maps/events/SealedChamber_OuterRoom.inc +++ b/data/maps/events/SealedChamber_OuterRoom.inc @@ -1,5 +1,5 @@ SealedChamber_OuterRoom_MapWarps: @ 8536D88 - warp_def 10, 2, 3, 0, SEALED_CHAMBER_INNER_ROOM + warp_def 10, 2, 3, 0, MAP_SEALED_CHAMBER_INNER_ROOM SealedChamber_OuterRoom_MapBGEvents: @ 8536D90 bg_event 5, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23916C diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/events/SecretBase_BlueCave1.inc index 301779af5a..c495a2b4c4 100644 --- a/data/maps/events/SecretBase_BlueCave1.inc +++ b/data/maps/events/SecretBase_BlueCave1.inc @@ -16,7 +16,7 @@ SecretBase_BlueCave1_EventObjects: @ 8537BEC object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BlueCave1_MapWarps: @ 8537D54 - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_BlueCave1_MapEvents:: @ 8537D5C map_events SecretBase_BlueCave1_EventObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/events/SecretBase_BlueCave2.inc index f919cfae0c..0c3d9dc297 100644 --- a/data/maps/events/SecretBase_BlueCave2.inc +++ b/data/maps/events/SecretBase_BlueCave2.inc @@ -16,7 +16,7 @@ SecretBase_BlueCave2_EventObjects: @ 8538504 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BlueCave2_MapWarps: @ 853866C - warp_def 7, 5, 0, 126, NONE + warp_def 7, 5, 0, 126, MAP_NONE SecretBase_BlueCave2_MapEvents:: @ 8538674 map_events SecretBase_BlueCave2_EventObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/events/SecretBase_BlueCave3.inc index ba2b28eb19..fb8018dca6 100644 --- a/data/maps/events/SecretBase_BlueCave3.inc +++ b/data/maps/events/SecretBase_BlueCave3.inc @@ -16,7 +16,7 @@ SecretBase_BlueCave3_EventObjects: @ 8538E1C object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BlueCave3_MapWarps: @ 8538F84 - warp_def 4, 15, 0, 126, NONE + warp_def 4, 15, 0, 126, MAP_NONE SecretBase_BlueCave3_MapEvents:: @ 8538F8C map_events SecretBase_BlueCave3_EventObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/events/SecretBase_BlueCave4.inc index cc79f44be2..d6da82af50 100644 --- a/data/maps/events/SecretBase_BlueCave4.inc +++ b/data/maps/events/SecretBase_BlueCave4.inc @@ -16,7 +16,7 @@ SecretBase_BlueCave4_EventObjects: @ 8539734 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BlueCave4_MapWarps: @ 853989C - warp_def 4, 15, 0, 126, NONE + warp_def 4, 15, 0, 126, MAP_NONE SecretBase_BlueCave4_MapEvents:: @ 85398A4 map_events SecretBase_BlueCave4_EventObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/events/SecretBase_BrownCave1.inc index e937ac1f43..52c7cc504c 100644 --- a/data/maps/events/SecretBase_BrownCave1.inc +++ b/data/maps/events/SecretBase_BrownCave1.inc @@ -16,7 +16,7 @@ SecretBase_BrownCave1_EventObjects: @ 8537A68 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BrownCave1_MapWarps: @ 8537BD0 - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_BrownCave1_MapEvents:: @ 8537BD8 map_events SecretBase_BrownCave1_EventObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/events/SecretBase_BrownCave2.inc index d3885cb0d4..5849476fef 100644 --- a/data/maps/events/SecretBase_BrownCave2.inc +++ b/data/maps/events/SecretBase_BrownCave2.inc @@ -16,7 +16,7 @@ SecretBase_BrownCave2_EventObjects: @ 8538380 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BrownCave2_MapWarps: @ 85384E8 - warp_def 1, 7, 0, 126, NONE + warp_def 1, 7, 0, 126, MAP_NONE SecretBase_BrownCave2_MapEvents:: @ 85384F0 map_events SecretBase_BrownCave2_EventObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/events/SecretBase_BrownCave3.inc index c0ec35e376..3b0b495525 100644 --- a/data/maps/events/SecretBase_BrownCave3.inc +++ b/data/maps/events/SecretBase_BrownCave3.inc @@ -16,7 +16,7 @@ SecretBase_BrownCave3_EventObjects: @ 8538C98 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BrownCave3_MapWarps: @ 8538E00 - warp_def 11, 9, 0, 126, NONE + warp_def 11, 9, 0, 126, MAP_NONE SecretBase_BrownCave3_MapEvents:: @ 8538E08 map_events SecretBase_BrownCave3_EventObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/events/SecretBase_BrownCave4.inc index de9250cbb9..d298884a53 100644 --- a/data/maps/events/SecretBase_BrownCave4.inc +++ b/data/maps/events/SecretBase_BrownCave4.inc @@ -16,7 +16,7 @@ SecretBase_BrownCave4_EventObjects: @ 85395B0 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BrownCave4_MapWarps: @ 8539718 - warp_def 2, 8, 0, 126, NONE + warp_def 2, 8, 0, 126, MAP_NONE SecretBase_BrownCave4_MapEvents:: @ 8539720 map_events SecretBase_BrownCave4_EventObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/events/SecretBase_RedCave1.inc index aa664f45c9..51ea103122 100644 --- a/data/maps/events/SecretBase_RedCave1.inc +++ b/data/maps/events/SecretBase_RedCave1.inc @@ -16,7 +16,7 @@ SecretBase_RedCave1_EventObjects: @ 85378E4 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_RedCave1_MapWarps: @ 8537A4C - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_RedCave1_MapEvents:: @ 8537A54 map_events SecretBase_RedCave1_EventObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/events/SecretBase_RedCave2.inc index 956e3b03b4..eeda14062b 100644 --- a/data/maps/events/SecretBase_RedCave2.inc +++ b/data/maps/events/SecretBase_RedCave2.inc @@ -16,7 +16,7 @@ SecretBase_RedCave2_EventObjects: @ 85381FC object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_RedCave2_MapWarps: @ 8538364 - warp_def 3, 14, 0, 126, NONE + warp_def 3, 14, 0, 126, MAP_NONE SecretBase_RedCave2_MapEvents:: @ 853836C map_events SecretBase_RedCave2_EventObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/events/SecretBase_RedCave3.inc index dfdbec94c6..3b72537b39 100644 --- a/data/maps/events/SecretBase_RedCave3.inc +++ b/data/maps/events/SecretBase_RedCave3.inc @@ -16,7 +16,7 @@ SecretBase_RedCave3_EventObjects: @ 8538B14 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_RedCave3_MapWarps: @ 8538C7C - warp_def 3, 6, 0, 126, NONE + warp_def 3, 6, 0, 126, MAP_NONE SecretBase_RedCave3_MapEvents:: @ 8538C84 map_events SecretBase_RedCave3_EventObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/events/SecretBase_RedCave4.inc index b485d0ad94..e375824e90 100644 --- a/data/maps/events/SecretBase_RedCave4.inc +++ b/data/maps/events/SecretBase_RedCave4.inc @@ -16,7 +16,7 @@ SecretBase_RedCave4_EventObjects: @ 853942C object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_RedCave4_MapWarps: @ 8539594 - warp_def 2, 12, 0, 126, NONE + warp_def 2, 12, 0, 126, MAP_NONE SecretBase_RedCave4_MapEvents:: @ 853959C map_events SecretBase_RedCave4_EventObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/events/SecretBase_Shrub1.inc index 545426eea0..133e21afd6 100644 --- a/data/maps/events/SecretBase_Shrub1.inc +++ b/data/maps/events/SecretBase_Shrub1.inc @@ -16,7 +16,7 @@ SecretBase_Shrub1_EventObjects: @ 8538078 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Shrub1_MapWarps: @ 85381E0 - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_Shrub1_MapEvents:: @ 85381E8 map_events SecretBase_Shrub1_EventObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/events/SecretBase_Shrub2.inc index 0adb6b76d3..12ee646482 100644 --- a/data/maps/events/SecretBase_Shrub2.inc +++ b/data/maps/events/SecretBase_Shrub2.inc @@ -16,7 +16,7 @@ SecretBase_Shrub2_EventObjects: @ 8538990 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Shrub2_MapWarps: @ 8538AF8 - warp_def 7, 5, 0, 126, NONE + warp_def 7, 5, 0, 126, MAP_NONE SecretBase_Shrub2_MapEvents:: @ 8538B00 map_events SecretBase_Shrub2_EventObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/events/SecretBase_Shrub3.inc index b8f4d4ed4a..57d0c07adf 100644 --- a/data/maps/events/SecretBase_Shrub3.inc +++ b/data/maps/events/SecretBase_Shrub3.inc @@ -16,7 +16,7 @@ SecretBase_Shrub3_EventObjects: @ 85392A8 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Shrub3_MapWarps: @ 8539410 - warp_def 6, 9, 0, 126, NONE + warp_def 6, 9, 0, 126, MAP_NONE SecretBase_Shrub3_MapEvents:: @ 8539418 map_events SecretBase_Shrub3_EventObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/events/SecretBase_Shrub4.inc index 679b313d5a..234a30943a 100644 --- a/data/maps/events/SecretBase_Shrub4.inc +++ b/data/maps/events/SecretBase_Shrub4.inc @@ -16,7 +16,7 @@ SecretBase_Shrub4_EventObjects: @ 8539BC0 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Shrub4_MapWarps: @ 8539D28 - warp_def 11, 8, 0, 126, NONE + warp_def 11, 8, 0, 126, MAP_NONE SecretBase_Shrub4_MapEvents:: @ 8539D30 map_events SecretBase_Shrub4_EventObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/events/SecretBase_Tree1.inc index 4020814509..73b572717b 100644 --- a/data/maps/events/SecretBase_Tree1.inc +++ b/data/maps/events/SecretBase_Tree1.inc @@ -16,7 +16,7 @@ SecretBase_Tree1_EventObjects: @ 8537EF4 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Tree1_MapWarps: @ 853805C - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_Tree1_MapEvents:: @ 8538064 map_events SecretBase_Tree1_EventObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/events/SecretBase_Tree2.inc index ddfbf094c6..d45021a2ec 100644 --- a/data/maps/events/SecretBase_Tree2.inc +++ b/data/maps/events/SecretBase_Tree2.inc @@ -16,7 +16,7 @@ SecretBase_Tree2_EventObjects: @ 853880C object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Tree2_MapWarps: @ 8538974 - warp_def 3, 14, 0, 126, NONE + warp_def 3, 14, 0, 126, MAP_NONE SecretBase_Tree2_MapEvents:: @ 853897C map_events SecretBase_Tree2_EventObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/events/SecretBase_Tree3.inc index a13916bc7c..c903add8d6 100644 --- a/data/maps/events/SecretBase_Tree3.inc +++ b/data/maps/events/SecretBase_Tree3.inc @@ -16,7 +16,7 @@ SecretBase_Tree3_EventObjects: @ 8539124 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Tree3_MapWarps: @ 853928C - warp_def 8, 6, 0, 126, NONE + warp_def 8, 6, 0, 126, MAP_NONE SecretBase_Tree3_MapEvents:: @ 8539294 map_events SecretBase_Tree3_EventObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/events/SecretBase_Tree4.inc index 4511b236c2..45a9182d00 100644 --- a/data/maps/events/SecretBase_Tree4.inc +++ b/data/maps/events/SecretBase_Tree4.inc @@ -16,7 +16,7 @@ SecretBase_Tree4_EventObjects: @ 8539A3C object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Tree4_MapWarps: @ 8539BA4 - warp_def 7, 12, 0, 126, NONE + warp_def 7, 12, 0, 126, MAP_NONE SecretBase_Tree4_MapEvents:: @ 8539BAC map_events SecretBase_Tree4_EventObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/events/SecretBase_YellowCave1.inc index 6fc02d447e..5f2779b27e 100644 --- a/data/maps/events/SecretBase_YellowCave1.inc +++ b/data/maps/events/SecretBase_YellowCave1.inc @@ -16,7 +16,7 @@ SecretBase_YellowCave1_EventObjects: @ 8537D70 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_YellowCave1_MapWarps: @ 8537ED8 - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_YellowCave1_MapEvents:: @ 8537EE0 map_events SecretBase_YellowCave1_EventObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/events/SecretBase_YellowCave2.inc index 646176740f..2eb1f86605 100644 --- a/data/maps/events/SecretBase_YellowCave2.inc +++ b/data/maps/events/SecretBase_YellowCave2.inc @@ -16,7 +16,7 @@ SecretBase_YellowCave2_EventObjects: @ 8538688 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_YellowCave2_MapWarps: @ 85387F0 - warp_def 12, 7, 0, 126, NONE + warp_def 12, 7, 0, 126, MAP_NONE SecretBase_YellowCave2_MapEvents:: @ 85387F8 map_events SecretBase_YellowCave2_EventObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/events/SecretBase_YellowCave3.inc index 32b71c477a..ca749ef060 100644 --- a/data/maps/events/SecretBase_YellowCave3.inc +++ b/data/maps/events/SecretBase_YellowCave3.inc @@ -16,7 +16,7 @@ SecretBase_YellowCave3_EventObjects: @ 8538FA0 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_YellowCave3_MapWarps: @ 8539108 - warp_def 5, 9, 0, 126, NONE + warp_def 5, 9, 0, 126, MAP_NONE SecretBase_YellowCave3_MapEvents:: @ 8539110 map_events SecretBase_YellowCave3_EventObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/events/SecretBase_YellowCave4.inc index 187d0dff9c..ab8a4d010c 100644 --- a/data/maps/events/SecretBase_YellowCave4.inc +++ b/data/maps/events/SecretBase_YellowCave4.inc @@ -16,7 +16,7 @@ SecretBase_YellowCave4_EventObjects: @ 85398B8 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_YellowCave4_MapWarps: @ 8539A20 - warp_def 6, 12, 0, 126, NONE + warp_def 6, 12, 0, 126, MAP_NONE SecretBase_YellowCave4_MapEvents:: @ 8539A28 map_events SecretBase_YellowCave4_EventObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc index dda65b0fe2..4b5ce03159 100644 --- a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc +++ b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc @@ -3,10 +3,10 @@ ShoalCave_LowTideEntranceRoom_EventObjects: @ 853627C object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 18, 15, 3, 9, 17, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0, 0, 0 ShoalCave_LowTideEntranceRoom_MapWarps: @ 85362AC - warp_def 20, 30, 3, 0, ROUTE_125 - warp_def 19, 5, 3, 0, SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 6, 2, 3, 6, SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 27, 2, 3, 7, SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 20, 30, 3, 0, MAP_ROUTE125 + warp_def 19, 5, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 6, 2, 3, 6, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 27, 2, 3, 7, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM ShoalCave_LowTideEntranceRoom_MapEvents:: @ 85362CC map_events ShoalCave_LowTideEntranceRoom_EventObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.inc b/data/maps/events/ShoalCave_LowTideIceRoom.inc index 809fb146c4..4ecc5efe4c 100644 --- a/data/maps/events/ShoalCave_LowTideIceRoom.inc +++ b/data/maps/events/ShoalCave_LowTideIceRoom.inc @@ -3,7 +3,7 @@ ShoalCave_LowTideIceRoom_EventObjects: @ 8537100 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 21, 4, 1, 17, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, 1113, 0, 0 ShoalCave_LowTideIceRoom_MapWarps: @ 8537130 - warp_def 17, 10, 3, 3, SHOAL_CAVE_LOW_TIDE_LOWER_ROOM + warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM ShoalCave_LowTideIceRoom_MapEvents:: @ 8537138 map_events ShoalCave_LowTideIceRoom_EventObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.inc b/data/maps/events/ShoalCave_LowTideInnerRoom.inc index 4d48e1aab1..4d610e8284 100644 --- a/data/maps/events/ShoalCave_LowTideInnerRoom.inc +++ b/data/maps/events/ShoalCave_LowTideInnerRoom.inc @@ -2,14 +2,14 @@ ShoalCave_LowTideInnerRoom_EventObjects: @ 85362E0 object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 26, 14, 5, 1, 17, 0, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, 1082, 0, 0 ShoalCave_LowTideInnerRoom_MapWarps: @ 85362F8 - warp_def 34, 29, 3, 1, SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM - warp_def 38, 15, 3, 0, SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM - warp_def 42, 4, 3, 1, SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM - warp_def 19, 14, 4, 0, SHOAL_CAVE_LOW_TIDE_LOWER_ROOM - warp_def 15, 19, 3, 1, SHOAL_CAVE_LOW_TIDE_LOWER_ROOM - warp_def 30, 25, 3, 2, SHOAL_CAVE_LOW_TIDE_LOWER_ROOM - warp_def 14, 33, 5, 2, SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM - warp_def 40, 33, 5, 3, SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM + warp_def 34, 29, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM + warp_def 38, 15, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM + warp_def 42, 4, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM + warp_def 19, 14, 4, 0, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM + warp_def 15, 19, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM + warp_def 30, 25, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM + warp_def 14, 33, 5, 2, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM + warp_def 40, 33, 5, 3, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM ShoalCave_LowTideInnerRoom_MapBGEvents: @ 8536338 bg_event 31, 8, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_23708C diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/events/ShoalCave_LowTideLowerRoom.inc index d3484961ee..752482a7ea 100644 --- a/data/maps/events/ShoalCave_LowTideLowerRoom.inc +++ b/data/maps/events/ShoalCave_LowTideLowerRoom.inc @@ -3,10 +3,10 @@ ShoalCave_LowTideLowerRoom_EventObjects: @ 85363DC object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 11, 4, 3, 2, 17, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2371B2, 0, 0, 0 ShoalCave_LowTideLowerRoom_MapWarps: @ 853640C - warp_def 7, 2, 3, 3, SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 2, 6, 3, 4, SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 19, 11, 3, 5, SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 28, 11, 3, 0, SHOAL_CAVE_LOW_TIDE_ICE_ROOM + warp_def 7, 2, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 2, 6, 3, 4, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 19, 11, 3, 5, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 28, 11, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM ShoalCave_LowTideLowerRoom_MapBGEvents: @ 853642C bg_event 18, 2, 3, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_237176 diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.inc b/data/maps/events/ShoalCave_LowTideStairsRoom.inc index 556524f057..6df886e80d 100644 --- a/data/maps/events/ShoalCave_LowTideStairsRoom.inc +++ b/data/maps/events/ShoalCave_LowTideStairsRoom.inc @@ -2,8 +2,8 @@ ShoalCave_LowTideStairsRoom_EventObjects: @ 8536394 object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 12, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, 1083, 0, 0 ShoalCave_LowTideStairsRoom_MapWarps: @ 85363AC - warp_def 3, 12, 3, 1, SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 7, 4, 3, 2, SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 3, 12, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 7, 4, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM ShoalCave_LowTideStairsRoom_MapBGEvents: @ 85363BC bg_event 11, 11, 3, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_23711A diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/events/SingleBattleColosseum.inc index 382cafe164..ac59cd8daa 100644 --- a/data/maps/events/SingleBattleColosseum.inc +++ b/data/maps/events/SingleBattleColosseum.inc @@ -2,8 +2,8 @@ SingleBattleColosseum_EventObjects: @ 8539D44 object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 9, 3, 3, 9, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0, 0, 0 SingleBattleColosseum_MapWarps: @ 8539D5C - warp_def 6, 8, 3, 127, NONE - warp_def 7, 8, 3, 127, NONE + warp_def 6, 8, 3, 127, MAP_NONE + warp_def 7, 8, 3, 127, MAP_NONE SingleBattleColosseum_MapCoordEvents: @ 8539D6C coord_event 3, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277374 diff --git a/data/maps/events/SkyPillar_1F.inc b/data/maps/events/SkyPillar_1F.inc index c9eda68b06..59ac1aac0d 100644 --- a/data/maps/events/SkyPillar_1F.inc +++ b/data/maps/events/SkyPillar_1F.inc @@ -1,7 +1,7 @@ SkyPillar_1F_MapWarps: @ 8537058 - warp_def 6, 13, 3, 1, SKY_PILLAR_OUTSIDE - warp_def 7, 13, 3, 1, SKY_PILLAR_OUTSIDE - warp_def 10, 1, 3, 0, SKY_PILLAR_2F + warp_def 6, 13, 3, 1, MAP_SKY_PILLAR_OUTSIDE + warp_def 7, 13, 3, 1, MAP_SKY_PILLAR_OUTSIDE + warp_def 10, 1, 3, 0, MAP_SKY_PILLAR_2F SkyPillar_1F_MapEvents:: @ 8537070 map_events 0x0, SkyPillar_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_2F.inc b/data/maps/events/SkyPillar_2F.inc index 1c81f78389..780db9cccd 100644 --- a/data/maps/events/SkyPillar_2F.inc +++ b/data/maps/events/SkyPillar_2F.inc @@ -1,6 +1,6 @@ SkyPillar_2F_MapWarps: @ 8537084 - warp_def 10, 1, 3, 2, SKY_PILLAR_1F - warp_def 3, 1, 3, 0, SKY_PILLAR_3F + warp_def 10, 1, 3, 2, MAP_SKY_PILLAR_1F + warp_def 3, 1, 3, 0, MAP_SKY_PILLAR_3F SkyPillar_2F_MapEvents:: @ 8537094 map_events 0x0, SkyPillar_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_3F.inc b/data/maps/events/SkyPillar_3F.inc index c8a97565b6..2e7697395a 100644 --- a/data/maps/events/SkyPillar_3F.inc +++ b/data/maps/events/SkyPillar_3F.inc @@ -1,7 +1,7 @@ SkyPillar_3F_MapWarps: @ 85370A8 - warp_def 3, 1, 3, 1, SKY_PILLAR_2F - warp_def 11, 1, 3, 0, SKY_PILLAR_4F - warp_def 7, 1, 3, 1, SKY_PILLAR_4F + warp_def 3, 1, 3, 1, MAP_SKY_PILLAR_2F + warp_def 11, 1, 3, 0, MAP_SKY_PILLAR_4F + warp_def 7, 1, 3, 1, MAP_SKY_PILLAR_4F SkyPillar_3F_MapEvents:: @ 85370C0 map_events 0x0, SkyPillar_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_4F.inc b/data/maps/events/SkyPillar_4F.inc index a399d1364d..248e36f958 100644 --- a/data/maps/events/SkyPillar_4F.inc +++ b/data/maps/events/SkyPillar_4F.inc @@ -1,7 +1,7 @@ SkyPillar_4F_MapWarps: @ 85370D4 - warp_def 11, 1, 3, 1, SKY_PILLAR_3F - warp_def 7, 1, 3, 2, SKY_PILLAR_3F - warp_def 3, 1, 3, 0, SKY_PILLAR_5F + warp_def 11, 1, 3, 1, MAP_SKY_PILLAR_3F + warp_def 7, 1, 3, 2, MAP_SKY_PILLAR_3F + warp_def 3, 1, 3, 0, MAP_SKY_PILLAR_5F SkyPillar_4F_MapEvents:: @ 85370EC map_events 0x0, SkyPillar_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_5F.inc b/data/maps/events/SkyPillar_5F.inc index d6ce944cb0..c0acb14c08 100644 --- a/data/maps/events/SkyPillar_5F.inc +++ b/data/maps/events/SkyPillar_5F.inc @@ -1,6 +1,6 @@ SkyPillar_5F_MapWarps: @ 853714C - warp_def 3, 1, 3, 2, SKY_PILLAR_4F - warp_def 10, 1, 3, 0, SKY_PILLAR_TOP + warp_def 3, 1, 3, 2, MAP_SKY_PILLAR_4F + warp_def 10, 1, 3, 0, MAP_SKY_PILLAR_TOP SkyPillar_5F_MapEvents:: @ 853715C map_events 0x0, SkyPillar_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_Entrance.inc b/data/maps/events/SkyPillar_Entrance.inc index 5a63e2496a..92cf0da9bf 100644 --- a/data/maps/events/SkyPillar_Entrance.inc +++ b/data/maps/events/SkyPillar_Entrance.inc @@ -1,6 +1,6 @@ SkyPillar_Entrance_MapWarps: @ 8536FF8 - warp_def 6, 16, 3, 0, ROUTE_131 - warp_def 14, 4, 3, 0, SKY_PILLAR_OUTSIDE + warp_def 6, 16, 3, 0, MAP_ROUTE131 + warp_def 14, 4, 3, 0, MAP_SKY_PILLAR_OUTSIDE SkyPillar_Entrance_MapEvents:: @ 8537008 map_events 0x0, SkyPillar_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_Outside.inc b/data/maps/events/SkyPillar_Outside.inc index 78991499c8..f16f577ef6 100644 --- a/data/maps/events/SkyPillar_Outside.inc +++ b/data/maps/events/SkyPillar_Outside.inc @@ -2,8 +2,8 @@ SkyPillar_Outside_EventObjects: @ 853701C object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 0, 13, 7, 3, 8, 17, 0, 0, 0, SkyPillar_Outside_EventScript_2393F8, 855, 0, 0 SkyPillar_Outside_MapWarps: @ 8537034 - warp_def 17, 13, 3, 1, SKY_PILLAR_ENTRANCE - warp_def 14, 5, 0, 0, SKY_PILLAR_1F + warp_def 17, 13, 3, 1, MAP_SKY_PILLAR_ENTRANCE + warp_def 14, 5, 0, 0, MAP_SKY_PILLAR_1F SkyPillar_Outside_MapEvents:: @ 8537044 map_events SkyPillar_Outside_EventObjects, SkyPillar_Outside_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_Top.inc b/data/maps/events/SkyPillar_Top.inc index 792f350b8f..2634e9dfd7 100644 --- a/data/maps/events/SkyPillar_Top.inc +++ b/data/maps/events/SkyPillar_Top.inc @@ -3,7 +3,7 @@ SkyPillar_Top_EventObjects: @ 8537170 object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 0, 14, 6, 3, 8, 17, 0, 0, 0, SkyPillar_Top_EventScript_239722, 80, 0, 0 SkyPillar_Top_MapWarps: @ 85371A0 - warp_def 16, 14, 3, 1, SKY_PILLAR_5F + warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F SkyPillar_Top_MapCoordEvents: @ 85371A8 coord_event 14, 9, 3, 0, VAR_0x40D7, 0, 0, SkyPillar_Top_EventScript_23979A diff --git a/data/maps/events/SlateportCity.inc b/data/maps/events/SlateportCity.inc index c429ae7f53..c4f629f5b1 100644 --- a/data/maps/events/SlateportCity.inc +++ b/data/maps/events/SlateportCity.inc @@ -36,17 +36,17 @@ SlateportCity_EventObjects: @ 85261CC object_event 35, EVENT_OBJ_GFX_SCOTT, 0, 0, 10, 12, 0, 8, 33, 0, 0, 0, 0x0, 749, 0, 0 SlateportCity_MapWarps: @ 8526514 - warp_def 19, 19, 0, 0, SLATEPORT_CITY_POKEMON_CENTER_1F - warp_def 13, 26, 0, 0, SLATEPORT_CITY_MART - warp_def 26, 38, 0, 0, SLATEPORT_CITY_STERNS_SHIPYARD_1F - warp_def 10, 12, 0, 0, SLATEPORT_CITY_BATTLE_TENT_LOBBY - warp_def 4, 26, 0, 0, SLATEPORT_CITY_POKEMON_FAN_CLUB - warp_def 30, 26, 0, 0, SLATEPORT_CITY_OCEANIC_MUSEUM_1F - warp_def 5, 19, 0, 0, SLATEPORT_CITY_HOUSE_1 - warp_def 31, 26, 0, 1, SLATEPORT_CITY_OCEANIC_MUSEUM_1F - warp_def 28, 12, 0, 0, SLATEPORT_CITY_HARBOR - warp_def 40, 7, 0, 2, SLATEPORT_CITY_HARBOR - warp_def 21, 44, 0, 0, SLATEPORT_CITY_HOUSE_2 + warp_def 19, 19, 0, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F + warp_def 13, 26, 0, 0, MAP_SLATEPORT_CITY_MART + warp_def 26, 38, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F + warp_def 10, 12, 0, 0, MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY + warp_def 4, 26, 0, 0, MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB + warp_def 30, 26, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F + warp_def 5, 19, 0, 0, MAP_SLATEPORT_CITY_HOUSE1 + warp_def 31, 26, 0, 1, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F + warp_def 28, 12, 0, 0, MAP_SLATEPORT_CITY_HARBOR + warp_def 40, 7, 0, 2, MAP_SLATEPORT_CITY_HARBOR + warp_def 21, 44, 0, 0, MAP_SLATEPORT_CITY_HOUSE2 SlateportCity_MapCoordEvents: @ 852656C coord_event 10, 13, 3, 0, VAR_0x40D2, 2, 0, SlateportCity_EventScript_1DD5DC diff --git a/data/maps/events/SlateportCity_BattleTentLobby.inc b/data/maps/events/SlateportCity_BattleTentLobby.inc index 3368d1ba29..bb33b654a2 100644 --- a/data/maps/events/SlateportCity_BattleTentLobby.inc +++ b/data/maps/events/SlateportCity_BattleTentLobby.inc @@ -6,8 +6,8 @@ SlateportCity_BattleTentLobby_EventObjects: @ 852F408 object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 11, 8, 3, 9, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0, 0, 0 SlateportCity_BattleTentLobby_MapWarps: @ 852F480 - warp_def 6, 9, 0, 3, SLATEPORT_CITY - warp_def 7, 9, 0, 3, SLATEPORT_CITY + warp_def 6, 9, 0, 3, MAP_SLATEPORT_CITY + warp_def 7, 9, 0, 3, MAP_SLATEPORT_CITY SlateportCity_BattleTentLobby_MapBGEvents: @ 852F490 bg_event 4, 5, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A99 diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/events/SlateportCity_Harbor.inc index b7a767f3c0..f501f871d9 100644 --- a/data/maps/events/SlateportCity_Harbor.inc +++ b/data/maps/events/SlateportCity_Harbor.inc @@ -9,10 +9,10 @@ SlateportCity_Harbor_EventObjects: @ 852FA68 object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 0, 7, 9, 1, 10, 0, 0, 0, 0, 0x0, 848, 0, 0 SlateportCity_Harbor_MapWarps: @ 852FB28 - warp_def 11, 14, 0, 8, SLATEPORT_CITY - warp_def 12, 14, 0, 8, SLATEPORT_CITY - warp_def 19, 15, 0, 9, SLATEPORT_CITY - warp_def 20, 15, 0, 9, SLATEPORT_CITY + warp_def 11, 14, 0, 8, MAP_SLATEPORT_CITY + warp_def 12, 14, 0, 8, MAP_SLATEPORT_CITY + warp_def 19, 15, 0, 9, MAP_SLATEPORT_CITY + warp_def 20, 15, 0, 9, MAP_SLATEPORT_CITY SlateportCity_Harbor_MapCoordEvents: @ 852FB48 coord_event 8, 11, 3, 0, VAR_0x40A0, 1, 0, SlateportCity_Harbor_EventScript_20C9BB diff --git a/data/maps/events/SlateportCity_House1.inc b/data/maps/events/SlateportCity_House1.inc index 96bf5fba91..40fc70d011 100644 --- a/data/maps/events/SlateportCity_House1.inc +++ b/data/maps/events/SlateportCity_House1.inc @@ -2,8 +2,8 @@ SlateportCity_House1_EventObjects: @ 852F538 object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0, 0, 0 SlateportCity_House1_MapWarps: @ 852F550 - warp_def 3, 7, 0, 6, SLATEPORT_CITY - warp_def 4, 7, 0, 6, SLATEPORT_CITY + warp_def 3, 7, 0, 6, MAP_SLATEPORT_CITY + warp_def 4, 7, 0, 6, MAP_SLATEPORT_CITY SlateportCity_House1_MapEvents:: @ 852F560 map_events SlateportCity_House1_EventObjects, SlateportCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_House2.inc b/data/maps/events/SlateportCity_House2.inc index 4bd43a5d40..519bc696fd 100644 --- a/data/maps/events/SlateportCity_House2.inc +++ b/data/maps/events/SlateportCity_House2.inc @@ -3,8 +3,8 @@ SlateportCity_House2_EventObjects: @ 852FB9C object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9B8, 0, 0, 0 SlateportCity_House2_MapWarps: @ 852FBCC - warp_def 3, 7, 0, 10, SLATEPORT_CITY - warp_def 4, 7, 0, 10, SLATEPORT_CITY + warp_def 3, 7, 0, 10, MAP_SLATEPORT_CITY + warp_def 4, 7, 0, 10, MAP_SLATEPORT_CITY SlateportCity_House2_MapEvents:: @ 852FBDC map_events SlateportCity_House2_EventObjects, SlateportCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_Mart.inc b/data/maps/events/SlateportCity_Mart.inc index c952cf34e9..88d6132c71 100644 --- a/data/maps/events/SlateportCity_Mart.inc +++ b/data/maps/events/SlateportCity_Mart.inc @@ -4,8 +4,8 @@ SlateportCity_Mart_EventObjects: @ 852FCF0 object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 5, 3, 1, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0, 0, 0 SlateportCity_Mart_MapWarps: @ 852FD38 - warp_def 3, 7, 0, 1, SLATEPORT_CITY - warp_def 4, 7, 0, 1, SLATEPORT_CITY + warp_def 3, 7, 0, 1, MAP_SLATEPORT_CITY + warp_def 4, 7, 0, 1, MAP_SLATEPORT_CITY SlateportCity_Mart_MapEvents:: @ 852FD48 map_events SlateportCity_Mart_EventObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc index 9f97d892d9..70e05b38a8 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc @@ -15,9 +15,9 @@ SlateportCity_OceanicMuseum_1F_EventObjects: @ 852F670 object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 0, 7, 4, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, 961, 0, 0 SlateportCity_OceanicMuseum_1F_MapWarps: @ 852F7C0 - warp_def 9, 8, 0, 5, SLATEPORT_CITY - warp_def 10, 8, 0, 7, SLATEPORT_CITY - warp_def 6, 1, 0, 0, SLATEPORT_CITY_OCEANIC_MUSEUM_2F + warp_def 9, 8, 0, 5, MAP_SLATEPORT_CITY + warp_def 10, 8, 0, 7, MAP_SLATEPORT_CITY + warp_def 6, 1, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F SlateportCity_OceanicMuseum_1F_MapCoordEvents: @ 852F7D8 coord_event 9, 7, 3, 0, VAR_0x40AA, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD9F diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc index 4bad8a43df..31ed1d3e49 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc @@ -8,7 +8,7 @@ SlateportCity_OceanicMuseum_2F_EventObjects: @ 852F8A8 object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 3, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, 961, 0, 0 SlateportCity_OceanicMuseum_2F_MapWarps: @ 852F950 - warp_def 6, 1, 0, 2, SLATEPORT_CITY_OCEANIC_MUSEUM_1F + warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F SlateportCity_OceanicMuseum_2F_MapBGEvents: @ 852F958 bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD0A diff --git a/data/maps/events/SlateportCity_PokemonCenter_1F.inc b/data/maps/events/SlateportCity_PokemonCenter_1F.inc index 4a63356959..f59fde2b39 100644 --- a/data/maps/events/SlateportCity_PokemonCenter_1F.inc +++ b/data/maps/events/SlateportCity_PokemonCenter_1F.inc @@ -4,9 +4,9 @@ SlateportCity_PokemonCenter_1F_EventObjects: @ 852FBF0 object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0, 0, 0 SlateportCity_PokemonCenter_1F_MapWarps: @ 852FC38 - warp_def 7, 8, 3, 0, SLATEPORT_CITY - warp_def 6, 8, 3, 0, SLATEPORT_CITY - warp_def 1, 6, 4, 0, SLATEPORT_CITY_POKEMON_CENTER_2F + warp_def 7, 8, 3, 0, MAP_SLATEPORT_CITY + warp_def 6, 8, 3, 0, MAP_SLATEPORT_CITY + warp_def 1, 6, 4, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_2F SlateportCity_PokemonCenter_1F_MapEvents:: @ 852FC50 map_events SlateportCity_PokemonCenter_1F_EventObjects, SlateportCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_PokemonCenter_2F.inc b/data/maps/events/SlateportCity_PokemonCenter_2F.inc index 43938e550b..02b6e8f647 100644 --- a/data/maps/events/SlateportCity_PokemonCenter_2F.inc +++ b/data/maps/events/SlateportCity_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ SlateportCity_PokemonCenter_2F_EventObjects: @ 852FC64 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 SlateportCity_PokemonCenter_2F_MapWarps: @ 852FCC4 - warp_def 1, 6, 4, 2, SLATEPORT_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER SlateportCity_PokemonCenter_2F_MapEvents:: @ 852FCDC map_events SlateportCity_PokemonCenter_2F_EventObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_PokemonFanClub.inc b/data/maps/events/SlateportCity_PokemonFanClub.inc index db5a8b97c7..4f4a7eac75 100644 --- a/data/maps/events/SlateportCity_PokemonFanClub.inc +++ b/data/maps/events/SlateportCity_PokemonFanClub.inc @@ -10,8 +10,8 @@ SlateportCity_PokemonFanClub_EventObjects: @ 852F574 object_event 9, EVENT_OBJ_GFX_MAN_5, 0, 0, 11, 8, 0, 9, 16, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0, 0, 0 SlateportCity_PokemonFanClub_MapWarps: @ 852F64C - warp_def 6, 10, 0, 4, SLATEPORT_CITY - warp_def 7, 10, 0, 4, SLATEPORT_CITY + warp_def 6, 10, 0, 4, MAP_SLATEPORT_CITY + warp_def 7, 10, 0, 4, MAP_SLATEPORT_CITY SlateportCity_PokemonFanClub_MapEvents:: @ 852F65C map_events SlateportCity_PokemonFanClub_EventObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.inc b/data/maps/events/SlateportCity_SternsShipyard_1F.inc index 6169dad1bc..76ead03e78 100644 --- a/data/maps/events/SlateportCity_SternsShipyard_1F.inc +++ b/data/maps/events/SlateportCity_SternsShipyard_1F.inc @@ -5,9 +5,9 @@ SlateportCity_SternsShipyard_1F_EventObjects: @ 852F318 object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 11, 3, 2, 33, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, 869, 0, 0 SlateportCity_SternsShipyard_1F_MapWarps: @ 852F378 - warp_def 2, 14, 0, 2, SLATEPORT_CITY - warp_def 3, 14, 0, 2, SLATEPORT_CITY - warp_def 3, 1, 0, 0, SLATEPORT_CITY_STERNS_SHIPYARD_2F + warp_def 2, 14, 0, 2, MAP_SLATEPORT_CITY + warp_def 3, 14, 0, 2, MAP_SLATEPORT_CITY + warp_def 3, 1, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F SlateportCity_SternsShipyard_1F_MapEvents:: @ 852F390 map_events SlateportCity_SternsShipyard_1F_EventObjects, SlateportCity_SternsShipyard_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_SternsShipyard_2F.inc b/data/maps/events/SlateportCity_SternsShipyard_2F.inc index 8224ed8ff9..487e387438 100644 --- a/data/maps/events/SlateportCity_SternsShipyard_2F.inc +++ b/data/maps/events/SlateportCity_SternsShipyard_2F.inc @@ -4,7 +4,7 @@ SlateportCity_SternsShipyard_2F_EventObjects: @ 852F3A4 object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 9, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_208647, 0, 0, 0 SlateportCity_SternsShipyard_2F_MapWarps: @ 852F3EC - warp_def 3, 1, 0, 2, SLATEPORT_CITY_STERNS_SHIPYARD_1F + warp_def 3, 1, 0, 2, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F SlateportCity_SternsShipyard_2F_MapEvents:: @ 852F3F4 map_events SlateportCity_SternsShipyard_2F_EventObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/events/SootopolisCity.inc index acb70f2856..12340b727b 100644 --- a/data/maps/events/SootopolisCity.inc +++ b/data/maps/events/SootopolisCity.inc @@ -19,19 +19,19 @@ SootopolisCity_EventObjects: @ 8527314 object_event 18, EVENT_OBJ_GFX_WALLACE, 0, 0, 31, 18, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E6446, 816, 0, 0 SootopolisCity_MapWarps: @ 85274C4 - warp_def 43, 31, 0, 0, SOOTOPOLIS_CITY_POKEMON_CENTER_1F - warp_def 17, 29, 0, 0, SOOTOPOLIS_CITY_MART - warp_def 31, 32, 0, 0, SOOTOPOLIS_CITY_GYM_1F - warp_def 31, 16, 3, 0, CAVE_OF_ORIGIN_ENTRANCE - warp_def 9, 6, 0, 0, SOOTOPOLIS_CITY_HOUSE_1 - warp_def 45, 6, 0, 0, SOOTOPOLIS_CITY_HOUSE_2 - warp_def 9, 17, 0, 0, SOOTOPOLIS_CITY_HOUSE_3 - warp_def 44, 17, 0, 0, SOOTOPOLIS_CITY_HOUSE_4 - warp_def 9, 26, 0, 0, SOOTOPOLIS_CITY_HOUSE_5 - warp_def 53, 28, 0, 0, SOOTOPOLIS_CITY_HOUSE_6 - warp_def 8, 35, 0, 0, SOOTOPOLIS_CITY_HOUSE_7 - warp_def 48, 25, 0, 0, SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE - warp_def 51, 36, 0, 0, SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F + warp_def 43, 31, 0, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F + warp_def 17, 29, 0, 0, MAP_SOOTOPOLIS_CITY_MART + warp_def 31, 32, 0, 0, MAP_SOOTOPOLIS_CITY_GYM_1F + warp_def 31, 16, 3, 0, MAP_CAVE_OF_ORIGIN_ENTRANCE + warp_def 9, 6, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE1 + warp_def 45, 6, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE2 + warp_def 9, 17, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE3 + warp_def 44, 17, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE4 + warp_def 9, 26, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE5 + warp_def 53, 28, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE6 + warp_def 8, 35, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE7 + warp_def 48, 25, 0, 0, MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE + warp_def 51, 36, 0, 0, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F SootopolisCity_MapBGEvents: @ 852752C bg_event 33, 34, 3, 0, 0, SootopolisCity_EventScript_1E614B diff --git a/data/maps/events/SootopolisCity_Gym_1F.inc b/data/maps/events/SootopolisCity_Gym_1F.inc index 60e02f3fbd..b7ed20bae1 100644 --- a/data/maps/events/SootopolisCity_Gym_1F.inc +++ b/data/maps/events/SootopolisCity_Gym_1F.inc @@ -3,9 +3,9 @@ SootopolisCity_Gym_1F_EventObjects: @ 8532FF4 object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 0, 7, 24, 3, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_225040, 0, 0, 0 SootopolisCity_Gym_1F_MapWarps: @ 8533024 - warp_def 8, 25, 0, 2, SOOTOPOLIS_CITY - warp_def 9, 25, 0, 2, SOOTOPOLIS_CITY - warp_def 11, 22, 3, 0, SOOTOPOLIS_CITY_GYM_B1F + warp_def 8, 25, 0, 2, MAP_SOOTOPOLIS_CITY + warp_def 9, 25, 0, 2, MAP_SOOTOPOLIS_CITY + warp_def 11, 22, 3, 0, MAP_SOOTOPOLIS_CITY_GYM_B1F SootopolisCity_Gym_1F_MapBGEvents: @ 853303C bg_event 6, 24, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_22505F diff --git a/data/maps/events/SootopolisCity_Gym_B1F.inc b/data/maps/events/SootopolisCity_Gym_B1F.inc index 1d490490dc..83f87c6f65 100644 --- a/data/maps/events/SootopolisCity_Gym_B1F.inc +++ b/data/maps/events/SootopolisCity_Gym_B1F.inc @@ -11,7 +11,7 @@ SootopolisCity_Gym_B1F_EventObjects: @ 8533068 object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 10, 13, 3, 9, 17, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0, 0, 0 SootopolisCity_Gym_B1F_MapWarps: @ 8533158 - warp_def 11, 22, 3, 2, SOOTOPOLIS_CITY_GYM_1F + warp_def 11, 22, 3, 2, MAP_SOOTOPOLIS_CITY_GYM_1F SootopolisCity_Gym_B1F_MapEvents:: @ 8533160 map_events SootopolisCity_Gym_B1F_EventObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House1.inc b/data/maps/events/SootopolisCity_House1.inc index eaaf2d3342..349891e239 100644 --- a/data/maps/events/SootopolisCity_House1.inc +++ b/data/maps/events/SootopolisCity_House1.inc @@ -3,8 +3,8 @@ SootopolisCity_House1_EventObjects: @ 85332F8 object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22698E, 0, 0, 0 SootopolisCity_House1_MapWarps: @ 8533328 - warp_def 3, 6, 0, 4, SOOTOPOLIS_CITY - warp_def 4, 6, 0, 4, SOOTOPOLIS_CITY + warp_def 3, 6, 0, 4, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 4, MAP_SOOTOPOLIS_CITY SootopolisCity_House1_MapEvents:: @ 8533338 map_events SootopolisCity_House1_EventObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House2.inc b/data/maps/events/SootopolisCity_House2.inc index d00a1fa5f2..e22dbabb01 100644 --- a/data/maps/events/SootopolisCity_House2.inc +++ b/data/maps/events/SootopolisCity_House2.inc @@ -2,8 +2,8 @@ SootopolisCity_House2_EventObjects: @ 853334C object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0, 0, 0 SootopolisCity_House2_MapWarps: @ 8533364 - warp_def 3, 6, 0, 5, SOOTOPOLIS_CITY - warp_def 4, 6, 0, 5, SOOTOPOLIS_CITY + warp_def 3, 6, 0, 5, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 5, MAP_SOOTOPOLIS_CITY SootopolisCity_House2_MapEvents:: @ 8533374 map_events SootopolisCity_House2_EventObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House3.inc b/data/maps/events/SootopolisCity_House3.inc index b6407478ce..1cddb15699 100644 --- a/data/maps/events/SootopolisCity_House3.inc +++ b/data/maps/events/SootopolisCity_House3.inc @@ -3,8 +3,8 @@ SootopolisCity_House3_EventObjects: @ 8533388 object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_House3_EventScript_226B9B, 0, 0, 0 SootopolisCity_House3_MapWarps: @ 85333B8 - warp_def 3, 6, 0, 6, SOOTOPOLIS_CITY - warp_def 4, 6, 0, 6, SOOTOPOLIS_CITY + warp_def 3, 6, 0, 6, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 6, MAP_SOOTOPOLIS_CITY SootopolisCity_House3_MapEvents:: @ 85333C8 map_events SootopolisCity_House3_EventObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House4.inc b/data/maps/events/SootopolisCity_House4.inc index 223cc4f0da..7b54379ceb 100644 --- a/data/maps/events/SootopolisCity_House4.inc +++ b/data/maps/events/SootopolisCity_House4.inc @@ -4,8 +4,8 @@ SootopolisCity_House4_EventObjects: @ 85333DC object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, SootopolisCity_House4_EventScript_226D28, 0, 0, 0 SootopolisCity_House4_MapWarps: @ 8533424 - warp_def 3, 6, 0, 7, SOOTOPOLIS_CITY - warp_def 4, 6, 0, 7, SOOTOPOLIS_CITY + warp_def 3, 6, 0, 7, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 7, MAP_SOOTOPOLIS_CITY SootopolisCity_House4_MapEvents:: @ 8533434 map_events SootopolisCity_House4_EventObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House5.inc b/data/maps/events/SootopolisCity_House5.inc index 66a804c1aa..7e313bb780 100644 --- a/data/maps/events/SootopolisCity_House5.inc +++ b/data/maps/events/SootopolisCity_House5.inc @@ -3,8 +3,8 @@ SootopolisCity_House5_EventObjects: @ 8533448 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E9D, 0, 0, 0 SootopolisCity_House5_MapWarps: @ 8533478 - warp_def 3, 6, 0, 8, SOOTOPOLIS_CITY - warp_def 4, 6, 0, 8, SOOTOPOLIS_CITY + warp_def 3, 6, 0, 8, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 8, MAP_SOOTOPOLIS_CITY SootopolisCity_House5_MapEvents:: @ 8533488 map_events SootopolisCity_House5_EventObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House6.inc b/data/maps/events/SootopolisCity_House6.inc index 2c27b4ef28..0a5f019368 100644 --- a/data/maps/events/SootopolisCity_House6.inc +++ b/data/maps/events/SootopolisCity_House6.inc @@ -2,8 +2,8 @@ SootopolisCity_House6_EventObjects: @ 853349C object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 4, 3, 3, 2, 17, 0, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0, 0, 0 SootopolisCity_House6_MapWarps: @ 85334B4 - warp_def 3, 6, 0, 9, SOOTOPOLIS_CITY - warp_def 4, 6, 0, 9, SOOTOPOLIS_CITY + warp_def 3, 6, 0, 9, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 9, MAP_SOOTOPOLIS_CITY SootopolisCity_House6_MapEvents:: @ 85334C4 map_events SootopolisCity_House6_EventObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House7.inc b/data/maps/events/SootopolisCity_House7.inc index fbbbc55793..ddb32e0926 100644 --- a/data/maps/events/SootopolisCity_House7.inc +++ b/data/maps/events/SootopolisCity_House7.inc @@ -3,8 +3,8 @@ SootopolisCity_House7_EventObjects: @ 85334D8 object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 1, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0, 0, 0 SootopolisCity_House7_MapWarps: @ 8533508 - warp_def 3, 6, 0, 10, SOOTOPOLIS_CITY - warp_def 4, 6, 0, 10, SOOTOPOLIS_CITY + warp_def 3, 6, 0, 10, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 10, MAP_SOOTOPOLIS_CITY SootopolisCity_House7_MapEvents:: @ 8533518 map_events SootopolisCity_House7_EventObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc b/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc index ffd6fe203f..fe16e66291 100644 --- a/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc +++ b/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc @@ -3,8 +3,8 @@ SootopolisCity_LotadAndSeedotHouse_EventObjects: @ 853352C object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 5, 4, 3, 9, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22722B, 0, 0, 0 SootopolisCity_LotadAndSeedotHouse_MapWarps: @ 853355C - warp_def 3, 6, 0, 11, SOOTOPOLIS_CITY - warp_def 4, 6, 0, 11, SOOTOPOLIS_CITY + warp_def 3, 6, 0, 11, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 11, MAP_SOOTOPOLIS_CITY SootopolisCity_LotadAndSeedotHouse_MapBGEvents: @ 853356C bg_event 5, 1, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22734D diff --git a/data/maps/events/SootopolisCity_Mart.inc b/data/maps/events/SootopolisCity_Mart.inc index 30ff856208..263e12a879 100644 --- a/data/maps/events/SootopolisCity_Mart.inc +++ b/data/maps/events/SootopolisCity_Mart.inc @@ -4,8 +4,8 @@ SootopolisCity_Mart_EventObjects: @ 853328C object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 9, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267EC, 0, 0, 0 SootopolisCity_Mart_MapWarps: @ 85332D4 - warp_def 3, 7, 0, 1, SOOTOPOLIS_CITY - warp_def 4, 7, 0, 1, SOOTOPOLIS_CITY + warp_def 3, 7, 0, 1, MAP_SOOTOPOLIS_CITY + warp_def 4, 7, 0, 1, MAP_SOOTOPOLIS_CITY SootopolisCity_Mart_MapEvents:: @ 85332E4 map_events SootopolisCity_Mart_EventObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc b/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc index f6efd8225e..3c3742ba0e 100644 --- a/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc +++ b/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc @@ -2,9 +2,9 @@ SootopolisCity_MysteryEventsHouse_1F_EventObjects: @ 8533598 object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 6, 4, 0, 10, 0, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0, 0, 0 SootopolisCity_MysteryEventsHouse_1F_MapWarps: @ 85335B0 - warp_def 3, 7, 0, 12, SOOTOPOLIS_CITY - warp_def 4, 7, 0, 12, SOOTOPOLIS_CITY - warp_def 3, 1, 3, 0, SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F + warp_def 3, 7, 0, 12, MAP_SOOTOPOLIS_CITY + warp_def 4, 7, 0, 12, MAP_SOOTOPOLIS_CITY + warp_def 3, 1, 3, 0, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F SootopolisCity_MysteryEventsHouse_1F_MapEvents:: @ 85335C8 map_events SootopolisCity_MysteryEventsHouse_1F_EventObjects, SootopolisCity_MysteryEventsHouse_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc index faec348c29..605343baaf 100644 --- a/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc +++ b/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc @@ -2,7 +2,7 @@ SootopolisCity_MysteryEventsHouse_B1F_EventObjects: @ 85335DC object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 5, 0, 9, 17, 0, 0, 0, 0x0, 0, 0, 0 SootopolisCity_MysteryEventsHouse_B1F_MapWarps: @ 85335F4 - warp_def 3, 1, 0, 2, SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F + warp_def 3, 1, 0, 2, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F SootopolisCity_MysteryEventsHouse_B1F_MapEvents:: @ 85335FC map_events SootopolisCity_MysteryEventsHouse_B1F_EventObjects, SootopolisCity_MysteryEventsHouse_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc index afb2d586b2..3ef5954c5e 100644 --- a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc +++ b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ SootopolisCity_PokemonCenter_1F_EventObjects: @ 8533174 object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 2, 3, 3, 2, 17, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_2C8256, 0, 0, 0 SootopolisCity_PokemonCenter_1F_MapWarps: @ 85331D4 - warp_def 7, 8, 3, 0, SOOTOPOLIS_CITY - warp_def 6, 8, 3, 0, SOOTOPOLIS_CITY - warp_def 1, 6, 4, 0, SOOTOPOLIS_CITY_POKEMON_CENTER_2F + warp_def 7, 8, 3, 0, MAP_SOOTOPOLIS_CITY + warp_def 6, 8, 3, 0, MAP_SOOTOPOLIS_CITY + warp_def 1, 6, 4, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F SootopolisCity_PokemonCenter_1F_MapEvents:: @ 85331EC map_events SootopolisCity_PokemonCenter_1F_EventObjects, SootopolisCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc index 21be152fae..af62b1aed0 100644 --- a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc +++ b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ SootopolisCity_PokemonCenter_2F_EventObjects: @ 8533200 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 SootopolisCity_PokemonCenter_2F_MapWarps: @ 8533260 - warp_def 1, 6, 4, 2, SOOTOPOLIS_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER SootopolisCity_PokemonCenter_2F_MapEvents:: @ 8533278 map_events SootopolisCity_PokemonCenter_2F_EventObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SouthernIsland_Exterior.inc b/data/maps/events/SouthernIsland_Exterior.inc index 11cc35658e..4285b6a0f5 100644 --- a/data/maps/events/SouthernIsland_Exterior.inc +++ b/data/maps/events/SouthernIsland_Exterior.inc @@ -3,8 +3,8 @@ SouthernIsland_Exterior_EventObjects: @ 853B83C object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 13, 25, 1, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 SouthernIsland_Exterior_MapWarps: @ 853B86C - warp_def 14, 5, 3, 0, SOUTHERN_ISLAND_INTERIOR - warp_def 15, 5, 3, 1, SOUTHERN_ISLAND_INTERIOR + warp_def 14, 5, 3, 0, MAP_SOUTHERN_ISLAND_INTERIOR + warp_def 15, 5, 3, 1, MAP_SOUTHERN_ISLAND_INTERIOR SouthernIsland_Exterior_MapBGEvents: @ 853B87C bg_event 16, 7, 3, 0, 0, SouthernIsland_Exterior_EventScript_242A3C diff --git a/data/maps/events/SouthernIsland_Interior.inc b/data/maps/events/SouthernIsland_Interior.inc index 6a89414b21..86b4af8165 100644 --- a/data/maps/events/SouthernIsland_Interior.inc +++ b/data/maps/events/SouthernIsland_Interior.inc @@ -3,8 +3,8 @@ SouthernIsland_Interior_EventObjects: @ 853B89C object_event 2, EVENT_OBJ_GFX_TRADER, 0, 0, 13, 2, 0, 8, 0, 0, 0, 0, 0x0, 911, 0, 0 SouthernIsland_Interior_MapWarps: @ 853B8CC - warp_def 13, 18, 3, 0, SOUTHERN_ISLAND_EXTERIOR - warp_def 14, 18, 3, 1, SOUTHERN_ISLAND_EXTERIOR + warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR + warp_def 14, 18, 3, 1, MAP_SOUTHERN_ISLAND_EXTERIOR SouthernIsland_Interior_MapBGEvents: @ 853B8DC bg_event 13, 11, 3, 1, 0, SouthernIsland_Interior_EventScript_242AC4 diff --git a/data/maps/events/TerraCave_End.inc b/data/maps/events/TerraCave_End.inc index 88dbdf09a9..97edc03e48 100644 --- a/data/maps/events/TerraCave_End.inc +++ b/data/maps/events/TerraCave_End.inc @@ -2,7 +2,7 @@ TerraCave_End_EventObjects: @ 8537850 object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 0, 17, 22, 1, 8, 17, 0, 0, 0, 0x0, 783, 0, 0 TerraCave_End_MapWarps: @ 8537868 - warp_def 5, 4, 3, 1, TERRA_CAVE_ENTRANCE + warp_def 5, 4, 3, 1, MAP_TERRA_CAVE_ENTRANCE TerraCave_End_MapCoordEvents: @ 8537870 coord_event 17, 26, 3, 0, VAR_TEMP_1, 1, 0, TerraCave_End_EventScript_23B0EC diff --git a/data/maps/events/TerraCave_Entrance.inc b/data/maps/events/TerraCave_Entrance.inc index 3cea5a7c6b..a176c548db 100644 --- a/data/maps/events/TerraCave_Entrance.inc +++ b/data/maps/events/TerraCave_Entrance.inc @@ -1,6 +1,6 @@ TerraCave_Entrance_MapWarps: @ 853782C - warp_def 8, 18, 0, 127, NONE - warp_def 14, 1, 3, 0, TERRA_CAVE_END + warp_def 8, 18, 0, 127, MAP_NONE + warp_def 14, 1, 3, 0, MAP_TERRA_CAVE_END TerraCave_Entrance_MapEvents:: @ 853783C map_events 0x0, TerraCave_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/TradeCenter.inc b/data/maps/events/TradeCenter.inc index 25dbd31390..9595b920c2 100644 --- a/data/maps/events/TradeCenter.inc +++ b/data/maps/events/TradeCenter.inc @@ -2,8 +2,8 @@ TradeCenter_EventObjects: @ 8539DA0 object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0, 0, 0 TradeCenter_MapWarps: @ 8539DB8 - warp_def 5, 8, 3, 127, NONE - warp_def 6, 8, 3, 127, NONE + warp_def 5, 8, 3, 127, MAP_NONE + warp_def 6, 8, 3, 127, MAP_NONE TradeCenter_MapCoordEvents: @ 8539DC8 coord_event 4, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773F5 diff --git a/data/maps/events/TrainerHill_1F.inc b/data/maps/events/TrainerHill_1F.inc index ae8fecee75..2a2428f57d 100644 --- a/data/maps/events/TrainerHill_1F.inc +++ b/data/maps/events/TrainerHill_1F.inc @@ -1,6 +1,6 @@ TrainerHill_1F_MapWarps: @ 853D934 - warp_def 2, 1, 3, 2, TRAINER_HILL_ENTRANCE - warp_def 12, 1, 3, 0, TRAINER_HILL_2F + warp_def 2, 1, 3, 2, MAP_TRAINER_HILL_ENTRANCE + warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_2F TrainerHill_1F_MapEvents:: @ 853D944 map_events 0x0, TrainerHill_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/TrainerHill_2F.inc b/data/maps/events/TrainerHill_2F.inc index dc0e071a2a..ca50380d5f 100644 --- a/data/maps/events/TrainerHill_2F.inc +++ b/data/maps/events/TrainerHill_2F.inc @@ -1,6 +1,6 @@ TrainerHill_2F_MapWarps: @ 853D958 - warp_def 2, 1, 3, 1, TRAINER_HILL_1F - warp_def 12, 1, 3, 0, TRAINER_HILL_3F + warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_1F + warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_3F TrainerHill_2F_MapEvents:: @ 853D968 map_events 0x0, TrainerHill_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/TrainerHill_3F.inc b/data/maps/events/TrainerHill_3F.inc index c022f16d25..e12394655b 100644 --- a/data/maps/events/TrainerHill_3F.inc +++ b/data/maps/events/TrainerHill_3F.inc @@ -1,6 +1,6 @@ TrainerHill_3F_MapWarps: @ 853D97C - warp_def 2, 1, 3, 1, TRAINER_HILL_2F - warp_def 12, 1, 3, 0, TRAINER_HILL_4F + warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_2F + warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_4F TrainerHill_3F_MapEvents:: @ 853D98C map_events 0x0, TrainerHill_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/TrainerHill_4F.inc b/data/maps/events/TrainerHill_4F.inc index 7007a69a7e..e9696de151 100644 --- a/data/maps/events/TrainerHill_4F.inc +++ b/data/maps/events/TrainerHill_4F.inc @@ -1,6 +1,6 @@ TrainerHill_4F_MapWarps: @ 853D9A0 - warp_def 2, 1, 3, 1, TRAINER_HILL_3F - warp_def 12, 1, 3, 0, TRAINER_HILL_ROOF + warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_3F + warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_ROOF TrainerHill_4F_MapEvents:: @ 853D9B0 map_events 0x0, TrainerHill_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/TrainerHill_Elevator.inc b/data/maps/events/TrainerHill_Elevator.inc index 0a84d3b512..fe9af52431 100644 --- a/data/maps/events/TrainerHill_Elevator.inc +++ b/data/maps/events/TrainerHill_Elevator.inc @@ -2,8 +2,8 @@ TrainerHill_Elevator_EventObjects: @ 853DD84 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 0, 6, 3, 8, 17, 0, 0, 0, TrainerHill_Elevator_EventScript_26935F, 0, 0, 0 TrainerHill_Elevator_MapWarps: @ 853DD9C - warp_def 1, 6, 3, 1, TRAINER_HILL_ROOF - warp_def 2, 6, 3, 1, TRAINER_HILL_ROOF + warp_def 1, 6, 3, 1, MAP_TRAINER_HILL_ROOF + warp_def 2, 6, 3, 1, MAP_TRAINER_HILL_ROOF TrainerHill_Elevator_MapEvents:: @ 853DDAC map_events TrainerHill_Elevator_EventObjects, TrainerHill_Elevator_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/TrainerHill_Entrance.inc b/data/maps/events/TrainerHill_Entrance.inc index 832ab58380..3c8c4a82f9 100644 --- a/data/maps/events/TrainerHill_Entrance.inc +++ b/data/maps/events/TrainerHill_Entrance.inc @@ -6,9 +6,9 @@ TrainerHill_Entrance_EventObjects: @ 853D874 object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 14, 15, 3, 2, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_268391, 0, 0, 0 TrainerHill_Entrance_MapWarps: @ 853D8EC - warp_def 9, 16, 3, 4, ROUTE_111 - warp_def 10, 16, 3, 4, ROUTE_111 - warp_def 9, 1, 3, 0, TRAINER_HILL_1F + warp_def 9, 16, 3, 4, MAP_ROUTE111 + warp_def 10, 16, 3, 4, MAP_ROUTE111 + warp_def 9, 1, 3, 0, MAP_TRAINER_HILL_1F TrainerHill_Entrance_MapCoordEvents: @ 853D904 coord_event 9, 6, 3, 0, VAR_0x40D6, 0, 0, TrainerHill_Entrance_EventScript_268229 diff --git a/data/maps/events/TrainerHill_Roof.inc b/data/maps/events/TrainerHill_Roof.inc index 1ae00b9a25..826b774dde 100644 --- a/data/maps/events/TrainerHill_Roof.inc +++ b/data/maps/events/TrainerHill_Roof.inc @@ -2,8 +2,8 @@ TrainerHill_Roof_EventObjects: @ 853D9C4 object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 12, 7, 3, 8, 17, 0, 0, 0, TrainerHill_Roof_EventScript_268FB2, 0, 0, 0 TrainerHill_Roof_MapWarps: @ 853D9DC - warp_def 9, 5, 3, 1, TRAINER_HILL_4F - warp_def 15, 5, 0, 1, TRAINER_HILL_ELEVATOR + warp_def 9, 5, 3, 1, MAP_TRAINER_HILL_4F + warp_def 15, 5, 0, 1, MAP_TRAINER_HILL_ELEVATOR TrainerHill_Roof_MapEvents:: @ 853D9EC map_events TrainerHill_Roof_EventObjects, TrainerHill_Roof_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Underwater2.inc b/data/maps/events/Underwater2.inc index 097dbdc65d..416e9fe865 100644 --- a/data/maps/events/Underwater2.inc +++ b/data/maps/events/Underwater2.inc @@ -1,5 +1,5 @@ Underwater2_MapWarps: @ 852CF1C - warp_def 45, 65, 0, 0, UNDERWATER_SOOTOPOLIS_CITY + warp_def 45, 65, 0, 0, MAP_UNDERWATER_SOOTOPOLIS_CITY Underwater2_MapBGEvents: @ 852CF24 bg_event 30, 17, 3, 7, 0, ITEM_HEART_SCALE, 14, 0 diff --git a/data/maps/events/Underwater3.inc b/data/maps/events/Underwater3.inc index 66b7b87585..ba8ed9508d 100644 --- a/data/maps/events/Underwater3.inc +++ b/data/maps/events/Underwater3.inc @@ -1,6 +1,6 @@ Underwater3_MapWarps: @ 852CF98 - warp_def 57, 5, 0, 0, UNDERWATER_MARINE_CAVE - warp_def 67, 38, 0, 0, UNDERWATER_MARINE_CAVE + warp_def 57, 5, 0, 0, MAP_UNDERWATER_MARINE_CAVE + warp_def 67, 38, 0, 0, MAP_UNDERWATER_MARINE_CAVE Underwater3_MapBGEvents: @ 852CFA8 bg_event 12, 42, 3, 7, 0, ITEM_STAR_PIECE, 21, 0 diff --git a/data/maps/events/Underwater4.inc b/data/maps/events/Underwater4.inc index b1846f1aa5..5f8b99b644 100644 --- a/data/maps/events/Underwater4.inc +++ b/data/maps/events/Underwater4.inc @@ -1,5 +1,5 @@ Underwater4_MapWarps: @ 852CFEC - warp_def 38, 26, 3, 0, UNDERWATER_SEAFLOOR_CAVERN + warp_def 38, 26, 3, 0, MAP_UNDERWATER_SEAFLOOR_CAVERN Underwater4_MapBGEvents: @ 852CFF4 bg_event 38, 19, 3, 7, 0, ITEM_PROTEIN, 25, 0 diff --git a/data/maps/events/Underwater5.inc b/data/maps/events/Underwater5.inc index 7f72f3771b..4b902cf963 100644 --- a/data/maps/events/Underwater5.inc +++ b/data/maps/events/Underwater5.inc @@ -1,6 +1,6 @@ Underwater5_MapWarps: @ 852D020 - warp_def 26, 3, 0, 0, UNDERWATER_MARINE_CAVE - warp_def 32, 21, 0, 0, UNDERWATER_MARINE_CAVE + warp_def 26, 3, 0, 0, MAP_UNDERWATER_MARINE_CAVE + warp_def 32, 21, 0, 0, MAP_UNDERWATER_MARINE_CAVE Underwater5_MapEvents:: @ 852D030 map_events 0x0, Underwater5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Underwater6.inc b/data/maps/events/Underwater6.inc index ba5883d7c7..a624efba39 100644 --- a/data/maps/events/Underwater6.inc +++ b/data/maps/events/Underwater6.inc @@ -1,6 +1,6 @@ Underwater6_MapWarps: @ 852D044 - warp_def 13, 4, 0, 0, UNDERWATER_MARINE_CAVE - warp_def 17, 66, 0, 0, UNDERWATER_MARINE_CAVE + warp_def 13, 4, 0, 0, MAP_UNDERWATER_MARINE_CAVE + warp_def 17, 66, 0, 0, MAP_UNDERWATER_MARINE_CAVE Underwater6_MapEvents:: @ 852D054 map_events 0x0, Underwater6_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Underwater7.inc b/data/maps/events/Underwater7.inc index 0841a343e2..fba9324f6e 100644 --- a/data/maps/events/Underwater7.inc +++ b/data/maps/events/Underwater7.inc @@ -1,6 +1,6 @@ Underwater7_MapWarps: @ 852D068 - warp_def 22, 10, 0, 0, UNDERWATER_MARINE_CAVE - warp_def 45, 30, 0, 0, UNDERWATER_MARINE_CAVE + warp_def 22, 10, 0, 0, MAP_UNDERWATER_MARINE_CAVE + warp_def 45, 30, 0, 0, MAP_UNDERWATER_MARINE_CAVE Underwater7_MapEvents:: @ 852D078 map_events 0x0, Underwater7_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Underwater_MarineCave.inc b/data/maps/events/Underwater_MarineCave.inc index 9266cc5c3a..685abaa163 100644 --- a/data/maps/events/Underwater_MarineCave.inc +++ b/data/maps/events/Underwater_MarineCave.inc @@ -1,5 +1,5 @@ Underwater_MarineCave_MapWarps: @ 85377B0 - warp_def 9, 8, 0, 127, NONE + warp_def 9, 8, 0, 127, MAP_NONE Underwater_MarineCave_MapEvents:: @ 85377B8 map_events 0x0, Underwater_MarineCave_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Underwater_Route134.inc b/data/maps/events/Underwater_Route134.inc index 03ed08535b..3a5219511c 100644 --- a/data/maps/events/Underwater_Route134.inc +++ b/data/maps/events/Underwater_Route134.inc @@ -1,5 +1,5 @@ Underwater_Route134_MapWarps: @ 8536D44 - warp_def 8, 8, 0, 0, UNDERWATER_SEALED_CHAMBER + warp_def 8, 8, 0, 0, MAP_UNDERWATER_SEALED_CHAMBER Underwater_Route134_MapEvents:: @ 8536D4C map_events 0x0, Underwater_Route134_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Underwater_SeafloorCavern.inc b/data/maps/events/Underwater_SeafloorCavern.inc index 0bf82c2176..718fe9ebba 100644 --- a/data/maps/events/Underwater_SeafloorCavern.inc +++ b/data/maps/events/Underwater_SeafloorCavern.inc @@ -5,7 +5,7 @@ Underwater_SeafloorCavern_EventObjects: @ 8535640 object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 8, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0 Underwater_SeafloorCavern_MapWarps: @ 85356A0 - warp_def 6, 7, 0, 0, UNDERWATER_4 + warp_def 6, 7, 0, 0, MAP_UNDERWATER4 Underwater_SeafloorCavern_MapEvents:: @ 85356A8 map_events Underwater_SeafloorCavern_EventObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Underwater_SealedChamber.inc b/data/maps/events/Underwater_SealedChamber.inc index 9ef7be29e8..350cca5d66 100644 --- a/data/maps/events/Underwater_SealedChamber.inc +++ b/data/maps/events/Underwater_SealedChamber.inc @@ -1,5 +1,5 @@ Underwater_SealedChamber_MapWarps: @ 8536D60 - warp_def 7, 1, 0, 0, UNDERWATER_ROUTE_134 + warp_def 7, 1, 0, 0, MAP_UNDERWATER_ROUTE134 Underwater_SealedChamber_MapBGEvents: @ 8536D68 bg_event 12, 43, 0, 0, 0, Underwater_SealedChamber_EventScript_2390FC diff --git a/data/maps/events/Underwater_SootopolisCity.inc b/data/maps/events/Underwater_SootopolisCity.inc index 4b0cda4eb0..78839e8a1c 100644 --- a/data/maps/events/Underwater_SootopolisCity.inc +++ b/data/maps/events/Underwater_SootopolisCity.inc @@ -1,6 +1,6 @@ Underwater_SootopolisCity_MapWarps: @ 8534330 - warp_def 9, 8, 0, 0, UNDERWATER_2 - warp_def 10, 8, 0, 0, UNDERWATER_2 + warp_def 9, 8, 0, 0, MAP_UNDERWATER2 + warp_def 10, 8, 0, 0, MAP_UNDERWATER2 Underwater_SootopolisCity_MapEvents:: @ 8534340 map_events 0x0, Underwater_SootopolisCity_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/UnionRoom.inc b/data/maps/events/UnionRoom.inc index c79b11f5d4..cfa69c7f42 100644 --- a/data/maps/events/UnionRoom.inc +++ b/data/maps/events/UnionRoom.inc @@ -10,8 +10,8 @@ UnionRoom_EventObjects: @ 853B020 object_event 9, EVENT_OBJ_GFX_HIPSTER, 0, 0, 4, 6, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1E6, 703, 0, 0 UnionRoom_MapWarps: @ 853B0F8 - warp_def 7, 11, 3, 127, NONE - warp_def 8, 11, 3, 127, NONE + warp_def 7, 11, 3, 127, MAP_NONE + warp_def 8, 11, 3, 127, MAP_NONE UnionRoom_MapEvents:: @ 853B108 map_events UnionRoom_EventObjects, UnionRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown.inc b/data/maps/events/VerdanturfTown.inc index c309696574..3144323a35 100644 --- a/data/maps/events/VerdanturfTown.inc +++ b/data/maps/events/VerdanturfTown.inc @@ -5,13 +5,13 @@ VerdanturfTown_EventObjects: @ 8527CDC object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 0, 7, 6, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5B1, 0, 0, 0 VerdanturfTown_MapWarps: @ 8527D3C - warp_def 3, 7, 0, 0, VERDANTURF_TOWN_BATTLE_TENT_LOBBY - warp_def 12, 3, 0, 0, VERDANTURF_TOWN_MART - warp_def 16, 3, 0, 0, VERDANTURF_TOWN_POKEMON_CENTER_1F - warp_def 10, 14, 0, 0, VERDANTURF_TOWN_WANDAS_HOUSE - warp_def 8, 1, 0, 1, RUSTURF_TUNNEL - warp_def 1, 14, 0, 0, VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE - warp_def 17, 15, 0, 0, VERDANTURF_TOWN_HOUSE + warp_def 3, 7, 0, 0, MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY + warp_def 12, 3, 0, 0, MAP_VERDANTURF_TOWN_MART + warp_def 16, 3, 0, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F + warp_def 10, 14, 0, 0, MAP_VERDANTURF_TOWN_WANDAS_HOUSE + warp_def 8, 1, 0, 1, MAP_RUSTURF_TUNNEL + warp_def 1, 14, 0, 0, MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE + warp_def 17, 15, 0, 0, MAP_VERDANTURF_TOWN_HOUSE VerdanturfTown_MapBGEvents: @ 8527D74 bg_event 14, 3, 0, 1, 0, VerdanturfTown_EventScript_271E6A diff --git a/data/maps/events/VerdanturfTown_BattleTentLobby.inc b/data/maps/events/VerdanturfTown_BattleTentLobby.inc index 3f5ea9c68e..f32feeb2db 100644 --- a/data/maps/events/VerdanturfTown_BattleTentLobby.inc +++ b/data/maps/events/VerdanturfTown_BattleTentLobby.inc @@ -7,8 +7,8 @@ VerdanturfTown_BattleTentLobby_EventObjects: @ 852E648 object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 2, 8, 3, 9, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0, 0, 0 VerdanturfTown_BattleTentLobby_MapWarps: @ 852E6D8 - warp_def 6, 9, 0, 0, VERDANTURF_TOWN - warp_def 7, 9, 0, 0, VERDANTURF_TOWN + warp_def 6, 9, 0, 0, MAP_VERDANTURF_TOWN + warp_def 7, 9, 0, 0, MAP_VERDANTURF_TOWN VerdanturfTown_BattleTentLobby_MapBGEvents: @ 852E6E8 bg_event 4, 5, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201B02 diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc index 03cf2de7ac..9dd15bca96 100644 --- a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc +++ b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc @@ -3,8 +3,8 @@ VerdanturfTown_FriendshipRatersHouse_EventObjects: @ 852E9C8 object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA, 0, 0, 0 VerdanturfTown_FriendshipRatersHouse_MapWarps: @ 852E9F8 - warp_def 3, 7, 0, 5, VERDANTURF_TOWN - warp_def 4, 7, 0, 5, VERDANTURF_TOWN + warp_def 3, 7, 0, 5, MAP_VERDANTURF_TOWN + warp_def 4, 7, 0, 5, MAP_VERDANTURF_TOWN VerdanturfTown_FriendshipRatersHouse_MapEvents:: @ 852EA08 map_events VerdanturfTown_FriendshipRatersHouse_EventObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_House.inc b/data/maps/events/VerdanturfTown_House.inc index 0f37fe20b5..d90d304e16 100644 --- a/data/maps/events/VerdanturfTown_House.inc +++ b/data/maps/events/VerdanturfTown_House.inc @@ -3,8 +3,8 @@ VerdanturfTown_House_EventObjects: @ 852EA1C object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0, 0, 0 VerdanturfTown_House_MapWarps: @ 852EA4C - warp_def 3, 8, 0, 6, VERDANTURF_TOWN - warp_def 4, 8, 0, 6, VERDANTURF_TOWN + warp_def 3, 8, 0, 6, MAP_VERDANTURF_TOWN + warp_def 4, 8, 0, 6, MAP_VERDANTURF_TOWN VerdanturfTown_House_MapEvents:: @ 852EA5C map_events VerdanturfTown_House_EventObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_Mart.inc b/data/maps/events/VerdanturfTown_Mart.inc index 551126235a..c4ffa13695 100644 --- a/data/maps/events/VerdanturfTown_Mart.inc +++ b/data/maps/events/VerdanturfTown_Mart.inc @@ -5,8 +5,8 @@ VerdanturfTown_Mart_EventObjects: @ 852E790 object_event 4, EVENT_OBJ_GFX_LASS, 0, 0, 3, 2, 3, 9, 17, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025CC, 0, 0, 0 VerdanturfTown_Mart_MapWarps: @ 852E7F0 - warp_def 3, 7, 0, 1, VERDANTURF_TOWN - warp_def 4, 7, 0, 1, VERDANTURF_TOWN + warp_def 3, 7, 0, 1, MAP_VERDANTURF_TOWN + warp_def 4, 7, 0, 1, MAP_VERDANTURF_TOWN VerdanturfTown_Mart_MapEvents:: @ 852E800 map_events VerdanturfTown_Mart_EventObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc index d17513fd55..a020bf4185 100644 --- a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc +++ b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ VerdanturfTown_PokemonCenter_1F_EventObjects: @ 852E814 object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 10, 6, 3, 9, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0, 0, 0 VerdanturfTown_PokemonCenter_1F_MapWarps: @ 852E874 - warp_def 7, 8, 3, 2, VERDANTURF_TOWN - warp_def 6, 8, 3, 2, VERDANTURF_TOWN - warp_def 1, 6, 4, 0, VERDANTURF_TOWN_POKEMON_CENTER_2F + warp_def 7, 8, 3, 2, MAP_VERDANTURF_TOWN + warp_def 6, 8, 3, 2, MAP_VERDANTURF_TOWN + warp_def 1, 6, 4, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F VerdanturfTown_PokemonCenter_1F_MapEvents:: @ 852E88C map_events VerdanturfTown_PokemonCenter_1F_EventObjects, VerdanturfTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc index 4fcbd0e08d..76df12cd23 100644 --- a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc +++ b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ VerdanturfTown_PokemonCenter_2F_EventObjects: @ 852E8A0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 VerdanturfTown_PokemonCenter_2F_MapWarps: @ 852E900 - warp_def 1, 6, 4, 2, VERDANTURF_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER VerdanturfTown_PokemonCenter_2F_MapEvents:: @ 852E918 map_events VerdanturfTown_PokemonCenter_2F_EventObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/events/VerdanturfTown_WandasHouse.inc index 0700926795..a9e0c86b76 100644 --- a/data/maps/events/VerdanturfTown_WandasHouse.inc +++ b/data/maps/events/VerdanturfTown_WandasHouse.inc @@ -6,8 +6,8 @@ VerdanturfTown_WandasHouse_EventObjects: @ 852E92C object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, 984, 0, 0 VerdanturfTown_WandasHouse_MapWarps: @ 852E9A4 - warp_def 7, 7, 0, 3, VERDANTURF_TOWN - warp_def 8, 7, 0, 3, VERDANTURF_TOWN + warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN + warp_def 8, 7, 0, 3, MAP_VERDANTURF_TOWN VerdanturfTown_WandasHouse_MapEvents:: @ 852E9B4 map_events VerdanturfTown_WandasHouse_EventObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/events/VictoryRoad_1F.inc index 511782688a..43c3b5c54b 100644 --- a/data/maps/events/VictoryRoad_1F.inc +++ b/data/maps/events/VictoryRoad_1F.inc @@ -10,11 +10,11 @@ VictoryRoad_1F_EventObjects: @ 8535E04 object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 0, 32, 17, 3, 9, 17, 0, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0, 0, 0 VictoryRoad_1F_MapWarps: @ 8535EDC - warp_def 15, 40, 3, 2, EVER_GRANDE_CITY - warp_def 39, 5, 3, 3, EVER_GRANDE_CITY - warp_def 21, 32, 3, 5, VICTORY_ROAD_B1F - warp_def 42, 38, 4, 2, VICTORY_ROAD_B1F - warp_def 9, 14, 4, 4, VICTORY_ROAD_B1F + warp_def 15, 40, 3, 2, MAP_EVER_GRANDE_CITY + warp_def 39, 5, 3, 3, MAP_EVER_GRANDE_CITY + warp_def 21, 32, 3, 5, MAP_VICTORY_ROAD_B1F + warp_def 42, 38, 4, 2, MAP_VICTORY_ROAD_B1F + warp_def 9, 14, 4, 4, MAP_VICTORY_ROAD_B1F VictoryRoad_1F_MapCoordEvents: @ 8535F04 coord_event 2, 23, 4, 0, VAR_0x40C3, 0, 0, VictoryRoad_1F_EventScript_235DAF diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/events/VictoryRoad_B1F.inc index b251959ae9..eda774701c 100644 --- a/data/maps/events/VictoryRoad_B1F.inc +++ b/data/maps/events/VictoryRoad_B1F.inc @@ -22,13 +22,13 @@ VictoryRoad_B1F_EventObjects: @ 8535F44 object_event 21, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 14, 20, 3, 16, 17, 0, 1, 3, VictoryRoad_B1F_EventScript_236541, 0, 0, 0 VictoryRoad_B1F_MapWarps: @ 853613C - warp_def 30, 25, 3, 0, VICTORY_ROAD_B2F - warp_def 17, 16, 3, 2, VICTORY_ROAD_B2F - warp_def 42, 25, 3, 3, VICTORY_ROAD_1F - warp_def 42, 2, 4, 1, VICTORY_ROAD_B2F - warp_def 8, 3, 3, 4, VICTORY_ROAD_1F - warp_def 20, 21, 3, 2, VICTORY_ROAD_1F - warp_def 5, 26, 3, 3, VICTORY_ROAD_B2F + warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B2F + warp_def 17, 16, 3, 2, MAP_VICTORY_ROAD_B2F + warp_def 42, 25, 3, 3, MAP_VICTORY_ROAD_1F + warp_def 42, 2, 4, 1, MAP_VICTORY_ROAD_B2F + warp_def 8, 3, 3, 4, MAP_VICTORY_ROAD_1F + warp_def 20, 21, 3, 2, MAP_VICTORY_ROAD_1F + warp_def 5, 26, 3, 3, MAP_VICTORY_ROAD_B2F VictoryRoad_B1F_MapEvents:: @ 8536174 map_events VictoryRoad_B1F_EventObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VictoryRoad_B2F.inc b/data/maps/events/VictoryRoad_B2F.inc index 5e702c0c3f..080993cfee 100644 --- a/data/maps/events/VictoryRoad_B2F.inc +++ b/data/maps/events/VictoryRoad_B2F.inc @@ -8,10 +8,10 @@ VictoryRoad_B2F_EventObjects: @ 8536188 object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 0, 25, 21, 4, 7, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236931, 0, 0, 0 VictoryRoad_B2F_MapWarps: @ 8536230 - warp_def 30, 25, 3, 0, VICTORY_ROAD_B1F - warp_def 43, 2, 3, 3, VICTORY_ROAD_B1F - warp_def 19, 12, 3, 1, VICTORY_ROAD_B1F - warp_def 5, 26, 3, 6, VICTORY_ROAD_B1F + warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B1F + warp_def 43, 2, 3, 3, MAP_VICTORY_ROAD_B1F + warp_def 19, 12, 3, 1, MAP_VICTORY_ROAD_B1F + warp_def 5, 26, 3, 6, MAP_VICTORY_ROAD_B1F VictoryRoad_B2F_MapBGEvents: @ 8536250 bg_event 28, 5, 3, 7, 0, ITEM_ELIXIR, 82, 0 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 523aa67cae..f02ffbe662 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -468,14 +468,14 @@ OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD waitdooranim applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release compare VAR_0x8004, 5 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277036 special sub_809D2BC - warp SINGLE_BATTLE_COLOSSEUM, 255, 6, 8 + warp MAP_SINGLE_BATTLE_COLOSSEUM, 255, 6, 8 special sub_80AF948 waitstate end @@ -487,7 +487,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27702B:: @ 827702B OldaleTown_PokemonCenter_2F_EventScript_277036:: @ 8277036 special sub_809D2BC - warp DOUBLE_BATTLE_COLOSSEUM, 255, 5, 8 + warp MAP_DOUBLE_BATTLE_COLOSSEUM, 255, 5, 8 special sub_80AF948 waitstate end @@ -572,12 +572,12 @@ OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A waitdooranim applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release special sub_809D2BC - setwarp TRADE_CENTER, 255, 5, 8 + setwarp MAP_TRADE_CENTER, 255, 5, 8 special sub_80AF948 waitstate end @@ -647,12 +647,12 @@ OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C waitdooranim applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release special sub_809D2BC - setwarp RECORD_CORNER, 255, 8, 9 + setwarp MAP_RECORD_CORNER, 255, 8, 9 special sub_80AF948 waitstate end @@ -1046,12 +1046,12 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F waitdooranim applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY closedoor 5, 1 waitdooranim special sub_8018090 special sub_809D2BC - warpteleport2 UNION_ROOM, 255, 7, 11 + warpteleport2 MAP_UNION_ROOM, 255, 7, 11 waitstate special UnionRoomSpecial waitstate @@ -1385,7 +1385,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277B3A:: @ 8277B3A waitdooranim applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release @@ -1595,7 +1595,7 @@ MossdeepCity_GameCorner_1F_EventScript_277E0E:: @ 8277E0E closemessage applymovement 255, MossdeepCity_GameCorner_1F_Movement_277360 waitmovement 0 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY release waitstate end diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index 3f019f4d86..f19dfe322c 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -4,7 +4,7 @@ AbandonedShip_Corridors_B1F_MapScripts:: @ 8237D84 .byte 0 AbandonedShip_Corridors_B1F_MapScript1_237D8F: @ 8237D8F - setdivewarp ABANDONED_SHIP_UNDERWATER_1, 255, 5, 4 + setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 end AbandonedShip_Corridors_B1F_MapScript1_237D98: @ 8237D98 diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index b1bca85aa8..2cd278f918 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -4,7 +4,7 @@ AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 823896C .byte 0 AbandonedShip_HiddenFloorCorridors_MapScript1_238977: @ 8238977 - setdivewarp ABANDONED_SHIP_UNDERWATER_1, 255, 5, 4 + setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 end AbandonedShip_HiddenFloorCorridors_MapScript1_238980: @ 8238980 diff --git a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc b/data/scripts/maps/AbandonedShip_Rooms_B1F.inc index 784d44c2ed..d4a5c92334 100644 --- a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms_B1F.inc @@ -3,7 +3,7 @@ AbandonedShip_Rooms_B1F_MapScripts:: @ 8237FB7 .byte 0 AbandonedShip_Rooms_B1F_MapScript1_237FBD: @ 8237FBD - setdivewarp ABANDONED_SHIP_UNDERWATER_2, 255, 17, 4 + setdivewarp MAP_ABANDONED_SHIP_UNDERWATER2, 255, 17, 4 end AbandonedShip_Rooms_B1F_EventScript_237FC6:: @ 8237FC6 diff --git a/data/scripts/maps/AbandonedShip_Underwater1.inc b/data/scripts/maps/AbandonedShip_Underwater1.inc index 49971cde71..7e39b1939f 100644 --- a/data/scripts/maps/AbandonedShip_Underwater1.inc +++ b/data/scripts/maps/AbandonedShip_Underwater1.inc @@ -3,6 +3,6 @@ AbandonedShip_Underwater1_MapScripts:: @ 8238096 .byte 0 AbandonedShip_Underwater1_MapScript1_23809C: @ 823809C - setdivewarp ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 255, 0, 10 + setdivewarp MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 255, 0, 10 end diff --git a/data/scripts/maps/AbandonedShip_Underwater2.inc b/data/scripts/maps/AbandonedShip_Underwater2.inc index 19a786956c..17f52c6918 100644 --- a/data/scripts/maps/AbandonedShip_Underwater2.inc +++ b/data/scripts/maps/AbandonedShip_Underwater2.inc @@ -3,6 +3,6 @@ AbandonedShip_Underwater2_MapScripts:: @ 823895D .byte 0 AbandonedShip_Underwater2_MapScript1_238963: @ 8238963 - setdivewarp ABANDONED_SHIP_ROOMS_B1F, 255, 13, 7 + setdivewarp MAP_ABANDONED_SHIP_ROOMS_B1F, 255, 13, 7 end diff --git a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc index 27ea23b59a..076eeab6e3 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc @@ -37,7 +37,7 @@ BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2: @ 82574D2 BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC lockall - showobjectat 8, BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM + showobjectat 8, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE2 waitmovement 0 setvar VAR_0x8004, 1 @@ -113,7 +113,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257615:: @ 8257615 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special sub_81A1780 - warp BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8 + warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8 waitstate BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630 @@ -228,7 +228,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257852:: @ 8257852 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 special sub_81A1780 - warp BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8 + warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8 waitstate BattleFrontier_BattleArenaBattleRoom_EventScript_257870:: @ 8257870 @@ -533,7 +533,7 @@ BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C: @ 8257C0C .2byte 0 BattleFrontier_BattleArenaBattleRoom_EventScript_257C16:: @ 8257C16 - hideobjectat 8, BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM + hideobjectat 8, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM removeobject 7 call BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC applymovement 255, BattleFrontier_BattleArenaBattleRoom_Movement_24C773 diff --git a/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc b/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc index 83b602fc44..a353379c2b 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc @@ -20,7 +20,7 @@ BattleFrontier_BattleArenaCorridor_EventScript_2573C9:: @ 82573C9 applymovement 255, BattleFrontier_BattleArenaCorridor_Movement_25742C waitmovement 0 setvar VAR_0x8006, 0 - warp BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM, 255, 7, 5 + warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM, 255, 7, 5 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc b/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc index 7a0695445d..a376bfe228 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc @@ -218,7 +218,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54 call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256005 compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256050 - warp BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR, 255, 9, 13 + warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR, 255, 9, 13 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc index c46358aede..e853afda04 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc @@ -48,7 +48,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A call BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C970, 4 closemessage - showobjectat 13, BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM + showobjectat 13, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM compare VAR_TEMP_F, 3 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E compare VAR_TEMP_E, 0 @@ -188,7 +188,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0 switch VAR_RESULT case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 setvar VAR_0x8006, 1 - warp BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 3 + warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 3 waitstate BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62:: @ 824BF62 @@ -547,7 +547,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481: @ 824C481 .2byte 0 BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B - hideobjectat 13, BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM + hideobjectat 13, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM call BattleFrontier_BattleDomeBattleRoom_EventScript_24C502 call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC setvar VAR_TEMP_1, 1 @@ -953,12 +953,12 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5:: @ 824C8F5 copyvar VAR_RESULT, VAR_0x40CE compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F - warp BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 5, 11 + warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 5, 11 waitstate end BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F:: @ 824C90F - warp BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 17, 11 + warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 17, 11 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc b/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc index 6a97382d4b..989ebe2f30 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc @@ -41,7 +41,7 @@ BattleFrontier_BattleDomeCorridor_EventScript_24B161:: @ 824B161 BattleFrontier_BattleDomeCorridor_EventScript_24B18F:: @ 824B18F waitmovement 0 setvar VAR_0x8006, 0 - warp BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 7 + warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 7 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc b/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc index b08d0ca89c..1e50357bc8 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc @@ -266,7 +266,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2 closemessage call BattleFrontier_BattleDomeLobby_EventScript_249C6E special HealPlayerParty - warp BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR, 255, 23, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR, 255, 23, 6 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc index d19b4b999a..024162cee0 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc @@ -179,7 +179,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D waitmovement 0 closedoor 5, 1 waitdooranim - warp BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM, 255, 9, 5 + warp MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM, 255, 9, 5 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc index cdfd6edd60..5b6a674fb0 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc @@ -30,10 +30,10 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00: @ 825AE00 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE0A:: @ 825AE0A setvar VAR_TEMP_1, 1 - hideobjectat 255, BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM + hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM compare VAR_TEMP_F, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24 - hideobjectat 2, BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM + hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24:: @ 825AE24 end @@ -133,7 +133,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43:: @ 825AF43 switch VAR_RESULT case 7, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85 setvar VAR_0x8006, 1 - warp BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 8 + warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 8 waitstate BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85:: @ 825AF85 @@ -294,12 +294,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190:: @ 825B190 copyvar VAR_RESULT, VAR_0x40CE compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA - warp BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 4, 8 + warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 4, 8 waitstate end BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA:: @ 825B1AA - warp BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 14, 8 + warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 14, 8 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc b/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc index 4f2dea3431..ec24833903 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc @@ -225,7 +225,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_2587A7 applymovement 255, BattleFrontier_BattleFactoryLobby_Movement_2587AC waitmovement 0 - warp BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 13 + warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 13 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc index 875a3a2202..e05c498852 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc @@ -60,7 +60,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74:: @ 8259B74 compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B waitmovement 0 - warp BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM, 255, 6, 11 + warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM, 255, 6, 11 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc index 07ccbe79de..2ae154927b 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc @@ -33,7 +33,7 @@ BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861: @ 824F861 .2byte 0 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B - showobjectat 1, BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM + showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 @@ -233,7 +233,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97 setobjectxyperm 2, 15, 1 addobject 2 - hideobjectat 2, BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM + hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM setobjectxy 2, 13, 1 setobjectxyperm 2, 13, 1 applymovement 4, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEDF @@ -354,7 +354,7 @@ BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34: @ 824FE34 .2byte 0 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE3E:: @ 824FE3E - hideobjectat 1, BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM + hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM call BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833 setvar VAR_TEMP_1, 1 applymovement 255, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90 @@ -462,12 +462,12 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB:: @ 824FEBB copyvar VAR_RESULT, VAR_0x40CE compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5 - warp BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 5, 7 + warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 5, 7 waitstate end BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5:: @ 824FED5 - warp BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 19, 7 + warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 19, 7 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc b/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc index 89697ff33e..c8142a207b 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc @@ -55,7 +55,7 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F553:: @ 824F553 waitdooranim BattleFrontier_BattlePalaceCorridor_EventScript_24F581:: @ 824F581 - warp BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM, 255, 7, 4 + warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM, 255, 7, 4 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc b/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc index a5cb110816..91c1abd0fe 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc @@ -236,7 +236,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3 msgbox BattleFrontier_BattlePalaceLobby_Text_24E408, 4 closemessage call BattleFrontier_BattlePalaceLobby_EventScript_24DBBC - warp BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR, 255, 8, 13 + warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR, 255, 8, 13 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc b/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc index 4171da314b..23ad266920 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc @@ -32,7 +32,7 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786 setvar VAR_0x8006, 99 special sub_81A1780 call BattleFrontier_BattlePikeCorridor_EventScript_25BB49 - warpsilent BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc b/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc index 74bdb1d782..5323c4a6b1 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc @@ -212,7 +212,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C call BattleFrontier_BattlePikeLobby_EventScript_25BA94 special HealPlayerParty call BattleFrontier_BattlePikeLobby_EventScript_25BB49 - warpsilent BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR, 255, 6, 7 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR, 255, 6, 7 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc index fd5fd81e05..5098065319 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc @@ -46,7 +46,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A:: @ 825D20A setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special sub_81A1780 - warp BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 waitstate end @@ -128,7 +128,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB playse 268 delay 65 call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8A4 - showobjectat 1, BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_1 + showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 delay 4 call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8E7 delay 4 diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc index 39045c3178..4f0d4632bc 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc @@ -19,7 +19,7 @@ BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7:: @ 825E3A7 msgbox BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2, 4 closemessage releaseall - warp BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc index d93913df27..9256764e8e 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc @@ -20,7 +20,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_25E44A:: @ 825E44A setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special sub_81A1780 - warp BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc b/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc index 6bef7ba122..a4725036b0 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc @@ -27,7 +27,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891:: @ 825C891 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C89A:: @ 825C89A - warp BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc index 148ea97c12..eacee4cf3d 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc @@ -91,7 +91,7 @@ BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66 setvar VAR_0x8004, 14 special sub_81A8E7C special HealPlayerParty - warpsilent BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 waitstate end @@ -143,12 +143,12 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8 setvar VAR_0x8006, 0 special sub_81A1780 setvar VAR_RESULT, 0 - warp BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1 + warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1 waitstate end BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45 - warp BATTLE_FRONTIER_BATTLE_PYRAMID_TOP, 255, 17, 17 + warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP, 255, 17, 17 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc b/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc index e92c8d97fc..07b9fee477 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc @@ -219,7 +219,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21 special sub_81A1780 setvar VAR_RESULT, 0 special HealPlayerParty - warp BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1 + warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc index 9d83ab4e00..886b3fe011 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc @@ -111,7 +111,7 @@ BattleFrontier_BattlePyramidTop_EventScript_25521A:: @ 825521A setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 special sub_81A1780 - warp BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 + warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc index 087752d8fb..f684e215de 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc @@ -491,24 +491,24 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8:: @ 82421B8 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2 compare VAR_RESULT, 3 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC - warp BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 6, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate end BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8:: @ 82421E8 - warp BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 10, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 10, 6 waitstate end BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2:: @ 82421F2 - warp BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 14, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 14, 6 waitstate end BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC:: @ 82421FC setvar VAR_0x8004, 13 special sub_8161F74 - warp BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 18, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 18, 6 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc index 81c2dd563c..d1b07451cc 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc @@ -33,7 +33,7 @@ BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33: @ 8248F33 .2byte 0 BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D:: @ 8248F3D - hideobjectat 255, BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM_2 + hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2 end BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43: @ 8248F43 diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc b/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc index ef11021759..9ff6bbc59e 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc @@ -35,7 +35,7 @@ BattleFrontier_BattleTowerCorridor_EventScript_241B16:: @ 8241B16 BattleFrontier_BattleTowerCorridor_EventScript_241B27:: @ 8241B27 setvar VAR_TEMP_0, 0 - warp BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc b/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc index 39157609e8..36cf93ada0 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc @@ -33,9 +33,9 @@ BattleFrontier_BattleTowerCorridor2_MapScript2_248D95: @ 8248D95 .2byte 0 BattleFrontier_BattleTowerCorridor2_EventScript_248D9F:: @ 8248D9F - hideobjectat 255, BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2 - hideobjectat 1, BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2 - hideobjectat 4, BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2 + hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 + hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 + hideobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 special sub_8139980 end @@ -51,8 +51,8 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC opendoor 1, 1 waitdooranim clearflag FLAG_SPECIAL_FLAG_0x4002 - showobjectat 1, BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2 - showobjectat 4, BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2 + showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 + showobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 applymovement 1, BattleFrontier_BattleTowerCorridor2_Movement_248EE6 applymovement 4, BattleFrontier_BattleTowerCorridor2_Movement_248EE6 waitmovement 0 @@ -98,17 +98,17 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248E71:: @ 8248E71 return BattleFrontier_BattleTowerCorridor2_EventScript_248E9E:: @ 8248E9E - warp BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 waitstate return BattleFrontier_BattleTowerCorridor2_EventScript_248EA8:: @ 8248EA8 - warp BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM_2, 255, 4, 5 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2, 255, 4, 5 waitstate return BattleFrontier_BattleTowerCorridor2_EventScript_248EB2:: @ 8248EB2 - warp BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM_2, 255, 4, 5 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2, 255, 4, 5 waitstate return diff --git a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc b/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc index 433d8e1814..248c1f9ca8 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc @@ -35,24 +35,24 @@ BattleFrontier_BattleTowerElevator_EventScript_241A28:: @ 8241A28 return BattleFrontier_BattleTowerElevator_EventScript_241A55:: @ 8241A55 - warp BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR, 255, 8, 1 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR, 255, 8, 1 waitstate return BattleFrontier_BattleTowerElevator_EventScript_241A5F:: @ 8241A5F checkflag FLAG_0x152 goto_if 0, BattleFrontier_BattleTowerElevator_EventScript_241A7C - warp BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2, 255, 7, 2 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2, 255, 7, 2 waitstate return BattleFrontier_BattleTowerElevator_EventScript_241A72:: @ 8241A72 - warp BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2, 255, 7, 2 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2, 255, 7, 2 waitstate return BattleFrontier_BattleTowerElevator_EventScript_241A7C:: @ 8241A7C - warp BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 1 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 1 waitstate return diff --git a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc index d899b1cbe2..478d61656c 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc @@ -747,7 +747,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108 goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23F108 call BattleFrontier_BattleTowerLobby_EventScript_23F135 clearflag FLAG_0x077 - warp BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc index c1d3534d30..a2f003b858 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc @@ -112,7 +112,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5 call BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EE4 closedoor 10, 1 waitdooranim - warp BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6 waitstate releaseall end @@ -198,7 +198,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36 call_if 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF removeobject VAR_LAST_TALKED setflag FLAG_0x152 - warpsilent BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 3 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 3 waitstate release end diff --git a/data/scripts/maps/BattleFrontier_OutsideWest.inc b/data/scripts/maps/BattleFrontier_OutsideWest.inc index fa2ff7e36e..bd9d508dd6 100644 --- a/data/scripts/maps/BattleFrontier_OutsideWest.inc +++ b/data/scripts/maps/BattleFrontier_OutsideWest.inc @@ -39,7 +39,7 @@ BattleFrontier_OutsideWest_EventScript_23D458:: @ 823D458 goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE msgbox BattleFrontier_OutsideWest_Text_23D94B, 4 call BattleFrontier_OutsideWest_EventScript_23D4BA - warp SLATEPORT_CITY_HARBOR, 255, 8, 11 + warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate release end @@ -50,7 +50,7 @@ BattleFrontier_OutsideWest_EventScript_23D483:: @ 823D483 goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE msgbox BattleFrontier_OutsideWest_Text_23D94B, 4 call BattleFrontier_OutsideWest_EventScript_23D4BA - warp LILYCOVE_CITY_HARBOR, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end @@ -66,7 +66,7 @@ BattleFrontier_OutsideWest_EventScript_23D4BA:: @ 823D4BA applymovement VAR_LAST_TALKED, BattleFrontier_OutsideWest_Movement_2725AA waitmovement 0 delay 30 - hideobjectat 3, BATTLE_FRONTIER_OUTSIDE_WEST + hideobjectat 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST setvar VAR_0x8004, 2 call BattleFrontier_OutsideWest_EventScript_272250 return diff --git a/data/scripts/maps/BirthIsland_Harbor.inc b/data/scripts/maps/BirthIsland_Harbor.inc index bf82aa6d1e..fe939172d1 100644 --- a/data/scripts/maps/BirthIsland_Harbor.inc +++ b/data/scripts/maps/BirthIsland_Harbor.inc @@ -12,10 +12,10 @@ BirthIsland_Harbor_EventScript_26805D:: @ 826805D applymovement VAR_LAST_TALKED, BirthIsland_Harbor_Movement_2725AA waitmovement 0 delay 30 - hideobjectat 1, BIRTH_ISLAND_HARBOR + hideobjectat 1, MAP_BIRTH_ISLAND_HARBOR setvar VAR_0x8004, 2 call BirthIsland_Harbor_EventScript_272250 - warp LILYCOVE_CITY_HARBOR, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end diff --git a/data/scripts/maps/CaveOfOrigin_Entrance.inc b/data/scripts/maps/CaveOfOrigin_Entrance.inc index a4b96a48f6..1a771ae82e 100644 --- a/data/scripts/maps/CaveOfOrigin_Entrance.inc +++ b/data/scripts/maps/CaveOfOrigin_Entrance.inc @@ -3,6 +3,6 @@ CaveOfOrigin_Entrance_MapScripts:: @ 8235759 .byte 0 CaveOfOrigin_Entrance_MapScript1_23575F: @ 823575F - setescapewarp SOOTOPOLIS_CITY, 255, 31, 17 + setescapewarp MAP_SOOTOPOLIS_CITY, 255, 31, 17 end diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index 1edc1407d7..157c1f4d52 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -118,31 +118,31 @@ DewfordTown_EventScript_1E9656:: @ 81E9656 DewfordTown_EventScript_1E9660:: @ 81E9660 call DewfordTown_EventScript_271E95 - setobjectpriority 2, DEWFORD_TOWN, 0 - setobjectpriority 255, DEWFORD_TOWN, 0 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 + setobjectpriority 255, MAP_DEWFORD_TOWN, 0 applymovement 2, DewfordTown_Movement_1E991D waitmovement 0 removeobject 2 applymovement 255, DewfordTown_Movement_1E9911 waitmovement 0 - hideobjectat 255, DEWFORD_TOWN + hideobjectat 255, MAP_DEWFORD_TOWN call DewfordTown_EventScript_2720A0 applymovement 4, DewfordTown_Movement_1E97A2 applymovement 255, DewfordTown_Movement_1E97A2 waitmovement 0 - showobjectat 255, ROUTE_104 + showobjectat 255, MAP_ROUTE104 call DewfordTown_EventScript_2720A8 applymovement 255, DewfordTown_Movement_1E9914 waitmovement 0 - showobjectat 255, ROUTE_104 + showobjectat 255, MAP_ROUTE104 clearflag FLAG_0x2E3 clearflag FLAG_0x371 clearflag FLAG_0x2E6 setflag FLAG_0x2E7 - hideobjectat 4, DEWFORD_TOWN + hideobjectat 4, MAP_DEWFORD_TOWN setvar VAR_0x408E, 2 - resetobjectpriority 255, DEWFORD_TOWN - warp ROUTE_104_MR_BRINEYS_HOUSE, 255, 5, 4 + resetobjectpriority 255, MAP_DEWFORD_TOWN + warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 copyvar VAR_0x4096, VAR_0x8008 waitstate release @@ -150,40 +150,40 @@ DewfordTown_EventScript_1E9660:: @ 81E9660 DewfordTown_EventScript_1E96E7:: @ 81E96E7 call DewfordTown_EventScript_271E95 - setobjectpriority 2, DEWFORD_TOWN, 0 - setobjectpriority 255, DEWFORD_TOWN, 1 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 + setobjectpriority 255, MAP_DEWFORD_TOWN, 1 applymovement 2, DewfordTown_Movement_1E991D waitmovement 0 removeobject 2 applymovement 255, DewfordTown_Movement_1E9911 waitmovement 0 - hideobjectat 255, DEWFORD_TOWN + hideobjectat 255, MAP_DEWFORD_TOWN call DewfordTown_EventScript_2720A0 applymovement 4, DewfordTown_Movement_1E9865 applymovement 255, DewfordTown_Movement_1E9865 waitmovement 0 call DewfordTown_EventScript_2720A8 - showobjectat 255, ROUTE_109 + showobjectat 255, MAP_ROUTE109 applymovement 255, DewfordTown_Movement_1E9918 waitmovement 0 setobjectxyperm 2, 21, 26 addobject 2 - setobjectpriority 2, ROUTE_109, 0 + setobjectpriority 2, MAP_ROUTE109, 0 applymovement 2, DewfordTown_Movement_1E991F waitmovement 0 clearflag FLAG_0x2E5 addobject 1 clearflag FLAG_0x2E8 setflag FLAG_0x2E7 - hideobjectat 4, DEWFORD_TOWN + hideobjectat 4, MAP_DEWFORD_TOWN checkflag FLAG_0x095 call_if 0, DewfordTown_EventScript_1E9790 checkflag FLAG_0x095 call_if 1, DewfordTown_EventScript_1E9799 closemessage copyvar VAR_0x4096, VAR_0x8008 - resetobjectpriority 255, DEWFORD_TOWN - resetobjectpriority 2, ROUTE_109 + resetobjectpriority 255, MAP_DEWFORD_TOWN + resetobjectpriority 2, MAP_ROUTE109 moveobjectoffscreen 2 release end diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index bed242a2b5..3e68f4fedc 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -137,7 +137,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228C20 waitmovement 0 setflag FLAG_0x30D - warp EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16 + warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16 waitstate releaseall end diff --git a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc index 48703897e9..e373ff5ad3 100644 --- a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc +++ b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc @@ -32,7 +32,7 @@ FallarborTown_BattleTentBattleRoom_MapScript2_2008DD: @ 82008DD FallarborTown_BattleTentBattleRoom_EventScript_2008E7:: @ 82008E7 lockall - showobjectat 1, FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM + showobjectat 1, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B8D waitmovement 0 setvar VAR_0x8004, 1 @@ -73,7 +73,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20097E:: @ 820097E setvar VAR_0x8006, 4 special sub_81A1780 special LoadPlayerParty - warp FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 + warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate FallarborTown_BattleTentBattleRoom_EventScript_20099C:: @ 820099C @@ -158,7 +158,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200AF3:: @ 8200AF3 setvar VAR_0x8006, 3 special sub_81A1780 special LoadPlayerParty - warp FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 + warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 @@ -260,8 +260,8 @@ FallarborTown_BattleTentBattleRoom_MapScript2_200BB0: @ 8200BB0 .2byte 0 FallarborTown_BattleTentBattleRoom_EventScript_200BBA:: @ 8200BBA - hideobjectat 255, FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM - hideobjectat 1, FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM + hideobjectat 255, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM + hideobjectat 1, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM removeobject 3 setvar VAR_TEMP_1, 1 end diff --git a/data/scripts/maps/FallarborTown_BattleTentCorridor.inc b/data/scripts/maps/FallarborTown_BattleTentCorridor.inc index f1d3024c04..f1a144a143 100644 --- a/data/scripts/maps/FallarborTown_BattleTentCorridor.inc +++ b/data/scripts/maps/FallarborTown_BattleTentCorridor.inc @@ -20,7 +20,7 @@ FallarborTown_BattleTentCorridor_EventScript_2006B7:: @ 82006B7 closedoor 2, 1 waitdooranim setvar VAR_0x8006, 0 - warp FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM, 255, 4, 4 + warp MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM, 255, 4, 4 waitstate releaseall end diff --git a/data/scripts/maps/FallarborTown_BattleTentLobby.inc b/data/scripts/maps/FallarborTown_BattleTentLobby.inc index 1bde88e7d1..00efa5394b 100644 --- a/data/scripts/maps/FallarborTown_BattleTentLobby.inc +++ b/data/scripts/maps/FallarborTown_BattleTentLobby.inc @@ -204,7 +204,7 @@ FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C msgbox FallarborTown_BattleTentLobby_Text_2C4DC3, 4 closemessage call FallarborTown_BattleTentLobby_EventScript_2001CF - warp FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7 + warp MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/FarawayIsland_Entrance.inc b/data/scripts/maps/FarawayIsland_Entrance.inc index ff8af2e9f1..08331b33b8 100644 --- a/data/scripts/maps/FarawayIsland_Entrance.inc +++ b/data/scripts/maps/FarawayIsland_Entrance.inc @@ -27,10 +27,10 @@ FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2 applymovement VAR_LAST_TALKED, FarawayIsland_Entrance_Movement_2725AA waitmovement 0 delay 30 - hideobjectat 1, FARAWAY_ISLAND_ENTRANCE + hideobjectat 1, MAP_FARAWAY_ISLAND_ENTRANCE setvar VAR_0x8004, 2 call FarawayIsland_Entrance_EventScript_272250 - warp LILYCOVE_CITY_HARBOR, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end diff --git a/data/scripts/maps/GraniteCave_B1F.inc b/data/scripts/maps/GraniteCave_B1F.inc index bf5c4297fb..360b10a08b 100644 --- a/data/scripts/maps/GraniteCave_B1F.inc +++ b/data/scripts/maps/GraniteCave_B1F.inc @@ -6,6 +6,6 @@ GraniteCave_B1F_MapScripts:: @ 822DC5E GraniteCave_B1F_MapScript1_22DC6E: @ 822DC6E setstepcallback 7 - setholewarp GRANITE_CAVE_B2F, 255, 0, 0 + setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0 end diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index 3c4b241ace..963dd196d1 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -32,7 +32,7 @@ InsideOfTruck_EventScript_23BF20:: @ 823BF20 setflag FLAG_0x2DF setflag FLAG_0x331 setvar VAR_0x408C, 1 - setdynamicwarp LITTLEROOT_TOWN, 255, 3, 10 + setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10 releaseall end @@ -45,7 +45,7 @@ InsideOfTruck_EventScript_23BF46:: @ 823BF46 setflag FLAG_0x2E0 setflag FLAG_0x332 setvar VAR_0x4082, 1 - setdynamicwarp LITTLEROOT_TOWN, 255, 12, 10 + setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10 releaseall end diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 1f65b88fd7..a4609ab548 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -376,31 +376,31 @@ LilycoveCity_ContestLobby_EventScript_21A5EF:: @ 821A5EF return LilycoveCity_ContestLobby_EventScript_21A62F:: @ 821A62F - setwarp LINK_CONTEST_ROOM_4, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM4, 255, 7, 5 special sub_80AFC60 waitstate return LilycoveCity_ContestLobby_EventScript_21A63C:: @ 821A63C - setwarp LINK_CONTEST_ROOM_2, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM2, 255, 7, 5 special sub_80AFC60 waitstate return LilycoveCity_ContestLobby_EventScript_21A649:: @ 821A649 - setwarp LINK_CONTEST_ROOM_6, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM6, 255, 7, 5 special sub_80AFC60 waitstate return LilycoveCity_ContestLobby_EventScript_21A656:: @ 821A656 - setwarp LINK_CONTEST_ROOM_5, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM5, 255, 7, 5 special sub_80AFC60 waitstate return LilycoveCity_ContestLobby_EventScript_21A663:: @ 821A663 - setwarp LINK_CONTEST_ROOM_3, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM3, 255, 7, 5 special sub_80AFC60 waitstate return diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index b7ba171255..2347519104 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -59,7 +59,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2206C5:: @ 82206C5 LilycoveCity_DepartmentStoreElevator_EventScript_220718:: @ 8220718 setvar VAR_0x8006, 4 - setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 4 goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 @@ -69,7 +69,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220718:: @ 8220718 LilycoveCity_DepartmentStoreElevator_EventScript_220740:: @ 8220740 setvar VAR_0x8006, 5 - setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 5 goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 @@ -79,7 +79,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220740:: @ 8220740 LilycoveCity_DepartmentStoreElevator_EventScript_220768:: @ 8220768 setvar VAR_0x8006, 6 - setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 6 goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 @@ -89,7 +89,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220768:: @ 8220768 LilycoveCity_DepartmentStoreElevator_EventScript_220790:: @ 8220790 setvar VAR_0x8006, 7 - setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 7 goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 @@ -99,7 +99,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220790:: @ 8220790 LilycoveCity_DepartmentStoreElevator_EventScript_2207B8:: @ 82207B8 setvar VAR_0x8006, 8 - setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 8 goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 6357326c1e..1dfd9c29aa 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -3,7 +3,7 @@ LilycoveCity_Harbor_MapScripts:: @ 821E000 .byte 0 LilycoveCity_Harbor_MapScript1_21E006: @ 821E006 - setescapewarp LILYCOVE_CITY, 255, 12, 33 + setescapewarp MAP_LILYCOVE_CITY, 255, 12, 33 end LilycoveCity_Harbor_EventScript_21E00F:: @ 821E00F @@ -59,28 +59,28 @@ LilycoveCity_Harbor_EventScript_21E09F:: @ 821E09F LilycoveCity_Harbor_EventScript_21E109:: @ 821E109 call LilycoveCity_Harbor_EventScript_21E5CC - warp SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 + warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 waitstate release end LilycoveCity_Harbor_EventScript_21E119:: @ 821E119 call LilycoveCity_Harbor_EventScript_21E5CC - warp NAVEL_ROCK_HARBOR, 255, 8, 4 + warp MAP_NAVEL_ROCK_HARBOR, 255, 8, 4 waitstate release end LilycoveCity_Harbor_EventScript_21E129:: @ 821E129 call LilycoveCity_Harbor_EventScript_21E5CC - warp BIRTH_ISLAND_HARBOR, 255, 8, 4 + warp MAP_BIRTH_ISLAND_HARBOR, 255, 8, 4 waitstate release end LilycoveCity_Harbor_EventScript_21E139:: @ 821E139 call LilycoveCity_Harbor_EventScript_21E5CC - warp FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 + warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 waitstate release end @@ -91,7 +91,7 @@ LilycoveCity_Harbor_EventScript_21E149:: @ 821E149 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 setvar VAR_PORTHOLE, 5 call LilycoveCity_Harbor_EventScript_21E5CC - warp SS_TIDAL_CORRIDOR, 255, 1, 10 + warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate release end @@ -101,7 +101,7 @@ LilycoveCity_Harbor_EventScript_21E171:: @ 821E171 compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 call LilycoveCity_Harbor_EventScript_21E5CC - warp BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 + warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 waitstate release end @@ -226,7 +226,7 @@ LilycoveCity_Harbor_EventScript_21E2F0:: @ 821E2F0 LilycoveCity_Harbor_EventScript_21E30F:: @ 821E30F closemessage call LilycoveCity_Harbor_EventScript_21E514 - warp SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 + warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 waitstate release end @@ -243,7 +243,7 @@ LilycoveCity_Harbor_EventScript_21E320:: @ 821E320 LilycoveCity_Harbor_EventScript_21E33F:: @ 821E33F closemessage call LilycoveCity_Harbor_EventScript_21E514 - warp BIRTH_ISLAND_HARBOR, 255, 8, 4 + warp MAP_BIRTH_ISLAND_HARBOR, 255, 8, 4 waitstate release end @@ -284,7 +284,7 @@ LilycoveCity_Harbor_EventScript_21E350:: @ 821E350 call_if 1, LilycoveCity_Harbor_EventScript_21E6BA setvar VAR_0x8004, 2 call LilycoveCity_Harbor_EventScript_2721E2 - warp FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 + warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 waitstate release end @@ -292,7 +292,7 @@ LilycoveCity_Harbor_EventScript_21E350:: @ 821E350 LilycoveCity_Harbor_EventScript_21E40C:: @ 821E40C closemessage call LilycoveCity_Harbor_EventScript_21E514 - warp FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 + warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 waitstate release end @@ -309,7 +309,7 @@ LilycoveCity_Harbor_EventScript_21E41D:: @ 821E41D LilycoveCity_Harbor_EventScript_21E43C:: @ 821E43C closemessage call LilycoveCity_Harbor_EventScript_21E514 - warp NAVEL_ROCK_HARBOR, 255, 8, 4 + warp MAP_NAVEL_ROCK_HARBOR, 255, 8, 4 waitstate release end @@ -344,7 +344,7 @@ LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6 delay 30 applymovement 1, LilycoveCity_Harbor_Movement_2725AA waitmovement 0 - showobjectat 1, LILYCOVE_CITY_HARBOR + showobjectat 1, MAP_LILYCOVE_CITY_HARBOR delay 30 msgbox LilycoveCity_Harbor_Text_21E842, 4 release @@ -354,7 +354,7 @@ LilycoveCity_Harbor_EventScript_21E4EE:: @ 821E4EE applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6 waitmovement 0 delay 30 - hideobjectat VAR_LAST_TALKED, LILYCOVE_CITY_HARBOR + hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR delay 60 addobject 4 delay 30 @@ -372,7 +372,7 @@ LilycoveCity_Harbor_EventScript_21E514:: @ 821E514 compare VAR_FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_21E610 delay 30 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY setvar VAR_0x8004, 2 call LilycoveCity_Harbor_EventScript_2721E2 return @@ -400,7 +400,7 @@ LilycoveCity_Harbor_EventScript_21E575:: @ 821E575 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 setvar VAR_PORTHOLE, 5 call LilycoveCity_Harbor_EventScript_21E5CC - warp SS_TIDAL_CORRIDOR, 255, 1, 10 + warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate release end @@ -410,7 +410,7 @@ LilycoveCity_Harbor_EventScript_21E59D:: @ 821E59D compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 call LilycoveCity_Harbor_EventScript_21E5CC - warp BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 + warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 waitstate release end @@ -427,13 +427,13 @@ LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6 waitmovement 0 delay 30 - hideobjectat VAR_LAST_TALKED, LILYCOVE_CITY_HARBOR + hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR compare VAR_FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E61B compare VAR_FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_21E610 delay 30 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY setvar VAR_0x8004, 2 call LilycoveCity_Harbor_EventScript_2721E2 return diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index 507997416a..c2f3be7d6d 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -49,7 +49,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A:: @ 8218D5A lockall applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_218DA1 waitmovement 0 - warp LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 + warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate end @@ -57,7 +57,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218D6F:: @ 8218D6F lockall applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_218D9B waitmovement 0 - warp LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 + warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate end @@ -65,7 +65,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218D84:: @ 8218D84 lockall applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_218D9E waitmovement 0 - warp LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 + warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate end diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 67b1f9381c..eb78368af8 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -95,7 +95,7 @@ LittlerootTown_EventScript_1E7EDB:: @ 81E7EDB setvar VAR_0x8005, 8 call LittlerootTown_EventScript_1E7F17 setflag FLAG_0x2F9 - warpsilent LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8 + warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8 waitstate releaseall end @@ -106,7 +106,7 @@ LittlerootTown_EventScript_1E7EF9:: @ 81E7EF9 setvar VAR_0x8005, 8 call LittlerootTown_EventScript_1E7F17 setflag FLAG_0x2FA - warpsilent LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8 + warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8 waitstate releaseall end @@ -138,7 +138,7 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17 waitmovement 0 setflag FLAG_0x2F0 setvar VAR_0x4092, 3 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY closedoor VAR_0x8004, VAR_0x8005 waitdooranim clearflag FLAG_0x364 @@ -196,7 +196,7 @@ LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1 clearflag FLAG_0x31B delay 20 clearflag FLAG_SPECIAL_FLAG_0x4000 - warp LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 + warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate releaseall end @@ -649,7 +649,7 @@ LittlerootTown_EventScript_1E84A1:: @ 81E84A1 waitdooranim applymovement 4, LittlerootTown_Movement_1E863B waitmovement 0 - hideobjectat 4, LITTLEROOT_TOWN + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return @@ -661,7 +661,7 @@ LittlerootTown_EventScript_1E84C7:: @ 81E84C7 waitdooranim applymovement 4, LittlerootTown_Movement_1E863B waitmovement 0 - hideobjectat 4, LITTLEROOT_TOWN + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return @@ -673,7 +673,7 @@ LittlerootTown_EventScript_1E84ED:: @ 81E84ED waitdooranim applymovement 4, LittlerootTown_Movement_1E863B waitmovement 0 - hideobjectat 4, LITTLEROOT_TOWN + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return @@ -685,7 +685,7 @@ LittlerootTown_EventScript_1E8513:: @ 81E8513 waitdooranim applymovement 4, LittlerootTown_Movement_1E863B waitmovement 0 - hideobjectat 4, LITTLEROOT_TOWN + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return @@ -697,7 +697,7 @@ LittlerootTown_EventScript_1E8539:: @ 81E8539 waitdooranim applymovement 4, LittlerootTown_Movement_1E863B waitmovement 0 - hideobjectat 4, LITTLEROOT_TOWN + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return @@ -709,7 +709,7 @@ LittlerootTown_EventScript_1E855F:: @ 81E855F waitdooranim applymovement 4, LittlerootTown_Movement_1E863B waitmovement 0 - hideobjectat 4, LITTLEROOT_TOWN + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return @@ -721,7 +721,7 @@ LittlerootTown_EventScript_1E8585:: @ 81E8585 waitdooranim applymovement 4, LittlerootTown_Movement_1E863B waitmovement 0 - hideobjectat 4, LITTLEROOT_TOWN + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return @@ -733,7 +733,7 @@ LittlerootTown_EventScript_1E85AB:: @ 81E85AB waitdooranim applymovement 4, LittlerootTown_Movement_1E863B waitmovement 0 - hideobjectat 4, LITTLEROOT_TOWN + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return @@ -903,7 +903,7 @@ LittlerootTown_EventScript_1E863D:: @ 81E863D waitdooranim applymovement 4, LittlerootTown_Movement_1E863B waitmovement 0 - hideobjectat 4, LITTLEROOT_TOWN + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim goto LittlerootTown_EventScript_1E8686 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 53825a84c2..4c904b0014 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -65,7 +65,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F7814:: @ 81F7814 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F783A applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_1F783A waitmovement 0 - warp LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1 + warp MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1 waitstate releaseall end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 9fc2fe53e5..99d47f9384 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -65,7 +65,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8964:: @ 81F8964 applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F898A applymovement 1, LittlerootTown_MaysHouse_1F_Movement_1F898A waitmovement 0 - warp LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1 + warp MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1 waitstate releaseall end diff --git a/data/scripts/maps/MarineCave_Entrance.inc b/data/scripts/maps/MarineCave_Entrance.inc index a1f5489fee..24b288050f 100644 --- a/data/scripts/maps/MarineCave_Entrance.inc +++ b/data/scripts/maps/MarineCave_Entrance.inc @@ -3,6 +3,6 @@ MarineCave_Entrance_MapScripts:: @ 823AFD0 .byte 0 MarineCave_Entrance_MapScript1_23AFD6: @ 823AFD6 - setdivewarp UNDERWATER_MARINE_CAVE, 255, 9, 6 + setdivewarp MAP_UNDERWATER_MARINE_CAVE, 255, 9, 6 end diff --git a/data/scripts/maps/MirageTower_2F.inc b/data/scripts/maps/MirageTower_2F.inc index c1a1d18d09..79f3cce2a1 100644 --- a/data/scripts/maps/MirageTower_2F.inc +++ b/data/scripts/maps/MirageTower_2F.inc @@ -6,6 +6,6 @@ MirageTower_2F_MapScripts:: @ 823AD11 MirageTower_2F_MapScript1_23AD21: @ 823AD21 setstepcallback 7 - setholewarp MIRAGE_TOWER_1F, 255, 0, 0 + setholewarp MAP_MIRAGE_TOWER_1F, 255, 0, 0 end diff --git a/data/scripts/maps/MirageTower_3F.inc b/data/scripts/maps/MirageTower_3F.inc index bcf847344c..1ec82de55e 100644 --- a/data/scripts/maps/MirageTower_3F.inc +++ b/data/scripts/maps/MirageTower_3F.inc @@ -6,6 +6,6 @@ MirageTower_3F_MapScripts:: @ 823AD2C MirageTower_3F_MapScript1_23AD3C: @ 823AD3C setstepcallback 7 - setholewarp MIRAGE_TOWER_2F, 255, 0, 0 + setholewarp MAP_MIRAGE_TOWER_2F, 255, 0, 0 end diff --git a/data/scripts/maps/MirageTower_4F.inc b/data/scripts/maps/MirageTower_4F.inc index 10d465b741..1e079c5d7b 100644 --- a/data/scripts/maps/MirageTower_4F.inc +++ b/data/scripts/maps/MirageTower_4F.inc @@ -54,7 +54,7 @@ MirageTower_4F_EventScript_23ADCA:: @ 823ADCA waitstate setvar VAR_0x40CB, 1 clearflag FLAG_LANDMARK_MIRAGE_TOWER - warp ROUTE_111, 255, 19, 59 + warp MAP_ROUTE111, 255, 19, 59 waitstate release end diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index bb6bfd9dee..f38fd606d6 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -205,7 +205,7 @@ MossdeepCity_Gym_EventScript_220ACC:: @ 8220ACC MossdeepCity_Gym_EventScript_220AF1:: @ 8220AF1 lockall - warp7 MOSSDEEP_CITY_GYM, 255, 7, 30 + warp7 MAP_MOSSDEEP_CITY_GYM, 255, 7, 30 waitstate releaseall end diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc index 52d01db6c8..0052f09aac 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc @@ -43,7 +43,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF closemessage applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_223E07 waitmovement 0 - warp MOSSDEEP_CITY_SPACE_CENTER_1F, 255, 13, 1 + warp MAP_MOSSDEEP_CITY_SPACE_CENTER_1F, 255, 13, 1 waitstate releaseall end diff --git a/data/scripts/maps/MtPyre_2F.inc b/data/scripts/maps/MtPyre_2F.inc index 9a479846fb..de8520954f 100644 --- a/data/scripts/maps/MtPyre_2F.inc +++ b/data/scripts/maps/MtPyre_2F.inc @@ -6,7 +6,7 @@ MtPyre_2F_MapScripts:: @ 82310FB MtPyre_2F_MapScript1_23110B: @ 823110B setstepcallback 7 - setholewarp MT_PYRE_1F, 255, 0, 0 + setholewarp MAP_MT_PYRE_1F, 255, 0, 0 end MtPyre_2F_EventScript_231116:: @ 8231116 diff --git a/data/scripts/maps/NavelRock_Harbor.inc b/data/scripts/maps/NavelRock_Harbor.inc index c7acaf0665..7f5a9e4c75 100644 --- a/data/scripts/maps/NavelRock_Harbor.inc +++ b/data/scripts/maps/NavelRock_Harbor.inc @@ -12,10 +12,10 @@ NavelRock_Harbor_EventScript_2690BD:: @ 82690BD applymovement VAR_LAST_TALKED, NavelRock_Harbor_Movement_2725AA waitmovement 0 delay 30 - hideobjectat 1, NAVEL_ROCK_HARBOR + hideobjectat 1, MAP_NAVEL_ROCK_HARBOR setvar VAR_0x8004, 2 call NavelRock_Harbor_EventScript_272250 - warp LILYCOVE_CITY_HARBOR, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 891b5a25ae..67a9f83f35 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -39,8 +39,8 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E special StartWallyTutorialBattle waitstate msgbox PetalburgCity_Text_1EC271, 4 - applymovement 2, PetalburgCity_Movement_2725A4, PETALBURG_CITY - waitmovement 2, PETALBURG_CITY + applymovement 2, PetalburgCity_Movement_2725A4, MAP_PETALBURG_CITY + waitmovement 2, MAP_PETALBURG_CITY msgbox PetalburgCity_Text_1EC297, 4 closemessage clearflag FLAG_SPECIAL_FLAG_0x4000 @@ -49,7 +49,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E clearflag FLAG_SPECIAL_FLAG_0x4001 special LoadPlayerParty setvar VAR_0x4085, 1 - warp PETALBURG_CITY_GYM, 255, 4, 108 + warp MAP_PETALBURG_CITY_GYM, 255, 4, 108 waitstate releaseall end @@ -68,13 +68,13 @@ PetalburgCity_EventScript_1DC390:: @ 81DC390 applymovement 255, PetalburgCity_Movement_1DC418 waitmovement 0 setflag FLAG_0x33E - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY closedoor VAR_0x8004, VAR_0x8005 waitdooranim clearflag FLAG_SPECIAL_FLAG_0x4000 fadedefaultbgm clearflag FLAG_SPECIAL_FLAG_0x4001 - warp PETALBURG_CITY_WALLYS_HOUSE, 255, 2, 4 + warp MAP_PETALBURG_CITY_WALLYS_HOUSE, 255, 2, 4 waitstate releaseall end diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 6631656112..e95e434b5f 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -223,7 +223,7 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC clearflag FLAG_0x362 setflag FLAG_0x379 special InitBirchState - warp PETALBURG_CITY, 255, 15, 8 + warp MAP_PETALBURG_CITY, 255, 15, 8 waitstate release end @@ -501,7 +501,7 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 removeobject 11 setvar VAR_0x4057, 4 clearflag FLAG_0x33E - warp PETALBURG_CITY, 255, 15, 8 + warp MAP_PETALBURG_CITY, 255, 15, 8 waitstate release end @@ -800,7 +800,7 @@ PetalburgCity_Gym_EventScript_205137:: @ 8205137 PetalburgCity_Gym_EventScript_20516C:: @ 820516C closemessage delay 30 - warpdoor PETALBURG_CITY_GYM, 255, 32776, 32777 + warpdoor MAP_PETALBURG_CITY_GYM, 255, 32776, 32777 waitstate releaseall end diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index c2807d50b8..9593ae59e3 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -242,7 +242,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16 call_if 1, Route101_EventScript_1EBE85 compare VAR_RESULT, 1 call_if 1, Route101_EventScript_1EBE89 - warp LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 + warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate release end diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index a432f0d947..83cfe5d924 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -367,14 +367,14 @@ Route104_EventScript_1ED090:: @ 81ED090 end Route104_EventScript_1ED099:: @ 81ED099 - setobjectpriority 8, ROUTE_104, 0 - setobjectpriority 255, ROUTE_104, 0 + setobjectpriority 8, MAP_ROUTE104, 0 + setobjectpriority 255, MAP_ROUTE104, 0 applymovement 8, Route104_Movement_1ED359 waitmovement 0 removeobject 8 applymovement 255, Route104_Movement_1ED34F waitmovement 0 - hideobjectat 255, ROUTE_104 + hideobjectat 255, MAP_ROUTE104 call Route104_EventScript_2720A0 checkflag FLAG_0x132 goto_eq Route104_EventScript_1ED0D9 @@ -402,8 +402,8 @@ Route104_EventScript_1ED0EF:: @ 81ED0EF delay 30 setflag FLAG_0x132 applymovement 255, Route104_Movement_1ED22A - applymovement 7, Route104_Movement_1ED22A, ROUTE_104 - waitmovement 7, ROUTE_104 + applymovement 7, Route104_Movement_1ED22A, MAP_ROUTE104 + waitmovement 7, MAP_ROUTE104 waitmovement 0 goto Route104_EventScript_1ED139 @@ -412,12 +412,12 @@ Route104_EventScript_1ED139:: @ 81ED139 applymovement 255, Route104_Movement_1ED353 waitmovement 0 call Route104_EventScript_2720A8 - showobjectat 255, DEWFORD_TOWN + showobjectat 255, MAP_DEWFORD_TOWN applymovement 255, Route104_Movement_1ED355 waitmovement 0 setobjectxyperm 2, 12, 8 addobject 2 - setobjectpriority 2, DEWFORD_TOWN, 0 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 clearflag FLAG_0x2E4 applymovement 2, Route104_Movement_1ED35C waitmovement 0 @@ -425,10 +425,10 @@ Route104_EventScript_1ED139:: @ 81ED139 clearflag FLAG_0x2E7 call Route104_EventScript_2720A8 setflag FLAG_0x2E6 - hideobjectat 7, ROUTE_104 + hideobjectat 7, MAP_ROUTE104 copyvar VAR_0x4096, VAR_0x8008 - resetobjectpriority 255, ROUTE_104 - resetobjectpriority 2, DEWFORD_TOWN + resetobjectpriority 255, MAP_ROUTE104 + resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 setvar VAR_0x408E, 0 checkflag FLAG_0x0BD diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index c0c3888e1b..1721fa4a06 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -87,7 +87,7 @@ Route104_MrBrineysHouse_EventScript_229E27:: @ 8229E27 setvar VAR_0x4063, 2 setflag FLAG_0x32E setflag FLAG_0x2CF - warp ROUTE_104, 255, 13, 51 + warp MAP_ROUTE104, 255, 13, 51 waitstate releaseall end diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index b1ac87e30f..84f7b7c34e 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -3,8 +3,8 @@ Route109_MapScripts:: @ 81EE75F Route109_EventScript_1EE760:: @ 81EE760 call Route109_EventScript_271E95 - setobjectpriority 2, ROUTE_109, 0 - setobjectpriority 255, ROUTE_109, 0 + setobjectpriority 2, MAP_ROUTE109, 0 + setobjectpriority 255, MAP_ROUTE109, 0 applymovement 2, Route109_Movement_1EE90B waitmovement 0 removeobject 2 @@ -33,31 +33,31 @@ Route109_EventScript_1EE7C5:: @ 81EE7C5 end Route109_EventScript_1EE7D5:: @ 81EE7D5 - hideobjectat 255, ROUTE_109 + hideobjectat 255, MAP_ROUTE109 call Route109_EventScript_2720A0 applymovement 1, Route109_Movement_1EE84F applymovement 255, Route109_Movement_1EE84F waitmovement 0 delay 50 call Route109_EventScript_2720A8 - showobjectat 255, DEWFORD_TOWN + showobjectat 255, MAP_DEWFORD_TOWN applymovement 255, Route109_Movement_1EE900 waitmovement 0 addobject 4 clearflag FLAG_0x2E7 setobjectxyperm 2, 12, 8 addobject 2 - setobjectpriority 2, DEWFORD_TOWN, 0 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 applymovement 2, Route109_Movement_1EE90D waitmovement 0 clearflag FLAG_0x2E4 setflag FLAG_0x2E8 - hideobjectat 1, ROUTE_109 + hideobjectat 1, MAP_ROUTE109 msgbox Route109_Text_1E9C1D, 4 closemessage copyvar VAR_0x4096, VAR_0x8008 - resetobjectpriority 255, ROUTE_109 - resetobjectpriority 2, DEWFORD_TOWN + resetobjectpriority 255, MAP_ROUTE109 + resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 release end diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index a2997a49b0..4e15ddbe74 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -22,7 +22,7 @@ Route110_TrickHouseEnd_MapScript2_26ACDE: @ 826ACDE Route110_TrickHouseEnd_EventScript_26ACE8:: @ 826ACE8 addobject 1 - showobjectat 1, ROUTE_110_TRICK_HOUSE_END + showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_END turnobject 1, 4 end diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 5e03fa1651..859a28d6ad 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -138,14 +138,14 @@ Route110_TrickHouseEntrance_MapScript2_269BD3: @ 8269BD3 Route110_TrickHouseEntrance_EventScript_269C15:: @ 8269C15 addobject 1 - showobjectat 1, ROUTE_110_TRICK_HOUSE_ENTRANCE + showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE turnobject 1, 4 turnobject 255, 3 end Route110_TrickHouseEntrance_EventScript_269C26:: @ 8269C26 addobject 1 - hideobjectat 1, ROUTE_110_TRICK_HOUSE_ENTRANCE + hideobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE switch VAR_0x4044 case 0, Route110_TrickHouseEntrance_EventScript_269C8C case 1, Route110_TrickHouseEntrance_EventScript_269C94 @@ -265,7 +265,7 @@ Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E call_if 1, Route110_TrickHouseEntrance_EventScript_269E2D closemessage setvar VAR_0x40A6, 1 - warpsilent ROUTE_110_TRICK_HOUSE_ENTRANCE, 255, 6, 2 + warpsilent MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2 waitstate releaseall end @@ -533,49 +533,49 @@ Route110_TrickHouseEntrance_Movement_26A1A7: @ 826A1A7 step_end Route110_TrickHouseEntrance_EventScript_26A1A9:: @ 826A1A9 - warp ROUTE_110_TRICK_HOUSE_PUZZLE_1, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_26A1B4:: @ 826A1B4 - warp ROUTE_110_TRICK_HOUSE_PUZZLE_2, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE2, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_26A1BF:: @ 826A1BF - warp ROUTE_110_TRICK_HOUSE_PUZZLE_3, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE3, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_26A1CA:: @ 826A1CA - warp ROUTE_110_TRICK_HOUSE_PUZZLE_4, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE4, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_26A1D5:: @ 826A1D5 - warp ROUTE_110_TRICK_HOUSE_PUZZLE_5, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_26A1E0:: @ 826A1E0 - warp ROUTE_110_TRICK_HOUSE_PUZZLE_6, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE6, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_26A1EB:: @ 826A1EB - warp ROUTE_110_TRICK_HOUSE_PUZZLE_7, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_26A1F6:: @ 826A1F6 - warp ROUTE_110_TRICK_HOUSE_PUZZLE_8, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE8, 255, 0, 21 waitstate releaseall end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index 3bdf93b12b..5afce1c885 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -458,7 +458,7 @@ Route110_TrickHousePuzzle5_EventScript_26D152:: @ 826D152 waitmovement 0 msgbox Route110_TrickHousePuzzle5_Text_26D8C9, 4 closemessage - warp ROUTE_110_TRICK_HOUSE_PUZZLE_5, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21 waitstate releaseall end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index 35e5e15224..fdf734423f 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -113,7 +113,7 @@ Route110_TrickHousePuzzle7_EventScript_26E1E2:: @ 826E1E2 Route110_TrickHousePuzzle7_EventScript_26E1ED:: @ 826E1ED lockall setvar VAR_0x40B6, 1 - warpteleport ROUTE_110_TRICK_HOUSE_PUZZLE_7, 255, 3, 19 + warpteleport MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 3, 19 waitstate releaseall end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 094a528952..fcbf32c91c 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -111,7 +111,7 @@ Route111_MapScript2_1F0E46: @ 81F0E46 .2byte 0 Route111_EventScript_1F0E50:: @ 81F0E50 - hideobjectat 255, LITTLEROOT_TOWN + hideobjectat 255, MAP_LITTLEROOT_TOWN end Route111_MapScript2_1F0E56: @ 81F0E56 @@ -127,7 +127,7 @@ Route111_EventScript_1F0E60:: @ 81F0E60 addobject 45 special sub_81BE7F4 waitstate - showobjectat 255, LITTLEROOT_TOWN + showobjectat 255, MAP_LITTLEROOT_TOWN removeobject 45 delay 16 turnobject 255, 2 diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index 94e442a48d..93e8ea7599 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -4,7 +4,7 @@ Route112_CableCarStation_MapScripts:: @ 822AABE .byte 0 Route112_CableCarStation_MapScript1_22AAC9: @ 822AAC9 - setescapewarp ROUTE_112, 255, 28, 28 + setescapewarp MAP_ROUTE112, 255, 28, 28 compare VAR_0x40A3, 2 call_if 1, Route112_CableCarStation_EventScript_22AADD end diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 0e9cf9636d..1973b0e9eb 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -83,7 +83,7 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 special EnterSafariMode setvar VAR_0x40A4, 2 clearflag FLAG_0x05D - warp SAFARI_ZONE_SOUTH, 255, 32, 33 + warp MAP_SAFARI_ZONE_SOUTH, 255, 32, 33 waitstate end diff --git a/data/scripts/maps/Route134.inc b/data/scripts/maps/Route134.inc index 8ee5b781aa..bdec88c42b 100644 --- a/data/scripts/maps/Route134.inc +++ b/data/scripts/maps/Route134.inc @@ -3,7 +3,7 @@ Route134_MapScripts:: @ 81F7644 .byte 0 Route134_MapScript1_1F764A: @ 81F764A - setdivewarp UNDERWATER_ROUTE_134, 255, 8, 6 + setdivewarp MAP_UNDERWATER_ROUTE134, 255, 8, 6 end Route134_EventScript_1F7653:: @ 81F7653 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 5e323211ac..6eb8d48bc9 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -602,7 +602,7 @@ RustboroCity_EventScript_1E0C5B:: @ 81E0C5B setflag FLAG_0x2DC setvar VAR_0x405A, 5 delay 30 - warp RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2 + warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2 waitstate releaseall end diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index 6d83c8841b..2e1b4cfa44 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -127,7 +127,7 @@ SSTidalCorridor_EventScript_23C13B:: @ 823C13B msgbox SSTidalCorridor_Text_23C64F, 4 checkflag FLAG_0x104 call_if 1, SSTidalCorridor_EventScript_23C179 - warp LILYCOVE_CITY_HARBOR, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end @@ -137,7 +137,7 @@ SSTidalCorridor_EventScript_23C15A:: @ 823C15A msgbox SSTidalCorridor_Text_23C64F, 4 checkflag FLAG_0x104 call_if 1, SSTidalCorridor_EventScript_23C179 - warp SLATEPORT_CITY_HARBOR, 255, 8, 11 + warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate release end diff --git a/data/scripts/maps/SafariZone_South.inc b/data/scripts/maps/SafariZone_South.inc index 239a2efdaa..19f51b8730 100644 --- a/data/scripts/maps/SafariZone_South.inc +++ b/data/scripts/maps/SafariZone_South.inc @@ -93,7 +93,7 @@ SafariZone_South_EventScript_23D359:: @ 823D359 SafariZone_South_EventScript_23D373:: @ 823D373 setvar VAR_0x40A4, 1 special ExitSafariMode - warpdoor ROUTE_121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 + warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate end diff --git a/data/scripts/maps/SeafloorCavern_Entrance.inc b/data/scripts/maps/SeafloorCavern_Entrance.inc index b5fdc5e427..9eb71d5e33 100644 --- a/data/scripts/maps/SeafloorCavern_Entrance.inc +++ b/data/scripts/maps/SeafloorCavern_Entrance.inc @@ -3,8 +3,8 @@ SeafloorCavern_Entrance_MapScripts:: @ 823446E .byte 0 SeafloorCavern_Entrance_MapScript1_234474: @ 8234474 - setdivewarp UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 - setescapewarp UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 + setdivewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 + setescapewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 end SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index e8f6323c15..cbfbccfe4c 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -141,7 +141,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setflag FLAG_0x35B setflag FLAG_0x3B2 setflag FLAG_SPECIAL_FLAG_0x4000 - warp ROUTE_128, 255, 38, 22 + warp MAP_ROUTE128, 255, 38, 22 waitstate releaseall end diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index b7b55f2566..e9e79d1e96 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -5,8 +5,8 @@ SealedChamber_OuterRoom_MapScripts:: @ 8239106 .byte 0 SealedChamber_OuterRoom_MapScript1_239116: @ 8239116 - setdivewarp UNDERWATER_SEALED_CHAMBER, 255, 12, 44 - setescapewarp UNDERWATER_SEALED_CHAMBER, 255, 12, 44 + setdivewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44 + setescapewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44 end SealedChamber_OuterRoom_MapScript1_239127: @ 8239127 diff --git a/data/scripts/maps/SkyPillar_2F.inc b/data/scripts/maps/SkyPillar_2F.inc index b22afaf547..c15f1f8c40 100644 --- a/data/scripts/maps/SkyPillar_2F.inc +++ b/data/scripts/maps/SkyPillar_2F.inc @@ -16,6 +16,6 @@ SkyPillar_2F_EventScript_23964C:: @ 823964C SkyPillar_2F_MapScript1_239650: @ 8239650 setstepcallback 7 - setholewarp SKY_PILLAR_1F, 255, 0, 0 + setholewarp MAP_SKY_PILLAR_1F, 255, 0, 0 end diff --git a/data/scripts/maps/SkyPillar_4F.inc b/data/scripts/maps/SkyPillar_4F.inc index 15d055f020..3884864d7d 100644 --- a/data/scripts/maps/SkyPillar_4F.inc +++ b/data/scripts/maps/SkyPillar_4F.inc @@ -16,6 +16,6 @@ SkyPillar_4F_EventScript_239692:: @ 8239692 SkyPillar_4F_MapScript1_239696: @ 8239696 setstepcallback 7 - setholewarp SKY_PILLAR_3F, 255, 0, 0 + setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0 end diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index d860e6e7c4..9a5e41b152 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -616,7 +616,7 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 clearflag FLAG_0x34D clearflag FLAG_0x34E setvar VAR_0x4058, 2 - warp SLATEPORT_CITY_HARBOR, 255, 11, 14 + warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14 waitstate releaseall end diff --git a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc b/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc index d79849a6c7..150cc425b3 100644 --- a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc +++ b/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc @@ -30,8 +30,8 @@ SlateportCity_BattleTentBattleRoom_MapScript2_20999A: @ 820999A SlateportCity_BattleTentBattleRoom_EventScript_2099A4:: @ 82099A4 setvar VAR_TEMP_1, 1 - hideobjectat 255, FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM - hideobjectat 2, SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM + hideobjectat 255, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM + hideobjectat 2, MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM end SlateportCity_BattleTentBattleRoom_MapScript2_2099B4: @ 82099B4 @@ -68,7 +68,7 @@ SlateportCity_BattleTentCorridor_EventScript_209A1B:: @ 8209A1B setvar VAR_0x8006, 4 special sub_81A1780 special LoadPlayerParty - warp SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6 + warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate SlateportCity_BattleTentBattleRoom_EventScript_209A39:: @ 8209A39 @@ -84,7 +84,7 @@ SlateportCity_BattleTentBattleRoom_EventScript_209A39:: @ 8209A39 case 3, SlateportCity_BattleTentBattleRoom_EventScript_209A7B @ case 3, SlateportCity_BattleTentCorridor_EventScript_209A7B setvar VAR_0x8006, 1 - warp SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 3 + warp MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 3 waitstate SlateportCity_BattleTentBattleRoom_EventScript_209A7B:: @ 8209A7B @@ -94,7 +94,7 @@ SlateportCity_BattleTentCorridor_EventScript_209A7B:: @ 8209A7B setvar VAR_0x8006, 3 special sub_81A1780 special LoadPlayerParty - warp SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6 + warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate @ forced stop diff --git a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc index 7446c10020..0a9eb6cf53 100644 --- a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc +++ b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc @@ -53,7 +53,7 @@ SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4 waitmovement 0 closedoor 2, 1 waitdooranim - warp SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM, 255, 4, 4 + warp MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM, 255, 4, 4 waitstate end diff --git a/data/scripts/maps/SlateportCity_BattleTentLobby.inc b/data/scripts/maps/SlateportCity_BattleTentLobby.inc index 187ed0751f..fc66d7387e 100644 --- a/data/scripts/maps/SlateportCity_BattleTentLobby.inc +++ b/data/scripts/maps/SlateportCity_BattleTentLobby.inc @@ -175,7 +175,7 @@ SlateportCity_BattleTentLobby_EventScript_2089AC:: @ 82089AC msgbox SlateportCity_BattleTentLobby_Text_2C5B8C, 4 closemessage call SlateportCity_BattleTentLobby_EventScript_2089C9 - warp SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 7 + warp MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 7 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index ca6ab50b55..e1f373bb21 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -3,7 +3,7 @@ SlateportCity_Harbor_MapScripts:: @ 820C97D .byte 0 SlateportCity_Harbor_MapScript1_20C983: @ 820C983 - setescapewarp SLATEPORT_CITY, 255, 28, 13 + setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 setvar VAR_TEMP_1, 0 compare VAR_0x40A0, 1 call_if 1, SlateportCity_Harbor_EventScript_20C9A9 @@ -205,7 +205,7 @@ SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92 goto_eq SlateportCity_Harbor_EventScript_20CBDD setvar VAR_PORTHOLE, 1 call SlateportCity_Harbor_EventScript_20CBE9 - warp SS_TIDAL_CORRIDOR, 255, 1, 10 + warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate release end @@ -215,7 +215,7 @@ SlateportCity_Harbor_EventScript_20CBBA:: @ 820CBBA compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_20CBDD call SlateportCity_Harbor_EventScript_20CBE9 - warp BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 + warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 waitstate release end @@ -232,13 +232,13 @@ SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9 applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A6 waitmovement 0 delay 30 - hideobjectat VAR_LAST_TALKED, SLATEPORT_CITY_HARBOR + hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR compare VAR_FACING, 2 call_if 1, SlateportCity_Harbor_EventScript_20CC42 compare VAR_FACING, 4 call_if 1, SlateportCity_Harbor_EventScript_20CC37 delay 30 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY setvar VAR_0x8004, 5 call SlateportCity_Harbor_EventScript_2721E2 return diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 6a26ee0ff7..5de8c7d120 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -192,7 +192,7 @@ SootopolisCity_EventScript_1E5901:: @ 81E5901 return SootopolisCity_MapScript1_1E590B: @ 81E590B - setdivewarp UNDERWATER_SOOTOPOLIS_CITY, 255, 9, 6 + setdivewarp MAP_UNDERWATER_SOOTOPOLIS_CITY, 255, 9, 6 end SootopolisCity_MapScript2_1E5914: @ 81E5914 @@ -549,7 +549,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E fadenewbgm MUS_RUNECITY delay 120 clearflag FLAG_SPECIAL_FLAG_0x4000 - warp8 SOOTOPOLIS_CITY, 255, 43, 32 + warp8 MAP_SOOTOPOLIS_CITY, 255, 43, 32 waitstate end @@ -602,7 +602,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE fadenewbgm MUS_NAMINORI delay 120 clearflag FLAG_SPECIAL_FLAG_0x4000 - warp8 SOOTOPOLIS_CITY, 255, 29, 53 + warp8 MAP_SOOTOPOLIS_CITY, 255, 29, 53 waitstate end @@ -987,7 +987,7 @@ SootopolisCity_EventScript_1E61CC:: @ 81E61CC setflag FLAG_0x133 applymovement 255, SootopolisCity_Movement_1E635A waitmovement 0 - warp CAVE_OF_ORIGIN_ENTRANCE, 255, 9, 20 + warp MAP_CAVE_OF_ORIGIN_ENTRANCE, 255, 9, 20 waitstate end @@ -1448,7 +1448,7 @@ SootopolisCity_EventScript_1E654C:: @ 81E654C clearflag FLAG_0x358 clearflag FLAG_0x394 setvar VAR_0x40B9, 2 - warpsilent SOOTOPOLIS_CITY, 255, 31, 34 + warpsilent MAP_SOOTOPOLIS_CITY, 255, 31, 34 waitstate releaseall end diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 02ac01f2b8..af661890fc 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -77,7 +77,7 @@ SootopolisCity_Gym_1F_EventScript_224F29:: @ 8224F29 waitmovement 0 playse SE_RU_HYUU delay 60 - warphole SOOTOPOLIS_CITY_GYM_B1F + warphole MAP_SOOTOPOLIS_CITY_GYM_B1F waitstate end diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc index 8d6b4631f4..cdcf5866ce 100644 --- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc +++ b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc @@ -115,7 +115,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10 compare VAR_FACING, 3 call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22 - warp SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F, 255, 3, 1 + warp MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F, 255, 3, 1 waitstate release end diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc index 142a8e70e3..b29ef99a5b 100644 --- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc +++ b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc @@ -34,7 +34,7 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68 waitmovement 0 special LoadPlayerParty setvar VAR_TEMP_1, 1 - warp SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F, 255, 3, 1 + warp MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F, 255, 3, 1 waitstate releaseall end diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index bf57aa9ce6..d303e0614a 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -17,10 +17,10 @@ SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2 applymovement VAR_LAST_TALKED, SouthernIsland_Exterior_Movement_2725AA waitmovement 0 delay 30 - hideobjectat 1, SOUTHERN_ISLAND_EXTERIOR + hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR setvar VAR_0x8004, 2 call SouthernIsland_Exterior_EventScript_272250 - warp LILYCOVE_CITY_HARBOR, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end diff --git a/data/scripts/maps/TrainerHill_Elevator.inc b/data/scripts/maps/TrainerHill_Elevator.inc index 155c31877f..ac2d5c8a7f 100644 --- a/data/scripts/maps/TrainerHill_Elevator.inc +++ b/data/scripts/maps/TrainerHill_Elevator.inc @@ -13,7 +13,7 @@ TrainerHill_Elevator_EventScript_269360:: @ 8269360 applymovement 255, TrainerHill_Elevator_Movement_2693EB waitmovement 0 releaseall - warp TRAINER_HILL_ROOF, 255, 15, 5 + warp MAP_TRAINER_HILL_ROOF, 255, 15, 5 waitstate end @@ -35,7 +35,7 @@ TrainerHill_Elevator_EventScript_269375:: @ 8269375 delay 25 applymovement 255, TrainerHill_Elevator_Movement_2693E7 waitmovement 0 - warp TRAINER_HILL_ENTRANCE, 255, 17, 8 + warp MAP_TRAINER_HILL_ENTRANCE, 255, 17, 8 waitstate end diff --git a/data/scripts/maps/Underwater_MarineCave.inc b/data/scripts/maps/Underwater_MarineCave.inc index c18534c614..ac96e3a9b2 100644 --- a/data/scripts/maps/Underwater_MarineCave.inc +++ b/data/scripts/maps/Underwater_MarineCave.inc @@ -8,6 +8,6 @@ Underwater_MarineCave_MapScript1_23AFC3: @ 823AFC3 end Underwater_MarineCave_MapScript1_23AFC7: @ 823AFC7 - setdivewarp MARINE_CAVE_ENTRANCE, 255, 10, 17 + setdivewarp MAP_MARINE_CAVE_ENTRANCE, 255, 10, 17 end diff --git a/data/scripts/maps/Underwater_Route134.inc b/data/scripts/maps/Underwater_Route134.inc index a06f87b48e..786de17572 100644 --- a/data/scripts/maps/Underwater_Route134.inc +++ b/data/scripts/maps/Underwater_Route134.inc @@ -3,6 +3,6 @@ Underwater_Route134_MapScripts:: @ 82390B5 .byte 0 Underwater_Route134_MapScript1_2390BB: @ 82390BB - setdivewarp ROUTE_134, 255, 60, 31 + setdivewarp MAP_ROUTE134, 255, 60, 31 end diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc index d3f0aa5e55..128cb31c0a 100644 --- a/data/scripts/maps/Underwater_SeafloorCavern.inc +++ b/data/scripts/maps/Underwater_SeafloorCavern.inc @@ -35,7 +35,7 @@ Underwater_SeafloorCavern_EventScript_234366:: @ 8234366 return Underwater_SeafloorCavern_MapScript1_2343D3: @ 82343D3 - setdivewarp SEAFLOOR_CAVERN_ENTRANCE, 255, 10, 17 + setdivewarp MAP_SEAFLOOR_CAVERN_ENTRANCE, 255, 10, 17 end Underwater_SeafloorCavern_EventScript_2343DC:: @ 82343DC diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index f8c7b02af5..7ac032c5ff 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -11,11 +11,11 @@ Underwater_SealedChamber_MapScript1_2390CA: @ 82390CA goto Underwater_SealedChamber_EventScript_2390F3 Underwater_SealedChamber_EventScript_2390EA:: @ 82390EA - setdivewarp ROUTE_134, 255, 60, 31 + setdivewarp MAP_ROUTE134, 255, 60, 31 end Underwater_SealedChamber_EventScript_2390F3:: @ 82390F3 - setdivewarp SEALED_CHAMBER_OUTER_ROOM, 255, 10, 19 + setdivewarp MAP_SEALED_CHAMBER_OUTER_ROOM, 255, 10, 19 end Underwater_SealedChamber_EventScript_2390FC:: @ 82390FC diff --git a/data/scripts/maps/Underwater_SootopolisCity.inc b/data/scripts/maps/Underwater_SootopolisCity.inc index 3337b72f14..cbeefcb1d6 100644 --- a/data/scripts/maps/Underwater_SootopolisCity.inc +++ b/data/scripts/maps/Underwater_SootopolisCity.inc @@ -3,6 +3,6 @@ Underwater_SootopolisCity_MapScripts:: @ 822D94C .byte 0 Underwater_SootopolisCity_MapScript1_22D952: @ 822D952 - setdivewarp SOOTOPOLIS_CITY, 255, 29, 53 + setdivewarp MAP_SOOTOPOLIS_CITY, 255, 29, 53 end diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index e92087ebd6..eb6bf8da41 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -75,7 +75,7 @@ LinkContestRoom1_EventScript_23B829:: @ 823B829 LinkContestRoom1_EventScript_23B834:: @ 823B834 special sub_80F8B94 - hideobjectat 255, LITTLEROOT_TOWN + hideobjectat 255, MAP_LITTLEROOT_TOWN call LinkContestRoom1_EventScript_23BB2B end @@ -416,27 +416,27 @@ LinkContestRoom1_EventScript_23BE44:: @ 823BE44 return LinkContestRoom1_EventScript_23BE84:: @ 823BE84 - warp LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 waitstate end LinkContestRoom1_EventScript_23BE8E:: @ 823BE8E - warp LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 waitstate end LinkContestRoom1_EventScript_23BE98:: @ 823BE98 - warp LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 waitstate end LinkContestRoom1_EventScript_23BEA2:: @ 823BEA2 - warp LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 waitstate end LinkContestRoom1_EventScript_23BEAC:: @ 823BEAC - warp LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4 waitstate end diff --git a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc index d7233a3aaf..b7f687cdfd 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc @@ -31,7 +31,7 @@ VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E: @ 820233E .2byte 0 VerdanturfTown_BattleTentBattleRoom_EventScript_202348:: @ 8202348 - showobjectat 1, VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM + showobjectat 1, MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_202575 waitmovement 0 setvar VAR_0x8004, 1 @@ -60,7 +60,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA:: @ 82023AA setvar VAR_0x8006, 4 special sub_81A1780 special LoadPlayerParty - warp VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 + warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 @@ -133,7 +133,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202501:: @ 8202501 setvar VAR_0x8006, 3 special sub_81A1780 special LoadPlayerParty - warp VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 + warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate VerdanturfTown_BattleTentBattleRoom_EventScript_20251F:: @ 820251F @@ -154,7 +154,7 @@ VerdanturfTown_BattleTentBattleRoom_MapScript2_202541: @ 8202541 .2byte 0 VerdanturfTown_BattleTentBattleRoom_EventScript_20254B:: @ 820254B - hideobjectat 1, VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM + hideobjectat 1, MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM call VerdanturfTown_BattleTentBattleRoom_EventScript_202310 setvar VAR_TEMP_1, 1 applymovement 255, VerdanturfTown_BattleTentBattleRoom_Movement_202573 diff --git a/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc b/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc index 96bd1f1141..a4c2e502cd 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc @@ -20,7 +20,7 @@ VerdanturfTown_BattleTentCorridor_EventScript_20209A:: @ 820209A closedoor 2, 1 waitdooranim setvar VAR_0x8006, 0 - warp VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM, 255, 6, 5 + warp MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM, 255, 6, 5 waitstate releaseall end diff --git a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc index 468a34991c..26f0680a0d 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc @@ -205,7 +205,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE msgbox VerdanturfTown_BattleTentLobby_Text_2C56A2, 4 closemessage call VerdanturfTown_BattleTentLobby_EventScript_201A41 - warp VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7 + warp MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index c2d217f939..e4b1fce418 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -1,13 +1,13 @@ EventScript_2A4B4C:: @ 82A4B4C setvar VAR_0x40A4, 1 special ExitSafariMode - setwarp ROUTE_121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 + setwarp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 end EventScript_2A4B5D:: @ 82A4B5D setvar VAR_0x40A4, 1 special ExitSafariMode - warp ROUTE_121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 + warp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate end diff --git a/include/constants/maps.h b/include/constants/maps.h index fb1cb82a8a..f6096e1c5b 100644 --- a/include/constants/maps.h +++ b/include/constants/maps.h @@ -228,21 +228,21 @@ #define MAP_MOSSDEEP_CITY_GAME_CORNER_B1F (12 | (14 << 8)) // Map Group 15 -#define MAP_SOOTOPOLIS_CITY_GYM_1F (0 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_GYM_B1F (1 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F (2 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F (3 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_MART (4 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE1 (5 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE2 (6 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE3 (7 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE4 (8 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE5 (9 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE6 (10 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE7 (11 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE8 (12 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE9_1F (13 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE9_B1F (14 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_GYM_1F (0 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_GYM_B1F (1 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F (2 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F (3 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_MART (4 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE1 (5 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE2 (6 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE3 (7 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE4 (8 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE5 (9 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE6 (10 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE7 (11 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE (12 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F (13 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F (14 | (15 << 8)) // Map Group 16 #define MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM (0 | (16 << 8)) @@ -442,29 +442,29 @@ #define MAP_SS_TIDAL_CORRIDOR (41 | (25 << 8)) #define MAP_SS_TIDAL_LOWER_DECK (42 | (25 << 8)) #define MAP_SS_TIDAL_ROOMS (43 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_01 (44 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_02 (45 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_03 (46 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_04 (47 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_05 (48 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_06 (49 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_07 (50 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_08 (51 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_09 (52 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_10 (53 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_11 (54 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_12 (55 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_13 (56 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_14 (57 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_15 (58 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_16 (59 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE01 (44 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE02 (45 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE03 (46 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE04 (47 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE05 (48 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE06 (49 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE07 (50 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE08 (51 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE09 (52 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE10 (53 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE11 (54 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE12 (55 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE13 (56 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE14 (57 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE15 (58 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE16 (59 | (25 << 8)) #define MAP_UNION_ROOM (60 | (25 << 8)) // Map Group 26 #define MAP_SAFARI_ZONE_NORTHWEST (0 | (26 << 8)) -#define MAP_SAFARI_ZONE_NORTHEAST (1 | (26 << 8)) +#define MAP_SAFARI_ZONE_NORTH (1 | (26 << 8)) #define MAP_SAFARI_ZONE_SOUTHWEST (2 | (26 << 8)) -#define MAP_SAFARI_ZONE_SOUTHEAST (3 | (26 << 8)) +#define MAP_SAFARI_ZONE_SOUTH (3 | (26 << 8)) #define MAP_BATTLE_FRONTIER_OUTSIDE_WEST (4 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY (5 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR (6 | (26 << 8)) @@ -473,12 +473,12 @@ #define MAP_SOUTHERN_ISLAND_EXTERIOR (9 | (26 << 8)) #define MAP_SOUTHERN_ISLAND_INTERIOR (10 | (26 << 8)) #define MAP_SAFARI_ZONE_REST_HOUSE (11 | (26 << 8)) -#define MAP_SAFARI_ZONE_EM_1 (12 | (26 << 8)) -#define MAP_SAFARI_ZONE_EM_2 (13 | (26 << 8)) +#define MAP_SAFARI_ZONE_NORTHEAST (12 | (26 << 8)) +#define MAP_SAFARI_ZONE_SOUTHEAST (13 | (26 << 8)) #define MAP_BATTLE_FRONTIER_OUTSIDE_EAST (14 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM (15 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2 (16 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM_2 (17 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 (16 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2 (17 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY (18 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR (19 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM (20 | (26 << 8)) @@ -498,22 +498,22 @@ #define MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY (34 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR (35 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM (36 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_1 (37 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_2 (38 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_3 (39 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 (37 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2 (38 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 (39 | (26 << 8)) #define MAP_BATTLE_FRONTIER_RANKING_HALL (40 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE_1 (41 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE1 (41 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER (42 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE_2 (43 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE_3 (44 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE_4 (45 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE2 (43 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE3 (44 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE4 (45 | (26 << 8)) #define MAP_BATTLE_FRONTIER_SCOTTS_HOUSE (46 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE_5 (47 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE_6 (48 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE_7 (49 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE5 (47 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE6 (48 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE7 (49 | (26 << 8)) #define MAP_BATTLE_FRONTIER_RECEPTION_GATE (50 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE_8 (51 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE_9 (52 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE8 (51 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE9 (52 | (26 << 8)) #define MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F (53 | (26 << 8)) #define MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F (54 | (26 << 8)) #define MAP_BATTLE_FRONTIER_MART (55 | (26 << 8)) @@ -530,24 +530,24 @@ #define MAP_NAVEL_ROCK_EXTERIOR (66 | (26 << 8)) #define MAP_NAVEL_ROCK_HARBOR (67 | (26 << 8)) #define MAP_NAVEL_ROCK_ENTRANCE (68 | (26 << 8)) -#define MAP_NAVEL_ROCK_B1F (69 | (26 << 8)) -#define MAP_NAVEL_ROCK_FORK (70 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP_1 (71 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP_2 (72 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP_3 (73 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP_4 (74 | (26 << 8)) -#define MAP_NAVEL_ROCK_TOP (75 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN_01 (76 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN_02 (77 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN_03 (78 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN_04 (79 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN_05 (80 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN_06 (81 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN_07 (82 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN_08 (83 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN_09 (84 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN_10 (85 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN_11 (86 | (26 << 8)) +#define MAP_NAVEL_ROCK_B1F (69 | (26 << 8)) +#define MAP_NAVEL_ROCK_FORK (70 | (26 << 8)) +#define MAP_NAVEL_ROCK_UP1 (71 | (26 << 8)) +#define MAP_NAVEL_ROCK_UP2 (72 | (26 << 8)) +#define MAP_NAVEL_ROCK_UP3 (73 | (26 << 8)) +#define MAP_NAVEL_ROCK_UP4 (74 | (26 << 8)) +#define MAP_NAVEL_ROCK_TOP (75 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN01 (76 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN02 (77 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN03 (78 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN04 (79 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN05 (80 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN06 (81 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN07 (82 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN08 (83 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN09 (84 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN10 (85 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN11 (86 | (26 << 8)) #define MAP_NAVEL_ROCK_BOTTOM (87 | (26 << 8)) #define MAP_TRAINER_HILL_ELEVATOR (88 | (26 << 8)) diff --git a/src/field_door.c b/src/field_door.c index f73c6bb55f..fe9de01fd0 100644 --- a/src/field_door.c +++ b/src/field_door.c @@ -889,7 +889,7 @@ bool8 sub_808A964(void) { if (FlagGet(FLAG_SPECIAL_FLAG_0x4002)) { - if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2)) + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2)) { return TRUE; } diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 279b6e672b..862672e198 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -3437,8 +3437,8 @@ const struct WildPokemonHeader gWildMonHeaders[] = .fishingMonsInfo = NULL, }, { - .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTHEAST), - .mapNum = MAP_NUM(SAFARI_ZONE_SOUTHEAST), + .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTH), + .mapNum = MAP_NUM(SAFARI_ZONE_SOUTH), .landMonsInfo = &gSafariZone_South_LandMonsInfo, .waterMonsInfo = NULL, .rockSmashMonsInfo = NULL, @@ -3861,8 +3861,8 @@ const struct WildPokemonHeader gWildMonHeaders[] = .fishingMonsInfo = &gSafariZone_Southwest_FishingMonsInfo, }, { - .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTHEAST), - .mapNum = MAP_NUM(SAFARI_ZONE_NORTHEAST), + .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTH), + .mapNum = MAP_NUM(SAFARI_ZONE_NORTH), .landMonsInfo = &gSafariZone_North_LandMonsInfo, .waterMonsInfo = NULL, .rockSmashMonsInfo = &gSafariZone_North_RockSmashMonsInfo, @@ -4053,16 +4053,16 @@ const struct WildPokemonHeader gWildMonHeaders[] = .fishingMonsInfo = NULL, }, { - .mapGroup = MAP_GROUP(SAFARI_ZONE_EM_2), - .mapNum = MAP_NUM(SAFARI_ZONE_EM_2), + .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTHEAST), + .mapNum = MAP_NUM(SAFARI_ZONE_SOUTHEAST), .landMonsInfo = &gSafariZone_Southeast_LandMonsInfo, .waterMonsInfo = &gSafariZone_Southeast_WaterMonsInfo, .rockSmashMonsInfo = NULL, .fishingMonsInfo = &gSafariZone_Southeast_FishingMonsInfo, }, { - .mapGroup = MAP_GROUP(SAFARI_ZONE_EM_1), - .mapNum = MAP_NUM(SAFARI_ZONE_EM_1), + .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTHEAST), + .mapNum = MAP_NUM(SAFARI_ZONE_NORTHEAST), .landMonsInfo = &gSafariZone_Northeast_LandMonsInfo, .waterMonsInfo = NULL, .rockSmashMonsInfo = &gSafariZone_Northeast_RockSmashMonsInfo, From 2807abe3ba0d331f26b935b3716cbee81d5feb20 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 14 Jun 2018 22:00:20 -0500 Subject: [PATCH 15/55] Remove filler bytes from object_event macro --- asm/macros/map.inc | 8 +- .../events/AbandonedShip_CaptainsOffice.inc | 4 +- .../events/AbandonedShip_Corridors_1F.inc | 4 +- .../events/AbandonedShip_Corridors_B1F.inc | 4 +- .../events/AbandonedShip_HiddenFloorRooms.inc | 8 +- data/maps/events/AbandonedShip_Room_B1F.inc | 2 +- data/maps/events/AbandonedShip_Rooms2_1F.inc | 10 +- data/maps/events/AbandonedShip_Rooms2_B1F.inc | 4 +- data/maps/events/AbandonedShip_Rooms_1F.inc | 8 +- data/maps/events/AbandonedShip_Rooms_B1F.inc | 4 +- data/maps/events/AncientTomb.inc | 2 +- data/maps/events/AquaHideout_1F.inc | 6 +- data/maps/events/AquaHideout_B1F.inc | 18 ++-- data/maps/events/AquaHideout_B2F.inc | 12 +-- data/maps/events/ArtisanCave_1F.inc | 2 +- data/maps/events/ArtisanCave_B1F.inc | 2 +- .../BattleFrontier_BattleArenaBattleRoom.inc | 18 ++-- .../BattleFrontier_BattleArenaCorridor.inc | 2 +- .../BattleFrontier_BattleArenaLobby.inc | 10 +- .../BattleFrontier_BattleDomeBattleRoom.inc | 30 +++--- .../BattleFrontier_BattleDomeCorridor.inc | 2 +- .../events/BattleFrontier_BattleDomeLobby.inc | 12 +-- ...BattleFrontier_BattleDomePreBattleRoom.inc | 2 +- ...BattleFrontier_BattleFactoryBattleRoom.inc | 16 ++-- .../BattleFrontier_BattleFactoryLobby.inc | 12 +-- ...tleFrontier_BattleFactoryPreBattleRoom.inc | 2 +- .../BattleFrontier_BattlePalaceBattleRoom.inc | 10 +- .../BattleFrontier_BattlePalaceCorridor.inc | 14 +-- .../BattleFrontier_BattlePalaceLobby.inc | 12 +-- .../BattleFrontier_BattlePikeCorridor.inc | 2 +- .../events/BattleFrontier_BattlePikeLobby.inc | 8 +- .../BattleFrontier_BattlePikeRandomRoom1.inc | 4 +- .../BattleFrontier_BattlePikeRandomRoom2.inc | 2 +- ...BattleFrontier_BattlePikeThreePathRoom.inc | 4 +- ...ntier_BattlePointExchangeServiceCorner.inc | 18 ++-- ...attleFrontier_BattlePyramidEmptySquare.inc | 32 +++---- .../BattleFrontier_BattlePyramidLobby.inc | 8 +- .../BattleFrontier_BattlePyramidTop.inc | 4 +- .../BattleFrontier_BattleTowerBattleRoom.inc | 6 +- .../BattleFrontier_BattleTowerBattleRoom2.inc | 12 +-- .../BattleFrontier_BattleTowerCorridor.inc | 2 +- .../BattleFrontier_BattleTowerCorridor2.inc | 8 +- .../BattleFrontier_BattleTowerElevator.inc | 2 +- .../BattleFrontier_BattleTowerLobby.inc | 18 ++-- ...tleFrontier_BattleTowerMultiBattleRoom.inc | 18 ++-- data/maps/events/BattleFrontier_Lounge1.inc | 6 +- data/maps/events/BattleFrontier_Lounge2.inc | 10 +- data/maps/events/BattleFrontier_Lounge3.inc | 10 +- data/maps/events/BattleFrontier_Lounge4.inc | 6 +- data/maps/events/BattleFrontier_Lounge5.inc | 8 +- data/maps/events/BattleFrontier_Lounge6.inc | 2 +- data/maps/events/BattleFrontier_Lounge7.inc | 8 +- data/maps/events/BattleFrontier_Lounge8.inc | 6 +- data/maps/events/BattleFrontier_Lounge9.inc | 2 +- data/maps/events/BattleFrontier_Mart.inc | 8 +- .../events/BattleFrontier_OutsideEast.inc | 52 +++++------ .../events/BattleFrontier_OutsideWest.inc | 48 +++++----- .../BattleFrontier_PokemonCenter_1F.inc | 10 +- .../BattleFrontier_PokemonCenter_2F.inc | 8 +- .../events/BattleFrontier_RankingHall.inc | 6 +- .../events/BattleFrontier_ReceptionGate.inc | 10 +- .../events/BattleFrontier_ScottsHouse.inc | 2 +- data/maps/events/BattlePyramidSquare01.inc | 14 +-- data/maps/events/BattlePyramidSquare02.inc | 14 +-- data/maps/events/BattlePyramidSquare03.inc | 14 +-- data/maps/events/BattlePyramidSquare04.inc | 14 +-- data/maps/events/BattlePyramidSquare05.inc | 14 +-- data/maps/events/BattlePyramidSquare06.inc | 14 +-- data/maps/events/BattlePyramidSquare07.inc | 14 +-- data/maps/events/BattlePyramidSquare08.inc | 14 +-- data/maps/events/BattlePyramidSquare09.inc | 14 +-- data/maps/events/BattlePyramidSquare10.inc | 14 +-- data/maps/events/BattlePyramidSquare11.inc | 14 +-- data/maps/events/BattlePyramidSquare12.inc | 14 +-- data/maps/events/BattlePyramidSquare13.inc | 14 +-- data/maps/events/BattlePyramidSquare14.inc | 14 +-- data/maps/events/BattlePyramidSquare15.inc | 14 +-- data/maps/events/BattlePyramidSquare16.inc | 14 +-- data/maps/events/BirthIsland_Exterior.inc | 4 +- data/maps/events/BirthIsland_Harbor.inc | 4 +- data/maps/events/CaveOfOrigin_B1F.inc | 2 +- data/maps/events/DesertRuins.inc | 2 +- data/maps/events/DesertUnderpass.inc | 2 +- data/maps/events/DewfordTown.inc | 10 +- data/maps/events/DewfordTown_Gym.inc | 16 ++-- data/maps/events/DewfordTown_Hall.inc | 18 ++-- data/maps/events/DewfordTown_House1.inc | 6 +- data/maps/events/DewfordTown_House2.inc | 4 +- .../events/DewfordTown_PokemonCenter_1F.inc | 6 +- .../events/DewfordTown_PokemonCenter_2F.inc | 8 +- .../events/EverGrandeCity_ChampionsRoom.inc | 6 +- .../maps/events/EverGrandeCity_DrakesRoom.inc | 2 +- .../events/EverGrandeCity_GlaciasRoom.inc | 2 +- .../maps/events/EverGrandeCity_HallOfFame.inc | 2 +- .../events/EverGrandeCity_PhoebesRoom.inc | 2 +- .../EverGrandeCity_PokemonCenter_1F.inc | 8 +- .../EverGrandeCity_PokemonCenter_2F.inc | 8 +- .../EverGrandeCity_PokemonLeague_1F.inc | 8 +- .../EverGrandeCity_PokemonLeague_2F.inc | 8 +- .../events/EverGrandeCity_SidneysRoom.inc | 2 +- data/maps/events/FallarborTown.inc | 8 +- .../FallarborTown_BattleTentBattleRoom.inc | 6 +- .../FallarborTown_BattleTentCorridor.inc | 2 +- .../events/FallarborTown_BattleTentLobby.inc | 10 +- data/maps/events/FallarborTown_House1.inc | 4 +- data/maps/events/FallarborTown_House2.inc | 2 +- data/maps/events/FallarborTown_Mart.inc | 10 +- .../events/FallarborTown_PokemonCenter_1F.inc | 8 +- .../events/FallarborTown_PokemonCenter_2F.inc | 8 +- data/maps/events/FarawayIsland_Entrance.inc | 4 +- data/maps/events/FarawayIsland_Interior.inc | 2 +- data/maps/events/FieryPath.inc | 16 ++-- data/maps/events/FortreeCity.inc | 14 +-- .../events/FortreeCity_DecorationShop.inc | 8 +- data/maps/events/FortreeCity_Gym.inc | 16 ++-- data/maps/events/FortreeCity_House1.inc | 6 +- data/maps/events/FortreeCity_House2.inc | 4 +- data/maps/events/FortreeCity_House3.inc | 4 +- data/maps/events/FortreeCity_House4.inc | 6 +- data/maps/events/FortreeCity_House5.inc | 6 +- data/maps/events/FortreeCity_Mart.inc | 8 +- .../events/FortreeCity_PokemonCenter_1F.inc | 8 +- .../events/FortreeCity_PokemonCenter_2F.inc | 8 +- data/maps/events/GraniteCave_1F.inc | 4 +- data/maps/events/GraniteCave_B1F.inc | 2 +- data/maps/events/GraniteCave_B2F.inc | 18 ++-- data/maps/events/GraniteCave_StevensRoom.inc | 2 +- data/maps/events/InsideOfTruck.inc | 6 +- data/maps/events/IslandCave.inc | 2 +- data/maps/events/JaggedPass.inc | 14 +-- data/maps/events/LavaridgeTown.inc | 18 ++-- data/maps/events/LavaridgeTown_Gym_1F.inc | 12 +-- data/maps/events/LavaridgeTown_Gym_B1F.inc | 8 +- data/maps/events/LavaridgeTown_HerbShop.inc | 6 +- data/maps/events/LavaridgeTown_House.inc | 6 +- data/maps/events/LavaridgeTown_Mart.inc | 6 +- .../events/LavaridgeTown_PokemonCenter_1F.inc | 8 +- .../events/LavaridgeTown_PokemonCenter_2F.inc | 8 +- data/maps/events/LilycoveCity.inc | 44 ++++----- data/maps/events/LilycoveCity_ContestHall.inc | 64 ++++++------- .../maps/events/LilycoveCity_ContestLobby.inc | 50 +++++----- .../events/LilycoveCity_CoveLilyMotel_1F.inc | 2 +- .../events/LilycoveCity_CoveLilyMotel_2F.inc | 14 +-- .../LilycoveCity_DepartmentStoreElevator.inc | 2 +- .../LilycoveCity_DepartmentStoreRooftop.inc | 8 +- .../LilycoveCity_DepartmentStore_1F.inc | 12 +-- .../LilycoveCity_DepartmentStore_2F.inc | 10 +- .../LilycoveCity_DepartmentStore_3F.inc | 10 +- .../LilycoveCity_DepartmentStore_4F.inc | 10 +- .../LilycoveCity_DepartmentStore_5F.inc | 14 +-- data/maps/events/LilycoveCity_Harbor.inc | 10 +- data/maps/events/LilycoveCity_House1.inc | 4 +- data/maps/events/LilycoveCity_House2.inc | 2 +- data/maps/events/LilycoveCity_House3.inc | 12 +-- data/maps/events/LilycoveCity_House4.inc | 4 +- .../events/LilycoveCity_LilycoveMuseum_1F.inc | 20 ++-- .../events/LilycoveCity_LilycoveMuseum_2F.inc | 8 +- .../events/LilycoveCity_MoveDeletersHouse.inc | 2 +- .../events/LilycoveCity_PokemonCenter_1F.inc | 10 +- .../events/LilycoveCity_PokemonCenter_2F.inc | 8 +- .../LilycoveCity_PokemonTrainerFanClub.inc | 18 ++-- data/maps/events/LinkContestRoom1.inc | 30 +++--- data/maps/events/LittlerootTown.inc | 16 ++-- .../LittlerootTown_BrendansHouse_1F.inc | 14 +-- .../LittlerootTown_BrendansHouse_2F.inc | 32 +++---- .../events/LittlerootTown_MaysHouse_1F.inc | 14 +-- .../events/LittlerootTown_MaysHouse_2F.inc | 32 +++---- .../LittlerootTown_ProfessorBirchsLab.inc | 12 +-- data/maps/events/MagmaHideout_1F.inc | 12 +-- data/maps/events/MagmaHideout_2F_1R.inc | 8 +- data/maps/events/MagmaHideout_2F_2R.inc | 12 +-- data/maps/events/MagmaHideout_3F_1R.inc | 6 +- data/maps/events/MagmaHideout_3F_2R.inc | 4 +- data/maps/events/MagmaHideout_3F_3R.inc | 2 +- data/maps/events/MagmaHideout_4F.inc | 16 ++-- data/maps/events/MarineCave_End.inc | 2 +- data/maps/events/MauvilleCity.inc | 22 ++--- data/maps/events/MauvilleCity_BikeShop.inc | 4 +- data/maps/events/MauvilleCity_GameCorner.inc | 24 ++--- data/maps/events/MauvilleCity_Gym.inc | 14 +-- data/maps/events/MauvilleCity_House1.inc | 2 +- data/maps/events/MauvilleCity_House2.inc | 2 +- data/maps/events/MauvilleCity_Mart.inc | 6 +- .../events/MauvilleCity_PokemonCenter_1F.inc | 10 +- .../events/MauvilleCity_PokemonCenter_2F.inc | 10 +- data/maps/events/MeteorFalls_1F_1R.inc | 20 ++-- data/maps/events/MeteorFalls_1F_2R.inc | 6 +- data/maps/events/MeteorFalls_B1F_2R.inc | 2 +- data/maps/events/MeteorFalls_StevensCave.inc | 2 +- data/maps/events/MirageTower_3F.inc | 4 +- data/maps/events/MirageTower_4F.inc | 6 +- data/maps/events/MossdeepCity.inc | 34 +++---- .../events/MossdeepCity_GameCorner_1F.inc | 4 +- .../events/MossdeepCity_GameCorner_B1F.inc | 2 +- data/maps/events/MossdeepCity_Gym.inc | 72 +++++++-------- data/maps/events/MossdeepCity_House1.inc | 4 +- data/maps/events/MossdeepCity_House2.inc | 6 +- data/maps/events/MossdeepCity_House3.inc | 2 +- data/maps/events/MossdeepCity_House4.inc | 6 +- data/maps/events/MossdeepCity_Mart.inc | 8 +- .../events/MossdeepCity_PokemonCenter_1F.inc | 6 +- .../events/MossdeepCity_PokemonCenter_2F.inc | 10 +- .../events/MossdeepCity_SpaceCenter_1F.inc | 22 ++--- .../events/MossdeepCity_SpaceCenter_2F.inc | 18 ++-- .../maps/events/MossdeepCity_StevensHouse.inc | 6 +- data/maps/events/MtChimney.inc | 60 ++++++------ .../maps/events/MtChimney_CableCarStation.inc | 4 +- data/maps/events/MtPyre_1F.inc | 6 +- data/maps/events/MtPyre_2F.inc | 16 ++-- data/maps/events/MtPyre_3F.inc | 8 +- data/maps/events/MtPyre_4F.inc | 4 +- data/maps/events/MtPyre_5F.inc | 4 +- data/maps/events/MtPyre_6F.inc | 6 +- data/maps/events/MtPyre_Exterior.inc | 4 +- data/maps/events/MtPyre_Summit.inc | 16 ++-- data/maps/events/NavelRock_Bottom.inc | 2 +- data/maps/events/NavelRock_Harbor.inc | 4 +- data/maps/events/NavelRock_Top.inc | 2 +- data/maps/events/NewMauville_Inside.inc | 16 ++-- data/maps/events/OldaleTown.inc | 8 +- data/maps/events/OldaleTown_House1.inc | 2 +- data/maps/events/OldaleTown_House2.inc | 4 +- data/maps/events/OldaleTown_Mart.inc | 6 +- .../events/OldaleTown_PokemonCenter_1F.inc | 8 +- .../events/OldaleTown_PokemonCenter_2F.inc | 8 +- data/maps/events/PacifidlogTown.inc | 6 +- data/maps/events/PacifidlogTown_House1.inc | 4 +- data/maps/events/PacifidlogTown_House2.inc | 6 +- data/maps/events/PacifidlogTown_House3.inc | 4 +- data/maps/events/PacifidlogTown_House4.inc | 6 +- data/maps/events/PacifidlogTown_House5.inc | 4 +- .../PacifidlogTown_PokemonCenter_1F.inc | 10 +- .../PacifidlogTown_PokemonCenter_2F.inc | 8 +- data/maps/events/PetalburgCity.inc | 18 ++-- data/maps/events/PetalburgCity_Gym.inc | 22 ++--- data/maps/events/PetalburgCity_House1.inc | 4 +- data/maps/events/PetalburgCity_House2.inc | 4 +- data/maps/events/PetalburgCity_Mart.inc | 8 +- .../events/PetalburgCity_PokemonCenter_1F.inc | 10 +- .../events/PetalburgCity_PokemonCenter_2F.inc | 8 +- .../maps/events/PetalburgCity_WallysHouse.inc | 4 +- data/maps/events/PetalburgWoods.inc | 26 +++--- data/maps/events/RecordCorner.inc | 2 +- data/maps/events/Route101.inc | 12 +-- data/maps/events/Route102.inc | 18 ++-- data/maps/events/Route103.inc | 40 ++++---- data/maps/events/Route104.inc | 68 +++++++------- data/maps/events/Route104_MrBrineysHouse.inc | 4 +- .../events/Route104_PrettyPetalFlowerShop.inc | 6 +- data/maps/events/Route105.inc | 16 ++-- data/maps/events/Route106.inc | 10 +- data/maps/events/Route107.inc | 14 +-- data/maps/events/Route108.inc | 14 +-- data/maps/events/Route109.inc | 48 +++++----- data/maps/events/Route109_SeashoreHouse.inc | 8 +- data/maps/events/Route110.inc | 72 +++++++-------- .../Route110_SeasideCyclingRoadEntrance1.inc | 2 +- .../Route110_SeasideCyclingRoadEntrance2.inc | 2 +- data/maps/events/Route110_TrickHouseEnd.inc | 2 +- .../events/Route110_TrickHouseEntrance.inc | 2 +- .../events/Route110_TrickHousePuzzle1.inc | 30 +++--- .../events/Route110_TrickHousePuzzle2.inc | 10 +- .../events/Route110_TrickHousePuzzle3.inc | 14 +-- .../events/Route110_TrickHousePuzzle4.inc | 28 +++--- .../events/Route110_TrickHousePuzzle5.inc | 10 +- .../events/Route110_TrickHousePuzzle6.inc | 8 +- .../events/Route110_TrickHousePuzzle7.inc | 18 ++-- .../events/Route110_TrickHousePuzzle8.inc | 8 +- data/maps/events/Route111.inc | 92 +++++++++---------- .../maps/events/Route111_OldLadysRestStop.inc | 2 +- .../events/Route111_WinstrateFamilysHouse.inc | 8 +- data/maps/events/Route112.inc | 28 +++--- data/maps/events/Route112_CableCarStation.inc | 4 +- data/maps/events/Route113.inc | 32 +++---- data/maps/events/Route113_GlassWorkshop.inc | 4 +- data/maps/events/Route114.inc | 54 +++++------ .../events/Route114_FossilManiacsHouse.inc | 2 +- .../events/Route114_FossilManiacsTunnel.inc | 2 +- data/maps/events/Route114_LanettesHouse.inc | 2 +- data/maps/events/Route115.inc | 46 +++++----- data/maps/events/Route116.inc | 56 +++++------ .../events/Route116_TunnelersRestHouse.inc | 6 +- data/maps/events/Route117.inc | 48 +++++----- data/maps/events/Route117_PokemonDayCare.inc | 2 +- data/maps/events/Route118.inc | 42 ++++----- data/maps/events/Route119.inc | 86 ++++++++--------- data/maps/events/Route119_House.inc | 14 +-- .../events/Route119_WeatherInstitute_1F.inc | 10 +- .../events/Route119_WeatherInstitute_2F.inc | 16 ++-- data/maps/events/Route120.inc | 88 +++++++++--------- data/maps/events/Route121.inc | 58 ++++++------ .../events/Route121_SafariZoneEntrance.inc | 6 +- data/maps/events/Route123.inc | 86 ++++++++--------- .../events/Route123_BerryMastersHouse.inc | 4 +- data/maps/events/Route124.inc | 24 ++--- .../Route124_DivingTreasureHuntersHouse.inc | 2 +- data/maps/events/Route125.inc | 20 ++-- data/maps/events/Route126.inc | 18 ++-- data/maps/events/Route127.inc | 22 ++--- data/maps/events/Route128.inc | 20 ++-- data/maps/events/Route129.inc | 10 +- data/maps/events/Route130.inc | 8 +- data/maps/events/Route131.inc | 16 ++-- data/maps/events/Route132.inc | 20 ++-- data/maps/events/Route133.inc | 20 ++-- data/maps/events/Route134.inc | 22 ++--- data/maps/events/RustboroCity.inc | 32 +++---- .../maps/events/RustboroCity_CuttersHouse.inc | 4 +- .../maps/events/RustboroCity_DevonCorp_1F.inc | 6 +- .../maps/events/RustboroCity_DevonCorp_2F.inc | 12 +-- .../maps/events/RustboroCity_DevonCorp_3F.inc | 6 +- data/maps/events/RustboroCity_Flat1_1F.inc | 4 +- data/maps/events/RustboroCity_Flat1_2F.inc | 16 ++-- data/maps/events/RustboroCity_Flat2_1F.inc | 4 +- data/maps/events/RustboroCity_Flat2_2F.inc | 4 +- data/maps/events/RustboroCity_Flat2_3F.inc | 4 +- data/maps/events/RustboroCity_Gym.inc | 10 +- data/maps/events/RustboroCity_House1.inc | 4 +- data/maps/events/RustboroCity_House2.inc | 4 +- data/maps/events/RustboroCity_House3.inc | 6 +- data/maps/events/RustboroCity_Mart.inc | 8 +- .../events/RustboroCity_PokemonCenter_1F.inc | 8 +- .../events/RustboroCity_PokemonCenter_2F.inc | 8 +- .../events/RustboroCity_PokemonSchool.inc | 14 +-- data/maps/events/RusturfTunnel.inc | 20 ++-- data/maps/events/SSTidalCorridor.inc | 10 +- data/maps/events/SSTidalLowerDeck.inc | 4 +- data/maps/events/SSTidalRooms.inc | 16 ++-- data/maps/events/SafariZone_North.inc | 18 ++-- data/maps/events/SafariZone_Northeast.inc | 18 ++-- data/maps/events/SafariZone_Northwest.inc | 4 +- data/maps/events/SafariZone_RestHouse.inc | 6 +- data/maps/events/SafariZone_South.inc | 12 +-- data/maps/events/SafariZone_Southeast.inc | 10 +- data/maps/events/SafariZone_Southwest.inc | 4 +- data/maps/events/ScorchedSlab.inc | 2 +- data/maps/events/SeafloorCavern_Entrance.inc | 2 +- data/maps/events/SeafloorCavern_Room1.inc | 10 +- data/maps/events/SeafloorCavern_Room2.inc | 16 ++-- data/maps/events/SeafloorCavern_Room3.inc | 18 ++-- data/maps/events/SeafloorCavern_Room4.inc | 4 +- data/maps/events/SeafloorCavern_Room5.inc | 12 +-- data/maps/events/SeafloorCavern_Room8.inc | 24 ++--- data/maps/events/SeafloorCavern_Room9.inc | 14 +-- data/maps/events/SecretBase_BlueCave1.inc | 30 +++--- data/maps/events/SecretBase_BlueCave2.inc | 30 +++--- data/maps/events/SecretBase_BlueCave3.inc | 30 +++--- data/maps/events/SecretBase_BlueCave4.inc | 30 +++--- data/maps/events/SecretBase_BrownCave1.inc | 30 +++--- data/maps/events/SecretBase_BrownCave2.inc | 30 +++--- data/maps/events/SecretBase_BrownCave3.inc | 30 +++--- data/maps/events/SecretBase_BrownCave4.inc | 30 +++--- data/maps/events/SecretBase_RedCave1.inc | 30 +++--- data/maps/events/SecretBase_RedCave2.inc | 30 +++--- data/maps/events/SecretBase_RedCave3.inc | 30 +++--- data/maps/events/SecretBase_RedCave4.inc | 30 +++--- data/maps/events/SecretBase_Shrub1.inc | 30 +++--- data/maps/events/SecretBase_Shrub2.inc | 30 +++--- data/maps/events/SecretBase_Shrub3.inc | 30 +++--- data/maps/events/SecretBase_Shrub4.inc | 30 +++--- data/maps/events/SecretBase_Tree1.inc | 30 +++--- data/maps/events/SecretBase_Tree2.inc | 30 +++--- data/maps/events/SecretBase_Tree3.inc | 30 +++--- data/maps/events/SecretBase_Tree4.inc | 30 +++--- data/maps/events/SecretBase_YellowCave1.inc | 30 +++--- data/maps/events/SecretBase_YellowCave2.inc | 30 +++--- data/maps/events/SecretBase_YellowCave3.inc | 30 +++--- data/maps/events/SecretBase_YellowCave4.inc | 30 +++--- .../events/ShoalCave_LowTideEntranceRoom.inc | 4 +- data/maps/events/ShoalCave_LowTideIceRoom.inc | 4 +- .../events/ShoalCave_LowTideInnerRoom.inc | 2 +- .../events/ShoalCave_LowTideLowerRoom.inc | 4 +- .../events/ShoalCave_LowTideStairsRoom.inc | 2 +- data/maps/events/SingleBattleColosseum.inc | 2 +- data/maps/events/SkyPillar_Outside.inc | 2 +- data/maps/events/SkyPillar_Top.inc | 4 +- data/maps/events/SlateportCity.inc | 70 +++++++------- .../SlateportCity_BattleTentBattleRoom.inc | 6 +- .../SlateportCity_BattleTentCorridor.inc | 2 +- .../events/SlateportCity_BattleTentLobby.inc | 10 +- data/maps/events/SlateportCity_Harbor.inc | 16 ++-- data/maps/events/SlateportCity_House1.inc | 2 +- data/maps/events/SlateportCity_House2.inc | 4 +- data/maps/events/SlateportCity_Mart.inc | 6 +- .../events/SlateportCity_OceanicMuseum_1F.inc | 28 +++--- .../events/SlateportCity_OceanicMuseum_2F.inc | 14 +-- .../events/SlateportCity_PokemonCenter_1F.inc | 6 +- .../events/SlateportCity_PokemonCenter_2F.inc | 8 +- .../events/SlateportCity_PokemonFanClub.inc | 18 ++-- .../SlateportCity_SternsShipyard_1F.inc | 8 +- .../SlateportCity_SternsShipyard_2F.inc | 6 +- data/maps/events/SootopolisCity.inc | 36 ++++---- data/maps/events/SootopolisCity_Gym_1F.inc | 4 +- data/maps/events/SootopolisCity_Gym_B1F.inc | 20 ++-- data/maps/events/SootopolisCity_House1.inc | 4 +- data/maps/events/SootopolisCity_House2.inc | 2 +- data/maps/events/SootopolisCity_House3.inc | 4 +- data/maps/events/SootopolisCity_House4.inc | 6 +- data/maps/events/SootopolisCity_House5.inc | 4 +- data/maps/events/SootopolisCity_House6.inc | 2 +- data/maps/events/SootopolisCity_House7.inc | 4 +- .../SootopolisCity_LotadAndSeedotHouse.inc | 4 +- data/maps/events/SootopolisCity_Mart.inc | 6 +- .../SootopolisCity_MysteryEventsHouse_1F.inc | 2 +- .../SootopolisCity_MysteryEventsHouse_B1F.inc | 2 +- .../SootopolisCity_PokemonCenter_1F.inc | 8 +- .../SootopolisCity_PokemonCenter_2F.inc | 8 +- data/maps/events/SouthernIsland_Exterior.inc | 4 +- data/maps/events/SouthernIsland_Interior.inc | 4 +- data/maps/events/TerraCave_End.inc | 2 +- data/maps/events/TradeCenter.inc | 2 +- data/maps/events/TrainerHill_Elevator.inc | 2 +- data/maps/events/TrainerHill_Entrance.inc | 10 +- data/maps/events/TrainerHill_Roof.inc | 2 +- .../maps/events/Underwater_SeafloorCavern.inc | 8 +- data/maps/events/UnionRoom.inc | 18 ++-- data/maps/events/VerdanturfTown.inc | 8 +- .../VerdanturfTown_BattleTentBattleRoom.inc | 6 +- .../VerdanturfTown_BattleTentCorridor.inc | 2 +- .../events/VerdanturfTown_BattleTentLobby.inc | 12 +-- .../VerdanturfTown_FriendshipRatersHouse.inc | 4 +- data/maps/events/VerdanturfTown_House.inc | 4 +- data/maps/events/VerdanturfTown_Mart.inc | 8 +- .../VerdanturfTown_PokemonCenter_1F.inc | 8 +- .../VerdanturfTown_PokemonCenter_2F.inc | 8 +- .../events/VerdanturfTown_WandasHouse.inc | 10 +- data/maps/events/VictoryRoad_1F.inc | 18 ++-- data/maps/events/VictoryRoad_B1F.inc | 42 ++++----- data/maps/events/VictoryRoad_B2F.inc | 14 +-- 429 files changed, 2780 insertions(+), 2780 deletions(-) diff --git a/asm/macros/map.inc b/asm/macros/map.inc index a6f9f2daee..8a07952663 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -14,15 +14,15 @@ .4byte \address .endm - .macro object_event index, gfx, replacement, filler1, x, y, elevation, movement_type, radius, filler2, trainer_type, sight_radius_tree_etc, script, event_flag, filler3, filler4 - .byte \index, \gfx, \replacement, \filler1 + .macro object_event index, gfx, replacement, x, y, elevation, movement_type, radius, trainer_type, sight_radius_tree_etc, script, event_flag + .byte \index, \gfx, \replacement, 0 .2byte \x .2byte \y - .byte \elevation, \movement_type, \radius, \filler2 + .byte \elevation, \movement_type, \radius, 0 .2byte \trainer_type, \sight_radius_tree_etc .4byte \script .2byte \event_flag - .byte \filler3, \filler4 + .2byte 0 inc _num_npcs .endm diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.inc b/data/maps/events/AbandonedShip_CaptainsOffice.inc index c66185abf7..b01dd1e726 100644 --- a/data/maps/events/AbandonedShip_CaptainsOffice.inc +++ b/data/maps/events/AbandonedShip_CaptainsOffice.inc @@ -1,6 +1,6 @@ AbandonedShip_CaptainsOffice_EventObjects: @ 8536A5C - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 6, 3, 1, 17, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100, 0, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, 8, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, 1, 17, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100 AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK diff --git a/data/maps/events/AbandonedShip_Corridors_1F.inc b/data/maps/events/AbandonedShip_Corridors_1F.inc index 60e5a0f4f8..3c3a18d4a1 100644 --- a/data/maps/events/AbandonedShip_Corridors_1F.inc +++ b/data/maps/events/AbandonedShip_Corridors_1F.inc @@ -1,6 +1,6 @@ AbandonedShip_Corridors_1F_EventObjects: @ 85366C0 - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 17, 7, 3, 2, 17, 0, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 0, 5, 10, 3, 45, 116, 0, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 17, 7, 3, 2, 17, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0 + object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 10, 3, 45, 116, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0 AbandonedShip_Corridors_1F_MapWarps: @ 85366F0 warp_def 9, 11, 3, 2, MAP_ABANDONED_SHIP_DECK diff --git a/data/maps/events/AbandonedShip_Corridors_B1F.inc b/data/maps/events/AbandonedShip_Corridors_B1F.inc index 7fb31aca0a..7a71cdcfc0 100644 --- a/data/maps/events/AbandonedShip_Corridors_B1F.inc +++ b/data/maps/events/AbandonedShip_Corridors_B1F.inc @@ -1,6 +1,6 @@ AbandonedShip_Corridors_B1F_EventObjects: @ 8536808 - object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 0, 2, 8, 3, 2, 17, 0, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 9, 6, 3, 14, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 2, 8, 3, 2, 17, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 6, 3, 14, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0 AbandonedShip_Corridors_B1F_MapWarps: @ 8536838 warp_def 6, 4, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_B1F diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc index 239d6a4558..dbc5d432b1 100644 --- a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc +++ b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc @@ -1,8 +1,8 @@ AbandonedShip_HiddenFloorRooms_EventObjects: @ 8536B40 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 41, 4, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077, 0, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 10, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078, 0, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 11, 3, 1, 17, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102, 0, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 11, 3, 1, 17, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101, 0, 0 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, 1, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, 1, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, 1, 17, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, 1, 17, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101 AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0 warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS diff --git a/data/maps/events/AbandonedShip_Room_B1F.inc b/data/maps/events/AbandonedShip_Room_B1F.inc index 10bcc33dd0..cf6369dd62 100644 --- a/data/maps/events/AbandonedShip_Room_B1F.inc +++ b/data/maps/events/AbandonedShip_Room_B1F.inc @@ -1,5 +1,5 @@ AbandonedShip_Room_B1F_EventObjects: @ 853697C - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 17, 0, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098, 0, 0 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 17, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098 AbandonedShip_Room_B1F_MapWarps: @ 8536994 warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.inc b/data/maps/events/AbandonedShip_Rooms2_1F.inc index 18b2b031d1..12bbe1366d 100644 --- a/data/maps/events/AbandonedShip_Rooms2_1F.inc +++ b/data/maps/events/AbandonedShip_Rooms2_1F.inc @@ -1,9 +1,9 @@ AbandonedShip_Rooms2_1F_EventObjects: @ 85369B8 - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 0, 7, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 6, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099, 0, 0 - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 0, 3, 2, 3, 10, 17, 0, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 0, 7, 2, 3, 9, 17, 0, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, 8, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 13, 3, 8, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 17, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099 + object_event 4, EVENT_OBJ_GFX_HIKER, 0, 3, 2, 3, 10, 17, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0 + object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 7, 2, 3, 9, 17, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0 AbandonedShip_Rooms2_1F_MapWarps: @ 8536A30 warp_def 4, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.inc b/data/maps/events/AbandonedShip_Rooms2_B1F.inc index 4bd68449cd..1aa5ad50f1 100644 --- a/data/maps/events/AbandonedShip_Rooms2_B1F.inc +++ b/data/maps/events/AbandonedShip_Rooms2_B1F.inc @@ -1,6 +1,6 @@ AbandonedShip_Rooms2_B1F_EventObjects: @ 85368F4 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 3, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097, 0, 0 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, 2, 17, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, 1, 17, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097 AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924 warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F diff --git a/data/maps/events/AbandonedShip_Rooms_1F.inc b/data/maps/events/AbandonedShip_Rooms_1F.inc index a3b61b7e9e..429159059c 100644 --- a/data/maps/events/AbandonedShip_Rooms_1F.inc +++ b/data/maps/events/AbandonedShip_Rooms_1F.inc @@ -1,8 +1,8 @@ AbandonedShip_Rooms_1F_EventObjects: @ 8536764 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 12, 5, 3, 2, 17, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 5, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095, 0, 0 - object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 0, 10, 11, 3, 8, 17, 0, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 10, 16, 3, 16, 17, 0, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 5, 3, 2, 17, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, 1, 17, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095 + object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 10, 11, 3, 8, 17, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 10, 16, 3, 16, 17, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0 AbandonedShip_Rooms_1F_MapWarps: @ 85367C4 warp_def 4, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.inc b/data/maps/events/AbandonedShip_Rooms_B1F.inc index 03690b801d..3b3d5976bf 100644 --- a/data/maps/events/AbandonedShip_Rooms_B1F.inc +++ b/data/maps/events/AbandonedShip_Rooms_B1F.inc @@ -1,6 +1,6 @@ AbandonedShip_Rooms_B1F_EventObjects: @ 8536898 - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 25, 6, 3, 9, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 7, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096, 0, 0 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, 9, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, 1, 17, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096 AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8 warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F diff --git a/data/maps/events/AncientTomb.inc b/data/maps/events/AncientTomb.inc index 31d31ccbc8..0071545870 100644 --- a/data/maps/events/AncientTomb.inc +++ b/data/maps/events/AncientTomb.inc @@ -1,5 +1,5 @@ AncientTomb_EventObjects: @ 8536CDC - object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937, 0, 0 + object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, 8, 0, 0, 0, AncientTomb_EventScript_23905A, 937 AncientTomb_MapWarps: @ 8536CF4 warp_def 8, 29, 3, 0, MAP_ROUTE120 diff --git a/data/maps/events/AquaHideout_1F.inc b/data/maps/events/AquaHideout_1F.inc index 6e4ef50683..44d9b8fea0 100644 --- a/data/maps/events/AquaHideout_1F.inc +++ b/data/maps/events/AquaHideout_1F.inc @@ -1,7 +1,7 @@ AquaHideout_1F_EventObjects: @ 8535304 - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821, 0, 0 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822, 0, 0 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 20, 4, 3, 50, 93, 0, 1, 3, AquaHideout_1F_EventScript_2334F8, 924, 0, 0 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, 8, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, 8, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, 50, 93, 1, 3, AquaHideout_1F_EventScript_2334F8, 924 AquaHideout_1F_MapWarps: @ 853534C warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/events/AquaHideout_B1F.inc index 1ad010c288..e279951fc4 100644 --- a/data/maps/events/AquaHideout_B1F.inc +++ b/data/maps/events/AquaHideout_B1F.inc @@ -1,13 +1,13 @@ AquaHideout_B1F_EventObjects: @ 8535378 - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 28, 16, 3, 8, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924, 0, 0 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 6, 3, 9, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924, 0, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 12, 3, 1, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071, 0, 0 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 20, 18, 3, 23, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 15, 9, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_291358, 1124, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 9, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977, 0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 15, 10, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_291365, 1132, 0, 0 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 10, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_233A38, 978, 0, 0 - object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 28, 21, 3, 7, 17, 0, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924, 0, 0 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, 8, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, 9, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, 1, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 20, 18, 3, 23, 4, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, 1, 17, 0, 0, AquaHideout_B1F_EventScript_291358, 1124 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, 1, 17, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, 1, 17, 0, 0, AquaHideout_B1F_EventScript_291365, 1132 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, 1, 17, 0, 0, AquaHideout_B1F_EventScript_233A38, 978 + object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, 7, 17, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924 AquaHideout_B1F_MapWarps: @ 8535450 warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/events/AquaHideout_B2F.inc index 9cfd51a10c..15cedf8b94 100644 --- a/data/maps/events/AquaHideout_B2F.inc +++ b/data/maps/events/AquaHideout_B2F.inc @@ -1,10 +1,10 @@ AquaHideout_B2F_EventObjects: @ 853552C - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 19, 3, 9, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, 924, 0, 0 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 10, 3, 45, 52, 0, 1, 3, AquaHideout_B2F_EventScript_233E8A, 924, 0, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072, 0, 0 - object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 0, 19, 20, 1, 9, 0, 0, 0, 0, 0x0, 943, 0, 0 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 7, 5, 3, 10, 17, 0, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924, 0, 0 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 5, 3, 9, 17, 0, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924, 0, 0 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 19, 3, 9, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, 924 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, 45, 52, 1, 3, AquaHideout_B2F_EventScript_233E8A, 924 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, 1, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072 + object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, 9, 0, 0, 0, 0x0, 943 + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, 10, 17, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, 9, 17, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924 AquaHideout_B2F_MapWarps: @ 85355BC warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F diff --git a/data/maps/events/ArtisanCave_1F.inc b/data/maps/events/ArtisanCave_1F.inc index e6752fc3ad..33c1cb9451 100644 --- a/data/maps/events/ArtisanCave_1F.inc +++ b/data/maps/events/ArtisanCave_1F.inc @@ -1,5 +1,5 @@ ArtisanCave_1F_EventObjects: @ 8537774 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 5, 3, 1, 17, 0, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163, 0, 0 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, 1, 17, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163 ArtisanCave_1F_MapWarps: @ 853778C warp_def 10, 17, 0, 13, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/ArtisanCave_B1F.inc b/data/maps/events/ArtisanCave_B1F.inc index e91c3211fd..fb9f896234 100644 --- a/data/maps/events/ArtisanCave_B1F.inc +++ b/data/maps/events/ArtisanCave_B1F.inc @@ -1,5 +1,5 @@ ArtisanCave_B1F_EventObjects: @ 8537708 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 32, 38, 3, 1, 17, 0, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162, 0, 0 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 38, 3, 1, 17, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162 ArtisanCave_B1F_MapWarps: @ 8537720 warp_def 8, 48, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc b/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc index 029a59b417..c8cd0042e1 100644 --- a/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc @@ -1,13 +1,13 @@ BattleFrontier_BattleArenaBattleRoom_EventObjects: @ 853C8EC - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 5, 3, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 10, 3, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 5, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 10, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 4, 5, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 11, 5, 3, 9, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 0, 15, 6, 3, 9, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 6, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 7, 4, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 3, 3, 8, 17, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 3, 3, 8, 17, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 9, 3, 7, 17, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 9, 3, 7, 17, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 5, 3, 10, 17, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 5, 3, 9, 17, 0, 0, 0x0, 0 + object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 15, 6, 3, 9, 17, 0, 0, 0x0, 0 + object_event 8, EVENT_OBJ_GFX_TRADER, 0, 0, 6, 3, 10, 17, 0, 0, 0x0, 0 + object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, 8, 17, 0, 0, 0x0, 0 BattleFrontier_BattleArenaBattleRoom_MapEvents:: @ 853C9C4 map_events BattleFrontier_BattleArenaBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleArenaCorridor.inc b/data/maps/events/BattleFrontier_BattleArenaCorridor.inc index 657f912e33..14f1b7d86a 100644 --- a/data/maps/events/BattleFrontier_BattleArenaCorridor.inc +++ b/data/maps/events/BattleFrontier_BattleArenaCorridor.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleArenaCorridor_EventObjects: @ 853C8C0 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 9, 12, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 12, 0, 8, 17, 0, 0, 0x0, 0 BattleFrontier_BattleArenaCorridor_MapEvents:: @ 853C8D8 map_events BattleFrontier_BattleArenaCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleArenaLobby.inc b/data/maps/events/BattleFrontier_BattleArenaLobby.inc index 9c7d333a07..d1c689967e 100644 --- a/data/maps/events/BattleFrontier_BattleArenaLobby.inc +++ b/data/maps/events/BattleFrontier_BattleArenaLobby.inc @@ -1,9 +1,9 @@ BattleFrontier_BattleArenaLobby_EventObjects: @ 853C814 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 7, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 2, 10, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 0, 14, 11, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 0, 14, 12, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 14, 10, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 7, 0, 8, 17, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 10, 3, 2, 17, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0 + object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 14, 11, 3, 9, 17, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0 + object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 14, 12, 3, 9, 17, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0 + object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 10, 3, 9, 17, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0 BattleFrontier_BattleArenaLobby_MapWarps: @ 853C88C warp_def 7, 12, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc b/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc index 595d14b607..b811d409ee 100644 --- a/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc @@ -1,19 +1,19 @@ BattleFrontier_BattleDomeBattleRoom_EventObjects: @ 853C1C4 - object_event 1, EVENT_OBJ_GFX_REPORTER_M, 0, 0, 5, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 7, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 9, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 11, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 16, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 0, 4, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 16, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_CAMPER, 0, 0, 8, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 12, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 11, EVENT_OBJ_GFX_GIRL_2, 0, 0, 13, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 13, EVENT_OBJ_GFX_TRADER, 0, 0, 4, 9, 4, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 14, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 15, EVENT_OBJ_GFX_HIPSTER, 0, 0, 11, 6, 0, 9, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_REPORTER_M, 0, 5, 4, 0, 8, 17, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 7, 2, 0, 8, 17, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 2, 0, 8, 17, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 11, 2, 0, 8, 17, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 16, 2, 0, 8, 17, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 4, 2, 0, 8, 17, 0, 0, 0x0, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 16, 1, 0, 8, 17, 0, 0, 0x0, 0 + object_event 8, EVENT_OBJ_GFX_CAMPER, 0, 8, 1, 0, 8, 17, 0, 0, 0x0, 0 + object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, 8, 17, 0, 0, 0x0, 0 + object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 1, 0, 8, 17, 0, 0, 0x0, 0 + object_event 11, EVENT_OBJ_GFX_GIRL_2, 0, 13, 2, 0, 8, 17, 0, 0, 0x0, 0 + object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 10, 2, 0, 8, 17, 0, 0, 0x0, 0 + object_event 13, EVENT_OBJ_GFX_TRADER, 0, 4, 9, 4, 7, 17, 0, 0, 0x0, 0 + object_event 14, EVENT_OBJ_GFX_WOMAN_4, 0, 14, 2, 0, 8, 17, 0, 0, 0x0, 0 + object_event 15, EVENT_OBJ_GFX_HIPSTER, 0, 11, 6, 0, 9, 17, 0, 0, 0x0, 0 BattleFrontier_BattleDomeBattleRoom_MapEvents:: @ 853C32C map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleDomeCorridor.inc b/data/maps/events/BattleFrontier_BattleDomeCorridor.inc index 34f39fa0ea..8157405492 100644 --- a/data/maps/events/BattleFrontier_BattleDomeCorridor.inc +++ b/data/maps/events/BattleFrontier_BattleDomeCorridor.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleDomeCorridor_EventObjects: @ 853C14C - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 23, 5, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 23, 5, 0, 8, 17, 0, 0, 0x0, 0 BattleFrontier_BattleDomeCorridor_MapWarps: @ 853C164 warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/events/BattleFrontier_BattleDomeLobby.inc b/data/maps/events/BattleFrontier_BattleDomeLobby.inc index c91db74297..da6e3ef874 100644 --- a/data/maps/events/BattleFrontier_BattleDomeLobby.inc +++ b/data/maps/events/BattleFrontier_BattleDomeLobby.inc @@ -1,10 +1,10 @@ BattleFrontier_BattleDomeLobby_EventObjects: @ 853C068 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 10, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 1, 11, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 14, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 18, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_TEALA, 0, 0, 17, 10, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 10, 0, 8, 17, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 1, 11, 0, 2, 17, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 14, 14, 0, 2, 17, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0 + object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 18, 14, 0, 2, 17, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0 + object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 8, 14, 0, 2, 17, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0 + object_event 6, EVENT_OBJ_GFX_TEALA, 0, 17, 10, 0, 8, 17, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0 BattleFrontier_BattleDomeLobby_MapWarps: @ 853C0F8 warp_def 11, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc b/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc index be18e491a5..db8cccf1cb 100644 --- a/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleDomePreBattleRoom_EventObjects: @ 853C188 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 2, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, 8, 17, 0, 0, 0x0, 0 BattleFrontier_BattleDomePreBattleRoom_MapWarps: @ 853C1A0 warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc b/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc index 48fd10c076..c3d3ea89e6 100644 --- a/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc @@ -1,12 +1,12 @@ BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 853CADC - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 6, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 7, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 8, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 6, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 8, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 8, 255, 0, 0, 5, 11, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 0, 8, 17, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 7, 4, 0, 8, 17, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 0, 8, 17, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 0, 8, 17, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 4, 0, 8, 17, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 6, 0, 8, 17, 0, 0, 0x0, 0 + object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 8, 0, 8, 17, 0, 0, 0x0, 0 + object_event 8, 255, 0, 5, 11, 0, 7, 17, 0, 0, 0x0, 0 BattleFrontier_BattleFactoryBattleRoom_MapEvents:: @ 853CB9C map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleFactoryLobby.inc b/data/maps/events/BattleFrontier_BattleFactoryLobby.inc index 322a2e66e8..b25212cde1 100644 --- a/data/maps/events/BattleFrontier_BattleFactoryLobby.inc +++ b/data/maps/events/BattleFrontier_BattleFactoryLobby.inc @@ -1,10 +1,10 @@ BattleFrontier_BattleFactoryLobby_EventObjects: @ 853C9D8 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 3, 11, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 14, 11, 0, 8, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 0, 13, 11, 0, 10, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 6, 10, 0, 1, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 7, 0, 8, 17, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 11, 0, 2, 17, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 14, 11, 0, 8, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 13, 11, 0, 10, 17, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0 + object_event 5, EVENT_OBJ_GFX_FAT_MAN, 0, 6, 10, 0, 1, 17, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0 + object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 7, 0, 8, 17, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0 BattleFrontier_BattleFactoryLobby_MapWarps: @ 853CA68 warp_def 9, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc index e1a0529fdc..a3bcf13b3a 100644 --- a/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventObjects: @ 853CAB0 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 12, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 12, 0, 7, 17, 0, 0, 0x0, 0 BattleFrontier_BattleFactoryPreBattleRoom_MapEvents:: @ 853CAC8 map_events BattleFrontier_BattleFactoryPreBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc b/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc index 520f928389..9b9e3d717a 100644 --- a/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc @@ -1,9 +1,9 @@ BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC - object_event 1, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 1, 4, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_TRADER, 0, 1, 9, 3, 7, 17, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 13, 1, 3, 8, 17, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 1, 4, 3, 10, 17, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 13, 1, 3, 8, 17, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 13, 1, 3, 8, 17, 0, 0, 0x0, 0 BattleFrontier_BattlePalaceBattleRoom_MapWarps: @ 853C574 warp_def 0, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR diff --git a/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc b/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc index a605a89ea3..91311b8dae 100644 --- a/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc +++ b/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc @@ -1,11 +1,11 @@ BattleFrontier_BattlePalaceCorridor_EventObjects: @ 853C420 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 8, 12, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 0, 3, 5, 0, 2, 1, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_KIRLIA, 0, 0, 12, 6, 0, 14, 32, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_PIKACHU, 0, 0, 15, 5, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 4, 9, 0, 14, 32, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 13, 9, 0, 1, 16, 0, 0, 0, 0x0, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 0, 3, 10, 0, 2, 33, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 8, 12, 3, 7, 17, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 3, 5, 0, 2, 1, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_KIRLIA, 0, 12, 6, 0, 14, 32, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_PIKACHU, 0, 15, 5, 0, 1, 17, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 9, 0, 14, 32, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 13, 9, 0, 1, 16, 0, 0, 0x0, 0 + object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 3, 10, 0, 2, 33, 0, 0, 0x0, 0 BattleFrontier_BattlePalaceCorridor_MapWarps: @ 853C4C8 warp_def 8, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY diff --git a/data/maps/events/BattleFrontier_BattlePalaceLobby.inc b/data/maps/events/BattleFrontier_BattlePalaceLobby.inc index a333fa1001..42b4da80e5 100644 --- a/data/maps/events/BattleFrontier_BattlePalaceLobby.inc +++ b/data/maps/events/BattleFrontier_BattlePalaceLobby.inc @@ -1,10 +1,10 @@ BattleFrontier_BattlePalaceLobby_EventObjects: @ 853C340 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 6, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 11, 8, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 0, 24, 5, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 18, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 0, 2, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 19, 6, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 6, 0, 8, 17, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 8, 0, 2, 17, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 24, 5, 0, 8, 17, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 18, 10, 0, 2, 17, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0 + object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 2, 10, 0, 2, 17, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0 + object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 19, 6, 0, 8, 17, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0 BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0 warp_def 12, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/BattleFrontier_BattlePikeCorridor.inc b/data/maps/events/BattleFrontier_BattlePikeCorridor.inc index 1960c0d63d..df9bd1572b 100644 --- a/data/maps/events/BattleFrontier_BattlePikeCorridor.inc +++ b/data/maps/events/BattleFrontier_BattlePikeCorridor.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePikeCorridor_EventObjects: @ 853CC54 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 6, 6, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 6, 6, 3, 8, 17, 0, 0, 0x0, 0 BattleFrontier_BattlePikeCorridor_MapEvents:: @ 853CC6C map_events BattleFrontier_BattlePikeCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePikeLobby.inc b/data/maps/events/BattleFrontier_BattlePikeLobby.inc index e9aa089178..4cd1297395 100644 --- a/data/maps/events/BattleFrontier_BattlePikeLobby.inc +++ b/data/maps/events/BattleFrontier_BattlePikeLobby.inc @@ -1,8 +1,8 @@ BattleFrontier_BattlePikeLobby_EventObjects: @ 853CBB0 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 5, 5, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 10, 9, 3, 7, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 0, 5, 3, 9, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 0, 8, 9, 3, 2, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 5, 5, 3, 8, 17, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 10, 9, 3, 7, 17, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 3, 9, 17, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 8, 9, 3, 2, 17, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0 BattleFrontier_BattlePikeLobby_MapWarps: @ 853CC10 warp_def 5, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc b/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc index 03e0a15e41..d5b5898cdd 100644 --- a/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc +++ b/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 853CD54 - object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 4, 4, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_TRADER, 0, 0, 3, 4, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 4, 4, 3, 8, 17, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0 + object_event 2, EVENT_OBJ_GFX_TRADER, 0, 3, 4, 3, 8, 17, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0 BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84 coord_event 4, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2 diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc b/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc index 69c2136065..95b7c67816 100644 --- a/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc +++ b/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePikeRandomRoom2_EventObjects: @ 853CE08 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 2, 4, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 2, 4, 3, 8, 17, 0, 0, 0x0, 0 BattleFrontier_BattlePikeRandomRoom2_MapEvents:: @ 853CE20 map_events BattleFrontier_BattlePikeRandomRoom2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc b/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc index f2bca38c16..e1668644ec 100644 --- a/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc +++ b/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePikeThreePathRoom_EventObjects: @ 853CC80 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 4, 10, 3, 10, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 8, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 4, 10, 3, 10, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_6, 0, 8, 5, 3, 8, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0 BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0 coord_event 2, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E diff --git a/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc b/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc index 8dce267b4e..574da0ed30 100644 --- a/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc +++ b/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc @@ -1,13 +1,13 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: @ 853D018 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 4, 4, 0, 9, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 0, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 0, 14, 6, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 0, 1, 9, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_TEALA, 0, 0, 9, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 4, 0, 10, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 0, 12, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 4, 0, 9, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0 + object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 5, 0, 10, 17, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 0, 8, 17, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0 + object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 14, 6, 0, 2, 17, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0 + object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 1, 9, 0, 2, 17, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0 + object_event 6, EVENT_OBJ_GFX_TEALA, 0, 5, 5, 0, 8, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0 + object_event 7, EVENT_OBJ_GFX_TEALA, 0, 9, 5, 0, 8, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0 + object_event 8, EVENT_OBJ_GFX_TEALA, 0, 10, 4, 0, 10, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0 + object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 12, 10, 0, 2, 17, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0 BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: @ 853D0F0 warp_def 7, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc b/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc index 7d531b54bc..141482321d 100644 --- a/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc +++ b/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc @@ -1,20 +1,20 @@ BattleFrontier_BattlePyramidEmptySquare_EventObjects: @ 853C62C - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 0, 0, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 0, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 0, 1, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 1, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 11, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 3, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 12, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 4, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 13, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 14, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 0, 0, 8, 17, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 0, 3, 1, 17, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 0, 3, 1, 17, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 0, 3, 1, 17, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 0, 3, 1, 17, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 3, 1, 17, 0, 0, 0x0, 0 + object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 3, 1, 17, 0, 0, 0x0, 0 + object_event 8, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 0, 1, 17, 0, 0, 0x0, 0 + object_event 9, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 3, 1, 17, 0, 0, 0x0, 0 + object_event 10, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 1, 3, 1, 17, 0, 0, 0x0, 0 + object_event 11, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 1, 0, 1, 17, 0, 0, 0x0, 0 + object_event 12, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 1, 0, 1, 17, 0, 0, 0x0, 0 + object_event 13, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 1, 0, 1, 17, 0, 0, 0x0, 0 + object_event 14, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 1, 0, 1, 17, 0, 0, 0x0, 0 + object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, 1, 17, 0, 0, 0x0, 0 + object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 1, 0, 1, 17, 0, 0, 0x0, 0 BattleFrontier_BattlePyramidEmptySquare_MapEvents:: @ 853C7AC map_events BattleFrontier_BattlePyramidEmptySquare_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePyramidLobby.inc b/data/maps/events/BattleFrontier_BattlePyramidLobby.inc index 0fc086feb0..429312ef00 100644 --- a/data/maps/events/BattleFrontier_BattlePyramidLobby.inc +++ b/data/maps/events/BattleFrontier_BattlePyramidLobby.inc @@ -1,8 +1,8 @@ BattleFrontier_BattlePyramidLobby_EventObjects: @ 853C598 - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 7, 12, 4, 8, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 14, 13, 4, 9, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 2, 15, 4, 2, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 12, 16, 4, 2, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 7, 12, 4, 8, 17, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0 + object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 14, 13, 4, 9, 17, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 15, 4, 2, 17, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0 + object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 16, 4, 2, 17, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0 BattleFrontier_BattlePyramidLobby_MapWarps: @ 853C5F8 warp_def 7, 17, 4, 3, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/BattleFrontier_BattlePyramidTop.inc b/data/maps/events/BattleFrontier_BattlePyramidTop.inc index a6ca1adea6..7aede39268 100644 --- a/data/maps/events/BattleFrontier_BattlePyramidTop.inc +++ b/data/maps/events/BattleFrontier_BattlePyramidTop.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePyramidTop_EventObjects: @ 853C7C0 - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 17, 11, 6, 8, 17, 0, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 0, 17, 7, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 17, 11, 6, 8, 17, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0 + object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 17, 7, 0, 7, 17, 0, 0, 0x0, 0 BattleFrontier_BattlePyramidTop_MapCoordEvents: @ 853C7F0 coord_event 17, 9, 4, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePyramidTop_EventScript_255256 diff --git a/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc b/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc index bea8a64847..7e702f40b0 100644 --- a/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc @@ -1,7 +1,7 @@ BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0 - object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, 8, 0, 0, 0, 0x0, 888 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, 10, 0, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 4, 8, 3, 7, 0, 0, 0, 0x0, 0 BattleFrontier_BattleTowerBattleRoom_MapWarps: @ 853B818 warp_def 5, 8, 0, 2, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY diff --git a/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc b/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc index 2d8dcaa07c..991c0843a8 100644 --- a/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc +++ b/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc @@ -1,10 +1,10 @@ BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4 - object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 4, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 5, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_TRADER, 0, 0, 4, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0 - object_event 5, 255, 0, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, 254, 0, 0, 5, 8, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, 8, 0, 0, 0, 0x0, 888 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 4, 3, 10, 0, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, 10, 0, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_TRADER, 0, 4, 1, 3, 8, 0, 0, 0, 0x0, 888 + object_event 5, 255, 0, 4, 8, 3, 7, 0, 0, 0, 0x0, 0 + object_event 6, 254, 0, 5, 8, 3, 7, 0, 0, 0, 0x0, 0 BattleFrontier_BattleTowerBattleRoom2_MapEvents:: @ 853C054 map_events BattleFrontier_BattleTowerBattleRoom2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleTowerCorridor.inc b/data/maps/events/BattleFrontier_BattleTowerCorridor.inc index a363801f0c..1e0e493151 100644 --- a/data/maps/events/BattleFrontier_BattleTowerCorridor.inc +++ b/data/maps/events/BattleFrontier_BattleTowerCorridor.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleTowerCorridor_EventObjects: @ 853B7A4 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 9, 2, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 9, 2, 3, 9, 0, 0, 0, 0x0, 0 BattleFrontier_BattleTowerCorridor_MapEvents:: @ 853B7BC map_events BattleFrontier_BattleTowerCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc b/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc index c2f1e30bfc..454e83ffb5 100644 --- a/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc +++ b/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc @@ -1,8 +1,8 @@ BattleFrontier_BattleTowerCorridor2_EventObjects: @ 853BF50 - object_event 1, 255, 0, 0, 1, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 14, 3, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 3, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, 254, 0, 0, 14, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, 255, 0, 1, 1, 0, 8, 17, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 14, 3, 3, 7, 17, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 3, 3, 7, 17, 0, 0, 0x0, 0 + object_event 4, 254, 0, 14, 1, 0, 8, 17, 0, 0, 0x0, 0 BattleFrontier_BattleTowerCorridor2_MapEvents:: @ 853BFB0 map_events BattleFrontier_BattleTowerCorridor2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleTowerElevator.inc b/data/maps/events/BattleFrontier_BattleTowerElevator.inc index a4dbc6afab..6ee887d943 100644 --- a/data/maps/events/BattleFrontier_BattleTowerElevator.inc +++ b/data/maps/events/BattleFrontier_BattleTowerElevator.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleTowerElevator_EventObjects: @ 853B778 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 5, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, 7, 0, 0, 0, 0x0, 0 BattleFrontier_BattleTowerElevator_MapEvents:: @ 853B790 map_events BattleFrontier_BattleTowerElevator_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleTowerLobby.inc b/data/maps/events/BattleFrontier_BattleTowerLobby.inc index 34c8082681..3b6c1a6f2c 100644 --- a/data/maps/events/BattleFrontier_BattleTowerLobby.inc +++ b/data/maps/events/BattleFrontier_BattleTowerLobby.inc @@ -1,13 +1,13 @@ BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 23, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 17, 8, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 0, 15, 9, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 11, 9, 3, 10, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, 918, 0, 0 - object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 0, 1, 5, 3, 8, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_2B688D, 701, 0, 0 - object_event 7, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_TEALA, 0, 0, 14, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_TEALA, 0, 0, 18, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 5, 3, 8, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 23, 5, 3, 8, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 17, 8, 3, 2, 17, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0 + object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 15, 9, 3, 2, 17, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0 + object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 9, 3, 10, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, 918 + object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 1, 5, 3, 8, 17, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_2B688D, 701 + object_event 7, EVENT_OBJ_GFX_TEALA, 0, 10, 5, 3, 8, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0 + object_event 8, EVENT_OBJ_GFX_TEALA, 0, 14, 5, 3, 8, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0 + object_event 9, EVENT_OBJ_GFX_TEALA, 0, 18, 5, 3, 8, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0 BattleFrontier_BattleTowerLobby_MapWarps: @ 853B710 warp_def 12, 9, 3, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc index 3d2bb61279..0c313dc976 100644 --- a/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc @@ -1,13 +1,13 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 853BE64 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 2, 3, 8, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 2, 10, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, 711, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 17, 11, 3, 14, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, 712, 0, 0 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 6, 9, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, 713, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 8, 13, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, 714, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 10, 11, 3, 7, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, 715, 0, 0 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 13, 10, 3, 10, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, 716, 0, 0 - object_event 8, 246, 0, 0, 15, 13, 3, 15, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, 864, 0, 0 - object_event 9, 247, 0, 0, 4, 12, 3, 10, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, 865, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 2, 3, 8, 17, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 2, 10, 3, 1, 17, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, 711 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 17, 11, 3, 14, 17, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, 712 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 6, 9, 3, 1, 17, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, 713 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 8, 13, 3, 1, 17, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, 714 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 10, 11, 3, 7, 17, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, 715 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 13, 10, 3, 10, 17, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, 716 + object_event 8, 246, 0, 15, 13, 3, 15, 17, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, 864 + object_event 9, 247, 0, 4, 12, 3, 10, 17, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, 865 BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: @ 853BF3C map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge1.inc b/data/maps/events/BattleFrontier_Lounge1.inc index a026f17346..fac8f78388 100644 --- a/data/maps/events/BattleFrontier_Lounge1.inc +++ b/data/maps/events/BattleFrontier_Lounge1.inc @@ -1,7 +1,7 @@ BattleFrontier_Lounge1_EventObjects: @ 853CFB4 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 0, 6, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 0, 7, 6, 0, 2, 33, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 0, 5, 4, 0, 2, 18, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 6, 0, 10, 17, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0 + object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 7, 6, 0, 2, 33, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0 + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 0, 2, 18, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0 BattleFrontier_Lounge1_MapWarps: @ 853CFFC warp_def 4, 9, 0, 5, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/BattleFrontier_Lounge2.inc b/data/maps/events/BattleFrontier_Lounge2.inc index a04ee9bec1..bb08de8c7c 100644 --- a/data/maps/events/BattleFrontier_Lounge2.inc +++ b/data/maps/events/BattleFrontier_Lounge2.inc @@ -1,9 +1,9 @@ BattleFrontier_Lounge2_EventObjects: @ 853D11C - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MANIAC, 0, 0, 10, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 0, 10, 3, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 4, 6, 0, 2, 33, 0, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 0, 10, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 8, 4, 0, 10, 17, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0 + object_event 2, EVENT_OBJ_GFX_MANIAC, 0, 10, 4, 0, 9, 17, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 10, 3, 0, 9, 17, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0 + object_event 4, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 4, 6, 0, 2, 33, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0 + object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 10, 5, 0, 9, 17, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0 BattleFrontier_Lounge2_MapWarps: @ 853D194 warp_def 1, 7, 0, 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/events/BattleFrontier_Lounge3.inc b/data/maps/events/BattleFrontier_Lounge3.inc index 529e42c664..6475115acd 100644 --- a/data/maps/events/BattleFrontier_Lounge3.inc +++ b/data/maps/events/BattleFrontier_Lounge3.inc @@ -1,9 +1,9 @@ BattleFrontier_Lounge3_EventObjects: @ 853D1B8 - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 4, 6, 0, 7, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 4, 0, 8, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 0, 6, 0, 2, 48, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 4, 6, 0, 7, 17, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 0, 8, 17, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 5, 0, 10, 17, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 0, 9, 17, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0 + object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 6, 0, 2, 48, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0 BattleFrontier_Lounge3_MapWarps: @ 853D230 warp_def 4, 9, 0, 9, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/BattleFrontier_Lounge4.inc b/data/maps/events/BattleFrontier_Lounge4.inc index 5bdfa4e12c..5f10cb1b8f 100644 --- a/data/maps/events/BattleFrontier_Lounge4.inc +++ b/data/maps/events/BattleFrontier_Lounge4.inc @@ -1,7 +1,7 @@ BattleFrontier_Lounge4_EventObjects: @ 853D24C - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 4, 4, 0, 7, 17, 0, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_COOK, 0, 0, 6, 6, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 0, 5, 0, 10, 18, 0, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 4, 0, 7, 17, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0 + object_event 2, EVENT_OBJ_GFX_COOK, 0, 6, 6, 0, 2, 17, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 0, 10, 18, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0 BattleFrontier_Lounge4_MapWarps: @ 853D294 warp_def 4, 9, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/events/BattleFrontier_Lounge5.inc b/data/maps/events/BattleFrontier_Lounge5.inc index 1d68986cc2..f33ceeb655 100644 --- a/data/maps/events/BattleFrontier_Lounge5.inc +++ b/data/maps/events/BattleFrontier_Lounge5.inc @@ -1,8 +1,8 @@ BattleFrontier_Lounge5_EventObjects: @ 853D2EC - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 12, 4, 4, 9, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 0, 4, 3, 10, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 6, 5, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 11, 7, 0, 1, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 12, 4, 4, 9, 17, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 3, 10, 17, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0 + object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 0, 2, 17, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 11, 7, 0, 1, 17, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0 BattleFrontier_Lounge5_MapWarps: @ 853D34C warp_def 1, 7, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/BattleFrontier_Lounge6.inc b/data/maps/events/BattleFrontier_Lounge6.inc index 12853012e3..24dca320a9 100644 --- a/data/maps/events/BattleFrontier_Lounge6.inc +++ b/data/maps/events/BattleFrontier_Lounge6.inc @@ -1,5 +1,5 @@ BattleFrontier_Lounge6_EventObjects: @ 853D370 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 2, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 2, 4, 0, 10, 17, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0 BattleFrontier_Lounge6_MapWarps: @ 853D388 warp_def 4, 9, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/BattleFrontier_Lounge7.inc b/data/maps/events/BattleFrontier_Lounge7.inc index bfe0ae7e80..bccac94bd4 100644 --- a/data/maps/events/BattleFrontier_Lounge7.inc +++ b/data/maps/events/BattleFrontier_Lounge7.inc @@ -1,8 +1,8 @@ BattleFrontier_Lounge7_EventObjects: @ 853D3A4 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 0, 7, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 2, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 6, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 8, 3, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 7, 0, 2, 17, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 2, 5, 0, 10, 17, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 6, 5, 0, 9, 17, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0 + object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 8, 3, 0, 9, 17, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0 BattleFrontier_Lounge7_MapWarps: @ 853D404 warp_def 4, 9, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/events/BattleFrontier_Lounge8.inc b/data/maps/events/BattleFrontier_Lounge8.inc index be16a61070..816e077821 100644 --- a/data/maps/events/BattleFrontier_Lounge8.inc +++ b/data/maps/events/BattleFrontier_Lounge8.inc @@ -1,7 +1,7 @@ BattleFrontier_Lounge8_EventObjects: @ 853D4BC - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 4, 5, 0, 2, 34, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 8, 7, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 4, 5, 0, 2, 34, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 8, 7, 0, 9, 17, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 4, 0, 9, 17, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0 BattleFrontier_Lounge8_MapWarps: @ 853D504 warp_def 4, 9, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/BattleFrontier_Lounge9.inc b/data/maps/events/BattleFrontier_Lounge9.inc index 5e294b384b..7864c31796 100644 --- a/data/maps/events/BattleFrontier_Lounge9.inc +++ b/data/maps/events/BattleFrontier_Lounge9.inc @@ -1,5 +1,5 @@ BattleFrontier_Lounge9_EventObjects: @ 853D520 - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 0, 6, 3, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 6, 3, 0, 1, 17, 0, 0, 0x0, 0 BattleFrontier_Lounge9_MapWarps: @ 853D538 warp_def 1, 9, 0, 11, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/BattleFrontier_Mart.inc b/data/maps/events/BattleFrontier_Mart.inc index 495be5f634..18e37be730 100644 --- a/data/maps/events/BattleFrontier_Mart.inc +++ b/data/maps/events/BattleFrontier_Mart.inc @@ -1,8 +1,8 @@ BattleFrontier_Mart_EventObjects: @ 853D68C - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 8, 4, 3, 9, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 5, 4, 3, 10, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 5, 3, 10, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 8, 4, 3, 9, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0 BattleFrontier_Mart_MapWarps: @ 853D6EC warp_def 3, 7, 0, 4, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/events/BattleFrontier_OutsideEast.inc b/data/maps/events/BattleFrontier_OutsideEast.inc index 62423b9c11..a5772cf1a9 100644 --- a/data/maps/events/BattleFrontier_OutsideEast.inc +++ b/data/maps/events/BattleFrontier_OutsideEast.inc @@ -1,30 +1,30 @@ BattleFrontier_OutsideEast_EventObjects: @ 853BB10 - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 20, 17, 0, 27, 19, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 42, 15, 0, 2, 49, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 0, 53, 6, 0, 8, 2, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 54, 16, 0, 2, 18, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C82, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 37, 32, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C8B, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_COOK, 0, 0, 41, 56, 3, 9, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C94, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 46, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CBB, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 34, 41, 0, 28, 19, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CE1, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_BOY_4, 0, 0, 45, 47, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CB2, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 59, 35, 0, 26, 97, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CC4, 0, 0, 0 - object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 18, 40, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0, 0, 0 - object_event 12, EVENT_OBJ_GFX_MAN_1, 0, 0, 17, 40, 0, 10, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0, 0, 0 - object_event 13, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 40, 56, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0, 0, 0 - object_event 14, EVENT_OBJ_GFX_SUDOWOODO, 0, 0, 54, 62, 3, 8, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, 842, 0, 0 - object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 0, 42, 34, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0, 0, 0 - object_event 16, EVENT_OBJ_GFX_GIRL_3, 0, 0, 51, 53, 3, 2, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0, 0, 0 - object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 62, 18, 0, 46, 98, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0, 0, 0 - object_event 18, EVENT_OBJ_GFX_MAN_4, 0, 0, 11, 21, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 0, 0, 0 - object_event 19, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 10, 21, 0, 10, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 0, 0, 0 - object_event 20, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 16, 30, 0, 2, 35, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DA6, 0, 0, 0 - object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 33, 14, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DAF, 0, 0, 0 - object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 0, 54, 31, 0, 9, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DB8, 0, 0, 0 - object_event 23, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 54, 32, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DC3, 0, 0, 0 - object_event 24, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 58, 55, 3, 17, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE9, 0, 0, 0 - object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 48, 41, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0, 0, 0 - object_event 26, EVENT_OBJ_GFX_CAMPER, 0, 0, 29, 14, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 20, 17, 0, 27, 19, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 42, 15, 0, 2, 49, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0 + object_event 3, EVENT_OBJ_GFX_HIKER, 0, 53, 6, 0, 8, 2, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0 + object_event 4, EVENT_OBJ_GFX_HEX_MANIAC, 0, 54, 16, 0, 2, 18, 0, 0, BattleFrontier_OutsideEast_EventScript_242C82, 0 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 37, 32, 0, 7, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C8B, 0 + object_event 6, EVENT_OBJ_GFX_COOK, 0, 41, 56, 3, 9, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242C94, 0 + object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 46, 0, 1, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242CBB, 0 + object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 34, 41, 0, 28, 19, 0, 0, BattleFrontier_OutsideEast_EventScript_242CE1, 0 + object_event 9, EVENT_OBJ_GFX_BOY_4, 0, 45, 47, 3, 1, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242CB2, 0 + object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 59, 35, 0, 26, 97, 0, 0, BattleFrontier_OutsideEast_EventScript_242CC4, 0 + object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 18, 40, 0, 1, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0 + object_event 12, EVENT_OBJ_GFX_MAN_1, 0, 17, 40, 0, 10, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0 + object_event 13, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 40, 56, 3, 1, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0 + object_event 14, EVENT_OBJ_GFX_SUDOWOODO, 0, 54, 62, 3, 8, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, 842 + object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 42, 34, 3, 1, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0 + object_event 16, EVENT_OBJ_GFX_GIRL_3, 0, 51, 53, 3, 2, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0 + object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 62, 18, 0, 46, 98, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0 + object_event 18, EVENT_OBJ_GFX_MAN_4, 0, 11, 21, 0, 1, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 0 + object_event 19, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 21, 0, 10, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 0 + object_event 20, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 30, 0, 2, 35, 0, 0, BattleFrontier_OutsideEast_EventScript_242DA6, 0 + object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 33, 14, 0, 7, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DAF, 0 + object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 54, 31, 0, 9, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242DB8, 0 + object_event 23, EVENT_OBJ_GFX_WOMAN_5, 0, 54, 32, 0, 7, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242DC3, 0 + object_event 24, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 58, 55, 3, 17, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE9, 0 + object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 48, 41, 0, 7, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0 + object_event 26, EVENT_OBJ_GFX_CAMPER, 0, 29, 14, 0, 7, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0 BattleFrontier_OutsideEast_MapWarps: @ 853BD80 warp_def 16, 14, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY diff --git a/data/maps/events/BattleFrontier_OutsideWest.inc b/data/maps/events/BattleFrontier_OutsideWest.inc index 60f10c8b5a..cbbd9af322 100644 --- a/data/maps/events/BattleFrontier_OutsideWest.inc +++ b/data/maps/events/BattleFrontier_OutsideWest.inc @@ -1,28 +1,28 @@ BattleFrontier_OutsideWest_EventObjects: @ 853B350 - object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 0, 26, 38, 0, 2, 34, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 20, 70, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 0, 19, 68, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 26, 20, 0, 5, 8, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D68B, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 27, 30, 0, 2, 49, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 33, 41, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 28, 43, 0, 3, 48, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 17, 20, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 0, 13, 44, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 0, 14, 44, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 0, 0, 0 - object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 0, 23, 47, 0, 15, 34, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0, 0, 0 - object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 0, 38, 27, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 0, 0, 0 - object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 45, 18, 0, 3, 49, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0, 0, 0 - object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 0, 9, 47, 0, 15, 33, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 0, 0, 0 - object_event 15, EVENT_OBJ_GFX_LASS, 0, 0, 35, 5, 0, 2, 18, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 0, 0, 0 - object_event 16, EVENT_OBJ_GFX_MAN_2, 0, 0, 11, 66, 0, 9, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 0, 0, 0 - object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 31, 31, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 0, 0, 0 - object_event 18, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 42, 48, 0, 18, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 0, 0, 0 - object_event 19, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 38, 22, 0, 3, 48, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 0, 0, 0 - object_event 20, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 12, 9, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0, 0, 0 - object_event 21, EVENT_OBJ_GFX_BOY_1, 0, 0, 12, 10, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 0, 0, 0 - object_event 22, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 11, 10, 0, 23, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0, 0, 0 - object_event 23, EVENT_OBJ_GFX_MAN_5, 0, 0, 8, 5, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0, 0, 0 - object_event 24, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 26, 0, 24, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 26, 38, 0, 2, 34, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 20, 70, 0, 10, 17, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 19, 68, 0, 7, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 26, 20, 0, 5, 8, 0, 0, BattleFrontier_OutsideWest_EventScript_23D68B, 0 + object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 27, 30, 0, 2, 49, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 33, 41, 0, 2, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0 + object_event 7, EVENT_OBJ_GFX_FAT_MAN, 0, 28, 43, 0, 3, 48, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 0 + object_event 8, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 20, 0, 2, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 0 + object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 13, 44, 0, 7, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 0 + object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 14, 44, 0, 7, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 0 + object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 23, 47, 0, 15, 34, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0 + object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 38, 27, 0, 2, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 0 + object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 45, 18, 0, 3, 49, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0 + object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 9, 47, 0, 15, 33, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 0 + object_event 15, EVENT_OBJ_GFX_LASS, 0, 35, 5, 0, 2, 18, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 0 + object_event 16, EVENT_OBJ_GFX_MAN_2, 0, 11, 66, 0, 9, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 0 + object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 31, 31, 0, 8, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 0 + object_event 18, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 48, 0, 18, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 0 + object_event 19, EVENT_OBJ_GFX_FAT_MAN, 0, 38, 22, 0, 3, 48, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 0 + object_event 20, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 9, 0, 8, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0 + object_event 21, EVENT_OBJ_GFX_BOY_1, 0, 12, 10, 0, 7, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 0 + object_event 22, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 10, 0, 23, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0 + object_event 23, EVENT_OBJ_GFX_MAN_5, 0, 8, 5, 0, 8, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0 + object_event 24, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 26, 0, 24, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0 BattleFrontier_OutsideWest_MapWarps: @ 853B590 warp_def 42, 27, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY diff --git a/data/maps/events/BattleFrontier_PokemonCenter_1F.inc b/data/maps/events/BattleFrontier_PokemonCenter_1F.inc index 79b37aead1..9566f2fe23 100644 --- a/data/maps/events/BattleFrontier_PokemonCenter_1F.inc +++ b/data/maps/events/BattleFrontier_PokemonCenter_1F.inc @@ -1,9 +1,9 @@ BattleFrontier_PokemonCenter_1F_EventObjects: @ 853D55C - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 4, 5, 3, 14, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 11, 4, 3, 8, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 0, 2, 3, 3, 9, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_SKITTY, 0, 0, 1, 3, 3, 10, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 4, 5, 3, 14, 1, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 11, 4, 3, 8, 1, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 2, 3, 3, 9, 1, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0 + object_event 5, EVENT_OBJ_GFX_SKITTY, 0, 1, 3, 3, 10, 1, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0 BattleFrontier_PokemonCenter_1F_MapWarps: @ 853D5D4 warp_def 7, 8, 3, 12, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/BattleFrontier_PokemonCenter_2F.inc b/data/maps/events/BattleFrontier_PokemonCenter_2F.inc index f94c24b004..548e1a3518 100644 --- a/data/maps/events/BattleFrontier_PokemonCenter_2F.inc +++ b/data/maps/events/BattleFrontier_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ BattleFrontier_PokemonCenter_2F_EventObjects: @ 853D600 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, 8, 17, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, 702 BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660 warp_def 1, 6, 4, 2, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F diff --git a/data/maps/events/BattleFrontier_RankingHall.inc b/data/maps/events/BattleFrontier_RankingHall.inc index bfe61cda1d..636b6c2815 100644 --- a/data/maps/events/BattleFrontier_RankingHall.inc +++ b/data/maps/events/BattleFrontier_RankingHall.inc @@ -1,7 +1,7 @@ BattleFrontier_RankingHall_EventObjects: @ 853CEB8 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 24, 13, 3, 8, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 4, 10, 3, 2, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 0, 44, 11, 3, 2, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 24, 13, 3, 8, 17, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 4, 10, 3, 2, 17, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0 + object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 44, 11, 3, 2, 17, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0 BattleFrontier_RankingHall_MapWarps: @ 853CF00 warp_def 26, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/BattleFrontier_ReceptionGate.inc b/data/maps/events/BattleFrontier_ReceptionGate.inc index aca73394cb..f73308cb91 100644 --- a/data/maps/events/BattleFrontier_ReceptionGate.inc +++ b/data/maps/events/BattleFrontier_ReceptionGate.inc @@ -1,9 +1,9 @@ BattleFrontier_ReceptionGate_EventObjects: @ 853D420 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 0, 11, 0, 10, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 8, 11, 0, 9, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAN_2, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 0, 4, 5, 3, 8, 17, 0, 0, 0, 0x0, 836, 0, 0 - object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 0, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 0, 10, 17, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 8, 11, 0, 9, 17, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0 + object_event 3, EVENT_OBJ_GFX_MAN_2, 0, 8, 4, 0, 9, 17, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0 + object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 4, 5, 3, 8, 17, 0, 0, 0x0, 836 + object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, 10, 17, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0 BattleFrontier_ReceptionGate_MapWarps: @ 853D498 warp_def 4, 13, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/events/BattleFrontier_ScottsHouse.inc b/data/maps/events/BattleFrontier_ScottsHouse.inc index 5e9ff19122..11c1666847 100644 --- a/data/maps/events/BattleFrontier_ScottsHouse.inc +++ b/data/maps/events/BattleFrontier_ScottsHouse.inc @@ -1,5 +1,5 @@ BattleFrontier_ScottsHouse_EventObjects: @ 853D2B0 - object_event 1, EVENT_OBJ_GFX_SCOTT, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, BattleFrontier_ScottsHouse_EventScript_2636A8, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SCOTT, 0, 2, 3, 3, 1, 17, 0, 0, BattleFrontier_ScottsHouse_EventScript_2636A8, 0 BattleFrontier_ScottsHouse_MapWarps: @ 853D2C8 warp_def 2, 7, 3, 5, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/events/BattlePyramidSquare01.inc b/data/maps/events/BattlePyramidSquare01.inc index 0226b4fdba..99ac3006d1 100644 --- a/data/maps/events/BattlePyramidSquare01.inc +++ b/data/maps/events/BattlePyramidSquare01.inc @@ -1,11 +1,11 @@ BattlePyramidSquare01_EventObjects: @ 853A460 - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 3, 4, 18, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 3, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 6, 6, 4, 9, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 3, 4, 18, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 5, 3, 4, 17, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 2, 6, 4, 16, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 6, 6, 4, 9, 17, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 1, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare01_MapEvents:: @ 853A508 map_events BattlePyramidSquare01_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare02.inc b/data/maps/events/BattlePyramidSquare02.inc index 8b14a4a47b..28242ddeda 100644 --- a/data/maps/events/BattlePyramidSquare02.inc +++ b/data/maps/events/BattlePyramidSquare02.inc @@ -1,11 +1,11 @@ BattlePyramidSquare02_EventObjects: @ 853A51C - object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 6, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 1, 4, 17, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 2, 1, 4, 18, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 6, 4, 15, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 6, 4, 16, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 1, 4, 17, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 5, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare02_MapEvents:: @ 853A5C4 map_events BattlePyramidSquare02_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare03.inc b/data/maps/events/BattlePyramidSquare03.inc index 4b7713426e..bec280de6c 100644 --- a/data/maps/events/BattlePyramidSquare03.inc +++ b/data/maps/events/BattlePyramidSquare03.inc @@ -1,11 +1,11 @@ BattlePyramidSquare03_EventObjects: @ 853A5D8 - object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 1, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 6, 4, 4, 15, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 3, 4, 4, 18, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 2, 1, 4, 18, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 6, 1, 4, 17, 17, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 6, 4, 4, 15, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 3, 4, 4, 18, 17, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 7, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare03_MapEvents:: @ 853A680 map_events BattlePyramidSquare03_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare04.inc b/data/maps/events/BattlePyramidSquare04.inc index dd35fcc43d..5b517b23b6 100644 --- a/data/maps/events/BattlePyramidSquare04.inc +++ b/data/maps/events/BattlePyramidSquare04.inc @@ -1,11 +1,11 @@ BattlePyramidSquare04_EventObjects: @ 853A694 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 7, 2, 4, 17, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 7, 7, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 0, 1, 4, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 6, 4, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 2, 4, 17, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 7, 7, 4, 15, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 1, 4, 4, 18, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 6, 4, 4, 15, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 6, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 0, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare04_MapEvents:: @ 853A73C map_events BattlePyramidSquare04_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare05.inc b/data/maps/events/BattlePyramidSquare05.inc index 766ee76267..7e08946d42 100644 --- a/data/maps/events/BattlePyramidSquare05.inc +++ b/data/maps/events/BattlePyramidSquare05.inc @@ -1,11 +1,11 @@ BattlePyramidSquare05_EventObjects: @ 853A750 - object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 0, 6, 4, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 0, 3, 7, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 0, 3, 1, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 6, 4, 4, 7, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 3, 7, 4, 16, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 3, 1, 4, 8, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 6, 0, 4, 17, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare05_MapEvents:: @ 853A7F8 map_events BattlePyramidSquare05_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare06.inc b/data/maps/events/BattlePyramidSquare06.inc index 64ab2e2269..608021a71f 100644 --- a/data/maps/events/BattlePyramidSquare06.inc +++ b/data/maps/events/BattlePyramidSquare06.inc @@ -1,11 +1,11 @@ BattlePyramidSquare06_EventObjects: @ 853A80C - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 0, 5, 2, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 0, 2, 5, 4, 16, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 0, 5, 5, 4, 15, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_2, 0, 0, 2, 2, 4, 18, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 5, 2, 4, 17, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 2, 5, 4, 16, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 5, 5, 4, 15, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 4, 18, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare06_MapEvents:: @ 853A8B4 map_events BattlePyramidSquare06_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare07.inc b/data/maps/events/BattlePyramidSquare07.inc index a3a0734f1e..79e6065a84 100644 --- a/data/maps/events/BattlePyramidSquare07.inc +++ b/data/maps/events/BattlePyramidSquare07.inc @@ -1,11 +1,11 @@ BattlePyramidSquare07_EventObjects: @ 853A8C8 - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 0, 6, 4, 10, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 4, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 0, 4, 8, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 4, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 4, 10, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 4, 0, 4, 17, 17, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 6, 0, 4, 8, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 4, 4, 4, 15, 17, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare07_MapEvents:: @ 853A970 map_events BattlePyramidSquare07_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare08.inc b/data/maps/events/BattlePyramidSquare08.inc index dfcfdb4510..6d286a0030 100644 --- a/data/maps/events/BattlePyramidSquare08.inc +++ b/data/maps/events/BattlePyramidSquare08.inc @@ -1,11 +1,11 @@ BattlePyramidSquare08_EventObjects: @ 853A984 - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 2, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 5, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 5, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 2, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 2, 4, 18, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 5, 4, 15, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 5, 4, 16, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 2, 4, 15, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare08_MapEvents:: @ 853AA2C map_events BattlePyramidSquare08_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare09.inc b/data/maps/events/BattlePyramidSquare09.inc index dc4ab38ee4..c8c99f4b9d 100644 --- a/data/maps/events/BattlePyramidSquare09.inc +++ b/data/maps/events/BattlePyramidSquare09.inc @@ -1,11 +1,11 @@ BattlePyramidSquare09_EventObjects: @ 853AA40 - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 3, 0, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 3, 5, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 3, 0, 4, 8, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 4, 4, 15, 17, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 0, 4, 17, 17, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 3, 5, 4, 15, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 6, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare09_MapEvents:: @ 853AAE8 map_events BattlePyramidSquare09_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare10.inc b/data/maps/events/BattlePyramidSquare10.inc index 9e87c6b06b..3f0c6b6aaa 100644 --- a/data/maps/events/BattlePyramidSquare10.inc +++ b/data/maps/events/BattlePyramidSquare10.inc @@ -1,11 +1,11 @@ BattlePyramidSquare10_EventObjects: @ 853AAFC - object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 0, 3, 0, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 0, 3, 4, 10, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 6, 5, 4, 9, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 0, 5, 4, 10, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 3, 0, 4, 17, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 3, 4, 10, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 6, 5, 4, 9, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 4, 10, 17, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare10_MapEvents:: @ 853ABA4 map_events BattlePyramidSquare10_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare11.inc b/data/maps/events/BattlePyramidSquare11.inc index b0ce15fb56..e4cec618d5 100644 --- a/data/maps/events/BattlePyramidSquare11.inc +++ b/data/maps/events/BattlePyramidSquare11.inc @@ -1,11 +1,11 @@ BattlePyramidSquare11_EventObjects: @ 853ABB8 - object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 0, 3, 2, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 3, 6, 4, 14, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 0, 6, 4, 4, 8, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 0, 6, 7, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 3, 2, 4, 8, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 3, 6, 4, 14, 17, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 6, 4, 4, 8, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 6, 7, 4, 7, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 2, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 5, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare11_MapEvents:: @ 853AC60 map_events BattlePyramidSquare11_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare12.inc b/data/maps/events/BattlePyramidSquare12.inc index 08783200f2..aadd2f71fa 100644 --- a/data/maps/events/BattlePyramidSquare12.inc +++ b/data/maps/events/BattlePyramidSquare12.inc @@ -1,11 +1,11 @@ BattlePyramidSquare12_EventObjects: @ 853AC74 - object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 7, 5, 4, 9, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 0, 5, 4, 10, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 3, 0, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 3, 3, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 7, 5, 4, 9, 17, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 5, 4, 10, 17, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 0, 4, 8, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 3, 4, 7, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 2, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare12_MapEvents:: @ 853AD1C map_events BattlePyramidSquare12_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare13.inc b/data/maps/events/BattlePyramidSquare13.inc index a930160cbb..be42aa8d25 100644 --- a/data/maps/events/BattlePyramidSquare13.inc +++ b/data/maps/events/BattlePyramidSquare13.inc @@ -1,11 +1,11 @@ BattlePyramidSquare13_EventObjects: @ 853AD30 - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 5, 1, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 5, 6, 4, 7, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 1, 1, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 1, 6, 4, 7, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 1, 4, 8, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 6, 4, 7, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 1, 4, 8, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 6, 4, 7, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare13_MapEvents:: @ 853ADD8 map_events BattlePyramidSquare13_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare14.inc b/data/maps/events/BattlePyramidSquare14.inc index a81c9b5e0b..656685c608 100644 --- a/data/maps/events/BattlePyramidSquare14.inc +++ b/data/maps/events/BattlePyramidSquare14.inc @@ -1,11 +1,11 @@ BattlePyramidSquare14_EventObjects: @ 853ADEC - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 7, 1, 4, 17, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 1, 1, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 5, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 0, 5, 4, 16, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 1, 4, 17, 17, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 1, 4, 18, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 5, 4, 15, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 4, 16, 17, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare14_MapEvents:: @ 853AE94 map_events BattlePyramidSquare14_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare15.inc b/data/maps/events/BattlePyramidSquare15.inc index fe0d085bda..ddf3bf62f6 100644 --- a/data/maps/events/BattlePyramidSquare15.inc +++ b/data/maps/events/BattlePyramidSquare15.inc @@ -1,11 +1,11 @@ BattlePyramidSquare15_EventObjects: @ 853AEA8 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 2, 5, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 2, 1, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 5, 4, 16, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 1, 4, 18, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 4, 15, 17, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 0, 4, 17, 17, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare15_MapEvents:: @ 853AF50 map_events BattlePyramidSquare15_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare16.inc b/data/maps/events/BattlePyramidSquare16.inc index 11abe791d1..d402e98b92 100644 --- a/data/maps/events/BattlePyramidSquare16.inc +++ b/data/maps/events/BattlePyramidSquare16.inc @@ -1,11 +1,11 @@ BattlePyramidSquare16_EventObjects: @ 853AF64 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 0, 6, 4, 16, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 1, 0, 0, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 7, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 16, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 0, 0, 18, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 7, 4, 15, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 0, 4, 17, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 2, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare16_MapEvents:: @ 853B00C map_events BattlePyramidSquare16_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BirthIsland_Exterior.inc b/data/maps/events/BirthIsland_Exterior.inc index e61935ebe8..06af73f75d 100644 --- a/data/maps/events/BirthIsland_Exterior.inc +++ b/data/maps/events/BirthIsland_Exterior.inc @@ -1,6 +1,6 @@ BirthIsland_Exterior_EventObjects: @ 853D7DC - object_event 1, EVENT_OBJ_GFX_DEOXYS_TRIANGLE, 0, 0, 15, 12, 3, 8, 17, 0, 0, 0, BirthIsland_Exterior_EventScript_267F83, 764, 0, 0 - object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 0, 15, 3, 0, 8, 17, 0, 0, 0, 0x0, 763, 0, 0 + object_event 1, EVENT_OBJ_GFX_DEOXYS_TRIANGLE, 0, 15, 12, 3, 8, 17, 0, 0, BirthIsland_Exterior_EventScript_267F83, 764 + object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 15, 3, 0, 8, 17, 0, 0, 0x0, 763 BirthIsland_Exterior_MapWarps: @ 853D80C warp_def 15, 24, 0, 0, MAP_BIRTH_ISLAND_HARBOR diff --git a/data/maps/events/BirthIsland_Harbor.inc b/data/maps/events/BirthIsland_Harbor.inc index fe4a55b25d..f10f53a561 100644 --- a/data/maps/events/BirthIsland_Harbor.inc +++ b/data/maps/events/BirthIsland_Harbor.inc @@ -1,6 +1,6 @@ BirthIsland_Harbor_EventObjects: @ 853D828 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 8, 5, 0, 7, 17, 0, 0, 0, BirthIsland_Harbor_EventScript_26805D, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 8, 7, 1, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, 7, 17, 0, 0, BirthIsland_Harbor_EventScript_26805D, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, 10, 17, 0, 0, 0x0, 0 BirthIsland_Harbor_MapWarps: @ 853D858 warp_def 8, 2, 0, 0, MAP_BIRTH_ISLAND_EXTERIOR diff --git a/data/maps/events/CaveOfOrigin_B1F.inc b/data/maps/events/CaveOfOrigin_B1F.inc index 1c951f240d..5fc4bb914e 100644 --- a/data/maps/events/CaveOfOrigin_B1F.inc +++ b/data/maps/events/CaveOfOrigin_B1F.inc @@ -1,5 +1,5 @@ CaveOfOrigin_B1F_EventObjects: @ 8535DD0 - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 0, 9, 13, 3, 7, 17, 0, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, 820, 0, 0 + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 9, 13, 3, 7, 17, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, 820 CaveOfOrigin_B1F_MapWarps: @ 8535DE8 warp_def 9, 3, 3, 1, MAP_CAVE_OF_ORIGIN_1F diff --git a/data/maps/events/DesertRuins.inc b/data/maps/events/DesertRuins.inc index 510a189980..b0d3b4ddf2 100644 --- a/data/maps/events/DesertRuins.inc +++ b/data/maps/events/DesertRuins.inc @@ -1,5 +1,5 @@ DesertRuins_EventObjects: @ 8534354 - object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, 935, 0, 0 + object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, 8, 0, 0, 0, DesertRuins_EventScript_22DA02, 935 DesertRuins_MapWarps: @ 853436C warp_def 8, 29, 3, 1, MAP_ROUTE111 diff --git a/data/maps/events/DesertUnderpass.inc b/data/maps/events/DesertUnderpass.inc index ea53189ad8..ade5f063a3 100644 --- a/data/maps/events/DesertUnderpass.inc +++ b/data/maps/events/DesertUnderpass.inc @@ -1,5 +1,5 @@ DesertUnderpass_EventObjects: @ 85376D4 - object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 0, 132, 10, 0, 8, 17, 0, 0, 0, DesertUnderpass_EventScript_23AF41, 874, 0, 0 + object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 132, 10, 0, 8, 17, 0, 0, DesertUnderpass_EventScript_23AF41, 874 DesertUnderpass_MapWarps: @ 85376EC warp_def 10, 12, 0, 2, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL diff --git a/data/maps/events/DewfordTown.inc b/data/maps/events/DewfordTown.inc index 9d2c34dc9f..2d62e70104 100644 --- a/data/maps/events/DewfordTown.inc +++ b/data/maps/events/DewfordTown.inc @@ -1,9 +1,9 @@ DewfordTown_EventObjects: @ 8527964 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 7, 12, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 9, 3, 9, 16, 0, 0, 3, DewfordTown_EventScript_1E9511, 740, 0, 0 - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 12, 14, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 12, 8, 1, 8, 0, 0, 0, 0, 0x0, 743, 0, 0 - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 0, 1, 6, 3, 1, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 12, 3, 5, 1, 0, 0, DewfordTown_EventScript_1E95B1, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 9, 3, 9, 16, 0, 3, DewfordTown_EventScript_1E9511, 740 + object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 14, 3, 5, 1, 0, 0, DewfordTown_EventScript_1E95D5, 0 + object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, 8, 0, 0, 0, 0x0, 743 + object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 6, 3, 1, 0, 0, 0, DewfordTown_EventScript_1E9922, 0 DewfordTown_MapWarps: @ 85279DC warp_def 3, 3, 0, 0, MAP_DEWFORD_TOWN_HALL diff --git a/data/maps/events/DewfordTown_Gym.inc b/data/maps/events/DewfordTown_Gym.inc index f5a4452bb6..c922f9c3ad 100644 --- a/data/maps/events/DewfordTown_Gym.inc +++ b/data/maps/events/DewfordTown_Gym.inc @@ -1,12 +1,12 @@ DewfordTown_Gym_EventObjects: @ 852DB34 - object_event 1, EVENT_OBJ_GFX_BRAWLY, 0, 0, 4, 3, 0, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC7C2, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 2, 18, 0, 7, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8B7, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 15, 3, 3, 8, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8D9, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 12, 25, 3, 7, 0, 0, 1, 2, DewfordTown_Gym_EventScript_1FC8FB, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 5, 24, 3, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC983, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 7, 8, 1, 10, 17, 0, 1, 3, DewfordTown_Gym_EventScript_1FC93F, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 0, 16, 9, 3, 8, 17, 0, 1, 3, DewfordTown_Gym_EventScript_1FC961, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_SAILOR, 0, 0, 14, 12, 1, 10, 17, 0, 1, 2, DewfordTown_Gym_EventScript_1FC91D, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_BRAWLY, 0, 4, 3, 0, 8, 0, 0, 0, DewfordTown_Gym_EventScript_1FC7C2, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 18, 0, 7, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8B7, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 15, 3, 3, 8, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8D9, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 12, 25, 3, 7, 0, 1, 2, DewfordTown_Gym_EventScript_1FC8FB, 0 + object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 5, 24, 3, 8, 0, 0, 0, DewfordTown_Gym_EventScript_1FC983, 0 + object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 8, 1, 10, 17, 1, 3, DewfordTown_Gym_EventScript_1FC93F, 0 + object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 16, 9, 3, 8, 17, 1, 3, DewfordTown_Gym_EventScript_1FC961, 0 + object_event 8, EVENT_OBJ_GFX_SAILOR, 0, 14, 12, 1, 10, 17, 1, 2, DewfordTown_Gym_EventScript_1FC91D, 0 DewfordTown_Gym_MapWarps: @ 852DBF4 warp_def 5, 27, 0, 2, MAP_DEWFORD_TOWN diff --git a/data/maps/events/DewfordTown_Hall.inc b/data/maps/events/DewfordTown_Hall.inc index 39f4fad75d..deb53eba5e 100644 --- a/data/maps/events/DewfordTown_Hall.inc +++ b/data/maps/events/DewfordTown_Hall.inc @@ -1,13 +1,13 @@ DewfordTown_Hall_EventObjects: @ 852DC48 - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 0, 4, 6, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4D0, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 1, 5, 0, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4F9, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 0, 5, 4, 0, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD50A, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 3, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD547, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 2, 3, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD563, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 14, 7, 0, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD57F, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 12, 3, 3, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD62F, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 15, 3, 3, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 6, 3, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, 940, 0, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 4, 6, 0, 7, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4D0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 1, 5, 0, 10, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4F9, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 5, 4, 0, 9, 0, 0, 0, DewfordTown_Hall_EventScript_1FD50A, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 0, 7, 0, 0, 0, DewfordTown_Hall_EventScript_1FD547, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 2, 3, 7, 0, 0, 0, DewfordTown_Hall_EventScript_1FD563, 0 + object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 14, 7, 0, 5, 1, 0, 0, DewfordTown_Hall_EventScript_1FD57F, 0 + object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 3, 3, 10, 0, 0, 0, DewfordTown_Hall_EventScript_1FD62F, 0 + object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 3, 3, 9, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0 + object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, 5, 1, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, 940 DewfordTown_Hall_MapWarps: @ 852DD20 warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN diff --git a/data/maps/events/DewfordTown_House1.inc b/data/maps/events/DewfordTown_House1.inc index 887165b822..9bed65eba3 100644 --- a/data/maps/events/DewfordTown_House1.inc +++ b/data/maps/events/DewfordTown_House1.inc @@ -1,7 +1,7 @@ DewfordTown_House1_EventObjects: @ 852D9C8 - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3D7, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3CE, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 4, 2, 3, 8, 19, 0, 0, 0, DewfordTown_House1_EventScript_1FC3E0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 3, 3, 9, 0, 0, 0, DewfordTown_House1_EventScript_1FC3D7, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 3, 3, 3, 10, 0, 0, 0, DewfordTown_House1_EventScript_1FC3CE, 0 + object_event 3, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 2, 3, 8, 19, 0, 0, DewfordTown_House1_EventScript_1FC3E0, 0 DewfordTown_House1_MapWarps: @ 852DA10 warp_def 3, 7, 0, 3, MAP_DEWFORD_TOWN diff --git a/data/maps/events/DewfordTown_House2.inc b/data/maps/events/DewfordTown_House2.inc index 9cacd146da..13fa5d0cf1 100644 --- a/data/maps/events/DewfordTown_House2.inc +++ b/data/maps/events/DewfordTown_House2.inc @@ -1,6 +1,6 @@ DewfordTown_House2_EventObjects: @ 852DD5C - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 6, 5, 3, 10, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE22E, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 0, 2, 3, 3, 1, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE271, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 6, 5, 3, 10, 0, 0, 0, DewfordTown_House2_EventScript_1FE22E, 0 + object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 2, 3, 3, 1, 0, 0, 0, DewfordTown_House2_EventScript_1FE271, 0 DewfordTown_House2_MapWarps: @ 852DD8C warp_def 3, 8, 0, 4, MAP_DEWFORD_TOWN diff --git a/data/maps/events/DewfordTown_PokemonCenter_1F.inc b/data/maps/events/DewfordTown_PokemonCenter_1F.inc index ab2f8c74a1..c6e4d09c6e 100644 --- a/data/maps/events/DewfordTown_PokemonCenter_1F.inc +++ b/data/maps/events/DewfordTown_PokemonCenter_1F.inc @@ -1,7 +1,7 @@ DewfordTown_PokemonCenter_1F_EventObjects: @ 852DA34 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC537, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC545, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 5, 0, 5, 18, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC54E, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC537, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 6, 3, 10, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC545, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 0, 5, 18, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC54E, 0 DewfordTown_PokemonCenter_1F_MapWarps: @ 852DA7C warp_def 7, 8, 3, 1, MAP_DEWFORD_TOWN diff --git a/data/maps/events/DewfordTown_PokemonCenter_2F.inc b/data/maps/events/DewfordTown_PokemonCenter_2F.inc index b2147e4f0c..2c2b2c3a2a 100644 --- a/data/maps/events/DewfordTown_PokemonCenter_2F.inc +++ b/data/maps/events/DewfordTown_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ DewfordTown_PokemonCenter_2F_EventObjects: @ 852DAA8 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, 702 DewfordTown_PokemonCenter_2F_MapWarps: @ 852DB08 warp_def 1, 6, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.inc b/data/maps/events/EverGrandeCity_ChampionsRoom.inc index 6318c7bb79..1fe09d0433 100644 --- a/data/maps/events/EverGrandeCity_ChampionsRoom.inc +++ b/data/maps/events/EverGrandeCity_ChampionsRoom.inc @@ -1,7 +1,7 @@ EverGrandeCity_ChampionsRoom_EventObjects: @ 8533700 - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 920, 0, 0 - object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 921, 0, 0 + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 5, 3, 8, 0, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 6, 12, 3, 7, 0, 0, 0, 0x0, 920 + object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, 7, 0, 0, 0, 0x0, 921 EverGrandeCity_ChampionsRoom_MapWarps: @ 8533748 warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR4 diff --git a/data/maps/events/EverGrandeCity_DrakesRoom.inc b/data/maps/events/EverGrandeCity_DrakesRoom.inc index 823965d787..2a9d327a00 100644 --- a/data/maps/events/EverGrandeCity_DrakesRoom.inc +++ b/data/maps/events/EverGrandeCity_DrakesRoom.inc @@ -1,5 +1,5 @@ EverGrandeCity_DrakesRoom_EventObjects: @ 85336C4 - object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 6, 5, 3, 8, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0 EverGrandeCity_DrakesRoom_MapWarps: @ 85336DC warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR3 diff --git a/data/maps/events/EverGrandeCity_GlaciasRoom.inc b/data/maps/events/EverGrandeCity_GlaciasRoom.inc index dd2e33d521..5e90b92948 100644 --- a/data/maps/events/EverGrandeCity_GlaciasRoom.inc +++ b/data/maps/events/EverGrandeCity_GlaciasRoom.inc @@ -1,5 +1,5 @@ EverGrandeCity_GlaciasRoom_EventObjects: @ 8533688 - object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 6, 5, 3, 8, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0 EverGrandeCity_GlaciasRoom_MapWarps: @ 85336A0 warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR2 diff --git a/data/maps/events/EverGrandeCity_HallOfFame.inc b/data/maps/events/EverGrandeCity_HallOfFame.inc index 671c312243..6951814ae3 100644 --- a/data/maps/events/EverGrandeCity_HallOfFame.inc +++ b/data/maps/events/EverGrandeCity_HallOfFame.inc @@ -1,5 +1,5 @@ EverGrandeCity_HallOfFame_EventObjects: @ 85338FC - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 0, 6, 16, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 16, 3, 7, 0, 0, 0, 0x0, 0 EverGrandeCity_HallOfFame_MapWarps: @ 8533914 warp_def 7, 11, 3, 1, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM diff --git a/data/maps/events/EverGrandeCity_PhoebesRoom.inc b/data/maps/events/EverGrandeCity_PhoebesRoom.inc index 0a8d48d29a..91a85ca54a 100644 --- a/data/maps/events/EverGrandeCity_PhoebesRoom.inc +++ b/data/maps/events/EverGrandeCity_PhoebesRoom.inc @@ -1,5 +1,5 @@ EverGrandeCity_PhoebesRoom_EventObjects: @ 853364C - object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 6, 5, 3, 8, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0 EverGrandeCity_PhoebesRoom_MapWarps: @ 8533664 warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR1 diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc index 745c23309b..5cb55a34a6 100644 --- a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ EverGrandeCity_PokemonCenter_1F_EventObjects: @ 8533930 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 5, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 0, 9, 4, 3, 7, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, 793, 0, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, 8, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 7, 3, 10, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0 + object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 9, 4, 3, 7, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, 793 EverGrandeCity_PokemonCenter_1F_MapWarps: @ 8533990 warp_def 7, 8, 3, 1, MAP_EVER_GRANDE_CITY diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc index 19741159a8..09117ab152 100644 --- a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc +++ b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ EverGrandeCity_PokemonCenter_2F_EventObjects: @ 85339BC - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, 702 EverGrandeCity_PokemonCenter_2F_MapWarps: @ 8533A1C warp_def 1, 6, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc b/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc index 129de15cc2..22e40d2409 100644 --- a/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc +++ b/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc @@ -1,8 +1,8 @@ EverGrandeCity_PokemonLeague_1F_EventObjects: @ 8533860 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295FC, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 16, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_22960A, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 8, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 11, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 3, 2, 3, 8, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295FC, 0 + object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 16, 2, 3, 8, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_22960A, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 2, 3, 8, 17, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 11, 2, 3, 8, 17, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0 EverGrandeCity_PokemonLeague_1F_MapWarps: @ 85338C0 warp_def 9, 11, 3, 0, MAP_EVER_GRANDE_CITY diff --git a/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc b/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc index 3e453781a0..8900d7f8e0 100644 --- a/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc +++ b/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc @@ -1,8 +1,8 @@ EverGrandeCity_PokemonLeague_2F_EventObjects: @ 8533A48 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, 702, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, 8, 17, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, 702 EverGrandeCity_PokemonLeague_2F_MapWarps: @ 8533AA8 warp_def 1, 6, 4, 4, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.inc b/data/maps/events/EverGrandeCity_SidneysRoom.inc index 295633242d..3547e13498 100644 --- a/data/maps/events/EverGrandeCity_SidneysRoom.inc +++ b/data/maps/events/EverGrandeCity_SidneysRoom.inc @@ -1,5 +1,5 @@ EverGrandeCity_SidneysRoom_EventObjects: @ 8533610 - object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 6, 5, 3, 8, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0 EverGrandeCity_SidneysRoom_MapWarps: @ 8533628 warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR5 diff --git a/data/maps/events/FallarborTown.inc b/data/maps/events/FallarborTown.inc index abe98828c3..8d90f004e4 100644 --- a/data/maps/events/FallarborTown.inc +++ b/data/maps/events/FallarborTown.inc @@ -1,8 +1,8 @@ FallarborTown_EventObjects: @ 8527BE0 - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 0, 8, 11, 3, 8, 16, 0, 0, 0, FallarborTown_EventScript_1EB22B, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 11, 9, 3, 5, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 11, 15, 3, 3, 17, 0, 0, 0, FallarborTown_EventScript_1EB234, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 0, 8, 12, 3, 1, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, 907, 0, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, 8, 16, 0, 0, FallarborTown_EventScript_1EB22B, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 9, 3, 5, 1, 0, 0, FallarborTown_EventScript_1EB20C, 0 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, 3, 17, 0, 0, FallarborTown_EventScript_1EB234, 0 + object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, 1, 1, 0, 0, FallarborTown_EventScript_1EB23D, 907 FallarborTown_MapWarps: @ 8527C40 warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART diff --git a/data/maps/events/FallarborTown_BattleTentBattleRoom.inc b/data/maps/events/FallarborTown_BattleTentBattleRoom.inc index 7c5842ab87..b1f7eb6dbb 100644 --- a/data/maps/events/FallarborTown_BattleTentBattleRoom.inc +++ b/data/maps/events/FallarborTown_BattleTentBattleRoom.inc @@ -1,7 +1,7 @@ FallarborTown_BattleTentBattleRoom_EventObjects: @ 852E444 - object_event 1, EVENT_OBJ_GFX_TRADER, 0, 0, 4, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 3, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_TRADER, 0, 4, 8, 3, 7, 17, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 2, 0, 8, 17, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, 8, 17, 0, 0, 0x0, 0 FallarborTown_BattleTentBattleRoom_MapEvents:: @ 852E48C map_events FallarborTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_BattleTentCorridor.inc b/data/maps/events/FallarborTown_BattleTentCorridor.inc index 35bca7b859..08762f2675 100644 --- a/data/maps/events/FallarborTown_BattleTentCorridor.inc +++ b/data/maps/events/FallarborTown_BattleTentCorridor.inc @@ -1,5 +1,5 @@ FallarborTown_BattleTentCorridor_EventObjects: @ 852E418 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 2, 6, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 6, 3, 7, 17, 0, 0, 0x0, 0 FallarborTown_BattleTentCorridor_MapEvents:: @ 852E430 map_events FallarborTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_BattleTentLobby.inc b/data/maps/events/FallarborTown_BattleTentLobby.inc index cdc525c0a3..d672c382a1 100644 --- a/data/maps/events/FallarborTown_BattleTentLobby.inc +++ b/data/maps/events/FallarborTown_BattleTentLobby.inc @@ -1,9 +1,9 @@ FallarborTown_BattleTentLobby_EventObjects: @ 852E370 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200001, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 1, 5, 3, 5, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 12, 6, 3, 3, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 0, 10, 9, 3, 8, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 0, 7, 3, 10, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, 767, 0, 0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 3, 8, 17, 0, 0, FallarborTown_BattleTentLobby_EventScript_200001, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 1, 5, 3, 5, 17, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 12, 6, 3, 3, 17, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 9, 3, 8, 17, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0 + object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 7, 3, 10, 17, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, 767 FallarborTown_BattleTentLobby_MapWarps: @ 852E3E8 warp_def 6, 9, 0, 1, MAP_FALLARBOR_TOWN diff --git a/data/maps/events/FallarborTown_House1.inc b/data/maps/events/FallarborTown_House1.inc index 42f5e1950d..d5eea14e38 100644 --- a/data/maps/events/FallarborTown_House1.inc +++ b/data/maps/events/FallarborTown_House1.inc @@ -1,6 +1,6 @@ FallarborTown_House1_EventObjects: @ 852E5B8 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, FallarborTown_House1_EventScript_200F13, 928, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 6, 3, 5, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, 2, 17, 0, 0, FallarborTown_House1_EventScript_200F13, 928 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 6, 3, 5, 1, 0, 0, FallarborTown_House1_EventScript_200FBC, 0 FallarborTown_House1_MapWarps: @ 852E5E8 warp_def 3, 8, 0, 3, MAP_FALLARBOR_TOWN diff --git a/data/maps/events/FallarborTown_House2.inc b/data/maps/events/FallarborTown_House2.inc index 853aa5d2b8..cb3094441e 100644 --- a/data/maps/events/FallarborTown_House2.inc +++ b/data/maps/events/FallarborTown_House2.inc @@ -1,5 +1,5 @@ FallarborTown_House2_EventObjects: @ 852E60C - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, FallarborTown_House2_EventScript_201383, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 3, 8, 0, 0, 0, FallarborTown_House2_EventScript_201383, 0 FallarborTown_House2_MapWarps: @ 852E624 warp_def 3, 7, 0, 4, MAP_FALLARBOR_TOWN diff --git a/data/maps/events/FallarborTown_Mart.inc b/data/maps/events/FallarborTown_Mart.inc index fee24d963f..e44e4098f3 100644 --- a/data/maps/events/FallarborTown_Mart.inc +++ b/data/maps/events/FallarborTown_Mart.inc @@ -1,9 +1,9 @@ FallarborTown_Mart_EventObjects: @ 852E2D4 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCBF, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 3, 3, 2, 17, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 9, 6, 3, 8, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCFD, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 0, 2, 5, 3, 1, 17, 0, 0, 0, FallarborTown_Mart_EventScript_1FFD06, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 0, 7, 2, 3, 7, 0, 0, 0, 0, FallarborTown_Mart_EventScript_2C80B6, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCBF, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 3, 3, 2, 17, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, 8, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCFD, 0 + object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 2, 5, 3, 1, 17, 0, 0, FallarborTown_Mart_EventScript_1FFD06, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 2, 3, 7, 0, 0, 0, FallarborTown_Mart_EventScript_2C80B6, 0 FallarborTown_Mart_MapWarps: @ 852E34C warp_def 3, 7, 0, 0, MAP_FALLARBOR_TOWN diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.inc b/data/maps/events/FallarborTown_PokemonCenter_1F.inc index 1be0bd7834..d8113295f0 100644 --- a/data/maps/events/FallarborTown_PokemonCenter_1F.inc +++ b/data/maps/events/FallarborTown_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ FallarborTown_PokemonCenter_1F_EventObjects: @ 852E4A0 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 10, 2, 3, 7, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, 871, 0, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, 10, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 3, 3, 8, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 2, 3, 7, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, 871 FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500 warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN diff --git a/data/maps/events/FallarborTown_PokemonCenter_2F.inc b/data/maps/events/FallarborTown_PokemonCenter_2F.inc index c72ccf88a2..513c483fdb 100644 --- a/data/maps/events/FallarborTown_PokemonCenter_2F.inc +++ b/data/maps/events/FallarborTown_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ FallarborTown_PokemonCenter_2F_EventObjects: @ 852E52C - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, 702 FallarborTown_PokemonCenter_2F_MapWarps: @ 852E58C warp_def 1, 6, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/events/FarawayIsland_Entrance.inc b/data/maps/events/FarawayIsland_Entrance.inc index 2c6a007bf3..ec06d4312e 100644 --- a/data/maps/events/FarawayIsland_Entrance.inc +++ b/data/maps/events/FarawayIsland_Entrance.inc @@ -1,6 +1,6 @@ FarawayIsland_Entrance_EventObjects: @ 853D710 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 13, 39, 3, 7, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267CA2, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 13, 41, 1, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 39, 3, 7, 0, 0, 0, FarawayIsland_Entrance_EventScript_267CA2, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 41, 1, 10, 0, 0, 0, 0x0, 0 FarawayIsland_Entrance_MapWarps: @ 853D740 warp_def 22, 7, 3, 0, MAP_FARAWAY_ISLAND_INTERIOR diff --git a/data/maps/events/FarawayIsland_Interior.inc b/data/maps/events/FarawayIsland_Interior.inc index 5d41d11d13..fa8f709cc8 100644 --- a/data/maps/events/FarawayIsland_Interior.inc +++ b/data/maps/events/FarawayIsland_Interior.inc @@ -1,5 +1,5 @@ FarawayIsland_Interior_EventObjects: @ 853D7A0 - object_event 1, EVENT_OBJ_GFX_MEW, 0, 0, 13, 17, 3, 60, 255, 0, 0, 1, FarawayIsland_Interior_EventScript_267DF2, 718, 0, 0 + object_event 1, EVENT_OBJ_GFX_MEW, 0, 13, 17, 3, 60, 255, 0, 1, FarawayIsland_Interior_EventScript_267DF2, 718 FarawayIsland_Interior_MapWarps: @ 853D7B8 warp_def 12, 19, 0, 0, MAP_FARAWAY_ISLAND_ENTRANCE diff --git a/data/maps/events/FieryPath.inc b/data/maps/events/FieryPath.inc index 6979786aae..c37b27057b 100644 --- a/data/maps/events/FieryPath.inc +++ b/data/maps/events/FieryPath.inc @@ -1,12 +1,12 @@ FieryPath_EventObjects: @ 8534C80 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 3, 3, 1, 17, 0, 0, 0, FieryPath_EventScript_29119E, 1091, 0, 0 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 17, 0, 0 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 17, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 18, 0, 0 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 8, 11, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 19, 0, 0 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 12, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 20, 0, 0 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 23, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 21, 0, 0 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 24, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 22, 0, 0 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 32, 3, 1, 17, 0, 0, 0, FieryPath_EventScript_291191, 1111, 0, 0 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, 1, 17, 0, 0, FieryPath_EventScript_29119E, 1091 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, 1, 0, 0, 0, FieryPath_EventScript_2908BA, 17 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, 1, 0, 0, 0, FieryPath_EventScript_2908BA, 18 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, 1, 0, 0, 0, FieryPath_EventScript_2908BA, 19 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, 1, 0, 0, 0, FieryPath_EventScript_2908BA, 20 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, 1, 0, 0, 0, FieryPath_EventScript_2908BA, 21 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, 1, 0, 0, 0, FieryPath_EventScript_2908BA, 22 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, 1, 17, 0, 0, FieryPath_EventScript_291191, 1111 FieryPath_MapWarps: @ 8534D40 warp_def 26, 36, 3, 4, MAP_ROUTE112 diff --git a/data/maps/events/FortreeCity.inc b/data/maps/events/FortreeCity.inc index cb9e70e07c..262b6c6a7a 100644 --- a/data/maps/events/FortreeCity.inc +++ b/data/maps/events/FortreeCity.inc @@ -1,11 +1,11 @@ FortreeCity_EventObjects: @ 8526B9C - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 0, 31, 3, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25B6, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 32, 16, 3, 2, 17, 0, 0, 0, FortreeCity_EventScript_1E25DE, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 32, 10, 3, 3, 16, 0, 0, 0, FortreeCity_EventScript_1E25BF, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 0, 11, 14, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25F0, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_BOY_5, 0, 0, 9, 16, 3, 8, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 25, 8, 3, 76, 17, 0, 0, 0, FortreeCity_EventScript_1E2614, 969, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 31, 3, 4, 1, 0, 0, 0, FortreeCity_EventScript_1E25B6, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 32, 16, 3, 2, 17, 0, 0, FortreeCity_EventScript_1E25DE, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 32, 10, 3, 3, 16, 0, 0, FortreeCity_EventScript_1E25BF, 0 + object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 11, 14, 4, 1, 0, 0, 0, FortreeCity_EventScript_1E25F0, 0 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 8, 10, 3, 1, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0 + object_event 6, EVENT_OBJ_GFX_BOY_5, 0, 9, 16, 3, 8, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0 + object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, 76, 17, 0, 0, FortreeCity_EventScript_1E2614, 969 FortreeCity_MapWarps: @ 8526C44 warp_def 5, 6, 0, 0, MAP_FORTREE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/FortreeCity_DecorationShop.inc b/data/maps/events/FortreeCity_DecorationShop.inc index 7abb73fed4..a956d1b207 100644 --- a/data/maps/events/FortreeCity_DecorationShop.inc +++ b/data/maps/events/FortreeCity_DecorationShop.inc @@ -1,8 +1,8 @@ FortreeCity_DecorationShop_EventObjects: @ 85310B0 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 5, 3, 1, 17, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21800E, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 0, 4, 3, 9, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218017, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218020, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 6, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21804C, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, 1, 17, 0, 0, FortreeCity_DecorationShop_EventScript_21800E, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 4, 3, 9, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218017, 0 + object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 2, 3, 8, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218020, 0 + object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 2, 3, 8, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21804C, 0 FortreeCity_DecorationShop_MapWarps: @ 8531110 warp_def 3, 5, 0, 8, MAP_FORTREE_CITY diff --git a/data/maps/events/FortreeCity_Gym.inc b/data/maps/events/FortreeCity_Gym.inc index 3f8e8d6344..478393dc68 100644 --- a/data/maps/events/FortreeCity_Gym.inc +++ b/data/maps/events/FortreeCity_Gym.inc @@ -1,12 +1,12 @@ FortreeCity_Gym_EventObjects: @ 8530C98 - object_event 1, EVENT_OBJ_GFX_WINONA, 0, 0, 15, 2, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_2165C8, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 4, 14, 3, 8, 0, 0, 1, 3, FortreeCity_Gym_EventScript_2166A8, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 10, 10, 3, 9, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166D6, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 0, 5, 17, 3, 9, 0, 0, 1, 1, FortreeCity_Gym_EventScript_2166ED, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 0, 9, 8, 3, 8, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166BF, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 0, 15, 21, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_216732, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 0, 4, 23, 3, 10, 17, 0, 1, 1, FortreeCity_Gym_EventScript_216704, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 0, 1, 10, 3, 7, 17, 0, 1, 3, FortreeCity_Gym_EventScript_21671B, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WINONA, 0, 15, 2, 3, 8, 0, 0, 0, FortreeCity_Gym_EventScript_2165C8, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 4, 14, 3, 8, 0, 1, 3, FortreeCity_Gym_EventScript_2166A8, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 10, 10, 3, 9, 0, 1, 2, FortreeCity_Gym_EventScript_2166D6, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 5, 17, 3, 9, 0, 1, 1, FortreeCity_Gym_EventScript_2166ED, 0 + object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 9, 8, 3, 8, 0, 1, 2, FortreeCity_Gym_EventScript_2166BF, 0 + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 15, 21, 3, 8, 0, 0, 0, FortreeCity_Gym_EventScript_216732, 0 + object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 4, 23, 3, 10, 17, 1, 1, FortreeCity_Gym_EventScript_216704, 0 + object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 1, 10, 3, 7, 17, 1, 3, FortreeCity_Gym_EventScript_21671B, 0 FortreeCity_Gym_MapWarps: @ 8530D58 warp_def 15, 24, 0, 2, MAP_FORTREE_CITY diff --git a/data/maps/events/FortreeCity_House1.inc b/data/maps/events/FortreeCity_House1.inc index 754758c5cc..c5efd81e6f 100644 --- a/data/maps/events/FortreeCity_House1.inc +++ b/data/maps/events/FortreeCity_House1.inc @@ -1,7 +1,7 @@ FortreeCity_House1_EventObjects: @ 8530C2C - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House1_EventScript_2162BB, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 2, 3, 3, 9, 0, 0, 0, 0, FortreeCity_House1_EventScript_216368, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 7, 4, 3, 1, 17, 0, 0, 0, FortreeCity_House1_EventScript_21635F, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 3, 3, 10, 0, 0, 0, FortreeCity_House1_EventScript_2162BB, 0 + object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 2, 3, 3, 9, 0, 0, 0, FortreeCity_House1_EventScript_216368, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 4, 3, 1, 17, 0, 0, FortreeCity_House1_EventScript_21635F, 0 FortreeCity_House1_MapWarps: @ 8530C74 warp_def 3, 5, 0, 1, MAP_FORTREE_CITY diff --git a/data/maps/events/FortreeCity_House2.inc b/data/maps/events/FortreeCity_House2.inc index 742688c1d7..aa384c3edb 100644 --- a/data/maps/events/FortreeCity_House2.inc +++ b/data/maps/events/FortreeCity_House2.inc @@ -1,6 +1,6 @@ FortreeCity_House2_EventObjects: @ 8530F30 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 2, 3, 3, 5, 1, 0, 0, 0, FortreeCity_House2_EventScript_2177CB, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 3, 3, 9, 1, 0, 0, 0, FortreeCity_House2_EventScript_2C811E, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 2, 3, 3, 5, 1, 0, 0, FortreeCity_House2_EventScript_2177CB, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 3, 3, 9, 1, 0, 0, FortreeCity_House2_EventScript_2C811E, 0 FortreeCity_House2_MapWarps: @ 8530F60 warp_def 3, 5, 0, 4, MAP_FORTREE_CITY diff --git a/data/maps/events/FortreeCity_House3.inc b/data/maps/events/FortreeCity_House3.inc index 13d1e079ea..d247f002cd 100644 --- a/data/maps/events/FortreeCity_House3.inc +++ b/data/maps/events/FortreeCity_House3.inc @@ -1,6 +1,6 @@ FortreeCity_House3_EventObjects: @ 8530F84 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 0, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House3_EventScript_217AE8, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 5, 4, 3, 2, 17, 0, 0, 0, FortreeCity_House3_EventScript_217AF1, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 3, 10, 0, 0, 0, FortreeCity_House3_EventScript_217AE8, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 5, 4, 3, 2, 17, 0, 0, FortreeCity_House3_EventScript_217AF1, 0 FortreeCity_House3_MapWarps: @ 8530FB4 warp_def 3, 5, 0, 5, MAP_FORTREE_CITY diff --git a/data/maps/events/FortreeCity_House4.inc b/data/maps/events/FortreeCity_House4.inc index 3c6886e3ce..c7bebb95b2 100644 --- a/data/maps/events/FortreeCity_House4.inc +++ b/data/maps/events/FortreeCity_House4.inc @@ -1,7 +1,7 @@ FortreeCity_House4_EventObjects: @ 8530FD8 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, FortreeCity_House4_EventScript_217C81, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, 933, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, 2, 17, 0, 0, FortreeCity_House4_EventScript_217C81, 0 + object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 3, 3, 8, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0 + object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, 8, 0, 0, 0, FortreeCity_House4_EventScript_217D20, 933 FortreeCity_House4_MapWarps: @ 8531020 warp_def 3, 5, 0, 6, MAP_FORTREE_CITY diff --git a/data/maps/events/FortreeCity_House5.inc b/data/maps/events/FortreeCity_House5.inc index 7849df43e0..cea1ff532e 100644 --- a/data/maps/events/FortreeCity_House5.inc +++ b/data/maps/events/FortreeCity_House5.inc @@ -1,7 +1,7 @@ FortreeCity_House5_EventObjects: @ 8531044 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 3, 20, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EF2, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 6, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House5_EventScript_217F04, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EFB, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, 20, 0, 0, 0, FortreeCity_House5_EventScript_217EF2, 0 + object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 3, 3, 8, 0, 0, 0, FortreeCity_House5_EventScript_217F04, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, 10, 0, 0, 0, FortreeCity_House5_EventScript_217EFB, 0 FortreeCity_House5_MapWarps: @ 853108C warp_def 3, 5, 0, 7, MAP_FORTREE_CITY diff --git a/data/maps/events/FortreeCity_Mart.inc b/data/maps/events/FortreeCity_Mart.inc index 450007097e..49e2adc718 100644 --- a/data/maps/events/FortreeCity_Mart.inc +++ b/data/maps/events/FortreeCity_Mart.inc @@ -1,8 +1,8 @@ FortreeCity_Mart_EventObjects: @ 8530EAC - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217666, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 9, 3, 3, 7, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217698, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 8, 5, 3, 2, 17, 0, 0, 0, FortreeCity_Mart_EventScript_2176A1, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 5, 6, 3, 10, 17, 0, 0, 0, FortreeCity_Mart_EventScript_2176AA, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, FortreeCity_Mart_EventScript_217666, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 3, 3, 7, 0, 0, 0, FortreeCity_Mart_EventScript_217698, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 8, 5, 3, 2, 17, 0, 0, FortreeCity_Mart_EventScript_2176A1, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 5, 6, 3, 10, 17, 0, 0, FortreeCity_Mart_EventScript_2176AA, 0 FortreeCity_Mart_MapWarps: @ 8530F0C warp_def 3, 7, 0, 3, MAP_FORTREE_CITY diff --git a/data/maps/events/FortreeCity_PokemonCenter_1F.inc b/data/maps/events/FortreeCity_PokemonCenter_1F.inc index e2555bd2c2..5ddc96e63f 100644 --- a/data/maps/events/FortreeCity_PokemonCenter_1F.inc +++ b/data/maps/events/FortreeCity_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ FortreeCity_PokemonCenter_1F_EventObjects: @ 8530D94 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173E7, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173F5, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 8, 5, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173FE, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 0, 2, 3, 3, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_217407, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173E7, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 7, 3, 1, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173F5, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 5, 3, 1, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173FE, 0 + object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 2, 3, 3, 8, 17, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_217407, 0 FortreeCity_PokemonCenter_1F_MapWarps: @ 8530DF4 warp_def 7, 8, 3, 0, MAP_FORTREE_CITY diff --git a/data/maps/events/FortreeCity_PokemonCenter_2F.inc b/data/maps/events/FortreeCity_PokemonCenter_2F.inc index b03f27efad..21f9208385 100644 --- a/data/maps/events/FortreeCity_PokemonCenter_2F.inc +++ b/data/maps/events/FortreeCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ FortreeCity_PokemonCenter_2F_EventObjects: @ 8530E20 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, 702 FortreeCity_PokemonCenter_2F_MapWarps: @ 8530E80 warp_def 1, 6, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/GraniteCave_1F.inc b/data/maps/events/GraniteCave_1F.inc index d14cf38ca5..05f53c9688 100644 --- a/data/maps/events/GraniteCave_1F.inc +++ b/data/maps/events/GraniteCave_1F.inc @@ -1,6 +1,6 @@ GraniteCave_1F_EventObjects: @ 85343BC - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 36, 9, 3, 1, 0, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 17, 7, 3, 8, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, 1050, 0, 0 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 36, 9, 3, 1, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, 8, 0, 0, 0, GraniteCave_1F_EventScript_291150, 1050 GraniteCave_1F_MapWarps: @ 85343EC warp_def 37, 12, 3, 0, MAP_ROUTE106 diff --git a/data/maps/events/GraniteCave_B1F.inc b/data/maps/events/GraniteCave_B1F.inc index f393dd7201..914da7523b 100644 --- a/data/maps/events/GraniteCave_B1F.inc +++ b/data/maps/events/GraniteCave_B1F.inc @@ -1,5 +1,5 @@ GraniteCave_B1F_EventObjects: @ 8534420 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 15, 21, 3, 1, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, 1051, 0, 0 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, 1, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, 1051 GraniteCave_B1F_MapWarps: @ 8534438 warp_def 25, 13, 3, 1, MAP_GRANITE_CAVE_1F diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/events/GraniteCave_B2F.inc index 7765201961..d1ba08ba3a 100644 --- a/data/maps/events/GraniteCave_B2F.inc +++ b/data/maps/events/GraniteCave_B2F.inc @@ -1,13 +1,13 @@ GraniteCave_B2F_EventObjects: @ 8534484 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, 1053, 0, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, 1054, 0, 0 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 5, 14, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 17, 0, 0 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 14, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 18, 0, 0 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 2, 16, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 19, 0, 0 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 7, 12, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 20, 0, 0 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 4, 22, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 21, 0, 0 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 6, 22, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 22, 0, 0 - object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 21, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 23, 0, 0 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, 1053 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, 1, 0, 0, 0, GraniteCave_B2F_EventScript_291177, 1054 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, 1, 17, 0, 0, GraniteCave_B2F_EventScript_2907A6, 17 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 14, 3, 1, 17, 0, 0, GraniteCave_B2F_EventScript_2907A6, 18 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 16, 3, 1, 17, 0, 0, GraniteCave_B2F_EventScript_2907A6, 19 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 12, 3, 1, 17, 0, 0, GraniteCave_B2F_EventScript_2907A6, 20 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 22, 3, 1, 17, 0, 0, GraniteCave_B2F_EventScript_2907A6, 21 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, 1, 17, 0, 0, GraniteCave_B2F_EventScript_2907A6, 22 + object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, 1, 17, 0, 0, GraniteCave_B2F_EventScript_2907A6, 23 GraniteCave_B2F_MapWarps: @ 853455C warp_def 29, 13, 3, 2, MAP_GRANITE_CAVE_B1F diff --git a/data/maps/events/GraniteCave_StevensRoom.inc b/data/maps/events/GraniteCave_StevensRoom.inc index 26233c0d74..c6abd9e5ad 100644 --- a/data/maps/events/GraniteCave_StevensRoom.inc +++ b/data/maps/events/GraniteCave_StevensRoom.inc @@ -1,5 +1,5 @@ GraniteCave_StevensRoom_EventObjects: @ 85345B0 - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 0, 7, 8, 3, 1, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, 833, 0, 0 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, 1, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, 833 GraniteCave_StevensRoom_MapWarps: @ 85345C8 warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/events/InsideOfTruck.inc index 60d8fc7bd0..dbda93e9ce 100644 --- a/data/maps/events/InsideOfTruck.inc +++ b/data/maps/events/InsideOfTruck.inc @@ -1,7 +1,7 @@ InsideOfTruck_EventObjects: @ 853A078 - object_event 1, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 2, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 8, 8, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 + object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 3, 8, 8, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 + object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 2, 3, 8, 8, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 InsideOfTruck_MapWarps: @ 853A0C0 warp_def 4, 1, 0, 127, MAP_NONE diff --git a/data/maps/events/IslandCave.inc b/data/maps/events/IslandCave.inc index 71d94e0cdb..3738636c89 100644 --- a/data/maps/events/IslandCave.inc +++ b/data/maps/events/IslandCave.inc @@ -1,5 +1,5 @@ IslandCave_EventObjects: @ 8536C74 - object_event 1, EVENT_OBJ_GFX_REGICE, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, IslandCave_EventScript_238F58, 936, 0, 0 + object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, 8, 0, 0, 0, IslandCave_EventScript_238F58, 936 IslandCave_MapWarps: @ 8536C8C warp_def 8, 29, 3, 0, MAP_ROUTE105 diff --git a/data/maps/events/JaggedPass.inc b/data/maps/events/JaggedPass.inc index fa6dabcffc..12dd9bdd2b 100644 --- a/data/maps/events/JaggedPass.inc +++ b/data/maps/events/JaggedPass.inc @@ -1,11 +1,11 @@ JaggedPass_EventObjects: @ 8534AE4 - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 10, 8, 3, 10, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 0, 16, 35, 3, 14, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 23, 24, 3, 1, 0, 0, 0, 0, JaggedPass_EventScript_291184, 1070, 0, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 0, 9, 21, 3, 16, 17, 0, 1, 3, JaggedPass_EventScript_23079C, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 16, 19, 3, 7, 17, 0, 0, 0, JaggedPass_EventScript_230718, 847, 0, 0 - object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 0, 14, 25, 3, 10, 17, 0, 1, 3, JaggedPass_EventScript_230871, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 18, 25, 3, 9, 17, 0, 1, 3, JaggedPass_EventScript_23085A, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 10, 8, 3, 10, 0, 1, 3, JaggedPass_EventScript_230785, 0 + object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 35, 3, 14, 0, 1, 4, JaggedPass_EventScript_2307FB, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, 1, 0, 0, 0, JaggedPass_EventScript_291184, 1070 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 9, 21, 3, 16, 17, 1, 3, JaggedPass_EventScript_23079C, 0 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 19, 3, 7, 17, 0, 0, JaggedPass_EventScript_230718, 847 + object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 14, 25, 3, 10, 17, 1, 3, JaggedPass_EventScript_230871, 0 + object_event 7, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 18, 25, 3, 9, 17, 1, 3, JaggedPass_EventScript_23085A, 0 JaggedPass_MapWarps: @ 8534B8C warp_def 14, 40, 3, 2, MAP_ROUTE112 diff --git a/data/maps/events/LavaridgeTown.inc b/data/maps/events/LavaridgeTown.inc index 7419f67d69..cf3f26095a 100644 --- a/data/maps/events/LavaridgeTown.inc +++ b/data/maps/events/LavaridgeTown.inc @@ -1,13 +1,13 @@ LavaridgeTown_EventObjects: @ 8527A54 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 8, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 10, 13, 3, 3, 32, 0, 0, 0, LavaridgeTown_EventScript_1EA720, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 0, 4, 4, 3, 18, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA729, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 0, 5, 4, 3, 17, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA732, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_GIDDY, 0, 0, 6, 16, 3, 9, 0, 0, 0, 0, 0x0, 930, 0, 0 - object_event 8, EVENT_OBJ_GFX_HIPSTER, 0, 0, 12, 15, 0, 8, 0, 0, 0, 0, 0x0, 929, 0, 0 - object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 4, 7, 3, 8, 17, 0, 0, 0, LavaridgeTown_EventScript_1EA744, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 7, 3, 8, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 1, 3, 8, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 8, 3, 8, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 10, 13, 3, 3, 32, 0, 0, LavaridgeTown_EventScript_1EA720, 0 + object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 4, 3, 18, 0, 0, 0, LavaridgeTown_EventScript_1EA729, 0 + object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 4, 3, 17, 0, 0, 0, LavaridgeTown_EventScript_1EA732, 0 + object_event 7, EVENT_OBJ_GFX_GIDDY, 0, 6, 16, 3, 9, 0, 0, 0, 0x0, 930 + object_event 8, EVENT_OBJ_GFX_HIPSTER, 0, 12, 15, 0, 8, 0, 0, 0, 0x0, 929 + object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 7, 3, 8, 17, 0, 0, LavaridgeTown_EventScript_1EA744, 0 LavaridgeTown_MapWarps: @ 8527B2C warp_def 12, 15, 0, 0, MAP_LAVARIDGE_TOWN_HERB_SHOP diff --git a/data/maps/events/LavaridgeTown_Gym_1F.inc b/data/maps/events/LavaridgeTown_Gym_1F.inc index 784b7b857e..24521f2468 100644 --- a/data/maps/events/LavaridgeTown_Gym_1F.inc +++ b/data/maps/events/LavaridgeTown_Gym_1F.inc @@ -1,10 +1,10 @@ LavaridgeTown_Gym_1F_EventObjects: @ 852DE1C - object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 0, 13, 9, 3, 8, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE78C, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 3, 14, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE87F, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 2, 15, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE900, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 0, 3, 10, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8AF, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 2, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8E5, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 0, 12, 16, 3, 10, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE96C, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 13, 9, 3, 8, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE78C, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 3, 14, 3, 8, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE87F, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 2, 15, 3, 8, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE900, 0 + object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 3, 10, 3, 8, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8AF, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 5, 2, 3, 8, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8E5, 0 + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 12, 16, 3, 10, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE96C, 0 LavaridgeTown_Gym_1F_MapWarps: @ 852DEAC warp_def 13, 18, 3, 1, MAP_LAVARIDGE_TOWN diff --git a/data/maps/events/LavaridgeTown_Gym_B1F.inc b/data/maps/events/LavaridgeTown_Gym_B1F.inc index 88dae4c5ec..0169d4a567 100644 --- a/data/maps/events/LavaridgeTown_Gym_B1F.inc +++ b/data/maps/events/LavaridgeTown_Gym_B1F.inc @@ -1,8 +1,8 @@ LavaridgeTown_Gym_B1F_EventObjects: @ 852DFA8 - object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 0, 4, 18, 3, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE91B, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 3, 6, 0, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE8CA, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 0, 13, 17, 0, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE936, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 0, 4, 16, 3, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE951, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 4, 18, 3, 8, 17, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE91B, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 3, 6, 0, 8, 17, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE8CA, 0 + object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 13, 17, 0, 8, 17, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE936, 0 + object_event 4, EVENT_OBJ_GFX_HIKER, 0, 4, 16, 3, 8, 17, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE951, 0 LavaridgeTown_Gym_B1F_MapWarps: @ 852E008 warp_def 10, 18, 3, 2, MAP_LAVARIDGE_TOWN_GYM_1F diff --git a/data/maps/events/LavaridgeTown_HerbShop.inc b/data/maps/events/LavaridgeTown_HerbShop.inc index 939a8752e8..f8b0a950c1 100644 --- a/data/maps/events/LavaridgeTown_HerbShop.inc +++ b/data/maps/events/LavaridgeTown_HerbShop.inc @@ -1,7 +1,7 @@ LavaridgeTown_HerbShop_EventObjects: @ 852DDB0 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4D7, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 7, 5, 3, 1, 17, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE505, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 3, 3, 5, 17, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 2, 3, 8, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4D7, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 7, 5, 3, 1, 17, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE505, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 3, 5, 17, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0 LavaridgeTown_HerbShop_MapWarps: @ 852DDF8 warp_def 3, 7, 0, 0, MAP_LAVARIDGE_TOWN diff --git a/data/maps/events/LavaridgeTown_House.inc b/data/maps/events/LavaridgeTown_House.inc index c97aea86a8..436d5c41a9 100644 --- a/data/maps/events/LavaridgeTown_House.inc +++ b/data/maps/events/LavaridgeTown_House.inc @@ -1,7 +1,7 @@ LavaridgeTown_House_EventObjects: @ 852E0DC - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, LavaridgeTown_House_EventScript_1FF912, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 6, 6, 3, 1, 17, 0, 0, 0, LavaridgeTown_House_EventScript_1FF91B, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 8, 4, 3, 2, 17, 0, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 2, 3, 3, 1, 17, 0, 0, LavaridgeTown_House_EventScript_1FF912, 0 + object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 6, 3, 1, 17, 0, 0, LavaridgeTown_House_EventScript_1FF91B, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 8, 4, 3, 2, 17, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0 LavaridgeTown_House_MapWarps: @ 852E124 warp_def 3, 7, 0, 4, MAP_LAVARIDGE_TOWN diff --git a/data/maps/events/LavaridgeTown_Mart.inc b/data/maps/events/LavaridgeTown_Mart.inc index 77f372aa29..bb12cf30c5 100644 --- a/data/maps/events/LavaridgeTown_Mart.inc +++ b/data/maps/events/LavaridgeTown_Mart.inc @@ -1,7 +1,7 @@ LavaridgeTown_Mart_EventObjects: @ 852E148 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9CE, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9FE, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 9, 5, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9CE, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 2, 3, 8, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9FE, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 9, 5, 3, 10, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0 LavaridgeTown_Mart_MapWarps: @ 852E190 warp_def 3, 7, 0, 2, MAP_LAVARIDGE_TOWN diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc index 07ca2e7c07..674ebef23e 100644 --- a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc +++ b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ LavaridgeTown_PokemonCenter_1F_EventObjects: @ 852E1B4 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 10, 6, 0, 9, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 11, 8, 3, 7, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 0, 9, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25, 0 + object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 1, 3, 3, 10, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E, 0 LavaridgeTown_PokemonCenter_1F_MapWarps: @ 852E214 warp_def 7, 8, 3, 3, MAP_LAVARIDGE_TOWN diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc index 27d0f6fec2..889dcb9b71 100644 --- a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc +++ b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ LavaridgeTown_PokemonCenter_2F_EventObjects: @ 852E248 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, 702 LavaridgeTown_PokemonCenter_2F_MapWarps: @ 852E2A8 warp_def 1, 6, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/events/LilycoveCity.inc index 5020993d8a..d1c602705e 100644 --- a/data/maps/events/LilycoveCity.inc +++ b/data/maps/events/LilycoveCity.inc @@ -1,26 +1,26 @@ LilycoveCity_EventObjects: @ 8526CE8 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 32, 20, 3, 3, 16, 0, 0, 0, LilycoveCity_EventScript_1E2C53, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 15, 18, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C2B, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 0, 28, 28, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C22, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 0, 21, 15, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C4A, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 16, 9, 5, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2C91, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 35, 27, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C72, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 35, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 34, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 57, 17, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 73, 15, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, 852, 0, 0 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 61, 36, 5, 1, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, 1042, 0, 0 - object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 43, 18, 3, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, 852, 0, 0 - object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 46, 12, 3, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, 852, 0, 0 - object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 45, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, 852, 0, 0 - object_event 15, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 38, 9, 5, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, 852, 0, 0 - object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 50, 7, 5, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2BD8, 0, 0, 0 - object_event 17, EVENT_OBJ_GFX_HIPSTER, 0, 0, 27, 7, 5, 8, 17, 0, 0, 0, LilycoveCity_EventScript_1E2DDE, 971, 0, 0 - object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 16, 23, 3, 10, 17, 0, 0, 0, LilycoveCity_EventScript_1E302D, 0, 0, 0 - object_event 19, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 41, 25, 3, 9, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CEE, 0, 0, 0 - object_event 20, EVENT_OBJ_GFX_MAN_2, 0, 0, 40, 25, 3, 10, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CDD, 0, 0, 0 - object_event 21, EVENT_OBJ_GFX_SAILOR, 0, 0, 16, 34, 3, 8, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CCB, 0, 0, 0 - object_event 22, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 16, 35, 3, 7, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CD4, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 32, 20, 3, 3, 16, 0, 0, LilycoveCity_EventScript_1E2C53, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 15, 18, 3, 2, 17, 0, 0, LilycoveCity_EventScript_1E2C2B, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 28, 28, 3, 1, 0, 0, 0, LilycoveCity_EventScript_1E2C22, 0 + object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 21, 15, 3, 2, 17, 0, 0, LilycoveCity_EventScript_1E2C4A, 0 + object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 16, 9, 5, 5, 1, 0, 0, LilycoveCity_EventScript_1E2C91, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 35, 27, 3, 2, 17, 0, 0, LilycoveCity_EventScript_1E2C72, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 35, 37, 5, 8, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 34, 37, 5, 8, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0 + object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 57, 17, 3, 1, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0 + object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 73, 15, 3, 10, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, 852 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, 1, 0, 0, 0, LilycoveCity_EventScript_2910E8, 1042 + object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 43, 18, 3, 5, 1, 0, 0, LilycoveCity_EventScript_1E2DD5, 852 + object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 46, 12, 3, 9, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, 852 + object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 45, 12, 3, 10, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, 852 + object_event 15, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 38, 9, 5, 9, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, 852 + object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 50, 7, 5, 2, 17, 0, 0, LilycoveCity_EventScript_1E2BD8, 0 + object_event 17, EVENT_OBJ_GFX_HIPSTER, 0, 27, 7, 5, 8, 17, 0, 0, LilycoveCity_EventScript_1E2DDE, 971 + object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 16, 23, 3, 10, 17, 0, 0, LilycoveCity_EventScript_1E302D, 0 + object_event 19, EVENT_OBJ_GFX_WOMAN_4, 0, 41, 25, 3, 9, 17, 0, 0, LilycoveCity_EventScript_1E2CEE, 0 + object_event 20, EVENT_OBJ_GFX_MAN_2, 0, 40, 25, 3, 10, 17, 0, 0, LilycoveCity_EventScript_1E2CDD, 0 + object_event 21, EVENT_OBJ_GFX_SAILOR, 0, 16, 34, 3, 8, 17, 0, 0, LilycoveCity_EventScript_1E2CCB, 0 + object_event 22, EVENT_OBJ_GFX_FAT_MAN, 0, 16, 35, 3, 7, 17, 0, 0, LilycoveCity_EventScript_1E2CD4, 0 LilycoveCity_MapWarps: @ 8526EF8 warp_def 27, 6, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F diff --git a/data/maps/events/LilycoveCity_ContestHall.inc b/data/maps/events/LilycoveCity_ContestHall.inc index 615f2682c2..036bf01730 100644 --- a/data/maps/events/LilycoveCity_ContestHall.inc +++ b/data/maps/events/LilycoveCity_ContestHall.inc @@ -1,36 +1,36 @@ LilycoveCity_ContestHall_EventObjects: @ 8531850 - object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 0, 30, 30, 3, 2, 68, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B485, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 0, 11, 7, 3, 2, 51, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B48E, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 40, 8, 3, 2, 34, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B497, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 12, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A9, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 0, 15, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4C0, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 10, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4D7, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4EE, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 0, 14, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B505, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 16, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B51C, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 24, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B533, 0, 0, 0 - object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 18, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B56A, 0, 0, 0 - object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 0, 8, 22, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B53C, 0, 0, 0 - object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 24, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B581, 0, 0, 0 - object_event 14, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 0, 27, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B598, 0, 0, 0 - object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 22, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5AF, 0, 0, 0 - object_event 16, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 24, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5C6, 0, 0, 0 - object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 26, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5DD, 0, 0, 0 - object_event 18, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 28, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5F4, 0, 0, 0 - object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 20, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B60B, 0, 0, 0 - object_event 20, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 30, 11, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B639, 0, 0, 0 - object_event 21, EVENT_OBJ_GFX_MAN_1, 0, 0, 26, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B622, 0, 0, 0 - object_event 22, EVENT_OBJ_GFX_CAMPER, 0, 0, 13, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B553, 0, 0, 0 - object_event 23, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 36, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B650, 0, 0, 0 - object_event 24, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 0, 39, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B667, 0, 0, 0 - object_event 25, EVENT_OBJ_GFX_BOY_2, 0, 0, 34, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B67E, 0, 0, 0 - object_event 26, EVENT_OBJ_GFX_GIRL_2, 0, 0, 36, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B695, 0, 0, 0 - object_event 27, EVENT_OBJ_GFX_BOY_3, 0, 0, 38, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6AC, 0, 0, 0 - object_event 28, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 40, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6C3, 0, 0, 0 - object_event 29, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 32, 23, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6DA, 0, 0, 0 - object_event 30, EVENT_OBJ_GFX_MAN_1, 0, 0, 37, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B71C, 0, 0, 0 - object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 42, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B705, 0, 0, 0 - object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 0, 23, 26, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 30, 30, 3, 2, 68, 0, 0, LilycoveCity_ContestHall_EventScript_21B485, 0 + object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 11, 7, 3, 2, 51, 0, 0, LilycoveCity_ContestHall_EventScript_21B48E, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 40, 8, 3, 2, 34, 0, 0, LilycoveCity_ContestHall_EventScript_21B497, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 12, 22, 3, 8, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A9, 0 + object_event 5, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 15, 22, 3, 8, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4C0, 0 + object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 25, 3, 7, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4D7, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 25, 3, 7, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4EE, 0 + object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 14, 25, 3, 7, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B505, 0 + object_event 9, EVENT_OBJ_GFX_WOMAN_6, 0, 16, 25, 3, 7, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B51C, 0 + object_event 10, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 24, 3, 10, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B533, 0 + object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 24, 3, 9, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B56A, 0 + object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, 10, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B53C, 0 + object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 24, 10, 3, 8, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B581, 0 + object_event 14, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 27, 10, 3, 8, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B598, 0 + object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 22, 13, 3, 7, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5AF, 0 + object_event 16, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 24, 13, 3, 7, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5C6, 0 + object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 26, 13, 3, 7, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5DD, 0 + object_event 18, EVENT_OBJ_GFX_WOMAN_2, 0, 28, 13, 3, 7, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5F4, 0 + object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 20, 10, 3, 10, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B60B, 0 + object_event 20, EVENT_OBJ_GFX_WOMAN_1, 0, 30, 11, 3, 9, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B639, 0 + object_event 21, EVENT_OBJ_GFX_MAN_1, 0, 26, 8, 3, 8, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B622, 0 + object_event 22, EVENT_OBJ_GFX_CAMPER, 0, 13, 20, 3, 8, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B553, 0 + object_event 23, EVENT_OBJ_GFX_WOMAN_4, 0, 36, 22, 3, 8, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B650, 0 + object_event 24, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 39, 22, 3, 8, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B667, 0 + object_event 25, EVENT_OBJ_GFX_BOY_2, 0, 34, 25, 3, 7, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B67E, 0 + object_event 26, EVENT_OBJ_GFX_GIRL_2, 0, 36, 25, 3, 7, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B695, 0 + object_event 27, EVENT_OBJ_GFX_BOY_3, 0, 38, 25, 3, 7, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6AC, 0 + object_event 28, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 40, 25, 3, 7, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6C3, 0 + object_event 29, EVENT_OBJ_GFX_WOMAN_3, 0, 32, 23, 3, 10, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6DA, 0 + object_event 30, EVENT_OBJ_GFX_MAN_1, 0, 37, 20, 3, 8, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B71C, 0 + object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 42, 24, 3, 9, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B705, 0 + object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 23, 26, 3, 2, 17, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A0, 0 LilycoveCity_ContestHall_MapWarps: @ 8531B50 warp_def 19, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY diff --git a/data/maps/events/LilycoveCity_ContestLobby.inc b/data/maps/events/LilycoveCity_ContestLobby.inc index b183b4f165..879c720c0d 100644 --- a/data/maps/events/LilycoveCity_ContestLobby.inc +++ b/data/maps/events/LilycoveCity_ContestLobby.inc @@ -1,29 +1,29 @@ LilycoveCity_ContestLobby_EventObjects: @ 8531534 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 14, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 15, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 0, 26, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 0, 9, 1, 0, 1, 0, 0, 0, 0, 0x0, 774, 0, 0 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 18, 8, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A708, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 0, 4, 9, 3, 2, 34, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A711, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A71A, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 0, 13, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, 802, 0, 0 - object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 0, 23, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A768, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 28, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FB4, 0, 0, 0 - object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 0, 21, 1, 0, 8, 0, 0, 0, 0, 0x0, 895, 0, 0 - object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 5, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A72C, 0, 0, 0 - object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 0, 8, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A723, 0, 0, 0 - object_event 14, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 8, 7, 3, 3, 16, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A735, 0, 0, 0 - object_event 15, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 22, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0, 0, 0 - object_event 16, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 26, 5, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, 873, 0, 0 - object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 0, 24, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A771, 0, 0, 0 - object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 0, 27, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, 832, 0, 0 - object_event 19, EVENT_OBJ_GFX_CAMPER, 0, 0, 28, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, 832, 0, 0 - object_event 20, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 28, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, 832, 0, 0 - object_event 21, EVENT_OBJ_GFX_SCIENTIST_2, 0, 0, 26, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, 832, 0, 0 - object_event 22, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 27, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, 832, 0, 0 - object_event 23, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 26, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, 832, 0, 0 - object_event 24, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 26, 5, 3, 10, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, 832, 0, 0 - object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 9, 10, 3, 10, 34, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 14, 2, 3, 8, 17, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 15, 2, 3, 8, 17, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 26, 9, 3, 10, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0 + object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 9, 1, 0, 1, 0, 0, 0, 0x0, 774 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 18, 8, 3, 2, 17, 0, 0, LilycoveCity_ContestLobby_EventScript_21A708, 0 + object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 4, 9, 3, 2, 34, 0, 0, LilycoveCity_ContestLobby_EventScript_21A711, 0 + object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 3, 4, 3, 2, 17, 0, 0, LilycoveCity_ContestLobby_EventScript_21A71A, 0 + object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 13, 10, 3, 10, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, 802 + object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 23, 8, 3, 8, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A768, 0 + object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 9, 3, 9, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FB4, 0 + object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 21, 1, 0, 8, 0, 0, 0, 0x0, 895 + object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 5, 6, 3, 2, 17, 0, 0, LilycoveCity_ContestLobby_EventScript_21A72C, 0 + object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 8, 3, 10, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A723, 0 + object_event 14, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 8, 7, 3, 3, 16, 0, 0, LilycoveCity_ContestLobby_EventScript_21A735, 0 + object_event 15, EVENT_OBJ_GFX_WOMAN_2, 0, 22, 9, 3, 10, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0 + object_event 16, EVENT_OBJ_GFX_OLD_MAN_1, 0, 26, 5, 3, 10, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, 873 + object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 24, 9, 3, 9, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A771, 0 + object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 27, 3, 3, 8, 17, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, 832 + object_event 19, EVENT_OBJ_GFX_CAMPER, 0, 28, 3, 3, 8, 17, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, 832 + object_event 20, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 28, 7, 3, 7, 17, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, 832 + object_event 21, EVENT_OBJ_GFX_SCIENTIST_2, 0, 26, 7, 3, 7, 17, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, 832 + object_event 22, EVENT_OBJ_GFX_WOMAN_1, 0, 27, 7, 3, 7, 17, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, 832 + object_event 23, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 3, 3, 8, 17, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, 832 + object_event 24, EVENT_OBJ_GFX_OLD_MAN_2, 0, 26, 5, 3, 10, 17, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, 832 + object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 9, 10, 3, 10, 34, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0 LilycoveCity_ContestLobby_MapWarps: @ 853178C warp_def 14, 11, 0, 4, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc index 77d0750343..e93810aa9a 100644 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc @@ -1,5 +1,5 @@ LilycoveCity_CoveLilyMotel_1F_EventObjects: @ 8531134 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 10, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218189, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 10, 3, 3, 7, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218189, 0 LilycoveCity_CoveLilyMotel_1F_MapWarps: @ 853114C warp_def 5, 8, 0, 1, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc index 48aae9c0c3..fd0afa0386 100644 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc @@ -1,11 +1,11 @@ LilycoveCity_CoveLilyMotel_2F_EventObjects: @ 8531188 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, 925, 0, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 4, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, 925, 0, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 7, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, 925, 0, 0 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 10, 3, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, 925, 0, 0 - object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 0, 7, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, 925, 0, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 4, 4, 3, 9, 17, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, 925, 0, 0 - object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, 787, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 4, 6, 3, 9, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, 925 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, 10, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, 925 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, 10, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, 925 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 10, 3, 3, 9, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, 925 + object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 7, 3, 3, 8, 17, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, 925 + object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 4, 3, 9, 17, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, 925 + object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 1, 7, 3, 10, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, 787 LilycoveCity_CoveLilyMotel_2F_MapWarps: @ 8531230 warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc index ef97e90c68..e8e472283b 100644 --- a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStoreElevator_EventObjects: @ 85324B0 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_220624, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 3, 8, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_220624, 0 LilycoveCity_DepartmentStoreElevator_MapWarps: @ 85324C8 warp_def 1, 5, 3, 127, MAP_NONE diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc index 095b201d98..d0bb04e595 100644 --- a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc @@ -1,8 +1,8 @@ LilycoveCity_DepartmentStoreRooftop_EventObjects: @ 853241C - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 4, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 7, 5, 3, 5, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 0, 6, 1, 3, 8, 17, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, 962, 0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 15, 5, 3, 8, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 4, 3, 7, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 7, 5, 3, 5, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0 + object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, 8, 17, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, 962 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 15, 5, 3, 8, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0 LilycoveCity_DepartmentStoreRooftop_MapWarps: @ 853247C warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F diff --git a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc index 0a8bd70b82..4d8dcf9c28 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc @@ -1,10 +1,10 @@ LilycoveCity_DepartmentStore_1F_EventObjects: @ 853208C - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F693, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 0, 10, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F69C, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 14, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F82F, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 4, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F838, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 0, 3, 6, 3, 1, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F841, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 2, 6, 3, 1, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F84A, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 2, 3, 8, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F693, 0 + object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 10, 2, 3, 8, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F69C, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 14, 5, 3, 2, 17, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F82F, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 4, 3, 2, 17, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F838, 0 + object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, 1, 17, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F841, 0 + object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 6, 3, 1, 17, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F84A, 0 LilycoveCity_DepartmentStore_1F_MapWarps: @ 853211C warp_def 8, 7, 0, 0, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc index 9356a7ae09..e66e9bc35d 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc @@ -1,9 +1,9 @@ LilycoveCity_DepartmentStore_2F_EventObjects: @ 853215C - object_event 1, EVENT_OBJ_GFX_COOK, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB2D, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB36, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 0, 13, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB3F, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 10, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB7A, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_COOK, 0, 8, 2, 3, 8, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB2D, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 3, 2, 17, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB36, 0 + object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 13, 5, 3, 2, 17, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB3F, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 3, 7, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB7A, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, 7, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0 LilycoveCity_DepartmentStore_2F_MapWarps: @ 85321D4 warp_def 16, 1, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F diff --git a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc index a26dc39d26..ff535abf5c 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc @@ -1,9 +1,9 @@ LilycoveCity_DepartmentStore_3F_EventObjects: @ 8532200 - object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCB6, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 0, 7, 7, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCBF, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 13, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCC8, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC65, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 10, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 5, 3, 2, 17, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCB6, 0 + object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 7, 3, 2, 17, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCBF, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 13, 5, 3, 2, 17, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCC8, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 2, 3, 8, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC65, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 2, 3, 8, 17, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0 LilycoveCity_DepartmentStore_3F_MapWarps: @ 8532278 warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F diff --git a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc index dd5a87e99d..b344e7d3da 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc @@ -1,9 +1,9 @@ LilycoveCity_DepartmentStore_4F_EventObjects: @ 85322A4 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 0, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDEB, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 6, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDF4, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 13, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDFD, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE06, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 9, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 2, 3, 2, 17, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDEB, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 2, 3, 2, 17, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDF4, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 4, 3, 2, 17, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDFD, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, 7, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE06, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 6, 3, 7, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0 LilycoveCity_DepartmentStore_4F_MapWarps: @ 853231C warp_def 16, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F diff --git a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc index 63ddcdb356..62db69ab60 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc @@ -1,11 +1,11 @@ LilycoveCity_DepartmentStore_5F_EventObjects: @ 8532348 - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_2200BC, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 7, 7, 3, 17, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22006C, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFA6, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 9, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFDC, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 15, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22000A, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 17, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22003A, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 9, 5, 3, 10, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 6, 3, 2, 17, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_2200BC, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 7, 3, 17, 17, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22006C, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 2, 3, 8, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFA6, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 2, 3, 8, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFDC, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 15, 6, 3, 9, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22000A, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 17, 6, 3, 7, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22003A, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 5, 3, 10, 17, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0 LilycoveCity_DepartmentStore_5F_MapWarps: @ 85323F0 warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F diff --git a/data/maps/events/LilycoveCity_Harbor.inc b/data/maps/events/LilycoveCity_Harbor.inc index 0f786ca84e..3d03eea7e7 100644 --- a/data/maps/events/LilycoveCity_Harbor.inc +++ b/data/maps/events/LilycoveCity_Harbor.inc @@ -1,9 +1,9 @@ LilycoveCity_Harbor_EventObjects: @ 8531E1C - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, 908, 0, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 861, 0, 0 - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 0, 3, 13, 3, 2, 17, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, 0x0, 909, 0, 0 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 8, 10, 3, 8, 17, 0, 0, 0, 0x0, 748, 0, 0 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, 8, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, 908 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, 10, 0, 0, 0, 0x0, 861 + object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 3, 13, 3, 2, 17, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0 + object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 10, 3, 8, 0, 0, 0, 0x0, 909 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 8, 10, 3, 8, 17, 0, 0, 0x0, 748 LilycoveCity_Harbor_MapWarps: @ 8531E94 warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LilycoveCity_House1.inc b/data/maps/events/LilycoveCity_House1.inc index 64ad5ea1b2..dc14e42910 100644 --- a/data/maps/events/LilycoveCity_House1.inc +++ b/data/maps/events/LilycoveCity_House1.inc @@ -1,6 +1,6 @@ LilycoveCity_House1_EventObjects: @ 8531EF4 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 5, 3, 9, 17, 0, 0, 0, LilycoveCity_House1_EventScript_21ECCE, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House1_EventScript_21ECD7, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 5, 3, 9, 17, 0, 0, LilycoveCity_House1_EventScript_21ECCE, 0 + object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 4, 3, 8, 0, 0, 0, LilycoveCity_House1_EventScript_21ECD7, 0 LilycoveCity_House1_MapWarps: @ 8531F24 warp_def 3, 8, 0, 8, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LilycoveCity_House2.inc b/data/maps/events/LilycoveCity_House2.inc index 037b195add..9c7237adc6 100644 --- a/data/maps/events/LilycoveCity_House2.inc +++ b/data/maps/events/LilycoveCity_House2.inc @@ -1,5 +1,5 @@ LilycoveCity_House2_EventObjects: @ 8531F48 - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House2_EventScript_21ED75, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 3, 8, 0, 0, 0, LilycoveCity_House2_EventScript_21ED75, 0 LilycoveCity_House2_MapWarps: @ 8531F60 warp_def 2, 7, 0, 9, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LilycoveCity_House3.inc b/data/maps/events/LilycoveCity_House3.inc index 25d2cb3336..63051a0873 100644 --- a/data/maps/events/LilycoveCity_House3.inc +++ b/data/maps/events/LilycoveCity_House3.inc @@ -1,10 +1,10 @@ LilycoveCity_House3_EventObjects: @ 8531F84 - object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 0, 3, 4, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BOY_5, 0, 0, 1, 4, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_BOY_5, 0, 0, 2, 5, 3, 7, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EF09, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 0, 2, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EEA1, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 5, 3, 9, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EE8A, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 3, 4, 3, 8, 17, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, 9, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0 + object_event 3, EVENT_OBJ_GFX_BOY_5, 0, 1, 4, 3, 8, 17, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0 + object_event 4, EVENT_OBJ_GFX_BOY_5, 0, 2, 5, 3, 7, 17, 0, 0, LilycoveCity_House3_EventScript_21EF09, 0 + object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 2, 3, 3, 8, 17, 0, 0, LilycoveCity_House3_EventScript_21EEA1, 0 + object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 7, 5, 3, 9, 17, 0, 0, LilycoveCity_House3_EventScript_21EE8A, 0 LilycoveCity_House3_MapWarps: @ 8532014 warp_def 3, 7, 0, 10, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LilycoveCity_House4.inc b/data/maps/events/LilycoveCity_House4.inc index 7556d0092e..db9bc7469b 100644 --- a/data/maps/events/LilycoveCity_House4.inc +++ b/data/maps/events/LilycoveCity_House4.inc @@ -1,6 +1,6 @@ LilycoveCity_House4_EventObjects: @ 8532038 - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 0, 1, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_House4_EventScript_21F5B5, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_House4_EventScript_21F5BE, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 1, 4, 3, 2, 17, 0, 0, LilycoveCity_House4_EventScript_21F5B5, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 7, 4, 3, 2, 17, 0, 0, LilycoveCity_House4_EventScript_21F5BE, 0 LilycoveCity_House4_MapWarps: @ 8532068 warp_def 3, 8, 0, 11, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc index 6780d3f189..ef490466c0 100644 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc @@ -1,14 +1,14 @@ LilycoveCity_LilycoveMuseum_1F_EventObjects: @ 853124C - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 5, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 16, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, 775, 0, 0 - object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 13, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 0, 13, 10, 3, 5, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E07, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 3, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E10, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 11, 3, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, 776, 0, 0 - object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 0, 19, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, 779, 0, 0 - object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 2, 2, 3, 2, 34, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, 780, 0, 0 - object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 6, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, 778, 0, 0 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 5, 12, 3, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 2, 3, 8, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, 775 + object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 7, 3, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5, 0 + object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 13, 10, 3, 5, 2, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 8, 3, 7, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E07, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 3, 8, 3, 7, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E10, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 3, 3, 2, 17, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, 776 + object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 19, 3, 3, 7, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, 779 + object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 2, 3, 2, 34, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, 780 + object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 2, 3, 2, 17, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, 778 LilycoveCity_LilycoveMuseum_1F_MapWarps: @ 853133C warp_def 9, 13, 0, 3, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc index e95ec1075b..f4338de644 100644 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc @@ -1,8 +1,8 @@ LilycoveCity_LilycoveMuseum_2F_EventObjects: @ 8531428 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 10, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 0, 19, 10, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, 777, 0, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 7, 3, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, 780, 0, 0 - object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 0, 14, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, 780, 0, 0 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 10, 8, 3, 7, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 10, 3, 2, 17, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, 777 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 3, 3, 2, 17, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, 780 + object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 14, 6, 3, 2, 17, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, 780 LilycoveCity_LilycoveMuseum_2F_MapWarps: @ 8531488 warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F diff --git a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc index 83fbf02880..5d1c20b47b 100644 --- a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc +++ b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc @@ -1,5 +1,5 @@ LilycoveCity_MoveDeletersHouse_EventObjects: @ 8531EB8 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0 LilycoveCity_MoveDeletersHouse_MapWarps: @ 8531ED0 warp_def 3, 7, 0, 7, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc index fb2e41948e..17dab40161 100644 --- a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc +++ b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc @@ -1,9 +1,9 @@ LilycoveCity_PokemonCenter_1F_EventObjects: @ 8531BCC - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5E8, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5F6, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_TRADER, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, 993, 0, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5E8, 0 + object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 10, 7, 3, 10, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5F6, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 11, 8, 3, 7, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0 + object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 1, 3, 3, 8, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0 + object_event 5, EVENT_OBJ_GFX_TRADER, 0, 2, 3, 3, 8, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, 993 LilycoveCity_PokemonCenter_1F_MapWarps: @ 8531C44 warp_def 7, 8, 3, 2, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc index 6522dc7992..525622b61c 100644 --- a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc +++ b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ LilycoveCity_PokemonCenter_2F_EventObjects: @ 8531C70 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, 702 LilycoveCity_PokemonCenter_2F_MapWarps: @ 8531CD0 warp_def 1, 6, 4, 2, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc index 476a6ebab0..dee64a91fa 100644 --- a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc @@ -1,13 +1,13 @@ LilycoveCity_PokemonTrainerFanClub_EventObjects: @ 8531D20 - object_event 1, EVENT_OBJ_GFX_LASS, 0, 0, 3, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 8, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 5, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 7, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, 791, 0, 0 - object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 0, 1, 9, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, 790, 0, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 3, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, 792, 0, 0 - object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 10, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, 789, 0, 0 - object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 0, 11, 5, 3, 8, 17, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, 730, 0, 0 + object_event 1, EVENT_OBJ_GFX_LASS, 0, 3, 11, 3, 7, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 8, 10, 3, 9, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 6, 11, 3, 7, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 5, 8, 3, 8, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 11, 3, 7, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, 791 + object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 1, 9, 3, 8, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, 790 + object_event 7, EVENT_OBJ_GFX_WOMAN_4, 0, 3, 10, 3, 10, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, 792 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 10, 10, 3, 9, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, 789 + object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 11, 5, 3, 8, 17, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, 730 LilycoveCity_PokemonTrainerFanClub_MapWarps: @ 8531DF8 warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LinkContestRoom1.inc b/data/maps/events/LinkContestRoom1.inc index 641c1bdd13..0d524368e3 100644 --- a/data/maps/events/LinkContestRoom1.inc +++ b/data/maps/events/LinkContestRoom1.inc @@ -1,18 +1,18 @@ LinkContestRoom1_EventObjects: @ 8539EFC - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 6, 4, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 0, 7, 4, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 0, 4, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_TRADER, 0, 0, 6, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 8, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 2, 6, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 7, 246, 0, 0, 4, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 8, 247, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 9, 248, 0, 0, 9, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 10, 249, 0, 0, 10, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 11, 250, 0, 0, 12, 5, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 12, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 2, 5, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 3, 1, 0, 0, 0, 0, 0x0, 86, 0, 0 - object_event 14, EVENT_OBJ_GFX_GIDDY, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 0, 12, 6, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, 8, 0, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 7, 4, 3, 8, 0, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 4, 7, 3, 7, 0, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_TRADER, 0, 6, 7, 3, 7, 0, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_STORYTELLER, 0, 8, 7, 3, 7, 0, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 2, 6, 3, 10, 0, 0, 0, 0x0, 0 + object_event 7, 246, 0, 4, 2, 3, 8, 0, 0, 0, 0x0, 0 + object_event 8, 247, 0, 5, 2, 3, 8, 0, 0, 0, 0x0, 0 + object_event 9, 248, 0, 9, 2, 3, 8, 0, 0, 0, 0x0, 0 + object_event 10, 249, 0, 10, 2, 3, 8, 0, 0, 0, 0x0, 0 + object_event 11, 250, 0, 12, 5, 3, 9, 0, 0, 0, 0x0, 0 + object_event 12, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 2, 5, 3, 10, 0, 0, 0, 0x0, 0 + object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, 1, 0, 0, 0, 0x0, 86 + object_event 14, EVENT_OBJ_GFX_GIDDY, 0, 10, 7, 3, 7, 0, 0, 0, 0x0, 0 + object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, 9, 0, 0, 0, 0x0, 0 LinkContestRoom1_MapEvents:: @ 853A064 diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/events/LittlerootTown.inc index d4388bc33c..47c07619fb 100644 --- a/data/maps/events/LittlerootTown.inc +++ b/data/maps/events/LittlerootTown.inc @@ -1,12 +1,12 @@ LittlerootTown_EventObjects: @ 85276A8 - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 16, 10, 3, 2, 33, 0, 0, 0, LittlerootTown_EventScript_1E8034, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 12, 13, 3, 2, 18, 0, 0, 0, LittlerootTown_EventScript_1E8022, 868, 0, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 0, 14, 17, 3, 2, 18, 0, 0, 0, LittlerootTown_EventScript_1E802B, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MOM, 0, 0, 5, 8, 3, 7, 0, 0, 0, 0, LittlerootTown_EventScript_1E863D, 752, 0, 0 - object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 0, 2, 10, 4, 10, 0, 0, 0, 0, 0x0, 761, 0, 0 - object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 0, 11, 10, 4, 10, 0, 0, 0, 0, 0x0, 762, 0, 0 - object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 0, 13, 10, 3, 7, 17, 0, 0, 0, 0x0, 794, 0, 0 - object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 14, 10, 3, 7, 17, 0, 0, 0, 0x0, 795, 0, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 16, 10, 3, 2, 33, 0, 0, LittlerootTown_EventScript_1E8034, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 13, 3, 2, 18, 0, 0, LittlerootTown_EventScript_1E8022, 868 + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 14, 17, 3, 2, 18, 0, 0, LittlerootTown_EventScript_1E802B, 0 + object_event 4, EVENT_OBJ_GFX_MOM, 0, 5, 8, 3, 7, 0, 0, 0, LittlerootTown_EventScript_1E863D, 752 + object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 10, 4, 10, 0, 0, 0, 0x0, 761 + object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 10, 4, 10, 0, 0, 0, 0x0, 762 + object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 13, 10, 3, 7, 17, 0, 0, 0x0, 794 + object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 14, 10, 3, 7, 17, 0, 0, 0x0, 795 LittlerootTown_MapWarps: @ 8527768 warp_def 14, 8, 0, 1, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc index e5320f071c..9105ae42ce 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc @@ -1,11 +1,11 @@ LittlerootTown_BrendansHouse_1F_EventObjects: @ 852D08C - object_event 1, EVENT_OBJ_GFX_MOM, 0, 0, 2, 6, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, 758, 0, 0 - object_event 2, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 0, 1, 3, 3, 28, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, 755, 0, 0 - object_event 3, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 0, 4, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, 754, 0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 2, 7, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, 784, 0, 0 - object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 0, 5, 6, 3, 9, 17, 0, 0, 0, 0x0, 734, 0, 0 - object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 5, 3, 5, 17, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, 735, 0, 0 - object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 8, 8, 3, 7, 17, 0, 0, 0, 0x0, 745, 0, 0 + object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 6, 3, 10, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, 758 + object_event 2, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 1, 3, 3, 28, 3, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, 755 + object_event 3, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 4, 5, 3, 65, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, 754 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 7, 3, 10, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, 784 + object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, 9, 17, 0, 0, 0x0, 734 + object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 5, 3, 5, 17, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, 735 + object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 8, 3, 7, 17, 0, 0, 0x0, 745 LittlerootTown_BrendansHouse_1F_MapWarps: @ 852D134 warp_def 9, 8, 0, 1, MAP_LITTLEROOT_TOWN diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc index 0ed661234b..094e010be8 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc @@ -1,20 +1,20 @@ LittlerootTown_BrendansHouse_2F_EventObjects: @ 852D1A0 - object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 1, 0, 8, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, 760, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 1, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 1, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 0, 1, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 4, 1, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 0, 1, 2, 3, 1, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 0, 1, 3, 3, 1, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 0, 1, 4, 3, 1, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 0, 1, 5, 0, 1, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, EVENT_OBJ_GFX_MOM, 0, 0, 7, 1, 3, 8, 1, 0, 0, 0, 0x0, 757, 0, 0 - object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 0, 1, 17, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, 817, 0, 0 - object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 0, 5, 5, 3, 1, 17, 0, 0, 0, 0x0, 815, 0, 0 + object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, 8, 1, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, 760 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 1, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 0, 1, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 1, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 1, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 0, 1, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 4, 1, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 1, 0, 0, 1, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 1, 0, 1, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 2, 3, 1, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 3, 3, 1, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 4, 3, 1, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 5, 0, 1, 0, 0, 0, 0x0, 185 + object_event 14, EVENT_OBJ_GFX_MOM, 0, 7, 1, 3, 8, 1, 0, 0, 0x0, 757 + object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 4, 0, 1, 17, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, 817 + object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 5, 5, 3, 1, 17, 0, 0, 0x0, 815 LittlerootTown_BrendansHouse_2F_MapWarps: @ 852D320 warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/events/LittlerootTown_MaysHouse_1F.inc index 2ceb34c8e1..aecede5ed0 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_1F.inc @@ -1,11 +1,11 @@ LittlerootTown_MaysHouse_1F_EventObjects: @ 852D36C - object_event 1, EVENT_OBJ_GFX_MOM, 0, 0, 8, 6, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, 759, 0, 0 - object_event 2, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 0, 6, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, 754, 0, 0 - object_event 3, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 0, 9, 3, 3, 27, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, 755, 0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 8, 7, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, 785, 0, 0 - object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 0, 5, 6, 3, 10, 17, 0, 0, 0, 0x0, 734, 0, 0 - object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 9, 5, 3, 5, 17, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, 736, 0, 0 - object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 0, 2, 8, 3, 7, 17, 0, 0, 0, 0x0, 746, 0, 0 + object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 6, 3, 9, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, 759 + object_event 2, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 6, 5, 3, 65, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, 754 + object_event 3, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 9, 3, 3, 27, 3, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, 755 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 7, 3, 9, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, 785 + object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, 10, 17, 0, 0, 0x0, 734 + object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 9, 5, 3, 5, 17, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, 736 + object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 2, 8, 3, 7, 17, 0, 0, 0x0, 746 LittlerootTown_MaysHouse_1F_MapWarps: @ 852D414 warp_def 1, 8, 0, 0, MAP_LITTLEROOT_TOWN diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/events/LittlerootTown_MaysHouse_2F.inc index 121c6164bb..b2038db600 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_2F.inc @@ -1,20 +1,20 @@ LittlerootTown_MaysHouse_2F_EventObjects: @ 852D480 - object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 0, 1, 1, 0, 8, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, 722, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 6, 0, 1, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 6, 3, 1, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 6, 0, 1, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 6, 3, 1, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 6, 3, 1, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 6, 3, 1, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 7, 3, 1, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 0, 1, 7, 3, 1, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 0, 2, 7, 3, 1, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 0, 3, 7, 3, 1, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 0, 5, 7, 3, 1, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, EVENT_OBJ_GFX_MOM, 0, 0, 1, 1, 3, 8, 1, 0, 0, 0, 0x0, 757, 0, 0 - object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 0, 3, 4, 4, 8, 17, 0, 0, 0, 0x0, 849, 0, 0 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 4, 0, 1, 17, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, 818, 0, 0 + object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 1, 1, 0, 8, 1, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, 722 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 0, 1, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 1, 6, 3, 1, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 2, 6, 0, 1, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 3, 6, 3, 1, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 4, 6, 3, 1, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 5, 6, 3, 1, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 7, 3, 1, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 7, 3, 1, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 2, 7, 3, 1, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 3, 7, 3, 1, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 4, 7, 3, 1, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 5, 7, 3, 1, 0, 0, 0, 0x0, 185 + object_event 14, EVENT_OBJ_GFX_MOM, 0, 1, 1, 3, 8, 1, 0, 0, 0x0, 757 + object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 4, 4, 8, 17, 0, 0, 0x0, 849 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 4, 0, 1, 17, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, 818 LittlerootTown_MaysHouse_2F_MapWarps: @ 852D600 warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc index bbae39ce8f..318b3171ba 100644 --- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc @@ -1,10 +1,10 @@ LittlerootTown_ProfessorBirchsLab_EventObjects: @ 852D64C - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 8, 3, 2, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 6, 4, 3, 8, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, 721, 0, 0 - object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 0, 7, 4, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, 889, 0, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB, 811, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, 812, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, 838, 0, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 9, 8, 3, 2, 17, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84, 0 + object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 4, 3, 8, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, 721 + object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 7, 4, 3, 8, 17, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, 889 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, 8, 17, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB, 811 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, 8, 17, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, 812 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, 8, 17, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, 838 LittlerootTown_ProfessorBirchsLab_MapWarps: @ 852D6DC warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN diff --git a/data/maps/events/MagmaHideout_1F.inc b/data/maps/events/MagmaHideout_1F.inc index 8462b47316..6418b5acc9 100644 --- a/data/maps/events/MagmaHideout_1F.inc +++ b/data/maps/events/MagmaHideout_1F.inc @@ -1,10 +1,10 @@ MagmaHideout_1F_EventObjects: @ 85371CC - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 4, 5, 0, 10, 17, 0, 1, 2, MagmaHideout_1F_EventScript_23988C, 857, 0, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 20, 0, 1, 17, 0, 0, 0, MagmaHideout_1F_EventScript_2914DE, 1151, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 30, 20, 3, 9, 17, 0, 1, 4, MagmaHideout_1F_EventScript_2398A3, 857, 0, 0 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 17, 0, 0 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 18, 0, 0 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 23, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 19, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 4, 5, 0, 10, 17, 1, 2, MagmaHideout_1F_EventScript_23988C, 857 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 20, 0, 1, 17, 0, 0, MagmaHideout_1F_EventScript_2914DE, 1151 + object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 20, 3, 9, 17, 1, 4, MagmaHideout_1F_EventScript_2398A3, 857 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 22, 3, 1, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 17 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 22, 3, 1, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 18 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, 1, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 19 MagmaHideout_1F_MapWarps: @ 853725C warp_def 10, 34, 3, 4, MAP_JAGGED_PASS diff --git a/data/maps/events/MagmaHideout_2F_1R.inc b/data/maps/events/MagmaHideout_2F_1R.inc index 1073518f2a..51ca352a28 100644 --- a/data/maps/events/MagmaHideout_2F_1R.inc +++ b/data/maps/events/MagmaHideout_2F_1R.inc @@ -1,8 +1,8 @@ MagmaHideout_2F_1R_EventObjects: @ 8537290 - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 18, 19, 3, 51, 69, 0, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, 857, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 14, 3, 46, 103, 0, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, 857, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 8, 8, 3, 10, 17, 0, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, 857, 0, 0 - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 21, 11, 3, 7, 17, 0, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, 857, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 18, 19, 3, 51, 69, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, 857 + object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 14, 3, 46, 103, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, 857 + object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 8, 3, 10, 17, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, 857 + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 11, 3, 7, 17, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, 857 MagmaHideout_2F_1R_MapWarps: @ 85372F0 warp_def 11, 23, 0, 0, MAP_MAGMA_HIDEOUT_2F_2R diff --git a/data/maps/events/MagmaHideout_2F_2R.inc b/data/maps/events/MagmaHideout_2F_2R.inc index e27fc5dc16..262fc33784 100644 --- a/data/maps/events/MagmaHideout_2F_2R.inc +++ b/data/maps/events/MagmaHideout_2F_2R.inc @@ -1,10 +1,10 @@ MagmaHideout_2F_2R_EventObjects: @ 853731C - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 29, 8, 3, 9, 17, 0, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, 857, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 25, 11, 3, 10, 17, 0, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, 857, 0, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 21, 7, 3, 1, 17, 0, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, 1164, 0, 0 - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 9, 3, 8, 17, 0, 1, 4, MagmaHideout_2F_2R_EventScript_239E1F, 857, 0, 0 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 7, 13, 3, 10, 17, 0, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, 857, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 6, 3, 1, 17, 0, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, 1165, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 29, 8, 3, 9, 17, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, 857 + object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 25, 11, 3, 10, 17, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, 857 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 21, 7, 3, 1, 17, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, 1164 + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 9, 3, 8, 17, 1, 4, MagmaHideout_2F_2R_EventScript_239E1F, 857 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 7, 13, 3, 10, 17, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, 857 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, 1, 17, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, 1165 MagmaHideout_2F_2R_MapWarps: @ 85373AC warp_def 10, 22, 3, 0, MAP_MAGMA_HIDEOUT_2F_1R diff --git a/data/maps/events/MagmaHideout_3F_1R.inc b/data/maps/events/MagmaHideout_3F_1R.inc index baf5359848..c5710463db 100644 --- a/data/maps/events/MagmaHideout_3F_1R.inc +++ b/data/maps/events/MagmaHideout_3F_1R.inc @@ -1,7 +1,7 @@ MagmaHideout_3F_1R_EventObjects: @ 85373D0 - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 2, 7, 4, 10, 17, 0, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, 857, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 21, 21, 0, 9, 17, 0, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, 857, 0, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 9, 16, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_1R_EventScript_291505, 1166, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 2, 7, 4, 10, 17, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, 857 + object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 21, 21, 0, 9, 17, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, 857 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 16, 0, 1, 17, 0, 0, MagmaHideout_3F_1R_EventScript_291505, 1166 MagmaHideout_3F_1R_MapWarps: @ 8537418 warp_def 7, 21, 0, 0, MAP_MAGMA_HIDEOUT_4F diff --git a/data/maps/events/MagmaHideout_3F_2R.inc b/data/maps/events/MagmaHideout_3F_2R.inc index e643a1c3fe..59ff76519b 100644 --- a/data/maps/events/MagmaHideout_3F_2R.inc +++ b/data/maps/events/MagmaHideout_3F_2R.inc @@ -1,6 +1,6 @@ MagmaHideout_3F_2R_EventObjects: @ 8537444 - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 16, 3, 0, 17, 17, 0, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, 857, 0, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 9, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_2R_EventScript_291512, 1167, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 3, 0, 17, 17, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, 857 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 9, 0, 1, 17, 0, 0, MagmaHideout_3F_2R_EventScript_291512, 1167 MagmaHideout_3F_2R_MapWarps: @ 8537474 warp_def 12, 15, 0, 1, MAP_MAGMA_HIDEOUT_3F_1R diff --git a/data/maps/events/MagmaHideout_3F_3R.inc b/data/maps/events/MagmaHideout_3F_3R.inc index e40619a49f..acbe985102 100644 --- a/data/maps/events/MagmaHideout_3F_3R.inc +++ b/data/maps/events/MagmaHideout_3F_3R.inc @@ -1,5 +1,5 @@ MagmaHideout_3F_3R_EventObjects: @ 8537574 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 9, 19, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, 1059, 0, 0 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 19, 0, 1, 17, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, 1059 MagmaHideout_3F_3R_MapWarps: @ 853758C warp_def 16, 1, 0, 1, MAP_MAGMA_HIDEOUT_2F_3R diff --git a/data/maps/events/MagmaHideout_4F.inc b/data/maps/events/MagmaHideout_4F.inc index 808f1b7daf..0c7b58257f 100644 --- a/data/maps/events/MagmaHideout_4F.inc +++ b/data/maps/events/MagmaHideout_4F.inc @@ -1,12 +1,12 @@ MagmaHideout_4F_EventObjects: @ 8537490 - object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 0, 16, 17, 0, 8, 17, 0, 0, 0, 0x0, 853, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 31, 22, 0, 10, 17, 0, 1, 3, MagmaHideout_4F_EventScript_23A68C, 857, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 30, 13, 0, 9, 17, 0, 1, 3, MagmaHideout_4F_EventScript_23A6A3, 857, 0, 0 - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 26, 13, 0, 10, 17, 0, 1, 3, MagmaHideout_4F_EventScript_23A6BA, 857, 0, 0 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 22, 4, 0, 8, 17, 0, 1, 4, MagmaHideout_4F_EventScript_23A6D1, 857, 0, 0 - object_event 6, EVENT_OBJ_GFX_MAXIE, 0, 0, 16, 21, 0, 7, 17, 0, 0, 0, MagmaHideout_4F_EventScript_23A560, 857, 0, 0 - object_event 7, EVENT_OBJ_GFX_GROUDON_2, 0, 0, 16, 17, 3, 8, 17, 0, 0, 0, 0x0, 850, 0, 0 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 7, 0, 1, 17, 0, 0, 0, MagmaHideout_4F_EventScript_29151F, 1168, 0, 0 + object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 16, 17, 0, 8, 17, 0, 0, 0x0, 853 + object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 31, 22, 0, 10, 17, 1, 3, MagmaHideout_4F_EventScript_23A68C, 857 + object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 13, 0, 9, 17, 1, 3, MagmaHideout_4F_EventScript_23A6A3, 857 + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 13, 0, 10, 17, 1, 3, MagmaHideout_4F_EventScript_23A6BA, 857 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 4, 0, 8, 17, 1, 4, MagmaHideout_4F_EventScript_23A6D1, 857 + object_event 6, EVENT_OBJ_GFX_MAXIE, 0, 16, 21, 0, 7, 17, 0, 0, MagmaHideout_4F_EventScript_23A560, 857 + object_event 7, EVENT_OBJ_GFX_GROUDON_2, 0, 16, 17, 3, 8, 17, 0, 0, 0x0, 850 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 0, 1, 17, 0, 0, MagmaHideout_4F_EventScript_29151F, 1168 MagmaHideout_4F_MapWarps: @ 8537550 warp_def 46, 7, 0, 0, MAP_MAGMA_HIDEOUT_3F_1R diff --git a/data/maps/events/MarineCave_End.inc b/data/maps/events/MarineCave_End.inc index 199465a691..a5db369da2 100644 --- a/data/maps/events/MarineCave_End.inc +++ b/data/maps/events/MarineCave_End.inc @@ -1,5 +1,5 @@ MarineCave_End_EventObjects: @ 85377E8 - object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 0, 9, 22, 1, 8, 17, 0, 0, 0, 0x0, 782, 0, 0 + object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 9, 22, 1, 8, 17, 0, 0, 0x0, 782 MarineCave_End_MapWarps: @ 8537800 warp_def 20, 4, 0, 0, MAP_MARINE_CAVE_ENTRANCE diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/events/MauvilleCity.inc index a73145ae2b..b4a0eddafc 100644 --- a/data/maps/events/MauvilleCity.inc +++ b/data/maps/events/MauvilleCity.inc @@ -1,15 +1,15 @@ MauvilleCity_EventObjects: @ 852662C - object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 0, 29, 16, 3, 5, 17, 0, 0, 0, MauvilleCity_EventScript_1DF3B3, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 24, 10, 3, 5, 1, 0, 0, 0, MauvilleCity_EventScript_1DF3CE, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 0, 14, 11, 3, 10, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 18, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3C5, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 17, 14, 3, 8, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3FB, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_WALLY, 0, 0, 8, 6, 3, 7, 0, 0, 0, 0, MauvilleCity_EventScript_1DF452, 804, 0, 0 - object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_1DF41D, 805, 0, 0 - object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 0, 29, 9, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF73A, 912, 0, 0 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 28, 19, 3, 1, 17, 0, 0, 0, MauvilleCity_EventScript_2910CE, 1116, 0, 0 - object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 13, 7, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0, 0, 0 - object_event 11, EVENT_OBJ_GFX_SCOTT, 0, 0, 12, 14, 3, 7, 0, 0, 0, 0, 0x0, 765, 0, 0 + object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 29, 16, 3, 5, 17, 0, 0, MauvilleCity_EventScript_1DF3B3, 0 + object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 24, 10, 3, 5, 1, 0, 0, MauvilleCity_EventScript_1DF3CE, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 14, 11, 3, 10, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 6, 3, 1, 0, 0, 0, MauvilleCity_EventScript_1DF3C5, 0 + object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 17, 14, 3, 8, 0, 0, 0, MauvilleCity_EventScript_1DF3FB, 0 + object_event 6, EVENT_OBJ_GFX_WALLY, 0, 8, 6, 3, 7, 0, 0, 0, MauvilleCity_EventScript_1DF452, 804 + object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, 9, 0, 0, 0, MauvilleCity_EventScript_1DF41D, 805 + object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 29, 9, 3, 1, 0, 0, 0, MauvilleCity_EventScript_1DF73A, 912 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 19, 3, 1, 17, 0, 0, MauvilleCity_EventScript_2910CE, 1116 + object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 13, 7, 3, 9, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0 + object_event 11, EVENT_OBJ_GFX_SCOTT, 0, 12, 14, 3, 7, 0, 0, 0, 0x0, 765 MauvilleCity_MapWarps: @ 8526734 warp_def 8, 5, 0, 0, MAP_MAUVILLE_CITY_GYM diff --git a/data/maps/events/MauvilleCity_BikeShop.inc b/data/maps/events/MauvilleCity_BikeShop.inc index cd4f43bb3e..dbd7cc7959 100644 --- a/data/maps/events/MauvilleCity_BikeShop.inc +++ b/data/maps/events/MauvilleCity_BikeShop.inc @@ -1,6 +1,6 @@ MauvilleCity_BikeShop_EventObjects: @ 852FE80 - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 0, 2, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EBBC, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 7, 6, 3, 2, 17, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 2, 5, 3, 9, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EBBC, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 7, 6, 3, 2, 17, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0 MauvilleCity_BikeShop_MapWarps: @ 852FEB0 warp_def 3, 8, 0, 2, MAP_MAUVILLE_CITY diff --git a/data/maps/events/MauvilleCity_GameCorner.inc b/data/maps/events/MauvilleCity_GameCorner.inc index 18e12ac652..59a40a11fc 100644 --- a/data/maps/events/MauvilleCity_GameCorner.inc +++ b/data/maps/events/MauvilleCity_GameCorner.inc @@ -1,16 +1,16 @@ MauvilleCity_GameCorner_EventObjects: @ 852FF28 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 12, 7, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210125, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 16, 5, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21012E, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 0, 11, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FBB9, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 0, 14, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FCF1, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 0, 7, 3, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210137, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 0, 19, 4, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21021D, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 20, 8, 3, 9, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210279, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_COOK, 0, 0, 6, 8, 3, 10, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210289, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_BEAUTY, 0, 0, 13, 2, 3, 8, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FE9F, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_MAN_4, 0, 0, 1, 7, 3, 10, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210299, 0, 0, 0 - object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 0, 9, 8, 3, 9, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2102B6, 0, 0, 0 - object_event 12, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 6, 3, 9, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 7, 3, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210125, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 5, 3, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21012E, 0 + object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 11, 2, 3, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FBB9, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 14, 2, 3, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FCF1, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 3, 3, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210137, 0 + object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 19, 4, 3, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21021D, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_2, 0, 20, 8, 3, 9, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210279, 0 + object_event 8, EVENT_OBJ_GFX_COOK, 0, 6, 8, 3, 10, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210289, 0 + object_event 9, EVENT_OBJ_GFX_BEAUTY, 0, 13, 2, 3, 8, 17, 0, 0, MauvilleCity_GameCorner_EventScript_20FE9F, 0 + object_event 10, EVENT_OBJ_GFX_MAN_4, 0, 1, 7, 3, 10, 17, 0, 0, MauvilleCity_GameCorner_EventScript_210299, 0 + object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 9, 8, 3, 9, 17, 0, 0, MauvilleCity_GameCorner_EventScript_2102B6, 0 + object_event 12, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 6, 3, 9, 17, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0 MauvilleCity_GameCorner_MapWarps: @ 8530048 warp_def 11, 10, 3, 5, MAP_MAUVILLE_CITY diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/events/MauvilleCity_Gym.inc index 0a931723e0..30d757b433 100644 --- a/data/maps/events/MauvilleCity_Gym.inc +++ b/data/maps/events/MauvilleCity_Gym.inc @@ -1,11 +1,11 @@ MauvilleCity_Gym_EventObjects: @ 852FD5C - object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 0, 5, 2, 0, 8, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, 913, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 7, 8, 3, 8, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 1, 16, 0, 7, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 5, 10, 0, 9, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0E7, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 0, 1, 13, 0, 8, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0B9, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 0, 7, 20, 0, 9, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20E12C, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 0, 7, 10, 3, 7, 17, 0, 1, 1, MauvilleCity_Gym_EventScript_20E115, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 5, 2, 0, 8, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, 913 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 7, 8, 3, 8, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 1, 16, 0, 7, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 10, 0, 9, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0E7, 0 + object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 1, 13, 0, 8, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0B9, 0 + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 20, 0, 9, 0, 0, 0, MauvilleCity_Gym_EventScript_20E12C, 0 + object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 7, 10, 3, 7, 17, 1, 1, MauvilleCity_Gym_EventScript_20E115, 0 MauvilleCity_Gym_MapWarps: @ 852FE04 warp_def 4, 20, 0, 0, MAP_MAUVILLE_CITY diff --git a/data/maps/events/MauvilleCity_House1.inc b/data/maps/events/MauvilleCity_House1.inc index b3ff72929b..dcdec217ab 100644 --- a/data/maps/events/MauvilleCity_House1.inc +++ b/data/maps/events/MauvilleCity_House1.inc @@ -1,5 +1,5 @@ MauvilleCity_House1_EventObjects: @ 852FEEC - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_House1_EventScript_20F976, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 4, 3, 10, 0, 0, 0, MauvilleCity_House1_EventScript_20F976, 0 MauvilleCity_House1_MapWarps: @ 852FF04 warp_def 3, 7, 0, 4, MAP_MAUVILLE_CITY diff --git a/data/maps/events/MauvilleCity_House2.inc b/data/maps/events/MauvilleCity_House2.inc index d96a2cd5d9..9dc17584a9 100644 --- a/data/maps/events/MauvilleCity_House2.inc +++ b/data/maps/events/MauvilleCity_House2.inc @@ -1,5 +1,5 @@ MauvilleCity_House2_EventObjects: @ 853018C - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 4, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 5, 3, 9, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0 MauvilleCity_House2_MapWarps: @ 85301A4 warp_def 3, 8, 0, 6, MAP_MAUVILLE_CITY diff --git a/data/maps/events/MauvilleCity_Mart.inc b/data/maps/events/MauvilleCity_Mart.inc index bc22e5bb0a..be12e7d022 100644 --- a/data/maps/events/MauvilleCity_Mart.inc +++ b/data/maps/events/MauvilleCity_Mart.inc @@ -1,7 +1,7 @@ MauvilleCity_Mart_EventObjects: @ 8530310 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_2110E6, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_21111C, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, MauvilleCity_Mart_EventScript_2110E6, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, 10, 0, 0, 0, MauvilleCity_Mart_EventScript_21111C, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, 10, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0 MauvilleCity_Mart_MapWarps: @ 8530358 warp_def 3, 7, 0, 3, MAP_MAUVILLE_CITY diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc index fc76f6b760..6134b9d352 100644 --- a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc +++ b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc @@ -1,9 +1,9 @@ MauvilleCity_PokemonCenter_1F_EventObjects: @ 85301C8 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E78, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 2, 3, 3, 9, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_28E066, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 8, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E86, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 11, 4, 3, 3, 16, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E8F, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 2, 8, 3, 1, 17, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E98, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E78, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 2, 3, 3, 9, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_28E066, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 8, 6, 3, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E86, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 4, 3, 3, 16, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E8F, 0 + object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 2, 8, 3, 1, 17, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E98, 0 MauvilleCity_PokemonCenter_1F_MapWarps: @ 8530240 warp_def 7, 8, 3, 1, MAP_MAUVILLE_CITY diff --git a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc index f22b9f0570..52cf72422b 100644 --- a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc +++ b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc @@ -1,9 +1,9 @@ MauvilleCity_PokemonCenter_2F_EventObjects: @ 853026C - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 - object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 8, 8, 3, 7, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_21102F, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 8, 8, 3, 7, 17, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_21102F, 0 MauvilleCity_PokemonCenter_2F_MapWarps: @ 85302E4 warp_def 1, 6, 4, 2, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/events/MeteorFalls_1F_1R.inc index 2e6195b607..d0f3aa45e7 100644 --- a/data/maps/events/MeteorFalls_1F_1R.inc +++ b/data/maps/events/MeteorFalls_1F_1R.inc @@ -1,14 +1,14 @@ MeteorFalls_1F_1R_EventObjects: @ 8533F74 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 4, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, 1044, 0, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 14, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, 1046, 0, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 27, 5, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, 1045, 0, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 26, 32, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911D2, 1047, 0, 0 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 20, 3, 8, 0, 0, 0, 0, 0x0, 939, 0, 0 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 14, 21, 3, 9, 0, 0, 0, 0, 0x0, 939, 0, 0 - object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938, 0, 0 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938, 0, 0 - object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 21, 3, 1, 0, 0, 0, 0, 0x0, 938, 0, 0 - object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 13, 23, 3, 21, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, 942, 0, 0 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 4, 3, 1, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, 1044 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 14, 3, 1, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, 1046 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 5, 3, 1, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, 1045 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 32, 3, 1, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911D2, 1047 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 20, 3, 8, 0, 0, 0, 0x0, 939 + object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 21, 3, 9, 0, 0, 0, 0x0, 939 + object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 6, 20, 3, 10, 0, 0, 0, 0x0, 938 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 20, 3, 10, 0, 0, 0, 0x0, 938 + object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 21, 3, 1, 0, 0, 0, 0x0, 938 + object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 23, 3, 21, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, 942 MeteorFalls_1F_1R_MapWarps: @ 8534064 warp_def 27, 18, 4, 0, MAP_ROUTE114 diff --git a/data/maps/events/MeteorFalls_1F_2R.inc b/data/maps/events/MeteorFalls_1F_2R.inc index 3561e7c5eb..c5bb29dfc2 100644 --- a/data/maps/events/MeteorFalls_1F_2R.inc +++ b/data/maps/events/MeteorFalls_1F_2R.inc @@ -1,7 +1,7 @@ MeteorFalls_1F_2R_EventObjects: @ 85340C4 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 13, 2, 3, 8, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C4DE, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 12, 3, 8, 17, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C540, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 7, 12, 3, 8, 17, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 13, 2, 3, 8, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C4DE, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 12, 3, 8, 17, 1, 1, MeteorFalls_1F_2R_EventScript_22C540, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 12, 3, 8, 17, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0 MeteorFalls_1F_2R_MapWarps: @ 853410C warp_def 10, 29, 3, 2, MAP_METEOR_FALLS_1F_1R diff --git a/data/maps/events/MeteorFalls_B1F_2R.inc b/data/maps/events/MeteorFalls_B1F_2R.inc index 92d60a60a6..8396ced4c6 100644 --- a/data/maps/events/MeteorFalls_B1F_2R.inc +++ b/data/maps/events/MeteorFalls_B1F_2R.inc @@ -1,5 +1,5 @@ MeteorFalls_B1F_2R_EventObjects: @ 8534190 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 3, 1, 17, 0, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, 1080, 0, 0 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, 1, 17, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, 1080 MeteorFalls_B1F_2R_MapWarps: @ 85341A8 warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R diff --git a/data/maps/events/MeteorFalls_StevensCave.inc b/data/maps/events/MeteorFalls_StevensCave.inc index 9a2556e8a6..e5547c6987 100644 --- a/data/maps/events/MeteorFalls_StevensCave.inc +++ b/data/maps/events/MeteorFalls_StevensCave.inc @@ -1,5 +1,5 @@ MeteorFalls_StevensCave_EventObjects: @ 85378B0 - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 0, 19, 3, 3, 7, 17, 0, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 19, 3, 3, 7, 17, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0 MeteorFalls_StevensCave_MapWarps: @ 85378C8 warp_def 10, 29, 3, 5, MAP_METEOR_FALLS_1F_1R diff --git a/data/maps/events/MirageTower_3F.inc b/data/maps/events/MirageTower_3F.inc index 062a137fcf..4163ccee92 100644 --- a/data/maps/events/MirageTower_3F.inc +++ b/data/maps/events/MirageTower_3F.inc @@ -1,6 +1,6 @@ MirageTower_3F_EventObjects: @ 853761C - object_event 1, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 7, 3, 1, 17, 0, 0, 0, MirageTower_3F_EventScript_2907A6, 17, 0, 0 - object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 4, 8, 3, 1, 17, 0, 0, 0, MirageTower_3F_EventScript_2907A6, 18, 0, 0 + object_event 1, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 7, 3, 1, 17, 0, 0, MirageTower_3F_EventScript_2907A6, 17 + object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 8, 3, 1, 17, 0, 0, MirageTower_3F_EventScript_2907A6, 18 MirageTower_3F_MapWarps: @ 853764C warp_def 18, 12, 3, 0, MAP_MIRAGE_TOWER_2F diff --git a/data/maps/events/MirageTower_4F.inc b/data/maps/events/MirageTower_4F.inc index 848eeb88e2..f751efe027 100644 --- a/data/maps/events/MirageTower_4F.inc +++ b/data/maps/events/MirageTower_4F.inc @@ -1,7 +1,7 @@ MirageTower_4F_EventObjects: @ 8537670 - object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 0, 5, 4, 4, 8, 17, 0, 0, 0, MirageTower_4F_EventScript_23AD48, 963, 0, 0 - object_event 2, EVENT_OBJ_GFX_FOSSIL, 0, 0, 7, 4, 0, 8, 17, 0, 0, 0, MirageTower_4F_EventScript_23AD89, 964, 0, 0 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 6, 7, 3, 1, 17, 0, 0, 0, MirageTower_4F_EventScript_2907A6, 17, 0, 0 + object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 5, 4, 4, 8, 17, 0, 0, MirageTower_4F_EventScript_23AD48, 963 + object_event 2, EVENT_OBJ_GFX_FOSSIL, 0, 7, 4, 0, 8, 17, 0, 0, MirageTower_4F_EventScript_23AD89, 964 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 7, 3, 1, 17, 0, 0, MirageTower_4F_EventScript_2907A6, 17 MirageTower_4F_MapWarps: @ 85376B8 warp_def 1, 4, 3, 1, MAP_MIRAGE_TOWER_3F diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/events/MossdeepCity.inc index 531fb141b3..3d3a7ee4e2 100644 --- a/data/maps/events/MossdeepCity.inc +++ b/data/maps/events/MossdeepCity.inc @@ -1,21 +1,21 @@ MossdeepCity_EventObjects: @ 8527018 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 38, 12, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4AD1, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 50, 34, 5, 5, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 32, 12, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4AB2, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 26, 21, 5, 3, 16, 0, 0, 0, MossdeepCity_EventScript_1E4AF0, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 0, 45, 18, 7, 9, 0, 0, 0, 0, MossdeepCity_EventScript_1E4B02, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 62, 35, 5, 1, 0, 0, 0, 0, MossdeepCity_EventScript_2910F5, 1043, 0, 0 - object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 0, 55, 5, 7, 7, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C10, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 56, 21, 7, 10, 17, 0, 0, 0, MossdeepCity_EventScript_1E4B0B, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 0, 23, 13, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4C26, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 23, 5, 8, 17, 0, 0, 0, 0x0, 823, 0, 0 - object_event 11, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 24, 5, 7, 17, 0, 0, 0, 0x0, 823, 0, 0 - object_event 12, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 25, 5, 8, 17, 0, 0, 0, 0x0, 823, 0, 0 - object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 26, 5, 7, 17, 0, 0, 0, 0x0, 823, 0, 0 - object_event 14, EVENT_OBJ_GFX_MAXIE, 0, 0, 45, 25, 5, 9, 17, 0, 0, 0, 0x0, 823, 0, 0 - object_event 15, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 19, 25, 3, 64, 51, 0, 0, 0, MossdeepCity_EventScript_2C81EE, 0, 0, 0 - object_event 16, EVENT_OBJ_GFX_SCOTT, 0, 0, 61, 29, 5, 17, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, 788, 0, 0 - object_event 17, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 31, 29, 3, 64, 51, 0, 0, 0, MossdeepCity_EventScript_1E4C7C, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 38, 12, 5, 2, 17, 0, 0, MossdeepCity_EventScript_1E4AD1, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 50, 34, 5, 5, 1, 0, 0, MossdeepCity_EventScript_1E4AF9, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 32, 12, 5, 2, 17, 0, 0, MossdeepCity_EventScript_1E4AB2, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 21, 5, 3, 16, 0, 0, MossdeepCity_EventScript_1E4AF0, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 45, 18, 7, 9, 0, 0, 0, MossdeepCity_EventScript_1E4B02, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 35, 5, 1, 0, 0, 0, MossdeepCity_EventScript_2910F5, 1043 + object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 55, 5, 7, 7, 0, 0, 0, MossdeepCity_EventScript_1E4C10, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_1, 0, 56, 21, 7, 10, 17, 0, 0, MossdeepCity_EventScript_1E4B0B, 0 + object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 23, 13, 5, 2, 17, 0, 0, MossdeepCity_EventScript_1E4C26, 0 + object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 23, 5, 8, 17, 0, 0, 0x0, 823 + object_event 11, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 24, 5, 7, 17, 0, 0, 0x0, 823 + object_event 12, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 25, 5, 8, 17, 0, 0, 0x0, 823 + object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 26, 5, 7, 17, 0, 0, 0x0, 823 + object_event 14, EVENT_OBJ_GFX_MAXIE, 0, 45, 25, 5, 9, 17, 0, 0, 0x0, 823 + object_event 15, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 25, 3, 64, 51, 0, 0, MossdeepCity_EventScript_2C81EE, 0 + object_event 16, EVENT_OBJ_GFX_SCOTT, 0, 61, 29, 5, 17, 0, 0, 0, MossdeepCity_EventScript_1E4C85, 788 + object_event 17, EVENT_OBJ_GFX_BLACK_BELT, 0, 31, 29, 3, 64, 51, 0, 0, MossdeepCity_EventScript_1E4C7C, 0 MossdeepCity_MapWarps: @ 85271B0 warp_def 28, 9, 0, 0, MAP_MOSSDEEP_CITY_HOUSE1 diff --git a/data/maps/events/MossdeepCity_GameCorner_1F.inc b/data/maps/events/MossdeepCity_GameCorner_1F.inc index a271897b74..00f32e95a6 100644 --- a/data/maps/events/MossdeepCity_GameCorner_1F.inc +++ b/data/maps/events/MossdeepCity_GameCorner_1F.inc @@ -1,6 +1,6 @@ MossdeepCity_GameCorner_1F_EventObjects: @ 8532F40 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B54, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 4, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 2, 0, 8, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B54, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 4, 2, 0, 8, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0 MossdeepCity_GameCorner_1F_MapWarps: @ 8532F70 warp_def 5, 9, 0, 9, MAP_MOSSDEEP_CITY diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.inc b/data/maps/events/MossdeepCity_GameCorner_B1F.inc index 2955da0b01..8a7cfe9399 100644 --- a/data/maps/events/MossdeepCity_GameCorner_B1F.inc +++ b/data/maps/events/MossdeepCity_GameCorner_B1F.inc @@ -1,5 +1,5 @@ MossdeepCity_GameCorner_B1F_EventObjects: @ 8532FC0 - object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 5, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 6, 5, 3, 9, 0, 0, 0, 0x0, 0 MossdeepCity_GameCorner_B1F_MapWarps: @ 8532FD8 warp_def 3, 1, 0, 2, MAP_MOSSDEEP_CITY_GAME_CORNER_1F diff --git a/data/maps/events/MossdeepCity_Gym.inc b/data/maps/events/MossdeepCity_Gym.inc index 23951059d7..3071139a7a 100644 --- a/data/maps/events/MossdeepCity_Gym.inc +++ b/data/maps/events/MossdeepCity_Gym.inc @@ -1,40 +1,40 @@ MossdeepCity_Gym_EventObjects: @ 85324EC - object_event 1, EVENT_OBJ_GFX_TATE, 0, 0, 23, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 1, 30, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220AFD, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 5, 20, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B2B, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 0, 4, 29, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B70, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_LASS, 0, 0, 4, 23, 0, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B59, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 6, 9, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B14, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 0, 6, 3, 0, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B42, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_MAN_2, 0, 0, 5, 33, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220C11, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_LIZA, 0, 0, 24, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 2, 30, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 11, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 1, 29, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 12, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 30, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 13, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 5, 29, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 14, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 5, 21, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 15, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 7, 9, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 16, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 10, 8, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 17, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 9, 8, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220B9E, 0, 0, 0 - object_event 18, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 7, 5, 3, 10, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220B87, 0, 0, 0 - object_event 19, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 6, 6, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 20, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 21, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 11, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 22, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 11, 34, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 23, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 33, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 24, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 34, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 22, 25, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BCC, 0, 0, 0 - object_event 26, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 23, 26, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 27, EVENT_OBJ_GFX_LASS, 0, 0, 25, 25, 0, 9, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BB5, 0, 0, 0 - object_event 28, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 22, 23, 3, 8, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BFA, 0, 0, 0 - object_event 29, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 21, 23, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 30, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 21, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 31, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 22, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 32, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 25, 22, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BE3, 0, 0, 0 - object_event 33, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 24, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 34, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 24, 23, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 35, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 6, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 36, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 23, 25, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_TATE, 0, 23, 7, 0, 8, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0 + object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 30, 3, 8, 0, 1, 1, MossdeepCity_Gym_EventScript_220AFD, 0 + object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 5, 20, 3, 7, 0, 1, 1, MossdeepCity_Gym_EventScript_220B2B, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 4, 29, 3, 7, 0, 1, 1, MossdeepCity_Gym_EventScript_220B70, 0 + object_event 5, EVENT_OBJ_GFX_LASS, 0, 4, 23, 0, 7, 0, 1, 1, MossdeepCity_Gym_EventScript_220B59, 0 + object_event 6, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 9, 3, 8, 0, 1, 1, MossdeepCity_Gym_EventScript_220B14, 0 + object_event 7, EVENT_OBJ_GFX_LASS, 0, 6, 3, 0, 8, 0, 1, 1, MossdeepCity_Gym_EventScript_220B42, 0 + object_event 8, EVENT_OBJ_GFX_MAN_2, 0, 5, 33, 0, 8, 0, 0, 0, MossdeepCity_Gym_EventScript_220C11, 0 + object_event 9, EVENT_OBJ_GFX_LIZA, 0, 24, 7, 0, 8, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0 + object_event 10, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 2, 30, 3, 1, 17, 0, 0, 0x0, 0 + object_event 11, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 1, 29, 3, 1, 17, 0, 0, 0x0, 0 + object_event 12, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 30, 3, 1, 17, 0, 0, 0x0, 0 + object_event 13, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 5, 29, 3, 1, 17, 0, 0, 0x0, 0 + object_event 14, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 5, 21, 3, 1, 17, 0, 0, 0x0, 0 + object_event 15, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 7, 9, 3, 1, 17, 0, 0, 0x0, 0 + object_event 16, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 10, 8, 3, 1, 17, 0, 0, 0x0, 0 + object_event 17, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 8, 3, 7, 17, 1, 1, MossdeepCity_Gym_EventScript_220B9E, 0 + object_event 18, EVENT_OBJ_GFX_HEX_MANIAC, 0, 7, 5, 3, 10, 17, 1, 1, MossdeepCity_Gym_EventScript_220B87, 0 + object_event 19, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 6, 6, 3, 1, 17, 0, 0, 0x0, 0 + object_event 20, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 5, 3, 1, 17, 0, 0, 0x0, 0 + object_event 21, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 11, 5, 3, 1, 17, 0, 0, 0x0, 0 + object_event 22, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 11, 34, 3, 1, 17, 0, 0, 0x0, 0 + object_event 23, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 33, 3, 1, 17, 0, 0, 0x0, 0 + object_event 24, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 34, 3, 1, 17, 0, 0, 0x0, 0 + object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 22, 25, 3, 7, 17, 1, 1, MossdeepCity_Gym_EventScript_220BCC, 0 + object_event 26, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 23, 26, 3, 1, 17, 0, 0, 0x0, 0 + object_event 27, EVENT_OBJ_GFX_LASS, 0, 25, 25, 0, 9, 17, 1, 1, MossdeepCity_Gym_EventScript_220BB5, 0 + object_event 28, EVENT_OBJ_GFX_HEX_MANIAC, 0, 22, 23, 3, 8, 17, 1, 1, MossdeepCity_Gym_EventScript_220BFA, 0 + object_event 29, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 21, 23, 3, 1, 17, 0, 0, 0x0, 0 + object_event 30, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 21, 22, 3, 1, 17, 0, 0, 0x0, 0 + object_event 31, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 22, 22, 3, 1, 17, 0, 0, 0x0, 0 + object_event 32, EVENT_OBJ_GFX_PSYCHIC_M, 0, 25, 22, 3, 7, 17, 1, 1, MossdeepCity_Gym_EventScript_220BE3, 0 + object_event 33, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 24, 22, 3, 1, 17, 0, 0, 0x0, 0 + object_event 34, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 24, 23, 3, 1, 17, 0, 0, 0x0, 0 + object_event 35, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 6, 5, 3, 1, 17, 0, 0, 0x0, 0 + object_event 36, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 23, 25, 3, 1, 17, 0, 0, 0x0, 0 MossdeepCity_Gym_MapWarps: @ 853284C warp_def 6, 35, 3, 1, MAP_MOSSDEEP_CITY diff --git a/data/maps/events/MossdeepCity_House1.inc b/data/maps/events/MossdeepCity_House1.inc index 6342bcc55e..5da968bfa6 100644 --- a/data/maps/events/MossdeepCity_House1.inc +++ b/data/maps/events/MossdeepCity_House1.inc @@ -1,6 +1,6 @@ MossdeepCity_House1_EventObjects: @ 8532978 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 3, 3, 3, 3, 17, 0, 0, 0, MossdeepCity_House1_EventScript_221FD6, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 3, 3, 3, 17, 0, 0, MossdeepCity_House1_EventScript_221FD6, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 4, 3, 9, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0 MossdeepCity_House1_MapWarps: @ 85329A8 warp_def 3, 7, 0, 0, MAP_MOSSDEEP_CITY diff --git a/data/maps/events/MossdeepCity_House2.inc b/data/maps/events/MossdeepCity_House2.inc index 9596aa7bd0..f1b535b170 100644 --- a/data/maps/events/MossdeepCity_House2.inc +++ b/data/maps/events/MossdeepCity_House2.inc @@ -1,7 +1,7 @@ MossdeepCity_House2_EventObjects: @ 85329CC - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, 934, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 6, 6, 3, 9, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 4, 4, 3, 8, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0 + object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 5, 3, 7, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, 934 MossdeepCity_House2_MapWarps: @ 8532A14 warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY diff --git a/data/maps/events/MossdeepCity_House3.inc b/data/maps/events/MossdeepCity_House3.inc index 19933fb6ad..2cca573a81 100644 --- a/data/maps/events/MossdeepCity_House3.inc +++ b/data/maps/events/MossdeepCity_House3.inc @@ -1,5 +1,5 @@ MossdeepCity_House3_EventObjects: @ 8532BD4 - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, MossdeepCity_House3_EventScript_2225C3, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 4, 4, 3, 10, 0, 0, 0, MossdeepCity_House3_EventScript_2225C3, 0 MossdeepCity_House3_MapWarps: @ 8532BEC warp_def 3, 7, 0, 5, MAP_MOSSDEEP_CITY diff --git a/data/maps/events/MossdeepCity_House4.inc b/data/maps/events/MossdeepCity_House4.inc index fc72039508..30a5719a82 100644 --- a/data/maps/events/MossdeepCity_House4.inc +++ b/data/maps/events/MossdeepCity_House4.inc @@ -1,7 +1,7 @@ MossdeepCity_House4_EventObjects: @ 8532CAC - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 6, 6, 3, 5, 1, 0, 0, 0, MossdeepCity_House4_EventScript_222DF7, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 0, 2, 4, 3, 1, 17, 0, 0, 0, MossdeepCity_House4_EventScript_222E1E, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 9, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 6, 3, 5, 1, 0, 0, MossdeepCity_House4_EventScript_222DF7, 0 + object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 2, 4, 3, 1, 17, 0, 0, MossdeepCity_House4_EventScript_222E1E, 0 MossdeepCity_House4_MapWarps: @ 8532CF4 warp_def 4, 7, 0, 7, MAP_MOSSDEEP_CITY diff --git a/data/maps/events/MossdeepCity_Mart.inc b/data/maps/events/MossdeepCity_Mart.inc index 91811e9e9f..888473e5ca 100644 --- a/data/maps/events/MossdeepCity_Mart.inc +++ b/data/maps/events/MossdeepCity_Mart.inc @@ -1,8 +1,8 @@ MossdeepCity_Mart_EventObjects: @ 8532B50 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223C8, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 1, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 0, 8, 3, 3, 3, 16, 0, 0, 0, MossdeepCity_Mart_EventScript_2223FF, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 0, 5, 3, 3, 2, 17, 0, 0, 0, MossdeepCity_Mart_EventScript_222408, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, MossdeepCity_Mart_EventScript_2223C8, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 1, 5, 3, 7, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0 + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 8, 3, 3, 3, 16, 0, 0, MossdeepCity_Mart_EventScript_2223FF, 0 + object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 5, 3, 3, 2, 17, 0, 0, MossdeepCity_Mart_EventScript_222408, 0 MossdeepCity_Mart_MapWarps: @ 8532BB0 warp_def 3, 7, 0, 4, MAP_MOSSDEEP_CITY diff --git a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc index 7c8b8b7028..999d16a110 100644 --- a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc +++ b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc @@ -1,7 +1,7 @@ MossdeepCity_PokemonCenter_1F_EventObjects: @ 8532A38 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22224E, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 8, 4, 3, 7, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22225C, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 0, 3, 5, 3, 1, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_222265, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22224E, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 4, 3, 7, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22225C, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 3, 5, 3, 1, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_222265, 0 MossdeepCity_PokemonCenter_1F_MapWarps: @ 8532A80 warp_def 7, 8, 3, 2, MAP_MOSSDEEP_CITY diff --git a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc index 4fa7dff998..aa37daee52 100644 --- a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc +++ b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc @@ -1,9 +1,9 @@ MossdeepCity_PokemonCenter_2F_EventObjects: @ 8532AAC - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 11, 7, 3, 5, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 7, 3, 5, 17, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0 MossdeepCity_PokemonCenter_2F_MapWarps: @ 8532B24 warp_def 1, 6, 4, 2, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc index d3b27947ab..5ffce14441 100644 --- a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc +++ b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc @@ -1,15 +1,15 @@ MossdeepCity_SpaceCenter_1F_EventObjects: @ 8532D18 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 7, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_222FD8, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 2, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223063, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 10, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223168, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 14, 7, 3, 3, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22312D, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 12, 9, 3, 9, 17, 0, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231DA, 756, 0, 0 - object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 11, 6, 3, 9, 17, 0, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231F1, 756, 0, 0 - object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 10, 2, 3, 8, 17, 0, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_223208, 756, 0, 0 - object_event 9, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 13, 2, 3, 8, 17, 0, 1, 0, MossdeepCity_SpaceCenter_1F_EventScript_22321F, 756, 0, 0 - object_event 10, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 5, 0, 76, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, 737, 0, 0 - object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 0, 1, 4, 3, 8, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, 753, 0, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 7, 2, 3, 7, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_222FD8, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 2, 3, 7, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223063, 0 + object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 6, 6, 3, 9, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 2, 3, 7, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223168, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 7, 3, 3, 17, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22312D, 0 + object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 12, 9, 3, 9, 17, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231DA, 756 + object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 11, 6, 3, 9, 17, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231F1, 756 + object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 10, 2, 3, 8, 17, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_223208, 756 + object_event 9, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 2, 3, 8, 17, 1, 0, MossdeepCity_SpaceCenter_1F_EventScript_22321F, 756 + object_event 10, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 5, 0, 76, 17, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, 737 + object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 1, 4, 3, 8, 17, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, 753 MossdeepCity_SpaceCenter_1F_MapWarps: @ 8532E20 warp_def 7, 9, 0, 8, MAP_MOSSDEEP_CITY diff --git a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc index e2f778bec3..30b594234b 100644 --- a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc +++ b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc @@ -1,13 +1,13 @@ MossdeepCity_SpaceCenter_2F_EventObjects: @ 8532E4C - object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 0, 6, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 5, 6, 3, 2, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223E8D, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_STEVEN, 0, 0, 1, 8, 3, 8, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F7A, 863, 0, 0 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 2, 3, 10, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F3E, 862, 0, 0 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 13, 3, 3, 7, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F50, 862, 0, 0 - object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 14, 2, 3, 9, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F47, 862, 0, 0 - object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 0, 8, 3, 10, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, 862, 0, 0 - object_event 9, EVENT_OBJ_GFX_MAXIE, 0, 0, 1, 9, 3, 7, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, 862, 0, 0 + object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 6, 2, 3, 7, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 8, 3, 7, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 5, 6, 3, 2, 17, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223E8D, 0 + object_event 4, EVENT_OBJ_GFX_STEVEN, 0, 1, 8, 3, 8, 17, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F7A, 863 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 2, 3, 10, 17, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F3E, 862 + object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 3, 3, 7, 17, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F50, 862 + object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 2, 3, 9, 17, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F47, 862 + object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 3, 10, 17, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, 862 + object_event 9, EVENT_OBJ_GFX_MAXIE, 0, 1, 9, 3, 7, 17, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, 862 MossdeepCity_SpaceCenter_2F_MapWarps: @ 8532F24 warp_def 13, 1, 0, 2, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/events/MossdeepCity_StevensHouse.inc index 2b0562d342..db7f2ed596 100644 --- a/data/maps/events/MossdeepCity_StevensHouse.inc +++ b/data/maps/events/MossdeepCity_StevensHouse.inc @@ -1,7 +1,7 @@ MossdeepCity_StevensHouse_EventObjects: @ 8532C10 - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 0, 9, 6, 3, 10, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, 967, 0, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 3, 1, 17, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, 968, 0, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 6, 4, 3, 76, 17, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, 727, 0, 0 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 6, 3, 10, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, 967 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, 1, 17, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, 968 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 4, 3, 76, 17, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, 727 MossdeepCity_StevensHouse_MapWarps: @ 8532C58 warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY diff --git a/data/maps/events/MtChimney.inc b/data/maps/events/MtChimney.inc index a260258302..3be5fbbe59 100644 --- a/data/maps/events/MtChimney.inc +++ b/data/maps/events/MtChimney.inc @@ -1,34 +1,34 @@ MtChimney_EventObjects: @ 85347C8 - object_event 1, EVENT_OBJ_GFX_ARCHIE, 0, 0, 24, 19, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, 926, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAXIE, 0, 0, 13, 6, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, 927, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 11, 3, 9, 0, 0, 1, 2, MtChimney_EventScript_22F06E, 927, 0, 0 - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 32, 5, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C0, 927, 0, 0 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 28, 12, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F0B7, 927, 0, 0 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F05C, 926, 0, 0 - object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 29, 5, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F053, 926, 0, 0 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 31, 12, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F065, 926, 0, 0 - object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EEF3, 994, 0, 0 - object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 22, 39, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C9, 927, 0, 0 - object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 23, 19, 3, 74, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0 - object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 23, 18, 3, 64, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 - object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 23, 17, 3, 8, 0, 0, 0, 0, MtChimney_EventScript_22F0A5, 927, 0, 0 - object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 23, 20, 3, 65, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 - object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 22, 19, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 - object_event 16, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 23, 21, 3, 7, 0, 0, 0, 0, MtChimney_EventScript_22F0AE, 927, 0, 0 - object_event 17, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 21, 19, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F09C, 927, 0, 0 - object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 30, 12, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0 - object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 29, 12, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 - object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 30, 5, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0 - object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 31, 5, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 - object_event 22, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 9, 16, 3, 10, 0, 0, 1, 3, MtChimney_EventScript_22F085, 927, 0, 0 - object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 20, 39, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0 - object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 21, 39, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 - object_event 25, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 16, 18, 3, 13, 0, 0, 1, 3, MtChimney_EventScript_22F14A, 877, 0, 0 - object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 0, 14, 7, 3, 70, 0, 0, 1, 6, MtChimney_EventScript_22F1AC, 877, 0, 0 - object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 0, 29, 7, 3, 17, 17, 0, 1, 3, MtChimney_EventScript_22F1C3, 877, 0, 0 - object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 0, 27, 17, 3, 16, 17, 0, 1, 3, MtChimney_EventScript_22F1DA, 877, 0, 0 - object_event 29, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 13, 16, 3, 9, 17, 0, 1, 3, MtChimney_EventScript_22F1F1, 927, 0, 0 - object_event 30, EVENT_OBJ_GFX_HIKER, 0, 0, 7, 7, 3, 10, 17, 0, 1, 6, MtChimney_EventScript_22F208, 877, 0, 0 + object_event 1, EVENT_OBJ_GFX_ARCHIE, 0, 24, 19, 3, 9, 0, 0, 0, MtChimney_EventScript_22EDD5, 926 + object_event 2, EVENT_OBJ_GFX_MAXIE, 0, 13, 6, 3, 10, 0, 0, 0, MtChimney_EventScript_22EE0B, 927 + object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 11, 3, 9, 0, 1, 2, MtChimney_EventScript_22F06E, 927 + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 32, 5, 3, 9, 0, 0, 0, MtChimney_EventScript_22F0C0, 927 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 28, 12, 3, 10, 0, 0, 0, MtChimney_EventScript_22F0B7, 927 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 19, 39, 3, 10, 0, 0, 0, MtChimney_EventScript_22F05C, 926 + object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 5, 3, 10, 0, 0, 0, MtChimney_EventScript_22F053, 926 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 12, 3, 9, 0, 0, 0, MtChimney_EventScript_22F065, 926 + object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 19, 39, 3, 10, 0, 0, 0, MtChimney_EventScript_22EEF3, 994 + object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 39, 3, 9, 0, 0, 0, MtChimney_EventScript_22F0C9, 927 + object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 19, 3, 74, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 + object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 18, 3, 64, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 + object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 17, 3, 8, 0, 0, 0, MtChimney_EventScript_22F0A5, 927 + object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 20, 3, 65, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 + object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 22, 19, 3, 67, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 + object_event 16, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 21, 3, 7, 0, 0, 0, MtChimney_EventScript_22F0AE, 927 + object_event 17, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 19, 3, 10, 0, 0, 0, MtChimney_EventScript_22F09C, 927 + object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 12, 3, 66, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 + object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 29, 12, 3, 67, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 + object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 5, 3, 67, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 + object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 31, 5, 3, 66, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 + object_event 22, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 9, 16, 3, 10, 0, 1, 3, MtChimney_EventScript_22F085, 927 + object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 20, 39, 3, 67, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 + object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 21, 39, 3, 66, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 + object_event 25, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 16, 18, 3, 13, 0, 1, 3, MtChimney_EventScript_22F14A, 877 + object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 14, 7, 3, 70, 0, 1, 6, MtChimney_EventScript_22F1AC, 877 + object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 29, 7, 3, 17, 17, 1, 3, MtChimney_EventScript_22F1C3, 877 + object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 27, 17, 3, 16, 17, 1, 3, MtChimney_EventScript_22F1DA, 877 + object_event 29, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 13, 16, 3, 9, 17, 1, 3, MtChimney_EventScript_22F1F1, 927 + object_event 30, EVENT_OBJ_GFX_HIKER, 0, 7, 7, 3, 10, 17, 1, 6, MtChimney_EventScript_22F208, 877 MtChimney_MapWarps: @ 8534A98 warp_def 17, 36, 0, 0, MAP_MT_CHIMNEY_CABLE_CAR_STATION diff --git a/data/maps/events/MtChimney_CableCarStation.inc b/data/maps/events/MtChimney_CableCarStation.inc index e519d5281d..5c3f44889a 100644 --- a/data/maps/events/MtChimney_CableCarStation.inc +++ b/data/maps/events/MtChimney_CableCarStation.inc @@ -1,6 +1,6 @@ MtChimney_CableCarStation_EventObjects: @ 8533CA8 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 6, 6, 3, 8, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_22AC4B, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, 8, 0, 0, 0, MtChimney_CableCarStation_EventScript_22AC4B, 0 + object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, 1, 0, 0, 0, 0x0, 0 MtChimney_CableCarStation_MapWarps: @ 8533CD8 warp_def 6, 11, 0, 0, MAP_MT_CHIMNEY diff --git a/data/maps/events/MtPyre_1F.inc b/data/maps/events/MtPyre_1F.inc index 99e6e88d27..9cebbca5ec 100644 --- a/data/maps/events/MtPyre_1F.inc +++ b/data/maps/events/MtPyre_1F.inc @@ -1,7 +1,7 @@ MtPyre_1F_EventObjects: @ 8534D64 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 21, 2, 3, 8, 17, 0, 0, 0, MtPyre_1F_EventScript_230F3F, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 17, 8, 3, 7, 17, 0, 0, 0, MtPyre_1F_EventScript_230F78, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 0, 13, 10, 3, 9, 17, 0, 0, 0, MtPyre_1F_EventScript_230F81, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 21, 2, 3, 8, 17, 0, 0, MtPyre_1F_EventScript_230F3F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 17, 8, 3, 7, 17, 0, 0, MtPyre_1F_EventScript_230F78, 0 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 10, 3, 9, 17, 0, 0, MtPyre_1F_EventScript_230F81, 0 MtPyre_1F_MapWarps: @ 8534DAC warp_def 17, 18, 3, 0, MAP_ROUTE122 diff --git a/data/maps/events/MtPyre_2F.inc b/data/maps/events/MtPyre_2F.inc index 89e8dd5534..9d9ceb3766 100644 --- a/data/maps/events/MtPyre_2F.inc +++ b/data/maps/events/MtPyre_2F.inc @@ -1,12 +1,12 @@ MtPyre_2F_EventObjects: @ 8534DF0 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 6, 3, 10, 17, 0, 1, 2, MtPyre_2F_EventScript_231128, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 10, 3, 1, 17, 0, 0, 0, MtPyre_2F_EventScript_2912FD, 1129, 0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 9, 3, 3, 10, 17, 0, 0, 0, MtPyre_2F_EventScript_231116, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 0, 12, 10, 3, 8, 17, 0, 0, 0, MtPyre_2F_EventScript_23111F, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 2, 9, 3, 8, 17, 0, 1, 1, MtPyre_2F_EventScript_23115A, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 0, 3, 9, 3, 8, 17, 0, 1, 1, MtPyre_2F_EventScript_23113F, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 6, 9, 3, 7, 17, 0, 1, 2, MtPyre_2F_EventScript_23118C, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 6, 6, 3, 17, 17, 0, 1, 2, MtPyre_2F_EventScript_231175, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 6, 3, 10, 17, 1, 2, MtPyre_2F_EventScript_231128, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, 1, 17, 0, 0, MtPyre_2F_EventScript_2912FD, 1129 + object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 9, 3, 3, 10, 17, 0, 0, MtPyre_2F_EventScript_231116, 0 + object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 12, 10, 3, 8, 17, 0, 0, MtPyre_2F_EventScript_23111F, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 9, 3, 8, 17, 1, 1, MtPyre_2F_EventScript_23115A, 0 + object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 3, 9, 3, 8, 17, 1, 1, MtPyre_2F_EventScript_23113F, 0 + object_event 7, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 9, 3, 7, 17, 1, 2, MtPyre_2F_EventScript_23118C, 0 + object_event 8, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 6, 3, 17, 17, 1, 2, MtPyre_2F_EventScript_231175, 0 MtPyre_2F_MapWarps: @ 8534EB0 warp_def 2, 1, 3, 4, MAP_MT_PYRE_1F diff --git a/data/maps/events/MtPyre_3F.inc b/data/maps/events/MtPyre_3F.inc index a60b1cec05..c788ae13d7 100644 --- a/data/maps/events/MtPyre_3F.inc +++ b/data/maps/events/MtPyre_3F.inc @@ -1,8 +1,8 @@ MtPyre_3F_EventObjects: @ 8534EEC - object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 1, 4, 3, 18, 17, 0, 1, 4, MtPyre_3F_EventScript_231753, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 0, 11, 4, 3, 17, 17, 0, 1, 4, MtPyre_3F_EventScript_23176A, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 3, 1, 17, 0, 0, 0, MtPyre_3F_EventScript_29130A, 1120, 0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 6, 4, 3, 14, 17, 0, 1, 4, MtPyre_3F_EventScript_231781, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, 18, 17, 1, 4, MtPyre_3F_EventScript_231753, 0 + object_event 2, EVENT_OBJ_GFX_LASS, 0, 11, 4, 3, 17, 17, 1, 4, MtPyre_3F_EventScript_23176A, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, 1, 17, 0, 0, MtPyre_3F_EventScript_29130A, 1120 + object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, 14, 17, 1, 4, MtPyre_3F_EventScript_231781, 0 MtPyre_3F_MapWarps: @ 8534F4C warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F diff --git a/data/maps/events/MtPyre_4F.inc b/data/maps/events/MtPyre_4F.inc index 4cb8ccd6f8..5374e60485 100644 --- a/data/maps/events/MtPyre_4F.inc +++ b/data/maps/events/MtPyre_4F.inc @@ -1,6 +1,6 @@ MtPyre_4F_EventObjects: @ 8534F90 - object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 11, 7, 3, 24, 17, 0, 1, 2, MtPyre_4F_EventScript_231C6E, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 11, 3, 1, 17, 0, 0, 0, MtPyre_4F_EventScript_291317, 1130, 0, 0 + object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 7, 3, 24, 17, 1, 2, MtPyre_4F_EventScript_231C6E, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, 1, 17, 0, 0, MtPyre_4F_EventScript_291317, 1130 MtPyre_4F_MapWarps: @ 8534FC0 warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F diff --git a/data/maps/events/MtPyre_5F.inc b/data/maps/events/MtPyre_5F.inc index 4bd96526e7..591b90bef4 100644 --- a/data/maps/events/MtPyre_5F.inc +++ b/data/maps/events/MtPyre_5F.inc @@ -1,6 +1,6 @@ MtPyre_5F_EventObjects: @ 8535004 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 3, 7, 3, 17, 17, 0, 1, 2, MtPyre_5F_EventScript_231BC9, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 11, 3, 1, 17, 0, 0, 0, MtPyre_5F_EventScript_291324, 1052, 0, 0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 7, 3, 17, 17, 1, 2, MtPyre_5F_EventScript_231BC9, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, 1, 17, 0, 0, MtPyre_5F_EventScript_291324, 1052 MtPyre_5F_MapWarps: @ 8535034 warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F diff --git a/data/maps/events/MtPyre_6F.inc b/data/maps/events/MtPyre_6F.inc index b160f48968..8c319b3a0b 100644 --- a/data/maps/events/MtPyre_6F.inc +++ b/data/maps/events/MtPyre_6F.inc @@ -1,7 +1,7 @@ MtPyre_6F_EventObjects: @ 8535070 - object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 6, 3, 3, 23, 17, 0, 1, 3, MtPyre_6F_EventScript_231D3B, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 9, 3, 1, 17, 0, 0, 0, MtPyre_6F_EventScript_291331, 1089, 0, 0 - object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 10, 3, 3, 24, 17, 0, 1, 3, MtPyre_6F_EventScript_231D9D, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, 23, 17, 1, 3, MtPyre_6F_EventScript_231D3B, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, 1, 17, 0, 0, MtPyre_6F_EventScript_291331, 1089 + object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 10, 3, 3, 24, 17, 1, 3, MtPyre_6F_EventScript_231D9D, 0 MtPyre_6F_MapWarps: @ 85350B8 warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F diff --git a/data/maps/events/MtPyre_Exterior.inc b/data/maps/events/MtPyre_Exterior.inc index 446e040721..cb3ea04d12 100644 --- a/data/maps/events/MtPyre_Exterior.inc +++ b/data/maps/events/MtPyre_Exterior.inc @@ -1,6 +1,6 @@ MtPyre_Exterior_EventObjects: @ 85350DC - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 27, 15, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, 1073, 0, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 19, 40, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, 1074, 0, 0 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 15, 3, 1, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, 1073 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 40, 3, 1, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, 1074 MtPyre_Exterior_MapWarps: @ 853510C warp_def 10, 42, 3, 1, MAP_MT_PYRE_1F diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/events/MtPyre_Summit.inc index e2512c586a..25b61fe193 100644 --- a/data/maps/events/MtPyre_Summit.inc +++ b/data/maps/events/MtPyre_Summit.inc @@ -1,12 +1,12 @@ MtPyre_Summit_EventObjects: @ 85351A0 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 22, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 0, 23, 6, 3, 7, 0, 0, 0, 0, 0x0, 916, 0, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 23, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 15, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, 917, 0, 0 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 25, 18, 3, 9, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, 917, 0, 0 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 11, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, 917, 0, 0 - object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 25, 11, 3, 9, 17, 0, 1, 3, MtPyre_Summit_EventScript_232442, 917, 0, 0 - object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 0, 23, 6, 3, 7, 17, 0, 0, 0, 0x0, 856, 0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 22, 5, 3, 8, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0 + object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, 7, 0, 0, 0, 0x0, 916 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 23, 5, 3, 8, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 15, 3, 10, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, 917 + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 18, 3, 9, 0, 1, 3, MtPyre_Summit_EventScript_232414, 917 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 11, 3, 10, 0, 1, 3, MtPyre_Summit_EventScript_23242B, 917 + object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 25, 11, 3, 9, 17, 1, 3, MtPyre_Summit_EventScript_232442, 917 + object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, 7, 17, 0, 0, 0x0, 856 MtPyre_Summit_MapWarps: @ 8535260 warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR diff --git a/data/maps/events/NavelRock_Bottom.inc b/data/maps/events/NavelRock_Bottom.inc index ae5c36cf1d..49743dfe46 100644 --- a/data/maps/events/NavelRock_Bottom.inc +++ b/data/maps/events/NavelRock_Bottom.inc @@ -1,5 +1,5 @@ NavelRock_Bottom_EventObjects: @ 853DD50 - object_event 1, EVENT_OBJ_GFX_LUGIA, 0, 0, 11, 13, 0, 8, 17, 0, 0, 0, NavelRock_Bottom_EventScript_2692A2, 800, 0, 0 + object_event 1, EVENT_OBJ_GFX_LUGIA, 0, 11, 13, 0, 8, 17, 0, 0, NavelRock_Bottom_EventScript_2692A2, 800 NavelRock_Bottom_MapWarps: @ 853DD68 warp_def 14, 19, 0, 0, MAP_NAVEL_ROCK_DOWN11 diff --git a/data/maps/events/NavelRock_Harbor.inc b/data/maps/events/NavelRock_Harbor.inc index 04b452b4ed..60e4a6935e 100644 --- a/data/maps/events/NavelRock_Harbor.inc +++ b/data/maps/events/NavelRock_Harbor.inc @@ -1,6 +1,6 @@ NavelRock_Harbor_EventObjects: @ 853DA24 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 8, 5, 0, 7, 17, 0, 0, 0, NavelRock_Harbor_EventScript_2690BD, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 8, 7, 1, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, 7, 17, 0, 0, NavelRock_Harbor_EventScript_2690BD, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, 10, 17, 0, 0, 0x0, 0 NavelRock_Harbor_MapWarps: @ 853DA54 warp_def 8, 2, 0, 0, MAP_NAVEL_ROCK_EXTERIOR diff --git a/data/maps/events/NavelRock_Top.inc b/data/maps/events/NavelRock_Top.inc index 65618f8ea5..ec3d8322af 100644 --- a/data/maps/events/NavelRock_Top.inc +++ b/data/maps/events/NavelRock_Top.inc @@ -1,5 +1,5 @@ NavelRock_Top_EventObjects: @ 853DB74 - object_event 1, EVENT_OBJ_GFX_HOOH, 0, 0, 12, 4, 0, 8, 17, 0, 0, 0, 0x0, 801, 0, 0 + object_event 1, EVENT_OBJ_GFX_HOOH, 0, 12, 4, 0, 8, 17, 0, 0, 0x0, 801 NavelRock_Top_MapWarps: @ 853DB8C warp_def 13, 20, 3, 1, MAP_NAVEL_ROCK_UP4 diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/events/NewMauville_Inside.inc index 41ef85fcee..5ecd2f8bfd 100644 --- a/data/maps/events/NewMauville_Inside.inc +++ b/data/maps/events/NewMauville_Inside.inc @@ -1,12 +1,12 @@ NewMauville_Inside_EventObjects: @ 85364A8 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 32, 25, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, 1075, 0, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 22, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, 1076, 0, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 39, 4, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291206, 1110, 0, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 17, 10, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291213, 1122, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 11, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291220, 1123, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 25, 18, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_2377AF, 974, 0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 11, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_2377FC, 975, 0, 0 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 10, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_237849, 976, 0, 0 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 25, 3, 1, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, 1075 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 22, 3, 1, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, 1076 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 4, 3, 1, 17, 0, 0, NewMauville_Inside_EventScript_291206, 1110 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 10, 3, 1, 17, 0, 0, NewMauville_Inside_EventScript_291213, 1122 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, 1, 17, 0, 0, NewMauville_Inside_EventScript_291220, 1123 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 18, 3, 1, 17, 0, 0, NewMauville_Inside_EventScript_2377AF, 974 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, 1, 17, 0, 0, NewMauville_Inside_EventScript_2377FC, 975 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 10, 3, 1, 17, 0, 0, NewMauville_Inside_EventScript_237849, 976 NewMauville_Inside_MapWarps: @ 8536568 warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE diff --git a/data/maps/events/OldaleTown.inc b/data/maps/events/OldaleTown.inc index 46fc07609a..c68db0e45b 100644 --- a/data/maps/events/OldaleTown.inc +++ b/data/maps/events/OldaleTown.inc @@ -1,8 +1,8 @@ OldaleTown_EventObjects: @ 8527854 - object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 0, 16, 11, 3, 9, 0, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 13, 7, 3, 8, 0, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 9, 3, 10, 0, 0, 0, 0, OldaleTown_EventScript_1E901F, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 0, 11, 19, 3, 7, 17, 0, 0, 0, OldaleTown_EventScript_1E9070, 979, 0, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 16, 11, 3, 9, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0 + object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 13, 7, 3, 8, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 8, 9, 3, 10, 0, 0, 0, OldaleTown_EventScript_1E901F, 0 + object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 11, 19, 3, 7, 17, 0, 0, OldaleTown_EventScript_1E9070, 979 OldaleTown_MapWarps: @ 85278B4 warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1 diff --git a/data/maps/events/OldaleTown_House1.inc b/data/maps/events/OldaleTown_House1.inc index 6b8cf653bf..a6be12d7aa 100644 --- a/data/maps/events/OldaleTown_House1.inc +++ b/data/maps/events/OldaleTown_House1.inc @@ -1,5 +1,5 @@ OldaleTown_House1_EventObjects: @ 852D7B4 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, 2, 17, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0 OldaleTown_House1_MapWarps: @ 852D7CC warp_def 3, 8, 0, 0, MAP_OLDALE_TOWN diff --git a/data/maps/events/OldaleTown_House2.inc b/data/maps/events/OldaleTown_House2.inc index b083217ced..715dd39aa1 100644 --- a/data/maps/events/OldaleTown_House2.inc +++ b/data/maps/events/OldaleTown_House2.inc @@ -1,6 +1,6 @@ OldaleTown_House2_EventObjects: @ 852D7F0 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF5B, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF64, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, 10, 0, 0, 0, OldaleTown_House2_EventScript_1FBF5B, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 4, 3, 9, 0, 0, 0, OldaleTown_House2_EventScript_1FBF64, 0 OldaleTown_House2_MapWarps: @ 852D820 warp_def 3, 7, 0, 1, MAP_OLDALE_TOWN diff --git a/data/maps/events/OldaleTown_Mart.inc b/data/maps/events/OldaleTown_Mart.inc index ac5678a51b..b5e49095a8 100644 --- a/data/maps/events/OldaleTown_Mart.inc +++ b/data/maps/events/OldaleTown_Mart.inc @@ -1,7 +1,7 @@ OldaleTown_Mart_EventObjects: @ 852D95C - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC240, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC28A, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 9, 4, 3, 3, 16, 0, 0, 0, OldaleTown_Mart_EventScript_1FC2A9, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, OldaleTown_Mart_EventScript_1FC240, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, 10, 0, 0, 0, OldaleTown_Mart_EventScript_1FC28A, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 4, 3, 3, 16, 0, 0, OldaleTown_Mart_EventScript_1FC2A9, 0 OldaleTown_Mart_MapWarps: @ 852D9A4 warp_def 3, 7, 0, 3, MAP_OLDALE_TOWN diff --git a/data/maps/events/OldaleTown_PokemonCenter_1F.inc b/data/maps/events/OldaleTown_PokemonCenter_1F.inc index f8e16522c4..6aff860668 100644 --- a/data/maps/events/OldaleTown_PokemonCenter_1F.inc +++ b/data/maps/events/OldaleTown_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ OldaleTown_PokemonCenter_1F_EventObjects: @ 852D844 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC01A, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC028, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC031, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 3, 7, 3, 10, 17, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC03A, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC01A, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 4, 3, 8, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC028, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 10, 6, 3, 10, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC031, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 3, 7, 3, 10, 17, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC03A, 0 OldaleTown_PokemonCenter_1F_MapWarps: @ 852D8A4 warp_def 7, 8, 3, 2, MAP_OLDALE_TOWN diff --git a/data/maps/events/OldaleTown_PokemonCenter_2F.inc b/data/maps/events/OldaleTown_PokemonCenter_2F.inc index c71b8608de..d0fc7a9d32 100644 --- a/data/maps/events/OldaleTown_PokemonCenter_2F.inc +++ b/data/maps/events/OldaleTown_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ OldaleTown_PokemonCenter_2F_EventObjects: @ 852D8D0 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 3, 8, 17, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 17, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, 702 OldaleTown_PokemonCenter_2F_MapWarps: @ 852D930 warp_def 1, 6, 4, 2, MAP_OLDALE_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/events/PacifidlogTown.inc b/data/maps/events/PacifidlogTown.inc index 1430294e24..ab11ee74ed 100644 --- a/data/maps/events/PacifidlogTown.inc +++ b/data/maps/events/PacifidlogTown.inc @@ -1,7 +1,7 @@ PacifidlogTown_EventObjects: @ 8527DE8 - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 0, 10, 23, 3, 9, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBACC, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 11, 14, 3, 10, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAD5, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 9, 16, 3, 8, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 10, 23, 3, 9, 0, 0, 0, PacifidlogTown_EventScript_1EBACC, 0 + object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 11, 14, 3, 10, 0, 0, 0, PacifidlogTown_EventScript_1EBAD5, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 9, 16, 3, 8, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0 PacifidlogTown_MapWarps: @ 8527E30 warp_def 8, 15, 0, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/events/PacifidlogTown_House1.inc b/data/maps/events/PacifidlogTown_House1.inc index 5734b534a9..21dc0c13f7 100644 --- a/data/maps/events/PacifidlogTown_House1.inc +++ b/data/maps/events/PacifidlogTown_House1.inc @@ -1,6 +1,6 @@ PacifidlogTown_House1_EventObjects: @ 852EBA0 - object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 0, 3, 5, 3, 8, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 6, 4, 3, 9, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 3, 5, 3, 8, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, 9, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0 PacifidlogTown_House1_MapWarps: @ 852EBD0 warp_def 4, 8, 0, 1, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/events/PacifidlogTown_House2.inc b/data/maps/events/PacifidlogTown_House2.inc index 1933cc143e..a16c5220b5 100644 --- a/data/maps/events/PacifidlogTown_House2.inc +++ b/data/maps/events/PacifidlogTown_House2.inc @@ -1,7 +1,7 @@ PacifidlogTown_House2_EventObjects: @ 852EBF4 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 3, 5, 3, 8, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_203792, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 0, 8, 6, 3, 1, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_203891, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 0, 1, 7, 3, 1, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_2038AC, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 5, 3, 8, 17, 0, 0, PacifidlogTown_House2_EventScript_203792, 0 + object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 8, 6, 3, 1, 17, 0, 0, PacifidlogTown_House2_EventScript_203891, 0 + object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 1, 7, 3, 1, 17, 0, 0, PacifidlogTown_House2_EventScript_2038AC, 0 PacifidlogTown_House2_MapWarps: @ 852EC3C warp_def 4, 8, 0, 2, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/events/PacifidlogTown_House3.inc b/data/maps/events/PacifidlogTown_House3.inc index b8573a4347..649f6b2885 100644 --- a/data/maps/events/PacifidlogTown_House3.inc +++ b/data/maps/events/PacifidlogTown_House3.inc @@ -1,6 +1,6 @@ PacifidlogTown_House3_EventObjects: @ 852EC60 - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 0, 3, 5, 3, 18, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_203CB5, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 2, 3, 10, 17, 0, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 3, 5, 3, 18, 0, 0, 0, PacifidlogTown_House3_EventScript_203CB5, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 4, 2, 3, 10, 17, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0 PacifidlogTown_House3_MapWarps: @ 852EC90 warp_def 4, 8, 0, 3, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/events/PacifidlogTown_House4.inc b/data/maps/events/PacifidlogTown_House4.inc index 8363ff2aeb..f9b415d680 100644 --- a/data/maps/events/PacifidlogTown_House4.inc +++ b/data/maps/events/PacifidlogTown_House4.inc @@ -1,7 +1,7 @@ PacifidlogTown_House4_EventObjects: @ 852ECB4 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_203F55, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 7, 5, 3, 2, 17, 0, 0, 0, PacifidlogTown_House4_EventScript_203F4C, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, PacifidlogTown_House4_EventScript_203F5E, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 8, 0, 0, 0, PacifidlogTown_House4_EventScript_203F55, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 7, 5, 3, 2, 17, 0, 0, PacifidlogTown_House4_EventScript_203F4C, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 4, 3, 2, 17, 0, 0, PacifidlogTown_House4_EventScript_203F5E, 0 PacifidlogTown_House4_MapWarps: @ 852ECFC warp_def 4, 8, 0, 4, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/events/PacifidlogTown_House5.inc b/data/maps/events/PacifidlogTown_House5.inc index 9c8ce51fa6..a5548861d4 100644 --- a/data/maps/events/PacifidlogTown_House5.inc +++ b/data/maps/events/PacifidlogTown_House5.inc @@ -1,6 +1,6 @@ PacifidlogTown_House5_EventObjects: @ 852ED20 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204111, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 3, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204137, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 4, 3, 10, 0, 0, 0, PacifidlogTown_House5_EventScript_204111, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 4, 3, 10, 0, 0, 0, PacifidlogTown_House5_EventScript_204137, 0 PacifidlogTown_House5_MapWarps: @ 852ED50 warp_def 4, 8, 0, 5, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc index 6448139c35..13525ab164 100644 --- a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc +++ b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc @@ -1,9 +1,9 @@ PacifidlogTown_PokemonCenter_1F_EventObjects: @ 852EA70 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034B6, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 10, 6, 3, 9, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034D6, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 0, 2, 2, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034C4, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 4, 5, 3, 1, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034CD, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 0, 12, 8, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034B6, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 6, 3, 9, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034D6, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 3, 7, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034C4, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 4, 5, 3, 1, 17, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034CD, 0 + object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 12, 8, 3, 7, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0 PacifidlogTown_PokemonCenter_1F_MapWarps: @ 852EAE8 warp_def 7, 8, 3, 0, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc index 2750b18300..3d4626c692 100644 --- a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc +++ b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ PacifidlogTown_PokemonCenter_2F_EventObjects: @ 852EB14 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, 702 PacifidlogTown_PokemonCenter_2F_MapWarps: @ 852EB74 warp_def 1, 6, 4, 2, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/events/PetalburgCity.inc index b8baf44377..a5f45989b0 100644 --- a/data/maps/events/PetalburgCity.inc +++ b/data/maps/events/PetalburgCity.inc @@ -1,13 +1,13 @@ PetalburgCity_EventObjects: @ 8525FD0 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 16, 18, 3, 2, 17, 0, 0, 0, PetalburgCity_EventScript_1DC3FD, 728, 0, 0 - object_event 2, EVENT_OBJ_GFX_WALLY, 0, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 726, 0, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 8, 22, 3, 8, 0, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 20, 10, 3, 3, 16, 0, 0, 0, PetalburgCity_EventScript_1DC488, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 830, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 19, 2, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910B4, 1039, 0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 28, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910C1, 1040, 0, 0 - object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 0, 12, 15, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_SCOTT, 0, 0, 13, 12, 3, 1, 17, 0, 0, 0, 0x0, 995, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 18, 3, 2, 17, 0, 0, PetalburgCity_EventScript_1DC3FD, 728 + object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, 7, 0, 0, 0, 0x0, 726 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, 8, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0 + object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 20, 10, 3, 3, 16, 0, 0, PetalburgCity_EventScript_1DC488, 0 + object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 15, 10, 3, 7, 0, 0, 0, 0x0, 830 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 2, 3, 1, 0, 0, 0, PetalburgCity_EventScript_2910B4, 1039 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 28, 3, 1, 0, 0, 0, PetalburgCity_EventScript_2910C1, 1040 + object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 12, 15, 3, 1, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0 + object_event 9, EVENT_OBJ_GFX_SCOTT, 0, 13, 12, 3, 1, 17, 0, 0, 0x0, 995 PetalburgCity_MapWarps: @ 85260A8 warp_def 10, 19, 0, 0, MAP_PETALBURG_CITY_HOUSE1 diff --git a/data/maps/events/PetalburgCity_Gym.inc b/data/maps/events/PetalburgCity_Gym.inc index 051c825490..26d9921727 100644 --- a/data/maps/events/PetalburgCity_Gym.inc +++ b/data/maps/events/PetalburgCity_Gym.inc @@ -1,15 +1,15 @@ PetalburgCity_Gym_EventObjects: @ 852EDC8 - object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 0, 4, 2, 0, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, 772, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 94, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 81, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 42, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053F6, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 55, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054E6, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 68, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205432, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 16, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205522, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 29, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_20546E, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 3, 109, 3, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_20574F, 781, 0, 0 - object_event 10, EVENT_OBJ_GFX_WALLY, 0, 0, 4, 111, 3, 7, 0, 0, 0, 0, 0x0, 866, 0, 0 - object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 0, 1, 7, 3, 7, 17, 0, 0, 0, 0x0, 824, 0, 0 + object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 2, 0, 8, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, 772 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 94, 3, 8, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 4, 81, 3, 8, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 4, 42, 3, 8, 0, 1, 0, PetalburgCity_Gym_EventScript_2053F6, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 55, 3, 8, 0, 1, 0, PetalburgCity_Gym_EventScript_2054E6, 0 + object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 4, 68, 3, 8, 0, 1, 0, PetalburgCity_Gym_EventScript_205432, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 16, 3, 8, 0, 1, 0, PetalburgCity_Gym_EventScript_205522, 0 + object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 4, 29, 3, 8, 0, 1, 0, PetalburgCity_Gym_EventScript_20546E, 0 + object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 3, 109, 3, 8, 0, 0, 0, PetalburgCity_Gym_EventScript_20574F, 781 + object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, 7, 0, 0, 0, 0x0, 866 + object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 1, 7, 3, 7, 17, 0, 0, 0x0, 824 PetalburgCity_Gym_MapWarps: @ 852EED0 warp_def 4, 111, 3, 2, MAP_PETALBURG_CITY diff --git a/data/maps/events/PetalburgCity_House1.inc b/data/maps/events/PetalburgCity_House1.inc index 2727161ff5..b4667f6ed0 100644 --- a/data/maps/events/PetalburgCity_House1.inc +++ b/data/maps/events/PetalburgCity_House1.inc @@ -1,6 +1,6 @@ PetalburgCity_House1_EventObjects: @ 852F0BC - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 0, 7, 4, 3, 2, 34, 0, 0, 0, PetalburgCity_House1_EventScript_2077A3, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 7, 4, 3, 2, 34, 0, 0, PetalburgCity_House1_EventScript_2077A3, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0 PetalburgCity_House1_MapWarps: @ 852F0EC warp_def 3, 8, 0, 0, MAP_PETALBURG_CITY diff --git a/data/maps/events/PetalburgCity_House2.inc b/data/maps/events/PetalburgCity_House2.inc index 26cc075682..85e686c19f 100644 --- a/data/maps/events/PetalburgCity_House2.inc +++ b/data/maps/events/PetalburgCity_House2.inc @@ -1,6 +1,6 @@ PetalburgCity_House2_EventObjects: @ 852F110 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 2, 5, 3, 2, 17, 0, 0, 0, PetalburgCity_House2_EventScript_2078F3, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, PetalburgCity_House2_EventScript_2078FC, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 5, 3, 2, 17, 0, 0, PetalburgCity_House2_EventScript_2078F3, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 5, 3, 8, 0, 0, 0, PetalburgCity_House2_EventScript_2078FC, 0 PetalburgCity_House2_MapWarps: @ 852F140 warp_def 3, 7, 0, 4, MAP_PETALBURG_CITY diff --git a/data/maps/events/PetalburgCity_Mart.inc b/data/maps/events/PetalburgCity_Mart.inc index d717f14d1a..8dedf60a7b 100644 --- a/data/maps/events/PetalburgCity_Mart.inc +++ b/data/maps/events/PetalburgCity_Mart.inc @@ -1,8 +1,8 @@ PetalburgCity_Mart_EventObjects: @ 852F294 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207D69, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DE8, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 6, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DDF, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, PetalburgCity_Mart_EventScript_207D69, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 9, 4, 3, 10, 0, 0, 0, PetalburgCity_Mart_EventScript_207DE8, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 6, 3, 3, 8, 0, 0, 0, PetalburgCity_Mart_EventScript_207DDF, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, 10, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0 PetalburgCity_Mart_MapWarps: @ 852F2F4 warp_def 3, 7, 0, 5, MAP_PETALBURG_CITY diff --git a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc index fcb50b871a..29b3917f51 100644 --- a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc +++ b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc @@ -1,9 +1,9 @@ PetalburgCity_PokemonCenter_1F_EventObjects: @ 852F164 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_2079FC, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 11, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_291539, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A0A, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 9, 6, 3, 2, 17, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A13, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 5, 4, 3, 1, 17, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_2079FC, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 11, 2, 3, 8, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_291539, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 3, 3, 8, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A0A, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 9, 6, 3, 2, 17, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A13, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 4, 3, 1, 17, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0 PetalburgCity_PokemonCenter_1F_MapWarps: @ 852F1DC warp_def 7, 8, 3, 3, MAP_PETALBURG_CITY diff --git a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc index 3bdcdfb12d..9ebe184efa 100644 --- a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc +++ b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ PetalburgCity_PokemonCenter_2F_EventObjects: @ 852F208 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, 702 PetalburgCity_PokemonCenter_2F_MapWarps: @ 852F268 warp_def 1, 6, 4, 2, MAP_PETALBURG_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/PetalburgCity_WallysHouse.inc b/data/maps/events/PetalburgCity_WallysHouse.inc index 7516e89e17..d681d2b921 100644 --- a/data/maps/events/PetalburgCity_WallysHouse.inc +++ b/data/maps/events/PetalburgCity_WallysHouse.inc @@ -1,6 +1,6 @@ PetalburgCity_WallysHouse_EventObjects: @ 852ED74 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 3, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 3, 4, 3, 10, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 5, 3, 9, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0 PetalburgCity_WallysHouse_MapWarps: @ 852EDA4 warp_def 3, 7, 0, 1, MAP_PETALBURG_CITY diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc index 70153850ce..08fe0e6ae1 100644 --- a/data/maps/events/PetalburgWoods.inc +++ b/data/maps/events/PetalburgWoods.inc @@ -1,17 +1,17 @@ PetalburgWoods_EventObjects: @ 85345E4 - object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 19, 10, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 17, 0, 0 - object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 19, 11, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 18, 0, 0 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 26, 17, 3, 10, 0, 0, 0, 0, 0x0, 725, 0, 0 - object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 0, 26, 20, 3, 1, 0, 0, 0, 0, 0x0, 724, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 45, 7, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_29110F, 1056, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 35, 20, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_291102, 1055, 0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_29111C, 1058, 0, 0 - object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 0, 15, 19, 3, 3, 33, 0, 0, 0, PetalburgWoods_EventScript_22E210, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 7, 32, 3, 22, 0, 0, 1, 3, PetalburgWoods_EventScript_22E26D, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 4, 14, 3, 20, 0, 0, 1, 3, PetalburgWoods_EventScript_22E284, 0, 0, 0 - object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 0, 30, 34, 3, 2, 18, 0, 0, 0, PetalburgWoods_EventScript_22E219, 0, 0, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 26, 3, 1, 17, 0, 0, 0, PetalburgWoods_EventScript_291129, 1117, 0, 0 - object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 0, 33, 5, 3, 1, 17, 0, 0, 0, PetalburgWoods_EventScript_22E222, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 10, 3, 1, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 17 + object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 11, 3, 1, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 18 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 17, 3, 10, 0, 0, 0, 0x0, 725 + object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 26, 20, 3, 1, 0, 0, 0, 0x0, 724 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 45, 7, 3, 8, 0, 0, 0, PetalburgWoods_EventScript_29110F, 1056 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 35, 20, 3, 8, 0, 0, 0, PetalburgWoods_EventScript_291102, 1055 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 8, 3, 1, 0, 0, 0, PetalburgWoods_EventScript_29111C, 1058 + object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 15, 19, 3, 3, 33, 0, 0, PetalburgWoods_EventScript_22E210, 0 + object_event 9, EVENT_OBJ_GFX_BUG_CATCHER, 0, 7, 32, 3, 22, 0, 1, 3, PetalburgWoods_EventScript_22E26D, 0 + object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 4, 14, 3, 20, 0, 1, 3, PetalburgWoods_EventScript_22E284, 0 + object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 30, 34, 3, 2, 18, 0, 0, PetalburgWoods_EventScript_22E219, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 26, 3, 1, 17, 0, 0, PetalburgWoods_EventScript_291129, 1117 + object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 33, 5, 3, 1, 17, 0, 0, PetalburgWoods_EventScript_22E222, 0 PetalburgWoods_MapWarps: @ 853471C warp_def 14, 5, 0, 2, MAP_ROUTE104 diff --git a/data/maps/events/RecordCorner.inc b/data/maps/events/RecordCorner.inc index f10ac533e4..3019e5f3c0 100644 --- a/data/maps/events/RecordCorner.inc +++ b/data/maps/events/RecordCorner.inc @@ -1,5 +1,5 @@ RecordCorner_EventObjects: @ 8539DFC - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 10, 5, 3, 8, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 10, 5, 3, 8, 0, 0, 0, RecordCorner_EventScript_2774C6, 0 RecordCorner_MapWarps: @ 8539E14 warp_def 8, 9, 3, 127, MAP_NONE diff --git a/data/maps/events/Route101.inc b/data/maps/events/Route101.inc index e942526bae..f8c17146b9 100644 --- a/data/maps/events/Route101.inc +++ b/data/maps/events/Route101.inc @@ -1,10 +1,10 @@ Route101_EventObjects: @ 8527E98 - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 16, 8, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 9, 13, 0, 71, 0, 0, 0, 0, 0x0, 720, 0, 0 - object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 0, 7, 14, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBE16, 700, 0, 0 - object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_1, 0, 0, 10, 13, 0, 70, 0, 0, 0, 0, 0x0, 750, 0, 0 - object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 5, 11, 3, 1, 0, 0, 0, 0, Route101_EventScript_272141, 897, 0, 0 - object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 0, 2, 13, 3, 5, 17, 0, 0, 0, Route101_EventScript_1EBE04, 991, 0, 0 + object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 8, 3, 1, 0, 0, 0, Route101_EventScript_1EBDFB, 0 + object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, 71, 0, 0, 0, 0x0, 720 + object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, 1, 0, 0, 0, Route101_EventScript_1EBE16, 700 + object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_1, 0, 10, 13, 0, 70, 0, 0, 0, 0x0, 750 + object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, 1, 0, 0, 0, Route101_EventScript_272141, 897 + object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, 5, 17, 0, 0, Route101_EventScript_1EBE04, 991 Route101_MapCoordEvents: @ 8527F28 coord_event 10, 19, 3, 0, VAR_0x4060, 1, 0, Route101_EventScript_1EBCDE diff --git a/data/maps/events/Route102.inc b/data/maps/events/Route102.inc index 8b1551f09d..68abe716b3 100644 --- a/data/maps/events/Route102.inc +++ b/data/maps/events/Route102.inc @@ -1,13 +1,13 @@ Route102_EventObjects: @ 8527FD8 - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 18, 11, 3, 1, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 33, 14, 3, 8, 0, 0, 1, 3, Route102_EventScript_1EC105, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 25, 15, 3, 7, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 0, 8, 7, 3, 18, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 0, 37, 4, 3, 2, 17, 0, 0, 0, Route102_EventScript_1EC0FC, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 11, 15, 3, 8, 0, 0, 0, 0, Route102_EventScript_290CD8, 1000, 0, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 24, 2, 3, 12, 0, 0, 0, 2, BerryTreeScript, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 25, 2, 3, 12, 0, 0, 0, 1, BerryTreeScript, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 19, 4, 3, 8, 17, 0, 1, 3, Route102_EventScript_1EC1E1, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 18, 11, 3, 1, 0, 0, 0, Route102_EventScript_1EC0E1, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 14, 3, 8, 0, 1, 3, Route102_EventScript_1EC105, 0 + object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, 7, 0, 1, 2, Route102_EventScript_1EC1B3, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, 18, 0, 1, 3, Route102_EventScript_1EC1CA, 0 + object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 37, 4, 3, 2, 17, 0, 0, Route102_EventScript_1EC0FC, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, 8, 0, 0, 0, Route102_EventScript_290CD8, 1000 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 2, 3, 12, 0, 0, 2, BerryTreeScript, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, 12, 0, 0, 1, BerryTreeScript, 0 + object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, 8, 17, 1, 3, Route102_EventScript_1EC1E1, 0 Route102_MapBGEvents: @ 85280B0 bg_event 17, 2, 0, 0, 0, Route102_EventScript_1EC0F3 diff --git a/data/maps/events/Route103.inc b/data/maps/events/Route103.inc index 6d8ab1306b..c7ce68b44b 100644 --- a/data/maps/events/Route103.inc +++ b/data/maps/events/Route103.inc @@ -1,24 +1,24 @@ Route103_EventObjects: @ 85280DC - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 49, 12, 3, 9, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 10, 3, 3, 10, 0, 0, 0, 0, Route103_EventScript_1EC3C1, 723, 0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 71, 11, 3, 18, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 65, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 64, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 50, 8, 3, 26, 16, 0, 1, 3, Route103_EventScript_1EC6D1, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 58, 5, 3, 12, 0, 0, 0, 5, BerryTreeScript, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 59, 5, 3, 12, 0, 0, 0, 6, BerryTreeScript, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 60, 5, 3, 12, 0, 0, 0, 7, BerryTreeScript, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 0, 20, 10, 3, 2, 33, 0, 0, 0, Route103_EventScript_1EC5D9, 0, 0, 0 - object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 7, 3, 3, 2, 17, 0, 0, 0, Route103_EventScript_272141, 898, 0, 0 - object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 0, 56, 13, 3, 10, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0, 0, 0 - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 50, 5, 3, 1, 17, 0, 0, 0, Route103_EventScript_290CE5, 1114, 0, 0 - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 67, 7, 3, 1, 17, 0, 0, 0, Route103_EventScript_2906BB, 18, 0, 0 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 72, 8, 3, 1, 17, 0, 0, 0, Route103_EventScript_2906BB, 19, 0, 0 - object_event 16, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 67, 5, 3, 8, 17, 0, 1, 2, Route103_EventScript_1EC761, 0, 0, 0 - object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 0, 67, 9, 3, 7, 17, 0, 1, 2, Route103_EventScript_1EC74A, 0, 0, 0 - object_event 18, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 36, 6, 1, 26, 49, 0, 1, 5, Route103_EventScript_1EC78F, 0, 0, 0 - object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 36, 13, 1, 25, 49, 0, 1, 5, Route103_EventScript_1EC778, 0, 0, 0 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 64, 7, 0, 1, 17, 0, 0, 0, Route103_EventScript_290CF2, 1137, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 49, 12, 3, 9, 0, 0, 0, Route103_EventScript_1EC5E2, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 10, 3, 3, 10, 0, 0, 0, Route103_EventScript_1EC3C1, 723 + object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 71, 11, 3, 18, 0, 1, 3, Route103_EventScript_1EC5F4, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 12, 3, 8, 0, 1, 1, Route103_EventScript_1EC66E, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 12, 3, 8, 0, 1, 1, Route103_EventScript_1EC60B, 0 + object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 50, 8, 3, 26, 16, 1, 3, Route103_EventScript_1EC6D1, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 58, 5, 3, 12, 0, 0, 5, BerryTreeScript, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 5, 3, 12, 0, 0, 6, BerryTreeScript, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 5, 3, 12, 0, 0, 7, BerryTreeScript, 0 + object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 20, 10, 3, 2, 33, 0, 0, Route103_EventScript_1EC5D9, 0 + object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, 2, 17, 0, 0, Route103_EventScript_272141, 898 + object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 56, 13, 3, 10, 0, 1, 5, Route103_EventScript_1EC6E8, 0 + object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 5, 3, 1, 17, 0, 0, Route103_EventScript_290CE5, 1114 + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, 1, 17, 0, 0, Route103_EventScript_2906BB, 18 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 72, 8, 3, 1, 17, 0, 0, Route103_EventScript_2906BB, 19 + object_event 16, EVENT_OBJ_GFX_BLACK_BELT, 0, 67, 5, 3, 8, 17, 1, 2, Route103_EventScript_1EC761, 0 + object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 67, 9, 3, 7, 17, 1, 2, Route103_EventScript_1EC74A, 0 + object_event 18, EVENT_OBJ_GFX_SWIMMER_F, 0, 36, 6, 1, 26, 49, 1, 5, Route103_EventScript_1EC78F, 0 + object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 13, 1, 25, 49, 1, 5, Route103_EventScript_1EC778, 0 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 7, 0, 1, 17, 0, 0, Route103_EventScript_290CF2, 1137 Route103_MapWarps: @ 85282BC warp_def 45, 6, 0, 0, MAP_ALTERING_CAVE diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc index d4dd12b70d..6d35c1bee2 100644 --- a/data/maps/events/Route104.inc +++ b/data/maps/events/Route104.inc @@ -1,38 +1,38 @@ Route104_EventObjects: @ 85282E4 - object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 15, 60, 3, 9, 0, 0, 0, 0, Route104_EventScript_1ED00F, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 0, 25, 49, 3, 2, 17, 0, 0, 0, Route104_EventScript_1ED006, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 31, 24, 3, 9, 0, 0, 1, 7, Route104_EventScript_1ED38D, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 0, 27, 63, 3, 3, 16, 0, 0, 0, Route104_EventScript_1ED045, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 30, 50, 3, 2, 17, 0, 0, 0, Route104_EventScript_1ED04E, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 0, 28, 74, 3, 7, 0, 0, 0, 0, Route104_EventScript_1ED090, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 12, 54, 1, 7, 0, 0, 0, 0, 0x0, 742, 0, 0 - object_event 8, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 51, 4, 10, 0, 0, 0, 0, 0x0, 738, 0, 0 - object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 29, 8, 3, 8, 0, 0, 1, 0, Route104_EventScript_1ED35F, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 34, 6, 3, 12, 0, 0, 0, 8, BerryTreeScript, 0, 0, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 35, 6, 3, 12, 0, 0, 0, 9, BerryTreeScript, 0, 0, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 36, 6, 3, 12, 0, 0, 0, 10, BerryTreeScript, 0, 0, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 22, 41, 3, 12, 0, 0, 0, 11, BerryTreeScript, 0, 0, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 23, 41, 3, 12, 0, 0, 0, 12, BerryTreeScript, 0, 0, 0 - object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 24, 41, 3, 12, 0, 0, 0, 13, BerryTreeScript, 0, 0, 0 - object_event 16, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 37, 8, 3, 9, 17, 0, 0, 0, Route104_EventScript_1ECF8C, 0, 0, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 3, 22, 3, 12, 0, 0, 0, 3, BerryTreeScript, 0, 0, 0 - object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 3, 23, 3, 12, 0, 0, 0, 4, BerryTreeScript, 0, 0, 0 - object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 3, 24, 3, 12, 0, 0, 0, 75, BerryTreeScript, 0, 0, 0 - object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 3, 25, 3, 12, 0, 0, 0, 76, BerryTreeScript, 0, 0, 0 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 39, 15, 3, 1, 0, 0, 0, 0, Route104_EventScript_290CFF, 1002, 0, 0 - object_event 22, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 8, 19, 3, 5, 1, 0, 0, 0, Route104_EventScript_1ECFCD, 906, 0, 0 - object_event 23, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 27, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED597, 0, 0, 0 - object_event 24, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 28, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED5B6, 0, 0, 0 - object_event 25, EVENT_OBJ_GFX_BOY_4, 0, 0, 21, 25, 3, 23, 0, 0, 1, 3, Route104_EventScript_1ED43B, 0, 0, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 11, 44, 3, 16, 0, 0, 1, 3, Route104_EventScript_1ED4E9, 0, 0, 0 - object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 53, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D0C, 1057, 0, 0 - object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 18, 67, 3, 46, 101, 0, 1, 2, Route104_EventScript_1ED376, 0, 0, 0 - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 22, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D19, 1115, 0, 0 - object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 35, 22, 3, 1, 17, 0, 0, 0, Route104_EventScript_2906BB, 17, 0, 0 - object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 8, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D26, 1135, 0, 0 - object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 0, 5, 26, 3, 1, 17, 0, 0, 0, Route104_EventScript_1ED057, 0, 0, 0 - object_event 33, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 15, 59, 3, 9, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0, 0, 0 - object_event 34, EVENT_OBJ_GFX_HIPSTER, 0, 0, 17, 50, 0, 1, 17, 0, 0, 0, Route104_EventScript_1ECC9E, 719, 0, 0 + object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 15, 60, 3, 9, 0, 0, 0, Route104_EventScript_1ED00F, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 25, 49, 3, 2, 17, 0, 0, Route104_EventScript_1ED006, 0 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 31, 24, 3, 9, 0, 1, 7, Route104_EventScript_1ED38D, 0 + object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 27, 63, 3, 3, 16, 0, 0, Route104_EventScript_1ED045, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 30, 50, 3, 2, 17, 0, 0, Route104_EventScript_1ED04E, 0 + object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 28, 74, 3, 7, 0, 0, 0, Route104_EventScript_1ED090, 0 + object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 54, 1, 7, 0, 0, 0, 0x0, 742 + object_event 8, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 51, 4, 10, 0, 0, 0, 0x0, 738 + object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 29, 8, 3, 8, 0, 1, 0, Route104_EventScript_1ED35F, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 6, 3, 12, 0, 0, 8, BerryTreeScript, 0 + object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 6, 3, 12, 0, 0, 9, BerryTreeScript, 0 + object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 6, 3, 12, 0, 0, 10, BerryTreeScript, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 41, 3, 12, 0, 0, 11, BerryTreeScript, 0 + object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 41, 3, 12, 0, 0, 12, BerryTreeScript, 0 + object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 41, 3, 12, 0, 0, 13, BerryTreeScript, 0 + object_event 16, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 37, 8, 3, 9, 17, 0, 0, Route104_EventScript_1ECF8C, 0 + object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 22, 3, 12, 0, 0, 3, BerryTreeScript, 0 + object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 23, 3, 12, 0, 0, 4, BerryTreeScript, 0 + object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 24, 3, 12, 0, 0, 75, BerryTreeScript, 0 + object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 25, 3, 12, 0, 0, 76, BerryTreeScript, 0 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 15, 3, 1, 0, 0, 0, Route104_EventScript_290CFF, 1002 + object_event 22, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 19, 3, 5, 1, 0, 0, Route104_EventScript_1ECFCD, 906 + object_event 23, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 15, 3, 8, 0, 1, 1, Route104_EventScript_1ED597, 0 + object_event 24, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 15, 3, 8, 0, 1, 1, Route104_EventScript_1ED5B6, 0 + object_event 25, EVENT_OBJ_GFX_BOY_4, 0, 21, 25, 3, 23, 0, 1, 3, Route104_EventScript_1ED43B, 0 + object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 44, 3, 16, 0, 1, 3, Route104_EventScript_1ED4E9, 0 + object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, 1, 17, 0, 0, Route104_EventScript_290D0C, 1057 + object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 18, 67, 3, 46, 101, 1, 2, Route104_EventScript_1ED376, 0 + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 22, 3, 1, 17, 0, 0, Route104_EventScript_290D19, 1115 + object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 22, 3, 1, 17, 0, 0, Route104_EventScript_2906BB, 17 + object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 8, 3, 1, 17, 0, 0, Route104_EventScript_290D26, 1135 + object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 5, 26, 3, 1, 17, 0, 0, Route104_EventScript_1ED057, 0 + object_event 33, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 59, 3, 9, 0, 1, 0, Route104_EventScript_1ED5D5, 0 + object_event 34, EVENT_OBJ_GFX_HIPSTER, 0, 17, 50, 0, 1, 17, 0, 0, Route104_EventScript_1ECC9E, 719 Route104_MapWarps: @ 8528614 warp_def 17, 50, 0, 0, MAP_ROUTE104_MR_BRINEYS_HOUSE diff --git a/data/maps/events/Route104_MrBrineysHouse.inc b/data/maps/events/Route104_MrBrineysHouse.inc index a1240dba4c..d14d62c2b0 100644 --- a/data/maps/events/Route104_MrBrineysHouse.inc +++ b/data/maps/events/Route104_MrBrineysHouse.inc @@ -1,6 +1,6 @@ Route104_MrBrineysHouse_EventObjects: @ 8533AD4 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 3, 3, 50, 51, 0, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, 739, 0, 0 - object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 0, 6, 3, 3, 8, 51, 0, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, 881, 0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 3, 3, 50, 51, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, 739 + object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, 8, 51, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, 881 Route104_MrBrineysHouse_MapWarps: @ 8533B04 warp_def 5, 8, 0, 0, MAP_ROUTE104 diff --git a/data/maps/events/Route104_PrettyPetalFlowerShop.inc b/data/maps/events/Route104_PrettyPetalFlowerShop.inc index 8464ada1d5..abd57bcd0b 100644 --- a/data/maps/events/Route104_PrettyPetalFlowerShop.inc +++ b/data/maps/events/Route104_PrettyPetalFlowerShop.inc @@ -1,7 +1,7 @@ Route104_PrettyPetalFlowerShop_EventObjects: @ 8533B28 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 0, 3, 3, 10, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A373, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 7, 3, 3, 5, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A40C, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 0, 11, 6, 4, 2, 34, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A442, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 3, 10, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A373, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 3, 3, 5, 1, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A40C, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 11, 6, 4, 2, 34, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A442, 0 Route104_PrettyPetalFlowerShop_MapWarps: @ 8533B70 warp_def 2, 8, 0, 1, MAP_ROUTE104 diff --git a/data/maps/events/Route105.inc b/data/maps/events/Route105.inc index 67a1c72bb6..4654b470a9 100644 --- a/data/maps/events/Route105.inc +++ b/data/maps/events/Route105.inc @@ -1,12 +1,12 @@ Route105_EventObjects: @ 85286F0 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 19, 60, 1, 10, 0, 0, 1, 6, Route105_EventScript_1EE261, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 27, 36, 1, 27, 7, 0, 1, 3, Route105_EventScript_1EE278, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 8, 45, 1, 25, 112, 0, 1, 3, Route105_EventScript_1EE28F, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 19, 9, 1, 24, 80, 0, 1, 3, Route105_EventScript_1EE2A6, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 73, 3, 1, 0, 0, 0, 0, Route105_EventScript_290D33, 1003, 0, 0 - object_event 6, EVENT_OBJ_GFX_HIKER, 0, 0, 17, 48, 3, 26, 112, 0, 1, 3, Route105_EventScript_1EE24A, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 0, 4, 54, 3, 8, 32, 0, 1, 2, Route105_EventScript_1EE2BD, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_HIKER, 0, 0, 4, 58, 3, 7, 32, 0, 1, 4, Route105_EventScript_1EE2D4, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 19, 60, 1, 10, 0, 1, 6, Route105_EventScript_1EE261, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 36, 1, 27, 7, 1, 3, Route105_EventScript_1EE278, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 45, 1, 25, 112, 1, 3, Route105_EventScript_1EE28F, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 19, 9, 1, 24, 80, 1, 3, Route105_EventScript_1EE2A6, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, 1, 0, 0, 0, Route105_EventScript_290D33, 1003 + object_event 6, EVENT_OBJ_GFX_HIKER, 0, 17, 48, 3, 26, 112, 1, 3, Route105_EventScript_1EE24A, 0 + object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 4, 54, 3, 8, 32, 1, 2, Route105_EventScript_1EE2BD, 0 + object_event 8, EVENT_OBJ_GFX_HIKER, 0, 4, 58, 3, 7, 32, 1, 4, Route105_EventScript_1EE2D4, 0 Route105_MapWarps: @ 85287B0 warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE diff --git a/data/maps/events/Route106.inc b/data/maps/events/Route106.inc index aac7938118..2697c42404 100644 --- a/data/maps/events/Route106.inc +++ b/data/maps/events/Route106.inc @@ -1,9 +1,9 @@ Route106_EventObjects: @ 85287E4 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 18, 5, 1, 27, 4, 0, 1, 3, Route106_EventScript_1EE493, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 29, 10, 1, 1, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 51, 14, 3, 10, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 65, 14, 3, 1, 0, 0, 1, 3, Route106_EventScript_1EE523, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 14, 3, 1, 0, 0, 0, 0, Route106_EventScript_290D40, 1004, 0, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 5, 1, 27, 4, 1, 3, Route106_EventScript_1EE493, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 29, 10, 1, 1, 0, 1, 3, Route106_EventScript_1EE4AA, 0 + object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, 10, 0, 1, 4, Route106_EventScript_1EE4C1, 0 + object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, 1, 0, 1, 3, Route106_EventScript_1EE523, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, 1, 0, 0, 0, Route106_EventScript_290D40, 1004 Route106_MapWarps: @ 852885C warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F diff --git a/data/maps/events/Route107.inc b/data/maps/events/Route107.inc index 87d734ed4e..609c6a8084 100644 --- a/data/maps/events/Route107.inc +++ b/data/maps/events/Route107.inc @@ -1,11 +1,11 @@ Route107_EventObjects: @ 85288A8 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 41, 10, 1, 24, 17, 0, 1, 3, Route107_EventScript_1EE595, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 23, 11, 1, 52, 38, 0, 1, 2, Route107_EventScript_1EE5AC, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 16, 7, 1, 13, 0, 0, 1, 5, Route107_EventScript_1EE60E, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 50, 11, 1, 65, 17, 0, 1, 5, Route107_EventScript_1EE625, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 33, 4, 1, 8, 17, 0, 1, 1, Route107_EventScript_1EE63C, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 32, 4, 1, 8, 17, 0, 1, 1, Route107_EventScript_1EE657, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 50, 5, 1, 64, 17, 0, 1, 5, Route107_EventScript_1EE672, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 10, 1, 24, 17, 1, 3, Route107_EventScript_1EE595, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 23, 11, 1, 52, 38, 1, 2, Route107_EventScript_1EE5AC, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 16, 7, 1, 13, 0, 1, 5, Route107_EventScript_1EE60E, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 50, 11, 1, 65, 17, 1, 5, Route107_EventScript_1EE625, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 4, 1, 8, 17, 1, 1, Route107_EventScript_1EE63C, 0 + object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 4, 1, 8, 17, 1, 1, Route107_EventScript_1EE657, 0 + object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 50, 5, 1, 64, 17, 1, 5, Route107_EventScript_1EE672, 0 Route107_MapEvents:: @ 8528950 map_events Route107_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route108.inc b/data/maps/events/Route108.inc index 81c1fb79c3..64e9f746c9 100644 --- a/data/maps/events/Route108.inc +++ b/data/maps/events/Route108.inc @@ -1,11 +1,11 @@ Route108_EventObjects: @ 8528964 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 52, 13, 1, 45, 51, 0, 1, 3, Route108_EventScript_1EE68A, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 35, 12, 1, 13, 17, 0, 1, 3, Route108_EventScript_1EE6B8, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 13, 13, 1, 24, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 8, 7, 1, 20, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 41, 5, 3, 10, 17, 0, 1, 1, Route108_EventScript_1EE6E6, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 0, 43, 5, 3, 9, 17, 0, 1, 1, Route108_EventScript_1EE6FD, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 42, 4, 3, 1, 17, 0, 0, 0, Route108_EventScript_290D4D, 1139, 0, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 13, 1, 45, 51, 1, 3, Route108_EventScript_1EE68A, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 12, 1, 13, 17, 1, 3, Route108_EventScript_1EE6B8, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 13, 1, 24, 0, 1, 3, Route108_EventScript_1EE6A1, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 7, 1, 20, 6, 1, 3, Route108_EventScript_1EE6CF, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 41, 5, 3, 10, 17, 1, 1, Route108_EventScript_1EE6E6, 0 + object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 43, 5, 3, 9, 17, 1, 1, Route108_EventScript_1EE6FD, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 4, 3, 1, 17, 0, 0, Route108_EventScript_290D4D, 1139 Route108_MapWarps: @ 8528A0C warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK diff --git a/data/maps/events/Route109.inc b/data/maps/events/Route109.inc index a5e210b51b..e21a54ab2c 100644 --- a/data/maps/events/Route109.inc +++ b/data/maps/events/Route109.inc @@ -1,28 +1,28 @@ Route109_EventObjects: @ 8528A34 - object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 21, 26, 1, 7, 0, 0, 0, 0, 0x0, 744, 0, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 21, 24, 3, 7, 0, 0, 0, 0, Route109_EventScript_1EE910, 741, 0, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 12, 36, 3, 10, 0, 0, 1, 5, Route109_EventScript_1EEA3D, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 25, 39, 1, 15, 0, 0, 1, 5, Route109_EventScript_1EEA54, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 0, 15, 17, 4, 8, 0, 0, 1, 1, Route109_EventScript_1EEA6B, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 0, 24, 13, 3, 9, 0, 0, 1, 6, Route109_EventScript_1EEA82, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 0, 19, 10, 3, 8, 0, 0, 1, 3, Route109_EventScript_1EEA99, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 0, 22, 7, 3, 80, 0, 0, 1, 4, Route109_EventScript_1EEAFB, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 11, 6, 3, 8, 0, 0, 0, 0, Route109_EventScript_1EE995, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 27, 46, 3, 1, 0, 0, 0, 0, Route109_EventScript_290D5A, 1005, 0, 0 - object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 0, 29, 32, 3, 13, 0, 0, 1, 3, Route109_EventScript_1EEB74, 0, 0, 0 - object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 0, 28, 31, 3, 17, 0, 0, 1, 3, Route109_EventScript_1EEB5D, 0, 0, 0 - object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 21, 56, 0, 9, 0, 0, 1, 3, Route109_EventScript_1EEB8B, 0, 0, 0 - object_event 14, EVENT_OBJ_GFX_TUBER_M, 0, 0, 24, 18, 3, 10, 17, 0, 0, 0, Route109_EventScript_1EE99E, 0, 0, 0 - object_event 15, EVENT_OBJ_GFX_TUBER_F, 0, 0, 25, 18, 3, 9, 17, 0, 0, 0, Route109_EventScript_1EE9B5, 0, 0, 0 - object_event 16, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 30, 32, 3, 8, 17, 0, 0, 0, Route109_EventScript_1EEA06, 0, 0, 0 - object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 8, 41, 3, 8, 17, 0, 1, 1, Route109_EventScript_1EEBBD, 0, 0, 0 - object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 0, 9, 41, 3, 8, 17, 0, 1, 1, Route109_EventScript_1EEBA2, 0, 0, 0 - object_event 19, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 33, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_1EEA0F, 0, 0, 0 - object_event 20, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 32, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_1EEA18, 0, 0, 0 - object_event 21, EVENT_OBJ_GFX_TUBER_F, 0, 0, 17, 13, 3, 80, 17, 0, 1, 6, Route109_EventScript_1EEBEF, 0, 0, 0 - object_event 22, EVENT_OBJ_GFX_TUBER_M, 0, 0, 27, 7, 3, 79, 17, 0, 1, 4, Route109_EventScript_1EEBD8, 0, 0, 0 - object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 25, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_290D67, 1140, 0, 0 - object_event 24, EVENT_OBJ_GFX_MAN_6, 0, 0, 17, 56, 3, 80, 17, 0, 1, 3, Route109_EventScript_1EEC06, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, 7, 0, 0, 0, 0x0, 744 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 21, 24, 3, 7, 0, 0, 0, Route109_EventScript_1EE910, 741 + object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 12, 36, 3, 10, 0, 1, 5, Route109_EventScript_1EEA3D, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 25, 39, 1, 15, 0, 1, 5, Route109_EventScript_1EEA54, 0 + object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 15, 17, 4, 8, 0, 1, 1, Route109_EventScript_1EEA6B, 0 + object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 24, 13, 3, 9, 0, 1, 6, Route109_EventScript_1EEA82, 0 + object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 19, 10, 3, 8, 0, 1, 3, Route109_EventScript_1EEA99, 0 + object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 22, 7, 3, 80, 0, 1, 4, Route109_EventScript_1EEAFB, 0 + object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 11, 6, 3, 8, 0, 0, 0, Route109_EventScript_1EE995, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 46, 3, 1, 0, 0, 0, Route109_EventScript_290D5A, 1005 + object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 29, 32, 3, 13, 0, 1, 3, Route109_EventScript_1EEB74, 0 + object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 28, 31, 3, 17, 0, 1, 3, Route109_EventScript_1EEB5D, 0 + object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 21, 56, 0, 9, 0, 1, 3, Route109_EventScript_1EEB8B, 0 + object_event 14, EVENT_OBJ_GFX_TUBER_M, 0, 24, 18, 3, 10, 17, 0, 0, Route109_EventScript_1EE99E, 0 + object_event 15, EVENT_OBJ_GFX_TUBER_F, 0, 25, 18, 3, 9, 17, 0, 0, Route109_EventScript_1EE9B5, 0 + object_event 16, EVENT_OBJ_GFX_WOMAN_2, 0, 30, 32, 3, 8, 17, 0, 0, Route109_EventScript_1EEA06, 0 + object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 41, 3, 8, 17, 1, 1, Route109_EventScript_1EEBBD, 0 + object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 9, 41, 3, 8, 17, 1, 1, Route109_EventScript_1EEBA2, 0 + object_event 19, EVENT_OBJ_GFX_OLD_MAN_2, 0, 33, 6, 3, 1, 17, 0, 0, Route109_EventScript_1EEA0F, 0 + object_event 20, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 32, 6, 3, 1, 17, 0, 0, Route109_EventScript_1EEA18, 0 + object_event 21, EVENT_OBJ_GFX_TUBER_F, 0, 17, 13, 3, 80, 17, 1, 6, Route109_EventScript_1EEBEF, 0 + object_event 22, EVENT_OBJ_GFX_TUBER_M, 0, 27, 7, 3, 79, 17, 1, 4, Route109_EventScript_1EEBD8, 0 + object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 6, 3, 1, 17, 0, 0, Route109_EventScript_290D67, 1140 + object_event 24, EVENT_OBJ_GFX_MAN_6, 0, 17, 56, 3, 80, 17, 1, 3, Route109_EventScript_1EEC06, 0 Route109_MapWarps: @ 8528C74 warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE diff --git a/data/maps/events/Route109_SeashoreHouse.inc b/data/maps/events/Route109_SeashoreHouse.inc index d7d9ab49ad..4812c3d068 100644 --- a/data/maps/events/Route109_SeashoreHouse.inc +++ b/data/maps/events/Route109_SeashoreHouse.inc @@ -1,8 +1,8 @@ Route109_SeashoreHouse_EventObjects: @ 853DDE8 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 2, 3, 8, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_2693FE, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 2, 3, 3, 8, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694E2, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 0, 14, 9, 3, 9, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_269518, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 0, 10, 5, 3, 14, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694FD, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 2, 3, 8, 0, 0, 0, Route109_SeashoreHouse_EventScript_2693FE, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, 8, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694E2, 0 + object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 14, 9, 3, 9, 0, 1, 2, Route109_SeashoreHouse_EventScript_269518, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 10, 5, 3, 14, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694FD, 0 Route109_SeashoreHouse_MapWarps: @ 853DE48 warp_def 6, 9, 0, 0, MAP_ROUTE109 diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc index 5ba0484828..3fc6257cc3 100644 --- a/data/maps/events/Route110.inc +++ b/data/maps/events/Route110.inc @@ -1,40 +1,40 @@ Route110_EventObjects: @ 8528CF0 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 0, 17, 90, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF338, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 29, 79, 4, 8, 0, 0, 0, 0, Route110_EventScript_1EF32F, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 14, 69, 3, 3, 16, 0, 0, 0, Route110_EventScript_1EF326, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 9, 57, 4, 2, 17, 0, 0, 0, Route110_EventScript_1EF314, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 10, 11, 3, 2, 17, 0, 0, 0, Route110_EventScript_1EF31D, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 27, 24, 4, 2, 49, 0, 0, 0, Route110_EventScript_1EF30B, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_BOY_3, 0, 0, 15, 7, 3, 2, 17, 0, 0, 0, Route110_EventScript_1EF302, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 16, 73, 4, 49, 226, 0, 1, 3, Route110_EventScript_1EF529, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 19, 31, 4, 51, 26, 0, 1, 3, Route110_EventScript_1EF4B0, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 30, 31, 4, 9, 17, 0, 1, 4, Route110_EventScript_1EF540, 0, 0, 0 - object_event 11, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 16, 55, 4, 45, 68, 0, 1, 3, Route110_EventScript_1EF4C7, 0, 0, 0 - object_event 12, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 3, 39, 3, 10, 0, 0, 1, 6, Route110_EventScript_1EF3F2, 0, 0, 0 - object_event 13, EVENT_OBJ_GFX_LASS, 0, 0, 33, 15, 3, 9, 0, 0, 1, 1, Route110_EventScript_1EF409, 0, 0, 0 - object_event 14, EVENT_OBJ_GFX_MANIAC, 0, 0, 34, 40, 3, 67, 0, 0, 1, 4, Route110_EventScript_1EF420, 0, 0, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 10, 19, 3, 8, 0, 0, 1, 1, Route110_EventScript_1EF482, 0, 0, 0 - object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 5, 11, 3, 12, 0, 0, 0, 16, BerryTreeScript, 0, 0, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 6, 11, 3, 12, 0, 0, 0, 17, BerryTreeScript, 0, 0, 0 - object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 7, 11, 3, 12, 0, 0, 0, 18, BerryTreeScript, 0, 0, 0 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 30, 69, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D81, 1007, 0, 0 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 26, 47, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D74, 1006, 0, 0 - object_event 21, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 27, 92, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF3B7, 0, 0, 0 - object_event 22, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 7, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2AA, 900, 0, 0 - object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2C0, 900, 0, 0 - object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 9, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2D6, 900, 0, 0 - object_event 25, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2EC, 900, 0, 0 - object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 82, 3, 8, 0, 0, 0, 0, 0x0, 900, 0, 0 - object_event 27, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 21, 78, 4, 51, 23, 0, 1, 2, Route110_EventScript_1EF499, 0, 0, 0 - object_event 28, EVENT_OBJ_GFX_HIPSTER, 0, 0, 34, 54, 3, 14, 0, 0, 0, 0, 0x0, 919, 0, 0 - object_event 29, EVENT_OBJ_GFX_GIDDY, 0, 0, 34, 54, 3, 8, 0, 0, 0, 0, 0x0, 922, 0, 0 - object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 33, 69, 3, 14, 0, 0, 1, 3, Route110_EventScript_1EF604, 0, 0, 0 - object_event 31, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 10, 76, 3, 9, 0, 0, 1, 2, Route110_EventScript_1EF5A2, 0, 0, 0 - object_event 32, EVENT_OBJ_GFX_MAN_3, 0, 0, 7, 76, 3, 10, 17, 0, 1, 2, Route110_EventScript_1EF61C, 0, 0, 0 - object_event 33, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 10, 39, 3, 9, 17, 0, 1, 6, Route110_EventScript_1EF64A, 0, 0, 0 - object_event 34, EVENT_OBJ_GFX_MAN_6, 0, 0, 36, 40, 3, 66, 17, 0, 1, 3, Route110_EventScript_1EF633, 0, 0, 0 - object_event 35, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 38, 3, 1, 17, 0, 0, 0, Route110_EventScript_290D8E, 1141, 0, 0 - object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 9, 79, 3, 1, 17, 0, 0, 0, 0x0, 837, 0, 0 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 17, 90, 3, 8, 0, 0, 0, Route110_EventScript_1EF338, 0 + object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 29, 79, 4, 8, 0, 0, 0, Route110_EventScript_1EF32F, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 14, 69, 3, 3, 16, 0, 0, Route110_EventScript_1EF326, 0 + object_event 4, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 9, 57, 4, 2, 17, 0, 0, Route110_EventScript_1EF314, 0 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 11, 3, 2, 17, 0, 0, Route110_EventScript_1EF31D, 0 + object_event 6, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 27, 24, 4, 2, 49, 0, 0, Route110_EventScript_1EF30B, 0 + object_event 7, EVENT_OBJ_GFX_BOY_3, 0, 15, 7, 3, 2, 17, 0, 0, Route110_EventScript_1EF302, 0 + object_event 8, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 16, 73, 4, 49, 226, 1, 3, Route110_EventScript_1EF529, 0 + object_event 9, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 31, 4, 51, 26, 1, 3, Route110_EventScript_1EF4B0, 0 + object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 30, 31, 4, 9, 17, 1, 4, Route110_EventScript_1EF540, 0 + object_event 11, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 16, 55, 4, 45, 68, 1, 3, Route110_EventScript_1EF4C7, 0 + object_event 12, EVENT_OBJ_GFX_PSYCHIC_M, 0, 3, 39, 3, 10, 0, 1, 6, Route110_EventScript_1EF3F2, 0 + object_event 13, EVENT_OBJ_GFX_LASS, 0, 33, 15, 3, 9, 0, 1, 1, Route110_EventScript_1EF409, 0 + object_event 14, EVENT_OBJ_GFX_MANIAC, 0, 34, 40, 3, 67, 0, 1, 4, Route110_EventScript_1EF420, 0 + object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 10, 19, 3, 8, 0, 1, 1, Route110_EventScript_1EF482, 0 + object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 11, 3, 12, 0, 0, 16, BerryTreeScript, 0 + object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 11, 3, 12, 0, 0, 17, BerryTreeScript, 0 + object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 11, 3, 12, 0, 0, 18, BerryTreeScript, 0 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 69, 3, 1, 0, 0, 0, Route110_EventScript_290D81, 1007 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 47, 3, 1, 0, 0, 0, Route110_EventScript_290D74, 1006 + object_event 21, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 92, 3, 8, 0, 0, 0, Route110_EventScript_1EF3B7, 0 + object_event 22, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 83, 3, 7, 0, 0, 0, Route110_EventScript_1EF2AA, 900 + object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 83, 3, 7, 0, 0, 0, Route110_EventScript_1EF2C0, 900 + object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 83, 3, 7, 0, 0, 0, Route110_EventScript_1EF2D6, 900 + object_event 25, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 83, 3, 7, 0, 0, 0, Route110_EventScript_1EF2EC, 900 + object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 82, 3, 8, 0, 0, 0, 0x0, 900 + object_event 27, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 78, 4, 51, 23, 1, 2, Route110_EventScript_1EF499, 0 + object_event 28, EVENT_OBJ_GFX_HIPSTER, 0, 34, 54, 3, 14, 0, 0, 0, 0x0, 919 + object_event 29, EVENT_OBJ_GFX_GIDDY, 0, 34, 54, 3, 8, 0, 0, 0, 0x0, 922 + object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 69, 3, 14, 0, 1, 3, Route110_EventScript_1EF604, 0 + object_event 31, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 76, 3, 9, 0, 1, 2, Route110_EventScript_1EF5A2, 0 + object_event 32, EVENT_OBJ_GFX_MAN_3, 0, 7, 76, 3, 10, 17, 1, 2, Route110_EventScript_1EF61C, 0 + object_event 33, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 10, 39, 3, 9, 17, 1, 6, Route110_EventScript_1EF64A, 0 + object_event 34, EVENT_OBJ_GFX_MAN_6, 0, 36, 40, 3, 66, 17, 1, 3, Route110_EventScript_1EF633, 0 + object_event 35, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 38, 3, 1, 17, 0, 0, Route110_EventScript_290D8E, 1141 + object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 79, 3, 1, 17, 0, 0, 0x0, 837 Route110_MapWarps: @ 8529050 warp_def 35, 24, 3, 0, MAP_NEW_MAUVILLE_ENTRANCE diff --git a/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc b/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc index 86f8883a36..c84b06c1a3 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc +++ b/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc @@ -1,5 +1,5 @@ Route110_SeasideCyclingRoadEntrance1_EventObjects: @ 853E9A0 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78, 0 Route110_SeasideCyclingRoadEntrance1_MapWarps: @ 853E9B8 warp_def 1, 5, 0, 4, MAP_ROUTE110 diff --git a/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc b/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc index 245dc0eaf2..4f9ea356c5 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc +++ b/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc @@ -1,5 +1,5 @@ Route110_SeasideCyclingRoadEntrance2_EventObjects: @ 853EA0C - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4, 0 Route110_SeasideCyclingRoadEntrance2_MapWarps: @ 853EA24 warp_def 1, 5, 0, 2, MAP_ROUTE110 diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/events/Route110_TrickHouseEnd.inc index 5acd3d9fb5..d868b6cd09 100644 --- a/data/maps/events/Route110_TrickHouseEnd.inc +++ b/data/maps/events/Route110_TrickHouseEnd.inc @@ -1,5 +1,5 @@ Route110_TrickHouseEnd_EventObjects: @ 853DEFC - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, 899, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, 10, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, 899 Route110_TrickHouseEnd_MapWarps: @ 853DF14 warp_def 10, 1, 3, 2, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/events/Route110_TrickHouseEntrance.inc index ff7c2182e0..3ce8e59427 100644 --- a/data/maps/events/Route110_TrickHouseEntrance.inc +++ b/data/maps/events/Route110_TrickHouseEntrance.inc @@ -1,5 +1,5 @@ Route110_TrickHouseEntrance_EventObjects: @ 853DE6C - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 6, 2, 3, 9, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, 872, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 2, 3, 9, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, 872 Route110_TrickHouseEntrance_MapWarps: @ 853DE84 warp_def 5, 7, 3, 1, MAP_ROUTE110 diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/events/Route110_TrickHousePuzzle1.inc index 56ec5beaa8..f3abb09d7d 100644 --- a/data/maps/events/Route110_TrickHousePuzzle1.inc +++ b/data/maps/events/Route110_TrickHousePuzzle1.inc @@ -1,19 +1,19 @@ Route110_TrickHousePuzzle1_EventObjects: @ 853DF88 - object_event 1, EVENT_OBJ_GFX_LASS, 0, 0, 14, 20, 3, 9, 0, 0, 1, 6, Route110_TrickHousePuzzle1_EventScript_26B948, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 14, 8, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B95F, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 2, 15, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B976, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 19, 0, 0 - object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 13, 18, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 18, 0, 0 - object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 14, 14, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 20, 0, 0 - object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 23, 0, 0 - object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 22, 0, 0 - object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 21, 0, 0 - object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 2, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 25, 0, 0 - object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 13, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 24, 0, 0 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 27, 0, 0 - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 9, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_29140E, 1060, 0, 0 - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 28, 0, 0 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 2, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 30, 0, 0 + object_event 1, EVENT_OBJ_GFX_LASS, 0, 14, 20, 3, 9, 0, 1, 6, Route110_TrickHousePuzzle1_EventScript_26B948, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 8, 3, 9, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B95F, 0 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 2, 15, 3, 8, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B976, 0 + object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 16, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 19 + object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 18, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 18 + object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 14, 14, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 20 + object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 8, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 23 + object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 8, 10, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 22 + object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 12, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 21 + object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 4, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 25 + object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 6, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 24 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 6, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 27 + object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 4, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_29140E, 1060 + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 4, 8, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 28 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 12, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 30 Route110_TrickHousePuzzle1_MapWarps: @ 853E0F0 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/events/Route110_TrickHousePuzzle2.inc index dcc1f5efe4..dd02e53199 100644 --- a/data/maps/events/Route110_TrickHousePuzzle2.inc +++ b/data/maps/events/Route110_TrickHousePuzzle2.inc @@ -1,9 +1,9 @@ Route110_TrickHousePuzzle2_EventObjects: @ 853E128 - object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 13, 10, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_26BC75, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 10, 17, 3, 8, 0, 0, 1, 4, Route110_TrickHousePuzzle2_EventScript_26BC8C, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 11, 9, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_26BCA3, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 17, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, 1062, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, 1061, 0, 0 + object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 10, 3, 10, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_26BC75, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 10, 17, 3, 8, 0, 1, 4, Route110_TrickHousePuzzle2_EventScript_26BC8C, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 11, 9, 3, 9, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_26BCA3, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, 1062 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, 1061 Route110_TrickHousePuzzle2_MapWarps: @ 853E1A0 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/events/Route110_TrickHousePuzzle3.inc index 3fb140aa7c..683718363c 100644 --- a/data/maps/events/Route110_TrickHousePuzzle3.inc +++ b/data/maps/events/Route110_TrickHousePuzzle3.inc @@ -1,11 +1,11 @@ Route110_TrickHousePuzzle3_EventObjects: @ 853E218 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 0, 7, 19, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle3_EventScript_26C5C4, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 0, 4, 4, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5DB, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 0, 10, 10, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5F2, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291442, 1064, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291435, 1063, 0, 0 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 1, 20, 3, 1, 17, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 21, 0, 0 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 2, 21, 3, 1, 17, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 22, 0, 0 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 7, 19, 3, 8, 0, 1, 2, Route110_TrickHousePuzzle3_EventScript_26C5C4, 0 + object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 4, 4, 3, 10, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5DB, 0 + object_event 3, EVENT_OBJ_GFX_HIKER, 0, 10, 10, 3, 8, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5F2, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291442, 1064 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291435, 1063 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 20, 3, 1, 17, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 21 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 21, 3, 1, 17, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 22 Route110_TrickHousePuzzle3_MapWarps: @ 853E2C0 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/events/Route110_TrickHousePuzzle4.inc index 652974cf7a..93856f7b6c 100644 --- a/data/maps/events/Route110_TrickHousePuzzle4.inc +++ b/data/maps/events/Route110_TrickHousePuzzle4.inc @@ -1,18 +1,18 @@ Route110_TrickHousePuzzle4_EventObjects: @ 853E338 - object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 0, 2, 2, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_26C87E, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 14, 7, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C8AC, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 2, 14, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C895, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_29144F, 1065, 0, 0 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 17, 0, 0 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 18, 0, 0 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 19, 0, 0 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 20, 0, 0 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 21, 0, 0 - object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 7, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 22, 0, 0 - object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 9, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 23, 0, 0 - object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 24, 0, 0 - object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 14, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 25, 0, 0 - object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 15, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 26, 0, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 2, 2, 3, 8, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_26C87E, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 14, 7, 3, 9, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C8AC, 0 + object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 14, 3, 10, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C895, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 5, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_29144F, 1065 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 17 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 5, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 18 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 16, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 19 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 6, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 20 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 2, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 21 + object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 22 + object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 3, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 23 + object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 12, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 24 + object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 2, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 25 + object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 26 Route110_TrickHousePuzzle4_MapWarps: @ 853E488 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/events/Route110_TrickHousePuzzle5.inc b/data/maps/events/Route110_TrickHousePuzzle5.inc index 004c71506f..9bf01f4b63 100644 --- a/data/maps/events/Route110_TrickHousePuzzle5.inc +++ b/data/maps/events/Route110_TrickHousePuzzle5.inc @@ -1,9 +1,9 @@ Route110_TrickHousePuzzle5_EventObjects: @ 853E4C0 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 6, 17, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB32, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 0, 7, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB53, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 0, 14, 10, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB74, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 0, 14, 19, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB95, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 0, 10, 4, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBB6, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 17, 3, 9, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB32, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 3, 10, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB53, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 14, 10, 3, 9, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB74, 0 + object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 14, 19, 3, 9, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB95, 0 + object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 10, 4, 3, 10, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBB6, 0 Route110_TrickHousePuzzle5_MapWarps: @ 853E538 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/events/Route110_TrickHousePuzzle6.inc b/data/maps/events/Route110_TrickHousePuzzle6.inc index 0da7ac6197..8e29b4ee1f 100644 --- a/data/maps/events/Route110_TrickHousePuzzle6.inc +++ b/data/maps/events/Route110_TrickHousePuzzle6.inc @@ -1,8 +1,8 @@ Route110_TrickHousePuzzle6_EventObjects: @ 853E6D0 - object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 0, 7, 9, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 11, 10, 3, 10, 0, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 4, 5, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 11, 21, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, 1067, 0, 0 + object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 7, 9, 3, 10, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 11, 10, 3, 10, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 4, 5, 3, 7, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 21, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, 1067 Route110_TrickHousePuzzle6_MapWarps: @ 853E730 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/events/Route110_TrickHousePuzzle7.inc index fd5748a76e..e6d50dca51 100644 --- a/data/maps/events/Route110_TrickHousePuzzle7.inc +++ b/data/maps/events/Route110_TrickHousePuzzle7.inc @@ -1,13 +1,13 @@ Route110_TrickHousePuzzle7_EventObjects: @ 853E768 - object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 9, 20, 0, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E389, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 0, 10, 2, 0, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3B7, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 8, 17, 0, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3A0, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_291469, 1068, 0, 0 - object_event 5, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 9, 2, 3, 8, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3E5, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_LASS, 0, 0, 8, 13, 3, 7, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3CE, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 9, 12, 3, 9, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3FC, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 17, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 6, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 20, 0, 10, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E389, 0 + object_event 2, EVENT_OBJ_GFX_LASS, 0, 10, 2, 0, 7, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3B7, 0 + object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 8, 17, 0, 9, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3A0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 12, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_291469, 1068 + object_event 5, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 2, 3, 8, 17, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3E5, 0 + object_event 6, EVENT_OBJ_GFX_LASS, 0, 8, 13, 3, 7, 17, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3CE, 0 + object_event 7, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 12, 3, 9, 17, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3FC, 0 + object_event 8, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 17, 0, 1, 17, 0, 0, 0x0, 0 + object_event 9, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 6, 0, 1, 17, 0, 0, 0x0, 0 Route110_TrickHousePuzzle7_MapWarps: @ 853E840 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/events/Route110_TrickHousePuzzle8.inc b/data/maps/events/Route110_TrickHousePuzzle8.inc index 821801eac7..1556a9516f 100644 --- a/data/maps/events/Route110_TrickHousePuzzle8.inc +++ b/data/maps/events/Route110_TrickHousePuzzle8.inc @@ -1,8 +1,8 @@ Route110_TrickHousePuzzle8_EventObjects: @ 853E908 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 1, 10, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 2, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 8, 17, 3, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, 1069, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 1, 10, 3, 7, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 4, 2, 3, 10, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 17, 3, 9, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 2, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, 1069 Route110_TrickHousePuzzle8_MapWarps: @ 853E968 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc index e259215de0..1d9aa1111e 100644 --- a/data/maps/events/Route111.inc +++ b/data/maps/events/Route111.inc @@ -1,50 +1,50 @@ Route111_EventObjects: @ 85291F0 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 13, 114, 3, 8, 0, 0, 0, 0, Route111_EventScript_1F0FC5, 768, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 769, 0, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 13, 113, 0, 8, 1, 0, 0, 0, 0x0, 770, 0, 0 - object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 771, 0, 0 - object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 0, 28, 51, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F121B, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 22, 5, 3, 12, 0, 0, 0, 19, BerryTreeScript, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 23, 5, 3, 12, 0, 0, 0, 20, BerryTreeScript, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 0, 8, 91, 3, 2, 17, 0, 0, 0, Route111_EventScript_1F1189, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_CAMPER, 0, 0, 29, 37, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1204, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_HIKER, 0, 0, 27, 69, 3, 50, 34, 0, 1, 2, Route111_EventScript_1F1260, 0, 0, 0 - object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 0, 21, 47, 3, 9, 0, 0, 1, 4, Route111_EventScript_1F1232, 0, 0, 0 - object_event 12, EVENT_OBJ_GFX_PICNICKER, 0, 0, 32, 66, 3, 24, 0, 0, 1, 3, Route111_EventScript_1F1249, 0, 0, 0 - object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDF6, 796, 0, 0 - object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDD6, 796, 0, 0 - object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 18, 101, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 17, 0, 0 - object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 19, 100, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 18, 0, 0 - object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 0, 23, 8, 3, 5, 1, 0, 0, 0, Route111_EventScript_1F0EB9, 0, 0, 0 - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 33, 104, 3, 1, 0, 0, 0, 0, Route111_EventScript_290D9B, 1008, 0, 0 - object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 18, 5, 3, 12, 0, 0, 0, 80, BerryTreeScript, 0, 0, 0 - object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 19, 5, 3, 12, 0, 0, 0, 81, BerryTreeScript, 0, 0, 0 - object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CE96, 799, 0, 0 - object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CEB6, 799, 0, 0 - object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF16, 903, 0, 0 - object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF36, 903, 0, 0 - object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 54, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DA8, 1009, 0, 0 - object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 114, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DB5, 1010, 0, 0 - object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 22, 21, 3, 1, 0, 0, 0, 0, Route111_EventScript_2906BB, 19, 0, 0 - object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 0, 10, 82, 3, 14, 0, 0, 1, 2, Route111_EventScript_1F12D9, 0, 0, 0 - object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 0, 11, 71, 3, 22, 0, 0, 1, 3, Route111_EventScript_1F12C2, 0, 0, 0 - object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 32, 29, 3, 28, 1, 0, 1, 2, Route111_EventScript_1F12F0, 0, 0, 0 - object_event 31, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 11, 11, 3, 7, 4, 0, 1, 4, Route111_EventScript_1F1369, 0, 0, 0 - object_event 32, EVENT_OBJ_GFX_MAN_4, 0, 0, 9, 27, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1307, 0, 0, 0 - object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 0, 13, 20, 3, 7, 17, 0, 0, 0, Route111_EventScript_2765FF, 960, 0, 0 - object_event 34, EVENT_OBJ_GFX_MAN_5, 0, 0, 20, 114, 3, 2, 17, 0, 0, 0, Route111_EventScript_1F1192, 0, 0, 0 - object_event 35, EVENT_OBJ_GFX_CAMPER, 0, 0, 26, 132, 3, 9, 17, 0, 1, 5, Route111_EventScript_1F13F9, 0, 0, 0 - object_event 36, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 20, 132, 3, 10, 17, 0, 1, 5, Route111_EventScript_1F1410, 0, 0, 0 - object_event 37, EVENT_OBJ_GFX_PICNICKER, 0, 0, 19, 121, 3, 7, 17, 0, 1, 2, Route111_EventScript_1F13E2, 0, 0, 0 - object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 0, 16, 119, 3, 10, 17, 0, 1, 3, Route111_EventScript_1F13CB, 0, 0, 0 - object_event 39, EVENT_OBJ_GFX_HIKER, 0, 0, 29, 77, 3, 14, 17, 0, 1, 7, Route111_EventScript_1F143E, 0, 0, 0 - object_event 40, EVENT_OBJ_GFX_PICNICKER, 0, 0, 22, 77, 3, 10, 17, 0, 1, 6, Route111_EventScript_1F1427, 0, 0, 0 - object_event 41, EVENT_OBJ_GFX_CAMPER, 0, 0, 37, 77, 3, 9, 17, 0, 1, 7, Route111_EventScript_1F1455, 0, 0, 0 - object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 19, 118, 3, 1, 17, 0, 0, 0, Route111_EventScript_290DC2, 1142, 0, 0 - object_event 43, EVENT_OBJ_GFX_HIKER, 0, 0, 14, 56, 3, 16, 17, 0, 0, 0, Route111_EventScript_1F119B, 0, 0, 0 - object_event 44, EVENT_OBJ_GFX_FOSSIL, 0, 0, 20, 53, 3, 8, 17, 0, 0, 0, 0x0, 876, 0, 0 - object_event 45, EVENT_OBJ_GFX_HIPSTER, 0, 0, 19, 53, 3, 8, 17, 0, 0, 0, 0x0, 875, 0, 0 - object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 19, 101, 3, 7, 17, 0, 0, 0, Route111_EventScript_1F11E4, 843, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 114, 3, 8, 0, 0, 0, Route111_EventScript_1F0FC5, 768 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 13, 113, 0, 8, 0, 0, 0, 0x0, 769 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, 8, 1, 0, 0, 0x0, 770 + object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 13, 113, 0, 8, 0, 0, 0, 0x0, 771 + object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 28, 51, 3, 17, 0, 1, 3, Route111_EventScript_1F121B, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 5, 3, 12, 0, 0, 19, BerryTreeScript, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 5, 3, 12, 0, 0, 20, BerryTreeScript, 0 + object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 8, 91, 3, 2, 17, 0, 0, Route111_EventScript_1F1189, 0 + object_event 9, EVENT_OBJ_GFX_CAMPER, 0, 29, 37, 3, 17, 0, 1, 3, Route111_EventScript_1F1204, 0 + object_event 10, EVENT_OBJ_GFX_HIKER, 0, 27, 69, 3, 50, 34, 1, 2, Route111_EventScript_1F1260, 0 + object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 21, 47, 3, 9, 0, 1, 4, Route111_EventScript_1F1232, 0 + object_event 12, EVENT_OBJ_GFX_PICNICKER, 0, 32, 66, 3, 24, 0, 1, 3, Route111_EventScript_1F1249, 0 + object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, Route111_EventScript_28CDF6, 796 + object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, Route111_EventScript_28CDD6, 796 + object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 101, 3, 1, 0, 0, 0, Route111_EventScript_2907A6, 17 + object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 100, 3, 1, 0, 0, 0, Route111_EventScript_2907A6, 18 + object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 23, 8, 3, 5, 1, 0, 0, Route111_EventScript_1F0EB9, 0 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 104, 3, 1, 0, 0, 0, Route111_EventScript_290D9B, 1008 + object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, 12, 0, 0, 80, BerryTreeScript, 0 + object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 5, 3, 12, 0, 0, 81, BerryTreeScript, 0 + object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, Route111_EventScript_28CE96, 799 + object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, Route111_EventScript_28CEB6, 799 + object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, Route111_EventScript_28CF16, 903 + object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, Route111_EventScript_28CF36, 903 + object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 54, 3, 1, 0, 0, 0, Route111_EventScript_290DA8, 1009 + object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 114, 3, 1, 0, 0, 0, Route111_EventScript_290DB5, 1010 + object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 22, 21, 3, 1, 0, 0, 0, Route111_EventScript_2906BB, 19 + object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 10, 82, 3, 14, 0, 1, 2, Route111_EventScript_1F12D9, 0 + object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 11, 71, 3, 22, 0, 1, 3, Route111_EventScript_1F12C2, 0 + object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 32, 29, 3, 28, 1, 1, 2, Route111_EventScript_1F12F0, 0 + object_event 31, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 11, 3, 7, 4, 1, 4, Route111_EventScript_1F1369, 0 + object_event 32, EVENT_OBJ_GFX_MAN_4, 0, 9, 27, 3, 17, 0, 1, 3, Route111_EventScript_1F1307, 0 + object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 13, 20, 3, 7, 17, 0, 0, Route111_EventScript_2765FF, 960 + object_event 34, EVENT_OBJ_GFX_MAN_5, 0, 20, 114, 3, 2, 17, 0, 0, Route111_EventScript_1F1192, 0 + object_event 35, EVENT_OBJ_GFX_CAMPER, 0, 26, 132, 3, 9, 17, 1, 5, Route111_EventScript_1F13F9, 0 + object_event 36, EVENT_OBJ_GFX_WOMAN_3, 0, 20, 132, 3, 10, 17, 1, 5, Route111_EventScript_1F1410, 0 + object_event 37, EVENT_OBJ_GFX_PICNICKER, 0, 19, 121, 3, 7, 17, 1, 2, Route111_EventScript_1F13E2, 0 + object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 16, 119, 3, 10, 17, 1, 3, Route111_EventScript_1F13CB, 0 + object_event 39, EVENT_OBJ_GFX_HIKER, 0, 29, 77, 3, 14, 17, 1, 7, Route111_EventScript_1F143E, 0 + object_event 40, EVENT_OBJ_GFX_PICNICKER, 0, 22, 77, 3, 10, 17, 1, 6, Route111_EventScript_1F1427, 0 + object_event 41, EVENT_OBJ_GFX_CAMPER, 0, 37, 77, 3, 9, 17, 1, 7, Route111_EventScript_1F1455, 0 + object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 118, 3, 1, 17, 0, 0, Route111_EventScript_290DC2, 1142 + object_event 43, EVENT_OBJ_GFX_HIKER, 0, 14, 56, 3, 16, 17, 0, 0, Route111_EventScript_1F119B, 0 + object_event 44, EVENT_OBJ_GFX_FOSSIL, 0, 20, 53, 3, 8, 17, 0, 0, 0x0, 876 + object_event 45, EVENT_OBJ_GFX_HIPSTER, 0, 19, 53, 3, 8, 17, 0, 0, 0x0, 875 + object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 101, 3, 7, 17, 0, 0, Route111_EventScript_1F11E4, 843 Route111_MapWarps: @ 8529640 warp_def 13, 113, 0, 0, MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE diff --git a/data/maps/events/Route111_OldLadysRestStop.inc b/data/maps/events/Route111_OldLadysRestStop.inc index ecb54bda31..4fd7d1952d 100644 --- a/data/maps/events/Route111_OldLadysRestStop.inc +++ b/data/maps/events/Route111_OldLadysRestStop.inc @@ -1,5 +1,5 @@ Route111_OldLadysRestStop_EventObjects: @ 8533C18 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 6, 3, 3, 9, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0 Route111_OldLadysRestStop_MapWarps: @ 8533C30 warp_def 3, 7, 0, 2, MAP_ROUTE111 diff --git a/data/maps/events/Route111_WinstrateFamilysHouse.inc b/data/maps/events/Route111_WinstrateFamilysHouse.inc index 62961b46c5..3585e27e6d 100644 --- a/data/maps/events/Route111_WinstrateFamilysHouse.inc +++ b/data/maps/events/Route111_WinstrateFamilysHouse.inc @@ -1,8 +1,8 @@ Route111_WinstrateFamilysHouse_EventObjects: @ 8533B94 - object_event 1, EVENT_OBJ_GFX_LASS, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4E8, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A48D, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 7, 4, 3, 9, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 5, 3, 9, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4E8, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, 10, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A48D, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, 9, 1, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0 + object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 4, 3, 10, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0 Route111_WinstrateFamilysHouse_MapWarps: @ 8533BF4 warp_def 3, 7, 0, 0, MAP_ROUTE111 diff --git a/data/maps/events/Route112.inc b/data/maps/events/Route112.inc index e063a12837..683f43ffde 100644 --- a/data/maps/events/Route112.inc +++ b/data/maps/events/Route112.inc @@ -1,18 +1,18 @@ Route112_EventObjects: @ 8529974 - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 26, 30, 3, 7, 17, 0, 0, 0, Route112_EventScript_1F1DB7, 819, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 24, 34, 3, 14, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 29, 49, 3, 8, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 0, 22, 46, 3, 23, 0, 0, 1, 3, Route112_EventScript_1F1EFA, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_HIKER, 0, 0, 15, 40, 3, 16, 0, 0, 1, 3, Route112_EventScript_1F1E81, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 27, 30, 3, 7, 0, 0, 0, 0, Route112_EventScript_1F1DB7, 819, 0, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 27, 6, 0, 12, 0, 0, 0, 24, BerryTreeScript, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 28, 6, 0, 12, 0, 0, 0, 23, BerryTreeScript, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 29, 6, 0, 12, 0, 0, 0, 22, BerryTreeScript, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 30, 6, 3, 12, 0, 0, 0, 21, BerryTreeScript, 0, 0, 0 - object_event 11, EVENT_OBJ_GFX_HIKER, 0, 0, 8, 50, 3, 26, 48, 0, 0, 0, Route112_EventScript_1F1E61, 0, 0, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 43, 3, 1, 0, 0, 0, 0, Route112_EventScript_290DCF, 1011, 0, 0 - object_event 13, EVENT_OBJ_GFX_MAN_6, 0, 0, 31, 7, 3, 18, 17, 0, 1, 3, Route112_EventScript_1F1F11, 0, 0, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 31, 11, 3, 15, 17, 0, 1, 3, Route112_EventScript_1F1F28, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 30, 3, 7, 17, 0, 0, Route112_EventScript_1F1DB7, 819 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, 14, 0, 1, 2, Route112_EventScript_1F1E6A, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, 8, 0, 1, 3, Route112_EventScript_1F1EE3, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 22, 46, 3, 23, 0, 1, 3, Route112_EventScript_1F1EFA, 0 + object_event 5, EVENT_OBJ_GFX_HIKER, 0, 15, 40, 3, 16, 0, 1, 3, Route112_EventScript_1F1E81, 0 + object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 27, 30, 3, 7, 0, 0, 0, Route112_EventScript_1F1DB7, 819 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 27, 6, 0, 12, 0, 0, 24, BerryTreeScript, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 28, 6, 0, 12, 0, 0, 23, BerryTreeScript, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 6, 0, 12, 0, 0, 22, BerryTreeScript, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 6, 3, 12, 0, 0, 21, BerryTreeScript, 0 + object_event 11, EVENT_OBJ_GFX_HIKER, 0, 8, 50, 3, 26, 48, 0, 0, Route112_EventScript_1F1E61, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, 1, 0, 0, 0, Route112_EventScript_290DCF, 1011 + object_event 13, EVENT_OBJ_GFX_MAN_6, 0, 31, 7, 3, 18, 17, 1, 3, Route112_EventScript_1F1F11, 0 + object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 31, 11, 3, 15, 17, 1, 3, Route112_EventScript_1F1F28, 0 Route112_MapWarps: @ 8529AC4 warp_def 28, 27, 0, 0, MAP_ROUTE112_CABLE_CAR_STATION diff --git a/data/maps/events/Route112_CableCarStation.inc b/data/maps/events/Route112_CableCarStation.inc index 15df206a0f..7a18ffd40e 100644 --- a/data/maps/events/Route112_CableCarStation.inc +++ b/data/maps/events/Route112_CableCarStation.inc @@ -1,6 +1,6 @@ Route112_CableCarStation_EventObjects: @ 8533C54 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 6, 6, 3, 8, 0, 0, 0, 0, Route112_CableCarStation_EventScript_22AB17, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, 8, 0, 0, 0, Route112_CableCarStation_EventScript_22AB17, 0 + object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, 1, 0, 0, 0, 0x0, 0 Route112_CableCarStation_MapWarps: @ 8533C84 warp_def 6, 11, 0, 0, MAP_ROUTE112 diff --git a/data/maps/events/Route113.inc b/data/maps/events/Route113.inc index 269aeac3e6..990df8f7f1 100644 --- a/data/maps/events/Route113.inc +++ b/data/maps/events/Route113.inc @@ -1,20 +1,20 @@ Route113_EventObjects: @ 8529B2C - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 66, 12, 3, 5, 1, 0, 0, 0, Route113_EventScript_1F2193, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 36, 10, 3, 3, 16, 0, 0, 0, Route113_EventScript_1F218A, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 62, 8, 3, 8, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 21, 11, 3, 17, 0, 0, 1, 3, Route113_EventScript_1F21D7, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 51, 11, 3, 23, 0, 0, 1, 2, Route113_EventScript_1F21EE, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 53, 7, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DDC, 1012, 0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 79, 5, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DE9, 1013, 0, 0 - object_event 8, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 29, 6, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F2250, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 71, 2, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 45, 6, 3, 8, 17, 0, 1, 1, Route113_EventScript_1F22C9, 0, 0, 0 - object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 46, 6, 3, 8, 17, 0, 1, 1, Route113_EventScript_1F22E4, 0, 0, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 15, 15, 3, 1, 17, 0, 0, 0, Route113_EventScript_290DF6, 1143, 0, 0 - object_event 13, EVENT_OBJ_GFX_MANIAC, 0, 0, 75, 3, 3, 9, 17, 0, 1, 4, Route113_EventScript_1F2344, 0, 0, 0 - object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 0, 71, 4, 3, 7, 17, 0, 1, 1, Route113_EventScript_1F232D, 0, 0, 0 - object_event 15, EVENT_OBJ_GFX_PICNICKER, 0, 0, 7, 6, 3, 26, 49, 0, 1, 6, Route113_EventScript_1F22FF, 0, 0, 0 - object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 0, 7, 13, 3, 25, 49, 0, 1, 6, Route113_EventScript_1F2316, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 66, 12, 3, 5, 1, 0, 0, Route113_EventScript_1F2193, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 36, 10, 3, 3, 16, 0, 0, Route113_EventScript_1F218A, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, 8, 0, 1, 3, Route113_EventScript_1F21C0, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 21, 11, 3, 17, 0, 1, 3, Route113_EventScript_1F21D7, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 51, 11, 3, 23, 0, 1, 2, Route113_EventScript_1F21EE, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, 1, 0, 0, 0, Route113_EventScript_290DDC, 1012 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 79, 5, 3, 1, 0, 0, 0, Route113_EventScript_290DE9, 1013 + object_event 8, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, 63, 0, 3, 1, Route113_EventScript_1F2250, 0 + object_event 9, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 71, 2, 3, 63, 0, 3, 1, Route113_EventScript_1F22B2, 0 + object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 45, 6, 3, 8, 17, 1, 1, Route113_EventScript_1F22C9, 0 + object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 46, 6, 3, 8, 17, 1, 1, Route113_EventScript_1F22E4, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 15, 3, 1, 17, 0, 0, Route113_EventScript_290DF6, 1143 + object_event 13, EVENT_OBJ_GFX_MANIAC, 0, 75, 3, 3, 9, 17, 1, 4, Route113_EventScript_1F2344, 0 + object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 71, 4, 3, 7, 17, 1, 1, Route113_EventScript_1F232D, 0 + object_event 15, EVENT_OBJ_GFX_PICNICKER, 0, 7, 6, 3, 26, 49, 1, 6, Route113_EventScript_1F22FF, 0 + object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 7, 13, 3, 25, 49, 1, 6, Route113_EventScript_1F2316, 0 Route113_MapWarps: @ 8529CAC warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP diff --git a/data/maps/events/Route113_GlassWorkshop.inc b/data/maps/events/Route113_GlassWorkshop.inc index 7701918e3c..7502ed737a 100644 --- a/data/maps/events/Route113_GlassWorkshop.inc +++ b/data/maps/events/Route113_GlassWorkshop.inc @@ -1,6 +1,6 @@ Route113_GlassWorkshop_EventObjects: @ 853EA78 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_26ED1E, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 5, 4, 3, 2, 17, 0, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 3, 3, 8, 0, 0, 0, Route113_GlassWorkshop_EventScript_26ED1E, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 5, 4, 3, 2, 17, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0 Route113_GlassWorkshop_MapWarps: @ 853EAA8 warp_def 3, 8, 0, 0, MAP_ROUTE113 diff --git a/data/maps/events/Route114.inc b/data/maps/events/Route114.inc index b785fd55a7..d250d801ee 100644 --- a/data/maps/events/Route114.inc +++ b/data/maps/events/Route114.inc @@ -1,31 +1,31 @@ Route114_EventObjects: @ 8529E68 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 31, 43, 3, 12, 0, 0, 0, 77, BerryTreeScript, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 31, 44, 3, 12, 0, 0, 0, 78, BerryTreeScript, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 0, 15, 65, 7, 10, 0, 0, 1, 6, Route114_EventScript_1F2640, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 0, 30, 72, 5, 9, 0, 0, 1, 4, Route114_EventScript_1F2657, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 0, 22, 50, 3, 10, 0, 0, 1, 3, Route114_EventScript_1F266E, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 0, 19, 35, 3, 1, 0, 0, 1, 3, Route114_EventScript_1F2685, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 0, 20, 56, 3, 7, 0, 0, 1, 3, Route114_EventScript_1F269C, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 31, 45, 3, 12, 0, 0, 0, 68, BerryTreeScript, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 3, 1, 0, 0, 0, 0, Route114_EventScript_290E03, 1014, 0, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 11, 37, 4, 1, 0, 0, 0, 0, Route114_EventScript_290E10, 1015, 0, 0 - object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 12, 43, 4, 1, 0, 0, 0, 0, Route114_EventScript_2907A6, 17, 0, 0 - object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 19, 11, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F25D1, 0, 0, 0 - object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 19, 12, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F2612, 0, 0, 0 - object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 0, 27, 42, 3, 3, 16, 0, 0, 0, Route114_EventScript_1F2582, 0, 0, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 25, 6, 3, 8, 0, 0, 1, 0, Route114_EventScript_1F2777, 0, 0, 0 - object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 19, 26, 3, 9, 0, 0, 1, 0, Route114_EventScript_1F2760, 0, 0, 0 - object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 0, 30, 58, 5, 23, 0, 0, 1, 3, Route114_EventScript_1F26FE, 0, 0, 0 - object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 29, 53, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 18, 0, 0 - object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 30, 54, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 19, 0, 0 - object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 22, 69, 7, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 20, 0, 0 - object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 11, 64, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 21, 0, 0 - object_event 22, EVENT_OBJ_GFX_LASS, 0, 0, 24, 44, 3, 8, 17, 0, 1, 1, Route114_EventScript_1F27A9, 0, 0, 0 - object_event 23, EVENT_OBJ_GFX_LASS, 0, 0, 23, 44, 3, 8, 17, 0, 1, 1, Route114_EventScript_1F278E, 0, 0, 0 - object_event 24, EVENT_OBJ_GFX_PICNICKER, 0, 0, 28, 20, 3, 7, 17, 0, 1, 3, Route114_EventScript_1F27DB, 0, 0, 0 - object_event 25, EVENT_OBJ_GFX_PICNICKER, 0, 0, 26, 72, 5, 18, 17, 0, 1, 4, Route114_EventScript_1F27C4, 0, 0, 0 - object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 19, 3, 1, 17, 0, 0, 0, Route114_EventScript_290E1D, 1160, 0, 0 - object_event 27, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 28, 16, 3, 17, 17, 0, 1, 3, Route114_EventScript_1F27F2, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 43, 3, 12, 0, 0, 77, BerryTreeScript, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 44, 3, 12, 0, 0, 78, BerryTreeScript, 0 + object_event 3, EVENT_OBJ_GFX_HIKER, 0, 15, 65, 7, 10, 0, 1, 6, Route114_EventScript_1F2640, 0 + object_event 4, EVENT_OBJ_GFX_HIKER, 0, 30, 72, 5, 9, 0, 1, 4, Route114_EventScript_1F2657, 0 + object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 22, 50, 3, 10, 0, 1, 3, Route114_EventScript_1F266E, 0 + object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 19, 35, 3, 1, 0, 1, 3, Route114_EventScript_1F2685, 0 + object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 20, 56, 3, 7, 0, 1, 3, Route114_EventScript_1F269C, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 45, 3, 12, 0, 0, 68, BerryTreeScript, 0 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, 1, 0, 0, 0, Route114_EventScript_290E03, 1014 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 37, 4, 1, 0, 0, 0, Route114_EventScript_290E10, 1015 + object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 43, 4, 1, 0, 0, 0, Route114_EventScript_2907A6, 17 + object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 19, 11, 3, 10, 0, 0, 0, Route114_EventScript_1F25D1, 0 + object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 19, 12, 3, 10, 0, 0, 0, Route114_EventScript_1F2612, 0 + object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 27, 42, 3, 3, 16, 0, 0, Route114_EventScript_1F2582, 0 + object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 25, 6, 3, 8, 0, 1, 0, Route114_EventScript_1F2777, 0 + object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 19, 26, 3, 9, 0, 1, 0, Route114_EventScript_1F2760, 0 + object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 30, 58, 5, 23, 0, 1, 3, Route114_EventScript_1F26FE, 0 + object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 53, 5, 1, 17, 0, 0, Route114_EventScript_2907A6, 18 + object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 54, 5, 1, 17, 0, 0, Route114_EventScript_2907A6, 19 + object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 69, 7, 1, 17, 0, 0, Route114_EventScript_2907A6, 20 + object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 64, 5, 1, 17, 0, 0, Route114_EventScript_2907A6, 21 + object_event 22, EVENT_OBJ_GFX_LASS, 0, 24, 44, 3, 8, 17, 1, 1, Route114_EventScript_1F27A9, 0 + object_event 23, EVENT_OBJ_GFX_LASS, 0, 23, 44, 3, 8, 17, 1, 1, Route114_EventScript_1F278E, 0 + object_event 24, EVENT_OBJ_GFX_PICNICKER, 0, 28, 20, 3, 7, 17, 1, 3, Route114_EventScript_1F27DB, 0 + object_event 25, EVENT_OBJ_GFX_PICNICKER, 0, 26, 72, 5, 18, 17, 1, 4, Route114_EventScript_1F27C4, 0 + object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 19, 3, 1, 17, 0, 0, Route114_EventScript_290E1D, 1160 + object_event 27, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 16, 3, 17, 17, 1, 3, Route114_EventScript_1F27F2, 0 Route114_MapWarps: @ 852A0F0 warp_def 8, 63, 0, 0, MAP_METEOR_FALLS_1F_1R diff --git a/data/maps/events/Route114_FossilManiacsHouse.inc b/data/maps/events/Route114_FossilManiacsHouse.inc index 87f2e8a51d..06788e39d1 100644 --- a/data/maps/events/Route114_FossilManiacsHouse.inc +++ b/data/maps/events/Route114_FossilManiacsHouse.inc @@ -1,5 +1,5 @@ Route114_FossilManiacsHouse_EventObjects: @ 8533CFC - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 3, 2, 3, 8, 17, 0, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 3, 2, 3, 8, 17, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0 Route114_FossilManiacsHouse_MapWarps: @ 8533D14 warp_def 4, 7, 0, 1, MAP_ROUTE114 diff --git a/data/maps/events/Route114_FossilManiacsTunnel.inc b/data/maps/events/Route114_FossilManiacsTunnel.inc index f14e6cd65b..64ff21b891 100644 --- a/data/maps/events/Route114_FossilManiacsTunnel.inc +++ b/data/maps/events/Route114_FossilManiacsTunnel.inc @@ -1,5 +1,5 @@ Route114_FossilManiacsTunnel_EventObjects: @ 8533D70 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 5, 3, 3, 7, 17, 0, 0, 0, Route114_FossilManiacsTunnel_EventScript_22AF87, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 5, 3, 3, 7, 17, 0, 0, Route114_FossilManiacsTunnel_EventScript_22AF87, 0 Route114_FossilManiacsTunnel_MapWarps: @ 8533D88 warp_def 6, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE diff --git a/data/maps/events/Route114_LanettesHouse.inc b/data/maps/events/Route114_LanettesHouse.inc index c7b2fdfefb..81633507dc 100644 --- a/data/maps/events/Route114_LanettesHouse.inc +++ b/data/maps/events/Route114_LanettesHouse.inc @@ -1,5 +1,5 @@ Route114_LanettesHouse_EventObjects: @ 8533DD4 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 4, 3, 1, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, 870, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 4, 3, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, 870 Route114_LanettesHouse_MapWarps: @ 8533DEC warp_def 5, 7, 0, 2, MAP_ROUTE114 diff --git a/data/maps/events/Route115.inc b/data/maps/events/Route115.inc index 5ff749096f..a698b98d80 100644 --- a/data/maps/events/Route115.inc +++ b/data/maps/events/Route115.inc @@ -1,27 +1,27 @@ Route115_EventObjects: @ 852A1BC - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 18, 68, 3, 2, 17, 0, 0, 0, Route115_EventScript_1F2973, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 15, 3, 10, 0, 0, 1, 6, Route115_EventScript_1F298E, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 27, 53, 3, 15, 17, 0, 1, 4, Route115_EventScript_1F2A07, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 12, 5, 3, 12, 0, 0, 0, 69, BerryTreeScript, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 13, 5, 3, 12, 0, 0, 0, 70, BerryTreeScript, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 14, 5, 3, 12, 0, 0, 0, 71, BerryTreeScript, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 0, 15, 50, 3, 64, 0, 0, 1, 3, Route115_EventScript_1F2A69, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 19, 15, 3, 27, 5, 0, 1, 2, Route115_EventScript_1F29F0, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 0, 24, 62, 3, 18, 0, 0, 1, 4, Route115_EventScript_1F2ACB, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 20, 60, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E2A, 1016, 0, 0 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 18, 7, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E37, 1017, 0, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 23, 29, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E44, 1018, 0, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 31, 64, 3, 12, 0, 0, 0, 55, BerryTreeScript, 0, 0, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 31, 65, 3, 12, 0, 0, 0, 56, BerryTreeScript, 0, 0, 0 - object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 29, 50, 3, 1, 17, 0, 0, 0, Route115_EventScript_2907A6, 17, 0, 0 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 56, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E51, 1118, 0, 0 - object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 10, 15, 3, 46, 51, 0, 1, 2, Route115_EventScript_1F2AE2, 0, 0, 0 - object_event 18, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 11, 12, 3, 57, 17, 0, 1, 3, Route115_EventScript_1F2AF9, 0, 0, 0 - object_event 19, EVENT_OBJ_GFX_GIRL_3, 0, 0, 15, 7, 3, 9, 17, 0, 1, 4, Route115_EventScript_1F2B27, 0, 0, 0 - object_event 20, EVENT_OBJ_GFX_LASS, 0, 0, 10, 7, 3, 10, 17, 0, 1, 4, Route115_EventScript_1F2B10, 0, 0, 0 - object_event 21, EVENT_OBJ_GFX_LASS, 0, 0, 28, 62, 3, 9, 17, 0, 1, 4, Route115_EventScript_1F2B3E, 0, 0, 0 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 26, 67, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E6B, 1161, 0, 0 - object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 14, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E5E, 1144, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 68, 3, 2, 17, 0, 0, Route115_EventScript_1F2973, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 15, 3, 10, 0, 1, 6, Route115_EventScript_1F298E, 0 + object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 27, 53, 3, 15, 17, 1, 4, Route115_EventScript_1F2A07, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, 12, 0, 0, 69, BerryTreeScript, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 13, 5, 3, 12, 0, 0, 70, BerryTreeScript, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, 12, 0, 0, 71, BerryTreeScript, 0 + object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 15, 50, 3, 64, 0, 1, 3, Route115_EventScript_1F2A69, 0 + object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 15, 3, 27, 5, 1, 2, Route115_EventScript_1F29F0, 0 + object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 24, 62, 3, 18, 0, 1, 4, Route115_EventScript_1F2ACB, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 60, 3, 1, 0, 0, 0, Route115_EventScript_290E2A, 1016 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 18, 7, 3, 1, 0, 0, 0, Route115_EventScript_290E37, 1017 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 29, 3, 1, 0, 0, 0, Route115_EventScript_290E44, 1018 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 64, 3, 12, 0, 0, 55, BerryTreeScript, 0 + object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 65, 3, 12, 0, 0, 56, BerryTreeScript, 0 + object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 50, 3, 1, 17, 0, 0, Route115_EventScript_2907A6, 17 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, 1, 17, 0, 0, Route115_EventScript_290E51, 1118 + object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 10, 15, 3, 46, 51, 1, 2, Route115_EventScript_1F2AE2, 0 + object_event 18, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 11, 12, 3, 57, 17, 1, 3, Route115_EventScript_1F2AF9, 0 + object_event 19, EVENT_OBJ_GFX_GIRL_3, 0, 15, 7, 3, 9, 17, 1, 4, Route115_EventScript_1F2B27, 0 + object_event 20, EVENT_OBJ_GFX_LASS, 0, 10, 7, 3, 10, 17, 1, 4, Route115_EventScript_1F2B10, 0 + object_event 21, EVENT_OBJ_GFX_LASS, 0, 28, 62, 3, 9, 17, 1, 4, Route115_EventScript_1F2B3E, 0 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 67, 3, 1, 17, 0, 0, Route115_EventScript_290E6B, 1161 + object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 14, 3, 1, 17, 0, 0, Route115_EventScript_290E5E, 1144 Route115_MapWarps: @ 852A3E4 warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc index a1c706e451..e36c02de42 100644 --- a/data/maps/events/Route116.inc +++ b/data/maps/events/Route116.inc @@ -1,32 +1,32 @@ Route116_EventObjects: @ 852A4B8 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 18, 2, 3, 12, 0, 0, 0, 25, BerryTreeScript, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 19, 2, 3, 12, 0, 0, 0, 26, BerryTreeScript, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 12, 7, 3, 16, 0, 0, 1, 3, Route116_EventScript_1F2E89, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 21, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 17, 0, 0 - object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 32, 10, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 18, 0, 0 - object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 13, 17, 3, 24, 0, 0, 1, 2, Route116_EventScript_1F2EA0, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 19, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E85, 1019, 0, 0 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 17, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E92, 1020, 0, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 20, 2, 3, 12, 0, 0, 0, 66, BerryTreeScript, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 21, 2, 3, 12, 0, 0, 0, 67, BerryTreeScript, 0, 0, 0 - object_event 11, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 46, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_1F2D84, 891, 0, 0 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 28, 11, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 19, 0, 0 - object_event 13, EVENT_OBJ_GFX_HIKER, 0, 0, 36, 17, 3, 15, 0, 0, 1, 3, Route116_EventScript_1F2F65, 0, 0, 0 - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 24, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 20, 0, 0 - object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 80, 8, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E9F, 1021, 0, 0 - object_event 16, EVENT_OBJ_GFX_LASS, 0, 0, 26, 6, 3, 10, 0, 0, 1, 2, Route116_EventScript_1F2F7C, 0, 0, 0 - object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 0, 22, 16, 3, 13, 0, 0, 1, 3, Route116_EventScript_1F2F93, 0, 0, 0 - object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 28, 8, 3, 7, 0, 0, 1, 4, Route116_EventScript_1F2EB7, 0, 0, 0 - object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 0, 46, 11, 3, 1, 17, 0, 0, 0, Route116_EventScript_1F2CA2, 947, 0, 0 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 55, 12, 4, 1, 17, 0, 0, 0, Route116_EventScript_290E78, 1001, 0, 0 - object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 38, 9, 3, 10, 17, 0, 0, 0, Route116_EventScript_1F2C70, 894, 0, 0 - object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 0, 74, 13, 3, 1, 17, 0, 0, 0, Route116_EventScript_1F2DB6, 813, 0, 0 - object_event 23, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 33, 8, 3, 7, 0, 0, 1, 1, Route116_EventScript_1F3041, 0, 0, 0 - object_event 24, EVENT_OBJ_GFX_BOY_2, 0, 0, 33, 5, 3, 8, 0, 0, 1, 2, Route116_EventScript_1F3058, 0, 0, 0 - object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 34, 7, 0, 1, 17, 0, 0, 0, Route116_EventScript_290EAC, 1146, 0, 0 - object_event 26, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 30, 5, 3, 1, 17, 0, 0, 0, Route116_EventScript_2906BB, 21, 0, 0 - object_event 27, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 36, 13, 3, 18, 17, 0, 1, 5, Route116_EventScript_1F3086, 0, 0, 0 - object_event 28, EVENT_OBJ_GFX_HIKER, 0, 0, 42, 13, 3, 9, 17, 0, 1, 5, Route116_EventScript_1F306F, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 2, 3, 12, 0, 0, 25, BerryTreeScript, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 2, 3, 12, 0, 0, 26, BerryTreeScript, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 12, 7, 3, 16, 0, 1, 3, Route116_EventScript_1F2E89, 0 + object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 21, 6, 3, 1, 0, 0, 0, Route116_EventScript_2906BB, 17 + object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 10, 3, 1, 0, 0, 0, Route116_EventScript_2906BB, 18 + object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 13, 17, 3, 24, 0, 1, 2, Route116_EventScript_1F2EA0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 6, 3, 1, 0, 0, 0, Route116_EventScript_290E85, 1019 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 17, 3, 1, 0, 0, 0, Route116_EventScript_290E92, 1020 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 20, 2, 3, 12, 0, 0, 66, BerryTreeScript, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 21, 2, 3, 12, 0, 0, 67, BerryTreeScript, 0 + object_event 11, EVENT_OBJ_GFX_OLD_MAN_1, 0, 46, 9, 3, 1, 0, 0, 0, Route116_EventScript_1F2D84, 891 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 28, 11, 3, 1, 0, 0, 0, Route116_EventScript_2906BB, 19 + object_event 13, EVENT_OBJ_GFX_HIKER, 0, 36, 17, 3, 15, 0, 1, 3, Route116_EventScript_1F2F65, 0 + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 9, 3, 1, 0, 0, 0, Route116_EventScript_2906BB, 20 + object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 8, 3, 1, 0, 0, 0, Route116_EventScript_290E9F, 1021 + object_event 16, EVENT_OBJ_GFX_LASS, 0, 26, 6, 3, 10, 0, 1, 2, Route116_EventScript_1F2F7C, 0 + object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 22, 16, 3, 13, 0, 1, 3, Route116_EventScript_1F2F93, 0 + object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 28, 8, 3, 7, 0, 1, 4, Route116_EventScript_1F2EB7, 0 + object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 46, 11, 3, 1, 17, 0, 0, Route116_EventScript_1F2CA2, 947 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 12, 4, 1, 17, 0, 0, Route116_EventScript_290E78, 1001 + object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 9, 3, 10, 17, 0, 0, Route116_EventScript_1F2C70, 894 + object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 13, 3, 1, 17, 0, 0, Route116_EventScript_1F2DB6, 813 + object_event 23, EVENT_OBJ_GFX_WOMAN_3, 0, 33, 8, 3, 7, 0, 1, 1, Route116_EventScript_1F3041, 0 + object_event 24, EVENT_OBJ_GFX_BOY_2, 0, 33, 5, 3, 8, 0, 1, 2, Route116_EventScript_1F3058, 0 + object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 34, 7, 0, 1, 17, 0, 0, Route116_EventScript_290EAC, 1146 + object_event 26, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 5, 3, 1, 17, 0, 0, Route116_EventScript_2906BB, 21 + object_event 27, EVENT_OBJ_GFX_YOUNGSTER, 0, 36, 13, 3, 18, 17, 1, 5, Route116_EventScript_1F3086, 0 + object_event 28, EVENT_OBJ_GFX_HIKER, 0, 42, 13, 3, 9, 17, 1, 5, Route116_EventScript_1F306F, 0 Route116_MapWarps: @ 852A758 warp_def 47, 8, 0, 0, MAP_RUSTURF_TUNNEL diff --git a/data/maps/events/Route116_TunnelersRestHouse.inc b/data/maps/events/Route116_TunnelersRestHouse.inc index d84600bf62..7a7ce78550 100644 --- a/data/maps/events/Route116_TunnelersRestHouse.inc +++ b/data/maps/events/Route116_TunnelersRestHouse.inc @@ -1,7 +1,7 @@ Route116_TunnelersRestHouse_EventObjects: @ 8533E34 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 5, 3, 10, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 0, 3, 6, 3, 1, 17, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 7, 2, 3, 7, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, 10, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0 + object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, 1, 17, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, 7, 1, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0 Route116_TunnelersRestHouse_MapWarps: @ 8533E7C warp_def 4, 8, 0, 1, MAP_ROUTE116 diff --git a/data/maps/events/Route117.inc b/data/maps/events/Route117.inc index 628ac7aabc..df4bf6f11f 100644 --- a/data/maps/events/Route117.inc +++ b/data/maps/events/Route117.inc @@ -1,28 +1,28 @@ Route117_EventObjects: @ 852A828 - object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 13, 13, 3, 8, 0, 0, 0, 0, Route117_EventScript_1F399A, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 25, 5, 3, 40, 34, 0, 0, 0, Route117_EventScript_1F39A3, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 47, 4, 3, 8, 0, 0, 0, 0, Route117_EventScript_291C18, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 33, 3, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 39, 4, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 42, 2, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_PIKACHU, 0, 0, 49, 2, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 38, 16, 3, 28, 8, 0, 1, 4, Route117_EventScript_1F3A94, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 8, 10, 3, 23, 0, 0, 1, 3, Route117_EventScript_1F3A32, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_MAN_5, 0, 0, 33, 11, 3, 16, 0, 0, 1, 4, Route117_EventScript_1F39D0, 0, 0, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 41, 13, 3, 12, 0, 0, 0, 29, BerryTreeScript, 0, 0, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 42, 13, 3, 12, 0, 0, 0, 28, BerryTreeScript, 0, 0, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 43, 13, 3, 12, 0, 0, 0, 27, BerryTreeScript, 0, 0, 0 - object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 18, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EB9, 1022, 0, 0 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 15, 2, 3, 1, 0, 0, 0, 0, Route117_EventScript_2906BB, 17, 0, 0 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 9, 1, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EC6, 1023, 0, 0 - object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 26, 13, 3, 33, 34, 0, 1, 5, Route117_EventScript_1F3AF6, 0, 0, 0 - object_event 18, EVENT_OBJ_GFX_MANIAC, 0, 0, 17, 12, 3, 7, 17, 0, 1, 4, Route117_EventScript_1F3B58, 0, 0, 0 - object_event 19, EVENT_OBJ_GFX_LASS, 0, 0, 43, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3BD3, 0, 0, 0 - object_event 20, EVENT_OBJ_GFX_LASS, 0, 0, 42, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3B6F, 0, 0, 0 - object_event 21, EVENT_OBJ_GFX_GIRL_2, 0, 0, 48, 10, 3, 2, 17, 0, 0, 0, Route117_EventScript_1F39AC, 0, 0, 0 - object_event 22, EVENT_OBJ_GFX_LASS, 0, 0, 15, 4, 3, 10, 17, 0, 1, 4, Route117_EventScript_1F3C4E, 0, 0, 0 - object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 0, 21, 4, 3, 9, 17, 0, 1, 4, Route117_EventScript_1F3C65, 0, 0, 0 - object_event 24, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 16, 4, 3, 28, 20, 0, 1, 4, Route117_EventScript_1F3C37, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 13, 3, 8, 0, 0, 0, Route117_EventScript_1F399A, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 25, 5, 3, 40, 34, 0, 0, Route117_EventScript_1F39A3, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 47, 4, 3, 8, 0, 0, 0, Route117_EventScript_291C18, 0 + object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 33, 3, 3, 1, 17, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_KECLEON_1, 0, 39, 4, 3, 1, 0, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 42, 2, 3, 1, 17, 0, 0, 0x0, 0 + object_event 7, EVENT_OBJ_GFX_PIKACHU, 0, 49, 2, 3, 1, 0, 0, 0, 0x0, 0 + object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 38, 16, 3, 28, 8, 1, 4, Route117_EventScript_1F3A94, 0 + object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 10, 3, 23, 0, 1, 3, Route117_EventScript_1F3A32, 0 + object_event 10, EVENT_OBJ_GFX_MAN_5, 0, 33, 11, 3, 16, 0, 1, 4, Route117_EventScript_1F39D0, 0 + object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 41, 13, 3, 12, 0, 0, 29, BerryTreeScript, 0 + object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 42, 13, 3, 12, 0, 0, 28, BerryTreeScript, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 43, 13, 3, 12, 0, 0, 27, BerryTreeScript, 0 + object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 18, 3, 1, 0, 0, 0, Route117_EventScript_290EB9, 1022 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 2, 3, 1, 0, 0, 0, Route117_EventScript_2906BB, 17 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 1, 3, 1, 0, 0, 0, Route117_EventScript_290EC6, 1023 + object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 26, 13, 3, 33, 34, 1, 5, Route117_EventScript_1F3AF6, 0 + object_event 18, EVENT_OBJ_GFX_MANIAC, 0, 17, 12, 3, 7, 17, 1, 4, Route117_EventScript_1F3B58, 0 + object_event 19, EVENT_OBJ_GFX_LASS, 0, 43, 6, 3, 8, 0, 1, 1, Route117_EventScript_1F3BD3, 0 + object_event 20, EVENT_OBJ_GFX_LASS, 0, 42, 6, 3, 8, 0, 1, 1, Route117_EventScript_1F3B6F, 0 + object_event 21, EVENT_OBJ_GFX_GIRL_2, 0, 48, 10, 3, 2, 17, 0, 0, Route117_EventScript_1F39AC, 0 + object_event 22, EVENT_OBJ_GFX_LASS, 0, 15, 4, 3, 10, 17, 1, 4, Route117_EventScript_1F3C4E, 0 + object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 21, 4, 3, 9, 17, 1, 4, Route117_EventScript_1F3C65, 0 + object_event 24, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 16, 4, 3, 28, 20, 1, 4, Route117_EventScript_1F3C37, 0 Route117_MapWarps: @ 852AA68 warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE diff --git a/data/maps/events/Route117_PokemonDayCare.inc b/data/maps/events/Route117_PokemonDayCare.inc index b5b1a19602..3182c9c837 100644 --- a/data/maps/events/Route117_PokemonDayCare.inc +++ b/data/maps/events/Route117_PokemonDayCare.inc @@ -1,5 +1,5 @@ Route117_PokemonDayCare_EventObjects: @ 8533EA0 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 2, 2, 3, 8, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 2, 2, 3, 8, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0 Route117_PokemonDayCare_MapWarps: @ 8533EB8 warp_def 2, 8, 0, 0, MAP_ROUTE117 diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc index dcd27a75df..6b3379504e 100644 --- a/data/maps/events/Route118.inc +++ b/data/maps/events/Route118.inc @@ -1,25 +1,25 @@ Route118_EventObjects: @ 852AAB4 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 35, 5, 3, 12, 0, 0, 0, 31, BerryTreeScript, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 36, 5, 3, 12, 0, 0, 0, 32, BerryTreeScript, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 37, 5, 3, 12, 0, 0, 0, 33, BerryTreeScript, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 0, 64, 10, 3, 8, 0, 0, 1, 3, Route118_EventScript_1F4079, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE16, 797, 0, 0 - object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE36, 797, 0, 0 - object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 0, 12, 10, 3, 2, 17, 0, 0, 0, Route118_EventScript_1F3E73, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CED6, 901, 0, 0 - object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CEF6, 901, 0, 0 - object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF16, 904, 0, 0 - object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF36, 904, 0, 0 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 38, 8, 3, 1, 0, 0, 0, 0, Route118_EventScript_2906BB, 17, 0, 0 - object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 28, 8, 3, 9, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0, 0, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 7, 12, 3, 7, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0, 0, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 14, 14, 3, 8, 0, 0, 1, 0, Route118_EventScript_1F4000, 0, 0, 0 - object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 0, 56, 7, 3, 16, 0, 0, 1, 3, Route118_EventScript_1F4090, 0, 0, 0 - object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 39, 15, 3, 1, 0, 0, 1, 2, Route118_EventScript_1F3FE9, 0, 0, 0 - object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 0, 17, 11, 3, 15, 17, 0, 1, 3, Route118_EventScript_1F4017, 0, 0, 0 - object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 0, 44, 7, 3, 8, 17, 0, 0, 0, 0x0, 966, 0, 0 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 69, 7, 3, 1, 17, 0, 0, 0, Route118_EventScript_290ED3, 1121, 0, 0 - object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 7, 7, 3, 8, 17, 0, 1, 4, Route118_EventScript_1F40A7, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 5, 3, 12, 0, 0, 31, BerryTreeScript, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, 12, 0, 0, 32, BerryTreeScript, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, 12, 0, 0, 33, BerryTreeScript, 0 + object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 64, 10, 3, 8, 0, 1, 3, Route118_EventScript_1F4079, 0 + object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, Route118_EventScript_28CE16, 797 + object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, Route118_EventScript_28CE36, 797 + object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 12, 10, 3, 2, 17, 0, 0, Route118_EventScript_1F3E73, 0 + object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, Route118_EventScript_28CED6, 901 + object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, Route118_EventScript_28CEF6, 901 + object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, Route118_EventScript_28CF16, 904 + object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, Route118_EventScript_28CF36, 904 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, 1, 0, 0, 0, Route118_EventScript_2906BB, 17 + object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 8, 3, 9, 0, 0, 0, Route118_EventScript_1F3E14, 0 + object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 12, 3, 7, 0, 1, 4, Route118_EventScript_1F3F87, 0 + object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 14, 14, 3, 8, 0, 1, 0, Route118_EventScript_1F4000, 0 + object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 56, 7, 3, 16, 0, 1, 3, Route118_EventScript_1F4090, 0 + object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 39, 15, 3, 1, 0, 1, 2, Route118_EventScript_1F3FE9, 0 + object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 17, 11, 3, 15, 17, 1, 3, Route118_EventScript_1F4017, 0 + object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, 8, 17, 0, 0, 0x0, 966 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, 1, 17, 0, 0, Route118_EventScript_290ED3, 1121 + object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 7, 3, 8, 17, 1, 4, Route118_EventScript_1F40A7, 0 Route118_MapWarps: @ 852ACAC warp_def 42, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc index c057150a41..a5e781b87d 100644 --- a/data/maps/events/Route119.inc +++ b/data/maps/events/Route119.inc @@ -1,47 +1,47 @@ Route119_EventObjects: @ 852AD6C - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 24, 5, 3, 12, 0, 0, 0, 34, BerryTreeScript, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 25, 5, 3, 12, 0, 0, 0, 35, BerryTreeScript, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 26, 5, 3, 12, 0, 0, 0, 36, BerryTreeScript, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 12, 123, 3, 59, 0, 0, 1, 1, Route119_EventScript_1F47E2, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 0, 26, 123, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F47B4, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_MANIAC, 0, 0, 5, 125, 3, 62, 0, 0, 1, 1, Route119_EventScript_1F479D, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_CAMPER, 0, 0, 7, 74, 3, 18, 0, 0, 1, 3, Route119_EventScript_1F4810, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 0, 28, 116, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F4786, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_PICNICKER, 0, 0, 35, 83, 4, 8, 0, 0, 1, 2, Route119_EventScript_1F4872, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 34, 122, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47CB, 0, 0, 0 - object_event 11, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 17, 128, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47F9, 0, 0, 0 - object_event 12, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 28, 14, 3, 57, 0, 0, 1, 1, Route119_EventScript_1F4902, 0, 0, 0 - object_event 13, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 19, 49, 3, 58, 0, 0, 1, 3, Route119_EventScript_1F4919, 0, 0, 0 - object_event 14, EVENT_OBJ_GFX_MAN_6, 0, 0, 10, 50, 4, 10, 0, 0, 1, 3, Route119_EventScript_1F48D4, 0, 0, 0 - object_event 15, EVENT_OBJ_GFX_MAN_6, 0, 0, 8, 63, 3, 8, 0, 0, 1, 5, Route119_EventScript_1F48EB, 0, 0, 0 - object_event 16, EVENT_OBJ_GFX_HIPSTER, 0, 0, 25, 32, 3, 7, 0, 0, 0, 0, 0x0, 851, 0, 0 - object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 121, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EE0, 1024, 0, 0 - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 96, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EED, 1025, 0, 0 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 53, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EFA, 1026, 0, 0 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 25, 76, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F07, 1027, 0, 0 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 18, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F14, 1028, 0, 0 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 33, 117, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F21, 1029, 0, 0 - object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 33, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49A3, 890, 0, 0 - object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 34, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49BA, 890, 0, 0 - object_event 25, EVENT_OBJ_GFX_GIDDY, 0, 0, 17, 33, 4, 7, 0, 0, 0, 0, 0x0, 923, 0, 0 - object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 0, 31, 109, 3, 8, 17, 0, 0, 0, Route119_EventScript_1F49D1, 0, 0, 0 - object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 8, 23, 3, 12, 0, 0, 0, 83, BerryTreeScript, 0, 0, 0 - object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 9, 23, 3, 12, 0, 0, 0, 84, BerryTreeScript, 0, 0, 0 - object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 29, 90, 3, 12, 0, 0, 0, 85, BerryTreeScript, 0, 0, 0 - object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 30, 90, 3, 12, 0, 0, 0, 86, BerryTreeScript, 0, 0, 0 - object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 19, 133, 3, 5, 18, 0, 0, 0, Route119_EventScript_1F476B, 0, 0, 0 - object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 56, 3, 1, 17, 0, 0, 0, Route119_EventScript_290F2E, 1106, 0, 0 - object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 0, 35, 93, 4, 2, 17, 0, 0, 0, Route119_EventScript_1F49DA, 0, 0, 0 - object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 29, 6, 3, 57, 17, 0, 1, 3, Route119_EventScript_1F4930, 0, 0, 0 - object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 31, 6, 3, 76, 17, 0, 0, 0, Route119_EventScript_27231C, 989, 0, 0 - object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 25, 15, 3, 76, 17, 0, 0, 0, Route119_EventScript_272329, 990, 0, 0 - object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 13, 104, 3, 10, 17, 0, 1, 0, Route119_EventScript_1F4947, 0, 0, 0 - object_event 38, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 8, 68, 3, 7, 17, 0, 1, 5, Route119_EventScript_1F498C, 0, 0, 0 - object_event 39, EVENT_OBJ_GFX_MAN_6, 0, 0, 16, 52, 3, 10, 17, 0, 1, 3, Route119_EventScript_1F4975, 0, 0, 0 - object_event 40, EVENT_OBJ_GFX_MAN_6, 0, 0, 32, 15, 3, 9, 17, 0, 1, 4, Route119_EventScript_1F495E, 0, 0, 0 - object_event 41, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 19, 5, 4, 1, 17, 0, 0, 0, Route119_EventScript_291399, 1134, 0, 0 - object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 24, 42, 3, 1, 17, 0, 0, 0, Route119_EventScript_290F3B, 1147, 0, 0 - object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 0, 28, 25, 3, 8, 0, 0, 0, 0, 0x0, 786, 0, 0 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 5, 3, 12, 0, 0, 34, BerryTreeScript, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 5, 3, 12, 0, 0, 35, BerryTreeScript, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 26, 5, 3, 12, 0, 0, 36, BerryTreeScript, 0 + object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 12, 123, 3, 59, 0, 1, 1, Route119_EventScript_1F47E2, 0 + object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 26, 123, 3, 60, 0, 1, 1, Route119_EventScript_1F47B4, 0 + object_event 6, EVENT_OBJ_GFX_MANIAC, 0, 5, 125, 3, 62, 0, 1, 1, Route119_EventScript_1F479D, 0 + object_event 7, EVENT_OBJ_GFX_CAMPER, 0, 7, 74, 3, 18, 0, 1, 3, Route119_EventScript_1F4810, 0 + object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 116, 3, 60, 0, 1, 1, Route119_EventScript_1F4786, 0 + object_event 9, EVENT_OBJ_GFX_PICNICKER, 0, 35, 83, 4, 8, 0, 1, 2, Route119_EventScript_1F4872, 0 + object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 34, 122, 3, 61, 0, 1, 1, Route119_EventScript_1F47CB, 0 + object_event 11, EVENT_OBJ_GFX_BUG_CATCHER, 0, 17, 128, 3, 61, 0, 1, 1, Route119_EventScript_1F47F9, 0 + object_event 12, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 28, 14, 3, 57, 0, 1, 1, Route119_EventScript_1F4902, 0 + object_event 13, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 49, 3, 58, 0, 1, 3, Route119_EventScript_1F4919, 0 + object_event 14, EVENT_OBJ_GFX_MAN_6, 0, 10, 50, 4, 10, 0, 1, 3, Route119_EventScript_1F48D4, 0 + object_event 15, EVENT_OBJ_GFX_MAN_6, 0, 8, 63, 3, 8, 0, 1, 5, Route119_EventScript_1F48EB, 0 + object_event 16, EVENT_OBJ_GFX_HIPSTER, 0, 25, 32, 3, 7, 0, 0, 0, 0x0, 851 + object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 121, 3, 1, 0, 0, 0, Route119_EventScript_290EE0, 1024 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 96, 3, 1, 0, 0, 0, Route119_EventScript_290EED, 1025 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, 1, 0, 0, 0, Route119_EventScript_290EFA, 1026 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 76, 3, 1, 0, 0, 0, Route119_EventScript_290F07, 1027 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 18, 3, 1, 0, 0, 0, Route119_EventScript_290F14, 1028 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 117, 3, 1, 0, 0, 0, Route119_EventScript_290F21, 1029 + object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 33, 4, 10, 0, 0, 0, Route119_EventScript_1F49A3, 890 + object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 34, 4, 10, 0, 0, 0, Route119_EventScript_1F49BA, 890 + object_event 25, EVENT_OBJ_GFX_GIDDY, 0, 17, 33, 4, 7, 0, 0, 0, 0x0, 923 + object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 31, 109, 3, 8, 17, 0, 0, Route119_EventScript_1F49D1, 0 + object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 8, 23, 3, 12, 0, 0, 83, BerryTreeScript, 0 + object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 23, 3, 12, 0, 0, 84, BerryTreeScript, 0 + object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 90, 3, 12, 0, 0, 85, BerryTreeScript, 0 + object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 90, 3, 12, 0, 0, 86, BerryTreeScript, 0 + object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 133, 3, 5, 18, 0, 0, Route119_EventScript_1F476B, 0 + object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 56, 3, 1, 17, 0, 0, Route119_EventScript_290F2E, 1106 + object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 35, 93, 4, 2, 17, 0, 0, Route119_EventScript_1F49DA, 0 + object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, 57, 17, 1, 3, Route119_EventScript_1F4930, 0 + object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 6, 3, 76, 17, 0, 0, Route119_EventScript_27231C, 989 + object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 15, 3, 76, 17, 0, 0, Route119_EventScript_272329, 990 + object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 104, 3, 10, 17, 1, 0, Route119_EventScript_1F4947, 0 + object_event 38, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 68, 3, 7, 17, 1, 5, Route119_EventScript_1F498C, 0 + object_event 39, EVENT_OBJ_GFX_MAN_6, 0, 16, 52, 3, 10, 17, 1, 3, Route119_EventScript_1F4975, 0 + object_event 40, EVENT_OBJ_GFX_MAN_6, 0, 32, 15, 3, 9, 17, 1, 4, Route119_EventScript_1F495E, 0 + object_event 41, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 5, 4, 1, 17, 0, 0, Route119_EventScript_291399, 1134 + object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 42, 3, 1, 17, 0, 0, Route119_EventScript_290F3B, 1147 + object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 28, 25, 3, 8, 0, 0, 0, 0x0, 786 Route119_MapWarps: @ 852B174 warp_def 6, 32, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_1F diff --git a/data/maps/events/Route119_House.inc b/data/maps/events/Route119_House.inc index 9b5dbb2d8e..31dd51afd7 100644 --- a/data/maps/events/Route119_House.inc +++ b/data/maps/events/Route119_House.inc @@ -1,11 +1,11 @@ Route119_House_EventObjects: @ 853ECD0 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route119_House_EventScript_270966, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 0, 1, 6, 3, 2, 34, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 0, 4, 3, 2, 19, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 0, 2, 2, 3, 2, 17, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_WINGULL, 0, 0, 8, 5, 3, 2, 35, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 0, 6, 6, 3, 2, 34, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 0, 5, 3, 3, 2, 49, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 2, 3, 8, 0, 0, 0, Route119_House_EventScript_270966, 0 + object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 1, 6, 3, 2, 34, 0, 0, Route119_House_EventScript_27096F, 0 + object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 3, 2, 19, 0, 0, Route119_House_EventScript_27096F, 0 + object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 2, 2, 3, 2, 17, 0, 0, Route119_House_EventScript_27096F, 0 + object_event 5, EVENT_OBJ_GFX_WINGULL, 0, 8, 5, 3, 2, 35, 0, 0, Route119_House_EventScript_27096F, 0 + object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 6, 6, 3, 2, 34, 0, 0, Route119_House_EventScript_27096F, 0 + object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 5, 3, 3, 2, 49, 0, 0, Route119_House_EventScript_27096F, 0 Route119_House_MapWarps: @ 853ED78 warp_def 3, 8, 0, 1, MAP_ROUTE119 diff --git a/data/maps/events/Route119_WeatherInstitute_1F.inc b/data/maps/events/Route119_WeatherInstitute_1F.inc index d06f52da9c..2e308bf4f0 100644 --- a/data/maps/events/Route119_WeatherInstitute_1F.inc +++ b/data/maps/events/Route119_WeatherInstitute_1F.inc @@ -1,9 +1,9 @@ Route119_WeatherInstitute_1F_EventObjects: @ 853EB20 - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 3, 3, 9, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, 890, 0, 0 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 10, 5, 3, 8, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, 890, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 0, 5, 4, 3, 8, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, 892, 0, 0 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 2, 11, 3, 1, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, 892, 0, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 14, 11, 3, 2, 17, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 3, 3, 9, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, 890 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 10, 5, 3, 8, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, 890 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 5, 4, 3, 8, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, 892 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 2, 11, 3, 1, 1, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, 892 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 14, 11, 3, 2, 17, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0 Route119_WeatherInstitute_1F_MapWarps: @ 853EB98 warp_def 9, 12, 0, 0, MAP_ROUTE119 diff --git a/data/maps/events/Route119_WeatherInstitute_2F.inc b/data/maps/events/Route119_WeatherInstitute_2F.inc index 6a9d375eda..bf900b67b8 100644 --- a/data/maps/events/Route119_WeatherInstitute_2F.inc +++ b/data/maps/events/Route119_WeatherInstitute_2F.inc @@ -1,12 +1,12 @@ Route119_WeatherInstitute_2F_EventObjects: @ 853EBF4 - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 6, 3, 10, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, 890, 0, 0 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 8, 3, 13, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, 890, 0, 0 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 4, 6, 3, 10, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, 890, 0, 0 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 0, 6, 3, 10, 0, 0, 0, 0, 0x0, 893, 0, 0 - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 18, 6, 3, 1, 18, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_27018B, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 893, 0, 0 - object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 16, 6, 3, 9, 17, 0, 0, 0, 0x0, 992, 0, 0 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 19, 6, 3, 9, 17, 0, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, 890, 0, 0 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 6, 3, 10, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, 890 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 8, 3, 13, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, 890 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 4, 6, 3, 10, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, 890 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 3, 10, 0, 0, 0, 0x0, 893 + object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 6, 3, 1, 18, 0, 0, Route119_WeatherInstitute_2F_EventScript_27018B, 0 + object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 1, 7, 3, 10, 0, 0, 0, 0x0, 893 + object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 16, 6, 3, 9, 17, 0, 0, 0x0, 992 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 19, 6, 3, 9, 17, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, 890 Route119_WeatherInstitute_2F_MapWarps: @ 853ECB4 warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc index 6060c20da0..d2b22f730a 100644 --- a/data/maps/events/Route120.inc +++ b/data/maps/events/Route120.inc @@ -1,48 +1,48 @@ Route120_EventObjects: @ 852B3F8 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 4, 79, 3, 12, 0, 0, 0, 46, BerryTreeScript, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 5, 79, 3, 12, 0, 0, 0, 45, BerryTreeScript, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 6, 79, 3, 12, 0, 0, 0, 44, BerryTreeScript, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 7, 79, 3, 12, 0, 0, 0, 43, BerryTreeScript, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 34, 24, 3, 12, 0, 0, 0, 37, BerryTreeScript, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 35, 24, 3, 12, 0, 0, 0, 38, BerryTreeScript, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 36, 24, 3, 12, 0, 0, 0, 39, BerryTreeScript, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 9, 92, 5, 12, 0, 0, 0, 40, BerryTreeScript, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 10, 92, 5, 12, 0, 0, 0, 41, BerryTreeScript, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 11, 92, 5, 12, 0, 0, 0, 42, BerryTreeScript, 0, 0, 0 - object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 0, 5, 22, 3, 14, 0, 0, 1, 3, Route120_EventScript_1F57D7, 0, 0, 0 - object_event 12, EVENT_OBJ_GFX_MAN_6, 0, 0, 32, 14, 3, 10, 0, 0, 1, 3, Route120_EventScript_1F57EE, 0, 0, 0 - object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 0, 27, 51, 3, 9, 0, 0, 1, 7, Route120_EventScript_1F5850, 0, 0, 0 - object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 0, 36, 45, 3, 9, 0, 0, 1, 2, Route120_EventScript_1F5867, 0, 0, 0 - object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 0, 19, 80, 5, 15, 0, 0, 1, 3, Route120_EventScript_1F587E, 0, 0, 0 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 20, 55, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F48, 1030, 0, 0 - object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE76, 798, 0, 0 - object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE56, 798, 0, 0 - object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF16, 902, 0, 0 - object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF36, 902, 0, 0 - object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 35, 32, 3, 1, 0, 0, 0, 0, Route120_EventScript_2906BB, 17, 0, 0 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 89, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F55, 1031, 0, 0 - object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 0, 14, 92, 5, 5, 1, 0, 0, 0, Route120_EventScript_1F5527, 0, 0, 0 - object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 31, 37, 3, 15, 0, 0, 1, 4, Route120_EventScript_1F58E0, 0, 0, 0 - object_event 25, EVENT_OBJ_GFX_HIKER, 0, 0, 9, 60, 3, 21, 0, 0, 1, 4, Route120_EventScript_1F58F7, 0, 0, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 16, 6, 3, 23, 0, 0, 1, 4, Route120_EventScript_1F590E, 0, 0, 0 - object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 18, 34, 3, 9, 0, 0, 1, 3, Route120_EventScript_1F5925, 0, 0, 0 - object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 22, 13, 3, 1, 17, 0, 0, 0, Route120_EventScript_290F6F, 1108, 0, 0 - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 23, 82, 5, 1, 17, 0, 0, 0, Route120_EventScript_290F62, 1107, 0, 0 - object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 12, 16, 4, 76, 17, 0, 0, 0, Route120_EventScript_1F57BC, 970, 0, 0 - object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 0, 13, 15, 4, 8, 17, 0, 0, 0, Route120_EventScript_1F5641, 972, 0, 0 - object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 20, 1, 3, 1, 17, 0, 0, 0, Route120_EventScript_2906BB, 20, 0, 0 - object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 15, 1, 3, 1, 17, 0, 0, 0, Route120_EventScript_2906BB, 18, 0, 0 - object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 10, 72, 3, 58, 17, 0, 1, 3, Route120_EventScript_1F593C, 0, 0, 0 - object_event 35, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 19, 28, 3, 57, 17, 0, 1, 3, Route120_EventScript_1F5953, 0, 0, 0 - object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 0, 12, 16, 3, 8, 17, 0, 0, 0, 0x0, 981, 0, 0 - object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 20, 11, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722DB, 982, 0, 0 - object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 27, 2, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722E8, 985, 0, 0 - object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 4, 77, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722F5, 986, 0, 0 - object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 7, 51, 3, 76, 17, 0, 0, 0, Route120_EventScript_27230F, 988, 0, 0 - object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 19, 48, 3, 76, 17, 0, 0, 0, Route120_EventScript_272302, 987, 0, 0 - object_event 42, EVENT_OBJ_GFX_GIRL_3, 0, 0, 19, 32, 3, 7, 17, 0, 1, 3, Route120_EventScript_1F5981, 0, 0, 0 - object_event 43, EVENT_OBJ_GFX_MAN_4, 0, 0, 14, 34, 3, 10, 17, 0, 1, 3, Route120_EventScript_1F596A, 0, 0, 0 - object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 24, 33, 3, 1, 17, 0, 0, 0, Route120_EventScript_290F7C, 1148, 0, 0 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 4, 79, 3, 12, 0, 0, 46, BerryTreeScript, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 79, 3, 12, 0, 0, 45, BerryTreeScript, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 79, 3, 12, 0, 0, 44, BerryTreeScript, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 79, 3, 12, 0, 0, 43, BerryTreeScript, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 24, 3, 12, 0, 0, 37, BerryTreeScript, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 24, 3, 12, 0, 0, 38, BerryTreeScript, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 24, 3, 12, 0, 0, 39, BerryTreeScript, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 92, 5, 12, 0, 0, 40, BerryTreeScript, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 10, 92, 5, 12, 0, 0, 41, BerryTreeScript, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 92, 5, 12, 0, 0, 42, BerryTreeScript, 0 + object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 5, 22, 3, 14, 0, 1, 3, Route120_EventScript_1F57D7, 0 + object_event 12, EVENT_OBJ_GFX_MAN_6, 0, 32, 14, 3, 10, 0, 1, 3, Route120_EventScript_1F57EE, 0 + object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 27, 51, 3, 9, 0, 1, 7, Route120_EventScript_1F5850, 0 + object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 36, 45, 3, 9, 0, 1, 2, Route120_EventScript_1F5867, 0 + object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 19, 80, 5, 15, 0, 1, 3, Route120_EventScript_1F587E, 0 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 55, 3, 1, 0, 0, 0, Route120_EventScript_290F48, 1030 + object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, 8, 0, 0, 0, Route120_EventScript_28CE76, 798 + object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, 8, 0, 0, 0, Route120_EventScript_28CE56, 798 + object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, 8, 0, 0, 0, Route120_EventScript_28CF16, 902 + object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, 8, 0, 0, 0, Route120_EventScript_28CF36, 902 + object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, 1, 0, 0, 0, Route120_EventScript_2906BB, 17 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, 1, 0, 0, 0, Route120_EventScript_290F55, 1031 + object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 14, 92, 5, 5, 1, 0, 0, Route120_EventScript_1F5527, 0 + object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 31, 37, 3, 15, 0, 1, 4, Route120_EventScript_1F58E0, 0 + object_event 25, EVENT_OBJ_GFX_HIKER, 0, 9, 60, 3, 21, 0, 1, 4, Route120_EventScript_1F58F7, 0 + object_event 26, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 6, 3, 23, 0, 1, 4, Route120_EventScript_1F590E, 0 + object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 34, 3, 9, 0, 1, 3, Route120_EventScript_1F5925, 0 + object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, 1, 17, 0, 0, Route120_EventScript_290F6F, 1108 + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, 1, 17, 0, 0, Route120_EventScript_290F62, 1107 + object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, 76, 17, 0, 0, Route120_EventScript_1F57BC, 970 + object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, 8, 17, 0, 0, Route120_EventScript_1F5641, 972 + object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, 1, 17, 0, 0, Route120_EventScript_2906BB, 20 + object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, 1, 17, 0, 0, Route120_EventScript_2906BB, 18 + object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 10, 72, 3, 58, 17, 1, 3, Route120_EventScript_1F593C, 0 + object_event 35, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 28, 3, 57, 17, 1, 3, Route120_EventScript_1F5953, 0 + object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, 8, 17, 0, 0, 0x0, 981 + object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, 76, 17, 0, 0, Route120_EventScript_2722DB, 982 + object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, 76, 17, 0, 0, Route120_EventScript_2722E8, 985 + object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, 76, 17, 0, 0, Route120_EventScript_2722F5, 986 + object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, 76, 17, 0, 0, Route120_EventScript_27230F, 988 + object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, 76, 17, 0, 0, Route120_EventScript_272302, 987 + object_event 42, EVENT_OBJ_GFX_GIRL_3, 0, 19, 32, 3, 7, 17, 1, 3, Route120_EventScript_1F5981, 0 + object_event 43, EVENT_OBJ_GFX_MAN_4, 0, 14, 34, 3, 10, 17, 1, 3, Route120_EventScript_1F596A, 0 + object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 33, 3, 1, 17, 0, 0, Route120_EventScript_290F7C, 1148 Route120_MapWarps: @ 852B818 warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc index 5446772bfc..77dec98a51 100644 --- a/data/maps/events/Route121.inc +++ b/data/maps/events/Route121.inc @@ -1,33 +1,33 @@ Route121_EventObjects: @ 852BA14 - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 29, 14, 3, 10, 17, 0, 0, 0, Route121_EventScript_1F5DFD, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 14, 2, 3, 12, 0, 0, 0, 47, BerryTreeScript, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 15, 2, 3, 12, 0, 0, 0, 48, BerryTreeScript, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 16, 2, 3, 12, 0, 0, 0, 49, BerryTreeScript, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 17, 2, 3, 12, 0, 0, 0, 50, BerryTreeScript, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 64, 14, 3, 12, 0, 0, 0, 51, BerryTreeScript, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 65, 14, 3, 12, 0, 0, 0, 52, BerryTreeScript, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 66, 14, 3, 12, 0, 0, 0, 53, BerryTreeScript, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 67, 14, 3, 12, 0, 0, 0, 54, BerryTreeScript, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_LASS, 0, 0, 39, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F04, 0, 0, 0 - object_event 11, EVENT_OBJ_GFX_LASS, 0, 0, 40, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F1F, 0, 0, 0 - object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 8, 3, 7, 0, 0, 0, 0, 0x0, 914, 0, 0 - object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 7, 3, 10, 0, 0, 0, 0, 0x0, 914, 0, 0 - object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 31, 7, 3, 9, 0, 0, 0, 0, 0x0, 914, 0, 0 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 32, 5, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 17, 0, 0 - object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 65, 4, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 18, 0, 0 - object_event 17, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 63, 5, 3, 9, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0, 0, 0 - object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 55, 8, 3, 9, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0, 0, 0 - object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 11, 11, 3, 7, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0, 0, 0 - object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 0, 22, 5, 3, 17, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0, 0, 0 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 55, 10, 3, 1, 17, 0, 0, 0, Route121_EventScript_290F89, 1103, 0, 0 - object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 26, 12, 3, 1, 17, 0, 0, 0, Route121_EventScript_2906BB, 19, 0, 0 - object_event 23, EVENT_OBJ_GFX_MANIAC, 0, 0, 11, 6, 3, 26, 65, 0, 1, 3, Route121_EventScript_1F5F9C, 0, 0, 0 - object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 0, 59, 8, 3, 8, 17, 0, 1, 4, Route121_EventScript_1F5FB3, 0, 0, 0 - object_event 25, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 59, 13, 3, 7, 17, 0, 1, 4, Route121_EventScript_1F5FCA, 0, 0, 0 - object_event 26, EVENT_OBJ_GFX_MAN_4, 0, 0, 65, 9, 3, 18, 17, 0, 1, 6, Route121_EventScript_1F5FE1, 0, 0, 0 - object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 72, 9, 3, 17, 17, 0, 1, 6, Route121_EventScript_1F5FF8, 0, 0, 0 - object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 60, 10, 3, 1, 17, 0, 0, 0, Route121_EventScript_290F96, 1149, 0, 0 - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 38, 13, 3, 1, 17, 0, 0, 0, Route121_EventScript_290FA3, 1150, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 29, 14, 3, 10, 17, 0, 0, Route121_EventScript_1F5DFD, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 2, 3, 12, 0, 0, 47, BerryTreeScript, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 2, 3, 12, 0, 0, 48, BerryTreeScript, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 16, 2, 3, 12, 0, 0, 49, BerryTreeScript, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 2, 3, 12, 0, 0, 50, BerryTreeScript, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 64, 14, 3, 12, 0, 0, 51, BerryTreeScript, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 65, 14, 3, 12, 0, 0, 52, BerryTreeScript, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 66, 14, 3, 12, 0, 0, 53, BerryTreeScript, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 67, 14, 3, 12, 0, 0, 54, BerryTreeScript, 0 + object_event 10, EVENT_OBJ_GFX_LASS, 0, 39, 9, 3, 8, 0, 1, 1, Route121_EventScript_1F5F04, 0 + object_event 11, EVENT_OBJ_GFX_LASS, 0, 40, 9, 3, 8, 0, 1, 1, Route121_EventScript_1F5F1F, 0 + object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 8, 3, 7, 0, 0, 0, 0x0, 914 + object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 7, 3, 10, 0, 0, 0, 0x0, 914 + object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 7, 3, 9, 0, 0, 0, 0x0, 914 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, 1, 0, 0, 0, Route121_EventScript_2906BB, 17 + object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, 1, 0, 0, 0, Route121_EventScript_2906BB, 18 + object_event 17, EVENT_OBJ_GFX_WOMAN_2, 0, 63, 5, 3, 9, 0, 1, 4, Route121_EventScript_1F5E74, 0 + object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 8, 3, 9, 0, 1, 3, Route121_EventScript_1F5E8B, 0 + object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 11, 3, 7, 0, 1, 4, Route121_EventScript_1F5EED, 0 + object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 5, 3, 17, 0, 1, 4, Route121_EventScript_1F5F3A, 0 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, 1, 17, 0, 0, Route121_EventScript_290F89, 1103 + object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, 1, 17, 0, 0, Route121_EventScript_2906BB, 19 + object_event 23, EVENT_OBJ_GFX_MANIAC, 0, 11, 6, 3, 26, 65, 1, 3, Route121_EventScript_1F5F9C, 0 + object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 59, 8, 3, 8, 17, 1, 4, Route121_EventScript_1F5FB3, 0 + object_event 25, EVENT_OBJ_GFX_WOMAN_3, 0, 59, 13, 3, 7, 17, 1, 4, Route121_EventScript_1F5FCA, 0 + object_event 26, EVENT_OBJ_GFX_MAN_4, 0, 65, 9, 3, 18, 17, 1, 6, Route121_EventScript_1F5FE1, 0 + object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 72, 9, 3, 17, 17, 1, 6, Route121_EventScript_1F5FF8, 0 + object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 60, 10, 3, 1, 17, 0, 0, Route121_EventScript_290F96, 1149 + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, 1, 17, 0, 0, Route121_EventScript_290FA3, 1150 Route121_MapWarps: @ 852BCCC warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE diff --git a/data/maps/events/Route121_SafariZoneEntrance.inc b/data/maps/events/Route121_SafariZoneEntrance.inc index b19240c8dc..2b56e1b1a5 100644 --- a/data/maps/events/Route121_SafariZoneEntrance.inc +++ b/data/maps/events/Route121_SafariZoneEntrance.inc @@ -1,7 +1,7 @@ Route121_SafariZoneEntrance_EventObjects: @ 8533EDC - object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 0, 17, 9, 3, 9, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBE6, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 0, 10, 2, 3, 8, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBEF, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 17, 9, 3, 9, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBE6, 0 + object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 10, 2, 3, 8, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBEF, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 8, 2, 3, 8, 0, 0, 0, 0x0, 0 Route121_SafariZoneEntrance_MapWarps: @ 8533F24 warp_def 2, 5, 0, 0, MAP_SAFARI_ZONE_SOUTH diff --git a/data/maps/events/Route123.inc b/data/maps/events/Route123.inc index f6d8f986db..717fce4d07 100644 --- a/data/maps/events/Route123.inc +++ b/data/maps/events/Route123.inc @@ -1,47 +1,47 @@ Route123_EventObjects: @ 852BDBC - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 11, 3, 3, 12, 0, 0, 0, 58, BerryTreeScript, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 12, 3, 3, 12, 0, 0, 0, 59, BerryTreeScript, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 14, 3, 3, 12, 0, 0, 0, 60, BerryTreeScript, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 15, 3, 3, 12, 0, 0, 0, 61, BerryTreeScript, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 81, 1, 3, 12, 0, 0, 0, 62, BerryTreeScript, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 82, 1, 3, 12, 0, 0, 0, 63, BerryTreeScript, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 83, 1, 3, 12, 0, 0, 0, 64, BerryTreeScript, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 70, 12, 3, 24, 0, 0, 1, 1, Route123_EventScript_1F61C5, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 0, 58, 7, 3, 17, 0, 0, 1, 2, Route123_EventScript_1F61DC, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 14, 5, 3, 12, 0, 0, 0, 65, BerryTreeScript, 0, 0, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 15, 5, 3, 12, 0, 0, 0, 72, BerryTreeScript, 0, 0, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 17, 5, 3, 12, 0, 0, 0, 73, BerryTreeScript, 0, 0, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 18, 5, 3, 12, 0, 0, 0, 74, BerryTreeScript, 0, 0, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 17, 3, 3, 12, 0, 0, 0, 79, BerryTreeScript, 0, 0, 0 - object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 18, 3, 3, 12, 0, 0, 0, 14, BerryTreeScript, 0, 0, 0 - object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 11, 5, 3, 12, 0, 0, 0, 15, BerryTreeScript, 0, 0, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 12, 5, 3, 12, 0, 0, 0, 30, BerryTreeScript, 0, 0, 0 - object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 101, 13, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 17, 0, 0 - object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 129, 14, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 18, 0, 0 - object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 92, 9, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 19, 0, 0 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 8, 3, 1, 0, 0, 0, 0, Route123_EventScript_290FB0, 1032, 0, 0 - object_event 22, EVENT_OBJ_GFX_GIRL_3, 0, 0, 108, 13, 3, 15, 0, 0, 0, 0, Route123_EventScript_1F6151, 0, 0, 0 - object_event 23, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 109, 13, 3, 12, 0, 0, 0, 87, BerryTreeScript, 0, 0, 0 - object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 110, 13, 3, 12, 0, 0, 0, 88, BerryTreeScript, 0, 0, 0 - object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 111, 13, 3, 12, 0, 0, 0, 89, BerryTreeScript, 0, 0, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 18, 9, 3, 23, 0, 0, 1, 2, Route123_EventScript_1F61F3, 0, 0, 0 - object_event 27, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 38, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62E9, 0, 0, 0 - object_event 28, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 37, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62CE, 0, 0, 0 - object_event 29, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 138, 12, 3, 9, 0, 0, 1, 7, Route123_EventScript_1F620A, 0, 0, 0 - object_event 30, EVENT_OBJ_GFX_LASS, 0, 0, 49, 16, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F626C, 0, 0, 0 - object_event 31, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 87, 12, 3, 8, 0, 0, 1, 4, Route123_EventScript_1F6304, 0, 0, 0 - object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 27, 18, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FBD, 1104, 0, 0 - object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 75, 9, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FCA, 1109, 0, 0 - object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 138, 14, 3, 57, 17, 0, 1, 1, Route123_EventScript_1F6377, 0, 0, 0 - object_event 35, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 138, 16, 3, 7, 17, 0, 1, 1, Route123_EventScript_1F6360, 0, 0, 0 - object_event 36, EVENT_OBJ_GFX_MANIAC, 0, 0, 87, 17, 3, 7, 17, 0, 1, 4, Route123_EventScript_1F6349, 0, 0, 0 - object_event 37, EVENT_OBJ_GFX_MAN_6, 0, 0, 66, 16, 3, 8, 17, 0, 1, 2, Route123_EventScript_1F63BC, 0, 0, 0 - object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 0, 66, 19, 3, 7, 17, 0, 1, 2, Route123_EventScript_1F6332, 0, 0, 0 - object_event 39, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 49, 19, 3, 7, 17, 0, 1, 2, Route123_EventScript_1F631B, 0, 0, 0 - object_event 40, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 43, 15, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FD7, 1152, 0, 0 - object_event 41, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 14, 16, 3, 7, 17, 0, 1, 3, Route123_EventScript_1F638E, 0, 0, 0 - object_event 42, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 14, 12, 3, 26, 49, 0, 1, 3, Route123_EventScript_1F63A5, 0, 0, 0 - object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 57, 16, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FE4, 1153, 0, 0 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 3, 3, 12, 0, 0, 58, BerryTreeScript, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 3, 3, 12, 0, 0, 59, BerryTreeScript, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 3, 3, 12, 0, 0, 60, BerryTreeScript, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 3, 3, 12, 0, 0, 61, BerryTreeScript, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 81, 1, 3, 12, 0, 0, 62, BerryTreeScript, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 82, 1, 3, 12, 0, 0, 63, BerryTreeScript, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 83, 1, 3, 12, 0, 0, 64, BerryTreeScript, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 70, 12, 3, 24, 0, 1, 1, Route123_EventScript_1F61C5, 0 + object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 58, 7, 3, 17, 0, 1, 2, Route123_EventScript_1F61DC, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, 12, 0, 0, 65, BerryTreeScript, 0 + object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 5, 3, 12, 0, 0, 72, BerryTreeScript, 0 + object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 5, 3, 12, 0, 0, 73, BerryTreeScript, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, 12, 0, 0, 74, BerryTreeScript, 0 + object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 3, 3, 12, 0, 0, 79, BerryTreeScript, 0 + object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 3, 3, 12, 0, 0, 14, BerryTreeScript, 0 + object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, 12, 0, 0, 15, BerryTreeScript, 0 + object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, 12, 0, 0, 30, BerryTreeScript, 0 + object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 101, 13, 3, 1, 0, 0, 0, Route123_EventScript_2906BB, 17 + object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 14, 3, 1, 0, 0, 0, Route123_EventScript_2906BB, 18 + object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 9, 3, 1, 0, 0, 0, Route123_EventScript_2906BB, 19 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 8, 3, 1, 0, 0, 0, Route123_EventScript_290FB0, 1032 + object_event 22, EVENT_OBJ_GFX_GIRL_3, 0, 108, 13, 3, 15, 0, 0, 0, Route123_EventScript_1F6151, 0 + object_event 23, EVENT_OBJ_GFX_BERRY_TREE, 0, 109, 13, 3, 12, 0, 0, 87, BerryTreeScript, 0 + object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 110, 13, 3, 12, 0, 0, 88, BerryTreeScript, 0 + object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 111, 13, 3, 12, 0, 0, 89, BerryTreeScript, 0 + object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 9, 3, 23, 0, 1, 2, Route123_EventScript_1F61F3, 0 + object_event 27, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 13, 3, 8, 0, 1, 1, Route123_EventScript_1F62E9, 0 + object_event 28, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 37, 13, 3, 8, 0, 1, 1, Route123_EventScript_1F62CE, 0 + object_event 29, EVENT_OBJ_GFX_PSYCHIC_M, 0, 138, 12, 3, 9, 0, 1, 7, Route123_EventScript_1F620A, 0 + object_event 30, EVENT_OBJ_GFX_LASS, 0, 49, 16, 3, 8, 0, 1, 1, Route123_EventScript_1F626C, 0 + object_event 31, EVENT_OBJ_GFX_HEX_MANIAC, 0, 87, 12, 3, 8, 0, 1, 4, Route123_EventScript_1F6304, 0 + object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 18, 3, 1, 17, 0, 0, Route123_EventScript_290FBD, 1104 + object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 9, 3, 1, 17, 0, 0, Route123_EventScript_290FCA, 1109 + object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 138, 14, 3, 57, 17, 1, 1, Route123_EventScript_1F6377, 0 + object_event 35, EVENT_OBJ_GFX_WOMAN_3, 0, 138, 16, 3, 7, 17, 1, 1, Route123_EventScript_1F6360, 0 + object_event 36, EVENT_OBJ_GFX_MANIAC, 0, 87, 17, 3, 7, 17, 1, 4, Route123_EventScript_1F6349, 0 + object_event 37, EVENT_OBJ_GFX_MAN_6, 0, 66, 16, 3, 8, 17, 1, 2, Route123_EventScript_1F63BC, 0 + object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 66, 19, 3, 7, 17, 1, 2, Route123_EventScript_1F6332, 0 + object_event 39, EVENT_OBJ_GFX_OLD_MAN_1, 0, 49, 19, 3, 7, 17, 1, 2, Route123_EventScript_1F631B, 0 + object_event 40, EVENT_OBJ_GFX_ITEM_BALL, 0, 43, 15, 3, 1, 17, 0, 0, Route123_EventScript_290FD7, 1152 + object_event 41, EVENT_OBJ_GFX_WOMAN_7, 0, 14, 16, 3, 7, 17, 1, 3, Route123_EventScript_1F638E, 0 + object_event 42, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 12, 3, 26, 49, 1, 3, Route123_EventScript_1F63A5, 0 + object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 57, 16, 3, 1, 17, 0, 0, Route123_EventScript_290FE4, 1153 Route123_MapWarps: @ 852C1C4 warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE diff --git a/data/maps/events/Route123_BerryMastersHouse.inc b/data/maps/events/Route123_BerryMastersHouse.inc index d250f8f392..f889fe387b 100644 --- a/data/maps/events/Route123_BerryMastersHouse.inc +++ b/data/maps/events/Route123_BerryMastersHouse.inc @@ -1,6 +1,6 @@ Route123_BerryMastersHouse_EventObjects: @ 853EACC - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F845, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 7, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F845, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 4, 3, 8, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0 Route123_BerryMastersHouse_MapWarps: @ 853EAFC warp_def 3, 7, 0, 0, MAP_ROUTE123 diff --git a/data/maps/events/Route124.inc b/data/maps/events/Route124.inc index dc4adebc47..6125be0cf5 100644 --- a/data/maps/events/Route124.inc +++ b/data/maps/events/Route124.inc @@ -1,16 +1,16 @@ Route124_EventObjects: @ 852C3C4 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 34, 25, 1, 1, 5, 0, 1, 3, Route124_EventScript_1F6585, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 61, 74, 1, 67, 53, 0, 1, 7, Route124_EventScript_1F659C, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 49, 45, 1, 24, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 7, 23, 1, 18, 134, 0, 1, 5, Route124_EventScript_1F6615, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 58, 58, 1, 28, 7, 0, 1, 2, Route124_EventScript_1F662C, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 28, 12, 3, 1, 17, 0, 0, 0, Route124_EventScript_290FF1, 1092, 0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 53, 3, 1, 17, 0, 0, 0, Route124_EventScript_290FFE, 1093, 0, 0 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 58, 11, 3, 1, 17, 0, 0, 0, Route124_EventScript_29100B, 1066, 0, 0 - object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 18, 44, 1, 8, 17, 0, 1, 1, Route124_EventScript_1F6643, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 17, 44, 1, 8, 17, 0, 1, 1, Route124_EventScript_1F66A7, 0, 0, 0 - object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 7, 29, 1, 7, 17, 0, 1, 5, Route124_EventScript_1F670B, 0, 0, 0 - object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 69, 74, 1, 66, 17, 0, 1, 7, Route124_EventScript_1F6722, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 34, 25, 1, 1, 5, 1, 3, Route124_EventScript_1F6585, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 61, 74, 1, 67, 53, 1, 7, Route124_EventScript_1F659C, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, 24, 0, 1, 3, Route124_EventScript_1F65B3, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 23, 1, 18, 134, 1, 5, Route124_EventScript_1F6615, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 58, 1, 28, 7, 1, 2, Route124_EventScript_1F662C, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, 1, 17, 0, 0, Route124_EventScript_290FF1, 1092 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, 1, 17, 0, 0, Route124_EventScript_290FFE, 1093 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, 1, 17, 0, 0, Route124_EventScript_29100B, 1066 + object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, 8, 17, 1, 1, Route124_EventScript_1F6643, 0 + object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, 8, 17, 1, 1, Route124_EventScript_1F66A7, 0 + object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 29, 1, 7, 17, 1, 5, Route124_EventScript_1F670B, 0 + object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 74, 1, 66, 17, 1, 7, Route124_EventScript_1F6722, 0 Route124_MapWarps: @ 852C4E4 warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc index d4fb69d74e..71bbc705f9 100644 --- a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc +++ b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc @@ -1,5 +1,5 @@ Route124_DivingTreasureHuntersHouse_EventObjects: @ 853ED9C - object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 0, 5, 4, 0, 9, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 5, 4, 0, 9, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0 Route124_DivingTreasureHuntersHouse_MapWarps: @ 853EDB4 warp_def 3, 8, 0, 0, MAP_ROUTE124 diff --git a/data/maps/events/Route125.inc b/data/maps/events/Route125.inc index 81a9dbcead..2ca6fb70bc 100644 --- a/data/maps/events/Route125.inc +++ b/data/maps/events/Route125.inc @@ -1,14 +1,14 @@ Route125_EventObjects: @ 852C50C - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 7, 31, 1, 28, 0, 0, 1, 2, Route125_EventScript_1F67A4, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 45, 9, 1, 10, 82, 0, 1, 2, Route125_EventScript_1F67BB, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 38, 24, 1, 28, 6, 0, 1, 3, Route125_EventScript_1F67D2, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 30, 28, 1, 52, 153, 0, 1, 3, Route125_EventScript_1F67E9, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 0, 21, 30, 3, 13, 0, 0, 1, 2, Route125_EventScript_1F6800, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_LASS, 0, 0, 17, 19, 3, 8, 17, 0, 1, 1, Route125_EventScript_1F6862, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 0, 18, 19, 3, 8, 17, 0, 1, 1, Route125_EventScript_1F687D, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 0, 43, 19, 3, 28, 18, 0, 1, 3, Route125_EventScript_1F6898, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 48, 19, 3, 27, 18, 0, 1, 3, Route125_EventScript_1F68AF, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 46, 17, 3, 1, 17, 0, 0, 0, Route125_EventScript_291018, 1154, 0, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 31, 1, 28, 0, 1, 2, Route125_EventScript_1F67A4, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 9, 1, 10, 82, 1, 2, Route125_EventScript_1F67BB, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 38, 24, 1, 28, 6, 1, 3, Route125_EventScript_1F67D2, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 30, 28, 1, 52, 153, 1, 3, Route125_EventScript_1F67E9, 0 + object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 21, 30, 3, 13, 0, 1, 2, Route125_EventScript_1F6800, 0 + object_event 6, EVENT_OBJ_GFX_LASS, 0, 17, 19, 3, 8, 17, 1, 1, Route125_EventScript_1F6862, 0 + object_event 7, EVENT_OBJ_GFX_LASS, 0, 18, 19, 3, 8, 17, 1, 1, Route125_EventScript_1F687D, 0 + object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 43, 19, 3, 28, 18, 1, 3, Route125_EventScript_1F6898, 0 + object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 48, 19, 3, 27, 18, 1, 3, Route125_EventScript_1F68AF, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 46, 17, 3, 1, 17, 0, 0, Route125_EventScript_291018, 1154 Route125_MapWarps: @ 852C5FC warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM diff --git a/data/maps/events/Route126.inc b/data/maps/events/Route126.inc index f6d4a71a5e..981e6f1d41 100644 --- a/data/maps/events/Route126.inc +++ b/data/maps/events/Route126.inc @@ -1,13 +1,13 @@ Route126_EventObjects: @ 852C648 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 51, 65, 1, 51, 58, 0, 1, 3, Route126_EventScript_1F68D6, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 56, 22, 1, 28, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 63, 43, 1, 24, 0, 0, 1, 3, Route126_EventScript_1F6904, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 9, 48, 1, 7, 0, 0, 1, 3, Route126_EventScript_1F691B, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 1, 3, 1, 17, 0, 0, 0, Route126_EventScript_291025, 1105, 0, 0 - object_event 6, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 15, 66, 1, 66, 17, 0, 1, 7, Route126_EventScript_1F6960, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 7, 66, 1, 67, 17, 0, 1, 7, Route126_EventScript_1F6977, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 64, 5, 1, 66, 17, 0, 1, 7, Route126_EventScript_1F6949, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 56, 5, 1, 67, 17, 0, 1, 7, Route126_EventScript_1F6932, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 51, 65, 1, 51, 58, 1, 3, Route126_EventScript_1F68D6, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 22, 1, 28, 9, 1, 3, Route126_EventScript_1F68ED, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 63, 43, 1, 24, 0, 1, 3, Route126_EventScript_1F6904, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 48, 1, 7, 0, 1, 3, Route126_EventScript_1F691B, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 1, 3, 1, 17, 0, 0, Route126_EventScript_291025, 1105 + object_event 6, EVENT_OBJ_GFX_SWIMMER_F, 0, 15, 66, 1, 66, 17, 1, 7, Route126_EventScript_1F6960, 0 + object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 66, 1, 67, 17, 1, 7, Route126_EventScript_1F6977, 0 + object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 5, 1, 66, 17, 1, 7, Route126_EventScript_1F6949, 0 + object_event 9, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 5, 1, 67, 17, 1, 7, Route126_EventScript_1F6932, 0 Route126_MapEvents:: @ 852C720 map_events Route126_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route127.inc b/data/maps/events/Route127.inc index b72a1d6297..656733d0d7 100644 --- a/data/maps/events/Route127.inc +++ b/data/maps/events/Route127.inc @@ -1,15 +1,15 @@ Route127_EventObjects: @ 852C734 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 45, 42, 1, 14, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 18, 68, 1, 21, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 6, 3, 1, 0, 0, 0, 0, Route127_EventScript_291032, 1034, 0, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 64, 39, 3, 1, 0, 0, 0, 0, Route127_EventScript_29103F, 1035, 0, 0 - object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 42, 21, 3, 9, 17, 0, 1, 0, Route127_EventScript_1F6A63, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 64, 19, 3, 10, 17, 0, 1, 0, Route127_EventScript_1F6A91, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 54, 14, 3, 7, 17, 0, 1, 0, Route127_EventScript_1F6A7A, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 0, 15, 23, 3, 9, 17, 0, 1, 2, Route127_EventScript_1F6AA8, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 63, 63, 3, 1, 17, 0, 1, 3, Route127_EventScript_1F6AD6, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 12, 23, 3, 10, 17, 0, 1, 2, Route127_EventScript_1F6ABF, 0, 0, 0 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 20, 3, 1, 0, 0, 0, 0, Route127_EventScript_29104C, 1155, 0, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 42, 1, 14, 0, 1, 2, Route127_EventScript_1F6A35, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 68, 1, 21, 0, 1, 4, Route127_EventScript_1F6A4C, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, 1, 0, 0, 0, Route127_EventScript_291032, 1034 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, 1, 0, 0, 0, Route127_EventScript_29103F, 1035 + object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 21, 3, 9, 17, 1, 0, Route127_EventScript_1F6A63, 0 + object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 19, 3, 10, 17, 1, 0, Route127_EventScript_1F6A91, 0 + object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 54, 14, 3, 7, 17, 1, 0, Route127_EventScript_1F6A7A, 0 + object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 15, 23, 3, 9, 17, 1, 2, Route127_EventScript_1F6AA8, 0 + object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 63, 3, 1, 17, 1, 3, Route127_EventScript_1F6AD6, 0 + object_event 10, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 23, 3, 10, 17, 1, 2, Route127_EventScript_1F6ABF, 0 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, 1, 0, 0, 0, Route127_EventScript_29104C, 1155 Route127_MapBGEvents: @ 852C83C bg_event 59, 67, 0, 8, 0, ITEM_ENERGY_ROOT, 0, 0 diff --git a/data/maps/events/Route128.inc b/data/maps/events/Route128.inc index e9efddf207..42cab969e9 100644 --- a/data/maps/events/Route128.inc +++ b/data/maps/events/Route128.inc @@ -1,14 +1,14 @@ Route128_EventObjects: @ 852C88C - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 35, 33, 1, 48, 85, 0, 1, 3, Route128_EventScript_1F6CBE, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 78, 24, 1, 28, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 0, 40, 22, 3, 8, 0, 0, 0, 0, 0x0, 834, 0, 0 - object_event 4, EVENT_OBJ_GFX_ARCHIE, 0, 0, 37, 22, 3, 9, 17, 0, 0, 0, 0x0, 944, 0, 0 - object_event 5, EVENT_OBJ_GFX_MAXIE, 0, 0, 38, 21, 3, 7, 17, 0, 0, 0, 0x0, 945, 0, 0 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 63, 28, 3, 7, 17, 0, 1, 0, Route128_EventScript_1F6DB0, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 0, 47, 9, 3, 10, 17, 0, 1, 3, Route128_EventScript_1F6D99, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 24, 8, 3, 17, 17, 0, 1, 3, Route128_EventScript_1F6D82, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 101, 29, 1, 25, 49, 0, 1, 4, Route128_EventScript_1F6DDE, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 101, 22, 1, 26, 49, 0, 1, 4, Route128_EventScript_1F6DC7, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 33, 1, 48, 85, 1, 3, Route128_EventScript_1F6CBE, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 78, 24, 1, 28, 5, 1, 7, Route128_EventScript_1F6D20, 0 + object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, 8, 0, 0, 0, 0x0, 834 + object_event 4, EVENT_OBJ_GFX_ARCHIE, 0, 37, 22, 3, 9, 17, 0, 0, 0x0, 944 + object_event 5, EVENT_OBJ_GFX_MAXIE, 0, 38, 21, 3, 7, 17, 0, 0, 0x0, 945 + object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 63, 28, 3, 7, 17, 1, 0, Route128_EventScript_1F6DB0, 0 + object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 47, 9, 3, 10, 17, 1, 3, Route128_EventScript_1F6D99, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 24, 8, 3, 17, 17, 1, 3, Route128_EventScript_1F6D82, 0 + object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 101, 29, 1, 25, 49, 1, 4, Route128_EventScript_1F6DDE, 0 + object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 101, 22, 1, 26, 49, 1, 4, Route128_EventScript_1F6DC7, 0 Route128_MapBGEvents: @ 852C97C bg_event 49, 9, 3, 7, 0, ITEM_HEART_SCALE, 92, 0 diff --git a/data/maps/events/Route129.inc b/data/maps/events/Route129.inc index 297b9eeb25..21c6fc6bd4 100644 --- a/data/maps/events/Route129.inc +++ b/data/maps/events/Route129.inc @@ -1,9 +1,9 @@ Route129_EventObjects: @ 852C9B4 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 28, 16, 1, 50, 67, 0, 1, 3, Route129_EventScript_1F72EC, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 10, 14, 1, 52, 37, 0, 1, 2, Route129_EventScript_1F7303, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 13, 22, 1, 64, 17, 0, 1, 5, Route129_EventScript_1F7331, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 35, 9, 1, 24, 17, 0, 1, 2, Route129_EventScript_1F731A, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 13, 27, 1, 65, 17, 0, 1, 5, Route129_EventScript_1F7348, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 28, 16, 1, 50, 67, 1, 3, Route129_EventScript_1F72EC, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 14, 1, 52, 37, 1, 2, Route129_EventScript_1F7303, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 22, 1, 64, 17, 1, 5, Route129_EventScript_1F7331, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 9, 1, 24, 17, 1, 2, Route129_EventScript_1F731A, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 27, 1, 65, 17, 1, 5, Route129_EventScript_1F7348, 0 Route129_MapEvents:: @ 852CA2C map_events Route129_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route130.inc b/data/maps/events/Route130.inc index 470fa9880d..a895743d12 100644 --- a/data/maps/events/Route130.inc +++ b/data/maps/events/Route130.inc @@ -1,8 +1,8 @@ Route130_EventObjects: @ 852CA40 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 70, 21, 1, 51, 99, 0, 1, 3, Route130_EventScript_1F73BF, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 7, 21, 1, 26, 65, 0, 1, 5, Route130_EventScript_1F73D6, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 52, 9, 3, 12, 0, 0, 0, 82, BerryTreeScript, 17, 0, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 7, 30, 1, 25, 65, 0, 1, 5, Route130_EventScript_1F73ED, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 70, 21, 1, 51, 99, 1, 3, Route130_EventScript_1F73BF, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 21, 1, 26, 65, 1, 5, Route130_EventScript_1F73D6, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, 12, 0, 0, 82, BerryTreeScript, 17 + object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 30, 1, 25, 65, 1, 5, Route130_EventScript_1F73ED, 0 Route130_MapEvents:: @ 852CAA0 map_events Route130_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route131.inc b/data/maps/events/Route131.inc index bea728a70a..5dff94bb74 100644 --- a/data/maps/events/Route131.inc +++ b/data/maps/events/Route131.inc @@ -1,12 +1,12 @@ Route131_EventObjects: @ 852CAB4 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 41, 32, 1, 29, 117, 0, 1, 3, Route131_EventScript_1F7429, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 18, 19, 1, 22, 112, 0, 1, 4, Route131_EventScript_1F7440, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 10, 22, 1, 20, 6, 0, 1, 4, Route131_EventScript_1F7457, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 31, 25, 1, 47, 83, 0, 1, 3, Route131_EventScript_1F746E, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 9, 16, 1, 8, 17, 0, 1, 1, Route131_EventScript_1F7485, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 8, 16, 1, 8, 17, 0, 1, 1, Route131_EventScript_1F74A0, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 52, 20, 1, 26, 49, 0, 1, 5, Route131_EventScript_1F74D2, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 52, 27, 1, 25, 49, 0, 1, 5, Route131_EventScript_1F74BB, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 32, 1, 29, 117, 1, 3, Route131_EventScript_1F7429, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 19, 1, 22, 112, 1, 4, Route131_EventScript_1F7440, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 22, 1, 20, 6, 1, 4, Route131_EventScript_1F7457, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 31, 25, 1, 47, 83, 1, 3, Route131_EventScript_1F746E, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 16, 1, 8, 17, 1, 1, Route131_EventScript_1F7485, 0 + object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 8, 16, 1, 8, 17, 1, 1, Route131_EventScript_1F74A0, 0 + object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 20, 1, 26, 49, 1, 5, Route131_EventScript_1F74D2, 0 + object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 52, 27, 1, 25, 49, 1, 5, Route131_EventScript_1F74BB, 0 Route131_MapWarps: @ 852CB74 warp_def 36, 6, 3, 0, MAP_SKY_PILLAR_ENTRANCE diff --git a/data/maps/events/Route132.inc b/data/maps/events/Route132.inc index 825c6fc65f..49cfd07e4b 100644 --- a/data/maps/events/Route132.inc +++ b/data/maps/events/Route132.inc @@ -1,14 +1,14 @@ Route132_EventObjects: @ 852CB90 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 40, 13, 1, 46, 51, 0, 1, 2, Route132_EventScript_1F74EA, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 10, 6, 1, 45, 51, 0, 1, 2, Route132_EventScript_1F7501, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 11, 3, 1, 0, 0, 0, 0, Route132_EventScript_291059, 1036, 0, 0 - object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 9, 15, 3, 8, 0, 0, 1, 4, Route132_EventScript_1F752F, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 49, 28, 3, 10, 0, 0, 1, 1, Route132_EventScript_1F7518, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 33, 26, 3, 8, 17, 0, 1, 4, Route132_EventScript_1F7546, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 33, 31, 3, 25, 65, 0, 1, 4, Route132_EventScript_1F755D, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 21, 30, 3, 7, 17, 0, 1, 4, Route132_EventScript_1F758B, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 0, 21, 25, 3, 26, 65, 0, 1, 4, Route132_EventScript_1F7574, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 20, 27, 3, 1, 17, 0, 0, 0, Route132_EventScript_291066, 1156, 0, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 40, 13, 1, 46, 51, 1, 2, Route132_EventScript_1F74EA, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 6, 1, 45, 51, 1, 2, Route132_EventScript_1F7501, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, 1, 0, 0, 0, Route132_EventScript_291059, 1036 + object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 15, 3, 8, 0, 1, 4, Route132_EventScript_1F752F, 0 + object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 49, 28, 3, 10, 0, 1, 1, Route132_EventScript_1F7518, 0 + object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 33, 26, 3, 8, 17, 1, 4, Route132_EventScript_1F7546, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 33, 31, 3, 25, 65, 1, 4, Route132_EventScript_1F755D, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 21, 30, 3, 7, 17, 1, 4, Route132_EventScript_1F758B, 0 + object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 21, 25, 3, 26, 65, 1, 4, Route132_EventScript_1F7574, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 27, 3, 1, 17, 0, 0, Route132_EventScript_291066, 1156 Route132_MapEvents:: @ 852CC80 map_events Route132_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route133.inc b/data/maps/events/Route133.inc index 6249ca026d..13bd5f6e2b 100644 --- a/data/maps/events/Route133.inc +++ b/data/maps/events/Route133.inc @@ -1,14 +1,14 @@ Route133_EventObjects: @ 852CC94 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 68, 27, 1, 25, 32, 0, 1, 3, Route133_EventScript_1F75A3, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 13, 3, 1, 8, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 68, 28, 1, 26, 32, 0, 1, 3, Route133_EventScript_1F75BA, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 53, 12, 3, 1, 0, 0, 0, 0, Route133_EventScript_291073, 1037, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route133_EventScript_291080, 1038, 0, 0 - object_event 6, EVENT_OBJ_GFX_MAN_6, 0, 0, 7, 14, 3, 18, 17, 0, 1, 2, Route133_EventScript_1F75FF, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 0, 37, 15, 3, 18, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 56, 11, 3, 8, 17, 0, 1, 3, Route133_EventScript_1F7616, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 56, 15, 3, 16, 17, 0, 1, 3, Route133_EventScript_1F762D, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 48, 28, 3, 1, 17, 0, 0, 0, Route133_EventScript_29108D, 1157, 0, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 68, 27, 1, 25, 32, 1, 3, Route133_EventScript_1F75A3, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 3, 1, 8, 0, 1, 3, Route133_EventScript_1F75D1, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 28, 1, 26, 32, 1, 3, Route133_EventScript_1F75BA, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 12, 3, 1, 0, 0, 0, Route133_EventScript_291073, 1037 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, 1, 0, 0, 0, Route133_EventScript_291080, 1038 + object_event 6, EVENT_OBJ_GFX_MAN_6, 0, 7, 14, 3, 18, 17, 1, 2, Route133_EventScript_1F75FF, 0 + object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 37, 15, 3, 18, 0, 1, 4, Route133_EventScript_1F75E8, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 56, 11, 3, 8, 17, 1, 3, Route133_EventScript_1F7616, 0 + object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 56, 15, 3, 16, 17, 1, 3, Route133_EventScript_1F762D, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 48, 28, 3, 1, 17, 0, 0, Route133_EventScript_29108D, 1157 Route133_MapEvents:: @ 852CD84 map_events Route133_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route134.inc b/data/maps/events/Route134.inc index 6beb27ba5d..df70e9af89 100644 --- a/data/maps/events/Route134.inc +++ b/data/maps/events/Route134.inc @@ -1,15 +1,15 @@ Route134_EventObjects: @ 852CD98 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 49, 9, 1, 49, 83, 0, 1, 2, Route134_EventScript_1F7653, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 58, 7, 1, 1, 0, 0, 1, 3, Route134_EventScript_1F766A, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 41, 23, 3, 10, 0, 0, 1, 2, Route134_EventScript_1F7698, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 0, 24, 23, 3, 26, 48, 0, 1, 6, Route134_EventScript_1F7681, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 49, 16, 3, 27, 6, 0, 1, 5, Route134_EventScript_1F76AF, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 43, 23, 1, 9, 17, 0, 1, 2, Route134_EventScript_1F76F4, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 0, 24, 30, 3, 25, 48, 0, 1, 6, Route134_EventScript_1F770B, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 0, 50, 16, 3, 28, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 0, 63, 14, 3, 18, 17, 0, 1, 3, Route134_EventScript_1F76C6, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 50, 17, 3, 1, 17, 0, 0, 0, Route134_EventScript_29109A, 1158, 0, 0 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 22, 27, 3, 1, 17, 0, 0, 0, Route134_EventScript_2910A7, 1159, 0, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 49, 9, 1, 49, 83, 1, 2, Route134_EventScript_1F7653, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 58, 7, 1, 1, 0, 1, 3, Route134_EventScript_1F766A, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 41, 23, 3, 10, 0, 1, 2, Route134_EventScript_1F7698, 0 + object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 24, 23, 3, 26, 48, 1, 6, Route134_EventScript_1F7681, 0 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 49, 16, 3, 27, 6, 1, 5, Route134_EventScript_1F76AF, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 43, 23, 1, 9, 17, 1, 2, Route134_EventScript_1F76F4, 0 + object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 24, 30, 3, 25, 48, 1, 6, Route134_EventScript_1F770B, 0 + object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 50, 16, 3, 28, 6, 1, 5, Route134_EventScript_1F76DD, 0 + object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 63, 14, 3, 18, 17, 1, 3, Route134_EventScript_1F76C6, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, 1, 17, 0, 0, Route134_EventScript_29109A, 1158 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, 1, 17, 0, 0, Route134_EventScript_2910A7, 1159 Route134_MapEvents:: @ 852CEA0 map_events Route134_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity.inc b/data/maps/events/RustboroCity.inc index 355539f00f..67d3d3eaae 100644 --- a/data/maps/events/RustboroCity.inc +++ b/data/maps/events/RustboroCity.inc @@ -1,20 +1,20 @@ RustboroCity_EventObjects: @ 85267E0 - object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 22, 34, 3, 3, 16, 0, 0, 0, RustboroCity_EventScript_1E088A, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 19, 13, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E085F, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 25, 37, 3, 7, 0, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 21, 46, 3, 3, 16, 0, 0, 0, RustboroCity_EventScript_1E08D1, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_BOY_2, 0, 0, 12, 45, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_1E08B2, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 0, 26, 23, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E0893, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 24, 51, 3, 10, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 25, 51, 3, 9, 0, 0, 0, 0, RustboroCity_EventScript_1E0938, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 30, 10, 3, 10, 17, 0, 0, 0, RustboroCity_EventScript_1E0ADD, 732, 0, 0 - object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 21, 3, 10, 0, 0, 0, 0, 0x0, 731, 0, 0 - object_event 11, EVENT_OBJ_GFX_MAN_7, 0, 0, 13, 34, 3, 2, 17, 0, 0, 0, RustboroCity_EventScript_1E087E, 0, 0, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 36, 51, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, 1041, 0, 0 - object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 0, 19, 27, 3, 8, 16, 0, 0, 0, RustboroCity_EventScript_1E094E, 0, 0, 0 - object_event 14, EVENT_OBJ_GFX_HIPSTER, 0, 0, 16, 50, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E0DB8, 814, 0, 0 - object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 11, 15, 0, 1, 17, 0, 0, 0, 0x0, 844, 0, 0 - object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 0, 31, 36, 3, 1, 16, 0, 0, 0, RustboroCity_EventScript_1E1236, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 22, 34, 3, 3, 16, 0, 0, RustboroCity_EventScript_1E088A, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 13, 3, 1, 17, 0, 0, RustboroCity_EventScript_1E085F, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 25, 37, 3, 7, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 21, 46, 3, 3, 16, 0, 0, RustboroCity_EventScript_1E08D1, 0 + object_event 5, EVENT_OBJ_GFX_BOY_2, 0, 12, 45, 3, 1, 0, 0, 0, RustboroCity_EventScript_1E08B2, 0 + object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 26, 23, 3, 1, 17, 0, 0, RustboroCity_EventScript_1E0893, 0 + object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 24, 51, 3, 10, 0, 0, 0, RustboroCity_EventScript_1E0922, 0 + object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 25, 51, 3, 9, 0, 0, 0, RustboroCity_EventScript_1E0938, 0 + object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, 10, 17, 0, 0, RustboroCity_EventScript_1E0ADD, 732 + object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 21, 3, 10, 0, 0, 0, 0x0, 731 + object_event 11, EVENT_OBJ_GFX_MAN_7, 0, 13, 34, 3, 2, 17, 0, 0, RustboroCity_EventScript_1E087E, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, 1, 0, 0, 0, RustboroCity_EventScript_2910DB, 1041 + object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 19, 27, 3, 8, 16, 0, 0, RustboroCity_EventScript_1E094E, 0 + object_event 14, EVENT_OBJ_GFX_HIPSTER, 0, 16, 50, 3, 1, 17, 0, 0, RustboroCity_EventScript_1E0DB8, 814 + object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 11, 15, 0, 1, 17, 0, 0, 0x0, 844 + object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 31, 36, 3, 1, 16, 0, 0, RustboroCity_EventScript_1E1236, 0 RustboroCity_MapWarps: @ 8526960 warp_def 27, 19, 0, 0, MAP_RUSTBORO_CITY_GYM diff --git a/data/maps/events/RustboroCity_CuttersHouse.inc b/data/maps/events/RustboroCity_CuttersHouse.inc index 34d6c282d8..fd69ad6dee 100644 --- a/data/maps/events/RustboroCity_CuttersHouse.inc +++ b/data/maps/events/RustboroCity_CuttersHouse.inc @@ -1,6 +1,6 @@ RustboroCity_CuttersHouse_EventObjects: @ 8530A1C - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 7, 5, 3, 10, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215BD4, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 0, 9, 2, 3, 5, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215C0A, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 7, 5, 3, 10, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215BD4, 0 + object_event 2, EVENT_OBJ_GFX_LASS, 0, 9, 2, 3, 5, 1, 0, 0, RustboroCity_CuttersHouse_EventScript_215C0A, 0 RustboroCity_CuttersHouse_MapWarps: @ 8530A4C warp_def 5, 8, 0, 8, MAP_RUSTBORO_CITY diff --git a/data/maps/events/RustboroCity_DevonCorp_1F.inc b/data/maps/events/RustboroCity_DevonCorp_1F.inc index b36e7c1c7f..1746830f0e 100644 --- a/data/maps/events/RustboroCity_DevonCorp_1F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_1F.inc @@ -1,7 +1,7 @@ RustboroCity_DevonCorp_1F_EventObjects: @ 853037C - object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 0, 2, 6, 3, 2, 17, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211261, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_7, 0, 0, 15, 5, 3, 2, 18, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211293, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 5, 3, 3, 8, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 2, 6, 3, 2, 17, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211261, 0 + object_event 2, EVENT_OBJ_GFX_MAN_7, 0, 15, 5, 3, 2, 18, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211293, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 5, 3, 3, 8, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0 RustboroCity_DevonCorp_1F_MapWarps: @ 85303C4 warp_def 5, 8, 0, 5, MAP_RUSTBORO_CITY diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.inc b/data/maps/events/RustboroCity_DevonCorp_2F.inc index 35fb23324a..da0c5ece2f 100644 --- a/data/maps/events/RustboroCity_DevonCorp_2F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_2F.inc @@ -1,10 +1,10 @@ RustboroCity_DevonCorp_2F_EventObjects: @ 8530408 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 5, 3, 7, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_21186F, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211886, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 2, 6, 3, 15, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118B0, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 5, 3, 7, 160, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118DA, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 8, 3, 7, 17, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118F1, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 5, 3, 7, 17, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211BCF, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, 7, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_21186F, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 5, 3, 10, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211886, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, 15, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118B0, 0 + object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 5, 3, 7, 160, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118DA, 0 + object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 8, 3, 7, 17, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118F1, 0 + object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 5, 3, 7, 17, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211BCF, 0 RustboroCity_DevonCorp_2F_MapWarps: @ 8530498 warp_def 14, 1, 0, 2, MAP_RUSTBORO_CITY_DEVON_CORP_1F diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.inc b/data/maps/events/RustboroCity_DevonCorp_3F.inc index 0d4687ad56..56e4295d0b 100644 --- a/data/maps/events/RustboroCity_DevonCorp_3F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_3F.inc @@ -1,7 +1,7 @@ RustboroCity_DevonCorp_3F_EventObjects: @ 85304BC - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 17, 5, 3, 9, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 0, 3, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, 949, 0, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 15, 5, 3, 76, 17, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 5, 3, 9, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 + object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, 10, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, 949 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 15, 5, 3, 76, 17, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 RustboroCity_DevonCorp_3F_MapWarps: @ 8530504 warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F diff --git a/data/maps/events/RustboroCity_Flat1_1F.inc b/data/maps/events/RustboroCity_Flat1_1F.inc index f7e7cacdbf..dd869ef29d 100644 --- a/data/maps/events/RustboroCity_Flat1_1F.inc +++ b/data/maps/events/RustboroCity_Flat1_1F.inc @@ -1,6 +1,6 @@ RustboroCity_Flat1_1F_EventObjects: @ 8530890 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150CE, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 12, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 9, 4, 3, 10, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150CE, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 4, 3, 9, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0 RustboroCity_Flat1_1F_MapWarps: @ 85308C0 warp_def 6, 7, 0, 1, MAP_RUSTBORO_CITY diff --git a/data/maps/events/RustboroCity_Flat1_2F.inc b/data/maps/events/RustboroCity_Flat1_2F.inc index c7ed5e5586..bafe8d8689 100644 --- a/data/maps/events/RustboroCity_Flat1_2F.inc +++ b/data/maps/events/RustboroCity_Flat1_2F.inc @@ -1,12 +1,12 @@ RustboroCity_Flat1_2F_EventObjects: @ 85308EC - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 6, 3, 5, 19, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_21523D, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 9, 5, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_SKITTY_DOLL, 0, 0, 9, 4, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_TREECKO_DOLL, 0, 0, 10, 5, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_TORCHIC_DOLL, 0, 0, 10, 6, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 0, 8, 5, 3, 10, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_21513A, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_MUDKIP_DOLL, 0, 0, 8, 6, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_PIKACHU_DOLL, 0, 0, 9, 7, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 6, 3, 5, 19, 0, 0, RustboroCity_Flat1_2F_EventScript_21523D, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 5, 3, 8, 17, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_SKITTY_DOLL, 0, 9, 4, 3, 1, 17, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 + object_event 4, EVENT_OBJ_GFX_TREECKO_DOLL, 0, 10, 5, 3, 1, 17, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 + object_event 5, EVENT_OBJ_GFX_TORCHIC_DOLL, 0, 10, 6, 3, 1, 17, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 + object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 8, 5, 3, 10, 17, 0, 0, RustboroCity_Flat1_2F_EventScript_21513A, 0 + object_event 7, EVENT_OBJ_GFX_MUDKIP_DOLL, 0, 8, 6, 3, 1, 17, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 + object_event 8, EVENT_OBJ_GFX_PIKACHU_DOLL, 0, 9, 7, 3, 1, 17, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 RustboroCity_Flat1_2F_MapWarps: @ 85309AC warp_def 2, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT1_1F diff --git a/data/maps/events/RustboroCity_Flat2_1F.inc b/data/maps/events/RustboroCity_Flat2_1F.inc index bb5e5b11dc..df833517f5 100644 --- a/data/maps/events/RustboroCity_Flat2_1F.inc +++ b/data/maps/events/RustboroCity_Flat2_1F.inc @@ -1,6 +1,6 @@ RustboroCity_Flat2_1F_EventObjects: @ 8530AC4 - object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 0, 11, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F80, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 8, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 11, 4, 3, 9, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F80, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 8, 4, 3, 10, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0 RustboroCity_Flat2_1F_MapWarps: @ 8530AF4 warp_def 2, 8, 0, 10, MAP_RUSTBORO_CITY diff --git a/data/maps/events/RustboroCity_Flat2_2F.inc b/data/maps/events/RustboroCity_Flat2_2F.inc index e0a4419d3c..76454e5678 100644 --- a/data/maps/events/RustboroCity_Flat2_2F.inc +++ b/data/maps/events/RustboroCity_Flat2_2F.inc @@ -1,6 +1,6 @@ RustboroCity_Flat2_2F_EventObjects: @ 8530B20 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 11, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FD8, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FE1, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 4, 3, 10, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FD8, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 3, 3, 5, 2, 0, 0, RustboroCity_Flat2_2F_EventScript_215FE1, 0 RustboroCity_Flat2_2F_MapWarps: @ 8530B50 warp_def 3, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT2_1F diff --git a/data/maps/events/RustboroCity_Flat2_3F.inc b/data/maps/events/RustboroCity_Flat2_3F.inc index 1b487cb0f3..dd6e342570 100644 --- a/data/maps/events/RustboroCity_Flat2_3F.inc +++ b/data/maps/events/RustboroCity_Flat2_3F.inc @@ -1,6 +1,6 @@ RustboroCity_Flat2_3F_EventObjects: @ 8530B74 - object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216117, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 12, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216120, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 7, 3, 3, 5, 2, 0, 0, RustboroCity_Flat2_3F_EventScript_216117, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 12, 2, 3, 8, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216120, 0 RustboroCity_Flat2_3F_MapWarps: @ 8530BA4 warp_def 1, 1, 0, 1, MAP_RUSTBORO_CITY_FLAT2_2F diff --git a/data/maps/events/RustboroCity_Gym.inc b/data/maps/events/RustboroCity_Gym.inc index 5285e5b381..47842da532 100644 --- a/data/maps/events/RustboroCity_Gym.inc +++ b/data/maps/events/RustboroCity_Gym.inc @@ -1,9 +1,9 @@ RustboroCity_Gym_EventObjects: @ 8530538 - object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_212F31, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 5, 13, 3, 8, 0, 0, 1, 2, RustboroCity_Gym_EventScript_212FE3, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 3, 9, 3, 9, 0, 0, 1, 3, RustboroCity_Gym_EventScript_212FFA, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 0, 3, 18, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_213028, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_HIKER, 0, 0, 1, 6, 3, 8, 17, 0, 1, 3, RustboroCity_Gym_EventScript_213011, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 5, 2, 3, 8, 0, 0, 0, RustboroCity_Gym_EventScript_212F31, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 13, 3, 8, 0, 1, 2, RustboroCity_Gym_EventScript_212FE3, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 3, 9, 3, 9, 0, 1, 3, RustboroCity_Gym_EventScript_212FFA, 0 + object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 3, 18, 3, 8, 0, 0, 0, RustboroCity_Gym_EventScript_213028, 0 + object_event 5, EVENT_OBJ_GFX_HIKER, 0, 1, 6, 3, 8, 17, 1, 3, RustboroCity_Gym_EventScript_213011, 0 RustboroCity_Gym_MapWarps: @ 85305B0 warp_def 5, 19, 0, 0, MAP_RUSTBORO_CITY diff --git a/data/maps/events/RustboroCity_House1.inc b/data/maps/events/RustboroCity_House1.inc index 9702820dfd..985fad05a8 100644 --- a/data/maps/events/RustboroCity_House1.inc +++ b/data/maps/events/RustboroCity_House1.inc @@ -1,6 +1,6 @@ RustboroCity_House1_EventObjects: @ 85309C8 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 0, 6, 4, 3, 9, 0, 0, 0, 0, RustboroCity_House1_EventScript_21593F, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 9, 2, 3, 8, 0, 0, 0, 0, RustboroCity_House1_EventScript_2159DF, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 6, 4, 3, 9, 0, 0, 0, RustboroCity_House1_EventScript_21593F, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 9, 2, 3, 8, 0, 0, 0, RustboroCity_House1_EventScript_2159DF, 0 RustboroCity_House1_MapWarps: @ 85309F8 warp_def 5, 7, 0, 7, MAP_RUSTBORO_CITY diff --git a/data/maps/events/RustboroCity_House2.inc b/data/maps/events/RustboroCity_House2.inc index 2e9cd945b1..a75f50ab10 100644 --- a/data/maps/events/RustboroCity_House2.inc +++ b/data/maps/events/RustboroCity_House2.inc @@ -1,6 +1,6 @@ RustboroCity_House2_EventObjects: @ 8530A70 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EB4, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, 8, 0, 0, 0, RustboroCity_House2_EventScript_215EB4, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 5, 3, 7, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0 RustboroCity_House2_MapWarps: @ 8530AA0 warp_def 5, 8, 0, 9, MAP_RUSTBORO_CITY diff --git a/data/maps/events/RustboroCity_House3.inc b/data/maps/events/RustboroCity_House3.inc index 0cbb78d183..0e8c6ca9ee 100644 --- a/data/maps/events/RustboroCity_House3.inc +++ b/data/maps/events/RustboroCity_House3.inc @@ -1,7 +1,7 @@ RustboroCity_House3_EventObjects: @ 8530BC0 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, RustboroCity_House3_EventScript_216191, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, RustboroCity_House3_EventScript_21619A, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House3_EventScript_2161A3, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 4, 5, 3, 10, 0, 0, 0, RustboroCity_House3_EventScript_216191, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 5, 3, 9, 0, 0, 0, RustboroCity_House3_EventScript_21619A, 0 + object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, 8, 0, 0, 0, RustboroCity_House3_EventScript_2161A3, 0 RustboroCity_House3_MapWarps: @ 8530C08 warp_def 5, 8, 0, 11, MAP_RUSTBORO_CITY diff --git a/data/maps/events/RustboroCity_Mart.inc b/data/maps/events/RustboroCity_Mart.inc index 1780ce5015..9eba87edab 100644 --- a/data/maps/events/RustboroCity_Mart.inc +++ b/data/maps/events/RustboroCity_Mart.inc @@ -1,8 +1,8 @@ RustboroCity_Mart_EventObjects: @ 853080C - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F06, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 0, 2, 5, 3, 7, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F7D, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 8, 4, 3, 3, 16, 0, 0, 0, RustboroCity_Mart_EventScript_214F74, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 8, 2, 3, 7, 17, 0, 0, 0, RustboroCity_Mart_EventScript_214F86, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, RustboroCity_Mart_EventScript_214F06, 0 + object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 2, 5, 3, 7, 0, 0, 0, RustboroCity_Mart_EventScript_214F7D, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 4, 3, 3, 16, 0, 0, RustboroCity_Mart_EventScript_214F74, 0 + object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 8, 2, 3, 7, 17, 0, 0, RustboroCity_Mart_EventScript_214F86, 0 RustboroCity_Mart_MapWarps: @ 853086C warp_def 3, 7, 0, 2, MAP_RUSTBORO_CITY diff --git a/data/maps/events/RustboroCity_PokemonCenter_1F.inc b/data/maps/events/RustboroCity_PokemonCenter_1F.inc index f287000ba0..94293fcb58 100644 --- a/data/maps/events/RustboroCity_PokemonCenter_1F.inc +++ b/data/maps/events/RustboroCity_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ RustboroCity_PokemonCenter_1F_EventObjects: @ 85306F4 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D76, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 11, 2, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D84, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D8D, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D96, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D76, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 11, 2, 3, 9, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D84, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 3, 4, 3, 2, 17, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D8D, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, 10, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D96, 0 RustboroCity_PokemonCenter_1F_MapWarps: @ 8530754 warp_def 7, 8, 3, 3, MAP_RUSTBORO_CITY diff --git a/data/maps/events/RustboroCity_PokemonCenter_2F.inc b/data/maps/events/RustboroCity_PokemonCenter_2F.inc index 2d3ff87774..e91cca2c82 100644 --- a/data/maps/events/RustboroCity_PokemonCenter_2F.inc +++ b/data/maps/events/RustboroCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ RustboroCity_PokemonCenter_2F_EventObjects: @ 8530780 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 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 diff --git a/data/maps/events/RustboroCity_PokemonSchool.inc b/data/maps/events/RustboroCity_PokemonSchool.inc index 3a5ab14161..56077139fc 100644 --- a/data/maps/events/RustboroCity_PokemonSchool.inc +++ b/data/maps/events/RustboroCity_PokemonSchool.inc @@ -1,11 +1,11 @@ RustboroCity_PokemonSchool_EventObjects: @ 85305EC - object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 0, 8, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BOY_5, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 0, 3, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F71, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 0, 10, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F7A, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 3, 6, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F83, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 5, 3, 3, 8, 17, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 0, 10, 0, 7, 17, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, 999, 0, 0 + object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 8, 6, 3, 10, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0 + object_event 2, EVENT_OBJ_GFX_BOY_5, 0, 9, 6, 3, 9, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 3, 8, 3, 7, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F71, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 8, 3, 7, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F7A, 0 + object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 3, 6, 3, 8, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F83, 0 + object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 5, 3, 3, 8, 17, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0 + object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 10, 0, 7, 17, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, 999 RustboroCity_PokemonSchool_MapWarps: @ 8530694 warp_def 5, 10, 0, 4, MAP_RUSTBORO_CITY diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc index 38b3885b4a..a72400e5b0 100644 --- a/data/maps/events/RusturfTunnel.inc +++ b/data/maps/events/RusturfTunnel.inc @@ -1,14 +1,14 @@ RusturfTunnel_EventObjects: @ 85341C4 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 23, 5, 3, 10, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, 807, 0, 0 - object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 24, 5, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 931, 0, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 1, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, 1048, 0, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 30, 2, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, 1049, 0, 0 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, 0x0, 879, 0, 0 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 5, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, 878, 0, 0 - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 0, 14, 4, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, 880, 0, 0 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 24, 4, 3, 8, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 932, 0, 0 - object_event 9, EVENT_OBJ_GFX_HIKER, 0, 0, 32, 13, 3, 9, 17, 0, 1, 3, RusturfTunnel_EventScript_22D1B1, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 25, 4, 3, 9, 17, 0, 0, 0, RusturfTunnel_EventScript_22CE5F, 983, 0, 0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, 10, 0, 0, 0, RusturfTunnel_EventScript_22CE76, 807 + object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, 1, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 931 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, 1, 0, 0, 0, RusturfTunnel_EventScript_291136, 1048 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, 1, 0, 0, 0, RusturfTunnel_EventScript_291143, 1049 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, 10, 0, 0, 0, 0x0, 879 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 5, 3, 9, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, 878 + object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, 9, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, 880 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, 8, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 932 + object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 13, 3, 9, 17, 1, 3, RusturfTunnel_EventScript_22D1B1, 0 + object_event 10, EVENT_OBJ_GFX_WOMAN_3, 0, 25, 4, 3, 9, 17, 0, 0, RusturfTunnel_EventScript_22CE5F, 983 RusturfTunnel_MapWarps: @ 85342B4 warp_def 4, 10, 3, 0, MAP_ROUTE116 diff --git a/data/maps/events/SSTidalCorridor.inc b/data/maps/events/SSTidalCorridor.inc index 80e65eb94f..866fdf78e2 100644 --- a/data/maps/events/SSTidalCorridor.inc +++ b/data/maps/events/SSTidalCorridor.inc @@ -1,9 +1,9 @@ SSTidalCorridor_EventObjects: @ 853A158 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 1, 11, 3, 7, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 16, 7, 3, 3, 32, 0, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 2, 3, 8, 17, 0, 0, 0, SSTidalCorridor_EventScript_23C0D9, 950, 0, 0 - object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 0, 7, 2, 3, 1, 17, 0, 0, 0, SSTidalCorridor_EventScript_23C0E2, 950, 0, 0 - object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 9, 10, 3, 9, 0, 0, 0, 0, 0x0, 810, 0, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 11, 3, 7, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, 3, 32, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 2, 3, 8, 17, 0, 0, SSTidalCorridor_EventScript_23C0D9, 950 + object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, 1, 17, 0, 0, SSTidalCorridor_EventScript_23C0E2, 950 + object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 9, 10, 3, 9, 0, 0, 0, 0x0, 810 SSTidalCorridor_MapWarps: @ 853A1D0 warp_def 4, 9, 3, 0, MAP_SS_TIDAL_ROOMS diff --git a/data/maps/events/SSTidalLowerDeck.inc b/data/maps/events/SSTidalLowerDeck.inc index 3cf22e65f6..ef83b32935 100644 --- a/data/maps/events/SSTidalLowerDeck.inc +++ b/data/maps/events/SSTidalLowerDeck.inc @@ -1,6 +1,6 @@ SSTidalLowerDeck_EventObjects: @ 853A2BC - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 10, 4, 3, 46, 68, 0, 1, 3, SSTidalLowerDeck_EventScript_23C819, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 7, 4, 3, 50, 71, 0, 1, 3, SSTidalLowerDeck_EventScript_23C830, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 10, 4, 3, 46, 68, 1, 3, SSTidalLowerDeck_EventScript_23C819, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 7, 4, 3, 50, 71, 1, 3, SSTidalLowerDeck_EventScript_23C830, 0 SSTidalLowerDeck_MapWarps: @ 853A2EC warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR diff --git a/data/maps/events/SSTidalRooms.inc b/data/maps/events/SSTidalRooms.inc index 0eb0017b36..42f5fd6059 100644 --- a/data/maps/events/SSTidalRooms.inc +++ b/data/maps/events/SSTidalRooms.inc @@ -1,12 +1,12 @@ SSTidalRooms_EventObjects: @ 853A314 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 4, 7, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA49, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 34, 11, 3, 9, 0, 0, 1, 3, SSTidalRooms_EventScript_23CA60, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 21, 5, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA77, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 5, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CA8E, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 4, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CAA9, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_BOY_4, 0, 0, 22, 11, 3, 8, 17, 0, 1, 3, SSTidalRooms_EventScript_23CAC4, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 15, 6, 3, 9, 0, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 0, 28, 5, 3, 7, 17, 0, 0, 0, SSTidalRooms_EventScript_23C9F2, 951, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 7, 3, 10, 0, 1, 0, SSTidalRooms_EventScript_23CA49, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 34, 11, 3, 9, 0, 1, 3, SSTidalRooms_EventScript_23CA60, 0 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 21, 5, 3, 10, 0, 1, 0, SSTidalRooms_EventScript_23CA77, 0 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 5, 14, 3, 8, 0, 1, 1, SSTidalRooms_EventScript_23CA8E, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 14, 3, 8, 0, 1, 1, SSTidalRooms_EventScript_23CAA9, 0 + object_event 6, EVENT_OBJ_GFX_BOY_4, 0, 22, 11, 3, 8, 17, 1, 3, SSTidalRooms_EventScript_23CAC4, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 6, 3, 9, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0 + object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 5, 3, 7, 17, 0, 0, SSTidalRooms_EventScript_23C9F2, 951 SSTidalRooms_MapWarps: @ 853A3D4 warp_def 4, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR diff --git a/data/maps/events/SafariZone_North.inc b/data/maps/events/SafariZone_North.inc index d11d31fe98..99d2b58609 100644 --- a/data/maps/events/SafariZone_North.inc +++ b/data/maps/events/SafariZone_North.inc @@ -1,13 +1,13 @@ SafariZone_North_EventObjects: @ 853B160 - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 22, 9, 3, 2, 17, 0, 0, 0, SafariZone_North_EventScript_23D254, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 29, 3, 2, 17, 0, 0, 0, SafariZone_North_EventScript_23D25D, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 25, 10, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 17, 0, 0 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 25, 13, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 18, 0, 0 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 28, 14, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 19, 0, 0 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 23, 6, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 20, 0, 0 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 7, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 21, 0, 0 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 27, 7, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 22, 0, 0 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2912C9, 1119, 0, 0 + object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 22, 9, 3, 2, 17, 0, 0, SafariZone_North_EventScript_23D254, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 6, 29, 3, 2, 17, 0, 0, SafariZone_North_EventScript_23D25D, 0 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 10, 3, 1, 17, 0, 0, SafariZone_North_EventScript_2907A6, 17 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 13, 3, 1, 17, 0, 0, SafariZone_North_EventScript_2907A6, 18 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 14, 3, 1, 17, 0, 0, SafariZone_North_EventScript_2907A6, 19 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 6, 3, 1, 17, 0, 0, SafariZone_North_EventScript_2907A6, 20 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 7, 3, 1, 17, 0, 0, SafariZone_North_EventScript_2907A6, 21 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 7, 3, 1, 17, 0, 0, SafariZone_North_EventScript_2907A6, 22 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, 1, 17, 0, 0, SafariZone_North_EventScript_2912C9, 1119 SafariZone_North_MapEvents:: @ 853B238 map_events SafariZone_North_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_Northeast.inc b/data/maps/events/SafariZone_Northeast.inc index 233b55da0e..d355654cd8 100644 --- a/data/maps/events/SafariZone_Northeast.inc +++ b/data/maps/events/SafariZone_Northeast.inc @@ -1,13 +1,13 @@ SafariZone_Northeast_EventObjects: @ 853B968 - object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 0, 8, 20, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3C6, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 30, 22, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3D8, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 11, 11, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 21, 0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 13, 35, 0, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3CF, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 13, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 19, 0, 0 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 9, 7, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 17, 0, 0 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 10, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 20, 0, 0 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 12, 8, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 18, 0, 0 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 17, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2912E3, 1169, 0, 0 + object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 8, 20, 3, 1, 17, 0, 0, SafariZone_Northeast_EventScript_23D3C6, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 30, 22, 3, 1, 17, 0, 0, SafariZone_Northeast_EventScript_23D3D8, 0 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 11, 3, 1, 17, 0, 0, SafariZone_Northeast_EventScript_2907A6, 21 + object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 35, 0, 1, 17, 0, 0, SafariZone_Northeast_EventScript_23D3CF, 0 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 13, 3, 1, 17, 0, 0, SafariZone_Northeast_EventScript_2907A6, 19 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 7, 3, 1, 17, 0, 0, SafariZone_Northeast_EventScript_2907A6, 17 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 10, 3, 1, 17, 0, 0, SafariZone_Northeast_EventScript_2907A6, 20 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 8, 3, 1, 17, 0, 0, SafariZone_Northeast_EventScript_2907A6, 18 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, 1, 17, 0, 0, SafariZone_Northeast_EventScript_2912E3, 1169 SafariZone_Northeast_MapBGEvents: @ 853BA40 bg_event 31, 35, 3, 7, 0, ITEM_RARE_CANDY, 106, 0 diff --git a/data/maps/events/SafariZone_Northwest.inc b/data/maps/events/SafariZone_Northwest.inc index 41c2fe1985..2fa67c7145 100644 --- a/data/maps/events/SafariZone_Northwest.inc +++ b/data/maps/events/SafariZone_Northwest.inc @@ -1,6 +1,6 @@ SafariZone_Northwest_EventObjects: @ 853B11C - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 8, 8, 5, 8, 0, 0, 0, 0, SafariZone_Northwest_EventScript_23D24A, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 33, 7, 3, 1, 17, 0, 0, 0, SafariZone_Northwest_EventScript_2912BC, 1094, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 8, 8, 5, 8, 0, 0, 0, SafariZone_Northwest_EventScript_23D24A, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 7, 3, 1, 17, 0, 0, SafariZone_Northwest_EventScript_2912BC, 1094 SafariZone_Northwest_MapEvents:: @ 853B14C map_events SafariZone_Northwest_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_RestHouse.inc b/data/maps/events/SafariZone_RestHouse.inc index 7f7e66bf6e..9ba24ae2b6 100644 --- a/data/maps/events/SafariZone_RestHouse.inc +++ b/data/maps/events/SafariZone_RestHouse.inc @@ -1,7 +1,7 @@ SafariZone_RestHouse_EventObjects: @ 853B8FC - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 7, 4, 0, 10, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BE7, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BF0, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 2, 5, 3, 10, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BF9, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 4, 0, 10, 17, 0, 0, SafariZone_RestHouse_EventScript_242BE7, 0 + object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 8, 4, 0, 9, 17, 0, 0, SafariZone_RestHouse_EventScript_242BF0, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 5, 3, 10, 17, 0, 0, SafariZone_RestHouse_EventScript_242BF9, 0 SafariZone_RestHouse_MapWarps: @ 853B944 warp_def 3, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST diff --git a/data/maps/events/SafariZone_South.inc b/data/maps/events/SafariZone_South.inc index 1415cf9e69..d1fbf95ed6 100644 --- a/data/maps/events/SafariZone_South.inc +++ b/data/maps/events/SafariZone_South.inc @@ -1,10 +1,10 @@ SafariZone_South_EventObjects: @ 853B2A4 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 0, 32, 34, 4, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2E5, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 0, 26, 28, 3, 2, 17, 0, 0, 0, SafariZone_South_EventScript_23D2CA, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 0, 16, 6, 5, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 15, 31, 3, 2, 17, 0, 0, 0, SafariZone_South_EventScript_23D2DC, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 0, 36, 16, 3, 9, 17, 0, 0, 0, SafariZone_South_EventScript_23D390, 717, 0, 0 - object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 0, 36, 17, 3, 9, 17, 0, 0, 0, SafariZone_South_EventScript_23D3A2, 717, 0, 0 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 32, 34, 4, 8, 0, 0, 0, SafariZone_South_EventScript_23D2E5, 0 + object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 26, 28, 3, 2, 17, 0, 0, SafariZone_South_EventScript_23D2CA, 0 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 16, 6, 5, 8, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 15, 31, 3, 2, 17, 0, 0, SafariZone_South_EventScript_23D2DC, 0 + object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 36, 16, 3, 9, 17, 0, 0, SafariZone_South_EventScript_23D390, 717 + object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 36, 17, 3, 9, 17, 0, 0, SafariZone_South_EventScript_23D3A2, 717 SafariZone_South_MapWarps: @ 853B334 warp_def 32, 33, 0, 0, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE diff --git a/data/maps/events/SafariZone_Southeast.inc b/data/maps/events/SafariZone_Southeast.inc index 61e6b93fe5..f14779cdb8 100644 --- a/data/maps/events/SafariZone_Southeast.inc +++ b/data/maps/events/SafariZone_Southeast.inc @@ -1,9 +1,9 @@ SafariZone_Southeast_EventObjects: @ 853BA6C - object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 0, 7, 7, 3, 1, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 20, 30, 3, 2, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 8, 26, 3, 2, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 15, 3, 1, 17, 0, 0, 0, SafariZone_Southeast_EventScript_2912F0, 1170, 0, 0 - object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 0, 12, 16, 3, 9, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D399, 747, 0, 0 + object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 7, 7, 3, 1, 17, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 20, 30, 3, 2, 17, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 8, 26, 3, 2, 17, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 15, 3, 1, 17, 0, 0, SafariZone_Southeast_EventScript_2912F0, 1170 + object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 12, 16, 3, 9, 17, 0, 0, SafariZone_Southeast_EventScript_23D399, 747 SafariZone_Southeast_MapBGEvents: @ 853BAE4 bg_event 19, 36, 3, 7, 0, ITEM_PP_UP, 108, 0 diff --git a/data/maps/events/SafariZone_Southwest.inc b/data/maps/events/SafariZone_Southwest.inc index da88db1c30..a6567b4769 100644 --- a/data/maps/events/SafariZone_Southwest.inc +++ b/data/maps/events/SafariZone_Southwest.inc @@ -1,6 +1,6 @@ SafariZone_Southwest_EventObjects: @ 853B24C - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 22, 9, 3, 8, 0, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 37, 3, 1, 17, 0, 0, 0, SafariZone_Southwest_EventScript_2912D6, 1131, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 22, 9, 3, 8, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 3, 1, 17, 0, 0, SafariZone_Southwest_EventScript_2912D6, 1131 SafariZone_Southwest_MapWarps: @ 853B27C warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE diff --git a/data/maps/events/ScorchedSlab.inc b/data/maps/events/ScorchedSlab.inc index d55facfabd..160a59a3c0 100644 --- a/data/maps/events/ScorchedSlab.inc +++ b/data/maps/events/ScorchedSlab.inc @@ -1,5 +1,5 @@ ScorchedSlab_EventObjects: @ 8536F88 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 3, 1, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, 1079, 0, 0 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, 1, 0, 0, 0, ScorchedSlab_EventScript_2912AF, 1079 ScorchedSlab_MapWarps: @ 8536FA0 warp_def 7, 16, 1, 1, MAP_ROUTE120 diff --git a/data/maps/events/SeafloorCavern_Entrance.inc b/data/maps/events/SeafloorCavern_Entrance.inc index 7f2619b0f1..7bb9d1ae4b 100644 --- a/data/maps/events/SeafloorCavern_Entrance.inc +++ b/data/maps/events/SeafloorCavern_Entrance.inc @@ -1,5 +1,5 @@ SeafloorCavern_Entrance_EventObjects: @ 85356BC - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 2, 3, 7, 17, 0, 0, 0, SeafloorCavern_Entrance_EventScript_234485, 941, 0, 0 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 2, 3, 7, 17, 0, 0, SeafloorCavern_Entrance_EventScript_234485, 941 SeafloorCavern_Entrance_MapWarps: @ 85356D4 warp_def 10, 18, 3, 0, MAP_UNDERWATER4 diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/events/SeafloorCavern_Room1.inc index b8f21b4de2..83b69c7393 100644 --- a/data/maps/events/SeafloorCavern_Room1.inc +++ b/data/maps/events/SeafloorCavern_Room1.inc @@ -1,9 +1,9 @@ SeafloorCavern_Room1_EventObjects: @ 85356F8 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 17, 0, 0 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 18, 0, 0 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 5, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, 19, 0, 0 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 6, 3, 1, 17, 0, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, 946, 0, 0 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 10, 3, 16, 17, 0, 1, 3, SeafloorCavern_Room1_EventScript_234803, 946, 0, 0 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 11, 3, 1, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 17 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, 1, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 18 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 10, 3, 1, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, 19 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 6, 3, 1, 17, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, 946 + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 10, 3, 16, 17, 1, 3, SeafloorCavern_Room1_EventScript_234803, 946 SeafloorCavern_Room1_MapWarps: @ 8535770 warp_def 5, 18, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/events/SeafloorCavern_Room2.inc index 0c5a8dd487..c8f58a15c1 100644 --- a/data/maps/events/SeafloorCavern_Room2.inc +++ b/data/maps/events/SeafloorCavern_Room2.inc @@ -1,12 +1,12 @@ SeafloorCavern_Room2_EventObjects: @ 853579C - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 18, 0, 0 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 19, 0, 0 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 17, 0, 0 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 21, 0, 0 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 22, 0, 0 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 24, 0, 0 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 9, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 25, 0, 0 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 23, 0, 0 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, 1, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 18 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 3, 3, 1, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 19 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 5, 3, 1, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 17 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, 1, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 21 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, 1, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 22 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 7, 3, 1, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 24 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 3, 3, 1, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 25 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 8, 3, 1, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 23 SeafloorCavern_Room2_MapWarps: @ 853585C warp_def 10, 7, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1 diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/events/SeafloorCavern_Room3.inc index a49565f4da..8319729bf9 100644 --- a/data/maps/events/SeafloorCavern_Room3.inc +++ b/data/maps/events/SeafloorCavern_Room3.inc @@ -1,13 +1,13 @@ SeafloorCavern_Room3_EventObjects: @ 8535890 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 18, 0, 0 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 20, 0, 0 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 9, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 21, 0, 0 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 22, 0, 0 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 23, 0, 0 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 24, 0, 0 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 25, 0, 0 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 9, 5, 3, 9, 17, 0, 1, 6, SeafloorCavern_Room3_EventScript_234938, 946, 0, 0 - object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 5, 5, 3, 10, 17, 0, 1, 4, SeafloorCavern_Room3_EventScript_23494F, 946, 0, 0 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 10, 3, 1, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 18 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 10, 3, 1, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 20 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 9, 3, 1, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 21 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 7, 3, 1, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 22 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 8, 3, 1, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 23 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, 1, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 24 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 8, 3, 1, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 25 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 9, 5, 3, 9, 17, 1, 6, SeafloorCavern_Room3_EventScript_234938, 946 + object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 5, 3, 10, 17, 1, 4, SeafloorCavern_Room3_EventScript_23494F, 946 SeafloorCavern_Room3_MapWarps: @ 8535968 warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8 diff --git a/data/maps/events/SeafloorCavern_Room4.inc b/data/maps/events/SeafloorCavern_Room4.inc index ca44cc403c..846e339642 100644 --- a/data/maps/events/SeafloorCavern_Room4.inc +++ b/data/maps/events/SeafloorCavern_Room4.inc @@ -1,6 +1,6 @@ SeafloorCavern_Room4_EventObjects: @ 8535994 - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 5, 8, 3, 17, 17, 0, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, 946, 0, 0 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 5, 12, 3, 7, 17, 0, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, 946, 0, 0 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 8, 3, 17, 17, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, 946 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 5, 12, 3, 7, 17, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, 946 SeafloorCavern_Room4_MapWarps: @ 85359C4 warp_def 13, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM2 diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/events/SeafloorCavern_Room5.inc index b9fa6997da..17ead20a38 100644 --- a/data/maps/events/SeafloorCavern_Room5.inc +++ b/data/maps/events/SeafloorCavern_Room5.inc @@ -1,10 +1,10 @@ SeafloorCavern_Room5_EventObjects: @ 85359F8 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 17, 0, 0 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 18, 0, 0 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 19, 0, 0 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 21, 0, 0 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 22, 0, 0 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 20, 0, 0 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 11, 3, 1, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 17 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, 1, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 18 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, 1, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 19 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 13, 3, 1, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 21 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, 1, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 22 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, 1, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 20 SeafloorCavern_Room5_MapWarps: @ 8535A88 warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM1 diff --git a/data/maps/events/SeafloorCavern_Room8.inc b/data/maps/events/SeafloorCavern_Room8.inc index 8049afd965..1fa73357d4 100644 --- a/data/maps/events/SeafloorCavern_Room8.inc +++ b/data/maps/events/SeafloorCavern_Room8.inc @@ -1,16 +1,16 @@ SeafloorCavern_Room8_EventObjects: @ 8535B04 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 17, 0, 0 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 18, 0, 0 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 19, 0, 0 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 20, 0, 0 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 21, 0, 0 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 22, 0, 0 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 23, 0, 0 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 24, 0, 0 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 25, 0, 0 - object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 26, 0, 0 - object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 27, 0, 0 - object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 28, 0, 0 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, 1, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 17 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, 1, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 18 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 7, 3, 1, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 19 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 6, 3, 1, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 20 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 6, 3, 1, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 21 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, 1, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 22 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 5, 3, 1, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 23 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 5, 3, 1, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 24 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 4, 3, 1, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 25 + object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 4, 3, 1, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 26 + object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 4, 3, 1, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 27 + object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, 1, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 28 SeafloorCavern_Room8_MapWarps: @ 8535C24 warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9 diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/events/SeafloorCavern_Room9.inc index ffa9830edc..3e370d8dcd 100644 --- a/data/maps/events/SeafloorCavern_Room9.inc +++ b/data/maps/events/SeafloorCavern_Room9.inc @@ -1,11 +1,11 @@ SeafloorCavern_Room9_EventObjects: @ 8535C48 - object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 0, 17, 38, 3, 8, 0, 0, 0, 0, 0x0, 859, 0, 0 - object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 828, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAXIE, 0, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 829, 0, 0 - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 41, 3, 10, 0, 0, 0, 0, 0x0, 831, 0, 0 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 8, 42, 3, 10, 0, 0, 0, 0, 0x0, 831, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 5, 3, 1, 17, 0, 0, 0, SeafloorCavern_Room9_EventScript_291401, 1090, 0, 0 - object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 0, 17, 38, 3, 8, 17, 0, 0, 0, 0x0, 733, 0, 0 + object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 17, 38, 3, 8, 0, 0, 0, 0x0, 859 + object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 9, 42, 3, 10, 0, 0, 0, 0x0, 828 + object_event 3, EVENT_OBJ_GFX_MAXIE, 0, 9, 42, 3, 10, 0, 0, 0, 0x0, 829 + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 41, 3, 10, 0, 0, 0, 0x0, 831 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 42, 3, 10, 0, 0, 0, 0x0, 831 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, 1, 17, 0, 0, SeafloorCavern_Room9_EventScript_291401, 1090 + object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 17, 38, 3, 8, 17, 0, 0, 0x0, 733 SeafloorCavern_Room9_MapWarps: @ 8535CF0 warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/events/SecretBase_BlueCave1.inc index c495a2b4c4..2a0f7eff13 100644 --- a/data/maps/events/SecretBase_BlueCave1.inc +++ b/data/maps/events/SecretBase_BlueCave1.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave1_EventObjects: @ 8537BEC - object_event 1, 255, 0, 0, 4, 2, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_275D64, 173, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 4, 2, 3, 8, 0, 0, 0, SecretBase_BlueCave1_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 SecretBase_BlueCave1_MapWarps: @ 8537D54 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/events/SecretBase_BlueCave2.inc index 0c3d9dc297..68e554b055 100644 --- a/data/maps/events/SecretBase_BlueCave2.inc +++ b/data/maps/events/SecretBase_BlueCave2.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave2_EventObjects: @ 8538504 - object_event 1, 255, 0, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_275D64, 173, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 2, 1, 3, 8, 0, 0, 0, SecretBase_BlueCave2_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 SecretBase_BlueCave2_MapWarps: @ 853866C warp_def 7, 5, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/events/SecretBase_BlueCave3.inc index fb8018dca6..de02278b3c 100644 --- a/data/maps/events/SecretBase_BlueCave3.inc +++ b/data/maps/events/SecretBase_BlueCave3.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave3_EventObjects: @ 8538E1C - object_event 1, 255, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_275D64, 173, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 5, 1, 3, 8, 0, 0, 0, SecretBase_BlueCave3_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 SecretBase_BlueCave3_MapWarps: @ 8538F84 warp_def 4, 15, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/events/SecretBase_BlueCave4.inc index d6da82af50..9b9f577b7d 100644 --- a/data/maps/events/SecretBase_BlueCave4.inc +++ b/data/maps/events/SecretBase_BlueCave4.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave4_EventObjects: @ 8539734 - object_event 1, 255, 0, 0, 5, 13, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_275D64, 173, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 5, 13, 3, 8, 0, 0, 0, SecretBase_BlueCave4_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 SecretBase_BlueCave4_MapWarps: @ 853989C warp_def 4, 15, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/events/SecretBase_BrownCave1.inc index 52c7cc504c..b1edf9985b 100644 --- a/data/maps/events/SecretBase_BrownCave1.inc +++ b/data/maps/events/SecretBase_BrownCave1.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave1_EventObjects: @ 8537A68 - object_event 1, 255, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_275D64, 173, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 5, 2, 3, 8, 0, 0, 0, SecretBase_BrownCave1_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 SecretBase_BrownCave1_MapWarps: @ 8537BD0 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/events/SecretBase_BrownCave2.inc index 5849476fef..dceb7a584a 100644 --- a/data/maps/events/SecretBase_BrownCave2.inc +++ b/data/maps/events/SecretBase_BrownCave2.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave2_EventObjects: @ 8538380 - object_event 1, 255, 0, 0, 11, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_275D64, 173, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 11, 2, 3, 8, 0, 0, 0, SecretBase_BrownCave2_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 SecretBase_BrownCave2_MapWarps: @ 85384E8 warp_def 1, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/events/SecretBase_BrownCave3.inc index 3b0b495525..4b8b7674f8 100644 --- a/data/maps/events/SecretBase_BrownCave3.inc +++ b/data/maps/events/SecretBase_BrownCave3.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave3_EventObjects: @ 8538C98 - object_event 1, 255, 0, 0, 1, 7, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_275D64, 173, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 1, 7, 3, 8, 0, 0, 0, SecretBase_BrownCave3_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 SecretBase_BrownCave3_MapWarps: @ 8538E00 warp_def 11, 9, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/events/SecretBase_BrownCave4.inc index d298884a53..1c2ad2d49b 100644 --- a/data/maps/events/SecretBase_BrownCave4.inc +++ b/data/maps/events/SecretBase_BrownCave4.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave4_EventObjects: @ 85395B0 - object_event 1, 255, 0, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_275D64, 173, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 2, 1, 3, 8, 0, 0, 0, SecretBase_BrownCave4_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 SecretBase_BrownCave4_MapWarps: @ 8539718 warp_def 2, 8, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/events/SecretBase_RedCave1.inc index 51ea103122..72592ec7da 100644 --- a/data/maps/events/SecretBase_RedCave1.inc +++ b/data/maps/events/SecretBase_RedCave1.inc @@ -1,19 +1,19 @@ SecretBase_RedCave1_EventObjects: @ 85378E4 - object_event 1, 255, 0, 0, 7, 4, 3, 8, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_275D64, 173, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 7, 4, 3, 8, 0, 0, 0, SecretBase_RedCave1_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 SecretBase_RedCave1_MapWarps: @ 8537A4C warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/events/SecretBase_RedCave2.inc index eeda14062b..0aae19f6a8 100644 --- a/data/maps/events/SecretBase_RedCave2.inc +++ b/data/maps/events/SecretBase_RedCave2.inc @@ -1,19 +1,19 @@ SecretBase_RedCave2_EventObjects: @ 85381FC - object_event 1, 255, 0, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_275D64, 173, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 3, 1, 3, 8, 0, 0, 0, SecretBase_RedCave2_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 SecretBase_RedCave2_MapWarps: @ 8538364 warp_def 3, 14, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/events/SecretBase_RedCave3.inc index 3b72537b39..acdc616d21 100644 --- a/data/maps/events/SecretBase_RedCave3.inc +++ b/data/maps/events/SecretBase_RedCave3.inc @@ -1,19 +1,19 @@ SecretBase_RedCave3_EventObjects: @ 8538B14 - object_event 1, 255, 0, 0, 12, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_275D64, 173, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 12, 1, 3, 8, 0, 0, 0, SecretBase_RedCave3_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 SecretBase_RedCave3_MapWarps: @ 8538C7C warp_def 3, 6, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/events/SecretBase_RedCave4.inc index e375824e90..b5863d41cf 100644 --- a/data/maps/events/SecretBase_RedCave4.inc +++ b/data/maps/events/SecretBase_RedCave4.inc @@ -1,19 +1,19 @@ SecretBase_RedCave4_EventObjects: @ 853942C - object_event 1, 255, 0, 0, 5, 8, 3, 8, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_275D64, 173, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 5, 8, 3, 8, 0, 0, 0, SecretBase_RedCave4_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 SecretBase_RedCave4_MapWarps: @ 8539594 warp_def 2, 12, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/events/SecretBase_Shrub1.inc index 133e21afd6..051297cd31 100644 --- a/data/maps/events/SecretBase_Shrub1.inc +++ b/data/maps/events/SecretBase_Shrub1.inc @@ -1,19 +1,19 @@ SecretBase_Shrub1_EventObjects: @ 8538078 - object_event 1, 255, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_275D64, 173, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 5, 2, 3, 8, 0, 0, 0, SecretBase_Shrub1_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 SecretBase_Shrub1_MapWarps: @ 85381E0 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/events/SecretBase_Shrub2.inc index 12ee646482..e9acfd82bb 100644 --- a/data/maps/events/SecretBase_Shrub2.inc +++ b/data/maps/events/SecretBase_Shrub2.inc @@ -1,19 +1,19 @@ SecretBase_Shrub2_EventObjects: @ 8538990 - object_event 1, 255, 0, 0, 13, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_275D64, 173, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 13, 2, 3, 8, 0, 0, 0, SecretBase_Shrub2_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 SecretBase_Shrub2_MapWarps: @ 8538AF8 warp_def 7, 5, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/events/SecretBase_Shrub3.inc index 57d0c07adf..965d19f70c 100644 --- a/data/maps/events/SecretBase_Shrub3.inc +++ b/data/maps/events/SecretBase_Shrub3.inc @@ -1,19 +1,19 @@ SecretBase_Shrub3_EventObjects: @ 85392A8 - object_event 1, 255, 0, 0, 5, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_275D64, 173, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 5, 7, 3, 8, 0, 0, 0, SecretBase_Shrub3_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 SecretBase_Shrub3_MapWarps: @ 8539410 warp_def 6, 9, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/events/SecretBase_Shrub4.inc index 234a30943a..60de85b7f3 100644 --- a/data/maps/events/SecretBase_Shrub4.inc +++ b/data/maps/events/SecretBase_Shrub4.inc @@ -1,19 +1,19 @@ SecretBase_Shrub4_EventObjects: @ 8539BC0 - object_event 1, 255, 0, 0, 9, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, 173, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 9, 7, 3, 8, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 SecretBase_Shrub4_MapWarps: @ 8539D28 warp_def 11, 8, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/events/SecretBase_Tree1.inc index 73b572717b..01052acc2f 100644 --- a/data/maps/events/SecretBase_Tree1.inc +++ b/data/maps/events/SecretBase_Tree1.inc @@ -1,19 +1,19 @@ SecretBase_Tree1_EventObjects: @ 8537EF4 - object_event 1, 255, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree1_EventScript_275D64, 173, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 5, 1, 3, 8, 0, 0, 0, SecretBase_Tree1_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 SecretBase_Tree1_MapWarps: @ 853805C warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/events/SecretBase_Tree2.inc index d45021a2ec..0317dfbcf9 100644 --- a/data/maps/events/SecretBase_Tree2.inc +++ b/data/maps/events/SecretBase_Tree2.inc @@ -1,19 +1,19 @@ SecretBase_Tree2_EventObjects: @ 853880C - object_event 1, 255, 0, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree2_EventScript_275D64, 173, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 3, 1, 3, 8, 0, 0, 0, SecretBase_Tree2_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 SecretBase_Tree2_MapWarps: @ 8538974 warp_def 3, 14, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/events/SecretBase_Tree3.inc index c903add8d6..061179987b 100644 --- a/data/maps/events/SecretBase_Tree3.inc +++ b/data/maps/events/SecretBase_Tree3.inc @@ -1,19 +1,19 @@ SecretBase_Tree3_EventObjects: @ 8539124 - object_event 1, 255, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, SecretBase_Tree3_EventScript_275D64, 173, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 1, 2, 3, 8, 0, 0, 0, SecretBase_Tree3_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 SecretBase_Tree3_MapWarps: @ 853928C warp_def 8, 6, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/events/SecretBase_Tree4.inc index 45a9182d00..b190e4f1e6 100644 --- a/data/maps/events/SecretBase_Tree4.inc +++ b/data/maps/events/SecretBase_Tree4.inc @@ -1,19 +1,19 @@ SecretBase_Tree4_EventObjects: @ 8539A3C - object_event 1, 255, 0, 0, 10, 9, 3, 8, 0, 0, 0, 0, SecretBase_Tree4_EventScript_275D64, 173, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 10, 9, 3, 8, 0, 0, 0, SecretBase_Tree4_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 SecretBase_Tree4_MapWarps: @ 8539BA4 warp_def 7, 12, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/events/SecretBase_YellowCave1.inc index 5f2779b27e..623c8f9704 100644 --- a/data/maps/events/SecretBase_YellowCave1.inc +++ b/data/maps/events/SecretBase_YellowCave1.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave1_EventObjects: @ 8537D70 - object_event 1, 255, 0, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_275D64, 173, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 3, 1, 3, 8, 0, 0, 0, SecretBase_YellowCave1_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 SecretBase_YellowCave1_MapWarps: @ 8537ED8 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/events/SecretBase_YellowCave2.inc index 2eb1f86605..60434dec97 100644 --- a/data/maps/events/SecretBase_YellowCave2.inc +++ b/data/maps/events/SecretBase_YellowCave2.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave2_EventObjects: @ 8538688 - object_event 1, 255, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_275D64, 173, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 1, 1, 3, 8, 0, 0, 0, SecretBase_YellowCave2_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 SecretBase_YellowCave2_MapWarps: @ 85387F0 warp_def 12, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/events/SecretBase_YellowCave3.inc index ca749ef060..dda1bf65bc 100644 --- a/data/maps/events/SecretBase_YellowCave3.inc +++ b/data/maps/events/SecretBase_YellowCave3.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave3_EventObjects: @ 8538FA0 - object_event 1, 255, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_275D64, 173, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 7, 5, 3, 8, 0, 0, 0, SecretBase_YellowCave3_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 SecretBase_YellowCave3_MapWarps: @ 8539108 warp_def 5, 9, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/events/SecretBase_YellowCave4.inc index ab8a4d010c..f525839b57 100644 --- a/data/maps/events/SecretBase_YellowCave4.inc +++ b/data/maps/events/SecretBase_YellowCave4.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave4_EventObjects: @ 85398B8 - object_event 1, 255, 0, 0, 9, 8, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_275D64, 173, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 9, 8, 3, 8, 0, 0, 0, SecretBase_YellowCave4_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 SecretBase_YellowCave4_MapWarps: @ 8539A20 warp_def 6, 12, 0, 126, MAP_NONE diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc index 4b5ce03159..f044adda4f 100644 --- a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc +++ b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc @@ -1,6 +1,6 @@ ShoalCave_LowTideEntranceRoom_EventObjects: @ 853627C - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 30, 3, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, 1081, 0, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 18, 15, 3, 9, 17, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 3, 3, 1, 17, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, 1081 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 18, 15, 3, 9, 17, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0 ShoalCave_LowTideEntranceRoom_MapWarps: @ 85362AC warp_def 20, 30, 3, 0, MAP_ROUTE125 diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.inc b/data/maps/events/ShoalCave_LowTideIceRoom.inc index 4ecc5efe4c..10ce11a10b 100644 --- a/data/maps/events/ShoalCave_LowTideIceRoom.inc +++ b/data/maps/events/ShoalCave_LowTideIceRoom.inc @@ -1,6 +1,6 @@ ShoalCave_LowTideIceRoom_EventObjects: @ 8537100 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 8, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, 1112, 0, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 21, 4, 1, 17, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, 1113, 0, 0 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 8, 3, 1, 17, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, 1112 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 21, 4, 1, 17, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, 1113 ShoalCave_LowTideIceRoom_MapWarps: @ 8537130 warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.inc b/data/maps/events/ShoalCave_LowTideInnerRoom.inc index 4d610e8284..d6ba2a87fd 100644 --- a/data/maps/events/ShoalCave_LowTideInnerRoom.inc +++ b/data/maps/events/ShoalCave_LowTideInnerRoom.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideInnerRoom_EventObjects: @ 85362E0 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 26, 14, 5, 1, 17, 0, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, 1082, 0, 0 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 14, 5, 1, 17, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, 1082 ShoalCave_LowTideInnerRoom_MapWarps: @ 85362F8 warp_def 34, 29, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/events/ShoalCave_LowTideLowerRoom.inc index 752482a7ea..6063c4e85d 100644 --- a/data/maps/events/ShoalCave_LowTideLowerRoom.inc +++ b/data/maps/events/ShoalCave_LowTideLowerRoom.inc @@ -1,6 +1,6 @@ ShoalCave_LowTideLowerRoom_EventObjects: @ 85363DC - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 25, 3, 3, 1, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, 17, 0, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 11, 4, 3, 2, 17, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2371B2, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 3, 3, 1, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, 17 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 4, 3, 2, 17, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2371B2, 0 ShoalCave_LowTideLowerRoom_MapWarps: @ 853640C warp_def 7, 2, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.inc b/data/maps/events/ShoalCave_LowTideStairsRoom.inc index 6df886e80d..7e477c0f22 100644 --- a/data/maps/events/ShoalCave_LowTideStairsRoom.inc +++ b/data/maps/events/ShoalCave_LowTideStairsRoom.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideStairsRoom_EventObjects: @ 8536394 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 12, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, 1083, 0, 0 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 12, 3, 1, 17, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, 1083 ShoalCave_LowTideStairsRoom_MapWarps: @ 85363AC warp_def 3, 12, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/events/SingleBattleColosseum.inc index ac59cd8daa..809a69ee82 100644 --- a/data/maps/events/SingleBattleColosseum.inc +++ b/data/maps/events/SingleBattleColosseum.inc @@ -1,5 +1,5 @@ SingleBattleColosseum_EventObjects: @ 8539D44 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 9, 3, 3, 9, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 3, 3, 9, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0 SingleBattleColosseum_MapWarps: @ 8539D5C warp_def 6, 8, 3, 127, MAP_NONE diff --git a/data/maps/events/SkyPillar_Outside.inc b/data/maps/events/SkyPillar_Outside.inc index f16f577ef6..6afadc9e83 100644 --- a/data/maps/events/SkyPillar_Outside.inc +++ b/data/maps/events/SkyPillar_Outside.inc @@ -1,5 +1,5 @@ SkyPillar_Outside_EventObjects: @ 853701C - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 0, 13, 7, 3, 8, 17, 0, 0, 0, SkyPillar_Outside_EventScript_2393F8, 855, 0, 0 + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 13, 7, 3, 8, 17, 0, 0, SkyPillar_Outside_EventScript_2393F8, 855 SkyPillar_Outside_MapWarps: @ 8537034 warp_def 17, 13, 3, 1, MAP_SKY_PILLAR_ENTRANCE diff --git a/data/maps/events/SkyPillar_Top.inc b/data/maps/events/SkyPillar_Top.inc index 2634e9dfd7..14b562cf78 100644 --- a/data/maps/events/SkyPillar_Top.inc +++ b/data/maps/events/SkyPillar_Top.inc @@ -1,6 +1,6 @@ SkyPillar_Top_EventObjects: @ 8537170 - object_event 1, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 0, 14, 7, 3, 8, 17, 0, 0, 0, 0x0, 773, 0, 0 - object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 0, 14, 6, 3, 8, 17, 0, 0, 0, SkyPillar_Top_EventScript_239722, 80, 0, 0 + object_event 1, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 14, 7, 3, 8, 17, 0, 0, 0x0, 773 + object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 14, 6, 3, 8, 17, 0, 0, SkyPillar_Top_EventScript_239722, 80 SkyPillar_Top_MapWarps: @ 85371A0 warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F diff --git a/data/maps/events/SlateportCity.inc b/data/maps/events/SlateportCity.inc index c4f629f5b1..3b9571d8b5 100644 --- a/data/maps/events/SlateportCity.inc +++ b/data/maps/events/SlateportCity.inc @@ -1,39 +1,39 @@ SlateportCity_EventObjects: @ 85261CC - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 21, 11, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DCED9, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 34, 29, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCEF6, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 0, 5, 13, 3, 2, 33, 0, 0, 0, SlateportCity_EventScript_1DCEB8, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 26, 29, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCF17, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 31, 27, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD009, 882, 0, 0 - object_event 6, EVENT_OBJ_GFX_COOK, 0, 0, 5, 43, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCE42, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 20, 37, 3, 1, 17, 0, 0, 0, SlateportCity_EventScript_1DCE63, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 0, 8, 42, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DCE84, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 29, 13, 3, 9, 0, 0, 0, 0, SlateportCity_EventScript_1DD353, 835, 0, 0 - object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 28, 14, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD35C, 835, 0, 0 - object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 28, 13, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD1F8, 840, 0, 0 - object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 0, 37, 41, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DCFE5, 0, 0, 0 - object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 0, 28, 46, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCFEE, 0, 0, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 9, 50, 3, 3, 16, 0, 0, 0, SlateportCity_EventScript_1DCFF7, 0, 0, 0 - object_event 15, EVENT_OBJ_GFX_MAN_4, 0, 0, 16, 46, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DD000, 0, 0, 0 - object_event 16, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 24, 3, 3, 16, 0, 0, 0, SlateportCity_EventScript_1DCFBB, 0, 0, 0 - object_event 17, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 15, 31, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCFDC, 0, 0, 0 - object_event 18, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD020, 882, 0, 0 - object_event 19, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 29, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD037, 882, 0, 0 - object_event 20, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 6, 38, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD198, 0, 0, 0 - object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 5, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD16A, 0, 0, 0 - object_event 22, EVENT_OBJ_GFX_MAN_6, 0, 0, 34, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD365, 0, 0, 0 - object_event 23, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 47, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCDE4, 0, 0, 0 - object_event 24, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 11, 47, 3, 8, 17, 0, 0, 0, SlateportCity_EventScript_1DD1D8, 948, 0, 0 - object_event 25, EVENT_OBJ_GFX_MAN_3, 0, 0, 5, 47, 3, 8, 17, 0, 0, 0, SlateportCity_EventScript_1DCDBD, 0, 0, 0 - object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 22, 27, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD04E, 882, 0, 0 - object_event 27, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD065, 882, 0, 0 - object_event 28, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 24, 27, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD07C, 882, 0, 0 - object_event 29, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 26, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD093, 882, 0, 0 - object_event 30, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 20, 26, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD0AA, 882, 0, 0 - object_event 31, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 26, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD0C1, 882, 0, 0 - object_event 32, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 28, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD14A, 882, 0, 0 - object_event 33, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 25, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD153, 882, 0, 0 - object_event 34, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 11, 37, 3, 9, 33, 0, 0, 0, SlateportCity_EventScript_1DD36E, 0, 0, 0 - object_event 35, EVENT_OBJ_GFX_SCOTT, 0, 0, 10, 12, 0, 8, 33, 0, 0, 0, 0x0, 749, 0, 0 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 21, 11, 3, 2, 17, 0, 0, SlateportCity_EventScript_1DCED9, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 34, 29, 3, 5, 1, 0, 0, SlateportCity_EventScript_1DCEF6, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 5, 13, 3, 2, 33, 0, 0, SlateportCity_EventScript_1DCEB8, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 26, 29, 3, 1, 0, 0, 0, SlateportCity_EventScript_1DCF17, 0 + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 31, 27, 3, 7, 0, 0, 0, SlateportCity_EventScript_1DD009, 882 + object_event 6, EVENT_OBJ_GFX_COOK, 0, 5, 43, 3, 8, 0, 0, 0, SlateportCity_EventScript_1DCE42, 0 + object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 20, 37, 3, 1, 17, 0, 0, SlateportCity_EventScript_1DCE63, 0 + object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 8, 42, 3, 2, 17, 0, 0, SlateportCity_EventScript_1DCE84, 0 + object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 29, 13, 3, 9, 0, 0, 0, SlateportCity_EventScript_1DD353, 835 + object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 28, 14, 3, 7, 0, 0, 0, SlateportCity_EventScript_1DD35C, 835 + object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 28, 13, 3, 10, 0, 0, 0, SlateportCity_EventScript_1DD1F8, 840 + object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 37, 41, 3, 10, 0, 0, 0, SlateportCity_EventScript_1DCFE5, 0 + object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 28, 46, 3, 5, 1, 0, 0, SlateportCity_EventScript_1DCFEE, 0 + object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 50, 3, 3, 16, 0, 0, SlateportCity_EventScript_1DCFF7, 0 + object_event 15, EVENT_OBJ_GFX_MAN_4, 0, 16, 46, 3, 2, 17, 0, 0, SlateportCity_EventScript_1DD000, 0 + object_event 16, EVENT_OBJ_GFX_MANIAC, 0, 8, 24, 3, 3, 16, 0, 0, SlateportCity_EventScript_1DCFBB, 0 + object_event 17, EVENT_OBJ_GFX_WOMAN_7, 0, 15, 31, 3, 1, 0, 0, 0, SlateportCity_EventScript_1DCFDC, 0 + object_event 18, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 27, 3, 10, 0, 0, 0, SlateportCity_EventScript_1DD020, 882 + object_event 19, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 27, 3, 10, 0, 0, 0, SlateportCity_EventScript_1DD037, 882 + object_event 20, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 38, 3, 10, 0, 0, 0, SlateportCity_EventScript_1DD198, 0 + object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 5, 51, 3, 8, 0, 0, 0, SlateportCity_EventScript_1DD16A, 0 + object_event 22, EVENT_OBJ_GFX_MAN_6, 0, 34, 51, 3, 8, 0, 0, 0, SlateportCity_EventScript_1DD365, 0 + object_event 23, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 47, 3, 8, 0, 0, 0, SlateportCity_EventScript_1DCDE4, 0 + object_event 24, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 11, 47, 3, 8, 17, 0, 0, SlateportCity_EventScript_1DD1D8, 948 + object_event 25, EVENT_OBJ_GFX_MAN_3, 0, 5, 47, 3, 8, 17, 0, 0, SlateportCity_EventScript_1DCDBD, 0 + object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 22, 27, 3, 10, 17, 0, 0, SlateportCity_EventScript_1DD04E, 882 + object_event 27, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 27, 3, 7, 17, 0, 0, SlateportCity_EventScript_1DD065, 882 + object_event 28, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 24, 27, 3, 10, 17, 0, 0, SlateportCity_EventScript_1DD07C, 882 + object_event 29, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 26, 3, 10, 17, 0, 0, SlateportCity_EventScript_1DD093, 882 + object_event 30, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 26, 3, 10, 17, 0, 0, SlateportCity_EventScript_1DD0AA, 882 + object_event 31, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 27, 3, 7, 17, 0, 0, SlateportCity_EventScript_1DD0C1, 882 + object_event 32, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 27, 3, 7, 17, 0, 0, SlateportCity_EventScript_1DD14A, 882 + object_event 33, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 27, 3, 7, 17, 0, 0, SlateportCity_EventScript_1DD153, 882 + object_event 34, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 37, 3, 9, 33, 0, 0, SlateportCity_EventScript_1DD36E, 0 + object_event 35, EVENT_OBJ_GFX_SCOTT, 0, 10, 12, 0, 8, 33, 0, 0, 0x0, 749 SlateportCity_MapWarps: @ 8526514 warp_def 19, 19, 0, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/SlateportCity_BattleTentBattleRoom.inc b/data/maps/events/SlateportCity_BattleTentBattleRoom.inc index f22969d2a1..4330ec1dd4 100644 --- a/data/maps/events/SlateportCity_BattleTentBattleRoom.inc +++ b/data/maps/events/SlateportCity_BattleTentBattleRoom.inc @@ -1,7 +1,7 @@ SlateportCity_BattleTentBattleRoom_EventObjects: @ 852F4DC - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 4, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 4, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 0, 10, 17, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, 8, 17, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 4, 8, 3, 7, 17, 0, 0, 0x0, 0 SlateportCity_BattleTentBattleRoom_MapEvents:: @ 852F524 map_events SlateportCity_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_BattleTentCorridor.inc b/data/maps/events/SlateportCity_BattleTentCorridor.inc index 6b45c8e268..57292c37fd 100644 --- a/data/maps/events/SlateportCity_BattleTentCorridor.inc +++ b/data/maps/events/SlateportCity_BattleTentCorridor.inc @@ -1,5 +1,5 @@ SlateportCity_BattleTentCorridor_EventObjects: @ 852F4B0 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 2, 6, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, 7, 17, 0, 0, 0x0, 0 SlateportCity_BattleTentCorridor_MapEvents:: @ 852F4C8 map_events SlateportCity_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_BattleTentLobby.inc b/data/maps/events/SlateportCity_BattleTentLobby.inc index bb33b654a2..da8a11ebf2 100644 --- a/data/maps/events/SlateportCity_BattleTentLobby.inc +++ b/data/maps/events/SlateportCity_BattleTentLobby.inc @@ -1,9 +1,9 @@ SlateportCity_BattleTentLobby_EventObjects: @ 852F408 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_2088AA, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 1, 5, 3, 2, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A3D, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 3, 7, 3, 7, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A7E, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 0, 1, 8, 3, 1, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A87, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 11, 8, 3, 9, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, 8, 17, 0, 0, SlateportCity_BattleTentLobby_EventScript_2088AA, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 1, 5, 3, 2, 17, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A3D, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 3, 7, 3, 7, 17, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A7E, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 1, 8, 3, 1, 17, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A87, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 8, 3, 9, 17, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0 SlateportCity_BattleTentLobby_MapWarps: @ 852F480 warp_def 6, 9, 0, 3, MAP_SLATEPORT_CITY diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/events/SlateportCity_Harbor.inc index f501f871d9..16782cbe61 100644 --- a/data/maps/events/SlateportCity_Harbor.inc +++ b/data/maps/events/SlateportCity_Harbor.inc @@ -1,12 +1,12 @@ SlateportCity_Harbor_EventObjects: @ 852FA68 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, 905, 0, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 4, 12, 3, 9, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, 905, 0, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 1, 12, 3, 10, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, 905, 0, 0 - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 13, 3, 1, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CCA2, 841, 0, 0 - object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 860, 0, 0 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 7, 10, 3, 10, 0, 0, 0, 0, 0x0, 845, 0, 0 - object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 0, 8, 10, 3, 9, 0, 0, 0, 0, 0x0, 846, 0, 0 - object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 0, 7, 9, 1, 10, 0, 0, 0, 0, 0x0, 848, 0, 0 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, 8, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, 905 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 12, 3, 9, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, 905 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 12, 3, 10, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, 905 + object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 13, 3, 1, 0, 0, 0, SlateportCity_Harbor_EventScript_20CCA2, 841 + object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, 10, 0, 0, 0, 0x0, 860 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 10, 3, 10, 0, 0, 0, 0x0, 845 + object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 8, 10, 3, 9, 0, 0, 0, 0x0, 846 + object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 9, 1, 10, 0, 0, 0, 0x0, 848 SlateportCity_Harbor_MapWarps: @ 852FB28 warp_def 11, 14, 0, 8, MAP_SLATEPORT_CITY diff --git a/data/maps/events/SlateportCity_House1.inc b/data/maps/events/SlateportCity_House1.inc index 40fc70d011..bb5e3c89ff 100644 --- a/data/maps/events/SlateportCity_House1.inc +++ b/data/maps/events/SlateportCity_House1.inc @@ -1,5 +1,5 @@ SlateportCity_House1_EventObjects: @ 852F538 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 5, 3, 8, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0 SlateportCity_House1_MapWarps: @ 852F550 warp_def 3, 7, 0, 6, MAP_SLATEPORT_CITY diff --git a/data/maps/events/SlateportCity_House2.inc b/data/maps/events/SlateportCity_House2.inc index 519bc696fd..55a83d72c1 100644 --- a/data/maps/events/SlateportCity_House2.inc +++ b/data/maps/events/SlateportCity_House2.inc @@ -1,6 +1,6 @@ SlateportCity_House2_EventObjects: @ 852FB9C - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9AF, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9B8, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 4, 3, 10, 0, 0, 0, SlateportCity_House2_EventScript_20D9AF, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 4, 3, 9, 0, 0, 0, SlateportCity_House2_EventScript_20D9B8, 0 SlateportCity_House2_MapWarps: @ 852FBCC warp_def 3, 7, 0, 10, MAP_SLATEPORT_CITY diff --git a/data/maps/events/SlateportCity_Mart.inc b/data/maps/events/SlateportCity_Mart.inc index 88d6132c71..e09928a4cc 100644 --- a/data/maps/events/SlateportCity_Mart.inc +++ b/data/maps/events/SlateportCity_Mart.inc @@ -1,7 +1,7 @@ SlateportCity_Mart_EventObjects: @ 852FCF0 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC49, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 4, 2, 3, 7, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC76, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 5, 3, 1, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, SlateportCity_Mart_EventScript_20DC49, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 2, 3, 7, 0, 0, 0, SlateportCity_Mart_EventScript_20DC76, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, 1, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0 SlateportCity_Mart_MapWarps: @ 852FD38 warp_def 3, 7, 0, 1, MAP_SLATEPORT_CITY diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc index 70e05b38a8..9d18bcd82f 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc @@ -1,18 +1,18 @@ SlateportCity_OceanicMuseum_1F_EventObjects: @ 852F670 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 7, 7, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 18, 5, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, 883, 0, 0 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 12, 2, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, 883, 0, 0 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 2, 8, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE56, 883, 0, 0 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 3, 4, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE4D, 883, 0, 0 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 4, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE71, 883, 0, 0 - object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 0, 12, 7, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 3, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE7A, 883, 0, 0 - object_event 9, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 2, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, 961, 0, 0 - object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 0, 10, 2, 3, 7, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, 961, 0, 0 - object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 0, 17, 7, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, 961, 0, 0 - object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 18, 8, 3, 7, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, 961, 0, 0 - object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 9, 4, 3, 21, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, 965, 0, 0 - object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 0, 7, 4, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, 961, 0, 0 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 7, 7, 3, 10, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 18, 5, 3, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, 883 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 12, 2, 3, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, 883 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 2, 8, 3, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE56, 883 + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 3, 4, 3, 9, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE4D, 883 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 4, 3, 10, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE71, 883 + object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, 9, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 3, 3, 8, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE7A, 883 + object_event 9, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 2, 3, 1, 17, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, 961 + object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 10, 2, 3, 7, 17, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, 961 + object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 17, 7, 3, 10, 17, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, 961 + object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 8, 3, 7, 17, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, 961 + object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 4, 3, 21, 17, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, 965 + object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 4, 3, 1, 17, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, 961 SlateportCity_OceanicMuseum_1F_MapWarps: @ 852F7C0 warp_def 9, 8, 0, 5, MAP_SLATEPORT_CITY diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc index 31ed1d3e49..f404c972b0 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc @@ -1,11 +1,11 @@ SlateportCity_OceanicMuseum_2F_EventObjects: @ 852F8A8 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 13, 6, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, 887, 0, 0 - object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 886, 0, 0 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 884, 0, 0 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 885, 0, 0 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 12, 7, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, 961, 0, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 9, 6, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, 961, 0, 0 - object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 3, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, 961, 0, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 6, 3, 8, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, 887 + object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 6, 1, 3, 8, 0, 0, 0, 0x0, 886 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, 8, 0, 0, 0, 0x0, 884 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, 8, 0, 0, 0, 0x0, 885 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 12, 7, 3, 10, 17, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, 961 + object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 6, 3, 1, 17, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, 961 + object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 3, 3, 10, 17, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, 961 SlateportCity_OceanicMuseum_2F_MapWarps: @ 852F950 warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F diff --git a/data/maps/events/SlateportCity_PokemonCenter_1F.inc b/data/maps/events/SlateportCity_PokemonCenter_1F.inc index f59fde2b39..d0c3b1d3cc 100644 --- a/data/maps/events/SlateportCity_PokemonCenter_1F.inc +++ b/data/maps/events/SlateportCity_PokemonCenter_1F.inc @@ -1,7 +1,7 @@ SlateportCity_PokemonCenter_1F_EventObjects: @ 852FBF0 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAD3, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAE1, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAD3, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, 8, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAE1, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 7, 3, 10, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0 SlateportCity_PokemonCenter_1F_MapWarps: @ 852FC38 warp_def 7, 8, 3, 0, MAP_SLATEPORT_CITY diff --git a/data/maps/events/SlateportCity_PokemonCenter_2F.inc b/data/maps/events/SlateportCity_PokemonCenter_2F.inc index 02b6e8f647..3861219ec8 100644 --- a/data/maps/events/SlateportCity_PokemonCenter_2F.inc +++ b/data/maps/events/SlateportCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ SlateportCity_PokemonCenter_2F_EventObjects: @ 852FC64 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, 702 SlateportCity_PokemonCenter_2F_MapWarps: @ 852FCC4 warp_def 1, 6, 4, 2, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/SlateportCity_PokemonFanClub.inc b/data/maps/events/SlateportCity_PokemonFanClub.inc index 4f4a7eac75..68d8f30824 100644 --- a/data/maps/events/SlateportCity_PokemonFanClub.inc +++ b/data/maps/events/SlateportCity_PokemonFanClub.inc @@ -1,13 +1,13 @@ SlateportCity_PokemonFanClub_EventObjects: @ 852F574 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 11, 4, 0, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1E8, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 1, 5, 0, 3, 16, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1F1, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 11, 5, 0, 7, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_28C943, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 6, 2, 3, 1, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A17E, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 6, 5, 4, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_209E96, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 3, 9, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A20D, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_SKITTY, 0, 0, 8, 3, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1FA, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 10, 8, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A220, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_MAN_5, 0, 0, 11, 8, 0, 9, 16, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 11, 4, 0, 8, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1E8, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 1, 5, 0, 3, 16, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1F1, 0 + object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 5, 0, 7, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_28C943, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 2, 3, 1, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A17E, 0 + object_event 5, EVENT_OBJ_GFX_GENTLEMAN, 0, 6, 5, 4, 8, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_209E96, 0 + object_event 6, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 3, 9, 3, 1, 17, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A20D, 0 + object_event 7, EVENT_OBJ_GFX_SKITTY, 0, 8, 3, 3, 1, 17, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1FA, 0 + object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 10, 8, 3, 1, 17, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A220, 0 + object_event 9, EVENT_OBJ_GFX_MAN_5, 0, 11, 8, 0, 9, 16, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0 SlateportCity_PokemonFanClub_MapWarps: @ 852F64C warp_def 6, 10, 0, 4, MAP_SLATEPORT_CITY diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.inc b/data/maps/events/SlateportCity_SternsShipyard_1F.inc index 76ead03e78..b4c6e9973a 100644 --- a/data/maps/events/SlateportCity_SternsShipyard_1F.inc +++ b/data/maps/events/SlateportCity_SternsShipyard_1F.inc @@ -1,8 +1,8 @@ SlateportCity_SternsShipyard_1F_EventObjects: @ 852F318 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 5, 5, 3, 8, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207F40, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FED, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 18, 8, 3, 5, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FF6, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 11, 3, 2, 33, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, 869, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 5, 5, 3, 8, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207F40, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, 7, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FED, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 8, 3, 5, 1, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FF6, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 11, 3, 2, 33, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, 869 SlateportCity_SternsShipyard_1F_MapWarps: @ 852F378 warp_def 2, 14, 0, 2, MAP_SLATEPORT_CITY diff --git a/data/maps/events/SlateportCity_SternsShipyard_2F.inc b/data/maps/events/SlateportCity_SternsShipyard_2F.inc index 487e387438..de45f19224 100644 --- a/data/maps/events/SlateportCity_SternsShipyard_2F.inc +++ b/data/maps/events/SlateportCity_SternsShipyard_2F.inc @@ -1,7 +1,7 @@ SlateportCity_SternsShipyard_2F_EventObjects: @ 852F3A4 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 4, 3, 10, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_20863E, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 9, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_208647, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, 7, 0, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 4, 3, 10, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_20863E, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 3, 7, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_208647, 0 SlateportCity_SternsShipyard_2F_MapWarps: @ 852F3EC warp_def 3, 1, 0, 2, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/events/SootopolisCity.inc index 12340b727b..6835fc7266 100644 --- a/data/maps/events/SootopolisCity.inc +++ b/data/maps/events/SootopolisCity.inc @@ -1,22 +1,22 @@ SootopolisCity_EventObjects: @ 8527314 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 31, 18, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 47, 33, 0, 9, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, 854, 0, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 0, 9, 43, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E5ED8, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 51, 14, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E608E, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 0, 43, 26, 3, 1, 0, 0, 0, 0, SootopolisCity_EventScript_1E60E3, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 0, 26, 4, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E6017, 839, 0, 0 - object_event 7, EVENT_OBJ_GFX_STEVEN, 0, 0, 20, 36, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E6166, 973, 0, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 49, 34, 3, 3, 17, 0, 0, 0, SootopolisCity_EventScript_1E6038, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_GROUDON_3, 0, 0, 28, 44, 0, 80, 17, 0, 0, 0, 0x0, 998, 0, 0 - object_event 10, EVENT_OBJ_GFX_KYOGRE_3, 0, 0, 34, 44, 1, 79, 17, 0, 0, 0, 0x0, 997, 0, 0 - object_event 11, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 0, 31, 41, 1, 10, 17, 0, 0, 0, 0x0, 996, 0, 0 - object_event 12, EVENT_OBJ_GFX_MANIAC, 0, 0, 17, 44, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E6411, 854, 0, 0 - object_event 13, EVENT_OBJ_GFX_GIRL_3, 0, 0, 14, 42, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E63DB, 854, 0, 0 - object_event 14, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 17, 40, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E6393, 854, 0, 0 - object_event 15, EVENT_OBJ_GFX_BOY_2, 0, 0, 19, 37, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E635D, 854, 0, 0 - object_event 16, EVENT_OBJ_GFX_MAXIE, 0, 0, 29, 33, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E64F2, 827, 0, 0 - object_event 17, EVENT_OBJ_GFX_ARCHIE, 0, 0, 31, 33, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E651F, 826, 0, 0 - object_event 18, EVENT_OBJ_GFX_WALLACE, 0, 0, 31, 18, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E6446, 816, 0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 31, 18, 3, 8, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 47, 33, 0, 9, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, 854 + object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 9, 43, 3, 5, 1, 0, 0, SootopolisCity_EventScript_1E5ED8, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 51, 14, 3, 8, 0, 0, 0, SootopolisCity_EventScript_1E608E, 0 + object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 43, 26, 3, 1, 0, 0, 0, SootopolisCity_EventScript_1E60E3, 0 + object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 26, 4, 3, 5, 1, 0, 0, SootopolisCity_EventScript_1E6017, 839 + object_event 7, EVENT_OBJ_GFX_STEVEN, 0, 20, 36, 3, 8, 17, 0, 0, SootopolisCity_EventScript_1E6166, 973 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 49, 34, 3, 3, 17, 0, 0, SootopolisCity_EventScript_1E6038, 0 + object_event 9, EVENT_OBJ_GFX_GROUDON_3, 0, 28, 44, 0, 80, 17, 0, 0, 0x0, 998 + object_event 10, EVENT_OBJ_GFX_KYOGRE_3, 0, 34, 44, 1, 79, 17, 0, 0, 0x0, 997 + object_event 11, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 31, 41, 1, 10, 17, 0, 0, 0x0, 996 + object_event 12, EVENT_OBJ_GFX_MANIAC, 0, 17, 44, 3, 10, 17, 0, 0, SootopolisCity_EventScript_1E6411, 854 + object_event 13, EVENT_OBJ_GFX_GIRL_3, 0, 14, 42, 3, 10, 17, 0, 0, SootopolisCity_EventScript_1E63DB, 854 + object_event 14, EVENT_OBJ_GFX_BLACK_BELT, 0, 17, 40, 3, 10, 17, 0, 0, SootopolisCity_EventScript_1E6393, 854 + object_event 15, EVENT_OBJ_GFX_BOY_2, 0, 19, 37, 3, 8, 17, 0, 0, SootopolisCity_EventScript_1E635D, 854 + object_event 16, EVENT_OBJ_GFX_MAXIE, 0, 29, 33, 3, 8, 17, 0, 0, SootopolisCity_EventScript_1E64F2, 827 + object_event 17, EVENT_OBJ_GFX_ARCHIE, 0, 31, 33, 3, 8, 17, 0, 0, SootopolisCity_EventScript_1E651F, 826 + object_event 18, EVENT_OBJ_GFX_WALLACE, 0, 31, 18, 3, 8, 17, 0, 0, SootopolisCity_EventScript_1E6446, 816 SootopolisCity_MapWarps: @ 85274C4 warp_def 43, 31, 0, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/SootopolisCity_Gym_1F.inc b/data/maps/events/SootopolisCity_Gym_1F.inc index b7ed20bae1..b0f2f6aa92 100644 --- a/data/maps/events/SootopolisCity_Gym_1F.inc +++ b/data/maps/events/SootopolisCity_Gym_1F.inc @@ -1,6 +1,6 @@ SootopolisCity_Gym_1F_EventObjects: @ 8532FF4 - object_event 1, EVENT_OBJ_GFX_JUAN, 0, 0, 8, 2, 0, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_224F44, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 0, 7, 24, 3, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_225040, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_JUAN, 0, 8, 2, 0, 8, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_224F44, 0 + object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 7, 24, 3, 8, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_225040, 0 SootopolisCity_Gym_1F_MapWarps: @ 8533024 warp_def 8, 25, 0, 2, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/events/SootopolisCity_Gym_B1F.inc b/data/maps/events/SootopolisCity_Gym_B1F.inc index 83f87c6f65..a493060dee 100644 --- a/data/maps/events/SootopolisCity_Gym_B1F.inc +++ b/data/maps/events/SootopolisCity_Gym_B1F.inc @@ -1,14 +1,14 @@ SootopolisCity_Gym_B1F_EventObjects: @ 8533068 - object_event 1, EVENT_OBJ_GFX_LASS, 0, 0, 7, 17, 3, 10, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225C8B, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 0, 9, 19, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CD0, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 12, 7, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CB9, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 0, 11, 9, 0, 7, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_225CE7, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 0, 5, 6, 3, 8, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_225D15, 0, 0, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 7, 8, 3, 10, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225D2C, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 0, 4, 8, 3, 10, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225CA2, 0, 0, 0 - object_event 8, EVENT_OBJ_GFX_BEAUTY, 0, 0, 9, 7, 3, 8, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225CFE, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 6, 13, 3, 10, 17, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D5A, 0, 0, 0 - object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 10, 13, 3, 9, 17, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 17, 3, 10, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225C8B, 0 + object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 9, 19, 3, 9, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CD0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 7, 3, 9, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CB9, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 11, 9, 0, 7, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_225CE7, 0 + object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 5, 6, 3, 8, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_225D15, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 8, 3, 10, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225D2C, 0 + object_event 7, EVENT_OBJ_GFX_LASS, 0, 4, 8, 3, 10, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225CA2, 0 + object_event 8, EVENT_OBJ_GFX_BEAUTY, 0, 9, 7, 3, 8, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225CFE, 0 + object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 13, 3, 10, 17, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D5A, 0 + object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 13, 3, 9, 17, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0 SootopolisCity_Gym_B1F_MapWarps: @ 8533158 warp_def 11, 22, 3, 2, MAP_SOOTOPOLIS_CITY_GYM_1F diff --git a/data/maps/events/SootopolisCity_House1.inc b/data/maps/events/SootopolisCity_House1.inc index 349891e239..af321c802b 100644 --- a/data/maps/events/SootopolisCity_House1.inc +++ b/data/maps/events/SootopolisCity_House1.inc @@ -1,6 +1,6 @@ SootopolisCity_House1_EventObjects: @ 85332F8 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22694D, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22698E, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 4, 3, 10, 0, 0, 0, SootopolisCity_House1_EventScript_22694D, 0 + object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 2, 3, 3, 8, 0, 0, 0, SootopolisCity_House1_EventScript_22698E, 0 SootopolisCity_House1_MapWarps: @ 8533328 warp_def 3, 6, 0, 4, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/events/SootopolisCity_House2.inc b/data/maps/events/SootopolisCity_House2.inc index e22dbabb01..f0e2b4455a 100644 --- a/data/maps/events/SootopolisCity_House2.inc +++ b/data/maps/events/SootopolisCity_House2.inc @@ -1,5 +1,5 @@ SootopolisCity_House2_EventObjects: @ 853334C - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 3, 3, 3, 10, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0 SootopolisCity_House2_MapWarps: @ 8533364 warp_def 3, 6, 0, 5, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/events/SootopolisCity_House3.inc b/data/maps/events/SootopolisCity_House3.inc index 1cddb15699..bd85df9875 100644 --- a/data/maps/events/SootopolisCity_House3.inc +++ b/data/maps/events/SootopolisCity_House3.inc @@ -1,6 +1,6 @@ SootopolisCity_House3_EventObjects: @ 8533388 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 2, 4, 3, 8, 0, 0, 0, 0, SootopolisCity_House3_EventScript_226B72, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_House3_EventScript_226B9B, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 4, 3, 8, 0, 0, 0, SootopolisCity_House3_EventScript_226B72, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 6, 4, 3, 2, 17, 0, 0, SootopolisCity_House3_EventScript_226B9B, 0 SootopolisCity_House3_MapWarps: @ 85333B8 warp_def 3, 6, 0, 6, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/events/SootopolisCity_House4.inc b/data/maps/events/SootopolisCity_House4.inc index 7b54379ceb..0e94e891fc 100644 --- a/data/maps/events/SootopolisCity_House4.inc +++ b/data/maps/events/SootopolisCity_House4.inc @@ -1,7 +1,7 @@ SootopolisCity_House4_EventObjects: @ 85333DC - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House4_EventScript_226D16, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 5, 2, 3, 7, 33, 0, 0, 0, SootopolisCity_House4_EventScript_226D1F, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, SootopolisCity_House4_EventScript_226D28, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, 10, 0, 0, 0, SootopolisCity_House4_EventScript_226D16, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 2, 3, 7, 33, 0, 0, SootopolisCity_House4_EventScript_226D1F, 0 + object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 3, 3, 1, 17, 0, 0, SootopolisCity_House4_EventScript_226D28, 0 SootopolisCity_House4_MapWarps: @ 8533424 warp_def 3, 6, 0, 7, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/events/SootopolisCity_House5.inc b/data/maps/events/SootopolisCity_House5.inc index 7e313bb780..a574df2e99 100644 --- a/data/maps/events/SootopolisCity_House5.inc +++ b/data/maps/events/SootopolisCity_House5.inc @@ -1,6 +1,6 @@ SootopolisCity_House5_EventObjects: @ 8533448 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E94, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E9D, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 3, 3, 10, 0, 0, 0, SootopolisCity_House5_EventScript_226E94, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 6, 3, 3, 9, 0, 0, 0, SootopolisCity_House5_EventScript_226E9D, 0 SootopolisCity_House5_MapWarps: @ 8533478 warp_def 3, 6, 0, 8, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/events/SootopolisCity_House6.inc b/data/maps/events/SootopolisCity_House6.inc index 0a5f019368..4e1b102d86 100644 --- a/data/maps/events/SootopolisCity_House6.inc +++ b/data/maps/events/SootopolisCity_House6.inc @@ -1,5 +1,5 @@ SootopolisCity_House6_EventObjects: @ 853349C - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 4, 3, 3, 2, 17, 0, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 3, 3, 2, 17, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0 SootopolisCity_House6_MapWarps: @ 85334B4 warp_def 3, 6, 0, 9, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/events/SootopolisCity_House7.inc b/data/maps/events/SootopolisCity_House7.inc index ddb32e0926..da06db206e 100644 --- a/data/maps/events/SootopolisCity_House7.inc +++ b/data/maps/events/SootopolisCity_House7.inc @@ -1,6 +1,6 @@ SootopolisCity_House7_EventObjects: @ 85334D8 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House7_EventScript_2270CC, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 1, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 3, 3, 9, 0, 0, 0, SootopolisCity_House7_EventScript_2270CC, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 4, 3, 2, 17, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0 SootopolisCity_House7_MapWarps: @ 8533508 warp_def 3, 6, 0, 10, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc b/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc index fe16e66291..9f17b52dac 100644 --- a/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc +++ b/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc @@ -1,6 +1,6 @@ SootopolisCity_LotadAndSeedotHouse_EventObjects: @ 853352C - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 5, 4, 3, 9, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22722B, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 2, 4, 3, 10, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 5, 4, 3, 9, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22722B, 0 SootopolisCity_LotadAndSeedotHouse_MapWarps: @ 853355C warp_def 3, 6, 0, 11, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/events/SootopolisCity_Mart.inc b/data/maps/events/SootopolisCity_Mart.inc index 263e12a879..3a38d7a58e 100644 --- a/data/maps/events/SootopolisCity_Mart.inc +++ b/data/maps/events/SootopolisCity_Mart.inc @@ -1,7 +1,7 @@ SootopolisCity_Mart_EventObjects: @ 853328C - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_226795, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267C2, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 9, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267EC, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, SootopolisCity_Mart_EventScript_226795, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 5, 3, 10, 0, 0, 0, SootopolisCity_Mart_EventScript_2267C2, 0 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 5, 3, 10, 0, 0, 0, SootopolisCity_Mart_EventScript_2267EC, 0 SootopolisCity_Mart_MapWarps: @ 85332D4 warp_def 3, 7, 0, 1, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc b/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc index 3c3742ba0e..9bd3c91d5d 100644 --- a/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc +++ b/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc @@ -1,5 +1,5 @@ SootopolisCity_MysteryEventsHouse_1F_EventObjects: @ 8533598 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 6, 4, 0, 10, 0, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 6, 4, 0, 10, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0 SootopolisCity_MysteryEventsHouse_1F_MapWarps: @ 85335B0 warp_def 3, 7, 0, 12, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc index 605343baaf..22bcf07eab 100644 --- a/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc +++ b/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc @@ -1,5 +1,5 @@ SootopolisCity_MysteryEventsHouse_B1F_EventObjects: @ 85335DC - object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 5, 0, 9, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 6, 5, 0, 9, 17, 0, 0, 0x0, 0 SootopolisCity_MysteryEventsHouse_B1F_MapWarps: @ 85335F4 warp_def 3, 1, 0, 2, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc index 3ef5954c5e..92f09cdd9c 100644 --- a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc +++ b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ SootopolisCity_PokemonCenter_1F_EventObjects: @ 8533174 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226500, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 12, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_22650E, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 7, 3, 5, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226538, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 2, 3, 3, 2, 17, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_2C8256, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226500, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 4, 3, 2, 17, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_22650E, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 7, 3, 5, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226538, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 2, 3, 3, 2, 17, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_2C8256, 0 SootopolisCity_PokemonCenter_1F_MapWarps: @ 85331D4 warp_def 7, 8, 3, 0, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc index af62b1aed0..a7937f8200 100644 --- a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc +++ b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ SootopolisCity_PokemonCenter_2F_EventObjects: @ 8533200 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, 702 SootopolisCity_PokemonCenter_2F_MapWarps: @ 8533260 warp_def 1, 6, 4, 2, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/SouthernIsland_Exterior.inc b/data/maps/events/SouthernIsland_Exterior.inc index 4285b6a0f5..8f1a22b224 100644 --- a/data/maps/events/SouthernIsland_Exterior.inc +++ b/data/maps/events/SouthernIsland_Exterior.inc @@ -1,6 +1,6 @@ SouthernIsland_Exterior_EventObjects: @ 853B83C - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 13, 23, 3, 7, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_2429D2, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 13, 25, 1, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 23, 3, 7, 0, 0, 0, SouthernIsland_Exterior_EventScript_2429D2, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 25, 1, 10, 0, 0, 0, 0x0, 0 SouthernIsland_Exterior_MapWarps: @ 853B86C warp_def 14, 5, 3, 0, MAP_SOUTHERN_ISLAND_INTERIOR diff --git a/data/maps/events/SouthernIsland_Interior.inc b/data/maps/events/SouthernIsland_Interior.inc index 86b4af8165..0a53cc249a 100644 --- a/data/maps/events/SouthernIsland_Interior.inc +++ b/data/maps/events/SouthernIsland_Interior.inc @@ -1,6 +1,6 @@ SouthernIsland_Interior_EventObjects: @ 853B89C - object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 13, 12, 3, 7, 0, 0, 0, 0, 0x0, 910, 0, 0 - object_event 2, EVENT_OBJ_GFX_TRADER, 0, 0, 13, 2, 0, 8, 0, 0, 0, 0, 0x0, 911, 0, 0 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 13, 12, 3, 7, 0, 0, 0, 0x0, 910 + object_event 2, EVENT_OBJ_GFX_TRADER, 0, 13, 2, 0, 8, 0, 0, 0, 0x0, 911 SouthernIsland_Interior_MapWarps: @ 853B8CC warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR diff --git a/data/maps/events/TerraCave_End.inc b/data/maps/events/TerraCave_End.inc index 97edc03e48..e46dad94bf 100644 --- a/data/maps/events/TerraCave_End.inc +++ b/data/maps/events/TerraCave_End.inc @@ -1,5 +1,5 @@ TerraCave_End_EventObjects: @ 8537850 - object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 0, 17, 22, 1, 8, 17, 0, 0, 0, 0x0, 783, 0, 0 + object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 17, 22, 1, 8, 17, 0, 0, 0x0, 783 TerraCave_End_MapWarps: @ 8537868 warp_def 5, 4, 3, 1, MAP_TERRA_CAVE_ENTRANCE diff --git a/data/maps/events/TradeCenter.inc b/data/maps/events/TradeCenter.inc index 9595b920c2..c767f78dff 100644 --- a/data/maps/events/TradeCenter.inc +++ b/data/maps/events/TradeCenter.inc @@ -1,5 +1,5 @@ TradeCenter_EventObjects: @ 8539DA0 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 6, 3, 9, 0, 0, 0, TradeCenter_EventScript_2774B6, 0 TradeCenter_MapWarps: @ 8539DB8 warp_def 5, 8, 3, 127, MAP_NONE diff --git a/data/maps/events/TrainerHill_Elevator.inc b/data/maps/events/TrainerHill_Elevator.inc index fe9af52431..ac7a4d9f5b 100644 --- a/data/maps/events/TrainerHill_Elevator.inc +++ b/data/maps/events/TrainerHill_Elevator.inc @@ -1,5 +1,5 @@ TrainerHill_Elevator_EventObjects: @ 853DD84 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 0, 6, 3, 8, 17, 0, 0, 0, TrainerHill_Elevator_EventScript_26935F, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 3, 8, 17, 0, 0, TrainerHill_Elevator_EventScript_26935F, 0 TrainerHill_Elevator_MapWarps: @ 853DD9C warp_def 1, 6, 3, 1, MAP_TRAINER_HILL_ROOF diff --git a/data/maps/events/TrainerHill_Entrance.inc b/data/maps/events/TrainerHill_Entrance.inc index 3c8c4a82f9..04fac8066e 100644 --- a/data/maps/events/TrainerHill_Entrance.inc +++ b/data/maps/events/TrainerHill_Entrance.inc @@ -1,9 +1,9 @@ TrainerHill_Entrance_EventObjects: @ 853D874 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 6, 3, 9, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2681FD, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_NURSE, 0, 0, 4, 9, 3, 8, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2681EF, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 14, 9, 3, 8, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2683C7, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 14, 3, 2, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2683AC, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 14, 15, 3, 2, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_268391, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 6, 3, 9, 17, 0, 0, TrainerHill_Entrance_EventScript_2681FD, 0 + object_event 2, EVENT_OBJ_GFX_NURSE, 0, 4, 9, 3, 8, 17, 0, 0, TrainerHill_Entrance_EventScript_2681EF, 0 + object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 14, 9, 3, 8, 17, 0, 0, TrainerHill_Entrance_EventScript_2683C7, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 5, 14, 3, 2, 17, 0, 0, TrainerHill_Entrance_EventScript_2683AC, 0 + object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 14, 15, 3, 2, 17, 0, 0, TrainerHill_Entrance_EventScript_268391, 0 TrainerHill_Entrance_MapWarps: @ 853D8EC warp_def 9, 16, 3, 4, MAP_ROUTE111 diff --git a/data/maps/events/TrainerHill_Roof.inc b/data/maps/events/TrainerHill_Roof.inc index 826b774dde..3ce2b9684b 100644 --- a/data/maps/events/TrainerHill_Roof.inc +++ b/data/maps/events/TrainerHill_Roof.inc @@ -1,5 +1,5 @@ TrainerHill_Roof_EventObjects: @ 853D9C4 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 12, 7, 3, 8, 17, 0, 0, 0, TrainerHill_Roof_EventScript_268FB2, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 7, 3, 8, 17, 0, 0, TrainerHill_Roof_EventScript_268FB2, 0 TrainerHill_Roof_MapWarps: @ 853D9DC warp_def 9, 5, 3, 1, MAP_TRAINER_HILL_4F diff --git a/data/maps/events/Underwater_SeafloorCavern.inc b/data/maps/events/Underwater_SeafloorCavern.inc index 718fe9ebba..4d9d8ba142 100644 --- a/data/maps/events/Underwater_SeafloorCavern.inc +++ b/data/maps/events/Underwater_SeafloorCavern.inc @@ -1,8 +1,8 @@ Underwater_SeafloorCavern_EventObjects: @ 8535640 - object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0 - object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0 - object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0 - object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 8, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0 + object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 4, 3, 76, 17, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 + object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 4, 3, 76, 17, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 + object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 4, 3, 76, 17, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 + object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 4, 3, 76, 17, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 Underwater_SeafloorCavern_MapWarps: @ 85356A0 warp_def 6, 7, 0, 0, MAP_UNDERWATER4 diff --git a/data/maps/events/UnionRoom.inc b/data/maps/events/UnionRoom.inc index cfa69c7f42..5aa373053b 100644 --- a/data/maps/events/UnionRoom.inc +++ b/data/maps/events/UnionRoom.inc @@ -1,13 +1,13 @@ UnionRoom_EventObjects: @ 853B020 - object_event 1, EVENT_OBJ_GFX_UNION_ROOM_NURSE, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GIDDY, 0, 0, 1, 8, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D204, 706, 0, 0 - object_event 3, 247, 0, 0, 7, 8, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D22C, 710, 0, 0 - object_event 4, 246, 0, 0, 1, 4, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D222, 709, 0, 0 - object_event 5, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D218, 708, 0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 13, 4, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D20E, 707, 0, 0 - object_event 7, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 10, 6, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1FA, 705, 0, 0 - object_event 8, EVENT_OBJ_GFX_TRADER, 0, 0, 13, 8, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1F0, 704, 0, 0 - object_event 9, EVENT_OBJ_GFX_HIPSTER, 0, 0, 4, 6, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1E6, 703, 0, 0 + object_event 1, EVENT_OBJ_GFX_UNION_ROOM_NURSE, 0, 3, 2, 3, 8, 0, 0, 0, UnionRoom_EventScript_23D236, 0 + object_event 2, EVENT_OBJ_GFX_GIDDY, 0, 1, 8, 3, 2, 17, 0, 0, UnionRoom_EventScript_23D204, 706 + object_event 3, 247, 0, 7, 8, 3, 2, 17, 0, 0, UnionRoom_EventScript_23D22C, 710 + object_event 4, 246, 0, 1, 4, 3, 2, 17, 0, 0, UnionRoom_EventScript_23D222, 709 + object_event 5, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 7, 4, 3, 2, 17, 0, 0, UnionRoom_EventScript_23D218, 708 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 13, 4, 3, 2, 17, 0, 0, UnionRoom_EventScript_23D20E, 707 + object_event 7, EVENT_OBJ_GFX_STORYTELLER, 0, 10, 6, 3, 2, 17, 0, 0, UnionRoom_EventScript_23D1FA, 705 + object_event 8, EVENT_OBJ_GFX_TRADER, 0, 13, 8, 3, 2, 17, 0, 0, UnionRoom_EventScript_23D1F0, 704 + object_event 9, EVENT_OBJ_GFX_HIPSTER, 0, 4, 6, 3, 2, 17, 0, 0, UnionRoom_EventScript_23D1E6, 703 UnionRoom_MapWarps: @ 853B0F8 warp_def 7, 11, 3, 127, MAP_NONE diff --git a/data/maps/events/VerdanturfTown.inc b/data/maps/events/VerdanturfTown.inc index 3144323a35..385d92e88e 100644 --- a/data/maps/events/VerdanturfTown.inc +++ b/data/maps/events/VerdanturfTown.inc @@ -1,8 +1,8 @@ VerdanturfTown_EventObjects: @ 8527CDC - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 17, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5A8, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 9, 2, 3, 9, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB575, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 7, 11, 3, 3, 16, 0, 0, 0, VerdanturfTown_EventScript_1EB5BA, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 0, 7, 6, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5B1, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 17, 3, 5, 1, 0, 0, VerdanturfTown_EventScript_1EB5A8, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 2, 3, 9, 1, 0, 0, VerdanturfTown_EventScript_1EB575, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 11, 3, 3, 16, 0, 0, VerdanturfTown_EventScript_1EB5BA, 0 + object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 7, 6, 3, 5, 1, 0, 0, VerdanturfTown_EventScript_1EB5B1, 0 VerdanturfTown_MapWarps: @ 8527D3C warp_def 3, 7, 0, 0, MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY diff --git a/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc b/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc index 20597089ae..240d64cdd2 100644 --- a/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc +++ b/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc @@ -1,7 +1,7 @@ VerdanturfTown_BattleTentBattleRoom_EventObjects: @ 852E734 - object_event 1, EVENT_OBJ_GFX_TRADER, 0, 0, 2, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 11, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 2, 4, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_TRADER, 0, 2, 8, 3, 7, 17, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 11, 1, 3, 8, 17, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 4, 0, 10, 17, 0, 0, 0x0, 0 VerdanturfTown_BattleTentBattleRoom_MapEvents:: @ 852E77C map_events VerdanturfTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_BattleTentCorridor.inc b/data/maps/events/VerdanturfTown_BattleTentCorridor.inc index 539cf8b110..1b85d4a3f8 100644 --- a/data/maps/events/VerdanturfTown_BattleTentCorridor.inc +++ b/data/maps/events/VerdanturfTown_BattleTentCorridor.inc @@ -1,5 +1,5 @@ VerdanturfTown_BattleTentCorridor_EventObjects: @ 852E708 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 2, 6, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 6, 3, 7, 17, 0, 0, 0x0, 0 VerdanturfTown_BattleTentCorridor_MapEvents:: @ 852E720 map_events VerdanturfTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_BattleTentLobby.inc b/data/maps/events/VerdanturfTown_BattleTentLobby.inc index f32feeb2db..fa54d8b653 100644 --- a/data/maps/events/VerdanturfTown_BattleTentLobby.inc +++ b/data/maps/events/VerdanturfTown_BattleTentLobby.inc @@ -1,10 +1,10 @@ VerdanturfTown_BattleTentLobby_EventObjects: @ 852E648 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201873, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 0, 9, 7, 3, 2, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 1, 8, 3, 10, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AC5, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 12, 6, 3, 9, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, 766, 0, 0 - object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 2, 8, 3, 9, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 5, 3, 8, 17, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201873, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 5, 3, 2, 17, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0 + object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 9, 7, 3, 2, 17, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 1, 8, 3, 10, 17, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AC5, 0 + object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 12, 6, 3, 9, 17, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, 766 + object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 2, 8, 3, 9, 17, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0 VerdanturfTown_BattleTentLobby_MapWarps: @ 852E6D8 warp_def 6, 9, 0, 0, MAP_VERDANTURF_TOWN diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc index 9dd15bca96..001d6ac1a7 100644 --- a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc +++ b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc @@ -1,6 +1,6 @@ VerdanturfTown_FriendshipRatersHouse_EventObjects: @ 852E9C8 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203031, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 8, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203031, 0 + object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, 8, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA, 0 VerdanturfTown_FriendshipRatersHouse_MapWarps: @ 852E9F8 warp_def 3, 7, 0, 5, MAP_VERDANTURF_TOWN diff --git a/data/maps/events/VerdanturfTown_House.inc b/data/maps/events/VerdanturfTown_House.inc index d90d304e16..feaf1afa1a 100644 --- a/data/maps/events/VerdanturfTown_House.inc +++ b/data/maps/events/VerdanturfTown_House.inc @@ -1,6 +1,6 @@ VerdanturfTown_House_EventObjects: @ 852EA1C - object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 5, 3, 7, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 4, 3, 8, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0 VerdanturfTown_House_MapWarps: @ 852EA4C warp_def 3, 8, 0, 6, MAP_VERDANTURF_TOWN diff --git a/data/maps/events/VerdanturfTown_Mart.inc b/data/maps/events/VerdanturfTown_Mart.inc index c4ffa13695..2d2440d554 100644 --- a/data/maps/events/VerdanturfTown_Mart.inc +++ b/data/maps/events/VerdanturfTown_Mart.inc @@ -1,8 +1,8 @@ VerdanturfTown_Mart_EventObjects: @ 852E790 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_202587, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025BA, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025C3, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 0, 3, 2, 3, 9, 17, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025CC, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, VerdanturfTown_Mart_EventScript_202587, 0 + object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 3, 10, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025BA, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 5, 3, 9, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025C3, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 3, 2, 3, 9, 17, 0, 0, VerdanturfTown_Mart_EventScript_2025CC, 0 VerdanturfTown_Mart_MapWarps: @ 852E7F0 warp_def 3, 7, 0, 1, MAP_VERDANTURF_TOWN diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc index a020bf4185..8727bc43f4 100644 --- a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc +++ b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ VerdanturfTown_PokemonCenter_1F_EventObjects: @ 852E814 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_20273A, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 5, 3, 5, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202748, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 2, 3, 7, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202751, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 10, 6, 3, 9, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_20273A, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 5, 3, 5, 1, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202748, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 2, 3, 7, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202751, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 10, 6, 3, 9, 1, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0 VerdanturfTown_PokemonCenter_1F_MapWarps: @ 852E874 warp_def 7, 8, 3, 2, MAP_VERDANTURF_TOWN diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc index 76df12cd23..92fc90e6d0 100644 --- a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc +++ b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ VerdanturfTown_PokemonCenter_2F_EventObjects: @ 852E8A0 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, 702 VerdanturfTown_PokemonCenter_2F_MapWarps: @ 852E900 warp_def 1, 6, 4, 2, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/events/VerdanturfTown_WandasHouse.inc index a9e0c86b76..e537d66f85 100644 --- a/data/maps/events/VerdanturfTown_WandasHouse.inc +++ b/data/maps/events/VerdanturfTown_WandasHouse.inc @@ -1,9 +1,9 @@ VerdanturfTown_WandasHouse_EventObjects: @ 852E92C - object_event 1, EVENT_OBJ_GFX_WALLY, 0, 0, 14, 5, 3, 2, 17, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, 806, 0, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 5, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, 808, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, 809, 0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, 984, 0, 0 + object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 5, 3, 2, 17, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, 806 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, 8, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, 808 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, 8, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, 809 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 4, 3, 10, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, 9, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, 984 VerdanturfTown_WandasHouse_MapWarps: @ 852E9A4 warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/events/VictoryRoad_1F.inc index 43c3b5c54b..e9958393a8 100644 --- a/data/maps/events/VictoryRoad_1F.inc +++ b/data/maps/events/VictoryRoad_1F.inc @@ -1,13 +1,13 @@ VictoryRoad_1F_EventObjects: @ 8535E04 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 33, 22, 3, 8, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 6, 15, 4, 9, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 27, 34, 3, 18, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_WALLY, 0, 0, 12, 25, 4, 8, 17, 0, 0, 0, VictoryRoad_1F_EventScript_235E2C, 858, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 40, 26, 3, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_291483, 1084, 0, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 39, 4, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_291490, 1085, 0, 0 - object_event 7, EVENT_OBJ_GFX_WALLY, 0, 0, 31, 9, 3, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_235E35, 751, 0, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 29, 17, 3, 10, 17, 0, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0, 0, 0 - object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 0, 32, 17, 3, 9, 17, 0, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 33, 22, 3, 8, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 6, 15, 4, 9, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 27, 34, 3, 18, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0 + object_event 4, EVENT_OBJ_GFX_WALLY, 0, 12, 25, 4, 8, 17, 0, 0, VictoryRoad_1F_EventScript_235E2C, 858 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 40, 26, 3, 1, 17, 0, 0, VictoryRoad_1F_EventScript_291483, 1084 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 39, 4, 1, 17, 0, 0, VictoryRoad_1F_EventScript_291490, 1085 + object_event 7, EVENT_OBJ_GFX_WALLY, 0, 31, 9, 3, 1, 17, 0, 0, VictoryRoad_1F_EventScript_235E35, 751 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 29, 17, 3, 10, 17, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0 + object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 32, 17, 3, 9, 17, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0 VictoryRoad_1F_MapWarps: @ 8535EDC warp_def 15, 40, 3, 2, MAP_EVER_GRANDE_CITY diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/events/VictoryRoad_B1F.inc index eda774701c..b480855d98 100644 --- a/data/maps/events/VictoryRoad_B1F.inc +++ b/data/maps/events/VictoryRoad_B1F.inc @@ -1,25 +1,25 @@ VictoryRoad_B1F_EventObjects: @ 8535F44 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 20, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 19, 0, 0 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 21, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 20, 0, 0 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 17, 0, 0 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 9, 10, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 18, 0, 0 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 20, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 23, 0, 0 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 21, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 22, 0, 0 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 35, 6, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 30, 0, 0 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 19, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 25, 0, 0 - object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 26, 0, 0 - object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 18, 12, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 27, 0, 0 - object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 28, 0, 0 - object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 21, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 29, 0, 0 - object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 34, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 31, 0, 0 - object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 0, 37, 12, 3, 9, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_2364E5, 0, 0, 0 - object_event 15, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 26, 16, 3, 7, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_2364FC, 0, 0, 0 - object_event 16, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 5, 21, 3, 9, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_236513, 0, 0, 0 - object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 34, 3, 3, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 21, 0, 0 - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 42, 8, 4, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_29149D, 1086, 0, 0 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 32, 3, 3, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_2914AA, 1087, 0, 0 - object_event 20, EVENT_OBJ_GFX_MAN_4, 0, 0, 14, 16, 3, 8, 17, 0, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0, 0, 0 - object_event 21, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 14, 20, 3, 16, 17, 0, 1, 3, VictoryRoad_B1F_EventScript_236541, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 5, 3, 1, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 19 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 4, 3, 1, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 20 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, 1, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 17 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 10, 3, 1, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 18 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 26, 3, 1, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 23 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 25, 3, 1, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 22 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 6, 3, 1, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 30 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 5, 3, 1, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 25 + object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 4, 3, 1, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 26 + object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 12, 3, 1, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 27 + object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 25, 3, 1, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 28 + object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 26, 3, 1, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 29 + object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 4, 3, 1, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 31 + object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 37, 12, 3, 9, 0, 1, 3, VictoryRoad_B1F_EventScript_2364E5, 0 + object_event 15, EVENT_OBJ_GFX_WOMAN_7, 0, 26, 16, 3, 7, 0, 1, 4, VictoryRoad_B1F_EventScript_2364FC, 0 + object_event 16, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 21, 3, 9, 0, 1, 2, VictoryRoad_B1F_EventScript_236513, 0 + object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 3, 3, 1, 17, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 21 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 8, 4, 1, 17, 0, 0, VictoryRoad_B1F_EventScript_29149D, 1086 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 3, 3, 1, 17, 0, 0, VictoryRoad_B1F_EventScript_2914AA, 1087 + object_event 20, EVENT_OBJ_GFX_MAN_4, 0, 14, 16, 3, 8, 17, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0 + object_event 21, EVENT_OBJ_GFX_WOMAN_7, 0, 14, 20, 3, 16, 17, 1, 3, VictoryRoad_B1F_EventScript_236541, 0 VictoryRoad_B1F_MapWarps: @ 853613C warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B2F diff --git a/data/maps/events/VictoryRoad_B2F.inc b/data/maps/events/VictoryRoad_B2F.inc index 080993cfee..d5f92efdba 100644 --- a/data/maps/events/VictoryRoad_B2F.inc +++ b/data/maps/events/VictoryRoad_B2F.inc @@ -1,11 +1,11 @@ VictoryRoad_B2F_EventObjects: @ 8536188 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 15, 6, 3, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0, 0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 43, 14, 3, 7, 17, 0, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0, 0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 2, 17, 3, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236903, 0, 0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 35, 22, 3, 9, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_23691A, 0, 0, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 8, 3, 1, 17, 0, 0, 0, VictoryRoad_B2F_EventScript_2914B7, 1088, 0, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 25, 18, 4, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236948, 0, 0, 0 - object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 0, 25, 21, 4, 7, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236931, 0, 0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 15, 6, 3, 8, 17, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 43, 14, 3, 7, 17, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 17, 3, 8, 17, 1, 2, VictoryRoad_B2F_EventScript_236903, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 35, 22, 3, 9, 17, 1, 2, VictoryRoad_B2F_EventScript_23691A, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 8, 3, 1, 17, 0, 0, VictoryRoad_B2F_EventScript_2914B7, 1088 + object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 25, 18, 4, 8, 17, 1, 2, VictoryRoad_B2F_EventScript_236948, 0 + object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 25, 21, 4, 7, 17, 1, 2, VictoryRoad_B2F_EventScript_236931, 0 VictoryRoad_B2F_MapWarps: @ 8536230 warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B1F From f807eb1f2de629ef094c3dae37d6380049980a8f Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 14 Jun 2018 22:00:27 -0500 Subject: [PATCH 16/55] Split out movement radius in object_event macro --- asm/macros/map.inc | 4 +- .../events/AbandonedShip_CaptainsOffice.inc | 4 +- .../events/AbandonedShip_Corridors_1F.inc | 4 +- .../events/AbandonedShip_Corridors_B1F.inc | 4 +- .../events/AbandonedShip_HiddenFloorRooms.inc | 8 +- data/maps/events/AbandonedShip_Room_B1F.inc | 2 +- data/maps/events/AbandonedShip_Rooms2_1F.inc | 10 +- data/maps/events/AbandonedShip_Rooms2_B1F.inc | 4 +- data/maps/events/AbandonedShip_Rooms_1F.inc | 8 +- data/maps/events/AbandonedShip_Rooms_B1F.inc | 4 +- data/maps/events/AncientTomb.inc | 2 +- data/maps/events/AquaHideout_1F.inc | 6 +- data/maps/events/AquaHideout_B1F.inc | 18 ++-- data/maps/events/AquaHideout_B2F.inc | 12 +-- data/maps/events/ArtisanCave_1F.inc | 2 +- data/maps/events/ArtisanCave_B1F.inc | 2 +- .../BattleFrontier_BattleArenaBattleRoom.inc | 18 ++-- .../BattleFrontier_BattleArenaCorridor.inc | 2 +- .../BattleFrontier_BattleArenaLobby.inc | 10 +- .../BattleFrontier_BattleDomeBattleRoom.inc | 30 +++--- .../BattleFrontier_BattleDomeCorridor.inc | 2 +- .../events/BattleFrontier_BattleDomeLobby.inc | 12 +-- ...BattleFrontier_BattleDomePreBattleRoom.inc | 2 +- ...BattleFrontier_BattleFactoryBattleRoom.inc | 16 ++-- .../BattleFrontier_BattleFactoryLobby.inc | 12 +-- ...tleFrontier_BattleFactoryPreBattleRoom.inc | 2 +- .../BattleFrontier_BattlePalaceBattleRoom.inc | 10 +- .../BattleFrontier_BattlePalaceCorridor.inc | 14 +-- .../BattleFrontier_BattlePalaceLobby.inc | 12 +-- .../BattleFrontier_BattlePikeCorridor.inc | 2 +- .../events/BattleFrontier_BattlePikeLobby.inc | 8 +- .../BattleFrontier_BattlePikeRandomRoom1.inc | 4 +- .../BattleFrontier_BattlePikeRandomRoom2.inc | 2 +- ...BattleFrontier_BattlePikeThreePathRoom.inc | 4 +- ...ntier_BattlePointExchangeServiceCorner.inc | 18 ++-- ...attleFrontier_BattlePyramidEmptySquare.inc | 32 +++---- .../BattleFrontier_BattlePyramidLobby.inc | 8 +- .../BattleFrontier_BattlePyramidTop.inc | 4 +- .../BattleFrontier_BattleTowerBattleRoom.inc | 6 +- .../BattleFrontier_BattleTowerBattleRoom2.inc | 12 +-- .../BattleFrontier_BattleTowerCorridor.inc | 2 +- .../BattleFrontier_BattleTowerCorridor2.inc | 8 +- .../BattleFrontier_BattleTowerElevator.inc | 2 +- .../BattleFrontier_BattleTowerLobby.inc | 18 ++-- ...tleFrontier_BattleTowerMultiBattleRoom.inc | 18 ++-- data/maps/events/BattleFrontier_Lounge1.inc | 6 +- data/maps/events/BattleFrontier_Lounge2.inc | 10 +- data/maps/events/BattleFrontier_Lounge3.inc | 10 +- data/maps/events/BattleFrontier_Lounge4.inc | 6 +- data/maps/events/BattleFrontier_Lounge5.inc | 8 +- data/maps/events/BattleFrontier_Lounge6.inc | 2 +- data/maps/events/BattleFrontier_Lounge7.inc | 8 +- data/maps/events/BattleFrontier_Lounge8.inc | 6 +- data/maps/events/BattleFrontier_Lounge9.inc | 2 +- data/maps/events/BattleFrontier_Mart.inc | 8 +- .../events/BattleFrontier_OutsideEast.inc | 52 +++++------ .../events/BattleFrontier_OutsideWest.inc | 48 +++++----- .../BattleFrontier_PokemonCenter_1F.inc | 10 +- .../BattleFrontier_PokemonCenter_2F.inc | 8 +- .../events/BattleFrontier_RankingHall.inc | 6 +- .../events/BattleFrontier_ReceptionGate.inc | 10 +- .../events/BattleFrontier_ScottsHouse.inc | 2 +- data/maps/events/BattlePyramidSquare01.inc | 14 +-- data/maps/events/BattlePyramidSquare02.inc | 14 +-- data/maps/events/BattlePyramidSquare03.inc | 14 +-- data/maps/events/BattlePyramidSquare04.inc | 14 +-- data/maps/events/BattlePyramidSquare05.inc | 14 +-- data/maps/events/BattlePyramidSquare06.inc | 14 +-- data/maps/events/BattlePyramidSquare07.inc | 14 +-- data/maps/events/BattlePyramidSquare08.inc | 14 +-- data/maps/events/BattlePyramidSquare09.inc | 14 +-- data/maps/events/BattlePyramidSquare10.inc | 14 +-- data/maps/events/BattlePyramidSquare11.inc | 14 +-- data/maps/events/BattlePyramidSquare12.inc | 14 +-- data/maps/events/BattlePyramidSquare13.inc | 14 +-- data/maps/events/BattlePyramidSquare14.inc | 14 +-- data/maps/events/BattlePyramidSquare15.inc | 14 +-- data/maps/events/BattlePyramidSquare16.inc | 14 +-- data/maps/events/BirthIsland_Exterior.inc | 4 +- data/maps/events/BirthIsland_Harbor.inc | 4 +- data/maps/events/CaveOfOrigin_B1F.inc | 2 +- data/maps/events/DesertRuins.inc | 2 +- data/maps/events/DesertUnderpass.inc | 2 +- data/maps/events/DewfordTown.inc | 10 +- data/maps/events/DewfordTown_Gym.inc | 16 ++-- data/maps/events/DewfordTown_Hall.inc | 18 ++-- data/maps/events/DewfordTown_House1.inc | 6 +- data/maps/events/DewfordTown_House2.inc | 4 +- .../events/DewfordTown_PokemonCenter_1F.inc | 6 +- .../events/DewfordTown_PokemonCenter_2F.inc | 8 +- .../events/EverGrandeCity_ChampionsRoom.inc | 6 +- .../maps/events/EverGrandeCity_DrakesRoom.inc | 2 +- .../events/EverGrandeCity_GlaciasRoom.inc | 2 +- .../maps/events/EverGrandeCity_HallOfFame.inc | 2 +- .../events/EverGrandeCity_PhoebesRoom.inc | 2 +- .../EverGrandeCity_PokemonCenter_1F.inc | 8 +- .../EverGrandeCity_PokemonCenter_2F.inc | 8 +- .../EverGrandeCity_PokemonLeague_1F.inc | 8 +- .../EverGrandeCity_PokemonLeague_2F.inc | 8 +- .../events/EverGrandeCity_SidneysRoom.inc | 2 +- data/maps/events/FallarborTown.inc | 8 +- .../FallarborTown_BattleTentBattleRoom.inc | 6 +- .../FallarborTown_BattleTentCorridor.inc | 2 +- .../events/FallarborTown_BattleTentLobby.inc | 10 +- data/maps/events/FallarborTown_House1.inc | 4 +- data/maps/events/FallarborTown_House2.inc | 2 +- data/maps/events/FallarborTown_Mart.inc | 10 +- .../events/FallarborTown_PokemonCenter_1F.inc | 8 +- .../events/FallarborTown_PokemonCenter_2F.inc | 8 +- data/maps/events/FarawayIsland_Entrance.inc | 4 +- data/maps/events/FarawayIsland_Interior.inc | 2 +- data/maps/events/FieryPath.inc | 16 ++-- data/maps/events/FortreeCity.inc | 14 +-- .../events/FortreeCity_DecorationShop.inc | 8 +- data/maps/events/FortreeCity_Gym.inc | 16 ++-- data/maps/events/FortreeCity_House1.inc | 6 +- data/maps/events/FortreeCity_House2.inc | 4 +- data/maps/events/FortreeCity_House3.inc | 4 +- data/maps/events/FortreeCity_House4.inc | 6 +- data/maps/events/FortreeCity_House5.inc | 6 +- data/maps/events/FortreeCity_Mart.inc | 8 +- .../events/FortreeCity_PokemonCenter_1F.inc | 8 +- .../events/FortreeCity_PokemonCenter_2F.inc | 8 +- data/maps/events/GraniteCave_1F.inc | 4 +- data/maps/events/GraniteCave_B1F.inc | 2 +- data/maps/events/GraniteCave_B2F.inc | 18 ++-- data/maps/events/GraniteCave_StevensRoom.inc | 2 +- data/maps/events/InsideOfTruck.inc | 6 +- data/maps/events/IslandCave.inc | 2 +- data/maps/events/JaggedPass.inc | 14 +-- data/maps/events/LavaridgeTown.inc | 18 ++-- data/maps/events/LavaridgeTown_Gym_1F.inc | 12 +-- data/maps/events/LavaridgeTown_Gym_B1F.inc | 8 +- data/maps/events/LavaridgeTown_HerbShop.inc | 6 +- data/maps/events/LavaridgeTown_House.inc | 6 +- data/maps/events/LavaridgeTown_Mart.inc | 6 +- .../events/LavaridgeTown_PokemonCenter_1F.inc | 8 +- .../events/LavaridgeTown_PokemonCenter_2F.inc | 8 +- data/maps/events/LilycoveCity.inc | 44 ++++----- data/maps/events/LilycoveCity_ContestHall.inc | 64 ++++++------- .../maps/events/LilycoveCity_ContestLobby.inc | 50 +++++----- .../events/LilycoveCity_CoveLilyMotel_1F.inc | 2 +- .../events/LilycoveCity_CoveLilyMotel_2F.inc | 14 +-- .../LilycoveCity_DepartmentStoreElevator.inc | 2 +- .../LilycoveCity_DepartmentStoreRooftop.inc | 8 +- .../LilycoveCity_DepartmentStore_1F.inc | 12 +-- .../LilycoveCity_DepartmentStore_2F.inc | 10 +- .../LilycoveCity_DepartmentStore_3F.inc | 10 +- .../LilycoveCity_DepartmentStore_4F.inc | 10 +- .../LilycoveCity_DepartmentStore_5F.inc | 14 +-- data/maps/events/LilycoveCity_Harbor.inc | 10 +- data/maps/events/LilycoveCity_House1.inc | 4 +- data/maps/events/LilycoveCity_House2.inc | 2 +- data/maps/events/LilycoveCity_House3.inc | 12 +-- data/maps/events/LilycoveCity_House4.inc | 4 +- .../events/LilycoveCity_LilycoveMuseum_1F.inc | 20 ++-- .../events/LilycoveCity_LilycoveMuseum_2F.inc | 8 +- .../events/LilycoveCity_MoveDeletersHouse.inc | 2 +- .../events/LilycoveCity_PokemonCenter_1F.inc | 10 +- .../events/LilycoveCity_PokemonCenter_2F.inc | 8 +- .../LilycoveCity_PokemonTrainerFanClub.inc | 18 ++-- data/maps/events/LinkContestRoom1.inc | 30 +++--- data/maps/events/LittlerootTown.inc | 16 ++-- .../LittlerootTown_BrendansHouse_1F.inc | 14 +-- .../LittlerootTown_BrendansHouse_2F.inc | 32 +++---- .../events/LittlerootTown_MaysHouse_1F.inc | 14 +-- .../events/LittlerootTown_MaysHouse_2F.inc | 32 +++---- .../LittlerootTown_ProfessorBirchsLab.inc | 12 +-- data/maps/events/MagmaHideout_1F.inc | 12 +-- data/maps/events/MagmaHideout_2F_1R.inc | 8 +- data/maps/events/MagmaHideout_2F_2R.inc | 12 +-- data/maps/events/MagmaHideout_3F_1R.inc | 6 +- data/maps/events/MagmaHideout_3F_2R.inc | 4 +- data/maps/events/MagmaHideout_3F_3R.inc | 2 +- data/maps/events/MagmaHideout_4F.inc | 16 ++-- data/maps/events/MarineCave_End.inc | 2 +- data/maps/events/MauvilleCity.inc | 22 ++--- data/maps/events/MauvilleCity_BikeShop.inc | 4 +- data/maps/events/MauvilleCity_GameCorner.inc | 24 ++--- data/maps/events/MauvilleCity_Gym.inc | 14 +-- data/maps/events/MauvilleCity_House1.inc | 2 +- data/maps/events/MauvilleCity_House2.inc | 2 +- data/maps/events/MauvilleCity_Mart.inc | 6 +- .../events/MauvilleCity_PokemonCenter_1F.inc | 10 +- .../events/MauvilleCity_PokemonCenter_2F.inc | 10 +- data/maps/events/MeteorFalls_1F_1R.inc | 20 ++-- data/maps/events/MeteorFalls_1F_2R.inc | 6 +- data/maps/events/MeteorFalls_B1F_2R.inc | 2 +- data/maps/events/MeteorFalls_StevensCave.inc | 2 +- data/maps/events/MirageTower_3F.inc | 4 +- data/maps/events/MirageTower_4F.inc | 6 +- data/maps/events/MossdeepCity.inc | 34 +++---- .../events/MossdeepCity_GameCorner_1F.inc | 4 +- .../events/MossdeepCity_GameCorner_B1F.inc | 2 +- data/maps/events/MossdeepCity_Gym.inc | 72 +++++++-------- data/maps/events/MossdeepCity_House1.inc | 4 +- data/maps/events/MossdeepCity_House2.inc | 6 +- data/maps/events/MossdeepCity_House3.inc | 2 +- data/maps/events/MossdeepCity_House4.inc | 6 +- data/maps/events/MossdeepCity_Mart.inc | 8 +- .../events/MossdeepCity_PokemonCenter_1F.inc | 6 +- .../events/MossdeepCity_PokemonCenter_2F.inc | 10 +- .../events/MossdeepCity_SpaceCenter_1F.inc | 22 ++--- .../events/MossdeepCity_SpaceCenter_2F.inc | 18 ++-- .../maps/events/MossdeepCity_StevensHouse.inc | 6 +- data/maps/events/MtChimney.inc | 60 ++++++------ .../maps/events/MtChimney_CableCarStation.inc | 4 +- data/maps/events/MtPyre_1F.inc | 6 +- data/maps/events/MtPyre_2F.inc | 16 ++-- data/maps/events/MtPyre_3F.inc | 8 +- data/maps/events/MtPyre_4F.inc | 4 +- data/maps/events/MtPyre_5F.inc | 4 +- data/maps/events/MtPyre_6F.inc | 6 +- data/maps/events/MtPyre_Exterior.inc | 4 +- data/maps/events/MtPyre_Summit.inc | 16 ++-- data/maps/events/NavelRock_Bottom.inc | 2 +- data/maps/events/NavelRock_Harbor.inc | 4 +- data/maps/events/NavelRock_Top.inc | 2 +- data/maps/events/NewMauville_Inside.inc | 16 ++-- data/maps/events/OldaleTown.inc | 8 +- data/maps/events/OldaleTown_House1.inc | 2 +- data/maps/events/OldaleTown_House2.inc | 4 +- data/maps/events/OldaleTown_Mart.inc | 6 +- .../events/OldaleTown_PokemonCenter_1F.inc | 8 +- .../events/OldaleTown_PokemonCenter_2F.inc | 8 +- data/maps/events/PacifidlogTown.inc | 6 +- data/maps/events/PacifidlogTown_House1.inc | 4 +- data/maps/events/PacifidlogTown_House2.inc | 6 +- data/maps/events/PacifidlogTown_House3.inc | 4 +- data/maps/events/PacifidlogTown_House4.inc | 6 +- data/maps/events/PacifidlogTown_House5.inc | 4 +- .../PacifidlogTown_PokemonCenter_1F.inc | 10 +- .../PacifidlogTown_PokemonCenter_2F.inc | 8 +- data/maps/events/PetalburgCity.inc | 18 ++-- data/maps/events/PetalburgCity_Gym.inc | 22 ++--- data/maps/events/PetalburgCity_House1.inc | 4 +- data/maps/events/PetalburgCity_House2.inc | 4 +- data/maps/events/PetalburgCity_Mart.inc | 8 +- .../events/PetalburgCity_PokemonCenter_1F.inc | 10 +- .../events/PetalburgCity_PokemonCenter_2F.inc | 8 +- .../maps/events/PetalburgCity_WallysHouse.inc | 4 +- data/maps/events/PetalburgWoods.inc | 26 +++--- data/maps/events/RecordCorner.inc | 2 +- data/maps/events/Route101.inc | 12 +-- data/maps/events/Route102.inc | 18 ++-- data/maps/events/Route103.inc | 40 ++++---- data/maps/events/Route104.inc | 68 +++++++------- data/maps/events/Route104_MrBrineysHouse.inc | 4 +- .../events/Route104_PrettyPetalFlowerShop.inc | 6 +- data/maps/events/Route105.inc | 16 ++-- data/maps/events/Route106.inc | 10 +- data/maps/events/Route107.inc | 14 +-- data/maps/events/Route108.inc | 14 +-- data/maps/events/Route109.inc | 48 +++++----- data/maps/events/Route109_SeashoreHouse.inc | 8 +- data/maps/events/Route110.inc | 72 +++++++-------- .../Route110_SeasideCyclingRoadEntrance1.inc | 2 +- .../Route110_SeasideCyclingRoadEntrance2.inc | 2 +- data/maps/events/Route110_TrickHouseEnd.inc | 2 +- .../events/Route110_TrickHouseEntrance.inc | 2 +- .../events/Route110_TrickHousePuzzle1.inc | 30 +++--- .../events/Route110_TrickHousePuzzle2.inc | 10 +- .../events/Route110_TrickHousePuzzle3.inc | 14 +-- .../events/Route110_TrickHousePuzzle4.inc | 28 +++--- .../events/Route110_TrickHousePuzzle5.inc | 10 +- .../events/Route110_TrickHousePuzzle6.inc | 8 +- .../events/Route110_TrickHousePuzzle7.inc | 18 ++-- .../events/Route110_TrickHousePuzzle8.inc | 8 +- data/maps/events/Route111.inc | 92 +++++++++---------- .../maps/events/Route111_OldLadysRestStop.inc | 2 +- .../events/Route111_WinstrateFamilysHouse.inc | 8 +- data/maps/events/Route112.inc | 28 +++--- data/maps/events/Route112_CableCarStation.inc | 4 +- data/maps/events/Route113.inc | 32 +++---- data/maps/events/Route113_GlassWorkshop.inc | 4 +- data/maps/events/Route114.inc | 54 +++++------ .../events/Route114_FossilManiacsHouse.inc | 2 +- .../events/Route114_FossilManiacsTunnel.inc | 2 +- data/maps/events/Route114_LanettesHouse.inc | 2 +- data/maps/events/Route115.inc | 46 +++++----- data/maps/events/Route116.inc | 56 +++++------ .../events/Route116_TunnelersRestHouse.inc | 6 +- data/maps/events/Route117.inc | 48 +++++----- data/maps/events/Route117_PokemonDayCare.inc | 2 +- data/maps/events/Route118.inc | 42 ++++----- data/maps/events/Route119.inc | 86 ++++++++--------- data/maps/events/Route119_House.inc | 14 +-- .../events/Route119_WeatherInstitute_1F.inc | 10 +- .../events/Route119_WeatherInstitute_2F.inc | 16 ++-- data/maps/events/Route120.inc | 88 +++++++++--------- data/maps/events/Route121.inc | 58 ++++++------ .../events/Route121_SafariZoneEntrance.inc | 6 +- data/maps/events/Route123.inc | 86 ++++++++--------- .../events/Route123_BerryMastersHouse.inc | 4 +- data/maps/events/Route124.inc | 24 ++--- .../Route124_DivingTreasureHuntersHouse.inc | 2 +- data/maps/events/Route125.inc | 20 ++-- data/maps/events/Route126.inc | 18 ++-- data/maps/events/Route127.inc | 22 ++--- data/maps/events/Route128.inc | 20 ++-- data/maps/events/Route129.inc | 10 +- data/maps/events/Route130.inc | 8 +- data/maps/events/Route131.inc | 16 ++-- data/maps/events/Route132.inc | 20 ++-- data/maps/events/Route133.inc | 20 ++-- data/maps/events/Route134.inc | 22 ++--- data/maps/events/RustboroCity.inc | 32 +++---- .../maps/events/RustboroCity_CuttersHouse.inc | 4 +- .../maps/events/RustboroCity_DevonCorp_1F.inc | 6 +- .../maps/events/RustboroCity_DevonCorp_2F.inc | 12 +-- .../maps/events/RustboroCity_DevonCorp_3F.inc | 6 +- data/maps/events/RustboroCity_Flat1_1F.inc | 4 +- data/maps/events/RustboroCity_Flat1_2F.inc | 16 ++-- data/maps/events/RustboroCity_Flat2_1F.inc | 4 +- data/maps/events/RustboroCity_Flat2_2F.inc | 4 +- data/maps/events/RustboroCity_Flat2_3F.inc | 4 +- data/maps/events/RustboroCity_Gym.inc | 10 +- data/maps/events/RustboroCity_House1.inc | 4 +- data/maps/events/RustboroCity_House2.inc | 4 +- data/maps/events/RustboroCity_House3.inc | 6 +- data/maps/events/RustboroCity_Mart.inc | 8 +- .../events/RustboroCity_PokemonCenter_1F.inc | 8 +- .../events/RustboroCity_PokemonCenter_2F.inc | 8 +- .../events/RustboroCity_PokemonSchool.inc | 14 +-- data/maps/events/RusturfTunnel.inc | 20 ++-- data/maps/events/SSTidalCorridor.inc | 10 +- data/maps/events/SSTidalLowerDeck.inc | 4 +- data/maps/events/SSTidalRooms.inc | 16 ++-- data/maps/events/SafariZone_North.inc | 18 ++-- data/maps/events/SafariZone_Northeast.inc | 18 ++-- data/maps/events/SafariZone_Northwest.inc | 4 +- data/maps/events/SafariZone_RestHouse.inc | 6 +- data/maps/events/SafariZone_South.inc | 12 +-- data/maps/events/SafariZone_Southeast.inc | 10 +- data/maps/events/SafariZone_Southwest.inc | 4 +- data/maps/events/ScorchedSlab.inc | 2 +- data/maps/events/SeafloorCavern_Entrance.inc | 2 +- data/maps/events/SeafloorCavern_Room1.inc | 10 +- data/maps/events/SeafloorCavern_Room2.inc | 16 ++-- data/maps/events/SeafloorCavern_Room3.inc | 18 ++-- data/maps/events/SeafloorCavern_Room4.inc | 4 +- data/maps/events/SeafloorCavern_Room5.inc | 12 +-- data/maps/events/SeafloorCavern_Room8.inc | 24 ++--- data/maps/events/SeafloorCavern_Room9.inc | 14 +-- data/maps/events/SecretBase_BlueCave1.inc | 30 +++--- data/maps/events/SecretBase_BlueCave2.inc | 30 +++--- data/maps/events/SecretBase_BlueCave3.inc | 30 +++--- data/maps/events/SecretBase_BlueCave4.inc | 30 +++--- data/maps/events/SecretBase_BrownCave1.inc | 30 +++--- data/maps/events/SecretBase_BrownCave2.inc | 30 +++--- data/maps/events/SecretBase_BrownCave3.inc | 30 +++--- data/maps/events/SecretBase_BrownCave4.inc | 30 +++--- data/maps/events/SecretBase_RedCave1.inc | 30 +++--- data/maps/events/SecretBase_RedCave2.inc | 30 +++--- data/maps/events/SecretBase_RedCave3.inc | 30 +++--- data/maps/events/SecretBase_RedCave4.inc | 30 +++--- data/maps/events/SecretBase_Shrub1.inc | 30 +++--- data/maps/events/SecretBase_Shrub2.inc | 30 +++--- data/maps/events/SecretBase_Shrub3.inc | 30 +++--- data/maps/events/SecretBase_Shrub4.inc | 30 +++--- data/maps/events/SecretBase_Tree1.inc | 30 +++--- data/maps/events/SecretBase_Tree2.inc | 30 +++--- data/maps/events/SecretBase_Tree3.inc | 30 +++--- data/maps/events/SecretBase_Tree4.inc | 30 +++--- data/maps/events/SecretBase_YellowCave1.inc | 30 +++--- data/maps/events/SecretBase_YellowCave2.inc | 30 +++--- data/maps/events/SecretBase_YellowCave3.inc | 30 +++--- data/maps/events/SecretBase_YellowCave4.inc | 30 +++--- .../events/ShoalCave_LowTideEntranceRoom.inc | 4 +- data/maps/events/ShoalCave_LowTideIceRoom.inc | 4 +- .../events/ShoalCave_LowTideInnerRoom.inc | 2 +- .../events/ShoalCave_LowTideLowerRoom.inc | 4 +- .../events/ShoalCave_LowTideStairsRoom.inc | 2 +- data/maps/events/SingleBattleColosseum.inc | 2 +- data/maps/events/SkyPillar_Outside.inc | 2 +- data/maps/events/SkyPillar_Top.inc | 4 +- data/maps/events/SlateportCity.inc | 70 +++++++------- .../SlateportCity_BattleTentBattleRoom.inc | 6 +- .../SlateportCity_BattleTentCorridor.inc | 2 +- .../events/SlateportCity_BattleTentLobby.inc | 10 +- data/maps/events/SlateportCity_Harbor.inc | 16 ++-- data/maps/events/SlateportCity_House1.inc | 2 +- data/maps/events/SlateportCity_House2.inc | 4 +- data/maps/events/SlateportCity_Mart.inc | 6 +- .../events/SlateportCity_OceanicMuseum_1F.inc | 28 +++--- .../events/SlateportCity_OceanicMuseum_2F.inc | 14 +-- .../events/SlateportCity_PokemonCenter_1F.inc | 6 +- .../events/SlateportCity_PokemonCenter_2F.inc | 8 +- .../events/SlateportCity_PokemonFanClub.inc | 18 ++-- .../SlateportCity_SternsShipyard_1F.inc | 8 +- .../SlateportCity_SternsShipyard_2F.inc | 6 +- data/maps/events/SootopolisCity.inc | 36 ++++---- data/maps/events/SootopolisCity_Gym_1F.inc | 4 +- data/maps/events/SootopolisCity_Gym_B1F.inc | 20 ++-- data/maps/events/SootopolisCity_House1.inc | 4 +- data/maps/events/SootopolisCity_House2.inc | 2 +- data/maps/events/SootopolisCity_House3.inc | 4 +- data/maps/events/SootopolisCity_House4.inc | 6 +- data/maps/events/SootopolisCity_House5.inc | 4 +- data/maps/events/SootopolisCity_House6.inc | 2 +- data/maps/events/SootopolisCity_House7.inc | 4 +- .../SootopolisCity_LotadAndSeedotHouse.inc | 4 +- data/maps/events/SootopolisCity_Mart.inc | 6 +- .../SootopolisCity_MysteryEventsHouse_1F.inc | 2 +- .../SootopolisCity_MysteryEventsHouse_B1F.inc | 2 +- .../SootopolisCity_PokemonCenter_1F.inc | 8 +- .../SootopolisCity_PokemonCenter_2F.inc | 8 +- data/maps/events/SouthernIsland_Exterior.inc | 4 +- data/maps/events/SouthernIsland_Interior.inc | 4 +- data/maps/events/TerraCave_End.inc | 2 +- data/maps/events/TradeCenter.inc | 2 +- data/maps/events/TrainerHill_Elevator.inc | 2 +- data/maps/events/TrainerHill_Entrance.inc | 10 +- data/maps/events/TrainerHill_Roof.inc | 2 +- .../maps/events/Underwater_SeafloorCavern.inc | 8 +- data/maps/events/UnionRoom.inc | 18 ++-- data/maps/events/VerdanturfTown.inc | 8 +- .../VerdanturfTown_BattleTentBattleRoom.inc | 6 +- .../VerdanturfTown_BattleTentCorridor.inc | 2 +- .../events/VerdanturfTown_BattleTentLobby.inc | 12 +-- .../VerdanturfTown_FriendshipRatersHouse.inc | 4 +- data/maps/events/VerdanturfTown_House.inc | 4 +- data/maps/events/VerdanturfTown_Mart.inc | 8 +- .../VerdanturfTown_PokemonCenter_1F.inc | 8 +- .../VerdanturfTown_PokemonCenter_2F.inc | 8 +- .../events/VerdanturfTown_WandasHouse.inc | 10 +- data/maps/events/VictoryRoad_1F.inc | 18 ++-- data/maps/events/VictoryRoad_B1F.inc | 42 ++++----- data/maps/events/VictoryRoad_B2F.inc | 14 +-- 429 files changed, 2778 insertions(+), 2778 deletions(-) diff --git a/asm/macros/map.inc b/asm/macros/map.inc index 8a07952663..69b3629f6b 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -14,11 +14,11 @@ .4byte \address .endm - .macro object_event index, gfx, replacement, x, y, elevation, movement_type, radius, trainer_type, sight_radius_tree_etc, script, event_flag + .macro object_event index, gfx, replacement, x, y, elevation, movement_type, x_radius, y_radius, trainer_type, sight_radius_tree_etc, script, event_flag .byte \index, \gfx, \replacement, 0 .2byte \x .2byte \y - .byte \elevation, \movement_type, \radius, 0 + .byte \elevation, \movement_type, ((\y_radius << 4) | \x_radius), 0 .2byte \trainer_type, \sight_radius_tree_etc .4byte \script .2byte \event_flag diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.inc b/data/maps/events/AbandonedShip_CaptainsOffice.inc index b01dd1e726..e7e48568ca 100644 --- a/data/maps/events/AbandonedShip_CaptainsOffice.inc +++ b/data/maps/events/AbandonedShip_CaptainsOffice.inc @@ -1,6 +1,6 @@ AbandonedShip_CaptainsOffice_EventObjects: @ 8536A5C - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, 8, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, 1, 17, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, 8, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, 1, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100 AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK diff --git a/data/maps/events/AbandonedShip_Corridors_1F.inc b/data/maps/events/AbandonedShip_Corridors_1F.inc index 3c3a18d4a1..f0e2760320 100644 --- a/data/maps/events/AbandonedShip_Corridors_1F.inc +++ b/data/maps/events/AbandonedShip_Corridors_1F.inc @@ -1,6 +1,6 @@ AbandonedShip_Corridors_1F_EventObjects: @ 85366C0 - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 17, 7, 3, 2, 17, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0 - object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 10, 3, 45, 116, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0 + object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 17, 7, 3, 2, 1, 1, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0 + object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 10, 3, 45, 4, 7, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0 AbandonedShip_Corridors_1F_MapWarps: @ 85366F0 warp_def 9, 11, 3, 2, MAP_ABANDONED_SHIP_DECK diff --git a/data/maps/events/AbandonedShip_Corridors_B1F.inc b/data/maps/events/AbandonedShip_Corridors_B1F.inc index 7a71cdcfc0..d1ee694990 100644 --- a/data/maps/events/AbandonedShip_Corridors_B1F.inc +++ b/data/maps/events/AbandonedShip_Corridors_B1F.inc @@ -1,6 +1,6 @@ AbandonedShip_Corridors_B1F_EventObjects: @ 8536808 - object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 2, 8, 3, 2, 17, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 6, 3, 14, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0 + object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 2, 8, 3, 2, 1, 1, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 6, 3, 14, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0 AbandonedShip_Corridors_B1F_MapWarps: @ 8536838 warp_def 6, 4, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_B1F diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc index dbc5d432b1..e352635a5f 100644 --- a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc +++ b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc @@ -1,8 +1,8 @@ AbandonedShip_HiddenFloorRooms_EventObjects: @ 8536B40 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, 1, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, 1, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, 1, 17, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, 1, 17, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, 1, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, 1, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101 AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0 warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS diff --git a/data/maps/events/AbandonedShip_Room_B1F.inc b/data/maps/events/AbandonedShip_Room_B1F.inc index cf6369dd62..1f1cab59aa 100644 --- a/data/maps/events/AbandonedShip_Room_B1F.inc +++ b/data/maps/events/AbandonedShip_Room_B1F.inc @@ -1,5 +1,5 @@ AbandonedShip_Room_B1F_EventObjects: @ 853697C - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 17, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098 AbandonedShip_Room_B1F_MapWarps: @ 8536994 warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.inc b/data/maps/events/AbandonedShip_Rooms2_1F.inc index 12bbe1366d..7dfb4d0593 100644 --- a/data/maps/events/AbandonedShip_Rooms2_1F.inc +++ b/data/maps/events/AbandonedShip_Rooms2_1F.inc @@ -1,9 +1,9 @@ AbandonedShip_Rooms2_1F_EventObjects: @ 85369B8 - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, 8, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 13, 3, 8, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 17, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099 - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 3, 2, 3, 10, 17, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0 - object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 7, 2, 3, 9, 17, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0 + object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099 + object_event 4, EVENT_OBJ_GFX_HIKER, 0, 3, 2, 3, 10, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0 + object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 7, 2, 3, 9, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0 AbandonedShip_Rooms2_1F_MapWarps: @ 8536A30 warp_def 4, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.inc b/data/maps/events/AbandonedShip_Rooms2_B1F.inc index 1aa5ad50f1..40e4600af2 100644 --- a/data/maps/events/AbandonedShip_Rooms2_B1F.inc +++ b/data/maps/events/AbandonedShip_Rooms2_B1F.inc @@ -1,6 +1,6 @@ AbandonedShip_Rooms2_B1F_EventObjects: @ 85368F4 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, 2, 17, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, 1, 17, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, 2, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097 AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924 warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F diff --git a/data/maps/events/AbandonedShip_Rooms_1F.inc b/data/maps/events/AbandonedShip_Rooms_1F.inc index 429159059c..072892b0a2 100644 --- a/data/maps/events/AbandonedShip_Rooms_1F.inc +++ b/data/maps/events/AbandonedShip_Rooms_1F.inc @@ -1,8 +1,8 @@ AbandonedShip_Rooms_1F_EventObjects: @ 8536764 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 5, 3, 2, 17, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, 1, 17, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095 - object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 10, 11, 3, 8, 17, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 10, 16, 3, 16, 17, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 5, 3, 2, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095 + object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 10, 11, 3, 8, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 10, 16, 3, 16, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0 AbandonedShip_Rooms_1F_MapWarps: @ 85367C4 warp_def 4, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.inc b/data/maps/events/AbandonedShip_Rooms_B1F.inc index 3b3d5976bf..50bc7c0ee9 100644 --- a/data/maps/events/AbandonedShip_Rooms_B1F.inc +++ b/data/maps/events/AbandonedShip_Rooms_B1F.inc @@ -1,6 +1,6 @@ AbandonedShip_Rooms_B1F_EventObjects: @ 8536898 - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, 9, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, 1, 17, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, 9, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096 AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8 warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F diff --git a/data/maps/events/AncientTomb.inc b/data/maps/events/AncientTomb.inc index 0071545870..4950be4ac3 100644 --- a/data/maps/events/AncientTomb.inc +++ b/data/maps/events/AncientTomb.inc @@ -1,5 +1,5 @@ AncientTomb_EventObjects: @ 8536CDC - object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, 8, 0, 0, 0, AncientTomb_EventScript_23905A, 937 + object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, 8, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937 AncientTomb_MapWarps: @ 8536CF4 warp_def 8, 29, 3, 0, MAP_ROUTE120 diff --git a/data/maps/events/AquaHideout_1F.inc b/data/maps/events/AquaHideout_1F.inc index 44d9b8fea0..7d0befd16d 100644 --- a/data/maps/events/AquaHideout_1F.inc +++ b/data/maps/events/AquaHideout_1F.inc @@ -1,7 +1,7 @@ AquaHideout_1F_EventObjects: @ 8535304 - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, 8, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, 8, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, 50, 93, 1, 3, AquaHideout_1F_EventScript_2334F8, 924 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, 50, 13, 5, 1, 3, AquaHideout_1F_EventScript_2334F8, 924 AquaHideout_1F_MapWarps: @ 853534C warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/events/AquaHideout_B1F.inc index e279951fc4..31108fa9c5 100644 --- a/data/maps/events/AquaHideout_B1F.inc +++ b/data/maps/events/AquaHideout_B1F.inc @@ -1,13 +1,13 @@ AquaHideout_B1F_EventObjects: @ 8535378 - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, 8, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, 9, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, 1, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 20, 18, 3, 23, 4, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, 1, 17, 0, 0, AquaHideout_B1F_EventScript_291358, 1124 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, 1, 17, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, 1, 17, 0, 0, AquaHideout_B1F_EventScript_291365, 1132 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, 1, 17, 0, 0, AquaHideout_B1F_EventScript_233A38, 978 - object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, 7, 17, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, 8, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, 9, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, 1, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 20, 18, 3, 23, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291358, 1124 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291365, 1132 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, 978 + object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, 7, 1, 1, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924 AquaHideout_B1F_MapWarps: @ 8535450 warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/events/AquaHideout_B2F.inc index 15cedf8b94..eca22f5f70 100644 --- a/data/maps/events/AquaHideout_B2F.inc +++ b/data/maps/events/AquaHideout_B2F.inc @@ -1,10 +1,10 @@ AquaHideout_B2F_EventObjects: @ 853552C - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 19, 3, 9, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, 924 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, 45, 52, 1, 3, AquaHideout_B2F_EventScript_233E8A, 924 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, 1, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072 - object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, 9, 0, 0, 0, 0x0, 943 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, 10, 17, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, 9, 17, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 19, 3, 9, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, 924 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, 45, 4, 3, 1, 3, AquaHideout_B2F_EventScript_233E8A, 924 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, 1, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072 + object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, 9, 0, 0, 0, 0, 0x0, 943 + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, 10, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, 9, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924 AquaHideout_B2F_MapWarps: @ 85355BC warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F diff --git a/data/maps/events/ArtisanCave_1F.inc b/data/maps/events/ArtisanCave_1F.inc index 33c1cb9451..edd7429a32 100644 --- a/data/maps/events/ArtisanCave_1F.inc +++ b/data/maps/events/ArtisanCave_1F.inc @@ -1,5 +1,5 @@ ArtisanCave_1F_EventObjects: @ 8537774 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, 1, 17, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, 1, 1, 1, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163 ArtisanCave_1F_MapWarps: @ 853778C warp_def 10, 17, 0, 13, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/ArtisanCave_B1F.inc b/data/maps/events/ArtisanCave_B1F.inc index fb9f896234..a0b96c3160 100644 --- a/data/maps/events/ArtisanCave_B1F.inc +++ b/data/maps/events/ArtisanCave_B1F.inc @@ -1,5 +1,5 @@ ArtisanCave_B1F_EventObjects: @ 8537708 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 38, 3, 1, 17, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 38, 3, 1, 1, 1, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162 ArtisanCave_B1F_MapWarps: @ 8537720 warp_def 8, 48, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc b/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc index c8cd0042e1..ce6eeb9523 100644 --- a/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc @@ -1,13 +1,13 @@ BattleFrontier_BattleArenaBattleRoom_EventObjects: @ 853C8EC - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 3, 3, 8, 17, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 3, 3, 8, 17, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 9, 3, 7, 17, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 9, 3, 7, 17, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 5, 3, 10, 17, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 5, 3, 9, 17, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 15, 6, 3, 9, 17, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_TRADER, 0, 0, 6, 3, 10, 17, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, 8, 17, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 3, 3, 8, 1, 1, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 3, 3, 8, 1, 1, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 9, 3, 7, 1, 1, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 9, 3, 7, 1, 1, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 5, 3, 10, 1, 1, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 5, 3, 9, 1, 1, 0, 0, 0x0, 0 + object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 15, 6, 3, 9, 1, 1, 0, 0, 0x0, 0 + object_event 8, EVENT_OBJ_GFX_TRADER, 0, 0, 6, 3, 10, 1, 1, 0, 0, 0x0, 0 + object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, 8, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattleArenaBattleRoom_MapEvents:: @ 853C9C4 map_events BattleFrontier_BattleArenaBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleArenaCorridor.inc b/data/maps/events/BattleFrontier_BattleArenaCorridor.inc index 14f1b7d86a..03a2cb14d3 100644 --- a/data/maps/events/BattleFrontier_BattleArenaCorridor.inc +++ b/data/maps/events/BattleFrontier_BattleArenaCorridor.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleArenaCorridor_EventObjects: @ 853C8C0 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 12, 0, 8, 17, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 12, 0, 8, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattleArenaCorridor_MapEvents:: @ 853C8D8 map_events BattleFrontier_BattleArenaCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleArenaLobby.inc b/data/maps/events/BattleFrontier_BattleArenaLobby.inc index d1c689967e..d0343228ba 100644 --- a/data/maps/events/BattleFrontier_BattleArenaLobby.inc +++ b/data/maps/events/BattleFrontier_BattleArenaLobby.inc @@ -1,9 +1,9 @@ BattleFrontier_BattleArenaLobby_EventObjects: @ 853C814 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 7, 0, 8, 17, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 10, 3, 2, 17, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0 - object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 14, 11, 3, 9, 17, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0 - object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 14, 12, 3, 9, 17, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0 - object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 10, 3, 9, 17, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 7, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 10, 3, 2, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0 + object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 14, 11, 3, 9, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0 + object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 14, 12, 3, 9, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0 + object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 10, 3, 9, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0 BattleFrontier_BattleArenaLobby_MapWarps: @ 853C88C warp_def 7, 12, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc b/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc index b811d409ee..2500a826b5 100644 --- a/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc @@ -1,19 +1,19 @@ BattleFrontier_BattleDomeBattleRoom_EventObjects: @ 853C1C4 - object_event 1, EVENT_OBJ_GFX_REPORTER_M, 0, 5, 4, 0, 8, 17, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 7, 2, 0, 8, 17, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 2, 0, 8, 17, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 11, 2, 0, 8, 17, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 16, 2, 0, 8, 17, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 4, 2, 0, 8, 17, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 16, 1, 0, 8, 17, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_CAMPER, 0, 8, 1, 0, 8, 17, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, 8, 17, 0, 0, 0x0, 0 - object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 1, 0, 8, 17, 0, 0, 0x0, 0 - object_event 11, EVENT_OBJ_GFX_GIRL_2, 0, 13, 2, 0, 8, 17, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 10, 2, 0, 8, 17, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_TRADER, 0, 4, 9, 4, 7, 17, 0, 0, 0x0, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_4, 0, 14, 2, 0, 8, 17, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_HIPSTER, 0, 11, 6, 0, 9, 17, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_REPORTER_M, 0, 5, 4, 0, 8, 1, 1, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 7, 2, 0, 8, 1, 1, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 2, 0, 8, 1, 1, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 11, 2, 0, 8, 1, 1, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 16, 2, 0, 8, 1, 1, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 4, 2, 0, 8, 1, 1, 0, 0, 0x0, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 16, 1, 0, 8, 1, 1, 0, 0, 0x0, 0 + object_event 8, EVENT_OBJ_GFX_CAMPER, 0, 8, 1, 0, 8, 1, 1, 0, 0, 0x0, 0 + object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, 8, 1, 1, 0, 0, 0x0, 0 + object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 1, 0, 8, 1, 1, 0, 0, 0x0, 0 + object_event 11, EVENT_OBJ_GFX_GIRL_2, 0, 13, 2, 0, 8, 1, 1, 0, 0, 0x0, 0 + object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 10, 2, 0, 8, 1, 1, 0, 0, 0x0, 0 + object_event 13, EVENT_OBJ_GFX_TRADER, 0, 4, 9, 4, 7, 1, 1, 0, 0, 0x0, 0 + object_event 14, EVENT_OBJ_GFX_WOMAN_4, 0, 14, 2, 0, 8, 1, 1, 0, 0, 0x0, 0 + object_event 15, EVENT_OBJ_GFX_HIPSTER, 0, 11, 6, 0, 9, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattleDomeBattleRoom_MapEvents:: @ 853C32C map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleDomeCorridor.inc b/data/maps/events/BattleFrontier_BattleDomeCorridor.inc index 8157405492..8a8d5448e2 100644 --- a/data/maps/events/BattleFrontier_BattleDomeCorridor.inc +++ b/data/maps/events/BattleFrontier_BattleDomeCorridor.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleDomeCorridor_EventObjects: @ 853C14C - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 23, 5, 0, 8, 17, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 23, 5, 0, 8, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattleDomeCorridor_MapWarps: @ 853C164 warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/events/BattleFrontier_BattleDomeLobby.inc b/data/maps/events/BattleFrontier_BattleDomeLobby.inc index da6e3ef874..9c6eb26496 100644 --- a/data/maps/events/BattleFrontier_BattleDomeLobby.inc +++ b/data/maps/events/BattleFrontier_BattleDomeLobby.inc @@ -1,10 +1,10 @@ BattleFrontier_BattleDomeLobby_EventObjects: @ 853C068 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 10, 0, 8, 17, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 1, 11, 0, 2, 17, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 14, 14, 0, 2, 17, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0 - object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 18, 14, 0, 2, 17, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0 - object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 8, 14, 0, 2, 17, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0 - object_event 6, EVENT_OBJ_GFX_TEALA, 0, 17, 10, 0, 8, 17, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 10, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 1, 11, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 14, 14, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0 + object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 18, 14, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0 + object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 8, 14, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0 + object_event 6, EVENT_OBJ_GFX_TEALA, 0, 17, 10, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0 BattleFrontier_BattleDomeLobby_MapWarps: @ 853C0F8 warp_def 11, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc b/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc index db8cccf1cb..7f2133ac59 100644 --- a/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleDomePreBattleRoom_EventObjects: @ 853C188 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, 8, 17, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, 8, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattleDomePreBattleRoom_MapWarps: @ 853C1A0 warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc b/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc index c3d3ea89e6..2ea1fbd41a 100644 --- a/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc @@ -1,12 +1,12 @@ BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 853CADC - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 0, 8, 17, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 7, 4, 0, 8, 17, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 0, 8, 17, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 0, 8, 17, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 4, 0, 8, 17, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 6, 0, 8, 17, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 8, 0, 8, 17, 0, 0, 0x0, 0 - object_event 8, 255, 0, 5, 11, 0, 7, 17, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 0, 8, 1, 1, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 7, 4, 0, 8, 1, 1, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 0, 8, 1, 1, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 0, 8, 1, 1, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 4, 0, 8, 1, 1, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 6, 0, 8, 1, 1, 0, 0, 0x0, 0 + object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 8, 0, 8, 1, 1, 0, 0, 0x0, 0 + object_event 8, 255, 0, 5, 11, 0, 7, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattleFactoryBattleRoom_MapEvents:: @ 853CB9C map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleFactoryLobby.inc b/data/maps/events/BattleFrontier_BattleFactoryLobby.inc index b25212cde1..13de4c5399 100644 --- a/data/maps/events/BattleFrontier_BattleFactoryLobby.inc +++ b/data/maps/events/BattleFrontier_BattleFactoryLobby.inc @@ -1,10 +1,10 @@ BattleFrontier_BattleFactoryLobby_EventObjects: @ 853C9D8 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 7, 0, 8, 17, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 11, 0, 2, 17, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 14, 11, 0, 8, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 13, 11, 0, 10, 17, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0 - object_event 5, EVENT_OBJ_GFX_FAT_MAN, 0, 6, 10, 0, 1, 17, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0 - object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 7, 0, 8, 17, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 7, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 11, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 14, 11, 0, 8, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 13, 11, 0, 10, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0 + object_event 5, EVENT_OBJ_GFX_FAT_MAN, 0, 6, 10, 0, 1, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0 + object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 7, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0 BattleFrontier_BattleFactoryLobby_MapWarps: @ 853CA68 warp_def 9, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc index a3bcf13b3a..b8ffbfc6d9 100644 --- a/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventObjects: @ 853CAB0 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 12, 0, 7, 17, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 12, 0, 7, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattleFactoryPreBattleRoom_MapEvents:: @ 853CAC8 map_events BattleFrontier_BattleFactoryPreBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc b/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc index 9b9e3d717a..bc1d5a525c 100644 --- a/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc @@ -1,9 +1,9 @@ BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC - object_event 1, EVENT_OBJ_GFX_TRADER, 0, 1, 9, 3, 7, 17, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 13, 1, 3, 8, 17, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 1, 4, 3, 10, 17, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 13, 1, 3, 8, 17, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 13, 1, 3, 8, 17, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_TRADER, 0, 1, 9, 3, 7, 1, 1, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 13, 1, 3, 8, 1, 1, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 1, 4, 3, 10, 1, 1, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 13, 1, 3, 8, 1, 1, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 13, 1, 3, 8, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattlePalaceBattleRoom_MapWarps: @ 853C574 warp_def 0, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR diff --git a/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc b/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc index 91311b8dae..f6baf26f69 100644 --- a/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc +++ b/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc @@ -1,11 +1,11 @@ BattleFrontier_BattlePalaceCorridor_EventObjects: @ 853C420 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 8, 12, 3, 7, 17, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 3, 5, 0, 2, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_KIRLIA, 0, 12, 6, 0, 14, 32, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_PIKACHU, 0, 15, 5, 0, 1, 17, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 9, 0, 14, 32, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 13, 9, 0, 1, 16, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 3, 10, 0, 2, 33, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 8, 12, 3, 7, 1, 1, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 3, 5, 0, 2, 1, 0, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_KIRLIA, 0, 12, 6, 0, 14, 0, 2, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_PIKACHU, 0, 15, 5, 0, 1, 1, 1, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 9, 0, 14, 0, 2, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 13, 9, 0, 1, 0, 1, 0, 0, 0x0, 0 + object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 3, 10, 0, 2, 1, 2, 0, 0, 0x0, 0 BattleFrontier_BattlePalaceCorridor_MapWarps: @ 853C4C8 warp_def 8, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY diff --git a/data/maps/events/BattleFrontier_BattlePalaceLobby.inc b/data/maps/events/BattleFrontier_BattlePalaceLobby.inc index 42b4da80e5..56da378cb5 100644 --- a/data/maps/events/BattleFrontier_BattlePalaceLobby.inc +++ b/data/maps/events/BattleFrontier_BattlePalaceLobby.inc @@ -1,10 +1,10 @@ BattleFrontier_BattlePalaceLobby_EventObjects: @ 853C340 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 6, 0, 8, 17, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 8, 0, 2, 17, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 24, 5, 0, 8, 17, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 18, 10, 0, 2, 17, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0 - object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 2, 10, 0, 2, 17, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0 - object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 19, 6, 0, 8, 17, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 6, 0, 8, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 8, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 24, 5, 0, 8, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 18, 10, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0 + object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 2, 10, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0 + object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 19, 6, 0, 8, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0 BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0 warp_def 12, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/BattleFrontier_BattlePikeCorridor.inc b/data/maps/events/BattleFrontier_BattlePikeCorridor.inc index df9bd1572b..67ceaaae68 100644 --- a/data/maps/events/BattleFrontier_BattlePikeCorridor.inc +++ b/data/maps/events/BattleFrontier_BattlePikeCorridor.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePikeCorridor_EventObjects: @ 853CC54 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 6, 6, 3, 8, 17, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 6, 6, 3, 8, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattlePikeCorridor_MapEvents:: @ 853CC6C map_events BattleFrontier_BattlePikeCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePikeLobby.inc b/data/maps/events/BattleFrontier_BattlePikeLobby.inc index 4cd1297395..45d3da1034 100644 --- a/data/maps/events/BattleFrontier_BattlePikeLobby.inc +++ b/data/maps/events/BattleFrontier_BattlePikeLobby.inc @@ -1,8 +1,8 @@ BattleFrontier_BattlePikeLobby_EventObjects: @ 853CBB0 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 5, 5, 3, 8, 17, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 10, 9, 3, 7, 17, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 3, 9, 17, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 8, 9, 3, 2, 17, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 5, 5, 3, 8, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 10, 9, 3, 7, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 3, 9, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 8, 9, 3, 2, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0 BattleFrontier_BattlePikeLobby_MapWarps: @ 853CC10 warp_def 5, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc b/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc index d5b5898cdd..80c1fc3bf1 100644 --- a/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc +++ b/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 853CD54 - object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 4, 4, 3, 8, 17, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0 - object_event 2, EVENT_OBJ_GFX_TRADER, 0, 3, 4, 3, 8, 17, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 4, 4, 3, 8, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0 + object_event 2, EVENT_OBJ_GFX_TRADER, 0, 3, 4, 3, 8, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0 BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84 coord_event 4, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2 diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc b/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc index 95b7c67816..9cff205176 100644 --- a/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc +++ b/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePikeRandomRoom2_EventObjects: @ 853CE08 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 2, 4, 3, 8, 17, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 2, 4, 3, 8, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattlePikeRandomRoom2_MapEvents:: @ 853CE20 map_events BattleFrontier_BattlePikeRandomRoom2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc b/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc index e1668644ec..7a23ba8929 100644 --- a/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc +++ b/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePikeThreePathRoom_EventObjects: @ 853CC80 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 4, 10, 3, 10, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_6, 0, 8, 5, 3, 8, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 4, 10, 3, 10, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_6, 0, 8, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0 BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0 coord_event 2, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E diff --git a/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc b/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc index 574da0ed30..7a8c584acb 100644 --- a/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc +++ b/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc @@ -1,13 +1,13 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: @ 853D018 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 4, 0, 9, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0 - object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 5, 0, 10, 17, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 0, 8, 17, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 14, 6, 0, 2, 17, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0 - object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 1, 9, 0, 2, 17, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0 - object_event 6, EVENT_OBJ_GFX_TEALA, 0, 5, 5, 0, 8, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0 - object_event 7, EVENT_OBJ_GFX_TEALA, 0, 9, 5, 0, 8, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0 - object_event 8, EVENT_OBJ_GFX_TEALA, 0, 10, 4, 0, 10, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0 - object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 12, 10, 0, 2, 17, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 4, 0, 9, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0 + object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 5, 0, 10, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 0, 8, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0 + object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 14, 6, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0 + object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 1, 9, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0 + object_event 6, EVENT_OBJ_GFX_TEALA, 0, 5, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0 + object_event 7, EVENT_OBJ_GFX_TEALA, 0, 9, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0 + object_event 8, EVENT_OBJ_GFX_TEALA, 0, 10, 4, 0, 10, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0 + object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 12, 10, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0 BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: @ 853D0F0 warp_def 7, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc b/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc index 141482321d..f7d22a5ed8 100644 --- a/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc +++ b/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc @@ -1,20 +1,20 @@ BattleFrontier_BattlePyramidEmptySquare_EventObjects: @ 853C62C - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 0, 0, 8, 17, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 0, 3, 1, 17, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 0, 3, 1, 17, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 0, 3, 1, 17, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 0, 3, 1, 17, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 3, 1, 17, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 3, 1, 17, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 0, 1, 17, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 3, 1, 17, 0, 0, 0x0, 0 - object_event 10, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 1, 3, 1, 17, 0, 0, 0x0, 0 - object_event 11, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 1, 0, 1, 17, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 1, 0, 1, 17, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 1, 0, 1, 17, 0, 0, 0x0, 0 - object_event 14, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 1, 0, 1, 17, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, 1, 17, 0, 0, 0x0, 0 - object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 1, 0, 1, 17, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 0, 0, 8, 1, 1, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 0, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 0, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 0, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 0, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 8, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 0, 1, 1, 1, 0, 0, 0x0, 0 + object_event 9, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 10, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 1, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 11, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 1, 0, 1, 1, 1, 0, 0, 0x0, 0 + object_event 12, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 1, 0, 1, 1, 1, 0, 0, 0x0, 0 + object_event 13, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 1, 0, 1, 1, 1, 0, 0, 0x0, 0 + object_event 14, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 1, 0, 1, 1, 1, 0, 0, 0x0, 0 + object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, 1, 1, 1, 0, 0, 0x0, 0 + object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 1, 0, 1, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattlePyramidEmptySquare_MapEvents:: @ 853C7AC map_events BattleFrontier_BattlePyramidEmptySquare_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePyramidLobby.inc b/data/maps/events/BattleFrontier_BattlePyramidLobby.inc index 429312ef00..28b5f5c61f 100644 --- a/data/maps/events/BattleFrontier_BattlePyramidLobby.inc +++ b/data/maps/events/BattleFrontier_BattlePyramidLobby.inc @@ -1,8 +1,8 @@ BattleFrontier_BattlePyramidLobby_EventObjects: @ 853C598 - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 7, 12, 4, 8, 17, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0 - object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 14, 13, 4, 9, 17, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 15, 4, 2, 17, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0 - object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 16, 4, 2, 17, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0 + 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 BattleFrontier_BattlePyramidLobby_MapWarps: @ 853C5F8 warp_def 7, 17, 4, 3, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/BattleFrontier_BattlePyramidTop.inc b/data/maps/events/BattleFrontier_BattlePyramidTop.inc index 7aede39268..f724f4f9f7 100644 --- a/data/maps/events/BattleFrontier_BattlePyramidTop.inc +++ b/data/maps/events/BattleFrontier_BattlePyramidTop.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePyramidTop_EventObjects: @ 853C7C0 - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 17, 11, 6, 8, 17, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0 - object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 17, 7, 0, 7, 17, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 17, 11, 6, 8, 1, 1, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0 + object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 17, 7, 0, 7, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattlePyramidTop_MapCoordEvents: @ 853C7F0 coord_event 17, 9, 4, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePyramidTop_EventScript_255256 diff --git a/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc b/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc index 7e702f40b0..0bc8d04348 100644 --- a/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc @@ -1,7 +1,7 @@ BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0 - object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, 8, 0, 0, 0, 0x0, 888 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, 10, 0, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 4, 8, 3, 7, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0 BattleFrontier_BattleTowerBattleRoom_MapWarps: @ 853B818 warp_def 5, 8, 0, 2, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY diff --git a/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc b/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc index 991c0843a8..f97d8ad0cd 100644 --- a/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc +++ b/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc @@ -1,10 +1,10 @@ BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4 - object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, 8, 0, 0, 0, 0x0, 888 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 4, 3, 10, 0, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, 10, 0, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_TRADER, 0, 4, 1, 3, 8, 0, 0, 0, 0x0, 888 - object_event 5, 255, 0, 4, 8, 3, 7, 0, 0, 0, 0x0, 0 - object_event 6, 254, 0, 5, 8, 3, 7, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 4, 3, 10, 0, 0, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, 10, 0, 0, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_TRADER, 0, 4, 1, 3, 8, 0, 0, 0, 0, 0x0, 888 + object_event 5, 255, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0 + object_event 6, 254, 0, 5, 8, 3, 7, 0, 0, 0, 0, 0x0, 0 BattleFrontier_BattleTowerBattleRoom2_MapEvents:: @ 853C054 map_events BattleFrontier_BattleTowerBattleRoom2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleTowerCorridor.inc b/data/maps/events/BattleFrontier_BattleTowerCorridor.inc index 1e0e493151..23f3377f37 100644 --- a/data/maps/events/BattleFrontier_BattleTowerCorridor.inc +++ b/data/maps/events/BattleFrontier_BattleTowerCorridor.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleTowerCorridor_EventObjects: @ 853B7A4 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 9, 2, 3, 9, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 9, 2, 3, 9, 0, 0, 0, 0, 0x0, 0 BattleFrontier_BattleTowerCorridor_MapEvents:: @ 853B7BC map_events BattleFrontier_BattleTowerCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc b/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc index 454e83ffb5..9dce5da52e 100644 --- a/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc +++ b/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc @@ -1,8 +1,8 @@ BattleFrontier_BattleTowerCorridor2_EventObjects: @ 853BF50 - object_event 1, 255, 0, 1, 1, 0, 8, 17, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 14, 3, 3, 7, 17, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 3, 3, 7, 17, 0, 0, 0x0, 0 - object_event 4, 254, 0, 14, 1, 0, 8, 17, 0, 0, 0x0, 0 + object_event 1, 255, 0, 1, 1, 0, 8, 1, 1, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 14, 3, 3, 7, 1, 1, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 3, 3, 7, 1, 1, 0, 0, 0x0, 0 + object_event 4, 254, 0, 14, 1, 0, 8, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattleTowerCorridor2_MapEvents:: @ 853BFB0 map_events BattleFrontier_BattleTowerCorridor2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleTowerElevator.inc b/data/maps/events/BattleFrontier_BattleTowerElevator.inc index 6ee887d943..321fc90e3d 100644 --- a/data/maps/events/BattleFrontier_BattleTowerElevator.inc +++ b/data/maps/events/BattleFrontier_BattleTowerElevator.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleTowerElevator_EventObjects: @ 853B778 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, 7, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, 7, 0, 0, 0, 0, 0x0, 0 BattleFrontier_BattleTowerElevator_MapEvents:: @ 853B790 map_events BattleFrontier_BattleTowerElevator_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleTowerLobby.inc b/data/maps/events/BattleFrontier_BattleTowerLobby.inc index 3b6c1a6f2c..86e159b635 100644 --- a/data/maps/events/BattleFrontier_BattleTowerLobby.inc +++ b/data/maps/events/BattleFrontier_BattleTowerLobby.inc @@ -1,13 +1,13 @@ BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 5, 3, 8, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 23, 5, 3, 8, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 17, 8, 3, 2, 17, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 15, 9, 3, 2, 17, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 9, 3, 10, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, 918 - object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 1, 5, 3, 8, 17, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_2B688D, 701 - object_event 7, EVENT_OBJ_GFX_TEALA, 0, 10, 5, 3, 8, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0 - object_event 8, EVENT_OBJ_GFX_TEALA, 0, 14, 5, 3, 8, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0 - object_event 9, EVENT_OBJ_GFX_TEALA, 0, 18, 5, 3, 8, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 23, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 17, 8, 3, 2, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0 + object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 15, 9, 3, 2, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0 + object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 9, 3, 10, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, 918 + object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 1, 5, 3, 8, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_2B688D, 701 + object_event 7, EVENT_OBJ_GFX_TEALA, 0, 10, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0 + object_event 8, EVENT_OBJ_GFX_TEALA, 0, 14, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0 + object_event 9, EVENT_OBJ_GFX_TEALA, 0, 18, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0 BattleFrontier_BattleTowerLobby_MapWarps: @ 853B710 warp_def 12, 9, 3, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc index 0c313dc976..0c730f37d5 100644 --- a/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc @@ -1,13 +1,13 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 853BE64 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 2, 3, 8, 17, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 2, 10, 3, 1, 17, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, 711 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 17, 11, 3, 14, 17, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, 712 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 6, 9, 3, 1, 17, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, 713 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 8, 13, 3, 1, 17, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, 714 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 10, 11, 3, 7, 17, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, 715 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 13, 10, 3, 10, 17, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, 716 - object_event 8, 246, 0, 15, 13, 3, 15, 17, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, 864 - object_event 9, 247, 0, 4, 12, 3, 10, 17, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, 865 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 2, 3, 8, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 2, 10, 3, 1, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, 711 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 17, 11, 3, 14, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, 712 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 6, 9, 3, 1, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, 713 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 8, 13, 3, 1, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, 714 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 10, 11, 3, 7, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, 715 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 13, 10, 3, 10, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, 716 + object_event 8, 246, 0, 15, 13, 3, 15, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, 864 + object_event 9, 247, 0, 4, 12, 3, 10, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, 865 BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: @ 853BF3C map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge1.inc b/data/maps/events/BattleFrontier_Lounge1.inc index fac8f78388..b6c6ecdd03 100644 --- a/data/maps/events/BattleFrontier_Lounge1.inc +++ b/data/maps/events/BattleFrontier_Lounge1.inc @@ -1,7 +1,7 @@ BattleFrontier_Lounge1_EventObjects: @ 853CFB4 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 6, 0, 10, 17, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 7, 6, 0, 2, 33, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 0, 2, 18, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 6, 0, 10, 1, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0 + object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 7, 6, 0, 2, 1, 2, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0 + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 0, 2, 2, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0 BattleFrontier_Lounge1_MapWarps: @ 853CFFC warp_def 4, 9, 0, 5, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/BattleFrontier_Lounge2.inc b/data/maps/events/BattleFrontier_Lounge2.inc index bb08de8c7c..0616573bd5 100644 --- a/data/maps/events/BattleFrontier_Lounge2.inc +++ b/data/maps/events/BattleFrontier_Lounge2.inc @@ -1,9 +1,9 @@ BattleFrontier_Lounge2_EventObjects: @ 853D11C - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 8, 4, 0, 10, 17, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0 - object_event 2, EVENT_OBJ_GFX_MANIAC, 0, 10, 4, 0, 9, 17, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 10, 3, 0, 9, 17, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0 - object_event 4, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 4, 6, 0, 2, 33, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0 - object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 10, 5, 0, 9, 17, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 8, 4, 0, 10, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0 + object_event 2, EVENT_OBJ_GFX_MANIAC, 0, 10, 4, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 10, 3, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0 + object_event 4, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 4, 6, 0, 2, 1, 2, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0 + object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 10, 5, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0 BattleFrontier_Lounge2_MapWarps: @ 853D194 warp_def 1, 7, 0, 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/events/BattleFrontier_Lounge3.inc b/data/maps/events/BattleFrontier_Lounge3.inc index 6475115acd..dbaa20fe12 100644 --- a/data/maps/events/BattleFrontier_Lounge3.inc +++ b/data/maps/events/BattleFrontier_Lounge3.inc @@ -1,9 +1,9 @@ BattleFrontier_Lounge3_EventObjects: @ 853D1B8 - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 4, 6, 0, 7, 17, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 0, 8, 17, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 5, 0, 10, 17, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 0, 9, 17, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0 - object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 6, 0, 2, 48, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 4, 6, 0, 7, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 0, 8, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 5, 0, 10, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0 + object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 6, 0, 2, 0, 3, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0 BattleFrontier_Lounge3_MapWarps: @ 853D230 warp_def 4, 9, 0, 9, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/BattleFrontier_Lounge4.inc b/data/maps/events/BattleFrontier_Lounge4.inc index 5f10cb1b8f..613adfae21 100644 --- a/data/maps/events/BattleFrontier_Lounge4.inc +++ b/data/maps/events/BattleFrontier_Lounge4.inc @@ -1,7 +1,7 @@ BattleFrontier_Lounge4_EventObjects: @ 853D24C - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 4, 0, 7, 17, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0 - object_event 2, EVENT_OBJ_GFX_COOK, 0, 6, 6, 0, 2, 17, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 0, 10, 18, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 4, 0, 7, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0 + object_event 2, EVENT_OBJ_GFX_COOK, 0, 6, 6, 0, 2, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 0, 10, 2, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0 BattleFrontier_Lounge4_MapWarps: @ 853D294 warp_def 4, 9, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/events/BattleFrontier_Lounge5.inc b/data/maps/events/BattleFrontier_Lounge5.inc index f33ceeb655..0224ae0a95 100644 --- a/data/maps/events/BattleFrontier_Lounge5.inc +++ b/data/maps/events/BattleFrontier_Lounge5.inc @@ -1,8 +1,8 @@ BattleFrontier_Lounge5_EventObjects: @ 853D2EC - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 12, 4, 4, 9, 17, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 3, 10, 17, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 0, 2, 17, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 11, 7, 0, 1, 17, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 12, 4, 4, 9, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 3, 10, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0 + object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 0, 2, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 11, 7, 0, 1, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0 BattleFrontier_Lounge5_MapWarps: @ 853D34C warp_def 1, 7, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/BattleFrontier_Lounge6.inc b/data/maps/events/BattleFrontier_Lounge6.inc index 24dca320a9..092be452b3 100644 --- a/data/maps/events/BattleFrontier_Lounge6.inc +++ b/data/maps/events/BattleFrontier_Lounge6.inc @@ -1,5 +1,5 @@ BattleFrontier_Lounge6_EventObjects: @ 853D370 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 2, 4, 0, 10, 17, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 2, 4, 0, 10, 1, 1, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0 BattleFrontier_Lounge6_MapWarps: @ 853D388 warp_def 4, 9, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/BattleFrontier_Lounge7.inc b/data/maps/events/BattleFrontier_Lounge7.inc index bccac94bd4..c5490d6c9c 100644 --- a/data/maps/events/BattleFrontier_Lounge7.inc +++ b/data/maps/events/BattleFrontier_Lounge7.inc @@ -1,8 +1,8 @@ BattleFrontier_Lounge7_EventObjects: @ 853D3A4 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 7, 0, 2, 17, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 2, 5, 0, 10, 17, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 6, 5, 0, 9, 17, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0 - object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 8, 3, 0, 9, 17, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 7, 0, 2, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 2, 5, 0, 10, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 6, 5, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0 + object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 8, 3, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0 BattleFrontier_Lounge7_MapWarps: @ 853D404 warp_def 4, 9, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/events/BattleFrontier_Lounge8.inc b/data/maps/events/BattleFrontier_Lounge8.inc index 816e077821..116cc007fa 100644 --- a/data/maps/events/BattleFrontier_Lounge8.inc +++ b/data/maps/events/BattleFrontier_Lounge8.inc @@ -1,7 +1,7 @@ BattleFrontier_Lounge8_EventObjects: @ 853D4BC - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 4, 5, 0, 2, 34, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 8, 7, 0, 9, 17, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 4, 0, 9, 17, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 4, 5, 0, 2, 2, 2, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 8, 7, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 4, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0 BattleFrontier_Lounge8_MapWarps: @ 853D504 warp_def 4, 9, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/BattleFrontier_Lounge9.inc b/data/maps/events/BattleFrontier_Lounge9.inc index 7864c31796..6500ab66a5 100644 --- a/data/maps/events/BattleFrontier_Lounge9.inc +++ b/data/maps/events/BattleFrontier_Lounge9.inc @@ -1,5 +1,5 @@ BattleFrontier_Lounge9_EventObjects: @ 853D520 - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 6, 3, 0, 1, 17, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 6, 3, 0, 1, 1, 1, 0, 0, 0x0, 0 BattleFrontier_Lounge9_MapWarps: @ 853D538 warp_def 1, 9, 0, 11, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/BattleFrontier_Mart.inc b/data/maps/events/BattleFrontier_Mart.inc index 18e37be730..669945b990 100644 --- a/data/maps/events/BattleFrontier_Mart.inc +++ b/data/maps/events/BattleFrontier_Mart.inc @@ -1,8 +1,8 @@ BattleFrontier_Mart_EventObjects: @ 853D68C - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 5, 4, 3, 10, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 5, 3, 10, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 8, 4, 3, 9, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 5, 4, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 5, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 8, 4, 3, 9, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0 BattleFrontier_Mart_MapWarps: @ 853D6EC warp_def 3, 7, 0, 4, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/events/BattleFrontier_OutsideEast.inc b/data/maps/events/BattleFrontier_OutsideEast.inc index a5772cf1a9..37fa6e7bd8 100644 --- a/data/maps/events/BattleFrontier_OutsideEast.inc +++ b/data/maps/events/BattleFrontier_OutsideEast.inc @@ -1,30 +1,30 @@ BattleFrontier_OutsideEast_EventObjects: @ 853BB10 - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 20, 17, 0, 27, 19, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 42, 15, 0, 2, 49, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 53, 6, 0, 8, 2, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0 - object_event 4, EVENT_OBJ_GFX_HEX_MANIAC, 0, 54, 16, 0, 2, 18, 0, 0, BattleFrontier_OutsideEast_EventScript_242C82, 0 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 37, 32, 0, 7, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C8B, 0 - object_event 6, EVENT_OBJ_GFX_COOK, 0, 41, 56, 3, 9, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242C94, 0 - object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 46, 0, 1, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242CBB, 0 - object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 34, 41, 0, 28, 19, 0, 0, BattleFrontier_OutsideEast_EventScript_242CE1, 0 - object_event 9, EVENT_OBJ_GFX_BOY_4, 0, 45, 47, 3, 1, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242CB2, 0 - object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 59, 35, 0, 26, 97, 0, 0, BattleFrontier_OutsideEast_EventScript_242CC4, 0 - object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 18, 40, 0, 1, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0 - object_event 12, EVENT_OBJ_GFX_MAN_1, 0, 17, 40, 0, 10, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0 - object_event 13, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 40, 56, 3, 1, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0 - object_event 14, EVENT_OBJ_GFX_SUDOWOODO, 0, 54, 62, 3, 8, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, 842 - object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 42, 34, 3, 1, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0 - object_event 16, EVENT_OBJ_GFX_GIRL_3, 0, 51, 53, 3, 2, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0 - object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 62, 18, 0, 46, 98, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0 - object_event 18, EVENT_OBJ_GFX_MAN_4, 0, 11, 21, 0, 1, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 0 - object_event 19, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 21, 0, 10, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 0 - object_event 20, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 30, 0, 2, 35, 0, 0, BattleFrontier_OutsideEast_EventScript_242DA6, 0 - object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 33, 14, 0, 7, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DAF, 0 - object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 54, 31, 0, 9, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242DB8, 0 - object_event 23, EVENT_OBJ_GFX_WOMAN_5, 0, 54, 32, 0, 7, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242DC3, 0 - object_event 24, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 58, 55, 3, 17, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE9, 0 - object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 48, 41, 0, 7, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0 - object_event 26, EVENT_OBJ_GFX_CAMPER, 0, 29, 14, 0, 7, 17, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 20, 17, 0, 27, 3, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 42, 15, 0, 2, 1, 3, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0 + object_event 3, EVENT_OBJ_GFX_HIKER, 0, 53, 6, 0, 8, 2, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0 + object_event 4, EVENT_OBJ_GFX_HEX_MANIAC, 0, 54, 16, 0, 2, 2, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C82, 0 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 37, 32, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C8B, 0 + object_event 6, EVENT_OBJ_GFX_COOK, 0, 41, 56, 3, 9, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C94, 0 + object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 46, 0, 1, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CBB, 0 + object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 34, 41, 0, 28, 3, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CE1, 0 + object_event 9, EVENT_OBJ_GFX_BOY_4, 0, 45, 47, 3, 1, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CB2, 0 + object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 59, 35, 0, 26, 1, 6, 0, 0, BattleFrontier_OutsideEast_EventScript_242CC4, 0 + object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 18, 40, 0, 1, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0 + object_event 12, EVENT_OBJ_GFX_MAN_1, 0, 17, 40, 0, 10, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0 + object_event 13, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 40, 56, 3, 1, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0 + object_event 14, EVENT_OBJ_GFX_SUDOWOODO, 0, 54, 62, 3, 8, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, 842 + object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 42, 34, 3, 1, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0 + object_event 16, EVENT_OBJ_GFX_GIRL_3, 0, 51, 53, 3, 2, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0 + object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 62, 18, 0, 46, 2, 6, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0 + object_event 18, EVENT_OBJ_GFX_MAN_4, 0, 11, 21, 0, 1, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 0 + object_event 19, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 21, 0, 10, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 0 + object_event 20, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 30, 0, 2, 3, 2, 0, 0, BattleFrontier_OutsideEast_EventScript_242DA6, 0 + object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 33, 14, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DAF, 0 + object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 54, 31, 0, 9, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DB8, 0 + object_event 23, EVENT_OBJ_GFX_WOMAN_5, 0, 54, 32, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DC3, 0 + object_event 24, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 58, 55, 3, 17, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE9, 0 + object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 48, 41, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0 + object_event 26, EVENT_OBJ_GFX_CAMPER, 0, 29, 14, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0 BattleFrontier_OutsideEast_MapWarps: @ 853BD80 warp_def 16, 14, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY diff --git a/data/maps/events/BattleFrontier_OutsideWest.inc b/data/maps/events/BattleFrontier_OutsideWest.inc index cbbd9af322..643e26e2e4 100644 --- a/data/maps/events/BattleFrontier_OutsideWest.inc +++ b/data/maps/events/BattleFrontier_OutsideWest.inc @@ -1,28 +1,28 @@ BattleFrontier_OutsideWest_EventObjects: @ 853B350 - object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 26, 38, 0, 2, 34, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 20, 70, 0, 10, 17, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 19, 68, 0, 7, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 26, 20, 0, 5, 8, 0, 0, BattleFrontier_OutsideWest_EventScript_23D68B, 0 - object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 27, 30, 0, 2, 49, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 33, 41, 0, 2, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0 - object_event 7, EVENT_OBJ_GFX_FAT_MAN, 0, 28, 43, 0, 3, 48, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 0 - object_event 8, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 20, 0, 2, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 13, 44, 0, 7, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 0 - object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 14, 44, 0, 7, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 0 - object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 23, 47, 0, 15, 34, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0 - object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 38, 27, 0, 2, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 0 - object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 45, 18, 0, 3, 49, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0 - object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 9, 47, 0, 15, 33, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 0 - object_event 15, EVENT_OBJ_GFX_LASS, 0, 35, 5, 0, 2, 18, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 0 - object_event 16, EVENT_OBJ_GFX_MAN_2, 0, 11, 66, 0, 9, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 0 - object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 31, 31, 0, 8, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 0 - object_event 18, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 48, 0, 18, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 0 - object_event 19, EVENT_OBJ_GFX_FAT_MAN, 0, 38, 22, 0, 3, 48, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 0 - object_event 20, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 9, 0, 8, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0 - object_event 21, EVENT_OBJ_GFX_BOY_1, 0, 12, 10, 0, 7, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 0 - object_event 22, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 10, 0, 23, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0 - object_event 23, EVENT_OBJ_GFX_MAN_5, 0, 8, 5, 0, 8, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0 - object_event 24, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 26, 0, 24, 17, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0 + object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 26, 38, 0, 2, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 20, 70, 0, 10, 1, 1, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 19, 68, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 26, 20, 0, 5, 8, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D68B, 0 + object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 27, 30, 0, 2, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 33, 41, 0, 2, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0 + object_event 7, EVENT_OBJ_GFX_FAT_MAN, 0, 28, 43, 0, 3, 0, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 0 + object_event 8, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 20, 0, 2, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 0 + object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 13, 44, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 0 + object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 14, 44, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 0 + object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 23, 47, 0, 15, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0 + object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 38, 27, 0, 2, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 0 + object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 45, 18, 0, 3, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0 + object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 9, 47, 0, 15, 1, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 0 + object_event 15, EVENT_OBJ_GFX_LASS, 0, 35, 5, 0, 2, 2, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 0 + object_event 16, EVENT_OBJ_GFX_MAN_2, 0, 11, 66, 0, 9, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 0 + object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 31, 31, 0, 8, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 0 + object_event 18, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 48, 0, 18, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 0 + object_event 19, EVENT_OBJ_GFX_FAT_MAN, 0, 38, 22, 0, 3, 0, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 0 + object_event 20, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 9, 0, 8, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0 + object_event 21, EVENT_OBJ_GFX_BOY_1, 0, 12, 10, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 0 + object_event 22, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 10, 0, 23, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0 + object_event 23, EVENT_OBJ_GFX_MAN_5, 0, 8, 5, 0, 8, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0 + object_event 24, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 26, 0, 24, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0 BattleFrontier_OutsideWest_MapWarps: @ 853B590 warp_def 42, 27, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY diff --git a/data/maps/events/BattleFrontier_PokemonCenter_1F.inc b/data/maps/events/BattleFrontier_PokemonCenter_1F.inc index 9566f2fe23..ba07ed15c2 100644 --- a/data/maps/events/BattleFrontier_PokemonCenter_1F.inc +++ b/data/maps/events/BattleFrontier_PokemonCenter_1F.inc @@ -1,9 +1,9 @@ BattleFrontier_PokemonCenter_1F_EventObjects: @ 853D55C - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 4, 5, 3, 14, 1, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 11, 4, 3, 8, 1, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 2, 3, 3, 9, 1, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0 - object_event 5, EVENT_OBJ_GFX_SKITTY, 0, 1, 3, 3, 10, 1, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 4, 5, 3, 14, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 11, 4, 3, 8, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 2, 3, 3, 9, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0 + object_event 5, EVENT_OBJ_GFX_SKITTY, 0, 1, 3, 3, 10, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0 BattleFrontier_PokemonCenter_1F_MapWarps: @ 853D5D4 warp_def 7, 8, 3, 12, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/BattleFrontier_PokemonCenter_2F.inc b/data/maps/events/BattleFrontier_PokemonCenter_2F.inc index 548e1a3518..bb5bb61191 100644 --- a/data/maps/events/BattleFrontier_PokemonCenter_2F.inc +++ b/data/maps/events/BattleFrontier_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ BattleFrontier_PokemonCenter_2F_EventObjects: @ 853D600 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, 8, 17, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, 8, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, 702 BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660 warp_def 1, 6, 4, 2, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F diff --git a/data/maps/events/BattleFrontier_RankingHall.inc b/data/maps/events/BattleFrontier_RankingHall.inc index 636b6c2815..239c372c6b 100644 --- a/data/maps/events/BattleFrontier_RankingHall.inc +++ b/data/maps/events/BattleFrontier_RankingHall.inc @@ -1,7 +1,7 @@ BattleFrontier_RankingHall_EventObjects: @ 853CEB8 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 24, 13, 3, 8, 17, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 4, 10, 3, 2, 17, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0 - object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 44, 11, 3, 2, 17, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 24, 13, 3, 8, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 4, 10, 3, 2, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0 + object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 44, 11, 3, 2, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0 BattleFrontier_RankingHall_MapWarps: @ 853CF00 warp_def 26, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/events/BattleFrontier_ReceptionGate.inc b/data/maps/events/BattleFrontier_ReceptionGate.inc index f73308cb91..34db359fca 100644 --- a/data/maps/events/BattleFrontier_ReceptionGate.inc +++ b/data/maps/events/BattleFrontier_ReceptionGate.inc @@ -1,9 +1,9 @@ BattleFrontier_ReceptionGate_EventObjects: @ 853D420 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 0, 10, 17, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 8, 11, 0, 9, 17, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0 - object_event 3, EVENT_OBJ_GFX_MAN_2, 0, 8, 4, 0, 9, 17, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0 - object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 4, 5, 3, 8, 17, 0, 0, 0x0, 836 - object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, 10, 17, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 0, 10, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 8, 11, 0, 9, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0 + object_event 3, EVENT_OBJ_GFX_MAN_2, 0, 8, 4, 0, 9, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0 + object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 4, 5, 3, 8, 1, 1, 0, 0, 0x0, 836 + object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, 10, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0 BattleFrontier_ReceptionGate_MapWarps: @ 853D498 warp_def 4, 13, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/events/BattleFrontier_ScottsHouse.inc b/data/maps/events/BattleFrontier_ScottsHouse.inc index 11c1666847..6e3de083ca 100644 --- a/data/maps/events/BattleFrontier_ScottsHouse.inc +++ b/data/maps/events/BattleFrontier_ScottsHouse.inc @@ -1,5 +1,5 @@ BattleFrontier_ScottsHouse_EventObjects: @ 853D2B0 - object_event 1, EVENT_OBJ_GFX_SCOTT, 0, 2, 3, 3, 1, 17, 0, 0, BattleFrontier_ScottsHouse_EventScript_2636A8, 0 + object_event 1, EVENT_OBJ_GFX_SCOTT, 0, 2, 3, 3, 1, 1, 1, 0, 0, BattleFrontier_ScottsHouse_EventScript_2636A8, 0 BattleFrontier_ScottsHouse_MapWarps: @ 853D2C8 warp_def 2, 7, 3, 5, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/events/BattlePyramidSquare01.inc b/data/maps/events/BattlePyramidSquare01.inc index 99ac3006d1..6774991526 100644 --- a/data/maps/events/BattlePyramidSquare01.inc +++ b/data/maps/events/BattlePyramidSquare01.inc @@ -1,11 +1,11 @@ BattlePyramidSquare01_EventObjects: @ 853A460 - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 3, 4, 18, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 5, 3, 4, 17, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 2, 6, 4, 16, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 6, 6, 4, 9, 17, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 1, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 3, 4, 18, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 5, 3, 4, 17, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 2, 6, 4, 16, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 6, 6, 4, 9, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 1, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare01_MapEvents:: @ 853A508 map_events BattlePyramidSquare01_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare02.inc b/data/maps/events/BattlePyramidSquare02.inc index 28242ddeda..1133979ee9 100644 --- a/data/maps/events/BattlePyramidSquare02.inc +++ b/data/maps/events/BattlePyramidSquare02.inc @@ -1,11 +1,11 @@ BattlePyramidSquare02_EventObjects: @ 853A51C - object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 2, 1, 4, 18, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 6, 4, 15, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 6, 4, 16, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 1, 4, 17, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 5, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 2, 1, 4, 18, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 6, 4, 15, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 6, 4, 16, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 1, 4, 17, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 5, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare02_MapEvents:: @ 853A5C4 map_events BattlePyramidSquare02_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare03.inc b/data/maps/events/BattlePyramidSquare03.inc index bec280de6c..95fdb77bcd 100644 --- a/data/maps/events/BattlePyramidSquare03.inc +++ b/data/maps/events/BattlePyramidSquare03.inc @@ -1,11 +1,11 @@ BattlePyramidSquare03_EventObjects: @ 853A5D8 - object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 2, 1, 4, 18, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 6, 1, 4, 17, 17, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 6, 4, 4, 15, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 3, 4, 4, 18, 17, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 7, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 2, 1, 4, 18, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 6, 1, 4, 17, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 6, 4, 4, 15, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 3, 4, 4, 18, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare03_MapEvents:: @ 853A680 map_events BattlePyramidSquare03_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare04.inc b/data/maps/events/BattlePyramidSquare04.inc index 5b517b23b6..3b19c7f09a 100644 --- a/data/maps/events/BattlePyramidSquare04.inc +++ b/data/maps/events/BattlePyramidSquare04.inc @@ -1,11 +1,11 @@ BattlePyramidSquare04_EventObjects: @ 853A694 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 2, 4, 17, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 7, 7, 4, 15, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 1, 4, 4, 18, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 6, 4, 4, 15, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 6, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 0, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 2, 4, 17, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 7, 7, 4, 15, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 1, 4, 4, 18, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 6, 4, 4, 15, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 6, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare04_MapEvents:: @ 853A73C map_events BattlePyramidSquare04_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare05.inc b/data/maps/events/BattlePyramidSquare05.inc index 7e08946d42..17f6aab606 100644 --- a/data/maps/events/BattlePyramidSquare05.inc +++ b/data/maps/events/BattlePyramidSquare05.inc @@ -1,11 +1,11 @@ BattlePyramidSquare05_EventObjects: @ 853A750 - object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 6, 4, 4, 7, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 3, 7, 4, 16, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 3, 1, 4, 8, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 6, 0, 4, 17, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 6, 4, 4, 7, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 3, 7, 4, 16, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 3, 1, 4, 8, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 6, 0, 4, 17, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare05_MapEvents:: @ 853A7F8 map_events BattlePyramidSquare05_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare06.inc b/data/maps/events/BattlePyramidSquare06.inc index 608021a71f..6ae39b52f4 100644 --- a/data/maps/events/BattlePyramidSquare06.inc +++ b/data/maps/events/BattlePyramidSquare06.inc @@ -1,11 +1,11 @@ BattlePyramidSquare06_EventObjects: @ 853A80C - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 5, 2, 4, 17, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 2, 5, 4, 16, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 5, 5, 4, 15, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 4, 18, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 5, 2, 4, 17, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 2, 5, 4, 16, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 5, 5, 4, 15, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 4, 18, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare06_MapEvents:: @ 853A8B4 map_events BattlePyramidSquare06_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare07.inc b/data/maps/events/BattlePyramidSquare07.inc index 79e6065a84..788c5e40cd 100644 --- a/data/maps/events/BattlePyramidSquare07.inc +++ b/data/maps/events/BattlePyramidSquare07.inc @@ -1,11 +1,11 @@ BattlePyramidSquare07_EventObjects: @ 853A8C8 - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 4, 10, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 4, 0, 4, 17, 17, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 6, 0, 4, 8, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 4, 4, 4, 15, 17, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 4, 10, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 4, 0, 4, 17, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 6, 0, 4, 8, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 4, 4, 4, 15, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare07_MapEvents:: @ 853A970 map_events BattlePyramidSquare07_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare08.inc b/data/maps/events/BattlePyramidSquare08.inc index 6d286a0030..780fab9ede 100644 --- a/data/maps/events/BattlePyramidSquare08.inc +++ b/data/maps/events/BattlePyramidSquare08.inc @@ -1,11 +1,11 @@ BattlePyramidSquare08_EventObjects: @ 853A984 - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 2, 4, 18, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 5, 4, 15, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 5, 4, 16, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 2, 4, 15, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 2, 4, 18, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 5, 4, 15, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 5, 4, 16, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 2, 4, 15, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare08_MapEvents:: @ 853AA2C map_events BattlePyramidSquare08_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare09.inc b/data/maps/events/BattlePyramidSquare09.inc index c8c99f4b9d..569059af5a 100644 --- a/data/maps/events/BattlePyramidSquare09.inc +++ b/data/maps/events/BattlePyramidSquare09.inc @@ -1,11 +1,11 @@ BattlePyramidSquare09_EventObjects: @ 853AA40 - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 3, 0, 4, 8, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 4, 4, 15, 17, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 0, 4, 17, 17, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 3, 5, 4, 15, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 6, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 3, 0, 4, 8, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 4, 4, 15, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 0, 4, 17, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 3, 5, 4, 15, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 6, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare09_MapEvents:: @ 853AAE8 map_events BattlePyramidSquare09_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare10.inc b/data/maps/events/BattlePyramidSquare10.inc index 3f0c6b6aaa..ae3c4f88e4 100644 --- a/data/maps/events/BattlePyramidSquare10.inc +++ b/data/maps/events/BattlePyramidSquare10.inc @@ -1,11 +1,11 @@ BattlePyramidSquare10_EventObjects: @ 853AAFC - object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 3, 0, 4, 17, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 3, 4, 10, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 6, 5, 4, 9, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 4, 10, 17, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 3, 0, 4, 17, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 3, 4, 10, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 6, 5, 4, 9, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 4, 10, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare10_MapEvents:: @ 853ABA4 map_events BattlePyramidSquare10_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare11.inc b/data/maps/events/BattlePyramidSquare11.inc index e4cec618d5..0389ee141a 100644 --- a/data/maps/events/BattlePyramidSquare11.inc +++ b/data/maps/events/BattlePyramidSquare11.inc @@ -1,11 +1,11 @@ BattlePyramidSquare11_EventObjects: @ 853ABB8 - object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 3, 2, 4, 8, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 3, 6, 4, 14, 17, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 6, 4, 4, 8, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 6, 7, 4, 7, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 2, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 5, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 3, 2, 4, 8, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 3, 6, 4, 14, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 6, 4, 4, 8, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 6, 7, 4, 7, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 5, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare11_MapEvents:: @ 853AC60 map_events BattlePyramidSquare11_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare12.inc b/data/maps/events/BattlePyramidSquare12.inc index aadd2f71fa..db27c6c64a 100644 --- a/data/maps/events/BattlePyramidSquare12.inc +++ b/data/maps/events/BattlePyramidSquare12.inc @@ -1,11 +1,11 @@ BattlePyramidSquare12_EventObjects: @ 853AC74 - object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 7, 5, 4, 9, 17, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 5, 4, 10, 17, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 0, 4, 8, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 3, 4, 7, 17, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 2, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 7, 5, 4, 9, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 5, 4, 10, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 0, 4, 8, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 3, 4, 7, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare12_MapEvents:: @ 853AD1C map_events BattlePyramidSquare12_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare13.inc b/data/maps/events/BattlePyramidSquare13.inc index be42aa8d25..12ac8ffe7e 100644 --- a/data/maps/events/BattlePyramidSquare13.inc +++ b/data/maps/events/BattlePyramidSquare13.inc @@ -1,11 +1,11 @@ BattlePyramidSquare13_EventObjects: @ 853AD30 - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 1, 4, 8, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 6, 4, 7, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 1, 4, 8, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 6, 4, 7, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 1, 4, 8, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 6, 4, 7, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 1, 4, 8, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 6, 4, 7, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare13_MapEvents:: @ 853ADD8 map_events BattlePyramidSquare13_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare14.inc b/data/maps/events/BattlePyramidSquare14.inc index 656685c608..c63fabee38 100644 --- a/data/maps/events/BattlePyramidSquare14.inc +++ b/data/maps/events/BattlePyramidSquare14.inc @@ -1,11 +1,11 @@ BattlePyramidSquare14_EventObjects: @ 853ADEC - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 1, 4, 17, 17, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 1, 4, 18, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 5, 4, 15, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 4, 16, 17, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 1, 4, 17, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 1, 4, 18, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 5, 4, 15, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 4, 16, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare14_MapEvents:: @ 853AE94 map_events BattlePyramidSquare14_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare15.inc b/data/maps/events/BattlePyramidSquare15.inc index ddf3bf62f6..f2332f18bd 100644 --- a/data/maps/events/BattlePyramidSquare15.inc +++ b/data/maps/events/BattlePyramidSquare15.inc @@ -1,11 +1,11 @@ BattlePyramidSquare15_EventObjects: @ 853AEA8 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 5, 4, 16, 17, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 1, 4, 18, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 4, 15, 17, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 0, 4, 17, 17, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 5, 4, 16, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 1, 4, 18, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 4, 15, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 0, 4, 17, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare15_MapEvents:: @ 853AF50 map_events BattlePyramidSquare15_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare16.inc b/data/maps/events/BattlePyramidSquare16.inc index d402e98b92..38d398b5b5 100644 --- a/data/maps/events/BattlePyramidSquare16.inc +++ b/data/maps/events/BattlePyramidSquare16.inc @@ -1,11 +1,11 @@ BattlePyramidSquare16_EventObjects: @ 853AF64 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 16, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 0, 0, 18, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 7, 4, 15, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 0, 4, 17, 17, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 2, 4, 1, 17, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 16, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 0, 0, 18, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 7, 4, 15, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 0, 4, 17, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare16_MapEvents:: @ 853B00C map_events BattlePyramidSquare16_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BirthIsland_Exterior.inc b/data/maps/events/BirthIsland_Exterior.inc index 06af73f75d..86f4d43cb5 100644 --- a/data/maps/events/BirthIsland_Exterior.inc +++ b/data/maps/events/BirthIsland_Exterior.inc @@ -1,6 +1,6 @@ BirthIsland_Exterior_EventObjects: @ 853D7DC - object_event 1, EVENT_OBJ_GFX_DEOXYS_TRIANGLE, 0, 15, 12, 3, 8, 17, 0, 0, BirthIsland_Exterior_EventScript_267F83, 764 - object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 15, 3, 0, 8, 17, 0, 0, 0x0, 763 + object_event 1, EVENT_OBJ_GFX_DEOXYS_TRIANGLE, 0, 15, 12, 3, 8, 1, 1, 0, 0, BirthIsland_Exterior_EventScript_267F83, 764 + object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 15, 3, 0, 8, 1, 1, 0, 0, 0x0, 763 BirthIsland_Exterior_MapWarps: @ 853D80C warp_def 15, 24, 0, 0, MAP_BIRTH_ISLAND_HARBOR diff --git a/data/maps/events/BirthIsland_Harbor.inc b/data/maps/events/BirthIsland_Harbor.inc index f10f53a561..f5c38358db 100644 --- a/data/maps/events/BirthIsland_Harbor.inc +++ b/data/maps/events/BirthIsland_Harbor.inc @@ -1,6 +1,6 @@ BirthIsland_Harbor_EventObjects: @ 853D828 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, 7, 17, 0, 0, BirthIsland_Harbor_EventScript_26805D, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, 10, 17, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, 7, 1, 1, 0, 0, BirthIsland_Harbor_EventScript_26805D, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, 10, 1, 1, 0, 0, 0x0, 0 BirthIsland_Harbor_MapWarps: @ 853D858 warp_def 8, 2, 0, 0, MAP_BIRTH_ISLAND_EXTERIOR diff --git a/data/maps/events/CaveOfOrigin_B1F.inc b/data/maps/events/CaveOfOrigin_B1F.inc index 5fc4bb914e..72a2c62104 100644 --- a/data/maps/events/CaveOfOrigin_B1F.inc +++ b/data/maps/events/CaveOfOrigin_B1F.inc @@ -1,5 +1,5 @@ CaveOfOrigin_B1F_EventObjects: @ 8535DD0 - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 9, 13, 3, 7, 17, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, 820 + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 9, 13, 3, 7, 1, 1, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, 820 CaveOfOrigin_B1F_MapWarps: @ 8535DE8 warp_def 9, 3, 3, 1, MAP_CAVE_OF_ORIGIN_1F diff --git a/data/maps/events/DesertRuins.inc b/data/maps/events/DesertRuins.inc index b0d3b4ddf2..b7ccd35b02 100644 --- a/data/maps/events/DesertRuins.inc +++ b/data/maps/events/DesertRuins.inc @@ -1,5 +1,5 @@ DesertRuins_EventObjects: @ 8534354 - object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, 8, 0, 0, 0, DesertRuins_EventScript_22DA02, 935 + object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, 8, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, 935 DesertRuins_MapWarps: @ 853436C warp_def 8, 29, 3, 1, MAP_ROUTE111 diff --git a/data/maps/events/DesertUnderpass.inc b/data/maps/events/DesertUnderpass.inc index ade5f063a3..05fb939a04 100644 --- a/data/maps/events/DesertUnderpass.inc +++ b/data/maps/events/DesertUnderpass.inc @@ -1,5 +1,5 @@ DesertUnderpass_EventObjects: @ 85376D4 - object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 132, 10, 0, 8, 17, 0, 0, DesertUnderpass_EventScript_23AF41, 874 + object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 132, 10, 0, 8, 1, 1, 0, 0, DesertUnderpass_EventScript_23AF41, 874 DesertUnderpass_MapWarps: @ 85376EC warp_def 10, 12, 0, 2, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL diff --git a/data/maps/events/DewfordTown.inc b/data/maps/events/DewfordTown.inc index 2d62e70104..c96b4c95e8 100644 --- a/data/maps/events/DewfordTown.inc +++ b/data/maps/events/DewfordTown.inc @@ -1,9 +1,9 @@ DewfordTown_EventObjects: @ 8527964 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 12, 3, 5, 1, 0, 0, DewfordTown_EventScript_1E95B1, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 9, 3, 9, 16, 0, 3, DewfordTown_EventScript_1E9511, 740 - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 14, 3, 5, 1, 0, 0, DewfordTown_EventScript_1E95D5, 0 - object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, 8, 0, 0, 0, 0x0, 743 - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 6, 3, 1, 0, 0, 0, DewfordTown_EventScript_1E9922, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 12, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 9, 3, 9, 0, 1, 0, 3, DewfordTown_EventScript_1E9511, 740 + object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 14, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0 + object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, 8, 0, 0, 0, 0, 0x0, 743 + object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 6, 3, 1, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0 DewfordTown_MapWarps: @ 85279DC warp_def 3, 3, 0, 0, MAP_DEWFORD_TOWN_HALL diff --git a/data/maps/events/DewfordTown_Gym.inc b/data/maps/events/DewfordTown_Gym.inc index c922f9c3ad..11f5d5a920 100644 --- a/data/maps/events/DewfordTown_Gym.inc +++ b/data/maps/events/DewfordTown_Gym.inc @@ -1,12 +1,12 @@ DewfordTown_Gym_EventObjects: @ 852DB34 - object_event 1, EVENT_OBJ_GFX_BRAWLY, 0, 4, 3, 0, 8, 0, 0, 0, DewfordTown_Gym_EventScript_1FC7C2, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 18, 0, 7, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8B7, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 15, 3, 3, 8, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8D9, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 12, 25, 3, 7, 0, 1, 2, DewfordTown_Gym_EventScript_1FC8FB, 0 - object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 5, 24, 3, 8, 0, 0, 0, DewfordTown_Gym_EventScript_1FC983, 0 - object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 8, 1, 10, 17, 1, 3, DewfordTown_Gym_EventScript_1FC93F, 0 - object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 16, 9, 3, 8, 17, 1, 3, DewfordTown_Gym_EventScript_1FC961, 0 - object_event 8, EVENT_OBJ_GFX_SAILOR, 0, 14, 12, 1, 10, 17, 1, 2, DewfordTown_Gym_EventScript_1FC91D, 0 + object_event 1, EVENT_OBJ_GFX_BRAWLY, 0, 4, 3, 0, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC7C2, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 18, 0, 7, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8B7, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 15, 3, 3, 8, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8D9, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 12, 25, 3, 7, 0, 0, 1, 2, DewfordTown_Gym_EventScript_1FC8FB, 0 + object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 5, 24, 3, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC983, 0 + object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 8, 1, 10, 1, 1, 1, 3, DewfordTown_Gym_EventScript_1FC93F, 0 + object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 16, 9, 3, 8, 1, 1, 1, 3, DewfordTown_Gym_EventScript_1FC961, 0 + object_event 8, EVENT_OBJ_GFX_SAILOR, 0, 14, 12, 1, 10, 1, 1, 1, 2, DewfordTown_Gym_EventScript_1FC91D, 0 DewfordTown_Gym_MapWarps: @ 852DBF4 warp_def 5, 27, 0, 2, MAP_DEWFORD_TOWN diff --git a/data/maps/events/DewfordTown_Hall.inc b/data/maps/events/DewfordTown_Hall.inc index deb53eba5e..e12a02a3c6 100644 --- a/data/maps/events/DewfordTown_Hall.inc +++ b/data/maps/events/DewfordTown_Hall.inc @@ -1,13 +1,13 @@ DewfordTown_Hall_EventObjects: @ 852DC48 - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 4, 6, 0, 7, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4D0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 1, 5, 0, 10, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4F9, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 5, 4, 0, 9, 0, 0, 0, DewfordTown_Hall_EventScript_1FD50A, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 0, 7, 0, 0, 0, DewfordTown_Hall_EventScript_1FD547, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 2, 3, 7, 0, 0, 0, DewfordTown_Hall_EventScript_1FD563, 0 - object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 14, 7, 0, 5, 1, 0, 0, DewfordTown_Hall_EventScript_1FD57F, 0 - object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 3, 3, 10, 0, 0, 0, DewfordTown_Hall_EventScript_1FD62F, 0 - object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 3, 3, 9, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, 5, 1, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, 940 + object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 4, 6, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4D0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 1, 5, 0, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4F9, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 5, 4, 0, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD50A, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD547, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 2, 3, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD563, 0 + object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 14, 7, 0, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD57F, 0 + object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 3, 3, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD62F, 0 + object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 3, 3, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0 + object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, 940 DewfordTown_Hall_MapWarps: @ 852DD20 warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN diff --git a/data/maps/events/DewfordTown_House1.inc b/data/maps/events/DewfordTown_House1.inc index 9bed65eba3..849bb0244f 100644 --- a/data/maps/events/DewfordTown_House1.inc +++ b/data/maps/events/DewfordTown_House1.inc @@ -1,7 +1,7 @@ DewfordTown_House1_EventObjects: @ 852D9C8 - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 3, 3, 9, 0, 0, 0, DewfordTown_House1_EventScript_1FC3D7, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 3, 3, 3, 10, 0, 0, 0, DewfordTown_House1_EventScript_1FC3CE, 0 - object_event 3, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 2, 3, 8, 19, 0, 0, DewfordTown_House1_EventScript_1FC3E0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 3, 3, 9, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3D7, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 3, 3, 3, 10, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3CE, 0 + object_event 3, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 2, 3, 8, 3, 1, 0, 0, DewfordTown_House1_EventScript_1FC3E0, 0 DewfordTown_House1_MapWarps: @ 852DA10 warp_def 3, 7, 0, 3, MAP_DEWFORD_TOWN diff --git a/data/maps/events/DewfordTown_House2.inc b/data/maps/events/DewfordTown_House2.inc index 13fa5d0cf1..8aec9176bf 100644 --- a/data/maps/events/DewfordTown_House2.inc +++ b/data/maps/events/DewfordTown_House2.inc @@ -1,6 +1,6 @@ DewfordTown_House2_EventObjects: @ 852DD5C - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 6, 5, 3, 10, 0, 0, 0, DewfordTown_House2_EventScript_1FE22E, 0 - object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 2, 3, 3, 1, 0, 0, 0, DewfordTown_House2_EventScript_1FE271, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 6, 5, 3, 10, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE22E, 0 + object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 2, 3, 3, 1, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE271, 0 DewfordTown_House2_MapWarps: @ 852DD8C warp_def 3, 8, 0, 4, MAP_DEWFORD_TOWN diff --git a/data/maps/events/DewfordTown_PokemonCenter_1F.inc b/data/maps/events/DewfordTown_PokemonCenter_1F.inc index c6e4d09c6e..aad05249cd 100644 --- a/data/maps/events/DewfordTown_PokemonCenter_1F.inc +++ b/data/maps/events/DewfordTown_PokemonCenter_1F.inc @@ -1,7 +1,7 @@ DewfordTown_PokemonCenter_1F_EventObjects: @ 852DA34 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC537, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 6, 3, 10, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC545, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 0, 5, 18, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC54E, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC537, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 6, 3, 10, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC545, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 0, 5, 2, 1, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC54E, 0 DewfordTown_PokemonCenter_1F_MapWarps: @ 852DA7C warp_def 7, 8, 3, 1, MAP_DEWFORD_TOWN diff --git a/data/maps/events/DewfordTown_PokemonCenter_2F.inc b/data/maps/events/DewfordTown_PokemonCenter_2F.inc index 2c2b2c3a2a..9c739974b2 100644 --- a/data/maps/events/DewfordTown_PokemonCenter_2F.inc +++ b/data/maps/events/DewfordTown_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ DewfordTown_PokemonCenter_2F_EventObjects: @ 852DAA8 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, 702 DewfordTown_PokemonCenter_2F_MapWarps: @ 852DB08 warp_def 1, 6, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.inc b/data/maps/events/EverGrandeCity_ChampionsRoom.inc index 1fe09d0433..6226fe527c 100644 --- a/data/maps/events/EverGrandeCity_ChampionsRoom.inc +++ b/data/maps/events/EverGrandeCity_ChampionsRoom.inc @@ -1,7 +1,7 @@ EverGrandeCity_ChampionsRoom_EventObjects: @ 8533700 - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 5, 3, 8, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 6, 12, 3, 7, 0, 0, 0, 0x0, 920 - object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, 7, 0, 0, 0, 0x0, 921 + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 5, 3, 8, 0, 0, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 920 + object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 921 EverGrandeCity_ChampionsRoom_MapWarps: @ 8533748 warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR4 diff --git a/data/maps/events/EverGrandeCity_DrakesRoom.inc b/data/maps/events/EverGrandeCity_DrakesRoom.inc index 2a9d327a00..56eda43748 100644 --- a/data/maps/events/EverGrandeCity_DrakesRoom.inc +++ b/data/maps/events/EverGrandeCity_DrakesRoom.inc @@ -1,5 +1,5 @@ EverGrandeCity_DrakesRoom_EventObjects: @ 85336C4 - object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 6, 5, 3, 8, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0 + object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0 EverGrandeCity_DrakesRoom_MapWarps: @ 85336DC warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR3 diff --git a/data/maps/events/EverGrandeCity_GlaciasRoom.inc b/data/maps/events/EverGrandeCity_GlaciasRoom.inc index 5e90b92948..c8d85fd988 100644 --- a/data/maps/events/EverGrandeCity_GlaciasRoom.inc +++ b/data/maps/events/EverGrandeCity_GlaciasRoom.inc @@ -1,5 +1,5 @@ EverGrandeCity_GlaciasRoom_EventObjects: @ 8533688 - object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 6, 5, 3, 8, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0 + object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0 EverGrandeCity_GlaciasRoom_MapWarps: @ 85336A0 warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR2 diff --git a/data/maps/events/EverGrandeCity_HallOfFame.inc b/data/maps/events/EverGrandeCity_HallOfFame.inc index 6951814ae3..50fc7fbdc1 100644 --- a/data/maps/events/EverGrandeCity_HallOfFame.inc +++ b/data/maps/events/EverGrandeCity_HallOfFame.inc @@ -1,5 +1,5 @@ EverGrandeCity_HallOfFame_EventObjects: @ 85338FC - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 16, 3, 7, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 16, 3, 7, 0, 0, 0, 0, 0x0, 0 EverGrandeCity_HallOfFame_MapWarps: @ 8533914 warp_def 7, 11, 3, 1, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM diff --git a/data/maps/events/EverGrandeCity_PhoebesRoom.inc b/data/maps/events/EverGrandeCity_PhoebesRoom.inc index 91a85ca54a..c9b5ef7fd2 100644 --- a/data/maps/events/EverGrandeCity_PhoebesRoom.inc +++ b/data/maps/events/EverGrandeCity_PhoebesRoom.inc @@ -1,5 +1,5 @@ EverGrandeCity_PhoebesRoom_EventObjects: @ 853364C - object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 6, 5, 3, 8, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0 + object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0 EverGrandeCity_PhoebesRoom_MapWarps: @ 8533664 warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR1 diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc index 5cb55a34a6..1f7e260469 100644 --- a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ EverGrandeCity_PokemonCenter_1F_EventObjects: @ 8533930 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, 8, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 7, 3, 10, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0 - object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 9, 4, 3, 7, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, 793 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 7, 3, 10, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0 + object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 9, 4, 3, 7, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, 793 EverGrandeCity_PokemonCenter_1F_MapWarps: @ 8533990 warp_def 7, 8, 3, 1, MAP_EVER_GRANDE_CITY diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc index 09117ab152..98671f414d 100644 --- a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc +++ b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ EverGrandeCity_PokemonCenter_2F_EventObjects: @ 85339BC - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, 702 EverGrandeCity_PokemonCenter_2F_MapWarps: @ 8533A1C warp_def 1, 6, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc b/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc index 22e40d2409..536dbf934b 100644 --- a/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc +++ b/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc @@ -1,8 +1,8 @@ EverGrandeCity_PokemonLeague_1F_EventObjects: @ 8533860 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 3, 2, 3, 8, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295FC, 0 - object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 16, 2, 3, 8, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_22960A, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 2, 3, 8, 17, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 11, 2, 3, 8, 17, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 3, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295FC, 0 + object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 16, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_22960A, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 2, 3, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 11, 2, 3, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0 EverGrandeCity_PokemonLeague_1F_MapWarps: @ 85338C0 warp_def 9, 11, 3, 0, MAP_EVER_GRANDE_CITY diff --git a/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc b/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc index 8900d7f8e0..a09e8ed31d 100644 --- a/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc +++ b/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc @@ -1,8 +1,8 @@ EverGrandeCity_PokemonLeague_2F_EventObjects: @ 8533A48 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, 8, 17, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, 702 EverGrandeCity_PokemonLeague_2F_MapWarps: @ 8533AA8 warp_def 1, 6, 4, 4, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.inc b/data/maps/events/EverGrandeCity_SidneysRoom.inc index 3547e13498..1823af7cd5 100644 --- a/data/maps/events/EverGrandeCity_SidneysRoom.inc +++ b/data/maps/events/EverGrandeCity_SidneysRoom.inc @@ -1,5 +1,5 @@ EverGrandeCity_SidneysRoom_EventObjects: @ 8533610 - object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 6, 5, 3, 8, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0 + object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0 EverGrandeCity_SidneysRoom_MapWarps: @ 8533628 warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR5 diff --git a/data/maps/events/FallarborTown.inc b/data/maps/events/FallarborTown.inc index 8d90f004e4..91a98cc289 100644 --- a/data/maps/events/FallarborTown.inc +++ b/data/maps/events/FallarborTown.inc @@ -1,8 +1,8 @@ FallarborTown_EventObjects: @ 8527BE0 - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, 8, 16, 0, 0, FallarborTown_EventScript_1EB22B, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 9, 3, 5, 1, 0, 0, FallarborTown_EventScript_1EB20C, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, 3, 17, 0, 0, FallarborTown_EventScript_1EB234, 0 - object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, 1, 1, 0, 0, FallarborTown_EventScript_1EB23D, 907 + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, 8, 0, 1, 0, 0, FallarborTown_EventScript_1EB22B, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 9, 3, 5, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, 3, 1, 1, 0, 0, FallarborTown_EventScript_1EB234, 0 + object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, 1, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, 907 FallarborTown_MapWarps: @ 8527C40 warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART diff --git a/data/maps/events/FallarborTown_BattleTentBattleRoom.inc b/data/maps/events/FallarborTown_BattleTentBattleRoom.inc index b1f7eb6dbb..c4e35ebbbe 100644 --- a/data/maps/events/FallarborTown_BattleTentBattleRoom.inc +++ b/data/maps/events/FallarborTown_BattleTentBattleRoom.inc @@ -1,7 +1,7 @@ FallarborTown_BattleTentBattleRoom_EventObjects: @ 852E444 - object_event 1, EVENT_OBJ_GFX_TRADER, 0, 4, 8, 3, 7, 17, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 2, 0, 8, 17, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, 8, 17, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_TRADER, 0, 4, 8, 3, 7, 1, 1, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 2, 0, 8, 1, 1, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, 8, 1, 1, 0, 0, 0x0, 0 FallarborTown_BattleTentBattleRoom_MapEvents:: @ 852E48C map_events FallarborTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_BattleTentCorridor.inc b/data/maps/events/FallarborTown_BattleTentCorridor.inc index 08762f2675..471ca66a37 100644 --- a/data/maps/events/FallarborTown_BattleTentCorridor.inc +++ b/data/maps/events/FallarborTown_BattleTentCorridor.inc @@ -1,5 +1,5 @@ FallarborTown_BattleTentCorridor_EventObjects: @ 852E418 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 6, 3, 7, 17, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 6, 3, 7, 1, 1, 0, 0, 0x0, 0 FallarborTown_BattleTentCorridor_MapEvents:: @ 852E430 map_events FallarborTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_BattleTentLobby.inc b/data/maps/events/FallarborTown_BattleTentLobby.inc index d672c382a1..570287ae35 100644 --- a/data/maps/events/FallarborTown_BattleTentLobby.inc +++ b/data/maps/events/FallarborTown_BattleTentLobby.inc @@ -1,9 +1,9 @@ FallarborTown_BattleTentLobby_EventObjects: @ 852E370 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 3, 8, 17, 0, 0, FallarborTown_BattleTentLobby_EventScript_200001, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 1, 5, 3, 5, 17, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 12, 6, 3, 3, 17, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 9, 3, 8, 17, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0 - object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 7, 3, 10, 17, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, 767 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 3, 8, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200001, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 1, 5, 3, 5, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 12, 6, 3, 3, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 9, 3, 8, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0 + object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 7, 3, 10, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, 767 FallarborTown_BattleTentLobby_MapWarps: @ 852E3E8 warp_def 6, 9, 0, 1, MAP_FALLARBOR_TOWN diff --git a/data/maps/events/FallarborTown_House1.inc b/data/maps/events/FallarborTown_House1.inc index d5eea14e38..5c2323b74a 100644 --- a/data/maps/events/FallarborTown_House1.inc +++ b/data/maps/events/FallarborTown_House1.inc @@ -1,6 +1,6 @@ FallarborTown_House1_EventObjects: @ 852E5B8 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, 2, 17, 0, 0, FallarborTown_House1_EventScript_200F13, 928 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 6, 3, 5, 1, 0, 0, FallarborTown_House1_EventScript_200FBC, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, 2, 1, 1, 0, 0, FallarborTown_House1_EventScript_200F13, 928 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 6, 3, 5, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0 FallarborTown_House1_MapWarps: @ 852E5E8 warp_def 3, 8, 0, 3, MAP_FALLARBOR_TOWN diff --git a/data/maps/events/FallarborTown_House2.inc b/data/maps/events/FallarborTown_House2.inc index cb3094441e..342e2e60b2 100644 --- a/data/maps/events/FallarborTown_House2.inc +++ b/data/maps/events/FallarborTown_House2.inc @@ -1,5 +1,5 @@ FallarborTown_House2_EventObjects: @ 852E60C - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 3, 8, 0, 0, 0, FallarborTown_House2_EventScript_201383, 0 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 3, 8, 0, 0, 0, 0, FallarborTown_House2_EventScript_201383, 0 FallarborTown_House2_MapWarps: @ 852E624 warp_def 3, 7, 0, 4, MAP_FALLARBOR_TOWN diff --git a/data/maps/events/FallarborTown_Mart.inc b/data/maps/events/FallarborTown_Mart.inc index e44e4098f3..6d7188c6a2 100644 --- a/data/maps/events/FallarborTown_Mart.inc +++ b/data/maps/events/FallarborTown_Mart.inc @@ -1,9 +1,9 @@ FallarborTown_Mart_EventObjects: @ 852E2D4 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCBF, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 3, 3, 2, 17, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, 8, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCFD, 0 - object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 2, 5, 3, 1, 17, 0, 0, FallarborTown_Mart_EventScript_1FFD06, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 2, 3, 7, 0, 0, 0, FallarborTown_Mart_EventScript_2C80B6, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCBF, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 3, 3, 2, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, 8, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCFD, 0 + object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 2, 5, 3, 1, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFD06, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 2, 3, 7, 0, 0, 0, 0, FallarborTown_Mart_EventScript_2C80B6, 0 FallarborTown_Mart_MapWarps: @ 852E34C warp_def 3, 7, 0, 0, MAP_FALLARBOR_TOWN diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.inc b/data/maps/events/FallarborTown_PokemonCenter_1F.inc index d8113295f0..3681909140 100644 --- a/data/maps/events/FallarborTown_PokemonCenter_1F.inc +++ b/data/maps/events/FallarborTown_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ FallarborTown_PokemonCenter_1F_EventObjects: @ 852E4A0 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, 10, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 3, 3, 8, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 2, 3, 7, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, 871 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, 10, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 2, 3, 7, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, 871 FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500 warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN diff --git a/data/maps/events/FallarborTown_PokemonCenter_2F.inc b/data/maps/events/FallarborTown_PokemonCenter_2F.inc index 513c483fdb..9162a28226 100644 --- a/data/maps/events/FallarborTown_PokemonCenter_2F.inc +++ b/data/maps/events/FallarborTown_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ FallarborTown_PokemonCenter_2F_EventObjects: @ 852E52C - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, 702 FallarborTown_PokemonCenter_2F_MapWarps: @ 852E58C warp_def 1, 6, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/events/FarawayIsland_Entrance.inc b/data/maps/events/FarawayIsland_Entrance.inc index ec06d4312e..8af15533b2 100644 --- a/data/maps/events/FarawayIsland_Entrance.inc +++ b/data/maps/events/FarawayIsland_Entrance.inc @@ -1,6 +1,6 @@ FarawayIsland_Entrance_EventObjects: @ 853D710 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 39, 3, 7, 0, 0, 0, FarawayIsland_Entrance_EventScript_267CA2, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 41, 1, 10, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 39, 3, 7, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267CA2, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 41, 1, 10, 0, 0, 0, 0, 0x0, 0 FarawayIsland_Entrance_MapWarps: @ 853D740 warp_def 22, 7, 3, 0, MAP_FARAWAY_ISLAND_INTERIOR diff --git a/data/maps/events/FarawayIsland_Interior.inc b/data/maps/events/FarawayIsland_Interior.inc index fa8f709cc8..c2cd25b404 100644 --- a/data/maps/events/FarawayIsland_Interior.inc +++ b/data/maps/events/FarawayIsland_Interior.inc @@ -1,5 +1,5 @@ FarawayIsland_Interior_EventObjects: @ 853D7A0 - object_event 1, EVENT_OBJ_GFX_MEW, 0, 13, 17, 3, 60, 255, 0, 1, FarawayIsland_Interior_EventScript_267DF2, 718 + object_event 1, EVENT_OBJ_GFX_MEW, 0, 13, 17, 3, 60, 15, 15, 0, 1, FarawayIsland_Interior_EventScript_267DF2, 718 FarawayIsland_Interior_MapWarps: @ 853D7B8 warp_def 12, 19, 0, 0, MAP_FARAWAY_ISLAND_ENTRANCE diff --git a/data/maps/events/FieryPath.inc b/data/maps/events/FieryPath.inc index c37b27057b..37fecaf5ea 100644 --- a/data/maps/events/FieryPath.inc +++ b/data/maps/events/FieryPath.inc @@ -1,12 +1,12 @@ FieryPath_EventObjects: @ 8534C80 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, 1, 17, 0, 0, FieryPath_EventScript_29119E, 1091 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, 1, 0, 0, 0, FieryPath_EventScript_2908BA, 17 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, 1, 0, 0, 0, FieryPath_EventScript_2908BA, 18 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, 1, 0, 0, 0, FieryPath_EventScript_2908BA, 19 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, 1, 0, 0, 0, FieryPath_EventScript_2908BA, 20 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, 1, 0, 0, 0, FieryPath_EventScript_2908BA, 21 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, 1, 0, 0, 0, FieryPath_EventScript_2908BA, 22 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, 1, 17, 0, 0, FieryPath_EventScript_291191, 1111 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, 1, 1, 1, 0, 0, FieryPath_EventScript_29119E, 1091 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 17 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 18 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 19 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 20 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 21 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 22 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, 1, 1, 1, 0, 0, FieryPath_EventScript_291191, 1111 FieryPath_MapWarps: @ 8534D40 warp_def 26, 36, 3, 4, MAP_ROUTE112 diff --git a/data/maps/events/FortreeCity.inc b/data/maps/events/FortreeCity.inc index 262b6c6a7a..c943e230d7 100644 --- a/data/maps/events/FortreeCity.inc +++ b/data/maps/events/FortreeCity.inc @@ -1,11 +1,11 @@ FortreeCity_EventObjects: @ 8526B9C - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 31, 3, 4, 1, 0, 0, 0, FortreeCity_EventScript_1E25B6, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 32, 16, 3, 2, 17, 0, 0, FortreeCity_EventScript_1E25DE, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 32, 10, 3, 3, 16, 0, 0, FortreeCity_EventScript_1E25BF, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 11, 14, 4, 1, 0, 0, 0, FortreeCity_EventScript_1E25F0, 0 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 8, 10, 3, 1, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0 - object_event 6, EVENT_OBJ_GFX_BOY_5, 0, 9, 16, 3, 8, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0 - object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, 76, 17, 0, 0, FortreeCity_EventScript_1E2614, 969 + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 31, 3, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25B6, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 32, 16, 3, 2, 1, 1, 0, 0, FortreeCity_EventScript_1E25DE, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 32, 10, 3, 3, 0, 1, 0, 0, FortreeCity_EventScript_1E25BF, 0 + object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 11, 14, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25F0, 0 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 8, 10, 3, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0 + object_event 6, EVENT_OBJ_GFX_BOY_5, 0, 9, 16, 3, 8, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0 + object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, 76, 1, 1, 0, 0, FortreeCity_EventScript_1E2614, 969 FortreeCity_MapWarps: @ 8526C44 warp_def 5, 6, 0, 0, MAP_FORTREE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/FortreeCity_DecorationShop.inc b/data/maps/events/FortreeCity_DecorationShop.inc index a956d1b207..fe85e94d64 100644 --- a/data/maps/events/FortreeCity_DecorationShop.inc +++ b/data/maps/events/FortreeCity_DecorationShop.inc @@ -1,8 +1,8 @@ FortreeCity_DecorationShop_EventObjects: @ 85310B0 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, 1, 17, 0, 0, FortreeCity_DecorationShop_EventScript_21800E, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 4, 3, 9, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218017, 0 - object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 2, 3, 8, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218020, 0 - object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 2, 3, 8, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21804C, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, 1, 1, 1, 0, 0, FortreeCity_DecorationShop_EventScript_21800E, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 4, 3, 9, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218017, 0 + object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218020, 0 + object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21804C, 0 FortreeCity_DecorationShop_MapWarps: @ 8531110 warp_def 3, 5, 0, 8, MAP_FORTREE_CITY diff --git a/data/maps/events/FortreeCity_Gym.inc b/data/maps/events/FortreeCity_Gym.inc index 478393dc68..234c10b0cf 100644 --- a/data/maps/events/FortreeCity_Gym.inc +++ b/data/maps/events/FortreeCity_Gym.inc @@ -1,12 +1,12 @@ FortreeCity_Gym_EventObjects: @ 8530C98 - object_event 1, EVENT_OBJ_GFX_WINONA, 0, 15, 2, 3, 8, 0, 0, 0, FortreeCity_Gym_EventScript_2165C8, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 4, 14, 3, 8, 0, 1, 3, FortreeCity_Gym_EventScript_2166A8, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 10, 10, 3, 9, 0, 1, 2, FortreeCity_Gym_EventScript_2166D6, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 5, 17, 3, 9, 0, 1, 1, FortreeCity_Gym_EventScript_2166ED, 0 - object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 9, 8, 3, 8, 0, 1, 2, FortreeCity_Gym_EventScript_2166BF, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 15, 21, 3, 8, 0, 0, 0, FortreeCity_Gym_EventScript_216732, 0 - object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 4, 23, 3, 10, 17, 1, 1, FortreeCity_Gym_EventScript_216704, 0 - object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 1, 10, 3, 7, 17, 1, 3, FortreeCity_Gym_EventScript_21671B, 0 + object_event 1, EVENT_OBJ_GFX_WINONA, 0, 15, 2, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_2165C8, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 4, 14, 3, 8, 0, 0, 1, 3, FortreeCity_Gym_EventScript_2166A8, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 10, 10, 3, 9, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166D6, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 5, 17, 3, 9, 0, 0, 1, 1, FortreeCity_Gym_EventScript_2166ED, 0 + object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 9, 8, 3, 8, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166BF, 0 + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 15, 21, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_216732, 0 + object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 4, 23, 3, 10, 1, 1, 1, 1, FortreeCity_Gym_EventScript_216704, 0 + object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 1, 10, 3, 7, 1, 1, 1, 3, FortreeCity_Gym_EventScript_21671B, 0 FortreeCity_Gym_MapWarps: @ 8530D58 warp_def 15, 24, 0, 2, MAP_FORTREE_CITY diff --git a/data/maps/events/FortreeCity_House1.inc b/data/maps/events/FortreeCity_House1.inc index c5efd81e6f..99d34626ce 100644 --- a/data/maps/events/FortreeCity_House1.inc +++ b/data/maps/events/FortreeCity_House1.inc @@ -1,7 +1,7 @@ FortreeCity_House1_EventObjects: @ 8530C2C - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 3, 3, 10, 0, 0, 0, FortreeCity_House1_EventScript_2162BB, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 2, 3, 3, 9, 0, 0, 0, FortreeCity_House1_EventScript_216368, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 4, 3, 1, 17, 0, 0, FortreeCity_House1_EventScript_21635F, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House1_EventScript_2162BB, 0 + object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 2, 3, 3, 9, 0, 0, 0, 0, FortreeCity_House1_EventScript_216368, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 4, 3, 1, 1, 1, 0, 0, FortreeCity_House1_EventScript_21635F, 0 FortreeCity_House1_MapWarps: @ 8530C74 warp_def 3, 5, 0, 1, MAP_FORTREE_CITY diff --git a/data/maps/events/FortreeCity_House2.inc b/data/maps/events/FortreeCity_House2.inc index aa384c3edb..2d78b27743 100644 --- a/data/maps/events/FortreeCity_House2.inc +++ b/data/maps/events/FortreeCity_House2.inc @@ -1,6 +1,6 @@ FortreeCity_House2_EventObjects: @ 8530F30 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 2, 3, 3, 5, 1, 0, 0, FortreeCity_House2_EventScript_2177CB, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 3, 3, 9, 1, 0, 0, FortreeCity_House2_EventScript_2C811E, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 2, 3, 3, 5, 1, 0, 0, 0, FortreeCity_House2_EventScript_2177CB, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 3, 3, 9, 1, 0, 0, 0, FortreeCity_House2_EventScript_2C811E, 0 FortreeCity_House2_MapWarps: @ 8530F60 warp_def 3, 5, 0, 4, MAP_FORTREE_CITY diff --git a/data/maps/events/FortreeCity_House3.inc b/data/maps/events/FortreeCity_House3.inc index d247f002cd..54ac6ed6ab 100644 --- a/data/maps/events/FortreeCity_House3.inc +++ b/data/maps/events/FortreeCity_House3.inc @@ -1,6 +1,6 @@ FortreeCity_House3_EventObjects: @ 8530F84 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 3, 10, 0, 0, 0, FortreeCity_House3_EventScript_217AE8, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 5, 4, 3, 2, 17, 0, 0, FortreeCity_House3_EventScript_217AF1, 0 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House3_EventScript_217AE8, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 5, 4, 3, 2, 1, 1, 0, 0, FortreeCity_House3_EventScript_217AF1, 0 FortreeCity_House3_MapWarps: @ 8530FB4 warp_def 3, 5, 0, 5, MAP_FORTREE_CITY diff --git a/data/maps/events/FortreeCity_House4.inc b/data/maps/events/FortreeCity_House4.inc index c7bebb95b2..1bddf34165 100644 --- a/data/maps/events/FortreeCity_House4.inc +++ b/data/maps/events/FortreeCity_House4.inc @@ -1,7 +1,7 @@ FortreeCity_House4_EventObjects: @ 8530FD8 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, 2, 17, 0, 0, FortreeCity_House4_EventScript_217C81, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 3, 3, 8, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, 8, 0, 0, 0, FortreeCity_House4_EventScript_217D20, 933 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, 2, 1, 1, 0, 0, FortreeCity_House4_EventScript_217C81, 0 + object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0 + object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, 933 FortreeCity_House4_MapWarps: @ 8531020 warp_def 3, 5, 0, 6, MAP_FORTREE_CITY diff --git a/data/maps/events/FortreeCity_House5.inc b/data/maps/events/FortreeCity_House5.inc index cea1ff532e..d6c03578e3 100644 --- a/data/maps/events/FortreeCity_House5.inc +++ b/data/maps/events/FortreeCity_House5.inc @@ -1,7 +1,7 @@ FortreeCity_House5_EventObjects: @ 8531044 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, 20, 0, 0, 0, FortreeCity_House5_EventScript_217EF2, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 3, 3, 8, 0, 0, 0, FortreeCity_House5_EventScript_217F04, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, 10, 0, 0, 0, FortreeCity_House5_EventScript_217EFB, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, 20, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EF2, 0 + object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House5_EventScript_217F04, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, 10, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EFB, 0 FortreeCity_House5_MapWarps: @ 853108C warp_def 3, 5, 0, 7, MAP_FORTREE_CITY diff --git a/data/maps/events/FortreeCity_Mart.inc b/data/maps/events/FortreeCity_Mart.inc index 49e2adc718..115b04ccdf 100644 --- a/data/maps/events/FortreeCity_Mart.inc +++ b/data/maps/events/FortreeCity_Mart.inc @@ -1,8 +1,8 @@ FortreeCity_Mart_EventObjects: @ 8530EAC - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, FortreeCity_Mart_EventScript_217666, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 3, 3, 7, 0, 0, 0, FortreeCity_Mart_EventScript_217698, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 8, 5, 3, 2, 17, 0, 0, FortreeCity_Mart_EventScript_2176A1, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 5, 6, 3, 10, 17, 0, 0, FortreeCity_Mart_EventScript_2176AA, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217666, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 3, 3, 7, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217698, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 8, 5, 3, 2, 1, 1, 0, 0, FortreeCity_Mart_EventScript_2176A1, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 5, 6, 3, 10, 1, 1, 0, 0, FortreeCity_Mart_EventScript_2176AA, 0 FortreeCity_Mart_MapWarps: @ 8530F0C warp_def 3, 7, 0, 3, MAP_FORTREE_CITY diff --git a/data/maps/events/FortreeCity_PokemonCenter_1F.inc b/data/maps/events/FortreeCity_PokemonCenter_1F.inc index 5ddc96e63f..4b681b5cb6 100644 --- a/data/maps/events/FortreeCity_PokemonCenter_1F.inc +++ b/data/maps/events/FortreeCity_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ FortreeCity_PokemonCenter_1F_EventObjects: @ 8530D94 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173E7, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 7, 3, 1, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173F5, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 5, 3, 1, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173FE, 0 - object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 2, 3, 3, 8, 17, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_217407, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173E7, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 7, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173F5, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 5, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173FE, 0 + object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 2, 3, 3, 8, 1, 1, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_217407, 0 FortreeCity_PokemonCenter_1F_MapWarps: @ 8530DF4 warp_def 7, 8, 3, 0, MAP_FORTREE_CITY diff --git a/data/maps/events/FortreeCity_PokemonCenter_2F.inc b/data/maps/events/FortreeCity_PokemonCenter_2F.inc index 21f9208385..7a7f666b2c 100644 --- a/data/maps/events/FortreeCity_PokemonCenter_2F.inc +++ b/data/maps/events/FortreeCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ FortreeCity_PokemonCenter_2F_EventObjects: @ 8530E20 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, 702 FortreeCity_PokemonCenter_2F_MapWarps: @ 8530E80 warp_def 1, 6, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/GraniteCave_1F.inc b/data/maps/events/GraniteCave_1F.inc index 05f53c9688..83368e186c 100644 --- a/data/maps/events/GraniteCave_1F.inc +++ b/data/maps/events/GraniteCave_1F.inc @@ -1,6 +1,6 @@ GraniteCave_1F_EventObjects: @ 85343BC - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 36, 9, 3, 1, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, 8, 0, 0, 0, GraniteCave_1F_EventScript_291150, 1050 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 36, 9, 3, 1, 0, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, 8, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, 1050 GraniteCave_1F_MapWarps: @ 85343EC warp_def 37, 12, 3, 0, MAP_ROUTE106 diff --git a/data/maps/events/GraniteCave_B1F.inc b/data/maps/events/GraniteCave_B1F.inc index 914da7523b..90b0f498e8 100644 --- a/data/maps/events/GraniteCave_B1F.inc +++ b/data/maps/events/GraniteCave_B1F.inc @@ -1,5 +1,5 @@ GraniteCave_B1F_EventObjects: @ 8534420 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, 1, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, 1051 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, 1, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, 1051 GraniteCave_B1F_MapWarps: @ 8534438 warp_def 25, 13, 3, 1, MAP_GRANITE_CAVE_1F diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/events/GraniteCave_B2F.inc index d1ba08ba3a..d7ce418122 100644 --- a/data/maps/events/GraniteCave_B2F.inc +++ b/data/maps/events/GraniteCave_B2F.inc @@ -1,13 +1,13 @@ GraniteCave_B2F_EventObjects: @ 8534484 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, 1053 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, 1, 0, 0, 0, GraniteCave_B2F_EventScript_291177, 1054 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, 1, 17, 0, 0, GraniteCave_B2F_EventScript_2907A6, 17 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 14, 3, 1, 17, 0, 0, GraniteCave_B2F_EventScript_2907A6, 18 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 16, 3, 1, 17, 0, 0, GraniteCave_B2F_EventScript_2907A6, 19 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 12, 3, 1, 17, 0, 0, GraniteCave_B2F_EventScript_2907A6, 20 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 22, 3, 1, 17, 0, 0, GraniteCave_B2F_EventScript_2907A6, 21 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, 1, 17, 0, 0, GraniteCave_B2F_EventScript_2907A6, 22 - object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, 1, 17, 0, 0, GraniteCave_B2F_EventScript_2907A6, 23 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, 1053 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, 1054 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 17 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 14, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 18 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 16, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 19 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 12, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 20 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 22, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 21 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 22 + object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 23 GraniteCave_B2F_MapWarps: @ 853455C warp_def 29, 13, 3, 2, MAP_GRANITE_CAVE_B1F diff --git a/data/maps/events/GraniteCave_StevensRoom.inc b/data/maps/events/GraniteCave_StevensRoom.inc index c6abd9e5ad..49e808cda8 100644 --- a/data/maps/events/GraniteCave_StevensRoom.inc +++ b/data/maps/events/GraniteCave_StevensRoom.inc @@ -1,5 +1,5 @@ GraniteCave_StevensRoom_EventObjects: @ 85345B0 - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, 1, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, 833 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, 1, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, 833 GraniteCave_StevensRoom_MapWarps: @ 85345C8 warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/events/InsideOfTruck.inc index dbda93e9ce..5dafdf1fde 100644 --- a/data/maps/events/InsideOfTruck.inc +++ b/data/maps/events/InsideOfTruck.inc @@ -1,7 +1,7 @@ InsideOfTruck_EventObjects: @ 853A078 - object_event 1, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 8, 8, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 - object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 3, 8, 8, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 - object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 2, 3, 8, 8, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 + object_event 1, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 + object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 + object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 2, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 InsideOfTruck_MapWarps: @ 853A0C0 warp_def 4, 1, 0, 127, MAP_NONE diff --git a/data/maps/events/IslandCave.inc b/data/maps/events/IslandCave.inc index 3738636c89..d7807a725c 100644 --- a/data/maps/events/IslandCave.inc +++ b/data/maps/events/IslandCave.inc @@ -1,5 +1,5 @@ IslandCave_EventObjects: @ 8536C74 - object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, 8, 0, 0, 0, IslandCave_EventScript_238F58, 936 + object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, 8, 0, 0, 0, 0, IslandCave_EventScript_238F58, 936 IslandCave_MapWarps: @ 8536C8C warp_def 8, 29, 3, 0, MAP_ROUTE105 diff --git a/data/maps/events/JaggedPass.inc b/data/maps/events/JaggedPass.inc index 12dd9bdd2b..fe193cd971 100644 --- a/data/maps/events/JaggedPass.inc +++ b/data/maps/events/JaggedPass.inc @@ -1,11 +1,11 @@ JaggedPass_EventObjects: @ 8534AE4 - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 10, 8, 3, 10, 0, 1, 3, JaggedPass_EventScript_230785, 0 - object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 35, 3, 14, 0, 1, 4, JaggedPass_EventScript_2307FB, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, 1, 0, 0, 0, JaggedPass_EventScript_291184, 1070 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 9, 21, 3, 16, 17, 1, 3, JaggedPass_EventScript_23079C, 0 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 19, 3, 7, 17, 0, 0, JaggedPass_EventScript_230718, 847 - object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 14, 25, 3, 10, 17, 1, 3, JaggedPass_EventScript_230871, 0 - object_event 7, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 18, 25, 3, 9, 17, 1, 3, JaggedPass_EventScript_23085A, 0 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 10, 8, 3, 10, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0 + object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 35, 3, 14, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, 1, 0, 0, 0, 0, JaggedPass_EventScript_291184, 1070 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 9, 21, 3, 16, 1, 1, 1, 3, JaggedPass_EventScript_23079C, 0 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 19, 3, 7, 1, 1, 0, 0, JaggedPass_EventScript_230718, 847 + object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 14, 25, 3, 10, 1, 1, 1, 3, JaggedPass_EventScript_230871, 0 + object_event 7, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 18, 25, 3, 9, 1, 1, 1, 3, JaggedPass_EventScript_23085A, 0 JaggedPass_MapWarps: @ 8534B8C warp_def 14, 40, 3, 2, MAP_ROUTE112 diff --git a/data/maps/events/LavaridgeTown.inc b/data/maps/events/LavaridgeTown.inc index cf3f26095a..cf32b8377e 100644 --- a/data/maps/events/LavaridgeTown.inc +++ b/data/maps/events/LavaridgeTown.inc @@ -1,13 +1,13 @@ LavaridgeTown_EventObjects: @ 8527A54 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 7, 3, 8, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 1, 3, 8, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 8, 3, 8, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 10, 13, 3, 3, 32, 0, 0, LavaridgeTown_EventScript_1EA720, 0 - object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 4, 3, 18, 0, 0, 0, LavaridgeTown_EventScript_1EA729, 0 - object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 4, 3, 17, 0, 0, 0, LavaridgeTown_EventScript_1EA732, 0 - object_event 7, EVENT_OBJ_GFX_GIDDY, 0, 6, 16, 3, 9, 0, 0, 0, 0x0, 930 - object_event 8, EVENT_OBJ_GFX_HIPSTER, 0, 12, 15, 0, 8, 0, 0, 0, 0x0, 929 - object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 7, 3, 8, 17, 0, 0, LavaridgeTown_EventScript_1EA744, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 7, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 1, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 8, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 10, 13, 3, 3, 0, 2, 0, 0, LavaridgeTown_EventScript_1EA720, 0 + object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 4, 3, 18, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA729, 0 + object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 4, 3, 17, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA732, 0 + object_event 7, EVENT_OBJ_GFX_GIDDY, 0, 6, 16, 3, 9, 0, 0, 0, 0, 0x0, 930 + object_event 8, EVENT_OBJ_GFX_HIPSTER, 0, 12, 15, 0, 8, 0, 0, 0, 0, 0x0, 929 + object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 7, 3, 8, 1, 1, 0, 0, LavaridgeTown_EventScript_1EA744, 0 LavaridgeTown_MapWarps: @ 8527B2C warp_def 12, 15, 0, 0, MAP_LAVARIDGE_TOWN_HERB_SHOP diff --git a/data/maps/events/LavaridgeTown_Gym_1F.inc b/data/maps/events/LavaridgeTown_Gym_1F.inc index 24521f2468..cc35053f08 100644 --- a/data/maps/events/LavaridgeTown_Gym_1F.inc +++ b/data/maps/events/LavaridgeTown_Gym_1F.inc @@ -1,10 +1,10 @@ LavaridgeTown_Gym_1F_EventObjects: @ 852DE1C - object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 13, 9, 3, 8, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE78C, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 3, 14, 3, 8, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE87F, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 2, 15, 3, 8, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE900, 0 - object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 3, 10, 3, 8, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8AF, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 5, 2, 3, 8, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8E5, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 12, 16, 3, 10, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE96C, 0 + object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 13, 9, 3, 8, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE78C, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 3, 14, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE87F, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 2, 15, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE900, 0 + object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 3, 10, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8AF, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 5, 2, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8E5, 0 + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 12, 16, 3, 10, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE96C, 0 LavaridgeTown_Gym_1F_MapWarps: @ 852DEAC warp_def 13, 18, 3, 1, MAP_LAVARIDGE_TOWN diff --git a/data/maps/events/LavaridgeTown_Gym_B1F.inc b/data/maps/events/LavaridgeTown_Gym_B1F.inc index 0169d4a567..eabf8e51de 100644 --- a/data/maps/events/LavaridgeTown_Gym_B1F.inc +++ b/data/maps/events/LavaridgeTown_Gym_B1F.inc @@ -1,8 +1,8 @@ LavaridgeTown_Gym_B1F_EventObjects: @ 852DFA8 - object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 4, 18, 3, 8, 17, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE91B, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 3, 6, 0, 8, 17, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE8CA, 0 - object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 13, 17, 0, 8, 17, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE936, 0 - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 4, 16, 3, 8, 17, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE951, 0 + object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 4, 18, 3, 8, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE91B, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 3, 6, 0, 8, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE8CA, 0 + object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 13, 17, 0, 8, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE936, 0 + object_event 4, EVENT_OBJ_GFX_HIKER, 0, 4, 16, 3, 8, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE951, 0 LavaridgeTown_Gym_B1F_MapWarps: @ 852E008 warp_def 10, 18, 3, 2, MAP_LAVARIDGE_TOWN_GYM_1F diff --git a/data/maps/events/LavaridgeTown_HerbShop.inc b/data/maps/events/LavaridgeTown_HerbShop.inc index f8b0a950c1..dd5ffdbe92 100644 --- a/data/maps/events/LavaridgeTown_HerbShop.inc +++ b/data/maps/events/LavaridgeTown_HerbShop.inc @@ -1,7 +1,7 @@ LavaridgeTown_HerbShop_EventObjects: @ 852DDB0 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 2, 3, 8, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4D7, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 7, 5, 3, 1, 17, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE505, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 3, 5, 17, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4D7, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 7, 5, 3, 1, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE505, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 3, 5, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0 LavaridgeTown_HerbShop_MapWarps: @ 852DDF8 warp_def 3, 7, 0, 0, MAP_LAVARIDGE_TOWN diff --git a/data/maps/events/LavaridgeTown_House.inc b/data/maps/events/LavaridgeTown_House.inc index 436d5c41a9..17809fc45a 100644 --- a/data/maps/events/LavaridgeTown_House.inc +++ b/data/maps/events/LavaridgeTown_House.inc @@ -1,7 +1,7 @@ LavaridgeTown_House_EventObjects: @ 852E0DC - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 2, 3, 3, 1, 17, 0, 0, LavaridgeTown_House_EventScript_1FF912, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 6, 3, 1, 17, 0, 0, LavaridgeTown_House_EventScript_1FF91B, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 8, 4, 3, 2, 17, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 2, 3, 3, 1, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF912, 0 + object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 6, 3, 1, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF91B, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 8, 4, 3, 2, 1, 1, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0 LavaridgeTown_House_MapWarps: @ 852E124 warp_def 3, 7, 0, 4, MAP_LAVARIDGE_TOWN diff --git a/data/maps/events/LavaridgeTown_Mart.inc b/data/maps/events/LavaridgeTown_Mart.inc index bb12cf30c5..0206eefd79 100644 --- a/data/maps/events/LavaridgeTown_Mart.inc +++ b/data/maps/events/LavaridgeTown_Mart.inc @@ -1,7 +1,7 @@ LavaridgeTown_Mart_EventObjects: @ 852E148 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9CE, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 2, 3, 8, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9FE, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 9, 5, 3, 10, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9CE, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9FE, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 9, 5, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0 LavaridgeTown_Mart_MapWarps: @ 852E190 warp_def 3, 7, 0, 2, MAP_LAVARIDGE_TOWN diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc index 674ebef23e..767f017135 100644 --- a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc +++ b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ LavaridgeTown_PokemonCenter_1F_EventObjects: @ 852E1B4 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 11, 8, 3, 7, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 0, 9, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25, 0 - object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 1, 3, 3, 10, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 11, 8, 3, 7, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 0, 9, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25, 0 + object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E, 0 LavaridgeTown_PokemonCenter_1F_MapWarps: @ 852E214 warp_def 7, 8, 3, 3, MAP_LAVARIDGE_TOWN diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc index 889dcb9b71..3191e7533e 100644 --- a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc +++ b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ LavaridgeTown_PokemonCenter_2F_EventObjects: @ 852E248 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, 702 LavaridgeTown_PokemonCenter_2F_MapWarps: @ 852E2A8 warp_def 1, 6, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/events/LilycoveCity.inc index d1c602705e..343249c2d2 100644 --- a/data/maps/events/LilycoveCity.inc +++ b/data/maps/events/LilycoveCity.inc @@ -1,26 +1,26 @@ LilycoveCity_EventObjects: @ 8526CE8 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 32, 20, 3, 3, 16, 0, 0, LilycoveCity_EventScript_1E2C53, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 15, 18, 3, 2, 17, 0, 0, LilycoveCity_EventScript_1E2C2B, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 28, 28, 3, 1, 0, 0, 0, LilycoveCity_EventScript_1E2C22, 0 - object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 21, 15, 3, 2, 17, 0, 0, LilycoveCity_EventScript_1E2C4A, 0 - object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 16, 9, 5, 5, 1, 0, 0, LilycoveCity_EventScript_1E2C91, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 35, 27, 3, 2, 17, 0, 0, LilycoveCity_EventScript_1E2C72, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 35, 37, 5, 8, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0 - object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 34, 37, 5, 8, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0 - object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 57, 17, 3, 1, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0 - object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 73, 15, 3, 10, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, 852 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, 1, 0, 0, 0, LilycoveCity_EventScript_2910E8, 1042 - object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 43, 18, 3, 5, 1, 0, 0, LilycoveCity_EventScript_1E2DD5, 852 - object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 46, 12, 3, 9, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, 852 - object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 45, 12, 3, 10, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, 852 - object_event 15, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 38, 9, 5, 9, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, 852 - object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 50, 7, 5, 2, 17, 0, 0, LilycoveCity_EventScript_1E2BD8, 0 - object_event 17, EVENT_OBJ_GFX_HIPSTER, 0, 27, 7, 5, 8, 17, 0, 0, LilycoveCity_EventScript_1E2DDE, 971 - object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 16, 23, 3, 10, 17, 0, 0, LilycoveCity_EventScript_1E302D, 0 - object_event 19, EVENT_OBJ_GFX_WOMAN_4, 0, 41, 25, 3, 9, 17, 0, 0, LilycoveCity_EventScript_1E2CEE, 0 - object_event 20, EVENT_OBJ_GFX_MAN_2, 0, 40, 25, 3, 10, 17, 0, 0, LilycoveCity_EventScript_1E2CDD, 0 - object_event 21, EVENT_OBJ_GFX_SAILOR, 0, 16, 34, 3, 8, 17, 0, 0, LilycoveCity_EventScript_1E2CCB, 0 - object_event 22, EVENT_OBJ_GFX_FAT_MAN, 0, 16, 35, 3, 7, 17, 0, 0, LilycoveCity_EventScript_1E2CD4, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 32, 20, 3, 3, 0, 1, 0, 0, LilycoveCity_EventScript_1E2C53, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 15, 18, 3, 2, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C2B, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 28, 28, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C22, 0 + object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 21, 15, 3, 2, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C4A, 0 + object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 16, 9, 5, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2C91, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 35, 27, 3, 2, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C72, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 35, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 34, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0 + object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 57, 17, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0 + object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 73, 15, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, 852 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, 1, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, 1042 + object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 43, 18, 3, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, 852 + object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 46, 12, 3, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, 852 + object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 45, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, 852 + object_event 15, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 38, 9, 5, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, 852 + object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 50, 7, 5, 2, 1, 1, 0, 0, LilycoveCity_EventScript_1E2BD8, 0 + object_event 17, EVENT_OBJ_GFX_HIPSTER, 0, 27, 7, 5, 8, 1, 1, 0, 0, LilycoveCity_EventScript_1E2DDE, 971 + object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 16, 23, 3, 10, 1, 1, 0, 0, LilycoveCity_EventScript_1E302D, 0 + object_event 19, EVENT_OBJ_GFX_WOMAN_4, 0, 41, 25, 3, 9, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CEE, 0 + object_event 20, EVENT_OBJ_GFX_MAN_2, 0, 40, 25, 3, 10, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CDD, 0 + object_event 21, EVENT_OBJ_GFX_SAILOR, 0, 16, 34, 3, 8, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CCB, 0 + object_event 22, EVENT_OBJ_GFX_FAT_MAN, 0, 16, 35, 3, 7, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CD4, 0 LilycoveCity_MapWarps: @ 8526EF8 warp_def 27, 6, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F diff --git a/data/maps/events/LilycoveCity_ContestHall.inc b/data/maps/events/LilycoveCity_ContestHall.inc index 036bf01730..dd5655bebf 100644 --- a/data/maps/events/LilycoveCity_ContestHall.inc +++ b/data/maps/events/LilycoveCity_ContestHall.inc @@ -1,36 +1,36 @@ LilycoveCity_ContestHall_EventObjects: @ 8531850 - object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 30, 30, 3, 2, 68, 0, 0, LilycoveCity_ContestHall_EventScript_21B485, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 11, 7, 3, 2, 51, 0, 0, LilycoveCity_ContestHall_EventScript_21B48E, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 40, 8, 3, 2, 34, 0, 0, LilycoveCity_ContestHall_EventScript_21B497, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 12, 22, 3, 8, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A9, 0 - object_event 5, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 15, 22, 3, 8, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4C0, 0 - object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 25, 3, 7, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4D7, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 25, 3, 7, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4EE, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 14, 25, 3, 7, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B505, 0 - object_event 9, EVENT_OBJ_GFX_WOMAN_6, 0, 16, 25, 3, 7, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B51C, 0 - object_event 10, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 24, 3, 10, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B533, 0 - object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 24, 3, 9, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B56A, 0 - object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, 10, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B53C, 0 - object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 24, 10, 3, 8, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B581, 0 - object_event 14, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 27, 10, 3, 8, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B598, 0 - object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 22, 13, 3, 7, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5AF, 0 - object_event 16, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 24, 13, 3, 7, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5C6, 0 - object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 26, 13, 3, 7, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5DD, 0 - object_event 18, EVENT_OBJ_GFX_WOMAN_2, 0, 28, 13, 3, 7, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5F4, 0 - object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 20, 10, 3, 10, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B60B, 0 - object_event 20, EVENT_OBJ_GFX_WOMAN_1, 0, 30, 11, 3, 9, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B639, 0 - object_event 21, EVENT_OBJ_GFX_MAN_1, 0, 26, 8, 3, 8, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B622, 0 - object_event 22, EVENT_OBJ_GFX_CAMPER, 0, 13, 20, 3, 8, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B553, 0 - object_event 23, EVENT_OBJ_GFX_WOMAN_4, 0, 36, 22, 3, 8, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B650, 0 - object_event 24, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 39, 22, 3, 8, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B667, 0 - object_event 25, EVENT_OBJ_GFX_BOY_2, 0, 34, 25, 3, 7, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B67E, 0 - object_event 26, EVENT_OBJ_GFX_GIRL_2, 0, 36, 25, 3, 7, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B695, 0 - object_event 27, EVENT_OBJ_GFX_BOY_3, 0, 38, 25, 3, 7, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6AC, 0 - object_event 28, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 40, 25, 3, 7, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6C3, 0 - object_event 29, EVENT_OBJ_GFX_WOMAN_3, 0, 32, 23, 3, 10, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6DA, 0 - object_event 30, EVENT_OBJ_GFX_MAN_1, 0, 37, 20, 3, 8, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B71C, 0 - object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 42, 24, 3, 9, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B705, 0 - object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 23, 26, 3, 2, 17, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A0, 0 + object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 30, 30, 3, 2, 4, 4, 0, 0, LilycoveCity_ContestHall_EventScript_21B485, 0 + object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 11, 7, 3, 2, 3, 3, 0, 0, LilycoveCity_ContestHall_EventScript_21B48E, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 40, 8, 3, 2, 2, 2, 0, 0, LilycoveCity_ContestHall_EventScript_21B497, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 12, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A9, 0 + object_event 5, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 15, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4C0, 0 + object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4D7, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4EE, 0 + object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 14, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B505, 0 + object_event 9, EVENT_OBJ_GFX_WOMAN_6, 0, 16, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B51C, 0 + object_event 10, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 24, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B533, 0 + object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B56A, 0 + object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B53C, 0 + object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 24, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B581, 0 + object_event 14, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 27, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B598, 0 + object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 22, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5AF, 0 + object_event 16, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 24, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5C6, 0 + object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 26, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5DD, 0 + object_event 18, EVENT_OBJ_GFX_WOMAN_2, 0, 28, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5F4, 0 + object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 20, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B60B, 0 + object_event 20, EVENT_OBJ_GFX_WOMAN_1, 0, 30, 11, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B639, 0 + object_event 21, EVENT_OBJ_GFX_MAN_1, 0, 26, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B622, 0 + object_event 22, EVENT_OBJ_GFX_CAMPER, 0, 13, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B553, 0 + object_event 23, EVENT_OBJ_GFX_WOMAN_4, 0, 36, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B650, 0 + object_event 24, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 39, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B667, 0 + object_event 25, EVENT_OBJ_GFX_BOY_2, 0, 34, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B67E, 0 + object_event 26, EVENT_OBJ_GFX_GIRL_2, 0, 36, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B695, 0 + object_event 27, EVENT_OBJ_GFX_BOY_3, 0, 38, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6AC, 0 + object_event 28, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 40, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6C3, 0 + object_event 29, EVENT_OBJ_GFX_WOMAN_3, 0, 32, 23, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6DA, 0 + object_event 30, EVENT_OBJ_GFX_MAN_1, 0, 37, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B71C, 0 + object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 42, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B705, 0 + object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 23, 26, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A0, 0 LilycoveCity_ContestHall_MapWarps: @ 8531B50 warp_def 19, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY diff --git a/data/maps/events/LilycoveCity_ContestLobby.inc b/data/maps/events/LilycoveCity_ContestLobby.inc index 879c720c0d..d7c31c8376 100644 --- a/data/maps/events/LilycoveCity_ContestLobby.inc +++ b/data/maps/events/LilycoveCity_ContestLobby.inc @@ -1,29 +1,29 @@ LilycoveCity_ContestLobby_EventObjects: @ 8531534 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 14, 2, 3, 8, 17, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 15, 2, 3, 8, 17, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 26, 9, 3, 10, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0 - object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 9, 1, 0, 1, 0, 0, 0, 0x0, 774 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 18, 8, 3, 2, 17, 0, 0, LilycoveCity_ContestLobby_EventScript_21A708, 0 - object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 4, 9, 3, 2, 34, 0, 0, LilycoveCity_ContestLobby_EventScript_21A711, 0 - object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 3, 4, 3, 2, 17, 0, 0, LilycoveCity_ContestLobby_EventScript_21A71A, 0 - object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 13, 10, 3, 10, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, 802 - object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 23, 8, 3, 8, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A768, 0 - object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 9, 3, 9, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FB4, 0 - object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 21, 1, 0, 8, 0, 0, 0, 0x0, 895 - object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 5, 6, 3, 2, 17, 0, 0, LilycoveCity_ContestLobby_EventScript_21A72C, 0 - object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 8, 3, 10, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A723, 0 - object_event 14, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 8, 7, 3, 3, 16, 0, 0, LilycoveCity_ContestLobby_EventScript_21A735, 0 - object_event 15, EVENT_OBJ_GFX_WOMAN_2, 0, 22, 9, 3, 10, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0 - object_event 16, EVENT_OBJ_GFX_OLD_MAN_1, 0, 26, 5, 3, 10, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, 873 - object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 24, 9, 3, 9, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A771, 0 - object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 27, 3, 3, 8, 17, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, 832 - object_event 19, EVENT_OBJ_GFX_CAMPER, 0, 28, 3, 3, 8, 17, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, 832 - object_event 20, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 28, 7, 3, 7, 17, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, 832 - object_event 21, EVENT_OBJ_GFX_SCIENTIST_2, 0, 26, 7, 3, 7, 17, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, 832 - object_event 22, EVENT_OBJ_GFX_WOMAN_1, 0, 27, 7, 3, 7, 17, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, 832 - object_event 23, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 3, 3, 8, 17, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, 832 - object_event 24, EVENT_OBJ_GFX_OLD_MAN_2, 0, 26, 5, 3, 10, 17, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, 832 - object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 9, 10, 3, 10, 34, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 14, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 15, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 26, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0 + object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 9, 1, 0, 1, 0, 0, 0, 0, 0x0, 774 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 18, 8, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A708, 0 + object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 4, 9, 3, 2, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21A711, 0 + object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 3, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A71A, 0 + object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 13, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, 802 + object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 23, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A768, 0 + object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FB4, 0 + object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 21, 1, 0, 8, 0, 0, 0, 0, 0x0, 895 + object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 5, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A72C, 0 + object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 8, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A723, 0 + object_event 14, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 8, 7, 3, 3, 0, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A735, 0 + object_event 15, EVENT_OBJ_GFX_WOMAN_2, 0, 22, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0 + object_event 16, EVENT_OBJ_GFX_OLD_MAN_1, 0, 26, 5, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, 873 + object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 24, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A771, 0 + object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 27, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, 832 + object_event 19, EVENT_OBJ_GFX_CAMPER, 0, 28, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, 832 + object_event 20, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 28, 7, 3, 7, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, 832 + object_event 21, EVENT_OBJ_GFX_SCIENTIST_2, 0, 26, 7, 3, 7, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, 832 + object_event 22, EVENT_OBJ_GFX_WOMAN_1, 0, 27, 7, 3, 7, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, 832 + object_event 23, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, 832 + object_event 24, EVENT_OBJ_GFX_OLD_MAN_2, 0, 26, 5, 3, 10, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, 832 + object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 9, 10, 3, 10, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0 LilycoveCity_ContestLobby_MapWarps: @ 853178C warp_def 14, 11, 0, 4, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc index e93810aa9a..7ccbc4aecb 100644 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc @@ -1,5 +1,5 @@ LilycoveCity_CoveLilyMotel_1F_EventObjects: @ 8531134 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 10, 3, 3, 7, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218189, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 10, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218189, 0 LilycoveCity_CoveLilyMotel_1F_MapWarps: @ 853114C warp_def 5, 8, 0, 1, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc index fd0afa0386..631eba91be 100644 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc @@ -1,11 +1,11 @@ LilycoveCity_CoveLilyMotel_2F_EventObjects: @ 8531188 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 4, 6, 3, 9, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, 925 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, 10, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, 925 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, 10, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, 925 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 10, 3, 3, 9, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, 925 - object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 7, 3, 3, 8, 17, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, 925 - object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 4, 3, 9, 17, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, 925 - object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 1, 7, 3, 10, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, 787 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 4, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, 925 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, 925 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, 925 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 10, 3, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, 925 + object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 7, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, 925 + object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 4, 3, 9, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, 925 + object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 1, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, 787 LilycoveCity_CoveLilyMotel_2F_MapWarps: @ 8531230 warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc index e8e472283b..bdeda0bd99 100644 --- a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStoreElevator_EventObjects: @ 85324B0 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 3, 8, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_220624, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_220624, 0 LilycoveCity_DepartmentStoreElevator_MapWarps: @ 85324C8 warp_def 1, 5, 3, 127, MAP_NONE diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc index d0bb04e595..aca7598ec0 100644 --- a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc @@ -1,8 +1,8 @@ LilycoveCity_DepartmentStoreRooftop_EventObjects: @ 853241C - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 4, 3, 7, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 7, 5, 3, 5, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0 - object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, 8, 17, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, 962 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 15, 5, 3, 8, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0 + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 4, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 7, 5, 3, 5, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0 + object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, 8, 1, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, 962 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 15, 5, 3, 8, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0 LilycoveCity_DepartmentStoreRooftop_MapWarps: @ 853247C warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F diff --git a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc index 4d8dcf9c28..17a6db6157 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc @@ -1,10 +1,10 @@ LilycoveCity_DepartmentStore_1F_EventObjects: @ 853208C - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 2, 3, 8, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F693, 0 - object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 10, 2, 3, 8, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F69C, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 14, 5, 3, 2, 17, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F82F, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 4, 3, 2, 17, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F838, 0 - object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, 1, 17, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F841, 0 - object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 6, 3, 1, 17, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F84A, 0 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F693, 0 + object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 10, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F69C, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 14, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F82F, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F838, 0 + object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, 1, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F841, 0 + object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 6, 3, 1, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F84A, 0 LilycoveCity_DepartmentStore_1F_MapWarps: @ 853211C warp_def 8, 7, 0, 0, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc index e66e9bc35d..1747ece5aa 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc @@ -1,9 +1,9 @@ LilycoveCity_DepartmentStore_2F_EventObjects: @ 853215C - object_event 1, EVENT_OBJ_GFX_COOK, 0, 8, 2, 3, 8, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB2D, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 3, 2, 17, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB36, 0 - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 13, 5, 3, 2, 17, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB3F, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 3, 7, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB7A, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, 7, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0 + object_event 1, EVENT_OBJ_GFX_COOK, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB2D, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB36, 0 + object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 13, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB3F, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB7A, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0 LilycoveCity_DepartmentStore_2F_MapWarps: @ 85321D4 warp_def 16, 1, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F diff --git a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc index ff535abf5c..93ef37b4b9 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc @@ -1,9 +1,9 @@ LilycoveCity_DepartmentStore_3F_EventObjects: @ 8532200 - object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 5, 3, 2, 17, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCB6, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 7, 3, 2, 17, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCBF, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 13, 5, 3, 2, 17, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCC8, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 2, 3, 8, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC65, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 2, 3, 8, 17, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0 + object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCB6, 0 + object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 7, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCBF, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 13, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCC8, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC65, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0 LilycoveCity_DepartmentStore_3F_MapWarps: @ 8532278 warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F diff --git a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc index b344e7d3da..5e6d0d94ac 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc @@ -1,9 +1,9 @@ LilycoveCity_DepartmentStore_4F_EventObjects: @ 85322A4 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 2, 3, 2, 17, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDEB, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 2, 3, 2, 17, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDF4, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 4, 3, 2, 17, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDFD, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, 7, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE06, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 6, 3, 7, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDEB, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDF4, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDFD, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE06, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0 LilycoveCity_DepartmentStore_4F_MapWarps: @ 853231C warp_def 16, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F diff --git a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc index 62db69ab60..f2b9b130ae 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc @@ -1,11 +1,11 @@ LilycoveCity_DepartmentStore_5F_EventObjects: @ 8532348 - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 6, 3, 2, 17, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_2200BC, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 7, 3, 17, 17, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22006C, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 2, 3, 8, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFA6, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 2, 3, 8, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFDC, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 15, 6, 3, 9, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22000A, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 17, 6, 3, 7, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22003A, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 5, 3, 10, 17, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_2200BC, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 7, 3, 17, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22006C, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFA6, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFDC, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 15, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22000A, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 17, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22003A, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 5, 3, 10, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0 LilycoveCity_DepartmentStore_5F_MapWarps: @ 85323F0 warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F diff --git a/data/maps/events/LilycoveCity_Harbor.inc b/data/maps/events/LilycoveCity_Harbor.inc index 3d03eea7e7..73d21e9ce4 100644 --- a/data/maps/events/LilycoveCity_Harbor.inc +++ b/data/maps/events/LilycoveCity_Harbor.inc @@ -1,9 +1,9 @@ LilycoveCity_Harbor_EventObjects: @ 8531E1C - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, 8, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, 908 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, 10, 0, 0, 0, 0x0, 861 - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 3, 13, 3, 2, 17, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 10, 3, 8, 0, 0, 0, 0x0, 909 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 8, 10, 3, 8, 17, 0, 0, 0x0, 748 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, 908 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 861 + object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 3, 13, 3, 2, 1, 1, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0 + object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 10, 3, 8, 0, 0, 0, 0, 0x0, 909 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 8, 10, 3, 8, 1, 1, 0, 0, 0x0, 748 LilycoveCity_Harbor_MapWarps: @ 8531E94 warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LilycoveCity_House1.inc b/data/maps/events/LilycoveCity_House1.inc index dc14e42910..d268037ba3 100644 --- a/data/maps/events/LilycoveCity_House1.inc +++ b/data/maps/events/LilycoveCity_House1.inc @@ -1,6 +1,6 @@ LilycoveCity_House1_EventObjects: @ 8531EF4 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 5, 3, 9, 17, 0, 0, LilycoveCity_House1_EventScript_21ECCE, 0 - object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 4, 3, 8, 0, 0, 0, LilycoveCity_House1_EventScript_21ECD7, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 5, 3, 9, 1, 1, 0, 0, LilycoveCity_House1_EventScript_21ECCE, 0 + object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House1_EventScript_21ECD7, 0 LilycoveCity_House1_MapWarps: @ 8531F24 warp_def 3, 8, 0, 8, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LilycoveCity_House2.inc b/data/maps/events/LilycoveCity_House2.inc index 9c7237adc6..7e5276102b 100644 --- a/data/maps/events/LilycoveCity_House2.inc +++ b/data/maps/events/LilycoveCity_House2.inc @@ -1,5 +1,5 @@ LilycoveCity_House2_EventObjects: @ 8531F48 - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 3, 8, 0, 0, 0, LilycoveCity_House2_EventScript_21ED75, 0 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House2_EventScript_21ED75, 0 LilycoveCity_House2_MapWarps: @ 8531F60 warp_def 2, 7, 0, 9, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LilycoveCity_House3.inc b/data/maps/events/LilycoveCity_House3.inc index 63051a0873..4f582bdefc 100644 --- a/data/maps/events/LilycoveCity_House3.inc +++ b/data/maps/events/LilycoveCity_House3.inc @@ -1,10 +1,10 @@ LilycoveCity_House3_EventObjects: @ 8531F84 - object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 3, 4, 3, 8, 17, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, 9, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0 - object_event 3, EVENT_OBJ_GFX_BOY_5, 0, 1, 4, 3, 8, 17, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0 - object_event 4, EVENT_OBJ_GFX_BOY_5, 0, 2, 5, 3, 7, 17, 0, 0, LilycoveCity_House3_EventScript_21EF09, 0 - object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 2, 3, 3, 8, 17, 0, 0, LilycoveCity_House3_EventScript_21EEA1, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 7, 5, 3, 9, 17, 0, 0, LilycoveCity_House3_EventScript_21EE8A, 0 + object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 3, 4, 3, 8, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, 9, 0, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0 + object_event 3, EVENT_OBJ_GFX_BOY_5, 0, 1, 4, 3, 8, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0 + object_event 4, EVENT_OBJ_GFX_BOY_5, 0, 2, 5, 3, 7, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF09, 0 + object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 2, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EEA1, 0 + object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 7, 5, 3, 9, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EE8A, 0 LilycoveCity_House3_MapWarps: @ 8532014 warp_def 3, 7, 0, 10, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LilycoveCity_House4.inc b/data/maps/events/LilycoveCity_House4.inc index db9bc7469b..e85c296d3b 100644 --- a/data/maps/events/LilycoveCity_House4.inc +++ b/data/maps/events/LilycoveCity_House4.inc @@ -1,6 +1,6 @@ LilycoveCity_House4_EventObjects: @ 8532038 - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 1, 4, 3, 2, 17, 0, 0, LilycoveCity_House4_EventScript_21F5B5, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 7, 4, 3, 2, 17, 0, 0, LilycoveCity_House4_EventScript_21F5BE, 0 + object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 1, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5B5, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 7, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5BE, 0 LilycoveCity_House4_MapWarps: @ 8532068 warp_def 3, 8, 0, 11, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc index ef490466c0..47b39c6eeb 100644 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc @@ -1,14 +1,14 @@ LilycoveCity_LilycoveMuseum_1F_EventObjects: @ 853124C - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 5, 12, 3, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 2, 3, 8, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, 775 - object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 7, 3, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5, 0 - object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 13, 10, 3, 5, 2, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 8, 3, 7, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E07, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 3, 8, 3, 7, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E10, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 3, 3, 2, 17, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, 776 - object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 19, 3, 3, 7, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, 779 - object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 2, 3, 2, 34, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, 780 - object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 2, 3, 2, 17, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, 778 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 5, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, 775 + object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5, 0 + object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 13, 10, 3, 5, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E07, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 3, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E10, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 3, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, 776 + object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 19, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, 779 + object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 2, 3, 2, 2, 2, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, 780 + object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, 778 LilycoveCity_LilycoveMuseum_1F_MapWarps: @ 853133C warp_def 9, 13, 0, 3, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc index f4338de644..ba1e74e659 100644 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc @@ -1,8 +1,8 @@ LilycoveCity_LilycoveMuseum_2F_EventObjects: @ 8531428 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 10, 8, 3, 7, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 10, 3, 2, 17, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, 777 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 3, 3, 2, 17, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, 780 - object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 14, 6, 3, 2, 17, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, 780 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 10, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 10, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, 777 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 3, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, 780 + object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 14, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, 780 LilycoveCity_LilycoveMuseum_2F_MapWarps: @ 8531488 warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F diff --git a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc index 5d1c20b47b..784b388aea 100644 --- a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc +++ b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc @@ -1,5 +1,5 @@ LilycoveCity_MoveDeletersHouse_EventObjects: @ 8531EB8 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0 LilycoveCity_MoveDeletersHouse_MapWarps: @ 8531ED0 warp_def 3, 7, 0, 7, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc index 17dab40161..dce57df3d7 100644 --- a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc +++ b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc @@ -1,9 +1,9 @@ LilycoveCity_PokemonCenter_1F_EventObjects: @ 8531BCC - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5E8, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 10, 7, 3, 10, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5F6, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 11, 8, 3, 7, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0 - object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 1, 3, 3, 8, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0 - object_event 5, EVENT_OBJ_GFX_TRADER, 0, 2, 3, 3, 8, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, 993 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5E8, 0 + object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 10, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5F6, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 11, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0 + object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 1, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0 + object_event 5, EVENT_OBJ_GFX_TRADER, 0, 2, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, 993 LilycoveCity_PokemonCenter_1F_MapWarps: @ 8531C44 warp_def 7, 8, 3, 2, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc index 525622b61c..ec8e4cf6eb 100644 --- a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc +++ b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ LilycoveCity_PokemonCenter_2F_EventObjects: @ 8531C70 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, 702 LilycoveCity_PokemonCenter_2F_MapWarps: @ 8531CD0 warp_def 1, 6, 4, 2, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc index dee64a91fa..228e56e4db 100644 --- a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc @@ -1,13 +1,13 @@ LilycoveCity_PokemonTrainerFanClub_EventObjects: @ 8531D20 - object_event 1, EVENT_OBJ_GFX_LASS, 0, 3, 11, 3, 7, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 8, 10, 3, 9, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 6, 11, 3, 7, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 5, 8, 3, 8, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 11, 3, 7, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, 791 - object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 1, 9, 3, 8, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, 790 - object_event 7, EVENT_OBJ_GFX_WOMAN_4, 0, 3, 10, 3, 10, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, 792 - object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 10, 10, 3, 9, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, 789 - object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 11, 5, 3, 8, 17, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, 730 + object_event 1, EVENT_OBJ_GFX_LASS, 0, 3, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 8, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 6, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 5, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, 791 + object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 1, 9, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, 790 + object_event 7, EVENT_OBJ_GFX_WOMAN_4, 0, 3, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, 792 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 10, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, 789 + object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 11, 5, 3, 8, 1, 1, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, 730 LilycoveCity_PokemonTrainerFanClub_MapWarps: @ 8531DF8 warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LinkContestRoom1.inc b/data/maps/events/LinkContestRoom1.inc index 0d524368e3..c1bdfe3fb4 100644 --- a/data/maps/events/LinkContestRoom1.inc +++ b/data/maps/events/LinkContestRoom1.inc @@ -1,18 +1,18 @@ LinkContestRoom1_EventObjects: @ 8539EFC - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, 8, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 7, 4, 3, 8, 0, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 4, 7, 3, 7, 0, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_TRADER, 0, 6, 7, 3, 7, 0, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_STORYTELLER, 0, 8, 7, 3, 7, 0, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 2, 6, 3, 10, 0, 0, 0, 0x0, 0 - object_event 7, 246, 0, 4, 2, 3, 8, 0, 0, 0, 0x0, 0 - object_event 8, 247, 0, 5, 2, 3, 8, 0, 0, 0, 0x0, 0 - object_event 9, 248, 0, 9, 2, 3, 8, 0, 0, 0, 0x0, 0 - object_event 10, 249, 0, 10, 2, 3, 8, 0, 0, 0, 0x0, 0 - object_event 11, 250, 0, 12, 5, 3, 9, 0, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 2, 5, 3, 10, 0, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, 1, 0, 0, 0, 0x0, 86 - object_event 14, EVENT_OBJ_GFX_GIDDY, 0, 10, 7, 3, 7, 0, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, 9, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, 8, 0, 0, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 7, 4, 3, 8, 0, 0, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 4, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_TRADER, 0, 6, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_STORYTELLER, 0, 8, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 2, 6, 3, 10, 0, 0, 0, 0, 0x0, 0 + object_event 7, 246, 0, 4, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 + object_event 8, 247, 0, 5, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 + object_event 9, 248, 0, 9, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 + object_event 10, 249, 0, 10, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 + object_event 11, 250, 0, 12, 5, 3, 9, 0, 0, 0, 0, 0x0, 0 + object_event 12, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 2, 5, 3, 10, 0, 0, 0, 0, 0x0, 0 + object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, 1, 0, 0, 0, 0, 0x0, 86 + object_event 14, EVENT_OBJ_GFX_GIDDY, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 + object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, 9, 0, 0, 0, 0, 0x0, 0 LinkContestRoom1_MapEvents:: @ 853A064 diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/events/LittlerootTown.inc index 47c07619fb..23b8cc3e5c 100644 --- a/data/maps/events/LittlerootTown.inc +++ b/data/maps/events/LittlerootTown.inc @@ -1,12 +1,12 @@ LittlerootTown_EventObjects: @ 85276A8 - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 16, 10, 3, 2, 33, 0, 0, LittlerootTown_EventScript_1E8034, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 13, 3, 2, 18, 0, 0, LittlerootTown_EventScript_1E8022, 868 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 14, 17, 3, 2, 18, 0, 0, LittlerootTown_EventScript_1E802B, 0 - object_event 4, EVENT_OBJ_GFX_MOM, 0, 5, 8, 3, 7, 0, 0, 0, LittlerootTown_EventScript_1E863D, 752 - object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 10, 4, 10, 0, 0, 0, 0x0, 761 - object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 10, 4, 10, 0, 0, 0, 0x0, 762 - object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 13, 10, 3, 7, 17, 0, 0, 0x0, 794 - object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 14, 10, 3, 7, 17, 0, 0, 0x0, 795 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 16, 10, 3, 2, 1, 2, 0, 0, LittlerootTown_EventScript_1E8034, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 13, 3, 2, 2, 1, 0, 0, LittlerootTown_EventScript_1E8022, 868 + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 14, 17, 3, 2, 2, 1, 0, 0, LittlerootTown_EventScript_1E802B, 0 + object_event 4, EVENT_OBJ_GFX_MOM, 0, 5, 8, 3, 7, 0, 0, 0, 0, LittlerootTown_EventScript_1E863D, 752 + object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 10, 4, 10, 0, 0, 0, 0, 0x0, 761 + object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 10, 4, 10, 0, 0, 0, 0, 0x0, 762 + object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 13, 10, 3, 7, 1, 1, 0, 0, 0x0, 794 + object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 14, 10, 3, 7, 1, 1, 0, 0, 0x0, 795 LittlerootTown_MapWarps: @ 8527768 warp_def 14, 8, 0, 1, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc index 9105ae42ce..cd08fbad8d 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc @@ -1,11 +1,11 @@ LittlerootTown_BrendansHouse_1F_EventObjects: @ 852D08C - object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 6, 3, 10, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, 758 - object_event 2, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 1, 3, 3, 28, 3, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, 755 - object_event 3, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 4, 5, 3, 65, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, 754 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 7, 3, 10, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, 784 - object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, 9, 17, 0, 0, 0x0, 734 - object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 5, 3, 5, 17, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, 735 - object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 8, 3, 7, 17, 0, 0, 0x0, 745 + object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 6, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, 758 + object_event 2, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 1, 3, 3, 28, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, 755 + object_event 3, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 4, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, 754 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 7, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, 784 + object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, 9, 1, 1, 0, 0, 0x0, 734 + object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 5, 3, 5, 1, 1, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, 735 + object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 8, 3, 7, 1, 1, 0, 0, 0x0, 745 LittlerootTown_BrendansHouse_1F_MapWarps: @ 852D134 warp_def 9, 8, 0, 1, MAP_LITTLEROOT_TOWN diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc index 094e010be8..a6649c9b6c 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc @@ -1,20 +1,20 @@ LittlerootTown_BrendansHouse_2F_EventObjects: @ 852D1A0 - object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, 8, 1, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, 760 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 1, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 0, 1, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 1, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 1, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 0, 1, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 4, 1, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 1, 0, 0, 1, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 1, 0, 1, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 2, 3, 1, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 3, 3, 1, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 4, 3, 1, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 5, 0, 1, 0, 0, 0, 0x0, 185 - object_event 14, EVENT_OBJ_GFX_MOM, 0, 7, 1, 3, 8, 1, 0, 0, 0x0, 757 - object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 4, 0, 1, 17, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, 817 - object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 5, 5, 3, 1, 17, 0, 0, 0x0, 815 + object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, 8, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, 760 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 1, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 1, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 0, 1, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 4, 1, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 2, 3, 1, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 3, 3, 1, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 4, 3, 1, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 5, 0, 1, 0, 0, 0, 0, 0x0, 185 + object_event 14, EVENT_OBJ_GFX_MOM, 0, 7, 1, 3, 8, 1, 0, 0, 0, 0x0, 757 + object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 4, 0, 1, 1, 1, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, 817 + object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 5, 5, 3, 1, 1, 1, 0, 0, 0x0, 815 LittlerootTown_BrendansHouse_2F_MapWarps: @ 852D320 warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/events/LittlerootTown_MaysHouse_1F.inc index aecede5ed0..6822c20e8f 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_1F.inc @@ -1,11 +1,11 @@ LittlerootTown_MaysHouse_1F_EventObjects: @ 852D36C - object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 6, 3, 9, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, 759 - object_event 2, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 6, 5, 3, 65, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, 754 - object_event 3, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 9, 3, 3, 27, 3, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, 755 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 7, 3, 9, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, 785 - object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, 10, 17, 0, 0, 0x0, 734 - object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 9, 5, 3, 5, 17, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, 736 - object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 2, 8, 3, 7, 17, 0, 0, 0x0, 746 + object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 6, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, 759 + object_event 2, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 6, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, 754 + object_event 3, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 9, 3, 3, 27, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, 755 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 7, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, 785 + object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, 10, 1, 1, 0, 0, 0x0, 734 + object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 9, 5, 3, 5, 1, 1, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, 736 + object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 2, 8, 3, 7, 1, 1, 0, 0, 0x0, 746 LittlerootTown_MaysHouse_1F_MapWarps: @ 852D414 warp_def 1, 8, 0, 0, MAP_LITTLEROOT_TOWN diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/events/LittlerootTown_MaysHouse_2F.inc index b2038db600..a5f1dd43c3 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_2F.inc @@ -1,20 +1,20 @@ LittlerootTown_MaysHouse_2F_EventObjects: @ 852D480 - object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 1, 1, 0, 8, 1, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, 722 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 0, 1, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 1, 6, 3, 1, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 2, 6, 0, 1, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 3, 6, 3, 1, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 4, 6, 3, 1, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 5, 6, 3, 1, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 7, 3, 1, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 7, 3, 1, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 2, 7, 3, 1, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 3, 7, 3, 1, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 4, 7, 3, 1, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 5, 7, 3, 1, 0, 0, 0, 0x0, 185 - object_event 14, EVENT_OBJ_GFX_MOM, 0, 1, 1, 3, 8, 1, 0, 0, 0x0, 757 - object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 4, 4, 8, 17, 0, 0, 0x0, 849 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 4, 0, 1, 17, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, 818 + object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 1, 1, 0, 8, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, 722 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 0, 1, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 1, 6, 3, 1, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 2, 6, 0, 1, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 3, 6, 3, 1, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 4, 6, 3, 1, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 5, 6, 3, 1, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 7, 3, 1, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 7, 3, 1, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 2, 7, 3, 1, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 3, 7, 3, 1, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 4, 7, 3, 1, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 5, 7, 3, 1, 0, 0, 0, 0, 0x0, 185 + object_event 14, EVENT_OBJ_GFX_MOM, 0, 1, 1, 3, 8, 1, 0, 0, 0, 0x0, 757 + object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 4, 4, 8, 1, 1, 0, 0, 0x0, 849 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 4, 0, 1, 1, 1, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, 818 LittlerootTown_MaysHouse_2F_MapWarps: @ 852D600 warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc index 318b3171ba..a4596ce5c8 100644 --- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc @@ -1,10 +1,10 @@ LittlerootTown_ProfessorBirchsLab_EventObjects: @ 852D64C - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 9, 8, 3, 2, 17, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84, 0 - object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 4, 3, 8, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, 721 - object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 7, 4, 3, 8, 17, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, 889 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, 8, 17, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB, 811 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, 8, 17, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, 812 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, 8, 17, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, 838 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 9, 8, 3, 2, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84, 0 + object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 4, 3, 8, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, 721 + object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 7, 4, 3, 8, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, 889 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, 8, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB, 811 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, 8, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, 812 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, 8, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, 838 LittlerootTown_ProfessorBirchsLab_MapWarps: @ 852D6DC warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN diff --git a/data/maps/events/MagmaHideout_1F.inc b/data/maps/events/MagmaHideout_1F.inc index 6418b5acc9..1274e2373f 100644 --- a/data/maps/events/MagmaHideout_1F.inc +++ b/data/maps/events/MagmaHideout_1F.inc @@ -1,10 +1,10 @@ MagmaHideout_1F_EventObjects: @ 85371CC - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 4, 5, 0, 10, 17, 1, 2, MagmaHideout_1F_EventScript_23988C, 857 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 20, 0, 1, 17, 0, 0, MagmaHideout_1F_EventScript_2914DE, 1151 - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 20, 3, 9, 17, 1, 4, MagmaHideout_1F_EventScript_2398A3, 857 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 22, 3, 1, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 17 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 22, 3, 1, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 18 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, 1, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 19 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 4, 5, 0, 10, 1, 1, 1, 2, MagmaHideout_1F_EventScript_23988C, 857 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 20, 0, 1, 1, 1, 0, 0, MagmaHideout_1F_EventScript_2914DE, 1151 + object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 20, 3, 9, 1, 1, 1, 4, MagmaHideout_1F_EventScript_2398A3, 857 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 17 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 18 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 19 MagmaHideout_1F_MapWarps: @ 853725C warp_def 10, 34, 3, 4, MAP_JAGGED_PASS diff --git a/data/maps/events/MagmaHideout_2F_1R.inc b/data/maps/events/MagmaHideout_2F_1R.inc index 51ca352a28..32f835efc1 100644 --- a/data/maps/events/MagmaHideout_2F_1R.inc +++ b/data/maps/events/MagmaHideout_2F_1R.inc @@ -1,8 +1,8 @@ MagmaHideout_2F_1R_EventObjects: @ 8537290 - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 18, 19, 3, 51, 69, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, 857 - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 14, 3, 46, 103, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, 857 - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 8, 3, 10, 17, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, 857 - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 11, 3, 7, 17, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, 857 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 18, 19, 3, 51, 5, 4, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, 857 + object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 14, 3, 46, 7, 6, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, 857 + object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 8, 3, 10, 1, 1, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, 857 + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 11, 3, 7, 1, 1, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, 857 MagmaHideout_2F_1R_MapWarps: @ 85372F0 warp_def 11, 23, 0, 0, MAP_MAGMA_HIDEOUT_2F_2R diff --git a/data/maps/events/MagmaHideout_2F_2R.inc b/data/maps/events/MagmaHideout_2F_2R.inc index 262fc33784..5567bf9cff 100644 --- a/data/maps/events/MagmaHideout_2F_2R.inc +++ b/data/maps/events/MagmaHideout_2F_2R.inc @@ -1,10 +1,10 @@ MagmaHideout_2F_2R_EventObjects: @ 853731C - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 29, 8, 3, 9, 17, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, 857 - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 25, 11, 3, 10, 17, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, 857 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 21, 7, 3, 1, 17, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, 1164 - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 9, 3, 8, 17, 1, 4, MagmaHideout_2F_2R_EventScript_239E1F, 857 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 7, 13, 3, 10, 17, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, 857 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, 1, 17, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, 1165 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 29, 8, 3, 9, 1, 1, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, 857 + object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 25, 11, 3, 10, 1, 1, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, 857 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 21, 7, 3, 1, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, 1164 + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 9, 3, 8, 1, 1, 1, 4, MagmaHideout_2F_2R_EventScript_239E1F, 857 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 7, 13, 3, 10, 1, 1, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, 857 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, 1, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, 1165 MagmaHideout_2F_2R_MapWarps: @ 85373AC warp_def 10, 22, 3, 0, MAP_MAGMA_HIDEOUT_2F_1R diff --git a/data/maps/events/MagmaHideout_3F_1R.inc b/data/maps/events/MagmaHideout_3F_1R.inc index c5710463db..b2f157f57b 100644 --- a/data/maps/events/MagmaHideout_3F_1R.inc +++ b/data/maps/events/MagmaHideout_3F_1R.inc @@ -1,7 +1,7 @@ MagmaHideout_3F_1R_EventObjects: @ 85373D0 - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 2, 7, 4, 10, 17, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, 857 - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 21, 21, 0, 9, 17, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, 857 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 16, 0, 1, 17, 0, 0, MagmaHideout_3F_1R_EventScript_291505, 1166 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 2, 7, 4, 10, 1, 1, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, 857 + object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 21, 21, 0, 9, 1, 1, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, 857 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 16, 0, 1, 1, 1, 0, 0, MagmaHideout_3F_1R_EventScript_291505, 1166 MagmaHideout_3F_1R_MapWarps: @ 8537418 warp_def 7, 21, 0, 0, MAP_MAGMA_HIDEOUT_4F diff --git a/data/maps/events/MagmaHideout_3F_2R.inc b/data/maps/events/MagmaHideout_3F_2R.inc index 59ff76519b..27ea129c35 100644 --- a/data/maps/events/MagmaHideout_3F_2R.inc +++ b/data/maps/events/MagmaHideout_3F_2R.inc @@ -1,6 +1,6 @@ MagmaHideout_3F_2R_EventObjects: @ 8537444 - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 3, 0, 17, 17, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, 857 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 9, 0, 1, 17, 0, 0, MagmaHideout_3F_2R_EventScript_291512, 1167 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 3, 0, 17, 1, 1, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, 857 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 9, 0, 1, 1, 1, 0, 0, MagmaHideout_3F_2R_EventScript_291512, 1167 MagmaHideout_3F_2R_MapWarps: @ 8537474 warp_def 12, 15, 0, 1, MAP_MAGMA_HIDEOUT_3F_1R diff --git a/data/maps/events/MagmaHideout_3F_3R.inc b/data/maps/events/MagmaHideout_3F_3R.inc index acbe985102..3f96b56528 100644 --- a/data/maps/events/MagmaHideout_3F_3R.inc +++ b/data/maps/events/MagmaHideout_3F_3R.inc @@ -1,5 +1,5 @@ MagmaHideout_3F_3R_EventObjects: @ 8537574 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 19, 0, 1, 17, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, 1059 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 19, 0, 1, 1, 1, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, 1059 MagmaHideout_3F_3R_MapWarps: @ 853758C warp_def 16, 1, 0, 1, MAP_MAGMA_HIDEOUT_2F_3R diff --git a/data/maps/events/MagmaHideout_4F.inc b/data/maps/events/MagmaHideout_4F.inc index 0c7b58257f..1865c3b845 100644 --- a/data/maps/events/MagmaHideout_4F.inc +++ b/data/maps/events/MagmaHideout_4F.inc @@ -1,12 +1,12 @@ MagmaHideout_4F_EventObjects: @ 8537490 - object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 16, 17, 0, 8, 17, 0, 0, 0x0, 853 - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 31, 22, 0, 10, 17, 1, 3, MagmaHideout_4F_EventScript_23A68C, 857 - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 13, 0, 9, 17, 1, 3, MagmaHideout_4F_EventScript_23A6A3, 857 - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 13, 0, 10, 17, 1, 3, MagmaHideout_4F_EventScript_23A6BA, 857 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 4, 0, 8, 17, 1, 4, MagmaHideout_4F_EventScript_23A6D1, 857 - object_event 6, EVENT_OBJ_GFX_MAXIE, 0, 16, 21, 0, 7, 17, 0, 0, MagmaHideout_4F_EventScript_23A560, 857 - object_event 7, EVENT_OBJ_GFX_GROUDON_2, 0, 16, 17, 3, 8, 17, 0, 0, 0x0, 850 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 0, 1, 17, 0, 0, MagmaHideout_4F_EventScript_29151F, 1168 + object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 16, 17, 0, 8, 1, 1, 0, 0, 0x0, 853 + object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 31, 22, 0, 10, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A68C, 857 + object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 13, 0, 9, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6A3, 857 + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 13, 0, 10, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6BA, 857 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 4, 0, 8, 1, 1, 1, 4, MagmaHideout_4F_EventScript_23A6D1, 857 + object_event 6, EVENT_OBJ_GFX_MAXIE, 0, 16, 21, 0, 7, 1, 1, 0, 0, MagmaHideout_4F_EventScript_23A560, 857 + object_event 7, EVENT_OBJ_GFX_GROUDON_2, 0, 16, 17, 3, 8, 1, 1, 0, 0, 0x0, 850 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 0, 1, 1, 1, 0, 0, MagmaHideout_4F_EventScript_29151F, 1168 MagmaHideout_4F_MapWarps: @ 8537550 warp_def 46, 7, 0, 0, MAP_MAGMA_HIDEOUT_3F_1R diff --git a/data/maps/events/MarineCave_End.inc b/data/maps/events/MarineCave_End.inc index a5db369da2..14903539b2 100644 --- a/data/maps/events/MarineCave_End.inc +++ b/data/maps/events/MarineCave_End.inc @@ -1,5 +1,5 @@ MarineCave_End_EventObjects: @ 85377E8 - object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 9, 22, 1, 8, 17, 0, 0, 0x0, 782 + object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 9, 22, 1, 8, 1, 1, 0, 0, 0x0, 782 MarineCave_End_MapWarps: @ 8537800 warp_def 20, 4, 0, 0, MAP_MARINE_CAVE_ENTRANCE diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/events/MauvilleCity.inc index b4a0eddafc..c8318005c4 100644 --- a/data/maps/events/MauvilleCity.inc +++ b/data/maps/events/MauvilleCity.inc @@ -1,15 +1,15 @@ MauvilleCity_EventObjects: @ 852662C - object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 29, 16, 3, 5, 17, 0, 0, MauvilleCity_EventScript_1DF3B3, 0 - object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 24, 10, 3, 5, 1, 0, 0, MauvilleCity_EventScript_1DF3CE, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 14, 11, 3, 10, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 6, 3, 1, 0, 0, 0, MauvilleCity_EventScript_1DF3C5, 0 - object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 17, 14, 3, 8, 0, 0, 0, MauvilleCity_EventScript_1DF3FB, 0 - object_event 6, EVENT_OBJ_GFX_WALLY, 0, 8, 6, 3, 7, 0, 0, 0, MauvilleCity_EventScript_1DF452, 804 - object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, 9, 0, 0, 0, MauvilleCity_EventScript_1DF41D, 805 - object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 29, 9, 3, 1, 0, 0, 0, MauvilleCity_EventScript_1DF73A, 912 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 19, 3, 1, 17, 0, 0, MauvilleCity_EventScript_2910CE, 1116 - object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 13, 7, 3, 9, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0 - object_event 11, EVENT_OBJ_GFX_SCOTT, 0, 12, 14, 3, 7, 0, 0, 0, 0x0, 765 + object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 29, 16, 3, 5, 1, 1, 0, 0, MauvilleCity_EventScript_1DF3B3, 0 + object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 24, 10, 3, 5, 1, 0, 0, 0, MauvilleCity_EventScript_1DF3CE, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 14, 11, 3, 10, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3C5, 0 + object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 17, 14, 3, 8, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3FB, 0 + object_event 6, EVENT_OBJ_GFX_WALLY, 0, 8, 6, 3, 7, 0, 0, 0, 0, MauvilleCity_EventScript_1DF452, 804 + object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_1DF41D, 805 + object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 29, 9, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF73A, 912 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 19, 3, 1, 1, 1, 0, 0, MauvilleCity_EventScript_2910CE, 1116 + object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 13, 7, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0 + object_event 11, EVENT_OBJ_GFX_SCOTT, 0, 12, 14, 3, 7, 0, 0, 0, 0, 0x0, 765 MauvilleCity_MapWarps: @ 8526734 warp_def 8, 5, 0, 0, MAP_MAUVILLE_CITY_GYM diff --git a/data/maps/events/MauvilleCity_BikeShop.inc b/data/maps/events/MauvilleCity_BikeShop.inc index dbd7cc7959..b4c0d19dfb 100644 --- a/data/maps/events/MauvilleCity_BikeShop.inc +++ b/data/maps/events/MauvilleCity_BikeShop.inc @@ -1,6 +1,6 @@ MauvilleCity_BikeShop_EventObjects: @ 852FE80 - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 2, 5, 3, 9, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EBBC, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 7, 6, 3, 2, 17, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0 + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 2, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EBBC, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 7, 6, 3, 2, 1, 1, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0 MauvilleCity_BikeShop_MapWarps: @ 852FEB0 warp_def 3, 8, 0, 2, MAP_MAUVILLE_CITY diff --git a/data/maps/events/MauvilleCity_GameCorner.inc b/data/maps/events/MauvilleCity_GameCorner.inc index 59a40a11fc..a956f16d83 100644 --- a/data/maps/events/MauvilleCity_GameCorner.inc +++ b/data/maps/events/MauvilleCity_GameCorner.inc @@ -1,16 +1,16 @@ MauvilleCity_GameCorner_EventObjects: @ 852FF28 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 7, 3, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210125, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 5, 3, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21012E, 0 - object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 11, 2, 3, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FBB9, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 14, 2, 3, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FCF1, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 3, 3, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210137, 0 - object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 19, 4, 3, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21021D, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN_2, 0, 20, 8, 3, 9, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210279, 0 - object_event 8, EVENT_OBJ_GFX_COOK, 0, 6, 8, 3, 10, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210289, 0 - object_event 9, EVENT_OBJ_GFX_BEAUTY, 0, 13, 2, 3, 8, 17, 0, 0, MauvilleCity_GameCorner_EventScript_20FE9F, 0 - object_event 10, EVENT_OBJ_GFX_MAN_4, 0, 1, 7, 3, 10, 17, 0, 0, MauvilleCity_GameCorner_EventScript_210299, 0 - object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 9, 8, 3, 9, 17, 0, 0, MauvilleCity_GameCorner_EventScript_2102B6, 0 - object_event 12, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 6, 3, 9, 17, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 7, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210125, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 5, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21012E, 0 + object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 11, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FBB9, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 14, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FCF1, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 3, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210137, 0 + object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 19, 4, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21021D, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_2, 0, 20, 8, 3, 9, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210279, 0 + object_event 8, EVENT_OBJ_GFX_COOK, 0, 6, 8, 3, 10, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210289, 0 + object_event 9, EVENT_OBJ_GFX_BEAUTY, 0, 13, 2, 3, 8, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_20FE9F, 0 + object_event 10, EVENT_OBJ_GFX_MAN_4, 0, 1, 7, 3, 10, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_210299, 0 + object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 9, 8, 3, 9, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102B6, 0 + object_event 12, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 6, 3, 9, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0 MauvilleCity_GameCorner_MapWarps: @ 8530048 warp_def 11, 10, 3, 5, MAP_MAUVILLE_CITY diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/events/MauvilleCity_Gym.inc index 30d757b433..08c8db4449 100644 --- a/data/maps/events/MauvilleCity_Gym.inc +++ b/data/maps/events/MauvilleCity_Gym.inc @@ -1,11 +1,11 @@ MauvilleCity_Gym_EventObjects: @ 852FD5C - object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 5, 2, 0, 8, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, 913 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 7, 8, 3, 8, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 1, 16, 0, 7, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 10, 0, 9, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0E7, 0 - object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 1, 13, 0, 8, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0B9, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 20, 0, 9, 0, 0, 0, MauvilleCity_Gym_EventScript_20E12C, 0 - object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 7, 10, 3, 7, 17, 1, 1, MauvilleCity_Gym_EventScript_20E115, 0 + object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 5, 2, 0, 8, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, 913 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 7, 8, 3, 8, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 1, 16, 0, 7, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 10, 0, 9, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0E7, 0 + object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 1, 13, 0, 8, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0B9, 0 + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 20, 0, 9, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20E12C, 0 + object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 7, 10, 3, 7, 1, 1, 1, 1, MauvilleCity_Gym_EventScript_20E115, 0 MauvilleCity_Gym_MapWarps: @ 852FE04 warp_def 4, 20, 0, 0, MAP_MAUVILLE_CITY diff --git a/data/maps/events/MauvilleCity_House1.inc b/data/maps/events/MauvilleCity_House1.inc index dcdec217ab..2590e33b9a 100644 --- a/data/maps/events/MauvilleCity_House1.inc +++ b/data/maps/events/MauvilleCity_House1.inc @@ -1,5 +1,5 @@ MauvilleCity_House1_EventObjects: @ 852FEEC - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 4, 3, 10, 0, 0, 0, MauvilleCity_House1_EventScript_20F976, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_House1_EventScript_20F976, 0 MauvilleCity_House1_MapWarps: @ 852FF04 warp_def 3, 7, 0, 4, MAP_MAUVILLE_CITY diff --git a/data/maps/events/MauvilleCity_House2.inc b/data/maps/events/MauvilleCity_House2.inc index 9dc17584a9..f8e04f5eae 100644 --- a/data/maps/events/MauvilleCity_House2.inc +++ b/data/maps/events/MauvilleCity_House2.inc @@ -1,5 +1,5 @@ MauvilleCity_House2_EventObjects: @ 853018C - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 5, 3, 9, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0 MauvilleCity_House2_MapWarps: @ 85301A4 warp_def 3, 8, 0, 6, MAP_MAUVILLE_CITY diff --git a/data/maps/events/MauvilleCity_Mart.inc b/data/maps/events/MauvilleCity_Mart.inc index be12e7d022..f678407833 100644 --- a/data/maps/events/MauvilleCity_Mart.inc +++ b/data/maps/events/MauvilleCity_Mart.inc @@ -1,7 +1,7 @@ MauvilleCity_Mart_EventObjects: @ 8530310 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, MauvilleCity_Mart_EventScript_2110E6, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, 10, 0, 0, 0, MauvilleCity_Mart_EventScript_21111C, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, 10, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_2110E6, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_21111C, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0 MauvilleCity_Mart_MapWarps: @ 8530358 warp_def 3, 7, 0, 3, MAP_MAUVILLE_CITY diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc index 6134b9d352..adab7d3e4f 100644 --- a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc +++ b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc @@ -1,9 +1,9 @@ MauvilleCity_PokemonCenter_1F_EventObjects: @ 85301C8 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E78, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 2, 3, 3, 9, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_28E066, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 8, 6, 3, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E86, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 4, 3, 3, 16, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E8F, 0 - object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 2, 8, 3, 1, 17, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E98, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E78, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 2, 3, 3, 9, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_28E066, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 8, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E86, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 4, 3, 3, 0, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E8F, 0 + object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 2, 8, 3, 1, 1, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E98, 0 MauvilleCity_PokemonCenter_1F_MapWarps: @ 8530240 warp_def 7, 8, 3, 1, MAP_MAUVILLE_CITY diff --git a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc index 52cf72422b..c3a0c4990a 100644 --- a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc +++ b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc @@ -1,9 +1,9 @@ MauvilleCity_PokemonCenter_2F_EventObjects: @ 853026C - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_276B03, 702 - object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 8, 8, 3, 7, 17, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_21102F, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 8, 8, 3, 7, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_21102F, 0 MauvilleCity_PokemonCenter_2F_MapWarps: @ 85302E4 warp_def 1, 6, 4, 2, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/events/MeteorFalls_1F_1R.inc index d0f3aa45e7..977559950b 100644 --- a/data/maps/events/MeteorFalls_1F_1R.inc +++ b/data/maps/events/MeteorFalls_1F_1R.inc @@ -1,14 +1,14 @@ MeteorFalls_1F_1R_EventObjects: @ 8533F74 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 4, 3, 1, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, 1044 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 14, 3, 1, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, 1046 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 5, 3, 1, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, 1045 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 32, 3, 1, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911D2, 1047 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 20, 3, 8, 0, 0, 0, 0x0, 939 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 21, 3, 9, 0, 0, 0, 0x0, 939 - object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 6, 20, 3, 10, 0, 0, 0, 0x0, 938 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 20, 3, 10, 0, 0, 0, 0x0, 938 - object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 21, 3, 1, 0, 0, 0, 0x0, 938 - object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 23, 3, 21, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, 942 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 4, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, 1044 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 14, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, 1046 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 5, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, 1045 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 32, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911D2, 1047 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 20, 3, 8, 0, 0, 0, 0, 0x0, 939 + object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 21, 3, 9, 0, 0, 0, 0, 0x0, 939 + object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938 + object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 21, 3, 1, 0, 0, 0, 0, 0x0, 938 + object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 23, 3, 21, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, 942 MeteorFalls_1F_1R_MapWarps: @ 8534064 warp_def 27, 18, 4, 0, MAP_ROUTE114 diff --git a/data/maps/events/MeteorFalls_1F_2R.inc b/data/maps/events/MeteorFalls_1F_2R.inc index c5bb29dfc2..0436851c5c 100644 --- a/data/maps/events/MeteorFalls_1F_2R.inc +++ b/data/maps/events/MeteorFalls_1F_2R.inc @@ -1,7 +1,7 @@ MeteorFalls_1F_2R_EventObjects: @ 85340C4 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 13, 2, 3, 8, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C4DE, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 12, 3, 8, 17, 1, 1, MeteorFalls_1F_2R_EventScript_22C540, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 12, 3, 8, 17, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 13, 2, 3, 8, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C4DE, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 12, 3, 8, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C540, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 12, 3, 8, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0 MeteorFalls_1F_2R_MapWarps: @ 853410C warp_def 10, 29, 3, 2, MAP_METEOR_FALLS_1F_1R diff --git a/data/maps/events/MeteorFalls_B1F_2R.inc b/data/maps/events/MeteorFalls_B1F_2R.inc index 8396ced4c6..8e2c9e1c4e 100644 --- a/data/maps/events/MeteorFalls_B1F_2R.inc +++ b/data/maps/events/MeteorFalls_B1F_2R.inc @@ -1,5 +1,5 @@ MeteorFalls_B1F_2R_EventObjects: @ 8534190 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, 1, 17, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, 1080 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, 1, 1, 1, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, 1080 MeteorFalls_B1F_2R_MapWarps: @ 85341A8 warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R diff --git a/data/maps/events/MeteorFalls_StevensCave.inc b/data/maps/events/MeteorFalls_StevensCave.inc index e5547c6987..ff920f86d5 100644 --- a/data/maps/events/MeteorFalls_StevensCave.inc +++ b/data/maps/events/MeteorFalls_StevensCave.inc @@ -1,5 +1,5 @@ MeteorFalls_StevensCave_EventObjects: @ 85378B0 - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 19, 3, 3, 7, 17, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 19, 3, 3, 7, 1, 1, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0 MeteorFalls_StevensCave_MapWarps: @ 85378C8 warp_def 10, 29, 3, 5, MAP_METEOR_FALLS_1F_1R diff --git a/data/maps/events/MirageTower_3F.inc b/data/maps/events/MirageTower_3F.inc index 4163ccee92..e12b4873d9 100644 --- a/data/maps/events/MirageTower_3F.inc +++ b/data/maps/events/MirageTower_3F.inc @@ -1,6 +1,6 @@ MirageTower_3F_EventObjects: @ 853761C - object_event 1, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 7, 3, 1, 17, 0, 0, MirageTower_3F_EventScript_2907A6, 17 - object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 8, 3, 1, 17, 0, 0, MirageTower_3F_EventScript_2907A6, 18 + object_event 1, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 7, 3, 1, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, 17 + object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 8, 3, 1, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, 18 MirageTower_3F_MapWarps: @ 853764C warp_def 18, 12, 3, 0, MAP_MIRAGE_TOWER_2F diff --git a/data/maps/events/MirageTower_4F.inc b/data/maps/events/MirageTower_4F.inc index f751efe027..7b215a83a1 100644 --- a/data/maps/events/MirageTower_4F.inc +++ b/data/maps/events/MirageTower_4F.inc @@ -1,7 +1,7 @@ MirageTower_4F_EventObjects: @ 8537670 - object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 5, 4, 4, 8, 17, 0, 0, MirageTower_4F_EventScript_23AD48, 963 - object_event 2, EVENT_OBJ_GFX_FOSSIL, 0, 7, 4, 0, 8, 17, 0, 0, MirageTower_4F_EventScript_23AD89, 964 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 7, 3, 1, 17, 0, 0, MirageTower_4F_EventScript_2907A6, 17 + object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 5, 4, 4, 8, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD48, 963 + object_event 2, EVENT_OBJ_GFX_FOSSIL, 0, 7, 4, 0, 8, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD89, 964 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 7, 3, 1, 1, 1, 0, 0, MirageTower_4F_EventScript_2907A6, 17 MirageTower_4F_MapWarps: @ 85376B8 warp_def 1, 4, 3, 1, MAP_MIRAGE_TOWER_3F diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/events/MossdeepCity.inc index 3d3a7ee4e2..d288400b56 100644 --- a/data/maps/events/MossdeepCity.inc +++ b/data/maps/events/MossdeepCity.inc @@ -1,21 +1,21 @@ MossdeepCity_EventObjects: @ 8527018 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 38, 12, 5, 2, 17, 0, 0, MossdeepCity_EventScript_1E4AD1, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 50, 34, 5, 5, 1, 0, 0, MossdeepCity_EventScript_1E4AF9, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 32, 12, 5, 2, 17, 0, 0, MossdeepCity_EventScript_1E4AB2, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 21, 5, 3, 16, 0, 0, MossdeepCity_EventScript_1E4AF0, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 45, 18, 7, 9, 0, 0, 0, MossdeepCity_EventScript_1E4B02, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 35, 5, 1, 0, 0, 0, MossdeepCity_EventScript_2910F5, 1043 - object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 55, 5, 7, 7, 0, 0, 0, MossdeepCity_EventScript_1E4C10, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_1, 0, 56, 21, 7, 10, 17, 0, 0, MossdeepCity_EventScript_1E4B0B, 0 - object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 23, 13, 5, 2, 17, 0, 0, MossdeepCity_EventScript_1E4C26, 0 - object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 23, 5, 8, 17, 0, 0, 0x0, 823 - object_event 11, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 24, 5, 7, 17, 0, 0, 0x0, 823 - object_event 12, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 25, 5, 8, 17, 0, 0, 0x0, 823 - object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 26, 5, 7, 17, 0, 0, 0x0, 823 - object_event 14, EVENT_OBJ_GFX_MAXIE, 0, 45, 25, 5, 9, 17, 0, 0, 0x0, 823 - object_event 15, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 25, 3, 64, 51, 0, 0, MossdeepCity_EventScript_2C81EE, 0 - object_event 16, EVENT_OBJ_GFX_SCOTT, 0, 61, 29, 5, 17, 0, 0, 0, MossdeepCity_EventScript_1E4C85, 788 - object_event 17, EVENT_OBJ_GFX_BLACK_BELT, 0, 31, 29, 3, 64, 51, 0, 0, MossdeepCity_EventScript_1E4C7C, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 38, 12, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AD1, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 50, 34, 5, 5, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 32, 12, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AB2, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 21, 5, 3, 0, 1, 0, 0, MossdeepCity_EventScript_1E4AF0, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 45, 18, 7, 9, 0, 0, 0, 0, MossdeepCity_EventScript_1E4B02, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 35, 5, 1, 0, 0, 0, 0, MossdeepCity_EventScript_2910F5, 1043 + object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 55, 5, 7, 7, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C10, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_1, 0, 56, 21, 7, 10, 1, 1, 0, 0, MossdeepCity_EventScript_1E4B0B, 0 + object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 23, 13, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_1E4C26, 0 + object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 23, 5, 8, 1, 1, 0, 0, 0x0, 823 + object_event 11, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 24, 5, 7, 1, 1, 0, 0, 0x0, 823 + object_event 12, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 25, 5, 8, 1, 1, 0, 0, 0x0, 823 + object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 26, 5, 7, 1, 1, 0, 0, 0x0, 823 + object_event 14, EVENT_OBJ_GFX_MAXIE, 0, 45, 25, 5, 9, 1, 1, 0, 0, 0x0, 823 + object_event 15, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 25, 3, 64, 3, 3, 0, 0, MossdeepCity_EventScript_2C81EE, 0 + object_event 16, EVENT_OBJ_GFX_SCOTT, 0, 61, 29, 5, 17, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, 788 + object_event 17, EVENT_OBJ_GFX_BLACK_BELT, 0, 31, 29, 3, 64, 3, 3, 0, 0, MossdeepCity_EventScript_1E4C7C, 0 MossdeepCity_MapWarps: @ 85271B0 warp_def 28, 9, 0, 0, MAP_MOSSDEEP_CITY_HOUSE1 diff --git a/data/maps/events/MossdeepCity_GameCorner_1F.inc b/data/maps/events/MossdeepCity_GameCorner_1F.inc index 00f32e95a6..42face3c4a 100644 --- a/data/maps/events/MossdeepCity_GameCorner_1F.inc +++ b/data/maps/events/MossdeepCity_GameCorner_1F.inc @@ -1,6 +1,6 @@ MossdeepCity_GameCorner_1F_EventObjects: @ 8532F40 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 2, 0, 8, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B54, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 4, 2, 0, 8, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B54, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 4, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0 MossdeepCity_GameCorner_1F_MapWarps: @ 8532F70 warp_def 5, 9, 0, 9, MAP_MOSSDEEP_CITY diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.inc b/data/maps/events/MossdeepCity_GameCorner_B1F.inc index 8a7cfe9399..7146d30b82 100644 --- a/data/maps/events/MossdeepCity_GameCorner_B1F.inc +++ b/data/maps/events/MossdeepCity_GameCorner_B1F.inc @@ -1,5 +1,5 @@ MossdeepCity_GameCorner_B1F_EventObjects: @ 8532FC0 - object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 6, 5, 3, 9, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 6, 5, 3, 9, 0, 0, 0, 0, 0x0, 0 MossdeepCity_GameCorner_B1F_MapWarps: @ 8532FD8 warp_def 3, 1, 0, 2, MAP_MOSSDEEP_CITY_GAME_CORNER_1F diff --git a/data/maps/events/MossdeepCity_Gym.inc b/data/maps/events/MossdeepCity_Gym.inc index 3071139a7a..e383463aff 100644 --- a/data/maps/events/MossdeepCity_Gym.inc +++ b/data/maps/events/MossdeepCity_Gym.inc @@ -1,40 +1,40 @@ MossdeepCity_Gym_EventObjects: @ 85324EC - object_event 1, EVENT_OBJ_GFX_TATE, 0, 23, 7, 0, 8, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0 - object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 30, 3, 8, 0, 1, 1, MossdeepCity_Gym_EventScript_220AFD, 0 - object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 5, 20, 3, 7, 0, 1, 1, MossdeepCity_Gym_EventScript_220B2B, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 4, 29, 3, 7, 0, 1, 1, MossdeepCity_Gym_EventScript_220B70, 0 - object_event 5, EVENT_OBJ_GFX_LASS, 0, 4, 23, 0, 7, 0, 1, 1, MossdeepCity_Gym_EventScript_220B59, 0 - object_event 6, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 9, 3, 8, 0, 1, 1, MossdeepCity_Gym_EventScript_220B14, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 6, 3, 0, 8, 0, 1, 1, MossdeepCity_Gym_EventScript_220B42, 0 - object_event 8, EVENT_OBJ_GFX_MAN_2, 0, 5, 33, 0, 8, 0, 0, 0, MossdeepCity_Gym_EventScript_220C11, 0 - object_event 9, EVENT_OBJ_GFX_LIZA, 0, 24, 7, 0, 8, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0 - object_event 10, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 2, 30, 3, 1, 17, 0, 0, 0x0, 0 - object_event 11, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 1, 29, 3, 1, 17, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 30, 3, 1, 17, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 5, 29, 3, 1, 17, 0, 0, 0x0, 0 - object_event 14, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 5, 21, 3, 1, 17, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 7, 9, 3, 1, 17, 0, 0, 0x0, 0 - object_event 16, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 10, 8, 3, 1, 17, 0, 0, 0x0, 0 - object_event 17, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 8, 3, 7, 17, 1, 1, MossdeepCity_Gym_EventScript_220B9E, 0 - object_event 18, EVENT_OBJ_GFX_HEX_MANIAC, 0, 7, 5, 3, 10, 17, 1, 1, MossdeepCity_Gym_EventScript_220B87, 0 - object_event 19, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 6, 6, 3, 1, 17, 0, 0, 0x0, 0 - object_event 20, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 5, 3, 1, 17, 0, 0, 0x0, 0 - object_event 21, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 11, 5, 3, 1, 17, 0, 0, 0x0, 0 - object_event 22, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 11, 34, 3, 1, 17, 0, 0, 0x0, 0 - object_event 23, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 33, 3, 1, 17, 0, 0, 0x0, 0 - object_event 24, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 34, 3, 1, 17, 0, 0, 0x0, 0 - object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 22, 25, 3, 7, 17, 1, 1, MossdeepCity_Gym_EventScript_220BCC, 0 - object_event 26, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 23, 26, 3, 1, 17, 0, 0, 0x0, 0 - object_event 27, EVENT_OBJ_GFX_LASS, 0, 25, 25, 0, 9, 17, 1, 1, MossdeepCity_Gym_EventScript_220BB5, 0 - object_event 28, EVENT_OBJ_GFX_HEX_MANIAC, 0, 22, 23, 3, 8, 17, 1, 1, MossdeepCity_Gym_EventScript_220BFA, 0 - object_event 29, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 21, 23, 3, 1, 17, 0, 0, 0x0, 0 - object_event 30, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 21, 22, 3, 1, 17, 0, 0, 0x0, 0 - object_event 31, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 22, 22, 3, 1, 17, 0, 0, 0x0, 0 - object_event 32, EVENT_OBJ_GFX_PSYCHIC_M, 0, 25, 22, 3, 7, 17, 1, 1, MossdeepCity_Gym_EventScript_220BE3, 0 - object_event 33, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 24, 22, 3, 1, 17, 0, 0, 0x0, 0 - object_event 34, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 24, 23, 3, 1, 17, 0, 0, 0x0, 0 - object_event 35, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 6, 5, 3, 1, 17, 0, 0, 0x0, 0 - object_event 36, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 23, 25, 3, 1, 17, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_TATE, 0, 23, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0 + object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 30, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220AFD, 0 + object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 5, 20, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B2B, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 4, 29, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B70, 0 + object_event 5, EVENT_OBJ_GFX_LASS, 0, 4, 23, 0, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B59, 0 + object_event 6, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 9, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B14, 0 + object_event 7, EVENT_OBJ_GFX_LASS, 0, 6, 3, 0, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B42, 0 + object_event 8, EVENT_OBJ_GFX_MAN_2, 0, 5, 33, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220C11, 0 + object_event 9, EVENT_OBJ_GFX_LIZA, 0, 24, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0 + object_event 10, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 2, 30, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 11, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 1, 29, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 12, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 30, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 13, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 5, 29, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 14, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 5, 21, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 15, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 7, 9, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 16, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 10, 8, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 17, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 8, 3, 7, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220B9E, 0 + object_event 18, EVENT_OBJ_GFX_HEX_MANIAC, 0, 7, 5, 3, 10, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220B87, 0 + object_event 19, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 6, 6, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 20, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 5, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 21, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 11, 5, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 22, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 11, 34, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 23, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 33, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 24, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 34, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 22, 25, 3, 7, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BCC, 0 + object_event 26, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 23, 26, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 27, EVENT_OBJ_GFX_LASS, 0, 25, 25, 0, 9, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BB5, 0 + object_event 28, EVENT_OBJ_GFX_HEX_MANIAC, 0, 22, 23, 3, 8, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BFA, 0 + object_event 29, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 21, 23, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 30, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 21, 22, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 31, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 22, 22, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 32, EVENT_OBJ_GFX_PSYCHIC_M, 0, 25, 22, 3, 7, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BE3, 0 + object_event 33, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 24, 22, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 34, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 24, 23, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 35, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 6, 5, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 36, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 23, 25, 3, 1, 1, 1, 0, 0, 0x0, 0 MossdeepCity_Gym_MapWarps: @ 853284C warp_def 6, 35, 3, 1, MAP_MOSSDEEP_CITY diff --git a/data/maps/events/MossdeepCity_House1.inc b/data/maps/events/MossdeepCity_House1.inc index 5da968bfa6..a7832fb095 100644 --- a/data/maps/events/MossdeepCity_House1.inc +++ b/data/maps/events/MossdeepCity_House1.inc @@ -1,6 +1,6 @@ MossdeepCity_House1_EventObjects: @ 8532978 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 3, 3, 3, 17, 0, 0, MossdeepCity_House1_EventScript_221FD6, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 4, 3, 9, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 3, 3, 3, 1, 1, 0, 0, MossdeepCity_House1_EventScript_221FD6, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0 MossdeepCity_House1_MapWarps: @ 85329A8 warp_def 3, 7, 0, 0, MAP_MOSSDEEP_CITY diff --git a/data/maps/events/MossdeepCity_House2.inc b/data/maps/events/MossdeepCity_House2.inc index f1b535b170..86ba589466 100644 --- a/data/maps/events/MossdeepCity_House2.inc +++ b/data/maps/events/MossdeepCity_House2.inc @@ -1,7 +1,7 @@ MossdeepCity_House2_EventObjects: @ 85329CC - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 6, 6, 3, 9, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 4, 4, 3, 8, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 5, 3, 7, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, 934 + object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0 + object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, 934 MossdeepCity_House2_MapWarps: @ 8532A14 warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY diff --git a/data/maps/events/MossdeepCity_House3.inc b/data/maps/events/MossdeepCity_House3.inc index 2cca573a81..e40e79e100 100644 --- a/data/maps/events/MossdeepCity_House3.inc +++ b/data/maps/events/MossdeepCity_House3.inc @@ -1,5 +1,5 @@ MossdeepCity_House3_EventObjects: @ 8532BD4 - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 4, 4, 3, 10, 0, 0, 0, MossdeepCity_House3_EventScript_2225C3, 0 + object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 4, 4, 3, 10, 0, 0, 0, 0, MossdeepCity_House3_EventScript_2225C3, 0 MossdeepCity_House3_MapWarps: @ 8532BEC warp_def 3, 7, 0, 5, MAP_MOSSDEEP_CITY diff --git a/data/maps/events/MossdeepCity_House4.inc b/data/maps/events/MossdeepCity_House4.inc index 30a5719a82..96d8fe7d89 100644 --- a/data/maps/events/MossdeepCity_House4.inc +++ b/data/maps/events/MossdeepCity_House4.inc @@ -1,7 +1,7 @@ MossdeepCity_House4_EventObjects: @ 8532CAC - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 9, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 6, 3, 5, 1, 0, 0, MossdeepCity_House4_EventScript_222DF7, 0 - object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 2, 4, 3, 1, 17, 0, 0, MossdeepCity_House4_EventScript_222E1E, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 6, 3, 5, 1, 0, 0, 0, MossdeepCity_House4_EventScript_222DF7, 0 + object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 2, 4, 3, 1, 1, 1, 0, 0, MossdeepCity_House4_EventScript_222E1E, 0 MossdeepCity_House4_MapWarps: @ 8532CF4 warp_def 4, 7, 0, 7, MAP_MOSSDEEP_CITY diff --git a/data/maps/events/MossdeepCity_Mart.inc b/data/maps/events/MossdeepCity_Mart.inc index 888473e5ca..d8314e6e53 100644 --- a/data/maps/events/MossdeepCity_Mart.inc +++ b/data/maps/events/MossdeepCity_Mart.inc @@ -1,8 +1,8 @@ MossdeepCity_Mart_EventObjects: @ 8532B50 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, MossdeepCity_Mart_EventScript_2223C8, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 1, 5, 3, 7, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 8, 3, 3, 3, 16, 0, 0, MossdeepCity_Mart_EventScript_2223FF, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 5, 3, 3, 2, 17, 0, 0, MossdeepCity_Mart_EventScript_222408, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223C8, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 1, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0 + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 8, 3, 3, 3, 0, 1, 0, 0, MossdeepCity_Mart_EventScript_2223FF, 0 + object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 5, 3, 3, 2, 1, 1, 0, 0, MossdeepCity_Mart_EventScript_222408, 0 MossdeepCity_Mart_MapWarps: @ 8532BB0 warp_def 3, 7, 0, 4, MAP_MOSSDEEP_CITY diff --git a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc index 999d16a110..7e56185b2b 100644 --- a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc +++ b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc @@ -1,7 +1,7 @@ MossdeepCity_PokemonCenter_1F_EventObjects: @ 8532A38 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22224E, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 4, 3, 7, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22225C, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 3, 5, 3, 1, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_222265, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22224E, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 4, 3, 7, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22225C, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 3, 5, 3, 1, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_222265, 0 MossdeepCity_PokemonCenter_1F_MapWarps: @ 8532A80 warp_def 7, 8, 3, 2, MAP_MOSSDEEP_CITY diff --git a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc index aa37daee52..c5d5af15ab 100644 --- a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc +++ b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc @@ -1,9 +1,9 @@ MossdeepCity_PokemonCenter_2F_EventObjects: @ 8532AAC - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, 702 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 7, 3, 5, 17, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 7, 3, 5, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0 MossdeepCity_PokemonCenter_2F_MapWarps: @ 8532B24 warp_def 1, 6, 4, 2, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc index 5ffce14441..fa5a8f3bb1 100644 --- a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc +++ b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc @@ -1,15 +1,15 @@ MossdeepCity_SpaceCenter_1F_EventObjects: @ 8532D18 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 7, 2, 3, 7, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_222FD8, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 2, 3, 7, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223063, 0 - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 6, 6, 3, 9, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 2, 3, 7, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223168, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 7, 3, 3, 17, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22312D, 0 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 12, 9, 3, 9, 17, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231DA, 756 - object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 11, 6, 3, 9, 17, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231F1, 756 - object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 10, 2, 3, 8, 17, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_223208, 756 - object_event 9, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 2, 3, 8, 17, 1, 0, MossdeepCity_SpaceCenter_1F_EventScript_22321F, 756 - object_event 10, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 5, 0, 76, 17, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, 737 - object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 1, 4, 3, 8, 17, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, 753 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 7, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_222FD8, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223063, 0 + object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223168, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 7, 3, 3, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22312D, 0 + object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 12, 9, 3, 9, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231DA, 756 + object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 11, 6, 3, 9, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231F1, 756 + object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 10, 2, 3, 8, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_223208, 756 + object_event 9, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 2, 3, 8, 1, 1, 1, 0, MossdeepCity_SpaceCenter_1F_EventScript_22321F, 756 + object_event 10, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 5, 0, 76, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, 737 + object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 1, 4, 3, 8, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, 753 MossdeepCity_SpaceCenter_1F_MapWarps: @ 8532E20 warp_def 7, 9, 0, 8, MAP_MOSSDEEP_CITY diff --git a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc index 30b594234b..bf143934ee 100644 --- a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc +++ b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc @@ -1,13 +1,13 @@ MossdeepCity_SpaceCenter_2F_EventObjects: @ 8532E4C - object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 6, 2, 3, 7, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 8, 3, 7, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 5, 6, 3, 2, 17, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223E8D, 0 - object_event 4, EVENT_OBJ_GFX_STEVEN, 0, 1, 8, 3, 8, 17, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F7A, 863 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 2, 3, 10, 17, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F3E, 862 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 3, 3, 7, 17, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F50, 862 - object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 2, 3, 9, 17, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F47, 862 - object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 3, 10, 17, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, 862 - object_event 9, EVENT_OBJ_GFX_MAXIE, 0, 1, 9, 3, 7, 17, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, 862 + object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 6, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 8, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 5, 6, 3, 2, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223E8D, 0 + object_event 4, EVENT_OBJ_GFX_STEVEN, 0, 1, 8, 3, 8, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F7A, 863 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 2, 3, 10, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F3E, 862 + object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 3, 3, 7, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F50, 862 + object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 2, 3, 9, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F47, 862 + object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 3, 10, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, 862 + object_event 9, EVENT_OBJ_GFX_MAXIE, 0, 1, 9, 3, 7, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, 862 MossdeepCity_SpaceCenter_2F_MapWarps: @ 8532F24 warp_def 13, 1, 0, 2, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/events/MossdeepCity_StevensHouse.inc index db7f2ed596..0ee8e7d153 100644 --- a/data/maps/events/MossdeepCity_StevensHouse.inc +++ b/data/maps/events/MossdeepCity_StevensHouse.inc @@ -1,7 +1,7 @@ MossdeepCity_StevensHouse_EventObjects: @ 8532C10 - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 6, 3, 10, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, 967 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, 1, 17, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, 968 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 4, 3, 76, 17, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, 727 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 6, 3, 10, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, 967 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, 1, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, 968 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 4, 3, 76, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, 727 MossdeepCity_StevensHouse_MapWarps: @ 8532C58 warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY diff --git a/data/maps/events/MtChimney.inc b/data/maps/events/MtChimney.inc index 3be5fbbe59..bb7e1a9131 100644 --- a/data/maps/events/MtChimney.inc +++ b/data/maps/events/MtChimney.inc @@ -1,34 +1,34 @@ MtChimney_EventObjects: @ 85347C8 - object_event 1, EVENT_OBJ_GFX_ARCHIE, 0, 24, 19, 3, 9, 0, 0, 0, MtChimney_EventScript_22EDD5, 926 - object_event 2, EVENT_OBJ_GFX_MAXIE, 0, 13, 6, 3, 10, 0, 0, 0, MtChimney_EventScript_22EE0B, 927 - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 11, 3, 9, 0, 1, 2, MtChimney_EventScript_22F06E, 927 - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 32, 5, 3, 9, 0, 0, 0, MtChimney_EventScript_22F0C0, 927 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 28, 12, 3, 10, 0, 0, 0, MtChimney_EventScript_22F0B7, 927 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 19, 39, 3, 10, 0, 0, 0, MtChimney_EventScript_22F05C, 926 - object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 5, 3, 10, 0, 0, 0, MtChimney_EventScript_22F053, 926 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 12, 3, 9, 0, 0, 0, MtChimney_EventScript_22F065, 926 - object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 19, 39, 3, 10, 0, 0, 0, MtChimney_EventScript_22EEF3, 994 - object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 39, 3, 9, 0, 0, 0, MtChimney_EventScript_22F0C9, 927 - object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 19, 3, 74, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 - object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 18, 3, 64, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 - object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 17, 3, 8, 0, 0, 0, MtChimney_EventScript_22F0A5, 927 - object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 20, 3, 65, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 - object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 22, 19, 3, 67, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 - object_event 16, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 21, 3, 7, 0, 0, 0, MtChimney_EventScript_22F0AE, 927 - object_event 17, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 19, 3, 10, 0, 0, 0, MtChimney_EventScript_22F09C, 927 - object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 12, 3, 66, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 - object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 29, 12, 3, 67, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 - object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 5, 3, 67, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 - object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 31, 5, 3, 66, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 - object_event 22, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 9, 16, 3, 10, 0, 1, 3, MtChimney_EventScript_22F085, 927 - object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 20, 39, 3, 67, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 - object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 21, 39, 3, 66, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 - object_event 25, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 16, 18, 3, 13, 0, 1, 3, MtChimney_EventScript_22F14A, 877 - object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 14, 7, 3, 70, 0, 1, 6, MtChimney_EventScript_22F1AC, 877 - object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 29, 7, 3, 17, 17, 1, 3, MtChimney_EventScript_22F1C3, 877 - object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 27, 17, 3, 16, 17, 1, 3, MtChimney_EventScript_22F1DA, 877 - object_event 29, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 13, 16, 3, 9, 17, 1, 3, MtChimney_EventScript_22F1F1, 927 - object_event 30, EVENT_OBJ_GFX_HIKER, 0, 7, 7, 3, 10, 17, 1, 6, MtChimney_EventScript_22F208, 877 + object_event 1, EVENT_OBJ_GFX_ARCHIE, 0, 24, 19, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, 926 + object_event 2, EVENT_OBJ_GFX_MAXIE, 0, 13, 6, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, 927 + object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 11, 3, 9, 0, 0, 1, 2, MtChimney_EventScript_22F06E, 927 + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 32, 5, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C0, 927 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 28, 12, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F0B7, 927 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F05C, 926 + object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 5, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F053, 926 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 12, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F065, 926 + object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EEF3, 994 + object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 39, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C9, 927 + object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 19, 3, 74, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 + object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 18, 3, 64, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 + object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 17, 3, 8, 0, 0, 0, 0, MtChimney_EventScript_22F0A5, 927 + object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 20, 3, 65, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 + object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 22, 19, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 + object_event 16, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 21, 3, 7, 0, 0, 0, 0, MtChimney_EventScript_22F0AE, 927 + object_event 17, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 19, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F09C, 927 + object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 12, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 + object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 29, 12, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 + object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 5, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 + object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 31, 5, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 + object_event 22, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 9, 16, 3, 10, 0, 0, 1, 3, MtChimney_EventScript_22F085, 927 + object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 20, 39, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 + object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 21, 39, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 + object_event 25, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 16, 18, 3, 13, 0, 0, 1, 3, MtChimney_EventScript_22F14A, 877 + object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 14, 7, 3, 70, 0, 0, 1, 6, MtChimney_EventScript_22F1AC, 877 + object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 29, 7, 3, 17, 1, 1, 1, 3, MtChimney_EventScript_22F1C3, 877 + object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 27, 17, 3, 16, 1, 1, 1, 3, MtChimney_EventScript_22F1DA, 877 + object_event 29, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 13, 16, 3, 9, 1, 1, 1, 3, MtChimney_EventScript_22F1F1, 927 + object_event 30, EVENT_OBJ_GFX_HIKER, 0, 7, 7, 3, 10, 1, 1, 1, 6, MtChimney_EventScript_22F208, 877 MtChimney_MapWarps: @ 8534A98 warp_def 17, 36, 0, 0, MAP_MT_CHIMNEY_CABLE_CAR_STATION diff --git a/data/maps/events/MtChimney_CableCarStation.inc b/data/maps/events/MtChimney_CableCarStation.inc index 5c3f44889a..19385b3d5a 100644 --- a/data/maps/events/MtChimney_CableCarStation.inc +++ b/data/maps/events/MtChimney_CableCarStation.inc @@ -1,6 +1,6 @@ MtChimney_CableCarStation_EventObjects: @ 8533CA8 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, 8, 0, 0, 0, MtChimney_CableCarStation_EventScript_22AC4B, 0 - object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, 1, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, 8, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_22AC4B, 0 + object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0 MtChimney_CableCarStation_MapWarps: @ 8533CD8 warp_def 6, 11, 0, 0, MAP_MT_CHIMNEY diff --git a/data/maps/events/MtPyre_1F.inc b/data/maps/events/MtPyre_1F.inc index 9cebbca5ec..80bf46c2e7 100644 --- a/data/maps/events/MtPyre_1F.inc +++ b/data/maps/events/MtPyre_1F.inc @@ -1,7 +1,7 @@ MtPyre_1F_EventObjects: @ 8534D64 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 21, 2, 3, 8, 17, 0, 0, MtPyre_1F_EventScript_230F3F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 17, 8, 3, 7, 17, 0, 0, MtPyre_1F_EventScript_230F78, 0 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 10, 3, 9, 17, 0, 0, MtPyre_1F_EventScript_230F81, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 21, 2, 3, 8, 1, 1, 0, 0, MtPyre_1F_EventScript_230F3F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 17, 8, 3, 7, 1, 1, 0, 0, MtPyre_1F_EventScript_230F78, 0 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 10, 3, 9, 1, 1, 0, 0, MtPyre_1F_EventScript_230F81, 0 MtPyre_1F_MapWarps: @ 8534DAC warp_def 17, 18, 3, 0, MAP_ROUTE122 diff --git a/data/maps/events/MtPyre_2F.inc b/data/maps/events/MtPyre_2F.inc index 9d9ceb3766..d5b24c06f5 100644 --- a/data/maps/events/MtPyre_2F.inc +++ b/data/maps/events/MtPyre_2F.inc @@ -1,12 +1,12 @@ MtPyre_2F_EventObjects: @ 8534DF0 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 6, 3, 10, 17, 1, 2, MtPyre_2F_EventScript_231128, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, 1, 17, 0, 0, MtPyre_2F_EventScript_2912FD, 1129 - object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 9, 3, 3, 10, 17, 0, 0, MtPyre_2F_EventScript_231116, 0 - object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 12, 10, 3, 8, 17, 0, 0, MtPyre_2F_EventScript_23111F, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 9, 3, 8, 17, 1, 1, MtPyre_2F_EventScript_23115A, 0 - object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 3, 9, 3, 8, 17, 1, 1, MtPyre_2F_EventScript_23113F, 0 - object_event 7, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 9, 3, 7, 17, 1, 2, MtPyre_2F_EventScript_23118C, 0 - object_event 8, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 6, 3, 17, 17, 1, 2, MtPyre_2F_EventScript_231175, 0 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 6, 3, 10, 1, 1, 1, 2, MtPyre_2F_EventScript_231128, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, 1, 1, 1, 0, 0, MtPyre_2F_EventScript_2912FD, 1129 + object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 9, 3, 3, 10, 1, 1, 0, 0, MtPyre_2F_EventScript_231116, 0 + object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 12, 10, 3, 8, 1, 1, 0, 0, MtPyre_2F_EventScript_23111F, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 9, 3, 8, 1, 1, 1, 1, MtPyre_2F_EventScript_23115A, 0 + object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 3, 9, 3, 8, 1, 1, 1, 1, MtPyre_2F_EventScript_23113F, 0 + object_event 7, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 9, 3, 7, 1, 1, 1, 2, MtPyre_2F_EventScript_23118C, 0 + object_event 8, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 6, 3, 17, 1, 1, 1, 2, MtPyre_2F_EventScript_231175, 0 MtPyre_2F_MapWarps: @ 8534EB0 warp_def 2, 1, 3, 4, MAP_MT_PYRE_1F diff --git a/data/maps/events/MtPyre_3F.inc b/data/maps/events/MtPyre_3F.inc index c788ae13d7..bf0d1af77c 100644 --- a/data/maps/events/MtPyre_3F.inc +++ b/data/maps/events/MtPyre_3F.inc @@ -1,8 +1,8 @@ MtPyre_3F_EventObjects: @ 8534EEC - object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, 18, 17, 1, 4, MtPyre_3F_EventScript_231753, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 11, 4, 3, 17, 17, 1, 4, MtPyre_3F_EventScript_23176A, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, 1, 17, 0, 0, MtPyre_3F_EventScript_29130A, 1120 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, 14, 17, 1, 4, MtPyre_3F_EventScript_231781, 0 + object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, 18, 1, 1, 1, 4, MtPyre_3F_EventScript_231753, 0 + object_event 2, EVENT_OBJ_GFX_LASS, 0, 11, 4, 3, 17, 1, 1, 1, 4, MtPyre_3F_EventScript_23176A, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, 1, 1, 1, 0, 0, MtPyre_3F_EventScript_29130A, 1120 + object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, 14, 1, 1, 1, 4, MtPyre_3F_EventScript_231781, 0 MtPyre_3F_MapWarps: @ 8534F4C warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F diff --git a/data/maps/events/MtPyre_4F.inc b/data/maps/events/MtPyre_4F.inc index 5374e60485..e39075d8b9 100644 --- a/data/maps/events/MtPyre_4F.inc +++ b/data/maps/events/MtPyre_4F.inc @@ -1,6 +1,6 @@ MtPyre_4F_EventObjects: @ 8534F90 - object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 7, 3, 24, 17, 1, 2, MtPyre_4F_EventScript_231C6E, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, 1, 17, 0, 0, MtPyre_4F_EventScript_291317, 1130 + object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 7, 3, 24, 1, 1, 1, 2, MtPyre_4F_EventScript_231C6E, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, 1, 1, 1, 0, 0, MtPyre_4F_EventScript_291317, 1130 MtPyre_4F_MapWarps: @ 8534FC0 warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F diff --git a/data/maps/events/MtPyre_5F.inc b/data/maps/events/MtPyre_5F.inc index 591b90bef4..03a9b773f4 100644 --- a/data/maps/events/MtPyre_5F.inc +++ b/data/maps/events/MtPyre_5F.inc @@ -1,6 +1,6 @@ MtPyre_5F_EventObjects: @ 8535004 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 7, 3, 17, 17, 1, 2, MtPyre_5F_EventScript_231BC9, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, 1, 17, 0, 0, MtPyre_5F_EventScript_291324, 1052 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 7, 3, 17, 1, 1, 1, 2, MtPyre_5F_EventScript_231BC9, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, 1, 1, 1, 0, 0, MtPyre_5F_EventScript_291324, 1052 MtPyre_5F_MapWarps: @ 8535034 warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F diff --git a/data/maps/events/MtPyre_6F.inc b/data/maps/events/MtPyre_6F.inc index 8c319b3a0b..1f00209b2c 100644 --- a/data/maps/events/MtPyre_6F.inc +++ b/data/maps/events/MtPyre_6F.inc @@ -1,7 +1,7 @@ MtPyre_6F_EventObjects: @ 8535070 - object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, 23, 17, 1, 3, MtPyre_6F_EventScript_231D3B, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, 1, 17, 0, 0, MtPyre_6F_EventScript_291331, 1089 - object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 10, 3, 3, 24, 17, 1, 3, MtPyre_6F_EventScript_231D9D, 0 + object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, 23, 1, 1, 1, 3, MtPyre_6F_EventScript_231D3B, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, 1, 1, 1, 0, 0, MtPyre_6F_EventScript_291331, 1089 + object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 10, 3, 3, 24, 1, 1, 1, 3, MtPyre_6F_EventScript_231D9D, 0 MtPyre_6F_MapWarps: @ 85350B8 warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F diff --git a/data/maps/events/MtPyre_Exterior.inc b/data/maps/events/MtPyre_Exterior.inc index cb3ea04d12..badd884f9a 100644 --- a/data/maps/events/MtPyre_Exterior.inc +++ b/data/maps/events/MtPyre_Exterior.inc @@ -1,6 +1,6 @@ MtPyre_Exterior_EventObjects: @ 85350DC - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 15, 3, 1, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, 1073 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 40, 3, 1, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, 1074 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 15, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, 1073 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 40, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, 1074 MtPyre_Exterior_MapWarps: @ 853510C warp_def 10, 42, 3, 1, MAP_MT_PYRE_1F diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/events/MtPyre_Summit.inc index 25b61fe193..2df3aaafd5 100644 --- a/data/maps/events/MtPyre_Summit.inc +++ b/data/maps/events/MtPyre_Summit.inc @@ -1,12 +1,12 @@ MtPyre_Summit_EventObjects: @ 85351A0 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 22, 5, 3, 8, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0 - object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, 7, 0, 0, 0, 0x0, 916 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 23, 5, 3, 8, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 15, 3, 10, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, 917 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 18, 3, 9, 0, 1, 3, MtPyre_Summit_EventScript_232414, 917 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 11, 3, 10, 0, 1, 3, MtPyre_Summit_EventScript_23242B, 917 - object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 25, 11, 3, 9, 17, 1, 3, MtPyre_Summit_EventScript_232442, 917 - object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, 7, 17, 0, 0, 0x0, 856 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 22, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0 + object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, 7, 0, 0, 0, 0, 0x0, 916 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 23, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 15, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, 917 + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 18, 3, 9, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, 917 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 11, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, 917 + object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 25, 11, 3, 9, 1, 1, 1, 3, MtPyre_Summit_EventScript_232442, 917 + object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, 7, 1, 1, 0, 0, 0x0, 856 MtPyre_Summit_MapWarps: @ 8535260 warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR diff --git a/data/maps/events/NavelRock_Bottom.inc b/data/maps/events/NavelRock_Bottom.inc index 49743dfe46..fec170ae9e 100644 --- a/data/maps/events/NavelRock_Bottom.inc +++ b/data/maps/events/NavelRock_Bottom.inc @@ -1,5 +1,5 @@ NavelRock_Bottom_EventObjects: @ 853DD50 - object_event 1, EVENT_OBJ_GFX_LUGIA, 0, 11, 13, 0, 8, 17, 0, 0, NavelRock_Bottom_EventScript_2692A2, 800 + object_event 1, EVENT_OBJ_GFX_LUGIA, 0, 11, 13, 0, 8, 1, 1, 0, 0, NavelRock_Bottom_EventScript_2692A2, 800 NavelRock_Bottom_MapWarps: @ 853DD68 warp_def 14, 19, 0, 0, MAP_NAVEL_ROCK_DOWN11 diff --git a/data/maps/events/NavelRock_Harbor.inc b/data/maps/events/NavelRock_Harbor.inc index 60e4a6935e..2ffdc5fa1c 100644 --- a/data/maps/events/NavelRock_Harbor.inc +++ b/data/maps/events/NavelRock_Harbor.inc @@ -1,6 +1,6 @@ NavelRock_Harbor_EventObjects: @ 853DA24 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, 7, 17, 0, 0, NavelRock_Harbor_EventScript_2690BD, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, 10, 17, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, 7, 1, 1, 0, 0, NavelRock_Harbor_EventScript_2690BD, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, 10, 1, 1, 0, 0, 0x0, 0 NavelRock_Harbor_MapWarps: @ 853DA54 warp_def 8, 2, 0, 0, MAP_NAVEL_ROCK_EXTERIOR diff --git a/data/maps/events/NavelRock_Top.inc b/data/maps/events/NavelRock_Top.inc index ec3d8322af..dc7c1e7dfd 100644 --- a/data/maps/events/NavelRock_Top.inc +++ b/data/maps/events/NavelRock_Top.inc @@ -1,5 +1,5 @@ NavelRock_Top_EventObjects: @ 853DB74 - object_event 1, EVENT_OBJ_GFX_HOOH, 0, 12, 4, 0, 8, 17, 0, 0, 0x0, 801 + object_event 1, EVENT_OBJ_GFX_HOOH, 0, 12, 4, 0, 8, 1, 1, 0, 0, 0x0, 801 NavelRock_Top_MapWarps: @ 853DB8C warp_def 13, 20, 3, 1, MAP_NAVEL_ROCK_UP4 diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/events/NewMauville_Inside.inc index 5ecd2f8bfd..794f1965c5 100644 --- a/data/maps/events/NewMauville_Inside.inc +++ b/data/maps/events/NewMauville_Inside.inc @@ -1,12 +1,12 @@ NewMauville_Inside_EventObjects: @ 85364A8 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 25, 3, 1, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, 1075 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 22, 3, 1, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, 1076 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 4, 3, 1, 17, 0, 0, NewMauville_Inside_EventScript_291206, 1110 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 10, 3, 1, 17, 0, 0, NewMauville_Inside_EventScript_291213, 1122 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, 1, 17, 0, 0, NewMauville_Inside_EventScript_291220, 1123 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 18, 3, 1, 17, 0, 0, NewMauville_Inside_EventScript_2377AF, 974 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, 1, 17, 0, 0, NewMauville_Inside_EventScript_2377FC, 975 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 10, 3, 1, 17, 0, 0, NewMauville_Inside_EventScript_237849, 976 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 25, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, 1075 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 22, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, 1076 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 4, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_291206, 1110 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 10, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_291213, 1122 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_291220, 1123 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 18, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377AF, 974 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377FC, 975 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 10, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_237849, 976 NewMauville_Inside_MapWarps: @ 8536568 warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE diff --git a/data/maps/events/OldaleTown.inc b/data/maps/events/OldaleTown.inc index c68db0e45b..b7bc6ab086 100644 --- a/data/maps/events/OldaleTown.inc +++ b/data/maps/events/OldaleTown.inc @@ -1,8 +1,8 @@ OldaleTown_EventObjects: @ 8527854 - object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 16, 11, 3, 9, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0 - object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 13, 7, 3, 8, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 8, 9, 3, 10, 0, 0, 0, OldaleTown_EventScript_1E901F, 0 - object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 11, 19, 3, 7, 17, 0, 0, OldaleTown_EventScript_1E9070, 979 + object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 16, 11, 3, 9, 0, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0 + object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 13, 7, 3, 8, 0, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 8, 9, 3, 10, 0, 0, 0, 0, OldaleTown_EventScript_1E901F, 0 + object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 11, 19, 3, 7, 1, 1, 0, 0, OldaleTown_EventScript_1E9070, 979 OldaleTown_MapWarps: @ 85278B4 warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1 diff --git a/data/maps/events/OldaleTown_House1.inc b/data/maps/events/OldaleTown_House1.inc index a6be12d7aa..cf853c8aca 100644 --- a/data/maps/events/OldaleTown_House1.inc +++ b/data/maps/events/OldaleTown_House1.inc @@ -1,5 +1,5 @@ OldaleTown_House1_EventObjects: @ 852D7B4 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, 2, 17, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, 2, 1, 1, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0 OldaleTown_House1_MapWarps: @ 852D7CC warp_def 3, 8, 0, 0, MAP_OLDALE_TOWN diff --git a/data/maps/events/OldaleTown_House2.inc b/data/maps/events/OldaleTown_House2.inc index 715dd39aa1..2feeb89499 100644 --- a/data/maps/events/OldaleTown_House2.inc +++ b/data/maps/events/OldaleTown_House2.inc @@ -1,6 +1,6 @@ OldaleTown_House2_EventObjects: @ 852D7F0 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, 10, 0, 0, 0, OldaleTown_House2_EventScript_1FBF5B, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 4, 3, 9, 0, 0, 0, OldaleTown_House2_EventScript_1FBF64, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, 10, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF5B, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 4, 3, 9, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF64, 0 OldaleTown_House2_MapWarps: @ 852D820 warp_def 3, 7, 0, 1, MAP_OLDALE_TOWN diff --git a/data/maps/events/OldaleTown_Mart.inc b/data/maps/events/OldaleTown_Mart.inc index b5e49095a8..f850fa4826 100644 --- a/data/maps/events/OldaleTown_Mart.inc +++ b/data/maps/events/OldaleTown_Mart.inc @@ -1,7 +1,7 @@ OldaleTown_Mart_EventObjects: @ 852D95C - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, OldaleTown_Mart_EventScript_1FC240, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, 10, 0, 0, 0, OldaleTown_Mart_EventScript_1FC28A, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 4, 3, 3, 16, 0, 0, OldaleTown_Mart_EventScript_1FC2A9, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC240, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC28A, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 4, 3, 3, 0, 1, 0, 0, OldaleTown_Mart_EventScript_1FC2A9, 0 OldaleTown_Mart_MapWarps: @ 852D9A4 warp_def 3, 7, 0, 3, MAP_OLDALE_TOWN diff --git a/data/maps/events/OldaleTown_PokemonCenter_1F.inc b/data/maps/events/OldaleTown_PokemonCenter_1F.inc index 6aff860668..bb102baab8 100644 --- a/data/maps/events/OldaleTown_PokemonCenter_1F.inc +++ b/data/maps/events/OldaleTown_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ OldaleTown_PokemonCenter_1F_EventObjects: @ 852D844 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC01A, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 4, 3, 8, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC028, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 10, 6, 3, 10, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC031, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 3, 7, 3, 10, 17, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC03A, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC01A, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 4, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC028, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 10, 6, 3, 10, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC031, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 3, 7, 3, 10, 1, 1, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC03A, 0 OldaleTown_PokemonCenter_1F_MapWarps: @ 852D8A4 warp_def 7, 8, 3, 2, MAP_OLDALE_TOWN diff --git a/data/maps/events/OldaleTown_PokemonCenter_2F.inc b/data/maps/events/OldaleTown_PokemonCenter_2F.inc index d0fc7a9d32..b25b155eaa 100644 --- a/data/maps/events/OldaleTown_PokemonCenter_2F.inc +++ b/data/maps/events/OldaleTown_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ OldaleTown_PokemonCenter_2F_EventObjects: @ 852D8D0 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 3, 8, 17, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 17, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 3, 8, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, 702 OldaleTown_PokemonCenter_2F_MapWarps: @ 852D930 warp_def 1, 6, 4, 2, MAP_OLDALE_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/events/PacifidlogTown.inc b/data/maps/events/PacifidlogTown.inc index ab11ee74ed..41d54e9fc2 100644 --- a/data/maps/events/PacifidlogTown.inc +++ b/data/maps/events/PacifidlogTown.inc @@ -1,7 +1,7 @@ PacifidlogTown_EventObjects: @ 8527DE8 - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 10, 23, 3, 9, 0, 0, 0, PacifidlogTown_EventScript_1EBACC, 0 - object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 11, 14, 3, 10, 0, 0, 0, PacifidlogTown_EventScript_1EBAD5, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 9, 16, 3, 8, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 10, 23, 3, 9, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBACC, 0 + object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 11, 14, 3, 10, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAD5, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 9, 16, 3, 8, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0 PacifidlogTown_MapWarps: @ 8527E30 warp_def 8, 15, 0, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/events/PacifidlogTown_House1.inc b/data/maps/events/PacifidlogTown_House1.inc index 21dc0c13f7..77ca4c832c 100644 --- a/data/maps/events/PacifidlogTown_House1.inc +++ b/data/maps/events/PacifidlogTown_House1.inc @@ -1,6 +1,6 @@ PacifidlogTown_House1_EventObjects: @ 852EBA0 - object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 3, 5, 3, 8, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, 9, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0 + object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 3, 5, 3, 8, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, 9, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0 PacifidlogTown_House1_MapWarps: @ 852EBD0 warp_def 4, 8, 0, 1, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/events/PacifidlogTown_House2.inc b/data/maps/events/PacifidlogTown_House2.inc index a16c5220b5..4505330147 100644 --- a/data/maps/events/PacifidlogTown_House2.inc +++ b/data/maps/events/PacifidlogTown_House2.inc @@ -1,7 +1,7 @@ PacifidlogTown_House2_EventObjects: @ 852EBF4 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 5, 3, 8, 17, 0, 0, PacifidlogTown_House2_EventScript_203792, 0 - object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 8, 6, 3, 1, 17, 0, 0, PacifidlogTown_House2_EventScript_203891, 0 - object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 1, 7, 3, 1, 17, 0, 0, PacifidlogTown_House2_EventScript_2038AC, 0 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 5, 3, 8, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_203792, 0 + object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 8, 6, 3, 1, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_203891, 0 + object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 1, 7, 3, 1, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_2038AC, 0 PacifidlogTown_House2_MapWarps: @ 852EC3C warp_def 4, 8, 0, 2, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/events/PacifidlogTown_House3.inc b/data/maps/events/PacifidlogTown_House3.inc index 649f6b2885..635ba86a79 100644 --- a/data/maps/events/PacifidlogTown_House3.inc +++ b/data/maps/events/PacifidlogTown_House3.inc @@ -1,6 +1,6 @@ PacifidlogTown_House3_EventObjects: @ 852EC60 - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 3, 5, 3, 18, 0, 0, 0, PacifidlogTown_House3_EventScript_203CB5, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 4, 2, 3, 10, 17, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 3, 5, 3, 18, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_203CB5, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 4, 2, 3, 10, 1, 1, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0 PacifidlogTown_House3_MapWarps: @ 852EC90 warp_def 4, 8, 0, 3, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/events/PacifidlogTown_House4.inc b/data/maps/events/PacifidlogTown_House4.inc index f9b415d680..e5f8dd4f1f 100644 --- a/data/maps/events/PacifidlogTown_House4.inc +++ b/data/maps/events/PacifidlogTown_House4.inc @@ -1,7 +1,7 @@ PacifidlogTown_House4_EventObjects: @ 852ECB4 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 8, 0, 0, 0, PacifidlogTown_House4_EventScript_203F55, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 7, 5, 3, 2, 17, 0, 0, PacifidlogTown_House4_EventScript_203F4C, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 4, 3, 2, 17, 0, 0, PacifidlogTown_House4_EventScript_203F5E, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 8, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_203F55, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 7, 5, 3, 2, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F4C, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 4, 3, 2, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F5E, 0 PacifidlogTown_House4_MapWarps: @ 852ECFC warp_def 4, 8, 0, 4, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/events/PacifidlogTown_House5.inc b/data/maps/events/PacifidlogTown_House5.inc index a5548861d4..febb80ad63 100644 --- a/data/maps/events/PacifidlogTown_House5.inc +++ b/data/maps/events/PacifidlogTown_House5.inc @@ -1,6 +1,6 @@ PacifidlogTown_House5_EventObjects: @ 852ED20 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 4, 3, 10, 0, 0, 0, PacifidlogTown_House5_EventScript_204111, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 4, 3, 10, 0, 0, 0, PacifidlogTown_House5_EventScript_204137, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204111, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204137, 0 PacifidlogTown_House5_MapWarps: @ 852ED50 warp_def 4, 8, 0, 5, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc index 13525ab164..66b8caa676 100644 --- a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc +++ b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc @@ -1,9 +1,9 @@ PacifidlogTown_PokemonCenter_1F_EventObjects: @ 852EA70 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034B6, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 6, 3, 9, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034D6, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 3, 7, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034C4, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 4, 5, 3, 1, 17, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034CD, 0 - object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 12, 8, 3, 7, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034B6, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 6, 3, 9, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034D6, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034C4, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 4, 5, 3, 1, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034CD, 0 + object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 12, 8, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0 PacifidlogTown_PokemonCenter_1F_MapWarps: @ 852EAE8 warp_def 7, 8, 3, 0, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc index 3d4626c692..1aa2799809 100644 --- a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc +++ b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ PacifidlogTown_PokemonCenter_2F_EventObjects: @ 852EB14 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, 702 PacifidlogTown_PokemonCenter_2F_MapWarps: @ 852EB74 warp_def 1, 6, 4, 2, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/events/PetalburgCity.inc index a5f45989b0..29fe0e02e5 100644 --- a/data/maps/events/PetalburgCity.inc +++ b/data/maps/events/PetalburgCity.inc @@ -1,13 +1,13 @@ PetalburgCity_EventObjects: @ 8525FD0 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 18, 3, 2, 17, 0, 0, PetalburgCity_EventScript_1DC3FD, 728 - object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, 7, 0, 0, 0, 0x0, 726 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, 8, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0 - object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 20, 10, 3, 3, 16, 0, 0, PetalburgCity_EventScript_1DC488, 0 - object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 15, 10, 3, 7, 0, 0, 0, 0x0, 830 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 2, 3, 1, 0, 0, 0, PetalburgCity_EventScript_2910B4, 1039 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 28, 3, 1, 0, 0, 0, PetalburgCity_EventScript_2910C1, 1040 - object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 12, 15, 3, 1, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0 - object_event 9, EVENT_OBJ_GFX_SCOTT, 0, 13, 12, 3, 1, 17, 0, 0, 0x0, 995 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 18, 3, 2, 1, 1, 0, 0, PetalburgCity_EventScript_1DC3FD, 728 + object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 726 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, 8, 0, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0 + object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 20, 10, 3, 3, 0, 1, 0, 0, PetalburgCity_EventScript_1DC488, 0 + object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 830 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 2, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910B4, 1039 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 28, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910C1, 1040 + object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 12, 15, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0 + object_event 9, EVENT_OBJ_GFX_SCOTT, 0, 13, 12, 3, 1, 1, 1, 0, 0, 0x0, 995 PetalburgCity_MapWarps: @ 85260A8 warp_def 10, 19, 0, 0, MAP_PETALBURG_CITY_HOUSE1 diff --git a/data/maps/events/PetalburgCity_Gym.inc b/data/maps/events/PetalburgCity_Gym.inc index 26d9921727..2df386d2ce 100644 --- a/data/maps/events/PetalburgCity_Gym.inc +++ b/data/maps/events/PetalburgCity_Gym.inc @@ -1,15 +1,15 @@ PetalburgCity_Gym_EventObjects: @ 852EDC8 - object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 2, 0, 8, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, 772 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 94, 3, 8, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 4, 81, 3, 8, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 4, 42, 3, 8, 0, 1, 0, PetalburgCity_Gym_EventScript_2053F6, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 55, 3, 8, 0, 1, 0, PetalburgCity_Gym_EventScript_2054E6, 0 - object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 4, 68, 3, 8, 0, 1, 0, PetalburgCity_Gym_EventScript_205432, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 16, 3, 8, 0, 1, 0, PetalburgCity_Gym_EventScript_205522, 0 - object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 4, 29, 3, 8, 0, 1, 0, PetalburgCity_Gym_EventScript_20546E, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 3, 109, 3, 8, 0, 0, 0, PetalburgCity_Gym_EventScript_20574F, 781 - object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, 7, 0, 0, 0, 0x0, 866 - object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 1, 7, 3, 7, 17, 0, 0, 0x0, 824 + object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 2, 0, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, 772 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 94, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 4, 81, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 4, 42, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053F6, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 55, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054E6, 0 + object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 4, 68, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205432, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 16, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205522, 0 + object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 4, 29, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_20546E, 0 + object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 3, 109, 3, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_20574F, 781 + object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, 7, 0, 0, 0, 0, 0x0, 866 + object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 1, 7, 3, 7, 1, 1, 0, 0, 0x0, 824 PetalburgCity_Gym_MapWarps: @ 852EED0 warp_def 4, 111, 3, 2, MAP_PETALBURG_CITY diff --git a/data/maps/events/PetalburgCity_House1.inc b/data/maps/events/PetalburgCity_House1.inc index b4667f6ed0..dcd3b071f6 100644 --- a/data/maps/events/PetalburgCity_House1.inc +++ b/data/maps/events/PetalburgCity_House1.inc @@ -1,6 +1,6 @@ PetalburgCity_House1_EventObjects: @ 852F0BC - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 7, 4, 3, 2, 34, 0, 0, PetalburgCity_House1_EventScript_2077A3, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 7, 4, 3, 2, 2, 2, 0, 0, PetalburgCity_House1_EventScript_2077A3, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0 PetalburgCity_House1_MapWarps: @ 852F0EC warp_def 3, 8, 0, 0, MAP_PETALBURG_CITY diff --git a/data/maps/events/PetalburgCity_House2.inc b/data/maps/events/PetalburgCity_House2.inc index 85e686c19f..7d1a863cb4 100644 --- a/data/maps/events/PetalburgCity_House2.inc +++ b/data/maps/events/PetalburgCity_House2.inc @@ -1,6 +1,6 @@ PetalburgCity_House2_EventObjects: @ 852F110 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 5, 3, 2, 17, 0, 0, PetalburgCity_House2_EventScript_2078F3, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 5, 3, 8, 0, 0, 0, PetalburgCity_House2_EventScript_2078FC, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 5, 3, 2, 1, 1, 0, 0, PetalburgCity_House2_EventScript_2078F3, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 5, 3, 8, 0, 0, 0, 0, PetalburgCity_House2_EventScript_2078FC, 0 PetalburgCity_House2_MapWarps: @ 852F140 warp_def 3, 7, 0, 4, MAP_PETALBURG_CITY diff --git a/data/maps/events/PetalburgCity_Mart.inc b/data/maps/events/PetalburgCity_Mart.inc index 8dedf60a7b..3dc327c6ad 100644 --- a/data/maps/events/PetalburgCity_Mart.inc +++ b/data/maps/events/PetalburgCity_Mart.inc @@ -1,8 +1,8 @@ PetalburgCity_Mart_EventObjects: @ 852F294 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, PetalburgCity_Mart_EventScript_207D69, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 9, 4, 3, 10, 0, 0, 0, PetalburgCity_Mart_EventScript_207DE8, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 6, 3, 3, 8, 0, 0, 0, PetalburgCity_Mart_EventScript_207DDF, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, 10, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207D69, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 9, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DE8, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 6, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DDF, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0 PetalburgCity_Mart_MapWarps: @ 852F2F4 warp_def 3, 7, 0, 5, MAP_PETALBURG_CITY diff --git a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc index 29b3917f51..e7a4ec6e68 100644 --- a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc +++ b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc @@ -1,9 +1,9 @@ PetalburgCity_PokemonCenter_1F_EventObjects: @ 852F164 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_2079FC, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 11, 2, 3, 8, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_291539, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 3, 3, 8, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A0A, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 9, 6, 3, 2, 17, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A13, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 4, 3, 1, 17, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_2079FC, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 11, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_291539, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A0A, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 9, 6, 3, 2, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A13, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 4, 3, 1, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0 PetalburgCity_PokemonCenter_1F_MapWarps: @ 852F1DC warp_def 7, 8, 3, 3, MAP_PETALBURG_CITY diff --git a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc index 9ebe184efa..7d2ff52f47 100644 --- a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc +++ b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ PetalburgCity_PokemonCenter_2F_EventObjects: @ 852F208 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, 702 PetalburgCity_PokemonCenter_2F_MapWarps: @ 852F268 warp_def 1, 6, 4, 2, MAP_PETALBURG_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/PetalburgCity_WallysHouse.inc b/data/maps/events/PetalburgCity_WallysHouse.inc index d681d2b921..563d61579c 100644 --- a/data/maps/events/PetalburgCity_WallysHouse.inc +++ b/data/maps/events/PetalburgCity_WallysHouse.inc @@ -1,6 +1,6 @@ PetalburgCity_WallysHouse_EventObjects: @ 852ED74 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 3, 4, 3, 10, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 5, 3, 9, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 3, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 5, 3, 9, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0 PetalburgCity_WallysHouse_MapWarps: @ 852EDA4 warp_def 3, 7, 0, 1, MAP_PETALBURG_CITY diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc index 08fe0e6ae1..da904f8ef0 100644 --- a/data/maps/events/PetalburgWoods.inc +++ b/data/maps/events/PetalburgWoods.inc @@ -1,17 +1,17 @@ PetalburgWoods_EventObjects: @ 85345E4 - object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 10, 3, 1, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 17 - object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 11, 3, 1, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 18 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 17, 3, 10, 0, 0, 0, 0x0, 725 - object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 26, 20, 3, 1, 0, 0, 0, 0x0, 724 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 45, 7, 3, 8, 0, 0, 0, PetalburgWoods_EventScript_29110F, 1056 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 35, 20, 3, 8, 0, 0, 0, PetalburgWoods_EventScript_291102, 1055 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 8, 3, 1, 0, 0, 0, PetalburgWoods_EventScript_29111C, 1058 - object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 15, 19, 3, 3, 33, 0, 0, PetalburgWoods_EventScript_22E210, 0 - object_event 9, EVENT_OBJ_GFX_BUG_CATCHER, 0, 7, 32, 3, 22, 0, 1, 3, PetalburgWoods_EventScript_22E26D, 0 - object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 4, 14, 3, 20, 0, 1, 3, PetalburgWoods_EventScript_22E284, 0 - object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 30, 34, 3, 2, 18, 0, 0, PetalburgWoods_EventScript_22E219, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 26, 3, 1, 17, 0, 0, PetalburgWoods_EventScript_291129, 1117 - object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 33, 5, 3, 1, 17, 0, 0, PetalburgWoods_EventScript_22E222, 0 + object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 10, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 17 + object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 11, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 18 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 17, 3, 10, 0, 0, 0, 0, 0x0, 725 + object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 26, 20, 3, 1, 0, 0, 0, 0, 0x0, 724 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 45, 7, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_29110F, 1056 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 35, 20, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_291102, 1055 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 8, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_29111C, 1058 + object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 15, 19, 3, 3, 1, 2, 0, 0, PetalburgWoods_EventScript_22E210, 0 + object_event 9, EVENT_OBJ_GFX_BUG_CATCHER, 0, 7, 32, 3, 22, 0, 0, 1, 3, PetalburgWoods_EventScript_22E26D, 0 + object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 4, 14, 3, 20, 0, 0, 1, 3, PetalburgWoods_EventScript_22E284, 0 + object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 30, 34, 3, 2, 2, 1, 0, 0, PetalburgWoods_EventScript_22E219, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 26, 3, 1, 1, 1, 0, 0, PetalburgWoods_EventScript_291129, 1117 + object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 33, 5, 3, 1, 1, 1, 0, 0, PetalburgWoods_EventScript_22E222, 0 PetalburgWoods_MapWarps: @ 853471C warp_def 14, 5, 0, 2, MAP_ROUTE104 diff --git a/data/maps/events/RecordCorner.inc b/data/maps/events/RecordCorner.inc index 3019e5f3c0..7970c14bad 100644 --- a/data/maps/events/RecordCorner.inc +++ b/data/maps/events/RecordCorner.inc @@ -1,5 +1,5 @@ RecordCorner_EventObjects: @ 8539DFC - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 10, 5, 3, 8, 0, 0, 0, RecordCorner_EventScript_2774C6, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 10, 5, 3, 8, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0 RecordCorner_MapWarps: @ 8539E14 warp_def 8, 9, 3, 127, MAP_NONE diff --git a/data/maps/events/Route101.inc b/data/maps/events/Route101.inc index f8c17146b9..82b674f9e0 100644 --- a/data/maps/events/Route101.inc +++ b/data/maps/events/Route101.inc @@ -1,10 +1,10 @@ Route101_EventObjects: @ 8527E98 - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 8, 3, 1, 0, 0, 0, Route101_EventScript_1EBDFB, 0 - object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, 71, 0, 0, 0, 0x0, 720 - object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, 1, 0, 0, 0, Route101_EventScript_1EBE16, 700 - object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_1, 0, 10, 13, 0, 70, 0, 0, 0, 0x0, 750 - object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, 1, 0, 0, 0, Route101_EventScript_272141, 897 - object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, 5, 17, 0, 0, Route101_EventScript_1EBE04, 991 + object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 8, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0 + object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, 71, 0, 0, 0, 0, 0x0, 720 + object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBE16, 700 + object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_1, 0, 10, 13, 0, 70, 0, 0, 0, 0, 0x0, 750 + object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, 1, 0, 0, 0, 0, Route101_EventScript_272141, 897 + object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, 5, 1, 1, 0, 0, Route101_EventScript_1EBE04, 991 Route101_MapCoordEvents: @ 8527F28 coord_event 10, 19, 3, 0, VAR_0x4060, 1, 0, Route101_EventScript_1EBCDE diff --git a/data/maps/events/Route102.inc b/data/maps/events/Route102.inc index 68abe716b3..fc30a195c3 100644 --- a/data/maps/events/Route102.inc +++ b/data/maps/events/Route102.inc @@ -1,13 +1,13 @@ Route102_EventObjects: @ 8527FD8 - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 18, 11, 3, 1, 0, 0, 0, Route102_EventScript_1EC0E1, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 14, 3, 8, 0, 1, 3, Route102_EventScript_1EC105, 0 - object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, 7, 0, 1, 2, Route102_EventScript_1EC1B3, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, 18, 0, 1, 3, Route102_EventScript_1EC1CA, 0 - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 37, 4, 3, 2, 17, 0, 0, Route102_EventScript_1EC0FC, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, 8, 0, 0, 0, Route102_EventScript_290CD8, 1000 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 2, 3, 12, 0, 0, 2, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, 12, 0, 0, 1, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, 8, 17, 1, 3, Route102_EventScript_1EC1E1, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 18, 11, 3, 1, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 14, 3, 8, 0, 0, 1, 3, Route102_EventScript_1EC105, 0 + object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, 7, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, 18, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0 + object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 37, 4, 3, 2, 1, 1, 0, 0, Route102_EventScript_1EC0FC, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, 8, 0, 0, 0, 0, Route102_EventScript_290CD8, 1000 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 2, 3, 12, 0, 0, 0, 2, BerryTreeScript, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, 12, 0, 0, 0, 1, BerryTreeScript, 0 + object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, 8, 1, 1, 1, 3, Route102_EventScript_1EC1E1, 0 Route102_MapBGEvents: @ 85280B0 bg_event 17, 2, 0, 0, 0, Route102_EventScript_1EC0F3 diff --git a/data/maps/events/Route103.inc b/data/maps/events/Route103.inc index c7ce68b44b..e4bf741779 100644 --- a/data/maps/events/Route103.inc +++ b/data/maps/events/Route103.inc @@ -1,24 +1,24 @@ Route103_EventObjects: @ 85280DC - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 49, 12, 3, 9, 0, 0, 0, Route103_EventScript_1EC5E2, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 10, 3, 3, 10, 0, 0, 0, Route103_EventScript_1EC3C1, 723 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 71, 11, 3, 18, 0, 1, 3, Route103_EventScript_1EC5F4, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 12, 3, 8, 0, 1, 1, Route103_EventScript_1EC66E, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 12, 3, 8, 0, 1, 1, Route103_EventScript_1EC60B, 0 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 50, 8, 3, 26, 16, 1, 3, Route103_EventScript_1EC6D1, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 58, 5, 3, 12, 0, 0, 5, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 5, 3, 12, 0, 0, 6, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 5, 3, 12, 0, 0, 7, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 20, 10, 3, 2, 33, 0, 0, Route103_EventScript_1EC5D9, 0 - object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, 2, 17, 0, 0, Route103_EventScript_272141, 898 - object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 56, 13, 3, 10, 0, 1, 5, Route103_EventScript_1EC6E8, 0 - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 5, 3, 1, 17, 0, 0, Route103_EventScript_290CE5, 1114 - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, 1, 17, 0, 0, Route103_EventScript_2906BB, 18 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 72, 8, 3, 1, 17, 0, 0, Route103_EventScript_2906BB, 19 - object_event 16, EVENT_OBJ_GFX_BLACK_BELT, 0, 67, 5, 3, 8, 17, 1, 2, Route103_EventScript_1EC761, 0 - object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 67, 9, 3, 7, 17, 1, 2, Route103_EventScript_1EC74A, 0 - object_event 18, EVENT_OBJ_GFX_SWIMMER_F, 0, 36, 6, 1, 26, 49, 1, 5, Route103_EventScript_1EC78F, 0 - object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 13, 1, 25, 49, 1, 5, Route103_EventScript_1EC778, 0 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 7, 0, 1, 17, 0, 0, Route103_EventScript_290CF2, 1137 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 49, 12, 3, 9, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 10, 3, 3, 10, 0, 0, 0, 0, Route103_EventScript_1EC3C1, 723 + object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 71, 11, 3, 18, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0 + object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 50, 8, 3, 26, 0, 1, 1, 3, Route103_EventScript_1EC6D1, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 58, 5, 3, 12, 0, 0, 0, 5, BerryTreeScript, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 5, 3, 12, 0, 0, 0, 6, BerryTreeScript, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 5, 3, 12, 0, 0, 0, 7, BerryTreeScript, 0 + object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 20, 10, 3, 2, 1, 2, 0, 0, Route103_EventScript_1EC5D9, 0 + object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, 2, 1, 1, 0, 0, Route103_EventScript_272141, 898 + object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 56, 13, 3, 10, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0 + object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 5, 3, 1, 1, 1, 0, 0, Route103_EventScript_290CE5, 1114 + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, 1, 1, 1, 0, 0, Route103_EventScript_2906BB, 18 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 72, 8, 3, 1, 1, 1, 0, 0, Route103_EventScript_2906BB, 19 + object_event 16, EVENT_OBJ_GFX_BLACK_BELT, 0, 67, 5, 3, 8, 1, 1, 1, 2, Route103_EventScript_1EC761, 0 + object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 67, 9, 3, 7, 1, 1, 1, 2, Route103_EventScript_1EC74A, 0 + object_event 18, EVENT_OBJ_GFX_SWIMMER_F, 0, 36, 6, 1, 26, 1, 3, 1, 5, Route103_EventScript_1EC78F, 0 + object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 13, 1, 25, 1, 3, 1, 5, Route103_EventScript_1EC778, 0 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 7, 0, 1, 1, 1, 0, 0, Route103_EventScript_290CF2, 1137 Route103_MapWarps: @ 85282BC warp_def 45, 6, 0, 0, MAP_ALTERING_CAVE diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc index 6d35c1bee2..315b5614e7 100644 --- a/data/maps/events/Route104.inc +++ b/data/maps/events/Route104.inc @@ -1,38 +1,38 @@ Route104_EventObjects: @ 85282E4 - object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 15, 60, 3, 9, 0, 0, 0, Route104_EventScript_1ED00F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 25, 49, 3, 2, 17, 0, 0, Route104_EventScript_1ED006, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 31, 24, 3, 9, 0, 1, 7, Route104_EventScript_1ED38D, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 27, 63, 3, 3, 16, 0, 0, Route104_EventScript_1ED045, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 30, 50, 3, 2, 17, 0, 0, Route104_EventScript_1ED04E, 0 - object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 28, 74, 3, 7, 0, 0, 0, Route104_EventScript_1ED090, 0 - object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 54, 1, 7, 0, 0, 0, 0x0, 742 - object_event 8, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 51, 4, 10, 0, 0, 0, 0x0, 738 - object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 29, 8, 3, 8, 0, 1, 0, Route104_EventScript_1ED35F, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 6, 3, 12, 0, 0, 8, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 6, 3, 12, 0, 0, 9, BerryTreeScript, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 6, 3, 12, 0, 0, 10, BerryTreeScript, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 41, 3, 12, 0, 0, 11, BerryTreeScript, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 41, 3, 12, 0, 0, 12, BerryTreeScript, 0 - object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 41, 3, 12, 0, 0, 13, BerryTreeScript, 0 - object_event 16, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 37, 8, 3, 9, 17, 0, 0, Route104_EventScript_1ECF8C, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 22, 3, 12, 0, 0, 3, BerryTreeScript, 0 - object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 23, 3, 12, 0, 0, 4, BerryTreeScript, 0 - object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 24, 3, 12, 0, 0, 75, BerryTreeScript, 0 - object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 25, 3, 12, 0, 0, 76, BerryTreeScript, 0 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 15, 3, 1, 0, 0, 0, Route104_EventScript_290CFF, 1002 - object_event 22, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 19, 3, 5, 1, 0, 0, Route104_EventScript_1ECFCD, 906 - object_event 23, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 15, 3, 8, 0, 1, 1, Route104_EventScript_1ED597, 0 - object_event 24, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 15, 3, 8, 0, 1, 1, Route104_EventScript_1ED5B6, 0 - object_event 25, EVENT_OBJ_GFX_BOY_4, 0, 21, 25, 3, 23, 0, 1, 3, Route104_EventScript_1ED43B, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 44, 3, 16, 0, 1, 3, Route104_EventScript_1ED4E9, 0 - object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, 1, 17, 0, 0, Route104_EventScript_290D0C, 1057 - object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 18, 67, 3, 46, 101, 1, 2, Route104_EventScript_1ED376, 0 - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 22, 3, 1, 17, 0, 0, Route104_EventScript_290D19, 1115 - object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 22, 3, 1, 17, 0, 0, Route104_EventScript_2906BB, 17 - object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 8, 3, 1, 17, 0, 0, Route104_EventScript_290D26, 1135 - object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 5, 26, 3, 1, 17, 0, 0, Route104_EventScript_1ED057, 0 - object_event 33, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 59, 3, 9, 0, 1, 0, Route104_EventScript_1ED5D5, 0 - object_event 34, EVENT_OBJ_GFX_HIPSTER, 0, 17, 50, 0, 1, 17, 0, 0, Route104_EventScript_1ECC9E, 719 + object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 15, 60, 3, 9, 0, 0, 0, 0, Route104_EventScript_1ED00F, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 25, 49, 3, 2, 1, 1, 0, 0, Route104_EventScript_1ED006, 0 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 31, 24, 3, 9, 0, 0, 1, 7, Route104_EventScript_1ED38D, 0 + object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 27, 63, 3, 3, 0, 1, 0, 0, Route104_EventScript_1ED045, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 30, 50, 3, 2, 1, 1, 0, 0, Route104_EventScript_1ED04E, 0 + object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 28, 74, 3, 7, 0, 0, 0, 0, Route104_EventScript_1ED090, 0 + object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 54, 1, 7, 0, 0, 0, 0, 0x0, 742 + object_event 8, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 51, 4, 10, 0, 0, 0, 0, 0x0, 738 + object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 29, 8, 3, 8, 0, 0, 1, 0, Route104_EventScript_1ED35F, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 6, 3, 12, 0, 0, 0, 8, BerryTreeScript, 0 + object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 6, 3, 12, 0, 0, 0, 9, BerryTreeScript, 0 + object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 6, 3, 12, 0, 0, 0, 10, BerryTreeScript, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 41, 3, 12, 0, 0, 0, 11, BerryTreeScript, 0 + object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 41, 3, 12, 0, 0, 0, 12, BerryTreeScript, 0 + object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 41, 3, 12, 0, 0, 0, 13, BerryTreeScript, 0 + object_event 16, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 37, 8, 3, 9, 1, 1, 0, 0, Route104_EventScript_1ECF8C, 0 + object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 22, 3, 12, 0, 0, 0, 3, BerryTreeScript, 0 + object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 23, 3, 12, 0, 0, 0, 4, BerryTreeScript, 0 + object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 24, 3, 12, 0, 0, 0, 75, BerryTreeScript, 0 + object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 25, 3, 12, 0, 0, 0, 76, BerryTreeScript, 0 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 15, 3, 1, 0, 0, 0, 0, Route104_EventScript_290CFF, 1002 + object_event 22, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 19, 3, 5, 1, 0, 0, 0, Route104_EventScript_1ECFCD, 906 + object_event 23, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED597, 0 + object_event 24, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED5B6, 0 + object_event 25, EVENT_OBJ_GFX_BOY_4, 0, 21, 25, 3, 23, 0, 0, 1, 3, Route104_EventScript_1ED43B, 0 + object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 44, 3, 16, 0, 0, 1, 3, Route104_EventScript_1ED4E9, 0 + object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, 1, 1, 1, 0, 0, Route104_EventScript_290D0C, 1057 + object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 18, 67, 3, 46, 5, 6, 1, 2, Route104_EventScript_1ED376, 0 + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 22, 3, 1, 1, 1, 0, 0, Route104_EventScript_290D19, 1115 + object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 22, 3, 1, 1, 1, 0, 0, Route104_EventScript_2906BB, 17 + object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 8, 3, 1, 1, 1, 0, 0, Route104_EventScript_290D26, 1135 + object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 5, 26, 3, 1, 1, 1, 0, 0, Route104_EventScript_1ED057, 0 + object_event 33, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 59, 3, 9, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0 + object_event 34, EVENT_OBJ_GFX_HIPSTER, 0, 17, 50, 0, 1, 1, 1, 0, 0, Route104_EventScript_1ECC9E, 719 Route104_MapWarps: @ 8528614 warp_def 17, 50, 0, 0, MAP_ROUTE104_MR_BRINEYS_HOUSE diff --git a/data/maps/events/Route104_MrBrineysHouse.inc b/data/maps/events/Route104_MrBrineysHouse.inc index d14d62c2b0..9eccc22869 100644 --- a/data/maps/events/Route104_MrBrineysHouse.inc +++ b/data/maps/events/Route104_MrBrineysHouse.inc @@ -1,6 +1,6 @@ Route104_MrBrineysHouse_EventObjects: @ 8533AD4 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 3, 3, 50, 51, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, 739 - object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, 8, 51, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, 881 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 3, 3, 50, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, 739 + object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, 8, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, 881 Route104_MrBrineysHouse_MapWarps: @ 8533B04 warp_def 5, 8, 0, 0, MAP_ROUTE104 diff --git a/data/maps/events/Route104_PrettyPetalFlowerShop.inc b/data/maps/events/Route104_PrettyPetalFlowerShop.inc index abd57bcd0b..025daad048 100644 --- a/data/maps/events/Route104_PrettyPetalFlowerShop.inc +++ b/data/maps/events/Route104_PrettyPetalFlowerShop.inc @@ -1,7 +1,7 @@ Route104_PrettyPetalFlowerShop_EventObjects: @ 8533B28 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 3, 10, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A373, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 3, 3, 5, 1, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A40C, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 11, 6, 4, 2, 34, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A442, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 3, 10, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A373, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 3, 3, 5, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A40C, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 11, 6, 4, 2, 2, 2, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A442, 0 Route104_PrettyPetalFlowerShop_MapWarps: @ 8533B70 warp_def 2, 8, 0, 1, MAP_ROUTE104 diff --git a/data/maps/events/Route105.inc b/data/maps/events/Route105.inc index 4654b470a9..bbe9cf73be 100644 --- a/data/maps/events/Route105.inc +++ b/data/maps/events/Route105.inc @@ -1,12 +1,12 @@ Route105_EventObjects: @ 85286F0 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 19, 60, 1, 10, 0, 1, 6, Route105_EventScript_1EE261, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 36, 1, 27, 7, 1, 3, Route105_EventScript_1EE278, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 45, 1, 25, 112, 1, 3, Route105_EventScript_1EE28F, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 19, 9, 1, 24, 80, 1, 3, Route105_EventScript_1EE2A6, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, 1, 0, 0, 0, Route105_EventScript_290D33, 1003 - object_event 6, EVENT_OBJ_GFX_HIKER, 0, 17, 48, 3, 26, 112, 1, 3, Route105_EventScript_1EE24A, 0 - object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 4, 54, 3, 8, 32, 1, 2, Route105_EventScript_1EE2BD, 0 - object_event 8, EVENT_OBJ_GFX_HIKER, 0, 4, 58, 3, 7, 32, 1, 4, Route105_EventScript_1EE2D4, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 19, 60, 1, 10, 0, 0, 1, 6, Route105_EventScript_1EE261, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 36, 1, 27, 7, 0, 1, 3, Route105_EventScript_1EE278, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 45, 1, 25, 0, 7, 1, 3, Route105_EventScript_1EE28F, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 19, 9, 1, 24, 0, 5, 1, 3, Route105_EventScript_1EE2A6, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, 1, 0, 0, 0, 0, Route105_EventScript_290D33, 1003 + object_event 6, EVENT_OBJ_GFX_HIKER, 0, 17, 48, 3, 26, 0, 7, 1, 3, Route105_EventScript_1EE24A, 0 + object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 4, 54, 3, 8, 0, 2, 1, 2, Route105_EventScript_1EE2BD, 0 + object_event 8, EVENT_OBJ_GFX_HIKER, 0, 4, 58, 3, 7, 0, 2, 1, 4, Route105_EventScript_1EE2D4, 0 Route105_MapWarps: @ 85287B0 warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE diff --git a/data/maps/events/Route106.inc b/data/maps/events/Route106.inc index 2697c42404..8fdbaad5fd 100644 --- a/data/maps/events/Route106.inc +++ b/data/maps/events/Route106.inc @@ -1,9 +1,9 @@ Route106_EventObjects: @ 85287E4 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 5, 1, 27, 4, 1, 3, Route106_EventScript_1EE493, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 29, 10, 1, 1, 0, 1, 3, Route106_EventScript_1EE4AA, 0 - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, 10, 0, 1, 4, Route106_EventScript_1EE4C1, 0 - object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, 1, 0, 1, 3, Route106_EventScript_1EE523, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, 1, 0, 0, 0, Route106_EventScript_290D40, 1004 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 5, 1, 27, 4, 0, 1, 3, Route106_EventScript_1EE493, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 29, 10, 1, 1, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0 + object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, 10, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0 + object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, 1, 0, 0, 1, 3, Route106_EventScript_1EE523, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, 1, 0, 0, 0, 0, Route106_EventScript_290D40, 1004 Route106_MapWarps: @ 852885C warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F diff --git a/data/maps/events/Route107.inc b/data/maps/events/Route107.inc index 609c6a8084..f748e2ff90 100644 --- a/data/maps/events/Route107.inc +++ b/data/maps/events/Route107.inc @@ -1,11 +1,11 @@ Route107_EventObjects: @ 85288A8 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 10, 1, 24, 17, 1, 3, Route107_EventScript_1EE595, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 23, 11, 1, 52, 38, 1, 2, Route107_EventScript_1EE5AC, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 16, 7, 1, 13, 0, 1, 5, Route107_EventScript_1EE60E, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 50, 11, 1, 65, 17, 1, 5, Route107_EventScript_1EE625, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 4, 1, 8, 17, 1, 1, Route107_EventScript_1EE63C, 0 - object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 4, 1, 8, 17, 1, 1, Route107_EventScript_1EE657, 0 - object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 50, 5, 1, 64, 17, 1, 5, Route107_EventScript_1EE672, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 10, 1, 24, 1, 1, 1, 3, Route107_EventScript_1EE595, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 23, 11, 1, 52, 6, 2, 1, 2, Route107_EventScript_1EE5AC, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 16, 7, 1, 13, 0, 0, 1, 5, Route107_EventScript_1EE60E, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 50, 11, 1, 65, 1, 1, 1, 5, Route107_EventScript_1EE625, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 4, 1, 8, 1, 1, 1, 1, Route107_EventScript_1EE63C, 0 + object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 4, 1, 8, 1, 1, 1, 1, Route107_EventScript_1EE657, 0 + object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 50, 5, 1, 64, 1, 1, 1, 5, Route107_EventScript_1EE672, 0 Route107_MapEvents:: @ 8528950 map_events Route107_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route108.inc b/data/maps/events/Route108.inc index 64e9f746c9..0a0b448c48 100644 --- a/data/maps/events/Route108.inc +++ b/data/maps/events/Route108.inc @@ -1,11 +1,11 @@ Route108_EventObjects: @ 8528964 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 13, 1, 45, 51, 1, 3, Route108_EventScript_1EE68A, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 12, 1, 13, 17, 1, 3, Route108_EventScript_1EE6B8, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 13, 1, 24, 0, 1, 3, Route108_EventScript_1EE6A1, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 7, 1, 20, 6, 1, 3, Route108_EventScript_1EE6CF, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 41, 5, 3, 10, 17, 1, 1, Route108_EventScript_1EE6E6, 0 - object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 43, 5, 3, 9, 17, 1, 1, Route108_EventScript_1EE6FD, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 4, 3, 1, 17, 0, 0, Route108_EventScript_290D4D, 1139 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 13, 1, 45, 3, 3, 1, 3, Route108_EventScript_1EE68A, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 12, 1, 13, 1, 1, 1, 3, Route108_EventScript_1EE6B8, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 13, 1, 24, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 7, 1, 20, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 41, 5, 3, 10, 1, 1, 1, 1, Route108_EventScript_1EE6E6, 0 + object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 43, 5, 3, 9, 1, 1, 1, 1, Route108_EventScript_1EE6FD, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 4, 3, 1, 1, 1, 0, 0, Route108_EventScript_290D4D, 1139 Route108_MapWarps: @ 8528A0C warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK diff --git a/data/maps/events/Route109.inc b/data/maps/events/Route109.inc index e21a54ab2c..1d847897d1 100644 --- a/data/maps/events/Route109.inc +++ b/data/maps/events/Route109.inc @@ -1,28 +1,28 @@ Route109_EventObjects: @ 8528A34 - object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, 7, 0, 0, 0, 0x0, 744 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 21, 24, 3, 7, 0, 0, 0, Route109_EventScript_1EE910, 741 - object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 12, 36, 3, 10, 0, 1, 5, Route109_EventScript_1EEA3D, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 25, 39, 1, 15, 0, 1, 5, Route109_EventScript_1EEA54, 0 - object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 15, 17, 4, 8, 0, 1, 1, Route109_EventScript_1EEA6B, 0 - object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 24, 13, 3, 9, 0, 1, 6, Route109_EventScript_1EEA82, 0 - object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 19, 10, 3, 8, 0, 1, 3, Route109_EventScript_1EEA99, 0 - object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 22, 7, 3, 80, 0, 1, 4, Route109_EventScript_1EEAFB, 0 - object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 11, 6, 3, 8, 0, 0, 0, Route109_EventScript_1EE995, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 46, 3, 1, 0, 0, 0, Route109_EventScript_290D5A, 1005 - object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 29, 32, 3, 13, 0, 1, 3, Route109_EventScript_1EEB74, 0 - object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 28, 31, 3, 17, 0, 1, 3, Route109_EventScript_1EEB5D, 0 - object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 21, 56, 0, 9, 0, 1, 3, Route109_EventScript_1EEB8B, 0 - object_event 14, EVENT_OBJ_GFX_TUBER_M, 0, 24, 18, 3, 10, 17, 0, 0, Route109_EventScript_1EE99E, 0 - object_event 15, EVENT_OBJ_GFX_TUBER_F, 0, 25, 18, 3, 9, 17, 0, 0, Route109_EventScript_1EE9B5, 0 - object_event 16, EVENT_OBJ_GFX_WOMAN_2, 0, 30, 32, 3, 8, 17, 0, 0, Route109_EventScript_1EEA06, 0 - object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 41, 3, 8, 17, 1, 1, Route109_EventScript_1EEBBD, 0 - object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 9, 41, 3, 8, 17, 1, 1, Route109_EventScript_1EEBA2, 0 - object_event 19, EVENT_OBJ_GFX_OLD_MAN_2, 0, 33, 6, 3, 1, 17, 0, 0, Route109_EventScript_1EEA0F, 0 - object_event 20, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 32, 6, 3, 1, 17, 0, 0, Route109_EventScript_1EEA18, 0 - object_event 21, EVENT_OBJ_GFX_TUBER_F, 0, 17, 13, 3, 80, 17, 1, 6, Route109_EventScript_1EEBEF, 0 - object_event 22, EVENT_OBJ_GFX_TUBER_M, 0, 27, 7, 3, 79, 17, 1, 4, Route109_EventScript_1EEBD8, 0 - object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 6, 3, 1, 17, 0, 0, Route109_EventScript_290D67, 1140 - object_event 24, EVENT_OBJ_GFX_MAN_6, 0, 17, 56, 3, 80, 17, 1, 3, Route109_EventScript_1EEC06, 0 + object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, 7, 0, 0, 0, 0, 0x0, 744 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 21, 24, 3, 7, 0, 0, 0, 0, Route109_EventScript_1EE910, 741 + object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 12, 36, 3, 10, 0, 0, 1, 5, Route109_EventScript_1EEA3D, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 25, 39, 1, 15, 0, 0, 1, 5, Route109_EventScript_1EEA54, 0 + object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 15, 17, 4, 8, 0, 0, 1, 1, Route109_EventScript_1EEA6B, 0 + object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 24, 13, 3, 9, 0, 0, 1, 6, Route109_EventScript_1EEA82, 0 + object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 19, 10, 3, 8, 0, 0, 1, 3, Route109_EventScript_1EEA99, 0 + object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 22, 7, 3, 80, 0, 0, 1, 4, Route109_EventScript_1EEAFB, 0 + object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 11, 6, 3, 8, 0, 0, 0, 0, Route109_EventScript_1EE995, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 46, 3, 1, 0, 0, 0, 0, Route109_EventScript_290D5A, 1005 + object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 29, 32, 3, 13, 0, 0, 1, 3, Route109_EventScript_1EEB74, 0 + object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 28, 31, 3, 17, 0, 0, 1, 3, Route109_EventScript_1EEB5D, 0 + object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 21, 56, 0, 9, 0, 0, 1, 3, Route109_EventScript_1EEB8B, 0 + object_event 14, EVENT_OBJ_GFX_TUBER_M, 0, 24, 18, 3, 10, 1, 1, 0, 0, Route109_EventScript_1EE99E, 0 + object_event 15, EVENT_OBJ_GFX_TUBER_F, 0, 25, 18, 3, 9, 1, 1, 0, 0, Route109_EventScript_1EE9B5, 0 + object_event 16, EVENT_OBJ_GFX_WOMAN_2, 0, 30, 32, 3, 8, 1, 1, 0, 0, Route109_EventScript_1EEA06, 0 + object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 41, 3, 8, 1, 1, 1, 1, Route109_EventScript_1EEBBD, 0 + object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 9, 41, 3, 8, 1, 1, 1, 1, Route109_EventScript_1EEBA2, 0 + object_event 19, EVENT_OBJ_GFX_OLD_MAN_2, 0, 33, 6, 3, 1, 1, 1, 0, 0, Route109_EventScript_1EEA0F, 0 + object_event 20, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 32, 6, 3, 1, 1, 1, 0, 0, Route109_EventScript_1EEA18, 0 + object_event 21, EVENT_OBJ_GFX_TUBER_F, 0, 17, 13, 3, 80, 1, 1, 1, 6, Route109_EventScript_1EEBEF, 0 + object_event 22, EVENT_OBJ_GFX_TUBER_M, 0, 27, 7, 3, 79, 1, 1, 1, 4, Route109_EventScript_1EEBD8, 0 + object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 6, 3, 1, 1, 1, 0, 0, Route109_EventScript_290D67, 1140 + object_event 24, EVENT_OBJ_GFX_MAN_6, 0, 17, 56, 3, 80, 1, 1, 1, 3, Route109_EventScript_1EEC06, 0 Route109_MapWarps: @ 8528C74 warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE diff --git a/data/maps/events/Route109_SeashoreHouse.inc b/data/maps/events/Route109_SeashoreHouse.inc index 4812c3d068..140b92a21f 100644 --- a/data/maps/events/Route109_SeashoreHouse.inc +++ b/data/maps/events/Route109_SeashoreHouse.inc @@ -1,8 +1,8 @@ Route109_SeashoreHouse_EventObjects: @ 853DDE8 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 2, 3, 8, 0, 0, 0, Route109_SeashoreHouse_EventScript_2693FE, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, 8, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694E2, 0 - object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 14, 9, 3, 9, 0, 1, 2, Route109_SeashoreHouse_EventScript_269518, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 10, 5, 3, 14, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694FD, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 2, 3, 8, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_2693FE, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, 8, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694E2, 0 + object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 14, 9, 3, 9, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_269518, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 10, 5, 3, 14, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694FD, 0 Route109_SeashoreHouse_MapWarps: @ 853DE48 warp_def 6, 9, 0, 0, MAP_ROUTE109 diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc index 3fc6257cc3..c982ededf5 100644 --- a/data/maps/events/Route110.inc +++ b/data/maps/events/Route110.inc @@ -1,40 +1,40 @@ Route110_EventObjects: @ 8528CF0 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 17, 90, 3, 8, 0, 0, 0, Route110_EventScript_1EF338, 0 - object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 29, 79, 4, 8, 0, 0, 0, Route110_EventScript_1EF32F, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 14, 69, 3, 3, 16, 0, 0, Route110_EventScript_1EF326, 0 - object_event 4, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 9, 57, 4, 2, 17, 0, 0, Route110_EventScript_1EF314, 0 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 11, 3, 2, 17, 0, 0, Route110_EventScript_1EF31D, 0 - object_event 6, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 27, 24, 4, 2, 49, 0, 0, Route110_EventScript_1EF30B, 0 - object_event 7, EVENT_OBJ_GFX_BOY_3, 0, 15, 7, 3, 2, 17, 0, 0, Route110_EventScript_1EF302, 0 - object_event 8, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 16, 73, 4, 49, 226, 1, 3, Route110_EventScript_1EF529, 0 - object_event 9, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 31, 4, 51, 26, 1, 3, Route110_EventScript_1EF4B0, 0 - object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 30, 31, 4, 9, 17, 1, 4, Route110_EventScript_1EF540, 0 - object_event 11, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 16, 55, 4, 45, 68, 1, 3, Route110_EventScript_1EF4C7, 0 - object_event 12, EVENT_OBJ_GFX_PSYCHIC_M, 0, 3, 39, 3, 10, 0, 1, 6, Route110_EventScript_1EF3F2, 0 - object_event 13, EVENT_OBJ_GFX_LASS, 0, 33, 15, 3, 9, 0, 1, 1, Route110_EventScript_1EF409, 0 - object_event 14, EVENT_OBJ_GFX_MANIAC, 0, 34, 40, 3, 67, 0, 1, 4, Route110_EventScript_1EF420, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 10, 19, 3, 8, 0, 1, 1, Route110_EventScript_1EF482, 0 - object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 11, 3, 12, 0, 0, 16, BerryTreeScript, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 11, 3, 12, 0, 0, 17, BerryTreeScript, 0 - object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 11, 3, 12, 0, 0, 18, BerryTreeScript, 0 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 69, 3, 1, 0, 0, 0, Route110_EventScript_290D81, 1007 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 47, 3, 1, 0, 0, 0, Route110_EventScript_290D74, 1006 - object_event 21, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 92, 3, 8, 0, 0, 0, Route110_EventScript_1EF3B7, 0 - object_event 22, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 83, 3, 7, 0, 0, 0, Route110_EventScript_1EF2AA, 900 - object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 83, 3, 7, 0, 0, 0, Route110_EventScript_1EF2C0, 900 - object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 83, 3, 7, 0, 0, 0, Route110_EventScript_1EF2D6, 900 - object_event 25, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 83, 3, 7, 0, 0, 0, Route110_EventScript_1EF2EC, 900 - object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 82, 3, 8, 0, 0, 0, 0x0, 900 - object_event 27, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 78, 4, 51, 23, 1, 2, Route110_EventScript_1EF499, 0 - object_event 28, EVENT_OBJ_GFX_HIPSTER, 0, 34, 54, 3, 14, 0, 0, 0, 0x0, 919 - object_event 29, EVENT_OBJ_GFX_GIDDY, 0, 34, 54, 3, 8, 0, 0, 0, 0x0, 922 - object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 69, 3, 14, 0, 1, 3, Route110_EventScript_1EF604, 0 - object_event 31, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 76, 3, 9, 0, 1, 2, Route110_EventScript_1EF5A2, 0 - object_event 32, EVENT_OBJ_GFX_MAN_3, 0, 7, 76, 3, 10, 17, 1, 2, Route110_EventScript_1EF61C, 0 - object_event 33, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 10, 39, 3, 9, 17, 1, 6, Route110_EventScript_1EF64A, 0 - object_event 34, EVENT_OBJ_GFX_MAN_6, 0, 36, 40, 3, 66, 17, 1, 3, Route110_EventScript_1EF633, 0 - object_event 35, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 38, 3, 1, 17, 0, 0, Route110_EventScript_290D8E, 1141 - object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 79, 3, 1, 17, 0, 0, 0x0, 837 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 17, 90, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF338, 0 + object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 29, 79, 4, 8, 0, 0, 0, 0, Route110_EventScript_1EF32F, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 14, 69, 3, 3, 0, 1, 0, 0, Route110_EventScript_1EF326, 0 + object_event 4, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 9, 57, 4, 2, 1, 1, 0, 0, Route110_EventScript_1EF314, 0 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 11, 3, 2, 1, 1, 0, 0, Route110_EventScript_1EF31D, 0 + object_event 6, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 27, 24, 4, 2, 1, 3, 0, 0, Route110_EventScript_1EF30B, 0 + object_event 7, EVENT_OBJ_GFX_BOY_3, 0, 15, 7, 3, 2, 1, 1, 0, 0, Route110_EventScript_1EF302, 0 + object_event 8, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 16, 73, 4, 49, 2, 14, 1, 3, Route110_EventScript_1EF529, 0 + object_event 9, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 31, 4, 51, 10, 1, 1, 3, Route110_EventScript_1EF4B0, 0 + object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 30, 31, 4, 9, 1, 1, 1, 4, Route110_EventScript_1EF540, 0 + object_event 11, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 16, 55, 4, 45, 4, 4, 1, 3, Route110_EventScript_1EF4C7, 0 + object_event 12, EVENT_OBJ_GFX_PSYCHIC_M, 0, 3, 39, 3, 10, 0, 0, 1, 6, Route110_EventScript_1EF3F2, 0 + object_event 13, EVENT_OBJ_GFX_LASS, 0, 33, 15, 3, 9, 0, 0, 1, 1, Route110_EventScript_1EF409, 0 + object_event 14, EVENT_OBJ_GFX_MANIAC, 0, 34, 40, 3, 67, 0, 0, 1, 4, Route110_EventScript_1EF420, 0 + object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 10, 19, 3, 8, 0, 0, 1, 1, Route110_EventScript_1EF482, 0 + object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 11, 3, 12, 0, 0, 0, 16, BerryTreeScript, 0 + object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 11, 3, 12, 0, 0, 0, 17, BerryTreeScript, 0 + object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 11, 3, 12, 0, 0, 0, 18, BerryTreeScript, 0 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 69, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D81, 1007 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 47, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D74, 1006 + object_event 21, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 92, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF3B7, 0 + object_event 22, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2AA, 900 + object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2C0, 900 + object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2D6, 900 + object_event 25, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2EC, 900 + object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 82, 3, 8, 0, 0, 0, 0, 0x0, 900 + object_event 27, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 78, 4, 51, 7, 1, 1, 2, Route110_EventScript_1EF499, 0 + object_event 28, EVENT_OBJ_GFX_HIPSTER, 0, 34, 54, 3, 14, 0, 0, 0, 0, 0x0, 919 + object_event 29, EVENT_OBJ_GFX_GIDDY, 0, 34, 54, 3, 8, 0, 0, 0, 0, 0x0, 922 + object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 69, 3, 14, 0, 0, 1, 3, Route110_EventScript_1EF604, 0 + object_event 31, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 76, 3, 9, 0, 0, 1, 2, Route110_EventScript_1EF5A2, 0 + object_event 32, EVENT_OBJ_GFX_MAN_3, 0, 7, 76, 3, 10, 1, 1, 1, 2, Route110_EventScript_1EF61C, 0 + object_event 33, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 10, 39, 3, 9, 1, 1, 1, 6, Route110_EventScript_1EF64A, 0 + object_event 34, EVENT_OBJ_GFX_MAN_6, 0, 36, 40, 3, 66, 1, 1, 1, 3, Route110_EventScript_1EF633, 0 + object_event 35, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 38, 3, 1, 1, 1, 0, 0, Route110_EventScript_290D8E, 1141 + object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 79, 3, 1, 1, 1, 0, 0, 0x0, 837 Route110_MapWarps: @ 8529050 warp_def 35, 24, 3, 0, MAP_NEW_MAUVILLE_ENTRANCE diff --git a/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc b/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc index c84b06c1a3..ed1750f79f 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc +++ b/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc @@ -1,5 +1,5 @@ Route110_SeasideCyclingRoadEntrance1_EventObjects: @ 853E9A0 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78, 0 Route110_SeasideCyclingRoadEntrance1_MapWarps: @ 853E9B8 warp_def 1, 5, 0, 4, MAP_ROUTE110 diff --git a/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc b/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc index 4f9ea356c5..5ad30e6c1f 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc +++ b/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc @@ -1,5 +1,5 @@ Route110_SeasideCyclingRoadEntrance2_EventObjects: @ 853EA0C - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4, 0 Route110_SeasideCyclingRoadEntrance2_MapWarps: @ 853EA24 warp_def 1, 5, 0, 2, MAP_ROUTE110 diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/events/Route110_TrickHouseEnd.inc index d868b6cd09..12659457a5 100644 --- a/data/maps/events/Route110_TrickHouseEnd.inc +++ b/data/maps/events/Route110_TrickHouseEnd.inc @@ -1,5 +1,5 @@ Route110_TrickHouseEnd_EventObjects: @ 853DEFC - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, 10, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, 899 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, 899 Route110_TrickHouseEnd_MapWarps: @ 853DF14 warp_def 10, 1, 3, 2, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/events/Route110_TrickHouseEntrance.inc index 3ce8e59427..30a6892df6 100644 --- a/data/maps/events/Route110_TrickHouseEntrance.inc +++ b/data/maps/events/Route110_TrickHouseEntrance.inc @@ -1,5 +1,5 @@ Route110_TrickHouseEntrance_EventObjects: @ 853DE6C - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 2, 3, 9, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, 872 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 2, 3, 9, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, 872 Route110_TrickHouseEntrance_MapWarps: @ 853DE84 warp_def 5, 7, 3, 1, MAP_ROUTE110 diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/events/Route110_TrickHousePuzzle1.inc index f3abb09d7d..05824aa38b 100644 --- a/data/maps/events/Route110_TrickHousePuzzle1.inc +++ b/data/maps/events/Route110_TrickHousePuzzle1.inc @@ -1,19 +1,19 @@ Route110_TrickHousePuzzle1_EventObjects: @ 853DF88 - object_event 1, EVENT_OBJ_GFX_LASS, 0, 14, 20, 3, 9, 0, 1, 6, Route110_TrickHousePuzzle1_EventScript_26B948, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 8, 3, 9, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B95F, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 2, 15, 3, 8, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B976, 0 - object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 16, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 19 - object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 18, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 18 - object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 14, 14, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 20 - object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 8, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 23 - object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 8, 10, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 22 - object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 12, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 21 - object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 4, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 25 - object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 6, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 24 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 6, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 27 - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 4, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_29140E, 1060 - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 4, 8, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 28 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 12, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 30 + object_event 1, EVENT_OBJ_GFX_LASS, 0, 14, 20, 3, 9, 0, 0, 1, 6, Route110_TrickHousePuzzle1_EventScript_26B948, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 8, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B95F, 0 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 2, 15, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B976, 0 + object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 19 + object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 18, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 18 + object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 14, 14, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 20 + object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 23 + object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 22 + object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 21 + object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 25 + object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 24 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 27 + object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_29140E, 1060 + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 4, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 28 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 30 Route110_TrickHousePuzzle1_MapWarps: @ 853E0F0 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/events/Route110_TrickHousePuzzle2.inc index dd02e53199..a7259e3b3c 100644 --- a/data/maps/events/Route110_TrickHousePuzzle2.inc +++ b/data/maps/events/Route110_TrickHousePuzzle2.inc @@ -1,9 +1,9 @@ Route110_TrickHousePuzzle2_EventObjects: @ 853E128 - object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 10, 3, 10, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_26BC75, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 10, 17, 3, 8, 0, 1, 4, Route110_TrickHousePuzzle2_EventScript_26BC8C, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 11, 9, 3, 9, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_26BCA3, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, 1062 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, 1061 + object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 10, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_26BC75, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 10, 17, 3, 8, 0, 0, 1, 4, Route110_TrickHousePuzzle2_EventScript_26BC8C, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 11, 9, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_26BCA3, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, 1062 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, 1061 Route110_TrickHousePuzzle2_MapWarps: @ 853E1A0 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/events/Route110_TrickHousePuzzle3.inc index 683718363c..2f95cf052c 100644 --- a/data/maps/events/Route110_TrickHousePuzzle3.inc +++ b/data/maps/events/Route110_TrickHousePuzzle3.inc @@ -1,11 +1,11 @@ Route110_TrickHousePuzzle3_EventObjects: @ 853E218 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 7, 19, 3, 8, 0, 1, 2, Route110_TrickHousePuzzle3_EventScript_26C5C4, 0 - object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 4, 4, 3, 10, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5DB, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 10, 10, 3, 8, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5F2, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291442, 1064 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291435, 1063 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 20, 3, 1, 17, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 21 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 21, 3, 1, 17, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 22 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 7, 19, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle3_EventScript_26C5C4, 0 + object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 4, 4, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5DB, 0 + object_event 3, EVENT_OBJ_GFX_HIKER, 0, 10, 10, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5F2, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291442, 1064 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291435, 1063 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 20, 3, 1, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 21 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 21, 3, 1, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 22 Route110_TrickHousePuzzle3_MapWarps: @ 853E2C0 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/events/Route110_TrickHousePuzzle4.inc index 93856f7b6c..b0dd3abf6a 100644 --- a/data/maps/events/Route110_TrickHousePuzzle4.inc +++ b/data/maps/events/Route110_TrickHousePuzzle4.inc @@ -1,18 +1,18 @@ Route110_TrickHousePuzzle4_EventObjects: @ 853E338 - object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 2, 2, 3, 8, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_26C87E, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 14, 7, 3, 9, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C8AC, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 14, 3, 10, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C895, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 5, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_29144F, 1065 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 17 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 5, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 18 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 16, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 19 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 6, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 20 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 2, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 21 - object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 22 - object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 3, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 23 - object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 12, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 24 - object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 2, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 25 - object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 26 + object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 2, 2, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_26C87E, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 14, 7, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C8AC, 0 + object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 14, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C895, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_29144F, 1065 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 17 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 18 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 19 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 20 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 21 + object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 22 + object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 23 + object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 24 + object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 25 + object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 26 Route110_TrickHousePuzzle4_MapWarps: @ 853E488 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/events/Route110_TrickHousePuzzle5.inc b/data/maps/events/Route110_TrickHousePuzzle5.inc index 9bf01f4b63..8da7daf11e 100644 --- a/data/maps/events/Route110_TrickHousePuzzle5.inc +++ b/data/maps/events/Route110_TrickHousePuzzle5.inc @@ -1,9 +1,9 @@ Route110_TrickHousePuzzle5_EventObjects: @ 853E4C0 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 17, 3, 9, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB32, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 3, 10, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB53, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 14, 10, 3, 9, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB74, 0 - object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 14, 19, 3, 9, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB95, 0 - object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 10, 4, 3, 10, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBB6, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 17, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB32, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB53, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 14, 10, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB74, 0 + object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 14, 19, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB95, 0 + object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 10, 4, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBB6, 0 Route110_TrickHousePuzzle5_MapWarps: @ 853E538 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/events/Route110_TrickHousePuzzle6.inc b/data/maps/events/Route110_TrickHousePuzzle6.inc index 8e29b4ee1f..7fc098f2c0 100644 --- a/data/maps/events/Route110_TrickHousePuzzle6.inc +++ b/data/maps/events/Route110_TrickHousePuzzle6.inc @@ -1,8 +1,8 @@ Route110_TrickHousePuzzle6_EventObjects: @ 853E6D0 - object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 7, 9, 3, 10, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 11, 10, 3, 10, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 4, 5, 3, 7, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 21, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, 1067 + object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 7, 9, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 11, 10, 3, 10, 0, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 4, 5, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 21, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, 1067 Route110_TrickHousePuzzle6_MapWarps: @ 853E730 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/events/Route110_TrickHousePuzzle7.inc index e6d50dca51..e72aa929a4 100644 --- a/data/maps/events/Route110_TrickHousePuzzle7.inc +++ b/data/maps/events/Route110_TrickHousePuzzle7.inc @@ -1,13 +1,13 @@ Route110_TrickHousePuzzle7_EventObjects: @ 853E768 - object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 20, 0, 10, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E389, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 10, 2, 0, 7, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3B7, 0 - object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 8, 17, 0, 9, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3A0, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 12, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_291469, 1068 - object_event 5, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 2, 3, 8, 17, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3E5, 0 - object_event 6, EVENT_OBJ_GFX_LASS, 0, 8, 13, 3, 7, 17, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3CE, 0 - object_event 7, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 12, 3, 9, 17, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3FC, 0 - object_event 8, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 17, 0, 1, 17, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 6, 0, 1, 17, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 20, 0, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E389, 0 + object_event 2, EVENT_OBJ_GFX_LASS, 0, 10, 2, 0, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3B7, 0 + object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 8, 17, 0, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3A0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_291469, 1068 + object_event 5, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 2, 3, 8, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3E5, 0 + object_event 6, EVENT_OBJ_GFX_LASS, 0, 8, 13, 3, 7, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3CE, 0 + object_event 7, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 12, 3, 9, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3FC, 0 + object_event 8, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 17, 0, 1, 1, 1, 0, 0, 0x0, 0 + object_event 9, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 6, 0, 1, 1, 1, 0, 0, 0x0, 0 Route110_TrickHousePuzzle7_MapWarps: @ 853E840 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/events/Route110_TrickHousePuzzle8.inc b/data/maps/events/Route110_TrickHousePuzzle8.inc index 1556a9516f..eacc9e940c 100644 --- a/data/maps/events/Route110_TrickHousePuzzle8.inc +++ b/data/maps/events/Route110_TrickHousePuzzle8.inc @@ -1,8 +1,8 @@ Route110_TrickHousePuzzle8_EventObjects: @ 853E908 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 1, 10, 3, 7, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 4, 2, 3, 10, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 17, 3, 9, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 2, 3, 1, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, 1069 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 1, 10, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 4, 2, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 17, 3, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, 1069 Route110_TrickHousePuzzle8_MapWarps: @ 853E968 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc index 1d9aa1111e..cea2db8d57 100644 --- a/data/maps/events/Route111.inc +++ b/data/maps/events/Route111.inc @@ -1,50 +1,50 @@ Route111_EventObjects: @ 85291F0 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 114, 3, 8, 0, 0, 0, Route111_EventScript_1F0FC5, 768 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 13, 113, 0, 8, 0, 0, 0, 0x0, 769 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, 8, 1, 0, 0, 0x0, 770 - object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 13, 113, 0, 8, 0, 0, 0, 0x0, 771 - object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 28, 51, 3, 17, 0, 1, 3, Route111_EventScript_1F121B, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 5, 3, 12, 0, 0, 19, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 5, 3, 12, 0, 0, 20, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 8, 91, 3, 2, 17, 0, 0, Route111_EventScript_1F1189, 0 - object_event 9, EVENT_OBJ_GFX_CAMPER, 0, 29, 37, 3, 17, 0, 1, 3, Route111_EventScript_1F1204, 0 - object_event 10, EVENT_OBJ_GFX_HIKER, 0, 27, 69, 3, 50, 34, 1, 2, Route111_EventScript_1F1260, 0 - object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 21, 47, 3, 9, 0, 1, 4, Route111_EventScript_1F1232, 0 - object_event 12, EVENT_OBJ_GFX_PICNICKER, 0, 32, 66, 3, 24, 0, 1, 3, Route111_EventScript_1F1249, 0 - object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, Route111_EventScript_28CDF6, 796 - object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, Route111_EventScript_28CDD6, 796 - object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 101, 3, 1, 0, 0, 0, Route111_EventScript_2907A6, 17 - object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 100, 3, 1, 0, 0, 0, Route111_EventScript_2907A6, 18 - object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 23, 8, 3, 5, 1, 0, 0, Route111_EventScript_1F0EB9, 0 - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 104, 3, 1, 0, 0, 0, Route111_EventScript_290D9B, 1008 - object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, 12, 0, 0, 80, BerryTreeScript, 0 - object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 5, 3, 12, 0, 0, 81, BerryTreeScript, 0 - object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, Route111_EventScript_28CE96, 799 - object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, Route111_EventScript_28CEB6, 799 - object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, Route111_EventScript_28CF16, 903 - object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, Route111_EventScript_28CF36, 903 - object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 54, 3, 1, 0, 0, 0, Route111_EventScript_290DA8, 1009 - object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 114, 3, 1, 0, 0, 0, Route111_EventScript_290DB5, 1010 - object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 22, 21, 3, 1, 0, 0, 0, Route111_EventScript_2906BB, 19 - object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 10, 82, 3, 14, 0, 1, 2, Route111_EventScript_1F12D9, 0 - object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 11, 71, 3, 22, 0, 1, 3, Route111_EventScript_1F12C2, 0 - object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 32, 29, 3, 28, 1, 1, 2, Route111_EventScript_1F12F0, 0 - object_event 31, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 11, 3, 7, 4, 1, 4, Route111_EventScript_1F1369, 0 - object_event 32, EVENT_OBJ_GFX_MAN_4, 0, 9, 27, 3, 17, 0, 1, 3, Route111_EventScript_1F1307, 0 - object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 13, 20, 3, 7, 17, 0, 0, Route111_EventScript_2765FF, 960 - object_event 34, EVENT_OBJ_GFX_MAN_5, 0, 20, 114, 3, 2, 17, 0, 0, Route111_EventScript_1F1192, 0 - object_event 35, EVENT_OBJ_GFX_CAMPER, 0, 26, 132, 3, 9, 17, 1, 5, Route111_EventScript_1F13F9, 0 - object_event 36, EVENT_OBJ_GFX_WOMAN_3, 0, 20, 132, 3, 10, 17, 1, 5, Route111_EventScript_1F1410, 0 - object_event 37, EVENT_OBJ_GFX_PICNICKER, 0, 19, 121, 3, 7, 17, 1, 2, Route111_EventScript_1F13E2, 0 - object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 16, 119, 3, 10, 17, 1, 3, Route111_EventScript_1F13CB, 0 - object_event 39, EVENT_OBJ_GFX_HIKER, 0, 29, 77, 3, 14, 17, 1, 7, Route111_EventScript_1F143E, 0 - object_event 40, EVENT_OBJ_GFX_PICNICKER, 0, 22, 77, 3, 10, 17, 1, 6, Route111_EventScript_1F1427, 0 - object_event 41, EVENT_OBJ_GFX_CAMPER, 0, 37, 77, 3, 9, 17, 1, 7, Route111_EventScript_1F1455, 0 - object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 118, 3, 1, 17, 0, 0, Route111_EventScript_290DC2, 1142 - object_event 43, EVENT_OBJ_GFX_HIKER, 0, 14, 56, 3, 16, 17, 0, 0, Route111_EventScript_1F119B, 0 - object_event 44, EVENT_OBJ_GFX_FOSSIL, 0, 20, 53, 3, 8, 17, 0, 0, 0x0, 876 - object_event 45, EVENT_OBJ_GFX_HIPSTER, 0, 19, 53, 3, 8, 17, 0, 0, 0x0, 875 - object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 101, 3, 7, 17, 0, 0, Route111_EventScript_1F11E4, 843 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 114, 3, 8, 0, 0, 0, 0, Route111_EventScript_1F0FC5, 768 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 769 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, 8, 1, 0, 0, 0, 0x0, 770 + object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 771 + object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 28, 51, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F121B, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 5, 3, 12, 0, 0, 0, 19, BerryTreeScript, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 5, 3, 12, 0, 0, 0, 20, BerryTreeScript, 0 + object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 8, 91, 3, 2, 1, 1, 0, 0, Route111_EventScript_1F1189, 0 + object_event 9, EVENT_OBJ_GFX_CAMPER, 0, 29, 37, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1204, 0 + object_event 10, EVENT_OBJ_GFX_HIKER, 0, 27, 69, 3, 50, 2, 2, 1, 2, Route111_EventScript_1F1260, 0 + object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 21, 47, 3, 9, 0, 0, 1, 4, Route111_EventScript_1F1232, 0 + object_event 12, EVENT_OBJ_GFX_PICNICKER, 0, 32, 66, 3, 24, 0, 0, 1, 3, Route111_EventScript_1F1249, 0 + object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDF6, 796 + object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDD6, 796 + object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 101, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 17 + object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 100, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 18 + object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 23, 8, 3, 5, 1, 0, 0, 0, Route111_EventScript_1F0EB9, 0 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 104, 3, 1, 0, 0, 0, 0, Route111_EventScript_290D9B, 1008 + object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, 12, 0, 0, 0, 80, BerryTreeScript, 0 + object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 5, 3, 12, 0, 0, 0, 81, BerryTreeScript, 0 + object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CE96, 799 + object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CEB6, 799 + object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF16, 903 + object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF36, 903 + object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 54, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DA8, 1009 + object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 114, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DB5, 1010 + object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 22, 21, 3, 1, 0, 0, 0, 0, Route111_EventScript_2906BB, 19 + object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 10, 82, 3, 14, 0, 0, 1, 2, Route111_EventScript_1F12D9, 0 + object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 11, 71, 3, 22, 0, 0, 1, 3, Route111_EventScript_1F12C2, 0 + object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 32, 29, 3, 28, 1, 0, 1, 2, Route111_EventScript_1F12F0, 0 + object_event 31, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 11, 3, 7, 4, 0, 1, 4, Route111_EventScript_1F1369, 0 + object_event 32, EVENT_OBJ_GFX_MAN_4, 0, 9, 27, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1307, 0 + object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 13, 20, 3, 7, 1, 1, 0, 0, Route111_EventScript_2765FF, 960 + object_event 34, EVENT_OBJ_GFX_MAN_5, 0, 20, 114, 3, 2, 1, 1, 0, 0, Route111_EventScript_1F1192, 0 + object_event 35, EVENT_OBJ_GFX_CAMPER, 0, 26, 132, 3, 9, 1, 1, 1, 5, Route111_EventScript_1F13F9, 0 + object_event 36, EVENT_OBJ_GFX_WOMAN_3, 0, 20, 132, 3, 10, 1, 1, 1, 5, Route111_EventScript_1F1410, 0 + object_event 37, EVENT_OBJ_GFX_PICNICKER, 0, 19, 121, 3, 7, 1, 1, 1, 2, Route111_EventScript_1F13E2, 0 + object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 16, 119, 3, 10, 1, 1, 1, 3, Route111_EventScript_1F13CB, 0 + object_event 39, EVENT_OBJ_GFX_HIKER, 0, 29, 77, 3, 14, 1, 1, 1, 7, Route111_EventScript_1F143E, 0 + object_event 40, EVENT_OBJ_GFX_PICNICKER, 0, 22, 77, 3, 10, 1, 1, 1, 6, Route111_EventScript_1F1427, 0 + object_event 41, EVENT_OBJ_GFX_CAMPER, 0, 37, 77, 3, 9, 1, 1, 1, 7, Route111_EventScript_1F1455, 0 + object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 118, 3, 1, 1, 1, 0, 0, Route111_EventScript_290DC2, 1142 + object_event 43, EVENT_OBJ_GFX_HIKER, 0, 14, 56, 3, 16, 1, 1, 0, 0, Route111_EventScript_1F119B, 0 + object_event 44, EVENT_OBJ_GFX_FOSSIL, 0, 20, 53, 3, 8, 1, 1, 0, 0, 0x0, 876 + object_event 45, EVENT_OBJ_GFX_HIPSTER, 0, 19, 53, 3, 8, 1, 1, 0, 0, 0x0, 875 + object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 101, 3, 7, 1, 1, 0, 0, Route111_EventScript_1F11E4, 843 Route111_MapWarps: @ 8529640 warp_def 13, 113, 0, 0, MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE diff --git a/data/maps/events/Route111_OldLadysRestStop.inc b/data/maps/events/Route111_OldLadysRestStop.inc index 4fd7d1952d..5ade76ba37 100644 --- a/data/maps/events/Route111_OldLadysRestStop.inc +++ b/data/maps/events/Route111_OldLadysRestStop.inc @@ -1,5 +1,5 @@ Route111_OldLadysRestStop_EventObjects: @ 8533C18 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 6, 3, 3, 9, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 6, 3, 3, 9, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0 Route111_OldLadysRestStop_MapWarps: @ 8533C30 warp_def 3, 7, 0, 2, MAP_ROUTE111 diff --git a/data/maps/events/Route111_WinstrateFamilysHouse.inc b/data/maps/events/Route111_WinstrateFamilysHouse.inc index 3585e27e6d..0fe5b5df49 100644 --- a/data/maps/events/Route111_WinstrateFamilysHouse.inc +++ b/data/maps/events/Route111_WinstrateFamilysHouse.inc @@ -1,8 +1,8 @@ Route111_WinstrateFamilysHouse_EventObjects: @ 8533B94 - object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 5, 3, 9, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4E8, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, 10, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A48D, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, 9, 1, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0 - object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 4, 3, 10, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0 + object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 5, 3, 9, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4E8, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A48D, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, 9, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0 + object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 4, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0 Route111_WinstrateFamilysHouse_MapWarps: @ 8533BF4 warp_def 3, 7, 0, 0, MAP_ROUTE111 diff --git a/data/maps/events/Route112.inc b/data/maps/events/Route112.inc index 683f43ffde..0e218cd784 100644 --- a/data/maps/events/Route112.inc +++ b/data/maps/events/Route112.inc @@ -1,18 +1,18 @@ Route112_EventObjects: @ 8529974 - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 30, 3, 7, 17, 0, 0, Route112_EventScript_1F1DB7, 819 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, 14, 0, 1, 2, Route112_EventScript_1F1E6A, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, 8, 0, 1, 3, Route112_EventScript_1F1EE3, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 22, 46, 3, 23, 0, 1, 3, Route112_EventScript_1F1EFA, 0 - object_event 5, EVENT_OBJ_GFX_HIKER, 0, 15, 40, 3, 16, 0, 1, 3, Route112_EventScript_1F1E81, 0 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 27, 30, 3, 7, 0, 0, 0, Route112_EventScript_1F1DB7, 819 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 27, 6, 0, 12, 0, 0, 24, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 28, 6, 0, 12, 0, 0, 23, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 6, 0, 12, 0, 0, 22, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 6, 3, 12, 0, 0, 21, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_HIKER, 0, 8, 50, 3, 26, 48, 0, 0, Route112_EventScript_1F1E61, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, 1, 0, 0, 0, Route112_EventScript_290DCF, 1011 - object_event 13, EVENT_OBJ_GFX_MAN_6, 0, 31, 7, 3, 18, 17, 1, 3, Route112_EventScript_1F1F11, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 31, 11, 3, 15, 17, 1, 3, Route112_EventScript_1F1F28, 0 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 30, 3, 7, 1, 1, 0, 0, Route112_EventScript_1F1DB7, 819 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, 14, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, 8, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 22, 46, 3, 23, 0, 0, 1, 3, Route112_EventScript_1F1EFA, 0 + object_event 5, EVENT_OBJ_GFX_HIKER, 0, 15, 40, 3, 16, 0, 0, 1, 3, Route112_EventScript_1F1E81, 0 + object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 27, 30, 3, 7, 0, 0, 0, 0, Route112_EventScript_1F1DB7, 819 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 27, 6, 0, 12, 0, 0, 0, 24, BerryTreeScript, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 28, 6, 0, 12, 0, 0, 0, 23, BerryTreeScript, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 6, 0, 12, 0, 0, 0, 22, BerryTreeScript, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 6, 3, 12, 0, 0, 0, 21, BerryTreeScript, 0 + object_event 11, EVENT_OBJ_GFX_HIKER, 0, 8, 50, 3, 26, 0, 3, 0, 0, Route112_EventScript_1F1E61, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, 1, 0, 0, 0, 0, Route112_EventScript_290DCF, 1011 + object_event 13, EVENT_OBJ_GFX_MAN_6, 0, 31, 7, 3, 18, 1, 1, 1, 3, Route112_EventScript_1F1F11, 0 + object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 31, 11, 3, 15, 1, 1, 1, 3, Route112_EventScript_1F1F28, 0 Route112_MapWarps: @ 8529AC4 warp_def 28, 27, 0, 0, MAP_ROUTE112_CABLE_CAR_STATION diff --git a/data/maps/events/Route112_CableCarStation.inc b/data/maps/events/Route112_CableCarStation.inc index 7a18ffd40e..77f37d72c8 100644 --- a/data/maps/events/Route112_CableCarStation.inc +++ b/data/maps/events/Route112_CableCarStation.inc @@ -1,6 +1,6 @@ Route112_CableCarStation_EventObjects: @ 8533C54 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, 8, 0, 0, 0, Route112_CableCarStation_EventScript_22AB17, 0 - object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, 1, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, 8, 0, 0, 0, 0, Route112_CableCarStation_EventScript_22AB17, 0 + object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0 Route112_CableCarStation_MapWarps: @ 8533C84 warp_def 6, 11, 0, 0, MAP_ROUTE112 diff --git a/data/maps/events/Route113.inc b/data/maps/events/Route113.inc index 990df8f7f1..25287a747c 100644 --- a/data/maps/events/Route113.inc +++ b/data/maps/events/Route113.inc @@ -1,20 +1,20 @@ Route113_EventObjects: @ 8529B2C - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 66, 12, 3, 5, 1, 0, 0, Route113_EventScript_1F2193, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 36, 10, 3, 3, 16, 0, 0, Route113_EventScript_1F218A, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, 8, 0, 1, 3, Route113_EventScript_1F21C0, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 21, 11, 3, 17, 0, 1, 3, Route113_EventScript_1F21D7, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 51, 11, 3, 23, 0, 1, 2, Route113_EventScript_1F21EE, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, 1, 0, 0, 0, Route113_EventScript_290DDC, 1012 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 79, 5, 3, 1, 0, 0, 0, Route113_EventScript_290DE9, 1013 - object_event 8, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, 63, 0, 3, 1, Route113_EventScript_1F2250, 0 - object_event 9, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 71, 2, 3, 63, 0, 3, 1, Route113_EventScript_1F22B2, 0 - object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 45, 6, 3, 8, 17, 1, 1, Route113_EventScript_1F22C9, 0 - object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 46, 6, 3, 8, 17, 1, 1, Route113_EventScript_1F22E4, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 15, 3, 1, 17, 0, 0, Route113_EventScript_290DF6, 1143 - object_event 13, EVENT_OBJ_GFX_MANIAC, 0, 75, 3, 3, 9, 17, 1, 4, Route113_EventScript_1F2344, 0 - object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 71, 4, 3, 7, 17, 1, 1, Route113_EventScript_1F232D, 0 - object_event 15, EVENT_OBJ_GFX_PICNICKER, 0, 7, 6, 3, 26, 49, 1, 6, Route113_EventScript_1F22FF, 0 - object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 7, 13, 3, 25, 49, 1, 6, Route113_EventScript_1F2316, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 66, 12, 3, 5, 1, 0, 0, 0, Route113_EventScript_1F2193, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 36, 10, 3, 3, 0, 1, 0, 0, Route113_EventScript_1F218A, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, 8, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 21, 11, 3, 17, 0, 0, 1, 3, Route113_EventScript_1F21D7, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 51, 11, 3, 23, 0, 0, 1, 2, Route113_EventScript_1F21EE, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DDC, 1012 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 79, 5, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DE9, 1013 + object_event 8, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F2250, 0 + object_event 9, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 71, 2, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0 + object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 45, 6, 3, 8, 1, 1, 1, 1, Route113_EventScript_1F22C9, 0 + object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 46, 6, 3, 8, 1, 1, 1, 1, Route113_EventScript_1F22E4, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 15, 3, 1, 1, 1, 0, 0, Route113_EventScript_290DF6, 1143 + object_event 13, EVENT_OBJ_GFX_MANIAC, 0, 75, 3, 3, 9, 1, 1, 1, 4, Route113_EventScript_1F2344, 0 + object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 71, 4, 3, 7, 1, 1, 1, 1, Route113_EventScript_1F232D, 0 + object_event 15, EVENT_OBJ_GFX_PICNICKER, 0, 7, 6, 3, 26, 1, 3, 1, 6, Route113_EventScript_1F22FF, 0 + object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 7, 13, 3, 25, 1, 3, 1, 6, Route113_EventScript_1F2316, 0 Route113_MapWarps: @ 8529CAC warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP diff --git a/data/maps/events/Route113_GlassWorkshop.inc b/data/maps/events/Route113_GlassWorkshop.inc index 7502ed737a..1d5104e1c2 100644 --- a/data/maps/events/Route113_GlassWorkshop.inc +++ b/data/maps/events/Route113_GlassWorkshop.inc @@ -1,6 +1,6 @@ Route113_GlassWorkshop_EventObjects: @ 853EA78 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 3, 3, 8, 0, 0, 0, Route113_GlassWorkshop_EventScript_26ED1E, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 5, 4, 3, 2, 17, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_26ED1E, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 5, 4, 3, 2, 1, 1, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0 Route113_GlassWorkshop_MapWarps: @ 853EAA8 warp_def 3, 8, 0, 0, MAP_ROUTE113 diff --git a/data/maps/events/Route114.inc b/data/maps/events/Route114.inc index d250d801ee..3e48c5721e 100644 --- a/data/maps/events/Route114.inc +++ b/data/maps/events/Route114.inc @@ -1,31 +1,31 @@ Route114_EventObjects: @ 8529E68 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 43, 3, 12, 0, 0, 77, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 44, 3, 12, 0, 0, 78, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 15, 65, 7, 10, 0, 1, 6, Route114_EventScript_1F2640, 0 - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 30, 72, 5, 9, 0, 1, 4, Route114_EventScript_1F2657, 0 - object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 22, 50, 3, 10, 0, 1, 3, Route114_EventScript_1F266E, 0 - object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 19, 35, 3, 1, 0, 1, 3, Route114_EventScript_1F2685, 0 - object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 20, 56, 3, 7, 0, 1, 3, Route114_EventScript_1F269C, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 45, 3, 12, 0, 0, 68, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, 1, 0, 0, 0, Route114_EventScript_290E03, 1014 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 37, 4, 1, 0, 0, 0, Route114_EventScript_290E10, 1015 - object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 43, 4, 1, 0, 0, 0, Route114_EventScript_2907A6, 17 - object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 19, 11, 3, 10, 0, 0, 0, Route114_EventScript_1F25D1, 0 - object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 19, 12, 3, 10, 0, 0, 0, Route114_EventScript_1F2612, 0 - object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 27, 42, 3, 3, 16, 0, 0, Route114_EventScript_1F2582, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 25, 6, 3, 8, 0, 1, 0, Route114_EventScript_1F2777, 0 - object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 19, 26, 3, 9, 0, 1, 0, Route114_EventScript_1F2760, 0 - object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 30, 58, 5, 23, 0, 1, 3, Route114_EventScript_1F26FE, 0 - object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 53, 5, 1, 17, 0, 0, Route114_EventScript_2907A6, 18 - object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 54, 5, 1, 17, 0, 0, Route114_EventScript_2907A6, 19 - object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 69, 7, 1, 17, 0, 0, Route114_EventScript_2907A6, 20 - object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 64, 5, 1, 17, 0, 0, Route114_EventScript_2907A6, 21 - object_event 22, EVENT_OBJ_GFX_LASS, 0, 24, 44, 3, 8, 17, 1, 1, Route114_EventScript_1F27A9, 0 - object_event 23, EVENT_OBJ_GFX_LASS, 0, 23, 44, 3, 8, 17, 1, 1, Route114_EventScript_1F278E, 0 - object_event 24, EVENT_OBJ_GFX_PICNICKER, 0, 28, 20, 3, 7, 17, 1, 3, Route114_EventScript_1F27DB, 0 - object_event 25, EVENT_OBJ_GFX_PICNICKER, 0, 26, 72, 5, 18, 17, 1, 4, Route114_EventScript_1F27C4, 0 - object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 19, 3, 1, 17, 0, 0, Route114_EventScript_290E1D, 1160 - object_event 27, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 16, 3, 17, 17, 1, 3, Route114_EventScript_1F27F2, 0 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 43, 3, 12, 0, 0, 0, 77, BerryTreeScript, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 44, 3, 12, 0, 0, 0, 78, BerryTreeScript, 0 + object_event 3, EVENT_OBJ_GFX_HIKER, 0, 15, 65, 7, 10, 0, 0, 1, 6, Route114_EventScript_1F2640, 0 + object_event 4, EVENT_OBJ_GFX_HIKER, 0, 30, 72, 5, 9, 0, 0, 1, 4, Route114_EventScript_1F2657, 0 + object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 22, 50, 3, 10, 0, 0, 1, 3, Route114_EventScript_1F266E, 0 + object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 19, 35, 3, 1, 0, 0, 1, 3, Route114_EventScript_1F2685, 0 + object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 20, 56, 3, 7, 0, 0, 1, 3, Route114_EventScript_1F269C, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 45, 3, 12, 0, 0, 0, 68, BerryTreeScript, 0 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, 1, 0, 0, 0, 0, Route114_EventScript_290E03, 1014 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 37, 4, 1, 0, 0, 0, 0, Route114_EventScript_290E10, 1015 + object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 43, 4, 1, 0, 0, 0, 0, Route114_EventScript_2907A6, 17 + object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 19, 11, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F25D1, 0 + object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 19, 12, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F2612, 0 + object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 27, 42, 3, 3, 0, 1, 0, 0, Route114_EventScript_1F2582, 0 + object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 25, 6, 3, 8, 0, 0, 1, 0, Route114_EventScript_1F2777, 0 + object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 19, 26, 3, 9, 0, 0, 1, 0, Route114_EventScript_1F2760, 0 + object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 30, 58, 5, 23, 0, 0, 1, 3, Route114_EventScript_1F26FE, 0 + object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 53, 5, 1, 1, 1, 0, 0, Route114_EventScript_2907A6, 18 + object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 54, 5, 1, 1, 1, 0, 0, Route114_EventScript_2907A6, 19 + object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 69, 7, 1, 1, 1, 0, 0, Route114_EventScript_2907A6, 20 + object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 64, 5, 1, 1, 1, 0, 0, Route114_EventScript_2907A6, 21 + object_event 22, EVENT_OBJ_GFX_LASS, 0, 24, 44, 3, 8, 1, 1, 1, 1, Route114_EventScript_1F27A9, 0 + object_event 23, EVENT_OBJ_GFX_LASS, 0, 23, 44, 3, 8, 1, 1, 1, 1, Route114_EventScript_1F278E, 0 + object_event 24, EVENT_OBJ_GFX_PICNICKER, 0, 28, 20, 3, 7, 1, 1, 1, 3, Route114_EventScript_1F27DB, 0 + object_event 25, EVENT_OBJ_GFX_PICNICKER, 0, 26, 72, 5, 18, 1, 1, 1, 4, Route114_EventScript_1F27C4, 0 + object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 19, 3, 1, 1, 1, 0, 0, Route114_EventScript_290E1D, 1160 + object_event 27, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 16, 3, 17, 1, 1, 1, 3, Route114_EventScript_1F27F2, 0 Route114_MapWarps: @ 852A0F0 warp_def 8, 63, 0, 0, MAP_METEOR_FALLS_1F_1R diff --git a/data/maps/events/Route114_FossilManiacsHouse.inc b/data/maps/events/Route114_FossilManiacsHouse.inc index 06788e39d1..c947d9d8fa 100644 --- a/data/maps/events/Route114_FossilManiacsHouse.inc +++ b/data/maps/events/Route114_FossilManiacsHouse.inc @@ -1,5 +1,5 @@ Route114_FossilManiacsHouse_EventObjects: @ 8533CFC - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 3, 2, 3, 8, 17, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 3, 2, 3, 8, 1, 1, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0 Route114_FossilManiacsHouse_MapWarps: @ 8533D14 warp_def 4, 7, 0, 1, MAP_ROUTE114 diff --git a/data/maps/events/Route114_FossilManiacsTunnel.inc b/data/maps/events/Route114_FossilManiacsTunnel.inc index 64ff21b891..99edadee15 100644 --- a/data/maps/events/Route114_FossilManiacsTunnel.inc +++ b/data/maps/events/Route114_FossilManiacsTunnel.inc @@ -1,5 +1,5 @@ Route114_FossilManiacsTunnel_EventObjects: @ 8533D70 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 5, 3, 3, 7, 17, 0, 0, Route114_FossilManiacsTunnel_EventScript_22AF87, 0 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 5, 3, 3, 7, 1, 1, 0, 0, Route114_FossilManiacsTunnel_EventScript_22AF87, 0 Route114_FossilManiacsTunnel_MapWarps: @ 8533D88 warp_def 6, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE diff --git a/data/maps/events/Route114_LanettesHouse.inc b/data/maps/events/Route114_LanettesHouse.inc index 81633507dc..352bb20378 100644 --- a/data/maps/events/Route114_LanettesHouse.inc +++ b/data/maps/events/Route114_LanettesHouse.inc @@ -1,5 +1,5 @@ Route114_LanettesHouse_EventObjects: @ 8533DD4 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 4, 3, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, 870 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 4, 3, 1, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, 870 Route114_LanettesHouse_MapWarps: @ 8533DEC warp_def 5, 7, 0, 2, MAP_ROUTE114 diff --git a/data/maps/events/Route115.inc b/data/maps/events/Route115.inc index a698b98d80..37d886e7fe 100644 --- a/data/maps/events/Route115.inc +++ b/data/maps/events/Route115.inc @@ -1,27 +1,27 @@ Route115_EventObjects: @ 852A1BC - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 68, 3, 2, 17, 0, 0, Route115_EventScript_1F2973, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 15, 3, 10, 0, 1, 6, Route115_EventScript_1F298E, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 27, 53, 3, 15, 17, 1, 4, Route115_EventScript_1F2A07, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, 12, 0, 0, 69, BerryTreeScript, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 13, 5, 3, 12, 0, 0, 70, BerryTreeScript, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, 12, 0, 0, 71, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 15, 50, 3, 64, 0, 1, 3, Route115_EventScript_1F2A69, 0 - object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 15, 3, 27, 5, 1, 2, Route115_EventScript_1F29F0, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 24, 62, 3, 18, 0, 1, 4, Route115_EventScript_1F2ACB, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 60, 3, 1, 0, 0, 0, Route115_EventScript_290E2A, 1016 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 18, 7, 3, 1, 0, 0, 0, Route115_EventScript_290E37, 1017 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 29, 3, 1, 0, 0, 0, Route115_EventScript_290E44, 1018 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 64, 3, 12, 0, 0, 55, BerryTreeScript, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 65, 3, 12, 0, 0, 56, BerryTreeScript, 0 - object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 50, 3, 1, 17, 0, 0, Route115_EventScript_2907A6, 17 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, 1, 17, 0, 0, Route115_EventScript_290E51, 1118 - object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 10, 15, 3, 46, 51, 1, 2, Route115_EventScript_1F2AE2, 0 - object_event 18, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 11, 12, 3, 57, 17, 1, 3, Route115_EventScript_1F2AF9, 0 - object_event 19, EVENT_OBJ_GFX_GIRL_3, 0, 15, 7, 3, 9, 17, 1, 4, Route115_EventScript_1F2B27, 0 - object_event 20, EVENT_OBJ_GFX_LASS, 0, 10, 7, 3, 10, 17, 1, 4, Route115_EventScript_1F2B10, 0 - object_event 21, EVENT_OBJ_GFX_LASS, 0, 28, 62, 3, 9, 17, 1, 4, Route115_EventScript_1F2B3E, 0 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 67, 3, 1, 17, 0, 0, Route115_EventScript_290E6B, 1161 - object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 14, 3, 1, 17, 0, 0, Route115_EventScript_290E5E, 1144 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 68, 3, 2, 1, 1, 0, 0, Route115_EventScript_1F2973, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 15, 3, 10, 0, 0, 1, 6, Route115_EventScript_1F298E, 0 + object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 27, 53, 3, 15, 1, 1, 1, 4, Route115_EventScript_1F2A07, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, 12, 0, 0, 0, 69, BerryTreeScript, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 13, 5, 3, 12, 0, 0, 0, 70, BerryTreeScript, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, 12, 0, 0, 0, 71, BerryTreeScript, 0 + object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 15, 50, 3, 64, 0, 0, 1, 3, Route115_EventScript_1F2A69, 0 + object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 15, 3, 27, 5, 0, 1, 2, Route115_EventScript_1F29F0, 0 + object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 24, 62, 3, 18, 0, 0, 1, 4, Route115_EventScript_1F2ACB, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 60, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E2A, 1016 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 18, 7, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E37, 1017 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 29, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E44, 1018 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 64, 3, 12, 0, 0, 0, 55, BerryTreeScript, 0 + object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 65, 3, 12, 0, 0, 0, 56, BerryTreeScript, 0 + object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 50, 3, 1, 1, 1, 0, 0, Route115_EventScript_2907A6, 17 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, 1, 1, 1, 0, 0, Route115_EventScript_290E51, 1118 + object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 10, 15, 3, 46, 3, 3, 1, 2, Route115_EventScript_1F2AE2, 0 + object_event 18, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 11, 12, 3, 57, 1, 1, 1, 3, Route115_EventScript_1F2AF9, 0 + object_event 19, EVENT_OBJ_GFX_GIRL_3, 0, 15, 7, 3, 9, 1, 1, 1, 4, Route115_EventScript_1F2B27, 0 + object_event 20, EVENT_OBJ_GFX_LASS, 0, 10, 7, 3, 10, 1, 1, 1, 4, Route115_EventScript_1F2B10, 0 + object_event 21, EVENT_OBJ_GFX_LASS, 0, 28, 62, 3, 9, 1, 1, 1, 4, Route115_EventScript_1F2B3E, 0 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 67, 3, 1, 1, 1, 0, 0, Route115_EventScript_290E6B, 1161 + object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 14, 3, 1, 1, 1, 0, 0, Route115_EventScript_290E5E, 1144 Route115_MapWarps: @ 852A3E4 warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc index e36c02de42..16afe4482d 100644 --- a/data/maps/events/Route116.inc +++ b/data/maps/events/Route116.inc @@ -1,32 +1,32 @@ Route116_EventObjects: @ 852A4B8 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 2, 3, 12, 0, 0, 25, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 2, 3, 12, 0, 0, 26, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 12, 7, 3, 16, 0, 1, 3, Route116_EventScript_1F2E89, 0 - object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 21, 6, 3, 1, 0, 0, 0, Route116_EventScript_2906BB, 17 - object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 10, 3, 1, 0, 0, 0, Route116_EventScript_2906BB, 18 - object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 13, 17, 3, 24, 0, 1, 2, Route116_EventScript_1F2EA0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 6, 3, 1, 0, 0, 0, Route116_EventScript_290E85, 1019 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 17, 3, 1, 0, 0, 0, Route116_EventScript_290E92, 1020 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 20, 2, 3, 12, 0, 0, 66, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 21, 2, 3, 12, 0, 0, 67, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_OLD_MAN_1, 0, 46, 9, 3, 1, 0, 0, 0, Route116_EventScript_1F2D84, 891 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 28, 11, 3, 1, 0, 0, 0, Route116_EventScript_2906BB, 19 - object_event 13, EVENT_OBJ_GFX_HIKER, 0, 36, 17, 3, 15, 0, 1, 3, Route116_EventScript_1F2F65, 0 - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 9, 3, 1, 0, 0, 0, Route116_EventScript_2906BB, 20 - object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 8, 3, 1, 0, 0, 0, Route116_EventScript_290E9F, 1021 - object_event 16, EVENT_OBJ_GFX_LASS, 0, 26, 6, 3, 10, 0, 1, 2, Route116_EventScript_1F2F7C, 0 - object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 22, 16, 3, 13, 0, 1, 3, Route116_EventScript_1F2F93, 0 - object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 28, 8, 3, 7, 0, 1, 4, Route116_EventScript_1F2EB7, 0 - object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 46, 11, 3, 1, 17, 0, 0, Route116_EventScript_1F2CA2, 947 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 12, 4, 1, 17, 0, 0, Route116_EventScript_290E78, 1001 - object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 9, 3, 10, 17, 0, 0, Route116_EventScript_1F2C70, 894 - object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 13, 3, 1, 17, 0, 0, Route116_EventScript_1F2DB6, 813 - object_event 23, EVENT_OBJ_GFX_WOMAN_3, 0, 33, 8, 3, 7, 0, 1, 1, Route116_EventScript_1F3041, 0 - object_event 24, EVENT_OBJ_GFX_BOY_2, 0, 33, 5, 3, 8, 0, 1, 2, Route116_EventScript_1F3058, 0 - object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 34, 7, 0, 1, 17, 0, 0, Route116_EventScript_290EAC, 1146 - object_event 26, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 5, 3, 1, 17, 0, 0, Route116_EventScript_2906BB, 21 - object_event 27, EVENT_OBJ_GFX_YOUNGSTER, 0, 36, 13, 3, 18, 17, 1, 5, Route116_EventScript_1F3086, 0 - object_event 28, EVENT_OBJ_GFX_HIKER, 0, 42, 13, 3, 9, 17, 1, 5, Route116_EventScript_1F306F, 0 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 2, 3, 12, 0, 0, 0, 25, BerryTreeScript, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 2, 3, 12, 0, 0, 0, 26, BerryTreeScript, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 12, 7, 3, 16, 0, 0, 1, 3, Route116_EventScript_1F2E89, 0 + object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 21, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 17 + object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 10, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 18 + object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 13, 17, 3, 24, 0, 0, 1, 2, Route116_EventScript_1F2EA0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E85, 1019 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 17, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E92, 1020 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 20, 2, 3, 12, 0, 0, 0, 66, BerryTreeScript, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 21, 2, 3, 12, 0, 0, 0, 67, BerryTreeScript, 0 + object_event 11, EVENT_OBJ_GFX_OLD_MAN_1, 0, 46, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_1F2D84, 891 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 28, 11, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 19 + object_event 13, EVENT_OBJ_GFX_HIKER, 0, 36, 17, 3, 15, 0, 0, 1, 3, Route116_EventScript_1F2F65, 0 + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 20 + object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 8, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E9F, 1021 + object_event 16, EVENT_OBJ_GFX_LASS, 0, 26, 6, 3, 10, 0, 0, 1, 2, Route116_EventScript_1F2F7C, 0 + object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 22, 16, 3, 13, 0, 0, 1, 3, Route116_EventScript_1F2F93, 0 + object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 28, 8, 3, 7, 0, 0, 1, 4, Route116_EventScript_1F2EB7, 0 + object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 46, 11, 3, 1, 1, 1, 0, 0, Route116_EventScript_1F2CA2, 947 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 12, 4, 1, 1, 1, 0, 0, Route116_EventScript_290E78, 1001 + object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 9, 3, 10, 1, 1, 0, 0, Route116_EventScript_1F2C70, 894 + object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 13, 3, 1, 1, 1, 0, 0, Route116_EventScript_1F2DB6, 813 + object_event 23, EVENT_OBJ_GFX_WOMAN_3, 0, 33, 8, 3, 7, 0, 0, 1, 1, Route116_EventScript_1F3041, 0 + object_event 24, EVENT_OBJ_GFX_BOY_2, 0, 33, 5, 3, 8, 0, 0, 1, 2, Route116_EventScript_1F3058, 0 + object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 34, 7, 0, 1, 1, 1, 0, 0, Route116_EventScript_290EAC, 1146 + object_event 26, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 5, 3, 1, 1, 1, 0, 0, Route116_EventScript_2906BB, 21 + object_event 27, EVENT_OBJ_GFX_YOUNGSTER, 0, 36, 13, 3, 18, 1, 1, 1, 5, Route116_EventScript_1F3086, 0 + object_event 28, EVENT_OBJ_GFX_HIKER, 0, 42, 13, 3, 9, 1, 1, 1, 5, Route116_EventScript_1F306F, 0 Route116_MapWarps: @ 852A758 warp_def 47, 8, 0, 0, MAP_RUSTURF_TUNNEL diff --git a/data/maps/events/Route116_TunnelersRestHouse.inc b/data/maps/events/Route116_TunnelersRestHouse.inc index 7a7ce78550..8d133ab6d6 100644 --- a/data/maps/events/Route116_TunnelersRestHouse.inc +++ b/data/maps/events/Route116_TunnelersRestHouse.inc @@ -1,7 +1,7 @@ Route116_TunnelersRestHouse_EventObjects: @ 8533E34 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, 10, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, 1, 17, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, 7, 1, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, 10, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0 + object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, 1, 1, 1, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, 7, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0 Route116_TunnelersRestHouse_MapWarps: @ 8533E7C warp_def 4, 8, 0, 1, MAP_ROUTE116 diff --git a/data/maps/events/Route117.inc b/data/maps/events/Route117.inc index df4bf6f11f..f84ef6212d 100644 --- a/data/maps/events/Route117.inc +++ b/data/maps/events/Route117.inc @@ -1,28 +1,28 @@ Route117_EventObjects: @ 852A828 - object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 13, 3, 8, 0, 0, 0, Route117_EventScript_1F399A, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 25, 5, 3, 40, 34, 0, 0, Route117_EventScript_1F39A3, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 47, 4, 3, 8, 0, 0, 0, Route117_EventScript_291C18, 0 - object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 33, 3, 3, 1, 17, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_KECLEON_1, 0, 39, 4, 3, 1, 0, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 42, 2, 3, 1, 17, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_PIKACHU, 0, 49, 2, 3, 1, 0, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 38, 16, 3, 28, 8, 1, 4, Route117_EventScript_1F3A94, 0 - object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 10, 3, 23, 0, 1, 3, Route117_EventScript_1F3A32, 0 - object_event 10, EVENT_OBJ_GFX_MAN_5, 0, 33, 11, 3, 16, 0, 1, 4, Route117_EventScript_1F39D0, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 41, 13, 3, 12, 0, 0, 29, BerryTreeScript, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 42, 13, 3, 12, 0, 0, 28, BerryTreeScript, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 43, 13, 3, 12, 0, 0, 27, BerryTreeScript, 0 - object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 18, 3, 1, 0, 0, 0, Route117_EventScript_290EB9, 1022 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 2, 3, 1, 0, 0, 0, Route117_EventScript_2906BB, 17 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 1, 3, 1, 0, 0, 0, Route117_EventScript_290EC6, 1023 - object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 26, 13, 3, 33, 34, 1, 5, Route117_EventScript_1F3AF6, 0 - object_event 18, EVENT_OBJ_GFX_MANIAC, 0, 17, 12, 3, 7, 17, 1, 4, Route117_EventScript_1F3B58, 0 - object_event 19, EVENT_OBJ_GFX_LASS, 0, 43, 6, 3, 8, 0, 1, 1, Route117_EventScript_1F3BD3, 0 - object_event 20, EVENT_OBJ_GFX_LASS, 0, 42, 6, 3, 8, 0, 1, 1, Route117_EventScript_1F3B6F, 0 - object_event 21, EVENT_OBJ_GFX_GIRL_2, 0, 48, 10, 3, 2, 17, 0, 0, Route117_EventScript_1F39AC, 0 - object_event 22, EVENT_OBJ_GFX_LASS, 0, 15, 4, 3, 10, 17, 1, 4, Route117_EventScript_1F3C4E, 0 - object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 21, 4, 3, 9, 17, 1, 4, Route117_EventScript_1F3C65, 0 - object_event 24, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 16, 4, 3, 28, 20, 1, 4, Route117_EventScript_1F3C37, 0 + 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 Route117_MapWarps: @ 852AA68 warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE diff --git a/data/maps/events/Route117_PokemonDayCare.inc b/data/maps/events/Route117_PokemonDayCare.inc index 3182c9c837..05220bdc99 100644 --- a/data/maps/events/Route117_PokemonDayCare.inc +++ b/data/maps/events/Route117_PokemonDayCare.inc @@ -1,5 +1,5 @@ Route117_PokemonDayCare_EventObjects: @ 8533EA0 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 2, 2, 3, 8, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 2, 2, 3, 8, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0 Route117_PokemonDayCare_MapWarps: @ 8533EB8 warp_def 2, 8, 0, 0, MAP_ROUTE117 diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc index 6b3379504e..5e732890de 100644 --- a/data/maps/events/Route118.inc +++ b/data/maps/events/Route118.inc @@ -1,25 +1,25 @@ Route118_EventObjects: @ 852AAB4 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 5, 3, 12, 0, 0, 31, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, 12, 0, 0, 32, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, 12, 0, 0, 33, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 64, 10, 3, 8, 0, 1, 3, Route118_EventScript_1F4079, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, Route118_EventScript_28CE16, 797 - object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, Route118_EventScript_28CE36, 797 - object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 12, 10, 3, 2, 17, 0, 0, Route118_EventScript_1F3E73, 0 - object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, Route118_EventScript_28CED6, 901 - object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, Route118_EventScript_28CEF6, 901 - object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, Route118_EventScript_28CF16, 904 - object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, Route118_EventScript_28CF36, 904 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, 1, 0, 0, 0, Route118_EventScript_2906BB, 17 - object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 8, 3, 9, 0, 0, 0, Route118_EventScript_1F3E14, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 12, 3, 7, 0, 1, 4, Route118_EventScript_1F3F87, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 14, 14, 3, 8, 0, 1, 0, Route118_EventScript_1F4000, 0 - object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 56, 7, 3, 16, 0, 1, 3, Route118_EventScript_1F4090, 0 - object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 39, 15, 3, 1, 0, 1, 2, Route118_EventScript_1F3FE9, 0 - object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 17, 11, 3, 15, 17, 1, 3, Route118_EventScript_1F4017, 0 - object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, 8, 17, 0, 0, 0x0, 966 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, 1, 17, 0, 0, Route118_EventScript_290ED3, 1121 - object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 7, 3, 8, 17, 1, 4, Route118_EventScript_1F40A7, 0 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 5, 3, 12, 0, 0, 0, 31, BerryTreeScript, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, 12, 0, 0, 0, 32, BerryTreeScript, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, 12, 0, 0, 0, 33, BerryTreeScript, 0 + object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 64, 10, 3, 8, 0, 0, 1, 3, Route118_EventScript_1F4079, 0 + object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE16, 797 + object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE36, 797 + object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 12, 10, 3, 2, 1, 1, 0, 0, Route118_EventScript_1F3E73, 0 + object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CED6, 901 + object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CEF6, 901 + object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF16, 904 + object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF36, 904 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, 1, 0, 0, 0, 0, Route118_EventScript_2906BB, 17 + object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 8, 3, 9, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0 + object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 12, 3, 7, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0 + object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 14, 14, 3, 8, 0, 0, 1, 0, Route118_EventScript_1F4000, 0 + object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 56, 7, 3, 16, 0, 0, 1, 3, Route118_EventScript_1F4090, 0 + object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 39, 15, 3, 1, 0, 0, 1, 2, Route118_EventScript_1F3FE9, 0 + object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 17, 11, 3, 15, 1, 1, 1, 3, Route118_EventScript_1F4017, 0 + object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, 8, 1, 1, 0, 0, 0x0, 966 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, 1, 1, 1, 0, 0, Route118_EventScript_290ED3, 1121 + object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 7, 3, 8, 1, 1, 1, 4, Route118_EventScript_1F40A7, 0 Route118_MapWarps: @ 852ACAC warp_def 42, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc index a5e781b87d..bd10dc05b6 100644 --- a/data/maps/events/Route119.inc +++ b/data/maps/events/Route119.inc @@ -1,47 +1,47 @@ Route119_EventObjects: @ 852AD6C - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 5, 3, 12, 0, 0, 34, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 5, 3, 12, 0, 0, 35, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 26, 5, 3, 12, 0, 0, 36, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 12, 123, 3, 59, 0, 1, 1, Route119_EventScript_1F47E2, 0 - object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 26, 123, 3, 60, 0, 1, 1, Route119_EventScript_1F47B4, 0 - object_event 6, EVENT_OBJ_GFX_MANIAC, 0, 5, 125, 3, 62, 0, 1, 1, Route119_EventScript_1F479D, 0 - object_event 7, EVENT_OBJ_GFX_CAMPER, 0, 7, 74, 3, 18, 0, 1, 3, Route119_EventScript_1F4810, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 116, 3, 60, 0, 1, 1, Route119_EventScript_1F4786, 0 - object_event 9, EVENT_OBJ_GFX_PICNICKER, 0, 35, 83, 4, 8, 0, 1, 2, Route119_EventScript_1F4872, 0 - object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 34, 122, 3, 61, 0, 1, 1, Route119_EventScript_1F47CB, 0 - object_event 11, EVENT_OBJ_GFX_BUG_CATCHER, 0, 17, 128, 3, 61, 0, 1, 1, Route119_EventScript_1F47F9, 0 - object_event 12, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 28, 14, 3, 57, 0, 1, 1, Route119_EventScript_1F4902, 0 - object_event 13, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 49, 3, 58, 0, 1, 3, Route119_EventScript_1F4919, 0 - object_event 14, EVENT_OBJ_GFX_MAN_6, 0, 10, 50, 4, 10, 0, 1, 3, Route119_EventScript_1F48D4, 0 - object_event 15, EVENT_OBJ_GFX_MAN_6, 0, 8, 63, 3, 8, 0, 1, 5, Route119_EventScript_1F48EB, 0 - object_event 16, EVENT_OBJ_GFX_HIPSTER, 0, 25, 32, 3, 7, 0, 0, 0, 0x0, 851 - object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 121, 3, 1, 0, 0, 0, Route119_EventScript_290EE0, 1024 - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 96, 3, 1, 0, 0, 0, Route119_EventScript_290EED, 1025 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, 1, 0, 0, 0, Route119_EventScript_290EFA, 1026 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 76, 3, 1, 0, 0, 0, Route119_EventScript_290F07, 1027 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 18, 3, 1, 0, 0, 0, Route119_EventScript_290F14, 1028 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 117, 3, 1, 0, 0, 0, Route119_EventScript_290F21, 1029 - object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 33, 4, 10, 0, 0, 0, Route119_EventScript_1F49A3, 890 - object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 34, 4, 10, 0, 0, 0, Route119_EventScript_1F49BA, 890 - object_event 25, EVENT_OBJ_GFX_GIDDY, 0, 17, 33, 4, 7, 0, 0, 0, 0x0, 923 - object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 31, 109, 3, 8, 17, 0, 0, Route119_EventScript_1F49D1, 0 - object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 8, 23, 3, 12, 0, 0, 83, BerryTreeScript, 0 - object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 23, 3, 12, 0, 0, 84, BerryTreeScript, 0 - object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 90, 3, 12, 0, 0, 85, BerryTreeScript, 0 - object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 90, 3, 12, 0, 0, 86, BerryTreeScript, 0 - object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 133, 3, 5, 18, 0, 0, Route119_EventScript_1F476B, 0 - object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 56, 3, 1, 17, 0, 0, Route119_EventScript_290F2E, 1106 - object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 35, 93, 4, 2, 17, 0, 0, Route119_EventScript_1F49DA, 0 - object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, 57, 17, 1, 3, Route119_EventScript_1F4930, 0 - object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 6, 3, 76, 17, 0, 0, Route119_EventScript_27231C, 989 - object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 15, 3, 76, 17, 0, 0, Route119_EventScript_272329, 990 - object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 104, 3, 10, 17, 1, 0, Route119_EventScript_1F4947, 0 - object_event 38, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 68, 3, 7, 17, 1, 5, Route119_EventScript_1F498C, 0 - object_event 39, EVENT_OBJ_GFX_MAN_6, 0, 16, 52, 3, 10, 17, 1, 3, Route119_EventScript_1F4975, 0 - object_event 40, EVENT_OBJ_GFX_MAN_6, 0, 32, 15, 3, 9, 17, 1, 4, Route119_EventScript_1F495E, 0 - object_event 41, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 5, 4, 1, 17, 0, 0, Route119_EventScript_291399, 1134 - object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 42, 3, 1, 17, 0, 0, Route119_EventScript_290F3B, 1147 - object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 28, 25, 3, 8, 0, 0, 0, 0x0, 786 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 5, 3, 12, 0, 0, 0, 34, BerryTreeScript, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 5, 3, 12, 0, 0, 0, 35, BerryTreeScript, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 26, 5, 3, 12, 0, 0, 0, 36, BerryTreeScript, 0 + object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 12, 123, 3, 59, 0, 0, 1, 1, Route119_EventScript_1F47E2, 0 + object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 26, 123, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F47B4, 0 + object_event 6, EVENT_OBJ_GFX_MANIAC, 0, 5, 125, 3, 62, 0, 0, 1, 1, Route119_EventScript_1F479D, 0 + object_event 7, EVENT_OBJ_GFX_CAMPER, 0, 7, 74, 3, 18, 0, 0, 1, 3, Route119_EventScript_1F4810, 0 + object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 116, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F4786, 0 + object_event 9, EVENT_OBJ_GFX_PICNICKER, 0, 35, 83, 4, 8, 0, 0, 1, 2, Route119_EventScript_1F4872, 0 + object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 34, 122, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47CB, 0 + object_event 11, EVENT_OBJ_GFX_BUG_CATCHER, 0, 17, 128, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47F9, 0 + object_event 12, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 28, 14, 3, 57, 0, 0, 1, 1, Route119_EventScript_1F4902, 0 + object_event 13, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 49, 3, 58, 0, 0, 1, 3, Route119_EventScript_1F4919, 0 + object_event 14, EVENT_OBJ_GFX_MAN_6, 0, 10, 50, 4, 10, 0, 0, 1, 3, Route119_EventScript_1F48D4, 0 + object_event 15, EVENT_OBJ_GFX_MAN_6, 0, 8, 63, 3, 8, 0, 0, 1, 5, Route119_EventScript_1F48EB, 0 + object_event 16, EVENT_OBJ_GFX_HIPSTER, 0, 25, 32, 3, 7, 0, 0, 0, 0, 0x0, 851 + object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 121, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EE0, 1024 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 96, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EED, 1025 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EFA, 1026 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 76, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F07, 1027 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 18, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F14, 1028 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 117, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F21, 1029 + object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 33, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49A3, 890 + object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 34, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49BA, 890 + object_event 25, EVENT_OBJ_GFX_GIDDY, 0, 17, 33, 4, 7, 0, 0, 0, 0, 0x0, 923 + object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 31, 109, 3, 8, 1, 1, 0, 0, Route119_EventScript_1F49D1, 0 + object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 8, 23, 3, 12, 0, 0, 0, 83, BerryTreeScript, 0 + object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 23, 3, 12, 0, 0, 0, 84, BerryTreeScript, 0 + object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 90, 3, 12, 0, 0, 0, 85, BerryTreeScript, 0 + object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 90, 3, 12, 0, 0, 0, 86, BerryTreeScript, 0 + object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 133, 3, 5, 2, 1, 0, 0, Route119_EventScript_1F476B, 0 + object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 56, 3, 1, 1, 1, 0, 0, Route119_EventScript_290F2E, 1106 + object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 35, 93, 4, 2, 1, 1, 0, 0, Route119_EventScript_1F49DA, 0 + object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, 57, 1, 1, 1, 3, Route119_EventScript_1F4930, 0 + object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 6, 3, 76, 1, 1, 0, 0, Route119_EventScript_27231C, 989 + object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 15, 3, 76, 1, 1, 0, 0, Route119_EventScript_272329, 990 + object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 104, 3, 10, 1, 1, 1, 0, Route119_EventScript_1F4947, 0 + object_event 38, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 68, 3, 7, 1, 1, 1, 5, Route119_EventScript_1F498C, 0 + object_event 39, EVENT_OBJ_GFX_MAN_6, 0, 16, 52, 3, 10, 1, 1, 1, 3, Route119_EventScript_1F4975, 0 + object_event 40, EVENT_OBJ_GFX_MAN_6, 0, 32, 15, 3, 9, 1, 1, 1, 4, Route119_EventScript_1F495E, 0 + object_event 41, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 5, 4, 1, 1, 1, 0, 0, Route119_EventScript_291399, 1134 + object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 42, 3, 1, 1, 1, 0, 0, Route119_EventScript_290F3B, 1147 + object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 28, 25, 3, 8, 0, 0, 0, 0, 0x0, 786 Route119_MapWarps: @ 852B174 warp_def 6, 32, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_1F diff --git a/data/maps/events/Route119_House.inc b/data/maps/events/Route119_House.inc index 31dd51afd7..05d426fe5a 100644 --- a/data/maps/events/Route119_House.inc +++ b/data/maps/events/Route119_House.inc @@ -1,11 +1,11 @@ Route119_House_EventObjects: @ 853ECD0 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 2, 3, 8, 0, 0, 0, Route119_House_EventScript_270966, 0 - object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 1, 6, 3, 2, 34, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 3, 2, 19, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 2, 2, 3, 2, 17, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 5, EVENT_OBJ_GFX_WINGULL, 0, 8, 5, 3, 2, 35, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 6, 6, 3, 2, 34, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 5, 3, 3, 2, 49, 0, 0, Route119_House_EventScript_27096F, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route119_House_EventScript_270966, 0 + object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 1, 6, 3, 2, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0 + object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 3, 2, 3, 1, 0, 0, Route119_House_EventScript_27096F, 0 + object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 2, 2, 3, 2, 1, 1, 0, 0, Route119_House_EventScript_27096F, 0 + object_event 5, EVENT_OBJ_GFX_WINGULL, 0, 8, 5, 3, 2, 3, 2, 0, 0, Route119_House_EventScript_27096F, 0 + object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 6, 6, 3, 2, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0 + object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 5, 3, 3, 2, 1, 3, 0, 0, Route119_House_EventScript_27096F, 0 Route119_House_MapWarps: @ 853ED78 warp_def 3, 8, 0, 1, MAP_ROUTE119 diff --git a/data/maps/events/Route119_WeatherInstitute_1F.inc b/data/maps/events/Route119_WeatherInstitute_1F.inc index 2e308bf4f0..ee9f42ac5f 100644 --- a/data/maps/events/Route119_WeatherInstitute_1F.inc +++ b/data/maps/events/Route119_WeatherInstitute_1F.inc @@ -1,9 +1,9 @@ Route119_WeatherInstitute_1F_EventObjects: @ 853EB20 - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 3, 3, 9, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, 890 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 10, 5, 3, 8, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, 890 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 5, 4, 3, 8, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, 892 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 2, 11, 3, 1, 1, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, 892 - object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 14, 11, 3, 2, 17, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 3, 3, 9, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, 890 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 10, 5, 3, 8, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, 890 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 5, 4, 3, 8, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, 892 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 2, 11, 3, 1, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, 892 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 14, 11, 3, 2, 1, 1, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0 Route119_WeatherInstitute_1F_MapWarps: @ 853EB98 warp_def 9, 12, 0, 0, MAP_ROUTE119 diff --git a/data/maps/events/Route119_WeatherInstitute_2F.inc b/data/maps/events/Route119_WeatherInstitute_2F.inc index bf900b67b8..4196be41bf 100644 --- a/data/maps/events/Route119_WeatherInstitute_2F.inc +++ b/data/maps/events/Route119_WeatherInstitute_2F.inc @@ -1,12 +1,12 @@ Route119_WeatherInstitute_2F_EventObjects: @ 853EBF4 - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 6, 3, 10, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, 890 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 8, 3, 13, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, 890 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 4, 6, 3, 10, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, 890 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 3, 10, 0, 0, 0, 0x0, 893 - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 6, 3, 1, 18, 0, 0, Route119_WeatherInstitute_2F_EventScript_27018B, 0 - object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 1, 7, 3, 10, 0, 0, 0, 0x0, 893 - object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 16, 6, 3, 9, 17, 0, 0, 0x0, 992 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 19, 6, 3, 9, 17, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, 890 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 6, 3, 10, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, 890 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 8, 3, 13, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, 890 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 4, 6, 3, 10, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, 890 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 3, 10, 0, 0, 0, 0, 0x0, 893 + object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 6, 3, 1, 2, 1, 0, 0, Route119_WeatherInstitute_2F_EventScript_27018B, 0 + object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 893 + object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 16, 6, 3, 9, 1, 1, 0, 0, 0x0, 992 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 19, 6, 3, 9, 1, 1, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, 890 Route119_WeatherInstitute_2F_MapWarps: @ 853ECB4 warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc index d2b22f730a..a19a70f33b 100644 --- a/data/maps/events/Route120.inc +++ b/data/maps/events/Route120.inc @@ -1,48 +1,48 @@ Route120_EventObjects: @ 852B3F8 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 4, 79, 3, 12, 0, 0, 46, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 79, 3, 12, 0, 0, 45, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 79, 3, 12, 0, 0, 44, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 79, 3, 12, 0, 0, 43, BerryTreeScript, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 24, 3, 12, 0, 0, 37, BerryTreeScript, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 24, 3, 12, 0, 0, 38, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 24, 3, 12, 0, 0, 39, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 92, 5, 12, 0, 0, 40, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 10, 92, 5, 12, 0, 0, 41, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 92, 5, 12, 0, 0, 42, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 5, 22, 3, 14, 0, 1, 3, Route120_EventScript_1F57D7, 0 - object_event 12, EVENT_OBJ_GFX_MAN_6, 0, 32, 14, 3, 10, 0, 1, 3, Route120_EventScript_1F57EE, 0 - object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 27, 51, 3, 9, 0, 1, 7, Route120_EventScript_1F5850, 0 - object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 36, 45, 3, 9, 0, 1, 2, Route120_EventScript_1F5867, 0 - object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 19, 80, 5, 15, 0, 1, 3, Route120_EventScript_1F587E, 0 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 55, 3, 1, 0, 0, 0, Route120_EventScript_290F48, 1030 - object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, 8, 0, 0, 0, Route120_EventScript_28CE76, 798 - object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, 8, 0, 0, 0, Route120_EventScript_28CE56, 798 - object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, 8, 0, 0, 0, Route120_EventScript_28CF16, 902 - object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, 8, 0, 0, 0, Route120_EventScript_28CF36, 902 - object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, 1, 0, 0, 0, Route120_EventScript_2906BB, 17 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, 1, 0, 0, 0, Route120_EventScript_290F55, 1031 - object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 14, 92, 5, 5, 1, 0, 0, Route120_EventScript_1F5527, 0 - object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 31, 37, 3, 15, 0, 1, 4, Route120_EventScript_1F58E0, 0 - object_event 25, EVENT_OBJ_GFX_HIKER, 0, 9, 60, 3, 21, 0, 1, 4, Route120_EventScript_1F58F7, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 6, 3, 23, 0, 1, 4, Route120_EventScript_1F590E, 0 - object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 34, 3, 9, 0, 1, 3, Route120_EventScript_1F5925, 0 - object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, 1, 17, 0, 0, Route120_EventScript_290F6F, 1108 - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, 1, 17, 0, 0, Route120_EventScript_290F62, 1107 - object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, 76, 17, 0, 0, Route120_EventScript_1F57BC, 970 - object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, 8, 17, 0, 0, Route120_EventScript_1F5641, 972 - object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, 1, 17, 0, 0, Route120_EventScript_2906BB, 20 - object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, 1, 17, 0, 0, Route120_EventScript_2906BB, 18 - object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 10, 72, 3, 58, 17, 1, 3, Route120_EventScript_1F593C, 0 - object_event 35, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 28, 3, 57, 17, 1, 3, Route120_EventScript_1F5953, 0 - object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, 8, 17, 0, 0, 0x0, 981 - object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, 76, 17, 0, 0, Route120_EventScript_2722DB, 982 - object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, 76, 17, 0, 0, Route120_EventScript_2722E8, 985 - object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, 76, 17, 0, 0, Route120_EventScript_2722F5, 986 - object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, 76, 17, 0, 0, Route120_EventScript_27230F, 988 - object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, 76, 17, 0, 0, Route120_EventScript_272302, 987 - object_event 42, EVENT_OBJ_GFX_GIRL_3, 0, 19, 32, 3, 7, 17, 1, 3, Route120_EventScript_1F5981, 0 - object_event 43, EVENT_OBJ_GFX_MAN_4, 0, 14, 34, 3, 10, 17, 1, 3, Route120_EventScript_1F596A, 0 - object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 33, 3, 1, 17, 0, 0, Route120_EventScript_290F7C, 1148 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 4, 79, 3, 12, 0, 0, 0, 46, BerryTreeScript, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 79, 3, 12, 0, 0, 0, 45, BerryTreeScript, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 79, 3, 12, 0, 0, 0, 44, BerryTreeScript, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 79, 3, 12, 0, 0, 0, 43, BerryTreeScript, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 24, 3, 12, 0, 0, 0, 37, BerryTreeScript, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 24, 3, 12, 0, 0, 0, 38, BerryTreeScript, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 24, 3, 12, 0, 0, 0, 39, BerryTreeScript, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 92, 5, 12, 0, 0, 0, 40, BerryTreeScript, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 10, 92, 5, 12, 0, 0, 0, 41, BerryTreeScript, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 92, 5, 12, 0, 0, 0, 42, BerryTreeScript, 0 + object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 5, 22, 3, 14, 0, 0, 1, 3, Route120_EventScript_1F57D7, 0 + object_event 12, EVENT_OBJ_GFX_MAN_6, 0, 32, 14, 3, 10, 0, 0, 1, 3, Route120_EventScript_1F57EE, 0 + object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 27, 51, 3, 9, 0, 0, 1, 7, Route120_EventScript_1F5850, 0 + object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 36, 45, 3, 9, 0, 0, 1, 2, Route120_EventScript_1F5867, 0 + object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 19, 80, 5, 15, 0, 0, 1, 3, Route120_EventScript_1F587E, 0 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 55, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F48, 1030 + object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE76, 798 + object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE56, 798 + object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF16, 902 + object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF36, 902 + object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, 1, 0, 0, 0, 0, Route120_EventScript_2906BB, 17 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F55, 1031 + object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 14, 92, 5, 5, 1, 0, 0, 0, Route120_EventScript_1F5527, 0 + object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 31, 37, 3, 15, 0, 0, 1, 4, Route120_EventScript_1F58E0, 0 + object_event 25, EVENT_OBJ_GFX_HIKER, 0, 9, 60, 3, 21, 0, 0, 1, 4, Route120_EventScript_1F58F7, 0 + object_event 26, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 6, 3, 23, 0, 0, 1, 4, Route120_EventScript_1F590E, 0 + object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 34, 3, 9, 0, 0, 1, 3, Route120_EventScript_1F5925, 0 + object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, 1, 1, 1, 0, 0, Route120_EventScript_290F6F, 1108 + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, 1, 1, 1, 0, 0, Route120_EventScript_290F62, 1107 + object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, 76, 1, 1, 0, 0, Route120_EventScript_1F57BC, 970 + object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, 8, 1, 1, 0, 0, Route120_EventScript_1F5641, 972 + object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, 1, 1, 1, 0, 0, Route120_EventScript_2906BB, 20 + object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, 1, 1, 1, 0, 0, Route120_EventScript_2906BB, 18 + object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 10, 72, 3, 58, 1, 1, 1, 3, Route120_EventScript_1F593C, 0 + object_event 35, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 28, 3, 57, 1, 1, 1, 3, Route120_EventScript_1F5953, 0 + object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, 8, 1, 1, 0, 0, 0x0, 981 + object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, 76, 1, 1, 0, 0, Route120_EventScript_2722DB, 982 + object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, 76, 1, 1, 0, 0, Route120_EventScript_2722E8, 985 + object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, 76, 1, 1, 0, 0, Route120_EventScript_2722F5, 986 + object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, 76, 1, 1, 0, 0, Route120_EventScript_27230F, 988 + object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, 76, 1, 1, 0, 0, Route120_EventScript_272302, 987 + object_event 42, EVENT_OBJ_GFX_GIRL_3, 0, 19, 32, 3, 7, 1, 1, 1, 3, Route120_EventScript_1F5981, 0 + object_event 43, EVENT_OBJ_GFX_MAN_4, 0, 14, 34, 3, 10, 1, 1, 1, 3, Route120_EventScript_1F596A, 0 + object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 33, 3, 1, 1, 1, 0, 0, Route120_EventScript_290F7C, 1148 Route120_MapWarps: @ 852B818 warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc index 77dec98a51..17ddae47f9 100644 --- a/data/maps/events/Route121.inc +++ b/data/maps/events/Route121.inc @@ -1,33 +1,33 @@ Route121_EventObjects: @ 852BA14 - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 29, 14, 3, 10, 17, 0, 0, Route121_EventScript_1F5DFD, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 2, 3, 12, 0, 0, 47, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 2, 3, 12, 0, 0, 48, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 16, 2, 3, 12, 0, 0, 49, BerryTreeScript, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 2, 3, 12, 0, 0, 50, BerryTreeScript, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 64, 14, 3, 12, 0, 0, 51, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 65, 14, 3, 12, 0, 0, 52, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 66, 14, 3, 12, 0, 0, 53, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 67, 14, 3, 12, 0, 0, 54, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_LASS, 0, 39, 9, 3, 8, 0, 1, 1, Route121_EventScript_1F5F04, 0 - object_event 11, EVENT_OBJ_GFX_LASS, 0, 40, 9, 3, 8, 0, 1, 1, Route121_EventScript_1F5F1F, 0 - object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 8, 3, 7, 0, 0, 0, 0x0, 914 - object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 7, 3, 10, 0, 0, 0, 0x0, 914 - object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 7, 3, 9, 0, 0, 0, 0x0, 914 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, 1, 0, 0, 0, Route121_EventScript_2906BB, 17 - object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, 1, 0, 0, 0, Route121_EventScript_2906BB, 18 - object_event 17, EVENT_OBJ_GFX_WOMAN_2, 0, 63, 5, 3, 9, 0, 1, 4, Route121_EventScript_1F5E74, 0 - object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 8, 3, 9, 0, 1, 3, Route121_EventScript_1F5E8B, 0 - object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 11, 3, 7, 0, 1, 4, Route121_EventScript_1F5EED, 0 - object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 5, 3, 17, 0, 1, 4, Route121_EventScript_1F5F3A, 0 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, 1, 17, 0, 0, Route121_EventScript_290F89, 1103 - object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, 1, 17, 0, 0, Route121_EventScript_2906BB, 19 - object_event 23, EVENT_OBJ_GFX_MANIAC, 0, 11, 6, 3, 26, 65, 1, 3, Route121_EventScript_1F5F9C, 0 - object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 59, 8, 3, 8, 17, 1, 4, Route121_EventScript_1F5FB3, 0 - object_event 25, EVENT_OBJ_GFX_WOMAN_3, 0, 59, 13, 3, 7, 17, 1, 4, Route121_EventScript_1F5FCA, 0 - object_event 26, EVENT_OBJ_GFX_MAN_4, 0, 65, 9, 3, 18, 17, 1, 6, Route121_EventScript_1F5FE1, 0 - object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 72, 9, 3, 17, 17, 1, 6, Route121_EventScript_1F5FF8, 0 - object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 60, 10, 3, 1, 17, 0, 0, Route121_EventScript_290F96, 1149 - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, 1, 17, 0, 0, Route121_EventScript_290FA3, 1150 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 29, 14, 3, 10, 1, 1, 0, 0, Route121_EventScript_1F5DFD, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 2, 3, 12, 0, 0, 0, 47, BerryTreeScript, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 2, 3, 12, 0, 0, 0, 48, BerryTreeScript, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 16, 2, 3, 12, 0, 0, 0, 49, BerryTreeScript, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 2, 3, 12, 0, 0, 0, 50, BerryTreeScript, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 64, 14, 3, 12, 0, 0, 0, 51, BerryTreeScript, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 65, 14, 3, 12, 0, 0, 0, 52, BerryTreeScript, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 66, 14, 3, 12, 0, 0, 0, 53, BerryTreeScript, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 67, 14, 3, 12, 0, 0, 0, 54, BerryTreeScript, 0 + object_event 10, EVENT_OBJ_GFX_LASS, 0, 39, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F04, 0 + object_event 11, EVENT_OBJ_GFX_LASS, 0, 40, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F1F, 0 + object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 8, 3, 7, 0, 0, 0, 0, 0x0, 914 + object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 7, 3, 10, 0, 0, 0, 0, 0x0, 914 + object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 7, 3, 9, 0, 0, 0, 0, 0x0, 914 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 17 + object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 18 + object_event 17, EVENT_OBJ_GFX_WOMAN_2, 0, 63, 5, 3, 9, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0 + object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 8, 3, 9, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0 + object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 11, 3, 7, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0 + object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 5, 3, 17, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, 1, 1, 1, 0, 0, Route121_EventScript_290F89, 1103 + object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, 1, 1, 1, 0, 0, Route121_EventScript_2906BB, 19 + object_event 23, EVENT_OBJ_GFX_MANIAC, 0, 11, 6, 3, 26, 1, 4, 1, 3, Route121_EventScript_1F5F9C, 0 + object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 59, 8, 3, 8, 1, 1, 1, 4, Route121_EventScript_1F5FB3, 0 + object_event 25, EVENT_OBJ_GFX_WOMAN_3, 0, 59, 13, 3, 7, 1, 1, 1, 4, Route121_EventScript_1F5FCA, 0 + object_event 26, EVENT_OBJ_GFX_MAN_4, 0, 65, 9, 3, 18, 1, 1, 1, 6, Route121_EventScript_1F5FE1, 0 + object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 72, 9, 3, 17, 1, 1, 1, 6, Route121_EventScript_1F5FF8, 0 + object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 60, 10, 3, 1, 1, 1, 0, 0, Route121_EventScript_290F96, 1149 + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, 1, 1, 1, 0, 0, Route121_EventScript_290FA3, 1150 Route121_MapWarps: @ 852BCCC warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE diff --git a/data/maps/events/Route121_SafariZoneEntrance.inc b/data/maps/events/Route121_SafariZoneEntrance.inc index 2b56e1b1a5..2d83515343 100644 --- a/data/maps/events/Route121_SafariZoneEntrance.inc +++ b/data/maps/events/Route121_SafariZoneEntrance.inc @@ -1,7 +1,7 @@ Route121_SafariZoneEntrance_EventObjects: @ 8533EDC - object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 17, 9, 3, 9, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBE6, 0 - object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 10, 2, 3, 8, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBEF, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 8, 2, 3, 8, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 17, 9, 3, 9, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBE6, 0 + object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 10, 2, 3, 8, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBEF, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 8, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 Route121_SafariZoneEntrance_MapWarps: @ 8533F24 warp_def 2, 5, 0, 0, MAP_SAFARI_ZONE_SOUTH diff --git a/data/maps/events/Route123.inc b/data/maps/events/Route123.inc index 717fce4d07..0fc1b015b3 100644 --- a/data/maps/events/Route123.inc +++ b/data/maps/events/Route123.inc @@ -1,47 +1,47 @@ Route123_EventObjects: @ 852BDBC - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 3, 3, 12, 0, 0, 58, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 3, 3, 12, 0, 0, 59, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 3, 3, 12, 0, 0, 60, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 3, 3, 12, 0, 0, 61, BerryTreeScript, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 81, 1, 3, 12, 0, 0, 62, BerryTreeScript, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 82, 1, 3, 12, 0, 0, 63, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 83, 1, 3, 12, 0, 0, 64, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 70, 12, 3, 24, 0, 1, 1, Route123_EventScript_1F61C5, 0 - object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 58, 7, 3, 17, 0, 1, 2, Route123_EventScript_1F61DC, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, 12, 0, 0, 65, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 5, 3, 12, 0, 0, 72, BerryTreeScript, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 5, 3, 12, 0, 0, 73, BerryTreeScript, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, 12, 0, 0, 74, BerryTreeScript, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 3, 3, 12, 0, 0, 79, BerryTreeScript, 0 - object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 3, 3, 12, 0, 0, 14, BerryTreeScript, 0 - object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, 12, 0, 0, 15, BerryTreeScript, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, 12, 0, 0, 30, BerryTreeScript, 0 - object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 101, 13, 3, 1, 0, 0, 0, Route123_EventScript_2906BB, 17 - object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 14, 3, 1, 0, 0, 0, Route123_EventScript_2906BB, 18 - object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 9, 3, 1, 0, 0, 0, Route123_EventScript_2906BB, 19 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 8, 3, 1, 0, 0, 0, Route123_EventScript_290FB0, 1032 - object_event 22, EVENT_OBJ_GFX_GIRL_3, 0, 108, 13, 3, 15, 0, 0, 0, Route123_EventScript_1F6151, 0 - object_event 23, EVENT_OBJ_GFX_BERRY_TREE, 0, 109, 13, 3, 12, 0, 0, 87, BerryTreeScript, 0 - object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 110, 13, 3, 12, 0, 0, 88, BerryTreeScript, 0 - object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 111, 13, 3, 12, 0, 0, 89, BerryTreeScript, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 9, 3, 23, 0, 1, 2, Route123_EventScript_1F61F3, 0 - object_event 27, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 13, 3, 8, 0, 1, 1, Route123_EventScript_1F62E9, 0 - object_event 28, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 37, 13, 3, 8, 0, 1, 1, Route123_EventScript_1F62CE, 0 - object_event 29, EVENT_OBJ_GFX_PSYCHIC_M, 0, 138, 12, 3, 9, 0, 1, 7, Route123_EventScript_1F620A, 0 - object_event 30, EVENT_OBJ_GFX_LASS, 0, 49, 16, 3, 8, 0, 1, 1, Route123_EventScript_1F626C, 0 - object_event 31, EVENT_OBJ_GFX_HEX_MANIAC, 0, 87, 12, 3, 8, 0, 1, 4, Route123_EventScript_1F6304, 0 - object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 18, 3, 1, 17, 0, 0, Route123_EventScript_290FBD, 1104 - object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 9, 3, 1, 17, 0, 0, Route123_EventScript_290FCA, 1109 - object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 138, 14, 3, 57, 17, 1, 1, Route123_EventScript_1F6377, 0 - object_event 35, EVENT_OBJ_GFX_WOMAN_3, 0, 138, 16, 3, 7, 17, 1, 1, Route123_EventScript_1F6360, 0 - object_event 36, EVENT_OBJ_GFX_MANIAC, 0, 87, 17, 3, 7, 17, 1, 4, Route123_EventScript_1F6349, 0 - object_event 37, EVENT_OBJ_GFX_MAN_6, 0, 66, 16, 3, 8, 17, 1, 2, Route123_EventScript_1F63BC, 0 - object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 66, 19, 3, 7, 17, 1, 2, Route123_EventScript_1F6332, 0 - object_event 39, EVENT_OBJ_GFX_OLD_MAN_1, 0, 49, 19, 3, 7, 17, 1, 2, Route123_EventScript_1F631B, 0 - object_event 40, EVENT_OBJ_GFX_ITEM_BALL, 0, 43, 15, 3, 1, 17, 0, 0, Route123_EventScript_290FD7, 1152 - object_event 41, EVENT_OBJ_GFX_WOMAN_7, 0, 14, 16, 3, 7, 17, 1, 3, Route123_EventScript_1F638E, 0 - object_event 42, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 12, 3, 26, 49, 1, 3, Route123_EventScript_1F63A5, 0 - object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 57, 16, 3, 1, 17, 0, 0, Route123_EventScript_290FE4, 1153 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 3, 3, 12, 0, 0, 0, 58, BerryTreeScript, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 3, 3, 12, 0, 0, 0, 59, BerryTreeScript, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 3, 3, 12, 0, 0, 0, 60, BerryTreeScript, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 3, 3, 12, 0, 0, 0, 61, BerryTreeScript, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 81, 1, 3, 12, 0, 0, 0, 62, BerryTreeScript, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 82, 1, 3, 12, 0, 0, 0, 63, BerryTreeScript, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 83, 1, 3, 12, 0, 0, 0, 64, BerryTreeScript, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 70, 12, 3, 24, 0, 0, 1, 1, Route123_EventScript_1F61C5, 0 + object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 58, 7, 3, 17, 0, 0, 1, 2, Route123_EventScript_1F61DC, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, 12, 0, 0, 0, 65, BerryTreeScript, 0 + object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 5, 3, 12, 0, 0, 0, 72, BerryTreeScript, 0 + object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 5, 3, 12, 0, 0, 0, 73, BerryTreeScript, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, 12, 0, 0, 0, 74, BerryTreeScript, 0 + object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 3, 3, 12, 0, 0, 0, 79, BerryTreeScript, 0 + object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 3, 3, 12, 0, 0, 0, 14, BerryTreeScript, 0 + object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, 12, 0, 0, 0, 15, BerryTreeScript, 0 + object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, 12, 0, 0, 0, 30, BerryTreeScript, 0 + object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 101, 13, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 17 + object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 14, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 18 + object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 9, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 19 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 8, 3, 1, 0, 0, 0, 0, Route123_EventScript_290FB0, 1032 + object_event 22, EVENT_OBJ_GFX_GIRL_3, 0, 108, 13, 3, 15, 0, 0, 0, 0, Route123_EventScript_1F6151, 0 + object_event 23, EVENT_OBJ_GFX_BERRY_TREE, 0, 109, 13, 3, 12, 0, 0, 0, 87, BerryTreeScript, 0 + object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 110, 13, 3, 12, 0, 0, 0, 88, BerryTreeScript, 0 + object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 111, 13, 3, 12, 0, 0, 0, 89, BerryTreeScript, 0 + object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 9, 3, 23, 0, 0, 1, 2, Route123_EventScript_1F61F3, 0 + object_event 27, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62E9, 0 + object_event 28, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 37, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62CE, 0 + object_event 29, EVENT_OBJ_GFX_PSYCHIC_M, 0, 138, 12, 3, 9, 0, 0, 1, 7, Route123_EventScript_1F620A, 0 + object_event 30, EVENT_OBJ_GFX_LASS, 0, 49, 16, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F626C, 0 + object_event 31, EVENT_OBJ_GFX_HEX_MANIAC, 0, 87, 12, 3, 8, 0, 0, 1, 4, Route123_EventScript_1F6304, 0 + object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 18, 3, 1, 1, 1, 0, 0, Route123_EventScript_290FBD, 1104 + object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 9, 3, 1, 1, 1, 0, 0, Route123_EventScript_290FCA, 1109 + object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 138, 14, 3, 57, 1, 1, 1, 1, Route123_EventScript_1F6377, 0 + object_event 35, EVENT_OBJ_GFX_WOMAN_3, 0, 138, 16, 3, 7, 1, 1, 1, 1, Route123_EventScript_1F6360, 0 + object_event 36, EVENT_OBJ_GFX_MANIAC, 0, 87, 17, 3, 7, 1, 1, 1, 4, Route123_EventScript_1F6349, 0 + object_event 37, EVENT_OBJ_GFX_MAN_6, 0, 66, 16, 3, 8, 1, 1, 1, 2, Route123_EventScript_1F63BC, 0 + object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 66, 19, 3, 7, 1, 1, 1, 2, Route123_EventScript_1F6332, 0 + object_event 39, EVENT_OBJ_GFX_OLD_MAN_1, 0, 49, 19, 3, 7, 1, 1, 1, 2, Route123_EventScript_1F631B, 0 + object_event 40, EVENT_OBJ_GFX_ITEM_BALL, 0, 43, 15, 3, 1, 1, 1, 0, 0, Route123_EventScript_290FD7, 1152 + object_event 41, EVENT_OBJ_GFX_WOMAN_7, 0, 14, 16, 3, 7, 1, 1, 1, 3, Route123_EventScript_1F638E, 0 + object_event 42, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 12, 3, 26, 1, 3, 1, 3, Route123_EventScript_1F63A5, 0 + object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 57, 16, 3, 1, 1, 1, 0, 0, Route123_EventScript_290FE4, 1153 Route123_MapWarps: @ 852C1C4 warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE diff --git a/data/maps/events/Route123_BerryMastersHouse.inc b/data/maps/events/Route123_BerryMastersHouse.inc index f889fe387b..3f47258701 100644 --- a/data/maps/events/Route123_BerryMastersHouse.inc +++ b/data/maps/events/Route123_BerryMastersHouse.inc @@ -1,6 +1,6 @@ Route123_BerryMastersHouse_EventObjects: @ 853EACC - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F845, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 4, 3, 8, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F845, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0 Route123_BerryMastersHouse_MapWarps: @ 853EAFC warp_def 3, 7, 0, 0, MAP_ROUTE123 diff --git a/data/maps/events/Route124.inc b/data/maps/events/Route124.inc index 6125be0cf5..2dc839783b 100644 --- a/data/maps/events/Route124.inc +++ b/data/maps/events/Route124.inc @@ -1,16 +1,16 @@ Route124_EventObjects: @ 852C3C4 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 34, 25, 1, 1, 5, 1, 3, Route124_EventScript_1F6585, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 61, 74, 1, 67, 53, 1, 7, Route124_EventScript_1F659C, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, 24, 0, 1, 3, Route124_EventScript_1F65B3, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 23, 1, 18, 134, 1, 5, Route124_EventScript_1F6615, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 58, 1, 28, 7, 1, 2, Route124_EventScript_1F662C, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, 1, 17, 0, 0, Route124_EventScript_290FF1, 1092 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, 1, 17, 0, 0, Route124_EventScript_290FFE, 1093 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, 1, 17, 0, 0, Route124_EventScript_29100B, 1066 - object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, 8, 17, 1, 1, Route124_EventScript_1F6643, 0 - object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, 8, 17, 1, 1, Route124_EventScript_1F66A7, 0 - object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 29, 1, 7, 17, 1, 5, Route124_EventScript_1F670B, 0 - object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 74, 1, 66, 17, 1, 7, Route124_EventScript_1F6722, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 34, 25, 1, 1, 5, 0, 1, 3, Route124_EventScript_1F6585, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 61, 74, 1, 67, 5, 3, 1, 7, Route124_EventScript_1F659C, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, 24, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 23, 1, 18, 6, 8, 1, 5, Route124_EventScript_1F6615, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 58, 1, 28, 7, 0, 1, 2, Route124_EventScript_1F662C, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, 1, 1, 1, 0, 0, Route124_EventScript_290FF1, 1092 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, 1, 1, 1, 0, 0, Route124_EventScript_290FFE, 1093 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, 1, 1, 1, 0, 0, Route124_EventScript_29100B, 1066 + object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, 8, 1, 1, 1, 1, Route124_EventScript_1F6643, 0 + object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, 8, 1, 1, 1, 1, Route124_EventScript_1F66A7, 0 + object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 29, 1, 7, 1, 1, 1, 5, Route124_EventScript_1F670B, 0 + object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 74, 1, 66, 1, 1, 1, 7, Route124_EventScript_1F6722, 0 Route124_MapWarps: @ 852C4E4 warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc index 71bbc705f9..606138e384 100644 --- a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc +++ b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc @@ -1,5 +1,5 @@ Route124_DivingTreasureHuntersHouse_EventObjects: @ 853ED9C - object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 5, 4, 0, 9, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0 + object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 5, 4, 0, 9, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0 Route124_DivingTreasureHuntersHouse_MapWarps: @ 853EDB4 warp_def 3, 8, 0, 0, MAP_ROUTE124 diff --git a/data/maps/events/Route125.inc b/data/maps/events/Route125.inc index 2ca6fb70bc..b767e512d8 100644 --- a/data/maps/events/Route125.inc +++ b/data/maps/events/Route125.inc @@ -1,14 +1,14 @@ Route125_EventObjects: @ 852C50C - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 31, 1, 28, 0, 1, 2, Route125_EventScript_1F67A4, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 9, 1, 10, 82, 1, 2, Route125_EventScript_1F67BB, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 38, 24, 1, 28, 6, 1, 3, Route125_EventScript_1F67D2, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 30, 28, 1, 52, 153, 1, 3, Route125_EventScript_1F67E9, 0 - object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 21, 30, 3, 13, 0, 1, 2, Route125_EventScript_1F6800, 0 - object_event 6, EVENT_OBJ_GFX_LASS, 0, 17, 19, 3, 8, 17, 1, 1, Route125_EventScript_1F6862, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 18, 19, 3, 8, 17, 1, 1, Route125_EventScript_1F687D, 0 - object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 43, 19, 3, 28, 18, 1, 3, Route125_EventScript_1F6898, 0 - object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 48, 19, 3, 27, 18, 1, 3, Route125_EventScript_1F68AF, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 46, 17, 3, 1, 17, 0, 0, Route125_EventScript_291018, 1154 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 31, 1, 28, 0, 0, 1, 2, Route125_EventScript_1F67A4, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 9, 1, 10, 2, 5, 1, 2, Route125_EventScript_1F67BB, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 38, 24, 1, 28, 6, 0, 1, 3, Route125_EventScript_1F67D2, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 30, 28, 1, 52, 9, 9, 1, 3, Route125_EventScript_1F67E9, 0 + object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 21, 30, 3, 13, 0, 0, 1, 2, Route125_EventScript_1F6800, 0 + object_event 6, EVENT_OBJ_GFX_LASS, 0, 17, 19, 3, 8, 1, 1, 1, 1, Route125_EventScript_1F6862, 0 + object_event 7, EVENT_OBJ_GFX_LASS, 0, 18, 19, 3, 8, 1, 1, 1, 1, Route125_EventScript_1F687D, 0 + object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 43, 19, 3, 28, 2, 1, 1, 3, Route125_EventScript_1F6898, 0 + object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 48, 19, 3, 27, 2, 1, 1, 3, Route125_EventScript_1F68AF, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 46, 17, 3, 1, 1, 1, 0, 0, Route125_EventScript_291018, 1154 Route125_MapWarps: @ 852C5FC warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM diff --git a/data/maps/events/Route126.inc b/data/maps/events/Route126.inc index 981e6f1d41..cf87bb74ed 100644 --- a/data/maps/events/Route126.inc +++ b/data/maps/events/Route126.inc @@ -1,13 +1,13 @@ Route126_EventObjects: @ 852C648 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 51, 65, 1, 51, 58, 1, 3, Route126_EventScript_1F68D6, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 22, 1, 28, 9, 1, 3, Route126_EventScript_1F68ED, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 63, 43, 1, 24, 0, 1, 3, Route126_EventScript_1F6904, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 48, 1, 7, 0, 1, 3, Route126_EventScript_1F691B, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 1, 3, 1, 17, 0, 0, Route126_EventScript_291025, 1105 - object_event 6, EVENT_OBJ_GFX_SWIMMER_F, 0, 15, 66, 1, 66, 17, 1, 7, Route126_EventScript_1F6960, 0 - object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 66, 1, 67, 17, 1, 7, Route126_EventScript_1F6977, 0 - object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 5, 1, 66, 17, 1, 7, Route126_EventScript_1F6949, 0 - object_event 9, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 5, 1, 67, 17, 1, 7, Route126_EventScript_1F6932, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 51, 65, 1, 51, 10, 3, 1, 3, Route126_EventScript_1F68D6, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 22, 1, 28, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 63, 43, 1, 24, 0, 0, 1, 3, Route126_EventScript_1F6904, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 48, 1, 7, 0, 0, 1, 3, Route126_EventScript_1F691B, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 1, 3, 1, 1, 1, 0, 0, Route126_EventScript_291025, 1105 + object_event 6, EVENT_OBJ_GFX_SWIMMER_F, 0, 15, 66, 1, 66, 1, 1, 1, 7, Route126_EventScript_1F6960, 0 + object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 66, 1, 67, 1, 1, 1, 7, Route126_EventScript_1F6977, 0 + object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 5, 1, 66, 1, 1, 1, 7, Route126_EventScript_1F6949, 0 + object_event 9, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 5, 1, 67, 1, 1, 1, 7, Route126_EventScript_1F6932, 0 Route126_MapEvents:: @ 852C720 map_events Route126_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route127.inc b/data/maps/events/Route127.inc index 656733d0d7..b7c378a965 100644 --- a/data/maps/events/Route127.inc +++ b/data/maps/events/Route127.inc @@ -1,15 +1,15 @@ Route127_EventObjects: @ 852C734 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 42, 1, 14, 0, 1, 2, Route127_EventScript_1F6A35, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 68, 1, 21, 0, 1, 4, Route127_EventScript_1F6A4C, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, 1, 0, 0, 0, Route127_EventScript_291032, 1034 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, 1, 0, 0, 0, Route127_EventScript_29103F, 1035 - object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 21, 3, 9, 17, 1, 0, Route127_EventScript_1F6A63, 0 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 19, 3, 10, 17, 1, 0, Route127_EventScript_1F6A91, 0 - object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 54, 14, 3, 7, 17, 1, 0, Route127_EventScript_1F6A7A, 0 - object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 15, 23, 3, 9, 17, 1, 2, Route127_EventScript_1F6AA8, 0 - object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 63, 3, 1, 17, 1, 3, Route127_EventScript_1F6AD6, 0 - object_event 10, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 23, 3, 10, 17, 1, 2, Route127_EventScript_1F6ABF, 0 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, 1, 0, 0, 0, Route127_EventScript_29104C, 1155 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 42, 1, 14, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 68, 1, 21, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, 1, 0, 0, 0, 0, Route127_EventScript_291032, 1034 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, 1, 0, 0, 0, 0, Route127_EventScript_29103F, 1035 + object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 21, 3, 9, 1, 1, 1, 0, Route127_EventScript_1F6A63, 0 + object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 19, 3, 10, 1, 1, 1, 0, Route127_EventScript_1F6A91, 0 + object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 54, 14, 3, 7, 1, 1, 1, 0, Route127_EventScript_1F6A7A, 0 + object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 15, 23, 3, 9, 1, 1, 1, 2, Route127_EventScript_1F6AA8, 0 + object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 63, 3, 1, 1, 1, 1, 3, Route127_EventScript_1F6AD6, 0 + object_event 10, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 23, 3, 10, 1, 1, 1, 2, Route127_EventScript_1F6ABF, 0 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, 1, 0, 0, 0, 0, Route127_EventScript_29104C, 1155 Route127_MapBGEvents: @ 852C83C bg_event 59, 67, 0, 8, 0, ITEM_ENERGY_ROOT, 0, 0 diff --git a/data/maps/events/Route128.inc b/data/maps/events/Route128.inc index 42cab969e9..c34f6eb16d 100644 --- a/data/maps/events/Route128.inc +++ b/data/maps/events/Route128.inc @@ -1,14 +1,14 @@ Route128_EventObjects: @ 852C88C - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 33, 1, 48, 85, 1, 3, Route128_EventScript_1F6CBE, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 78, 24, 1, 28, 5, 1, 7, Route128_EventScript_1F6D20, 0 - object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, 8, 0, 0, 0, 0x0, 834 - object_event 4, EVENT_OBJ_GFX_ARCHIE, 0, 37, 22, 3, 9, 17, 0, 0, 0x0, 944 - object_event 5, EVENT_OBJ_GFX_MAXIE, 0, 38, 21, 3, 7, 17, 0, 0, 0x0, 945 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 63, 28, 3, 7, 17, 1, 0, Route128_EventScript_1F6DB0, 0 - object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 47, 9, 3, 10, 17, 1, 3, Route128_EventScript_1F6D99, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 24, 8, 3, 17, 17, 1, 3, Route128_EventScript_1F6D82, 0 - object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 101, 29, 1, 25, 49, 1, 4, Route128_EventScript_1F6DDE, 0 - object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 101, 22, 1, 26, 49, 1, 4, Route128_EventScript_1F6DC7, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 33, 1, 48, 5, 5, 1, 3, Route128_EventScript_1F6CBE, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 78, 24, 1, 28, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0 + object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, 8, 0, 0, 0, 0, 0x0, 834 + object_event 4, EVENT_OBJ_GFX_ARCHIE, 0, 37, 22, 3, 9, 1, 1, 0, 0, 0x0, 944 + object_event 5, EVENT_OBJ_GFX_MAXIE, 0, 38, 21, 3, 7, 1, 1, 0, 0, 0x0, 945 + object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 63, 28, 3, 7, 1, 1, 1, 0, Route128_EventScript_1F6DB0, 0 + object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 47, 9, 3, 10, 1, 1, 1, 3, Route128_EventScript_1F6D99, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 24, 8, 3, 17, 1, 1, 1, 3, Route128_EventScript_1F6D82, 0 + object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 101, 29, 1, 25, 1, 3, 1, 4, Route128_EventScript_1F6DDE, 0 + object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 101, 22, 1, 26, 1, 3, 1, 4, Route128_EventScript_1F6DC7, 0 Route128_MapBGEvents: @ 852C97C bg_event 49, 9, 3, 7, 0, ITEM_HEART_SCALE, 92, 0 diff --git a/data/maps/events/Route129.inc b/data/maps/events/Route129.inc index 21c6fc6bd4..7c1425ebe8 100644 --- a/data/maps/events/Route129.inc +++ b/data/maps/events/Route129.inc @@ -1,9 +1,9 @@ Route129_EventObjects: @ 852C9B4 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 28, 16, 1, 50, 67, 1, 3, Route129_EventScript_1F72EC, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 14, 1, 52, 37, 1, 2, Route129_EventScript_1F7303, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 22, 1, 64, 17, 1, 5, Route129_EventScript_1F7331, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 9, 1, 24, 17, 1, 2, Route129_EventScript_1F731A, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 27, 1, 65, 17, 1, 5, Route129_EventScript_1F7348, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 28, 16, 1, 50, 3, 4, 1, 3, Route129_EventScript_1F72EC, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 14, 1, 52, 5, 2, 1, 2, Route129_EventScript_1F7303, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 22, 1, 64, 1, 1, 1, 5, Route129_EventScript_1F7331, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 9, 1, 24, 1, 1, 1, 2, Route129_EventScript_1F731A, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 27, 1, 65, 1, 1, 1, 5, Route129_EventScript_1F7348, 0 Route129_MapEvents:: @ 852CA2C map_events Route129_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route130.inc b/data/maps/events/Route130.inc index a895743d12..ad14295535 100644 --- a/data/maps/events/Route130.inc +++ b/data/maps/events/Route130.inc @@ -1,8 +1,8 @@ Route130_EventObjects: @ 852CA40 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 70, 21, 1, 51, 99, 1, 3, Route130_EventScript_1F73BF, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 21, 1, 26, 65, 1, 5, Route130_EventScript_1F73D6, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, 12, 0, 0, 82, BerryTreeScript, 17 - object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 30, 1, 25, 65, 1, 5, Route130_EventScript_1F73ED, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 70, 21, 1, 51, 3, 6, 1, 3, Route130_EventScript_1F73BF, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 21, 1, 26, 1, 4, 1, 5, Route130_EventScript_1F73D6, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, 12, 0, 0, 0, 82, BerryTreeScript, 17 + object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 30, 1, 25, 1, 4, 1, 5, Route130_EventScript_1F73ED, 0 Route130_MapEvents:: @ 852CAA0 map_events Route130_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route131.inc b/data/maps/events/Route131.inc index 5dff94bb74..2bb2c5cbc7 100644 --- a/data/maps/events/Route131.inc +++ b/data/maps/events/Route131.inc @@ -1,12 +1,12 @@ Route131_EventObjects: @ 852CAB4 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 32, 1, 29, 117, 1, 3, Route131_EventScript_1F7429, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 19, 1, 22, 112, 1, 4, Route131_EventScript_1F7440, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 22, 1, 20, 6, 1, 4, Route131_EventScript_1F7457, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 31, 25, 1, 47, 83, 1, 3, Route131_EventScript_1F746E, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 16, 1, 8, 17, 1, 1, Route131_EventScript_1F7485, 0 - object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 8, 16, 1, 8, 17, 1, 1, Route131_EventScript_1F74A0, 0 - object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 20, 1, 26, 49, 1, 5, Route131_EventScript_1F74D2, 0 - object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 52, 27, 1, 25, 49, 1, 5, Route131_EventScript_1F74BB, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 32, 1, 29, 5, 7, 1, 3, Route131_EventScript_1F7429, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 19, 1, 22, 0, 7, 1, 4, Route131_EventScript_1F7440, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 22, 1, 20, 6, 0, 1, 4, Route131_EventScript_1F7457, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 31, 25, 1, 47, 3, 5, 1, 3, Route131_EventScript_1F746E, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 16, 1, 8, 1, 1, 1, 1, Route131_EventScript_1F7485, 0 + object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 8, 16, 1, 8, 1, 1, 1, 1, Route131_EventScript_1F74A0, 0 + object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 20, 1, 26, 1, 3, 1, 5, Route131_EventScript_1F74D2, 0 + object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 52, 27, 1, 25, 1, 3, 1, 5, Route131_EventScript_1F74BB, 0 Route131_MapWarps: @ 852CB74 warp_def 36, 6, 3, 0, MAP_SKY_PILLAR_ENTRANCE diff --git a/data/maps/events/Route132.inc b/data/maps/events/Route132.inc index 49cfd07e4b..19ff5ccc85 100644 --- a/data/maps/events/Route132.inc +++ b/data/maps/events/Route132.inc @@ -1,14 +1,14 @@ Route132_EventObjects: @ 852CB90 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 40, 13, 1, 46, 51, 1, 2, Route132_EventScript_1F74EA, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 6, 1, 45, 51, 1, 2, Route132_EventScript_1F7501, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, 1, 0, 0, 0, Route132_EventScript_291059, 1036 - object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 15, 3, 8, 0, 1, 4, Route132_EventScript_1F752F, 0 - object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 49, 28, 3, 10, 0, 1, 1, Route132_EventScript_1F7518, 0 - object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 33, 26, 3, 8, 17, 1, 4, Route132_EventScript_1F7546, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 33, 31, 3, 25, 65, 1, 4, Route132_EventScript_1F755D, 0 - object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 21, 30, 3, 7, 17, 1, 4, Route132_EventScript_1F758B, 0 - object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 21, 25, 3, 26, 65, 1, 4, Route132_EventScript_1F7574, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 27, 3, 1, 17, 0, 0, Route132_EventScript_291066, 1156 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 40, 13, 1, 46, 3, 3, 1, 2, Route132_EventScript_1F74EA, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 6, 1, 45, 3, 3, 1, 2, Route132_EventScript_1F7501, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, 1, 0, 0, 0, 0, Route132_EventScript_291059, 1036 + object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 15, 3, 8, 0, 0, 1, 4, Route132_EventScript_1F752F, 0 + object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 49, 28, 3, 10, 0, 0, 1, 1, Route132_EventScript_1F7518, 0 + object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 33, 26, 3, 8, 1, 1, 1, 4, Route132_EventScript_1F7546, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 33, 31, 3, 25, 1, 4, 1, 4, Route132_EventScript_1F755D, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 21, 30, 3, 7, 1, 1, 1, 4, Route132_EventScript_1F758B, 0 + object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 21, 25, 3, 26, 1, 4, 1, 4, Route132_EventScript_1F7574, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 27, 3, 1, 1, 1, 0, 0, Route132_EventScript_291066, 1156 Route132_MapEvents:: @ 852CC80 map_events Route132_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route133.inc b/data/maps/events/Route133.inc index 13bd5f6e2b..6adfce330d 100644 --- a/data/maps/events/Route133.inc +++ b/data/maps/events/Route133.inc @@ -1,14 +1,14 @@ Route133_EventObjects: @ 852CC94 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 68, 27, 1, 25, 32, 1, 3, Route133_EventScript_1F75A3, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 3, 1, 8, 0, 1, 3, Route133_EventScript_1F75D1, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 28, 1, 26, 32, 1, 3, Route133_EventScript_1F75BA, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 12, 3, 1, 0, 0, 0, Route133_EventScript_291073, 1037 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, 1, 0, 0, 0, Route133_EventScript_291080, 1038 - object_event 6, EVENT_OBJ_GFX_MAN_6, 0, 7, 14, 3, 18, 17, 1, 2, Route133_EventScript_1F75FF, 0 - object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 37, 15, 3, 18, 0, 1, 4, Route133_EventScript_1F75E8, 0 - object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 56, 11, 3, 8, 17, 1, 3, Route133_EventScript_1F7616, 0 - object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 56, 15, 3, 16, 17, 1, 3, Route133_EventScript_1F762D, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 48, 28, 3, 1, 17, 0, 0, Route133_EventScript_29108D, 1157 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 68, 27, 1, 25, 0, 2, 1, 3, Route133_EventScript_1F75A3, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 3, 1, 8, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 28, 1, 26, 0, 2, 1, 3, Route133_EventScript_1F75BA, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 12, 3, 1, 0, 0, 0, 0, Route133_EventScript_291073, 1037 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route133_EventScript_291080, 1038 + object_event 6, EVENT_OBJ_GFX_MAN_6, 0, 7, 14, 3, 18, 1, 1, 1, 2, Route133_EventScript_1F75FF, 0 + object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 37, 15, 3, 18, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 56, 11, 3, 8, 1, 1, 1, 3, Route133_EventScript_1F7616, 0 + object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 56, 15, 3, 16, 1, 1, 1, 3, Route133_EventScript_1F762D, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 48, 28, 3, 1, 1, 1, 0, 0, Route133_EventScript_29108D, 1157 Route133_MapEvents:: @ 852CD84 map_events Route133_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route134.inc b/data/maps/events/Route134.inc index df70e9af89..5a2d574176 100644 --- a/data/maps/events/Route134.inc +++ b/data/maps/events/Route134.inc @@ -1,15 +1,15 @@ Route134_EventObjects: @ 852CD98 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 49, 9, 1, 49, 83, 1, 2, Route134_EventScript_1F7653, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 58, 7, 1, 1, 0, 1, 3, Route134_EventScript_1F766A, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 41, 23, 3, 10, 0, 1, 2, Route134_EventScript_1F7698, 0 - object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 24, 23, 3, 26, 48, 1, 6, Route134_EventScript_1F7681, 0 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 49, 16, 3, 27, 6, 1, 5, Route134_EventScript_1F76AF, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 43, 23, 1, 9, 17, 1, 2, Route134_EventScript_1F76F4, 0 - object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 24, 30, 3, 25, 48, 1, 6, Route134_EventScript_1F770B, 0 - object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 50, 16, 3, 28, 6, 1, 5, Route134_EventScript_1F76DD, 0 - object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 63, 14, 3, 18, 17, 1, 3, Route134_EventScript_1F76C6, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, 1, 17, 0, 0, Route134_EventScript_29109A, 1158 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, 1, 17, 0, 0, Route134_EventScript_2910A7, 1159 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 49, 9, 1, 49, 3, 5, 1, 2, Route134_EventScript_1F7653, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 58, 7, 1, 1, 0, 0, 1, 3, Route134_EventScript_1F766A, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 41, 23, 3, 10, 0, 0, 1, 2, Route134_EventScript_1F7698, 0 + object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 24, 23, 3, 26, 0, 3, 1, 6, Route134_EventScript_1F7681, 0 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 49, 16, 3, 27, 6, 0, 1, 5, Route134_EventScript_1F76AF, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 43, 23, 1, 9, 1, 1, 1, 2, Route134_EventScript_1F76F4, 0 + object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 24, 30, 3, 25, 0, 3, 1, 6, Route134_EventScript_1F770B, 0 + object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 50, 16, 3, 28, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0 + object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 63, 14, 3, 18, 1, 1, 1, 3, Route134_EventScript_1F76C6, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, 1, 1, 1, 0, 0, Route134_EventScript_29109A, 1158 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, 1, 1, 1, 0, 0, Route134_EventScript_2910A7, 1159 Route134_MapEvents:: @ 852CEA0 map_events Route134_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity.inc b/data/maps/events/RustboroCity.inc index 67d3d3eaae..b71bdb875e 100644 --- a/data/maps/events/RustboroCity.inc +++ b/data/maps/events/RustboroCity.inc @@ -1,20 +1,20 @@ RustboroCity_EventObjects: @ 85267E0 - object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 22, 34, 3, 3, 16, 0, 0, RustboroCity_EventScript_1E088A, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 13, 3, 1, 17, 0, 0, RustboroCity_EventScript_1E085F, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 25, 37, 3, 7, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 21, 46, 3, 3, 16, 0, 0, RustboroCity_EventScript_1E08D1, 0 - object_event 5, EVENT_OBJ_GFX_BOY_2, 0, 12, 45, 3, 1, 0, 0, 0, RustboroCity_EventScript_1E08B2, 0 - object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 26, 23, 3, 1, 17, 0, 0, RustboroCity_EventScript_1E0893, 0 - object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 24, 51, 3, 10, 0, 0, 0, RustboroCity_EventScript_1E0922, 0 - object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 25, 51, 3, 9, 0, 0, 0, RustboroCity_EventScript_1E0938, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, 10, 17, 0, 0, RustboroCity_EventScript_1E0ADD, 732 - object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 21, 3, 10, 0, 0, 0, 0x0, 731 - object_event 11, EVENT_OBJ_GFX_MAN_7, 0, 13, 34, 3, 2, 17, 0, 0, RustboroCity_EventScript_1E087E, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, 1, 0, 0, 0, RustboroCity_EventScript_2910DB, 1041 - object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 19, 27, 3, 8, 16, 0, 0, RustboroCity_EventScript_1E094E, 0 - object_event 14, EVENT_OBJ_GFX_HIPSTER, 0, 16, 50, 3, 1, 17, 0, 0, RustboroCity_EventScript_1E0DB8, 814 - object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 11, 15, 0, 1, 17, 0, 0, 0x0, 844 - object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 31, 36, 3, 1, 16, 0, 0, RustboroCity_EventScript_1E1236, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 22, 34, 3, 3, 0, 1, 0, 0, RustboroCity_EventScript_1E088A, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 13, 3, 1, 1, 1, 0, 0, RustboroCity_EventScript_1E085F, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 25, 37, 3, 7, 0, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 21, 46, 3, 3, 0, 1, 0, 0, RustboroCity_EventScript_1E08D1, 0 + object_event 5, EVENT_OBJ_GFX_BOY_2, 0, 12, 45, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_1E08B2, 0 + object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 26, 23, 3, 1, 1, 1, 0, 0, RustboroCity_EventScript_1E0893, 0 + object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 24, 51, 3, 10, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0 + object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 25, 51, 3, 9, 0, 0, 0, 0, RustboroCity_EventScript_1E0938, 0 + object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, 10, 1, 1, 0, 0, RustboroCity_EventScript_1E0ADD, 732 + object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 21, 3, 10, 0, 0, 0, 0, 0x0, 731 + object_event 11, EVENT_OBJ_GFX_MAN_7, 0, 13, 34, 3, 2, 1, 1, 0, 0, RustboroCity_EventScript_1E087E, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, 1041 + object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 19, 27, 3, 8, 0, 1, 0, 0, RustboroCity_EventScript_1E094E, 0 + object_event 14, EVENT_OBJ_GFX_HIPSTER, 0, 16, 50, 3, 1, 1, 1, 0, 0, RustboroCity_EventScript_1E0DB8, 814 + object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 11, 15, 0, 1, 1, 1, 0, 0, 0x0, 844 + object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 31, 36, 3, 1, 0, 1, 0, 0, RustboroCity_EventScript_1E1236, 0 RustboroCity_MapWarps: @ 8526960 warp_def 27, 19, 0, 0, MAP_RUSTBORO_CITY_GYM diff --git a/data/maps/events/RustboroCity_CuttersHouse.inc b/data/maps/events/RustboroCity_CuttersHouse.inc index fd69ad6dee..db9b6f56db 100644 --- a/data/maps/events/RustboroCity_CuttersHouse.inc +++ b/data/maps/events/RustboroCity_CuttersHouse.inc @@ -1,6 +1,6 @@ RustboroCity_CuttersHouse_EventObjects: @ 8530A1C - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 7, 5, 3, 10, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215BD4, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 9, 2, 3, 5, 1, 0, 0, RustboroCity_CuttersHouse_EventScript_215C0A, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 7, 5, 3, 10, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215BD4, 0 + object_event 2, EVENT_OBJ_GFX_LASS, 0, 9, 2, 3, 5, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215C0A, 0 RustboroCity_CuttersHouse_MapWarps: @ 8530A4C warp_def 5, 8, 0, 8, MAP_RUSTBORO_CITY diff --git a/data/maps/events/RustboroCity_DevonCorp_1F.inc b/data/maps/events/RustboroCity_DevonCorp_1F.inc index 1746830f0e..c6d4048c41 100644 --- a/data/maps/events/RustboroCity_DevonCorp_1F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_1F.inc @@ -1,7 +1,7 @@ RustboroCity_DevonCorp_1F_EventObjects: @ 853037C - object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 2, 6, 3, 2, 17, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211261, 0 - object_event 2, EVENT_OBJ_GFX_MAN_7, 0, 15, 5, 3, 2, 18, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211293, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 5, 3, 3, 8, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0 + object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 2, 6, 3, 2, 1, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211261, 0 + object_event 2, EVENT_OBJ_GFX_MAN_7, 0, 15, 5, 3, 2, 2, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211293, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 5, 3, 3, 8, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0 RustboroCity_DevonCorp_1F_MapWarps: @ 85303C4 warp_def 5, 8, 0, 5, MAP_RUSTBORO_CITY diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.inc b/data/maps/events/RustboroCity_DevonCorp_2F.inc index da0c5ece2f..31a3d1de67 100644 --- a/data/maps/events/RustboroCity_DevonCorp_2F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_2F.inc @@ -1,10 +1,10 @@ RustboroCity_DevonCorp_2F_EventObjects: @ 8530408 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, 7, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_21186F, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 5, 3, 10, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211886, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, 15, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118B0, 0 - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 5, 3, 7, 160, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118DA, 0 - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 8, 3, 7, 17, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118F1, 0 - object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 5, 3, 7, 17, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211BCF, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, 7, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_21186F, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211886, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, 15, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118B0, 0 + object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 5, 3, 7, 0, 10, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118DA, 0 + object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 8, 3, 7, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118F1, 0 + object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 5, 3, 7, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211BCF, 0 RustboroCity_DevonCorp_2F_MapWarps: @ 8530498 warp_def 14, 1, 0, 2, MAP_RUSTBORO_CITY_DEVON_CORP_1F diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.inc b/data/maps/events/RustboroCity_DevonCorp_3F.inc index 56e4295d0b..8db3c085cd 100644 --- a/data/maps/events/RustboroCity_DevonCorp_3F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_3F.inc @@ -1,7 +1,7 @@ RustboroCity_DevonCorp_3F_EventObjects: @ 85304BC - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 5, 3, 9, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 - object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, 10, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, 949 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 15, 5, 3, 76, 17, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 5, 3, 9, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 + object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, 949 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 15, 5, 3, 76, 1, 1, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 RustboroCity_DevonCorp_3F_MapWarps: @ 8530504 warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F diff --git a/data/maps/events/RustboroCity_Flat1_1F.inc b/data/maps/events/RustboroCity_Flat1_1F.inc index dd869ef29d..1f2ae85fd6 100644 --- a/data/maps/events/RustboroCity_Flat1_1F.inc +++ b/data/maps/events/RustboroCity_Flat1_1F.inc @@ -1,6 +1,6 @@ RustboroCity_Flat1_1F_EventObjects: @ 8530890 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 9, 4, 3, 10, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150CE, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 4, 3, 9, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 9, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150CE, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0 RustboroCity_Flat1_1F_MapWarps: @ 85308C0 warp_def 6, 7, 0, 1, MAP_RUSTBORO_CITY diff --git a/data/maps/events/RustboroCity_Flat1_2F.inc b/data/maps/events/RustboroCity_Flat1_2F.inc index bafe8d8689..647e7a437c 100644 --- a/data/maps/events/RustboroCity_Flat1_2F.inc +++ b/data/maps/events/RustboroCity_Flat1_2F.inc @@ -1,12 +1,12 @@ RustboroCity_Flat1_2F_EventObjects: @ 85308EC - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 6, 3, 5, 19, 0, 0, RustboroCity_Flat1_2F_EventScript_21523D, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 5, 3, 8, 17, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_SKITTY_DOLL, 0, 9, 4, 3, 1, 17, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 - object_event 4, EVENT_OBJ_GFX_TREECKO_DOLL, 0, 10, 5, 3, 1, 17, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 - object_event 5, EVENT_OBJ_GFX_TORCHIC_DOLL, 0, 10, 6, 3, 1, 17, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 8, 5, 3, 10, 17, 0, 0, RustboroCity_Flat1_2F_EventScript_21513A, 0 - object_event 7, EVENT_OBJ_GFX_MUDKIP_DOLL, 0, 8, 6, 3, 1, 17, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 - object_event 8, EVENT_OBJ_GFX_PIKACHU_DOLL, 0, 9, 7, 3, 1, 17, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 6, 3, 5, 3, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_21523D, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 5, 3, 8, 1, 1, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_SKITTY_DOLL, 0, 9, 4, 3, 1, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 + object_event 4, EVENT_OBJ_GFX_TREECKO_DOLL, 0, 10, 5, 3, 1, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 + object_event 5, EVENT_OBJ_GFX_TORCHIC_DOLL, 0, 10, 6, 3, 1, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 + object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 8, 5, 3, 10, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_21513A, 0 + object_event 7, EVENT_OBJ_GFX_MUDKIP_DOLL, 0, 8, 6, 3, 1, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 + object_event 8, EVENT_OBJ_GFX_PIKACHU_DOLL, 0, 9, 7, 3, 1, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 RustboroCity_Flat1_2F_MapWarps: @ 85309AC warp_def 2, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT1_1F diff --git a/data/maps/events/RustboroCity_Flat2_1F.inc b/data/maps/events/RustboroCity_Flat2_1F.inc index df833517f5..392f5b1fa8 100644 --- a/data/maps/events/RustboroCity_Flat2_1F.inc +++ b/data/maps/events/RustboroCity_Flat2_1F.inc @@ -1,6 +1,6 @@ RustboroCity_Flat2_1F_EventObjects: @ 8530AC4 - object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 11, 4, 3, 9, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F80, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 8, 4, 3, 10, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0 + object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 11, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F80, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 8, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0 RustboroCity_Flat2_1F_MapWarps: @ 8530AF4 warp_def 2, 8, 0, 10, MAP_RUSTBORO_CITY diff --git a/data/maps/events/RustboroCity_Flat2_2F.inc b/data/maps/events/RustboroCity_Flat2_2F.inc index 76454e5678..9914eed3c7 100644 --- a/data/maps/events/RustboroCity_Flat2_2F.inc +++ b/data/maps/events/RustboroCity_Flat2_2F.inc @@ -1,6 +1,6 @@ RustboroCity_Flat2_2F_EventObjects: @ 8530B20 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 4, 3, 10, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FD8, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 3, 3, 5, 2, 0, 0, RustboroCity_Flat2_2F_EventScript_215FE1, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FD8, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FE1, 0 RustboroCity_Flat2_2F_MapWarps: @ 8530B50 warp_def 3, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT2_1F diff --git a/data/maps/events/RustboroCity_Flat2_3F.inc b/data/maps/events/RustboroCity_Flat2_3F.inc index dd6e342570..4a67fdc472 100644 --- a/data/maps/events/RustboroCity_Flat2_3F.inc +++ b/data/maps/events/RustboroCity_Flat2_3F.inc @@ -1,6 +1,6 @@ RustboroCity_Flat2_3F_EventObjects: @ 8530B74 - object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 7, 3, 3, 5, 2, 0, 0, RustboroCity_Flat2_3F_EventScript_216117, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 12, 2, 3, 8, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216120, 0 + object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216117, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 12, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216120, 0 RustboroCity_Flat2_3F_MapWarps: @ 8530BA4 warp_def 1, 1, 0, 1, MAP_RUSTBORO_CITY_FLAT2_2F diff --git a/data/maps/events/RustboroCity_Gym.inc b/data/maps/events/RustboroCity_Gym.inc index 47842da532..193c416855 100644 --- a/data/maps/events/RustboroCity_Gym.inc +++ b/data/maps/events/RustboroCity_Gym.inc @@ -1,9 +1,9 @@ RustboroCity_Gym_EventObjects: @ 8530538 - object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 5, 2, 3, 8, 0, 0, 0, RustboroCity_Gym_EventScript_212F31, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 13, 3, 8, 0, 1, 2, RustboroCity_Gym_EventScript_212FE3, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 3, 9, 3, 9, 0, 1, 3, RustboroCity_Gym_EventScript_212FFA, 0 - object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 3, 18, 3, 8, 0, 0, 0, RustboroCity_Gym_EventScript_213028, 0 - object_event 5, EVENT_OBJ_GFX_HIKER, 0, 1, 6, 3, 8, 17, 1, 3, RustboroCity_Gym_EventScript_213011, 0 + object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 5, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_212F31, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 13, 3, 8, 0, 0, 1, 2, RustboroCity_Gym_EventScript_212FE3, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 3, 9, 3, 9, 0, 0, 1, 3, RustboroCity_Gym_EventScript_212FFA, 0 + object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 3, 18, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_213028, 0 + object_event 5, EVENT_OBJ_GFX_HIKER, 0, 1, 6, 3, 8, 1, 1, 1, 3, RustboroCity_Gym_EventScript_213011, 0 RustboroCity_Gym_MapWarps: @ 85305B0 warp_def 5, 19, 0, 0, MAP_RUSTBORO_CITY diff --git a/data/maps/events/RustboroCity_House1.inc b/data/maps/events/RustboroCity_House1.inc index 985fad05a8..1d2b2d0b7c 100644 --- a/data/maps/events/RustboroCity_House1.inc +++ b/data/maps/events/RustboroCity_House1.inc @@ -1,6 +1,6 @@ RustboroCity_House1_EventObjects: @ 85309C8 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 6, 4, 3, 9, 0, 0, 0, RustboroCity_House1_EventScript_21593F, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 9, 2, 3, 8, 0, 0, 0, RustboroCity_House1_EventScript_2159DF, 0 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 6, 4, 3, 9, 0, 0, 0, 0, RustboroCity_House1_EventScript_21593F, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 9, 2, 3, 8, 0, 0, 0, 0, RustboroCity_House1_EventScript_2159DF, 0 RustboroCity_House1_MapWarps: @ 85309F8 warp_def 5, 7, 0, 7, MAP_RUSTBORO_CITY diff --git a/data/maps/events/RustboroCity_House2.inc b/data/maps/events/RustboroCity_House2.inc index a75f50ab10..3a4e5e15ea 100644 --- a/data/maps/events/RustboroCity_House2.inc +++ b/data/maps/events/RustboroCity_House2.inc @@ -1,6 +1,6 @@ RustboroCity_House2_EventObjects: @ 8530A70 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, 8, 0, 0, 0, RustboroCity_House2_EventScript_215EB4, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 5, 3, 7, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EB4, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 5, 3, 7, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0 RustboroCity_House2_MapWarps: @ 8530AA0 warp_def 5, 8, 0, 9, MAP_RUSTBORO_CITY diff --git a/data/maps/events/RustboroCity_House3.inc b/data/maps/events/RustboroCity_House3.inc index 0e8c6ca9ee..07234fc2e1 100644 --- a/data/maps/events/RustboroCity_House3.inc +++ b/data/maps/events/RustboroCity_House3.inc @@ -1,7 +1,7 @@ RustboroCity_House3_EventObjects: @ 8530BC0 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 4, 5, 3, 10, 0, 0, 0, RustboroCity_House3_EventScript_216191, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 5, 3, 9, 0, 0, 0, RustboroCity_House3_EventScript_21619A, 0 - object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, 8, 0, 0, 0, RustboroCity_House3_EventScript_2161A3, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 4, 5, 3, 10, 0, 0, 0, 0, RustboroCity_House3_EventScript_216191, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 5, 3, 9, 0, 0, 0, 0, RustboroCity_House3_EventScript_21619A, 0 + object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House3_EventScript_2161A3, 0 RustboroCity_House3_MapWarps: @ 8530C08 warp_def 5, 8, 0, 11, MAP_RUSTBORO_CITY diff --git a/data/maps/events/RustboroCity_Mart.inc b/data/maps/events/RustboroCity_Mart.inc index 9eba87edab..038d13bf7e 100644 --- a/data/maps/events/RustboroCity_Mart.inc +++ b/data/maps/events/RustboroCity_Mart.inc @@ -1,8 +1,8 @@ RustboroCity_Mart_EventObjects: @ 853080C - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, RustboroCity_Mart_EventScript_214F06, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 2, 5, 3, 7, 0, 0, 0, RustboroCity_Mart_EventScript_214F7D, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 4, 3, 3, 16, 0, 0, RustboroCity_Mart_EventScript_214F74, 0 - object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 8, 2, 3, 7, 17, 0, 0, RustboroCity_Mart_EventScript_214F86, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F06, 0 + object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 2, 5, 3, 7, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F7D, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 4, 3, 3, 0, 1, 0, 0, RustboroCity_Mart_EventScript_214F74, 0 + object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 8, 2, 3, 7, 1, 1, 0, 0, RustboroCity_Mart_EventScript_214F86, 0 RustboroCity_Mart_MapWarps: @ 853086C warp_def 3, 7, 0, 2, MAP_RUSTBORO_CITY diff --git a/data/maps/events/RustboroCity_PokemonCenter_1F.inc b/data/maps/events/RustboroCity_PokemonCenter_1F.inc index 94293fcb58..e2945f4350 100644 --- a/data/maps/events/RustboroCity_PokemonCenter_1F.inc +++ b/data/maps/events/RustboroCity_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ RustboroCity_PokemonCenter_1F_EventObjects: @ 85306F4 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D76, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 11, 2, 3, 9, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D84, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 3, 4, 3, 2, 17, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D8D, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, 10, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D96, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D76, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 11, 2, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D84, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 3, 4, 3, 2, 1, 1, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D8D, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D96, 0 RustboroCity_PokemonCenter_1F_MapWarps: @ 8530754 warp_def 7, 8, 3, 3, MAP_RUSTBORO_CITY diff --git a/data/maps/events/RustboroCity_PokemonCenter_2F.inc b/data/maps/events/RustboroCity_PokemonCenter_2F.inc index e91cca2c82..d1ec1adb9e 100644 --- a/data/maps/events/RustboroCity_PokemonCenter_2F.inc +++ b/data/maps/events/RustboroCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ RustboroCity_PokemonCenter_2F_EventObjects: @ 8530780 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, 702 + 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 RustboroCity_PokemonCenter_2F_MapWarps: @ 85307E0 warp_def 1, 6, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/RustboroCity_PokemonSchool.inc b/data/maps/events/RustboroCity_PokemonSchool.inc index 56077139fc..2deabdb5c5 100644 --- a/data/maps/events/RustboroCity_PokemonSchool.inc +++ b/data/maps/events/RustboroCity_PokemonSchool.inc @@ -1,11 +1,11 @@ RustboroCity_PokemonSchool_EventObjects: @ 85305EC - object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 8, 6, 3, 10, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0 - object_event 2, EVENT_OBJ_GFX_BOY_5, 0, 9, 6, 3, 9, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0 - object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 3, 8, 3, 7, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F71, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 8, 3, 7, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F7A, 0 - object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 3, 6, 3, 8, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F83, 0 - object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 5, 3, 3, 8, 17, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0 - object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 10, 0, 7, 17, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, 999 + object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 8, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0 + object_event 2, EVENT_OBJ_GFX_BOY_5, 0, 9, 6, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 3, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F71, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F7A, 0 + object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 3, 6, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F83, 0 + object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 5, 3, 3, 8, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0 + object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 10, 0, 7, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, 999 RustboroCity_PokemonSchool_MapWarps: @ 8530694 warp_def 5, 10, 0, 4, MAP_RUSTBORO_CITY diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc index a72400e5b0..e294e200e8 100644 --- a/data/maps/events/RusturfTunnel.inc +++ b/data/maps/events/RusturfTunnel.inc @@ -1,14 +1,14 @@ RusturfTunnel_EventObjects: @ 85341C4 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, 10, 0, 0, 0, RusturfTunnel_EventScript_22CE76, 807 - object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, 1, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 931 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, 1, 0, 0, 0, RusturfTunnel_EventScript_291136, 1048 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, 1, 0, 0, 0, RusturfTunnel_EventScript_291143, 1049 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, 10, 0, 0, 0, 0x0, 879 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 5, 3, 9, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, 878 - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, 9, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, 880 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, 8, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 932 - object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 13, 3, 9, 17, 1, 3, RusturfTunnel_EventScript_22D1B1, 0 - object_event 10, EVENT_OBJ_GFX_WOMAN_3, 0, 25, 4, 3, 9, 17, 0, 0, RusturfTunnel_EventScript_22CE5F, 983 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, 10, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, 807 + object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 931 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, 1048 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, 1049 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, 10, 0, 0, 0, 0, 0x0, 879 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 5, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, 878 + object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, 880 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, 8, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 932 + object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 13, 3, 9, 1, 1, 1, 3, RusturfTunnel_EventScript_22D1B1, 0 + object_event 10, EVENT_OBJ_GFX_WOMAN_3, 0, 25, 4, 3, 9, 1, 1, 0, 0, RusturfTunnel_EventScript_22CE5F, 983 RusturfTunnel_MapWarps: @ 85342B4 warp_def 4, 10, 3, 0, MAP_ROUTE116 diff --git a/data/maps/events/SSTidalCorridor.inc b/data/maps/events/SSTidalCorridor.inc index 866fdf78e2..8f0b1de77e 100644 --- a/data/maps/events/SSTidalCorridor.inc +++ b/data/maps/events/SSTidalCorridor.inc @@ -1,9 +1,9 @@ SSTidalCorridor_EventObjects: @ 853A158 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 11, 3, 7, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, 3, 32, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 2, 3, 8, 17, 0, 0, SSTidalCorridor_EventScript_23C0D9, 950 - object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, 1, 17, 0, 0, SSTidalCorridor_EventScript_23C0E2, 950 - object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 9, 10, 3, 9, 0, 0, 0, 0x0, 810 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 11, 3, 7, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, 3, 0, 2, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 2, 3, 8, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0D9, 950 + object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, 1, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0E2, 950 + object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 9, 10, 3, 9, 0, 0, 0, 0, 0x0, 810 SSTidalCorridor_MapWarps: @ 853A1D0 warp_def 4, 9, 3, 0, MAP_SS_TIDAL_ROOMS diff --git a/data/maps/events/SSTidalLowerDeck.inc b/data/maps/events/SSTidalLowerDeck.inc index ef83b32935..969830d370 100644 --- a/data/maps/events/SSTidalLowerDeck.inc +++ b/data/maps/events/SSTidalLowerDeck.inc @@ -1,6 +1,6 @@ SSTidalLowerDeck_EventObjects: @ 853A2BC - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 10, 4, 3, 46, 68, 1, 3, SSTidalLowerDeck_EventScript_23C819, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 7, 4, 3, 50, 71, 1, 3, SSTidalLowerDeck_EventScript_23C830, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 10, 4, 3, 46, 4, 4, 1, 3, SSTidalLowerDeck_EventScript_23C819, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 7, 4, 3, 50, 7, 4, 1, 3, SSTidalLowerDeck_EventScript_23C830, 0 SSTidalLowerDeck_MapWarps: @ 853A2EC warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR diff --git a/data/maps/events/SSTidalRooms.inc b/data/maps/events/SSTidalRooms.inc index 42f5fd6059..a9900294cf 100644 --- a/data/maps/events/SSTidalRooms.inc +++ b/data/maps/events/SSTidalRooms.inc @@ -1,12 +1,12 @@ SSTidalRooms_EventObjects: @ 853A314 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 7, 3, 10, 0, 1, 0, SSTidalRooms_EventScript_23CA49, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 34, 11, 3, 9, 0, 1, 3, SSTidalRooms_EventScript_23CA60, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 21, 5, 3, 10, 0, 1, 0, SSTidalRooms_EventScript_23CA77, 0 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 5, 14, 3, 8, 0, 1, 1, SSTidalRooms_EventScript_23CA8E, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 14, 3, 8, 0, 1, 1, SSTidalRooms_EventScript_23CAA9, 0 - object_event 6, EVENT_OBJ_GFX_BOY_4, 0, 22, 11, 3, 8, 17, 1, 3, SSTidalRooms_EventScript_23CAC4, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 6, 3, 9, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 5, 3, 7, 17, 0, 0, SSTidalRooms_EventScript_23C9F2, 951 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 7, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA49, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 34, 11, 3, 9, 0, 0, 1, 3, SSTidalRooms_EventScript_23CA60, 0 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 21, 5, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA77, 0 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 5, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CA8E, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CAA9, 0 + object_event 6, EVENT_OBJ_GFX_BOY_4, 0, 22, 11, 3, 8, 1, 1, 1, 3, SSTidalRooms_EventScript_23CAC4, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 6, 3, 9, 0, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0 + object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 5, 3, 7, 1, 1, 0, 0, SSTidalRooms_EventScript_23C9F2, 951 SSTidalRooms_MapWarps: @ 853A3D4 warp_def 4, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR diff --git a/data/maps/events/SafariZone_North.inc b/data/maps/events/SafariZone_North.inc index 99d2b58609..88b41669bd 100644 --- a/data/maps/events/SafariZone_North.inc +++ b/data/maps/events/SafariZone_North.inc @@ -1,13 +1,13 @@ SafariZone_North_EventObjects: @ 853B160 - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 22, 9, 3, 2, 17, 0, 0, SafariZone_North_EventScript_23D254, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 6, 29, 3, 2, 17, 0, 0, SafariZone_North_EventScript_23D25D, 0 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 10, 3, 1, 17, 0, 0, SafariZone_North_EventScript_2907A6, 17 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 13, 3, 1, 17, 0, 0, SafariZone_North_EventScript_2907A6, 18 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 14, 3, 1, 17, 0, 0, SafariZone_North_EventScript_2907A6, 19 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 6, 3, 1, 17, 0, 0, SafariZone_North_EventScript_2907A6, 20 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 7, 3, 1, 17, 0, 0, SafariZone_North_EventScript_2907A6, 21 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 7, 3, 1, 17, 0, 0, SafariZone_North_EventScript_2907A6, 22 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, 1, 17, 0, 0, SafariZone_North_EventScript_2912C9, 1119 + object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 22, 9, 3, 2, 1, 1, 0, 0, SafariZone_North_EventScript_23D254, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 6, 29, 3, 2, 1, 1, 0, 0, SafariZone_North_EventScript_23D25D, 0 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 10, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 17 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 13, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 18 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 14, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 19 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 6, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 20 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 7, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 21 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 7, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 22 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2912C9, 1119 SafariZone_North_MapEvents:: @ 853B238 map_events SafariZone_North_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_Northeast.inc b/data/maps/events/SafariZone_Northeast.inc index d355654cd8..e71ba4dd51 100644 --- a/data/maps/events/SafariZone_Northeast.inc +++ b/data/maps/events/SafariZone_Northeast.inc @@ -1,13 +1,13 @@ SafariZone_Northeast_EventObjects: @ 853B968 - object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 8, 20, 3, 1, 17, 0, 0, SafariZone_Northeast_EventScript_23D3C6, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 30, 22, 3, 1, 17, 0, 0, SafariZone_Northeast_EventScript_23D3D8, 0 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 11, 3, 1, 17, 0, 0, SafariZone_Northeast_EventScript_2907A6, 21 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 35, 0, 1, 17, 0, 0, SafariZone_Northeast_EventScript_23D3CF, 0 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 13, 3, 1, 17, 0, 0, SafariZone_Northeast_EventScript_2907A6, 19 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 7, 3, 1, 17, 0, 0, SafariZone_Northeast_EventScript_2907A6, 17 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 10, 3, 1, 17, 0, 0, SafariZone_Northeast_EventScript_2907A6, 20 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 8, 3, 1, 17, 0, 0, SafariZone_Northeast_EventScript_2907A6, 18 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, 1, 17, 0, 0, SafariZone_Northeast_EventScript_2912E3, 1169 + object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 8, 20, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3C6, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 30, 22, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3D8, 0 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 11, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 21 + object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 35, 0, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3CF, 0 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 13, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 19 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 7, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 17 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 10, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 20 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 8, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 18 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2912E3, 1169 SafariZone_Northeast_MapBGEvents: @ 853BA40 bg_event 31, 35, 3, 7, 0, ITEM_RARE_CANDY, 106, 0 diff --git a/data/maps/events/SafariZone_Northwest.inc b/data/maps/events/SafariZone_Northwest.inc index 2fa67c7145..8e5b242b9b 100644 --- a/data/maps/events/SafariZone_Northwest.inc +++ b/data/maps/events/SafariZone_Northwest.inc @@ -1,6 +1,6 @@ SafariZone_Northwest_EventObjects: @ 853B11C - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 8, 8, 5, 8, 0, 0, 0, SafariZone_Northwest_EventScript_23D24A, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 7, 3, 1, 17, 0, 0, SafariZone_Northwest_EventScript_2912BC, 1094 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 8, 8, 5, 8, 0, 0, 0, 0, SafariZone_Northwest_EventScript_23D24A, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 7, 3, 1, 1, 1, 0, 0, SafariZone_Northwest_EventScript_2912BC, 1094 SafariZone_Northwest_MapEvents:: @ 853B14C map_events SafariZone_Northwest_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_RestHouse.inc b/data/maps/events/SafariZone_RestHouse.inc index 9ba24ae2b6..0607ffcc75 100644 --- a/data/maps/events/SafariZone_RestHouse.inc +++ b/data/maps/events/SafariZone_RestHouse.inc @@ -1,7 +1,7 @@ SafariZone_RestHouse_EventObjects: @ 853B8FC - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 4, 0, 10, 17, 0, 0, SafariZone_RestHouse_EventScript_242BE7, 0 - object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 8, 4, 0, 9, 17, 0, 0, SafariZone_RestHouse_EventScript_242BF0, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 5, 3, 10, 17, 0, 0, SafariZone_RestHouse_EventScript_242BF9, 0 + object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 4, 0, 10, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BE7, 0 + object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 8, 4, 0, 9, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BF0, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 5, 3, 10, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BF9, 0 SafariZone_RestHouse_MapWarps: @ 853B944 warp_def 3, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST diff --git a/data/maps/events/SafariZone_South.inc b/data/maps/events/SafariZone_South.inc index d1fbf95ed6..46173d11a0 100644 --- a/data/maps/events/SafariZone_South.inc +++ b/data/maps/events/SafariZone_South.inc @@ -1,10 +1,10 @@ SafariZone_South_EventObjects: @ 853B2A4 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 32, 34, 4, 8, 0, 0, 0, SafariZone_South_EventScript_23D2E5, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 26, 28, 3, 2, 17, 0, 0, SafariZone_South_EventScript_23D2CA, 0 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 16, 6, 5, 8, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 15, 31, 3, 2, 17, 0, 0, SafariZone_South_EventScript_23D2DC, 0 - object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 36, 16, 3, 9, 17, 0, 0, SafariZone_South_EventScript_23D390, 717 - object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 36, 17, 3, 9, 17, 0, 0, SafariZone_South_EventScript_23D3A2, 717 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 32, 34, 4, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2E5, 0 + object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 26, 28, 3, 2, 1, 1, 0, 0, SafariZone_South_EventScript_23D2CA, 0 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 16, 6, 5, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 15, 31, 3, 2, 1, 1, 0, 0, SafariZone_South_EventScript_23D2DC, 0 + object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 36, 16, 3, 9, 1, 1, 0, 0, SafariZone_South_EventScript_23D390, 717 + object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 36, 17, 3, 9, 1, 1, 0, 0, SafariZone_South_EventScript_23D3A2, 717 SafariZone_South_MapWarps: @ 853B334 warp_def 32, 33, 0, 0, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE diff --git a/data/maps/events/SafariZone_Southeast.inc b/data/maps/events/SafariZone_Southeast.inc index f14779cdb8..af2da05753 100644 --- a/data/maps/events/SafariZone_Southeast.inc +++ b/data/maps/events/SafariZone_Southeast.inc @@ -1,9 +1,9 @@ SafariZone_Southeast_EventObjects: @ 853BA6C - object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 7, 7, 3, 1, 17, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 20, 30, 3, 2, 17, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 8, 26, 3, 2, 17, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 15, 3, 1, 17, 0, 0, SafariZone_Southeast_EventScript_2912F0, 1170 - object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 12, 16, 3, 9, 17, 0, 0, SafariZone_Southeast_EventScript_23D399, 747 + object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 7, 7, 3, 1, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 20, 30, 3, 2, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 8, 26, 3, 2, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 15, 3, 1, 1, 1, 0, 0, SafariZone_Southeast_EventScript_2912F0, 1170 + object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 12, 16, 3, 9, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D399, 747 SafariZone_Southeast_MapBGEvents: @ 853BAE4 bg_event 19, 36, 3, 7, 0, ITEM_PP_UP, 108, 0 diff --git a/data/maps/events/SafariZone_Southwest.inc b/data/maps/events/SafariZone_Southwest.inc index a6567b4769..ccd775dd2b 100644 --- a/data/maps/events/SafariZone_Southwest.inc +++ b/data/maps/events/SafariZone_Southwest.inc @@ -1,6 +1,6 @@ SafariZone_Southwest_EventObjects: @ 853B24C - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 22, 9, 3, 8, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 3, 1, 17, 0, 0, SafariZone_Southwest_EventScript_2912D6, 1131 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 22, 9, 3, 8, 0, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 3, 1, 1, 1, 0, 0, SafariZone_Southwest_EventScript_2912D6, 1131 SafariZone_Southwest_MapWarps: @ 853B27C warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE diff --git a/data/maps/events/ScorchedSlab.inc b/data/maps/events/ScorchedSlab.inc index 160a59a3c0..588b7a9aef 100644 --- a/data/maps/events/ScorchedSlab.inc +++ b/data/maps/events/ScorchedSlab.inc @@ -1,5 +1,5 @@ ScorchedSlab_EventObjects: @ 8536F88 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, 1, 0, 0, 0, ScorchedSlab_EventScript_2912AF, 1079 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, 1, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, 1079 ScorchedSlab_MapWarps: @ 8536FA0 warp_def 7, 16, 1, 1, MAP_ROUTE120 diff --git a/data/maps/events/SeafloorCavern_Entrance.inc b/data/maps/events/SeafloorCavern_Entrance.inc index 7bb9d1ae4b..e27362f00f 100644 --- a/data/maps/events/SeafloorCavern_Entrance.inc +++ b/data/maps/events/SeafloorCavern_Entrance.inc @@ -1,5 +1,5 @@ SeafloorCavern_Entrance_EventObjects: @ 85356BC - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 2, 3, 7, 17, 0, 0, SeafloorCavern_Entrance_EventScript_234485, 941 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 2, 3, 7, 1, 1, 0, 0, SeafloorCavern_Entrance_EventScript_234485, 941 SeafloorCavern_Entrance_MapWarps: @ 85356D4 warp_def 10, 18, 3, 0, MAP_UNDERWATER4 diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/events/SeafloorCavern_Room1.inc index 83b69c7393..261314b9bf 100644 --- a/data/maps/events/SeafloorCavern_Room1.inc +++ b/data/maps/events/SeafloorCavern_Room1.inc @@ -1,9 +1,9 @@ SeafloorCavern_Room1_EventObjects: @ 85356F8 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 11, 3, 1, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 17 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, 1, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 18 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 10, 3, 1, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, 19 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 6, 3, 1, 17, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, 946 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 10, 3, 16, 17, 1, 3, SeafloorCavern_Room1_EventScript_234803, 946 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 17 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 18 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, 19 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 6, 3, 1, 1, 1, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, 946 + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 10, 3, 16, 1, 1, 1, 3, SeafloorCavern_Room1_EventScript_234803, 946 SeafloorCavern_Room1_MapWarps: @ 8535770 warp_def 5, 18, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/events/SeafloorCavern_Room2.inc index c8f58a15c1..01f6f3ba53 100644 --- a/data/maps/events/SeafloorCavern_Room2.inc +++ b/data/maps/events/SeafloorCavern_Room2.inc @@ -1,12 +1,12 @@ SeafloorCavern_Room2_EventObjects: @ 853579C - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, 1, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 18 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 3, 3, 1, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 19 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 5, 3, 1, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 17 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, 1, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 21 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, 1, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 22 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 7, 3, 1, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 24 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 3, 3, 1, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 25 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 8, 3, 1, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 23 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 18 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 19 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 17 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 21 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 22 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 24 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 25 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 23 SeafloorCavern_Room2_MapWarps: @ 853585C warp_def 10, 7, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1 diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/events/SeafloorCavern_Room3.inc index 8319729bf9..300db40c5a 100644 --- a/data/maps/events/SeafloorCavern_Room3.inc +++ b/data/maps/events/SeafloorCavern_Room3.inc @@ -1,13 +1,13 @@ SeafloorCavern_Room3_EventObjects: @ 8535890 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 10, 3, 1, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 18 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 10, 3, 1, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 20 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 9, 3, 1, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 21 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 7, 3, 1, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 22 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 8, 3, 1, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 23 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, 1, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 24 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 8, 3, 1, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 25 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 9, 5, 3, 9, 17, 1, 6, SeafloorCavern_Room3_EventScript_234938, 946 - object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 5, 3, 10, 17, 1, 4, SeafloorCavern_Room3_EventScript_23494F, 946 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 18 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 20 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 9, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 21 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 22 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 23 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 24 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 25 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 9, 5, 3, 9, 1, 1, 1, 6, SeafloorCavern_Room3_EventScript_234938, 946 + object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 5, 3, 10, 1, 1, 1, 4, SeafloorCavern_Room3_EventScript_23494F, 946 SeafloorCavern_Room3_MapWarps: @ 8535968 warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8 diff --git a/data/maps/events/SeafloorCavern_Room4.inc b/data/maps/events/SeafloorCavern_Room4.inc index 846e339642..6b6df78f2e 100644 --- a/data/maps/events/SeafloorCavern_Room4.inc +++ b/data/maps/events/SeafloorCavern_Room4.inc @@ -1,6 +1,6 @@ SeafloorCavern_Room4_EventObjects: @ 8535994 - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 8, 3, 17, 17, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, 946 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 5, 12, 3, 7, 17, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, 946 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 8, 3, 17, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, 946 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 5, 12, 3, 7, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, 946 SeafloorCavern_Room4_MapWarps: @ 85359C4 warp_def 13, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM2 diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/events/SeafloorCavern_Room5.inc index 17ead20a38..97787ebbfa 100644 --- a/data/maps/events/SeafloorCavern_Room5.inc +++ b/data/maps/events/SeafloorCavern_Room5.inc @@ -1,10 +1,10 @@ SeafloorCavern_Room5_EventObjects: @ 85359F8 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 11, 3, 1, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 17 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, 1, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 18 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, 1, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 19 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 13, 3, 1, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 21 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, 1, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 22 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, 1, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 20 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 17 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 18 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 19 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 13, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 21 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 22 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 20 SeafloorCavern_Room5_MapWarps: @ 8535A88 warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM1 diff --git a/data/maps/events/SeafloorCavern_Room8.inc b/data/maps/events/SeafloorCavern_Room8.inc index 1fa73357d4..42dcf9faa0 100644 --- a/data/maps/events/SeafloorCavern_Room8.inc +++ b/data/maps/events/SeafloorCavern_Room8.inc @@ -1,16 +1,16 @@ SeafloorCavern_Room8_EventObjects: @ 8535B04 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, 1, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 17 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, 1, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 18 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 7, 3, 1, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 19 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 6, 3, 1, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 20 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 6, 3, 1, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 21 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, 1, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 22 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 5, 3, 1, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 23 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 5, 3, 1, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 24 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 4, 3, 1, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 25 - object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 4, 3, 1, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 26 - object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 4, 3, 1, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 27 - object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, 1, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 28 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 17 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 18 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 19 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 20 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 21 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 22 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 23 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 24 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 25 + object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 26 + object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 27 + object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 28 SeafloorCavern_Room8_MapWarps: @ 8535C24 warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9 diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/events/SeafloorCavern_Room9.inc index 3e370d8dcd..ac3337bed2 100644 --- a/data/maps/events/SeafloorCavern_Room9.inc +++ b/data/maps/events/SeafloorCavern_Room9.inc @@ -1,11 +1,11 @@ SeafloorCavern_Room9_EventObjects: @ 8535C48 - object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 17, 38, 3, 8, 0, 0, 0, 0x0, 859 - object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 9, 42, 3, 10, 0, 0, 0, 0x0, 828 - object_event 3, EVENT_OBJ_GFX_MAXIE, 0, 9, 42, 3, 10, 0, 0, 0, 0x0, 829 - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 41, 3, 10, 0, 0, 0, 0x0, 831 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 42, 3, 10, 0, 0, 0, 0x0, 831 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, 1, 17, 0, 0, SeafloorCavern_Room9_EventScript_291401, 1090 - object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 17, 38, 3, 8, 17, 0, 0, 0x0, 733 + object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 17, 38, 3, 8, 0, 0, 0, 0, 0x0, 859 + object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 828 + object_event 3, EVENT_OBJ_GFX_MAXIE, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 829 + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 41, 3, 10, 0, 0, 0, 0, 0x0, 831 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 42, 3, 10, 0, 0, 0, 0, 0x0, 831 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, 1, 1, 1, 0, 0, SeafloorCavern_Room9_EventScript_291401, 1090 + object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 17, 38, 3, 8, 1, 1, 0, 0, 0x0, 733 SeafloorCavern_Room9_MapWarps: @ 8535CF0 warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/events/SecretBase_BlueCave1.inc index 2a0f7eff13..2905764cf1 100644 --- a/data/maps/events/SecretBase_BlueCave1.inc +++ b/data/maps/events/SecretBase_BlueCave1.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave1_EventObjects: @ 8537BEC - object_event 1, 255, 0, 4, 2, 3, 8, 0, 0, 0, SecretBase_BlueCave1_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 4, 2, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave1_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 SecretBase_BlueCave1_MapWarps: @ 8537D54 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/events/SecretBase_BlueCave2.inc index 68e554b055..8202b7a421 100644 --- a/data/maps/events/SecretBase_BlueCave2.inc +++ b/data/maps/events/SecretBase_BlueCave2.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave2_EventObjects: @ 8538504 - object_event 1, 255, 0, 2, 1, 3, 8, 0, 0, 0, SecretBase_BlueCave2_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave2_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 SecretBase_BlueCave2_MapWarps: @ 853866C warp_def 7, 5, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/events/SecretBase_BlueCave3.inc index de02278b3c..733b674b70 100644 --- a/data/maps/events/SecretBase_BlueCave3.inc +++ b/data/maps/events/SecretBase_BlueCave3.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave3_EventObjects: @ 8538E1C - object_event 1, 255, 0, 5, 1, 3, 8, 0, 0, 0, SecretBase_BlueCave3_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave3_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 SecretBase_BlueCave3_MapWarps: @ 8538F84 warp_def 4, 15, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/events/SecretBase_BlueCave4.inc index 9b9f577b7d..afd1622b88 100644 --- a/data/maps/events/SecretBase_BlueCave4.inc +++ b/data/maps/events/SecretBase_BlueCave4.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave4_EventObjects: @ 8539734 - object_event 1, 255, 0, 5, 13, 3, 8, 0, 0, 0, SecretBase_BlueCave4_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 5, 13, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave4_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 SecretBase_BlueCave4_MapWarps: @ 853989C warp_def 4, 15, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/events/SecretBase_BrownCave1.inc index b1edf9985b..e4fffab493 100644 --- a/data/maps/events/SecretBase_BrownCave1.inc +++ b/data/maps/events/SecretBase_BrownCave1.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave1_EventObjects: @ 8537A68 - object_event 1, 255, 0, 5, 2, 3, 8, 0, 0, 0, SecretBase_BrownCave1_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave1_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 SecretBase_BrownCave1_MapWarps: @ 8537BD0 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/events/SecretBase_BrownCave2.inc index dceb7a584a..29e90b5921 100644 --- a/data/maps/events/SecretBase_BrownCave2.inc +++ b/data/maps/events/SecretBase_BrownCave2.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave2_EventObjects: @ 8538380 - object_event 1, 255, 0, 11, 2, 3, 8, 0, 0, 0, SecretBase_BrownCave2_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 11, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave2_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 SecretBase_BrownCave2_MapWarps: @ 85384E8 warp_def 1, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/events/SecretBase_BrownCave3.inc index 4b8b7674f8..3322b9d5a8 100644 --- a/data/maps/events/SecretBase_BrownCave3.inc +++ b/data/maps/events/SecretBase_BrownCave3.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave3_EventObjects: @ 8538C98 - object_event 1, 255, 0, 1, 7, 3, 8, 0, 0, 0, SecretBase_BrownCave3_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 1, 7, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave3_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 SecretBase_BrownCave3_MapWarps: @ 8538E00 warp_def 11, 9, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/events/SecretBase_BrownCave4.inc index 1c2ad2d49b..3100339479 100644 --- a/data/maps/events/SecretBase_BrownCave4.inc +++ b/data/maps/events/SecretBase_BrownCave4.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave4_EventObjects: @ 85395B0 - object_event 1, 255, 0, 2, 1, 3, 8, 0, 0, 0, SecretBase_BrownCave4_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave4_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 SecretBase_BrownCave4_MapWarps: @ 8539718 warp_def 2, 8, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/events/SecretBase_RedCave1.inc index 72592ec7da..eba9925866 100644 --- a/data/maps/events/SecretBase_RedCave1.inc +++ b/data/maps/events/SecretBase_RedCave1.inc @@ -1,19 +1,19 @@ SecretBase_RedCave1_EventObjects: @ 85378E4 - object_event 1, 255, 0, 7, 4, 3, 8, 0, 0, 0, SecretBase_RedCave1_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 7, 4, 3, 8, 0, 0, 0, 0, SecretBase_RedCave1_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 SecretBase_RedCave1_MapWarps: @ 8537A4C warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/events/SecretBase_RedCave2.inc index 0aae19f6a8..c6f5349656 100644 --- a/data/maps/events/SecretBase_RedCave2.inc +++ b/data/maps/events/SecretBase_RedCave2.inc @@ -1,19 +1,19 @@ SecretBase_RedCave2_EventObjects: @ 85381FC - object_event 1, 255, 0, 3, 1, 3, 8, 0, 0, 0, SecretBase_RedCave2_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave2_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 SecretBase_RedCave2_MapWarps: @ 8538364 warp_def 3, 14, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/events/SecretBase_RedCave3.inc index acdc616d21..dda054b445 100644 --- a/data/maps/events/SecretBase_RedCave3.inc +++ b/data/maps/events/SecretBase_RedCave3.inc @@ -1,19 +1,19 @@ SecretBase_RedCave3_EventObjects: @ 8538B14 - object_event 1, 255, 0, 12, 1, 3, 8, 0, 0, 0, SecretBase_RedCave3_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 12, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave3_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 SecretBase_RedCave3_MapWarps: @ 8538C7C warp_def 3, 6, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/events/SecretBase_RedCave4.inc index b5863d41cf..54e33dc3d9 100644 --- a/data/maps/events/SecretBase_RedCave4.inc +++ b/data/maps/events/SecretBase_RedCave4.inc @@ -1,19 +1,19 @@ SecretBase_RedCave4_EventObjects: @ 853942C - object_event 1, 255, 0, 5, 8, 3, 8, 0, 0, 0, SecretBase_RedCave4_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 5, 8, 3, 8, 0, 0, 0, 0, SecretBase_RedCave4_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 SecretBase_RedCave4_MapWarps: @ 8539594 warp_def 2, 12, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/events/SecretBase_Shrub1.inc index 051297cd31..acdac9692c 100644 --- a/data/maps/events/SecretBase_Shrub1.inc +++ b/data/maps/events/SecretBase_Shrub1.inc @@ -1,19 +1,19 @@ SecretBase_Shrub1_EventObjects: @ 8538078 - object_event 1, 255, 0, 5, 2, 3, 8, 0, 0, 0, SecretBase_Shrub1_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub1_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 SecretBase_Shrub1_MapWarps: @ 85381E0 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/events/SecretBase_Shrub2.inc index e9acfd82bb..a370d2e72e 100644 --- a/data/maps/events/SecretBase_Shrub2.inc +++ b/data/maps/events/SecretBase_Shrub2.inc @@ -1,19 +1,19 @@ SecretBase_Shrub2_EventObjects: @ 8538990 - object_event 1, 255, 0, 13, 2, 3, 8, 0, 0, 0, SecretBase_Shrub2_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 13, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub2_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 SecretBase_Shrub2_MapWarps: @ 8538AF8 warp_def 7, 5, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/events/SecretBase_Shrub3.inc index 965d19f70c..942be36176 100644 --- a/data/maps/events/SecretBase_Shrub3.inc +++ b/data/maps/events/SecretBase_Shrub3.inc @@ -1,19 +1,19 @@ SecretBase_Shrub3_EventObjects: @ 85392A8 - object_event 1, 255, 0, 5, 7, 3, 8, 0, 0, 0, SecretBase_Shrub3_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 5, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub3_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 SecretBase_Shrub3_MapWarps: @ 8539410 warp_def 6, 9, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/events/SecretBase_Shrub4.inc index 60de85b7f3..a027b266bd 100644 --- a/data/maps/events/SecretBase_Shrub4.inc +++ b/data/maps/events/SecretBase_Shrub4.inc @@ -1,19 +1,19 @@ SecretBase_Shrub4_EventObjects: @ 8539BC0 - object_event 1, 255, 0, 9, 7, 3, 8, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 + 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 SecretBase_Shrub4_MapWarps: @ 8539D28 warp_def 11, 8, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/events/SecretBase_Tree1.inc index 01052acc2f..3379e8ecb7 100644 --- a/data/maps/events/SecretBase_Tree1.inc +++ b/data/maps/events/SecretBase_Tree1.inc @@ -1,19 +1,19 @@ SecretBase_Tree1_EventObjects: @ 8537EF4 - object_event 1, 255, 0, 5, 1, 3, 8, 0, 0, 0, SecretBase_Tree1_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree1_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 SecretBase_Tree1_MapWarps: @ 853805C warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/events/SecretBase_Tree2.inc index 0317dfbcf9..e330951cfc 100644 --- a/data/maps/events/SecretBase_Tree2.inc +++ b/data/maps/events/SecretBase_Tree2.inc @@ -1,19 +1,19 @@ SecretBase_Tree2_EventObjects: @ 853880C - object_event 1, 255, 0, 3, 1, 3, 8, 0, 0, 0, SecretBase_Tree2_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree2_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 SecretBase_Tree2_MapWarps: @ 8538974 warp_def 3, 14, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/events/SecretBase_Tree3.inc index 061179987b..b4a8c2eb38 100644 --- a/data/maps/events/SecretBase_Tree3.inc +++ b/data/maps/events/SecretBase_Tree3.inc @@ -1,19 +1,19 @@ SecretBase_Tree3_EventObjects: @ 8539124 - object_event 1, 255, 0, 1, 2, 3, 8, 0, 0, 0, SecretBase_Tree3_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 1, 2, 3, 8, 0, 0, 0, 0, SecretBase_Tree3_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 SecretBase_Tree3_MapWarps: @ 853928C warp_def 8, 6, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/events/SecretBase_Tree4.inc index b190e4f1e6..4c57fcdfd6 100644 --- a/data/maps/events/SecretBase_Tree4.inc +++ b/data/maps/events/SecretBase_Tree4.inc @@ -1,19 +1,19 @@ SecretBase_Tree4_EventObjects: @ 8539A3C - object_event 1, 255, 0, 10, 9, 3, 8, 0, 0, 0, SecretBase_Tree4_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 10, 9, 3, 8, 0, 0, 0, 0, SecretBase_Tree4_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 SecretBase_Tree4_MapWarps: @ 8539BA4 warp_def 7, 12, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/events/SecretBase_YellowCave1.inc index 623c8f9704..e7f4ed7ce4 100644 --- a/data/maps/events/SecretBase_YellowCave1.inc +++ b/data/maps/events/SecretBase_YellowCave1.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave1_EventObjects: @ 8537D70 - object_event 1, 255, 0, 3, 1, 3, 8, 0, 0, 0, SecretBase_YellowCave1_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave1_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 SecretBase_YellowCave1_MapWarps: @ 8537ED8 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/events/SecretBase_YellowCave2.inc index 60434dec97..84aabf3d4b 100644 --- a/data/maps/events/SecretBase_YellowCave2.inc +++ b/data/maps/events/SecretBase_YellowCave2.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave2_EventObjects: @ 8538688 - object_event 1, 255, 0, 1, 1, 3, 8, 0, 0, 0, SecretBase_YellowCave2_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 1, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave2_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 SecretBase_YellowCave2_MapWarps: @ 85387F0 warp_def 12, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/events/SecretBase_YellowCave3.inc index dda1bf65bc..2e1d617083 100644 --- a/data/maps/events/SecretBase_YellowCave3.inc +++ b/data/maps/events/SecretBase_YellowCave3.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave3_EventObjects: @ 8538FA0 - object_event 1, 255, 0, 7, 5, 3, 8, 0, 0, 0, SecretBase_YellowCave3_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 7, 5, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave3_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 SecretBase_YellowCave3_MapWarps: @ 8539108 warp_def 5, 9, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/events/SecretBase_YellowCave4.inc index f525839b57..07ac363ac0 100644 --- a/data/maps/events/SecretBase_YellowCave4.inc +++ b/data/maps/events/SecretBase_YellowCave4.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave4_EventObjects: @ 85398B8 - object_event 1, 255, 0, 9, 8, 3, 8, 0, 0, 0, SecretBase_YellowCave4_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 9, 8, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave4_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 SecretBase_YellowCave4_MapWarps: @ 8539A20 warp_def 6, 12, 0, 126, MAP_NONE diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc index f044adda4f..1f4a008e3c 100644 --- a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc +++ b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc @@ -1,6 +1,6 @@ ShoalCave_LowTideEntranceRoom_EventObjects: @ 853627C - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 3, 3, 1, 17, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, 1081 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 18, 15, 3, 9, 17, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 3, 3, 1, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, 1081 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 18, 15, 3, 9, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0 ShoalCave_LowTideEntranceRoom_MapWarps: @ 85362AC warp_def 20, 30, 3, 0, MAP_ROUTE125 diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.inc b/data/maps/events/ShoalCave_LowTideIceRoom.inc index 10ce11a10b..57922e3225 100644 --- a/data/maps/events/ShoalCave_LowTideIceRoom.inc +++ b/data/maps/events/ShoalCave_LowTideIceRoom.inc @@ -1,6 +1,6 @@ ShoalCave_LowTideIceRoom_EventObjects: @ 8537100 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 8, 3, 1, 17, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, 1112 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 21, 4, 1, 17, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, 1113 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 8, 3, 1, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, 1112 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 21, 4, 1, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, 1113 ShoalCave_LowTideIceRoom_MapWarps: @ 8537130 warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.inc b/data/maps/events/ShoalCave_LowTideInnerRoom.inc index d6ba2a87fd..f1d8942645 100644 --- a/data/maps/events/ShoalCave_LowTideInnerRoom.inc +++ b/data/maps/events/ShoalCave_LowTideInnerRoom.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideInnerRoom_EventObjects: @ 85362E0 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 14, 5, 1, 17, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, 1082 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 14, 5, 1, 1, 1, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, 1082 ShoalCave_LowTideInnerRoom_MapWarps: @ 85362F8 warp_def 34, 29, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/events/ShoalCave_LowTideLowerRoom.inc index 6063c4e85d..d3d6564529 100644 --- a/data/maps/events/ShoalCave_LowTideLowerRoom.inc +++ b/data/maps/events/ShoalCave_LowTideLowerRoom.inc @@ -1,6 +1,6 @@ ShoalCave_LowTideLowerRoom_EventObjects: @ 85363DC - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 3, 3, 1, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, 17 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 4, 3, 2, 17, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2371B2, 0 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 3, 3, 1, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, 17 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 4, 3, 2, 1, 1, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2371B2, 0 ShoalCave_LowTideLowerRoom_MapWarps: @ 853640C warp_def 7, 2, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.inc b/data/maps/events/ShoalCave_LowTideStairsRoom.inc index 7e477c0f22..875f337a55 100644 --- a/data/maps/events/ShoalCave_LowTideStairsRoom.inc +++ b/data/maps/events/ShoalCave_LowTideStairsRoom.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideStairsRoom_EventObjects: @ 8536394 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 12, 3, 1, 17, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, 1083 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 12, 3, 1, 1, 1, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, 1083 ShoalCave_LowTideStairsRoom_MapWarps: @ 85363AC warp_def 3, 12, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/events/SingleBattleColosseum.inc index 809a69ee82..4ef0de89ff 100644 --- a/data/maps/events/SingleBattleColosseum.inc +++ b/data/maps/events/SingleBattleColosseum.inc @@ -1,5 +1,5 @@ SingleBattleColosseum_EventObjects: @ 8539D44 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 3, 3, 9, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 3, 3, 9, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0 SingleBattleColosseum_MapWarps: @ 8539D5C warp_def 6, 8, 3, 127, MAP_NONE diff --git a/data/maps/events/SkyPillar_Outside.inc b/data/maps/events/SkyPillar_Outside.inc index 6afadc9e83..4fb4cc0102 100644 --- a/data/maps/events/SkyPillar_Outside.inc +++ b/data/maps/events/SkyPillar_Outside.inc @@ -1,5 +1,5 @@ SkyPillar_Outside_EventObjects: @ 853701C - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 13, 7, 3, 8, 17, 0, 0, SkyPillar_Outside_EventScript_2393F8, 855 + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 13, 7, 3, 8, 1, 1, 0, 0, SkyPillar_Outside_EventScript_2393F8, 855 SkyPillar_Outside_MapWarps: @ 8537034 warp_def 17, 13, 3, 1, MAP_SKY_PILLAR_ENTRANCE diff --git a/data/maps/events/SkyPillar_Top.inc b/data/maps/events/SkyPillar_Top.inc index 14b562cf78..26bccf67f9 100644 --- a/data/maps/events/SkyPillar_Top.inc +++ b/data/maps/events/SkyPillar_Top.inc @@ -1,6 +1,6 @@ SkyPillar_Top_EventObjects: @ 8537170 - object_event 1, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 14, 7, 3, 8, 17, 0, 0, 0x0, 773 - object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 14, 6, 3, 8, 17, 0, 0, SkyPillar_Top_EventScript_239722, 80 + object_event 1, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 14, 7, 3, 8, 1, 1, 0, 0, 0x0, 773 + object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 14, 6, 3, 8, 1, 1, 0, 0, SkyPillar_Top_EventScript_239722, 80 SkyPillar_Top_MapWarps: @ 85371A0 warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F diff --git a/data/maps/events/SlateportCity.inc b/data/maps/events/SlateportCity.inc index 3b9571d8b5..b8480dfb6d 100644 --- a/data/maps/events/SlateportCity.inc +++ b/data/maps/events/SlateportCity.inc @@ -1,39 +1,39 @@ SlateportCity_EventObjects: @ 85261CC - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 21, 11, 3, 2, 17, 0, 0, SlateportCity_EventScript_1DCED9, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 34, 29, 3, 5, 1, 0, 0, SlateportCity_EventScript_1DCEF6, 0 - object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 5, 13, 3, 2, 33, 0, 0, SlateportCity_EventScript_1DCEB8, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 26, 29, 3, 1, 0, 0, 0, SlateportCity_EventScript_1DCF17, 0 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 31, 27, 3, 7, 0, 0, 0, SlateportCity_EventScript_1DD009, 882 - object_event 6, EVENT_OBJ_GFX_COOK, 0, 5, 43, 3, 8, 0, 0, 0, SlateportCity_EventScript_1DCE42, 0 - object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 20, 37, 3, 1, 17, 0, 0, SlateportCity_EventScript_1DCE63, 0 - object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 8, 42, 3, 2, 17, 0, 0, SlateportCity_EventScript_1DCE84, 0 - object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 29, 13, 3, 9, 0, 0, 0, SlateportCity_EventScript_1DD353, 835 - object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 28, 14, 3, 7, 0, 0, 0, SlateportCity_EventScript_1DD35C, 835 - object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 28, 13, 3, 10, 0, 0, 0, SlateportCity_EventScript_1DD1F8, 840 - object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 37, 41, 3, 10, 0, 0, 0, SlateportCity_EventScript_1DCFE5, 0 - object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 28, 46, 3, 5, 1, 0, 0, SlateportCity_EventScript_1DCFEE, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 50, 3, 3, 16, 0, 0, SlateportCity_EventScript_1DCFF7, 0 - object_event 15, EVENT_OBJ_GFX_MAN_4, 0, 16, 46, 3, 2, 17, 0, 0, SlateportCity_EventScript_1DD000, 0 - object_event 16, EVENT_OBJ_GFX_MANIAC, 0, 8, 24, 3, 3, 16, 0, 0, SlateportCity_EventScript_1DCFBB, 0 - object_event 17, EVENT_OBJ_GFX_WOMAN_7, 0, 15, 31, 3, 1, 0, 0, 0, SlateportCity_EventScript_1DCFDC, 0 - object_event 18, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 27, 3, 10, 0, 0, 0, SlateportCity_EventScript_1DD020, 882 - object_event 19, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 27, 3, 10, 0, 0, 0, SlateportCity_EventScript_1DD037, 882 - object_event 20, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 38, 3, 10, 0, 0, 0, SlateportCity_EventScript_1DD198, 0 - object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 5, 51, 3, 8, 0, 0, 0, SlateportCity_EventScript_1DD16A, 0 - object_event 22, EVENT_OBJ_GFX_MAN_6, 0, 34, 51, 3, 8, 0, 0, 0, SlateportCity_EventScript_1DD365, 0 - object_event 23, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 47, 3, 8, 0, 0, 0, SlateportCity_EventScript_1DCDE4, 0 - object_event 24, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 11, 47, 3, 8, 17, 0, 0, SlateportCity_EventScript_1DD1D8, 948 - object_event 25, EVENT_OBJ_GFX_MAN_3, 0, 5, 47, 3, 8, 17, 0, 0, SlateportCity_EventScript_1DCDBD, 0 - object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 22, 27, 3, 10, 17, 0, 0, SlateportCity_EventScript_1DD04E, 882 - object_event 27, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 27, 3, 7, 17, 0, 0, SlateportCity_EventScript_1DD065, 882 - object_event 28, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 24, 27, 3, 10, 17, 0, 0, SlateportCity_EventScript_1DD07C, 882 - object_event 29, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 26, 3, 10, 17, 0, 0, SlateportCity_EventScript_1DD093, 882 - object_event 30, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 26, 3, 10, 17, 0, 0, SlateportCity_EventScript_1DD0AA, 882 - object_event 31, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 27, 3, 7, 17, 0, 0, SlateportCity_EventScript_1DD0C1, 882 - object_event 32, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 27, 3, 7, 17, 0, 0, SlateportCity_EventScript_1DD14A, 882 - object_event 33, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 27, 3, 7, 17, 0, 0, SlateportCity_EventScript_1DD153, 882 - object_event 34, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 37, 3, 9, 33, 0, 0, SlateportCity_EventScript_1DD36E, 0 - object_event 35, EVENT_OBJ_GFX_SCOTT, 0, 10, 12, 0, 8, 33, 0, 0, 0x0, 749 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 21, 11, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_1DCED9, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 34, 29, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCEF6, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 5, 13, 3, 2, 1, 2, 0, 0, SlateportCity_EventScript_1DCEB8, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 26, 29, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCF17, 0 + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 31, 27, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD009, 882 + object_event 6, EVENT_OBJ_GFX_COOK, 0, 5, 43, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCE42, 0 + object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 20, 37, 3, 1, 1, 1, 0, 0, SlateportCity_EventScript_1DCE63, 0 + object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 8, 42, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_1DCE84, 0 + object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 29, 13, 3, 9, 0, 0, 0, 0, SlateportCity_EventScript_1DD353, 835 + object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 28, 14, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD35C, 835 + object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 28, 13, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD1F8, 840 + object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 37, 41, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DCFE5, 0 + object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 28, 46, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCFEE, 0 + object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 50, 3, 3, 0, 1, 0, 0, SlateportCity_EventScript_1DCFF7, 0 + object_event 15, EVENT_OBJ_GFX_MAN_4, 0, 16, 46, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_1DD000, 0 + object_event 16, EVENT_OBJ_GFX_MANIAC, 0, 8, 24, 3, 3, 0, 1, 0, 0, SlateportCity_EventScript_1DCFBB, 0 + object_event 17, EVENT_OBJ_GFX_WOMAN_7, 0, 15, 31, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCFDC, 0 + object_event 18, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD020, 882 + object_event 19, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD037, 882 + object_event 20, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 38, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD198, 0 + object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 5, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD16A, 0 + object_event 22, EVENT_OBJ_GFX_MAN_6, 0, 34, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD365, 0 + object_event 23, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 47, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCDE4, 0 + object_event 24, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 11, 47, 3, 8, 1, 1, 0, 0, SlateportCity_EventScript_1DD1D8, 948 + object_event 25, EVENT_OBJ_GFX_MAN_3, 0, 5, 47, 3, 8, 1, 1, 0, 0, SlateportCity_EventScript_1DCDBD, 0 + object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 22, 27, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_1DD04E, 882 + object_event 27, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 27, 3, 7, 1, 1, 0, 0, SlateportCity_EventScript_1DD065, 882 + object_event 28, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 24, 27, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_1DD07C, 882 + object_event 29, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 26, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_1DD093, 882 + object_event 30, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 26, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_1DD0AA, 882 + object_event 31, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 27, 3, 7, 1, 1, 0, 0, SlateportCity_EventScript_1DD0C1, 882 + object_event 32, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 27, 3, 7, 1, 1, 0, 0, SlateportCity_EventScript_1DD14A, 882 + object_event 33, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 27, 3, 7, 1, 1, 0, 0, SlateportCity_EventScript_1DD153, 882 + object_event 34, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 37, 3, 9, 1, 2, 0, 0, SlateportCity_EventScript_1DD36E, 0 + object_event 35, EVENT_OBJ_GFX_SCOTT, 0, 10, 12, 0, 8, 1, 2, 0, 0, 0x0, 749 SlateportCity_MapWarps: @ 8526514 warp_def 19, 19, 0, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/SlateportCity_BattleTentBattleRoom.inc b/data/maps/events/SlateportCity_BattleTentBattleRoom.inc index 4330ec1dd4..ce13a5899f 100644 --- a/data/maps/events/SlateportCity_BattleTentBattleRoom.inc +++ b/data/maps/events/SlateportCity_BattleTentBattleRoom.inc @@ -1,7 +1,7 @@ SlateportCity_BattleTentBattleRoom_EventObjects: @ 852F4DC - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 0, 10, 17, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, 8, 17, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 4, 8, 3, 7, 17, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 0, 10, 1, 1, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, 8, 1, 1, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 4, 8, 3, 7, 1, 1, 0, 0, 0x0, 0 SlateportCity_BattleTentBattleRoom_MapEvents:: @ 852F524 map_events SlateportCity_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_BattleTentCorridor.inc b/data/maps/events/SlateportCity_BattleTentCorridor.inc index 57292c37fd..b56b50a0ef 100644 --- a/data/maps/events/SlateportCity_BattleTentCorridor.inc +++ b/data/maps/events/SlateportCity_BattleTentCorridor.inc @@ -1,5 +1,5 @@ SlateportCity_BattleTentCorridor_EventObjects: @ 852F4B0 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, 7, 17, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, 7, 1, 1, 0, 0, 0x0, 0 SlateportCity_BattleTentCorridor_MapEvents:: @ 852F4C8 map_events SlateportCity_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_BattleTentLobby.inc b/data/maps/events/SlateportCity_BattleTentLobby.inc index da8a11ebf2..0ceca119bb 100644 --- a/data/maps/events/SlateportCity_BattleTentLobby.inc +++ b/data/maps/events/SlateportCity_BattleTentLobby.inc @@ -1,9 +1,9 @@ SlateportCity_BattleTentLobby_EventObjects: @ 852F408 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, 8, 17, 0, 0, SlateportCity_BattleTentLobby_EventScript_2088AA, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 1, 5, 3, 2, 17, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A3D, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 3, 7, 3, 7, 17, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A7E, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 1, 8, 3, 1, 17, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A87, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 8, 3, 9, 17, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, 8, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_2088AA, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 1, 5, 3, 2, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A3D, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 3, 7, 3, 7, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A7E, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 1, 8, 3, 1, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A87, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 8, 3, 9, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0 SlateportCity_BattleTentLobby_MapWarps: @ 852F480 warp_def 6, 9, 0, 3, MAP_SLATEPORT_CITY diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/events/SlateportCity_Harbor.inc index 16782cbe61..af274e22f1 100644 --- a/data/maps/events/SlateportCity_Harbor.inc +++ b/data/maps/events/SlateportCity_Harbor.inc @@ -1,12 +1,12 @@ SlateportCity_Harbor_EventObjects: @ 852FA68 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, 8, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, 905 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 12, 3, 9, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, 905 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 12, 3, 10, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, 905 - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 13, 3, 1, 0, 0, 0, SlateportCity_Harbor_EventScript_20CCA2, 841 - object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, 10, 0, 0, 0, 0x0, 860 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 10, 3, 10, 0, 0, 0, 0x0, 845 - object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 8, 10, 3, 9, 0, 0, 0, 0x0, 846 - object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 9, 1, 10, 0, 0, 0, 0x0, 848 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, 8, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, 905 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 12, 3, 9, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, 905 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 12, 3, 10, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, 905 + object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 13, 3, 1, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CCA2, 841 + object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 860 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 10, 3, 10, 0, 0, 0, 0, 0x0, 845 + object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 8, 10, 3, 9, 0, 0, 0, 0, 0x0, 846 + object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 9, 1, 10, 0, 0, 0, 0, 0x0, 848 SlateportCity_Harbor_MapWarps: @ 852FB28 warp_def 11, 14, 0, 8, MAP_SLATEPORT_CITY diff --git a/data/maps/events/SlateportCity_House1.inc b/data/maps/events/SlateportCity_House1.inc index bb5e3c89ff..493bb29220 100644 --- a/data/maps/events/SlateportCity_House1.inc +++ b/data/maps/events/SlateportCity_House1.inc @@ -1,5 +1,5 @@ SlateportCity_House1_EventObjects: @ 852F538 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 5, 3, 8, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 5, 3, 8, 0, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0 SlateportCity_House1_MapWarps: @ 852F550 warp_def 3, 7, 0, 6, MAP_SLATEPORT_CITY diff --git a/data/maps/events/SlateportCity_House2.inc b/data/maps/events/SlateportCity_House2.inc index 55a83d72c1..42d0e3660d 100644 --- a/data/maps/events/SlateportCity_House2.inc +++ b/data/maps/events/SlateportCity_House2.inc @@ -1,6 +1,6 @@ SlateportCity_House2_EventObjects: @ 852FB9C - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 4, 3, 10, 0, 0, 0, SlateportCity_House2_EventScript_20D9AF, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 4, 3, 9, 0, 0, 0, SlateportCity_House2_EventScript_20D9B8, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 4, 3, 10, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9AF, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 4, 3, 9, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9B8, 0 SlateportCity_House2_MapWarps: @ 852FBCC warp_def 3, 7, 0, 10, MAP_SLATEPORT_CITY diff --git a/data/maps/events/SlateportCity_Mart.inc b/data/maps/events/SlateportCity_Mart.inc index e09928a4cc..d6391598e1 100644 --- a/data/maps/events/SlateportCity_Mart.inc +++ b/data/maps/events/SlateportCity_Mart.inc @@ -1,7 +1,7 @@ SlateportCity_Mart_EventObjects: @ 852FCF0 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, SlateportCity_Mart_EventScript_20DC49, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 2, 3, 7, 0, 0, 0, SlateportCity_Mart_EventScript_20DC76, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, 1, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC49, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 2, 3, 7, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC76, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, 1, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0 SlateportCity_Mart_MapWarps: @ 852FD38 warp_def 3, 7, 0, 1, MAP_SLATEPORT_CITY diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc index 9d18bcd82f..cfe385a3c0 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc @@ -1,18 +1,18 @@ SlateportCity_OceanicMuseum_1F_EventObjects: @ 852F670 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 7, 7, 3, 10, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 18, 5, 3, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, 883 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 12, 2, 3, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, 883 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 2, 8, 3, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE56, 883 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 3, 4, 3, 9, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE4D, 883 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 4, 3, 10, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE71, 883 - object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, 9, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 3, 3, 8, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE7A, 883 - object_event 9, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 2, 3, 1, 17, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, 961 - object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 10, 2, 3, 7, 17, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, 961 - object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 17, 7, 3, 10, 17, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, 961 - object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 8, 3, 7, 17, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, 961 - object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 4, 3, 21, 17, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, 965 - object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 4, 3, 1, 17, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, 961 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 7, 7, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 18, 5, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, 883 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 12, 2, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, 883 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 2, 8, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE56, 883 + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 3, 4, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE4D, 883 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 4, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE71, 883 + object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 3, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE7A, 883 + object_event 9, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 2, 3, 1, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, 961 + object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 10, 2, 3, 7, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, 961 + object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 17, 7, 3, 10, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, 961 + object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 8, 3, 7, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, 961 + object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 4, 3, 21, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, 965 + object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 4, 3, 1, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, 961 SlateportCity_OceanicMuseum_1F_MapWarps: @ 852F7C0 warp_def 9, 8, 0, 5, MAP_SLATEPORT_CITY diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc index f404c972b0..dc0c8a8d98 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc @@ -1,11 +1,11 @@ SlateportCity_OceanicMuseum_2F_EventObjects: @ 852F8A8 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 6, 3, 8, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, 887 - object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 6, 1, 3, 8, 0, 0, 0, 0x0, 886 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, 8, 0, 0, 0, 0x0, 884 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, 8, 0, 0, 0, 0x0, 885 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 12, 7, 3, 10, 17, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, 961 - object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 6, 3, 1, 17, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, 961 - object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 3, 3, 10, 17, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, 961 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 6, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, 887 + object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 886 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 884 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 885 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 12, 7, 3, 10, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, 961 + object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 6, 3, 1, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, 961 + object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 3, 3, 10, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, 961 SlateportCity_OceanicMuseum_2F_MapWarps: @ 852F950 warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F diff --git a/data/maps/events/SlateportCity_PokemonCenter_1F.inc b/data/maps/events/SlateportCity_PokemonCenter_1F.inc index d0c3b1d3cc..f59413aba8 100644 --- a/data/maps/events/SlateportCity_PokemonCenter_1F.inc +++ b/data/maps/events/SlateportCity_PokemonCenter_1F.inc @@ -1,7 +1,7 @@ SlateportCity_PokemonCenter_1F_EventObjects: @ 852FBF0 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAD3, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, 8, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAE1, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 7, 3, 10, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAD3, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAE1, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 7, 3, 10, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0 SlateportCity_PokemonCenter_1F_MapWarps: @ 852FC38 warp_def 7, 8, 3, 0, MAP_SLATEPORT_CITY diff --git a/data/maps/events/SlateportCity_PokemonCenter_2F.inc b/data/maps/events/SlateportCity_PokemonCenter_2F.inc index 3861219ec8..f59512311f 100644 --- a/data/maps/events/SlateportCity_PokemonCenter_2F.inc +++ b/data/maps/events/SlateportCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ SlateportCity_PokemonCenter_2F_EventObjects: @ 852FC64 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, 702 SlateportCity_PokemonCenter_2F_MapWarps: @ 852FCC4 warp_def 1, 6, 4, 2, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/SlateportCity_PokemonFanClub.inc b/data/maps/events/SlateportCity_PokemonFanClub.inc index 68d8f30824..92974f5b48 100644 --- a/data/maps/events/SlateportCity_PokemonFanClub.inc +++ b/data/maps/events/SlateportCity_PokemonFanClub.inc @@ -1,13 +1,13 @@ SlateportCity_PokemonFanClub_EventObjects: @ 852F574 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 11, 4, 0, 8, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1E8, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 1, 5, 0, 3, 16, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1F1, 0 - object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 5, 0, 7, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_28C943, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 2, 3, 1, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A17E, 0 - object_event 5, EVENT_OBJ_GFX_GENTLEMAN, 0, 6, 5, 4, 8, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_209E96, 0 - object_event 6, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 3, 9, 3, 1, 17, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A20D, 0 - object_event 7, EVENT_OBJ_GFX_SKITTY, 0, 8, 3, 3, 1, 17, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1FA, 0 - object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 10, 8, 3, 1, 17, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A220, 0 - object_event 9, EVENT_OBJ_GFX_MAN_5, 0, 11, 8, 0, 9, 16, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 11, 4, 0, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1E8, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 1, 5, 0, 3, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1F1, 0 + object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 5, 0, 7, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_28C943, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 2, 3, 1, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A17E, 0 + object_event 5, EVENT_OBJ_GFX_GENTLEMAN, 0, 6, 5, 4, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_209E96, 0 + object_event 6, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 3, 9, 3, 1, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A20D, 0 + object_event 7, EVENT_OBJ_GFX_SKITTY, 0, 8, 3, 3, 1, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1FA, 0 + object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 10, 8, 3, 1, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A220, 0 + object_event 9, EVENT_OBJ_GFX_MAN_5, 0, 11, 8, 0, 9, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0 SlateportCity_PokemonFanClub_MapWarps: @ 852F64C warp_def 6, 10, 0, 4, MAP_SLATEPORT_CITY diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.inc b/data/maps/events/SlateportCity_SternsShipyard_1F.inc index b4c6e9973a..b231f9816d 100644 --- a/data/maps/events/SlateportCity_SternsShipyard_1F.inc +++ b/data/maps/events/SlateportCity_SternsShipyard_1F.inc @@ -1,8 +1,8 @@ SlateportCity_SternsShipyard_1F_EventObjects: @ 852F318 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 5, 5, 3, 8, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207F40, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, 7, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FED, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 8, 3, 5, 1, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FF6, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 11, 3, 2, 33, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, 869 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 5, 5, 3, 8, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207F40, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FED, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 8, 3, 5, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FF6, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 11, 3, 2, 1, 2, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, 869 SlateportCity_SternsShipyard_1F_MapWarps: @ 852F378 warp_def 2, 14, 0, 2, MAP_SLATEPORT_CITY diff --git a/data/maps/events/SlateportCity_SternsShipyard_2F.inc b/data/maps/events/SlateportCity_SternsShipyard_2F.inc index de45f19224..450f40fe7f 100644 --- a/data/maps/events/SlateportCity_SternsShipyard_2F.inc +++ b/data/maps/events/SlateportCity_SternsShipyard_2F.inc @@ -1,7 +1,7 @@ SlateportCity_SternsShipyard_2F_EventObjects: @ 852F3A4 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, 7, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 4, 3, 10, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_20863E, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 3, 7, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_208647, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 4, 3, 10, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_20863E, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_208647, 0 SlateportCity_SternsShipyard_2F_MapWarps: @ 852F3EC warp_def 3, 1, 0, 2, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/events/SootopolisCity.inc index 6835fc7266..96aaefd9c3 100644 --- a/data/maps/events/SootopolisCity.inc +++ b/data/maps/events/SootopolisCity.inc @@ -1,22 +1,22 @@ SootopolisCity_EventObjects: @ 8527314 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 31, 18, 3, 8, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 47, 33, 0, 9, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, 854 - object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 9, 43, 3, 5, 1, 0, 0, SootopolisCity_EventScript_1E5ED8, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 51, 14, 3, 8, 0, 0, 0, SootopolisCity_EventScript_1E608E, 0 - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 43, 26, 3, 1, 0, 0, 0, SootopolisCity_EventScript_1E60E3, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 26, 4, 3, 5, 1, 0, 0, SootopolisCity_EventScript_1E6017, 839 - object_event 7, EVENT_OBJ_GFX_STEVEN, 0, 20, 36, 3, 8, 17, 0, 0, SootopolisCity_EventScript_1E6166, 973 - object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 49, 34, 3, 3, 17, 0, 0, SootopolisCity_EventScript_1E6038, 0 - object_event 9, EVENT_OBJ_GFX_GROUDON_3, 0, 28, 44, 0, 80, 17, 0, 0, 0x0, 998 - object_event 10, EVENT_OBJ_GFX_KYOGRE_3, 0, 34, 44, 1, 79, 17, 0, 0, 0x0, 997 - object_event 11, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 31, 41, 1, 10, 17, 0, 0, 0x0, 996 - object_event 12, EVENT_OBJ_GFX_MANIAC, 0, 17, 44, 3, 10, 17, 0, 0, SootopolisCity_EventScript_1E6411, 854 - object_event 13, EVENT_OBJ_GFX_GIRL_3, 0, 14, 42, 3, 10, 17, 0, 0, SootopolisCity_EventScript_1E63DB, 854 - object_event 14, EVENT_OBJ_GFX_BLACK_BELT, 0, 17, 40, 3, 10, 17, 0, 0, SootopolisCity_EventScript_1E6393, 854 - object_event 15, EVENT_OBJ_GFX_BOY_2, 0, 19, 37, 3, 8, 17, 0, 0, SootopolisCity_EventScript_1E635D, 854 - object_event 16, EVENT_OBJ_GFX_MAXIE, 0, 29, 33, 3, 8, 17, 0, 0, SootopolisCity_EventScript_1E64F2, 827 - object_event 17, EVENT_OBJ_GFX_ARCHIE, 0, 31, 33, 3, 8, 17, 0, 0, SootopolisCity_EventScript_1E651F, 826 - object_event 18, EVENT_OBJ_GFX_WALLACE, 0, 31, 18, 3, 8, 17, 0, 0, SootopolisCity_EventScript_1E6446, 816 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 31, 18, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 47, 33, 0, 9, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, 854 + object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 9, 43, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E5ED8, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 51, 14, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E608E, 0 + object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 43, 26, 3, 1, 0, 0, 0, 0, SootopolisCity_EventScript_1E60E3, 0 + object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 26, 4, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E6017, 839 + object_event 7, EVENT_OBJ_GFX_STEVEN, 0, 20, 36, 3, 8, 1, 1, 0, 0, SootopolisCity_EventScript_1E6166, 973 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 49, 34, 3, 3, 1, 1, 0, 0, SootopolisCity_EventScript_1E6038, 0 + object_event 9, EVENT_OBJ_GFX_GROUDON_3, 0, 28, 44, 0, 80, 1, 1, 0, 0, 0x0, 998 + object_event 10, EVENT_OBJ_GFX_KYOGRE_3, 0, 34, 44, 1, 79, 1, 1, 0, 0, 0x0, 997 + object_event 11, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 31, 41, 1, 10, 1, 1, 0, 0, 0x0, 996 + object_event 12, EVENT_OBJ_GFX_MANIAC, 0, 17, 44, 3, 10, 1, 1, 0, 0, SootopolisCity_EventScript_1E6411, 854 + object_event 13, EVENT_OBJ_GFX_GIRL_3, 0, 14, 42, 3, 10, 1, 1, 0, 0, SootopolisCity_EventScript_1E63DB, 854 + object_event 14, EVENT_OBJ_GFX_BLACK_BELT, 0, 17, 40, 3, 10, 1, 1, 0, 0, SootopolisCity_EventScript_1E6393, 854 + object_event 15, EVENT_OBJ_GFX_BOY_2, 0, 19, 37, 3, 8, 1, 1, 0, 0, SootopolisCity_EventScript_1E635D, 854 + object_event 16, EVENT_OBJ_GFX_MAXIE, 0, 29, 33, 3, 8, 1, 1, 0, 0, SootopolisCity_EventScript_1E64F2, 827 + object_event 17, EVENT_OBJ_GFX_ARCHIE, 0, 31, 33, 3, 8, 1, 1, 0, 0, SootopolisCity_EventScript_1E651F, 826 + object_event 18, EVENT_OBJ_GFX_WALLACE, 0, 31, 18, 3, 8, 1, 1, 0, 0, SootopolisCity_EventScript_1E6446, 816 SootopolisCity_MapWarps: @ 85274C4 warp_def 43, 31, 0, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/SootopolisCity_Gym_1F.inc b/data/maps/events/SootopolisCity_Gym_1F.inc index b0f2f6aa92..925acc34b0 100644 --- a/data/maps/events/SootopolisCity_Gym_1F.inc +++ b/data/maps/events/SootopolisCity_Gym_1F.inc @@ -1,6 +1,6 @@ SootopolisCity_Gym_1F_EventObjects: @ 8532FF4 - object_event 1, EVENT_OBJ_GFX_JUAN, 0, 8, 2, 0, 8, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_224F44, 0 - object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 7, 24, 3, 8, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_225040, 0 + object_event 1, EVENT_OBJ_GFX_JUAN, 0, 8, 2, 0, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_224F44, 0 + object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 7, 24, 3, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_225040, 0 SootopolisCity_Gym_1F_MapWarps: @ 8533024 warp_def 8, 25, 0, 2, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/events/SootopolisCity_Gym_B1F.inc b/data/maps/events/SootopolisCity_Gym_B1F.inc index a493060dee..1ed20fc941 100644 --- a/data/maps/events/SootopolisCity_Gym_B1F.inc +++ b/data/maps/events/SootopolisCity_Gym_B1F.inc @@ -1,14 +1,14 @@ SootopolisCity_Gym_B1F_EventObjects: @ 8533068 - object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 17, 3, 10, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225C8B, 0 - object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 9, 19, 3, 9, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CD0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 7, 3, 9, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CB9, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 11, 9, 0, 7, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_225CE7, 0 - object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 5, 6, 3, 8, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_225D15, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 8, 3, 10, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225D2C, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 4, 8, 3, 10, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225CA2, 0 - object_event 8, EVENT_OBJ_GFX_BEAUTY, 0, 9, 7, 3, 8, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225CFE, 0 - object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 13, 3, 10, 17, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D5A, 0 - object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 13, 3, 9, 17, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0 + object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 17, 3, 10, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225C8B, 0 + object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 9, 19, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CD0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 7, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CB9, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 11, 9, 0, 7, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_225CE7, 0 + object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 5, 6, 3, 8, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_225D15, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 8, 3, 10, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225D2C, 0 + object_event 7, EVENT_OBJ_GFX_LASS, 0, 4, 8, 3, 10, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225CA2, 0 + object_event 8, EVENT_OBJ_GFX_BEAUTY, 0, 9, 7, 3, 8, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225CFE, 0 + object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 13, 3, 10, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D5A, 0 + object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 13, 3, 9, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0 SootopolisCity_Gym_B1F_MapWarps: @ 8533158 warp_def 11, 22, 3, 2, MAP_SOOTOPOLIS_CITY_GYM_1F diff --git a/data/maps/events/SootopolisCity_House1.inc b/data/maps/events/SootopolisCity_House1.inc index af321c802b..4ddbd23ea4 100644 --- a/data/maps/events/SootopolisCity_House1.inc +++ b/data/maps/events/SootopolisCity_House1.inc @@ -1,6 +1,6 @@ SootopolisCity_House1_EventObjects: @ 85332F8 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 4, 3, 10, 0, 0, 0, SootopolisCity_House1_EventScript_22694D, 0 - object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 2, 3, 3, 8, 0, 0, 0, SootopolisCity_House1_EventScript_22698E, 0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22694D, 0 + object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22698E, 0 SootopolisCity_House1_MapWarps: @ 8533328 warp_def 3, 6, 0, 4, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/events/SootopolisCity_House2.inc b/data/maps/events/SootopolisCity_House2.inc index f0e2b4455a..213fe39d34 100644 --- a/data/maps/events/SootopolisCity_House2.inc +++ b/data/maps/events/SootopolisCity_House2.inc @@ -1,5 +1,5 @@ SootopolisCity_House2_EventObjects: @ 853334C - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 3, 3, 3, 10, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0 SootopolisCity_House2_MapWarps: @ 8533364 warp_def 3, 6, 0, 5, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/events/SootopolisCity_House3.inc b/data/maps/events/SootopolisCity_House3.inc index bd85df9875..0feca97cb2 100644 --- a/data/maps/events/SootopolisCity_House3.inc +++ b/data/maps/events/SootopolisCity_House3.inc @@ -1,6 +1,6 @@ SootopolisCity_House3_EventObjects: @ 8533388 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 4, 3, 8, 0, 0, 0, SootopolisCity_House3_EventScript_226B72, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 6, 4, 3, 2, 17, 0, 0, SootopolisCity_House3_EventScript_226B9B, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 4, 3, 8, 0, 0, 0, 0, SootopolisCity_House3_EventScript_226B72, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 6, 4, 3, 2, 1, 1, 0, 0, SootopolisCity_House3_EventScript_226B9B, 0 SootopolisCity_House3_MapWarps: @ 85333B8 warp_def 3, 6, 0, 6, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/events/SootopolisCity_House4.inc b/data/maps/events/SootopolisCity_House4.inc index 0e94e891fc..1f14ba6e99 100644 --- a/data/maps/events/SootopolisCity_House4.inc +++ b/data/maps/events/SootopolisCity_House4.inc @@ -1,7 +1,7 @@ SootopolisCity_House4_EventObjects: @ 85333DC - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, 10, 0, 0, 0, SootopolisCity_House4_EventScript_226D16, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 2, 3, 7, 33, 0, 0, SootopolisCity_House4_EventScript_226D1F, 0 - object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 3, 3, 1, 17, 0, 0, SootopolisCity_House4_EventScript_226D28, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House4_EventScript_226D16, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 2, 3, 7, 1, 2, 0, 0, SootopolisCity_House4_EventScript_226D1F, 0 + object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 3, 3, 1, 1, 1, 0, 0, SootopolisCity_House4_EventScript_226D28, 0 SootopolisCity_House4_MapWarps: @ 8533424 warp_def 3, 6, 0, 7, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/events/SootopolisCity_House5.inc b/data/maps/events/SootopolisCity_House5.inc index a574df2e99..566631c026 100644 --- a/data/maps/events/SootopolisCity_House5.inc +++ b/data/maps/events/SootopolisCity_House5.inc @@ -1,6 +1,6 @@ SootopolisCity_House5_EventObjects: @ 8533448 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 3, 3, 10, 0, 0, 0, SootopolisCity_House5_EventScript_226E94, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 6, 3, 3, 9, 0, 0, 0, SootopolisCity_House5_EventScript_226E9D, 0 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E94, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 6, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E9D, 0 SootopolisCity_House5_MapWarps: @ 8533478 warp_def 3, 6, 0, 8, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/events/SootopolisCity_House6.inc b/data/maps/events/SootopolisCity_House6.inc index 4e1b102d86..a85356317e 100644 --- a/data/maps/events/SootopolisCity_House6.inc +++ b/data/maps/events/SootopolisCity_House6.inc @@ -1,5 +1,5 @@ SootopolisCity_House6_EventObjects: @ 853349C - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 3, 3, 2, 17, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 3, 3, 2, 1, 1, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0 SootopolisCity_House6_MapWarps: @ 85334B4 warp_def 3, 6, 0, 9, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/events/SootopolisCity_House7.inc b/data/maps/events/SootopolisCity_House7.inc index da06db206e..65b0cf9ddb 100644 --- a/data/maps/events/SootopolisCity_House7.inc +++ b/data/maps/events/SootopolisCity_House7.inc @@ -1,6 +1,6 @@ SootopolisCity_House7_EventObjects: @ 85334D8 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 3, 3, 9, 0, 0, 0, SootopolisCity_House7_EventScript_2270CC, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 4, 3, 2, 17, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House7_EventScript_2270CC, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 4, 3, 2, 1, 1, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0 SootopolisCity_House7_MapWarps: @ 8533508 warp_def 3, 6, 0, 10, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc b/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc index 9f17b52dac..84e642bac9 100644 --- a/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc +++ b/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc @@ -1,6 +1,6 @@ SootopolisCity_LotadAndSeedotHouse_EventObjects: @ 853352C - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 2, 4, 3, 10, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 5, 4, 3, 9, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22722B, 0 + object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 5, 4, 3, 9, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22722B, 0 SootopolisCity_LotadAndSeedotHouse_MapWarps: @ 853355C warp_def 3, 6, 0, 11, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/events/SootopolisCity_Mart.inc b/data/maps/events/SootopolisCity_Mart.inc index 3a38d7a58e..0c32cb4829 100644 --- a/data/maps/events/SootopolisCity_Mart.inc +++ b/data/maps/events/SootopolisCity_Mart.inc @@ -1,7 +1,7 @@ SootopolisCity_Mart_EventObjects: @ 853328C - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, SootopolisCity_Mart_EventScript_226795, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 5, 3, 10, 0, 0, 0, SootopolisCity_Mart_EventScript_2267C2, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 5, 3, 10, 0, 0, 0, SootopolisCity_Mart_EventScript_2267EC, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_226795, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267C2, 0 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267EC, 0 SootopolisCity_Mart_MapWarps: @ 85332D4 warp_def 3, 7, 0, 1, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc b/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc index 9bd3c91d5d..bf06c2cd9e 100644 --- a/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc +++ b/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc @@ -1,5 +1,5 @@ SootopolisCity_MysteryEventsHouse_1F_EventObjects: @ 8533598 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 6, 4, 0, 10, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 6, 4, 0, 10, 0, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0 SootopolisCity_MysteryEventsHouse_1F_MapWarps: @ 85335B0 warp_def 3, 7, 0, 12, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc index 22bcf07eab..21ea255a42 100644 --- a/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc +++ b/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc @@ -1,5 +1,5 @@ SootopolisCity_MysteryEventsHouse_B1F_EventObjects: @ 85335DC - object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 6, 5, 0, 9, 17, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 6, 5, 0, 9, 1, 1, 0, 0, 0x0, 0 SootopolisCity_MysteryEventsHouse_B1F_MapWarps: @ 85335F4 warp_def 3, 1, 0, 2, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc index 92f09cdd9c..9bca02a56f 100644 --- a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc +++ b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ SootopolisCity_PokemonCenter_1F_EventObjects: @ 8533174 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226500, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 4, 3, 2, 17, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_22650E, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 7, 3, 5, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226538, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 2, 3, 3, 2, 17, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_2C8256, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226500, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 4, 3, 2, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_22650E, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 7, 3, 5, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226538, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 2, 3, 3, 2, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_2C8256, 0 SootopolisCity_PokemonCenter_1F_MapWarps: @ 85331D4 warp_def 7, 8, 3, 0, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc index a7937f8200..8498f9de2e 100644 --- a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc +++ b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ SootopolisCity_PokemonCenter_2F_EventObjects: @ 8533200 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, 702 SootopolisCity_PokemonCenter_2F_MapWarps: @ 8533260 warp_def 1, 6, 4, 2, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/SouthernIsland_Exterior.inc b/data/maps/events/SouthernIsland_Exterior.inc index 8f1a22b224..69cddf6036 100644 --- a/data/maps/events/SouthernIsland_Exterior.inc +++ b/data/maps/events/SouthernIsland_Exterior.inc @@ -1,6 +1,6 @@ SouthernIsland_Exterior_EventObjects: @ 853B83C - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 23, 3, 7, 0, 0, 0, SouthernIsland_Exterior_EventScript_2429D2, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 25, 1, 10, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 23, 3, 7, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_2429D2, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 25, 1, 10, 0, 0, 0, 0, 0x0, 0 SouthernIsland_Exterior_MapWarps: @ 853B86C warp_def 14, 5, 3, 0, MAP_SOUTHERN_ISLAND_INTERIOR diff --git a/data/maps/events/SouthernIsland_Interior.inc b/data/maps/events/SouthernIsland_Interior.inc index 0a53cc249a..c31a5568be 100644 --- a/data/maps/events/SouthernIsland_Interior.inc +++ b/data/maps/events/SouthernIsland_Interior.inc @@ -1,6 +1,6 @@ SouthernIsland_Interior_EventObjects: @ 853B89C - object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 13, 12, 3, 7, 0, 0, 0, 0x0, 910 - object_event 2, EVENT_OBJ_GFX_TRADER, 0, 13, 2, 0, 8, 0, 0, 0, 0x0, 911 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 13, 12, 3, 7, 0, 0, 0, 0, 0x0, 910 + object_event 2, EVENT_OBJ_GFX_TRADER, 0, 13, 2, 0, 8, 0, 0, 0, 0, 0x0, 911 SouthernIsland_Interior_MapWarps: @ 853B8CC warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR diff --git a/data/maps/events/TerraCave_End.inc b/data/maps/events/TerraCave_End.inc index e46dad94bf..61edb1e282 100644 --- a/data/maps/events/TerraCave_End.inc +++ b/data/maps/events/TerraCave_End.inc @@ -1,5 +1,5 @@ TerraCave_End_EventObjects: @ 8537850 - object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 17, 22, 1, 8, 17, 0, 0, 0x0, 783 + object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 17, 22, 1, 8, 1, 1, 0, 0, 0x0, 783 TerraCave_End_MapWarps: @ 8537868 warp_def 5, 4, 3, 1, MAP_TERRA_CAVE_ENTRANCE diff --git a/data/maps/events/TradeCenter.inc b/data/maps/events/TradeCenter.inc index c767f78dff..89e5eac907 100644 --- a/data/maps/events/TradeCenter.inc +++ b/data/maps/events/TradeCenter.inc @@ -1,5 +1,5 @@ TradeCenter_EventObjects: @ 8539DA0 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 6, 3, 9, 0, 0, 0, TradeCenter_EventScript_2774B6, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 6, 3, 9, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0 TradeCenter_MapWarps: @ 8539DB8 warp_def 5, 8, 3, 127, MAP_NONE diff --git a/data/maps/events/TrainerHill_Elevator.inc b/data/maps/events/TrainerHill_Elevator.inc index ac7a4d9f5b..7af4c54255 100644 --- a/data/maps/events/TrainerHill_Elevator.inc +++ b/data/maps/events/TrainerHill_Elevator.inc @@ -1,5 +1,5 @@ TrainerHill_Elevator_EventObjects: @ 853DD84 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 3, 8, 17, 0, 0, TrainerHill_Elevator_EventScript_26935F, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 3, 8, 1, 1, 0, 0, TrainerHill_Elevator_EventScript_26935F, 0 TrainerHill_Elevator_MapWarps: @ 853DD9C warp_def 1, 6, 3, 1, MAP_TRAINER_HILL_ROOF diff --git a/data/maps/events/TrainerHill_Entrance.inc b/data/maps/events/TrainerHill_Entrance.inc index 04fac8066e..4b974ce9b8 100644 --- a/data/maps/events/TrainerHill_Entrance.inc +++ b/data/maps/events/TrainerHill_Entrance.inc @@ -1,9 +1,9 @@ TrainerHill_Entrance_EventObjects: @ 853D874 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 6, 3, 9, 17, 0, 0, TrainerHill_Entrance_EventScript_2681FD, 0 - object_event 2, EVENT_OBJ_GFX_NURSE, 0, 4, 9, 3, 8, 17, 0, 0, TrainerHill_Entrance_EventScript_2681EF, 0 - object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 14, 9, 3, 8, 17, 0, 0, TrainerHill_Entrance_EventScript_2683C7, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 5, 14, 3, 2, 17, 0, 0, TrainerHill_Entrance_EventScript_2683AC, 0 - object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 14, 15, 3, 2, 17, 0, 0, TrainerHill_Entrance_EventScript_268391, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 6, 3, 9, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2681FD, 0 + object_event 2, EVENT_OBJ_GFX_NURSE, 0, 4, 9, 3, 8, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2681EF, 0 + object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 14, 9, 3, 8, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683C7, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 5, 14, 3, 2, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683AC, 0 + object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 14, 15, 3, 2, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_268391, 0 TrainerHill_Entrance_MapWarps: @ 853D8EC warp_def 9, 16, 3, 4, MAP_ROUTE111 diff --git a/data/maps/events/TrainerHill_Roof.inc b/data/maps/events/TrainerHill_Roof.inc index 3ce2b9684b..c322d7e96c 100644 --- a/data/maps/events/TrainerHill_Roof.inc +++ b/data/maps/events/TrainerHill_Roof.inc @@ -1,5 +1,5 @@ TrainerHill_Roof_EventObjects: @ 853D9C4 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 7, 3, 8, 17, 0, 0, TrainerHill_Roof_EventScript_268FB2, 0 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 7, 3, 8, 1, 1, 0, 0, TrainerHill_Roof_EventScript_268FB2, 0 TrainerHill_Roof_MapWarps: @ 853D9DC warp_def 9, 5, 3, 1, MAP_TRAINER_HILL_4F diff --git a/data/maps/events/Underwater_SeafloorCavern.inc b/data/maps/events/Underwater_SeafloorCavern.inc index 4d9d8ba142..a22465ca0c 100644 --- a/data/maps/events/Underwater_SeafloorCavern.inc +++ b/data/maps/events/Underwater_SeafloorCavern.inc @@ -1,8 +1,8 @@ Underwater_SeafloorCavern_EventObjects: @ 8535640 - object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 4, 3, 76, 17, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 - object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 4, 3, 76, 17, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 - object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 4, 3, 76, 17, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 - object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 4, 3, 76, 17, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 + object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 + object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 + object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 + object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 Underwater_SeafloorCavern_MapWarps: @ 85356A0 warp_def 6, 7, 0, 0, MAP_UNDERWATER4 diff --git a/data/maps/events/UnionRoom.inc b/data/maps/events/UnionRoom.inc index 5aa373053b..1a50ea7d81 100644 --- a/data/maps/events/UnionRoom.inc +++ b/data/maps/events/UnionRoom.inc @@ -1,13 +1,13 @@ UnionRoom_EventObjects: @ 853B020 - object_event 1, EVENT_OBJ_GFX_UNION_ROOM_NURSE, 0, 3, 2, 3, 8, 0, 0, 0, UnionRoom_EventScript_23D236, 0 - object_event 2, EVENT_OBJ_GFX_GIDDY, 0, 1, 8, 3, 2, 17, 0, 0, UnionRoom_EventScript_23D204, 706 - object_event 3, 247, 0, 7, 8, 3, 2, 17, 0, 0, UnionRoom_EventScript_23D22C, 710 - object_event 4, 246, 0, 1, 4, 3, 2, 17, 0, 0, UnionRoom_EventScript_23D222, 709 - object_event 5, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 7, 4, 3, 2, 17, 0, 0, UnionRoom_EventScript_23D218, 708 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 13, 4, 3, 2, 17, 0, 0, UnionRoom_EventScript_23D20E, 707 - object_event 7, EVENT_OBJ_GFX_STORYTELLER, 0, 10, 6, 3, 2, 17, 0, 0, UnionRoom_EventScript_23D1FA, 705 - object_event 8, EVENT_OBJ_GFX_TRADER, 0, 13, 8, 3, 2, 17, 0, 0, UnionRoom_EventScript_23D1F0, 704 - object_event 9, EVENT_OBJ_GFX_HIPSTER, 0, 4, 6, 3, 2, 17, 0, 0, UnionRoom_EventScript_23D1E6, 703 + object_event 1, EVENT_OBJ_GFX_UNION_ROOM_NURSE, 0, 3, 2, 3, 8, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0 + object_event 2, EVENT_OBJ_GFX_GIDDY, 0, 1, 8, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D204, 706 + object_event 3, 247, 0, 7, 8, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D22C, 710 + object_event 4, 246, 0, 1, 4, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D222, 709 + object_event 5, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 7, 4, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D218, 708 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 13, 4, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D20E, 707 + object_event 7, EVENT_OBJ_GFX_STORYTELLER, 0, 10, 6, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D1FA, 705 + object_event 8, EVENT_OBJ_GFX_TRADER, 0, 13, 8, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D1F0, 704 + object_event 9, EVENT_OBJ_GFX_HIPSTER, 0, 4, 6, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D1E6, 703 UnionRoom_MapWarps: @ 853B0F8 warp_def 7, 11, 3, 127, MAP_NONE diff --git a/data/maps/events/VerdanturfTown.inc b/data/maps/events/VerdanturfTown.inc index 385d92e88e..c844cfa1a2 100644 --- a/data/maps/events/VerdanturfTown.inc +++ b/data/maps/events/VerdanturfTown.inc @@ -1,8 +1,8 @@ VerdanturfTown_EventObjects: @ 8527CDC - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 17, 3, 5, 1, 0, 0, VerdanturfTown_EventScript_1EB5A8, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 2, 3, 9, 1, 0, 0, VerdanturfTown_EventScript_1EB575, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 11, 3, 3, 16, 0, 0, VerdanturfTown_EventScript_1EB5BA, 0 - object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 7, 6, 3, 5, 1, 0, 0, VerdanturfTown_EventScript_1EB5B1, 0 + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 17, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5A8, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 2, 3, 9, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB575, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 11, 3, 3, 0, 1, 0, 0, VerdanturfTown_EventScript_1EB5BA, 0 + object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 7, 6, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5B1, 0 VerdanturfTown_MapWarps: @ 8527D3C warp_def 3, 7, 0, 0, MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY diff --git a/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc b/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc index 240d64cdd2..6276192b37 100644 --- a/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc +++ b/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc @@ -1,7 +1,7 @@ VerdanturfTown_BattleTentBattleRoom_EventObjects: @ 852E734 - object_event 1, EVENT_OBJ_GFX_TRADER, 0, 2, 8, 3, 7, 17, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 11, 1, 3, 8, 17, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 4, 0, 10, 17, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_TRADER, 0, 2, 8, 3, 7, 1, 1, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 11, 1, 3, 8, 1, 1, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 4, 0, 10, 1, 1, 0, 0, 0x0, 0 VerdanturfTown_BattleTentBattleRoom_MapEvents:: @ 852E77C map_events VerdanturfTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_BattleTentCorridor.inc b/data/maps/events/VerdanturfTown_BattleTentCorridor.inc index 1b85d4a3f8..4fa836d58e 100644 --- a/data/maps/events/VerdanturfTown_BattleTentCorridor.inc +++ b/data/maps/events/VerdanturfTown_BattleTentCorridor.inc @@ -1,5 +1,5 @@ VerdanturfTown_BattleTentCorridor_EventObjects: @ 852E708 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 6, 3, 7, 17, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 6, 3, 7, 1, 1, 0, 0, 0x0, 0 VerdanturfTown_BattleTentCorridor_MapEvents:: @ 852E720 map_events VerdanturfTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_BattleTentLobby.inc b/data/maps/events/VerdanturfTown_BattleTentLobby.inc index fa54d8b653..570e600fe7 100644 --- a/data/maps/events/VerdanturfTown_BattleTentLobby.inc +++ b/data/maps/events/VerdanturfTown_BattleTentLobby.inc @@ -1,10 +1,10 @@ VerdanturfTown_BattleTentLobby_EventObjects: @ 852E648 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 5, 3, 8, 17, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201873, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 5, 3, 2, 17, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0 - object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 9, 7, 3, 2, 17, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 1, 8, 3, 10, 17, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AC5, 0 - object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 12, 6, 3, 9, 17, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, 766 - object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 2, 8, 3, 9, 17, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 5, 3, 8, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201873, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 5, 3, 2, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0 + object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 9, 7, 3, 2, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 1, 8, 3, 10, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AC5, 0 + object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 12, 6, 3, 9, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, 766 + object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 2, 8, 3, 9, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0 VerdanturfTown_BattleTentLobby_MapWarps: @ 852E6D8 warp_def 6, 9, 0, 0, MAP_VERDANTURF_TOWN diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc index 001d6ac1a7..fd5fa02921 100644 --- a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc +++ b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc @@ -1,6 +1,6 @@ VerdanturfTown_FriendshipRatersHouse_EventObjects: @ 852E9C8 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 8, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203031, 0 - object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, 8, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203031, 0 + object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA, 0 VerdanturfTown_FriendshipRatersHouse_MapWarps: @ 852E9F8 warp_def 3, 7, 0, 5, MAP_VERDANTURF_TOWN diff --git a/data/maps/events/VerdanturfTown_House.inc b/data/maps/events/VerdanturfTown_House.inc index feaf1afa1a..49b8d47ee4 100644 --- a/data/maps/events/VerdanturfTown_House.inc +++ b/data/maps/events/VerdanturfTown_House.inc @@ -1,6 +1,6 @@ VerdanturfTown_House_EventObjects: @ 852EA1C - object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 5, 3, 7, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 4, 3, 8, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 5, 3, 7, 0, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0 VerdanturfTown_House_MapWarps: @ 852EA4C warp_def 3, 8, 0, 6, MAP_VERDANTURF_TOWN diff --git a/data/maps/events/VerdanturfTown_Mart.inc b/data/maps/events/VerdanturfTown_Mart.inc index 2d2440d554..804f396470 100644 --- a/data/maps/events/VerdanturfTown_Mart.inc +++ b/data/maps/events/VerdanturfTown_Mart.inc @@ -1,8 +1,8 @@ VerdanturfTown_Mart_EventObjects: @ 852E790 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, VerdanturfTown_Mart_EventScript_202587, 0 - object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 3, 10, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025BA, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 5, 3, 9, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025C3, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 3, 2, 3, 9, 17, 0, 0, VerdanturfTown_Mart_EventScript_2025CC, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_202587, 0 + object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025BA, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025C3, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 3, 2, 3, 9, 1, 1, 0, 0, VerdanturfTown_Mart_EventScript_2025CC, 0 VerdanturfTown_Mart_MapWarps: @ 852E7F0 warp_def 3, 7, 0, 1, MAP_VERDANTURF_TOWN diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc index 8727bc43f4..77bd6748c2 100644 --- a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc +++ b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ VerdanturfTown_PokemonCenter_1F_EventObjects: @ 852E814 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_20273A, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 5, 3, 5, 1, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202748, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 2, 3, 7, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202751, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 10, 6, 3, 9, 1, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_20273A, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 5, 3, 5, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202748, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 2, 3, 7, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202751, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 10, 6, 3, 9, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0 VerdanturfTown_PokemonCenter_1F_MapWarps: @ 852E874 warp_def 7, 8, 3, 2, MAP_VERDANTURF_TOWN diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc index 92fc90e6d0..40cbe6aec9 100644 --- a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc +++ b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ VerdanturfTown_PokemonCenter_2F_EventObjects: @ 852E8A0 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 17, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 17, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 17, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 17, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, 702 VerdanturfTown_PokemonCenter_2F_MapWarps: @ 852E900 warp_def 1, 6, 4, 2, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/events/VerdanturfTown_WandasHouse.inc index e537d66f85..cfa46e1024 100644 --- a/data/maps/events/VerdanturfTown_WandasHouse.inc +++ b/data/maps/events/VerdanturfTown_WandasHouse.inc @@ -1,9 +1,9 @@ VerdanturfTown_WandasHouse_EventObjects: @ 852E92C - object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 5, 3, 2, 17, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, 806 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, 8, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, 808 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, 8, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, 809 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 4, 3, 10, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, 9, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, 984 + object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 5, 3, 2, 1, 1, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, 806 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, 808 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, 809 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, 984 VerdanturfTown_WandasHouse_MapWarps: @ 852E9A4 warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/events/VictoryRoad_1F.inc index e9958393a8..d5fa881dc8 100644 --- a/data/maps/events/VictoryRoad_1F.inc +++ b/data/maps/events/VictoryRoad_1F.inc @@ -1,13 +1,13 @@ VictoryRoad_1F_EventObjects: @ 8535E04 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 33, 22, 3, 8, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 6, 15, 4, 9, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 27, 34, 3, 18, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0 - object_event 4, EVENT_OBJ_GFX_WALLY, 0, 12, 25, 4, 8, 17, 0, 0, VictoryRoad_1F_EventScript_235E2C, 858 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 40, 26, 3, 1, 17, 0, 0, VictoryRoad_1F_EventScript_291483, 1084 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 39, 4, 1, 17, 0, 0, VictoryRoad_1F_EventScript_291490, 1085 - object_event 7, EVENT_OBJ_GFX_WALLY, 0, 31, 9, 3, 1, 17, 0, 0, VictoryRoad_1F_EventScript_235E35, 751 - object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 29, 17, 3, 10, 17, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0 - object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 32, 17, 3, 9, 17, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 33, 22, 3, 8, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 6, 15, 4, 9, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 27, 34, 3, 18, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0 + object_event 4, EVENT_OBJ_GFX_WALLY, 0, 12, 25, 4, 8, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E2C, 858 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 40, 26, 3, 1, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291483, 1084 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 39, 4, 1, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291490, 1085 + object_event 7, EVENT_OBJ_GFX_WALLY, 0, 31, 9, 3, 1, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E35, 751 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 29, 17, 3, 10, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0 + object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 32, 17, 3, 9, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0 VictoryRoad_1F_MapWarps: @ 8535EDC warp_def 15, 40, 3, 2, MAP_EVER_GRANDE_CITY diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/events/VictoryRoad_B1F.inc index b480855d98..26d67171d5 100644 --- a/data/maps/events/VictoryRoad_B1F.inc +++ b/data/maps/events/VictoryRoad_B1F.inc @@ -1,25 +1,25 @@ VictoryRoad_B1F_EventObjects: @ 8535F44 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 5, 3, 1, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 19 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 4, 3, 1, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 20 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, 1, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 17 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 10, 3, 1, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 18 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 26, 3, 1, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 23 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 25, 3, 1, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 22 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 6, 3, 1, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 30 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 5, 3, 1, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 25 - object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 4, 3, 1, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 26 - object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 12, 3, 1, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 27 - object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 25, 3, 1, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 28 - object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 26, 3, 1, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 29 - object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 4, 3, 1, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 31 - object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 37, 12, 3, 9, 0, 1, 3, VictoryRoad_B1F_EventScript_2364E5, 0 - object_event 15, EVENT_OBJ_GFX_WOMAN_7, 0, 26, 16, 3, 7, 0, 1, 4, VictoryRoad_B1F_EventScript_2364FC, 0 - object_event 16, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 21, 3, 9, 0, 1, 2, VictoryRoad_B1F_EventScript_236513, 0 - object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 3, 3, 1, 17, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 21 - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 8, 4, 1, 17, 0, 0, VictoryRoad_B1F_EventScript_29149D, 1086 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 3, 3, 1, 17, 0, 0, VictoryRoad_B1F_EventScript_2914AA, 1087 - object_event 20, EVENT_OBJ_GFX_MAN_4, 0, 14, 16, 3, 8, 17, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0 - object_event 21, EVENT_OBJ_GFX_WOMAN_7, 0, 14, 20, 3, 16, 17, 1, 3, VictoryRoad_B1F_EventScript_236541, 0 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 19 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 20 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 17 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 10, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 18 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 23 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 22 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 6, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 30 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 25 + object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 26 + object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 12, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 27 + object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 28 + object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 29 + object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 31 + object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 37, 12, 3, 9, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_2364E5, 0 + object_event 15, EVENT_OBJ_GFX_WOMAN_7, 0, 26, 16, 3, 7, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_2364FC, 0 + object_event 16, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 21, 3, 9, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_236513, 0 + object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 3, 3, 1, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 21 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 8, 4, 1, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_29149D, 1086 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 3, 3, 1, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2914AA, 1087 + object_event 20, EVENT_OBJ_GFX_MAN_4, 0, 14, 16, 3, 8, 1, 1, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0 + object_event 21, EVENT_OBJ_GFX_WOMAN_7, 0, 14, 20, 3, 16, 1, 1, 1, 3, VictoryRoad_B1F_EventScript_236541, 0 VictoryRoad_B1F_MapWarps: @ 853613C warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B2F diff --git a/data/maps/events/VictoryRoad_B2F.inc b/data/maps/events/VictoryRoad_B2F.inc index d5f92efdba..a25c76c813 100644 --- a/data/maps/events/VictoryRoad_B2F.inc +++ b/data/maps/events/VictoryRoad_B2F.inc @@ -1,11 +1,11 @@ VictoryRoad_B2F_EventObjects: @ 8536188 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 15, 6, 3, 8, 17, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 43, 14, 3, 7, 17, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 17, 3, 8, 17, 1, 2, VictoryRoad_B2F_EventScript_236903, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 35, 22, 3, 9, 17, 1, 2, VictoryRoad_B2F_EventScript_23691A, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 8, 3, 1, 17, 0, 0, VictoryRoad_B2F_EventScript_2914B7, 1088 - object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 25, 18, 4, 8, 17, 1, 2, VictoryRoad_B2F_EventScript_236948, 0 - object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 25, 21, 4, 7, 17, 1, 2, VictoryRoad_B2F_EventScript_236931, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 15, 6, 3, 8, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 43, 14, 3, 7, 1, 1, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 17, 3, 8, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236903, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 35, 22, 3, 9, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_23691A, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 8, 3, 1, 1, 1, 0, 0, VictoryRoad_B2F_EventScript_2914B7, 1088 + object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 25, 18, 4, 8, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236948, 0 + object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 25, 21, 4, 7, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236931, 0 VictoryRoad_B2F_MapWarps: @ 8536230 warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B1F From 7ea5dd7923eb9a44609a6cdaff331f7cd97bb34a Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 16 Jun 2018 00:45:48 +0200 Subject: [PATCH 17/55] start fldeffect cut --- asm/fldeff_80F9BCC.s | 24 +- asm/fldeff_cut.s | 1294 +---------------- asm/party_menu.s | 38 +- asm/pokemon_summary_screen.s | 2 +- .../field_event_obj/event_object_graphics.h | 4 +- src/field_tasks.c | 2 +- src/fldeff_cut.c | 610 +++++++- src/fldeff_flash.c | 8 +- src/fldeff_strength.c | 6 +- src/fldeff_sweetscent.c | 4 +- src/fldeff_teleport.c | 4 +- src/metatile_behavior.c | 2 +- src/overworld.c | 12 +- src/rom6.c | 26 +- src/start_menu.c | 2 +- 15 files changed, 678 insertions(+), 1360 deletions(-) diff --git a/asm/fldeff_80F9BCC.s b/asm/fldeff_80F9BCC.s index 840d38f64e..3cfbe215a3 100644 --- a/asm/fldeff_80F9BCC.s +++ b/asm/fldeff_80F9BCC.s @@ -467,7 +467,7 @@ _080F9F54: thumb_func_start sub_80F9F5C sub_80F9F5C: @ 80F9F5C push {lr} - ldr r0, =gUnknown_0203AB40 + ldr r0, =gPlayerFacingPosition ldr r1, =gMapHeader ldr r1, [r1, 0x4] bl sub_80E9608 @@ -572,7 +572,7 @@ sub_80FA004: @ 80FA004 lsrs r0, 24 cmp r0, 0x2 bne _080FA0AE - ldr r4, =gUnknown_0203AB40 + ldr r4, =gPlayerFacingPosition adds r1, r4, 0x2 adds r0, r4, 0 bl GetXYCoordsOneStepInFrontOfPlayer @@ -590,10 +590,10 @@ sub_80FA004: @ 80FA004 cmp r0, 0x1 bne _080FA070 bl sub_80F9F5C - ldr r1, =gUnknown_03005DB0 - ldr r0, =FieldCallback_Teleport + ldr r1, =gFieldCallback2 + ldr r0, =FieldCallback_PrepareFadeInFromMenu str r0, [r1] - ldr r1, =gUnknown_0203CEEC + ldr r1, =gPostMenuFieldCallback ldr r0, =sub_80FA0DC b _080FA0C0 .pool @@ -605,10 +605,10 @@ _080FA070: cmp r0, 0x1 bne _080FA0A0 bl sub_80F9F5C - ldr r1, =gUnknown_03005DB0 - ldr r0, =FieldCallback_Teleport + ldr r1, =gFieldCallback2 + ldr r0, =FieldCallback_PrepareFadeInFromMenu str r0, [r1] - ldr r1, =gUnknown_0203CEEC + ldr r1, =gPostMenuFieldCallback ldr r0, =sub_80FA1E8 b _080FA0C0 .pool @@ -624,10 +624,10 @@ _080FA0AE: b _080FA0C4 _080FA0B2: bl sub_80F9F5C - ldr r1, =gUnknown_03005DB0 - ldr r0, =FieldCallback_Teleport + ldr r1, =gFieldCallback2 + ldr r0, =FieldCallback_PrepareFadeInFromMenu str r0, [r1] - ldr r1, =gUnknown_0203CEEC + ldr r1, =gPostMenuFieldCallback ldr r0, =sub_80FA34C _080FA0C0: str r0, [r1] @@ -824,7 +824,7 @@ sub_80FA234: @ 80FA234 thumb_func_start sub_80FA248 sub_80FA248: @ 80FA248 push {r4,lr} - ldr r1, =gUnknown_0203AB40 + ldr r1, =gPlayerFacingPosition movs r2, 0 ldrsh r0, [r1, r2] movs r2, 0x2 diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s index 19a29d729c..fa7ac73212 100644 --- a/asm/fldeff_cut.s +++ b/asm/fldeff_cut.s @@ -5,1291 +5,13 @@ .text - thumb_func_start sub_80D3718 -sub_80D3718: @ 80D3718 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x1C - movs r0, 0x52 - bl npc_before_player_of_type - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080D3754 - ldr r1, =gUnknown_03005DB0 - ldr r0, =FieldCallback_Teleport - str r0, [r1] - ldr r1, =gUnknown_0203CEEC - ldr r0, =sub_80D3A9C - str r0, [r1] - movs r0, 0x1 - b _080D3A2C - .pool -_080D3754: - ldr r0, =gUnknown_0203AB40 - adds r1, r0, 0x2 - bl PlayerGetDestCoords - bl GetCursorSelectionMonId - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x64 - muls r0, r1 - ldr r1, =gPlayerParty - adds r0, r1 - bl GetMonAbility - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0xC] - cmp r0, 0x34 - bne _080D3798 - ldr r1, =gUnknown_03001100 - movs r0, 0x5 - strb r0, [r1] - ldr r0, =gUnknown_03001101 - movs r1, 0x2 - b _080D37A2 - .pool -_080D3798: - ldr r1, =gUnknown_03001100 - movs r0, 0x3 - strb r0, [r1] - ldr r0, =gUnknown_03001101 - movs r1, 0x1 -_080D37A2: - strb r1, [r0] - ldr r0, =gUnknown_03001102 - strb r1, [r0] - movs r6, 0 - movs r1, 0 -_080D37AC: - mov r2, sp - adds r0, r2, r6 - strb r1, [r0] - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x8 - bls _080D37AC - movs r6, 0 - ldr r2, =gUnknown_03001108 - movs r1, 0 -_080D37C2: - adds r0, r6, r2 - strb r1, [r0] - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x18 - bls _080D37C2 - movs r3, 0 - str r3, [sp, 0x10] - movs r6, 0 -_080D37D6: - ldr r4, =0x0000ffff - adds r0, r6, r4 - ldr r1, =gUnknown_0203AB40 - ldrh r1, [r1, 0x2] - adds r0, r1 - movs r5, 0 - adds r2, r6, 0x1 - str r2, [sp, 0x18] - lsls r7, r6, 1 - lsls r0, 16 - str r0, [sp, 0x14] - asrs r0, 16 - mov r10, r0 - lsls r0, r6, 2 - adds r0, r6 - mov r9, r0 -_080D37F6: - ldr r3, =0x0000ffff - adds r0, r5, r3 - ldr r4, =gUnknown_0203AB40 - ldrh r4, [r4] - adds r0, r4 - lsls r0, 16 - lsrs r1, r0, 16 - mov r8, r1 - asrs r4, r0, 16 - adds r0, r4, 0 - mov r1, r10 - bl MapGridGetZCoordAt - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gUnknown_0203AB40 - movs r1, 0x4 - ldrsb r1, [r2, r1] - cmp r0, r1 - bne _080D38BC - adds r0, r4, 0 - mov r1, r10 - bl MapGridGetMetatileBehaviorAt - lsls r0, 24 - lsrs r4, r0, 24 - adds r0, r4, 0 - bl MetatileBehavior_IsPokeGrass - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _080D3846 - adds r0, r4, 0 - bl MetatileBehavior_IsAsh - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080D3856 -_080D3846: - adds r0, r5, 0x6 - add r0, r9 - ldr r3, =gUnknown_03001108 - adds r0, r3 - movs r1, 0x1 - strb r1, [r0] - movs r0, 0x1 - str r0, [sp, 0x10] -_080D3856: - mov r1, r8 - lsls r0, r1, 16 - asrs r0, 16 - ldr r2, [sp, 0x14] - asrs r1, r2, 16 - bl MapGridIsImpassableAt - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080D3890 - adds r0, r7, r6 - adds r0, r5 - mov r3, sp - adds r1, r3, r0 - b _080D38C4 - .pool -_080D3890: - adds r0, r7, r6 - adds r0, r5 - mov r2, sp - adds r1, r2, r0 - movs r0, 0x1 - strb r0, [r1] - adds r0, r4, 0 - bl MetatileBehavior_IsCuttableGrass - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x1 - bne _080D38C8 - adds r0, r5, 0x6 - add r0, r9 - ldr r3, =gUnknown_03001108 - adds r0, r3 - strb r1, [r0] - b _080D38C8 - .pool -_080D38BC: - adds r0, r7, r6 - adds r0, r5 - mov r4, sp - adds r1, r4, r0 -_080D38C4: - movs r0, 0 - strb r0, [r1] -_080D38C8: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x2 - bls _080D37F6 - ldr r1, [sp, 0x18] - lsls r0, r1, 24 - lsrs r6, r0, 24 - cmp r6, 0x2 - bhi _080D38DE - b _080D37D6 -_080D38DE: - ldr r2, [sp, 0xC] - cmp r2, 0x34 - beq _080D38EE - ldr r3, [sp, 0x10] - cmp r3, 0x1 - beq _080D38EC - b _080D3A2A -_080D38EC: - b _080D3A1E -_080D38EE: - movs r6, 0 - ldr r4, =gUnknown_0203AB40 - mov r9, r4 - ldr r0, =gUnknown_0857C608 - mov r10, r0 -_080D38F8: - lsls r2, r6, 2 - mov r3, r10 - adds r1, r2, r3 - movs r0, 0 - ldrsb r0, [r1, r0] - mov r4, r9 - ldrh r4, [r4] - adds r0, r4 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - movs r0, 0x1 - ldrsb r0, [r1, r0] - mov r1, r9 - ldrh r1, [r1, 0x2] - adds r0, r1 - lsls r0, 16 - lsrs r4, r0, 16 - movs r7, 0x1 - movs r5, 0 - ldr r3, =gUnknown_0857C608 + 2 - adds r0, r2, r3 - ldrb r0, [r0] - adds r6, 0x1 - str r6, [sp, 0x18] - adds r6, r2, 0 - cmp r0, 0 - beq _080D395A -_080D3930: - adds r1, r2, 0 - adds r0, r5, r2 - adds r0, r3 - ldrb r0, [r0] - subs r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - add r0, sp - ldrb r0, [r0] - cmp r0, 0 - beq _080D39F4 - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x1 - bhi _080D395A - adds r0, r5, r1 - adds r0, r3 - ldrb r0, [r0] - cmp r0, 0 - bne _080D3930 -_080D395A: - cmp r7, 0x1 - bne _080D3A0C - mov r1, r8 - lsls r0, r1, 16 - asrs r5, r0, 16 - lsls r0, r4, 16 - asrs r4, r0, 16 - adds r0, r5, 0 - adds r1, r4, 0 - bl MapGridGetZCoordAt - lsls r0, 24 - lsrs r0, 24 - mov r2, r9 - movs r1, 0x4 - ldrsb r1, [r2, r1] - cmp r0, r1 - bne _080D3A0C - mov r3, r10 - adds r2, r6, r3 - movs r1, 0x1 - ldrsb r1, [r2, r1] - lsls r0, r1, 2 - adds r0, r1 - adds r0, 0xC - ldrb r2, [r2] - adds r0, r2 - lsls r0, 24 - lsrs r6, r0, 24 - adds r0, r5, 0 - adds r1, r4, 0 - bl MapGridGetMetatileBehaviorAt - lsls r0, 24 - lsrs r4, r0, 24 - adds r0, r4, 0 - bl MetatileBehavior_IsPokeGrass - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _080D39BC - adds r0, r4, 0 - bl MetatileBehavior_IsAsh - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080D39F8 -_080D39BC: - ldr r1, =gUnknown_03005DB0 - ldr r0, =FieldCallback_Teleport - str r0, [r1] - ldr r1, =gUnknown_0203CEEC - ldr r0, =hm2_ruin_valley - str r0, [r1] - ldr r0, =gUnknown_03001108 - adds r0, r6, r0 - strb r7, [r0] - movs r4, 0x1 - str r4, [sp, 0x10] - b _080D3A0C - .pool -_080D39F4: - movs r7, 0 - b _080D395A -_080D39F8: - adds r0, r4, 0 - bl MetatileBehavior_IsCuttableGrass - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x1 - bne _080D3A0C - ldr r0, =gUnknown_03001108 - adds r0, r6, r0 - strb r1, [r0] -_080D3A0C: - ldr r1, [sp, 0x18] - lsls r0, r1, 24 - lsrs r6, r0, 24 - cmp r6, 0xF - bhi _080D3A18 - b _080D38F8 -_080D3A18: - ldr r2, [sp, 0x10] - cmp r2, 0x1 - bne _080D3A2A -_080D3A1E: - ldr r1, =gUnknown_03005DB0 - ldr r0, =FieldCallback_Teleport - str r0, [r1] - ldr r1, =gUnknown_0203CEEC - ldr r0, =hm2_ruin_valley - str r0, [r1] -_080D3A2A: - ldr r0, [sp, 0x10] -_080D3A2C: - add sp, 0x1C - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_80D3718 - thumb_func_start hm2_ruin_valley -hm2_ruin_valley: @ 80D3A50 - push {lr} - movs r0, 0x1 - bl FieldEffectStart - bl GetCursorSelectionMonId - ldr r1, =gFieldEffectArguments - lsls r0, 24 - lsrs r0, 24 - str r0, [r1] - pop {r0} - bx r0 - .pool - thumb_func_end hm2_ruin_valley - - thumb_func_start sub_80D3A6C -sub_80D3A6C: @ 80D3A6C - push {lr} - bl oei_task_add - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - ldr r2, =sub_80D3AEC - lsrs r0, r2, 16 - strh r0, [r1, 0x18] - strh r2, [r1, 0x1A] - movs r0, 0x12 - bl IncrementGameStat - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_80D3A6C - - thumb_func_start sub_80D3A9C -sub_80D3A9C: @ 80D3A9C - push {lr} - bl GetCursorSelectionMonId - ldr r1, =gFieldEffectArguments - lsls r0, 24 - lsrs r0, 24 - str r0, [r1] - ldr r0, =Route103_EventScript_290705 - bl ScriptContext1_SetupScript - pop {r0} - bx r0 - .pool - thumb_func_end sub_80D3A9C - - thumb_func_start sub_80D3ABC -sub_80D3ABC: @ 80D3ABC - push {lr} - bl oei_task_add - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - ldr r2, =sub_80D4354 - lsrs r0, r2, 16 - strh r0, [r1, 0x18] - strh r2, [r1, 0x1A] - movs r0, 0x12 - bl IncrementGameStat - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_80D3ABC - - thumb_func_start sub_80D3AEC -sub_80D3AEC: @ 80D3AEC - push {lr} - movs r0, 0x1 - bl FieldEffectActiveListRemove - movs r0, 0x3A - bl FieldEffectStart - pop {r0} - bx r0 - thumb_func_end sub_80D3AEC - - thumb_func_start sub_80D3B00 -sub_80D3B00: @ 80D3B00 - push {r4-r7,lr} - movs r6, 0 - movs r0, 0x80 - bl PlaySE - ldr r4, =gUnknown_0203AB40 - adds r1, r4, 0x2 - adds r0, r4, 0 - bl PlayerGetDestCoords - adds r7, r4, 0 -_080D3B16: - ldr r0, =gUnknown_03001108 - adds r0, r6, r0 - ldrb r0, [r0] - cmp r0, 0x1 - bne _080D3B64 - adds r0, r6, 0 - movs r1, 0x5 - bl __umodsi3 - adds r4, r0, 0 - subs r4, 0x2 - lsls r4, 24 - lsrs r4, 24 - adds r0, r6, 0 - movs r1, 0x5 - bl __udivsi3 - adds r5, r0, 0 - subs r5, 0x2 - lsls r4, 24 - asrs r4, 24 - ldrh r0, [r7] - adds r4, r0 - lsls r5, 24 - asrs r5, 24 - ldrh r2, [r7, 0x2] - adds r5, r2 - lsls r4, 16 - asrs r4, 16 - lsls r5, 16 - asrs r5, 16 - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_80D3C10 - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_808E75C -_080D3B64: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x18 - bls _080D3B16 - ldr r2, =gUnknown_0203AB40 - ldr r0, =gUnknown_03001101 - ldrb r1, [r0] - ldrh r0, [r2] - subs r0, r1 - lsls r0, 16 - asrs r0, 16 - ldr r1, =gUnknown_03001102 - ldrb r1, [r1] - mvns r1, r1 - ldrh r2, [r2, 0x2] - adds r1, r2 - lsls r1, 16 - asrs r1, 16 - bl sub_80D3D5C - bl DrawWholeMapView - ldr r4, =gUnknown_02039DD0 - movs r0, 0x8 - bl AllocZeroed - str r0, [r4] - movs r6, 0 - ldr r5, =gSprites -_080D3BA0: - ldr r0, =gPlayerAvatar - ldrb r1, [r0, 0x4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - ldrh r1, [r0, 0x2] - lsls r1, 23 - lsrs r1, 7 - movs r2, 0x80 - lsls r2, 12 - adds r1, r2 - asrs r1, 16 - ldrb r2, [r0] - adds r2, 0x14 - ldr r0, =gUnknown_0857C66C - movs r3, 0 - bl CreateSprite - ldr r1, [r4] - adds r1, r6 - strb r0, [r1] - ldr r0, [r4] - adds r0, r6 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - lsls r1, r6, 5 - strh r1, [r0, 0x32] - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x7 - bls _080D3BA0 - movs r0, 0 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_80D3B00 - - thumb_func_start sub_80D3C10 -sub_80D3C10: @ 80D3C10 - push {r4-r7,lr} - lsls r0, 16 - lsls r1, 16 - lsrs r6, r0, 16 - asrs r4, r0, 16 - lsrs r7, r1, 16 - asrs r5, r1, 16 - adds r0, r4, 0 - adds r1, r5, 0 - bl MapGridGetMetatileIdAt - adds r1, r0, 0 - ldr r0, =0x00000207 - cmp r1, r0 - bgt _080D3C5C - subs r0, 0x1 - cmp r1, r0 - bge _080D3CD4 - cmp r1, 0x25 - beq _080D3CF6 - cmp r1, 0x25 - bgt _080D3C4C - cmp r1, 0xD - beq _080D3C9C - cmp r1, 0x15 - beq _080D3C9C - b _080D3D00 - .pool -_080D3C4C: - movs r0, 0xE3 - lsls r0, 1 - cmp r1, r0 - beq _080D3CAC - adds r0, 0x1 - cmp r1, r0 - beq _080D3CB2 - b _080D3D00 -_080D3C5C: - ldr r0, =0x00000212 - cmp r1, r0 - beq _080D3CE4 - cmp r1, r0 - bgt _080D3C78 - subs r0, 0xA - cmp r1, r0 - beq _080D3C9C - adds r0, 0x2 - cmp r1, r0 - beq _080D3CE4 - b _080D3D00 - .pool -_080D3C78: - ldr r0, =0x00000282 - cmp r1, r0 - beq _080D3CC4 - cmp r1, r0 - bgt _080D3C90 - subs r0, 0x1 - cmp r1, r0 - beq _080D3CBC - b _080D3D00 - .pool -_080D3C90: - ldr r0, =0x00000283 - cmp r1, r0 - beq _080D3CCC - b _080D3D00 - .pool -_080D3C9C: - lsls r0, r6, 16 - asrs r0, 16 - lsls r1, r7, 16 - asrs r1, 16 - movs r2, 0x1 - bl MapGridSetMetatileIdAt - b _080D3D00 -_080D3CAC: - movs r2, 0xE7 - lsls r2, 1 - b _080D3CD6 -_080D3CB2: - ldr r2, =0x000001cf - b _080D3CD6 - .pool -_080D3CBC: - ldr r2, =0x00000279 - b _080D3CD6 - .pool -_080D3CC4: - ldr r2, =0x0000027a - b _080D3CD6 - .pool -_080D3CCC: - ldr r2, =0x0000027b - b _080D3CD6 - .pool -_080D3CD4: - ldr r2, =0x00000271 -_080D3CD6: - adds r0, r4, 0 - adds r1, r5, 0 - bl MapGridSetMetatileIdAt - b _080D3D00 - .pool -_080D3CE4: - lsls r0, r6, 16 - asrs r0, 16 - lsls r1, r7, 16 - asrs r1, 16 - movs r2, 0x86 - lsls r2, 2 - bl MapGridSetMetatileIdAt - b _080D3D00 -_080D3CF6: - adds r0, r4, 0 - adds r1, r5, 0 - movs r2, 0xE - bl MapGridSetMetatileIdAt -_080D3D00: - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80D3C10 - - thumb_func_start sub_80D3D08 -sub_80D3D08: @ 80D3D08 - push {lr} - lsls r0, 16 - asrs r0, 16 - lsls r1, 16 - asrs r1, 16 - bl MapGridGetMetatileIdAt - lsls r0, 16 - lsrs r1, r0, 16 - adds r2, r1, 0 - cmp r1, 0x1 - bne _080D3D24 - movs r0, 0x1 - b _080D3D56 -_080D3D24: - ldr r0, =0x00000279 - cmp r1, r0 - bne _080D3D34 - movs r0, 0x2 - b _080D3D56 - .pool -_080D3D34: - ldr r0, =0x0000027a - cmp r1, r0 - bne _080D3D44 - movs r0, 0x3 - b _080D3D56 - .pool -_080D3D44: - ldr r0, =0x0000027b - cmp r2, r0 - beq _080D3D54 - movs r0, 0 - b _080D3D56 - .pool -_080D3D54: - movs r0, 0x4 -_080D3D56: - pop {r1} - bx r1 - thumb_func_end sub_80D3D08 - - thumb_func_start sub_80D3D5C -sub_80D3D5C: @ 80D3D5C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - lsls r0, 16 - lsrs r0, 16 - mov r9, r0 - lsls r1, 16 - lsrs r1, 16 - mov r10, r1 - ldr r1, =gUnknown_03001100 - ldrb r2, [r1] - mov r3, r10 - adds r0, r2, r3 - lsls r0, 16 - lsrs r0, 16 - str r0, [sp] - movs r4, 0 - cmp r4, r2 - blt _080D3D8A - b _080D3EA0 -_080D3D8A: - lsls r0, r3, 16 - asrs r7, r0, 16 -_080D3D8E: - mov r1, r9 - lsls r0, r1, 16 - asrs r0, 16 - lsls r4, 16 - asrs r1, r4, 16 - adds r0, r1 - lsls r0, 16 - lsrs r6, r0, 16 - asrs r5, r0, 16 - adds r0, r5, 0 - adds r1, r7, 0 - bl MapGridGetMetatileIdAt - mov r8, r4 - cmp r0, 0x15 - bne _080D3E12 - adds r4, r7, 0x1 - lsls r1, r4, 16 - asrs r1, 16 - adds r0, r5, 0 - bl sub_80D3D08 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x2 - beq _080D3DE8 - cmp r0, 0x2 - bgt _080D3DD0 - cmp r0, 0x1 - beq _080D3DDA - b _080D3E12 - .pool -_080D3DD0: - cmp r0, 0x3 - beq _080D3DF8 - cmp r0, 0x4 - beq _080D3E08 - b _080D3E12 -_080D3DDA: - adds r0, r5, 0 - adds r1, r4, 0 - movs r2, 0x82 - lsls r2, 2 - bl MapGridSetMetatileIdAt - b _080D3E12 -_080D3DE8: - adds r0, r5, 0 - adds r1, r4, 0 - ldr r2, =0x00000281 - bl MapGridSetMetatileIdAt - b _080D3E12 - .pool -_080D3DF8: - adds r0, r5, 0 - adds r1, r4, 0 - ldr r2, =0x00000282 - bl MapGridSetMetatileIdAt - b _080D3E12 - .pool -_080D3E08: - adds r0, r5, 0 - adds r1, r4, 0 - ldr r2, =0x00000283 - bl MapGridSetMetatileIdAt -_080D3E12: - lsls r0, r6, 16 - asrs r5, r0, 16 - ldr r3, [sp] - lsls r0, r3, 16 - asrs r4, r0, 16 - adds r0, r5, 0 - adds r1, r4, 0 - bl MapGridGetMetatileIdAt - cmp r0, 0x1 - bne _080D3E8C - adds r4, 0x1 - adds r0, r5, 0 - adds r1, r4, 0 - bl MapGridGetMetatileIdAt - movs r1, 0x82 - lsls r1, 2 - cmp r0, r1 - bne _080D3E44 - adds r0, r5, 0 - adds r1, r4, 0 - movs r2, 0x1 - bl MapGridSetMetatileIdAt -_080D3E44: - adds r0, r5, 0 - adds r1, r4, 0 - bl MapGridGetMetatileIdAt - ldr r1, =0x00000281 - cmp r0, r1 - bne _080D3E5C - adds r0, r5, 0 - adds r1, r4, 0 - ldr r2, =0x00000279 - bl MapGridSetMetatileIdAt -_080D3E5C: - adds r0, r5, 0 - adds r1, r4, 0 - bl MapGridGetMetatileIdAt - ldr r1, =0x00000282 - cmp r0, r1 - bne _080D3E74 - adds r0, r5, 0 - adds r1, r4, 0 - ldr r2, =0x0000027a - bl MapGridSetMetatileIdAt -_080D3E74: - adds r0, r5, 0 - adds r1, r4, 0 - bl MapGridGetMetatileIdAt - ldr r1, =0x00000283 - cmp r0, r1 - bne _080D3E8C - adds r0, r5, 0 - adds r1, r4, 0 - ldr r2, =0x0000027b - bl MapGridSetMetatileIdAt -_080D3E8C: - movs r1, 0x80 - lsls r1, 9 - add r1, r8 - lsrs r4, r1, 16 - asrs r1, 16 - ldr r0, =gUnknown_03001100 - ldrb r0, [r0] - cmp r1, r0 - bge _080D3EA0 - b _080D3D8E -_080D3EA0: - ldr r1, =gUnknown_03001100 - ldrb r0, [r1] - cmp r0, 0x5 - bne _080D3EC8 - mov r3, r9 - lsls r5, r3, 16 - asrs r5, 16 - mov r0, r10 - lsls r4, r0, 16 - asrs r4, 16 - movs r0, 0 - adds r1, r5, 0 - adds r2, r4, 0 - bl sub_80D3EF4 - movs r0, 0x1 - adds r1, r5, 0 - adds r2, r4, 0 - bl sub_80D3EF4 -_080D3EC8: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80D3D5C - - thumb_func_start sub_80D3EF4 -sub_80D3EF4: @ 80D3EF4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - lsls r0, 24 - lsrs r0, 24 - lsls r1, 16 - lsrs r5, r1, 16 - adds r3, r5, 0 - lsls r2, 16 - lsrs r2, 16 - mov r10, r2 - cmp r0, 0 - bne _080D3F2C - mov r2, sp - ldr r1, =gUnknown_03001108 - ldrb r0, [r1, 0x5] - strb r0, [r2] - ldrb r0, [r1, 0xA] - strb r0, [r2, 0x1] - ldrb r0, [r1, 0xF] - strb r0, [r2, 0x2] - mov r8, r5 - b _080D3F4E - .pool -_080D3F2C: - cmp r0, 0x1 - beq _080D3F32 - b _080D414A -_080D3F32: - mov r2, sp - ldr r1, =gUnknown_03001108 - ldrb r0, [r1, 0x9] - strb r0, [r2] - ldrb r0, [r1, 0xE] - strb r0, [r2, 0x1] - ldrb r0, [r1, 0x13] - strb r0, [r2, 0x2] - lsls r0, r3, 16 - movs r1, 0x80 - lsls r1, 11 - adds r0, r1 - lsrs r0, 16 - mov r8, r0 -_080D3F4E: - mov r0, sp - ldrb r0, [r0] - cmp r0, 0x1 - bne _080D3FC6 - mov r1, r8 - lsls r0, r1, 16 - asrs r5, r0, 16 - mov r1, r10 - lsls r0, r1, 16 - asrs r0, 16 - adds r4, r0, 0x3 - adds r0, r5, 0 - adds r1, r4, 0 - bl MapGridGetMetatileIdAt - movs r1, 0x82 - lsls r1, 2 - cmp r0, r1 - bne _080D3F7E - adds r0, r5, 0 - adds r1, r4, 0 - movs r2, 0x1 - bl MapGridSetMetatileIdAt -_080D3F7E: - adds r0, r5, 0 - adds r1, r4, 0 - bl MapGridGetMetatileIdAt - ldr r1, =0x00000281 - cmp r0, r1 - bne _080D3F96 - ldr r2, =0x00000279 - adds r0, r5, 0 - adds r1, r4, 0 - bl MapGridSetMetatileIdAt -_080D3F96: - adds r0, r5, 0 - adds r1, r4, 0 - bl MapGridGetMetatileIdAt - ldr r1, =0x00000282 - cmp r0, r1 - bne _080D3FAE - ldr r2, =0x0000027a - adds r0, r5, 0 - adds r1, r4, 0 - bl MapGridSetMetatileIdAt -_080D3FAE: - adds r0, r5, 0 - adds r1, r4, 0 - bl MapGridGetMetatileIdAt - ldr r1, =0x00000283 - cmp r0, r1 - bne _080D3FC6 - ldr r2, =0x0000027b - adds r0, r5, 0 - adds r1, r4, 0 - bl MapGridSetMetatileIdAt -_080D3FC6: - mov r0, sp - ldrb r0, [r0, 0x1] - cmp r0, 0x1 - bne _080D40C0 - mov r0, r8 - lsls r5, r0, 16 - asrs r6, r5, 16 - mov r1, r10 - lsls r4, r1, 16 - asrs r7, r4, 16 - adds r1, r7, 0x2 - adds r0, r6, 0 - bl MapGridGetMetatileIdAt - mov r9, r4 - cmp r0, 0x15 - bne _080D4056 - adds r4, r7, 0x3 - lsls r1, r4, 16 - asrs r1, 16 - adds r0, r6, 0 - bl sub_80D3D08 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x2 - beq _080D4034 - cmp r0, 0x2 - bgt _080D4024 - cmp r0, 0x1 - beq _080D402E - b _080D4056 - .pool -_080D4024: - cmp r0, 0x3 - beq _080D403C - cmp r0, 0x4 - beq _080D404C - b _080D4056 -_080D402E: - movs r2, 0x82 - lsls r2, 2 - b _080D403E -_080D4034: - ldr r2, =0x00000281 - b _080D403E - .pool -_080D403C: - ldr r2, =0x00000282 -_080D403E: - adds r0, r6, 0 - adds r1, r4, 0 - bl MapGridSetMetatileIdAt - b _080D4056 - .pool -_080D404C: - ldr r2, =0x00000283 - adds r0, r6, 0 - adds r1, r4, 0 - bl MapGridSetMetatileIdAt -_080D4056: - asrs r5, 16 - mov r1, r9 - asrs r0, r1, 16 - adds r4, r0, 0x4 - adds r0, r5, 0 - adds r1, r4, 0 - bl MapGridGetMetatileIdAt - movs r1, 0x82 - lsls r1, 2 - cmp r0, r1 - bne _080D4078 - adds r0, r5, 0 - adds r1, r4, 0 - movs r2, 0x1 - bl MapGridSetMetatileIdAt -_080D4078: - adds r0, r5, 0 - adds r1, r4, 0 - bl MapGridGetMetatileIdAt - ldr r1, =0x00000281 - cmp r0, r1 - bne _080D4090 - ldr r2, =0x00000279 - adds r0, r5, 0 - adds r1, r4, 0 - bl MapGridSetMetatileIdAt -_080D4090: - adds r0, r5, 0 - adds r1, r4, 0 - bl MapGridGetMetatileIdAt - ldr r1, =0x00000282 - cmp r0, r1 - bne _080D40A8 - ldr r2, =0x0000027a - adds r0, r5, 0 - adds r1, r4, 0 - bl MapGridSetMetatileIdAt -_080D40A8: - adds r0, r5, 0 - adds r1, r4, 0 - bl MapGridGetMetatileIdAt - ldr r1, =0x00000283 - cmp r0, r1 - bne _080D40C0 - ldr r2, =0x0000027b - adds r0, r5, 0 - adds r1, r4, 0 - bl MapGridSetMetatileIdAt -_080D40C0: - mov r0, sp - ldrb r0, [r0, 0x2] - cmp r0, 0x1 - bne _080D414A - mov r1, r8 - lsls r0, r1, 16 - asrs r5, r0, 16 - mov r1, r10 - lsls r0, r1, 16 - asrs r4, r0, 16 - adds r1, r4, 0x3 - adds r0, r5, 0 - bl MapGridGetMetatileIdAt - cmp r0, 0x15 - bne _080D414A - adds r4, 0x4 - lsls r1, r4, 16 - asrs r1, 16 - adds r0, r5, 0 - bl sub_80D3D08 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x2 - beq _080D4128 - cmp r0, 0x2 - bgt _080D4118 - cmp r0, 0x1 - beq _080D4122 - b _080D414A - .pool -_080D4118: - cmp r0, 0x3 - beq _080D4130 - cmp r0, 0x4 - beq _080D4140 - b _080D414A -_080D4122: - movs r2, 0x82 - lsls r2, 2 - b _080D4132 -_080D4128: - ldr r2, =0x00000281 - b _080D4132 - .pool -_080D4130: - ldr r2, =0x00000282 -_080D4132: - adds r0, r5, 0 - adds r1, r4, 0 - bl MapGridSetMetatileIdAt - b _080D414A - .pool -_080D4140: - ldr r2, =0x00000283 - adds r0, r5, 0 - adds r1, r4, 0 - bl MapGridSetMetatileIdAt -_080D414A: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80D3EF4 - - thumb_func_start objc_8097BA8 -objc_8097BA8: @ 80D4160 - movs r2, 0 - movs r1, 0x8 - strh r1, [r0, 0x2E] - strh r2, [r0, 0x30] - strh r2, [r0, 0x34] - ldr r1, =objc_8097BBC - str r1, [r0, 0x1C] - bx lr - .pool - thumb_func_end objc_8097BA8 - - thumb_func_start objc_8097BBC -objc_8097BBC: @ 80D4174 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x32 - ldrsh r0, [r4, r1] - movs r2, 0x2E - ldrsh r1, [r4, r2] - bl Sin - strh r0, [r4, 0x24] - movs r1, 0x32 - ldrsh r0, [r4, r1] - movs r2, 0x2E - ldrsh r1, [r4, r2] - bl Cos - strh r0, [r4, 0x26] - ldrh r0, [r4, 0x32] - adds r0, 0x8 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x32] - ldrh r1, [r4, 0x2E] - adds r1, 0x1 - ldrh r2, [r4, 0x34] - lsls r0, r2, 16 - asrs r0, 18 - adds r1, r0 - strh r1, [r4, 0x2E] - adds r2, 0x1 - strh r2, [r4, 0x34] - ldrh r1, [r4, 0x30] - movs r2, 0x30 - ldrsh r0, [r4, r2] - cmp r0, 0x1C - beq _080D41C0 - adds r0, r1, 0x1 - strh r0, [r4, 0x30] - b _080D41C4 -_080D41C0: - ldr r0, =sub_80D41D0 - str r0, [r4, 0x1C] -_080D41C4: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end objc_8097BBC - - thumb_func_start sub_80D41D0 -sub_80D41D0: @ 80D41D0 + thumb_func_start CutGrassSpriteCallbackEnd +CutGrassSpriteCallbackEnd: @ 80D41D0 push {r4-r6,lr} movs r4, 0x1 _080D41D4: - ldr r6, =gUnknown_02039DD0 + ldr r6, =gCutGrassSpriteArrayPtr ldr r0, [r6] adds r0, r4 ldrb r1, [r0] @@ -1330,7 +52,7 @@ _080D422A: pop {r0} bx r0 .pool - thumb_func_end sub_80D41D0 + thumb_func_end CutGrassSpriteCallbackEnd thumb_func_start sub_80D423C sub_80D423C: @ 80D423C @@ -1352,7 +74,7 @@ sub_80D423C: @ 80D423C lsls r1, r4, 16 asrs r1, 16 adds r0, r5, 0 - bl sub_80D3D08 + bl GetTallGrassCaseAt lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 @@ -1471,8 +193,8 @@ _080D434A: .pool thumb_func_end sub_80D42B8 - thumb_func_start sub_80D4354 -sub_80D4354: @ 80D4354 + thumb_func_start StartCutTreeFieldEffect +StartCutTreeFieldEffect: @ 80D4354 push {lr} movs r0, 0x80 bl PlaySE @@ -1481,6 +203,6 @@ sub_80D4354: @ 80D4354 bl EnableBothScriptContexts pop {r0} bx r0 - thumb_func_end sub_80D4354 + thumb_func_end StartCutTreeFieldEffect .align 2, 0 @ Don't pad with nop. diff --git a/asm/party_menu.s b/asm/party_menu.s index 4001b71446..5c1e6c1b09 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -10199,10 +10199,10 @@ _081B5714: movs r0, 0x5 bl PlaySE _081B571A: - ldr r0, =gUnknown_03005DB0 + ldr r0, =gFieldCallback2 movs r1, 0 str r1, [r0] - ldr r0, =gUnknown_0203CEEC + ldr r0, =gPostMenuFieldCallback str r1, [r0] adds r0, r4, 0 bl sub_81B1C1C @@ -10213,8 +10213,8 @@ _081B572A: .pool thumb_func_end sub_81B56D8 - thumb_func_start FieldCallback_Teleport -FieldCallback_Teleport: @ 81B5738 + thumb_func_start FieldCallback_PrepareFadeInFromMenu +FieldCallback_PrepareFadeInFromMenu: @ 81B5738 push {lr} bl pal_fill_black ldr r0, =task_launch_hm_phase_2 @@ -10224,7 +10224,7 @@ FieldCallback_Teleport: @ 81B5738 pop {r1} bx r1 .pool - thumb_func_end FieldCallback_Teleport + thumb_func_end FieldCallback_PrepareFadeInFromMenu thumb_func_start task_launch_hm_phase_2 task_launch_hm_phase_2: @ 81B5750 @@ -10241,7 +10241,7 @@ task_launch_hm_phase_2: @ 81B5750 lsls r0, 16 lsrs r0, 16 str r0, [r1] - ldr r0, =gUnknown_0203CEEC + ldr r0, =gPostMenuFieldCallback ldr r0, [r0] bl _call_via_r0 adds r0, r4, 0 @@ -10345,10 +10345,10 @@ sub_81B5820: @ 81B5820 lsrs r0, 24 cmp r0, 0x1 bne _081B585C - ldr r1, =gUnknown_03005DB0 - ldr r0, =FieldCallback_Teleport + ldr r1, =gFieldCallback2 + ldr r0, =FieldCallback_PrepareFadeInFromMenu str r0, [r1] - ldr r1, =gUnknown_0203CEEC + ldr r1, =gPostMenuFieldCallback ldr r0, =hm_surf_run_dp02scr str r0, [r1] movs r0, 0x1 @@ -10463,10 +10463,10 @@ hm_prepare_waterfall: @ 81B58F0 lsrs r0, 24 cmp r0, 0x1 bne _081B594C - ldr r1, =gUnknown_03005DB0 - ldr r0, =FieldCallback_Teleport + ldr r1, =gFieldCallback2 + ldr r0, =FieldCallback_PrepareFadeInFromMenu str r0, [r1] - ldr r1, =gUnknown_0203CEEC + ldr r1, =gPostMenuFieldCallback ldr r0, =hm2_waterfall str r0, [r1] movs r0, 0x1 @@ -10510,10 +10510,10 @@ sub_81B5974: @ 81B5974 b _081B599E .pool _081B5990: - ldr r1, =gUnknown_03005DB0 - ldr r0, =FieldCallback_Teleport + ldr r1, =gFieldCallback2 + ldr r0, =FieldCallback_PrepareFadeInFromMenu str r0, [r1] - ldr r1, =gUnknown_0203CEEC + ldr r1, =gPostMenuFieldCallback ldr r0, =sub_81B5958 str r0, [r1] movs r0, 0x1 @@ -17276,7 +17276,7 @@ sub_81B9354: @ 81B9354 sub sp, 0xC lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_03005DB0 + ldr r2, =gFieldCallback2 ldr r1, =hm_add_c3_without_phase_2 str r1, [r2] movs r1, 0 @@ -17308,7 +17308,7 @@ sub_81B9390: @ 81B9390 movs r0, 0xFF strh r0, [r4] _081B93A6: - ldr r0, =gUnknown_03005DB0 + ldr r0, =gFieldCallback2 ldr r1, =hm_add_c3_without_phase_2 str r1, [r0] ldr r0, =CB2_ReturnToField @@ -17417,7 +17417,7 @@ _081B9486: ldr r1, =gSpecialVar_0x8004 ldrb r0, [r2] strh r0, [r1] - ldr r1, =gUnknown_03005DB0 + ldr r1, =gFieldCallback2 ldr r0, =hm_add_c3_without_phase_2 str r0, [r1] ldr r0, =CB2_ReturnToField @@ -17553,7 +17553,7 @@ _081B95A4: lsrs r0, 24 strh r0, [r4] _081B95BA: - ldr r0, =gUnknown_03005DB0 + ldr r0, =gFieldCallback2 ldr r1, =hm_add_c3_without_phase_2 str r1, [r0] ldr r0, =CB2_ReturnToField diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index c7f2ad0859..d758aa3141 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -2070,7 +2070,7 @@ sub_81C4F44: @ 81C4F44 cmp r0, 0 bne _081C4F6E bl overworld_free_bg_tilemaps - ldr r0, =gUnknown_03005DB0 + ldr r0, =gFieldCallback2 ldr r1, =hm_add_c3_without_phase_2 str r1, [r0] ldr r1, =CB2_ReturnToField diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h index 3d4303189e..b226b066af 100755 --- a/src/data/field_event_obj/event_object_graphics.h +++ b/src/data/field_event_obj/event_object_graphics.h @@ -1376,7 +1376,9 @@ const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/event_objec const u32 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_medium.4bpp"); const u32 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_large.4bpp"); const u32 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_extra_large.4bpp"); -const u32 gUnknown_084F6D38[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_4F6D38/0.4bpp"); +const u32 filler_8368A08[0x48] = {}; +const u8 gFieldEffectPic_CutGrass[] = INCBIN_U8("graphics/event_objects/pics/effects/cut_grass.4bpp"); +const u32 gFieldEffectPic_CutGrass_Copy[] = INCBIN_U32("graphics/event_objects/pics/effects/cut_grass.4bpp"); const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_06.gbapal"); const u32 gFieldEffectObjectPic_Ripple_0[] = INCBIN_U32("graphics/event_objects/pics/effects/ripple/0.4bpp"); const u32 gFieldEffectObjectPic_Ripple_1[] = INCBIN_U32("graphics/event_objects/pics/effects/ripple/1.4bpp"); diff --git a/src/field_tasks.c b/src/field_tasks.c index d9c3078dae..59990f22eb 100644 --- a/src/field_tasks.c +++ b/src/field_tasks.c @@ -623,7 +623,7 @@ static void PerStepCallback_8069F64(u8 taskId) { data[1] = x; data[2] = y; - if (MetatileBehavior_IsAsh(MapGridGetMetatileBehaviorAt(x, y))) + if (MetatileBehavior_IsAshGrass(MapGridGetMetatileBehaviorAt(x, y))) { if (MapGridGetMetatileIdAt(x, y) == 0x20a) { diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 9929dd6f96..a007c8ca74 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -1,19 +1,613 @@ - -// Includes #include "global.h" +#include "field_camera.h" +#include "field_effect.h" +#include "event_object_movement.h" +#include "field_player_avatar.h" +#include "fieldmap.h" +#include "event_obj_lock.h" +#include "metatile_behavior.h" +#include "party_menu.h" +#include "overworld.h" +#include "script.h" +#include "sound.h" +#include "sprite.h" +#include "task.h" +#include "trig.h" +#include "malloc.h" +#include "constants/event_objects.h" +#include "constants/songs.h" +#include "constants/abilities.h" -// Static type declarations +// tileset 0 as first +#define METATILE_ID_GRASS 0x1 +#define METATILE_ID_POKE_GRASS 0xD -// Static RAM declarations +#define METATILE_ID_POKE_GRASS_TREE_UP 0x25 +#define METATILE_ID_GRASS_TREE_UP 0xE + +#define METATILE_ID_POKE_GRASS_TREE_LEFT 0x1C6 +#define METATILE_ID_POKE_GRASS_TREE_RIGHT 0x1C7 + +#define METATILE_ID_GRASS_TREE_LEFT 0x1CE +#define METATILE_ID_GRASS_TREE_RIGHT 0x1CF + +#define METATILE_ID_POKE_TALL_GRASS 0x15 + +// tileset 6 as second +#define METATILE_ID_POKE_STEP_LAVA_GRASS 0x206 +#define METATILE_ID_POKE_LAVA_GRASS 0x207 +#define METATILE_ID_LAVA_FIELD 0x271 + +// tileset 7 as second +#define METATILE_ID_POKE_ASH_GRASS 0x20A +#define METATILE_ID_POKE_STEP_ASH_GRASS 0x212 +#define METATILE_ID_ASH 0x218 + +// tileset 8 as second +#define METATILE_ID_POKE_TALL_GRASS_START 0x208 + +#define METATILE_ID_SECRET_BASE_LEFT_TALL_GRASS 0x279 +#define METATILE_ID_SECRET_BASE_CENTER_TALL_GRASS 0x27A +#define METATILE_ID_SECRET_BASE_RIGHT_TALL_GRASS 0x27B + +#define METATILE_ID_SECRET_BASE_LEFT_POKE_TALL_GRASS 0x281 +#define METATILE_ID_SECRET_BASE_CENTER_POKE_TALL_GRASS 0x282 +#define METATILE_ID_SECRET_BASE_RIGHT_POKE_TALL_GRASS 0x283 + +extern bool8 SetLastTalkedObjectInFrontOfPlayer(u8); +extern u8 oei_task_add(void); + +extern struct MapPosition gPlayerFacingPosition; +extern u8 *gCutGrassSpriteArrayPtr; + +extern const u8 Route103_EventScript_290705[]; +extern const u8 gFieldEffectPic_CutGrass[]; +extern const u16 gFieldEffectObjectPalette6[]; + +#define CUT_NORMAL_SIDE 3 +#define CUT_NORMAL_AREA CUT_NORMAL_SIDE * CUT_NORMAL_SIDE +/* P - player + X - cut area + + XXX + XPX + XXX +*/ + +#define CUT_HYPER_SIDE 5 +#define CUT_HYPER_AREA CUT_HYPER_SIDE * CUT_HYPER_SIDE +/* P - player + X - cut area + + XXXXX + XXXXX + XXPXX + XXXXX + XXXXX +*/ IWRAM_DATA u8 gUnknown_03001100; IWRAM_DATA u8 gUnknown_03001101; IWRAM_DATA u8 gUnknown_03001102; IWRAM_DATA u32 fldeff_cut_unused_03001104; -IWRAM_DATA u8 gUnknown_03001108[25]; +IWRAM_DATA bool8 gUnknown_03001108[CUT_HYPER_AREA]; -// Static ROM declarations +struct HyperCutterUnk +{ + s8 x; + s8 y; + u8 unk2[2]; +}; -// .rodata +const struct HyperCutterUnk gUnknown_0857C608[] = +{ + {-2, -2, {1}}, + {-1, -2, {1}}, + {0, -2, {2}}, + {1, -2, {3}}, + {2, -2, {3}}, + {-2, -1, {1}}, + {2, -1, {3}}, + {-2, 0, {4}}, + {2, 0, {6}}, + {-2, 1, {7}}, + {2, 1, {9}}, + {-2, 2, {7}}, + {-1, 2, {7}}, + {0, 2, {8}}, + {1, 2, {9}}, + {2, 2, {9}}, +}; -// .text +const struct OamData gOamData_CutGrass = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 1, + .priority = 1, + .paletteNum = 1, + .affineParam = 0, +}; + +const union AnimCmd gSpriteAnim_CutGrass[] = +{ + ANIMCMD_FRAME(0, 30), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd *const gSpriteAnimTable_CutGrass[] = +{ + gSpriteAnim_CutGrass, +}; + +const struct SpriteFrameImage gSpriteImageTable_CutGrass[] = +{ + {gFieldEffectPic_CutGrass, 0x20}, +}; + +const struct SpritePalette gFieldEffectObjectPaletteInfo6 = {gFieldEffectObjectPalette6, 0x1000}; + +void FieldCallback_CutTree(void); +void FieldCallback_CutGrass(void); +void StartCutTreeFieldEffect(void); +void StartCutGrassFieldEffect(void); +void SetCutGrassMetatile(s16, s16); +void SetCutGrassMetatiles(s16, s16); +void CutGrassSpriteCallback1(struct Sprite *); +void CutGrassSpriteCallback2(struct Sprite *); +void CutGrassSpriteCallbackEnd(struct Sprite *); +void HandleTallGrassOnHyper(u8, s16, s16); + +const struct SpriteTemplate gSpriteTemplate_CutGrass = +{ + .tileTag = 0xFFFF, + .paletteTag = 0x1000, + .oam = &gOamData_CutGrass, + .anims = gSpriteAnimTable_CutGrass, + .images = gSpriteImageTable_CutGrass, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = CutGrassSpriteCallback1, +}; + +bool8 SetUpFieldMove_Cut(void) +{ + s16 x, y; + u8 i, j; + u8 tileBehavior; + u8 userAbility; + bool8 array[CUT_NORMAL_AREA]; + bool8 ret; + + if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_CUTTABLE_TREE) == TRUE) + { + // Standing in front of cuttable tree. + gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; + gPostMenuFieldCallback = FieldCallback_CutTree; + return TRUE; + } + else + { + PlayerGetDestCoords(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y); + userAbility = GetMonAbility(&gPlayerParty[GetCursorSelectionMonId()]); + if (userAbility == ABILITY_HYPER_CUTTER) + { + gUnknown_03001100 = 5; + gUnknown_03001101 = 2; + gUnknown_03001102 = 2; + } + else + { + gUnknown_03001100 = 3; + gUnknown_03001101 = 1; + gUnknown_03001102 = 1; + } + + for (i = 0; i < CUT_NORMAL_AREA; i++) + array[i] = FALSE; + for (i = 0; i < CUT_HYPER_AREA; i++) + gUnknown_03001108[i] = FALSE; + + ret = FALSE; + + for (i = 0; i < 3; i++) + { + y = i - 1 + gPlayerFacingPosition.y; + for (j = 0; j < 3; j++) + { + x = j - 1 + gPlayerFacingPosition.x; + if (MapGridGetZCoordAt(x, y) == gPlayerFacingPosition.height) + { + tileBehavior = MapGridGetMetatileBehaviorAt(x, y); + if (MetatileBehavior_IsPokeGrass(tileBehavior) == TRUE + || MetatileBehavior_IsAshGrass(tileBehavior) == TRUE) + { + // Standing in front of grass. + gUnknown_03001108[6 + (i * 5) + j] = TRUE; + ret = TRUE; + } + if (MapGridIsImpassableAt(x, y) == TRUE) + { + array[i * 3 + j] = FALSE; + } + else + { + array[i * 3 + j] = TRUE; + if (MetatileBehavior_IsCuttableGrass(tileBehavior) == TRUE) + gUnknown_03001108[6 + (i * 5) + j] = TRUE; + } + } + else + { + array[i * 3 + j] = FALSE; + } + } + } + + if (userAbility != ABILITY_HYPER_CUTTER) + { + if (ret == TRUE) + { + gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; + gPostMenuFieldCallback = FieldCallback_CutGrass; + } + } + else + { + bool8 r7; + for (i = 0; i < 16; i++) + { + x = gPlayerFacingPosition.x + gUnknown_0857C608[i].x; + y = gPlayerFacingPosition.y + gUnknown_0857C608[i].y; + r7 = TRUE; + + j = 0; + while (1) + { + if (gUnknown_0857C608[i].unk2[j] == 0) + break; + if (array[(u8)(gUnknown_0857C608[i].unk2[j] - 1)] == FALSE) + { + r7 = FALSE; + break; + } + if (++j >= 2) + break; + } + + if (r7 == TRUE) + { + if (MapGridGetZCoordAt(x, y) == gPlayerFacingPosition.height) + { + u8 r6 = ((gUnknown_0857C608[i].y * 5) + 12) + (gUnknown_0857C608[i].x); + tileBehavior = MapGridGetMetatileBehaviorAt(x, y); + if (MetatileBehavior_IsPokeGrass(tileBehavior) == TRUE + || MetatileBehavior_IsAshGrass(tileBehavior) == TRUE) + { + gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; + gPostMenuFieldCallback = FieldCallback_CutGrass; + gUnknown_03001108[r6] = r7; + ret = TRUE; + } + else + { + if (MetatileBehavior_IsCuttableGrass(tileBehavior) == TRUE) + gUnknown_03001108[r6] = TRUE; + } + } + } + } + + if (ret == TRUE) + { + gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; + gPostMenuFieldCallback = FieldCallback_CutGrass; + } + } + + return ret; + } +} + +void FieldCallback_CutGrass(void) +{ + FieldEffectStart(FLDEFF_USE_CUT_ON_GRASS); + gFieldEffectArguments[0] = GetCursorSelectionMonId(); +} + +bool8 FldEff_UseCutOnGrass(void) +{ + u8 taskId = oei_task_add(); + + gTasks[taskId].data[8] = (u32)StartCutGrassFieldEffect >> 16; + gTasks[taskId].data[9] = (u32)StartCutGrassFieldEffect; + IncrementGameStat(GAME_STAT_USED_CUT); + return FALSE; +} + +void FieldCallback_CutTree(void) +{ + gFieldEffectArguments[0] = GetCursorSelectionMonId(); + ScriptContext1_SetupScript(Route103_EventScript_290705); +} + +bool8 FldEff_UseCutOnTree(void) +{ + u8 taskId = oei_task_add(); + + gTasks[taskId].data[8] = (u32)StartCutTreeFieldEffect >> 16; + gTasks[taskId].data[9] = (u32)StartCutTreeFieldEffect; + IncrementGameStat(GAME_STAT_USED_CUT); + return FALSE; +} + +void StartCutGrassFieldEffect(void) +{ + FieldEffectActiveListRemove(FLDEFF_USE_CUT_ON_GRASS); + FieldEffectStart(FLDEFF_CUT_GRASS); +} + +bool8 FldEff_CutGrass(void) +{ + s16 x, y; + u8 tileBehavior; + u8 i; + + for (i = 0, PlaySE(SE_W015), PlayerGetDestCoords(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y); i < 25; i++) + { + if (gUnknown_03001108[i] == TRUE) + { + s8 xAdd = (i % 5) - 2; + s8 yAdd = (i / 5) - 2; + + x = xAdd + gPlayerFacingPosition.x; + y = yAdd + gPlayerFacingPosition.y; + + SetCutGrassMetatile(x, y); + sub_808E75C(x, y); + } + } + + SetCutGrassMetatiles(gPlayerFacingPosition.x - gUnknown_03001101, gPlayerFacingPosition.y + (~gUnknown_03001102)); + DrawWholeMapView(); + gCutGrassSpriteArrayPtr = AllocZeroed(8); + + // populate sprite ID array + for (i = 0; i < 8; i++) + { + gCutGrassSpriteArrayPtr[i] = CreateSprite(&gSpriteTemplate_CutGrass, + gSprites[gPlayerAvatar.spriteId].oam.x + 8, gSprites[gPlayerAvatar.spriteId].oam.y + 20, 0); + gSprites[gCutGrassSpriteArrayPtr[i]].data[2] = 32 * i; + } + + return FALSE; +} + +// set map grid metatile depending on x, y +void SetCutGrassMetatile(s16 x, s16 y) +{ + s32 metatileId = MapGridGetMetatileIdAt(x, y); + + switch (metatileId) + { + case METATILE_ID_POKE_TALL_GRASS_START: + case METATILE_ID_POKE_TALL_GRASS: + case METATILE_ID_POKE_GRASS: + MapGridSetMetatileIdAt(x, y, METATILE_ID_GRASS); + break; + case METATILE_ID_POKE_GRASS_TREE_LEFT: + MapGridSetMetatileIdAt(x, y, METATILE_ID_GRASS_TREE_LEFT); + break; + case METATILE_ID_POKE_GRASS_TREE_RIGHT: + MapGridSetMetatileIdAt(x, y, METATILE_ID_GRASS_TREE_RIGHT); + break; + case METATILE_ID_SECRET_BASE_LEFT_POKE_TALL_GRASS: + MapGridSetMetatileIdAt(x, y, METATILE_ID_SECRET_BASE_LEFT_TALL_GRASS); + break; + case METATILE_ID_SECRET_BASE_CENTER_POKE_TALL_GRASS: + MapGridSetMetatileIdAt(x, y, METATILE_ID_SECRET_BASE_CENTER_TALL_GRASS); + break; + case METATILE_ID_SECRET_BASE_RIGHT_POKE_TALL_GRASS: + MapGridSetMetatileIdAt(x, y, METATILE_ID_SECRET_BASE_RIGHT_TALL_GRASS); + break; + case METATILE_ID_POKE_STEP_LAVA_GRASS: + case METATILE_ID_POKE_LAVA_GRASS: + MapGridSetMetatileIdAt(x, y, METATILE_ID_LAVA_FIELD); + break; + case METATILE_ID_POKE_STEP_ASH_GRASS: + case METATILE_ID_POKE_ASH_GRASS: + MapGridSetMetatileIdAt(x, y, METATILE_ID_ASH); + break; + case METATILE_ID_POKE_GRASS_TREE_UP: + MapGridSetMetatileIdAt(x, y, METATILE_ID_GRASS_TREE_UP); + break; + } +} + +enum +{ + TALL_GRASS_NONE, + TALL_GRASS_FIELD, + TALL_GRASS_BASE_LEFT, + TALL_GRASS_BASE_CENTER, + TALL_GRASS_BASE_RIGHT +}; + +u8 GetTallGrassCaseAt(s16 x, s16 y) +{ + u16 metatileId = MapGridGetMetatileIdAt(x, y); + + if (metatileId == METATILE_ID_GRASS) + return TALL_GRASS_FIELD; + else if (metatileId == METATILE_ID_SECRET_BASE_LEFT_TALL_GRASS) + return TALL_GRASS_BASE_LEFT; + else if (metatileId == METATILE_ID_SECRET_BASE_CENTER_TALL_GRASS) + return TALL_GRASS_BASE_CENTER; + else if (metatileId == METATILE_ID_SECRET_BASE_RIGHT_TALL_GRASS) + return TALL_GRASS_BASE_RIGHT; + else + return TALL_GRASS_NONE; +} + +void SetCutGrassMetatiles(s16 x, s16 y) +{ + s16 i; + s16 lowerY = y + gUnknown_03001100; + + for (i = 0; i < gUnknown_03001100; i++) + { + s16 currentX = x + i; + if (MapGridGetMetatileIdAt(currentX, y) == METATILE_ID_POKE_TALL_GRASS) + { + switch (GetTallGrassCaseAt(currentX, y + 1)) + { + case TALL_GRASS_FIELD: + MapGridSetMetatileIdAt(currentX, y + 1, METATILE_ID_POKE_TALL_GRASS_START); + break; + case TALL_GRASS_BASE_LEFT: + MapGridSetMetatileIdAt(currentX, y + 1, METATILE_ID_SECRET_BASE_LEFT_POKE_TALL_GRASS); + break; + case TALL_GRASS_BASE_CENTER: + MapGridSetMetatileIdAt(currentX, y + 1, METATILE_ID_SECRET_BASE_CENTER_POKE_TALL_GRASS); + break; + case TALL_GRASS_BASE_RIGHT: + MapGridSetMetatileIdAt(currentX, y + 1, METATILE_ID_SECRET_BASE_RIGHT_POKE_TALL_GRASS); + break; + } + } + if (MapGridGetMetatileIdAt(currentX, lowerY) == METATILE_ID_GRASS) + { + if (MapGridGetMetatileIdAt(currentX, lowerY + 1) == METATILE_ID_POKE_TALL_GRASS_START) + MapGridSetMetatileIdAt(currentX, lowerY + 1, METATILE_ID_GRASS); + if (MapGridGetMetatileIdAt(currentX, lowerY + 1) == METATILE_ID_SECRET_BASE_LEFT_POKE_TALL_GRASS) + MapGridSetMetatileIdAt(currentX, lowerY + 1, METATILE_ID_SECRET_BASE_LEFT_TALL_GRASS); + if (MapGridGetMetatileIdAt(currentX, lowerY + 1) == METATILE_ID_SECRET_BASE_CENTER_POKE_TALL_GRASS) + MapGridSetMetatileIdAt(currentX, lowerY + 1, METATILE_ID_SECRET_BASE_CENTER_TALL_GRASS); + if (MapGridGetMetatileIdAt(currentX, lowerY + 1) == METATILE_ID_SECRET_BASE_RIGHT_POKE_TALL_GRASS) + MapGridSetMetatileIdAt(currentX, lowerY + 1, METATILE_ID_SECRET_BASE_RIGHT_TALL_GRASS); + } + } + + if (gUnknown_03001100 == CUT_HYPER_SIDE) + { + HandleTallGrassOnHyper(0, x, y); + HandleTallGrassOnHyper(1, x, y); + } +} + +void HandleTallGrassOnHyper(u8 caseId, s16 x, s16 y) +{ + s16 newX; + bool8 arr[3]; + + if (caseId == 0) + { + arr[0] = gUnknown_03001108[5]; + arr[1] = gUnknown_03001108[10]; + arr[2] = gUnknown_03001108[15]; + newX = x; + } + else if (caseId == 1) + { + arr[0] = gUnknown_03001108[9]; + arr[1] = gUnknown_03001108[14]; + arr[2] = gUnknown_03001108[19]; + newX = x + 4; + } + else // invalid case + { + return; + } + + if (arr[0] == TRUE) + { + if (MapGridGetMetatileIdAt(newX, y + 3) == METATILE_ID_POKE_TALL_GRASS_START) + MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID_GRASS); + if (MapGridGetMetatileIdAt(newX, y + 3) == METATILE_ID_SECRET_BASE_LEFT_POKE_TALL_GRASS) + MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID_SECRET_BASE_LEFT_TALL_GRASS); + if (MapGridGetMetatileIdAt(newX, y + 3) == METATILE_ID_SECRET_BASE_CENTER_POKE_TALL_GRASS) + MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID_SECRET_BASE_CENTER_TALL_GRASS); + if (MapGridGetMetatileIdAt(newX, y + 3) == METATILE_ID_SECRET_BASE_RIGHT_POKE_TALL_GRASS) + MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID_SECRET_BASE_RIGHT_TALL_GRASS); + } + if (arr[1] == TRUE) + { + if (MapGridGetMetatileIdAt(newX, y + 2) == METATILE_ID_POKE_TALL_GRASS) + { + switch (GetTallGrassCaseAt(newX, y + 3)) + { + case TALL_GRASS_FIELD: + MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID_POKE_TALL_GRASS_START); + break; + case TALL_GRASS_BASE_LEFT: + MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID_SECRET_BASE_LEFT_POKE_TALL_GRASS); + break; + case TALL_GRASS_BASE_CENTER: + MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID_SECRET_BASE_CENTER_POKE_TALL_GRASS); + break; + case TALL_GRASS_BASE_RIGHT: + MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID_SECRET_BASE_RIGHT_POKE_TALL_GRASS); + break; + } + } + + if (MapGridGetMetatileIdAt(newX, y + 4) == METATILE_ID_POKE_TALL_GRASS_START) + MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID_GRASS); + if (MapGridGetMetatileIdAt(newX, y + 4) == METATILE_ID_SECRET_BASE_LEFT_POKE_TALL_GRASS) + MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID_SECRET_BASE_LEFT_TALL_GRASS); + if (MapGridGetMetatileIdAt(newX, y + 4) == METATILE_ID_SECRET_BASE_CENTER_POKE_TALL_GRASS) + MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID_SECRET_BASE_CENTER_TALL_GRASS); + if (MapGridGetMetatileIdAt(newX, y + 4) == METATILE_ID_SECRET_BASE_RIGHT_POKE_TALL_GRASS) + MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID_SECRET_BASE_RIGHT_TALL_GRASS); + } + if (arr[2] == TRUE) + { + if (MapGridGetMetatileIdAt(newX, y + 3) == METATILE_ID_POKE_TALL_GRASS) + { + switch (GetTallGrassCaseAt(newX, y + 4)) + { + case TALL_GRASS_FIELD: + MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID_POKE_TALL_GRASS_START); + break; + case TALL_GRASS_BASE_LEFT: + MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID_SECRET_BASE_LEFT_POKE_TALL_GRASS); + break; + case TALL_GRASS_BASE_CENTER: + MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID_SECRET_BASE_CENTER_POKE_TALL_GRASS); + break; + case TALL_GRASS_BASE_RIGHT: + MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID_SECRET_BASE_RIGHT_POKE_TALL_GRASS); + break; + } + } + } +} + +void CutGrassSpriteCallback1(struct Sprite *sprite) +{ + sprite->data[0] = 8; + sprite->data[1] = 0; + sprite->data[3] = 0; + sprite->callback = CutGrassSpriteCallback2; +} + +void CutGrassSpriteCallback2(struct Sprite *sprite) +{ + sprite->pos2.x = Sin(sprite->data[2], sprite->data[0]); + sprite->pos2.y = Cos(sprite->data[2], sprite->data[0]); + + sprite->data[2] = (sprite->data[2] + 8) & 0xFF; + sprite->data[0] += 1 + (sprite->data[3] >> 2); // right shift by 2 is dividing by 4 + sprite->data[3]++; + + if (sprite->data[1] != 28) + sprite->data[1]++; + else + sprite->callback = CutGrassSpriteCallbackEnd; // done rotating the grass, execute clean up function +} diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index 4f3a091ce5..654f02c232 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -78,14 +78,14 @@ bool8 SetUpFieldMove_Flash(void) if (ShouldDoBrailleFlyEffect()) { gSpecialVar_Result = GetCursorSelectionMonId(); - gUnknown_03005DB0 = FieldCallback_Teleport; - gUnknown_0203CEEC = sub_8179918; + gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; + gPostMenuFieldCallback = sub_8179918; return TRUE; } else if (gMapHeader.cave == TRUE && !FlagGet(FLAG_SYS_USE_FLASH)) { - gUnknown_03005DB0 = FieldCallback_Teleport; - gUnknown_0203CEEC = hm2_flash; + gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; + gPostMenuFieldCallback = hm2_flash; return TRUE; } diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index 162479c734..52b76edb44 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -14,11 +14,11 @@ static void sub_8145E74(void); // text bool8 SetUpFieldMove_Strength(void) { - if (npc_before_player_of_type(87) == TRUE) + if (SetLastTalkedObjectInFrontOfPlayer(87) == TRUE) { gSpecialVar_Result = GetCursorSelectionMonId(); - gUnknown_03005DB0 = FieldCallback_Teleport; - gUnknown_0203CEEC = FldEff_UseStrength; + gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; + gPostMenuFieldCallback = FldEff_UseStrength; return TRUE; } return FALSE; diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c index 100e440a53..14da87eb33 100644 --- a/src/fldeff_sweetscent.c +++ b/src/fldeff_sweetscent.c @@ -24,8 +24,8 @@ void sub_81BE72C(void); bool8 SetUpFieldMove_SweetScent(void) { - gUnknown_03005DB0 = FieldCallback_Teleport; - gUnknown_0203CEEC = hm2_sweet_scent; + gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; + gPostMenuFieldCallback = hm2_sweet_scent; return TRUE; } diff --git a/src/fldeff_teleport.c b/src/fldeff_teleport.c index 1b88b42d71..e82a26cd11 100644 --- a/src/fldeff_teleport.c +++ b/src/fldeff_teleport.c @@ -11,8 +11,8 @@ bool8 SetUpFieldMove_Teleport(void) { if (Overworld_MapTypeAllowsTeleportAndFly(gMapHeader.mapType) == TRUE) { - gUnknown_03005DB0 = FieldCallback_Teleport; - gUnknown_0203CEEC = hm_teleport_run_dp02scr; + gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; + gPostMenuFieldCallback = hm_teleport_run_dp02scr; return TRUE; } return FALSE; diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c index ad0062c206..a5e328e4a9 100644 --- a/src/metatile_behavior.c +++ b/src/metatile_behavior.c @@ -846,7 +846,7 @@ bool8 MetatileBehavior_IsBerryTreeSoil(u8 var) return FALSE; } -bool8 MetatileBehavior_IsAsh(u8 var) +bool8 MetatileBehavior_IsAshGrass(u8 var) { if (var == MB_ASHGRASS) return TRUE; diff --git a/src/overworld.c b/src/overworld.c index 1e41160536..99670dfe2d 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -88,7 +88,7 @@ extern const u16 gUnknown_82EC7C4[]; u16 gUnknown_03005DA8; MainCallback gFieldCallback; -bool8 (*gUnknown_03005DB0)(void); +bool8 (*gFieldCallback2)(void); u8 gUnknown_03005DB4; u8 gFieldLinkPlayerCount; @@ -1518,15 +1518,15 @@ void sub_8085E94(void *a0) static bool8 map_post_load_hook_exec(void) { - if (gUnknown_03005DB0 != NULL) + if (gFieldCallback2 != NULL) { - if (!gUnknown_03005DB0()) + if (!gFieldCallback2()) { return FALSE; } else { - gUnknown_03005DB0 = NULL; + gFieldCallback2 = NULL; gFieldCallback = NULL; } } @@ -1554,7 +1554,7 @@ void CB2_NewGame(void) ScriptContext1_Init(); ScriptContext2_Disable(); gFieldCallback = ExecuteTruckSequence; - gUnknown_03005DB0 = NULL; + gFieldCallback2 = NULL; do_load_map_stuff_loop(&gMain.state); SetFieldVBlankCallback(); SetMainCallback1(CB1_Overworld); @@ -1684,7 +1684,7 @@ void c2_8056854(void) void CB2_ReturnToFieldWithOpenMenu(void) { FieldClearVBlankHBlankCallbacks(); - gUnknown_03005DB0 = sub_80AF6A4; + gFieldCallback2 = sub_80AF6A4; CB2_ReturnToField(); } diff --git a/src/rom6.c b/src/rom6.c index cdc1064ddf..cec2cfcb69 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -27,16 +27,16 @@ static void hm2_dig(void); static void sub_8135780(void); // extern RAM loc -extern struct MapPosition gUnknown_0203AB40; +extern struct MapPosition gPlayerFacingPosition; // text -bool8 npc_before_player_of_type(u8 a) +bool8 SetLastTalkedObjectInFrontOfPlayer(u8 a) { u8 eventObjId; - GetXYCoordsOneStepInFrontOfPlayer(&gUnknown_0203AB40.x, &gUnknown_0203AB40.y); - gUnknown_0203AB40.height = PlayerGetZCoord(); - eventObjId = GetEventObjectIdByXYZ(gUnknown_0203AB40.x, gUnknown_0203AB40.y, gUnknown_0203AB40.height); + GetXYCoordsOneStepInFrontOfPlayer(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y); + gPlayerFacingPosition.height = PlayerGetZCoord(); + eventObjId = GetEventObjectIdByXYZ(gPlayerFacingPosition.x, gPlayerFacingPosition.y, gPlayerFacingPosition.height); if (gEventObjects[eventObjId].graphicsId != a) { return FALSE; @@ -50,7 +50,7 @@ bool8 npc_before_player_of_type(u8 a) u8 oei_task_add(void) { - GetXYCoordsOneStepInFrontOfPlayer(&gUnknown_0203AB40.x, &gUnknown_0203AB40.y); + GetXYCoordsOneStepInFrontOfPlayer(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y); return CreateTask(task08_080C9820, 8); } @@ -121,14 +121,14 @@ bool8 SetUpFieldMove_RockSmash(void) if(ShouldDoBrailleStrengthEffect()) { gSpecialVar_Result = GetCursorSelectionMonId(); - gUnknown_03005DB0 = FieldCallback_Teleport; - gUnknown_0203CEEC = sub_8179834; + gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; + gPostMenuFieldCallback = sub_8179834; return TRUE; } - else if (npc_before_player_of_type(0x56) == TRUE) + else if (SetLastTalkedObjectInFrontOfPlayer(0x56) == TRUE) { - gUnknown_03005DB0 = FieldCallback_Teleport; - gUnknown_0203CEEC = sub_81356C4; + gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; + gPostMenuFieldCallback = sub_81356C4; return TRUE; } else @@ -164,8 +164,8 @@ bool8 SetUpFieldMove_Dig(void) { if (CanUseEscapeRopeOnCurrMap() == TRUE) { - gUnknown_03005DB0 = FieldCallback_Teleport; - gUnknown_0203CEEC = hm2_dig; + gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; + gPostMenuFieldCallback = hm2_dig; return TRUE; } else diff --git a/src/start_menu.c b/src/start_menu.c index 7080ae6a83..6371acff0d 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -530,7 +530,7 @@ void sub_809FA18(void) // Called from field_screen.s { sUnknown_02037619[0] = 0; sUnknown_02037619[1] = 0; - gUnknown_03005DB0 = sub_809FA00; + gFieldCallback2 = sub_809FA00; } void sub_809FA34(u8 taskId) // Referenced in field_screen.s and rom_8011DC0.s From 3bcd30969a8b7ced6e9fa54e1fc0f8447c2983bc Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 16 Jun 2018 14:04:29 +0200 Subject: [PATCH 18/55] cut field effect is decompiled and documented --- asm/field_screen.s | 2 +- asm/fldeff_cut.s | 208 -------- asm/pokenav.s | 6 +- common_syms/overworld.txt | 2 +- data/field_effect_scripts.s | 6 +- data/fldeff_cut.s | 32 -- data/party_menu.s | 2 +- .../event_objects/pics/effects/cut_grass.png | Bin 0 -> 160 bytes .../pics/effects/unknown_4F6D38/0.png | Bin 130 -> 0 bytes include/field_effect.h | 4 +- include/fldeff_cut.h | 10 +- include/global.h | 2 +- include/metatile_behavior.h | 2 +- include/party_menu.h | 2 +- include/rom6.h | 2 +- ld_script.txt | 4 +- src/event_obj_lock.c | 2 +- src/fldeff_cut.c | 443 ++++++++++-------- src/item_use.c | 8 +- src/start_menu.c | 10 +- sym_ewram.txt | 9 +- 21 files changed, 295 insertions(+), 461 deletions(-) delete mode 100644 asm/fldeff_cut.s delete mode 100644 data/fldeff_cut.s create mode 100644 graphics/event_objects/pics/effects/cut_grass.png delete mode 100644 graphics/event_objects/pics/effects/unknown_4F6D38/0.png diff --git a/asm/field_screen.s b/asm/field_screen.s index 08eaf949a6..27627ac587 100644 --- a/asm/field_screen.s +++ b/asm/field_screen.s @@ -8656,7 +8656,7 @@ task_mpl_807E3C8: @ 80AF6B0 bl ScriptContext2_Disable adds r0, r4, 0 bl DestroyTask - bl sub_80984F4 + bl ScriptUnfreezeEventObjects _080AF6CC: pop {r4} pop {r0} diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s deleted file mode 100644 index fa7ac73212..0000000000 --- a/asm/fldeff_cut.s +++ /dev/null @@ -1,208 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - - thumb_func_start CutGrassSpriteCallbackEnd -CutGrassSpriteCallbackEnd: @ 80D41D0 - push {r4-r6,lr} - movs r4, 0x1 -_080D41D4: - ldr r6, =gCutGrassSpriteArrayPtr - ldr r0, [r6] - adds r0, r4 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r5, =gSprites - adds r0, r5 - bl DestroySprite - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x7 - bls _080D41D4 - ldr r0, [r6] - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - movs r1, 0x3A - bl FieldEffectStop - ldr r0, [r6] - bl Free - movs r0, 0 - str r0, [r6] - bl sub_80984F4 - bl ScriptContext2_Disable - bl unown_chamber_related - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080D422A - ldr r0, =FarawayIsland_Interior_EventScript_267EDB - bl ScriptContext1_SetupScript -_080D422A: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end CutGrassSpriteCallbackEnd - - thumb_func_start sub_80D423C -sub_80D423C: @ 80D423C - push {r4,r5,lr} - lsls r0, 16 - asrs r5, r0, 16 - lsls r1, 16 - asrs r4, r1, 16 - adds r0, r5, 0 - adds r1, r4, 0 - bl MapGridGetMetatileBehaviorAt - lsls r0, 24 - lsrs r0, 24 - bl MetatileBehavior_IsLongGrass_Duplicate - lsls r0, 24 - cmp r0, 0 - beq _080D42AE - adds r4, 0x1 - lsls r1, r4, 16 - asrs r1, 16 - adds r0, r5, 0 - bl GetTallGrassCaseAt - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x2 - beq _080D428A - cmp r0, 0x2 - bgt _080D427A - cmp r0, 0x1 - beq _080D4284 - b _080D42AE -_080D427A: - cmp r0, 0x3 - beq _080D4294 - cmp r0, 0x4 - beq _080D42A4 - b _080D42AE -_080D4284: - movs r2, 0x82 - lsls r2, 2 - b _080D4296 -_080D428A: - ldr r2, =0x00000281 - b _080D4296 - .pool -_080D4294: - ldr r2, =0x00000282 -_080D4296: - adds r0, r5, 0 - adds r1, r4, 0 - bl MapGridSetMetatileIdAt - b _080D42AE - .pool -_080D42A4: - ldr r2, =0x00000283 - adds r0, r5, 0 - adds r1, r4, 0 - bl MapGridSetMetatileIdAt -_080D42AE: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80D423C - - thumb_func_start sub_80D42B8 -sub_80D42B8: @ 80D42B8 - push {r4,r5,lr} - lsls r0, 16 - asrs r4, r0, 16 - lsls r1, 16 - asrs r5, r1, 16 - adds r0, r4, 0 - adds r1, r5, 0 - bl MapGridGetMetatileIdAt - cmp r0, 0x1 - bne _080D434A - adds r5, 0x1 - adds r0, r4, 0 - adds r1, r5, 0 - bl MapGridGetMetatileBehaviorAt - lsls r0, 24 - lsrs r0, 24 - bl MetatileBehavior_IsLongGrassSouthEdge - lsls r0, 24 - cmp r0, 0 - beq _080D434A - adds r0, r4, 0 - adds r1, r5, 0 - bl MapGridGetMetatileIdAt - adds r1, r0, 0 - ldr r0, =0x00000281 - cmp r1, r0 - beq _080D4328 - cmp r1, r0 - bgt _080D4308 - subs r0, 0x79 - cmp r1, r0 - beq _080D431C - b _080D434A - .pool -_080D4308: - ldr r0, =0x00000282 - cmp r1, r0 - beq _080D4330 - adds r0, 0x1 - cmp r1, r0 - beq _080D4340 - b _080D434A - .pool -_080D431C: - adds r0, r4, 0 - adds r1, r5, 0 - movs r2, 0x1 - bl MapGridSetMetatileIdAt - b _080D434A -_080D4328: - ldr r2, =0x00000279 - b _080D4332 - .pool -_080D4330: - ldr r2, =0x0000027a -_080D4332: - adds r0, r4, 0 - adds r1, r5, 0 - bl MapGridSetMetatileIdAt - b _080D434A - .pool -_080D4340: - ldr r2, =0x0000027b - adds r0, r4, 0 - adds r1, r5, 0 - bl MapGridSetMetatileIdAt -_080D434A: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80D42B8 - - thumb_func_start StartCutTreeFieldEffect -StartCutTreeFieldEffect: @ 80D4354 - push {lr} - movs r0, 0x80 - bl PlaySE - movs r0, 0x2 - bl FieldEffectActiveListRemove - bl EnableBothScriptContexts - pop {r0} - bx r0 - thumb_func_end StartCutTreeFieldEffect - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/pokenav.s b/asm/pokenav.s index 00c8c84488..ecba5a6271 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -26527,8 +26527,8 @@ _081D4A0E: bx r1 thumb_func_end EventObjectIsFarawayIslandMew - thumb_func_start unown_chamber_related -unown_chamber_related: @ 81D4A14 + thumb_func_start IsMewPlayingHideAndSeek +IsMewPlayingHideAndSeek: @ 81D4A14 push {lr} ldr r0, =gSaveBlock1Ptr ldr r0, [r0] @@ -26557,7 +26557,7 @@ _081D4A50: _081D4A52: pop {r1} bx r1 - thumb_func_end unown_chamber_related + thumb_func_end IsMewPlayingHideAndSeek thumb_func_start sub_81D4A58 sub_81D4A58: @ 81D4A58 diff --git a/common_syms/overworld.txt b/common_syms/overworld.txt index 687b675454..a3b97a7597 100644 --- a/common_syms/overworld.txt +++ b/common_syms/overworld.txt @@ -1,5 +1,5 @@ gUnknown_03005DA8 gFieldCallback -gUnknown_03005DB0 +gFieldCallback2 gUnknown_03005DB4 gFieldLinkPlayerCount diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 581b72e430..c0c74496f6 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -78,11 +78,11 @@ gFieldEffectScript_ExclamationMarkIcon1:: @ 82DBAE0 field_eff_end gFieldEffectScript_UseCutOnTallGrass:: @ 82DBAE6 - field_eff_callnative sub_80D3A6C + field_eff_callnative FldEff_UseCutOnGrass field_eff_end gFieldEffectScript_UseCutOnTree:: @ 82DBAEC - field_eff_callnative sub_80D3ABC + field_eff_callnative FldEff_UseCutOnTree field_eff_end gFieldEffectScript_Shadow:: @ 82DBAF2 @@ -308,7 +308,7 @@ gFieldEffectScript_Unknown57:: @ 82DBCB8 field_eff_end gFieldEffectScript_Unknown58:: @ 82DBCC2 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo6, sub_80D3B00 + field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo6, FldEff_CutGrass field_eff_end gFieldEffectScript_FieldMoveShowMonInit:: @ 82DBCCC diff --git a/data/fldeff_cut.s b/data/fldeff_cut.s deleted file mode 100644 index ee5a09c379..0000000000 --- a/data/fldeff_cut.s +++ /dev/null @@ -1,32 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -gUnknown_0857C608:: @ 857C608 - .byte 0xfe, 0xfe, 0x01, 0x00, 0xff, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x01, 0xfe, 0x03, 0x00, 0x02, 0xfe, 0x03, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x02, 0xff, 0x03, 0x00, 0xfe, 0x00, 0x04, 0x00, 0x02, 0x00 - .byte 0x06, 0x00, 0xfe, 0x01, 0x07, 0x00, 0x02, 0x01, 0x09, 0x00, 0xfe, 0x02, 0x07, 0x00, 0xff, 0x02, 0x07, 0x00, 0x00, 0x02, 0x08, 0x00, 0x01, 0x02, 0x09, 0x00, 0x02, 0x02, 0x09, 0x00 - -gUnknown_0857C648:: @ 857C648 - .2byte 0 - .2byte 0 - .2byte 0x1401 - .2byte 0 - -gUnknown_0857C650:: @ 857C650 - obj_image_anim_frame 0, 0x1E - obj_image_anim_jump 0 - -gUnknown_0857C658:: @ 857C658 - .4byte gUnknown_0857C650 - -gUnknown_0857C65C:: @ 857C65C - obj_frame_tiles gFieldEffectObjectPic_ShadowExtraLarge + 0x520, 32 - - .align 2 -gFieldEffectObjectPaletteInfo6:: @ 857C664 - obj_pal gFieldEffectObjectPalette6, 0x1000 - -gUnknown_0857C66C:: @ 857C66C - spr_template -1, 0x1000, gUnknown_0857C648, gUnknown_0857C658, gUnknown_0857C65C, gDummySpriteAffineAnimTable, objc_8097BA8 diff --git a/data/party_menu.s b/data/party_menu.s index ebd5968701..eedcd4377a 100644 --- a/data/party_menu.s +++ b/data/party_menu.s @@ -431,7 +431,7 @@ gUnknown_08615D7E:: @ 8615D7E .align 2 gUnknown_08615D9C:: @ 8615D9C - .4byte sub_80D3718, 0x00000007 + .4byte SetUpFieldMove_Cut, 0x00000007 .4byte SetUpFieldMove_Flash, 0x0000000d .4byte SetUpFieldMove_RockSmash, 0x0000000d .4byte SetUpFieldMove_Strength, 0x0000000d diff --git a/graphics/event_objects/pics/effects/cut_grass.png b/graphics/event_objects/pics/effects/cut_grass.png new file mode 100644 index 0000000000000000000000000000000000000000..3c41d28b3a7a6c9642121e67728e6bf0c421513d GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^93afX3?$7I7w-U41_3@Hu0VRr|DdF^9Gb;ICSkyK z_0W5uDs4{}#}JO0$q5XMX$mO@CI%)620>v)2?=3gY+aI)#s(Ua(wYVan%ag83?_Qa U{H<4N1wn>;y85}Sb4q9e0G84lh5!Hn literal 0 HcmV?d00001 diff --git a/graphics/event_objects/pics/effects/unknown_4F6D38/0.png b/graphics/event_objects/pics/effects/unknown_4F6D38/0.png deleted file mode 100644 index 3ee87e1cdee0683fb6edf9fbe7f117f1d34f3bc8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ0wfrI9P#J^Ql6eJjv*3L-}YP-JfOgF^hUke zMb-zqI^te)|0`!a?9aF3M)d~m|3=>xYQHpAq@3)ru)pWE>1Xqr6Srn8P|V= 2) break; } - if (r7 == TRUE) + if (tileCuttable == TRUE) { if (MapGridGetZCoordAt(x, y) == gPlayerFacingPosition.height) { - u8 r6 = ((gUnknown_0857C608[i].y * 5) + 12) + (gUnknown_0857C608[i].x); + u8 tileArrayId = ((sHyperCutStruct[i].y * 5) + 12) + (sHyperCutStruct[i].x); tileBehavior = MapGridGetMetatileBehaviorAt(x, y); if (MetatileBehavior_IsPokeGrass(tileBehavior) == TRUE || MetatileBehavior_IsAshGrass(tileBehavior) == TRUE) { gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; gPostMenuFieldCallback = FieldCallback_CutGrass; - gUnknown_03001108[r6] = r7; + sHyperCutTiles[tileArrayId] = TRUE; ret = TRUE; } else { if (MetatileBehavior_IsCuttableGrass(tileBehavior) == TRUE) - gUnknown_03001108[r6] = TRUE; + sHyperCutTiles[tileArrayId] = TRUE; } } } @@ -315,7 +313,7 @@ bool8 SetUpFieldMove_Cut(void) } } -void FieldCallback_CutGrass(void) +static void FieldCallback_CutGrass(void) { FieldEffectStart(FLDEFF_USE_CUT_ON_GRASS); gFieldEffectArguments[0] = GetCursorSelectionMonId(); @@ -331,7 +329,7 @@ bool8 FldEff_UseCutOnGrass(void) return FALSE; } -void FieldCallback_CutTree(void) +static void FieldCallback_CutTree(void) { gFieldEffectArguments[0] = GetCursorSelectionMonId(); ScriptContext1_SetupScript(Route103_EventScript_290705); @@ -347,7 +345,7 @@ bool8 FldEff_UseCutOnTree(void) return FALSE; } -void StartCutGrassFieldEffect(void) +static void StartCutGrassFieldEffect(void) { FieldEffectActiveListRemove(FLDEFF_USE_CUT_ON_GRASS); FieldEffectStart(FLDEFF_CUT_GRASS); @@ -359,9 +357,9 @@ bool8 FldEff_CutGrass(void) u8 tileBehavior; u8 i; - for (i = 0, PlaySE(SE_W015), PlayerGetDestCoords(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y); i < 25; i++) + for (i = 0, PlaySE(SE_W015), PlayerGetDestCoords(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y); i < CUT_HYPER_AREA; i++) { - if (gUnknown_03001108[i] == TRUE) + if (sHyperCutTiles[i] == TRUE) { s8 xAdd = (i % 5) - 2; s8 yAdd = (i / 5) - 2; @@ -374,30 +372,30 @@ bool8 FldEff_CutGrass(void) } } - SetCutGrassMetatiles(gPlayerFacingPosition.x - gUnknown_03001101, gPlayerFacingPosition.y + (~gUnknown_03001102)); + SetCutGrassMetatiles(gPlayerFacingPosition.x - sTileCountFromPlayer_X, gPlayerFacingPosition.y - (1 + sTileCountFromPlayer_Y)); DrawWholeMapView(); - gCutGrassSpriteArrayPtr = AllocZeroed(8); + sCutGrassSpriteArrayPtr = AllocZeroed(CUT_SPRITE_ARRAY_COUNT); // populate sprite ID array - for (i = 0; i < 8; i++) + for (i = 0; i < CUT_SPRITE_ARRAY_COUNT; i++) { - gCutGrassSpriteArrayPtr[i] = CreateSprite(&gSpriteTemplate_CutGrass, + sCutGrassSpriteArrayPtr[i] = CreateSprite(&sSpriteTemplate_CutGrass, gSprites[gPlayerAvatar.spriteId].oam.x + 8, gSprites[gPlayerAvatar.spriteId].oam.y + 20, 0); - gSprites[gCutGrassSpriteArrayPtr[i]].data[2] = 32 * i; + gSprites[sCutGrassSpriteArrayPtr[i]].data[2] = 32 * i; } return FALSE; } // set map grid metatile depending on x, y -void SetCutGrassMetatile(s16 x, s16 y) +static void SetCutGrassMetatile(s16 x, s16 y) { s32 metatileId = MapGridGetMetatileIdAt(x, y); switch (metatileId) { - case METATILE_ID_POKE_TALL_GRASS_START: - case METATILE_ID_POKE_TALL_GRASS: + case METATILE_ID_POKE_LONG_GRASS_START: + case METATILE_ID_POKE_LONG_GRASS: case METATILE_ID_POKE_GRASS: MapGridSetMetatileIdAt(x, y, METATILE_ID_GRASS); break; @@ -407,14 +405,14 @@ void SetCutGrassMetatile(s16 x, s16 y) case METATILE_ID_POKE_GRASS_TREE_RIGHT: MapGridSetMetatileIdAt(x, y, METATILE_ID_GRASS_TREE_RIGHT); break; - case METATILE_ID_SECRET_BASE_LEFT_POKE_TALL_GRASS: - MapGridSetMetatileIdAt(x, y, METATILE_ID_SECRET_BASE_LEFT_TALL_GRASS); + case METATILE_ID_SECRET_BASE_LEFT_POKE_LONG_GRASS: + MapGridSetMetatileIdAt(x, y, METATILE_ID_SECRET_BASE_LEFT_LONG_GRASS); break; - case METATILE_ID_SECRET_BASE_CENTER_POKE_TALL_GRASS: - MapGridSetMetatileIdAt(x, y, METATILE_ID_SECRET_BASE_CENTER_TALL_GRASS); + case METATILE_ID_SECRET_BASE_CENTER_POKE_LONG_GRASS: + MapGridSetMetatileIdAt(x, y, METATILE_ID_SECRET_BASE_CENTER_LONG_GRASS); break; - case METATILE_ID_SECRET_BASE_RIGHT_POKE_TALL_GRASS: - MapGridSetMetatileIdAt(x, y, METATILE_ID_SECRET_BASE_RIGHT_TALL_GRASS); + case METATILE_ID_SECRET_BASE_RIGHT_POKE_LONG_GRASS: + MapGridSetMetatileIdAt(x, y, METATILE_ID_SECRET_BASE_RIGHT_LONG_GRASS); break; case METATILE_ID_POKE_STEP_LAVA_GRASS: case METATILE_ID_POKE_LAVA_GRASS: @@ -432,92 +430,92 @@ void SetCutGrassMetatile(s16 x, s16 y) enum { - TALL_GRASS_NONE, - TALL_GRASS_FIELD, - TALL_GRASS_BASE_LEFT, - TALL_GRASS_BASE_CENTER, - TALL_GRASS_BASE_RIGHT + LONG_GRASS_NONE, + LONG_GRASS_FIELD, + LONG_GRASS_BASE_LEFT, + LONG_GRASS_BASE_CENTER, + LONG_GRASS_BASE_RIGHT }; -u8 GetTallGrassCaseAt(s16 x, s16 y) +static u8 GetLongGrassCaseAt(s16 x, s16 y) { u16 metatileId = MapGridGetMetatileIdAt(x, y); if (metatileId == METATILE_ID_GRASS) - return TALL_GRASS_FIELD; - else if (metatileId == METATILE_ID_SECRET_BASE_LEFT_TALL_GRASS) - return TALL_GRASS_BASE_LEFT; - else if (metatileId == METATILE_ID_SECRET_BASE_CENTER_TALL_GRASS) - return TALL_GRASS_BASE_CENTER; - else if (metatileId == METATILE_ID_SECRET_BASE_RIGHT_TALL_GRASS) - return TALL_GRASS_BASE_RIGHT; + return LONG_GRASS_FIELD; + else if (metatileId == METATILE_ID_SECRET_BASE_LEFT_LONG_GRASS) + return LONG_GRASS_BASE_LEFT; + else if (metatileId == METATILE_ID_SECRET_BASE_CENTER_LONG_GRASS) + return LONG_GRASS_BASE_CENTER; + else if (metatileId == METATILE_ID_SECRET_BASE_RIGHT_LONG_GRASS) + return LONG_GRASS_BASE_RIGHT; else - return TALL_GRASS_NONE; + return LONG_GRASS_NONE; } -void SetCutGrassMetatiles(s16 x, s16 y) +static void SetCutGrassMetatiles(s16 x, s16 y) { s16 i; - s16 lowerY = y + gUnknown_03001100; + s16 lowerY = y + sCutSquareSide; - for (i = 0; i < gUnknown_03001100; i++) + for (i = 0; i < sCutSquareSide; i++) { s16 currentX = x + i; - if (MapGridGetMetatileIdAt(currentX, y) == METATILE_ID_POKE_TALL_GRASS) + if (MapGridGetMetatileIdAt(currentX, y) == METATILE_ID_POKE_LONG_GRASS) { - switch (GetTallGrassCaseAt(currentX, y + 1)) + switch (GetLongGrassCaseAt(currentX, y + 1)) { - case TALL_GRASS_FIELD: - MapGridSetMetatileIdAt(currentX, y + 1, METATILE_ID_POKE_TALL_GRASS_START); + case LONG_GRASS_FIELD: + MapGridSetMetatileIdAt(currentX, y + 1, METATILE_ID_POKE_LONG_GRASS_START); break; - case TALL_GRASS_BASE_LEFT: - MapGridSetMetatileIdAt(currentX, y + 1, METATILE_ID_SECRET_BASE_LEFT_POKE_TALL_GRASS); + case LONG_GRASS_BASE_LEFT: + MapGridSetMetatileIdAt(currentX, y + 1, METATILE_ID_SECRET_BASE_LEFT_POKE_LONG_GRASS); break; - case TALL_GRASS_BASE_CENTER: - MapGridSetMetatileIdAt(currentX, y + 1, METATILE_ID_SECRET_BASE_CENTER_POKE_TALL_GRASS); + case LONG_GRASS_BASE_CENTER: + MapGridSetMetatileIdAt(currentX, y + 1, METATILE_ID_SECRET_BASE_CENTER_POKE_LONG_GRASS); break; - case TALL_GRASS_BASE_RIGHT: - MapGridSetMetatileIdAt(currentX, y + 1, METATILE_ID_SECRET_BASE_RIGHT_POKE_TALL_GRASS); + case LONG_GRASS_BASE_RIGHT: + MapGridSetMetatileIdAt(currentX, y + 1, METATILE_ID_SECRET_BASE_RIGHT_POKE_LONG_GRASS); break; } } if (MapGridGetMetatileIdAt(currentX, lowerY) == METATILE_ID_GRASS) { - if (MapGridGetMetatileIdAt(currentX, lowerY + 1) == METATILE_ID_POKE_TALL_GRASS_START) + if (MapGridGetMetatileIdAt(currentX, lowerY + 1) == METATILE_ID_POKE_LONG_GRASS_START) MapGridSetMetatileIdAt(currentX, lowerY + 1, METATILE_ID_GRASS); - if (MapGridGetMetatileIdAt(currentX, lowerY + 1) == METATILE_ID_SECRET_BASE_LEFT_POKE_TALL_GRASS) - MapGridSetMetatileIdAt(currentX, lowerY + 1, METATILE_ID_SECRET_BASE_LEFT_TALL_GRASS); - if (MapGridGetMetatileIdAt(currentX, lowerY + 1) == METATILE_ID_SECRET_BASE_CENTER_POKE_TALL_GRASS) - MapGridSetMetatileIdAt(currentX, lowerY + 1, METATILE_ID_SECRET_BASE_CENTER_TALL_GRASS); - if (MapGridGetMetatileIdAt(currentX, lowerY + 1) == METATILE_ID_SECRET_BASE_RIGHT_POKE_TALL_GRASS) - MapGridSetMetatileIdAt(currentX, lowerY + 1, METATILE_ID_SECRET_BASE_RIGHT_TALL_GRASS); + if (MapGridGetMetatileIdAt(currentX, lowerY + 1) == METATILE_ID_SECRET_BASE_LEFT_POKE_LONG_GRASS) + MapGridSetMetatileIdAt(currentX, lowerY + 1, METATILE_ID_SECRET_BASE_LEFT_LONG_GRASS); + if (MapGridGetMetatileIdAt(currentX, lowerY + 1) == METATILE_ID_SECRET_BASE_CENTER_POKE_LONG_GRASS) + MapGridSetMetatileIdAt(currentX, lowerY + 1, METATILE_ID_SECRET_BASE_CENTER_LONG_GRASS); + if (MapGridGetMetatileIdAt(currentX, lowerY + 1) == METATILE_ID_SECRET_BASE_RIGHT_POKE_LONG_GRASS) + MapGridSetMetatileIdAt(currentX, lowerY + 1, METATILE_ID_SECRET_BASE_RIGHT_LONG_GRASS); } } - if (gUnknown_03001100 == CUT_HYPER_SIDE) + if (sCutSquareSide == CUT_HYPER_SIDE) { - HandleTallGrassOnHyper(0, x, y); - HandleTallGrassOnHyper(1, x, y); + HandleLongGrassOnHyper(0, x, y); + HandleLongGrassOnHyper(1, x, y); } } -void HandleTallGrassOnHyper(u8 caseId, s16 x, s16 y) +static void HandleLongGrassOnHyper(u8 caseId, s16 x, s16 y) { s16 newX; bool8 arr[3]; if (caseId == 0) { - arr[0] = gUnknown_03001108[5]; - arr[1] = gUnknown_03001108[10]; - arr[2] = gUnknown_03001108[15]; + arr[0] = sHyperCutTiles[5]; + arr[1] = sHyperCutTiles[10]; + arr[2] = sHyperCutTiles[15]; newX = x; } else if (caseId == 1) { - arr[0] = gUnknown_03001108[9]; - arr[1] = gUnknown_03001108[14]; - arr[2] = gUnknown_03001108[19]; + arr[0] = sHyperCutTiles[9]; + arr[1] = sHyperCutTiles[14]; + arr[2] = sHyperCutTiles[19]; newX = x + 4; } else // invalid case @@ -527,69 +525,69 @@ void HandleTallGrassOnHyper(u8 caseId, s16 x, s16 y) if (arr[0] == TRUE) { - if (MapGridGetMetatileIdAt(newX, y + 3) == METATILE_ID_POKE_TALL_GRASS_START) + if (MapGridGetMetatileIdAt(newX, y + 3) == METATILE_ID_POKE_LONG_GRASS_START) MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID_GRASS); - if (MapGridGetMetatileIdAt(newX, y + 3) == METATILE_ID_SECRET_BASE_LEFT_POKE_TALL_GRASS) - MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID_SECRET_BASE_LEFT_TALL_GRASS); - if (MapGridGetMetatileIdAt(newX, y + 3) == METATILE_ID_SECRET_BASE_CENTER_POKE_TALL_GRASS) - MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID_SECRET_BASE_CENTER_TALL_GRASS); - if (MapGridGetMetatileIdAt(newX, y + 3) == METATILE_ID_SECRET_BASE_RIGHT_POKE_TALL_GRASS) - MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID_SECRET_BASE_RIGHT_TALL_GRASS); + if (MapGridGetMetatileIdAt(newX, y + 3) == METATILE_ID_SECRET_BASE_LEFT_POKE_LONG_GRASS) + MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID_SECRET_BASE_LEFT_LONG_GRASS); + if (MapGridGetMetatileIdAt(newX, y + 3) == METATILE_ID_SECRET_BASE_CENTER_POKE_LONG_GRASS) + MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID_SECRET_BASE_CENTER_LONG_GRASS); + if (MapGridGetMetatileIdAt(newX, y + 3) == METATILE_ID_SECRET_BASE_RIGHT_POKE_LONG_GRASS) + MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID_SECRET_BASE_RIGHT_LONG_GRASS); } if (arr[1] == TRUE) { - if (MapGridGetMetatileIdAt(newX, y + 2) == METATILE_ID_POKE_TALL_GRASS) + if (MapGridGetMetatileIdAt(newX, y + 2) == METATILE_ID_POKE_LONG_GRASS) { - switch (GetTallGrassCaseAt(newX, y + 3)) + switch (GetLongGrassCaseAt(newX, y + 3)) { - case TALL_GRASS_FIELD: - MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID_POKE_TALL_GRASS_START); + case LONG_GRASS_FIELD: + MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID_POKE_LONG_GRASS_START); break; - case TALL_GRASS_BASE_LEFT: - MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID_SECRET_BASE_LEFT_POKE_TALL_GRASS); + case LONG_GRASS_BASE_LEFT: + MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID_SECRET_BASE_LEFT_POKE_LONG_GRASS); break; - case TALL_GRASS_BASE_CENTER: - MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID_SECRET_BASE_CENTER_POKE_TALL_GRASS); + case LONG_GRASS_BASE_CENTER: + MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID_SECRET_BASE_CENTER_POKE_LONG_GRASS); break; - case TALL_GRASS_BASE_RIGHT: - MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID_SECRET_BASE_RIGHT_POKE_TALL_GRASS); + case LONG_GRASS_BASE_RIGHT: + MapGridSetMetatileIdAt(newX, y + 3, METATILE_ID_SECRET_BASE_RIGHT_POKE_LONG_GRASS); break; } } - if (MapGridGetMetatileIdAt(newX, y + 4) == METATILE_ID_POKE_TALL_GRASS_START) + if (MapGridGetMetatileIdAt(newX, y + 4) == METATILE_ID_POKE_LONG_GRASS_START) MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID_GRASS); - if (MapGridGetMetatileIdAt(newX, y + 4) == METATILE_ID_SECRET_BASE_LEFT_POKE_TALL_GRASS) - MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID_SECRET_BASE_LEFT_TALL_GRASS); - if (MapGridGetMetatileIdAt(newX, y + 4) == METATILE_ID_SECRET_BASE_CENTER_POKE_TALL_GRASS) - MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID_SECRET_BASE_CENTER_TALL_GRASS); - if (MapGridGetMetatileIdAt(newX, y + 4) == METATILE_ID_SECRET_BASE_RIGHT_POKE_TALL_GRASS) - MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID_SECRET_BASE_RIGHT_TALL_GRASS); + if (MapGridGetMetatileIdAt(newX, y + 4) == METATILE_ID_SECRET_BASE_LEFT_POKE_LONG_GRASS) + MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID_SECRET_BASE_LEFT_LONG_GRASS); + if (MapGridGetMetatileIdAt(newX, y + 4) == METATILE_ID_SECRET_BASE_CENTER_POKE_LONG_GRASS) + MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID_SECRET_BASE_CENTER_LONG_GRASS); + if (MapGridGetMetatileIdAt(newX, y + 4) == METATILE_ID_SECRET_BASE_RIGHT_POKE_LONG_GRASS) + MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID_SECRET_BASE_RIGHT_LONG_GRASS); } if (arr[2] == TRUE) { - if (MapGridGetMetatileIdAt(newX, y + 3) == METATILE_ID_POKE_TALL_GRASS) + if (MapGridGetMetatileIdAt(newX, y + 3) == METATILE_ID_POKE_LONG_GRASS) { - switch (GetTallGrassCaseAt(newX, y + 4)) + switch (GetLongGrassCaseAt(newX, y + 4)) { - case TALL_GRASS_FIELD: - MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID_POKE_TALL_GRASS_START); + case LONG_GRASS_FIELD: + MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID_POKE_LONG_GRASS_START); break; - case TALL_GRASS_BASE_LEFT: - MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID_SECRET_BASE_LEFT_POKE_TALL_GRASS); + case LONG_GRASS_BASE_LEFT: + MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID_SECRET_BASE_LEFT_POKE_LONG_GRASS); break; - case TALL_GRASS_BASE_CENTER: - MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID_SECRET_BASE_CENTER_POKE_TALL_GRASS); + case LONG_GRASS_BASE_CENTER: + MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID_SECRET_BASE_CENTER_POKE_LONG_GRASS); break; - case TALL_GRASS_BASE_RIGHT: - MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID_SECRET_BASE_RIGHT_POKE_TALL_GRASS); + case LONG_GRASS_BASE_RIGHT: + MapGridSetMetatileIdAt(newX, y + 4, METATILE_ID_SECRET_BASE_RIGHT_POKE_LONG_GRASS); break; } } } } -void CutGrassSpriteCallback1(struct Sprite *sprite) +static void CutGrassSpriteCallback1(struct Sprite *sprite) { sprite->data[0] = 8; sprite->data[1] = 0; @@ -597,7 +595,7 @@ void CutGrassSpriteCallback1(struct Sprite *sprite) sprite->callback = CutGrassSpriteCallback2; } -void CutGrassSpriteCallback2(struct Sprite *sprite) +static void CutGrassSpriteCallback2(struct Sprite *sprite) { sprite->pos2.x = Sin(sprite->data[2], sprite->data[0]); sprite->pos2.y = Cos(sprite->data[2], sprite->data[0]); @@ -611,3 +609,76 @@ void CutGrassSpriteCallback2(struct Sprite *sprite) else sprite->callback = CutGrassSpriteCallbackEnd; // done rotating the grass, execute clean up function } + +static void CutGrassSpriteCallbackEnd(struct Sprite *sprite) +{ + u8 i; + + for (i = 1; i < CUT_SPRITE_ARRAY_COUNT; i++) + DestroySprite(&gSprites[sCutGrassSpriteArrayPtr[i]]); + + FieldEffectStop(&gSprites[sCutGrassSpriteArrayPtr[0]], FLDEFF_CUT_GRASS); + FREE_AND_SET_NULL(sCutGrassSpriteArrayPtr); + ScriptUnfreezeEventObjects(); + ScriptContext2_Disable(); + + if (IsMewPlayingHideAndSeek() == TRUE) + ScriptContext1_SetupScript(FarawayIsland_Interior_EventScript_267EDB); +} + +void sub_80D423C(s16 x, s16 y) +{ + u8 metatileBehavior = MapGridGetMetatileBehaviorAt(x, y); + if (MetatileBehavior_IsLongGrass_Duplicate(metatileBehavior)) + { + switch (GetLongGrassCaseAt(x, y + 1)) + { + case LONG_GRASS_FIELD: + MapGridSetMetatileIdAt(x, y + 1, METATILE_ID_POKE_LONG_GRASS_START); + break; + case LONG_GRASS_BASE_LEFT: + MapGridSetMetatileIdAt(x, y + 1, METATILE_ID_SECRET_BASE_LEFT_POKE_LONG_GRASS); + break; + case LONG_GRASS_BASE_CENTER: + MapGridSetMetatileIdAt(x, y + 1, METATILE_ID_SECRET_BASE_CENTER_POKE_LONG_GRASS); + break; + case LONG_GRASS_BASE_RIGHT: + MapGridSetMetatileIdAt(x, y + 1, METATILE_ID_SECRET_BASE_RIGHT_POKE_LONG_GRASS); + break; + } + } +} + +void sub_80D42B8(s16 x, s16 y) +{ + if (MapGridGetMetatileIdAt(x, y) == METATILE_ID_GRASS) + { + u8 metatileBehavior = MapGridGetMetatileBehaviorAt(x, y + 1); + if (MetatileBehavior_IsLongGrassSouthEdge(metatileBehavior)) + { + s32 metatileId = MapGridGetMetatileIdAt(x, y + 1); + switch (metatileId) + { + case METATILE_ID_POKE_LONG_GRASS_START: + MapGridSetMetatileIdAt(x, y + 1, METATILE_ID_GRASS); + break; + case METATILE_ID_SECRET_BASE_LEFT_POKE_LONG_GRASS: + MapGridSetMetatileIdAt(x, y + 1, METATILE_ID_SECRET_BASE_LEFT_LONG_GRASS); + break; + case METATILE_ID_SECRET_BASE_CENTER_POKE_LONG_GRASS: + MapGridSetMetatileIdAt(x, y + 1, METATILE_ID_SECRET_BASE_CENTER_LONG_GRASS); + break; + case METATILE_ID_SECRET_BASE_RIGHT_POKE_LONG_GRASS: + MapGridSetMetatileIdAt(x, y + 1, METATILE_ID_SECRET_BASE_RIGHT_LONG_GRASS); + break; + } + } + } +} + +static void StartCutTreeFieldEffect(void) +{ + PlaySE(SE_W015); + FieldEffectActiveListRemove(FLDEFF_USE_CUT_ON_TREE); + EnableBothScriptContexts(); +} diff --git a/src/item_use.c b/src/item_use.c index 96f63ee3ec..5bbc1d50ef 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -39,7 +39,7 @@ extern void sub_81C5B14(u8 taskId); extern u8 gText_DadsAdvice[]; extern u8 gText_CantDismountBike[]; extern void sub_8197434(u8 a, u8 b); -extern void sub_80984F4(void); +extern void ScriptUnfreezeEventObjects(void); extern void ItemUseOutOfBattle_TMHM(u8 a); extern void ItemUseOutOfBattle_EvolutionStone(u8 b); extern void bag_menu_mail_related(void); @@ -197,7 +197,7 @@ void CleanUpAfterFailingToUseRegisteredKeyItemOnField(u8 taskId) { sub_8197434(0, 1); DestroyTask(taskId); - sub_80984F4(); + ScriptUnfreezeEventObjects(); ScriptContext2_Disable(); } @@ -252,7 +252,7 @@ void ItemUseOnFieldCB_Bike(u8 taskId) GetOnOffBike(2); else GetOnOffBike(4); - sub_80984F4(); + ScriptUnfreezeEventObjects(); ScriptContext2_Disable(); DestroyTask(taskId); } @@ -358,7 +358,7 @@ void sub_80FD504(u8 taskId) void sub_80FD5CC(u8 taskId) { sub_8197434(0, 1); - sub_80984F4(); + ScriptUnfreezeEventObjects(); ScriptContext2_Disable(); DestroyTask(taskId); } diff --git a/src/start_menu.c b/src/start_menu.c index 6371acff0d..5900cced17 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -90,7 +90,7 @@ extern void sub_80C4DDC(void (*)(void)); extern void sub_80C51C4(void (*)(void)); extern void sub_80C4E74(u8, void (*)(void)); extern void sub_81C4EFC(void); -extern void sub_80984F4(void); +extern void ScriptUnfreezeEventObjects(void); extern void sub_81A9EC8(void); extern void save_serialize_map(void); extern void sub_81A9E90(void); @@ -773,7 +773,7 @@ static bool8 StartMenuBattlePyramidRetireCallback(void) void sub_809FDD4(void) // Called from battle_frontier_2.s { sub_8197DF8(0, FALSE); - sub_80984F4(); + ScriptUnfreezeEventObjects(); CreateStartMenuTask(sub_809FA34); ScriptContext2_Enable(); } @@ -815,7 +815,7 @@ static bool8 SaveCallback(void) case SAVE_SUCCESS: case SAVE_ERROR: // Close start menu sub_8197DF8(0, TRUE); - sub_80984F4(); + ScriptUnfreezeEventObjects(); ScriptContext2_Disable(); sub_81A9EC8(); return TRUE; @@ -852,7 +852,7 @@ static bool8 BattlePyramidRetireCallback(void) return FALSE; case SAVE_CANCELED: // Yes (Retire from battle pyramid) sub_8197DF8(0, TRUE); - sub_80984F4(); + ScriptUnfreezeEventObjects(); ScriptContext2_Disable(); ScriptContext1_SetupScript(BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88); return TRUE; @@ -1409,7 +1409,7 @@ static void HideStartMenuWindow(void) { sub_819746C(GetStartMenuWindowId(), TRUE); RemoveStartMenuWindow(); - sub_80984F4(); + ScriptUnfreezeEventObjects(); ScriptContext2_Disable(); } diff --git a/sym_ewram.txt b/sym_ewram.txt index 7ea9bef797..a4eece919e 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -384,10 +384,7 @@ gUnknown_02039D8C: @ 2039D8C .space 0x4 .include "src/script_movement.o" - -gUnknown_02039DD0: @ 2039DD0 - .space 0x4 - + .include "src/fldeff_cut.o" .include "src/map_name_popup.o" .include "src/item.o" @@ -607,7 +604,7 @@ gUnknown_0203AB34: @ 203AB34 .include "src/battle_ai_script_commands.o" .align 2 -gUnknown_0203AB40: @ 203AB40 +gPlayerFacingPosition: @ 203AB40 .space 0x8 .include "src/pokeblock.o" @@ -844,7 +841,7 @@ gUnknown_0203CEE8: @ 203CEE8 gUnknown_0203CEE9: @ 203CEE9 .space 0x3 -gUnknown_0203CEEC: @ 203CEEC +gPostMenuFieldCallback: @ 203CEEC .space 0x4 gUnknown_0203CEF0: @ 203CEF0 From 46f9b83fe54b2c0b2a81c60de143ba0abcb75ec9 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 16 Jun 2018 11:39:54 -0500 Subject: [PATCH 19/55] Add calcrom discord webhook to travis --- .travis.yml | 2 ++ .travis/calcrom/calcrom.pl | 37 +++++++++++++++++++++++++++++++++++++ .travis/calcrom/webhook.sh | 16 ++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100755 .travis/calcrom/calcrom.pl create mode 100755 .travis/calcrom/webhook.sh diff --git a/.travis.yml b/.travis.yml index fef1fc0ebe..aad16906c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,3 +26,5 @@ matrix: script: - ./build_tools.sh - make -j2 compare +after_success: + - .travis/calcrom/webhook.sh pokeemerald diff --git a/.travis/calcrom/calcrom.pl b/.travis/calcrom/calcrom.pl new file mode 100755 index 0000000000..8ee02036de --- /dev/null +++ b/.travis/calcrom/calcrom.pl @@ -0,0 +1,37 @@ +#!/usr/bin/perl + +(@ARGV == 1) + or die "ERROR: no map file specified.\n"; +open(my $file, $ARGV[0]) + or die "ERROR: could not open file '$ARGV[0]'.\n"; + +my $src = 0; +my $asm = 0; +while (my $line = <$file>) +{ + if ($line =~ /^ \.(\w+)\s+0x[0-9a-f]+\s+(0x[0-9a-f]+) (\w+)\/.+\.o/) + { + my $section = $1; + my $size = hex($2); + my $dir = $3; + + if ($section =~ /text/) + { + if ($dir eq 'src') + { + $src += $size; + } + elsif ($dir eq 'asm') + { + $asm += $size; + } + } + } +} + +my $total = $src + $asm; +my $srcPct = sprintf("%.4f", 100 * $src / $total); +my $asmPct = sprintf("%.4f", 100 * $asm / $total); +print "$total total bytes of code\n"; +print "$src bytes of code in src ($srcPct%)\n"; +print "$asm bytes of code in asm ($asmPct%)\n"; diff --git a/.travis/calcrom/webhook.sh b/.travis/calcrom/webhook.sh new file mode 100755 index 0000000000..336a8103e9 --- /dev/null +++ b/.travis/calcrom/webhook.sh @@ -0,0 +1,16 @@ +#!/bin/bash -ex + +# Only run this script if it's the master branch build. +if [[ "$TRAVIS_BRANCH" != "master" || "$TRAVIS_PULL_REQUEST" != "false" ]]; then + exit 0 +fi + +build_name=$1 +map_file=$build_name.map +if [ ! -f $map_file ]; then + echo "$map_file does not exist!" + exit 1 +fi + +output=$(perl $(dirname "$0")/calcrom.pl $build_name.map | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g') +curl -d "{\"username\": \"OK\", \"avatar_url\": \"https://i.imgur.com/38BQHdd.png\", \"content\":\"\`\`\`$build_name progress:\\n$output\`\`\`\"}" -H "Content-Type: application/json" -X POST https://discordapp.com/api/webhooks/340931107060973570/$DISCORD_WEBHOOK_KEY From 4ab87bf8f3fd527d0b5120344f84b73d309693db Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 16 Jun 2018 18:50:31 -0500 Subject: [PATCH 20/55] Fetch calcrom webhook details from travis environment --- .travis/calcrom/webhook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/calcrom/webhook.sh b/.travis/calcrom/webhook.sh index 336a8103e9..86da74c873 100755 --- a/.travis/calcrom/webhook.sh +++ b/.travis/calcrom/webhook.sh @@ -13,4 +13,4 @@ if [ ! -f $map_file ]; then fi output=$(perl $(dirname "$0")/calcrom.pl $build_name.map | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g') -curl -d "{\"username\": \"OK\", \"avatar_url\": \"https://i.imgur.com/38BQHdd.png\", \"content\":\"\`\`\`$build_name progress:\\n$output\`\`\`\"}" -H "Content-Type: application/json" -X POST https://discordapp.com/api/webhooks/340931107060973570/$DISCORD_WEBHOOK_KEY +curl -d "{\"username\": \"$CALCROM_DISCORD_WEBHOOK_USERNAME\", \"avatar_url\": \"$CALCROM_DISCORD_WEBHOOK_AVATAR_URL\", \"content\":\"\`\`\`$build_name progress:\\n$output\`\`\`\"}" -H "Content-Type: application/json" -X POST $CALCROM_DISCORD_WEBHOOK_URL From 0fe3e612ebd3e7f49f930f7ae40aa9d9267862fa Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 17 Jun 2018 12:30:09 +0200 Subject: [PATCH 21/55] battle tent start and create frontier struct in saveblock --- asm/battle_tent.s | 580 -------------------------- data/battle_tent.s | 51 --- include/battle_frontier_2.h | 3 + include/battle_tower.h | 15 + include/global.h | 112 ++--- include/new_game.h | 5 - ld_script.txt | 3 +- src/battle_controller_link_opponent.c | 2 +- src/battle_controller_link_partner.c | 2 +- src/battle_controller_player.c | 2 +- src/battle_controllers.c | 4 +- src/battle_main.c | 10 +- src/battle_setup.c | 4 +- src/battle_tent.c | 267 ++++++++++++ src/item.c | 16 +- src/map_name_popup.c | 2 +- src/new_game.c | 43 +- src/pokemon.c | 4 +- src/record_mixing.c | 28 +- src/recorded_battle.c | 8 +- src/start_menu.c | 82 ++-- src/tv.c | 22 +- src/wild_encounter.c | 4 +- 23 files changed, 464 insertions(+), 805 deletions(-) delete mode 100644 data/battle_tent.s create mode 100644 src/battle_tent.c diff --git a/asm/battle_tent.s b/asm/battle_tent.s index 8253d4f985..c967390d08 100644 --- a/asm/battle_tent.s +++ b/asm/battle_tent.s @@ -5,586 +5,6 @@ .text - thumb_func_start sub_81B99B4 -sub_81B99B4: @ 81B99B4 - push {lr} - ldr r1, =gUnknown_086160B4 - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - bl _call_via_r0 - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B99B4 - - thumb_func_start sub_81B99D4 -sub_81B99D4: @ 81B99D4 - push {lr} - ldr r1, =gSaveBlock2Ptr - ldr r0, [r1] - ldr r2, =0x00000ca8 - adds r0, r2 - movs r2, 0 - strb r2, [r0] - ldr r1, [r1] - ldr r3, =0x00000cb2 - adds r0, r1, r3 - strh r2, [r0] - ldr r0, =0x00000ca9 - adds r1, r0 - ldrb r2, [r1] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - strb r0, [r1] - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - movs r1, 0x4 - ldrsb r1, [r0, r1] - movs r2, 0x5 - ldrsb r2, [r0, r2] - movs r3, 0x1 - negs r3, r3 - movs r0, 0 - bl saved_warp2_set - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B99D4 - - thumb_func_start sub_81B9A28 -sub_81B9A28: @ 81B9A28 - ldr r1, =gSpecialVar_Result - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldr r2, =0x00000e6a - adds r0, r2 - ldrh r0, [r0] - strh r0, [r1] - bx lr - .pool - thumb_func_end sub_81B9A28 - - thumb_func_start sub_81B9A44 -sub_81B9A44: @ 81B9A44 - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldr r1, =gSpecialVar_0x8006 - ldrh r1, [r1] - ldr r2, =0x00000e6a - adds r0, r2 - strh r1, [r0] - bx lr - .pool - thumb_func_end sub_81B9A44 - - thumb_func_start sub_81B9A60 -sub_81B9A60: @ 81B9A60 - push {r4,lr} - ldr r4, =gTrainerBattleOpponent_A - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0xFF - bl __umodsi3 - lsls r0, 16 - lsrs r0, 16 - lsls r1, r0, 2 - adds r1, r0 - lsrs r1, 6 - strh r1, [r4] - ldrh r0, [r4] - movs r1, 0 - bl sub_8162614 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9A60 - - thumb_func_start sub_81B9A90 -sub_81B9A90: @ 81B9A90 - push {lr} - ldr r3, =gTrainerBattleOpponent_A - ldrh r1, [r3] - ldr r0, =0x0000012b - cmp r1, r0 - bhi _081B9AAC - ldr r2, =gUnknown_0203BC88 - movs r0, 0x34 - muls r1, r0 - ldr r0, [r2] - adds r0, r1 - adds r0, 0xC - bl ConvertBattleFrontierTrainerSpeechToString -_081B9AAC: - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9A90 - - thumb_func_start sub_81B9ABC -sub_81B9ABC: @ 81B9ABC - push {r4,lr} - ldr r4, =gSaveBlock2Ptr - ldr r0, [r4] - ldr r1, =gSpecialVar_0x8005 - ldrh r1, [r1] - ldr r2, =0x00000ca8 - adds r0, r2 - strb r1, [r0] - movs r0, 0x80 - lsls r0, 7 - movs r1, 0 - bl VarSet - ldr r1, [r4] - ldr r0, =0x00000ca9 - adds r1, r0 - ldrb r0, [r1] - movs r2, 0x4 - orrs r0, r2 - strb r0, [r1] - bl sub_81A4C30 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9ABC - - thumb_func_start sub_81B9B00 -sub_81B9B00: @ 81B9B00 - push {r4,r5,lr} - ldr r0, =gSaveBlock2Ptr - ldr r4, [r0] - ldr r5, =gUnknown_086160D4 - bl Random - ldrh r0, [r5] - ldr r1, =0x00000e6a - adds r4, r1 - strh r0, [r4] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9B00 - - thumb_func_start sub_81B9B28 -sub_81B9B28: @ 81B9B28 - push {r4,r5,lr} - ldr r4, =gSaveBlock2Ptr - ldr r0, [r4] - ldr r1, =0x00000e6a - adds r0, r1 - ldrh r0, [r0] - movs r1, 0x1 - bl AddBagItem - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x1 - bne _081B9B70 - ldr r0, [r4] - ldr r1, =0x00000e6a - adds r0, r1 - ldrh r0, [r0] - ldr r1, =gStringVar1 - bl CopyItemName - ldr r0, [r4] - ldr r1, =0x00000e6a - adds r0, r1 - movs r1, 0 - strh r1, [r0] - ldr r0, =gSpecialVar_Result - strh r5, [r0] - b _081B9B76 - .pool -_081B9B70: - ldr r1, =gSpecialVar_Result - movs r0, 0 - strh r0, [r1] -_081B9B76: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9B28 - - thumb_func_start sub_81B9B80 -sub_81B9B80: @ 81B9B80 - push {lr} - ldr r1, =gUnknown_086160D8 - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - bl _call_via_r0 - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9B80 - - thumb_func_start sub_81B9BA0 -sub_81B9BA0: @ 81B9BA0 - push {lr} - ldr r1, =gSaveBlock2Ptr - ldr r0, [r1] - ldr r2, =0x00000ca8 - adds r0, r2 - movs r2, 0 - strb r2, [r0] - ldr r1, [r1] - ldr r3, =0x00000cb2 - adds r0, r1, r3 - strh r2, [r0] - ldr r0, =0x00000ca9 - adds r1, r0 - ldrb r2, [r1] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - strb r0, [r1] - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - movs r1, 0x4 - ldrsb r1, [r0, r1] - movs r2, 0x5 - ldrsb r2, [r0, r2] - movs r3, 0x1 - negs r3, r3 - movs r0, 0 - bl saved_warp2_set - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9BA0 - - thumb_func_start sub_81B9BF4 -sub_81B9BF4: @ 81B9BF4 - ldr r1, =gSpecialVar_Result - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldr r2, =0x00000e6c - adds r0, r2 - ldrh r0, [r0] - strh r0, [r1] - bx lr - .pool - thumb_func_end sub_81B9BF4 - - thumb_func_start sub_81B9C10 -sub_81B9C10: @ 81B9C10 - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldr r1, =gSpecialVar_0x8006 - ldrh r1, [r1] - ldr r2, =0x00000e6c - adds r0, r2 - strh r1, [r0] - bx lr - .pool - thumb_func_end sub_81B9C10 - - thumb_func_start sub_81B9C2C -sub_81B9C2C: @ 81B9C2C - push {r4,lr} - ldr r4, =gSaveBlock2Ptr - ldr r0, [r4] - ldr r1, =gSpecialVar_0x8005 - ldrh r1, [r1] - ldr r2, =0x00000ca8 - adds r0, r2 - strb r1, [r0] - movs r0, 0x80 - lsls r0, 7 - movs r1, 0 - bl VarSet - ldr r1, [r4] - ldr r0, =0x00000ca9 - adds r1, r0 - ldrb r0, [r1] - movs r2, 0x4 - orrs r0, r2 - strb r0, [r1] - bl sub_81A4C30 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9C2C - - thumb_func_start sub_81B9C70 -sub_81B9C70: @ 81B9C70 - push {r4,r5,lr} - ldr r0, =gSaveBlock2Ptr - ldr r4, [r0] - ldr r5, =gUnknown_086160F4 - bl Random - ldrh r0, [r5] - ldr r1, =0x00000e6c - adds r4, r1 - strh r0, [r4] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9C70 - - thumb_func_start sub_81B9C98 -sub_81B9C98: @ 81B9C98 - push {r4,r5,lr} - ldr r4, =gSaveBlock2Ptr - ldr r0, [r4] - ldr r1, =0x00000e6c - adds r0, r1 - ldrh r0, [r0] - movs r1, 0x1 - bl AddBagItem - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x1 - bne _081B9CE0 - ldr r0, [r4] - ldr r1, =0x00000e6c - adds r0, r1 - ldrh r0, [r0] - ldr r1, =gStringVar1 - bl CopyItemName - ldr r0, [r4] - ldr r1, =0x00000e6c - adds r0, r1 - movs r1, 0 - strh r1, [r0] - ldr r0, =gSpecialVar_Result - strh r5, [r0] - b _081B9CE6 - .pool -_081B9CE0: - ldr r1, =gSpecialVar_Result - movs r0, 0 - strh r0, [r1] -_081B9CE6: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9C98 - - thumb_func_start sub_81B9CF0 -sub_81B9CF0: @ 81B9CF0 - push {lr} - ldr r0, =gStringVar1 - ldr r1, =gTrainerBattleOpponent_A - ldrh r1, [r1] - bl GetFrontierTrainerName - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9CF0 - - thumb_func_start sub_81B9D08 -sub_81B9D08: @ 81B9D08 - push {lr} - ldr r1, =gUnknown_086160F8 - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - bl _call_via_r0 - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9D08 - - thumb_func_start sub_81B9D28 -sub_81B9D28: @ 81B9D28 - push {lr} - ldr r1, =gSaveBlock2Ptr - ldr r0, [r1] - ldr r2, =0x00000ca8 - adds r0, r2 - movs r2, 0 - strb r2, [r0] - ldr r1, [r1] - ldr r3, =0x00000cb2 - adds r0, r1, r3 - strh r2, [r0] - ldr r0, =0x00000ca9 - adds r1, r0 - ldrb r2, [r1] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - strb r0, [r1] - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - movs r1, 0x4 - ldrsb r1, [r0, r1] - movs r2, 0x5 - ldrsb r2, [r0, r2] - movs r3, 0x1 - negs r3, r3 - movs r0, 0 - bl saved_warp2_set - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9D28 - - thumb_func_start sub_81B9D7C -sub_81B9D7C: @ 81B9D7C - ldr r1, =gSpecialVar_Result - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldr r2, =0x00000e6e - adds r0, r2 - ldrh r0, [r0] - strh r0, [r1] - bx lr - .pool - thumb_func_end sub_81B9D7C - - thumb_func_start sub_81B9D98 -sub_81B9D98: @ 81B9D98 - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldr r1, =gSpecialVar_0x8006 - ldrh r1, [r1] - ldr r2, =0x00000e6e - adds r0, r2 - strh r1, [r0] - bx lr - .pool - thumb_func_end sub_81B9D98 - - thumb_func_start sub_81B9DB4 -sub_81B9DB4: @ 81B9DB4 - push {r4,lr} - ldr r4, =gSaveBlock2Ptr - ldr r0, [r4] - ldr r1, =gSpecialVar_0x8005 - ldrh r1, [r1] - ldr r2, =0x00000ca8 - adds r0, r2 - strb r1, [r0] - movs r0, 0x80 - lsls r0, 7 - movs r1, 0 - bl VarSet - ldr r1, [r4] - ldr r0, =0x00000ca9 - adds r1, r0 - ldrb r0, [r1] - movs r2, 0x4 - orrs r0, r2 - strb r0, [r1] - bl sub_81A4C30 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9DB4 - - thumb_func_start sub_81B9DF8 -sub_81B9DF8: @ 81B9DF8 - push {r4,r5,lr} - ldr r0, =gSaveBlock2Ptr - ldr r4, [r0] - ldr r5, =gUnknown_08616120 - bl Random - ldrh r0, [r5] - ldr r1, =0x00000e6e - adds r4, r1 - strh r0, [r4] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9DF8 - - thumb_func_start sub_81B9E20 -sub_81B9E20: @ 81B9E20 - push {r4,r5,lr} - ldr r4, =gSaveBlock2Ptr - ldr r0, [r4] - ldr r1, =0x00000e6e - adds r0, r1 - ldrh r0, [r0] - movs r1, 0x1 - bl AddBagItem - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x1 - bne _081B9E68 - ldr r0, [r4] - ldr r1, =0x00000e6e - adds r0, r1 - ldrh r0, [r0] - ldr r1, =gStringVar1 - bl CopyItemName - ldr r0, [r4] - ldr r1, =0x00000e6e - adds r0, r1 - movs r1, 0 - strh r1, [r0] - ldr r0, =gSpecialVar_Result - strh r5, [r0] - b _081B9E6E - .pool -_081B9E68: - ldr r1, =gSpecialVar_Result - movs r0, 0 - strh r0, [r1] -_081B9E6E: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9E20 - - thumb_func_start sub_81B9E78 -sub_81B9E78: @ 81B9E78 - push {lr} - bl ZeroPlayerPartyMons - bl sub_819A4F8 - pop {r0} - bx r0 - thumb_func_end sub_81B9E78 - - thumb_func_start sub_81B9E88 -sub_81B9E88: @ 81B9E88 - push {lr} - bl sub_819DC00 - pop {r0} - bx r0 - thumb_func_end sub_81B9E88 - - thumb_func_start sub_81B9E94 -sub_81B9E94: @ 81B9E94 - push {lr} - movs r2, 0 - ldr r1, =gMapHeader - ldrb r0, [r1, 0x14] - cmp r0, 0x8 - bne _081B9EB2 - ldr r3, =0xfffffe7f - adds r0, r3, 0 - ldrh r1, [r1, 0x12] - adds r0, r1 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1 - bhi _081B9EB2 - movs r2, 0x1 -_081B9EB2: - adds r0, r2, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81B9E94 thumb_func_start sub_81B9EC0 sub_81B9EC0: @ 81B9EC0 diff --git a/data/battle_tent.s b/data/battle_tent.s deleted file mode 100644 index 06cfac50eb..0000000000 --- a/data/battle_tent.s +++ /dev/null @@ -1,51 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_086160B4:: @ 86160B4 - .4byte sub_81B99D4 - .4byte sub_81B9A28 - .4byte sub_81B9A44 - .4byte sub_81B9A60 - .4byte sub_81B9A90 - .4byte sub_81B9ABC - .4byte sub_81B9B00 - .4byte sub_81B9B28 - - .align 2 -gUnknown_086160D4:: @ 86160D4 - .4byte 0x00000008 - - .align 2 -gUnknown_086160D8:: @ 86160D8 - .4byte sub_81B9BA0 - .4byte sub_81B9BF4 - .4byte sub_81B9C10 - .4byte sub_81B9C2C - .4byte sub_81B9C70 - .4byte sub_81B9C98 - .4byte sub_81B9CF0 - - .align 2 -gUnknown_086160F4:: @ 86160F4 - .4byte 0x00000015 - - .align 2 -gUnknown_086160F8:: @ 86160F8 - .4byte sub_81B9D28 - .4byte sub_81B9D7C - .4byte sub_81B9D98 - .4byte sub_81B9DB4 - .4byte sub_81B9DF8 - .4byte sub_81B9E20 - .4byte sub_81B9E78 - .4byte sub_81B9E88 - .4byte sub_81BA040 - .4byte sub_81B9EC0 - - .align 2 -gUnknown_08616120:: @ 8616120 - .4byte 0x00000017 - diff --git a/include/battle_frontier_2.h b/include/battle_frontier_2.h index 3f8f8049d3..d410749b9a 100644 --- a/include/battle_frontier_2.h +++ b/include/battle_frontier_2.h @@ -8,5 +8,8 @@ void sub_81A8AF8(void); bool8 InBattlePike(void); void sub_819FA50(void); void sub_81AA078(u16*, u8); +void sub_81A4C30(void); +void sub_819A4F8(void); +void sub_819DC00(void); #endif // GUARD_BATTLE_FRONTIER_2_H diff --git a/include/battle_tower.h b/include/battle_tower.h index 9d45531324..d8a3dc9a8d 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -22,10 +22,25 @@ union BattleTowerRecord struct EmeraldBattleTowerRecord emerald; }; +struct BattleFrontierTrainer +{ + u32 trainerClass; + u8 trainerName[8]; + u16 speechBefore[6]; + u16 speechWin[6]; + u16 speechLose[6]; + u16 *btMonPool; +}; + +extern struct BattleFrontierTrainer *gUnknown_0203BC88; + u16 sub_8164FCC(u8, u8); void sub_81659DC(struct RSBattleTowerRecord *a0, struct RSBattleTowerRecord *a1); bool32 sub_816587C(union BattleTowerRecord *, union BattleTowerRecord *); void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *); void sub_81628A0(union BattleTowerRecord *); +void sub_8162614(u16 trainerId, u8); +void ConvertBattleFrontierTrainerSpeechToString(u16 *words); +void GetFrontierTrainerName(u8 *dest, u16 trainerIdx); #endif //GUARD_BATTLE_TOWER_H diff --git a/include/global.h b/include/global.h index d26184270a..b877592bdc 100644 --- a/include/global.h +++ b/include/global.h @@ -314,62 +314,30 @@ struct EmeraldBattleTowerRecord /*0xE8*/ u32 checksum; }; -struct SaveBlock2 +struct BattleFrontier { - /*0x00*/ u8 playerName[PLAYER_NAME_LENGTH]; - /*0x08*/ u8 playerGender; // MALE, FEMALE - /*0x09*/ u8 specialSaveWarp; - /*0x0A*/ u8 playerTrainerId[4]; - /*0x0E*/ u16 playTimeHours; - /*0x10*/ u8 playTimeMinutes; - /*0x11*/ u8 playTimeSeconds; - /*0x12*/ u8 playTimeVBlanks; - /*0x13*/ u8 optionsButtonMode; // OPTIONS_BUTTON_MODE_[NORMAL/LR/L_EQUALS_A] - /*0x14*/ u16 optionsTextSpeed:3; // OPTIONS_TEXT_SPEED_[SLOW/MID/FAST] - u16 optionsWindowFrameType:5; // Specifies one of the 20 decorative borders for text boxes - u16 optionsSound:1; // OPTIONS_SOUND_[MONO/STEREO] - u16 optionsBattleStyle:1; // OPTIONS_BATTLE_STYLE_[SHIFT/SET] - u16 optionsBattleSceneOff:1; // whether battle animations are disabled - u16 regionMapZoom:1; // whether the map is zoomed in - /*0x18*/ struct Pokedex pokedex; - /*0x90*/ u8 filler_90[0x8]; - /*0x98*/ struct Time localTimeOffset; - /*0xA0*/ struct Time lastBerryTreeUpdate; - /*0xA8*/ u32 field_A8; - /*0xAC*/ u32 encryptionKey; - - // TODO: fix and verify labels - /*0xB0*/ u8 field_B0; - /*0xB1*/ u8 field_B1; - /*0xB2*/ u8 field_B2_0:3; - /*0xB2*/ u8 field_B2_1:2; - /*0xB3*/ u8 field_B3[0x29]; - /*0xDC*/ struct UnkRecordMixingStruct field_DC[4]; - /*0x1EC*/ struct BerryCrush berryCrush; - /*0x1FC*/ struct PokemonJumpResults pokeJump; - /*0x20C*/ struct BerryPickingResults berryPick; - /*0x21C*/ u8 field_21C[1032]; - /*0x624*/ u16 contestLinkResults[20]; // 4 positions for 5 categories, possibly a struct or a 2d array - - // All below could be a one giant struct - /*0x64C*/ struct EmeraldBattleTowerRecord battleTower; /*0x738*/ struct UnknownSaveBlock2Struct field_738[5]; // No idea here, it's probably wrong, no clue. /*0xBD4*/ u16 field_BD4; /*0xBD6*/ u16 field_BD6; /*0xBD8*/ u8 field_BD8[11]; - /*0xBE3*/ u8 filler_BE3[8]; + /*0xBE3*/ u8 field_BE3[8]; /*0xBEB*/ u8 field_BEB; - /*0xBE3*/ u8 filler_BEC[189]; - /*0xCA9*/ u8 frontierChosenLvl : 2; // 0x1, 0x2 -> 0x3 - /*0xCA9*/ u8 field_CA9_a : 1; // 0x4 - /*0xCA9*/ u8 field_CA9_b : 1; // 0x8 - /*0xCA9*/ u8 field_CA9_c : 1; // 0x10 - /*0xCA9*/ u8 field_CA9_d : 1; // 0x20 - /*0xCA9*/ u8 field_CA9_e : 1; // 0x40 - /*0xCA9*/ u8 field_CA9_f : 1; // 0x80 + /*0xBEC*/ u8 filler_BEC[16]; + /*0xBFC*/ u16 ecwords_BFC[6]; + /*0xC08*/ u16 ecwords_C08[6]; + /*0xC14*/ u16 ecwords_C14[6]; + /*0xC20*/ u8 filler_C20[0x88]; + /*0xCA8*/ u8 field_CA8; + /*0xCA9*/ u8 chosenLvl:2; // 0x1, 0x2 -> 0x3 + /*0xCA9*/ u8 field_CA9_a:1; // 0x4 + /*0xCA9*/ u8 field_CA9_b:1; // 0x8 + /*0xCA9*/ u8 field_CA9_c:1; // 0x10 + /*0xCA9*/ u8 field_CA9_d:1; // 0x20 + /*0xCA9*/ u8 field_CA9_e:1; // 0x40 + /*0xCA9*/ u8 field_CA9_f:1; // 0x80 /*0xCAA*/ u16 field_CAA[4]; - /*0xCB2*/ u16 battlePyramidWildHeaderId; + /*0xCB2*/ u16 field_CB2; /*0xCB4*/ u16 field_CB4[30]; /*0xCF0*/ u16 field_CF0[2]; /*0xCF4*/ u16 field_CF4[2]; @@ -416,21 +384,61 @@ struct SaveBlock2 /*0xE04*/ u16 field_E04; /*0xE06*/ u16 field_E06; /*0xE08*/ u16 field_E08[9]; - /*0xE1A*/ u16 battlePyramidFloor; // possibly? + /*0xE1A*/ u16 field_E1A; /*0xE1C*/ u16 field_E1C; /*0xE1E*/ u16 field_E1E[7]; /*0xE2C*/ struct PyramidBag pyramidBag; - /*0x???*/ u8 field_unkown[6]; - /*0xE6E*/ u16 battleTentWinStreak; + /*0xE58*/ u16 field_E58; + /*0xE6A*/ u16 field_E6A; + /*0xE6C*/ u16 field_E6C; + /*0xE6E*/ u16 field_E6E; /*0xE70*/ u8 field_E70[72]; /*0xEB8*/ u16 frontierBattlePoints; /*0xEBA*/ u8 field_EBA[39]; /*0xEE1*/ u8 field_EE1[2][PLAYER_NAME_LENGTH]; /*0xEF1*/ u8 field_EF1[2][4]; /*0xEF9*/ u8 field_EF9[51]; - // sizeof=0xF2C }; +struct SaveBlock2 +{ + /*0x00*/ u8 playerName[PLAYER_NAME_LENGTH]; + /*0x08*/ u8 playerGender; // MALE, FEMALE + /*0x09*/ u8 specialSaveWarp; + /*0x0A*/ u8 playerTrainerId[4]; + /*0x0E*/ u16 playTimeHours; + /*0x10*/ u8 playTimeMinutes; + /*0x11*/ u8 playTimeSeconds; + /*0x12*/ u8 playTimeVBlanks; + /*0x13*/ u8 optionsButtonMode; // OPTIONS_BUTTON_MODE_[NORMAL/LR/L_EQUALS_A] + /*0x14*/ u16 optionsTextSpeed:3; // OPTIONS_TEXT_SPEED_[SLOW/MID/FAST] + u16 optionsWindowFrameType:5; // Specifies one of the 20 decorative borders for text boxes + u16 optionsSound:1; // OPTIONS_SOUND_[MONO/STEREO] + u16 optionsBattleStyle:1; // OPTIONS_BATTLE_STYLE_[SHIFT/SET] + u16 optionsBattleSceneOff:1; // whether battle animations are disabled + u16 regionMapZoom:1; // whether the map is zoomed in + /*0x18*/ struct Pokedex pokedex; + /*0x90*/ u8 filler_90[0x8]; + /*0x98*/ struct Time localTimeOffset; + /*0xA0*/ struct Time lastBerryTreeUpdate; + /*0xA8*/ u32 field_A8; + /*0xAC*/ u32 encryptionKey; + + // TODO: fix and verify labels + /*0xB0*/ u8 field_B0; + /*0xB1*/ u8 field_B1; + /*0xB2*/ u8 field_B2_0:3; + /*0xB2*/ u8 field_B2_1:2; + /*0xB3*/ u8 field_B3[0x29]; + /*0xDC*/ struct UnkRecordMixingStruct field_DC[4]; + /*0x1EC*/ struct BerryCrush berryCrush; + /*0x1FC*/ struct PokemonJumpResults pokeJump; + /*0x20C*/ struct BerryPickingResults berryPick; + /*0x21C*/ u8 field_21C[1032]; + /*0x624*/ u16 contestLinkResults[20]; // 4 positions for 5 categories, possibly a struct or a 2d array + /*0x64C*/ struct BattleFrontier frontier; +}; // sizeof=0xF2C + extern struct SaveBlock2 *gSaveBlock2Ptr; struct SecretBaseParty diff --git a/include/new_game.h b/include/new_game.h index 2088d1826e..7e1169ec33 100644 --- a/include/new_game.h +++ b/include/new_game.h @@ -4,12 +4,7 @@ void WriteUnalignedWord(u32 var, u8 *dataPtr); u32 ReadUnalignedWord(u8* dataPtr); void CopyUnalignedWord(u8 *copyTo, u8 *copyFrom); -void InitPlayerTrainerId(void); -void SetDefaultOptions(void); -void ClearPokedexFlags(void); -void WarpToTruck(void); void NewGameInitData(void); -void ResetMiniGamesResults(void); void sub_808447C(void); void Sav2_ClearSetDefault(void); diff --git a/ld_script.txt b/ld_script.txt index 1949d04809..566059e20e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -246,6 +246,7 @@ SECTIONS { src/save_location.o(.text); src/item_icon.o(.text); asm/party_menu.o(.text); + src/battle_tent.o(.text); asm/battle_tent.o(.text); src/unk_text_util_2.o(.text); src/multiboot.o(.text); @@ -518,7 +519,7 @@ SECTIONS { src/save_location.o(.rodata); src/item_icon.o(.rodata); data/party_menu.o(.rodata); - data/battle_tent.o(.rodata); + src/battle_tent.o(.rodata); src/unk_text_util_2.o(.rodata); src/unk_81BAD84.o(.rodata); src/battle_controller_player_partner.o(.rodata); diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index a4aac55e2f..e81fcabe6d 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -1854,7 +1854,7 @@ static void LinkOpponentHandleCmd55(void) else gBattleOutcome = gBattleBufferA[gActiveBattler][1] ^ B_OUTCOME_DREW; - gSaveBlock2Ptr->field_CA9_b = gBattleBufferA[gActiveBattler][2]; + gSaveBlock2Ptr->frontier.field_CA9_b = gBattleBufferA[gActiveBattler][2]; FadeOutMapMusic(5); BeginFastPaletteFade(3); LinkOpponentBufferExecCompleted(); diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index d742d5df22..aaaaebd8d9 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -1684,7 +1684,7 @@ static void LinkPartnerHandleCmd55(void) { sub_81851A8(&gBattleBufferA[gActiveBattler][4]); gBattleOutcome = gBattleBufferA[gActiveBattler][1]; - gSaveBlock2Ptr->field_CA9_b = gBattleBufferA[gActiveBattler][2]; + gSaveBlock2Ptr->frontier.field_CA9_b = gBattleBufferA[gActiveBattler][2]; FadeOutMapMusic(5); BeginFastPaletteFade(3); LinkPartnerBufferExecCompleted(); diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index e0694029aa..9fc0c68eac 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -3104,7 +3104,7 @@ static void PlayerHandleCmd55(void) { sub_81851A8(&gBattleBufferA[gActiveBattler][4]); gBattleOutcome = gBattleBufferA[gActiveBattler][1]; - gSaveBlock2Ptr->field_CA9_b = gBattleBufferA[gActiveBattler][2]; + gSaveBlock2Ptr->frontier.field_CA9_b = gBattleBufferA[gActiveBattler][2]; FadeOutMapMusic(5); BeginFastPaletteFade(3); PlayerBufferExecCompleted(); diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 2b918d0180..0a712c79b2 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -1515,8 +1515,8 @@ void BtlController_EmitCmd55(u8 bufferId, u8 arg1) { sBattleBuffersTransferData[0] = CONTROLLER_55; sBattleBuffersTransferData[1] = arg1; - sBattleBuffersTransferData[2] = gSaveBlock2Ptr->field_CA9_b; - sBattleBuffersTransferData[3] = gSaveBlock2Ptr->field_CA9_b; + sBattleBuffersTransferData[2] = gSaveBlock2Ptr->frontier.field_CA9_b; + sBattleBuffersTransferData[3] = gSaveBlock2Ptr->frontier.field_CA9_b; sBattleBuffersTransferData[5] = sBattleBuffersTransferData[4] = sub_81850DC(&sBattleBuffersTransferData[6]); PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, sBattleBuffersTransferData[4] + 6); } diff --git a/src/battle_main.c b/src/battle_main.c index 8649209c0f..ace481c26e 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -676,7 +676,7 @@ static void CB2_InitBattleInternal(void) } gMain.inBattle = TRUE; - gSaveBlock2Ptr->field_CA9_b = 0; + gSaveBlock2Ptr->frontier.field_CA9_b = 0; for (i = 0; i < 6; i++) AdjustFriendship(&gPlayerParty[i], 3); @@ -2273,7 +2273,7 @@ static void sub_8038F34(void) for (i = 0; i < monsCount && (gLinkPlayers[i].version & 0xFF) == VERSION_EMERALD; i++); - if (!gSaveBlock2Ptr->field_CA9_b && i == monsCount) + if (!gSaveBlock2Ptr->frontier.field_CA9_b && i == monsCount) { if (FlagGet(FLAG_SYS_FRONTIER_PASS)) { @@ -5015,7 +5015,7 @@ static void HandleEndTurn_BattleLost(void) { gBattlescriptCurrInstr = BattleScript_PrintPlayerForfeitedLinkBattle; gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN); - gSaveBlock2Ptr->field_CA9_b = 1; + gSaveBlock2Ptr->frontier.field_CA9_b = 1; } else { @@ -5047,7 +5047,7 @@ static void HandleEndTurn_RanFromBattle(void) { gBattlescriptCurrInstr = BattleScript_PrintPlayerForfeited; gBattleOutcome = B_OUTCOME_FORFEITED; - gSaveBlock2Ptr->field_CA9_b = 1; + gSaveBlock2Ptr->frontier.field_CA9_b = 1; } else if (gBattleTypeFlags & BATTLE_TYPE_x4000000) { @@ -5666,7 +5666,7 @@ static void HandleAction_Run(void) } gBattleOutcome |= B_OUTCOME_LINK_BATTLE_RAN; - gSaveBlock2Ptr->field_CA9_b = 1; + gSaveBlock2Ptr->frontier.field_CA9_b = 1; } else { diff --git a/src/battle_setup.c b/src/battle_setup.c index ccc36b7c27..c8440a35fd 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -883,8 +883,8 @@ u8 sub_80B100C(s32 arg0) return sUnknown_0854FE98[Random() % ARRAY_COUNT(sUnknown_0854FE98)]; } - var = gSaveBlock2Ptr->field_CB4[gSaveBlock2Ptr->battlePyramidWildHeaderId * 2 + 0] - + gSaveBlock2Ptr->field_CB4[gSaveBlock2Ptr->battlePyramidWildHeaderId * 2 + 1]; + var = gSaveBlock2Ptr->frontier.field_CB4[gSaveBlock2Ptr->frontier.field_CB2 * 2 + 0] + + gSaveBlock2Ptr->frontier.field_CB4[gSaveBlock2Ptr->frontier.field_CB2 * 2 + 1]; return sUnknown_0854FE98[var % ARRAY_COUNT(sUnknown_0854FE98)]; } diff --git a/src/battle_tent.c b/src/battle_tent.c new file mode 100644 index 0000000000..85640e8e5b --- /dev/null +++ b/src/battle_tent.c @@ -0,0 +1,267 @@ +#include "global.h" +#include "overworld.h" +#include "event_data.h" +#include "region_map.h" +#include "battle.h" +#include "battle_setup.h" +#include "battle_tower.h" +#include "battle_frontier_2.h" +#include "random.h" +#include "item.h" +#include "constants/items.h" + +// this file's functions +void sub_81B99D4(void); +void sub_81B9A28(void); +void sub_81B9A44(void); +void sub_81B9A60(void); +void sub_81B9A90(void); +void sub_81B9ABC(void); +void sub_81B9B00(void); +void sub_81B9B28(void); +void sub_81B9BA0(void); +void sub_81B9BF4(void); +void sub_81B9C10(void); +void sub_81B9C2C(void); +void sub_81B9C70(void); +void sub_81B9C98(void); +void sub_81B9CF0(void); +void sub_81B9D28(void); +void sub_81B9D7C(void); +void sub_81B9D98(void); +void sub_81B9DB4(void); +void sub_81B9DF8(void); +void sub_81B9E20(void); +void sub_81B9E78(void); +void sub_81B9E88(void); +void sub_81BA040(void); +void sub_81B9EC0(void); + +// const rom data +void (*const gUnknown_086160B4[])(void) = +{ + sub_81B99D4, + sub_81B9A28, + sub_81B9A44, + sub_81B9A60, + sub_81B9A90, + sub_81B9ABC, + sub_81B9B00, + sub_81B9B28 +}; + +const u16 gUnknown_086160D4[] = {ITEM_NEST_BALL, ITEM_NONE}; + +void (*const gUnknown_086160D8[])(void) = +{ + sub_81B9BA0, + sub_81B9BF4, + sub_81B9C10, + sub_81B9C2C, + sub_81B9C70, + sub_81B9C98, + sub_81B9CF0 +}; + +const u16 gUnknown_086160F4[] = {ITEM_HYPER_POTION, ITEM_NONE}; + +void (*const gUnknown_086160F8[])(void) = +{ + sub_81B9D28, + sub_81B9D7C, + sub_81B9D98, + sub_81B9DB4, + sub_81B9DF8, + sub_81B9E20, + sub_81B9E78, + sub_81B9E88, + sub_81BA040, + sub_81B9EC0 +}; + +const u16 gUnknown_08616120[] = {ITEM_FULL_HEAL, ITEM_NONE}; + +// code +void sub_81B99B4(void) +{ + gUnknown_086160B4[gSpecialVar_0x8004](); +} + +void sub_81B99D4(void) +{ + gSaveBlock2Ptr->frontier.field_CA8 = 0; + gSaveBlock2Ptr->frontier.field_CB2 = 0; + gSaveBlock2Ptr->frontier.field_CA9_a = FALSE; + saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); +} + +void sub_81B9A28(void) +{ + gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_E6A; +} + +void sub_81B9A44(void) +{ + gSaveBlock2Ptr->frontier.field_E6A = gSpecialVar_0x8006; +} + +void sub_81B9A60(void) +{ + gTrainerBattleOpponent_A = (u32)((Random() % 255) * 5) / 64; + sub_8162614(gTrainerBattleOpponent_A, 0); +} + +void sub_81B9A90(void) +{ + if (gTrainerBattleOpponent_A < 300) + ConvertBattleFrontierTrainerSpeechToString(gUnknown_0203BC88[gTrainerBattleOpponent_A].speechBefore); +} + +void sub_81B9ABC(void) +{ + gSaveBlock2Ptr->frontier.field_CA8 = gSpecialVar_0x8005; + VarSet(VAR_TEMP_0, 0); + gSaveBlock2Ptr->frontier.field_CA9_a = TRUE; + sub_81A4C30(); +} + +void sub_81B9B00(void) +{ + gSaveBlock2Ptr->frontier.field_E6A = gUnknown_086160D4[Random() % 1]; +} + +void sub_81B9B28(void) +{ + if (AddBagItem(gSaveBlock2Ptr->frontier.field_E6A, 1) == TRUE) + { + CopyItemName(gSaveBlock2Ptr->frontier.field_E6A, gStringVar1); + gSaveBlock2Ptr->frontier.field_E6A = ITEM_NONE; + gSpecialVar_Result = TRUE; + } + else + { + gSpecialVar_Result = FALSE; + } +} + +void sub_81B9B80(void) +{ + gUnknown_086160D8[gSpecialVar_0x8004](); +} + +void sub_81B9BA0(void) +{ + gSaveBlock2Ptr->frontier.field_CA8 = 0; + gSaveBlock2Ptr->frontier.field_CB2 = 0; + gSaveBlock2Ptr->frontier.field_CA9_a = FALSE; + saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); +} + +void sub_81B9BF4(void) +{ + gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_E6C; +} + +void sub_81B9C10(void) +{ + gSaveBlock2Ptr->frontier.field_E6C = gSpecialVar_0x8006; +} + +void sub_81B9C2C(void) +{ + gSaveBlock2Ptr->frontier.field_CA8 = gSpecialVar_0x8005; + VarSet(VAR_TEMP_0, 0); + gSaveBlock2Ptr->frontier.field_CA9_a = TRUE; + sub_81A4C30(); +} + +void sub_81B9C70(void) +{ + gSaveBlock2Ptr->frontier.field_E6C = gUnknown_086160F4[Random() % 1]; +} + +void sub_81B9C98(void) +{ + if (AddBagItem(gSaveBlock2Ptr->frontier.field_E6C, 1) == TRUE) + { + CopyItemName(gSaveBlock2Ptr->frontier.field_E6C, gStringVar1); + gSaveBlock2Ptr->frontier.field_E6C = ITEM_NONE; + gSpecialVar_Result = TRUE; + } + else + { + gSpecialVar_Result = FALSE; + } +} + +void sub_81B9CF0(void) +{ + GetFrontierTrainerName(gStringVar1, gTrainerBattleOpponent_A); +} + +void sub_81B9D08(void) +{ + gUnknown_086160F8[gSpecialVar_0x8004](); +} + +void sub_81B9D28(void) +{ + gSaveBlock2Ptr->frontier.field_CA8 = 0; + gSaveBlock2Ptr->frontier.field_CB2 = 0; + gSaveBlock2Ptr->frontier.field_CA9_a = FALSE; + saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); +} + +void sub_81B9D7C(void) +{ + gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_E6E; +} + +void sub_81B9D98(void) +{ + gSaveBlock2Ptr->frontier.field_E6E = gSpecialVar_0x8006; +} + +void sub_81B9DB4(void) +{ + gSaveBlock2Ptr->frontier.field_CA8 = gSpecialVar_0x8005; + VarSet(VAR_TEMP_0, 0); + gSaveBlock2Ptr->frontier.field_CA9_a = TRUE; + sub_81A4C30(); +} + +void sub_81B9DF8(void) +{ + gSaveBlock2Ptr->frontier.field_E6E = gUnknown_08616120[Random() % 1]; +} + +void sub_81B9E20(void) +{ + if (AddBagItem(gSaveBlock2Ptr->frontier.field_E6E, 1) == TRUE) + { + CopyItemName(gSaveBlock2Ptr->frontier.field_E6E, gStringVar1); + gSaveBlock2Ptr->frontier.field_E6E = ITEM_NONE; + gSpecialVar_Result = TRUE; + } + else + { + gSpecialVar_Result = FALSE; + } +} + +void sub_81B9E78(void) +{ + ZeroPlayerPartyMons(); + sub_819A4F8(); +} + +void sub_81B9E88(void) +{ + sub_819DC00(); +} + +bool8 sub_81B9E94(void) +{ + return (gMapHeader.regionMapSectionId == 8 + && ((gMapHeader.mapDataId == 385) | (gMapHeader.mapDataId == 386))); +} diff --git a/src/item.c b/src/item.c index 319d167fc7..30710d08ac 100644 --- a/src/item.c +++ b/src/item.c @@ -845,8 +845,8 @@ u16 CountTotalItemQuantityInBag(u16 itemId) static bool8 CheckPyramidBagHasItem(u16 itemId, u16 count) { u8 i; - u16 *items = gSaveBlock2Ptr->pyramidBag.itemId[gSaveBlock2Ptr->frontierChosenLvl]; - u8 *quantities = gSaveBlock2Ptr->pyramidBag.quantity[gSaveBlock2Ptr->frontierChosenLvl]; + u16 *items = gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.chosenLvl]; + u8 *quantities = gSaveBlock2Ptr->frontier.pyramidBag.quantity[gSaveBlock2Ptr->frontier.chosenLvl]; for (i = 0; i < PYRAMID_BAG_ITEMS_COUNT; i++) { @@ -867,8 +867,8 @@ static bool8 CheckPyramidBagHasItem(u16 itemId, u16 count) static bool8 CheckPyramidBagHasSpace(u16 itemId, u16 count) { u8 i; - u16 *items = gSaveBlock2Ptr->pyramidBag.itemId[gSaveBlock2Ptr->frontierChosenLvl]; - u8 *quantities = gSaveBlock2Ptr->pyramidBag.quantity[gSaveBlock2Ptr->frontierChosenLvl]; + u16 *items = gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.chosenLvl]; + u8 *quantities = gSaveBlock2Ptr->frontier.pyramidBag.quantity[gSaveBlock2Ptr->frontier.chosenLvl]; for (i = 0; i < PYRAMID_BAG_ITEMS_COUNT; i++) { @@ -890,8 +890,8 @@ bool8 AddPyramidBagItem(u16 itemId, u16 count) { u16 i; - u16 *items = gSaveBlock2Ptr->pyramidBag.itemId[gSaveBlock2Ptr->frontierChosenLvl]; - u8 *quantities = gSaveBlock2Ptr->pyramidBag.quantity[gSaveBlock2Ptr->frontierChosenLvl]; + u16 *items = gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.chosenLvl]; + u8 *quantities = gSaveBlock2Ptr->frontier.pyramidBag.quantity[gSaveBlock2Ptr->frontier.chosenLvl]; u16 *newItems = Alloc(PYRAMID_BAG_ITEMS_COUNT * sizeof(u16)); u8 *newQuantities = Alloc(PYRAMID_BAG_ITEMS_COUNT * sizeof(u8)); @@ -963,8 +963,8 @@ bool8 RemovePyramidBagItem(u16 itemId, u16 count) { u16 i; - u16 *items = gSaveBlock2Ptr->pyramidBag.itemId[gSaveBlock2Ptr->frontierChosenLvl]; - u8 *quantities = gSaveBlock2Ptr->pyramidBag.quantity[gSaveBlock2Ptr->frontierChosenLvl]; + u16 *items = gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.chosenLvl]; + u8 *quantities = gSaveBlock2Ptr->frontier.pyramidBag.quantity[gSaveBlock2Ptr->frontier.chosenLvl]; i = gUnknown_0203CF30[3] + gUnknown_0203CF30[4]; if (items[i] == itemId && quantities[i] >= count) diff --git a/src/map_name_popup.c b/src/map_name_popup.c index 1782e9af82..34415a16ea 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -236,7 +236,7 @@ static void ShowMapNamePopUpWindow(void) else { withoutPrefixPtr = &(mapDisplayHeader[3]); - mapDisplayHeaderSource = gBattlePyramid_MapHeaderStrings[gSaveBlock2Ptr->battlePyramidWildHeaderId]; + mapDisplayHeaderSource = gBattlePyramid_MapHeaderStrings[gSaveBlock2Ptr->frontier.field_CB2]; } StringCopy(withoutPrefixPtr, mapDisplayHeaderSource); } diff --git a/src/new_game.c b/src/new_game.c index c387bce65e..8b8436d105 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -31,11 +31,9 @@ extern u8 gUnknown_030060B0; // TODO: replace those declarations with file headers extern u16 GetGeneratedTrainerIdLower(void); extern void ClearContestWinnerPicsInContestHall(void); -extern void warp_in(void); extern void sub_80BB358(void); extern void ResetBagScrollPositions(void); extern void ResetPokedex(void); -extern void sub_8084400(void); extern void ResetGabbyAndTy(void); extern void ResetSecretBases(void); extern void ResetLinkContestBoolean(void); @@ -58,6 +56,19 @@ extern void SetBerryPowder(u32* powder, u32 newValue); extern const u8 EventScript_2715DE[]; +// this file's functions +static void ClearFrontierRecord(void); +static void WarpToTruck(void); +static void ResetMiniGamesResults(void); + +// const rom data +static const struct ContestWinner sContestWinnerPicDummy = +{ + .monName = _(""), + .trainerName = _("") +}; + +// code void WriteUnalignedWord(u32 var, u8 *dataPtr) { dataPtr[0] = var; @@ -78,14 +89,14 @@ void CopyUnalignedWord(u8 *copyTo, u8 *copyFrom) copyTo[i] = copyFrom[i]; } -void InitPlayerTrainerId(void) +static void InitPlayerTrainerId(void) { u32 trainerId = (Random() << 0x10) | GetGeneratedTrainerIdLower(); WriteUnalignedWord(trainerId, gSaveBlock2Ptr->playerTrainerId); } // L=A isnt set here for some reason. -void SetDefaultOptions(void) +static void SetDefaultOptions(void) { gSaveBlock2Ptr->optionsTextSpeed = OPTIONS_TEXT_SPEED_MID; gSaveBlock2Ptr->optionsWindowFrameType = 0; @@ -95,37 +106,31 @@ void SetDefaultOptions(void) gSaveBlock2Ptr->regionMapZoom = FALSE; } -void ClearPokedexFlags(void) +static void ClearPokedexFlags(void) { gUnknown_030060B0 = 0; memset(&gSaveBlock2Ptr->pokedex.owned, 0, sizeof(gSaveBlock2Ptr->pokedex.owned)); memset(&gSaveBlock2Ptr->pokedex.seen, 0, sizeof(gSaveBlock2Ptr->pokedex.seen)); } -const struct ContestWinner gContestWinnerPicDummy = { - .monName = _(""), - .trainerName = _("") -}; - void ClearAllContestWinnerPics(void) { s32 i; ClearContestWinnerPicsInContestHall(); for (i = 8; i < 13; i++) - gSaveBlock1Ptr->contestWinners[i] = gContestWinnerPicDummy; + gSaveBlock1Ptr->contestWinners[i] = sContestWinnerPicDummy; } -void sub_8084400(void) +static void ClearFrontierRecord(void) { - // probably clearing one struct for battle frontier - CpuFill32(0, &gSaveBlock2Ptr->battleTower, 2272); + CpuFill32(0, &gSaveBlock2Ptr->frontier, sizeof(gSaveBlock2Ptr->frontier)); - gSaveBlock2Ptr->field_EE1[0][0] = EOS; - gSaveBlock2Ptr->field_EE1[1][0] = EOS; + gSaveBlock2Ptr->frontier.field_EE1[0][0] = EOS; + gSaveBlock2Ptr->frontier.field_EE1[1][0] = EOS; } -void WarpToTruck(void) +static void WarpToTruck(void) { Overworld_SetWarpDestination(25, 40, -1, -1, -1); // inside of truck warp_in(); @@ -157,7 +162,7 @@ void NewGameInitData(void) ZeroPlayerPartyMons(); ZeroEnemyPartyMons(); ResetPokedex(); - sub_8084400(); + ClearFrontierRecord(); ClearSav1(); ClearMailData(); gSaveBlock2Ptr->specialSaveWarp = 0; @@ -207,7 +212,7 @@ void NewGameInitData(void) ResetContestLinkResults(); } -void ResetMiniGamesResults(void) +static void ResetMiniGamesResults(void) { CpuFill16(0, &gSaveBlock2Ptr->berryCrush, sizeof(struct BerryCrush)); SetBerryPowder(&gSaveBlock2Ptr->berryCrush.berryPowderAmount, 0); diff --git a/src/pokemon.c b/src/pokemon.c index 800b7c0cd4..dac8e01975 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1575,8 +1575,8 @@ void sub_8068338(struct Pokemon *mon, struct UnknownPokemonStruct *src, bool8 lv u8 language; u8 value; - if (gSaveBlock2Ptr->frontierChosenLvl != 0) - level = BattleFrontierGetOpponentLvl(gSaveBlock2Ptr->frontierChosenLvl); + if (gSaveBlock2Ptr->frontier.chosenLvl != 0) + level = BattleFrontierGetOpponentLvl(gSaveBlock2Ptr->frontier.chosenLvl); else if (lvl50) level = 50; else diff --git a/src/record_mixing.c b/src/record_mixing.c index 35e518d8aa..8b21e214f8 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -197,10 +197,10 @@ static void SetSrcLookupPointers(void) sOldManSave = &gSaveBlock1Ptr->oldMan; sEasyChatPairsSave = gSaveBlock1Ptr->easyChatPairs; gUnknown_03001148 = &gUnknown_02039F9C; - sBattleTowerSave = &gSaveBlock2Ptr->battleTower; + sBattleTowerSave = &gSaveBlock2Ptr->frontier.battleTower; sLilycoveLadySave = &gSaveBlock1Ptr->lilycoveLady; gUnknown_03001154 = gSaveBlock2Ptr->field_DC; - sBattleTowerSave_Duplicate = &gSaveBlock2Ptr->battleTower; + sBattleTowerSave_Duplicate = &gSaveBlock2Ptr->frontier.battleTower; } static void PrepareUnknownExchangePacket(struct PlayerRecordsRS *dest) @@ -1625,24 +1625,24 @@ void sub_80E8260(struct UnkRecordMixingStruct2 *dst) { dst->field_120[j].language = GAME_LANGUAGE; CopyUnalignedWord(dst->field_120[j].playerId1, gSaveBlock2Ptr->playerTrainerId); - CopyUnalignedWord(dst->field_120[j].playerId2, gSaveBlock2Ptr->field_EF1[j]); + CopyUnalignedWord(dst->field_120[j].playerId2, gSaveBlock2Ptr->frontier.field_EF1[j]); StringCopy(dst->field_120[j].playerName1, gSaveBlock2Ptr->playerName); - StringCopy(dst->field_120[j].playerName2, gSaveBlock2Ptr->field_EE1[j]); + StringCopy(dst->field_120[j].playerName2, gSaveBlock2Ptr->frontier.field_EE1[j]); } for (i = 0; i < 2; i++) { - dst->field_0[0][i].field_4 = gSaveBlock2Ptr->field_CF0[i]; - dst->field_0[1][i].field_4 = gSaveBlock2Ptr->field_CF4[i]; - dst->field_0[2][i].field_4 = gSaveBlock2Ptr->field_CF8[i]; - dst->field_0[3][i].field_4 = gSaveBlock2Ptr->field_D14[i]; - dst->field_0[4][i].field_4 = gSaveBlock2Ptr->field_DD0[i]; - dst->field_0[5][i].field_4 = gSaveBlock2Ptr->field_DDE[i]; - dst->field_0[6][i].field_4 = gSaveBlock2Ptr->field_DEA[i]; - dst->field_0[7][i].field_4 = gSaveBlock2Ptr->field_E08[i]; - dst->field_0[8][i].field_4 = gSaveBlock2Ptr->field_E1E[i]; + dst->field_0[0][i].field_4 = gSaveBlock2Ptr->frontier.field_CF0[i]; + dst->field_0[1][i].field_4 = gSaveBlock2Ptr->frontier.field_CF4[i]; + dst->field_0[2][i].field_4 = gSaveBlock2Ptr->frontier.field_CF8[i]; + dst->field_0[3][i].field_4 = gSaveBlock2Ptr->frontier.field_D14[i]; + dst->field_0[4][i].field_4 = gSaveBlock2Ptr->frontier.field_DD0[i]; + dst->field_0[5][i].field_4 = gSaveBlock2Ptr->frontier.field_DDE[i]; + dst->field_0[6][i].field_4 = gSaveBlock2Ptr->frontier.field_DEA[i]; + dst->field_0[7][i].field_4 = gSaveBlock2Ptr->frontier.field_E08[i]; + dst->field_0[8][i].field_4 = gSaveBlock2Ptr->frontier.field_E1E[i]; - dst->field_120[i].field_8 = gSaveBlock2Ptr->field_CFC[i]; + dst->field_120[i].field_8 = gSaveBlock2Ptr->frontier.field_CFC[i]; } } diff --git a/src/recorded_battle.c b/src/recorded_battle.c index eb48ab15a3..a9360d49a1 100644 --- a/src/recorded_battle.c +++ b/src/recorded_battle.c @@ -390,7 +390,7 @@ u32 MoveRecordedBattleToSaveData(void) battleSave->opponentB = gTrainerBattleOpponent_B; battleSave->partnerId = gPartnerTrainerId; battleSave->field_4FA = gUnknown_0203C7B4; - battleSave->field_4FC = gSaveBlock2Ptr->field_CA9_b; + battleSave->field_4FC = gSaveBlock2Ptr->frontier.field_CA9_b; battleSave->field_4FD = sUnknown_0203C7AE; battleSave->field_4FE = sUnknown_0203C7AF; battleSave->battleStyle = gSaveBlock2Ptr->optionsBattleStyle; @@ -1293,7 +1293,7 @@ static bool32 AllocTryCopyRecordedBattleSaveData(struct RecordedBattleSave *dst) static void CB2_RecordedBattleEnd(void) { - gSaveBlock2Ptr->frontierChosenLvl = sUnknown_0203C7AD; + gSaveBlock2Ptr->frontier.chosenLvl = sUnknown_0203C7AD; gBattleOutcome = 0; gBattleTypeFlags = 0; gTrainerBattleOpponent_A = 0; @@ -1353,7 +1353,7 @@ static void SetRecordedBattleVarsFromSave(struct RecordedBattleSave *src) gTrainerBattleOpponent_B = src->opponentB; gPartnerTrainerId = src->partnerId; gUnknown_0203C7B4 = src->field_4FA; - sUnknown_0203C7AD = gSaveBlock2Ptr->frontierChosenLvl; + sUnknown_0203C7AD = gSaveBlock2Ptr->frontier.chosenLvl; sUnknown_0203C7AE = src->field_4FD; sUnknown_0203C7AF = src->field_4FE; sRecordedBattle_BattleStyle = src->battleStyle; @@ -1375,7 +1375,7 @@ static void SetRecordedBattleVarsFromSave(struct RecordedBattleSave *src) sUnknown_0203CCDC[i] = src->field_50E[i]; } - gSaveBlock2Ptr->frontierChosenLvl = src->field_4FC; + gSaveBlock2Ptr->frontier.chosenLvl = src->field_4FC; for (i = 0; i < MAX_BATTLERS_COUNT; i++) { diff --git a/src/start_menu.c b/src/start_menu.c index 7080ae6a83..dad1078872 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -288,14 +288,14 @@ static void BuildNormalStartMenu(void) { AddStartMenuAction(MENU_ACTION_POKEMON); } - + AddStartMenuAction(MENU_ACTION_BAG); if (FlagGet(FLAG_SYS_POKENAV_GET) == TRUE) { AddStartMenuAction(MENU_ACTION_POKENAV); } - + AddStartMenuAction(MENU_ACTION_PLAYER); AddStartMenuAction(MENU_ACTION_SAVE); AddStartMenuAction(MENU_ACTION_OPTION); @@ -322,7 +322,7 @@ static void BuildLinkModeStartMenu(void) { AddStartMenuAction(MENU_ACTION_POKENAV); } - + AddStartMenuAction(MENU_ACTION_PLAYER_LINK); AddStartMenuAction(MENU_ACTION_OPTION); AddStartMenuAction(MENU_ACTION_EXIT); @@ -384,18 +384,14 @@ static void ShowSafariBallsWindow(void) static void ShowPyramidFloorWindow(void) { - if (gSaveBlock2Ptr->field_CAA[4] == 7) // TODO: fix location - { + if (gSaveBlock2Ptr->frontier.field_CB2 == 7) sBattlePyramidFloorWindowId = AddWindow(&sPyramidFloorWindowTemplate_1); - } else - { sBattlePyramidFloorWindowId = AddWindow(&sPyramidFloorWindowTemplate_2); - } PutWindowTilemap(sBattlePyramidFloorWindowId); NewMenuHelpers_DrawStdWindowFrame(sBattlePyramidFloorWindowId, FALSE); - StringCopy(gStringVar1, sPyramindFloorNames[gSaveBlock2Ptr->field_CAA[4]]); + StringCopy(gStringVar1, sPyramindFloorNames[gSaveBlock2Ptr->frontier.field_CB2]); StringExpandPlaceholders(gStringVar4, gText_BattlePyramidFloor); PrintTextOnWindow(sBattlePyramidFloorWindowId, 1, gStringVar4, 0, 1, 0xFF, NULL); CopyWindowToVram(sBattlePyramidFloorWindowId, 2); @@ -419,7 +415,7 @@ static void RemoveExtraStartMenuWindows(void) static bool32 PrintStartMenuActions(s8 *pIndex, u32 count) { s8 index = *pIndex; - + do { if (sStartMenuItems[sCurrentStartMenuActions[index]].func.u8_void == StartMenuPlayerNameCallback) { @@ -444,11 +440,11 @@ static bool32 PrintStartMenuActions(s8 *pIndex, u32 count) return FALSE; } -static bool32 InitStartMenuStep(void) +static bool32 InitStartMenuStep(void) { s8 value = sUnknown_02037619[0]; - switch (value) + switch (value) { case 0: sUnknown_02037619[0]++; @@ -468,14 +464,14 @@ static bool32 InitStartMenuStep(void) { ShowSafariBallsWindow(); } - if (InBattlePyramid() != FALSE) + if (InBattlePyramid() != FALSE) { ShowPyramidFloorWindow(); } sUnknown_02037619[0]++; break; case 4: - if (PrintStartMenuActions(&sUnknown_02037619[1], 2) == FALSE) + if (PrintStartMenuActions(&sUnknown_02037619[1], 2) == FALSE) { break; } @@ -515,7 +511,7 @@ static void CreateStartMenuTask(TaskFunc followupFunc) SetTaskFuncWithFollowupFunc(taskId, StartMenuTask, followupFunc); } -static bool8 sub_809FA00(void) +static bool8 sub_809FA00(void) { if (InitStartMenuStep() == FALSE) { @@ -537,7 +533,7 @@ void sub_809FA34(u8 taskId) // Referenced in field_screen.s and rom_8011DC0.s { struct Task* task = &gTasks[taskId]; - switch(task->data[0]) + switch(task->data[0]) { case 0: if (InUnionRoom() == TRUE) @@ -576,13 +572,13 @@ static bool8 HandleStartMenuInput(void) PlaySE(SE_SELECT); sStartMenuCursorPos = MoveMenuCursor(-1); } - + if (gMain.newKeys & DPAD_DOWN) { PlaySE(SE_SELECT); sStartMenuCursorPos = MoveMenuCursor(1); } - + if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); @@ -592,20 +588,20 @@ static bool8 HandleStartMenuInput(void) return FALSE; } } - + gMenuCallback = sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func.u8_void; - - if (gMenuCallback != StartMenuSaveCallback + + if (gMenuCallback != StartMenuSaveCallback && gMenuCallback != StartMenuExitCallback && gMenuCallback != StartMenuSafariZoneRetireCallback && gMenuCallback != StartMenuBattlePyramidRetireCallback) { FadeScreen(1, 0); } - + return FALSE; } - + if (gMain.newKeys & (START_BUTTON | B_BUTTON)) { RemoveExtraStartMenuWindows(); @@ -625,10 +621,10 @@ static bool8 StartMenuPokedexCallback(void) RemoveExtraStartMenuWindows(); overworld_free_bg_tilemaps(); SetMainCallback2(sub_80BB534); // Display pokedex - + return TRUE; } - + return FALSE; } @@ -640,7 +636,7 @@ static bool8 StartMenuPokemonCallback(void) RemoveExtraStartMenuWindows(); overworld_free_bg_tilemaps(); SetMainCallback2(CB2_PartyMenuFromStartMenu); // Display party menu - + return TRUE; } @@ -693,7 +689,7 @@ static bool8 StartMenuPlayerNameCallback(void) { sub_80C51C4(CB2_ReturnToFieldWithOpenMenu); // Display frontier pass } - else + else { sub_80C4DDC(CB2_ReturnToFieldWithOpenMenu); // Display trainer card } @@ -736,7 +732,7 @@ static bool8 StartMenuExitCallback(void) { RemoveExtraStartMenuWindows(); HideStartMenu(); // Hide start menu - + return TRUE; } @@ -911,7 +907,7 @@ static void SaveGameTask(u8 taskId) case SAVE_IN_PROGRESS: return; } - + DestroyTask(taskId); EnableBothScriptContexts(); } @@ -972,7 +968,7 @@ static u8 SaveConfirmSaveCallback(void) { ShowSaveMessage(gText_BattlePyramidConfirmRest, SaveYesNoCallback); } - else + else { ShowSaveMessage(gText_ConfirmSave, SaveYesNoCallback); } @@ -1025,7 +1021,7 @@ static u8 SaveFileExistsCallback(void) { ShowSaveMessage(gText_DifferentSaveFile, SaveConfirmOverwriteNoCallback); } - else + else { ShowSaveMessage(gText_AlreadySavedFile, SaveConfirmOverwriteCallback); } @@ -1082,7 +1078,7 @@ static u8 SaveDoSaveCallback(void) saveStatus = TrySavingData(SAVE_OVERWRITE_DIFFERENT_FILE); gDifferentSaveFile = FALSE; } - else + else { saveStatus = TrySavingData(SAVE_NORMAL); } @@ -1118,7 +1114,7 @@ static u8 SaveReturnSuccessCallback(void) HideSaveInfoWindow(); return SAVE_SUCCESS; } - else + else { return SAVE_IN_PROGRESS; } @@ -1131,13 +1127,13 @@ static u8 SaveErrorCallback(void) PlaySE(SE_BOO); sSaveDialogCallback = SaveReturnErrorCallback; } - + return SAVE_IN_PROGRESS; } static u8 SaveReturnErrorCallback(void) { - if (!SaveErrorTimer()) + if (!SaveErrorTimer()) { return SAVE_IN_PROGRESS; } @@ -1182,7 +1178,7 @@ static u8 BattlePyramidRetireInputCallback(void) sub_80A0014(); return SAVE_SUCCESS; } - + return SAVE_IN_PROGRESS; } @@ -1254,8 +1250,8 @@ static void sub_80A0550(u8 taskId) { case 0: FillWindowPixelBuffer(0, 17); - AddTextPrinterParameterized(0, - 1, + AddTextPrinterParameterized(0, + 1, gText_SavingDontTurnOffPower, 255, NULL, @@ -1266,14 +1262,14 @@ static void sub_80A0550(u8 taskId) PutWindowTilemap(0); CopyWindowToVram(0, 3); BeginNormalPaletteFade(-1, 0, 16, 0, 0); - + if (gWirelessCommType != 0 && InUnionRoom()) { if (sub_800A07C()) { *step = 1; } - else + else { *step = 5; } @@ -1327,7 +1323,7 @@ static void ShowSaveInfoWindow(void) u8 color; u32 xOffset; u32 yOffset; - + if (!FlagGet(FLAG_SYS_POKEDEX_GET)) { saveInfoWindow.height -= 2; @@ -1340,7 +1336,7 @@ static void ShowSaveInfoWindow(void) color = TEXT_COLOR_RED; // Red when female, blue when male. if (gender == MALE) - { + { color = TEXT_COLOR_BLUE; } @@ -1423,4 +1419,4 @@ void AppendToList(u8 *list, u8 *pos, u8 newEntry) { list[*pos] = newEntry; (*pos)++; -} \ No newline at end of file +} diff --git a/src/tv.c b/src/tv.c index 2219a720b6..297754dfb4 100644 --- a/src/tv.c +++ b/src/tv.c @@ -1541,12 +1541,12 @@ static void InterviewAfter_BravoTrainerBattleTowerProfile(void) show->bravoTrainerTower.kind = TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE; show->bravoTrainerTower.active = TRUE; StringCopy(show->bravoTrainerTower.trainerName, gSaveBlock2Ptr->playerName); - StringCopy(show->bravoTrainerTower.pokemonName, gSaveBlock2Ptr->field_BD8); - show->bravoTrainerTower.species = gSaveBlock2Ptr->field_BD4; - show->bravoTrainerTower.defeatedSpecies = gSaveBlock2Ptr->field_BD6; - show->bravoTrainerTower.numFights = sub_8164FCC(gSaveBlock2Ptr->field_D07, 0); - show->bravoTrainerTower.wonTheChallenge = gSaveBlock2Ptr->field_D06; - if (gSaveBlock2Ptr->field_D07 == 0) + StringCopy(show->bravoTrainerTower.pokemonName, gSaveBlock2Ptr->frontier.field_BD8); + show->bravoTrainerTower.species = gSaveBlock2Ptr->frontier.field_BD4; + show->bravoTrainerTower.defeatedSpecies = gSaveBlock2Ptr->frontier.field_BD6; + show->bravoTrainerTower.numFights = sub_8164FCC(gSaveBlock2Ptr->frontier.field_D07, 0); + show->bravoTrainerTower.wonTheChallenge = gSaveBlock2Ptr->frontier.field_D06; + if (gSaveBlock2Ptr->frontier.field_D07 == 0) { show->bravoTrainerTower.btLevel = 50; } @@ -1557,13 +1557,13 @@ static void InterviewAfter_BravoTrainerBattleTowerProfile(void) show->bravoTrainerTower.interviewResponse = gSpecialVar_0x8004; tv_store_id_2x(show); show->bravoTrainerTower.language = gGameLanguage; - if (show->bravoTrainerTower.language == LANGUAGE_JAPANESE || gSaveBlock2Ptr->field_BEB == LANGUAGE_JAPANESE) + if (show->bravoTrainerTower.language == LANGUAGE_JAPANESE || gSaveBlock2Ptr->frontier.field_BEB == LANGUAGE_JAPANESE) { show->bravoTrainerTower.pokemonNameLanguage = LANGUAGE_JAPANESE; } else { - show->bravoTrainerTower.pokemonNameLanguage = gSaveBlock2Ptr->field_BEB; + show->bravoTrainerTower.pokemonNameLanguage = gSaveBlock2Ptr->frontier.field_BEB; } } @@ -1972,7 +1972,7 @@ void sub_80EDB44(void) show->rivalTrainer.nGoldSymbols ++; } } - show->rivalTrainer.battlePoints = gSaveBlock2Ptr->frontierBattlePoints; + show->rivalTrainer.battlePoints = gSaveBlock2Ptr->frontier.frontierBattlePoints; StringCopy(show->rivalTrainer.playerName, gSaveBlock2Ptr->playerName); tv_store_id_3x(show); show->rivalTrainer.language = gGameLanguage; @@ -2540,8 +2540,8 @@ void sub_80EE8C8(u16 winStreak, u8 facility) show->frontier.species2 = GetMonData(&gPlayerParty[1], MON_DATA_SPECIES, NULL); break; case 4: - show->frontier.species1 = GetMonData(&gSaveBlock1Ptr->playerParty[gSaveBlock2Ptr->field_CAA[0] - 1], MON_DATA_SPECIES, NULL); - show->frontier.species2 = GetMonData(&gSaveBlock1Ptr->playerParty[gSaveBlock2Ptr->field_CAA[1] - 1], MON_DATA_SPECIES, NULL); + show->frontier.species1 = GetMonData(&gSaveBlock1Ptr->playerParty[gSaveBlock2Ptr->frontier.field_CAA[0] - 1], MON_DATA_SPECIES, NULL); + show->frontier.species2 = GetMonData(&gSaveBlock1Ptr->playerParty[gSaveBlock2Ptr->frontier.field_CAA[1] - 1], MON_DATA_SPECIES, NULL); break; } tv_store_id_3x(show); diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 862672e198..97fa186ea5 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -5102,7 +5102,7 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi } if (gMapHeader.mapDataId == 0x169) { - headerId = gSaveBlock2Ptr->battlePyramidWildHeaderId; + headerId = gSaveBlock2Ptr->frontier.field_CB2; if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll()) return FALSE; else if (DoWildEncounterRateTest(gBattlePyramidWildMonHeaders[headerId].landMonsInfo->encounterRate, FALSE) != TRUE) @@ -5240,7 +5240,7 @@ bool8 SweetScentWildEncounter(void) } if (gMapHeader.mapDataId == 0x169) { - headerId = gSaveBlock2Ptr->battlePyramidWildHeaderId; + headerId = gSaveBlock2Ptr->frontier.field_CB2; if (TryGenerateWildMon(gBattlePyramidWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, 0) != TRUE) return FALSE; From 9329ffc2bc4435337f456334046eba18e2d27302 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 17 Jun 2018 12:39:58 +0200 Subject: [PATCH 22/55] review cut changes --- src/field_effect.c | 4 ++-- src/fldeff_cut.c | 6 ++---- src/fldeff_strength.c | 2 +- src/rom6.c | 4 ++-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/field_effect.c b/src/field_effect.c index 00814192ec..f047c78a35 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -561,7 +561,7 @@ u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y) PreservePaletteInWeather(IndexOfSpritePaletteTag(gMonPaletteTable[species].tag) + 0x10); if (spriteId == 0xFFFF) return 0x40; - + return spriteId; } #else @@ -623,7 +623,7 @@ u8 CreateMonSprite_FieldMove(u16 species, u32 d, u32 g, s16 x, s16 y, u8 subprio PreservePaletteInWeather(IndexOfSpritePaletteTag(spritePalette->tag) + 0x10); if (spriteId == 0xFFFF) return 0x40; - + return spriteId; } diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 615de02028..bdc9b78687 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -266,7 +266,7 @@ bool8 SetUpFieldMove_Cut(void) tileCuttable = TRUE; j = 0; - while (1) + do { if (sHyperCutStruct[i].unk2[j] == 0) break; @@ -275,9 +275,7 @@ bool8 SetUpFieldMove_Cut(void) tileCuttable = FALSE; break; } - if (++j >= 2) - break; - } + } while (++j <= 1); if (tileCuttable == TRUE) { diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index 52b76edb44..fb5aa5e95b 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -14,7 +14,7 @@ static void sub_8145E74(void); // text bool8 SetUpFieldMove_Strength(void) { - if (SetLastTalkedObjectInFrontOfPlayer(87) == TRUE) + if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_PUSHABLE_BOULDER) == TRUE) { gSpecialVar_Result = GetCursorSelectionMonId(); gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; diff --git a/src/rom6.c b/src/rom6.c index cec2cfcb69..6c74396224 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -118,14 +118,14 @@ static void sub_813561C(u8 taskId) bool8 SetUpFieldMove_RockSmash(void) { - if(ShouldDoBrailleStrengthEffect()) + if (ShouldDoBrailleStrengthEffect()) { gSpecialVar_Result = GetCursorSelectionMonId(); gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; gPostMenuFieldCallback = sub_8179834; return TRUE; } - else if (SetLastTalkedObjectInFrontOfPlayer(0x56) == TRUE) + else if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_BREAKABLE_ROCK) == TRUE) { gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; gPostMenuFieldCallback = sub_81356C4; From caa36b530a93dc51727822abf6c4c31fa8cbaf63 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 17 Jun 2018 16:48:58 +0200 Subject: [PATCH 23/55] label and document battle windows --- asm/battle_frontier_2.s | 16 +- asm/easy_chat.s | 2 +- asm/party_menu.s | 2 +- asm/pokemon_storage_system.s | 4 +- asm/pokemon_summary_screen.s | 4 +- asm/pokenav.s | 6 +- asm/rom_8011DC0.s | 24 +- asm/shop.s | 4 +- asm/slot_machine.s | 4 +- asm/trade.s | 4 +- data/data2b.s | 4 +- include/battle.h | 2 +- include/battle_ai_script_commands.h | 15 +- include/battle_bg.h | 6 +- include/battle_message.h | 2 +- include/battle_util.h | 8 +- include/text_window.h | 8 +- src/battle_ai_script_commands.c | 705 +++++++++++----------- src/battle_ai_switch_items.c | 263 ++++---- src/battle_anim.c | 117 ++-- src/battle_anim_sound_tasks.c | 12 +- src/battle_bg.c | 100 +-- src/battle_controller_link_opponent.c | 2 +- src/battle_controller_link_partner.c | 2 +- src/battle_controller_opponent.c | 2 +- src/battle_controller_player.c | 20 +- src/battle_controller_player_partner.c | 2 +- src/battle_controller_recorded_opponent.c | 2 +- src/battle_controller_recorded_player.c | 2 +- src/battle_controller_safari.c | 6 +- src/battle_controller_wally.c | 6 +- src/battle_main.c | 46 +- src/battle_message.c | 684 ++++++++++++++++++--- src/battle_script_commands.c | 10 +- src/berry_blender.c | 12 +- src/clear_save_data_screen.c | 2 +- src/egg_hatch.c | 2 +- src/evolution_scene.c | 30 +- src/field_region_map.c | 2 +- src/hall_of_fame.c | 4 +- src/item_menu.c | 4 +- src/list_menu.c | 2 +- src/main_menu.c | 4 +- src/menu.c | 6 +- src/mystery_event_menu.c | 2 +- src/pokeblock.c | 8 +- src/pokeblock_feed.c | 4 +- src/region_map.c | 2 +- src/reshow_battle_screen.c | 2 +- src/scrcmd.c | 2 +- src/start_menu.c | 2 +- src/starter_choose.c | 4 +- src/text_window.c | 12 +- src/use_pokeblock.c | 2 +- src/wallclock.c | 2 +- 55 files changed, 1361 insertions(+), 845 deletions(-) diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s index b2b4542789..02bfe8b3bd 100644 --- a/asm/battle_frontier_2.s +++ b/asm/battle_frontier_2.s @@ -20646,29 +20646,29 @@ _081A5328: ldr r4, =gDisplayedStringBattle adds r0, r4, 0 movs r1, 0xF - bl BattleHandleAddTextPrinter + bl BattlePutTextOnWindow ldr r0, =gText_Vs movs r1, 0x10 - bl BattleHandleAddTextPrinter + bl BattlePutTextOnWindow ldr r0, =gText_OpponentMon1Name bl BattleStringExpandPlaceholdersToDisplayedString adds r0, r4, 0 movs r1, 0x11 - bl BattleHandleAddTextPrinter + bl BattlePutTextOnWindow ldr r0, =gText_Mind movs r1, 0x12 - bl BattleHandleAddTextPrinter + bl BattlePutTextOnWindow ldr r0, =gText_Skill movs r1, 0x13 - bl BattleHandleAddTextPrinter + bl BattlePutTextOnWindow ldr r0, =gText_Body movs r1, 0x14 - bl BattleHandleAddTextPrinter + bl BattlePutTextOnWindow ldr r0, =gText_Judgement bl BattleStringExpandPlaceholdersToDisplayedString adds r0, r4, 0 movs r1, 0x15 - bl BattleHandleAddTextPrinter + bl BattlePutTextOnWindow b _081A553E .pool _081A53B4: @@ -20752,7 +20752,7 @@ _081A5464: bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, =gDisplayedStringBattle movs r1, 0x15 - bl BattleHandleAddTextPrinter + bl BattlePutTextOnWindow ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] diff --git a/asm/easy_chat.s b/asm/easy_chat.s index eb423cf4cf..a6b522a7ed 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -5988,7 +5988,7 @@ sub_811D0BC: @ 811D0BC movs r0, 0x1 movs r1, 0x1 movs r2, 0xE0 - bl sub_809882C + bl LoadSav2WindowGfx movs r0, 0x1 movs r1, 0x1 movs r2, 0xE diff --git a/asm/party_menu.s b/asm/party_menu.s index 4001b71446..6e2b1e55a8 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -4396,7 +4396,7 @@ _081B23E8: movs r0, 0 movs r1, 0x4F movs r2, 0xD0 - bl sub_809882C + bl LoadSav2WindowGfx bl GetOverworldTextboxPalettePtr movs r1, 0xE0 movs r2, 0x20 diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 5988eb7323..f2b9a55639 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -1837,7 +1837,7 @@ _080C805E: movs r0, 0x1 movs r1, 0xB movs r2, 0xE0 - bl sub_809882C + bl LoadSav2WindowGfx b _080C8198 .pool _080C808C: @@ -6712,7 +6712,7 @@ sub_80CAC1C: @ 80CAC1C movs r0, 0x1 movs r1, 0x2 movs r2, 0xD0 - bl sub_809882C + bl LoadSav2WindowGfx movs r0, 0x20 str r0, [sp] movs r0, 0x14 diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index c7f2ad0859..901669715a 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -5293,11 +5293,11 @@ sub_81C6BD8: @ 81C6BD8 movs r0, 0 movs r1, 0x1 movs r2, 0xE0 - bl sub_809882C + bl LoadSav2WindowGfx movs r0, 0 movs r1, 0xA movs r2, 0xD0 - bl copy_textbox_border_tile_patterns_to_vram + bl LoadMessageBoxGfx ldr r0, =gUnknown_0860F074 movs r1, 0xF0 movs r2, 0x20 diff --git a/asm/pokenav.s b/asm/pokenav.s index 00c8c84488..a9c1ec7e63 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -10101,7 +10101,7 @@ sub_81CC09C: @ 81CC09C ldrb r0, [r4, 0x14] movs r1, 0x1 movs r2, 0x40 - bl sub_809882C + bl LoadSav2WindowGfx ldrb r0, [r4, 0x14] movs r1, 0x1 movs r2, 0x4 @@ -11351,7 +11351,7 @@ sub_81CCA1C: @ 81CCA1C lsrs r0, 24 movs r1, 0x42 movs r2, 0x40 - bl box_border_load_tiles_and_pal + bl LoadSav2WindowGfx_ ldrb r0, [r5, 0x8] movs r1, 0x42 movs r2, 0x4 @@ -22282,7 +22282,7 @@ sub_81D2824: @ 81D2824 movs r0, 0 movs r1, 0x1 movs r2, 0xE0 - bl sub_809882C + bl LoadSav2WindowGfx ldr r0, =gUnknown_0860F074 movs r1, 0xF0 movs r2, 0x20 diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index f906304cad..b43978f84e 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -10972,11 +10972,11 @@ _08018574: movs r0, 0 movs r1, 0xA movs r2, 0xE0 - bl sub_809882C + bl LoadSav2WindowGfx movs r0, 0 movs r1, 0x1 movs r2, 0xF0 - bl box_border_load_tiles_and_pal + bl LoadSav2WindowGfx_ movs r4, 0x20 str r4, [sp] str r4, [sp, 0x4] @@ -15907,11 +15907,11 @@ _0801AD8C: movs r0, 0 movs r1, 0x1 movs r2, 0xD0 - bl sub_809882C + bl LoadSav2WindowGfx movs r0, 0 movs r1, 0x1 movs r2, 0xD0 - bl box_border_load_tiles_and_pal + bl LoadSav2WindowGfx_ bl sub_819789C ldr r0, =sub_801AC40 bl SetVBlankCallback @@ -27081,11 +27081,11 @@ sub_8020740: @ 8020740 movs r0, 0x3 movs r1, 0x1 movs r2, 0xD0 - bl sub_809882C + bl LoadSav2WindowGfx movs r0, 0x3 movs r1, 0xA movs r2, 0x20 - bl box_border_load_tiles_and_pal + bl LoadSav2WindowGfx_ ldr r0, =gUnknown_0860F074 movs r1, 0xE0 movs r2, 0x20 @@ -30171,7 +30171,7 @@ _0802210C: ldr r4, =0x0000021d adds r1, r4, 0 movs r2, 0xD0 - bl box_border_load_tiles_and_pal + bl LoadSav2WindowGfx_ ldrb r0, [r5] movs r1, 0 adds r2, r4, 0 @@ -30370,7 +30370,7 @@ _08022296: ldr r4, =0x0000021d adds r1, r4, 0 movs r2, 0xD0 - bl box_border_load_tiles_and_pal + bl LoadSav2WindowGfx_ ldrb r0, [r6, 0x2] movs r1, 0 adds r2, r4, 0 @@ -35221,7 +35221,7 @@ sub_80248B0: @ 80248B0 ldr r5, =0x0000021d adds r1, r5, 0 movs r2, 0xD0 - bl box_border_load_tiles_and_pal + bl LoadSav2WindowGfx_ ldrb r4, [r4] bl sub_80247BC adds r3, r0, 0 @@ -41645,7 +41645,7 @@ sub_8027BEC: @ 8027BEC adds r0, r7, 0 adds r1, r4, 0 movs r2, 0xD0 - bl box_border_load_tiles_and_pal + bl LoadSav2WindowGfx_ adds r0, r7, 0 adds r1, r4, 0 movs r2, 0xD @@ -44214,7 +44214,7 @@ sub_802902C: @ 802902C movs r0, 0 movs r1, 0xA movs r2, 0xB0 - bl box_border_load_tiles_and_pal + bl LoadSav2WindowGfx_ pop {r0} bx r0 thumb_func_end sub_802902C @@ -54638,7 +54638,7 @@ sub_802E500: @ 802E500 adds r0, r4, 0 adds r1, r5, 0 movs r2, 0xD0 - bl box_border_load_tiles_and_pal + bl LoadSav2WindowGfx_ adds r0, r4, 0 adds r1, r5, 0 movs r2, 0xD diff --git a/asm/shop.s b/asm/shop.s index b498da70d5..515174151a 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -1157,11 +1157,11 @@ BuyMenuInitWindows: @ 80E0468 movs r0, 0 movs r1, 0x1 movs r2, 0xD0 - bl sub_809882C + bl LoadSav2WindowGfx movs r0, 0 movs r1, 0xA movs r2, 0xE0 - bl copy_textbox_border_tile_patterns_to_vram + bl LoadMessageBoxGfx movs r0, 0 bl PutWindowTilemap movs r0, 0x1 diff --git a/asm/slot_machine.s b/asm/slot_machine.s index fc475c2e3d..1719833a53 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -634,12 +634,12 @@ sub_812AA48: @ 812AA48 lsls r1, 2 movs r0, 0 movs r2, 0xF0 - bl copy_textbox_border_tile_patterns_to_vram + bl LoadMessageBoxGfx movs r1, 0x85 lsls r1, 2 movs r0, 0 movs r2, 0xE0 - bl sub_809882C + bl LoadSav2WindowGfx movs r0, 0 bl PutWindowTilemap pop {r0} diff --git a/asm/trade.s b/asm/trade.s index b96fb8ca9e..0d73539380 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -241,11 +241,11 @@ _08077310: movs r0, 0 movs r1, 0x14 movs r2, 0xC0 - bl box_border_load_tiles_and_pal + bl LoadSav2WindowGfx_ movs r0, 0x2 movs r1, 0x1 movs r2, 0xE0 - bl sub_809882C + bl LoadSav2WindowGfx bl LoadMonIconPalettes ldr r2, =gUnknown_0203229C ldr r0, [r2] diff --git a/data/data2b.s b/data/data2b.s index 8d759b0b26..17a44ecbc2 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -4684,7 +4684,7 @@ gUnknown_0831AA00:: @ 831AA00 obj_tiles gUnknown_08D77B0C, 0x1000, 0x2710 .align 2 -gUnknown_0831AA08:: @ 831AA08 +gBattleBgTemplates:: @ 831AA08 .4byte 0x00000580, 0x000005c5, 0x000013e6, 0x000033ab .align 2 @@ -4743,7 +4743,7 @@ gUnknown_0831AAE0:: @ 831AAE0 null_window_template .align 2 -gUnknown_0831ABA0:: @ 831ABA0 +gBattleWindowTemplates:: @ 831ABA0 .4byte gUnknown_0831AA18 .4byte gUnknown_0831AAE0 diff --git a/include/battle.h b/include/battle.h index ae8a1c98a7..bf875ad9de 100644 --- a/include/battle.h +++ b/include/battle.h @@ -606,7 +606,7 @@ struct BattleScripting u8 reshowMainState; u8 reshowHelperState; u8 field_23; - u8 field_24; + u8 windowsType; // 0 - normal, 1 - battle arena u8 multiplayerId; }; diff --git a/include/battle_ai_script_commands.h b/include/battle_ai_script_commands.h index 316f76de60..d23ad048a5 100644 --- a/include/battle_ai_script_commands.h +++ b/include/battle_ai_script_commands.h @@ -1,13 +1,18 @@ #ifndef GUARD_BATTLE_AI_SCRIPT_COMMANDS_H #define GUARD_BATTLE_AI_SCRIPT_COMMANDS_H +// return values for BattleAI_ChooseMoveOrAction +// 0 - 3 are move idx +#define AI_CHOICE_FLEE 4 +#define AI_CHOICE_WATCH 5 + void BattleAI_HandleItemUseBeforeAISetup(u8 defaultScoreMoves); void BattleAI_SetupAIData(u8 defaultScoreMoves); u8 BattleAI_ChooseMoveOrAction(void); -void ClearBattlerMoveHistory(u8 bank); -void RecordAbilityBattle(u8 bank, u8 abilityId); -void ClearBattlerAbilityHistory(u8 bank); -void RecordItemEffectBattle(u8 bank, u8 itemEffect); -void ClearBankItemEffectHistory(u8 bank); +void ClearBattlerMoveHistory(u8 battlerId); +void RecordAbilityBattle(u8 battlerId, u8 abilityId); +void ClearBattlerAbilityHistory(u8 battlerId); +void RecordItemEffectBattle(u8 battlerId, u8 itemEffect); +void ClearBattlerItemEffectHistory(u8 battlerId); #endif // GUARD_BATTLE_AI_SCRIPT_COMMANDS_H diff --git a/include/battle_bg.h b/include/battle_bg.h index 7fc09fbf70..dac41c992c 100644 --- a/include/battle_bg.h +++ b/include/battle_bg.h @@ -1,13 +1,13 @@ #ifndef GUARD_BATTLE_BG_H #define GUARD_BATTLE_BG_H -void sub_8035658(void); +void BattleInitBgsAndWindows(void); void sub_80356D0(void); -void ApplyPlayerChosenFrameToBattleMenu(void); +void LoadBattleMenuWindowGfx(void); void DrawMainBattleBackground(void); void LoadBattleTextboxAndBackground(void); void sub_8035D74(u8 taskId); -void LoadBattleEntryBackground(void); +void DrawBattleEntryBackground(void); bool8 LoadChosenBattleElement(u8 caseId); #endif // GUARD_BATTLE_BG_H diff --git a/include/battle_message.h b/include/battle_message.h index bf9b590afb..f792ff7b0b 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -212,7 +212,7 @@ struct StringInfoBattle void BufferStringBattle(u16 stringID); u32 BattleStringExpandPlaceholdersToDisplayedString(const u8* src); u32 BattleStringExpandPlaceholders(const u8* src, u8* dst); -void BattleHandleAddTextPrinter(const u8* text, u8 arg1); +void BattlePutTextOnWindow(const u8* text, u8 arg1); void SetPpNumbersPaletteInMoveSelection(void); u8 GetCurrentPpToMaxPpState(u8 currentPp, u8 maxPp); diff --git a/include/battle_util.h b/include/battle_util.h index e5c1aaf180..0b5590011d 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -30,10 +30,14 @@ #define ABILITYEFFECT_CHECK_ON_FIELD 0x13 #define ABILITYEFFECT_SWITCH_IN_WEATHER 0xFF +#define ABILITY_ON_OPPOSING_FIELD(battlerId, abilityId)(AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, battlerId, abilityId, 0, 0)) +#define ABILITY_ON_FIELD(abilityId)(AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, abilityId, 0, 0)) +#define ABILITY_ON_FIELD2(abilityId)(AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, abilityId, 0, 0)) + #define ITEMEFFECT_ON_SWITCH_IN 0x0 -#define WEATHER_HAS_EFFECT ((!AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_CLOUD_NINE, 0, 0) && !AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_AIR_LOCK, 0, 0))) -#define WEATHER_HAS_EFFECT2 ((!AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, ABILITY_CLOUD_NINE, 0, 0) && !AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, ABILITY_AIR_LOCK, 0, 0))) +#define WEATHER_HAS_EFFECT ((!ABILITY_ON_FIELD(ABILITY_CLOUD_NINE) && !ABILITY_ON_FIELD(ABILITY_AIR_LOCK))) +#define WEATHER_HAS_EFFECT2 ((!ABILITY_ON_FIELD2(ABILITY_CLOUD_NINE) && !ABILITY_ON_FIELD2(ABILITY_AIR_LOCK))) #define BS_GET_TARGET 0 #define BS_GET_ATTACKER 1 diff --git a/include/text_window.h b/include/text_window.h index 2ac13fab75..3d2b8692f6 100644 --- a/include/text_window.h +++ b/include/text_window.h @@ -13,10 +13,10 @@ extern const u8 gTextWindowFrame1_Gfx[]; extern const u16 gTextWindowFrame1_Pal[]; const struct TilesPal* GetWindowFrameTilesPal(u8 id); -void copy_textbox_border_tile_patterns_to_vram(u8 windowId, u16 destOffset, u8 palOffset); -void sub_809882C(u8 windowId, u16 destOffset, u8 palOffset); -void sub_80987D4(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset); -void box_border_load_tiles_and_pal(u8 windowId, u16 destOffset, u8 palOffset); +void LoadMessageBoxGfx(u8 windowId, u16 destOffset, u8 palOffset); +void LoadSav2WindowGfx(u8 windowId, u16 destOffset, u8 palOffset); +void LoadWindowGfx(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset); +void LoadSav2WindowGfx_(u8 windowId, u16 destOffset, u8 palOffset); void sub_8098858(u8 windowId, u16 tileNum, u8 palNum); void sub_80989E0(u8 windowId, u16 tileNum, u8 palNum); void rbox_fill_rectangle(u8 windowId); diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index e1a9168a99..1315989858 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -3,6 +3,7 @@ #include "pokemon.h" #include "battle.h" #include "battle_setup.h" +#include "recorded_battle.h" #include "constants/species.h" #include "constants/abilities.h" #include "random.h" @@ -41,13 +42,12 @@ in order to read the next command correctly. refer to battle_ai_scripts.s for th AI scripts. */ -extern const u8 * const gBattleAI_ScriptsTable[]; +extern const u8 *const gBattleAI_ScriptsTable[]; -extern u32 GetAiScriptsInRecordedBattle(); extern u32 GetAiScriptsInBattleFactory(); -static u8 BattleAI_ChooseMoveOrAction_Singles(void); -static u8 BattleAI_ChooseMoveOrAction_Doubles(void); +static u8 ChooseMoveOrAction_Singles(void); +static u8 ChooseMoveOrAction_Doubles(void); static void RecordLastUsedMoveByTarget(void); static void BattleAI_DoAIProcessing(void); static void AIStackPushVar(const u8 *); @@ -90,7 +90,7 @@ static void BattleAICmd_get_turn_count(void); static void BattleAICmd_get_type(void); static void BattleAICmd_get_considered_move_power(void); static void BattleAICmd_get_how_powerful_move_is(void); -static void BattleAICmd_get_last_used_bank_move(void); +static void BattleAICmd_get_last_used_battler_move(void); static void BattleAICmd_if_equal_(void); static void BattleAICmd_if_not_equal_(void); static void BattleAICmd_if_user_goes(void); @@ -154,115 +154,113 @@ static void BattleAICmd_if_flash_fired(void); static void BattleAICmd_if_holds_item(void); // ewram - EWRAM_DATA const u8 *gAIScriptPtr = NULL; EWRAM_DATA static u8 sBattler_AI = 0; // const rom data - typedef void (*BattleAICmdFunc)(void); static const BattleAICmdFunc sBattleAICmdTable[] = { - BattleAICmd_if_random_less_than, // 0x0 - BattleAICmd_if_random_greater_than, // 0x1 - BattleAICmd_if_random_equal, // 0x2 - BattleAICmd_if_random_not_equal, // 0x3 - BattleAICmd_score, // 0x4 - BattleAICmd_if_hp_less_than, // 0x5 - BattleAICmd_if_hp_more_than, // 0x6 - BattleAICmd_if_hp_equal, // 0x7 - BattleAICmd_if_hp_not_equal, // 0x8 - BattleAICmd_if_status, // 0x9 - BattleAICmd_if_not_status, // 0xA - BattleAICmd_if_status2, // 0xB - BattleAICmd_if_not_status2, // 0xC - BattleAICmd_if_status3, // 0xD - BattleAICmd_if_not_status3, // 0xE - BattleAICmd_if_side_affecting, // 0xF - BattleAICmd_if_not_side_affecting, // 0x10 - BattleAICmd_if_less_than, // 0x11 - BattleAICmd_if_more_than, // 0x12 - BattleAICmd_if_equal, // 0x13 - BattleAICmd_if_not_equal, // 0x14 - BattleAICmd_if_less_than_ptr, // 0x15 - BattleAICmd_if_more_than_ptr, // 0x16 - BattleAICmd_if_equal_ptr, // 0x17 - BattleAICmd_if_not_equal_ptr, // 0x18 - BattleAICmd_if_move, // 0x19 - BattleAICmd_if_not_move, // 0x1A - BattleAICmd_if_in_bytes, // 0x1B - BattleAICmd_if_not_in_bytes, // 0x1C - BattleAICmd_if_in_hwords, // 0x1D - BattleAICmd_if_not_in_hwords, // 0x1E - BattleAICmd_if_user_has_attacking_move, // 0x1F - BattleAICmd_if_user_has_no_attacking_moves, // 0x20 - BattleAICmd_get_turn_count, // 0x21 - BattleAICmd_get_type, // 0x22 - BattleAICmd_get_considered_move_power, // 0x23 - BattleAICmd_get_how_powerful_move_is, // 0x24 - BattleAICmd_get_last_used_bank_move, // 0x25 - BattleAICmd_if_equal_, // 0x26 - BattleAICmd_if_not_equal_, // 0x27 - BattleAICmd_if_user_goes, // 0x28 - BattleAICmd_if_user_doesnt_go, // 0x29 - BattleAICmd_nullsub_2A, // 0x2A - BattleAICmd_nullsub_2B, // 0x2B - BattleAICmd_count_usable_party_mons, // 0x2C - BattleAICmd_get_considered_move, // 0x2D - BattleAICmd_get_considered_move_effect, // 0x2E - BattleAICmd_get_ability, // 0x2F - BattleAICmd_get_highest_type_effectiveness, // 0x30 - BattleAICmd_if_type_effectiveness, // 0x31 - BattleAICmd_nullsub_32, // 0x32 - BattleAICmd_nullsub_33, // 0x33 - BattleAICmd_if_status_in_party, // 0x34 - BattleAICmd_if_status_not_in_party, // 0x35 - BattleAICmd_get_weather, // 0x36 - BattleAICmd_if_effect, // 0x37 - BattleAICmd_if_not_effect, // 0x38 - BattleAICmd_if_stat_level_less_than, // 0x39 - BattleAICmd_if_stat_level_more_than, // 0x3A - BattleAICmd_if_stat_level_equal, // 0x3B - BattleAICmd_if_stat_level_not_equal, // 0x3C - BattleAICmd_if_can_faint, // 0x3D - BattleAICmd_if_cant_faint, // 0x3E - BattleAICmd_if_has_move, // 0x3F - BattleAICmd_if_doesnt_have_move, // 0x40 - BattleAICmd_if_has_move_with_effect, // 0x41 - BattleAICmd_if_doesnt_have_move_with_effect, // 0x42 + BattleAICmd_if_random_less_than, // 0x0 + BattleAICmd_if_random_greater_than, // 0x1 + BattleAICmd_if_random_equal, // 0x2 + BattleAICmd_if_random_not_equal, // 0x3 + BattleAICmd_score, // 0x4 + BattleAICmd_if_hp_less_than, // 0x5 + BattleAICmd_if_hp_more_than, // 0x6 + BattleAICmd_if_hp_equal, // 0x7 + BattleAICmd_if_hp_not_equal, // 0x8 + BattleAICmd_if_status, // 0x9 + BattleAICmd_if_not_status, // 0xA + BattleAICmd_if_status2, // 0xB + BattleAICmd_if_not_status2, // 0xC + BattleAICmd_if_status3, // 0xD + BattleAICmd_if_not_status3, // 0xE + BattleAICmd_if_side_affecting, // 0xF + BattleAICmd_if_not_side_affecting, // 0x10 + BattleAICmd_if_less_than, // 0x11 + BattleAICmd_if_more_than, // 0x12 + BattleAICmd_if_equal, // 0x13 + BattleAICmd_if_not_equal, // 0x14 + BattleAICmd_if_less_than_ptr, // 0x15 + BattleAICmd_if_more_than_ptr, // 0x16 + BattleAICmd_if_equal_ptr, // 0x17 + BattleAICmd_if_not_equal_ptr, // 0x18 + BattleAICmd_if_move, // 0x19 + BattleAICmd_if_not_move, // 0x1A + BattleAICmd_if_in_bytes, // 0x1B + BattleAICmd_if_not_in_bytes, // 0x1C + BattleAICmd_if_in_hwords, // 0x1D + BattleAICmd_if_not_in_hwords, // 0x1E + BattleAICmd_if_user_has_attacking_move, // 0x1F + BattleAICmd_if_user_has_no_attacking_moves, // 0x20 + BattleAICmd_get_turn_count, // 0x21 + BattleAICmd_get_type, // 0x22 + BattleAICmd_get_considered_move_power, // 0x23 + BattleAICmd_get_how_powerful_move_is, // 0x24 + BattleAICmd_get_last_used_battler_move, // 0x25 + BattleAICmd_if_equal_, // 0x26 + BattleAICmd_if_not_equal_, // 0x27 + BattleAICmd_if_user_goes, // 0x28 + BattleAICmd_if_user_doesnt_go, // 0x29 + BattleAICmd_nullsub_2A, // 0x2A + BattleAICmd_nullsub_2B, // 0x2B + BattleAICmd_count_usable_party_mons, // 0x2C + BattleAICmd_get_considered_move, // 0x2D + BattleAICmd_get_considered_move_effect, // 0x2E + BattleAICmd_get_ability, // 0x2F + BattleAICmd_get_highest_type_effectiveness, // 0x30 + BattleAICmd_if_type_effectiveness, // 0x31 + BattleAICmd_nullsub_32, // 0x32 + BattleAICmd_nullsub_33, // 0x33 + BattleAICmd_if_status_in_party, // 0x34 + BattleAICmd_if_status_not_in_party, // 0x35 + BattleAICmd_get_weather, // 0x36 + BattleAICmd_if_effect, // 0x37 + BattleAICmd_if_not_effect, // 0x38 + BattleAICmd_if_stat_level_less_than, // 0x39 + BattleAICmd_if_stat_level_more_than, // 0x3A + BattleAICmd_if_stat_level_equal, // 0x3B + BattleAICmd_if_stat_level_not_equal, // 0x3C + BattleAICmd_if_can_faint, // 0x3D + BattleAICmd_if_cant_faint, // 0x3E + BattleAICmd_if_has_move, // 0x3F + BattleAICmd_if_doesnt_have_move, // 0x40 + BattleAICmd_if_has_move_with_effect, // 0x41 + BattleAICmd_if_doesnt_have_move_with_effect, // 0x42 BattleAICmd_if_any_move_disabled_or_encored, // 0x43 BattleAICmd_if_curr_move_disabled_or_encored, // 0x44 - BattleAICmd_flee, // 0x45 - BattleAICmd_if_random_safari_flee, // 0x46 - BattleAICmd_watch, // 0x47 - BattleAICmd_get_hold_effect, // 0x48 - BattleAICmd_get_gender, // 0x49 - BattleAICmd_is_first_turn_for, // 0x4A - BattleAICmd_get_stockpile_count, // 0x4B - BattleAICmd_is_double_battle, // 0x4C - BattleAICmd_get_used_held_item, // 0x4D - BattleAICmd_get_move_type_from_result, // 0x4E - BattleAICmd_get_move_power_from_result, // 0x4F - BattleAICmd_get_move_effect_from_result, // 0x50 - BattleAICmd_get_protect_count, // 0x51 - BattleAICmd_nullsub_52, // 0x52 - BattleAICmd_nullsub_53, // 0x53 - BattleAICmd_nullsub_54, // 0x54 - BattleAICmd_nullsub_55, // 0x55 - BattleAICmd_nullsub_56, // 0x56 - BattleAICmd_nullsub_57, // 0x57 - BattleAICmd_call, // 0x58 - BattleAICmd_goto, // 0x59 - BattleAICmd_end, // 0x5A - BattleAICmd_if_level_cond, // 0x5B - BattleAICmd_if_target_taunted, // 0x5C - BattleAICmd_if_target_not_taunted, // 0x5D - BattleAICmd_if_target_is_ally, // 0x5E - BattleAICmd_is_of_type, // 0x5F - BattleAICmd_check_ability, // 0x60 - BattleAICmd_if_flash_fired, // 0x61 - BattleAICmd_if_holds_item, // 0x62 + BattleAICmd_flee, // 0x45 + BattleAICmd_if_random_safari_flee, // 0x46 + BattleAICmd_watch, // 0x47 + BattleAICmd_get_hold_effect, // 0x48 + BattleAICmd_get_gender, // 0x49 + BattleAICmd_is_first_turn_for, // 0x4A + BattleAICmd_get_stockpile_count, // 0x4B + BattleAICmd_is_double_battle, // 0x4C + BattleAICmd_get_used_held_item, // 0x4D + BattleAICmd_get_move_type_from_result, // 0x4E + BattleAICmd_get_move_power_from_result, // 0x4F + BattleAICmd_get_move_effect_from_result, // 0x50 + BattleAICmd_get_protect_count, // 0x51 + BattleAICmd_nullsub_52, // 0x52 + BattleAICmd_nullsub_53, // 0x53 + BattleAICmd_nullsub_54, // 0x54 + BattleAICmd_nullsub_55, // 0x55 + BattleAICmd_nullsub_56, // 0x56 + BattleAICmd_nullsub_57, // 0x57 + BattleAICmd_call, // 0x58 + BattleAICmd_goto, // 0x59 + BattleAICmd_end, // 0x5A + BattleAICmd_if_level_cond, // 0x5B + BattleAICmd_if_target_taunted, // 0x5C + BattleAICmd_if_target_not_taunted, // 0x5D + BattleAICmd_if_target_is_ally, // 0x5E + BattleAICmd_is_of_type, // 0x5F + BattleAICmd_check_ability, // 0x60 + BattleAICmd_if_flash_fired, // 0x61 + BattleAICmd_if_holds_item, // 0x62 }; static const u16 sDiscouragedPowerfulMoveEffects[] = @@ -282,26 +280,29 @@ static const u16 sDiscouragedPowerfulMoveEffects[] = 0xFFFF }; +// code void BattleAI_HandleItemUseBeforeAISetup(u8 defaultScoreMoves) { s32 i; - u8 *data = (u8 *)gBattleResources->battleHistory; + u8 *data = (u8 *)BATTLE_HISTORY; for (i = 0; i < sizeof(struct BattleHistory); i++) data[i] = 0; - // items are allowed to use in ONLY trainer battles - if ((gBattleTypeFlags & - (BATTLE_TYPE_LINK | BATTLE_TYPE_SAFARI | BATTLE_TYPE_BATTLE_TOWER | - BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_TRAINER | BATTLE_TYPE_FRONTIER - | BATTLE_TYPE_INGAME_PARTNER | BATTLE_TYPE_x2000000 | BATTLE_TYPE_SECRET_BASE)) - == BATTLE_TYPE_TRAINER) + + // Items are allowed to use in ONLY trainer battles. + if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) + && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_SAFARI | BATTLE_TYPE_BATTLE_TOWER + | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_SECRET_BASE | BATTLE_TYPE_FRONTIER + | BATTLE_TYPE_INGAME_PARTNER | BATTLE_TYPE_x2000000) + ) + ) { for (i = 0; i < 4; i++) { if (gTrainers[gTrainerBattleOpponent_A].items[i] != 0) { - gBattleResources->battleHistory->trainerItems[gBattleResources->battleHistory->itemsNo] = gTrainers[gTrainerBattleOpponent_A].items[i]; - gBattleResources->battleHistory->itemsNo++; + BATTLE_HISTORY->trainerItems[BATTLE_HISTORY->itemsNo] = gTrainers[gTrainerBattleOpponent_A].items[i]; + BATTLE_HISTORY->itemsNo++; } } } @@ -315,23 +316,24 @@ void BattleAI_SetupAIData(u8 defaultScoreMoves) u8 *data = (u8 *)AI_THINKING_STRUCT; u8 moveLimitations; - // clear AI data. + // Clear AI data. for (i = 0; i < sizeof(struct AI_ThinkingStruct); i++) data[i] = 0; - // conditional score reset, unlike Ruby. + // Conditional score reset, unlike Ruby. for (i = 0; i < 4; i++) { if (defaultScoreMoves & 1) AI_THINKING_STRUCT->score[i] = 100; else AI_THINKING_STRUCT->score[i] = 0; + defaultScoreMoves >>= 1; } moveLimitations = CheckMoveLimitations(gActiveBattler, 0, 0xFF); - // ignore moves that aren't possible to use + // Ignore moves that aren't possible to use. for (i = 0; i < 4; i++) { if (gBitTable[i] & moveLimitations) @@ -339,21 +341,24 @@ void BattleAI_SetupAIData(u8 defaultScoreMoves) AI_THINKING_STRUCT->simulatedRNG[i] = 100 - (Random() % 16); } + gBattleResources->AI_ScriptsStack->size = 0; sBattler_AI = gActiveBattler; - // decide a random target battlerId in doubles + + // Decide a random target battlerId in doubles. if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { gBattlerTarget = (Random() & BIT_FLANK) + (GetBattlerSide(gActiveBattler) ^ BIT_SIDE); if (gAbsentBattlerFlags & gBitTable[gBattlerTarget]) gBattlerTarget ^= BIT_FLANK; } - // in singles there's only one choice + // There's only one choice in signle battles. else { gBattlerTarget = sBattler_AI ^ BIT_SIDE; } + // Choose proper trainer ai scripts. if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) AI_THINKING_STRUCT->aiFlags = GetAiScriptsInRecordedBattle(); else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI) @@ -370,6 +375,7 @@ void BattleAI_SetupAIData(u8 defaultScoreMoves) AI_THINKING_STRUCT->aiFlags = gTrainers[gTrainerBattleOpponent_A].aiFlags | gTrainers[gTrainerBattleOpponent_B].aiFlags; else AI_THINKING_STRUCT->aiFlags = gTrainers[gTrainerBattleOpponent_A].aiFlags; + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) AI_THINKING_STRUCT->aiFlags |= AI_SCRIPT_DOUBLE_BATTLE; // act smart in doubles and don't attack your partner } @@ -380,15 +386,15 @@ u8 BattleAI_ChooseMoveOrAction(void) u8 ret; if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) - ret = BattleAI_ChooseMoveOrAction_Singles(); + ret = ChooseMoveOrAction_Singles(); else - ret = BattleAI_ChooseMoveOrAction_Doubles(); + ret = ChooseMoveOrAction_Doubles(); gCurrentMove = savedCurrentMove; return ret; } -static u8 BattleAI_ChooseMoveOrAction_Singles(void) +static u8 ChooseMoveOrAction_Singles(void) { u8 currentMoveArray[4]; u8 consideredMoveArray[4]; @@ -409,11 +415,11 @@ static u8 BattleAI_ChooseMoveOrAction_Singles(void) AI_THINKING_STRUCT->movesetIndex = 0; } - // special flags for safari + // Check special AI actions. if (AI_THINKING_STRUCT->aiAction & AI_ACTION_FLEE) - return 4; + return AI_CHOICE_FLEE; if (AI_THINKING_STRUCT->aiAction & AI_ACTION_WATCH) - return 5; + return AI_CHOICE_WATCH; numOfBestMoves = 1; currentMoveArray[0] = AI_THINKING_STRUCT->score[0]; @@ -421,9 +427,9 @@ static u8 BattleAI_ChooseMoveOrAction_Singles(void) for (i = 1; i < 4; i++) { - if (gBattleMons[sBattler_AI].moves[i] != 0) // emerald adds an extra move ID check for some reason. + if (gBattleMons[sBattler_AI].moves[i] != MOVE_NONE) { - // in ruby, the order of these if statements are reversed. + // In ruby, the order of these if statements is reversed. if (currentMoveArray[0] == AI_THINKING_STRUCT->score[i]) { currentMoveArray[numOfBestMoves] = AI_THINKING_STRUCT->score[i]; @@ -440,7 +446,7 @@ static u8 BattleAI_ChooseMoveOrAction_Singles(void) return consideredMoveArray[Random() % numOfBestMoves]; } -static u8 BattleAI_ChooseMoveOrAction_Doubles(void) +static u8 ChooseMoveOrAction_Doubles(void) { s32 i; s32 j; @@ -487,10 +493,15 @@ static u8 BattleAI_ChooseMoveOrAction_Doubles(void) AI_THINKING_STRUCT->aiLogicId++; AI_THINKING_STRUCT->movesetIndex = 0; } + if (AI_THINKING_STRUCT->aiAction & AI_ACTION_FLEE) - actionOrMoveIndex[i] = 4; + { + actionOrMoveIndex[i] = AI_CHOICE_FLEE; + } else if (AI_THINKING_STRUCT->aiAction & AI_ACTION_WATCH) - actionOrMoveIndex[i] = 5; + { + actionOrMoveIndex[i] = AI_CHOICE_WATCH; + } else { mostViableMovesScores[0] = AI_THINKING_STRUCT->score[0]; @@ -513,18 +524,16 @@ static u8 BattleAI_ChooseMoveOrAction_Doubles(void) mostViableMovesNo = 1; } } - //_08130E72 } actionOrMoveIndex[i] = mostViableMovesIndices[Random() % mostViableMovesNo]; bestMovePointsForTarget[i] = mostViableMovesScores[0]; - // don't use a move against ally if it has less than 100 pts + // Don't use a move against ally if it has less than 100 points. if (i == (sBattler_AI ^ BIT_FLANK) && bestMovePointsForTarget[i] < 100) { bestMovePointsForTarget[i] = -1; - mostViableMovesScores[0] = mostViableMovesScores[0]; // needed to match + mostViableMovesScores[0] = mostViableMovesScores[0]; // Needed to match. } - } } } @@ -535,13 +544,11 @@ static u8 BattleAI_ChooseMoveOrAction_Doubles(void) for (i = 1; i < 4; i++) { - //_08130EDA if (mostMovePoints == bestMovePointsForTarget[i]) { mostViableTargetsArray[mostViableTargetsNo] = i; mostViableTargetsNo++; } - //_08130EEE if (mostMovePoints < bestMovePointsForTarget[i]) { mostMovePoints = bestMovePointsForTarget[i]; @@ -576,7 +583,9 @@ static void BattleAI_DoAIProcessing(void) break; case AIState_Processing: if (AI_THINKING_STRUCT->moveConsidered != 0) + { sBattleAICmdTable[*gAIScriptPtr](); // Run AI command. + } else { AI_THINKING_STRUCT->score[AI_THINKING_STRUCT->movesetIndex] = 0; @@ -604,12 +613,12 @@ static void RecordLastUsedMoveByTarget(void) for (i = 0; i < 4; i++) { - if (gBattleResources->battleHistory->usedMoves[gBattlerTarget].moves[i] == gLastMoves[gBattlerTarget]) + if (BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i] == gLastMoves[gBattlerTarget]) break; - if (gBattleResources->battleHistory->usedMoves[gBattlerTarget].moves[i] != gLastMoves[gBattlerTarget] // HACK: This redundant condition is a hack to make the asm match. - && gBattleResources->battleHistory->usedMoves[gBattlerTarget].moves[i] == 0) + if (BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i] != gLastMoves[gBattlerTarget] // HACK: This redundant condition is a hack to make the asm match. + && BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i] == MOVE_NONE) { - gBattleResources->battleHistory->usedMoves[gBattlerTarget].moves[i] = gLastMoves[gBattlerTarget]; + BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i] = gLastMoves[gBattlerTarget]; break; } } @@ -620,27 +629,27 @@ void ClearBattlerMoveHistory(u8 battlerId) s32 i; for (i = 0; i < 4; i++) - gBattleResources->battleHistory->usedMoves[battlerId].moves[i] = 0; + BATTLE_HISTORY->usedMoves[battlerId].moves[i] = MOVE_NONE; } void RecordAbilityBattle(u8 battlerId, u8 abilityId) { - gBattleResources->battleHistory->abilities[battlerId] = abilityId; + BATTLE_HISTORY->abilities[battlerId] = abilityId; } void ClearBattlerAbilityHistory(u8 battlerId) { - gBattleResources->battleHistory->abilities[battlerId] = 0; + BATTLE_HISTORY->abilities[battlerId] = ABILITY_NONE; } void RecordItemEffectBattle(u8 battlerId, u8 itemEffect) { - gBattleResources->battleHistory->itemEffects[battlerId] = itemEffect; + BATTLE_HISTORY->itemEffects[battlerId] = itemEffect; } -void ClearBankItemEffectHistory(u8 battlerId) +void ClearBattlerItemEffectHistory(u8 battlerId) { - gBattleResources->battleHistory->itemEffects[battlerId] = 0; + BATTLE_HISTORY->itemEffects[battlerId] = 0; } static void BattleAICmd_if_random_less_than(void) @@ -685,9 +694,9 @@ static void BattleAICmd_if_random_not_equal(void) static void BattleAICmd_score(void) { - AI_THINKING_STRUCT->score[AI_THINKING_STRUCT->movesetIndex] += gAIScriptPtr[1]; // add the result to the array of the move consider's score. + AI_THINKING_STRUCT->score[AI_THINKING_STRUCT->movesetIndex] += gAIScriptPtr[1]; // Add the result to the array of the move consider's score. - if (AI_THINKING_STRUCT->score[AI_THINKING_STRUCT->movesetIndex] < 0) // if the score is negative, flatten it to 0. + if (AI_THINKING_STRUCT->score[AI_THINKING_STRUCT->movesetIndex] < 0) // If the score is negative, flatten it to 0. AI_THINKING_STRUCT->score[AI_THINKING_STRUCT->movesetIndex] = 0; gAIScriptPtr += 2; // AI return. @@ -765,7 +774,7 @@ static void BattleAICmd_if_status(void) status = T1_READ_32(gAIScriptPtr + 2); - if ((gBattleMons[battlerId].status1 & status) != 0) + if ((gBattleMons[battlerId].status1 & status)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -783,7 +792,7 @@ static void BattleAICmd_if_not_status(void) status = T1_READ_32(gAIScriptPtr + 2); - if ((gBattleMons[battlerId].status1 & status) == 0) + if (!(gBattleMons[battlerId].status1 & status)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -801,7 +810,7 @@ static void BattleAICmd_if_status2(void) status = T1_READ_32(gAIScriptPtr + 2); - if ((gBattleMons[battlerId].status2 & status) != 0) + if ((gBattleMons[battlerId].status2 & status)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -819,7 +828,7 @@ static void BattleAICmd_if_not_status2(void) status = T1_READ_32(gAIScriptPtr + 2); - if ((gBattleMons[battlerId].status2 & status) == 0) + if (!(gBattleMons[battlerId].status2 & status)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -837,7 +846,7 @@ static void BattleAICmd_if_status3(void) status = T1_READ_32(gAIScriptPtr + 2); - if ((gStatuses3[battlerId] & status) != 0) + if ((gStatuses3[battlerId] & status)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -855,7 +864,7 @@ static void BattleAICmd_if_not_status3(void) status = T1_READ_32(gAIScriptPtr + 2); - if ((gStatuses3[battlerId] & status) == 0) + if (!(gStatuses3[battlerId] & status)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -874,7 +883,7 @@ static void BattleAICmd_if_side_affecting(void) side = GET_BATTLER_SIDE(battlerId); status = T1_READ_32(gAIScriptPtr + 2); - if ((gSideStatuses[side] & status) != 0) + if ((gSideStatuses[side] & status)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -893,7 +902,7 @@ static void BattleAICmd_if_not_side_affecting(void) side = GET_BATTLER_SIDE(battlerId); status = T1_READ_32(gAIScriptPtr + 2); - if ((gSideStatuses[side] & status) == 0) + if (!(gSideStatuses[side] & status)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -1041,7 +1050,7 @@ static void BattleAICmd_if_in_hwords(void) static void BattleAICmd_if_not_in_hwords(void) { - const u16 *ptr = (u16 *)T1_READ_PTR(gAIScriptPtr + 1); + const u16 *ptr = (const u16 *)T1_READ_PTR(gAIScriptPtr + 1); while (*ptr != 0xFFFF) { @@ -1065,6 +1074,7 @@ static void BattleAICmd_if_user_has_attacking_move(void) && gBattleMoves[gBattleMons[sBattler_AI].moves[i]].power != 0) break; } + if (i == 4) gAIScriptPtr += 5; else @@ -1081,6 +1091,7 @@ static void BattleAICmd_if_user_has_no_attacking_moves(void) && gBattleMoves[gBattleMons[sBattler_AI].moves[i]].power != 0) break; } + if (i != 4) gAIScriptPtr += 5; else @@ -1118,34 +1129,30 @@ static void BattleAICmd_get_type(void) gAIScriptPtr += 2; } -static u8 BattleAI_GetWantedBank(u8 battlerId) +static u8 BattleAI_GetWantedBattler(u8 wantedBattler) { - switch (battlerId) + switch (wantedBattler) { - case AI_USER: - return sBattler_AI; - case AI_TARGET: - default: - return gBattlerTarget; - case AI_USER_PARTNER: - return sBattler_AI ^ BIT_FLANK; - case AI_TARGET_PARTNER: - return gBattlerTarget ^ BIT_FLANK; + case AI_USER: + return sBattler_AI; + case AI_TARGET: + default: + return gBattlerTarget; + case AI_USER_PARTNER: + return sBattler_AI ^ BIT_FLANK; + case AI_TARGET_PARTNER: + return gBattlerTarget ^ BIT_FLANK; } } static void BattleAICmd_is_of_type(void) { - u8 battlerId = BattleAI_GetWantedBank(gAIScriptPtr[1]); + u8 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]); - if(gBattleMons[battlerId].type1 == gAIScriptPtr[2] || gBattleMons[battlerId].type2 == gAIScriptPtr[2]) - { + if (IS_BATTLER_OF_TYPE(battlerId, gAIScriptPtr[2])) AI_THINKING_STRUCT->funcResult = TRUE; - } else - { AI_THINKING_STRUCT->funcResult = FALSE; - } gAIScriptPtr += 3; } @@ -1208,19 +1215,19 @@ static void BattleAICmd_get_how_powerful_move_is(void) } if (checkedMove == 4) - AI_THINKING_STRUCT->funcResult = MOVE_MOST_POWERFUL; // is the most powerful + AI_THINKING_STRUCT->funcResult = MOVE_MOST_POWERFUL; // Is the most powerful. else - AI_THINKING_STRUCT->funcResult = MOVE_NOT_MOST_POWERFUL; // not most powerful + AI_THINKING_STRUCT->funcResult = MOVE_NOT_MOST_POWERFUL; // Not the most powerful. } else { - AI_THINKING_STRUCT->funcResult = MOVE_POWER_DISCOURAGED; // highly discouraged in terms of power + AI_THINKING_STRUCT->funcResult = MOVE_POWER_DISCOURAGED; // Highly discouraged in terms of power. } gAIScriptPtr++; } -static void BattleAICmd_get_last_used_bank_move(void) +static void BattleAICmd_get_last_used_battler_move(void) { if (gAIScriptPtr[1] == AI_USER) AI_THINKING_STRUCT->funcResult = gLastMoves[sBattler_AI]; @@ -1230,7 +1237,7 @@ static void BattleAICmd_get_last_used_bank_move(void) gAIScriptPtr += 2; } -static void BattleAICmd_if_equal_(void) // same as if_equal +static void BattleAICmd_if_equal_(void) // Same as if_equal. { if (gAIScriptPtr[1] == AI_THINKING_STRUCT->funcResult) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); @@ -1238,7 +1245,7 @@ static void BattleAICmd_if_equal_(void) // same as if_equal gAIScriptPtr += 6; } -static void BattleAICmd_if_not_equal_(void) // same as if_not_equal +static void BattleAICmd_if_not_equal_(void) // Same as if_not_equal. { if (gAIScriptPtr[1] != AI_THINKING_STRUCT->funcResult) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); @@ -1273,9 +1280,9 @@ static void BattleAICmd_nullsub_2B(void) static void BattleAICmd_count_usable_party_mons(void) { u8 battlerId; - u8 bankOnField1, bankOnField2; + u8 battlerOnField1, battlerOnField2; struct Pokemon *party; - int i; + s32 i; AI_THINKING_STRUCT->funcResult = 0; @@ -1292,19 +1299,19 @@ static void BattleAICmd_count_usable_party_mons(void) if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { u32 position; - bankOnField1 = gBattlerPartyIndexes[battlerId]; + battlerOnField1 = gBattlerPartyIndexes[battlerId]; position = GetBattlerPosition(battlerId) ^ BIT_FLANK; - bankOnField2 = gBattlerPartyIndexes[GetBattlerAtPosition(position)]; + battlerOnField2 = gBattlerPartyIndexes[GetBattlerAtPosition(position)]; } - else // in singles there's only one battlerId by side + else // In singles there's only one battlerId by side. { - bankOnField1 = gBattlerPartyIndexes[battlerId]; - bankOnField2 = gBattlerPartyIndexes[battlerId]; + battlerOnField1 = gBattlerPartyIndexes[battlerId]; + battlerOnField2 = gBattlerPartyIndexes[battlerId]; } for (i = 0; i < PARTY_SIZE; i++) { - if (i != bankOnField1 && i != bankOnField2 + if (i != battlerOnField1 && i != battlerOnField2 && GetMonData(&party[i], MON_DATA_HP) != 0 && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_NONE && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG) @@ -1362,22 +1369,18 @@ static void BattleAICmd_get_ability(void) { // AI has no knowledge of opponent, so it guesses which ability. if (Random() & 1) - { AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].ability1; - } else - { AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].ability2; - } } else { - AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].ability1; // it's definitely ability 1. + AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].ability1; // It's definitely ability 1. } } else { - AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].ability2; // AI cant actually reach this part since every mon has at least 1 ability. + AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].ability2; // AI can't actually reach this part since no pokemon has ability 2 and no ability 1. } } else @@ -1385,22 +1388,23 @@ static void BattleAICmd_get_ability(void) // The AI knows its own ability. AI_THINKING_STRUCT->funcResult = gBattleMons[battlerId].ability; } + gAIScriptPtr += 2; } static void BattleAICmd_check_ability(void) { - u32 battlerId = BattleAI_GetWantedBank(gAIScriptPtr[1]); + u32 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]); u32 ability = gAIScriptPtr[2]; if (gAIScriptPtr[1] == AI_TARGET || gAIScriptPtr[1] == AI_TARGET_PARTNER) { - if (BATTLE_HISTORY->abilities[battlerId] != 0) + if (BATTLE_HISTORY->abilities[battlerId] != ABILITY_NONE) { ability = BATTLE_HISTORY->abilities[battlerId]; AI_THINKING_STRUCT->funcResult = ability; } - // abilities that prevent fleeing. + // Abilities that prevent fleeing. else if (gBattleMons[battlerId].ability == ABILITY_SHADOW_TAG || gBattleMons[battlerId].ability == ABILITY_MAGNET_PULL || gBattleMons[battlerId].ability == ABILITY_ARENA_TRAP) @@ -1411,14 +1415,16 @@ static void BattleAICmd_check_ability(void) { if (gBaseStats[gBattleMons[battlerId].species].ability2 != ABILITY_NONE) { - u8 abilityDummyVariable = ability; // needed to match + u8 abilityDummyVariable = ability; // Needed to match. if (gBaseStats[gBattleMons[battlerId].species].ability1 != abilityDummyVariable && gBaseStats[gBattleMons[battlerId].species].ability2 != abilityDummyVariable) { ability = gBaseStats[gBattleMons[battlerId].species].ability1; } else - ability = 0; + { + ability = ABILITY_NONE; + } } else { @@ -1427,7 +1433,7 @@ static void BattleAICmd_check_ability(void) } else { - ability = gBaseStats[gBattleMons[battlerId].species].ability2; // AI cant actually reach this part since every mon has at least 1 ability. + ability = gBaseStats[gBattleMons[battlerId].species].ability2; // AI can't actually reach this part since no pokemon has ability 2 and no ability 1. } } else @@ -1435,25 +1441,21 @@ static void BattleAICmd_check_ability(void) // The AI knows its own or partner's ability. ability = gBattleMons[battlerId].ability; } + if (ability == 0) - { - AI_THINKING_STRUCT->funcResult = 2; // unable to answer - } + AI_THINKING_STRUCT->funcResult = 2; // Unable to answer. else if (ability == gAIScriptPtr[2]) - { - AI_THINKING_STRUCT->funcResult = 1; // pokemon has the ability we wanted to check - } + AI_THINKING_STRUCT->funcResult = 1; // Pokemon has the ability we wanted to check. else - { - AI_THINKING_STRUCT->funcResult = 0; // pokemon doesn't have the ability we wanted to check - } + AI_THINKING_STRUCT->funcResult = 0; // Pokemon doesn't have the ability we wanted to check. + gAIScriptPtr += 3; } static void BattleAICmd_get_highest_type_effectiveness(void) { s32 i; - u8* dynamicMoveType; + u8 *dynamicMoveType; gDynamicBasePower = 0; dynamicMoveType = &gBattleStruct->dynamicMoveType; @@ -1465,19 +1467,18 @@ static void BattleAICmd_get_highest_type_effectiveness(void) for (i = 0; i < 4; i++) { - gBattleMoveDamage = AI_EFFECTIVENESS_x1; + gBattleMoveDamage = 40; gCurrentMove = gBattleMons[sBattler_AI].moves[i]; - if (gCurrentMove) + if (gCurrentMove != MOVE_NONE) { TypeCalc(gCurrentMove, sBattler_AI, gBattlerTarget); - // reduce by 1/3. - if (gBattleMoveDamage == 120) + if (gBattleMoveDamage == 120) // Super effective STAB. gBattleMoveDamage = AI_EFFECTIVENESS_x2; if (gBattleMoveDamage == 240) gBattleMoveDamage = AI_EFFECTIVENESS_x4; - if (gBattleMoveDamage == 30) + if (gBattleMoveDamage == 30) // Not very effective STAB. gBattleMoveDamage = AI_EFFECTIVENESS_x0_5; if (gBattleMoveDamage == 15) gBattleMoveDamage = AI_EFFECTIVENESS_x0_25; @@ -1489,6 +1490,7 @@ static void BattleAICmd_get_highest_type_effectiveness(void) AI_THINKING_STRUCT->funcResult = gBattleMoveDamage; } } + gAIScriptPtr += 1; } @@ -1507,11 +1509,11 @@ static void BattleAICmd_if_type_effectiveness(void) TypeCalc(gCurrentMove, sBattler_AI, gBattlerTarget); - if (gBattleMoveDamage == 120) + if (gBattleMoveDamage == 120) // Super effective STAB. gBattleMoveDamage = AI_EFFECTIVENESS_x2; if (gBattleMoveDamage == 240) gBattleMoveDamage = AI_EFFECTIVENESS_x4; - if (gBattleMoveDamage == 30) + if (gBattleMoveDamage == 30) // Not very effective STAB. gBattleMoveDamage = AI_EFFECTIVENESS_x0_5; if (gBattleMoveDamage == 15) gBattleMoveDamage = AI_EFFECTIVENESS_x0_25; @@ -1519,7 +1521,7 @@ static void BattleAICmd_if_type_effectiveness(void) if (gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE) gBattleMoveDamage = AI_EFFECTIVENESS_x0; - // store gBattleMoveDamage in a u8 variable because gAIScriptPtr[1] is a u8. + // Store gBattleMoveDamage in a u8 variable because gAIScriptPtr[1] is a u8. damageVar = gBattleMoveDamage; if (damageVar == gAIScriptPtr[1]) @@ -1539,18 +1541,18 @@ static void BattleAICmd_nullsub_33(void) static void BattleAICmd_if_status_in_party(void) { struct Pokemon *party; - int i; + s32 i; u32 statusToCompareTo; u8 battlerId; - switch(gAIScriptPtr[1]) + switch (gAIScriptPtr[1]) { - case AI_USER: - battlerId = sBattler_AI; - break; - default: - battlerId = gBattlerTarget; - break; + case AI_USER: + battlerId = sBattler_AI; + break; + default: + battlerId = gBattlerTarget; + break; } party = (GetBattlerSide(battlerId) == B_SIDE_PLAYER) ? gPlayerParty : gEnemyParty; @@ -1576,18 +1578,18 @@ static void BattleAICmd_if_status_in_party(void) static void BattleAICmd_if_status_not_in_party(void) { struct Pokemon *party; - int i; + s32 i; u32 statusToCompareTo; u8 battlerId; switch(gAIScriptPtr[1]) { - case 1: - battlerId = sBattler_AI; - break; - default: - battlerId = gBattlerTarget; - break; + case 1: + battlerId = sBattler_AI; + break; + default: + battlerId = gBattlerTarget; + break; } party = (GetBattlerSide(battlerId) == B_SIDE_PLAYER) ? gPlayerParty : gEnemyParty; @@ -1602,7 +1604,8 @@ static void BattleAICmd_if_status_not_in_party(void) if (species != SPECIES_NONE && species != SPECIES_EGG && hp != 0 && status == statusToCompareTo) { - gAIScriptPtr += 10; // still bugged in Emerald + gAIScriptPtr += 10; // UB: Still bugged in Emerald. Uncomment the return statement to fix. + // return; } } @@ -1718,7 +1721,7 @@ static void BattleAICmd_if_can_faint(void) gBattleMoveDamage = gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[AI_THINKING_STRUCT->movesetIndex] / 100; - // moves always do at least 1 damage. + // Moves always do at least 1 damage. if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; @@ -1747,7 +1750,7 @@ static void BattleAICmd_if_cant_faint(void) gBattleMoveDamage = gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[AI_THINKING_STRUCT->movesetIndex] / 100; - // this macro is missing the damage 0 = 1 assumption. + // This macro is missing the damage 0 = 1 assumption. if (gBattleMons[gBattlerTarget].hp > gBattleMoveDamage) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); @@ -1757,118 +1760,93 @@ static void BattleAICmd_if_cant_faint(void) static void BattleAICmd_if_has_move(void) { - int i; + s32 i; const u16 *movePtr = (u16 *)(gAIScriptPtr + 2); switch (gAIScriptPtr[1]) { - case AI_USER: + case AI_USER: + for (i = 0; i < 4; i++) + { + if (gBattleMons[sBattler_AI].moves[i] == *movePtr) + break; + } + if (i == 4) + gAIScriptPtr += 8; + else + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); + break; + case AI_USER_PARTNER: + if (gBattleMons[sBattler_AI ^ BIT_FLANK].hp == 0) + { + gAIScriptPtr += 8; + break; + } + else + { for (i = 0; i < 4; i++) { - if (gBattleMons[sBattler_AI].moves[i] == *movePtr) + if (gBattleMons[sBattler_AI ^ BIT_FLANK].moves[i] == *movePtr) break; } - if (i == 4) - { - gAIScriptPtr += 8; - return; - } - else - { - gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); - return; - } - case AI_USER_PARTNER: - if (gBattleMons[sBattler_AI ^ BIT_FLANK].hp == 0) - { - gAIScriptPtr += 8; - return; - } - else - { - for (i = 0; i < 4; i++) - { - if (gBattleMons[sBattler_AI ^ BIT_FLANK].moves[i] == *movePtr) - break; - } - } - if (i == 4) - { - gAIScriptPtr += 8; - return; - } - else - { - gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); - return; - } - case AI_TARGET: - case AI_TARGET_PARTNER: - for (i = 0; i < 4; i++) - { - if (BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i] == *movePtr) - break; - } - if (i == 4) - { - gAIScriptPtr += 8; - return; - } - else - { - gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); - return; - } + } + if (i == 4) + gAIScriptPtr += 8; + else + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); + break; + case AI_TARGET: + case AI_TARGET_PARTNER: + for (i = 0; i < 4; i++) + { + if (BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i] == *movePtr) + break; + } + if (i == 4) + gAIScriptPtr += 8; + else + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); + break; } } static void BattleAICmd_if_doesnt_have_move(void) { - int i; + s32 i; const u16 *movePtr = (u16 *)(gAIScriptPtr + 2); switch(gAIScriptPtr[1]) { - case AI_USER: - case AI_USER_PARTNER: // UB: no separate check for user partner - for (i = 0; i < 4; i++) - { - if (gBattleMons[sBattler_AI].moves[i] == *movePtr) - break; - } - if (i != 4) - { - gAIScriptPtr += 8; - return; - } - else - { - gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); - return; - } - case AI_TARGET: - case AI_TARGET_PARTNER: - for (i = 0; i < 4; i++) - { - if (BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i] == *movePtr) - break; - } - if (i != 4) - { - gAIScriptPtr += 8; - return; - } - else - { - gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); - return; - } + case AI_USER: + case AI_USER_PARTNER: // UB: no separate check for user partner. + for (i = 0; i < 4; i++) + { + if (gBattleMons[sBattler_AI].moves[i] == *movePtr) + break; + } + if (i != 4) + gAIScriptPtr += 8; + else + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); + break; + case AI_TARGET: + case AI_TARGET_PARTNER: + for (i = 0; i < 4; i++) + { + if (BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i] == *movePtr) + break; + } + if (i != 4) + gAIScriptPtr += 8; + else + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); + break; } } static void BattleAICmd_if_has_move_with_effect(void) { - int i; + s32 i; switch (gAIScriptPtr[1]) { @@ -1888,7 +1866,7 @@ static void BattleAICmd_if_has_move_with_effect(void) case AI_TARGET_PARTNER: for (i = 0; i < 4; i++) { - // UB: checks sBattler_AI instead of gBattlerTarget + // UB: checks sBattler_AI instead of gBattlerTarget. if (gBattleMons[sBattler_AI].moves[i] != 0 && gBattleMoves[BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i]].effect == gAIScriptPtr[2]) break; } @@ -1902,7 +1880,7 @@ static void BattleAICmd_if_has_move_with_effect(void) static void BattleAICmd_if_doesnt_have_move_with_effect(void) { - int i; + s32 i; switch (gAIScriptPtr[1]) { @@ -1944,25 +1922,22 @@ static void BattleAICmd_if_any_move_disabled_or_encored(void) if (gAIScriptPtr[2] == 0) { - if (gDisableStructs[battlerId].disabledMove == 0) - { + if (gDisableStructs[battlerId].disabledMove == MOVE_NONE) gAIScriptPtr += 7; - return; - } - gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); - return; + else + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); } - else if (gAIScriptPtr[2] != 1) // ignore the macro if its not 0 or 1. + else if (gAIScriptPtr[2] != 1) { gAIScriptPtr += 7; - return; } - else if (gDisableStructs[battlerId].encoredMove != 0) + else { - gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); - return; + if (gDisableStructs[battlerId].encoredMove != MOVE_NONE) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); + else + gAIScriptPtr += 7; } - gAIScriptPtr += 7; } static void BattleAICmd_if_curr_move_disabled_or_encored(void) @@ -1971,23 +1946,19 @@ static void BattleAICmd_if_curr_move_disabled_or_encored(void) { case 0: if (gDisableStructs[gActiveBattler].disabledMove == AI_THINKING_STRUCT->moveConsidered) - { gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); - return; - } - gAIScriptPtr += 6; - return; + else + gAIScriptPtr += 6; + break;; case 1: if (gDisableStructs[gActiveBattler].encoredMove == AI_THINKING_STRUCT->moveConsidered) - { gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); - return; - } - gAIScriptPtr += 6; - return; + else + gAIScriptPtr += 6; + break; default: gAIScriptPtr += 6; - return; + break; } } @@ -1998,7 +1969,7 @@ static void BattleAICmd_flee(void) static void BattleAICmd_if_random_safari_flee(void) { - u8 safariFleeRate = gBattleStruct->field_7B * 5; // safari flee rate, from 0-20 + u8 safariFleeRate = gBattleStruct->field_7B * 5; // Safari flee rate, from 0-20. if ((u8)(Random() % 100) < safariFleeRate) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); @@ -2030,7 +2001,7 @@ static void BattleAICmd_get_hold_effect(void) static void BattleAICmd_if_holds_item(void) { - u8 battlerId = BattleAI_GetWantedBank(gAIScriptPtr[1]); + u8 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]); u16 item; u8 var1, var2; @@ -2107,7 +2078,7 @@ static void BattleAICmd_get_used_held_item(void) else battlerId = gBattlerTarget; - // This is likely a leftover from Ruby's code and its ugly ewram access + // This is likely a leftover from Ruby's code and its ugly ewram access. #ifdef NONMATCHING AI_THINKING_STRUCT->funcResult = gBattleStruct->usedHeldItems[battlerId]; #else @@ -2199,28 +2170,22 @@ static void BattleAICmd_if_level_cond(void) { case 0: // greater than if (gBattleMons[sBattler_AI].level > gBattleMons[gBattlerTarget].level) - { gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); - return; - } - gAIScriptPtr += 6; - return; + else + gAIScriptPtr += 6; + break; case 1: // less than if (gBattleMons[sBattler_AI].level < gBattleMons[gBattlerTarget].level) - { gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); - return; - } - gAIScriptPtr += 6; - return; + else + gAIScriptPtr += 6; + break; case 2: // equal if (gBattleMons[sBattler_AI].level == gBattleMons[gBattlerTarget].level) - { gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); - return; - } - gAIScriptPtr += 6; - return; + else + gAIScriptPtr += 6; + break; } } @@ -2250,7 +2215,7 @@ static void BattleAICmd_if_target_is_ally(void) static void BattleAICmd_if_flash_fired(void) { - u8 battlerId = BattleAI_GetWantedBank(gAIScriptPtr[1]); + u8 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]); if (gBattleResources->flags->flags[battlerId] & UNKNOWN_FLAG_FLASH_FIRE) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); @@ -2277,5 +2242,7 @@ static bool8 AIStackPop(void) return TRUE; } else + { return FALSE; + } } diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index 83ad2b4fdd..a105e7edfb 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -19,18 +19,20 @@ static bool8 ShouldSwitchIfPerishSong(void) if (gStatuses3[gActiveBattler] & STATUS3_PERISH_SONG && gDisableStructs[gActiveBattler].perishSongTimer1 == 0) { - *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = 6; + *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = PARTY_SIZE; BtlController_EmitTwoReturnValues(1, B_ACTION_SWITCH, 0); return TRUE; } - - return FALSE; + else + { + return FALSE; + } } static bool8 ShouldSwitchIfWonderGuard(void) { u8 opposingPosition; - u8 opposingBank; + u8 opposingBattler; u8 moveFlags; s32 i, j; s32 firstId; @@ -46,22 +48,22 @@ static bool8 ShouldSwitchIfWonderGuard(void) if (gBattleMons[GetBattlerAtPosition(opposingPosition)].ability != ABILITY_WONDER_GUARD) return FALSE; - // check if pokemon has a super effective move - for (opposingBank = GetBattlerAtPosition(opposingPosition), i = 0; i < 4; i++) + // Check if Pokemon has a super effective move. + for (opposingBattler = GetBattlerAtPosition(opposingPosition), i = 0; i < 4; i++) { move = gBattleMons[gActiveBattler].moves[i]; if (move == MOVE_NONE) continue; - moveFlags = AI_TypeCalc(move, gBattleMons[opposingBank].species, gBattleMons[opposingBank].ability); + moveFlags = AI_TypeCalc(move, gBattleMons[opposingBattler].species, gBattleMons[opposingBattler].ability); if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE) return FALSE; } - // get party information + // Get party information. if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000)) { - if ((gActiveBattler & BIT_FLANK) == 0) + if ((gActiveBattler & BIT_FLANK) == B_FLANK_LEFT) firstId = 0, lastId = 3; else firstId = 3, lastId = 6; @@ -76,7 +78,7 @@ static bool8 ShouldSwitchIfWonderGuard(void) else party = gEnemyParty; - // find a pokemon in the party that has a super effective move + // Find a Pokemon in the party that has a super effective move. for (i = firstId; i < lastId; i++) { if (GetMonData(&party[i], MON_DATA_HP) == 0) @@ -88,19 +90,19 @@ static bool8 ShouldSwitchIfWonderGuard(void) if (i == gBattlerPartyIndexes[gActiveBattler]) continue; - GetMonData(&party[i], MON_DATA_SPECIES); // unused return value - GetMonData(&party[i], MON_DATA_ALT_ABILITY); // unused return value + GetMonData(&party[i], MON_DATA_SPECIES); // Unused return value. + GetMonData(&party[i], MON_DATA_ALT_ABILITY); // Unused return value. - for (opposingBank = GetBattlerAtPosition(opposingPosition), j = 0; j < 4; j++) + for (opposingBattler = GetBattlerAtPosition(opposingPosition), j = 0; j < 4; j++) { move = GetMonData(&party[i], MON_DATA_MOVE1 + j); if (move == MOVE_NONE) continue; - moveFlags = AI_TypeCalc(move, gBattleMons[opposingBank].species, gBattleMons[opposingBank].ability); + moveFlags = AI_TypeCalc(move, gBattleMons[opposingBattler].species, gBattleMons[opposingBattler].ability); if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE && Random() % 3 < 2) { - // we found a mon + // We found a mon. *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = i; BtlController_EmitTwoReturnValues(1, B_ACTION_SWITCH, 0); return TRUE; @@ -108,12 +110,12 @@ static bool8 ShouldSwitchIfWonderGuard(void) } } - return FALSE; // at this point there is not a single pokemon in the party that has a super effective move against a pokemon with wonder guard + return FALSE; // There is not a single Pokemon in the party that has a super effective move against a mon with Wonder Guard. } static bool8 FindMonThatAbsorbsOpponentsMove(void) { - u8 bankIn1, bankIn2; + u8 battlerIn1, battlerIn2; u8 absorbingTypeAbility; s32 firstId; s32 lastId; // + 1 @@ -131,16 +133,16 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void) if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { - bankIn1 = gActiveBattler; + battlerIn1 = gActiveBattler; if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))]) - bankIn2 = gActiveBattler; + battlerIn2 = gActiveBattler; else - bankIn2 = GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler))); + battlerIn2 = GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler))); } else { - bankIn1 = gActiveBattler; - bankIn2 = gActiveBattler; + battlerIn1 = gActiveBattler; + battlerIn2 = gActiveBattler; } if (gBattleMoves[gLastLandedMoves[gActiveBattler]].type == TYPE_FIRE) @@ -157,7 +159,7 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void) if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000)) { - if ((gActiveBattler & BIT_FLANK) == 0) + if ((gActiveBattler & BIT_FLANK) == B_FLANK_LEFT) firstId = 0, lastId = 3; else firstId = 3, lastId = 6; @@ -183,13 +185,13 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void) continue; if (GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_EGG) continue; - if (i == gBattlerPartyIndexes[bankIn1]) + if (i == gBattlerPartyIndexes[battlerIn1]) continue; - if (i == gBattlerPartyIndexes[bankIn2]) + if (i == gBattlerPartyIndexes[battlerIn2]) continue; - if (i == *(gBattleStruct->monToSwitchIntoId + bankIn1)) + if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn1)) continue; - if (i == *(gBattleStruct->monToSwitchIntoId + bankIn2)) + if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn2)) continue; species = GetMonData(&party[i], MON_DATA_SPECIES); @@ -200,7 +202,7 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void) if (absorbingTypeAbility == monAbility && Random() & 1) { - // we found a mon + // we found a mon. *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = i; BtlController_EmitTwoReturnValues(1, B_ACTION_SWITCH, 0); return TRUE; @@ -221,13 +223,13 @@ static bool8 ShouldSwitchIfNaturalCure(void) if ((gLastLandedMoves[gActiveBattler] == 0 || gLastLandedMoves[gActiveBattler] == 0xFFFF) && Random() & 1) { - *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = 6; + *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = PARTY_SIZE; BtlController_EmitTwoReturnValues(1, B_ACTION_SWITCH, 0); return TRUE; } else if (gBattleMoves[gLastLandedMoves[gActiveBattler]].power == 0 && Random() & 1) { - *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = 6; + *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = PARTY_SIZE; BtlController_EmitTwoReturnValues(1, B_ACTION_SWITCH, 0); return TRUE; } @@ -236,9 +238,10 @@ static bool8 ShouldSwitchIfNaturalCure(void) return TRUE; if (FindMonWithFlagsAndSuperEffective(MOVE_RESULT_NOT_VERY_EFFECTIVE, 1)) return TRUE; + if (Random() & 1) { - *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = 6; + *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = PARTY_SIZE; BtlController_EmitTwoReturnValues(1, B_ACTION_SWITCH, 0); return TRUE; } @@ -249,15 +252,15 @@ static bool8 ShouldSwitchIfNaturalCure(void) static bool8 HasSuperEffectiveMoveAgainstOpponents(bool8 noRng) { u8 opposingPosition; - u8 opposingBank; + u8 opposingBattler; s32 i; u8 moveFlags; u16 move; opposingPosition = BATTLE_OPPOSITE(GetBattlerPosition(gActiveBattler)); - opposingBank = GetBattlerAtPosition(opposingPosition); + opposingBattler = GetBattlerAtPosition(opposingPosition); - if (!(gAbsentBattlerFlags & gBitTable[opposingBank])) + if (!(gAbsentBattlerFlags & gBitTable[opposingBattler])) { for (i = 0; i < 4; i++) { @@ -265,7 +268,7 @@ static bool8 HasSuperEffectiveMoveAgainstOpponents(bool8 noRng) if (move == MOVE_NONE) continue; - moveFlags = AI_TypeCalc(move, gBattleMons[opposingBank].species, gBattleMons[opposingBank].ability); + moveFlags = AI_TypeCalc(move, gBattleMons[opposingBattler].species, gBattleMons[opposingBattler].ability); if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE) { if (noRng) @@ -278,9 +281,9 @@ static bool8 HasSuperEffectiveMoveAgainstOpponents(bool8 noRng) if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) return FALSE; - opposingBank = GetBattlerAtPosition(BATTLE_PARTNER(opposingPosition)); + opposingBattler = GetBattlerAtPosition(BATTLE_PARTNER(opposingPosition)); - if (!(gAbsentBattlerFlags & gBitTable[opposingBank])) + if (!(gAbsentBattlerFlags & gBitTable[opposingBattler])) { for (i = 0; i < 4; i++) { @@ -288,7 +291,7 @@ static bool8 HasSuperEffectiveMoveAgainstOpponents(bool8 noRng) if (move == MOVE_NONE) continue; - moveFlags = AI_TypeCalc(move, gBattleMons[opposingBank].species, gBattleMons[opposingBank].ability); + moveFlags = AI_TypeCalc(move, gBattleMons[opposingBattler].species, gBattleMons[opposingBattler].ability); if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE) { if (noRng) @@ -318,7 +321,7 @@ static bool8 AreStatsRaised(void) static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent) { - u8 bankIn1, bankIn2; + u8 battlerIn1, battlerIn2; s32 firstId; s32 lastId; // + 1 struct Pokemon *party; @@ -337,16 +340,16 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent) if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { - bankIn1 = gActiveBattler; + battlerIn1 = gActiveBattler; if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))]) - bankIn2 = gActiveBattler; + battlerIn2 = gActiveBattler; else - bankIn2 = GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler))); + battlerIn2 = GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler))); } else { - bankIn1 = gActiveBattler; - bankIn2 = gActiveBattler; + battlerIn1 = gActiveBattler; + battlerIn2 = gActiveBattler; } if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000)) @@ -377,13 +380,13 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent) continue; if (GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_EGG) continue; - if (i == gBattlerPartyIndexes[bankIn1]) + if (i == gBattlerPartyIndexes[battlerIn1]) continue; - if (i == gBattlerPartyIndexes[bankIn2]) + if (i == gBattlerPartyIndexes[battlerIn2]) continue; - if (i == *(gBattleStruct->monToSwitchIntoId + bankIn1)) + if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn1)) continue; - if (i == *(gBattleStruct->monToSwitchIntoId + bankIn2)) + if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn2)) continue; species = GetMonData(&party[i], MON_DATA_SPECIES); @@ -395,7 +398,7 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent) moveFlags = AI_TypeCalc(gLastLandedMoves[gActiveBattler], species, monAbility); if (moveFlags & flags) { - bankIn1 = gLastHitBy[gActiveBattler]; + battlerIn1 = gLastHitBy[gActiveBattler]; for (j = 0; j < 4; j++) { @@ -403,7 +406,7 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent) if (move == 0) continue; - moveFlags = AI_TypeCalc(move, gBattleMons[bankIn1].species, gBattleMons[bankIn1].ability); + moveFlags = AI_TypeCalc(move, gBattleMons[battlerIn1].species, gBattleMons[battlerIn1].ability); if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE && Random() % moduloPercent == 0) { *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = i; @@ -419,23 +422,23 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent) static bool8 ShouldSwitch(void) { - u8 bankIn1, bankIn2; - u8 *activeBankPtr; // needed to match + u8 battlerIn1, battlerIn2; + u8 *activeBattlerPtr; // Needed to match. s32 firstId; s32 lastId; // + 1 struct Pokemon *party; s32 i; s32 availableToSwitch; - if (gBattleMons[*(activeBankPtr = &gActiveBattler)].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION)) + if (gBattleMons[*(activeBattlerPtr = &gActiveBattler)].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION)) return FALSE; if (gStatuses3[gActiveBattler] & STATUS3_ROOTED) return FALSE; - if (AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gActiveBattler, ABILITY_SHADOW_TAG, 0, 0)) + if (ABILITY_ON_OPPOSING_FIELD(gActiveBattler, ABILITY_SHADOW_TAG)) return FALSE; - if (AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gActiveBattler, ABILITY_ARENA_TRAP, 0, 0)) - return FALSE; // misses the flying or levitate check - if (AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, ABILITY_MAGNET_PULL, 0, 0)) + if (ABILITY_ON_OPPOSING_FIELD(gActiveBattler, ABILITY_ARENA_TRAP)) // Misses the flying type and Levitate check. + return FALSE; + if (ABILITY_ON_FIELD2(ABILITY_MAGNET_PULL)) { if (gBattleMons[gActiveBattler].type1 == TYPE_STEEL) return FALSE; @@ -448,21 +451,21 @@ static bool8 ShouldSwitch(void) availableToSwitch = 0; if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { - bankIn1 = *activeBankPtr; - if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(GetBattlerPosition(*activeBankPtr) ^ BIT_FLANK)]) - bankIn2 = *activeBankPtr; + battlerIn1 = *activeBattlerPtr; + if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(GetBattlerPosition(*activeBattlerPtr) ^ BIT_FLANK)]) + battlerIn2 = *activeBattlerPtr; else - bankIn2 = GetBattlerAtPosition(GetBattlerPosition(*activeBankPtr) ^ BIT_FLANK); + battlerIn2 = GetBattlerAtPosition(GetBattlerPosition(*activeBattlerPtr) ^ BIT_FLANK); } else { - bankIn1 = *activeBankPtr; - bankIn2 = *activeBankPtr; + battlerIn1 = *activeBattlerPtr; + battlerIn2 = *activeBattlerPtr; } if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000)) { - if ((gActiveBattler & BIT_FLANK) == 0) + if ((gActiveBattler & BIT_FLANK) == B_FLANK_LEFT) firstId = 0, lastId = 3; else firstId = 3, lastId = 6; @@ -485,13 +488,13 @@ static bool8 ShouldSwitch(void) continue; if (GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_EGG) continue; - if (i == gBattlerPartyIndexes[bankIn1]) + if (i == gBattlerPartyIndexes[battlerIn1]) continue; - if (i == gBattlerPartyIndexes[bankIn2]) + if (i == gBattlerPartyIndexes[battlerIn2]) continue; - if (i == *(gBattleStruct->monToSwitchIntoId + bankIn1)) + if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn1)) continue; - if (i == *(gBattleStruct->monToSwitchIntoId + bankIn2)) + if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn2)) continue; availableToSwitch++; @@ -521,10 +524,10 @@ static bool8 ShouldSwitch(void) void AI_TrySwitchOrUseItem(void) { struct Pokemon *party; - u8 bankIn1, bankIn2; + u8 battlerIn1, battlerIn2; s32 firstId; s32 lastId; // + 1 - u8 bankIdentity = GetBattlerPosition(gActiveBattler); + u8 battlerIdentity = GetBattlerPosition(gActiveBattler); if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) party = gPlayerParty; @@ -535,25 +538,25 @@ void AI_TrySwitchOrUseItem(void) { if (ShouldSwitch()) { - if (*(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) == 6) + if (*(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) == PARTY_SIZE) { s32 monToSwitchId = GetMostSuitableMonToSwitchInto(); - if (monToSwitchId == 6) + if (monToSwitchId == PARTY_SIZE) { if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) { - bankIn1 = GetBattlerAtPosition(bankIdentity); - bankIn2 = bankIn1; + battlerIn1 = GetBattlerAtPosition(battlerIdentity); + battlerIn2 = battlerIn1; } else { - bankIn1 = GetBattlerAtPosition(bankIdentity); - bankIn2 = GetBattlerAtPosition(bankIdentity ^ BIT_FLANK); + battlerIn1 = GetBattlerAtPosition(battlerIdentity); + battlerIn2 = GetBattlerAtPosition(battlerIdentity ^ BIT_FLANK); } if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000)) { - if ((gActiveBattler & BIT_FLANK) == 0) + if ((gActiveBattler & BIT_FLANK) == B_FLANK_LEFT) firstId = 0, lastId = 3; else firstId = 3, lastId = 6; @@ -567,13 +570,13 @@ void AI_TrySwitchOrUseItem(void) { if (GetMonData(&party[monToSwitchId], MON_DATA_HP) == 0) continue; - if (monToSwitchId == gBattlerPartyIndexes[bankIn1]) + if (monToSwitchId == gBattlerPartyIndexes[battlerIn1]) continue; - if (monToSwitchId == gBattlerPartyIndexes[bankIn2]) + if (monToSwitchId == gBattlerPartyIndexes[battlerIn2]) continue; - if (monToSwitchId == *(gBattleStruct->monToSwitchIntoId + bankIn1)) + if (monToSwitchId == *(gBattleStruct->monToSwitchIntoId + battlerIn1)) continue; - if (monToSwitchId == *(gBattleStruct->monToSwitchIntoId + bankIn2)) + if (monToSwitchId == *(gBattleStruct->monToSwitchIntoId + battlerIn2)) continue; break; @@ -608,10 +611,10 @@ static void ModulateByTypeEffectiveness(u8 atkType, u8 defType1, u8 defType2, u8 } else if (TYPE_EFFECT_ATK_TYPE(i) == atkType) { - // check type1 + // Check type1. if (TYPE_EFFECT_DEF_TYPE(i) == defType1) *var = (*var * TYPE_EFFECT_MULTIPLIER(i)) / 10; - // check type2 + // Check type2. if (TYPE_EFFECT_DEF_TYPE(i) == defType2 && defType1 != defType2) *var = (*var * TYPE_EFFECT_MULTIPLIER(i)) / 10; } @@ -621,10 +624,10 @@ static void ModulateByTypeEffectiveness(u8 atkType, u8 defType1, u8 defType2, u8 u8 GetMostSuitableMonToSwitchInto(void) { - u8 opposingBank; - u8 bestDmg; // note : should be changed to u32 for obvious reasons + u8 opposingBattler; + u8 bestDmg; // Note : should be changed to u32 for obvious reasons. u8 bestMonId; - u8 bankIn1, bankIn2; + u8 battlerIn1, battlerIn2; s32 firstId; s32 lastId; // + 1 struct Pokemon *party; @@ -632,34 +635,34 @@ u8 GetMostSuitableMonToSwitchInto(void) u8 invalidMons; u16 move; - if (*(gBattleStruct->monToSwitchIntoId + gActiveBattler) != 6) + if (*(gBattleStruct->monToSwitchIntoId + gActiveBattler) != PARTY_SIZE) return *(gBattleStruct->monToSwitchIntoId + gActiveBattler); if (gBattleTypeFlags & BATTLE_TYPE_ARENA) return gBattlerPartyIndexes[gActiveBattler] + 1; if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { - bankIn1 = gActiveBattler; + battlerIn1 = gActiveBattler; if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)]) - bankIn2 = gActiveBattler; + battlerIn2 = gActiveBattler; else - bankIn2 = GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK); + battlerIn2 = GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK); - // UB: It considers the opponent only player's side even though it can battle alongside player; - opposingBank = Random() & BIT_FLANK; - if (gAbsentBattlerFlags & gBitTable[opposingBank]) - opposingBank ^= BIT_FLANK; + // UB: It considers the opponent only player's side even though it can battle alongside player. + opposingBattler = Random() & BIT_FLANK; + if (gAbsentBattlerFlags & gBitTable[opposingBattler]) + opposingBattler ^= BIT_FLANK; } else { - opposingBank = GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_SIDE); - bankIn1 = gActiveBattler; - bankIn2 = gActiveBattler; + opposingBattler = GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_SIDE); + battlerIn1 = gActiveBattler; + battlerIn2 = gActiveBattler; } if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000)) { - if ((gActiveBattler & BIT_FLANK) == 0) + if ((gActiveBattler & BIT_FLANK) == B_FLANK_LEFT) firstId = 0, lastId = 3; else firstId = 3, lastId = 6; @@ -676,27 +679,27 @@ u8 GetMostSuitableMonToSwitchInto(void) invalidMons = 0; - while (invalidMons != 0x3F) // all mons are invalid + while (invalidMons != 0x3F) // All mons are invalid. { bestDmg = 0; bestMonId = 6; - // find the mon which type is the most suitable offensively + // Find the mon whose type is the most suitable offensively. for (i = firstId; i < lastId; i++) { u16 species = GetMonData(&party[i], MON_DATA_SPECIES); if (species != SPECIES_NONE && GetMonData(&party[i], MON_DATA_HP) != 0 && !(gBitTable[i] & invalidMons) - && gBattlerPartyIndexes[bankIn1] != i - && gBattlerPartyIndexes[bankIn2] != i - && i != *(gBattleStruct->monToSwitchIntoId + bankIn1) - && i != *(gBattleStruct->monToSwitchIntoId + bankIn2)) + && gBattlerPartyIndexes[battlerIn1] != i + && gBattlerPartyIndexes[battlerIn2] != i + && i != *(gBattleStruct->monToSwitchIntoId + battlerIn1) + && i != *(gBattleStruct->monToSwitchIntoId + battlerIn2)) { u8 type1 = gBaseStats[species].type1; u8 type2 = gBaseStats[species].type2; u8 typeDmg = 10; - ModulateByTypeEffectiveness(gBattleMons[opposingBank].type1, type1, type2, &typeDmg); - ModulateByTypeEffectiveness(gBattleMons[opposingBank].type2, type1, type2, &typeDmg); + ModulateByTypeEffectiveness(gBattleMons[opposingBattler].type1, type1, type2, &typeDmg); + ModulateByTypeEffectiveness(gBattleMons[opposingBattler].type2, type1, type2, &typeDmg); if (bestDmg < typeDmg) { bestDmg = typeDmg; @@ -709,24 +712,24 @@ u8 GetMostSuitableMonToSwitchInto(void) } } - // ok, we know the mon has the right typing but does it have at least one super effective move? - if (bestMonId != 6) + // Ok, we know the mon has the right typing but does it have at least one super effective move? + if (bestMonId != PARTY_SIZE) { for (i = 0; i < 4; i++) { move = GetMonData(&party[bestMonId], MON_DATA_MOVE1 + i); - if (move != MOVE_NONE && TypeCalc(move, gActiveBattler, opposingBank) & MOVE_RESULT_SUPER_EFFECTIVE) + if (move != MOVE_NONE && TypeCalc(move, gActiveBattler, opposingBattler) & MOVE_RESULT_SUPER_EFFECTIVE) break; } if (i != 4) - return bestMonId; // has both the typing and at least one super effective move + return bestMonId; // Has both the typing and at least one super effective move. - invalidMons |= gBitTable[bestMonId]; // sorry buddy, we want something better + invalidMons |= gBitTable[bestMonId]; // Sorry buddy, we want something better. } else { - invalidMons = 0x3F; // no viable mon to switch + invalidMons = 0x3F; // No viable mon to switch. } } @@ -738,20 +741,20 @@ u8 GetMostSuitableMonToSwitchInto(void) bestDmg = 0; bestMonId = 6; - // if we couldn't find the best mon in terms of typing, find the one that deals most damage + // If we couldn't find the best mon in terms of typing, find the one that deals most damage. for (i = firstId; i < lastId; i++) { if ((u16)(GetMonData(&party[i], MON_DATA_SPECIES)) == SPECIES_NONE) continue; if (GetMonData(&party[i], MON_DATA_HP) == 0) continue; - if (gBattlerPartyIndexes[bankIn1] == i) + if (gBattlerPartyIndexes[battlerIn1] == i) continue; - if (gBattlerPartyIndexes[bankIn2] == i) + if (gBattlerPartyIndexes[battlerIn2] == i) continue; - if (i == *(gBattleStruct->monToSwitchIntoId + bankIn1)) + if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn1)) continue; - if (i == *(gBattleStruct->monToSwitchIntoId + bankIn2)) + if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn2)) continue; for (j = 0; j < 4; j++) @@ -760,8 +763,8 @@ u8 GetMostSuitableMonToSwitchInto(void) gBattleMoveDamage = 0; if (move != MOVE_NONE && gBattleMoves[move].power != 1) { - AI_CalcDmg(gActiveBattler, opposingBank); - TypeCalc(move, gActiveBattler, opposingBank); + AI_CalcDmg(gActiveBattler, opposingBattler); + TypeCalc(move, gActiveBattler, opposingBattler); } if (bestDmg < gBattleMoveDamage) { @@ -774,21 +777,21 @@ u8 GetMostSuitableMonToSwitchInto(void) return bestMonId; } -// TODO: use PokemonItemEffect struct instead of u8 once it's documented +// TODO: use PokemonItemEffect struct instead of u8 once it's documented. static u8 GetAI_ItemType(u8 itemId, const u8 *itemEffect) // NOTE: should take u16 as item Id argument { if (itemId == ITEM_FULL_RESTORE) return AI_ITEM_FULL_RESTORE; - if (itemEffect[4] & 4) + else if (itemEffect[4] & 4) return AI_ITEM_HEAL_HP; - if (itemEffect[3] & 0x3F) + else if (itemEffect[3] & 0x3F) return AI_ITEM_CURE_CONDITION; - if (itemEffect[0] & 0x3F || itemEffect[1] != 0 || itemEffect[2] != 0) + else if (itemEffect[0] & 0x3F || itemEffect[1] != 0 || itemEffect[2] != 0) return AI_ITEM_X_STAT; - if (itemEffect[3] & 0x80) + else if (itemEffect[3] & 0x80) return AI_ITEM_GUARD_SPECS; - - return AI_ITEM_NOT_RECOGNIZABLE; + else + return AI_ITEM_NOT_RECOGNIZABLE; } static bool8 ShouldUseItem(void) @@ -806,7 +809,7 @@ static bool8 ShouldUseItem(void) else party = gEnemyParty; - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) { if (GetMonData(&party[i], MON_DATA_HP) != 0 && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_NONE @@ -821,7 +824,7 @@ static bool8 ShouldUseItem(void) u16 item; const u8 *itemEffects; u8 paramOffset; - u8 bankSide; + u8 battlerSide; if (i != 0 && validMons > (gBattleResources->battleHistory->itemsNo - i) + 1) continue; @@ -908,8 +911,8 @@ static bool8 ShouldUseItem(void) shouldUse = TRUE; break; case AI_ITEM_GUARD_SPECS: - bankSide = GetBattlerSide(gActiveBattler); - if (gDisableStructs[gActiveBattler].isFirstTurn != 0 && gSideTimers[bankSide].mistTimer == 0) + battlerSide = GetBattlerSide(gActiveBattler); + if (gDisableStructs[gActiveBattler].isFirstTurn != 0 && gSideTimers[battlerSide].mistTimer == 0) shouldUse = TRUE; break; case AI_ITEM_NOT_RECOGNIZABLE: diff --git a/src/battle_anim.c b/src/battle_anim.c index 8071736e66..b6f726897c 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -120,7 +120,7 @@ EWRAM_DATA static u16 sSoundAnimFramesToWait = 0; EWRAM_DATA static u8 sMonAnimTaskIdArray[2] = {0}; EWRAM_DATA u8 gAnimMoveTurn = 0; EWRAM_DATA static u8 sAnimBackgroundFadeState = 0; -EWRAM_DATA static u16 sAnimMoveIndex = 0; // set but unused. +EWRAM_DATA static u16 sAnimMoveIndex = 0; // Set but unused. EWRAM_DATA u8 gBattleAnimAttacker = 0; EWRAM_DATA u8 gBattleAnimTarget = 0; EWRAM_DATA u16 gAnimBattlerSpecies[MAX_BATTLERS_COUNT] = {0}; @@ -179,6 +179,7 @@ static void (* const sScriptCmdTable[])(void) = ScriptCmd_stopsound }; +// code void ClearBattleAnimationVars(void) { s32 i; @@ -192,11 +193,11 @@ void ClearBattleAnimationVars(void) gAnimMovePower = 0; gAnimFriendship = 0; - // clear index array. + // Clear index array. for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) sAnimSpriteIndexArray[i] |= 0xFFFF; - // clear anim args. + // Clear anim args. for (i = 0; i < ANIM_ARGS_COUNT; i++) gBattleAnimArgs[i] = 0; @@ -459,7 +460,7 @@ static void ScriptCmd_delay(void) gAnimScriptCallback = WaitAnimFrameCount; } -// wait for visual tasks to finish. +// Wait for visual tasks to finish. static void ScriptCmd_waitforvisualfinish(void) { if (gAnimVisualTaskCount == 0) @@ -486,7 +487,7 @@ static void ScriptCmd_end(void) s32 i; bool32 continuousAnim = FALSE; - // keep waiting as long as there is animations to be done. + // Keep waiting as long as there are animations to be done. if (gAnimVisualTaskCount != 0 || gAnimSoundTaskCount != 0 || sMonAnimTaskIdArray[0] != 0xFF || sMonAnimTaskIdArray[1] != 0xFF) { @@ -495,10 +496,10 @@ static void ScriptCmd_end(void) return; } - // finish the sound effects. + // Finish the sound effects. if (IsSEPlaying()) { - if (++sSoundAnimFramesToWait <= 90) // wait 90 frames, then halt the sound effect. + if (++sSoundAnimFramesToWait <= 90) // Wait 90 frames, then halt the sound effect. { gAnimFramesToWait = 1; return; @@ -510,7 +511,7 @@ static void ScriptCmd_end(void) } } - // the SE has halted, so set the SE Frame Counter to 0 and continue. + // The SE has halted, so set the SE Frame Counter to 0 and continue. sSoundAnimFramesToWait = 0; for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) @@ -523,7 +524,7 @@ static void ScriptCmd_end(void) } } - if (!continuousAnim) // may have been used for debug? + if (!continuousAnim) // May have been used for debug? { m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256); if (!IsContest()) @@ -592,12 +593,12 @@ static void ScriptCmd_monbg(void) bool8 toBG_2; u8 taskId; u8 battlerId; - u8 animBank; + u8 animBattler; sBattleAnimScriptPtr++; - animBank = sBattleAnimScriptPtr[0]; - if (animBank & ANIM_TARGET) + animBattler = sBattleAnimScriptPtr[0]; + if (animBattler & ANIM_TARGET) battlerId = gBattleAnimTarget; else battlerId = gBattleAnimAttacker; @@ -655,7 +656,7 @@ bool8 IsBattlerSpriteVisible(u8 battlerId) if (!IsBattlerSpritePresent(battlerId)) return FALSE; if (IsContest()) - return TRUE; // this line wont ever be reached. + return TRUE; // This line won't ever be reached. if (!gBattleSpritesDataPtr->battlerData[battlerId].invisible || !gSprites[gBattlerSpriteIds[battlerId]].invisible) return TRUE; @@ -847,32 +848,32 @@ static void task_pA_ma0A_obj_to_bg_pal(u8 taskId) static void ScriptCmd_clearmonbg(void) { - u8 animBankId; + u8 animBattlerId; u8 battlerId; u8 taskId; sBattleAnimScriptPtr++; - animBankId = sBattleAnimScriptPtr[0]; + animBattlerId = sBattleAnimScriptPtr[0]; - if (animBankId == ANIM_ATTACKER) - animBankId = ANIM_ATK_PARTNER; - else if (animBankId == ANIM_TARGET) - animBankId = ANIM_DEF_PARTNER; + if (animBattlerId == ANIM_ATTACKER) + animBattlerId = ANIM_ATK_PARTNER; + else if (animBattlerId == ANIM_TARGET) + animBattlerId = ANIM_DEF_PARTNER; - if (animBankId == ANIM_ATTACKER || animBankId == ANIM_ATK_PARTNER) + if (animBattlerId == ANIM_ATTACKER || animBattlerId == ANIM_ATK_PARTNER) battlerId = gBattleAnimAttacker; else battlerId = gBattleAnimTarget; if (sMonAnimTaskIdArray[0] != 0xFF) gSprites[gBattlerSpriteIds[battlerId]].invisible = 0; - if (animBankId > 1 && sMonAnimTaskIdArray[1] != 0xFF) + if (animBattlerId > 1 && sMonAnimTaskIdArray[1] != 0xFF) gSprites[gBattlerSpriteIds[battlerId ^ BIT_FLANK]].invisible = 0; else - animBankId = 0; + animBattlerId = 0; taskId = CreateTask(sub_80A4980, 5); - gTasks[taskId].data[0] = animBankId; + gTasks[taskId].data[0] = animBattlerId; gTasks[taskId].data[2] = battlerId; sBattleAnimScriptPtr++; @@ -910,18 +911,18 @@ static void ScriptCmd_monbg_22(void) { bool8 toBG_2; u8 battlerId; - u8 animBankId; + u8 animBattlerId; sBattleAnimScriptPtr++; - animBankId = sBattleAnimScriptPtr[0]; + animBattlerId = sBattleAnimScriptPtr[0]; - if (animBankId == ANIM_ATTACKER) - animBankId = ANIM_ATK_PARTNER; - else if (animBankId == ANIM_TARGET) - animBankId = ANIM_DEF_PARTNER; + if (animBattlerId == ANIM_ATTACKER) + animBattlerId = ANIM_ATK_PARTNER; + else if (animBattlerId == ANIM_TARGET) + animBattlerId = ANIM_DEF_PARTNER; - if (animBankId == ANIM_ATTACKER || animBankId == ANIM_ATK_PARTNER) + if (animBattlerId == ANIM_ATTACKER || animBattlerId == ANIM_ATK_PARTNER) battlerId = gBattleAnimAttacker; else battlerId = gBattleAnimTarget; @@ -938,7 +939,7 @@ static void ScriptCmd_monbg_22(void) } battlerId ^= BIT_FLANK; - if (animBankId > 1 && IsBattlerSpriteVisible(battlerId)) + if (animBattlerId > 1 && IsBattlerSpriteVisible(battlerId)) { u8 position = GetBattlerPosition(battlerId); if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest()) @@ -954,32 +955,32 @@ static void ScriptCmd_monbg_22(void) static void ScriptCmd_clearmonbg_23(void) { - u8 animBankId; + u8 animBattlerId; u8 battlerId; u8 taskId; sBattleAnimScriptPtr++; - animBankId = sBattleAnimScriptPtr[0]; + animBattlerId = sBattleAnimScriptPtr[0]; - if (animBankId == ANIM_ATTACKER) - animBankId = ANIM_ATK_PARTNER; - else if (animBankId == ANIM_TARGET) - animBankId = ANIM_DEF_PARTNER; + if (animBattlerId == ANIM_ATTACKER) + animBattlerId = ANIM_ATK_PARTNER; + else if (animBattlerId == ANIM_TARGET) + animBattlerId = ANIM_DEF_PARTNER; - if (animBankId == ANIM_ATTACKER || animBankId == ANIM_ATK_PARTNER) + if (animBattlerId == ANIM_ATTACKER || animBattlerId == ANIM_ATK_PARTNER) battlerId = gBattleAnimAttacker; else battlerId = gBattleAnimTarget; if (IsBattlerSpriteVisible(battlerId)) gSprites[gBattlerSpriteIds[battlerId]].invisible = 0; - if (animBankId > 1 && IsBattlerSpriteVisible(battlerId ^ BIT_FLANK)) + if (animBattlerId > 1 && IsBattlerSpriteVisible(battlerId ^ BIT_FLANK)) gSprites[gBattlerSpriteIds[battlerId ^ BIT_FLANK]].invisible = 0; else - animBankId = 0; + animBattlerId = 0; taskId = CreateTask(sub_80A4BB0, 5); - gTasks[taskId].data[0] = animBankId; + gTasks[taskId].data[0] = animBattlerId; gTasks[taskId].data[2] = battlerId; sBattleAnimScriptPtr++; @@ -1419,18 +1420,18 @@ void Task_PanFromInitialToTarget(u8 taskId) pan = currentPan + incrementPan; gTasks[taskId].tCurrentPan = pan; - if (incrementPan == 0) // If we're not incrementing, just cancel the task immediately + if (incrementPan == 0) // If we're not incrementing, just cancel the task immediately. { destroyTask = TRUE; } - else if (initialPanning < targetPanning) // Panning increasing + else if (initialPanning < targetPanning) // Panning increasing. { - if (pan >= targetPanning) // Target reached + if (pan >= targetPanning) // Target reached. destroyTask = TRUE; } - else // Panning decreasing + else // Panning decreasing. { - if (pan <= targetPanning) // Target reached + if (pan <= targetPanning) // Target reached. destroyTask = TRUE; } @@ -1684,14 +1685,14 @@ static void ScriptCmd_jumpifcontest(void) static void ScriptCmd_monbgprio_28(void) { - u8 wantedBank; + u8 wantedBattler; u8 battlerId; u8 battlerPosition; - wantedBank = sBattleAnimScriptPtr[1]; + wantedBattler = sBattleAnimScriptPtr[1]; sBattleAnimScriptPtr += 2; - if (wantedBank != ANIM_ATTACKER) + if (wantedBattler != ANIM_ATTACKER) battlerId = gBattleAnimTarget; else battlerId = gBattleAnimAttacker; @@ -1716,15 +1717,15 @@ static void ScriptCmd_monbgprio_29(void) static void ScriptCmd_monbgprio_2A(void) { - u8 wantedBank; + u8 wantedBattler; u8 battlerPosition; u8 battlerId; - wantedBank = sBattleAnimScriptPtr[1]; + wantedBattler = sBattleAnimScriptPtr[1]; sBattleAnimScriptPtr += 2; if (GetBattlerSide(gBattleAnimAttacker) != GetBattlerSide(gBattleAnimTarget)) { - if (wantedBank != ANIM_ATTACKER) + if (wantedBattler != ANIM_ATTACKER) battlerId = gBattleAnimTarget; else battlerId = gBattleAnimAttacker; @@ -1762,16 +1763,16 @@ static void ScriptCmd_visible(void) static void ScriptCmd_doublebattle_2D(void) { - u8 wantedBank; + u8 wantedBattler; u8 r4; u8 spriteId; - wantedBank = sBattleAnimScriptPtr[1]; + wantedBattler = sBattleAnimScriptPtr[1]; sBattleAnimScriptPtr += 2; if (!IsContest() && IsDoubleBattle() && GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget)) { - if (wantedBank == ANIM_ATTACKER) + if (wantedBattler == ANIM_ATTACKER) { r4 = sub_80A8364(gBattleAnimAttacker); spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); @@ -1797,16 +1798,16 @@ static void ScriptCmd_doublebattle_2D(void) static void ScriptCmd_doublebattle_2E(void) { - u8 wantedBank; + u8 wantedBattler; u8 r4; u8 spriteId; - wantedBank = sBattleAnimScriptPtr[1]; + wantedBattler = sBattleAnimScriptPtr[1]; sBattleAnimScriptPtr += 2; if (!IsContest() && IsDoubleBattle() && GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget)) { - if (wantedBank == ANIM_ATTACKER) + if (wantedBattler == ANIM_ATTACKER) { r4 = sub_80A8364(gBattleAnimAttacker); spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); diff --git a/src/battle_anim_sound_tasks.c b/src/battle_anim_sound_tasks.c index 2316b97590..5a829171e8 100644 --- a/src/battle_anim_sound_tasks.c +++ b/src/battle_anim_sound_tasks.c @@ -133,13 +133,13 @@ void sub_8158D8C(u8 taskId) if (gBattleAnimArgs[0] == ANIM_ATTACKER) species = gContestResources->field_18->field_0; else - DestroyAnimVisualTask(taskId); // UB: function should return upon destroying task + DestroyAnimVisualTask(taskId); // UB: function should return upon destroying task. } else { u8 battlerId; - // get wanted battler + // Get wanted battler. if (gBattleAnimArgs[0] == ANIM_ATTACKER) battlerId = gBattleAnimAttacker; else if (gBattleAnimArgs[0] == ANIM_TARGET) @@ -149,7 +149,7 @@ void sub_8158D8C(u8 taskId) else battlerId = BATTLE_PARTNER(gBattleAnimTarget); - // check if battler is visible + // Check if battler is visible. if ((gBattleAnimArgs[0] == ANIM_TARGET || gBattleAnimArgs[0] == ANIM_DEF_PARTNER) && !IsBattlerSpriteVisible(battlerId)) { DestroyAnimVisualTask(taskId); @@ -179,13 +179,13 @@ void sub_8158E9C(u8 taskId) if (gBattleAnimArgs[0] == ANIM_ATTACKER) species = gContestResources->field_18->field_0; else - DestroyAnimVisualTask(taskId); // UB: function should return upon destroying task + DestroyAnimVisualTask(taskId); // UB: function should return upon destroying task. } else { u8 battlerId; - // get wanted battler + // Get wanted battler. if (gBattleAnimArgs[0] == ANIM_ATTACKER) battlerId = gBattleAnimAttacker; else if (gBattleAnimArgs[0] == ANIM_TARGET) @@ -195,7 +195,7 @@ void sub_8158E9C(u8 taskId) else battlerId = BATTLE_PARTNER(gBattleAnimTarget); - // check if battler is visible + // Check if battler is visible. if ((gBattleAnimArgs[0] == ANIM_TARGET || gBattleAnimArgs[0] == ANIM_DEF_PARTNER) && !IsBattlerSpriteVisible(battlerId)) { DestroyAnimVisualTask(taskId); diff --git a/src/battle_bg.c b/src/battle_bg.c index d4bfd297aa..4895e96432 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -31,8 +31,8 @@ struct BattleBackground extern const struct SpriteTemplate gUnknown_0831A9D0; extern const struct SpriteTemplate gUnknown_0831A9E8; extern const struct CompressedSpriteSheet gUnknown_0831AA00; -extern const struct BgTemplate gUnknown_0831AA08[4]; -extern const struct WindowTemplate *gUnknown_0831ABA0[]; +extern const struct BgTemplate gBattleBgTemplates[4]; +extern const struct WindowTemplate *const gBattleWindowTemplates[]; extern const struct BattleBackground gBattleTerrainTable[]; extern u16 gBattle_BG1_X; @@ -42,23 +42,23 @@ extern u16 gBattle_BG2_Y; extern u8 GetCurrentMapBattleScene(void); -void sub_8035658(void) +void BattleInitBgsAndWindows(void) { ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, gUnknown_0831AA08, ARRAY_COUNT(gUnknown_0831AA08)); + InitBgsFromTemplates(0, gBattleBgTemplates, ARRAY_COUNT(gBattleBgTemplates)); if (gBattleTypeFlags & BATTLE_TYPE_ARENA) { - gBattleScripting.field_24 = 1; + gBattleScripting.windowsType = 1; SetBgTilemapBuffer(1, gUnknown_02023060); SetBgTilemapBuffer(2, gUnknown_02023060); } else { - gBattleScripting.field_24 = 0; + gBattleScripting.windowsType = 0; } - InitWindows(gUnknown_0831ABA0[gBattleScripting.field_24]); + InitWindows(gBattleWindowTemplates[gBattleScripting.windowsType]); DeactivateAllTextPrinters(); } @@ -66,23 +66,23 @@ void sub_80356D0(void) { DisableInterrupts(INTR_FLAG_HBLANK); EnableInterrupts(INTR_FLAG_VBLANK | INTR_FLAG_VCOUNT | INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL); - sub_8035658(); + BattleInitBgsAndWindows(); SetGpuReg(REG_OFFSET_BLDCNT, 0); SetGpuReg(REG_OFFSET_BLDALPHA, 0); SetGpuReg(REG_OFFSET_BLDY, 0); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJWIN_ON | DISPCNT_WIN0_ON | DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); } -void ApplyPlayerChosenFrameToBattleMenu(void) +void LoadBattleMenuWindowGfx(void) { - sub_809882C(2, 0x12, 0x10); - sub_809882C(2, 0x22, 0x10); + LoadSav2WindowGfx(2, 0x12, 0x10); + LoadSav2WindowGfx(2, 0x22, 0x10); LoadCompressedPalette(gUnknown_08D85600, 0x50, 0x20); if (gBattleTypeFlags & BATTLE_TYPE_ARENA) { sub_81978B0(0x70); - copy_textbox_border_tile_patterns_to_vram(0, 0x30, 0x70); + LoadMessageBoxGfx(0, 0x30, 0x70); gPlttBufferUnfaded[0x76] = 0; CpuCopy16(&gPlttBufferUnfaded[0x76], &gPlttBufferFaded[0x76], 2); } @@ -193,12 +193,12 @@ void LoadBattleTextboxAndBackground(void) CopyToBgTilemapBuffer(0, gBattleTextboxTilemap, 0, 0); CopyBgTilemapBufferToVram(0); LoadCompressedPalette(gBattleTextboxPalette, 0, 0x40); - ApplyPlayerChosenFrameToBattleMenu(); + LoadBattleMenuWindowGfx(); DrawMainBattleBackground(); } -static void sub_8035AE4(u8 taskId, u8 bank, u8 bgId, u8 destX, u8 destY) +static void sub_8035AE4(u8 taskId, u8 battlerId, u8 bgId, u8 destX, u8 destY) { s32 i; u16 var = 0; @@ -208,7 +208,7 @@ static void sub_8035AE4(u8 taskId, u8 bank, u8 bgId, u8 destX, u8 destY) { if (gTasks[taskId].data[5] != 0) { - switch (bank) + switch (battlerId) { case 0: var = 0x3F & gTasks[taskId].data[3]; @@ -226,7 +226,7 @@ static void sub_8035AE4(u8 taskId, u8 bank, u8 bgId, u8 destX, u8 destY) } else { - switch (bank) + switch (battlerId) { case 0: var = 0x3F & gTasks[taskId].data[3]; @@ -253,7 +253,7 @@ static void sub_8035AE4(u8 taskId, u8 bank, u8 bgId, u8 destX, u8 destY) } else { - if (bank == gBattleScripting.multiplayerId) + if (battlerId == gBattleScripting.multiplayerId) var = gTasks[taskId].data[3]; else var = gTasks[taskId].data[4]; @@ -272,7 +272,7 @@ static void sub_8035C4C(void) { if (gBattleOutcome == B_OUTCOME_DREW) { - BattleHandleAddTextPrinter(gText_Draw, 0x15); + BattlePutTextOnWindow(gText_Draw, 0x15); } else if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { @@ -281,20 +281,20 @@ static void sub_8035C4C(void) switch (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18) { case 0: - BattleHandleAddTextPrinter(gText_Win, 0x16); - BattleHandleAddTextPrinter(gText_Loss, 0x17); + BattlePutTextOnWindow(gText_Win, 0x16); + BattlePutTextOnWindow(gText_Loss, 0x17); break; case 1: - BattleHandleAddTextPrinter(gText_Win, 0x17); - BattleHandleAddTextPrinter(gText_Loss, 0x16); + BattlePutTextOnWindow(gText_Win, 0x17); + BattlePutTextOnWindow(gText_Loss, 0x16); break; case 2: - BattleHandleAddTextPrinter(gText_Win, 0x16); - BattleHandleAddTextPrinter(gText_Loss, 0x17); + BattlePutTextOnWindow(gText_Win, 0x16); + BattlePutTextOnWindow(gText_Loss, 0x17); break; case 3: - BattleHandleAddTextPrinter(gText_Win, 0x17); - BattleHandleAddTextPrinter(gText_Loss, 0x16); + BattlePutTextOnWindow(gText_Win, 0x17); + BattlePutTextOnWindow(gText_Loss, 0x16); break; } } @@ -303,20 +303,20 @@ static void sub_8035C4C(void) switch (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18) { case 0: - BattleHandleAddTextPrinter(gText_Win, 0x17); - BattleHandleAddTextPrinter(gText_Loss, 0x16); + BattlePutTextOnWindow(gText_Win, 0x17); + BattlePutTextOnWindow(gText_Loss, 0x16); break; case 1: - BattleHandleAddTextPrinter(gText_Win, 0x16); - BattleHandleAddTextPrinter(gText_Loss, 0x17); + BattlePutTextOnWindow(gText_Win, 0x16); + BattlePutTextOnWindow(gText_Loss, 0x17); break; case 2: - BattleHandleAddTextPrinter(gText_Win, 0x17); - BattleHandleAddTextPrinter(gText_Loss, 0x16); + BattlePutTextOnWindow(gText_Win, 0x17); + BattlePutTextOnWindow(gText_Loss, 0x16); break; case 3: - BattleHandleAddTextPrinter(gText_Win, 0x16); - BattleHandleAddTextPrinter(gText_Loss, 0x17); + BattlePutTextOnWindow(gText_Win, 0x16); + BattlePutTextOnWindow(gText_Loss, 0x17); break; } } @@ -325,26 +325,26 @@ static void sub_8035C4C(void) { if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 != 0) { - BattleHandleAddTextPrinter(gText_Win, 0x17); - BattleHandleAddTextPrinter(gText_Loss, 0x16); + BattlePutTextOnWindow(gText_Win, 0x17); + BattlePutTextOnWindow(gText_Loss, 0x16); } else { - BattleHandleAddTextPrinter(gText_Win, 0x16); - BattleHandleAddTextPrinter(gText_Loss, 0x17); + BattlePutTextOnWindow(gText_Win, 0x16); + BattlePutTextOnWindow(gText_Loss, 0x17); } } else { if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 != 0) { - BattleHandleAddTextPrinter(gText_Win, 0x16); - BattleHandleAddTextPrinter(gText_Loss, 0x17); + BattlePutTextOnWindow(gText_Win, 0x16); + BattlePutTextOnWindow(gText_Loss, 0x17); } else { - BattleHandleAddTextPrinter(gText_Win, 0x17); - BattleHandleAddTextPrinter(gText_Loss, 0x16); + BattlePutTextOnWindow(gText_Win, 0x17); + BattlePutTextOnWindow(gText_Loss, 0x16); } } } @@ -368,19 +368,19 @@ void sub_8035D74(u8 taskId) switch (linkPlayer->lp_field_18) { case 0: - BattleHandleAddTextPrinter(name, 0x11); + BattlePutTextOnWindow(name, 0x11); sub_8035AE4(taskId, linkPlayer->lp_field_18, 1, 2, 4); break; case 1: - BattleHandleAddTextPrinter(name, 0x12); + BattlePutTextOnWindow(name, 0x12); sub_8035AE4(taskId, linkPlayer->lp_field_18, 2, 2, 4); break; case 2: - BattleHandleAddTextPrinter(name, 0x13); + BattlePutTextOnWindow(name, 0x13); sub_8035AE4(taskId, linkPlayer->lp_field_18, 1, 2, 8); break; case 3: - BattleHandleAddTextPrinter(name, 0x14); + BattlePutTextOnWindow(name, 0x14); sub_8035AE4(taskId, linkPlayer->lp_field_18, 2, 2, 8); break; } @@ -396,10 +396,10 @@ void sub_8035D74(u8 taskId) opponentId = playerId, playerId = opponentId_copy; name = gLinkPlayers[playerId].name; - BattleHandleAddTextPrinter(name, 0xF); + BattlePutTextOnWindow(name, 0xF); name = gLinkPlayers[opponentId].name; - BattleHandleAddTextPrinter(name, 0x10); + BattlePutTextOnWindow(name, 0x10); sub_8035AE4(taskId, playerId, 1, 2, 7); sub_8035AE4(taskId, opponentId, 2, 2, 7); @@ -457,7 +457,7 @@ void sub_8035D74(u8 taskId) } } -void LoadBattleEntryBackground(void) +void DrawBattleEntryBackground(void) { if (gBattleTypeFlags & BATTLE_TYPE_LINK) { @@ -740,7 +740,7 @@ bool8 LoadChosenBattleElement(u8 caseId) } break; case 6: - ApplyPlayerChosenFrameToBattleMenu(); + LoadBattleMenuWindowGfx(); break; default: ret = TRUE; diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index a4aac55e2f..905e957ea7 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -1475,7 +1475,7 @@ static void LinkOpponentHandlePrintString(void) gBattle_BG0_Y = 0; stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]); BufferStringBattle(*stringId); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter; BattleTv_SetDataBasedOnString(*stringId); } diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index d742d5df22..3178bad0e3 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -1299,7 +1299,7 @@ static void LinkPartnerHandlePrintString(void) gBattle_BG0_Y = 0; stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]); BufferStringBattle(*stringId); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter; BattleTv_SetDataBasedOnString(*stringId); } diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 64cf16b864..ae407af244 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -1511,7 +1511,7 @@ static void OpponentHandlePrintString(void) gBattle_BG0_Y = 0; stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]); BufferStringBattle(*stringId); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter; sub_81A57E4(gActiveBattler, *stringId); } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index e0694029aa..627b13e229 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -620,7 +620,7 @@ static void HandleInputChooseMove(void) gMultiUsePlayerCursor = gMoveSelectionCursor[gActiveBattler] + 1; MoveSelectionCreateCursorAt(gMultiUsePlayerCursor, 27); - BattleHandleAddTextPrinter(gText_BattleSwitchWhich, 0xB); + BattlePutTextOnWindow(gText_BattleSwitchWhich, 0xB); gBattlerControllerFuncs[gActiveBattler] = HandleMoveSwitchting; } } @@ -1458,7 +1458,7 @@ static void MoveSelectionDisplayMoveNames(void) { MoveSelectionDestroyCursorAt(i); StringCopy(gDisplayedStringBattle, gMoveNames[moveInfo->moves[i]]); - BattleHandleAddTextPrinter(gDisplayedStringBattle, i + 3); + BattlePutTextOnWindow(gDisplayedStringBattle, i + 3); if (moveInfo->moves[i] != MOVE_NONE) gNumberOfMovesToChoose++; } @@ -1467,7 +1467,7 @@ static void MoveSelectionDisplayMoveNames(void) static void MoveSelectionDisplayPpString(void) { StringCopy(gDisplayedStringBattle, gText_MoveInterfacePP); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 7); + BattlePutTextOnWindow(gDisplayedStringBattle, 7); } static void MoveSelectionDisplayPpNumber(void) @@ -1485,7 +1485,7 @@ static void MoveSelectionDisplayPpNumber(void) txtPtr++; ConvertIntToDecimalStringN(txtPtr, moveInfo->maxPp[gMoveSelectionCursor[gActiveBattler]], STR_CONV_MODE_RIGHT_ALIGN, 2); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 9); + BattlePutTextOnWindow(gDisplayedStringBattle, 9); } static void MoveSelectionDisplayMoveType(void) @@ -1502,7 +1502,7 @@ static void MoveSelectionDisplayMoveType(void) txtPtr++; StringCopy(txtPtr, gTypeNames[gBattleMoves[moveInfo->moves[gMoveSelectionCursor[gActiveBattler]]].type]); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 10); + BattlePutTextOnWindow(gDisplayedStringBattle, 10); } static void MoveSelectionCreateCursorAt(u8 cursorPosition, u8 arg1) @@ -1573,7 +1573,7 @@ static void PrintLinkStandbyMsg(void) { gBattle_BG0_X = 0; gBattle_BG0_Y = 0; - BattleHandleAddTextPrinter(gText_LinkStandby, 0); + BattlePutTextOnWindow(gText_LinkStandby, 0); } } @@ -2536,7 +2536,7 @@ static void PlayerHandlePrintString(void) gBattle_BG0_Y = 0; stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]); BufferStringBattle(*stringId); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter2; BattleTv_SetDataBasedOnString(*stringId); sub_81A57E4(gActiveBattler, *stringId); @@ -2566,14 +2566,14 @@ static void PlayerHandleChooseAction(void) gBattlerControllerFuncs[gActiveBattler] = HandleChooseActionAfterDma3; BattleTv_ClearExplosionFaintCause(); - BattleHandleAddTextPrinter(gText_BattleMenu, 2); + BattlePutTextOnWindow(gText_BattleMenu, 2); for (i = 0; i < 4; i++) ActionSelectionDestroyCursorAt(i); ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0); BattleStringExpandPlaceholdersToDisplayedString(gText_WhatWillPkmnDo); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 1); + BattlePutTextOnWindow(gDisplayedStringBattle, 1); } static void PlayerHandleUnknownYesNoBox(void) @@ -2581,7 +2581,7 @@ static void PlayerHandleUnknownYesNoBox(void) if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) { HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0); - BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 12); + BattlePutTextOnWindow(gText_BattleYesNoChoice, 12); gMultiUsePlayerCursor = 1; BattleCreateYesNoCursorAt(1); gBattlerControllerFuncs[gActiveBattler] = PlayerHandleUnknownYesNoInput; diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index f18f582f7b..25eef4c5cd 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -1492,7 +1492,7 @@ static void PlayerPartnerHandlePrintString(void) gBattle_BG0_Y = 0; stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]); BufferStringBattle(*stringId); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter2; } diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 4d1ccbaca4..b4bdfaa4ec 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -1404,7 +1404,7 @@ static void RecordedOpponentHandlePrintString(void) gBattle_BG0_Y = 0; stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]); BufferStringBattle(*stringId); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter; } diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index b16c3f3075..24cb58ea49 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -1409,7 +1409,7 @@ static void RecordedPlayerHandlePrintString(void) gBattle_BG0_Y = 0; stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]); BufferStringBattle(*stringId); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter; } diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index 09776f1504..245447d8d0 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -427,7 +427,7 @@ static void SafariHandlePrintString(void) gBattle_BG0_Y = 0; stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]); BufferStringBattle(*stringId); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter; } @@ -454,14 +454,14 @@ static void SafariHandleChooseAction(void) s32 i; gBattlerControllerFuncs[gActiveBattler] = HandleChooseActionAfterDma3; - BattleHandleAddTextPrinter(gText_SafariZoneMenu, 2); + BattlePutTextOnWindow(gText_SafariZoneMenu, 2); for (i = 0; i < 4; i++) ActionSelectionDestroyCursorAt(i); ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0); BattleStringExpandPlaceholdersToDisplayedString(gText_WhatWillPkmnDo2); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 1); + BattlePutTextOnWindow(gDisplayedStringBattle, 1); } static void SafariHandleUnknownYesNoBox(void) diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index ca7b2fd44b..e8efb404f9 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -1179,7 +1179,7 @@ static void WallyHandlePrintString(void) gBattle_BG0_Y = 0; stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]); BufferStringBattle(*stringId); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter; } @@ -1206,14 +1206,14 @@ static void WallyHandleChooseAction(void) s32 i; gBattlerControllerFuncs[gActiveBattler] = HandleChooseActionAfterDma3; - BattleHandleAddTextPrinter(gText_BattleMenu, 2); + BattlePutTextOnWindow(gText_BattleMenu, 2); for (i = 0; i < 4; i++) ActionSelectionDestroyCursorAt(i); ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0); BattleStringExpandPlaceholdersToDisplayedString(gText_WhatWillWallyDo); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 1); + BattlePutTextOnWindow(gDisplayedStringBattle, 1); } static void WallyHandleUnknownYesNoBox(void) diff --git a/src/battle_main.c b/src/battle_main.c index 8649209c0f..2d24d0dabb 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -82,8 +82,8 @@ extern struct MusicPlayerInfo gMPlayInfo_SE2; extern u8 gUnknown_0203CF00[]; extern const u16 gBattleTextboxPalette[]; // battle textbox palette -extern const struct BgTemplate gUnknown_0831AA08[]; -extern const struct WindowTemplate * const gUnknown_0831ABA0[]; +extern const struct BgTemplate gBattleBgTemplates[]; +extern const struct WindowTemplate * const gBattleWindowTemplates[]; extern const u8 gUnknown_0831ACE0[]; extern const u8 * const gBattleScriptsForMoveEffects[]; extern const u8 * const gBattlescriptsForBallThrow[]; @@ -652,7 +652,7 @@ static void CB2_InitBattleInternal(void) LoadBattleTextboxAndBackground(); ResetSpriteData(); ResetTasks(); - LoadBattleEntryBackground(); + DrawBattleEntryBackground(); FreeAllSpritePalettes(); gReservedSpritePaletteCount = 4; SetVBlankCallback(VBlankCB_Battle); @@ -2210,10 +2210,10 @@ void sub_8038D64(void) sub_80356D0(); LoadCompressedPalette(gBattleTextboxPalette, 0, 64); - ApplyPlayerChosenFrameToBattleMenu(); + LoadBattleMenuWindowGfx(); ResetSpriteData(); ResetTasks(); - LoadBattleEntryBackground(); + DrawBattleEntryBackground(); SetGpuReg(REG_OFFSET_WINOUT, 0x37); FreeAllSpritePalettes(); gReservedSpritePaletteCount = 4; @@ -2327,7 +2327,7 @@ static void sub_8038F34(void) if (sub_800A520() == TRUE) { sub_800ADF8(); - BattleHandleAddTextPrinter(gText_LinkStandby3, 0); + BattlePutTextOnWindow(gText_LinkStandby3, 0); gBattleCommunication[MULTIUSE_STATE]++; } break; @@ -2363,25 +2363,25 @@ u32 sub_80391E0(u8 arrayId, u8 caseId) switch (caseId) { case 0: - ret = gUnknown_0831AA08[arrayId].bg; + ret = gBattleBgTemplates[arrayId].bg; break; case 1: - ret = gUnknown_0831AA08[arrayId].charBaseIndex; + ret = gBattleBgTemplates[arrayId].charBaseIndex; break; case 2: - ret = gUnknown_0831AA08[arrayId].mapBaseIndex; + ret = gBattleBgTemplates[arrayId].mapBaseIndex; break; case 3: - ret = gUnknown_0831AA08[arrayId].screenSize; + ret = gBattleBgTemplates[arrayId].screenSize; break; case 4: - ret = gUnknown_0831AA08[arrayId].paletteMode; + ret = gBattleBgTemplates[arrayId].paletteMode; break; case 5: - ret = gUnknown_0831AA08[arrayId].priority; + ret = gBattleBgTemplates[arrayId].priority; break; case 6: - ret = gUnknown_0831AA08[arrayId].baseTile; + ret = gBattleBgTemplates[arrayId].baseTile; break; } @@ -2406,7 +2406,7 @@ static void sub_80392A8(void) gBattle_BG3_Y = 0; sub_80356D0(); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); - ApplyPlayerChosenFrameToBattleMenu(); + LoadBattleMenuWindowGfx(); for (i = 0; i < 2; i++) LoadChosenBattleElement(i); @@ -2453,7 +2453,7 @@ static void sub_803939C(void) case 3: if (!gPaletteFade.active) { - BattleHandleAddTextPrinter(gText_RecordBattleToPass, 0); + BattlePutTextOnWindow(gText_RecordBattleToPass, 0); gBattleCommunication[MULTIUSE_STATE]++; } break; @@ -2461,7 +2461,7 @@ static void sub_803939C(void) if (!IsTextPrinterActive(0)) { HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0); - BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 0xC); + BattlePutTextOnWindow(gText_BattleYesNoChoice, 0xC); gBattleCommunication[CURSOR_POSITION] = 1; BattleCreateYesNoCursorAt(1); gBattleCommunication[MULTIUSE_STATE]++; @@ -2515,7 +2515,7 @@ static void sub_803939C(void) if (gMain.field_439_x4) { sub_800ADF8(); - BattleHandleAddTextPrinter(gText_LinkStandby3, 0); + BattlePutTextOnWindow(gText_LinkStandby3, 0); } gBattleCommunication[MULTIUSE_STATE]++; } @@ -2546,14 +2546,14 @@ static void sub_803939C(void) { PlaySE(SE_SAVE); BattleStringExpandPlaceholdersToDisplayedString(gText_BattleRecordedOnPass); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gBattleCommunication[1] = 0x80; gBattleCommunication[MULTIUSE_STATE]++; } else { BattleStringExpandPlaceholdersToDisplayedString(gText_BattleRecordCouldntBeSaved); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gBattleCommunication[1] = 0x80; gBattleCommunication[MULTIUSE_STATE]++; } @@ -2564,7 +2564,7 @@ static void sub_803939C(void) if (gMain.field_439_x4) { sub_800ADF8(); - BattleHandleAddTextPrinter(gText_LinkStandby3, 0); + BattlePutTextOnWindow(gText_LinkStandby3, 0); } gBattleCommunication[MULTIUSE_STATE]++; } @@ -2610,7 +2610,7 @@ static void TryCorrectShedinjaLanguage(struct Pokemon *mon) u32 sub_80397C4(u32 setId, u32 tableId) { - return gUnknown_0831ABA0[setId][tableId].width * 8; + return gBattleWindowTemplates[setId][tableId].width * 8; } #define sBattler data[0] @@ -3885,7 +3885,7 @@ static void TryDoEventsBeforeFirstTurn(void) TurnValuesCleanUp(FALSE); SpecialStatusesClear(); *(&gBattleStruct->field_91) = gAbsentBattlerFlags; - BattleHandleAddTextPrinter(gText_EmptyString3, 0); + BattlePutTextOnWindow(gText_EmptyString3, 0); gBattleMainFunc = HandleTurnActionSelectionState; ResetSentPokesToOpponentValue(); @@ -3992,7 +3992,7 @@ void BattleTurnPassed(void) *(gBattleStruct->monToSwitchIntoId + i) = 6; *(&gBattleStruct->field_91) = gAbsentBattlerFlags; - BattleHandleAddTextPrinter(gText_EmptyString3, 0); + BattlePutTextOnWindow(gText_EmptyString3, 0); gBattleMainFunc = HandleTurnActionSelectionState; gRandomTurnNumber = Random(); diff --git a/src/battle_message.c b/src/battle_message.c index 1f338db925..896b2197ef 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -17,6 +17,20 @@ #include "recorded_battle.h" #include "international_string_util.h" +struct BattleWindowText +{ + u8 fillValue; + u8 fontId; + u8 x; + u8 y; + u8 letterSpacing; + u8 lineSpacing; + u8 speed; + u8 fgColor; + u8 bgColor; + u8 shadowColor; +}; + extern u8 gBattlerAbilities[MAX_BATTLERS_COUNT]; extern u8 gUnknown_0203C7B4; extern struct StringInfoBattle *gStringInfo; @@ -1351,67 +1365,590 @@ static const u16 sUnknownMoveTable[] = static const u8 sDummyWeirdStatusString[] = {EOS, EOS, EOS, EOS, EOS, EOS, EOS, EOS, 0, 0}; -static const u8 sUnknown_085CD42C[] = +static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = { - 0xFF, 0x1, 0x0, 0x1, 0x0, 0x0, 0x1, 0x1, 0xF, 0x6, 0x0, 0x0, 0xFF, 0x1, - 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0xF, 0x6, 0x0, 0x0, 0xEE, 0x1, 0x0, 0x1, 0x0, - 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x7, 0x0, 0x1, 0x0, 0x0, 0x0, - 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x7, 0x0, 0x1, 0x0, 0x0, 0x0, 0xD, - 0xE, 0xF, 0x0, 0x0, 0xEE, 0x7, 0x0, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, - 0xF, 0x0, 0x0, 0xEE, 0x7, 0x0, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, - 0x0, 0x0, 0xEE, 0x7, 0x0, 0x1, 0x0, 0x0, 0x0, 0xC, 0xE, 0xB, 0x0, 0x0, - 0xEE, 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, - 0x1, 0x2, 0x1, 0x0, 0x0, 0x0, 0xC, 0xE, 0xB, 0x0, 0x0, 0xEE, 0x7, 0x0, - 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x7, 0x0, 0x1, 0x0, - 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, - 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0xD, - 0xE, 0xF, 0x0, 0x0, 0x0, 0x1, 0x20, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x2, - 0x0, 0x0, 0xEE, 0x1, 0xFF, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, - 0x0, 0xEE, 0x1, 0xFF, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, - 0xEE, 0x1, 0xFF, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, - 0x1, 0xFF, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x1, - 0xFF, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x1, 0xFF, - 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0x0, 0x1, 0xFF, 0x1, 0x0, - 0x0, 0x0, 0x1, 0x0, 0x6, 0x0, 0x0, 0x0, 0x1, 0xFF, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, - 0x6, 0x0, 0x0, 0x0, 0x1, 0xFF, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x6, 0x0, 0x0 + { // 0 + .fillValue = 0xFF, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 1, + .fgColor = 1, + .bgColor = 15, + .shadowColor = 6, + }, + { // 1 + .fillValue = 0xFF, + .fontId = 1, + .x = 1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 15, + .shadowColor = 6, + }, + { // 2 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 3 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 4 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 5 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 6 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 7 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 12, + .bgColor = 14, + .shadowColor = 11, + }, + { // 8 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 9 + .fillValue = 0xEE, + .fontId = 1, + .x = 2, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 12, + .bgColor = 14, + .shadowColor = 11, + }, + { // 10 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 11 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 12 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 13 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 14 + .fillValue = 0x0, + .fontId = 1, + .x = 32, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 0, + .shadowColor = 2, + }, + { // 15 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 16 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 17 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 18 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 19 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 20 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 21 + .fillValue = 0x0, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 0, + .shadowColor = 6, + }, + { // 22 + .fillValue = 0x0, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 0, + .shadowColor = 6, + }, + { // 23 + .fillValue = 0x0, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 0, + .shadowColor = 6, + }, }; -static const u8 sUnknown_085CD54C[] = +static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = { - 0xFF, 0x1, 0x0, 0x1, 0x0, 0x0, 0x1, 0x1, 0xF, 0x6, 0x0, 0x0, 0xFF, 0x1, - 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0xF, 0x6, 0x0, 0x0, 0xEE, 0x1, 0x0, 0x1, 0x0, - 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x7, 0x0, 0x1, 0x0, 0x0, 0x0, - 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x7, 0x0, 0x1, 0x0, 0x0, 0x0, 0xD, - 0xE, 0xF, 0x0, 0x0, 0xEE, 0x7, 0x0, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, - 0xF, 0x0, 0x0, 0xEE, 0x7, 0x0, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, - 0x0, 0x0, 0xEE, 0x7, 0x0, 0x1, 0x0, 0x0, 0x0, 0xC, 0xE, 0xB, 0x0, 0x0, - 0xEE, 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, - 0x1, 0x2, 0x1, 0x0, 0x0, 0x0, 0xC, 0xE, 0xB, 0x0, 0x0, 0xEE, 0x7, 0x0, - 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x7, 0x0, 0x1, 0x0, - 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, - 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0xD, - 0xE, 0xF, 0x0, 0x0, 0x0, 0x1, 0x20, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x2, - 0x0, 0x0, 0xEE, 0x1, 0xFF, 0x1, 0x0, 0x0, 0x0, 0x1, 0xE, 0xF, 0x0, - 0x0, 0xEE, 0x1, 0xFF, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, - 0xEE, 0x1, 0xFF, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, - 0x1, 0xFF, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x1, - 0xFF, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x1, 0xFF, - 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x1, 0xFF, 0x1, - 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0x11, 0x1, 0x0, 0x1, 0x0, 0x0, - 0x1, 0x2, 0x1, 0x3, 0x0, 0x0 + { // 0 + .fillValue = 0xFF, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 1, + .fgColor = 1, + .bgColor = 15, + .shadowColor = 6, + }, + { // 1 + .fillValue = 0xFF, + .fontId = 1, + .x = 1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 15, + .shadowColor = 6, + }, + { // 2 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 3 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 4 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 5 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 6 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 7 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 12, + .bgColor = 14, + .shadowColor = 11, + }, + { // 8 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 9 + .fillValue = 0xEE, + .fontId = 1, + .x = 2, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 12, + .bgColor = 14, + .shadowColor = 11, + }, + { // 10 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 11 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 12 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 13 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 14 + .fillValue = 0x0, + .fontId = 1, + .x = 32, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 0, + .shadowColor = 2, + }, + { // 15 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 14, + .shadowColor = 15, + }, + { // 16 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 17 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 18 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 19 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 20 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 21 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 22 + .fillValue = 0x11, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 1, + .fgColor = 2, + .bgColor = 1, + .shadowColor = 3, + }, }; -static const u8 * const gUnknown_085CD660[] = +static const struct BattleWindowText *const sBattleTextOnWindowsInfo[] = { - sUnknown_085CD42C, sUnknown_085CD54C + sTextOnWindowsInfo_Normal, sTextOnWindowsInfo_Arena }; static const u8 sRecordedBattleTextSpeeds[] = {8, 4, 1, 0}; +// code void BufferStringBattle(u16 stringID) { s32 i; - const u8* stringPtr = NULL; + const u8 *stringPtr = NULL; gStringInfo = (struct StringInfoBattle*)(&gBattleBufferA[gActiveBattler][4]); gLastUsedItem = gStringInfo->lastItem; @@ -2395,47 +2932,46 @@ static void sub_814F950(u8* dst) } } -void BattleHandleAddTextPrinter(const u8 *text, u8 arg1) +void BattlePutTextOnWindow(const u8 *text, u8 windowId) { - const u8 *r8 = gUnknown_085CD660[gBattleScripting.field_24]; - bool32 r9; + const struct BattleWindowText *textInfo = sBattleTextOnWindowsInfo[gBattleScripting.windowsType]; + bool32 toVram; struct TextSubPrinter textSubPrinter; u8 speed; - if (arg1 & 0x80) + if (windowId & 0x80) { - arg1 &= ~(0x80); - r9 = FALSE; + windowId &= ~(0x80); + toVram = FALSE; } else { - FillWindowPixelBuffer(arg1, r8[12 * arg1]); - r9 = TRUE; + FillWindowPixelBuffer(windowId, textInfo[windowId].fillValue); + toVram = TRUE; } textSubPrinter.current_text_offset = text; - textSubPrinter.windowId = arg1; - textSubPrinter.fontId = r8[(12 * arg1) + 1]; - textSubPrinter.x = r8[(12 * arg1) + 2]; - textSubPrinter.y = r8[(12 * arg1) + 3]; + textSubPrinter.windowId = windowId; + textSubPrinter.fontId = textInfo[windowId].fontId; + textSubPrinter.x = textInfo[windowId].x; + textSubPrinter.y = textInfo[windowId].y; textSubPrinter.currentX = textSubPrinter.x; textSubPrinter.currentY = textSubPrinter.y; - textSubPrinter.letterSpacing = r8[(12 * arg1) + 4]; - textSubPrinter.lineSpacing = r8[(12 * arg1) + 5]; + textSubPrinter.letterSpacing = textInfo[windowId].letterSpacing; + textSubPrinter.lineSpacing = textInfo[windowId].lineSpacing; textSubPrinter.fontColor_l = 0; - textSubPrinter.fgColor = r8[(12 * arg1) + 7]; - textSubPrinter.bgColor = r8[(12 * arg1) + 8]; - textSubPrinter.shadowColor = r8[(12 * arg1) + 9]; + textSubPrinter.fgColor = textInfo[windowId].fgColor; + textSubPrinter.bgColor = textInfo[windowId].bgColor; + textSubPrinter.shadowColor = textInfo[windowId].shadowColor; if (textSubPrinter.x == 0xFF) { - s32 var2; - u32 var = sub_80397C4(gBattleScripting.field_24, arg1); - var2 = GetStringCenterAlignXOffsetWithLetterSpacing(textSubPrinter.fontId, textSubPrinter.current_text_offset, var, textSubPrinter.letterSpacing); - textSubPrinter.x = textSubPrinter.currentX = var2; + u32 width = sub_80397C4(gBattleScripting.windowsType, windowId); + s32 alignX = GetStringCenterAlignXOffsetWithLetterSpacing(textSubPrinter.fontId, textSubPrinter.current_text_offset, width, textSubPrinter.letterSpacing); + textSubPrinter.x = textSubPrinter.currentX = alignX; } - if (arg1 == 0x16) + if (windowId == 0x16) gTextFlags.flag_1 = 0; else gTextFlags.flag_1 = 1; @@ -2445,7 +2981,7 @@ void BattleHandleAddTextPrinter(const u8 *text, u8 arg1) else gTextFlags.flag_2 = 0; - if (arg1 == 0 || arg1 == 0x16) + if (windowId == 0 || windowId == 0x16) { if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) speed = 1; @@ -2458,16 +2994,16 @@ void BattleHandleAddTextPrinter(const u8 *text, u8 arg1) } else { - speed = r8[(12 * arg1) + 6]; + speed = textInfo[windowId].speed; gTextFlags.flag_0 = 0; } AddTextPrinter(&textSubPrinter, speed, NULL); - if (r9) + if (toVram) { - PutWindowTilemap(arg1); - CopyWindowToVram(arg1, 3); + PutWindowTilemap(windowId); + CopyWindowToVram(windowId, 3); } } diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 811aba1285..c26e5ac114 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -5687,7 +5687,7 @@ static void atk5A_yesnoboxlearnmove(void) { case 0: HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0); - BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 0xC); + BattlePutTextOnWindow(gText_BattleYesNoChoice, 0xC); gBattleScripting.learnMoveState++; gBattleCommunication[CURSOR_POSITION] = 0; BattleCreateYesNoCursorAt(0); @@ -5804,7 +5804,7 @@ static void atk5B_yesnoboxstoplearningmove(void) { case 0: HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0); - BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 0xC); + BattlePutTextOnWindow(gText_BattleYesNoChoice, 0xC); gBattleScripting.learnMoveState++; gBattleCommunication[CURSOR_POSITION] = 0; BattleCreateYesNoCursorAt(0); @@ -6100,7 +6100,7 @@ static void atk67_yesnobox(void) { case 0: HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0); - BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 0xC); + BattlePutTextOnWindow(gText_BattleYesNoChoice, 0xC); gBattleCommunication[0]++; gBattleCommunication[CURSOR_POSITION] = 0; BattleCreateYesNoCursorAt(0); @@ -6720,7 +6720,7 @@ static void atk76_various(void) break; case 16: BattleStringExpandPlaceholdersToDisplayedString(gRefereeStringsTable[gBattlescriptCurrInstr[1]]); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0x16); + BattlePutTextOnWindow(gDisplayedStringBattle, 0x16); break; case 17: if (IsTextPrinterActive(0x16)) @@ -10406,7 +10406,7 @@ static void atkF3_trygivecaughtmonnick(void) { case 0: HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0); - BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 0xC); + BattlePutTextOnWindow(gText_BattleYesNoChoice, 0xC); gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[CURSOR_POSITION] = 0; BattleCreateYesNoCursorAt(0); diff --git a/src/berry_blender.c b/src/berry_blender.c index 2edb147485..55431af72d 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -153,8 +153,8 @@ extern const u8 gText_234Players[]; extern void sub_800A418(void); extern u8 sub_800A9D8(void); -extern void sub_809882C(u8, u16, u8); -extern void copy_textbox_border_tile_patterns_to_vram(u8, u16, u8); +extern void LoadSav2WindowGfx(u8, u16, u8); +extern void LoadMessageBoxGfx(u8, u16, u8); extern void sub_81AABF0(void (*callback)(void)); extern void sub_800B4C0(void); extern void ClearLinkCallback(void); @@ -927,8 +927,8 @@ static void sub_807FAC8(void) InitBgsFromTemplates(1, sBerryBlenderBgTemplates, ARRAY_COUNT(sBerryBlenderBgTemplates)); SetBgTilemapBuffer(1, sBerryBlenderData->tilemapBuffers[0]); SetBgTilemapBuffer(2, sBerryBlenderData->tilemapBuffers[1]); - sub_809882C(0, 1, 0xD0); - copy_textbox_border_tile_patterns_to_vram(0, 0x14, 0xF0); + LoadSav2WindowGfx(0, 1, 0xD0); + LoadMessageBoxGfx(0, 0x14, 0xF0); InitBerryBlenderWindows(); sBerryBlenderData->mainState++; @@ -1331,8 +1331,8 @@ static void sub_8080588(void) SetBgTilemapBuffer(1, sBerryBlenderData->tilemapBuffers[0]); SetBgTilemapBuffer(2, sBerryBlenderData->tilemapBuffers[1]); - sub_809882C(0, 1, 0xD0); - copy_textbox_border_tile_patterns_to_vram(0, 0x14, 0xF0); + LoadSav2WindowGfx(0, 1, 0xD0); + LoadMessageBoxGfx(0, 0x14, 0xF0); InitBerryBlenderWindows(); sBerryBlenderData->field_44 = 0; diff --git a/src/clear_save_data_screen.c b/src/clear_save_data_screen.c index ca2037d2f6..266ea8250f 100644 --- a/src/clear_save_data_screen.c +++ b/src/clear_save_data_screen.c @@ -202,6 +202,6 @@ static void InitClearSaveDataScreenWindows(void) InitWindows(sClearSaveTextWindow); DeactivateAllTextPrinters(); FillWindowPixelBuffer(0, 0); - sub_80987D4(0, 0, 2, 224); + LoadWindowGfx(0, 0, 2, 224); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); } diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 1ed38c67e9..00e6236fe0 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -655,7 +655,7 @@ static void CB2_EggHatch_1(void) case 9: if (!IsTextPrinterActive(sEggHatchData->windowId)) { - sub_809882C(sEggHatchData->windowId, 0x140, 0xE0); + LoadSav2WindowGfx(sEggHatchData->windowId, 0x140, 0xE0); CreateYesNoMenu(&sYesNoWinTemplate, 0x140, 0xE, 0); sEggHatchData->CB2_state++; } diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 74eac32de5..84f00418c6 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -635,7 +635,7 @@ static void Task_EvolutionScene(u8 taskID) if (!gPaletteFade.active) { StringExpandPlaceholders(gStringVar4, gText_PkmnIsEvolving); - BattleHandleAddTextPrinter(gStringVar4, 0); + BattlePutTextOnWindow(gStringVar4, 0); gTasks[taskID].tState++; } break; @@ -731,7 +731,7 @@ static void Task_EvolutionScene(u8 taskID) if (IsCryFinished()) { StringExpandPlaceholders(gStringVar4, gText_CongratsPkmnEvolved); - BattleHandleAddTextPrinter(gStringVar4, 0); + BattlePutTextOnWindow(gStringVar4, 0); PlayBGM(MUS_FANFA5); gTasks[taskID].tState++; SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskID].tPostEvoSpecies)); @@ -818,7 +818,7 @@ static void Task_EvolutionScene(u8 taskID) else // Fire Red leftover probably StringExpandPlaceholders(gStringVar4, gText_PkmnStoppedEvolving); - BattleHandleAddTextPrinter(gStringVar4, 0); + BattlePutTextOnWindow(gStringVar4, 0); gTasks[taskID].tEvoWasStopped = TRUE; gTasks[taskID].tState = 15; } @@ -829,7 +829,7 @@ static void Task_EvolutionScene(u8 taskID) BufferMoveToLearnIntoBattleTextBuff2(); PlayFanfare(MUS_FANFA1); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE - BATTLESTRINGS_ID_ADDER]); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter gTasks[taskID].tState++; } @@ -846,7 +846,7 @@ static void Task_EvolutionScene(u8 taskID) { BufferMoveToLearnIntoBattleTextBuff2(); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE1 - BATTLESTRINGS_ID_ADDER]); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gTasks[taskID].tLearnMoveState++; } break; @@ -854,7 +854,7 @@ static void Task_EvolutionScene(u8 taskID) if (!IsTextPrinterActive(0) && !IsSEPlaying()) { BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE2 - BATTLESTRINGS_ID_ADDER]); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gTasks[taskID].tLearnMoveState++; } break; @@ -862,7 +862,7 @@ static void Task_EvolutionScene(u8 taskID) if (!IsTextPrinterActive(0) && !IsSEPlaying()) { BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE3 - BATTLESTRINGS_ID_ADDER]); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gTasks[taskID].tData7 = 5; gTasks[taskID].tData8 = 10; gTasks[taskID].tLearnMoveState++; @@ -871,7 +871,7 @@ static void Task_EvolutionScene(u8 taskID) if (!IsTextPrinterActive(0) && !IsSEPlaying()) { HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0); - BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 0xC); + BattlePutTextOnWindow(gText_BattleYesNoChoice, 0xC); gTasks[taskID].tLearnMoveState++; sEvoCursorPos = 0; BattleCreateYesNoCursorAt(0); @@ -939,7 +939,7 @@ static void Task_EvolutionScene(u8 taskID) if (IsHMMove2(move)) { BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_HMMOVESCANTBEFORGOTTEN - BATTLESTRINGS_ID_ADDER]); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gTasks[taskID].tLearnMoveState = 12; } else @@ -955,14 +955,14 @@ static void Task_EvolutionScene(u8 taskID) break; case 7: BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_123POOF - BATTLESTRINGS_ID_ADDER]); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gTasks[taskID].tLearnMoveState++; break; case 8: if (!IsTextPrinterActive(0) && !IsSEPlaying()) { BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNFORGOTMOVE - BATTLESTRINGS_ID_ADDER]); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gTasks[taskID].tLearnMoveState++; } break; @@ -970,20 +970,20 @@ static void Task_EvolutionScene(u8 taskID) if (!IsTextPrinterActive(0) && !IsSEPlaying()) { BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_ANDELLIPSIS - BATTLESTRINGS_ID_ADDER]); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gTasks[taskID].tState = 20; } break; case 10: BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_STOPLEARNINGMOVE - BATTLESTRINGS_ID_ADDER]); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gTasks[taskID].tData7 = 11; gTasks[taskID].tData8 = 0; gTasks[taskID].tLearnMoveState = 3; break; case 11: BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_DIDNOTLEARNMOVE - BATTLESTRINGS_ID_ADDER]); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gTasks[taskID].tState = 15; break; case 12: @@ -1215,7 +1215,7 @@ static void Task_TradeEvolutionScene(u8 taskID) case 3: if (!IsTextPrinterActive(0) && !IsSEPlaying()) { - sub_809882C(0, 0xA8, 0xE0); + LoadSav2WindowGfx(0, 0xA8, 0xE0); CreateYesNoMenu(&gUnknown_0833900C, 0xA8, 0xE, 0); sEvoCursorPos = 0; gTasks[taskID].tLearnMoveState++; diff --git a/src/field_region_map.c b/src/field_region_map.c index b7d677c903..1edf1ab51b 100644 --- a/src/field_region_map.c +++ b/src/field_region_map.c @@ -89,7 +89,7 @@ static void MCB2_InitRegionMapRegisters(void) InitBgsFromTemplates(1, gUnknown_085E5068, 2); InitWindows(gUnknown_085E5070); DeactivateAllTextPrinters(); - sub_809882C(0, 0x27, 0xd0); + LoadSav2WindowGfx(0, 0x27, 0xd0); clear_scheduled_bg_copies_to_vram(); SetMainCallback2(MCB2_FieldUpdateRegionMap); SetVBlankCallback(VBCB_FieldUpdateRegionMap); diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 83df30d05e..b0388e9712 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -89,7 +89,7 @@ extern void sub_8197434(u8, u8); extern u16 sub_818D97C(u8 playerGender, u8); extern u16 sub_818D8AC(u16, u8, s16, s16, u8, u16); extern const void* stdpal_get(u8); -extern void sub_80987D4(u8, u8, u16, u8); +extern void LoadWindowGfx(u8, u8, u16, u8); extern u16 sub_818D820(u16); extern u16 sub_818D8F0(u16); extern u16 sub_818D7D8(u16 species, u32 trainerId, u32 personality, u8 arg3, s16 sp0, s16 sp1, u8 sp2, u16 sp3); @@ -725,7 +725,7 @@ static void sub_8173EE4(u8 taskId) ShowBg(3); gTasks[taskId].tPlayerSpriteID = sub_818D8AC(sub_818D97C(gSaveBlock2Ptr->playerGender, 1), 1, 120, 72, 6, 0xFFFF); AddWindow(&sHof_WindowTemplate); - sub_80987D4(1, gSaveBlock2Ptr->optionsWindowFrameType, 0x21D, 0xD0); + LoadWindowGfx(1, gSaveBlock2Ptr->optionsWindowFrameType, 0x21D, 0xD0); LoadPalette(stdpal_get(1), 0xE0, 0x20); gTasks[taskId].tFrameCount = 120; gTasks[taskId].func = Task_Hof_WaitAndPrintPlayerInfo; diff --git a/src/item_menu.c b/src/item_menu.c index 0642c771e7..5a0929a7cc 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -2103,8 +2103,8 @@ void setup_bag_menu_textboxes(void) InitWindows(gUnknown_08614174); DeactivateAllTextPrinters(); - sub_809882C(0, 1, -32); - copy_textbox_border_tile_patterns_to_vram(0, 10, -48); + LoadSav2WindowGfx(0, 1, -32); + LoadMessageBoxGfx(0, 10, -48); sub_819A2BC(-64, 1); LoadPalette(&gUnknown_0860F074, 0xF0, 0x20); for (i = 0; i < 3; i++) diff --git a/src/list_menu.c b/src/list_menu.c index de7de82690..d4a8976a59 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -337,7 +337,7 @@ s32 DoMysteryGiftListMenu(struct WindowTemplate *windowTemplate, struct ListMenu switch (arg2) { case 2: - sub_809882C(gUnknown_0203CE84.field_5, tileNum, palNum); + LoadSav2WindowGfx(gUnknown_0203CE84.field_5, tileNum, palNum); case 1: sub_8098858(gUnknown_0203CE84.field_5, tileNum, palNum / 16); break; diff --git a/src/main_menu.c b/src/main_menu.c index 3490424aff..0f703a0143 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -1038,7 +1038,7 @@ void task_new_game_prof_birch_speech_3(u8 taskId) { InitWindows(gUnknown_082FF080); LoadMainMenuWindowFrameTiles(0, 0xF3); - copy_textbox_border_tile_patterns_to_vram(0, 0xFC, 0xF0); + LoadMessageBoxGfx(0, 0xFC, 0xF0); unknown_rbox_to_vram(0, 1); PutWindowTilemap(0); CopyWindowToVram(0, 2); @@ -1565,7 +1565,7 @@ void new_game_prof_birch_speech_part2_start(void) SetMainCallback2(CB2_MainMenu); InitWindows(gUnknown_082FF080); LoadMainMenuWindowFrameTiles(0, 0xF3); - copy_textbox_border_tile_patterns_to_vram(0, 0xFC, 0xF0); + LoadMessageBoxGfx(0, 0xFC, 0xF0); PutWindowTilemap(0); CopyWindowToVram(0, 3); } diff --git a/src/menu.c b/src/menu.c index dedfcc3be0..79c70e6190 100644 --- a/src/menu.c +++ b/src/menu.c @@ -193,8 +193,8 @@ void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonP void sub_81973A4(void) { - copy_textbox_border_tile_patterns_to_vram(0, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM * 0x10); - sub_809882C(0, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM * 0x10); + LoadMessageBoxGfx(0, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM * 0x10); + LoadSav2WindowGfx(0, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM * 0x10); } void NewMenuHelpers_DrawDialogueFrame(u8 windowId, bool8 copyToVram) @@ -412,7 +412,7 @@ void SetStandardWindowBorderStyle(u8 windowId, bool8 copyToVram) void sub_819786C(u8 windowId, bool8 copyToVram) { - copy_textbox_border_tile_patterns_to_vram(windowId, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM * 0x10); + LoadMessageBoxGfx(windowId, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM * 0x10); sub_8197B1C(windowId, copyToVram, DLG_WINDOW_BASE_TILE_NUM, 0xF); } diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c index 8a7671c5b7..c7247b696a 100644 --- a/src/mystery_event_menu.c +++ b/src/mystery_event_menu.c @@ -77,7 +77,7 @@ void CB2_InitMysteryEventMenu(void) FillWindowPixelBuffer(i, 0); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x1E, 0x14); - sub_809882C(0, 1u, 0xD0u); + LoadSav2WindowGfx(0, 1u, 0xD0u); sub_81978B0(0xE0); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON); SetGpuReg(REG_OFFSET_BLDCNT, 0); diff --git a/src/pokeblock.c b/src/pokeblock.c index 216c9e2c50..518acd792a 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -75,8 +75,8 @@ extern const u16 gUnknown_0860F074[]; extern void CB2_ReturnToField(void); extern bool8 sub_81221EC(void); -extern void sub_809882C(u8, u16, u8); -extern void copy_textbox_border_tile_patterns_to_vram(u8, u16, u8); +extern void LoadSav2WindowGfx(u8, u16, u8); +extern void LoadMessageBoxGfx(u8, u16, u8); extern void sub_80AF168(void); // this file's functions @@ -566,8 +566,8 @@ static void HandleInitWindows(void) InitWindows(sWindowTemplatesForPokeblockMenu); DeactivateAllTextPrinters(); - sub_809882C(0, 1, 0xE0); - copy_textbox_border_tile_patterns_to_vram(0, 0xA, 0xD0); + LoadSav2WindowGfx(0, 1, 0xE0); + LoadMessageBoxGfx(0, 0xA, 0xD0); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); for (i = 0; i < ARRAY_COUNT(sWindowTemplatesForPokeblockMenu) - 1; i++) diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index db92d56a85..d3fdbd3555 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -59,7 +59,7 @@ extern const u16 gUnknown_0860F074[]; extern bool8 sub_81221EC(void); extern void sub_806A068(u16, u8); -extern void sub_809882C(u8, u16, u8); +extern void LoadSav2WindowGfx(u8, u16, u8); // this file's functions static void HandleInitBackgrounds(void); @@ -706,7 +706,7 @@ static void HandleInitWindows(void) { InitWindows(sWindowTemplates); DeactivateAllTextPrinters(); - sub_809882C(0, 1, 0xE0); + LoadSav2WindowGfx(0, 1, 0xE0); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); FillWindowPixelBuffer(0, 0); PutWindowTilemap(0); diff --git a/src/region_map.c b/src/region_map.c index f16787fc93..0a6c08234a 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -1603,7 +1603,7 @@ void MCB2_FlyMap(void) gMain.state++; break; case 3: - sub_809882C(0, 0x65, 0xd0); + LoadSav2WindowGfx(0, 0x65, 0xd0); clear_scheduled_bg_copies_to_vram(); gMain.state++; break; diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c index 45f0f5a9ea..4456e450c8 100644 --- a/src/reshow_battle_screen.c +++ b/src/reshow_battle_screen.c @@ -58,7 +58,7 @@ static void CB2_ReshowBattleScreenAfterMenu(void) { case 0: ScanlineEffect_Clear(); - sub_8035658(); + BattleInitBgsAndWindows(); SetBgAttribute(1, BG_CTRL_ATTR_VISIBLE, 0); SetBgAttribute(2, BG_CTRL_ATTR_VISIBLE, 0); ShowBg(0); diff --git a/src/scrcmd.c b/src/scrcmd.c index 4e3fceb10b..a09e911f08 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1517,7 +1517,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) winTemplate = sub_8198A50(0, xWindow, yWindow + 1, width, height, 0xF, 0x1); gUnknown_03000F30 = AddWindow(&winTemplate); - sub_809882C(gUnknown_03000F30, 0x214, 0xE0); + LoadSav2WindowGfx(gUnknown_03000F30, 0x214, 0xE0); NewMenuHelpers_DrawStdWindowFrame(gUnknown_03000F30, 0); PutWindowTilemap(gUnknown_03000F30); FillWindowPixelBuffer(gUnknown_03000F30, 0x11); diff --git a/src/start_menu.c b/src/start_menu.c index 7080ae6a83..43b4f85f25 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -1212,7 +1212,7 @@ static bool32 sub_80A03E4(u8 *par1) ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, sUnknown_085105A8, ARRAY_COUNT(sUnknown_085105A8)); InitWindows(sUnknown_085105AC); - box_border_load_tiles_and_pal(0, 8, 224); + LoadSav2WindowGfx_(0, 8, 224); sub_81978B0(240); break; case 3: diff --git a/src/starter_choose.c b/src/starter_choose.c index 480edbcb74..b2160a5a6c 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -46,7 +46,7 @@ extern const u8 gStarterChoose_LabelCoords[][2]; extern const u8 gUnknown_085B1E0C[]; extern const u8 gUnknown_085B1E28[][2]; -extern void sub_809882C(u8, u16, u8); +extern void LoadSav2WindowGfx(u8, u16, u8); extern void ScanlineEffect_Stop(void); extern void clear_scheduled_bg_copies_to_vram(void); extern void dp13_810BB8C(void); @@ -126,7 +126,7 @@ void CB2_ChooseStarter(void) InitWindows(gUnknown_085B1DCC); DeactivateAllTextPrinters(); - sub_809882C(0, 0x2A8, 0xD0); + LoadSav2WindowGfx(0, 0x2A8, 0xD0); clear_scheduled_bg_copies_to_vram(); ScanlineEffect_Stop(); ResetTasks(); diff --git a/src/text_window.c b/src/text_window.c index c3b9f7197f..35afc20043 100644 --- a/src/text_window.c +++ b/src/text_window.c @@ -91,26 +91,26 @@ const struct TilesPal *GetWindowFrameTilesPal(u8 id) return &sWindowFrames[id]; } -void copy_textbox_border_tile_patterns_to_vram(u8 windowId, u16 destOffset, u8 palOffset) +void LoadMessageBoxGfx(u8 windowId, u16 destOffset, u8 palOffset) { LoadBgTiles(GetWindowAttribute(windowId, WINDOW_PRIORITY), gMessageBox_Gfx, 0x1C0, destOffset); LoadPalette(GetOverworldTextboxPalettePtr(), palOffset, 0x20); } -void box_border_load_tiles_and_pal(u8 windowId, u16 destOffset, u8 palOffset) +void LoadSav2WindowGfx_(u8 windowId, u16 destOffset, u8 palOffset) { - sub_809882C(windowId, destOffset, palOffset); + LoadSav2WindowGfx(windowId, destOffset, palOffset); } -void sub_80987D4(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset) +void LoadWindowGfx(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset) { LoadBgTiles(GetWindowAttribute(windowId, WINDOW_PRIORITY), sWindowFrames[frameId].tiles, 0x120, destOffset); LoadPalette(sWindowFrames[frameId].pal, palOffset, 0x20); } -void sub_809882C(u8 windowId, u16 destOffset, u8 palOffset) +void LoadSav2WindowGfx(u8 windowId, u16 destOffset, u8 palOffset) { - sub_80987D4(windowId, gSaveBlock2Ptr->optionsWindowFrameType, destOffset, palOffset); + LoadWindowGfx(windowId, gSaveBlock2Ptr->optionsWindowFrameType, destOffset, palOffset); } void sub_8098858(u8 windowId, u16 tileNum, u8 palNum) diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index c8898d08f4..1fb4c411ff 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -164,7 +164,7 @@ void sub_8166380(void) InitBgsFromTemplates(0, gUnknown_085DFCCC, ARRAY_COUNT(gUnknown_085DFCCC)); InitWindows(gUnknown_085DFCDC); DeactivateAllTextPrinters(); - sub_809882C(0, 0x97, 0xE0); + LoadSav2WindowGfx(0, 0x97, 0xE0); gUnknown_0203BC90->field_50++; break; case 4: diff --git a/src/wallclock.c b/src/wallclock.c index f15bbbc274..80383c26da 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -576,7 +576,7 @@ static void LoadWallClockGraphics(void) InitBgsFromTemplates(0, gUnknown_085B21FC, 3); InitWindows(gUnknown_085B21DC); DeactivateAllTextPrinters(); - sub_809882C(0, 0x250, 0xd0); + LoadSav2WindowGfx(0, 0x250, 0xd0); clear_scheduled_bg_copies_to_vram(); ScanlineEffect_Stop(); ResetTasks(); From 94752d420769dfc205b3f717c660f33a6eb2b6fb Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 19 Jun 2018 00:43:15 +0200 Subject: [PATCH 24/55] document battle bars --- include/battle.h | 4 +- include/battle_gfx_sfx_util.h | 4 +- include/battle_interface.h | 8 +- src/battle_controller_link_opponent.c | 2 +- src/battle_controller_link_partner.c | 2 +- src/battle_controller_opponent.c | 2 +- src/battle_controller_player.c | 4 +- src/battle_controller_player_partner.c | 4 +- src/battle_controller_recorded_opponent.c | 2 +- src/battle_controller_recorded_player.c | 2 +- src/battle_controller_wally.c | 2 +- src/battle_controllers.c | 2 +- src/battle_gfx_sfx_util.c | 130 ++-- src/battle_interface.c | 740 +++++++++++----------- src/pokeball.c | 6 +- 15 files changed, 468 insertions(+), 446 deletions(-) diff --git a/include/battle.h b/include/battle.h index bf875ad9de..62caa2cfe1 100644 --- a/include/battle.h +++ b/include/battle.h @@ -692,9 +692,9 @@ struct BattleBarInfo { u8 healthboxSpriteId; s32 maxValue; - s32 currentValue; + s32 oldValue; s32 receivedValue; - s32 field_10; + s32 currValue; }; struct BattleSpriteData diff --git a/include/battle_gfx_sfx_util.h b/include/battle_gfx_sfx_util.h index e1c6325b6b..16253e760e 100644 --- a/include/battle_gfx_sfx_util.h +++ b/include/battle_gfx_sfx_util.h @@ -35,7 +35,7 @@ void ClearBehindSubstituteBit(u8 battlerId); void HandleLowHpMusicChange(struct Pokemon *mon, u8 battlerId); void BattleStopLowHpSound(void); u8 GetMonHPBarLevel(struct Pokemon *mon); -void sub_805EAE8(void); +void HandleBattleLowHpMusicChange(void); void sub_805EB9C(u8 affineMode); void LoadAndCreateEnemyShadowSprites(void); void SpriteCB_SetInvisible(struct Sprite *sprite); @@ -45,6 +45,6 @@ void sub_805EF14(void); void ClearTemporarySpeciesSpriteData(u8 battlerId, bool8 dontClearSubstitute); void AllocateMonSpritesGfx(void); void FreeMonSpritesGfx(void); -bool32 ShouldPlayNormalPokeCry(struct Pokemon *mon); +bool32 ShouldPlayNormalMonCry(struct Pokemon *mon); #endif // GUARD_BATTLE_GFX_SFX_UTIL diff --git a/include/battle_interface.h b/include/battle_interface.h index fe8c03f70a..b917d2cb35 100644 --- a/include/battle_interface.h +++ b/include/battle_interface.h @@ -29,12 +29,18 @@ enum #define TAG_HEALTHBOX_OPPONENT1_TILE 0xD701 #define TAG_HEALTHBOX_OPPONENT2_TILE 0xD702 +#define TAG_HEALTHBAR_PLAYER1_TILE 0xD704 +#define TAG_HEALTHBAR_OPPONENT1_TILE 0xD705 +#define TAG_HEALTHBAR_PLAYER2_TILE 0xD706 +#define TAG_HEALTHBAR_OPPONENT2_TILE 0xD707 + #define TAG_HEALTHBOX_SAFARI_TILE 0xD70B #define TAG_STATUS_SUMMARY_BAR_TILE 0xD70C #define TAG_STATUS_SUMMARY_BALLS_TILE 0xD714 #define TAG_HEALTHBOX_PAL 0xD6FF +#define TAG_HEALTHBAR_PAL 0xD704 #define TAG_STATUS_SUMMARY_BAR_PAL 0xD710 #define TAG_STATUS_SUMMARY_BALLS_PAL 0xD712 @@ -68,7 +74,7 @@ void SwapHpBarsWithHpText(void); u8 CreatePartyStatusSummarySprites(u8 bank, struct HpAndStatus *partyInfo, u8 arg2, bool8 isBattleStart); void sub_8073C30(u8 taskId); void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elementId); -s32 sub_8074AA0(u8 bank, u8 healthboxSpriteId, u8 whichBar, u8 arg3); +s32 MoveBattleBar(u8 bank, u8 healthboxSpriteId, u8 whichBar, u8 arg3); u8 GetScaledHPFraction(s16 hp, s16 maxhp, u8 scale); u8 GetHPBarLevel(s16 hp, s16 maxhp); diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 905e957ea7..b2c05664bc 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -395,7 +395,7 @@ static void sub_8064B04(void) static void CompleteOnHealthbarDone(void) { - s16 hpValue = sub_8074AA0(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); + s16 hpValue = MoveBattleBar(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 3178bad0e3..f7abe589ac 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -279,7 +279,7 @@ static void sub_814B290(void) static void CompleteOnHealthbarDone(void) { - s16 hpValue = sub_8074AA0(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); + s16 hpValue = MoveBattleBar(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index ae407af244..21b45dabf3 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -391,7 +391,7 @@ static void sub_805F994(void) static void CompleteOnHealthbarDone(void) { - s16 hpValue = sub_8074AA0(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); + s16 hpValue = MoveBattleBar(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); if (hpValue != -1) { diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 627b13e229..599ebfee42 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -1120,7 +1120,7 @@ void c3_0802FDF4(u8 taskId) static void CompleteOnHealthbarDone(void) { - s16 hpValue = sub_8074AA0(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); + s16 hpValue = MoveBattleBar(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); @@ -1224,7 +1224,7 @@ static void sub_8059400(u8 taskId) u8 battlerId = gTasks[taskId].tExpTask_bank; s16 r4; - r4 = sub_8074AA0(battlerId, gHealthboxSpriteIds[battlerId], EXP_BAR, 0); + r4 = MoveBattleBar(battlerId, gHealthboxSpriteIds[battlerId], EXP_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battlerId]); if (r4 == -1) { diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index 25eef4c5cd..df075522e0 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -294,7 +294,7 @@ static void sub_81BB1D4(void) static void CompleteOnHealthbarDone(void) { - s16 hpValue = sub_8074AA0(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); + s16 hpValue = MoveBattleBar(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); @@ -399,7 +399,7 @@ static void sub_81BB4E4(u8 taskId) u8 battlerId = gTasks[taskId].tExpTask_bank; s16 r4; - r4 = sub_8074AA0(battlerId, gHealthboxSpriteIds[battlerId], EXP_BAR, 0); + r4 = MoveBattleBar(battlerId, gHealthboxSpriteIds[battlerId], EXP_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battlerId]); if (r4 == -1) { diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index b4bdfaa4ec..69f93d7e28 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -377,7 +377,7 @@ static void sub_8186C48(void) static void CompleteOnHealthbarDone(void) { - s16 hpValue = sub_8074AA0(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); + s16 hpValue = MoveBattleBar(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index 24cb58ea49..54ca4578b9 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -363,7 +363,7 @@ static void sub_818A064(void) static void CompleteOnHealthbarDone(void) { - s16 hpValue = sub_8074AA0(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); + s16 hpValue = MoveBattleBar(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index e8efb404f9..955799ee34 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -349,7 +349,7 @@ static void sub_8168818(void) static void CompleteOnHealthbarDone(void) { - s16 hpValue = sub_8074AA0(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); + s16 hpValue = MoveBattleBar(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 2b918d0180..8a7ff7b5d9 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -587,7 +587,7 @@ static void SetBattlePartyIds(void) { for (i = 0; i < gBattlersCount; i++) { - for (j = 0; j < 6; j++) + for (j = 0; j < PARTY_SIZE; j++) { if (i < 2) { diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index d2c2425536..47af1b9ddf 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -67,7 +67,7 @@ static void sub_805D7EC(struct Sprite *sprite); static bool8 ShouldAnimBeDoneRegardlessOfSubsitute(u8 animId); static void Task_ClearBitWhenBattleTableAnimDone(u8 taskId); static void Task_ClearBitWhenSpecialAnimDone(u8 taskId); -static void ClearSpritesBankHealthboxAnimData(void); +static void ClearSpritesBattlerHealthboxAnimData(void); // const rom data static const struct CompressedSpriteSheet gUnknown_0832C0D0 = @@ -411,35 +411,35 @@ void InitAndLaunchChosenStatusAnimation(bool8 isStatus2, u32 status) #define tBattlerId data[0] -bool8 TryHandleLaunchBattleTableAnimation(u8 activeBank, u8 atkBank, u8 defBank, u8 tableId, u16 argument) +bool8 TryHandleLaunchBattleTableAnimation(u8 activeBattler, u8 atkBattler, u8 defBattler, u8 tableId, u16 argument) { u8 taskId; if (tableId == B_ANIM_CASTFORM_CHANGE && (argument & 0x80)) { - gBattleMonForms[activeBank] = (argument & ~(0x80)); + gBattleMonForms[activeBattler] = (argument & ~(0x80)); return TRUE; } - if (gBattleSpritesDataPtr->battlerData[activeBank].behindSubstitute + if (gBattleSpritesDataPtr->battlerData[activeBattler].behindSubstitute && !ShouldAnimBeDoneRegardlessOfSubsitute(tableId)) { return TRUE; } - if (gBattleSpritesDataPtr->battlerData[activeBank].behindSubstitute + if (gBattleSpritesDataPtr->battlerData[activeBattler].behindSubstitute && tableId == B_ANIM_SUBSTITUTE_FADE - && gSprites[gBattlerSpriteIds[activeBank]].invisible) + && gSprites[gBattlerSpriteIds[activeBattler]].invisible) { - LoadBattleMonGfxAndAnimate(activeBank, TRUE, gBattlerSpriteIds[activeBank]); - ClearBehindSubstituteBit(activeBank); + LoadBattleMonGfxAndAnimate(activeBattler, TRUE, gBattlerSpriteIds[activeBattler]); + ClearBehindSubstituteBit(activeBattler); return TRUE; } - gBattleAnimAttacker = atkBank; - gBattleAnimTarget = defBank; + gBattleAnimAttacker = atkBattler; + gBattleAnimTarget = defBattler; gBattleSpritesDataPtr->animationData->animArg = argument; LaunchBattleAnimation(gBattleAnims_VariousTable, tableId, FALSE); taskId = CreateTask(Task_ClearBitWhenBattleTableAnimDone, 10); - gTasks[taskId].tBattlerId = activeBank; + gTasks[taskId].tBattlerId = activeBattler; gBattleSpritesDataPtr->healthBoxesData[gTasks[taskId].tBattlerId].animFromTableActive = 1; return FALSE; @@ -475,15 +475,15 @@ static bool8 ShouldAnimBeDoneRegardlessOfSubsitute(u8 animId) #define tBattlerId data[0] -void InitAndLaunchSpecialAnimation(u8 activeBank, u8 atkBank, u8 defBank, u8 tableId) +void InitAndLaunchSpecialAnimation(u8 activeBattler, u8 atkBattler, u8 defBattler, u8 tableId) { u8 taskId; - gBattleAnimAttacker = atkBank; - gBattleAnimTarget = defBank; + gBattleAnimAttacker = atkBattler; + gBattleAnimTarget = defBattler; LaunchBattleAnimation(gBattleAnims_Special, tableId, FALSE); taskId = CreateTask(Task_ClearBitWhenSpecialAnimDone, 10); - gTasks[taskId].tBattlerId = activeBank; + gTasks[taskId].tBattlerId = activeBattler; gBattleSpritesDataPtr->healthBoxesData[gTasks[taskId].tBattlerId].specialAnimActive = 1; } @@ -681,7 +681,7 @@ void FreeTrainerFrontPicPalette(u16 frontPicId) void sub_805DFFC(void) { - u8 numberOfBanks = 0; + u8 numberOfBattlers = 0; u8 i; LoadSpritePalette(&gUnknown_0832C128[0]); @@ -690,7 +690,7 @@ void sub_805DFFC(void) { LoadCompressedObjectPic(&gUnknown_0832C0D0); LoadCompressedObjectPic(&gUnknown_0832C0D8); - numberOfBanks = 2; + numberOfBattlers = 2; } else { @@ -698,9 +698,9 @@ void sub_805DFFC(void) LoadCompressedObjectPic(&gUnknown_0832C0E0[1]); LoadCompressedObjectPic(&gUnknown_0832C0F0[0]); LoadCompressedObjectPic(&gUnknown_0832C0F0[1]); - numberOfBanks = 4; + numberOfBattlers = 4; } - for (i = 0; i < numberOfBanks; i++) + for (i = 0; i < numberOfBattlers; i++) LoadCompressedObjectPic(&gUnknown_0832C108[gBattlerPositions[i]]); } @@ -771,7 +771,7 @@ bool8 BattleInitAllSprites(u8 *state1, u8 *battlerId) switch (*state1) { case 0: - ClearSpritesBankHealthboxAnimData(); + ClearSpritesBattlerHealthboxAnimData(); (*state1)++; break; case 1: @@ -849,7 +849,7 @@ void ClearSpritesHealthboxAnimData(void) memset(gBattleSpritesDataPtr->animationData, 0, sizeof(struct BattleAnimationInfo)); } -static void ClearSpritesBankHealthboxAnimData(void) +static void ClearSpritesBattlerHealthboxAnimData(void) { ClearSpritesHealthboxAnimData(); memset(gBattleSpritesDataPtr->battlerData, 0, sizeof(struct BattleSpriteInfo) * MAX_BATTLERS_COUNT); @@ -868,7 +868,7 @@ void CopyBattleSpriteInvisibility(u8 battlerId) gBattleSpritesDataPtr->battlerData[battlerId].invisible = gSprites[gBattlerSpriteIds[battlerId]].invisible; } -void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform) +void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, bool8 notTransform) { u16 paletteOffset; u32 personalityValue; @@ -878,16 +878,16 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform) if (notTransform) { - StartSpriteAnim(&gSprites[gBattlerSpriteIds[bankAtk]], gBattleSpritesDataPtr->animationData->animArg); - paletteOffset = 0x100 + bankAtk * 16; + StartSpriteAnim(&gSprites[gBattlerSpriteIds[battlerAtk]], gBattleSpritesDataPtr->animationData->animArg); + paletteOffset = 0x100 + battlerAtk * 16; LoadPalette(gBattleStruct->castformPalette[gBattleSpritesDataPtr->animationData->animArg], paletteOffset, 32); - gBattleMonForms[bankAtk] = gBattleSpritesDataPtr->animationData->animArg; - if (gBattleSpritesDataPtr->battlerData[bankAtk].transformSpecies != SPECIES_NONE) + gBattleMonForms[battlerAtk] = gBattleSpritesDataPtr->animationData->animArg; + if (gBattleSpritesDataPtr->battlerData[battlerAtk].transformSpecies != SPECIES_NONE) { BlendPalette(paletteOffset, 16, 6, RGB_WHITE); CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32); } - gSprites[gBattlerSpriteIds[bankAtk]].pos1.y = GetBattlerSpriteDefault_Y(bankAtk); + gSprites[gBattlerSpriteIds[battlerAtk]].pos1.y = GetBattlerSpriteDefault_Y(battlerAtk); } else { @@ -909,48 +909,48 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform) } else { - position = GetBattlerPosition(bankAtk); + position = GetBattlerPosition(battlerAtk); - if (GetBattlerSide(bankDef) == B_SIDE_OPPONENT) - targetSpecies = GetMonData(&gEnemyParty[gBattlerPartyIndexes[bankDef]], MON_DATA_SPECIES); + if (GetBattlerSide(battlerDef) == B_SIDE_OPPONENT) + targetSpecies = GetMonData(&gEnemyParty[gBattlerPartyIndexes[battlerDef]], MON_DATA_SPECIES); else - targetSpecies = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bankDef]], MON_DATA_SPECIES); + targetSpecies = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerDef]], MON_DATA_SPECIES); - if (GetBattlerSide(bankAtk) == B_SIDE_PLAYER) + if (GetBattlerSide(battlerAtk) == B_SIDE_PLAYER) { - personalityValue = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bankAtk]], MON_DATA_PERSONALITY); - otId = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bankAtk]], MON_DATA_OT_ID); + personalityValue = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerAtk]], MON_DATA_PERSONALITY); + otId = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerAtk]], MON_DATA_OT_ID); HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonBackPicTable[targetSpecies], gMonSpritesGfxPtr->sprites[position], targetSpecies, - gTransformedPersonalities[bankAtk]); + gTransformedPersonalities[battlerAtk]); } else { - personalityValue = GetMonData(&gEnemyParty[gBattlerPartyIndexes[bankAtk]], MON_DATA_PERSONALITY); - otId = GetMonData(&gEnemyParty[gBattlerPartyIndexes[bankAtk]], MON_DATA_OT_ID); + personalityValue = GetMonData(&gEnemyParty[gBattlerPartyIndexes[battlerAtk]], MON_DATA_PERSONALITY); + otId = GetMonData(&gEnemyParty[gBattlerPartyIndexes[battlerAtk]], MON_DATA_OT_ID); HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[targetSpecies], gMonSpritesGfxPtr->sprites[position], targetSpecies, - gTransformedPersonalities[bankAtk]); + gTransformedPersonalities[battlerAtk]); } } src = gMonSpritesGfxPtr->sprites[position]; - dst = (void *)(VRAM + 0x10000 + gSprites[gBattlerSpriteIds[bankAtk]].oam.tileNum * 32); + dst = (void *)(VRAM + 0x10000 + gSprites[gBattlerSpriteIds[battlerAtk]].oam.tileNum * 32); DmaCopy32(3, src, dst, 0x800); - paletteOffset = 0x100 + bankAtk * 16; + paletteOffset = 0x100 + battlerAtk * 16; lzPaletteData = GetFrontSpritePalFromSpeciesAndPersonality(targetSpecies, otId, personalityValue); LZDecompressWram(lzPaletteData, gDecompressionBuffer); LoadPalette(gDecompressionBuffer, paletteOffset, 32); if (targetSpecies == SPECIES_CASTFORM) { - gSprites[gBattlerSpriteIds[bankAtk]].anims = gMonAnimationsSpriteAnimsPtrTable[targetSpecies]; + gSprites[gBattlerSpriteIds[battlerAtk]].anims = gMonAnimationsSpriteAnimsPtrTable[targetSpecies]; LZDecompressWram(lzPaletteData, gBattleStruct->castformPalette[0]); - LoadPalette(gBattleStruct->castformPalette[0] + gBattleMonForms[bankDef] * 16, paletteOffset, 32); + LoadPalette(gBattleStruct->castformPalette[0] + gBattleMonForms[battlerDef] * 16, paletteOffset, 32); } BlendPalette(paletteOffset, 16, 6, RGB_WHITE); @@ -958,12 +958,12 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform) if (!IsContest()) { - gBattleSpritesDataPtr->battlerData[bankAtk].transformSpecies = targetSpecies; - gBattleMonForms[bankAtk] = gBattleMonForms[bankDef]; + gBattleSpritesDataPtr->battlerData[battlerAtk].transformSpecies = targetSpecies; + gBattleMonForms[battlerAtk] = gBattleMonForms[battlerDef]; } - gSprites[gBattlerSpriteIds[bankAtk]].pos1.y = GetBattlerSpriteDefault_Y(bankAtk); - StartSpriteAnim(&gSprites[gBattlerSpriteIds[bankAtk]], gBattleMonForms[bankAtk]); + gSprites[gBattlerSpriteIds[battlerAtk]].pos1.y = GetBattlerSpriteDefault_Y(battlerAtk); + StartSpriteAnim(&gSprites[gBattlerSpriteIds[battlerAtk]], gBattleMonForms[battlerAtk]); } } @@ -1068,11 +1068,11 @@ void HandleLowHpMusicChange(struct Pokemon *mon, u8 battlerId) void BattleStopLowHpSound(void) { - u8 playerBank = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); + u8 playerBattler = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); - gBattleSpritesDataPtr->battlerData[playerBank].lowHpSong = 0; + gBattleSpritesDataPtr->battlerData[playerBattler].lowHpSong = 0; if (IsDoubleBattle()) - gBattleSpritesDataPtr->battlerData[playerBank ^ BIT_FLANK].lowHpSong = 0; + gBattleSpritesDataPtr->battlerData[playerBattler ^ BIT_FLANK].lowHpSong = 0; m4aSongNumStop(SE_HINSI); } @@ -1085,19 +1085,19 @@ u8 GetMonHPBarLevel(struct Pokemon *mon) return GetHPBarLevel(hp, maxHP); } -void sub_805EAE8(void) +void HandleBattleLowHpMusicChange(void) { if (gMain.inBattle) { - u8 playerBank1 = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); - u8 playerBank2 = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT); - u8 bank1PartyId = pokemon_order_func(gBattlerPartyIndexes[playerBank1]); - u8 bank2PartyId = pokemon_order_func(gBattlerPartyIndexes[playerBank2]); + u8 playerBattler1 = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); + u8 playerBattler2 = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT); + u8 battler1PartyId = pokemon_order_func(gBattlerPartyIndexes[playerBattler1]); + u8 battler2PartyId = pokemon_order_func(gBattlerPartyIndexes[playerBattler2]); - if (GetMonData(&gPlayerParty[bank1PartyId], MON_DATA_HP) != 0) - HandleLowHpMusicChange(&gPlayerParty[bank1PartyId], playerBank1); - if (IsDoubleBattle() && GetMonData(&gPlayerParty[bank2PartyId], MON_DATA_HP) != 0) - HandleLowHpMusicChange(&gPlayerParty[bank2PartyId], playerBank2); + if (GetMonData(&gPlayerParty[battler1PartyId], MON_DATA_HP) != 0) + HandleLowHpMusicChange(&gPlayerParty[battler1PartyId], playerBattler1); + if (IsDoubleBattle() && GetMonData(&gPlayerParty[battler2PartyId], MON_DATA_HP) != 0) + HandleLowHpMusicChange(&gPlayerParty[battler2PartyId], playerBattler2); } } @@ -1147,14 +1147,14 @@ void SpriteCB_EnemyShadow(struct Sprite *shadowSprite) { bool8 invisible = FALSE; u8 battlerId = shadowSprite->tBattlerId; - struct Sprite *bankSprite = &gSprites[gBattlerSpriteIds[battlerId]]; + struct Sprite *battlerSprite = &gSprites[gBattlerSpriteIds[battlerId]]; - if (!bankSprite->inUse || !IsBattlerSpritePresent(battlerId)) + if (!battlerSprite->inUse || !IsBattlerSpritePresent(battlerId)) { shadowSprite->callback = SpriteCB_SetInvisible; return; } - if (gAnimScriptActive || bankSprite->invisible) + if (gAnimScriptActive || battlerSprite->invisible) invisible = TRUE; else if (gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != SPECIES_NONE && gEnemyMonElevation[gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies] == 0) @@ -1163,8 +1163,8 @@ void SpriteCB_EnemyShadow(struct Sprite *shadowSprite) if (gBattleSpritesDataPtr->battlerData[battlerId].behindSubstitute) invisible = TRUE; - shadowSprite->pos1.x = bankSprite->pos1.x; - shadowSprite->pos2.x = bankSprite->pos2.x; + shadowSprite->pos1.x = battlerSprite->pos1.x; + shadowSprite->pos2.x = battlerSprite->pos2.x; shadowSprite->invisible = invisible; } @@ -1177,7 +1177,7 @@ void SpriteCB_SetInvisible(struct Sprite *sprite) void SetBattlerShadowSpriteCallback(u8 battlerId, u16 species) { - // The player's shadow is never seen + // The player's shadow is never seen. if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) return; @@ -1270,7 +1270,7 @@ void FreeMonSpritesGfx(void) FREE_AND_SET_NULL(gMonSpritesGfxPtr); } -bool32 ShouldPlayNormalPokeCry(struct Pokemon *mon) +bool32 ShouldPlayNormalMonCry(struct Pokemon *mon) { s16 hp, maxHP; s32 barLevel; diff --git a/src/battle_interface.c b/src/battle_interface.c index 9ef45020df..94b5a2be9a 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -26,7 +26,7 @@ struct TestingBar { s32 maxValue; - s32 currValue; + s32 oldValue; s32 receivedValue; u32 unkC_0:5; u32 unk10; @@ -37,7 +37,7 @@ enum HEALTHBOX_GFX_0, HEALTHBOX_GFX_1, HEALTHBOX_GFX_2, - HEALTHBOX_GFX_3, + HEALTHBOX_GFX_HP_BAR_GREEN, HEALTHBOX_GFX_4, HEALTHBOX_GFX_5, HEALTHBOX_GFX_6, @@ -55,19 +55,19 @@ enum HEALTHBOX_GFX_18, HEALTHBOX_GFX_19, HEALTHBOX_GFX_20, - HEALTHBOX_GFX_STATUS_PSN_BANK0, + HEALTHBOX_GFX_STATUS_PSN_BATTLER0, HEALTHBOX_GFX_22, HEALTHBOX_GFX_23, - HEALTHBOX_GFX_STATUS_PRZ_BANK0, + HEALTHBOX_GFX_STATUS_PRZ_BATTLER0, HEALTHBOX_GFX_25, HEALTHBOX_GFX_26, - HEALTHBOX_GFX_STATUS_SLP_BANK0, + HEALTHBOX_GFX_STATUS_SLP_BATTLER0, HEALTHBOX_GFX_28, HEALTHBOX_GFX_29, - HEALTHBOX_GFX_STATUS_FRZ_BANK0, + HEALTHBOX_GFX_STATUS_FRZ_BATTLER0, HEALTHBOX_GFX_31, HEALTHBOX_GFX_32, - HEALTHBOX_GFX_STATUS_BRN_BANK0, + HEALTHBOX_GFX_STATUS_BRN_BATTLER0, HEALTHBOX_GFX_34, HEALTHBOX_GFX_35, HEALTHBOX_GFX_36, @@ -81,7 +81,7 @@ enum HEALTHBOX_GFX_44, HEALTHBOX_GFX_45, HEALTHBOX_GFX_46, - HEALTHBOX_GFX_47, + HEALTHBOX_GFX_HP_BAR_YELLOW, HEALTHBOX_GFX_48, HEALTHBOX_GFX_49, HEALTHBOX_GFX_50, @@ -90,7 +90,7 @@ enum HEALTHBOX_GFX_53, HEALTHBOX_GFX_54, HEALTHBOX_GFX_55, - HEALTHBOX_GFX_56, + HEALTHBOX_GFX_HP_BAR_RED, HEALTHBOX_GFX_57, HEALTHBOX_GFX_58, HEALTHBOX_GFX_59, @@ -105,56 +105,56 @@ enum HEALTHBOX_GFX_68, HEALTHBOX_GFX_69, HEALTHBOX_GFX_70, - HEALTHBOX_GFX_STATUS_PSN_BANK1, + HEALTHBOX_GFX_STATUS_PSN_BATTLER1, HEALTHBOX_GFX_72, HEALTHBOX_GFX_73, - HEALTHBOX_GFX_STATUS_PRZ_BANK1, + HEALTHBOX_GFX_STATUS_PRZ_BATTLER1, HEALTHBOX_GFX_75, HEALTHBOX_GFX_76, - HEALTHBOX_GFX_STATUS_SLP_BANK1, + HEALTHBOX_GFX_STATUS_SLP_BATTLER1, HEALTHBOX_GFX_78, HEALTHBOX_GFX_79, - HEALTHBOX_GFX_STATUS_FRZ_BANK1, + HEALTHBOX_GFX_STATUS_FRZ_BATTLER1, HEALTHBOX_GFX_81, HEALTHBOX_GFX_82, - HEALTHBOX_GFX_STATUS_BRN_BANK1, + HEALTHBOX_GFX_STATUS_BRN_BATTLER1, HEALTHBOX_GFX_84, HEALTHBOX_GFX_85, - HEALTHBOX_GFX_STATUS_PSN_BANK2, + HEALTHBOX_GFX_STATUS_PSN_BATTLER2, HEALTHBOX_GFX_87, HEALTHBOX_GFX_88, - HEALTHBOX_GFX_STATUS_PRZ_BANK2, + HEALTHBOX_GFX_STATUS_PRZ_BATTLER2, HEALTHBOX_GFX_90, HEALTHBOX_GFX_91, - HEALTHBOX_GFX_STATUS_SLP_BANK2, + HEALTHBOX_GFX_STATUS_SLP_BATTLER2, HEALTHBOX_GFX_93, HEALTHBOX_GFX_94, - HEALTHBOX_GFX_STATUS_FRZ_BANK2, + HEALTHBOX_GFX_STATUS_FRZ_BATTLER2, HEALTHBOX_GFX_96, HEALTHBOX_GFX_97, - HEALTHBOX_GFX_STATUS_BRN_BANK2, + HEALTHBOX_GFX_STATUS_BRN_BATTLER2, HEALTHBOX_GFX_99, HEALTHBOX_GFX_100, - HEALTHBOX_GFX_STATUS_PSN_BANK3, + HEALTHBOX_GFX_STATUS_PSN_BATTLER3, HEALTHBOX_GFX_102, HEALTHBOX_GFX_103, - HEALTHBOX_GFX_STATUS_PRZ_BANK3, + HEALTHBOX_GFX_STATUS_PRZ_BATTLER3, HEALTHBOX_GFX_105, HEALTHBOX_GFX_106, - HEALTHBOX_GFX_STATUS_SLP_BANK3, + HEALTHBOX_GFX_STATUS_SLP_BATTLER3, HEALTHBOX_GFX_108, HEALTHBOX_GFX_109, - HEALTHBOX_GFX_STATUS_FRZ_BANK3, + HEALTHBOX_GFX_STATUS_FRZ_BATTLER3, HEALTHBOX_GFX_111, HEALTHBOX_GFX_112, - HEALTHBOX_GFX_STATUS_BRN_BANK3, + HEALTHBOX_GFX_STATUS_BRN_BATTLER3, HEALTHBOX_GFX_114, HEALTHBOX_GFX_115, HEALTHBOX_GFX_116, HEALTHBOX_GFX_117, }; -extern const u8 * const gNatureNamePointers[]; +extern const u8 *const gNatureNamePointers[]; // strings extern const u8 gText_Slash[]; @@ -179,28 +179,28 @@ static void RemoveWindowOnHealthbox(u32 windowId); static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent); static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId); -static void sub_8075198(void *dest, u8 *windowTileData, s32 arg2); -static void sub_80751E4(void *dest, u8 *windowTileData, u32 arg2); -static void sub_8075170(void *dest, u8 *windowTileData, u32 arg2); -static void sub_807513C(void *dest, u32 arg1, u32 arg2); +static void TextIntoHealthboxObject(void *dest, u8 *windowTileData, s32 arg2); +static void SafariTextIntoHealthboxObject(void *dest, u8 *windowTileData, u32 arg2); +static void HpTextIntoHealthboxObject(void *dest, u8 *windowTileData, u32 arg2); +static void FillHealthboxObject(void *dest, u32 arg1, u32 arg2); static void sub_8073E08(u8 taskId); static void sub_8073F98(u8 taskId); static void sub_8073E64(u8 taskId); -static void sub_8072924(struct Sprite *sprite); -static void sub_80728B4(struct Sprite *sprite); +static void SpriteCB_HealthBoxOther(struct Sprite *sprite); +static void SpriteCB_HealthBar(struct Sprite *sprite); static void sub_8074158(struct Sprite *sprite); static void sub_8074090(struct Sprite *sprite); static void SpriteCB_StatusSummaryBar(struct Sprite *sprite); static void SpriteCB_StatusSummaryBallsOnBattleStart(struct Sprite *sprite); static void SpriteCB_StatusSummaryBallsOnSwitchout(struct Sprite *sprite); -static u8 GetStatusIconForBankId(u8 statusElementId, u8 battlerId); -static s32 sub_8074DB8(s32 maxValue, s32 currValue, s32 receivedValue, s32 *arg3, u8 arg4, u16 arg5); +static u8 GetStatusIconForBattlerId(u8 statusElementId, u8 battlerId); +static s32 CalcNewBarValue(s32 maxValue, s32 currValue, s32 receivedValue, s32 *arg3, u8 arg4, u16 arg5); static u8 GetScaledExpFraction(s32 currValue, s32 receivedValue, s32 maxValue, u8 scale); -static void sub_8074B9C(u8 battlerId, u8 whichBar); -static u8 sub_8074E8C(s32 maxValue, s32 currValue, s32 receivedValue, s32 *arg3, u8 *arg4, u8 arg5); +static void MoveBattleBarGraphically(u8 battlerId, u8 whichBar); +static u8 CalcBarFilledPixels(s32 maxValue, s32 oldValue, s32 receivedValue, s32 *currValue, u8 *arg4, u8 scale); static void sub_8074F88(struct TestingBar *barInfo, s32 *arg1, u16 *arg2); // const rom data @@ -276,7 +276,7 @@ static const struct SpriteTemplate sHealthboxSafariSpriteTemplate = .callback = SpriteCallbackDummy }; -static const struct OamData sUnknown_0832C1B8 = +static const struct OamData sOamData_Healthbar = { .y = 0, .affineMode = 0, @@ -293,43 +293,43 @@ static const struct OamData sUnknown_0832C1B8 = .affineParam = 0, }; -static const struct SpriteTemplate sUnknown_0832C1C0[4] = +static const struct SpriteTemplate sHealthbarSpriteTemplates[MAX_BATTLERS_COUNT] = { { - .tileTag = 0xd704, - .paletteTag = 0xd704, - .oam = &sUnknown_0832C1B8, + .tileTag = TAG_HEALTHBAR_PLAYER1_TILE, + .paletteTag = TAG_HEALTHBAR_PAL, + .oam = &sOamData_Healthbar, .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80728B4 + .callback = SpriteCB_HealthBar }, { - .tileTag = 0xd705, - .paletteTag = 0xd704, - .oam = &sUnknown_0832C1B8, + .tileTag = TAG_HEALTHBAR_OPPONENT1_TILE, + .paletteTag = TAG_HEALTHBAR_PAL, + .oam = &sOamData_Healthbar, .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80728B4 + .callback = SpriteCB_HealthBar }, { - .tileTag = 0xd706, - .paletteTag = 0xd704, - .oam = &sUnknown_0832C1B8, + .tileTag = TAG_HEALTHBAR_PLAYER2_TILE, + .paletteTag = TAG_HEALTHBAR_PAL, + .oam = &sOamData_Healthbar, .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80728B4 + .callback = SpriteCB_HealthBar }, { - .tileTag = 0xd707, - .paletteTag = 0xd704, - .oam = &sUnknown_0832C1B8, + .tileTag = TAG_HEALTHBAR_OPPONENT2_TILE, + .paletteTag = TAG_HEALTHBAR_PAL, + .oam = &sOamData_Healthbar, .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80728B4 + .callback = SpriteCB_HealthBar } }; @@ -883,112 +883,126 @@ void sub_80724A8(s16 arg0, s16 arg1, u16 *arg2) sub_8072308(arg0, arg2 + 5, 1); } -// because the healthbox is too large to fit into one sprite, it is divided into two sprites -// healthboxSpriteId_1 or healthboxSpriteId refers to the 'main' healthbox -// healthboxSpriteId_2 refers to the other part -// there's also one other sprite that appears to be a black square? dont fully understand its role +// Because the healthbox is too large to fit into one sprite, it is divided into two sprites. +// healthboxLeft or healthboxMain is the left part that is used as the 'main' sprite. +// healthboxRight or healthboxOther is the right part of the healthbox. +// There's also the third sprite under name of healthbarSprite that refers to the healthbar visible on the healtbox. -u8 CreateBattlerHealthboxSprites(u8 battler) +// data fields for healthboxMain +// oam.affineParam holds healthboxRight spriteId +#define hMain_HealthBarSpriteId data[5] +#define hMain_Battler data[6] +#define hMain_Data7 data[7] + +// data fields for healthboxRight +#define hOther_HealthBoxSpriteId data[5] + +// data fields for healthbar +#define hBar_HealthBoxSpriteId data[5] +#define hBar_Data6 data[6] + +u8 CreateBattlerHealthboxSprites(u8 battlerId) { s16 data6 = 0; - u8 healthboxSpriteId_1, healthboxSpriteId_2; - u8 unkSpriteId; - struct Sprite *unkSpritePtr; + u8 healthboxLeftSpriteId, healthboxRightSpriteId; + u8 healthbarSpriteId; + struct Sprite *healthBarSpritePtr; if (!IsDoubleBattle()) { - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) { - healthboxSpriteId_1 = CreateSprite(&sHealthboxPlayerSpriteTemplates[0], 240, 160, 1); - healthboxSpriteId_2 = CreateSpriteAtEnd(&sHealthboxPlayerSpriteTemplates[0], 240, 160, 1); + healthboxLeftSpriteId = CreateSprite(&sHealthboxPlayerSpriteTemplates[0], 240, 160, 1); + healthboxRightSpriteId = CreateSpriteAtEnd(&sHealthboxPlayerSpriteTemplates[0], 240, 160, 1); - gSprites[healthboxSpriteId_1].oam.shape = 0; + gSprites[healthboxLeftSpriteId].oam.shape = 0; - gSprites[healthboxSpriteId_2].oam.shape = 0; - gSprites[healthboxSpriteId_2].oam.tileNum += 64; + gSprites[healthboxRightSpriteId].oam.shape = 0; + gSprites[healthboxRightSpriteId].oam.tileNum += 64; } else { - healthboxSpriteId_1 = CreateSprite(&sHealthboxOpponentSpriteTemplates[0], 240, 160, 1); - healthboxSpriteId_2 = CreateSpriteAtEnd(&sHealthboxOpponentSpriteTemplates[0], 240, 160, 1); + healthboxLeftSpriteId = CreateSprite(&sHealthboxOpponentSpriteTemplates[0], 240, 160, 1); + healthboxRightSpriteId = CreateSpriteAtEnd(&sHealthboxOpponentSpriteTemplates[0], 240, 160, 1); - gSprites[healthboxSpriteId_2].oam.tileNum += 32; + gSprites[healthboxRightSpriteId].oam.tileNum += 32; data6 = 2; } - gSprites[healthboxSpriteId_1].oam.affineParam = healthboxSpriteId_2; - gSprites[healthboxSpriteId_2].data[5] = healthboxSpriteId_1; - gSprites[healthboxSpriteId_2].callback = sub_8072924; + gSprites[healthboxLeftSpriteId].oam.affineParam = healthboxRightSpriteId; + + gSprites[healthboxRightSpriteId].hOther_HealthBoxSpriteId = healthboxLeftSpriteId; + gSprites[healthboxRightSpriteId].callback = SpriteCB_HealthBoxOther; } else { - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) { - healthboxSpriteId_1 = CreateSprite(&sHealthboxPlayerSpriteTemplates[GetBattlerPosition(battler) / 2], 240, 160, 1); - healthboxSpriteId_2 = CreateSpriteAtEnd(&sHealthboxPlayerSpriteTemplates[GetBattlerPosition(battler) / 2], 240, 160, 1); + healthboxLeftSpriteId = CreateSprite(&sHealthboxPlayerSpriteTemplates[GetBattlerPosition(battlerId) / 2], 240, 160, 1); + healthboxRightSpriteId = CreateSpriteAtEnd(&sHealthboxPlayerSpriteTemplates[GetBattlerPosition(battlerId) / 2], 240, 160, 1); - gSprites[healthboxSpriteId_1].oam.affineParam = healthboxSpriteId_2; + gSprites[healthboxLeftSpriteId].oam.affineParam = healthboxRightSpriteId; - gSprites[healthboxSpriteId_2].data[5] = healthboxSpriteId_1; - gSprites[healthboxSpriteId_2].oam.tileNum += 32; - gSprites[healthboxSpriteId_2].callback = sub_8072924; + gSprites[healthboxRightSpriteId].hOther_HealthBoxSpriteId = healthboxLeftSpriteId; + gSprites[healthboxRightSpriteId].oam.tileNum += 32; + gSprites[healthboxRightSpriteId].callback = SpriteCB_HealthBoxOther; data6 = 1; } else { - healthboxSpriteId_1 = CreateSprite(&sHealthboxOpponentSpriteTemplates[GetBattlerPosition(battler) / 2], 240, 160, 1); - healthboxSpriteId_2 = CreateSpriteAtEnd(&sHealthboxOpponentSpriteTemplates[GetBattlerPosition(battler) / 2], 240, 160, 1); + healthboxLeftSpriteId = CreateSprite(&sHealthboxOpponentSpriteTemplates[GetBattlerPosition(battlerId) / 2], 240, 160, 1); + healthboxRightSpriteId = CreateSpriteAtEnd(&sHealthboxOpponentSpriteTemplates[GetBattlerPosition(battlerId) / 2], 240, 160, 1); - gSprites[healthboxSpriteId_1].oam.affineParam = healthboxSpriteId_2; + gSprites[healthboxLeftSpriteId].oam.affineParam = healthboxRightSpriteId; - gSprites[healthboxSpriteId_2].data[5] = healthboxSpriteId_1; - gSprites[healthboxSpriteId_2].oam.tileNum += 32; - gSprites[healthboxSpriteId_2].callback = sub_8072924; + gSprites[healthboxRightSpriteId].hOther_HealthBoxSpriteId = healthboxLeftSpriteId; + gSprites[healthboxRightSpriteId].oam.tileNum += 32; + gSprites[healthboxRightSpriteId].callback = SpriteCB_HealthBoxOther; data6 = 2; } } - unkSpriteId = CreateSpriteAtEnd(&sUnknown_0832C1C0[gBattlerPositions[battler]], 140, 60, 0); - unkSpritePtr = &gSprites[unkSpriteId]; - SetSubspriteTables(unkSpritePtr, &sUnknown_0832C28C[GetBattlerSide(battler)]); - unkSpritePtr->subspriteMode = 2; - unkSpritePtr->oam.priority = 1; + healthbarSpriteId = CreateSpriteAtEnd(&sHealthbarSpriteTemplates[gBattlerPositions[battlerId]], 140, 60, 0); + healthBarSpritePtr = &gSprites[healthbarSpriteId]; + SetSubspriteTables(healthBarSpritePtr, &sUnknown_0832C28C[GetBattlerSide(battlerId)]); + healthBarSpritePtr->subspriteMode = 2; + healthBarSpritePtr->oam.priority = 1; - CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_1), (void*)(OBJ_VRAM0 + unkSpritePtr->oam.tileNum * 32), 64); + CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_1), (void*)(OBJ_VRAM0 + healthBarSpritePtr->oam.tileNum * 32), 64); - gSprites[healthboxSpriteId_1].data[5] = unkSpriteId; - gSprites[healthboxSpriteId_1].data[6] = battler; - gSprites[healthboxSpriteId_1].invisible = 1; + gSprites[healthboxLeftSpriteId].hMain_HealthBarSpriteId = healthbarSpriteId; + gSprites[healthboxLeftSpriteId].hMain_Battler = battlerId; + gSprites[healthboxLeftSpriteId].invisible = 1; - gSprites[healthboxSpriteId_2].invisible = 1; + gSprites[healthboxRightSpriteId].invisible = 1; - unkSpritePtr->data[5] = healthboxSpriteId_1; - unkSpritePtr->data[6] = data6; - unkSpritePtr->invisible = 1; + healthBarSpritePtr->hBar_HealthBoxSpriteId = healthboxLeftSpriteId; + healthBarSpritePtr->hBar_Data6 = data6; + healthBarSpritePtr->invisible = 1; - return healthboxSpriteId_1; + return healthboxLeftSpriteId; } u8 CreateSafariPlayerHealthboxSprites(void) { - u8 healthboxSpriteId_1, healthboxSpriteId_2; + u8 healthboxLeftSpriteId, healthboxRightSpriteId; - healthboxSpriteId_1 = CreateSprite(&sHealthboxSafariSpriteTemplate, 240, 160, 1); - healthboxSpriteId_2 = CreateSpriteAtEnd(&sHealthboxSafariSpriteTemplate, 240, 160, 1); + healthboxLeftSpriteId = CreateSprite(&sHealthboxSafariSpriteTemplate, 240, 160, 1); + healthboxRightSpriteId = CreateSpriteAtEnd(&sHealthboxSafariSpriteTemplate, 240, 160, 1); - gSprites[healthboxSpriteId_1].oam.shape = 0; - gSprites[healthboxSpriteId_2].oam.shape = 0; + gSprites[healthboxLeftSpriteId].oam.shape = 0; + gSprites[healthboxRightSpriteId].oam.shape = 0; - gSprites[healthboxSpriteId_2].oam.tileNum += 64; + gSprites[healthboxRightSpriteId].oam.tileNum += 64; - gSprites[healthboxSpriteId_1].oam.affineParam = healthboxSpriteId_2; - gSprites[healthboxSpriteId_2].data[5] = healthboxSpriteId_1; + gSprites[healthboxLeftSpriteId].oam.affineParam = healthboxRightSpriteId; + gSprites[healthboxRightSpriteId].hOther_HealthBoxSpriteId = healthboxLeftSpriteId; - gSprites[healthboxSpriteId_2].callback = sub_8072924; + gSprites[healthboxRightSpriteId].callback = SpriteCB_HealthBoxOther; - return healthboxSpriteId_1; + return healthboxLeftSpriteId; } static const u8 *GetHealthboxElementGfxPtr(u8 elementId) @@ -996,62 +1010,63 @@ static const u8 *GetHealthboxElementGfxPtr(u8 elementId) return gHealthboxElementsGfxTable[elementId]; } -static void sub_80728B4(struct Sprite *sprite) +// Syncs the position of healthbar accordingly with the healthbox. +static void SpriteCB_HealthBar(struct Sprite *sprite) { - u8 var = sprite->data[5]; + u8 healthboxSpriteId = sprite->hBar_HealthBoxSpriteId; - switch (sprite->data[6]) + switch (sprite->hBar_Data6) { case 0: - sprite->pos1.x = gSprites[var].pos1.x + 16; - sprite->pos1.y = gSprites[var].pos1.y; + sprite->pos1.x = gSprites[healthboxSpriteId].pos1.x + 16; + sprite->pos1.y = gSprites[healthboxSpriteId].pos1.y; break; case 1: - sprite->pos1.x = gSprites[var].pos1.x + 16; - sprite->pos1.y = gSprites[var].pos1.y; + sprite->pos1.x = gSprites[healthboxSpriteId].pos1.x + 16; + sprite->pos1.y = gSprites[healthboxSpriteId].pos1.y; break; case 2: default: - sprite->pos1.x = gSprites[var].pos1.x + 8; - sprite->pos1.y = gSprites[var].pos1.y; + sprite->pos1.x = gSprites[healthboxSpriteId].pos1.x + 8; + sprite->pos1.y = gSprites[healthboxSpriteId].pos1.y; break; } - sprite->pos2.x = gSprites[var].pos2.x; - sprite->pos2.y = gSprites[var].pos2.y; + sprite->pos2.x = gSprites[healthboxSpriteId].pos2.x; + sprite->pos2.y = gSprites[healthboxSpriteId].pos2.y; } -static void sub_8072924(struct Sprite *sprite) +static void SpriteCB_HealthBoxOther(struct Sprite *sprite) { - u8 otherSpriteId = sprite->data[5]; + u8 healthboxMainSpriteId = sprite->hOther_HealthBoxSpriteId; - sprite->pos1.x = gSprites[otherSpriteId].pos1.x + 64; - sprite->pos1.y = gSprites[otherSpriteId].pos1.y; + sprite->pos1.x = gSprites[healthboxMainSpriteId].pos1.x + 64; + sprite->pos1.y = gSprites[healthboxMainSpriteId].pos1.y; - sprite->pos2.x = gSprites[otherSpriteId].pos2.x; - sprite->pos2.y = gSprites[otherSpriteId].pos2.y; + sprite->pos2.x = gSprites[healthboxMainSpriteId].pos2.x; + sprite->pos2.y = gSprites[healthboxMainSpriteId].pos2.y; } -void SetBattleBarStruct(u8 battlerId, u8 healthboxSpriteId, s32 maxVal, s32 currVal, s32 receivedValue) +void SetBattleBarStruct(u8 battlerId, u8 healthboxSpriteId, s32 maxVal, s32 oldVal, s32 receivedValue) { gBattleSpritesDataPtr->battleBars[battlerId].healthboxSpriteId = healthboxSpriteId; gBattleSpritesDataPtr->battleBars[battlerId].maxValue = maxVal; - gBattleSpritesDataPtr->battleBars[battlerId].currentValue = currVal; + gBattleSpritesDataPtr->battleBars[battlerId].oldValue = oldVal; gBattleSpritesDataPtr->battleBars[battlerId].receivedValue = receivedValue; - gBattleSpritesDataPtr->battleBars[battlerId].field_10 = -32768; + gBattleSpritesDataPtr->battleBars[battlerId].currValue = -32768; } void SetHealthboxSpriteInvisible(u8 healthboxSpriteId) { gSprites[healthboxSpriteId].invisible = 1; - gSprites[gSprites[healthboxSpriteId].data[5]].invisible = 1; + gSprites[gSprites[healthboxSpriteId].hMain_HealthBarSpriteId].invisible = 1; gSprites[gSprites[healthboxSpriteId].oam.affineParam].invisible = 1; } void SetHealthboxSpriteVisible(u8 healthboxSpriteId) { gSprites[healthboxSpriteId].invisible = 0; - gSprites[gSprites[healthboxSpriteId].data[5]].invisible = 0; + gSprites[gSprites[healthboxSpriteId].hMain_HealthBarSpriteId].invisible = 0; gSprites[gSprites[healthboxSpriteId].oam.affineParam].invisible = 0; } @@ -1064,11 +1079,11 @@ static void UpdateSpritePos(u8 spriteId, s16 x, s16 y) void DestoryHealthboxSprite(u8 healthboxSpriteId) { DestroySprite(&gSprites[gSprites[healthboxSpriteId].oam.affineParam]); - DestroySprite(&gSprites[gSprites[healthboxSpriteId].data[5]]); + DestroySprite(&gSprites[gSprites[healthboxSpriteId].hMain_HealthBarSpriteId]); DestroySprite(&gSprites[healthboxSpriteId]); } -void DummyBattleInterfaceFunc(u8 healthboxSpriteId, bool8 isDoubleBattleBankOnly) +void DummyBattleInterfaceFunc(u8 healthboxSpriteId, bool8 isDoubleBattleBattlerOnly) { } @@ -1079,13 +1094,13 @@ void UpdateOamPriorityInAllHealthboxes(u8 priority) for (i = 0; i < gBattlersCount; i++) { - u8 healthboxSpriteId_1 = gHealthboxSpriteIds[i]; - u8 healthboxSpriteId_2 = gSprites[gHealthboxSpriteIds[i]].oam.affineParam; - u8 healthboxSpriteId_3 = gSprites[gHealthboxSpriteIds[i]].data[5]; + u8 healthboxLeftSpriteId = gHealthboxSpriteIds[i]; + u8 healthboxRightSpriteId = gSprites[gHealthboxSpriteIds[i]].oam.affineParam; + u8 healthbarSpriteId = gSprites[gHealthboxSpriteIds[i]].hMain_HealthBarSpriteId; - gSprites[healthboxSpriteId_1].oam.priority = priority; - gSprites[healthboxSpriteId_2].oam.priority = priority; - gSprites[healthboxSpriteId_3].oam.priority = priority; + gSprites[healthboxLeftSpriteId].oam.priority = priority; + gSprites[healthboxRightSpriteId].oam.priority = priority; + gSprites[healthbarSpriteId].oam.priority = priority; } } @@ -1146,7 +1161,7 @@ static void UpdateLvlInHealthbox(u8 healthboxSpriteId, u8 lvl) windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(text, xPos, 3, 2, &windowId); spriteTileNum = gSprites[healthboxSpriteId].oam.tileNum * 32; - if (GetBattlerSide(gSprites[healthboxSpriteId].data[6]) == B_SIDE_PLAYER) + if (GetBattlerSide(gSprites[healthboxSpriteId].hMain_Battler) == B_SIDE_PLAYER) { objVram = (void*)(OBJ_VRAM0); if (!IsDoubleBattle()) @@ -1159,7 +1174,7 @@ static void UpdateLvlInHealthbox(u8 healthboxSpriteId, u8 lvl) objVram = (void*)(OBJ_VRAM0); objVram += spriteTileNum + 0x400; } - sub_8075198(objVram, windowTileData, 3); + TextIntoHealthboxObject(objVram, windowTileData, 3); RemoveWindowOnHealthbox(windowId); } @@ -1170,7 +1185,7 @@ void UpdateHpTextInHealthbox(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent) u8 text[32]; void *objVram; - if (GetBattlerSide(gSprites[healthboxSpriteId].data[6]) == B_SIDE_PLAYER && !IsDoubleBattle()) + if (GetBattlerSide(gSprites[healthboxSpriteId].hMain_Battler) == B_SIDE_PLAYER && !IsDoubleBattle()) { spriteTileNum = gSprites[healthboxSpriteId].oam.tileNum * 32; if (maxOrCurrent != HP_CURRENT) // singles, max @@ -1179,7 +1194,7 @@ void UpdateHpTextInHealthbox(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent) windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(text, 0, 5, 2, &windowId); objVram = (void*)(OBJ_VRAM0); objVram += spriteTileNum + 0xB40; - sub_8075170(objVram, windowTileData, 2); + HpTextIntoHealthboxObject(objVram, windowTileData, 2); RemoveWindowOnHealthbox(windowId); } else // singles, current @@ -1190,20 +1205,19 @@ void UpdateHpTextInHealthbox(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent) windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(text, 4, 5, 2, &windowId); objVram = (void*)(OBJ_VRAM0); objVram += spriteTileNum + 0x3E0; - sub_8075170(objVram, windowTileData, 1); + HpTextIntoHealthboxObject(objVram, windowTileData, 1); objVram = (void*)(OBJ_VRAM0); objVram += spriteTileNum + 0xB00; - sub_8075170(objVram, windowTileData + 0x20, 2); + HpTextIntoHealthboxObject(objVram, windowTileData + 0x20, 2); RemoveWindowOnHealthbox(windowId); } - } else { u8 battler; memcpy(text, sUnknown_0832C3C4, sizeof(sUnknown_0832C3C4)); - battler = gSprites[healthboxSpriteId].data[6]; + battler = gSprites[healthboxSpriteId].hMain_Battler; if (IsDoubleBattle() == TRUE || GetBattlerSide(battler) == B_SIDE_OPPONENT) { UpdateHpTextInHealthboxInDoubles(healthboxSpriteId, value, maxOrCurrent); @@ -1248,7 +1262,7 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8 u8 text[32]; void *objVram; - if (GetBattlerSide(gSprites[healthboxSpriteId].data[6]) == B_SIDE_PLAYER) + if (GetBattlerSide(gSprites[healthboxSpriteId].hMain_Battler) == B_SIDE_PLAYER) { if (gBattleSpritesDataPtr->battlerData[gSprites[healthboxSpriteId].data[6]].hpNumbersNoBars) // don't print text if only bars are visible { @@ -1259,7 +1273,7 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8 { ConvertIntToDecimalStringN(text, value, STR_CONV_MODE_RIGHT_ALIGN, 3); windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(text, 0, 5, 0, &windowId); - sub_8075170((void*)(OBJ_VRAM0) + spriteTileNum + 0xC0, windowTileData, 2); + HpTextIntoHealthboxObject((void*)(OBJ_VRAM0) + spriteTileNum + 0xC0, windowTileData, 2); RemoveWindowOnHealthbox(windowId); CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_116), (void*)(OBJ_VRAM0 + 0x680) + (gSprites[healthboxSpriteId].oam.tileNum * 32), @@ -1271,8 +1285,8 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8 text[3] = CHAR_SLASH; text[4] = EOS; windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(text, 4, 5, 0, &windowId); - sub_807513C(objVram, 0, 3); - sub_8075170((void*)(OBJ_VRAM0 + 0x60) + spriteTileNum, windowTileData, 3); + FillHealthboxObject(objVram, 0, 3); // Erases HP bar leftover. + HpTextIntoHealthboxObject((void*)(OBJ_VRAM0 + 0x60) + spriteTileNum, windowTileData, 3); RemoveWindowOnHealthbox(windowId); } } @@ -1282,7 +1296,7 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8 u8 battlerId; memcpy(text, sUnknown_0832C3D8, sizeof(sUnknown_0832C3D8)); - battlerId = gSprites[healthboxSpriteId].data[6]; + battlerId = gSprites[healthboxSpriteId].hMain_Battler; if (gBattleSpritesDataPtr->battlerData[battlerId].hpNumbersNoBars) // don't print text if only bars are visible { @@ -1325,7 +1339,7 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8 } else { - if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) // impossible to reach part, because the battlerId is from the opponent's side + if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) // Impossible to reach part, because the battlerId is from the opponent's side. { CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_116), (void*)(OBJ_VRAM0) + ((gSprites[healthboxSpriteId].oam.tileNum + 52) * 32), @@ -1336,15 +1350,16 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8 } } -static void sub_80730D4(u8 healthboxSpriteId, struct Pokemon *mon) +// Prints mon's nature and flee rate. Probably used to test pokeblock feeders. +static void PrintSafariMonInfo(u8 healthboxSpriteId, struct Pokemon *mon) { u8 text[20]; s32 j, var2; u8 *barFontGfx; - u8 i, var, nature, healthboxSpriteId_2; + u8 i, var, nature, healthBarSpriteId; memcpy(text, sUnknown_0832C3C4, sizeof(sUnknown_0832C3C4)); - barFontGfx = &gMonSpritesGfxPtr->barFontGfx[0x520 + (GetBattlerPosition(gSprites[healthboxSpriteId].data[6]) * 384)]; + barFontGfx = &gMonSpritesGfxPtr->barFontGfx[0x520 + (GetBattlerPosition(gSprites[healthboxSpriteId].hMain_Battler) * 384)]; var = 5; nature = GetNature(mon); StringCopy(text + 6, gNatureNamePointers[nature]); @@ -1375,26 +1390,26 @@ static void sub_80730D4(u8 healthboxSpriteId, struct Pokemon *mon) barFontGfx += 0x20; } - healthboxSpriteId_2 = gSprites[healthboxSpriteId].data[5]; + healthBarSpriteId = gSprites[healthboxSpriteId].hMain_HealthBarSpriteId; ConvertIntToDecimalStringN(text + 6, gBattleStruct->field_7C, STR_CONV_MODE_RIGHT_ALIGN, 2); ConvertIntToDecimalStringN(text + 9, gBattleStruct->field_7B, STR_CONV_MODE_RIGHT_ALIGN, 2); text[5] = CHAR_SPACE; text[8] = CHAR_SLASH; RenderTextFont9(gMonSpritesGfxPtr->barFontGfx, 9, text); - j = healthboxSpriteId_2; // needed to match for some reason + j = healthBarSpriteId; // Needed to match for some reason. for (j = 0; j < 5; j++) { if (j <= 1) { CpuCopy32(&gMonSpritesGfxPtr->barFontGfx[0x40 * j + 0x20], - (void*)(OBJ_VRAM0) + (gSprites[healthboxSpriteId_2].oam.tileNum + 2 + j) * 32, + (void*)(OBJ_VRAM0) + (gSprites[healthBarSpriteId].oam.tileNum + 2 + j) * 32, 32); } else { CpuCopy32(&gMonSpritesGfxPtr->barFontGfx[0x40 * j + 0x20], - (void*)(OBJ_VRAM0 + 0xC0) + (j + gSprites[healthboxSpriteId_2].oam.tileNum) * 32, + (void*)(OBJ_VRAM0 + 0xC0) + (j + gSprites[healthBarSpriteId].oam.tileNum) * 32, 32); } } @@ -1403,7 +1418,7 @@ static void sub_80730D4(u8 healthboxSpriteId, struct Pokemon *mon) void SwapHpBarsWithHpText(void) { s32 i; - u8 spriteId; + u8 healthBarSpriteId; for (i = 0; i < gBattlersCount; i++) { @@ -1424,9 +1439,9 @@ void SwapHpBarsWithHpText(void) if (noBars == TRUE) // bars to text { - spriteId = gSprites[gHealthboxSpriteIds[i]].data[5]; + healthBarSpriteId = gSprites[gHealthboxSpriteIds[i]].hMain_HealthBarSpriteId; - CpuFill32(0, (void*)(OBJ_VRAM0 + gSprites[spriteId].oam.tileNum * 32), 0x100); + CpuFill32(0, (void*)(OBJ_VRAM0 + gSprites[healthBarSpriteId].oam.tileNum * 32), 0x100); UpdateHpTextInHealthboxInDoubles(gHealthboxSpriteIds[i], GetMonData(&gPlayerParty[gBattlerPartyIndexes[i]], MON_DATA_HP), HP_CURRENT); UpdateHpTextInHealthboxInDoubles(gHealthboxSpriteIds[i], GetMonData(&gPlayerParty[gBattlerPartyIndexes[i]], MON_DATA_MAX_HP), HP_MAX); } @@ -1443,13 +1458,14 @@ void SwapHpBarsWithHpText(void) { if (gBattleTypeFlags & BATTLE_TYPE_SAFARI) { - sub_80730D4(gHealthboxSpriteIds[i], &gEnemyParty[gBattlerPartyIndexes[i]]); + // Most likely a debug function. + PrintSafariMonInfo(gHealthboxSpriteIds[i], &gEnemyParty[gBattlerPartyIndexes[i]]); } else { - spriteId = gSprites[gHealthboxSpriteIds[i]].data[5]; + healthBarSpriteId = gSprites[gHealthboxSpriteIds[i]].hMain_HealthBarSpriteId; - CpuFill32(0, (void *)(OBJ_VRAM0 + gSprites[spriteId].oam.tileNum * 32), 0x100); + CpuFill32(0, (void *)(OBJ_VRAM0 + gSprites[healthBarSpriteId].oam.tileNum * 32), 0x100); UpdateHpTextInHealthboxInDoubles(gHealthboxSpriteIds[i], GetMonData(&gEnemyParty[gBattlerPartyIndexes[i]], MON_DATA_HP), HP_CURRENT); UpdateHpTextInHealthboxInDoubles(gHealthboxSpriteIds[i], GetMonData(&gEnemyParty[gBattlerPartyIndexes[i]], MON_DATA_MAX_HP), HP_MAX); } @@ -1462,7 +1478,7 @@ void SwapHpBarsWithHpText(void) UpdateHealthboxAttribute(gHealthboxSpriteIds[i], &gEnemyParty[gBattlerPartyIndexes[i]], HEALTHBOX_NICK); } } - gSprites[gHealthboxSpriteIds[i]].data[7] ^= 1; + gSprites[gHealthboxSpriteIds[i]].hMain_Data7 ^= 1; } } } @@ -1473,7 +1489,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, s16 bar_X, bar_Y, bar_pos2_X, bar_data0; s32 i, j, var; u8 barSpriteId; - u8 ballIconSpritesIds[6]; + u8 ballIconSpritesIds[PARTY_SIZE]; u8 taskId; if (!arg2 || GetBattlerPosition(battlerId) != B_POSITION_OPPONENT_RIGHT) @@ -1561,7 +1577,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, { if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) { if (partyInfo[i].hp == 0xFFFF) // empty slot or an egg { @@ -1580,7 +1596,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, } else { - for (i = 0, var = 5, j = 0; j < 6; j++) + for (i = 0, var = 5, j = 0; j < PARTY_SIZE; j++) { if (partyInfo[j].hp == 0xFFFF) // empty slot or an egg { @@ -1609,7 +1625,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, { if (gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_TWO_OPPONENTS)) { - for (var = 5, i = 0; i < 6; i++) + for (var = 5, i = 0; i < PARTY_SIZE; i++) { if (partyInfo[i].hp == 0xFFFF) // empty slot or an egg { @@ -1629,7 +1645,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, } else { - for (var = 0, i = 0, j = 0; j < 6; j++) + for (var = 0, i = 0, j = 0; j < PARTY_SIZE; j++) { if (partyInfo[j].hp == 0xFFFF) // empty slot or an egg { @@ -1659,7 +1675,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, gTasks[taskId].data[0] = battlerId; gTasks[taskId].data[1] = barSpriteId; - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) gTasks[taskId].data[3 + i] = ballIconSpritesIds[i]; gTasks[taskId].data[10] = isBattleStart; @@ -1677,12 +1693,12 @@ void sub_8073C30(u8 taskId) { u8 sp[6]; u8 r7; - u8 r10; + u8 summaryBarSpriteId; u8 battlerId; s32 i; r7 = gTasks[taskId].data[10]; - r10 = gTasks[taskId].data[1]; + summaryBarSpriteId = gTasks[taskId].data[1]; battlerId = gTasks[taskId].data[0]; for (i = 0; i < 6; i++) @@ -1696,7 +1712,7 @@ void sub_8073C30(u8 taskId) for (i = 0; i < 6; i++) gSprites[sp[i]].oam.objMode = 1; - gSprites[r10].oam.objMode = 1; + gSprites[summaryBarSpriteId].oam.objMode = 1; if (r7 != 0) { @@ -1717,10 +1733,10 @@ void sub_8073C30(u8 taskId) gSprites[sp[i]].callback = sub_8074158; } } - gSprites[r10].data[0] /= 2; - gSprites[r10].data[1] = 0; - gSprites[r10].callback = sub_8074090; - SetSubspriteTables(&gSprites[r10], sUnknown_0832C2CC); + gSprites[summaryBarSpriteId].data[0] /= 2; + gSprites[summaryBarSpriteId].data[1] = 0; + gSprites[summaryBarSpriteId].callback = sub_8074090; + SetSubspriteTables(&gSprites[summaryBarSpriteId], sUnknown_0832C2CC); gTasks[taskId].func = sub_8073E08; } else @@ -1754,7 +1770,7 @@ static void sub_8073E64(u8 taskId) gTasks[taskId].data[15]--; if (gTasks[taskId].data[15] == -1) { - u8 var = gTasks[taskId].data[1]; + u8 summaryBarSpriteId = gTasks[taskId].data[1]; for (i = 0; i < 6; i++) sp[i] = gTasks[taskId].data[3 + i]; @@ -1762,13 +1778,13 @@ static void sub_8073E64(u8 taskId) gBattleSpritesDataPtr->animationData->field_9_x1C--; if (!gBattleSpritesDataPtr->animationData->field_9_x1C) { - DestroySpriteAndFreeResources(&gSprites[var]); + DestroySpriteAndFreeResources(&gSprites[summaryBarSpriteId]); DestroySpriteAndFreeResources(&gSprites[sp[0]]); } else { - FreeSpriteOamMatrix(&gSprites[var]); - DestroySprite(&gSprites[var]); + FreeSpriteOamMatrix(&gSprites[summaryBarSpriteId]); + DestroySprite(&gSprites[summaryBarSpriteId]); FreeSpriteOamMatrix(&gSprites[sp[0]]); DestroySprite(&gSprites[sp[0]]); } @@ -1798,12 +1814,12 @@ static void sub_8073F98(u8 taskId) } else if (gTasks[taskId].data[15] == -1) { - u8 var = gTasks[taskId].data[1]; + u8 summaryBarSpriteId = gTasks[taskId].data[1]; for (i = 0; i < 6; i++) sp[i] = gTasks[taskId].data[3 + i]; - DestroySpriteAndFreeResources(&gSprites[var]); + DestroySpriteAndFreeResources(&gSprites[summaryBarSpriteId]); DestroySpriteAndFreeResources(&gSprites[sp[0]]); for (i = 1; i < 6; i++) @@ -1956,17 +1972,17 @@ static void UpdateNickInHealthbox(u8 healthboxSpriteId, struct Pokemon *mon) if (GetBattlerSide(gSprites[healthboxSpriteId].data[6]) == B_SIDE_PLAYER) { - sub_8075198((void*)(0x6010040 + spriteTileNum), windowTileData, 6); + TextIntoHealthboxObject((void*)(VRAM + 0x10040 + spriteTileNum), windowTileData, 6); ptr = (void*)(OBJ_VRAM0); if (!IsDoubleBattle()) ptr += spriteTileNum + 0x800; else ptr += spriteTileNum + 0x400; - sub_8075198(ptr, windowTileData + 0xC0, 1); + TextIntoHealthboxObject(ptr, windowTileData + 0xC0, 1); } else { - sub_8075198((void*)(0x6010020 + spriteTileNum), windowTileData, 7); + TextIntoHealthboxObject((void*)(VRAM + 0x10020 + spriteTileNum), windowTileData, 7); } RemoveWindowOnHealthbox(windowId); @@ -1974,38 +1990,38 @@ static void UpdateNickInHealthbox(u8 healthboxSpriteId, struct Pokemon *mon) static void TryAddPokeballIconToHealthbox(u8 healthboxSpriteId, bool8 noStatus) { - u8 battlerId, healthboxSpriteId_2; + u8 battlerId, healthBarSpriteId; if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL) return; if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) return; - battlerId = gSprites[healthboxSpriteId].data[6]; + battlerId = gSprites[healthboxSpriteId].hMain_Battler; if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) return; if (!GetSetPokedexFlag(SpeciesToNationalPokedexNum(GetMonData(&gEnemyParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES)), FLAG_GET_CAUGHT)) return; - healthboxSpriteId_2 = gSprites[healthboxSpriteId].data[5]; + healthBarSpriteId = gSprites[healthboxSpriteId].hMain_HealthBarSpriteId; if (noStatus) - CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_70), (void*)(OBJ_VRAM0 + (gSprites[healthboxSpriteId_2].oam.tileNum + 8) * 32), 32); + CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_70), (void*)(OBJ_VRAM0 + (gSprites[healthBarSpriteId].oam.tileNum + 8) * 32), 32); else - CpuFill32(0, (void*)(OBJ_VRAM0 + (gSprites[healthboxSpriteId_2].oam.tileNum + 8) * 32), 32); + CpuFill32(0, (void*)(OBJ_VRAM0 + (gSprites[healthBarSpriteId].oam.tileNum + 8) * 32), 32); } static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId) { s32 i; - u8 battlerId, healthboxSpriteId_2; + u8 battlerId, healthBarSpriteId; u32 status, pltAdder; const u8 *statusGfxPtr; s16 tileNumAdder; u8 statusPalId; - battlerId = gSprites[healthboxSpriteId].data[6]; - healthboxSpriteId_2 = gSprites[healthboxSpriteId].data[5]; + battlerId = gSprites[healthboxSpriteId].hMain_Battler; + healthBarSpriteId = gSprites[healthboxSpriteId].hMain_HealthBarSpriteId; if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) { status = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_STATUS); @@ -2022,27 +2038,27 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId) if (status & STATUS1_SLEEP) { - statusGfxPtr = GetHealthboxElementGfxPtr(GetStatusIconForBankId(HEALTHBOX_GFX_STATUS_SLP_BANK0, battlerId)); + statusGfxPtr = GetHealthboxElementGfxPtr(GetStatusIconForBattlerId(HEALTHBOX_GFX_STATUS_SLP_BATTLER0, battlerId)); statusPalId = PAL_STATUS_SLP; } else if (status & STATUS1_PSN_ANY) { - statusGfxPtr = GetHealthboxElementGfxPtr(GetStatusIconForBankId(HEALTHBOX_GFX_STATUS_PSN_BANK0, battlerId)); + statusGfxPtr = GetHealthboxElementGfxPtr(GetStatusIconForBattlerId(HEALTHBOX_GFX_STATUS_PSN_BATTLER0, battlerId)); statusPalId = PAL_STATUS_PSN; } else if (status & STATUS1_BURN) { - statusGfxPtr = GetHealthboxElementGfxPtr(GetStatusIconForBankId(HEALTHBOX_GFX_STATUS_BRN_BANK0, battlerId)); + statusGfxPtr = GetHealthboxElementGfxPtr(GetStatusIconForBattlerId(HEALTHBOX_GFX_STATUS_BRN_BATTLER0, battlerId)); statusPalId = PAL_STATUS_BRN; } else if (status & STATUS1_FREEZE) { - statusGfxPtr = GetHealthboxElementGfxPtr(GetStatusIconForBankId(HEALTHBOX_GFX_STATUS_FRZ_BANK0, battlerId)); + statusGfxPtr = GetHealthboxElementGfxPtr(GetStatusIconForBattlerId(HEALTHBOX_GFX_STATUS_FRZ_BATTLER0, battlerId)); statusPalId = PAL_STATUS_FRZ; } else if (status & STATUS1_PARALYSIS) { - statusGfxPtr = GetHealthboxElementGfxPtr(GetStatusIconForBankId(HEALTHBOX_GFX_STATUS_PRZ_BANK0, battlerId)); + statusGfxPtr = GetHealthboxElementGfxPtr(GetStatusIconForBattlerId(HEALTHBOX_GFX_STATUS_PRZ_BATTLER0, battlerId)); statusPalId = PAL_STATUS_PAR; } else @@ -2053,7 +2069,7 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId) CpuCopy32(statusGfxPtr, (void*)(OBJ_VRAM0 + (gSprites[healthboxSpriteId].oam.tileNum + tileNumAdder + i) * 32), 32); if (!gBattleSpritesDataPtr->battlerData[battlerId].hpNumbersNoBars) - CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_1), (void *)(OBJ_VRAM0 + gSprites[healthboxSpriteId_2].oam.tileNum * 32), 64); + CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_1), (void *)(OBJ_VRAM0 + gSprites[healthBarSpriteId].oam.tileNum * 32), 64); TryAddPokeballIconToHealthbox(healthboxSpriteId, TRUE); return; @@ -2069,68 +2085,68 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId) { if (!gBattleSpritesDataPtr->battlerData[battlerId].hpNumbersNoBars) { - CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_0), (void*)(OBJ_VRAM0 + gSprites[healthboxSpriteId_2].oam.tileNum * 32), 32); - CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_65), (void*)(OBJ_VRAM0 + (gSprites[healthboxSpriteId_2].oam.tileNum + 1) * 32), 32); + CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_0), (void*)(OBJ_VRAM0 + gSprites[healthBarSpriteId].oam.tileNum * 32), 32); + CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_65), (void*)(OBJ_VRAM0 + (gSprites[healthBarSpriteId].oam.tileNum + 1) * 32), 32); } } TryAddPokeballIconToHealthbox(healthboxSpriteId, FALSE); } -static u8 GetStatusIconForBankId(u8 statusElementId, u8 battlerId) +static u8 GetStatusIconForBattlerId(u8 statusElementId, u8 battlerId) { u8 ret = statusElementId; switch (statusElementId) { - case HEALTHBOX_GFX_STATUS_PSN_BANK0: + case HEALTHBOX_GFX_STATUS_PSN_BATTLER0: if (battlerId == 0) - ret = HEALTHBOX_GFX_STATUS_PSN_BANK0; + ret = HEALTHBOX_GFX_STATUS_PSN_BATTLER0; else if (battlerId == 1) - ret = HEALTHBOX_GFX_STATUS_PSN_BANK1; + ret = HEALTHBOX_GFX_STATUS_PSN_BATTLER1; else if (battlerId == 2) - ret = HEALTHBOX_GFX_STATUS_PSN_BANK2; + ret = HEALTHBOX_GFX_STATUS_PSN_BATTLER2; else - ret = HEALTHBOX_GFX_STATUS_PSN_BANK3; + ret = HEALTHBOX_GFX_STATUS_PSN_BATTLER3; break; - case HEALTHBOX_GFX_STATUS_PRZ_BANK0: + case HEALTHBOX_GFX_STATUS_PRZ_BATTLER0: if (battlerId == 0) - ret = HEALTHBOX_GFX_STATUS_PRZ_BANK0; + ret = HEALTHBOX_GFX_STATUS_PRZ_BATTLER0; else if (battlerId == 1) - ret = HEALTHBOX_GFX_STATUS_PRZ_BANK1; + ret = HEALTHBOX_GFX_STATUS_PRZ_BATTLER1; else if (battlerId == 2) - ret = HEALTHBOX_GFX_STATUS_PRZ_BANK2; + ret = HEALTHBOX_GFX_STATUS_PRZ_BATTLER2; else - ret = HEALTHBOX_GFX_STATUS_PRZ_BANK3; + ret = HEALTHBOX_GFX_STATUS_PRZ_BATTLER3; break; - case HEALTHBOX_GFX_STATUS_SLP_BANK0: + case HEALTHBOX_GFX_STATUS_SLP_BATTLER0: if (battlerId == 0) - ret = HEALTHBOX_GFX_STATUS_SLP_BANK0; + ret = HEALTHBOX_GFX_STATUS_SLP_BATTLER0; else if (battlerId == 1) - ret = HEALTHBOX_GFX_STATUS_SLP_BANK1; + ret = HEALTHBOX_GFX_STATUS_SLP_BATTLER1; else if (battlerId == 2) - ret = HEALTHBOX_GFX_STATUS_SLP_BANK2; + ret = HEALTHBOX_GFX_STATUS_SLP_BATTLER2; else - ret = HEALTHBOX_GFX_STATUS_SLP_BANK3; + ret = HEALTHBOX_GFX_STATUS_SLP_BATTLER3; break; - case HEALTHBOX_GFX_STATUS_FRZ_BANK0: + case HEALTHBOX_GFX_STATUS_FRZ_BATTLER0: if (battlerId == 0) - ret = HEALTHBOX_GFX_STATUS_FRZ_BANK0; + ret = HEALTHBOX_GFX_STATUS_FRZ_BATTLER0; else if (battlerId == 1) - ret = HEALTHBOX_GFX_STATUS_FRZ_BANK1; + ret = HEALTHBOX_GFX_STATUS_FRZ_BATTLER1; else if (battlerId == 2) - ret = HEALTHBOX_GFX_STATUS_FRZ_BANK2; + ret = HEALTHBOX_GFX_STATUS_FRZ_BATTLER2; else - ret = HEALTHBOX_GFX_STATUS_FRZ_BANK3; + ret = HEALTHBOX_GFX_STATUS_FRZ_BATTLER3; break; - case HEALTHBOX_GFX_STATUS_BRN_BANK0: + case HEALTHBOX_GFX_STATUS_BRN_BATTLER0: if (battlerId == 0) - ret = HEALTHBOX_GFX_STATUS_BRN_BANK0; + ret = HEALTHBOX_GFX_STATUS_BRN_BATTLER0; else if (battlerId == 1) - ret = HEALTHBOX_GFX_STATUS_BRN_BANK1; + ret = HEALTHBOX_GFX_STATUS_BRN_BATTLER1; else if (battlerId == 2) - ret = HEALTHBOX_GFX_STATUS_BRN_BANK2; + ret = HEALTHBOX_GFX_STATUS_BRN_BATTLER2; else - ret = HEALTHBOX_GFX_STATUS_BRN_BANK3; + ret = HEALTHBOX_GFX_STATUS_BRN_BATTLER3; break; } return ret; @@ -2143,8 +2159,8 @@ static void UpdateSafariBallsTextOnHealthbox(u8 healthboxSpriteId) windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(gText_SafariBalls, 0, 3, 2, &windowId); spriteTileNum = gSprites[healthboxSpriteId].oam.tileNum * 32; - sub_8075198((void*)(OBJ_VRAM0 + 0x40) + spriteTileNum, windowTileData, 6); - sub_8075198((void*)(OBJ_VRAM0 + 0x800) + spriteTileNum, windowTileData + 0xC0, 2); + TextIntoHealthboxObject((void*)(OBJ_VRAM0 + 0x40) + spriteTileNum, windowTileData, 6); + TextIntoHealthboxObject((void*)(OBJ_VRAM0 + 0x800) + spriteTileNum, windowTileData + 0xC0, 2); RemoveWindowOnHealthbox(windowId); } @@ -2160,20 +2176,20 @@ static void UpdateLeftNoOfBallsTextOnHealthbox(u8 healthboxSpriteId) windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(text, GetStringRightAlignXOffset(0, text, 0x2F), 3, 2, &windowId); spriteTileNum = gSprites[healthboxSpriteId].oam.tileNum * 32; - sub_80751E4((void*)(OBJ_VRAM0 + 0x2C0) + spriteTileNum, windowTileData, 2); - sub_80751E4((void*)(OBJ_VRAM0 + 0xA00) + spriteTileNum, windowTileData + 0x40, 4); + SafariTextIntoHealthboxObject((void*)(OBJ_VRAM0 + 0x2C0) + spriteTileNum, windowTileData, 2); + SafariTextIntoHealthboxObject((void*)(OBJ_VRAM0 + 0xA00) + spriteTileNum, windowTileData + 0x40, 4); RemoveWindowOnHealthbox(windowId); } void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elementId) { s32 maxHp, currHp; - u8 battlerId = gSprites[healthboxSpriteId].data[6]; + u8 battlerId = gSprites[healthboxSpriteId].hMain_Battler; if (elementId == HEALTHBOX_ALL && !IsDoubleBattle()) - GetBattlerSide(battlerId); // pointless function call + GetBattlerSide(battlerId); // Pointless function call. - if (GetBattlerSide(gSprites[healthboxSpriteId].data[6]) == B_SIDE_PLAYER) + if (GetBattlerSide(gSprites[healthboxSpriteId].hMain_Battler) == B_SIDE_PLAYER) { u8 isDoubles; @@ -2189,7 +2205,7 @@ void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elem maxHp = GetMonData(mon, MON_DATA_MAX_HP); currHp = GetMonData(mon, MON_DATA_HP); SetBattleBarStruct(battlerId, healthboxSpriteId, maxHp, currHp, 0); - sub_8074AA0(battlerId, healthboxSpriteId, HEALTH_BAR, 0); + MoveBattleBar(battlerId, healthboxSpriteId, HEALTH_BAR, 0); } isDoubles = IsDoubleBattle(); if (!isDoubles && (elementId == HEALTHBOX_EXP_BAR || elementId == HEALTHBOX_ALL)) @@ -2207,7 +2223,7 @@ void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elem currExpBarValue = exp - currLevelExp; maxExpBarValue = gExperienceTables[gBaseStats[species].growthRate][level + 1] - currLevelExp; SetBattleBarStruct(battlerId, healthboxSpriteId, maxExpBarValue, currExpBarValue, isDoubles); - sub_8074AA0(battlerId, healthboxSpriteId, EXP_BAR, 0); + MoveBattleBar(battlerId, healthboxSpriteId, EXP_BAR, 0); } if (elementId == HEALTHBOX_NICK || elementId == HEALTHBOX_ALL) UpdateNickInHealthbox(healthboxSpriteId, mon); @@ -2228,7 +2244,7 @@ void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elem maxHp = GetMonData(mon, MON_DATA_MAX_HP); currHp = GetMonData(mon, MON_DATA_HP); SetBattleBarStruct(battlerId, healthboxSpriteId, maxHp, currHp, 0); - sub_8074AA0(battlerId, healthboxSpriteId, HEALTH_BAR, 0); + MoveBattleBar(battlerId, healthboxSpriteId, HEALTH_BAR, 0); } if (elementId == HEALTHBOX_NICK || elementId == HEALTHBOX_ALL) UpdateNickInHealthbox(healthboxSpriteId, mon); @@ -2237,82 +2253,86 @@ void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elem } } -s32 sub_8074AA0(u8 battlerId, u8 healthboxSpriteId, u8 whichBar, u8 arg3) +#define EXPBAR_PIXELS 64 +#define HEALTHBAR_PIXELS 48 + +s32 MoveBattleBar(u8 battlerId, u8 healthboxSpriteId, u8 whichBar, u8 unused) { - s32 var; + s32 currentBarValue; if (whichBar == HEALTH_BAR) // health bar { - var = sub_8074DB8(gBattleSpritesDataPtr->battleBars[battlerId].maxValue, - gBattleSpritesDataPtr->battleBars[battlerId].currentValue, + currentBarValue = CalcNewBarValue(gBattleSpritesDataPtr->battleBars[battlerId].maxValue, + gBattleSpritesDataPtr->battleBars[battlerId].oldValue, gBattleSpritesDataPtr->battleBars[battlerId].receivedValue, - &gBattleSpritesDataPtr->battleBars[battlerId].field_10, - 6, 1); + &gBattleSpritesDataPtr->battleBars[battlerId].currValue, + HEALTHBAR_PIXELS / 8, 1); } else // exp bar { - u16 expFraction = GetScaledExpFraction(gBattleSpritesDataPtr->battleBars[battlerId].currentValue, + u16 expFraction = GetScaledExpFraction(gBattleSpritesDataPtr->battleBars[battlerId].oldValue, gBattleSpritesDataPtr->battleBars[battlerId].receivedValue, gBattleSpritesDataPtr->battleBars[battlerId].maxValue, 8); if (expFraction == 0) expFraction = 1; expFraction = abs(gBattleSpritesDataPtr->battleBars[battlerId].receivedValue / expFraction); - var = sub_8074DB8(gBattleSpritesDataPtr->battleBars[battlerId].maxValue, - gBattleSpritesDataPtr->battleBars[battlerId].currentValue, + currentBarValue = CalcNewBarValue(gBattleSpritesDataPtr->battleBars[battlerId].maxValue, + gBattleSpritesDataPtr->battleBars[battlerId].oldValue, gBattleSpritesDataPtr->battleBars[battlerId].receivedValue, - &gBattleSpritesDataPtr->battleBars[battlerId].field_10, - 8, expFraction); + &gBattleSpritesDataPtr->battleBars[battlerId].currValue, + EXPBAR_PIXELS / 8, expFraction); } if (whichBar == EXP_BAR || (whichBar == HEALTH_BAR && !gBattleSpritesDataPtr->battlerData[battlerId].hpNumbersNoBars)) - sub_8074B9C(battlerId, whichBar); + MoveBattleBarGraphically(battlerId, whichBar); - if (var == -1) - gBattleSpritesDataPtr->battleBars[battlerId].field_10 = 0; + if (currentBarValue == -1) + gBattleSpritesDataPtr->battleBars[battlerId].currValue = 0; - return var; + return currentBarValue; } -static void sub_8074B9C(u8 battlerId, u8 whichBar) +static void MoveBattleBarGraphically(u8 battlerId, u8 whichBar) { u8 array[8]; - u8 subRet, level; + u8 filledPixelsCount, level; u8 barElementId; u8 i; switch (whichBar) { case HEALTH_BAR: - subRet = sub_8074E8C(gBattleSpritesDataPtr->battleBars[battlerId].maxValue, - gBattleSpritesDataPtr->battleBars[battlerId].currentValue, + filledPixelsCount = CalcBarFilledPixels(gBattleSpritesDataPtr->battleBars[battlerId].maxValue, + gBattleSpritesDataPtr->battleBars[battlerId].oldValue, gBattleSpritesDataPtr->battleBars[battlerId].receivedValue, - &gBattleSpritesDataPtr->battleBars[battlerId].field_10, - array, 6); - barElementId = 3; - if (subRet <= 0x18) - { - barElementId = 0x38; - if (subRet > 9) - barElementId = 0x2F; - } + &gBattleSpritesDataPtr->battleBars[battlerId].currValue, + array, HEALTHBAR_PIXELS / 8); + + if (filledPixelsCount > (HEALTHBAR_PIXELS * 50 / 100)) // more than 50 % hp + barElementId = HEALTHBOX_GFX_HP_BAR_GREEN; + else if (filledPixelsCount > (HEALTHBAR_PIXELS * 20 / 100)) // more than 20% hp + barElementId = HEALTHBOX_GFX_HP_BAR_YELLOW; + else + barElementId = HEALTHBOX_GFX_HP_BAR_RED; // 20 % or less + for (i = 0; i < 6; i++) { - u8 healthboxSpriteId_2 = gSprites[gBattleSpritesDataPtr->battleBars[battlerId].healthboxSpriteId].data[5]; + u8 healthbarSpriteId = gSprites[gBattleSpritesDataPtr->battleBars[battlerId].healthboxSpriteId].hMain_HealthBarSpriteId; if (i < 2) CpuCopy32(GetHealthboxElementGfxPtr(barElementId) + array[i] * 32, - (void*)(OBJ_VRAM0 + (gSprites[healthboxSpriteId_2].oam.tileNum + 2 + i) * 32), 32); + (void*)(OBJ_VRAM0 + (gSprites[healthbarSpriteId].oam.tileNum + 2 + i) * 32), 32); else CpuCopy32(GetHealthboxElementGfxPtr(barElementId) + array[i] * 32, - (void*)(OBJ_VRAM0 + 64 + (i + gSprites[healthboxSpriteId_2].oam.tileNum) * 32), 32); + (void*)(OBJ_VRAM0 + 64 + (i + gSprites[healthbarSpriteId].oam.tileNum) * 32), 32); } break; case EXP_BAR: - sub_8074E8C(gBattleSpritesDataPtr->battleBars[battlerId].maxValue, - gBattleSpritesDataPtr->battleBars[battlerId].currentValue, + CalcBarFilledPixels(gBattleSpritesDataPtr->battleBars[battlerId].maxValue, + gBattleSpritesDataPtr->battleBars[battlerId].oldValue, gBattleSpritesDataPtr->battleBars[battlerId].receivedValue, - &gBattleSpritesDataPtr->battleBars[battlerId].field_10, - array, 8); + &gBattleSpritesDataPtr->battleBars[battlerId].currValue, + array, EXPBAR_PIXELS / 8); level = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_LEVEL); if (level == MAX_MON_LEVEL) { @@ -2332,149 +2352,145 @@ static void sub_8074B9C(u8 battlerId, u8 whichBar) } } -static s32 sub_8074DB8(s32 maxValue, s32 currValue, s32 receivedValue, s32 *arg3, u8 arg4, u16 arg5) +static s32 CalcNewBarValue(s32 maxValue, s32 oldValue, s32 receivedValue, s32 *currValue, u8 scale, u16 toAdd) { - s32 r6; - s32 ret; - arg4 <<= 3; + s32 ret, newValue; + scale *= 8; - if (*arg3 == -32768) + if (*currValue == -32768) // first function call { - if (maxValue < arg4) - *arg3 = currValue << 8; + if (maxValue < scale) + *currValue = oldValue << 8; else - *arg3 = currValue; + *currValue = oldValue; } - currValue -= receivedValue; - if (currValue < 0) - currValue = 0; - else if (currValue > maxValue) - currValue = maxValue; + newValue = oldValue - receivedValue; + if (newValue < 0) + newValue = 0; + else if (newValue > maxValue) + newValue = maxValue; - if (maxValue < arg4) + if (maxValue < scale) { - s32 var = *arg3 >> 8; + s32 var = *currValue >> 8; - r6 = *arg3; - if (currValue == var && (r6 & 0xFF) == 0) + if (newValue == var && (*currValue & 0xFF) == 0) return -1; } else { - r6 = *arg3; - if (currValue == r6) + if (newValue == *currValue) // we're done, the bar's value has been updated return -1; } - if (maxValue < arg4) + if (maxValue < scale) // handle cases of max var having less pixels than the whole bar { - s32 var = (maxValue << 8) / arg4; + s32 var = (maxValue << 8) / scale; - if (receivedValue < 0) + if (receivedValue < 0) // fill bar right { - *arg3 = r6 + var; - ret = *arg3 >> 8; - if (ret >= currValue) + *currValue += var; + ret = *currValue >> 8; + if (ret >= newValue) { - *arg3 = currValue << 8; - ret = currValue; + *currValue = newValue << 8; + ret = newValue; } } - else + else // move bar left { - *arg3 = r6 - var; - ret = *arg3 >> 8; - if ((*arg3 & 0xFF) > 0) + *currValue -= var; + ret = *currValue >> 8; + if ((*currValue & 0xFF) > 0) ret++; - if (ret <= currValue) + if (ret <= newValue) { - *arg3 = currValue << 8; - ret = currValue; + *currValue = newValue << 8; + ret = newValue; } } } else { - if (receivedValue < 0) + if (receivedValue < 0) // fill bar right { - *arg3 += arg5; - if (*arg3 > currValue) - *arg3 = currValue; - ret = *arg3; + *currValue += toAdd; + if (*currValue > newValue) + *currValue = newValue; + ret = *currValue; } - else + else // move bar left { - *arg3 -= arg5; - if (*arg3 < currValue) - *arg3 = currValue; - ret = *arg3; + *currValue -= toAdd; + if (*currValue < newValue) + *currValue = newValue; + ret = *currValue; } } return ret; } -static u8 sub_8074E8C(s32 maxValue, s32 currValue, s32 receivedValue, s32 *arg3, u8 *arg4, u8 arg5) +static u8 CalcBarFilledPixels(s32 maxValue, s32 oldValue, s32 receivedValue, s32 *currValue, u8 *arg4, u8 scale) { - s32 r5 = currValue - receivedValue; - u8 ret; + u8 pixels, filledPixels, totalPixels; u8 i; - u8 r2; - if (r5 < 0) - r5 = 0; - else if (r5 > maxValue) - r5 = maxValue; + s32 newValue = oldValue - receivedValue; + if (newValue < 0) + newValue = 0; + else if (newValue > maxValue) + newValue = maxValue; - ret = arg5 << 3; + totalPixels = scale * 8; - for (i = 0; i < arg5; i++) + for (i = 0; i < scale; i++) arg4[i] = 0; - if (maxValue < ret) - r2 = (*arg3 * ret / maxValue) >> 8; + if (maxValue < totalPixels) + pixels = (*currValue * totalPixels / maxValue) >> 8; else - r2 = *arg3 * ret / maxValue; + pixels = *currValue * totalPixels / maxValue; - ret = r2; + filledPixels = pixels; - if (ret == 0 && r5 > 0) + if (filledPixels == 0 && newValue > 0) { arg4[0] = 1; - ret = 1; + filledPixels = 1; } else { - for (i = 0; i < arg5; i++) + for (i = 0; i < scale; i++) { - if (r2 >= 8) + if (pixels >= 8) { arg4[i] = 8; } else { - arg4[i] = r2; + arg4[i] = pixels; break; } - r2 -= 8; + pixels -= 8; } } - return ret; + return filledPixels; } static s16 sub_8074F28(struct TestingBar *barInfo, s32 *arg1, u16 *arg2, s32 arg3) { s16 ret, var; - ret = sub_8074DB8(barInfo->maxValue, - barInfo->currValue, + ret = CalcNewBarValue(barInfo->maxValue, + barInfo->oldValue, barInfo->receivedValue, arg1, 6, 1); sub_8074F88(barInfo, arg1, arg2); - if (barInfo->maxValue < 0x30) + if (barInfo->maxValue < HEALTHBAR_PIXELS) var = *arg1 >> 8; else var = *arg1; @@ -2490,7 +2506,7 @@ static void sub_8074F88(struct TestingBar *barInfo, s32 *arg1, u16 *arg2) u16 sp10[6]; u8 i; - sub_8074E8C(barInfo->maxValue, barInfo->currValue, + CalcBarFilledPixels(barInfo->maxValue, barInfo->oldValue, barInfo->receivedValue, arg1, sp8, 6); for (i = 0; i < 6; i++) @@ -2499,22 +2515,22 @@ static void sub_8074F88(struct TestingBar *barInfo, s32 *arg1, u16 *arg2) CpuCopy16(sp10, arg2, sizeof(sp10)); } -static u8 GetScaledExpFraction(s32 currValue, s32 receivedValue, s32 maxValue, u8 scale) +static u8 GetScaledExpFraction(s32 oldValue, s32 receivedValue, s32 maxValue, u8 scale) { - s32 r5, result; - s8 r4, r0; + s32 newVal, result; + s8 oldToMax, newToMax; scale *= 8; - r5 = currValue - receivedValue; + newVal = oldValue - receivedValue; - if (r5 < 0) - r5 = 0; - else if (r5 > maxValue) - r5 = maxValue; + if (newVal < 0) + newVal = 0; + else if (newVal > maxValue) + newVal = maxValue; - r4 = currValue * scale / maxValue; - r0 = r5 * scale / maxValue; - result = r4 - r0; + oldToMax = oldValue * scale / maxValue; + newToMax = newVal * scale / maxValue; + result = oldToMax - newToMax; return abs(result); } @@ -2577,17 +2593,17 @@ static void RemoveWindowOnHealthbox(u32 windowId) RemoveWindow(windowId); } -static void sub_807513C(void *dest, u32 arg1, u32 arg2) +static void FillHealthboxObject(void *dest, u32 arg1, u32 arg2) { CpuFill32(0x11111111 * arg1, dest, arg2 * 32); } -static void sub_8075170(void *dest, u8 *windowTileData, u32 arg2) +static void HpTextIntoHealthboxObject(void *dest, u8 *windowTileData, u32 arg2) { CpuCopy32(windowTileData + 256, dest, arg2 * 32); } -static void sub_8075198(void *dest, u8 *windowTileData, s32 arg2) +static void TextIntoHealthboxObject(void *dest, u8 *windowTileData, s32 arg2) { CpuCopy32(windowTileData + 256, dest + 256, arg2 * 32); @@ -2596,13 +2612,13 @@ static void sub_8075198(void *dest, u8 *windowTileData, s32 arg2) do { CpuCopy32(windowTileData + 20, dest + 20, 12); - dest += 32, windowTileData+= 32; + dest += 32, windowTileData += 32; arg2--; } while (arg2 != 0); } } -static void sub_80751E4(void *dest, u8 *windowTileData, u32 arg2) +static void SafariTextIntoHealthboxObject(void *dest, u8 *windowTileData, u32 arg2) { CpuCopy32(windowTileData, dest, arg2 * 32); CpuCopy32(windowTileData + 256, dest + 256, arg2 * 32); diff --git a/src/pokeball.c b/src/pokeball.c index 8173c4a906..3dbbb29670 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -665,7 +665,7 @@ static void Task_PlayCryWhenReleasedFromBall(u8 taskId) gTasks[taskId].tCryTaskState = wantedCry + 1; break; case 1: - if (ShouldPlayNormalPokeCry(mon) == TRUE) + if (ShouldPlayNormalMonCry(mon) == TRUE) PlayCry3(species, pan, 0); else PlayCry3(species, pan, 11); @@ -680,7 +680,7 @@ static void Task_PlayCryWhenReleasedFromBall(u8 taskId) case 20: if (gTasks[taskId].tCryTaskFrames == 0) { - if (ShouldPlayNormalPokeCry(mon) == TRUE) + if (ShouldPlayNormalMonCry(mon) == TRUE) PlayCry4(species, pan, 1); else PlayCry4(species, pan, 12); @@ -719,7 +719,7 @@ static void Task_PlayCryWhenReleasedFromBall(u8 taskId) gTasks[taskId].tCryTaskFrames--; break; } - if (ShouldPlayNormalPokeCry(mon) == TRUE) + if (ShouldPlayNormalMonCry(mon) == TRUE) PlayCry4(species, pan, 0); else PlayCry4(species, pan, 11); From ab36efdaf4a7f64df9bbfae153eb88cd9c5b29b0 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 20 Jun 2018 23:07:51 +0200 Subject: [PATCH 25/55] document bounce effect --- include/battle.h | 106 ++++++------ include/battle_controllers.h | 8 +- include/battle_main.h | 12 +- include/global.h | 6 + src/battle_controller_link_opponent.c | 8 +- src/battle_controller_link_partner.c | 6 +- src/battle_controller_opponent.c | 8 +- src/battle_controller_player.c | 34 ++-- src/battle_controller_player_partner.c | 6 +- src/battle_controller_recorded_opponent.c | 8 +- src/battle_controller_recorded_player.c | 6 +- src/battle_controller_safari.c | 6 +- src/battle_controller_wally.c | 6 +- src/battle_controllers.c | 10 +- src/battle_interface.c | 197 +++++++++++---------- src/battle_main.c | 200 ++++++++++++---------- src/hall_of_fame.c | 2 +- 17 files changed, 330 insertions(+), 299 deletions(-) diff --git a/include/battle.h b/include/battle.h index 62caa2cfe1..2651407fba 100644 --- a/include/battle.h +++ b/include/battle.h @@ -33,7 +33,7 @@ #define B_ACTION_SAFARI_GO_NEAR 7 #define B_ACTION_SAFARI_RUN 8 // The exact purposes of these are unclear -#define B_ACTION_UNKNOWN9 9 +#define B_ACTION_WALLY_THROW 9 #define B_ACTION_EXEC_SCRIPT 10 // when executing an action #define B_ACTION_CANCEL_PARTNER 12 // when choosing an action #define B_ACTION_FINISHED 12 // when executing an action @@ -150,29 +150,29 @@ struct DisableStruct /*0x08*/ u8 protectUses; /*0x09*/ u8 stockpileCounter; /*0x0A*/ u8 substituteHP; - /*0x0B*/ u8 disableTimer1 : 4; - /*0x0B*/ u8 disableTimer2 : 4; + /*0x0B*/ u8 disableTimer1:4; + /*0x0B*/ u8 disableTimer2:4; /*0x0C*/ u8 encoredMovePos; /*0x0D*/ u8 unkD; - /*0x0E*/ u8 encoreTimer1 : 4; - /*0x0E*/ u8 encoreTimer2 : 4; - /*0x0F*/ u8 perishSongTimer1 : 4; - /*0x0F*/ u8 perishSongTimer2 : 4; + /*0x0E*/ u8 encoreTimer1:4; + /*0x0E*/ u8 encoreTimer2:4; + /*0x0F*/ u8 perishSongTimer1:4; + /*0x0F*/ u8 perishSongTimer2:4; /*0x10*/ u8 furyCutterCounter; - /*0x11*/ u8 rolloutCounter1 : 4; - /*0x11*/ u8 rolloutCounter2 : 4; - /*0x12*/ u8 chargeTimer1 : 4; - /*0x12*/ u8 chargeTimer2 : 4; + /*0x11*/ u8 rolloutCounter1:4; + /*0x11*/ u8 rolloutCounter2:4; + /*0x12*/ u8 chargeTimer1:4; + /*0x12*/ u8 chargeTimer2:4; /*0x13*/ u8 tauntTimer1:4; /*0x13*/ u8 tauntTimer2:4; /*0x14*/ u8 battlerPreventingEscape; /*0x15*/ u8 battlerWithSureHit; /*0x16*/ u8 isFirstTurn; /*0x17*/ u8 unk17; - /*0x18*/ u8 truantCounter : 1; - /*0x18*/ u8 truantUnknownBit : 1; - /*0x18*/ u8 unk18_a_2 : 2; - /*0x18*/ u8 unk18_b : 4; + /*0x18*/ u8 truantCounter:1; + /*0x18*/ u8 truantUnknownBit:1; + /*0x18*/ u8 unk18_a_2:2; + /*0x18*/ u8 unk18_b:4; /*0x19*/ u8 rechargeCounter; /*0x1A*/ u8 unk1A[2]; }; @@ -201,12 +201,12 @@ struct ProtectStruct u32 flag2Unknown:1; // 0x2 u32 flinchImmobility:1; // 0x4 u32 notFirstStrike:1; // 0x8 - u32 flag_x10 : 1; // 0x10 - u32 flag_x20 : 1; // 0x20 - u32 flag_x40 : 1; // 0x40 - u32 flag_x80 : 1; // 0x80 + u32 flag_x10:1; // 0x10 + u32 flag_x20:1; // 0x20 + u32 flag_x40:1; // 0x40 + u32 flag_x80:1; // 0x80 /* field_3 */ - u32 field3 : 8; + u32 field3:8; /* field_4 */ u32 physicalDmg; /* field_8 */ u32 specialDmg; @@ -217,14 +217,14 @@ struct ProtectStruct struct SpecialStatus { - u8 statLowered : 1; // 0x1 - u8 lightningRodRedirected : 1; // 0x2 + u8 statLowered:1; // 0x1 + u8 lightningRodRedirected:1; // 0x2 u8 restoredBankSprite: 1; // 0x4 - u8 intimidatedPoke : 1; // 0x8 - u8 traced : 1; // 0x10 - u8 flag20 : 1; - u8 flag40 : 1; - u8 focusBanded : 1; + u8 intimidatedPoke:1; // 0x8 + u8 traced:1; // 0x10 + u8 flag20:1; + u8 flag40:1; + u8 focusBanded:1; u8 field1[3]; s32 dmg; s32 physicalDmg; @@ -629,11 +629,11 @@ u8 GetBattlerAtPosition(u8 bank); struct BattleSpriteInfo { - u16 invisible : 1; // 0x1 - u16 lowHpSong : 1; // 0x2 - u16 behindSubstitute : 1; // 0x4 - u16 flag_x8 : 1; // 0x8 - u16 hpNumbersNoBars : 1; // 0x10 + u16 invisible:1; // 0x1 + u16 lowHpSong:1; // 0x2 + u16 behindSubstitute:1; // 0x4 + u16 flag_x8:1; // 0x8 + u16 hpNumbersNoBars:1; // 0x10 u16 transformSpecies; }; @@ -647,12 +647,12 @@ struct BattleAnimationInfo u8 field_6; u8 field_7; u8 ballThrowCaseId; - u8 field_9_x1 : 1; - u8 field_9_x2 : 1; - u8 field_9_x1C : 3; - u8 field_9_x20 : 1; - u8 field_9_x40 : 1; - u8 field_9_x80 : 1; + u8 field_9_x1:1; + u8 field_9_x2:1; + u8 field_9_x1C:3; + u8 field_9_x20:1; + u8 field_9_x40:1; + u8 field_9_x80:1; u8 field_A; u8 field_B; u8 field_C; @@ -663,21 +663,21 @@ struct BattleAnimationInfo struct BattleHealthboxInfo { - u8 flag_x1 : 1; - u8 flag_x2 : 1; - u8 flag_x4 : 1; - u8 ballAnimActive : 1; // 0x8 - u8 statusAnimActive : 1; // x10 - u8 animFromTableActive : 1; // x20 - u8 specialAnimActive : 1; //x40 - u8 flag_x80 : 1; - u8 field_1_x1 : 1; - u8 field_1_x1E : 4; - u8 field_1_x20 : 1; - u8 field_1_x40 : 1; - u8 field_1_x80 : 1; - u8 field_2; - u8 field_3; + u8 flag_x1:1; + u8 healthboxIsBouncing:1; + u8 battlerIsBouncing:1; + u8 ballAnimActive:1; // 0x8 + u8 statusAnimActive:1; // x10 + u8 animFromTableActive:1; // x20 + u8 specialAnimActive:1; //x40 + u8 flag_x80:1; + u8 field_1_x1:1; + u8 field_1_x1E:4; + u8 field_1_x20:1; + u8 field_1_x40:1; + u8 field_1_x80:1; + u8 healthboxBounceSpriteId; + u8 battlerBounceSpriteId; u8 animationState; u8 field_5; u8 field_6; diff --git a/include/battle_controllers.h b/include/battle_controllers.h index a0fc41b520..c5f5f48d7b 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -82,8 +82,8 @@ enum struct UnusedControllerStruct { - u8 field_0 : 7; - u8 flag_x80 : 1; + u8 field_0:7; + u8 flag_x80:1; }; struct HpAndStatus @@ -161,7 +161,7 @@ enum CONTROLLER_INTROTRAINERBALLTHROW, CONTROLLER_DRAWPARTYSTATUSSUMMARY, CONTROLLER_49, - CONTROLLER_50, + CONTROLLER_ENDBOUNCE, CONTROLLER_SPRITEINVISIBILITY, CONTROLLER_BATTLEANIMATION, CONTROLLER_LINKSTANDBYMSG, @@ -231,7 +231,7 @@ void BtlController_EmitIntroSlide(u8 bufferId, u8 terrainId); void BtlController_EmitIntroTrainerBallThrow(u8 bufferId); void BtlController_EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus* hpAndStatus, u8 arg2); void BtlController_EmitCmd49(u8 bufferId); -void BtlController_EmitCmd50(u8 bufferId); +void BtlController_EmitEndBounceEffect(u8 bufferId); void BtlController_EmitSpriteInvisibility(u8 bufferId, bool8 isInvisible); void BtlController_EmitBattleAnimation(u8 bufferId, u8 animationId, u16 argument); void BtlController_EmitLinkStandbyMsg(u8 bufferId, u8 arg1, bool32 arg2); diff --git a/include/battle_main.h b/include/battle_main.h index a725b631fe..27e61c8fc2 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -25,6 +25,10 @@ struct TrainerMoney #define TYPE_FORESIGHT 0xFE #define TYPE_ENDTABLE 0xFF +// defines for the 'DoBounceEffect' function +#define BOUNCE_MON 0x0 +#define BOUNCE_HEALTHBOX 0x1 + void CB2_InitBattle(void); void BattleMainCB2(void); void CB2_QuitRecordedBattle(void); @@ -38,15 +42,15 @@ u32 sub_80391E0(u8 arrayId, u8 caseId); u32 sub_80397C4(u32 setId, u32 tableId); void oac_poke_opponent(struct Sprite *sprite); void SpriteCallbackDummy_2(struct Sprite *sprite); -void sub_8039934(struct Sprite *sprite); +void SpriteCB_FaintOpponentMon(struct Sprite *sprite); void sub_8039AD8(struct Sprite *sprite); void sub_8039B2C(struct Sprite *sprite); void sub_8039B58(struct Sprite *sprite); void sub_8039BB4(struct Sprite *sprite); void sub_80105DC(struct Sprite *sprite); void sub_8039C00(struct Sprite *sprite); -void dp11b_obj_instanciate(u8 battlerId, u8 b, s8 c, s8 d); -void dp11b_obj_free(u8 battlerId, bool8 b); +void DoBounceEffect(u8 battlerId, u8 b, s8 c, s8 d); +void EndBounceEffect(u8 battlerId, bool8 b); void sub_8039E44(struct Sprite *sprite); void sub_8039E60(struct Sprite *sprite); void sub_8039E84(struct Sprite *sprite); @@ -80,6 +84,6 @@ extern const u8 gStatusConditionString_IceJpn[8]; extern const u8 gStatusConditionString_ConfusionJpn[8]; extern const u8 gStatusConditionString_LoveJpn[8]; -extern const u8 * const gStatusConditionStringsTable[7][2]; +extern const u8 *const gStatusConditionStringsTable[7][2]; #endif // GUARD_BATTLE_MAIN_H diff --git a/include/global.h b/include/global.h index d26184270a..5a37cdc1ba 100644 --- a/include/global.h +++ b/include/global.h @@ -35,12 +35,18 @@ // Converts a number to Q4.12 fixed-point format #define Q_4_12(n) ((s16)((n) * 4096)) +// Converts a number to Q24.8 fixed-point format +#define Q_24_8(n) ((s32)((n) * 256)) + // Converts a Q8.8 fixed-point format number to a regular integer #define Q_8_8_TO_INT(n) ((int)((n) / 256)) // Converts a Q4.12 fixed-point format number to a regular integer #define Q_4_12_TO_INT(n) ((int)((n) / 4096)) +// Converts a Q24.8 fixed-point format number to a regular integer +#define Q_24_8_TO_INT(n) ((int)((n) >> 8)) + #define PARTY_SIZE 6 #define POKEMON_SLOTS_NUMBER 412 diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index b2c05664bc..0a53c28938 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -90,7 +90,7 @@ static void LinkOpponentHandleIntroSlide(void); static void LinkOpponentHandleIntroTrainerBallThrow(void); static void LinkOpponentHandleDrawPartyStatusSummary(void); static void LinkOpponentHandleCmd49(void); -static void LinkOpponentHandleCmd50(void); +static void LinkOpponentHandleEndBounceEffect(void); static void LinkOpponentHandleSpriteInvisibility(void); static void LinkOpponentHandleBattleAnimation(void); static void LinkOpponentHandleLinkStandbyMsg(void); @@ -162,7 +162,7 @@ static void (*const sLinkOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) = LinkOpponentHandleIntroTrainerBallThrow, LinkOpponentHandleDrawPartyStatusSummary, LinkOpponentHandleCmd49, - LinkOpponentHandleCmd50, + LinkOpponentHandleEndBounceEffect, LinkOpponentHandleSpriteInvisibility, LinkOpponentHandleBattleAnimation, LinkOpponentHandleLinkStandbyMsg, @@ -1366,7 +1366,7 @@ static void LinkOpponentHandleFaintAnimation(void) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_OPPONENT); - gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039934; + gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon; gBattlerControllerFuncs[gActiveBattler] = sub_8064C14; } } @@ -1803,7 +1803,7 @@ static void LinkOpponentHandleCmd49(void) LinkOpponentBufferExecCompleted(); } -static void LinkOpponentHandleCmd50(void) +static void LinkOpponentHandleEndBounceEffect(void) { LinkOpponentBufferExecCompleted(); } diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index f7abe589ac..f5987c0ce0 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -88,7 +88,7 @@ static void LinkPartnerHandleIntroSlide(void); static void LinkPartnerHandleIntroTrainerBallThrow(void); static void LinkPartnerHandleDrawPartyStatusSummary(void); static void LinkPartnerHandleCmd49(void); -static void LinkPartnerHandleCmd50(void); +static void LinkPartnerHandleEndBounceEffect(void); static void LinkPartnerHandleSpriteInvisibility(void); static void LinkPartnerHandleBattleAnimation(void); static void LinkPartnerHandleLinkStandbyMsg(void); @@ -159,7 +159,7 @@ static void (*const sLinkPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = LinkPartnerHandleIntroTrainerBallThrow, LinkPartnerHandleDrawPartyStatusSummary, LinkPartnerHandleCmd49, - LinkPartnerHandleCmd50, + LinkPartnerHandleEndBounceEffect, LinkPartnerHandleSpriteInvisibility, LinkPartnerHandleBattleAnimation, LinkPartnerHandleLinkStandbyMsg, @@ -1638,7 +1638,7 @@ static void LinkPartnerHandleCmd49(void) LinkPartnerBufferExecCompleted(); } -static void LinkPartnerHandleCmd50(void) +static void LinkPartnerHandleEndBounceEffect(void) { LinkPartnerBufferExecCompleted(); } diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 21b45dabf3..83dac5436d 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -95,7 +95,7 @@ static void OpponentHandleIntroSlide(void); static void OpponentHandleIntroTrainerBallThrow(void); static void OpponentHandleDrawPartyStatusSummary(void); static void OpponentHandleCmd49(void); -static void OpponentHandleCmd50(void); +static void OpponentHandleEndBounceEffect(void); static void OpponentHandleSpriteInvisibility(void); static void OpponentHandleBattleAnimation(void); static void OpponentHandleLinkStandbyMsg(void); @@ -167,7 +167,7 @@ static void (*const sOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) = OpponentHandleIntroTrainerBallThrow, OpponentHandleDrawPartyStatusSummary, OpponentHandleCmd49, - OpponentHandleCmd50, + OpponentHandleEndBounceEffect, OpponentHandleSpriteInvisibility, OpponentHandleBattleAnimation, OpponentHandleLinkStandbyMsg, @@ -1403,7 +1403,7 @@ static void OpponentHandleFaintAnimation(void) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_OPPONENT); - gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039934; + gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon; gBattlerControllerFuncs[gActiveBattler] = sub_805FAC4; } } @@ -1957,7 +1957,7 @@ static void OpponentHandleCmd49(void) OpponentBufferExecCompleted(); } -static void OpponentHandleCmd50(void) +static void OpponentHandleEndBounceEffect(void) { OpponentBufferExecCompleted(); } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 599ebfee42..63dc989be2 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -101,7 +101,7 @@ static void PlayerHandleIntroSlide(void); static void PlayerHandleIntroTrainerBallThrow(void); static void PlayerHandleDrawPartyStatusSummary(void); static void PlayerHandleCmd49(void); -static void PlayerHandleCmd50(void); +static void PlayerHandleEndBounceEffect(void); static void PlayerHandleSpriteInvisibility(void); static void PlayerHandleBattleAnimation(void); static void PlayerHandleLinkStandbyMsg(void); @@ -188,7 +188,7 @@ static void (*const sPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = PlayerHandleIntroTrainerBallThrow, PlayerHandleDrawPartyStatusSummary, PlayerHandleCmd49, - PlayerHandleCmd50, + PlayerHandleEndBounceEffect, PlayerHandleSpriteInvisibility, PlayerHandleBattleAnimation, PlayerHandleLinkStandbyMsg, @@ -250,8 +250,8 @@ static void HandleInputChooseAction(void) { u16 itemId = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8); - dp11b_obj_instanciate(gActiveBattler, 1, 7, 1); - dp11b_obj_instanciate(gActiveBattler, 0, 7, 1); + DoBounceEffect(gActiveBattler, BOUNCE_HEALTHBOX, 7, 1); + DoBounceEffect(gActiveBattler, BOUNCE_MON, 7, 1); if (gMain.newAndRepeatedKeys & DPAD_ANY && gSaveBlock2Ptr->optionsButtonMode == 2) gPlayerDpadHoldFrames++; @@ -347,8 +347,8 @@ static void HandleInputChooseAction(void) static void sub_80577F0(void) // unused { - dp11b_obj_free(gActiveBattler, 1); - dp11b_obj_free(gActiveBattler, 0); + EndBounceEffect(gActiveBattler, BOUNCE_HEALTHBOX); + EndBounceEffect(gActiveBattler, BOUNCE_MON); gBattlerControllerFuncs[gActiveBattler] = HandleInputChooseTarget; } @@ -358,7 +358,7 @@ static void HandleInputChooseTarget(void) u8 identities[4]; memcpy(identities, sTargetIdentities, ARRAY_COUNT(sTargetIdentities)); - dp11b_obj_instanciate(gMultiUsePlayerCursor, 1, 0xF, 1); + DoBounceEffect(gMultiUsePlayerCursor, BOUNCE_HEALTHBOX, 15, 1); // what a weird loop i = 0; @@ -367,7 +367,7 @@ static void HandleInputChooseTarget(void) do { if (i != gMultiUsePlayerCursor) - dp11b_obj_free(i, 1); + EndBounceEffect(i, BOUNCE_HEALTHBOX); i++; } while (i < gBattlersCount); } @@ -382,7 +382,7 @@ static void HandleInputChooseTarget(void) PlaySE(SE_SELECT); gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039B2C; BtlController_EmitTwoReturnValues(1, 10, gMoveSelectionCursor[gActiveBattler] | (gMultiUsePlayerCursor << 8)); - dp11b_obj_free(gMultiUsePlayerCursor, 1); + EndBounceEffect(gMultiUsePlayerCursor, BOUNCE_HEALTHBOX); PlayerBufferExecCompleted(); } else if (gMain.newKeys & B_BUTTON || gPlayerDpadHoldFrames > 59) @@ -390,9 +390,9 @@ static void HandleInputChooseTarget(void) PlaySE(SE_SELECT); gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039B2C; gBattlerControllerFuncs[gActiveBattler] = HandleInputChooseMove; - dp11b_obj_instanciate(gActiveBattler, 1, 7, 1); - dp11b_obj_instanciate(gActiveBattler, 0, 7, 1); - dp11b_obj_free(gMultiUsePlayerCursor, 1); + DoBounceEffect(gActiveBattler, BOUNCE_HEALTHBOX, 7, 1); + DoBounceEffect(gActiveBattler, BOUNCE_MON, 7, 1); + EndBounceEffect(gMultiUsePlayerCursor, BOUNCE_HEALTHBOX); } else if (gMain.newKeys & (DPAD_LEFT | DPAD_UP)) { @@ -3030,10 +3030,10 @@ static void PlayerHandleCmd49(void) PlayerBufferExecCompleted(); } -static void PlayerHandleCmd50(void) +static void PlayerHandleEndBounceEffect(void) { - dp11b_obj_free(gActiveBattler, 1); - dp11b_obj_free(gActiveBattler, 0); + EndBounceEffect(gActiveBattler, BOUNCE_HEALTHBOX); + EndBounceEffect(gActiveBattler, BOUNCE_MON); PlayerBufferExecCompleted(); } @@ -3072,8 +3072,8 @@ static void PlayerHandleLinkStandbyMsg(void) PrintLinkStandbyMsg(); // fall through case 1: - dp11b_obj_free(gActiveBattler, 1); - dp11b_obj_free(gActiveBattler, 0); + EndBounceEffect(gActiveBattler, BOUNCE_HEALTHBOX); + EndBounceEffect(gActiveBattler, BOUNCE_MON); break; case 2: PrintLinkStandbyMsg(); diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index df075522e0..17ed1c24f5 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -88,7 +88,7 @@ static void PlayerPartnerHandleIntroSlide(void); static void PlayerPartnerHandleIntroTrainerBallThrow(void); static void PlayerPartnerHandleDrawPartyStatusSummary(void); static void PlayerPartnerHandleCmd49(void); -static void PlayerPartnerHandleCmd50(void); +static void PlayerPartnerHandleEndBounceEffect(void); static void PlayerPartnerHandleSpriteInvisibility(void); static void PlayerPartnerHandleBattleAnimation(void); static void PlayerPartnerHandleLinkStandbyMsg(void); @@ -165,7 +165,7 @@ static void (*const sPlayerPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = PlayerPartnerHandleIntroTrainerBallThrow, PlayerPartnerHandleDrawPartyStatusSummary, PlayerPartnerHandleCmd49, - PlayerPartnerHandleCmd50, + PlayerPartnerHandleEndBounceEffect, PlayerPartnerHandleSpriteInvisibility, PlayerPartnerHandleBattleAnimation, PlayerPartnerHandleLinkStandbyMsg, @@ -1884,7 +1884,7 @@ static void PlayerPartnerHandleCmd49(void) PlayerPartnerBufferExecCompleted(); } -static void PlayerPartnerHandleCmd50(void) +static void PlayerPartnerHandleEndBounceEffect(void) { PlayerPartnerBufferExecCompleted(); } diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 69f93d7e28..9d213fc6bb 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -91,7 +91,7 @@ static void RecordedOpponentHandleIntroSlide(void); static void RecordedOpponentHandleIntroTrainerBallThrow(void); static void RecordedOpponentHandleDrawPartyStatusSummary(void); static void RecordedOpponentHandleCmd49(void); -static void RecordedOpponentHandleCmd50(void); +static void RecordedOpponentHandleEndBounceEffect(void); static void RecordedOpponentHandleSpriteInvisibility(void); static void RecordedOpponentHandleBattleAnimation(void); static void RecordedOpponentHandleLinkStandbyMsg(void); @@ -163,7 +163,7 @@ static void (*const sRecordedOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void RecordedOpponentHandleIntroTrainerBallThrow, RecordedOpponentHandleDrawPartyStatusSummary, RecordedOpponentHandleCmd49, - RecordedOpponentHandleCmd50, + RecordedOpponentHandleEndBounceEffect, RecordedOpponentHandleSpriteInvisibility, RecordedOpponentHandleBattleAnimation, RecordedOpponentHandleLinkStandbyMsg, @@ -1296,7 +1296,7 @@ static void RecordedOpponentHandleFaintAnimation(void) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_OPPONENT); - gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039934; + gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon; gBattlerControllerFuncs[gActiveBattler] = sub_8186D58; } } @@ -1745,7 +1745,7 @@ static void RecordedOpponentHandleCmd49(void) RecordedOpponentBufferExecCompleted(); } -static void RecordedOpponentHandleCmd50(void) +static void RecordedOpponentHandleEndBounceEffect(void) { RecordedOpponentBufferExecCompleted(); } diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index 54ca4578b9..d1836c092c 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -90,7 +90,7 @@ static void RecordedPlayerHandleIntroSlide(void); static void RecordedPlayerHandleIntroTrainerBallThrow(void); static void RecordedPlayerHandleDrawPartyStatusSummary(void); static void RecordedPlayerHandleCmd49(void); -static void RecordedPlayerHandleCmd50(void); +static void RecordedPlayerHandleEndBounceEffect(void); static void RecordedPlayerHandleSpriteInvisibility(void); static void RecordedPlayerHandleBattleAnimation(void); static void RecordedPlayerHandleLinkStandbyMsg(void); @@ -161,7 +161,7 @@ static void (*const sRecordedPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) RecordedPlayerHandleIntroTrainerBallThrow, RecordedPlayerHandleDrawPartyStatusSummary, RecordedPlayerHandleCmd49, - RecordedPlayerHandleCmd50, + RecordedPlayerHandleEndBounceEffect, RecordedPlayerHandleSpriteInvisibility, RecordedPlayerHandleBattleAnimation, RecordedPlayerHandleLinkStandbyMsg, @@ -1767,7 +1767,7 @@ static void RecordedPlayerHandleCmd49(void) RecordedPlayerBufferExecCompleted(); } -static void RecordedPlayerHandleCmd50(void) +static void RecordedPlayerHandleEndBounceEffect(void) { RecordedPlayerBufferExecCompleted(); } diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index 245447d8d0..3cdd952efc 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -81,7 +81,7 @@ static void SafariHandleIntroSlide(void); static void SafariHandleIntroTrainerBallThrow(void); static void SafariHandleDrawPartyStatusSummary(void); static void SafariHandleCmd49(void); -static void SafariHandleCmd50(void); +static void SafariHandleEndBounceEffect(void); static void SafariHandleSpriteInvisibility(void); static void SafariHandleBattleAnimation(void); static void SafariHandleLinkStandbyMsg(void); @@ -145,7 +145,7 @@ static void (*const sSafariBufferCommands[CONTROLLER_CMDS_COUNT])(void) = SafariHandleIntroTrainerBallThrow, SafariHandleDrawPartyStatusSummary, SafariHandleCmd49, - SafariHandleCmd50, + SafariHandleEndBounceEffect, SafariHandleSpriteInvisibility, SafariHandleBattleAnimation, SafariHandleLinkStandbyMsg, @@ -650,7 +650,7 @@ static void SafariHandleCmd49(void) SafariBufferExecCompleted(); } -static void SafariHandleCmd50(void) +static void SafariHandleEndBounceEffect(void) { SafariBufferExecCompleted(); } diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index 955799ee34..05c7b9e1fd 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -91,7 +91,7 @@ static void WallyHandleIntroSlide(void); static void WallyHandleIntroTrainerBallThrow(void); static void WallyHandleDrawPartyStatusSummary(void); static void WallyHandleCmd49(void); -static void WallyHandleCmd50(void); +static void WallyHandleEndBounceEffect(void); static void WallyHandleSpriteInvisibility(void); static void WallyHandleBattleAnimation(void); static void WallyHandleLinkStandbyMsg(void); @@ -160,7 +160,7 @@ static void (*const sWallyBufferCommands[CONTROLLER_CMDS_COUNT])(void) = WallyHandleIntroTrainerBallThrow, WallyHandleDrawPartyStatusSummary, WallyHandleCmd49, - WallyHandleCmd50, + WallyHandleEndBounceEffect, WallyHandleSpriteInvisibility, WallyHandleBattleAnimation, WallyHandleLinkStandbyMsg, @@ -1522,7 +1522,7 @@ static void WallyHandleCmd49(void) WallyBufferExecCompleted(); } -static void WallyHandleCmd50(void) +static void WallyHandleEndBounceEffect(void) { WallyBufferExecCompleted(); } diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 8a7ff7b5d9..1c60e22efd 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -1463,12 +1463,12 @@ void BtlController_EmitCmd49(u8 bufferId) PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 4); } -void BtlController_EmitCmd50(u8 bufferId) +void BtlController_EmitEndBounceEffect(u8 bufferId) { - sBattleBuffersTransferData[0] = CONTROLLER_50; - sBattleBuffersTransferData[1] = CONTROLLER_50; - sBattleBuffersTransferData[2] = CONTROLLER_50; - sBattleBuffersTransferData[3] = CONTROLLER_50; + sBattleBuffersTransferData[0] = CONTROLLER_ENDBOUNCE; + sBattleBuffersTransferData[1] = CONTROLLER_ENDBOUNCE; + sBattleBuffersTransferData[2] = CONTROLLER_ENDBOUNCE; + sBattleBuffersTransferData[3] = CONTROLLER_ENDBOUNCE; PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 4); } diff --git a/src/battle_interface.c b/src/battle_interface.c index 94b5a2be9a..f5e031cb92 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -1483,12 +1483,18 @@ void SwapHpBarsWithHpText(void) } } +#define tBattler data[0] +#define tSummaryBarSpriteId data[1] +#define tBallIconSpriteId(n) data[3 + n] +#define tIsBattleStart data[10] +#define tData15 data[15] + u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, u8 arg2, bool8 isBattleStart) { bool8 isOpponent; s16 bar_X, bar_Y, bar_pos2_X, bar_data0; s32 i, j, var; - u8 barSpriteId; + u8 summaryBarSpriteId; u8 ballIconSpritesIds[PARTY_SIZE]; u8 taskId; @@ -1527,19 +1533,19 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, LoadSpritePalette(&sStatusSummaryBarSpritePal); LoadSpritePalette(&sStatusSummaryBallsSpritePal); - barSpriteId = CreateSprite(&sStatusSummaryBarSpriteTemplates[isOpponent], bar_X, bar_Y, 10); - SetSubspriteTables(&gSprites[barSpriteId], sStatusSummaryBar_SubspriteTable); - gSprites[barSpriteId].pos2.x = bar_pos2_X; - gSprites[barSpriteId].data[0] = bar_data0; + summaryBarSpriteId = CreateSprite(&sStatusSummaryBarSpriteTemplates[isOpponent], bar_X, bar_Y, 10); + SetSubspriteTables(&gSprites[summaryBarSpriteId], sStatusSummaryBar_SubspriteTable); + gSprites[summaryBarSpriteId].pos2.x = bar_pos2_X; + gSprites[summaryBarSpriteId].data[0] = bar_data0; if (isOpponent) { - gSprites[barSpriteId].pos1.x -= 96; - gSprites[barSpriteId].oam.matrixNum = 8; + gSprites[summaryBarSpriteId].pos1.x -= 96; + gSprites[summaryBarSpriteId].oam.matrixNum = 8; } else { - gSprites[barSpriteId].pos1.x += 96; + gSprites[summaryBarSpriteId].pos1.x += 96; } for (i = 0; i < PARTY_SIZE; i++) @@ -1555,7 +1561,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, gSprites[ballIconSpritesIds[i]].pos2.y = 0; } - gSprites[ballIconSpritesIds[i]].data[0] = barSpriteId; + gSprites[ballIconSpritesIds[i]].data[0] = summaryBarSpriteId; if (!isOpponent) { @@ -1672,13 +1678,13 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, } taskId = CreateTask(TaskDummy, 5); - gTasks[taskId].data[0] = battlerId; - gTasks[taskId].data[1] = barSpriteId; + gTasks[taskId].tBattler = battlerId; + gTasks[taskId].tSummaryBarSpriteId = summaryBarSpriteId; for (i = 0; i < PARTY_SIZE; i++) - gTasks[taskId].data[3 + i] = ballIconSpritesIds[i]; + gTasks[taskId].tBallIconSpriteId(i) = ballIconSpritesIds[i]; - gTasks[taskId].data[10] = isBattleStart; + gTasks[taskId].tIsBattleStart = isBattleStart; if (isBattleStart) { @@ -1691,46 +1697,46 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, void sub_8073C30(u8 taskId) { - u8 sp[6]; - u8 r7; + u8 ballIconSpriteIds[PARTY_SIZE]; + bool8 isBattleStart; u8 summaryBarSpriteId; u8 battlerId; s32 i; - r7 = gTasks[taskId].data[10]; - summaryBarSpriteId = gTasks[taskId].data[1]; - battlerId = gTasks[taskId].data[0]; + isBattleStart = gTasks[taskId].tIsBattleStart; + summaryBarSpriteId = gTasks[taskId].tSummaryBarSpriteId; + battlerId = gTasks[taskId].tBattler; for (i = 0; i < 6; i++) - sp[i] = gTasks[taskId].data[3 + i]; + ballIconSpriteIds[i] = gTasks[taskId].tBallIconSpriteId(i); SetGpuReg(REG_OFFSET_BLDCNT, 0x3F40); SetGpuReg(REG_OFFSET_BLDALPHA, 0x10); - gTasks[taskId].data[15] = 16; + gTasks[taskId].tData15 = 16; - for (i = 0; i < 6; i++) - gSprites[sp[i]].oam.objMode = 1; + for (i = 0; i < PARTY_SIZE; i++) + gSprites[ballIconSpriteIds[i]].oam.objMode = 1; gSprites[summaryBarSpriteId].oam.objMode = 1; - if (r7 != 0) + if (isBattleStart) { - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) { if (GetBattlerSide(battlerId) != B_SIDE_PLAYER) { - gSprites[sp[5 - i]].data[1] = 7 * i; - gSprites[sp[5 - i]].data[3] = 0; - gSprites[sp[5 - i]].data[4] = 0; - gSprites[sp[5 - i]].callback = sub_8074158; + gSprites[ballIconSpriteIds[5 - i]].data[1] = 7 * i; + gSprites[ballIconSpriteIds[5 - i]].data[3] = 0; + gSprites[ballIconSpriteIds[5 - i]].data[4] = 0; + gSprites[ballIconSpriteIds[5 - i]].callback = sub_8074158; } else { - gSprites[sp[i]].data[1] = 7 * i; - gSprites[sp[i]].data[3] = 0; - gSprites[sp[i]].data[4] = 0; - gSprites[sp[i]].callback = sub_8074158; + gSprites[ballIconSpriteIds[i]].data[1] = 7 * i; + gSprites[ballIconSpriteIds[i]].data[3] = 0; + gSprites[ballIconSpriteIds[i]].data[4] = 0; + gSprites[ballIconSpriteIds[i]].callback = sub_8074158; } } gSprites[summaryBarSpriteId].data[0] /= 2; @@ -1747,12 +1753,9 @@ void sub_8073C30(u8 taskId) static void sub_8073E08(u8 taskId) { - u16 temp = gTasks[taskId].data[11]++; - - if (!(temp & 1)) + if ((gTasks[taskId].data[11]++ % 2) == 0) { - gTasks[taskId].data[15]--; - if (gTasks[taskId].data[15] < 0) + if (--gTasks[taskId].data[15] < 0) return; SetGpuReg(REG_OFFSET_BLDALPHA, (gTasks[taskId].data[15]) | ((16 - gTasks[taskId].data[15]) << 8)); @@ -1763,36 +1766,35 @@ static void sub_8073E08(u8 taskId) static void sub_8073E64(u8 taskId) { - u8 sp[6]; + u8 ballIconSpriteIds[PARTY_SIZE]; s32 i; - u8 battlerId = gTasks[taskId].data[0]; - gTasks[taskId].data[15]--; - if (gTasks[taskId].data[15] == -1) + u8 battlerId = gTasks[taskId].tBattler; + if (--gTasks[taskId].tData15 == -1) { - u8 summaryBarSpriteId = gTasks[taskId].data[1]; + u8 summaryBarSpriteId = gTasks[taskId].tSummaryBarSpriteId; - for (i = 0; i < 6; i++) - sp[i] = gTasks[taskId].data[3 + i]; + for (i = 0; i < PARTY_SIZE; i++) + ballIconSpriteIds[i] = gTasks[taskId].tBallIconSpriteId(i); gBattleSpritesDataPtr->animationData->field_9_x1C--; - if (!gBattleSpritesDataPtr->animationData->field_9_x1C) + if (gBattleSpritesDataPtr->animationData->field_9_x1C == 0) { DestroySpriteAndFreeResources(&gSprites[summaryBarSpriteId]); - DestroySpriteAndFreeResources(&gSprites[sp[0]]); + DestroySpriteAndFreeResources(&gSprites[ballIconSpriteIds[0]]); } else { FreeSpriteOamMatrix(&gSprites[summaryBarSpriteId]); DestroySprite(&gSprites[summaryBarSpriteId]); - FreeSpriteOamMatrix(&gSprites[sp[0]]); - DestroySprite(&gSprites[sp[0]]); + FreeSpriteOamMatrix(&gSprites[ballIconSpriteIds[0]]); + DestroySprite(&gSprites[ballIconSpriteIds[0]]); } - for (i = 1; i < 6; i++) - DestroySprite(&gSprites[sp[i]]); + for (i = 1; i < PARTY_SIZE; i++) + DestroySprite(&gSprites[ballIconSpriteIds[i]]); } - else if (gTasks[taskId].data[15] == -3) + else if (gTasks[taskId].tData15 == -3) { gBattleSpritesDataPtr->healthBoxesData[battlerId].flag_x1 = 0; SetGpuReg(REG_OFFSET_BLDCNT, 0); @@ -1803,29 +1805,28 @@ static void sub_8073E64(u8 taskId) static void sub_8073F98(u8 taskId) { - u8 sp[6]; + u8 ballIconSpriteIds[PARTY_SIZE]; s32 i; + u8 battlerId = gTasks[taskId].tBattler; - u8 battlerId = gTasks[taskId].data[0]; - gTasks[taskId].data[15]--; - if (gTasks[taskId].data[15] >= 0) + if (--gTasks[taskId].tData15 >= 0) { - SetGpuReg(REG_OFFSET_BLDALPHA, (gTasks[taskId].data[15]) | ((16 - gTasks[taskId].data[15]) << 8)); + SetGpuReg(REG_OFFSET_BLDALPHA, (gTasks[taskId].tData15) | ((16 - gTasks[taskId].tData15) << 8)); } - else if (gTasks[taskId].data[15] == -1) + else if (gTasks[taskId].tData15 == -1) { - u8 summaryBarSpriteId = gTasks[taskId].data[1]; + u8 summaryBarSpriteId = gTasks[taskId].tSummaryBarSpriteId; - for (i = 0; i < 6; i++) - sp[i] = gTasks[taskId].data[3 + i]; + for (i = 0; i < PARTY_SIZE; i++) + ballIconSpriteIds[i] = gTasks[taskId].tBallIconSpriteId(i); DestroySpriteAndFreeResources(&gSprites[summaryBarSpriteId]); - DestroySpriteAndFreeResources(&gSprites[sp[0]]); + DestroySpriteAndFreeResources(&gSprites[ballIconSpriteIds[0]]); - for (i = 1; i < 6; i++) - DestroySprite(&gSprites[sp[i]]); + for (i = 1; i < PARTY_SIZE; i++) + DestroySprite(&gSprites[ballIconSpriteIds[i]]); } - else if (gTasks[taskId].data[15] == -3) + else if (gTasks[taskId].tData15 == -3) { gBattleSpritesDataPtr->healthBoxesData[battlerId].flag_x1 = 0; SetGpuReg(REG_OFFSET_BLDCNT, 0); @@ -1834,6 +1835,12 @@ static void sub_8073F98(u8 taskId) } } +#undef tBattler +#undef tSummaryBarSpriteId +#undef tBallIconSpriteId +#undef tIsBattleStart +#undef tData15 + static void SpriteCB_StatusSummaryBar(struct Sprite *sprite) { if (sprite->pos2.x != 0) @@ -2253,8 +2260,8 @@ void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elem } } -#define EXPBAR_PIXELS 64 -#define HEALTHBAR_PIXELS 48 +#define B_EXPBAR_PIXELS 64 +#define B_HEALTHBAR_PIXELS 48 s32 MoveBattleBar(u8 battlerId, u8 healthboxSpriteId, u8 whichBar, u8 unused) { @@ -2266,7 +2273,7 @@ s32 MoveBattleBar(u8 battlerId, u8 healthboxSpriteId, u8 whichBar, u8 unused) gBattleSpritesDataPtr->battleBars[battlerId].oldValue, gBattleSpritesDataPtr->battleBars[battlerId].receivedValue, &gBattleSpritesDataPtr->battleBars[battlerId].currValue, - HEALTHBAR_PIXELS / 8, 1); + B_HEALTHBAR_PIXELS / 8, 1); } else // exp bar { @@ -2281,7 +2288,7 @@ s32 MoveBattleBar(u8 battlerId, u8 healthboxSpriteId, u8 whichBar, u8 unused) gBattleSpritesDataPtr->battleBars[battlerId].oldValue, gBattleSpritesDataPtr->battleBars[battlerId].receivedValue, &gBattleSpritesDataPtr->battleBars[battlerId].currValue, - EXPBAR_PIXELS / 8, expFraction); + B_EXPBAR_PIXELS / 8, expFraction); } if (whichBar == EXP_BAR || (whichBar == HEALTH_BAR && !gBattleSpritesDataPtr->battlerData[battlerId].hpNumbersNoBars)) @@ -2307,11 +2314,11 @@ static void MoveBattleBarGraphically(u8 battlerId, u8 whichBar) gBattleSpritesDataPtr->battleBars[battlerId].oldValue, gBattleSpritesDataPtr->battleBars[battlerId].receivedValue, &gBattleSpritesDataPtr->battleBars[battlerId].currValue, - array, HEALTHBAR_PIXELS / 8); + array, B_HEALTHBAR_PIXELS / 8); - if (filledPixelsCount > (HEALTHBAR_PIXELS * 50 / 100)) // more than 50 % hp + if (filledPixelsCount > (B_HEALTHBAR_PIXELS * 50 / 100)) // more than 50 % hp barElementId = HEALTHBOX_GFX_HP_BAR_GREEN; - else if (filledPixelsCount > (HEALTHBAR_PIXELS * 20 / 100)) // more than 20% hp + else if (filledPixelsCount > (B_HEALTHBAR_PIXELS * 20 / 100)) // more than 20% hp barElementId = HEALTHBOX_GFX_HP_BAR_YELLOW; else barElementId = HEALTHBOX_GFX_HP_BAR_RED; // 20 % or less @@ -2332,7 +2339,7 @@ static void MoveBattleBarGraphically(u8 battlerId, u8 whichBar) gBattleSpritesDataPtr->battleBars[battlerId].oldValue, gBattleSpritesDataPtr->battleBars[battlerId].receivedValue, &gBattleSpritesDataPtr->battleBars[battlerId].currValue, - array, EXPBAR_PIXELS / 8); + array, B_EXPBAR_PIXELS / 8); level = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_LEVEL); if (level == MAX_MON_LEVEL) { @@ -2360,7 +2367,7 @@ static s32 CalcNewBarValue(s32 maxValue, s32 oldValue, s32 receivedValue, s32 *c if (*currValue == -32768) // first function call { if (maxValue < scale) - *currValue = oldValue << 8; + *currValue = Q_24_8(oldValue); else *currValue = oldValue; } @@ -2373,9 +2380,7 @@ static s32 CalcNewBarValue(s32 maxValue, s32 oldValue, s32 receivedValue, s32 *c if (maxValue < scale) { - s32 var = *currValue >> 8; - - if (newValue == var && (*currValue & 0xFF) == 0) + if (newValue == Q_24_8_TO_INT(*currValue) && (*currValue & 0xFF) == 0) return -1; } else @@ -2386,27 +2391,28 @@ static s32 CalcNewBarValue(s32 maxValue, s32 oldValue, s32 receivedValue, s32 *c if (maxValue < scale) // handle cases of max var having less pixels than the whole bar { - s32 var = (maxValue << 8) / scale; + s32 toAdd = Q_24_8(maxValue) / scale; if (receivedValue < 0) // fill bar right { - *currValue += var; - ret = *currValue >> 8; + *currValue += toAdd; + ret = Q_24_8_TO_INT(*currValue); if (ret >= newValue) { - *currValue = newValue << 8; + *currValue = Q_24_8(newValue); ret = newValue; } } else // move bar left { - *currValue -= var; - ret = *currValue >> 8; + *currValue -= toAdd; + ret = Q_24_8_TO_INT(*currValue); + // try round up if ((*currValue & 0xFF) > 0) ret++; if (ret <= newValue) { - *currValue = newValue << 8; + *currValue = Q_24_8(newValue); ret = newValue; } } @@ -2480,34 +2486,35 @@ static u8 CalcBarFilledPixels(s32 maxValue, s32 oldValue, s32 receivedValue, s32 return filledPixels; } -static s16 sub_8074F28(struct TestingBar *barInfo, s32 *arg1, u16 *arg2, s32 arg3) +// These two functions seem as if they were made for testing the health bar. +static s16 sub_8074F28(struct TestingBar *barInfo, s32 *currValue, u16 *arg2, s32 arg3) { s16 ret, var; ret = CalcNewBarValue(barInfo->maxValue, barInfo->oldValue, barInfo->receivedValue, - arg1, 6, 1); - sub_8074F88(barInfo, arg1, arg2); + currValue, B_HEALTHBAR_PIXELS / 8, 1); + sub_8074F88(barInfo, currValue, arg2); - if (barInfo->maxValue < HEALTHBAR_PIXELS) - var = *arg1 >> 8; + if (barInfo->maxValue < B_HEALTHBAR_PIXELS) + var = *currValue >> 8; else - var = *arg1; + var = *currValue; DummiedOutFunction(barInfo->maxValue, var, arg3); return ret; } -static void sub_8074F88(struct TestingBar *barInfo, s32 *arg1, u16 *arg2) +static void sub_8074F88(struct TestingBar *barInfo, s32 *currValue, u16 *arg2) { u8 sp8[6]; u16 sp10[6]; u8 i; CalcBarFilledPixels(barInfo->maxValue, barInfo->oldValue, - barInfo->receivedValue, arg1, sp8, 6); + barInfo->receivedValue, currValue, sp8, B_HEALTHBAR_PIXELS / 8); for (i = 0; i < 6; i++) sp10[i] = (barInfo->unkC_0 << 12) | (barInfo->unk10 + sp8[i]); @@ -2547,7 +2554,7 @@ u8 GetScaledHPFraction(s16 hp, s16 maxhp, u8 scale) u8 GetHPBarLevel(s16 hp, s16 maxhp) { - s32 result; + u8 result; if (hp == maxhp) { @@ -2555,10 +2562,10 @@ u8 GetHPBarLevel(s16 hp, s16 maxhp) } else { - u8 fraction = GetScaledHPFraction(hp, maxhp, 48); - if (fraction > 24) + u8 fraction = GetScaledHPFraction(hp, maxhp, B_HEALTHBAR_PIXELS); + if (fraction > (B_HEALTHBAR_PIXELS * 50 / 100)) // more than 50 % hp result = HP_BAR_GREEN; - else if (fraction > 9) + else if (fraction > (B_HEALTHBAR_PIXELS * 20 / 100)) // more than 20% hp result = HP_BAR_YELLOW; else if (fraction > 0) result = HP_BAR_RED; diff --git a/src/battle_main.c b/src/battle_main.c index 2d24d0dabb..9afbc7f403 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -41,6 +41,7 @@ #include "pokedex.h" #include "constants/abilities.h" #include "constants/moves.h" +#include "constants/rgb.h" #include "evolution_scene.h" #include "roamer.h" #include "tv.h" @@ -137,13 +138,13 @@ static void sub_803980C(struct Sprite *sprite); static void sub_8039838(struct Sprite *sprite); static void sub_8039894(struct Sprite *sprite); static void sub_80398D0(struct Sprite *sprite); -static void sub_8039A48(struct Sprite *sprite); +static void SpriteCB_AnimFaintOpponent(struct Sprite *sprite); static void sub_8039AF4(struct Sprite *sprite); static void SpriteCallbackDummy_3(struct Sprite *sprite); static void oac_poke_ally_(struct Sprite *sprite); static void SpecialStatusesClear(void); static void TurnValuesCleanUp(bool8 var0); -static void SpriteCB_HealthBoxBounce(struct Sprite *sprite); +static void SpriteCB_BounceEffect(struct Sprite *sprite); static void BattleStartClearSetData(void); static void BattleIntroGetMonsData(void); static void BattleIntroPrepareBackgroundSlide(void); @@ -183,7 +184,7 @@ static void HandleAction_SafariZoneBallThrow(void); static void HandleAction_ThrowPokeblock(void); static void HandleAction_GoNear(void); static void HandleAction_SafriZoneRun(void); -static void HandleAction_Action9(void); +static void HandleAction_WallyBallThrow(void); static void HandleAction_Action11(void); static void HandleAction_NothingIsFainted(void); static void HandleAction_ActionFinished(void); @@ -515,7 +516,7 @@ static void (* const sTurnActionsFuncsTable[])(void) = HandleAction_ThrowPokeblock, // B_ACTION_SAFARI_POKEBLOCK HandleAction_GoNear, // B_ACTION_SAFARI_GO_NEAR HandleAction_SafriZoneRun, // B_ACTION_SAFARI_RUN - HandleAction_Action9, // B_ACTION_UNKNOWN9 + HandleAction_WallyBallThrow, // B_ACTION_WALLY_THROW HandleAction_RunBattleScript, // B_ACTION_EXEC_SCRIPT HandleAction_Action11, // not sure about this one HandleAction_ActionFinished, // B_ACTION_FINISHED @@ -532,7 +533,7 @@ static void (* const sEndTurnFuncsTable[])(void) = HandleEndTurn_FinishBattle, // B_OUTCOME_PLAYER_TELEPORTED HandleEndTurn_MonFled, // B_OUTCOME_MON_FLED HandleEndTurn_FinishBattle, // B_OUTCOME_CAUGHT - HandleEndTurn_FinishBattle, // battle outcome 8 + HandleEndTurn_FinishBattle, // B_OUTCOME_NO_SAFARI_BALLS HandleEndTurn_FinishBattle, // B_OUTCOME_FORFEITED HandleEndTurn_FinishBattle, // B_OUTCOME_MON_TELEPORTED }; @@ -678,7 +679,7 @@ static void CB2_InitBattleInternal(void) gMain.inBattle = TRUE; gSaveBlock2Ptr->field_CA9_b = 0; - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) AdjustFriendship(&gPlayerParty[i], 3); gBattleCommunication[MULTIUSE_STATE] = 0; @@ -739,7 +740,7 @@ static void SetPlayerBerryDataInBattleStruct(void) } else { - const struct Berry* berryData = GetBerryInfo(ItemIdToBerryType(ITEM_ENIGMA_BERRY)); + const struct Berry *berryData = GetBerryInfo(ItemIdToBerryType(ITEM_ENIGMA_BERRY)); for (i = 0; i < BERRY_NAME_COUNT - 1; i++) battleBerry->name[i] = berryData->name[i]; @@ -783,7 +784,7 @@ static void SetAllPlayersBerryData(void) } else { - const struct Berry* berryData = GetBerryInfo(ItemIdToBerryType(ITEM_ENIGMA_BERRY)); + const struct Berry *berryData = GetBerryInfo(ItemIdToBerryType(ITEM_ENIGMA_BERRY)); for (i = 0; i < BERRY_NAME_COUNT - 1; i++) { @@ -809,7 +810,7 @@ static void SetAllPlayersBerryData(void) { s32 numPlayers; struct BattleEnigmaBerry *src; - u8 r4; + u8 battlerId; if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { @@ -821,17 +822,17 @@ static void SetAllPlayersBerryData(void) for (i = 0; i < numPlayers; i++) { src = (struct BattleEnigmaBerry *)(gBlockRecvBuffer[i] + 2); - r4 = gLinkPlayers[i].lp_field_18; + battlerId = gLinkPlayers[i].lp_field_18; for (j = 0; j < BERRY_NAME_COUNT - 1; j++) - gEnigmaBerries[r4].name[j] = src->name[j]; - gEnigmaBerries[r4].name[j] = EOS; + gEnigmaBerries[battlerId].name[j] = src->name[j]; + gEnigmaBerries[battlerId].name[j] = EOS; for (j = 0; j < BERRY_ITEM_EFFECT_COUNT; j++) - gEnigmaBerries[r4].itemEffect[j] = src->itemEffect[j]; + gEnigmaBerries[battlerId].itemEffect[j] = src->itemEffect[j]; - gEnigmaBerries[r4].holdEffect = src->holdEffect; - gEnigmaBerries[r4].holdEffectParam = src->holdEffectParam; + gEnigmaBerries[battlerId].holdEffect = src->holdEffect; + gEnigmaBerries[battlerId].holdEffectParam = src->holdEffectParam; } } else @@ -1382,7 +1383,7 @@ static void CB2_PreInitMultiBattle(void) u8 playerMultiplierId; s32 numPlayers = 4; u8 r4 = 0xF; - u32* savedBattleTypeFlags; + u32 *savedBattleTypeFlags; void (**savedCallback)(void); if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER) @@ -1476,7 +1477,7 @@ static void CB2_PreInitMultiBattle(void) static void CB2_PreInitIngamePlayerPartnerBattle(void) { - u32* savedBattleTypeFlags; + u32 *savedBattleTypeFlags; void (**savedCallback)(void); savedCallback = &gBattleStruct->savedCallback; @@ -1819,7 +1820,7 @@ void BattleMainCB2(void) { gSpecialVar_Result = gBattleOutcome = B_OUTCOME_PLAYER_TELEPORTED; ResetPaletteFadeControl(); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(-1, 0, 0, 0x10, RGB_BLACK); SetMainCallback2(CB2_QuitRecordedBattle); } } @@ -2026,7 +2027,7 @@ void sub_8038A04(void) // unused void VBlankCB_Battle(void) { - // change gRngSeed every vblank unless the battle could be recorded + // Change gRngSeed every vblank unless the battle could be recorded. if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_RECORDED))) Random(); @@ -2192,7 +2193,7 @@ void sub_8038D64(void) } for (i = 80; i < 160; i++) { - asm(""::"r"(i)); // Needed to stop the compiler from optimizing out the loop counter + asm(""::"r"(i)); // Needed to stop the compiler from optimizing out the loop counter. gScanlineEffectRegBuffers[0][i] = 0xFF10; gScanlineEffectRegBuffers[1][i] = 0xFF10; } @@ -2255,7 +2256,7 @@ static void sub_8038F34(void) case 1: if (--gBattleCommunication[1] == 0) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(-1, 0, 0, 0x10, RGB_BLACK); gBattleCommunication[MULTIUSE_STATE]++; } break; @@ -2312,7 +2313,7 @@ static void sub_8038F34(void) for (i = 0; i < 2; i++) LoadChosenBattleElement(i); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(-1, 0, 0x10, 0, RGB_BLACK); gBattleCommunication[MULTIUSE_STATE]++; break; case 4: @@ -2417,7 +2418,7 @@ static void sub_80392A8(void) gReservedSpritePaletteCount = 4; SetVBlankCallback(VBlankCB_Battle); SetMainCallback2(sub_803937C); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(-1, 0, 0x10, 0, RGB_BLACK); gBattleCommunication[MULTIUSE_STATE] = 0; } @@ -2577,7 +2578,7 @@ static void sub_803939C(void) { if (sub_800A520() == TRUE) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(-1, 0, 0, 0x10, RGB_BLACK); gBattleCommunication[1] = 0x20; gBattleCommunication[MULTIUSE_STATE] = 8; } @@ -2585,7 +2586,7 @@ static void sub_803939C(void) } else { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(-1, 0, 0, 0x10, RGB_BLACK); gBattleCommunication[1] = 0x20; gBattleCommunication[MULTIUSE_STATE] = 8; } @@ -2620,7 +2621,7 @@ void oac_poke_opponent(struct Sprite *sprite) { sprite->callback = sub_803980C; StartSpriteAnimIfDifferent(sprite, 0); - BeginNormalPaletteFade(0x20000, 0, 10, 10, 0x2108); + BeginNormalPaletteFade(0x20000, 0, 10, 10, RGB(8, 8, 8)); } static void sub_803980C(struct Sprite *sprite) @@ -2643,7 +2644,7 @@ static void sub_8039838(struct Sprite *sprite) SetHealthboxSpriteVisible(gHealthboxSpriteIds[sprite->sBattler]); sprite->callback = sub_8039894; StartSpriteAnimIfDifferent(sprite, 0); - BeginNormalPaletteFade(0x20000, 0, 10, 0, 0x2108); + BeginNormalPaletteFade(0x20000, 0, 10, 0, RGB(8, 8, 8)); } } @@ -2687,7 +2688,7 @@ static void sub_80398D0(struct Sprite *sprite) extern const struct MonCoords gMonFrontPicCoords[]; extern const struct MonCoords gCastformFrontSpriteCoords[]; -void sub_8039934(struct Sprite *sprite) +void SpriteCB_FaintOpponentMon(struct Sprite *sprite) { u8 battler = sprite->sBattler; u16 species; @@ -2698,7 +2699,7 @@ void sub_8039934(struct Sprite *sprite) else species = sprite->sSpeciesId; - GetMonData(&gEnemyParty[gBattlerPartyIndexes[battler]], MON_DATA_PERSONALITY); // Unused return value + GetMonData(&gEnemyParty[gBattlerPartyIndexes[battler]], MON_DATA_PERSONALITY); // Unused return value. if (species == SPECIES_UNOWN) { @@ -2707,9 +2708,9 @@ void sub_8039934(struct Sprite *sprite) u16 unownSpecies; if (unownForm == 0) - unownSpecies = SPECIES_UNOWN; // Use the A Unown form + unownSpecies = SPECIES_UNOWN; // Use the A Unown form. else - unownSpecies = NUM_SPECIES + unownForm; // Use one of the other Unown letters + unownSpecies = NUM_SPECIES + unownForm; // Use one of the other Unown letters. yOffset = gMonFrontPicCoords[unownSpecies].y_offset; } @@ -2728,25 +2729,23 @@ void sub_8039934(struct Sprite *sprite) sprite->data[3] = 8 - yOffset / 8; sprite->data[4] = 1; - sprite->callback = sub_8039A48; + sprite->callback = SpriteCB_AnimFaintOpponent; } -static void sub_8039A48(struct Sprite *sprite) +static void SpriteCB_AnimFaintOpponent(struct Sprite *sprite) { s32 i; - sprite->data[4]--; - if (sprite->data[4] == 0) + if (--sprite->data[4] == 0) { sprite->data[4] = 2; - sprite->pos2.y += 8; - sprite->data[3]--; - if (sprite->data[3] < 0) + sprite->pos2.y += 8; // Move the sprite down. + if (--sprite->data[3] < 0) { FreeSpriteOamMatrix(sprite); DestroySprite(sprite); } - else + else // Erase bottom part of the sprite to create a smooth illusion of mon falling down. { u8 *dst = (u8 *)gMonSpritesGfxPtr->sprites[GetBattlerPosition(sprite->sBattler)] + (gBattleMonForms[sprite->sBattler] << 11) + (sprite->data[3] << 8); @@ -2831,85 +2830,100 @@ void sub_8039C00(struct Sprite *sprite) } } -void dp11b_obj_instanciate(u8 battler, u8 b, s8 c, s8 d) +#define sSinIndex data[0] +#define sDelta data[1] +#define sAmplitude data[2] +#define sBouncerSpriteId data[3] +#define sWhich data[4] + +void DoBounceEffect(u8 battler, u8 which, s8 delta, s8 amplitude) { - u8 bounceHealthBoxSpriteId; - u8 spriteId2; + u8 invisibleSpriteId; + u8 bouncerSpriteId; - if (b) + switch (which) { - if (gBattleSpritesDataPtr->healthBoxesData[battler].flag_x2) + case BOUNCE_HEALTHBOX: + default: + if (gBattleSpritesDataPtr->healthBoxesData[battler].healthboxIsBouncing) return; + break; + case BOUNCE_MON: + if (gBattleSpritesDataPtr->healthBoxesData[battler].battlerIsBouncing) + return; + break; + } + + invisibleSpriteId = CreateInvisibleSpriteWithCallback(SpriteCB_BounceEffect); + if (which == BOUNCE_HEALTHBOX) + { + bouncerSpriteId = gHealthboxSpriteIds[battler]; + gBattleSpritesDataPtr->healthBoxesData[battler].healthboxBounceSpriteId = invisibleSpriteId; + gBattleSpritesDataPtr->healthBoxesData[battler].healthboxIsBouncing = 1; + gSprites[invisibleSpriteId].sSinIndex = 128; // 0 } else { - if (gBattleSpritesDataPtr->healthBoxesData[battler].flag_x4) - return; + bouncerSpriteId = gBattlerSpriteIds[battler]; + gBattleSpritesDataPtr->healthBoxesData[battler].battlerBounceSpriteId = invisibleSpriteId; + gBattleSpritesDataPtr->healthBoxesData[battler].battlerIsBouncing = 1; + gSprites[invisibleSpriteId].sSinIndex = 192; // -1 } - - bounceHealthBoxSpriteId = CreateInvisibleSpriteWithCallback(SpriteCB_HealthBoxBounce); - if (b == TRUE) - { - spriteId2 = gHealthboxSpriteIds[battler]; - gBattleSpritesDataPtr->healthBoxesData[battler].field_2 = bounceHealthBoxSpriteId; - gBattleSpritesDataPtr->healthBoxesData[battler].flag_x2 = 1; - gSprites[bounceHealthBoxSpriteId].data[0] = 0x80; - } - else - { - spriteId2 = gBattlerSpriteIds[battler]; - gBattleSpritesDataPtr->healthBoxesData[battler].field_3 = bounceHealthBoxSpriteId; - gBattleSpritesDataPtr->healthBoxesData[battler].flag_x4 = 1; - gSprites[bounceHealthBoxSpriteId].data[0] = 0xC0; - } - gSprites[bounceHealthBoxSpriteId].data[1] = c; - gSprites[bounceHealthBoxSpriteId].data[2] = d; - gSprites[bounceHealthBoxSpriteId].data[3] = spriteId2; - gSprites[bounceHealthBoxSpriteId].data[4] = b; - gSprites[spriteId2].pos2.x = 0; - gSprites[spriteId2].pos2.y = 0; + gSprites[invisibleSpriteId].sDelta = delta; + gSprites[invisibleSpriteId].sAmplitude = amplitude; + gSprites[invisibleSpriteId].sBouncerSpriteId = bouncerSpriteId; + gSprites[invisibleSpriteId].sWhich = which; + gSprites[bouncerSpriteId].pos2.x = 0; + gSprites[bouncerSpriteId].pos2.y = 0; } -void dp11b_obj_free(u8 battler, bool8 b) +void EndBounceEffect(u8 battler, u8 which) { - u8 r4; + u8 bouncerSpriteId; - if (b == TRUE) + if (which == BOUNCE_HEALTHBOX) { - if (!gBattleSpritesDataPtr->healthBoxesData[battler].flag_x2) + if (!gBattleSpritesDataPtr->healthBoxesData[battler].healthboxIsBouncing) return; - r4 = gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].field_2].data[3]; - DestroySprite(&gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].field_2]); - gBattleSpritesDataPtr->healthBoxesData[battler].flag_x2 = 0; + bouncerSpriteId = gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].healthboxBounceSpriteId].sBouncerSpriteId; + DestroySprite(&gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].healthboxBounceSpriteId]); + gBattleSpritesDataPtr->healthBoxesData[battler].healthboxIsBouncing = 0; } else { - if (!gBattleSpritesDataPtr->healthBoxesData[battler].flag_x4) + if (!gBattleSpritesDataPtr->healthBoxesData[battler].battlerIsBouncing) return; - r4 = gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].field_3].data[3]; - DestroySprite(&gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].field_3]); - gBattleSpritesDataPtr->healthBoxesData[battler].flag_x4 = 0; + bouncerSpriteId = gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].battlerBounceSpriteId].sBouncerSpriteId; + DestroySprite(&gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].battlerBounceSpriteId]); + gBattleSpritesDataPtr->healthBoxesData[battler].battlerIsBouncing = 0; } - gSprites[r4].pos2.x = 0; - gSprites[r4].pos2.y = 0; + + gSprites[bouncerSpriteId].pos2.x = 0; + gSprites[bouncerSpriteId].pos2.y = 0; } -static void SpriteCB_HealthBoxBounce(struct Sprite *sprite) +static void SpriteCB_BounceEffect(struct Sprite *sprite) { - u8 spriteId = sprite->data[3]; - s32 var; + u8 bouncerSpriteId = sprite->sBouncerSpriteId; + s32 index; - if (sprite->data[4] == 1) - var = sprite->data[0]; + if (sprite->sWhich == BOUNCE_HEALTHBOX) + index = sprite->sSinIndex; else - var = sprite->data[0]; + index = sprite->sSinIndex; - gSprites[spriteId].pos2.y = Sin(var, sprite->data[2]) + sprite->data[2]; - sprite->data[0] = (sprite->data[0] + sprite->data[1]) & 0xFF; + gSprites[bouncerSpriteId].pos2.y = Sin(index, sprite->sAmplitude) + sprite->sAmplitude; + sprite->sSinIndex = (sprite->sSinIndex + sprite->sDelta) & 0xFF; } +#undef sSinIndex +#undef sDelta +#undef sAmplitude +#undef sBouncerSpriteId +#undef sWhich + void sub_8039E44(struct Sprite *sprite) { if (sprite->affineAnimEnded) @@ -4272,7 +4286,7 @@ static void HandleTurnActionSelectionState(void) if (gBattleMons[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))].status2 & STATUS2_MULTIPLETURNS || gBattleMons[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))].status2 & STATUS2_RECHARGE) { - BtlController_EmitCmd50(0); + BtlController_EmitEndBounceEffect(0); MarkBattlerForControllerExec(gActiveBattler); return; } @@ -4300,7 +4314,7 @@ static void HandleTurnActionSelectionState(void) { RecordedBattle_ClearBattlerAction(GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler))), 3); } - BtlController_EmitCmd50(0); + BtlController_EmitEndBounceEffect(0); MarkBattlerForControllerExec(gActiveBattler); return; } @@ -4439,7 +4453,7 @@ static void HandleTurnActionSelectionState(void) gHitMarker |= HITMARKER_RUN; gBattleCommunication[gActiveBattler]++; break; - case B_ACTION_UNKNOWN9: + case B_ACTION_WALLY_THROW: gBattleCommunication[gActiveBattler]++; break; } @@ -5776,7 +5790,7 @@ static void HandleAction_SafriZoneRun(void) gBattleOutcome = B_OUTCOME_RAN; } -static void HandleAction_Action9(void) +static void HandleAction_WallyBallThrow(void) { gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber]; gBattle_BG0_X = 0; diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index b0388e9712..78b615407c 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -38,7 +38,7 @@ struct HallofFameMon struct HallofFameTeam { - struct HallofFameMon mon[6]; + struct HallofFameMon mon[PARTY_SIZE]; }; struct HofGfx From 89d35e82a27c7328bf5987b4993b3456bb78f440 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:41:17 -0500 Subject: [PATCH 26/55] Move 'map attributes' into 'layouts' --- Makefile | 2 +- data/layouts.inc | 441 + .../AbandonedShip_CaptainsOffice/border.bin | 0 .../AbandonedShip_CaptainsOffice/layout.inc | 16 + .../AbandonedShip_CaptainsOffice/map.bin | Bin .../AbandonedShip_Corridors_1F/border.bin | 0 .../AbandonedShip_Corridors_1F/layout.inc | 16 + .../AbandonedShip_Corridors_1F/map.bin | 0 .../AbandonedShip_Corridors_B1F/border.bin | 0 .../AbandonedShip_Corridors_B1F/layout.inc | 16 + .../AbandonedShip_Corridors_B1F/map.bin | 0 .../AbandonedShip_Deck/border.bin | 0 data/layouts/AbandonedShip_Deck/layout.inc | 16 + .../AbandonedShip_Deck/map.bin | 0 .../border.bin | 0 .../layout.inc | 16 + .../map.bin | 0 .../AbandonedShip_HiddenFloorRooms/border.bin | 0 .../AbandonedShip_HiddenFloorRooms/layout.inc | 16 + .../AbandonedShip_HiddenFloorRooms/map.bin | 0 .../AbandonedShip_Room_B1F/border.bin | 0 .../layouts/AbandonedShip_Room_B1F/layout.inc | 16 + .../AbandonedShip_Room_B1F/map.bin | 0 .../AbandonedShip_Rooms2_1F/border.bin | 0 .../AbandonedShip_Rooms2_1F/layout.inc | 16 + .../AbandonedShip_Rooms2_1F/map.bin | 0 .../AbandonedShip_Rooms2_B1F/border.bin | 0 .../AbandonedShip_Rooms2_B1F/layout.inc | 16 + .../AbandonedShip_Rooms2_B1F/map.bin | 0 .../AbandonedShip_Rooms_1F/border.bin | 0 .../layouts/AbandonedShip_Rooms_1F/layout.inc | 16 + .../AbandonedShip_Rooms_1F/map.bin | 0 .../AbandonedShip_Rooms_B1F/border.bin | 0 .../AbandonedShip_Rooms_B1F/layout.inc | 16 + .../AbandonedShip_Rooms_B1F/map.bin | 0 .../AbandonedShip_Underwater1/border.bin | 0 .../AbandonedShip_Underwater1/layout.inc | 16 + .../AbandonedShip_Underwater1/map.bin | 0 .../AbandonedShip_Underwater2/border.bin | 0 .../AbandonedShip_Underwater2/layout.inc | 16 + .../AbandonedShip_Underwater2/map.bin | 0 .../{maps => layouts}/AlteringCave/border.bin | 0 data/layouts/AlteringCave/layout.inc | 16 + data/{maps => layouts}/AlteringCave/map.bin | 0 data/{maps => layouts}/AncientTomb/border.bin | 0 data/layouts/AncientTomb/layout.inc | 16 + data/{maps => layouts}/AncientTomb/map.bin | Bin .../AquaHideout_1F/border.bin | 0 data/layouts/AquaHideout_1F/layout.inc | 16 + data/{maps => layouts}/AquaHideout_1F/map.bin | 0 .../AquaHideout_B1F/border.bin | 0 data/layouts/AquaHideout_B1F/layout.inc | 16 + .../{maps => layouts}/AquaHideout_B1F/map.bin | 0 .../AquaHideout_B2F/border.bin | 0 data/layouts/AquaHideout_B2F/layout.inc | 16 + .../{maps => layouts}/AquaHideout_B2F/map.bin | 0 .../AquaHideout_UnusedRubyMap1/border.bin | 0 .../AquaHideout_UnusedRubyMap1/layout.inc | 16 + .../AquaHideout_UnusedRubyMap1/map.bin | Bin .../AquaHideout_UnusedRubyMap2/border.bin | 0 .../AquaHideout_UnusedRubyMap2/layout.inc | 16 + .../AquaHideout_UnusedRubyMap2/map.bin | 0 .../AquaHideout_UnusedRubyMap3/border.bin | 0 .../AquaHideout_UnusedRubyMap3/layout.inc | 16 + .../AquaHideout_UnusedRubyMap3/map.bin | 0 .../ArtisanCave_1F/border.bin | 0 data/layouts/ArtisanCave_1F/layout.inc | 16 + data/{maps => layouts}/ArtisanCave_1F/map.bin | 0 .../ArtisanCave_B1F/border.bin | 0 data/layouts/ArtisanCave_B1F/layout.inc | 16 + .../{maps => layouts}/ArtisanCave_B1F/map.bin | 0 .../BattleElevator}/border.bin | Bin data/layouts/BattleElevator/layout.inc | 16 + .../BattleElevator}/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../BattleFrontier_BattleArenaLobby/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../BattleFrontier_BattleDomeCorridor/map.bin | 0 .../border.bin | Bin .../BattleFrontier_BattleDomeLobby/layout.inc | 16 + .../BattleFrontier_BattleDomeLobby/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | Bin .../border.bin | Bin .../layout.inc | 16 + .../map.bin | Bin .../border.bin | Bin .../layout.inc | 16 + .../BattleFrontier_BattleFactoryLobby/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | Bin .../border.bin | Bin .../layout.inc | 16 + .../BattleFrontier_BattlePalaceLobby/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../BattleFrontier_BattlePikeCorridor/map.bin | 0 .../border.bin | Bin .../BattleFrontier_BattlePikeLobby/layout.inc | 16 + .../BattleFrontier_BattlePikeLobby/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../BattleFrontier_BattlePyramidLobby/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../BattleFrontier_BattlePyramidTop/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | Bin .../border.bin | Bin .../layout.inc | 16 + .../map.bin | Bin .../border.bin | Bin .../layout.inc | 16 + .../BattleFrontier_BattleTowerLobby/map.bin | Bin .../border.bin | Bin .../layout.inc | 16 + .../map.bin | Bin .../BattleFrontier_Lounge1/border.bin | Bin .../layouts/BattleFrontier_Lounge1/layout.inc | 16 + .../BattleFrontier_Lounge1}/map.bin | 0 .../BattleFrontier_Lounge2/border.bin | Bin .../layouts/BattleFrontier_Lounge2/layout.inc | 16 + .../BattleFrontier_Lounge2}/map.bin | 0 .../BattleFrontier_OutsideEast/border.bin | 0 .../BattleFrontier_OutsideEast/layout.inc | 16 + .../BattleFrontier_OutsideEast/map.bin | Bin .../BattleFrontier_OutsideWest/border.bin | 0 .../BattleFrontier_OutsideWest/layout.inc | 16 + .../BattleFrontier_OutsideWest/map.bin | Bin .../BattleFrontier_RankingHall/border.bin | Bin .../BattleFrontier_RankingHall/layout.inc | 16 + .../BattleFrontier_RankingHall/map.bin | 0 .../BattleFrontier_ReceptionGate/border.bin | Bin .../BattleFrontier_ReceptionGate/layout.inc | 16 + .../BattleFrontier_ReceptionGate/map.bin | Bin .../BattleFrontier_ScottsHouse/border.bin | Bin .../BattleFrontier_ScottsHouse/layout.inc | 16 + .../BattleFrontier_ScottsHouse/map.bin | 0 .../BattlePyramidSquare01/border.bin | Bin data/layouts/BattlePyramidSquare01/layout.inc | 16 + .../BattlePyramidSquare01/map.bin | 0 .../BattlePyramidSquare02/border.bin | Bin data/layouts/BattlePyramidSquare02/layout.inc | 16 + .../BattlePyramidSquare02/map.bin | 0 .../BattlePyramidSquare03/border.bin | Bin data/layouts/BattlePyramidSquare03/layout.inc | 16 + .../BattlePyramidSquare03/map.bin | 0 .../BattlePyramidSquare04/border.bin | Bin data/layouts/BattlePyramidSquare04/layout.inc | 16 + .../BattlePyramidSquare04/map.bin | 0 .../BattlePyramidSquare05/border.bin | Bin data/layouts/BattlePyramidSquare05/layout.inc | 16 + .../BattlePyramidSquare05/map.bin | 0 .../BattlePyramidSquare06/border.bin | Bin data/layouts/BattlePyramidSquare06/layout.inc | 16 + .../BattlePyramidSquare06/map.bin | 0 .../BattlePyramidSquare07/border.bin | Bin data/layouts/BattlePyramidSquare07/layout.inc | 16 + .../BattlePyramidSquare07/map.bin | 0 .../BattlePyramidSquare08/border.bin | Bin data/layouts/BattlePyramidSquare08/layout.inc | 16 + .../BattlePyramidSquare08/map.bin | 0 .../BattlePyramidSquare09/border.bin | Bin data/layouts/BattlePyramidSquare09/layout.inc | 16 + .../BattlePyramidSquare09/map.bin | 0 .../BattlePyramidSquare10/border.bin | Bin data/layouts/BattlePyramidSquare10/layout.inc | 16 + .../BattlePyramidSquare10/map.bin | 0 .../BattlePyramidSquare11/border.bin | Bin data/layouts/BattlePyramidSquare11/layout.inc | 16 + .../BattlePyramidSquare11/map.bin | 0 .../BattlePyramidSquare12/border.bin | Bin data/layouts/BattlePyramidSquare12/layout.inc | 16 + .../BattlePyramidSquare12/map.bin | 0 .../BattlePyramidSquare13/border.bin | Bin data/layouts/BattlePyramidSquare13/layout.inc | 16 + .../BattlePyramidSquare13/map.bin | 0 .../BattlePyramidSquare14/border.bin | Bin data/layouts/BattlePyramidSquare14/layout.inc | 16 + .../BattlePyramidSquare14/map.bin | 0 .../BattlePyramidSquare15/border.bin | Bin data/layouts/BattlePyramidSquare15/layout.inc | 16 + .../BattlePyramidSquare15/map.bin | 0 .../BattlePyramidSquare16/border.bin | Bin data/layouts/BattlePyramidSquare16/layout.inc | 16 + .../BattlePyramidSquare16/map.bin | 0 .../BattleTentBattleRoom}/border.bin | Bin data/layouts/BattleTentBattleRoom/layout.inc | 16 + .../BattleTentBattleRoom}/map.bin | Bin .../BattleTentCorridor}/border.bin | Bin data/layouts/BattleTentCorridor/layout.inc | 16 + .../BattleTentCorridor}/map.bin | 0 .../BattleTentLobby}/border.bin | Bin data/layouts/BattleTentLobby/layout.inc | 16 + .../BattleTentLobby}/map.bin | 0 .../BirthIsland_Exterior/border.bin | 0 data/layouts/BirthIsland_Exterior/layout.inc | 16 + .../BirthIsland_Exterior/map.bin | Bin .../CableCarStation}/border.bin | 0 data/layouts/CableCarStation/layout.inc | 16 + .../CableCarStation}/map.bin | Bin .../CaveOfOrigin_1F/border.bin | 0 data/layouts/CaveOfOrigin_1F/layout.inc | 16 + .../{maps => layouts}/CaveOfOrigin_1F/map.bin | 0 .../CaveOfOrigin_B1F/border.bin | 0 data/layouts/CaveOfOrigin_B1F/layout.inc | 16 + .../CaveOfOrigin_B1F/map.bin | 0 .../CaveOfOrigin_Entrance/border.bin | 0 data/layouts/CaveOfOrigin_Entrance/layout.inc | 16 + .../CaveOfOrigin_Entrance/map.bin | 0 .../border.bin | 0 .../layout.inc | 16 + .../map.bin | 0 .../border.bin | 0 .../layout.inc | 16 + .../map.bin | 0 .../border.bin | 0 .../layout.inc | 16 + .../map.bin | 0 data/{maps => layouts}/DesertRuins/border.bin | 0 data/layouts/DesertRuins/layout.inc | 16 + data/{maps => layouts}/DesertRuins/map.bin | Bin .../DesertUnderpass/border.bin | 0 data/layouts/DesertUnderpass/layout.inc | 16 + .../{maps => layouts}/DesertUnderpass/map.bin | 0 data/{maps => layouts}/DewfordTown/border.bin | 0 data/layouts/DewfordTown/layout.inc | 16 + data/{maps => layouts}/DewfordTown/map.bin | 0 .../DewfordTown_Gym}/border.bin | Bin data/layouts/DewfordTown_Gym/layout.inc | 16 + .../{maps => layouts}/DewfordTown_Gym/map.bin | Bin .../DewfordTown_Hall/border.bin | 0 data/layouts/DewfordTown_Hall/layout.inc | 16 + .../DewfordTown_Hall/map.bin | Bin .../DoubleBattleColosseum}/border.bin | 0 data/layouts/DoubleBattleColosseum/layout.inc | 16 + .../DoubleBattleColosseum/map.bin | 0 .../EverGrandeCity/border.bin | 0 data/layouts/EverGrandeCity/layout.inc | 16 + data/{maps => layouts}/EverGrandeCity/map.bin | Bin .../EverGrandeCity_ChampionsRoom}/border.bin | Bin .../EverGrandeCity_ChampionsRoom/layout.inc | 16 + .../EverGrandeCity_ChampionsRoom/map.bin | Bin .../EverGrandeCity_DrakesRoom}/border.bin | Bin .../EverGrandeCity_DrakesRoom/layout.inc | 16 + .../EverGrandeCity_DrakesRoom/map.bin | 0 .../EverGrandeCity_GlaciasRoom}/border.bin | Bin .../EverGrandeCity_GlaciasRoom/layout.inc | 16 + .../EverGrandeCity_GlaciasRoom/map.bin | 0 .../EverGrandeCity_Hall4}/border.bin | Bin data/layouts/EverGrandeCity_Hall4/layout.inc | 16 + .../EverGrandeCity_Hall4/map.bin | 0 .../EverGrandeCity_HallOfFame}/border.bin | Bin .../EverGrandeCity_HallOfFame/layout.inc | 16 + .../EverGrandeCity_HallOfFame/map.bin | 0 .../EverGrandeCity_PhoebesRoom}/border.bin | Bin .../EverGrandeCity_PhoebesRoom/layout.inc | 16 + .../EverGrandeCity_PhoebesRoom/map.bin | 0 .../border.bin | 0 .../layout.inc | 16 + .../EverGrandeCity_PokemonLeague_1F/map.bin | 0 .../EverGrandeCity_ShortHall}/border.bin | Bin .../EverGrandeCity_ShortHall/layout.inc | 16 + .../EverGrandeCity_ShortHall}/map.bin | 0 .../EverGrandeCity_SidneysRoom}/border.bin | Bin .../EverGrandeCity_SidneysRoom/layout.inc | 16 + .../EverGrandeCity_SidneysRoom/map.bin | 0 .../FallarborTown/border.bin | 0 data/layouts/FallarborTown/layout.inc | 16 + data/{maps => layouts}/FallarborTown/map.bin | 0 .../border.bin | 0 .../layout.inc | 16 + .../map.bin | 0 .../border.bin | 0 .../layout.inc | 16 + .../map.bin | 0 .../FarawayIsland_Entrance/border.bin | 0 .../layouts/FarawayIsland_Entrance/layout.inc | 16 + .../FarawayIsland_Entrance/map.bin | Bin .../FarawayIsland_Interior/border.bin | Bin .../layouts/FarawayIsland_Interior/layout.inc | 16 + .../FarawayIsland_Interior/map.bin | Bin data/{maps => layouts}/FieryPath/border.bin | 0 data/layouts/FieryPath/layout.inc | 16 + data/{maps => layouts}/FieryPath/map.bin | 0 data/{maps => layouts}/FortreeCity/border.bin | Bin data/layouts/FortreeCity/layout.inc | 16 + data/{maps => layouts}/FortreeCity/map.bin | 0 .../FortreeCity_DecorationShop}/border.bin | 0 .../FortreeCity_DecorationShop/layout.inc | 16 + .../FortreeCity_DecorationShop/map.bin | 0 .../FortreeCity_Gym/border.bin | Bin data/layouts/FortreeCity_Gym/layout.inc | 16 + .../{maps => layouts}/FortreeCity_Gym/map.bin | Bin .../FortreeCity_House1}/border.bin | 0 data/layouts/FortreeCity_House1/layout.inc | 16 + .../FortreeCity_House1/map.bin | 0 .../FortreeCity_House2}/border.bin | 0 data/layouts/FortreeCity_House2/layout.inc | 16 + .../FortreeCity_House2/map.bin | 0 .../GraniteCave_1F/border.bin | 0 data/layouts/GraniteCave_1F/layout.inc | 16 + data/{maps => layouts}/GraniteCave_1F/map.bin | 0 .../GraniteCave_B1F/border.bin | 0 data/layouts/GraniteCave_B1F/layout.inc | 16 + .../{maps => layouts}/GraniteCave_B1F/map.bin | 0 .../GraniteCave_B2F/border.bin | 0 data/layouts/GraniteCave_B2F/layout.inc | 16 + .../{maps => layouts}/GraniteCave_B2F/map.bin | 0 .../GraniteCave_StevensRoom/border.bin | 0 .../GraniteCave_StevensRoom/layout.inc | 16 + .../GraniteCave_StevensRoom/map.bin | 0 .../Harbor}/border.bin | 0 data/layouts/Harbor/layout.inc | 16 + .../Harbor}/map.bin | 0 .../House1}/border.bin | Bin data/layouts/House1/layout.inc | 16 + .../House1}/map.bin | 0 .../House2}/border.bin | Bin data/layouts/House2/layout.inc | 16 + .../House2}/map.bin | 0 .../House3}/border.bin | 0 data/layouts/House3/layout.inc | 16 + .../House3}/map.bin | 0 .../House4}/border.bin | 0 data/layouts/House4/layout.inc | 16 + .../House4}/map.bin | 0 .../HouseWithBed}/border.bin | 0 data/layouts/HouseWithBed/layout.inc | 16 + .../HouseWithBed}/map.bin | 0 .../InsideOfTruck/border.bin | 0 data/layouts/InsideOfTruck/layout.inc | 16 + data/{maps => layouts}/InsideOfTruck/map.bin | 0 data/{maps => layouts}/IslandCave/border.bin | 0 data/layouts/IslandCave/layout.inc | 16 + data/{maps => layouts}/IslandCave/map.bin | Bin .../IslandHarbor}/border.bin | 0 data/layouts/IslandHarbor/layout.inc | 16 + .../IslandHarbor}/map.bin | 0 data/{maps => layouts}/JaggedPass/border.bin | 0 data/layouts/JaggedPass/layout.inc | 16 + data/{maps => layouts}/JaggedPass/map.bin | Bin .../LavaridgeTown/border.bin | 0 data/layouts/LavaridgeTown/layout.inc | 16 + data/{maps => layouts}/LavaridgeTown/map.bin | 0 .../LavaridgeTown_Gym_1F}/border.bin | Bin data/layouts/LavaridgeTown_Gym_1F/layout.inc | 16 + .../LavaridgeTown_Gym_1F/map.bin | 0 .../LavaridgeTown_Gym_B1F}/border.bin | Bin data/layouts/LavaridgeTown_Gym_B1F/layout.inc | 16 + .../LavaridgeTown_Gym_B1F/map.bin | 0 .../LavaridgeTown_HerbShop}/border.bin | Bin .../layouts/LavaridgeTown_HerbShop/layout.inc | 16 + .../LavaridgeTown_HerbShop/map.bin | 0 .../border.bin | 0 .../LavaridgeTown_PokemonCenter_1F/layout.inc | 16 + .../LavaridgeTown_PokemonCenter_1F/map.bin | 0 .../{maps => layouts}/LilycoveCity/border.bin | 0 data/layouts/LilycoveCity/layout.inc | 16 + data/{maps => layouts}/LilycoveCity/map.bin | Bin .../LilycoveCity_ContestHall}/border.bin | 0 .../LilycoveCity_ContestHall/layout.inc | 16 + .../LilycoveCity_ContestHall/map.bin | 0 .../LilycoveCity_ContestLobby}/border.bin | 0 .../LilycoveCity_ContestLobby/layout.inc | 16 + .../LilycoveCity_ContestLobby/map.bin | 0 .../LilycoveCity_CoveLilyMotel_1F}/border.bin | 0 .../LilycoveCity_CoveLilyMotel_1F/layout.inc | 16 + .../LilycoveCity_CoveLilyMotel_1F/map.bin | 0 .../LilycoveCity_CoveLilyMotel_2F}/border.bin | 0 .../LilycoveCity_CoveLilyMotel_2F/layout.inc | 16 + .../LilycoveCity_CoveLilyMotel_2F/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | 0 .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../LilycoveCity_DepartmentStore_1F/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../LilycoveCity_DepartmentStore_2F/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../LilycoveCity_DepartmentStore_3F/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../LilycoveCity_DepartmentStore_4F/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../LilycoveCity_DepartmentStore_5F/map.bin | Bin .../LilycoveCity_House2}/border.bin | 0 data/layouts/LilycoveCity_House2/layout.inc | 16 + .../LilycoveCity_House2/map.bin | 0 .../border.bin | 0 .../LilycoveCity_LilycoveMuseum_1F/layout.inc | 16 + .../LilycoveCity_LilycoveMuseum_1F/map.bin | 0 .../border.bin | 0 .../LilycoveCity_LilycoveMuseum_2F/layout.inc | 16 + .../LilycoveCity_LilycoveMuseum_2F/map.bin | 0 .../border.bin | 0 .../layout.inc | 16 + .../map.bin | 0 .../LinkContestRoom1}/border.bin | 0 data/layouts/LinkContestRoom1/layout.inc | 16 + .../LinkContestRoom1/map.bin | 0 .../LinkContestRoom2}/border.bin | 0 data/layouts/LinkContestRoom2/layout.inc | 16 + .../LinkContestRoom2/map.bin | 0 .../LinkContestRoom3}/border.bin | 0 data/layouts/LinkContestRoom3/layout.inc | 16 + .../LinkContestRoom3/map.bin | 0 .../LinkContestRoom4}/border.bin | 0 data/layouts/LinkContestRoom4/layout.inc | 16 + .../LinkContestRoom4/map.bin | 0 .../LinkContestRoom5}/border.bin | 0 data/layouts/LinkContestRoom5/layout.inc | 16 + .../LinkContestRoom5/map.bin | 0 .../LinkContestRoom6}/border.bin | 0 data/layouts/LinkContestRoom6/layout.inc | 16 + .../LinkContestRoom6/map.bin | 0 .../LittlerootTown/border.bin | 0 data/layouts/LittlerootTown/layout.inc | 16 + data/{maps => layouts}/LittlerootTown/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../LittlerootTown_BrendansHouse_1F/map.bin | 0 .../border.bin | 0 .../layout.inc | 16 + .../LittlerootTown_BrendansHouse_2F/map.bin | 0 .../LittlerootTown_MaysHouse_1F/border.bin | 0 .../LittlerootTown_MaysHouse_1F/layout.inc | 16 + .../LittlerootTown_MaysHouse_1F/map.bin | 0 .../LittlerootTown_MaysHouse_2F/border.bin | 0 .../LittlerootTown_MaysHouse_2F/layout.inc | 16 + .../LittlerootTown_MaysHouse_2F/map.bin | 0 .../border.bin | 0 .../layout.inc | 16 + .../LittlerootTown_ProfessorBirchsLab/map.bin | 0 .../MagmaHideout_1F/border.bin | 0 data/layouts/MagmaHideout_1F/layout.inc | 16 + .../{maps => layouts}/MagmaHideout_1F/map.bin | Bin .../MagmaHideout_2F_1R/border.bin | 0 data/layouts/MagmaHideout_2F_1R/layout.inc | 16 + .../MagmaHideout_2F_1R/map.bin | 0 .../MagmaHideout_2F_2R/border.bin | 0 data/layouts/MagmaHideout_2F_2R/layout.inc | 16 + .../MagmaHideout_2F_2R/map.bin | 0 .../MagmaHideout_2F_3R/border.bin | 0 data/layouts/MagmaHideout_2F_3R/layout.inc | 16 + .../MagmaHideout_2F_3R/map.bin | 0 .../MagmaHideout_3F_1R/border.bin | 0 data/layouts/MagmaHideout_3F_1R/layout.inc | 16 + .../MagmaHideout_3F_1R/map.bin | 0 .../MagmaHideout_3F_2R/border.bin | 0 data/layouts/MagmaHideout_3F_2R/layout.inc | 16 + .../MagmaHideout_3F_2R/map.bin | 0 .../MagmaHideout_3F_3R/border.bin | 0 data/layouts/MagmaHideout_3F_3R/layout.inc | 16 + .../MagmaHideout_3F_3R/map.bin | 0 .../MagmaHideout_4F/border.bin | 0 data/layouts/MagmaHideout_4F/layout.inc | 16 + .../{maps => layouts}/MagmaHideout_4F/map.bin | 0 .../MarineCave_End/border.bin | 0 data/layouts/MarineCave_End/layout.inc | 16 + data/{maps => layouts}/MarineCave_End/map.bin | 0 .../MarineCave_Entrance/border.bin | 0 data/layouts/MarineCave_Entrance/layout.inc | 16 + .../MarineCave_Entrance/map.bin | 0 .../Mart}/border.bin | Bin data/layouts/Mart/layout.inc | 16 + .../OldaleTown_Mart => layouts/Mart}/map.bin | 0 .../{maps => layouts}/MauvilleCity/border.bin | 0 data/layouts/MauvilleCity/layout.inc | 16 + data/{maps => layouts}/MauvilleCity/map.bin | Bin .../MauvilleCity_BikeShop/border.bin | 0 data/layouts/MauvilleCity_BikeShop/layout.inc | 16 + .../MauvilleCity_BikeShop/map.bin | 0 .../MauvilleCity_GameCorner}/border.bin | Bin .../MauvilleCity_GameCorner/layout.inc | 16 + .../MauvilleCity_GameCorner/map.bin | 0 .../MauvilleCity_Gym}/border.bin | Bin data/layouts/MauvilleCity_Gym/layout.inc | 16 + .../MauvilleCity_Gym/map.bin | Bin .../MeteorFalls_1F_1R}/border.bin | 0 data/layouts/MeteorFalls_1F_1R/layout.inc | 16 + .../MeteorFalls_1F_1R/map.bin | 0 .../MeteorFalls_1F_2R}/border.bin | 0 data/layouts/MeteorFalls_1F_2R/layout.inc | 16 + .../MeteorFalls_1F_2R/map.bin | 0 .../MeteorFalls_B1F_1R}/border.bin | 0 data/layouts/MeteorFalls_B1F_1R/layout.inc | 16 + .../MeteorFalls_B1F_1R/map.bin | 0 .../MeteorFalls_B1F_2R}/border.bin | 0 data/layouts/MeteorFalls_B1F_2R/layout.inc | 16 + .../MeteorFalls_B1F_2R/map.bin | 0 .../MeteorFalls_StevensCave}/border.bin | 0 .../MeteorFalls_StevensCave/layout.inc | 16 + .../MeteorFalls_StevensCave/map.bin | 0 .../MirageTower_1F/border.bin | 0 data/layouts/MirageTower_1F/layout.inc | 16 + data/{maps => layouts}/MirageTower_1F/map.bin | 0 .../MirageTower_2F/border.bin | 0 data/layouts/MirageTower_2F/layout.inc | 16 + data/{maps => layouts}/MirageTower_2F/map.bin | 0 .../MirageTower_3F/border.bin | 0 data/layouts/MirageTower_3F/layout.inc | 16 + data/{maps => layouts}/MirageTower_3F/map.bin | 0 .../MirageTower_4F/border.bin | 0 data/layouts/MirageTower_4F/layout.inc | 16 + data/{maps => layouts}/MirageTower_4F/map.bin | 0 .../{maps => layouts}/MossdeepCity/border.bin | 0 data/layouts/MossdeepCity/layout.inc | 16 + data/{maps => layouts}/MossdeepCity/map.bin | Bin .../MossdeepCity_GameCorner_1F}/border.bin | Bin .../MossdeepCity_GameCorner_1F/layout.inc | 16 + .../MossdeepCity_GameCorner_1F/map.bin | 0 .../MossdeepCity_GameCorner_B1F}/border.bin | Bin .../MossdeepCity_GameCorner_B1F/layout.inc | 16 + .../MossdeepCity_GameCorner_B1F/map.bin | 0 .../MossdeepCity_Gym/border.bin | 0 data/layouts/MossdeepCity_Gym/layout.inc | 16 + .../MossdeepCity_Gym/map.bin | 0 .../MossdeepCity_SpaceCenter_1F}/border.bin | 0 .../MossdeepCity_SpaceCenter_1F/layout.inc | 16 + .../MossdeepCity_SpaceCenter_1F/map.bin | Bin .../MossdeepCity_SpaceCenter_2F}/border.bin | 0 .../MossdeepCity_SpaceCenter_2F/layout.inc | 16 + .../MossdeepCity_SpaceCenter_2F/map.bin | Bin .../MossdeepCity_StevensHouse}/border.bin | Bin .../MossdeepCity_StevensHouse/layout.inc | 16 + .../MossdeepCity_StevensHouse/map.bin | 0 data/{maps => layouts}/MtChimney/border.bin | 0 data/layouts/MtChimney/layout.inc | 16 + data/{maps => layouts}/MtChimney/map.bin | 0 .../MtPyre_1F}/border.bin | 0 data/layouts/MtPyre_1F/layout.inc | 16 + data/{maps => layouts}/MtPyre_1F/map.bin | 0 .../MtPyre_2F}/border.bin | 0 data/layouts/MtPyre_2F/layout.inc | 16 + data/{maps => layouts}/MtPyre_2F/map.bin | 0 .../MtPyre_3F}/border.bin | 0 data/layouts/MtPyre_3F/layout.inc | 16 + data/{maps => layouts}/MtPyre_3F/map.bin | 0 .../MtPyre_4F}/border.bin | 0 data/layouts/MtPyre_4F/layout.inc | 16 + data/{maps => layouts}/MtPyre_4F/map.bin | 0 .../MtPyre_5F}/border.bin | 0 data/layouts/MtPyre_5F/layout.inc | 16 + data/{maps => layouts}/MtPyre_5F/map.bin | 0 .../MtPyre_6F}/border.bin | 0 data/layouts/MtPyre_6F/layout.inc | 16 + data/{maps => layouts}/MtPyre_6F/map.bin | 0 .../MtPyre_Exterior/border.bin | Bin data/layouts/MtPyre_Exterior/layout.inc | 16 + .../{maps => layouts}/MtPyre_Exterior/map.bin | Bin .../MtPyre_Summit/border.bin | Bin data/layouts/MtPyre_Summit/layout.inc | 16 + data/{maps => layouts}/MtPyre_Summit/map.bin | Bin .../NavelRock_B1F/border.bin | 0 data/layouts/NavelRock_B1F/layout.inc | 16 + data/{maps => layouts}/NavelRock_B1F/map.bin | 0 .../NavelRock_Bottom/border.bin | 0 data/layouts/NavelRock_Bottom/layout.inc | 16 + .../NavelRock_Bottom/map.bin | 0 .../NavelRock_Entrance/border.bin | 0 data/layouts/NavelRock_Entrance/layout.inc | 16 + .../NavelRock_Entrance/map.bin | 0 .../NavelRock_Exterior/border.bin | 0 data/layouts/NavelRock_Exterior/layout.inc | 16 + .../NavelRock_Exterior/map.bin | Bin .../NavelRock_Fork/border.bin | 0 data/layouts/NavelRock_Fork/layout.inc | 16 + data/{maps => layouts}/NavelRock_Fork/map.bin | 0 .../NavelRock_LadderRoom1}/border.bin | 0 data/layouts/NavelRock_LadderRoom1/layout.inc | 16 + .../NavelRock_LadderRoom1}/map.bin | 0 .../NavelRock_LadderRoom2}/border.bin | 0 data/layouts/NavelRock_LadderRoom2/layout.inc | 16 + .../NavelRock_LadderRoom2}/map.bin | 0 .../NavelRock_Top/border.bin | 0 data/layouts/NavelRock_Top/layout.inc | 16 + data/{maps => layouts}/NavelRock_Top/map.bin | 0 .../NewMauville_Entrance/border.bin | Bin data/layouts/NewMauville_Entrance/layout.inc | 16 + .../NewMauville_Entrance/map.bin | 0 .../NewMauville_Inside/border.bin | 0 data/layouts/NewMauville_Inside/layout.inc | 16 + .../NewMauville_Inside/map.bin | 0 data/{maps => layouts}/OldaleTown/border.bin | 0 data/layouts/OldaleTown/layout.inc | 16 + data/{maps => layouts}/OldaleTown/map.bin | 0 .../PacifidlogTown/border.bin | 0 data/layouts/PacifidlogTown/layout.inc | 16 + data/{maps => layouts}/PacifidlogTown/map.bin | 0 .../PacifidlogTown_House1}/border.bin | 0 data/layouts/PacifidlogTown_House1/layout.inc | 16 + .../PacifidlogTown_House1/map.bin | 0 .../PacifidlogTown_House2}/border.bin | 0 data/layouts/PacifidlogTown_House2/layout.inc | 16 + .../PacifidlogTown_House2/map.bin | 0 .../PetalburgCity/border.bin | 0 data/layouts/PetalburgCity/layout.inc | 16 + data/{maps => layouts}/PetalburgCity/map.bin | 0 .../PetalburgCity_Gym/border.bin | 0 data/layouts/PetalburgCity_Gym/layout.inc | 16 + .../PetalburgCity_Gym/map.bin | 0 .../PetalburgWoods/border.bin | 0 data/layouts/PetalburgWoods/layout.inc | 16 + data/{maps => layouts}/PetalburgWoods/map.bin | 0 .../PokemonCenter_1F}/border.bin | 0 data/layouts/PokemonCenter_1F/layout.inc | 16 + .../PokemonCenter_1F}/map.bin | 0 .../PokemonCenter_2F}/border.bin | 0 data/layouts/PokemonCenter_2F/layout.inc | 16 + .../PokemonCenter_2F}/map.bin | 0 .../RecordCorner}/border.bin | 0 data/layouts/RecordCorner/layout.inc | 16 + data/{maps => layouts}/RecordCorner/map.bin | 0 data/{maps => layouts}/Route101/border.bin | 0 data/layouts/Route101/layout.inc | 16 + data/{maps => layouts}/Route101/map.bin | 0 data/{maps => layouts}/Route102/border.bin | 0 data/layouts/Route102/layout.inc | 16 + data/{maps => layouts}/Route102/map.bin | 0 data/{maps => layouts}/Route103/border.bin | 0 data/layouts/Route103/layout.inc | 16 + data/{maps => layouts}/Route103/map.bin | 0 data/{maps => layouts}/Route104/border.bin | 0 data/layouts/Route104/layout.inc | 16 + data/{maps => layouts}/Route104/map.bin | Bin .../Route104_MrBrineysHouse}/border.bin | 0 .../Route104_MrBrineysHouse/layout.inc | 16 + .../Route104_MrBrineysHouse/map.bin | 0 .../Route104_PrettyPetalFlowerShop/border.bin | Bin .../Route104_PrettyPetalFlowerShop/layout.inc | 16 + .../Route104_PrettyPetalFlowerShop/map.bin | Bin .../Route104_Prototype/border.bin | 0 data/layouts/Route104_Prototype/layout.inc | 16 + .../Route104_Prototype/map.bin | 0 data/{maps => layouts}/Route105/border.bin | 0 data/layouts/Route105/layout.inc | 16 + data/{maps => layouts}/Route105/map.bin | Bin data/{maps => layouts}/Route106/border.bin | 0 data/layouts/Route106/layout.inc | 16 + data/{maps => layouts}/Route106/map.bin | Bin data/{maps => layouts}/Route107/border.bin | 0 data/layouts/Route107/layout.inc | 16 + data/{maps => layouts}/Route107/map.bin | Bin data/{maps => layouts}/Route108/border.bin | 0 data/layouts/Route108/layout.inc | 16 + data/{maps => layouts}/Route108/map.bin | 0 data/{maps => layouts}/Route109/border.bin | 0 data/layouts/Route109/layout.inc | 16 + data/{maps => layouts}/Route109/map.bin | Bin .../Route109_SeashoreHouse/border.bin | Bin .../layouts/Route109_SeashoreHouse/layout.inc | 16 + .../Route109_SeashoreHouse/map.bin | 0 data/{maps => layouts}/Route110/border.bin | 0 data/layouts/Route110/layout.inc | 16 + data/{maps => layouts}/Route110/map.bin | Bin .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../Route110_TrickHouseCorridor}/border.bin | 0 .../Route110_TrickHouseCorridor/layout.inc | 16 + .../Route110_TrickHouseCorridor/map.bin | 0 .../Route110_TrickHouseEnd}/border.bin | 0 .../layouts/Route110_TrickHouseEnd/layout.inc | 16 + .../Route110_TrickHouseEnd/map.bin | 0 .../Route110_TrickHouseEntrance}/border.bin | 0 .../Route110_TrickHouseEntrance/layout.inc | 16 + .../Route110_TrickHouseEntrance/map.bin | 0 .../Route110_TrickHousePuzzle1/border.bin | Bin .../Route110_TrickHousePuzzle1/layout.inc | 16 + .../Route110_TrickHousePuzzle1/map.bin | 0 .../Route110_TrickHousePuzzle2/border.bin | Bin .../Route110_TrickHousePuzzle2/layout.inc | 16 + .../Route110_TrickHousePuzzle2/map.bin | 0 .../Route110_TrickHousePuzzle3/border.bin | Bin .../Route110_TrickHousePuzzle3/layout.inc | 16 + .../Route110_TrickHousePuzzle3/map.bin | 0 .../Route110_TrickHousePuzzle4/border.bin | Bin .../Route110_TrickHousePuzzle4/layout.inc | 16 + .../Route110_TrickHousePuzzle4/map.bin | 0 .../Route110_TrickHousePuzzle5/border.bin | Bin .../Route110_TrickHousePuzzle5/layout.inc | 16 + .../Route110_TrickHousePuzzle5/map.bin | 0 .../Route110_TrickHousePuzzle6/border.bin | Bin .../Route110_TrickHousePuzzle6/layout.inc | 16 + .../Route110_TrickHousePuzzle6/map.bin | 0 .../Route110_TrickHousePuzzle7/border.bin | Bin .../Route110_TrickHousePuzzle7/layout.inc | 16 + .../Route110_TrickHousePuzzle7/map.bin | 0 .../Route110_TrickHousePuzzle8/border.bin | Bin .../Route110_TrickHousePuzzle8/layout.inc | 16 + .../Route110_TrickHousePuzzle8/map.bin | 0 data/{maps => layouts}/Route111/border.bin | Bin data/layouts/Route111/layout.inc | 16 + data/{maps => layouts}/Route111/map.bin | Bin data/{maps => layouts}/Route112/border.bin | 0 data/layouts/Route112/layout.inc | 16 + data/{maps => layouts}/Route112/map.bin | Bin data/{maps => layouts}/Route113/border.bin | 0 data/layouts/Route113/layout.inc | 16 + data/{maps => layouts}/Route113/map.bin | Bin data/{maps => layouts}/Route114/border.bin | 0 data/layouts/Route114/layout.inc | 16 + data/{maps => layouts}/Route114/map.bin | Bin .../Route114_FossilManiacsHouse}/border.bin | 0 .../Route114_FossilManiacsHouse/layout.inc | 16 + .../Route114_FossilManiacsHouse/map.bin | 0 .../Route114_FossilManiacsTunnel/border.bin | 0 .../Route114_FossilManiacsTunnel/layout.inc | 16 + .../Route114_FossilManiacsTunnel/map.bin | 0 .../Route114_LanettesHouse}/border.bin | 0 .../layouts/Route114_LanettesHouse/layout.inc | 16 + .../Route114_LanettesHouse/map.bin | 0 data/{maps => layouts}/Route115/border.bin | 0 data/layouts/Route115/layout.inc | 16 + data/{maps => layouts}/Route115/map.bin | Bin data/{maps => layouts}/Route116/border.bin | 0 data/layouts/Route116/layout.inc | 16 + data/{maps => layouts}/Route116/map.bin | Bin .../Route116_TunnelersRestHouse}/border.bin | 0 .../Route116_TunnelersRestHouse/layout.inc | 16 + .../Route116_TunnelersRestHouse/map.bin | 0 data/{maps => layouts}/Route117/border.bin | Bin data/layouts/Route117/layout.inc | 16 + data/{maps => layouts}/Route117/map.bin | 0 .../Route117_PokemonDayCare/border.bin | 0 .../Route117_PokemonDayCare/layout.inc | 16 + .../Route117_PokemonDayCare/map.bin | 0 data/{maps => layouts}/Route118/border.bin | 0 data/layouts/Route118/layout.inc | 16 + data/{maps => layouts}/Route118/map.bin | Bin data/{maps => layouts}/Route119/border.bin | Bin data/layouts/Route119/layout.inc | 16 + data/{maps => layouts}/Route119/map.bin | Bin .../Route119_WeatherInstitute_1F}/border.bin | 0 .../Route119_WeatherInstitute_1F/layout.inc | 16 + .../Route119_WeatherInstitute_1F/map.bin | 0 .../Route119_WeatherInstitute_2F}/border.bin | 0 .../Route119_WeatherInstitute_2F/layout.inc | 16 + .../Route119_WeatherInstitute_2F/map.bin | 0 data/{maps => layouts}/Route120/border.bin | Bin data/layouts/Route120/layout.inc | 16 + data/{maps => layouts}/Route120/map.bin | Bin data/{maps => layouts}/Route121/border.bin | 0 data/layouts/Route121/layout.inc | 16 + data/{maps => layouts}/Route121/map.bin | 0 .../Route121_SafariZoneEntrance/border.bin | Bin .../Route121_SafariZoneEntrance/layout.inc | 16 + .../Route121_SafariZoneEntrance/map.bin | 0 data/{maps => layouts}/Route122/border.bin | 0 data/layouts/Route122/layout.inc | 16 + data/{maps => layouts}/Route122/map.bin | Bin data/{maps => layouts}/Route123/border.bin | Bin data/layouts/Route123/layout.inc | 16 + data/{maps => layouts}/Route123/map.bin | 0 data/{maps => layouts}/Route124/border.bin | 0 data/layouts/Route124/layout.inc | 16 + data/{maps => layouts}/Route124/map.bin | Bin .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 data/{maps => layouts}/Route125/border.bin | 0 data/layouts/Route125/layout.inc | 16 + data/{maps => layouts}/Route125/map.bin | Bin data/{maps => layouts}/Route126/border.bin | 0 data/layouts/Route126/layout.inc | 16 + data/{maps => layouts}/Route126/map.bin | Bin data/{maps => layouts}/Route127/border.bin | 0 data/layouts/Route127/layout.inc | 16 + data/{maps => layouts}/Route127/map.bin | Bin data/{maps => layouts}/Route128/border.bin | 0 data/layouts/Route128/layout.inc | 16 + data/{maps => layouts}/Route128/map.bin | Bin data/{maps => layouts}/Route129/border.bin | 0 data/layouts/Route129/layout.inc | 16 + data/{maps => layouts}/Route129/map.bin | Bin data/{maps => layouts}/Route130/border.bin | 0 data/layouts/Route130/layout.inc | 16 + data/{maps => layouts}/Route130/map.bin | 0 data/{maps => layouts}/Route131/border.bin | 0 data/layouts/Route131/layout.inc | 16 + data/{maps => layouts}/Route131/map.bin | 0 data/{maps => layouts}/Route132/border.bin | 0 data/layouts/Route132/layout.inc | 16 + data/{maps => layouts}/Route132/map.bin | Bin data/{maps => layouts}/Route133/border.bin | 0 data/layouts/Route133/layout.inc | 16 + data/{maps => layouts}/Route133/map.bin | 0 data/{maps => layouts}/Route134/border.bin | 0 data/layouts/Route134/layout.inc | 16 + data/{maps => layouts}/Route134/map.bin | Bin .../{maps => layouts}/RustboroCity/border.bin | 0 data/layouts/RustboroCity/layout.inc | 16 + data/{maps => layouts}/RustboroCity/map.bin | Bin .../RustboroCity_CuttersHouse}/border.bin | 0 .../RustboroCity_CuttersHouse/layout.inc | 16 + .../RustboroCity_CuttersHouse/map.bin | 0 .../RustboroCity_DevonCorp_1F}/border.bin | 0 .../RustboroCity_DevonCorp_1F/layout.inc | 16 + .../RustboroCity_DevonCorp_1F/map.bin | 0 .../RustboroCity_DevonCorp_2F}/border.bin | 0 .../RustboroCity_DevonCorp_2F/layout.inc | 16 + .../RustboroCity_DevonCorp_2F/map.bin | 0 .../RustboroCity_DevonCorp_3F}/border.bin | 0 .../RustboroCity_DevonCorp_3F/layout.inc | 16 + .../RustboroCity_DevonCorp_3F/map.bin | 0 .../RustboroCity_Flat1_1F}/border.bin | 0 data/layouts/RustboroCity_Flat1_1F/layout.inc | 16 + .../RustboroCity_Flat1_1F/map.bin | 0 .../RustboroCity_Flat1_2F}/border.bin | 0 data/layouts/RustboroCity_Flat1_2F/layout.inc | 16 + .../RustboroCity_Flat1_2F/map.bin | 0 .../RustboroCity_Flat2_1F}/border.bin | 0 data/layouts/RustboroCity_Flat2_1F/layout.inc | 16 + .../RustboroCity_Flat2_1F/map.bin | Bin .../RustboroCity_Flat2_2F}/border.bin | 0 data/layouts/RustboroCity_Flat2_2F/layout.inc | 16 + .../RustboroCity_Flat2_2F/map.bin | Bin .../RustboroCity_Flat2_3F}/border.bin | 0 data/layouts/RustboroCity_Flat2_3F/layout.inc | 16 + .../RustboroCity_Flat2_3F/map.bin | Bin .../RustboroCity_Gym/border.bin | Bin data/layouts/RustboroCity_Gym/layout.inc | 16 + .../RustboroCity_Gym/map.bin | 0 .../RustboroCity_House}/border.bin | 0 data/layouts/RustboroCity_House/layout.inc | 16 + .../RustboroCity_House}/map.bin | 0 .../RustboroCity_House1}/border.bin | 0 data/layouts/RustboroCity_House1/layout.inc | 16 + .../RustboroCity_House1/map.bin | 0 .../RustboroCity_PokemonSchool/border.bin | 0 .../RustboroCity_PokemonSchool/layout.inc | 16 + .../RustboroCity_PokemonSchool/map.bin | Bin .../RusturfTunnel/border.bin | 0 data/layouts/RusturfTunnel/layout.inc | 16 + data/{maps => layouts}/RusturfTunnel/map.bin | 0 .../SSTidalCorridor}/border.bin | 0 data/layouts/SSTidalCorridor/layout.inc | 16 + .../{maps => layouts}/SSTidalCorridor/map.bin | 0 .../SSTidalLowerDeck}/border.bin | 0 data/layouts/SSTidalLowerDeck/layout.inc | 16 + .../SSTidalLowerDeck/map.bin | 0 .../SSTidalRooms}/border.bin | 0 data/layouts/SSTidalRooms/layout.inc | 16 + data/{maps => layouts}/SSTidalRooms/map.bin | 0 .../SafariZone_North/border.bin | 0 data/layouts/SafariZone_North/layout.inc | 16 + .../SafariZone_North/map.bin | Bin .../SafariZone_Northeast/border.bin | 0 data/layouts/SafariZone_Northeast/layout.inc | 16 + .../SafariZone_Northeast/map.bin | Bin .../SafariZone_Northwest/border.bin | 0 data/layouts/SafariZone_Northwest/layout.inc | 16 + .../SafariZone_Northwest/map.bin | Bin .../SafariZone_RestHouse/border.bin | Bin data/layouts/SafariZone_RestHouse/layout.inc | 16 + .../SafariZone_RestHouse/map.bin | 0 .../SafariZone_South/border.bin | 0 data/layouts/SafariZone_South/layout.inc | 16 + .../SafariZone_South/map.bin | Bin .../SafariZone_Southeast/border.bin | 0 data/layouts/SafariZone_Southeast/layout.inc | 16 + .../SafariZone_Southeast/map.bin | Bin .../SafariZone_Southwest/border.bin | 0 data/layouts/SafariZone_Southwest/layout.inc | 16 + .../SafariZone_Southwest/map.bin | Bin .../{maps => layouts}/ScorchedSlab/border.bin | 0 data/layouts/ScorchedSlab/layout.inc | 16 + data/{maps => layouts}/ScorchedSlab/map.bin | 0 .../SeafloorCavern_Entrance/border.bin | 0 .../SeafloorCavern_Entrance/layout.inc | 16 + .../SeafloorCavern_Entrance/map.bin | 0 .../SeafloorCavern_Room1/border.bin | 0 data/layouts/SeafloorCavern_Room1/layout.inc | 16 + .../SeafloorCavern_Room1/map.bin | 0 .../SeafloorCavern_Room2/border.bin | 0 data/layouts/SeafloorCavern_Room2/layout.inc | 16 + .../SeafloorCavern_Room2/map.bin | 0 .../SeafloorCavern_Room3/border.bin | 0 data/layouts/SeafloorCavern_Room3/layout.inc | 16 + .../SeafloorCavern_Room3/map.bin | 0 .../SeafloorCavern_Room4/border.bin | 0 data/layouts/SeafloorCavern_Room4/layout.inc | 16 + .../SeafloorCavern_Room4/map.bin | 0 .../SeafloorCavern_Room5/border.bin | 0 data/layouts/SeafloorCavern_Room5/layout.inc | 16 + .../SeafloorCavern_Room5/map.bin | 0 .../SeafloorCavern_Room6/border.bin | 0 data/layouts/SeafloorCavern_Room6/layout.inc | 16 + .../SeafloorCavern_Room6/map.bin | 0 .../SeafloorCavern_Room7/border.bin | 0 data/layouts/SeafloorCavern_Room7/layout.inc | 16 + .../SeafloorCavern_Room7/map.bin | 0 .../SeafloorCavern_Room8/border.bin | 0 data/layouts/SeafloorCavern_Room8/layout.inc | 16 + .../SeafloorCavern_Room8/map.bin | 0 .../SeafloorCavern_Room9/border.bin | 0 data/layouts/SeafloorCavern_Room9/layout.inc | 16 + .../SeafloorCavern_Room9/map.bin | 0 .../SealedChamber_InnerRoom/border.bin | Bin .../SealedChamber_InnerRoom/layout.inc | 16 + .../SealedChamber_InnerRoom/map.bin | 0 .../SealedChamber_OuterRoom/border.bin | Bin .../SealedChamber_OuterRoom/layout.inc | 16 + .../SealedChamber_OuterRoom/map.bin | 0 .../SecretBase_BlueCave1/border.bin | 0 data/layouts/SecretBase_BlueCave1/layout.inc | 16 + .../SecretBase_BlueCave1/map.bin | 0 .../SecretBase_BlueCave2/border.bin | 0 data/layouts/SecretBase_BlueCave2/layout.inc | 16 + .../SecretBase_BlueCave2/map.bin | 0 .../SecretBase_BlueCave3/border.bin | 0 data/layouts/SecretBase_BlueCave3/layout.inc | 16 + .../SecretBase_BlueCave3/map.bin | 0 .../SecretBase_BlueCave4/border.bin | 0 data/layouts/SecretBase_BlueCave4/layout.inc | 16 + .../SecretBase_BlueCave4/map.bin | 0 .../SecretBase_BrownCave1/border.bin | 0 data/layouts/SecretBase_BrownCave1/layout.inc | 16 + .../SecretBase_BrownCave1/map.bin | 0 .../SecretBase_BrownCave2/border.bin | 0 data/layouts/SecretBase_BrownCave2/layout.inc | 16 + .../SecretBase_BrownCave2/map.bin | 0 .../SecretBase_BrownCave3/border.bin | 0 data/layouts/SecretBase_BrownCave3/layout.inc | 16 + .../SecretBase_BrownCave3/map.bin | 0 .../SecretBase_BrownCave4/border.bin | 0 data/layouts/SecretBase_BrownCave4/layout.inc | 16 + .../SecretBase_BrownCave4/map.bin | 0 .../SecretBase_RedCave1/border.bin | 0 data/layouts/SecretBase_RedCave1/layout.inc | 16 + .../SecretBase_RedCave1/map.bin | 0 .../SecretBase_RedCave2/border.bin | 0 data/layouts/SecretBase_RedCave2/layout.inc | 16 + .../SecretBase_RedCave2/map.bin | 0 .../SecretBase_RedCave3/border.bin | 0 data/layouts/SecretBase_RedCave3/layout.inc | 16 + .../SecretBase_RedCave3/map.bin | 0 .../SecretBase_RedCave4/border.bin | 0 data/layouts/SecretBase_RedCave4/layout.inc | 16 + .../SecretBase_RedCave4/map.bin | 0 .../SecretBase_Shrub1/border.bin | 0 data/layouts/SecretBase_Shrub1/layout.inc | 16 + .../SecretBase_Shrub1/map.bin | 0 .../SecretBase_Shrub2/border.bin | 0 data/layouts/SecretBase_Shrub2/layout.inc | 16 + .../SecretBase_Shrub2/map.bin | 0 .../SecretBase_Shrub3/border.bin | 0 data/layouts/SecretBase_Shrub3/layout.inc | 16 + .../SecretBase_Shrub3/map.bin | 0 .../SecretBase_Shrub4/border.bin | 0 data/layouts/SecretBase_Shrub4/layout.inc | 16 + .../SecretBase_Shrub4/map.bin | 0 .../SecretBase_Tree1/border.bin | 0 data/layouts/SecretBase_Tree1/layout.inc | 16 + .../SecretBase_Tree1/map.bin | 0 .../SecretBase_Tree2/border.bin | 0 data/layouts/SecretBase_Tree2/layout.inc | 16 + .../SecretBase_Tree2/map.bin | 0 .../SecretBase_Tree3/border.bin | 0 data/layouts/SecretBase_Tree3/layout.inc | 16 + .../SecretBase_Tree3/map.bin | 0 .../SecretBase_Tree4/border.bin | 0 data/layouts/SecretBase_Tree4/layout.inc | 16 + .../SecretBase_Tree4/map.bin | 0 .../SecretBase_YellowCave1/border.bin | 0 .../layouts/SecretBase_YellowCave1/layout.inc | 16 + .../SecretBase_YellowCave1/map.bin | 0 .../SecretBase_YellowCave2/border.bin | 0 .../layouts/SecretBase_YellowCave2/layout.inc | 16 + .../SecretBase_YellowCave2/map.bin | 0 .../SecretBase_YellowCave3/border.bin | 0 .../layouts/SecretBase_YellowCave3/layout.inc | 16 + .../SecretBase_YellowCave3/map.bin | 0 .../SecretBase_YellowCave4/border.bin | 0 .../layouts/SecretBase_YellowCave4/layout.inc | 16 + .../SecretBase_YellowCave4/map.bin | 0 .../ShoalCave_HighTideEntranceRoom/border.bin | 0 .../ShoalCave_HighTideEntranceRoom/layout.inc | 16 + .../ShoalCave_HighTideEntranceRoom/map.bin | 0 .../ShoalCave_HighTideInnerRoom/border.bin | 0 .../ShoalCave_HighTideInnerRoom/layout.inc | 16 + .../ShoalCave_HighTideInnerRoom/map.bin | 0 .../ShoalCave_LowTideEntranceRoom/border.bin | 0 .../ShoalCave_LowTideEntranceRoom/layout.inc | 16 + .../ShoalCave_LowTideEntranceRoom/map.bin | 0 .../ShoalCave_LowTideIceRoom/border.bin | 0 .../ShoalCave_LowTideIceRoom/layout.inc | 16 + .../ShoalCave_LowTideIceRoom/map.bin | 0 .../ShoalCave_LowTideInnerRoom/border.bin | 0 .../ShoalCave_LowTideInnerRoom/layout.inc | 16 + .../ShoalCave_LowTideInnerRoom/map.bin | 0 .../ShoalCave_LowTideLowerRoom/border.bin | 0 .../ShoalCave_LowTideLowerRoom/layout.inc | 16 + .../ShoalCave_LowTideLowerRoom/map.bin | 0 .../ShoalCave_LowTideStairsRoom/border.bin | 0 .../ShoalCave_LowTideStairsRoom/layout.inc | 16 + .../ShoalCave_LowTideStairsRoom/map.bin | 0 .../SingleBattleColosseum}/border.bin | 0 data/layouts/SingleBattleColosseum/layout.inc | 16 + .../SingleBattleColosseum/map.bin | 0 .../SkyPillar_1F}/border.bin | 0 data/layouts/SkyPillar_1F/layout.inc | 16 + data/{maps => layouts}/SkyPillar_1F/map.bin | 0 .../SkyPillar_2F}/border.bin | 0 data/layouts/SkyPillar_2F/layout.inc | 16 + data/{maps => layouts}/SkyPillar_2F/map.bin | 0 .../SkyPillar_3F}/border.bin | 0 data/layouts/SkyPillar_3F/layout.inc | 16 + data/{maps => layouts}/SkyPillar_3F/map.bin | 0 .../SkyPillar_4F}/border.bin | 0 data/layouts/SkyPillar_4F/layout.inc | 16 + data/{maps => layouts}/SkyPillar_4F/map.bin | 0 .../SkyPillar_5F}/border.bin | 0 data/layouts/SkyPillar_5F/layout.inc | 16 + data/{maps => layouts}/SkyPillar_5F/map.bin | 0 .../SkyPillar_Entrance/border.bin | 0 data/layouts/SkyPillar_Entrance/layout.inc | 16 + .../SkyPillar_Entrance/map.bin | 0 .../SkyPillar_Outside/border.bin | 0 data/layouts/SkyPillar_Outside/layout.inc | 16 + .../SkyPillar_Outside/map.bin | 0 .../SkyPillar_Top/border.bin | 0 data/layouts/SkyPillar_Top/layout.inc | 16 + data/{maps => layouts}/SkyPillar_Top/map.bin | 0 .../SlateportCity/border.bin | 0 data/layouts/SlateportCity/layout.inc | 16 + data/{maps => layouts}/SlateportCity/map.bin | Bin .../SlateportCity_OceanicMuseum_1F/border.bin | Bin .../SlateportCity_OceanicMuseum_1F/layout.inc | 16 + .../SlateportCity_OceanicMuseum_1F/map.bin | 0 .../SlateportCity_OceanicMuseum_2F/border.bin | Bin .../SlateportCity_OceanicMuseum_2F/layout.inc | 16 + .../SlateportCity_OceanicMuseum_2F/map.bin | 0 .../SlateportCity_PokemonFanClub/border.bin | Bin .../SlateportCity_PokemonFanClub/layout.inc | 16 + .../SlateportCity_PokemonFanClub/map.bin | Bin .../border.bin | 0 .../layout.inc | 16 + .../SlateportCity_SternsShipyard_1F/map.bin | 0 .../border.bin | 0 .../layout.inc | 16 + .../SlateportCity_SternsShipyard_2F/map.bin | 0 .../SootopolisCity/border.bin | 0 data/layouts/SootopolisCity/layout.inc | 16 + data/{maps => layouts}/SootopolisCity/map.bin | 0 .../SootopolisCity_Gym_1F/border.bin | Bin data/layouts/SootopolisCity_Gym_1F/layout.inc | 16 + .../SootopolisCity_Gym_1F/map.bin | Bin .../SootopolisCity_Gym_B1F/border.bin | Bin .../layouts/SootopolisCity_Gym_B1F/layout.inc | 16 + .../SootopolisCity_Gym_B1F/map.bin | 0 .../SootopolisCity_House1/border.bin | 0 data/layouts/SootopolisCity_House1/layout.inc | 16 + .../SootopolisCity_House1/map.bin | 0 .../SootopolisCity_House2/border.bin | 0 data/layouts/SootopolisCity_House2/layout.inc | 16 + .../SootopolisCity_House2/map.bin | 0 .../SootopolisCity_House3/border.bin | 0 data/layouts/SootopolisCity_House3/layout.inc | 16 + .../SootopolisCity_House3/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../SouthernIsland_Exterior/border.bin | 0 .../SouthernIsland_Exterior/layout.inc | 16 + .../SouthernIsland_Exterior/map.bin | 0 .../SouthernIsland_Interior/border.bin | 0 .../SouthernIsland_Interior/layout.inc | 16 + .../SouthernIsland_Interior/map.bin | 0 .../TerraCave_End/border.bin | 0 data/layouts/TerraCave_End/layout.inc | 16 + data/{maps => layouts}/TerraCave_End/map.bin | 0 .../TerraCave_Entrance/border.bin | 0 data/layouts/TerraCave_Entrance/layout.inc | 16 + .../TerraCave_Entrance/map.bin | 0 data/{maps => layouts}/TradeCenter/border.bin | 0 data/layouts/TradeCenter/layout.inc | 16 + data/{maps => layouts}/TradeCenter/map.bin | 0 .../TrainerHill_1F/border.bin | 0 data/layouts/TrainerHill_1F/layout.inc | 16 + data/{maps => layouts}/TrainerHill_1F/map.bin | 0 .../TrainerHill_2F/border.bin | 0 data/layouts/TrainerHill_2F/layout.inc | 16 + data/{maps => layouts}/TrainerHill_2F/map.bin | 0 .../TrainerHill_3F/border.bin | 0 data/layouts/TrainerHill_3F/layout.inc | 16 + data/{maps => layouts}/TrainerHill_3F/map.bin | 0 .../TrainerHill_4F/border.bin | 0 data/layouts/TrainerHill_4F/layout.inc | 16 + data/{maps => layouts}/TrainerHill_4F/map.bin | 0 .../TrainerHill_Entrance/border.bin | 0 data/layouts/TrainerHill_Entrance/layout.inc | 16 + .../TrainerHill_Entrance/map.bin | 0 .../TrainerHill_Roof/border.bin | 0 data/layouts/TrainerHill_Roof/layout.inc | 16 + .../TrainerHill_Roof/map.bin | 0 data/{maps => layouts}/Underwater1/border.bin | 0 data/layouts/Underwater1/layout.inc | 16 + data/{maps => layouts}/Underwater1/map.bin | 0 data/{maps => layouts}/Underwater2/border.bin | 0 data/layouts/Underwater2/layout.inc | 16 + data/{maps => layouts}/Underwater2/map.bin | 0 data/{maps => layouts}/Underwater3/border.bin | 0 data/layouts/Underwater3/layout.inc | 16 + data/{maps => layouts}/Underwater3/map.bin | 0 data/{maps => layouts}/Underwater4/border.bin | 0 data/layouts/Underwater4/layout.inc | 16 + data/{maps => layouts}/Underwater4/map.bin | 0 data/{maps => layouts}/Underwater5/border.bin | 0 data/layouts/Underwater5/layout.inc | 16 + data/{maps => layouts}/Underwater5/map.bin | 0 data/{maps => layouts}/Underwater6/border.bin | 0 data/layouts/Underwater6/layout.inc | 16 + data/{maps => layouts}/Underwater6/map.bin | 0 data/{maps => layouts}/Underwater7/border.bin | 0 data/layouts/Underwater7/layout.inc | 16 + data/{maps => layouts}/Underwater7/map.bin | 0 .../Underwater_MarineCave/border.bin | 0 data/layouts/Underwater_MarineCave/layout.inc | 16 + .../Underwater_MarineCave/map.bin | 0 .../Underwater_Route134/border.bin | 0 data/layouts/Underwater_Route134/layout.inc | 16 + .../Underwater_Route134/map.bin | 0 .../Underwater_SeafloorCavern/border.bin | 0 .../Underwater_SeafloorCavern/layout.inc | 16 + .../Underwater_SeafloorCavern/map.bin | 0 .../Underwater_SealedChamber/border.bin | 0 .../Underwater_SealedChamber/layout.inc | 16 + .../Underwater_SealedChamber/map.bin | 0 .../Underwater_SootopolisCity/border.bin | 0 .../Underwater_SootopolisCity/layout.inc | 16 + .../Underwater_SootopolisCity/map.bin | 0 data/{maps => layouts}/UnionRoom/border.bin | Bin data/layouts/UnionRoom/layout.inc | 16 + data/{maps => layouts}/UnionRoom/map.bin | 0 .../UnknownMap_08417FC4/border.bin | 0 data/layouts/UnknownMap_08417FC4/layout.inc | 16 + .../UnknownMap_08417FC4/map.bin | 0 .../UnknownMap_08428450/border.bin | 0 data/layouts/UnknownMap_08428450/layout.inc | 16 + .../UnknownMap_08428450/map.bin | Bin .../UnknownMap_084294C4/border.bin | 0 data/layouts/UnknownMap_084294C4/layout.inc | 16 + .../UnknownMap_084294C4/map.bin | Bin .../UnknownMap_084294E8/border.bin | 0 data/layouts/UnknownMap_084294E8/layout.inc | 16 + .../UnknownMap_084294E8/map.bin | Bin .../UnknownMap_0843E6C0/border.bin | 0 data/layouts/UnknownMap_0843E6C0/layout.inc | 16 + .../UnknownMap_0843E6C0/map.bin | Bin .../UnknownMap_0843E6E4/border.bin | 0 data/layouts/UnknownMap_0843E6E4/layout.inc | 16 + .../UnknownMap_0843E6E4/map.bin | Bin .../UnknownMap_0843E708/border.bin | 0 data/layouts/UnknownMap_0843E708/layout.inc | 16 + .../UnknownMap_0843E708/map.bin | Bin .../UnknownMap_0843E72C/border.bin | 0 data/layouts/UnknownMap_0843E72C/layout.inc | 16 + .../UnknownMap_0843E72C/map.bin | Bin .../UnknownMap_0843E750/border.bin | 0 data/layouts/UnknownMap_0843E750/layout.inc | 16 + .../UnknownMap_0843E750/map.bin | Bin .../UnknownMap_0843E774/border.bin | 0 data/layouts/UnknownMap_0843E774/layout.inc | 16 + .../UnknownMap_0843E774/map.bin | Bin .../UnknownMap_0843E798/border.bin | 0 data/layouts/UnknownMap_0843E798/layout.inc | 16 + .../UnknownMap_0843E798/map.bin | Bin .../UnknownMap_0843E7BC/border.bin | 0 data/layouts/UnknownMap_0843E7BC/layout.inc | 16 + .../UnknownMap_0843E7BC/map.bin | Bin .../UnknownMap_0843E7E0/border.bin | 0 data/layouts/UnknownMap_0843E7E0/layout.inc | 16 + .../UnknownMap_0843E7E0/map.bin | Bin .../UnknownMap_0843E804/border.bin | 0 data/layouts/UnknownMap_0843E804/layout.inc | 16 + .../UnknownMap_0843E804/map.bin | Bin .../UnknownMap_0843E828/border.bin | 0 data/layouts/UnknownMap_0843E828/layout.inc | 16 + .../UnknownMap_0843E828/map.bin | Bin .../UnknownMap_0843E84C/border.bin | 0 data/layouts/UnknownMap_0843E84C/layout.inc | 16 + .../UnknownMap_0843E84C/map.bin | Bin .../UnknownMap_0843E870/border.bin | 0 data/layouts/UnknownMap_0843E870/layout.inc | 16 + .../UnknownMap_0843E870/map.bin | Bin .../UnknownMap_0843E894/border.bin | 0 data/layouts/UnknownMap_0843E894/layout.inc | 15 + .../UnknownMap_0843E894/map.bin | Bin .../UnknownMap_08447028/border.bin | 0 data/layouts/UnknownMap_08447028/layout.inc | 16 + .../UnknownMap_08447028/map.bin | 0 .../UnknownMap_0845A394/border.bin | 0 data/layouts/UnknownMap_0845A394/layout.inc | 16 + .../UnknownMap_0845A394/map.bin | Bin .../UnknownMap_0845D470/border.bin | 0 data/layouts/UnknownMap_0845D470/layout.inc | 16 + .../UnknownMap_0845D470/map.bin | 0 .../UnknownMap_0845ECB4/border.bin | 0 data/layouts/UnknownMap_0845ECB4/layout.inc | 16 + .../UnknownMap_0845ECB4/map.bin | 0 .../UnknownMap_08469200/border.bin | 0 data/layouts/UnknownMap_08469200/layout.inc | 16 + .../UnknownMap_08469200/map.bin | 0 .../UnknownMap_084693AC/border.bin | Bin data/layouts/UnknownMap_084693AC/layout.inc | 16 + .../UnknownMap_084693AC/map.bin | Bin .../UnknownMap_08470BD8/border.bin | Bin data/layouts/UnknownMap_08470BD8/layout.inc | 16 + .../UnknownMap_08470BD8/map.bin | Bin .../UnknownMap_08480DAC/border.bin | 0 data/layouts/UnknownMap_08480DAC/layout.inc | 16 + .../UnknownMap_08480DAC/map.bin | Bin .../UnknownMap_08480F54/border.bin | 0 data/layouts/UnknownMap_08480F54/layout.inc | 16 + .../UnknownMap_08480F54/map.bin | 0 .../UnknownMap_084810FC/border.bin | 0 data/layouts/UnknownMap_084810FC/layout.inc | 16 + .../UnknownMap_084810FC/map.bin | 0 .../UnknownMap_084812A4/border.bin | 0 data/layouts/UnknownMap_084812A4/layout.inc | 16 + .../UnknownMap_084812A4/map.bin | 0 .../UnknownMap_0848144C/border.bin | 0 data/layouts/UnknownMap_0848144C/layout.inc | 16 + .../UnknownMap_0848144C/map.bin | 0 .../UnknownMap_084815F4/border.bin | 0 data/layouts/UnknownMap_084815F4/layout.inc | 16 + .../UnknownMap_084815F4/map.bin | 0 .../UnknownMap_08481B24/border.bin | 0 data/layouts/UnknownMap_08481B24/layout.inc | 16 + .../UnknownMap_08481B24/map.bin | 0 .../UnknownMap_08481DBC/border.bin | Bin data/layouts/UnknownMap_08481DBC/layout.inc | 16 + .../UnknownMap_08481DBC/map.bin | 0 .../UnknownMap_25_29/border.bin | 0 data/layouts/UnknownMap_25_29/layout.inc | 16 + .../UnknownMap_25_29/map.bin | 0 .../UnknownMap_25_30/border.bin | 0 data/layouts/UnknownMap_25_30/layout.inc | 16 + .../UnknownMap_25_30/map.bin | 0 .../UnknownMap_25_31/border.bin | 0 data/layouts/UnknownMap_25_31/layout.inc | 16 + .../UnknownMap_25_31/map.bin | 0 .../UnknownMap_25_32/border.bin | 0 data/layouts/UnknownMap_25_32/layout.inc | 16 + .../UnknownMap_25_32/map.bin | 0 .../UnknownMap_25_33/border.bin | 0 data/layouts/UnknownMap_25_33/layout.inc | 16 + .../UnknownMap_25_33/map.bin | 0 .../UnknownMap_25_34/border.bin | 0 data/layouts/UnknownMap_25_34/layout.inc | 16 + .../UnknownMap_25_34/map.bin | 0 .../VerdanturfTown/border.bin | Bin data/layouts/VerdanturfTown/layout.inc | 16 + data/{maps => layouts}/VerdanturfTown/map.bin | Bin .../border.bin | Bin .../layout.inc | 16 + .../map.bin | Bin .../VerdanturfTown_WandasHouse/border.bin | Bin .../VerdanturfTown_WandasHouse/layout.inc | 16 + .../VerdanturfTown_WandasHouse/map.bin | Bin .../VictoryRoad_1F/border.bin | 0 data/layouts/VictoryRoad_1F/layout.inc | 16 + data/{maps => layouts}/VictoryRoad_1F/map.bin | 0 .../VictoryRoad_B1F/border.bin | 0 data/layouts/VictoryRoad_B1F/layout.inc | 16 + .../{maps => layouts}/VictoryRoad_B1F/map.bin | 0 .../VictoryRoad_B2F/border.bin | 0 data/layouts/VictoryRoad_B2F/layout.inc | 16 + .../{maps => layouts}/VictoryRoad_B2F/map.bin | 0 data/layouts_table.inc | 444 + data/maps.s | 6 +- .../AbandonedShip_CaptainsOffice/header.inc | 2 +- .../AbandonedShip_Corridors_1F/header.inc | 2 +- .../AbandonedShip_Corridors_B1F/header.inc | 2 +- data/maps/AbandonedShip_Deck/header.inc | 2 +- .../header.inc | 2 +- .../AbandonedShip_HiddenFloorRooms/header.inc | 2 +- data/maps/AbandonedShip_Room_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_B1F/header.inc | 2 +- .../maps/AbandonedShip_Underwater1/header.inc | 2 +- .../maps/AbandonedShip_Underwater2/header.inc | 2 +- data/maps/AlteringCave/header.inc | 2 +- data/maps/AncientTomb/header.inc | 2 +- data/maps/AquaHideout_1F/header.inc | 2 +- data/maps/AquaHideout_B1F/header.inc | 2 +- data/maps/AquaHideout_B2F/header.inc | 2 +- .../AquaHideout_UnusedRubyMap1/header.inc | 2 +- .../AquaHideout_UnusedRubyMap2/header.inc | 2 +- .../AquaHideout_UnusedRubyMap3/header.inc | 2 +- data/maps/ArtisanCave_1F/header.inc | 2 +- data/maps/ArtisanCave_B1F/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../BattleFrontier_BattleDomeLobby/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../BattleFrontier_BattlePikeLobby/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/BattleFrontier_Lounge1/header.inc | 2 +- data/maps/BattleFrontier_Lounge2/header.inc | 2 +- data/maps/BattleFrontier_Lounge3/header.inc | 2 +- data/maps/BattleFrontier_Lounge4/header.inc | 2 +- data/maps/BattleFrontier_Lounge5/header.inc | 2 +- data/maps/BattleFrontier_Lounge6/header.inc | 2 +- data/maps/BattleFrontier_Lounge7/header.inc | 2 +- data/maps/BattleFrontier_Lounge8/header.inc | 2 +- data/maps/BattleFrontier_Lounge9/header.inc | 2 +- data/maps/BattleFrontier_Mart/header.inc | 2 +- .../BattleFrontier_OutsideEast/header.inc | 2 +- .../BattleFrontier_OutsideWest/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../BattleFrontier_RankingHall/header.inc | 2 +- .../BattleFrontier_ReceptionGate/header.inc | 2 +- .../BattleFrontier_ScottsHouse/header.inc | 2 +- data/maps/BattlePyramidSquare01/header.inc | 2 +- data/maps/BattlePyramidSquare02/header.inc | 2 +- data/maps/BattlePyramidSquare03/header.inc | 2 +- data/maps/BattlePyramidSquare04/header.inc | 2 +- data/maps/BattlePyramidSquare05/header.inc | 2 +- data/maps/BattlePyramidSquare06/header.inc | 2 +- data/maps/BattlePyramidSquare07/header.inc | 2 +- data/maps/BattlePyramidSquare08/header.inc | 2 +- data/maps/BattlePyramidSquare09/header.inc | 2 +- data/maps/BattlePyramidSquare10/header.inc | 2 +- data/maps/BattlePyramidSquare11/header.inc | 2 +- data/maps/BattlePyramidSquare12/header.inc | 2 +- data/maps/BattlePyramidSquare13/header.inc | 2 +- data/maps/BattlePyramidSquare14/header.inc | 2 +- data/maps/BattlePyramidSquare15/header.inc | 2 +- data/maps/BattlePyramidSquare16/header.inc | 2 +- data/maps/BirthIsland_Exterior/header.inc | 2 +- data/maps/BirthIsland_Harbor/header.inc | 2 +- data/maps/CaveOfOrigin_1F/header.inc | 2 +- data/maps/CaveOfOrigin_B1F/header.inc | 2 +- data/maps/CaveOfOrigin_Entrance/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/DesertRuins/header.inc | 2 +- data/maps/DesertUnderpass/header.inc | 2 +- data/maps/DewfordTown/header.inc | 2 +- data/maps/DewfordTown_Gym/header.inc | 2 +- data/maps/DewfordTown_Hall/header.inc | 2 +- data/maps/DewfordTown_House1/header.inc | 2 +- data/maps/DewfordTown_House2/header.inc | 2 +- .../DewfordTown_PokemonCenter_1F/header.inc | 2 +- .../DewfordTown_PokemonCenter_2F/header.inc | 2 +- data/maps/DoubleBattleColosseum/header.inc | 2 +- data/maps/EverGrandeCity/header.inc | 2 +- .../EverGrandeCity_ChampionsRoom/header.inc | 2 +- .../maps/EverGrandeCity_DrakesRoom/header.inc | 2 +- .../EverGrandeCity_GlaciasRoom/header.inc | 2 +- data/maps/EverGrandeCity_Hall1/header.inc | 2 +- data/maps/EverGrandeCity_Hall2/header.inc | 2 +- data/maps/EverGrandeCity_Hall3/header.inc | 2 +- data/maps/EverGrandeCity_Hall4/header.inc | 2 +- data/maps/EverGrandeCity_Hall5/header.inc | 2 +- .../maps/EverGrandeCity_HallOfFame/header.inc | 2 +- .../EverGrandeCity_PhoebesRoom/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../EverGrandeCity_SidneysRoom/header.inc | 2 +- data/maps/FallarborTown/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../FallarborTown_BattleTentLobby/header.inc | 2 +- data/maps/FallarborTown_House1/header.inc | 2 +- data/maps/FallarborTown_House2/header.inc | 2 +- data/maps/FallarborTown_Mart/header.inc | 2 +- .../FallarborTown_PokemonCenter_1F/header.inc | 2 +- .../FallarborTown_PokemonCenter_2F/header.inc | 2 +- data/maps/FarawayIsland_Entrance/header.inc | 2 +- data/maps/FarawayIsland_Interior/header.inc | 2 +- data/maps/FieryPath/header.inc | 2 +- data/maps/FortreeCity/header.inc | 2 +- .../FortreeCity_DecorationShop/header.inc | 2 +- data/maps/FortreeCity_Gym/header.inc | 2 +- data/maps/FortreeCity_House1/header.inc | 2 +- data/maps/FortreeCity_House2/header.inc | 2 +- data/maps/FortreeCity_House3/header.inc | 2 +- data/maps/FortreeCity_House4/header.inc | 2 +- data/maps/FortreeCity_House5/header.inc | 2 +- data/maps/FortreeCity_Mart/header.inc | 2 +- .../FortreeCity_PokemonCenter_1F/header.inc | 2 +- .../FortreeCity_PokemonCenter_2F/header.inc | 2 +- data/maps/GraniteCave_1F/header.inc | 2 +- data/maps/GraniteCave_B1F/header.inc | 2 +- data/maps/GraniteCave_B2F/header.inc | 2 +- data/maps/GraniteCave_StevensRoom/header.inc | 2 +- data/maps/InsideOfTruck/header.inc | 2 +- data/maps/IslandCave/header.inc | 2 +- data/maps/JaggedPass/header.inc | 2 +- data/maps/LavaridgeTown/header.inc | 2 +- data/maps/LavaridgeTown_Gym_1F/header.inc | 2 +- data/maps/LavaridgeTown_Gym_B1F/header.inc | 2 +- data/maps/LavaridgeTown_HerbShop/header.inc | 2 +- data/maps/LavaridgeTown_House/header.inc | 2 +- data/maps/LavaridgeTown_Mart/header.inc | 2 +- .../LavaridgeTown_PokemonCenter_1F/header.inc | 2 +- .../LavaridgeTown_PokemonCenter_2F/header.inc | 2 +- data/maps/LilycoveCity/header.inc | 2 +- data/maps/LilycoveCity_ContestHall/header.inc | 2 +- .../maps/LilycoveCity_ContestLobby/header.inc | 2 +- .../LilycoveCity_CoveLilyMotel_1F/header.inc | 2 +- .../LilycoveCity_CoveLilyMotel_2F/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/LilycoveCity_Harbor/header.inc | 2 +- data/maps/LilycoveCity_House1/header.inc | 2 +- data/maps/LilycoveCity_House2/header.inc | 2 +- data/maps/LilycoveCity_House3/header.inc | 2 +- data/maps/LilycoveCity_House4/header.inc | 2 +- .../LilycoveCity_LilycoveMuseum_1F/header.inc | 2 +- .../LilycoveCity_LilycoveMuseum_2F/header.inc | 2 +- .../LilycoveCity_MoveDeletersHouse/header.inc | 2 +- .../LilycoveCity_PokemonCenter_1F/header.inc | 2 +- .../LilycoveCity_PokemonCenter_2F/header.inc | 2 +- .../header.inc | 2 +- data/maps/LilycoveCity_UnusedMart/header.inc | 2 +- data/maps/LinkContestRoom1/header.inc | 2 +- data/maps/LinkContestRoom2/header.inc | 2 +- data/maps/LinkContestRoom3/header.inc | 2 +- data/maps/LinkContestRoom4/header.inc | 2 +- data/maps/LinkContestRoom5/header.inc | 2 +- data/maps/LinkContestRoom6/header.inc | 2 +- data/maps/LittlerootTown/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../LittlerootTown_MaysHouse_1F/header.inc | 2 +- .../LittlerootTown_MaysHouse_2F/header.inc | 2 +- .../header.inc | 2 +- data/maps/MagmaHideout_1F/header.inc | 2 +- data/maps/MagmaHideout_2F_1R/header.inc | 2 +- data/maps/MagmaHideout_2F_2R/header.inc | 2 +- data/maps/MagmaHideout_2F_3R/header.inc | 2 +- data/maps/MagmaHideout_3F_1R/header.inc | 2 +- data/maps/MagmaHideout_3F_2R/header.inc | 2 +- data/maps/MagmaHideout_3F_3R/header.inc | 2 +- data/maps/MagmaHideout_4F/header.inc | 2 +- data/maps/MarineCave_End/header.inc | 2 +- data/maps/MarineCave_Entrance/header.inc | 2 +- data/maps/MauvilleCity/header.inc | 2 +- data/maps/MauvilleCity_BikeShop/header.inc | 2 +- data/maps/MauvilleCity_GameCorner/header.inc | 2 +- data/maps/MauvilleCity_Gym/header.inc | 2 +- data/maps/MauvilleCity_House1/header.inc | 2 +- data/maps/MauvilleCity_House2/header.inc | 2 +- data/maps/MauvilleCity_Mart/header.inc | 2 +- .../MauvilleCity_PokemonCenter_1F/header.inc | 2 +- .../MauvilleCity_PokemonCenter_2F/header.inc | 2 +- data/maps/MeteorFalls_1F_1R/header.inc | 2 +- data/maps/MeteorFalls_1F_2R/header.inc | 2 +- data/maps/MeteorFalls_B1F_1R/header.inc | 2 +- data/maps/MeteorFalls_B1F_2R/header.inc | 2 +- data/maps/MeteorFalls_StevensCave/header.inc | 2 +- data/maps/MirageTower_1F/header.inc | 2 +- data/maps/MirageTower_2F/header.inc | 2 +- data/maps/MirageTower_3F/header.inc | 2 +- data/maps/MirageTower_4F/header.inc | 2 +- data/maps/MossdeepCity/header.inc | 2 +- .../MossdeepCity_GameCorner_1F/header.inc | 2 +- .../MossdeepCity_GameCorner_B1F/header.inc | 2 +- data/maps/MossdeepCity_Gym/header.inc | 2 +- data/maps/MossdeepCity_House1/header.inc | 2 +- data/maps/MossdeepCity_House2/header.inc | 2 +- data/maps/MossdeepCity_House3/header.inc | 2 +- data/maps/MossdeepCity_House4/header.inc | 2 +- data/maps/MossdeepCity_Mart/header.inc | 2 +- .../MossdeepCity_PokemonCenter_1F/header.inc | 2 +- .../MossdeepCity_PokemonCenter_2F/header.inc | 2 +- .../MossdeepCity_SpaceCenter_1F/header.inc | 2 +- .../MossdeepCity_SpaceCenter_2F/header.inc | 2 +- .../maps/MossdeepCity_StevensHouse/header.inc | 2 +- data/maps/MtChimney/header.inc | 2 +- .../maps/MtChimney_CableCarStation/header.inc | 2 +- data/maps/MtPyre_1F/header.inc | 2 +- data/maps/MtPyre_2F/header.inc | 2 +- data/maps/MtPyre_3F/header.inc | 2 +- data/maps/MtPyre_4F/header.inc | 2 +- data/maps/MtPyre_5F/header.inc | 2 +- data/maps/MtPyre_6F/header.inc | 2 +- data/maps/MtPyre_Exterior/header.inc | 2 +- data/maps/MtPyre_Summit/header.inc | 2 +- data/maps/NavelRock_B1F/header.inc | 2 +- data/maps/NavelRock_Bottom/header.inc | 2 +- data/maps/NavelRock_Down01/header.inc | 2 +- data/maps/NavelRock_Down02/header.inc | 2 +- data/maps/NavelRock_Down03/header.inc | 2 +- data/maps/NavelRock_Down04/header.inc | 2 +- data/maps/NavelRock_Down05/header.inc | 2 +- data/maps/NavelRock_Down06/header.inc | 2 +- data/maps/NavelRock_Down07/header.inc | 2 +- data/maps/NavelRock_Down08/header.inc | 2 +- data/maps/NavelRock_Down09/header.inc | 2 +- data/maps/NavelRock_Down10/header.inc | 2 +- data/maps/NavelRock_Down11/header.inc | 2 +- data/maps/NavelRock_Entrance/header.inc | 2 +- data/maps/NavelRock_Exterior/header.inc | 2 +- data/maps/NavelRock_Fork/header.inc | 2 +- data/maps/NavelRock_Harbor/header.inc | 2 +- data/maps/NavelRock_Top/header.inc | 2 +- data/maps/NavelRock_Up1/header.inc | 2 +- data/maps/NavelRock_Up2/header.inc | 2 +- data/maps/NavelRock_Up3/header.inc | 2 +- data/maps/NavelRock_Up4/header.inc | 2 +- data/maps/NewMauville_Entrance/header.inc | 2 +- data/maps/NewMauville_Inside/header.inc | 2 +- data/maps/OldaleTown/header.inc | 2 +- data/maps/OldaleTown_House1/header.inc | 2 +- data/maps/OldaleTown_House2/header.inc | 2 +- data/maps/OldaleTown_Mart/header.inc | 2 +- .../OldaleTown_PokemonCenter_1F/header.inc | 2 +- .../OldaleTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PacifidlogTown/header.inc | 2 +- data/maps/PacifidlogTown_House1/header.inc | 2 +- data/maps/PacifidlogTown_House2/header.inc | 2 +- data/maps/PacifidlogTown_House3/header.inc | 2 +- data/maps/PacifidlogTown_House4/header.inc | 2 +- data/maps/PacifidlogTown_House5/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/PetalburgCity/header.inc | 2 +- data/maps/PetalburgCity_Gym/header.inc | 2 +- data/maps/PetalburgCity_House1/header.inc | 2 +- data/maps/PetalburgCity_House2/header.inc | 2 +- data/maps/PetalburgCity_Mart/header.inc | 2 +- .../PetalburgCity_PokemonCenter_1F/header.inc | 2 +- .../PetalburgCity_PokemonCenter_2F/header.inc | 2 +- .../maps/PetalburgCity_WallysHouse/header.inc | 2 +- data/maps/PetalburgWoods/header.inc | 2 +- data/maps/RecordCorner/header.inc | 2 +- data/maps/Route101/header.inc | 2 +- data/maps/Route102/header.inc | 2 +- data/maps/Route103/header.inc | 2 +- data/maps/Route104/header.inc | 2 +- data/maps/Route104_MrBrineysHouse/header.inc | 2 +- .../Route104_PrettyPetalFlowerShop/header.inc | 2 +- data/maps/Route104_Prototype/header.inc | 2 +- .../header.inc | 2 +- data/maps/Route105/header.inc | 2 +- data/maps/Route106/header.inc | 2 +- data/maps/Route107/header.inc | 2 +- data/maps/Route108/header.inc | 2 +- data/maps/Route109/header.inc | 2 +- data/maps/Route109_SeashoreHouse/header.inc | 2 +- data/maps/Route110/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../Route110_TrickHouseCorridor/header.inc | 2 +- data/maps/Route110_TrickHouseEnd/header.inc | 2 +- .../Route110_TrickHouseEntrance/header.inc | 2 +- .../Route110_TrickHousePuzzle1/header.inc | 2 +- .../Route110_TrickHousePuzzle2/header.inc | 2 +- .../Route110_TrickHousePuzzle3/header.inc | 2 +- .../Route110_TrickHousePuzzle4/header.inc | 2 +- .../Route110_TrickHousePuzzle5/header.inc | 2 +- .../Route110_TrickHousePuzzle6/header.inc | 2 +- .../Route110_TrickHousePuzzle7/header.inc | 2 +- .../Route110_TrickHousePuzzle8/header.inc | 2 +- data/maps/Route111/header.inc | 2 +- .../maps/Route111_OldLadysRestStop/header.inc | 2 +- .../Route111_WinstrateFamilysHouse/header.inc | 2 +- data/maps/Route112/header.inc | 2 +- data/maps/Route112_CableCarStation/header.inc | 2 +- data/maps/Route113/header.inc | 2 +- data/maps/Route113_GlassWorkshop/header.inc | 2 +- data/maps/Route114/header.inc | 2 +- .../Route114_FossilManiacsHouse/header.inc | 2 +- .../Route114_FossilManiacsTunnel/header.inc | 2 +- data/maps/Route114_LanettesHouse/header.inc | 2 +- data/maps/Route115/header.inc | 2 +- data/maps/Route116/header.inc | 2 +- .../Route116_TunnelersRestHouse/header.inc | 2 +- data/maps/Route117/header.inc | 2 +- data/maps/Route117_PokemonDayCare/header.inc | 2 +- data/maps/Route118/header.inc | 2 +- data/maps/Route119/header.inc | 2 +- data/maps/Route119_House/header.inc | 2 +- .../Route119_WeatherInstitute_1F/header.inc | 2 +- .../Route119_WeatherInstitute_2F/header.inc | 2 +- data/maps/Route120/header.inc | 2 +- data/maps/Route121/header.inc | 2 +- .../Route121_SafariZoneEntrance/header.inc | 2 +- data/maps/Route122/header.inc | 2 +- data/maps/Route123/header.inc | 2 +- .../Route123_BerryMastersHouse/header.inc | 2 +- data/maps/Route124/header.inc | 2 +- .../header.inc | 2 +- data/maps/Route125/header.inc | 2 +- data/maps/Route126/header.inc | 2 +- data/maps/Route127/header.inc | 2 +- data/maps/Route128/header.inc | 2 +- data/maps/Route129/header.inc | 2 +- data/maps/Route130/header.inc | 2 +- data/maps/Route131/header.inc | 2 +- data/maps/Route132/header.inc | 2 +- data/maps/Route133/header.inc | 2 +- data/maps/Route134/header.inc | 2 +- data/maps/RustboroCity/header.inc | 2 +- .../maps/RustboroCity_CuttersHouse/header.inc | 2 +- .../maps/RustboroCity_DevonCorp_1F/header.inc | 2 +- .../maps/RustboroCity_DevonCorp_2F/header.inc | 2 +- .../maps/RustboroCity_DevonCorp_3F/header.inc | 2 +- data/maps/RustboroCity_Flat1_1F/header.inc | 2 +- data/maps/RustboroCity_Flat1_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_1F/header.inc | 2 +- data/maps/RustboroCity_Flat2_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_3F/header.inc | 2 +- data/maps/RustboroCity_Gym/header.inc | 2 +- data/maps/RustboroCity_House1/header.inc | 2 +- data/maps/RustboroCity_House2/header.inc | 2 +- data/maps/RustboroCity_House3/header.inc | 2 +- data/maps/RustboroCity_Mart/header.inc | 2 +- .../RustboroCity_PokemonCenter_1F/header.inc | 2 +- .../RustboroCity_PokemonCenter_2F/header.inc | 2 +- .../RustboroCity_PokemonSchool/header.inc | 2 +- data/maps/RusturfTunnel/header.inc | 2 +- data/maps/SSTidalCorridor/header.inc | 2 +- data/maps/SSTidalLowerDeck/header.inc | 2 +- data/maps/SSTidalRooms/header.inc | 2 +- data/maps/SafariZone_North/header.inc | 2 +- data/maps/SafariZone_Northeast/header.inc | 2 +- data/maps/SafariZone_Northwest/header.inc | 2 +- data/maps/SafariZone_RestHouse/header.inc | 2 +- data/maps/SafariZone_South/header.inc | 2 +- data/maps/SafariZone_Southeast/header.inc | 2 +- data/maps/SafariZone_Southwest/header.inc | 2 +- data/maps/ScorchedSlab/header.inc | 2 +- data/maps/SeafloorCavern_Entrance/header.inc | 2 +- data/maps/SeafloorCavern_Room1/header.inc | 2 +- data/maps/SeafloorCavern_Room2/header.inc | 2 +- data/maps/SeafloorCavern_Room3/header.inc | 2 +- data/maps/SeafloorCavern_Room4/header.inc | 2 +- data/maps/SeafloorCavern_Room5/header.inc | 2 +- data/maps/SeafloorCavern_Room6/header.inc | 2 +- data/maps/SeafloorCavern_Room7/header.inc | 2 +- data/maps/SeafloorCavern_Room8/header.inc | 2 +- data/maps/SeafloorCavern_Room9/header.inc | 2 +- data/maps/SealedChamber_InnerRoom/header.inc | 2 +- data/maps/SealedChamber_OuterRoom/header.inc | 2 +- data/maps/SecretBase_BlueCave1/header.inc | 2 +- data/maps/SecretBase_BlueCave2/header.inc | 2 +- data/maps/SecretBase_BlueCave3/header.inc | 2 +- data/maps/SecretBase_BlueCave4/header.inc | 2 +- data/maps/SecretBase_BrownCave1/header.inc | 2 +- data/maps/SecretBase_BrownCave2/header.inc | 2 +- data/maps/SecretBase_BrownCave3/header.inc | 2 +- data/maps/SecretBase_BrownCave4/header.inc | 2 +- data/maps/SecretBase_RedCave1/header.inc | 2 +- data/maps/SecretBase_RedCave2/header.inc | 2 +- data/maps/SecretBase_RedCave3/header.inc | 2 +- data/maps/SecretBase_RedCave4/header.inc | 2 +- data/maps/SecretBase_Shrub1/header.inc | 2 +- data/maps/SecretBase_Shrub2/header.inc | 2 +- data/maps/SecretBase_Shrub3/header.inc | 2 +- data/maps/SecretBase_Shrub4/header.inc | 2 +- data/maps/SecretBase_Tree1/header.inc | 2 +- data/maps/SecretBase_Tree2/header.inc | 2 +- data/maps/SecretBase_Tree3/header.inc | 2 +- data/maps/SecretBase_Tree4/header.inc | 2 +- data/maps/SecretBase_YellowCave1/header.inc | 2 +- data/maps/SecretBase_YellowCave2/header.inc | 2 +- data/maps/SecretBase_YellowCave3/header.inc | 2 +- data/maps/SecretBase_YellowCave4/header.inc | 2 +- .../ShoalCave_HighTideEntranceRoom/header.inc | 2 +- .../ShoalCave_HighTideInnerRoom/header.inc | 2 +- .../ShoalCave_LowTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideIceRoom/header.inc | 2 +- .../ShoalCave_LowTideInnerRoom/header.inc | 2 +- .../ShoalCave_LowTideLowerRoom/header.inc | 2 +- .../ShoalCave_LowTideStairsRoom/header.inc | 2 +- data/maps/SingleBattleColosseum/header.inc | 2 +- data/maps/SkyPillar_1F/header.inc | 2 +- data/maps/SkyPillar_2F/header.inc | 2 +- data/maps/SkyPillar_3F/header.inc | 2 +- data/maps/SkyPillar_4F/header.inc | 2 +- data/maps/SkyPillar_5F/header.inc | 2 +- data/maps/SkyPillar_Entrance/header.inc | 2 +- data/maps/SkyPillar_Outside/header.inc | 2 +- data/maps/SkyPillar_Top/header.inc | 2 +- data/maps/SlateportCity/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../SlateportCity_BattleTentLobby/header.inc | 2 +- data/maps/SlateportCity_Harbor/header.inc | 2 +- data/maps/SlateportCity_House1/header.inc | 2 +- data/maps/SlateportCity_House2/header.inc | 2 +- data/maps/SlateportCity_Mart/header.inc | 2 +- .../SlateportCity_OceanicMuseum_1F/header.inc | 2 +- .../SlateportCity_OceanicMuseum_2F/header.inc | 2 +- .../SlateportCity_PokemonCenter_1F/header.inc | 2 +- .../SlateportCity_PokemonCenter_2F/header.inc | 2 +- .../SlateportCity_PokemonFanClub/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/SootopolisCity/header.inc | 2 +- data/maps/SootopolisCity_Gym_1F/header.inc | 2 +- data/maps/SootopolisCity_Gym_B1F/header.inc | 2 +- data/maps/SootopolisCity_House1/header.inc | 2 +- data/maps/SootopolisCity_House2/header.inc | 2 +- data/maps/SootopolisCity_House3/header.inc | 2 +- data/maps/SootopolisCity_House4/header.inc | 2 +- data/maps/SootopolisCity_House5/header.inc | 2 +- data/maps/SootopolisCity_House6/header.inc | 2 +- data/maps/SootopolisCity_House7/header.inc | 2 +- .../header.inc | 2 +- data/maps/SootopolisCity_Mart/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/SouthernIsland_Exterior/header.inc | 2 +- data/maps/SouthernIsland_Interior/header.inc | 2 +- data/maps/TerraCave_End/header.inc | 2 +- data/maps/TerraCave_Entrance/header.inc | 2 +- data/maps/TradeCenter/header.inc | 2 +- data/maps/TrainerHill_1F/header.inc | 2 +- data/maps/TrainerHill_2F/header.inc | 2 +- data/maps/TrainerHill_3F/header.inc | 2 +- data/maps/TrainerHill_4F/header.inc | 2 +- data/maps/TrainerHill_Elevator/header.inc | 2 +- data/maps/TrainerHill_Entrance/header.inc | 2 +- data/maps/TrainerHill_Roof/header.inc | 2 +- data/maps/Underwater1/header.inc | 2 +- data/maps/Underwater2/header.inc | 2 +- data/maps/Underwater3/header.inc | 2 +- data/maps/Underwater4/header.inc | 2 +- data/maps/Underwater5/header.inc | 2 +- data/maps/Underwater6/header.inc | 2 +- data/maps/Underwater7/header.inc | 2 +- data/maps/Underwater_MarineCave/header.inc | 2 +- data/maps/Underwater_Route134/header.inc | 2 +- .../maps/Underwater_SeafloorCavern/header.inc | 2 +- data/maps/Underwater_SealedChamber/header.inc | 2 +- .../maps/Underwater_SootopolisCity/header.inc | 2 +- data/maps/UnionRoom/header.inc | 2 +- data/maps/UnknownMap_25_29/header.inc | 2 +- data/maps/UnknownMap_25_30/header.inc | 2 +- data/maps/UnknownMap_25_31/header.inc | 2 +- data/maps/UnknownMap_25_32/header.inc | 2 +- data/maps/UnknownMap_25_33/header.inc | 2 +- data/maps/UnknownMap_25_34/header.inc | 2 +- data/maps/VerdanturfTown/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../VerdanturfTown_BattleTentLobby/header.inc | 2 +- .../header.inc | 2 +- data/maps/VerdanturfTown_House/header.inc | 2 +- data/maps/VerdanturfTown_Mart/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../VerdanturfTown_WandasHouse/header.inc | 2 +- data/maps/VictoryRoad_1F/header.inc | 2 +- data/maps/VictoryRoad_B1F/header.inc | 2 +- data/maps/VictoryRoad_B2F/header.inc | 2 +- data/maps/_assets.inc | 7606 ----------------- data/maps/attributes_table.inc | 444 - data/maps/{_groups.inc => groups.inc} | 0 1848 files changed, 8462 insertions(+), 8572 deletions(-) create mode 100755 data/layouts.inc rename data/{maps => layouts}/AbandonedShip_CaptainsOffice/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_CaptainsOffice/layout.inc rename data/{maps => layouts}/AbandonedShip_CaptainsOffice/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Corridors_1F/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Corridors_1F/layout.inc rename data/{maps => layouts}/AbandonedShip_Corridors_1F/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Corridors_B1F/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Corridors_B1F/layout.inc rename data/{maps => layouts}/AbandonedShip_Corridors_B1F/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Deck/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Deck/layout.inc rename data/{maps => layouts}/AbandonedShip_Deck/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_HiddenFloorCorridors/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc rename data/{maps => layouts}/AbandonedShip_HiddenFloorCorridors/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_HiddenFloorRooms/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc rename data/{maps => layouts}/AbandonedShip_HiddenFloorRooms/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Room_B1F/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Room_B1F/layout.inc rename data/{maps => layouts}/AbandonedShip_Room_B1F/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Rooms2_1F/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Rooms2_1F/layout.inc rename data/{maps => layouts}/AbandonedShip_Rooms2_1F/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Rooms2_B1F/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Rooms2_B1F/layout.inc rename data/{maps => layouts}/AbandonedShip_Rooms2_B1F/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Rooms_1F/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Rooms_1F/layout.inc rename data/{maps => layouts}/AbandonedShip_Rooms_1F/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Rooms_B1F/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Rooms_B1F/layout.inc rename data/{maps => layouts}/AbandonedShip_Rooms_B1F/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Underwater1/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Underwater1/layout.inc rename data/{maps => layouts}/AbandonedShip_Underwater1/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Underwater2/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Underwater2/layout.inc rename data/{maps => layouts}/AbandonedShip_Underwater2/map.bin (100%) rename data/{maps => layouts}/AlteringCave/border.bin (100%) create mode 100644 data/layouts/AlteringCave/layout.inc rename data/{maps => layouts}/AlteringCave/map.bin (100%) rename data/{maps => layouts}/AncientTomb/border.bin (100%) create mode 100644 data/layouts/AncientTomb/layout.inc rename data/{maps => layouts}/AncientTomb/map.bin (100%) rename data/{maps => layouts}/AquaHideout_1F/border.bin (100%) create mode 100644 data/layouts/AquaHideout_1F/layout.inc rename data/{maps => layouts}/AquaHideout_1F/map.bin (100%) rename data/{maps => layouts}/AquaHideout_B1F/border.bin (100%) create mode 100644 data/layouts/AquaHideout_B1F/layout.inc rename data/{maps => layouts}/AquaHideout_B1F/map.bin (100%) rename data/{maps => layouts}/AquaHideout_B2F/border.bin (100%) create mode 100644 data/layouts/AquaHideout_B2F/layout.inc rename data/{maps => layouts}/AquaHideout_B2F/map.bin (100%) rename data/{maps => layouts}/AquaHideout_UnusedRubyMap1/border.bin (100%) create mode 100644 data/layouts/AquaHideout_UnusedRubyMap1/layout.inc rename data/{maps => layouts}/AquaHideout_UnusedRubyMap1/map.bin (100%) rename data/{maps => layouts}/AquaHideout_UnusedRubyMap2/border.bin (100%) create mode 100644 data/layouts/AquaHideout_UnusedRubyMap2/layout.inc rename data/{maps => layouts}/AquaHideout_UnusedRubyMap2/map.bin (100%) rename data/{maps => layouts}/AquaHideout_UnusedRubyMap3/border.bin (100%) create mode 100644 data/layouts/AquaHideout_UnusedRubyMap3/layout.inc rename data/{maps => layouts}/AquaHideout_UnusedRubyMap3/map.bin (100%) rename data/{maps => layouts}/ArtisanCave_1F/border.bin (100%) create mode 100644 data/layouts/ArtisanCave_1F/layout.inc rename data/{maps => layouts}/ArtisanCave_1F/map.bin (100%) rename data/{maps => layouts}/ArtisanCave_B1F/border.bin (100%) create mode 100644 data/layouts/ArtisanCave_B1F/layout.inc rename data/{maps => layouts}/ArtisanCave_B1F/map.bin (100%) rename data/{maps/BattleFrontier_BattleArenaBattleRoom => layouts/BattleElevator}/border.bin (100%) create mode 100644 data/layouts/BattleElevator/layout.inc rename data/{maps/BattleFrontier_BattleTowerElevator => layouts/BattleElevator}/map.bin (100%) rename data/{maps/BattleFrontier_BattleArenaCorridor => layouts/BattleFrontier_BattleArenaBattleRoom}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleArenaBattleRoom/map.bin (100%) rename data/{maps/BattleFrontier_BattleArenaLobby => layouts/BattleFrontier_BattleArenaCorridor}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleArenaCorridor/map.bin (100%) rename data/{maps/BattleFrontier_BattleDomeBattleRoom => layouts/BattleFrontier_BattleArenaLobby}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleArenaLobby/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleArenaLobby/map.bin (100%) rename data/{maps/BattleFrontier_BattleDomeCorridor => layouts/BattleFrontier_BattleDomeBattleRoom}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleDomeBattleRoom/map.bin (100%) rename data/{maps/BattleFrontier_BattleDomeLobby => layouts/BattleFrontier_BattleDomeCorridor}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleDomeCorridor/map.bin (100%) rename data/{maps/BattleFrontier_BattleDomePreBattleRoom => layouts/BattleFrontier_BattleDomeLobby}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleDomeLobby/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleDomeLobby/map.bin (100%) rename data/{maps/BattleFrontier_BattleFactoryBattleRoom => layouts/BattleFrontier_BattleDomePreBattleRoom}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleDomePreBattleRoom/map.bin (100%) rename data/{maps/BattleFrontier_BattleFactoryLobby => layouts/BattleFrontier_BattleFactoryBattleRoom}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleFactoryBattleRoom/map.bin (100%) rename data/{maps/BattleFrontier_BattleFactoryPreBattleRoom => layouts/BattleFrontier_BattleFactoryLobby}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleFactoryLobby/map.bin (100%) rename data/{maps/BattleFrontier_BattlePalaceLobby => layouts/BattleFrontier_BattleFactoryPreBattleRoom}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleFactoryPreBattleRoom/map.bin (100%) rename data/{maps => layouts}/BattleFrontier_BattlePalaceBattleRoom/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc rename data/{maps => layouts}/BattleFrontier_BattlePalaceBattleRoom/map.bin (100%) rename data/{maps => layouts}/BattleFrontier_BattlePalaceCorridor/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc rename data/{maps => layouts}/BattleFrontier_BattlePalaceCorridor/map.bin (100%) rename data/{maps/BattleFrontier_BattlePikeCorridor => layouts/BattleFrontier_BattlePalaceLobby}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc rename data/{maps => layouts}/BattleFrontier_BattlePalaceLobby/map.bin (100%) rename data/{maps/BattleFrontier_BattlePikeLobby => layouts/BattleFrontier_BattlePikeCorridor}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc rename data/{maps => layouts}/BattleFrontier_BattlePikeCorridor/map.bin (100%) rename data/{maps/BattleFrontier_BattlePikeRandomRoom1 => layouts/BattleFrontier_BattlePikeLobby}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattlePikeLobby/layout.inc rename data/{maps => layouts}/BattleFrontier_BattlePikeLobby/map.bin (100%) rename data/{maps/BattleFrontier_BattlePikeRandomRoom2 => layouts/BattleFrontier_BattlePikeRandomRoom1}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc rename data/{maps => layouts}/BattleFrontier_BattlePikeRandomRoom1/map.bin (100%) rename data/{maps/BattleFrontier_BattlePikeRandomRoom3 => layouts/BattleFrontier_BattlePikeRandomRoom2}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc rename data/{maps => layouts}/BattleFrontier_BattlePikeRandomRoom2/map.bin (100%) rename data/{maps/BattleFrontier_BattlePikeThreePathRoom => layouts/BattleFrontier_BattlePikeRandomRoom3}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc rename data/{maps => layouts}/BattleFrontier_BattlePikeRandomRoom3/map.bin (100%) rename data/{maps/BattleFrontier_BattlePointExchangeServiceCorner => layouts/BattleFrontier_BattlePikeThreePathRoom}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc rename data/{maps => layouts}/BattleFrontier_BattlePikeThreePathRoom/map.bin (100%) rename data/{maps/BattleFrontier_BattlePyramidEmptySquare => layouts/BattleFrontier_BattlePointExchangeServiceCorner}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc rename data/{maps => layouts}/BattleFrontier_BattlePointExchangeServiceCorner/map.bin (100%) rename data/{maps/BattleFrontier_BattlePyramidLobby => layouts/BattleFrontier_BattlePyramidEmptySquare}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc rename data/{maps => layouts}/BattleFrontier_BattlePyramidEmptySquare/map.bin (100%) rename data/{maps/BattleFrontier_BattlePyramidTop => layouts/BattleFrontier_BattlePyramidLobby}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc rename data/{maps => layouts}/BattleFrontier_BattlePyramidLobby/map.bin (100%) rename data/{maps/BattleFrontier_BattleTowerBattleRoom => layouts/BattleFrontier_BattlePyramidTop}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattlePyramidTop/layout.inc rename data/{maps => layouts}/BattleFrontier_BattlePyramidTop/map.bin (100%) rename data/{maps/BattleFrontier_BattleTowerCorridor => layouts/BattleFrontier_BattleTowerBattleRoom}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleTowerBattleRoom/map.bin (100%) rename data/{maps/BattleFrontier_BattleTowerCorridor2 => layouts/BattleFrontier_BattleTowerCorridor}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleTowerCorridor/map.bin (100%) rename data/{maps/BattleFrontier_BattleTowerElevator => layouts/BattleFrontier_BattleTowerCorridor2}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleTowerCorridor2/map.bin (100%) rename data/{maps => layouts}/BattleFrontier_BattleTowerLobby/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleTowerLobby/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleTowerLobby/map.bin (100%) rename data/{maps => layouts}/BattleFrontier_BattleTowerMultiBattleRoom/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleTowerMultiBattleRoom/map.bin (100%) rename data/{maps => layouts}/BattleFrontier_Lounge1/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_Lounge1/layout.inc rename data/{maps/BattleFrontier_Lounge2 => layouts/BattleFrontier_Lounge1}/map.bin (100%) rename data/{maps => layouts}/BattleFrontier_Lounge2/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_Lounge2/layout.inc rename data/{maps/BattleFrontier_Lounge1 => layouts/BattleFrontier_Lounge2}/map.bin (100%) rename data/{maps => layouts}/BattleFrontier_OutsideEast/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_OutsideEast/layout.inc rename data/{maps => layouts}/BattleFrontier_OutsideEast/map.bin (100%) rename data/{maps => layouts}/BattleFrontier_OutsideWest/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_OutsideWest/layout.inc rename data/{maps => layouts}/BattleFrontier_OutsideWest/map.bin (100%) rename data/{maps => layouts}/BattleFrontier_RankingHall/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_RankingHall/layout.inc rename data/{maps => layouts}/BattleFrontier_RankingHall/map.bin (100%) rename data/{maps => layouts}/BattleFrontier_ReceptionGate/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_ReceptionGate/layout.inc rename data/{maps => layouts}/BattleFrontier_ReceptionGate/map.bin (100%) rename data/{maps => layouts}/BattleFrontier_ScottsHouse/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_ScottsHouse/layout.inc rename data/{maps => layouts}/BattleFrontier_ScottsHouse/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare01/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare01/layout.inc rename data/{maps => layouts}/BattlePyramidSquare01/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare02/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare02/layout.inc rename data/{maps => layouts}/BattlePyramidSquare02/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare03/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare03/layout.inc rename data/{maps => layouts}/BattlePyramidSquare03/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare04/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare04/layout.inc rename data/{maps => layouts}/BattlePyramidSquare04/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare05/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare05/layout.inc rename data/{maps => layouts}/BattlePyramidSquare05/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare06/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare06/layout.inc rename data/{maps => layouts}/BattlePyramidSquare06/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare07/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare07/layout.inc rename data/{maps => layouts}/BattlePyramidSquare07/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare08/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare08/layout.inc rename data/{maps => layouts}/BattlePyramidSquare08/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare09/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare09/layout.inc rename data/{maps => layouts}/BattlePyramidSquare09/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare10/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare10/layout.inc rename data/{maps => layouts}/BattlePyramidSquare10/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare11/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare11/layout.inc rename data/{maps => layouts}/BattlePyramidSquare11/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare12/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare12/layout.inc rename data/{maps => layouts}/BattlePyramidSquare12/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare13/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare13/layout.inc rename data/{maps => layouts}/BattlePyramidSquare13/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare14/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare14/layout.inc rename data/{maps => layouts}/BattlePyramidSquare14/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare15/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare15/layout.inc rename data/{maps => layouts}/BattlePyramidSquare15/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare16/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare16/layout.inc rename data/{maps => layouts}/BattlePyramidSquare16/map.bin (100%) rename data/{maps/DewfordTown_Gym => layouts/BattleTentBattleRoom}/border.bin (100%) create mode 100644 data/layouts/BattleTentBattleRoom/layout.inc rename data/{maps/FallarborTown_BattleTentBattleRoom => layouts/BattleTentBattleRoom}/map.bin (100%) rename data/{maps/EverGrandeCity_ChampionsRoom => layouts/BattleTentCorridor}/border.bin (100%) create mode 100644 data/layouts/BattleTentCorridor/layout.inc rename data/{maps/FallarborTown_BattleTentCorridor => layouts/BattleTentCorridor}/map.bin (100%) rename data/{maps/EverGrandeCity_DrakesRoom => layouts/BattleTentLobby}/border.bin (100%) create mode 100644 data/layouts/BattleTentLobby/layout.inc rename data/{maps/FallarborTown_BattleTentLobby => layouts/BattleTentLobby}/map.bin (100%) rename data/{maps => layouts}/BirthIsland_Exterior/border.bin (100%) create mode 100644 data/layouts/BirthIsland_Exterior/layout.inc rename data/{maps => layouts}/BirthIsland_Exterior/map.bin (100%) rename data/{maps/BirthIsland_Harbor => layouts/CableCarStation}/border.bin (100%) create mode 100644 data/layouts/CableCarStation/layout.inc rename data/{maps/Route112_CableCarStation => layouts/CableCarStation}/map.bin (100%) rename data/{maps => layouts}/CaveOfOrigin_1F/border.bin (100%) create mode 100644 data/layouts/CaveOfOrigin_1F/layout.inc rename data/{maps => layouts}/CaveOfOrigin_1F/map.bin (100%) rename data/{maps => layouts}/CaveOfOrigin_B1F/border.bin (100%) create mode 100644 data/layouts/CaveOfOrigin_B1F/layout.inc rename data/{maps => layouts}/CaveOfOrigin_B1F/map.bin (100%) rename data/{maps => layouts}/CaveOfOrigin_Entrance/border.bin (100%) create mode 100644 data/layouts/CaveOfOrigin_Entrance/layout.inc rename data/{maps => layouts}/CaveOfOrigin_Entrance/map.bin (100%) rename data/{maps => layouts}/CaveOfOrigin_UnusedRubySapphireMap1/border.bin (100%) create mode 100644 data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc rename data/{maps => layouts}/CaveOfOrigin_UnusedRubySapphireMap1/map.bin (100%) rename data/{maps => layouts}/CaveOfOrigin_UnusedRubySapphireMap2/border.bin (100%) create mode 100644 data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc rename data/{maps => layouts}/CaveOfOrigin_UnusedRubySapphireMap2/map.bin (100%) rename data/{maps => layouts}/CaveOfOrigin_UnusedRubySapphireMap3/border.bin (100%) create mode 100644 data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc rename data/{maps => layouts}/CaveOfOrigin_UnusedRubySapphireMap3/map.bin (100%) rename data/{maps => layouts}/DesertRuins/border.bin (100%) create mode 100644 data/layouts/DesertRuins/layout.inc rename data/{maps => layouts}/DesertRuins/map.bin (100%) rename data/{maps => layouts}/DesertUnderpass/border.bin (100%) create mode 100644 data/layouts/DesertUnderpass/layout.inc rename data/{maps => layouts}/DesertUnderpass/map.bin (100%) rename data/{maps => layouts}/DewfordTown/border.bin (100%) create mode 100644 data/layouts/DewfordTown/layout.inc rename data/{maps => layouts}/DewfordTown/map.bin (100%) rename data/{maps/EverGrandeCity_GlaciasRoom => layouts/DewfordTown_Gym}/border.bin (100%) create mode 100644 data/layouts/DewfordTown_Gym/layout.inc rename data/{maps => layouts}/DewfordTown_Gym/map.bin (100%) rename data/{maps => layouts}/DewfordTown_Hall/border.bin (100%) create mode 100644 data/layouts/DewfordTown_Hall/layout.inc rename data/{maps => layouts}/DewfordTown_Hall/map.bin (100%) rename data/{maps/DewfordTown_House1 => layouts/DoubleBattleColosseum}/border.bin (100%) create mode 100644 data/layouts/DoubleBattleColosseum/layout.inc rename data/{maps => layouts}/DoubleBattleColosseum/map.bin (100%) rename data/{maps => layouts}/EverGrandeCity/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity/layout.inc rename data/{maps => layouts}/EverGrandeCity/map.bin (100%) rename data/{maps/EverGrandeCity_Hall1 => layouts/EverGrandeCity_ChampionsRoom}/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity_ChampionsRoom/layout.inc rename data/{maps => layouts}/EverGrandeCity_ChampionsRoom/map.bin (100%) rename data/{maps/EverGrandeCity_Hall4 => layouts/EverGrandeCity_DrakesRoom}/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity_DrakesRoom/layout.inc rename data/{maps => layouts}/EverGrandeCity_DrakesRoom/map.bin (100%) rename data/{maps/EverGrandeCity_HallOfFame => layouts/EverGrandeCity_GlaciasRoom}/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity_GlaciasRoom/layout.inc rename data/{maps => layouts}/EverGrandeCity_GlaciasRoom/map.bin (100%) rename data/{maps/EverGrandeCity_PhoebesRoom => layouts/EverGrandeCity_Hall4}/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity_Hall4/layout.inc rename data/{maps => layouts}/EverGrandeCity_Hall4/map.bin (100%) rename data/{maps/EverGrandeCity_SidneysRoom => layouts/EverGrandeCity_HallOfFame}/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity_HallOfFame/layout.inc rename data/{maps => layouts}/EverGrandeCity_HallOfFame/map.bin (100%) rename data/{maps/FallarborTown_BattleTentBattleRoom => layouts/EverGrandeCity_PhoebesRoom}/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity_PhoebesRoom/layout.inc rename data/{maps => layouts}/EverGrandeCity_PhoebesRoom/map.bin (100%) rename data/{maps/DewfordTown_House2 => layouts/EverGrandeCity_PokemonLeague_1F}/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc rename data/{maps => layouts}/EverGrandeCity_PokemonLeague_1F/map.bin (100%) rename data/{maps/FallarborTown_BattleTentCorridor => layouts/EverGrandeCity_ShortHall}/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity_ShortHall/layout.inc rename data/{maps/EverGrandeCity_Hall1 => layouts/EverGrandeCity_ShortHall}/map.bin (100%) rename data/{maps/FallarborTown_BattleTentLobby => layouts/EverGrandeCity_SidneysRoom}/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity_SidneysRoom/layout.inc rename data/{maps => layouts}/EverGrandeCity_SidneysRoom/map.bin (100%) rename data/{maps => layouts}/FallarborTown/border.bin (100%) create mode 100644 data/layouts/FallarborTown/layout.inc rename data/{maps => layouts}/FallarborTown/map.bin (100%) rename data/{maps/DoubleBattleColosseum => layouts/FallarborTown_LeftoverRSContestHall}/border.bin (100%) create mode 100644 data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc rename data/{maps => layouts}/FallarborTown_LeftoverRSContestHall/map.bin (100%) rename data/{maps/EverGrandeCity_PokemonLeague_1F => layouts/FallarborTown_LeftoverRSContestLobby}/border.bin (100%) create mode 100644 data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc rename data/{maps => layouts}/FallarborTown_LeftoverRSContestLobby/map.bin (100%) rename data/{maps => layouts}/FarawayIsland_Entrance/border.bin (100%) create mode 100644 data/layouts/FarawayIsland_Entrance/layout.inc rename data/{maps => layouts}/FarawayIsland_Entrance/map.bin (100%) rename data/{maps => layouts}/FarawayIsland_Interior/border.bin (100%) create mode 100644 data/layouts/FarawayIsland_Interior/layout.inc rename data/{maps => layouts}/FarawayIsland_Interior/map.bin (100%) rename data/{maps => layouts}/FieryPath/border.bin (100%) create mode 100644 data/layouts/FieryPath/layout.inc rename data/{maps => layouts}/FieryPath/map.bin (100%) rename data/{maps => layouts}/FortreeCity/border.bin (100%) create mode 100644 data/layouts/FortreeCity/layout.inc rename data/{maps => layouts}/FortreeCity/map.bin (100%) rename data/{maps/FallarborTown_LeftoverRSContestHall => layouts/FortreeCity_DecorationShop}/border.bin (100%) create mode 100644 data/layouts/FortreeCity_DecorationShop/layout.inc rename data/{maps => layouts}/FortreeCity_DecorationShop/map.bin (100%) rename data/{maps => layouts}/FortreeCity_Gym/border.bin (100%) create mode 100644 data/layouts/FortreeCity_Gym/layout.inc rename data/{maps => layouts}/FortreeCity_Gym/map.bin (100%) rename data/{maps/FallarborTown_LeftoverRSContestLobby => layouts/FortreeCity_House1}/border.bin (100%) create mode 100644 data/layouts/FortreeCity_House1/layout.inc rename data/{maps => layouts}/FortreeCity_House1/map.bin (100%) rename data/{maps/FortreeCity_DecorationShop => layouts/FortreeCity_House2}/border.bin (100%) create mode 100644 data/layouts/FortreeCity_House2/layout.inc rename data/{maps => layouts}/FortreeCity_House2/map.bin (100%) rename data/{maps => layouts}/GraniteCave_1F/border.bin (100%) create mode 100644 data/layouts/GraniteCave_1F/layout.inc rename data/{maps => layouts}/GraniteCave_1F/map.bin (100%) rename data/{maps => layouts}/GraniteCave_B1F/border.bin (100%) create mode 100644 data/layouts/GraniteCave_B1F/layout.inc rename data/{maps => layouts}/GraniteCave_B1F/map.bin (100%) rename data/{maps => layouts}/GraniteCave_B2F/border.bin (100%) create mode 100644 data/layouts/GraniteCave_B2F/layout.inc rename data/{maps => layouts}/GraniteCave_B2F/map.bin (100%) rename data/{maps => layouts}/GraniteCave_StevensRoom/border.bin (100%) create mode 100644 data/layouts/GraniteCave_StevensRoom/layout.inc rename data/{maps => layouts}/GraniteCave_StevensRoom/map.bin (100%) rename data/{maps/FortreeCity_House1 => layouts/Harbor}/border.bin (100%) create mode 100644 data/layouts/Harbor/layout.inc rename data/{maps/SlateportCity_Harbor => layouts/Harbor}/map.bin (100%) rename data/{maps/LavaridgeTown_Gym_1F => layouts/House1}/border.bin (100%) create mode 100644 data/layouts/House1/layout.inc rename data/{maps/OldaleTown_House1 => layouts/House1}/map.bin (100%) rename data/{maps/LavaridgeTown_Gym_B1F => layouts/House2}/border.bin (100%) create mode 100644 data/layouts/House2/layout.inc rename data/{maps/OldaleTown_House2 => layouts/House2}/map.bin (100%) rename data/{maps/FortreeCity_House2 => layouts/House3}/border.bin (100%) create mode 100644 data/layouts/House3/layout.inc rename data/{maps/DewfordTown_House1 => layouts/House3}/map.bin (100%) rename data/{maps/LavaridgeTown_PokemonCenter_1F => layouts/House4}/border.bin (100%) create mode 100644 data/layouts/House4/layout.inc rename data/{maps/DewfordTown_House2 => layouts/House4}/map.bin (100%) rename data/{maps/LilycoveCity_ContestHall => layouts/HouseWithBed}/border.bin (100%) create mode 100644 data/layouts/HouseWithBed/layout.inc rename data/{maps/PetalburgCity_House2 => layouts/HouseWithBed}/map.bin (100%) rename data/{maps => layouts}/InsideOfTruck/border.bin (100%) create mode 100644 data/layouts/InsideOfTruck/layout.inc rename data/{maps => layouts}/InsideOfTruck/map.bin (100%) rename data/{maps => layouts}/IslandCave/border.bin (100%) create mode 100644 data/layouts/IslandCave/layout.inc rename data/{maps => layouts}/IslandCave/map.bin (100%) rename data/{maps/LilycoveCity_ContestLobby => layouts/IslandHarbor}/border.bin (100%) create mode 100644 data/layouts/IslandHarbor/layout.inc rename data/{maps/BirthIsland_Harbor => layouts/IslandHarbor}/map.bin (100%) rename data/{maps => layouts}/JaggedPass/border.bin (100%) create mode 100644 data/layouts/JaggedPass/layout.inc rename data/{maps => layouts}/JaggedPass/map.bin (100%) rename data/{maps => layouts}/LavaridgeTown/border.bin (100%) create mode 100644 data/layouts/LavaridgeTown/layout.inc rename data/{maps => layouts}/LavaridgeTown/map.bin (100%) rename data/{maps/LavaridgeTown_HerbShop => layouts/LavaridgeTown_Gym_1F}/border.bin (100%) create mode 100644 data/layouts/LavaridgeTown_Gym_1F/layout.inc rename data/{maps => layouts}/LavaridgeTown_Gym_1F/map.bin (100%) rename data/{maps/LilycoveCity_DepartmentStoreElevator => layouts/LavaridgeTown_Gym_B1F}/border.bin (100%) create mode 100644 data/layouts/LavaridgeTown_Gym_B1F/layout.inc rename data/{maps => layouts}/LavaridgeTown_Gym_B1F/map.bin (100%) rename data/{maps/LilycoveCity_DepartmentStore_1F => layouts/LavaridgeTown_HerbShop}/border.bin (100%) create mode 100644 data/layouts/LavaridgeTown_HerbShop/layout.inc rename data/{maps => layouts}/LavaridgeTown_HerbShop/map.bin (100%) rename data/{maps/LilycoveCity_CoveLilyMotel_1F => layouts/LavaridgeTown_PokemonCenter_1F}/border.bin (100%) create mode 100644 data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc rename data/{maps => layouts}/LavaridgeTown_PokemonCenter_1F/map.bin (100%) rename data/{maps => layouts}/LilycoveCity/border.bin (100%) create mode 100644 data/layouts/LilycoveCity/layout.inc rename data/{maps => layouts}/LilycoveCity/map.bin (100%) rename data/{maps/LilycoveCity_CoveLilyMotel_2F => layouts/LilycoveCity_ContestHall}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_ContestHall/layout.inc rename data/{maps => layouts}/LilycoveCity_ContestHall/map.bin (100%) rename data/{maps/LilycoveCity_House2 => layouts/LilycoveCity_ContestLobby}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_ContestLobby/layout.inc rename data/{maps => layouts}/LilycoveCity_ContestLobby/map.bin (100%) rename data/{maps/LilycoveCity_LilycoveMuseum_1F => layouts/LilycoveCity_CoveLilyMotel_1F}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc rename data/{maps => layouts}/LilycoveCity_CoveLilyMotel_1F/map.bin (100%) rename data/{maps/LilycoveCity_LilycoveMuseum_2F => layouts/LilycoveCity_CoveLilyMotel_2F}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc rename data/{maps => layouts}/LilycoveCity_CoveLilyMotel_2F/map.bin (100%) rename data/{maps/LilycoveCity_DepartmentStore_2F => layouts/LilycoveCity_DepartmentStoreElevator}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc rename data/{maps => layouts}/LilycoveCity_DepartmentStoreElevator/map.bin (100%) rename data/{maps => layouts}/LilycoveCity_DepartmentStoreRooftop/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc rename data/{maps => layouts}/LilycoveCity_DepartmentStoreRooftop/map.bin (100%) rename data/{maps/LilycoveCity_DepartmentStore_3F => layouts/LilycoveCity_DepartmentStore_1F}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc rename data/{maps => layouts}/LilycoveCity_DepartmentStore_1F/map.bin (100%) rename data/{maps/LilycoveCity_DepartmentStore_4F => layouts/LilycoveCity_DepartmentStore_2F}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc rename data/{maps => layouts}/LilycoveCity_DepartmentStore_2F/map.bin (100%) rename data/{maps/LilycoveCity_DepartmentStore_5F => layouts/LilycoveCity_DepartmentStore_3F}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc rename data/{maps => layouts}/LilycoveCity_DepartmentStore_3F/map.bin (100%) rename data/{maps/LittlerootTown_BrendansHouse_1F => layouts/LilycoveCity_DepartmentStore_4F}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc rename data/{maps => layouts}/LilycoveCity_DepartmentStore_4F/map.bin (100%) rename data/{maps/MauvilleCity_GameCorner => layouts/LilycoveCity_DepartmentStore_5F}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc rename data/{maps => layouts}/LilycoveCity_DepartmentStore_5F/map.bin (100%) rename data/{maps/LilycoveCity_PokemonTrainerFanClub => layouts/LilycoveCity_House2}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_House2/layout.inc rename data/{maps => layouts}/LilycoveCity_House2/map.bin (100%) rename data/{maps/LinkContestRoom1 => layouts/LilycoveCity_LilycoveMuseum_1F}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc rename data/{maps => layouts}/LilycoveCity_LilycoveMuseum_1F/map.bin (100%) rename data/{maps/LinkContestRoom2 => layouts/LilycoveCity_LilycoveMuseum_2F}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc rename data/{maps => layouts}/LilycoveCity_LilycoveMuseum_2F/map.bin (100%) rename data/{maps/LinkContestRoom3 => layouts/LilycoveCity_PokemonTrainerFanClub}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc rename data/{maps => layouts}/LilycoveCity_PokemonTrainerFanClub/map.bin (100%) rename data/{maps/LinkContestRoom4 => layouts/LinkContestRoom1}/border.bin (100%) create mode 100644 data/layouts/LinkContestRoom1/layout.inc rename data/{maps => layouts}/LinkContestRoom1/map.bin (100%) rename data/{maps/LinkContestRoom5 => layouts/LinkContestRoom2}/border.bin (100%) create mode 100644 data/layouts/LinkContestRoom2/layout.inc rename data/{maps => layouts}/LinkContestRoom2/map.bin (100%) rename data/{maps/LinkContestRoom6 => layouts/LinkContestRoom3}/border.bin (100%) create mode 100644 data/layouts/LinkContestRoom3/layout.inc rename data/{maps => layouts}/LinkContestRoom3/map.bin (100%) rename data/{maps/LittlerootTown_ProfessorBirchsLab => layouts/LinkContestRoom4}/border.bin (100%) create mode 100644 data/layouts/LinkContestRoom4/layout.inc rename data/{maps => layouts}/LinkContestRoom4/map.bin (100%) rename data/{maps/MeteorFalls_1F_1R => layouts/LinkContestRoom5}/border.bin (100%) create mode 100644 data/layouts/LinkContestRoom5/layout.inc rename data/{maps => layouts}/LinkContestRoom5/map.bin (100%) rename data/{maps/MeteorFalls_1F_2R => layouts/LinkContestRoom6}/border.bin (100%) create mode 100644 data/layouts/LinkContestRoom6/layout.inc rename data/{maps => layouts}/LinkContestRoom6/map.bin (100%) rename data/{maps => layouts}/LittlerootTown/border.bin (100%) create mode 100644 data/layouts/LittlerootTown/layout.inc rename data/{maps => layouts}/LittlerootTown/map.bin (100%) rename data/{maps/MauvilleCity_Gym => layouts/LittlerootTown_BrendansHouse_1F}/border.bin (100%) create mode 100644 data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc rename data/{maps => layouts}/LittlerootTown_BrendansHouse_1F/map.bin (100%) rename data/{maps => layouts}/LittlerootTown_BrendansHouse_2F/border.bin (100%) create mode 100644 data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc rename data/{maps => layouts}/LittlerootTown_BrendansHouse_2F/map.bin (100%) rename data/{maps => layouts}/LittlerootTown_MaysHouse_1F/border.bin (100%) create mode 100644 data/layouts/LittlerootTown_MaysHouse_1F/layout.inc rename data/{maps => layouts}/LittlerootTown_MaysHouse_1F/map.bin (100%) rename data/{maps => layouts}/LittlerootTown_MaysHouse_2F/border.bin (100%) create mode 100644 data/layouts/LittlerootTown_MaysHouse_2F/layout.inc rename data/{maps => layouts}/LittlerootTown_MaysHouse_2F/map.bin (100%) rename data/{maps/MeteorFalls_B1F_1R => layouts/LittlerootTown_ProfessorBirchsLab}/border.bin (100%) create mode 100644 data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc rename data/{maps => layouts}/LittlerootTown_ProfessorBirchsLab/map.bin (100%) rename data/{maps => layouts}/MagmaHideout_1F/border.bin (100%) create mode 100644 data/layouts/MagmaHideout_1F/layout.inc rename data/{maps => layouts}/MagmaHideout_1F/map.bin (100%) rename data/{maps => layouts}/MagmaHideout_2F_1R/border.bin (100%) create mode 100644 data/layouts/MagmaHideout_2F_1R/layout.inc rename data/{maps => layouts}/MagmaHideout_2F_1R/map.bin (100%) rename data/{maps => layouts}/MagmaHideout_2F_2R/border.bin (100%) create mode 100644 data/layouts/MagmaHideout_2F_2R/layout.inc rename data/{maps => layouts}/MagmaHideout_2F_2R/map.bin (100%) rename data/{maps => layouts}/MagmaHideout_2F_3R/border.bin (100%) create mode 100644 data/layouts/MagmaHideout_2F_3R/layout.inc rename data/{maps => layouts}/MagmaHideout_2F_3R/map.bin (100%) rename data/{maps => layouts}/MagmaHideout_3F_1R/border.bin (100%) create mode 100644 data/layouts/MagmaHideout_3F_1R/layout.inc rename data/{maps => layouts}/MagmaHideout_3F_1R/map.bin (100%) rename data/{maps => layouts}/MagmaHideout_3F_2R/border.bin (100%) create mode 100644 data/layouts/MagmaHideout_3F_2R/layout.inc rename data/{maps => layouts}/MagmaHideout_3F_2R/map.bin (100%) rename data/{maps => layouts}/MagmaHideout_3F_3R/border.bin (100%) create mode 100644 data/layouts/MagmaHideout_3F_3R/layout.inc rename data/{maps => layouts}/MagmaHideout_3F_3R/map.bin (100%) rename data/{maps => layouts}/MagmaHideout_4F/border.bin (100%) create mode 100644 data/layouts/MagmaHideout_4F/layout.inc rename data/{maps => layouts}/MagmaHideout_4F/map.bin (100%) rename data/{maps => layouts}/MarineCave_End/border.bin (100%) create mode 100644 data/layouts/MarineCave_End/layout.inc rename data/{maps => layouts}/MarineCave_End/map.bin (100%) rename data/{maps => layouts}/MarineCave_Entrance/border.bin (100%) create mode 100644 data/layouts/MarineCave_Entrance/layout.inc rename data/{maps => layouts}/MarineCave_Entrance/map.bin (100%) rename data/{maps/MossdeepCity_GameCorner_1F => layouts/Mart}/border.bin (100%) create mode 100644 data/layouts/Mart/layout.inc rename data/{maps/OldaleTown_Mart => layouts/Mart}/map.bin (100%) rename data/{maps => layouts}/MauvilleCity/border.bin (100%) create mode 100644 data/layouts/MauvilleCity/layout.inc rename data/{maps => layouts}/MauvilleCity/map.bin (100%) rename data/{maps => layouts}/MauvilleCity_BikeShop/border.bin (100%) create mode 100644 data/layouts/MauvilleCity_BikeShop/layout.inc rename data/{maps => layouts}/MauvilleCity_BikeShop/map.bin (100%) rename data/{maps/MossdeepCity_GameCorner_B1F => layouts/MauvilleCity_GameCorner}/border.bin (100%) create mode 100644 data/layouts/MauvilleCity_GameCorner/layout.inc rename data/{maps => layouts}/MauvilleCity_GameCorner/map.bin (100%) rename data/{maps/MossdeepCity_StevensHouse => layouts/MauvilleCity_Gym}/border.bin (100%) create mode 100644 data/layouts/MauvilleCity_Gym/layout.inc rename data/{maps => layouts}/MauvilleCity_Gym/map.bin (100%) rename data/{maps/MeteorFalls_B1F_2R => layouts/MeteorFalls_1F_1R}/border.bin (100%) create mode 100644 data/layouts/MeteorFalls_1F_1R/layout.inc rename data/{maps => layouts}/MeteorFalls_1F_1R/map.bin (100%) rename data/{maps/MeteorFalls_StevensCave => layouts/MeteorFalls_1F_2R}/border.bin (100%) create mode 100644 data/layouts/MeteorFalls_1F_2R/layout.inc rename data/{maps => layouts}/MeteorFalls_1F_2R/map.bin (100%) rename data/{maps/MossdeepCity_SpaceCenter_1F => layouts/MeteorFalls_B1F_1R}/border.bin (100%) create mode 100644 data/layouts/MeteorFalls_B1F_1R/layout.inc rename data/{maps => layouts}/MeteorFalls_B1F_1R/map.bin (100%) rename data/{maps/MossdeepCity_SpaceCenter_2F => layouts/MeteorFalls_B1F_2R}/border.bin (100%) create mode 100644 data/layouts/MeteorFalls_B1F_2R/layout.inc rename data/{maps => layouts}/MeteorFalls_B1F_2R/map.bin (100%) rename data/{maps/MtPyre_1F => layouts/MeteorFalls_StevensCave}/border.bin (100%) create mode 100644 data/layouts/MeteorFalls_StevensCave/layout.inc rename data/{maps => layouts}/MeteorFalls_StevensCave/map.bin (100%) rename data/{maps => layouts}/MirageTower_1F/border.bin (100%) create mode 100644 data/layouts/MirageTower_1F/layout.inc rename data/{maps => layouts}/MirageTower_1F/map.bin (100%) rename data/{maps => layouts}/MirageTower_2F/border.bin (100%) create mode 100644 data/layouts/MirageTower_2F/layout.inc rename data/{maps => layouts}/MirageTower_2F/map.bin (100%) rename data/{maps => layouts}/MirageTower_3F/border.bin (100%) create mode 100644 data/layouts/MirageTower_3F/layout.inc rename data/{maps => layouts}/MirageTower_3F/map.bin (100%) rename data/{maps => layouts}/MirageTower_4F/border.bin (100%) create mode 100644 data/layouts/MirageTower_4F/layout.inc rename data/{maps => layouts}/MirageTower_4F/map.bin (100%) rename data/{maps => layouts}/MossdeepCity/border.bin (100%) create mode 100644 data/layouts/MossdeepCity/layout.inc rename data/{maps => layouts}/MossdeepCity/map.bin (100%) rename data/{maps/OldaleTown_House1 => layouts/MossdeepCity_GameCorner_1F}/border.bin (100%) create mode 100644 data/layouts/MossdeepCity_GameCorner_1F/layout.inc rename data/{maps => layouts}/MossdeepCity_GameCorner_1F/map.bin (100%) rename data/{maps/OldaleTown_House2 => layouts/MossdeepCity_GameCorner_B1F}/border.bin (100%) create mode 100644 data/layouts/MossdeepCity_GameCorner_B1F/layout.inc rename data/{maps => layouts}/MossdeepCity_GameCorner_B1F/map.bin (100%) rename data/{maps => layouts}/MossdeepCity_Gym/border.bin (100%) create mode 100644 data/layouts/MossdeepCity_Gym/layout.inc rename data/{maps => layouts}/MossdeepCity_Gym/map.bin (100%) rename data/{maps/MtPyre_2F => layouts/MossdeepCity_SpaceCenter_1F}/border.bin (100%) create mode 100644 data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc rename data/{maps => layouts}/MossdeepCity_SpaceCenter_1F/map.bin (100%) rename data/{maps/MtPyre_3F => layouts/MossdeepCity_SpaceCenter_2F}/border.bin (100%) create mode 100644 data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc rename data/{maps => layouts}/MossdeepCity_SpaceCenter_2F/map.bin (100%) rename data/{maps/OldaleTown_Mart => layouts/MossdeepCity_StevensHouse}/border.bin (100%) create mode 100644 data/layouts/MossdeepCity_StevensHouse/layout.inc rename data/{maps => layouts}/MossdeepCity_StevensHouse/map.bin (100%) rename data/{maps => layouts}/MtChimney/border.bin (100%) create mode 100644 data/layouts/MtChimney/layout.inc rename data/{maps => layouts}/MtChimney/map.bin (100%) rename data/{maps/MtPyre_4F => layouts/MtPyre_1F}/border.bin (100%) create mode 100644 data/layouts/MtPyre_1F/layout.inc rename data/{maps => layouts}/MtPyre_1F/map.bin (100%) rename data/{maps/MtPyre_5F => layouts/MtPyre_2F}/border.bin (100%) create mode 100644 data/layouts/MtPyre_2F/layout.inc rename data/{maps => layouts}/MtPyre_2F/map.bin (100%) rename data/{maps/MtPyre_6F => layouts/MtPyre_3F}/border.bin (100%) create mode 100644 data/layouts/MtPyre_3F/layout.inc rename data/{maps => layouts}/MtPyre_3F/map.bin (100%) rename data/{maps/OldaleTown_PokemonCenter_1F => layouts/MtPyre_4F}/border.bin (100%) create mode 100644 data/layouts/MtPyre_4F/layout.inc rename data/{maps => layouts}/MtPyre_4F/map.bin (100%) rename data/{maps/OldaleTown_PokemonCenter_2F => layouts/MtPyre_5F}/border.bin (100%) create mode 100644 data/layouts/MtPyre_5F/layout.inc rename data/{maps => layouts}/MtPyre_5F/map.bin (100%) rename data/{maps/PacifidlogTown_House1 => layouts/MtPyre_6F}/border.bin (100%) create mode 100644 data/layouts/MtPyre_6F/layout.inc rename data/{maps => layouts}/MtPyre_6F/map.bin (100%) rename data/{maps => layouts}/MtPyre_Exterior/border.bin (100%) create mode 100644 data/layouts/MtPyre_Exterior/layout.inc rename data/{maps => layouts}/MtPyre_Exterior/map.bin (100%) rename data/{maps => layouts}/MtPyre_Summit/border.bin (100%) create mode 100644 data/layouts/MtPyre_Summit/layout.inc rename data/{maps => layouts}/MtPyre_Summit/map.bin (100%) rename data/{maps => layouts}/NavelRock_B1F/border.bin (100%) create mode 100644 data/layouts/NavelRock_B1F/layout.inc rename data/{maps => layouts}/NavelRock_B1F/map.bin (100%) rename data/{maps => layouts}/NavelRock_Bottom/border.bin (100%) create mode 100644 data/layouts/NavelRock_Bottom/layout.inc rename data/{maps => layouts}/NavelRock_Bottom/map.bin (100%) rename data/{maps => layouts}/NavelRock_Entrance/border.bin (100%) create mode 100644 data/layouts/NavelRock_Entrance/layout.inc rename data/{maps => layouts}/NavelRock_Entrance/map.bin (100%) rename data/{maps => layouts}/NavelRock_Exterior/border.bin (100%) create mode 100644 data/layouts/NavelRock_Exterior/layout.inc rename data/{maps => layouts}/NavelRock_Exterior/map.bin (100%) rename data/{maps => layouts}/NavelRock_Fork/border.bin (100%) create mode 100644 data/layouts/NavelRock_Fork/layout.inc rename data/{maps => layouts}/NavelRock_Fork/map.bin (100%) rename data/{maps/NavelRock_Up1 => layouts/NavelRock_LadderRoom1}/border.bin (100%) create mode 100644 data/layouts/NavelRock_LadderRoom1/layout.inc rename data/{maps/NavelRock_Up1 => layouts/NavelRock_LadderRoom1}/map.bin (100%) rename data/{maps/NavelRock_Up2 => layouts/NavelRock_LadderRoom2}/border.bin (100%) create mode 100644 data/layouts/NavelRock_LadderRoom2/layout.inc rename data/{maps/NavelRock_Up2 => layouts/NavelRock_LadderRoom2}/map.bin (100%) rename data/{maps => layouts}/NavelRock_Top/border.bin (100%) create mode 100644 data/layouts/NavelRock_Top/layout.inc rename data/{maps => layouts}/NavelRock_Top/map.bin (100%) rename data/{maps => layouts}/NewMauville_Entrance/border.bin (100%) create mode 100644 data/layouts/NewMauville_Entrance/layout.inc rename data/{maps => layouts}/NewMauville_Entrance/map.bin (100%) rename data/{maps => layouts}/NewMauville_Inside/border.bin (100%) create mode 100644 data/layouts/NewMauville_Inside/layout.inc rename data/{maps => layouts}/NewMauville_Inside/map.bin (100%) rename data/{maps => layouts}/OldaleTown/border.bin (100%) create mode 100644 data/layouts/OldaleTown/layout.inc rename data/{maps => layouts}/OldaleTown/map.bin (100%) rename data/{maps => layouts}/PacifidlogTown/border.bin (100%) create mode 100644 data/layouts/PacifidlogTown/layout.inc rename data/{maps => layouts}/PacifidlogTown/map.bin (100%) rename data/{maps/PacifidlogTown_House2 => layouts/PacifidlogTown_House1}/border.bin (100%) create mode 100644 data/layouts/PacifidlogTown_House1/layout.inc rename data/{maps => layouts}/PacifidlogTown_House1/map.bin (100%) rename data/{maps/PetalburgCity_House2 => layouts/PacifidlogTown_House2}/border.bin (100%) create mode 100644 data/layouts/PacifidlogTown_House2/layout.inc rename data/{maps => layouts}/PacifidlogTown_House2/map.bin (100%) rename data/{maps => layouts}/PetalburgCity/border.bin (100%) create mode 100644 data/layouts/PetalburgCity/layout.inc rename data/{maps => layouts}/PetalburgCity/map.bin (100%) rename data/{maps => layouts}/PetalburgCity_Gym/border.bin (100%) create mode 100644 data/layouts/PetalburgCity_Gym/layout.inc rename data/{maps => layouts}/PetalburgCity_Gym/map.bin (100%) rename data/{maps => layouts}/PetalburgWoods/border.bin (100%) create mode 100644 data/layouts/PetalburgWoods/layout.inc rename data/{maps => layouts}/PetalburgWoods/map.bin (100%) rename data/{maps/RecordCorner => layouts/PokemonCenter_1F}/border.bin (100%) create mode 100644 data/layouts/PokemonCenter_1F/layout.inc rename data/{maps/OldaleTown_PokemonCenter_1F => layouts/PokemonCenter_1F}/map.bin (100%) rename data/{maps/Route104_MrBrineysHouse => layouts/PokemonCenter_2F}/border.bin (100%) create mode 100644 data/layouts/PokemonCenter_2F/layout.inc rename data/{maps/OldaleTown_PokemonCenter_2F => layouts/PokemonCenter_2F}/map.bin (100%) rename data/{maps/Route110_TrickHouseCorridor => layouts/RecordCorner}/border.bin (100%) create mode 100644 data/layouts/RecordCorner/layout.inc rename data/{maps => layouts}/RecordCorner/map.bin (100%) rename data/{maps => layouts}/Route101/border.bin (100%) create mode 100644 data/layouts/Route101/layout.inc rename data/{maps => layouts}/Route101/map.bin (100%) rename data/{maps => layouts}/Route102/border.bin (100%) create mode 100644 data/layouts/Route102/layout.inc rename data/{maps => layouts}/Route102/map.bin (100%) rename data/{maps => layouts}/Route103/border.bin (100%) create mode 100644 data/layouts/Route103/layout.inc rename data/{maps => layouts}/Route103/map.bin (100%) rename data/{maps => layouts}/Route104/border.bin (100%) create mode 100644 data/layouts/Route104/layout.inc rename data/{maps => layouts}/Route104/map.bin (100%) rename data/{maps/Route110_TrickHouseEnd => layouts/Route104_MrBrineysHouse}/border.bin (100%) create mode 100644 data/layouts/Route104_MrBrineysHouse/layout.inc rename data/{maps => layouts}/Route104_MrBrineysHouse/map.bin (100%) rename data/{maps => layouts}/Route104_PrettyPetalFlowerShop/border.bin (100%) create mode 100644 data/layouts/Route104_PrettyPetalFlowerShop/layout.inc rename data/{maps => layouts}/Route104_PrettyPetalFlowerShop/map.bin (100%) rename data/{maps => layouts}/Route104_Prototype/border.bin (100%) create mode 100644 data/layouts/Route104_Prototype/layout.inc rename data/{maps => layouts}/Route104_Prototype/map.bin (100%) rename data/{maps => layouts}/Route105/border.bin (100%) create mode 100644 data/layouts/Route105/layout.inc rename data/{maps => layouts}/Route105/map.bin (100%) rename data/{maps => layouts}/Route106/border.bin (100%) create mode 100644 data/layouts/Route106/layout.inc rename data/{maps => layouts}/Route106/map.bin (100%) rename data/{maps => layouts}/Route107/border.bin (100%) create mode 100644 data/layouts/Route107/layout.inc rename data/{maps => layouts}/Route107/map.bin (100%) rename data/{maps => layouts}/Route108/border.bin (100%) create mode 100644 data/layouts/Route108/layout.inc rename data/{maps => layouts}/Route108/map.bin (100%) rename data/{maps => layouts}/Route109/border.bin (100%) create mode 100644 data/layouts/Route109/layout.inc rename data/{maps => layouts}/Route109/map.bin (100%) rename data/{maps => layouts}/Route109_SeashoreHouse/border.bin (100%) create mode 100644 data/layouts/Route109_SeashoreHouse/layout.inc rename data/{maps => layouts}/Route109_SeashoreHouse/map.bin (100%) rename data/{maps => layouts}/Route110/border.bin (100%) create mode 100644 data/layouts/Route110/layout.inc rename data/{maps => layouts}/Route110/map.bin (100%) rename data/{maps/Route110_SeasideCyclingRoadEntrance1 => layouts/Route110_SeasideCyclingRoadEntrance}/border.bin (100%) create mode 100644 data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc rename data/{maps/Route110_SeasideCyclingRoadEntrance1 => layouts/Route110_SeasideCyclingRoadEntrance}/map.bin (100%) rename data/{maps/Route110_TrickHouseEntrance => layouts/Route110_TrickHouseCorridor}/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHouseCorridor/layout.inc rename data/{maps => layouts}/Route110_TrickHouseCorridor/map.bin (100%) rename data/{maps/Route112_CableCarStation => layouts/Route110_TrickHouseEnd}/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHouseEnd/layout.inc rename data/{maps => layouts}/Route110_TrickHouseEnd/map.bin (100%) rename data/{maps/Route114_FossilManiacsHouse => layouts/Route110_TrickHouseEntrance}/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHouseEntrance/layout.inc rename data/{maps => layouts}/Route110_TrickHouseEntrance/map.bin (100%) rename data/{maps => layouts}/Route110_TrickHousePuzzle1/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHousePuzzle1/layout.inc rename data/{maps => layouts}/Route110_TrickHousePuzzle1/map.bin (100%) rename data/{maps => layouts}/Route110_TrickHousePuzzle2/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHousePuzzle2/layout.inc rename data/{maps => layouts}/Route110_TrickHousePuzzle2/map.bin (100%) rename data/{maps => layouts}/Route110_TrickHousePuzzle3/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHousePuzzle3/layout.inc rename data/{maps => layouts}/Route110_TrickHousePuzzle3/map.bin (100%) rename data/{maps => layouts}/Route110_TrickHousePuzzle4/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHousePuzzle4/layout.inc rename data/{maps => layouts}/Route110_TrickHousePuzzle4/map.bin (100%) rename data/{maps => layouts}/Route110_TrickHousePuzzle5/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHousePuzzle5/layout.inc rename data/{maps => layouts}/Route110_TrickHousePuzzle5/map.bin (100%) rename data/{maps => layouts}/Route110_TrickHousePuzzle6/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHousePuzzle6/layout.inc rename data/{maps => layouts}/Route110_TrickHousePuzzle6/map.bin (100%) rename data/{maps => layouts}/Route110_TrickHousePuzzle7/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHousePuzzle7/layout.inc rename data/{maps => layouts}/Route110_TrickHousePuzzle7/map.bin (100%) rename data/{maps => layouts}/Route110_TrickHousePuzzle8/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHousePuzzle8/layout.inc rename data/{maps => layouts}/Route110_TrickHousePuzzle8/map.bin (100%) rename data/{maps => layouts}/Route111/border.bin (100%) create mode 100644 data/layouts/Route111/layout.inc rename data/{maps => layouts}/Route111/map.bin (100%) rename data/{maps => layouts}/Route112/border.bin (100%) create mode 100644 data/layouts/Route112/layout.inc rename data/{maps => layouts}/Route112/map.bin (100%) rename data/{maps => layouts}/Route113/border.bin (100%) create mode 100644 data/layouts/Route113/layout.inc rename data/{maps => layouts}/Route113/map.bin (100%) rename data/{maps => layouts}/Route114/border.bin (100%) create mode 100644 data/layouts/Route114/layout.inc rename data/{maps => layouts}/Route114/map.bin (100%) rename data/{maps/Route114_LanettesHouse => layouts/Route114_FossilManiacsHouse}/border.bin (100%) create mode 100644 data/layouts/Route114_FossilManiacsHouse/layout.inc rename data/{maps => layouts}/Route114_FossilManiacsHouse/map.bin (100%) rename data/{maps => layouts}/Route114_FossilManiacsTunnel/border.bin (100%) create mode 100644 data/layouts/Route114_FossilManiacsTunnel/layout.inc rename data/{maps => layouts}/Route114_FossilManiacsTunnel/map.bin (100%) rename data/{maps/Route116_TunnelersRestHouse => layouts/Route114_LanettesHouse}/border.bin (100%) create mode 100644 data/layouts/Route114_LanettesHouse/layout.inc rename data/{maps => layouts}/Route114_LanettesHouse/map.bin (100%) rename data/{maps => layouts}/Route115/border.bin (100%) create mode 100644 data/layouts/Route115/layout.inc rename data/{maps => layouts}/Route115/map.bin (100%) rename data/{maps => layouts}/Route116/border.bin (100%) create mode 100644 data/layouts/Route116/layout.inc rename data/{maps => layouts}/Route116/map.bin (100%) rename data/{maps/Route119_WeatherInstitute_1F => layouts/Route116_TunnelersRestHouse}/border.bin (100%) create mode 100644 data/layouts/Route116_TunnelersRestHouse/layout.inc rename data/{maps => layouts}/Route116_TunnelersRestHouse/map.bin (100%) rename data/{maps => layouts}/Route117/border.bin (100%) create mode 100644 data/layouts/Route117/layout.inc rename data/{maps => layouts}/Route117/map.bin (100%) rename data/{maps => layouts}/Route117_PokemonDayCare/border.bin (100%) create mode 100644 data/layouts/Route117_PokemonDayCare/layout.inc rename data/{maps => layouts}/Route117_PokemonDayCare/map.bin (100%) rename data/{maps => layouts}/Route118/border.bin (100%) create mode 100644 data/layouts/Route118/layout.inc rename data/{maps => layouts}/Route118/map.bin (100%) rename data/{maps => layouts}/Route119/border.bin (100%) create mode 100644 data/layouts/Route119/layout.inc rename data/{maps => layouts}/Route119/map.bin (100%) rename data/{maps/Route119_WeatherInstitute_2F => layouts/Route119_WeatherInstitute_1F}/border.bin (100%) create mode 100644 data/layouts/Route119_WeatherInstitute_1F/layout.inc rename data/{maps => layouts}/Route119_WeatherInstitute_1F/map.bin (100%) rename data/{maps/RustboroCity_CuttersHouse => layouts/Route119_WeatherInstitute_2F}/border.bin (100%) create mode 100644 data/layouts/Route119_WeatherInstitute_2F/layout.inc rename data/{maps => layouts}/Route119_WeatherInstitute_2F/map.bin (100%) rename data/{maps => layouts}/Route120/border.bin (100%) create mode 100644 data/layouts/Route120/layout.inc rename data/{maps => layouts}/Route120/map.bin (100%) rename data/{maps => layouts}/Route121/border.bin (100%) create mode 100644 data/layouts/Route121/layout.inc rename data/{maps => layouts}/Route121/map.bin (100%) rename data/{maps => layouts}/Route121_SafariZoneEntrance/border.bin (100%) create mode 100644 data/layouts/Route121_SafariZoneEntrance/layout.inc rename data/{maps => layouts}/Route121_SafariZoneEntrance/map.bin (100%) rename data/{maps => layouts}/Route122/border.bin (100%) create mode 100644 data/layouts/Route122/layout.inc rename data/{maps => layouts}/Route122/map.bin (100%) rename data/{maps => layouts}/Route123/border.bin (100%) create mode 100644 data/layouts/Route123/layout.inc rename data/{maps => layouts}/Route123/map.bin (100%) rename data/{maps => layouts}/Route124/border.bin (100%) create mode 100644 data/layouts/Route124/layout.inc rename data/{maps => layouts}/Route124/map.bin (100%) rename data/{maps => layouts}/Route124_DivingTreasureHuntersHouse/border.bin (100%) create mode 100644 data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc rename data/{maps => layouts}/Route124_DivingTreasureHuntersHouse/map.bin (100%) rename data/{maps => layouts}/Route125/border.bin (100%) create mode 100644 data/layouts/Route125/layout.inc rename data/{maps => layouts}/Route125/map.bin (100%) rename data/{maps => layouts}/Route126/border.bin (100%) create mode 100644 data/layouts/Route126/layout.inc rename data/{maps => layouts}/Route126/map.bin (100%) rename data/{maps => layouts}/Route127/border.bin (100%) create mode 100644 data/layouts/Route127/layout.inc rename data/{maps => layouts}/Route127/map.bin (100%) rename data/{maps => layouts}/Route128/border.bin (100%) create mode 100644 data/layouts/Route128/layout.inc rename data/{maps => layouts}/Route128/map.bin (100%) rename data/{maps => layouts}/Route129/border.bin (100%) create mode 100644 data/layouts/Route129/layout.inc rename data/{maps => layouts}/Route129/map.bin (100%) rename data/{maps => layouts}/Route130/border.bin (100%) create mode 100644 data/layouts/Route130/layout.inc rename data/{maps => layouts}/Route130/map.bin (100%) rename data/{maps => layouts}/Route131/border.bin (100%) create mode 100644 data/layouts/Route131/layout.inc rename data/{maps => layouts}/Route131/map.bin (100%) rename data/{maps => layouts}/Route132/border.bin (100%) create mode 100644 data/layouts/Route132/layout.inc rename data/{maps => layouts}/Route132/map.bin (100%) rename data/{maps => layouts}/Route133/border.bin (100%) create mode 100644 data/layouts/Route133/layout.inc rename data/{maps => layouts}/Route133/map.bin (100%) rename data/{maps => layouts}/Route134/border.bin (100%) create mode 100644 data/layouts/Route134/layout.inc rename data/{maps => layouts}/Route134/map.bin (100%) rename data/{maps => layouts}/RustboroCity/border.bin (100%) create mode 100644 data/layouts/RustboroCity/layout.inc rename data/{maps => layouts}/RustboroCity/map.bin (100%) rename data/{maps/RustboroCity_DevonCorp_1F => layouts/RustboroCity_CuttersHouse}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_CuttersHouse/layout.inc rename data/{maps => layouts}/RustboroCity_CuttersHouse/map.bin (100%) rename data/{maps/RustboroCity_DevonCorp_2F => layouts/RustboroCity_DevonCorp_1F}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_DevonCorp_1F/layout.inc rename data/{maps => layouts}/RustboroCity_DevonCorp_1F/map.bin (100%) rename data/{maps/RustboroCity_DevonCorp_3F => layouts/RustboroCity_DevonCorp_2F}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_DevonCorp_2F/layout.inc rename data/{maps => layouts}/RustboroCity_DevonCorp_2F/map.bin (100%) rename data/{maps/RustboroCity_Flat1_1F => layouts/RustboroCity_DevonCorp_3F}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_DevonCorp_3F/layout.inc rename data/{maps => layouts}/RustboroCity_DevonCorp_3F/map.bin (100%) rename data/{maps/RustboroCity_Flat1_2F => layouts/RustboroCity_Flat1_1F}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_Flat1_1F/layout.inc rename data/{maps => layouts}/RustboroCity_Flat1_1F/map.bin (100%) rename data/{maps/RustboroCity_Flat2_1F => layouts/RustboroCity_Flat1_2F}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_Flat1_2F/layout.inc rename data/{maps => layouts}/RustboroCity_Flat1_2F/map.bin (100%) rename data/{maps/RustboroCity_Flat2_2F => layouts/RustboroCity_Flat2_1F}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_Flat2_1F/layout.inc rename data/{maps => layouts}/RustboroCity_Flat2_1F/map.bin (100%) rename data/{maps/RustboroCity_Flat2_3F => layouts/RustboroCity_Flat2_2F}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_Flat2_2F/layout.inc rename data/{maps => layouts}/RustboroCity_Flat2_2F/map.bin (100%) rename data/{maps/RustboroCity_House1 => layouts/RustboroCity_Flat2_3F}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_Flat2_3F/layout.inc rename data/{maps => layouts}/RustboroCity_Flat2_3F/map.bin (100%) rename data/{maps => layouts}/RustboroCity_Gym/border.bin (100%) create mode 100644 data/layouts/RustboroCity_Gym/layout.inc rename data/{maps => layouts}/RustboroCity_Gym/map.bin (100%) rename data/{maps/RustboroCity_House2 => layouts/RustboroCity_House}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_House/layout.inc rename data/{maps/RustboroCity_House2 => layouts/RustboroCity_House}/map.bin (100%) rename data/{maps/SSTidalCorridor => layouts/RustboroCity_House1}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_House1/layout.inc rename data/{maps => layouts}/RustboroCity_House1/map.bin (100%) rename data/{maps => layouts}/RustboroCity_PokemonSchool/border.bin (100%) create mode 100644 data/layouts/RustboroCity_PokemonSchool/layout.inc rename data/{maps => layouts}/RustboroCity_PokemonSchool/map.bin (100%) rename data/{maps => layouts}/RusturfTunnel/border.bin (100%) create mode 100644 data/layouts/RusturfTunnel/layout.inc rename data/{maps => layouts}/RusturfTunnel/map.bin (100%) rename data/{maps/SSTidalLowerDeck => layouts/SSTidalCorridor}/border.bin (100%) create mode 100644 data/layouts/SSTidalCorridor/layout.inc rename data/{maps => layouts}/SSTidalCorridor/map.bin (100%) rename data/{maps/SSTidalRooms => layouts/SSTidalLowerDeck}/border.bin (100%) create mode 100644 data/layouts/SSTidalLowerDeck/layout.inc rename data/{maps => layouts}/SSTidalLowerDeck/map.bin (100%) rename data/{maps/SingleBattleColosseum => layouts/SSTidalRooms}/border.bin (100%) create mode 100644 data/layouts/SSTidalRooms/layout.inc rename data/{maps => layouts}/SSTidalRooms/map.bin (100%) rename data/{maps => layouts}/SafariZone_North/border.bin (100%) create mode 100644 data/layouts/SafariZone_North/layout.inc rename data/{maps => layouts}/SafariZone_North/map.bin (100%) rename data/{maps => layouts}/SafariZone_Northeast/border.bin (100%) create mode 100644 data/layouts/SafariZone_Northeast/layout.inc rename data/{maps => layouts}/SafariZone_Northeast/map.bin (100%) rename data/{maps => layouts}/SafariZone_Northwest/border.bin (100%) create mode 100644 data/layouts/SafariZone_Northwest/layout.inc rename data/{maps => layouts}/SafariZone_Northwest/map.bin (100%) rename data/{maps => layouts}/SafariZone_RestHouse/border.bin (100%) create mode 100644 data/layouts/SafariZone_RestHouse/layout.inc rename data/{maps => layouts}/SafariZone_RestHouse/map.bin (100%) rename data/{maps => layouts}/SafariZone_South/border.bin (100%) create mode 100644 data/layouts/SafariZone_South/layout.inc rename data/{maps => layouts}/SafariZone_South/map.bin (100%) rename data/{maps => layouts}/SafariZone_Southeast/border.bin (100%) create mode 100644 data/layouts/SafariZone_Southeast/layout.inc rename data/{maps => layouts}/SafariZone_Southeast/map.bin (100%) rename data/{maps => layouts}/SafariZone_Southwest/border.bin (100%) create mode 100644 data/layouts/SafariZone_Southwest/layout.inc rename data/{maps => layouts}/SafariZone_Southwest/map.bin (100%) rename data/{maps => layouts}/ScorchedSlab/border.bin (100%) create mode 100644 data/layouts/ScorchedSlab/layout.inc rename data/{maps => layouts}/ScorchedSlab/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Entrance/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Entrance/layout.inc rename data/{maps => layouts}/SeafloorCavern_Entrance/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Room1/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Room1/layout.inc rename data/{maps => layouts}/SeafloorCavern_Room1/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Room2/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Room2/layout.inc rename data/{maps => layouts}/SeafloorCavern_Room2/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Room3/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Room3/layout.inc rename data/{maps => layouts}/SeafloorCavern_Room3/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Room4/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Room4/layout.inc rename data/{maps => layouts}/SeafloorCavern_Room4/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Room5/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Room5/layout.inc rename data/{maps => layouts}/SeafloorCavern_Room5/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Room6/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Room6/layout.inc rename data/{maps => layouts}/SeafloorCavern_Room6/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Room7/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Room7/layout.inc rename data/{maps => layouts}/SeafloorCavern_Room7/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Room8/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Room8/layout.inc rename data/{maps => layouts}/SeafloorCavern_Room8/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Room9/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Room9/layout.inc rename data/{maps => layouts}/SeafloorCavern_Room9/map.bin (100%) rename data/{maps => layouts}/SealedChamber_InnerRoom/border.bin (100%) create mode 100644 data/layouts/SealedChamber_InnerRoom/layout.inc rename data/{maps => layouts}/SealedChamber_InnerRoom/map.bin (100%) rename data/{maps => layouts}/SealedChamber_OuterRoom/border.bin (100%) create mode 100644 data/layouts/SealedChamber_OuterRoom/layout.inc rename data/{maps => layouts}/SealedChamber_OuterRoom/map.bin (100%) rename data/{maps => layouts}/SecretBase_BlueCave1/border.bin (100%) create mode 100644 data/layouts/SecretBase_BlueCave1/layout.inc rename data/{maps => layouts}/SecretBase_BlueCave1/map.bin (100%) rename data/{maps => layouts}/SecretBase_BlueCave2/border.bin (100%) create mode 100644 data/layouts/SecretBase_BlueCave2/layout.inc rename data/{maps => layouts}/SecretBase_BlueCave2/map.bin (100%) rename data/{maps => layouts}/SecretBase_BlueCave3/border.bin (100%) create mode 100644 data/layouts/SecretBase_BlueCave3/layout.inc rename data/{maps => layouts}/SecretBase_BlueCave3/map.bin (100%) rename data/{maps => layouts}/SecretBase_BlueCave4/border.bin (100%) create mode 100644 data/layouts/SecretBase_BlueCave4/layout.inc rename data/{maps => layouts}/SecretBase_BlueCave4/map.bin (100%) rename data/{maps => layouts}/SecretBase_BrownCave1/border.bin (100%) create mode 100644 data/layouts/SecretBase_BrownCave1/layout.inc rename data/{maps => layouts}/SecretBase_BrownCave1/map.bin (100%) rename data/{maps => layouts}/SecretBase_BrownCave2/border.bin (100%) create mode 100644 data/layouts/SecretBase_BrownCave2/layout.inc rename data/{maps => layouts}/SecretBase_BrownCave2/map.bin (100%) rename data/{maps => layouts}/SecretBase_BrownCave3/border.bin (100%) create mode 100644 data/layouts/SecretBase_BrownCave3/layout.inc rename data/{maps => layouts}/SecretBase_BrownCave3/map.bin (100%) rename data/{maps => layouts}/SecretBase_BrownCave4/border.bin (100%) create mode 100644 data/layouts/SecretBase_BrownCave4/layout.inc rename data/{maps => layouts}/SecretBase_BrownCave4/map.bin (100%) rename data/{maps => layouts}/SecretBase_RedCave1/border.bin (100%) create mode 100644 data/layouts/SecretBase_RedCave1/layout.inc rename data/{maps => layouts}/SecretBase_RedCave1/map.bin (100%) rename data/{maps => layouts}/SecretBase_RedCave2/border.bin (100%) create mode 100644 data/layouts/SecretBase_RedCave2/layout.inc rename data/{maps => layouts}/SecretBase_RedCave2/map.bin (100%) rename data/{maps => layouts}/SecretBase_RedCave3/border.bin (100%) create mode 100644 data/layouts/SecretBase_RedCave3/layout.inc rename data/{maps => layouts}/SecretBase_RedCave3/map.bin (100%) rename data/{maps => layouts}/SecretBase_RedCave4/border.bin (100%) create mode 100644 data/layouts/SecretBase_RedCave4/layout.inc rename data/{maps => layouts}/SecretBase_RedCave4/map.bin (100%) rename data/{maps => layouts}/SecretBase_Shrub1/border.bin (100%) create mode 100644 data/layouts/SecretBase_Shrub1/layout.inc rename data/{maps => layouts}/SecretBase_Shrub1/map.bin (100%) rename data/{maps => layouts}/SecretBase_Shrub2/border.bin (100%) create mode 100644 data/layouts/SecretBase_Shrub2/layout.inc rename data/{maps => layouts}/SecretBase_Shrub2/map.bin (100%) rename data/{maps => layouts}/SecretBase_Shrub3/border.bin (100%) create mode 100644 data/layouts/SecretBase_Shrub3/layout.inc rename data/{maps => layouts}/SecretBase_Shrub3/map.bin (100%) rename data/{maps => layouts}/SecretBase_Shrub4/border.bin (100%) create mode 100644 data/layouts/SecretBase_Shrub4/layout.inc rename data/{maps => layouts}/SecretBase_Shrub4/map.bin (100%) rename data/{maps => layouts}/SecretBase_Tree1/border.bin (100%) create mode 100644 data/layouts/SecretBase_Tree1/layout.inc rename data/{maps => layouts}/SecretBase_Tree1/map.bin (100%) rename data/{maps => layouts}/SecretBase_Tree2/border.bin (100%) create mode 100644 data/layouts/SecretBase_Tree2/layout.inc rename data/{maps => layouts}/SecretBase_Tree2/map.bin (100%) rename data/{maps => layouts}/SecretBase_Tree3/border.bin (100%) create mode 100644 data/layouts/SecretBase_Tree3/layout.inc rename data/{maps => layouts}/SecretBase_Tree3/map.bin (100%) rename data/{maps => layouts}/SecretBase_Tree4/border.bin (100%) create mode 100644 data/layouts/SecretBase_Tree4/layout.inc rename data/{maps => layouts}/SecretBase_Tree4/map.bin (100%) rename data/{maps => layouts}/SecretBase_YellowCave1/border.bin (100%) create mode 100644 data/layouts/SecretBase_YellowCave1/layout.inc rename data/{maps => layouts}/SecretBase_YellowCave1/map.bin (100%) rename data/{maps => layouts}/SecretBase_YellowCave2/border.bin (100%) create mode 100644 data/layouts/SecretBase_YellowCave2/layout.inc rename data/{maps => layouts}/SecretBase_YellowCave2/map.bin (100%) rename data/{maps => layouts}/SecretBase_YellowCave3/border.bin (100%) create mode 100644 data/layouts/SecretBase_YellowCave3/layout.inc rename data/{maps => layouts}/SecretBase_YellowCave3/map.bin (100%) rename data/{maps => layouts}/SecretBase_YellowCave4/border.bin (100%) create mode 100644 data/layouts/SecretBase_YellowCave4/layout.inc rename data/{maps => layouts}/SecretBase_YellowCave4/map.bin (100%) rename data/{maps => layouts}/ShoalCave_HighTideEntranceRoom/border.bin (100%) create mode 100644 data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc rename data/{maps => layouts}/ShoalCave_HighTideEntranceRoom/map.bin (100%) rename data/{maps => layouts}/ShoalCave_HighTideInnerRoom/border.bin (100%) create mode 100644 data/layouts/ShoalCave_HighTideInnerRoom/layout.inc rename data/{maps => layouts}/ShoalCave_HighTideInnerRoom/map.bin (100%) rename data/{maps => layouts}/ShoalCave_LowTideEntranceRoom/border.bin (100%) create mode 100644 data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc rename data/{maps => layouts}/ShoalCave_LowTideEntranceRoom/map.bin (100%) rename data/{maps => layouts}/ShoalCave_LowTideIceRoom/border.bin (100%) create mode 100644 data/layouts/ShoalCave_LowTideIceRoom/layout.inc rename data/{maps => layouts}/ShoalCave_LowTideIceRoom/map.bin (100%) rename data/{maps => layouts}/ShoalCave_LowTideInnerRoom/border.bin (100%) create mode 100644 data/layouts/ShoalCave_LowTideInnerRoom/layout.inc rename data/{maps => layouts}/ShoalCave_LowTideInnerRoom/map.bin (100%) rename data/{maps => layouts}/ShoalCave_LowTideLowerRoom/border.bin (100%) create mode 100644 data/layouts/ShoalCave_LowTideLowerRoom/layout.inc rename data/{maps => layouts}/ShoalCave_LowTideLowerRoom/map.bin (100%) rename data/{maps => layouts}/ShoalCave_LowTideStairsRoom/border.bin (100%) create mode 100644 data/layouts/ShoalCave_LowTideStairsRoom/layout.inc rename data/{maps => layouts}/ShoalCave_LowTideStairsRoom/map.bin (100%) rename data/{maps/SkyPillar_1F => layouts/SingleBattleColosseum}/border.bin (100%) create mode 100644 data/layouts/SingleBattleColosseum/layout.inc rename data/{maps => layouts}/SingleBattleColosseum/map.bin (100%) rename data/{maps/SkyPillar_2F => layouts/SkyPillar_1F}/border.bin (100%) create mode 100644 data/layouts/SkyPillar_1F/layout.inc rename data/{maps => layouts}/SkyPillar_1F/map.bin (100%) rename data/{maps/SkyPillar_3F => layouts/SkyPillar_2F}/border.bin (100%) create mode 100644 data/layouts/SkyPillar_2F/layout.inc rename data/{maps => layouts}/SkyPillar_2F/map.bin (100%) rename data/{maps/SkyPillar_4F => layouts/SkyPillar_3F}/border.bin (100%) create mode 100644 data/layouts/SkyPillar_3F/layout.inc rename data/{maps => layouts}/SkyPillar_3F/map.bin (100%) rename data/{maps/SkyPillar_5F => layouts/SkyPillar_4F}/border.bin (100%) create mode 100644 data/layouts/SkyPillar_4F/layout.inc rename data/{maps => layouts}/SkyPillar_4F/map.bin (100%) rename data/{maps/SlateportCity_Harbor => layouts/SkyPillar_5F}/border.bin (100%) create mode 100644 data/layouts/SkyPillar_5F/layout.inc rename data/{maps => layouts}/SkyPillar_5F/map.bin (100%) rename data/{maps => layouts}/SkyPillar_Entrance/border.bin (100%) create mode 100644 data/layouts/SkyPillar_Entrance/layout.inc rename data/{maps => layouts}/SkyPillar_Entrance/map.bin (100%) rename data/{maps => layouts}/SkyPillar_Outside/border.bin (100%) create mode 100644 data/layouts/SkyPillar_Outside/layout.inc rename data/{maps => layouts}/SkyPillar_Outside/map.bin (100%) rename data/{maps => layouts}/SkyPillar_Top/border.bin (100%) create mode 100644 data/layouts/SkyPillar_Top/layout.inc rename data/{maps => layouts}/SkyPillar_Top/map.bin (100%) rename data/{maps => layouts}/SlateportCity/border.bin (100%) create mode 100644 data/layouts/SlateportCity/layout.inc rename data/{maps => layouts}/SlateportCity/map.bin (100%) rename data/{maps => layouts}/SlateportCity_OceanicMuseum_1F/border.bin (100%) create mode 100644 data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc rename data/{maps => layouts}/SlateportCity_OceanicMuseum_1F/map.bin (100%) rename data/{maps => layouts}/SlateportCity_OceanicMuseum_2F/border.bin (100%) create mode 100644 data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc rename data/{maps => layouts}/SlateportCity_OceanicMuseum_2F/map.bin (100%) rename data/{maps => layouts}/SlateportCity_PokemonFanClub/border.bin (100%) create mode 100644 data/layouts/SlateportCity_PokemonFanClub/layout.inc rename data/{maps => layouts}/SlateportCity_PokemonFanClub/map.bin (100%) rename data/{maps => layouts}/SlateportCity_SternsShipyard_1F/border.bin (100%) create mode 100644 data/layouts/SlateportCity_SternsShipyard_1F/layout.inc rename data/{maps => layouts}/SlateportCity_SternsShipyard_1F/map.bin (100%) rename data/{maps => layouts}/SlateportCity_SternsShipyard_2F/border.bin (100%) create mode 100644 data/layouts/SlateportCity_SternsShipyard_2F/layout.inc rename data/{maps => layouts}/SlateportCity_SternsShipyard_2F/map.bin (100%) rename data/{maps => layouts}/SootopolisCity/border.bin (100%) create mode 100644 data/layouts/SootopolisCity/layout.inc rename data/{maps => layouts}/SootopolisCity/map.bin (100%) rename data/{maps => layouts}/SootopolisCity_Gym_1F/border.bin (100%) create mode 100644 data/layouts/SootopolisCity_Gym_1F/layout.inc rename data/{maps => layouts}/SootopolisCity_Gym_1F/map.bin (100%) rename data/{maps => layouts}/SootopolisCity_Gym_B1F/border.bin (100%) create mode 100644 data/layouts/SootopolisCity_Gym_B1F/layout.inc rename data/{maps => layouts}/SootopolisCity_Gym_B1F/map.bin (100%) rename data/{maps => layouts}/SootopolisCity_House1/border.bin (100%) create mode 100644 data/layouts/SootopolisCity_House1/layout.inc rename data/{maps => layouts}/SootopolisCity_House1/map.bin (100%) rename data/{maps => layouts}/SootopolisCity_House2/border.bin (100%) create mode 100644 data/layouts/SootopolisCity_House2/layout.inc rename data/{maps => layouts}/SootopolisCity_House2/map.bin (100%) rename data/{maps => layouts}/SootopolisCity_House3/border.bin (100%) create mode 100644 data/layouts/SootopolisCity_House3/layout.inc rename data/{maps => layouts}/SootopolisCity_House3/map.bin (100%) rename data/{maps => layouts}/SootopolisCity_LotadAndSeedotHouse/border.bin (100%) create mode 100644 data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc rename data/{maps => layouts}/SootopolisCity_LotadAndSeedotHouse/map.bin (100%) rename data/{maps => layouts}/SootopolisCity_MysteryEventsHouse_1F/border.bin (100%) create mode 100644 data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc rename data/{maps => layouts}/SootopolisCity_MysteryEventsHouse_1F/map.bin (100%) rename data/{maps => layouts}/SootopolisCity_MysteryEventsHouse_B1F/border.bin (100%) create mode 100644 data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc rename data/{maps => layouts}/SootopolisCity_MysteryEventsHouse_B1F/map.bin (100%) rename data/{maps => layouts}/SouthernIsland_Exterior/border.bin (100%) create mode 100644 data/layouts/SouthernIsland_Exterior/layout.inc rename data/{maps => layouts}/SouthernIsland_Exterior/map.bin (100%) rename data/{maps => layouts}/SouthernIsland_Interior/border.bin (100%) create mode 100644 data/layouts/SouthernIsland_Interior/layout.inc rename data/{maps => layouts}/SouthernIsland_Interior/map.bin (100%) rename data/{maps => layouts}/TerraCave_End/border.bin (100%) create mode 100644 data/layouts/TerraCave_End/layout.inc rename data/{maps => layouts}/TerraCave_End/map.bin (100%) rename data/{maps => layouts}/TerraCave_Entrance/border.bin (100%) create mode 100644 data/layouts/TerraCave_Entrance/layout.inc rename data/{maps => layouts}/TerraCave_Entrance/map.bin (100%) rename data/{maps => layouts}/TradeCenter/border.bin (100%) create mode 100644 data/layouts/TradeCenter/layout.inc rename data/{maps => layouts}/TradeCenter/map.bin (100%) rename data/{maps => layouts}/TrainerHill_1F/border.bin (100%) create mode 100644 data/layouts/TrainerHill_1F/layout.inc rename data/{maps => layouts}/TrainerHill_1F/map.bin (100%) rename data/{maps => layouts}/TrainerHill_2F/border.bin (100%) create mode 100644 data/layouts/TrainerHill_2F/layout.inc rename data/{maps => layouts}/TrainerHill_2F/map.bin (100%) rename data/{maps => layouts}/TrainerHill_3F/border.bin (100%) create mode 100644 data/layouts/TrainerHill_3F/layout.inc rename data/{maps => layouts}/TrainerHill_3F/map.bin (100%) rename data/{maps => layouts}/TrainerHill_4F/border.bin (100%) create mode 100644 data/layouts/TrainerHill_4F/layout.inc rename data/{maps => layouts}/TrainerHill_4F/map.bin (100%) rename data/{maps => layouts}/TrainerHill_Entrance/border.bin (100%) create mode 100644 data/layouts/TrainerHill_Entrance/layout.inc rename data/{maps => layouts}/TrainerHill_Entrance/map.bin (100%) rename data/{maps => layouts}/TrainerHill_Roof/border.bin (100%) create mode 100644 data/layouts/TrainerHill_Roof/layout.inc rename data/{maps => layouts}/TrainerHill_Roof/map.bin (100%) rename data/{maps => layouts}/Underwater1/border.bin (100%) create mode 100644 data/layouts/Underwater1/layout.inc rename data/{maps => layouts}/Underwater1/map.bin (100%) rename data/{maps => layouts}/Underwater2/border.bin (100%) create mode 100644 data/layouts/Underwater2/layout.inc rename data/{maps => layouts}/Underwater2/map.bin (100%) rename data/{maps => layouts}/Underwater3/border.bin (100%) create mode 100644 data/layouts/Underwater3/layout.inc rename data/{maps => layouts}/Underwater3/map.bin (100%) rename data/{maps => layouts}/Underwater4/border.bin (100%) create mode 100644 data/layouts/Underwater4/layout.inc rename data/{maps => layouts}/Underwater4/map.bin (100%) rename data/{maps => layouts}/Underwater5/border.bin (100%) create mode 100644 data/layouts/Underwater5/layout.inc rename data/{maps => layouts}/Underwater5/map.bin (100%) rename data/{maps => layouts}/Underwater6/border.bin (100%) create mode 100644 data/layouts/Underwater6/layout.inc rename data/{maps => layouts}/Underwater6/map.bin (100%) rename data/{maps => layouts}/Underwater7/border.bin (100%) create mode 100644 data/layouts/Underwater7/layout.inc rename data/{maps => layouts}/Underwater7/map.bin (100%) rename data/{maps => layouts}/Underwater_MarineCave/border.bin (100%) create mode 100644 data/layouts/Underwater_MarineCave/layout.inc rename data/{maps => layouts}/Underwater_MarineCave/map.bin (100%) rename data/{maps => layouts}/Underwater_Route134/border.bin (100%) create mode 100644 data/layouts/Underwater_Route134/layout.inc rename data/{maps => layouts}/Underwater_Route134/map.bin (100%) rename data/{maps => layouts}/Underwater_SeafloorCavern/border.bin (100%) create mode 100644 data/layouts/Underwater_SeafloorCavern/layout.inc rename data/{maps => layouts}/Underwater_SeafloorCavern/map.bin (100%) rename data/{maps => layouts}/Underwater_SealedChamber/border.bin (100%) create mode 100644 data/layouts/Underwater_SealedChamber/layout.inc rename data/{maps => layouts}/Underwater_SealedChamber/map.bin (100%) rename data/{maps => layouts}/Underwater_SootopolisCity/border.bin (100%) create mode 100644 data/layouts/Underwater_SootopolisCity/layout.inc rename data/{maps => layouts}/Underwater_SootopolisCity/map.bin (100%) rename data/{maps => layouts}/UnionRoom/border.bin (100%) create mode 100644 data/layouts/UnionRoom/layout.inc rename data/{maps => layouts}/UnionRoom/map.bin (100%) rename data/{maps => layouts}/UnknownMap_08417FC4/border.bin (100%) create mode 100644 data/layouts/UnknownMap_08417FC4/layout.inc rename data/{maps => layouts}/UnknownMap_08417FC4/map.bin (100%) rename data/{maps => layouts}/UnknownMap_08428450/border.bin (100%) create mode 100644 data/layouts/UnknownMap_08428450/layout.inc rename data/{maps => layouts}/UnknownMap_08428450/map.bin (100%) rename data/{maps => layouts}/UnknownMap_084294C4/border.bin (100%) create mode 100644 data/layouts/UnknownMap_084294C4/layout.inc rename data/{maps => layouts}/UnknownMap_084294C4/map.bin (100%) rename data/{maps => layouts}/UnknownMap_084294E8/border.bin (100%) create mode 100644 data/layouts/UnknownMap_084294E8/layout.inc rename data/{maps => layouts}/UnknownMap_084294E8/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E6C0/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0843E6C0/layout.inc rename data/{maps => layouts}/UnknownMap_0843E6C0/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E6E4/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0843E6E4/layout.inc rename data/{maps => layouts}/UnknownMap_0843E6E4/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E708/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0843E708/layout.inc rename data/{maps => layouts}/UnknownMap_0843E708/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E72C/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0843E72C/layout.inc rename data/{maps => layouts}/UnknownMap_0843E72C/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E750/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0843E750/layout.inc rename data/{maps => layouts}/UnknownMap_0843E750/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E774/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0843E774/layout.inc rename data/{maps => layouts}/UnknownMap_0843E774/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E798/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0843E798/layout.inc rename data/{maps => layouts}/UnknownMap_0843E798/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E7BC/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0843E7BC/layout.inc rename data/{maps => layouts}/UnknownMap_0843E7BC/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E7E0/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0843E7E0/layout.inc rename data/{maps => layouts}/UnknownMap_0843E7E0/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E804/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0843E804/layout.inc rename data/{maps => layouts}/UnknownMap_0843E804/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E828/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0843E828/layout.inc rename data/{maps => layouts}/UnknownMap_0843E828/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E84C/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0843E84C/layout.inc rename data/{maps => layouts}/UnknownMap_0843E84C/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E870/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0843E870/layout.inc rename data/{maps => layouts}/UnknownMap_0843E870/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E894/border.bin (100%) create mode 100755 data/layouts/UnknownMap_0843E894/layout.inc rename data/{maps => layouts}/UnknownMap_0843E894/map.bin (100%) rename data/{maps => layouts}/UnknownMap_08447028/border.bin (100%) create mode 100644 data/layouts/UnknownMap_08447028/layout.inc rename data/{maps => layouts}/UnknownMap_08447028/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0845A394/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0845A394/layout.inc rename data/{maps => layouts}/UnknownMap_0845A394/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0845D470/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0845D470/layout.inc rename data/{maps => layouts}/UnknownMap_0845D470/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0845ECB4/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0845ECB4/layout.inc rename data/{maps => layouts}/UnknownMap_0845ECB4/map.bin (100%) rename data/{maps => layouts}/UnknownMap_08469200/border.bin (100%) create mode 100644 data/layouts/UnknownMap_08469200/layout.inc rename data/{maps => layouts}/UnknownMap_08469200/map.bin (100%) rename data/{maps => layouts}/UnknownMap_084693AC/border.bin (100%) create mode 100644 data/layouts/UnknownMap_084693AC/layout.inc rename data/{maps => layouts}/UnknownMap_084693AC/map.bin (100%) rename data/{maps => layouts}/UnknownMap_08470BD8/border.bin (100%) create mode 100644 data/layouts/UnknownMap_08470BD8/layout.inc rename data/{maps => layouts}/UnknownMap_08470BD8/map.bin (100%) rename data/{maps => layouts}/UnknownMap_08480DAC/border.bin (100%) create mode 100644 data/layouts/UnknownMap_08480DAC/layout.inc rename data/{maps => layouts}/UnknownMap_08480DAC/map.bin (100%) rename data/{maps => layouts}/UnknownMap_08480F54/border.bin (100%) create mode 100644 data/layouts/UnknownMap_08480F54/layout.inc rename data/{maps => layouts}/UnknownMap_08480F54/map.bin (100%) rename data/{maps => layouts}/UnknownMap_084810FC/border.bin (100%) create mode 100644 data/layouts/UnknownMap_084810FC/layout.inc rename data/{maps => layouts}/UnknownMap_084810FC/map.bin (100%) rename data/{maps => layouts}/UnknownMap_084812A4/border.bin (100%) create mode 100644 data/layouts/UnknownMap_084812A4/layout.inc rename data/{maps => layouts}/UnknownMap_084812A4/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0848144C/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0848144C/layout.inc rename data/{maps => layouts}/UnknownMap_0848144C/map.bin (100%) rename data/{maps => layouts}/UnknownMap_084815F4/border.bin (100%) create mode 100644 data/layouts/UnknownMap_084815F4/layout.inc rename data/{maps => layouts}/UnknownMap_084815F4/map.bin (100%) rename data/{maps => layouts}/UnknownMap_08481B24/border.bin (100%) create mode 100644 data/layouts/UnknownMap_08481B24/layout.inc rename data/{maps => layouts}/UnknownMap_08481B24/map.bin (100%) rename data/{maps => layouts}/UnknownMap_08481DBC/border.bin (100%) create mode 100644 data/layouts/UnknownMap_08481DBC/layout.inc rename data/{maps => layouts}/UnknownMap_08481DBC/map.bin (100%) rename data/{maps => layouts}/UnknownMap_25_29/border.bin (100%) create mode 100644 data/layouts/UnknownMap_25_29/layout.inc rename data/{maps => layouts}/UnknownMap_25_29/map.bin (100%) rename data/{maps => layouts}/UnknownMap_25_30/border.bin (100%) create mode 100644 data/layouts/UnknownMap_25_30/layout.inc rename data/{maps => layouts}/UnknownMap_25_30/map.bin (100%) rename data/{maps => layouts}/UnknownMap_25_31/border.bin (100%) create mode 100644 data/layouts/UnknownMap_25_31/layout.inc rename data/{maps => layouts}/UnknownMap_25_31/map.bin (100%) rename data/{maps => layouts}/UnknownMap_25_32/border.bin (100%) create mode 100644 data/layouts/UnknownMap_25_32/layout.inc rename data/{maps => layouts}/UnknownMap_25_32/map.bin (100%) rename data/{maps => layouts}/UnknownMap_25_33/border.bin (100%) create mode 100644 data/layouts/UnknownMap_25_33/layout.inc rename data/{maps => layouts}/UnknownMap_25_33/map.bin (100%) rename data/{maps => layouts}/UnknownMap_25_34/border.bin (100%) create mode 100644 data/layouts/UnknownMap_25_34/layout.inc rename data/{maps => layouts}/UnknownMap_25_34/map.bin (100%) rename data/{maps => layouts}/VerdanturfTown/border.bin (100%) create mode 100644 data/layouts/VerdanturfTown/layout.inc rename data/{maps => layouts}/VerdanturfTown/map.bin (100%) rename data/{maps => layouts}/VerdanturfTown_BattleTentBattleRoom/border.bin (100%) create mode 100644 data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc rename data/{maps => layouts}/VerdanturfTown_BattleTentBattleRoom/map.bin (100%) rename data/{maps => layouts}/VerdanturfTown_WandasHouse/border.bin (100%) create mode 100644 data/layouts/VerdanturfTown_WandasHouse/layout.inc rename data/{maps => layouts}/VerdanturfTown_WandasHouse/map.bin (100%) rename data/{maps => layouts}/VictoryRoad_1F/border.bin (100%) create mode 100644 data/layouts/VictoryRoad_1F/layout.inc rename data/{maps => layouts}/VictoryRoad_1F/map.bin (100%) rename data/{maps => layouts}/VictoryRoad_B1F/border.bin (100%) create mode 100644 data/layouts/VictoryRoad_B1F/layout.inc rename data/{maps => layouts}/VictoryRoad_B1F/map.bin (100%) rename data/{maps => layouts}/VictoryRoad_B2F/border.bin (100%) create mode 100644 data/layouts/VictoryRoad_B2F/layout.inc rename data/{maps => layouts}/VictoryRoad_B2F/map.bin (100%) create mode 100644 data/layouts_table.inc delete mode 100644 data/maps/_assets.inc delete mode 100644 data/maps/attributes_table.inc rename data/maps/{_groups.inc => groups.inc} (100%) diff --git a/Makefile b/Makefile index 2afb830cf3..eb15d11ab6 100644 --- a/Makefile +++ b/Makefile @@ -99,7 +99,7 @@ include graphics_file_rules.mk %.lz: % ; $(GFX) $< $@ %.rl: % ; $(GFX) $< $@ sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif ; $(AIF) $< $@ --compress -%.bin: %.aif ; $(AIF) $< $@ +sound/%.bin: sound/%.aif ; $(AIF) $< $@ sound/songs/%.s: sound/songs/%.mid cd $(@D) && ../../$(MID) $( Date: Wed, 20 Jun 2018 17:41:41 -0500 Subject: [PATCH 27/55] Move events and scripts into map dirs --- data/event_scripts.s | 1036 ++++++++--------- data/map_events.s | 1036 ++++++++--------- .../events.inc} | 0 .../AbandonedShip_CaptainsOffice/scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Corridors_1F/scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Corridors_B1F/scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Deck/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Room_B1F/scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Rooms2_1F/scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Rooms2_B1F/scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Rooms_1F/scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Rooms_B1F/scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Underwater1/scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Underwater2/scripts.inc} | 0 .../events.inc} | 0 .../AlteringCave/scripts.inc} | 0 .../events.inc} | 0 .../AncientTomb/scripts.inc} | 0 .../events.inc} | 0 .../AquaHideout_1F/scripts.inc} | 0 .../events.inc} | 0 .../AquaHideout_B1F/scripts.inc} | 0 .../events.inc} | 0 .../AquaHideout_B2F/scripts.inc} | 0 .../events.inc} | 0 .../AquaHideout_UnusedRubyMap1/scripts.inc} | 0 .../events.inc} | 0 .../AquaHideout_UnusedRubyMap2/scripts.inc} | 0 .../events.inc} | 0 .../AquaHideout_UnusedRubyMap3/scripts.inc} | 0 .../events.inc} | 0 .../ArtisanCave_1F/scripts.inc} | 0 .../events.inc} | 0 .../ArtisanCave_B1F/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Lounge1/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Lounge2/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Lounge3/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Lounge4/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Lounge5/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Lounge6/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Lounge7/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Lounge8/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Lounge9/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Mart/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_OutsideEast/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_OutsideWest/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_RankingHall/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_ReceptionGate/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_ScottsHouse/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare01/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare02/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare03/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare04/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare05/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare06/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare07/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare08/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare09/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare10/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare11/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare12/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare13/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare14/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare15/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare16/scripts.inc} | 0 .../events.inc} | 0 .../BirthIsland_Exterior/scripts.inc} | 0 .../events.inc} | 0 .../BirthIsland_Harbor/scripts.inc} | 0 .../events.inc} | 0 .../CaveOfOrigin_1F/scripts.inc} | 0 .../events.inc} | 0 .../CaveOfOrigin_B1F/scripts.inc} | 0 .../events.inc} | 0 .../CaveOfOrigin_Entrance/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../DesertRuins/scripts.inc} | 0 .../events.inc} | 0 .../DesertUnderpass/scripts.inc} | 0 .../events.inc} | 0 .../DewfordTown/scripts.inc} | 0 .../events.inc} | 0 .../DewfordTown_Gym/scripts.inc} | 0 .../events.inc} | 0 .../DewfordTown_Hall/scripts.inc} | 0 .../events.inc} | 0 .../DewfordTown_House1/scripts.inc} | 0 .../events.inc} | 0 .../DewfordTown_House2/scripts.inc} | 0 .../events.inc} | 0 .../DewfordTown_PokemonCenter_1F/scripts.inc} | 0 .../events.inc} | 0 .../DewfordTown_PokemonCenter_2F/scripts.inc} | 0 .../events.inc} | 0 .../DoubleBattleColosseum/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_ChampionsRoom/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_DrakesRoom/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_GlaciasRoom/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_Hall1/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_Hall2/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_Hall3/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_Hall4/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_Hall5/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_HallOfFame/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_PhoebesRoom/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_SidneysRoom/scripts.inc} | 0 .../events.inc} | 0 .../FallarborTown/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../FallarborTown_House1/scripts.inc} | 0 .../events.inc} | 0 .../FallarborTown_House2/scripts.inc} | 0 .../events.inc} | 0 .../FallarborTown_Mart/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../FarawayIsland_Entrance/scripts.inc} | 0 .../events.inc} | 0 .../FarawayIsland_Interior/scripts.inc} | 0 .../FieryPath.inc => FieryPath/events.inc} | 0 .../FieryPath/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_DecorationShop/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_Gym/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_House1/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_House2/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_House3/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_House4/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_House5/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_Mart/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_PokemonCenter_1F/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_PokemonCenter_2F/scripts.inc} | 0 .../events.inc} | 0 .../GraniteCave_1F/scripts.inc} | 0 .../events.inc} | 0 .../GraniteCave_B1F/scripts.inc} | 0 .../events.inc} | 0 .../GraniteCave_B2F/scripts.inc} | 0 .../events.inc} | 0 .../GraniteCave_StevensRoom/scripts.inc} | 0 .../events.inc} | 0 .../InsideOfTruck/scripts.inc} | 0 .../IslandCave.inc => IslandCave/events.inc} | 0 .../IslandCave/scripts.inc} | 0 .../JaggedPass.inc => JaggedPass/events.inc} | 0 .../JaggedPass/scripts.inc} | 0 .../events.inc} | 0 .../LavaridgeTown/scripts.inc} | 0 .../events.inc} | 0 .../LavaridgeTown_Gym_1F/scripts.inc} | 0 .../events.inc} | 0 .../LavaridgeTown_Gym_B1F/scripts.inc} | 0 .../events.inc} | 0 .../LavaridgeTown_HerbShop/scripts.inc} | 0 .../events.inc} | 0 .../LavaridgeTown_House/scripts.inc} | 0 .../events.inc} | 0 .../LavaridgeTown_Mart/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../LilycoveCity/scripts.inc} | 0 .../events.inc} | 0 .../LilycoveCity_ContestHall/scripts.inc} | 0 .../events.inc} | 0 .../LilycoveCity_ContestLobby/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../LilycoveCity_Harbor/scripts.inc} | 0 .../events.inc} | 0 .../LilycoveCity_House1/scripts.inc} | 0 .../events.inc} | 0 .../LilycoveCity_House2/scripts.inc} | 0 .../events.inc} | 0 .../LilycoveCity_House3/scripts.inc} | 0 .../events.inc} | 0 .../LilycoveCity_House4/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../LilycoveCity_UnusedMart/scripts.inc} | 0 .../events.inc} | 0 .../LinkContestRoom1/scripts.inc} | 0 .../events.inc} | 0 .../LinkContestRoom2/scripts.inc} | 0 .../events.inc} | 0 .../LinkContestRoom3/scripts.inc} | 0 .../events.inc} | 0 .../LinkContestRoom4/scripts.inc} | 0 .../events.inc} | 0 .../LinkContestRoom5/scripts.inc} | 0 .../events.inc} | 0 .../LinkContestRoom6/scripts.inc} | 0 .../events.inc} | 0 .../LittlerootTown/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../LittlerootTown_MaysHouse_1F/scripts.inc} | 0 .../events.inc} | 0 .../LittlerootTown_MaysHouse_2F/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../MagmaHideout_1F/scripts.inc} | 0 .../events.inc} | 0 .../MagmaHideout_2F_1R/scripts.inc} | 0 .../events.inc} | 0 .../MagmaHideout_2F_2R/scripts.inc} | 0 .../events.inc} | 0 .../MagmaHideout_2F_3R/scripts.inc} | 0 .../events.inc} | 0 .../MagmaHideout_3F_1R/scripts.inc} | 0 .../events.inc} | 0 .../MagmaHideout_3F_2R/scripts.inc} | 0 .../events.inc} | 0 .../MagmaHideout_3F_3R/scripts.inc} | 0 .../events.inc} | 0 .../MagmaHideout_4F/scripts.inc} | 0 .../events.inc} | 0 .../MarineCave_End/scripts.inc} | 0 .../events.inc} | 0 .../MarineCave_Entrance/scripts.inc} | 0 .../events.inc} | 0 .../MauvilleCity/scripts.inc} | 0 .../events.inc} | 0 .../MauvilleCity_BikeShop/scripts.inc} | 0 .../events.inc} | 0 .../MauvilleCity_GameCorner/scripts.inc} | 0 .../events.inc} | 0 .../MauvilleCity_Gym/scripts.inc} | 0 .../events.inc} | 0 .../MauvilleCity_House1/scripts.inc} | 0 .../events.inc} | 0 .../MauvilleCity_House2/scripts.inc} | 0 .../events.inc} | 0 .../MauvilleCity_Mart/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../MeteorFalls_1F_1R/scripts.inc} | 0 .../events.inc} | 0 .../MeteorFalls_1F_2R/scripts.inc} | 0 .../events.inc} | 0 .../MeteorFalls_B1F_1R/scripts.inc} | 0 .../events.inc} | 0 .../MeteorFalls_B1F_2R/scripts.inc} | 0 .../events.inc} | 0 .../MeteorFalls_StevensCave/scripts.inc} | 0 .../events.inc} | 0 .../MirageTower_1F/scripts.inc} | 0 .../events.inc} | 0 .../MirageTower_2F/scripts.inc} | 0 .../events.inc} | 0 .../MirageTower_3F/scripts.inc} | 0 .../events.inc} | 0 .../MirageTower_4F/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_GameCorner_1F/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_GameCorner_B1F/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_Gym/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_House1/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_House2/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_House3/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_House4/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_Mart/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_SpaceCenter_1F/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_SpaceCenter_2F/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_StevensHouse/scripts.inc} | 0 .../MtChimney.inc => MtChimney/events.inc} | 0 .../MtChimney/scripts.inc} | 0 .../events.inc} | 0 .../MtChimney_CableCarStation/scripts.inc} | 0 .../MtPyre_1F.inc => MtPyre_1F/events.inc} | 0 .../MtPyre_1F/scripts.inc} | 0 .../MtPyre_2F.inc => MtPyre_2F/events.inc} | 0 .../MtPyre_2F/scripts.inc} | 0 .../MtPyre_3F.inc => MtPyre_3F/events.inc} | 0 .../MtPyre_3F/scripts.inc} | 0 .../MtPyre_4F.inc => MtPyre_4F/events.inc} | 0 .../MtPyre_4F/scripts.inc} | 0 .../MtPyre_5F.inc => MtPyre_5F/events.inc} | 0 .../MtPyre_5F/scripts.inc} | 0 .../MtPyre_6F.inc => MtPyre_6F/events.inc} | 0 .../MtPyre_6F/scripts.inc} | 0 .../events.inc} | 0 .../MtPyre_Exterior/scripts.inc} | 0 .../events.inc} | 0 .../MtPyre_Summit/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_B1F/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Bottom/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down01/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down02/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down03/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down04/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down05/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down06/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down07/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down08/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down09/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down10/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down11/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Entrance/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Exterior/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Fork/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Harbor/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Top/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Up1/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Up2/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Up3/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Up4/scripts.inc} | 0 .../events.inc} | 0 .../NewMauville_Entrance/scripts.inc} | 0 .../events.inc} | 0 .../NewMauville_Inside/scripts.inc} | 0 .../OldaleTown.inc => OldaleTown/events.inc} | 0 .../OldaleTown/scripts.inc} | 0 .../events.inc} | 0 .../OldaleTown_House1/scripts.inc} | 0 .../events.inc} | 0 .../OldaleTown_House2/scripts.inc} | 0 .../events.inc} | 0 .../OldaleTown_Mart/scripts.inc} | 0 .../events.inc} | 0 .../OldaleTown_PokemonCenter_1F/scripts.inc} | 0 .../events.inc} | 0 .../OldaleTown_PokemonCenter_2F/scripts.inc} | 0 .../events.inc} | 0 .../PacifidlogTown/scripts.inc} | 0 .../events.inc} | 0 .../PacifidlogTown_House1/scripts.inc} | 0 .../events.inc} | 0 .../PacifidlogTown_House2/scripts.inc} | 0 .../events.inc} | 0 .../PacifidlogTown_House3/scripts.inc} | 0 .../events.inc} | 0 .../PacifidlogTown_House4/scripts.inc} | 0 .../events.inc} | 0 .../PacifidlogTown_House5/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../PetalburgCity/scripts.inc} | 0 .../events.inc} | 0 .../PetalburgCity_Gym/scripts.inc} | 0 .../events.inc} | 0 .../PetalburgCity_House1/scripts.inc} | 0 .../events.inc} | 0 .../PetalburgCity_House2/scripts.inc} | 0 .../events.inc} | 0 .../PetalburgCity_Mart/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../PetalburgCity_WallysHouse/scripts.inc} | 0 .../events.inc} | 0 .../PetalburgWoods/scripts.inc} | 0 .../events.inc} | 0 .../RecordCorner/scripts.inc} | 0 .../Route101.inc => Route101/events.inc} | 0 .../Route101/scripts.inc} | 0 .../Route102.inc => Route102/events.inc} | 0 .../Route102/scripts.inc} | 0 .../Route103.inc => Route103/events.inc} | 0 .../Route103/scripts.inc} | 0 .../Route104.inc => Route104/events.inc} | 0 .../Route104/scripts.inc} | 0 .../events.inc} | 0 .../Route104_MrBrineysHouse/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../Route104_Prototype/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../Route105.inc => Route105/events.inc} | 0 .../Route105/scripts.inc} | 0 .../Route106.inc => Route106/events.inc} | 0 .../Route106/scripts.inc} | 0 .../Route107.inc => Route107/events.inc} | 0 .../Route107/scripts.inc} | 0 .../Route108.inc => Route108/events.inc} | 0 .../Route108/scripts.inc} | 0 .../Route109.inc => Route109/events.inc} | 0 .../Route109/scripts.inc} | 0 .../events.inc} | 0 .../Route109_SeashoreHouse/scripts.inc} | 0 .../Route110.inc => Route110/events.inc} | 0 .../Route110/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHouseCorridor/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHouseEnd/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHouseEntrance/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHousePuzzle1/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHousePuzzle2/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHousePuzzle3/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHousePuzzle4/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHousePuzzle5/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHousePuzzle6/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHousePuzzle7/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHousePuzzle8/scripts.inc} | 0 .../Route111.inc => Route111/events.inc} | 0 .../Route111/scripts.inc} | 0 .../events.inc} | 0 .../Route111_OldLadysRestStop/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../Route112.inc => Route112/events.inc} | 0 .../Route112/scripts.inc} | 0 .../events.inc} | 0 .../Route112_CableCarStation/scripts.inc} | 0 .../Route113.inc => Route113/events.inc} | 0 .../Route113/scripts.inc} | 0 .../events.inc} | 0 .../Route113_GlassWorkshop/scripts.inc} | 0 .../Route114.inc => Route114/events.inc} | 0 .../Route114/scripts.inc} | 0 .../events.inc} | 0 .../Route114_FossilManiacsHouse/scripts.inc} | 0 .../events.inc} | 0 .../Route114_FossilManiacsTunnel/scripts.inc} | 0 .../events.inc} | 0 .../Route114_LanettesHouse/scripts.inc} | 0 .../Route115.inc => Route115/events.inc} | 0 .../Route115/scripts.inc} | 0 .../Route116.inc => Route116/events.inc} | 0 .../Route116/scripts.inc} | 0 .../events.inc} | 0 .../Route116_TunnelersRestHouse/scripts.inc} | 0 .../Route117.inc => Route117/events.inc} | 0 .../Route117/scripts.inc} | 0 .../events.inc} | 0 .../Route117_PokemonDayCare/scripts.inc} | 0 .../Route118.inc => Route118/events.inc} | 0 .../Route118/scripts.inc} | 0 .../Route119.inc => Route119/events.inc} | 0 .../Route119/scripts.inc} | 0 .../events.inc} | 0 .../Route119_House/scripts.inc} | 0 .../events.inc} | 0 .../Route119_WeatherInstitute_1F/scripts.inc} | 0 .../events.inc} | 0 .../Route119_WeatherInstitute_2F/scripts.inc} | 0 .../Route120.inc => Route120/events.inc} | 0 .../Route120/scripts.inc} | 0 .../Route121.inc => Route121/events.inc} | 0 .../Route121/scripts.inc} | 0 .../events.inc} | 0 .../Route121_SafariZoneEntrance/scripts.inc} | 0 .../Route122.inc => Route122/events.inc} | 0 .../Route122/scripts.inc} | 0 .../Route123.inc => Route123/events.inc} | 0 .../Route123/scripts.inc} | 0 .../events.inc} | 0 .../Route123_BerryMastersHouse/scripts.inc} | 0 .../Route124.inc => Route124/events.inc} | 0 .../Route124/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../Route125.inc => Route125/events.inc} | 0 .../Route125/scripts.inc} | 0 .../Route126.inc => Route126/events.inc} | 0 .../Route126/scripts.inc} | 0 .../Route127.inc => Route127/events.inc} | 0 .../Route127/scripts.inc} | 0 .../Route128.inc => Route128/events.inc} | 0 .../Route128/scripts.inc} | 0 .../Route129.inc => Route129/events.inc} | 0 .../Route129/scripts.inc} | 0 .../Route130.inc => Route130/events.inc} | 0 .../Route130/scripts.inc} | 0 .../Route131.inc => Route131/events.inc} | 0 .../Route131/scripts.inc} | 0 .../Route132.inc => Route132/events.inc} | 0 .../Route132/scripts.inc} | 0 .../Route133.inc => Route133/events.inc} | 0 .../Route133/scripts.inc} | 0 .../Route134.inc => Route134/events.inc} | 0 .../Route134/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_CuttersHouse/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_DevonCorp_1F/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_DevonCorp_2F/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_DevonCorp_3F/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_Flat1_1F/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_Flat1_2F/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_Flat2_1F/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_Flat2_2F/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_Flat2_3F/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_Gym/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_House1/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_House2/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_House3/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_Mart/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_PokemonSchool/scripts.inc} | 0 .../events.inc} | 0 .../RusturfTunnel/scripts.inc} | 0 .../events.inc} | 0 .../SSTidalCorridor/scripts.inc} | 0 .../events.inc} | 0 .../SSTidalLowerDeck/scripts.inc} | 0 .../events.inc} | 0 .../SSTidalRooms/scripts.inc} | 0 .../events.inc} | 0 .../SafariZone_North/scripts.inc} | 0 .../events.inc} | 0 .../SafariZone_Northeast/scripts.inc} | 0 .../events.inc} | 0 .../SafariZone_Northwest/scripts.inc} | 0 .../events.inc} | 0 .../SafariZone_RestHouse/scripts.inc} | 0 .../events.inc} | 0 .../SafariZone_South/scripts.inc} | 0 .../events.inc} | 0 .../SafariZone_Southeast/scripts.inc} | 0 .../events.inc} | 0 .../SafariZone_Southwest/scripts.inc} | 0 .../events.inc} | 0 .../ScorchedSlab/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Entrance/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Room1/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Room2/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Room3/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Room4/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Room5/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Room6/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Room7/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Room8/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Room9/scripts.inc} | 0 .../events.inc} | 0 .../SealedChamber_InnerRoom/scripts.inc} | 0 .../events.inc} | 0 .../SealedChamber_OuterRoom/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_BlueCave1/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_BlueCave2/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_BlueCave3/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_BlueCave4/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_BrownCave1/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_BrownCave2/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_BrownCave3/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_BrownCave4/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_RedCave1/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_RedCave2/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_RedCave3/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_RedCave4/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_Shrub1/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_Shrub2/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_Shrub3/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_Shrub4/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_Tree1/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_Tree2/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_Tree3/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_Tree4/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_YellowCave1/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_YellowCave2/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_YellowCave3/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_YellowCave4/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../ShoalCave_HighTideInnerRoom/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../ShoalCave_LowTideIceRoom/scripts.inc} | 0 .../events.inc} | 0 .../ShoalCave_LowTideInnerRoom/scripts.inc} | 0 .../events.inc} | 0 .../ShoalCave_LowTideLowerRoom/scripts.inc} | 0 .../events.inc} | 0 .../ShoalCave_LowTideStairsRoom/scripts.inc} | 0 .../events.inc} | 0 .../SingleBattleColosseum/scripts.inc} | 0 .../events.inc} | 0 .../SkyPillar_1F/scripts.inc} | 0 .../events.inc} | 0 .../SkyPillar_2F/scripts.inc} | 0 .../events.inc} | 0 .../SkyPillar_3F/scripts.inc} | 0 .../events.inc} | 0 .../SkyPillar_4F/scripts.inc} | 0 .../events.inc} | 0 .../SkyPillar_5F/scripts.inc} | 0 .../events.inc} | 0 .../SkyPillar_Entrance/scripts.inc} | 0 .../events.inc} | 0 .../SkyPillar_Outside/scripts.inc} | 0 .../events.inc} | 0 .../SkyPillar_Top/scripts.inc} | 0 .../events.inc} | 0 .../SlateportCity/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../SlateportCity_Harbor/scripts.inc} | 0 .../events.inc} | 0 .../SlateportCity_House1/scripts.inc} | 0 .../events.inc} | 0 .../SlateportCity_House2/scripts.inc} | 0 .../events.inc} | 0 .../SlateportCity_Mart/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../SlateportCity_PokemonFanClub/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity/scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_Gym_1F/scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_Gym_B1F/scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_House1/scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_House2/scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_House3/scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_House4/scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_House5/scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_House6/scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_House7/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_Mart/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../SouthernIsland_Exterior/scripts.inc} | 0 .../events.inc} | 0 .../SouthernIsland_Interior/scripts.inc} | 0 .../events.inc} | 0 .../TerraCave_End/scripts.inc} | 0 .../events.inc} | 0 .../TerraCave_Entrance/scripts.inc} | 0 .../events.inc} | 0 .../TradeCenter/scripts.inc} | 0 .../events.inc} | 0 .../TrainerHill_1F/scripts.inc} | 0 .../events.inc} | 0 .../TrainerHill_2F/scripts.inc} | 0 .../events.inc} | 0 .../TrainerHill_3F/scripts.inc} | 0 .../events.inc} | 0 .../TrainerHill_4F/scripts.inc} | 0 .../events.inc} | 0 .../TrainerHill_Elevator/scripts.inc} | 0 .../events.inc} | 0 .../TrainerHill_Entrance/scripts.inc} | 0 .../events.inc} | 0 .../TrainerHill_Roof/scripts.inc} | 0 .../events.inc} | 0 .../Underwater1/scripts.inc} | 0 .../events.inc} | 0 .../Underwater2/scripts.inc} | 0 .../events.inc} | 0 .../Underwater3/scripts.inc} | 0 .../events.inc} | 0 .../Underwater4/scripts.inc} | 0 .../events.inc} | 0 .../Underwater5/scripts.inc} | 0 .../events.inc} | 0 .../Underwater6/scripts.inc} | 0 .../events.inc} | 0 .../Underwater7/scripts.inc} | 0 .../events.inc} | 0 .../Underwater_MarineCave/scripts.inc} | 0 .../events.inc} | 0 .../Underwater_Route134/scripts.inc} | 0 .../events.inc} | 0 .../Underwater_SeafloorCavern/scripts.inc} | 0 .../events.inc} | 0 .../Underwater_SealedChamber/scripts.inc} | 0 .../events.inc} | 0 .../Underwater_SootopolisCity/scripts.inc} | 0 .../UnionRoom.inc => UnionRoom/events.inc} | 0 .../UnionRoom/scripts.inc} | 0 .../events.inc} | 0 .../UnknownMap_25_29/scripts.inc} | 0 .../events.inc} | 0 .../UnknownMap_25_30/scripts.inc} | 0 .../events.inc} | 0 .../UnknownMap_25_31/scripts.inc} | 0 .../events.inc} | 0 .../UnknownMap_25_32/scripts.inc} | 0 .../events.inc} | 0 .../UnknownMap_25_33/scripts.inc} | 0 .../events.inc} | 0 .../UnknownMap_25_34/scripts.inc} | 0 .../events.inc} | 0 .../VerdanturfTown/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../VerdanturfTown_House/scripts.inc} | 0 .../events.inc} | 0 .../VerdanturfTown_Mart/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../VerdanturfTown_WandasHouse/scripts.inc} | 0 .../events.inc} | 0 .../VictoryRoad_1F/scripts.inc} | 0 .../events.inc} | 0 .../VictoryRoad_B1F/scripts.inc} | 0 .../events.inc} | 0 .../VictoryRoad_B2F/scripts.inc} | 0 1038 files changed, 1036 insertions(+), 1036 deletions(-) rename data/maps/{events/AbandonedShip_CaptainsOffice.inc => AbandonedShip_CaptainsOffice/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_CaptainsOffice.inc => maps/AbandonedShip_CaptainsOffice/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Corridors_1F.inc => AbandonedShip_Corridors_1F/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Corridors_1F.inc => maps/AbandonedShip_Corridors_1F/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Corridors_B1F.inc => AbandonedShip_Corridors_B1F/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Corridors_B1F.inc => maps/AbandonedShip_Corridors_B1F/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Deck.inc => AbandonedShip_Deck/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Deck.inc => maps/AbandonedShip_Deck/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_HiddenFloorCorridors.inc => AbandonedShip_HiddenFloorCorridors/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_HiddenFloorCorridors.inc => maps/AbandonedShip_HiddenFloorCorridors/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_HiddenFloorRooms.inc => AbandonedShip_HiddenFloorRooms/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_HiddenFloorRooms.inc => maps/AbandonedShip_HiddenFloorRooms/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Room_B1F.inc => AbandonedShip_Room_B1F/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Room_B1F.inc => maps/AbandonedShip_Room_B1F/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Rooms2_1F.inc => AbandonedShip_Rooms2_1F/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Rooms2_1F.inc => maps/AbandonedShip_Rooms2_1F/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Rooms2_B1F.inc => AbandonedShip_Rooms2_B1F/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Rooms2_B1F.inc => maps/AbandonedShip_Rooms2_B1F/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Rooms_1F.inc => AbandonedShip_Rooms_1F/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Rooms_1F.inc => maps/AbandonedShip_Rooms_1F/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Rooms_B1F.inc => AbandonedShip_Rooms_B1F/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Rooms_B1F.inc => maps/AbandonedShip_Rooms_B1F/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Underwater1.inc => AbandonedShip_Underwater1/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Underwater1.inc => maps/AbandonedShip_Underwater1/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Underwater2.inc => AbandonedShip_Underwater2/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Underwater2.inc => maps/AbandonedShip_Underwater2/scripts.inc} (100%) rename data/maps/{events/AlteringCave.inc => AlteringCave/events.inc} (100%) rename data/{scripts/maps/AlteringCave.inc => maps/AlteringCave/scripts.inc} (100%) rename data/maps/{events/AncientTomb.inc => AncientTomb/events.inc} (100%) rename data/{scripts/maps/AncientTomb.inc => maps/AncientTomb/scripts.inc} (100%) rename data/maps/{events/AquaHideout_1F.inc => AquaHideout_1F/events.inc} (100%) rename data/{scripts/maps/AquaHideout_1F.inc => maps/AquaHideout_1F/scripts.inc} (100%) rename data/maps/{events/AquaHideout_B1F.inc => AquaHideout_B1F/events.inc} (100%) rename data/{scripts/maps/AquaHideout_B1F.inc => maps/AquaHideout_B1F/scripts.inc} (100%) rename data/maps/{events/AquaHideout_B2F.inc => AquaHideout_B2F/events.inc} (100%) rename data/{scripts/maps/AquaHideout_B2F.inc => maps/AquaHideout_B2F/scripts.inc} (100%) rename data/maps/{events/AquaHideout_UnusedRubyMap1.inc => AquaHideout_UnusedRubyMap1/events.inc} (100%) rename data/{scripts/maps/AquaHideout_UnusedRubyMap1.inc => maps/AquaHideout_UnusedRubyMap1/scripts.inc} (100%) rename data/maps/{events/AquaHideout_UnusedRubyMap2.inc => AquaHideout_UnusedRubyMap2/events.inc} (100%) rename data/{scripts/maps/AquaHideout_UnusedRubyMap2.inc => maps/AquaHideout_UnusedRubyMap2/scripts.inc} (100%) rename data/maps/{events/AquaHideout_UnusedRubyMap3.inc => AquaHideout_UnusedRubyMap3/events.inc} (100%) rename data/{scripts/maps/AquaHideout_UnusedRubyMap3.inc => maps/AquaHideout_UnusedRubyMap3/scripts.inc} (100%) rename data/maps/{events/ArtisanCave_1F.inc => ArtisanCave_1F/events.inc} (100%) rename data/{scripts/maps/ArtisanCave_1F.inc => maps/ArtisanCave_1F/scripts.inc} (100%) rename data/maps/{events/ArtisanCave_B1F.inc => ArtisanCave_B1F/events.inc} (100%) rename data/{scripts/maps/ArtisanCave_B1F.inc => maps/ArtisanCave_B1F/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleArenaBattleRoom.inc => BattleFrontier_BattleArenaBattleRoom/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc => maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleArenaCorridor.inc => BattleFrontier_BattleArenaCorridor/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleArenaCorridor.inc => maps/BattleFrontier_BattleArenaCorridor/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleArenaLobby.inc => BattleFrontier_BattleArenaLobby/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleArenaLobby.inc => maps/BattleFrontier_BattleArenaLobby/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleDomeBattleRoom.inc => BattleFrontier_BattleDomeBattleRoom/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc => maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleDomeCorridor.inc => BattleFrontier_BattleDomeCorridor/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleDomeCorridor.inc => maps/BattleFrontier_BattleDomeCorridor/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleDomeLobby.inc => BattleFrontier_BattleDomeLobby/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleDomeLobby.inc => maps/BattleFrontier_BattleDomeLobby/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleDomePreBattleRoom.inc => BattleFrontier_BattleDomePreBattleRoom/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc => maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleFactoryBattleRoom.inc => BattleFrontier_BattleFactoryBattleRoom/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc => maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleFactoryLobby.inc => BattleFrontier_BattleFactoryLobby/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleFactoryLobby.inc => maps/BattleFrontier_BattleFactoryLobby/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleFactoryPreBattleRoom.inc => BattleFrontier_BattleFactoryPreBattleRoom/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc => maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePalaceBattleRoom.inc => BattleFrontier_BattlePalaceBattleRoom/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc => maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePalaceCorridor.inc => BattleFrontier_BattlePalaceCorridor/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePalaceCorridor.inc => maps/BattleFrontier_BattlePalaceCorridor/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePalaceLobby.inc => BattleFrontier_BattlePalaceLobby/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePalaceLobby.inc => maps/BattleFrontier_BattlePalaceLobby/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePikeCorridor.inc => BattleFrontier_BattlePikeCorridor/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePikeCorridor.inc => maps/BattleFrontier_BattlePikeCorridor/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePikeLobby.inc => BattleFrontier_BattlePikeLobby/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePikeLobby.inc => maps/BattleFrontier_BattlePikeLobby/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePikeRandomRoom1.inc => BattleFrontier_BattlePikeRandomRoom1/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc => maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePikeRandomRoom2.inc => BattleFrontier_BattlePikeRandomRoom2/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc => maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePikeRandomRoom3.inc => BattleFrontier_BattlePikeRandomRoom3/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc => maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePikeThreePathRoom.inc => BattleFrontier_BattlePikeThreePathRoom/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc => maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePointExchangeServiceCorner.inc => BattleFrontier_BattlePointExchangeServiceCorner/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc => maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePyramidEmptySquare.inc => BattleFrontier_BattlePyramidEmptySquare/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc => maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePyramidLobby.inc => BattleFrontier_BattlePyramidLobby/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePyramidLobby.inc => maps/BattleFrontier_BattlePyramidLobby/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePyramidTop.inc => BattleFrontier_BattlePyramidTop/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePyramidTop.inc => maps/BattleFrontier_BattlePyramidTop/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleTowerBattleRoom.inc => BattleFrontier_BattleTowerBattleRoom/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc => maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleTowerBattleRoom2.inc => BattleFrontier_BattleTowerBattleRoom2/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc => maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleTowerCorridor.inc => BattleFrontier_BattleTowerCorridor/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleTowerCorridor.inc => maps/BattleFrontier_BattleTowerCorridor/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleTowerCorridor2.inc => BattleFrontier_BattleTowerCorridor2/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleTowerCorridor2.inc => maps/BattleFrontier_BattleTowerCorridor2/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleTowerElevator.inc => BattleFrontier_BattleTowerElevator/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleTowerElevator.inc => maps/BattleFrontier_BattleTowerElevator/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleTowerLobby.inc => BattleFrontier_BattleTowerLobby/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleTowerLobby.inc => maps/BattleFrontier_BattleTowerLobby/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleTowerMultiBattleRoom.inc => BattleFrontier_BattleTowerMultiBattleRoom/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc => maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Lounge1.inc => BattleFrontier_Lounge1/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Lounge1.inc => maps/BattleFrontier_Lounge1/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Lounge2.inc => BattleFrontier_Lounge2/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Lounge2.inc => maps/BattleFrontier_Lounge2/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Lounge3.inc => BattleFrontier_Lounge3/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Lounge3.inc => maps/BattleFrontier_Lounge3/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Lounge4.inc => BattleFrontier_Lounge4/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Lounge4.inc => maps/BattleFrontier_Lounge4/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Lounge5.inc => BattleFrontier_Lounge5/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Lounge5.inc => maps/BattleFrontier_Lounge5/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Lounge6.inc => BattleFrontier_Lounge6/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Lounge6.inc => maps/BattleFrontier_Lounge6/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Lounge7.inc => BattleFrontier_Lounge7/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Lounge7.inc => maps/BattleFrontier_Lounge7/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Lounge8.inc => BattleFrontier_Lounge8/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Lounge8.inc => maps/BattleFrontier_Lounge8/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Lounge9.inc => BattleFrontier_Lounge9/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Lounge9.inc => maps/BattleFrontier_Lounge9/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Mart.inc => BattleFrontier_Mart/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Mart.inc => maps/BattleFrontier_Mart/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_OutsideEast.inc => BattleFrontier_OutsideEast/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_OutsideEast.inc => maps/BattleFrontier_OutsideEast/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_OutsideWest.inc => BattleFrontier_OutsideWest/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_OutsideWest.inc => maps/BattleFrontier_OutsideWest/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_PokemonCenter_1F.inc => BattleFrontier_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_PokemonCenter_1F.inc => maps/BattleFrontier_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_PokemonCenter_2F.inc => BattleFrontier_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_PokemonCenter_2F.inc => maps/BattleFrontier_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_RankingHall.inc => BattleFrontier_RankingHall/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_RankingHall.inc => maps/BattleFrontier_RankingHall/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_ReceptionGate.inc => BattleFrontier_ReceptionGate/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_ReceptionGate.inc => maps/BattleFrontier_ReceptionGate/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_ScottsHouse.inc => BattleFrontier_ScottsHouse/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_ScottsHouse.inc => maps/BattleFrontier_ScottsHouse/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare01.inc => BattlePyramidSquare01/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare01.inc => maps/BattlePyramidSquare01/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare02.inc => BattlePyramidSquare02/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare02.inc => maps/BattlePyramidSquare02/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare03.inc => BattlePyramidSquare03/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare03.inc => maps/BattlePyramidSquare03/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare04.inc => BattlePyramidSquare04/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare04.inc => maps/BattlePyramidSquare04/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare05.inc => BattlePyramidSquare05/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare05.inc => maps/BattlePyramidSquare05/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare06.inc => BattlePyramidSquare06/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare06.inc => maps/BattlePyramidSquare06/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare07.inc => BattlePyramidSquare07/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare07.inc => maps/BattlePyramidSquare07/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare08.inc => BattlePyramidSquare08/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare08.inc => maps/BattlePyramidSquare08/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare09.inc => BattlePyramidSquare09/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare09.inc => maps/BattlePyramidSquare09/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare10.inc => BattlePyramidSquare10/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare10.inc => maps/BattlePyramidSquare10/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare11.inc => BattlePyramidSquare11/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare11.inc => maps/BattlePyramidSquare11/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare12.inc => BattlePyramidSquare12/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare12.inc => maps/BattlePyramidSquare12/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare13.inc => BattlePyramidSquare13/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare13.inc => maps/BattlePyramidSquare13/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare14.inc => BattlePyramidSquare14/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare14.inc => maps/BattlePyramidSquare14/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare15.inc => BattlePyramidSquare15/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare15.inc => maps/BattlePyramidSquare15/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare16.inc => BattlePyramidSquare16/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare16.inc => maps/BattlePyramidSquare16/scripts.inc} (100%) rename data/maps/{events/BirthIsland_Exterior.inc => BirthIsland_Exterior/events.inc} (100%) rename data/{scripts/maps/BirthIsland_Exterior.inc => maps/BirthIsland_Exterior/scripts.inc} (100%) rename data/maps/{events/BirthIsland_Harbor.inc => BirthIsland_Harbor/events.inc} (100%) rename data/{scripts/maps/BirthIsland_Harbor.inc => maps/BirthIsland_Harbor/scripts.inc} (100%) rename data/maps/{events/CaveOfOrigin_1F.inc => CaveOfOrigin_1F/events.inc} (100%) rename data/{scripts/maps/CaveOfOrigin_1F.inc => maps/CaveOfOrigin_1F/scripts.inc} (100%) rename data/maps/{events/CaveOfOrigin_B1F.inc => CaveOfOrigin_B1F/events.inc} (100%) rename data/{scripts/maps/CaveOfOrigin_B1F.inc => maps/CaveOfOrigin_B1F/scripts.inc} (100%) rename data/maps/{events/CaveOfOrigin_Entrance.inc => CaveOfOrigin_Entrance/events.inc} (100%) rename data/{scripts/maps/CaveOfOrigin_Entrance.inc => maps/CaveOfOrigin_Entrance/scripts.inc} (100%) rename data/maps/{events/CaveOfOrigin_UnusedRubySapphireMap1.inc => CaveOfOrigin_UnusedRubySapphireMap1/events.inc} (100%) rename data/{scripts/maps/CaveOfOrigin_UnusedRubySapphireMap1.inc => maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc} (100%) rename data/maps/{events/CaveOfOrigin_UnusedRubySapphireMap2.inc => CaveOfOrigin_UnusedRubySapphireMap2/events.inc} (100%) rename data/{scripts/maps/CaveOfOrigin_UnusedRubySapphireMap2.inc => maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc} (100%) rename data/maps/{events/CaveOfOrigin_UnusedRubySapphireMap3.inc => CaveOfOrigin_UnusedRubySapphireMap3/events.inc} (100%) rename data/{scripts/maps/CaveOfOrigin_UnusedRubySapphireMap3.inc => maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc} (100%) rename data/maps/{events/DesertRuins.inc => DesertRuins/events.inc} (100%) rename data/{scripts/maps/DesertRuins.inc => maps/DesertRuins/scripts.inc} (100%) rename data/maps/{events/DesertUnderpass.inc => DesertUnderpass/events.inc} (100%) rename data/{scripts/maps/DesertUnderpass.inc => maps/DesertUnderpass/scripts.inc} (100%) rename data/maps/{events/DewfordTown.inc => DewfordTown/events.inc} (100%) rename data/{scripts/maps/DewfordTown.inc => maps/DewfordTown/scripts.inc} (100%) rename data/maps/{events/DewfordTown_Gym.inc => DewfordTown_Gym/events.inc} (100%) rename data/{scripts/maps/DewfordTown_Gym.inc => maps/DewfordTown_Gym/scripts.inc} (100%) rename data/maps/{events/DewfordTown_Hall.inc => DewfordTown_Hall/events.inc} (100%) rename data/{scripts/maps/DewfordTown_Hall.inc => maps/DewfordTown_Hall/scripts.inc} (100%) rename data/maps/{events/DewfordTown_House1.inc => DewfordTown_House1/events.inc} (100%) rename data/{scripts/maps/DewfordTown_House1.inc => maps/DewfordTown_House1/scripts.inc} (100%) rename data/maps/{events/DewfordTown_House2.inc => DewfordTown_House2/events.inc} (100%) rename data/{scripts/maps/DewfordTown_House2.inc => maps/DewfordTown_House2/scripts.inc} (100%) rename data/maps/{events/DewfordTown_PokemonCenter_1F.inc => DewfordTown_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/DewfordTown_PokemonCenter_1F.inc => maps/DewfordTown_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/DewfordTown_PokemonCenter_2F.inc => DewfordTown_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/DewfordTown_PokemonCenter_2F.inc => maps/DewfordTown_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/DoubleBattleColosseum.inc => DoubleBattleColosseum/events.inc} (100%) rename data/{scripts/maps/DoubleBattleColosseum.inc => maps/DoubleBattleColosseum/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity.inc => EverGrandeCity/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity.inc => maps/EverGrandeCity/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_ChampionsRoom.inc => EverGrandeCity_ChampionsRoom/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_ChampionsRoom.inc => maps/EverGrandeCity_ChampionsRoom/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_DrakesRoom.inc => EverGrandeCity_DrakesRoom/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_DrakesRoom.inc => maps/EverGrandeCity_DrakesRoom/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_GlaciasRoom.inc => EverGrandeCity_GlaciasRoom/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_GlaciasRoom.inc => maps/EverGrandeCity_GlaciasRoom/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_Hall1.inc => EverGrandeCity_Hall1/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_Hall1.inc => maps/EverGrandeCity_Hall1/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_Hall2.inc => EverGrandeCity_Hall2/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_Hall2.inc => maps/EverGrandeCity_Hall2/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_Hall3.inc => EverGrandeCity_Hall3/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_Hall3.inc => maps/EverGrandeCity_Hall3/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_Hall4.inc => EverGrandeCity_Hall4/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_Hall4.inc => maps/EverGrandeCity_Hall4/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_Hall5.inc => EverGrandeCity_Hall5/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_Hall5.inc => maps/EverGrandeCity_Hall5/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_HallOfFame.inc => EverGrandeCity_HallOfFame/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_HallOfFame.inc => maps/EverGrandeCity_HallOfFame/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_PhoebesRoom.inc => EverGrandeCity_PhoebesRoom/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_PhoebesRoom.inc => maps/EverGrandeCity_PhoebesRoom/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_PokemonCenter_1F.inc => EverGrandeCity_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_PokemonCenter_1F.inc => maps/EverGrandeCity_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_PokemonCenter_2F.inc => EverGrandeCity_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_PokemonCenter_2F.inc => maps/EverGrandeCity_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_PokemonLeague_1F.inc => EverGrandeCity_PokemonLeague_1F/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_PokemonLeague_1F.inc => maps/EverGrandeCity_PokemonLeague_1F/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_PokemonLeague_2F.inc => EverGrandeCity_PokemonLeague_2F/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_PokemonLeague_2F.inc => maps/EverGrandeCity_PokemonLeague_2F/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_SidneysRoom.inc => EverGrandeCity_SidneysRoom/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_SidneysRoom.inc => maps/EverGrandeCity_SidneysRoom/scripts.inc} (100%) rename data/maps/{events/FallarborTown.inc => FallarborTown/events.inc} (100%) rename data/{scripts/maps/FallarborTown.inc => maps/FallarborTown/scripts.inc} (100%) rename data/maps/{events/FallarborTown_BattleTentBattleRoom.inc => FallarborTown_BattleTentBattleRoom/events.inc} (100%) rename data/{scripts/maps/FallarborTown_BattleTentBattleRoom.inc => maps/FallarborTown_BattleTentBattleRoom/scripts.inc} (100%) rename data/maps/{events/FallarborTown_BattleTentCorridor.inc => FallarborTown_BattleTentCorridor/events.inc} (100%) rename data/{scripts/maps/FallarborTown_BattleTentCorridor.inc => maps/FallarborTown_BattleTentCorridor/scripts.inc} (100%) rename data/maps/{events/FallarborTown_BattleTentLobby.inc => FallarborTown_BattleTentLobby/events.inc} (100%) rename data/{scripts/maps/FallarborTown_BattleTentLobby.inc => maps/FallarborTown_BattleTentLobby/scripts.inc} (100%) rename data/maps/{events/FallarborTown_House1.inc => FallarborTown_House1/events.inc} (100%) rename data/{scripts/maps/FallarborTown_House1.inc => maps/FallarborTown_House1/scripts.inc} (100%) rename data/maps/{events/FallarborTown_House2.inc => FallarborTown_House2/events.inc} (100%) rename data/{scripts/maps/FallarborTown_House2.inc => maps/FallarborTown_House2/scripts.inc} (100%) rename data/maps/{events/FallarborTown_Mart.inc => FallarborTown_Mart/events.inc} (100%) rename data/{scripts/maps/FallarborTown_Mart.inc => maps/FallarborTown_Mart/scripts.inc} (100%) rename data/maps/{events/FallarborTown_PokemonCenter_1F.inc => FallarborTown_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/FallarborTown_PokemonCenter_1F.inc => maps/FallarborTown_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/FallarborTown_PokemonCenter_2F.inc => FallarborTown_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/FallarborTown_PokemonCenter_2F.inc => maps/FallarborTown_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/FarawayIsland_Entrance.inc => FarawayIsland_Entrance/events.inc} (100%) rename data/{scripts/maps/FarawayIsland_Entrance.inc => maps/FarawayIsland_Entrance/scripts.inc} (100%) rename data/maps/{events/FarawayIsland_Interior.inc => FarawayIsland_Interior/events.inc} (100%) rename data/{scripts/maps/FarawayIsland_Interior.inc => maps/FarawayIsland_Interior/scripts.inc} (100%) rename data/maps/{events/FieryPath.inc => FieryPath/events.inc} (100%) rename data/{scripts/maps/FieryPath.inc => maps/FieryPath/scripts.inc} (100%) rename data/maps/{events/FortreeCity.inc => FortreeCity/events.inc} (100%) rename data/{scripts/maps/FortreeCity.inc => maps/FortreeCity/scripts.inc} (100%) rename data/maps/{events/FortreeCity_DecorationShop.inc => FortreeCity_DecorationShop/events.inc} (100%) rename data/{scripts/maps/FortreeCity_DecorationShop.inc => maps/FortreeCity_DecorationShop/scripts.inc} (100%) rename data/maps/{events/FortreeCity_Gym.inc => FortreeCity_Gym/events.inc} (100%) rename data/{scripts/maps/FortreeCity_Gym.inc => maps/FortreeCity_Gym/scripts.inc} (100%) rename data/maps/{events/FortreeCity_House1.inc => FortreeCity_House1/events.inc} (100%) rename data/{scripts/maps/FortreeCity_House1.inc => maps/FortreeCity_House1/scripts.inc} (100%) rename data/maps/{events/FortreeCity_House2.inc => FortreeCity_House2/events.inc} (100%) rename data/{scripts/maps/FortreeCity_House2.inc => maps/FortreeCity_House2/scripts.inc} (100%) rename data/maps/{events/FortreeCity_House3.inc => FortreeCity_House3/events.inc} (100%) rename data/{scripts/maps/FortreeCity_House3.inc => maps/FortreeCity_House3/scripts.inc} (100%) rename data/maps/{events/FortreeCity_House4.inc => FortreeCity_House4/events.inc} (100%) rename data/{scripts/maps/FortreeCity_House4.inc => maps/FortreeCity_House4/scripts.inc} (100%) rename data/maps/{events/FortreeCity_House5.inc => FortreeCity_House5/events.inc} (100%) rename data/{scripts/maps/FortreeCity_House5.inc => maps/FortreeCity_House5/scripts.inc} (100%) rename data/maps/{events/FortreeCity_Mart.inc => FortreeCity_Mart/events.inc} (100%) rename data/{scripts/maps/FortreeCity_Mart.inc => maps/FortreeCity_Mart/scripts.inc} (100%) rename data/maps/{events/FortreeCity_PokemonCenter_1F.inc => FortreeCity_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/FortreeCity_PokemonCenter_1F.inc => maps/FortreeCity_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/FortreeCity_PokemonCenter_2F.inc => FortreeCity_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/FortreeCity_PokemonCenter_2F.inc => maps/FortreeCity_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/GraniteCave_1F.inc => GraniteCave_1F/events.inc} (100%) rename data/{scripts/maps/GraniteCave_1F.inc => maps/GraniteCave_1F/scripts.inc} (100%) rename data/maps/{events/GraniteCave_B1F.inc => GraniteCave_B1F/events.inc} (100%) rename data/{scripts/maps/GraniteCave_B1F.inc => maps/GraniteCave_B1F/scripts.inc} (100%) rename data/maps/{events/GraniteCave_B2F.inc => GraniteCave_B2F/events.inc} (100%) rename data/{scripts/maps/GraniteCave_B2F.inc => maps/GraniteCave_B2F/scripts.inc} (100%) rename data/maps/{events/GraniteCave_StevensRoom.inc => GraniteCave_StevensRoom/events.inc} (100%) rename data/{scripts/maps/GraniteCave_StevensRoom.inc => maps/GraniteCave_StevensRoom/scripts.inc} (100%) rename data/maps/{events/InsideOfTruck.inc => InsideOfTruck/events.inc} (100%) rename data/{scripts/maps/InsideOfTruck.inc => maps/InsideOfTruck/scripts.inc} (100%) rename data/maps/{events/IslandCave.inc => IslandCave/events.inc} (100%) rename data/{scripts/maps/IslandCave.inc => maps/IslandCave/scripts.inc} (100%) rename data/maps/{events/JaggedPass.inc => JaggedPass/events.inc} (100%) rename data/{scripts/maps/JaggedPass.inc => maps/JaggedPass/scripts.inc} (100%) rename data/maps/{events/LavaridgeTown.inc => LavaridgeTown/events.inc} (100%) rename data/{scripts/maps/LavaridgeTown.inc => maps/LavaridgeTown/scripts.inc} (100%) rename data/maps/{events/LavaridgeTown_Gym_1F.inc => LavaridgeTown_Gym_1F/events.inc} (100%) rename data/{scripts/maps/LavaridgeTown_Gym_1F.inc => maps/LavaridgeTown_Gym_1F/scripts.inc} (100%) rename data/maps/{events/LavaridgeTown_Gym_B1F.inc => LavaridgeTown_Gym_B1F/events.inc} (100%) rename data/{scripts/maps/LavaridgeTown_Gym_B1F.inc => maps/LavaridgeTown_Gym_B1F/scripts.inc} (100%) rename data/maps/{events/LavaridgeTown_HerbShop.inc => LavaridgeTown_HerbShop/events.inc} (100%) rename data/{scripts/maps/LavaridgeTown_HerbShop.inc => maps/LavaridgeTown_HerbShop/scripts.inc} (100%) rename data/maps/{events/LavaridgeTown_House.inc => LavaridgeTown_House/events.inc} (100%) rename data/{scripts/maps/LavaridgeTown_House.inc => maps/LavaridgeTown_House/scripts.inc} (100%) rename data/maps/{events/LavaridgeTown_Mart.inc => LavaridgeTown_Mart/events.inc} (100%) rename data/{scripts/maps/LavaridgeTown_Mart.inc => maps/LavaridgeTown_Mart/scripts.inc} (100%) rename data/maps/{events/LavaridgeTown_PokemonCenter_1F.inc => LavaridgeTown_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/LavaridgeTown_PokemonCenter_1F.inc => maps/LavaridgeTown_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/LavaridgeTown_PokemonCenter_2F.inc => LavaridgeTown_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/LavaridgeTown_PokemonCenter_2F.inc => maps/LavaridgeTown_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity.inc => LilycoveCity/events.inc} (100%) rename data/{scripts/maps/LilycoveCity.inc => maps/LilycoveCity/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_ContestHall.inc => LilycoveCity_ContestHall/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_ContestHall.inc => maps/LilycoveCity_ContestHall/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_ContestLobby.inc => LilycoveCity_ContestLobby/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_ContestLobby.inc => maps/LilycoveCity_ContestLobby/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_CoveLilyMotel_1F.inc => LilycoveCity_CoveLilyMotel_1F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc => maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_CoveLilyMotel_2F.inc => LilycoveCity_CoveLilyMotel_2F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc => maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStoreElevator.inc => LilycoveCity_DepartmentStoreElevator/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStoreElevator.inc => maps/LilycoveCity_DepartmentStoreElevator/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStoreRooftop.inc => LilycoveCity_DepartmentStoreRooftop/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc => maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStore_1F.inc => LilycoveCity_DepartmentStore_1F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStore_1F.inc => maps/LilycoveCity_DepartmentStore_1F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStore_2F.inc => LilycoveCity_DepartmentStore_2F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStore_2F.inc => maps/LilycoveCity_DepartmentStore_2F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStore_3F.inc => LilycoveCity_DepartmentStore_3F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStore_3F.inc => maps/LilycoveCity_DepartmentStore_3F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStore_4F.inc => LilycoveCity_DepartmentStore_4F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStore_4F.inc => maps/LilycoveCity_DepartmentStore_4F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStore_5F.inc => LilycoveCity_DepartmentStore_5F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStore_5F.inc => maps/LilycoveCity_DepartmentStore_5F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_Harbor.inc => LilycoveCity_Harbor/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_Harbor.inc => maps/LilycoveCity_Harbor/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_House1.inc => LilycoveCity_House1/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_House1.inc => maps/LilycoveCity_House1/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_House2.inc => LilycoveCity_House2/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_House2.inc => maps/LilycoveCity_House2/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_House3.inc => LilycoveCity_House3/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_House3.inc => maps/LilycoveCity_House3/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_House4.inc => LilycoveCity_House4/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_House4.inc => maps/LilycoveCity_House4/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_LilycoveMuseum_1F.inc => LilycoveCity_LilycoveMuseum_1F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc => maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_LilycoveMuseum_2F.inc => LilycoveCity_LilycoveMuseum_2F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc => maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_MoveDeletersHouse.inc => LilycoveCity_MoveDeletersHouse/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_MoveDeletersHouse.inc => maps/LilycoveCity_MoveDeletersHouse/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_PokemonCenter_1F.inc => LilycoveCity_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_PokemonCenter_1F.inc => maps/LilycoveCity_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_PokemonCenter_2F.inc => LilycoveCity_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_PokemonCenter_2F.inc => maps/LilycoveCity_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_PokemonTrainerFanClub.inc => LilycoveCity_PokemonTrainerFanClub/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc => maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_UnusedMart.inc => LilycoveCity_UnusedMart/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_UnusedMart.inc => maps/LilycoveCity_UnusedMart/scripts.inc} (100%) rename data/maps/{events/LinkContestRoom1.inc => LinkContestRoom1/events.inc} (100%) rename data/{scripts/maps/LinkContestRoom1.inc => maps/LinkContestRoom1/scripts.inc} (100%) rename data/maps/{events/LinkContestRoom2.inc => LinkContestRoom2/events.inc} (100%) rename data/{scripts/maps/LinkContestRoom2.inc => maps/LinkContestRoom2/scripts.inc} (100%) rename data/maps/{events/LinkContestRoom3.inc => LinkContestRoom3/events.inc} (100%) rename data/{scripts/maps/LinkContestRoom3.inc => maps/LinkContestRoom3/scripts.inc} (100%) rename data/maps/{events/LinkContestRoom4.inc => LinkContestRoom4/events.inc} (100%) rename data/{scripts/maps/LinkContestRoom4.inc => maps/LinkContestRoom4/scripts.inc} (100%) rename data/maps/{events/LinkContestRoom5.inc => LinkContestRoom5/events.inc} (100%) rename data/{scripts/maps/LinkContestRoom5.inc => maps/LinkContestRoom5/scripts.inc} (100%) rename data/maps/{events/LinkContestRoom6.inc => LinkContestRoom6/events.inc} (100%) rename data/{scripts/maps/LinkContestRoom6.inc => maps/LinkContestRoom6/scripts.inc} (100%) rename data/maps/{events/LittlerootTown.inc => LittlerootTown/events.inc} (100%) rename data/{scripts/maps/LittlerootTown.inc => maps/LittlerootTown/scripts.inc} (100%) rename data/maps/{events/LittlerootTown_BrendansHouse_1F.inc => LittlerootTown_BrendansHouse_1F/events.inc} (100%) rename data/{scripts/maps/LittlerootTown_BrendansHouse_1F.inc => maps/LittlerootTown_BrendansHouse_1F/scripts.inc} (100%) rename data/maps/{events/LittlerootTown_BrendansHouse_2F.inc => LittlerootTown_BrendansHouse_2F/events.inc} (100%) rename data/{scripts/maps/LittlerootTown_BrendansHouse_2F.inc => maps/LittlerootTown_BrendansHouse_2F/scripts.inc} (100%) rename data/maps/{events/LittlerootTown_MaysHouse_1F.inc => LittlerootTown_MaysHouse_1F/events.inc} (100%) rename data/{scripts/maps/LittlerootTown_MaysHouse_1F.inc => maps/LittlerootTown_MaysHouse_1F/scripts.inc} (100%) rename data/maps/{events/LittlerootTown_MaysHouse_2F.inc => LittlerootTown_MaysHouse_2F/events.inc} (100%) rename data/{scripts/maps/LittlerootTown_MaysHouse_2F.inc => maps/LittlerootTown_MaysHouse_2F/scripts.inc} (100%) rename data/maps/{events/LittlerootTown_ProfessorBirchsLab.inc => LittlerootTown_ProfessorBirchsLab/events.inc} (100%) rename data/{scripts/maps/LittlerootTown_ProfessorBirchsLab.inc => maps/LittlerootTown_ProfessorBirchsLab/scripts.inc} (100%) rename data/maps/{events/MagmaHideout_1F.inc => MagmaHideout_1F/events.inc} (100%) rename data/{scripts/maps/MagmaHideout_1F.inc => maps/MagmaHideout_1F/scripts.inc} (100%) rename data/maps/{events/MagmaHideout_2F_1R.inc => MagmaHideout_2F_1R/events.inc} (100%) rename data/{scripts/maps/MagmaHideout_2F_1R.inc => maps/MagmaHideout_2F_1R/scripts.inc} (100%) rename data/maps/{events/MagmaHideout_2F_2R.inc => MagmaHideout_2F_2R/events.inc} (100%) rename data/{scripts/maps/MagmaHideout_2F_2R.inc => maps/MagmaHideout_2F_2R/scripts.inc} (100%) rename data/maps/{events/MagmaHideout_2F_3R.inc => MagmaHideout_2F_3R/events.inc} (100%) rename data/{scripts/maps/MagmaHideout_2F_3R.inc => maps/MagmaHideout_2F_3R/scripts.inc} (100%) rename data/maps/{events/MagmaHideout_3F_1R.inc => MagmaHideout_3F_1R/events.inc} (100%) rename data/{scripts/maps/MagmaHideout_3F_1R.inc => maps/MagmaHideout_3F_1R/scripts.inc} (100%) rename data/maps/{events/MagmaHideout_3F_2R.inc => MagmaHideout_3F_2R/events.inc} (100%) rename data/{scripts/maps/MagmaHideout_3F_2R.inc => maps/MagmaHideout_3F_2R/scripts.inc} (100%) rename data/maps/{events/MagmaHideout_3F_3R.inc => MagmaHideout_3F_3R/events.inc} (100%) rename data/{scripts/maps/MagmaHideout_3F_3R.inc => maps/MagmaHideout_3F_3R/scripts.inc} (100%) rename data/maps/{events/MagmaHideout_4F.inc => MagmaHideout_4F/events.inc} (100%) rename data/{scripts/maps/MagmaHideout_4F.inc => maps/MagmaHideout_4F/scripts.inc} (100%) rename data/maps/{events/MarineCave_End.inc => MarineCave_End/events.inc} (100%) rename data/{scripts/maps/MarineCave_End.inc => maps/MarineCave_End/scripts.inc} (100%) rename data/maps/{events/MarineCave_Entrance.inc => MarineCave_Entrance/events.inc} (100%) rename data/{scripts/maps/MarineCave_Entrance.inc => maps/MarineCave_Entrance/scripts.inc} (100%) rename data/maps/{events/MauvilleCity.inc => MauvilleCity/events.inc} (100%) rename data/{scripts/maps/MauvilleCity.inc => maps/MauvilleCity/scripts.inc} (100%) rename data/maps/{events/MauvilleCity_BikeShop.inc => MauvilleCity_BikeShop/events.inc} (100%) rename data/{scripts/maps/MauvilleCity_BikeShop.inc => maps/MauvilleCity_BikeShop/scripts.inc} (100%) rename data/maps/{events/MauvilleCity_GameCorner.inc => MauvilleCity_GameCorner/events.inc} (100%) rename data/{scripts/maps/MauvilleCity_GameCorner.inc => maps/MauvilleCity_GameCorner/scripts.inc} (100%) rename data/maps/{events/MauvilleCity_Gym.inc => MauvilleCity_Gym/events.inc} (100%) rename data/{scripts/maps/MauvilleCity_Gym.inc => maps/MauvilleCity_Gym/scripts.inc} (100%) rename data/maps/{events/MauvilleCity_House1.inc => MauvilleCity_House1/events.inc} (100%) rename data/{scripts/maps/MauvilleCity_House1.inc => maps/MauvilleCity_House1/scripts.inc} (100%) rename data/maps/{events/MauvilleCity_House2.inc => MauvilleCity_House2/events.inc} (100%) rename data/{scripts/maps/MauvilleCity_House2.inc => maps/MauvilleCity_House2/scripts.inc} (100%) rename data/maps/{events/MauvilleCity_Mart.inc => MauvilleCity_Mart/events.inc} (100%) rename data/{scripts/maps/MauvilleCity_Mart.inc => maps/MauvilleCity_Mart/scripts.inc} (100%) rename data/maps/{events/MauvilleCity_PokemonCenter_1F.inc => MauvilleCity_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/MauvilleCity_PokemonCenter_1F.inc => maps/MauvilleCity_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/MauvilleCity_PokemonCenter_2F.inc => MauvilleCity_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/MauvilleCity_PokemonCenter_2F.inc => maps/MauvilleCity_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/MeteorFalls_1F_1R.inc => MeteorFalls_1F_1R/events.inc} (100%) rename data/{scripts/maps/MeteorFalls_1F_1R.inc => maps/MeteorFalls_1F_1R/scripts.inc} (100%) rename data/maps/{events/MeteorFalls_1F_2R.inc => MeteorFalls_1F_2R/events.inc} (100%) rename data/{scripts/maps/MeteorFalls_1F_2R.inc => maps/MeteorFalls_1F_2R/scripts.inc} (100%) rename data/maps/{events/MeteorFalls_B1F_1R.inc => MeteorFalls_B1F_1R/events.inc} (100%) rename data/{scripts/maps/MeteorFalls_B1F_1R.inc => maps/MeteorFalls_B1F_1R/scripts.inc} (100%) rename data/maps/{events/MeteorFalls_B1F_2R.inc => MeteorFalls_B1F_2R/events.inc} (100%) rename data/{scripts/maps/MeteorFalls_B1F_2R.inc => maps/MeteorFalls_B1F_2R/scripts.inc} (100%) rename data/maps/{events/MeteorFalls_StevensCave.inc => MeteorFalls_StevensCave/events.inc} (100%) rename data/{scripts/maps/MeteorFalls_StevensCave.inc => maps/MeteorFalls_StevensCave/scripts.inc} (100%) rename data/maps/{events/MirageTower_1F.inc => MirageTower_1F/events.inc} (100%) rename data/{scripts/maps/MirageTower_1F.inc => maps/MirageTower_1F/scripts.inc} (100%) rename data/maps/{events/MirageTower_2F.inc => MirageTower_2F/events.inc} (100%) rename data/{scripts/maps/MirageTower_2F.inc => maps/MirageTower_2F/scripts.inc} (100%) rename data/maps/{events/MirageTower_3F.inc => MirageTower_3F/events.inc} (100%) rename data/{scripts/maps/MirageTower_3F.inc => maps/MirageTower_3F/scripts.inc} (100%) rename data/maps/{events/MirageTower_4F.inc => MirageTower_4F/events.inc} (100%) rename data/{scripts/maps/MirageTower_4F.inc => maps/MirageTower_4F/scripts.inc} (100%) rename data/maps/{events/MossdeepCity.inc => MossdeepCity/events.inc} (100%) rename data/{scripts/maps/MossdeepCity.inc => maps/MossdeepCity/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_GameCorner_1F.inc => MossdeepCity_GameCorner_1F/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_GameCorner_1F.inc => maps/MossdeepCity_GameCorner_1F/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_GameCorner_B1F.inc => MossdeepCity_GameCorner_B1F/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_GameCorner_B1F.inc => maps/MossdeepCity_GameCorner_B1F/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_Gym.inc => MossdeepCity_Gym/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_Gym.inc => maps/MossdeepCity_Gym/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_House1.inc => MossdeepCity_House1/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_House1.inc => maps/MossdeepCity_House1/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_House2.inc => MossdeepCity_House2/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_House2.inc => maps/MossdeepCity_House2/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_House3.inc => MossdeepCity_House3/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_House3.inc => maps/MossdeepCity_House3/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_House4.inc => MossdeepCity_House4/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_House4.inc => maps/MossdeepCity_House4/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_Mart.inc => MossdeepCity_Mart/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_Mart.inc => maps/MossdeepCity_Mart/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_PokemonCenter_1F.inc => MossdeepCity_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_PokemonCenter_1F.inc => maps/MossdeepCity_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_PokemonCenter_2F.inc => MossdeepCity_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_PokemonCenter_2F.inc => maps/MossdeepCity_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_SpaceCenter_1F.inc => MossdeepCity_SpaceCenter_1F/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_SpaceCenter_1F.inc => maps/MossdeepCity_SpaceCenter_1F/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_SpaceCenter_2F.inc => MossdeepCity_SpaceCenter_2F/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_SpaceCenter_2F.inc => maps/MossdeepCity_SpaceCenter_2F/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_StevensHouse.inc => MossdeepCity_StevensHouse/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_StevensHouse.inc => maps/MossdeepCity_StevensHouse/scripts.inc} (100%) rename data/maps/{events/MtChimney.inc => MtChimney/events.inc} (100%) rename data/{scripts/maps/MtChimney.inc => maps/MtChimney/scripts.inc} (100%) rename data/maps/{events/MtChimney_CableCarStation.inc => MtChimney_CableCarStation/events.inc} (100%) rename data/{scripts/maps/MtChimney_CableCarStation.inc => maps/MtChimney_CableCarStation/scripts.inc} (100%) rename data/maps/{events/MtPyre_1F.inc => MtPyre_1F/events.inc} (100%) rename data/{scripts/maps/MtPyre_1F.inc => maps/MtPyre_1F/scripts.inc} (100%) rename data/maps/{events/MtPyre_2F.inc => MtPyre_2F/events.inc} (100%) rename data/{scripts/maps/MtPyre_2F.inc => maps/MtPyre_2F/scripts.inc} (100%) rename data/maps/{events/MtPyre_3F.inc => MtPyre_3F/events.inc} (100%) rename data/{scripts/maps/MtPyre_3F.inc => maps/MtPyre_3F/scripts.inc} (100%) rename data/maps/{events/MtPyre_4F.inc => MtPyre_4F/events.inc} (100%) rename data/{scripts/maps/MtPyre_4F.inc => maps/MtPyre_4F/scripts.inc} (100%) rename data/maps/{events/MtPyre_5F.inc => MtPyre_5F/events.inc} (100%) rename data/{scripts/maps/MtPyre_5F.inc => maps/MtPyre_5F/scripts.inc} (100%) rename data/maps/{events/MtPyre_6F.inc => MtPyre_6F/events.inc} (100%) rename data/{scripts/maps/MtPyre_6F.inc => maps/MtPyre_6F/scripts.inc} (100%) rename data/maps/{events/MtPyre_Exterior.inc => MtPyre_Exterior/events.inc} (100%) rename data/{scripts/maps/MtPyre_Exterior.inc => maps/MtPyre_Exterior/scripts.inc} (100%) rename data/maps/{events/MtPyre_Summit.inc => MtPyre_Summit/events.inc} (100%) rename data/{scripts/maps/MtPyre_Summit.inc => maps/MtPyre_Summit/scripts.inc} (100%) rename data/maps/{events/NavelRock_B1F.inc => NavelRock_B1F/events.inc} (100%) rename data/{scripts/maps/NavelRock_B1F.inc => maps/NavelRock_B1F/scripts.inc} (100%) rename data/maps/{events/NavelRock_Bottom.inc => NavelRock_Bottom/events.inc} (100%) rename data/{scripts/maps/NavelRock_Bottom.inc => maps/NavelRock_Bottom/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down01.inc => NavelRock_Down01/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down01.inc => maps/NavelRock_Down01/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down02.inc => NavelRock_Down02/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down02.inc => maps/NavelRock_Down02/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down03.inc => NavelRock_Down03/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down03.inc => maps/NavelRock_Down03/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down04.inc => NavelRock_Down04/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down04.inc => maps/NavelRock_Down04/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down05.inc => NavelRock_Down05/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down05.inc => maps/NavelRock_Down05/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down06.inc => NavelRock_Down06/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down06.inc => maps/NavelRock_Down06/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down07.inc => NavelRock_Down07/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down07.inc => maps/NavelRock_Down07/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down08.inc => NavelRock_Down08/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down08.inc => maps/NavelRock_Down08/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down09.inc => NavelRock_Down09/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down09.inc => maps/NavelRock_Down09/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down10.inc => NavelRock_Down10/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down10.inc => maps/NavelRock_Down10/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down11.inc => NavelRock_Down11/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down11.inc => maps/NavelRock_Down11/scripts.inc} (100%) rename data/maps/{events/NavelRock_Entrance.inc => NavelRock_Entrance/events.inc} (100%) rename data/{scripts/maps/NavelRock_Entrance.inc => maps/NavelRock_Entrance/scripts.inc} (100%) rename data/maps/{events/NavelRock_Exterior.inc => NavelRock_Exterior/events.inc} (100%) rename data/{scripts/maps/NavelRock_Exterior.inc => maps/NavelRock_Exterior/scripts.inc} (100%) rename data/maps/{events/NavelRock_Fork.inc => NavelRock_Fork/events.inc} (100%) rename data/{scripts/maps/NavelRock_Fork.inc => maps/NavelRock_Fork/scripts.inc} (100%) rename data/maps/{events/NavelRock_Harbor.inc => NavelRock_Harbor/events.inc} (100%) rename data/{scripts/maps/NavelRock_Harbor.inc => maps/NavelRock_Harbor/scripts.inc} (100%) rename data/maps/{events/NavelRock_Top.inc => NavelRock_Top/events.inc} (100%) rename data/{scripts/maps/NavelRock_Top.inc => maps/NavelRock_Top/scripts.inc} (100%) rename data/maps/{events/NavelRock_Up1.inc => NavelRock_Up1/events.inc} (100%) rename data/{scripts/maps/NavelRock_Up1.inc => maps/NavelRock_Up1/scripts.inc} (100%) rename data/maps/{events/NavelRock_Up2.inc => NavelRock_Up2/events.inc} (100%) rename data/{scripts/maps/NavelRock_Up2.inc => maps/NavelRock_Up2/scripts.inc} (100%) rename data/maps/{events/NavelRock_Up3.inc => NavelRock_Up3/events.inc} (100%) rename data/{scripts/maps/NavelRock_Up3.inc => maps/NavelRock_Up3/scripts.inc} (100%) rename data/maps/{events/NavelRock_Up4.inc => NavelRock_Up4/events.inc} (100%) rename data/{scripts/maps/NavelRock_Up4.inc => maps/NavelRock_Up4/scripts.inc} (100%) rename data/maps/{events/NewMauville_Entrance.inc => NewMauville_Entrance/events.inc} (100%) rename data/{scripts/maps/NewMauville_Entrance.inc => maps/NewMauville_Entrance/scripts.inc} (100%) rename data/maps/{events/NewMauville_Inside.inc => NewMauville_Inside/events.inc} (100%) rename data/{scripts/maps/NewMauville_Inside.inc => maps/NewMauville_Inside/scripts.inc} (100%) rename data/maps/{events/OldaleTown.inc => OldaleTown/events.inc} (100%) rename data/{scripts/maps/OldaleTown.inc => maps/OldaleTown/scripts.inc} (100%) rename data/maps/{events/OldaleTown_House1.inc => OldaleTown_House1/events.inc} (100%) rename data/{scripts/maps/OldaleTown_House1.inc => maps/OldaleTown_House1/scripts.inc} (100%) rename data/maps/{events/OldaleTown_House2.inc => OldaleTown_House2/events.inc} (100%) rename data/{scripts/maps/OldaleTown_House2.inc => maps/OldaleTown_House2/scripts.inc} (100%) rename data/maps/{events/OldaleTown_Mart.inc => OldaleTown_Mart/events.inc} (100%) rename data/{scripts/maps/OldaleTown_Mart.inc => maps/OldaleTown_Mart/scripts.inc} (100%) rename data/maps/{events/OldaleTown_PokemonCenter_1F.inc => OldaleTown_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/OldaleTown_PokemonCenter_1F.inc => maps/OldaleTown_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/OldaleTown_PokemonCenter_2F.inc => OldaleTown_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/OldaleTown_PokemonCenter_2F.inc => maps/OldaleTown_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/PacifidlogTown.inc => PacifidlogTown/events.inc} (100%) rename data/{scripts/maps/PacifidlogTown.inc => maps/PacifidlogTown/scripts.inc} (100%) rename data/maps/{events/PacifidlogTown_House1.inc => PacifidlogTown_House1/events.inc} (100%) rename data/{scripts/maps/PacifidlogTown_House1.inc => maps/PacifidlogTown_House1/scripts.inc} (100%) rename data/maps/{events/PacifidlogTown_House2.inc => PacifidlogTown_House2/events.inc} (100%) rename data/{scripts/maps/PacifidlogTown_House2.inc => maps/PacifidlogTown_House2/scripts.inc} (100%) rename data/maps/{events/PacifidlogTown_House3.inc => PacifidlogTown_House3/events.inc} (100%) rename data/{scripts/maps/PacifidlogTown_House3.inc => maps/PacifidlogTown_House3/scripts.inc} (100%) rename data/maps/{events/PacifidlogTown_House4.inc => PacifidlogTown_House4/events.inc} (100%) rename data/{scripts/maps/PacifidlogTown_House4.inc => maps/PacifidlogTown_House4/scripts.inc} (100%) rename data/maps/{events/PacifidlogTown_House5.inc => PacifidlogTown_House5/events.inc} (100%) rename data/{scripts/maps/PacifidlogTown_House5.inc => maps/PacifidlogTown_House5/scripts.inc} (100%) rename data/maps/{events/PacifidlogTown_PokemonCenter_1F.inc => PacifidlogTown_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/PacifidlogTown_PokemonCenter_1F.inc => maps/PacifidlogTown_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/PacifidlogTown_PokemonCenter_2F.inc => PacifidlogTown_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/PacifidlogTown_PokemonCenter_2F.inc => maps/PacifidlogTown_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/PetalburgCity.inc => PetalburgCity/events.inc} (100%) rename data/{scripts/maps/PetalburgCity.inc => maps/PetalburgCity/scripts.inc} (100%) rename data/maps/{events/PetalburgCity_Gym.inc => PetalburgCity_Gym/events.inc} (100%) rename data/{scripts/maps/PetalburgCity_Gym.inc => maps/PetalburgCity_Gym/scripts.inc} (100%) rename data/maps/{events/PetalburgCity_House1.inc => PetalburgCity_House1/events.inc} (100%) rename data/{scripts/maps/PetalburgCity_House1.inc => maps/PetalburgCity_House1/scripts.inc} (100%) rename data/maps/{events/PetalburgCity_House2.inc => PetalburgCity_House2/events.inc} (100%) rename data/{scripts/maps/PetalburgCity_House2.inc => maps/PetalburgCity_House2/scripts.inc} (100%) rename data/maps/{events/PetalburgCity_Mart.inc => PetalburgCity_Mart/events.inc} (100%) rename data/{scripts/maps/PetalburgCity_Mart.inc => maps/PetalburgCity_Mart/scripts.inc} (100%) rename data/maps/{events/PetalburgCity_PokemonCenter_1F.inc => PetalburgCity_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/PetalburgCity_PokemonCenter_1F.inc => maps/PetalburgCity_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/PetalburgCity_PokemonCenter_2F.inc => PetalburgCity_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/PetalburgCity_PokemonCenter_2F.inc => maps/PetalburgCity_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/PetalburgCity_WallysHouse.inc => PetalburgCity_WallysHouse/events.inc} (100%) rename data/{scripts/maps/PetalburgCity_WallysHouse.inc => maps/PetalburgCity_WallysHouse/scripts.inc} (100%) rename data/maps/{events/PetalburgWoods.inc => PetalburgWoods/events.inc} (100%) rename data/{scripts/maps/PetalburgWoods.inc => maps/PetalburgWoods/scripts.inc} (100%) rename data/maps/{events/RecordCorner.inc => RecordCorner/events.inc} (100%) rename data/{scripts/maps/RecordCorner.inc => maps/RecordCorner/scripts.inc} (100%) rename data/maps/{events/Route101.inc => Route101/events.inc} (100%) rename data/{scripts/maps/Route101.inc => maps/Route101/scripts.inc} (100%) rename data/maps/{events/Route102.inc => Route102/events.inc} (100%) rename data/{scripts/maps/Route102.inc => maps/Route102/scripts.inc} (100%) rename data/maps/{events/Route103.inc => Route103/events.inc} (100%) rename data/{scripts/maps/Route103.inc => maps/Route103/scripts.inc} (100%) rename data/maps/{events/Route104.inc => Route104/events.inc} (100%) rename data/{scripts/maps/Route104.inc => maps/Route104/scripts.inc} (100%) rename data/maps/{events/Route104_MrBrineysHouse.inc => Route104_MrBrineysHouse/events.inc} (100%) rename data/{scripts/maps/Route104_MrBrineysHouse.inc => maps/Route104_MrBrineysHouse/scripts.inc} (100%) rename data/maps/{events/Route104_PrettyPetalFlowerShop.inc => Route104_PrettyPetalFlowerShop/events.inc} (100%) rename data/{scripts/maps/Route104_PrettyPetalFlowerShop.inc => maps/Route104_PrettyPetalFlowerShop/scripts.inc} (100%) rename data/maps/{events/Route104_Prototype.inc => Route104_Prototype/events.inc} (100%) rename data/{scripts/maps/Route104_Prototype.inc => maps/Route104_Prototype/scripts.inc} (100%) rename data/maps/{events/Route104_PrototypePrettyPetalFlowerShop.inc => Route104_PrototypePrettyPetalFlowerShop/events.inc} (100%) rename data/{scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc => maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc} (100%) rename data/maps/{events/Route105.inc => Route105/events.inc} (100%) rename data/{scripts/maps/Route105.inc => maps/Route105/scripts.inc} (100%) rename data/maps/{events/Route106.inc => Route106/events.inc} (100%) rename data/{scripts/maps/Route106.inc => maps/Route106/scripts.inc} (100%) rename data/maps/{events/Route107.inc => Route107/events.inc} (100%) rename data/{scripts/maps/Route107.inc => maps/Route107/scripts.inc} (100%) rename data/maps/{events/Route108.inc => Route108/events.inc} (100%) rename data/{scripts/maps/Route108.inc => maps/Route108/scripts.inc} (100%) rename data/maps/{events/Route109.inc => Route109/events.inc} (100%) rename data/{scripts/maps/Route109.inc => maps/Route109/scripts.inc} (100%) rename data/maps/{events/Route109_SeashoreHouse.inc => Route109_SeashoreHouse/events.inc} (100%) rename data/{scripts/maps/Route109_SeashoreHouse.inc => maps/Route109_SeashoreHouse/scripts.inc} (100%) rename data/maps/{events/Route110.inc => Route110/events.inc} (100%) rename data/{scripts/maps/Route110.inc => maps/Route110/scripts.inc} (100%) rename data/maps/{events/Route110_SeasideCyclingRoadEntrance1.inc => Route110_SeasideCyclingRoadEntrance1/events.inc} (100%) rename data/{scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc => maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc} (100%) rename data/maps/{events/Route110_SeasideCyclingRoadEntrance2.inc => Route110_SeasideCyclingRoadEntrance2/events.inc} (100%) rename data/{scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc => maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHouseCorridor.inc => Route110_TrickHouseCorridor/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHouseCorridor.inc => maps/Route110_TrickHouseCorridor/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHouseEnd.inc => Route110_TrickHouseEnd/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHouseEnd.inc => maps/Route110_TrickHouseEnd/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHouseEntrance.inc => Route110_TrickHouseEntrance/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHouseEntrance.inc => maps/Route110_TrickHouseEntrance/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle1.inc => Route110_TrickHousePuzzle1/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle1.inc => maps/Route110_TrickHousePuzzle1/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle2.inc => Route110_TrickHousePuzzle2/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle2.inc => maps/Route110_TrickHousePuzzle2/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle3.inc => Route110_TrickHousePuzzle3/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle3.inc => maps/Route110_TrickHousePuzzle3/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle4.inc => Route110_TrickHousePuzzle4/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle4.inc => maps/Route110_TrickHousePuzzle4/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle5.inc => Route110_TrickHousePuzzle5/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle5.inc => maps/Route110_TrickHousePuzzle5/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle6.inc => Route110_TrickHousePuzzle6/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle6.inc => maps/Route110_TrickHousePuzzle6/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle7.inc => Route110_TrickHousePuzzle7/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle7.inc => maps/Route110_TrickHousePuzzle7/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle8.inc => Route110_TrickHousePuzzle8/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle8.inc => maps/Route110_TrickHousePuzzle8/scripts.inc} (100%) rename data/maps/{events/Route111.inc => Route111/events.inc} (100%) rename data/{scripts/maps/Route111.inc => maps/Route111/scripts.inc} (100%) rename data/maps/{events/Route111_OldLadysRestStop.inc => Route111_OldLadysRestStop/events.inc} (100%) rename data/{scripts/maps/Route111_OldLadysRestStop.inc => maps/Route111_OldLadysRestStop/scripts.inc} (100%) rename data/maps/{events/Route111_WinstrateFamilysHouse.inc => Route111_WinstrateFamilysHouse/events.inc} (100%) rename data/{scripts/maps/Route111_WinstrateFamilysHouse.inc => maps/Route111_WinstrateFamilysHouse/scripts.inc} (100%) rename data/maps/{events/Route112.inc => Route112/events.inc} (100%) rename data/{scripts/maps/Route112.inc => maps/Route112/scripts.inc} (100%) rename data/maps/{events/Route112_CableCarStation.inc => Route112_CableCarStation/events.inc} (100%) rename data/{scripts/maps/Route112_CableCarStation.inc => maps/Route112_CableCarStation/scripts.inc} (100%) rename data/maps/{events/Route113.inc => Route113/events.inc} (100%) rename data/{scripts/maps/Route113.inc => maps/Route113/scripts.inc} (100%) rename data/maps/{events/Route113_GlassWorkshop.inc => Route113_GlassWorkshop/events.inc} (100%) rename data/{scripts/maps/Route113_GlassWorkshop.inc => maps/Route113_GlassWorkshop/scripts.inc} (100%) rename data/maps/{events/Route114.inc => Route114/events.inc} (100%) rename data/{scripts/maps/Route114.inc => maps/Route114/scripts.inc} (100%) rename data/maps/{events/Route114_FossilManiacsHouse.inc => Route114_FossilManiacsHouse/events.inc} (100%) rename data/{scripts/maps/Route114_FossilManiacsHouse.inc => maps/Route114_FossilManiacsHouse/scripts.inc} (100%) rename data/maps/{events/Route114_FossilManiacsTunnel.inc => Route114_FossilManiacsTunnel/events.inc} (100%) rename data/{scripts/maps/Route114_FossilManiacsTunnel.inc => maps/Route114_FossilManiacsTunnel/scripts.inc} (100%) rename data/maps/{events/Route114_LanettesHouse.inc => Route114_LanettesHouse/events.inc} (100%) rename data/{scripts/maps/Route114_LanettesHouse.inc => maps/Route114_LanettesHouse/scripts.inc} (100%) rename data/maps/{events/Route115.inc => Route115/events.inc} (100%) rename data/{scripts/maps/Route115.inc => maps/Route115/scripts.inc} (100%) rename data/maps/{events/Route116.inc => Route116/events.inc} (100%) rename data/{scripts/maps/Route116.inc => maps/Route116/scripts.inc} (100%) rename data/maps/{events/Route116_TunnelersRestHouse.inc => Route116_TunnelersRestHouse/events.inc} (100%) rename data/{scripts/maps/Route116_TunnelersRestHouse.inc => maps/Route116_TunnelersRestHouse/scripts.inc} (100%) rename data/maps/{events/Route117.inc => Route117/events.inc} (100%) rename data/{scripts/maps/Route117.inc => maps/Route117/scripts.inc} (100%) rename data/maps/{events/Route117_PokemonDayCare.inc => Route117_PokemonDayCare/events.inc} (100%) rename data/{scripts/maps/Route117_PokemonDayCare.inc => maps/Route117_PokemonDayCare/scripts.inc} (100%) rename data/maps/{events/Route118.inc => Route118/events.inc} (100%) rename data/{scripts/maps/Route118.inc => maps/Route118/scripts.inc} (100%) rename data/maps/{events/Route119.inc => Route119/events.inc} (100%) rename data/{scripts/maps/Route119.inc => maps/Route119/scripts.inc} (100%) rename data/maps/{events/Route119_House.inc => Route119_House/events.inc} (100%) rename data/{scripts/maps/Route119_House.inc => maps/Route119_House/scripts.inc} (100%) rename data/maps/{events/Route119_WeatherInstitute_1F.inc => Route119_WeatherInstitute_1F/events.inc} (100%) rename data/{scripts/maps/Route119_WeatherInstitute_1F.inc => maps/Route119_WeatherInstitute_1F/scripts.inc} (100%) rename data/maps/{events/Route119_WeatherInstitute_2F.inc => Route119_WeatherInstitute_2F/events.inc} (100%) rename data/{scripts/maps/Route119_WeatherInstitute_2F.inc => maps/Route119_WeatherInstitute_2F/scripts.inc} (100%) rename data/maps/{events/Route120.inc => Route120/events.inc} (100%) rename data/{scripts/maps/Route120.inc => maps/Route120/scripts.inc} (100%) rename data/maps/{events/Route121.inc => Route121/events.inc} (100%) rename data/{scripts/maps/Route121.inc => maps/Route121/scripts.inc} (100%) rename data/maps/{events/Route121_SafariZoneEntrance.inc => Route121_SafariZoneEntrance/events.inc} (100%) rename data/{scripts/maps/Route121_SafariZoneEntrance.inc => maps/Route121_SafariZoneEntrance/scripts.inc} (100%) rename data/maps/{events/Route122.inc => Route122/events.inc} (100%) rename data/{scripts/maps/Route122.inc => maps/Route122/scripts.inc} (100%) rename data/maps/{events/Route123.inc => Route123/events.inc} (100%) rename data/{scripts/maps/Route123.inc => maps/Route123/scripts.inc} (100%) rename data/maps/{events/Route123_BerryMastersHouse.inc => Route123_BerryMastersHouse/events.inc} (100%) rename data/{scripts/maps/Route123_BerryMastersHouse.inc => maps/Route123_BerryMastersHouse/scripts.inc} (100%) rename data/maps/{events/Route124.inc => Route124/events.inc} (100%) rename data/{scripts/maps/Route124.inc => maps/Route124/scripts.inc} (100%) rename data/maps/{events/Route124_DivingTreasureHuntersHouse.inc => Route124_DivingTreasureHuntersHouse/events.inc} (100%) rename data/{scripts/maps/Route124_DivingTreasureHuntersHouse.inc => maps/Route124_DivingTreasureHuntersHouse/scripts.inc} (100%) rename data/maps/{events/Route125.inc => Route125/events.inc} (100%) rename data/{scripts/maps/Route125.inc => maps/Route125/scripts.inc} (100%) rename data/maps/{events/Route126.inc => Route126/events.inc} (100%) rename data/{scripts/maps/Route126.inc => maps/Route126/scripts.inc} (100%) rename data/maps/{events/Route127.inc => Route127/events.inc} (100%) rename data/{scripts/maps/Route127.inc => maps/Route127/scripts.inc} (100%) rename data/maps/{events/Route128.inc => Route128/events.inc} (100%) rename data/{scripts/maps/Route128.inc => maps/Route128/scripts.inc} (100%) rename data/maps/{events/Route129.inc => Route129/events.inc} (100%) rename data/{scripts/maps/Route129.inc => maps/Route129/scripts.inc} (100%) rename data/maps/{events/Route130.inc => Route130/events.inc} (100%) rename data/{scripts/maps/Route130.inc => maps/Route130/scripts.inc} (100%) rename data/maps/{events/Route131.inc => Route131/events.inc} (100%) rename data/{scripts/maps/Route131.inc => maps/Route131/scripts.inc} (100%) rename data/maps/{events/Route132.inc => Route132/events.inc} (100%) rename data/{scripts/maps/Route132.inc => maps/Route132/scripts.inc} (100%) rename data/maps/{events/Route133.inc => Route133/events.inc} (100%) rename data/{scripts/maps/Route133.inc => maps/Route133/scripts.inc} (100%) rename data/maps/{events/Route134.inc => Route134/events.inc} (100%) rename data/{scripts/maps/Route134.inc => maps/Route134/scripts.inc} (100%) rename data/maps/{events/RustboroCity.inc => RustboroCity/events.inc} (100%) rename data/{scripts/maps/RustboroCity.inc => maps/RustboroCity/scripts.inc} (100%) rename data/maps/{events/RustboroCity_CuttersHouse.inc => RustboroCity_CuttersHouse/events.inc} (100%) rename data/{scripts/maps/RustboroCity_CuttersHouse.inc => maps/RustboroCity_CuttersHouse/scripts.inc} (100%) rename data/maps/{events/RustboroCity_DevonCorp_1F.inc => RustboroCity_DevonCorp_1F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_DevonCorp_1F.inc => maps/RustboroCity_DevonCorp_1F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_DevonCorp_2F.inc => RustboroCity_DevonCorp_2F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_DevonCorp_2F.inc => maps/RustboroCity_DevonCorp_2F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_DevonCorp_3F.inc => RustboroCity_DevonCorp_3F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_DevonCorp_3F.inc => maps/RustboroCity_DevonCorp_3F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_Flat1_1F.inc => RustboroCity_Flat1_1F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_Flat1_1F.inc => maps/RustboroCity_Flat1_1F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_Flat1_2F.inc => RustboroCity_Flat1_2F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_Flat1_2F.inc => maps/RustboroCity_Flat1_2F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_Flat2_1F.inc => RustboroCity_Flat2_1F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_Flat2_1F.inc => maps/RustboroCity_Flat2_1F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_Flat2_2F.inc => RustboroCity_Flat2_2F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_Flat2_2F.inc => maps/RustboroCity_Flat2_2F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_Flat2_3F.inc => RustboroCity_Flat2_3F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_Flat2_3F.inc => maps/RustboroCity_Flat2_3F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_Gym.inc => RustboroCity_Gym/events.inc} (100%) rename data/{scripts/maps/RustboroCity_Gym.inc => maps/RustboroCity_Gym/scripts.inc} (100%) rename data/maps/{events/RustboroCity_House1.inc => RustboroCity_House1/events.inc} (100%) rename data/{scripts/maps/RustboroCity_House1.inc => maps/RustboroCity_House1/scripts.inc} (100%) rename data/maps/{events/RustboroCity_House2.inc => RustboroCity_House2/events.inc} (100%) rename data/{scripts/maps/RustboroCity_House2.inc => maps/RustboroCity_House2/scripts.inc} (100%) rename data/maps/{events/RustboroCity_House3.inc => RustboroCity_House3/events.inc} (100%) rename data/{scripts/maps/RustboroCity_House3.inc => maps/RustboroCity_House3/scripts.inc} (100%) rename data/maps/{events/RustboroCity_Mart.inc => RustboroCity_Mart/events.inc} (100%) rename data/{scripts/maps/RustboroCity_Mart.inc => maps/RustboroCity_Mart/scripts.inc} (100%) rename data/maps/{events/RustboroCity_PokemonCenter_1F.inc => RustboroCity_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_PokemonCenter_1F.inc => maps/RustboroCity_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_PokemonCenter_2F.inc => RustboroCity_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_PokemonCenter_2F.inc => maps/RustboroCity_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_PokemonSchool.inc => RustboroCity_PokemonSchool/events.inc} (100%) rename data/{scripts/maps/RustboroCity_PokemonSchool.inc => maps/RustboroCity_PokemonSchool/scripts.inc} (100%) rename data/maps/{events/RusturfTunnel.inc => RusturfTunnel/events.inc} (100%) rename data/{scripts/maps/RusturfTunnel.inc => maps/RusturfTunnel/scripts.inc} (100%) rename data/maps/{events/SSTidalCorridor.inc => SSTidalCorridor/events.inc} (100%) rename data/{scripts/maps/SSTidalCorridor.inc => maps/SSTidalCorridor/scripts.inc} (100%) rename data/maps/{events/SSTidalLowerDeck.inc => SSTidalLowerDeck/events.inc} (100%) rename data/{scripts/maps/SSTidalLowerDeck.inc => maps/SSTidalLowerDeck/scripts.inc} (100%) rename data/maps/{events/SSTidalRooms.inc => SSTidalRooms/events.inc} (100%) rename data/{scripts/maps/SSTidalRooms.inc => maps/SSTidalRooms/scripts.inc} (100%) rename data/maps/{events/SafariZone_North.inc => SafariZone_North/events.inc} (100%) rename data/{scripts/maps/SafariZone_North.inc => maps/SafariZone_North/scripts.inc} (100%) rename data/maps/{events/SafariZone_Northeast.inc => SafariZone_Northeast/events.inc} (100%) rename data/{scripts/maps/SafariZone_Northeast.inc => maps/SafariZone_Northeast/scripts.inc} (100%) rename data/maps/{events/SafariZone_Northwest.inc => SafariZone_Northwest/events.inc} (100%) rename data/{scripts/maps/SafariZone_Northwest.inc => maps/SafariZone_Northwest/scripts.inc} (100%) rename data/maps/{events/SafariZone_RestHouse.inc => SafariZone_RestHouse/events.inc} (100%) rename data/{scripts/maps/SafariZone_RestHouse.inc => maps/SafariZone_RestHouse/scripts.inc} (100%) rename data/maps/{events/SafariZone_South.inc => SafariZone_South/events.inc} (100%) rename data/{scripts/maps/SafariZone_South.inc => maps/SafariZone_South/scripts.inc} (100%) rename data/maps/{events/SafariZone_Southeast.inc => SafariZone_Southeast/events.inc} (100%) rename data/{scripts/maps/SafariZone_Southeast.inc => maps/SafariZone_Southeast/scripts.inc} (100%) rename data/maps/{events/SafariZone_Southwest.inc => SafariZone_Southwest/events.inc} (100%) rename data/{scripts/maps/SafariZone_Southwest.inc => maps/SafariZone_Southwest/scripts.inc} (100%) rename data/maps/{events/ScorchedSlab.inc => ScorchedSlab/events.inc} (100%) rename data/{scripts/maps/ScorchedSlab.inc => maps/ScorchedSlab/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Entrance.inc => SeafloorCavern_Entrance/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Entrance.inc => maps/SeafloorCavern_Entrance/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Room1.inc => SeafloorCavern_Room1/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room1.inc => maps/SeafloorCavern_Room1/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Room2.inc => SeafloorCavern_Room2/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room2.inc => maps/SeafloorCavern_Room2/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Room3.inc => SeafloorCavern_Room3/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room3.inc => maps/SeafloorCavern_Room3/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Room4.inc => SeafloorCavern_Room4/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room4.inc => maps/SeafloorCavern_Room4/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Room5.inc => SeafloorCavern_Room5/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room5.inc => maps/SeafloorCavern_Room5/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Room6.inc => SeafloorCavern_Room6/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room6.inc => maps/SeafloorCavern_Room6/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Room7.inc => SeafloorCavern_Room7/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room7.inc => maps/SeafloorCavern_Room7/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Room8.inc => SeafloorCavern_Room8/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room8.inc => maps/SeafloorCavern_Room8/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Room9.inc => SeafloorCavern_Room9/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room9.inc => maps/SeafloorCavern_Room9/scripts.inc} (100%) rename data/maps/{events/SealedChamber_InnerRoom.inc => SealedChamber_InnerRoom/events.inc} (100%) rename data/{scripts/maps/SealedChamber_InnerRoom.inc => maps/SealedChamber_InnerRoom/scripts.inc} (100%) rename data/maps/{events/SealedChamber_OuterRoom.inc => SealedChamber_OuterRoom/events.inc} (100%) rename data/{scripts/maps/SealedChamber_OuterRoom.inc => maps/SealedChamber_OuterRoom/scripts.inc} (100%) rename data/maps/{events/SecretBase_BlueCave1.inc => SecretBase_BlueCave1/events.inc} (100%) rename data/{scripts/maps/SecretBase_BlueCave1.inc => maps/SecretBase_BlueCave1/scripts.inc} (100%) rename data/maps/{events/SecretBase_BlueCave2.inc => SecretBase_BlueCave2/events.inc} (100%) rename data/{scripts/maps/SecretBase_BlueCave2.inc => maps/SecretBase_BlueCave2/scripts.inc} (100%) rename data/maps/{events/SecretBase_BlueCave3.inc => SecretBase_BlueCave3/events.inc} (100%) rename data/{scripts/maps/SecretBase_BlueCave3.inc => maps/SecretBase_BlueCave3/scripts.inc} (100%) rename data/maps/{events/SecretBase_BlueCave4.inc => SecretBase_BlueCave4/events.inc} (100%) rename data/{scripts/maps/SecretBase_BlueCave4.inc => maps/SecretBase_BlueCave4/scripts.inc} (100%) rename data/maps/{events/SecretBase_BrownCave1.inc => SecretBase_BrownCave1/events.inc} (100%) rename data/{scripts/maps/SecretBase_BrownCave1.inc => maps/SecretBase_BrownCave1/scripts.inc} (100%) rename data/maps/{events/SecretBase_BrownCave2.inc => SecretBase_BrownCave2/events.inc} (100%) rename data/{scripts/maps/SecretBase_BrownCave2.inc => maps/SecretBase_BrownCave2/scripts.inc} (100%) rename data/maps/{events/SecretBase_BrownCave3.inc => SecretBase_BrownCave3/events.inc} (100%) rename data/{scripts/maps/SecretBase_BrownCave3.inc => maps/SecretBase_BrownCave3/scripts.inc} (100%) rename data/maps/{events/SecretBase_BrownCave4.inc => SecretBase_BrownCave4/events.inc} (100%) rename data/{scripts/maps/SecretBase_BrownCave4.inc => maps/SecretBase_BrownCave4/scripts.inc} (100%) rename data/maps/{events/SecretBase_RedCave1.inc => SecretBase_RedCave1/events.inc} (100%) rename data/{scripts/maps/SecretBase_RedCave1.inc => maps/SecretBase_RedCave1/scripts.inc} (100%) rename data/maps/{events/SecretBase_RedCave2.inc => SecretBase_RedCave2/events.inc} (100%) rename data/{scripts/maps/SecretBase_RedCave2.inc => maps/SecretBase_RedCave2/scripts.inc} (100%) rename data/maps/{events/SecretBase_RedCave3.inc => SecretBase_RedCave3/events.inc} (100%) rename data/{scripts/maps/SecretBase_RedCave3.inc => maps/SecretBase_RedCave3/scripts.inc} (100%) rename data/maps/{events/SecretBase_RedCave4.inc => SecretBase_RedCave4/events.inc} (100%) rename data/{scripts/maps/SecretBase_RedCave4.inc => maps/SecretBase_RedCave4/scripts.inc} (100%) rename data/maps/{events/SecretBase_Shrub1.inc => SecretBase_Shrub1/events.inc} (100%) rename data/{scripts/maps/SecretBase_Shrub1.inc => maps/SecretBase_Shrub1/scripts.inc} (100%) rename data/maps/{events/SecretBase_Shrub2.inc => SecretBase_Shrub2/events.inc} (100%) rename data/{scripts/maps/SecretBase_Shrub2.inc => maps/SecretBase_Shrub2/scripts.inc} (100%) rename data/maps/{events/SecretBase_Shrub3.inc => SecretBase_Shrub3/events.inc} (100%) rename data/{scripts/maps/SecretBase_Shrub3.inc => maps/SecretBase_Shrub3/scripts.inc} (100%) rename data/maps/{events/SecretBase_Shrub4.inc => SecretBase_Shrub4/events.inc} (100%) rename data/{scripts/maps/SecretBase_Shrub4.inc => maps/SecretBase_Shrub4/scripts.inc} (100%) rename data/maps/{events/SecretBase_Tree1.inc => SecretBase_Tree1/events.inc} (100%) rename data/{scripts/maps/SecretBase_Tree1.inc => maps/SecretBase_Tree1/scripts.inc} (100%) rename data/maps/{events/SecretBase_Tree2.inc => SecretBase_Tree2/events.inc} (100%) rename data/{scripts/maps/SecretBase_Tree2.inc => maps/SecretBase_Tree2/scripts.inc} (100%) rename data/maps/{events/SecretBase_Tree3.inc => SecretBase_Tree3/events.inc} (100%) rename data/{scripts/maps/SecretBase_Tree3.inc => maps/SecretBase_Tree3/scripts.inc} (100%) rename data/maps/{events/SecretBase_Tree4.inc => SecretBase_Tree4/events.inc} (100%) rename data/{scripts/maps/SecretBase_Tree4.inc => maps/SecretBase_Tree4/scripts.inc} (100%) rename data/maps/{events/SecretBase_YellowCave1.inc => SecretBase_YellowCave1/events.inc} (100%) rename data/{scripts/maps/SecretBase_YellowCave1.inc => maps/SecretBase_YellowCave1/scripts.inc} (100%) rename data/maps/{events/SecretBase_YellowCave2.inc => SecretBase_YellowCave2/events.inc} (100%) rename data/{scripts/maps/SecretBase_YellowCave2.inc => maps/SecretBase_YellowCave2/scripts.inc} (100%) rename data/maps/{events/SecretBase_YellowCave3.inc => SecretBase_YellowCave3/events.inc} (100%) rename data/{scripts/maps/SecretBase_YellowCave3.inc => maps/SecretBase_YellowCave3/scripts.inc} (100%) rename data/maps/{events/SecretBase_YellowCave4.inc => SecretBase_YellowCave4/events.inc} (100%) rename data/{scripts/maps/SecretBase_YellowCave4.inc => maps/SecretBase_YellowCave4/scripts.inc} (100%) rename data/maps/{events/ShoalCave_HighTideEntranceRoom.inc => ShoalCave_HighTideEntranceRoom/events.inc} (100%) rename data/{scripts/maps/ShoalCave_HighTideEntranceRoom.inc => maps/ShoalCave_HighTideEntranceRoom/scripts.inc} (100%) rename data/maps/{events/ShoalCave_HighTideInnerRoom.inc => ShoalCave_HighTideInnerRoom/events.inc} (100%) rename data/{scripts/maps/ShoalCave_HighTideInnerRoom.inc => maps/ShoalCave_HighTideInnerRoom/scripts.inc} (100%) rename data/maps/{events/ShoalCave_LowTideEntranceRoom.inc => ShoalCave_LowTideEntranceRoom/events.inc} (100%) rename data/{scripts/maps/ShoalCave_LowTideEntranceRoom.inc => maps/ShoalCave_LowTideEntranceRoom/scripts.inc} (100%) rename data/maps/{events/ShoalCave_LowTideIceRoom.inc => ShoalCave_LowTideIceRoom/events.inc} (100%) rename data/{scripts/maps/ShoalCave_LowTideIceRoom.inc => maps/ShoalCave_LowTideIceRoom/scripts.inc} (100%) rename data/maps/{events/ShoalCave_LowTideInnerRoom.inc => ShoalCave_LowTideInnerRoom/events.inc} (100%) rename data/{scripts/maps/ShoalCave_LowTideInnerRoom.inc => maps/ShoalCave_LowTideInnerRoom/scripts.inc} (100%) rename data/maps/{events/ShoalCave_LowTideLowerRoom.inc => ShoalCave_LowTideLowerRoom/events.inc} (100%) rename data/{scripts/maps/ShoalCave_LowTideLowerRoom.inc => maps/ShoalCave_LowTideLowerRoom/scripts.inc} (100%) rename data/maps/{events/ShoalCave_LowTideStairsRoom.inc => ShoalCave_LowTideStairsRoom/events.inc} (100%) rename data/{scripts/maps/ShoalCave_LowTideStairsRoom.inc => maps/ShoalCave_LowTideStairsRoom/scripts.inc} (100%) rename data/maps/{events/SingleBattleColosseum.inc => SingleBattleColosseum/events.inc} (100%) rename data/{scripts/maps/SingleBattleColosseum.inc => maps/SingleBattleColosseum/scripts.inc} (100%) rename data/maps/{events/SkyPillar_1F.inc => SkyPillar_1F/events.inc} (100%) rename data/{scripts/maps/SkyPillar_1F.inc => maps/SkyPillar_1F/scripts.inc} (100%) rename data/maps/{events/SkyPillar_2F.inc => SkyPillar_2F/events.inc} (100%) rename data/{scripts/maps/SkyPillar_2F.inc => maps/SkyPillar_2F/scripts.inc} (100%) rename data/maps/{events/SkyPillar_3F.inc => SkyPillar_3F/events.inc} (100%) rename data/{scripts/maps/SkyPillar_3F.inc => maps/SkyPillar_3F/scripts.inc} (100%) rename data/maps/{events/SkyPillar_4F.inc => SkyPillar_4F/events.inc} (100%) rename data/{scripts/maps/SkyPillar_4F.inc => maps/SkyPillar_4F/scripts.inc} (100%) rename data/maps/{events/SkyPillar_5F.inc => SkyPillar_5F/events.inc} (100%) rename data/{scripts/maps/SkyPillar_5F.inc => maps/SkyPillar_5F/scripts.inc} (100%) rename data/maps/{events/SkyPillar_Entrance.inc => SkyPillar_Entrance/events.inc} (100%) rename data/{scripts/maps/SkyPillar_Entrance.inc => maps/SkyPillar_Entrance/scripts.inc} (100%) rename data/maps/{events/SkyPillar_Outside.inc => SkyPillar_Outside/events.inc} (100%) rename data/{scripts/maps/SkyPillar_Outside.inc => maps/SkyPillar_Outside/scripts.inc} (100%) rename data/maps/{events/SkyPillar_Top.inc => SkyPillar_Top/events.inc} (100%) rename data/{scripts/maps/SkyPillar_Top.inc => maps/SkyPillar_Top/scripts.inc} (100%) rename data/maps/{events/SlateportCity.inc => SlateportCity/events.inc} (100%) rename data/{scripts/maps/SlateportCity.inc => maps/SlateportCity/scripts.inc} (100%) rename data/maps/{events/SlateportCity_BattleTentBattleRoom.inc => SlateportCity_BattleTentBattleRoom/events.inc} (100%) rename data/{scripts/maps/SlateportCity_BattleTentBattleRoom.inc => maps/SlateportCity_BattleTentBattleRoom/scripts.inc} (100%) rename data/maps/{events/SlateportCity_BattleTentCorridor.inc => SlateportCity_BattleTentCorridor/events.inc} (100%) rename data/{scripts/maps/SlateportCity_BattleTentCorridor.inc => maps/SlateportCity_BattleTentCorridor/scripts.inc} (100%) rename data/maps/{events/SlateportCity_BattleTentLobby.inc => SlateportCity_BattleTentLobby/events.inc} (100%) rename data/{scripts/maps/SlateportCity_BattleTentLobby.inc => maps/SlateportCity_BattleTentLobby/scripts.inc} (100%) rename data/maps/{events/SlateportCity_Harbor.inc => SlateportCity_Harbor/events.inc} (100%) rename data/{scripts/maps/SlateportCity_Harbor.inc => maps/SlateportCity_Harbor/scripts.inc} (100%) rename data/maps/{events/SlateportCity_House1.inc => SlateportCity_House1/events.inc} (100%) rename data/{scripts/maps/SlateportCity_House1.inc => maps/SlateportCity_House1/scripts.inc} (100%) rename data/maps/{events/SlateportCity_House2.inc => SlateportCity_House2/events.inc} (100%) rename data/{scripts/maps/SlateportCity_House2.inc => maps/SlateportCity_House2/scripts.inc} (100%) rename data/maps/{events/SlateportCity_Mart.inc => SlateportCity_Mart/events.inc} (100%) rename data/{scripts/maps/SlateportCity_Mart.inc => maps/SlateportCity_Mart/scripts.inc} (100%) rename data/maps/{events/SlateportCity_OceanicMuseum_1F.inc => SlateportCity_OceanicMuseum_1F/events.inc} (100%) rename data/{scripts/maps/SlateportCity_OceanicMuseum_1F.inc => maps/SlateportCity_OceanicMuseum_1F/scripts.inc} (100%) rename data/maps/{events/SlateportCity_OceanicMuseum_2F.inc => SlateportCity_OceanicMuseum_2F/events.inc} (100%) rename data/{scripts/maps/SlateportCity_OceanicMuseum_2F.inc => maps/SlateportCity_OceanicMuseum_2F/scripts.inc} (100%) rename data/maps/{events/SlateportCity_PokemonCenter_1F.inc => SlateportCity_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/SlateportCity_PokemonCenter_1F.inc => maps/SlateportCity_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/SlateportCity_PokemonCenter_2F.inc => SlateportCity_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/SlateportCity_PokemonCenter_2F.inc => maps/SlateportCity_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/SlateportCity_PokemonFanClub.inc => SlateportCity_PokemonFanClub/events.inc} (100%) rename data/{scripts/maps/SlateportCity_PokemonFanClub.inc => maps/SlateportCity_PokemonFanClub/scripts.inc} (100%) rename data/maps/{events/SlateportCity_SternsShipyard_1F.inc => SlateportCity_SternsShipyard_1F/events.inc} (100%) rename data/{scripts/maps/SlateportCity_SternsShipyard_1F.inc => maps/SlateportCity_SternsShipyard_1F/scripts.inc} (100%) rename data/maps/{events/SlateportCity_SternsShipyard_2F.inc => SlateportCity_SternsShipyard_2F/events.inc} (100%) rename data/{scripts/maps/SlateportCity_SternsShipyard_2F.inc => maps/SlateportCity_SternsShipyard_2F/scripts.inc} (100%) rename data/maps/{events/SootopolisCity.inc => SootopolisCity/events.inc} (100%) rename data/{scripts/maps/SootopolisCity.inc => maps/SootopolisCity/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_Gym_1F.inc => SootopolisCity_Gym_1F/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_Gym_1F.inc => maps/SootopolisCity_Gym_1F/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_Gym_B1F.inc => SootopolisCity_Gym_B1F/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_Gym_B1F.inc => maps/SootopolisCity_Gym_B1F/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_House1.inc => SootopolisCity_House1/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_House1.inc => maps/SootopolisCity_House1/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_House2.inc => SootopolisCity_House2/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_House2.inc => maps/SootopolisCity_House2/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_House3.inc => SootopolisCity_House3/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_House3.inc => maps/SootopolisCity_House3/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_House4.inc => SootopolisCity_House4/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_House4.inc => maps/SootopolisCity_House4/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_House5.inc => SootopolisCity_House5/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_House5.inc => maps/SootopolisCity_House5/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_House6.inc => SootopolisCity_House6/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_House6.inc => maps/SootopolisCity_House6/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_House7.inc => SootopolisCity_House7/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_House7.inc => maps/SootopolisCity_House7/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_LotadAndSeedotHouse.inc => SootopolisCity_LotadAndSeedotHouse/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc => maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_Mart.inc => SootopolisCity_Mart/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_Mart.inc => maps/SootopolisCity_Mart/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_MysteryEventsHouse_1F.inc => SootopolisCity_MysteryEventsHouse_1F/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc => maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_MysteryEventsHouse_B1F.inc => SootopolisCity_MysteryEventsHouse_B1F/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc => maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_PokemonCenter_1F.inc => SootopolisCity_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_PokemonCenter_1F.inc => maps/SootopolisCity_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_PokemonCenter_2F.inc => SootopolisCity_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_PokemonCenter_2F.inc => maps/SootopolisCity_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/SouthernIsland_Exterior.inc => SouthernIsland_Exterior/events.inc} (100%) rename data/{scripts/maps/SouthernIsland_Exterior.inc => maps/SouthernIsland_Exterior/scripts.inc} (100%) rename data/maps/{events/SouthernIsland_Interior.inc => SouthernIsland_Interior/events.inc} (100%) rename data/{scripts/maps/SouthernIsland_Interior.inc => maps/SouthernIsland_Interior/scripts.inc} (100%) rename data/maps/{events/TerraCave_End.inc => TerraCave_End/events.inc} (100%) rename data/{scripts/maps/TerraCave_End.inc => maps/TerraCave_End/scripts.inc} (100%) rename data/maps/{events/TerraCave_Entrance.inc => TerraCave_Entrance/events.inc} (100%) rename data/{scripts/maps/TerraCave_Entrance.inc => maps/TerraCave_Entrance/scripts.inc} (100%) rename data/maps/{events/TradeCenter.inc => TradeCenter/events.inc} (100%) rename data/{scripts/maps/TradeCenter.inc => maps/TradeCenter/scripts.inc} (100%) rename data/maps/{events/TrainerHill_1F.inc => TrainerHill_1F/events.inc} (100%) rename data/{scripts/maps/TrainerHill_1F.inc => maps/TrainerHill_1F/scripts.inc} (100%) rename data/maps/{events/TrainerHill_2F.inc => TrainerHill_2F/events.inc} (100%) rename data/{scripts/maps/TrainerHill_2F.inc => maps/TrainerHill_2F/scripts.inc} (100%) rename data/maps/{events/TrainerHill_3F.inc => TrainerHill_3F/events.inc} (100%) rename data/{scripts/maps/TrainerHill_3F.inc => maps/TrainerHill_3F/scripts.inc} (100%) rename data/maps/{events/TrainerHill_4F.inc => TrainerHill_4F/events.inc} (100%) rename data/{scripts/maps/TrainerHill_4F.inc => maps/TrainerHill_4F/scripts.inc} (100%) rename data/maps/{events/TrainerHill_Elevator.inc => TrainerHill_Elevator/events.inc} (100%) rename data/{scripts/maps/TrainerHill_Elevator.inc => maps/TrainerHill_Elevator/scripts.inc} (100%) rename data/maps/{events/TrainerHill_Entrance.inc => TrainerHill_Entrance/events.inc} (100%) rename data/{scripts/maps/TrainerHill_Entrance.inc => maps/TrainerHill_Entrance/scripts.inc} (100%) rename data/maps/{events/TrainerHill_Roof.inc => TrainerHill_Roof/events.inc} (100%) rename data/{scripts/maps/TrainerHill_Roof.inc => maps/TrainerHill_Roof/scripts.inc} (100%) rename data/maps/{events/Underwater1.inc => Underwater1/events.inc} (100%) rename data/{scripts/maps/Underwater1.inc => maps/Underwater1/scripts.inc} (100%) rename data/maps/{events/Underwater2.inc => Underwater2/events.inc} (100%) rename data/{scripts/maps/Underwater2.inc => maps/Underwater2/scripts.inc} (100%) rename data/maps/{events/Underwater3.inc => Underwater3/events.inc} (100%) rename data/{scripts/maps/Underwater3.inc => maps/Underwater3/scripts.inc} (100%) rename data/maps/{events/Underwater4.inc => Underwater4/events.inc} (100%) rename data/{scripts/maps/Underwater4.inc => maps/Underwater4/scripts.inc} (100%) rename data/maps/{events/Underwater5.inc => Underwater5/events.inc} (100%) rename data/{scripts/maps/Underwater5.inc => maps/Underwater5/scripts.inc} (100%) rename data/maps/{events/Underwater6.inc => Underwater6/events.inc} (100%) rename data/{scripts/maps/Underwater6.inc => maps/Underwater6/scripts.inc} (100%) rename data/maps/{events/Underwater7.inc => Underwater7/events.inc} (100%) rename data/{scripts/maps/Underwater7.inc => maps/Underwater7/scripts.inc} (100%) rename data/maps/{events/Underwater_MarineCave.inc => Underwater_MarineCave/events.inc} (100%) rename data/{scripts/maps/Underwater_MarineCave.inc => maps/Underwater_MarineCave/scripts.inc} (100%) rename data/maps/{events/Underwater_Route134.inc => Underwater_Route134/events.inc} (100%) rename data/{scripts/maps/Underwater_Route134.inc => maps/Underwater_Route134/scripts.inc} (100%) rename data/maps/{events/Underwater_SeafloorCavern.inc => Underwater_SeafloorCavern/events.inc} (100%) rename data/{scripts/maps/Underwater_SeafloorCavern.inc => maps/Underwater_SeafloorCavern/scripts.inc} (100%) rename data/maps/{events/Underwater_SealedChamber.inc => Underwater_SealedChamber/events.inc} (100%) rename data/{scripts/maps/Underwater_SealedChamber.inc => maps/Underwater_SealedChamber/scripts.inc} (100%) rename data/maps/{events/Underwater_SootopolisCity.inc => Underwater_SootopolisCity/events.inc} (100%) rename data/{scripts/maps/Underwater_SootopolisCity.inc => maps/Underwater_SootopolisCity/scripts.inc} (100%) rename data/maps/{events/UnionRoom.inc => UnionRoom/events.inc} (100%) rename data/{scripts/maps/UnionRoom.inc => maps/UnionRoom/scripts.inc} (100%) rename data/maps/{events/UnknownMap_25_29.inc => UnknownMap_25_29/events.inc} (100%) rename data/{scripts/maps/UnknownMap_25_29.inc => maps/UnknownMap_25_29/scripts.inc} (100%) rename data/maps/{events/UnknownMap_25_30.inc => UnknownMap_25_30/events.inc} (100%) rename data/{scripts/maps/UnknownMap_25_30.inc => maps/UnknownMap_25_30/scripts.inc} (100%) rename data/maps/{events/UnknownMap_25_31.inc => UnknownMap_25_31/events.inc} (100%) rename data/{scripts/maps/UnknownMap_25_31.inc => maps/UnknownMap_25_31/scripts.inc} (100%) rename data/maps/{events/UnknownMap_25_32.inc => UnknownMap_25_32/events.inc} (100%) rename data/{scripts/maps/UnknownMap_25_32.inc => maps/UnknownMap_25_32/scripts.inc} (100%) rename data/maps/{events/UnknownMap_25_33.inc => UnknownMap_25_33/events.inc} (100%) rename data/{scripts/maps/UnknownMap_25_33.inc => maps/UnknownMap_25_33/scripts.inc} (100%) rename data/maps/{events/UnknownMap_25_34.inc => UnknownMap_25_34/events.inc} (100%) rename data/{scripts/maps/UnknownMap_25_34.inc => maps/UnknownMap_25_34/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown.inc => VerdanturfTown/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown.inc => maps/VerdanturfTown/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown_BattleTentBattleRoom.inc => VerdanturfTown_BattleTentBattleRoom/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc => maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown_BattleTentCorridor.inc => VerdanturfTown_BattleTentCorridor/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown_BattleTentCorridor.inc => maps/VerdanturfTown_BattleTentCorridor/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown_BattleTentLobby.inc => VerdanturfTown_BattleTentLobby/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown_BattleTentLobby.inc => maps/VerdanturfTown_BattleTentLobby/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown_FriendshipRatersHouse.inc => VerdanturfTown_FriendshipRatersHouse/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc => maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown_House.inc => VerdanturfTown_House/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown_House.inc => maps/VerdanturfTown_House/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown_Mart.inc => VerdanturfTown_Mart/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown_Mart.inc => maps/VerdanturfTown_Mart/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown_PokemonCenter_1F.inc => VerdanturfTown_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown_PokemonCenter_1F.inc => maps/VerdanturfTown_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown_PokemonCenter_2F.inc => VerdanturfTown_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown_PokemonCenter_2F.inc => maps/VerdanturfTown_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown_WandasHouse.inc => VerdanturfTown_WandasHouse/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown_WandasHouse.inc => maps/VerdanturfTown_WandasHouse/scripts.inc} (100%) rename data/maps/{events/VictoryRoad_1F.inc => VictoryRoad_1F/events.inc} (100%) rename data/{scripts/maps/VictoryRoad_1F.inc => maps/VictoryRoad_1F/scripts.inc} (100%) rename data/maps/{events/VictoryRoad_B1F.inc => VictoryRoad_B1F/events.inc} (100%) rename data/{scripts/maps/VictoryRoad_B1F.inc => maps/VictoryRoad_B1F/scripts.inc} (100%) rename data/maps/{events/VictoryRoad_B2F.inc => VictoryRoad_B2F/events.inc} (100%) rename data/{scripts/maps/VictoryRoad_B2F.inc => maps/VictoryRoad_B2F/scripts.inc} (100%) diff --git a/data/event_scripts.s b/data/event_scripts.s index e18dec8360..4ad0ad60dd 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -59,376 +59,376 @@ gStdScripts_End:: @ 81DC2CC map_script 2, PetalburgCity_MapScript2_1DC31C .byte 0 - .include "data/scripts/maps/PetalburgCity.inc" - .include "data/scripts/maps/SlateportCity.inc" - .include "data/scripts/maps/MauvilleCity.inc" - .include "data/scripts/maps/RustboroCity.inc" - .include "data/scripts/maps/FortreeCity.inc" - .include "data/scripts/maps/LilycoveCity.inc" - .include "data/scripts/maps/MossdeepCity.inc" - .include "data/scripts/maps/SootopolisCity.inc" - .include "data/scripts/maps/EverGrandeCity.inc" - .include "data/scripts/maps/LittlerootTown.inc" - .include "data/scripts/maps/OldaleTown.inc" - .include "data/scripts/maps/DewfordTown.inc" - .include "data/scripts/maps/LavaridgeTown.inc" - .include "data/scripts/maps/FallarborTown.inc" - .include "data/scripts/maps/VerdanturfTown.inc" - .include "data/scripts/maps/PacifidlogTown.inc" - .include "data/scripts/maps/Route101.inc" - .include "data/scripts/maps/Route102.inc" - .include "data/scripts/maps/Route103.inc" - .include "data/scripts/maps/Route104.inc" - .include "data/scripts/maps/Route105.inc" - .include "data/scripts/maps/Route106.inc" - .include "data/scripts/maps/Route107.inc" - .include "data/scripts/maps/Route108.inc" - .include "data/scripts/maps/Route109.inc" - .include "data/scripts/maps/Route110.inc" - .include "data/scripts/maps/Route111.inc" - .include "data/scripts/maps/Route112.inc" - .include "data/scripts/maps/Route113.inc" - .include "data/scripts/maps/Route114.inc" - .include "data/scripts/maps/Route115.inc" - .include "data/scripts/maps/Route116.inc" - .include "data/scripts/maps/Route117.inc" - .include "data/scripts/maps/Route118.inc" - .include "data/scripts/maps/Route119.inc" - .include "data/scripts/maps/Route120.inc" - .include "data/scripts/maps/Route121.inc" - .include "data/scripts/maps/Route122.inc" - .include "data/scripts/maps/Route123.inc" - .include "data/scripts/maps/Route124.inc" - .include "data/scripts/maps/Route125.inc" - .include "data/scripts/maps/Route126.inc" - .include "data/scripts/maps/Route127.inc" - .include "data/scripts/maps/Route128.inc" - .include "data/scripts/maps/Route129.inc" - .include "data/scripts/maps/Route130.inc" - .include "data/scripts/maps/Route131.inc" - .include "data/scripts/maps/Route132.inc" - .include "data/scripts/maps/Route133.inc" - .include "data/scripts/maps/Route134.inc" - .include "data/scripts/maps/Underwater1.inc" - .include "data/scripts/maps/Underwater2.inc" - .include "data/scripts/maps/Underwater3.inc" - .include "data/scripts/maps/Underwater4.inc" - .include "data/scripts/maps/Underwater5.inc" - .include "data/scripts/maps/Underwater6.inc" - .include "data/scripts/maps/Underwater7.inc" - .include "data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc" - .include "data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc" - .include "data/scripts/maps/LittlerootTown_MaysHouse_1F.inc" - .include "data/scripts/maps/LittlerootTown_MaysHouse_2F.inc" - .include "data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc" - .include "data/scripts/maps/OldaleTown_House1.inc" - .include "data/scripts/maps/OldaleTown_House2.inc" - .include "data/scripts/maps/OldaleTown_PokemonCenter_1F.inc" - .include "data/scripts/maps/OldaleTown_PokemonCenter_2F.inc" - .include "data/scripts/maps/OldaleTown_Mart.inc" - .include "data/scripts/maps/DewfordTown_House1.inc" - .include "data/scripts/maps/DewfordTown_PokemonCenter_1F.inc" - .include "data/scripts/maps/DewfordTown_PokemonCenter_2F.inc" - .include "data/scripts/maps/DewfordTown_Gym.inc" - .include "data/scripts/maps/DewfordTown_Hall.inc" - .include "data/scripts/maps/DewfordTown_House2.inc" - .include "data/scripts/maps/LavaridgeTown_HerbShop.inc" - .include "data/scripts/maps/LavaridgeTown_Gym_1F.inc" - .include "data/scripts/maps/LavaridgeTown_Gym_B1F.inc" - .include "data/scripts/maps/LavaridgeTown_House.inc" - .include "data/scripts/maps/LavaridgeTown_Mart.inc" - .include "data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc" - .include "data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc" - .include "data/scripts/maps/FallarborTown_Mart.inc" - .include "data/scripts/maps/FallarborTown_BattleTentLobby.inc" - .include "data/scripts/maps/FallarborTown_BattleTentCorridor.inc" - .include "data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc" - .include "data/scripts/maps/FallarborTown_PokemonCenter_1F.inc" - .include "data/scripts/maps/FallarborTown_PokemonCenter_2F.inc" - .include "data/scripts/maps/FallarborTown_House1.inc" - .include "data/scripts/maps/FallarborTown_House2.inc" - .include "data/scripts/maps/VerdanturfTown_BattleTentLobby.inc" - .include "data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc" - .include "data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc" - .include "data/scripts/maps/VerdanturfTown_Mart.inc" - .include "data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc" - .include "data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc" - .include "data/scripts/maps/VerdanturfTown_WandasHouse.inc" - .include "data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc" - .include "data/scripts/maps/VerdanturfTown_House.inc" - .include "data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc" - .include "data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc" - .include "data/scripts/maps/PacifidlogTown_House1.inc" - .include "data/scripts/maps/PacifidlogTown_House2.inc" - .include "data/scripts/maps/PacifidlogTown_House3.inc" - .include "data/scripts/maps/PacifidlogTown_House4.inc" - .include "data/scripts/maps/PacifidlogTown_House5.inc" - .include "data/scripts/maps/PetalburgCity_WallysHouse.inc" - .include "data/scripts/maps/PetalburgCity_Gym.inc" - .include "data/scripts/maps/PetalburgCity_House1.inc" - .include "data/scripts/maps/PetalburgCity_House2.inc" - .include "data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc" - .include "data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc" - .include "data/scripts/maps/PetalburgCity_Mart.inc" - .include "data/scripts/maps/SlateportCity_SternsShipyard_1F.inc" - .include "data/scripts/maps/SlateportCity_SternsShipyard_2F.inc" - .include "data/scripts/maps/SlateportCity_BattleTentLobby.inc" - .include "data/scripts/maps/SlateportCity_BattleTentCorridor.inc" - .include "data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc" - .include "data/scripts/maps/SlateportCity_House1.inc" - .include "data/scripts/maps/SlateportCity_PokemonFanClub.inc" - .include "data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc" - .include "data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc" - .include "data/scripts/maps/SlateportCity_Harbor.inc" - .include "data/scripts/maps/SlateportCity_House2.inc" - .include "data/scripts/maps/SlateportCity_PokemonCenter_1F.inc" - .include "data/scripts/maps/SlateportCity_PokemonCenter_2F.inc" - .include "data/scripts/maps/SlateportCity_Mart.inc" - .include "data/scripts/maps/MauvilleCity_Gym.inc" - .include "data/scripts/maps/MauvilleCity_BikeShop.inc" - .include "data/scripts/maps/MauvilleCity_House1.inc" - .include "data/scripts/maps/MauvilleCity_GameCorner.inc" - .include "data/scripts/maps/MauvilleCity_House2.inc" - .include "data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc" - .include "data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc" - .include "data/scripts/maps/MauvilleCity_Mart.inc" - .include "data/scripts/maps/RustboroCity_DevonCorp_1F.inc" - .include "data/scripts/maps/RustboroCity_DevonCorp_2F.inc" - .include "data/scripts/maps/RustboroCity_DevonCorp_3F.inc" - .include "data/scripts/maps/RustboroCity_Gym.inc" - .include "data/scripts/maps/RustboroCity_PokemonSchool.inc" - .include "data/scripts/maps/RustboroCity_PokemonCenter_1F.inc" - .include "data/scripts/maps/RustboroCity_PokemonCenter_2F.inc" - .include "data/scripts/maps/RustboroCity_Mart.inc" - .include "data/scripts/maps/RustboroCity_Flat1_1F.inc" - .include "data/scripts/maps/RustboroCity_Flat1_2F.inc" - .include "data/scripts/maps/RustboroCity_House1.inc" - .include "data/scripts/maps/RustboroCity_CuttersHouse.inc" - .include "data/scripts/maps/RustboroCity_House2.inc" - .include "data/scripts/maps/RustboroCity_Flat2_1F.inc" - .include "data/scripts/maps/RustboroCity_Flat2_2F.inc" - .include "data/scripts/maps/RustboroCity_Flat2_3F.inc" - .include "data/scripts/maps/RustboroCity_House3.inc" - .include "data/scripts/maps/FortreeCity_House1.inc" - .include "data/scripts/maps/FortreeCity_Gym.inc" - .include "data/scripts/maps/FortreeCity_PokemonCenter_1F.inc" - .include "data/scripts/maps/FortreeCity_PokemonCenter_2F.inc" - .include "data/scripts/maps/FortreeCity_Mart.inc" - .include "data/scripts/maps/FortreeCity_House2.inc" - .include "data/scripts/maps/FortreeCity_House3.inc" - .include "data/scripts/maps/FortreeCity_House4.inc" - .include "data/scripts/maps/FortreeCity_House5.inc" - .include "data/scripts/maps/FortreeCity_DecorationShop.inc" - .include "data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc" - .include "data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc" - .include "data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc" - .include "data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc" - .include "data/scripts/maps/LilycoveCity_ContestLobby.inc" - .include "data/scripts/maps/LilycoveCity_ContestHall.inc" - .include "data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc" - .include "data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc" - .include "data/scripts/maps/LilycoveCity_UnusedMart.inc" - .include "data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc" - .include "data/scripts/maps/LilycoveCity_Harbor.inc" - .include "data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc" - .include "data/scripts/maps/LilycoveCity_House1.inc" - .include "data/scripts/maps/LilycoveCity_House2.inc" - .include "data/scripts/maps/LilycoveCity_House3.inc" - .include "data/scripts/maps/LilycoveCity_House4.inc" - .include "data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc" - .include "data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc" - .include "data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc" - .include "data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc" - .include "data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc" - .include "data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc" - .include "data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc" - .include "data/scripts/maps/MossdeepCity_Gym.inc" - .include "data/scripts/maps/MossdeepCity_House1.inc" - .include "data/scripts/maps/MossdeepCity_House2.inc" - .include "data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc" - .include "data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc" - .include "data/scripts/maps/MossdeepCity_Mart.inc" - .include "data/scripts/maps/MossdeepCity_House3.inc" - .include "data/scripts/maps/MossdeepCity_StevensHouse.inc" - .include "data/scripts/maps/MossdeepCity_House4.inc" - .include "data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc" - .include "data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc" - .include "data/scripts/maps/MossdeepCity_GameCorner_1F.inc" - .include "data/scripts/maps/MossdeepCity_GameCorner_B1F.inc" - .include "data/scripts/maps/SootopolisCity_Gym_1F.inc" - .include "data/scripts/maps/SootopolisCity_Gym_B1F.inc" - .include "data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc" - .include "data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc" - .include "data/scripts/maps/SootopolisCity_Mart.inc" - .include "data/scripts/maps/SootopolisCity_House1.inc" - .include "data/scripts/maps/SootopolisCity_House2.inc" - .include "data/scripts/maps/SootopolisCity_House3.inc" - .include "data/scripts/maps/SootopolisCity_House4.inc" - .include "data/scripts/maps/SootopolisCity_House5.inc" - .include "data/scripts/maps/SootopolisCity_House6.inc" - .include "data/scripts/maps/SootopolisCity_House7.inc" - .include "data/scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc" - .include "data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc" - .include "data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc" - .include "data/scripts/maps/EverGrandeCity_SidneysRoom.inc" - .include "data/scripts/maps/EverGrandeCity_PhoebesRoom.inc" - .include "data/scripts/maps/EverGrandeCity_GlaciasRoom.inc" - .include "data/scripts/maps/EverGrandeCity_DrakesRoom.inc" - .include "data/scripts/maps/EverGrandeCity_ChampionsRoom.inc" - .include "data/scripts/maps/EverGrandeCity_Hall1.inc" - .include "data/scripts/maps/EverGrandeCity_Hall2.inc" - .include "data/scripts/maps/EverGrandeCity_Hall3.inc" - .include "data/scripts/maps/EverGrandeCity_Hall4.inc" - .include "data/scripts/maps/EverGrandeCity_Hall5.inc" - .include "data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc" - .include "data/scripts/maps/EverGrandeCity_HallOfFame.inc" - .include "data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc" - .include "data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc" - .include "data/scripts/maps/EverGrandeCity_PokemonLeague_2F.inc" - .include "data/scripts/maps/Route104_MrBrineysHouse.inc" - .include "data/scripts/maps/Route104_PrettyPetalFlowerShop.inc" - .include "data/scripts/maps/Route111_WinstrateFamilysHouse.inc" - .include "data/scripts/maps/Route111_OldLadysRestStop.inc" - .include "data/scripts/maps/Route112_CableCarStation.inc" - .include "data/scripts/maps/MtChimney_CableCarStation.inc" - .include "data/scripts/maps/Route114_FossilManiacsHouse.inc" - .include "data/scripts/maps/Route114_FossilManiacsTunnel.inc" - .include "data/scripts/maps/Route114_LanettesHouse.inc" - .include "data/scripts/maps/Route116_TunnelersRestHouse.inc" - .include "data/scripts/maps/Route117_PokemonDayCare.inc" - .include "data/scripts/maps/Route121_SafariZoneEntrance.inc" - .include "data/scripts/maps/MeteorFalls_1F_1R.inc" - .include "data/scripts/maps/MeteorFalls_1F_2R.inc" - .include "data/scripts/maps/MeteorFalls_B1F_1R.inc" - .include "data/scripts/maps/MeteorFalls_B1F_2R.inc" - .include "data/scripts/maps/RusturfTunnel.inc" - .include "data/scripts/maps/Underwater_SootopolisCity.inc" - .include "data/scripts/maps/DesertRuins.inc" - .include "data/scripts/maps/GraniteCave_1F.inc" - .include "data/scripts/maps/GraniteCave_B1F.inc" - .include "data/scripts/maps/GraniteCave_B2F.inc" - .include "data/scripts/maps/GraniteCave_StevensRoom.inc" - .include "data/scripts/maps/PetalburgWoods.inc" - .include "data/scripts/maps/MtChimney.inc" - .include "data/scripts/maps/JaggedPass.inc" - .include "data/scripts/maps/FieryPath.inc" - .include "data/scripts/maps/MtPyre_1F.inc" - .include "data/scripts/maps/MtPyre_2F.inc" - .include "data/scripts/maps/MtPyre_3F.inc" - .include "data/scripts/maps/MtPyre_4F.inc" - .include "data/scripts/maps/MtPyre_5F.inc" - .include "data/scripts/maps/MtPyre_6F.inc" - .include "data/scripts/maps/MtPyre_Exterior.inc" - .include "data/scripts/maps/MtPyre_Summit.inc" - .include "data/scripts/maps/AquaHideout_1F.inc" - .include "data/scripts/maps/AquaHideout_B1F.inc" - .include "data/scripts/maps/AquaHideout_B2F.inc" - .include "data/scripts/maps/Underwater_SeafloorCavern.inc" - .include "data/scripts/maps/SeafloorCavern_Entrance.inc" - .include "data/scripts/maps/SeafloorCavern_Room1.inc" - .include "data/scripts/maps/SeafloorCavern_Room2.inc" - .include "data/scripts/maps/SeafloorCavern_Room3.inc" - .include "data/scripts/maps/SeafloorCavern_Room4.inc" - .include "data/scripts/maps/SeafloorCavern_Room5.inc" - .include "data/scripts/maps/SeafloorCavern_Room6.inc" - .include "data/scripts/maps/SeafloorCavern_Room7.inc" - .include "data/scripts/maps/SeafloorCavern_Room8.inc" - .include "data/scripts/maps/SeafloorCavern_Room9.inc" - .include "data/scripts/maps/CaveOfOrigin_Entrance.inc" - .include "data/scripts/maps/CaveOfOrigin_1F.inc" - .include "data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap1.inc" - .include "data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap2.inc" - .include "data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap3.inc" - .include "data/scripts/maps/CaveOfOrigin_B1F.inc" - .include "data/scripts/maps/VictoryRoad_1F.inc" - .include "data/scripts/maps/VictoryRoad_B1F.inc" - .include "data/scripts/maps/VictoryRoad_B2F.inc" - .include "data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc" - .include "data/scripts/maps/ShoalCave_LowTideInnerRoom.inc" - .include "data/scripts/maps/ShoalCave_LowTideStairsRoom.inc" - .include "data/scripts/maps/ShoalCave_LowTideLowerRoom.inc" - .include "data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc" - .include "data/scripts/maps/ShoalCave_HighTideInnerRoom.inc" - .include "data/scripts/maps/NewMauville_Entrance.inc" - .include "data/scripts/maps/NewMauville_Inside.inc" - .include "data/scripts/maps/AbandonedShip_Deck.inc" - .include "data/scripts/maps/AbandonedShip_Corridors_1F.inc" - .include "data/scripts/maps/AbandonedShip_Rooms_1F.inc" - .include "data/scripts/maps/AbandonedShip_Corridors_B1F.inc" - .include "data/scripts/maps/AbandonedShip_Rooms_B1F.inc" - .include "data/scripts/maps/AbandonedShip_Rooms2_B1F.inc" - .include "data/scripts/maps/AbandonedShip_Underwater1.inc" - .include "data/scripts/maps/AbandonedShip_Room_B1F.inc" - .include "data/scripts/maps/AbandonedShip_Rooms2_1F.inc" - .include "data/scripts/maps/AbandonedShip_CaptainsOffice.inc" - .include "data/scripts/maps/AbandonedShip_Underwater2.inc" - .include "data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc" - .include "data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc" - .include "data/scripts/maps/IslandCave.inc" - .include "data/scripts/maps/AncientTomb.inc" - .include "data/scripts/maps/Underwater_Route134.inc" - .include "data/scripts/maps/Underwater_SealedChamber.inc" - .include "data/scripts/maps/SealedChamber_OuterRoom.inc" - .include "data/scripts/maps/SealedChamber_InnerRoom.inc" - .include "data/scripts/maps/ScorchedSlab.inc" - .include "data/scripts/maps/AquaHideout_UnusedRubyMap1.inc" - .include "data/scripts/maps/AquaHideout_UnusedRubyMap2.inc" - .include "data/scripts/maps/AquaHideout_UnusedRubyMap3.inc" - .include "data/scripts/maps/SkyPillar_Entrance.inc" - .include "data/scripts/maps/SkyPillar_Outside.inc" - .include "data/scripts/maps/SkyPillar_1F.inc" - .include "data/scripts/maps/SkyPillar_2F.inc" - .include "data/scripts/maps/SkyPillar_3F.inc" - .include "data/scripts/maps/SkyPillar_4F.inc" - .include "data/scripts/maps/ShoalCave_LowTideIceRoom.inc" - .include "data/scripts/maps/SkyPillar_5F.inc" - .include "data/scripts/maps/SkyPillar_Top.inc" - .include "data/scripts/maps/MagmaHideout_1F.inc" - .include "data/scripts/maps/MagmaHideout_2F_1R.inc" - .include "data/scripts/maps/MagmaHideout_2F_2R.inc" - .include "data/scripts/maps/MagmaHideout_3F_1R.inc" - .include "data/scripts/maps/MagmaHideout_3F_2R.inc" - .include "data/scripts/maps/MagmaHideout_4F.inc" - .include "data/scripts/maps/MagmaHideout_3F_3R.inc" - .include "data/scripts/maps/MagmaHideout_2F_3R.inc" - .include "data/scripts/maps/MirageTower_1F.inc" - .include "data/scripts/maps/MirageTower_2F.inc" - .include "data/scripts/maps/MirageTower_3F.inc" - .include "data/scripts/maps/MirageTower_4F.inc" - .include "data/scripts/maps/DesertUnderpass.inc" - .include "data/scripts/maps/ArtisanCave_B1F.inc" - .include "data/scripts/maps/ArtisanCave_1F.inc" - .include "data/scripts/maps/Underwater_MarineCave.inc" - .include "data/scripts/maps/MarineCave_Entrance.inc" - .include "data/scripts/maps/MarineCave_End.inc" - .include "data/scripts/maps/TerraCave_Entrance.inc" - .include "data/scripts/maps/TerraCave_End.inc" - .include "data/scripts/maps/AlteringCave.inc" - .include "data/scripts/maps/MeteorFalls_StevensCave.inc" - .include "data/scripts/maps/SecretBase_BlueCave1.inc" - .include "data/scripts/maps/SecretBase_BlueCave2.inc" - .include "data/scripts/maps/SecretBase_BlueCave3.inc" - .include "data/scripts/maps/SecretBase_BlueCave4.inc" - .include "data/scripts/maps/SecretBase_BrownCave1.inc" - .include "data/scripts/maps/SecretBase_BrownCave2.inc" - .include "data/scripts/maps/SecretBase_BrownCave3.inc" - .include "data/scripts/maps/SecretBase_BrownCave4.inc" - .include "data/scripts/maps/SecretBase_RedCave1.inc" - .include "data/scripts/maps/SecretBase_RedCave2.inc" - .include "data/scripts/maps/SecretBase_RedCave3.inc" - .include "data/scripts/maps/SecretBase_RedCave4.inc" - .include "data/scripts/maps/SecretBase_Shrub1.inc" - .include "data/scripts/maps/SecretBase_Shrub2.inc" - .include "data/scripts/maps/SecretBase_Shrub3.inc" - .include "data/scripts/maps/SecretBase_Shrub4.inc" - .include "data/scripts/maps/SecretBase_Tree1.inc" - .include "data/scripts/maps/SecretBase_Tree2.inc" - .include "data/scripts/maps/SecretBase_Tree3.inc" - .include "data/scripts/maps/SecretBase_Tree4.inc" - .include "data/scripts/maps/SecretBase_YellowCave1.inc" - .include "data/scripts/maps/SecretBase_YellowCave2.inc" - .include "data/scripts/maps/SecretBase_YellowCave3.inc" - .include "data/scripts/maps/SecretBase_YellowCave4.inc" + .include "data/maps/PetalburgCity/scripts.inc" + .include "data/maps/SlateportCity/scripts.inc" + .include "data/maps/MauvilleCity/scripts.inc" + .include "data/maps/RustboroCity/scripts.inc" + .include "data/maps/FortreeCity/scripts.inc" + .include "data/maps/LilycoveCity/scripts.inc" + .include "data/maps/MossdeepCity/scripts.inc" + .include "data/maps/SootopolisCity/scripts.inc" + .include "data/maps/EverGrandeCity/scripts.inc" + .include "data/maps/LittlerootTown/scripts.inc" + .include "data/maps/OldaleTown/scripts.inc" + .include "data/maps/DewfordTown/scripts.inc" + .include "data/maps/LavaridgeTown/scripts.inc" + .include "data/maps/FallarborTown/scripts.inc" + .include "data/maps/VerdanturfTown/scripts.inc" + .include "data/maps/PacifidlogTown/scripts.inc" + .include "data/maps/Route101/scripts.inc" + .include "data/maps/Route102/scripts.inc" + .include "data/maps/Route103/scripts.inc" + .include "data/maps/Route104/scripts.inc" + .include "data/maps/Route105/scripts.inc" + .include "data/maps/Route106/scripts.inc" + .include "data/maps/Route107/scripts.inc" + .include "data/maps/Route108/scripts.inc" + .include "data/maps/Route109/scripts.inc" + .include "data/maps/Route110/scripts.inc" + .include "data/maps/Route111/scripts.inc" + .include "data/maps/Route112/scripts.inc" + .include "data/maps/Route113/scripts.inc" + .include "data/maps/Route114/scripts.inc" + .include "data/maps/Route115/scripts.inc" + .include "data/maps/Route116/scripts.inc" + .include "data/maps/Route117/scripts.inc" + .include "data/maps/Route118/scripts.inc" + .include "data/maps/Route119/scripts.inc" + .include "data/maps/Route120/scripts.inc" + .include "data/maps/Route121/scripts.inc" + .include "data/maps/Route122/scripts.inc" + .include "data/maps/Route123/scripts.inc" + .include "data/maps/Route124/scripts.inc" + .include "data/maps/Route125/scripts.inc" + .include "data/maps/Route126/scripts.inc" + .include "data/maps/Route127/scripts.inc" + .include "data/maps/Route128/scripts.inc" + .include "data/maps/Route129/scripts.inc" + .include "data/maps/Route130/scripts.inc" + .include "data/maps/Route131/scripts.inc" + .include "data/maps/Route132/scripts.inc" + .include "data/maps/Route133/scripts.inc" + .include "data/maps/Route134/scripts.inc" + .include "data/maps/Underwater1/scripts.inc" + .include "data/maps/Underwater2/scripts.inc" + .include "data/maps/Underwater3/scripts.inc" + .include "data/maps/Underwater4/scripts.inc" + .include "data/maps/Underwater5/scripts.inc" + .include "data/maps/Underwater6/scripts.inc" + .include "data/maps/Underwater7/scripts.inc" + .include "data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc" + .include "data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc" + .include "data/maps/LittlerootTown_MaysHouse_1F/scripts.inc" + .include "data/maps/LittlerootTown_MaysHouse_2F/scripts.inc" + .include "data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc" + .include "data/maps/OldaleTown_House1/scripts.inc" + .include "data/maps/OldaleTown_House2/scripts.inc" + .include "data/maps/OldaleTown_PokemonCenter_1F/scripts.inc" + .include "data/maps/OldaleTown_PokemonCenter_2F/scripts.inc" + .include "data/maps/OldaleTown_Mart/scripts.inc" + .include "data/maps/DewfordTown_House1/scripts.inc" + .include "data/maps/DewfordTown_PokemonCenter_1F/scripts.inc" + .include "data/maps/DewfordTown_PokemonCenter_2F/scripts.inc" + .include "data/maps/DewfordTown_Gym/scripts.inc" + .include "data/maps/DewfordTown_Hall/scripts.inc" + .include "data/maps/DewfordTown_House2/scripts.inc" + .include "data/maps/LavaridgeTown_HerbShop/scripts.inc" + .include "data/maps/LavaridgeTown_Gym_1F/scripts.inc" + .include "data/maps/LavaridgeTown_Gym_B1F/scripts.inc" + .include "data/maps/LavaridgeTown_House/scripts.inc" + .include "data/maps/LavaridgeTown_Mart/scripts.inc" + .include "data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc" + .include "data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc" + .include "data/maps/FallarborTown_Mart/scripts.inc" + .include "data/maps/FallarborTown_BattleTentLobby/scripts.inc" + .include "data/maps/FallarborTown_BattleTentCorridor/scripts.inc" + .include "data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc" + .include "data/maps/FallarborTown_PokemonCenter_1F/scripts.inc" + .include "data/maps/FallarborTown_PokemonCenter_2F/scripts.inc" + .include "data/maps/FallarborTown_House1/scripts.inc" + .include "data/maps/FallarborTown_House2/scripts.inc" + .include "data/maps/VerdanturfTown_BattleTentLobby/scripts.inc" + .include "data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc" + .include "data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc" + .include "data/maps/VerdanturfTown_Mart/scripts.inc" + .include "data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc" + .include "data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc" + .include "data/maps/VerdanturfTown_WandasHouse/scripts.inc" + .include "data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc" + .include "data/maps/VerdanturfTown_House/scripts.inc" + .include "data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc" + .include "data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc" + .include "data/maps/PacifidlogTown_House1/scripts.inc" + .include "data/maps/PacifidlogTown_House2/scripts.inc" + .include "data/maps/PacifidlogTown_House3/scripts.inc" + .include "data/maps/PacifidlogTown_House4/scripts.inc" + .include "data/maps/PacifidlogTown_House5/scripts.inc" + .include "data/maps/PetalburgCity_WallysHouse/scripts.inc" + .include "data/maps/PetalburgCity_Gym/scripts.inc" + .include "data/maps/PetalburgCity_House1/scripts.inc" + .include "data/maps/PetalburgCity_House2/scripts.inc" + .include "data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/PetalburgCity_Mart/scripts.inc" + .include "data/maps/SlateportCity_SternsShipyard_1F/scripts.inc" + .include "data/maps/SlateportCity_SternsShipyard_2F/scripts.inc" + .include "data/maps/SlateportCity_BattleTentLobby/scripts.inc" + .include "data/maps/SlateportCity_BattleTentCorridor/scripts.inc" + .include "data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc" + .include "data/maps/SlateportCity_House1/scripts.inc" + .include "data/maps/SlateportCity_PokemonFanClub/scripts.inc" + .include "data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc" + .include "data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc" + .include "data/maps/SlateportCity_Harbor/scripts.inc" + .include "data/maps/SlateportCity_House2/scripts.inc" + .include "data/maps/SlateportCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/SlateportCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/SlateportCity_Mart/scripts.inc" + .include "data/maps/MauvilleCity_Gym/scripts.inc" + .include "data/maps/MauvilleCity_BikeShop/scripts.inc" + .include "data/maps/MauvilleCity_House1/scripts.inc" + .include "data/maps/MauvilleCity_GameCorner/scripts.inc" + .include "data/maps/MauvilleCity_House2/scripts.inc" + .include "data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/MauvilleCity_Mart/scripts.inc" + .include "data/maps/RustboroCity_DevonCorp_1F/scripts.inc" + .include "data/maps/RustboroCity_DevonCorp_2F/scripts.inc" + .include "data/maps/RustboroCity_DevonCorp_3F/scripts.inc" + .include "data/maps/RustboroCity_Gym/scripts.inc" + .include "data/maps/RustboroCity_PokemonSchool/scripts.inc" + .include "data/maps/RustboroCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/RustboroCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/RustboroCity_Mart/scripts.inc" + .include "data/maps/RustboroCity_Flat1_1F/scripts.inc" + .include "data/maps/RustboroCity_Flat1_2F/scripts.inc" + .include "data/maps/RustboroCity_House1/scripts.inc" + .include "data/maps/RustboroCity_CuttersHouse/scripts.inc" + .include "data/maps/RustboroCity_House2/scripts.inc" + .include "data/maps/RustboroCity_Flat2_1F/scripts.inc" + .include "data/maps/RustboroCity_Flat2_2F/scripts.inc" + .include "data/maps/RustboroCity_Flat2_3F/scripts.inc" + .include "data/maps/RustboroCity_House3/scripts.inc" + .include "data/maps/FortreeCity_House1/scripts.inc" + .include "data/maps/FortreeCity_Gym/scripts.inc" + .include "data/maps/FortreeCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/FortreeCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/FortreeCity_Mart/scripts.inc" + .include "data/maps/FortreeCity_House2/scripts.inc" + .include "data/maps/FortreeCity_House3/scripts.inc" + .include "data/maps/FortreeCity_House4/scripts.inc" + .include "data/maps/FortreeCity_House5/scripts.inc" + .include "data/maps/FortreeCity_DecorationShop/scripts.inc" + .include "data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc" + .include "data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc" + .include "data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc" + .include "data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc" + .include "data/maps/LilycoveCity_ContestLobby/scripts.inc" + .include "data/maps/LilycoveCity_ContestHall/scripts.inc" + .include "data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/LilycoveCity_UnusedMart/scripts.inc" + .include "data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc" + .include "data/maps/LilycoveCity_Harbor/scripts.inc" + .include "data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc" + .include "data/maps/LilycoveCity_House1/scripts.inc" + .include "data/maps/LilycoveCity_House2/scripts.inc" + .include "data/maps/LilycoveCity_House3/scripts.inc" + .include "data/maps/LilycoveCity_House4/scripts.inc" + .include "data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc" + .include "data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc" + .include "data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc" + .include "data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc" + .include "data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc" + .include "data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc" + .include "data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc" + .include "data/maps/MossdeepCity_Gym/scripts.inc" + .include "data/maps/MossdeepCity_House1/scripts.inc" + .include "data/maps/MossdeepCity_House2/scripts.inc" + .include "data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/MossdeepCity_Mart/scripts.inc" + .include "data/maps/MossdeepCity_House3/scripts.inc" + .include "data/maps/MossdeepCity_StevensHouse/scripts.inc" + .include "data/maps/MossdeepCity_House4/scripts.inc" + .include "data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc" + .include "data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc" + .include "data/maps/MossdeepCity_GameCorner_1F/scripts.inc" + .include "data/maps/MossdeepCity_GameCorner_B1F/scripts.inc" + .include "data/maps/SootopolisCity_Gym_1F/scripts.inc" + .include "data/maps/SootopolisCity_Gym_B1F/scripts.inc" + .include "data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/SootopolisCity_Mart/scripts.inc" + .include "data/maps/SootopolisCity_House1/scripts.inc" + .include "data/maps/SootopolisCity_House2/scripts.inc" + .include "data/maps/SootopolisCity_House3/scripts.inc" + .include "data/maps/SootopolisCity_House4/scripts.inc" + .include "data/maps/SootopolisCity_House5/scripts.inc" + .include "data/maps/SootopolisCity_House6/scripts.inc" + .include "data/maps/SootopolisCity_House7/scripts.inc" + .include "data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc" + .include "data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc" + .include "data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc" + .include "data/maps/EverGrandeCity_SidneysRoom/scripts.inc" + .include "data/maps/EverGrandeCity_PhoebesRoom/scripts.inc" + .include "data/maps/EverGrandeCity_GlaciasRoom/scripts.inc" + .include "data/maps/EverGrandeCity_DrakesRoom/scripts.inc" + .include "data/maps/EverGrandeCity_ChampionsRoom/scripts.inc" + .include "data/maps/EverGrandeCity_Hall1/scripts.inc" + .include "data/maps/EverGrandeCity_Hall2/scripts.inc" + .include "data/maps/EverGrandeCity_Hall3/scripts.inc" + .include "data/maps/EverGrandeCity_Hall4/scripts.inc" + .include "data/maps/EverGrandeCity_Hall5/scripts.inc" + .include "data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc" + .include "data/maps/EverGrandeCity_HallOfFame/scripts.inc" + .include "data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc" + .include "data/maps/Route104_MrBrineysHouse/scripts.inc" + .include "data/maps/Route104_PrettyPetalFlowerShop/scripts.inc" + .include "data/maps/Route111_WinstrateFamilysHouse/scripts.inc" + .include "data/maps/Route111_OldLadysRestStop/scripts.inc" + .include "data/maps/Route112_CableCarStation/scripts.inc" + .include "data/maps/MtChimney_CableCarStation/scripts.inc" + .include "data/maps/Route114_FossilManiacsHouse/scripts.inc" + .include "data/maps/Route114_FossilManiacsTunnel/scripts.inc" + .include "data/maps/Route114_LanettesHouse/scripts.inc" + .include "data/maps/Route116_TunnelersRestHouse/scripts.inc" + .include "data/maps/Route117_PokemonDayCare/scripts.inc" + .include "data/maps/Route121_SafariZoneEntrance/scripts.inc" + .include "data/maps/MeteorFalls_1F_1R/scripts.inc" + .include "data/maps/MeteorFalls_1F_2R/scripts.inc" + .include "data/maps/MeteorFalls_B1F_1R/scripts.inc" + .include "data/maps/MeteorFalls_B1F_2R/scripts.inc" + .include "data/maps/RusturfTunnel/scripts.inc" + .include "data/maps/Underwater_SootopolisCity/scripts.inc" + .include "data/maps/DesertRuins/scripts.inc" + .include "data/maps/GraniteCave_1F/scripts.inc" + .include "data/maps/GraniteCave_B1F/scripts.inc" + .include "data/maps/GraniteCave_B2F/scripts.inc" + .include "data/maps/GraniteCave_StevensRoom/scripts.inc" + .include "data/maps/PetalburgWoods/scripts.inc" + .include "data/maps/MtChimney/scripts.inc" + .include "data/maps/JaggedPass/scripts.inc" + .include "data/maps/FieryPath/scripts.inc" + .include "data/maps/MtPyre_1F/scripts.inc" + .include "data/maps/MtPyre_2F/scripts.inc" + .include "data/maps/MtPyre_3F/scripts.inc" + .include "data/maps/MtPyre_4F/scripts.inc" + .include "data/maps/MtPyre_5F/scripts.inc" + .include "data/maps/MtPyre_6F/scripts.inc" + .include "data/maps/MtPyre_Exterior/scripts.inc" + .include "data/maps/MtPyre_Summit/scripts.inc" + .include "data/maps/AquaHideout_1F/scripts.inc" + .include "data/maps/AquaHideout_B1F/scripts.inc" + .include "data/maps/AquaHideout_B2F/scripts.inc" + .include "data/maps/Underwater_SeafloorCavern/scripts.inc" + .include "data/maps/SeafloorCavern_Entrance/scripts.inc" + .include "data/maps/SeafloorCavern_Room1/scripts.inc" + .include "data/maps/SeafloorCavern_Room2/scripts.inc" + .include "data/maps/SeafloorCavern_Room3/scripts.inc" + .include "data/maps/SeafloorCavern_Room4/scripts.inc" + .include "data/maps/SeafloorCavern_Room5/scripts.inc" + .include "data/maps/SeafloorCavern_Room6/scripts.inc" + .include "data/maps/SeafloorCavern_Room7/scripts.inc" + .include "data/maps/SeafloorCavern_Room8/scripts.inc" + .include "data/maps/SeafloorCavern_Room9/scripts.inc" + .include "data/maps/CaveOfOrigin_Entrance/scripts.inc" + .include "data/maps/CaveOfOrigin_1F/scripts.inc" + .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc" + .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc" + .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc" + .include "data/maps/CaveOfOrigin_B1F/scripts.inc" + .include "data/maps/VictoryRoad_1F/scripts.inc" + .include "data/maps/VictoryRoad_B1F/scripts.inc" + .include "data/maps/VictoryRoad_B2F/scripts.inc" + .include "data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc" + .include "data/maps/ShoalCave_LowTideInnerRoom/scripts.inc" + .include "data/maps/ShoalCave_LowTideStairsRoom/scripts.inc" + .include "data/maps/ShoalCave_LowTideLowerRoom/scripts.inc" + .include "data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc" + .include "data/maps/ShoalCave_HighTideInnerRoom/scripts.inc" + .include "data/maps/NewMauville_Entrance/scripts.inc" + .include "data/maps/NewMauville_Inside/scripts.inc" + .include "data/maps/AbandonedShip_Deck/scripts.inc" + .include "data/maps/AbandonedShip_Corridors_1F/scripts.inc" + .include "data/maps/AbandonedShip_Rooms_1F/scripts.inc" + .include "data/maps/AbandonedShip_Corridors_B1F/scripts.inc" + .include "data/maps/AbandonedShip_Rooms_B1F/scripts.inc" + .include "data/maps/AbandonedShip_Rooms2_B1F/scripts.inc" + .include "data/maps/AbandonedShip_Underwater1/scripts.inc" + .include "data/maps/AbandonedShip_Room_B1F/scripts.inc" + .include "data/maps/AbandonedShip_Rooms2_1F/scripts.inc" + .include "data/maps/AbandonedShip_CaptainsOffice/scripts.inc" + .include "data/maps/AbandonedShip_Underwater2/scripts.inc" + .include "data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc" + .include "data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc" + .include "data/maps/IslandCave/scripts.inc" + .include "data/maps/AncientTomb/scripts.inc" + .include "data/maps/Underwater_Route134/scripts.inc" + .include "data/maps/Underwater_SealedChamber/scripts.inc" + .include "data/maps/SealedChamber_OuterRoom/scripts.inc" + .include "data/maps/SealedChamber_InnerRoom/scripts.inc" + .include "data/maps/ScorchedSlab/scripts.inc" + .include "data/maps/AquaHideout_UnusedRubyMap1/scripts.inc" + .include "data/maps/AquaHideout_UnusedRubyMap2/scripts.inc" + .include "data/maps/AquaHideout_UnusedRubyMap3/scripts.inc" + .include "data/maps/SkyPillar_Entrance/scripts.inc" + .include "data/maps/SkyPillar_Outside/scripts.inc" + .include "data/maps/SkyPillar_1F/scripts.inc" + .include "data/maps/SkyPillar_2F/scripts.inc" + .include "data/maps/SkyPillar_3F/scripts.inc" + .include "data/maps/SkyPillar_4F/scripts.inc" + .include "data/maps/ShoalCave_LowTideIceRoom/scripts.inc" + .include "data/maps/SkyPillar_5F/scripts.inc" + .include "data/maps/SkyPillar_Top/scripts.inc" + .include "data/maps/MagmaHideout_1F/scripts.inc" + .include "data/maps/MagmaHideout_2F_1R/scripts.inc" + .include "data/maps/MagmaHideout_2F_2R/scripts.inc" + .include "data/maps/MagmaHideout_3F_1R/scripts.inc" + .include "data/maps/MagmaHideout_3F_2R/scripts.inc" + .include "data/maps/MagmaHideout_4F/scripts.inc" + .include "data/maps/MagmaHideout_3F_3R/scripts.inc" + .include "data/maps/MagmaHideout_2F_3R/scripts.inc" + .include "data/maps/MirageTower_1F/scripts.inc" + .include "data/maps/MirageTower_2F/scripts.inc" + .include "data/maps/MirageTower_3F/scripts.inc" + .include "data/maps/MirageTower_4F/scripts.inc" + .include "data/maps/DesertUnderpass/scripts.inc" + .include "data/maps/ArtisanCave_B1F/scripts.inc" + .include "data/maps/ArtisanCave_1F/scripts.inc" + .include "data/maps/Underwater_MarineCave/scripts.inc" + .include "data/maps/MarineCave_Entrance/scripts.inc" + .include "data/maps/MarineCave_End/scripts.inc" + .include "data/maps/TerraCave_Entrance/scripts.inc" + .include "data/maps/TerraCave_End/scripts.inc" + .include "data/maps/AlteringCave/scripts.inc" + .include "data/maps/MeteorFalls_StevensCave/scripts.inc" + .include "data/maps/SecretBase_BlueCave1/scripts.inc" + .include "data/maps/SecretBase_BlueCave2/scripts.inc" + .include "data/maps/SecretBase_BlueCave3/scripts.inc" + .include "data/maps/SecretBase_BlueCave4/scripts.inc" + .include "data/maps/SecretBase_BrownCave1/scripts.inc" + .include "data/maps/SecretBase_BrownCave2/scripts.inc" + .include "data/maps/SecretBase_BrownCave3/scripts.inc" + .include "data/maps/SecretBase_BrownCave4/scripts.inc" + .include "data/maps/SecretBase_RedCave1/scripts.inc" + .include "data/maps/SecretBase_RedCave2/scripts.inc" + .include "data/maps/SecretBase_RedCave3/scripts.inc" + .include "data/maps/SecretBase_RedCave4/scripts.inc" + .include "data/maps/SecretBase_Shrub1/scripts.inc" + .include "data/maps/SecretBase_Shrub2/scripts.inc" + .include "data/maps/SecretBase_Shrub3/scripts.inc" + .include "data/maps/SecretBase_Shrub4/scripts.inc" + .include "data/maps/SecretBase_Tree1/scripts.inc" + .include "data/maps/SecretBase_Tree2/scripts.inc" + .include "data/maps/SecretBase_Tree3/scripts.inc" + .include "data/maps/SecretBase_Tree4/scripts.inc" + .include "data/maps/SecretBase_YellowCave1/scripts.inc" + .include "data/maps/SecretBase_YellowCave2/scripts.inc" + .include "data/maps/SecretBase_YellowCave3/scripts.inc" + .include "data/maps/SecretBase_YellowCave4/scripts.inc" gUnknown_0823B4BB:: @ 823B4BB lockall @@ -627,154 +627,154 @@ gText_23B73E:: @ 823B73E SecretBase_RedCave1_Text_23B759: @ 823B759 .string "Want to make your SECRET BASE here?$" - .include "data/scripts/maps/SingleBattleColosseum.inc" - .include "data/scripts/maps/TradeCenter.inc" - .include "data/scripts/maps/RecordCorner.inc" - .include "data/scripts/maps/DoubleBattleColosseum.inc" - .include "data/scripts/maps/LinkContestRoom1.inc" - .include "data/scripts/maps/LinkContestRoom2.inc" - .include "data/scripts/maps/LinkContestRoom3.inc" - .include "data/scripts/maps/LinkContestRoom4.inc" - .include "data/scripts/maps/LinkContestRoom5.inc" - .include "data/scripts/maps/LinkContestRoom6.inc" - .include "data/scripts/maps/UnknownMap_25_29.inc" - .include "data/scripts/maps/UnknownMap_25_30.inc" - .include "data/scripts/maps/UnknownMap_25_31.inc" - .include "data/scripts/maps/UnknownMap_25_32.inc" - .include "data/scripts/maps/UnknownMap_25_33.inc" - .include "data/scripts/maps/UnknownMap_25_34.inc" - .include "data/scripts/maps/InsideOfTruck.inc" - .include "data/scripts/maps/SSTidalCorridor.inc" - .include "data/scripts/maps/SSTidalLowerDeck.inc" - .include "data/scripts/maps/SSTidalRooms.inc" - .include "data/scripts/maps/BattlePyramidSquare01.inc" - .include "data/scripts/maps/BattlePyramidSquare02.inc" - .include "data/scripts/maps/BattlePyramidSquare03.inc" - .include "data/scripts/maps/BattlePyramidSquare04.inc" - .include "data/scripts/maps/BattlePyramidSquare05.inc" - .include "data/scripts/maps/BattlePyramidSquare06.inc" - .include "data/scripts/maps/BattlePyramidSquare07.inc" - .include "data/scripts/maps/BattlePyramidSquare08.inc" - .include "data/scripts/maps/BattlePyramidSquare09.inc" - .include "data/scripts/maps/BattlePyramidSquare10.inc" - .include "data/scripts/maps/BattlePyramidSquare11.inc" - .include "data/scripts/maps/BattlePyramidSquare12.inc" - .include "data/scripts/maps/BattlePyramidSquare13.inc" - .include "data/scripts/maps/BattlePyramidSquare14.inc" - .include "data/scripts/maps/BattlePyramidSquare15.inc" - .include "data/scripts/maps/BattlePyramidSquare16.inc" - .include "data/scripts/maps/UnionRoom.inc" - .include "data/scripts/maps/SafariZone_Northwest.inc" - .include "data/scripts/maps/SafariZone_North.inc" - .include "data/scripts/maps/SafariZone_Southwest.inc" - .include "data/scripts/maps/SafariZone_South.inc" - .include "data/scripts/maps/BattleFrontier_OutsideWest.inc" - .include "data/scripts/maps/BattleFrontier_BattleTowerLobby.inc" - .include "data/scripts/maps/BattleFrontier_BattleTowerElevator.inc" - .include "data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc" - .include "data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc" - .include "data/scripts/maps/SouthernIsland_Exterior.inc" - .include "data/scripts/maps/SouthernIsland_Interior.inc" - .include "data/scripts/maps/SafariZone_RestHouse.inc" - .include "data/scripts/maps/SafariZone_Northeast.inc" - .include "data/scripts/maps/SafariZone_Southeast.inc" - .include "data/scripts/maps/BattleFrontier_OutsideEast.inc" - .include "data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc" - .include "data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc" - .include "data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc" - .include "data/scripts/maps/BattleFrontier_BattleDomeLobby.inc" - .include "data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc" - .include "data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc" - .include "data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc" - .include "data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc" - .include "data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc" - .include "data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc" - .include "data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc" - .include "data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc" - .include "data/scripts/maps/BattleFrontier_BattlePyramidTop.inc" - .include "data/scripts/maps/BattleFrontier_BattleArenaLobby.inc" - .include "data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc" - .include "data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc" - .include "data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc" - .include "data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc" - .include "data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc" - .include "data/scripts/maps/BattleFrontier_BattlePikeLobby.inc" - .include "data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc" - .include "data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc" - .include "data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc" - .include "data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc" - .include "data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc" - .include "data/scripts/maps/BattleFrontier_RankingHall.inc" - .include "data/scripts/maps/BattleFrontier_Lounge1.inc" - .include "data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc" - .include "data/scripts/maps/BattleFrontier_Lounge2.inc" - .include "data/scripts/maps/BattleFrontier_Lounge3.inc" - .include "data/scripts/maps/BattleFrontier_Lounge4.inc" - .include "data/scripts/maps/BattleFrontier_ScottsHouse.inc" - .include "data/scripts/maps/BattleFrontier_Lounge5.inc" - .include "data/scripts/maps/BattleFrontier_Lounge6.inc" - .include "data/scripts/maps/BattleFrontier_Lounge7.inc" - .include "data/scripts/maps/BattleFrontier_ReceptionGate.inc" - .include "data/scripts/maps/BattleFrontier_Lounge8.inc" - .include "data/scripts/maps/BattleFrontier_Lounge9.inc" - .include "data/scripts/maps/BattleFrontier_PokemonCenter_1F.inc" - .include "data/scripts/maps/BattleFrontier_PokemonCenter_2F.inc" - .include "data/scripts/maps/BattleFrontier_Mart.inc" - .include "data/scripts/maps/FarawayIsland_Entrance.inc" - .include "data/scripts/maps/FarawayIsland_Interior.inc" - .include "data/scripts/maps/BirthIsland_Exterior.inc" - .include "data/scripts/maps/BirthIsland_Harbor.inc" - .include "data/scripts/maps/TrainerHill_Entrance.inc" - .include "data/scripts/maps/TrainerHill_1F.inc" - .include "data/scripts/maps/TrainerHill_2F.inc" - .include "data/scripts/maps/TrainerHill_3F.inc" - .include "data/scripts/maps/TrainerHill_4F.inc" - .include "data/scripts/maps/TrainerHill_Roof.inc" - .include "data/scripts/maps/NavelRock_Exterior.inc" - .include "data/scripts/maps/NavelRock_Harbor.inc" - .include "data/scripts/maps/NavelRock_Entrance.inc" - .include "data/scripts/maps/NavelRock_B1F.inc" - .include "data/scripts/maps/NavelRock_Fork.inc" - .include "data/scripts/maps/NavelRock_Up1.inc" - .include "data/scripts/maps/NavelRock_Up2.inc" - .include "data/scripts/maps/NavelRock_Up3.inc" - .include "data/scripts/maps/NavelRock_Up4.inc" - .include "data/scripts/maps/NavelRock_Top.inc" - .include "data/scripts/maps/NavelRock_Down01.inc" - .include "data/scripts/maps/NavelRock_Down02.inc" - .include "data/scripts/maps/NavelRock_Down03.inc" - .include "data/scripts/maps/NavelRock_Down04.inc" - .include "data/scripts/maps/NavelRock_Down05.inc" - .include "data/scripts/maps/NavelRock_Down06.inc" - .include "data/scripts/maps/NavelRock_Down07.inc" - .include "data/scripts/maps/NavelRock_Down08.inc" - .include "data/scripts/maps/NavelRock_Down09.inc" - .include "data/scripts/maps/NavelRock_Down10.inc" - .include "data/scripts/maps/NavelRock_Down11.inc" - .include "data/scripts/maps/NavelRock_Bottom.inc" - .include "data/scripts/maps/TrainerHill_Elevator.inc" - .include "data/scripts/maps/Route104_Prototype.inc" - .include "data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc" - .include "data/scripts/maps/Route109_SeashoreHouse.inc" - .include "data/scripts/maps/Route110_TrickHouseEntrance.inc" - .include "data/scripts/maps/Route110_TrickHouseEnd.inc" - .include "data/scripts/maps/Route110_TrickHouseCorridor.inc" - .include "data/scripts/maps/Route110_TrickHousePuzzle1.inc" - .include "data/scripts/maps/Route110_TrickHousePuzzle2.inc" - .include "data/scripts/maps/Route110_TrickHousePuzzle3.inc" - .include "data/scripts/maps/Route110_TrickHousePuzzle4.inc" - .include "data/scripts/maps/Route110_TrickHousePuzzle5.inc" - .include "data/scripts/maps/Route110_TrickHousePuzzle6.inc" - .include "data/scripts/maps/Route110_TrickHousePuzzle7.inc" - .include "data/scripts/maps/Route110_TrickHousePuzzle8.inc" - .include "data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc" - .include "data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc" - .include "data/scripts/maps/Route113_GlassWorkshop.inc" - .include "data/scripts/maps/Route123_BerryMastersHouse.inc" - .include "data/scripts/maps/Route119_WeatherInstitute_1F.inc" - .include "data/scripts/maps/Route119_WeatherInstitute_2F.inc" - .include "data/scripts/maps/Route119_House.inc" - .include "data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc" + .include "data/maps/SingleBattleColosseum/scripts.inc" + .include "data/maps/TradeCenter/scripts.inc" + .include "data/maps/RecordCorner/scripts.inc" + .include "data/maps/DoubleBattleColosseum/scripts.inc" + .include "data/maps/LinkContestRoom1/scripts.inc" + .include "data/maps/LinkContestRoom2/scripts.inc" + .include "data/maps/LinkContestRoom3/scripts.inc" + .include "data/maps/LinkContestRoom4/scripts.inc" + .include "data/maps/LinkContestRoom5/scripts.inc" + .include "data/maps/LinkContestRoom6/scripts.inc" + .include "data/maps/UnknownMap_25_29/scripts.inc" + .include "data/maps/UnknownMap_25_30/scripts.inc" + .include "data/maps/UnknownMap_25_31/scripts.inc" + .include "data/maps/UnknownMap_25_32/scripts.inc" + .include "data/maps/UnknownMap_25_33/scripts.inc" + .include "data/maps/UnknownMap_25_34/scripts.inc" + .include "data/maps/InsideOfTruck/scripts.inc" + .include "data/maps/SSTidalCorridor/scripts.inc" + .include "data/maps/SSTidalLowerDeck/scripts.inc" + .include "data/maps/SSTidalRooms/scripts.inc" + .include "data/maps/BattlePyramidSquare01/scripts.inc" + .include "data/maps/BattlePyramidSquare02/scripts.inc" + .include "data/maps/BattlePyramidSquare03/scripts.inc" + .include "data/maps/BattlePyramidSquare04/scripts.inc" + .include "data/maps/BattlePyramidSquare05/scripts.inc" + .include "data/maps/BattlePyramidSquare06/scripts.inc" + .include "data/maps/BattlePyramidSquare07/scripts.inc" + .include "data/maps/BattlePyramidSquare08/scripts.inc" + .include "data/maps/BattlePyramidSquare09/scripts.inc" + .include "data/maps/BattlePyramidSquare10/scripts.inc" + .include "data/maps/BattlePyramidSquare11/scripts.inc" + .include "data/maps/BattlePyramidSquare12/scripts.inc" + .include "data/maps/BattlePyramidSquare13/scripts.inc" + .include "data/maps/BattlePyramidSquare14/scripts.inc" + .include "data/maps/BattlePyramidSquare15/scripts.inc" + .include "data/maps/BattlePyramidSquare16/scripts.inc" + .include "data/maps/UnionRoom/scripts.inc" + .include "data/maps/SafariZone_Northwest/scripts.inc" + .include "data/maps/SafariZone_North/scripts.inc" + .include "data/maps/SafariZone_Southwest/scripts.inc" + .include "data/maps/SafariZone_South/scripts.inc" + .include "data/maps/BattleFrontier_OutsideWest/scripts.inc" + .include "data/maps/BattleFrontier_BattleTowerLobby/scripts.inc" + .include "data/maps/BattleFrontier_BattleTowerElevator/scripts.inc" + .include "data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc" + .include "data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc" + .include "data/maps/SouthernIsland_Exterior/scripts.inc" + .include "data/maps/SouthernIsland_Interior/scripts.inc" + .include "data/maps/SafariZone_RestHouse/scripts.inc" + .include "data/maps/SafariZone_Northeast/scripts.inc" + .include "data/maps/SafariZone_Southeast/scripts.inc" + .include "data/maps/BattleFrontier_OutsideEast/scripts.inc" + .include "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc" + .include "data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc" + .include "data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc" + .include "data/maps/BattleFrontier_BattleDomeLobby/scripts.inc" + .include "data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc" + .include "data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc" + .include "data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc" + .include "data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc" + .include "data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc" + .include "data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc" + .include "data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc" + .include "data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc" + .include "data/maps/BattleFrontier_BattlePyramidTop/scripts.inc" + .include "data/maps/BattleFrontier_BattleArenaLobby/scripts.inc" + .include "data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc" + .include "data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc" + .include "data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc" + .include "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc" + .include "data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc" + .include "data/maps/BattleFrontier_BattlePikeLobby/scripts.inc" + .include "data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc" + .include "data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc" + .include "data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc" + .include "data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc" + .include "data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc" + .include "data/maps/BattleFrontier_RankingHall/scripts.inc" + .include "data/maps/BattleFrontier_Lounge1/scripts.inc" + .include "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc" + .include "data/maps/BattleFrontier_Lounge2/scripts.inc" + .include "data/maps/BattleFrontier_Lounge3/scripts.inc" + .include "data/maps/BattleFrontier_Lounge4/scripts.inc" + .include "data/maps/BattleFrontier_ScottsHouse/scripts.inc" + .include "data/maps/BattleFrontier_Lounge5/scripts.inc" + .include "data/maps/BattleFrontier_Lounge6/scripts.inc" + .include "data/maps/BattleFrontier_Lounge7/scripts.inc" + .include "data/maps/BattleFrontier_ReceptionGate/scripts.inc" + .include "data/maps/BattleFrontier_Lounge8/scripts.inc" + .include "data/maps/BattleFrontier_Lounge9/scripts.inc" + .include "data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc" + .include "data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc" + .include "data/maps/BattleFrontier_Mart/scripts.inc" + .include "data/maps/FarawayIsland_Entrance/scripts.inc" + .include "data/maps/FarawayIsland_Interior/scripts.inc" + .include "data/maps/BirthIsland_Exterior/scripts.inc" + .include "data/maps/BirthIsland_Harbor/scripts.inc" + .include "data/maps/TrainerHill_Entrance/scripts.inc" + .include "data/maps/TrainerHill_1F/scripts.inc" + .include "data/maps/TrainerHill_2F/scripts.inc" + .include "data/maps/TrainerHill_3F/scripts.inc" + .include "data/maps/TrainerHill_4F/scripts.inc" + .include "data/maps/TrainerHill_Roof/scripts.inc" + .include "data/maps/NavelRock_Exterior/scripts.inc" + .include "data/maps/NavelRock_Harbor/scripts.inc" + .include "data/maps/NavelRock_Entrance/scripts.inc" + .include "data/maps/NavelRock_B1F/scripts.inc" + .include "data/maps/NavelRock_Fork/scripts.inc" + .include "data/maps/NavelRock_Up1/scripts.inc" + .include "data/maps/NavelRock_Up2/scripts.inc" + .include "data/maps/NavelRock_Up3/scripts.inc" + .include "data/maps/NavelRock_Up4/scripts.inc" + .include "data/maps/NavelRock_Top/scripts.inc" + .include "data/maps/NavelRock_Down01/scripts.inc" + .include "data/maps/NavelRock_Down02/scripts.inc" + .include "data/maps/NavelRock_Down03/scripts.inc" + .include "data/maps/NavelRock_Down04/scripts.inc" + .include "data/maps/NavelRock_Down05/scripts.inc" + .include "data/maps/NavelRock_Down06/scripts.inc" + .include "data/maps/NavelRock_Down07/scripts.inc" + .include "data/maps/NavelRock_Down08/scripts.inc" + .include "data/maps/NavelRock_Down09/scripts.inc" + .include "data/maps/NavelRock_Down10/scripts.inc" + .include "data/maps/NavelRock_Down11/scripts.inc" + .include "data/maps/NavelRock_Bottom/scripts.inc" + .include "data/maps/TrainerHill_Elevator/scripts.inc" + .include "data/maps/Route104_Prototype/scripts.inc" + .include "data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc" + .include "data/maps/Route109_SeashoreHouse/scripts.inc" + .include "data/maps/Route110_TrickHouseEntrance/scripts.inc" + .include "data/maps/Route110_TrickHouseEnd/scripts.inc" + .include "data/maps/Route110_TrickHouseCorridor/scripts.inc" + .include "data/maps/Route110_TrickHousePuzzle1/scripts.inc" + .include "data/maps/Route110_TrickHousePuzzle2/scripts.inc" + .include "data/maps/Route110_TrickHousePuzzle3/scripts.inc" + .include "data/maps/Route110_TrickHousePuzzle4/scripts.inc" + .include "data/maps/Route110_TrickHousePuzzle5/scripts.inc" + .include "data/maps/Route110_TrickHousePuzzle6/scripts.inc" + .include "data/maps/Route110_TrickHousePuzzle7/scripts.inc" + .include "data/maps/Route110_TrickHousePuzzle8/scripts.inc" + .include "data/maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc" + .include "data/maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc" + .include "data/maps/Route113_GlassWorkshop/scripts.inc" + .include "data/maps/Route123_BerryMastersHouse/scripts.inc" + .include "data/maps/Route119_WeatherInstitute_1F/scripts.inc" + .include "data/maps/Route119_WeatherInstitute_2F/scripts.inc" + .include "data/maps/Route119_House/scripts.inc" + .include "data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc" Std_2: @ 8271315 lock diff --git a/data/map_events.s b/data/map_events.s index 31b4b00d23..aca9978e48 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -8,522 +8,522 @@ .section .rodata - .include "data/maps/events/PetalburgCity.inc" - .include "data/maps/events/SlateportCity.inc" - .include "data/maps/events/MauvilleCity.inc" - .include "data/maps/events/RustboroCity.inc" - .include "data/maps/events/FortreeCity.inc" - .include "data/maps/events/LilycoveCity.inc" - .include "data/maps/events/MossdeepCity.inc" - .include "data/maps/events/SootopolisCity.inc" - .include "data/maps/events/EverGrandeCity.inc" - .include "data/maps/events/LittlerootTown.inc" - .include "data/maps/events/OldaleTown.inc" - .include "data/maps/events/DewfordTown.inc" - .include "data/maps/events/LavaridgeTown.inc" - .include "data/maps/events/FallarborTown.inc" - .include "data/maps/events/VerdanturfTown.inc" - .include "data/maps/events/PacifidlogTown.inc" - .include "data/maps/events/Route101.inc" - .include "data/maps/events/Route102.inc" - .include "data/maps/events/Route103.inc" - .include "data/maps/events/Route104.inc" - .include "data/maps/events/Route105.inc" - .include "data/maps/events/Route106.inc" - .include "data/maps/events/Route107.inc" - .include "data/maps/events/Route108.inc" - .include "data/maps/events/Route109.inc" - .include "data/maps/events/Route110.inc" - .include "data/maps/events/Route111.inc" - .include "data/maps/events/Route112.inc" - .include "data/maps/events/Route113.inc" - .include "data/maps/events/Route114.inc" - .include "data/maps/events/Route115.inc" - .include "data/maps/events/Route116.inc" - .include "data/maps/events/Route117.inc" - .include "data/maps/events/Route118.inc" - .include "data/maps/events/Route119.inc" - .include "data/maps/events/Route120.inc" - .include "data/maps/events/Route121.inc" - .include "data/maps/events/Route122.inc" - .include "data/maps/events/Route123.inc" - .include "data/maps/events/Route124.inc" - .include "data/maps/events/Route125.inc" - .include "data/maps/events/Route126.inc" - .include "data/maps/events/Route127.inc" - .include "data/maps/events/Route128.inc" - .include "data/maps/events/Route129.inc" - .include "data/maps/events/Route130.inc" - .include "data/maps/events/Route131.inc" - .include "data/maps/events/Route132.inc" - .include "data/maps/events/Route133.inc" - .include "data/maps/events/Route134.inc" - .include "data/maps/events/Underwater1.inc" - .include "data/maps/events/Underwater2.inc" - .include "data/maps/events/Underwater3.inc" - .include "data/maps/events/Underwater4.inc" - .include "data/maps/events/Underwater5.inc" - .include "data/maps/events/Underwater6.inc" - .include "data/maps/events/Underwater7.inc" - .include "data/maps/events/LittlerootTown_BrendansHouse_1F.inc" - .include "data/maps/events/LittlerootTown_BrendansHouse_2F.inc" - .include "data/maps/events/LittlerootTown_MaysHouse_1F.inc" - .include "data/maps/events/LittlerootTown_MaysHouse_2F.inc" - .include "data/maps/events/LittlerootTown_ProfessorBirchsLab.inc" - .include "data/maps/events/OldaleTown_House1.inc" - .include "data/maps/events/OldaleTown_House2.inc" - .include "data/maps/events/OldaleTown_PokemonCenter_1F.inc" - .include "data/maps/events/OldaleTown_PokemonCenter_2F.inc" - .include "data/maps/events/OldaleTown_Mart.inc" - .include "data/maps/events/DewfordTown_House1.inc" - .include "data/maps/events/DewfordTown_PokemonCenter_1F.inc" - .include "data/maps/events/DewfordTown_PokemonCenter_2F.inc" - .include "data/maps/events/DewfordTown_Gym.inc" - .include "data/maps/events/DewfordTown_Hall.inc" - .include "data/maps/events/DewfordTown_House2.inc" - .include "data/maps/events/LavaridgeTown_HerbShop.inc" - .include "data/maps/events/LavaridgeTown_Gym_1F.inc" - .include "data/maps/events/LavaridgeTown_Gym_B1F.inc" - .include "data/maps/events/LavaridgeTown_House.inc" - .include "data/maps/events/LavaridgeTown_Mart.inc" - .include "data/maps/events/LavaridgeTown_PokemonCenter_1F.inc" - .include "data/maps/events/LavaridgeTown_PokemonCenter_2F.inc" - .include "data/maps/events/FallarborTown_Mart.inc" - .include "data/maps/events/FallarborTown_BattleTentLobby.inc" - .include "data/maps/events/FallarborTown_BattleTentCorridor.inc" - .include "data/maps/events/FallarborTown_BattleTentBattleRoom.inc" - .include "data/maps/events/FallarborTown_PokemonCenter_1F.inc" - .include "data/maps/events/FallarborTown_PokemonCenter_2F.inc" - .include "data/maps/events/FallarborTown_House1.inc" - .include "data/maps/events/FallarborTown_House2.inc" - .include "data/maps/events/VerdanturfTown_BattleTentLobby.inc" - .include "data/maps/events/VerdanturfTown_BattleTentCorridor.inc" - .include "data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc" - .include "data/maps/events/VerdanturfTown_Mart.inc" - .include "data/maps/events/VerdanturfTown_PokemonCenter_1F.inc" - .include "data/maps/events/VerdanturfTown_PokemonCenter_2F.inc" - .include "data/maps/events/VerdanturfTown_WandasHouse.inc" - .include "data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc" - .include "data/maps/events/VerdanturfTown_House.inc" - .include "data/maps/events/PacifidlogTown_PokemonCenter_1F.inc" - .include "data/maps/events/PacifidlogTown_PokemonCenter_2F.inc" - .include "data/maps/events/PacifidlogTown_House1.inc" - .include "data/maps/events/PacifidlogTown_House2.inc" - .include "data/maps/events/PacifidlogTown_House3.inc" - .include "data/maps/events/PacifidlogTown_House4.inc" - .include "data/maps/events/PacifidlogTown_House5.inc" - .include "data/maps/events/PetalburgCity_WallysHouse.inc" - .include "data/maps/events/PetalburgCity_Gym.inc" - .include "data/maps/events/PetalburgCity_House1.inc" - .include "data/maps/events/PetalburgCity_House2.inc" - .include "data/maps/events/PetalburgCity_PokemonCenter_1F.inc" - .include "data/maps/events/PetalburgCity_PokemonCenter_2F.inc" - .include "data/maps/events/PetalburgCity_Mart.inc" - .include "data/maps/events/SlateportCity_SternsShipyard_1F.inc" - .include "data/maps/events/SlateportCity_SternsShipyard_2F.inc" - .include "data/maps/events/SlateportCity_BattleTentLobby.inc" - .include "data/maps/events/SlateportCity_BattleTentCorridor.inc" - .include "data/maps/events/SlateportCity_BattleTentBattleRoom.inc" - .include "data/maps/events/SlateportCity_House1.inc" - .include "data/maps/events/SlateportCity_PokemonFanClub.inc" - .include "data/maps/events/SlateportCity_OceanicMuseum_1F.inc" - .include "data/maps/events/SlateportCity_OceanicMuseum_2F.inc" - .include "data/maps/events/SlateportCity_Harbor.inc" - .include "data/maps/events/SlateportCity_House2.inc" - .include "data/maps/events/SlateportCity_PokemonCenter_1F.inc" - .include "data/maps/events/SlateportCity_PokemonCenter_2F.inc" - .include "data/maps/events/SlateportCity_Mart.inc" - .include "data/maps/events/MauvilleCity_Gym.inc" - .include "data/maps/events/MauvilleCity_BikeShop.inc" - .include "data/maps/events/MauvilleCity_House1.inc" - .include "data/maps/events/MauvilleCity_GameCorner.inc" - .include "data/maps/events/MauvilleCity_House2.inc" - .include "data/maps/events/MauvilleCity_PokemonCenter_1F.inc" - .include "data/maps/events/MauvilleCity_PokemonCenter_2F.inc" - .include "data/maps/events/MauvilleCity_Mart.inc" - .include "data/maps/events/RustboroCity_DevonCorp_1F.inc" - .include "data/maps/events/RustboroCity_DevonCorp_2F.inc" - .include "data/maps/events/RustboroCity_DevonCorp_3F.inc" - .include "data/maps/events/RustboroCity_Gym.inc" - .include "data/maps/events/RustboroCity_PokemonSchool.inc" - .include "data/maps/events/RustboroCity_PokemonCenter_1F.inc" - .include "data/maps/events/RustboroCity_PokemonCenter_2F.inc" - .include "data/maps/events/RustboroCity_Mart.inc" - .include "data/maps/events/RustboroCity_Flat1_1F.inc" - .include "data/maps/events/RustboroCity_Flat1_2F.inc" - .include "data/maps/events/RustboroCity_House1.inc" - .include "data/maps/events/RustboroCity_CuttersHouse.inc" - .include "data/maps/events/RustboroCity_House2.inc" - .include "data/maps/events/RustboroCity_Flat2_1F.inc" - .include "data/maps/events/RustboroCity_Flat2_2F.inc" - .include "data/maps/events/RustboroCity_Flat2_3F.inc" - .include "data/maps/events/RustboroCity_House3.inc" - .include "data/maps/events/FortreeCity_House1.inc" - .include "data/maps/events/FortreeCity_Gym.inc" - .include "data/maps/events/FortreeCity_PokemonCenter_1F.inc" - .include "data/maps/events/FortreeCity_PokemonCenter_2F.inc" - .include "data/maps/events/FortreeCity_Mart.inc" - .include "data/maps/events/FortreeCity_House2.inc" - .include "data/maps/events/FortreeCity_House3.inc" - .include "data/maps/events/FortreeCity_House4.inc" - .include "data/maps/events/FortreeCity_House5.inc" - .include "data/maps/events/FortreeCity_DecorationShop.inc" - .include "data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc" - .include "data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc" - .include "data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc" - .include "data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc" - .include "data/maps/events/LilycoveCity_ContestLobby.inc" - .include "data/maps/events/LilycoveCity_ContestHall.inc" - .include "data/maps/events/LilycoveCity_PokemonCenter_1F.inc" - .include "data/maps/events/LilycoveCity_PokemonCenter_2F.inc" - .include "data/maps/events/LilycoveCity_UnusedMart.inc" - .include "data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc" - .include "data/maps/events/LilycoveCity_Harbor.inc" - .include "data/maps/events/LilycoveCity_MoveDeletersHouse.inc" - .include "data/maps/events/LilycoveCity_House1.inc" - .include "data/maps/events/LilycoveCity_House2.inc" - .include "data/maps/events/LilycoveCity_House3.inc" - .include "data/maps/events/LilycoveCity_House4.inc" - .include "data/maps/events/LilycoveCity_DepartmentStore_1F.inc" - .include "data/maps/events/LilycoveCity_DepartmentStore_2F.inc" - .include "data/maps/events/LilycoveCity_DepartmentStore_3F.inc" - .include "data/maps/events/LilycoveCity_DepartmentStore_4F.inc" - .include "data/maps/events/LilycoveCity_DepartmentStore_5F.inc" - .include "data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc" - .include "data/maps/events/LilycoveCity_DepartmentStoreElevator.inc" - .include "data/maps/events/MossdeepCity_Gym.inc" - .include "data/maps/events/MossdeepCity_House1.inc" - .include "data/maps/events/MossdeepCity_House2.inc" - .include "data/maps/events/MossdeepCity_PokemonCenter_1F.inc" - .include "data/maps/events/MossdeepCity_PokemonCenter_2F.inc" - .include "data/maps/events/MossdeepCity_Mart.inc" - .include "data/maps/events/MossdeepCity_House3.inc" - .include "data/maps/events/MossdeepCity_StevensHouse.inc" - .include "data/maps/events/MossdeepCity_House4.inc" - .include "data/maps/events/MossdeepCity_SpaceCenter_1F.inc" - .include "data/maps/events/MossdeepCity_SpaceCenter_2F.inc" - .include "data/maps/events/MossdeepCity_GameCorner_1F.inc" - .include "data/maps/events/MossdeepCity_GameCorner_B1F.inc" - .include "data/maps/events/SootopolisCity_Gym_1F.inc" - .include "data/maps/events/SootopolisCity_Gym_B1F.inc" - .include "data/maps/events/SootopolisCity_PokemonCenter_1F.inc" - .include "data/maps/events/SootopolisCity_PokemonCenter_2F.inc" - .include "data/maps/events/SootopolisCity_Mart.inc" - .include "data/maps/events/SootopolisCity_House1.inc" - .include "data/maps/events/SootopolisCity_House2.inc" - .include "data/maps/events/SootopolisCity_House3.inc" - .include "data/maps/events/SootopolisCity_House4.inc" - .include "data/maps/events/SootopolisCity_House5.inc" - .include "data/maps/events/SootopolisCity_House6.inc" - .include "data/maps/events/SootopolisCity_House7.inc" - .include "data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc" - .include "data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc" - .include "data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc" - .include "data/maps/events/EverGrandeCity_SidneysRoom.inc" - .include "data/maps/events/EverGrandeCity_PhoebesRoom.inc" - .include "data/maps/events/EverGrandeCity_GlaciasRoom.inc" - .include "data/maps/events/EverGrandeCity_DrakesRoom.inc" - .include "data/maps/events/EverGrandeCity_ChampionsRoom.inc" - .include "data/maps/events/EverGrandeCity_Hall1.inc" - .include "data/maps/events/EverGrandeCity_Hall2.inc" - .include "data/maps/events/EverGrandeCity_Hall3.inc" - .include "data/maps/events/EverGrandeCity_Hall4.inc" - .include "data/maps/events/EverGrandeCity_Hall5.inc" - .include "data/maps/events/EverGrandeCity_PokemonLeague_1F.inc" - .include "data/maps/events/EverGrandeCity_HallOfFame.inc" - .include "data/maps/events/EverGrandeCity_PokemonCenter_1F.inc" - .include "data/maps/events/EverGrandeCity_PokemonCenter_2F.inc" - .include "data/maps/events/EverGrandeCity_PokemonLeague_2F.inc" - .include "data/maps/events/Route104_MrBrineysHouse.inc" - .include "data/maps/events/Route104_PrettyPetalFlowerShop.inc" - .include "data/maps/events/Route111_WinstrateFamilysHouse.inc" - .include "data/maps/events/Route111_OldLadysRestStop.inc" - .include "data/maps/events/Route112_CableCarStation.inc" - .include "data/maps/events/MtChimney_CableCarStation.inc" - .include "data/maps/events/Route114_FossilManiacsHouse.inc" - .include "data/maps/events/Route114_FossilManiacsTunnel.inc" - .include "data/maps/events/Route114_LanettesHouse.inc" - .include "data/maps/events/Route116_TunnelersRestHouse.inc" - .include "data/maps/events/Route117_PokemonDayCare.inc" - .include "data/maps/events/Route121_SafariZoneEntrance.inc" - .include "data/maps/events/MeteorFalls_1F_1R.inc" - .include "data/maps/events/MeteorFalls_1F_2R.inc" - .include "data/maps/events/MeteorFalls_B1F_1R.inc" - .include "data/maps/events/MeteorFalls_B1F_2R.inc" - .include "data/maps/events/RusturfTunnel.inc" - .include "data/maps/events/Underwater_SootopolisCity.inc" - .include "data/maps/events/DesertRuins.inc" - .include "data/maps/events/GraniteCave_1F.inc" - .include "data/maps/events/GraniteCave_B1F.inc" - .include "data/maps/events/GraniteCave_B2F.inc" - .include "data/maps/events/GraniteCave_StevensRoom.inc" - .include "data/maps/events/PetalburgWoods.inc" - .include "data/maps/events/MtChimney.inc" - .include "data/maps/events/JaggedPass.inc" - .include "data/maps/events/FieryPath.inc" - .include "data/maps/events/MtPyre_1F.inc" - .include "data/maps/events/MtPyre_2F.inc" - .include "data/maps/events/MtPyre_3F.inc" - .include "data/maps/events/MtPyre_4F.inc" - .include "data/maps/events/MtPyre_5F.inc" - .include "data/maps/events/MtPyre_6F.inc" - .include "data/maps/events/MtPyre_Exterior.inc" - .include "data/maps/events/MtPyre_Summit.inc" - .include "data/maps/events/AquaHideout_1F.inc" - .include "data/maps/events/AquaHideout_B1F.inc" - .include "data/maps/events/AquaHideout_B2F.inc" - .include "data/maps/events/Underwater_SeafloorCavern.inc" - .include "data/maps/events/SeafloorCavern_Entrance.inc" - .include "data/maps/events/SeafloorCavern_Room1.inc" - .include "data/maps/events/SeafloorCavern_Room2.inc" - .include "data/maps/events/SeafloorCavern_Room3.inc" - .include "data/maps/events/SeafloorCavern_Room4.inc" - .include "data/maps/events/SeafloorCavern_Room5.inc" - .include "data/maps/events/SeafloorCavern_Room6.inc" - .include "data/maps/events/SeafloorCavern_Room7.inc" - .include "data/maps/events/SeafloorCavern_Room8.inc" - .include "data/maps/events/SeafloorCavern_Room9.inc" - .include "data/maps/events/CaveOfOrigin_Entrance.inc" - .include "data/maps/events/CaveOfOrigin_1F.inc" - .include "data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc" - .include "data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc" - .include "data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc" - .include "data/maps/events/CaveOfOrigin_B1F.inc" - .include "data/maps/events/VictoryRoad_1F.inc" - .include "data/maps/events/VictoryRoad_B1F.inc" - .include "data/maps/events/VictoryRoad_B2F.inc" - .include "data/maps/events/ShoalCave_LowTideEntranceRoom.inc" - .include "data/maps/events/ShoalCave_LowTideInnerRoom.inc" - .include "data/maps/events/ShoalCave_LowTideStairsRoom.inc" - .include "data/maps/events/ShoalCave_LowTideLowerRoom.inc" - .include "data/maps/events/ShoalCave_HighTideEntranceRoom.inc" - .include "data/maps/events/ShoalCave_HighTideInnerRoom.inc" - .include "data/maps/events/NewMauville_Entrance.inc" - .include "data/maps/events/NewMauville_Inside.inc" - .include "data/maps/events/AbandonedShip_Deck.inc" - .include "data/maps/events/AbandonedShip_Corridors_1F.inc" - .include "data/maps/events/AbandonedShip_Rooms_1F.inc" - .include "data/maps/events/AbandonedShip_Corridors_B1F.inc" - .include "data/maps/events/AbandonedShip_Rooms_B1F.inc" - .include "data/maps/events/AbandonedShip_Rooms2_B1F.inc" - .include "data/maps/events/AbandonedShip_Underwater1.inc" - .include "data/maps/events/AbandonedShip_Room_B1F.inc" - .include "data/maps/events/AbandonedShip_Rooms2_1F.inc" - .include "data/maps/events/AbandonedShip_CaptainsOffice.inc" - .include "data/maps/events/AbandonedShip_Underwater2.inc" - .include "data/maps/events/AbandonedShip_HiddenFloorCorridors.inc" - .include "data/maps/events/AbandonedShip_HiddenFloorRooms.inc" - .include "data/maps/events/IslandCave.inc" - .include "data/maps/events/AncientTomb.inc" - .include "data/maps/events/Underwater_Route134.inc" - .include "data/maps/events/Underwater_SealedChamber.inc" - .include "data/maps/events/SealedChamber_OuterRoom.inc" - .include "data/maps/events/SealedChamber_InnerRoom.inc" - .include "data/maps/events/ScorchedSlab.inc" - .include "data/maps/events/AquaHideout_UnusedRubyMap1.inc" - .include "data/maps/events/AquaHideout_UnusedRubyMap2.inc" - .include "data/maps/events/AquaHideout_UnusedRubyMap3.inc" - .include "data/maps/events/SkyPillar_Entrance.inc" - .include "data/maps/events/SkyPillar_Outside.inc" - .include "data/maps/events/SkyPillar_1F.inc" - .include "data/maps/events/SkyPillar_2F.inc" - .include "data/maps/events/SkyPillar_3F.inc" - .include "data/maps/events/SkyPillar_4F.inc" - .include "data/maps/events/ShoalCave_LowTideIceRoom.inc" - .include "data/maps/events/SkyPillar_5F.inc" - .include "data/maps/events/SkyPillar_Top.inc" - .include "data/maps/events/MagmaHideout_1F.inc" - .include "data/maps/events/MagmaHideout_2F_1R.inc" - .include "data/maps/events/MagmaHideout_2F_2R.inc" - .include "data/maps/events/MagmaHideout_3F_1R.inc" - .include "data/maps/events/MagmaHideout_3F_2R.inc" - .include "data/maps/events/MagmaHideout_4F.inc" - .include "data/maps/events/MagmaHideout_3F_3R.inc" - .include "data/maps/events/MagmaHideout_2F_3R.inc" - .include "data/maps/events/MirageTower_1F.inc" - .include "data/maps/events/MirageTower_2F.inc" - .include "data/maps/events/MirageTower_3F.inc" - .include "data/maps/events/MirageTower_4F.inc" - .include "data/maps/events/DesertUnderpass.inc" - .include "data/maps/events/ArtisanCave_B1F.inc" - .include "data/maps/events/ArtisanCave_1F.inc" - .include "data/maps/events/Underwater_MarineCave.inc" - .include "data/maps/events/MarineCave_Entrance.inc" - .include "data/maps/events/MarineCave_End.inc" - .include "data/maps/events/TerraCave_Entrance.inc" - .include "data/maps/events/TerraCave_End.inc" - .include "data/maps/events/AlteringCave.inc" - .include "data/maps/events/MeteorFalls_StevensCave.inc" - .include "data/maps/events/SecretBase_RedCave1.inc" - .include "data/maps/events/SecretBase_BrownCave1.inc" - .include "data/maps/events/SecretBase_BlueCave1.inc" - .include "data/maps/events/SecretBase_YellowCave1.inc" - .include "data/maps/events/SecretBase_Tree1.inc" - .include "data/maps/events/SecretBase_Shrub1.inc" - .include "data/maps/events/SecretBase_RedCave2.inc" - .include "data/maps/events/SecretBase_BrownCave2.inc" - .include "data/maps/events/SecretBase_BlueCave2.inc" - .include "data/maps/events/SecretBase_YellowCave2.inc" - .include "data/maps/events/SecretBase_Tree2.inc" - .include "data/maps/events/SecretBase_Shrub2.inc" - .include "data/maps/events/SecretBase_RedCave3.inc" - .include "data/maps/events/SecretBase_BrownCave3.inc" - .include "data/maps/events/SecretBase_BlueCave3.inc" - .include "data/maps/events/SecretBase_YellowCave3.inc" - .include "data/maps/events/SecretBase_Tree3.inc" - .include "data/maps/events/SecretBase_Shrub3.inc" - .include "data/maps/events/SecretBase_RedCave4.inc" - .include "data/maps/events/SecretBase_BrownCave4.inc" - .include "data/maps/events/SecretBase_BlueCave4.inc" - .include "data/maps/events/SecretBase_YellowCave4.inc" - .include "data/maps/events/SecretBase_Tree4.inc" - .include "data/maps/events/SecretBase_Shrub4.inc" - .include "data/maps/events/SingleBattleColosseum.inc" - .include "data/maps/events/TradeCenter.inc" - .include "data/maps/events/RecordCorner.inc" - .include "data/maps/events/DoubleBattleColosseum.inc" - .include "data/maps/events/LinkContestRoom1.inc" - .include "data/maps/events/LinkContestRoom2.inc" - .include "data/maps/events/LinkContestRoom3.inc" - .include "data/maps/events/LinkContestRoom4.inc" - .include "data/maps/events/LinkContestRoom5.inc" - .include "data/maps/events/LinkContestRoom6.inc" - .include "data/maps/events/UnknownMap_25_29.inc" - .include "data/maps/events/UnknownMap_25_30.inc" - .include "data/maps/events/UnknownMap_25_31.inc" - .include "data/maps/events/UnknownMap_25_32.inc" - .include "data/maps/events/UnknownMap_25_33.inc" - .include "data/maps/events/UnknownMap_25_34.inc" - .include "data/maps/events/InsideOfTruck.inc" - .include "data/maps/events/SSTidalCorridor.inc" - .include "data/maps/events/SSTidalLowerDeck.inc" - .include "data/maps/events/SSTidalRooms.inc" - .include "data/maps/events/BattlePyramidSquare01.inc" - .include "data/maps/events/BattlePyramidSquare02.inc" - .include "data/maps/events/BattlePyramidSquare03.inc" - .include "data/maps/events/BattlePyramidSquare04.inc" - .include "data/maps/events/BattlePyramidSquare05.inc" - .include "data/maps/events/BattlePyramidSquare06.inc" - .include "data/maps/events/BattlePyramidSquare07.inc" - .include "data/maps/events/BattlePyramidSquare08.inc" - .include "data/maps/events/BattlePyramidSquare09.inc" - .include "data/maps/events/BattlePyramidSquare10.inc" - .include "data/maps/events/BattlePyramidSquare11.inc" - .include "data/maps/events/BattlePyramidSquare12.inc" - .include "data/maps/events/BattlePyramidSquare13.inc" - .include "data/maps/events/BattlePyramidSquare14.inc" - .include "data/maps/events/BattlePyramidSquare15.inc" - .include "data/maps/events/BattlePyramidSquare16.inc" - .include "data/maps/events/UnionRoom.inc" - .include "data/maps/events/SafariZone_Northwest.inc" - .include "data/maps/events/SafariZone_North.inc" - .include "data/maps/events/SafariZone_Southwest.inc" - .include "data/maps/events/SafariZone_South.inc" - .include "data/maps/events/BattleFrontier_OutsideWest.inc" - .include "data/maps/events/BattleFrontier_BattleTowerLobby.inc" - .include "data/maps/events/BattleFrontier_BattleTowerElevator.inc" - .include "data/maps/events/BattleFrontier_BattleTowerCorridor.inc" - .include "data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc" - .include "data/maps/events/SouthernIsland_Exterior.inc" - .include "data/maps/events/SouthernIsland_Interior.inc" - .include "data/maps/events/SafariZone_RestHouse.inc" - .include "data/maps/events/SafariZone_Northeast.inc" - .include "data/maps/events/SafariZone_Southeast.inc" - .include "data/maps/events/BattleFrontier_OutsideEast.inc" - .include "data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattleTowerCorridor2.inc" - .include "data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc" - .include "data/maps/events/BattleFrontier_BattleDomeLobby.inc" - .include "data/maps/events/BattleFrontier_BattleDomeCorridor.inc" - .include "data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattlePalaceLobby.inc" - .include "data/maps/events/BattleFrontier_BattlePalaceCorridor.inc" - .include "data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattlePyramidLobby.inc" - .include "data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc" - .include "data/maps/events/BattleFrontier_BattlePyramidTop.inc" - .include "data/maps/events/BattleFrontier_BattleArenaLobby.inc" - .include "data/maps/events/BattleFrontier_BattleArenaCorridor.inc" - .include "data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattleFactoryLobby.inc" - .include "data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattlePikeLobby.inc" - .include "data/maps/events/BattleFrontier_BattlePikeCorridor.inc" - .include "data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc" - .include "data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc" - .include "data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc" - .include "data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc" - .include "data/maps/events/BattleFrontier_RankingHall.inc" - .include "data/maps/events/BattleFrontier_Lounge1.inc" - .include "data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc" - .include "data/maps/events/BattleFrontier_Lounge2.inc" - .include "data/maps/events/BattleFrontier_Lounge3.inc" - .include "data/maps/events/BattleFrontier_Lounge4.inc" - .include "data/maps/events/BattleFrontier_ScottsHouse.inc" - .include "data/maps/events/BattleFrontier_Lounge5.inc" - .include "data/maps/events/BattleFrontier_Lounge6.inc" - .include "data/maps/events/BattleFrontier_Lounge7.inc" - .include "data/maps/events/BattleFrontier_ReceptionGate.inc" - .include "data/maps/events/BattleFrontier_Lounge8.inc" - .include "data/maps/events/BattleFrontier_Lounge9.inc" - .include "data/maps/events/BattleFrontier_PokemonCenter_1F.inc" - .include "data/maps/events/BattleFrontier_PokemonCenter_2F.inc" - .include "data/maps/events/BattleFrontier_Mart.inc" - .include "data/maps/events/FarawayIsland_Entrance.inc" - .include "data/maps/events/FarawayIsland_Interior.inc" - .include "data/maps/events/BirthIsland_Exterior.inc" - .include "data/maps/events/BirthIsland_Harbor.inc" - .include "data/maps/events/TrainerHill_Entrance.inc" - .include "data/maps/events/TrainerHill_1F.inc" - .include "data/maps/events/TrainerHill_2F.inc" - .include "data/maps/events/TrainerHill_3F.inc" - .include "data/maps/events/TrainerHill_4F.inc" - .include "data/maps/events/TrainerHill_Roof.inc" - .include "data/maps/events/NavelRock_Exterior.inc" - .include "data/maps/events/NavelRock_Harbor.inc" - .include "data/maps/events/NavelRock_Entrance.inc" - .include "data/maps/events/NavelRock_B1F.inc" - .include "data/maps/events/NavelRock_Fork.inc" - .include "data/maps/events/NavelRock_Up1.inc" - .include "data/maps/events/NavelRock_Up2.inc" - .include "data/maps/events/NavelRock_Up3.inc" - .include "data/maps/events/NavelRock_Up4.inc" - .include "data/maps/events/NavelRock_Top.inc" - .include "data/maps/events/NavelRock_Down01.inc" - .include "data/maps/events/NavelRock_Down02.inc" - .include "data/maps/events/NavelRock_Down03.inc" - .include "data/maps/events/NavelRock_Down04.inc" - .include "data/maps/events/NavelRock_Down05.inc" - .include "data/maps/events/NavelRock_Down06.inc" - .include "data/maps/events/NavelRock_Down07.inc" - .include "data/maps/events/NavelRock_Down08.inc" - .include "data/maps/events/NavelRock_Down09.inc" - .include "data/maps/events/NavelRock_Down10.inc" - .include "data/maps/events/NavelRock_Down11.inc" - .include "data/maps/events/NavelRock_Bottom.inc" - .include "data/maps/events/TrainerHill_Elevator.inc" - .include "data/maps/events/Route104_Prototype.inc" - .include "data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc" - .include "data/maps/events/Route109_SeashoreHouse.inc" - .include "data/maps/events/Route110_TrickHouseEntrance.inc" - .include "data/maps/events/Route110_TrickHouseEnd.inc" - .include "data/maps/events/Route110_TrickHouseCorridor.inc" - .include "data/maps/events/Route110_TrickHousePuzzle1.inc" - .include "data/maps/events/Route110_TrickHousePuzzle2.inc" - .include "data/maps/events/Route110_TrickHousePuzzle3.inc" - .include "data/maps/events/Route110_TrickHousePuzzle4.inc" - .include "data/maps/events/Route110_TrickHousePuzzle5.inc" - .include "data/maps/events/Route110_TrickHousePuzzle6.inc" - .include "data/maps/events/Route110_TrickHousePuzzle7.inc" - .include "data/maps/events/Route110_TrickHousePuzzle8.inc" - .include "data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc" - .include "data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc" - .include "data/maps/events/Route113_GlassWorkshop.inc" - .include "data/maps/events/Route123_BerryMastersHouse.inc" - .include "data/maps/events/Route119_WeatherInstitute_1F.inc" - .include "data/maps/events/Route119_WeatherInstitute_2F.inc" - .include "data/maps/events/Route119_House.inc" - .include "data/maps/events/Route124_DivingTreasureHuntersHouse.inc" + .include "data/maps/PetalburgCity/events.inc" + .include "data/maps/SlateportCity/events.inc" + .include "data/maps/MauvilleCity/events.inc" + .include "data/maps/RustboroCity/events.inc" + .include "data/maps/FortreeCity/events.inc" + .include "data/maps/LilycoveCity/events.inc" + .include "data/maps/MossdeepCity/events.inc" + .include "data/maps/SootopolisCity/events.inc" + .include "data/maps/EverGrandeCity/events.inc" + .include "data/maps/LittlerootTown/events.inc" + .include "data/maps/OldaleTown/events.inc" + .include "data/maps/DewfordTown/events.inc" + .include "data/maps/LavaridgeTown/events.inc" + .include "data/maps/FallarborTown/events.inc" + .include "data/maps/VerdanturfTown/events.inc" + .include "data/maps/PacifidlogTown/events.inc" + .include "data/maps/Route101/events.inc" + .include "data/maps/Route102/events.inc" + .include "data/maps/Route103/events.inc" + .include "data/maps/Route104/events.inc" + .include "data/maps/Route105/events.inc" + .include "data/maps/Route106/events.inc" + .include "data/maps/Route107/events.inc" + .include "data/maps/Route108/events.inc" + .include "data/maps/Route109/events.inc" + .include "data/maps/Route110/events.inc" + .include "data/maps/Route111/events.inc" + .include "data/maps/Route112/events.inc" + .include "data/maps/Route113/events.inc" + .include "data/maps/Route114/events.inc" + .include "data/maps/Route115/events.inc" + .include "data/maps/Route116/events.inc" + .include "data/maps/Route117/events.inc" + .include "data/maps/Route118/events.inc" + .include "data/maps/Route119/events.inc" + .include "data/maps/Route120/events.inc" + .include "data/maps/Route121/events.inc" + .include "data/maps/Route122/events.inc" + .include "data/maps/Route123/events.inc" + .include "data/maps/Route124/events.inc" + .include "data/maps/Route125/events.inc" + .include "data/maps/Route126/events.inc" + .include "data/maps/Route127/events.inc" + .include "data/maps/Route128/events.inc" + .include "data/maps/Route129/events.inc" + .include "data/maps/Route130/events.inc" + .include "data/maps/Route131/events.inc" + .include "data/maps/Route132/events.inc" + .include "data/maps/Route133/events.inc" + .include "data/maps/Route134/events.inc" + .include "data/maps/Underwater1/events.inc" + .include "data/maps/Underwater2/events.inc" + .include "data/maps/Underwater3/events.inc" + .include "data/maps/Underwater4/events.inc" + .include "data/maps/Underwater5/events.inc" + .include "data/maps/Underwater6/events.inc" + .include "data/maps/Underwater7/events.inc" + .include "data/maps/LittlerootTown_BrendansHouse_1F/events.inc" + .include "data/maps/LittlerootTown_BrendansHouse_2F/events.inc" + .include "data/maps/LittlerootTown_MaysHouse_1F/events.inc" + .include "data/maps/LittlerootTown_MaysHouse_2F/events.inc" + .include "data/maps/LittlerootTown_ProfessorBirchsLab/events.inc" + .include "data/maps/OldaleTown_House1/events.inc" + .include "data/maps/OldaleTown_House2/events.inc" + .include "data/maps/OldaleTown_PokemonCenter_1F/events.inc" + .include "data/maps/OldaleTown_PokemonCenter_2F/events.inc" + .include "data/maps/OldaleTown_Mart/events.inc" + .include "data/maps/DewfordTown_House1/events.inc" + .include "data/maps/DewfordTown_PokemonCenter_1F/events.inc" + .include "data/maps/DewfordTown_PokemonCenter_2F/events.inc" + .include "data/maps/DewfordTown_Gym/events.inc" + .include "data/maps/DewfordTown_Hall/events.inc" + .include "data/maps/DewfordTown_House2/events.inc" + .include "data/maps/LavaridgeTown_HerbShop/events.inc" + .include "data/maps/LavaridgeTown_Gym_1F/events.inc" + .include "data/maps/LavaridgeTown_Gym_B1F/events.inc" + .include "data/maps/LavaridgeTown_House/events.inc" + .include "data/maps/LavaridgeTown_Mart/events.inc" + .include "data/maps/LavaridgeTown_PokemonCenter_1F/events.inc" + .include "data/maps/LavaridgeTown_PokemonCenter_2F/events.inc" + .include "data/maps/FallarborTown_Mart/events.inc" + .include "data/maps/FallarborTown_BattleTentLobby/events.inc" + .include "data/maps/FallarborTown_BattleTentCorridor/events.inc" + .include "data/maps/FallarborTown_BattleTentBattleRoom/events.inc" + .include "data/maps/FallarborTown_PokemonCenter_1F/events.inc" + .include "data/maps/FallarborTown_PokemonCenter_2F/events.inc" + .include "data/maps/FallarborTown_House1/events.inc" + .include "data/maps/FallarborTown_House2/events.inc" + .include "data/maps/VerdanturfTown_BattleTentLobby/events.inc" + .include "data/maps/VerdanturfTown_BattleTentCorridor/events.inc" + .include "data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc" + .include "data/maps/VerdanturfTown_Mart/events.inc" + .include "data/maps/VerdanturfTown_PokemonCenter_1F/events.inc" + .include "data/maps/VerdanturfTown_PokemonCenter_2F/events.inc" + .include "data/maps/VerdanturfTown_WandasHouse/events.inc" + .include "data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc" + .include "data/maps/VerdanturfTown_House/events.inc" + .include "data/maps/PacifidlogTown_PokemonCenter_1F/events.inc" + .include "data/maps/PacifidlogTown_PokemonCenter_2F/events.inc" + .include "data/maps/PacifidlogTown_House1/events.inc" + .include "data/maps/PacifidlogTown_House2/events.inc" + .include "data/maps/PacifidlogTown_House3/events.inc" + .include "data/maps/PacifidlogTown_House4/events.inc" + .include "data/maps/PacifidlogTown_House5/events.inc" + .include "data/maps/PetalburgCity_WallysHouse/events.inc" + .include "data/maps/PetalburgCity_Gym/events.inc" + .include "data/maps/PetalburgCity_House1/events.inc" + .include "data/maps/PetalburgCity_House2/events.inc" + .include "data/maps/PetalburgCity_PokemonCenter_1F/events.inc" + .include "data/maps/PetalburgCity_PokemonCenter_2F/events.inc" + .include "data/maps/PetalburgCity_Mart/events.inc" + .include "data/maps/SlateportCity_SternsShipyard_1F/events.inc" + .include "data/maps/SlateportCity_SternsShipyard_2F/events.inc" + .include "data/maps/SlateportCity_BattleTentLobby/events.inc" + .include "data/maps/SlateportCity_BattleTentCorridor/events.inc" + .include "data/maps/SlateportCity_BattleTentBattleRoom/events.inc" + .include "data/maps/SlateportCity_House1/events.inc" + .include "data/maps/SlateportCity_PokemonFanClub/events.inc" + .include "data/maps/SlateportCity_OceanicMuseum_1F/events.inc" + .include "data/maps/SlateportCity_OceanicMuseum_2F/events.inc" + .include "data/maps/SlateportCity_Harbor/events.inc" + .include "data/maps/SlateportCity_House2/events.inc" + .include "data/maps/SlateportCity_PokemonCenter_1F/events.inc" + .include "data/maps/SlateportCity_PokemonCenter_2F/events.inc" + .include "data/maps/SlateportCity_Mart/events.inc" + .include "data/maps/MauvilleCity_Gym/events.inc" + .include "data/maps/MauvilleCity_BikeShop/events.inc" + .include "data/maps/MauvilleCity_House1/events.inc" + .include "data/maps/MauvilleCity_GameCorner/events.inc" + .include "data/maps/MauvilleCity_House2/events.inc" + .include "data/maps/MauvilleCity_PokemonCenter_1F/events.inc" + .include "data/maps/MauvilleCity_PokemonCenter_2F/events.inc" + .include "data/maps/MauvilleCity_Mart/events.inc" + .include "data/maps/RustboroCity_DevonCorp_1F/events.inc" + .include "data/maps/RustboroCity_DevonCorp_2F/events.inc" + .include "data/maps/RustboroCity_DevonCorp_3F/events.inc" + .include "data/maps/RustboroCity_Gym/events.inc" + .include "data/maps/RustboroCity_PokemonSchool/events.inc" + .include "data/maps/RustboroCity_PokemonCenter_1F/events.inc" + .include "data/maps/RustboroCity_PokemonCenter_2F/events.inc" + .include "data/maps/RustboroCity_Mart/events.inc" + .include "data/maps/RustboroCity_Flat1_1F/events.inc" + .include "data/maps/RustboroCity_Flat1_2F/events.inc" + .include "data/maps/RustboroCity_House1/events.inc" + .include "data/maps/RustboroCity_CuttersHouse/events.inc" + .include "data/maps/RustboroCity_House2/events.inc" + .include "data/maps/RustboroCity_Flat2_1F/events.inc" + .include "data/maps/RustboroCity_Flat2_2F/events.inc" + .include "data/maps/RustboroCity_Flat2_3F/events.inc" + .include "data/maps/RustboroCity_House3/events.inc" + .include "data/maps/FortreeCity_House1/events.inc" + .include "data/maps/FortreeCity_Gym/events.inc" + .include "data/maps/FortreeCity_PokemonCenter_1F/events.inc" + .include "data/maps/FortreeCity_PokemonCenter_2F/events.inc" + .include "data/maps/FortreeCity_Mart/events.inc" + .include "data/maps/FortreeCity_House2/events.inc" + .include "data/maps/FortreeCity_House3/events.inc" + .include "data/maps/FortreeCity_House4/events.inc" + .include "data/maps/FortreeCity_House5/events.inc" + .include "data/maps/FortreeCity_DecorationShop/events.inc" + .include "data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc" + .include "data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc" + .include "data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc" + .include "data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc" + .include "data/maps/LilycoveCity_ContestLobby/events.inc" + .include "data/maps/LilycoveCity_ContestHall/events.inc" + .include "data/maps/LilycoveCity_PokemonCenter_1F/events.inc" + .include "data/maps/LilycoveCity_PokemonCenter_2F/events.inc" + .include "data/maps/LilycoveCity_UnusedMart/events.inc" + .include "data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc" + .include "data/maps/LilycoveCity_Harbor/events.inc" + .include "data/maps/LilycoveCity_MoveDeletersHouse/events.inc" + .include "data/maps/LilycoveCity_House1/events.inc" + .include "data/maps/LilycoveCity_House2/events.inc" + .include "data/maps/LilycoveCity_House3/events.inc" + .include "data/maps/LilycoveCity_House4/events.inc" + .include "data/maps/LilycoveCity_DepartmentStore_1F/events.inc" + .include "data/maps/LilycoveCity_DepartmentStore_2F/events.inc" + .include "data/maps/LilycoveCity_DepartmentStore_3F/events.inc" + .include "data/maps/LilycoveCity_DepartmentStore_4F/events.inc" + .include "data/maps/LilycoveCity_DepartmentStore_5F/events.inc" + .include "data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc" + .include "data/maps/LilycoveCity_DepartmentStoreElevator/events.inc" + .include "data/maps/MossdeepCity_Gym/events.inc" + .include "data/maps/MossdeepCity_House1/events.inc" + .include "data/maps/MossdeepCity_House2/events.inc" + .include "data/maps/MossdeepCity_PokemonCenter_1F/events.inc" + .include "data/maps/MossdeepCity_PokemonCenter_2F/events.inc" + .include "data/maps/MossdeepCity_Mart/events.inc" + .include "data/maps/MossdeepCity_House3/events.inc" + .include "data/maps/MossdeepCity_StevensHouse/events.inc" + .include "data/maps/MossdeepCity_House4/events.inc" + .include "data/maps/MossdeepCity_SpaceCenter_1F/events.inc" + .include "data/maps/MossdeepCity_SpaceCenter_2F/events.inc" + .include "data/maps/MossdeepCity_GameCorner_1F/events.inc" + .include "data/maps/MossdeepCity_GameCorner_B1F/events.inc" + .include "data/maps/SootopolisCity_Gym_1F/events.inc" + .include "data/maps/SootopolisCity_Gym_B1F/events.inc" + .include "data/maps/SootopolisCity_PokemonCenter_1F/events.inc" + .include "data/maps/SootopolisCity_PokemonCenter_2F/events.inc" + .include "data/maps/SootopolisCity_Mart/events.inc" + .include "data/maps/SootopolisCity_House1/events.inc" + .include "data/maps/SootopolisCity_House2/events.inc" + .include "data/maps/SootopolisCity_House3/events.inc" + .include "data/maps/SootopolisCity_House4/events.inc" + .include "data/maps/SootopolisCity_House5/events.inc" + .include "data/maps/SootopolisCity_House6/events.inc" + .include "data/maps/SootopolisCity_House7/events.inc" + .include "data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc" + .include "data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc" + .include "data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc" + .include "data/maps/EverGrandeCity_SidneysRoom/events.inc" + .include "data/maps/EverGrandeCity_PhoebesRoom/events.inc" + .include "data/maps/EverGrandeCity_GlaciasRoom/events.inc" + .include "data/maps/EverGrandeCity_DrakesRoom/events.inc" + .include "data/maps/EverGrandeCity_ChampionsRoom/events.inc" + .include "data/maps/EverGrandeCity_Hall1/events.inc" + .include "data/maps/EverGrandeCity_Hall2/events.inc" + .include "data/maps/EverGrandeCity_Hall3/events.inc" + .include "data/maps/EverGrandeCity_Hall4/events.inc" + .include "data/maps/EverGrandeCity_Hall5/events.inc" + .include "data/maps/EverGrandeCity_PokemonLeague_1F/events.inc" + .include "data/maps/EverGrandeCity_HallOfFame/events.inc" + .include "data/maps/EverGrandeCity_PokemonCenter_1F/events.inc" + .include "data/maps/EverGrandeCity_PokemonCenter_2F/events.inc" + .include "data/maps/EverGrandeCity_PokemonLeague_2F/events.inc" + .include "data/maps/Route104_MrBrineysHouse/events.inc" + .include "data/maps/Route104_PrettyPetalFlowerShop/events.inc" + .include "data/maps/Route111_WinstrateFamilysHouse/events.inc" + .include "data/maps/Route111_OldLadysRestStop/events.inc" + .include "data/maps/Route112_CableCarStation/events.inc" + .include "data/maps/MtChimney_CableCarStation/events.inc" + .include "data/maps/Route114_FossilManiacsHouse/events.inc" + .include "data/maps/Route114_FossilManiacsTunnel/events.inc" + .include "data/maps/Route114_LanettesHouse/events.inc" + .include "data/maps/Route116_TunnelersRestHouse/events.inc" + .include "data/maps/Route117_PokemonDayCare/events.inc" + .include "data/maps/Route121_SafariZoneEntrance/events.inc" + .include "data/maps/MeteorFalls_1F_1R/events.inc" + .include "data/maps/MeteorFalls_1F_2R/events.inc" + .include "data/maps/MeteorFalls_B1F_1R/events.inc" + .include "data/maps/MeteorFalls_B1F_2R/events.inc" + .include "data/maps/RusturfTunnel/events.inc" + .include "data/maps/Underwater_SootopolisCity/events.inc" + .include "data/maps/DesertRuins/events.inc" + .include "data/maps/GraniteCave_1F/events.inc" + .include "data/maps/GraniteCave_B1F/events.inc" + .include "data/maps/GraniteCave_B2F/events.inc" + .include "data/maps/GraniteCave_StevensRoom/events.inc" + .include "data/maps/PetalburgWoods/events.inc" + .include "data/maps/MtChimney/events.inc" + .include "data/maps/JaggedPass/events.inc" + .include "data/maps/FieryPath/events.inc" + .include "data/maps/MtPyre_1F/events.inc" + .include "data/maps/MtPyre_2F/events.inc" + .include "data/maps/MtPyre_3F/events.inc" + .include "data/maps/MtPyre_4F/events.inc" + .include "data/maps/MtPyre_5F/events.inc" + .include "data/maps/MtPyre_6F/events.inc" + .include "data/maps/MtPyre_Exterior/events.inc" + .include "data/maps/MtPyre_Summit/events.inc" + .include "data/maps/AquaHideout_1F/events.inc" + .include "data/maps/AquaHideout_B1F/events.inc" + .include "data/maps/AquaHideout_B2F/events.inc" + .include "data/maps/Underwater_SeafloorCavern/events.inc" + .include "data/maps/SeafloorCavern_Entrance/events.inc" + .include "data/maps/SeafloorCavern_Room1/events.inc" + .include "data/maps/SeafloorCavern_Room2/events.inc" + .include "data/maps/SeafloorCavern_Room3/events.inc" + .include "data/maps/SeafloorCavern_Room4/events.inc" + .include "data/maps/SeafloorCavern_Room5/events.inc" + .include "data/maps/SeafloorCavern_Room6/events.inc" + .include "data/maps/SeafloorCavern_Room7/events.inc" + .include "data/maps/SeafloorCavern_Room8/events.inc" + .include "data/maps/SeafloorCavern_Room9/events.inc" + .include "data/maps/CaveOfOrigin_Entrance/events.inc" + .include "data/maps/CaveOfOrigin_1F/events.inc" + .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc" + .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc" + .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc" + .include "data/maps/CaveOfOrigin_B1F/events.inc" + .include "data/maps/VictoryRoad_1F/events.inc" + .include "data/maps/VictoryRoad_B1F/events.inc" + .include "data/maps/VictoryRoad_B2F/events.inc" + .include "data/maps/ShoalCave_LowTideEntranceRoom/events.inc" + .include "data/maps/ShoalCave_LowTideInnerRoom/events.inc" + .include "data/maps/ShoalCave_LowTideStairsRoom/events.inc" + .include "data/maps/ShoalCave_LowTideLowerRoom/events.inc" + .include "data/maps/ShoalCave_HighTideEntranceRoom/events.inc" + .include "data/maps/ShoalCave_HighTideInnerRoom/events.inc" + .include "data/maps/NewMauville_Entrance/events.inc" + .include "data/maps/NewMauville_Inside/events.inc" + .include "data/maps/AbandonedShip_Deck/events.inc" + .include "data/maps/AbandonedShip_Corridors_1F/events.inc" + .include "data/maps/AbandonedShip_Rooms_1F/events.inc" + .include "data/maps/AbandonedShip_Corridors_B1F/events.inc" + .include "data/maps/AbandonedShip_Rooms_B1F/events.inc" + .include "data/maps/AbandonedShip_Rooms2_B1F/events.inc" + .include "data/maps/AbandonedShip_Underwater1/events.inc" + .include "data/maps/AbandonedShip_Room_B1F/events.inc" + .include "data/maps/AbandonedShip_Rooms2_1F/events.inc" + .include "data/maps/AbandonedShip_CaptainsOffice/events.inc" + .include "data/maps/AbandonedShip_Underwater2/events.inc" + .include "data/maps/AbandonedShip_HiddenFloorCorridors/events.inc" + .include "data/maps/AbandonedShip_HiddenFloorRooms/events.inc" + .include "data/maps/IslandCave/events.inc" + .include "data/maps/AncientTomb/events.inc" + .include "data/maps/Underwater_Route134/events.inc" + .include "data/maps/Underwater_SealedChamber/events.inc" + .include "data/maps/SealedChamber_OuterRoom/events.inc" + .include "data/maps/SealedChamber_InnerRoom/events.inc" + .include "data/maps/ScorchedSlab/events.inc" + .include "data/maps/AquaHideout_UnusedRubyMap1/events.inc" + .include "data/maps/AquaHideout_UnusedRubyMap2/events.inc" + .include "data/maps/AquaHideout_UnusedRubyMap3/events.inc" + .include "data/maps/SkyPillar_Entrance/events.inc" + .include "data/maps/SkyPillar_Outside/events.inc" + .include "data/maps/SkyPillar_1F/events.inc" + .include "data/maps/SkyPillar_2F/events.inc" + .include "data/maps/SkyPillar_3F/events.inc" + .include "data/maps/SkyPillar_4F/events.inc" + .include "data/maps/ShoalCave_LowTideIceRoom/events.inc" + .include "data/maps/SkyPillar_5F/events.inc" + .include "data/maps/SkyPillar_Top/events.inc" + .include "data/maps/MagmaHideout_1F/events.inc" + .include "data/maps/MagmaHideout_2F_1R/events.inc" + .include "data/maps/MagmaHideout_2F_2R/events.inc" + .include "data/maps/MagmaHideout_3F_1R/events.inc" + .include "data/maps/MagmaHideout_3F_2R/events.inc" + .include "data/maps/MagmaHideout_4F/events.inc" + .include "data/maps/MagmaHideout_3F_3R/events.inc" + .include "data/maps/MagmaHideout_2F_3R/events.inc" + .include "data/maps/MirageTower_1F/events.inc" + .include "data/maps/MirageTower_2F/events.inc" + .include "data/maps/MirageTower_3F/events.inc" + .include "data/maps/MirageTower_4F/events.inc" + .include "data/maps/DesertUnderpass/events.inc" + .include "data/maps/ArtisanCave_B1F/events.inc" + .include "data/maps/ArtisanCave_1F/events.inc" + .include "data/maps/Underwater_MarineCave/events.inc" + .include "data/maps/MarineCave_Entrance/events.inc" + .include "data/maps/MarineCave_End/events.inc" + .include "data/maps/TerraCave_Entrance/events.inc" + .include "data/maps/TerraCave_End/events.inc" + .include "data/maps/AlteringCave/events.inc" + .include "data/maps/MeteorFalls_StevensCave/events.inc" + .include "data/maps/SecretBase_RedCave1/events.inc" + .include "data/maps/SecretBase_BrownCave1/events.inc" + .include "data/maps/SecretBase_BlueCave1/events.inc" + .include "data/maps/SecretBase_YellowCave1/events.inc" + .include "data/maps/SecretBase_Tree1/events.inc" + .include "data/maps/SecretBase_Shrub1/events.inc" + .include "data/maps/SecretBase_RedCave2/events.inc" + .include "data/maps/SecretBase_BrownCave2/events.inc" + .include "data/maps/SecretBase_BlueCave2/events.inc" + .include "data/maps/SecretBase_YellowCave2/events.inc" + .include "data/maps/SecretBase_Tree2/events.inc" + .include "data/maps/SecretBase_Shrub2/events.inc" + .include "data/maps/SecretBase_RedCave3/events.inc" + .include "data/maps/SecretBase_BrownCave3/events.inc" + .include "data/maps/SecretBase_BlueCave3/events.inc" + .include "data/maps/SecretBase_YellowCave3/events.inc" + .include "data/maps/SecretBase_Tree3/events.inc" + .include "data/maps/SecretBase_Shrub3/events.inc" + .include "data/maps/SecretBase_RedCave4/events.inc" + .include "data/maps/SecretBase_BrownCave4/events.inc" + .include "data/maps/SecretBase_BlueCave4/events.inc" + .include "data/maps/SecretBase_YellowCave4/events.inc" + .include "data/maps/SecretBase_Tree4/events.inc" + .include "data/maps/SecretBase_Shrub4/events.inc" + .include "data/maps/SingleBattleColosseum/events.inc" + .include "data/maps/TradeCenter/events.inc" + .include "data/maps/RecordCorner/events.inc" + .include "data/maps/DoubleBattleColosseum/events.inc" + .include "data/maps/LinkContestRoom1/events.inc" + .include "data/maps/LinkContestRoom2/events.inc" + .include "data/maps/LinkContestRoom3/events.inc" + .include "data/maps/LinkContestRoom4/events.inc" + .include "data/maps/LinkContestRoom5/events.inc" + .include "data/maps/LinkContestRoom6/events.inc" + .include "data/maps/UnknownMap_25_29/events.inc" + .include "data/maps/UnknownMap_25_30/events.inc" + .include "data/maps/UnknownMap_25_31/events.inc" + .include "data/maps/UnknownMap_25_32/events.inc" + .include "data/maps/UnknownMap_25_33/events.inc" + .include "data/maps/UnknownMap_25_34/events.inc" + .include "data/maps/InsideOfTruck/events.inc" + .include "data/maps/SSTidalCorridor/events.inc" + .include "data/maps/SSTidalLowerDeck/events.inc" + .include "data/maps/SSTidalRooms/events.inc" + .include "data/maps/BattlePyramidSquare01/events.inc" + .include "data/maps/BattlePyramidSquare02/events.inc" + .include "data/maps/BattlePyramidSquare03/events.inc" + .include "data/maps/BattlePyramidSquare04/events.inc" + .include "data/maps/BattlePyramidSquare05/events.inc" + .include "data/maps/BattlePyramidSquare06/events.inc" + .include "data/maps/BattlePyramidSquare07/events.inc" + .include "data/maps/BattlePyramidSquare08/events.inc" + .include "data/maps/BattlePyramidSquare09/events.inc" + .include "data/maps/BattlePyramidSquare10/events.inc" + .include "data/maps/BattlePyramidSquare11/events.inc" + .include "data/maps/BattlePyramidSquare12/events.inc" + .include "data/maps/BattlePyramidSquare13/events.inc" + .include "data/maps/BattlePyramidSquare14/events.inc" + .include "data/maps/BattlePyramidSquare15/events.inc" + .include "data/maps/BattlePyramidSquare16/events.inc" + .include "data/maps/UnionRoom/events.inc" + .include "data/maps/SafariZone_Northwest/events.inc" + .include "data/maps/SafariZone_North/events.inc" + .include "data/maps/SafariZone_Southwest/events.inc" + .include "data/maps/SafariZone_South/events.inc" + .include "data/maps/BattleFrontier_OutsideWest/events.inc" + .include "data/maps/BattleFrontier_BattleTowerLobby/events.inc" + .include "data/maps/BattleFrontier_BattleTowerElevator/events.inc" + .include "data/maps/BattleFrontier_BattleTowerCorridor/events.inc" + .include "data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc" + .include "data/maps/SouthernIsland_Exterior/events.inc" + .include "data/maps/SouthernIsland_Interior/events.inc" + .include "data/maps/SafariZone_RestHouse/events.inc" + .include "data/maps/SafariZone_Northeast/events.inc" + .include "data/maps/SafariZone_Southeast/events.inc" + .include "data/maps/BattleFrontier_OutsideEast/events.inc" + .include "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc" + .include "data/maps/BattleFrontier_BattleTowerCorridor2/events.inc" + .include "data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc" + .include "data/maps/BattleFrontier_BattleDomeLobby/events.inc" + .include "data/maps/BattleFrontier_BattleDomeCorridor/events.inc" + .include "data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc" + .include "data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc" + .include "data/maps/BattleFrontier_BattlePalaceLobby/events.inc" + .include "data/maps/BattleFrontier_BattlePalaceCorridor/events.inc" + .include "data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc" + .include "data/maps/BattleFrontier_BattlePyramidLobby/events.inc" + .include "data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc" + .include "data/maps/BattleFrontier_BattlePyramidTop/events.inc" + .include "data/maps/BattleFrontier_BattleArenaLobby/events.inc" + .include "data/maps/BattleFrontier_BattleArenaCorridor/events.inc" + .include "data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc" + .include "data/maps/BattleFrontier_BattleFactoryLobby/events.inc" + .include "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc" + .include "data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc" + .include "data/maps/BattleFrontier_BattlePikeLobby/events.inc" + .include "data/maps/BattleFrontier_BattlePikeCorridor/events.inc" + .include "data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc" + .include "data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc" + .include "data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc" + .include "data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc" + .include "data/maps/BattleFrontier_RankingHall/events.inc" + .include "data/maps/BattleFrontier_Lounge1/events.inc" + .include "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc" + .include "data/maps/BattleFrontier_Lounge2/events.inc" + .include "data/maps/BattleFrontier_Lounge3/events.inc" + .include "data/maps/BattleFrontier_Lounge4/events.inc" + .include "data/maps/BattleFrontier_ScottsHouse/events.inc" + .include "data/maps/BattleFrontier_Lounge5/events.inc" + .include "data/maps/BattleFrontier_Lounge6/events.inc" + .include "data/maps/BattleFrontier_Lounge7/events.inc" + .include "data/maps/BattleFrontier_ReceptionGate/events.inc" + .include "data/maps/BattleFrontier_Lounge8/events.inc" + .include "data/maps/BattleFrontier_Lounge9/events.inc" + .include "data/maps/BattleFrontier_PokemonCenter_1F/events.inc" + .include "data/maps/BattleFrontier_PokemonCenter_2F/events.inc" + .include "data/maps/BattleFrontier_Mart/events.inc" + .include "data/maps/FarawayIsland_Entrance/events.inc" + .include "data/maps/FarawayIsland_Interior/events.inc" + .include "data/maps/BirthIsland_Exterior/events.inc" + .include "data/maps/BirthIsland_Harbor/events.inc" + .include "data/maps/TrainerHill_Entrance/events.inc" + .include "data/maps/TrainerHill_1F/events.inc" + .include "data/maps/TrainerHill_2F/events.inc" + .include "data/maps/TrainerHill_3F/events.inc" + .include "data/maps/TrainerHill_4F/events.inc" + .include "data/maps/TrainerHill_Roof/events.inc" + .include "data/maps/NavelRock_Exterior/events.inc" + .include "data/maps/NavelRock_Harbor/events.inc" + .include "data/maps/NavelRock_Entrance/events.inc" + .include "data/maps/NavelRock_B1F/events.inc" + .include "data/maps/NavelRock_Fork/events.inc" + .include "data/maps/NavelRock_Up1/events.inc" + .include "data/maps/NavelRock_Up2/events.inc" + .include "data/maps/NavelRock_Up3/events.inc" + .include "data/maps/NavelRock_Up4/events.inc" + .include "data/maps/NavelRock_Top/events.inc" + .include "data/maps/NavelRock_Down01/events.inc" + .include "data/maps/NavelRock_Down02/events.inc" + .include "data/maps/NavelRock_Down03/events.inc" + .include "data/maps/NavelRock_Down04/events.inc" + .include "data/maps/NavelRock_Down05/events.inc" + .include "data/maps/NavelRock_Down06/events.inc" + .include "data/maps/NavelRock_Down07/events.inc" + .include "data/maps/NavelRock_Down08/events.inc" + .include "data/maps/NavelRock_Down09/events.inc" + .include "data/maps/NavelRock_Down10/events.inc" + .include "data/maps/NavelRock_Down11/events.inc" + .include "data/maps/NavelRock_Bottom/events.inc" + .include "data/maps/TrainerHill_Elevator/events.inc" + .include "data/maps/Route104_Prototype/events.inc" + .include "data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc" + .include "data/maps/Route109_SeashoreHouse/events.inc" + .include "data/maps/Route110_TrickHouseEntrance/events.inc" + .include "data/maps/Route110_TrickHouseEnd/events.inc" + .include "data/maps/Route110_TrickHouseCorridor/events.inc" + .include "data/maps/Route110_TrickHousePuzzle1/events.inc" + .include "data/maps/Route110_TrickHousePuzzle2/events.inc" + .include "data/maps/Route110_TrickHousePuzzle3/events.inc" + .include "data/maps/Route110_TrickHousePuzzle4/events.inc" + .include "data/maps/Route110_TrickHousePuzzle5/events.inc" + .include "data/maps/Route110_TrickHousePuzzle6/events.inc" + .include "data/maps/Route110_TrickHousePuzzle7/events.inc" + .include "data/maps/Route110_TrickHousePuzzle8/events.inc" + .include "data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc" + .include "data/maps/Route110_SeasideCyclingRoadEntrance2/events.inc" + .include "data/maps/Route113_GlassWorkshop/events.inc" + .include "data/maps/Route123_BerryMastersHouse/events.inc" + .include "data/maps/Route119_WeatherInstitute_1F/events.inc" + .include "data/maps/Route119_WeatherInstitute_2F/events.inc" + .include "data/maps/Route119_House/events.inc" + .include "data/maps/Route124_DivingTreasureHuntersHouse/events.inc" diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.inc b/data/maps/AbandonedShip_CaptainsOffice/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_CaptainsOffice.inc rename to data/maps/AbandonedShip_CaptainsOffice/events.inc diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_CaptainsOffice.inc rename to data/maps/AbandonedShip_CaptainsOffice/scripts.inc diff --git a/data/maps/events/AbandonedShip_Corridors_1F.inc b/data/maps/AbandonedShip_Corridors_1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Corridors_1F.inc rename to data/maps/AbandonedShip_Corridors_1F/events.inc diff --git a/data/scripts/maps/AbandonedShip_Corridors_1F.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Corridors_1F.inc rename to data/maps/AbandonedShip_Corridors_1F/scripts.inc diff --git a/data/maps/events/AbandonedShip_Corridors_B1F.inc b/data/maps/AbandonedShip_Corridors_B1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Corridors_B1F.inc rename to data/maps/AbandonedShip_Corridors_B1F/events.inc diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Corridors_B1F.inc rename to data/maps/AbandonedShip_Corridors_B1F/scripts.inc diff --git a/data/maps/events/AbandonedShip_Deck.inc b/data/maps/AbandonedShip_Deck/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Deck.inc rename to data/maps/AbandonedShip_Deck/events.inc diff --git a/data/scripts/maps/AbandonedShip_Deck.inc b/data/maps/AbandonedShip_Deck/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Deck.inc rename to data/maps/AbandonedShip_Deck/scripts.inc diff --git a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_HiddenFloorCorridors.inc rename to data/maps/AbandonedShip_HiddenFloorCorridors/events.inc diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc rename to data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_HiddenFloorRooms.inc rename to data/maps/AbandonedShip_HiddenFloorRooms/events.inc diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc rename to data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc diff --git a/data/maps/events/AbandonedShip_Room_B1F.inc b/data/maps/AbandonedShip_Room_B1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Room_B1F.inc rename to data/maps/AbandonedShip_Room_B1F/events.inc diff --git a/data/scripts/maps/AbandonedShip_Room_B1F.inc b/data/maps/AbandonedShip_Room_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Room_B1F.inc rename to data/maps/AbandonedShip_Room_B1F/scripts.inc diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.inc b/data/maps/AbandonedShip_Rooms2_1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Rooms2_1F.inc rename to data/maps/AbandonedShip_Rooms2_1F/events.inc diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Rooms2_1F.inc rename to data/maps/AbandonedShip_Rooms2_1F/scripts.inc diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.inc b/data/maps/AbandonedShip_Rooms2_B1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Rooms2_B1F.inc rename to data/maps/AbandonedShip_Rooms2_B1F/events.inc diff --git a/data/scripts/maps/AbandonedShip_Rooms2_B1F.inc b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Rooms2_B1F.inc rename to data/maps/AbandonedShip_Rooms2_B1F/scripts.inc diff --git a/data/maps/events/AbandonedShip_Rooms_1F.inc b/data/maps/AbandonedShip_Rooms_1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Rooms_1F.inc rename to data/maps/AbandonedShip_Rooms_1F/events.inc diff --git a/data/scripts/maps/AbandonedShip_Rooms_1F.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Rooms_1F.inc rename to data/maps/AbandonedShip_Rooms_1F/scripts.inc diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.inc b/data/maps/AbandonedShip_Rooms_B1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Rooms_B1F.inc rename to data/maps/AbandonedShip_Rooms_B1F/events.inc diff --git a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Rooms_B1F.inc rename to data/maps/AbandonedShip_Rooms_B1F/scripts.inc diff --git a/data/maps/events/AbandonedShip_Underwater1.inc b/data/maps/AbandonedShip_Underwater1/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Underwater1.inc rename to data/maps/AbandonedShip_Underwater1/events.inc diff --git a/data/scripts/maps/AbandonedShip_Underwater1.inc b/data/maps/AbandonedShip_Underwater1/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Underwater1.inc rename to data/maps/AbandonedShip_Underwater1/scripts.inc diff --git a/data/maps/events/AbandonedShip_Underwater2.inc b/data/maps/AbandonedShip_Underwater2/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Underwater2.inc rename to data/maps/AbandonedShip_Underwater2/events.inc diff --git a/data/scripts/maps/AbandonedShip_Underwater2.inc b/data/maps/AbandonedShip_Underwater2/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Underwater2.inc rename to data/maps/AbandonedShip_Underwater2/scripts.inc diff --git a/data/maps/events/AlteringCave.inc b/data/maps/AlteringCave/events.inc similarity index 100% rename from data/maps/events/AlteringCave.inc rename to data/maps/AlteringCave/events.inc diff --git a/data/scripts/maps/AlteringCave.inc b/data/maps/AlteringCave/scripts.inc similarity index 100% rename from data/scripts/maps/AlteringCave.inc rename to data/maps/AlteringCave/scripts.inc diff --git a/data/maps/events/AncientTomb.inc b/data/maps/AncientTomb/events.inc similarity index 100% rename from data/maps/events/AncientTomb.inc rename to data/maps/AncientTomb/events.inc diff --git a/data/scripts/maps/AncientTomb.inc b/data/maps/AncientTomb/scripts.inc similarity index 100% rename from data/scripts/maps/AncientTomb.inc rename to data/maps/AncientTomb/scripts.inc diff --git a/data/maps/events/AquaHideout_1F.inc b/data/maps/AquaHideout_1F/events.inc similarity index 100% rename from data/maps/events/AquaHideout_1F.inc rename to data/maps/AquaHideout_1F/events.inc diff --git a/data/scripts/maps/AquaHideout_1F.inc b/data/maps/AquaHideout_1F/scripts.inc similarity index 100% rename from data/scripts/maps/AquaHideout_1F.inc rename to data/maps/AquaHideout_1F/scripts.inc diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/AquaHideout_B1F/events.inc similarity index 100% rename from data/maps/events/AquaHideout_B1F.inc rename to data/maps/AquaHideout_B1F/events.inc diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/maps/AquaHideout_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/AquaHideout_B1F.inc rename to data/maps/AquaHideout_B1F/scripts.inc diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/AquaHideout_B2F/events.inc similarity index 100% rename from data/maps/events/AquaHideout_B2F.inc rename to data/maps/AquaHideout_B2F/events.inc diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/maps/AquaHideout_B2F/scripts.inc similarity index 100% rename from data/scripts/maps/AquaHideout_B2F.inc rename to data/maps/AquaHideout_B2F/scripts.inc diff --git a/data/maps/events/AquaHideout_UnusedRubyMap1.inc b/data/maps/AquaHideout_UnusedRubyMap1/events.inc similarity index 100% rename from data/maps/events/AquaHideout_UnusedRubyMap1.inc rename to data/maps/AquaHideout_UnusedRubyMap1/events.inc diff --git a/data/scripts/maps/AquaHideout_UnusedRubyMap1.inc b/data/maps/AquaHideout_UnusedRubyMap1/scripts.inc similarity index 100% rename from data/scripts/maps/AquaHideout_UnusedRubyMap1.inc rename to data/maps/AquaHideout_UnusedRubyMap1/scripts.inc diff --git a/data/maps/events/AquaHideout_UnusedRubyMap2.inc b/data/maps/AquaHideout_UnusedRubyMap2/events.inc similarity index 100% rename from data/maps/events/AquaHideout_UnusedRubyMap2.inc rename to data/maps/AquaHideout_UnusedRubyMap2/events.inc diff --git a/data/scripts/maps/AquaHideout_UnusedRubyMap2.inc b/data/maps/AquaHideout_UnusedRubyMap2/scripts.inc similarity index 100% rename from data/scripts/maps/AquaHideout_UnusedRubyMap2.inc rename to data/maps/AquaHideout_UnusedRubyMap2/scripts.inc diff --git a/data/maps/events/AquaHideout_UnusedRubyMap3.inc b/data/maps/AquaHideout_UnusedRubyMap3/events.inc similarity index 100% rename from data/maps/events/AquaHideout_UnusedRubyMap3.inc rename to data/maps/AquaHideout_UnusedRubyMap3/events.inc diff --git a/data/scripts/maps/AquaHideout_UnusedRubyMap3.inc b/data/maps/AquaHideout_UnusedRubyMap3/scripts.inc similarity index 100% rename from data/scripts/maps/AquaHideout_UnusedRubyMap3.inc rename to data/maps/AquaHideout_UnusedRubyMap3/scripts.inc diff --git a/data/maps/events/ArtisanCave_1F.inc b/data/maps/ArtisanCave_1F/events.inc similarity index 100% rename from data/maps/events/ArtisanCave_1F.inc rename to data/maps/ArtisanCave_1F/events.inc diff --git a/data/scripts/maps/ArtisanCave_1F.inc b/data/maps/ArtisanCave_1F/scripts.inc similarity index 100% rename from data/scripts/maps/ArtisanCave_1F.inc rename to data/maps/ArtisanCave_1F/scripts.inc diff --git a/data/maps/events/ArtisanCave_B1F.inc b/data/maps/ArtisanCave_B1F/events.inc similarity index 100% rename from data/maps/events/ArtisanCave_B1F.inc rename to data/maps/ArtisanCave_B1F/events.inc diff --git a/data/scripts/maps/ArtisanCave_B1F.inc b/data/maps/ArtisanCave_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/ArtisanCave_B1F.inc rename to data/maps/ArtisanCave_B1F/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc rename to data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc rename to data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleArenaCorridor.inc b/data/maps/BattleFrontier_BattleArenaCorridor/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleArenaCorridor.inc rename to data/maps/BattleFrontier_BattleArenaCorridor/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc rename to data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleArenaLobby.inc b/data/maps/BattleFrontier_BattleArenaLobby/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleArenaLobby.inc rename to data/maps/BattleFrontier_BattleArenaLobby/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleArenaLobby.inc rename to data/maps/BattleFrontier_BattleArenaLobby/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc rename to data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc rename to data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleDomeCorridor.inc b/data/maps/BattleFrontier_BattleDomeCorridor/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleDomeCorridor.inc rename to data/maps/BattleFrontier_BattleDomeCorridor/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc rename to data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleDomeLobby.inc b/data/maps/BattleFrontier_BattleDomeLobby/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleDomeLobby.inc rename to data/maps/BattleFrontier_BattleDomeLobby/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleDomeLobby.inc rename to data/maps/BattleFrontier_BattleDomeLobby/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc rename to data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc rename to data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc rename to data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc rename to data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleFactoryLobby.inc b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleFactoryLobby.inc rename to data/maps/BattleFrontier_BattleFactoryLobby/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc rename to data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc rename to data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc rename to data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc rename to data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc rename to data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePalaceCorridor.inc rename to data/maps/BattleFrontier_BattlePalaceCorridor/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc rename to data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePalaceLobby.inc b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePalaceLobby.inc rename to data/maps/BattleFrontier_BattlePalaceLobby/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc rename to data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePikeCorridor.inc b/data/maps/BattleFrontier_BattlePikeCorridor/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePikeCorridor.inc rename to data/maps/BattleFrontier_BattlePikeCorridor/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc rename to data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePikeLobby.inc b/data/maps/BattleFrontier_BattlePikeLobby/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePikeLobby.inc rename to data/maps/BattleFrontier_BattlePikeLobby/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePikeLobby.inc rename to data/maps/BattleFrontier_BattlePikeLobby/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc rename to data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc rename to data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc rename to data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc rename to data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc rename to data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc rename to data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc rename to data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc rename to data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc rename to data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc rename to data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc rename to data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc rename to data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePyramidLobby.inc b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePyramidLobby.inc rename to data/maps/BattleFrontier_BattlePyramidLobby/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc rename to data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePyramidTop.inc b/data/maps/BattleFrontier_BattlePyramidTop/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePyramidTop.inc rename to data/maps/BattleFrontier_BattlePyramidTop/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePyramidTop.inc rename to data/maps/BattleFrontier_BattlePyramidTop/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc rename to data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc rename to data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc rename to data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc rename to data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleTowerCorridor.inc b/data/maps/BattleFrontier_BattleTowerCorridor/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleTowerCorridor.inc rename to data/maps/BattleFrontier_BattleTowerCorridor/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc rename to data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleTowerCorridor2.inc rename to data/maps/BattleFrontier_BattleTowerCorridor2/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc rename to data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleTowerElevator.inc b/data/maps/BattleFrontier_BattleTowerElevator/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleTowerElevator.inc rename to data/maps/BattleFrontier_BattleTowerElevator/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleTowerElevator.inc rename to data/maps/BattleFrontier_BattleTowerElevator/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleTowerLobby.inc b/data/maps/BattleFrontier_BattleTowerLobby/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleTowerLobby.inc rename to data/maps/BattleFrontier_BattleTowerLobby/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleTowerLobby.inc rename to data/maps/BattleFrontier_BattleTowerLobby/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc rename to data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc rename to data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc diff --git a/data/maps/events/BattleFrontier_Lounge1.inc b/data/maps/BattleFrontier_Lounge1/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Lounge1.inc rename to data/maps/BattleFrontier_Lounge1/events.inc diff --git a/data/scripts/maps/BattleFrontier_Lounge1.inc b/data/maps/BattleFrontier_Lounge1/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Lounge1.inc rename to data/maps/BattleFrontier_Lounge1/scripts.inc diff --git a/data/maps/events/BattleFrontier_Lounge2.inc b/data/maps/BattleFrontier_Lounge2/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Lounge2.inc rename to data/maps/BattleFrontier_Lounge2/events.inc diff --git a/data/scripts/maps/BattleFrontier_Lounge2.inc b/data/maps/BattleFrontier_Lounge2/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Lounge2.inc rename to data/maps/BattleFrontier_Lounge2/scripts.inc diff --git a/data/maps/events/BattleFrontier_Lounge3.inc b/data/maps/BattleFrontier_Lounge3/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Lounge3.inc rename to data/maps/BattleFrontier_Lounge3/events.inc diff --git a/data/scripts/maps/BattleFrontier_Lounge3.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Lounge3.inc rename to data/maps/BattleFrontier_Lounge3/scripts.inc diff --git a/data/maps/events/BattleFrontier_Lounge4.inc b/data/maps/BattleFrontier_Lounge4/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Lounge4.inc rename to data/maps/BattleFrontier_Lounge4/events.inc diff --git a/data/scripts/maps/BattleFrontier_Lounge4.inc b/data/maps/BattleFrontier_Lounge4/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Lounge4.inc rename to data/maps/BattleFrontier_Lounge4/scripts.inc diff --git a/data/maps/events/BattleFrontier_Lounge5.inc b/data/maps/BattleFrontier_Lounge5/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Lounge5.inc rename to data/maps/BattleFrontier_Lounge5/events.inc diff --git a/data/scripts/maps/BattleFrontier_Lounge5.inc b/data/maps/BattleFrontier_Lounge5/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Lounge5.inc rename to data/maps/BattleFrontier_Lounge5/scripts.inc diff --git a/data/maps/events/BattleFrontier_Lounge6.inc b/data/maps/BattleFrontier_Lounge6/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Lounge6.inc rename to data/maps/BattleFrontier_Lounge6/events.inc diff --git a/data/scripts/maps/BattleFrontier_Lounge6.inc b/data/maps/BattleFrontier_Lounge6/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Lounge6.inc rename to data/maps/BattleFrontier_Lounge6/scripts.inc diff --git a/data/maps/events/BattleFrontier_Lounge7.inc b/data/maps/BattleFrontier_Lounge7/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Lounge7.inc rename to data/maps/BattleFrontier_Lounge7/events.inc diff --git a/data/scripts/maps/BattleFrontier_Lounge7.inc b/data/maps/BattleFrontier_Lounge7/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Lounge7.inc rename to data/maps/BattleFrontier_Lounge7/scripts.inc diff --git a/data/maps/events/BattleFrontier_Lounge8.inc b/data/maps/BattleFrontier_Lounge8/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Lounge8.inc rename to data/maps/BattleFrontier_Lounge8/events.inc diff --git a/data/scripts/maps/BattleFrontier_Lounge8.inc b/data/maps/BattleFrontier_Lounge8/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Lounge8.inc rename to data/maps/BattleFrontier_Lounge8/scripts.inc diff --git a/data/maps/events/BattleFrontier_Lounge9.inc b/data/maps/BattleFrontier_Lounge9/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Lounge9.inc rename to data/maps/BattleFrontier_Lounge9/events.inc diff --git a/data/scripts/maps/BattleFrontier_Lounge9.inc b/data/maps/BattleFrontier_Lounge9/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Lounge9.inc rename to data/maps/BattleFrontier_Lounge9/scripts.inc diff --git a/data/maps/events/BattleFrontier_Mart.inc b/data/maps/BattleFrontier_Mart/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Mart.inc rename to data/maps/BattleFrontier_Mart/events.inc diff --git a/data/scripts/maps/BattleFrontier_Mart.inc b/data/maps/BattleFrontier_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Mart.inc rename to data/maps/BattleFrontier_Mart/scripts.inc diff --git a/data/maps/events/BattleFrontier_OutsideEast.inc b/data/maps/BattleFrontier_OutsideEast/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_OutsideEast.inc rename to data/maps/BattleFrontier_OutsideEast/events.inc diff --git a/data/scripts/maps/BattleFrontier_OutsideEast.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_OutsideEast.inc rename to data/maps/BattleFrontier_OutsideEast/scripts.inc diff --git a/data/maps/events/BattleFrontier_OutsideWest.inc b/data/maps/BattleFrontier_OutsideWest/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_OutsideWest.inc rename to data/maps/BattleFrontier_OutsideWest/events.inc diff --git a/data/scripts/maps/BattleFrontier_OutsideWest.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_OutsideWest.inc rename to data/maps/BattleFrontier_OutsideWest/scripts.inc diff --git a/data/maps/events/BattleFrontier_PokemonCenter_1F.inc b/data/maps/BattleFrontier_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_PokemonCenter_1F.inc rename to data/maps/BattleFrontier_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/BattleFrontier_PokemonCenter_1F.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_PokemonCenter_1F.inc rename to data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/BattleFrontier_PokemonCenter_2F.inc b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_PokemonCenter_2F.inc rename to data/maps/BattleFrontier_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/BattleFrontier_PokemonCenter_2F.inc b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_PokemonCenter_2F.inc rename to data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/BattleFrontier_RankingHall.inc b/data/maps/BattleFrontier_RankingHall/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_RankingHall.inc rename to data/maps/BattleFrontier_RankingHall/events.inc diff --git a/data/scripts/maps/BattleFrontier_RankingHall.inc b/data/maps/BattleFrontier_RankingHall/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_RankingHall.inc rename to data/maps/BattleFrontier_RankingHall/scripts.inc diff --git a/data/maps/events/BattleFrontier_ReceptionGate.inc b/data/maps/BattleFrontier_ReceptionGate/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_ReceptionGate.inc rename to data/maps/BattleFrontier_ReceptionGate/events.inc diff --git a/data/scripts/maps/BattleFrontier_ReceptionGate.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_ReceptionGate.inc rename to data/maps/BattleFrontier_ReceptionGate/scripts.inc diff --git a/data/maps/events/BattleFrontier_ScottsHouse.inc b/data/maps/BattleFrontier_ScottsHouse/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_ScottsHouse.inc rename to data/maps/BattleFrontier_ScottsHouse/events.inc diff --git a/data/scripts/maps/BattleFrontier_ScottsHouse.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_ScottsHouse.inc rename to data/maps/BattleFrontier_ScottsHouse/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare01.inc b/data/maps/BattlePyramidSquare01/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare01.inc rename to data/maps/BattlePyramidSquare01/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare01.inc b/data/maps/BattlePyramidSquare01/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare01.inc rename to data/maps/BattlePyramidSquare01/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare02.inc b/data/maps/BattlePyramidSquare02/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare02.inc rename to data/maps/BattlePyramidSquare02/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare02.inc b/data/maps/BattlePyramidSquare02/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare02.inc rename to data/maps/BattlePyramidSquare02/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare03.inc b/data/maps/BattlePyramidSquare03/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare03.inc rename to data/maps/BattlePyramidSquare03/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare03.inc b/data/maps/BattlePyramidSquare03/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare03.inc rename to data/maps/BattlePyramidSquare03/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare04.inc b/data/maps/BattlePyramidSquare04/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare04.inc rename to data/maps/BattlePyramidSquare04/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare04.inc b/data/maps/BattlePyramidSquare04/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare04.inc rename to data/maps/BattlePyramidSquare04/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare05.inc b/data/maps/BattlePyramidSquare05/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare05.inc rename to data/maps/BattlePyramidSquare05/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare05.inc b/data/maps/BattlePyramidSquare05/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare05.inc rename to data/maps/BattlePyramidSquare05/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare06.inc b/data/maps/BattlePyramidSquare06/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare06.inc rename to data/maps/BattlePyramidSquare06/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare06.inc b/data/maps/BattlePyramidSquare06/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare06.inc rename to data/maps/BattlePyramidSquare06/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare07.inc b/data/maps/BattlePyramidSquare07/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare07.inc rename to data/maps/BattlePyramidSquare07/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare07.inc b/data/maps/BattlePyramidSquare07/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare07.inc rename to data/maps/BattlePyramidSquare07/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare08.inc b/data/maps/BattlePyramidSquare08/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare08.inc rename to data/maps/BattlePyramidSquare08/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare08.inc b/data/maps/BattlePyramidSquare08/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare08.inc rename to data/maps/BattlePyramidSquare08/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare09.inc b/data/maps/BattlePyramidSquare09/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare09.inc rename to data/maps/BattlePyramidSquare09/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare09.inc b/data/maps/BattlePyramidSquare09/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare09.inc rename to data/maps/BattlePyramidSquare09/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare10.inc b/data/maps/BattlePyramidSquare10/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare10.inc rename to data/maps/BattlePyramidSquare10/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare10.inc b/data/maps/BattlePyramidSquare10/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare10.inc rename to data/maps/BattlePyramidSquare10/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare11.inc b/data/maps/BattlePyramidSquare11/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare11.inc rename to data/maps/BattlePyramidSquare11/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare11.inc b/data/maps/BattlePyramidSquare11/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare11.inc rename to data/maps/BattlePyramidSquare11/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare12.inc b/data/maps/BattlePyramidSquare12/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare12.inc rename to data/maps/BattlePyramidSquare12/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare12.inc b/data/maps/BattlePyramidSquare12/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare12.inc rename to data/maps/BattlePyramidSquare12/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare13.inc b/data/maps/BattlePyramidSquare13/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare13.inc rename to data/maps/BattlePyramidSquare13/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare13.inc b/data/maps/BattlePyramidSquare13/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare13.inc rename to data/maps/BattlePyramidSquare13/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare14.inc b/data/maps/BattlePyramidSquare14/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare14.inc rename to data/maps/BattlePyramidSquare14/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare14.inc b/data/maps/BattlePyramidSquare14/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare14.inc rename to data/maps/BattlePyramidSquare14/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare15.inc b/data/maps/BattlePyramidSquare15/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare15.inc rename to data/maps/BattlePyramidSquare15/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare15.inc b/data/maps/BattlePyramidSquare15/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare15.inc rename to data/maps/BattlePyramidSquare15/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare16.inc b/data/maps/BattlePyramidSquare16/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare16.inc rename to data/maps/BattlePyramidSquare16/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare16.inc b/data/maps/BattlePyramidSquare16/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare16.inc rename to data/maps/BattlePyramidSquare16/scripts.inc diff --git a/data/maps/events/BirthIsland_Exterior.inc b/data/maps/BirthIsland_Exterior/events.inc similarity index 100% rename from data/maps/events/BirthIsland_Exterior.inc rename to data/maps/BirthIsland_Exterior/events.inc diff --git a/data/scripts/maps/BirthIsland_Exterior.inc b/data/maps/BirthIsland_Exterior/scripts.inc similarity index 100% rename from data/scripts/maps/BirthIsland_Exterior.inc rename to data/maps/BirthIsland_Exterior/scripts.inc diff --git a/data/maps/events/BirthIsland_Harbor.inc b/data/maps/BirthIsland_Harbor/events.inc similarity index 100% rename from data/maps/events/BirthIsland_Harbor.inc rename to data/maps/BirthIsland_Harbor/events.inc diff --git a/data/scripts/maps/BirthIsland_Harbor.inc b/data/maps/BirthIsland_Harbor/scripts.inc similarity index 100% rename from data/scripts/maps/BirthIsland_Harbor.inc rename to data/maps/BirthIsland_Harbor/scripts.inc diff --git a/data/maps/events/CaveOfOrigin_1F.inc b/data/maps/CaveOfOrigin_1F/events.inc similarity index 100% rename from data/maps/events/CaveOfOrigin_1F.inc rename to data/maps/CaveOfOrigin_1F/events.inc diff --git a/data/scripts/maps/CaveOfOrigin_1F.inc b/data/maps/CaveOfOrigin_1F/scripts.inc similarity index 100% rename from data/scripts/maps/CaveOfOrigin_1F.inc rename to data/maps/CaveOfOrigin_1F/scripts.inc diff --git a/data/maps/events/CaveOfOrigin_B1F.inc b/data/maps/CaveOfOrigin_B1F/events.inc similarity index 100% rename from data/maps/events/CaveOfOrigin_B1F.inc rename to data/maps/CaveOfOrigin_B1F/events.inc diff --git a/data/scripts/maps/CaveOfOrigin_B1F.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/CaveOfOrigin_B1F.inc rename to data/maps/CaveOfOrigin_B1F/scripts.inc diff --git a/data/maps/events/CaveOfOrigin_Entrance.inc b/data/maps/CaveOfOrigin_Entrance/events.inc similarity index 100% rename from data/maps/events/CaveOfOrigin_Entrance.inc rename to data/maps/CaveOfOrigin_Entrance/events.inc diff --git a/data/scripts/maps/CaveOfOrigin_Entrance.inc b/data/maps/CaveOfOrigin_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/CaveOfOrigin_Entrance.inc rename to data/maps/CaveOfOrigin_Entrance/scripts.inc diff --git a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc similarity index 100% rename from data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc rename to data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc diff --git a/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap1.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc similarity index 100% rename from data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap1.inc rename to data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc diff --git a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc similarity index 100% rename from data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc rename to data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc diff --git a/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap2.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc similarity index 100% rename from data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap2.inc rename to data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc diff --git a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc similarity index 100% rename from data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc rename to data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc diff --git a/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap3.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc similarity index 100% rename from data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap3.inc rename to data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc diff --git a/data/maps/events/DesertRuins.inc b/data/maps/DesertRuins/events.inc similarity index 100% rename from data/maps/events/DesertRuins.inc rename to data/maps/DesertRuins/events.inc diff --git a/data/scripts/maps/DesertRuins.inc b/data/maps/DesertRuins/scripts.inc similarity index 100% rename from data/scripts/maps/DesertRuins.inc rename to data/maps/DesertRuins/scripts.inc diff --git a/data/maps/events/DesertUnderpass.inc b/data/maps/DesertUnderpass/events.inc similarity index 100% rename from data/maps/events/DesertUnderpass.inc rename to data/maps/DesertUnderpass/events.inc diff --git a/data/scripts/maps/DesertUnderpass.inc b/data/maps/DesertUnderpass/scripts.inc similarity index 100% rename from data/scripts/maps/DesertUnderpass.inc rename to data/maps/DesertUnderpass/scripts.inc diff --git a/data/maps/events/DewfordTown.inc b/data/maps/DewfordTown/events.inc similarity index 100% rename from data/maps/events/DewfordTown.inc rename to data/maps/DewfordTown/events.inc diff --git a/data/scripts/maps/DewfordTown.inc b/data/maps/DewfordTown/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown.inc rename to data/maps/DewfordTown/scripts.inc diff --git a/data/maps/events/DewfordTown_Gym.inc b/data/maps/DewfordTown_Gym/events.inc similarity index 100% rename from data/maps/events/DewfordTown_Gym.inc rename to data/maps/DewfordTown_Gym/events.inc diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/maps/DewfordTown_Gym/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown_Gym.inc rename to data/maps/DewfordTown_Gym/scripts.inc diff --git a/data/maps/events/DewfordTown_Hall.inc b/data/maps/DewfordTown_Hall/events.inc similarity index 100% rename from data/maps/events/DewfordTown_Hall.inc rename to data/maps/DewfordTown_Hall/events.inc diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/maps/DewfordTown_Hall/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown_Hall.inc rename to data/maps/DewfordTown_Hall/scripts.inc diff --git a/data/maps/events/DewfordTown_House1.inc b/data/maps/DewfordTown_House1/events.inc similarity index 100% rename from data/maps/events/DewfordTown_House1.inc rename to data/maps/DewfordTown_House1/events.inc diff --git a/data/scripts/maps/DewfordTown_House1.inc b/data/maps/DewfordTown_House1/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown_House1.inc rename to data/maps/DewfordTown_House1/scripts.inc diff --git a/data/maps/events/DewfordTown_House2.inc b/data/maps/DewfordTown_House2/events.inc similarity index 100% rename from data/maps/events/DewfordTown_House2.inc rename to data/maps/DewfordTown_House2/events.inc diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/maps/DewfordTown_House2/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown_House2.inc rename to data/maps/DewfordTown_House2/scripts.inc diff --git a/data/maps/events/DewfordTown_PokemonCenter_1F.inc b/data/maps/DewfordTown_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/DewfordTown_PokemonCenter_1F.inc rename to data/maps/DewfordTown_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown_PokemonCenter_1F.inc rename to data/maps/DewfordTown_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/DewfordTown_PokemonCenter_2F.inc b/data/maps/DewfordTown_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/DewfordTown_PokemonCenter_2F.inc rename to data/maps/DewfordTown_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_2F.inc b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown_PokemonCenter_2F.inc rename to data/maps/DewfordTown_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/DoubleBattleColosseum.inc b/data/maps/DoubleBattleColosseum/events.inc similarity index 100% rename from data/maps/events/DoubleBattleColosseum.inc rename to data/maps/DoubleBattleColosseum/events.inc diff --git a/data/scripts/maps/DoubleBattleColosseum.inc b/data/maps/DoubleBattleColosseum/scripts.inc similarity index 100% rename from data/scripts/maps/DoubleBattleColosseum.inc rename to data/maps/DoubleBattleColosseum/scripts.inc diff --git a/data/maps/events/EverGrandeCity.inc b/data/maps/EverGrandeCity/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity.inc rename to data/maps/EverGrandeCity/events.inc diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/maps/EverGrandeCity/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity.inc rename to data/maps/EverGrandeCity/scripts.inc diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_ChampionsRoom.inc rename to data/maps/EverGrandeCity_ChampionsRoom/events.inc diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_ChampionsRoom.inc rename to data/maps/EverGrandeCity_ChampionsRoom/scripts.inc diff --git a/data/maps/events/EverGrandeCity_DrakesRoom.inc b/data/maps/EverGrandeCity_DrakesRoom/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_DrakesRoom.inc rename to data/maps/EverGrandeCity_DrakesRoom/events.inc diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_DrakesRoom.inc rename to data/maps/EverGrandeCity_DrakesRoom/scripts.inc diff --git a/data/maps/events/EverGrandeCity_GlaciasRoom.inc b/data/maps/EverGrandeCity_GlaciasRoom/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_GlaciasRoom.inc rename to data/maps/EverGrandeCity_GlaciasRoom/events.inc diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_GlaciasRoom.inc rename to data/maps/EverGrandeCity_GlaciasRoom/scripts.inc diff --git a/data/maps/events/EverGrandeCity_Hall1.inc b/data/maps/EverGrandeCity_Hall1/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_Hall1.inc rename to data/maps/EverGrandeCity_Hall1/events.inc diff --git a/data/scripts/maps/EverGrandeCity_Hall1.inc b/data/maps/EverGrandeCity_Hall1/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_Hall1.inc rename to data/maps/EverGrandeCity_Hall1/scripts.inc diff --git a/data/maps/events/EverGrandeCity_Hall2.inc b/data/maps/EverGrandeCity_Hall2/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_Hall2.inc rename to data/maps/EverGrandeCity_Hall2/events.inc diff --git a/data/scripts/maps/EverGrandeCity_Hall2.inc b/data/maps/EverGrandeCity_Hall2/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_Hall2.inc rename to data/maps/EverGrandeCity_Hall2/scripts.inc diff --git a/data/maps/events/EverGrandeCity_Hall3.inc b/data/maps/EverGrandeCity_Hall3/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_Hall3.inc rename to data/maps/EverGrandeCity_Hall3/events.inc diff --git a/data/scripts/maps/EverGrandeCity_Hall3.inc b/data/maps/EverGrandeCity_Hall3/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_Hall3.inc rename to data/maps/EverGrandeCity_Hall3/scripts.inc diff --git a/data/maps/events/EverGrandeCity_Hall4.inc b/data/maps/EverGrandeCity_Hall4/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_Hall4.inc rename to data/maps/EverGrandeCity_Hall4/events.inc diff --git a/data/scripts/maps/EverGrandeCity_Hall4.inc b/data/maps/EverGrandeCity_Hall4/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_Hall4.inc rename to data/maps/EverGrandeCity_Hall4/scripts.inc diff --git a/data/maps/events/EverGrandeCity_Hall5.inc b/data/maps/EverGrandeCity_Hall5/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_Hall5.inc rename to data/maps/EverGrandeCity_Hall5/events.inc diff --git a/data/scripts/maps/EverGrandeCity_Hall5.inc b/data/maps/EverGrandeCity_Hall5/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_Hall5.inc rename to data/maps/EverGrandeCity_Hall5/scripts.inc diff --git a/data/maps/events/EverGrandeCity_HallOfFame.inc b/data/maps/EverGrandeCity_HallOfFame/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_HallOfFame.inc rename to data/maps/EverGrandeCity_HallOfFame/events.inc diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_HallOfFame.inc rename to data/maps/EverGrandeCity_HallOfFame/scripts.inc diff --git a/data/maps/events/EverGrandeCity_PhoebesRoom.inc b/data/maps/EverGrandeCity_PhoebesRoom/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_PhoebesRoom.inc rename to data/maps/EverGrandeCity_PhoebesRoom/events.inc diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_PhoebesRoom.inc rename to data/maps/EverGrandeCity_PhoebesRoom/scripts.inc diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_PokemonCenter_1F.inc rename to data/maps/EverGrandeCity_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc rename to data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_PokemonCenter_2F.inc rename to data/maps/EverGrandeCity_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc rename to data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_PokemonLeague_1F.inc rename to data/maps/EverGrandeCity_PokemonLeague_1F/events.inc diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc rename to data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc diff --git a/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_PokemonLeague_2F.inc rename to data/maps/EverGrandeCity_PokemonLeague_2F/events.inc diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague_2F.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_PokemonLeague_2F.inc rename to data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.inc b/data/maps/EverGrandeCity_SidneysRoom/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_SidneysRoom.inc rename to data/maps/EverGrandeCity_SidneysRoom/events.inc diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_SidneysRoom.inc rename to data/maps/EverGrandeCity_SidneysRoom/scripts.inc diff --git a/data/maps/events/FallarborTown.inc b/data/maps/FallarborTown/events.inc similarity index 100% rename from data/maps/events/FallarborTown.inc rename to data/maps/FallarborTown/events.inc diff --git a/data/scripts/maps/FallarborTown.inc b/data/maps/FallarborTown/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown.inc rename to data/maps/FallarborTown/scripts.inc diff --git a/data/maps/events/FallarborTown_BattleTentBattleRoom.inc b/data/maps/FallarborTown_BattleTentBattleRoom/events.inc similarity index 100% rename from data/maps/events/FallarborTown_BattleTentBattleRoom.inc rename to data/maps/FallarborTown_BattleTentBattleRoom/events.inc diff --git a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc rename to data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc diff --git a/data/maps/events/FallarborTown_BattleTentCorridor.inc b/data/maps/FallarborTown_BattleTentCorridor/events.inc similarity index 100% rename from data/maps/events/FallarborTown_BattleTentCorridor.inc rename to data/maps/FallarborTown_BattleTentCorridor/events.inc diff --git a/data/scripts/maps/FallarborTown_BattleTentCorridor.inc b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_BattleTentCorridor.inc rename to data/maps/FallarborTown_BattleTentCorridor/scripts.inc diff --git a/data/maps/events/FallarborTown_BattleTentLobby.inc b/data/maps/FallarborTown_BattleTentLobby/events.inc similarity index 100% rename from data/maps/events/FallarborTown_BattleTentLobby.inc rename to data/maps/FallarborTown_BattleTentLobby/events.inc diff --git a/data/scripts/maps/FallarborTown_BattleTentLobby.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_BattleTentLobby.inc rename to data/maps/FallarborTown_BattleTentLobby/scripts.inc diff --git a/data/maps/events/FallarborTown_House1.inc b/data/maps/FallarborTown_House1/events.inc similarity index 100% rename from data/maps/events/FallarborTown_House1.inc rename to data/maps/FallarborTown_House1/events.inc diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/maps/FallarborTown_House1/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_House1.inc rename to data/maps/FallarborTown_House1/scripts.inc diff --git a/data/maps/events/FallarborTown_House2.inc b/data/maps/FallarborTown_House2/events.inc similarity index 100% rename from data/maps/events/FallarborTown_House2.inc rename to data/maps/FallarborTown_House2/events.inc diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/maps/FallarborTown_House2/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_House2.inc rename to data/maps/FallarborTown_House2/scripts.inc diff --git a/data/maps/events/FallarborTown_Mart.inc b/data/maps/FallarborTown_Mart/events.inc similarity index 100% rename from data/maps/events/FallarborTown_Mart.inc rename to data/maps/FallarborTown_Mart/events.inc diff --git a/data/scripts/maps/FallarborTown_Mart.inc b/data/maps/FallarborTown_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_Mart.inc rename to data/maps/FallarborTown_Mart/scripts.inc diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/FallarborTown_PokemonCenter_1F.inc rename to data/maps/FallarborTown_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_PokemonCenter_1F.inc rename to data/maps/FallarborTown_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/FallarborTown_PokemonCenter_2F.inc b/data/maps/FallarborTown_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/FallarborTown_PokemonCenter_2F.inc rename to data/maps/FallarborTown_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_2F.inc b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_PokemonCenter_2F.inc rename to data/maps/FallarborTown_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/FarawayIsland_Entrance.inc b/data/maps/FarawayIsland_Entrance/events.inc similarity index 100% rename from data/maps/events/FarawayIsland_Entrance.inc rename to data/maps/FarawayIsland_Entrance/events.inc diff --git a/data/scripts/maps/FarawayIsland_Entrance.inc b/data/maps/FarawayIsland_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/FarawayIsland_Entrance.inc rename to data/maps/FarawayIsland_Entrance/scripts.inc diff --git a/data/maps/events/FarawayIsland_Interior.inc b/data/maps/FarawayIsland_Interior/events.inc similarity index 100% rename from data/maps/events/FarawayIsland_Interior.inc rename to data/maps/FarawayIsland_Interior/events.inc diff --git a/data/scripts/maps/FarawayIsland_Interior.inc b/data/maps/FarawayIsland_Interior/scripts.inc similarity index 100% rename from data/scripts/maps/FarawayIsland_Interior.inc rename to data/maps/FarawayIsland_Interior/scripts.inc diff --git a/data/maps/events/FieryPath.inc b/data/maps/FieryPath/events.inc similarity index 100% rename from data/maps/events/FieryPath.inc rename to data/maps/FieryPath/events.inc diff --git a/data/scripts/maps/FieryPath.inc b/data/maps/FieryPath/scripts.inc similarity index 100% rename from data/scripts/maps/FieryPath.inc rename to data/maps/FieryPath/scripts.inc diff --git a/data/maps/events/FortreeCity.inc b/data/maps/FortreeCity/events.inc similarity index 100% rename from data/maps/events/FortreeCity.inc rename to data/maps/FortreeCity/events.inc diff --git a/data/scripts/maps/FortreeCity.inc b/data/maps/FortreeCity/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity.inc rename to data/maps/FortreeCity/scripts.inc diff --git a/data/maps/events/FortreeCity_DecorationShop.inc b/data/maps/FortreeCity_DecorationShop/events.inc similarity index 100% rename from data/maps/events/FortreeCity_DecorationShop.inc rename to data/maps/FortreeCity_DecorationShop/events.inc diff --git a/data/scripts/maps/FortreeCity_DecorationShop.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_DecorationShop.inc rename to data/maps/FortreeCity_DecorationShop/scripts.inc diff --git a/data/maps/events/FortreeCity_Gym.inc b/data/maps/FortreeCity_Gym/events.inc similarity index 100% rename from data/maps/events/FortreeCity_Gym.inc rename to data/maps/FortreeCity_Gym/events.inc diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/maps/FortreeCity_Gym/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_Gym.inc rename to data/maps/FortreeCity_Gym/scripts.inc diff --git a/data/maps/events/FortreeCity_House1.inc b/data/maps/FortreeCity_House1/events.inc similarity index 100% rename from data/maps/events/FortreeCity_House1.inc rename to data/maps/FortreeCity_House1/events.inc diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/maps/FortreeCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_House1.inc rename to data/maps/FortreeCity_House1/scripts.inc diff --git a/data/maps/events/FortreeCity_House2.inc b/data/maps/FortreeCity_House2/events.inc similarity index 100% rename from data/maps/events/FortreeCity_House2.inc rename to data/maps/FortreeCity_House2/events.inc diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/maps/FortreeCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_House2.inc rename to data/maps/FortreeCity_House2/scripts.inc diff --git a/data/maps/events/FortreeCity_House3.inc b/data/maps/FortreeCity_House3/events.inc similarity index 100% rename from data/maps/events/FortreeCity_House3.inc rename to data/maps/FortreeCity_House3/events.inc diff --git a/data/scripts/maps/FortreeCity_House3.inc b/data/maps/FortreeCity_House3/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_House3.inc rename to data/maps/FortreeCity_House3/scripts.inc diff --git a/data/maps/events/FortreeCity_House4.inc b/data/maps/FortreeCity_House4/events.inc similarity index 100% rename from data/maps/events/FortreeCity_House4.inc rename to data/maps/FortreeCity_House4/events.inc diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/maps/FortreeCity_House4/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_House4.inc rename to data/maps/FortreeCity_House4/scripts.inc diff --git a/data/maps/events/FortreeCity_House5.inc b/data/maps/FortreeCity_House5/events.inc similarity index 100% rename from data/maps/events/FortreeCity_House5.inc rename to data/maps/FortreeCity_House5/events.inc diff --git a/data/scripts/maps/FortreeCity_House5.inc b/data/maps/FortreeCity_House5/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_House5.inc rename to data/maps/FortreeCity_House5/scripts.inc diff --git a/data/maps/events/FortreeCity_Mart.inc b/data/maps/FortreeCity_Mart/events.inc similarity index 100% rename from data/maps/events/FortreeCity_Mart.inc rename to data/maps/FortreeCity_Mart/events.inc diff --git a/data/scripts/maps/FortreeCity_Mart.inc b/data/maps/FortreeCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_Mart.inc rename to data/maps/FortreeCity_Mart/scripts.inc diff --git a/data/maps/events/FortreeCity_PokemonCenter_1F.inc b/data/maps/FortreeCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/FortreeCity_PokemonCenter_1F.inc rename to data/maps/FortreeCity_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_PokemonCenter_1F.inc rename to data/maps/FortreeCity_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/FortreeCity_PokemonCenter_2F.inc b/data/maps/FortreeCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/FortreeCity_PokemonCenter_2F.inc rename to data/maps/FortreeCity_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_2F.inc b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_PokemonCenter_2F.inc rename to data/maps/FortreeCity_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/GraniteCave_1F.inc b/data/maps/GraniteCave_1F/events.inc similarity index 100% rename from data/maps/events/GraniteCave_1F.inc rename to data/maps/GraniteCave_1F/events.inc diff --git a/data/scripts/maps/GraniteCave_1F.inc b/data/maps/GraniteCave_1F/scripts.inc similarity index 100% rename from data/scripts/maps/GraniteCave_1F.inc rename to data/maps/GraniteCave_1F/scripts.inc diff --git a/data/maps/events/GraniteCave_B1F.inc b/data/maps/GraniteCave_B1F/events.inc similarity index 100% rename from data/maps/events/GraniteCave_B1F.inc rename to data/maps/GraniteCave_B1F/events.inc diff --git a/data/scripts/maps/GraniteCave_B1F.inc b/data/maps/GraniteCave_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/GraniteCave_B1F.inc rename to data/maps/GraniteCave_B1F/scripts.inc diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/GraniteCave_B2F/events.inc similarity index 100% rename from data/maps/events/GraniteCave_B2F.inc rename to data/maps/GraniteCave_B2F/events.inc diff --git a/data/scripts/maps/GraniteCave_B2F.inc b/data/maps/GraniteCave_B2F/scripts.inc similarity index 100% rename from data/scripts/maps/GraniteCave_B2F.inc rename to data/maps/GraniteCave_B2F/scripts.inc diff --git a/data/maps/events/GraniteCave_StevensRoom.inc b/data/maps/GraniteCave_StevensRoom/events.inc similarity index 100% rename from data/maps/events/GraniteCave_StevensRoom.inc rename to data/maps/GraniteCave_StevensRoom/events.inc diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc similarity index 100% rename from data/scripts/maps/GraniteCave_StevensRoom.inc rename to data/maps/GraniteCave_StevensRoom/scripts.inc diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/InsideOfTruck/events.inc similarity index 100% rename from data/maps/events/InsideOfTruck.inc rename to data/maps/InsideOfTruck/events.inc diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/maps/InsideOfTruck/scripts.inc similarity index 100% rename from data/scripts/maps/InsideOfTruck.inc rename to data/maps/InsideOfTruck/scripts.inc diff --git a/data/maps/events/IslandCave.inc b/data/maps/IslandCave/events.inc similarity index 100% rename from data/maps/events/IslandCave.inc rename to data/maps/IslandCave/events.inc diff --git a/data/scripts/maps/IslandCave.inc b/data/maps/IslandCave/scripts.inc similarity index 100% rename from data/scripts/maps/IslandCave.inc rename to data/maps/IslandCave/scripts.inc diff --git a/data/maps/events/JaggedPass.inc b/data/maps/JaggedPass/events.inc similarity index 100% rename from data/maps/events/JaggedPass.inc rename to data/maps/JaggedPass/events.inc diff --git a/data/scripts/maps/JaggedPass.inc b/data/maps/JaggedPass/scripts.inc similarity index 100% rename from data/scripts/maps/JaggedPass.inc rename to data/maps/JaggedPass/scripts.inc diff --git a/data/maps/events/LavaridgeTown.inc b/data/maps/LavaridgeTown/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown.inc rename to data/maps/LavaridgeTown/events.inc diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/maps/LavaridgeTown/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown.inc rename to data/maps/LavaridgeTown/scripts.inc diff --git a/data/maps/events/LavaridgeTown_Gym_1F.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_Gym_1F.inc rename to data/maps/LavaridgeTown_Gym_1F/events.inc diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_Gym_1F.inc rename to data/maps/LavaridgeTown_Gym_1F/scripts.inc diff --git a/data/maps/events/LavaridgeTown_Gym_B1F.inc b/data/maps/LavaridgeTown_Gym_B1F/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_Gym_B1F.inc rename to data/maps/LavaridgeTown_Gym_B1F/events.inc diff --git a/data/scripts/maps/LavaridgeTown_Gym_B1F.inc b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_Gym_B1F.inc rename to data/maps/LavaridgeTown_Gym_B1F/scripts.inc diff --git a/data/maps/events/LavaridgeTown_HerbShop.inc b/data/maps/LavaridgeTown_HerbShop/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_HerbShop.inc rename to data/maps/LavaridgeTown_HerbShop/events.inc diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_HerbShop.inc rename to data/maps/LavaridgeTown_HerbShop/scripts.inc diff --git a/data/maps/events/LavaridgeTown_House.inc b/data/maps/LavaridgeTown_House/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_House.inc rename to data/maps/LavaridgeTown_House/events.inc diff --git a/data/scripts/maps/LavaridgeTown_House.inc b/data/maps/LavaridgeTown_House/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_House.inc rename to data/maps/LavaridgeTown_House/scripts.inc diff --git a/data/maps/events/LavaridgeTown_Mart.inc b/data/maps/LavaridgeTown_Mart/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_Mart.inc rename to data/maps/LavaridgeTown_Mart/events.inc diff --git a/data/scripts/maps/LavaridgeTown_Mart.inc b/data/maps/LavaridgeTown_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_Mart.inc rename to data/maps/LavaridgeTown_Mart/scripts.inc diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_PokemonCenter_1F.inc rename to data/maps/LavaridgeTown_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc rename to data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_PokemonCenter_2F.inc rename to data/maps/LavaridgeTown_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc rename to data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/LilycoveCity/events.inc similarity index 100% rename from data/maps/events/LilycoveCity.inc rename to data/maps/LilycoveCity/events.inc diff --git a/data/scripts/maps/LilycoveCity.inc b/data/maps/LilycoveCity/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity.inc rename to data/maps/LilycoveCity/scripts.inc diff --git a/data/maps/events/LilycoveCity_ContestHall.inc b/data/maps/LilycoveCity_ContestHall/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_ContestHall.inc rename to data/maps/LilycoveCity_ContestHall/events.inc diff --git a/data/scripts/maps/LilycoveCity_ContestHall.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_ContestHall.inc rename to data/maps/LilycoveCity_ContestHall/scripts.inc diff --git a/data/maps/events/LilycoveCity_ContestLobby.inc b/data/maps/LilycoveCity_ContestLobby/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_ContestLobby.inc rename to data/maps/LilycoveCity_ContestLobby/events.inc diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_ContestLobby.inc rename to data/maps/LilycoveCity_ContestLobby/scripts.inc diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc rename to data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc rename to data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc rename to data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc rename to data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStoreElevator.inc rename to data/maps/LilycoveCity_DepartmentStoreElevator/events.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc rename to data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc rename to data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc rename to data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStore_1F.inc rename to data/maps/LilycoveCity_DepartmentStore_1F/events.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc rename to data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStore_2F.inc rename to data/maps/LilycoveCity_DepartmentStore_2F/events.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc rename to data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStore_3F.inc rename to data/maps/LilycoveCity_DepartmentStore_3F/events.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc rename to data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStore_4F.inc rename to data/maps/LilycoveCity_DepartmentStore_4F/events.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc rename to data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStore_5F.inc rename to data/maps/LilycoveCity_DepartmentStore_5F/events.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc rename to data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc diff --git a/data/maps/events/LilycoveCity_Harbor.inc b/data/maps/LilycoveCity_Harbor/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_Harbor.inc rename to data/maps/LilycoveCity_Harbor/events.inc diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/maps/LilycoveCity_Harbor/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_Harbor.inc rename to data/maps/LilycoveCity_Harbor/scripts.inc diff --git a/data/maps/events/LilycoveCity_House1.inc b/data/maps/LilycoveCity_House1/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_House1.inc rename to data/maps/LilycoveCity_House1/events.inc diff --git a/data/scripts/maps/LilycoveCity_House1.inc b/data/maps/LilycoveCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_House1.inc rename to data/maps/LilycoveCity_House1/scripts.inc diff --git a/data/maps/events/LilycoveCity_House2.inc b/data/maps/LilycoveCity_House2/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_House2.inc rename to data/maps/LilycoveCity_House2/events.inc diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/maps/LilycoveCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_House2.inc rename to data/maps/LilycoveCity_House2/scripts.inc diff --git a/data/maps/events/LilycoveCity_House3.inc b/data/maps/LilycoveCity_House3/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_House3.inc rename to data/maps/LilycoveCity_House3/events.inc diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/maps/LilycoveCity_House3/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_House3.inc rename to data/maps/LilycoveCity_House3/scripts.inc diff --git a/data/maps/events/LilycoveCity_House4.inc b/data/maps/LilycoveCity_House4/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_House4.inc rename to data/maps/LilycoveCity_House4/events.inc diff --git a/data/scripts/maps/LilycoveCity_House4.inc b/data/maps/LilycoveCity_House4/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_House4.inc rename to data/maps/LilycoveCity_House4/scripts.inc diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc rename to data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc rename to data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc rename to data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc rename to data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc diff --git a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_MoveDeletersHouse.inc rename to data/maps/LilycoveCity_MoveDeletersHouse/events.inc diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc rename to data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc diff --git a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_PokemonCenter_1F.inc rename to data/maps/LilycoveCity_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc rename to data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_PokemonCenter_2F.inc rename to data/maps/LilycoveCity_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc rename to data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc rename to data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc rename to data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc diff --git a/data/maps/events/LilycoveCity_UnusedMart.inc b/data/maps/LilycoveCity_UnusedMart/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_UnusedMart.inc rename to data/maps/LilycoveCity_UnusedMart/events.inc diff --git a/data/scripts/maps/LilycoveCity_UnusedMart.inc b/data/maps/LilycoveCity_UnusedMart/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_UnusedMart.inc rename to data/maps/LilycoveCity_UnusedMart/scripts.inc diff --git a/data/maps/events/LinkContestRoom1.inc b/data/maps/LinkContestRoom1/events.inc similarity index 100% rename from data/maps/events/LinkContestRoom1.inc rename to data/maps/LinkContestRoom1/events.inc diff --git a/data/scripts/maps/LinkContestRoom1.inc b/data/maps/LinkContestRoom1/scripts.inc similarity index 100% rename from data/scripts/maps/LinkContestRoom1.inc rename to data/maps/LinkContestRoom1/scripts.inc diff --git a/data/maps/events/LinkContestRoom2.inc b/data/maps/LinkContestRoom2/events.inc similarity index 100% rename from data/maps/events/LinkContestRoom2.inc rename to data/maps/LinkContestRoom2/events.inc diff --git a/data/scripts/maps/LinkContestRoom2.inc b/data/maps/LinkContestRoom2/scripts.inc similarity index 100% rename from data/scripts/maps/LinkContestRoom2.inc rename to data/maps/LinkContestRoom2/scripts.inc diff --git a/data/maps/events/LinkContestRoom3.inc b/data/maps/LinkContestRoom3/events.inc similarity index 100% rename from data/maps/events/LinkContestRoom3.inc rename to data/maps/LinkContestRoom3/events.inc diff --git a/data/scripts/maps/LinkContestRoom3.inc b/data/maps/LinkContestRoom3/scripts.inc similarity index 100% rename from data/scripts/maps/LinkContestRoom3.inc rename to data/maps/LinkContestRoom3/scripts.inc diff --git a/data/maps/events/LinkContestRoom4.inc b/data/maps/LinkContestRoom4/events.inc similarity index 100% rename from data/maps/events/LinkContestRoom4.inc rename to data/maps/LinkContestRoom4/events.inc diff --git a/data/scripts/maps/LinkContestRoom4.inc b/data/maps/LinkContestRoom4/scripts.inc similarity index 100% rename from data/scripts/maps/LinkContestRoom4.inc rename to data/maps/LinkContestRoom4/scripts.inc diff --git a/data/maps/events/LinkContestRoom5.inc b/data/maps/LinkContestRoom5/events.inc similarity index 100% rename from data/maps/events/LinkContestRoom5.inc rename to data/maps/LinkContestRoom5/events.inc diff --git a/data/scripts/maps/LinkContestRoom5.inc b/data/maps/LinkContestRoom5/scripts.inc similarity index 100% rename from data/scripts/maps/LinkContestRoom5.inc rename to data/maps/LinkContestRoom5/scripts.inc diff --git a/data/maps/events/LinkContestRoom6.inc b/data/maps/LinkContestRoom6/events.inc similarity index 100% rename from data/maps/events/LinkContestRoom6.inc rename to data/maps/LinkContestRoom6/events.inc diff --git a/data/scripts/maps/LinkContestRoom6.inc b/data/maps/LinkContestRoom6/scripts.inc similarity index 100% rename from data/scripts/maps/LinkContestRoom6.inc rename to data/maps/LinkContestRoom6/scripts.inc diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/LittlerootTown/events.inc similarity index 100% rename from data/maps/events/LittlerootTown.inc rename to data/maps/LittlerootTown/events.inc diff --git a/data/scripts/maps/LittlerootTown.inc b/data/maps/LittlerootTown/scripts.inc similarity index 100% rename from data/scripts/maps/LittlerootTown.inc rename to data/maps/LittlerootTown/scripts.inc diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc similarity index 100% rename from data/maps/events/LittlerootTown_BrendansHouse_1F.inc rename to data/maps/LittlerootTown_BrendansHouse_1F/events.inc diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc rename to data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc similarity index 100% rename from data/maps/events/LittlerootTown_BrendansHouse_2F.inc rename to data/maps/LittlerootTown_BrendansHouse_2F/events.inc diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc rename to data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc similarity index 100% rename from data/maps/events/LittlerootTown_MaysHouse_1F.inc rename to data/maps/LittlerootTown_MaysHouse_1F/events.inc diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LittlerootTown_MaysHouse_1F.inc rename to data/maps/LittlerootTown_MaysHouse_1F/scripts.inc diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc similarity index 100% rename from data/maps/events/LittlerootTown_MaysHouse_2F.inc rename to data/maps/LittlerootTown_MaysHouse_2F/events.inc diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LittlerootTown_MaysHouse_2F.inc rename to data/maps/LittlerootTown_MaysHouse_2F/scripts.inc diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc similarity index 100% rename from data/maps/events/LittlerootTown_ProfessorBirchsLab.inc rename to data/maps/LittlerootTown_ProfessorBirchsLab/events.inc diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc similarity index 100% rename from data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc rename to data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc diff --git a/data/maps/events/MagmaHideout_1F.inc b/data/maps/MagmaHideout_1F/events.inc similarity index 100% rename from data/maps/events/MagmaHideout_1F.inc rename to data/maps/MagmaHideout_1F/events.inc diff --git a/data/scripts/maps/MagmaHideout_1F.inc b/data/maps/MagmaHideout_1F/scripts.inc similarity index 100% rename from data/scripts/maps/MagmaHideout_1F.inc rename to data/maps/MagmaHideout_1F/scripts.inc diff --git a/data/maps/events/MagmaHideout_2F_1R.inc b/data/maps/MagmaHideout_2F_1R/events.inc similarity index 100% rename from data/maps/events/MagmaHideout_2F_1R.inc rename to data/maps/MagmaHideout_2F_1R/events.inc diff --git a/data/scripts/maps/MagmaHideout_2F_1R.inc b/data/maps/MagmaHideout_2F_1R/scripts.inc similarity index 100% rename from data/scripts/maps/MagmaHideout_2F_1R.inc rename to data/maps/MagmaHideout_2F_1R/scripts.inc diff --git a/data/maps/events/MagmaHideout_2F_2R.inc b/data/maps/MagmaHideout_2F_2R/events.inc similarity index 100% rename from data/maps/events/MagmaHideout_2F_2R.inc rename to data/maps/MagmaHideout_2F_2R/events.inc diff --git a/data/scripts/maps/MagmaHideout_2F_2R.inc b/data/maps/MagmaHideout_2F_2R/scripts.inc similarity index 100% rename from data/scripts/maps/MagmaHideout_2F_2R.inc rename to data/maps/MagmaHideout_2F_2R/scripts.inc diff --git a/data/maps/events/MagmaHideout_2F_3R.inc b/data/maps/MagmaHideout_2F_3R/events.inc similarity index 100% rename from data/maps/events/MagmaHideout_2F_3R.inc rename to data/maps/MagmaHideout_2F_3R/events.inc diff --git a/data/scripts/maps/MagmaHideout_2F_3R.inc b/data/maps/MagmaHideout_2F_3R/scripts.inc similarity index 100% rename from data/scripts/maps/MagmaHideout_2F_3R.inc rename to data/maps/MagmaHideout_2F_3R/scripts.inc diff --git a/data/maps/events/MagmaHideout_3F_1R.inc b/data/maps/MagmaHideout_3F_1R/events.inc similarity index 100% rename from data/maps/events/MagmaHideout_3F_1R.inc rename to data/maps/MagmaHideout_3F_1R/events.inc diff --git a/data/scripts/maps/MagmaHideout_3F_1R.inc b/data/maps/MagmaHideout_3F_1R/scripts.inc similarity index 100% rename from data/scripts/maps/MagmaHideout_3F_1R.inc rename to data/maps/MagmaHideout_3F_1R/scripts.inc diff --git a/data/maps/events/MagmaHideout_3F_2R.inc b/data/maps/MagmaHideout_3F_2R/events.inc similarity index 100% rename from data/maps/events/MagmaHideout_3F_2R.inc rename to data/maps/MagmaHideout_3F_2R/events.inc diff --git a/data/scripts/maps/MagmaHideout_3F_2R.inc b/data/maps/MagmaHideout_3F_2R/scripts.inc similarity index 100% rename from data/scripts/maps/MagmaHideout_3F_2R.inc rename to data/maps/MagmaHideout_3F_2R/scripts.inc diff --git a/data/maps/events/MagmaHideout_3F_3R.inc b/data/maps/MagmaHideout_3F_3R/events.inc similarity index 100% rename from data/maps/events/MagmaHideout_3F_3R.inc rename to data/maps/MagmaHideout_3F_3R/events.inc diff --git a/data/scripts/maps/MagmaHideout_3F_3R.inc b/data/maps/MagmaHideout_3F_3R/scripts.inc similarity index 100% rename from data/scripts/maps/MagmaHideout_3F_3R.inc rename to data/maps/MagmaHideout_3F_3R/scripts.inc diff --git a/data/maps/events/MagmaHideout_4F.inc b/data/maps/MagmaHideout_4F/events.inc similarity index 100% rename from data/maps/events/MagmaHideout_4F.inc rename to data/maps/MagmaHideout_4F/events.inc diff --git a/data/scripts/maps/MagmaHideout_4F.inc b/data/maps/MagmaHideout_4F/scripts.inc similarity index 100% rename from data/scripts/maps/MagmaHideout_4F.inc rename to data/maps/MagmaHideout_4F/scripts.inc diff --git a/data/maps/events/MarineCave_End.inc b/data/maps/MarineCave_End/events.inc similarity index 100% rename from data/maps/events/MarineCave_End.inc rename to data/maps/MarineCave_End/events.inc diff --git a/data/scripts/maps/MarineCave_End.inc b/data/maps/MarineCave_End/scripts.inc similarity index 100% rename from data/scripts/maps/MarineCave_End.inc rename to data/maps/MarineCave_End/scripts.inc diff --git a/data/maps/events/MarineCave_Entrance.inc b/data/maps/MarineCave_Entrance/events.inc similarity index 100% rename from data/maps/events/MarineCave_Entrance.inc rename to data/maps/MarineCave_Entrance/events.inc diff --git a/data/scripts/maps/MarineCave_Entrance.inc b/data/maps/MarineCave_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/MarineCave_Entrance.inc rename to data/maps/MarineCave_Entrance/scripts.inc diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/MauvilleCity/events.inc similarity index 100% rename from data/maps/events/MauvilleCity.inc rename to data/maps/MauvilleCity/events.inc diff --git a/data/scripts/maps/MauvilleCity.inc b/data/maps/MauvilleCity/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity.inc rename to data/maps/MauvilleCity/scripts.inc diff --git a/data/maps/events/MauvilleCity_BikeShop.inc b/data/maps/MauvilleCity_BikeShop/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_BikeShop.inc rename to data/maps/MauvilleCity_BikeShop/events.inc diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_BikeShop.inc rename to data/maps/MauvilleCity_BikeShop/scripts.inc diff --git a/data/maps/events/MauvilleCity_GameCorner.inc b/data/maps/MauvilleCity_GameCorner/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_GameCorner.inc rename to data/maps/MauvilleCity_GameCorner/events.inc diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_GameCorner.inc rename to data/maps/MauvilleCity_GameCorner/scripts.inc diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/MauvilleCity_Gym/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_Gym.inc rename to data/maps/MauvilleCity_Gym/events.inc diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/maps/MauvilleCity_Gym/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_Gym.inc rename to data/maps/MauvilleCity_Gym/scripts.inc diff --git a/data/maps/events/MauvilleCity_House1.inc b/data/maps/MauvilleCity_House1/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_House1.inc rename to data/maps/MauvilleCity_House1/events.inc diff --git a/data/scripts/maps/MauvilleCity_House1.inc b/data/maps/MauvilleCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_House1.inc rename to data/maps/MauvilleCity_House1/scripts.inc diff --git a/data/maps/events/MauvilleCity_House2.inc b/data/maps/MauvilleCity_House2/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_House2.inc rename to data/maps/MauvilleCity_House2/events.inc diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/maps/MauvilleCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_House2.inc rename to data/maps/MauvilleCity_House2/scripts.inc diff --git a/data/maps/events/MauvilleCity_Mart.inc b/data/maps/MauvilleCity_Mart/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_Mart.inc rename to data/maps/MauvilleCity_Mart/events.inc diff --git a/data/scripts/maps/MauvilleCity_Mart.inc b/data/maps/MauvilleCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_Mart.inc rename to data/maps/MauvilleCity_Mart/scripts.inc diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_PokemonCenter_1F.inc rename to data/maps/MauvilleCity_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc rename to data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_PokemonCenter_2F.inc rename to data/maps/MauvilleCity_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc rename to data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/MeteorFalls_1F_1R/events.inc similarity index 100% rename from data/maps/events/MeteorFalls_1F_1R.inc rename to data/maps/MeteorFalls_1F_1R/events.inc diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc similarity index 100% rename from data/scripts/maps/MeteorFalls_1F_1R.inc rename to data/maps/MeteorFalls_1F_1R/scripts.inc diff --git a/data/maps/events/MeteorFalls_1F_2R.inc b/data/maps/MeteorFalls_1F_2R/events.inc similarity index 100% rename from data/maps/events/MeteorFalls_1F_2R.inc rename to data/maps/MeteorFalls_1F_2R/events.inc diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc similarity index 100% rename from data/scripts/maps/MeteorFalls_1F_2R.inc rename to data/maps/MeteorFalls_1F_2R/scripts.inc diff --git a/data/maps/events/MeteorFalls_B1F_1R.inc b/data/maps/MeteorFalls_B1F_1R/events.inc similarity index 100% rename from data/maps/events/MeteorFalls_B1F_1R.inc rename to data/maps/MeteorFalls_B1F_1R/events.inc diff --git a/data/scripts/maps/MeteorFalls_B1F_1R.inc b/data/maps/MeteorFalls_B1F_1R/scripts.inc similarity index 100% rename from data/scripts/maps/MeteorFalls_B1F_1R.inc rename to data/maps/MeteorFalls_B1F_1R/scripts.inc diff --git a/data/maps/events/MeteorFalls_B1F_2R.inc b/data/maps/MeteorFalls_B1F_2R/events.inc similarity index 100% rename from data/maps/events/MeteorFalls_B1F_2R.inc rename to data/maps/MeteorFalls_B1F_2R/events.inc diff --git a/data/scripts/maps/MeteorFalls_B1F_2R.inc b/data/maps/MeteorFalls_B1F_2R/scripts.inc similarity index 100% rename from data/scripts/maps/MeteorFalls_B1F_2R.inc rename to data/maps/MeteorFalls_B1F_2R/scripts.inc diff --git a/data/maps/events/MeteorFalls_StevensCave.inc b/data/maps/MeteorFalls_StevensCave/events.inc similarity index 100% rename from data/maps/events/MeteorFalls_StevensCave.inc rename to data/maps/MeteorFalls_StevensCave/events.inc diff --git a/data/scripts/maps/MeteorFalls_StevensCave.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc similarity index 100% rename from data/scripts/maps/MeteorFalls_StevensCave.inc rename to data/maps/MeteorFalls_StevensCave/scripts.inc diff --git a/data/maps/events/MirageTower_1F.inc b/data/maps/MirageTower_1F/events.inc similarity index 100% rename from data/maps/events/MirageTower_1F.inc rename to data/maps/MirageTower_1F/events.inc diff --git a/data/scripts/maps/MirageTower_1F.inc b/data/maps/MirageTower_1F/scripts.inc similarity index 100% rename from data/scripts/maps/MirageTower_1F.inc rename to data/maps/MirageTower_1F/scripts.inc diff --git a/data/maps/events/MirageTower_2F.inc b/data/maps/MirageTower_2F/events.inc similarity index 100% rename from data/maps/events/MirageTower_2F.inc rename to data/maps/MirageTower_2F/events.inc diff --git a/data/scripts/maps/MirageTower_2F.inc b/data/maps/MirageTower_2F/scripts.inc similarity index 100% rename from data/scripts/maps/MirageTower_2F.inc rename to data/maps/MirageTower_2F/scripts.inc diff --git a/data/maps/events/MirageTower_3F.inc b/data/maps/MirageTower_3F/events.inc similarity index 100% rename from data/maps/events/MirageTower_3F.inc rename to data/maps/MirageTower_3F/events.inc diff --git a/data/scripts/maps/MirageTower_3F.inc b/data/maps/MirageTower_3F/scripts.inc similarity index 100% rename from data/scripts/maps/MirageTower_3F.inc rename to data/maps/MirageTower_3F/scripts.inc diff --git a/data/maps/events/MirageTower_4F.inc b/data/maps/MirageTower_4F/events.inc similarity index 100% rename from data/maps/events/MirageTower_4F.inc rename to data/maps/MirageTower_4F/events.inc diff --git a/data/scripts/maps/MirageTower_4F.inc b/data/maps/MirageTower_4F/scripts.inc similarity index 100% rename from data/scripts/maps/MirageTower_4F.inc rename to data/maps/MirageTower_4F/scripts.inc diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/MossdeepCity/events.inc similarity index 100% rename from data/maps/events/MossdeepCity.inc rename to data/maps/MossdeepCity/events.inc diff --git a/data/scripts/maps/MossdeepCity.inc b/data/maps/MossdeepCity/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity.inc rename to data/maps/MossdeepCity/scripts.inc diff --git a/data/maps/events/MossdeepCity_GameCorner_1F.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_GameCorner_1F.inc rename to data/maps/MossdeepCity_GameCorner_1F/events.inc diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_GameCorner_1F.inc rename to data/maps/MossdeepCity_GameCorner_1F/scripts.inc diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.inc b/data/maps/MossdeepCity_GameCorner_B1F/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_GameCorner_B1F.inc rename to data/maps/MossdeepCity_GameCorner_B1F/events.inc diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_GameCorner_B1F.inc rename to data/maps/MossdeepCity_GameCorner_B1F/scripts.inc diff --git a/data/maps/events/MossdeepCity_Gym.inc b/data/maps/MossdeepCity_Gym/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_Gym.inc rename to data/maps/MossdeepCity_Gym/events.inc diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/maps/MossdeepCity_Gym/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_Gym.inc rename to data/maps/MossdeepCity_Gym/scripts.inc diff --git a/data/maps/events/MossdeepCity_House1.inc b/data/maps/MossdeepCity_House1/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_House1.inc rename to data/maps/MossdeepCity_House1/events.inc diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/maps/MossdeepCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_House1.inc rename to data/maps/MossdeepCity_House1/scripts.inc diff --git a/data/maps/events/MossdeepCity_House2.inc b/data/maps/MossdeepCity_House2/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_House2.inc rename to data/maps/MossdeepCity_House2/events.inc diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/maps/MossdeepCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_House2.inc rename to data/maps/MossdeepCity_House2/scripts.inc diff --git a/data/maps/events/MossdeepCity_House3.inc b/data/maps/MossdeepCity_House3/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_House3.inc rename to data/maps/MossdeepCity_House3/events.inc diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/maps/MossdeepCity_House3/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_House3.inc rename to data/maps/MossdeepCity_House3/scripts.inc diff --git a/data/maps/events/MossdeepCity_House4.inc b/data/maps/MossdeepCity_House4/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_House4.inc rename to data/maps/MossdeepCity_House4/events.inc diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/maps/MossdeepCity_House4/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_House4.inc rename to data/maps/MossdeepCity_House4/scripts.inc diff --git a/data/maps/events/MossdeepCity_Mart.inc b/data/maps/MossdeepCity_Mart/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_Mart.inc rename to data/maps/MossdeepCity_Mart/events.inc diff --git a/data/scripts/maps/MossdeepCity_Mart.inc b/data/maps/MossdeepCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_Mart.inc rename to data/maps/MossdeepCity_Mart/scripts.inc diff --git a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_PokemonCenter_1F.inc rename to data/maps/MossdeepCity_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc rename to data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_PokemonCenter_2F.inc rename to data/maps/MossdeepCity_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc rename to data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_SpaceCenter_1F.inc rename to data/maps/MossdeepCity_SpaceCenter_1F/events.inc diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc rename to data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc diff --git a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_SpaceCenter_2F.inc rename to data/maps/MossdeepCity_SpaceCenter_2F/events.inc diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc rename to data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/MossdeepCity_StevensHouse/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_StevensHouse.inc rename to data/maps/MossdeepCity_StevensHouse/events.inc diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_StevensHouse.inc rename to data/maps/MossdeepCity_StevensHouse/scripts.inc diff --git a/data/maps/events/MtChimney.inc b/data/maps/MtChimney/events.inc similarity index 100% rename from data/maps/events/MtChimney.inc rename to data/maps/MtChimney/events.inc diff --git a/data/scripts/maps/MtChimney.inc b/data/maps/MtChimney/scripts.inc similarity index 100% rename from data/scripts/maps/MtChimney.inc rename to data/maps/MtChimney/scripts.inc diff --git a/data/maps/events/MtChimney_CableCarStation.inc b/data/maps/MtChimney_CableCarStation/events.inc similarity index 100% rename from data/maps/events/MtChimney_CableCarStation.inc rename to data/maps/MtChimney_CableCarStation/events.inc diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/maps/MtChimney_CableCarStation/scripts.inc similarity index 100% rename from data/scripts/maps/MtChimney_CableCarStation.inc rename to data/maps/MtChimney_CableCarStation/scripts.inc diff --git a/data/maps/events/MtPyre_1F.inc b/data/maps/MtPyre_1F/events.inc similarity index 100% rename from data/maps/events/MtPyre_1F.inc rename to data/maps/MtPyre_1F/events.inc diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/maps/MtPyre_1F/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_1F.inc rename to data/maps/MtPyre_1F/scripts.inc diff --git a/data/maps/events/MtPyre_2F.inc b/data/maps/MtPyre_2F/events.inc similarity index 100% rename from data/maps/events/MtPyre_2F.inc rename to data/maps/MtPyre_2F/events.inc diff --git a/data/scripts/maps/MtPyre_2F.inc b/data/maps/MtPyre_2F/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_2F.inc rename to data/maps/MtPyre_2F/scripts.inc diff --git a/data/maps/events/MtPyre_3F.inc b/data/maps/MtPyre_3F/events.inc similarity index 100% rename from data/maps/events/MtPyre_3F.inc rename to data/maps/MtPyre_3F/events.inc diff --git a/data/scripts/maps/MtPyre_3F.inc b/data/maps/MtPyre_3F/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_3F.inc rename to data/maps/MtPyre_3F/scripts.inc diff --git a/data/maps/events/MtPyre_4F.inc b/data/maps/MtPyre_4F/events.inc similarity index 100% rename from data/maps/events/MtPyre_4F.inc rename to data/maps/MtPyre_4F/events.inc diff --git a/data/scripts/maps/MtPyre_4F.inc b/data/maps/MtPyre_4F/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_4F.inc rename to data/maps/MtPyre_4F/scripts.inc diff --git a/data/maps/events/MtPyre_5F.inc b/data/maps/MtPyre_5F/events.inc similarity index 100% rename from data/maps/events/MtPyre_5F.inc rename to data/maps/MtPyre_5F/events.inc diff --git a/data/scripts/maps/MtPyre_5F.inc b/data/maps/MtPyre_5F/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_5F.inc rename to data/maps/MtPyre_5F/scripts.inc diff --git a/data/maps/events/MtPyre_6F.inc b/data/maps/MtPyre_6F/events.inc similarity index 100% rename from data/maps/events/MtPyre_6F.inc rename to data/maps/MtPyre_6F/events.inc diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/maps/MtPyre_6F/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_6F.inc rename to data/maps/MtPyre_6F/scripts.inc diff --git a/data/maps/events/MtPyre_Exterior.inc b/data/maps/MtPyre_Exterior/events.inc similarity index 100% rename from data/maps/events/MtPyre_Exterior.inc rename to data/maps/MtPyre_Exterior/events.inc diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/maps/MtPyre_Exterior/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_Exterior.inc rename to data/maps/MtPyre_Exterior/scripts.inc diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/MtPyre_Summit/events.inc similarity index 100% rename from data/maps/events/MtPyre_Summit.inc rename to data/maps/MtPyre_Summit/events.inc diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/maps/MtPyre_Summit/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_Summit.inc rename to data/maps/MtPyre_Summit/scripts.inc diff --git a/data/maps/events/NavelRock_B1F.inc b/data/maps/NavelRock_B1F/events.inc similarity index 100% rename from data/maps/events/NavelRock_B1F.inc rename to data/maps/NavelRock_B1F/events.inc diff --git a/data/scripts/maps/NavelRock_B1F.inc b/data/maps/NavelRock_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_B1F.inc rename to data/maps/NavelRock_B1F/scripts.inc diff --git a/data/maps/events/NavelRock_Bottom.inc b/data/maps/NavelRock_Bottom/events.inc similarity index 100% rename from data/maps/events/NavelRock_Bottom.inc rename to data/maps/NavelRock_Bottom/events.inc diff --git a/data/scripts/maps/NavelRock_Bottom.inc b/data/maps/NavelRock_Bottom/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Bottom.inc rename to data/maps/NavelRock_Bottom/scripts.inc diff --git a/data/maps/events/NavelRock_Down01.inc b/data/maps/NavelRock_Down01/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down01.inc rename to data/maps/NavelRock_Down01/events.inc diff --git a/data/scripts/maps/NavelRock_Down01.inc b/data/maps/NavelRock_Down01/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down01.inc rename to data/maps/NavelRock_Down01/scripts.inc diff --git a/data/maps/events/NavelRock_Down02.inc b/data/maps/NavelRock_Down02/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down02.inc rename to data/maps/NavelRock_Down02/events.inc diff --git a/data/scripts/maps/NavelRock_Down02.inc b/data/maps/NavelRock_Down02/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down02.inc rename to data/maps/NavelRock_Down02/scripts.inc diff --git a/data/maps/events/NavelRock_Down03.inc b/data/maps/NavelRock_Down03/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down03.inc rename to data/maps/NavelRock_Down03/events.inc diff --git a/data/scripts/maps/NavelRock_Down03.inc b/data/maps/NavelRock_Down03/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down03.inc rename to data/maps/NavelRock_Down03/scripts.inc diff --git a/data/maps/events/NavelRock_Down04.inc b/data/maps/NavelRock_Down04/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down04.inc rename to data/maps/NavelRock_Down04/events.inc diff --git a/data/scripts/maps/NavelRock_Down04.inc b/data/maps/NavelRock_Down04/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down04.inc rename to data/maps/NavelRock_Down04/scripts.inc diff --git a/data/maps/events/NavelRock_Down05.inc b/data/maps/NavelRock_Down05/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down05.inc rename to data/maps/NavelRock_Down05/events.inc diff --git a/data/scripts/maps/NavelRock_Down05.inc b/data/maps/NavelRock_Down05/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down05.inc rename to data/maps/NavelRock_Down05/scripts.inc diff --git a/data/maps/events/NavelRock_Down06.inc b/data/maps/NavelRock_Down06/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down06.inc rename to data/maps/NavelRock_Down06/events.inc diff --git a/data/scripts/maps/NavelRock_Down06.inc b/data/maps/NavelRock_Down06/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down06.inc rename to data/maps/NavelRock_Down06/scripts.inc diff --git a/data/maps/events/NavelRock_Down07.inc b/data/maps/NavelRock_Down07/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down07.inc rename to data/maps/NavelRock_Down07/events.inc diff --git a/data/scripts/maps/NavelRock_Down07.inc b/data/maps/NavelRock_Down07/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down07.inc rename to data/maps/NavelRock_Down07/scripts.inc diff --git a/data/maps/events/NavelRock_Down08.inc b/data/maps/NavelRock_Down08/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down08.inc rename to data/maps/NavelRock_Down08/events.inc diff --git a/data/scripts/maps/NavelRock_Down08.inc b/data/maps/NavelRock_Down08/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down08.inc rename to data/maps/NavelRock_Down08/scripts.inc diff --git a/data/maps/events/NavelRock_Down09.inc b/data/maps/NavelRock_Down09/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down09.inc rename to data/maps/NavelRock_Down09/events.inc diff --git a/data/scripts/maps/NavelRock_Down09.inc b/data/maps/NavelRock_Down09/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down09.inc rename to data/maps/NavelRock_Down09/scripts.inc diff --git a/data/maps/events/NavelRock_Down10.inc b/data/maps/NavelRock_Down10/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down10.inc rename to data/maps/NavelRock_Down10/events.inc diff --git a/data/scripts/maps/NavelRock_Down10.inc b/data/maps/NavelRock_Down10/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down10.inc rename to data/maps/NavelRock_Down10/scripts.inc diff --git a/data/maps/events/NavelRock_Down11.inc b/data/maps/NavelRock_Down11/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down11.inc rename to data/maps/NavelRock_Down11/events.inc diff --git a/data/scripts/maps/NavelRock_Down11.inc b/data/maps/NavelRock_Down11/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down11.inc rename to data/maps/NavelRock_Down11/scripts.inc diff --git a/data/maps/events/NavelRock_Entrance.inc b/data/maps/NavelRock_Entrance/events.inc similarity index 100% rename from data/maps/events/NavelRock_Entrance.inc rename to data/maps/NavelRock_Entrance/events.inc diff --git a/data/scripts/maps/NavelRock_Entrance.inc b/data/maps/NavelRock_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Entrance.inc rename to data/maps/NavelRock_Entrance/scripts.inc diff --git a/data/maps/events/NavelRock_Exterior.inc b/data/maps/NavelRock_Exterior/events.inc similarity index 100% rename from data/maps/events/NavelRock_Exterior.inc rename to data/maps/NavelRock_Exterior/events.inc diff --git a/data/scripts/maps/NavelRock_Exterior.inc b/data/maps/NavelRock_Exterior/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Exterior.inc rename to data/maps/NavelRock_Exterior/scripts.inc diff --git a/data/maps/events/NavelRock_Fork.inc b/data/maps/NavelRock_Fork/events.inc similarity index 100% rename from data/maps/events/NavelRock_Fork.inc rename to data/maps/NavelRock_Fork/events.inc diff --git a/data/scripts/maps/NavelRock_Fork.inc b/data/maps/NavelRock_Fork/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Fork.inc rename to data/maps/NavelRock_Fork/scripts.inc diff --git a/data/maps/events/NavelRock_Harbor.inc b/data/maps/NavelRock_Harbor/events.inc similarity index 100% rename from data/maps/events/NavelRock_Harbor.inc rename to data/maps/NavelRock_Harbor/events.inc diff --git a/data/scripts/maps/NavelRock_Harbor.inc b/data/maps/NavelRock_Harbor/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Harbor.inc rename to data/maps/NavelRock_Harbor/scripts.inc diff --git a/data/maps/events/NavelRock_Top.inc b/data/maps/NavelRock_Top/events.inc similarity index 100% rename from data/maps/events/NavelRock_Top.inc rename to data/maps/NavelRock_Top/events.inc diff --git a/data/scripts/maps/NavelRock_Top.inc b/data/maps/NavelRock_Top/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Top.inc rename to data/maps/NavelRock_Top/scripts.inc diff --git a/data/maps/events/NavelRock_Up1.inc b/data/maps/NavelRock_Up1/events.inc similarity index 100% rename from data/maps/events/NavelRock_Up1.inc rename to data/maps/NavelRock_Up1/events.inc diff --git a/data/scripts/maps/NavelRock_Up1.inc b/data/maps/NavelRock_Up1/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Up1.inc rename to data/maps/NavelRock_Up1/scripts.inc diff --git a/data/maps/events/NavelRock_Up2.inc b/data/maps/NavelRock_Up2/events.inc similarity index 100% rename from data/maps/events/NavelRock_Up2.inc rename to data/maps/NavelRock_Up2/events.inc diff --git a/data/scripts/maps/NavelRock_Up2.inc b/data/maps/NavelRock_Up2/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Up2.inc rename to data/maps/NavelRock_Up2/scripts.inc diff --git a/data/maps/events/NavelRock_Up3.inc b/data/maps/NavelRock_Up3/events.inc similarity index 100% rename from data/maps/events/NavelRock_Up3.inc rename to data/maps/NavelRock_Up3/events.inc diff --git a/data/scripts/maps/NavelRock_Up3.inc b/data/maps/NavelRock_Up3/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Up3.inc rename to data/maps/NavelRock_Up3/scripts.inc diff --git a/data/maps/events/NavelRock_Up4.inc b/data/maps/NavelRock_Up4/events.inc similarity index 100% rename from data/maps/events/NavelRock_Up4.inc rename to data/maps/NavelRock_Up4/events.inc diff --git a/data/scripts/maps/NavelRock_Up4.inc b/data/maps/NavelRock_Up4/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Up4.inc rename to data/maps/NavelRock_Up4/scripts.inc diff --git a/data/maps/events/NewMauville_Entrance.inc b/data/maps/NewMauville_Entrance/events.inc similarity index 100% rename from data/maps/events/NewMauville_Entrance.inc rename to data/maps/NewMauville_Entrance/events.inc diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/maps/NewMauville_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/NewMauville_Entrance.inc rename to data/maps/NewMauville_Entrance/scripts.inc diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/NewMauville_Inside/events.inc similarity index 100% rename from data/maps/events/NewMauville_Inside.inc rename to data/maps/NewMauville_Inside/events.inc diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/maps/NewMauville_Inside/scripts.inc similarity index 100% rename from data/scripts/maps/NewMauville_Inside.inc rename to data/maps/NewMauville_Inside/scripts.inc diff --git a/data/maps/events/OldaleTown.inc b/data/maps/OldaleTown/events.inc similarity index 100% rename from data/maps/events/OldaleTown.inc rename to data/maps/OldaleTown/events.inc diff --git a/data/scripts/maps/OldaleTown.inc b/data/maps/OldaleTown/scripts.inc similarity index 100% rename from data/scripts/maps/OldaleTown.inc rename to data/maps/OldaleTown/scripts.inc diff --git a/data/maps/events/OldaleTown_House1.inc b/data/maps/OldaleTown_House1/events.inc similarity index 100% rename from data/maps/events/OldaleTown_House1.inc rename to data/maps/OldaleTown_House1/events.inc diff --git a/data/scripts/maps/OldaleTown_House1.inc b/data/maps/OldaleTown_House1/scripts.inc similarity index 100% rename from data/scripts/maps/OldaleTown_House1.inc rename to data/maps/OldaleTown_House1/scripts.inc diff --git a/data/maps/events/OldaleTown_House2.inc b/data/maps/OldaleTown_House2/events.inc similarity index 100% rename from data/maps/events/OldaleTown_House2.inc rename to data/maps/OldaleTown_House2/events.inc diff --git a/data/scripts/maps/OldaleTown_House2.inc b/data/maps/OldaleTown_House2/scripts.inc similarity index 100% rename from data/scripts/maps/OldaleTown_House2.inc rename to data/maps/OldaleTown_House2/scripts.inc diff --git a/data/maps/events/OldaleTown_Mart.inc b/data/maps/OldaleTown_Mart/events.inc similarity index 100% rename from data/maps/events/OldaleTown_Mart.inc rename to data/maps/OldaleTown_Mart/events.inc diff --git a/data/scripts/maps/OldaleTown_Mart.inc b/data/maps/OldaleTown_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/OldaleTown_Mart.inc rename to data/maps/OldaleTown_Mart/scripts.inc diff --git a/data/maps/events/OldaleTown_PokemonCenter_1F.inc b/data/maps/OldaleTown_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/OldaleTown_PokemonCenter_1F.inc rename to data/maps/OldaleTown_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/OldaleTown_PokemonCenter_1F.inc rename to data/maps/OldaleTown_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/OldaleTown_PokemonCenter_2F.inc b/data/maps/OldaleTown_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/OldaleTown_PokemonCenter_2F.inc rename to data/maps/OldaleTown_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_2F.inc b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/OldaleTown_PokemonCenter_2F.inc rename to data/maps/OldaleTown_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/PacifidlogTown.inc b/data/maps/PacifidlogTown/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown.inc rename to data/maps/PacifidlogTown/events.inc diff --git a/data/scripts/maps/PacifidlogTown.inc b/data/maps/PacifidlogTown/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown.inc rename to data/maps/PacifidlogTown/scripts.inc diff --git a/data/maps/events/PacifidlogTown_House1.inc b/data/maps/PacifidlogTown_House1/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_House1.inc rename to data/maps/PacifidlogTown_House1/events.inc diff --git a/data/scripts/maps/PacifidlogTown_House1.inc b/data/maps/PacifidlogTown_House1/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_House1.inc rename to data/maps/PacifidlogTown_House1/scripts.inc diff --git a/data/maps/events/PacifidlogTown_House2.inc b/data/maps/PacifidlogTown_House2/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_House2.inc rename to data/maps/PacifidlogTown_House2/events.inc diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/maps/PacifidlogTown_House2/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_House2.inc rename to data/maps/PacifidlogTown_House2/scripts.inc diff --git a/data/maps/events/PacifidlogTown_House3.inc b/data/maps/PacifidlogTown_House3/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_House3.inc rename to data/maps/PacifidlogTown_House3/events.inc diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/maps/PacifidlogTown_House3/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_House3.inc rename to data/maps/PacifidlogTown_House3/scripts.inc diff --git a/data/maps/events/PacifidlogTown_House4.inc b/data/maps/PacifidlogTown_House4/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_House4.inc rename to data/maps/PacifidlogTown_House4/events.inc diff --git a/data/scripts/maps/PacifidlogTown_House4.inc b/data/maps/PacifidlogTown_House4/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_House4.inc rename to data/maps/PacifidlogTown_House4/scripts.inc diff --git a/data/maps/events/PacifidlogTown_House5.inc b/data/maps/PacifidlogTown_House5/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_House5.inc rename to data/maps/PacifidlogTown_House5/events.inc diff --git a/data/scripts/maps/PacifidlogTown_House5.inc b/data/maps/PacifidlogTown_House5/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_House5.inc rename to data/maps/PacifidlogTown_House5/scripts.inc diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_PokemonCenter_1F.inc rename to data/maps/PacifidlogTown_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc rename to data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_PokemonCenter_2F.inc rename to data/maps/PacifidlogTown_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc rename to data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/PetalburgCity/events.inc similarity index 100% rename from data/maps/events/PetalburgCity.inc rename to data/maps/PetalburgCity/events.inc diff --git a/data/scripts/maps/PetalburgCity.inc b/data/maps/PetalburgCity/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity.inc rename to data/maps/PetalburgCity/scripts.inc diff --git a/data/maps/events/PetalburgCity_Gym.inc b/data/maps/PetalburgCity_Gym/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_Gym.inc rename to data/maps/PetalburgCity_Gym/events.inc diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/maps/PetalburgCity_Gym/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_Gym.inc rename to data/maps/PetalburgCity_Gym/scripts.inc diff --git a/data/maps/events/PetalburgCity_House1.inc b/data/maps/PetalburgCity_House1/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_House1.inc rename to data/maps/PetalburgCity_House1/events.inc diff --git a/data/scripts/maps/PetalburgCity_House1.inc b/data/maps/PetalburgCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_House1.inc rename to data/maps/PetalburgCity_House1/scripts.inc diff --git a/data/maps/events/PetalburgCity_House2.inc b/data/maps/PetalburgCity_House2/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_House2.inc rename to data/maps/PetalburgCity_House2/events.inc diff --git a/data/scripts/maps/PetalburgCity_House2.inc b/data/maps/PetalburgCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_House2.inc rename to data/maps/PetalburgCity_House2/scripts.inc diff --git a/data/maps/events/PetalburgCity_Mart.inc b/data/maps/PetalburgCity_Mart/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_Mart.inc rename to data/maps/PetalburgCity_Mart/events.inc diff --git a/data/scripts/maps/PetalburgCity_Mart.inc b/data/maps/PetalburgCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_Mart.inc rename to data/maps/PetalburgCity_Mart/scripts.inc diff --git a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_PokemonCenter_1F.inc rename to data/maps/PetalburgCity_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc rename to data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_PokemonCenter_2F.inc rename to data/maps/PetalburgCity_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc rename to data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/PetalburgCity_WallysHouse.inc b/data/maps/PetalburgCity_WallysHouse/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_WallysHouse.inc rename to data/maps/PetalburgCity_WallysHouse/events.inc diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_WallysHouse.inc rename to data/maps/PetalburgCity_WallysHouse/scripts.inc diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/PetalburgWoods/events.inc similarity index 100% rename from data/maps/events/PetalburgWoods.inc rename to data/maps/PetalburgWoods/events.inc diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/maps/PetalburgWoods/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgWoods.inc rename to data/maps/PetalburgWoods/scripts.inc diff --git a/data/maps/events/RecordCorner.inc b/data/maps/RecordCorner/events.inc similarity index 100% rename from data/maps/events/RecordCorner.inc rename to data/maps/RecordCorner/events.inc diff --git a/data/scripts/maps/RecordCorner.inc b/data/maps/RecordCorner/scripts.inc similarity index 100% rename from data/scripts/maps/RecordCorner.inc rename to data/maps/RecordCorner/scripts.inc diff --git a/data/maps/events/Route101.inc b/data/maps/Route101/events.inc similarity index 100% rename from data/maps/events/Route101.inc rename to data/maps/Route101/events.inc diff --git a/data/scripts/maps/Route101.inc b/data/maps/Route101/scripts.inc similarity index 100% rename from data/scripts/maps/Route101.inc rename to data/maps/Route101/scripts.inc diff --git a/data/maps/events/Route102.inc b/data/maps/Route102/events.inc similarity index 100% rename from data/maps/events/Route102.inc rename to data/maps/Route102/events.inc diff --git a/data/scripts/maps/Route102.inc b/data/maps/Route102/scripts.inc similarity index 100% rename from data/scripts/maps/Route102.inc rename to data/maps/Route102/scripts.inc diff --git a/data/maps/events/Route103.inc b/data/maps/Route103/events.inc similarity index 100% rename from data/maps/events/Route103.inc rename to data/maps/Route103/events.inc diff --git a/data/scripts/maps/Route103.inc b/data/maps/Route103/scripts.inc similarity index 100% rename from data/scripts/maps/Route103.inc rename to data/maps/Route103/scripts.inc diff --git a/data/maps/events/Route104.inc b/data/maps/Route104/events.inc similarity index 100% rename from data/maps/events/Route104.inc rename to data/maps/Route104/events.inc diff --git a/data/scripts/maps/Route104.inc b/data/maps/Route104/scripts.inc similarity index 100% rename from data/scripts/maps/Route104.inc rename to data/maps/Route104/scripts.inc diff --git a/data/maps/events/Route104_MrBrineysHouse.inc b/data/maps/Route104_MrBrineysHouse/events.inc similarity index 100% rename from data/maps/events/Route104_MrBrineysHouse.inc rename to data/maps/Route104_MrBrineysHouse/events.inc diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route104_MrBrineysHouse.inc rename to data/maps/Route104_MrBrineysHouse/scripts.inc diff --git a/data/maps/events/Route104_PrettyPetalFlowerShop.inc b/data/maps/Route104_PrettyPetalFlowerShop/events.inc similarity index 100% rename from data/maps/events/Route104_PrettyPetalFlowerShop.inc rename to data/maps/Route104_PrettyPetalFlowerShop/events.inc diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc similarity index 100% rename from data/scripts/maps/Route104_PrettyPetalFlowerShop.inc rename to data/maps/Route104_PrettyPetalFlowerShop/scripts.inc diff --git a/data/maps/events/Route104_Prototype.inc b/data/maps/Route104_Prototype/events.inc similarity index 100% rename from data/maps/events/Route104_Prototype.inc rename to data/maps/Route104_Prototype/events.inc diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/maps/Route104_Prototype/scripts.inc similarity index 100% rename from data/scripts/maps/Route104_Prototype.inc rename to data/maps/Route104_Prototype/scripts.inc diff --git a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc similarity index 100% rename from data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc rename to data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc diff --git a/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc similarity index 100% rename from data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc rename to data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc diff --git a/data/maps/events/Route105.inc b/data/maps/Route105/events.inc similarity index 100% rename from data/maps/events/Route105.inc rename to data/maps/Route105/events.inc diff --git a/data/scripts/maps/Route105.inc b/data/maps/Route105/scripts.inc similarity index 100% rename from data/scripts/maps/Route105.inc rename to data/maps/Route105/scripts.inc diff --git a/data/maps/events/Route106.inc b/data/maps/Route106/events.inc similarity index 100% rename from data/maps/events/Route106.inc rename to data/maps/Route106/events.inc diff --git a/data/scripts/maps/Route106.inc b/data/maps/Route106/scripts.inc similarity index 100% rename from data/scripts/maps/Route106.inc rename to data/maps/Route106/scripts.inc diff --git a/data/maps/events/Route107.inc b/data/maps/Route107/events.inc similarity index 100% rename from data/maps/events/Route107.inc rename to data/maps/Route107/events.inc diff --git a/data/scripts/maps/Route107.inc b/data/maps/Route107/scripts.inc similarity index 100% rename from data/scripts/maps/Route107.inc rename to data/maps/Route107/scripts.inc diff --git a/data/maps/events/Route108.inc b/data/maps/Route108/events.inc similarity index 100% rename from data/maps/events/Route108.inc rename to data/maps/Route108/events.inc diff --git a/data/scripts/maps/Route108.inc b/data/maps/Route108/scripts.inc similarity index 100% rename from data/scripts/maps/Route108.inc rename to data/maps/Route108/scripts.inc diff --git a/data/maps/events/Route109.inc b/data/maps/Route109/events.inc similarity index 100% rename from data/maps/events/Route109.inc rename to data/maps/Route109/events.inc diff --git a/data/scripts/maps/Route109.inc b/data/maps/Route109/scripts.inc similarity index 100% rename from data/scripts/maps/Route109.inc rename to data/maps/Route109/scripts.inc diff --git a/data/maps/events/Route109_SeashoreHouse.inc b/data/maps/Route109_SeashoreHouse/events.inc similarity index 100% rename from data/maps/events/Route109_SeashoreHouse.inc rename to data/maps/Route109_SeashoreHouse/events.inc diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/maps/Route109_SeashoreHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route109_SeashoreHouse.inc rename to data/maps/Route109_SeashoreHouse/scripts.inc diff --git a/data/maps/events/Route110.inc b/data/maps/Route110/events.inc similarity index 100% rename from data/maps/events/Route110.inc rename to data/maps/Route110/events.inc diff --git a/data/scripts/maps/Route110.inc b/data/maps/Route110/scripts.inc similarity index 100% rename from data/scripts/maps/Route110.inc rename to data/maps/Route110/scripts.inc diff --git a/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc b/data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc similarity index 100% rename from data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc rename to data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc b/data/maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc rename to data/maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc diff --git a/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc b/data/maps/Route110_SeasideCyclingRoadEntrance2/events.inc similarity index 100% rename from data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc rename to data/maps/Route110_SeasideCyclingRoadEntrance2/events.inc diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc b/data/maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc rename to data/maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc diff --git a/data/maps/events/Route110_TrickHouseCorridor.inc b/data/maps/Route110_TrickHouseCorridor/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHouseCorridor.inc rename to data/maps/Route110_TrickHouseCorridor/events.inc diff --git a/data/scripts/maps/Route110_TrickHouseCorridor.inc b/data/maps/Route110_TrickHouseCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHouseCorridor.inc rename to data/maps/Route110_TrickHouseCorridor/scripts.inc diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/Route110_TrickHouseEnd/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHouseEnd.inc rename to data/maps/Route110_TrickHouseEnd/events.inc diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHouseEnd.inc rename to data/maps/Route110_TrickHouseEnd/scripts.inc diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/Route110_TrickHouseEntrance/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHouseEntrance.inc rename to data/maps/Route110_TrickHouseEntrance/events.inc diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHouseEntrance.inc rename to data/maps/Route110_TrickHouseEntrance/scripts.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle1.inc rename to data/maps/Route110_TrickHousePuzzle1/events.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle1.inc rename to data/maps/Route110_TrickHousePuzzle1/scripts.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle2.inc rename to data/maps/Route110_TrickHousePuzzle2/events.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle2.inc rename to data/maps/Route110_TrickHousePuzzle2/scripts.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle3.inc rename to data/maps/Route110_TrickHousePuzzle3/events.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle3.inc rename to data/maps/Route110_TrickHousePuzzle3/scripts.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle4.inc rename to data/maps/Route110_TrickHousePuzzle4/events.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle4.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle4.inc rename to data/maps/Route110_TrickHousePuzzle4/scripts.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle5.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle5.inc rename to data/maps/Route110_TrickHousePuzzle5/events.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle5.inc rename to data/maps/Route110_TrickHousePuzzle5/scripts.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle6.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle6.inc rename to data/maps/Route110_TrickHousePuzzle6/events.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle6.inc rename to data/maps/Route110_TrickHousePuzzle6/scripts.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle7.inc rename to data/maps/Route110_TrickHousePuzzle7/events.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle7.inc rename to data/maps/Route110_TrickHousePuzzle7/scripts.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle8.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle8.inc rename to data/maps/Route110_TrickHousePuzzle8/events.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle8.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle8.inc rename to data/maps/Route110_TrickHousePuzzle8/scripts.inc diff --git a/data/maps/events/Route111.inc b/data/maps/Route111/events.inc similarity index 100% rename from data/maps/events/Route111.inc rename to data/maps/Route111/events.inc diff --git a/data/scripts/maps/Route111.inc b/data/maps/Route111/scripts.inc similarity index 100% rename from data/scripts/maps/Route111.inc rename to data/maps/Route111/scripts.inc diff --git a/data/maps/events/Route111_OldLadysRestStop.inc b/data/maps/Route111_OldLadysRestStop/events.inc similarity index 100% rename from data/maps/events/Route111_OldLadysRestStop.inc rename to data/maps/Route111_OldLadysRestStop/events.inc diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc similarity index 100% rename from data/scripts/maps/Route111_OldLadysRestStop.inc rename to data/maps/Route111_OldLadysRestStop/scripts.inc diff --git a/data/maps/events/Route111_WinstrateFamilysHouse.inc b/data/maps/Route111_WinstrateFamilysHouse/events.inc similarity index 100% rename from data/maps/events/Route111_WinstrateFamilysHouse.inc rename to data/maps/Route111_WinstrateFamilysHouse/events.inc diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route111_WinstrateFamilysHouse.inc rename to data/maps/Route111_WinstrateFamilysHouse/scripts.inc diff --git a/data/maps/events/Route112.inc b/data/maps/Route112/events.inc similarity index 100% rename from data/maps/events/Route112.inc rename to data/maps/Route112/events.inc diff --git a/data/scripts/maps/Route112.inc b/data/maps/Route112/scripts.inc similarity index 100% rename from data/scripts/maps/Route112.inc rename to data/maps/Route112/scripts.inc diff --git a/data/maps/events/Route112_CableCarStation.inc b/data/maps/Route112_CableCarStation/events.inc similarity index 100% rename from data/maps/events/Route112_CableCarStation.inc rename to data/maps/Route112_CableCarStation/events.inc diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/maps/Route112_CableCarStation/scripts.inc similarity index 100% rename from data/scripts/maps/Route112_CableCarStation.inc rename to data/maps/Route112_CableCarStation/scripts.inc diff --git a/data/maps/events/Route113.inc b/data/maps/Route113/events.inc similarity index 100% rename from data/maps/events/Route113.inc rename to data/maps/Route113/events.inc diff --git a/data/scripts/maps/Route113.inc b/data/maps/Route113/scripts.inc similarity index 100% rename from data/scripts/maps/Route113.inc rename to data/maps/Route113/scripts.inc diff --git a/data/maps/events/Route113_GlassWorkshop.inc b/data/maps/Route113_GlassWorkshop/events.inc similarity index 100% rename from data/maps/events/Route113_GlassWorkshop.inc rename to data/maps/Route113_GlassWorkshop/events.inc diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/maps/Route113_GlassWorkshop/scripts.inc similarity index 100% rename from data/scripts/maps/Route113_GlassWorkshop.inc rename to data/maps/Route113_GlassWorkshop/scripts.inc diff --git a/data/maps/events/Route114.inc b/data/maps/Route114/events.inc similarity index 100% rename from data/maps/events/Route114.inc rename to data/maps/Route114/events.inc diff --git a/data/scripts/maps/Route114.inc b/data/maps/Route114/scripts.inc similarity index 100% rename from data/scripts/maps/Route114.inc rename to data/maps/Route114/scripts.inc diff --git a/data/maps/events/Route114_FossilManiacsHouse.inc b/data/maps/Route114_FossilManiacsHouse/events.inc similarity index 100% rename from data/maps/events/Route114_FossilManiacsHouse.inc rename to data/maps/Route114_FossilManiacsHouse/events.inc diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route114_FossilManiacsHouse.inc rename to data/maps/Route114_FossilManiacsHouse/scripts.inc diff --git a/data/maps/events/Route114_FossilManiacsTunnel.inc b/data/maps/Route114_FossilManiacsTunnel/events.inc similarity index 100% rename from data/maps/events/Route114_FossilManiacsTunnel.inc rename to data/maps/Route114_FossilManiacsTunnel/events.inc diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc similarity index 100% rename from data/scripts/maps/Route114_FossilManiacsTunnel.inc rename to data/maps/Route114_FossilManiacsTunnel/scripts.inc diff --git a/data/maps/events/Route114_LanettesHouse.inc b/data/maps/Route114_LanettesHouse/events.inc similarity index 100% rename from data/maps/events/Route114_LanettesHouse.inc rename to data/maps/Route114_LanettesHouse/events.inc diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/maps/Route114_LanettesHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route114_LanettesHouse.inc rename to data/maps/Route114_LanettesHouse/scripts.inc diff --git a/data/maps/events/Route115.inc b/data/maps/Route115/events.inc similarity index 100% rename from data/maps/events/Route115.inc rename to data/maps/Route115/events.inc diff --git a/data/scripts/maps/Route115.inc b/data/maps/Route115/scripts.inc similarity index 100% rename from data/scripts/maps/Route115.inc rename to data/maps/Route115/scripts.inc diff --git a/data/maps/events/Route116.inc b/data/maps/Route116/events.inc similarity index 100% rename from data/maps/events/Route116.inc rename to data/maps/Route116/events.inc diff --git a/data/scripts/maps/Route116.inc b/data/maps/Route116/scripts.inc similarity index 100% rename from data/scripts/maps/Route116.inc rename to data/maps/Route116/scripts.inc diff --git a/data/maps/events/Route116_TunnelersRestHouse.inc b/data/maps/Route116_TunnelersRestHouse/events.inc similarity index 100% rename from data/maps/events/Route116_TunnelersRestHouse.inc rename to data/maps/Route116_TunnelersRestHouse/events.inc diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route116_TunnelersRestHouse.inc rename to data/maps/Route116_TunnelersRestHouse/scripts.inc diff --git a/data/maps/events/Route117.inc b/data/maps/Route117/events.inc similarity index 100% rename from data/maps/events/Route117.inc rename to data/maps/Route117/events.inc diff --git a/data/scripts/maps/Route117.inc b/data/maps/Route117/scripts.inc similarity index 100% rename from data/scripts/maps/Route117.inc rename to data/maps/Route117/scripts.inc diff --git a/data/maps/events/Route117_PokemonDayCare.inc b/data/maps/Route117_PokemonDayCare/events.inc similarity index 100% rename from data/maps/events/Route117_PokemonDayCare.inc rename to data/maps/Route117_PokemonDayCare/events.inc diff --git a/data/scripts/maps/Route117_PokemonDayCare.inc b/data/maps/Route117_PokemonDayCare/scripts.inc similarity index 100% rename from data/scripts/maps/Route117_PokemonDayCare.inc rename to data/maps/Route117_PokemonDayCare/scripts.inc diff --git a/data/maps/events/Route118.inc b/data/maps/Route118/events.inc similarity index 100% rename from data/maps/events/Route118.inc rename to data/maps/Route118/events.inc diff --git a/data/scripts/maps/Route118.inc b/data/maps/Route118/scripts.inc similarity index 100% rename from data/scripts/maps/Route118.inc rename to data/maps/Route118/scripts.inc diff --git a/data/maps/events/Route119.inc b/data/maps/Route119/events.inc similarity index 100% rename from data/maps/events/Route119.inc rename to data/maps/Route119/events.inc diff --git a/data/scripts/maps/Route119.inc b/data/maps/Route119/scripts.inc similarity index 100% rename from data/scripts/maps/Route119.inc rename to data/maps/Route119/scripts.inc diff --git a/data/maps/events/Route119_House.inc b/data/maps/Route119_House/events.inc similarity index 100% rename from data/maps/events/Route119_House.inc rename to data/maps/Route119_House/events.inc diff --git a/data/scripts/maps/Route119_House.inc b/data/maps/Route119_House/scripts.inc similarity index 100% rename from data/scripts/maps/Route119_House.inc rename to data/maps/Route119_House/scripts.inc diff --git a/data/maps/events/Route119_WeatherInstitute_1F.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc similarity index 100% rename from data/maps/events/Route119_WeatherInstitute_1F.inc rename to data/maps/Route119_WeatherInstitute_1F/events.inc diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc similarity index 100% rename from data/scripts/maps/Route119_WeatherInstitute_1F.inc rename to data/maps/Route119_WeatherInstitute_1F/scripts.inc diff --git a/data/maps/events/Route119_WeatherInstitute_2F.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc similarity index 100% rename from data/maps/events/Route119_WeatherInstitute_2F.inc rename to data/maps/Route119_WeatherInstitute_2F/events.inc diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc similarity index 100% rename from data/scripts/maps/Route119_WeatherInstitute_2F.inc rename to data/maps/Route119_WeatherInstitute_2F/scripts.inc diff --git a/data/maps/events/Route120.inc b/data/maps/Route120/events.inc similarity index 100% rename from data/maps/events/Route120.inc rename to data/maps/Route120/events.inc diff --git a/data/scripts/maps/Route120.inc b/data/maps/Route120/scripts.inc similarity index 100% rename from data/scripts/maps/Route120.inc rename to data/maps/Route120/scripts.inc diff --git a/data/maps/events/Route121.inc b/data/maps/Route121/events.inc similarity index 100% rename from data/maps/events/Route121.inc rename to data/maps/Route121/events.inc diff --git a/data/scripts/maps/Route121.inc b/data/maps/Route121/scripts.inc similarity index 100% rename from data/scripts/maps/Route121.inc rename to data/maps/Route121/scripts.inc diff --git a/data/maps/events/Route121_SafariZoneEntrance.inc b/data/maps/Route121_SafariZoneEntrance/events.inc similarity index 100% rename from data/maps/events/Route121_SafariZoneEntrance.inc rename to data/maps/Route121_SafariZoneEntrance/events.inc diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc similarity index 100% rename from data/scripts/maps/Route121_SafariZoneEntrance.inc rename to data/maps/Route121_SafariZoneEntrance/scripts.inc diff --git a/data/maps/events/Route122.inc b/data/maps/Route122/events.inc similarity index 100% rename from data/maps/events/Route122.inc rename to data/maps/Route122/events.inc diff --git a/data/scripts/maps/Route122.inc b/data/maps/Route122/scripts.inc similarity index 100% rename from data/scripts/maps/Route122.inc rename to data/maps/Route122/scripts.inc diff --git a/data/maps/events/Route123.inc b/data/maps/Route123/events.inc similarity index 100% rename from data/maps/events/Route123.inc rename to data/maps/Route123/events.inc diff --git a/data/scripts/maps/Route123.inc b/data/maps/Route123/scripts.inc similarity index 100% rename from data/scripts/maps/Route123.inc rename to data/maps/Route123/scripts.inc diff --git a/data/maps/events/Route123_BerryMastersHouse.inc b/data/maps/Route123_BerryMastersHouse/events.inc similarity index 100% rename from data/maps/events/Route123_BerryMastersHouse.inc rename to data/maps/Route123_BerryMastersHouse/events.inc diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route123_BerryMastersHouse.inc rename to data/maps/Route123_BerryMastersHouse/scripts.inc diff --git a/data/maps/events/Route124.inc b/data/maps/Route124/events.inc similarity index 100% rename from data/maps/events/Route124.inc rename to data/maps/Route124/events.inc diff --git a/data/scripts/maps/Route124.inc b/data/maps/Route124/scripts.inc similarity index 100% rename from data/scripts/maps/Route124.inc rename to data/maps/Route124/scripts.inc diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc similarity index 100% rename from data/maps/events/Route124_DivingTreasureHuntersHouse.inc rename to data/maps/Route124_DivingTreasureHuntersHouse/events.inc diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc rename to data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc diff --git a/data/maps/events/Route125.inc b/data/maps/Route125/events.inc similarity index 100% rename from data/maps/events/Route125.inc rename to data/maps/Route125/events.inc diff --git a/data/scripts/maps/Route125.inc b/data/maps/Route125/scripts.inc similarity index 100% rename from data/scripts/maps/Route125.inc rename to data/maps/Route125/scripts.inc diff --git a/data/maps/events/Route126.inc b/data/maps/Route126/events.inc similarity index 100% rename from data/maps/events/Route126.inc rename to data/maps/Route126/events.inc diff --git a/data/scripts/maps/Route126.inc b/data/maps/Route126/scripts.inc similarity index 100% rename from data/scripts/maps/Route126.inc rename to data/maps/Route126/scripts.inc diff --git a/data/maps/events/Route127.inc b/data/maps/Route127/events.inc similarity index 100% rename from data/maps/events/Route127.inc rename to data/maps/Route127/events.inc diff --git a/data/scripts/maps/Route127.inc b/data/maps/Route127/scripts.inc similarity index 100% rename from data/scripts/maps/Route127.inc rename to data/maps/Route127/scripts.inc diff --git a/data/maps/events/Route128.inc b/data/maps/Route128/events.inc similarity index 100% rename from data/maps/events/Route128.inc rename to data/maps/Route128/events.inc diff --git a/data/scripts/maps/Route128.inc b/data/maps/Route128/scripts.inc similarity index 100% rename from data/scripts/maps/Route128.inc rename to data/maps/Route128/scripts.inc diff --git a/data/maps/events/Route129.inc b/data/maps/Route129/events.inc similarity index 100% rename from data/maps/events/Route129.inc rename to data/maps/Route129/events.inc diff --git a/data/scripts/maps/Route129.inc b/data/maps/Route129/scripts.inc similarity index 100% rename from data/scripts/maps/Route129.inc rename to data/maps/Route129/scripts.inc diff --git a/data/maps/events/Route130.inc b/data/maps/Route130/events.inc similarity index 100% rename from data/maps/events/Route130.inc rename to data/maps/Route130/events.inc diff --git a/data/scripts/maps/Route130.inc b/data/maps/Route130/scripts.inc similarity index 100% rename from data/scripts/maps/Route130.inc rename to data/maps/Route130/scripts.inc diff --git a/data/maps/events/Route131.inc b/data/maps/Route131/events.inc similarity index 100% rename from data/maps/events/Route131.inc rename to data/maps/Route131/events.inc diff --git a/data/scripts/maps/Route131.inc b/data/maps/Route131/scripts.inc similarity index 100% rename from data/scripts/maps/Route131.inc rename to data/maps/Route131/scripts.inc diff --git a/data/maps/events/Route132.inc b/data/maps/Route132/events.inc similarity index 100% rename from data/maps/events/Route132.inc rename to data/maps/Route132/events.inc diff --git a/data/scripts/maps/Route132.inc b/data/maps/Route132/scripts.inc similarity index 100% rename from data/scripts/maps/Route132.inc rename to data/maps/Route132/scripts.inc diff --git a/data/maps/events/Route133.inc b/data/maps/Route133/events.inc similarity index 100% rename from data/maps/events/Route133.inc rename to data/maps/Route133/events.inc diff --git a/data/scripts/maps/Route133.inc b/data/maps/Route133/scripts.inc similarity index 100% rename from data/scripts/maps/Route133.inc rename to data/maps/Route133/scripts.inc diff --git a/data/maps/events/Route134.inc b/data/maps/Route134/events.inc similarity index 100% rename from data/maps/events/Route134.inc rename to data/maps/Route134/events.inc diff --git a/data/scripts/maps/Route134.inc b/data/maps/Route134/scripts.inc similarity index 100% rename from data/scripts/maps/Route134.inc rename to data/maps/Route134/scripts.inc diff --git a/data/maps/events/RustboroCity.inc b/data/maps/RustboroCity/events.inc similarity index 100% rename from data/maps/events/RustboroCity.inc rename to data/maps/RustboroCity/events.inc diff --git a/data/scripts/maps/RustboroCity.inc b/data/maps/RustboroCity/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity.inc rename to data/maps/RustboroCity/scripts.inc diff --git a/data/maps/events/RustboroCity_CuttersHouse.inc b/data/maps/RustboroCity_CuttersHouse/events.inc similarity index 100% rename from data/maps/events/RustboroCity_CuttersHouse.inc rename to data/maps/RustboroCity_CuttersHouse/events.inc diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.inc b/data/maps/RustboroCity_CuttersHouse/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_CuttersHouse.inc rename to data/maps/RustboroCity_CuttersHouse/scripts.inc diff --git a/data/maps/events/RustboroCity_DevonCorp_1F.inc b/data/maps/RustboroCity_DevonCorp_1F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_DevonCorp_1F.inc rename to data/maps/RustboroCity_DevonCorp_1F/events.inc diff --git a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_DevonCorp_1F.inc rename to data/maps/RustboroCity_DevonCorp_1F/scripts.inc diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.inc b/data/maps/RustboroCity_DevonCorp_2F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_DevonCorp_2F.inc rename to data/maps/RustboroCity_DevonCorp_2F/events.inc diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_DevonCorp_2F.inc rename to data/maps/RustboroCity_DevonCorp_2F/scripts.inc diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_DevonCorp_3F.inc rename to data/maps/RustboroCity_DevonCorp_3F/events.inc diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_DevonCorp_3F.inc rename to data/maps/RustboroCity_DevonCorp_3F/scripts.inc diff --git a/data/maps/events/RustboroCity_Flat1_1F.inc b/data/maps/RustboroCity_Flat1_1F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Flat1_1F.inc rename to data/maps/RustboroCity_Flat1_1F/events.inc diff --git a/data/scripts/maps/RustboroCity_Flat1_1F.inc b/data/maps/RustboroCity_Flat1_1F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Flat1_1F.inc rename to data/maps/RustboroCity_Flat1_1F/scripts.inc diff --git a/data/maps/events/RustboroCity_Flat1_2F.inc b/data/maps/RustboroCity_Flat1_2F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Flat1_2F.inc rename to data/maps/RustboroCity_Flat1_2F/events.inc diff --git a/data/scripts/maps/RustboroCity_Flat1_2F.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Flat1_2F.inc rename to data/maps/RustboroCity_Flat1_2F/scripts.inc diff --git a/data/maps/events/RustboroCity_Flat2_1F.inc b/data/maps/RustboroCity_Flat2_1F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Flat2_1F.inc rename to data/maps/RustboroCity_Flat2_1F/events.inc diff --git a/data/scripts/maps/RustboroCity_Flat2_1F.inc b/data/maps/RustboroCity_Flat2_1F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Flat2_1F.inc rename to data/maps/RustboroCity_Flat2_1F/scripts.inc diff --git a/data/maps/events/RustboroCity_Flat2_2F.inc b/data/maps/RustboroCity_Flat2_2F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Flat2_2F.inc rename to data/maps/RustboroCity_Flat2_2F/events.inc diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Flat2_2F.inc rename to data/maps/RustboroCity_Flat2_2F/scripts.inc diff --git a/data/maps/events/RustboroCity_Flat2_3F.inc b/data/maps/RustboroCity_Flat2_3F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Flat2_3F.inc rename to data/maps/RustboroCity_Flat2_3F/events.inc diff --git a/data/scripts/maps/RustboroCity_Flat2_3F.inc b/data/maps/RustboroCity_Flat2_3F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Flat2_3F.inc rename to data/maps/RustboroCity_Flat2_3F/scripts.inc diff --git a/data/maps/events/RustboroCity_Gym.inc b/data/maps/RustboroCity_Gym/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Gym.inc rename to data/maps/RustboroCity_Gym/events.inc diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/maps/RustboroCity_Gym/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Gym.inc rename to data/maps/RustboroCity_Gym/scripts.inc diff --git a/data/maps/events/RustboroCity_House1.inc b/data/maps/RustboroCity_House1/events.inc similarity index 100% rename from data/maps/events/RustboroCity_House1.inc rename to data/maps/RustboroCity_House1/events.inc diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/maps/RustboroCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_House1.inc rename to data/maps/RustboroCity_House1/scripts.inc diff --git a/data/maps/events/RustboroCity_House2.inc b/data/maps/RustboroCity_House2/events.inc similarity index 100% rename from data/maps/events/RustboroCity_House2.inc rename to data/maps/RustboroCity_House2/events.inc diff --git a/data/scripts/maps/RustboroCity_House2.inc b/data/maps/RustboroCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_House2.inc rename to data/maps/RustboroCity_House2/scripts.inc diff --git a/data/maps/events/RustboroCity_House3.inc b/data/maps/RustboroCity_House3/events.inc similarity index 100% rename from data/maps/events/RustboroCity_House3.inc rename to data/maps/RustboroCity_House3/events.inc diff --git a/data/scripts/maps/RustboroCity_House3.inc b/data/maps/RustboroCity_House3/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_House3.inc rename to data/maps/RustboroCity_House3/scripts.inc diff --git a/data/maps/events/RustboroCity_Mart.inc b/data/maps/RustboroCity_Mart/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Mart.inc rename to data/maps/RustboroCity_Mart/events.inc diff --git a/data/scripts/maps/RustboroCity_Mart.inc b/data/maps/RustboroCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Mart.inc rename to data/maps/RustboroCity_Mart/scripts.inc diff --git a/data/maps/events/RustboroCity_PokemonCenter_1F.inc b/data/maps/RustboroCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_PokemonCenter_1F.inc rename to data/maps/RustboroCity_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_PokemonCenter_1F.inc rename to data/maps/RustboroCity_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/RustboroCity_PokemonCenter_2F.inc b/data/maps/RustboroCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_PokemonCenter_2F.inc rename to data/maps/RustboroCity_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_2F.inc b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_PokemonCenter_2F.inc rename to data/maps/RustboroCity_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/RustboroCity_PokemonSchool.inc b/data/maps/RustboroCity_PokemonSchool/events.inc similarity index 100% rename from data/maps/events/RustboroCity_PokemonSchool.inc rename to data/maps/RustboroCity_PokemonSchool/events.inc diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_PokemonSchool.inc rename to data/maps/RustboroCity_PokemonSchool/scripts.inc diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/RusturfTunnel/events.inc similarity index 100% rename from data/maps/events/RusturfTunnel.inc rename to data/maps/RusturfTunnel/events.inc diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/maps/RusturfTunnel/scripts.inc similarity index 100% rename from data/scripts/maps/RusturfTunnel.inc rename to data/maps/RusturfTunnel/scripts.inc diff --git a/data/maps/events/SSTidalCorridor.inc b/data/maps/SSTidalCorridor/events.inc similarity index 100% rename from data/maps/events/SSTidalCorridor.inc rename to data/maps/SSTidalCorridor/events.inc diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/maps/SSTidalCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/SSTidalCorridor.inc rename to data/maps/SSTidalCorridor/scripts.inc diff --git a/data/maps/events/SSTidalLowerDeck.inc b/data/maps/SSTidalLowerDeck/events.inc similarity index 100% rename from data/maps/events/SSTidalLowerDeck.inc rename to data/maps/SSTidalLowerDeck/events.inc diff --git a/data/scripts/maps/SSTidalLowerDeck.inc b/data/maps/SSTidalLowerDeck/scripts.inc similarity index 100% rename from data/scripts/maps/SSTidalLowerDeck.inc rename to data/maps/SSTidalLowerDeck/scripts.inc diff --git a/data/maps/events/SSTidalRooms.inc b/data/maps/SSTidalRooms/events.inc similarity index 100% rename from data/maps/events/SSTidalRooms.inc rename to data/maps/SSTidalRooms/events.inc diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/maps/SSTidalRooms/scripts.inc similarity index 100% rename from data/scripts/maps/SSTidalRooms.inc rename to data/maps/SSTidalRooms/scripts.inc diff --git a/data/maps/events/SafariZone_North.inc b/data/maps/SafariZone_North/events.inc similarity index 100% rename from data/maps/events/SafariZone_North.inc rename to data/maps/SafariZone_North/events.inc diff --git a/data/scripts/maps/SafariZone_North.inc b/data/maps/SafariZone_North/scripts.inc similarity index 100% rename from data/scripts/maps/SafariZone_North.inc rename to data/maps/SafariZone_North/scripts.inc diff --git a/data/maps/events/SafariZone_Northeast.inc b/data/maps/SafariZone_Northeast/events.inc similarity index 100% rename from data/maps/events/SafariZone_Northeast.inc rename to data/maps/SafariZone_Northeast/events.inc diff --git a/data/scripts/maps/SafariZone_Northeast.inc b/data/maps/SafariZone_Northeast/scripts.inc similarity index 100% rename from data/scripts/maps/SafariZone_Northeast.inc rename to data/maps/SafariZone_Northeast/scripts.inc diff --git a/data/maps/events/SafariZone_Northwest.inc b/data/maps/SafariZone_Northwest/events.inc similarity index 100% rename from data/maps/events/SafariZone_Northwest.inc rename to data/maps/SafariZone_Northwest/events.inc diff --git a/data/scripts/maps/SafariZone_Northwest.inc b/data/maps/SafariZone_Northwest/scripts.inc similarity index 100% rename from data/scripts/maps/SafariZone_Northwest.inc rename to data/maps/SafariZone_Northwest/scripts.inc diff --git a/data/maps/events/SafariZone_RestHouse.inc b/data/maps/SafariZone_RestHouse/events.inc similarity index 100% rename from data/maps/events/SafariZone_RestHouse.inc rename to data/maps/SafariZone_RestHouse/events.inc diff --git a/data/scripts/maps/SafariZone_RestHouse.inc b/data/maps/SafariZone_RestHouse/scripts.inc similarity index 100% rename from data/scripts/maps/SafariZone_RestHouse.inc rename to data/maps/SafariZone_RestHouse/scripts.inc diff --git a/data/maps/events/SafariZone_South.inc b/data/maps/SafariZone_South/events.inc similarity index 100% rename from data/maps/events/SafariZone_South.inc rename to data/maps/SafariZone_South/events.inc diff --git a/data/scripts/maps/SafariZone_South.inc b/data/maps/SafariZone_South/scripts.inc similarity index 100% rename from data/scripts/maps/SafariZone_South.inc rename to data/maps/SafariZone_South/scripts.inc diff --git a/data/maps/events/SafariZone_Southeast.inc b/data/maps/SafariZone_Southeast/events.inc similarity index 100% rename from data/maps/events/SafariZone_Southeast.inc rename to data/maps/SafariZone_Southeast/events.inc diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/maps/SafariZone_Southeast/scripts.inc similarity index 100% rename from data/scripts/maps/SafariZone_Southeast.inc rename to data/maps/SafariZone_Southeast/scripts.inc diff --git a/data/maps/events/SafariZone_Southwest.inc b/data/maps/SafariZone_Southwest/events.inc similarity index 100% rename from data/maps/events/SafariZone_Southwest.inc rename to data/maps/SafariZone_Southwest/events.inc diff --git a/data/scripts/maps/SafariZone_Southwest.inc b/data/maps/SafariZone_Southwest/scripts.inc similarity index 100% rename from data/scripts/maps/SafariZone_Southwest.inc rename to data/maps/SafariZone_Southwest/scripts.inc diff --git a/data/maps/events/ScorchedSlab.inc b/data/maps/ScorchedSlab/events.inc similarity index 100% rename from data/maps/events/ScorchedSlab.inc rename to data/maps/ScorchedSlab/events.inc diff --git a/data/scripts/maps/ScorchedSlab.inc b/data/maps/ScorchedSlab/scripts.inc similarity index 100% rename from data/scripts/maps/ScorchedSlab.inc rename to data/maps/ScorchedSlab/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Entrance.inc b/data/maps/SeafloorCavern_Entrance/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Entrance.inc rename to data/maps/SeafloorCavern_Entrance/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Entrance.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Entrance.inc rename to data/maps/SeafloorCavern_Entrance/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/SeafloorCavern_Room1/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room1.inc rename to data/maps/SeafloorCavern_Room1/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Room1.inc b/data/maps/SeafloorCavern_Room1/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room1.inc rename to data/maps/SeafloorCavern_Room1/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/SeafloorCavern_Room2/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room2.inc rename to data/maps/SeafloorCavern_Room2/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Room2.inc b/data/maps/SeafloorCavern_Room2/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room2.inc rename to data/maps/SeafloorCavern_Room2/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/SeafloorCavern_Room3/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room3.inc rename to data/maps/SeafloorCavern_Room3/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Room3.inc b/data/maps/SeafloorCavern_Room3/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room3.inc rename to data/maps/SeafloorCavern_Room3/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Room4.inc b/data/maps/SeafloorCavern_Room4/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room4.inc rename to data/maps/SeafloorCavern_Room4/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Room4.inc b/data/maps/SeafloorCavern_Room4/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room4.inc rename to data/maps/SeafloorCavern_Room4/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/SeafloorCavern_Room5/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room5.inc rename to data/maps/SeafloorCavern_Room5/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Room5.inc b/data/maps/SeafloorCavern_Room5/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room5.inc rename to data/maps/SeafloorCavern_Room5/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Room6.inc b/data/maps/SeafloorCavern_Room6/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room6.inc rename to data/maps/SeafloorCavern_Room6/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Room6.inc b/data/maps/SeafloorCavern_Room6/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room6.inc rename to data/maps/SeafloorCavern_Room6/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Room7.inc b/data/maps/SeafloorCavern_Room7/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room7.inc rename to data/maps/SeafloorCavern_Room7/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Room7.inc b/data/maps/SeafloorCavern_Room7/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room7.inc rename to data/maps/SeafloorCavern_Room7/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Room8.inc b/data/maps/SeafloorCavern_Room8/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room8.inc rename to data/maps/SeafloorCavern_Room8/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Room8.inc b/data/maps/SeafloorCavern_Room8/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room8.inc rename to data/maps/SeafloorCavern_Room8/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/SeafloorCavern_Room9/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room9.inc rename to data/maps/SeafloorCavern_Room9/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/maps/SeafloorCavern_Room9/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room9.inc rename to data/maps/SeafloorCavern_Room9/scripts.inc diff --git a/data/maps/events/SealedChamber_InnerRoom.inc b/data/maps/SealedChamber_InnerRoom/events.inc similarity index 100% rename from data/maps/events/SealedChamber_InnerRoom.inc rename to data/maps/SealedChamber_InnerRoom/events.inc diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc similarity index 100% rename from data/scripts/maps/SealedChamber_InnerRoom.inc rename to data/maps/SealedChamber_InnerRoom/scripts.inc diff --git a/data/maps/events/SealedChamber_OuterRoom.inc b/data/maps/SealedChamber_OuterRoom/events.inc similarity index 100% rename from data/maps/events/SealedChamber_OuterRoom.inc rename to data/maps/SealedChamber_OuterRoom/events.inc diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc similarity index 100% rename from data/scripts/maps/SealedChamber_OuterRoom.inc rename to data/maps/SealedChamber_OuterRoom/scripts.inc diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/SecretBase_BlueCave1/events.inc similarity index 100% rename from data/maps/events/SecretBase_BlueCave1.inc rename to data/maps/SecretBase_BlueCave1/events.inc diff --git a/data/scripts/maps/SecretBase_BlueCave1.inc b/data/maps/SecretBase_BlueCave1/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BlueCave1.inc rename to data/maps/SecretBase_BlueCave1/scripts.inc diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/SecretBase_BlueCave2/events.inc similarity index 100% rename from data/maps/events/SecretBase_BlueCave2.inc rename to data/maps/SecretBase_BlueCave2/events.inc diff --git a/data/scripts/maps/SecretBase_BlueCave2.inc b/data/maps/SecretBase_BlueCave2/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BlueCave2.inc rename to data/maps/SecretBase_BlueCave2/scripts.inc diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/SecretBase_BlueCave3/events.inc similarity index 100% rename from data/maps/events/SecretBase_BlueCave3.inc rename to data/maps/SecretBase_BlueCave3/events.inc diff --git a/data/scripts/maps/SecretBase_BlueCave3.inc b/data/maps/SecretBase_BlueCave3/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BlueCave3.inc rename to data/maps/SecretBase_BlueCave3/scripts.inc diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/SecretBase_BlueCave4/events.inc similarity index 100% rename from data/maps/events/SecretBase_BlueCave4.inc rename to data/maps/SecretBase_BlueCave4/events.inc diff --git a/data/scripts/maps/SecretBase_BlueCave4.inc b/data/maps/SecretBase_BlueCave4/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BlueCave4.inc rename to data/maps/SecretBase_BlueCave4/scripts.inc diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/SecretBase_BrownCave1/events.inc similarity index 100% rename from data/maps/events/SecretBase_BrownCave1.inc rename to data/maps/SecretBase_BrownCave1/events.inc diff --git a/data/scripts/maps/SecretBase_BrownCave1.inc b/data/maps/SecretBase_BrownCave1/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BrownCave1.inc rename to data/maps/SecretBase_BrownCave1/scripts.inc diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/SecretBase_BrownCave2/events.inc similarity index 100% rename from data/maps/events/SecretBase_BrownCave2.inc rename to data/maps/SecretBase_BrownCave2/events.inc diff --git a/data/scripts/maps/SecretBase_BrownCave2.inc b/data/maps/SecretBase_BrownCave2/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BrownCave2.inc rename to data/maps/SecretBase_BrownCave2/scripts.inc diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/SecretBase_BrownCave3/events.inc similarity index 100% rename from data/maps/events/SecretBase_BrownCave3.inc rename to data/maps/SecretBase_BrownCave3/events.inc diff --git a/data/scripts/maps/SecretBase_BrownCave3.inc b/data/maps/SecretBase_BrownCave3/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BrownCave3.inc rename to data/maps/SecretBase_BrownCave3/scripts.inc diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/SecretBase_BrownCave4/events.inc similarity index 100% rename from data/maps/events/SecretBase_BrownCave4.inc rename to data/maps/SecretBase_BrownCave4/events.inc diff --git a/data/scripts/maps/SecretBase_BrownCave4.inc b/data/maps/SecretBase_BrownCave4/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BrownCave4.inc rename to data/maps/SecretBase_BrownCave4/scripts.inc diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/SecretBase_RedCave1/events.inc similarity index 100% rename from data/maps/events/SecretBase_RedCave1.inc rename to data/maps/SecretBase_RedCave1/events.inc diff --git a/data/scripts/maps/SecretBase_RedCave1.inc b/data/maps/SecretBase_RedCave1/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_RedCave1.inc rename to data/maps/SecretBase_RedCave1/scripts.inc diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/SecretBase_RedCave2/events.inc similarity index 100% rename from data/maps/events/SecretBase_RedCave2.inc rename to data/maps/SecretBase_RedCave2/events.inc diff --git a/data/scripts/maps/SecretBase_RedCave2.inc b/data/maps/SecretBase_RedCave2/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_RedCave2.inc rename to data/maps/SecretBase_RedCave2/scripts.inc diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/SecretBase_RedCave3/events.inc similarity index 100% rename from data/maps/events/SecretBase_RedCave3.inc rename to data/maps/SecretBase_RedCave3/events.inc diff --git a/data/scripts/maps/SecretBase_RedCave3.inc b/data/maps/SecretBase_RedCave3/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_RedCave3.inc rename to data/maps/SecretBase_RedCave3/scripts.inc diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/SecretBase_RedCave4/events.inc similarity index 100% rename from data/maps/events/SecretBase_RedCave4.inc rename to data/maps/SecretBase_RedCave4/events.inc diff --git a/data/scripts/maps/SecretBase_RedCave4.inc b/data/maps/SecretBase_RedCave4/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_RedCave4.inc rename to data/maps/SecretBase_RedCave4/scripts.inc diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/SecretBase_Shrub1/events.inc similarity index 100% rename from data/maps/events/SecretBase_Shrub1.inc rename to data/maps/SecretBase_Shrub1/events.inc diff --git a/data/scripts/maps/SecretBase_Shrub1.inc b/data/maps/SecretBase_Shrub1/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Shrub1.inc rename to data/maps/SecretBase_Shrub1/scripts.inc diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/SecretBase_Shrub2/events.inc similarity index 100% rename from data/maps/events/SecretBase_Shrub2.inc rename to data/maps/SecretBase_Shrub2/events.inc diff --git a/data/scripts/maps/SecretBase_Shrub2.inc b/data/maps/SecretBase_Shrub2/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Shrub2.inc rename to data/maps/SecretBase_Shrub2/scripts.inc diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/SecretBase_Shrub3/events.inc similarity index 100% rename from data/maps/events/SecretBase_Shrub3.inc rename to data/maps/SecretBase_Shrub3/events.inc diff --git a/data/scripts/maps/SecretBase_Shrub3.inc b/data/maps/SecretBase_Shrub3/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Shrub3.inc rename to data/maps/SecretBase_Shrub3/scripts.inc diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/SecretBase_Shrub4/events.inc similarity index 100% rename from data/maps/events/SecretBase_Shrub4.inc rename to data/maps/SecretBase_Shrub4/events.inc diff --git a/data/scripts/maps/SecretBase_Shrub4.inc b/data/maps/SecretBase_Shrub4/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Shrub4.inc rename to data/maps/SecretBase_Shrub4/scripts.inc diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/SecretBase_Tree1/events.inc similarity index 100% rename from data/maps/events/SecretBase_Tree1.inc rename to data/maps/SecretBase_Tree1/events.inc diff --git a/data/scripts/maps/SecretBase_Tree1.inc b/data/maps/SecretBase_Tree1/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Tree1.inc rename to data/maps/SecretBase_Tree1/scripts.inc diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/SecretBase_Tree2/events.inc similarity index 100% rename from data/maps/events/SecretBase_Tree2.inc rename to data/maps/SecretBase_Tree2/events.inc diff --git a/data/scripts/maps/SecretBase_Tree2.inc b/data/maps/SecretBase_Tree2/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Tree2.inc rename to data/maps/SecretBase_Tree2/scripts.inc diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/SecretBase_Tree3/events.inc similarity index 100% rename from data/maps/events/SecretBase_Tree3.inc rename to data/maps/SecretBase_Tree3/events.inc diff --git a/data/scripts/maps/SecretBase_Tree3.inc b/data/maps/SecretBase_Tree3/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Tree3.inc rename to data/maps/SecretBase_Tree3/scripts.inc diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/SecretBase_Tree4/events.inc similarity index 100% rename from data/maps/events/SecretBase_Tree4.inc rename to data/maps/SecretBase_Tree4/events.inc diff --git a/data/scripts/maps/SecretBase_Tree4.inc b/data/maps/SecretBase_Tree4/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Tree4.inc rename to data/maps/SecretBase_Tree4/scripts.inc diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/SecretBase_YellowCave1/events.inc similarity index 100% rename from data/maps/events/SecretBase_YellowCave1.inc rename to data/maps/SecretBase_YellowCave1/events.inc diff --git a/data/scripts/maps/SecretBase_YellowCave1.inc b/data/maps/SecretBase_YellowCave1/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_YellowCave1.inc rename to data/maps/SecretBase_YellowCave1/scripts.inc diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/SecretBase_YellowCave2/events.inc similarity index 100% rename from data/maps/events/SecretBase_YellowCave2.inc rename to data/maps/SecretBase_YellowCave2/events.inc diff --git a/data/scripts/maps/SecretBase_YellowCave2.inc b/data/maps/SecretBase_YellowCave2/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_YellowCave2.inc rename to data/maps/SecretBase_YellowCave2/scripts.inc diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/SecretBase_YellowCave3/events.inc similarity index 100% rename from data/maps/events/SecretBase_YellowCave3.inc rename to data/maps/SecretBase_YellowCave3/events.inc diff --git a/data/scripts/maps/SecretBase_YellowCave3.inc b/data/maps/SecretBase_YellowCave3/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_YellowCave3.inc rename to data/maps/SecretBase_YellowCave3/scripts.inc diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/SecretBase_YellowCave4/events.inc similarity index 100% rename from data/maps/events/SecretBase_YellowCave4.inc rename to data/maps/SecretBase_YellowCave4/events.inc diff --git a/data/scripts/maps/SecretBase_YellowCave4.inc b/data/maps/SecretBase_YellowCave4/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_YellowCave4.inc rename to data/maps/SecretBase_YellowCave4/scripts.inc diff --git a/data/maps/events/ShoalCave_HighTideEntranceRoom.inc b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_HighTideEntranceRoom.inc rename to data/maps/ShoalCave_HighTideEntranceRoom/events.inc diff --git a/data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc b/data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc rename to data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc diff --git a/data/maps/events/ShoalCave_HighTideInnerRoom.inc b/data/maps/ShoalCave_HighTideInnerRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_HighTideInnerRoom.inc rename to data/maps/ShoalCave_HighTideInnerRoom/events.inc diff --git a/data/scripts/maps/ShoalCave_HighTideInnerRoom.inc b/data/maps/ShoalCave_HighTideInnerRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_HighTideInnerRoom.inc rename to data/maps/ShoalCave_HighTideInnerRoom/scripts.inc diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_LowTideEntranceRoom.inc rename to data/maps/ShoalCave_LowTideEntranceRoom/events.inc diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc rename to data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.inc b/data/maps/ShoalCave_LowTideIceRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_LowTideIceRoom.inc rename to data/maps/ShoalCave_LowTideIceRoom/events.inc diff --git a/data/scripts/maps/ShoalCave_LowTideIceRoom.inc b/data/maps/ShoalCave_LowTideIceRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_LowTideIceRoom.inc rename to data/maps/ShoalCave_LowTideIceRoom/scripts.inc diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_LowTideInnerRoom.inc rename to data/maps/ShoalCave_LowTideInnerRoom/events.inc diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_LowTideInnerRoom.inc rename to data/maps/ShoalCave_LowTideInnerRoom/scripts.inc diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_LowTideLowerRoom.inc rename to data/maps/ShoalCave_LowTideLowerRoom/events.inc diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_LowTideLowerRoom.inc rename to data/maps/ShoalCave_LowTideLowerRoom/scripts.inc diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_LowTideStairsRoom.inc rename to data/maps/ShoalCave_LowTideStairsRoom/events.inc diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_LowTideStairsRoom.inc rename to data/maps/ShoalCave_LowTideStairsRoom/scripts.inc diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/SingleBattleColosseum/events.inc similarity index 100% rename from data/maps/events/SingleBattleColosseum.inc rename to data/maps/SingleBattleColosseum/events.inc diff --git a/data/scripts/maps/SingleBattleColosseum.inc b/data/maps/SingleBattleColosseum/scripts.inc similarity index 100% rename from data/scripts/maps/SingleBattleColosseum.inc rename to data/maps/SingleBattleColosseum/scripts.inc diff --git a/data/maps/events/SkyPillar_1F.inc b/data/maps/SkyPillar_1F/events.inc similarity index 100% rename from data/maps/events/SkyPillar_1F.inc rename to data/maps/SkyPillar_1F/events.inc diff --git a/data/scripts/maps/SkyPillar_1F.inc b/data/maps/SkyPillar_1F/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_1F.inc rename to data/maps/SkyPillar_1F/scripts.inc diff --git a/data/maps/events/SkyPillar_2F.inc b/data/maps/SkyPillar_2F/events.inc similarity index 100% rename from data/maps/events/SkyPillar_2F.inc rename to data/maps/SkyPillar_2F/events.inc diff --git a/data/scripts/maps/SkyPillar_2F.inc b/data/maps/SkyPillar_2F/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_2F.inc rename to data/maps/SkyPillar_2F/scripts.inc diff --git a/data/maps/events/SkyPillar_3F.inc b/data/maps/SkyPillar_3F/events.inc similarity index 100% rename from data/maps/events/SkyPillar_3F.inc rename to data/maps/SkyPillar_3F/events.inc diff --git a/data/scripts/maps/SkyPillar_3F.inc b/data/maps/SkyPillar_3F/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_3F.inc rename to data/maps/SkyPillar_3F/scripts.inc diff --git a/data/maps/events/SkyPillar_4F.inc b/data/maps/SkyPillar_4F/events.inc similarity index 100% rename from data/maps/events/SkyPillar_4F.inc rename to data/maps/SkyPillar_4F/events.inc diff --git a/data/scripts/maps/SkyPillar_4F.inc b/data/maps/SkyPillar_4F/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_4F.inc rename to data/maps/SkyPillar_4F/scripts.inc diff --git a/data/maps/events/SkyPillar_5F.inc b/data/maps/SkyPillar_5F/events.inc similarity index 100% rename from data/maps/events/SkyPillar_5F.inc rename to data/maps/SkyPillar_5F/events.inc diff --git a/data/scripts/maps/SkyPillar_5F.inc b/data/maps/SkyPillar_5F/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_5F.inc rename to data/maps/SkyPillar_5F/scripts.inc diff --git a/data/maps/events/SkyPillar_Entrance.inc b/data/maps/SkyPillar_Entrance/events.inc similarity index 100% rename from data/maps/events/SkyPillar_Entrance.inc rename to data/maps/SkyPillar_Entrance/events.inc diff --git a/data/scripts/maps/SkyPillar_Entrance.inc b/data/maps/SkyPillar_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_Entrance.inc rename to data/maps/SkyPillar_Entrance/scripts.inc diff --git a/data/maps/events/SkyPillar_Outside.inc b/data/maps/SkyPillar_Outside/events.inc similarity index 100% rename from data/maps/events/SkyPillar_Outside.inc rename to data/maps/SkyPillar_Outside/events.inc diff --git a/data/scripts/maps/SkyPillar_Outside.inc b/data/maps/SkyPillar_Outside/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_Outside.inc rename to data/maps/SkyPillar_Outside/scripts.inc diff --git a/data/maps/events/SkyPillar_Top.inc b/data/maps/SkyPillar_Top/events.inc similarity index 100% rename from data/maps/events/SkyPillar_Top.inc rename to data/maps/SkyPillar_Top/events.inc diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/maps/SkyPillar_Top/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_Top.inc rename to data/maps/SkyPillar_Top/scripts.inc diff --git a/data/maps/events/SlateportCity.inc b/data/maps/SlateportCity/events.inc similarity index 100% rename from data/maps/events/SlateportCity.inc rename to data/maps/SlateportCity/events.inc diff --git a/data/scripts/maps/SlateportCity.inc b/data/maps/SlateportCity/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity.inc rename to data/maps/SlateportCity/scripts.inc diff --git a/data/maps/events/SlateportCity_BattleTentBattleRoom.inc b/data/maps/SlateportCity_BattleTentBattleRoom/events.inc similarity index 100% rename from data/maps/events/SlateportCity_BattleTentBattleRoom.inc rename to data/maps/SlateportCity_BattleTentBattleRoom/events.inc diff --git a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc rename to data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc diff --git a/data/maps/events/SlateportCity_BattleTentCorridor.inc b/data/maps/SlateportCity_BattleTentCorridor/events.inc similarity index 100% rename from data/maps/events/SlateportCity_BattleTentCorridor.inc rename to data/maps/SlateportCity_BattleTentCorridor/events.inc diff --git a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_BattleTentCorridor.inc rename to data/maps/SlateportCity_BattleTentCorridor/scripts.inc diff --git a/data/maps/events/SlateportCity_BattleTentLobby.inc b/data/maps/SlateportCity_BattleTentLobby/events.inc similarity index 100% rename from data/maps/events/SlateportCity_BattleTentLobby.inc rename to data/maps/SlateportCity_BattleTentLobby/events.inc diff --git a/data/scripts/maps/SlateportCity_BattleTentLobby.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_BattleTentLobby.inc rename to data/maps/SlateportCity_BattleTentLobby/scripts.inc diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/SlateportCity_Harbor/events.inc similarity index 100% rename from data/maps/events/SlateportCity_Harbor.inc rename to data/maps/SlateportCity_Harbor/events.inc diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/maps/SlateportCity_Harbor/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_Harbor.inc rename to data/maps/SlateportCity_Harbor/scripts.inc diff --git a/data/maps/events/SlateportCity_House1.inc b/data/maps/SlateportCity_House1/events.inc similarity index 100% rename from data/maps/events/SlateportCity_House1.inc rename to data/maps/SlateportCity_House1/events.inc diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/maps/SlateportCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_House1.inc rename to data/maps/SlateportCity_House1/scripts.inc diff --git a/data/maps/events/SlateportCity_House2.inc b/data/maps/SlateportCity_House2/events.inc similarity index 100% rename from data/maps/events/SlateportCity_House2.inc rename to data/maps/SlateportCity_House2/events.inc diff --git a/data/scripts/maps/SlateportCity_House2.inc b/data/maps/SlateportCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_House2.inc rename to data/maps/SlateportCity_House2/scripts.inc diff --git a/data/maps/events/SlateportCity_Mart.inc b/data/maps/SlateportCity_Mart/events.inc similarity index 100% rename from data/maps/events/SlateportCity_Mart.inc rename to data/maps/SlateportCity_Mart/events.inc diff --git a/data/scripts/maps/SlateportCity_Mart.inc b/data/maps/SlateportCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_Mart.inc rename to data/maps/SlateportCity_Mart/scripts.inc diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc similarity index 100% rename from data/maps/events/SlateportCity_OceanicMuseum_1F.inc rename to data/maps/SlateportCity_OceanicMuseum_1F/events.inc diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc rename to data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc similarity index 100% rename from data/maps/events/SlateportCity_OceanicMuseum_2F.inc rename to data/maps/SlateportCity_OceanicMuseum_2F/events.inc diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc rename to data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc diff --git a/data/maps/events/SlateportCity_PokemonCenter_1F.inc b/data/maps/SlateportCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/SlateportCity_PokemonCenter_1F.inc rename to data/maps/SlateportCity_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_PokemonCenter_1F.inc rename to data/maps/SlateportCity_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/SlateportCity_PokemonCenter_2F.inc b/data/maps/SlateportCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/SlateportCity_PokemonCenter_2F.inc rename to data/maps/SlateportCity_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_2F.inc b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_PokemonCenter_2F.inc rename to data/maps/SlateportCity_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/SlateportCity_PokemonFanClub.inc b/data/maps/SlateportCity_PokemonFanClub/events.inc similarity index 100% rename from data/maps/events/SlateportCity_PokemonFanClub.inc rename to data/maps/SlateportCity_PokemonFanClub/events.inc diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_PokemonFanClub.inc rename to data/maps/SlateportCity_PokemonFanClub/scripts.inc diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.inc b/data/maps/SlateportCity_SternsShipyard_1F/events.inc similarity index 100% rename from data/maps/events/SlateportCity_SternsShipyard_1F.inc rename to data/maps/SlateportCity_SternsShipyard_1F/events.inc diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_SternsShipyard_1F.inc rename to data/maps/SlateportCity_SternsShipyard_1F/scripts.inc diff --git a/data/maps/events/SlateportCity_SternsShipyard_2F.inc b/data/maps/SlateportCity_SternsShipyard_2F/events.inc similarity index 100% rename from data/maps/events/SlateportCity_SternsShipyard_2F.inc rename to data/maps/SlateportCity_SternsShipyard_2F/events.inc diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_2F.inc b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_SternsShipyard_2F.inc rename to data/maps/SlateportCity_SternsShipyard_2F/scripts.inc diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/SootopolisCity/events.inc similarity index 100% rename from data/maps/events/SootopolisCity.inc rename to data/maps/SootopolisCity/events.inc diff --git a/data/scripts/maps/SootopolisCity.inc b/data/maps/SootopolisCity/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity.inc rename to data/maps/SootopolisCity/scripts.inc diff --git a/data/maps/events/SootopolisCity_Gym_1F.inc b/data/maps/SootopolisCity_Gym_1F/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_Gym_1F.inc rename to data/maps/SootopolisCity_Gym_1F/events.inc diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_Gym_1F.inc rename to data/maps/SootopolisCity_Gym_1F/scripts.inc diff --git a/data/maps/events/SootopolisCity_Gym_B1F.inc b/data/maps/SootopolisCity_Gym_B1F/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_Gym_B1F.inc rename to data/maps/SootopolisCity_Gym_B1F/events.inc diff --git a/data/scripts/maps/SootopolisCity_Gym_B1F.inc b/data/maps/SootopolisCity_Gym_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_Gym_B1F.inc rename to data/maps/SootopolisCity_Gym_B1F/scripts.inc diff --git a/data/maps/events/SootopolisCity_House1.inc b/data/maps/SootopolisCity_House1/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House1.inc rename to data/maps/SootopolisCity_House1/events.inc diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/maps/SootopolisCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House1.inc rename to data/maps/SootopolisCity_House1/scripts.inc diff --git a/data/maps/events/SootopolisCity_House2.inc b/data/maps/SootopolisCity_House2/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House2.inc rename to data/maps/SootopolisCity_House2/events.inc diff --git a/data/scripts/maps/SootopolisCity_House2.inc b/data/maps/SootopolisCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House2.inc rename to data/maps/SootopolisCity_House2/scripts.inc diff --git a/data/maps/events/SootopolisCity_House3.inc b/data/maps/SootopolisCity_House3/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House3.inc rename to data/maps/SootopolisCity_House3/events.inc diff --git a/data/scripts/maps/SootopolisCity_House3.inc b/data/maps/SootopolisCity_House3/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House3.inc rename to data/maps/SootopolisCity_House3/scripts.inc diff --git a/data/maps/events/SootopolisCity_House4.inc b/data/maps/SootopolisCity_House4/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House4.inc rename to data/maps/SootopolisCity_House4/events.inc diff --git a/data/scripts/maps/SootopolisCity_House4.inc b/data/maps/SootopolisCity_House4/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House4.inc rename to data/maps/SootopolisCity_House4/scripts.inc diff --git a/data/maps/events/SootopolisCity_House5.inc b/data/maps/SootopolisCity_House5/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House5.inc rename to data/maps/SootopolisCity_House5/events.inc diff --git a/data/scripts/maps/SootopolisCity_House5.inc b/data/maps/SootopolisCity_House5/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House5.inc rename to data/maps/SootopolisCity_House5/scripts.inc diff --git a/data/maps/events/SootopolisCity_House6.inc b/data/maps/SootopolisCity_House6/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House6.inc rename to data/maps/SootopolisCity_House6/events.inc diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/maps/SootopolisCity_House6/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House6.inc rename to data/maps/SootopolisCity_House6/scripts.inc diff --git a/data/maps/events/SootopolisCity_House7.inc b/data/maps/SootopolisCity_House7/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House7.inc rename to data/maps/SootopolisCity_House7/events.inc diff --git a/data/scripts/maps/SootopolisCity_House7.inc b/data/maps/SootopolisCity_House7/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House7.inc rename to data/maps/SootopolisCity_House7/scripts.inc diff --git a/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc rename to data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc diff --git a/data/scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc rename to data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc diff --git a/data/maps/events/SootopolisCity_Mart.inc b/data/maps/SootopolisCity_Mart/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_Mart.inc rename to data/maps/SootopolisCity_Mart/events.inc diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/maps/SootopolisCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_Mart.inc rename to data/maps/SootopolisCity_Mart/scripts.inc diff --git a/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc rename to data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc rename to data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc diff --git a/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc rename to data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc rename to data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_PokemonCenter_1F.inc rename to data/maps/SootopolisCity_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc rename to data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_PokemonCenter_2F.inc rename to data/maps/SootopolisCity_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc rename to data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/SouthernIsland_Exterior.inc b/data/maps/SouthernIsland_Exterior/events.inc similarity index 100% rename from data/maps/events/SouthernIsland_Exterior.inc rename to data/maps/SouthernIsland_Exterior/events.inc diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/maps/SouthernIsland_Exterior/scripts.inc similarity index 100% rename from data/scripts/maps/SouthernIsland_Exterior.inc rename to data/maps/SouthernIsland_Exterior/scripts.inc diff --git a/data/maps/events/SouthernIsland_Interior.inc b/data/maps/SouthernIsland_Interior/events.inc similarity index 100% rename from data/maps/events/SouthernIsland_Interior.inc rename to data/maps/SouthernIsland_Interior/events.inc diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/maps/SouthernIsland_Interior/scripts.inc similarity index 100% rename from data/scripts/maps/SouthernIsland_Interior.inc rename to data/maps/SouthernIsland_Interior/scripts.inc diff --git a/data/maps/events/TerraCave_End.inc b/data/maps/TerraCave_End/events.inc similarity index 100% rename from data/maps/events/TerraCave_End.inc rename to data/maps/TerraCave_End/events.inc diff --git a/data/scripts/maps/TerraCave_End.inc b/data/maps/TerraCave_End/scripts.inc similarity index 100% rename from data/scripts/maps/TerraCave_End.inc rename to data/maps/TerraCave_End/scripts.inc diff --git a/data/maps/events/TerraCave_Entrance.inc b/data/maps/TerraCave_Entrance/events.inc similarity index 100% rename from data/maps/events/TerraCave_Entrance.inc rename to data/maps/TerraCave_Entrance/events.inc diff --git a/data/scripts/maps/TerraCave_Entrance.inc b/data/maps/TerraCave_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/TerraCave_Entrance.inc rename to data/maps/TerraCave_Entrance/scripts.inc diff --git a/data/maps/events/TradeCenter.inc b/data/maps/TradeCenter/events.inc similarity index 100% rename from data/maps/events/TradeCenter.inc rename to data/maps/TradeCenter/events.inc diff --git a/data/scripts/maps/TradeCenter.inc b/data/maps/TradeCenter/scripts.inc similarity index 100% rename from data/scripts/maps/TradeCenter.inc rename to data/maps/TradeCenter/scripts.inc diff --git a/data/maps/events/TrainerHill_1F.inc b/data/maps/TrainerHill_1F/events.inc similarity index 100% rename from data/maps/events/TrainerHill_1F.inc rename to data/maps/TrainerHill_1F/events.inc diff --git a/data/scripts/maps/TrainerHill_1F.inc b/data/maps/TrainerHill_1F/scripts.inc similarity index 100% rename from data/scripts/maps/TrainerHill_1F.inc rename to data/maps/TrainerHill_1F/scripts.inc diff --git a/data/maps/events/TrainerHill_2F.inc b/data/maps/TrainerHill_2F/events.inc similarity index 100% rename from data/maps/events/TrainerHill_2F.inc rename to data/maps/TrainerHill_2F/events.inc diff --git a/data/scripts/maps/TrainerHill_2F.inc b/data/maps/TrainerHill_2F/scripts.inc similarity index 100% rename from data/scripts/maps/TrainerHill_2F.inc rename to data/maps/TrainerHill_2F/scripts.inc diff --git a/data/maps/events/TrainerHill_3F.inc b/data/maps/TrainerHill_3F/events.inc similarity index 100% rename from data/maps/events/TrainerHill_3F.inc rename to data/maps/TrainerHill_3F/events.inc diff --git a/data/scripts/maps/TrainerHill_3F.inc b/data/maps/TrainerHill_3F/scripts.inc similarity index 100% rename from data/scripts/maps/TrainerHill_3F.inc rename to data/maps/TrainerHill_3F/scripts.inc diff --git a/data/maps/events/TrainerHill_4F.inc b/data/maps/TrainerHill_4F/events.inc similarity index 100% rename from data/maps/events/TrainerHill_4F.inc rename to data/maps/TrainerHill_4F/events.inc diff --git a/data/scripts/maps/TrainerHill_4F.inc b/data/maps/TrainerHill_4F/scripts.inc similarity index 100% rename from data/scripts/maps/TrainerHill_4F.inc rename to data/maps/TrainerHill_4F/scripts.inc diff --git a/data/maps/events/TrainerHill_Elevator.inc b/data/maps/TrainerHill_Elevator/events.inc similarity index 100% rename from data/maps/events/TrainerHill_Elevator.inc rename to data/maps/TrainerHill_Elevator/events.inc diff --git a/data/scripts/maps/TrainerHill_Elevator.inc b/data/maps/TrainerHill_Elevator/scripts.inc similarity index 100% rename from data/scripts/maps/TrainerHill_Elevator.inc rename to data/maps/TrainerHill_Elevator/scripts.inc diff --git a/data/maps/events/TrainerHill_Entrance.inc b/data/maps/TrainerHill_Entrance/events.inc similarity index 100% rename from data/maps/events/TrainerHill_Entrance.inc rename to data/maps/TrainerHill_Entrance/events.inc diff --git a/data/scripts/maps/TrainerHill_Entrance.inc b/data/maps/TrainerHill_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/TrainerHill_Entrance.inc rename to data/maps/TrainerHill_Entrance/scripts.inc diff --git a/data/maps/events/TrainerHill_Roof.inc b/data/maps/TrainerHill_Roof/events.inc similarity index 100% rename from data/maps/events/TrainerHill_Roof.inc rename to data/maps/TrainerHill_Roof/events.inc diff --git a/data/scripts/maps/TrainerHill_Roof.inc b/data/maps/TrainerHill_Roof/scripts.inc similarity index 100% rename from data/scripts/maps/TrainerHill_Roof.inc rename to data/maps/TrainerHill_Roof/scripts.inc diff --git a/data/maps/events/Underwater1.inc b/data/maps/Underwater1/events.inc similarity index 100% rename from data/maps/events/Underwater1.inc rename to data/maps/Underwater1/events.inc diff --git a/data/scripts/maps/Underwater1.inc b/data/maps/Underwater1/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater1.inc rename to data/maps/Underwater1/scripts.inc diff --git a/data/maps/events/Underwater2.inc b/data/maps/Underwater2/events.inc similarity index 100% rename from data/maps/events/Underwater2.inc rename to data/maps/Underwater2/events.inc diff --git a/data/scripts/maps/Underwater2.inc b/data/maps/Underwater2/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater2.inc rename to data/maps/Underwater2/scripts.inc diff --git a/data/maps/events/Underwater3.inc b/data/maps/Underwater3/events.inc similarity index 100% rename from data/maps/events/Underwater3.inc rename to data/maps/Underwater3/events.inc diff --git a/data/scripts/maps/Underwater3.inc b/data/maps/Underwater3/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater3.inc rename to data/maps/Underwater3/scripts.inc diff --git a/data/maps/events/Underwater4.inc b/data/maps/Underwater4/events.inc similarity index 100% rename from data/maps/events/Underwater4.inc rename to data/maps/Underwater4/events.inc diff --git a/data/scripts/maps/Underwater4.inc b/data/maps/Underwater4/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater4.inc rename to data/maps/Underwater4/scripts.inc diff --git a/data/maps/events/Underwater5.inc b/data/maps/Underwater5/events.inc similarity index 100% rename from data/maps/events/Underwater5.inc rename to data/maps/Underwater5/events.inc diff --git a/data/scripts/maps/Underwater5.inc b/data/maps/Underwater5/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater5.inc rename to data/maps/Underwater5/scripts.inc diff --git a/data/maps/events/Underwater6.inc b/data/maps/Underwater6/events.inc similarity index 100% rename from data/maps/events/Underwater6.inc rename to data/maps/Underwater6/events.inc diff --git a/data/scripts/maps/Underwater6.inc b/data/maps/Underwater6/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater6.inc rename to data/maps/Underwater6/scripts.inc diff --git a/data/maps/events/Underwater7.inc b/data/maps/Underwater7/events.inc similarity index 100% rename from data/maps/events/Underwater7.inc rename to data/maps/Underwater7/events.inc diff --git a/data/scripts/maps/Underwater7.inc b/data/maps/Underwater7/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater7.inc rename to data/maps/Underwater7/scripts.inc diff --git a/data/maps/events/Underwater_MarineCave.inc b/data/maps/Underwater_MarineCave/events.inc similarity index 100% rename from data/maps/events/Underwater_MarineCave.inc rename to data/maps/Underwater_MarineCave/events.inc diff --git a/data/scripts/maps/Underwater_MarineCave.inc b/data/maps/Underwater_MarineCave/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater_MarineCave.inc rename to data/maps/Underwater_MarineCave/scripts.inc diff --git a/data/maps/events/Underwater_Route134.inc b/data/maps/Underwater_Route134/events.inc similarity index 100% rename from data/maps/events/Underwater_Route134.inc rename to data/maps/Underwater_Route134/events.inc diff --git a/data/scripts/maps/Underwater_Route134.inc b/data/maps/Underwater_Route134/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater_Route134.inc rename to data/maps/Underwater_Route134/scripts.inc diff --git a/data/maps/events/Underwater_SeafloorCavern.inc b/data/maps/Underwater_SeafloorCavern/events.inc similarity index 100% rename from data/maps/events/Underwater_SeafloorCavern.inc rename to data/maps/Underwater_SeafloorCavern/events.inc diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater_SeafloorCavern.inc rename to data/maps/Underwater_SeafloorCavern/scripts.inc diff --git a/data/maps/events/Underwater_SealedChamber.inc b/data/maps/Underwater_SealedChamber/events.inc similarity index 100% rename from data/maps/events/Underwater_SealedChamber.inc rename to data/maps/Underwater_SealedChamber/events.inc diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/maps/Underwater_SealedChamber/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater_SealedChamber.inc rename to data/maps/Underwater_SealedChamber/scripts.inc diff --git a/data/maps/events/Underwater_SootopolisCity.inc b/data/maps/Underwater_SootopolisCity/events.inc similarity index 100% rename from data/maps/events/Underwater_SootopolisCity.inc rename to data/maps/Underwater_SootopolisCity/events.inc diff --git a/data/scripts/maps/Underwater_SootopolisCity.inc b/data/maps/Underwater_SootopolisCity/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater_SootopolisCity.inc rename to data/maps/Underwater_SootopolisCity/scripts.inc diff --git a/data/maps/events/UnionRoom.inc b/data/maps/UnionRoom/events.inc similarity index 100% rename from data/maps/events/UnionRoom.inc rename to data/maps/UnionRoom/events.inc diff --git a/data/scripts/maps/UnionRoom.inc b/data/maps/UnionRoom/scripts.inc similarity index 100% rename from data/scripts/maps/UnionRoom.inc rename to data/maps/UnionRoom/scripts.inc diff --git a/data/maps/events/UnknownMap_25_29.inc b/data/maps/UnknownMap_25_29/events.inc similarity index 100% rename from data/maps/events/UnknownMap_25_29.inc rename to data/maps/UnknownMap_25_29/events.inc diff --git a/data/scripts/maps/UnknownMap_25_29.inc b/data/maps/UnknownMap_25_29/scripts.inc similarity index 100% rename from data/scripts/maps/UnknownMap_25_29.inc rename to data/maps/UnknownMap_25_29/scripts.inc diff --git a/data/maps/events/UnknownMap_25_30.inc b/data/maps/UnknownMap_25_30/events.inc similarity index 100% rename from data/maps/events/UnknownMap_25_30.inc rename to data/maps/UnknownMap_25_30/events.inc diff --git a/data/scripts/maps/UnknownMap_25_30.inc b/data/maps/UnknownMap_25_30/scripts.inc similarity index 100% rename from data/scripts/maps/UnknownMap_25_30.inc rename to data/maps/UnknownMap_25_30/scripts.inc diff --git a/data/maps/events/UnknownMap_25_31.inc b/data/maps/UnknownMap_25_31/events.inc similarity index 100% rename from data/maps/events/UnknownMap_25_31.inc rename to data/maps/UnknownMap_25_31/events.inc diff --git a/data/scripts/maps/UnknownMap_25_31.inc b/data/maps/UnknownMap_25_31/scripts.inc similarity index 100% rename from data/scripts/maps/UnknownMap_25_31.inc rename to data/maps/UnknownMap_25_31/scripts.inc diff --git a/data/maps/events/UnknownMap_25_32.inc b/data/maps/UnknownMap_25_32/events.inc similarity index 100% rename from data/maps/events/UnknownMap_25_32.inc rename to data/maps/UnknownMap_25_32/events.inc diff --git a/data/scripts/maps/UnknownMap_25_32.inc b/data/maps/UnknownMap_25_32/scripts.inc similarity index 100% rename from data/scripts/maps/UnknownMap_25_32.inc rename to data/maps/UnknownMap_25_32/scripts.inc diff --git a/data/maps/events/UnknownMap_25_33.inc b/data/maps/UnknownMap_25_33/events.inc similarity index 100% rename from data/maps/events/UnknownMap_25_33.inc rename to data/maps/UnknownMap_25_33/events.inc diff --git a/data/scripts/maps/UnknownMap_25_33.inc b/data/maps/UnknownMap_25_33/scripts.inc similarity index 100% rename from data/scripts/maps/UnknownMap_25_33.inc rename to data/maps/UnknownMap_25_33/scripts.inc diff --git a/data/maps/events/UnknownMap_25_34.inc b/data/maps/UnknownMap_25_34/events.inc similarity index 100% rename from data/maps/events/UnknownMap_25_34.inc rename to data/maps/UnknownMap_25_34/events.inc diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/maps/UnknownMap_25_34/scripts.inc similarity index 100% rename from data/scripts/maps/UnknownMap_25_34.inc rename to data/maps/UnknownMap_25_34/scripts.inc diff --git a/data/maps/events/VerdanturfTown.inc b/data/maps/VerdanturfTown/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown.inc rename to data/maps/VerdanturfTown/events.inc diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/maps/VerdanturfTown/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown.inc rename to data/maps/VerdanturfTown/scripts.inc diff --git a/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc rename to data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc diff --git a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc rename to data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc diff --git a/data/maps/events/VerdanturfTown_BattleTentCorridor.inc b/data/maps/VerdanturfTown_BattleTentCorridor/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_BattleTentCorridor.inc rename to data/maps/VerdanturfTown_BattleTentCorridor/events.inc diff --git a/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc rename to data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc diff --git a/data/maps/events/VerdanturfTown_BattleTentLobby.inc b/data/maps/VerdanturfTown_BattleTentLobby/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_BattleTentLobby.inc rename to data/maps/VerdanturfTown_BattleTentLobby/events.inc diff --git a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_BattleTentLobby.inc rename to data/maps/VerdanturfTown_BattleTentLobby/scripts.inc diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc rename to data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc diff --git a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc rename to data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc diff --git a/data/maps/events/VerdanturfTown_House.inc b/data/maps/VerdanturfTown_House/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_House.inc rename to data/maps/VerdanturfTown_House/events.inc diff --git a/data/scripts/maps/VerdanturfTown_House.inc b/data/maps/VerdanturfTown_House/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_House.inc rename to data/maps/VerdanturfTown_House/scripts.inc diff --git a/data/maps/events/VerdanturfTown_Mart.inc b/data/maps/VerdanturfTown_Mart/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_Mart.inc rename to data/maps/VerdanturfTown_Mart/events.inc diff --git a/data/scripts/maps/VerdanturfTown_Mart.inc b/data/maps/VerdanturfTown_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_Mart.inc rename to data/maps/VerdanturfTown_Mart/scripts.inc diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_PokemonCenter_1F.inc rename to data/maps/VerdanturfTown_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc rename to data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_PokemonCenter_2F.inc rename to data/maps/VerdanturfTown_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc rename to data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/VerdanturfTown_WandasHouse/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_WandasHouse.inc rename to data/maps/VerdanturfTown_WandasHouse/events.inc diff --git a/data/scripts/maps/VerdanturfTown_WandasHouse.inc b/data/maps/VerdanturfTown_WandasHouse/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_WandasHouse.inc rename to data/maps/VerdanturfTown_WandasHouse/scripts.inc diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/VictoryRoad_1F/events.inc similarity index 100% rename from data/maps/events/VictoryRoad_1F.inc rename to data/maps/VictoryRoad_1F/events.inc diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/maps/VictoryRoad_1F/scripts.inc similarity index 100% rename from data/scripts/maps/VictoryRoad_1F.inc rename to data/maps/VictoryRoad_1F/scripts.inc diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/VictoryRoad_B1F/events.inc similarity index 100% rename from data/maps/events/VictoryRoad_B1F.inc rename to data/maps/VictoryRoad_B1F/events.inc diff --git a/data/scripts/maps/VictoryRoad_B1F.inc b/data/maps/VictoryRoad_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/VictoryRoad_B1F.inc rename to data/maps/VictoryRoad_B1F/scripts.inc diff --git a/data/maps/events/VictoryRoad_B2F.inc b/data/maps/VictoryRoad_B2F/events.inc similarity index 100% rename from data/maps/events/VictoryRoad_B2F.inc rename to data/maps/VictoryRoad_B2F/events.inc diff --git a/data/scripts/maps/VictoryRoad_B2F.inc b/data/maps/VictoryRoad_B2F/scripts.inc similarity index 100% rename from data/scripts/maps/VictoryRoad_B2F.inc rename to data/maps/VictoryRoad_B2F/scripts.inc From ed8b006e67cdf5427177108b32c009a217b12b37 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:41:51 -0500 Subject: [PATCH 28/55] Rename map-layout-related things --- asm/battle_frontier_2.s | 2 +- data/layouts_table.inc | 2 +- include/fieldmap.h | 2 +- include/global.fieldmap.h | 8 +-- include/global.h | 2 +- include/global.tv.h | 4 +- include/overworld.h | 4 +- src/decoration.c | 6 +- src/field_camera.c | 52 ++++++++--------- src/field_tasks.c | 4 +- src/fieldmap.c | 116 +++++++++++++++++++------------------- src/item_use.c | 12 ++-- src/map_name_popup.c | 2 +- src/overworld.c | 72 +++++++++++------------ src/pokemon.c | 2 +- src/region_map.c | 20 +++---- src/secret_base.c | 10 ++-- src/tileset_anims.c | 8 +-- src/tv.c | 8 +-- src/wild_encounter.c | 14 ++--- 20 files changed, 175 insertions(+), 175 deletions(-) diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s index b2b4542789..a58a3d2d26 100644 --- a/asm/battle_frontier_2.s +++ b/asm/battle_frontier_2.s @@ -30026,7 +30026,7 @@ _081AA0A6: ldr r2, =0x00000169 adds r0, r2 lsls r0, 2 - ldr r1, =gMapAttributes + ldr r1, =gMapLayouts adds r0, r1 ldr r6, [r0] ldr r2, [r6, 0xC] diff --git a/data/layouts_table.inc b/data/layouts_table.inc index cf3cac6469..3f94138fbb 100644 --- a/data/layouts_table.inc +++ b/data/layouts_table.inc @@ -1,5 +1,5 @@ .align 2 -gMapAttributes:: @ 8481DD4 +gMapLayouts:: @ 8481DD4 .4byte PetalburgCity_Layout .4byte SlateportCity_Layout .4byte MauvilleCity_Layout diff --git a/include/fieldmap.h b/include/fieldmap.h index 01218493ab..05ffb2edcf 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -1,7 +1,7 @@ #ifndef GUARD_FIELDMAP_H #define GUARD_FIELDMAP_H -extern struct BackupMapData gUnknown_03005DC0; +extern struct BackupMapLayout gUnknown_03005DC0; u32 MapGridGetMetatileIdAt(int, int); u32 MapGridGetMetatileBehaviorAt(int, int); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 7b38f9ddc5..5b2944a2bd 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -55,7 +55,7 @@ struct Tileset /*0x14*/ TilesetCB callback; }; -struct MapData +struct MapLayout { /*0x00*/ s32 width; /*0x04*/ s32 height; @@ -65,7 +65,7 @@ struct MapData /*0x14*/ struct Tileset *secondaryTileset; }; -struct BackupMapData +struct BackupMapLayout { s32 width; s32 height; @@ -160,12 +160,12 @@ struct MapConnections struct MapHeader { - /* 0x00 */ const struct MapData *mapData; + /* 0x00 */ const struct MapLayout *mapLayout; /* 0x04 */ const struct MapEvents *events; /* 0x08 */ const u8 *mapScripts; /* 0x0C */ const struct MapConnections *connections; /* 0x10 */ u16 music; - /* 0x12 */ u16 mapDataId; + /* 0x12 */ u16 mapLayoutId; /* 0x14 */ u8 regionMapSectionId; /* 0x15 */ u8 cave; /* 0x16 */ u8 weather; diff --git a/include/global.h b/include/global.h index d26184270a..d27dae2ba7 100644 --- a/include/global.h +++ b/include/global.h @@ -777,7 +777,7 @@ struct SaveBlock1 /*0x2E*/ u8 weather; /*0x2F*/ u8 filler_2F; /*0x30*/ u8 flashLevel; - /*0x32*/ u16 mapDataId; + /*0x32*/ u16 mapLayoutId; /*0x34*/ u16 mapView[0x100]; /*0x234*/ u8 playerPartyCount; /*0x238*/ struct Pokemon playerParty[PARTY_SIZE]; diff --git a/include/global.tv.h b/include/global.tv.h index 81f181cf32..805922d5c9 100644 --- a/include/global.tv.h +++ b/include/global.tv.h @@ -301,7 +301,7 @@ typedef union // size = 0x24 /*0x06*/ u8 nGoldSymbols; /*0x07*/ u8 location; /*0x08*/ u16 battlePoints; - /*0x0a*/ u16 mapDataId; + /*0x0a*/ u16 mapLayoutId; /*0x0c*/ u8 language; /*0x0d*/ u8 filler_0d[6]; /*0x13*/ u8 playerName[8]; @@ -326,7 +326,7 @@ typedef union // size = 0x24 /*0x02*/ u16 item; /*0x04*/ u8 location; /*0x05*/ u8 language; - /*0x06*/ u16 mapDataId; + /*0x06*/ u16 mapLayoutId; /*0x08*/ u8 filler_08[11]; /*0x13*/ u8 playerName[8]; } treasureInvestigators; diff --git a/include/overworld.h b/include/overworld.h index a81f10b0d1..6869d70847 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -41,7 +41,7 @@ void LoadEventObjTemplatesFromHeader(void); void LoadSaveblockEventObjScripts(void); void Overworld_SetEventObjTemplateCoords(u8 localId, s16 x, s16 y); void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType); -const struct MapData *get_mapdata_header(void); +const struct MapLayout *GetMapLayout(void); void ApplyCurrentWarp(void); void set_warp2_warp3_to_neg_1(void); void SetWarpData(struct WarpData *warp, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); @@ -82,7 +82,7 @@ bool32 Overworld_IsBikingAllowed(void); void SetDefaultFlashLevel(void); void Overworld_SetFlashLevel(s32 flashLevel); u8 Overworld_GetFlashLevel(void); -void sub_8085524(u16 mapDataId); +void sub_8085524(u16 mapLayoutId); void sub_8085540(u8 var); u8 sub_808554C(void); u16 GetLocationMusic(struct WarpData *warp); diff --git a/src/decoration.c b/src/decoration.c index ad2cdfa30e..0510b9f312 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -1736,7 +1736,7 @@ bool8 sub_8128D10(u8 taskId) data[1] ++; return FALSE; } - if (sDecorationLastDirectionMoved == DIR_NORTH && data[1] - 7 >= gMapHeader.mapData->height) + if (sDecorationLastDirectionMoved == DIR_NORTH && data[1] - 7 >= gMapHeader.mapLayout->height) { data[1] --; return FALSE; @@ -1746,7 +1746,7 @@ bool8 sub_8128D10(u8 taskId) data[0] ++; return FALSE; } - if (sDecorationLastDirectionMoved == DIR_EAST && data[0] + data[5] - 8 >= gMapHeader.mapData->width) + if (sDecorationLastDirectionMoved == DIR_EAST && data[0] + data[5] - 8 >= gMapHeader.mapLayout->width) { data[0] --; return FALSE; @@ -2186,7 +2186,7 @@ void sub_81297F8(void) { for (x = 0; x < sDecorRearrangementDataBuffer[i].width; x ++) { - MapGridSetMetatileEntryAt(posX + 7 + x, posY + 7 - y, gMapHeader.mapData->map[posX + x + gMapHeader.mapData->width * (posY - y)] | 0x3000); + MapGridSetMetatileEntryAt(posX + 7 + x, posY + 7 - y, gMapHeader.mapLayout->map[posX + x + gMapHeader.mapLayout->width * (posY - y)] | 0x3000); } } sub_81296EC(sDecorRearrangementDataBuffer[i].idx); diff --git a/src/field_camera.c b/src/field_camera.c index d7063bd89a..8629bec2b4 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -25,13 +25,13 @@ struct FieldCameraUnknownStruct }; // static functions -static void RedrawMapSliceNorth(struct FieldCameraUnknownStruct *a, const struct MapData *mapData); -static void RedrawMapSliceSouth(struct FieldCameraUnknownStruct *a, const struct MapData *mapData); -static void RedrawMapSliceEast(struct FieldCameraUnknownStruct *a, const struct MapData *mapData); -static void RedrawMapSliceWest(struct FieldCameraUnknownStruct *a, const struct MapData *mapData); +static void RedrawMapSliceNorth(struct FieldCameraUnknownStruct *a, const struct MapLayout *mapLayout); +static void RedrawMapSliceSouth(struct FieldCameraUnknownStruct *a, const struct MapLayout *mapLayout); +static void RedrawMapSliceEast(struct FieldCameraUnknownStruct *a, const struct MapLayout *mapLayout); +static void RedrawMapSliceWest(struct FieldCameraUnknownStruct *a, const struct MapLayout *mapLayout); static s32 MapPosToBgTilemapOffset(struct FieldCameraUnknownStruct *a, s32 x, s32 y); -static void DrawWholeMapViewInternal(int x, int y, const struct MapData *mapData); -static void DrawMetatileAt(const struct MapData *mapData, u16, int, int); +static void DrawWholeMapViewInternal(int x, int y, const struct MapLayout *mapLayout); +static void DrawMetatileAt(const struct MapLayout *mapLayout, u16, int, int); static void DrawMetatile(s32 a, u16 *b, u16 c); static void CameraPanningCB_PanAhead(void); @@ -97,11 +97,11 @@ void sub_8089C08(s16 *a, s16 *b) void DrawWholeMapView(void) { - DrawWholeMapViewInternal(gSaveBlock1Ptr->pos.x, gSaveBlock1Ptr->pos.y, gMapHeader.mapData); + DrawWholeMapViewInternal(gSaveBlock1Ptr->pos.x, gSaveBlock1Ptr->pos.y, gMapHeader.mapLayout); gUnknown_03000E20.unk4 = TRUE; } -static void DrawWholeMapViewInternal(int x, int y, const struct MapData *mapData) +static void DrawWholeMapViewInternal(int x, int y, const struct MapLayout *mapLayout) { u8 i; u8 j; @@ -119,27 +119,27 @@ static void DrawWholeMapViewInternal(int x, int y, const struct MapData *mapData temp = gUnknown_03000E20.unk2 + j; if (temp >= 32) temp -= 32; - DrawMetatileAt(mapData, r6 + temp, x + j / 2, y + i / 2); + DrawMetatileAt(mapLayout, r6 + temp, x + j / 2, y + i / 2); } } } static void RedrawMapSlicesForCameraUpdate(struct FieldCameraUnknownStruct *a, int x, int y) { - const struct MapData *mapData = gMapHeader.mapData; + const struct MapLayout *mapLayout = gMapHeader.mapLayout; if (x > 0) - RedrawMapSliceWest(a, mapData); + RedrawMapSliceWest(a, mapLayout); if (x < 0) - RedrawMapSliceEast(a, mapData); + RedrawMapSliceEast(a, mapLayout); if (y > 0) - RedrawMapSliceNorth(a, mapData); + RedrawMapSliceNorth(a, mapLayout); if (y < 0) - RedrawMapSliceSouth(a, mapData); + RedrawMapSliceSouth(a, mapLayout); a->unk4 = TRUE; } -static void RedrawMapSliceNorth(struct FieldCameraUnknownStruct *a, const struct MapData *mapData) +static void RedrawMapSliceNorth(struct FieldCameraUnknownStruct *a, const struct MapLayout *mapLayout) { u8 i; u8 temp; @@ -154,11 +154,11 @@ static void RedrawMapSliceNorth(struct FieldCameraUnknownStruct *a, const struct temp = a->unk2 + i; if (temp >= 32) temp -= 32; - DrawMetatileAt(mapData, r7 + temp, gSaveBlock1Ptr->pos.x + i / 2, gSaveBlock1Ptr->pos.y + 14); + DrawMetatileAt(mapLayout, r7 + temp, gSaveBlock1Ptr->pos.x + i / 2, gSaveBlock1Ptr->pos.y + 14); } } -static void RedrawMapSliceSouth(struct FieldCameraUnknownStruct *a, const struct MapData *mapData) +static void RedrawMapSliceSouth(struct FieldCameraUnknownStruct *a, const struct MapLayout *mapLayout) { u8 i; u8 temp; @@ -169,11 +169,11 @@ static void RedrawMapSliceSouth(struct FieldCameraUnknownStruct *a, const struct temp = a->unk2 + i; if (temp >= 32) temp -= 32; - DrawMetatileAt(mapData, r7 + temp, gSaveBlock1Ptr->pos.x + i / 2, gSaveBlock1Ptr->pos.y); + DrawMetatileAt(mapLayout, r7 + temp, gSaveBlock1Ptr->pos.x + i / 2, gSaveBlock1Ptr->pos.y); } } -static void RedrawMapSliceEast(struct FieldCameraUnknownStruct *a, const struct MapData *mapData) +static void RedrawMapSliceEast(struct FieldCameraUnknownStruct *a, const struct MapLayout *mapLayout) { u8 i; u8 temp; @@ -184,11 +184,11 @@ static void RedrawMapSliceEast(struct FieldCameraUnknownStruct *a, const struct temp = a->unk3 + i; if (temp >= 32) temp -= 32; - DrawMetatileAt(mapData, temp * 32 + r6, gSaveBlock1Ptr->pos.x, gSaveBlock1Ptr->pos.y + i / 2); + DrawMetatileAt(mapLayout, temp * 32 + r6, gSaveBlock1Ptr->pos.x, gSaveBlock1Ptr->pos.y + i / 2); } } -static void RedrawMapSliceWest(struct FieldCameraUnknownStruct *a, const struct MapData *mapData) +static void RedrawMapSliceWest(struct FieldCameraUnknownStruct *a, const struct MapLayout *mapLayout) { u8 i; u8 temp; @@ -201,7 +201,7 @@ static void RedrawMapSliceWest(struct FieldCameraUnknownStruct *a, const struct temp = a->unk3 + i; if (temp >= 32) temp -= 32; - DrawMetatileAt(mapData, temp * 32 + r5, gSaveBlock1Ptr->pos.x + 14, gSaveBlock1Ptr->pos.y + i / 2); + DrawMetatileAt(mapLayout, temp * 32 + r5, gSaveBlock1Ptr->pos.x + 14, gSaveBlock1Ptr->pos.y + i / 2); } } @@ -211,7 +211,7 @@ void CurrentMapDrawMetatileAt(int a, int b) if (offset >= 0) { - DrawMetatileAt(gMapHeader.mapData, offset, a, b); + DrawMetatileAt(gMapHeader.mapLayout, offset, a, b); gUnknown_03000E20.unk4 = TRUE; } } @@ -227,7 +227,7 @@ void DrawDoorMetatileAt(int x, int y, u16 *arr) } } -static void DrawMetatileAt(const struct MapData *mapData, u16 b, int c, int d) +static void DrawMetatileAt(const struct MapLayout *mapLayout, u16 b, int c, int d) { u16 metatileId = MapGridGetMetatileIdAt(c, d); u16 *metatiles; @@ -235,10 +235,10 @@ static void DrawMetatileAt(const struct MapData *mapData, u16 b, int c, int d) if (metatileId > 1024) metatileId = 0; if (metatileId < 512) - metatiles = mapData->primaryTileset->metatiles; + metatiles = mapLayout->primaryTileset->metatiles; else { - metatiles = mapData->secondaryTileset->metatiles; + metatiles = mapLayout->secondaryTileset->metatiles; metatileId -= 512; } DrawMetatile(MapGridGetMetatileLayerTypeAt(c, d), metatiles + metatileId * 8, b); diff --git a/src/field_tasks.c b/src/field_tasks.c index d9c3078dae..3cc40ac9d5 100644 --- a/src/field_tasks.c +++ b/src/field_tasks.c @@ -525,8 +525,8 @@ static bool32 sub_809E184(s16 x, s16 y) void SetSootopolisGymCrackedIceMetatiles(void) { s32 x, y; - s32 width = gMapHeader.mapData->width; - s32 height = gMapHeader.mapData->height; + s32 width = gMapHeader.mapLayout->width; + s32 height = gMapHeader.mapLayout->height; for (x = 0; x < width; x++) { for (y = 0; y < height; y++) diff --git a/src/fieldmap.c b/src/fieldmap.c index 245c883275..2561bceb70 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -28,7 +28,7 @@ EWRAM_DATA struct Camera gCamera = {0}; EWRAM_DATA static struct ConnectionFlags gUnknown_02037340 = {0}; EWRAM_DATA static u32 sFiller_02037344 = 0; // without this, the next file won't align properly -struct BackupMapData gUnknown_03005DC0; +struct BackupMapLayout gUnknown_03005DC0; static const struct ConnectionFlags sDummyConnectionFlags = {0}; @@ -68,19 +68,19 @@ void trainer_hill_map_load_related(void) void mapheader_copy_mapdata_with_padding(struct MapHeader *mapHeader) { - struct MapData const *mapData; + struct MapLayout const *mapLayout; int width; int height; - mapData = mapHeader->mapData; + mapLayout = mapHeader->mapLayout; CpuFastFill16(0x03ff, gUnknown_02032318, sizeof(gUnknown_02032318)); gUnknown_03005DC0.map = gUnknown_02032318; - width = mapData->width + 15; + width = mapLayout->width + 15; gUnknown_03005DC0.width = width; - height = mapData->height + 14; + height = mapLayout->height + 14; gUnknown_03005DC0.height = height; if (width * height <= 0x2800) { - map_copy_with_padding(mapData->map, mapData->width, mapData->height); + map_copy_with_padding(mapLayout->map, mapLayout->width, mapLayout->height); mapheader_copy_mapdata_of_adjacent_maps(mapHeader); } } @@ -146,8 +146,8 @@ void sub_8087F54(int x, int y, struct MapHeader const *mapHeader, int x2, int y2 u16 *dest; int mapWidth; - mapWidth = mapHeader->mapData->width; - src = &mapHeader->mapData->map[mapWidth * y2 + x2]; + mapWidth = mapHeader->mapLayout->width; + src = &mapHeader->mapLayout->map[mapWidth * y2 + x2]; dest = &gUnknown_03005DC0.map[gUnknown_03005DC0.width * y + x]; for (i = 0; i < height; i++) @@ -167,9 +167,9 @@ void fillSouthConnection(struct MapHeader const *mapHeader, struct MapHeader con if (connectedMapHeader) { - cWidth = connectedMapHeader->mapData->width; + cWidth = connectedMapHeader->mapLayout->width; x = offset + 7; - y = mapHeader->mapData->height + 7; + y = mapHeader->mapLayout->height + 7; if (x < 0) { x2 = -x; @@ -214,8 +214,8 @@ void fillNorthConnection(struct MapHeader const *mapHeader, struct MapHeader con if (connectedMapHeader) { - cWidth = connectedMapHeader->mapData->width; - cHeight = connectedMapHeader->mapData->height; + cWidth = connectedMapHeader->mapLayout->width; + cHeight = connectedMapHeader->mapLayout->height; x = offset + 7; y2 = cHeight - 7; if (x < 0) @@ -262,8 +262,8 @@ void fillWestConnection(struct MapHeader const *mapHeader, struct MapHeader cons int cWidth, cHeight; if (connectedMapHeader) { - cWidth = connectedMapHeader->mapData->width; - cHeight = connectedMapHeader->mapData->height; + cWidth = connectedMapHeader->mapLayout->width; + cHeight = connectedMapHeader->mapLayout->height; y = offset + 7; x2 = cWidth - 7; if (y < 0) @@ -308,8 +308,8 @@ void fillEastConnection(struct MapHeader const *mapHeader, struct MapHeader cons int cHeight; if (connectedMapHeader) { - cHeight = connectedMapHeader->mapData->height; - x = mapHeader->mapData->width + 7; + cHeight = connectedMapHeader->mapLayout->height; + x = mapHeader->mapLayout->width + 7; y = offset + 7; if (y < 0) { @@ -369,10 +369,10 @@ u8 MapGridGetZCoordAt(int x, int y) } else { - border = gMapHeader.mapData->border; + border = gMapHeader.mapLayout->border; i = (x + 1) & 1; i += ((y + 1) & 1) * 2; - block = gMapHeader.mapData->border[i]; + block = gMapHeader.mapLayout->border[i]; block |= 0xc00; } @@ -397,10 +397,10 @@ u8 MapGridIsImpassableAt(int x, int y) } else { - border = gMapHeader.mapData->border; + border = gMapHeader.mapLayout->border; i = (x + 1) & 1; i += ((y + 1) & 1) * 2; - block = gMapHeader.mapData->border[i]; + block = gMapHeader.mapLayout->border[i]; block |= 0xc00; } if (block == 0x3ff) @@ -415,7 +415,7 @@ u32 MapGridGetMetatileIdAt(int x, int y) u16 block; int i; int j; - struct MapData const *mapData; + struct MapLayout const *mapLayout; u16 *border; u16 block2; @@ -426,17 +426,17 @@ u32 MapGridGetMetatileIdAt(int x, int y) } else { - mapData = gMapHeader.mapData; + mapLayout = gMapHeader.mapLayout; i = (x + 1) & 1; i += ((y + 1) & 1) * 2; - block = mapData->border[i] | 0xc00; + block = mapLayout->border[i] | 0xc00; } if (block == 0x3ff) { - border = gMapHeader.mapData->border; + border = gMapHeader.mapLayout->border; j = (x + 1) & 1; j += ((y + 1) & 1) * 2; - block2 = gMapHeader.mapData->border[j]; + block2 = gMapHeader.mapLayout->border[j]; block2 |= 0xc00; return block2 & block; } @@ -484,12 +484,12 @@ u16 GetBehaviorByMetatileId(u16 metatile) u16 *attributes; if (metatile <= 0x1ff) { - attributes = gMapHeader.mapData->primaryTileset->metatileAttributes; + attributes = gMapHeader.mapLayout->primaryTileset->metatileAttributes; return attributes[metatile]; } else if (metatile <= 0x3ff) { - attributes = gMapHeader.mapData->secondaryTileset->metatileAttributes; + attributes = gMapHeader.mapLayout->secondaryTileset->metatileAttributes; return attributes[metatile - 0x200]; } else @@ -555,7 +555,7 @@ void mapdata_from_sav2(void) { if (i == y && i != 0) a0 = 0; - else if (i == y + 13 && i != gMapHeader.mapData->height - 1) + else if (i == y + 13 && i != gMapHeader.mapLayout->height - 1) a0 = 1; else a0 = -1; @@ -571,7 +571,7 @@ void mapdata_from_sav2(void) { if (y != 0) sub_80D423C(j, y - 1); - if (i < gMapHeader.mapData->height - 1) + if (i < gMapHeader.mapLayout->height - 1) sub_80D42B8(j, y + 13); } sav2_mapdata_clear(); @@ -636,7 +636,7 @@ void sub_80885C4(u8 a1) int GetMapBorderIdAt(int x, int y) { - struct MapData const *mapData; + struct MapLayout const *mapLayout; u16 block, block2; int i, j; if (x >= 0 && x < gUnknown_03005DC0.width @@ -652,10 +652,10 @@ int GetMapBorderIdAt(int x, int y) } else { - mapData = gMapHeader.mapData; + mapLayout = gMapHeader.mapLayout; j = (x + 1) & 1; j += ((y + 1) & 1) * 2; - block2 = 0xc00 | mapData->border[j]; + block2 = 0xc00 | mapLayout->border[j]; if (block2 == 0x3ff) { goto fail; @@ -732,7 +732,7 @@ void sub_80887F8(struct MapConnection *connection, int direction, int x, int y) gSaveBlock1Ptr->pos.y -= connection->offset; break; case CONNECTION_WEST: - gSaveBlock1Ptr->pos.x = mapHeader->mapData->width; + gSaveBlock1Ptr->pos.x = mapHeader->mapLayout->width; gSaveBlock1Ptr->pos.y -= connection->offset; break; case CONNECTION_SOUTH: @@ -741,7 +741,7 @@ void sub_80887F8(struct MapConnection *connection, int direction, int x, int y) break; case CONNECTION_NORTH: gSaveBlock1Ptr->pos.x -= connection->offset; - gSaveBlock1Ptr->pos.y = mapHeader->mapData->height; + gSaveBlock1Ptr->pos.y = mapHeader->mapLayout->height; break; } } @@ -800,10 +800,10 @@ bool8 sub_80889A8(u8 direction, int x, int y, struct MapConnection *connection) { case CONNECTION_SOUTH: case CONNECTION_NORTH: - return sub_8088A0C(x, gMapHeader.mapData->width, mapHeader->mapData->width, connection->offset); + return sub_8088A0C(x, gMapHeader.mapLayout->width, mapHeader->mapLayout->width, connection->offset); case CONNECTION_WEST: case CONNECTION_EAST: - return sub_8088A0C(y, gMapHeader.mapData->height, mapHeader->mapData->height, connection->offset); + return sub_8088A0C(y, gMapHeader.mapLayout->height, mapHeader->mapLayout->height, connection->offset); } return FALSE; } @@ -841,10 +841,10 @@ int sub_8088A4C(struct MapConnection *connection, int x, int y) { case CONNECTION_SOUTH: case CONNECTION_NORTH: - return sub_8088A38(x - connection->offset, mapHeader->mapData->width); + return sub_8088A38(x - connection->offset, mapHeader->mapLayout->width); case CONNECTION_WEST: case CONNECTION_EAST: - return sub_8088A38(y - connection->offset, mapHeader->mapData->height); + return sub_8088A38(y - connection->offset, mapHeader->mapLayout->height); } return FALSE; } @@ -868,9 +868,9 @@ struct MapConnection *sub_8088A8C(s16 x, s16 y) direction = connection->direction; if ((direction == CONNECTION_DIVE || direction == CONNECTION_EMERGE) || (direction == CONNECTION_NORTH && y > 6) - || (direction == CONNECTION_SOUTH && y < gMapHeader.mapData->height + 7) + || (direction == CONNECTION_SOUTH && y < gMapHeader.mapLayout->height + 7) || (direction == CONNECTION_WEST && x > 6) - || (direction == CONNECTION_EAST && x < gMapHeader.mapData->width + 7)) + || (direction == CONNECTION_EAST && x < gMapHeader.mapLayout->width + 7)) { continue; } @@ -990,45 +990,45 @@ void apply_map_tileset_palette(struct Tileset const *tileset, u16 destOffset, u1 } } -void copy_map_tileset1_to_vram(struct MapData const *mapData) +void copy_map_tileset1_to_vram(struct MapLayout const *mapLayout) { - copy_tileset_patterns_to_vram(mapData->primaryTileset, 0x200, 0); + copy_tileset_patterns_to_vram(mapLayout->primaryTileset, 0x200, 0); } -void copy_map_tileset2_to_vram(struct MapData const *mapData) +void copy_map_tileset2_to_vram(struct MapLayout const *mapLayout) { - copy_tileset_patterns_to_vram(mapData->secondaryTileset, 0x200, 0x200); + copy_tileset_patterns_to_vram(mapLayout->secondaryTileset, 0x200, 0x200); } -void copy_map_tileset2_to_vram_2(struct MapData const *mapData) +void copy_map_tileset2_to_vram_2(struct MapLayout const *mapLayout) { - copy_tileset_patterns_to_vram2(mapData->secondaryTileset, 0x200, 0x200); + copy_tileset_patterns_to_vram2(mapLayout->secondaryTileset, 0x200, 0x200); } -void apply_map_tileset1_palette(struct MapData const *mapData) +void apply_map_tileset1_palette(struct MapLayout const *mapLayout) { - apply_map_tileset_palette(mapData->primaryTileset, 0, 0xC0); + apply_map_tileset_palette(mapLayout->primaryTileset, 0, 0xC0); } -void apply_map_tileset2_palette(struct MapData const *mapData) +void apply_map_tileset2_palette(struct MapLayout const *mapLayout) { - apply_map_tileset_palette(mapData->secondaryTileset, 0x60, 0xE0); + apply_map_tileset_palette(mapLayout->secondaryTileset, 0x60, 0xE0); } -void copy_map_tileset1_tileset2_to_vram(struct MapData const *mapData) +void copy_map_tileset1_tileset2_to_vram(struct MapLayout const *mapLayout) { - if (mapData) + if (mapLayout) { - copy_tileset_patterns_to_vram2(mapData->primaryTileset, 0x200, 0); - copy_tileset_patterns_to_vram2(mapData->secondaryTileset, 0x200, 0x200); + copy_tileset_patterns_to_vram2(mapLayout->primaryTileset, 0x200, 0); + copy_tileset_patterns_to_vram2(mapLayout->secondaryTileset, 0x200, 0x200); } } -void apply_map_tileset1_tileset2_palette(struct MapData const *mapData) +void apply_map_tileset1_tileset2_palette(struct MapLayout const *mapLayout) { - if (mapData) + if (mapLayout) { - apply_map_tileset1_palette(mapData); - apply_map_tileset2_palette(mapData); + apply_map_tileset1_palette(mapLayout); + apply_map_tileset2_palette(mapLayout); } } diff --git a/src/item_use.c b/src/item_use.c index 96f63ee3ec..f3cb58069e 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -424,23 +424,23 @@ bool8 sub_80FD730(struct MapConnection *connection, int x, int y) case 2: localOffset = connection->offset + 7; localX = x - localOffset; - localLength = mapHeader->mapData->height - 7; + localLength = mapHeader->mapLayout->height - 7; localY = localLength + y; // additions are reversed for some reason break; case 1: localOffset = connection->offset + 7; localX = x - localOffset; - localLength = gMapHeader.mapData->height + 7; + localLength = gMapHeader.mapLayout->height + 7; localY = y - localLength; break; case 3: - localLength = mapHeader->mapData->width - 7; + localLength = mapHeader->mapLayout->width - 7; localX = localLength + x; // additions are reversed for some reason localOffset = connection->offset + 7; localY = y - localOffset; break; case 4: - localLength = gMapHeader.mapData->width + 7; + localLength = gMapHeader.mapLayout->width + 7; localX = x - localLength; localOffset = connection->offset + 7; localY = y - localOffset; @@ -455,8 +455,8 @@ void sub_80FD7C8(u8 taskId) { s16 x, y; s16 curX, curY; - s16 width = gMapHeader.mapData->width + 7; - s16 height = gMapHeader.mapData->height + 7; + s16 width = gMapHeader.mapLayout->width + 7; + s16 height = gMapHeader.mapLayout->height + 7; s16 var1 = 7; s16 var2 = 7; diff --git a/src/map_name_popup.c b/src/map_name_popup.c index 1782e9af82..b2109bb823 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -228,7 +228,7 @@ static void ShowMapNamePopUpWindow(void) if(InBattlePyramid()) { - if(gMapHeader.mapDataId == 0x17A) + if(gMapHeader.mapLayoutId == 0x17A) { withoutPrefixPtr = &(mapDisplayHeader[3]); mapDisplayHeaderSource = gBattlePyramid_MapHeaderStrings[7]; diff --git a/src/overworld.c b/src/overworld.c index 1e41160536..657ffd86a1 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -81,7 +81,7 @@ extern const u8 gUnknown_082774EF[]; extern const u8 gUnknown_08277509[]; // vars -extern const struct MapData *const gMapAttributes[]; +extern const struct MapLayout *const gMapLayouts[]; extern const struct MapHeader *const *const gMapGroups[]; extern const s32 gMaxFlashLevel; extern const u16 gUnknown_82EC7C4[]; @@ -97,16 +97,16 @@ extern void HealPlayerParty(void); extern void move_tilemap_camera_to_upper_left_corner(void); extern void cur_mapheader_run_tileset_funcs_after_some_cpuset(void); extern void DrawWholeMapView(void); -extern void copy_map_tileset1_tileset2_to_vram(const struct MapData *); -extern void apply_map_tileset1_tileset2_palette(const struct MapData *); +extern void copy_map_tileset1_tileset2_to_vram(const struct MapLayout *); +extern void apply_map_tileset1_tileset2_palette(const struct MapLayout *); extern void ResetCyclingRoadChallengeData(void); extern void ApplyNewEncryptionKeyToWord(u32 *word, u32 newKey); extern void mapheader_run_script_with_tag_x5(void); extern void ResetFieldTasksArgs(void); extern void sub_80A0A2C(void); extern void not_trainer_hill_battle_pyramid(void); -extern void apply_map_tileset2_palette(const struct MapData *); -extern void copy_map_tileset2_to_vram_2(const struct MapData *); +extern void apply_map_tileset2_palette(const struct MapLayout *); +extern void copy_map_tileset2_to_vram_2(const struct MapLayout *); extern void prev_quest_postbuffer_cursor_backup_reset(void); extern void ShowMapNamePopup(void); extern bool32 InTrainerHill(void); @@ -143,8 +143,8 @@ extern void sub_80EDB44(void); extern void sub_81D64C0(void); extern void sub_81BE6AC(void); extern void sub_8098128(void); -extern void copy_map_tileset1_to_vram(const struct MapData *); -extern void copy_map_tileset2_to_vram(const struct MapData *); +extern void copy_map_tileset1_to_vram(const struct MapLayout *); +extern void copy_map_tileset2_to_vram(const struct MapLayout *); extern void FieldUpdateBgTilemapScroll(void); extern void TransferTilesetAnimsBuffer(void); extern bool32 sub_81D5F48(void); @@ -558,17 +558,17 @@ void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType) static void mapdata_load_assets_to_gpu_and_full_redraw(void) { move_tilemap_camera_to_upper_left_corner(); - copy_map_tileset1_tileset2_to_vram(gMapHeader.mapData); - apply_map_tileset1_tileset2_palette(gMapHeader.mapData); + copy_map_tileset1_tileset2_to_vram(gMapHeader.mapLayout); + apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout); DrawWholeMapView(); cur_mapheader_run_tileset_funcs_after_some_cpuset(); } -const struct MapData *get_mapdata_header(void) +const struct MapLayout *GetMapLayout(void) { - u16 mapDataId = gSaveBlock1Ptr->mapDataId; - if (mapDataId) - return gMapAttributes[mapDataId - 1]; + u16 mapLayoutId = gSaveBlock1Ptr->mapLayoutId; + if (mapLayoutId) + return gMapLayouts[mapLayoutId - 1]; return NULL; } @@ -625,14 +625,14 @@ void set_current_map_header_from_sav1_save_old_name(void) { sLastMapSectionId = gMapHeader.regionMapSectionId; gMapHeader = *Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum); - gSaveBlock1Ptr->mapDataId = gMapHeader.mapDataId; - gMapHeader.mapData = get_mapdata_header(); + gSaveBlock1Ptr->mapLayoutId = gMapHeader.mapLayoutId; + gMapHeader.mapLayout = GetMapLayout(); } void LoadSaveblockMapHeader(void) { gMapHeader = *Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum); - gMapHeader.mapData = get_mapdata_header(); + gMapHeader.mapLayout = GetMapLayout(); } void update_camera_pos_from_warpid(void) @@ -649,8 +649,8 @@ void update_camera_pos_from_warpid(void) } else { - gSaveBlock1Ptr->pos.x = gMapHeader.mapData->width / 2; - gSaveBlock1Ptr->pos.y = gMapHeader.mapData->height / 2; + gSaveBlock1Ptr->pos.x = gMapHeader.mapLayout->width / 2; + gSaveBlock1Ptr->pos.y = gMapHeader.mapLayout->height / 2; } } @@ -837,8 +837,8 @@ void mliX_load_map(u8 mapGroup, u8 mapNum) Overworld_ClearSavedMusic(); mapheader_run_script_with_tag_x3(); not_trainer_hill_battle_pyramid(); - copy_map_tileset2_to_vram_2(gMapHeader.mapData); - apply_map_tileset2_palette(gMapHeader.mapData); + copy_map_tileset2_to_vram_2(gMapHeader.mapLayout); + apply_map_tileset2_palette(gMapHeader.mapLayout); for (paletteIndex = 6; paletteIndex < 13; paletteIndex++) ApplyWeatherGammaShiftToPal(paletteIndex); @@ -862,7 +862,7 @@ static void mli0_load_map(u32 a1) set_current_map_header_from_sav1_save_old_name(); if (!(sUnknown_020322D8 & 1)) { - if (gMapHeader.mapDataId == 0x169) + if (gMapHeader.mapLayoutId == 0x169) sub_81AA1D8(); else if (InTrainerHill()) sub_81D5DF8(); @@ -890,7 +890,7 @@ static void mli0_load_map(u32 a1) mapheader_run_script_with_tag_x3(); UpdateLocationHistoryForRoamer(); RoamerMoveToOtherLocationSet(); - if (gMapHeader.mapDataId == 0x169) + if (gMapHeader.mapLayoutId == 0x169) battle_pyramid_map_load_related(0); else if (InTrainerHill()) trainer_hill_map_load_related(); @@ -1016,10 +1016,10 @@ u8 Overworld_GetFlashLevel(void) return gSaveBlock1Ptr->flashLevel; } -void sub_8085524(u16 mapDataId) +void sub_8085524(u16 mapLayoutId) { - gSaveBlock1Ptr->mapDataId = mapDataId; - gMapHeader.mapData = get_mapdata_header(); + gSaveBlock1Ptr->mapLayoutId = mapLayoutId; + gMapHeader.mapLayout = GetMapLayout(); } void sub_8085540(u8 var) @@ -1729,7 +1729,7 @@ void CB2_ContinueSavedGame(void) LoadSaveblockMapHeader(); set_warp2_warp3_to_neg_1(); trainerHillMapId = GetCurrentTrainerHillMapId(); - if (gMapHeader.mapDataId == 0x169) + if (gMapHeader.mapLayoutId == 0x169) sub_81AA2F8(); else if (trainerHillMapId != 0 && trainerHillMapId != 6) sub_81D5F48(); @@ -1739,7 +1739,7 @@ void CB2_ContinueSavedGame(void) UnfreezeEventObjects(); DoTimeBasedEvents(); sub_8084788(); - if (gMapHeader.mapDataId == 0x169) + if (gMapHeader.mapLayoutId == 0x169) battle_pyramid_map_load_related(1); else if (trainerHillMapId != 0) trainer_hill_map_load_related(); @@ -1859,17 +1859,17 @@ static bool32 map_loading_iteration_3(u8 *state) (*state)++; break; case 6: - copy_map_tileset1_to_vram(gMapHeader.mapData); + copy_map_tileset1_to_vram(gMapHeader.mapLayout); (*state)++; break; case 7: - copy_map_tileset2_to_vram(gMapHeader.mapData); + copy_map_tileset2_to_vram(gMapHeader.mapLayout); (*state)++; break; case 8: if (free_temp_tile_data_buffers_if_possible() != TRUE) { - apply_map_tileset1_tileset2_palette(gMapHeader.mapData); + apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout); (*state)++; } break; @@ -1934,17 +1934,17 @@ static bool32 load_map_stuff(u8 *state, u32 a2) (*state)++; break; case 6: - copy_map_tileset1_to_vram(gMapHeader.mapData); + copy_map_tileset1_to_vram(gMapHeader.mapLayout); (*state)++; break; case 7: - copy_map_tileset2_to_vram(gMapHeader.mapData); + copy_map_tileset2_to_vram(gMapHeader.mapLayout); (*state)++; break; case 8: if (free_temp_tile_data_buffers_if_possible() != TRUE) { - apply_map_tileset1_tileset2_palette(gMapHeader.mapData); + apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout); (*state)++; } break; @@ -2031,17 +2031,17 @@ static bool32 map_loading_iteration_2_link(u8 *state) (*state)++; break; case 5: - copy_map_tileset1_to_vram(gMapHeader.mapData); + copy_map_tileset1_to_vram(gMapHeader.mapLayout); (*state)++; break; case 6: - copy_map_tileset2_to_vram(gMapHeader.mapData); + copy_map_tileset2_to_vram(gMapHeader.mapLayout); (*state)++; break; case 7: if (free_temp_tile_data_buffers_if_possible() != TRUE) { - apply_map_tileset1_tileset2_palette(gMapHeader.mapData); + apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout); (*state)++; } break; diff --git a/src/pokemon.c b/src/pokemon.c index 800b7c0cd4..1fa1c08f84 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -5620,7 +5620,7 @@ void SetWildMonHeldItem(void) var1 = 20; var2 = 80; } - if (gMapHeader.mapDataId == 0x1A4) + if (gMapHeader.mapLayoutId == 0x1A4) { s32 alteringCaveId = GetWildMonTableIdInAlteringCave(species); if (alteringCaveId != 0) diff --git a/src/region_map.c b/src/region_map.c index f16787fc93..0dcccfdab6 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -891,8 +891,8 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void) case 6: gRegionMap->mapSecId = gMapHeader.regionMapSectionId; gRegionMap->playerIsInCave = FALSE; - mapWidth = gMapHeader.mapData->width; - mapHeight = gMapHeader.mapData->height; + mapWidth = gMapHeader.mapLayout->width; + mapHeight = gMapHeader.mapLayout->height; x = gSaveBlock1Ptr->pos.x; y = gSaveBlock1Ptr->pos.y; if (gRegionMap->mapSecId == MAPSEC_UNDERWATER_128 || gRegionMap->mapSecId == MAPSEC_UNDERWATER_MARINE_CAVE) @@ -907,8 +907,8 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void) mapHeader = Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->warp4.mapGroup, gSaveBlock1Ptr->warp4.mapNum); gRegionMap->mapSecId = mapHeader->regionMapSectionId; gRegionMap->playerIsInCave = TRUE; - mapWidth = mapHeader->mapData->width; - mapHeight = mapHeader->mapData->height; + mapWidth = mapHeader->mapLayout->width; + mapHeight = mapHeader->mapLayout->height; x = gSaveBlock1Ptr->warp4.x; y = gSaveBlock1Ptr->warp4.y; } @@ -926,8 +926,8 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void) mapHeader = Overworld_GetMapHeaderByGroupAndId((u16)gSaveBlock1Ptr->warp2.mapGroup, (u16)gSaveBlock1Ptr->warp2.mapNum); gRegionMap->mapSecId = mapHeader->regionMapSectionId; gRegionMap->playerIsInCave = TRUE; - mapWidth = mapHeader->mapData->width; - mapHeight = mapHeader->mapData->height; + mapWidth = mapHeader->mapLayout->width; + mapHeight = mapHeader->mapLayout->height; x = gSaveBlock1Ptr->warp2.x; y = gSaveBlock1Ptr->warp2.y; break; @@ -953,8 +953,8 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void) { gRegionMap->playerIsInCave = FALSE; } - mapWidth = mapHeader->mapData->width; - mapHeight = mapHeader->mapData->height; + mapWidth = mapHeader->mapLayout->width; + mapHeight = mapHeader->mapLayout->height; x = storedWarp->x; y = storedWarp->y; break; @@ -1068,14 +1068,14 @@ static void RegionMap_InitializeStateBasedOnSSTidalLocation(void) mapHeader = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum); gRegionMap->mapSecId = mapHeader->regionMapSectionId; - dimensionScale = mapHeader->mapData->width / gRegionMapEntries[gRegionMap->mapSecId].width; + dimensionScale = mapHeader->mapLayout->width / gRegionMapEntries[gRegionMap->mapSecId].width; if (dimensionScale == 0) dimensionScale = 1; x = xOnMap / dimensionScale; if (x >= gRegionMapEntries[gRegionMap->mapSecId].width) x = gRegionMapEntries[gRegionMap->mapSecId].width - 1; - dimensionScale = mapHeader->mapData->height / gRegionMapEntries[gRegionMap->mapSecId].height; + dimensionScale = mapHeader->mapLayout->height / gRegionMapEntries[gRegionMap->mapSecId].height; if (dimensionScale == 0) dimensionScale = 1; y = yOnMap / dimensionScale; diff --git a/src/secret_base.c b/src/secret_base.c index d6f4e24a5e..93b82b3cbd 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -246,16 +246,16 @@ void sub_80E8C98(void) void sub_80E8CB0(s16 *xPtr, s16 *yPtr, u16 tile) { - const struct MapData *mapData; + const struct MapLayout *mapLayout; s16 x; s16 y; - mapData = gMapHeader.mapData; - for (y = 0; y < mapData->height; y ++) + mapLayout = gMapHeader.mapLayout; + for (y = 0; y < mapLayout->height; y ++) { - for (x = 0; x < mapData->width; x ++) + for (x = 0; x < mapLayout->width; x ++) { - if ((mapData->map[y * mapData->width + x] & 0x3ff) == tile) + if ((mapLayout->map[y * mapLayout->width + x] & 0x3ff) == tile) { *xPtr = x; *yPtr = y; diff --git a/src/tileset_anims.c b/src/tileset_anims.c index aaa05bcc82..d05931dbad 100644 --- a/src/tileset_anims.c +++ b/src/tileset_anims.c @@ -686,8 +686,8 @@ static void cur_mapheader_run_tileset1_func(void) sPrimaryTilesetCBCounter = 0; sPrimaryTilesetCBBufferSize = 0; sPrimaryTilesetCB = NULL; - if (gMapHeader.mapData->primaryTileset && gMapHeader.mapData->primaryTileset->callback) - gMapHeader.mapData->primaryTileset->callback(); + if (gMapHeader.mapLayout->primaryTileset && gMapHeader.mapLayout->primaryTileset->callback) + gMapHeader.mapLayout->primaryTileset->callback(); } static void cur_mapheader_run_tileset2_func(void) @@ -695,8 +695,8 @@ static void cur_mapheader_run_tileset2_func(void) sSecondaryTilesetCBCounter = 0; sSecondaryTilesetCBBufferSize = 0; sSecondaryTilesetCB = NULL; - if (gMapHeader.mapData->secondaryTileset && gMapHeader.mapData->secondaryTileset->callback) - gMapHeader.mapData->secondaryTileset->callback(); + if (gMapHeader.mapLayout->secondaryTileset && gMapHeader.mapLayout->secondaryTileset->callback) + gMapHeader.mapLayout->secondaryTileset->callback(); } void TilesetCb_General(void) diff --git a/src/tv.c b/src/tv.c index 2219a720b6..d32a8940ed 100644 --- a/src/tv.c +++ b/src/tv.c @@ -1958,7 +1958,7 @@ void sub_80EDB44(void) show->rivalTrainer.dexCount = GetHoennPokedexCount(0x01); } show->rivalTrainer.location = gMapHeader.regionMapSectionId; - show->rivalTrainer.mapDataId = gMapHeader.mapDataId; + show->rivalTrainer.mapLayoutId = gMapHeader.mapLayoutId; show->rivalTrainer.nSilverSymbols = 0; show->rivalTrainer.nGoldSymbols = 0; for (i = 0; i < 7; i ++) @@ -2010,7 +2010,7 @@ void sub_80EDCE8(void) show->treasureInvestigators.active = FALSE; show->treasureInvestigators.item = gSpecialVar_0x8005; show->treasureInvestigators.location = gMapHeader.regionMapSectionId; - show->treasureInvestigators.mapDataId = gMapHeader.mapDataId; + show->treasureInvestigators.mapLayoutId = gMapHeader.mapLayoutId; StringCopy(show->treasureInvestigators.playerName, gSaveBlock2Ptr->playerName); tv_store_id_3x(show); show->treasureInvestigators.language = gGameLanguage; @@ -6261,7 +6261,7 @@ static void DoTVShowTodaysRivalTrainer(void) sTVShowState = 8; break; case MAPSEC_DYNAMIC: - switch (show->rivalTrainer.mapDataId) + switch (show->rivalTrainer.mapLayoutId) { case 0x115 ... 0x117: sTVShowState = 10; @@ -6460,7 +6460,7 @@ static void DoTVShowHoennTreasureInvestigators(void) StringCopy(gStringVar1, ItemId_GetName(show->treasureInvestigators.item)); if (show->treasureInvestigators.location == MAPSEC_DYNAMIC) { - switch (show->treasureInvestigators.mapDataId) + switch (show->treasureInvestigators.mapLayoutId) { case 0x115 ... 0x117: sTVShowState = 2; diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 862672e198..6beacf0a2b 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -4613,7 +4613,7 @@ static u16 GetRoute119WaterTileNum(s16 x, s16 y, u8 section) for (yCur = yMin; yCur <= yMax; yCur++) { - for (xCur = 0; xCur < gMapHeader.mapData->width; xCur++) + for (xCur = 0; xCur < gMapHeader.mapLayout->width; xCur++) { u8 tileBehaviorId = MapGridGetMetatileBehaviorAt(xCur + 7, yCur + 7); if (MetatileBehavior_IsSurfableAndNotWaterfall(tileBehaviorId) == TRUE) @@ -4976,7 +4976,7 @@ static bool8 TryGenerateWildMon(const struct WildPokemonInfo *wildMonInfo, u8 ar level = ChooseWildMonLevel(&wildMonInfo->wildPokemon[wildMonIndex]); if (flags & WILD_CHECK_REPEL && !IsWildLevelAllowedByRepel(level)) return FALSE; - if (gMapHeader.mapDataId != 0x166 && flags & WILD_CHECK_KEEN_EYE && !IsAbilityAllowingEncounter(level)) + if (gMapHeader.mapLayoutId != 0x166 && flags & WILD_CHECK_KEEN_EYE && !IsAbilityAllowingEncounter(level)) return FALSE; CreateWildMon(wildMonInfo->wildPokemon[wildMonIndex].species, level); @@ -5037,7 +5037,7 @@ static bool8 DoWildEncounterRateTest(u32 encounterRate, bool8 ignoreAbility) { u32 ability = GetMonAbility(&gPlayerParty[0]); - if (ability == ABILITY_STENCH && gMapHeader.mapDataId == 0x169) + if (ability == ABILITY_STENCH && gMapHeader.mapLayoutId == 0x169) encounterRate = encounterRate * 3 / 4; else if (ability == ABILITY_STENCH) encounterRate /= 2; @@ -5085,7 +5085,7 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi headerId = GetCurrentMapWildMonHeaderId(); if (headerId == 0xFFFF) // invalid { - if (gMapHeader.mapDataId == 0x166) + if (gMapHeader.mapLayoutId == 0x166) { headerId = GetBattlePikeWildMonHeaderId(); if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll()) @@ -5100,7 +5100,7 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi BattleSetup_StartBattlePikeWildBattle(); return TRUE; } - if (gMapHeader.mapDataId == 0x169) + if (gMapHeader.mapLayoutId == 0x169) { headerId = gSaveBlock2Ptr->battlePyramidWildHeaderId; if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll()) @@ -5228,7 +5228,7 @@ bool8 SweetScentWildEncounter(void) headerId = GetCurrentMapWildMonHeaderId(); if (headerId == 0xFFFF) // invalid { - if (gMapHeader.mapDataId == 0x166) + if (gMapHeader.mapLayoutId == 0x166) { headerId = GetBattlePikeWildMonHeaderId(); if (TryGenerateWildMon(gBattlePikeWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, 0) != TRUE) @@ -5238,7 +5238,7 @@ bool8 SweetScentWildEncounter(void) BattleSetup_StartBattlePikeWildBattle(); return TRUE; } - if (gMapHeader.mapDataId == 0x169) + if (gMapHeader.mapLayoutId == 0x169) { headerId = gSaveBlock2Ptr->battlePyramidWildHeaderId; if (TryGenerateWildMon(gBattlePyramidWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, 0) != TRUE) From 5e00c0bfcf54271b392dd1b83a901c7d623ce704 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:42:01 -0500 Subject: [PATCH 29/55] Fix map constants --- data/event_scripts.s | 4 +- data/map_events.s | 4 +- .../events.inc | 2 +- .../events.inc | 4 +- .../events.inc | 2 +- .../EverGrandeCity_ChampionsRoom/events.inc | 2 +- .../maps/EverGrandeCity_DrakesRoom/events.inc | 4 +- .../EverGrandeCity_GlaciasRoom/events.inc | 4 +- .../EverGrandeCity_PhoebesRoom/events.inc | 4 +- .../events.inc | 4 +- .../EverGrandeCity_SidneysRoom/events.inc | 4 +- data/maps/Route110/events.inc | 8 +-- .../events.inc | 16 ----- .../header.inc | 15 ---- .../scripts.inc | 50 -------------- .../events.inc | 16 ----- .../header.inc | 15 ---- .../scripts.inc | 69 ------------------- .../events.inc | 16 +++++ .../header.inc | 15 ++++ .../scripts.inc | 50 ++++++++++++++ .../events.inc | 16 +++++ .../header.inc | 15 ++++ .../scripts.inc | 69 +++++++++++++++++++ data/maps/groups.inc | 4 +- data/maps/headers.inc | 4 +- include/constants/maps.h | 20 +++--- src/wild_encounter.c | 12 ++-- 28 files changed, 224 insertions(+), 224 deletions(-) delete mode 100644 data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc delete mode 100644 data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc delete mode 100644 data/maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc delete mode 100644 data/maps/Route110_SeasideCyclingRoadEntrance2/events.inc delete mode 100644 data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc delete mode 100644 data/maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc create mode 100644 data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc create mode 100644 data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc create mode 100644 data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc create mode 100644 data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc create mode 100644 data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc create mode 100644 data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc diff --git a/data/event_scripts.s b/data/event_scripts.s index 4ad0ad60dd..0336c0c97c 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -767,8 +767,8 @@ SecretBase_RedCave1_Text_23B759: @ 823B759 .include "data/maps/Route110_TrickHousePuzzle6/scripts.inc" .include "data/maps/Route110_TrickHousePuzzle7/scripts.inc" .include "data/maps/Route110_TrickHousePuzzle8/scripts.inc" - .include "data/maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc" - .include "data/maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc" + .include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc" + .include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc" .include "data/maps/Route113_GlassWorkshop/scripts.inc" .include "data/maps/Route123_BerryMastersHouse/scripts.inc" .include "data/maps/Route119_WeatherInstitute_1F/scripts.inc" diff --git a/data/map_events.s b/data/map_events.s index aca9978e48..4fcfb59796 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -518,8 +518,8 @@ .include "data/maps/Route110_TrickHousePuzzle6/events.inc" .include "data/maps/Route110_TrickHousePuzzle7/events.inc" .include "data/maps/Route110_TrickHousePuzzle8/events.inc" - .include "data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc" - .include "data/maps/Route110_SeasideCyclingRoadEntrance2/events.inc" + .include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc" + .include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc" .include "data/maps/Route113_GlassWorkshop/events.inc" .include "data/maps/Route123_BerryMastersHouse/events.inc" .include "data/maps/Route119_WeatherInstitute_1F/events.inc" diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc index c9eeaff22b..049c263da7 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc @@ -1,6 +1,6 @@ CaveOfOrigin_UnusedRubySapphireMap1_MapWarps: @ 8535D64 warp_def 13, 5, 3, 1, MAP_CAVE_OF_ORIGIN_1F - warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RS_B2F + warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 CaveOfOrigin_UnusedRubySapphireMap1_MapEvents:: @ 8535D74 map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap1_MapWarps, 0x0, 0x0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc index c8e9bbeeba..5af05a4712 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc @@ -1,6 +1,6 @@ CaveOfOrigin_UnusedRubySapphireMap2_MapWarps: @ 8535D88 - warp_def 5, 10, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RS_B1F - warp_def 8, 14, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RS_B3F + warp_def 5, 10, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 + warp_def 8, 14, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 CaveOfOrigin_UnusedRubySapphireMap2_MapEvents:: @ 8535D98 map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap2_MapWarps, 0x0, 0x0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc index 953eef5581..a17416bd31 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc @@ -1,5 +1,5 @@ CaveOfOrigin_UnusedRubySapphireMap3_MapWarps: @ 8535DAC - warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RS_B2F + warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 warp_def 12, 6, 3, 0, MAP_CAVE_OF_ORIGIN_B1F CaveOfOrigin_UnusedRubySapphireMap3_MapEvents:: @ 8535DBC diff --git a/data/maps/EverGrandeCity_ChampionsRoom/events.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc index 6226fe527c..c97236e419 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/events.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/events.inc @@ -4,7 +4,7 @@ EverGrandeCity_ChampionsRoom_EventObjects: @ 8533700 object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 921 EverGrandeCity_ChampionsRoom_MapWarps: @ 8533748 - warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR4 + warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_HALL4 warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL_OF_FAME EverGrandeCity_ChampionsRoom_MapEvents:: @ 8533758 diff --git a/data/maps/EverGrandeCity_DrakesRoom/events.inc b/data/maps/EverGrandeCity_DrakesRoom/events.inc index 56eda43748..90c9af1c4a 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/events.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/events.inc @@ -2,8 +2,8 @@ EverGrandeCity_DrakesRoom_EventObjects: @ 85336C4 object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0 EverGrandeCity_DrakesRoom_MapWarps: @ 85336DC - warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR3 - warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR4 + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL3 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL4 EverGrandeCity_DrakesRoom_MapEvents:: @ 85336EC map_events EverGrandeCity_DrakesRoom_EventObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/events.inc b/data/maps/EverGrandeCity_GlaciasRoom/events.inc index c8d85fd988..5490ed006f 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/events.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/events.inc @@ -2,8 +2,8 @@ EverGrandeCity_GlaciasRoom_EventObjects: @ 8533688 object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0 EverGrandeCity_GlaciasRoom_MapWarps: @ 85336A0 - warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR2 - warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR3 + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL2 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL3 EverGrandeCity_GlaciasRoom_MapEvents:: @ 85336B0 map_events EverGrandeCity_GlaciasRoom_EventObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/events.inc b/data/maps/EverGrandeCity_PhoebesRoom/events.inc index c9b5ef7fd2..296fe32400 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/events.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/events.inc @@ -2,8 +2,8 @@ EverGrandeCity_PhoebesRoom_EventObjects: @ 853364C object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0 EverGrandeCity_PhoebesRoom_MapWarps: @ 8533664 - warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR1 - warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR2 + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL1 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL2 EverGrandeCity_PhoebesRoom_MapEvents:: @ 8533674 map_events EverGrandeCity_PhoebesRoom_EventObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc index 536dbf934b..ff2ca71c2b 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc @@ -7,8 +7,8 @@ EverGrandeCity_PokemonLeague_1F_EventObjects: @ 8533860 EverGrandeCity_PokemonLeague_1F_MapWarps: @ 85338C0 warp_def 9, 11, 3, 0, MAP_EVER_GRANDE_CITY warp_def 10, 11, 3, 0, MAP_EVER_GRANDE_CITY - warp_def 9, 1, 3, 0, MAP_EVER_GRANDE_CITY_CORRIDOR5 - warp_def 10, 1, 3, 0, MAP_EVER_GRANDE_CITY_CORRIDOR5 + warp_def 9, 1, 3, 0, MAP_EVER_GRANDE_CITY_HALL5 + warp_def 10, 1, 3, 0, MAP_EVER_GRANDE_CITY_HALL5 warp_def 1, 7, 4, 0, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F EverGrandeCity_PokemonLeague_1F_MapEvents:: @ 85338E8 diff --git a/data/maps/EverGrandeCity_SidneysRoom/events.inc b/data/maps/EverGrandeCity_SidneysRoom/events.inc index 1823af7cd5..af4c5de980 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/events.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/events.inc @@ -2,8 +2,8 @@ EverGrandeCity_SidneysRoom_EventObjects: @ 8533610 object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0 EverGrandeCity_SidneysRoom_MapWarps: @ 8533628 - warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR5 - warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR1 + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL5 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL1 EverGrandeCity_SidneysRoom_MapEvents:: @ 8533638 map_events EverGrandeCity_SidneysRoom_EventObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc index c982ededf5..a38375d8e5 100644 --- a/data/maps/Route110/events.inc +++ b/data/maps/Route110/events.inc @@ -39,10 +39,10 @@ Route110_EventObjects: @ 8528CF0 Route110_MapWarps: @ 8529050 warp_def 35, 24, 3, 0, MAP_NEW_MAUVILLE_ENTRANCE warp_def 11, 66, 0, 0, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 15, 16, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE - warp_def 18, 16, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE - warp_def 16, 88, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE - warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE + warp_def 15, 16, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE + warp_def 18, 16, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE + warp_def 16, 88, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE + warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE Route110_MapCoordEvents: @ 8529080 coord_event 28, 92, 3, 0, VAR_0x40A9, 2, 0, Route110_EventScript_1EF661 diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc b/data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc deleted file mode 100644 index ed1750f79f..0000000000 --- a/data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route110_SeasideCyclingRoadEntrance1_EventObjects: @ 853E9A0 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78, 0 - -Route110_SeasideCyclingRoadEntrance1_MapWarps: @ 853E9B8 - warp_def 1, 5, 0, 4, MAP_ROUTE110 - warp_def 2, 5, 0, 4, MAP_ROUTE110 - warp_def 12, 5, 0, 5, MAP_ROUTE110 - warp_def 13, 5, 0, 5, MAP_ROUTE110 - -Route110_SeasideCyclingRoadEntrance1_MapCoordEvents: @ 853E9D8 - coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EA84 - coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EAB6 - -Route110_SeasideCyclingRoadEntrance1_MapEvents:: @ 853E9F8 - map_events Route110_SeasideCyclingRoadEntrance1_EventObjects, Route110_SeasideCyclingRoadEntrance1_MapWarps, Route110_SeasideCyclingRoadEntrance1_MapCoordEvents, 0x0 - diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc b/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc deleted file mode 100644 index a2d6a37a5d..0000000000 --- a/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_SeasideCyclingRoadEntrance1: @ 8485C80 - .4byte Route110_SeasideCyclingRoadEntrance_Layout - .4byte Route110_SeasideCyclingRoadEntrance1_MapEvents - .4byte Route110_SeasideCyclingRoadEntrance1_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte 256 - .byte 25 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 1 - .byte 0 - diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc b/data/maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc deleted file mode 100644 index 9579df56c5..0000000000 --- a/data/maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc +++ /dev/null @@ -1,50 +0,0 @@ -Route110_SeasideCyclingRoadEntrance1_MapScripts:: @ 826EA77 - .byte 0 - -Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78:: @ 826EA78 - lock - faceplayer - msgbox Route110_SeasideCyclingRoadEntrance1_Text_26EAC1, 4 - release - end - -Route110_SeasideCyclingRoadEntrance1_EventScript_26EA84:: @ 826EA84 - lockall - specialvar VAR_RESULT, GetPlayerAvatarBike - compare VAR_RESULT, 0 - goto_eq Route110_SeasideCyclingRoadEntrance1_EventScript_26EA9F - setflag FLAG_SYS_CYCLING_ROAD - setvar VAR_TEMP_1, 1 - releaseall - end - -Route110_SeasideCyclingRoadEntrance1_EventScript_26EA9F:: @ 826EA9F - msgbox Route110_SeasideCyclingRoadEntrance1_Text_26EB48, 4 - closemessage - applymovement 255, Route110_SeasideCyclingRoadEntrance1_Movement_26EAB4 - waitmovement 0 - releaseall - end - -Route110_SeasideCyclingRoadEntrance1_Movement_26EAB4: @ 826EAB4 - walk_left - step_end - -Route110_SeasideCyclingRoadEntrance1_EventScript_26EAB6:: @ 826EAB6 - lockall - clearflag FLAG_SYS_CYCLING_ROAD - setvar VAR_TEMP_1, 0 - releaseall - end - -Route110_SeasideCyclingRoadEntrance1_Text_26EAC1: @ 826EAC1 - .string "On CYCLING ROAD, you can go all out\n" - .string "and cycle as fast as you’d like.\p" - .string "It feels great to go that fast, but try\n" - .string "not to crash into anyone!$" - -Route110_SeasideCyclingRoadEntrance1_Text_26EB48: @ 826EB48 - .string "Sorry, you can’t walk on CYCLING\n" - .string "ROAD. It’s too dangerous.\p" - .string "Please come back with a BIKE.$" - diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance2/events.inc b/data/maps/Route110_SeasideCyclingRoadEntrance2/events.inc deleted file mode 100644 index 5ad30e6c1f..0000000000 --- a/data/maps/Route110_SeasideCyclingRoadEntrance2/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route110_SeasideCyclingRoadEntrance2_EventObjects: @ 853EA0C - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4, 0 - -Route110_SeasideCyclingRoadEntrance2_MapWarps: @ 853EA24 - warp_def 1, 5, 0, 2, MAP_ROUTE110 - warp_def 2, 5, 0, 2, MAP_ROUTE110 - warp_def 12, 5, 0, 3, MAP_ROUTE110 - warp_def 13, 5, 0, 3, MAP_ROUTE110 - -Route110_SeasideCyclingRoadEntrance2_MapCoordEvents: @ 853EA44 - coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBD0 - coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EC13 - -Route110_SeasideCyclingRoadEntrance2_MapEvents:: @ 853EA64 - map_events Route110_SeasideCyclingRoadEntrance2_EventObjects, Route110_SeasideCyclingRoadEntrance2_MapWarps, Route110_SeasideCyclingRoadEntrance2_MapCoordEvents, 0x0 - diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc b/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc deleted file mode 100644 index 1720a77a25..0000000000 --- a/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_SeasideCyclingRoadEntrance2: @ 8485C9C - .4byte Route110_SeasideCyclingRoadEntrance_Layout - .4byte Route110_SeasideCyclingRoadEntrance2_MapEvents - .4byte Route110_SeasideCyclingRoadEntrance2_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte 256 - .byte 25 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 1 - .byte 0 - diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc b/data/maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc deleted file mode 100644 index 499969d6eb..0000000000 --- a/data/maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc +++ /dev/null @@ -1,69 +0,0 @@ -Route110_SeasideCyclingRoadEntrance2_MapScripts:: @ 826EBA1 - map_script 3, Route110_SeasideCyclingRoadEntrance2_MapScript1_26EBA7 - .byte 0 - -Route110_SeasideCyclingRoadEntrance2_MapScript1_26EBA7: @ 826EBA7 - compare VAR_0x40A9, 3 - call_if 1, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBBE - compare VAR_0x40A9, 2 - call_if 1, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBBE - end - -Route110_SeasideCyclingRoadEntrance2_EventScript_26EBBE:: @ 826EBBE - setvar VAR_0x40A9, 1 - return - -Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4:: @ 826EBC4 - lock - faceplayer - msgbox Route110_SeasideCyclingRoadEntrance2_Text_26EC23, 4 - release - end - -Route110_SeasideCyclingRoadEntrance2_EventScript_26EBD0:: @ 826EBD0 - lockall - specialvar VAR_RESULT, GetPlayerAvatarBike - compare VAR_RESULT, 2 - call_if 1, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBF6 - compare VAR_RESULT, 0 - goto_eq Route110_SeasideCyclingRoadEntrance2_EventScript_26EBFC - setflag FLAG_SYS_CYCLING_ROAD - setvar VAR_TEMP_1, 1 - releaseall - end - -Route110_SeasideCyclingRoadEntrance2_EventScript_26EBF6:: @ 826EBF6 - setvar VAR_0x40A9, 1 - return - -Route110_SeasideCyclingRoadEntrance2_EventScript_26EBFC:: @ 826EBFC - msgbox Route110_SeasideCyclingRoadEntrance2_Text_26ECAA, 4 - closemessage - applymovement 255, Route110_SeasideCyclingRoadEntrance2_Movement_26EC11 - waitmovement 0 - releaseall - end - -Route110_SeasideCyclingRoadEntrance2_Movement_26EC11: @ 826EC11 - walk_left - step_end - -Route110_SeasideCyclingRoadEntrance2_EventScript_26EC13:: @ 826EC13 - lockall - setvar VAR_0x40A9, 0 - clearflag FLAG_SYS_CYCLING_ROAD - setvar VAR_TEMP_1, 0 - releaseall - end - -Route110_SeasideCyclingRoadEntrance2_Text_26EC23: @ 826EC23 - .string "On CYCLING ROAD, you can go all out\n" - .string "and cycle as fast as you’d like.\p" - .string "It feels great to go that fast, but try\n" - .string "not to crash into anyone!$" - -Route110_SeasideCyclingRoadEntrance2_Text_26ECAA: @ 826ECAA - .string "Sorry, you can’t walk on CYCLING\n" - .string "ROAD. It’s too dangerous.\p" - .string "Please come back with a BIKE.$" - diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc new file mode 100644 index 0000000000..adb59f580e --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc @@ -0,0 +1,16 @@ +Route110_SeasideCyclingRoadNorthEntrance_EventObjects: @ 853E9A0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78, 0 + +Route110_SeasideCyclingRoadNorthEntrance_MapWarps: @ 853E9B8 + warp_def 1, 5, 0, 4, MAP_ROUTE110 + warp_def 2, 5, 0, 4, MAP_ROUTE110 + warp_def 12, 5, 0, 5, MAP_ROUTE110 + warp_def 13, 5, 0, 5, MAP_ROUTE110 + +Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents: @ 853E9D8 + coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84 + coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6 + +Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: @ 853E9F8 + map_events Route110_SeasideCyclingRoadNorthEntrance_EventObjects, Route110_SeasideCyclingRoadNorthEntrance_MapWarps, Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents, 0x0 + diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc new file mode 100644 index 0000000000..35a466e1e2 --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc @@ -0,0 +1,15 @@ +Route110_SeasideCyclingRoadNorthEntrance: @ 8485C80 + .4byte Route110_SeasideCyclingRoadEntrance_Layout + .4byte Route110_SeasideCyclingRoadNorthEntrance_MapEvents + .4byte Route110_SeasideCyclingRoadNorthEntrance_MapScripts + .4byte 0x0 + .2byte MUS_FINECITY + .2byte 256 + .byte 25 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 1 + .byte 0 + diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc new file mode 100644 index 0000000000..cbb5070a2a --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc @@ -0,0 +1,50 @@ +Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 826EA77 + .byte 0 + +Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78:: @ 826EA78 + lock + faceplayer + msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EAC1, 4 + release + end + +Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84:: @ 826EA84 + lockall + specialvar VAR_RESULT, GetPlayerAvatarBike + compare VAR_RESULT, 0 + goto_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA9F + setflag FLAG_SYS_CYCLING_ROAD + setvar VAR_TEMP_1, 1 + releaseall + end + +Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA9F:: @ 826EA9F + msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EB48, 4 + closemessage + applymovement 255, Route110_SeasideCyclingRoadNorthEntrance_Movement_26EAB4 + waitmovement 0 + releaseall + end + +Route110_SeasideCyclingRoadNorthEntrance_Movement_26EAB4: @ 826EAB4 + walk_left + step_end + +Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6:: @ 826EAB6 + lockall + clearflag FLAG_SYS_CYCLING_ROAD + setvar VAR_TEMP_1, 0 + releaseall + end + +Route110_SeasideCyclingRoadNorthEntrance_Text_26EAC1: @ 826EAC1 + .string "On CYCLING ROAD, you can go all out\n" + .string "and cycle as fast as you’d like.\p" + .string "It feels great to go that fast, but try\n" + .string "not to crash into anyone!$" + +Route110_SeasideCyclingRoadNorthEntrance_Text_26EB48: @ 826EB48 + .string "Sorry, you can’t walk on CYCLING\n" + .string "ROAD. It’s too dangerous.\p" + .string "Please come back with a BIKE.$" + diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc new file mode 100644 index 0000000000..5def6e102b --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc @@ -0,0 +1,16 @@ +Route110_SeasideCyclingRoadSouthEntrance_EventObjects: @ 853EA0C + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4, 0 + +Route110_SeasideCyclingRoadSouthEntrance_MapWarps: @ 853EA24 + warp_def 1, 5, 0, 2, MAP_ROUTE110 + warp_def 2, 5, 0, 2, MAP_ROUTE110 + warp_def 12, 5, 0, 3, MAP_ROUTE110 + warp_def 13, 5, 0, 3, MAP_ROUTE110 + +Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents: @ 853EA44 + coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0 + coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13 + +Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: @ 853EA64 + map_events Route110_SeasideCyclingRoadSouthEntrance_EventObjects, Route110_SeasideCyclingRoadSouthEntrance_MapWarps, Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents, 0x0 + diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc new file mode 100644 index 0000000000..2529d7366b --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc @@ -0,0 +1,15 @@ +Route110_SeasideCyclingRoadSouthEntrance: @ 8485C9C + .4byte Route110_SeasideCyclingRoadEntrance_Layout + .4byte Route110_SeasideCyclingRoadSouthEntrance_MapEvents + .4byte Route110_SeasideCyclingRoadSouthEntrance_MapScripts + .4byte 0x0 + .2byte MUS_FINECITY + .2byte 256 + .byte 25 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 1 + .byte 0 + diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc new file mode 100644 index 0000000000..9f99cf44f3 --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc @@ -0,0 +1,69 @@ +Route110_SeasideCyclingRoadSouthEntrance_MapScripts:: @ 826EBA1 + map_script 3, Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7 + .byte 0 + +Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7: @ 826EBA7 + compare VAR_0x40A9, 3 + call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE + compare VAR_0x40A9, 2 + call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE + end + +Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE:: @ 826EBBE + setvar VAR_0x40A9, 1 + return + +Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4:: @ 826EBC4 + lock + faceplayer + msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26EC23, 4 + release + end + +Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0:: @ 826EBD0 + lockall + specialvar VAR_RESULT, GetPlayerAvatarBike + compare VAR_RESULT, 2 + call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6 + compare VAR_RESULT, 0 + goto_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC + setflag FLAG_SYS_CYCLING_ROAD + setvar VAR_TEMP_1, 1 + releaseall + end + +Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6:: @ 826EBF6 + setvar VAR_0x40A9, 1 + return + +Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC:: @ 826EBFC + msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26ECAA, 4 + closemessage + applymovement 255, Route110_SeasideCyclingRoadSouthEntrance_Movement_26EC11 + waitmovement 0 + releaseall + end + +Route110_SeasideCyclingRoadSouthEntrance_Movement_26EC11: @ 826EC11 + walk_left + step_end + +Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13:: @ 826EC13 + lockall + setvar VAR_0x40A9, 0 + clearflag FLAG_SYS_CYCLING_ROAD + setvar VAR_TEMP_1, 0 + releaseall + end + +Route110_SeasideCyclingRoadSouthEntrance_Text_26EC23: @ 826EC23 + .string "On CYCLING ROAD, you can go all out\n" + .string "and cycle as fast as you’d like.\p" + .string "It feels great to go that fast, but try\n" + .string "not to crash into anyone!$" + +Route110_SeasideCyclingRoadSouthEntrance_Text_26ECAA: @ 826ECAA + .string "Sorry, you can’t walk on CYCLING\n" + .string "ROAD. It’s too dangerous.\p" + .string "Please come back with a BIKE.$" + diff --git a/data/maps/groups.inc b/data/maps/groups.inc index f7fc7be897..77f9c4441b 100644 --- a/data/maps/groups.inc +++ b/data/maps/groups.inc @@ -567,8 +567,8 @@ gMapGroup29: @ 848652C .4byte Route110_TrickHousePuzzle6 .4byte Route110_TrickHousePuzzle7 .4byte Route110_TrickHousePuzzle8 - .4byte Route110_SeasideCyclingRoadEntrance1 - .4byte Route110_SeasideCyclingRoadEntrance2 + .4byte Route110_SeasideCyclingRoadNorthEntrance + .4byte Route110_SeasideCyclingRoadSouthEntrance gMapGroup30: @ 8486560 .4byte Route113_GlassWorkshop diff --git a/data/maps/headers.inc b/data/maps/headers.inc index 58d2cc66cb..b4be3ab0c2 100644 --- a/data/maps/headers.inc +++ b/data/maps/headers.inc @@ -508,8 +508,8 @@ .include "data/maps/Route110_TrickHousePuzzle6/header.inc" .include "data/maps/Route110_TrickHousePuzzle7/header.inc" .include "data/maps/Route110_TrickHousePuzzle8/header.inc" - .include "data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc" - .include "data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc" + .include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc" + .include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc" .include "data/maps/Route113_GlassWorkshop/header.inc" .include "data/maps/Route123_BerryMastersHouse/header.inc" .include "data/maps/Route119_WeatherInstitute_1F/header.inc" diff --git a/include/constants/maps.h b/include/constants/maps.h index f6096e1c5b..bcb7784221 100644 --- a/include/constants/maps.h +++ b/include/constants/maps.h @@ -250,11 +250,11 @@ #define MAP_EVER_GRANDE_CITY_GLACIAS_ROOM (2 | (16 << 8)) #define MAP_EVER_GRANDE_CITY_DRAKES_ROOM (3 | (16 << 8)) #define MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM (4 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_CORRIDOR1 (5 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_CORRIDOR2 (6 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_CORRIDOR3 (7 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_CORRIDOR4 (8 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_CORRIDOR5 (9 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL1 (5 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL2 (6 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL3 (7 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL4 (8 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL5 (9 | (16 << 8)) #define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F (10 | (16 << 8)) #define MAP_EVER_GRANDE_CITY_HALL_OF_FAME (11 | (16 << 8)) #define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F (12 | (16 << 8)) @@ -327,9 +327,9 @@ #define MAP_SEAFLOOR_CAVERN_ROOM9 (36 | (24 << 8)) #define MAP_CAVE_OF_ORIGIN_ENTRANCE (37 | (24 << 8)) #define MAP_CAVE_OF_ORIGIN_1F (38 | (24 << 8)) -#define MAP_CAVE_OF_ORIGIN_UNUSED_RS_B1F (39 | (24 << 8)) // -#define MAP_CAVE_OF_ORIGIN_UNUSED_RS_B2F (40 | (24 << 8)) // Ruby/Sapphire leftovers -#define MAP_CAVE_OF_ORIGIN_UNUSED_RS_B3F (41 | (24 << 8)) // +#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 (39 | (24 << 8)) // +#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 (40 | (24 << 8)) // Ruby/Sapphire leftovers +#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 (41 | (24 << 8)) // #define MAP_CAVE_OF_ORIGIN_B1F (42 | (24 << 8)) #define MAP_VICTORY_ROAD_1F (43 | (24 << 8)) #define MAP_VICTORY_ROAD_B1F (44 | (24 << 8)) @@ -570,8 +570,8 @@ #define MAP_ROUTE110_TRICK_HOUSE_PUZZLE6 (8 | (29 << 8)) #define MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 (9 | (29 << 8)) #define MAP_ROUTE110_TRICK_HOUSE_PUZZLE8 (10 | (29 << 8)) -#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE (11 | (29 << 8)) -#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE (12 | (29 << 8)) +#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE (11 | (29 << 8)) +#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE (12 | (29 << 8)) // Map Group 30 #define MAP_ROUTE113_GLASS_WORKSHOP (0 | (30 << 8)) diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 6beacf0a2b..82ef742133 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -3821,24 +3821,24 @@ const struct WildPokemonHeader gWildMonHeaders[] = .fishingMonsInfo = NULL, }, { - .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RS_B1F), - .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RS_B1F), + .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1), + .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1), .landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap1_LandMonsInfo, .waterMonsInfo = NULL, .rockSmashMonsInfo = NULL, .fishingMonsInfo = NULL, }, { - .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RS_B2F), - .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RS_B2F), + .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2), + .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2), .landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap2_LandMonsInfo, .waterMonsInfo = NULL, .rockSmashMonsInfo = NULL, .fishingMonsInfo = NULL, }, { - .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RS_B3F), - .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RS_B3F), + .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3), + .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3), .landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap3_LandMonsInfo, .waterMonsInfo = NULL, .rockSmashMonsInfo = NULL, From 91ee3221b3a4885d155ad2cca16b7678062ad18a Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:42:34 -0500 Subject: [PATCH 30/55] Formatting --- .../AbandonedShip_CaptainsOffice/layout.inc | 3 +- .../AbandonedShip_Corridors_1F/layout.inc | 3 +- .../AbandonedShip_Corridors_B1F/layout.inc | 3 +- data/layouts/AbandonedShip_Deck/layout.inc | 3 +- .../layout.inc | 3 +- .../AbandonedShip_HiddenFloorRooms/layout.inc | 3 +- .../layouts/AbandonedShip_Room_B1F/layout.inc | 3 +- .../AbandonedShip_Rooms2_1F/layout.inc | 3 +- .../AbandonedShip_Rooms2_B1F/layout.inc | 3 +- .../layouts/AbandonedShip_Rooms_1F/layout.inc | 3 +- .../AbandonedShip_Rooms_B1F/layout.inc | 3 +- .../AbandonedShip_Underwater1/layout.inc | 3 +- .../AbandonedShip_Underwater2/layout.inc | 3 +- data/layouts/AlteringCave/layout.inc | 3 +- data/layouts/AncientTomb/layout.inc | 3 +- data/layouts/AquaHideout_1F/layout.inc | 3 +- data/layouts/AquaHideout_B1F/layout.inc | 3 +- data/layouts/AquaHideout_B2F/layout.inc | 3 +- .../AquaHideout_UnusedRubyMap1/layout.inc | 3 +- .../AquaHideout_UnusedRubyMap2/layout.inc | 3 +- .../AquaHideout_UnusedRubyMap3/layout.inc | 3 +- data/layouts/ArtisanCave_1F/layout.inc | 3 +- data/layouts/ArtisanCave_B1F/layout.inc | 3 +- data/layouts/BattleElevator/layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../BattleFrontier_BattleDomeLobby/layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../BattleFrontier_BattlePikeLobby/layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layouts/BattleFrontier_Lounge1/layout.inc | 3 +- .../layouts/BattleFrontier_Lounge2/layout.inc | 3 +- .../BattleFrontier_OutsideEast/layout.inc | 3 +- .../BattleFrontier_OutsideWest/layout.inc | 3 +- .../BattleFrontier_RankingHall/layout.inc | 3 +- .../BattleFrontier_ReceptionGate/layout.inc | 3 +- .../BattleFrontier_ScottsHouse/layout.inc | 3 +- data/layouts/BattlePyramidSquare01/layout.inc | 3 +- data/layouts/BattlePyramidSquare02/layout.inc | 3 +- data/layouts/BattlePyramidSquare03/layout.inc | 3 +- data/layouts/BattlePyramidSquare04/layout.inc | 3 +- data/layouts/BattlePyramidSquare05/layout.inc | 3 +- data/layouts/BattlePyramidSquare06/layout.inc | 3 +- data/layouts/BattlePyramidSquare07/layout.inc | 3 +- data/layouts/BattlePyramidSquare08/layout.inc | 3 +- data/layouts/BattlePyramidSquare09/layout.inc | 3 +- data/layouts/BattlePyramidSquare10/layout.inc | 3 +- data/layouts/BattlePyramidSquare11/layout.inc | 3 +- data/layouts/BattlePyramidSquare12/layout.inc | 3 +- data/layouts/BattlePyramidSquare13/layout.inc | 3 +- data/layouts/BattlePyramidSquare14/layout.inc | 3 +- data/layouts/BattlePyramidSquare15/layout.inc | 3 +- data/layouts/BattlePyramidSquare16/layout.inc | 3 +- data/layouts/BattleTentBattleRoom/layout.inc | 3 +- data/layouts/BattleTentCorridor/layout.inc | 3 +- data/layouts/BattleTentLobby/layout.inc | 3 +- data/layouts/BirthIsland_Exterior/layout.inc | 3 +- data/layouts/CableCarStation/layout.inc | 3 +- data/layouts/CaveOfOrigin_1F/layout.inc | 3 +- data/layouts/CaveOfOrigin_B1F/layout.inc | 3 +- data/layouts/CaveOfOrigin_Entrance/layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- data/layouts/DesertRuins/layout.inc | 3 +- data/layouts/DesertUnderpass/layout.inc | 3 +- data/layouts/DewfordTown/layout.inc | 3 +- data/layouts/DewfordTown_Gym/layout.inc | 3 +- data/layouts/DewfordTown_Hall/layout.inc | 3 +- data/layouts/DoubleBattleColosseum/layout.inc | 3 +- data/layouts/EverGrandeCity/layout.inc | 3 +- .../EverGrandeCity_ChampionsRoom/layout.inc | 3 +- .../EverGrandeCity_DrakesRoom/layout.inc | 3 +- .../EverGrandeCity_GlaciasRoom/layout.inc | 3 +- data/layouts/EverGrandeCity_Hall4/layout.inc | 3 +- .../EverGrandeCity_HallOfFame/layout.inc | 3 +- .../EverGrandeCity_PhoebesRoom/layout.inc | 3 +- .../layout.inc | 3 +- .../EverGrandeCity_ShortHall/layout.inc | 3 +- .../EverGrandeCity_SidneysRoom/layout.inc | 3 +- data/layouts/FallarborTown/layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layouts/FarawayIsland_Entrance/layout.inc | 3 +- .../layouts/FarawayIsland_Interior/layout.inc | 3 +- data/layouts/FieryPath/layout.inc | 3 +- data/layouts/FortreeCity/layout.inc | 3 +- .../FortreeCity_DecorationShop/layout.inc | 3 +- data/layouts/FortreeCity_Gym/layout.inc | 3 +- data/layouts/FortreeCity_House1/layout.inc | 3 +- data/layouts/FortreeCity_House2/layout.inc | 3 +- data/layouts/GraniteCave_1F/layout.inc | 3 +- data/layouts/GraniteCave_B1F/layout.inc | 3 +- data/layouts/GraniteCave_B2F/layout.inc | 3 +- .../GraniteCave_StevensRoom/layout.inc | 3 +- data/layouts/Harbor/layout.inc | 3 +- data/layouts/House1/layout.inc | 3 +- data/layouts/House2/layout.inc | 3 +- data/layouts/House3/layout.inc | 3 +- data/layouts/House4/layout.inc | 3 +- data/layouts/HouseWithBed/layout.inc | 3 +- data/layouts/InsideOfTruck/layout.inc | 3 +- data/layouts/IslandCave/layout.inc | 3 +- data/layouts/IslandHarbor/layout.inc | 3 +- data/layouts/JaggedPass/layout.inc | 3 +- data/layouts/LavaridgeTown/layout.inc | 3 +- data/layouts/LavaridgeTown_Gym_1F/layout.inc | 3 +- data/layouts/LavaridgeTown_Gym_B1F/layout.inc | 3 +- .../layouts/LavaridgeTown_HerbShop/layout.inc | 3 +- .../LavaridgeTown_PokemonCenter_1F/layout.inc | 3 +- data/layouts/LilycoveCity/layout.inc | 3 +- .../LilycoveCity_ContestHall/layout.inc | 3 +- .../LilycoveCity_ContestLobby/layout.inc | 3 +- .../LilycoveCity_CoveLilyMotel_1F/layout.inc | 3 +- .../LilycoveCity_CoveLilyMotel_2F/layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- data/layouts/LilycoveCity_House2/layout.inc | 3 +- .../LilycoveCity_LilycoveMuseum_1F/layout.inc | 3 +- .../LilycoveCity_LilycoveMuseum_2F/layout.inc | 3 +- .../layout.inc | 3 +- data/layouts/LinkContestRoom1/layout.inc | 3 +- data/layouts/LinkContestRoom2/layout.inc | 3 +- data/layouts/LinkContestRoom3/layout.inc | 3 +- data/layouts/LinkContestRoom4/layout.inc | 3 +- data/layouts/LinkContestRoom5/layout.inc | 3 +- data/layouts/LinkContestRoom6/layout.inc | 3 +- data/layouts/LittlerootTown/layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../LittlerootTown_MaysHouse_1F/layout.inc | 3 +- .../LittlerootTown_MaysHouse_2F/layout.inc | 3 +- .../layout.inc | 3 +- data/layouts/MagmaHideout_1F/layout.inc | 3 +- data/layouts/MagmaHideout_2F_1R/layout.inc | 3 +- data/layouts/MagmaHideout_2F_2R/layout.inc | 3 +- data/layouts/MagmaHideout_2F_3R/layout.inc | 3 +- data/layouts/MagmaHideout_3F_1R/layout.inc | 3 +- data/layouts/MagmaHideout_3F_2R/layout.inc | 3 +- data/layouts/MagmaHideout_3F_3R/layout.inc | 3 +- data/layouts/MagmaHideout_4F/layout.inc | 3 +- data/layouts/MarineCave_End/layout.inc | 3 +- data/layouts/MarineCave_Entrance/layout.inc | 3 +- data/layouts/Mart/layout.inc | 3 +- data/layouts/MauvilleCity/layout.inc | 3 +- data/layouts/MauvilleCity_BikeShop/layout.inc | 3 +- .../MauvilleCity_GameCorner/layout.inc | 3 +- data/layouts/MauvilleCity_Gym/layout.inc | 3 +- data/layouts/MeteorFalls_1F_1R/layout.inc | 3 +- data/layouts/MeteorFalls_1F_2R/layout.inc | 3 +- data/layouts/MeteorFalls_B1F_1R/layout.inc | 3 +- data/layouts/MeteorFalls_B1F_2R/layout.inc | 3 +- .../MeteorFalls_StevensCave/layout.inc | 3 +- data/layouts/MirageTower_1F/layout.inc | 3 +- data/layouts/MirageTower_2F/layout.inc | 3 +- data/layouts/MirageTower_3F/layout.inc | 3 +- data/layouts/MirageTower_4F/layout.inc | 3 +- data/layouts/MossdeepCity/layout.inc | 3 +- .../MossdeepCity_GameCorner_1F/layout.inc | 3 +- .../MossdeepCity_GameCorner_B1F/layout.inc | 3 +- data/layouts/MossdeepCity_Gym/layout.inc | 3 +- .../MossdeepCity_SpaceCenter_1F/layout.inc | 3 +- .../MossdeepCity_SpaceCenter_2F/layout.inc | 3 +- .../MossdeepCity_StevensHouse/layout.inc | 3 +- data/layouts/MtChimney/layout.inc | 3 +- data/layouts/MtPyre_1F/layout.inc | 3 +- data/layouts/MtPyre_2F/layout.inc | 3 +- data/layouts/MtPyre_3F/layout.inc | 3 +- data/layouts/MtPyre_4F/layout.inc | 3 +- data/layouts/MtPyre_5F/layout.inc | 3 +- data/layouts/MtPyre_6F/layout.inc | 3 +- data/layouts/MtPyre_Exterior/layout.inc | 3 +- data/layouts/MtPyre_Summit/layout.inc | 3 +- data/layouts/NavelRock_B1F/layout.inc | 3 +- data/layouts/NavelRock_Bottom/layout.inc | 3 +- data/layouts/NavelRock_Entrance/layout.inc | 3 +- data/layouts/NavelRock_Exterior/layout.inc | 3 +- data/layouts/NavelRock_Fork/layout.inc | 3 +- data/layouts/NavelRock_LadderRoom1/layout.inc | 3 +- data/layouts/NavelRock_LadderRoom2/layout.inc | 3 +- data/layouts/NavelRock_Top/layout.inc | 3 +- data/layouts/NewMauville_Entrance/layout.inc | 3 +- data/layouts/NewMauville_Inside/layout.inc | 3 +- data/layouts/OldaleTown/layout.inc | 3 +- data/layouts/PacifidlogTown/layout.inc | 3 +- data/layouts/PacifidlogTown_House1/layout.inc | 3 +- data/layouts/PacifidlogTown_House2/layout.inc | 3 +- data/layouts/PetalburgCity/layout.inc | 3 +- data/layouts/PetalburgCity_Gym/layout.inc | 3 +- data/layouts/PetalburgWoods/layout.inc | 3 +- data/layouts/PokemonCenter_1F/layout.inc | 3 +- data/layouts/PokemonCenter_2F/layout.inc | 3 +- data/layouts/RecordCorner/layout.inc | 3 +- data/layouts/Route101/layout.inc | 3 +- data/layouts/Route102/layout.inc | 3 +- data/layouts/Route103/layout.inc | 3 +- data/layouts/Route104/layout.inc | 3 +- .../Route104_MrBrineysHouse/layout.inc | 3 +- .../Route104_PrettyPetalFlowerShop/layout.inc | 3 +- data/layouts/Route104_Prototype/layout.inc | 3 +- data/layouts/Route105/layout.inc | 3 +- data/layouts/Route106/layout.inc | 3 +- data/layouts/Route107/layout.inc | 3 +- data/layouts/Route108/layout.inc | 3 +- data/layouts/Route109/layout.inc | 3 +- .../layouts/Route109_SeashoreHouse/layout.inc | 3 +- data/layouts/Route110/layout.inc | 3 +- .../layout.inc | 3 +- .../Route110_TrickHouseCorridor/layout.inc | 3 +- .../layouts/Route110_TrickHouseEnd/layout.inc | 3 +- .../Route110_TrickHouseEntrance/layout.inc | 3 +- .../Route110_TrickHousePuzzle1/layout.inc | 3 +- .../Route110_TrickHousePuzzle2/layout.inc | 3 +- .../Route110_TrickHousePuzzle3/layout.inc | 3 +- .../Route110_TrickHousePuzzle4/layout.inc | 3 +- .../Route110_TrickHousePuzzle5/layout.inc | 3 +- .../Route110_TrickHousePuzzle6/layout.inc | 3 +- .../Route110_TrickHousePuzzle7/layout.inc | 3 +- .../Route110_TrickHousePuzzle8/layout.inc | 3 +- data/layouts/Route111/layout.inc | 3 +- data/layouts/Route112/layout.inc | 3 +- data/layouts/Route113/layout.inc | 3 +- data/layouts/Route114/layout.inc | 3 +- .../Route114_FossilManiacsHouse/layout.inc | 3 +- .../Route114_FossilManiacsTunnel/layout.inc | 3 +- .../layouts/Route114_LanettesHouse/layout.inc | 3 +- data/layouts/Route115/layout.inc | 3 +- data/layouts/Route116/layout.inc | 3 +- .../Route116_TunnelersRestHouse/layout.inc | 3 +- data/layouts/Route117/layout.inc | 3 +- .../Route117_PokemonDayCare/layout.inc | 3 +- data/layouts/Route118/layout.inc | 3 +- data/layouts/Route119/layout.inc | 3 +- .../Route119_WeatherInstitute_1F/layout.inc | 3 +- .../Route119_WeatherInstitute_2F/layout.inc | 3 +- data/layouts/Route120/layout.inc | 3 +- data/layouts/Route121/layout.inc | 3 +- .../Route121_SafariZoneEntrance/layout.inc | 3 +- data/layouts/Route122/layout.inc | 3 +- data/layouts/Route123/layout.inc | 3 +- data/layouts/Route124/layout.inc | 3 +- .../layout.inc | 3 +- data/layouts/Route125/layout.inc | 3 +- data/layouts/Route126/layout.inc | 3 +- data/layouts/Route127/layout.inc | 3 +- data/layouts/Route128/layout.inc | 3 +- data/layouts/Route129/layout.inc | 3 +- data/layouts/Route130/layout.inc | 3 +- data/layouts/Route131/layout.inc | 3 +- data/layouts/Route132/layout.inc | 3 +- data/layouts/Route133/layout.inc | 3 +- data/layouts/Route134/layout.inc | 3 +- data/layouts/RustboroCity/layout.inc | 3 +- .../RustboroCity_CuttersHouse/layout.inc | 3 +- .../RustboroCity_DevonCorp_1F/layout.inc | 3 +- .../RustboroCity_DevonCorp_2F/layout.inc | 3 +- .../RustboroCity_DevonCorp_3F/layout.inc | 3 +- data/layouts/RustboroCity_Flat1_1F/layout.inc | 3 +- data/layouts/RustboroCity_Flat1_2F/layout.inc | 3 +- data/layouts/RustboroCity_Flat2_1F/layout.inc | 3 +- data/layouts/RustboroCity_Flat2_2F/layout.inc | 3 +- data/layouts/RustboroCity_Flat2_3F/layout.inc | 3 +- data/layouts/RustboroCity_Gym/layout.inc | 3 +- data/layouts/RustboroCity_House/layout.inc | 3 +- data/layouts/RustboroCity_House1/layout.inc | 3 +- .../RustboroCity_PokemonSchool/layout.inc | 3 +- data/layouts/RusturfTunnel/layout.inc | 3 +- data/layouts/SSTidalCorridor/layout.inc | 3 +- data/layouts/SSTidalLowerDeck/layout.inc | 3 +- data/layouts/SSTidalRooms/layout.inc | 3 +- data/layouts/SafariZone_North/layout.inc | 3 +- data/layouts/SafariZone_Northeast/layout.inc | 3 +- data/layouts/SafariZone_Northwest/layout.inc | 3 +- data/layouts/SafariZone_RestHouse/layout.inc | 3 +- data/layouts/SafariZone_South/layout.inc | 3 +- data/layouts/SafariZone_Southeast/layout.inc | 3 +- data/layouts/SafariZone_Southwest/layout.inc | 3 +- data/layouts/ScorchedSlab/layout.inc | 3 +- .../SeafloorCavern_Entrance/layout.inc | 3 +- data/layouts/SeafloorCavern_Room1/layout.inc | 3 +- data/layouts/SeafloorCavern_Room2/layout.inc | 3 +- data/layouts/SeafloorCavern_Room3/layout.inc | 3 +- data/layouts/SeafloorCavern_Room4/layout.inc | 3 +- data/layouts/SeafloorCavern_Room5/layout.inc | 3 +- data/layouts/SeafloorCavern_Room6/layout.inc | 3 +- data/layouts/SeafloorCavern_Room7/layout.inc | 3 +- data/layouts/SeafloorCavern_Room8/layout.inc | 3 +- data/layouts/SeafloorCavern_Room9/layout.inc | 3 +- .../SealedChamber_InnerRoom/layout.inc | 3 +- .../SealedChamber_OuterRoom/layout.inc | 3 +- data/layouts/SecretBase_BlueCave1/layout.inc | 3 +- data/layouts/SecretBase_BlueCave2/layout.inc | 3 +- data/layouts/SecretBase_BlueCave3/layout.inc | 3 +- data/layouts/SecretBase_BlueCave4/layout.inc | 3 +- data/layouts/SecretBase_BrownCave1/layout.inc | 3 +- data/layouts/SecretBase_BrownCave2/layout.inc | 3 +- data/layouts/SecretBase_BrownCave3/layout.inc | 3 +- data/layouts/SecretBase_BrownCave4/layout.inc | 3 +- data/layouts/SecretBase_RedCave1/layout.inc | 3 +- data/layouts/SecretBase_RedCave2/layout.inc | 3 +- data/layouts/SecretBase_RedCave3/layout.inc | 3 +- data/layouts/SecretBase_RedCave4/layout.inc | 3 +- data/layouts/SecretBase_Shrub1/layout.inc | 3 +- data/layouts/SecretBase_Shrub2/layout.inc | 3 +- data/layouts/SecretBase_Shrub3/layout.inc | 3 +- data/layouts/SecretBase_Shrub4/layout.inc | 3 +- data/layouts/SecretBase_Tree1/layout.inc | 3 +- data/layouts/SecretBase_Tree2/layout.inc | 3 +- data/layouts/SecretBase_Tree3/layout.inc | 3 +- data/layouts/SecretBase_Tree4/layout.inc | 3 +- .../layouts/SecretBase_YellowCave1/layout.inc | 3 +- .../layouts/SecretBase_YellowCave2/layout.inc | 3 +- .../layouts/SecretBase_YellowCave3/layout.inc | 3 +- .../layouts/SecretBase_YellowCave4/layout.inc | 3 +- .../ShoalCave_HighTideEntranceRoom/layout.inc | 3 +- .../ShoalCave_HighTideInnerRoom/layout.inc | 3 +- .../ShoalCave_LowTideEntranceRoom/layout.inc | 3 +- .../ShoalCave_LowTideIceRoom/layout.inc | 3 +- .../ShoalCave_LowTideInnerRoom/layout.inc | 3 +- .../ShoalCave_LowTideLowerRoom/layout.inc | 3 +- .../ShoalCave_LowTideStairsRoom/layout.inc | 3 +- data/layouts/SingleBattleColosseum/layout.inc | 3 +- data/layouts/SkyPillar_1F/layout.inc | 3 +- data/layouts/SkyPillar_2F/layout.inc | 3 +- data/layouts/SkyPillar_3F/layout.inc | 3 +- data/layouts/SkyPillar_4F/layout.inc | 3 +- data/layouts/SkyPillar_5F/layout.inc | 3 +- data/layouts/SkyPillar_Entrance/layout.inc | 3 +- data/layouts/SkyPillar_Outside/layout.inc | 3 +- data/layouts/SkyPillar_Top/layout.inc | 3 +- data/layouts/SlateportCity/layout.inc | 3 +- .../SlateportCity_OceanicMuseum_1F/layout.inc | 3 +- .../SlateportCity_OceanicMuseum_2F/layout.inc | 3 +- .../SlateportCity_PokemonFanClub/layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- data/layouts/SootopolisCity/layout.inc | 3 +- data/layouts/SootopolisCity_Gym_1F/layout.inc | 3 +- .../layouts/SootopolisCity_Gym_B1F/layout.inc | 3 +- data/layouts/SootopolisCity_House1/layout.inc | 3 +- data/layouts/SootopolisCity_House2/layout.inc | 3 +- data/layouts/SootopolisCity_House3/layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../SouthernIsland_Exterior/layout.inc | 3 +- .../SouthernIsland_Interior/layout.inc | 3 +- data/layouts/TerraCave_End/layout.inc | 3 +- data/layouts/TerraCave_Entrance/layout.inc | 3 +- data/layouts/TradeCenter/layout.inc | 3 +- data/layouts/TrainerHill_1F/layout.inc | 3 +- data/layouts/TrainerHill_2F/layout.inc | 3 +- data/layouts/TrainerHill_3F/layout.inc | 3 +- data/layouts/TrainerHill_4F/layout.inc | 3 +- data/layouts/TrainerHill_Entrance/layout.inc | 3 +- data/layouts/TrainerHill_Roof/layout.inc | 3 +- data/layouts/Underwater1/layout.inc | 3 +- data/layouts/Underwater2/layout.inc | 3 +- data/layouts/Underwater3/layout.inc | 3 +- data/layouts/Underwater4/layout.inc | 3 +- data/layouts/Underwater5/layout.inc | 3 +- data/layouts/Underwater6/layout.inc | 3 +- data/layouts/Underwater7/layout.inc | 3 +- data/layouts/Underwater_MarineCave/layout.inc | 3 +- data/layouts/Underwater_Route134/layout.inc | 3 +- .../Underwater_SeafloorCavern/layout.inc | 3 +- .../Underwater_SealedChamber/layout.inc | 3 +- .../Underwater_SootopolisCity/layout.inc | 3 +- data/layouts/UnionRoom/layout.inc | 3 +- data/layouts/UnknownMap_08417FC4/layout.inc | 3 +- data/layouts/UnknownMap_08428450/layout.inc | 3 +- data/layouts/UnknownMap_084294C4/layout.inc | 3 +- data/layouts/UnknownMap_084294E8/layout.inc | 3 +- data/layouts/UnknownMap_0843E6C0/layout.inc | 3 +- data/layouts/UnknownMap_0843E6E4/layout.inc | 3 +- data/layouts/UnknownMap_0843E708/layout.inc | 3 +- data/layouts/UnknownMap_0843E72C/layout.inc | 3 +- data/layouts/UnknownMap_0843E750/layout.inc | 3 +- data/layouts/UnknownMap_0843E774/layout.inc | 3 +- data/layouts/UnknownMap_0843E798/layout.inc | 3 +- data/layouts/UnknownMap_0843E7BC/layout.inc | 3 +- data/layouts/UnknownMap_0843E7E0/layout.inc | 3 +- data/layouts/UnknownMap_0843E804/layout.inc | 3 +- data/layouts/UnknownMap_0843E828/layout.inc | 3 +- data/layouts/UnknownMap_0843E84C/layout.inc | 3 +- data/layouts/UnknownMap_0843E870/layout.inc | 3 +- data/layouts/UnknownMap_0843E894/layout.inc | 2 +- data/layouts/UnknownMap_08447028/layout.inc | 3 +- data/layouts/UnknownMap_0845A394/layout.inc | 3 +- data/layouts/UnknownMap_0845D470/layout.inc | 3 +- data/layouts/UnknownMap_0845ECB4/layout.inc | 3 +- data/layouts/UnknownMap_08469200/layout.inc | 3 +- data/layouts/UnknownMap_084693AC/layout.inc | 3 +- data/layouts/UnknownMap_08470BD8/layout.inc | 3 +- data/layouts/UnknownMap_08480DAC/layout.inc | 3 +- data/layouts/UnknownMap_08480F54/layout.inc | 3 +- data/layouts/UnknownMap_084810FC/layout.inc | 3 +- data/layouts/UnknownMap_084812A4/layout.inc | 3 +- data/layouts/UnknownMap_0848144C/layout.inc | 3 +- data/layouts/UnknownMap_084815F4/layout.inc | 3 +- data/layouts/UnknownMap_08481B24/layout.inc | 3 +- data/layouts/UnknownMap_08481DBC/layout.inc | 3 +- data/layouts/UnknownMap_25_29/layout.inc | 3 +- data/layouts/UnknownMap_25_30/layout.inc | 3 +- data/layouts/UnknownMap_25_31/layout.inc | 3 +- data/layouts/UnknownMap_25_32/layout.inc | 3 +- data/layouts/UnknownMap_25_33/layout.inc | 3 +- data/layouts/UnknownMap_25_34/layout.inc | 3 +- data/layouts/VerdanturfTown/layout.inc | 3 +- .../layout.inc | 3 +- .../VerdanturfTown_WandasHouse/layout.inc | 3 +- data/layouts/VictoryRoad_1F/layout.inc | 3 +- data/layouts/VictoryRoad_B1F/layout.inc | 3 +- data/layouts/VictoryRoad_B2F/layout.inc | 3 +- data/layouts_table.inc | 263 +++++++++--------- 442 files changed, 572 insertions(+), 1013 deletions(-) diff --git a/data/layouts/AbandonedShip_CaptainsOffice/layout.inc b/data/layouts/AbandonedShip_CaptainsOffice/layout.inc index 8a123be4ca..d9e122ef20 100644 --- a/data/layouts/AbandonedShip_CaptainsOffice/layout.inc +++ b/data/layouts/AbandonedShip_CaptainsOffice/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_CaptainsOffice_MapBorder:: .incbin "data/layouts/AbandonedShip_CaptainsOffice/border.bin" - .align 2 AbandonedShip_CaptainsOffice_MapBlockdata:: .incbin "data/layouts/AbandonedShip_CaptainsOffice/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_CaptainsOffice_Layout:: .4byte AbandonedShip_CaptainsOffice_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/AbandonedShip_Corridors_1F/layout.inc b/data/layouts/AbandonedShip_Corridors_1F/layout.inc index f3704b1cc7..d5fd225782 100644 --- a/data/layouts/AbandonedShip_Corridors_1F/layout.inc +++ b/data/layouts/AbandonedShip_Corridors_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_Corridors_1F_MapBorder:: .incbin "data/layouts/AbandonedShip_Corridors_1F/border.bin" - .align 2 AbandonedShip_Corridors_1F_MapBlockdata:: .incbin "data/layouts/AbandonedShip_Corridors_1F/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_Corridors_1F_Layout:: .4byte AbandonedShip_Corridors_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_Corridors_B1F/layout.inc b/data/layouts/AbandonedShip_Corridors_B1F/layout.inc index 131caed67e..7299aa6f89 100644 --- a/data/layouts/AbandonedShip_Corridors_B1F/layout.inc +++ b/data/layouts/AbandonedShip_Corridors_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_Corridors_B1F_MapBorder:: .incbin "data/layouts/AbandonedShip_Corridors_B1F/border.bin" - .align 2 AbandonedShip_Corridors_B1F_MapBlockdata:: .incbin "data/layouts/AbandonedShip_Corridors_B1F/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_Corridors_B1F_Layout:: .4byte AbandonedShip_Corridors_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_Deck/layout.inc b/data/layouts/AbandonedShip_Deck/layout.inc index 81b598fb4f..7f0baaaec2 100644 --- a/data/layouts/AbandonedShip_Deck/layout.inc +++ b/data/layouts/AbandonedShip_Deck/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_Deck_MapBorder:: .incbin "data/layouts/AbandonedShip_Deck/border.bin" - .align 2 AbandonedShip_Deck_MapBlockdata:: .incbin "data/layouts/AbandonedShip_Deck/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_Deck_Layout:: .4byte AbandonedShip_Deck_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc b/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc index 1f7d3117af..0ee7aa7556 100644 --- a/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc +++ b/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_HiddenFloorCorridors_MapBorder:: .incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin" - .align 2 AbandonedShip_HiddenFloorCorridors_MapBlockdata:: .incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_HiddenFloorCorridors_Layout:: .4byte AbandonedShip_HiddenFloorCorridors_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc b/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc index d7b36dd8be..bf2f758d7a 100644 --- a/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc +++ b/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_HiddenFloorRooms_MapBorder:: .incbin "data/layouts/AbandonedShip_HiddenFloorRooms/border.bin" - .align 2 AbandonedShip_HiddenFloorRooms_MapBlockdata:: .incbin "data/layouts/AbandonedShip_HiddenFloorRooms/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_HiddenFloorRooms_Layout:: .4byte AbandonedShip_HiddenFloorRooms_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_Room_B1F/layout.inc b/data/layouts/AbandonedShip_Room_B1F/layout.inc index 62c4127f8b..fdd5b395d4 100644 --- a/data/layouts/AbandonedShip_Room_B1F/layout.inc +++ b/data/layouts/AbandonedShip_Room_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_Room_B1F_MapBorder:: .incbin "data/layouts/AbandonedShip_Room_B1F/border.bin" - .align 2 AbandonedShip_Room_B1F_MapBlockdata:: .incbin "data/layouts/AbandonedShip_Room_B1F/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_Room_B1F_Layout:: .4byte AbandonedShip_Room_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_Rooms2_1F/layout.inc b/data/layouts/AbandonedShip_Rooms2_1F/layout.inc index 26789691e8..d15652cc07 100644 --- a/data/layouts/AbandonedShip_Rooms2_1F/layout.inc +++ b/data/layouts/AbandonedShip_Rooms2_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_Rooms2_1F_MapBorder:: .incbin "data/layouts/AbandonedShip_Rooms2_1F/border.bin" - .align 2 AbandonedShip_Rooms2_1F_MapBlockdata:: .incbin "data/layouts/AbandonedShip_Rooms2_1F/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_Rooms2_1F_Layout:: .4byte AbandonedShip_Rooms2_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc b/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc index 35b92addd8..d99e43f473 100644 --- a/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc +++ b/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_Rooms2_B1F_MapBorder:: .incbin "data/layouts/AbandonedShip_Rooms2_B1F/border.bin" - .align 2 AbandonedShip_Rooms2_B1F_MapBlockdata:: .incbin "data/layouts/AbandonedShip_Rooms2_B1F/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_Rooms2_B1F_Layout:: .4byte AbandonedShip_Rooms2_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_Rooms_1F/layout.inc b/data/layouts/AbandonedShip_Rooms_1F/layout.inc index 0109a26f07..63e4a716a3 100644 --- a/data/layouts/AbandonedShip_Rooms_1F/layout.inc +++ b/data/layouts/AbandonedShip_Rooms_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_Rooms_1F_MapBorder:: .incbin "data/layouts/AbandonedShip_Rooms_1F/border.bin" - .align 2 AbandonedShip_Rooms_1F_MapBlockdata:: .incbin "data/layouts/AbandonedShip_Rooms_1F/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_Rooms_1F_Layout:: .4byte AbandonedShip_Rooms_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_Rooms_B1F/layout.inc b/data/layouts/AbandonedShip_Rooms_B1F/layout.inc index 40ef7680a1..ab688d668a 100644 --- a/data/layouts/AbandonedShip_Rooms_B1F/layout.inc +++ b/data/layouts/AbandonedShip_Rooms_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_Rooms_B1F_MapBorder:: .incbin "data/layouts/AbandonedShip_Rooms_B1F/border.bin" - .align 2 AbandonedShip_Rooms_B1F_MapBlockdata:: .incbin "data/layouts/AbandonedShip_Rooms_B1F/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_Rooms_B1F_Layout:: .4byte AbandonedShip_Rooms_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_Underwater1/layout.inc b/data/layouts/AbandonedShip_Underwater1/layout.inc index 5619d0dba4..8fa1b14859 100644 --- a/data/layouts/AbandonedShip_Underwater1/layout.inc +++ b/data/layouts/AbandonedShip_Underwater1/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_Underwater1_MapBorder:: .incbin "data/layouts/AbandonedShip_Underwater1/border.bin" - .align 2 AbandonedShip_Underwater1_MapBlockdata:: .incbin "data/layouts/AbandonedShip_Underwater1/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_Underwater1_Layout:: .4byte AbandonedShip_Underwater1_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_Underwater2/layout.inc b/data/layouts/AbandonedShip_Underwater2/layout.inc index 1d123c8c7b..feea82d163 100644 --- a/data/layouts/AbandonedShip_Underwater2/layout.inc +++ b/data/layouts/AbandonedShip_Underwater2/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_Underwater2_MapBorder:: .incbin "data/layouts/AbandonedShip_Underwater2/border.bin" - .align 2 AbandonedShip_Underwater2_MapBlockdata:: .incbin "data/layouts/AbandonedShip_Underwater2/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_Underwater2_Layout:: .4byte AbandonedShip_Underwater2_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AlteringCave/layout.inc b/data/layouts/AlteringCave/layout.inc index e69cc1dd0b..9f03e7d871 100644 --- a/data/layouts/AlteringCave/layout.inc +++ b/data/layouts/AlteringCave/layout.inc @@ -1,8 +1,6 @@ - .align 2 AlteringCave_MapBorder:: .incbin "data/layouts/AlteringCave/border.bin" - .align 2 AlteringCave_MapBlockdata:: .incbin "data/layouts/AlteringCave/map.bin" @@ -14,3 +12,4 @@ AlteringCave_Layout:: .4byte AlteringCave_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/AncientTomb/layout.inc b/data/layouts/AncientTomb/layout.inc index 7aabb07cc0..ad173f9360 100644 --- a/data/layouts/AncientTomb/layout.inc +++ b/data/layouts/AncientTomb/layout.inc @@ -1,8 +1,6 @@ - .align 2 AncientTomb_MapBorder:: .incbin "data/layouts/AncientTomb/border.bin" - .align 2 AncientTomb_MapBlockdata:: .incbin "data/layouts/AncientTomb/map.bin" @@ -14,3 +12,4 @@ AncientTomb_Layout:: .4byte AncientTomb_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/AquaHideout_1F/layout.inc b/data/layouts/AquaHideout_1F/layout.inc index 645be578fd..5508a668b4 100644 --- a/data/layouts/AquaHideout_1F/layout.inc +++ b/data/layouts/AquaHideout_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 AquaHideout_1F_MapBorder:: .incbin "data/layouts/AquaHideout_1F/border.bin" - .align 2 AquaHideout_1F_MapBlockdata:: .incbin "data/layouts/AquaHideout_1F/map.bin" @@ -14,3 +12,4 @@ AquaHideout_1F_Layout:: .4byte AquaHideout_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/AquaHideout_B1F/layout.inc b/data/layouts/AquaHideout_B1F/layout.inc index 10cfd2d9b3..0889e548a8 100644 --- a/data/layouts/AquaHideout_B1F/layout.inc +++ b/data/layouts/AquaHideout_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 AquaHideout_B1F_MapBorder:: .incbin "data/layouts/AquaHideout_B1F/border.bin" - .align 2 AquaHideout_B1F_MapBlockdata:: .incbin "data/layouts/AquaHideout_B1F/map.bin" @@ -14,3 +12,4 @@ AquaHideout_B1F_Layout:: .4byte AquaHideout_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/AquaHideout_B2F/layout.inc b/data/layouts/AquaHideout_B2F/layout.inc index 188e51fcc3..9e335e5d92 100644 --- a/data/layouts/AquaHideout_B2F/layout.inc +++ b/data/layouts/AquaHideout_B2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 AquaHideout_B2F_MapBorder:: .incbin "data/layouts/AquaHideout_B2F/border.bin" - .align 2 AquaHideout_B2F_MapBlockdata:: .incbin "data/layouts/AquaHideout_B2F/map.bin" @@ -14,3 +12,4 @@ AquaHideout_B2F_Layout:: .4byte AquaHideout_B2F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc index 643993a221..05862b275b 100644 --- a/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc +++ b/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc @@ -1,8 +1,6 @@ - .align 2 AquaHideout_UnusedRubyMap1_MapBorder:: .incbin "data/layouts/AquaHideout_UnusedRubyMap1/border.bin" - .align 2 AquaHideout_UnusedRubyMap1_MapBlockdata:: .incbin "data/layouts/AquaHideout_UnusedRubyMap1/map.bin" @@ -14,3 +12,4 @@ AquaHideout_UnusedRubyMap1_Layout:: .4byte AquaHideout_UnusedRubyMap1_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc index 6fdf6b31ce..e9e08ab97f 100644 --- a/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc +++ b/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc @@ -1,8 +1,6 @@ - .align 2 AquaHideout_UnusedRubyMap2_MapBorder:: .incbin "data/layouts/AquaHideout_UnusedRubyMap2/border.bin" - .align 2 AquaHideout_UnusedRubyMap2_MapBlockdata:: .incbin "data/layouts/AquaHideout_UnusedRubyMap2/map.bin" @@ -14,3 +12,4 @@ AquaHideout_UnusedRubyMap2_Layout:: .4byte AquaHideout_UnusedRubyMap2_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc index 070fb2bace..44b35666f0 100644 --- a/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc +++ b/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc @@ -1,8 +1,6 @@ - .align 2 AquaHideout_UnusedRubyMap3_MapBorder:: .incbin "data/layouts/AquaHideout_UnusedRubyMap3/border.bin" - .align 2 AquaHideout_UnusedRubyMap3_MapBlockdata:: .incbin "data/layouts/AquaHideout_UnusedRubyMap3/map.bin" @@ -14,3 +12,4 @@ AquaHideout_UnusedRubyMap3_Layout:: .4byte AquaHideout_UnusedRubyMap3_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/ArtisanCave_1F/layout.inc b/data/layouts/ArtisanCave_1F/layout.inc index 7a5d636902..b32eef4221 100644 --- a/data/layouts/ArtisanCave_1F/layout.inc +++ b/data/layouts/ArtisanCave_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 ArtisanCave_1F_MapBorder:: .incbin "data/layouts/ArtisanCave_1F/border.bin" - .align 2 ArtisanCave_1F_MapBlockdata:: .incbin "data/layouts/ArtisanCave_1F/map.bin" @@ -14,3 +12,4 @@ ArtisanCave_1F_Layout:: .4byte ArtisanCave_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/ArtisanCave_B1F/layout.inc b/data/layouts/ArtisanCave_B1F/layout.inc index 97e409473b..2640303e34 100644 --- a/data/layouts/ArtisanCave_B1F/layout.inc +++ b/data/layouts/ArtisanCave_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 ArtisanCave_B1F_MapBorder:: .incbin "data/layouts/ArtisanCave_B1F/border.bin" - .align 2 ArtisanCave_B1F_MapBlockdata:: .incbin "data/layouts/ArtisanCave_B1F/map.bin" @@ -14,3 +12,4 @@ ArtisanCave_B1F_Layout:: .4byte ArtisanCave_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/BattleElevator/layout.inc b/data/layouts/BattleElevator/layout.inc index b101dbdda8..374af9ffad 100644 --- a/data/layouts/BattleElevator/layout.inc +++ b/data/layouts/BattleElevator/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleElevator_MapBorder:: .incbin "data/layouts/BattleElevator/border.bin" - .align 2 BattleElevator_MapBlockdata:: .incbin "data/layouts/BattleElevator/map.bin" @@ -14,3 +12,4 @@ BattleElevator_Layout:: .4byte BattleElevator_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc index 6b0f61b5fe..89f799d84f 100644 --- a/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc +++ b/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleArenaBattleRoom_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleArenaBattleRoom/border.bin" - .align 2 BattleFrontier_BattleArenaBattleRoom_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleArenaBattleRoom_Layout:: .4byte BattleFrontier_BattleArenaBattleRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleArena + diff --git a/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc b/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc index c984be1fb7..8961ed7785 100644 --- a/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc +++ b/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleArenaCorridor_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleArenaCorridor/border.bin" - .align 2 BattleFrontier_BattleArenaCorridor_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleArenaCorridor/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleArenaCorridor_Layout:: .4byte BattleFrontier_BattleArenaCorridor_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleArena + diff --git a/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc b/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc index bda4799ece..305fcc0d97 100644 --- a/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc +++ b/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleArenaLobby_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleArenaLobby/border.bin" - .align 2 BattleFrontier_BattleArenaLobby_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleArenaLobby/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleArenaLobby_Layout:: .4byte BattleFrontier_BattleArenaLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleArena + diff --git a/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc index 3ed732898a..a4991ae0c0 100644 --- a/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc +++ b/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleDomeBattleRoom_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleDomeBattleRoom/border.bin" - .align 2 BattleFrontier_BattleDomeBattleRoom_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleDomeBattleRoom_Layout:: .4byte BattleFrontier_BattleDomeBattleRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleDome + diff --git a/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc b/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc index f4354caf0c..7f3c93b827 100644 --- a/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc +++ b/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleDomeCorridor_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleDomeCorridor/border.bin" - .align 2 BattleFrontier_BattleDomeCorridor_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleDomeCorridor/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleDomeCorridor_Layout:: .4byte BattleFrontier_BattleDomeCorridor_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleDome + diff --git a/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc b/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc index d9127802ac..2553e70987 100644 --- a/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc +++ b/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleDomeLobby_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleDomeLobby/border.bin" - .align 2 BattleFrontier_BattleDomeLobby_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleDomeLobby/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleDomeLobby_Layout:: .4byte BattleFrontier_BattleDomeLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleDome + diff --git a/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc index 4ac7a79df1..8c0fe2ce5c 100644 --- a/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc +++ b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleDomePreBattleRoom_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.bin" - .align 2 BattleFrontier_BattleDomePreBattleRoom_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleDomePreBattleRoom_Layout:: .4byte BattleFrontier_BattleDomePreBattleRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleDome + diff --git a/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc index 35b8a1dec5..21ba6a0156 100644 --- a/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc +++ b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleFactoryBattleRoom_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.bin" - .align 2 BattleFrontier_BattleFactoryBattleRoom_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleFactoryBattleRoom_Layout:: .4byte BattleFrontier_BattleFactoryBattleRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFactory + diff --git a/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc b/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc index 2071dd54a9..cc0a336110 100644 --- a/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc +++ b/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleFactoryLobby_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleFactoryLobby/border.bin" - .align 2 BattleFrontier_BattleFactoryLobby_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleFactoryLobby/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleFactoryLobby_Layout:: .4byte BattleFrontier_BattleFactoryLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFactory + diff --git a/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc index f458fb9c22..fc4fc49bcc 100644 --- a/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc +++ b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleFactoryPreBattleRoom_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.bin" - .align 2 BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleFactoryPreBattleRoom_Layout:: .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFactory + diff --git a/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc index 2a570bbd78..3d9acc3c49 100644 --- a/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc +++ b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePalaceBattleRoom_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.bin" - .align 2 BattleFrontier_BattlePalaceBattleRoom_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePalaceBattleRoom_Layout:: .4byte BattleFrontier_BattlePalaceBattleRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_BattlePalace + diff --git a/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc b/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc index b76b87cb57..2d16216c52 100644 --- a/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc +++ b/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePalaceCorridor_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePalaceCorridor/border.bin" - .align 2 BattleFrontier_BattlePalaceCorridor_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePalaceCorridor/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePalaceCorridor_Layout:: .4byte BattleFrontier_BattlePalaceCorridor_MapBlockdata .4byte gTileset_General .4byte gTileset_BattlePalace + diff --git a/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc b/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc index 08c904db80..f9a1dad7b5 100644 --- a/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc +++ b/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePalaceLobby_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePalaceLobby/border.bin" - .align 2 BattleFrontier_BattlePalaceLobby_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePalaceLobby/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePalaceLobby_Layout:: .4byte BattleFrontier_BattlePalaceLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePalace + diff --git a/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc b/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc index 7dd3dcbaa1..1d6d21778c 100644 --- a/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc +++ b/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePikeCorridor_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePikeCorridor/border.bin" - .align 2 BattleFrontier_BattlePikeCorridor_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePikeCorridor/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePikeCorridor_Layout:: .4byte BattleFrontier_BattlePikeCorridor_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePike + diff --git a/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc b/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc index a1bd10dd31..3a5cd35380 100644 --- a/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc +++ b/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePikeLobby_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePikeLobby/border.bin" - .align 2 BattleFrontier_BattlePikeLobby_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePikeLobby/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePikeLobby_Layout:: .4byte BattleFrontier_BattlePikeLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePike + diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc index c860deb93c..466ad0ff4e 100644 --- a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc +++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePikeRandomRoom1_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin" - .align 2 BattleFrontier_BattlePikeRandomRoom1_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePikeRandomRoom1_Layout:: .4byte BattleFrontier_BattlePikeRandomRoom1_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePike + diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc index 1ad2a90cc8..1c7fb35d45 100644 --- a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc +++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePikeRandomRoom2_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin" - .align 2 BattleFrontier_BattlePikeRandomRoom2_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePikeRandomRoom2_Layout:: .4byte BattleFrontier_BattlePikeRandomRoom2_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePike + diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc index b60e073615..ce17a0bf68 100644 --- a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc +++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePikeRandomRoom3_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin" - .align 2 BattleFrontier_BattlePikeRandomRoom3_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePikeRandomRoom3_Layout:: .4byte BattleFrontier_BattlePikeRandomRoom3_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePike + diff --git a/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc index d4f99085b7..d7a082d13b 100644 --- a/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc +++ b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePikeThreePathRoom_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.bin" - .align 2 BattleFrontier_BattlePikeThreePathRoom_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePikeThreePathRoom_Layout:: .4byte BattleFrontier_BattlePikeThreePathRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePike + diff --git a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc index 8a991e45d9..a65e7928b1 100644 --- a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc +++ b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePointExchangeServiceCorner_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin" - .align 2 BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePointExchangeServiceCorner_Layout:: .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc index 2097173cc6..a9e779ddbe 100644 --- a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc +++ b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePyramidEmptySquare_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin" - .align 2 BattleFrontier_BattlePyramidEmptySquare_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePyramidEmptySquare_Layout:: .4byte BattleFrontier_BattlePyramidEmptySquare_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc b/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc index ecdceec7f9..28575776ac 100644 --- a/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc +++ b/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePyramidLobby_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePyramidLobby/border.bin" - .align 2 BattleFrontier_BattlePyramidLobby_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePyramidLobby/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePyramidLobby_Layout:: .4byte BattleFrontier_BattlePyramidLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc b/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc index e962595890..4657c37a36 100644 --- a/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc +++ b/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePyramidTop_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePyramidTop/border.bin" - .align 2 BattleFrontier_BattlePyramidTop_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePyramidTop/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePyramidTop_Layout:: .4byte BattleFrontier_BattlePyramidTop_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc index 8738d81e11..3d498239ae 100644 --- a/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc +++ b/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleTowerBattleRoom_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleTowerBattleRoom/border.bin" - .align 2 BattleFrontier_BattleTowerBattleRoom_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleTowerBattleRoom_Layout:: .4byte BattleFrontier_BattleTowerBattleRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc b/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc index c54c388120..56335aa234 100644 --- a/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc +++ b/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleTowerCorridor_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleTowerCorridor/border.bin" - .align 2 BattleFrontier_BattleTowerCorridor_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleTowerCorridor/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleTowerCorridor_Layout:: .4byte BattleFrontier_BattleTowerCorridor_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc b/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc index 9e822f0f95..7dba3777cd 100644 --- a/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc +++ b/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleTowerCorridor2_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin" - .align 2 BattleFrontier_BattleTowerCorridor2_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleTowerCorridor2_Layout:: .4byte BattleFrontier_BattleTowerCorridor2_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc b/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc index dc3733bc08..790ff3bcd7 100644 --- a/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc +++ b/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleTowerLobby_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleTowerLobby/border.bin" - .align 2 BattleFrontier_BattleTowerLobby_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleTowerLobby/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleTowerLobby_Layout:: .4byte BattleFrontier_BattleTowerLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc index dbd77c420c..df5615873f 100644 --- a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc +++ b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleTowerMultiBattleRoom_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin" - .align 2 BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleTowerMultiBattleRoom_Layout:: .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_Lounge1/layout.inc b/data/layouts/BattleFrontier_Lounge1/layout.inc index cc22cc8d72..c25b3b2a0f 100644 --- a/data/layouts/BattleFrontier_Lounge1/layout.inc +++ b/data/layouts/BattleFrontier_Lounge1/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_Lounge1_MapBorder:: .incbin "data/layouts/BattleFrontier_Lounge1/border.bin" - .align 2 BattleFrontier_Lounge1_MapBlockdata:: .incbin "data/layouts/BattleFrontier_Lounge1/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_Lounge1_Layout:: .4byte BattleFrontier_Lounge1_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_Lounge2/layout.inc b/data/layouts/BattleFrontier_Lounge2/layout.inc index 1f8df21ae2..b735b4994e 100644 --- a/data/layouts/BattleFrontier_Lounge2/layout.inc +++ b/data/layouts/BattleFrontier_Lounge2/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_Lounge2_MapBorder:: .incbin "data/layouts/BattleFrontier_Lounge2/border.bin" - .align 2 BattleFrontier_Lounge2_MapBlockdata:: .incbin "data/layouts/BattleFrontier_Lounge2/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_Lounge2_Layout:: .4byte BattleFrontier_Lounge2_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_OutsideEast/layout.inc b/data/layouts/BattleFrontier_OutsideEast/layout.inc index e79db8ee71..ddaf204465 100644 --- a/data/layouts/BattleFrontier_OutsideEast/layout.inc +++ b/data/layouts/BattleFrontier_OutsideEast/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_OutsideEast_MapBorder:: .incbin "data/layouts/BattleFrontier_OutsideEast/border.bin" - .align 2 BattleFrontier_OutsideEast_MapBlockdata:: .incbin "data/layouts/BattleFrontier_OutsideEast/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_OutsideEast_Layout:: .4byte BattleFrontier_OutsideEast_MapBlockdata .4byte gTileset_General .4byte gTileset_BattleFrontierOutsideEast + diff --git a/data/layouts/BattleFrontier_OutsideWest/layout.inc b/data/layouts/BattleFrontier_OutsideWest/layout.inc index 0644d4b2b8..a506e554fb 100644 --- a/data/layouts/BattleFrontier_OutsideWest/layout.inc +++ b/data/layouts/BattleFrontier_OutsideWest/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_OutsideWest_MapBorder:: .incbin "data/layouts/BattleFrontier_OutsideWest/border.bin" - .align 2 BattleFrontier_OutsideWest_MapBlockdata:: .incbin "data/layouts/BattleFrontier_OutsideWest/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_OutsideWest_Layout:: .4byte BattleFrontier_OutsideWest_MapBlockdata .4byte gTileset_General .4byte gTileset_BattleFrontierOutsideWest + diff --git a/data/layouts/BattleFrontier_RankingHall/layout.inc b/data/layouts/BattleFrontier_RankingHall/layout.inc index 03639f2032..d7615e693d 100644 --- a/data/layouts/BattleFrontier_RankingHall/layout.inc +++ b/data/layouts/BattleFrontier_RankingHall/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_RankingHall_MapBorder:: .incbin "data/layouts/BattleFrontier_RankingHall/border.bin" - .align 2 BattleFrontier_RankingHall_MapBlockdata:: .incbin "data/layouts/BattleFrontier_RankingHall/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_RankingHall_Layout:: .4byte BattleFrontier_RankingHall_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontierRankingHall + diff --git a/data/layouts/BattleFrontier_ReceptionGate/layout.inc b/data/layouts/BattleFrontier_ReceptionGate/layout.inc index 11beca5e5a..3dd4aeaa53 100644 --- a/data/layouts/BattleFrontier_ReceptionGate/layout.inc +++ b/data/layouts/BattleFrontier_ReceptionGate/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_ReceptionGate_MapBorder:: .incbin "data/layouts/BattleFrontier_ReceptionGate/border.bin" - .align 2 BattleFrontier_ReceptionGate_MapBlockdata:: .incbin "data/layouts/BattleFrontier_ReceptionGate/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_ReceptionGate_Layout:: .4byte BattleFrontier_ReceptionGate_MapBlockdata .4byte gTileset_General .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_ScottsHouse/layout.inc b/data/layouts/BattleFrontier_ScottsHouse/layout.inc index 913d636d1c..f087371096 100644 --- a/data/layouts/BattleFrontier_ScottsHouse/layout.inc +++ b/data/layouts/BattleFrontier_ScottsHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_ScottsHouse_MapBorder:: .incbin "data/layouts/BattleFrontier_ScottsHouse/border.bin" - .align 2 BattleFrontier_ScottsHouse_MapBlockdata:: .incbin "data/layouts/BattleFrontier_ScottsHouse/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_ScottsHouse_Layout:: .4byte BattleFrontier_ScottsHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattlePyramidSquare01/layout.inc b/data/layouts/BattlePyramidSquare01/layout.inc index 103f35b315..fe710cc404 100644 --- a/data/layouts/BattlePyramidSquare01/layout.inc +++ b/data/layouts/BattlePyramidSquare01/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare01_MapBorder:: .incbin "data/layouts/BattlePyramidSquare01/border.bin" - .align 2 BattlePyramidSquare01_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare01/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare01_Layout:: .4byte BattlePyramidSquare01_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare02/layout.inc b/data/layouts/BattlePyramidSquare02/layout.inc index c831af0a8c..6aa5b7aa98 100644 --- a/data/layouts/BattlePyramidSquare02/layout.inc +++ b/data/layouts/BattlePyramidSquare02/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare02_MapBorder:: .incbin "data/layouts/BattlePyramidSquare02/border.bin" - .align 2 BattlePyramidSquare02_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare02/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare02_Layout:: .4byte BattlePyramidSquare02_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare03/layout.inc b/data/layouts/BattlePyramidSquare03/layout.inc index fb1da5213c..4da41f9e9b 100644 --- a/data/layouts/BattlePyramidSquare03/layout.inc +++ b/data/layouts/BattlePyramidSquare03/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare03_MapBorder:: .incbin "data/layouts/BattlePyramidSquare03/border.bin" - .align 2 BattlePyramidSquare03_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare03/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare03_Layout:: .4byte BattlePyramidSquare03_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare04/layout.inc b/data/layouts/BattlePyramidSquare04/layout.inc index b8b7ce24f6..c298ee6f4e 100644 --- a/data/layouts/BattlePyramidSquare04/layout.inc +++ b/data/layouts/BattlePyramidSquare04/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare04_MapBorder:: .incbin "data/layouts/BattlePyramidSquare04/border.bin" - .align 2 BattlePyramidSquare04_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare04/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare04_Layout:: .4byte BattlePyramidSquare04_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare05/layout.inc b/data/layouts/BattlePyramidSquare05/layout.inc index f6f61cd5fe..87ce532740 100644 --- a/data/layouts/BattlePyramidSquare05/layout.inc +++ b/data/layouts/BattlePyramidSquare05/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare05_MapBorder:: .incbin "data/layouts/BattlePyramidSquare05/border.bin" - .align 2 BattlePyramidSquare05_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare05/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare05_Layout:: .4byte BattlePyramidSquare05_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare06/layout.inc b/data/layouts/BattlePyramidSquare06/layout.inc index 3774ce871f..bcaeb89b01 100644 --- a/data/layouts/BattlePyramidSquare06/layout.inc +++ b/data/layouts/BattlePyramidSquare06/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare06_MapBorder:: .incbin "data/layouts/BattlePyramidSquare06/border.bin" - .align 2 BattlePyramidSquare06_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare06/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare06_Layout:: .4byte BattlePyramidSquare06_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare07/layout.inc b/data/layouts/BattlePyramidSquare07/layout.inc index cd5f16b0e1..bb469b3c81 100644 --- a/data/layouts/BattlePyramidSquare07/layout.inc +++ b/data/layouts/BattlePyramidSquare07/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare07_MapBorder:: .incbin "data/layouts/BattlePyramidSquare07/border.bin" - .align 2 BattlePyramidSquare07_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare07/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare07_Layout:: .4byte BattlePyramidSquare07_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare08/layout.inc b/data/layouts/BattlePyramidSquare08/layout.inc index bc3ac30050..df88b710fd 100644 --- a/data/layouts/BattlePyramidSquare08/layout.inc +++ b/data/layouts/BattlePyramidSquare08/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare08_MapBorder:: .incbin "data/layouts/BattlePyramidSquare08/border.bin" - .align 2 BattlePyramidSquare08_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare08/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare08_Layout:: .4byte BattlePyramidSquare08_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare09/layout.inc b/data/layouts/BattlePyramidSquare09/layout.inc index 1794f72b3b..2869d9ac25 100644 --- a/data/layouts/BattlePyramidSquare09/layout.inc +++ b/data/layouts/BattlePyramidSquare09/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare09_MapBorder:: .incbin "data/layouts/BattlePyramidSquare09/border.bin" - .align 2 BattlePyramidSquare09_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare09/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare09_Layout:: .4byte BattlePyramidSquare09_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare10/layout.inc b/data/layouts/BattlePyramidSquare10/layout.inc index 49150f493f..2ba8e8124d 100644 --- a/data/layouts/BattlePyramidSquare10/layout.inc +++ b/data/layouts/BattlePyramidSquare10/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare10_MapBorder:: .incbin "data/layouts/BattlePyramidSquare10/border.bin" - .align 2 BattlePyramidSquare10_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare10/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare10_Layout:: .4byte BattlePyramidSquare10_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare11/layout.inc b/data/layouts/BattlePyramidSquare11/layout.inc index 8385b6f3a0..190bddf10b 100644 --- a/data/layouts/BattlePyramidSquare11/layout.inc +++ b/data/layouts/BattlePyramidSquare11/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare11_MapBorder:: .incbin "data/layouts/BattlePyramidSquare11/border.bin" - .align 2 BattlePyramidSquare11_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare11/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare11_Layout:: .4byte BattlePyramidSquare11_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare12/layout.inc b/data/layouts/BattlePyramidSquare12/layout.inc index a63f1dc346..199f66aceb 100644 --- a/data/layouts/BattlePyramidSquare12/layout.inc +++ b/data/layouts/BattlePyramidSquare12/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare12_MapBorder:: .incbin "data/layouts/BattlePyramidSquare12/border.bin" - .align 2 BattlePyramidSquare12_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare12/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare12_Layout:: .4byte BattlePyramidSquare12_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare13/layout.inc b/data/layouts/BattlePyramidSquare13/layout.inc index 6f145fe96b..351b04227c 100644 --- a/data/layouts/BattlePyramidSquare13/layout.inc +++ b/data/layouts/BattlePyramidSquare13/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare13_MapBorder:: .incbin "data/layouts/BattlePyramidSquare13/border.bin" - .align 2 BattlePyramidSquare13_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare13/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare13_Layout:: .4byte BattlePyramidSquare13_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare14/layout.inc b/data/layouts/BattlePyramidSquare14/layout.inc index ec69a1b54d..653ad161b5 100644 --- a/data/layouts/BattlePyramidSquare14/layout.inc +++ b/data/layouts/BattlePyramidSquare14/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare14_MapBorder:: .incbin "data/layouts/BattlePyramidSquare14/border.bin" - .align 2 BattlePyramidSquare14_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare14/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare14_Layout:: .4byte BattlePyramidSquare14_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare15/layout.inc b/data/layouts/BattlePyramidSquare15/layout.inc index 29c5444f90..24090c671e 100644 --- a/data/layouts/BattlePyramidSquare15/layout.inc +++ b/data/layouts/BattlePyramidSquare15/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare15_MapBorder:: .incbin "data/layouts/BattlePyramidSquare15/border.bin" - .align 2 BattlePyramidSquare15_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare15/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare15_Layout:: .4byte BattlePyramidSquare15_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare16/layout.inc b/data/layouts/BattlePyramidSquare16/layout.inc index cc28959436..67187b9bf6 100644 --- a/data/layouts/BattlePyramidSquare16/layout.inc +++ b/data/layouts/BattlePyramidSquare16/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare16_MapBorder:: .incbin "data/layouts/BattlePyramidSquare16/border.bin" - .align 2 BattlePyramidSquare16_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare16/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare16_Layout:: .4byte BattlePyramidSquare16_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattleTentBattleRoom/layout.inc b/data/layouts/BattleTentBattleRoom/layout.inc index 97be7fdb4f..4f9a8e6261 100644 --- a/data/layouts/BattleTentBattleRoom/layout.inc +++ b/data/layouts/BattleTentBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleTentBattleRoom_MapBorder:: .incbin "data/layouts/BattleTentBattleRoom/border.bin" - .align 2 BattleTentBattleRoom_MapBlockdata:: .incbin "data/layouts/BattleTentBattleRoom/map.bin" @@ -14,3 +12,4 @@ BattleTentBattleRoom_Layout:: .4byte BattleTentBattleRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleTent + diff --git a/data/layouts/BattleTentCorridor/layout.inc b/data/layouts/BattleTentCorridor/layout.inc index 21f6c94fdf..9abcdefa43 100644 --- a/data/layouts/BattleTentCorridor/layout.inc +++ b/data/layouts/BattleTentCorridor/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleTentCorridor_MapBorder:: .incbin "data/layouts/BattleTentCorridor/border.bin" - .align 2 BattleTentCorridor_MapBlockdata:: .incbin "data/layouts/BattleTentCorridor/map.bin" @@ -14,3 +12,4 @@ BattleTentCorridor_Layout:: .4byte BattleTentCorridor_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleTent + diff --git a/data/layouts/BattleTentLobby/layout.inc b/data/layouts/BattleTentLobby/layout.inc index a740ae2f93..a3216370f0 100644 --- a/data/layouts/BattleTentLobby/layout.inc +++ b/data/layouts/BattleTentLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleTentLobby_MapBorder:: .incbin "data/layouts/BattleTentLobby/border.bin" - .align 2 BattleTentLobby_MapBlockdata:: .incbin "data/layouts/BattleTentLobby/map.bin" @@ -14,3 +12,4 @@ BattleTentLobby_Layout:: .4byte BattleTentLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleTent + diff --git a/data/layouts/BirthIsland_Exterior/layout.inc b/data/layouts/BirthIsland_Exterior/layout.inc index 0fe3899ae7..17dc4f0fbd 100644 --- a/data/layouts/BirthIsland_Exterior/layout.inc +++ b/data/layouts/BirthIsland_Exterior/layout.inc @@ -1,8 +1,6 @@ - .align 2 BirthIsland_Exterior_MapBorder:: .incbin "data/layouts/BirthIsland_Exterior/border.bin" - .align 2 BirthIsland_Exterior_MapBlockdata:: .incbin "data/layouts/BirthIsland_Exterior/map.bin" @@ -14,3 +12,4 @@ BirthIsland_Exterior_Layout:: .4byte BirthIsland_Exterior_MapBlockdata .4byte gTileset_General .4byte gTileset_Dewford + diff --git a/data/layouts/CableCarStation/layout.inc b/data/layouts/CableCarStation/layout.inc index c2727063f6..1113f89f2e 100644 --- a/data/layouts/CableCarStation/layout.inc +++ b/data/layouts/CableCarStation/layout.inc @@ -1,8 +1,6 @@ - .align 2 CableCarStation_MapBorder:: .incbin "data/layouts/CableCarStation/border.bin" - .align 2 CableCarStation_MapBlockdata:: .incbin "data/layouts/CableCarStation/map.bin" @@ -14,3 +12,4 @@ CableCarStation_Layout:: .4byte CableCarStation_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/CaveOfOrigin_1F/layout.inc b/data/layouts/CaveOfOrigin_1F/layout.inc index d82ecddd0f..616af16558 100644 --- a/data/layouts/CaveOfOrigin_1F/layout.inc +++ b/data/layouts/CaveOfOrigin_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 CaveOfOrigin_1F_MapBorder:: .incbin "data/layouts/CaveOfOrigin_1F/border.bin" - .align 2 CaveOfOrigin_1F_MapBlockdata:: .incbin "data/layouts/CaveOfOrigin_1F/map.bin" @@ -14,3 +12,4 @@ CaveOfOrigin_1F_Layout:: .4byte CaveOfOrigin_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/CaveOfOrigin_B1F/layout.inc b/data/layouts/CaveOfOrigin_B1F/layout.inc index 41158462c8..5850f15c90 100644 --- a/data/layouts/CaveOfOrigin_B1F/layout.inc +++ b/data/layouts/CaveOfOrigin_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 CaveOfOrigin_B1F_MapBorder:: .incbin "data/layouts/CaveOfOrigin_B1F/border.bin" - .align 2 CaveOfOrigin_B1F_MapBlockdata:: .incbin "data/layouts/CaveOfOrigin_B1F/map.bin" @@ -14,3 +12,4 @@ CaveOfOrigin_B1F_Layout:: .4byte CaveOfOrigin_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/CaveOfOrigin_Entrance/layout.inc b/data/layouts/CaveOfOrigin_Entrance/layout.inc index 3e6375d3e6..11e230ce36 100644 --- a/data/layouts/CaveOfOrigin_Entrance/layout.inc +++ b/data/layouts/CaveOfOrigin_Entrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 CaveOfOrigin_Entrance_MapBorder:: .incbin "data/layouts/CaveOfOrigin_Entrance/border.bin" - .align 2 CaveOfOrigin_Entrance_MapBlockdata:: .incbin "data/layouts/CaveOfOrigin_Entrance/map.bin" @@ -14,3 +12,4 @@ CaveOfOrigin_Entrance_Layout:: .4byte CaveOfOrigin_Entrance_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc index dfaf8b8a6d..294bf786a2 100644 --- a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc +++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc @@ -1,8 +1,6 @@ - .align 2 CaveOfOrigin_UnusedRubySapphireMap1_MapBorder:: .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/border.bin" - .align 2 CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata:: .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/map.bin" @@ -14,3 +12,4 @@ CaveOfOrigin_UnusedRubySapphireMap1_Layout:: .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc index 5caa1b9e5a..c3a05f75f7 100644 --- a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc +++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc @@ -1,8 +1,6 @@ - .align 2 CaveOfOrigin_UnusedRubySapphireMap2_MapBorder:: .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/border.bin" - .align 2 CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata:: .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/map.bin" @@ -14,3 +12,4 @@ CaveOfOrigin_UnusedRubySapphireMap2_Layout:: .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc index 6290452c0b..cbc5c052a7 100644 --- a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc +++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc @@ -1,8 +1,6 @@ - .align 2 CaveOfOrigin_UnusedRubySapphireMap3_MapBorder:: .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/border.bin" - .align 2 CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata:: .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/map.bin" @@ -14,3 +12,4 @@ CaveOfOrigin_UnusedRubySapphireMap3_Layout:: .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/DesertRuins/layout.inc b/data/layouts/DesertRuins/layout.inc index 6c4bff8862..4d6e7571ab 100644 --- a/data/layouts/DesertRuins/layout.inc +++ b/data/layouts/DesertRuins/layout.inc @@ -1,8 +1,6 @@ - .align 2 DesertRuins_MapBorder:: .incbin "data/layouts/DesertRuins/border.bin" - .align 2 DesertRuins_MapBlockdata:: .incbin "data/layouts/DesertRuins/map.bin" @@ -14,3 +12,4 @@ DesertRuins_Layout:: .4byte DesertRuins_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/DesertUnderpass/layout.inc b/data/layouts/DesertUnderpass/layout.inc index 3871e181ea..9a17a128e0 100644 --- a/data/layouts/DesertUnderpass/layout.inc +++ b/data/layouts/DesertUnderpass/layout.inc @@ -1,8 +1,6 @@ - .align 2 DesertUnderpass_MapBorder:: .incbin "data/layouts/DesertUnderpass/border.bin" - .align 2 DesertUnderpass_MapBlockdata:: .incbin "data/layouts/DesertUnderpass/map.bin" @@ -14,3 +12,4 @@ DesertUnderpass_Layout:: .4byte DesertUnderpass_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/DewfordTown/layout.inc b/data/layouts/DewfordTown/layout.inc index 077262836c..28ccdc43c5 100644 --- a/data/layouts/DewfordTown/layout.inc +++ b/data/layouts/DewfordTown/layout.inc @@ -1,8 +1,6 @@ - .align 2 DewfordTown_MapBorder:: .incbin "data/layouts/DewfordTown/border.bin" - .align 2 DewfordTown_MapBlockdata:: .incbin "data/layouts/DewfordTown/map.bin" @@ -14,3 +12,4 @@ DewfordTown_Layout:: .4byte DewfordTown_MapBlockdata .4byte gTileset_General .4byte gTileset_Dewford + diff --git a/data/layouts/DewfordTown_Gym/layout.inc b/data/layouts/DewfordTown_Gym/layout.inc index 89eb399360..bbada5bdc0 100644 --- a/data/layouts/DewfordTown_Gym/layout.inc +++ b/data/layouts/DewfordTown_Gym/layout.inc @@ -1,8 +1,6 @@ - .align 2 DewfordTown_Gym_MapBorder:: .incbin "data/layouts/DewfordTown_Gym/border.bin" - .align 2 DewfordTown_Gym_MapBlockdata:: .incbin "data/layouts/DewfordTown_Gym/map.bin" @@ -14,3 +12,4 @@ DewfordTown_Gym_Layout:: .4byte DewfordTown_Gym_MapBlockdata .4byte gTileset_Building .4byte gTileset_DewfordGym + diff --git a/data/layouts/DewfordTown_Hall/layout.inc b/data/layouts/DewfordTown_Hall/layout.inc index 59e88cd47b..bd9cd03aec 100644 --- a/data/layouts/DewfordTown_Hall/layout.inc +++ b/data/layouts/DewfordTown_Hall/layout.inc @@ -1,8 +1,6 @@ - .align 2 DewfordTown_Hall_MapBorder:: .incbin "data/layouts/DewfordTown_Hall/border.bin" - .align 2 DewfordTown_Hall_MapBlockdata:: .incbin "data/layouts/DewfordTown_Hall/map.bin" @@ -14,3 +12,4 @@ DewfordTown_Hall_Layout:: .4byte DewfordTown_Hall_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/DoubleBattleColosseum/layout.inc b/data/layouts/DoubleBattleColosseum/layout.inc index 9641fb2bf8..61d112c1e9 100644 --- a/data/layouts/DoubleBattleColosseum/layout.inc +++ b/data/layouts/DoubleBattleColosseum/layout.inc @@ -1,8 +1,6 @@ - .align 2 DoubleBattleColosseum_MapBorder:: .incbin "data/layouts/DoubleBattleColosseum/border.bin" - .align 2 DoubleBattleColosseum_MapBlockdata:: .incbin "data/layouts/DoubleBattleColosseum/map.bin" @@ -14,3 +12,4 @@ DoubleBattleColosseum_Layout:: .4byte DoubleBattleColosseum_MapBlockdata .4byte gTileset_Building .4byte gTileset_CableClub + diff --git a/data/layouts/EverGrandeCity/layout.inc b/data/layouts/EverGrandeCity/layout.inc index e12d3c259a..16c02fbaac 100644 --- a/data/layouts/EverGrandeCity/layout.inc +++ b/data/layouts/EverGrandeCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_MapBorder:: .incbin "data/layouts/EverGrandeCity/border.bin" - .align 2 EverGrandeCity_MapBlockdata:: .incbin "data/layouts/EverGrandeCity/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_Layout:: .4byte EverGrandeCity_MapBlockdata .4byte gTileset_General .4byte gTileset_EverGrande + diff --git a/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc b/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc index c92ee599db..dad4c7ef35 100644 --- a/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc +++ b/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_ChampionsRoom_MapBorder:: .incbin "data/layouts/EverGrandeCity_ChampionsRoom/border.bin" - .align 2 EverGrandeCity_ChampionsRoom_MapBlockdata:: .incbin "data/layouts/EverGrandeCity_ChampionsRoom/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_ChampionsRoom_Layout:: .4byte EverGrandeCity_ChampionsRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_EliteFour + diff --git a/data/layouts/EverGrandeCity_DrakesRoom/layout.inc b/data/layouts/EverGrandeCity_DrakesRoom/layout.inc index 1cd96a760e..9c140d49d3 100644 --- a/data/layouts/EverGrandeCity_DrakesRoom/layout.inc +++ b/data/layouts/EverGrandeCity_DrakesRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_DrakesRoom_MapBorder:: .incbin "data/layouts/EverGrandeCity_DrakesRoom/border.bin" - .align 2 EverGrandeCity_DrakesRoom_MapBlockdata:: .incbin "data/layouts/EverGrandeCity_DrakesRoom/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_DrakesRoom_Layout:: .4byte EverGrandeCity_DrakesRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_EliteFour + diff --git a/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc b/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc index 17031e546e..bcd610d8c8 100644 --- a/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc +++ b/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_GlaciasRoom_MapBorder:: .incbin "data/layouts/EverGrandeCity_GlaciasRoom/border.bin" - .align 2 EverGrandeCity_GlaciasRoom_MapBlockdata:: .incbin "data/layouts/EverGrandeCity_GlaciasRoom/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_GlaciasRoom_Layout:: .4byte EverGrandeCity_GlaciasRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_EliteFour + diff --git a/data/layouts/EverGrandeCity_Hall4/layout.inc b/data/layouts/EverGrandeCity_Hall4/layout.inc index 169d5fda7e..464fc8998f 100644 --- a/data/layouts/EverGrandeCity_Hall4/layout.inc +++ b/data/layouts/EverGrandeCity_Hall4/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_Hall4_MapBorder:: .incbin "data/layouts/EverGrandeCity_Hall4/border.bin" - .align 2 EverGrandeCity_Hall4_MapBlockdata:: .incbin "data/layouts/EverGrandeCity_Hall4/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_Hall4_Layout:: .4byte EverGrandeCity_Hall4_MapBlockdata .4byte gTileset_Building .4byte gTileset_EliteFour + diff --git a/data/layouts/EverGrandeCity_HallOfFame/layout.inc b/data/layouts/EverGrandeCity_HallOfFame/layout.inc index f7442adde4..deaa4429d1 100644 --- a/data/layouts/EverGrandeCity_HallOfFame/layout.inc +++ b/data/layouts/EverGrandeCity_HallOfFame/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_HallOfFame_MapBorder:: .incbin "data/layouts/EverGrandeCity_HallOfFame/border.bin" - .align 2 EverGrandeCity_HallOfFame_MapBlockdata:: .incbin "data/layouts/EverGrandeCity_HallOfFame/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_HallOfFame_Layout:: .4byte EverGrandeCity_HallOfFame_MapBlockdata .4byte gTileset_Building .4byte gTileset_CableClub + diff --git a/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc b/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc index dc2847ed09..b02d5c312c 100644 --- a/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc +++ b/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_PhoebesRoom_MapBorder:: .incbin "data/layouts/EverGrandeCity_PhoebesRoom/border.bin" - .align 2 EverGrandeCity_PhoebesRoom_MapBlockdata:: .incbin "data/layouts/EverGrandeCity_PhoebesRoom/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_PhoebesRoom_Layout:: .4byte EverGrandeCity_PhoebesRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_EliteFour + diff --git a/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc b/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc index da1a3de82d..d84e6449f7 100644 --- a/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc +++ b/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_PokemonLeague_1F_MapBorder:: .incbin "data/layouts/EverGrandeCity_PokemonLeague_1F/border.bin" - .align 2 EverGrandeCity_PokemonLeague_1F_MapBlockdata:: .incbin "data/layouts/EverGrandeCity_PokemonLeague_1F/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_PokemonLeague_1F_Layout:: .4byte EverGrandeCity_PokemonLeague_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_PokemonCenter + diff --git a/data/layouts/EverGrandeCity_ShortHall/layout.inc b/data/layouts/EverGrandeCity_ShortHall/layout.inc index b880ee4394..2159c894d3 100644 --- a/data/layouts/EverGrandeCity_ShortHall/layout.inc +++ b/data/layouts/EverGrandeCity_ShortHall/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_ShortHall_MapBorder:: .incbin "data/layouts/EverGrandeCity_ShortHall/border.bin" - .align 2 EverGrandeCity_ShortHall_MapBlockdata:: .incbin "data/layouts/EverGrandeCity_ShortHall/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_ShortHall_Layout:: .4byte EverGrandeCity_ShortHall_MapBlockdata .4byte gTileset_Building .4byte gTileset_EliteFour + diff --git a/data/layouts/EverGrandeCity_SidneysRoom/layout.inc b/data/layouts/EverGrandeCity_SidneysRoom/layout.inc index f43fdae6b7..86ffa16a15 100644 --- a/data/layouts/EverGrandeCity_SidneysRoom/layout.inc +++ b/data/layouts/EverGrandeCity_SidneysRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_SidneysRoom_MapBorder:: .incbin "data/layouts/EverGrandeCity_SidneysRoom/border.bin" - .align 2 EverGrandeCity_SidneysRoom_MapBlockdata:: .incbin "data/layouts/EverGrandeCity_SidneysRoom/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_SidneysRoom_Layout:: .4byte EverGrandeCity_SidneysRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_EliteFour + diff --git a/data/layouts/FallarborTown/layout.inc b/data/layouts/FallarborTown/layout.inc index f8ba2bf1a0..7f08949032 100644 --- a/data/layouts/FallarborTown/layout.inc +++ b/data/layouts/FallarborTown/layout.inc @@ -1,8 +1,6 @@ - .align 2 FallarborTown_MapBorder:: .incbin "data/layouts/FallarborTown/border.bin" - .align 2 FallarborTown_MapBlockdata:: .incbin "data/layouts/FallarborTown/map.bin" @@ -14,3 +12,4 @@ FallarborTown_Layout:: .4byte FallarborTown_MapBlockdata .4byte gTileset_General .4byte gTileset_Fallarbor + diff --git a/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc b/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc index 70d1a079fe..66acc546b4 100644 --- a/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc +++ b/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc @@ -1,8 +1,6 @@ - .align 2 FallarborTown_LeftoverRSContestHall_MapBorder:: .incbin "data/layouts/FallarborTown_LeftoverRSContestHall/border.bin" - .align 2 FallarborTown_LeftoverRSContestHall_MapBlockdata:: .incbin "data/layouts/FallarborTown_LeftoverRSContestHall/map.bin" @@ -14,3 +12,4 @@ FallarborTown_LeftoverRSContestHall_Layout:: .4byte FallarborTown_LeftoverRSContestHall_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc b/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc index c30723a044..3ad232728e 100644 --- a/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc +++ b/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 FallarborTown_LeftoverRSContestLobby_MapBorder:: .incbin "data/layouts/FallarborTown_LeftoverRSContestLobby/border.bin" - .align 2 FallarborTown_LeftoverRSContestLobby_MapBlockdata:: .incbin "data/layouts/FallarborTown_LeftoverRSContestLobby/map.bin" @@ -14,3 +12,4 @@ FallarborTown_LeftoverRSContestLobby_Layout:: .4byte FallarborTown_LeftoverRSContestLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/FarawayIsland_Entrance/layout.inc b/data/layouts/FarawayIsland_Entrance/layout.inc index 4a1c6c36b6..c7d6bef917 100644 --- a/data/layouts/FarawayIsland_Entrance/layout.inc +++ b/data/layouts/FarawayIsland_Entrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 FarawayIsland_Entrance_MapBorder:: .incbin "data/layouts/FarawayIsland_Entrance/border.bin" - .align 2 FarawayIsland_Entrance_MapBlockdata:: .incbin "data/layouts/FarawayIsland_Entrance/map.bin" @@ -14,3 +12,4 @@ FarawayIsland_Entrance_Layout:: .4byte FarawayIsland_Entrance_MapBlockdata .4byte gTileset_General .4byte gTileset_Rustboro + diff --git a/data/layouts/FarawayIsland_Interior/layout.inc b/data/layouts/FarawayIsland_Interior/layout.inc index bf8cbdbf47..787dd53c9e 100644 --- a/data/layouts/FarawayIsland_Interior/layout.inc +++ b/data/layouts/FarawayIsland_Interior/layout.inc @@ -1,8 +1,6 @@ - .align 2 FarawayIsland_Interior_MapBorder:: .incbin "data/layouts/FarawayIsland_Interior/border.bin" - .align 2 FarawayIsland_Interior_MapBlockdata:: .incbin "data/layouts/FarawayIsland_Interior/map.bin" @@ -14,3 +12,4 @@ FarawayIsland_Interior_Layout:: .4byte FarawayIsland_Interior_MapBlockdata .4byte gTileset_General .4byte gTileset_Fortree + diff --git a/data/layouts/FieryPath/layout.inc b/data/layouts/FieryPath/layout.inc index 7fff04df13..c129ae7150 100644 --- a/data/layouts/FieryPath/layout.inc +++ b/data/layouts/FieryPath/layout.inc @@ -1,8 +1,6 @@ - .align 2 FieryPath_MapBorder:: .incbin "data/layouts/FieryPath/border.bin" - .align 2 FieryPath_MapBlockdata:: .incbin "data/layouts/FieryPath/map.bin" @@ -14,3 +12,4 @@ FieryPath_Layout:: .4byte FieryPath_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/FortreeCity/layout.inc b/data/layouts/FortreeCity/layout.inc index e273287ded..02564b36ad 100644 --- a/data/layouts/FortreeCity/layout.inc +++ b/data/layouts/FortreeCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 FortreeCity_MapBorder:: .incbin "data/layouts/FortreeCity/border.bin" - .align 2 FortreeCity_MapBlockdata:: .incbin "data/layouts/FortreeCity/map.bin" @@ -14,3 +12,4 @@ FortreeCity_Layout:: .4byte FortreeCity_MapBlockdata .4byte gTileset_General .4byte gTileset_Fortree + diff --git a/data/layouts/FortreeCity_DecorationShop/layout.inc b/data/layouts/FortreeCity_DecorationShop/layout.inc index e4727cf759..6460a35b54 100644 --- a/data/layouts/FortreeCity_DecorationShop/layout.inc +++ b/data/layouts/FortreeCity_DecorationShop/layout.inc @@ -1,8 +1,6 @@ - .align 2 FortreeCity_DecorationShop_MapBorder:: .incbin "data/layouts/FortreeCity_DecorationShop/border.bin" - .align 2 FortreeCity_DecorationShop_MapBlockdata:: .incbin "data/layouts/FortreeCity_DecorationShop/map.bin" @@ -14,3 +12,4 @@ FortreeCity_DecorationShop_Layout:: .4byte FortreeCity_DecorationShop_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/FortreeCity_Gym/layout.inc b/data/layouts/FortreeCity_Gym/layout.inc index 81994276b8..da7f1e73e9 100644 --- a/data/layouts/FortreeCity_Gym/layout.inc +++ b/data/layouts/FortreeCity_Gym/layout.inc @@ -1,8 +1,6 @@ - .align 2 FortreeCity_Gym_MapBorder:: .incbin "data/layouts/FortreeCity_Gym/border.bin" - .align 2 FortreeCity_Gym_MapBlockdata:: .incbin "data/layouts/FortreeCity_Gym/map.bin" @@ -14,3 +12,4 @@ FortreeCity_Gym_Layout:: .4byte FortreeCity_Gym_MapBlockdata .4byte gTileset_Building .4byte gTileset_FortreeGym + diff --git a/data/layouts/FortreeCity_House1/layout.inc b/data/layouts/FortreeCity_House1/layout.inc index dd9962fdeb..214846c228 100644 --- a/data/layouts/FortreeCity_House1/layout.inc +++ b/data/layouts/FortreeCity_House1/layout.inc @@ -1,8 +1,6 @@ - .align 2 FortreeCity_House1_MapBorder:: .incbin "data/layouts/FortreeCity_House1/border.bin" - .align 2 FortreeCity_House1_MapBlockdata:: .incbin "data/layouts/FortreeCity_House1/map.bin" @@ -14,3 +12,4 @@ FortreeCity_House1_Layout:: .4byte FortreeCity_House1_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/FortreeCity_House2/layout.inc b/data/layouts/FortreeCity_House2/layout.inc index 5ab659b9a5..3aa0898bfe 100644 --- a/data/layouts/FortreeCity_House2/layout.inc +++ b/data/layouts/FortreeCity_House2/layout.inc @@ -1,8 +1,6 @@ - .align 2 FortreeCity_House2_MapBorder:: .incbin "data/layouts/FortreeCity_House2/border.bin" - .align 2 FortreeCity_House2_MapBlockdata:: .incbin "data/layouts/FortreeCity_House2/map.bin" @@ -14,3 +12,4 @@ FortreeCity_House2_Layout:: .4byte FortreeCity_House2_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/GraniteCave_1F/layout.inc b/data/layouts/GraniteCave_1F/layout.inc index 641310f758..009fd12f5c 100644 --- a/data/layouts/GraniteCave_1F/layout.inc +++ b/data/layouts/GraniteCave_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 GraniteCave_1F_MapBorder:: .incbin "data/layouts/GraniteCave_1F/border.bin" - .align 2 GraniteCave_1F_MapBlockdata:: .incbin "data/layouts/GraniteCave_1F/map.bin" @@ -14,3 +12,4 @@ GraniteCave_1F_Layout:: .4byte GraniteCave_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/GraniteCave_B1F/layout.inc b/data/layouts/GraniteCave_B1F/layout.inc index dcdafcd4e2..a57b238be1 100644 --- a/data/layouts/GraniteCave_B1F/layout.inc +++ b/data/layouts/GraniteCave_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 GraniteCave_B1F_MapBorder:: .incbin "data/layouts/GraniteCave_B1F/border.bin" - .align 2 GraniteCave_B1F_MapBlockdata:: .incbin "data/layouts/GraniteCave_B1F/map.bin" @@ -14,3 +12,4 @@ GraniteCave_B1F_Layout:: .4byte GraniteCave_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/GraniteCave_B2F/layout.inc b/data/layouts/GraniteCave_B2F/layout.inc index 90d63c5bb4..7ffd04b001 100644 --- a/data/layouts/GraniteCave_B2F/layout.inc +++ b/data/layouts/GraniteCave_B2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 GraniteCave_B2F_MapBorder:: .incbin "data/layouts/GraniteCave_B2F/border.bin" - .align 2 GraniteCave_B2F_MapBlockdata:: .incbin "data/layouts/GraniteCave_B2F/map.bin" @@ -14,3 +12,4 @@ GraniteCave_B2F_Layout:: .4byte GraniteCave_B2F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/GraniteCave_StevensRoom/layout.inc b/data/layouts/GraniteCave_StevensRoom/layout.inc index ea61473432..5ee4fade44 100644 --- a/data/layouts/GraniteCave_StevensRoom/layout.inc +++ b/data/layouts/GraniteCave_StevensRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 GraniteCave_StevensRoom_MapBorder:: .incbin "data/layouts/GraniteCave_StevensRoom/border.bin" - .align 2 GraniteCave_StevensRoom_MapBlockdata:: .incbin "data/layouts/GraniteCave_StevensRoom/map.bin" @@ -14,3 +12,4 @@ GraniteCave_StevensRoom_Layout:: .4byte GraniteCave_StevensRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/Harbor/layout.inc b/data/layouts/Harbor/layout.inc index ab5f0e0325..e95b8ec9d7 100644 --- a/data/layouts/Harbor/layout.inc +++ b/data/layouts/Harbor/layout.inc @@ -1,8 +1,6 @@ - .align 2 Harbor_MapBorder:: .incbin "data/layouts/Harbor/border.bin" - .align 2 Harbor_MapBlockdata:: .incbin "data/layouts/Harbor/map.bin" @@ -14,3 +12,4 @@ Harbor_Layout:: .4byte Harbor_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/House1/layout.inc b/data/layouts/House1/layout.inc index 0d1c9a6991..b93f24df4f 100644 --- a/data/layouts/House1/layout.inc +++ b/data/layouts/House1/layout.inc @@ -1,8 +1,6 @@ - .align 2 House1_MapBorder:: .incbin "data/layouts/House1/border.bin" - .align 2 House1_MapBlockdata:: .incbin "data/layouts/House1/map.bin" @@ -14,3 +12,4 @@ House1_Layout:: .4byte House1_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/House2/layout.inc b/data/layouts/House2/layout.inc index 357e6022ff..35566d8d12 100644 --- a/data/layouts/House2/layout.inc +++ b/data/layouts/House2/layout.inc @@ -1,8 +1,6 @@ - .align 2 House2_MapBorder:: .incbin "data/layouts/House2/border.bin" - .align 2 House2_MapBlockdata:: .incbin "data/layouts/House2/map.bin" @@ -14,3 +12,4 @@ House2_Layout:: .4byte House2_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/House3/layout.inc b/data/layouts/House3/layout.inc index 2fe4bee46c..6e2de11f48 100644 --- a/data/layouts/House3/layout.inc +++ b/data/layouts/House3/layout.inc @@ -1,8 +1,6 @@ - .align 2 House3_MapBorder:: .incbin "data/layouts/House3/border.bin" - .align 2 House3_MapBlockdata:: .incbin "data/layouts/House3/map.bin" @@ -14,3 +12,4 @@ House3_Layout:: .4byte House3_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/House4/layout.inc b/data/layouts/House4/layout.inc index caeca73a89..b06b3d4273 100644 --- a/data/layouts/House4/layout.inc +++ b/data/layouts/House4/layout.inc @@ -1,8 +1,6 @@ - .align 2 House4_MapBorder:: .incbin "data/layouts/House4/border.bin" - .align 2 House4_MapBlockdata:: .incbin "data/layouts/House4/map.bin" @@ -14,3 +12,4 @@ House4_Layout:: .4byte House4_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/HouseWithBed/layout.inc b/data/layouts/HouseWithBed/layout.inc index bdb047feba..7fb8d2c9bd 100644 --- a/data/layouts/HouseWithBed/layout.inc +++ b/data/layouts/HouseWithBed/layout.inc @@ -1,8 +1,6 @@ - .align 2 HouseWithBed_MapBorder:: .incbin "data/layouts/HouseWithBed/border.bin" - .align 2 HouseWithBed_MapBlockdata:: .incbin "data/layouts/HouseWithBed/map.bin" @@ -14,3 +12,4 @@ HouseWithBed_Layout:: .4byte HouseWithBed_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/InsideOfTruck/layout.inc b/data/layouts/InsideOfTruck/layout.inc index dc93f12a8e..d1ddf86865 100644 --- a/data/layouts/InsideOfTruck/layout.inc +++ b/data/layouts/InsideOfTruck/layout.inc @@ -1,8 +1,6 @@ - .align 2 InsideOfTruck_MapBorder:: .incbin "data/layouts/InsideOfTruck/border.bin" - .align 2 InsideOfTruck_MapBlockdata:: .incbin "data/layouts/InsideOfTruck/map.bin" @@ -14,3 +12,4 @@ InsideOfTruck_Layout:: .4byte InsideOfTruck_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideOfTruck + diff --git a/data/layouts/IslandCave/layout.inc b/data/layouts/IslandCave/layout.inc index 25d870e682..5a3035b721 100644 --- a/data/layouts/IslandCave/layout.inc +++ b/data/layouts/IslandCave/layout.inc @@ -1,8 +1,6 @@ - .align 2 IslandCave_MapBorder:: .incbin "data/layouts/IslandCave/border.bin" - .align 2 IslandCave_MapBlockdata:: .incbin "data/layouts/IslandCave/map.bin" @@ -14,3 +12,4 @@ IslandCave_Layout:: .4byte IslandCave_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/IslandHarbor/layout.inc b/data/layouts/IslandHarbor/layout.inc index 7a1c432848..7fc86dca44 100644 --- a/data/layouts/IslandHarbor/layout.inc +++ b/data/layouts/IslandHarbor/layout.inc @@ -1,8 +1,6 @@ - .align 2 IslandHarbor_MapBorder:: .incbin "data/layouts/IslandHarbor/border.bin" - .align 2 IslandHarbor_MapBlockdata:: .incbin "data/layouts/IslandHarbor/map.bin" @@ -14,3 +12,4 @@ IslandHarbor_Layout:: .4byte IslandHarbor_MapBlockdata .4byte gTileset_General .4byte gTileset_IslandHarbor + diff --git a/data/layouts/JaggedPass/layout.inc b/data/layouts/JaggedPass/layout.inc index 6aefbf6059..5620551b8a 100644 --- a/data/layouts/JaggedPass/layout.inc +++ b/data/layouts/JaggedPass/layout.inc @@ -1,8 +1,6 @@ - .align 2 JaggedPass_MapBorder:: .incbin "data/layouts/JaggedPass/border.bin" - .align 2 JaggedPass_MapBlockdata:: .incbin "data/layouts/JaggedPass/map.bin" @@ -14,3 +12,4 @@ JaggedPass_Layout:: .4byte JaggedPass_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/LavaridgeTown/layout.inc b/data/layouts/LavaridgeTown/layout.inc index 48d0bbe58b..6629554306 100644 --- a/data/layouts/LavaridgeTown/layout.inc +++ b/data/layouts/LavaridgeTown/layout.inc @@ -1,8 +1,6 @@ - .align 2 LavaridgeTown_MapBorder:: .incbin "data/layouts/LavaridgeTown/border.bin" - .align 2 LavaridgeTown_MapBlockdata:: .incbin "data/layouts/LavaridgeTown/map.bin" @@ -14,3 +12,4 @@ LavaridgeTown_Layout:: .4byte LavaridgeTown_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/LavaridgeTown_Gym_1F/layout.inc b/data/layouts/LavaridgeTown_Gym_1F/layout.inc index e881e9d58d..36f4cb826a 100644 --- a/data/layouts/LavaridgeTown_Gym_1F/layout.inc +++ b/data/layouts/LavaridgeTown_Gym_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LavaridgeTown_Gym_1F_MapBorder:: .incbin "data/layouts/LavaridgeTown_Gym_1F/border.bin" - .align 2 LavaridgeTown_Gym_1F_MapBlockdata:: .incbin "data/layouts/LavaridgeTown_Gym_1F/map.bin" @@ -14,3 +12,4 @@ LavaridgeTown_Gym_1F_Layout:: .4byte LavaridgeTown_Gym_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_LavaridgeGym + diff --git a/data/layouts/LavaridgeTown_Gym_B1F/layout.inc b/data/layouts/LavaridgeTown_Gym_B1F/layout.inc index 1fa258cbaf..9b80d7f90f 100644 --- a/data/layouts/LavaridgeTown_Gym_B1F/layout.inc +++ b/data/layouts/LavaridgeTown_Gym_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LavaridgeTown_Gym_B1F_MapBorder:: .incbin "data/layouts/LavaridgeTown_Gym_B1F/border.bin" - .align 2 LavaridgeTown_Gym_B1F_MapBlockdata:: .incbin "data/layouts/LavaridgeTown_Gym_B1F/map.bin" @@ -14,3 +12,4 @@ LavaridgeTown_Gym_B1F_Layout:: .4byte LavaridgeTown_Gym_B1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_LavaridgeGym + diff --git a/data/layouts/LavaridgeTown_HerbShop/layout.inc b/data/layouts/LavaridgeTown_HerbShop/layout.inc index bf107dca9a..c59e12e49c 100644 --- a/data/layouts/LavaridgeTown_HerbShop/layout.inc +++ b/data/layouts/LavaridgeTown_HerbShop/layout.inc @@ -1,8 +1,6 @@ - .align 2 LavaridgeTown_HerbShop_MapBorder:: .incbin "data/layouts/LavaridgeTown_HerbShop/border.bin" - .align 2 LavaridgeTown_HerbShop_MapBlockdata:: .incbin "data/layouts/LavaridgeTown_HerbShop/map.bin" @@ -14,3 +12,4 @@ LavaridgeTown_HerbShop_Layout:: .4byte LavaridgeTown_HerbShop_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc b/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc index e0ba92bbfc..e38d63815f 100644 --- a/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc +++ b/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LavaridgeTown_PokemonCenter_1F_MapBorder:: .incbin "data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin" - .align 2 LavaridgeTown_PokemonCenter_1F_MapBlockdata:: .incbin "data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin" @@ -14,3 +12,4 @@ LavaridgeTown_PokemonCenter_1F_Layout:: .4byte LavaridgeTown_PokemonCenter_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_PokemonCenter + diff --git a/data/layouts/LilycoveCity/layout.inc b/data/layouts/LilycoveCity/layout.inc index fedb7a91ed..ed4bd81e4a 100644 --- a/data/layouts/LilycoveCity/layout.inc +++ b/data/layouts/LilycoveCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_MapBorder:: .incbin "data/layouts/LilycoveCity/border.bin" - .align 2 LilycoveCity_MapBlockdata:: .incbin "data/layouts/LilycoveCity/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_Layout:: .4byte LilycoveCity_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/LilycoveCity_ContestHall/layout.inc b/data/layouts/LilycoveCity_ContestHall/layout.inc index e0ce089f76..61e6e27ee5 100644 --- a/data/layouts/LilycoveCity_ContestHall/layout.inc +++ b/data/layouts/LilycoveCity_ContestHall/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_ContestHall_MapBorder:: .incbin "data/layouts/LilycoveCity_ContestHall/border.bin" - .align 2 LilycoveCity_ContestHall_MapBlockdata:: .incbin "data/layouts/LilycoveCity_ContestHall/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_ContestHall_Layout:: .4byte LilycoveCity_ContestHall_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/LilycoveCity_ContestLobby/layout.inc b/data/layouts/LilycoveCity_ContestLobby/layout.inc index 8ca1d160f1..20cf4389fb 100644 --- a/data/layouts/LilycoveCity_ContestLobby/layout.inc +++ b/data/layouts/LilycoveCity_ContestLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_ContestLobby_MapBorder:: .incbin "data/layouts/LilycoveCity_ContestLobby/border.bin" - .align 2 LilycoveCity_ContestLobby_MapBlockdata:: .incbin "data/layouts/LilycoveCity_ContestLobby/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_ContestLobby_Layout:: .4byte LilycoveCity_ContestLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc b/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc index 3c6c30cdc7..b275834f7e 100644 --- a/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc +++ b/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_CoveLilyMotel_1F_MapBorder:: .incbin "data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin" - .align 2 LilycoveCity_CoveLilyMotel_1F_MapBlockdata:: .incbin "data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_CoveLilyMotel_1F_Layout:: .4byte LilycoveCity_CoveLilyMotel_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc b/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc index c65508e1a1..82a294c48f 100644 --- a/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc +++ b/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_CoveLilyMotel_2F_MapBorder:: .incbin "data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin" - .align 2 LilycoveCity_CoveLilyMotel_2F_MapBlockdata:: .incbin "data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_CoveLilyMotel_2F_Layout:: .4byte LilycoveCity_CoveLilyMotel_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc b/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc index 53d452438b..899e934bdb 100644 --- a/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc +++ b/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_DepartmentStoreElevator_MapBorder:: .incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin" - .align 2 LilycoveCity_DepartmentStoreElevator_MapBlockdata:: .incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_DepartmentStoreElevator_Layout:: .4byte LilycoveCity_DepartmentStoreElevator_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc b/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc index 61a5db9c23..d404833086 100644 --- a/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc +++ b/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_DepartmentStoreRooftop_MapBorder:: .incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin" - .align 2 LilycoveCity_DepartmentStoreRooftop_MapBlockdata:: .incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_DepartmentStoreRooftop_Layout:: .4byte LilycoveCity_DepartmentStoreRooftop_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc index 441cfc4741..d3b5d94207 100644 --- a/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc +++ b/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_DepartmentStore_1F_MapBorder:: .incbin "data/layouts/LilycoveCity_DepartmentStore_1F/border.bin" - .align 2 LilycoveCity_DepartmentStore_1F_MapBlockdata:: .incbin "data/layouts/LilycoveCity_DepartmentStore_1F/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_DepartmentStore_1F_Layout:: .4byte LilycoveCity_DepartmentStore_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc index 54ede95cd9..e5b01c8fd7 100644 --- a/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc +++ b/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_DepartmentStore_2F_MapBorder:: .incbin "data/layouts/LilycoveCity_DepartmentStore_2F/border.bin" - .align 2 LilycoveCity_DepartmentStore_2F_MapBlockdata:: .incbin "data/layouts/LilycoveCity_DepartmentStore_2F/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_DepartmentStore_2F_Layout:: .4byte LilycoveCity_DepartmentStore_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc index a163424253..5d7aa93ebe 100644 --- a/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc +++ b/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_DepartmentStore_3F_MapBorder:: .incbin "data/layouts/LilycoveCity_DepartmentStore_3F/border.bin" - .align 2 LilycoveCity_DepartmentStore_3F_MapBlockdata:: .incbin "data/layouts/LilycoveCity_DepartmentStore_3F/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_DepartmentStore_3F_Layout:: .4byte LilycoveCity_DepartmentStore_3F_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc index 26806016a2..b4585ca031 100644 --- a/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc +++ b/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_DepartmentStore_4F_MapBorder:: .incbin "data/layouts/LilycoveCity_DepartmentStore_4F/border.bin" - .align 2 LilycoveCity_DepartmentStore_4F_MapBlockdata:: .incbin "data/layouts/LilycoveCity_DepartmentStore_4F/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_DepartmentStore_4F_Layout:: .4byte LilycoveCity_DepartmentStore_4F_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc index 6b5a98fe4e..ade5e4bf51 100644 --- a/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc +++ b/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_DepartmentStore_5F_MapBorder:: .incbin "data/layouts/LilycoveCity_DepartmentStore_5F/border.bin" - .align 2 LilycoveCity_DepartmentStore_5F_MapBlockdata:: .incbin "data/layouts/LilycoveCity_DepartmentStore_5F/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_DepartmentStore_5F_Layout:: .4byte LilycoveCity_DepartmentStore_5F_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/LilycoveCity_House2/layout.inc b/data/layouts/LilycoveCity_House2/layout.inc index a7926872fc..de51e7fd61 100644 --- a/data/layouts/LilycoveCity_House2/layout.inc +++ b/data/layouts/LilycoveCity_House2/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_House2_MapBorder:: .incbin "data/layouts/LilycoveCity_House2/border.bin" - .align 2 LilycoveCity_House2_MapBlockdata:: .incbin "data/layouts/LilycoveCity_House2/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_House2_Layout:: .4byte LilycoveCity_House2_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc b/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc index 3a0215859e..0dab4095ce 100644 --- a/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc +++ b/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_LilycoveMuseum_1F_MapBorder:: .incbin "data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin" - .align 2 LilycoveCity_LilycoveMuseum_1F_MapBlockdata:: .incbin "data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_LilycoveMuseum_1F_Layout:: .4byte LilycoveCity_LilycoveMuseum_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_LilycoveMuseum + diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc b/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc index 0cc19b0394..aea4464109 100644 --- a/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc +++ b/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_LilycoveMuseum_2F_MapBorder:: .incbin "data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin" - .align 2 LilycoveCity_LilycoveMuseum_2F_MapBlockdata:: .incbin "data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_LilycoveMuseum_2F_Layout:: .4byte LilycoveCity_LilycoveMuseum_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_LilycoveMuseum + diff --git a/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc b/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc index 3a3a624bd5..9b30c7c08e 100644 --- a/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc +++ b/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_PokemonTrainerFanClub_MapBorder:: .incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin" - .align 2 LilycoveCity_PokemonTrainerFanClub_MapBlockdata:: .incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_PokemonTrainerFanClub_Layout:: .4byte LilycoveCity_PokemonTrainerFanClub_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/LinkContestRoom1/layout.inc b/data/layouts/LinkContestRoom1/layout.inc index 38af498294..e71fe2df32 100644 --- a/data/layouts/LinkContestRoom1/layout.inc +++ b/data/layouts/LinkContestRoom1/layout.inc @@ -1,8 +1,6 @@ - .align 2 LinkContestRoom1_MapBorder:: .incbin "data/layouts/LinkContestRoom1/border.bin" - .align 2 LinkContestRoom1_MapBlockdata:: .incbin "data/layouts/LinkContestRoom1/map.bin" @@ -14,3 +12,4 @@ LinkContestRoom1_Layout:: .4byte LinkContestRoom1_MapBlockdata .4byte gTileset_General .4byte gTileset_Contest + diff --git a/data/layouts/LinkContestRoom2/layout.inc b/data/layouts/LinkContestRoom2/layout.inc index d09439edde..2dd66ab962 100644 --- a/data/layouts/LinkContestRoom2/layout.inc +++ b/data/layouts/LinkContestRoom2/layout.inc @@ -1,8 +1,6 @@ - .align 2 LinkContestRoom2_MapBorder:: .incbin "data/layouts/LinkContestRoom2/border.bin" - .align 2 LinkContestRoom2_MapBlockdata:: .incbin "data/layouts/LinkContestRoom2/map.bin" @@ -14,3 +12,4 @@ LinkContestRoom2_Layout:: .4byte LinkContestRoom2_MapBlockdata .4byte gTileset_General .4byte gTileset_Contest + diff --git a/data/layouts/LinkContestRoom3/layout.inc b/data/layouts/LinkContestRoom3/layout.inc index c969be1ace..c53cad7230 100644 --- a/data/layouts/LinkContestRoom3/layout.inc +++ b/data/layouts/LinkContestRoom3/layout.inc @@ -1,8 +1,6 @@ - .align 2 LinkContestRoom3_MapBorder:: .incbin "data/layouts/LinkContestRoom3/border.bin" - .align 2 LinkContestRoom3_MapBlockdata:: .incbin "data/layouts/LinkContestRoom3/map.bin" @@ -14,3 +12,4 @@ LinkContestRoom3_Layout:: .4byte LinkContestRoom3_MapBlockdata .4byte gTileset_General .4byte gTileset_Contest + diff --git a/data/layouts/LinkContestRoom4/layout.inc b/data/layouts/LinkContestRoom4/layout.inc index 61b03a2ce5..883918f377 100644 --- a/data/layouts/LinkContestRoom4/layout.inc +++ b/data/layouts/LinkContestRoom4/layout.inc @@ -1,8 +1,6 @@ - .align 2 LinkContestRoom4_MapBorder:: .incbin "data/layouts/LinkContestRoom4/border.bin" - .align 2 LinkContestRoom4_MapBlockdata:: .incbin "data/layouts/LinkContestRoom4/map.bin" @@ -14,3 +12,4 @@ LinkContestRoom4_Layout:: .4byte LinkContestRoom4_MapBlockdata .4byte gTileset_General .4byte gTileset_Contest + diff --git a/data/layouts/LinkContestRoom5/layout.inc b/data/layouts/LinkContestRoom5/layout.inc index 38f1e42cdf..72a9d9f4ed 100644 --- a/data/layouts/LinkContestRoom5/layout.inc +++ b/data/layouts/LinkContestRoom5/layout.inc @@ -1,8 +1,6 @@ - .align 2 LinkContestRoom5_MapBorder:: .incbin "data/layouts/LinkContestRoom5/border.bin" - .align 2 LinkContestRoom5_MapBlockdata:: .incbin "data/layouts/LinkContestRoom5/map.bin" @@ -14,3 +12,4 @@ LinkContestRoom5_Layout:: .4byte LinkContestRoom5_MapBlockdata .4byte gTileset_General .4byte gTileset_Contest + diff --git a/data/layouts/LinkContestRoom6/layout.inc b/data/layouts/LinkContestRoom6/layout.inc index 39349840a1..33db4b56dc 100644 --- a/data/layouts/LinkContestRoom6/layout.inc +++ b/data/layouts/LinkContestRoom6/layout.inc @@ -1,8 +1,6 @@ - .align 2 LinkContestRoom6_MapBorder:: .incbin "data/layouts/LinkContestRoom6/border.bin" - .align 2 LinkContestRoom6_MapBlockdata:: .incbin "data/layouts/LinkContestRoom6/map.bin" @@ -14,3 +12,4 @@ LinkContestRoom6_Layout:: .4byte LinkContestRoom6_MapBlockdata .4byte gTileset_General .4byte gTileset_Contest + diff --git a/data/layouts/LittlerootTown/layout.inc b/data/layouts/LittlerootTown/layout.inc index 5f8254576d..8193ac6956 100644 --- a/data/layouts/LittlerootTown/layout.inc +++ b/data/layouts/LittlerootTown/layout.inc @@ -1,8 +1,6 @@ - .align 2 LittlerootTown_MapBorder:: .incbin "data/layouts/LittlerootTown/border.bin" - .align 2 LittlerootTown_MapBlockdata:: .incbin "data/layouts/LittlerootTown/map.bin" @@ -14,3 +12,4 @@ LittlerootTown_Layout:: .4byte LittlerootTown_MapBlockdata .4byte gTileset_General .4byte gTileset_Petalburg + diff --git a/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc b/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc index 0ccddcca8f..092c7d20b3 100644 --- a/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc +++ b/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LittlerootTown_BrendansHouse_1F_MapBorder:: .incbin "data/layouts/LittlerootTown_BrendansHouse_1F/border.bin" - .align 2 LittlerootTown_BrendansHouse_1F_MapBlockdata:: .incbin "data/layouts/LittlerootTown_BrendansHouse_1F/map.bin" @@ -14,3 +12,4 @@ LittlerootTown_BrendansHouse_1F_Layout:: .4byte LittlerootTown_BrendansHouse_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_BrendansMaysHouse + diff --git a/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc b/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc index f626ecfb0a..5235f4d986 100644 --- a/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc +++ b/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LittlerootTown_BrendansHouse_2F_MapBorder:: .incbin "data/layouts/LittlerootTown_BrendansHouse_2F/border.bin" - .align 2 LittlerootTown_BrendansHouse_2F_MapBlockdata:: .incbin "data/layouts/LittlerootTown_BrendansHouse_2F/map.bin" @@ -14,3 +12,4 @@ LittlerootTown_BrendansHouse_2F_Layout:: .4byte LittlerootTown_BrendansHouse_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_BrendansMaysHouse + diff --git a/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc b/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc index 42d1365c33..88b81a289a 100644 --- a/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc +++ b/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LittlerootTown_MaysHouse_1F_MapBorder:: .incbin "data/layouts/LittlerootTown_MaysHouse_1F/border.bin" - .align 2 LittlerootTown_MaysHouse_1F_MapBlockdata:: .incbin "data/layouts/LittlerootTown_MaysHouse_1F/map.bin" @@ -14,3 +12,4 @@ LittlerootTown_MaysHouse_1F_Layout:: .4byte LittlerootTown_MaysHouse_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_BrendansMaysHouse + diff --git a/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc b/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc index c0770b8f66..0b6134dbd9 100644 --- a/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc +++ b/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LittlerootTown_MaysHouse_2F_MapBorder:: .incbin "data/layouts/LittlerootTown_MaysHouse_2F/border.bin" - .align 2 LittlerootTown_MaysHouse_2F_MapBlockdata:: .incbin "data/layouts/LittlerootTown_MaysHouse_2F/map.bin" @@ -14,3 +12,4 @@ LittlerootTown_MaysHouse_2F_Layout:: .4byte LittlerootTown_MaysHouse_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_BrendansMaysHouse + diff --git a/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc b/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc index 77d07033f9..d0be539a0f 100644 --- a/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc +++ b/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc @@ -1,8 +1,6 @@ - .align 2 LittlerootTown_ProfessorBirchsLab_MapBorder:: .incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin" - .align 2 LittlerootTown_ProfessorBirchsLab_MapBlockdata:: .incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin" @@ -14,3 +12,4 @@ LittlerootTown_ProfessorBirchsLab_Layout:: .4byte LittlerootTown_ProfessorBirchsLab_MapBlockdata .4byte gTileset_Building .4byte gTileset_Lab + diff --git a/data/layouts/MagmaHideout_1F/layout.inc b/data/layouts/MagmaHideout_1F/layout.inc index 2721bb6ff9..b50c7f015f 100644 --- a/data/layouts/MagmaHideout_1F/layout.inc +++ b/data/layouts/MagmaHideout_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MagmaHideout_1F_MapBorder:: .incbin "data/layouts/MagmaHideout_1F/border.bin" - .align 2 MagmaHideout_1F_MapBlockdata:: .incbin "data/layouts/MagmaHideout_1F/map.bin" @@ -14,3 +12,4 @@ MagmaHideout_1F_Layout:: .4byte MagmaHideout_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/MagmaHideout_2F_1R/layout.inc b/data/layouts/MagmaHideout_2F_1R/layout.inc index 9d16b20b09..b9f0d27d7e 100644 --- a/data/layouts/MagmaHideout_2F_1R/layout.inc +++ b/data/layouts/MagmaHideout_2F_1R/layout.inc @@ -1,8 +1,6 @@ - .align 2 MagmaHideout_2F_1R_MapBorder:: .incbin "data/layouts/MagmaHideout_2F_1R/border.bin" - .align 2 MagmaHideout_2F_1R_MapBlockdata:: .incbin "data/layouts/MagmaHideout_2F_1R/map.bin" @@ -14,3 +12,4 @@ MagmaHideout_2F_1R_Layout:: .4byte MagmaHideout_2F_1R_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/MagmaHideout_2F_2R/layout.inc b/data/layouts/MagmaHideout_2F_2R/layout.inc index 47a492f525..01507909c1 100644 --- a/data/layouts/MagmaHideout_2F_2R/layout.inc +++ b/data/layouts/MagmaHideout_2F_2R/layout.inc @@ -1,8 +1,6 @@ - .align 2 MagmaHideout_2F_2R_MapBorder:: .incbin "data/layouts/MagmaHideout_2F_2R/border.bin" - .align 2 MagmaHideout_2F_2R_MapBlockdata:: .incbin "data/layouts/MagmaHideout_2F_2R/map.bin" @@ -14,3 +12,4 @@ MagmaHideout_2F_2R_Layout:: .4byte MagmaHideout_2F_2R_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/MagmaHideout_2F_3R/layout.inc b/data/layouts/MagmaHideout_2F_3R/layout.inc index cf13105878..d88fb50fd0 100644 --- a/data/layouts/MagmaHideout_2F_3R/layout.inc +++ b/data/layouts/MagmaHideout_2F_3R/layout.inc @@ -1,8 +1,6 @@ - .align 2 MagmaHideout_2F_3R_MapBorder:: .incbin "data/layouts/MagmaHideout_2F_3R/border.bin" - .align 2 MagmaHideout_2F_3R_MapBlockdata:: .incbin "data/layouts/MagmaHideout_2F_3R/map.bin" @@ -14,3 +12,4 @@ MagmaHideout_2F_3R_Layout:: .4byte MagmaHideout_2F_3R_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/MagmaHideout_3F_1R/layout.inc b/data/layouts/MagmaHideout_3F_1R/layout.inc index 6e72159144..c2199b2f2e 100644 --- a/data/layouts/MagmaHideout_3F_1R/layout.inc +++ b/data/layouts/MagmaHideout_3F_1R/layout.inc @@ -1,8 +1,6 @@ - .align 2 MagmaHideout_3F_1R_MapBorder:: .incbin "data/layouts/MagmaHideout_3F_1R/border.bin" - .align 2 MagmaHideout_3F_1R_MapBlockdata:: .incbin "data/layouts/MagmaHideout_3F_1R/map.bin" @@ -14,3 +12,4 @@ MagmaHideout_3F_1R_Layout:: .4byte MagmaHideout_3F_1R_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/MagmaHideout_3F_2R/layout.inc b/data/layouts/MagmaHideout_3F_2R/layout.inc index 6f108d1989..2c4662a49d 100644 --- a/data/layouts/MagmaHideout_3F_2R/layout.inc +++ b/data/layouts/MagmaHideout_3F_2R/layout.inc @@ -1,8 +1,6 @@ - .align 2 MagmaHideout_3F_2R_MapBorder:: .incbin "data/layouts/MagmaHideout_3F_2R/border.bin" - .align 2 MagmaHideout_3F_2R_MapBlockdata:: .incbin "data/layouts/MagmaHideout_3F_2R/map.bin" @@ -14,3 +12,4 @@ MagmaHideout_3F_2R_Layout:: .4byte MagmaHideout_3F_2R_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/MagmaHideout_3F_3R/layout.inc b/data/layouts/MagmaHideout_3F_3R/layout.inc index 6508e73bf9..4042b9653b 100644 --- a/data/layouts/MagmaHideout_3F_3R/layout.inc +++ b/data/layouts/MagmaHideout_3F_3R/layout.inc @@ -1,8 +1,6 @@ - .align 2 MagmaHideout_3F_3R_MapBorder:: .incbin "data/layouts/MagmaHideout_3F_3R/border.bin" - .align 2 MagmaHideout_3F_3R_MapBlockdata:: .incbin "data/layouts/MagmaHideout_3F_3R/map.bin" @@ -14,3 +12,4 @@ MagmaHideout_3F_3R_Layout:: .4byte MagmaHideout_3F_3R_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/MagmaHideout_4F/layout.inc b/data/layouts/MagmaHideout_4F/layout.inc index 32db601011..d7f8c547ca 100644 --- a/data/layouts/MagmaHideout_4F/layout.inc +++ b/data/layouts/MagmaHideout_4F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MagmaHideout_4F_MapBorder:: .incbin "data/layouts/MagmaHideout_4F/border.bin" - .align 2 MagmaHideout_4F_MapBlockdata:: .incbin "data/layouts/MagmaHideout_4F/map.bin" @@ -14,3 +12,4 @@ MagmaHideout_4F_Layout:: .4byte MagmaHideout_4F_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/MarineCave_End/layout.inc b/data/layouts/MarineCave_End/layout.inc index f69952dced..256338b897 100644 --- a/data/layouts/MarineCave_End/layout.inc +++ b/data/layouts/MarineCave_End/layout.inc @@ -1,8 +1,6 @@ - .align 2 MarineCave_End_MapBorder:: .incbin "data/layouts/MarineCave_End/border.bin" - .align 2 MarineCave_End_MapBlockdata:: .incbin "data/layouts/MarineCave_End/map.bin" @@ -14,3 +12,4 @@ MarineCave_End_Layout:: .4byte MarineCave_End_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/MarineCave_Entrance/layout.inc b/data/layouts/MarineCave_Entrance/layout.inc index b6c9248c6a..219c182d79 100644 --- a/data/layouts/MarineCave_Entrance/layout.inc +++ b/data/layouts/MarineCave_Entrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 MarineCave_Entrance_MapBorder:: .incbin "data/layouts/MarineCave_Entrance/border.bin" - .align 2 MarineCave_Entrance_MapBlockdata:: .incbin "data/layouts/MarineCave_Entrance/map.bin" @@ -14,3 +12,4 @@ MarineCave_Entrance_Layout:: .4byte MarineCave_Entrance_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/Mart/layout.inc b/data/layouts/Mart/layout.inc index 33c2320598..5233e09ab0 100644 --- a/data/layouts/Mart/layout.inc +++ b/data/layouts/Mart/layout.inc @@ -1,8 +1,6 @@ - .align 2 Mart_MapBorder:: .incbin "data/layouts/Mart/border.bin" - .align 2 Mart_MapBlockdata:: .incbin "data/layouts/Mart/map.bin" @@ -14,3 +12,4 @@ Mart_Layout:: .4byte Mart_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/MauvilleCity/layout.inc b/data/layouts/MauvilleCity/layout.inc index ba7785c3ee..7a8c17da2e 100644 --- a/data/layouts/MauvilleCity/layout.inc +++ b/data/layouts/MauvilleCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 MauvilleCity_MapBorder:: .incbin "data/layouts/MauvilleCity/border.bin" - .align 2 MauvilleCity_MapBlockdata:: .incbin "data/layouts/MauvilleCity/map.bin" @@ -14,3 +12,4 @@ MauvilleCity_Layout:: .4byte MauvilleCity_MapBlockdata .4byte gTileset_General .4byte gTileset_Mauville + diff --git a/data/layouts/MauvilleCity_BikeShop/layout.inc b/data/layouts/MauvilleCity_BikeShop/layout.inc index 4814becf80..f0d358a354 100644 --- a/data/layouts/MauvilleCity_BikeShop/layout.inc +++ b/data/layouts/MauvilleCity_BikeShop/layout.inc @@ -1,8 +1,6 @@ - .align 2 MauvilleCity_BikeShop_MapBorder:: .incbin "data/layouts/MauvilleCity_BikeShop/border.bin" - .align 2 MauvilleCity_BikeShop_MapBlockdata:: .incbin "data/layouts/MauvilleCity_BikeShop/map.bin" @@ -14,3 +12,4 @@ MauvilleCity_BikeShop_Layout:: .4byte MauvilleCity_BikeShop_MapBlockdata .4byte gTileset_General .4byte gTileset_BikeShop + diff --git a/data/layouts/MauvilleCity_GameCorner/layout.inc b/data/layouts/MauvilleCity_GameCorner/layout.inc index 9403c9df66..307f7205e7 100644 --- a/data/layouts/MauvilleCity_GameCorner/layout.inc +++ b/data/layouts/MauvilleCity_GameCorner/layout.inc @@ -1,8 +1,6 @@ - .align 2 MauvilleCity_GameCorner_MapBorder:: .incbin "data/layouts/MauvilleCity_GameCorner/border.bin" - .align 2 MauvilleCity_GameCorner_MapBlockdata:: .incbin "data/layouts/MauvilleCity_GameCorner/map.bin" @@ -14,3 +12,4 @@ MauvilleCity_GameCorner_Layout:: .4byte MauvilleCity_GameCorner_MapBlockdata .4byte gTileset_Building .4byte gTileset_MauvilleGameCorner + diff --git a/data/layouts/MauvilleCity_Gym/layout.inc b/data/layouts/MauvilleCity_Gym/layout.inc index 1fdaf921e5..290fca78e0 100644 --- a/data/layouts/MauvilleCity_Gym/layout.inc +++ b/data/layouts/MauvilleCity_Gym/layout.inc @@ -1,8 +1,6 @@ - .align 2 MauvilleCity_Gym_MapBorder:: .incbin "data/layouts/MauvilleCity_Gym/border.bin" - .align 2 MauvilleCity_Gym_MapBlockdata:: .incbin "data/layouts/MauvilleCity_Gym/map.bin" @@ -14,3 +12,4 @@ MauvilleCity_Gym_Layout:: .4byte MauvilleCity_Gym_MapBlockdata .4byte gTileset_Building .4byte gTileset_MauvilleGym + diff --git a/data/layouts/MeteorFalls_1F_1R/layout.inc b/data/layouts/MeteorFalls_1F_1R/layout.inc index 3fea20553d..ba7a0e487b 100644 --- a/data/layouts/MeteorFalls_1F_1R/layout.inc +++ b/data/layouts/MeteorFalls_1F_1R/layout.inc @@ -1,8 +1,6 @@ - .align 2 MeteorFalls_1F_1R_MapBorder:: .incbin "data/layouts/MeteorFalls_1F_1R/border.bin" - .align 2 MeteorFalls_1F_1R_MapBlockdata:: .incbin "data/layouts/MeteorFalls_1F_1R/map.bin" @@ -14,3 +12,4 @@ MeteorFalls_1F_1R_Layout:: .4byte MeteorFalls_1F_1R_MapBlockdata .4byte gTileset_General .4byte gTileset_MeteorFalls + diff --git a/data/layouts/MeteorFalls_1F_2R/layout.inc b/data/layouts/MeteorFalls_1F_2R/layout.inc index ac91e848ea..2e3fcaf2e1 100644 --- a/data/layouts/MeteorFalls_1F_2R/layout.inc +++ b/data/layouts/MeteorFalls_1F_2R/layout.inc @@ -1,8 +1,6 @@ - .align 2 MeteorFalls_1F_2R_MapBorder:: .incbin "data/layouts/MeteorFalls_1F_2R/border.bin" - .align 2 MeteorFalls_1F_2R_MapBlockdata:: .incbin "data/layouts/MeteorFalls_1F_2R/map.bin" @@ -14,3 +12,4 @@ MeteorFalls_1F_2R_Layout:: .4byte MeteorFalls_1F_2R_MapBlockdata .4byte gTileset_General .4byte gTileset_MeteorFalls + diff --git a/data/layouts/MeteorFalls_B1F_1R/layout.inc b/data/layouts/MeteorFalls_B1F_1R/layout.inc index c424edf3bc..a4f385d8f4 100644 --- a/data/layouts/MeteorFalls_B1F_1R/layout.inc +++ b/data/layouts/MeteorFalls_B1F_1R/layout.inc @@ -1,8 +1,6 @@ - .align 2 MeteorFalls_B1F_1R_MapBorder:: .incbin "data/layouts/MeteorFalls_B1F_1R/border.bin" - .align 2 MeteorFalls_B1F_1R_MapBlockdata:: .incbin "data/layouts/MeteorFalls_B1F_1R/map.bin" @@ -14,3 +12,4 @@ MeteorFalls_B1F_1R_Layout:: .4byte MeteorFalls_B1F_1R_MapBlockdata .4byte gTileset_General .4byte gTileset_MeteorFalls + diff --git a/data/layouts/MeteorFalls_B1F_2R/layout.inc b/data/layouts/MeteorFalls_B1F_2R/layout.inc index b7ee944ccd..982edc975e 100644 --- a/data/layouts/MeteorFalls_B1F_2R/layout.inc +++ b/data/layouts/MeteorFalls_B1F_2R/layout.inc @@ -1,8 +1,6 @@ - .align 2 MeteorFalls_B1F_2R_MapBorder:: .incbin "data/layouts/MeteorFalls_B1F_2R/border.bin" - .align 2 MeteorFalls_B1F_2R_MapBlockdata:: .incbin "data/layouts/MeteorFalls_B1F_2R/map.bin" @@ -14,3 +12,4 @@ MeteorFalls_B1F_2R_Layout:: .4byte MeteorFalls_B1F_2R_MapBlockdata .4byte gTileset_General .4byte gTileset_MeteorFalls + diff --git a/data/layouts/MeteorFalls_StevensCave/layout.inc b/data/layouts/MeteorFalls_StevensCave/layout.inc index 992e7d1740..1baf70a097 100644 --- a/data/layouts/MeteorFalls_StevensCave/layout.inc +++ b/data/layouts/MeteorFalls_StevensCave/layout.inc @@ -1,8 +1,6 @@ - .align 2 MeteorFalls_StevensCave_MapBorder:: .incbin "data/layouts/MeteorFalls_StevensCave/border.bin" - .align 2 MeteorFalls_StevensCave_MapBlockdata:: .incbin "data/layouts/MeteorFalls_StevensCave/map.bin" @@ -14,3 +12,4 @@ MeteorFalls_StevensCave_Layout:: .4byte MeteorFalls_StevensCave_MapBlockdata .4byte gTileset_General .4byte gTileset_MeteorFalls + diff --git a/data/layouts/MirageTower_1F/layout.inc b/data/layouts/MirageTower_1F/layout.inc index e4bb92d747..be36cc758b 100644 --- a/data/layouts/MirageTower_1F/layout.inc +++ b/data/layouts/MirageTower_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MirageTower_1F_MapBorder:: .incbin "data/layouts/MirageTower_1F/border.bin" - .align 2 MirageTower_1F_MapBlockdata:: .incbin "data/layouts/MirageTower_1F/map.bin" @@ -14,3 +12,4 @@ MirageTower_1F_Layout:: .4byte MirageTower_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_MirageTower + diff --git a/data/layouts/MirageTower_2F/layout.inc b/data/layouts/MirageTower_2F/layout.inc index 601dd9de29..ec4971bc41 100644 --- a/data/layouts/MirageTower_2F/layout.inc +++ b/data/layouts/MirageTower_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MirageTower_2F_MapBorder:: .incbin "data/layouts/MirageTower_2F/border.bin" - .align 2 MirageTower_2F_MapBlockdata:: .incbin "data/layouts/MirageTower_2F/map.bin" @@ -14,3 +12,4 @@ MirageTower_2F_Layout:: .4byte MirageTower_2F_MapBlockdata .4byte gTileset_General .4byte gTileset_MirageTower + diff --git a/data/layouts/MirageTower_3F/layout.inc b/data/layouts/MirageTower_3F/layout.inc index 2bcd9806dd..c12de3a150 100644 --- a/data/layouts/MirageTower_3F/layout.inc +++ b/data/layouts/MirageTower_3F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MirageTower_3F_MapBorder:: .incbin "data/layouts/MirageTower_3F/border.bin" - .align 2 MirageTower_3F_MapBlockdata:: .incbin "data/layouts/MirageTower_3F/map.bin" @@ -14,3 +12,4 @@ MirageTower_3F_Layout:: .4byte MirageTower_3F_MapBlockdata .4byte gTileset_General .4byte gTileset_MirageTower + diff --git a/data/layouts/MirageTower_4F/layout.inc b/data/layouts/MirageTower_4F/layout.inc index babf2a5c74..518f7c9435 100644 --- a/data/layouts/MirageTower_4F/layout.inc +++ b/data/layouts/MirageTower_4F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MirageTower_4F_MapBorder:: .incbin "data/layouts/MirageTower_4F/border.bin" - .align 2 MirageTower_4F_MapBlockdata:: .incbin "data/layouts/MirageTower_4F/map.bin" @@ -14,3 +12,4 @@ MirageTower_4F_Layout:: .4byte MirageTower_4F_MapBlockdata .4byte gTileset_General .4byte gTileset_MirageTower + diff --git a/data/layouts/MossdeepCity/layout.inc b/data/layouts/MossdeepCity/layout.inc index b5d392dc71..881cf9498d 100644 --- a/data/layouts/MossdeepCity/layout.inc +++ b/data/layouts/MossdeepCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 MossdeepCity_MapBorder:: .incbin "data/layouts/MossdeepCity/border.bin" - .align 2 MossdeepCity_MapBlockdata:: .incbin "data/layouts/MossdeepCity/map.bin" @@ -14,3 +12,4 @@ MossdeepCity_Layout:: .4byte MossdeepCity_MapBlockdata .4byte gTileset_General .4byte gTileset_Mossdeep + diff --git a/data/layouts/MossdeepCity_GameCorner_1F/layout.inc b/data/layouts/MossdeepCity_GameCorner_1F/layout.inc index e03619423c..2c2fb717da 100644 --- a/data/layouts/MossdeepCity_GameCorner_1F/layout.inc +++ b/data/layouts/MossdeepCity_GameCorner_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MossdeepCity_GameCorner_1F_MapBorder:: .incbin "data/layouts/MossdeepCity_GameCorner_1F/border.bin" - .align 2 MossdeepCity_GameCorner_1F_MapBlockdata:: .incbin "data/layouts/MossdeepCity_GameCorner_1F/map.bin" @@ -14,3 +12,4 @@ MossdeepCity_GameCorner_1F_Layout:: .4byte MossdeepCity_GameCorner_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_MossdeepGameCorner + diff --git a/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc b/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc index b51e183626..ec5dd2a574 100644 --- a/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc +++ b/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MossdeepCity_GameCorner_B1F_MapBorder:: .incbin "data/layouts/MossdeepCity_GameCorner_B1F/border.bin" - .align 2 MossdeepCity_GameCorner_B1F_MapBlockdata:: .incbin "data/layouts/MossdeepCity_GameCorner_B1F/map.bin" @@ -14,3 +12,4 @@ MossdeepCity_GameCorner_B1F_Layout:: .4byte MossdeepCity_GameCorner_B1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/MossdeepCity_Gym/layout.inc b/data/layouts/MossdeepCity_Gym/layout.inc index fbdfa6fddd..a65212a40c 100644 --- a/data/layouts/MossdeepCity_Gym/layout.inc +++ b/data/layouts/MossdeepCity_Gym/layout.inc @@ -1,8 +1,6 @@ - .align 2 MossdeepCity_Gym_MapBorder:: .incbin "data/layouts/MossdeepCity_Gym/border.bin" - .align 2 MossdeepCity_Gym_MapBlockdata:: .incbin "data/layouts/MossdeepCity_Gym/map.bin" @@ -14,3 +12,4 @@ MossdeepCity_Gym_Layout:: .4byte MossdeepCity_Gym_MapBlockdata .4byte gTileset_Building .4byte gTileset_MossdeepGym + diff --git a/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc b/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc index c5fc2f5707..759e688912 100644 --- a/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc +++ b/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MossdeepCity_SpaceCenter_1F_MapBorder:: .incbin "data/layouts/MossdeepCity_SpaceCenter_1F/border.bin" - .align 2 MossdeepCity_SpaceCenter_1F_MapBlockdata:: .incbin "data/layouts/MossdeepCity_SpaceCenter_1F/map.bin" @@ -14,3 +12,4 @@ MossdeepCity_SpaceCenter_1F_Layout:: .4byte MossdeepCity_SpaceCenter_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc b/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc index 4d406accc6..6e370a7fac 100644 --- a/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc +++ b/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MossdeepCity_SpaceCenter_2F_MapBorder:: .incbin "data/layouts/MossdeepCity_SpaceCenter_2F/border.bin" - .align 2 MossdeepCity_SpaceCenter_2F_MapBlockdata:: .incbin "data/layouts/MossdeepCity_SpaceCenter_2F/map.bin" @@ -14,3 +12,4 @@ MossdeepCity_SpaceCenter_2F_Layout:: .4byte MossdeepCity_SpaceCenter_2F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/MossdeepCity_StevensHouse/layout.inc b/data/layouts/MossdeepCity_StevensHouse/layout.inc index 29aede186e..0db92aee9f 100644 --- a/data/layouts/MossdeepCity_StevensHouse/layout.inc +++ b/data/layouts/MossdeepCity_StevensHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 MossdeepCity_StevensHouse_MapBorder:: .incbin "data/layouts/MossdeepCity_StevensHouse/border.bin" - .align 2 MossdeepCity_StevensHouse_MapBlockdata:: .incbin "data/layouts/MossdeepCity_StevensHouse/map.bin" @@ -14,3 +12,4 @@ MossdeepCity_StevensHouse_Layout:: .4byte MossdeepCity_StevensHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/MtChimney/layout.inc b/data/layouts/MtChimney/layout.inc index f0afefe3b7..29a3b1ad7e 100644 --- a/data/layouts/MtChimney/layout.inc +++ b/data/layouts/MtChimney/layout.inc @@ -1,8 +1,6 @@ - .align 2 MtChimney_MapBorder:: .incbin "data/layouts/MtChimney/border.bin" - .align 2 MtChimney_MapBlockdata:: .incbin "data/layouts/MtChimney/map.bin" @@ -14,3 +12,4 @@ MtChimney_Layout:: .4byte MtChimney_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/MtPyre_1F/layout.inc b/data/layouts/MtPyre_1F/layout.inc index bd7fd82d51..2402e815c4 100644 --- a/data/layouts/MtPyre_1F/layout.inc +++ b/data/layouts/MtPyre_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MtPyre_1F_MapBorder:: .incbin "data/layouts/MtPyre_1F/border.bin" - .align 2 MtPyre_1F_MapBlockdata:: .incbin "data/layouts/MtPyre_1F/map.bin" @@ -14,3 +12,4 @@ MtPyre_1F_Layout:: .4byte MtPyre_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/MtPyre_2F/layout.inc b/data/layouts/MtPyre_2F/layout.inc index cbf534f693..8d6ca12003 100644 --- a/data/layouts/MtPyre_2F/layout.inc +++ b/data/layouts/MtPyre_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MtPyre_2F_MapBorder:: .incbin "data/layouts/MtPyre_2F/border.bin" - .align 2 MtPyre_2F_MapBlockdata:: .incbin "data/layouts/MtPyre_2F/map.bin" @@ -14,3 +12,4 @@ MtPyre_2F_Layout:: .4byte MtPyre_2F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/MtPyre_3F/layout.inc b/data/layouts/MtPyre_3F/layout.inc index ceaa1bea9d..24ed0f7b12 100644 --- a/data/layouts/MtPyre_3F/layout.inc +++ b/data/layouts/MtPyre_3F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MtPyre_3F_MapBorder:: .incbin "data/layouts/MtPyre_3F/border.bin" - .align 2 MtPyre_3F_MapBlockdata:: .incbin "data/layouts/MtPyre_3F/map.bin" @@ -14,3 +12,4 @@ MtPyre_3F_Layout:: .4byte MtPyre_3F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/MtPyre_4F/layout.inc b/data/layouts/MtPyre_4F/layout.inc index 5bd0eab595..65a8fcf598 100644 --- a/data/layouts/MtPyre_4F/layout.inc +++ b/data/layouts/MtPyre_4F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MtPyre_4F_MapBorder:: .incbin "data/layouts/MtPyre_4F/border.bin" - .align 2 MtPyre_4F_MapBlockdata:: .incbin "data/layouts/MtPyre_4F/map.bin" @@ -14,3 +12,4 @@ MtPyre_4F_Layout:: .4byte MtPyre_4F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/MtPyre_5F/layout.inc b/data/layouts/MtPyre_5F/layout.inc index fed3f9ae2f..222c6eb804 100644 --- a/data/layouts/MtPyre_5F/layout.inc +++ b/data/layouts/MtPyre_5F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MtPyre_5F_MapBorder:: .incbin "data/layouts/MtPyre_5F/border.bin" - .align 2 MtPyre_5F_MapBlockdata:: .incbin "data/layouts/MtPyre_5F/map.bin" @@ -14,3 +12,4 @@ MtPyre_5F_Layout:: .4byte MtPyre_5F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/MtPyre_6F/layout.inc b/data/layouts/MtPyre_6F/layout.inc index 0fe9f6982a..31b5288d5b 100644 --- a/data/layouts/MtPyre_6F/layout.inc +++ b/data/layouts/MtPyre_6F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MtPyre_6F_MapBorder:: .incbin "data/layouts/MtPyre_6F/border.bin" - .align 2 MtPyre_6F_MapBlockdata:: .incbin "data/layouts/MtPyre_6F/map.bin" @@ -14,3 +12,4 @@ MtPyre_6F_Layout:: .4byte MtPyre_6F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/MtPyre_Exterior/layout.inc b/data/layouts/MtPyre_Exterior/layout.inc index 2f81759d75..1b5997dbae 100644 --- a/data/layouts/MtPyre_Exterior/layout.inc +++ b/data/layouts/MtPyre_Exterior/layout.inc @@ -1,8 +1,6 @@ - .align 2 MtPyre_Exterior_MapBorder:: .incbin "data/layouts/MtPyre_Exterior/border.bin" - .align 2 MtPyre_Exterior_MapBlockdata:: .incbin "data/layouts/MtPyre_Exterior/map.bin" @@ -14,3 +12,4 @@ MtPyre_Exterior_Layout:: .4byte MtPyre_Exterior_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/MtPyre_Summit/layout.inc b/data/layouts/MtPyre_Summit/layout.inc index 4f30ac9e1d..58e932eb7a 100644 --- a/data/layouts/MtPyre_Summit/layout.inc +++ b/data/layouts/MtPyre_Summit/layout.inc @@ -1,8 +1,6 @@ - .align 2 MtPyre_Summit_MapBorder:: .incbin "data/layouts/MtPyre_Summit/border.bin" - .align 2 MtPyre_Summit_MapBlockdata:: .incbin "data/layouts/MtPyre_Summit/map.bin" @@ -14,3 +12,4 @@ MtPyre_Summit_Layout:: .4byte MtPyre_Summit_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/NavelRock_B1F/layout.inc b/data/layouts/NavelRock_B1F/layout.inc index 899aa8eed3..6f15bd2766 100644 --- a/data/layouts/NavelRock_B1F/layout.inc +++ b/data/layouts/NavelRock_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 NavelRock_B1F_MapBorder:: .incbin "data/layouts/NavelRock_B1F/border.bin" - .align 2 NavelRock_B1F_MapBlockdata:: .incbin "data/layouts/NavelRock_B1F/map.bin" @@ -14,3 +12,4 @@ NavelRock_B1F_Layout:: .4byte NavelRock_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_NavelRock + diff --git a/data/layouts/NavelRock_Bottom/layout.inc b/data/layouts/NavelRock_Bottom/layout.inc index 043a977de6..5c96a8cef2 100644 --- a/data/layouts/NavelRock_Bottom/layout.inc +++ b/data/layouts/NavelRock_Bottom/layout.inc @@ -1,8 +1,6 @@ - .align 2 NavelRock_Bottom_MapBorder:: .incbin "data/layouts/NavelRock_Bottom/border.bin" - .align 2 NavelRock_Bottom_MapBlockdata:: .incbin "data/layouts/NavelRock_Bottom/map.bin" @@ -14,3 +12,4 @@ NavelRock_Bottom_Layout:: .4byte NavelRock_Bottom_MapBlockdata .4byte gTileset_General .4byte gTileset_NavelRock + diff --git a/data/layouts/NavelRock_Entrance/layout.inc b/data/layouts/NavelRock_Entrance/layout.inc index d9a12b71d9..6dcedcb208 100644 --- a/data/layouts/NavelRock_Entrance/layout.inc +++ b/data/layouts/NavelRock_Entrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 NavelRock_Entrance_MapBorder:: .incbin "data/layouts/NavelRock_Entrance/border.bin" - .align 2 NavelRock_Entrance_MapBlockdata:: .incbin "data/layouts/NavelRock_Entrance/map.bin" @@ -14,3 +12,4 @@ NavelRock_Entrance_Layout:: .4byte NavelRock_Entrance_MapBlockdata .4byte gTileset_General .4byte gTileset_NavelRock + diff --git a/data/layouts/NavelRock_Exterior/layout.inc b/data/layouts/NavelRock_Exterior/layout.inc index b3fc825cf6..c2c4fa95e5 100644 --- a/data/layouts/NavelRock_Exterior/layout.inc +++ b/data/layouts/NavelRock_Exterior/layout.inc @@ -1,8 +1,6 @@ - .align 2 NavelRock_Exterior_MapBorder:: .incbin "data/layouts/NavelRock_Exterior/border.bin" - .align 2 NavelRock_Exterior_MapBlockdata:: .incbin "data/layouts/NavelRock_Exterior/map.bin" @@ -14,3 +12,4 @@ NavelRock_Exterior_Layout:: .4byte NavelRock_Exterior_MapBlockdata .4byte gTileset_General .4byte gTileset_Dewford + diff --git a/data/layouts/NavelRock_Fork/layout.inc b/data/layouts/NavelRock_Fork/layout.inc index 0f7956e5eb..ab5d9c8673 100644 --- a/data/layouts/NavelRock_Fork/layout.inc +++ b/data/layouts/NavelRock_Fork/layout.inc @@ -1,8 +1,6 @@ - .align 2 NavelRock_Fork_MapBorder:: .incbin "data/layouts/NavelRock_Fork/border.bin" - .align 2 NavelRock_Fork_MapBlockdata:: .incbin "data/layouts/NavelRock_Fork/map.bin" @@ -14,3 +12,4 @@ NavelRock_Fork_Layout:: .4byte NavelRock_Fork_MapBlockdata .4byte gTileset_General .4byte gTileset_NavelRock + diff --git a/data/layouts/NavelRock_LadderRoom1/layout.inc b/data/layouts/NavelRock_LadderRoom1/layout.inc index 34ff05e395..a7fc73d220 100644 --- a/data/layouts/NavelRock_LadderRoom1/layout.inc +++ b/data/layouts/NavelRock_LadderRoom1/layout.inc @@ -1,8 +1,6 @@ - .align 2 NavelRock_LadderRoom1_MapBorder:: .incbin "data/layouts/NavelRock_LadderRoom1/border.bin" - .align 2 NavelRock_LadderRoom1_MapBlockdata:: .incbin "data/layouts/NavelRock_LadderRoom1/map.bin" @@ -14,3 +12,4 @@ NavelRock_LadderRoom1_Layout:: .4byte NavelRock_LadderRoom1_MapBlockdata .4byte gTileset_General .4byte gTileset_NavelRock + diff --git a/data/layouts/NavelRock_LadderRoom2/layout.inc b/data/layouts/NavelRock_LadderRoom2/layout.inc index a50a32690f..8fbd6e51ff 100644 --- a/data/layouts/NavelRock_LadderRoom2/layout.inc +++ b/data/layouts/NavelRock_LadderRoom2/layout.inc @@ -1,8 +1,6 @@ - .align 2 NavelRock_LadderRoom2_MapBorder:: .incbin "data/layouts/NavelRock_LadderRoom2/border.bin" - .align 2 NavelRock_LadderRoom2_MapBlockdata:: .incbin "data/layouts/NavelRock_LadderRoom2/map.bin" @@ -14,3 +12,4 @@ NavelRock_LadderRoom2_Layout:: .4byte NavelRock_LadderRoom2_MapBlockdata .4byte gTileset_General .4byte gTileset_NavelRock + diff --git a/data/layouts/NavelRock_Top/layout.inc b/data/layouts/NavelRock_Top/layout.inc index 6e99e9bf41..50698cc768 100644 --- a/data/layouts/NavelRock_Top/layout.inc +++ b/data/layouts/NavelRock_Top/layout.inc @@ -1,8 +1,6 @@ - .align 2 NavelRock_Top_MapBorder:: .incbin "data/layouts/NavelRock_Top/border.bin" - .align 2 NavelRock_Top_MapBlockdata:: .incbin "data/layouts/NavelRock_Top/map.bin" @@ -14,3 +12,4 @@ NavelRock_Top_Layout:: .4byte NavelRock_Top_MapBlockdata .4byte gTileset_General .4byte gTileset_NavelRock + diff --git a/data/layouts/NewMauville_Entrance/layout.inc b/data/layouts/NewMauville_Entrance/layout.inc index 78e3edee40..bbd81cac7d 100644 --- a/data/layouts/NewMauville_Entrance/layout.inc +++ b/data/layouts/NewMauville_Entrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 NewMauville_Entrance_MapBorder:: .incbin "data/layouts/NewMauville_Entrance/border.bin" - .align 2 NewMauville_Entrance_MapBlockdata:: .incbin "data/layouts/NewMauville_Entrance/map.bin" @@ -14,3 +12,4 @@ NewMauville_Entrance_Layout:: .4byte NewMauville_Entrance_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/NewMauville_Inside/layout.inc b/data/layouts/NewMauville_Inside/layout.inc index d7dbe6a620..096142c6de 100644 --- a/data/layouts/NewMauville_Inside/layout.inc +++ b/data/layouts/NewMauville_Inside/layout.inc @@ -1,8 +1,6 @@ - .align 2 NewMauville_Inside_MapBorder:: .incbin "data/layouts/NewMauville_Inside/border.bin" - .align 2 NewMauville_Inside_MapBlockdata:: .incbin "data/layouts/NewMauville_Inside/map.bin" @@ -14,3 +12,4 @@ NewMauville_Inside_Layout:: .4byte NewMauville_Inside_MapBlockdata .4byte gTileset_General .4byte gTileset_BikeShop + diff --git a/data/layouts/OldaleTown/layout.inc b/data/layouts/OldaleTown/layout.inc index 7d266cfba9..9709ca1ea0 100644 --- a/data/layouts/OldaleTown/layout.inc +++ b/data/layouts/OldaleTown/layout.inc @@ -1,8 +1,6 @@ - .align 2 OldaleTown_MapBorder:: .incbin "data/layouts/OldaleTown/border.bin" - .align 2 OldaleTown_MapBlockdata:: .incbin "data/layouts/OldaleTown/map.bin" @@ -14,3 +12,4 @@ OldaleTown_Layout:: .4byte OldaleTown_MapBlockdata .4byte gTileset_General .4byte gTileset_Petalburg + diff --git a/data/layouts/PacifidlogTown/layout.inc b/data/layouts/PacifidlogTown/layout.inc index a87de70363..4ba791f231 100644 --- a/data/layouts/PacifidlogTown/layout.inc +++ b/data/layouts/PacifidlogTown/layout.inc @@ -1,8 +1,6 @@ - .align 2 PacifidlogTown_MapBorder:: .incbin "data/layouts/PacifidlogTown/border.bin" - .align 2 PacifidlogTown_MapBlockdata:: .incbin "data/layouts/PacifidlogTown/map.bin" @@ -14,3 +12,4 @@ PacifidlogTown_Layout:: .4byte PacifidlogTown_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/PacifidlogTown_House1/layout.inc b/data/layouts/PacifidlogTown_House1/layout.inc index 16f9402ca4..b5dcf58b23 100644 --- a/data/layouts/PacifidlogTown_House1/layout.inc +++ b/data/layouts/PacifidlogTown_House1/layout.inc @@ -1,8 +1,6 @@ - .align 2 PacifidlogTown_House1_MapBorder:: .incbin "data/layouts/PacifidlogTown_House1/border.bin" - .align 2 PacifidlogTown_House1_MapBlockdata:: .incbin "data/layouts/PacifidlogTown_House1/map.bin" @@ -14,3 +12,4 @@ PacifidlogTown_House1_Layout:: .4byte PacifidlogTown_House1_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/PacifidlogTown_House2/layout.inc b/data/layouts/PacifidlogTown_House2/layout.inc index deb1110599..a10daa3cd6 100644 --- a/data/layouts/PacifidlogTown_House2/layout.inc +++ b/data/layouts/PacifidlogTown_House2/layout.inc @@ -1,8 +1,6 @@ - .align 2 PacifidlogTown_House2_MapBorder:: .incbin "data/layouts/PacifidlogTown_House2/border.bin" - .align 2 PacifidlogTown_House2_MapBlockdata:: .incbin "data/layouts/PacifidlogTown_House2/map.bin" @@ -14,3 +12,4 @@ PacifidlogTown_House2_Layout:: .4byte PacifidlogTown_House2_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/PetalburgCity/layout.inc b/data/layouts/PetalburgCity/layout.inc index c458140a9c..bae16b88f3 100644 --- a/data/layouts/PetalburgCity/layout.inc +++ b/data/layouts/PetalburgCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 PetalburgCity_MapBorder:: .incbin "data/layouts/PetalburgCity/border.bin" - .align 2 PetalburgCity_MapBlockdata:: .incbin "data/layouts/PetalburgCity/map.bin" @@ -14,3 +12,4 @@ PetalburgCity_Layout:: .4byte PetalburgCity_MapBlockdata .4byte gTileset_General .4byte gTileset_Petalburg + diff --git a/data/layouts/PetalburgCity_Gym/layout.inc b/data/layouts/PetalburgCity_Gym/layout.inc index 974b95baf0..36fe1002ff 100644 --- a/data/layouts/PetalburgCity_Gym/layout.inc +++ b/data/layouts/PetalburgCity_Gym/layout.inc @@ -1,8 +1,6 @@ - .align 2 PetalburgCity_Gym_MapBorder:: .incbin "data/layouts/PetalburgCity_Gym/border.bin" - .align 2 PetalburgCity_Gym_MapBlockdata:: .incbin "data/layouts/PetalburgCity_Gym/map.bin" @@ -14,3 +12,4 @@ PetalburgCity_Gym_Layout:: .4byte PetalburgCity_Gym_MapBlockdata .4byte gTileset_Building .4byte gTileset_PetalburgGym + diff --git a/data/layouts/PetalburgWoods/layout.inc b/data/layouts/PetalburgWoods/layout.inc index 6ee24ef31e..840e17f7e8 100644 --- a/data/layouts/PetalburgWoods/layout.inc +++ b/data/layouts/PetalburgWoods/layout.inc @@ -1,8 +1,6 @@ - .align 2 PetalburgWoods_MapBorder:: .incbin "data/layouts/PetalburgWoods/border.bin" - .align 2 PetalburgWoods_MapBlockdata:: .incbin "data/layouts/PetalburgWoods/map.bin" @@ -14,3 +12,4 @@ PetalburgWoods_Layout:: .4byte PetalburgWoods_MapBlockdata .4byte gTileset_General .4byte gTileset_Rustboro + diff --git a/data/layouts/PokemonCenter_1F/layout.inc b/data/layouts/PokemonCenter_1F/layout.inc index 4d299d4070..bf1335f844 100644 --- a/data/layouts/PokemonCenter_1F/layout.inc +++ b/data/layouts/PokemonCenter_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 PokemonCenter_1F_MapBorder:: .incbin "data/layouts/PokemonCenter_1F/border.bin" - .align 2 PokemonCenter_1F_MapBlockdata:: .incbin "data/layouts/PokemonCenter_1F/map.bin" @@ -14,3 +12,4 @@ PokemonCenter_1F_Layout:: .4byte PokemonCenter_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_PokemonCenter + diff --git a/data/layouts/PokemonCenter_2F/layout.inc b/data/layouts/PokemonCenter_2F/layout.inc index cc2aba89a0..3cb812de77 100644 --- a/data/layouts/PokemonCenter_2F/layout.inc +++ b/data/layouts/PokemonCenter_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 PokemonCenter_2F_MapBorder:: .incbin "data/layouts/PokemonCenter_2F/border.bin" - .align 2 PokemonCenter_2F_MapBlockdata:: .incbin "data/layouts/PokemonCenter_2F/map.bin" @@ -14,3 +12,4 @@ PokemonCenter_2F_Layout:: .4byte PokemonCenter_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_PokemonCenter + diff --git a/data/layouts/RecordCorner/layout.inc b/data/layouts/RecordCorner/layout.inc index ab18faa0db..ed258b2a7f 100644 --- a/data/layouts/RecordCorner/layout.inc +++ b/data/layouts/RecordCorner/layout.inc @@ -1,8 +1,6 @@ - .align 2 RecordCorner_MapBorder:: .incbin "data/layouts/RecordCorner/border.bin" - .align 2 RecordCorner_MapBlockdata:: .incbin "data/layouts/RecordCorner/map.bin" @@ -14,3 +12,4 @@ RecordCorner_Layout:: .4byte RecordCorner_MapBlockdata .4byte gTileset_Building .4byte gTileset_CableClub + diff --git a/data/layouts/Route101/layout.inc b/data/layouts/Route101/layout.inc index 54193c3435..e42ecf340e 100644 --- a/data/layouts/Route101/layout.inc +++ b/data/layouts/Route101/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route101_MapBorder:: .incbin "data/layouts/Route101/border.bin" - .align 2 Route101_MapBlockdata:: .incbin "data/layouts/Route101/map.bin" @@ -14,3 +12,4 @@ Route101_Layout:: .4byte Route101_MapBlockdata .4byte gTileset_General .4byte gTileset_Petalburg + diff --git a/data/layouts/Route102/layout.inc b/data/layouts/Route102/layout.inc index eaf962db27..194d44fce7 100644 --- a/data/layouts/Route102/layout.inc +++ b/data/layouts/Route102/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route102_MapBorder:: .incbin "data/layouts/Route102/border.bin" - .align 2 Route102_MapBlockdata:: .incbin "data/layouts/Route102/map.bin" @@ -14,3 +12,4 @@ Route102_Layout:: .4byte Route102_MapBlockdata .4byte gTileset_General .4byte gTileset_Petalburg + diff --git a/data/layouts/Route103/layout.inc b/data/layouts/Route103/layout.inc index eaf00808e5..fe3bac0668 100644 --- a/data/layouts/Route103/layout.inc +++ b/data/layouts/Route103/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route103_MapBorder:: .incbin "data/layouts/Route103/border.bin" - .align 2 Route103_MapBlockdata:: .incbin "data/layouts/Route103/map.bin" @@ -14,3 +12,4 @@ Route103_Layout:: .4byte Route103_MapBlockdata .4byte gTileset_General .4byte gTileset_Petalburg + diff --git a/data/layouts/Route104/layout.inc b/data/layouts/Route104/layout.inc index 58a000d706..9a9418e461 100644 --- a/data/layouts/Route104/layout.inc +++ b/data/layouts/Route104/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route104_MapBorder:: .incbin "data/layouts/Route104/border.bin" - .align 2 Route104_MapBlockdata:: .incbin "data/layouts/Route104/map.bin" @@ -14,3 +12,4 @@ Route104_Layout:: .4byte Route104_MapBlockdata .4byte gTileset_General .4byte gTileset_Rustboro + diff --git a/data/layouts/Route104_MrBrineysHouse/layout.inc b/data/layouts/Route104_MrBrineysHouse/layout.inc index 039901d0a5..3474f33351 100644 --- a/data/layouts/Route104_MrBrineysHouse/layout.inc +++ b/data/layouts/Route104_MrBrineysHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route104_MrBrineysHouse_MapBorder:: .incbin "data/layouts/Route104_MrBrineysHouse/border.bin" - .align 2 Route104_MrBrineysHouse_MapBlockdata:: .incbin "data/layouts/Route104_MrBrineysHouse/map.bin" @@ -14,3 +12,4 @@ Route104_MrBrineysHouse_Layout:: .4byte Route104_MrBrineysHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc b/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc index 0510c90288..a46ffc18c8 100644 --- a/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc +++ b/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route104_PrettyPetalFlowerShop_MapBorder:: .incbin "data/layouts/Route104_PrettyPetalFlowerShop/border.bin" - .align 2 Route104_PrettyPetalFlowerShop_MapBlockdata:: .incbin "data/layouts/Route104_PrettyPetalFlowerShop/map.bin" @@ -14,3 +12,4 @@ Route104_PrettyPetalFlowerShop_Layout:: .4byte Route104_PrettyPetalFlowerShop_MapBlockdata .4byte gTileset_Building .4byte gTileset_PrettyPetalFlowerShop + diff --git a/data/layouts/Route104_Prototype/layout.inc b/data/layouts/Route104_Prototype/layout.inc index eb70f55c9a..b2b2c4f194 100644 --- a/data/layouts/Route104_Prototype/layout.inc +++ b/data/layouts/Route104_Prototype/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route104_Prototype_MapBorder:: .incbin "data/layouts/Route104_Prototype/border.bin" - .align 2 Route104_Prototype_MapBlockdata:: .incbin "data/layouts/Route104_Prototype/map.bin" @@ -14,3 +12,4 @@ Route104_Prototype_Layout:: .4byte Route104_Prototype_MapBlockdata .4byte gTileset_General .4byte gTileset_Rustboro + diff --git a/data/layouts/Route105/layout.inc b/data/layouts/Route105/layout.inc index 4156bc9a46..ce78ef9cc2 100644 --- a/data/layouts/Route105/layout.inc +++ b/data/layouts/Route105/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route105_MapBorder:: .incbin "data/layouts/Route105/border.bin" - .align 2 Route105_MapBlockdata:: .incbin "data/layouts/Route105/map.bin" @@ -14,3 +12,4 @@ Route105_Layout:: .4byte Route105_MapBlockdata .4byte gTileset_General .4byte gTileset_Dewford + diff --git a/data/layouts/Route106/layout.inc b/data/layouts/Route106/layout.inc index ff43ced2ed..ea255b383b 100644 --- a/data/layouts/Route106/layout.inc +++ b/data/layouts/Route106/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route106_MapBorder:: .incbin "data/layouts/Route106/border.bin" - .align 2 Route106_MapBlockdata:: .incbin "data/layouts/Route106/map.bin" @@ -14,3 +12,4 @@ Route106_Layout:: .4byte Route106_MapBlockdata .4byte gTileset_General .4byte gTileset_Dewford + diff --git a/data/layouts/Route107/layout.inc b/data/layouts/Route107/layout.inc index 9de501c61b..ea305b2a76 100644 --- a/data/layouts/Route107/layout.inc +++ b/data/layouts/Route107/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route107_MapBorder:: .incbin "data/layouts/Route107/border.bin" - .align 2 Route107_MapBlockdata:: .incbin "data/layouts/Route107/map.bin" @@ -14,3 +12,4 @@ Route107_Layout:: .4byte Route107_MapBlockdata .4byte gTileset_General .4byte gTileset_Dewford + diff --git a/data/layouts/Route108/layout.inc b/data/layouts/Route108/layout.inc index 10fd278b3e..1ec7171cf0 100644 --- a/data/layouts/Route108/layout.inc +++ b/data/layouts/Route108/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route108_MapBorder:: .incbin "data/layouts/Route108/border.bin" - .align 2 Route108_MapBlockdata:: .incbin "data/layouts/Route108/map.bin" @@ -14,3 +12,4 @@ Route108_Layout:: .4byte Route108_MapBlockdata .4byte gTileset_General .4byte gTileset_Slateport + diff --git a/data/layouts/Route109/layout.inc b/data/layouts/Route109/layout.inc index f6d4864bf7..fa41585e93 100644 --- a/data/layouts/Route109/layout.inc +++ b/data/layouts/Route109/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route109_MapBorder:: .incbin "data/layouts/Route109/border.bin" - .align 2 Route109_MapBlockdata:: .incbin "data/layouts/Route109/map.bin" @@ -14,3 +12,4 @@ Route109_Layout:: .4byte Route109_MapBlockdata .4byte gTileset_General .4byte gTileset_Slateport + diff --git a/data/layouts/Route109_SeashoreHouse/layout.inc b/data/layouts/Route109_SeashoreHouse/layout.inc index 316c1fc1b6..9ec997b484 100644 --- a/data/layouts/Route109_SeashoreHouse/layout.inc +++ b/data/layouts/Route109_SeashoreHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route109_SeashoreHouse_MapBorder:: .incbin "data/layouts/Route109_SeashoreHouse/border.bin" - .align 2 Route109_SeashoreHouse_MapBlockdata:: .incbin "data/layouts/Route109_SeashoreHouse/map.bin" @@ -14,3 +12,4 @@ Route109_SeashoreHouse_Layout:: .4byte Route109_SeashoreHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_SeashoreHouse + diff --git a/data/layouts/Route110/layout.inc b/data/layouts/Route110/layout.inc index 1539ae91d5..24e5a93210 100644 --- a/data/layouts/Route110/layout.inc +++ b/data/layouts/Route110/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_MapBorder:: .incbin "data/layouts/Route110/border.bin" - .align 2 Route110_MapBlockdata:: .incbin "data/layouts/Route110/map.bin" @@ -14,3 +12,4 @@ Route110_Layout:: .4byte Route110_MapBlockdata .4byte gTileset_General .4byte gTileset_Mauville + diff --git a/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc b/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc index 4f804ef53d..abf78f62dd 100644 --- a/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc +++ b/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_SeasideCyclingRoadEntrance_MapBorder:: .incbin "data/layouts/Route110_SeasideCyclingRoadEntrance/border.bin" - .align 2 Route110_SeasideCyclingRoadEntrance_MapBlockdata:: .incbin "data/layouts/Route110_SeasideCyclingRoadEntrance/map.bin" @@ -14,3 +12,4 @@ Route110_SeasideCyclingRoadEntrance_Layout:: .4byte Route110_SeasideCyclingRoadEntrance_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/Route110_TrickHouseCorridor/layout.inc b/data/layouts/Route110_TrickHouseCorridor/layout.inc index 8f9c4d9eea..fe6ee4d26b 100644 --- a/data/layouts/Route110_TrickHouseCorridor/layout.inc +++ b/data/layouts/Route110_TrickHouseCorridor/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHouseCorridor_MapBorder:: .incbin "data/layouts/Route110_TrickHouseCorridor/border.bin" - .align 2 Route110_TrickHouseCorridor_MapBlockdata:: .incbin "data/layouts/Route110_TrickHouseCorridor/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHouseCorridor_Layout:: .4byte Route110_TrickHouseCorridor_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/Route110_TrickHouseEnd/layout.inc b/data/layouts/Route110_TrickHouseEnd/layout.inc index ee2b6b47f0..dd9474aeef 100644 --- a/data/layouts/Route110_TrickHouseEnd/layout.inc +++ b/data/layouts/Route110_TrickHouseEnd/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHouseEnd_MapBorder:: .incbin "data/layouts/Route110_TrickHouseEnd/border.bin" - .align 2 Route110_TrickHouseEnd_MapBlockdata:: .incbin "data/layouts/Route110_TrickHouseEnd/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHouseEnd_Layout:: .4byte Route110_TrickHouseEnd_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/Route110_TrickHouseEntrance/layout.inc b/data/layouts/Route110_TrickHouseEntrance/layout.inc index ec96366279..97f3abe24c 100644 --- a/data/layouts/Route110_TrickHouseEntrance/layout.inc +++ b/data/layouts/Route110_TrickHouseEntrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHouseEntrance_MapBorder:: .incbin "data/layouts/Route110_TrickHouseEntrance/border.bin" - .align 2 Route110_TrickHouseEntrance_MapBlockdata:: .incbin "data/layouts/Route110_TrickHouseEntrance/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHouseEntrance_Layout:: .4byte Route110_TrickHouseEntrance_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/Route110_TrickHousePuzzle1/layout.inc b/data/layouts/Route110_TrickHousePuzzle1/layout.inc index d8aadf1101..546876ab00 100644 --- a/data/layouts/Route110_TrickHousePuzzle1/layout.inc +++ b/data/layouts/Route110_TrickHousePuzzle1/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHousePuzzle1_MapBorder:: .incbin "data/layouts/Route110_TrickHousePuzzle1/border.bin" - .align 2 Route110_TrickHousePuzzle1_MapBlockdata:: .incbin "data/layouts/Route110_TrickHousePuzzle1/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHousePuzzle1_Layout:: .4byte Route110_TrickHousePuzzle1_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrickHousePuzzle + diff --git a/data/layouts/Route110_TrickHousePuzzle2/layout.inc b/data/layouts/Route110_TrickHousePuzzle2/layout.inc index 59bc2d06c0..65caaa7341 100644 --- a/data/layouts/Route110_TrickHousePuzzle2/layout.inc +++ b/data/layouts/Route110_TrickHousePuzzle2/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHousePuzzle2_MapBorder:: .incbin "data/layouts/Route110_TrickHousePuzzle2/border.bin" - .align 2 Route110_TrickHousePuzzle2_MapBlockdata:: .incbin "data/layouts/Route110_TrickHousePuzzle2/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHousePuzzle2_Layout:: .4byte Route110_TrickHousePuzzle2_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrickHousePuzzle + diff --git a/data/layouts/Route110_TrickHousePuzzle3/layout.inc b/data/layouts/Route110_TrickHousePuzzle3/layout.inc index 384a840327..a03cf9a719 100644 --- a/data/layouts/Route110_TrickHousePuzzle3/layout.inc +++ b/data/layouts/Route110_TrickHousePuzzle3/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHousePuzzle3_MapBorder:: .incbin "data/layouts/Route110_TrickHousePuzzle3/border.bin" - .align 2 Route110_TrickHousePuzzle3_MapBlockdata:: .incbin "data/layouts/Route110_TrickHousePuzzle3/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHousePuzzle3_Layout:: .4byte Route110_TrickHousePuzzle3_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrickHousePuzzle + diff --git a/data/layouts/Route110_TrickHousePuzzle4/layout.inc b/data/layouts/Route110_TrickHousePuzzle4/layout.inc index 3524e092d8..581b41a43b 100644 --- a/data/layouts/Route110_TrickHousePuzzle4/layout.inc +++ b/data/layouts/Route110_TrickHousePuzzle4/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHousePuzzle4_MapBorder:: .incbin "data/layouts/Route110_TrickHousePuzzle4/border.bin" - .align 2 Route110_TrickHousePuzzle4_MapBlockdata:: .incbin "data/layouts/Route110_TrickHousePuzzle4/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHousePuzzle4_Layout:: .4byte Route110_TrickHousePuzzle4_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrickHousePuzzle + diff --git a/data/layouts/Route110_TrickHousePuzzle5/layout.inc b/data/layouts/Route110_TrickHousePuzzle5/layout.inc index 06f105c71d..5e06ac31e4 100644 --- a/data/layouts/Route110_TrickHousePuzzle5/layout.inc +++ b/data/layouts/Route110_TrickHousePuzzle5/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHousePuzzle5_MapBorder:: .incbin "data/layouts/Route110_TrickHousePuzzle5/border.bin" - .align 2 Route110_TrickHousePuzzle5_MapBlockdata:: .incbin "data/layouts/Route110_TrickHousePuzzle5/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHousePuzzle5_Layout:: .4byte Route110_TrickHousePuzzle5_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrickHousePuzzle + diff --git a/data/layouts/Route110_TrickHousePuzzle6/layout.inc b/data/layouts/Route110_TrickHousePuzzle6/layout.inc index b11da0a1de..398c179516 100644 --- a/data/layouts/Route110_TrickHousePuzzle6/layout.inc +++ b/data/layouts/Route110_TrickHousePuzzle6/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHousePuzzle6_MapBorder:: .incbin "data/layouts/Route110_TrickHousePuzzle6/border.bin" - .align 2 Route110_TrickHousePuzzle6_MapBlockdata:: .incbin "data/layouts/Route110_TrickHousePuzzle6/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHousePuzzle6_Layout:: .4byte Route110_TrickHousePuzzle6_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrickHousePuzzle + diff --git a/data/layouts/Route110_TrickHousePuzzle7/layout.inc b/data/layouts/Route110_TrickHousePuzzle7/layout.inc index 8d9e88b7e5..1612ec41b5 100644 --- a/data/layouts/Route110_TrickHousePuzzle7/layout.inc +++ b/data/layouts/Route110_TrickHousePuzzle7/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHousePuzzle7_MapBorder:: .incbin "data/layouts/Route110_TrickHousePuzzle7/border.bin" - .align 2 Route110_TrickHousePuzzle7_MapBlockdata:: .incbin "data/layouts/Route110_TrickHousePuzzle7/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHousePuzzle7_Layout:: .4byte Route110_TrickHousePuzzle7_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrickHousePuzzle + diff --git a/data/layouts/Route110_TrickHousePuzzle8/layout.inc b/data/layouts/Route110_TrickHousePuzzle8/layout.inc index 139cefadcc..3520b503f7 100644 --- a/data/layouts/Route110_TrickHousePuzzle8/layout.inc +++ b/data/layouts/Route110_TrickHousePuzzle8/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHousePuzzle8_MapBorder:: .incbin "data/layouts/Route110_TrickHousePuzzle8/border.bin" - .align 2 Route110_TrickHousePuzzle8_MapBlockdata:: .incbin "data/layouts/Route110_TrickHousePuzzle8/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHousePuzzle8_Layout:: .4byte Route110_TrickHousePuzzle8_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrickHousePuzzle + diff --git a/data/layouts/Route111/layout.inc b/data/layouts/Route111/layout.inc index 911ecfcb08..2966c06c54 100644 --- a/data/layouts/Route111/layout.inc +++ b/data/layouts/Route111/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route111_MapBorder:: .incbin "data/layouts/Route111/border.bin" - .align 2 Route111_MapBlockdata:: .incbin "data/layouts/Route111/map.bin" @@ -14,3 +12,4 @@ Route111_Layout:: .4byte Route111_MapBlockdata .4byte gTileset_General .4byte gTileset_Mauville + diff --git a/data/layouts/Route112/layout.inc b/data/layouts/Route112/layout.inc index 22aae208c8..72a0c428c4 100644 --- a/data/layouts/Route112/layout.inc +++ b/data/layouts/Route112/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route112_MapBorder:: .incbin "data/layouts/Route112/border.bin" - .align 2 Route112_MapBlockdata:: .incbin "data/layouts/Route112/map.bin" @@ -14,3 +12,4 @@ Route112_Layout:: .4byte Route112_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/Route113/layout.inc b/data/layouts/Route113/layout.inc index a6a4389864..0c1d76b585 100644 --- a/data/layouts/Route113/layout.inc +++ b/data/layouts/Route113/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route113_MapBorder:: .incbin "data/layouts/Route113/border.bin" - .align 2 Route113_MapBlockdata:: .incbin "data/layouts/Route113/map.bin" @@ -14,3 +12,4 @@ Route113_Layout:: .4byte Route113_MapBlockdata .4byte gTileset_General .4byte gTileset_Fallarbor + diff --git a/data/layouts/Route114/layout.inc b/data/layouts/Route114/layout.inc index 1391ce2969..071f9e1b66 100644 --- a/data/layouts/Route114/layout.inc +++ b/data/layouts/Route114/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route114_MapBorder:: .incbin "data/layouts/Route114/border.bin" - .align 2 Route114_MapBlockdata:: .incbin "data/layouts/Route114/map.bin" @@ -14,3 +12,4 @@ Route114_Layout:: .4byte Route114_MapBlockdata .4byte gTileset_General .4byte gTileset_Fallarbor + diff --git a/data/layouts/Route114_FossilManiacsHouse/layout.inc b/data/layouts/Route114_FossilManiacsHouse/layout.inc index 3140908493..f915e572a9 100644 --- a/data/layouts/Route114_FossilManiacsHouse/layout.inc +++ b/data/layouts/Route114_FossilManiacsHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route114_FossilManiacsHouse_MapBorder:: .incbin "data/layouts/Route114_FossilManiacsHouse/border.bin" - .align 2 Route114_FossilManiacsHouse_MapBlockdata:: .incbin "data/layouts/Route114_FossilManiacsHouse/map.bin" @@ -14,3 +12,4 @@ Route114_FossilManiacsHouse_Layout:: .4byte Route114_FossilManiacsHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/Route114_FossilManiacsTunnel/layout.inc b/data/layouts/Route114_FossilManiacsTunnel/layout.inc index 90a891b57b..c2392ff01c 100644 --- a/data/layouts/Route114_FossilManiacsTunnel/layout.inc +++ b/data/layouts/Route114_FossilManiacsTunnel/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route114_FossilManiacsTunnel_MapBorder:: .incbin "data/layouts/Route114_FossilManiacsTunnel/border.bin" - .align 2 Route114_FossilManiacsTunnel_MapBlockdata:: .incbin "data/layouts/Route114_FossilManiacsTunnel/map.bin" @@ -14,3 +12,4 @@ Route114_FossilManiacsTunnel_Layout:: .4byte Route114_FossilManiacsTunnel_MapBlockdata .4byte gTileset_General .4byte gTileset_Fallarbor + diff --git a/data/layouts/Route114_LanettesHouse/layout.inc b/data/layouts/Route114_LanettesHouse/layout.inc index e1f2354c1f..be9689ae30 100644 --- a/data/layouts/Route114_LanettesHouse/layout.inc +++ b/data/layouts/Route114_LanettesHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route114_LanettesHouse_MapBorder:: .incbin "data/layouts/Route114_LanettesHouse/border.bin" - .align 2 Route114_LanettesHouse_MapBlockdata:: .incbin "data/layouts/Route114_LanettesHouse/map.bin" @@ -14,3 +12,4 @@ Route114_LanettesHouse_Layout:: .4byte Route114_LanettesHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_Lab + diff --git a/data/layouts/Route115/layout.inc b/data/layouts/Route115/layout.inc index 1a51214745..9d6c3c969b 100644 --- a/data/layouts/Route115/layout.inc +++ b/data/layouts/Route115/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route115_MapBorder:: .incbin "data/layouts/Route115/border.bin" - .align 2 Route115_MapBlockdata:: .incbin "data/layouts/Route115/map.bin" @@ -14,3 +12,4 @@ Route115_Layout:: .4byte Route115_MapBlockdata .4byte gTileset_General .4byte gTileset_Fallarbor + diff --git a/data/layouts/Route116/layout.inc b/data/layouts/Route116/layout.inc index 54471a0e09..232cc41f8a 100644 --- a/data/layouts/Route116/layout.inc +++ b/data/layouts/Route116/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route116_MapBorder:: .incbin "data/layouts/Route116/border.bin" - .align 2 Route116_MapBlockdata:: .incbin "data/layouts/Route116/map.bin" @@ -14,3 +12,4 @@ Route116_Layout:: .4byte Route116_MapBlockdata .4byte gTileset_General .4byte gTileset_Rustboro + diff --git a/data/layouts/Route116_TunnelersRestHouse/layout.inc b/data/layouts/Route116_TunnelersRestHouse/layout.inc index 4faea6ce60..1bd42eafca 100644 --- a/data/layouts/Route116_TunnelersRestHouse/layout.inc +++ b/data/layouts/Route116_TunnelersRestHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route116_TunnelersRestHouse_MapBorder:: .incbin "data/layouts/Route116_TunnelersRestHouse/border.bin" - .align 2 Route116_TunnelersRestHouse_MapBlockdata:: .incbin "data/layouts/Route116_TunnelersRestHouse/map.bin" @@ -14,3 +12,4 @@ Route116_TunnelersRestHouse_Layout:: .4byte Route116_TunnelersRestHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/Route117/layout.inc b/data/layouts/Route117/layout.inc index 75b7f0d986..25e133f28e 100644 --- a/data/layouts/Route117/layout.inc +++ b/data/layouts/Route117/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route117_MapBorder:: .incbin "data/layouts/Route117/border.bin" - .align 2 Route117_MapBlockdata:: .incbin "data/layouts/Route117/map.bin" @@ -14,3 +12,4 @@ Route117_Layout:: .4byte Route117_MapBlockdata .4byte gTileset_General .4byte gTileset_Mauville + diff --git a/data/layouts/Route117_PokemonDayCare/layout.inc b/data/layouts/Route117_PokemonDayCare/layout.inc index 0589c2d1b1..403881bfea 100644 --- a/data/layouts/Route117_PokemonDayCare/layout.inc +++ b/data/layouts/Route117_PokemonDayCare/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route117_PokemonDayCare_MapBorder:: .incbin "data/layouts/Route117_PokemonDayCare/border.bin" - .align 2 Route117_PokemonDayCare_MapBlockdata:: .incbin "data/layouts/Route117_PokemonDayCare/map.bin" @@ -14,3 +12,4 @@ Route117_PokemonDayCare_Layout:: .4byte Route117_PokemonDayCare_MapBlockdata .4byte gTileset_Building .4byte gTileset_PokemonDayCare + diff --git a/data/layouts/Route118/layout.inc b/data/layouts/Route118/layout.inc index a78bd28dea..cb87f8414e 100644 --- a/data/layouts/Route118/layout.inc +++ b/data/layouts/Route118/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route118_MapBorder:: .incbin "data/layouts/Route118/border.bin" - .align 2 Route118_MapBlockdata:: .incbin "data/layouts/Route118/map.bin" @@ -14,3 +12,4 @@ Route118_Layout:: .4byte Route118_MapBlockdata .4byte gTileset_General .4byte gTileset_Mauville + diff --git a/data/layouts/Route119/layout.inc b/data/layouts/Route119/layout.inc index 0f288c2c5a..66502fb15f 100644 --- a/data/layouts/Route119/layout.inc +++ b/data/layouts/Route119/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route119_MapBorder:: .incbin "data/layouts/Route119/border.bin" - .align 2 Route119_MapBlockdata:: .incbin "data/layouts/Route119/map.bin" @@ -14,3 +12,4 @@ Route119_Layout:: .4byte Route119_MapBlockdata .4byte gTileset_General .4byte gTileset_Fortree + diff --git a/data/layouts/Route119_WeatherInstitute_1F/layout.inc b/data/layouts/Route119_WeatherInstitute_1F/layout.inc index 35ae95d378..9637beea5c 100644 --- a/data/layouts/Route119_WeatherInstitute_1F/layout.inc +++ b/data/layouts/Route119_WeatherInstitute_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route119_WeatherInstitute_1F_MapBorder:: .incbin "data/layouts/Route119_WeatherInstitute_1F/border.bin" - .align 2 Route119_WeatherInstitute_1F_MapBlockdata:: .incbin "data/layouts/Route119_WeatherInstitute_1F/map.bin" @@ -14,3 +12,4 @@ Route119_WeatherInstitute_1F_Layout:: .4byte Route119_WeatherInstitute_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_Lab + diff --git a/data/layouts/Route119_WeatherInstitute_2F/layout.inc b/data/layouts/Route119_WeatherInstitute_2F/layout.inc index 476ebf4fae..4f0948f7be 100644 --- a/data/layouts/Route119_WeatherInstitute_2F/layout.inc +++ b/data/layouts/Route119_WeatherInstitute_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route119_WeatherInstitute_2F_MapBorder:: .incbin "data/layouts/Route119_WeatherInstitute_2F/border.bin" - .align 2 Route119_WeatherInstitute_2F_MapBlockdata:: .incbin "data/layouts/Route119_WeatherInstitute_2F/map.bin" @@ -14,3 +12,4 @@ Route119_WeatherInstitute_2F_Layout:: .4byte Route119_WeatherInstitute_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_Lab + diff --git a/data/layouts/Route120/layout.inc b/data/layouts/Route120/layout.inc index a58e60aee4..f9e9255a0f 100644 --- a/data/layouts/Route120/layout.inc +++ b/data/layouts/Route120/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route120_MapBorder:: .incbin "data/layouts/Route120/border.bin" - .align 2 Route120_MapBlockdata:: .incbin "data/layouts/Route120/map.bin" @@ -14,3 +12,4 @@ Route120_Layout:: .4byte Route120_MapBlockdata .4byte gTileset_General .4byte gTileset_Fortree + diff --git a/data/layouts/Route121/layout.inc b/data/layouts/Route121/layout.inc index 0e39c4d35a..4d2c9744a4 100644 --- a/data/layouts/Route121/layout.inc +++ b/data/layouts/Route121/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route121_MapBorder:: .incbin "data/layouts/Route121/border.bin" - .align 2 Route121_MapBlockdata:: .incbin "data/layouts/Route121/map.bin" @@ -14,3 +12,4 @@ Route121_Layout:: .4byte Route121_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/Route121_SafariZoneEntrance/layout.inc b/data/layouts/Route121_SafariZoneEntrance/layout.inc index f28d1b4dc9..38ad9e97ed 100644 --- a/data/layouts/Route121_SafariZoneEntrance/layout.inc +++ b/data/layouts/Route121_SafariZoneEntrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route121_SafariZoneEntrance_MapBorder:: .incbin "data/layouts/Route121_SafariZoneEntrance/border.bin" - .align 2 Route121_SafariZoneEntrance_MapBlockdata:: .incbin "data/layouts/Route121_SafariZoneEntrance/map.bin" @@ -14,3 +12,4 @@ Route121_SafariZoneEntrance_Layout:: .4byte Route121_SafariZoneEntrance_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/Route122/layout.inc b/data/layouts/Route122/layout.inc index 39f70e4e49..7f0baac20e 100644 --- a/data/layouts/Route122/layout.inc +++ b/data/layouts/Route122/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route122_MapBorder:: .incbin "data/layouts/Route122/border.bin" - .align 2 Route122_MapBlockdata:: .incbin "data/layouts/Route122/map.bin" @@ -14,3 +12,4 @@ Route122_Layout:: .4byte Route122_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/Route123/layout.inc b/data/layouts/Route123/layout.inc index db9093ba9f..0c76c2b7b6 100644 --- a/data/layouts/Route123/layout.inc +++ b/data/layouts/Route123/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route123_MapBorder:: .incbin "data/layouts/Route123/border.bin" - .align 2 Route123_MapBlockdata:: .incbin "data/layouts/Route123/map.bin" @@ -14,3 +12,4 @@ Route123_Layout:: .4byte Route123_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/Route124/layout.inc b/data/layouts/Route124/layout.inc index e2c9abffcb..d27ed902a5 100644 --- a/data/layouts/Route124/layout.inc +++ b/data/layouts/Route124/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route124_MapBorder:: .incbin "data/layouts/Route124/border.bin" - .align 2 Route124_MapBlockdata:: .incbin "data/layouts/Route124/map.bin" @@ -14,3 +12,4 @@ Route124_Layout:: .4byte Route124_MapBlockdata .4byte gTileset_General .4byte gTileset_Mossdeep + diff --git a/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc b/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc index 2179d72080..2635712359 100644 --- a/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc +++ b/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route124_DivingTreasureHuntersHouse_MapBorder:: .incbin "data/layouts/Route124_DivingTreasureHuntersHouse/border.bin" - .align 2 Route124_DivingTreasureHuntersHouse_MapBlockdata:: .incbin "data/layouts/Route124_DivingTreasureHuntersHouse/map.bin" @@ -14,3 +12,4 @@ Route124_DivingTreasureHuntersHouse_Layout:: .4byte Route124_DivingTreasureHuntersHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/Route125/layout.inc b/data/layouts/Route125/layout.inc index 7c894c943d..f0d4e13b73 100644 --- a/data/layouts/Route125/layout.inc +++ b/data/layouts/Route125/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route125_MapBorder:: .incbin "data/layouts/Route125/border.bin" - .align 2 Route125_MapBlockdata:: .incbin "data/layouts/Route125/map.bin" @@ -14,3 +12,4 @@ Route125_Layout:: .4byte Route125_MapBlockdata .4byte gTileset_General .4byte gTileset_Mossdeep + diff --git a/data/layouts/Route126/layout.inc b/data/layouts/Route126/layout.inc index b7f2e3e3c4..859d025a5d 100644 --- a/data/layouts/Route126/layout.inc +++ b/data/layouts/Route126/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route126_MapBorder:: .incbin "data/layouts/Route126/border.bin" - .align 2 Route126_MapBlockdata:: .incbin "data/layouts/Route126/map.bin" @@ -14,3 +12,4 @@ Route126_Layout:: .4byte Route126_MapBlockdata .4byte gTileset_General .4byte gTileset_Mossdeep + diff --git a/data/layouts/Route127/layout.inc b/data/layouts/Route127/layout.inc index 637bd29b69..767330aff8 100644 --- a/data/layouts/Route127/layout.inc +++ b/data/layouts/Route127/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route127_MapBorder:: .incbin "data/layouts/Route127/border.bin" - .align 2 Route127_MapBlockdata:: .incbin "data/layouts/Route127/map.bin" @@ -14,3 +12,4 @@ Route127_Layout:: .4byte Route127_MapBlockdata .4byte gTileset_General .4byte gTileset_Mossdeep + diff --git a/data/layouts/Route128/layout.inc b/data/layouts/Route128/layout.inc index 09265d8115..16624fa023 100644 --- a/data/layouts/Route128/layout.inc +++ b/data/layouts/Route128/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route128_MapBorder:: .incbin "data/layouts/Route128/border.bin" - .align 2 Route128_MapBlockdata:: .incbin "data/layouts/Route128/map.bin" @@ -14,3 +12,4 @@ Route128_Layout:: .4byte Route128_MapBlockdata .4byte gTileset_General .4byte gTileset_Mossdeep + diff --git a/data/layouts/Route129/layout.inc b/data/layouts/Route129/layout.inc index 926213af44..9b7d6af1de 100644 --- a/data/layouts/Route129/layout.inc +++ b/data/layouts/Route129/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route129_MapBorder:: .incbin "data/layouts/Route129/border.bin" - .align 2 Route129_MapBlockdata:: .incbin "data/layouts/Route129/map.bin" @@ -14,3 +12,4 @@ Route129_Layout:: .4byte Route129_MapBlockdata .4byte gTileset_General .4byte gTileset_Mossdeep + diff --git a/data/layouts/Route130/layout.inc b/data/layouts/Route130/layout.inc index 30a1053bf4..41db11cb41 100644 --- a/data/layouts/Route130/layout.inc +++ b/data/layouts/Route130/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route130_MapBorder:: .incbin "data/layouts/Route130/border.bin" - .align 2 Route130_MapBlockdata:: .incbin "data/layouts/Route130/map.bin" @@ -14,3 +12,4 @@ Route130_Layout:: .4byte Route130_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/Route131/layout.inc b/data/layouts/Route131/layout.inc index 0762566a8d..7fae261cc8 100644 --- a/data/layouts/Route131/layout.inc +++ b/data/layouts/Route131/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route131_MapBorder:: .incbin "data/layouts/Route131/border.bin" - .align 2 Route131_MapBlockdata:: .incbin "data/layouts/Route131/map.bin" @@ -14,3 +12,4 @@ Route131_Layout:: .4byte Route131_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/Route132/layout.inc b/data/layouts/Route132/layout.inc index 3838b85bc4..afaa7fb58b 100644 --- a/data/layouts/Route132/layout.inc +++ b/data/layouts/Route132/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route132_MapBorder:: .incbin "data/layouts/Route132/border.bin" - .align 2 Route132_MapBlockdata:: .incbin "data/layouts/Route132/map.bin" @@ -14,3 +12,4 @@ Route132_Layout:: .4byte Route132_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/Route133/layout.inc b/data/layouts/Route133/layout.inc index c380a9ca18..5ff11108b9 100644 --- a/data/layouts/Route133/layout.inc +++ b/data/layouts/Route133/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route133_MapBorder:: .incbin "data/layouts/Route133/border.bin" - .align 2 Route133_MapBlockdata:: .incbin "data/layouts/Route133/map.bin" @@ -14,3 +12,4 @@ Route133_Layout:: .4byte Route133_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/Route134/layout.inc b/data/layouts/Route134/layout.inc index 46c4ea9dc2..9eeca6cc9a 100644 --- a/data/layouts/Route134/layout.inc +++ b/data/layouts/Route134/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route134_MapBorder:: .incbin "data/layouts/Route134/border.bin" - .align 2 Route134_MapBlockdata:: .incbin "data/layouts/Route134/map.bin" @@ -14,3 +12,4 @@ Route134_Layout:: .4byte Route134_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/RustboroCity/layout.inc b/data/layouts/RustboroCity/layout.inc index e1451aff60..00c45dcc25 100644 --- a/data/layouts/RustboroCity/layout.inc +++ b/data/layouts/RustboroCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_MapBorder:: .incbin "data/layouts/RustboroCity/border.bin" - .align 2 RustboroCity_MapBlockdata:: .incbin "data/layouts/RustboroCity/map.bin" @@ -14,3 +12,4 @@ RustboroCity_Layout:: .4byte RustboroCity_MapBlockdata .4byte gTileset_General .4byte gTileset_Rustboro + diff --git a/data/layouts/RustboroCity_CuttersHouse/layout.inc b/data/layouts/RustboroCity_CuttersHouse/layout.inc index a0df178335..0c86dede9a 100644 --- a/data/layouts/RustboroCity_CuttersHouse/layout.inc +++ b/data/layouts/RustboroCity_CuttersHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_CuttersHouse_MapBorder:: .incbin "data/layouts/RustboroCity_CuttersHouse/border.bin" - .align 2 RustboroCity_CuttersHouse_MapBlockdata:: .incbin "data/layouts/RustboroCity_CuttersHouse/map.bin" @@ -14,3 +12,4 @@ RustboroCity_CuttersHouse_Layout:: .4byte RustboroCity_CuttersHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/RustboroCity_DevonCorp_1F/layout.inc b/data/layouts/RustboroCity_DevonCorp_1F/layout.inc index 6662b05c9c..dbf6b388e1 100644 --- a/data/layouts/RustboroCity_DevonCorp_1F/layout.inc +++ b/data/layouts/RustboroCity_DevonCorp_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_DevonCorp_1F_MapBorder:: .incbin "data/layouts/RustboroCity_DevonCorp_1F/border.bin" - .align 2 RustboroCity_DevonCorp_1F_MapBlockdata:: .incbin "data/layouts/RustboroCity_DevonCorp_1F/map.bin" @@ -14,3 +12,4 @@ RustboroCity_DevonCorp_1F_Layout:: .4byte RustboroCity_DevonCorp_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_Facility + diff --git a/data/layouts/RustboroCity_DevonCorp_2F/layout.inc b/data/layouts/RustboroCity_DevonCorp_2F/layout.inc index f6331ab386..34d581ae54 100644 --- a/data/layouts/RustboroCity_DevonCorp_2F/layout.inc +++ b/data/layouts/RustboroCity_DevonCorp_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_DevonCorp_2F_MapBorder:: .incbin "data/layouts/RustboroCity_DevonCorp_2F/border.bin" - .align 2 RustboroCity_DevonCorp_2F_MapBlockdata:: .incbin "data/layouts/RustboroCity_DevonCorp_2F/map.bin" @@ -14,3 +12,4 @@ RustboroCity_DevonCorp_2F_Layout:: .4byte RustboroCity_DevonCorp_2F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/RustboroCity_DevonCorp_3F/layout.inc b/data/layouts/RustboroCity_DevonCorp_3F/layout.inc index 2d265b6c8b..64c555be55 100644 --- a/data/layouts/RustboroCity_DevonCorp_3F/layout.inc +++ b/data/layouts/RustboroCity_DevonCorp_3F/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_DevonCorp_3F_MapBorder:: .incbin "data/layouts/RustboroCity_DevonCorp_3F/border.bin" - .align 2 RustboroCity_DevonCorp_3F_MapBlockdata:: .incbin "data/layouts/RustboroCity_DevonCorp_3F/map.bin" @@ -14,3 +12,4 @@ RustboroCity_DevonCorp_3F_Layout:: .4byte RustboroCity_DevonCorp_3F_MapBlockdata .4byte gTileset_Building .4byte gTileset_Facility + diff --git a/data/layouts/RustboroCity_Flat1_1F/layout.inc b/data/layouts/RustboroCity_Flat1_1F/layout.inc index fc61a42016..b904524a6f 100644 --- a/data/layouts/RustboroCity_Flat1_1F/layout.inc +++ b/data/layouts/RustboroCity_Flat1_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_Flat1_1F_MapBorder:: .incbin "data/layouts/RustboroCity_Flat1_1F/border.bin" - .align 2 RustboroCity_Flat1_1F_MapBlockdata:: .incbin "data/layouts/RustboroCity_Flat1_1F/map.bin" @@ -14,3 +12,4 @@ RustboroCity_Flat1_1F_Layout:: .4byte RustboroCity_Flat1_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/RustboroCity_Flat1_2F/layout.inc b/data/layouts/RustboroCity_Flat1_2F/layout.inc index b80a343223..aa6e3ebdf9 100644 --- a/data/layouts/RustboroCity_Flat1_2F/layout.inc +++ b/data/layouts/RustboroCity_Flat1_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_Flat1_2F_MapBorder:: .incbin "data/layouts/RustboroCity_Flat1_2F/border.bin" - .align 2 RustboroCity_Flat1_2F_MapBlockdata:: .incbin "data/layouts/RustboroCity_Flat1_2F/map.bin" @@ -14,3 +12,4 @@ RustboroCity_Flat1_2F_Layout:: .4byte RustboroCity_Flat1_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/RustboroCity_Flat2_1F/layout.inc b/data/layouts/RustboroCity_Flat2_1F/layout.inc index 55c38f906b..8e44c97b70 100644 --- a/data/layouts/RustboroCity_Flat2_1F/layout.inc +++ b/data/layouts/RustboroCity_Flat2_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_Flat2_1F_MapBorder:: .incbin "data/layouts/RustboroCity_Flat2_1F/border.bin" - .align 2 RustboroCity_Flat2_1F_MapBlockdata:: .incbin "data/layouts/RustboroCity_Flat2_1F/map.bin" @@ -14,3 +12,4 @@ RustboroCity_Flat2_1F_Layout:: .4byte RustboroCity_Flat2_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/RustboroCity_Flat2_2F/layout.inc b/data/layouts/RustboroCity_Flat2_2F/layout.inc index c099b5f9ab..ffcba8d17e 100644 --- a/data/layouts/RustboroCity_Flat2_2F/layout.inc +++ b/data/layouts/RustboroCity_Flat2_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_Flat2_2F_MapBorder:: .incbin "data/layouts/RustboroCity_Flat2_2F/border.bin" - .align 2 RustboroCity_Flat2_2F_MapBlockdata:: .incbin "data/layouts/RustboroCity_Flat2_2F/map.bin" @@ -14,3 +12,4 @@ RustboroCity_Flat2_2F_Layout:: .4byte RustboroCity_Flat2_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/RustboroCity_Flat2_3F/layout.inc b/data/layouts/RustboroCity_Flat2_3F/layout.inc index 5e938f7d69..77775b4e02 100644 --- a/data/layouts/RustboroCity_Flat2_3F/layout.inc +++ b/data/layouts/RustboroCity_Flat2_3F/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_Flat2_3F_MapBorder:: .incbin "data/layouts/RustboroCity_Flat2_3F/border.bin" - .align 2 RustboroCity_Flat2_3F_MapBlockdata:: .incbin "data/layouts/RustboroCity_Flat2_3F/map.bin" @@ -14,3 +12,4 @@ RustboroCity_Flat2_3F_Layout:: .4byte RustboroCity_Flat2_3F_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/RustboroCity_Gym/layout.inc b/data/layouts/RustboroCity_Gym/layout.inc index cd9b907fb5..8c064171bf 100644 --- a/data/layouts/RustboroCity_Gym/layout.inc +++ b/data/layouts/RustboroCity_Gym/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_Gym_MapBorder:: .incbin "data/layouts/RustboroCity_Gym/border.bin" - .align 2 RustboroCity_Gym_MapBlockdata:: .incbin "data/layouts/RustboroCity_Gym/map.bin" @@ -14,3 +12,4 @@ RustboroCity_Gym_Layout:: .4byte RustboroCity_Gym_MapBlockdata .4byte gTileset_Building .4byte gTileset_RustboroGym + diff --git a/data/layouts/RustboroCity_House/layout.inc b/data/layouts/RustboroCity_House/layout.inc index 80f658fcdf..b1b90daee9 100644 --- a/data/layouts/RustboroCity_House/layout.inc +++ b/data/layouts/RustboroCity_House/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_House_MapBorder:: .incbin "data/layouts/RustboroCity_House/border.bin" - .align 2 RustboroCity_House_MapBlockdata:: .incbin "data/layouts/RustboroCity_House/map.bin" @@ -14,3 +12,4 @@ RustboroCity_House_Layouts:: .4byte RustboroCity_House_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/RustboroCity_House1/layout.inc b/data/layouts/RustboroCity_House1/layout.inc index f88e3a80b5..27893f2fb0 100644 --- a/data/layouts/RustboroCity_House1/layout.inc +++ b/data/layouts/RustboroCity_House1/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_House1_MapBorder:: .incbin "data/layouts/RustboroCity_House1/border.bin" - .align 2 RustboroCity_House1_MapBlockdata:: .incbin "data/layouts/RustboroCity_House1/map.bin" @@ -14,3 +12,4 @@ RustboroCity_House1_Layout:: .4byte RustboroCity_House1_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/RustboroCity_PokemonSchool/layout.inc b/data/layouts/RustboroCity_PokemonSchool/layout.inc index 470baa66e7..2c4eb3977c 100644 --- a/data/layouts/RustboroCity_PokemonSchool/layout.inc +++ b/data/layouts/RustboroCity_PokemonSchool/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_PokemonSchool_MapBorder:: .incbin "data/layouts/RustboroCity_PokemonSchool/border.bin" - .align 2 RustboroCity_PokemonSchool_MapBlockdata:: .incbin "data/layouts/RustboroCity_PokemonSchool/map.bin" @@ -14,3 +12,4 @@ RustboroCity_PokemonSchool_Layout:: .4byte RustboroCity_PokemonSchool_MapBlockdata .4byte gTileset_Building .4byte gTileset_PokemonSchool + diff --git a/data/layouts/RusturfTunnel/layout.inc b/data/layouts/RusturfTunnel/layout.inc index feb5b0fc09..7a063b922c 100644 --- a/data/layouts/RusturfTunnel/layout.inc +++ b/data/layouts/RusturfTunnel/layout.inc @@ -1,8 +1,6 @@ - .align 2 RusturfTunnel_MapBorder:: .incbin "data/layouts/RusturfTunnel/border.bin" - .align 2 RusturfTunnel_MapBlockdata:: .incbin "data/layouts/RusturfTunnel/map.bin" @@ -14,3 +12,4 @@ RusturfTunnel_Layout:: .4byte RusturfTunnel_MapBlockdata .4byte gTileset_General .4byte gTileset_RusturfTunnel + diff --git a/data/layouts/SSTidalCorridor/layout.inc b/data/layouts/SSTidalCorridor/layout.inc index 8180f0a4d3..bcc034ecd9 100644 --- a/data/layouts/SSTidalCorridor/layout.inc +++ b/data/layouts/SSTidalCorridor/layout.inc @@ -1,8 +1,6 @@ - .align 2 SSTidalCorridor_MapBorder:: .incbin "data/layouts/SSTidalCorridor/border.bin" - .align 2 SSTidalCorridor_MapBlockdata:: .incbin "data/layouts/SSTidalCorridor/map.bin" @@ -14,3 +12,4 @@ SSTidalCorridor_Layout:: .4byte SSTidalCorridor_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/SSTidalLowerDeck/layout.inc b/data/layouts/SSTidalLowerDeck/layout.inc index ece1a572e4..807da09a18 100644 --- a/data/layouts/SSTidalLowerDeck/layout.inc +++ b/data/layouts/SSTidalLowerDeck/layout.inc @@ -1,8 +1,6 @@ - .align 2 SSTidalLowerDeck_MapBorder:: .incbin "data/layouts/SSTidalLowerDeck/border.bin" - .align 2 SSTidalLowerDeck_MapBlockdata:: .incbin "data/layouts/SSTidalLowerDeck/map.bin" @@ -14,3 +12,4 @@ SSTidalLowerDeck_Layout:: .4byte SSTidalLowerDeck_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/SSTidalRooms/layout.inc b/data/layouts/SSTidalRooms/layout.inc index 8cd255d8ca..e44aac53c9 100644 --- a/data/layouts/SSTidalRooms/layout.inc +++ b/data/layouts/SSTidalRooms/layout.inc @@ -1,8 +1,6 @@ - .align 2 SSTidalRooms_MapBorder:: .incbin "data/layouts/SSTidalRooms/border.bin" - .align 2 SSTidalRooms_MapBlockdata:: .incbin "data/layouts/SSTidalRooms/map.bin" @@ -14,3 +12,4 @@ SSTidalRooms_Layout:: .4byte SSTidalRooms_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/SafariZone_North/layout.inc b/data/layouts/SafariZone_North/layout.inc index f539c2cede..c6986540fe 100644 --- a/data/layouts/SafariZone_North/layout.inc +++ b/data/layouts/SafariZone_North/layout.inc @@ -1,8 +1,6 @@ - .align 2 SafariZone_North_MapBorder:: .incbin "data/layouts/SafariZone_North/border.bin" - .align 2 SafariZone_North_MapBlockdata:: .incbin "data/layouts/SafariZone_North/map.bin" @@ -14,3 +12,4 @@ SafariZone_North_Layout:: .4byte SafariZone_North_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/SafariZone_Northeast/layout.inc b/data/layouts/SafariZone_Northeast/layout.inc index 903a6c9e0c..026e4a7c76 100644 --- a/data/layouts/SafariZone_Northeast/layout.inc +++ b/data/layouts/SafariZone_Northeast/layout.inc @@ -1,8 +1,6 @@ - .align 2 SafariZone_Northeast_MapBorder:: .incbin "data/layouts/SafariZone_Northeast/border.bin" - .align 2 SafariZone_Northeast_MapBlockdata:: .incbin "data/layouts/SafariZone_Northeast/map.bin" @@ -14,3 +12,4 @@ SafariZone_Northeast_Layout:: .4byte SafariZone_Northeast_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/SafariZone_Northwest/layout.inc b/data/layouts/SafariZone_Northwest/layout.inc index 469e256178..09d8bd4829 100644 --- a/data/layouts/SafariZone_Northwest/layout.inc +++ b/data/layouts/SafariZone_Northwest/layout.inc @@ -1,8 +1,6 @@ - .align 2 SafariZone_Northwest_MapBorder:: .incbin "data/layouts/SafariZone_Northwest/border.bin" - .align 2 SafariZone_Northwest_MapBlockdata:: .incbin "data/layouts/SafariZone_Northwest/map.bin" @@ -14,3 +12,4 @@ SafariZone_Northwest_Layout:: .4byte SafariZone_Northwest_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/SafariZone_RestHouse/layout.inc b/data/layouts/SafariZone_RestHouse/layout.inc index 7cb2387190..4176cb370f 100644 --- a/data/layouts/SafariZone_RestHouse/layout.inc +++ b/data/layouts/SafariZone_RestHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 SafariZone_RestHouse_MapBorder:: .incbin "data/layouts/SafariZone_RestHouse/border.bin" - .align 2 SafariZone_RestHouse_MapBlockdata:: .incbin "data/layouts/SafariZone_RestHouse/map.bin" @@ -14,3 +12,4 @@ SafariZone_RestHouse_Layout:: .4byte SafariZone_RestHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/SafariZone_South/layout.inc b/data/layouts/SafariZone_South/layout.inc index 6431c6c014..ec83ba5b01 100644 --- a/data/layouts/SafariZone_South/layout.inc +++ b/data/layouts/SafariZone_South/layout.inc @@ -1,8 +1,6 @@ - .align 2 SafariZone_South_MapBorder:: .incbin "data/layouts/SafariZone_South/border.bin" - .align 2 SafariZone_South_MapBlockdata:: .incbin "data/layouts/SafariZone_South/map.bin" @@ -14,3 +12,4 @@ SafariZone_South_Layout:: .4byte SafariZone_South_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/SafariZone_Southeast/layout.inc b/data/layouts/SafariZone_Southeast/layout.inc index 450efcd07b..e55309b46a 100644 --- a/data/layouts/SafariZone_Southeast/layout.inc +++ b/data/layouts/SafariZone_Southeast/layout.inc @@ -1,8 +1,6 @@ - .align 2 SafariZone_Southeast_MapBorder:: .incbin "data/layouts/SafariZone_Southeast/border.bin" - .align 2 SafariZone_Southeast_MapBlockdata:: .incbin "data/layouts/SafariZone_Southeast/map.bin" @@ -14,3 +12,4 @@ SafariZone_Southeast_Layout:: .4byte SafariZone_Southeast_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/SafariZone_Southwest/layout.inc b/data/layouts/SafariZone_Southwest/layout.inc index 559736b9f7..1236d4d4bf 100644 --- a/data/layouts/SafariZone_Southwest/layout.inc +++ b/data/layouts/SafariZone_Southwest/layout.inc @@ -1,8 +1,6 @@ - .align 2 SafariZone_Southwest_MapBorder:: .incbin "data/layouts/SafariZone_Southwest/border.bin" - .align 2 SafariZone_Southwest_MapBlockdata:: .incbin "data/layouts/SafariZone_Southwest/map.bin" @@ -14,3 +12,4 @@ SafariZone_Southwest_Layout:: .4byte SafariZone_Southwest_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/ScorchedSlab/layout.inc b/data/layouts/ScorchedSlab/layout.inc index e9f30c74c5..897d873abe 100644 --- a/data/layouts/ScorchedSlab/layout.inc +++ b/data/layouts/ScorchedSlab/layout.inc @@ -1,8 +1,6 @@ - .align 2 ScorchedSlab_MapBorder:: .incbin "data/layouts/ScorchedSlab/border.bin" - .align 2 ScorchedSlab_MapBlockdata:: .incbin "data/layouts/ScorchedSlab/map.bin" @@ -14,3 +12,4 @@ ScorchedSlab_Layout:: .4byte ScorchedSlab_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SeafloorCavern_Entrance/layout.inc b/data/layouts/SeafloorCavern_Entrance/layout.inc index eaed336bca..1d6ce495b6 100644 --- a/data/layouts/SeafloorCavern_Entrance/layout.inc +++ b/data/layouts/SeafloorCavern_Entrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Entrance_MapBorder:: .incbin "data/layouts/SeafloorCavern_Entrance/border.bin" - .align 2 SeafloorCavern_Entrance_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Entrance/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Entrance_Layout:: .4byte SeafloorCavern_Entrance_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SeafloorCavern_Room1/layout.inc b/data/layouts/SeafloorCavern_Room1/layout.inc index 6deb54493a..7f7cf0570d 100644 --- a/data/layouts/SeafloorCavern_Room1/layout.inc +++ b/data/layouts/SeafloorCavern_Room1/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Room1_MapBorder:: .incbin "data/layouts/SeafloorCavern_Room1/border.bin" - .align 2 SeafloorCavern_Room1_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Room1/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Room1_Layout:: .4byte SeafloorCavern_Room1_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SeafloorCavern_Room2/layout.inc b/data/layouts/SeafloorCavern_Room2/layout.inc index c0dfdcedcf..89f4e6a792 100644 --- a/data/layouts/SeafloorCavern_Room2/layout.inc +++ b/data/layouts/SeafloorCavern_Room2/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Room2_MapBorder:: .incbin "data/layouts/SeafloorCavern_Room2/border.bin" - .align 2 SeafloorCavern_Room2_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Room2/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Room2_Layout:: .4byte SeafloorCavern_Room2_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SeafloorCavern_Room3/layout.inc b/data/layouts/SeafloorCavern_Room3/layout.inc index 58ce10cdf7..070842a9f5 100644 --- a/data/layouts/SeafloorCavern_Room3/layout.inc +++ b/data/layouts/SeafloorCavern_Room3/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Room3_MapBorder:: .incbin "data/layouts/SeafloorCavern_Room3/border.bin" - .align 2 SeafloorCavern_Room3_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Room3/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Room3_Layout:: .4byte SeafloorCavern_Room3_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SeafloorCavern_Room4/layout.inc b/data/layouts/SeafloorCavern_Room4/layout.inc index f4ff113ff1..6c984109df 100644 --- a/data/layouts/SeafloorCavern_Room4/layout.inc +++ b/data/layouts/SeafloorCavern_Room4/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Room4_MapBorder:: .incbin "data/layouts/SeafloorCavern_Room4/border.bin" - .align 2 SeafloorCavern_Room4_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Room4/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Room4_Layout:: .4byte SeafloorCavern_Room4_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SeafloorCavern_Room5/layout.inc b/data/layouts/SeafloorCavern_Room5/layout.inc index 69218f64b2..c48b00dbaa 100644 --- a/data/layouts/SeafloorCavern_Room5/layout.inc +++ b/data/layouts/SeafloorCavern_Room5/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Room5_MapBorder:: .incbin "data/layouts/SeafloorCavern_Room5/border.bin" - .align 2 SeafloorCavern_Room5_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Room5/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Room5_Layout:: .4byte SeafloorCavern_Room5_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SeafloorCavern_Room6/layout.inc b/data/layouts/SeafloorCavern_Room6/layout.inc index d18506d6bb..f729d0b1b2 100644 --- a/data/layouts/SeafloorCavern_Room6/layout.inc +++ b/data/layouts/SeafloorCavern_Room6/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Room6_MapBorder:: .incbin "data/layouts/SeafloorCavern_Room6/border.bin" - .align 2 SeafloorCavern_Room6_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Room6/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Room6_Layout:: .4byte SeafloorCavern_Room6_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/SeafloorCavern_Room7/layout.inc b/data/layouts/SeafloorCavern_Room7/layout.inc index 6e953c06e7..784b9bbb95 100644 --- a/data/layouts/SeafloorCavern_Room7/layout.inc +++ b/data/layouts/SeafloorCavern_Room7/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Room7_MapBorder:: .incbin "data/layouts/SeafloorCavern_Room7/border.bin" - .align 2 SeafloorCavern_Room7_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Room7/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Room7_Layout:: .4byte SeafloorCavern_Room7_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/SeafloorCavern_Room8/layout.inc b/data/layouts/SeafloorCavern_Room8/layout.inc index 1a0477b686..8f3d826c77 100644 --- a/data/layouts/SeafloorCavern_Room8/layout.inc +++ b/data/layouts/SeafloorCavern_Room8/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Room8_MapBorder:: .incbin "data/layouts/SeafloorCavern_Room8/border.bin" - .align 2 SeafloorCavern_Room8_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Room8/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Room8_Layout:: .4byte SeafloorCavern_Room8_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SeafloorCavern_Room9/layout.inc b/data/layouts/SeafloorCavern_Room9/layout.inc index 115db570bf..a5039da8f3 100644 --- a/data/layouts/SeafloorCavern_Room9/layout.inc +++ b/data/layouts/SeafloorCavern_Room9/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Room9_MapBorder:: .incbin "data/layouts/SeafloorCavern_Room9/border.bin" - .align 2 SeafloorCavern_Room9_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Room9/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Room9_Layout:: .4byte SeafloorCavern_Room9_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SealedChamber_InnerRoom/layout.inc b/data/layouts/SealedChamber_InnerRoom/layout.inc index 3de6298e26..7a064d5f0c 100644 --- a/data/layouts/SealedChamber_InnerRoom/layout.inc +++ b/data/layouts/SealedChamber_InnerRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 SealedChamber_InnerRoom_MapBorder:: .incbin "data/layouts/SealedChamber_InnerRoom/border.bin" - .align 2 SealedChamber_InnerRoom_MapBlockdata:: .incbin "data/layouts/SealedChamber_InnerRoom/map.bin" @@ -14,3 +12,4 @@ SealedChamber_InnerRoom_Layout:: .4byte SealedChamber_InnerRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SealedChamber_OuterRoom/layout.inc b/data/layouts/SealedChamber_OuterRoom/layout.inc index b966d00efd..bc6afaf291 100644 --- a/data/layouts/SealedChamber_OuterRoom/layout.inc +++ b/data/layouts/SealedChamber_OuterRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 SealedChamber_OuterRoom_MapBorder:: .incbin "data/layouts/SealedChamber_OuterRoom/border.bin" - .align 2 SealedChamber_OuterRoom_MapBlockdata:: .incbin "data/layouts/SealedChamber_OuterRoom/map.bin" @@ -14,3 +12,4 @@ SealedChamber_OuterRoom_Layout:: .4byte SealedChamber_OuterRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SecretBase_BlueCave1/layout.inc b/data/layouts/SecretBase_BlueCave1/layout.inc index 7e3110f483..ec138440a4 100644 --- a/data/layouts/SecretBase_BlueCave1/layout.inc +++ b/data/layouts/SecretBase_BlueCave1/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_BlueCave1_MapBorder:: .incbin "data/layouts/SecretBase_BlueCave1/border.bin" - .align 2 SecretBase_BlueCave1_MapBlockdata:: .incbin "data/layouts/SecretBase_BlueCave1/map.bin" @@ -14,3 +12,4 @@ SecretBase_BlueCave1_Layout:: .4byte SecretBase_BlueCave1_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBlueCave + diff --git a/data/layouts/SecretBase_BlueCave2/layout.inc b/data/layouts/SecretBase_BlueCave2/layout.inc index 7a32288323..8c2b48661e 100644 --- a/data/layouts/SecretBase_BlueCave2/layout.inc +++ b/data/layouts/SecretBase_BlueCave2/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_BlueCave2_MapBorder:: .incbin "data/layouts/SecretBase_BlueCave2/border.bin" - .align 2 SecretBase_BlueCave2_MapBlockdata:: .incbin "data/layouts/SecretBase_BlueCave2/map.bin" @@ -14,3 +12,4 @@ SecretBase_BlueCave2_Layout:: .4byte SecretBase_BlueCave2_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBlueCave + diff --git a/data/layouts/SecretBase_BlueCave3/layout.inc b/data/layouts/SecretBase_BlueCave3/layout.inc index a1921a475b..0ac8bee1be 100644 --- a/data/layouts/SecretBase_BlueCave3/layout.inc +++ b/data/layouts/SecretBase_BlueCave3/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_BlueCave3_MapBorder:: .incbin "data/layouts/SecretBase_BlueCave3/border.bin" - .align 2 SecretBase_BlueCave3_MapBlockdata:: .incbin "data/layouts/SecretBase_BlueCave3/map.bin" @@ -14,3 +12,4 @@ SecretBase_BlueCave3_Layout:: .4byte SecretBase_BlueCave3_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBlueCave + diff --git a/data/layouts/SecretBase_BlueCave4/layout.inc b/data/layouts/SecretBase_BlueCave4/layout.inc index 81509d18cf..d0e5ed45fa 100644 --- a/data/layouts/SecretBase_BlueCave4/layout.inc +++ b/data/layouts/SecretBase_BlueCave4/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_BlueCave4_MapBorder:: .incbin "data/layouts/SecretBase_BlueCave4/border.bin" - .align 2 SecretBase_BlueCave4_MapBlockdata:: .incbin "data/layouts/SecretBase_BlueCave4/map.bin" @@ -14,3 +12,4 @@ SecretBase_BlueCave4_Layout:: .4byte SecretBase_BlueCave4_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBlueCave + diff --git a/data/layouts/SecretBase_BrownCave1/layout.inc b/data/layouts/SecretBase_BrownCave1/layout.inc index e1bec323ac..9044fd6d1e 100644 --- a/data/layouts/SecretBase_BrownCave1/layout.inc +++ b/data/layouts/SecretBase_BrownCave1/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_BrownCave1_MapBorder:: .incbin "data/layouts/SecretBase_BrownCave1/border.bin" - .align 2 SecretBase_BrownCave1_MapBlockdata:: .incbin "data/layouts/SecretBase_BrownCave1/map.bin" @@ -14,3 +12,4 @@ SecretBase_BrownCave1_Layout:: .4byte SecretBase_BrownCave1_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBrownCave + diff --git a/data/layouts/SecretBase_BrownCave2/layout.inc b/data/layouts/SecretBase_BrownCave2/layout.inc index 52d5952125..7cfb9573ba 100644 --- a/data/layouts/SecretBase_BrownCave2/layout.inc +++ b/data/layouts/SecretBase_BrownCave2/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_BrownCave2_MapBorder:: .incbin "data/layouts/SecretBase_BrownCave2/border.bin" - .align 2 SecretBase_BrownCave2_MapBlockdata:: .incbin "data/layouts/SecretBase_BrownCave2/map.bin" @@ -14,3 +12,4 @@ SecretBase_BrownCave2_Layout:: .4byte SecretBase_BrownCave2_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBrownCave + diff --git a/data/layouts/SecretBase_BrownCave3/layout.inc b/data/layouts/SecretBase_BrownCave3/layout.inc index 4fa22e613b..5ad1bf5269 100644 --- a/data/layouts/SecretBase_BrownCave3/layout.inc +++ b/data/layouts/SecretBase_BrownCave3/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_BrownCave3_MapBorder:: .incbin "data/layouts/SecretBase_BrownCave3/border.bin" - .align 2 SecretBase_BrownCave3_MapBlockdata:: .incbin "data/layouts/SecretBase_BrownCave3/map.bin" @@ -14,3 +12,4 @@ SecretBase_BrownCave3_Layout:: .4byte SecretBase_BrownCave3_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBrownCave + diff --git a/data/layouts/SecretBase_BrownCave4/layout.inc b/data/layouts/SecretBase_BrownCave4/layout.inc index 65566a482f..6094a38322 100644 --- a/data/layouts/SecretBase_BrownCave4/layout.inc +++ b/data/layouts/SecretBase_BrownCave4/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_BrownCave4_MapBorder:: .incbin "data/layouts/SecretBase_BrownCave4/border.bin" - .align 2 SecretBase_BrownCave4_MapBlockdata:: .incbin "data/layouts/SecretBase_BrownCave4/map.bin" @@ -14,3 +12,4 @@ SecretBase_BrownCave4_Layout:: .4byte SecretBase_BrownCave4_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBrownCave + diff --git a/data/layouts/SecretBase_RedCave1/layout.inc b/data/layouts/SecretBase_RedCave1/layout.inc index f9dcde8805..a4664d5098 100644 --- a/data/layouts/SecretBase_RedCave1/layout.inc +++ b/data/layouts/SecretBase_RedCave1/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_RedCave1_MapBorder:: .incbin "data/layouts/SecretBase_RedCave1/border.bin" - .align 2 SecretBase_RedCave1_MapBlockdata:: .incbin "data/layouts/SecretBase_RedCave1/map.bin" @@ -14,3 +12,4 @@ SecretBase_RedCave1_Layout:: .4byte SecretBase_RedCave1_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseRedCave + diff --git a/data/layouts/SecretBase_RedCave2/layout.inc b/data/layouts/SecretBase_RedCave2/layout.inc index 667a744ad7..7999395d85 100644 --- a/data/layouts/SecretBase_RedCave2/layout.inc +++ b/data/layouts/SecretBase_RedCave2/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_RedCave2_MapBorder:: .incbin "data/layouts/SecretBase_RedCave2/border.bin" - .align 2 SecretBase_RedCave2_MapBlockdata:: .incbin "data/layouts/SecretBase_RedCave2/map.bin" @@ -14,3 +12,4 @@ SecretBase_RedCave2_Layout:: .4byte SecretBase_RedCave2_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseRedCave + diff --git a/data/layouts/SecretBase_RedCave3/layout.inc b/data/layouts/SecretBase_RedCave3/layout.inc index 39a079d2be..6a3cc123b6 100644 --- a/data/layouts/SecretBase_RedCave3/layout.inc +++ b/data/layouts/SecretBase_RedCave3/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_RedCave3_MapBorder:: .incbin "data/layouts/SecretBase_RedCave3/border.bin" - .align 2 SecretBase_RedCave3_MapBlockdata:: .incbin "data/layouts/SecretBase_RedCave3/map.bin" @@ -14,3 +12,4 @@ SecretBase_RedCave3_Layout:: .4byte SecretBase_RedCave3_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseRedCave + diff --git a/data/layouts/SecretBase_RedCave4/layout.inc b/data/layouts/SecretBase_RedCave4/layout.inc index 890c1c3b5f..665f44709c 100644 --- a/data/layouts/SecretBase_RedCave4/layout.inc +++ b/data/layouts/SecretBase_RedCave4/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_RedCave4_MapBorder:: .incbin "data/layouts/SecretBase_RedCave4/border.bin" - .align 2 SecretBase_RedCave4_MapBlockdata:: .incbin "data/layouts/SecretBase_RedCave4/map.bin" @@ -14,3 +12,4 @@ SecretBase_RedCave4_Layout:: .4byte SecretBase_RedCave4_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseRedCave + diff --git a/data/layouts/SecretBase_Shrub1/layout.inc b/data/layouts/SecretBase_Shrub1/layout.inc index 835028c64a..2bcc9f58a5 100644 --- a/data/layouts/SecretBase_Shrub1/layout.inc +++ b/data/layouts/SecretBase_Shrub1/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_Shrub1_MapBorder:: .incbin "data/layouts/SecretBase_Shrub1/border.bin" - .align 2 SecretBase_Shrub1_MapBlockdata:: .incbin "data/layouts/SecretBase_Shrub1/map.bin" @@ -14,3 +12,4 @@ SecretBase_Shrub1_Layout:: .4byte SecretBase_Shrub1_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseShrub + diff --git a/data/layouts/SecretBase_Shrub2/layout.inc b/data/layouts/SecretBase_Shrub2/layout.inc index cd1fe61196..e94376c3b9 100644 --- a/data/layouts/SecretBase_Shrub2/layout.inc +++ b/data/layouts/SecretBase_Shrub2/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_Shrub2_MapBorder:: .incbin "data/layouts/SecretBase_Shrub2/border.bin" - .align 2 SecretBase_Shrub2_MapBlockdata:: .incbin "data/layouts/SecretBase_Shrub2/map.bin" @@ -14,3 +12,4 @@ SecretBase_Shrub2_Layout:: .4byte SecretBase_Shrub2_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseShrub + diff --git a/data/layouts/SecretBase_Shrub3/layout.inc b/data/layouts/SecretBase_Shrub3/layout.inc index 721df1201d..449f1a11f0 100644 --- a/data/layouts/SecretBase_Shrub3/layout.inc +++ b/data/layouts/SecretBase_Shrub3/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_Shrub3_MapBorder:: .incbin "data/layouts/SecretBase_Shrub3/border.bin" - .align 2 SecretBase_Shrub3_MapBlockdata:: .incbin "data/layouts/SecretBase_Shrub3/map.bin" @@ -14,3 +12,4 @@ SecretBase_Shrub3_Layout:: .4byte SecretBase_Shrub3_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseShrub + diff --git a/data/layouts/SecretBase_Shrub4/layout.inc b/data/layouts/SecretBase_Shrub4/layout.inc index 71a2495adb..139a820503 100644 --- a/data/layouts/SecretBase_Shrub4/layout.inc +++ b/data/layouts/SecretBase_Shrub4/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_Shrub4_MapBorder:: .incbin "data/layouts/SecretBase_Shrub4/border.bin" - .align 2 SecretBase_Shrub4_MapBlockdata:: .incbin "data/layouts/SecretBase_Shrub4/map.bin" @@ -14,3 +12,4 @@ SecretBase_Shrub4_Layout:: .4byte SecretBase_Shrub4_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseShrub + diff --git a/data/layouts/SecretBase_Tree1/layout.inc b/data/layouts/SecretBase_Tree1/layout.inc index 45889b4497..73e6e41a61 100644 --- a/data/layouts/SecretBase_Tree1/layout.inc +++ b/data/layouts/SecretBase_Tree1/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_Tree1_MapBorder:: .incbin "data/layouts/SecretBase_Tree1/border.bin" - .align 2 SecretBase_Tree1_MapBlockdata:: .incbin "data/layouts/SecretBase_Tree1/map.bin" @@ -14,3 +12,4 @@ SecretBase_Tree1_Layout:: .4byte SecretBase_Tree1_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseTree + diff --git a/data/layouts/SecretBase_Tree2/layout.inc b/data/layouts/SecretBase_Tree2/layout.inc index ca1106b26c..95b122220d 100644 --- a/data/layouts/SecretBase_Tree2/layout.inc +++ b/data/layouts/SecretBase_Tree2/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_Tree2_MapBorder:: .incbin "data/layouts/SecretBase_Tree2/border.bin" - .align 2 SecretBase_Tree2_MapBlockdata:: .incbin "data/layouts/SecretBase_Tree2/map.bin" @@ -14,3 +12,4 @@ SecretBase_Tree2_Layout:: .4byte SecretBase_Tree2_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseTree + diff --git a/data/layouts/SecretBase_Tree3/layout.inc b/data/layouts/SecretBase_Tree3/layout.inc index 28a4ecbcc1..66716a4045 100644 --- a/data/layouts/SecretBase_Tree3/layout.inc +++ b/data/layouts/SecretBase_Tree3/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_Tree3_MapBorder:: .incbin "data/layouts/SecretBase_Tree3/border.bin" - .align 2 SecretBase_Tree3_MapBlockdata:: .incbin "data/layouts/SecretBase_Tree3/map.bin" @@ -14,3 +12,4 @@ SecretBase_Tree3_Layout:: .4byte SecretBase_Tree3_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseTree + diff --git a/data/layouts/SecretBase_Tree4/layout.inc b/data/layouts/SecretBase_Tree4/layout.inc index 6f869a74e3..20d4c3e018 100644 --- a/data/layouts/SecretBase_Tree4/layout.inc +++ b/data/layouts/SecretBase_Tree4/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_Tree4_MapBorder:: .incbin "data/layouts/SecretBase_Tree4/border.bin" - .align 2 SecretBase_Tree4_MapBlockdata:: .incbin "data/layouts/SecretBase_Tree4/map.bin" @@ -14,3 +12,4 @@ SecretBase_Tree4_Layout:: .4byte SecretBase_Tree4_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseTree + diff --git a/data/layouts/SecretBase_YellowCave1/layout.inc b/data/layouts/SecretBase_YellowCave1/layout.inc index d34c182c3d..7fa3aa8237 100644 --- a/data/layouts/SecretBase_YellowCave1/layout.inc +++ b/data/layouts/SecretBase_YellowCave1/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_YellowCave1_MapBorder:: .incbin "data/layouts/SecretBase_YellowCave1/border.bin" - .align 2 SecretBase_YellowCave1_MapBlockdata:: .incbin "data/layouts/SecretBase_YellowCave1/map.bin" @@ -14,3 +12,4 @@ SecretBase_YellowCave1_Layout:: .4byte SecretBase_YellowCave1_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseYellowCave + diff --git a/data/layouts/SecretBase_YellowCave2/layout.inc b/data/layouts/SecretBase_YellowCave2/layout.inc index fc58138580..0ae872e081 100644 --- a/data/layouts/SecretBase_YellowCave2/layout.inc +++ b/data/layouts/SecretBase_YellowCave2/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_YellowCave2_MapBorder:: .incbin "data/layouts/SecretBase_YellowCave2/border.bin" - .align 2 SecretBase_YellowCave2_MapBlockdata:: .incbin "data/layouts/SecretBase_YellowCave2/map.bin" @@ -14,3 +12,4 @@ SecretBase_YellowCave2_Layout:: .4byte SecretBase_YellowCave2_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseYellowCave + diff --git a/data/layouts/SecretBase_YellowCave3/layout.inc b/data/layouts/SecretBase_YellowCave3/layout.inc index 005af813a3..f42d889208 100644 --- a/data/layouts/SecretBase_YellowCave3/layout.inc +++ b/data/layouts/SecretBase_YellowCave3/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_YellowCave3_MapBorder:: .incbin "data/layouts/SecretBase_YellowCave3/border.bin" - .align 2 SecretBase_YellowCave3_MapBlockdata:: .incbin "data/layouts/SecretBase_YellowCave3/map.bin" @@ -14,3 +12,4 @@ SecretBase_YellowCave3_Layout:: .4byte SecretBase_YellowCave3_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseYellowCave + diff --git a/data/layouts/SecretBase_YellowCave4/layout.inc b/data/layouts/SecretBase_YellowCave4/layout.inc index 5dfaa435cc..b7a11df5a3 100644 --- a/data/layouts/SecretBase_YellowCave4/layout.inc +++ b/data/layouts/SecretBase_YellowCave4/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_YellowCave4_MapBorder:: .incbin "data/layouts/SecretBase_YellowCave4/border.bin" - .align 2 SecretBase_YellowCave4_MapBlockdata:: .incbin "data/layouts/SecretBase_YellowCave4/map.bin" @@ -14,3 +12,4 @@ SecretBase_YellowCave4_Layout:: .4byte SecretBase_YellowCave4_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseYellowCave + diff --git a/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc b/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc index 43df2d4956..a52425e15c 100644 --- a/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc +++ b/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 ShoalCave_HighTideEntranceRoom_MapBorder:: .incbin "data/layouts/ShoalCave_HighTideEntranceRoom/border.bin" - .align 2 ShoalCave_HighTideEntranceRoom_MapBlockdata:: .incbin "data/layouts/ShoalCave_HighTideEntranceRoom/map.bin" @@ -14,3 +12,4 @@ ShoalCave_HighTideEntranceRoom_Layout:: .4byte ShoalCave_HighTideEntranceRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc b/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc index 22fde10c60..2d323b9e07 100644 --- a/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc +++ b/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 ShoalCave_HighTideInnerRoom_MapBorder:: .incbin "data/layouts/ShoalCave_HighTideInnerRoom/border.bin" - .align 2 ShoalCave_HighTideInnerRoom_MapBlockdata:: .incbin "data/layouts/ShoalCave_HighTideInnerRoom/map.bin" @@ -14,3 +12,4 @@ ShoalCave_HighTideInnerRoom_Layout:: .4byte ShoalCave_HighTideInnerRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc b/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc index c471d40ed5..0a1eee113e 100644 --- a/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc +++ b/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 ShoalCave_LowTideEntranceRoom_MapBorder:: .incbin "data/layouts/ShoalCave_LowTideEntranceRoom/border.bin" - .align 2 ShoalCave_LowTideEntranceRoom_MapBlockdata:: .incbin "data/layouts/ShoalCave_LowTideEntranceRoom/map.bin" @@ -14,3 +12,4 @@ ShoalCave_LowTideEntranceRoom_Layout:: .4byte ShoalCave_LowTideEntranceRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/ShoalCave_LowTideIceRoom/layout.inc b/data/layouts/ShoalCave_LowTideIceRoom/layout.inc index 3dea1135c4..6d7a515750 100644 --- a/data/layouts/ShoalCave_LowTideIceRoom/layout.inc +++ b/data/layouts/ShoalCave_LowTideIceRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 ShoalCave_LowTideIceRoom_MapBorder:: .incbin "data/layouts/ShoalCave_LowTideIceRoom/border.bin" - .align 2 ShoalCave_LowTideIceRoom_MapBlockdata:: .incbin "data/layouts/ShoalCave_LowTideIceRoom/map.bin" @@ -14,3 +12,4 @@ ShoalCave_LowTideIceRoom_Layout:: .4byte ShoalCave_LowTideIceRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc b/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc index 090a783c43..f66fc97239 100644 --- a/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc +++ b/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 ShoalCave_LowTideInnerRoom_MapBorder:: .incbin "data/layouts/ShoalCave_LowTideInnerRoom/border.bin" - .align 2 ShoalCave_LowTideInnerRoom_MapBlockdata:: .incbin "data/layouts/ShoalCave_LowTideInnerRoom/map.bin" @@ -14,3 +12,4 @@ ShoalCave_LowTideInnerRoom_Layout:: .4byte ShoalCave_LowTideInnerRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc b/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc index 364c026b2f..79cc82e8c8 100644 --- a/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc +++ b/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 ShoalCave_LowTideLowerRoom_MapBorder:: .incbin "data/layouts/ShoalCave_LowTideLowerRoom/border.bin" - .align 2 ShoalCave_LowTideLowerRoom_MapBlockdata:: .incbin "data/layouts/ShoalCave_LowTideLowerRoom/map.bin" @@ -14,3 +12,4 @@ ShoalCave_LowTideLowerRoom_Layout:: .4byte ShoalCave_LowTideLowerRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc b/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc index 4195e34d8b..62dbff40ee 100644 --- a/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc +++ b/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 ShoalCave_LowTideStairsRoom_MapBorder:: .incbin "data/layouts/ShoalCave_LowTideStairsRoom/border.bin" - .align 2 ShoalCave_LowTideStairsRoom_MapBlockdata:: .incbin "data/layouts/ShoalCave_LowTideStairsRoom/map.bin" @@ -14,3 +12,4 @@ ShoalCave_LowTideStairsRoom_Layout:: .4byte ShoalCave_LowTideStairsRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SingleBattleColosseum/layout.inc b/data/layouts/SingleBattleColosseum/layout.inc index 59ec3c3c78..f42855de8a 100644 --- a/data/layouts/SingleBattleColosseum/layout.inc +++ b/data/layouts/SingleBattleColosseum/layout.inc @@ -1,8 +1,6 @@ - .align 2 SingleBattleColosseum_MapBorder:: .incbin "data/layouts/SingleBattleColosseum/border.bin" - .align 2 SingleBattleColosseum_MapBlockdata:: .incbin "data/layouts/SingleBattleColosseum/map.bin" @@ -14,3 +12,4 @@ SingleBattleColosseum_Layout:: .4byte SingleBattleColosseum_MapBlockdata .4byte gTileset_Building .4byte gTileset_CableClub + diff --git a/data/layouts/SkyPillar_1F/layout.inc b/data/layouts/SkyPillar_1F/layout.inc index e0f3550ed0..235f049352 100644 --- a/data/layouts/SkyPillar_1F/layout.inc +++ b/data/layouts/SkyPillar_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SkyPillar_1F_MapBorder:: .incbin "data/layouts/SkyPillar_1F/border.bin" - .align 2 SkyPillar_1F_MapBlockdata:: .incbin "data/layouts/SkyPillar_1F/map.bin" @@ -14,3 +12,4 @@ SkyPillar_1F_Layout:: .4byte SkyPillar_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/SkyPillar_2F/layout.inc b/data/layouts/SkyPillar_2F/layout.inc index 2ce0b52807..368fcd518e 100644 --- a/data/layouts/SkyPillar_2F/layout.inc +++ b/data/layouts/SkyPillar_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SkyPillar_2F_MapBorder:: .incbin "data/layouts/SkyPillar_2F/border.bin" - .align 2 SkyPillar_2F_MapBlockdata:: .incbin "data/layouts/SkyPillar_2F/map.bin" @@ -14,3 +12,4 @@ SkyPillar_2F_Layout:: .4byte SkyPillar_2F_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/SkyPillar_3F/layout.inc b/data/layouts/SkyPillar_3F/layout.inc index 0bf2ad939e..32ac95143a 100644 --- a/data/layouts/SkyPillar_3F/layout.inc +++ b/data/layouts/SkyPillar_3F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SkyPillar_3F_MapBorder:: .incbin "data/layouts/SkyPillar_3F/border.bin" - .align 2 SkyPillar_3F_MapBlockdata:: .incbin "data/layouts/SkyPillar_3F/map.bin" @@ -14,3 +12,4 @@ SkyPillar_3F_Layout:: .4byte SkyPillar_3F_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/SkyPillar_4F/layout.inc b/data/layouts/SkyPillar_4F/layout.inc index 35b7b61d1d..055abf133c 100644 --- a/data/layouts/SkyPillar_4F/layout.inc +++ b/data/layouts/SkyPillar_4F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SkyPillar_4F_MapBorder:: .incbin "data/layouts/SkyPillar_4F/border.bin" - .align 2 SkyPillar_4F_MapBlockdata:: .incbin "data/layouts/SkyPillar_4F/map.bin" @@ -14,3 +12,4 @@ SkyPillar_4F_Layout:: .4byte SkyPillar_4F_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/SkyPillar_5F/layout.inc b/data/layouts/SkyPillar_5F/layout.inc index dbef0083e6..3f3bb5bc10 100644 --- a/data/layouts/SkyPillar_5F/layout.inc +++ b/data/layouts/SkyPillar_5F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SkyPillar_5F_MapBorder:: .incbin "data/layouts/SkyPillar_5F/border.bin" - .align 2 SkyPillar_5F_MapBlockdata:: .incbin "data/layouts/SkyPillar_5F/map.bin" @@ -14,3 +12,4 @@ SkyPillar_5F_Layout:: .4byte SkyPillar_5F_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/SkyPillar_Entrance/layout.inc b/data/layouts/SkyPillar_Entrance/layout.inc index ed0d1dedd6..1313bd196f 100644 --- a/data/layouts/SkyPillar_Entrance/layout.inc +++ b/data/layouts/SkyPillar_Entrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 SkyPillar_Entrance_MapBorder:: .incbin "data/layouts/SkyPillar_Entrance/border.bin" - .align 2 SkyPillar_Entrance_MapBlockdata:: .incbin "data/layouts/SkyPillar_Entrance/map.bin" @@ -14,3 +12,4 @@ SkyPillar_Entrance_Layout:: .4byte SkyPillar_Entrance_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SkyPillar_Outside/layout.inc b/data/layouts/SkyPillar_Outside/layout.inc index ae4184ea97..5eb9df563b 100644 --- a/data/layouts/SkyPillar_Outside/layout.inc +++ b/data/layouts/SkyPillar_Outside/layout.inc @@ -1,8 +1,6 @@ - .align 2 SkyPillar_Outside_MapBorder:: .incbin "data/layouts/SkyPillar_Outside/border.bin" - .align 2 SkyPillar_Outside_MapBlockdata:: .incbin "data/layouts/SkyPillar_Outside/map.bin" @@ -14,3 +12,4 @@ SkyPillar_Outside_Layout:: .4byte SkyPillar_Outside_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/SkyPillar_Top/layout.inc b/data/layouts/SkyPillar_Top/layout.inc index f9e7f24a44..646c6f95f8 100644 --- a/data/layouts/SkyPillar_Top/layout.inc +++ b/data/layouts/SkyPillar_Top/layout.inc @@ -1,8 +1,6 @@ - .align 2 SkyPillar_Top_MapBorder:: .incbin "data/layouts/SkyPillar_Top/border.bin" - .align 2 SkyPillar_Top_MapBlockdata:: .incbin "data/layouts/SkyPillar_Top/map.bin" @@ -14,3 +12,4 @@ SkyPillar_Top_Layout:: .4byte SkyPillar_Top_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/SlateportCity/layout.inc b/data/layouts/SlateportCity/layout.inc index 5cc1b12760..dfa184764d 100644 --- a/data/layouts/SlateportCity/layout.inc +++ b/data/layouts/SlateportCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 SlateportCity_MapBorder:: .incbin "data/layouts/SlateportCity/border.bin" - .align 2 SlateportCity_MapBlockdata:: .incbin "data/layouts/SlateportCity/map.bin" @@ -14,3 +12,4 @@ SlateportCity_Layout:: .4byte SlateportCity_MapBlockdata .4byte gTileset_General .4byte gTileset_Slateport + diff --git a/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc b/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc index 957e233203..f921eb5fcc 100644 --- a/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc +++ b/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SlateportCity_OceanicMuseum_1F_MapBorder:: .incbin "data/layouts/SlateportCity_OceanicMuseum_1F/border.bin" - .align 2 SlateportCity_OceanicMuseum_1F_MapBlockdata:: .incbin "data/layouts/SlateportCity_OceanicMuseum_1F/map.bin" @@ -14,3 +12,4 @@ SlateportCity_OceanicMuseum_1F_Layout:: .4byte SlateportCity_OceanicMuseum_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_OceanicMuseum + diff --git a/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc b/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc index 0072fe2c5a..7a69989875 100644 --- a/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc +++ b/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SlateportCity_OceanicMuseum_2F_MapBorder:: .incbin "data/layouts/SlateportCity_OceanicMuseum_2F/border.bin" - .align 2 SlateportCity_OceanicMuseum_2F_MapBlockdata:: .incbin "data/layouts/SlateportCity_OceanicMuseum_2F/map.bin" @@ -14,3 +12,4 @@ SlateportCity_OceanicMuseum_2F_Layout:: .4byte SlateportCity_OceanicMuseum_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_OceanicMuseum + diff --git a/data/layouts/SlateportCity_PokemonFanClub/layout.inc b/data/layouts/SlateportCity_PokemonFanClub/layout.inc index 789c78b673..44f9a559f0 100644 --- a/data/layouts/SlateportCity_PokemonFanClub/layout.inc +++ b/data/layouts/SlateportCity_PokemonFanClub/layout.inc @@ -1,8 +1,6 @@ - .align 2 SlateportCity_PokemonFanClub_MapBorder:: .incbin "data/layouts/SlateportCity_PokemonFanClub/border.bin" - .align 2 SlateportCity_PokemonFanClub_MapBlockdata:: .incbin "data/layouts/SlateportCity_PokemonFanClub/map.bin" @@ -14,3 +12,4 @@ SlateportCity_PokemonFanClub_Layout:: .4byte SlateportCity_PokemonFanClub_MapBlockdata .4byte gTileset_Building .4byte gTileset_PokemonFanClub + diff --git a/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc b/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc index 5ffddafa6f..00d5840c67 100644 --- a/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc +++ b/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SlateportCity_SternsShipyard_1F_MapBorder:: .incbin "data/layouts/SlateportCity_SternsShipyard_1F/border.bin" - .align 2 SlateportCity_SternsShipyard_1F_MapBlockdata:: .incbin "data/layouts/SlateportCity_SternsShipyard_1F/map.bin" @@ -14,3 +12,4 @@ SlateportCity_SternsShipyard_1F_Layout:: .4byte SlateportCity_SternsShipyard_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc b/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc index fe76a83e83..01a969a3a2 100644 --- a/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc +++ b/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SlateportCity_SternsShipyard_2F_MapBorder:: .incbin "data/layouts/SlateportCity_SternsShipyard_2F/border.bin" - .align 2 SlateportCity_SternsShipyard_2F_MapBlockdata:: .incbin "data/layouts/SlateportCity_SternsShipyard_2F/map.bin" @@ -14,3 +12,4 @@ SlateportCity_SternsShipyard_2F_Layout:: .4byte SlateportCity_SternsShipyard_2F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/SootopolisCity/layout.inc b/data/layouts/SootopolisCity/layout.inc index 91a877c38b..400a29cbd5 100644 --- a/data/layouts/SootopolisCity/layout.inc +++ b/data/layouts/SootopolisCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 SootopolisCity_MapBorder:: .incbin "data/layouts/SootopolisCity/border.bin" - .align 2 SootopolisCity_MapBlockdata:: .incbin "data/layouts/SootopolisCity/map.bin" @@ -14,3 +12,4 @@ SootopolisCity_Layout:: .4byte SootopolisCity_MapBlockdata .4byte gTileset_General .4byte gTileset_Sootopolis + diff --git a/data/layouts/SootopolisCity_Gym_1F/layout.inc b/data/layouts/SootopolisCity_Gym_1F/layout.inc index ce7a15e5e1..4c6a6eeef9 100644 --- a/data/layouts/SootopolisCity_Gym_1F/layout.inc +++ b/data/layouts/SootopolisCity_Gym_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SootopolisCity_Gym_1F_MapBorder:: .incbin "data/layouts/SootopolisCity_Gym_1F/border.bin" - .align 2 SootopolisCity_Gym_1F_MapBlockdata:: .incbin "data/layouts/SootopolisCity_Gym_1F/map.bin" @@ -14,3 +12,4 @@ SootopolisCity_Gym_1F_Layout:: .4byte SootopolisCity_Gym_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_SootopolisGym + diff --git a/data/layouts/SootopolisCity_Gym_B1F/layout.inc b/data/layouts/SootopolisCity_Gym_B1F/layout.inc index a97138cd59..7eb90fb71e 100644 --- a/data/layouts/SootopolisCity_Gym_B1F/layout.inc +++ b/data/layouts/SootopolisCity_Gym_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SootopolisCity_Gym_B1F_MapBorder:: .incbin "data/layouts/SootopolisCity_Gym_B1F/border.bin" - .align 2 SootopolisCity_Gym_B1F_MapBlockdata:: .incbin "data/layouts/SootopolisCity_Gym_B1F/map.bin" @@ -14,3 +12,4 @@ SootopolisCity_Gym_B1F_Layout:: .4byte SootopolisCity_Gym_B1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_SootopolisGym + diff --git a/data/layouts/SootopolisCity_House1/layout.inc b/data/layouts/SootopolisCity_House1/layout.inc index 5c37828ef8..1ad9cc41c9 100644 --- a/data/layouts/SootopolisCity_House1/layout.inc +++ b/data/layouts/SootopolisCity_House1/layout.inc @@ -1,8 +1,6 @@ - .align 2 SootopolisCity_House1_MapBorder:: .incbin "data/layouts/SootopolisCity_House1/border.bin" - .align 2 SootopolisCity_House1_MapBlockdata:: .incbin "data/layouts/SootopolisCity_House1/map.bin" @@ -14,3 +12,4 @@ SootopolisCity_House1_Layout:: .4byte SootopolisCity_House1_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/SootopolisCity_House2/layout.inc b/data/layouts/SootopolisCity_House2/layout.inc index ffa3c5ad18..9007d584bc 100644 --- a/data/layouts/SootopolisCity_House2/layout.inc +++ b/data/layouts/SootopolisCity_House2/layout.inc @@ -1,8 +1,6 @@ - .align 2 SootopolisCity_House2_MapBorder:: .incbin "data/layouts/SootopolisCity_House2/border.bin" - .align 2 SootopolisCity_House2_MapBlockdata:: .incbin "data/layouts/SootopolisCity_House2/map.bin" @@ -14,3 +12,4 @@ SootopolisCity_House2_Layout:: .4byte SootopolisCity_House2_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/SootopolisCity_House3/layout.inc b/data/layouts/SootopolisCity_House3/layout.inc index 3d1fa421cf..540f4306cd 100644 --- a/data/layouts/SootopolisCity_House3/layout.inc +++ b/data/layouts/SootopolisCity_House3/layout.inc @@ -1,8 +1,6 @@ - .align 2 SootopolisCity_House3_MapBorder:: .incbin "data/layouts/SootopolisCity_House3/border.bin" - .align 2 SootopolisCity_House3_MapBlockdata:: .incbin "data/layouts/SootopolisCity_House3/map.bin" @@ -14,3 +12,4 @@ SootopolisCity_House3_Layout:: .4byte SootopolisCity_House3_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc b/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc index 1a0e7b4187..152563eb60 100644 --- a/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc +++ b/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 SootopolisCity_LotadAndSeedotHouse_MapBorder:: .incbin "data/layouts/SootopolisCity_LotadAndSeedotHouse/border.bin" - .align 2 SootopolisCity_LotadAndSeedotHouse_MapBlockdata:: .incbin "data/layouts/SootopolisCity_LotadAndSeedotHouse/map.bin" @@ -14,3 +12,4 @@ SootopolisCity_LotadAndSeedotHouse_Layout:: .4byte SootopolisCity_LotadAndSeedotHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc index 127128a2e5..0b846950ed 100644 --- a/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc +++ b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SootopolisCity_MysteryEventsHouse_1F_MapBorder:: .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_1F/border.bin" - .align 2 SootopolisCity_MysteryEventsHouse_1F_MapBlockdata:: .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_1F/map.bin" @@ -14,3 +12,4 @@ SootopolisCity_MysteryEventsHouse_1F_Layout:: .4byte SootopolisCity_MysteryEventsHouse_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_MysteryEventsHouse + diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc index 951b90582e..1bb92b9339 100644 --- a/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc +++ b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SootopolisCity_MysteryEventsHouse_B1F_MapBorder:: .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/border.bin" - .align 2 SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata:: .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin" @@ -14,3 +12,4 @@ SootopolisCity_MysteryEventsHouse_B1F_Layout:: .4byte SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_MysteryEventsHouse + diff --git a/data/layouts/SouthernIsland_Exterior/layout.inc b/data/layouts/SouthernIsland_Exterior/layout.inc index e5747d2e9f..4a62cd3f5d 100644 --- a/data/layouts/SouthernIsland_Exterior/layout.inc +++ b/data/layouts/SouthernIsland_Exterior/layout.inc @@ -1,8 +1,6 @@ - .align 2 SouthernIsland_Exterior_MapBorder:: .incbin "data/layouts/SouthernIsland_Exterior/border.bin" - .align 2 SouthernIsland_Exterior_MapBlockdata:: .incbin "data/layouts/SouthernIsland_Exterior/map.bin" @@ -14,3 +12,4 @@ SouthernIsland_Exterior_Layout:: .4byte SouthernIsland_Exterior_MapBlockdata .4byte gTileset_General .4byte gTileset_Rustboro + diff --git a/data/layouts/SouthernIsland_Interior/layout.inc b/data/layouts/SouthernIsland_Interior/layout.inc index 3ac1a6a824..b4d9a35d29 100644 --- a/data/layouts/SouthernIsland_Interior/layout.inc +++ b/data/layouts/SouthernIsland_Interior/layout.inc @@ -1,8 +1,6 @@ - .align 2 SouthernIsland_Interior_MapBorder:: .incbin "data/layouts/SouthernIsland_Interior/border.bin" - .align 2 SouthernIsland_Interior_MapBlockdata:: .incbin "data/layouts/SouthernIsland_Interior/map.bin" @@ -14,3 +12,4 @@ SouthernIsland_Interior_Layout:: .4byte SouthernIsland_Interior_MapBlockdata .4byte gTileset_General .4byte gTileset_Rustboro + diff --git a/data/layouts/TerraCave_End/layout.inc b/data/layouts/TerraCave_End/layout.inc index 42ba6309ba..0865a8e5bb 100644 --- a/data/layouts/TerraCave_End/layout.inc +++ b/data/layouts/TerraCave_End/layout.inc @@ -1,8 +1,6 @@ - .align 2 TerraCave_End_MapBorder:: .incbin "data/layouts/TerraCave_End/border.bin" - .align 2 TerraCave_End_MapBlockdata:: .incbin "data/layouts/TerraCave_End/map.bin" @@ -14,3 +12,4 @@ TerraCave_End_Layout:: .4byte TerraCave_End_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/TerraCave_Entrance/layout.inc b/data/layouts/TerraCave_Entrance/layout.inc index 8b0a096504..19d50ef442 100644 --- a/data/layouts/TerraCave_Entrance/layout.inc +++ b/data/layouts/TerraCave_Entrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 TerraCave_Entrance_MapBorder:: .incbin "data/layouts/TerraCave_Entrance/border.bin" - .align 2 TerraCave_Entrance_MapBlockdata:: .incbin "data/layouts/TerraCave_Entrance/map.bin" @@ -14,3 +12,4 @@ TerraCave_Entrance_Layout:: .4byte TerraCave_Entrance_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/TradeCenter/layout.inc b/data/layouts/TradeCenter/layout.inc index 59d257c624..5e0297e7ad 100644 --- a/data/layouts/TradeCenter/layout.inc +++ b/data/layouts/TradeCenter/layout.inc @@ -1,8 +1,6 @@ - .align 2 TradeCenter_MapBorder:: .incbin "data/layouts/TradeCenter/border.bin" - .align 2 TradeCenter_MapBlockdata:: .incbin "data/layouts/TradeCenter/map.bin" @@ -14,3 +12,4 @@ TradeCenter_Layout:: .4byte TradeCenter_MapBlockdata .4byte gTileset_Building .4byte gTileset_CableClub + diff --git a/data/layouts/TrainerHill_1F/layout.inc b/data/layouts/TrainerHill_1F/layout.inc index 0cb5fee4a9..2009cd49e5 100644 --- a/data/layouts/TrainerHill_1F/layout.inc +++ b/data/layouts/TrainerHill_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 TrainerHill_1F_MapBorder:: .incbin "data/layouts/TrainerHill_1F/border.bin" - .align 2 TrainerHill_1F_MapBlockdata:: .incbin "data/layouts/TrainerHill_1F/map.bin" @@ -14,3 +12,4 @@ TrainerHill_1F_Layout:: .4byte TrainerHill_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrainerHill + diff --git a/data/layouts/TrainerHill_2F/layout.inc b/data/layouts/TrainerHill_2F/layout.inc index 25ac09eb9e..f67b54bf1d 100644 --- a/data/layouts/TrainerHill_2F/layout.inc +++ b/data/layouts/TrainerHill_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 TrainerHill_2F_MapBorder:: .incbin "data/layouts/TrainerHill_2F/border.bin" - .align 2 TrainerHill_2F_MapBlockdata:: .incbin "data/layouts/TrainerHill_2F/map.bin" @@ -14,3 +12,4 @@ TrainerHill_2F_Layout:: .4byte TrainerHill_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrainerHill + diff --git a/data/layouts/TrainerHill_3F/layout.inc b/data/layouts/TrainerHill_3F/layout.inc index 2b9f74cc7d..280517f410 100644 --- a/data/layouts/TrainerHill_3F/layout.inc +++ b/data/layouts/TrainerHill_3F/layout.inc @@ -1,8 +1,6 @@ - .align 2 TrainerHill_3F_MapBorder:: .incbin "data/layouts/TrainerHill_3F/border.bin" - .align 2 TrainerHill_3F_MapBlockdata:: .incbin "data/layouts/TrainerHill_3F/map.bin" @@ -14,3 +12,4 @@ TrainerHill_3F_Layout:: .4byte TrainerHill_3F_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrainerHill + diff --git a/data/layouts/TrainerHill_4F/layout.inc b/data/layouts/TrainerHill_4F/layout.inc index 8664a3c90c..eed0b01209 100644 --- a/data/layouts/TrainerHill_4F/layout.inc +++ b/data/layouts/TrainerHill_4F/layout.inc @@ -1,8 +1,6 @@ - .align 2 TrainerHill_4F_MapBorder:: .incbin "data/layouts/TrainerHill_4F/border.bin" - .align 2 TrainerHill_4F_MapBlockdata:: .incbin "data/layouts/TrainerHill_4F/map.bin" @@ -14,3 +12,4 @@ TrainerHill_4F_Layout:: .4byte TrainerHill_4F_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrainerHill + diff --git a/data/layouts/TrainerHill_Entrance/layout.inc b/data/layouts/TrainerHill_Entrance/layout.inc index 0fc549f46d..896f43e0d4 100644 --- a/data/layouts/TrainerHill_Entrance/layout.inc +++ b/data/layouts/TrainerHill_Entrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 TrainerHill_Entrance_MapBorder:: .incbin "data/layouts/TrainerHill_Entrance/border.bin" - .align 2 TrainerHill_Entrance_MapBlockdata:: .incbin "data/layouts/TrainerHill_Entrance/map.bin" @@ -14,3 +12,4 @@ TrainerHill_Entrance_Layout:: .4byte TrainerHill_Entrance_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrainerHill + diff --git a/data/layouts/TrainerHill_Roof/layout.inc b/data/layouts/TrainerHill_Roof/layout.inc index bfa1aeb35e..9477dceda9 100644 --- a/data/layouts/TrainerHill_Roof/layout.inc +++ b/data/layouts/TrainerHill_Roof/layout.inc @@ -1,8 +1,6 @@ - .align 2 TrainerHill_Roof_MapBorder:: .incbin "data/layouts/TrainerHill_Roof/border.bin" - .align 2 TrainerHill_Roof_MapBlockdata:: .incbin "data/layouts/TrainerHill_Roof/map.bin" @@ -14,3 +12,4 @@ TrainerHill_Roof_Layout:: .4byte TrainerHill_Roof_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrainerHill + diff --git a/data/layouts/Underwater1/layout.inc b/data/layouts/Underwater1/layout.inc index f2b61dfbc3..8e027bbd28 100644 --- a/data/layouts/Underwater1/layout.inc +++ b/data/layouts/Underwater1/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater1_MapBorder:: .incbin "data/layouts/Underwater1/border.bin" - .align 2 Underwater1_MapBlockdata:: .incbin "data/layouts/Underwater1/map.bin" @@ -14,3 +12,4 @@ Underwater1_Layout:: .4byte Underwater1_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater2/layout.inc b/data/layouts/Underwater2/layout.inc index ab8892c860..ac6350d474 100644 --- a/data/layouts/Underwater2/layout.inc +++ b/data/layouts/Underwater2/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater2_MapBorder:: .incbin "data/layouts/Underwater2/border.bin" - .align 2 Underwater2_MapBlockdata:: .incbin "data/layouts/Underwater2/map.bin" @@ -14,3 +12,4 @@ Underwater2_Layout:: .4byte Underwater2_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater3/layout.inc b/data/layouts/Underwater3/layout.inc index b1238bc1f8..c365b6b8f5 100644 --- a/data/layouts/Underwater3/layout.inc +++ b/data/layouts/Underwater3/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater3_MapBorder:: .incbin "data/layouts/Underwater3/border.bin" - .align 2 Underwater3_MapBlockdata:: .incbin "data/layouts/Underwater3/map.bin" @@ -14,3 +12,4 @@ Underwater3_Layout:: .4byte Underwater3_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater4/layout.inc b/data/layouts/Underwater4/layout.inc index ed46c9f5b6..9e22e4e409 100644 --- a/data/layouts/Underwater4/layout.inc +++ b/data/layouts/Underwater4/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater4_MapBorder:: .incbin "data/layouts/Underwater4/border.bin" - .align 2 Underwater4_MapBlockdata:: .incbin "data/layouts/Underwater4/map.bin" @@ -14,3 +12,4 @@ Underwater4_Layout:: .4byte Underwater4_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater5/layout.inc b/data/layouts/Underwater5/layout.inc index cef2c5d766..6394eec544 100644 --- a/data/layouts/Underwater5/layout.inc +++ b/data/layouts/Underwater5/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater5_MapBorder:: .incbin "data/layouts/Underwater5/border.bin" - .align 2 Underwater5_MapBlockdata:: .incbin "data/layouts/Underwater5/map.bin" @@ -14,3 +12,4 @@ Underwater5_Layout:: .4byte Underwater5_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater6/layout.inc b/data/layouts/Underwater6/layout.inc index c6f8b9742d..247af44bdb 100644 --- a/data/layouts/Underwater6/layout.inc +++ b/data/layouts/Underwater6/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater6_MapBorder:: .incbin "data/layouts/Underwater6/border.bin" - .align 2 Underwater6_MapBlockdata:: .incbin "data/layouts/Underwater6/map.bin" @@ -14,3 +12,4 @@ Underwater6_Layout:: .4byte Underwater6_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater7/layout.inc b/data/layouts/Underwater7/layout.inc index e910152e49..5c2670b111 100644 --- a/data/layouts/Underwater7/layout.inc +++ b/data/layouts/Underwater7/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater7_MapBorder:: .incbin "data/layouts/Underwater7/border.bin" - .align 2 Underwater7_MapBlockdata:: .incbin "data/layouts/Underwater7/map.bin" @@ -14,3 +12,4 @@ Underwater7_Layout:: .4byte Underwater7_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater_MarineCave/layout.inc b/data/layouts/Underwater_MarineCave/layout.inc index c51bbeb35e..52a3a7851c 100644 --- a/data/layouts/Underwater_MarineCave/layout.inc +++ b/data/layouts/Underwater_MarineCave/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater_MarineCave_MapBorder:: .incbin "data/layouts/Underwater_MarineCave/border.bin" - .align 2 Underwater_MarineCave_MapBlockdata:: .incbin "data/layouts/Underwater_MarineCave/map.bin" @@ -14,3 +12,4 @@ Underwater_MarineCave_Layout:: .4byte Underwater_MarineCave_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater_Route134/layout.inc b/data/layouts/Underwater_Route134/layout.inc index a4bcf2043a..1534564a46 100644 --- a/data/layouts/Underwater_Route134/layout.inc +++ b/data/layouts/Underwater_Route134/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater_Route134_MapBorder:: .incbin "data/layouts/Underwater_Route134/border.bin" - .align 2 Underwater_Route134_MapBlockdata:: .incbin "data/layouts/Underwater_Route134/map.bin" @@ -14,3 +12,4 @@ Underwater_Route134_Layout:: .4byte Underwater_Route134_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater_SeafloorCavern/layout.inc b/data/layouts/Underwater_SeafloorCavern/layout.inc index 5d610efb1e..5bce06a6b1 100644 --- a/data/layouts/Underwater_SeafloorCavern/layout.inc +++ b/data/layouts/Underwater_SeafloorCavern/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater_SeafloorCavern_MapBorder:: .incbin "data/layouts/Underwater_SeafloorCavern/border.bin" - .align 2 Underwater_SeafloorCavern_MapBlockdata:: .incbin "data/layouts/Underwater_SeafloorCavern/map.bin" @@ -14,3 +12,4 @@ Underwater_SeafloorCavern_Layout:: .4byte Underwater_SeafloorCavern_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater_SealedChamber/layout.inc b/data/layouts/Underwater_SealedChamber/layout.inc index a6f924c188..5baf5dde85 100644 --- a/data/layouts/Underwater_SealedChamber/layout.inc +++ b/data/layouts/Underwater_SealedChamber/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater_SealedChamber_MapBorder:: .incbin "data/layouts/Underwater_SealedChamber/border.bin" - .align 2 Underwater_SealedChamber_MapBlockdata:: .incbin "data/layouts/Underwater_SealedChamber/map.bin" @@ -14,3 +12,4 @@ Underwater_SealedChamber_Layout:: .4byte Underwater_SealedChamber_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater_SootopolisCity/layout.inc b/data/layouts/Underwater_SootopolisCity/layout.inc index 22d42167e0..4a1b0aa026 100644 --- a/data/layouts/Underwater_SootopolisCity/layout.inc +++ b/data/layouts/Underwater_SootopolisCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater_SootopolisCity_MapBorder:: .incbin "data/layouts/Underwater_SootopolisCity/border.bin" - .align 2 Underwater_SootopolisCity_MapBlockdata:: .incbin "data/layouts/Underwater_SootopolisCity/map.bin" @@ -14,3 +12,4 @@ Underwater_SootopolisCity_Layout:: .4byte Underwater_SootopolisCity_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/UnionRoom/layout.inc b/data/layouts/UnionRoom/layout.inc index 2c7e821a9b..0c2a065a55 100644 --- a/data/layouts/UnionRoom/layout.inc +++ b/data/layouts/UnionRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnionRoom_MapBorder:: .incbin "data/layouts/UnionRoom/border.bin" - .align 2 UnionRoom_MapBlockdata:: .incbin "data/layouts/UnionRoom/map.bin" @@ -14,3 +12,4 @@ UnionRoom_Layout:: .4byte UnionRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_UnionRoom + diff --git a/data/layouts/UnknownMap_08417FC4/layout.inc b/data/layouts/UnknownMap_08417FC4/layout.inc index 0f3b5504de..41e954b4ed 100644 --- a/data/layouts/UnknownMap_08417FC4/layout.inc +++ b/data/layouts/UnknownMap_08417FC4/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_08417FC4_MapBorder:: .incbin "data/layouts/UnknownMap_08417FC4/border.bin" - .align 2 UnknownMap_08417FC4_MapBlockdata:: .incbin "data/layouts/UnknownMap_08417FC4/map.bin" @@ -14,3 +12,4 @@ UnknownMap_08417FC4_Layout:: .4byte UnknownMap_08417FC4_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_08428450/layout.inc b/data/layouts/UnknownMap_08428450/layout.inc index 603919b424..f1695ec66b 100644 --- a/data/layouts/UnknownMap_08428450/layout.inc +++ b/data/layouts/UnknownMap_08428450/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_08428450_MapBorder:: .incbin "data/layouts/UnknownMap_08428450/border.bin" - .align 2 UnknownMap_08428450_MapBlockdata:: .incbin "data/layouts/UnknownMap_08428450/map.bin" @@ -14,3 +12,4 @@ UnknownMap_08428450_Layout:: .4byte UnknownMap_08428450_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/UnknownMap_084294C4/layout.inc b/data/layouts/UnknownMap_084294C4/layout.inc index 3e565369ae..f19bd682d7 100644 --- a/data/layouts/UnknownMap_084294C4/layout.inc +++ b/data/layouts/UnknownMap_084294C4/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_084294C4_MapBorder:: .incbin "data/layouts/UnknownMap_084294C4/border.bin" - .align 2 UnknownMap_084294C4_MapBlockdata:: .incbin "data/layouts/UnknownMap_084294C4/map.bin" @@ -14,3 +12,4 @@ UnknownMap_084294C4_Layout:: .4byte UnknownMap_084294C4_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/UnknownMap_084294E8/layout.inc b/data/layouts/UnknownMap_084294E8/layout.inc index fd157b9991..e351524e16 100644 --- a/data/layouts/UnknownMap_084294E8/layout.inc +++ b/data/layouts/UnknownMap_084294E8/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_084294E8_MapBorder:: .incbin "data/layouts/UnknownMap_084294E8/border.bin" - .align 2 UnknownMap_084294E8_MapBlockdata:: .incbin "data/layouts/UnknownMap_084294E8/map.bin" @@ -14,3 +12,4 @@ UnknownMap_084294E8_Layout:: .4byte UnknownMap_084294E8_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/UnknownMap_0843E6C0/layout.inc b/data/layouts/UnknownMap_0843E6C0/layout.inc index 9cc060b768..fd01ddc105 100644 --- a/data/layouts/UnknownMap_0843E6C0/layout.inc +++ b/data/layouts/UnknownMap_0843E6C0/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E6C0_MapBorder:: .incbin "data/layouts/UnknownMap_0843E6C0/border.bin" - .align 2 UnknownMap_0843E6C0_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E6C0/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E6C0_Layout:: .4byte UnknownMap_0843E6C0_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E6E4/layout.inc b/data/layouts/UnknownMap_0843E6E4/layout.inc index 5651df7df7..80ad931275 100644 --- a/data/layouts/UnknownMap_0843E6E4/layout.inc +++ b/data/layouts/UnknownMap_0843E6E4/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E6E4_MapBorder:: .incbin "data/layouts/UnknownMap_0843E6E4/border.bin" - .align 2 UnknownMap_0843E6E4_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E6E4/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E6E4_Layout:: .4byte UnknownMap_0843E6E4_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E708/layout.inc b/data/layouts/UnknownMap_0843E708/layout.inc index b79c2d34b4..16d4e400ca 100644 --- a/data/layouts/UnknownMap_0843E708/layout.inc +++ b/data/layouts/UnknownMap_0843E708/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E708_MapBorder:: .incbin "data/layouts/UnknownMap_0843E708/border.bin" - .align 2 UnknownMap_0843E708_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E708/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E708_Layout:: .4byte UnknownMap_0843E708_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E72C/layout.inc b/data/layouts/UnknownMap_0843E72C/layout.inc index 36aee8b80c..c6541b3ea9 100644 --- a/data/layouts/UnknownMap_0843E72C/layout.inc +++ b/data/layouts/UnknownMap_0843E72C/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E72C_MapBorder:: .incbin "data/layouts/UnknownMap_0843E72C/border.bin" - .align 2 UnknownMap_0843E72C_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E72C/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E72C_Layout:: .4byte UnknownMap_0843E72C_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E750/layout.inc b/data/layouts/UnknownMap_0843E750/layout.inc index c233955f1b..e566a93b71 100644 --- a/data/layouts/UnknownMap_0843E750/layout.inc +++ b/data/layouts/UnknownMap_0843E750/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E750_MapBorder:: .incbin "data/layouts/UnknownMap_0843E750/border.bin" - .align 2 UnknownMap_0843E750_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E750/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E750_Layout:: .4byte UnknownMap_0843E750_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E774/layout.inc b/data/layouts/UnknownMap_0843E774/layout.inc index bc2c238f33..ce1a438eb0 100644 --- a/data/layouts/UnknownMap_0843E774/layout.inc +++ b/data/layouts/UnknownMap_0843E774/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E774_MapBorder:: .incbin "data/layouts/UnknownMap_0843E774/border.bin" - .align 2 UnknownMap_0843E774_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E774/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E774_Layout:: .4byte UnknownMap_0843E774_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E798/layout.inc b/data/layouts/UnknownMap_0843E798/layout.inc index 352db474d4..179e0d881d 100644 --- a/data/layouts/UnknownMap_0843E798/layout.inc +++ b/data/layouts/UnknownMap_0843E798/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E798_MapBorder:: .incbin "data/layouts/UnknownMap_0843E798/border.bin" - .align 2 UnknownMap_0843E798_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E798/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E798_Layout:: .4byte UnknownMap_0843E798_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E7BC/layout.inc b/data/layouts/UnknownMap_0843E7BC/layout.inc index c0edd37eb1..907ec6266d 100644 --- a/data/layouts/UnknownMap_0843E7BC/layout.inc +++ b/data/layouts/UnknownMap_0843E7BC/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E7BC_MapBorder:: .incbin "data/layouts/UnknownMap_0843E7BC/border.bin" - .align 2 UnknownMap_0843E7BC_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E7BC/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E7BC_Layout:: .4byte UnknownMap_0843E7BC_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E7E0/layout.inc b/data/layouts/UnknownMap_0843E7E0/layout.inc index b421cf6629..c56046ef18 100644 --- a/data/layouts/UnknownMap_0843E7E0/layout.inc +++ b/data/layouts/UnknownMap_0843E7E0/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E7E0_MapBorder:: .incbin "data/layouts/UnknownMap_0843E7E0/border.bin" - .align 2 UnknownMap_0843E7E0_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E7E0/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E7E0_Layout:: .4byte UnknownMap_0843E7E0_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E804/layout.inc b/data/layouts/UnknownMap_0843E804/layout.inc index d8bc1cfb09..49e32dbc76 100644 --- a/data/layouts/UnknownMap_0843E804/layout.inc +++ b/data/layouts/UnknownMap_0843E804/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E804_MapBorder:: .incbin "data/layouts/UnknownMap_0843E804/border.bin" - .align 2 UnknownMap_0843E804_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E804/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E804_Layout:: .4byte UnknownMap_0843E804_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E828/layout.inc b/data/layouts/UnknownMap_0843E828/layout.inc index dddd408cc4..3cbe672998 100644 --- a/data/layouts/UnknownMap_0843E828/layout.inc +++ b/data/layouts/UnknownMap_0843E828/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E828_MapBorder:: .incbin "data/layouts/UnknownMap_0843E828/border.bin" - .align 2 UnknownMap_0843E828_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E828/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E828_Layout:: .4byte UnknownMap_0843E828_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E84C/layout.inc b/data/layouts/UnknownMap_0843E84C/layout.inc index 34c5282d5a..7449536bf7 100644 --- a/data/layouts/UnknownMap_0843E84C/layout.inc +++ b/data/layouts/UnknownMap_0843E84C/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E84C_MapBorder:: .incbin "data/layouts/UnknownMap_0843E84C/border.bin" - .align 2 UnknownMap_0843E84C_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E84C/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E84C_Layout:: .4byte UnknownMap_0843E84C_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E870/layout.inc b/data/layouts/UnknownMap_0843E870/layout.inc index 0ddc0f858d..23880a79c7 100644 --- a/data/layouts/UnknownMap_0843E870/layout.inc +++ b/data/layouts/UnknownMap_0843E870/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E870_MapBorder:: .incbin "data/layouts/UnknownMap_0843E870/border.bin" - .align 2 UnknownMap_0843E870_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E870/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E870_Layout:: .4byte UnknownMap_0843E870_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E894/layout.inc b/data/layouts/UnknownMap_0843E894/layout.inc index 0b3cc16977..e42bfcdd96 100755 --- a/data/layouts/UnknownMap_0843E894/layout.inc +++ b/data/layouts/UnknownMap_0843E894/layout.inc @@ -1,4 +1,3 @@ - .align 2 UnknownMap_0843E894_MapBorder:: .incbin "data/layouts/UnknownMap_0843E894/border.bin" @@ -13,3 +12,4 @@ UnknownMap_0843E894_Layout:: .4byte UnknownMap_0843E894_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_08447028/layout.inc b/data/layouts/UnknownMap_08447028/layout.inc index ea5e6288d2..39d7bb18ab 100644 --- a/data/layouts/UnknownMap_08447028/layout.inc +++ b/data/layouts/UnknownMap_08447028/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_08447028_MapBorder:: .incbin "data/layouts/UnknownMap_08447028/border.bin" - .align 2 UnknownMap_08447028_MapBlockdata:: .incbin "data/layouts/UnknownMap_08447028/map.bin" @@ -14,3 +12,4 @@ UnknownMap_08447028_Layout:: .4byte UnknownMap_08447028_MapBlockdata .4byte gTileset_General .4byte 0 + diff --git a/data/layouts/UnknownMap_0845A394/layout.inc b/data/layouts/UnknownMap_0845A394/layout.inc index d9951db4db..a180340f8b 100644 --- a/data/layouts/UnknownMap_0845A394/layout.inc +++ b/data/layouts/UnknownMap_0845A394/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0845A394_MapBorder:: .incbin "data/layouts/UnknownMap_0845A394/border.bin" - .align 2 UnknownMap_0845A394_MapBlockdata:: .incbin "data/layouts/UnknownMap_0845A394/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0845A394_Layout:: .4byte UnknownMap_0845A394_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0845D470/layout.inc b/data/layouts/UnknownMap_0845D470/layout.inc index 36421f5031..ce6a4c819a 100644 --- a/data/layouts/UnknownMap_0845D470/layout.inc +++ b/data/layouts/UnknownMap_0845D470/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0845D470_MapBorder:: .incbin "data/layouts/UnknownMap_0845D470/border.bin" - .align 2 UnknownMap_0845D470_MapBlockdata:: .incbin "data/layouts/UnknownMap_0845D470/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0845D470_Layout:: .4byte UnknownMap_0845D470_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/UnknownMap_0845ECB4/layout.inc b/data/layouts/UnknownMap_0845ECB4/layout.inc index ca018989b9..535c4a6e9a 100644 --- a/data/layouts/UnknownMap_0845ECB4/layout.inc +++ b/data/layouts/UnknownMap_0845ECB4/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0845ECB4_MapBorder:: .incbin "data/layouts/UnknownMap_0845ECB4/border.bin" - .align 2 UnknownMap_0845ECB4_MapBlockdata:: .incbin "data/layouts/UnknownMap_0845ECB4/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0845ECB4_Layout:: .4byte UnknownMap_0845ECB4_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_08469200/layout.inc b/data/layouts/UnknownMap_08469200/layout.inc index babdb2c61b..22191c61cf 100644 --- a/data/layouts/UnknownMap_08469200/layout.inc +++ b/data/layouts/UnknownMap_08469200/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_08469200_MapBorder:: .incbin "data/layouts/UnknownMap_08469200/border.bin" - .align 2 UnknownMap_08469200_MapBlockdata:: .incbin "data/layouts/UnknownMap_08469200/map.bin" @@ -14,3 +12,4 @@ UnknownMap_08469200_Layout:: .4byte UnknownMap_08469200_MapBlockdata .4byte gTileset_General .4byte gTileset_Sootopolis + diff --git a/data/layouts/UnknownMap_084693AC/layout.inc b/data/layouts/UnknownMap_084693AC/layout.inc index f4b882fdef..0106c666a5 100644 --- a/data/layouts/UnknownMap_084693AC/layout.inc +++ b/data/layouts/UnknownMap_084693AC/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_084693AC_MapBorder:: .incbin "data/layouts/UnknownMap_084693AC/border.bin" - .align 2 UnknownMap_084693AC_MapBlockdata:: .incbin "data/layouts/UnknownMap_084693AC/map.bin" @@ -14,3 +12,4 @@ UnknownMap_084693AC_Layout:: .4byte UnknownMap_084693AC_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePike + diff --git a/data/layouts/UnknownMap_08470BD8/layout.inc b/data/layouts/UnknownMap_08470BD8/layout.inc index f1a0e90eaa..671127587d 100644 --- a/data/layouts/UnknownMap_08470BD8/layout.inc +++ b/data/layouts/UnknownMap_08470BD8/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_08470BD8_MapBorder:: .incbin "data/layouts/UnknownMap_08470BD8/border.bin" - .align 2 UnknownMap_08470BD8_MapBlockdata:: .incbin "data/layouts/UnknownMap_08470BD8/map.bin" @@ -14,3 +12,4 @@ UnknownMap_08470BD8_Layout:: .4byte UnknownMap_08470BD8_MapBlockdata .4byte gTileset_General .4byte gTileset_Mauville + diff --git a/data/layouts/UnknownMap_08480DAC/layout.inc b/data/layouts/UnknownMap_08480DAC/layout.inc index 8239461fcd..b440362392 100644 --- a/data/layouts/UnknownMap_08480DAC/layout.inc +++ b/data/layouts/UnknownMap_08480DAC/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_08480DAC_MapBorder:: .incbin "data/layouts/UnknownMap_08480DAC/border.bin" - .align 2 UnknownMap_08480DAC_MapBlockdata:: .incbin "data/layouts/UnknownMap_08480DAC/map.bin" @@ -14,3 +12,4 @@ UnknownMap_08480DAC_Layout:: .4byte UnknownMap_08480DAC_MapBlockdata .4byte gTileset_Building .4byte gTileset_Lab + diff --git a/data/layouts/UnknownMap_08480F54/layout.inc b/data/layouts/UnknownMap_08480F54/layout.inc index 6916f61aed..4593a8ba47 100644 --- a/data/layouts/UnknownMap_08480F54/layout.inc +++ b/data/layouts/UnknownMap_08480F54/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_08480F54_MapBorder:: .incbin "data/layouts/UnknownMap_08480F54/border.bin" - .align 2 UnknownMap_08480F54_MapBlockdata:: .incbin "data/layouts/UnknownMap_08480F54/map.bin" @@ -14,3 +12,4 @@ UnknownMap_08480F54_Layout:: .4byte UnknownMap_08480F54_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/UnknownMap_084810FC/layout.inc b/data/layouts/UnknownMap_084810FC/layout.inc index 6e0116512c..6b73bfdcee 100644 --- a/data/layouts/UnknownMap_084810FC/layout.inc +++ b/data/layouts/UnknownMap_084810FC/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_084810FC_MapBorder:: .incbin "data/layouts/UnknownMap_084810FC/border.bin" - .align 2 UnknownMap_084810FC_MapBlockdata:: .incbin "data/layouts/UnknownMap_084810FC/map.bin" @@ -14,3 +12,4 @@ UnknownMap_084810FC_Layout:: .4byte UnknownMap_084810FC_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/UnknownMap_084812A4/layout.inc b/data/layouts/UnknownMap_084812A4/layout.inc index 3f7a2770d9..a394c8ef3f 100644 --- a/data/layouts/UnknownMap_084812A4/layout.inc +++ b/data/layouts/UnknownMap_084812A4/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_084812A4_MapBorder:: .incbin "data/layouts/UnknownMap_084812A4/border.bin" - .align 2 UnknownMap_084812A4_MapBlockdata:: .incbin "data/layouts/UnknownMap_084812A4/map.bin" @@ -14,3 +12,4 @@ UnknownMap_084812A4_Layout:: .4byte UnknownMap_084812A4_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/UnknownMap_0848144C/layout.inc b/data/layouts/UnknownMap_0848144C/layout.inc index fe7f90b16b..cabe0b25b2 100644 --- a/data/layouts/UnknownMap_0848144C/layout.inc +++ b/data/layouts/UnknownMap_0848144C/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0848144C_MapBorder:: .incbin "data/layouts/UnknownMap_0848144C/border.bin" - .align 2 UnknownMap_0848144C_MapBlockdata:: .incbin "data/layouts/UnknownMap_0848144C/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0848144C_Layout:: .4byte UnknownMap_0848144C_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/UnknownMap_084815F4/layout.inc b/data/layouts/UnknownMap_084815F4/layout.inc index a501c6cc66..73ed49c79a 100644 --- a/data/layouts/UnknownMap_084815F4/layout.inc +++ b/data/layouts/UnknownMap_084815F4/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_084815F4_MapBorder:: .incbin "data/layouts/UnknownMap_084815F4/border.bin" - .align 2 UnknownMap_084815F4_MapBlockdata:: .incbin "data/layouts/UnknownMap_084815F4/map.bin" @@ -14,3 +12,4 @@ UnknownMap_084815F4_Layout:: .4byte UnknownMap_084815F4_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/UnknownMap_08481B24/layout.inc b/data/layouts/UnknownMap_08481B24/layout.inc index 52a6a8acf8..250528be04 100644 --- a/data/layouts/UnknownMap_08481B24/layout.inc +++ b/data/layouts/UnknownMap_08481B24/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_08481B24_MapBorder:: .incbin "data/layouts/UnknownMap_08481B24/border.bin" - .align 2 UnknownMap_08481B24_MapBlockdata:: .incbin "data/layouts/UnknownMap_08481B24/map.bin" @@ -14,3 +12,4 @@ UnknownMap_08481B24_Layout:: .4byte UnknownMap_08481B24_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/UnknownMap_08481DBC/layout.inc b/data/layouts/UnknownMap_08481DBC/layout.inc index 314a94b885..465b92dc82 100644 --- a/data/layouts/UnknownMap_08481DBC/layout.inc +++ b/data/layouts/UnknownMap_08481DBC/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_08481DBC_MapBorder:: .incbin "data/layouts/UnknownMap_08481DBC/border.bin" - .align 2 UnknownMap_08481DBC_MapBlockdata:: .incbin "data/layouts/UnknownMap_08481DBC/map.bin" @@ -14,3 +12,4 @@ UnknownMap_08481DBC_Layout:: .4byte UnknownMap_08481DBC_MapBlockdata .4byte gTileset_Building .4byte gTileset_MysteryEventsHouse + diff --git a/data/layouts/UnknownMap_25_29/layout.inc b/data/layouts/UnknownMap_25_29/layout.inc index 30eb032e48..bb7002a20e 100644 --- a/data/layouts/UnknownMap_25_29/layout.inc +++ b/data/layouts/UnknownMap_25_29/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_25_29_MapBorder:: .incbin "data/layouts/UnknownMap_25_29/border.bin" - .align 2 UnknownMap_25_29_MapBlockdata:: .incbin "data/layouts/UnknownMap_25_29/map.bin" @@ -14,3 +12,4 @@ UnknownMap_25_29_Layout:: .4byte UnknownMap_25_29_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/UnknownMap_25_30/layout.inc b/data/layouts/UnknownMap_25_30/layout.inc index 3423735c3a..5937a21952 100644 --- a/data/layouts/UnknownMap_25_30/layout.inc +++ b/data/layouts/UnknownMap_25_30/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_25_30_MapBorder:: .incbin "data/layouts/UnknownMap_25_30/border.bin" - .align 2 UnknownMap_25_30_MapBlockdata:: .incbin "data/layouts/UnknownMap_25_30/map.bin" @@ -14,3 +12,4 @@ UnknownMap_25_30_Layout:: .4byte UnknownMap_25_30_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/UnknownMap_25_31/layout.inc b/data/layouts/UnknownMap_25_31/layout.inc index 20fbdc9c8d..3dcbc7986a 100644 --- a/data/layouts/UnknownMap_25_31/layout.inc +++ b/data/layouts/UnknownMap_25_31/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_25_31_MapBorder:: .incbin "data/layouts/UnknownMap_25_31/border.bin" - .align 2 UnknownMap_25_31_MapBlockdata:: .incbin "data/layouts/UnknownMap_25_31/map.bin" @@ -14,3 +12,4 @@ UnknownMap_25_31_Layout:: .4byte UnknownMap_25_31_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/UnknownMap_25_32/layout.inc b/data/layouts/UnknownMap_25_32/layout.inc index 2efcab4e06..0ffe4c0b7c 100644 --- a/data/layouts/UnknownMap_25_32/layout.inc +++ b/data/layouts/UnknownMap_25_32/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_25_32_MapBorder:: .incbin "data/layouts/UnknownMap_25_32/border.bin" - .align 2 UnknownMap_25_32_MapBlockdata:: .incbin "data/layouts/UnknownMap_25_32/map.bin" @@ -14,3 +12,4 @@ UnknownMap_25_32_Layout:: .4byte UnknownMap_25_32_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/UnknownMap_25_33/layout.inc b/data/layouts/UnknownMap_25_33/layout.inc index 4d27276dcf..3f8113a6fb 100644 --- a/data/layouts/UnknownMap_25_33/layout.inc +++ b/data/layouts/UnknownMap_25_33/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_25_33_MapBorder:: .incbin "data/layouts/UnknownMap_25_33/border.bin" - .align 2 UnknownMap_25_33_MapBlockdata:: .incbin "data/layouts/UnknownMap_25_33/map.bin" @@ -14,3 +12,4 @@ UnknownMap_25_33_Layout:: .4byte UnknownMap_25_33_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/UnknownMap_25_34/layout.inc b/data/layouts/UnknownMap_25_34/layout.inc index 3dea1f9af4..6001d8fe79 100644 --- a/data/layouts/UnknownMap_25_34/layout.inc +++ b/data/layouts/UnknownMap_25_34/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_25_34_MapBorder:: .incbin "data/layouts/UnknownMap_25_34/border.bin" - .align 2 UnknownMap_25_34_MapBlockdata:: .incbin "data/layouts/UnknownMap_25_34/map.bin" @@ -14,3 +12,4 @@ UnknownMap_25_34_Layout:: .4byte UnknownMap_25_34_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/VerdanturfTown/layout.inc b/data/layouts/VerdanturfTown/layout.inc index 2f329b9303..ce58c0798e 100644 --- a/data/layouts/VerdanturfTown/layout.inc +++ b/data/layouts/VerdanturfTown/layout.inc @@ -1,8 +1,6 @@ - .align 2 VerdanturfTown_MapBorder:: .incbin "data/layouts/VerdanturfTown/border.bin" - .align 2 VerdanturfTown_MapBlockdata:: .incbin "data/layouts/VerdanturfTown/map.bin" @@ -14,3 +12,4 @@ VerdanturfTown_Layout:: .4byte VerdanturfTown_MapBlockdata .4byte gTileset_General .4byte gTileset_Mauville + diff --git a/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc b/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc index 89d82169cc..21fca69535 100644 --- a/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc +++ b/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 VerdanturfTown_BattleTentBattleRoom_MapBorder:: .incbin "data/layouts/VerdanturfTown_BattleTentBattleRoom/border.bin" - .align 2 VerdanturfTown_BattleTentBattleRoom_MapBlockdata:: .incbin "data/layouts/VerdanturfTown_BattleTentBattleRoom/map.bin" @@ -14,3 +12,4 @@ VerdanturfTown_BattleTentBattleRoom_Layout:: .4byte VerdanturfTown_BattleTentBattleRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_BattleTent + diff --git a/data/layouts/VerdanturfTown_WandasHouse/layout.inc b/data/layouts/VerdanturfTown_WandasHouse/layout.inc index 8791f34bb2..ae5d1a7cf6 100644 --- a/data/layouts/VerdanturfTown_WandasHouse/layout.inc +++ b/data/layouts/VerdanturfTown_WandasHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 VerdanturfTown_WandasHouse_MapBorder:: .incbin "data/layouts/VerdanturfTown_WandasHouse/border.bin" - .align 2 VerdanturfTown_WandasHouse_MapBlockdata:: .incbin "data/layouts/VerdanturfTown_WandasHouse/map.bin" @@ -14,3 +12,4 @@ VerdanturfTown_WandasHouse_Layout:: .4byte VerdanturfTown_WandasHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/VictoryRoad_1F/layout.inc b/data/layouts/VictoryRoad_1F/layout.inc index 9ef50f7430..31e0fede38 100644 --- a/data/layouts/VictoryRoad_1F/layout.inc +++ b/data/layouts/VictoryRoad_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 VictoryRoad_1F_MapBorder:: .incbin "data/layouts/VictoryRoad_1F/border.bin" - .align 2 VictoryRoad_1F_MapBlockdata:: .incbin "data/layouts/VictoryRoad_1F/map.bin" @@ -14,3 +12,4 @@ VictoryRoad_1F_Layout:: .4byte VictoryRoad_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/VictoryRoad_B1F/layout.inc b/data/layouts/VictoryRoad_B1F/layout.inc index fed9804feb..9ce7223e1e 100644 --- a/data/layouts/VictoryRoad_B1F/layout.inc +++ b/data/layouts/VictoryRoad_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 VictoryRoad_B1F_MapBorder:: .incbin "data/layouts/VictoryRoad_B1F/border.bin" - .align 2 VictoryRoad_B1F_MapBlockdata:: .incbin "data/layouts/VictoryRoad_B1F/map.bin" @@ -14,3 +12,4 @@ VictoryRoad_B1F_Layout:: .4byte VictoryRoad_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/VictoryRoad_B2F/layout.inc b/data/layouts/VictoryRoad_B2F/layout.inc index 77a9542f96..23c500cbe4 100644 --- a/data/layouts/VictoryRoad_B2F/layout.inc +++ b/data/layouts/VictoryRoad_B2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 VictoryRoad_B2F_MapBorder:: .incbin "data/layouts/VictoryRoad_B2F/border.bin" - .align 2 VictoryRoad_B2F_MapBlockdata:: .incbin "data/layouts/VictoryRoad_B2F/map.bin" @@ -14,3 +12,4 @@ VictoryRoad_B2F_Layout:: .4byte VictoryRoad_B2F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts_table.inc b/data/layouts_table.inc index 3f94138fbb..bd67fb6f97 100644 --- a/data/layouts_table.inc +++ b/data/layouts_table.inc @@ -1,5 +1,5 @@ - .align 2 -gMapLayouts:: @ 8481DD4 + .align 2 +gMapLayouts:: .4byte PetalburgCity_Layout .4byte SlateportCity_Layout .4byte MauvilleCity_Layout @@ -159,9 +159,9 @@ gMapLayouts:: @ 8481DD4 .4byte CaveOfOrigin_Entrance_Layout .4byte CaveOfOrigin_1F_Layout .4byte CaveOfOrigin_UnusedRubySapphireMap1_Layout - .4byte CaveOfOrigin_UnusedRubySapphireMap2_Layout - .4byte CaveOfOrigin_UnusedRubySapphireMap3_Layout - .4byte CaveOfOrigin_B1F_Layout + .4byte CaveOfOrigin_UnusedRubySapphireMap2_Layout + .4byte CaveOfOrigin_UnusedRubySapphireMap3_Layout + .4byte CaveOfOrigin_B1F_Layout .4byte VictoryRoad_1F_Layout .4byte ShoalCave_LowTideEntranceRoom_Layout .4byte ShoalCave_LowTideInnerRoom_Layout @@ -169,20 +169,20 @@ gMapLayouts:: @ 8481DD4 .4byte ShoalCave_LowTideLowerRoom_Layout .4byte ShoalCave_HighTideEntranceRoom_Layout .4byte ShoalCave_HighTideInnerRoom_Layout - .4byte UnknownMap_0843E6C0_Layout @ unused maps - .4byte UnknownMap_0843E6E4_Layout - .4byte UnknownMap_0843E708_Layout - .4byte UnknownMap_0843E72C_Layout - .4byte UnknownMap_0843E750_Layout - .4byte UnknownMap_0843E774_Layout - .4byte UnknownMap_0843E798_Layout - .4byte UnknownMap_0843E7BC_Layout - .4byte UnknownMap_0843E7E0_Layout - .4byte UnknownMap_0843E804_Layout - .4byte UnknownMap_0843E828_Layout - .4byte UnknownMap_0843E84C_Layout - .4byte UnknownMap_0843E870_Layout - .4byte UnknownMap_0843E894_Layout + .4byte UnknownMap_0843E6C0_Layout + .4byte UnknownMap_0843E6E4_Layout + .4byte UnknownMap_0843E708_Layout + .4byte UnknownMap_0843E72C_Layout + .4byte UnknownMap_0843E750_Layout + .4byte UnknownMap_0843E774_Layout + .4byte UnknownMap_0843E798_Layout + .4byte UnknownMap_0843E7BC_Layout + .4byte UnknownMap_0843E7E0_Layout + .4byte UnknownMap_0843E804_Layout + .4byte UnknownMap_0843E828_Layout + .4byte UnknownMap_0843E84C_Layout + .4byte UnknownMap_0843E870_Layout + .4byte UnknownMap_0843E894_Layout .4byte NewMauville_Entrance_Layout .4byte NewMauville_Inside_Layout .4byte AbandonedShip_Deck_Layout @@ -241,8 +241,8 @@ gMapLayouts:: @ 8481DD4 .4byte SafariZone_North_Layout .4byte SafariZone_Southwest_Layout .4byte SafariZone_South_Layout - .4byte UnknownMap_08447028_Layout - .4byte Route109_SeashoreHouse_Layout + .4byte UnknownMap_08447028_Layout + .4byte Route109_SeashoreHouse_Layout .4byte Route110_TrickHouseEntrance_Layout .4byte Route110_TrickHouseEnd_Layout .4byte Route110_TrickHouseCorridor_Layout @@ -331,114 +331,113 @@ gMapLayouts:: @ 8481DD4 .4byte SafariZone_RestHouse_Layout .4byte SkyPillar_5F_Layout .4byte SkyPillar_Top_Layout - .4byte BattleFrontier_BattleDomeLobby_Layout - .4byte BattleFrontier_BattleDomeCorridor_Layout - .4byte BattleFrontier_BattleDomePreBattleRoom_Layout - .4byte BattleFrontier_BattleDomeBattleRoom_Layout - .4byte MagmaHideout_1F_Layout - .4byte MagmaHideout_2F_1R_Layout - .4byte MagmaHideout_2F_2R_Layout - .4byte MagmaHideout_3F_1R_Layout - .4byte MagmaHideout_3F_2R_Layout - .4byte MagmaHideout_4F_Layout - .4byte BattleFrontier_BattlePalaceLobby_Layout - .4byte BattleFrontier_BattlePalaceCorridor_Layout - .4byte BattleFrontier_BattlePalaceBattleRoom_Layout - .4byte BattleFrontier_OutsideEast_Layout - .4byte BattleFrontier_BattleFactoryLobby_Layout - .4byte BattleFrontier_BattleFactoryPreBattleRoom_Layout - .4byte BattleFrontier_BattleFactoryBattleRoom_Layout - .4byte BattleFrontier_BattlePikeLobby_Layout - .4byte BattleFrontier_BattlePikeCorridor_Layout - .4byte BattleFrontier_BattlePikeThreePathRoom_Layout - .4byte BattleFrontier_BattlePikeRandomRoom1_Layout - .4byte BattleFrontier_BattlePikeRandomRoom2_Layout - .4byte BattleFrontier_BattleArenaLobby_Layout - .4byte BattleFrontier_BattleArenaCorridor_Layout - .4byte BattleFrontier_BattleArenaBattleRoom_Layout - .4byte UnknownMap_08469200_Layout - .4byte BattleFrontier_BattlePikeRandomRoom3_Layout - .4byte UnknownMap_084693AC_Layout - .4byte BattleFrontier_BattlePyramidLobby_Layout - .4byte BattleFrontier_BattlePyramidEmptySquare_Layout - .4byte BattlePyramidSquare01_Layout - .4byte BattlePyramidSquare02_Layout - .4byte BattlePyramidSquare03_Layout - .4byte BattlePyramidSquare04_Layout - .4byte BattlePyramidSquare05_Layout - .4byte BattlePyramidSquare06_Layout - .4byte BattlePyramidSquare07_Layout - .4byte BattlePyramidSquare08_Layout - .4byte BattlePyramidSquare09_Layout - .4byte BattlePyramidSquare10_Layout - .4byte BattlePyramidSquare11_Layout - .4byte BattlePyramidSquare12_Layout - .4byte BattlePyramidSquare13_Layout - .4byte BattlePyramidSquare14_Layout - .4byte BattlePyramidSquare15_Layout - .4byte BattlePyramidSquare16_Layout - .4byte BattleFrontier_BattlePyramidTop_Layout - .4byte MagmaHideout_3F_3R_Layout - .4byte MagmaHideout_2F_3R_Layout - .4byte MirageTower_1F_Layout - .4byte MirageTower_2F_Layout - .4byte MirageTower_3F_Layout - .4byte BattleTentLobby_Layout - .4byte BattleTentCorridor_Layout - .4byte BattleTentBattleRoom_Layout - .4byte VerdanturfTown_BattleTentBattleRoom_Layout - .4byte MirageTower_4F_Layout - .4byte DesertUnderpass_Layout - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Layout - .4byte BattleFrontier_BattleTowerCorridor2_Layout - .4byte UnknownMap_08470BD8_Layout - .4byte UnionRoom_Layout - .4byte SafariZone_Northeast_Layout - .4byte SafariZone_Southeast_Layout - .4byte BattleFrontier_RankingHall_Layout - .4byte BattleFrontier_Lounge1_Layout - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Layout - .4byte BattleFrontier_ReceptionGate_Layout - .4byte ArtisanCave_B1F_Layout - .4byte ArtisanCave_1F_Layout - .4byte FarawayIsland_Entrance_Layout - .4byte FarawayIsland_Interior_Layout - .4byte BirthIsland_Exterior_Layout - .4byte IslandHarbor_Layout - .4byte Underwater_MarineCave_Layout - .4byte MarineCave_Entrance_Layout - .4byte TerraCave_Entrance_Layout - .4byte TerraCave_End_Layout - .4byte Underwater6_Layout - .4byte Underwater7_Layout - .4byte Underwater5_Layout - .4byte MarineCave_End_Layout - .4byte TrainerHill_Entrance_Layout - .4byte TrainerHill_1F_Layout - .4byte TrainerHill_2F_Layout - .4byte TrainerHill_3F_Layout - .4byte TrainerHill_4F_Layout - .4byte TrainerHill_Roof_Layout - .4byte AlteringCave_Layout - .4byte NavelRock_Exterior_Layout - .4byte NavelRock_Entrance_Layout - .4byte NavelRock_Top_Layout - .4byte NavelRock_Bottom_Layout - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_LadderRoom2_Layout - .4byte NavelRock_B1F_Layout - .4byte NavelRock_Fork_Layout - .4byte BattleFrontier_Lounge2_Layout - .4byte BattleFrontier_ScottsHouse_Layout - .4byte MeteorFalls_StevensCave_Layout - .4byte UnknownMap_08480DAC_Layout - .4byte UnknownMap_08480F54_Layout - .4byte UnknownMap_084810FC_Layout - .4byte UnknownMap_084812A4_Layout - .4byte UnknownMap_0848144C_Layout - .4byte UnknownMap_084815F4_Layout - .4byte UnknownMap_08481B24_Layout - .4byte SootopolisCity_MysteryEventsHouse_1F_Layout - .4byte SootopolisCity_MysteryEventsHouse_B1F_Layout - .4byte UnknownMap_08481DBC_Layout - + .4byte BattleFrontier_BattleDomeLobby_Layout + .4byte BattleFrontier_BattleDomeCorridor_Layout + .4byte BattleFrontier_BattleDomePreBattleRoom_Layout + .4byte BattleFrontier_BattleDomeBattleRoom_Layout + .4byte MagmaHideout_1F_Layout + .4byte MagmaHideout_2F_1R_Layout + .4byte MagmaHideout_2F_2R_Layout + .4byte MagmaHideout_3F_1R_Layout + .4byte MagmaHideout_3F_2R_Layout + .4byte MagmaHideout_4F_Layout + .4byte BattleFrontier_BattlePalaceLobby_Layout + .4byte BattleFrontier_BattlePalaceCorridor_Layout + .4byte BattleFrontier_BattlePalaceBattleRoom_Layout + .4byte BattleFrontier_OutsideEast_Layout + .4byte BattleFrontier_BattleFactoryLobby_Layout + .4byte BattleFrontier_BattleFactoryPreBattleRoom_Layout + .4byte BattleFrontier_BattleFactoryBattleRoom_Layout + .4byte BattleFrontier_BattlePikeLobby_Layout + .4byte BattleFrontier_BattlePikeCorridor_Layout + .4byte BattleFrontier_BattlePikeThreePathRoom_Layout + .4byte BattleFrontier_BattlePikeRandomRoom1_Layout + .4byte BattleFrontier_BattlePikeRandomRoom2_Layout + .4byte BattleFrontier_BattleArenaLobby_Layout + .4byte BattleFrontier_BattleArenaCorridor_Layout + .4byte BattleFrontier_BattleArenaBattleRoom_Layout + .4byte UnknownMap_08469200_Layout + .4byte BattleFrontier_BattlePikeRandomRoom3_Layout + .4byte UnknownMap_084693AC_Layout + .4byte BattleFrontier_BattlePyramidLobby_Layout + .4byte BattleFrontier_BattlePyramidEmptySquare_Layout + .4byte BattlePyramidSquare01_Layout + .4byte BattlePyramidSquare02_Layout + .4byte BattlePyramidSquare03_Layout + .4byte BattlePyramidSquare04_Layout + .4byte BattlePyramidSquare05_Layout + .4byte BattlePyramidSquare06_Layout + .4byte BattlePyramidSquare07_Layout + .4byte BattlePyramidSquare08_Layout + .4byte BattlePyramidSquare09_Layout + .4byte BattlePyramidSquare10_Layout + .4byte BattlePyramidSquare11_Layout + .4byte BattlePyramidSquare12_Layout + .4byte BattlePyramidSquare13_Layout + .4byte BattlePyramidSquare14_Layout + .4byte BattlePyramidSquare15_Layout + .4byte BattlePyramidSquare16_Layout + .4byte BattleFrontier_BattlePyramidTop_Layout + .4byte MagmaHideout_3F_3R_Layout + .4byte MagmaHideout_2F_3R_Layout + .4byte MirageTower_1F_Layout + .4byte MirageTower_2F_Layout + .4byte MirageTower_3F_Layout + .4byte BattleTentLobby_Layout + .4byte BattleTentCorridor_Layout + .4byte BattleTentBattleRoom_Layout + .4byte VerdanturfTown_BattleTentBattleRoom_Layout + .4byte MirageTower_4F_Layout + .4byte DesertUnderpass_Layout + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Layout + .4byte BattleFrontier_BattleTowerCorridor2_Layout + .4byte UnknownMap_08470BD8_Layout + .4byte UnionRoom_Layout + .4byte SafariZone_Northeast_Layout + .4byte SafariZone_Southeast_Layout + .4byte BattleFrontier_RankingHall_Layout + .4byte BattleFrontier_Lounge1_Layout + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Layout + .4byte BattleFrontier_ReceptionGate_Layout + .4byte ArtisanCave_B1F_Layout + .4byte ArtisanCave_1F_Layout + .4byte FarawayIsland_Entrance_Layout + .4byte FarawayIsland_Interior_Layout + .4byte BirthIsland_Exterior_Layout + .4byte IslandHarbor_Layout + .4byte Underwater_MarineCave_Layout + .4byte MarineCave_Entrance_Layout + .4byte TerraCave_Entrance_Layout + .4byte TerraCave_End_Layout + .4byte Underwater6_Layout + .4byte Underwater7_Layout + .4byte Underwater5_Layout + .4byte MarineCave_End_Layout + .4byte TrainerHill_Entrance_Layout + .4byte TrainerHill_1F_Layout + .4byte TrainerHill_2F_Layout + .4byte TrainerHill_3F_Layout + .4byte TrainerHill_4F_Layout + .4byte TrainerHill_Roof_Layout + .4byte AlteringCave_Layout + .4byte NavelRock_Exterior_Layout + .4byte NavelRock_Entrance_Layout + .4byte NavelRock_Top_Layout + .4byte NavelRock_Bottom_Layout + .4byte NavelRock_LadderRoom1_Layout + .4byte NavelRock_LadderRoom2_Layout + .4byte NavelRock_B1F_Layout + .4byte NavelRock_Fork_Layout + .4byte BattleFrontier_Lounge2_Layout + .4byte BattleFrontier_ScottsHouse_Layout + .4byte MeteorFalls_StevensCave_Layout + .4byte UnknownMap_08480DAC_Layout + .4byte UnknownMap_08480F54_Layout + .4byte UnknownMap_084810FC_Layout + .4byte UnknownMap_084812A4_Layout + .4byte UnknownMap_0848144C_Layout + .4byte UnknownMap_084815F4_Layout + .4byte UnknownMap_08481B24_Layout + .4byte SootopolisCity_MysteryEventsHouse_1F_Layout + .4byte SootopolisCity_MysteryEventsHouse_B1F_Layout + .4byte UnknownMap_08481DBC_Layout From 272b98da6c5174db3f7f2d05ed765fc4cdefc2c6 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 28 Jun 2018 21:06:32 +0200 Subject: [PATCH 31/55] document party status summary --- asm/macros/battle_script.inc | 2 +- asm/party_menu.s | 2 +- asm/pokemon_summary_screen.s | 2 +- data/battle_scripts_1.s | 8 +- data/battle_scripts_2.s | 10 +- include/battle.h | 18 +-- include/battle_controllers.h | 6 +- include/battle_interface.h | 2 +- src/battle_controller_link_opponent.c | 16 +-- src/battle_controller_link_partner.c | 16 +-- src/battle_controller_opponent.c | 16 +-- src/battle_controller_player.c | 20 ++-- src/battle_controller_player_partner.c | 16 +-- src/battle_controller_recorded_opponent.c | 16 +-- src/battle_controller_recorded_player.c | 16 +-- src/battle_controller_safari.c | 6 +- src/battle_controller_wally.c | 12 +- src/battle_controllers.c | 18 +-- src/battle_interface.c | 12 +- src/battle_main.c | 136 +++++++++++----------- src/battle_script_commands.c | 22 ++-- src/battle_util.c | 10 +- src/safari_zone.c | 10 +- 23 files changed, 196 insertions(+), 196 deletions(-) diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 083107c082..73fcbeac12 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -525,7 +525,7 @@ .byte \bank .endm - .macro atk62 bank + .macro hidepartystatussummary bank .byte 0x62 .byte \bank .endm diff --git a/asm/party_menu.s b/asm/party_menu.s index 6e2b1e55a8..782d8ae31d 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -12158,7 +12158,7 @@ sub_81B672C: @ 81B672C bl sub_81B1B5C movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - bl sub_805EAE8 + bl HandleBattleLowHpMusicChange ldr r1, =gTasks lsls r0, r5, 2 adds r0, r5 diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index 901669715a..e52874f576 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -1116,7 +1116,7 @@ sub_81C4778: @ 81C4778 bne _081C47AE adds r0, r1, 0 adds r0, 0xC - bl ShouldPlayNormalPokeCry + bl ShouldPlayNormalMonCry cmp r0, 0x1 bne _081C47A4 ldrh r0, [r4, 0x2] diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 058833fa9c..a9d305ec83 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2899,7 +2899,7 @@ BattleScript_FaintedMonTryChooseAnother:: switchindataupdate BS_ATTACKER hpthresholds BS_ATTACKER printstring STRINGID_SWITCHINMON - atk62 BS_ATTACKER + hidepartystatussummary BS_ATTACKER switchinanim BS_ATTACKER, 0x0 waitstate switchineffects BS_ATTACKER @@ -2910,7 +2910,7 @@ BattleScript_FaintedMonChooseAnother:: switchindataupdate BS_FAINTED hpthresholds BS_FAINTED printstring STRINGID_SWITCHINMON - atk62 BS_FAINTED + hidepartystatussummary BS_FAINTED switchinanim BS_FAINTED, FALSE waitstate various7 BS_ATTACKER @@ -2933,7 +2933,7 @@ BattleScript_82DA908:: switchindataupdate BS_FAINTED hpthresholds BS_FAINTED printstring STRINGID_SWITCHINMON - atk62 BS_FAINTED + hidepartystatussummary BS_FAINTED switchinanim BS_FAINTED, FALSE waitstate switchineffects 5 @@ -3136,7 +3136,7 @@ BattleScript_DoSwitchOut:: switchindataupdate BS_ATTACKER hpthresholds BS_ATTACKER printstring STRINGID_SWITCHINMON - atk62 BS_ATTACKER + hidepartystatussummary BS_ATTACKER switchinanim BS_ATTACKER, FALSE waitstate switchineffects BS_ATTACKER diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 8020d7c5c1..1fbaa9536b 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -44,7 +44,7 @@ gBattlescriptsForSafariActions:: @ 82DBD58 .4byte BattleScript_ActionWatchesCarefully .4byte BattleScript_ActionGetNear .4byte BattleScript_ActionThrowPokeblock - .4byte BattleScript_82DBEE3 + .4byte BattleScript_ActionWallyThrow BattleScript_BallThrow:: jumpifword CMP_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_WALLY_TUTORIAL, BattleScript_BallThrowByWally @@ -176,17 +176,17 @@ BattleScript_RunByUsingItem:: setbyte gBattleOutcome, B_OUTCOME_RAN finishturn -BattleScript_ActionWatchesCarefully:: +BattleScript_ActionWatchesCarefully: printstring STRINGID_PKMNWATCHINGCAREFULLY waitmessage 0x40 end2 -BattleScript_ActionGetNear:: +BattleScript_ActionGetNear: printfromtable gSafariGetNearStringIds waitmessage 0x40 end2 -BattleScript_ActionThrowPokeblock:: +BattleScript_ActionThrowPokeblock: printstring STRINGID_THREWPOKEBLOCKATPKMN waitmessage 0x40 playanimation BS_ATTACKER, B_ANIM_x4, NULL @@ -194,7 +194,7 @@ BattleScript_ActionThrowPokeblock:: waitmessage 0x40 end2 -BattleScript_82DBEE3:: +BattleScript_ActionWallyThrow: printstring STRINGID_RETURNMON waitmessage 0x40 returnatktoball diff --git a/include/battle.h b/include/battle.h index 2651407fba..20a6cf1b88 100644 --- a/include/battle.h +++ b/include/battle.h @@ -336,20 +336,20 @@ struct BattleResults u8 unk5_0:1; // 0x5 u8 usedMasterBall:1; // 0x5 u8 caughtMonBall:4; // 0x5 - u8 unk5_6:1; // 0x5 + u8 shinyWildMon:1; // 0x5 u8 unk5_7:1; // 0x5 u16 playerMon1Species; // 0x6 - u8 playerMon1Name[11]; // 0x8 + u8 playerMon1Name[POKEMON_NAME_LENGTH + 1]; // 0x8 u8 battleTurnCounter; // 0x13 - u8 playerMon2Name[11]; // 0x14 - u8 field_1F; // 0x1F + u8 playerMon2Name[POKEMON_NAME_LENGTH + 1]; // 0x14 + u8 pokeblockThrows; // 0x1F u16 lastOpponentSpecies; // 0x20 u16 lastUsedMovePlayer; // 0x22 u16 lastUsedMoveOpponent; // 0x24 u16 playerMon2Species; // 0x26 u16 caughtMonSpecies; // 0x28 - u8 caughtMonNick[10]; // 0x2A - u8 filler34[2]; // 0x34 + u8 caughtMonNick[POKEMON_NAME_LENGTH + 1]; // 0x2A + u8 filler35[1]; // 0x35 u8 catchAttempts[11]; // 0x36 }; @@ -663,13 +663,13 @@ struct BattleAnimationInfo struct BattleHealthboxInfo { - u8 flag_x1:1; + u8 partyStatusSummaryShown:1; u8 healthboxIsBouncing:1; u8 battlerIsBouncing:1; u8 ballAnimActive:1; // 0x8 u8 statusAnimActive:1; // x10 u8 animFromTableActive:1; // x20 - u8 specialAnimActive:1; //x40 + u8 specialAnimActive:1; // x40 u8 flag_x80:1; u8 field_1_x1:1; u8 field_1_x1E:4; @@ -733,7 +733,7 @@ extern u8 gBattlersCount; extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT]; extern u8 gBattlerPositions[MAX_BATTLERS_COUNT]; extern u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT]; -extern u8 gBattleTurnOrder[MAX_BATTLERS_COUNT]; +extern u8 gBattlerByTurnOrder[MAX_BATTLERS_COUNT]; extern u8 gCurrentTurnActionNumber; extern u8 gCurrentActionFuncId; extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT]; diff --git a/include/battle_controllers.h b/include/battle_controllers.h index c5f5f48d7b..61e2935b7a 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -160,7 +160,7 @@ enum CONTROLLER_INTROSLIDE, CONTROLLER_INTROTRAINERBALLTHROW, CONTROLLER_DRAWPARTYSTATUSSUMMARY, - CONTROLLER_49, + CONTROLLER_HIDEPARTYSTATUSSUMMARY, CONTROLLER_ENDBOUNCE, CONTROLLER_SPRITEINVISIBILITY, CONTROLLER_BATTLEANIMATION, @@ -230,13 +230,13 @@ void BtlController_EmitFaintingCry(u8 bufferId); void BtlController_EmitIntroSlide(u8 bufferId, u8 terrainId); void BtlController_EmitIntroTrainerBallThrow(u8 bufferId); void BtlController_EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus* hpAndStatus, u8 arg2); -void BtlController_EmitCmd49(u8 bufferId); +void BtlController_EmitHidePartyStatusSummary(u8 bufferId); void BtlController_EmitEndBounceEffect(u8 bufferId); void BtlController_EmitSpriteInvisibility(u8 bufferId, bool8 isInvisible); void BtlController_EmitBattleAnimation(u8 bufferId, u8 animationId, u16 argument); void BtlController_EmitLinkStandbyMsg(u8 bufferId, u8 arg1, bool32 arg2); void BtlController_EmitResetActionMoveSelection(u8 bufferId, u8 caseId); -void BtlController_EmitCmd55(u8 bufferId, u8 arg1); +void BtlController_EmitCmd55(u8 bufferId, u8 battleOutcome); // player controller void SetControllerToPlayer(void); diff --git a/include/battle_interface.h b/include/battle_interface.h index b917d2cb35..2d93811f18 100644 --- a/include/battle_interface.h +++ b/include/battle_interface.h @@ -72,7 +72,7 @@ void InitBattlerHealthboxCoords(u8 bank); void UpdateHpTextInHealthbox(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent); void SwapHpBarsWithHpText(void); u8 CreatePartyStatusSummarySprites(u8 bank, struct HpAndStatus *partyInfo, u8 arg2, bool8 isBattleStart); -void sub_8073C30(u8 taskId); +void Task_HidePartyStatusSummary(u8 taskId); void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elementId); s32 MoveBattleBar(u8 bank, u8 healthboxSpriteId, u8 whichBar, u8 arg3); u8 GetScaledHPFraction(s16 hp, s16 maxhp, u8 scale); diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 0a53c28938..aa98b179d3 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -89,7 +89,7 @@ static void LinkOpponentHandleFaintingCry(void); static void LinkOpponentHandleIntroSlide(void); static void LinkOpponentHandleIntroTrainerBallThrow(void); static void LinkOpponentHandleDrawPartyStatusSummary(void); -static void LinkOpponentHandleCmd49(void); +static void LinkOpponentHandleHidePartyStatusSummary(void); static void LinkOpponentHandleEndBounceEffect(void); static void LinkOpponentHandleSpriteInvisibility(void); static void LinkOpponentHandleBattleAnimation(void); @@ -161,7 +161,7 @@ static void (*const sLinkOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) = LinkOpponentHandleIntroSlide, LinkOpponentHandleIntroTrainerBallThrow, LinkOpponentHandleDrawPartyStatusSummary, - LinkOpponentHandleCmd49, + LinkOpponentHandleHidePartyStatusSummary, LinkOpponentHandleEndBounceEffect, LinkOpponentHandleSpriteInvisibility, LinkOpponentHandleBattleAnimation, @@ -1716,8 +1716,8 @@ static void LinkOpponentHandleIntroTrainerBallThrow(void) taskId = CreateTask(sub_8067618, 5); gTasks[taskId].data[0] = gActiveBattler; - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; gBattleSpritesDataPtr->animationData->field_9_x1 = 1; gBattlerControllerFuncs[gActiveBattler] = nullsub_28; @@ -1762,7 +1762,7 @@ static void LinkOpponentHandleDrawPartyStatusSummary(void) } else { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown = 1; if (gBattleBufferA[gActiveBattler][2] != 0) { @@ -1796,10 +1796,10 @@ static void sub_806782C(void) } } -static void LinkOpponentHandleCmd49(void) +static void LinkOpponentHandleHidePartyStatusSummary(void) { - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; LinkOpponentBufferExecCompleted(); } diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index f5987c0ce0..be9609e624 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -87,7 +87,7 @@ static void LinkPartnerHandleFaintingCry(void); static void LinkPartnerHandleIntroSlide(void); static void LinkPartnerHandleIntroTrainerBallThrow(void); static void LinkPartnerHandleDrawPartyStatusSummary(void); -static void LinkPartnerHandleCmd49(void); +static void LinkPartnerHandleHidePartyStatusSummary(void); static void LinkPartnerHandleEndBounceEffect(void); static void LinkPartnerHandleSpriteInvisibility(void); static void LinkPartnerHandleBattleAnimation(void); @@ -158,7 +158,7 @@ static void (*const sLinkPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = LinkPartnerHandleIntroSlide, LinkPartnerHandleIntroTrainerBallThrow, LinkPartnerHandleDrawPartyStatusSummary, - LinkPartnerHandleCmd49, + LinkPartnerHandleHidePartyStatusSummary, LinkPartnerHandleEndBounceEffect, LinkPartnerHandleSpriteInvisibility, LinkPartnerHandleBattleAnimation, @@ -1564,8 +1564,8 @@ static void LinkPartnerHandleIntroTrainerBallThrow(void) taskId = CreateTask(sub_814DCCC, 5); gTasks[taskId].data[0] = gActiveBattler; - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; gBattleSpritesDataPtr->animationData->field_9_x1 = 1; gBattlerControllerFuncs[gActiveBattler] = nullsub_112; @@ -1611,7 +1611,7 @@ static void LinkPartnerHandleDrawPartyStatusSummary(void) } else { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown = 1; gBattlerStatusSummaryTaskId[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]); gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0; @@ -1631,10 +1631,10 @@ static void sub_814DE9C(void) } } -static void LinkPartnerHandleCmd49(void) +static void LinkPartnerHandleHidePartyStatusSummary(void) { - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; LinkPartnerBufferExecCompleted(); } diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 83dac5436d..414e084eef 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -94,7 +94,7 @@ static void OpponentHandleFaintingCry(void); static void OpponentHandleIntroSlide(void); static void OpponentHandleIntroTrainerBallThrow(void); static void OpponentHandleDrawPartyStatusSummary(void); -static void OpponentHandleCmd49(void); +static void OpponentHandleHidePartyStatusSummary(void); static void OpponentHandleEndBounceEffect(void); static void OpponentHandleSpriteInvisibility(void); static void OpponentHandleBattleAnimation(void); @@ -166,7 +166,7 @@ static void (*const sOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) = OpponentHandleIntroSlide, OpponentHandleIntroTrainerBallThrow, OpponentHandleDrawPartyStatusSummary, - OpponentHandleCmd49, + OpponentHandleHidePartyStatusSummary, OpponentHandleEndBounceEffect, OpponentHandleSpriteInvisibility, OpponentHandleBattleAnimation, @@ -1865,8 +1865,8 @@ static void OpponentHandleIntroTrainerBallThrow(void) taskId = CreateTask(sub_8062828, 5); gTasks[taskId].data[0] = gActiveBattler; - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; gBattleSpritesDataPtr->animationData->field_9_x1 = 1; gBattlerControllerFuncs[gActiveBattler] = nullsub_26; @@ -1916,7 +1916,7 @@ static void OpponentHandleDrawPartyStatusSummary(void) } else { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown = 1; if (gBattleBufferA[gActiveBattler][2] != 0) { @@ -1950,10 +1950,10 @@ static void sub_8062A2C(void) } } -static void OpponentHandleCmd49(void) +static void OpponentHandleHidePartyStatusSummary(void) { - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; OpponentBufferExecCompleted(); } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 63dc989be2..86775f50ef 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -100,7 +100,7 @@ static void PlayerHandleFaintingCry(void); static void PlayerHandleIntroSlide(void); static void PlayerHandleIntroTrainerBallThrow(void); static void PlayerHandleDrawPartyStatusSummary(void); -static void PlayerHandleCmd49(void); +static void PlayerHandleHidePartyStatusSummary(void); static void PlayerHandleEndBounceEffect(void); static void PlayerHandleSpriteInvisibility(void); static void PlayerHandleBattleAnimation(void); @@ -187,7 +187,7 @@ static void (*const sPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = PlayerHandleIntroSlide, PlayerHandleIntroTrainerBallThrow, PlayerHandleDrawPartyStatusSummary, - PlayerHandleCmd49, + PlayerHandleHidePartyStatusSummary, PlayerHandleEndBounceEffect, PlayerHandleSpriteInvisibility, PlayerHandleBattleAnimation, @@ -253,7 +253,7 @@ static void HandleInputChooseAction(void) DoBounceEffect(gActiveBattler, BOUNCE_HEALTHBOX, 7, 1); DoBounceEffect(gActiveBattler, BOUNCE_MON, 7, 1); - if (gMain.newAndRepeatedKeys & DPAD_ANY && gSaveBlock2Ptr->optionsButtonMode == 2) + if (gMain.newAndRepeatedKeys & DPAD_ANY && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_L_EQUALS_A) gPlayerDpadHoldFrames++; else gPlayerDpadHoldFrames = 0; @@ -485,7 +485,7 @@ static void HandleInputChooseMove(void) bool32 canSelectTarget = FALSE; struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBattler][4]); - if (gMain.heldKeys & DPAD_ANY && gSaveBlock2Ptr->optionsButtonMode == 2) + if (gMain.heldKeys & DPAD_ANY && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_L_EQUALS_A) gPlayerDpadHoldFrames++; else gPlayerDpadHoldFrames = 0; @@ -2945,8 +2945,8 @@ static void PlayerHandleIntroTrainerBallThrow(void) taskId = CreateTask(task05_08033660, 5); gTasks[taskId].data[0] = gActiveBattler; - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; gBattleSpritesDataPtr->animationData->field_9_x1 = 1; gBattlerControllerFuncs[gActiveBattler] = nullsub_21; @@ -3003,7 +3003,7 @@ static void PlayerHandleDrawPartyStatusSummary(void) } else { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown = 1; gBattlerStatusSummaryTaskId[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]); gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0; @@ -3023,10 +3023,10 @@ static void sub_805CE38(void) } } -static void PlayerHandleCmd49(void) +static void PlayerHandleHidePartyStatusSummary(void) { - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; PlayerBufferExecCompleted(); } diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index 17ed1c24f5..6a70200b62 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -87,7 +87,7 @@ static void PlayerPartnerHandleFaintingCry(void); static void PlayerPartnerHandleIntroSlide(void); static void PlayerPartnerHandleIntroTrainerBallThrow(void); static void PlayerPartnerHandleDrawPartyStatusSummary(void); -static void PlayerPartnerHandleCmd49(void); +static void PlayerPartnerHandleHidePartyStatusSummary(void); static void PlayerPartnerHandleEndBounceEffect(void); static void PlayerPartnerHandleSpriteInvisibility(void); static void PlayerPartnerHandleBattleAnimation(void); @@ -164,7 +164,7 @@ static void (*const sPlayerPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = PlayerPartnerHandleIntroSlide, PlayerPartnerHandleIntroTrainerBallThrow, PlayerPartnerHandleDrawPartyStatusSummary, - PlayerPartnerHandleCmd49, + PlayerPartnerHandleHidePartyStatusSummary, PlayerPartnerHandleEndBounceEffect, PlayerPartnerHandleSpriteInvisibility, PlayerPartnerHandleBattleAnimation, @@ -1810,8 +1810,8 @@ static void PlayerPartnerHandleIntroTrainerBallThrow(void) taskId = CreateTask(sub_81BE2C8, 5); gTasks[taskId].data[0] = gActiveBattler; - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; gBattleSpritesDataPtr->animationData->field_9_x1 = 1; gBattlerControllerFuncs[gActiveBattler] = nullsub_77; @@ -1857,7 +1857,7 @@ static void PlayerPartnerHandleDrawPartyStatusSummary(void) } else { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown = 1; gBattlerStatusSummaryTaskId[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]); gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0; @@ -1877,10 +1877,10 @@ static void sub_81BE498(void) } } -static void PlayerPartnerHandleCmd49(void) +static void PlayerPartnerHandleHidePartyStatusSummary(void) { - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; PlayerPartnerBufferExecCompleted(); } diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 9d213fc6bb..4b44116dd0 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -90,7 +90,7 @@ static void RecordedOpponentHandleFaintingCry(void); static void RecordedOpponentHandleIntroSlide(void); static void RecordedOpponentHandleIntroTrainerBallThrow(void); static void RecordedOpponentHandleDrawPartyStatusSummary(void); -static void RecordedOpponentHandleCmd49(void); +static void RecordedOpponentHandleHidePartyStatusSummary(void); static void RecordedOpponentHandleEndBounceEffect(void); static void RecordedOpponentHandleSpriteInvisibility(void); static void RecordedOpponentHandleBattleAnimation(void); @@ -162,7 +162,7 @@ static void (*const sRecordedOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void RecordedOpponentHandleIntroSlide, RecordedOpponentHandleIntroTrainerBallThrow, RecordedOpponentHandleDrawPartyStatusSummary, - RecordedOpponentHandleCmd49, + RecordedOpponentHandleHidePartyStatusSummary, RecordedOpponentHandleEndBounceEffect, RecordedOpponentHandleSpriteInvisibility, RecordedOpponentHandleBattleAnimation, @@ -1658,8 +1658,8 @@ static void RecordedOpponentHandleIntroTrainerBallThrow(void) taskId = CreateTask(sub_8189548, 5); gTasks[taskId].data[0] = gActiveBattler; - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; gBattleSpritesDataPtr->animationData->field_9_x1 = 1; gBattlerControllerFuncs[gActiveBattler] = nullsub_70; @@ -1704,7 +1704,7 @@ static void RecordedOpponentHandleDrawPartyStatusSummary(void) } else { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown = 1; if (gBattleBufferA[gActiveBattler][2] != 0) { @@ -1738,10 +1738,10 @@ static void sub_818975C(void) } } -static void RecordedOpponentHandleCmd49(void) +static void RecordedOpponentHandleHidePartyStatusSummary(void) { - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; RecordedOpponentBufferExecCompleted(); } diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index d1836c092c..b6a96b6fd8 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -89,7 +89,7 @@ static void RecordedPlayerHandleFaintingCry(void); static void RecordedPlayerHandleIntroSlide(void); static void RecordedPlayerHandleIntroTrainerBallThrow(void); static void RecordedPlayerHandleDrawPartyStatusSummary(void); -static void RecordedPlayerHandleCmd49(void); +static void RecordedPlayerHandleHidePartyStatusSummary(void); static void RecordedPlayerHandleEndBounceEffect(void); static void RecordedPlayerHandleSpriteInvisibility(void); static void RecordedPlayerHandleBattleAnimation(void); @@ -160,7 +160,7 @@ static void (*const sRecordedPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) RecordedPlayerHandleIntroSlide, RecordedPlayerHandleIntroTrainerBallThrow, RecordedPlayerHandleDrawPartyStatusSummary, - RecordedPlayerHandleCmd49, + RecordedPlayerHandleHidePartyStatusSummary, RecordedPlayerHandleEndBounceEffect, RecordedPlayerHandleSpriteInvisibility, RecordedPlayerHandleBattleAnimation, @@ -1693,8 +1693,8 @@ static void RecordedPlayerHandleIntroTrainerBallThrow(void) taskId = CreateTask(sub_818CC24, 5); gTasks[taskId].data[0] = gActiveBattler; - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; gBattleSpritesDataPtr->animationData->field_9_x1 = 1; gBattlerControllerFuncs[gActiveBattler] = nullsub_120; @@ -1740,7 +1740,7 @@ static void RecordedPlayerHandleDrawPartyStatusSummary(void) } else { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown = 1; gBattlerStatusSummaryTaskId[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]); gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0; @@ -1760,10 +1760,10 @@ static void sub_818CDF4(void) } } -static void RecordedPlayerHandleCmd49(void) +static void RecordedPlayerHandleHidePartyStatusSummary(void) { - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; RecordedPlayerBufferExecCompleted(); } diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index 3cdd952efc..bc69e2624f 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -80,7 +80,7 @@ static void SafariHandleFaintingCry(void); static void SafariHandleIntroSlide(void); static void SafariHandleIntroTrainerBallThrow(void); static void SafariHandleDrawPartyStatusSummary(void); -static void SafariHandleCmd49(void); +static void SafariHandleHidePartyStatusSummary(void); static void SafariHandleEndBounceEffect(void); static void SafariHandleSpriteInvisibility(void); static void SafariHandleBattleAnimation(void); @@ -144,7 +144,7 @@ static void (*const sSafariBufferCommands[CONTROLLER_CMDS_COUNT])(void) = SafariHandleIntroSlide, SafariHandleIntroTrainerBallThrow, SafariHandleDrawPartyStatusSummary, - SafariHandleCmd49, + SafariHandleHidePartyStatusSummary, SafariHandleEndBounceEffect, SafariHandleSpriteInvisibility, SafariHandleBattleAnimation, @@ -645,7 +645,7 @@ static void SafariHandleDrawPartyStatusSummary(void) SafariBufferExecCompleted(); } -static void SafariHandleCmd49(void) +static void SafariHandleHidePartyStatusSummary(void) { SafariBufferExecCompleted(); } diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index 05c7b9e1fd..5399ccbf00 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -90,7 +90,7 @@ static void WallyHandleFaintingCry(void); static void WallyHandleIntroSlide(void); static void WallyHandleIntroTrainerBallThrow(void); static void WallyHandleDrawPartyStatusSummary(void); -static void WallyHandleCmd49(void); +static void WallyHandleHidePartyStatusSummary(void); static void WallyHandleEndBounceEffect(void); static void WallyHandleSpriteInvisibility(void); static void WallyHandleBattleAnimation(void); @@ -159,7 +159,7 @@ static void (*const sWallyBufferCommands[CONTROLLER_CMDS_COUNT])(void) = WallyHandleIntroSlide, WallyHandleIntroTrainerBallThrow, WallyHandleDrawPartyStatusSummary, - WallyHandleCmd49, + WallyHandleHidePartyStatusSummary, WallyHandleEndBounceEffect, WallyHandleSpriteInvisibility, WallyHandleBattleAnimation, @@ -1450,8 +1450,8 @@ static void WallyHandleIntroTrainerBallThrow(void) taskId = CreateTask(sub_816AC04, 5); gTasks[taskId].data[0] = gActiveBattler; - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; gBattleSpritesDataPtr->animationData->field_9_x1 = 1; gBattlerControllerFuncs[gActiveBattler] = nullsub_21; @@ -1511,13 +1511,13 @@ static void WallyHandleDrawPartyStatusSummary(void) } else { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown = 1; gBattlerStatusSummaryTaskId[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]); WallyBufferExecCompleted(); } } -static void WallyHandleCmd49(void) +static void WallyHandleHidePartyStatusSummary(void) { WallyBufferExecCompleted(); } diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 1c60e22efd..4da941ab05 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -1449,17 +1449,17 @@ void BtlController_EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus* h sBattleBuffersTransferData[1] = arg2 & 0x7F; sBattleBuffersTransferData[2] = (arg2 & 0x80) >> 7; sBattleBuffersTransferData[3] = CONTROLLER_DRAWPARTYSTATUSSUMMARY; - for (i = 0; i < (s32)(sizeof(struct HpAndStatus) * 6); i++) + for (i = 0; i < (s32)(sizeof(struct HpAndStatus) * PARTY_SIZE); i++) sBattleBuffersTransferData[4 + i] = *(i + (u8*)(hpAndStatus)); - PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, sizeof(struct HpAndStatus) * 6 + 4); + PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, sizeof(struct HpAndStatus) * PARTY_SIZE + 4); } -void BtlController_EmitCmd49(u8 bufferId) +void BtlController_EmitHidePartyStatusSummary(u8 bufferId) { - sBattleBuffersTransferData[0] = CONTROLLER_49; - sBattleBuffersTransferData[1] = CONTROLLER_49; - sBattleBuffersTransferData[2] = CONTROLLER_49; - sBattleBuffersTransferData[3] = CONTROLLER_49; + sBattleBuffersTransferData[0] = CONTROLLER_HIDEPARTYSTATUSSUMMARY; + sBattleBuffersTransferData[1] = CONTROLLER_HIDEPARTYSTATUSSUMMARY; + sBattleBuffersTransferData[2] = CONTROLLER_HIDEPARTYSTATUSSUMMARY; + sBattleBuffersTransferData[3] = CONTROLLER_HIDEPARTYSTATUSSUMMARY; PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 4); } @@ -1511,10 +1511,10 @@ void BtlController_EmitResetActionMoveSelection(u8 bufferId, u8 caseId) PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 2); } -void BtlController_EmitCmd55(u8 bufferId, u8 arg1) +void BtlController_EmitCmd55(u8 bufferId, u8 battleOutcome) { sBattleBuffersTransferData[0] = CONTROLLER_55; - sBattleBuffersTransferData[1] = arg1; + sBattleBuffersTransferData[1] = battleOutcome; sBattleBuffersTransferData[2] = gSaveBlock2Ptr->field_CA9_b; sBattleBuffersTransferData[3] = gSaveBlock2Ptr->field_CA9_b; sBattleBuffersTransferData[5] = sBattleBuffersTransferData[4] = sub_81850DC(&sBattleBuffersTransferData[6]); diff --git a/src/battle_interface.c b/src/battle_interface.c index f5e031cb92..6a30ed487b 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -1695,7 +1695,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, return taskId; } -void sub_8073C30(u8 taskId) +void Task_HidePartyStatusSummary(u8 taskId) { u8 ballIconSpriteIds[PARTY_SIZE]; bool8 isBattleStart; @@ -1707,7 +1707,7 @@ void sub_8073C30(u8 taskId) summaryBarSpriteId = gTasks[taskId].tSummaryBarSpriteId; battlerId = gTasks[taskId].tBattler; - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) ballIconSpriteIds[i] = gTasks[taskId].tBallIconSpriteId(i); SetGpuReg(REG_OFFSET_BLDCNT, 0x3F40); @@ -1755,12 +1755,12 @@ static void sub_8073E08(u8 taskId) { if ((gTasks[taskId].data[11]++ % 2) == 0) { - if (--gTasks[taskId].data[15] < 0) + if (--gTasks[taskId].tData15 < 0) return; SetGpuReg(REG_OFFSET_BLDALPHA, (gTasks[taskId].data[15]) | ((16 - gTasks[taskId].data[15]) << 8)); } - if (gTasks[taskId].data[15] == 0) + if (gTasks[taskId].tData15 == 0) gTasks[taskId].func = sub_8073E64; } @@ -1796,7 +1796,7 @@ static void sub_8073E64(u8 taskId) } else if (gTasks[taskId].tData15 == -3) { - gBattleSpritesDataPtr->healthBoxesData[battlerId].flag_x1 = 0; + gBattleSpritesDataPtr->healthBoxesData[battlerId].partyStatusSummaryShown = 0; SetGpuReg(REG_OFFSET_BLDCNT, 0); SetGpuReg(REG_OFFSET_BLDALPHA, 0); DestroyTask(taskId); @@ -1828,7 +1828,7 @@ static void sub_8073F98(u8 taskId) } else if (gTasks[taskId].tData15 == -3) { - gBattleSpritesDataPtr->healthBoxesData[battlerId].flag_x1 = 0; + gBattleSpritesDataPtr->healthBoxesData[battlerId].partyStatusSummaryShown = 0; SetGpuReg(REG_OFFSET_BLDCNT, 0); SetGpuReg(REG_OFFSET_BLDALPHA, 0); DestroyTask(taskId); diff --git a/src/battle_main.c b/src/battle_main.c index 9afbc7f403..a0d812a94f 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -82,15 +82,15 @@ extern struct MusicPlayerInfo gMPlayInfo_SE1; extern struct MusicPlayerInfo gMPlayInfo_SE2; extern u8 gUnknown_0203CF00[]; -extern const u16 gBattleTextboxPalette[]; // battle textbox palette +extern const u16 gBattleTextboxPalette[]; extern const struct BgTemplate gBattleBgTemplates[]; -extern const struct WindowTemplate * const gBattleWindowTemplates[]; +extern const struct WindowTemplate *const gBattleWindowTemplates[]; extern const u8 gUnknown_0831ACE0[]; -extern const u8 * const gBattleScriptsForMoveEffects[]; -extern const u8 * const gBattlescriptsForBallThrow[]; -extern const u8 * const gBattlescriptsForRunningByItem[]; -extern const u8 * const gBattlescriptsForUsingItem[]; -extern const u8 * const gBattlescriptsForSafariActions[]; +extern const u8 *const gBattleScriptsForMoveEffects[]; +extern const u8 *const gBattlescriptsForBallThrow[]; +extern const u8 *const gBattlescriptsForRunningByItem[]; +extern const u8 *const gBattlescriptsForUsingItem[]; +extern const u8 *const gBattlescriptsForSafariActions[]; extern const struct ScanlineEffectParams gUnknown_0831AC70; // strings @@ -206,7 +206,7 @@ EWRAM_DATA u8 gBattlersCount = 0; EWRAM_DATA u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT] = {0}; EWRAM_DATA u8 gBattlerPositions[MAX_BATTLERS_COUNT] = {0}; EWRAM_DATA u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT] = {0}; -EWRAM_DATA u8 gBattleTurnOrder[MAX_BATTLERS_COUNT] = {0}; +EWRAM_DATA u8 gBattlerByTurnOrder[MAX_BATTLERS_COUNT] = {0}; EWRAM_DATA u8 gCurrentTurnActionNumber = 0; EWRAM_DATA u8 gCurrentActionFuncId = 0; EWRAM_DATA struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT] = {0}; @@ -3067,7 +3067,7 @@ static void BattleStartClearSetData(void) for (i = 0; i < MAX_BATTLERS_COUNT; i++) { - *(gBattleStruct->AI_monToSwitchIntoId + i) = 6; + *(gBattleStruct->AI_monToSwitchIntoId + i) = PARTY_SIZE; } gBattleStruct->field_DF = 0; @@ -3079,7 +3079,7 @@ static void BattleStartClearSetData(void) for (i = 0; i < sizeof(struct BattleResults); i++) dataPtr[i] = 0; - gBattleResults.unk5_6 = IsMonShiny(&gEnemyParty[0]); + gBattleResults.shinyWildMon = IsMonShiny(&gEnemyParty[0]); gBattleStruct->field_2A0 = 0; gBattleStruct->field_2A1 = 0; @@ -3427,7 +3427,7 @@ static void BattleIntroDrawTrainersOrMonsSprites(void) static void BattleIntroDrawPartySummaryScreens(void) { s32 i; - struct HpAndStatus hpStatus[6]; + struct HpAndStatus hpStatus[PARTY_SIZE]; if (gBattleControllerExecFlags) return; @@ -3478,7 +3478,7 @@ static void BattleIntroDrawPartySummaryScreens(void) // wild battles don't show the party summary. // Still, there's no point in having dead code. - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) { if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_NONE || GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_EGG) @@ -3848,12 +3848,12 @@ static void TryDoEventsBeforeFirstTurn(void) if (gBattleStruct->switchInAbilitiesCounter == 0) { for (i = 0; i < gBattlersCount; i++) - gBattleTurnOrder[i] = i; + gBattlerByTurnOrder[i] = i; for (i = 0; i < gBattlersCount - 1; i++) { for (j = i + 1; j < gBattlersCount; j++) { - if (GetWhoStrikesFirst(gBattleTurnOrder[i], gBattleTurnOrder[j], TRUE) != 0) + if (GetWhoStrikesFirst(gBattlerByTurnOrder[i], gBattlerByTurnOrder[j], TRUE) != 0) SwapTurnOrder(i, j); } } @@ -3864,10 +3864,10 @@ static void TryDoEventsBeforeFirstTurn(void) gBattleStruct->overworldWeatherDone = TRUE; return; } - // check all switch in abilities happening from the fastest mon to slowest + // Check all switch in abilities happening from the fastest mon to slowest. while (gBattleStruct->switchInAbilitiesCounter < gBattlersCount) { - if (AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, gBattleTurnOrder[gBattleStruct->switchInAbilitiesCounter], 0, 0, 0) != 0) + if (AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, gBattlerByTurnOrder[gBattleStruct->switchInAbilitiesCounter], 0, 0, 0) != 0) effect++; gBattleStruct->switchInAbilitiesCounter++; @@ -3879,10 +3879,10 @@ static void TryDoEventsBeforeFirstTurn(void) return; if (AbilityBattleEffects(ABILITYEFFECT_TRACE, 0, 0, 0, 0) != 0) return; - // check all switch in items having effect from the fastest mon to slowest + // Check all switch in items having effect from the fastest mon to slowest. while (gBattleStruct->switchInItemsCounter < gBattlersCount) { - if (ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gBattleTurnOrder[gBattleStruct->switchInItemsCounter], 0) != 0) + if (ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gBattlerByTurnOrder[gBattleStruct->switchInItemsCounter], 0) != 0) effect++; gBattleStruct->switchInItemsCounter++; @@ -3892,7 +3892,7 @@ static void TryDoEventsBeforeFirstTurn(void) } for (i = 0; i < MAX_BATTLERS_COUNT; i++) { - *(gBattleStruct->monToSwitchIntoId + i) = 6; + *(gBattleStruct->monToSwitchIntoId + i) = PARTY_SIZE; gChosenActionByBattler[i] = B_ACTION_NONE; gChosenMoveByBattler[i] = MOVE_NONE; } @@ -3958,15 +3958,15 @@ void BattleTurnPassed(void) TurnValuesCleanUp(TRUE); if (gBattleOutcome == 0) { - if (UpdateTurnCounters() != 0) + if (UpdateTurnCounters()) return; - if (TurnBasedEffects() != 0) + if (TurnBasedEffects()) return; } - if (HandleFaintedMonActions() != 0) + if (HandleFaintedMonActions()) return; gBattleStruct->faintedActionsState = 0; - if (HandleWishPerishSongOnTurnEnd() != 0) + if (HandleWishPerishSongOnTurnEnd()) return; TurnValuesCleanUp(FALSE); @@ -4003,7 +4003,7 @@ void BattleTurnPassed(void) } for (i = 0; i < 4; i++) - *(gBattleStruct->monToSwitchIntoId + i) = 6; + *(gBattleStruct->monToSwitchIntoId + i) = PARTY_SIZE; *(&gBattleStruct->field_91) = gAbsentBattlerFlags; BattlePutTextOnWindow(gText_EmptyString3, 0); @@ -4141,11 +4141,11 @@ static void HandleTurnActionSelectionState(void) gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN; break; case STATE_BEFORE_ACTION_CHOSEN: // choose an action - *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = 6; + *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = PARTY_SIZE; if (gBattleTypeFlags & BATTLE_TYPE_MULTI - || !(position & BIT_FLANK) + || (position & BIT_FLANK) == B_FLANK_LEFT || gBattleStruct->field_91 & gBitTable[GetBattlerAtPosition(BATTLE_PARTNER(position))] - || gBattleCommunication[GetBattlerAtPosition(BATTLE_PARTNER(position))] == 5) + || gBattleCommunication[GetBattlerAtPosition(BATTLE_PARTNER(position))] == STATE_WAIT_ACTION_CONFIRMED) { if (gBattleStruct->field_91 & gBitTable[gActiveBattler]) { @@ -4415,7 +4415,7 @@ static void HandleTurnActionSelectionState(void) } break; case B_ACTION_SWITCH: - if (gBattleBufferB[gActiveBattler][1] == 6) + if (gBattleBufferB[gActiveBattler][1] == PARTY_SIZE) { gBattleCommunication[gActiveBattler] = 1; RecordedBattle_ClearBattlerAction(gActiveBattler, 1); @@ -4591,9 +4591,9 @@ void SwapTurnOrder(u8 id1, u8 id2) gActionsByTurnOrder[id1] = gActionsByTurnOrder[id2]; gActionsByTurnOrder[id2] = temp; - temp = gBattleTurnOrder[id1]; - gBattleTurnOrder[id1] = gBattleTurnOrder[id2]; - gBattleTurnOrder[id2] = temp; + temp = gBattlerByTurnOrder[id1]; + gBattlerByTurnOrder[id1] = gBattlerByTurnOrder[id2]; + gBattlerByTurnOrder[id2] = temp; } u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves) @@ -4753,16 +4753,16 @@ u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves) static void SetActionsAndBattlersTurnOrder(void) { - s32 var = 0; + s32 turnOrderId = 0; s32 i, j; if (gBattleTypeFlags & BATTLE_TYPE_SAFARI) { for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++) { - gActionsByTurnOrder[var] = gChosenActionByBattler[gActiveBattler]; - gBattleTurnOrder[var] = gActiveBattler; - var++; + gActionsByTurnOrder[turnOrderId] = gChosenActionByBattler[gActiveBattler]; + gBattlerByTurnOrder[turnOrderId] = gActiveBattler; + turnOrderId++; } } else @@ -4773,7 +4773,7 @@ static void SetActionsAndBattlersTurnOrder(void) { if (gChosenActionByBattler[gActiveBattler] == B_ACTION_RUN) { - var = 5; + turnOrderId = 5; break; } } @@ -4783,27 +4783,27 @@ static void SetActionsAndBattlersTurnOrder(void) if (gChosenActionByBattler[0] == B_ACTION_RUN) { gActiveBattler = 0; - var = 5; + turnOrderId = 5; } if (gChosenActionByBattler[2] == B_ACTION_RUN) { gActiveBattler = 2; - var = 5; + turnOrderId = 5; } } - if (var == 5) + if (turnOrderId == 5) // One of battlers wants to run. { gActionsByTurnOrder[0] = gChosenActionByBattler[gActiveBattler]; - gBattleTurnOrder[0] = gActiveBattler; - var = 1; + gBattlerByTurnOrder[0] = gActiveBattler; + turnOrderId = 1; for (i = 0; i < gBattlersCount; i++) { if (i != gActiveBattler) { - gActionsByTurnOrder[var] = gChosenActionByBattler[i]; - gBattleTurnOrder[var] = i; - var++; + gActionsByTurnOrder[turnOrderId] = gChosenActionByBattler[i]; + gBattlerByTurnOrder[turnOrderId] = i; + turnOrderId++; } } gBattleMainFunc = CheckFocusPunch_ClearVarsBeforeTurnStarts; @@ -4816,26 +4816,26 @@ static void SetActionsAndBattlersTurnOrder(void) { if (gChosenActionByBattler[gActiveBattler] == B_ACTION_USE_ITEM || gChosenActionByBattler[gActiveBattler] == B_ACTION_SWITCH) { - gActionsByTurnOrder[var] = gChosenActionByBattler[gActiveBattler]; - gBattleTurnOrder[var] = gActiveBattler; - var++; + gActionsByTurnOrder[turnOrderId] = gChosenActionByBattler[gActiveBattler]; + gBattlerByTurnOrder[turnOrderId] = gActiveBattler; + turnOrderId++; } } for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++) { if (gChosenActionByBattler[gActiveBattler] != B_ACTION_USE_ITEM && gChosenActionByBattler[gActiveBattler] != B_ACTION_SWITCH) { - gActionsByTurnOrder[var] = gChosenActionByBattler[gActiveBattler]; - gBattleTurnOrder[var] = gActiveBattler; - var++; + gActionsByTurnOrder[turnOrderId] = gChosenActionByBattler[gActiveBattler]; + gBattlerByTurnOrder[turnOrderId] = gActiveBattler; + turnOrderId++; } } for (i = 0; i < gBattlersCount - 1; i++) { for (j = i + 1; j < gBattlersCount; j++) { - u8 battler1 = gBattleTurnOrder[i]; - u8 battler2 = gBattleTurnOrder[j]; + u8 battler1 = gBattlerByTurnOrder[i]; + u8 battler2 = gBattlerByTurnOrder[j]; if (gActionsByTurnOrder[i] != B_ACTION_USE_ITEM && gActionsByTurnOrder[j] != B_ACTION_USE_ITEM && gActionsByTurnOrder[i] != B_ACTION_SWITCH @@ -4882,7 +4882,7 @@ static void TurnValuesCleanUp(bool8 var0) } if (gDisableStructs[gActiveBattler].substituteHP == 0) - gBattleMons[gActiveBattler].status2 &= ~(STATUS2_SUBSTITUTE); + gBattleMons[gActiveBattler].status2 &= ~(STATUS2_SUBSTITUTE); } gSideTimers[0].followmeTimer = 0; @@ -5136,7 +5136,7 @@ static void HandleEndTurn_FinishBattle(void) | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_WALLY_TUTORIAL)) - && gBattleResults.unk5_6) + && gBattleResults.shinyWildMon) { sub_80EE184(); } @@ -5268,7 +5268,7 @@ static void HandleAction_UseMove(void) u8 side; u8 var = 4; - gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; if (*(&gBattleStruct->field_91) & gBitTable[gBattlerAttacker]) { @@ -5400,7 +5400,7 @@ static void HandleAction_UseMove(void) } else { - gActiveBattler = gBattleTurnOrder[var]; + gActiveBattler = gBattlerByTurnOrder[var]; RecordAbilityBattle(gActiveBattler, gBattleMons[gActiveBattler].ability); gSpecialStatuses[gActiveBattler].lightningRodRedirected = 1; gBattlerTarget = gActiveBattler; @@ -5482,7 +5482,7 @@ static void HandleAction_UseMove(void) static void HandleAction_Switch(void) { - gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; gBattle_BG0_X = 0; gBattle_BG0_Y = 0; gActionSelectionCursor[gBattlerAttacker] = 0; @@ -5500,7 +5500,7 @@ static void HandleAction_Switch(void) static void HandleAction_UseItem(void) { - gBattlerAttacker = gBattlerTarget = gBattleTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerTarget = gBattlerByTurnOrder[gCurrentTurnActionNumber]; gBattle_BG0_X = 0; gBattle_BG0_Y = 0; ClearFuryCutterDestinyBondGrudge(gBattlerAttacker); @@ -5659,7 +5659,7 @@ bool8 TryRunFromBattle(u8 battler) static void HandleAction_Run(void) { - gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) { @@ -5713,7 +5713,7 @@ static void HandleAction_Run(void) static void HandleAction_WatchesCarefully(void) { - gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; gBattle_BG0_X = 0; gBattle_BG0_Y = 0; gBattlescriptCurrInstr = gBattlescriptsForSafariActions[0]; @@ -5722,7 +5722,7 @@ static void HandleAction_WatchesCarefully(void) static void HandleAction_SafariZoneBallThrow(void) { - gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; gBattle_BG0_X = 0; gBattle_BG0_Y = 0; gNumSafariBalls--; @@ -5733,14 +5733,14 @@ static void HandleAction_SafariZoneBallThrow(void) static void HandleAction_ThrowPokeblock(void) { - gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; gBattle_BG0_X = 0; gBattle_BG0_Y = 0; gBattleCommunication[MULTISTRING_CHOOSER] = gBattleBufferB[gBattlerAttacker][1] - 1; gLastUsedItem = gBattleBufferB[gBattlerAttacker][2]; - if (gBattleResults.field_1F < 0xFF) - gBattleResults.field_1F++; + if (gBattleResults.pokeblockThrows < 0xFF) + gBattleResults.pokeblockThrows++; if (gBattleStruct->field_7A < 3) gBattleStruct->field_7A++; if (gBattleStruct->field_7B > 1) @@ -5757,7 +5757,7 @@ static void HandleAction_ThrowPokeblock(void) static void HandleAction_GoNear(void) { - gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; gBattle_BG0_X = 0; gBattle_BG0_Y = 0; @@ -5784,7 +5784,7 @@ static void HandleAction_GoNear(void) static void HandleAction_SafriZoneRun(void) { - gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; PlaySE(SE_NIGERU); gCurrentTurnActionNumber = gBattlersCount; gBattleOutcome = B_OUTCOME_RAN; @@ -5792,7 +5792,7 @@ static void HandleAction_SafriZoneRun(void) static void HandleAction_WallyBallThrow(void) { - gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; gBattle_BG0_X = 0; gBattle_BG0_Y = 0; @@ -5825,7 +5825,7 @@ static void HandleAction_NothingIsFainted(void) static void HandleAction_ActionFinished(void) { - *(gBattleStruct->monToSwitchIntoId + gBattleTurnOrder[gCurrentTurnActionNumber]) = 6; + *(gBattleStruct->monToSwitchIntoId + gBattlerByTurnOrder[gCurrentTurnActionNumber]) = 6; gCurrentTurnActionNumber++; gCurrentActionFuncId = gActionsByTurnOrder[gCurrentTurnActionNumber]; SpecialStatusesClear(); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index c26e5ac114..fb77ab4c41 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -188,7 +188,7 @@ static void atk5E(void); static void atk5F(void); static void atk60_incrementgamestat(void); static void atk61_drawpartystatussummary(void); -static void atk62(void); +static void atk62_hidepartystatussummary(void); static void atk63_jumptorandomattack(void); static void atk64_statusanimation(void); static void atk65_status2animation(void); @@ -440,7 +440,7 @@ void (* const gBattleScriptingCommandsTable[])(void) = atk5F, atk60_incrementgamestat, atk61_drawpartystatussummary, - atk62, + atk62_hidepartystatussummary, atk63_jumptorandomattack, atk64_statusanimation, atk65_status2animation, @@ -989,11 +989,11 @@ static void atk00_attackcanceler(void) for (i = 0; i < gBattlersCount; i++) { - if ((gProtectStructs[gBattleTurnOrder[i]].stealMove) && gBattleMoves[gCurrentMove].flags & FLAG_SNATCH_AFFECTED) + if ((gProtectStructs[gBattlerByTurnOrder[i]].stealMove) && gBattleMoves[gCurrentMove].flags & FLAG_SNATCH_AFFECTED) { - PressurePPLose(gBattlerAttacker, gBattleTurnOrder[i], MOVE_SNATCH); - gProtectStructs[gBattleTurnOrder[i]].stealMove = 0; - gBattleScripting.battler = gBattleTurnOrder[i]; + PressurePPLose(gBattlerAttacker, gBattlerByTurnOrder[i], MOVE_SNATCH); + gProtectStructs[gBattlerByTurnOrder[i]].stealMove = 0; + gBattleScripting.battler = gBattlerByTurnOrder[i]; BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_SnatchedMove; return; @@ -2216,7 +2216,7 @@ u8 GetBattlerTurnOrderNum(u8 battlerId) s32 i; for (i = 0; i < gBattlersCount; i++) { - if (gBattleTurnOrder[i] == battlerId) + if (gBattlerByTurnOrder[i] == battlerId) break; } return i; @@ -5556,7 +5556,7 @@ static void atk52_switchineffects(void) for (i = 0; i < gBattlersCount; i++) { - if (gBattleTurnOrder[i] == gActiveBattler) + if (gBattlerByTurnOrder[i] == gActiveBattler) gActionsByTurnOrder[i] = B_ACTION_CANCEL_PARTNER; } @@ -6021,10 +6021,10 @@ static void atk61_drawpartystatussummary(void) gBattlescriptCurrInstr += 2; } -static void atk62(void) +static void atk62_hidepartystatussummary(void) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); - BtlController_EmitCmd49(0); + BtlController_EmitHidePartyStatusSummary(0); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 2; @@ -8957,7 +8957,7 @@ static void atkBA_jumpifnopursuitswitchdmg(void) for (i = 0; i < gBattlersCount; i++) { - if (gBattleTurnOrder[i] == gBattlerTarget) + if (gBattlerByTurnOrder[i] == gBattlerTarget) gActionsByTurnOrder[i] = 11; } diff --git a/src/battle_util.c b/src/battle_util.c index 172ec66598..b9a7f546ac 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -511,14 +511,14 @@ u8 UpdateTurnCounters(void) case 0: for (i = 0; i < gBattlersCount; i++) { - gBattleTurnOrder[i] = i; + gBattlerByTurnOrder[i] = i; } for (i = 0; i < gBattlersCount - 1; i++) { s32 j; for (j = i + 1; j < gBattlersCount; j++) { - if (GetWhoStrikesFirst(gBattleTurnOrder[i], gBattleTurnOrder[j], 0)) + if (GetWhoStrikesFirst(gBattlerByTurnOrder[i], gBattlerByTurnOrder[j], 0)) SwapTurnOrder(i, j); } } @@ -632,7 +632,7 @@ u8 UpdateTurnCounters(void) case 5: while (gBattleStruct->turnSideTracker < gBattlersCount) { - gActiveBattler = gBattleTurnOrder[gBattleStruct->turnSideTracker]; + gActiveBattler = gBattlerByTurnOrder[gBattleStruct->turnSideTracker]; if (gWishFutureKnock.wishCounter[gActiveBattler] != 0 && --gWishFutureKnock.wishCounter[gActiveBattler] == 0 && gBattleMons[gActiveBattler].hp != 0) @@ -755,7 +755,7 @@ u8 TurnBasedEffects(void) gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_x20); while (gBattleStruct->turnEffectsBattlerId < gBattlersCount && gBattleStruct->turnEffectsTracker <= TURNBASED_MAX_CASE) { - gActiveBattler = gBattlerAttacker = gBattleTurnOrder[gBattleStruct->turnEffectsBattlerId]; + gActiveBattler = gBattlerAttacker = gBattlerByTurnOrder[gBattleStruct->turnEffectsBattlerId]; if (gAbsentBattlerFlags & gBitTable[gActiveBattler]) { gBattleStruct->turnEffectsBattlerId++; @@ -1121,7 +1121,7 @@ bool8 HandleWishPerishSongOnTurnEnd(void) case 1: while (gBattleStruct->wishPerishSongBattlerId < gBattlersCount) { - gActiveBattler = gBattlerAttacker = gBattleTurnOrder[gBattleStruct->wishPerishSongBattlerId]; + gActiveBattler = gBattlerAttacker = gBattlerByTurnOrder[gBattleStruct->wishPerishSongBattlerId]; if (gAbsentBattlerFlags & gBitTable[gActiveBattler]) { gBattleStruct->wishPerishSongBattlerId++; diff --git a/src/safari_zone.c b/src/safari_zone.c index ab5c38f3a5..c0c098b38b 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -42,7 +42,7 @@ extern void PlayerGetDestCoords(s16* x, s16* y); EWRAM_DATA u8 gNumSafariBalls = 0; EWRAM_DATA static u16 sSafariZoneStepCounter = 0; EWRAM_DATA static u8 sSafariZoneCaughtMons = 0; -EWRAM_DATA static u8 sSafariZoneFleedMons = 0; +EWRAM_DATA static u8 sSafariZonePkblkUses = 0; EWRAM_DATA static struct PokeblockFeeder sPokeblockFeeders[NUM_POKEBLOCK_FEEDERS] = {0}; static void ClearAllPokeblockFeeders(void); @@ -71,12 +71,12 @@ void EnterSafariMode(void) gNumSafariBalls = 30; sSafariZoneStepCounter = 500; sSafariZoneCaughtMons = 0; - sSafariZoneFleedMons = 0; + sSafariZonePkblkUses = 0; } void ExitSafariMode(void) { - sub_80EE44C(sSafariZoneCaughtMons, sSafariZoneFleedMons); + sub_80EE44C(sSafariZoneCaughtMons, sSafariZonePkblkUses); ResetSafariZoneFlag(); ClearAllPokeblockFeeders(); gNumSafariBalls = 0; @@ -107,7 +107,7 @@ void SafariZoneRetirePrompt(void) void CB2_EndSafariBattle(void) { - sSafariZoneFleedMons += gBattleResults.field_1F; + sSafariZonePkblkUses += gBattleResults.pokeblockThrows; if (gBattleOutcome == B_OUTCOME_CAUGHT) sSafariZoneCaughtMons++; if (gNumSafariBalls != 0) @@ -172,7 +172,7 @@ void GetPokeblockFeederWithinRange(void) { if (gSaveBlock1Ptr->location.mapNum == sPokeblockFeeders[i].mapNum) { - //Get absolute value of x and y distance from Pokeblock feeder on current map + // Get absolute value of x and y distance from Pokeblock feeder on current map. x -= sPokeblockFeeders[i].x; y -= sPokeblockFeeders[i].y; if (x < 0) From 30c85a5128b2b68049ce7b62d8beb64adad26b64 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 30 Jun 2018 14:12:17 +0200 Subject: [PATCH 32/55] more battle documentation --- asm/macros/battle_script.inc | 4 +-- data/battle_scripts_1.s | 14 +++++----- include/constants/battle.h | 2 +- src/battle_main.c | 1 + src/battle_message.c | 51 ++++++++++++++++++------------------ src/battle_script_commands.c | 39 ++++++++++++++------------- 6 files changed, 56 insertions(+), 55 deletions(-) diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 73fcbeac12..c03d78df75 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -511,7 +511,7 @@ .byte \bank .endm - .macro atk5F + .macro swapattackerwithtarget .byte 0x5f .endm @@ -1163,7 +1163,7 @@ .4byte \param0 .endm - .macro snatchsetbanks + .macro snatchsetbattlers .byte 0xed .endm diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index a9d305ec83..4956ffc133 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2873,7 +2873,7 @@ BattleScript_FaintedMonTryChooseAnother:: jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_FaintedMonChooseAnother jumpifbattletype BATTLE_TYPE_LINK, BattleScript_FaintedMonChooseAnother jumpifbattletype BATTLE_TYPE_x2000000, BattleScript_FaintedMonChooseAnother - jumpifbattletype BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID, BattleScript_FaintedMonChooseAnother + jumpifbattletype BATTLE_TYPE_FRONTIER, BattleScript_FaintedMonChooseAnother jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonChooseAnother jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_FaintedMonChooseAnother jumpifbyte CMP_EQUAL, sBATTLE_STYLE, 0x1, BattleScript_FaintedMonChooseAnother @@ -2968,7 +2968,7 @@ BattleScript_PayDayMoneyAndPickUpItems:: BattleScript_LocalBattleLost:: jumpifbattletype BATTLE_TYPE_DOME, BattleScript_CheckDomeDrew - jumpifbattletype BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID, BattleScript_LocalBattleLostPrintTrainersWinText + jumpifbattletype BATTLE_TYPE_FRONTIER, BattleScript_LocalBattleLostPrintTrainersWinText jumpifbattletype BATTLE_TYPE_x4000000, BattleScript_LocalBattleLostPrintTrainersWinText jumpifbattletype BATTLE_TYPE_EREADER_TRAINER, BattleScript_LocalBattleLostEnd jumpifhalfword CMP_EQUAL, gTrainerBattleOpponent_A, 0x400, BattleScript_LocalBattleLostEnd @@ -3120,10 +3120,10 @@ BattleScript_PursuitSwitchDmgSetMultihit:: setmultihit 0x2 BattleScript_PursuitSwitchDmgLoop:: jumpifnopursuitswitchdmg BattleScript_DoSwitchOut - atk5F + swapattackerwithtarget trysetdestinybondtohappen call BattleScript_PursuitDmgOnSwitchOut - atk5F + swapattackerwithtarget BattleScript_DoSwitchOut:: decrementmultihit BattleScript_PursuitSwitchDmgLoop switchoutabilities BS_ATTACKER @@ -3230,7 +3230,7 @@ BattleScript_DamagingWeatherContinues:: playanimation2 BS_ATTACKER, sB_ANIM_ARG1, NULL setbyte gBattleCommunication, 0x0 BattleScript_DamagingWeatherLoop:: - copyarraywithindex gBattlerAttacker, gBattleTurnOrder, gBattleCommunication, 0x1 + copyarraywithindex gBattlerAttacker, gBattlerByTurnOrder, gBattleCommunication, 0x1 weatherdamage jumpifword CMP_EQUAL, gBattleMoveDamage, 0x0, BattleScript_DamagingWeatherLoopIncrement printfromtable gSandStormHailDmgStringIds @@ -3710,12 +3710,12 @@ BattleScript_MagicCoatBounce:: BattleScript_SnatchedMove:: attackstring ppreduce - snatchsetbanks + snatchsetbattlers playanimation BS_TARGET, B_ANIM_SNATCH_MOVE, NULL printstring STRINGID_PKMNSNATCHEDMOVE waitmessage 0x40 orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_x800000 - atk5F + swapattackerwithtarget return BattleScript_EnduredMsg:: diff --git a/include/constants/battle.h b/include/constants/battle.h index f3d7a8e0e7..5a09067ad3 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -159,7 +159,7 @@ #define HITMARKER_NO_ATTACKSTRING 0x00000200 #define HITMARKER_ATTACKSTRING_PRINTED 0x00000400 #define HITMARKER_NO_PPDEDUCT 0x00000800 -#define HITMARKER_PURSUIT_TRAP 0x00001000 +#define HITMARKER_SWAP_ATTACKER_TARGET 0x00001000 #define HITMARKER_IGNORE_SAFEGUARD 0x00002000 #define HITMARKER_SYNCHRONISE_EFFECT 0x00004000 #define HITMARKER_RUN 0x00008000 diff --git a/src/battle_main.c b/src/battle_main.c index a0d812a94f..a846f57696 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -561,6 +561,7 @@ static const u8 sUnknown_0831BCE0[][3] = {{0, 0, 0}, {3, 5, 0}, {2, 3, 0}, {1, 2 static const u8 sUnknown_0831BCEF[] = {4, 3, 2, 1}; static const u8 sUnknown_0831BCF3[] = {4, 4, 4, 4}; +// code void CB2_InitBattle(void) { MoveSaveBlocks_ResetHeap(); diff --git a/src/battle_message.c b/src/battle_message.c index 896b2197ef..41b36ae13f 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -45,7 +45,6 @@ extern const u8 gText_PkmnBoxLanettesPCFull[]; extern const u8 gText_PkmnTransferredSomeonesPC[]; extern const u8 gText_PkmnTransferredLanettesPC[]; -extern u16 sub_8068BB0(void); // pokemon_1 extern u8 sub_81A4D00(void); // battle_frontier_2 extern u8 GetFrontierOpponentClass(u16 trainerId); // battle_tower extern u8 sub_81D5530(u16 trainerId); // pokenav @@ -58,8 +57,8 @@ extern void sub_81D572C(u8 arg0, u16 trainerId); // pokenav extern void GetFrontierTrainerName(u8 *dst, u16 trainerId); // this file's functions -static void sub_814F8F8(u8 *textPtr); -static void sub_814F950(u8 *dst); +static void ChooseMoveUsedParticle(u8 *textPtr); +static void ChooseTypeOfMoveUsedString(u8 *dst); static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst); // ewram variables @@ -1322,8 +1321,8 @@ static const u8 sText_LinkTrainerWantsToBattlePause[] = _("{B_20}\nwants to batt static const u8 sText_TwoLinkTrainersWantToBattlePause[] = _("{B_20} and {B_21}\nwant to battle!{PAUSE 49}"); // This is four lists of moves which use a different attack string in Japanese -// to the default. See the documentation for sub_814F950 for more detail. -static const u16 sUnknownMoveTable[] = +// to the default. See the documentation for ChooseTypeOfMoveUsedString for more detail. +static const u16 sGrammarMoveUsedTable[] = { MOVE_SWORDS_DANCE, MOVE_STRENGTH, MOVE_GROWTH, MOVE_HARDEN, MOVE_MINIMIZE, MOVE_SMOKESCREEN, @@ -2142,14 +2141,14 @@ void BufferStringBattle(u16 stringID) } break; case STRINGID_USEDMOVE: // pokemon used a move msg - sub_814F8F8(gBattleTextBuff1); // buff1 doesn't appear in the string, leftover from japanese move names? + ChooseMoveUsedParticle(gBattleTextBuff1); // buff1 doesn't appear in the string, leftover from japanese move names if (gStringInfo->currentMove > LAST_MOVE_INDEX) StringCopy(gBattleTextBuff2, sATypeMove_Table[*(&gBattleStruct->stringMoveType)]); else StringCopy(gBattleTextBuff2, gMoveNames[gStringInfo->currentMove]); - sub_814F950(gBattleTextBuff2); + ChooseTypeOfMoveUsedString(gBattleTextBuff2); stringPtr = sText_AttackerUsedX; break; case STRINGID_BATTLEEND: // battle end @@ -2740,10 +2739,6 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) return dstID; } -// TODO: move these to a general header like util.h -#define ByteRead16(ptr) ((ptr)[0] | ((ptr)[1] << 8)) -#define ByteRead32(ptr) ((ptr)[0] | (ptr)[1] << 8 | (ptr)[2] << 16 | (ptr)[3] << 24) - static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst) { u32 srcID = 1; @@ -2757,7 +2752,7 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst) switch (src[srcID]) { case B_BUFF_STRING: // battle string - hword = ByteRead16(&src[srcID + 1]); + hword = T1_READ_16(&src[srcID + 1]); StringAppend(dst, gBattleStringsTable[hword - BATTLESTRINGS_ID_ADDER]); srcID += 3; break; @@ -2768,17 +2763,17 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst) value = src[srcID + 3]; break; case 2: - value = ByteRead16(&src[srcID + 3]); + value = T1_READ_16(&src[srcID + 3]); break; case 4: - value = ByteRead32(&src[srcID + 3]); + value = T1_READ_32(&src[srcID + 3]); break; } ConvertIntToDecimalStringN(dst, value, 0, src[srcID + 2]); srcID += src[srcID + 1] + 3; break; case B_BUFF_MOVE: // move name - StringAppend(dst, gMoveNames[ByteRead16(&src[srcID + 1])]); + StringAppend(dst, gMoveNames[T1_READ_16(&src[srcID + 1])]); srcID += 3; break; case B_BUFF_TYPE: // type name @@ -2808,7 +2803,7 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst) srcID += 2; break; case B_BUFF_SPECIES: // species name - GetSpeciesName(dst, ByteRead16(&src[srcID + 1])); + GetSpeciesName(dst, T1_READ_16(&src[srcID + 1])); srcID += 3; break; case B_BUFF_MON_NICK: // poke nick without prefix @@ -2828,7 +2823,7 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst) srcID += 2; break; case B_BUFF_ITEM: // item name - hword = ByteRead16(&src[srcID + 1]); + hword = T1_READ_16(&src[srcID + 1]); if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) { if (hword == ITEM_ENIGMA_BERRY) @@ -2839,13 +2834,19 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst) StringAppend(dst, sText_BerrySuffix); } else + { StringAppend(dst, sText_EnigmaBerry); + } } else + { CopyItemName(hword, dst); + } } else + { CopyItemName(hword, dst); + } srcID += 3; break; } @@ -2854,18 +2855,18 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst) // Loads one of two text strings into the provided buffer. This is functionally // unused, since the value loaded into the buffer is not read; it loaded one of -// two particles (either "は" or "の") which works in tandem with sub_814F950 +// two particles (either "は" or "の") which works in tandem with ChooseTypeOfMoveUsedString // below to effect changes in the meaning of the line. -static void sub_814F8F8(u8* textBuff) +static void ChooseMoveUsedParticle(u8* textBuff) { s32 counter = 0; u32 i = 0; while (counter != 4) { - if (sUnknownMoveTable[i] == 0) + if (sGrammarMoveUsedTable[i] == 0) counter++; - if (sUnknownMoveTable[i++] == gStringInfo->currentMove) + if (sGrammarMoveUsedTable[i++] == gStringInfo->currentMove) break; } @@ -2879,7 +2880,7 @@ static void sub_814F8F8(u8* textBuff) } // Appends "!" to the text buffer `dst`. In the original Japanese this looked -// into the table of moves at sUnknownMoveTable and varied the line accordingly. +// into the table of moves at sGrammarMoveUsedTable and varied the line accordingly. // // sText_ExclamationMark was a plain "!", used for any attack not on the list. // It resulted in the translation "'s !". @@ -2896,7 +2897,7 @@ static void sub_814F8F8(u8* textBuff) // // sText_ExclamationMark5 was " こうげき！" This resulted in a translation of // "'s attack!". -static void sub_814F950(u8* dst) +static void ChooseTypeOfMoveUsedString(u8* dst) { s32 counter = 0; s32 i = 0; @@ -2906,9 +2907,9 @@ static void sub_814F950(u8* dst) while (counter != 4) { - if (sUnknownMoveTable[i] == MOVE_NONE) + if (sGrammarMoveUsedTable[i] == MOVE_NONE) counter++; - if (sUnknownMoveTable[i++] == gStringInfo->currentMove) + if (sGrammarMoveUsedTable[i++] == gStringInfo->currentMove) break; } diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index fb77ab4c41..ecba9f934f 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -67,7 +67,6 @@ extern bool8 sub_81B1250(void); // ? extern bool8 InBattlePike(void); extern bool8 InBattlePyramid(void); extern u16 GetBattlePyramidPickupItemId(void); -extern u8 Overworld_GetMapTypeOfSaveblockLocation(void); extern u8 sub_813B21C(void); extern u16 get_unknown_box_id(void); @@ -185,7 +184,7 @@ static void atk5B_yesnoboxstoplearningmove(void); static void atk5C_hitanimation(void); static void atk5D_getmoneyreward(void); static void atk5E(void); -static void atk5F(void); +static void atk5F_swapattackerwithtarget(void); static void atk60_incrementgamestat(void); static void atk61_drawpartystatussummary(void); static void atk62_hidepartystatussummary(void); @@ -327,7 +326,7 @@ static void atkE9_setweatherballtype(void); static void atkEA_tryrecycleitem(void); static void atkEB_settypetoterrain(void); static void atkEC_pursuitrelated(void); -static void atkEF_snatchsetbanks(void); +static void atkEF_snatchsetbattlers(void); static void atkEE_removelightscreenreflect(void); static void atkEF_handleballthrow(void); static void atkF0_givecaughtmon(void); @@ -437,7 +436,7 @@ void (* const gBattleScriptingCommandsTable[])(void) = atk5C_hitanimation, atk5D_getmoneyreward, atk5E, - atk5F, + atk5F_swapattackerwithtarget, atk60_incrementgamestat, atk61_drawpartystatussummary, atk62_hidepartystatussummary, @@ -579,7 +578,7 @@ void (* const gBattleScriptingCommandsTable[])(void) = atkEA_tryrecycleitem, atkEB_settypetoterrain, atkEC_pursuitrelated, - atkEF_snatchsetbanks, + atkEF_snatchsetbattlers, atkEE_removelightscreenreflect, atkEF_handleballthrow, atkF0_givecaughtmon, @@ -1172,7 +1171,7 @@ static void atk01_accuracycheck(void) calc = (calc * 130) / 100; // 1.3 compound eyes boost if (WEATHER_HAS_EFFECT && gBattleMons[gBattlerTarget].ability == ABILITY_SAND_VEIL && gBattleWeather & WEATHER_SANDSTORM_ANY) calc = (calc * 80) / 100; // 1.2 sand veil loss - if (gBattleMons[gBattlerAttacker].ability == ABILITY_HUSTLE && type < 9) + if (gBattleMons[gBattlerAttacker].ability == ABILITY_HUSTLE && IS_MOVE_PHYSICAL(type)) calc = (calc * 80) / 100; // 1.2 hustle loss if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY) @@ -4676,12 +4675,12 @@ static void atk49_moveend(void) gBattleScripting.atk49_state++; break; case 14: // This case looks interesting, although I am not certain what it does. Probably fine tunes edge cases. - if (gHitMarker & HITMARKER_PURSUIT_TRAP) + if (gHitMarker & HITMARKER_SWAP_ATTACKER_TARGET) { gActiveBattler = gBattlerAttacker; gBattlerAttacker = gBattlerTarget; gBattlerTarget = gActiveBattler; - gHitMarker &= ~(HITMARKER_PURSUIT_TRAP); + gHitMarker &= ~(HITMARKER_SWAP_ATTACKER_TARGET); } if (gHitMarker & HITMARKER_ATTACKSTRING_PRINTED) { @@ -5950,7 +5949,7 @@ static void atk5E(void) if (gBattleControllerExecFlags == 0) { s32 i; - struct BattlePokemon* bufferPoke = (struct BattlePokemon*) &gBattleBufferB[gActiveBattler][4]; + struct BattlePokemon *bufferPoke = (struct BattlePokemon*) &gBattleBufferB[gActiveBattler][4]; for (i = 0; i < 4; i++) { gBattleMons[gActiveBattler].moves[i] = bufferPoke->moves[i]; @@ -5962,16 +5961,16 @@ static void atk5E(void) } } -static void atk5F(void) +static void atk5F_swapattackerwithtarget(void) { gActiveBattler = gBattlerAttacker; gBattlerAttacker = gBattlerTarget; gBattlerTarget = gActiveBattler; - if (gHitMarker & HITMARKER_PURSUIT_TRAP) - gHitMarker &= ~(HITMARKER_PURSUIT_TRAP); + if (gHitMarker & HITMARKER_SWAP_ATTACKER_TARGET) + gHitMarker &= ~(HITMARKER_SWAP_ATTACKER_TARGET); else - gHitMarker |= HITMARKER_PURSUIT_TRAP; + gHitMarker |= HITMARKER_SWAP_ATTACKER_TARGET; gBattlescriptCurrInstr++; } @@ -5987,8 +5986,8 @@ static void atk60_incrementgamestat(void) static void atk61_drawpartystatussummary(void) { s32 i; - struct Pokemon* party; - struct HpAndStatus hpStatuses[6]; + struct Pokemon *party; + struct HpAndStatus hpStatuses[PARTY_SIZE]; if (gBattleControllerExecFlags) return; @@ -6000,7 +5999,7 @@ static void atk61_drawpartystatussummary(void) else party = gEnemyParty; - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) { if (GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_NONE || GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_EGG) @@ -8595,7 +8594,7 @@ static void atkAE_healpartystatus(void) if (gCurrentMove == MOVE_HEAL_BELL) { - struct Pokemon* party; + struct Pokemon *party; s32 i; gBattleCommunication[MULTISTRING_CHOOSER] = 0; @@ -8633,7 +8632,7 @@ static void atkAE_healpartystatus(void) } } - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) { u16 species = GetMonData(&party[i], MON_DATA_SPECIES2); u8 abilityBit = GetMonData(&party[i], MON_DATA_ALT_ABILITY); @@ -10053,7 +10052,7 @@ static void atkEC_pursuitrelated(void) } } -static void atkEF_snatchsetbanks(void) +static void atkEF_snatchsetbattlers(void) { gEffectBattler = gBattlerAttacker; @@ -10131,7 +10130,7 @@ static void atkEF_handleballthrow(void) ballMultiplier = 10; break; case ITEM_DIVE_BALL: - if (Overworld_GetMapTypeOfSaveblockLocation() == 5) + if (Overworld_GetMapTypeOfSaveblockLocation() == MAP_TYPE_UNDERWATER) ballMultiplier = 35; else ballMultiplier = 10; From 5434db2fc6f4e7ebd8cb6bc76115d5c3b6b5807e Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 30 Jun 2018 14:22:09 +0200 Subject: [PATCH 33/55] use region map constants --- src/battle_tent.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/battle_tent.c b/src/battle_tent.c index 85640e8e5b..64eba1658e 100644 --- a/src/battle_tent.c +++ b/src/battle_tent.c @@ -9,6 +9,7 @@ #include "random.h" #include "item.h" #include "constants/items.h" +#include "constants/region_map_sections.h" // this file's functions void sub_81B99D4(void); @@ -262,6 +263,6 @@ void sub_81B9E88(void) bool8 sub_81B9E94(void) { - return (gMapHeader.regionMapSectionId == 8 + return (gMapHeader.regionMapSectionId == MAPSEC_SLATEPORT_CITY && ((gMapHeader.mapDataId == 385) | (gMapHeader.mapDataId == 386))); } From cdacc2771426a8e4ec5ccc5d7ba0d8d7c4224c36 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 30 Jun 2018 14:26:33 +0200 Subject: [PATCH 34/55] change for loop in fldeff_cut --- src/fldeff_cut.c | 7 ++++--- src/fldeff_strength.c | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index bdc9b78687..c2f5e77319 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -352,10 +352,11 @@ static void StartCutGrassFieldEffect(void) bool8 FldEff_CutGrass(void) { s16 x, y; - u8 tileBehavior; - u8 i; + u8 i = 0; - for (i = 0, PlaySE(SE_W015), PlayerGetDestCoords(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y); i < CUT_HYPER_AREA; i++) + PlaySE(SE_W015); + PlayerGetDestCoords(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y); + for (i = 0; i < CUT_HYPER_AREA; i++) { if (sHyperCutTiles[i] == TRUE) { diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index fb5aa5e95b..ae7b557d8d 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -6,6 +6,7 @@ #include "rom6.h" #include "script.h" #include "task.h" +#include "constants/event_objects.h" // static functions static void FldEff_UseStrength(void); From 97712ec931febe390861f2234e26a66f15c9c295 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 30 Jun 2018 14:52:13 +0200 Subject: [PATCH 35/55] change mapDataId to mapLayoutId --- src/battle_tent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_tent.c b/src/battle_tent.c index 64eba1658e..68d7c5e83d 100644 --- a/src/battle_tent.c +++ b/src/battle_tent.c @@ -264,5 +264,5 @@ void sub_81B9E88(void) bool8 sub_81B9E94(void) { return (gMapHeader.regionMapSectionId == MAPSEC_SLATEPORT_CITY - && ((gMapHeader.mapDataId == 385) | (gMapHeader.mapDataId == 386))); + && ((gMapHeader.mapLayoutId == 385) | (gMapHeader.mapLayoutId == 386))); } From bfc64c9689d4518c64ba15cd7d52b9a6149fd218 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 30 Jun 2018 15:35:54 +0200 Subject: [PATCH 36/55] C vars sym ewram --- include/battle.h | 7 ++++- include/battle_message.h | 18 +++++-------- src/battle_main.c | 4 +++ src/battle_message.c | 58 +++++++++++++++++++--------------------- src/battle_setup.c | 28 +++++++++---------- src/battle_tv.c | 10 +++---- src/braille_puzzles.c | 14 +++++----- src/hall_of_fame.c | 18 ++++++------- sym_ewram.txt | 21 ++------------- 9 files changed, 80 insertions(+), 98 deletions(-) diff --git a/include/battle.h b/include/battle.h index 20a6cf1b88..0169dde7ca 100644 --- a/include/battle.h +++ b/include/battle.h @@ -4,6 +4,7 @@ // should they be included here or included individually by every file? #include "constants/battle.h" #include "battle_main.h" +#include "battle_message.h" #include "battle_util.h" #include "battle_script_commands.h" #include "battle_ai_switch_items.h" @@ -719,7 +720,11 @@ struct MonSpritesGfx void *field_17C; }; -// all battle variables are declared in battle_main.c +// All battle variables are declared in battle_main.c +extern u8 gDisplayedStringBattle[300]; +extern u8 gBattleTextBuff1[TEXT_BUFF_ARRAY_COUNT]; +extern u8 gBattleTextBuff2[TEXT_BUFF_ARRAY_COUNT]; +extern u8 gBattleTextBuff3[TEXT_BUFF_ARRAY_COUNT]; extern u32 gBattleTypeFlags; extern u8 gBattleTerrain; extern u32 gUnknown_02022FF4; diff --git a/include/battle_message.h b/include/battle_message.h index f792ff7b0b..cccbae841e 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -1,8 +1,9 @@ #ifndef GUARD_BATTLE_MESSAGE_H #define GUARD_BATTLE_MESSAGE_H -// for 0xFD +#define TEXT_BUFF_ARRAY_COUNT 16 +// for 0xFD #define B_TXT_BUFF1 0x0 #define B_TXT_BUFF2 0x1 #define B_TXT_COPY_VAR_1 0x2 @@ -194,7 +195,7 @@ textVar[4] = B_BUFF_EOS; \ } -struct StringInfoBattle +struct BattleMsgData { u16 currentMove; u16 originallyUsedMove; @@ -203,10 +204,10 @@ struct StringInfoBattle u8 scrActive; u8 unk1605E; u8 hpScale; - u8 StringBank; + u8 itemEffectBattler; u8 moveType; - u8 abilities[4]; - u8 textBuffs[3][0x10]; + u8 abilities[MAX_BATTLERS_COUNT]; + u8 textBuffs[3][TEXT_BUFF_ARRAY_COUNT]; }; void BufferStringBattle(u16 stringID); @@ -216,12 +217,7 @@ void BattlePutTextOnWindow(const u8* text, u8 arg1); void SetPpNumbersPaletteInMoveSelection(void); u8 GetCurrentPpToMaxPpState(u8 currentPp, u8 maxPp); -#define TEXT_BUFF_ARRAY_COUNT 16 - -extern u8 gDisplayedStringBattle[300]; -extern u8 gBattleTextBuff1[TEXT_BUFF_ARRAY_COUNT]; -extern u8 gBattleTextBuff2[TEXT_BUFF_ARRAY_COUNT]; -extern u8 gBattleTextBuff3[TEXT_BUFF_ARRAY_COUNT]; +extern struct BattleMsgData *gBattleMsgDataPtr; extern const u8* const gBattleStringsTable[]; extern const u8* const gStatNamesTable[]; diff --git a/src/battle_main.c b/src/battle_main.c index a846f57696..487e119939 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -190,6 +190,10 @@ static void HandleAction_NothingIsFainted(void); static void HandleAction_ActionFinished(void); // EWRAM vars +EWRAM_DATA u8 gDisplayedStringBattle[300] = {0}; +EWRAM_DATA u8 gBattleTextBuff1[TEXT_BUFF_ARRAY_COUNT] = {0}; +EWRAM_DATA u8 gBattleTextBuff2[TEXT_BUFF_ARRAY_COUNT] = {0}; +EWRAM_DATA u8 gBattleTextBuff3[TEXT_BUFF_ARRAY_COUNT] = {0}; EWRAM_DATA static u32 sUnusedUnknownArray[25] = {0}; EWRAM_DATA u32 gBattleTypeFlags = 0; EWRAM_DATA u8 gBattleTerrain = 0; diff --git a/src/battle_message.c b/src/battle_message.c index 41b36ae13f..9dcd4aaf18 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -31,9 +31,7 @@ struct BattleWindowText u8 shadowColor; }; -extern u8 gBattlerAbilities[MAX_BATTLERS_COUNT]; extern u8 gUnknown_0203C7B4; -extern struct StringInfoBattle *gStringInfo; extern const u8 gMoveNames[LAST_MOVE_INDEX + 1][13]; extern const u8 gTrainerClassNames[][13]; @@ -61,11 +59,9 @@ static void ChooseMoveUsedParticle(u8 *textPtr); static void ChooseTypeOfMoveUsedString(u8 *dst); static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst); -// ewram variables -EWRAM_DATA u8 gDisplayedStringBattle[300] = {0}; -EWRAM_DATA u8 gBattleTextBuff1[TEXT_BUFF_ARRAY_COUNT] = {0}; -EWRAM_DATA u8 gBattleTextBuff2[TEXT_BUFF_ARRAY_COUNT] = {0}; -EWRAM_DATA u8 gBattleTextBuff3[TEXT_BUFF_ARRAY_COUNT] = {0}; +// EWRAM vars +static EWRAM_DATA u8 sBattlerAbilities[MAX_BATTLERS_COUNT] = {0}; +EWRAM_DATA struct BattleMsgData *gBattleMsgDataPtr = NULL; // const rom data // todo: make some of those names less vague: attacker/target vs pkmn, etc. @@ -1949,24 +1945,24 @@ void BufferStringBattle(u16 stringID) s32 i; const u8 *stringPtr = NULL; - gStringInfo = (struct StringInfoBattle*)(&gBattleBufferA[gActiveBattler][4]); - gLastUsedItem = gStringInfo->lastItem; - gLastUsedAbility = gStringInfo->lastAbility; - gBattleScripting.battler = gStringInfo->scrActive; - *(&gBattleStruct->field_52) = gStringInfo->unk1605E; - *(&gBattleStruct->hpScale) = gStringInfo->hpScale; - gPotentialItemEffectBattler = gStringInfo->StringBank; - *(&gBattleStruct->stringMoveType) = gStringInfo->moveType; + gBattleMsgDataPtr = (struct BattleMsgData*)(&gBattleBufferA[gActiveBattler][4]); + gLastUsedItem = gBattleMsgDataPtr->lastItem; + gLastUsedAbility = gBattleMsgDataPtr->lastAbility; + gBattleScripting.battler = gBattleMsgDataPtr->scrActive; + *(&gBattleStruct->field_52) = gBattleMsgDataPtr->unk1605E; + *(&gBattleStruct->hpScale) = gBattleMsgDataPtr->hpScale; + gPotentialItemEffectBattler = gBattleMsgDataPtr->itemEffectBattler; + *(&gBattleStruct->stringMoveType) = gBattleMsgDataPtr->moveType; for (i = 0; i < MAX_BATTLERS_COUNT; i++) { - gBattlerAbilities[i] = gStringInfo->abilities[i]; + sBattlerAbilities[i] = gBattleMsgDataPtr->abilities[i]; } for (i = 0; i < TEXT_BUFF_ARRAY_COUNT; i++) { - gBattleTextBuff1[i] = gStringInfo->textBuffs[0][i]; - gBattleTextBuff2[i] = gStringInfo->textBuffs[1][i]; - gBattleTextBuff3[i] = gStringInfo->textBuffs[2][i]; + gBattleTextBuff1[i] = gBattleMsgDataPtr->textBuffs[0][i]; + gBattleTextBuff2[i] = gBattleMsgDataPtr->textBuffs[1][i]; + gBattleTextBuff3[i] = gBattleMsgDataPtr->textBuffs[2][i]; } switch (stringID) @@ -2143,10 +2139,10 @@ void BufferStringBattle(u16 stringID) case STRINGID_USEDMOVE: // pokemon used a move msg ChooseMoveUsedParticle(gBattleTextBuff1); // buff1 doesn't appear in the string, leftover from japanese move names - if (gStringInfo->currentMove > LAST_MOVE_INDEX) + if (gBattleMsgDataPtr->currentMove > LAST_MOVE_INDEX) StringCopy(gBattleTextBuff2, sATypeMove_Table[*(&gBattleStruct->stringMoveType)]); else - StringCopy(gBattleTextBuff2, gMoveNames[gStringInfo->currentMove]); + StringCopy(gBattleTextBuff2, gMoveNames[gBattleMsgDataPtr->currentMove]); ChooseTypeOfMoveUsedString(gBattleTextBuff2); stringPtr = sText_AttackerUsedX; @@ -2431,16 +2427,16 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) HANDLE_NICKNAME_STRING_CASE(gBattleScripting.battler, gBattlerPartyIndexes[gBattleScripting.battler]) break; case B_TXT_CURRENT_MOVE: // current move name - if (gStringInfo->currentMove > LAST_MOVE_INDEX) + if (gBattleMsgDataPtr->currentMove > LAST_MOVE_INDEX) toCpy = sATypeMove_Table[gBattleStruct->stringMoveType]; else - toCpy = gMoveNames[gStringInfo->currentMove]; + toCpy = gMoveNames[gBattleMsgDataPtr->currentMove]; break; case B_TXT_LAST_MOVE: // originally used move name - if (gStringInfo->originallyUsedMove > LAST_MOVE_INDEX) + if (gBattleMsgDataPtr->originallyUsedMove > LAST_MOVE_INDEX) toCpy = sATypeMove_Table[gBattleStruct->stringMoveType]; else - toCpy = gMoveNames[gStringInfo->originallyUsedMove]; + toCpy = gMoveNames[gBattleMsgDataPtr->originallyUsedMove]; break; case B_TXT_LAST_ITEM: // last used item if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) @@ -2489,16 +2485,16 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) toCpy = gAbilityNames[gLastUsedAbility]; break; case B_TXT_ATK_ABILITY: // attacker ability - toCpy = gAbilityNames[gBattlerAbilities[gBattlerAttacker]]; + toCpy = gAbilityNames[sBattlerAbilities[gBattlerAttacker]]; break; case B_TXT_DEF_ABILITY: // target ability - toCpy = gAbilityNames[gBattlerAbilities[gBattlerTarget]]; + toCpy = gAbilityNames[sBattlerAbilities[gBattlerTarget]]; break; case B_TXT_SCR_ACTIVE_ABILITY: // scripting active ability - toCpy = gAbilityNames[gBattlerAbilities[gBattleScripting.battler]]; + toCpy = gAbilityNames[sBattlerAbilities[gBattleScripting.battler]]; break; case B_TXT_EFF_ABILITY: // effect battlerId ability - toCpy = gAbilityNames[gBattlerAbilities[gEffectBattler]]; + toCpy = gAbilityNames[sBattlerAbilities[gEffectBattler]]; break; case B_TXT_TRAINER1_CLASS: // trainer class name if (gBattleTypeFlags & BATTLE_TYPE_SECRET_BASE) @@ -2866,7 +2862,7 @@ static void ChooseMoveUsedParticle(u8* textBuff) { if (sGrammarMoveUsedTable[i] == 0) counter++; - if (sGrammarMoveUsedTable[i++] == gStringInfo->currentMove) + if (sGrammarMoveUsedTable[i++] == gBattleMsgDataPtr->currentMove) break; } @@ -2909,7 +2905,7 @@ static void ChooseTypeOfMoveUsedString(u8* dst) { if (sGrammarMoveUsedTable[i] == MOVE_NONE) counter++; - if (sGrammarMoveUsedTable[i++] == gStringInfo->currentMove) + if (sGrammarMoveUsedTable[i++] == gBattleMsgDataPtr->currentMove) break; } diff --git a/src/battle_setup.c b/src/battle_setup.c index ccc36b7c27..b110839293 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -1088,14 +1088,14 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) switch (sTrainerBattleMode) { - case 3: + case TRAINER_BATTLE_NORMAL_NO_INTRO_TEXT: TrainerBattleLoadArgs(sOrdinaryNoIntroBattleParams, data); return EventScript_2713C2; - case 4: + case TRAINER_BATTLE_DOUBLE: TrainerBattleLoadArgs(sDoubleBattleParams, data); SetMapVarsToTrainer(); return EventScript_TryDoDoubleTrainerBattle; - case 2: + case TRAINER_BATTLE_CONTINUE_SCRIPT: if (gApproachingTrainerId == 0) { TrainerBattleLoadArgs(sContinueScriptBattleParams, data); @@ -1106,26 +1106,26 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) TrainerBattleLoadArgs(sTrainerBContinueScriptBattleParams, data); } return EventScript_271362; - case 1: + case TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC: TrainerBattleLoadArgs(sContinueScriptBattleParams, data); SetMapVarsToTrainer(); return EventScript_271362; - case 6: - case 8: + case TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE: + case TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC: TrainerBattleLoadArgs(sContinueScriptDoubleBattleParams, data); SetMapVarsToTrainer(); return EventScript_TryDoDoubleTrainerBattle; - case 7: + case TRAINER_BATTLE_REMATCH_DOUBLE: TrainerBattleLoadArgs(sDoubleBattleParams, data); SetMapVarsToTrainer(); gTrainerBattleOpponent_A = GetRematchTrainerId(gTrainerBattleOpponent_A); return EventScript_TryDoDoubleRematchBattle; - case 5: + case TRAINER_BATTLE_REMATCH: TrainerBattleLoadArgs(sOrdinaryBattleParams, data); SetMapVarsToTrainer(); gTrainerBattleOpponent_A = GetRematchTrainerId(gTrainerBattleOpponent_A); return EventScript_2713D1; - case 9: + case TRAINER_BATTLE_9: if (gApproachingTrainerId == 0) { TrainerBattleLoadArgs(sOrdinaryBattleParams, data); @@ -1138,13 +1138,13 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) gTrainerBattleOpponent_B = sub_81A9AA8(gSpecialVar_LastTalked); } return EventScript_271362; - case 10: + case TRAINER_BATTLE_SET_TRAINER_A: TrainerBattleLoadArgs(sOrdinaryBattleParams, data); return NULL; - case 11: + case TRAINER_BATTLE_SET_TRAINER_B: TrainerBattleLoadArgs(sTrainerBOrdinaryBattleParams, data); return NULL; - case 12: + case TRAINER_BATTLE_12: if (gApproachingTrainerId == 0) { TrainerBattleLoadArgs(sOrdinaryBattleParams, data); @@ -1591,11 +1591,11 @@ static bool32 UpdateRandomTrainerRematches(const struct RematchTrainer *table, u { if (gSaveBlock1Ptr->trainerRematches[i] != 0) { - // Trainer already wants a rematch. Don't bother updating it + // Trainer already wants a rematch. Don't bother updating it. ret = TRUE; } else if (FlagGet(FLAG_MATCH_CALL_REGISTERED + i) - && (Random() % 100) <= 30) // 31% chance of getting a rematch + && (Random() % 100) <= 30) // 31% chance of getting a rematch. { SetRematchIdForTrainer(table, i); ret = TRUE; diff --git a/src/battle_tv.c b/src/battle_tv.c index e5d97be304..cd0490a1b4 100644 --- a/src/battle_tv.c +++ b/src/battle_tv.c @@ -9,8 +9,6 @@ #include "battle_message.h" #include "tv.h" -extern struct StringInfoBattle *gStringInfo; - // this file's functions static bool8 sub_817E0B8(u16 stringId); static void AddMovePoints(u8 caseId, u16 arg1, u8 arg2, u8 arg3); @@ -223,7 +221,7 @@ void BattleTv_SetDataBasedOnString(u16 stringId) atkSide = GetBattlerSide(gBattlerAttacker); defSide = GetBattlerSide(gBattlerTarget); effSide = GetBattlerSide(gEffectBattler); - scriptingSide = GetBattlerSide(gStringInfo->scrActive); + scriptingSide = GetBattlerSide(gBattleMsgDataPtr->scrActive); if (atkSide == B_SIDE_PLAYER) atkMon = &gPlayerParty[gBattlerPartyIndexes[gBattlerAttacker]]; @@ -235,7 +233,7 @@ void BattleTv_SetDataBasedOnString(u16 stringId) else defMon = &gEnemyParty[gBattlerPartyIndexes[gBattlerTarget]]; - moveSlot = GetBattlerMoveSlotId(gBattlerAttacker, gStringInfo->currentMove); + moveSlot = GetBattlerMoveSlotId(gBattlerAttacker, gBattleMsgDataPtr->currentMove); if (moveSlot >= 4 && sub_817E0B8(stringId) && stringId > BATTLESTRINGS_ID_ADDER) { @@ -480,8 +478,8 @@ void BattleTv_SetDataBasedOnString(u16 stringId) break; case STRINGID_PKMNFASTASLEEP: if (tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].slpMonId != 0 - && gStringInfo->currentMove != MOVE_SNORE - && gStringInfo->currentMove != MOVE_SLEEP_TALK) + && gBattleMsgDataPtr->currentMove != MOVE_SNORE + && gBattleMsgDataPtr->currentMove != MOVE_SLEEP_TALK) AddMovePoints(9, 3, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].slpMonId - 1, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].slpMoveSlot); break; case STRINGID_PKMNWASFROZEN: diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index 35277fe87e..91fcf8c460 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -14,7 +14,6 @@ extern void SetCameraPanningCallback(void ( *callback)()); // field_camera extern void InstallCameraPanAheadCallback(void); extern void SetCameraPanning(s16 x, s16 y); extern u8 GetCursorSelectionMonId(void); -extern void FieldEffectActiveListRemove(u8 id); // field_effect extern u8 oei_task_add(void); // why do this, GF? @@ -24,7 +23,8 @@ enum FLY_PUZZLE }; -extern u8 gBraillePuzzleCallbackFlag; +EWRAM_DATA static u8 sBraillePuzzleCallbackFlag = 0; + extern const u8 gUnknown_085EFE74[][2]; void SealedChamberShakingEffect(u8); @@ -208,11 +208,11 @@ bool8 ShouldDoBrailleStrengthEffect(void) if (!FlagGet(FLAG_SYS_BRAILLE_STRENGTH) && (gSaveBlock1Ptr->location.mapGroup == 0x18 && gSaveBlock1Ptr->location.mapNum == 0x06)) { if (gSaveBlock1Ptr->pos.x == 6 && gSaveBlock1Ptr->pos.y == 23) - { gBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; return TRUE; } + { sBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; return TRUE; } else if (gSaveBlock1Ptr->pos.x == 5 && gSaveBlock1Ptr->pos.y == 23) - { gBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; return TRUE; } + { sBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; return TRUE; } else if (gSaveBlock1Ptr->pos.x == 7 && gSaveBlock1Ptr->pos.y == 23) - { gBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; return TRUE; } + { sBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; return TRUE; } } return FALSE; @@ -249,7 +249,7 @@ bool8 ShouldDoBrailleFlyEffect(void) if (!FlagGet(FLAG_SYS_BRAILLE_FLY) && (gSaveBlock1Ptr->location.mapGroup == 0x18 && gSaveBlock1Ptr->location.mapNum == 0x44)) { if (gSaveBlock1Ptr->pos.x == 8 && gSaveBlock1Ptr->pos.y == 25) - { gBraillePuzzleCallbackFlag = FLY_PUZZLE; return TRUE; } + { sBraillePuzzleCallbackFlag = FLY_PUZZLE; return TRUE; } } return FALSE; } @@ -362,7 +362,7 @@ bool8 FldEff_UsePuzzleEffect(void) { u8 taskId = oei_task_add(); - if (gBraillePuzzleCallbackFlag == FLY_PUZZLE) + if (sBraillePuzzleCallbackFlag == FLY_PUZZLE) { gTasks[taskId].data[8] = (u32)UseFlyAncientTomb_Callback >> 16; gTasks[taskId].data[9] = (u32)UseFlyAncientTomb_Callback; diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 78b615407c..0ed22c1e10 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -33,7 +33,7 @@ struct HallofFameMon u32 personality; u16 species:9; u16 lvl:7; - u8 nick[10]; + u8 nick[POKEMON_NAME_LENGTH]; }; struct HallofFameTeam @@ -49,11 +49,11 @@ struct HofGfx u8 tilemap2[0x1000]; }; +static EWRAM_DATA u32 sUnknown_0203BCD4 = 0; static EWRAM_DATA struct HallofFameTeam *sHofMonPtr = NULL; static EWRAM_DATA struct HofGfx *sHofGfxPtr = NULL; extern bool8 gHasHallOfFameRecords; -extern u32 gUnknown_0203BCD4; extern struct MusicPlayerInfo gMPlayInfo_BGM; extern MainCallback gGameContinueCallback; extern u32 gDamagedSaveSectors; @@ -490,7 +490,7 @@ static void Task_Hof_InitMonData(u8 taskId) } } - gUnknown_0203BCD4 = 0; + sUnknown_0203BCD4 = 0; gTasks[taskId].tDisplayedMonId = 0; gTasks[taskId].tPlayerSpriteID = 0xFF; @@ -648,11 +648,11 @@ static void Task_Hof_TryDisplayAnotherMon(u8 taskId) } else { - gUnknown_0203BCD4 |= (0x10000 << gSprites[gTasks[taskId].tMonSpriteId(currPokeID)].oam.paletteNum); + sUnknown_0203BCD4 |= (0x10000 << gSprites[gTasks[taskId].tMonSpriteId(currPokeID)].oam.paletteNum); if (gTasks[taskId].tDisplayedMonId <= 4 && currMon[1].species != SPECIES_NONE) // there is another pokemon to display { gTasks[taskId].tDisplayedMonId++; - BeginNormalPaletteFade(gUnknown_0203BCD4, 0, 12, 12, 0x63B0); + BeginNormalPaletteFade(sUnknown_0203BCD4, 0, 12, 12, 0x63B0); gSprites[gTasks[taskId].tMonSpriteId(currPokeID)].oam.priority = 1; gTasks[taskId].func = Task_Hof_DisplayMon; } @@ -696,7 +696,7 @@ static void sub_8173DC0(u8 taskId) if (gTasks[taskId].tMonSpriteId(i) != 0xFF) gSprites[gTasks[taskId].tMonSpriteId(i)].oam.priority = 1; } - BeginNormalPaletteFade(gUnknown_0203BCD4, 0, 12, 12, 0x63B0); + BeginNormalPaletteFade(sUnknown_0203BCD4, 0, 12, 12, 0x63B0); FillWindowPixelBuffer(0, 0); CopyWindowToVram(0, 3); gTasks[taskId].tFrameCount = 7; @@ -923,7 +923,7 @@ static void Task_HofPC_DrawSpritesPrintText(u8 taskId) savedTeams++; currMon = &savedTeams->mon[0]; - gUnknown_0203BCD4 = 0; + sUnknown_0203BCD4 = 0; gTasks[taskId].tCurrMonId = 0; gTasks[taskId].tMonNo = 0; @@ -998,8 +998,8 @@ static void Task_HofPC_PrintMonInfo(u8 taskId) currMonID = gTasks[taskId].tMonSpriteId(gTasks[taskId].tCurrMonId); gSprites[currMonID].oam.priority = 0; - gUnknown_0203BCD4 = (0x10000 << gSprites[currMonID].oam.paletteNum) ^ 0xFFFF0000; - BlendPalettesUnfaded(gUnknown_0203BCD4, 0xC, 0x63B0); + sUnknown_0203BCD4 = (0x10000 << gSprites[currMonID].oam.paletteNum) ^ 0xFFFF0000; + BlendPalettesUnfaded(sUnknown_0203BCD4, 0xC, 0x63B0); currMon = &savedTeams->mon[gTasks[taskId].tCurrMonId]; if (currMon->species != SPECIES_EGG) diff --git a/sym_ewram.txt b/sym_ewram.txt index 7ea9bef797..4dff894f8d 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -174,9 +174,7 @@ gBattle_WIN1H: @ 2022E28 gBattle_WIN1V: @ 2022E2A .space 0x2 - .include "src/battle_message.o" .include "src/battle_main.o" - .include "src/pokemon.o" .include "src/random.o" .include "src/daycare.o" @@ -288,9 +286,6 @@ gUnknown_02038BC6: @ 2038BC6 .include "src/field_effect.o" .include "src/scanline_effect.o" .include "src/option_menu.o" - - .align 2 - .include "src/pokedex.o" gTrainerCards: @ 2039B58 @@ -684,12 +679,7 @@ gUnknown_0203AB98: @ 203AB98 .include "src/coins.o" .include "src/battle_transition.o" - -gBattlerAbilities: @ 203ABA4 - .space 0x4 - -gStringInfo: @ 203ABA8 - .space 0x4 + .include "src/battle_message.o" gUnknown_0203ABAC: @ 203ABAC .space 0x4 @@ -740,10 +730,6 @@ gUnknown_0203BC8C: @ 203BC8C .include "src/player_pc.o" .include "src/intro.o" .include "src/field_region_map.o" - -gUnknown_0203BCD4: @ 203BCD4 - .space 0x4 - .include "src/hall_of_fame.o" .include "src/credits.o" .include "src/lottery_corner.o" @@ -751,10 +737,7 @@ gUnknown_0203BCD4: @ 203BCD4 .include "src/berry_tag_screen.o" .include "src/mystery_event_menu.o" .include "src/save_failed_screen.o" - -gBraillePuzzleCallbackFlag: @ 203BD14 - .space 0x4 - + .include "src/braille_puzzles.o" .include "src/pokeblock_feed.o" .include "src/intro_credits_graphics.o" .include "src/recorded_battle.o" From 2d0be91217e0ea16f298bb823e954a4d6f6ff63b Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 30 Jun 2018 18:55:34 +0200 Subject: [PATCH 37/55] Move all trainer defines to trainers.h and identify frontier brain trainer id --- asm/battle_frontier_2.s | 26 ++++++++++---------- asm/battle_tower.s | 4 ++-- data/battle_frontier_2.s | 7 ++++-- src/battle_bg.c | 2 +- src/battle_controller_opponent.c | 4 ++-- src/battle_controller_player.c | 19 ++++++++------- src/battle_controller_player_partner.c | 11 +++++---- src/battle_controller_wally.c | 15 ++++++------ src/battle_main.c | 6 ++--- src/battle_message.c | 20 ++++++++-------- src/battle_script_commands.c | 6 ++--- src/battle_setup.c | 8 +++---- src/pokemon.c | 12 +++++----- src/recorded_battle.c | 14 +++++------ src/reshow_battle_screen.c | 33 +++++++++++++------------- 15 files changed, 97 insertions(+), 90 deletions(-) diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s index 02bfe8b3bd..e377c1b2b9 100644 --- a/asm/battle_frontier_2.s +++ b/asm/battle_frontier_2.s @@ -19881,7 +19881,7 @@ sub_81A4CB0: @ 81A4CB0 ands r0, r1 cmp r0, 0 beq _081A4CD0 - bl sub_8185EA0 + bl GetRecordedBattleFrontierFacility lsls r0, 24 lsrs r0, 24 b _081A4CDA @@ -19893,7 +19893,7 @@ _081A4CD0: lsrs r0, 16 _081A4CDA: ldr r2, =gTrainers - ldr r1, =gUnknown_08611D30 + ldr r1, =gFacilityToBrainTrainerId lsls r0, 1 adds r0, r1 ldrh r1, [r0] @@ -19907,8 +19907,8 @@ _081A4CDA: .pool thumb_func_end sub_81A4CB0 - thumb_func_start sub_81A4D00 -sub_81A4D00: @ 81A4D00 + thumb_func_start GetFrontierBrainTrainerClass +GetFrontierBrainTrainerClass: @ 81A4D00 push {lr} ldr r0, =gBattleTypeFlags ldr r0, [r0] @@ -19917,7 +19917,7 @@ sub_81A4D00: @ 81A4D00 ands r0, r1 cmp r0, 0 beq _081A4D20 - bl sub_8185EA0 + bl GetRecordedBattleFrontierFacility lsls r0, 24 lsrs r0, 24 b _081A4D2A @@ -19929,7 +19929,7 @@ _081A4D20: lsrs r0, 16 _081A4D2A: ldr r2, =gTrainers - ldr r1, =gUnknown_08611D30 + ldr r1, =gFacilityToBrainTrainerId lsls r0, 1 adds r0, r1 ldrh r1, [r0] @@ -19941,10 +19941,10 @@ _081A4D2A: pop {r1} bx r1 .pool - thumb_func_end sub_81A4D00 + thumb_func_end GetFrontierBrainTrainerClass - thumb_func_start sub_81A4D50 -sub_81A4D50: @ 81A4D50 + thumb_func_start CopyFrontierBrainTrainerName +CopyFrontierBrainTrainerName: @ 81A4D50 push {r4,lr} adds r4, r0, 0 ldr r0, =gBattleTypeFlags @@ -19954,7 +19954,7 @@ sub_81A4D50: @ 81A4D50 ands r0, r1 cmp r0, 0 beq _081A4D70 - bl sub_8185EA0 + bl GetRecordedBattleFrontierFacility lsls r0, 24 lsrs r0, 24 b _081A4D7A @@ -19968,7 +19968,7 @@ _081A4D7A: movs r3, 0 lsls r0, 1 ldr r2, =gTrainers - ldr r1, =gUnknown_08611D30 + ldr r1, =gFacilityToBrainTrainerId adds r0, r1 ldrh r1, [r0] lsls r0, r1, 2 @@ -19991,7 +19991,7 @@ _081A4D90: pop {r0} bx r0 .pool - thumb_func_end sub_81A4D50 + thumb_func_end CopyFrontierBrainTrainerName thumb_func_start sub_81A4DB8 sub_81A4DB8: @ 81A4DB8 @@ -20483,7 +20483,7 @@ sub_81A51A8: @ 81A51A8 ands r0, r1 cmp r0, 0 beq _081A51D4 - bl sub_8185EA0 + bl GetRecordedBattleFrontierFacility lsls r0, 24 lsrs r4, r0, 24 bl sub_8185EAC diff --git a/asm/battle_tower.s b/asm/battle_tower.s index 788061f2b9..c3b82a836b 100644 --- a/asm/battle_tower.s +++ b/asm/battle_tower.s @@ -1479,7 +1479,7 @@ _08162C08: ldr r0, =0x000003fe cmp r4, r0 bne _08162C1C - bl sub_81A4D00 + bl GetFrontierBrainTrainerClass lsls r0, 24 lsrs r0, 24 b _08162D1E @@ -1729,7 +1729,7 @@ _08162E54: cmp r5, r0 bne _08162E68 adds r0, r6, 0 - bl sub_81A4D50 + bl CopyFrontierBrainTrainerName b _08162F62 .pool _08162E68: diff --git a/data/battle_frontier_2.s b/data/battle_frontier_2.s index ce24905794..1fbf2a2e1d 100644 --- a/data/battle_frontier_2.s +++ b/data/battle_frontier_2.s @@ -1,5 +1,6 @@ #include "constants/moves.h" #include "constants/species.h" +#include "constants/trainers.h" .include "asm/macros.inc" .include "constants/constants.inc" @@ -1049,8 +1050,10 @@ gUnknown_08611D08:: @ 8611D08 .4byte gUnknown_085EE3C4 .align 1 -gUnknown_08611D30:: @ 8611D30 - .2byte 0x0325, 0x0326, 0x0327, 0x0328, 0x0329, 0x032a, 0x032b, 0x0000 +gFacilityToBrainTrainerId:: @ 8611D30 + .2byte TRAINER_ANABEL, TRAINER_TUCKER, TRAINER_SPENSER + .2byte TRAINER_GRETA, TRAINER_NOLAND, TRAINER_LUCY + .2byte TRAINER_BRANDON .align 2 gUnknown_08611D40:: @ 8611D40 diff --git a/src/battle_bg.c b/src/battle_bg.c index 4895e96432..c5dd727f44 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -478,7 +478,7 @@ void DrawBattleEntryBackground(void) } else if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_EREADER_TRAINER)) { - if (!(gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) || gPartnerTrainerId == STEVEN_PARTNER_ID) + if (!(gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) || gPartnerTrainerId == TRAINER_STEVEN_PARTNER) { LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(VRAM + 0x4000)); LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000)); diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 414e084eef..c37423a722 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -1232,7 +1232,7 @@ static void OpponentHandleDrawTrainerPic(void) { trainerPicId = GetSecretBaseTrainerPicIndex(); } - else if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_3FE) + else if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN) { trainerPicId = sub_81A4CB0(); } @@ -1316,7 +1316,7 @@ static void OpponentHandleTrainerSlide(void) { trainerPicId = GetSecretBaseTrainerPicIndex(); } - else if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_3FE) + else if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN) { trainerPicId = sub_81A4CB0(); } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 86775f50ef..d30d349307 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -15,6 +15,7 @@ #include "constants/songs.h" #include "sound.h" #include "constants/moves.h" +#include "constants/trainers.h" #include "window.h" #include "m4a.h" #include "palette.h" @@ -2259,9 +2260,9 @@ static void DoSwitchOutAnimation(void) } } -// some explanation here -// in emerald it's possible to have a tag battle in the battle frontier facilities with AI -// which use the front sprite for both the player and the partner as opposed to any other battles (including the one with Steven) that use the back pic as well as animate it +// In emerald it's possible to have a tag battle in the battle frontier facilities with AI +// which use the front sprite for both the player and the partner as opposed to any other battles (including the one with Steven) +// that use an animated back pic. static void PlayerHandleDrawTrainerPic(void) { s16 xPos, yPos; @@ -2272,12 +2273,12 @@ static void PlayerHandleDrawTrainerPic(void) if ((gLinkPlayers[GetMultiplayerId()].version & 0xFF) == VERSION_FIRE_RED || (gLinkPlayers[GetMultiplayerId()].version & 0xFF) == VERSION_LEAF_GREEN) { - trainerPicId = gLinkPlayers[GetMultiplayerId()].gender + BACK_PIC_RED; + trainerPicId = gLinkPlayers[GetMultiplayerId()].gender + TRAINER_BACK_PIC_RED; } else if ((gLinkPlayers[GetMultiplayerId()].version & 0xFF) == VERSION_RUBY || (gLinkPlayers[GetMultiplayerId()].version & 0xFF) == VERSION_SAPPHIRE) { - trainerPicId = gLinkPlayers[GetMultiplayerId()].gender + BACK_PIC_RS_BRENDAN; + trainerPicId = gLinkPlayers[GetMultiplayerId()].gender + TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN; } else { @@ -2296,7 +2297,7 @@ static void PlayerHandleDrawTrainerPic(void) else // first mon xPos = 32; - if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gPartnerTrainerId != STEVEN_PARTNER_ID) + if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gPartnerTrainerId != TRAINER_STEVEN_PARTNER) { xPos = 90; yPos = (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 80; @@ -2314,7 +2315,7 @@ static void PlayerHandleDrawTrainerPic(void) } // Use front pic table for any tag battles unless your partner is Steven. - if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gPartnerTrainerId != STEVEN_PARTNER_ID) + if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gPartnerTrainerId != TRAINER_STEVEN_PARTNER) { trainerPicId = PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender); DecompressTrainerFrontPic(trainerPicId, gActiveBattler); @@ -2354,12 +2355,12 @@ static void PlayerHandleTrainerSlide(void) if ((gLinkPlayers[GetMultiplayerId()].version & 0xFF) == VERSION_FIRE_RED || (gLinkPlayers[GetMultiplayerId()].version & 0xFF) == VERSION_LEAF_GREEN) { - trainerPicId = gLinkPlayers[GetMultiplayerId()].gender + BACK_PIC_RED; + trainerPicId = gLinkPlayers[GetMultiplayerId()].gender + TRAINER_BACK_PIC_RED; } else if ((gLinkPlayers[GetMultiplayerId()].version & 0xFF) == VERSION_RUBY || (gLinkPlayers[GetMultiplayerId()].version & 0xFF) == VERSION_SAPPHIRE) { - trainerPicId = gLinkPlayers[GetMultiplayerId()].gender + BACK_PIC_RS_BRENDAN; + trainerPicId = gLinkPlayers[GetMultiplayerId()].gender + TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN; } else { diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index 6a70200b62..d7878678a4 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -11,6 +11,7 @@ #include "util.h" #include "main.h" #include "constants/songs.h" +#include "constants/trainers.h" #include "sound.h" #include "window.h" #include "m4a.h" @@ -1308,9 +1309,9 @@ static void PlayerPartnerHandleDrawTrainerPic(void) s16 xPos, yPos; u32 trainerPicId; - if (gPartnerTrainerId == STEVEN_PARTNER_ID) + if (gPartnerTrainerId == TRAINER_STEVEN_PARTNER) { - trainerPicId = BACK_PIC_STEVEN; + trainerPicId = TRAINER_BACK_PIC_STEVEN; xPos = 90; yPos = (8 - gTrainerBackPicCoords[trainerPicId].coords) * 4 + 80; } @@ -1322,7 +1323,7 @@ static void PlayerPartnerHandleDrawTrainerPic(void) } // Use back pic only if the partner is Steven - if (gPartnerTrainerId == STEVEN_PARTNER_ID) + if (gPartnerTrainerId == TRAINER_STEVEN_PARTNER) { DecompressTrainerBackPic(trainerPicId, gActiveBattler); sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler)); @@ -1793,9 +1794,9 @@ static void PlayerPartnerHandleIntroTrainerBallThrow(void) StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], 1); paletteNum = AllocSpritePalette(0xD6F9); - if (gPartnerTrainerId == STEVEN_PARTNER_ID) + if (gPartnerTrainerId == TRAINER_STEVEN_PARTNER) { - u8 spriteId = BACK_PIC_STEVEN; + u8 spriteId = TRAINER_BACK_PIC_STEVEN; LoadCompressedPalette(gTrainerBackPicPaletteTable[spriteId].data, 0x100 + paletteNum * 16, 32); } else diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index 5399ccbf00..f66a1d7739 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -15,6 +15,7 @@ #include "constants/songs.h" #include "sound.h" #include "constants/moves.h" +#include "constants/trainers.h" #include "window.h" #include "m4a.h" #include "palette.h" @@ -1037,11 +1038,11 @@ static void WallyHandleReturnMonToBall(void) static void WallyHandleDrawTrainerPic(void) { - DecompressTrainerBackPic(BACK_PIC_WALLY, gActiveBattler); - sub_806A12C(BACK_PIC_WALLY, GetBattlerPosition(gActiveBattler)); + DecompressTrainerBackPic(TRAINER_BACK_PIC_WALLY, gActiveBattler); + sub_806A12C(TRAINER_BACK_PIC_WALLY, GetBattlerPosition(gActiveBattler)); gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, 80, - 80 + 4 * (8 - gTrainerBackPicCoords[BACK_PIC_WALLY].coords), + 80 + 4 * (8 - gTrainerBackPicCoords[TRAINER_BACK_PIC_WALLY].coords), 30); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240; @@ -1052,11 +1053,11 @@ static void WallyHandleDrawTrainerPic(void) static void WallyHandleTrainerSlide(void) { - DecompressTrainerBackPic(BACK_PIC_WALLY, gActiveBattler); - sub_806A12C(BACK_PIC_WALLY, GetBattlerPosition(gActiveBattler)); + DecompressTrainerBackPic(TRAINER_BACK_PIC_WALLY, gActiveBattler); + sub_806A12C(TRAINER_BACK_PIC_WALLY, GetBattlerPosition(gActiveBattler)); gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, 80, - 80 + 4 * (8 - gTrainerBackPicCoords[BACK_PIC_WALLY].coords), + 80 + 4 * (8 - gTrainerBackPicCoords[TRAINER_BACK_PIC_WALLY].coords), 30); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -96; @@ -1444,7 +1445,7 @@ static void WallyHandleIntroTrainerBallThrow(void) StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], 1); paletteNum = AllocSpritePalette(0xD6F8); - LoadCompressedPalette(gTrainerBackPicPaletteTable[BACK_PIC_WALLY].data, 0x100 + paletteNum * 16, 32); + LoadCompressedPalette(gTrainerBackPicPaletteTable[TRAINER_BACK_PIC_WALLY].data, 0x100 + paletteNum * 16, 32); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = paletteNum; taskId = CreateTask(sub_816AC04, 5); diff --git a/src/battle_main.c b/src/battle_main.c index 487e119939..dfe99e003b 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -614,7 +614,7 @@ static void CB2_InitBattleInternal(void) gBattle_WIN0H = 240; - if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gPartnerTrainerId != STEVEN_PARTNER_ID) + if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gPartnerTrainerId != TRAINER_STEVEN_PARTNER) { gBattle_WIN0V = 159; gBattle_WIN1H = 240; @@ -1914,7 +1914,7 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 fir s32 i, j; u8 monsCount; - if (trainerNum == SECRET_BASE_OPPONENT) + if (trainerNum == TRAINER_SECRET_BASE) return 0; if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && !(gBattleTypeFlags & (BATTLE_TYPE_FRONTIER @@ -4982,7 +4982,7 @@ static void HandleEndTurn_BattleWon(void) BattleStopLowHpSound(); gBattlescriptCurrInstr = BattleScript_FrontierTrainerBattleWon; - if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_3FE) + if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN) PlayBGM(MUS_KACHI3); else PlayBGM(MUS_KACHI1); diff --git a/src/battle_message.c b/src/battle_message.c index 9dcd4aaf18..d2ac6da8c9 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -33,7 +33,7 @@ struct BattleWindowText extern u8 gUnknown_0203C7B4; -extern const u8 gMoveNames[LAST_MOVE_INDEX + 1][13]; +extern const u8 gMoveNames[MOVES_COUNT][13]; extern const u8 gTrainerClassNames[][13]; extern const u16 gUnknown_08D85620[]; @@ -43,11 +43,11 @@ extern const u8 gText_PkmnBoxLanettesPCFull[]; extern const u8 gText_PkmnTransferredSomeonesPC[]; extern const u8 gText_PkmnTransferredLanettesPC[]; -extern u8 sub_81A4D00(void); // battle_frontier_2 +extern u8 GetFrontierBrainTrainerClass(void); // battle_frontier_2 extern u8 GetFrontierOpponentClass(u16 trainerId); // battle_tower extern u8 sub_81D5530(u16 trainerId); // pokenav extern u8 GetEreaderTrainerClassId(void); // battle_tower -extern void sub_81A4D50(u8 *txtPtr); // battle_frontier_2 +extern void CopyFrontierBrainTrainerName(u8 *txtPtr); // battle_frontier_2 extern void sub_81D5554(u8 *txtPtr, u16 trainerId); // pokenav extern void GetEreaderTrainerName(u8 *txtPtr); extern void sub_81A36D0(u8 arg0, u16 trainerId); // battle_frontier_2 @@ -2139,7 +2139,7 @@ void BufferStringBattle(u16 stringID) case STRINGID_USEDMOVE: // pokemon used a move msg ChooseMoveUsedParticle(gBattleTextBuff1); // buff1 doesn't appear in the string, leftover from japanese move names - if (gBattleMsgDataPtr->currentMove > LAST_MOVE_INDEX) + if (gBattleMsgDataPtr->currentMove >= MOVES_COUNT) StringCopy(gBattleTextBuff2, sATypeMove_Table[*(&gBattleStruct->stringMoveType)]); else StringCopy(gBattleTextBuff2, gMoveNames[gBattleMsgDataPtr->currentMove]); @@ -2427,13 +2427,13 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) HANDLE_NICKNAME_STRING_CASE(gBattleScripting.battler, gBattlerPartyIndexes[gBattleScripting.battler]) break; case B_TXT_CURRENT_MOVE: // current move name - if (gBattleMsgDataPtr->currentMove > LAST_MOVE_INDEX) + if (gBattleMsgDataPtr->currentMove >= MOVES_COUNT) toCpy = sATypeMove_Table[gBattleStruct->stringMoveType]; else toCpy = gMoveNames[gBattleMsgDataPtr->currentMove]; break; case B_TXT_LAST_MOVE: // originally used move name - if (gBattleMsgDataPtr->originallyUsedMove > LAST_MOVE_INDEX) + if (gBattleMsgDataPtr->originallyUsedMove >= MOVES_COUNT) toCpy = sATypeMove_Table[gBattleStruct->stringMoveType]; else toCpy = gMoveNames[gBattleMsgDataPtr->originallyUsedMove]; @@ -2501,8 +2501,8 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) toCpy = gTrainerClassNames[GetSecretBaseTrainerClass()]; else if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_C00) toCpy = gTrainerClassNames[sub_8068BB0()]; - else if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_3FE) - toCpy = gTrainerClassNames[sub_81A4D00()]; + else if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN) + toCpy = gTrainerClassNames[GetFrontierBrainTrainerClass()]; else if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) toCpy = gTrainerClassNames[GetFrontierOpponentClass(gTrainerBattleOpponent_A)]; else if (gBattleTypeFlags & BATTLE_TYPE_x4000000) @@ -2525,9 +2525,9 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) { toCpy = gLinkPlayers[multiplayerID ^ BIT_SIDE].name; } - else if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_3FE) + else if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN) { - sub_81A4D50(text); + CopyFrontierBrainTrainerName(text); toCpy = text; } else if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index ecba9f934f..9c48b083cc 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -3533,7 +3533,7 @@ static void atk24(void) if (gBattleControllerExecFlags) return; - if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gPartnerTrainerId == STEVEN_PARTNER_ID) + if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gPartnerTrainerId == TRAINER_STEVEN_PARTNER) { for (i = 0; i < 3; i++) { @@ -5870,7 +5870,7 @@ static u32 GetTrainerMoneyToGive(u16 trainerId) u32 lastMonLevel = 0; u32 moneyReward = 0; - if (trainerId == SECRET_BASE_OPPONENT) + if (trainerId == TRAINER_SECRET_BASE) { moneyReward = 20 * gBattleResources->secretBase->party.levels[0] * gBattleStruct->moneyMultiplier; } @@ -8124,7 +8124,7 @@ static void atk9E_metronome(void) s32 i; gCurrentMove = (Random() & 0x1FF) + 1; - if (gCurrentMove > LAST_MOVE_INDEX) + if (gCurrentMove >= MOVES_COUNT) continue; for (i = 0; i < 4; i++); // ? diff --git a/src/battle_setup.c b/src/battle_setup.c index b110839293..b2655f7317 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -798,7 +798,7 @@ static u8 GetTrainerBattleTransition(void) u8 enemyLevel; u8 playerLevel; - if (gTrainerBattleOpponent_A == SECRET_BASE_OPPONENT) + if (gTrainerBattleOpponent_A == TRAINER_SECRET_BASE) return B_TRANSITION_CHAMPION; if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_ELITE_FOUR) @@ -1305,7 +1305,7 @@ void BattleSetup_StartTrainerBattle(void) static void CB2_EndTrainerBattle(void) { - if (gTrainerBattleOpponent_A == SECRET_BASE_OPPONENT) + if (gTrainerBattleOpponent_A == TRAINER_SECRET_BASE) { SetMainCallback2(CB2_ReturnToFieldContinueScript); } @@ -1329,7 +1329,7 @@ static void CB2_EndTrainerBattle(void) static void CB2_EndRematchBattle(void) { - if (gTrainerBattleOpponent_A == SECRET_BASE_OPPONENT) + if (gTrainerBattleOpponent_A == TRAINER_SECRET_BASE) { SetMainCallback2(CB2_ReturnToFieldContinueScript); } @@ -1497,7 +1497,7 @@ const u8 *GetTrainerALoseText(void) { const u8 *string; - if (gTrainerBattleOpponent_A == SECRET_BASE_OPPONENT) + if (gTrainerBattleOpponent_A == TRAINER_SECRET_BASE) string = GetSecretBaseTrainerLoseText(); else string = sTrainerADefeatSpeech; diff --git a/src/pokemon.c b/src/pokemon.c index 800b7c0cd4..a4d62feca5 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2488,7 +2488,7 @@ static bool8 ShouldGetStatBadgeBoost(u16 badgeFlag, u8 battlerId) return FALSE; if (GetBattlerSide(battlerId) != B_SIDE_PLAYER) return FALSE; - if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gTrainerBattleOpponent_A == SECRET_BASE_OPPONENT) + if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gTrainerBattleOpponent_A == TRAINER_SECRET_BASE) return FALSE; if (FlagGet(badgeFlag)) return TRUE; @@ -5678,7 +5678,7 @@ const u8 *GetTrainerPartnerName(void) { if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) { - if (gPartnerTrainerId == STEVEN_PARTNER_ID) + if (gPartnerTrainerId == TRAINER_STEVEN_PARTNER) { return gTrainers[TRAINER_STEVEN].trainerName; } @@ -5891,15 +5891,15 @@ void HandleSetPokedexFlag(u16 nationalNum, u8 caseId, u32 personality) const u8 *GetTrainerClassNameFromId(u16 trainerId) { - if (trainerId > NO_OF_TRAINERS) - trainerId = 0; + if (trainerId >= TRAINERS_COUNT) + trainerId = TRAINER_NONE; return gTrainerClassNames[gTrainers[trainerId].trainerClass]; } const u8 *GetTrainerNameFromId(u16 trainerId) { - if (trainerId > NO_OF_TRAINERS) - trainerId = 0; + if (trainerId >= TRAINERS_COUNT) + trainerId = TRAINER_NONE; return gTrainers[trainerId].trainerName; } diff --git a/src/recorded_battle.c b/src/recorded_battle.c index eb48ab15a3..3a42658951 100644 --- a/src/recorded_battle.c +++ b/src/recorded_battle.c @@ -79,7 +79,7 @@ EWRAM_DATA static u16 sUnknown_0203C79C[4] = {0}; EWRAM_DATA static u16 sUnknown_0203C7A4[4] = {0}; EWRAM_DATA static u8 sUnknown_0203C7AC = 0; EWRAM_DATA static u8 sUnknown_0203C7AD = 0; -EWRAM_DATA static u8 sUnknown_0203C7AE = 0; +EWRAM_DATA static u8 sRecordedBattle_FrontierFacility = 0; EWRAM_DATA static u8 sUnknown_0203C7AF = 0; EWRAM_DATA static MainCallback sCallback2_AfterRecordedBattle = NULL; EWRAM_DATA u8 gUnknown_0203C7B4 = 0; @@ -139,7 +139,7 @@ void sub_8184E58(void) if (sUnknown_0203C7AC == 1) { gRecordedBattleRngSeed = gRngValue; - sUnknown_0203C7AE = VarGet(VAR_FRONTIER_FACILITY); + sRecordedBattle_FrontierFacility = VarGet(VAR_FRONTIER_FACILITY); sUnknown_0203C7AF = sub_81A513C(); } else if (sUnknown_0203C7AC == 2) @@ -391,7 +391,7 @@ u32 MoveRecordedBattleToSaveData(void) battleSave->partnerId = gPartnerTrainerId; battleSave->field_4FA = gUnknown_0203C7B4; battleSave->field_4FC = gSaveBlock2Ptr->field_CA9_b; - battleSave->field_4FD = sUnknown_0203C7AE; + battleSave->field_4FD = sRecordedBattle_FrontierFacility; battleSave->field_4FE = sUnknown_0203C7AF; battleSave->battleStyle = gSaveBlock2Ptr->optionsBattleStyle; battleSave->textSpeed = gSaveBlock2Ptr->optionsTextSpeed; @@ -700,7 +700,7 @@ _081854E2:\n\ ldr r5, =0x000004fc\n\ adds r1, r7, r5\n\ strb r0, [r1]\n\ - ldr r0, =sUnknown_0203C7AE\n\ + ldr r0, =sRecordedBattle_FrontierFacility\n\ ldrb r1, [r0]\n\ adds r2, 0x3\n\ adds r0, r7, r2\n\ @@ -1354,7 +1354,7 @@ static void SetRecordedBattleVarsFromSave(struct RecordedBattleSave *src) gPartnerTrainerId = src->partnerId; gUnknown_0203C7B4 = src->field_4FA; sUnknown_0203C7AD = gSaveBlock2Ptr->frontierChosenLvl; - sUnknown_0203C7AE = src->field_4FD; + sRecordedBattle_FrontierFacility = src->field_4FD; sUnknown_0203C7AF = src->field_4FE; sRecordedBattle_BattleStyle = src->battleStyle; sRecordedBattle_TextSpeed = src->textSpeed; @@ -1415,9 +1415,9 @@ static void CB2_RecordedBattle(void) RunTasks(); } -u8 sub_8185EA0(void) +u8 GetRecordedBattleFrontierFacility(void) { - return sUnknown_0203C7AE; + return sRecordedBattle_FrontierFacility; } u8 sub_8185EAC(void) diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c index 4456e450c8..4d5240bc72 100644 --- a/src/reshow_battle_screen.c +++ b/src/reshow_battle_screen.c @@ -11,6 +11,7 @@ #include "link.h" #include "sprite.h" #include "constants/species.h" +#include "constants/trainers.h" #include "battle_interface.h" #include "battle_anim.h" #include "data2.h" @@ -144,20 +145,20 @@ static void CB2_ReshowBattleScreenAfterMenu(void) break; case 19: { - u8 opponentBank; + u8 opponentBattler; u16 species; LoadAndCreateEnemyShadowSprites(); - opponentBank = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); - species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[opponentBank]], MON_DATA_SPECIES); - SetBattlerShadowSpriteCallback(opponentBank, species); + opponentBattler = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); + species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[opponentBattler]], MON_DATA_SPECIES); + SetBattlerShadowSpriteCallback(opponentBattler, species); if (IsDoubleBattle()) { - opponentBank = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT); - species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[opponentBank]], MON_DATA_SPECIES); - SetBattlerShadowSpriteCallback(opponentBank, species); + opponentBattler = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT); + species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[opponentBattler]], MON_DATA_SPECIES); + SetBattlerShadowSpriteCallback(opponentBattler, species); } ActionSelectionCreateCursorAt(gActionSelectionCursor[gBattlerInMenuId], 0); @@ -204,10 +205,10 @@ static bool8 LoadBattlerSpriteGfx(u8 battler) else BattleLoadSubstituteOrMonSpriteGfx(battler, FALSE); } - else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && battler == 0) + else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && battler == B_POSITION_PLAYER_LEFT) // Should be checking position, not battler. DecompressTrainerBackPic(gSaveBlock2Ptr->playerGender, battler); - else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && battler == 0) - DecompressTrainerBackPic(BACK_PIC_WALLY, battler); + else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && battler == B_POSITION_PLAYER_LEFT) // Should be checking position, not battler. + DecompressTrainerBackPic(TRAINER_BACK_PIC_WALLY, battler); else if (!gBattleSpritesDataPtr->battlerData[battler].behindSubstitute) BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[battler]], battler); else @@ -245,7 +246,7 @@ static void CreateBattlerSprite(u8 battler) if (gBattleSpritesDataPtr->battlerData[battler].transformSpecies == SPECIES_CASTFORM) gSprites[gBattlerSpriteIds[battler]].anims = gMonAnimationsSpriteAnimsPtrTable[SPECIES_CASTFORM]; } - else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && battler == 0) + else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && battler == B_POSITION_PLAYER_LEFT) { sub_806A12C(gSaveBlock2Ptr->playerGender, GetBattlerPosition(B_POSITION_PLAYER_LEFT)); gBattlerSpriteIds[battler] = CreateSprite(&gUnknown_0202499C, 0x50, @@ -255,11 +256,11 @@ static void CreateBattlerSprite(u8 battler) gSprites[gBattlerSpriteIds[battler]].callback = SpriteCallbackDummy; gSprites[gBattlerSpriteIds[battler]].data[0] = battler; } - else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && battler == 0) + else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && battler == B_POSITION_PLAYER_LEFT) { - sub_806A12C(BACK_PIC_WALLY, GetBattlerPosition(0)); + sub_806A12C(TRAINER_BACK_PIC_WALLY, GetBattlerPosition(0)); gBattlerSpriteIds[battler] = CreateSprite(&gUnknown_0202499C, 0x50, - (8 - gTrainerBackPicCoords[BACK_PIC_WALLY].coords) * 4 + 80, + (8 - gTrainerBackPicCoords[TRAINER_BACK_PIC_WALLY].coords) * 4 + 80, sub_80A82E4(0)); gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = battler; gSprites[gBattlerSpriteIds[battler]].callback = SpriteCallbackDummy; @@ -292,9 +293,9 @@ static void CreateHealthboxSprite(u8 battler) { u8 healthboxSpriteId; - if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && battler == 0) + if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && battler == B_POSITION_PLAYER_LEFT) healthboxSpriteId = CreateSafariPlayerHealthboxSprites(); - else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && battler == 0) + else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && battler == B_POSITION_PLAYER_LEFT) return; else healthboxSpriteId = CreateBattlerHealthboxSprites(battler); From d2e47323fe988e430af782c2c10b8e41e7a131b3 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 1 Jul 2018 11:15:42 +0200 Subject: [PATCH 38/55] document frontier related --- asm/battle_frontier_2.s | 6 +- asm/battle_tower.s | 2 +- data/battle_ai_scripts.s | 6 +- data/data2b.s | 4 - include/battle.h | 30 +-- include/battle_util.h | 53 ++-- include/constants/abilities.h | 2 + include/constants/battle.h | 2 +- include/constants/battle_frontier.h | 13 + include/constants/battle_script_commands.h | 2 +- include/constants/moves.h | 2 +- include/constants/trainers.h | 18 +- include/data/battle_moves.h | 2 +- include/data/text/abilities.h | 4 +- include/pokemon.h | 2 +- include/recorded_battle.h | 2 +- src/battle_ai_script_commands.c | 2 +- src/battle_controller_link_partner.c | 9 +- src/battle_controller_opponent.c | 7 +- src/battle_controller_recorded_opponent.c | 1 + src/battle_controllers.c | 14 +- src/battle_gfx_sfx_util.c | 77 +++--- src/battle_interface.c | 6 +- src/battle_main.c | 50 ++-- src/battle_message.c | 3 +- src/battle_script_commands.c | 30 +-- src/battle_tv.c | 8 +- src/battle_util.c | 283 +++++++++++---------- src/pokemon.c | 22 +- src/recorded_battle.c | 116 ++++----- 30 files changed, 402 insertions(+), 376 deletions(-) create mode 100644 include/constants/battle_frontier.h diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s index e377c1b2b9..586cc8f05f 100644 --- a/asm/battle_frontier_2.s +++ b/asm/battle_frontier_2.s @@ -19871,8 +19871,8 @@ _081A4C84: .pool thumb_func_end sub_81A4C30 - thumb_func_start sub_81A4CB0 -sub_81A4CB0: @ 81A4CB0 + thumb_func_start GetFrontierBrainTrainerPicIndex +GetFrontierBrainTrainerPicIndex: @ 81A4CB0 push {lr} ldr r0, =gBattleTypeFlags ldr r0, [r0] @@ -19905,7 +19905,7 @@ _081A4CDA: pop {r1} bx r1 .pool - thumb_func_end sub_81A4CB0 + thumb_func_end GetFrontierBrainTrainerPicIndex thumb_func_start GetFrontierBrainTrainerClass GetFrontierBrainTrainerClass: @ 81A4D00 diff --git a/asm/battle_tower.s b/asm/battle_tower.s index c3b82a836b..1e07bdb9c0 100644 --- a/asm/battle_tower.s +++ b/asm/battle_tower.s @@ -1353,7 +1353,7 @@ _08162AD0: ldr r0, =0x000003fe cmp r4, r0 bne _08162AE4 - bl sub_81A4CB0 + bl GetFrontierBrainTrainerPicIndex lsls r0, 24 lsrs r0, 24 b _08162BCA diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index 1b4863046e..2db1c5728e 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -3382,11 +3382,11 @@ AI_Safari_Flee: flee AI_FirstBattle: - if_hp_equal AI_TARGET, 20, BattleAIScript_82DE34D - if_hp_less_than AI_TARGET, 20, BattleAIScript_82DE34D + if_hp_equal AI_TARGET, 20, AI_FirstBattle_Flee + if_hp_less_than AI_TARGET, 20, AI_FirstBattle_Flee end -BattleAIScript_82DE34D: +AI_FirstBattle_Flee: flee AI_Ret: diff --git a/data/data2b.s b/data/data2b.s index 17a44ecbc2..de32e97753 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -4862,7 +4862,3 @@ gUnknown_0831ACC4:: @ 831ACC4 .align 2 gUnknown_0831ACDC:: @ 831ACDC .4byte gUnknown_0831ACC4 - - .align 2 -gUnknown_0831ACE0:: @ 831ACE0 - .byte 0xe0, 0xf0, 0xf0, 0xe0, 0xe0, 0x00, 0x00, 0x00 diff --git a/include/battle.h b/include/battle.h index 0169dde7ca..6e941191f5 100644 --- a/include/battle.h +++ b/include/battle.h @@ -16,12 +16,6 @@ #define GET_BATTLER_SIDE(battler) (GetBattlerPosition(battler) & BIT_SIDE) #define GET_BATTLER_SIDE2(battler) (GET_BATTLER_POSITION(battler) & BIT_SIDE) -#define TRAINER_OPPONENT_3FE 0x3FE -#define TRAINER_OPPONENT_C00 0xC00 -#define TRAINER_OPPONENT_800 0x800 -#define STEVEN_PARTNER_ID 0xC03 -#define SECRET_BASE_OPPONENT 0x400 - // Battle Actions // These determine what each battler will do in a turn #define B_ACTION_USE_MOVE 0 @@ -429,7 +423,7 @@ struct BattleTv_Mon struct BattleTv { - struct BattleTv_Mon mon[2][6]; // [side][partyId] + struct BattleTv_Mon mon[2][PARTY_SIZE]; // [side][partyId] struct BattleTv_Position pos[2][2]; // [side][flank] struct BattleTv_Side side[2]; // [side] }; @@ -479,10 +473,10 @@ struct BattleStruct u8 runTries; u8 caughtMonNick[11]; u8 field_78; - u8 field_79; - u8 field_7A; - u8 field_7B; - u8 field_7C; + u8 safariGoNearCounter; + u8 safariPkblThrowCounter; + u8 safariEscapeFactor; + u8 safariCatchFactor; u8 field_7D; u8 field_7E; u8 formToChangeInto; @@ -526,7 +520,7 @@ struct BattleStruct u8 AI_itemFlags[2]; u16 choicedMove[MAX_BATTLERS_COUNT]; u16 changedItems[MAX_BATTLERS_COUNT]; - u8 intimidateBank; + u8 intimidateBattler; u8 switchInItemsCounter; u8 field_DA; u8 turnSideTracker; @@ -611,18 +605,6 @@ struct BattleScripting u8 multiplayerId; }; -enum -{ - BACK_PIC_BRENDAN, - BACK_PIC_MAY, - BACK_PIC_RED, - BACK_PIC_LEAF, - BACK_PIC_RS_BRENDAN, - BACK_PIC_RS_MAY, - BACK_PIC_WALLY, - BACK_PIC_STEVEN -}; - // rom_80A5C6C u8 GetBattlerSide(u8 battler); u8 GetBattlerPosition(u8 bank); diff --git a/include/battle_util.h b/include/battle_util.h index 0b5590011d..0531966dfc 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -8,27 +8,27 @@ #define MOVE_LIMITATION_TAUNT (1 << 4) #define MOVE_LIMITATION_IMPRISION (1 << 5) -#define ABILITYEFFECT_ON_SWITCHIN 0x0 -#define ABILITYEFFECT_ENDTURN 0x1 -#define ABILITYEFFECT_MOVES_BLOCK 0x2 -#define ABILITYEFFECT_ABSORBING 0x3 -#define ABILITYEFFECT_CONTACT 0x4 -#define ABILITYEFFECT_IMMUNITY 0x5 -#define ABILITYEFFECT_FORECAST 0x6 -#define ABILITYEFFECT_SYNCHRONIZE 0x7 -#define ABILITYEFFECT_ATK_SYNCHRONIZE 0x8 -#define ABILITYEFFECT_INTIMIDATE1 0x9 -#define ABILITYEFFECT_INTIMIDATE2 0xA -#define ABILITYEFFECT_TRACE 0xB -#define ABILITYEFFECT_CHECK_OTHER_SIDE 0xC -#define ABILITYEFFECT_CHECK_BANK_SIDE 0xD -#define ABILITYEFFECT_FIELD_SPORT 0xE -#define ABILITYEFFECT_CHECK_FIELD_EXCEPT_BANK 0xF -#define ABILITYEFFECT_COUNT_OTHER_SIDE 0x10 -#define ABILITYEFFECT_COUNT_BANK_SIDE 0x11 -#define ABILITYEFFECT_COUNT_ON_FIELD 0x12 -#define ABILITYEFFECT_CHECK_ON_FIELD 0x13 -#define ABILITYEFFECT_SWITCH_IN_WEATHER 0xFF +#define ABILITYEFFECT_ON_SWITCHIN 0x0 +#define ABILITYEFFECT_ENDTURN 0x1 +#define ABILITYEFFECT_MOVES_BLOCK 0x2 +#define ABILITYEFFECT_ABSORBING 0x3 +#define ABILITYEFFECT_CONTACT 0x4 +#define ABILITYEFFECT_IMMUNITY 0x5 +#define ABILITYEFFECT_FORECAST 0x6 +#define ABILITYEFFECT_SYNCHRONIZE 0x7 +#define ABILITYEFFECT_ATK_SYNCHRONIZE 0x8 +#define ABILITYEFFECT_INTIMIDATE1 0x9 +#define ABILITYEFFECT_INTIMIDATE2 0xA +#define ABILITYEFFECT_TRACE 0xB +#define ABILITYEFFECT_CHECK_OTHER_SIDE 0xC +#define ABILITYEFFECT_CHECK_BATTLER_SIDE 0xD +#define ABILITYEFFECT_FIELD_SPORT 0xE +#define ABILITYEFFECT_CHECK_FIELD_EXCEPT_BATTLER 0xF +#define ABILITYEFFECT_COUNT_OTHER_SIDE 0x10 +#define ABILITYEFFECT_COUNT_BATTLER_SIDE 0x11 +#define ABILITYEFFECT_COUNT_ON_FIELD 0x12 +#define ABILITYEFFECT_CHECK_ON_FIELD 0x13 +#define ABILITYEFFECT_SWITCH_IN_WEATHER 0xFF #define ABILITY_ON_OPPOSING_FIELD(battlerId, abilityId)(AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, battlerId, abilityId, 0, 0)) #define ABILITY_ON_FIELD(abilityId)(AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, abilityId, 0, 0)) @@ -39,15 +39,6 @@ #define WEATHER_HAS_EFFECT ((!ABILITY_ON_FIELD(ABILITY_CLOUD_NINE) && !ABILITY_ON_FIELD(ABILITY_AIR_LOCK))) #define WEATHER_HAS_EFFECT2 ((!ABILITY_ON_FIELD2(ABILITY_CLOUD_NINE) && !ABILITY_ON_FIELD2(ABILITY_AIR_LOCK))) -#define BS_GET_TARGET 0 -#define BS_GET_ATTACKER 1 -#define BS_GET_EFFECT_BANK 2 -#define BS_GET_SCRIPTING_BANK 10 -#define BS_GET_PLAYER1 11 -#define BS_GET_OPPONENT1 12 -#define BS_GET_PLAYER2 13 -#define BS_GET_OPPONENT2 14 - u8 GetBattlerForBattleScript(u8 caseId); void PressurePPLose(u8 bankDef, u8 bankAtk, u16 move); void PressurePPLoseOnUsingPerishSong(u8 bankAtk); @@ -74,7 +65,7 @@ bool8 HandleWishPerishSongOnTurnEnd(void); bool8 HandleFaintedMonActions(void); void TryClearRageStatuses(void); u8 AtkCanceller_UnableToUseMove(void); -bool8 sub_80423F4(u8 battlerId, u8 r1, u8 r2); +bool8 HasNoMonsToSwitch(u8 battlerId, u8 r1, u8 r2); u8 CastformDataTypeChange(u8 battlerId); u8 AbilityBattleEffects(u8 caseID, u8 battlerId, u8 ability, u8 special, u16 moveArg); void BattleScriptExecute(const u8* BS_ptr); diff --git a/include/constants/abilities.h b/include/constants/abilities.h index 4e2c4056c7..4ad54c86fa 100644 --- a/include/constants/abilities.h +++ b/include/constants/abilities.h @@ -80,4 +80,6 @@ #define ABILITY_CACOPHONY 76 #define ABILITY_AIR_LOCK 77 +#define ABILITIES_COUNT 78 + #endif // GUARD_CONSTANTS_ABILITIES_H diff --git a/include/constants/battle.h b/include/constants/battle.h index 5a09067ad3..b3f9d919ad 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -130,7 +130,7 @@ #define STATUS2_TORMENT 0x80000000 // Seems like per-battler statuses. Not quite sure how to categorize these -#define STATUS3_LEECHSEED_BANK 0x3 +#define STATUS3_LEECHSEED_BATTLER 0x3 #define STATUS3_LEECHSEED 0x4 #define STATUS3_ALWAYS_HITS 0x18 // two bits #define STATUS3_PERISH_SONG 0x20 diff --git a/include/constants/battle_frontier.h b/include/constants/battle_frontier.h new file mode 100644 index 0000000000..4145805c44 --- /dev/null +++ b/include/constants/battle_frontier.h @@ -0,0 +1,13 @@ +#ifndef GUARD_CONSTANTS_BATTLE_FRONTIER_H +#define GUARD_CONSTANTS_BATTLE_FRONTIER_H + +// Battle Frontier facility ids. +#define FRONTIER_FACILITY_TOWER 0 +#define FRONTIER_FACILITY_DOME 1 +#define FRONTIER_FACILITY_PALACE 2 +#define FRONTIER_FACILITY_ARENA 3 +#define FRONTIER_FACILITY_FACTORY 4 +#define FRONTIER_FACILITY_PIKE 5 +#define FRONTIER_FACILITY_PYRAMID 6 + +#endif // GUARD_CONSTANTS_BATTLE_FRONTIER_H diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index a1a4ed50a1..c820a1114d 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -37,7 +37,7 @@ #define BS_ATTACKER 1 #define BS_EFFECT_BATTLER 2 #define BS_FAINTED 3 -#define BS_BANK_0 7 +#define BS_BATTLER_0 7 #define BS_ATTACKER_WITH_PARTNER 4 // for atk98_status_icon_update #define BS_ATTACKER_SIDE 8 // for atk1E_jumpifability #define BS_NOT_ATTACKER_SIDE 9 // for atk1E_jumpifability diff --git a/include/constants/moves.h b/include/constants/moves.h index f3a3acb902..85c02e3da5 100644 --- a/include/constants/moves.h +++ b/include/constants/moves.h @@ -357,6 +357,6 @@ #define MOVE_DOOM_DESIRE 353 #define MOVE_PSYCHO_BOOST 354 -#define LAST_MOVE_INDEX MOVE_PSYCHO_BOOST +#define MOVES_COUNT 355 #endif // GUARD_CONSTANTS_MOVES_H diff --git a/include/constants/trainers.h b/include/constants/trainers.h index a017b6975f..eb695e4ab1 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -857,7 +857,14 @@ #define TRAINER_BRENDAN_16 853 #define TRAINER_MAY_16 854 -#define NO_OF_TRAINERS 854 +#define TRAINERS_COUNT 855 + +// Special Trainer Ids. +#define TRAINER_FRONTIER_BRAIN 1022 +#define TRAINER_SECRET_BASE 1024 +#define TRAINER_LINK_OPPONENT 0x800 +#define TRAINER_OPPONENT_C00 0xC00 +#define TRAINER_STEVEN_PARTNER 0xC03 #define TRAINER_PIC_HIKER 0 #define TRAINER_PIC_AQUA_GRUNT_M 1 @@ -953,6 +960,15 @@ #define TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN 91 #define TRAINER_PIC_RUBY_SAPPHIRE_MAY 92 +#define TRAINER_BACK_PIC_BRENDAN 0 +#define TRAINER_BACK_PIC_MAY 1 +#define TRAINER_BACK_PIC_RED 2 +#define TRAINER_BACK_PIC_LEAF 3 +#define TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN 4 +#define TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY 5 +#define TRAINER_BACK_PIC_WALLY 6 +#define TRAINER_BACK_PIC_STEVEN 7 + #define FACILITY_CLASS_HIKER 0x0 #define FACILITY_CLASS_TEAM_AQUA_1 0x1 #define FACILITY_CLASS_PKMN_BREEDER_1 0x2 diff --git a/include/data/battle_moves.h b/include/data/battle_moves.h index 6489fe07f5..00a6f7fdbe 100644 --- a/include/data/battle_moves.h +++ b/include/data/battle_moves.h @@ -1,7 +1,7 @@ #ifndef GUARD_DATA_BATTLE_MOVES #define GUARD_DATA_BATTLE_MOVES -const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = +const struct BattleMove gBattleMoves[MOVES_COUNT] = { { // MOVE_NONE .effect = EFFECT_HIT, diff --git a/include/data/text/abilities.h b/include/data/text/abilities.h index 2efd76afcd..3a1e989d2b 100644 --- a/include/data/text/abilities.h +++ b/include/data/text/abilities.h @@ -80,7 +80,7 @@ static const u8 gShellArmorAbilityDescription[] = _("Blocks critical hits."); static const u8 gCacophonyAbilityDescription[] = _("Avoids sound-based moves."); static const u8 gAirLockAbilityDescription[] = _("Negates weather effects."); -const u8 gAbilityNames[][ABILITY_NAME_LENGTH + 1] = +const u8 gAbilityNames[ABILITIES_COUNT][ABILITY_NAME_LENGTH + 1] = { _("-------"), _("STENCH"), @@ -162,7 +162,7 @@ const u8 gAbilityNames[][ABILITY_NAME_LENGTH + 1] = _("AIR LOCK"), }; -const u8 *const gAbilityDescriptionPointers[] = +const u8 *const gAbilityDescriptionPointers[ABILITIES_COUNT] = { gNoneAbilityDescription, gStenchAbilityDescription, diff --git a/include/pokemon.h b/include/pokemon.h index 37028821a0..f928243d0c 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -556,7 +556,7 @@ void sub_806D544(u16 species, u32 personality, u8 *dest); void DrawSpindaSpots(u16 species, u32 personality, u8 *dest, u8 a4); void EvolutionRenameMon(struct Pokemon *mon, u16 oldSpecies, u16 newSpecies); bool8 sub_806D7EC(void); -bool16 sub_806D82C(u8 id); +bool16 GetLinkTrainerFlankId(u8 id); s32 GetBattlerMultiplayerId(u16 a1); u8 GetTrainerEncounterMusicId(u16 trainerOpponentId); u16 ModifyStatByNature(u8 nature, u16 n, u8 statIndex); diff --git a/include/recorded_battle.h b/include/recorded_battle.h index 8b1fa258df..81c88a15ee 100644 --- a/include/recorded_battle.h +++ b/include/recorded_battle.h @@ -16,7 +16,7 @@ void sub_81851A8(u8 *arg0); bool32 CanCopyRecordedBattleSaveData(void); u32 MoveRecordedBattleToSaveData(void); void PlayRecordedBattle(void (*CB2_After)(void)); -u8 sub_8185EA0(void); +u8 GetRecordedBattleFrontierFacility(void); u8 sub_8185EAC(void); void RecordedBattle_SaveParties(void); u8 GetActiveBattlerLinkPlayerGender(void); diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index 1315989858..e82d225762 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -1969,7 +1969,7 @@ static void BattleAICmd_flee(void) static void BattleAICmd_if_random_safari_flee(void) { - u8 safariFleeRate = gBattleStruct->field_7B * 5; // Safari flee rate, from 0-20. + u8 safariFleeRate = gBattleStruct->safariEscapeFactor * 5; // Safari flee rate, from 0-20. if ((u8)(Random() % 100) < safariFleeRate) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index be9609e624..a88c4a0768 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -12,6 +12,7 @@ #include "util.h" #include "main.h" #include "constants/songs.h" +#include "constants/trainers.h" #include "sound.h" #include "window.h" #include "m4a.h" @@ -1133,12 +1134,12 @@ static void LinkPartnerHandleDrawTrainerPic(void) if ((gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_FIRE_RED || (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_LEAF_GREEN) { - trainerPicId = gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender + BACK_PIC_RED; + trainerPicId = gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender + TRAINER_BACK_PIC_RED; } else if ((gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_RUBY || (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_SAPPHIRE) { - trainerPicId = gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender + BACK_PIC_RS_BRENDAN; + trainerPicId = gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender + TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN; } else { @@ -1545,12 +1546,12 @@ static void LinkPartnerHandleIntroTrainerBallThrow(void) if ((gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_FIRE_RED || (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_LEAF_GREEN) { - trainerPicId = gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender + BACK_PIC_RED; + trainerPicId = gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender + TRAINER_BACK_PIC_RED; } else if ((gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_RUBY || (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_SAPPHIRE) { - trainerPicId = gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender + BACK_PIC_RS_BRENDAN; + trainerPicId = gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender + TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN; } else { diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index c37423a722..2af17d32e8 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -16,6 +16,7 @@ #include "constants/songs.h" #include "sound.h" #include "constants/moves.h" +#include "constants/trainers.h" #include "window.h" #include "m4a.h" #include "palette.h" @@ -39,7 +40,7 @@ extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); extern void sub_806A068(u16, u8); extern void sub_81A57E4(u8 battlerId, u16 stringId); -extern u8 sub_81A4CB0(void); +extern u8 GetFrontierBrainTrainerPicIndex(void); extern u8 sub_81D5588(u16 trainerId); extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId); extern u8 GetEreaderTrainerFrontSpriteId(void); @@ -1234,7 +1235,7 @@ static void OpponentHandleDrawTrainerPic(void) } else if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN) { - trainerPicId = sub_81A4CB0(); + trainerPicId = GetFrontierBrainTrainerPicIndex(); } else if (gBattleTypeFlags & BATTLE_TYPE_x4000000) { @@ -1318,7 +1319,7 @@ static void OpponentHandleTrainerSlide(void) } else if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN) { - trainerPicId = sub_81A4CB0(); + trainerPicId = GetFrontierBrainTrainerPicIndex(); } else if (gBattleTypeFlags & BATTLE_TYPE_x4000000) { diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 4b44116dd0..1fd1deebfa 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -13,6 +13,7 @@ #include "util.h" #include "main.h" #include "constants/songs.h" +#include "constants/trainers.h" #include "sound.h" #include "window.h" #include "m4a.h" diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 4da941ab05..01ad750db5 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -1082,14 +1082,14 @@ void BtlController_EmitMoveAnimation(u8 bufferId, u16 move, u8 turnOfMove, u16 m void BtlController_EmitPrintString(u8 bufferId, u16 stringID) { s32 i; - struct StringInfoBattle* stringInfo; + struct BattleMsgData* stringInfo; sBattleBuffersTransferData[0] = CONTROLLER_PRINTSTRING; sBattleBuffersTransferData[1] = gBattleOutcome; sBattleBuffersTransferData[2] = stringID; sBattleBuffersTransferData[3] = (stringID & 0xFF00) >> 8; - stringInfo = (struct StringInfoBattle*)(&sBattleBuffersTransferData[4]); + stringInfo = (struct BattleMsgData*)(&sBattleBuffersTransferData[4]); stringInfo->currentMove = gCurrentMove; stringInfo->originallyUsedMove = gChosenMove; stringInfo->lastItem = gLastUsedItem; @@ -1097,7 +1097,7 @@ void BtlController_EmitPrintString(u8 bufferId, u16 stringID) stringInfo->scrActive = gBattleScripting.battler; stringInfo->unk1605E = gBattleStruct->field_52; stringInfo->hpScale = gBattleStruct->hpScale; - stringInfo->StringBank = gPotentialItemEffectBattler; + stringInfo->itemEffectBattler = gPotentialItemEffectBattler; stringInfo->moveType = gBattleMoves[gCurrentMove].type; for (i = 0; i < MAX_BATTLERS_COUNT; i++) @@ -1108,20 +1108,20 @@ void BtlController_EmitPrintString(u8 bufferId, u16 stringID) stringInfo->textBuffs[1][i] = gBattleTextBuff2[i]; stringInfo->textBuffs[2][i] = gBattleTextBuff3[i]; } - PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, sizeof(struct StringInfoBattle) + 4); + PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, sizeof(struct BattleMsgData) + 4); } void BtlController_EmitPrintSelectionString(u8 bufferId, u16 stringID) { s32 i; - struct StringInfoBattle *stringInfo; + struct BattleMsgData *stringInfo; sBattleBuffersTransferData[0] = CONTROLLER_PRINTSTRINGPLAYERONLY; sBattleBuffersTransferData[1] = CONTROLLER_PRINTSTRINGPLAYERONLY; sBattleBuffersTransferData[2] = stringID; sBattleBuffersTransferData[3] = (stringID & 0xFF00) >> 8; - stringInfo = (struct StringInfoBattle*)(&sBattleBuffersTransferData[4]); + stringInfo = (struct BattleMsgData*)(&sBattleBuffersTransferData[4]); stringInfo->currentMove = gCurrentMove; stringInfo->originallyUsedMove = gChosenMove; stringInfo->lastItem = gLastUsedItem; @@ -1137,7 +1137,7 @@ void BtlController_EmitPrintSelectionString(u8 bufferId, u16 stringID) stringInfo->textBuffs[1][i] = gBattleTextBuff2[i]; stringInfo->textBuffs[2][i] = gBattleTextBuff3[i]; } - PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, sizeof(struct StringInfoBattle) + 4); + PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, sizeof(struct BattleMsgData) + 4); } void BtlController_EmitChooseAction(u8 bufferId, u8 arg1, u16 arg2) diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 47af1b9ddf..8f17d488e5 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -70,45 +70,45 @@ static void Task_ClearBitWhenSpecialAnimDone(u8 taskId); static void ClearSpritesBattlerHealthboxAnimData(void); // const rom data -static const struct CompressedSpriteSheet gUnknown_0832C0D0 = +static const struct CompressedSpriteSheet sSpriteSheet_SinglesPlayerHealthbox = { gUnknown_08C1F1C8, 0x1000, TAG_HEALTHBOX_PLAYER1_TILE }; -static const struct CompressedSpriteSheet gUnknown_0832C0D8 = +static const struct CompressedSpriteSheet sSpriteSheet_SinglesOpponentHealthbox = { gUnknown_08C1F46C, 0x1000, TAG_HEALTHBOX_OPPONENT1_TILE }; -static const struct CompressedSpriteSheet gUnknown_0832C0E0[2] = +static const struct CompressedSpriteSheet sSpriteSheets_DoublesPlayerHealthbox[2] = { {gUnknown_08C1F5E8, 0x800, TAG_HEALTHBOX_PLAYER1_TILE}, {gUnknown_08C1F5E8, 0x800, TAG_HEALTHBOX_PLAYER2_TILE} }; -static const struct CompressedSpriteSheet gUnknown_0832C0F0[2] = +static const struct CompressedSpriteSheet sSpriteSheets_DoublesOpponentHealthbox[2] = { {gUnknown_08C1F76C, 0x800, TAG_HEALTHBOX_OPPONENT1_TILE}, {gUnknown_08C1F76C, 0x800, TAG_HEALTHBOX_OPPONENT2_TILE} }; -static const struct CompressedSpriteSheet gUnknown_0832C100 = +static const struct CompressedSpriteSheet sSpriteSheet_SafariHealthbox = { gUnknown_08C1F8E8, 0x1000, TAG_HEALTHBOX_SAFARI_TILE }; -static const struct CompressedSpriteSheet gUnknown_0832C108[MAX_BATTLERS_COUNT] = +static const struct CompressedSpriteSheet sSpriteSheets_HealthBar[MAX_BATTLERS_COUNT] = { - {gBlankGfxCompressed, 0x0100, 0xd704}, - {gBlankGfxCompressed, 0x0120, 0xd705}, - {gBlankGfxCompressed, 0x0100, 0xd706}, - {gBlankGfxCompressed, 0x0120, 0xd707} + {gBlankGfxCompressed, 0x0100, TAG_HEALTHBAR_PLAYER1_TILE}, + {gBlankGfxCompressed, 0x0120, TAG_HEALTHBAR_OPPONENT1_TILE}, + {gBlankGfxCompressed, 0x0100, TAG_HEALTHBAR_PLAYER2_TILE}, + {gBlankGfxCompressed, 0x0120, TAG_HEALTHBAR_OPPONENT2_TILE} }; -static const struct SpritePalette gUnknown_0832C128[2] = +static const struct SpritePalette sSpritePalettes_HealthBoxHealthBar[2] = { {gBattleInterface_BallStatusBarPal, TAG_HEALTHBOX_PAL}, - {gBattleInterface_BallDisplayPal, 0xd704} + {gBattleInterface_BallDisplayPal, TAG_HEALTHBAR_PAL} }; // code @@ -499,7 +499,7 @@ static void Task_ClearBitWhenSpecialAnimDone(u8 taskId) #undef tBattlerId -// great function to include newly added moves that don't have animation yet +// Great function to include newly added moves that don't have animation yet. bool8 IsMoveWithoutAnimation(u16 moveId, u8 animationTurn) { return FALSE; @@ -679,29 +679,30 @@ void FreeTrainerFrontPicPalette(u16 frontPicId) FreeSpritePaletteByTag(gTrainerFrontPicPaletteTable[frontPicId].tag); } -void sub_805DFFC(void) +// Unused. +void BattleLoadAllHealthBoxesGfxAtOnce(void) { u8 numberOfBattlers = 0; u8 i; - LoadSpritePalette(&gUnknown_0832C128[0]); - LoadSpritePalette(&gUnknown_0832C128[1]); + LoadSpritePalette(&sSpritePalettes_HealthBoxHealthBar[0]); + LoadSpritePalette(&sSpritePalettes_HealthBoxHealthBar[1]); if (!IsDoubleBattle()) { - LoadCompressedObjectPic(&gUnknown_0832C0D0); - LoadCompressedObjectPic(&gUnknown_0832C0D8); + LoadCompressedObjectPic(&sSpriteSheet_SinglesPlayerHealthbox); + LoadCompressedObjectPic(&sSpriteSheet_SinglesOpponentHealthbox); numberOfBattlers = 2; } else { - LoadCompressedObjectPic(&gUnknown_0832C0E0[0]); - LoadCompressedObjectPic(&gUnknown_0832C0E0[1]); - LoadCompressedObjectPic(&gUnknown_0832C0F0[0]); - LoadCompressedObjectPic(&gUnknown_0832C0F0[1]); + LoadCompressedObjectPic(&sSpriteSheets_DoublesPlayerHealthbox[0]); + LoadCompressedObjectPic(&sSpriteSheets_DoublesPlayerHealthbox[1]); + LoadCompressedObjectPic(&sSpriteSheets_DoublesOpponentHealthbox[0]); + LoadCompressedObjectPic(&sSpriteSheets_DoublesOpponentHealthbox[1]); numberOfBattlers = 4; } for (i = 0; i < numberOfBattlers; i++) - LoadCompressedObjectPic(&gUnknown_0832C108[gBattlerPositions[i]]); + LoadCompressedObjectPic(&sSpriteSheets_HealthBar[gBattlerPositions[i]]); } bool8 BattleLoadAllHealthBoxesGfx(u8 state) @@ -712,45 +713,45 @@ bool8 BattleLoadAllHealthBoxesGfx(u8 state) { if (state == 1) { - LoadSpritePalette(&gUnknown_0832C128[0]); - LoadSpritePalette(&gUnknown_0832C128[1]); + LoadSpritePalette(&sSpritePalettes_HealthBoxHealthBar[0]); + LoadSpritePalette(&sSpritePalettes_HealthBoxHealthBar[1]); } else if (!IsDoubleBattle()) { if (state == 2) { if (gBattleTypeFlags & BATTLE_TYPE_SAFARI) - LoadCompressedObjectPic(&gUnknown_0832C100); + LoadCompressedObjectPic(&sSpriteSheet_SafariHealthbox); else - LoadCompressedObjectPic(&gUnknown_0832C0D0); + LoadCompressedObjectPic(&sSpriteSheet_SinglesPlayerHealthbox); } else if (state == 3) - LoadCompressedObjectPic(&gUnknown_0832C0D8); + LoadCompressedObjectPic(&sSpriteSheet_SinglesOpponentHealthbox); else if (state == 4) - LoadCompressedObjectPic(&gUnknown_0832C108[gBattlerPositions[0]]); + LoadCompressedObjectPic(&sSpriteSheets_HealthBar[gBattlerPositions[0]]); else if (state == 5) - LoadCompressedObjectPic(&gUnknown_0832C108[gBattlerPositions[1]]); + LoadCompressedObjectPic(&sSpriteSheets_HealthBar[gBattlerPositions[1]]); else retVal = TRUE; } else { if (state == 2) - LoadCompressedObjectPic(&gUnknown_0832C0E0[0]); + LoadCompressedObjectPic(&sSpriteSheets_DoublesPlayerHealthbox[0]); else if (state == 3) - LoadCompressedObjectPic(&gUnknown_0832C0E0[1]); + LoadCompressedObjectPic(&sSpriteSheets_DoublesPlayerHealthbox[1]); else if (state == 4) - LoadCompressedObjectPic(&gUnknown_0832C0F0[0]); + LoadCompressedObjectPic(&sSpriteSheets_DoublesOpponentHealthbox[0]); else if (state == 5) - LoadCompressedObjectPic(&gUnknown_0832C0F0[1]); + LoadCompressedObjectPic(&sSpriteSheets_DoublesOpponentHealthbox[1]); else if (state == 6) - LoadCompressedObjectPic(&gUnknown_0832C108[gBattlerPositions[0]]); + LoadCompressedObjectPic(&sSpriteSheets_HealthBar[gBattlerPositions[0]]); else if (state == 7) - LoadCompressedObjectPic(&gUnknown_0832C108[gBattlerPositions[1]]); + LoadCompressedObjectPic(&sSpriteSheets_HealthBar[gBattlerPositions[1]]); else if (state == 8) - LoadCompressedObjectPic(&gUnknown_0832C108[gBattlerPositions[2]]); + LoadCompressedObjectPic(&sSpriteSheets_HealthBar[gBattlerPositions[2]]); else if (state == 9) - LoadCompressedObjectPic(&gUnknown_0832C108[gBattlerPositions[3]]); + LoadCompressedObjectPic(&sSpriteSheets_HealthBar[gBattlerPositions[3]]); else retVal = TRUE; } diff --git a/src/battle_interface.c b/src/battle_interface.c index 6a30ed487b..a6032adc3d 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -1350,7 +1350,7 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8 } } -// Prints mon's nature and flee rate. Probably used to test pokeblock feeders. +// Prints mon's nature, catch and flee rate. Probably used to test pokeblock-related features. static void PrintSafariMonInfo(u8 healthboxSpriteId, struct Pokemon *mon) { u8 text[20]; @@ -1391,8 +1391,8 @@ static void PrintSafariMonInfo(u8 healthboxSpriteId, struct Pokemon *mon) } healthBarSpriteId = gSprites[healthboxSpriteId].hMain_HealthBarSpriteId; - ConvertIntToDecimalStringN(text + 6, gBattleStruct->field_7C, STR_CONV_MODE_RIGHT_ALIGN, 2); - ConvertIntToDecimalStringN(text + 9, gBattleStruct->field_7B, STR_CONV_MODE_RIGHT_ALIGN, 2); + ConvertIntToDecimalStringN(text + 6, gBattleStruct->safariCatchFactor, STR_CONV_MODE_RIGHT_ALIGN, 2); + ConvertIntToDecimalStringN(text + 9, gBattleStruct->safariEscapeFactor, STR_CONV_MODE_RIGHT_ALIGN, 2); text[5] = CHAR_SPACE; text[8] = CHAR_SLASH; RenderTextFont9(gMonSpritesGfxPtr->barFontGfx, 9, text); diff --git a/src/battle_main.c b/src/battle_main.c index dfe99e003b..34558ab38e 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -85,7 +85,6 @@ extern u8 gUnknown_0203CF00[]; extern const u16 gBattleTextboxPalette[]; extern const struct BgTemplate gBattleBgTemplates[]; extern const struct WindowTemplate *const gBattleWindowTemplates[]; -extern const u8 gUnknown_0831ACE0[]; extern const u8 *const gBattleScriptsForMoveEffects[]; extern const u8 *const gBattlescriptsForBallThrow[]; extern const u8 *const gBattlescriptsForRunningByItem[]; @@ -308,6 +307,9 @@ u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT]; // 10 is ×1.0 TYPE_MUL_NORMAL // 05 is ×0.5 TYPE_MUL_NOT_EFFECTIVE // 00 is ×0.0 TYPE_MUL_NO_EFFECT + +static const s8 gUnknown_0831ACE0[] ={-32, -16, -16, -32, -32, 0, 0, 0}; + const u8 gTypeEffectiveness[336] = { TYPE_NORMAL, TYPE_ROCK, TYPE_MUL_NOT_EFFECTIVE, @@ -561,9 +563,9 @@ const u8 * const gStatusConditionStringsTable[7][2] = {gStatusConditionString_LoveJpn, gText_Love} }; -static const u8 sUnknown_0831BCE0[][3] = {{0, 0, 0}, {3, 5, 0}, {2, 3, 0}, {1, 2, 0}, {1, 1, 0}}; -static const u8 sUnknown_0831BCEF[] = {4, 3, 2, 1}; -static const u8 sUnknown_0831BCF3[] = {4, 4, 4, 4}; +static const u8 sPkblToEscapeFactor[][3] = {{0, 0, 0}, {3, 5, 0}, {2, 3, 0}, {1, 2, 0}, {1, 1, 0}}; +static const u8 sGoNearCounterToCatchFactor[] = {4, 3, 2, 1}; +static const u8 sGoNearCounterToEscapeFactor[] = {4, 4, 4, 4}; // code void CB2_InitBattle(void) @@ -1805,7 +1807,7 @@ static void CB2_HandleStartMultiBattle(void) SetMainCallback2(BattleMainCB2); if (gBattleTypeFlags & BATTLE_TYPE_LINK) { - gTrainerBattleOpponent_A = TRAINER_OPPONENT_800; + gTrainerBattleOpponent_A = TRAINER_LINK_OPPONENT; gBattleTypeFlags |= BATTLE_TYPE_20; } } @@ -3051,10 +3053,10 @@ static void BattleStartClearSetData(void) gLeveledUpInBattle = 0; gAbsentBattlerFlags = 0; gBattleStruct->runTries = 0; - gBattleStruct->field_79 = 0; - gBattleStruct->field_7A = 0; - *(&gBattleStruct->field_7C) = gBaseStats[GetMonData(&gEnemyParty[0], MON_DATA_SPECIES)].catchRate * 100 / 1275; - gBattleStruct->field_7B = 3; + gBattleStruct->safariGoNearCounter = 0; + gBattleStruct->safariPkblThrowCounter = 0; + *(&gBattleStruct->safariCatchFactor) = gBaseStats[GetMonData(&gEnemyParty[0], MON_DATA_SPECIES)].catchRate * 100 / 1275; + gBattleStruct->safariEscapeFactor = 3; gBattleStruct->wildVictorySong = 0; gBattleStruct->moneyMultiplier = 1; @@ -5746,14 +5748,14 @@ static void HandleAction_ThrowPokeblock(void) if (gBattleResults.pokeblockThrows < 0xFF) gBattleResults.pokeblockThrows++; - if (gBattleStruct->field_7A < 3) - gBattleStruct->field_7A++; - if (gBattleStruct->field_7B > 1) + if (gBattleStruct->safariPkblThrowCounter < 3) + gBattleStruct->safariPkblThrowCounter++; + if (gBattleStruct->safariEscapeFactor > 1) { - if (gBattleStruct->field_7B < sUnknown_0831BCE0[gBattleStruct->field_7A][gBattleCommunication[MULTISTRING_CHOOSER]]) - gBattleStruct->field_7B = 1; + if (gBattleStruct->safariEscapeFactor < sPkblToEscapeFactor[gBattleStruct->safariPkblThrowCounter][gBattleCommunication[MULTISTRING_CHOOSER]]) + gBattleStruct->safariEscapeFactor = 1; else - gBattleStruct->field_7B -= sUnknown_0831BCE0[gBattleStruct->field_7A][gBattleCommunication[MULTISTRING_CHOOSER]]; + gBattleStruct->safariEscapeFactor -= sPkblToEscapeFactor[gBattleStruct->safariPkblThrowCounter][gBattleCommunication[MULTISTRING_CHOOSER]]; } gBattlescriptCurrInstr = gBattlescriptsForSafariActions[2]; @@ -5766,22 +5768,22 @@ static void HandleAction_GoNear(void) gBattle_BG0_X = 0; gBattle_BG0_Y = 0; - gBattleStruct->field_7C += sUnknown_0831BCEF[gBattleStruct->field_79]; - if (gBattleStruct->field_7C > 20) - gBattleStruct->field_7C = 20; + gBattleStruct->safariCatchFactor += sGoNearCounterToCatchFactor[gBattleStruct->safariGoNearCounter]; + if (gBattleStruct->safariCatchFactor > 20) + gBattleStruct->safariCatchFactor = 20; - gBattleStruct->field_7B +=sUnknown_0831BCF3[gBattleStruct->field_79]; - if (gBattleStruct->field_7B > 20) - gBattleStruct->field_7B = 20; + gBattleStruct->safariEscapeFactor += sGoNearCounterToEscapeFactor[gBattleStruct->safariGoNearCounter]; + if (gBattleStruct->safariEscapeFactor > 20) + gBattleStruct->safariEscapeFactor = 20; - if (gBattleStruct->field_79 < 3) + if (gBattleStruct->safariGoNearCounter < 3) { - gBattleStruct->field_79++; + gBattleStruct->safariGoNearCounter++; gBattleCommunication[MULTISTRING_CHOOSER] = 0; } else { - gBattleCommunication[MULTISTRING_CHOOSER] = 1; + gBattleCommunication[MULTISTRING_CHOOSER] = 1; // Can't get closer. } gBattlescriptCurrInstr = gBattlescriptsForSafariActions[1]; gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT; diff --git a/src/battle_message.c b/src/battle_message.c index d2ac6da8c9..7d442ea98f 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -6,6 +6,7 @@ #include "text.h" #include "string_util.h" #include "constants/items.h" +#include "constants/trainers.h" #include "event_data.h" #include "link.h" #include "item.h" @@ -2074,7 +2075,7 @@ void BufferStringBattle(u16 stringID) } else { - if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_800 || gBattleTypeFlags & BATTLE_TYPE_x2000000) + if (gTrainerBattleOpponent_A == TRAINER_LINK_OPPONENT || gBattleTypeFlags & BATTLE_TYPE_x2000000) { if (gBattleTypeFlags & BATTLE_TYPE_MULTI) stringPtr = sText_LinkTrainer2WithdrewPkmn; diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 9c48b083cc..bacaf2bace 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -3111,7 +3111,7 @@ static void atk1E_jumpifability(void) if (gBattlescriptCurrInstr[1] == BS_ATTACKER_SIDE) { - battlerId = AbilityBattleEffects(ABILITYEFFECT_CHECK_BANK_SIDE, gBattlerAttacker, ability, 0, 0); + battlerId = AbilityBattleEffects(ABILITYEFFECT_CHECK_BATTLER_SIDE, gBattlerAttacker, ability, 0, 0); if (battlerId) { gLastUsedAbility = ability; @@ -5033,7 +5033,7 @@ static void atk4F_jumpifcantswitch(void) party = gPlayerParty; i = 0; - if (sub_806D82C(GetBattlerMultiplayerId(gActiveBattler)) == TRUE) + if (GetLinkTrainerFlankId(GetBattlerMultiplayerId(gActiveBattler)) == TRUE) i = 3; } else @@ -5054,7 +5054,7 @@ static void atk4F_jumpifcantswitch(void) party = gPlayerParty; i = 0; - if (sub_806D82C(GetBattlerMultiplayerId(gActiveBattler)) == TRUE) + if (GetLinkTrainerFlankId(GetBattlerMultiplayerId(gActiveBattler)) == TRUE) i = 3; } @@ -5166,7 +5166,7 @@ static void atk50_openpartyscreen(void) { if (gHitMarker & HITMARKER_FAINTED(gActiveBattler)) { - if (sub_80423F4(gActiveBattler, 6, 6)) + if (HasNoMonsToSwitch(gActiveBattler, 6, 6)) { gAbsentBattlerFlags |= gBitTable[gActiveBattler]; gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler)); @@ -5195,7 +5195,7 @@ static void atk50_openpartyscreen(void) if (gBitTable[0] & hitmarkerFaintBits) { gActiveBattler = 0; - if (sub_80423F4(0, 6, 6)) + if (HasNoMonsToSwitch(0, 6, 6)) { gAbsentBattlerFlags |= gBitTable[gActiveBattler]; gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler)); @@ -5217,7 +5217,7 @@ static void atk50_openpartyscreen(void) if (gBitTable[2] & hitmarkerFaintBits && !(gBitTable[0] & hitmarkerFaintBits)) { gActiveBattler = 2; - if (sub_80423F4(2, 6, 6)) + if (HasNoMonsToSwitch(2, 6, 6)) { gAbsentBattlerFlags |= gBitTable[gActiveBattler]; gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler)); @@ -5238,7 +5238,7 @@ static void atk50_openpartyscreen(void) if (gBitTable[1] & hitmarkerFaintBits) { gActiveBattler = 1; - if (sub_80423F4(1, 6, 6)) + if (HasNoMonsToSwitch(1, 6, 6)) { gAbsentBattlerFlags |= gBitTable[gActiveBattler]; gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler)); @@ -5260,7 +5260,7 @@ static void atk50_openpartyscreen(void) if (gBitTable[3] & hitmarkerFaintBits && !(gBitTable[1] & hitmarkerFaintBits)) { gActiveBattler = 3; - if (sub_80423F4(3, 6, 6)) + if (HasNoMonsToSwitch(3, 6, 6)) { gAbsentBattlerFlags |= gBitTable[gActiveBattler]; gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler)); @@ -5323,7 +5323,7 @@ static void atk50_openpartyscreen(void) if (gBitTable[2] & hitmarkerFaintBits && gBitTable[0] & hitmarkerFaintBits) { gActiveBattler = 2; - if (sub_80423F4(2, gBattleBufferB[0][1], 6)) + if (HasNoMonsToSwitch(2, gBattleBufferB[0][1], 6)) { gAbsentBattlerFlags |= gBitTable[gActiveBattler]; gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler)); @@ -5339,7 +5339,7 @@ static void atk50_openpartyscreen(void) if (gBitTable[3] & hitmarkerFaintBits && hitmarkerFaintBits & gBitTable[1]) { gActiveBattler = 3; - if (sub_80423F4(3, gBattleBufferB[1][1], 6)) + if (HasNoMonsToSwitch(3, gBattleBufferB[1][1], 6)) { gAbsentBattlerFlags |= gBitTable[gActiveBattler]; gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler)); @@ -5391,7 +5391,7 @@ static void atk50_openpartyscreen(void) { gBattlescriptCurrInstr += 6; } - else if (sub_80423F4(battlerId, 6, 6)) + else if (HasNoMonsToSwitch(battlerId, 6, 6)) { gActiveBattler = battlerId; gAbsentBattlerFlags |= gBitTable[gActiveBattler]; @@ -7506,7 +7506,7 @@ static void atk8F_forcerandomswitch(void) else if ((gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK) || (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_x2000000)) { - if (sub_806D82C(GetBattlerMultiplayerId(gBattlerTarget)) == 1) + if (GetLinkTrainerFlankId(GetBattlerMultiplayerId(gBattlerTarget)) == 1) { firstMonId = 3; lastMonId = 6; @@ -9044,7 +9044,7 @@ static void atkBE_rapidspinfree(void) else if (gStatuses3[gBattlerAttacker] & STATUS3_LEECHSEED) { gStatuses3[gBattlerAttacker] &= ~(STATUS3_LEECHSEED); - gStatuses3[gBattlerAttacker] &= ~(STATUS3_LEECHSEED_BANK); + gStatuses3[gBattlerAttacker] &= ~(STATUS3_LEECHSEED_BATTLER); BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_LeechSeedFree; } @@ -9760,7 +9760,7 @@ static void atkE1_trygetintimidatetarget(void) { u8 side; - gBattleScripting.battler = gBattleStruct->intimidateBank; + gBattleScripting.battler = gBattleStruct->intimidateBattler; side = GetBattlerSide(gBattleScripting.battler); PREPARE_ABILITY_BUFFER(gBattleTextBuff1, gBattleMons[gBattleScripting.battler].ability) @@ -10115,7 +10115,7 @@ static void atkEF_handleballthrow(void) u8 catchRate; if (gLastUsedItem == ITEM_SAFARI_BALL) - catchRate = gBattleStruct->field_7C * 1275 / 100; + catchRate = gBattleStruct->safariCatchFactor * 1275 / 100; else catchRate = gBaseStats[gBattleMons[gBattlerTarget].species].catchRate; diff --git a/src/battle_tv.c b/src/battle_tv.c index cd0490a1b4..6f9ee414e6 100644 --- a/src/battle_tv.c +++ b/src/battle_tv.c @@ -796,8 +796,8 @@ void TryPutLinkBattleTvShowOnAir(void) if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { - if ((playerBestMonId < 3 && !sub_806D82C(gBattleScripting.multiplayerId)) - || (playerBestMonId >= 3 && sub_806D82C(gBattleScripting.multiplayerId))) + if ((playerBestMonId < 3 && !GetLinkTrainerFlankId(gBattleScripting.multiplayerId)) + || (playerBestMonId >= 3 && GetLinkTrainerFlankId(gBattleScripting.multiplayerId))) { j = (opponentBestMonId < 3) ? 0 : 1; PutBattleUpdateOnTheAir(sub_806EF84(j, gBattleScripting.multiplayerId), moveId, playerBestSpecies, opponentBestSpecies); @@ -1078,7 +1078,7 @@ _0817E5C8:\n\ ldr r0, =gBattleScripting\n\ adds r0, 0x25\n\ ldrb r0, [r0]\n\ - bl sub_806D82C\n\ + bl GetLinkTrainerFlankId\n\ lsls r0, 16\n\ cmp r0, 0\n\ beq _0817E630\n\ @@ -1088,7 +1088,7 @@ _0817E620:\n\ ldr r0, =gBattleScripting\n\ adds r0, 0x25\n\ ldrb r0, [r0]\n\ - bl sub_806D82C\n\ + bl GetLinkTrainerFlankId\n\ lsls r0, 16\n\ cmp r0, 0\n\ beq _0817E670\n\ diff --git a/src/battle_util.c b/src/battle_util.c index b9a7f546ac..5d2ec62a9a 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -46,7 +46,7 @@ u8 GetBattlerForBattleScript(u8 caseId) case BS_EFFECT_BATTLER: ret = gEffectBattler; break; - case BS_BANK_0: + case BS_BATTLER_0: ret = 0; break; case BS_SCRIPTING: @@ -292,7 +292,7 @@ void sub_803FA70(u8 battler) } } -void BattleScriptPush(const u8* bsPtr) +void BattleScriptPush(const u8 *bsPtr) { gBattleResources->battleScriptsStack->ptr[gBattleResources->battleScriptsStack->size++] = bsPtr; } @@ -453,7 +453,7 @@ bool8 AreAllMovesUnusable(void) u8 unusable; unusable = CheckMoveLimitations(gActiveBattler, 0, 0xFF); - if (unusable == 0xF) // all moves are unusable + if (unusable == 0xF) // All moves are unusable. { gProtectStructs[gActiveBattler].onlyStruggle = 1; gSelectionBattleScripts[gActiveBattler] = BattleScript_NoMovesLeft; @@ -470,11 +470,11 @@ u8 GetImprisonedMovesCount(u8 battlerId, u16 move) { s32 i; u8 imprisionedMoves = 0; - u8 bankSide = GetBattlerSide(battlerId); + u8 BattlerSide = GetBattlerSide(battlerId); for (i = 0; i < gBattlersCount; i++) { - if (bankSide != GetBattlerSide(i) && gStatuses3[i] & STATUS3_IMPRISONED_OTHERS) + if (BattlerSide != GetBattlerSide(i) && gStatuses3[i] & STATUS3_IMPRISONED_OTHERS) { s32 j; for (j = 0; j < 4; j++) @@ -504,7 +504,7 @@ u8 UpdateTurnCounters(void) do { - u8 sideBank; + u8 side; switch (gBattleStruct->turnCountersTracker) { @@ -533,13 +533,13 @@ u8 UpdateTurnCounters(void) case 1: while (gBattleStruct->turnSideTracker < 2) { - sideBank = gBattleStruct->turnSideTracker; - gActiveBattler = gBattlerAttacker = gSideTimers[sideBank].reflectBattlerId; - if (gSideStatuses[sideBank] & SIDE_STATUS_REFLECT) + side = gBattleStruct->turnSideTracker; + gActiveBattler = gBattlerAttacker = gSideTimers[side].reflectBattlerId; + if (gSideStatuses[side] & SIDE_STATUS_REFLECT) { - if (--gSideTimers[sideBank].reflectTimer == 0) + if (--gSideTimers[side].reflectTimer == 0) { - gSideStatuses[sideBank] &= ~SIDE_STATUS_REFLECT; + gSideStatuses[side] &= ~SIDE_STATUS_REFLECT; BattleScriptExecute(BattleScript_SideStatusWoreOff); PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_REFLECT); effect++; @@ -558,15 +558,15 @@ u8 UpdateTurnCounters(void) case 2: while (gBattleStruct->turnSideTracker < 2) { - sideBank = gBattleStruct->turnSideTracker; - gActiveBattler = gBattlerAttacker = gSideTimers[sideBank].lightscreenBattlerId; - if (gSideStatuses[sideBank] & SIDE_STATUS_LIGHTSCREEN) + side = gBattleStruct->turnSideTracker; + gActiveBattler = gBattlerAttacker = gSideTimers[side].lightscreenBattlerId; + if (gSideStatuses[side] & SIDE_STATUS_LIGHTSCREEN) { - if (--gSideTimers[sideBank].lightscreenTimer == 0) + if (--gSideTimers[side].lightscreenTimer == 0) { - gSideStatuses[sideBank] &= ~SIDE_STATUS_LIGHTSCREEN; + gSideStatuses[side] &= ~SIDE_STATUS_LIGHTSCREEN; BattleScriptExecute(BattleScript_SideStatusWoreOff); - gBattleCommunication[MULTISTRING_CHOOSER] = sideBank; + gBattleCommunication[MULTISTRING_CHOOSER] = side; PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_LIGHT_SCREEN); effect++; } @@ -584,14 +584,14 @@ u8 UpdateTurnCounters(void) case 3: while (gBattleStruct->turnSideTracker < 2) { - sideBank = gBattleStruct->turnSideTracker; - gActiveBattler = gBattlerAttacker = gSideTimers[sideBank].mistBattlerId; - if (gSideTimers[sideBank].mistTimer != 0 - && --gSideTimers[sideBank].mistTimer == 0) + side = gBattleStruct->turnSideTracker; + gActiveBattler = gBattlerAttacker = gSideTimers[side].mistBattlerId; + if (gSideTimers[side].mistTimer != 0 + && --gSideTimers[side].mistTimer == 0) { - gSideStatuses[sideBank] &= ~SIDE_STATUS_MIST; + gSideStatuses[side] &= ~SIDE_STATUS_MIST; BattleScriptExecute(BattleScript_SideStatusWoreOff); - gBattleCommunication[MULTISTRING_CHOOSER] = sideBank; + gBattleCommunication[MULTISTRING_CHOOSER] = side; PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_MIST); effect++; } @@ -608,13 +608,13 @@ u8 UpdateTurnCounters(void) case 4: while (gBattleStruct->turnSideTracker < 2) { - sideBank = gBattleStruct->turnSideTracker; - gActiveBattler = gBattlerAttacker = gSideTimers[sideBank].safeguardBattlerId; - if (gSideStatuses[sideBank] & SIDE_STATUS_SAFEGUARD) + side = gBattleStruct->turnSideTracker; + gActiveBattler = gBattlerAttacker = gSideTimers[side].safeguardBattlerId; + if (gSideStatuses[side] & SIDE_STATUS_SAFEGUARD) { - if (--gSideTimers[sideBank].safeguardTimer == 0) + if (--gSideTimers[side].safeguardTimer == 0) { - gSideStatuses[sideBank] &= ~SIDE_STATUS_SAFEGUARD; + gSideStatuses[side] &= ~SIDE_STATUS_SAFEGUARD; BattleScriptExecute(BattleScript_SafeguardEnds); effect++; } @@ -795,10 +795,10 @@ u8 TurnBasedEffects(void) break; case 3: // leech seed if ((gStatuses3[gActiveBattler] & STATUS3_LEECHSEED) - && gBattleMons[gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BANK].hp != 0 + && gBattleMons[gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BATTLER].hp != 0 && gBattleMons[gActiveBattler].hp != 0) { - gBattlerTarget = gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BANK; //funny how the 'target' is actually the battlerId that receives HP + gBattlerTarget = gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BATTLER; // Notice gBattlerTarget is actually the HP receiver. gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 8; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; @@ -848,8 +848,8 @@ u8 TurnBasedEffects(void) case 7: // spooky nightmares if ((gBattleMons[gActiveBattler].status2 & STATUS2_NIGHTMARE) && gBattleMons[gActiveBattler].hp != 0) { - // R/S does not perform this sleep check, which causes the nighmare effect to - // persist even after the affected Pokemon has been awakened by Shed Skin + // R/S does not perform this sleep check, which causes the nightmare effect to + // persist even after the affected Pokemon has been awakened by Shed Skin. if (gBattleMons[gActiveBattler].status1 & STATUS1_SLEEP) { gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 4; @@ -983,7 +983,7 @@ u8 TurnBasedEffects(void) case 12: // disable if (gDisableStructs[gActiveBattler].disableTimer1 != 0) { - int i; + s32 i; for (i = 0; i < 4; i++) { if (gDisableStructs[gActiveBattler].disabledMove == gBattleMons[gActiveBattler].moves[i]) @@ -1184,7 +1184,7 @@ bool8 HandleFaintedMonActions(void) return FALSE; do { - int i; + s32 i; switch (gBattleStruct->faintedActionsState) { case 0: @@ -1192,7 +1192,7 @@ bool8 HandleFaintedMonActions(void) gBattleStruct->faintedActionsState++; for (i = 0; i < gBattlersCount; i++) { - if (gAbsentBattlerFlags & gBitTable[i] && !sub_80423F4(i, 6, 6)) + if (gAbsentBattlerFlags & gBitTable[i] && !HasNoMonsToSwitch(i, 6, 6)) gAbsentBattlerFlags &= ~(gBitTable[i]); } // fall through @@ -1256,7 +1256,7 @@ bool8 HandleFaintedMonActions(void) void TryClearRageStatuses(void) { - int i; + s32 i; for (i = 0; i < gBattlersCount; i++) { if ((gBattleMons[i].status2 & STATUS2_RAGE) && gChosenMoveByBattler[i] != MOVE_RAGE) @@ -1467,7 +1467,9 @@ u8 AtkCanceller_UnableToUseMove(void) { gBattleScripting.battler = CountTrailingZeroBits((gBattleMons[gBattlerAttacker].status2 & STATUS2_INFATUATION) >> 0x10); if (Random() & 1) + { BattleScriptPushCursor(); + } else { BattleScriptPush(BattleScript_MoveUsedIsParalyzedCantAttack); @@ -1485,7 +1487,9 @@ u8 AtkCanceller_UnableToUseMove(void) { gBattleMons[gBattlerAttacker].status2 -= 0x100; if (gBattleMons[gBattlerAttacker].status2 & STATUS2_BIDE) + { gBattlescriptCurrInstr = BattleScript_BideStoringEnergy; + } else { // This is removed in Emerald for some reason @@ -1500,7 +1504,9 @@ u8 AtkCanceller_UnableToUseMove(void) gBattlescriptCurrInstr = BattleScript_BideAttack; } else + { gBattlescriptCurrInstr = BattleScript_BideNoEnergyToAttack; + } } effect = 1; } @@ -1535,29 +1541,31 @@ u8 AtkCanceller_UnableToUseMove(void) return effect; } -bool8 sub_80423F4(u8 battler, u8 r1, u8 r2) +bool8 HasNoMonsToSwitch(u8 battler, u8 partyIdBattlerOn1, u8 partyIdBattlerOn2) { - struct Pokemon* party; - u8 r7; - u8 r6; + struct Pokemon *party; + u8 id1, id2; s32 i; + if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) return FALSE; + if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) { if (GetBattlerSide(battler) == B_SIDE_PLAYER) party = gPlayerParty; else party = gEnemyParty; - r6 = ((battler & 2) / 2); - for (i = r6 * 3; i < r6 * 3 + 3; i++) + + id1 = ((battler & BIT_FLANK) / 2); + for (i = id1 * 3; i < id1 * 3 + 3; i++) { if (GetMonData(&party[i], MON_DATA_HP) != 0 - && GetMonData(&party[i], MON_DATA_SPECIES2) != 0 + && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_NONE && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG) break; } - return (i == r6 * 3 + 3); + return (i == id1 * 3 + 3); } else if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { @@ -1566,86 +1574,95 @@ bool8 sub_80423F4(u8 battler, u8 r1, u8 r2) if (GetBattlerSide(battler) == B_SIDE_PLAYER) { party = gPlayerParty; - r7 = GetBattlerMultiplayerId(battler); - r6 = sub_806D82C(r7); + id2 = GetBattlerMultiplayerId(battler); + id1 = GetLinkTrainerFlankId(id2); } else { - // FIXME: Compiler insists on moving r4 into r1 before doing the eor + // FIXME: Compiler insists on moving r4 into r1 before doing the eor. #ifndef NONMATCHING - register u32 var asm("r1"); + register u32 var asm("r1"); #else - u32 var; + u32 var; #endif // NONMATCHING party = gEnemyParty; - var = battler ^ 1; - r6 = (var != 0) ? 1 : 0; + var = battler ^ BIT_SIDE; + if (var == 0) + id1 = 0; + else + id1 = 1; } } else { - r7 = GetBattlerMultiplayerId(battler); + id2 = GetBattlerMultiplayerId(battler); + if (GetBattlerSide(battler) == B_SIDE_PLAYER) party = gPlayerParty; else party = gEnemyParty; - r6 = sub_806D82C(r7); + + id1 = GetLinkTrainerFlankId(id2); } - for (i = r6 * 3; i < r6 * 3 + 3; i++) + + for (i = id1 * 3; i < id1 * 3 + 3; i++) { if (GetMonData(&party[i], MON_DATA_HP) != 0 - && GetMonData(&party[i], MON_DATA_SPECIES2) != 0 + && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_NONE && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG) break; } - return (i == r6 * 3 + 3); + return (i == id1 * 3 + 3); } else if ((gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) && GetBattlerSide(battler) == B_SIDE_OPPONENT) { party = gEnemyParty; if (battler == 1) - r6 = 0; + id1 = 0; else - r6 = 3; - for (i = r6; i < r6 + 3; i++) + id1 = 3; + + for (i = id1; i < id1 + 3; i++) { if (GetMonData(&party[i], MON_DATA_HP) != 0 - && GetMonData(&party[i], MON_DATA_SPECIES2) != 0 + && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_NONE && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG) break; } - return (i == r6 + 3); + return (i == id1 + 3); } else { if (GetBattlerSide(battler) == B_SIDE_OPPONENT) { - r7 = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); - r6 = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT); + id2 = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); + id1 = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT); party = gEnemyParty; } else { - r7 = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); - r6 = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT); + id2 = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); + id1 = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT); party = gPlayerParty; } - if (r1 == 6) - r1 = gBattlerPartyIndexes[r7]; - if (r2 == 6) - r2 = gBattlerPartyIndexes[r6]; - for (i = 0; i < 6; i++) + + if (partyIdBattlerOn1 == PARTY_SIZE) + partyIdBattlerOn1 = gBattlerPartyIndexes[id2]; + if (partyIdBattlerOn2 == PARTY_SIZE) + partyIdBattlerOn2 = gBattlerPartyIndexes[id1]; + + for (i = 0; i < PARTY_SIZE; i++) { if (GetMonData(&party[i], MON_DATA_HP) != 0 - && GetMonData(&party[i], MON_DATA_SPECIES2) != 0 + && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_NONE && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG - // FIXME: Using index[array] instead of array[index] is BAD! - && i != r1 && i != r2 && i != r7[gBattleStruct->monToSwitchIntoId] && i != r6[gBattleStruct->monToSwitchIntoId]) + && i != partyIdBattlerOn1 && i != partyIdBattlerOn2 + && i != *(gBattleStruct->monToSwitchIntoId + id2) && i != id1[gBattleStruct->monToSwitchIntoId]) break; } - return (i == 6); + return (i == PARTY_SIZE); } } @@ -1706,6 +1723,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA if (gBattlerAttacker >= gBattlersCount) gBattlerAttacker = battler; + if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER) pokeAtk = &gPlayerParty[gBattlerPartyIndexes[gBattlerAttacker]]; else @@ -1713,6 +1731,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA if (gBattlerTarget >= gBattlersCount) gBattlerTarget = battler; + if (GetBattlerSide(gBattlerTarget) == B_SIDE_PLAYER) pokeDef = &gPlayerParty[gBattlerPartyIndexes[gBattlerTarget]]; else @@ -1724,7 +1743,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA speciesDef = GetMonData(pokeDef, MON_DATA_SPECIES); pidDef = GetMonData(pokeDef, MON_DATA_PERSONALITY); - if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI)) // why isn't that check done at the beginning? + if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI)) // Why isn't that check done at the beginning? { u8 moveType; s32 i; @@ -2271,7 +2290,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA gLastUsedAbility = ABILITY_INTIMIDATE; gStatuses3[i] &= ~(STATUS3_INTIMIDATE_POKES); BattleScriptPushCursorAndCallback(BattleScript_82DB4B8); - gBattleStruct->intimidateBank = i; + gBattleStruct->intimidateBattler = i; effect++; break; } @@ -2343,7 +2362,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA gStatuses3[i] &= ~(STATUS3_INTIMIDATE_POKES); BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_82DB4C1; - gBattleStruct->intimidateBank = i; + gBattleStruct->intimidateBattler = i; effect++; break; } @@ -2360,7 +2379,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA } } break; - case ABILITYEFFECT_CHECK_BANK_SIDE: // 13 + case ABILITYEFFECT_CHECK_BATTLER_SIDE: // 13 side = GetBattlerSide(battler); for (i = 0; i < gBattlersCount; i++) { @@ -2410,7 +2429,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA } } break; - case ABILITYEFFECT_CHECK_FIELD_EXCEPT_BANK: // 15 + case ABILITYEFFECT_CHECK_FIELD_EXCEPT_BATTLER: // 15 for (i = 0; i < gBattlersCount; i++) { if (gBattleMons[i].ability == ability && i != battler) @@ -2431,7 +2450,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA } } break; - case ABILITYEFFECT_COUNT_BANK_SIDE: // 17 + case ABILITYEFFECT_COUNT_BATTLER_SIDE: // 17 side = GetBattlerSide(battler); for (i = 0; i < gBattlersCount; i++) { @@ -2492,20 +2511,20 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) int i = 0; u8 effect = ITEM_NO_EFFECT; u8 changedPP = 0; - u8 bankHoldEffect, atkHoldEffect, defHoldEffect; - u8 bankQuality, atkQuality, defQuality; + u8 BattlerHoldEffect, atkHoldEffect, defHoldEffect; + u8 BattlerQuality, atkQuality, defQuality; u16 atkItem, defItem; gLastUsedItem = gBattleMons[battlerId].item; if (gLastUsedItem == ITEM_ENIGMA_BERRY) { - bankHoldEffect = gEnigmaBerries[battlerId].holdEffect; - bankQuality = gEnigmaBerries[battlerId].holdEffectParam; + BattlerHoldEffect = gEnigmaBerries[battlerId].holdEffect; + BattlerQuality = gEnigmaBerries[battlerId].holdEffectParam; } else { - bankHoldEffect = ItemId_GetHoldEffect(gLastUsedItem); - bankQuality = ItemId_GetHoldEffectParam(gLastUsedItem); + BattlerHoldEffect = ItemId_GetHoldEffect(gLastUsedItem); + BattlerQuality = ItemId_GetHoldEffectParam(gLastUsedItem); } atkItem = gBattleMons[gBattlerAttacker].item; @@ -2536,7 +2555,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) switch (caseID) { case ITEMEFFECT_ON_SWITCH_IN: - switch (bankHoldEffect) + switch (BattlerHoldEffect) { case HOLD_EFFECT_DOUBLE_PRIZE: if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) @@ -2564,13 +2583,13 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) case 1: if (gBattleMons[battlerId].hp) { - switch (bankHoldEffect) + switch (BattlerHoldEffect) { case HOLD_EFFECT_RESTORE_HP: if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / 2 && !moveTurn) { - gBattleMoveDamage = bankQuality; - if (gBattleMons[battlerId].hp + bankQuality > gBattleMons[battlerId].maxHP) + gBattleMoveDamage = BattlerQuality; + if (gBattleMons[battlerId].hp + BattlerQuality > gBattleMons[battlerId].maxHP) gBattleMoveDamage = gBattleMons[battlerId].maxHP - gBattleMons[battlerId].hp; gBattleMoveDamage *= -1; BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem); @@ -2599,10 +2618,10 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) if (i != 4) { u8 maxPP = CalculatePPWithBonus(move, ppBonuses, i); - if (changedPP + bankQuality > maxPP) + if (changedPP + BattlerQuality > maxPP) changedPP = maxPP; else - changedPP = changedPP + bankQuality; + changedPP = changedPP + BattlerQuality; PREPARE_MOVE_BUFFER(gBattleTextBuff1, move); @@ -2641,7 +2660,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) gBattleMoveDamage *= -1; BattleScriptExecute(BattleScript_ItemHealHP_End2); effect = ITEM_HP_CHANGE; - RecordItemEffectBattle(battlerId, bankHoldEffect); + RecordItemEffectBattle(battlerId, BattlerHoldEffect); } break; // nice copy/paste there gamefreak, making a function for confuse berries was too much eh? @@ -2650,7 +2669,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) { PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_SPICY); - gBattleMoveDamage = gBattleMons[battlerId].maxHP / bankQuality; + gBattleMoveDamage = gBattleMons[battlerId].maxHP / BattlerQuality; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; if (gBattleMons[battlerId].hp + gBattleMoveDamage > gBattleMons[battlerId].maxHP) @@ -2668,7 +2687,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) { PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_DRY); - gBattleMoveDamage = gBattleMons[battlerId].maxHP / bankQuality; + gBattleMoveDamage = gBattleMons[battlerId].maxHP / BattlerQuality; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; if (gBattleMons[battlerId].hp + gBattleMoveDamage > gBattleMons[battlerId].maxHP) @@ -2686,7 +2705,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) { PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_SWEET); - gBattleMoveDamage = gBattleMons[battlerId].maxHP / bankQuality; + gBattleMoveDamage = gBattleMons[battlerId].maxHP / BattlerQuality; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; if (gBattleMons[battlerId].hp + gBattleMoveDamage > gBattleMons[battlerId].maxHP) @@ -2704,7 +2723,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) { PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_BITTER); - gBattleMoveDamage = gBattleMons[battlerId].maxHP / bankQuality; + gBattleMoveDamage = gBattleMons[battlerId].maxHP / BattlerQuality; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; if (gBattleMons[battlerId].hp + gBattleMoveDamage > gBattleMons[battlerId].maxHP) @@ -2722,7 +2741,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) { PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_SOUR); - gBattleMoveDamage = gBattleMons[battlerId].maxHP / bankQuality; + gBattleMoveDamage = gBattleMons[battlerId].maxHP / BattlerQuality; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; if (gBattleMons[battlerId].hp + gBattleMoveDamage > gBattleMons[battlerId].maxHP) @@ -2737,7 +2756,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) break; // copy/paste again, smh case HOLD_EFFECT_ATTACK_UP: - if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_ATK] < 0xC) + if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_ATK] < 0xC) { PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_ATK); PREPARE_STRING_BUFFER(gBattleTextBuff2, STRINGID_STATROSE); @@ -2751,7 +2770,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) } break; case HOLD_EFFECT_DEFENSE_UP: - if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_DEF] < 0xC) + if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_DEF] < 0xC) { PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_DEF); @@ -2764,7 +2783,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) } break; case HOLD_EFFECT_SPEED_UP: - if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPEED] < 0xC) + if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPEED] < 0xC) { PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_SPEED); @@ -2777,7 +2796,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) } break; case HOLD_EFFECT_SP_ATTACK_UP: - if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPATK] < 0xC) + if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPATK] < 0xC) { PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_SPATK); @@ -2790,7 +2809,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) } break; case HOLD_EFFECT_SP_DEFENSE_UP: - if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPDEF] < 0xC) + if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPDEF] < 0xC) { PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_SPDEF); @@ -2803,7 +2822,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) } break; case HOLD_EFFECT_CRITICAL_UP: - if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && !(gBattleMons[battlerId].status2 & STATUS2_FOCUS_ENERGY)) + if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality && !moveTurn && !(gBattleMons[battlerId].status2 & STATUS2_FOCUS_ENERGY)) { gBattleMons[battlerId].status2 |= STATUS2_FOCUS_ENERGY; BattleScriptExecute(BattleScript_BerryFocusEnergyEnd2); @@ -2811,7 +2830,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) } break; case HOLD_EFFECT_RANDOM_STAT_UP: - if (!moveTurn && gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality) + if (!moveTurn && gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality) { for (i = 0; i < 5; i++) { @@ -2977,15 +2996,15 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) gLastUsedItem = gBattleMons[battlerId].item; if (gBattleMons[battlerId].item == ITEM_ENIGMA_BERRY) { - bankHoldEffect = gEnigmaBerries[battlerId].holdEffect; - bankQuality = gEnigmaBerries[battlerId].holdEffectParam; + BattlerHoldEffect = gEnigmaBerries[battlerId].holdEffect; + BattlerQuality = gEnigmaBerries[battlerId].holdEffectParam; } else { - bankHoldEffect = ItemId_GetHoldEffect(gLastUsedItem); - bankQuality = ItemId_GetHoldEffectParam(gLastUsedItem); + BattlerHoldEffect = ItemId_GetHoldEffect(gLastUsedItem); + BattlerQuality = ItemId_GetHoldEffectParam(gLastUsedItem); } - switch (bankHoldEffect) + switch (BattlerHoldEffect) { case HOLD_EFFECT_CURE_PAR: if (gBattleMons[battlerId].status1 & STATUS1_PARALYSIS) @@ -3180,7 +3199,7 @@ void HandleAction_RunBattleScript(void) // identical to RunBattleScriptCommands u8 GetMoveTarget(u16 move, u8 setTarget) { - u8 targetBank = 0; + u8 targetBattler = 0; u8 moveTarget; u8 side; @@ -3194,21 +3213,21 @@ u8 GetMoveTarget(u16 move, u8 setTarget) case MOVE_TARGET_SELECTED: side = GetBattlerSide(gBattlerAttacker) ^ BIT_SIDE; if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp) - targetBank = gSideTimers[side].followmeTarget; + targetBattler = gSideTimers[side].followmeTarget; else { side = GetBattlerSide(gBattlerAttacker); do { - targetBank = Random() % gBattlersCount; - } while (targetBank == gBattlerAttacker || side == GetBattlerSide(targetBank) || gAbsentBattlerFlags & gBitTable[targetBank]); + targetBattler = Random() % gBattlersCount; + } while (targetBattler == gBattlerAttacker || side == GetBattlerSide(targetBattler) || gAbsentBattlerFlags & gBitTable[targetBattler]); if (gBattleMoves[move].type == TYPE_ELECTRIC && AbilityBattleEffects(ABILITYEFFECT_COUNT_OTHER_SIDE, gBattlerAttacker, ABILITY_LIGHTNING_ROD, 0, 0) - && gBattleMons[targetBank].ability != ABILITY_LIGHTNING_ROD) + && gBattleMons[targetBattler].ability != ABILITY_LIGHTNING_ROD) { - targetBank ^= BIT_FLANK; - RecordAbilityBattle(targetBank, gBattleMons[targetBank].ability); - gSpecialStatuses[targetBank].lightningRodRedirected = 1; + targetBattler ^= BIT_FLANK; + RecordAbilityBattle(targetBattler, gBattleMons[targetBattler].ability); + gSpecialStatuses[targetBattler].lightningRodRedirected = 1; } } break; @@ -3216,45 +3235,45 @@ u8 GetMoveTarget(u16 move, u8 setTarget) case MOVE_TARGET_BOTH: case MOVE_TARGET_FOES_AND_ALLY: case MOVE_TARGET_OPPONENTS_FIELD: - targetBank = GetBattlerAtPosition((GetBattlerPosition(gBattlerAttacker) & BIT_SIDE) ^ BIT_SIDE); - if (gAbsentBattlerFlags & gBitTable[targetBank]) - targetBank ^= BIT_FLANK; + targetBattler = GetBattlerAtPosition((GetBattlerPosition(gBattlerAttacker) & BIT_SIDE) ^ BIT_SIDE); + if (gAbsentBattlerFlags & gBitTable[targetBattler]) + targetBattler ^= BIT_FLANK; break; case MOVE_TARGET_RANDOM: side = GetBattlerSide(gBattlerAttacker) ^ BIT_SIDE; if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp) - targetBank = gSideTimers[side].followmeTarget; + targetBattler = gSideTimers[side].followmeTarget; else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && moveTarget & MOVE_TARGET_RANDOM) { if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER) { if (Random() & 1) - targetBank = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); + targetBattler = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); else - targetBank = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT); + targetBattler = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT); } else { if (Random() & 1) - targetBank = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); + targetBattler = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); else - targetBank = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT); + targetBattler = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT); } - if (gAbsentBattlerFlags & gBitTable[targetBank]) - targetBank ^= BIT_FLANK; + if (gAbsentBattlerFlags & gBitTable[targetBattler]) + targetBattler ^= BIT_FLANK; } else - targetBank = GetBattlerAtPosition((GetBattlerPosition(gBattlerAttacker) & BIT_SIDE) ^ BIT_SIDE); + targetBattler = GetBattlerAtPosition((GetBattlerPosition(gBattlerAttacker) & BIT_SIDE) ^ BIT_SIDE); break; case MOVE_TARGET_USER_OR_SELECTED: case MOVE_TARGET_USER: - targetBank = gBattlerAttacker; + targetBattler = gBattlerAttacker; break; } - *(gBattleStruct->moveTarget + gBattlerAttacker) = targetBank; + *(gBattleStruct->moveTarget + gBattlerAttacker) = targetBattler; - return targetBank; + return targetBattler; } static bool32 HasObedientBitSet(u8 battlerId) diff --git a/src/pokemon.c b/src/pokemon.c index a4d62feca5..7d685062f1 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1964,11 +1964,11 @@ void CalculateMonStats(struct Pokemon *mon) SetMonData(mon, MON_DATA_MAX_HP, &newMaxHP); - CALC_STAT(baseAttack, attackIV, attackEV, 1, MON_DATA_ATK) - CALC_STAT(baseDefense, defenseIV, defenseEV, 2, MON_DATA_DEF) - CALC_STAT(baseSpeed, speedIV, speedEV, 3, MON_DATA_SPEED) - CALC_STAT(baseSpAttack, spAttackIV, spAttackEV, 4, MON_DATA_SPATK) - CALC_STAT(baseSpDefense, spDefenseIV, spDefenseEV, 5, MON_DATA_SPDEF) + CALC_STAT(baseAttack, attackIV, attackEV, STAT_ATK, MON_DATA_ATK) + CALC_STAT(baseDefense, defenseIV, defenseEV, STAT_DEF, MON_DATA_DEF) + CALC_STAT(baseSpeed, speedIV, speedEV, STAT_SPEED, MON_DATA_SPEED) + CALC_STAT(baseSpAttack, spAttackIV, spAttackEV, STAT_SPATK, MON_DATA_SPATK) + CALC_STAT(baseSpDefense, spDefenseIV, spDefenseEV, STAT_SPDEF, MON_DATA_SPDEF) if (species == SPECIES_SHEDINJA) { @@ -4819,21 +4819,21 @@ bool8 sub_806D7EC(void) return retVal; } -bool16 sub_806D82C(u8 id) +u16 GetLinkTrainerFlankId(u8 linkPlayerId) { - bool16 retVal = FALSE; - switch (gLinkPlayers[id].lp_field_18) + u16 flankId = 0; + switch (gLinkPlayers[linkPlayerId].lp_field_18) { case 0: case 3: - retVal = FALSE; + flankId = 0; break; case 1: case 2: - retVal = TRUE; + flankId = 1; break; } - return retVal; + return flankId; } s32 GetBattlerMultiplayerId(u16 a1) diff --git a/src/recorded_battle.c b/src/recorded_battle.c index 3a42658951..e36716febe 100644 --- a/src/recorded_battle.c +++ b/src/recorded_battle.c @@ -58,8 +58,8 @@ struct RecordedBattleSave u8 field_4FC; u8 field_4FD; u8 field_4FE; - u8 battleStyle : 1; - u8 textSpeed : 3; + u8 battleStyle:1; + u8 textSpeed:3; u32 AI_scripts; u8 field_504[8]; u8 field_50C; @@ -79,19 +79,19 @@ EWRAM_DATA static u16 sUnknown_0203C79C[4] = {0}; EWRAM_DATA static u16 sUnknown_0203C7A4[4] = {0}; EWRAM_DATA static u8 sUnknown_0203C7AC = 0; EWRAM_DATA static u8 sUnknown_0203C7AD = 0; -EWRAM_DATA static u8 sRecordedBattle_FrontierFacility = 0; +EWRAM_DATA static u8 sFrontierFacility = 0; EWRAM_DATA static u8 sUnknown_0203C7AF = 0; EWRAM_DATA static MainCallback sCallback2_AfterRecordedBattle = NULL; EWRAM_DATA u8 gUnknown_0203C7B4 = 0; EWRAM_DATA static u8 sUnknown_0203C7B5 = 0; -EWRAM_DATA static u8 sRecordedBattle_BattleStyle = 0; -EWRAM_DATA static u8 sRecordedBattle_TextSpeed = 0; -EWRAM_DATA static u32 sRecordedBattle_BattleFlags = 0; -EWRAM_DATA static u32 sRecordedBattle_AI_Scripts = 0; +EWRAM_DATA static u8 sBattleStyle = 0; +EWRAM_DATA static u8 sTextSpeed = 0; +EWRAM_DATA static u32 sBattleFlags = 0; +EWRAM_DATA static u32 sAI_Scripts = 0; EWRAM_DATA static struct Pokemon sSavedPlayerParty[PARTY_SIZE] = {0}; EWRAM_DATA static struct Pokemon sSavedOpponentParty[PARTY_SIZE] = {0}; -EWRAM_DATA static u16 sRecordedBattle_PlayerMonMoves[2][4] = {0}; -EWRAM_DATA static struct PlayerInfo sRecordedBattle_Players[MAX_BATTLERS_COUNT] = {0}; +EWRAM_DATA static u16 sPlayerMonMoves[2][4] = {0}; +EWRAM_DATA static struct PlayerInfo sPlayers[MAX_BATTLERS_COUNT] = {0}; EWRAM_DATA static u8 sUnknown_0203CCD0 = 0; EWRAM_DATA static u8 sUnknown_0203CCD1[8] = {0}; EWRAM_DATA static u8 sUnknown_0203CCD9 = 0; @@ -126,8 +126,8 @@ void sub_8184DA4(u8 arg0) { sBattleRecords[i][j] |= 0xFF; } - sRecordedBattle_BattleFlags = gBattleTypeFlags; - sRecordedBattle_AI_Scripts = gBattleResources->ai->aiFlags; + sBattleFlags = gBattleTypeFlags; + sAI_Scripts = gBattleResources->ai->aiFlags; } } } @@ -139,7 +139,7 @@ void sub_8184E58(void) if (sUnknown_0203C7AC == 1) { gRecordedBattleRngSeed = gRngValue; - sRecordedBattle_FrontierFacility = VarGet(VAR_FRONTIER_FACILITY); + sFrontierFacility = VarGet(VAR_FRONTIER_FACILITY); sUnknown_0203C7AF = sub_81A513C(); } else if (sUnknown_0203C7AC == 2) @@ -157,37 +157,37 @@ void sub_8184E58(void) for (i = 0; i < MAX_BATTLERS_COUNT; i++) { - sRecordedBattle_Players[i].trainerId = gLinkPlayers[i].trainerId; - sRecordedBattle_Players[i].gender = gLinkPlayers[i].gender; - sRecordedBattle_Players[i].battlerId = gLinkPlayers[i].lp_field_18; - sRecordedBattle_Players[i].language = gLinkPlayers[i].language; + sPlayers[i].trainerId = gLinkPlayers[i].trainerId; + sPlayers[i].gender = gLinkPlayers[i].gender; + sPlayers[i].battlerId = gLinkPlayers[i].lp_field_18; + sPlayers[i].language = gLinkPlayers[i].language; if (i < linkPlayersCount) { StringCopy(text, gLinkPlayers[i].name); StripExtCtrlCodes(text); - StringCopy(sRecordedBattle_Players[i].name, text); + StringCopy(sPlayers[i].name, text); } else { for (j = 0; j < PLAYER_NAME_LENGTH; j++) - sRecordedBattle_Players[i].name[j] = gLinkPlayers[i].name[j]; + sPlayers[i].name[j] = gLinkPlayers[i].name[j]; } } } else { - sRecordedBattle_Players[0].trainerId = (gSaveBlock2Ptr->playerTrainerId[0]) + sPlayers[0].trainerId = (gSaveBlock2Ptr->playerTrainerId[0]) | (gSaveBlock2Ptr->playerTrainerId[1] << 8) | (gSaveBlock2Ptr->playerTrainerId[2] << 16) | (gSaveBlock2Ptr->playerTrainerId[3] << 24); - sRecordedBattle_Players[0].gender = gSaveBlock2Ptr->playerGender; - sRecordedBattle_Players[0].battlerId = 0; - sRecordedBattle_Players[0].language = gGameLanguage; + sPlayers[0].gender = gSaveBlock2Ptr->playerGender; + sPlayers[0].battlerId = 0; + sPlayers[0].language = gGameLanguage; for (i = 0; i < PLAYER_NAME_LENGTH; i++) - sRecordedBattle_Players[0].name[i] = gSaveBlock2Ptr->playerName[i]; + sPlayers[0].name[i] = gSaveBlock2Ptr->playerName[i]; } } @@ -214,7 +214,7 @@ void RecordedBattle_ClearBattlerAction(u8 battlerId, u8 bytesToClear) u8 RecordedBattle_GetBattlerAction(u8 battlerId) { - // trying to read past array or invalid action byte, battle is over + // Trying to read past array or invalid action byte, battle is over. if (sRecordedBytesNo[battlerId] >= BATTLER_RECORD_SIZE || sBattleRecords[battlerId][sRecordedBytesNo[battlerId]] == 0xFF) { gSpecialVar_Result = gBattleOutcome = B_OUTCOME_PLAYER_TELEPORTED; // hah @@ -345,37 +345,37 @@ u32 MoveRecordedBattleToSaveData(void) { for (j = 0; j < PLAYER_NAME_LENGTH; j++) { - battleSave->playersName[i][j] = sRecordedBattle_Players[i].name[j]; + battleSave->playersName[i][j] = sPlayers[i].name[j]; } - battleSave->playersGender[i] = sRecordedBattle_Players[i].gender; - battleSave->playersLanguage[i] = sRecordedBattle_Players[i].language; - battleSave->playersBattlers[i] = sRecordedBattle_Players[i].battlerId; - battleSave->playersTrainerId[i] = sRecordedBattle_Players[i].trainerId; + battleSave->playersGender[i] = sPlayers[i].gender; + battleSave->playersLanguage[i] = sPlayers[i].language; + battleSave->playersBattlers[i] = sPlayers[i].battlerId; + battleSave->playersTrainerId[i] = sPlayers[i].trainerId; } battleSave->rngSeed = gRecordedBattleRngSeed; - if (sRecordedBattle_BattleFlags & BATTLE_TYPE_LINK) + if (sBattleFlags & BATTLE_TYPE_LINK) { - battleSave->battleFlags = (sRecordedBattle_BattleFlags & ~(BATTLE_TYPE_LINK | BATTLE_TYPE_20)); + battleSave->battleFlags = (sBattleFlags & ~(BATTLE_TYPE_LINK | BATTLE_TYPE_20)); battleSave->battleFlags |= BATTLE_TYPE_x2000000; - if (sRecordedBattle_BattleFlags & BATTLE_TYPE_WILD) + if (sBattleFlags & BATTLE_TYPE_WILD) { battleSave->battleFlags |= BATTLE_TYPE_x80000000; } - else if (sRecordedBattle_BattleFlags & BATTLE_TYPE_MULTI) + else if (sBattleFlags & BATTLE_TYPE_MULTI) { - switch (sRecordedBattle_Players[0].battlerId) + switch (sPlayers[0].battlerId) { case 0: case 2: - if (!(sRecordedBattle_Players[gUnknown_0203C7B4].battlerId & 1)) + if (!(sPlayers[gUnknown_0203C7B4].battlerId & 1)) battleSave->battleFlags |= BATTLE_TYPE_x80000000; break; case 1: case 3: - if ((sRecordedBattle_Players[gUnknown_0203C7B4].battlerId & 1)) + if ((sPlayers[gUnknown_0203C7B4].battlerId & 1)) battleSave->battleFlags |= BATTLE_TYPE_x80000000; break; } @@ -383,7 +383,7 @@ u32 MoveRecordedBattleToSaveData(void) } else { - battleSave->battleFlags = sRecordedBattle_BattleFlags; + battleSave->battleFlags = sBattleFlags; } battleSave->opponentA = gTrainerBattleOpponent_A; @@ -391,11 +391,11 @@ u32 MoveRecordedBattleToSaveData(void) battleSave->partnerId = gPartnerTrainerId; battleSave->field_4FA = gUnknown_0203C7B4; battleSave->field_4FC = gSaveBlock2Ptr->field_CA9_b; - battleSave->field_4FD = sRecordedBattle_FrontierFacility; + battleSave->field_4FD = sFrontierFacility; battleSave->field_4FE = sUnknown_0203C7AF; battleSave->battleStyle = gSaveBlock2Ptr->optionsBattleStyle; battleSave->textSpeed = gSaveBlock2Ptr->optionsTextSpeed; - battleSave->AI_scripts = sRecordedBattle_AI_Scripts; + battleSave->AI_scripts = sAI_Scripts; /* Can't match it without proper knowledge of the Saveblock 2. if (gTrainerBattleOpponent_A >= 300 && gTrainerBattleOpponent_A <= 399) @@ -525,7 +525,7 @@ _0818535E:\n\ lsls r3, 3\n\ adds r3, r7, r3\n\ str r3, [sp, 0x8]\n\ - ldr r5, =sRecordedBattle_Players\n\ + ldr r5, =sPlayers\n\ mov r8, r6\n\ mov r12, r6\n\ movs r4, 0x96\n\ @@ -536,7 +536,7 @@ _0818535E:\n\ adds r4, r7, r0\n\ _081853AC:\n\ lsls r1, r6, 3\n\ - ldr r0, =sRecordedBattle_Players\n\ + ldr r0, =sPlayers\n\ adds r0, 0x4\n\ mov r3, r8\n\ adds r2, r3, r0\n\ @@ -578,7 +578,7 @@ _081853BA:\n\ ldr r5, =gRecordedBattleRngSeed\n\ ldr r0, [r5]\n\ str r0, [r1]\n\ - ldr r0, =sRecordedBattle_BattleFlags\n\ + ldr r0, =sBattleFlags\n\ ldr r2, [r0]\n\ movs r0, 0x2\n\ ands r0, r2\n\ @@ -608,7 +608,7 @@ _08185454:\n\ ands r2, r0\n\ cmp r2, 0\n\ beq _081854E2\n\ - ldr r2, =sRecordedBattle_Players\n\ + ldr r2, =sPlayers\n\ ldrh r0, [r2, 0xE]\n\ cmp r0, 0x1\n\ beq _081854A8\n\ @@ -630,7 +630,7 @@ _0818547E:\n\ lsls r0, r1, 2\n\ adds r0, r1\n\ lsls r0, 2\n\ - ldr r4, =sRecordedBattle_Players\n\ + ldr r4, =sPlayers\n\ adds r0, r4\n\ ldrh r1, [r0, 0xE]\n\ movs r0, 0x1\n\ @@ -647,7 +647,7 @@ _081854A8:\n\ lsls r0, r1, 2\n\ adds r0, r1\n\ lsls r0, 2\n\ - ldr r1, =sRecordedBattle_Players\n\ + ldr r1, =sPlayers\n\ adds r0, r1\n\ ldrh r1, [r0, 0xE]\n\ movs r0, 0x1\n\ @@ -700,7 +700,7 @@ _081854E2:\n\ ldr r5, =0x000004fc\n\ adds r1, r7, r5\n\ strb r0, [r1]\n\ - ldr r0, =sRecordedBattle_FrontierFacility\n\ + ldr r0, =sFrontierFacility\n\ ldrb r1, [r0]\n\ adds r2, 0x3\n\ adds r0, r7, r2\n\ @@ -735,7 +735,7 @@ _081854E2:\n\ movs r2, 0xA0\n\ lsls r2, 3\n\ adds r1, r7, r2\n\ - ldr r3, =sRecordedBattle_AI_Scripts\n\ + ldr r3, =sAI_Scripts\n\ ldr r0, [r3]\n\ str r0, [r1]\n\ ldr r4, =0xfffffed4\n\ @@ -1354,11 +1354,11 @@ static void SetRecordedBattleVarsFromSave(struct RecordedBattleSave *src) gPartnerTrainerId = src->partnerId; gUnknown_0203C7B4 = src->field_4FA; sUnknown_0203C7AD = gSaveBlock2Ptr->frontierChosenLvl; - sRecordedBattle_FrontierFacility = src->field_4FD; + sFrontierFacility = src->field_4FD; sUnknown_0203C7AF = src->field_4FE; - sRecordedBattle_BattleStyle = src->battleStyle; - sRecordedBattle_TextSpeed = src->textSpeed; - sRecordedBattle_AI_Scripts = src->AI_scripts; + sBattleStyle = src->battleStyle; + sTextSpeed = src->textSpeed; + sAI_Scripts = src->AI_scripts; for (i = 0; i < 8; i++) { @@ -1417,7 +1417,7 @@ static void CB2_RecordedBattle(void) u8 GetRecordedBattleFrontierFacility(void) { - return sRecordedBattle_FrontierFacility; + return sFrontierFacility; } u8 sub_8185EAC(void) @@ -1480,12 +1480,12 @@ u8 sub_8185FAC(void) u8 GetBattleStyleInRecordedBattle(void) { - return sRecordedBattle_BattleStyle; + return sBattleStyle; } u8 GetTextSpeedInRecordedBattle(void) { - return sRecordedBattle_TextSpeed; + return sTextSpeed; } void RecordedBattle_CopyBattlerMoves(void) @@ -1501,7 +1501,7 @@ void RecordedBattle_CopyBattlerMoves(void) for (i = 0; i < 4; i++) { - sRecordedBattle_PlayerMonMoves[gActiveBattler / 2][i] = gBattleMons[gActiveBattler].moves[i]; + sPlayerMonMoves[gActiveBattler / 2][i] = gBattleMons[gActiveBattler].moves[i]; } } @@ -1522,7 +1522,7 @@ void sub_818603C(u8 arg0) { for (j = 0; j < 4; j++) { - if (gBattleMons[battlerId].moves[j] != sRecordedBattle_PlayerMonMoves[battlerId / 2][j]) + if (gBattleMons[battlerId].moves[j] != sPlayerMonMoves[battlerId / 2][j]) break; } if (j != 4) // player's mon's move has been changed @@ -1532,7 +1532,7 @@ void sub_818603C(u8 arg0) { for (k = 0; k < 4; k++) { - if (gBattleMons[battlerId].moves[j] == sRecordedBattle_PlayerMonMoves[battlerId / 2][k]) + if (gBattleMons[battlerId].moves[j] == sPlayerMonMoves[battlerId / 2][k]) { RecordedBattle_SetBattlerAction(battlerId, k); break; @@ -1612,7 +1612,7 @@ void sub_818603C(u8 arg0) u32 GetAiScriptsInRecordedBattle(void) { - return sRecordedBattle_AI_Scripts; + return sAI_Scripts; } void sub_8186444(void) From c556358e47f7af50ba9b04fc1d7b359512c25b03 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 1 Jul 2018 15:28:57 +0200 Subject: [PATCH 39/55] label multiuse sprite template functions --- asm/contest.s | 4 +- asm/contest_link_80F57C4.s | 4 +- asm/pokemon_summary_screen.s | 4 +- asm/script_pokemon_util_80F87D8.s | 4 +- asm/trade.s | 4 +- data/data2b.s | 2 +- include/pokemon.h | 8 +-- src/battle_controller_link_opponent.c | 21 +++--- src/battle_controller_link_partner.c | 17 +++-- src/battle_controller_opponent.c | 21 +++--- src/battle_controller_player.c | 35 +++++----- src/battle_controller_player_partner.c | 22 +++--- src/battle_controller_recorded_opponent.c | 17 +++-- src/battle_controller_recorded_player.c | 21 +++--- src/battle_controller_safari.c | 8 +-- src/battle_controller_wally.c | 17 +++-- src/battle_dome_cards.c | 13 ++-- src/battle_main.c | 6 +- src/egg_hatch.c | 6 +- src/evolution_scene.c | 31 ++++----- src/pokeblock_feed.c | 5 +- src/pokemon.c | 84 ++++++++++++----------- src/reshow_battle_screen.c | 19 +++-- 23 files changed, 183 insertions(+), 190 deletions(-) diff --git a/asm/contest.s b/asm/contest.s index 327a80d75e..453ecb04c3 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -6770,8 +6770,8 @@ _080DB1CC: bl LoadCompressedPalette adds r0, r5, 0 movs r1, 0 - bl sub_806A068 - ldr r4, =gUnknown_0202499C + bl SetMultiuseSpriteTemplateToPokemon + ldr r4, =gMultiuseSpriteTemplate movs r0, 0x2 adds r1, r5, 0 movs r2, 0 diff --git a/asm/contest_link_80F57C4.s b/asm/contest_link_80F57C4.s index 450a235d5b..ba1fa1c292 100644 --- a/asm/contest_link_80F57C4.s +++ b/asm/contest_link_80F57C4.s @@ -1420,8 +1420,8 @@ _080F64F2: bl LoadCompressedObjectPalette adds r0, r6, 0 movs r1, 0x1 - bl sub_806A068 - ldr r0, =gUnknown_0202499C + bl SetMultiuseSpriteTemplateToPokemon + ldr r0, =gMultiuseSpriteTemplate ldrh r1, [r4, 0x4] strh r1, [r0, 0x2] movs r1, 0x88 diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index e52874f576..ff848df08d 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -1092,7 +1092,7 @@ _081C4750: bl LoadCompressedObjectPalette ldrh r0, [r4, 0x4] movs r1, 0x1 - bl sub_806A068 + bl SetMultiuseSpriteTemplateToPokemon _081C4768: ldrh r0, [r6] adds r0, 0x1 @@ -1144,7 +1144,7 @@ sub_81C47B4: @ 81C47B4 ldr r0, =gUnknown_0203CF1C ldr r6, [r0] adds r6, 0x70 - ldr r0, =gUnknown_0202499C + ldr r0, =gMultiuseSpriteTemplate movs r1, 0x28 movs r2, 0x40 movs r3, 0x5 diff --git a/asm/script_pokemon_util_80F87D8.s b/asm/script_pokemon_util_80F87D8.s index 18a0cec886..1d4173c4cb 100644 --- a/asm/script_pokemon_util_80F87D8.s +++ b/asm/script_pokemon_util_80F87D8.s @@ -737,8 +737,8 @@ _080F8DD8: bl LoadCompressedObjectPalette adds r0, r6, 0 movs r1, 0x1 - bl sub_806A068 - ldr r0, =gUnknown_0202499C + bl SetMultiuseSpriteTemplateToPokemon + ldr r0, =gMultiuseSpriteTemplate ldrh r1, [r4, 0x4] strh r1, [r0, 0x2] mov r1, r9 diff --git a/asm/trade.s b/asm/trade.s index 0d73539380..061e338cda 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -7174,8 +7174,8 @@ _0807ADE0: bl GetMonSpritePalStruct ldrh r0, [r0, 0x4] adds r1, r4, 0 - bl sub_806A068 - ldr r0, =gUnknown_0202499C + bl SetMultiuseSpriteTemplateToPokemon + ldr r0, =gMultiuseSpriteTemplate movs r1, 0x78 movs r2, 0x3C movs r3, 0x6 diff --git a/data/data2b.s b/data/data2b.s index de32e97753..87ca0b881d 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -235,7 +235,7 @@ gUnknown_082FF704:: @ 82FF704 .2byte 0x0003, 0x0000, 0xffff, 0x0000 .align 2 -gUnknown_082FF70C:: @ 82FF70C +gPlayerMonSpriteAnimsTable:: @ 82FF70C .4byte gUnknown_082FF6EC .4byte gUnknown_082FF6F4 .4byte gUnknown_082FF6FC diff --git a/include/pokemon.h b/include/pokemon.h index f928243d0c..f36284f12a 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -438,7 +438,7 @@ extern u8 gPlayerPartyCount; extern struct Pokemon gPlayerParty[PARTY_SIZE]; extern u8 gEnemyPartyCount; extern struct Pokemon gEnemyParty[PARTY_SIZE]; -extern struct SpriteTemplate gUnknown_0202499C; +extern struct SpriteTemplate gMultiuseSpriteTemplate; extern struct PokemonStorage* gPokemonStoragePtr; extern const struct BattleMove gBattleMoves[]; @@ -505,9 +505,9 @@ u8 GetDefaultMoveTarget(u8 battlerId); u8 GetMonGender(struct Pokemon *mon); u8 GetBoxMonGender(struct BoxPokemon *boxMon); u8 GetGenderFromSpeciesAndPersonality(u16 species, u32 personality); -void sub_806A068(u16 species, u8 battlerPosition); -void sub_806A12C(u16 trainerSpriteId, u8 battlerPosition); -void sub_806A1C0(u16 arg0, u8 battlerPosition); +void SetMultiuseSpriteTemplateToPokemon(u16 species, u8 battlerPosition); +void SetMultiuseSpriteTemplateToTrainerBack(u16 trainerSpriteId, u8 battlerPosition); +void SetMultiuseSpriteTemplateToTrainerFront(u16 arg0, u8 battlerPosition); // These are full type signatures for GetMonData() and GetBoxMonData(), // but they are not used since some code erroneously omits the third arg. diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 18963f9551..d786dacd14 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -34,7 +34,6 @@ extern struct UnusedControllerStruct gUnknown_02022D0C; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern void sub_806A068(u16, u8); extern void sub_81851A8(u8 *); extern u16 sub_8068B48(void); extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId); @@ -191,7 +190,7 @@ static void LinkOpponentBufferRunCommand(void) } } -static void CompleteOnBankSpriteCallbackDummy(void) +static void CompleteOnBattlerSpriteCallbackDummy(void) { if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy) LinkOpponentBufferExecCompleted(); @@ -1135,9 +1134,9 @@ static void LinkOpponentHandleLoadMonSprite(void) u16 species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES); BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); - sub_806A068(species, GetBattlerPosition(gActiveBattler)); + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(gActiveBattler, 2), GetBattlerSpriteDefault_Y(gActiveBattler), sub_80A82E4(gActiveBattler)); @@ -1168,10 +1167,10 @@ static void sub_8066494(u8 battlerId, bool8 dontClearSubstituteBit) species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES); gUnknown_03005D7C[battlerId] = CreateInvisibleSpriteWithCallback(sub_805D714); BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[battlerId]], battlerId); - sub_806A068(species, GetBattlerPosition(battlerId)); + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(battlerId)); gBattlerSpriteIds[battlerId] = CreateSprite( - &gUnknown_0202499C, + &gMultiuseSpriteTemplate, GetBattlerSpriteCoord(battlerId, 2), GetBattlerSpriteDefault_Y(battlerId), sub_80A82E4(battlerId)); @@ -1302,8 +1301,8 @@ static void LinkOpponentHandleDrawTrainerPic(void) } DecompressTrainerFrontPic(trainerPicId, gActiveBattler); - sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, + SetMultiuseSpriteTemplateToTrainerBack(trainerPicId, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40, sub_80A82E4(gActiveBattler)); @@ -1314,7 +1313,7 @@ static void LinkOpponentHandleDrawTrainerPic(void) gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineParam = trainerPicId; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC; - gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy; + gBattlerControllerFuncs[gActiveBattler] = CompleteOnBattlerSpriteCallbackDummy; } static void LinkOpponentHandleTrainerSlide(void) @@ -1327,8 +1326,8 @@ static void LinkOpponentHandleTrainerSlide(void) trainerPicId = GetFrontierTrainerFrontSpriteId(gTrainerBattleOpponent_B); DecompressTrainerFrontPic(trainerPicId, gActiveBattler); - sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, 176, (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40, 0x1E); + SetMultiuseSpriteTemplateToTrainerBack(trainerPicId, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, 176, (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40, 0x1E); gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 96; gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.x += 32; diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index b2cf621386..9867c14e4d 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -34,7 +34,6 @@ extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern void sub_806A068(u16, u8); extern void sub_81851A8(u8 *); extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId); @@ -189,7 +188,7 @@ static void LinkPartnerBufferRunCommand(void) } } -static void CompleteOnBankSpriteCallbackDummy(void) +static void CompleteOnBattlerSpriteCallbackDummy(void) { if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy) LinkPartnerBufferExecCompleted(); @@ -1024,9 +1023,9 @@ static void LinkPartnerHandleLoadMonSprite(void) BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES); - sub_806A068(species, GetBattlerPosition(gActiveBattler)); + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(gActiveBattler, 2), GetBattlerSpriteDefault_Y(gActiveBattler), sub_80A82E4(gActiveBattler)); @@ -1054,10 +1053,10 @@ static void sub_814CC98(u8 battlerId, bool8 dontClearSubstituteBit) gBattlerPartyIndexes[battlerId] = gBattleBufferA[battlerId][1]; species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES); gUnknown_03005D7C[battlerId] = CreateInvisibleSpriteWithCallback(sub_805D714); - sub_806A068(species, GetBattlerPosition(battlerId)); + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(battlerId)); gBattlerSpriteIds[battlerId] = CreateSprite( - &gUnknown_0202499C, + &gMultiuseSpriteTemplate, GetBattlerSpriteCoord(battlerId, 2), GetBattlerSpriteDefault_Y(battlerId), sub_80A82E4(battlerId)); @@ -1147,15 +1146,15 @@ static void LinkPartnerHandleDrawTrainerPic(void) } DecompressTrainerBackPic(trainerPicId, gActiveBattler); - sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, (8 - gTrainerBackPicCoords[trainerPicId].coords) * 4 + 80, sub_80A82E4(gActiveBattler)); + SetMultiuseSpriteTemplateToTrainerBack(trainerPicId, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, (8 - gTrainerBackPicCoords[trainerPicId].coords) * 4 + 80, sub_80A82E4(gActiveBattler)); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240; gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC; - gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy; + gBattlerControllerFuncs[gActiveBattler] = CompleteOnBattlerSpriteCallbackDummy; } static void LinkPartnerHandleTrainerSlide(void) diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 2af17d32e8..1eaa9da18f 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -38,7 +38,6 @@ extern struct UnusedControllerStruct gUnknown_02022D0C; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern void sub_806A068(u16, u8); extern void sub_81A57E4(u8 battlerId, u16 stringId); extern u8 GetFrontierBrainTrainerPicIndex(void); extern u8 sub_81D5588(u16 trainerId); @@ -200,7 +199,7 @@ static void OpponentBufferRunCommand(void) } } -static void CompleteOnBankSpriteCallbackDummy(void) +static void CompleteOnBattlerSpriteCallbackDummy(void) { if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy) OpponentBufferExecCompleted(); @@ -1128,9 +1127,9 @@ static void OpponentHandleLoadMonSprite(void) u16 species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES); BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); - sub_806A068(species, GetBattlerPosition(gActiveBattler)); + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(gActiveBattler, 2), GetBattlerSpriteDefault_Y(gActiveBattler), sub_80A82E4(gActiveBattler)); @@ -1163,9 +1162,9 @@ static void sub_80613DC(u8 battlerId, bool8 dontClearSubstituteBit) species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES); gUnknown_03005D7C[battlerId] = CreateInvisibleSpriteWithCallback(sub_805D714); BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[battlerId]], battlerId); - sub_806A068(species, GetBattlerPosition(battlerId)); + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(battlerId)); - gBattlerSpriteIds[battlerId] = CreateSprite(&gUnknown_0202499C, + gBattlerSpriteIds[battlerId] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(battlerId, 2), GetBattlerSpriteDefault_Y(battlerId), sub_80A82E4(battlerId)); @@ -1294,8 +1293,8 @@ static void OpponentHandleDrawTrainerPic(void) } DecompressTrainerFrontPic(trainerPicId, gActiveBattler); - sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, + SetMultiuseSpriteTemplateToTrainerBack(trainerPicId, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40, sub_80A82E4(gActiveBattler)); @@ -1306,7 +1305,7 @@ static void OpponentHandleDrawTrainerPic(void) gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineParam = trainerPicId; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC; - gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy; + gBattlerControllerFuncs[gActiveBattler] = CompleteOnBattlerSpriteCallbackDummy; } static void OpponentHandleTrainerSlide(void) @@ -1366,8 +1365,8 @@ static void OpponentHandleTrainerSlide(void) } DecompressTrainerFrontPic(trainerPicId, gActiveBattler); - sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, 176, (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40, 0x1E); + SetMultiuseSpriteTemplateToTrainerBack(trainerPicId, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, 176, (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40, 0x1E); gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 96; gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.x += 32; diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 26c2cae984..ef45b60cd0 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -39,7 +39,7 @@ extern u16 gBattle_BG0_Y; extern s32 gUnknown_0203CD70; extern struct UnusedControllerStruct gUnknown_02022D0C; extern struct MusicPlayerInfo gMPlayInfo_BGM; -extern struct SpriteTemplate gUnknown_0202499C; +extern struct SpriteTemplate gMultiuseSpriteTemplate; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; @@ -47,7 +47,6 @@ extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); extern void sub_81B89AC(u8 arg0); extern void sub_81AABB0(void); -extern void sub_806A068(u16, u8); extern void sub_81A57E4(u8 battlerId, u16 stringId); extern void sub_81851A8(u8 *); @@ -917,7 +916,7 @@ void sub_80587B0(void) } } -static void CompleteOnBankSpriteCallbackDummy(void) +static void CompleteOnBattlerSpriteCallbackDummy(void) { if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy) PlayerBufferExecCompleted(); @@ -2200,10 +2199,10 @@ static void sub_805B258(u8 battlerId, bool8 dontClearSubstituteBit) gBattlerPartyIndexes[battlerId] = gBattleBufferA[battlerId][1]; species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES); gUnknown_03005D7C[battlerId] = CreateInvisibleSpriteWithCallback(sub_805D714); - sub_806A068(species, GetBattlerPosition(battlerId)); + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(battlerId)); gBattlerSpriteIds[battlerId] = CreateSprite( - &gUnknown_0202499C, + &gMultiuseSpriteTemplate, GetBattlerSpriteCoord(battlerId, 2), GetBattlerSpriteDefault_Y(battlerId), sub_80A82E4(battlerId)); @@ -2282,7 +2281,7 @@ static void PlayerHandleDrawTrainerPic(void) } else { - trainerPicId = gLinkPlayers[GetMultiplayerId()].gender; + trainerPicId = gLinkPlayers[GetMultiplayerId()].gender + TRAINER_BACK_PIC_BRENDAN; } } else @@ -2292,9 +2291,9 @@ static void PlayerHandleDrawTrainerPic(void) if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { - if ((GetBattlerPosition(gActiveBattler) & BIT_FLANK) != 0) // second mon + if ((GetBattlerPosition(gActiveBattler) & BIT_FLANK) != B_FLANK_LEFT) // Second mon, on the right. xPos = 90; - else // first mon + else // First mon, on the left. xPos = 32; if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gPartnerTrainerId != TRAINER_STEVEN_PARTNER) @@ -2319,8 +2318,8 @@ static void PlayerHandleDrawTrainerPic(void) { trainerPicId = PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender); DecompressTrainerFrontPic(trainerPicId, gActiveBattler); - sub_806A1C0(trainerPicId, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler)); + SetMultiuseSpriteTemplateToTrainerFront(trainerPicId, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, yPos, sub_80A82E4(gActiveBattler)); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag); gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240; @@ -2330,12 +2329,12 @@ static void PlayerHandleDrawTrainerPic(void) gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineMode = 0; gSprites[gBattlerSpriteIds[gActiveBattler]].hFlip = 1; } - // use the back pic in any other scenario + // Use the back pic in any other scenario. else { DecompressTrainerBackPic(trainerPicId, gActiveBattler); - sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler)); + SetMultiuseSpriteTemplateToTrainerBack(trainerPicId, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, yPos, sub_80A82E4(gActiveBattler)); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240; @@ -2343,7 +2342,7 @@ static void PlayerHandleDrawTrainerPic(void) gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC; } - gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy; + gBattlerControllerFuncs[gActiveBattler] = CompleteOnBattlerSpriteCallbackDummy; } static void PlayerHandleTrainerSlide(void) @@ -2364,17 +2363,17 @@ static void PlayerHandleTrainerSlide(void) } else { - trainerPicId = gLinkPlayers[GetMultiplayerId()].gender; + trainerPicId = gLinkPlayers[GetMultiplayerId()].gender + TRAINER_BACK_PIC_BRENDAN; } } else { - trainerPicId = gSaveBlock2Ptr->playerGender; + trainerPicId = gSaveBlock2Ptr->playerGender + TRAINER_BACK_PIC_BRENDAN; } DecompressTrainerBackPic(trainerPicId, gActiveBattler); - sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, 80, (8 - gTrainerBackPicCoords[trainerPicId].coords) * 4 + 80, 30); + SetMultiuseSpriteTemplateToTrainerBack(trainerPicId, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, 80, (8 - gTrainerBackPicCoords[trainerPicId].coords) * 4 + 80, 30); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -96; diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index d7878678a4..cd3a946924 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -35,7 +35,7 @@ extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern void sub_81358F4(void); extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern void sub_806A068(u16, u8); +extern void SetMultiuseSpriteTemplateToPokemon(u16, u8); extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId); // this file's functions @@ -204,7 +204,7 @@ static void PlayerPartnerBufferRunCommand(void) } } -static void CompleteOnBankSpriteCallbackDummy(void) +static void CompleteOnBattlerSpriteCallbackDummy(void) { if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy) PlayerPartnerBufferExecCompleted(); @@ -1211,9 +1211,9 @@ static void PlayerPartnerHandleLoadMonSprite(void) BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES); - sub_806A068(species, GetBattlerPosition(gActiveBattler)); + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(gActiveBattler, 2), GetBattlerSpriteDefault_Y(gActiveBattler), sub_80A82E4(gActiveBattler)); @@ -1241,10 +1241,10 @@ static void sub_81BD0E4(u8 battlerId, bool8 dontClearSubstituteBit) gBattlerPartyIndexes[battlerId] = gBattleBufferA[battlerId][1]; species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES); gUnknown_03005D7C[battlerId] = CreateInvisibleSpriteWithCallback(sub_805D714); - sub_806A068(species, GetBattlerPosition(battlerId)); + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(battlerId)); gBattlerSpriteIds[battlerId] = CreateSprite( - &gUnknown_0202499C, + &gMultiuseSpriteTemplate, GetBattlerSpriteCoord(battlerId, 2), GetBattlerSpriteDefault_Y(battlerId), sub_80A82E4(battlerId)); @@ -1326,8 +1326,8 @@ static void PlayerPartnerHandleDrawTrainerPic(void) if (gPartnerTrainerId == TRAINER_STEVEN_PARTNER) { DecompressTrainerBackPic(trainerPicId, gActiveBattler); - sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler)); + SetMultiuseSpriteTemplateToTrainerBack(trainerPicId, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, yPos, sub_80A82E4(gActiveBattler)); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240; @@ -1337,8 +1337,8 @@ static void PlayerPartnerHandleDrawTrainerPic(void) else // otherwise use front sprite { DecompressTrainerFrontPic(trainerPicId, gActiveBattler); - sub_806A1C0(trainerPicId, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler)); + SetMultiuseSpriteTemplateToTrainerFront(trainerPicId, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, yPos, sub_80A82E4(gActiveBattler)); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag); gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240; @@ -1349,7 +1349,7 @@ static void PlayerPartnerHandleDrawTrainerPic(void) gSprites[gBattlerSpriteIds[gActiveBattler]].hFlip = 1; } - gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy; + gBattlerControllerFuncs[gActiveBattler] = CompleteOnBattlerSpriteCallbackDummy; } static void PlayerPartnerHandleTrainerSlide(void) diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 1fd1deebfa..affcb09ab8 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -37,7 +37,6 @@ extern u8 gUnknown_0203C7B4; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern void sub_806A068(u16, u8); extern u16 sub_8068B48(void); extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId); @@ -193,7 +192,7 @@ static void RecordedOpponentBufferRunCommand(void) } } -static void CompleteOnBankSpriteCallbackDummy(void) +static void CompleteOnBattlerSpriteCallbackDummy(void) { if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy) RecordedOpponentBufferExecCompleted(); @@ -1119,9 +1118,9 @@ static void RecordedOpponentHandleLoadMonSprite(void) u16 species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES); BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); - sub_806A068(species, GetBattlerPosition(gActiveBattler)); + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(gActiveBattler, 2), GetBattlerSpriteDefault_Y(gActiveBattler), sub_80A82E4(gActiveBattler)); @@ -1154,9 +1153,9 @@ static void sub_81885D8(u8 battlerId, bool8 dontClearSubstituteBit) species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES); gUnknown_03005D7C[battlerId] = CreateInvisibleSpriteWithCallback(sub_805D714); BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[battlerId]], battlerId); - sub_806A068(species, GetBattlerPosition(battlerId)); + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(battlerId)); - gBattlerSpriteIds[battlerId] = CreateSprite(&gUnknown_0202499C, + gBattlerSpriteIds[battlerId] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(battlerId, 2), GetBattlerSpriteDefault_Y(battlerId), sub_80A82E4(battlerId)); @@ -1252,8 +1251,8 @@ static void RecordedOpponentHandleDrawTrainerPic(void) } DecompressTrainerFrontPic(trainerPicId, gActiveBattler); - sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, + SetMultiuseSpriteTemplateToTrainerBack(trainerPicId, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40, sub_80A82E4(gActiveBattler)); @@ -1264,7 +1263,7 @@ static void RecordedOpponentHandleDrawTrainerPic(void) gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineParam = trainerPicId; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC; - gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy; + gBattlerControllerFuncs[gActiveBattler] = CompleteOnBattlerSpriteCallbackDummy; } static void RecordedOpponentHandleTrainerSlide(void) diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index b6a96b6fd8..4f224bc67e 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -36,7 +36,6 @@ extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern void sub_806A068(u16, u8); extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId); // this file's functions @@ -190,7 +189,7 @@ static void RecordedPlayerBufferRunCommand(void) } } -static void CompleteOnBankSpriteCallbackDummy(void) +static void CompleteOnBattlerSpriteCallbackDummy(void) { if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy) RecordedPlayerBufferExecCompleted(); @@ -1107,9 +1106,9 @@ static void RecordedPlayerHandleLoadMonSprite(void) BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES); - sub_806A068(species, GetBattlerPosition(gActiveBattler)); + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(gActiveBattler, 2), GetBattlerSpriteDefault_Y(gActiveBattler), sub_80A82E4(gActiveBattler)); @@ -1137,10 +1136,10 @@ static void sub_818BA6C(u8 battlerId, bool8 dontClearSubstituteBit) gBattlerPartyIndexes[battlerId] = gBattleBufferA[battlerId][1]; species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES); gUnknown_03005D7C[battlerId] = CreateInvisibleSpriteWithCallback(sub_805D714); - sub_806A068(species, GetBattlerPosition(battlerId)); + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(battlerId)); gBattlerSpriteIds[battlerId] = CreateSprite( - &gUnknown_0202499C, + &gMultiuseSpriteTemplate, GetBattlerSpriteCoord(battlerId, 2), GetBattlerSpriteDefault_Y(battlerId), sub_80A82E4(battlerId)); @@ -1242,8 +1241,8 @@ static void RecordedPlayerHandleDrawTrainerPic(void) { trainerPicId = PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender); DecompressTrainerFrontPic(trainerPicId, gActiveBattler); - sub_806A1C0(trainerPicId, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler)); + SetMultiuseSpriteTemplateToTrainerFront(trainerPicId, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, yPos, sub_80A82E4(gActiveBattler)); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag); gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240; @@ -1256,8 +1255,8 @@ static void RecordedPlayerHandleDrawTrainerPic(void) else { DecompressTrainerBackPic(trainerPicId, gActiveBattler); - sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler)); + SetMultiuseSpriteTemplateToTrainerBack(trainerPicId, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, yPos, sub_80A82E4(gActiveBattler)); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240; @@ -1265,7 +1264,7 @@ static void RecordedPlayerHandleDrawTrainerPic(void) gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC; } - gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy; + gBattlerControllerFuncs[gActiveBattler] = CompleteOnBattlerSpriteCallbackDummy; } static void RecordedPlayerHandleTrainerSlide(void) diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index bc69e2624f..f7be76c9be 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -239,7 +239,7 @@ static void HandleInputChooseAction(void) } } -static void CompleteOnBankSpriteCallbackDummy(void) +static void CompleteOnBattlerSpriteCallbackDummy(void) { if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy) SafariBufferExecCompleted(); @@ -358,9 +358,9 @@ static void SafariHandleReturnMonToBall(void) static void SafariHandleDrawTrainerPic(void) { DecompressTrainerBackPic(gSaveBlock2Ptr->playerGender, gActiveBattler); - sub_806A12C(gSaveBlock2Ptr->playerGender, GetBattlerPosition(gActiveBattler)); + SetMultiuseSpriteTemplateToTrainerBack(gSaveBlock2Ptr->playerGender, GetBattlerPosition(gActiveBattler)); gBattlerSpriteIds[gActiveBattler] = CreateSprite( - &gUnknown_0202499C, + &gMultiuseSpriteTemplate, 80, (8 - gTrainerBackPicCoords[gSaveBlock2Ptr->playerGender].coords) * 4 + 80, 30); @@ -368,7 +368,7 @@ static void SafariHandleDrawTrainerPic(void) gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240; gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC; - gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy; + gBattlerControllerFuncs[gActiveBattler] = CompleteOnBattlerSpriteCallbackDummy; } static void SafariHandleTrainerSlide(void) diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index f66a1d7739..f024c29c08 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -39,7 +39,6 @@ extern struct UnusedControllerStruct gUnknown_02022D0C; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern void sub_806A068(u16, u8); // this file's functions static void WallyHandleGetMonData(void); @@ -254,7 +253,7 @@ static void WallyHandleActions(void) } } -static void CompleteOnBankSpriteCallbackDummy(void) +static void CompleteOnBattlerSpriteCallbackDummy(void) { if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy) WallyBufferExecCompleted(); @@ -1039,8 +1038,8 @@ static void WallyHandleReturnMonToBall(void) static void WallyHandleDrawTrainerPic(void) { DecompressTrainerBackPic(TRAINER_BACK_PIC_WALLY, gActiveBattler); - sub_806A12C(TRAINER_BACK_PIC_WALLY, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, + SetMultiuseSpriteTemplateToTrainerBack(TRAINER_BACK_PIC_WALLY, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, 80, 80 + 4 * (8 - gTrainerBackPicCoords[TRAINER_BACK_PIC_WALLY].coords), 30); @@ -1048,14 +1047,14 @@ static void WallyHandleDrawTrainerPic(void) gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240; gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC; - gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy; + gBattlerControllerFuncs[gActiveBattler] = CompleteOnBattlerSpriteCallbackDummy; } static void WallyHandleTrainerSlide(void) { DecompressTrainerBackPic(TRAINER_BACK_PIC_WALLY, gActiveBattler); - sub_806A12C(TRAINER_BACK_PIC_WALLY, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, + SetMultiuseSpriteTemplateToTrainerBack(TRAINER_BACK_PIC_WALLY, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, 80, 80 + 4 * (8 - gTrainerBackPicCoords[TRAINER_BACK_PIC_WALLY].coords), 30); @@ -1466,8 +1465,8 @@ static void sub_816AA80(u8 battlerId) gBattlerPartyIndexes[battlerId] = gBattleBufferA[battlerId][1]; species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES); gUnknown_03005D7C[battlerId] = CreateInvisibleSpriteWithCallback(sub_805D714); - sub_806A068(species, GetBattlerPosition(battlerId)); - gBattlerSpriteIds[battlerId] = CreateSprite(&gUnknown_0202499C, + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(battlerId)); + gBattlerSpriteIds[battlerId] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(battlerId, 2), GetBattlerSpriteDefault_Y(battlerId), sub_80A82E4(battlerId)); diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c index 076a4d3428..5e659a2e89 100644 --- a/src/battle_dome_cards.c +++ b/src/battle_dome_cards.c @@ -16,14 +16,15 @@ extern const struct CompressedSpriteSheet gTrainerBackPicTable[]; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const union AffineAnimCmd *const gUnknown_082FF618[]; extern const union AffineAnimCmd *const gUnknown_082FF694[]; -extern const union AnimCmd *const gUnknown_082FF70C[]; +extern const union AnimCmd *const gPlayerMonSpriteAnimsTable[]; extern const union AnimCmd *const *const gMonAnimationsSpriteAnimsPtrTable[NUM_SPECIES]; extern const union AnimCmd *const *const gUnknown_0830536C[]; extern const u8 gFacilityClassToPicIndex[]; // Static type declarations -struct BattleDomeCard { +struct BattleDomeCard +{ u8 *frames; struct SpriteFrameImage *images; u16 paletteTag; @@ -41,10 +42,12 @@ static EWRAM_DATA struct BattleDomeCard gUnknown_0203CD04[8] = {}; // .rodata static const struct BattleDomeCard gUnknown_0860B058 = {}; -static const struct OamData gUnknown_0860B064 = { +static const struct OamData gUnknown_0860B064 = +{ .size = 3 }; -static const struct OamData gUnknown_0860B06C = { +static const struct OamData gUnknown_0860B06C = +{ .affineMode = 1, .size = 3 }; @@ -158,7 +161,7 @@ static void uns_builder_assign_animtable1(bool8 isTrainer) { if (!isTrainer) { - gUnknown_0203CCEC.anims = gUnknown_082FF70C; + gUnknown_0203CCEC.anims = gPlayerMonSpriteAnimsTable; } else { diff --git a/src/battle_main.c b/src/battle_main.c index 9bec157505..591c299d7e 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -300,6 +300,7 @@ u8 gNumberOfMovesToChoose; u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT]; // rom const data +static const s8 gUnknown_0831ACE0[] ={-32, -16, -16, -32, -32, 0, 0, 0}; // format: attacking type, defending type, damage multiplier // the multiplier is a (decimal) fixed-point number: @@ -307,9 +308,6 @@ u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT]; // 10 is ×1.0 TYPE_MUL_NORMAL // 05 is ×0.5 TYPE_MUL_NOT_EFFECTIVE // 00 is ×0.0 TYPE_MUL_NO_EFFECT - -static const s8 gUnknown_0831ACE0[] ={-32, -16, -16, -32, -32, 0, 0, 0}; - const u8 gTypeEffectiveness[336] = { TYPE_NORMAL, TYPE_ROCK, TYPE_MUL_NOT_EFFECTIVE, @@ -2808,7 +2806,7 @@ void sub_8039BB4(struct Sprite *sprite) static void oac_poke_ally_(struct Sprite *sprite) { - if ((gIntroSlideFlags & 1) == 0) + if (!(gIntroSlideFlags & 1)) { sprite->pos2.x -= 2; if (sprite->pos2.x == 0) diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 00e6236fe0..1e89650d3b 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -57,12 +57,10 @@ extern const u8 gText_NickHatchPrompt[]; extern u8 sav1_map_get_name(void); extern void TVShowConvertInternationalString(u8* str1, u8* str2, u8); -extern void sub_806A068(u16, u8); extern void FadeScreen(u8, u8); extern void overworld_free_bg_tilemaps(void); extern void sub_80AF168(void); extern void ScanlineEffect_Stop(void); -extern void CB2_ReturnToField(void); extern void play_some_sound(void); extern void DoNamingScreen(u8, const u8*, u16, u8, u32, MainCallback); extern u16 sub_80D22D0(void); @@ -437,8 +435,8 @@ static u8 EggHatchCreateMonSprite(u8 a0, u8 switchID, u8 pokeID, u16* speciesLoc } break; case 1: - sub_806A068(GetMonSpritePalStruct(mon)->tag, r5); - spriteID = CreateSprite(&gUnknown_0202499C, 120, 75, 6); + SetMultiuseSpriteTemplateToPokemon(GetMonSpritePalStruct(mon)->tag, r5); + spriteID = CreateSprite(&gMultiuseSpriteTemplate, 120, 75, 6); gSprites[spriteID].invisible = 1; gSprites[spriteID].callback = SpriteCallbackDummy; break; diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 84f00418c6..7079375f84 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -62,7 +62,6 @@ extern const u8 gText_CommunicationStandby5[]; extern void sub_80356D0(void); extern void sub_807B154(void); -extern void sub_806A068(u16, u8); extern void sub_807F19C(void); extern void sub_807B140(void); extern void EvolutionRenameMon(struct Pokemon *mon, u16 oldSpecies, u16 newSpecies); @@ -280,9 +279,9 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, pokePal = GetMonSpritePalStructFromOtIdPersonality(currSpecies, trainerId, personality); LoadCompressedPalette(pokePal->data, 0x110, 0x20); - sub_806A068(currSpecies, 1); - gUnknown_0202499C.affineAnims = gDummySpriteAffineAnimTable; - sEvoStructPtr->preEvoSpriteID = ID = CreateSprite(&gUnknown_0202499C, 120, 64, 30); + SetMultiuseSpriteTemplateToPokemon(currSpecies, 1); + gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; + sEvoStructPtr->preEvoSpriteID = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); gSprites[ID].callback = SpriteCallbackDummy_2; gSprites[ID].oam.paletteNum = 1; @@ -295,9 +294,9 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, pokePal = GetMonSpritePalStructFromOtIdPersonality(speciesToEvolve, trainerId, personality); LoadCompressedPalette(pokePal->data, 0x120, 0x20); - sub_806A068(speciesToEvolve, 3); - gUnknown_0202499C.affineAnims = gDummySpriteAffineAnimTable; - sEvoStructPtr->postEvoSpriteID = ID = CreateSprite(&gUnknown_0202499C, 120, 64, 30); + SetMultiuseSpriteTemplateToPokemon(speciesToEvolve, 3); + gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; + sEvoStructPtr->postEvoSpriteID = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); gSprites[ID].callback = SpriteCallbackDummy_2; gSprites[ID].oam.paletteNum = 2; gSprites[ID].invisible = 1; @@ -373,9 +372,9 @@ static void CB2_EvolutionSceneLoadGraphics(void) LoadCompressedPalette(pokePal->data, 0x120, 0x20); - sub_806A068(postEvoSpecies, 3); - gUnknown_0202499C.affineAnims = gDummySpriteAffineAnimTable; - sEvoStructPtr->postEvoSpriteID = ID = CreateSprite(&gUnknown_0202499C, 120, 64, 30); + SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, 3); + gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; + sEvoStructPtr->postEvoSpriteID = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); gSprites[ID].callback = SpriteCallbackDummy_2; gSprites[ID].oam.paletteNum = 2; @@ -450,9 +449,9 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void) { u8 ID; - sub_806A068(postEvoSpecies, 1); - gUnknown_0202499C.affineAnims = gDummySpriteAffineAnimTable; - sEvoStructPtr->postEvoSpriteID = ID = CreateSprite(&gUnknown_0202499C, 120, 64, 30); + SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, 1); + gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; + sEvoStructPtr->postEvoSpriteID = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); gSprites[ID].callback = SpriteCallbackDummy_2; gSprites[ID].oam.paletteNum = 2; @@ -509,9 +508,9 @@ void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpri pokePal = GetMonSpritePalStructFromOtIdPersonality(speciesToEvolve, trainerId, personality); LoadCompressedPalette(pokePal->data, 0x120, 0x20); - sub_806A068(speciesToEvolve, 1); - gUnknown_0202499C.affineAnims = gDummySpriteAffineAnimTable; - sEvoStructPtr->postEvoSpriteID = ID = CreateSprite(&gUnknown_0202499C, 120, 64, 30); + SetMultiuseSpriteTemplateToPokemon(speciesToEvolve, 1); + gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; + sEvoStructPtr->postEvoSpriteID = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); gSprites[ID].callback = SpriteCallbackDummy_2; gSprites[ID].oam.paletteNum = 2; diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index d3fdbd3555..7ce7affcc7 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -58,7 +58,6 @@ extern const struct CompressedSpriteSheet gMonFrontPicTable[]; extern const u16 gUnknown_0860F074[]; extern bool8 sub_81221EC(void); -extern void sub_806A068(u16, u8); extern void LoadSav2WindowGfx(u8, u16, u8); // this file's functions @@ -661,7 +660,7 @@ static bool8 LoadMonAndSceneGfx(struct Pokemon *mon) palette = GetMonSpritePalStructFromOtIdPersonality(species, trainerId, personality); LoadCompressedObjectPalette(palette); - sub_806A068(palette->tag, 1); + SetMultiuseSpriteTemplateToPokemon(palette->tag, 1); sPokeblockFeed->loadGfxState++; break; case 2: @@ -827,7 +826,7 @@ static void Task_PaletteFadeToReturn(u8 taskId) static u8 CreateMonSprite(struct Pokemon* mon) { u16 species = GetMonData(mon, MON_DATA_SPECIES2); - u8 spriteId = CreateSprite(&gUnknown_0202499C, 48, 80, 2); + u8 spriteId = CreateSprite(&gMultiuseSpriteTemplate, 48, 80, 2); sPokeblockFeed->species = species; sPokeblockFeed->monSpriteId_ = spriteId; diff --git a/src/pokemon.c b/src/pokemon.c index d06da3e9e7..80c1ab7846 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -63,7 +63,7 @@ extern const struct SpriteFrameImage gUnknown_082FF4F8[]; extern const struct SpriteFrameImage gUnknown_082FF518[]; extern const union AffineAnimCmd *const gUnknown_082FF618[]; extern const union AffineAnimCmd *const gUnknown_082FF694[]; -extern const union AnimCmd *gUnknown_082FF70C[]; +extern const union AnimCmd *gPlayerMonSpriteAnimsTable[]; extern const union AnimCmd *const *const gMonAnimationsSpriteAnimsPtrTable[]; extern const union AnimCmd *const *const gUnknown_08305D0C[]; extern const union AnimCmd *const *const gUnknown_0830536C[]; @@ -105,7 +105,7 @@ EWRAM_DATA u8 gPlayerPartyCount = 0; EWRAM_DATA u8 gEnemyPartyCount = 0; EWRAM_DATA struct Pokemon gPlayerParty[PARTY_SIZE] = {0}; EWRAM_DATA struct Pokemon gEnemyParty[PARTY_SIZE] = {0}; -EWRAM_DATA struct SpriteTemplate gUnknown_0202499C = {0}; +EWRAM_DATA struct SpriteTemplate gMultiuseSpriteTemplate = {0}; EWRAM_DATA struct Unknown_806F160_Struct *gUnknown_020249B4[2] = {NULL}; // const rom data @@ -2486,13 +2486,14 @@ static bool8 ShouldGetStatBadgeBoost(u16 badgeFlag, u8 battlerId) { if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_x2000000 | BATTLE_TYPE_FRONTIER)) return FALSE; - if (GetBattlerSide(battlerId) != B_SIDE_PLAYER) + else if (GetBattlerSide(battlerId) != B_SIDE_PLAYER) return FALSE; - if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gTrainerBattleOpponent_A == TRAINER_SECRET_BASE) + else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gTrainerBattleOpponent_A == TRAINER_SECRET_BASE) return FALSE; - if (FlagGet(badgeFlag)) + else if (FlagGet(badgeFlag)) return TRUE; - return FALSE; + else + return FALSE; } u8 GetDefaultMoveTarget(u8 battlerId) @@ -2561,53 +2562,53 @@ u8 GetGenderFromSpeciesAndPersonality(u16 species, u32 personality) return MON_MALE; } -void sub_806A068(u16 species, u8 battlerPosition) +void SetMultiuseSpriteTemplateToPokemon(u16 species, u8 battlerPosition) { if (gMonSpritesGfxPtr != NULL) - gUnknown_0202499C = gMonSpritesGfxPtr->templates[battlerPosition]; + gMultiuseSpriteTemplate = gMonSpritesGfxPtr->templates[battlerPosition]; else if (gUnknown_020249B4[0]) - gUnknown_0202499C = gUnknown_020249B4[0]->templates[battlerPosition]; + gMultiuseSpriteTemplate = gUnknown_020249B4[0]->templates[battlerPosition]; else if (gUnknown_020249B4[1]) - gUnknown_0202499C = gUnknown_020249B4[1]->templates[battlerPosition]; + gMultiuseSpriteTemplate = gUnknown_020249B4[1]->templates[battlerPosition]; else - gUnknown_0202499C = gUnknown_08329D98[battlerPosition]; + gMultiuseSpriteTemplate = gUnknown_08329D98[battlerPosition]; - gUnknown_0202499C.paletteTag = species; - if (battlerPosition == 0 || battlerPosition == 2) - gUnknown_0202499C.anims = gUnknown_082FF70C; + gMultiuseSpriteTemplate.paletteTag = species; + if (battlerPosition == B_POSITION_PLAYER_LEFT || battlerPosition == B_POSITION_PLAYER_RIGHT) + gMultiuseSpriteTemplate.anims = gPlayerMonSpriteAnimsTable; else if (species > 500) - gUnknown_0202499C.anims = gMonAnimationsSpriteAnimsPtrTable[species - 500]; + gMultiuseSpriteTemplate.anims = gMonAnimationsSpriteAnimsPtrTable[species - 500]; else - gUnknown_0202499C.anims = gMonAnimationsSpriteAnimsPtrTable[species]; + gMultiuseSpriteTemplate.anims = gMonAnimationsSpriteAnimsPtrTable[species]; } -void sub_806A12C(u16 trainerSpriteId, u8 battlerPosition) +void SetMultiuseSpriteTemplateToTrainerBack(u16 trainerSpriteId, u8 battlerPosition) { - gUnknown_0202499C.paletteTag = trainerSpriteId; + gMultiuseSpriteTemplate.paletteTag = trainerSpriteId; if (battlerPosition == B_POSITION_PLAYER_LEFT || battlerPosition == B_POSITION_PLAYER_RIGHT) { - gUnknown_0202499C = gUnknown_08329DF8[trainerSpriteId]; - gUnknown_0202499C.anims = gUnknown_08305D0C[trainerSpriteId]; + gMultiuseSpriteTemplate = gUnknown_08329DF8[trainerSpriteId]; + gMultiuseSpriteTemplate.anims = gUnknown_08305D0C[trainerSpriteId]; } else { if (gMonSpritesGfxPtr != NULL) - gUnknown_0202499C = gMonSpritesGfxPtr->templates[battlerPosition]; + gMultiuseSpriteTemplate = gMonSpritesGfxPtr->templates[battlerPosition]; else - gUnknown_0202499C = gUnknown_08329D98[battlerPosition]; - gUnknown_0202499C.anims = gUnknown_0830536C[trainerSpriteId]; + gMultiuseSpriteTemplate = gUnknown_08329D98[battlerPosition]; + gMultiuseSpriteTemplate.anims = gUnknown_0830536C[trainerSpriteId]; } } -void sub_806A1C0(u16 arg0, u8 battlerPosition) +void SetMultiuseSpriteTemplateToTrainerFront(u16 arg0, u8 battlerPosition) { if (gMonSpritesGfxPtr != NULL) - gUnknown_0202499C = gMonSpritesGfxPtr->templates[battlerPosition]; + gMultiuseSpriteTemplate = gMonSpritesGfxPtr->templates[battlerPosition]; else - gUnknown_0202499C = gUnknown_08329D98[battlerPosition]; + gMultiuseSpriteTemplate = gUnknown_08329D98[battlerPosition]; - gUnknown_0202499C.paletteTag = arg0; - gUnknown_0202499C.anims = gUnknown_0830536C[arg0]; + gMultiuseSpriteTemplate.paletteTag = arg0; + gMultiuseSpriteTemplate.anims = gUnknown_0830536C[arg0]; } static void EncryptBoxMon(struct BoxPokemon *boxMon) @@ -3136,7 +3137,8 @@ u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data) void SetMonData(struct Pokemon *mon, s32 field, const void *dataArg) { - const u8* data = dataArg; + const u8 *data = dataArg; + switch (field) { case MON_DATA_STATUS: @@ -3179,7 +3181,7 @@ void SetMonData(struct Pokemon *mon, s32 field, const void *dataArg) void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *dataArg) { - const u8* data = dataArg; + const u8 *data = dataArg; struct PokemonSubstruct0 *substruct0 = NULL; struct PokemonSubstruct1 *substruct1 = NULL; @@ -4511,7 +4513,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem) else holdEffect = ItemId_GetHoldEffect(heldItem); - if (holdEffect == 38 && type != 3) + if (holdEffect == HOLD_EFFECT_PREVENT_EVOLVE && type != 3) return 0; switch (type) @@ -4849,16 +4851,17 @@ u8 GetTrainerEncounterMusicId(u16 trainerOpponentId) { if (InBattlePyramid()) return GetTrainerEncounterMusicIdInBattlePyramind(trainerOpponentId); - if (sub_81D5C18()) + else if (sub_81D5C18()) return sub_81D63C8(trainerOpponentId); - return TRAINER_ENCOUNTER_MUSIC(trainerOpponentId); + else + return TRAINER_ENCOUNTER_MUSIC(trainerOpponentId); } u16 ModifyStatByNature(u8 nature, u16 n, u8 statIndex) { if (statIndex < 1 || statIndex > 5) { - // should just be "return n", but it wouldn't match without this + // Should just be "return n", but it wouldn't match without this. u16 retVal = n; retVal++; retVal--; @@ -5165,7 +5168,7 @@ void PartySpreadPokerus(struct Pokemon *party) { if (pokerus & 0xF) { - // spread to adjacent party members + // Spread to adjacent party members. if (i != 0 && !(GetMonData(&party[i - 1], MON_DATA_POKERUS, 0) & 0xF0)) SetMonData(&party[i - 1], MON_DATA_POKERUS, &curPokerus); if (i != (PARTY_SIZE - 1) && !(GetMonData(&party[i + 1], MON_DATA_POKERUS, 0) & 0xF0)) @@ -5365,11 +5368,11 @@ u16 GetBattleBGM(void) { if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON) return MUS_BATTLE34; - if (gBattleTypeFlags & BATTLE_TYPE_REGI) + else if (gBattleTypeFlags & BATTLE_TYPE_REGI) return MUS_BATTLE36; - if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) + else if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) return MUS_BATTLE20; - if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) + else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) { u8 trainerClass; @@ -5414,7 +5417,8 @@ u16 GetBattleBGM(void) return MUS_BATTLE20; } } - return MUS_BATTLE27; + else + return MUS_BATTLE27; } void PlayBattleBGM(void) @@ -5948,7 +5952,7 @@ static void sub_806F1FC(struct Unknown_806F160_Struct* structPtr) structPtr->frameImages[i * structPtr->field_0_0 + j].data = &structPtr->byteArrays[i][j * 0x800]; } structPtr->templates[i].images = &structPtr->frameImages[i * structPtr->field_0_0]; - structPtr->templates[i].anims = gUnknown_082FF70C; + structPtr->templates[i].anims = gPlayerMonSpriteAnimsTable; structPtr->templates[i].paletteTag = i; } } diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c index 4d5240bc72..60580ef2d7 100644 --- a/src/reshow_battle_screen.c +++ b/src/reshow_battle_screen.c @@ -27,8 +27,7 @@ extern u16 gBattle_BG3_Y; extern const union AnimCmd * const * const gMonAnimationsSpriteAnimsPtrTable[]; -extern void sub_806A068(u16 species, u8 battlerPosition); -extern void sub_806A12C(u16 backPicId, u8 battlerPosition); +extern void SetMultiuseSpriteTemplateToTrainerBack(u16 backPicId, u8 battlerPosition); // this file's functions static void CB2_ReshowBattleScreenAfterMenu(void); @@ -235,8 +234,8 @@ static void CreateBattlerSprite(u8 battler) if (GetMonData(&gEnemyParty[gBattlerPartyIndexes[battler]], MON_DATA_HP) == 0) return; - sub_806A068(GetMonData(&gEnemyParty[gBattlerPartyIndexes[battler]], MON_DATA_SPECIES), GetBattlerPosition(battler)); - gBattlerSpriteIds[battler] = CreateSprite(&gUnknown_0202499C, GetBattlerSpriteCoord(battler, 2), posY, sub_80A82E4(battler)); + SetMultiuseSpriteTemplateToPokemon(GetMonData(&gEnemyParty[gBattlerPartyIndexes[battler]], MON_DATA_SPECIES), GetBattlerPosition(battler)); + gBattlerSpriteIds[battler] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(battler, 2), posY, sub_80A82E4(battler)); gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = battler; gSprites[gBattlerSpriteIds[battler]].callback = SpriteCallbackDummy; gSprites[gBattlerSpriteIds[battler]].data[0] = battler; @@ -248,8 +247,8 @@ static void CreateBattlerSprite(u8 battler) } else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && battler == B_POSITION_PLAYER_LEFT) { - sub_806A12C(gSaveBlock2Ptr->playerGender, GetBattlerPosition(B_POSITION_PLAYER_LEFT)); - gBattlerSpriteIds[battler] = CreateSprite(&gUnknown_0202499C, 0x50, + SetMultiuseSpriteTemplateToTrainerBack(gSaveBlock2Ptr->playerGender, GetBattlerPosition(B_POSITION_PLAYER_LEFT)); + gBattlerSpriteIds[battler] = CreateSprite(&gMultiuseSpriteTemplate, 0x50, (8 - gTrainerBackPicCoords[gSaveBlock2Ptr->playerGender].coords) * 4 + 80, sub_80A82E4(0)); gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = battler; @@ -258,8 +257,8 @@ static void CreateBattlerSprite(u8 battler) } else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && battler == B_POSITION_PLAYER_LEFT) { - sub_806A12C(TRAINER_BACK_PIC_WALLY, GetBattlerPosition(0)); - gBattlerSpriteIds[battler] = CreateSprite(&gUnknown_0202499C, 0x50, + SetMultiuseSpriteTemplateToTrainerBack(TRAINER_BACK_PIC_WALLY, GetBattlerPosition(0)); + gBattlerSpriteIds[battler] = CreateSprite(&gMultiuseSpriteTemplate, 0x50, (8 - gTrainerBackPicCoords[TRAINER_BACK_PIC_WALLY].coords) * 4 + 80, sub_80A82E4(0)); gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = battler; @@ -271,8 +270,8 @@ static void CreateBattlerSprite(u8 battler) if (GetMonData(&gPlayerParty[gBattlerPartyIndexes[battler]], MON_DATA_HP) == 0) return; - sub_806A068(GetMonData(&gPlayerParty[gBattlerPartyIndexes[battler]], MON_DATA_SPECIES), GetBattlerPosition(battler)); - gBattlerSpriteIds[battler] = CreateSprite(&gUnknown_0202499C, GetBattlerSpriteCoord(battler, 2), posY, sub_80A82E4(battler)); + SetMultiuseSpriteTemplateToPokemon(GetMonData(&gPlayerParty[gBattlerPartyIndexes[battler]], MON_DATA_SPECIES), GetBattlerPosition(battler)); + gBattlerSpriteIds[battler] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(battler, 2), posY, sub_80A82E4(battler)); gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = battler; gSprites[gBattlerSpriteIds[battler]].callback = SpriteCallbackDummy; gSprites[gBattlerSpriteIds[battler]].data[0] = battler; From e6d67c7c2299a0c6fa7ec79fa1427c4a1277a6f7 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 1 Jul 2018 15:45:47 +0200 Subject: [PATCH 40/55] give labels to player controller functions --- src/battle_controller_player.c | 66 +++++++++++++++++----------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index ef45b60cd0..992d8656c6 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -122,11 +122,11 @@ static void HandleMoveSwitchting(void); static void sub_8058FC0(void); static void sub_8059828(void); static void CompleteWhenChoseItem(void); -static void sub_8059544(u8 taskId); +static void Task_LaunchLvlUpAnim(u8 taskId); static void Task_PrepareToGiveExpWithExpBar(u8 taskId); static void DestroyExpTaskAndCompleteOnInactiveTextPrinter(u8 taskId); static void sub_8059400(u8 taskId); -static void sub_80595A4(u8 taskId); +static void Task_UpdateLvlInHealthbox(u8 taskId); static void PrintLinkStandbyMsg(void); static u32 CopyPlayerMonData(u8 monId, u8 *dst); static void SetPlayerMonData(u8 monId); @@ -1143,16 +1143,16 @@ static void CompleteOnInactiveTextPrinter(void) #define tExpTask_monId data[0] #define tExpTask_gainedExp data[1] -#define tExpTask_bank data[2] +#define tExpTask_battler data[2] #define tExpTask_frames data[10] static void Task_GiveExpToMon(u8 taskId) { u32 monId = (u8)(gTasks[taskId].tExpTask_monId); - u8 battlerId = gTasks[taskId].tExpTask_bank; + u8 battlerId = gTasks[taskId].tExpTask_battler; s16 gainedExp = gTasks[taskId].tExpTask_gainedExp; - if (IsDoubleBattle() == TRUE || monId != gBattlerPartyIndexes[battlerId]) // give exp without the expbar + if (IsDoubleBattle() == TRUE || monId != gBattlerPartyIndexes[battlerId]) // Give exp without moving the expbar. { struct Pokemon *mon = &gPlayerParty[monId]; u16 species = GetMonData(mon, MON_DATA_SPECIES); @@ -1162,19 +1162,19 @@ static void Task_GiveExpToMon(u8 taskId) if (currExp + gainedExp >= nextLvlExp) { - u8 savedActiveBank; + u8 savedActiveBattler; SetMonData(mon, MON_DATA_EXP, &nextLvlExp); CalculateMonStats(mon); gainedExp -= nextLvlExp - currExp; - savedActiveBank = gActiveBattler; + savedActiveBattler = gActiveBattler; gActiveBattler = battlerId; BtlController_EmitTwoReturnValues(1, RET_VALUE_LEVELLED_UP, gainedExp); - gActiveBattler = savedActiveBank; + gActiveBattler = savedActiveBattler; if (IsDoubleBattle() == TRUE && ((u16)(monId) == gBattlerPartyIndexes[battlerId] || (u16)(monId) == gBattlerPartyIndexes[battlerId ^ BIT_FLANK])) - gTasks[taskId].func = sub_8059544; + gTasks[taskId].func = Task_LaunchLvlUpAnim; else gTasks[taskId].func = DestroyExpTaskAndCompleteOnInactiveTextPrinter; } @@ -1196,7 +1196,7 @@ static void Task_PrepareToGiveExpWithExpBar(u8 taskId) { u8 monIndex = gTasks[taskId].tExpTask_monId; s32 gainedExp = gTasks[taskId].tExpTask_gainedExp; - u8 battlerId = gTasks[taskId].tExpTask_bank; + u8 battlerId = gTasks[taskId].tExpTask_battler; struct Pokemon *mon = &gPlayerParty[monIndex]; u8 level = GetMonData(mon, MON_DATA_LEVEL); u16 species = GetMonData(mon, MON_DATA_SPECIES); @@ -1221,12 +1221,12 @@ static void sub_8059400(u8 taskId) { u8 monId = gTasks[taskId].tExpTask_monId; s16 gainedExp = gTasks[taskId].tExpTask_gainedExp; - u8 battlerId = gTasks[taskId].tExpTask_bank; - s16 r4; + u8 battlerId = gTasks[taskId].tExpTask_battler; + s16 newExpPoints; - r4 = MoveBattleBar(battlerId, gHealthboxSpriteIds[battlerId], EXP_BAR, 0); + newExpPoints = MoveBattleBar(battlerId, gHealthboxSpriteIds[battlerId], EXP_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battlerId]); - if (r4 == -1) + if (newExpPoints == -1) // The bar has been filled with given exp points. { u8 level; s32 currExp; @@ -1241,16 +1241,16 @@ static void sub_8059400(u8 taskId) if (currExp + gainedExp >= expOnNextLvl) { - u8 savedActiveBank; + u8 savedActiveBattler; SetMonData(&gPlayerParty[monId], MON_DATA_EXP, &expOnNextLvl); CalculateMonStats(&gPlayerParty[monId]); gainedExp -= expOnNextLvl - currExp; - savedActiveBank = gActiveBattler; + savedActiveBattler = gActiveBattler; gActiveBattler = battlerId; BtlController_EmitTwoReturnValues(1, RET_VALUE_LEVELLED_UP, gainedExp); - gActiveBattler = savedActiveBank; - gTasks[taskId].func = sub_8059544; + gActiveBattler = savedActiveBattler; + gTasks[taskId].func = Task_LaunchLvlUpAnim; } else { @@ -1263,27 +1263,27 @@ static void sub_8059400(u8 taskId) } } -static void sub_8059544(u8 taskId) +static void Task_LaunchLvlUpAnim(u8 taskId) { - u8 battlerId = gTasks[taskId].tExpTask_bank; + u8 battlerId = gTasks[taskId].tExpTask_battler; u8 monIndex = gTasks[taskId].tExpTask_monId; if (IsDoubleBattle() == TRUE && monIndex == gBattlerPartyIndexes[battlerId ^ BIT_FLANK]) battlerId ^= BIT_FLANK; InitAndLaunchSpecialAnimation(battlerId, battlerId, battlerId, B_ANIM_LVL_UP); - gTasks[taskId].func = sub_80595A4; + gTasks[taskId].func = Task_UpdateLvlInHealthbox; } -static void sub_80595A4(u8 taskId) +static void Task_UpdateLvlInHealthbox(u8 taskId) { - u8 battlerId = gTasks[taskId].tExpTask_bank; + u8 battlerId = gTasks[taskId].tExpTask_battler; if (!gBattleSpritesDataPtr->healthBoxesData[battlerId].specialAnimActive) { u8 monIndex = gTasks[taskId].tExpTask_monId; - GetMonData(&gPlayerParty[monIndex], MON_DATA_LEVEL); // Unused return value + GetMonData(&gPlayerParty[monIndex], MON_DATA_LEVEL); // Unused return value. if (IsDoubleBattle() == TRUE && monIndex == gBattlerPartyIndexes[battlerId ^ BIT_FLANK]) UpdateHealthboxAttribute(gHealthboxSpriteIds[battlerId ^ BIT_FLANK], &gPlayerParty[monIndex], HEALTHBOX_ALL); @@ -1300,8 +1300,8 @@ static void DestroyExpTaskAndCompleteOnInactiveTextPrinter(u8 taskId) u8 battlerId; monIndex = gTasks[taskId].tExpTask_monId; - GetMonData(&gPlayerParty[monIndex], MON_DATA_LEVEL); // Unused return value - battlerId = gTasks[taskId].tExpTask_bank; + GetMonData(&gPlayerParty[monIndex], MON_DATA_LEVEL); // Unused return value. + battlerId = gTasks[taskId].tExpTask_battler; gBattlerControllerFuncs[battlerId] = CompleteOnInactiveTextPrinter; DestroyTask(taskId); } @@ -2466,7 +2466,7 @@ static void PlayerHandleMoveAnimation(void) gWeatherMoveAnim = gBattleBufferA[gActiveBattler][12] | (gBattleBufferA[gActiveBattler][13] << 8); gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBattler][16]; gTransformedPersonalities[gActiveBattler] = gAnimDisableStructPtr->transformedMonPersonality; - if (IsMoveWithoutAnimation(move, gAnimMoveTurn)) // always returns FALSE + if (IsMoveWithoutAnimation(move, gAnimMoveTurn)) // Always returns FALSE. { PlayerBufferExecCompleted(); } @@ -2722,19 +2722,19 @@ static void PlayerHandleExpUpdate(void) u8 taskId; LoadBattleBarGfx(1); - GetMonData(&gPlayerParty[monId], MON_DATA_SPECIES); // unused return value - expPointsToGive = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8); + GetMonData(&gPlayerParty[monId], MON_DATA_SPECIES); // Unused return value. + expPointsToGive = T1_READ_16(&gBattleBufferA[gActiveBattler][2]); taskId = CreateTask(Task_GiveExpToMon, 10); gTasks[taskId].tExpTask_monId = monId; gTasks[taskId].tExpTask_gainedExp = expPointsToGive; - gTasks[taskId].tExpTask_bank = gActiveBattler; + gTasks[taskId].tExpTask_battler = gActiveBattler; gBattlerControllerFuncs[gActiveBattler] = nullsub_21; } } #undef tExpTask_monId #undef tExpTask_gainedExp -#undef tExpTask_bank +#undef tExpTask_battler #undef tExpTask_frames static void PlayerHandleStatusIconUpdate(void) @@ -2971,7 +2971,7 @@ static void task05_08033660(u8 taskId) } else { - u8 savedActiveBank = gActiveBattler; + u8 savedActiveBattler = gActiveBattler; gActiveBattler = gTasks[taskId].data[0]; if (!IsDoubleBattle() || (gBattleTypeFlags & BATTLE_TYPE_MULTI)) @@ -2990,7 +2990,7 @@ static void task05_08033660(u8 taskId) gActiveBattler ^= BIT_FLANK; } gBattlerControllerFuncs[gActiveBattler] = sub_8058B40; - gActiveBattler = savedActiveBank; + gActiveBattler = savedActiveBattler; DestroyTask(taskId); } } From f79ac26ce36197ddf98ab18b6699c76039ec68db Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Thu, 5 Jul 2018 20:33:07 -0700 Subject: [PATCH 41/55] Rename SetLastTalkedObjectInFrontOfPlayer to CheckObjectGraphicsInFrontOfPlayer --- include/rom6.h | 2 +- src/fldeff_cut.c | 4 ++-- src/fldeff_strength.c | 2 +- src/rom6.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/rom6.h b/include/rom6.h index 629df57fe8..96c3b3ca2b 100644 --- a/include/rom6.h +++ b/include/rom6.h @@ -12,7 +12,7 @@ void UpdateFrontierManiac(u16 days); void UpdateFrontierGambler(u16 days); void SetShoalItemFlag(u16 days); -bool8 SetLastTalkedObjectInFrontOfPlayer(u8); +bool8 CheckObjectGraphicsInFrontOfPlayer(u8); u8 oei_task_add(void); #endif //GUARD_ROM6_H diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index c2f5e77319..9de954e80e 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -19,7 +19,7 @@ #include "constants/songs.h" #include "constants/abilities.h" -extern bool8 SetLastTalkedObjectInFrontOfPlayer(u8); +extern bool8 CheckObjectGraphicsInFrontOfPlayer(u8); extern u8 oei_task_add(void); extern void ScriptUnfreezeEventObjects(void); extern bool8 IsMewPlayingHideAndSeek(void); @@ -183,7 +183,7 @@ bool8 SetUpFieldMove_Cut(void) bool8 cutTiles[CUT_NORMAL_AREA]; bool8 ret; - if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_CUTTABLE_TREE) == TRUE) + if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_CUTTABLE_TREE) == TRUE) { // Standing in front of cuttable tree. gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index ae7b557d8d..74eb100bca 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -15,7 +15,7 @@ static void sub_8145E74(void); // text bool8 SetUpFieldMove_Strength(void) { - if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_PUSHABLE_BOULDER) == TRUE) + if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_PUSHABLE_BOULDER) == TRUE) { gSpecialVar_Result = GetCursorSelectionMonId(); gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; diff --git a/src/rom6.c b/src/rom6.c index 6c74396224..78cbbe2de5 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -30,7 +30,7 @@ static void sub_8135780(void); extern struct MapPosition gPlayerFacingPosition; // text -bool8 SetLastTalkedObjectInFrontOfPlayer(u8 a) +bool8 CheckObjectGraphicsInFrontOfPlayer(u8 a) { u8 eventObjId; @@ -125,7 +125,7 @@ bool8 SetUpFieldMove_RockSmash(void) gPostMenuFieldCallback = sub_8179834; return TRUE; } - else if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_BREAKABLE_ROCK) == TRUE) + else if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_BREAKABLE_ROCK) == TRUE) { gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; gPostMenuFieldCallback = sub_81356C4; From 1c48e585747de0a2273c4b3eb4be114d5214b8a2 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 7 Jul 2018 14:24:19 +0200 Subject: [PATCH 42/55] small fixes --- include/battle_message.h | 7 +++++++ include/constants/items.h | 4 ++-- include/text.h | 10 ++++++++++ src/battle_message.c | 9 ++++++++- src/fieldmap.c | 6 +++--- src/item.c | 2 +- src/item_icon.c | 2 +- 7 files changed, 32 insertions(+), 8 deletions(-) diff --git a/include/battle_message.h b/include/battle_message.h index cccbae841e..147bfa501c 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -248,6 +248,13 @@ extern const u8 gText_BattleSwitchWhich4[]; extern const u8 gText_BattleSwitchWhich5[]; extern const u8 gText_SafariBalls[]; extern const u8 gText_SafariBallLeft[]; +extern const u8 gText_Sleep[]; +extern const u8 gText_Poison[]; +extern const u8 gText_Burn[]; +extern const u8 gText_Paralysis[]; +extern const u8 gText_Ice[]; +extern const u8 gText_Confusion[]; +extern const u8 gText_Love[]; extern const u8 gText_SpaceAndSpace[]; extern const u8 gText_CommaSpace[]; extern const u8 gText_Space2[]; diff --git a/include/constants/items.h b/include/constants/items.h index 4ca5cb7df4..294499c8bc 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -462,8 +462,8 @@ #define ITEM_MAGMA_EMBLEM 375 #define ITEM_OLD_SEA_MAP 376 -#define ITEM_LAST_ID 376 -#define ITEM_FIELD_ARROW ITEM_LAST_ID + 1 +#define ITEMS_COUNT 377 +#define ITEM_FIELD_ARROW ITEMS_COUNT #define FIRST_BERRY_INDEX ITEM_CHERI_BERRY #define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY diff --git a/include/text.h b/include/text.h index 2566b51b77..07a2017b46 100644 --- a/include/text.h +++ b/include/text.h @@ -2,7 +2,17 @@ #define GUARD_TEXT_H #define CHAR_SPACE 0x00 +#define CHAR_PLUS 0x2E #define CHAR_0 0xA1 +#define CHAR_1 0xA2 +#define CHAR_2 0xA3 +#define CHAR_3 0xA4 +#define CHAR_4 0xA5 +#define CHAR_5 0xA6 +#define CHAR_6 0xA7 +#define CHAR_7 0xA8 +#define CHAR_8 0xA9 +#define CHAR_9 0xAA #define CHAR_QUESTION_MARK 0xAC #define CHAR_PERIOD 0xAD #define CHAR_HYPHEN 0xAE diff --git a/src/battle_message.c b/src/battle_message.c index 7d442ea98f..32097fd761 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -1197,7 +1197,14 @@ const u8 * const gStatNamesTable2[] = }; const u8 gText_SafariBalls[] = _("{HIGHLIGHT DARK_GREY}SAFARI BALLS"); -const u8 gText_SafariBallLeft[] = _("{HIGHLIGHT DARK_GREY}Left: $" "{HIGHLIGHT DARK_GREY}");const u8 gText_Sleep[] = _( "sleep");const u8 gText_Poison[] = _( "poison");const u8 gText_Burn[] = _( "burn");const u8 gText_Paralysis[] = _( "paralysis");const u8 gText_Ice[] = _( "ice");const u8 gText_Confusion[] = _( "confusion");const u8 gText_Love[] = _( "love"); +const u8 gText_SafariBallLeft[] = _("{HIGHLIGHT DARK_GREY}Left: $" "{HIGHLIGHT DARK_GREY}"); +const u8 gText_Sleep[] = _("sleep"); +const u8 gText_Poison[] = _("poison"); +const u8 gText_Burn[] = _("burn"); +const u8 gText_Paralysis[] = _("paralysis"); +const u8 gText_Ice[] = _("ice"); +const u8 gText_Confusion[] = _("confusion"); +const u8 gText_Love[] = _("love"); const u8 gText_SpaceAndSpace[] = _(" and "); const u8 gText_CommaSpace[] = _(", "); const u8 gText_Space2[] = _(" "); diff --git a/src/fieldmap.c b/src/fieldmap.c index 2561bceb70..f57c4b48f1 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -380,7 +380,7 @@ u8 MapGridGetZCoordAt(int x, int y) { return 0; } - + return block >> 12; } @@ -559,7 +559,7 @@ void mapdata_from_sav2(void) a0 = 1; else a0 = -1; - + for (j = x; j < x + 15; j++) { if (!sub_8088BF0(&gUnknown_02032318[j + width * i], width, a0)) @@ -922,7 +922,7 @@ bool8 sub_8088BF0(u16* a0, u16 a1, u8 a2) { if (a2 == 0xFF) return FALSE; - + if (a2 == 0) a0 -= a1; else diff --git a/src/item.c b/src/item.c index 30710d08ac..c94f29910f 100644 --- a/src/item.c +++ b/src/item.c @@ -1024,7 +1024,7 @@ bool8 RemovePyramidBagItem(u16 itemId, u16 count) static u16 SanitizeItemId(u16 itemId) { - if (itemId >= ITEM_LAST_ID + 1) + if (itemId >= ITEMS_COUNT) return ITEM_NONE; else return itemId; diff --git a/src/item_icon.c b/src/item_icon.c index d6fedf892b..68ec1daf0a 100644 --- a/src/item_icon.c +++ b/src/item_icon.c @@ -162,7 +162,7 @@ const void *GetItemIconPicOrPalette(u16 itemId, u8 which) { if (itemId == 0xFFFF) itemId = ITEM_FIELD_ARROW; - else if (itemId > ITEM_LAST_ID) + else if (itemId >= ITEMS_COUNT) itemId = 0; return gItemIconTable[itemId][which]; From 008d961b2a3d2d145f9ff8e7515cfb4f5e04128c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 7 Jul 2018 19:57:09 +0200 Subject: [PATCH 43/55] add party menu defines --- asm/party_menu.s | 8 ++++---- include/battle.h | 6 +++--- include/battle_controllers.h | 7 +++++-- include/party_menu.h | 13 +++++++++++++ include/pokemon.h | 2 +- src/battle_controller_player.c | 26 +++++++++++++------------- src/battle_controllers.c | 4 ++-- src/battle_main.c | 31 ++++++++++++++++--------------- src/battle_script_commands.c | 7 ++++--- src/battle_util.c | 4 ++-- src/pokemon.c | 12 ++++++------ 11 files changed, 69 insertions(+), 51 deletions(-) diff --git a/asm/party_menu.s b/asm/party_menu.s index 6e90fa3c3d..017f1dc549 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -16079,8 +16079,8 @@ _081B89A6: bx r1 thumb_func_end sub_81B8984 - thumb_func_start sub_81B89AC -sub_81B89AC: @ 81B89AC + thumb_func_start OpenPartyMenuInBattle +OpenPartyMenuInBattle: @ 81B89AC push {r4,lr} sub sp, 0xC adds r4, r0, 0 @@ -16107,7 +16107,7 @@ sub_81B89AC: @ 81B89AC pop {r0} bx r0 .pool - thumb_func_end sub_81B89AC + thumb_func_end OpenPartyMenuInBattle thumb_func_start sub_81B89F0 sub_81B89F0: @ 81B89F0 @@ -16288,7 +16288,7 @@ _081B8B94: ldrb r0, [r0, 0xB] cmp r0, 0x4 bne _081B8BA8 - bl sub_806E994 + bl SetMonPreventsSwitchingString b _081B8C46 .pool _081B8BA8: diff --git a/include/battle.h b/include/battle.h index 6e941191f5..fba5fb460a 100644 --- a/include/battle.h +++ b/include/battle.h @@ -177,7 +177,7 @@ struct ProtectStruct /* field_0 */ u32 protected:1; u32 endured:1; - u32 onlyStruggle:1; + u32 noValidMoves:1; u32 helpingHand:1; u32 bounceMove:1; u32 stealMove:1; @@ -456,7 +456,7 @@ struct BattleStruct u8 field_46; u8 field_47; u8 focusPunchBattlerId; - u8 field_49; + u8 battlerPreventingSwitchout; u8 moneyMultiplier; u8 savedTurnActionNumber; u8 switchInAbilitiesCounter; @@ -509,7 +509,7 @@ struct BattleStruct u8 field_A7; u16 hpOnSwitchout[2]; u32 savedBattleTypeFlags; - u8 field_B0; + u8 abilityPreventingSwitchout; u8 hpScale; u8 synchronizeMoveEffect; bool8 anyMonHasTransformed; diff --git a/include/battle_controllers.h b/include/battle_controllers.h index 61e2935b7a..8ba45fad14 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -65,6 +65,8 @@ enum REQUEST_TOUGH_RIBBON_BATTLE, }; +// Special arguments for Battle Controller functions. + #define RESET_ACTION_MOVE_SELECTION 0 #define RESET_ACTION_SELECTION 1 #define RESET_MOVE_SELECTION 2 @@ -76,10 +78,11 @@ enum #define BALL_3_SHAKES_SUCCESS 4 #define BALL_TRAINER_BLOCK 5 -#define RET_VALUE_LEVELLED_UP 11 - #define INSTANT_HP_BAR_DROP 32767 +// Special return values in gBattleBufferB from Battle Controller functions. +#define RET_VALUE_LEVELLED_UP 11 + struct UnusedControllerStruct { u8 field_0:7; diff --git a/include/party_menu.h b/include/party_menu.h index 2cf17f1e40..fd52f8d4dd 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -1,6 +1,8 @@ #ifndef GUARD_PARTY_MENU_H #define GUARD_PARTY_MENU_H + #include "task.h" + enum { AILMENT_NONE, @@ -11,6 +13,16 @@ enum AILMENT_BRN }; +enum +{ + PARTY_CHOOSE_MON, + PARTY_MUST_CHOOSE_MON, + PARTY_CANT_SWITCH, + PARTY_USE_ITEM_ON, + PARTY_ABILITY_PREVENTS, + PARTY_GIVE_ITEM, +}; + struct Struct203CEC8 { u8 filler[0x9]; @@ -38,5 +50,6 @@ void sub_81B1F18(u8 taskId, u8 pokemonIdx, s8 a, s16 hp, TaskFunc func); void sub_81B1B5C(void *a, u8 b); u8 sub_81B1BD4(); void sub_81B8448(); +void OpenPartyMenuInBattle(u8 caseId); #endif // GUARD_PARTY_MENU_H diff --git a/include/pokemon.h b/include/pokemon.h index f36284f12a..a60ad66bed 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -593,7 +593,7 @@ bool8 IsTradedMon(struct Pokemon *mon); bool8 IsOtherTrainer(u32 otId, u8 *otName); void MonRestorePP(struct Pokemon *mon); void BoxMonRestorePP(struct BoxPokemon *boxMon); -void sub_806E994(void); +void SetMonPreventsSwitchingString(void); void SetWildMonHeldItem(void); bool8 IsMonShiny(struct Pokemon *mon); bool8 IsShinyOtIdPersonality(u32 otId, u32 personality); diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 992d8656c6..8f69dab068 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -30,6 +30,7 @@ #include "battle_setup.h" #include "item_use.h" #include "recorded_battle.h" +#include "party_menu.h" extern u8 gUnknown_0203CEE8; extern u8 gUnknown_0203CEE9; @@ -45,7 +46,6 @@ extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern void sub_81B89AC(u8 arg0); extern void sub_81AABB0(void); extern void sub_81A57E4(u8 battlerId, u16 stringId); extern void sub_81851A8(u8 *); @@ -120,7 +120,7 @@ static void MoveSelectionDisplayMoveType(void); static void MoveSelectionDisplayMoveNames(void); static void HandleMoveSwitchting(void); static void sub_8058FC0(void); -static void sub_8059828(void); +static void WaitForMonSelection(void); static void CompleteWhenChoseItem(void); static void Task_LaunchLvlUpAnim(u8 taskId); static void Task_PrepareToGiveExpWithExpBar(u8 taskId); @@ -1337,21 +1337,21 @@ static void CompleteOnInactiveTextPrinter2(void) PlayerBufferExecCompleted(); } -static void sub_80597CC(void) +static void OpenPartyMenuToChooseMon(void) { if (!gPaletteFade.active) { - u8 r4; + u8 caseId; - gBattlerControllerFuncs[gActiveBattler] = sub_8059828; - r4 = gTasks[gUnknown_03005D7C[gActiveBattler]].data[0]; + gBattlerControllerFuncs[gActiveBattler] = WaitForMonSelection; + caseId = gTasks[gUnknown_03005D7C[gActiveBattler]].data[0]; DestroyTask(gUnknown_03005D7C[gActiveBattler]); FreeAllWindowBuffers(); - sub_81B89AC(r4); + OpenPartyMenuInBattle(caseId); } } -static void sub_8059828(void) +static void WaitForMonSelection(void) { if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active) { @@ -2655,7 +2655,7 @@ static void PlayerHandleChoosePokemon(void) for (i = 0; i < 3; i++) gUnknown_0203CF00[i] = gBattleBufferA[gActiveBattler][4 + i]; - if (gBattleTypeFlags & BATTLE_TYPE_ARENA && (gBattleBufferA[gActiveBattler][1] & 0xF) != 2) + if (gBattleTypeFlags & BATTLE_TYPE_ARENA && (gBattleBufferA[gActiveBattler][1] & 0xF) != PARTY_CANT_SWITCH) { BtlController_EmitChosenMonReturnValue(1, gBattlerPartyIndexes[gActiveBattler] + 1, gUnknown_0203CF00); PlayerBufferExecCompleted(); @@ -2664,11 +2664,11 @@ static void PlayerHandleChoosePokemon(void) { gUnknown_03005D7C[gActiveBattler] = CreateTask(TaskDummy, 0xFF); gTasks[gUnknown_03005D7C[gActiveBattler]].data[0] = gBattleBufferA[gActiveBattler][1] & 0xF; - *(&gBattleStruct->field_49) = gBattleBufferA[gActiveBattler][1] >> 4; + *(&gBattleStruct->battlerPreventingSwitchout) = gBattleBufferA[gActiveBattler][1] >> 4; *(&gBattleStruct->field_8B) = gBattleBufferA[gActiveBattler][2]; - *(&gBattleStruct->field_B0) = gBattleBufferA[gActiveBattler][3]; - BeginNormalPaletteFade(-1, 0, 0, 16, 0); - gBattlerControllerFuncs[gActiveBattler] = sub_80597CC; + *(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3]; + BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon; gBattlerInMenuId = gActiveBattler; } } diff --git a/src/battle_controllers.c b/src/battle_controllers.c index c841aaa034..1ce5d30998 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -1181,7 +1181,7 @@ void BtlController_EmitChooseItem(u8 bufferId, u8 *arg1) PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 4); } -void BtlController_EmitChoosePokemon(u8 bufferId, u8 caseId, u8 arg2, u8 abilityId, u8* arg4) +void BtlController_EmitChoosePokemon(u8 bufferId, u8 caseId, u8 arg2, u8 abilityId, u8 *arg4) { s32 i; @@ -1191,7 +1191,7 @@ void BtlController_EmitChoosePokemon(u8 bufferId, u8 caseId, u8 arg2, u8 ability sBattleBuffersTransferData[3] = abilityId; for (i = 0; i < 3; i++) sBattleBuffersTransferData[4 + i] = arg4[i]; - PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 8); // but only 7 bytes were written + PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 8); // Only 7 bytes were written. } void BtlController_EmitCmd23(u8 bufferId) diff --git a/src/battle_main.c b/src/battle_main.c index 591c299d7e..fe6e62c5d8 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -51,6 +51,7 @@ #include "decompress.h" #include "international_string_util.h" #include "pokeball.h" +#include "party_menu.h" struct UnknownPokemonStruct4 { @@ -3232,7 +3233,7 @@ void FaintClearSetData(void) gProtectStructs[gActiveBattler].protected = 0; gProtectStructs[gActiveBattler].endured = 0; - gProtectStructs[gActiveBattler].onlyStruggle = 0; + gProtectStructs[gActiveBattler].noValidMoves = 0; gProtectStructs[gActiveBattler].helpingHand = 0; gProtectStructs[gActiveBattler].bounceMove = 0; gProtectStructs[gActiveBattler].stealMove = 0; @@ -4141,11 +4142,11 @@ static void HandleTurnActionSelectionState(void) u8 position = GetBattlerPosition(gActiveBattler); switch (gBattleCommunication[gActiveBattler]) { - case STATE_TURN_START_RECORD: // recorded battle related on start of every turn + case STATE_TURN_START_RECORD: // Recorded battle related action on start of every turn. RecordedBattle_CopyBattlerMoves(); gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN; break; - case STATE_BEFORE_ACTION_CHOSEN: // choose an action + case STATE_BEFORE_ACTION_CHOSEN: // Choose an action. *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = PARTY_SIZE; if (gBattleTypeFlags & BATTLE_TYPE_MULTI || (position & BIT_FLANK) == B_FLANK_LEFT @@ -4177,7 +4178,7 @@ static void HandleTurnActionSelectionState(void) } } break; - case STATE_WAIT_ACTION_CHOSEN: // try to perform an action + case STATE_WAIT_ACTION_CHOSEN: // Try to perform an action. if (!(gBattleControllerExecFlags & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC)))) { RecordedBattle_SetBattlerAction(gActiveBattler, gBattleBufferB[gActiveBattler][1]); @@ -4248,7 +4249,7 @@ static void HandleTurnActionSelectionState(void) || gBattleTypeFlags & BATTLE_TYPE_ARENA || gStatuses3[gActiveBattler] & STATUS3_ROOTED) { - BtlController_EmitChoosePokemon(0, 2, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]); + BtlController_EmitChoosePokemon(0, PARTY_CANT_SWITCH, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]); } else if ((i = ABILITY_ON_OPPOSING_FIELD(gActiveBattler, ABILITY_SHADOW_TAG)) || ((i = ABILITY_ON_OPPOSING_FIELD(gActiveBattler, ABILITY_ARENA_TRAP)) @@ -4257,16 +4258,16 @@ static void HandleTurnActionSelectionState(void) || ((i = AbilityBattleEffects(ABILITYEFFECT_CHECK_FIELD_EXCEPT_BATTLER, gActiveBattler, ABILITY_MAGNET_PULL, 0, 0)) && IS_BATTLER_OF_TYPE(gActiveBattler, TYPE_STEEL))) { - BtlController_EmitChoosePokemon(0, ((i - 1) << 4) | 4, 6, gLastUsedAbility, gBattleStruct->field_60[gActiveBattler]); + BtlController_EmitChoosePokemon(0, ((i - 1) << 4) | PARTY_ABILITY_PREVENTS, 6, gLastUsedAbility, gBattleStruct->field_60[gActiveBattler]); } else { if (gActiveBattler == 2 && gChosenActionByBattler[0] == B_ACTION_SWITCH) - BtlController_EmitChoosePokemon(0, 0, *(gBattleStruct->monToSwitchIntoId + 0), ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]); + BtlController_EmitChoosePokemon(0, PARTY_CHOOSE_MON, *(gBattleStruct->monToSwitchIntoId + 0), ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]); else if (gActiveBattler == 3 && gChosenActionByBattler[1] == B_ACTION_SWITCH) - BtlController_EmitChoosePokemon(0, 0, *(gBattleStruct->monToSwitchIntoId + 1), ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]); + BtlController_EmitChoosePokemon(0, PARTY_CHOOSE_MON, *(gBattleStruct->monToSwitchIntoId + 1), ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]); else - BtlController_EmitChoosePokemon(0, 0, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]); + BtlController_EmitChoosePokemon(0, PARTY_CHOOSE_MON, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]); } MarkBattlerForControllerExec(gActiveBattler); break; @@ -4304,7 +4305,7 @@ static void HandleTurnActionSelectionState(void) RecordedBattle_ClearBattlerAction(GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler))), 1); } else if (gChosenActionByBattler[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))] == B_ACTION_USE_MOVE - && (gProtectStructs[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))].onlyStruggle + && (gProtectStructs[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))].noValidMoves || gDisableStructs[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))].encoredMove)) { RecordedBattle_ClearBattlerAction(GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler))), 1); @@ -4705,7 +4706,7 @@ u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves) { if (gChosenActionByBattler[battler1] == B_ACTION_USE_MOVE) { - if (gProtectStructs[battler1].onlyStruggle) + if (gProtectStructs[battler1].noValidMoves) moveBattler1 = MOVE_STRUGGLE; else moveBattler1 = gBattleMons[battler1].moves[*(gBattleStruct->chosenMovePositions + battler1)]; @@ -4715,7 +4716,7 @@ u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves) if (gChosenActionByBattler[battler2] == B_ACTION_USE_MOVE) { - if (gProtectStructs[battler2].onlyStruggle) + if (gProtectStructs[battler2].noValidMoves) moveBattler2 = MOVE_STRUGGLE; else moveBattler2 = gBattleMons[battler2].moves[*(gBattleStruct->chosenMovePositions + battler2)]; @@ -4917,7 +4918,7 @@ static void CheckFocusPunch_ClearVarsBeforeTurnStarts(void) if (gChosenMoveByBattler[gActiveBattler] == MOVE_FOCUS_PUNCH && !(gBattleMons[gActiveBattler].status1 & STATUS1_SLEEP) && !(gDisableStructs[gBattlerAttacker].truantCounter) - && !(gProtectStructs[gActiveBattler].onlyStruggle)) + && !(gProtectStructs[gActiveBattler].noValidMoves)) { BattleScriptExecute(BattleScript_FocusPunchSetUp); return; @@ -5290,9 +5291,9 @@ static void HandleAction_UseMove(void) gCurrMovePos = gChosenMovePos = *(gBattleStruct->chosenMovePositions + gBattlerAttacker); // choose move - if (gProtectStructs[gBattlerAttacker].onlyStruggle) + if (gProtectStructs[gBattlerAttacker].noValidMoves) { - gProtectStructs[gBattlerAttacker].onlyStruggle = 0; + gProtectStructs[gBattlerAttacker].noValidMoves = 0; gCurrentMove = gChosenMove = MOVE_STRUGGLE; gHitMarker |= HITMARKER_NO_PPDEDUCT; *(gBattleStruct->moveTarget + gBattlerAttacker) = GetMoveTarget(MOVE_STRUGGLE, 0); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index bacaf2bace..eb6feb2a07 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -40,6 +40,7 @@ #include "constants/battle_string_ids.h" #include "battle_setup.h" #include "overworld.h" +#include "party_menu.h" extern u16 gBattle_BG1_X; extern u16 gBattle_BG1_Y; @@ -5143,7 +5144,7 @@ static void sub_804CF10(u8 arg0) *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = 6; gBattleStruct->field_93 &= ~(gBitTable[gActiveBattler]); - BtlController_EmitChoosePokemon(0, 1, arg0, 0, gBattleStruct->field_60[gActiveBattler]); + BtlController_EmitChoosePokemon(0, PARTY_MUST_CHOOSE_MON, arg0, 0, gBattleStruct->field_60[gActiveBattler]); MarkBattlerForControllerExec(gActiveBattler); } @@ -5382,9 +5383,9 @@ static void atk50_openpartyscreen(void) else { if (gBattlescriptCurrInstr[1] & 0x80) - hitmarkerFaintBits = 0; // used here as the caseId for the EmitChoose function + hitmarkerFaintBits = PARTY_CHOOSE_MON; // Used here as the caseId for the EmitChoose function. else - hitmarkerFaintBits = 1; + hitmarkerFaintBits = PARTY_MUST_CHOOSE_MON; battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(0x80)); if (gSpecialStatuses[battlerId].flag40) diff --git a/src/battle_util.c b/src/battle_util.c index 5d2ec62a9a..6e3fc3e7fd 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -455,12 +455,12 @@ bool8 AreAllMovesUnusable(void) if (unusable == 0xF) // All moves are unusable. { - gProtectStructs[gActiveBattler].onlyStruggle = 1; + gProtectStructs[gActiveBattler].noValidMoves = 1; gSelectionBattleScripts[gActiveBattler] = BattleScript_NoMovesLeft; } else { - gProtectStructs[gActiveBattler].onlyStruggle = 0; + gProtectStructs[gActiveBattler].noValidMoves = 0; } return (unusable == 0xF); diff --git a/src/pokemon.c b/src/pokemon.c index 80c1ab7846..5406cfee99 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -5582,19 +5582,19 @@ void BoxMonRestorePP(struct BoxPokemon *boxMon) } } -void sub_806E994(void) +void SetMonPreventsSwitchingString(void) { - gLastUsedAbility = gBattleStruct->field_B0; + gLastUsedAbility = gBattleStruct->abilityPreventingSwitchout; gBattleTextBuff1[0] = B_BUFF_PLACEHOLDER_BEGIN; gBattleTextBuff1[1] = B_BUFF_MON_NICK_WITH_PREFIX; - gBattleTextBuff1[2] = gBattleStruct->field_49; + gBattleTextBuff1[2] = gBattleStruct->battlerPreventingSwitchout; gBattleTextBuff1[4] = B_BUFF_EOS; - if (!GetBattlerSide(gBattleStruct->field_49)) - gBattleTextBuff1[3] = pokemon_order_func(gBattlerPartyIndexes[gBattleStruct->field_49]); + if (GetBattlerSide(gBattleStruct->battlerPreventingSwitchout) == B_SIDE_PLAYER) + gBattleTextBuff1[3] = pokemon_order_func(gBattlerPartyIndexes[gBattleStruct->battlerPreventingSwitchout]); else - gBattleTextBuff1[3] = gBattlerPartyIndexes[gBattleStruct->field_49]; + gBattleTextBuff1[3] = gBattlerPartyIndexes[gBattleStruct->battlerPreventingSwitchout]; PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff2, gBattlerInMenuId, pokemon_order_func(gBattlerPartyIndexes[gBattlerInMenuId])) From ee3d505b585c5d0a8b6a8a68b8ab787d04bdc33a Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 7 Jul 2018 21:14:41 +0200 Subject: [PATCH 44/55] little touches for HandleTurnActionSelectionState --- src/battle_main.c | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/src/battle_main.c b/src/battle_main.c index fe6e62c5d8..88422574f8 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -163,7 +163,7 @@ static void HandleTurnActionSelectionState(void); static void RunTurnActionsFunctions(void); static void SetActionsAndBattlersTurnOrder(void); static void sub_803CDF8(void); -static bool8 sub_803CDB8(void); +static bool8 AllAtActionConfirmed(void); static void CheckFocusPunch_ClearVarsBeforeTurnStarts(void); static void FreeResetData_ReturnToOvOrDoEvolutions(void); static void ReturnFromBattleToOverworld(void); @@ -4286,8 +4286,8 @@ static void HandleTurnActionSelectionState(void) MarkBattlerForControllerExec(gActiveBattler); break; case B_ACTION_CANCEL_PARTNER: - gBattleCommunication[gActiveBattler] = 7; - gBattleCommunication[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))] = 1; + gBattleCommunication[gActiveBattler] = STATE_WAIT_SET_BEFORE_ACTION; + gBattleCommunication[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))] = STATE_BEFORE_ACTION_CHOSEN; RecordedBattle_ClearBattlerAction(gActiveBattler, 1); if (gBattleMons[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))].status2 & STATUS2_MULTIPLETURNS || gBattleMons[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))].status2 & STATUS2_RECHARGE) @@ -4330,7 +4330,7 @@ static void HandleTurnActionSelectionState(void) && gBattleBufferB[gActiveBattler][1] == B_ACTION_RUN) { gSelectionBattleScripts[gActiveBattler] = BattleScript_AskIfWantsToForfeitMatch; - gBattleCommunication[gActiveBattler] = 8; + gBattleCommunication[gActiveBattler] = STATE_SELECTION_SCRIPT_MAY_RUN; *(gBattleStruct->selectionScriptFinished + gActiveBattler) = FALSE; *(gBattleStruct->stateIdAfterSelScript + gActiveBattler) = STATE_BEFORE_ACTION_CHOSEN; return; @@ -4340,7 +4340,7 @@ static void HandleTurnActionSelectionState(void) && gBattleBufferB[gActiveBattler][1] == B_ACTION_RUN) { BattleScriptExecute(BattleScript_PrintCantRunFromTrainer); - gBattleCommunication[gActiveBattler] = 1; + gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN; } else if (IsRunningFromBattleImpossible() && gBattleBufferB[gActiveBattler][1] == B_ACTION_RUN) @@ -4382,7 +4382,7 @@ static void HandleTurnActionSelectionState(void) sub_818603C(2); if ((gBattleBufferB[gActiveBattler][2] | (gBattleBufferB[gActiveBattler][3] << 8)) == 0xFFFF) { - gBattleCommunication[gActiveBattler] = 1; + gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN; RecordedBattle_ClearBattlerAction(gActiveBattler, 1); } else if (TrySetCantSelectMoveBattleScript()) @@ -4412,7 +4412,7 @@ static void HandleTurnActionSelectionState(void) case B_ACTION_USE_ITEM: if ((gBattleBufferB[gActiveBattler][1] | (gBattleBufferB[gActiveBattler][2] << 8)) == 0) { - gBattleCommunication[gActiveBattler] = 1; + gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN; } else { @@ -4423,7 +4423,7 @@ static void HandleTurnActionSelectionState(void) case B_ACTION_SWITCH: if (gBattleBufferB[gActiveBattler][1] == PARTY_SIZE) { - gBattleCommunication[gActiveBattler] = 1; + gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN; RecordedBattle_ClearBattlerAction(gActiveBattler, 1); } else @@ -4468,10 +4468,13 @@ static void HandleTurnActionSelectionState(void) case STATE_WAIT_ACTION_CONFIRMED_STANDBY: if (!(gBattleControllerExecFlags & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC)))) { - i = (sub_803CDB8() != 0); + if (AllAtActionConfirmed()) + i = TRUE; + else + i = FALSE; if (((gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_DOUBLE)) != BATTLE_TYPE_DOUBLE) - || (position & BIT_FLANK) + || (position & BIT_FLANK) != B_FLANK_LEFT || (*(&gBattleStruct->field_91) & gBitTable[GetBattlerAtPosition(position ^ BIT_FLANK)])) { BtlController_EmitLinkStandbyMsg(0, 0, i); @@ -4509,7 +4512,7 @@ static void HandleTurnActionSelectionState(void) case STATE_WAIT_SET_BEFORE_ACTION: if (!(gBattleControllerExecFlags & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC)))) { - gBattleCommunication[gActiveBattler] = 1; + gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN; } break; case STATE_SELECTION_SCRIPT_MAY_RUN: @@ -4541,7 +4544,7 @@ static void HandleTurnActionSelectionState(void) } } - // check if everyone chose actions + // Check if everyone chose actions. if (gBattleCommunication[ACTIONS_CONFIRMED_COUNT] == gBattlersCount) { sub_818603C(1); @@ -4558,17 +4561,17 @@ static void HandleTurnActionSelectionState(void) } } -static bool8 sub_803CDB8(void) +static bool8 AllAtActionConfirmed(void) { - s32 i, var; + s32 i, count; - for (var = 0, i = 0; i < gBattlersCount; i++) + for (count = 0, i = 0; i < gBattlersCount; i++) { - if (gBattleCommunication[i] == 5) - var++; + if (gBattleCommunication[i] == STATE_WAIT_ACTION_CONFIRMED) + count++; } - if (var + 1 == gBattlersCount) + if (count + 1 == gBattlersCount) return TRUE; else return FALSE; From dd228fae5a4f0426c0242b3bb5ac6dfe62673a1f Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Sun, 8 Jul 2018 01:20:01 +0100 Subject: [PATCH 45/55] Minor variable labelling --- src/item_menu.c | 4 +- src/pokedex.c | 132 ++++++++++++++++++++++++------------------------ 2 files changed, 68 insertions(+), 68 deletions(-) diff --git a/src/item_menu.c b/src/item_menu.c index 0642c771e7..e18d8fdd80 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -2116,9 +2116,9 @@ void setup_bag_menu_textboxes(void) schedule_bg_copy_tilemap_to_vram(1); } -void bag_menu_print(u8 a, u8 b, const u8 *str, u8 c, u8 d, u8 e, u8 f, u8 g, u8 h) +void bag_menu_print(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 letterSpacing, u8 lineSpacing, u8 speed, u8 h) { - AddTextPrinterParameterized2(a, b, c, d, e, f, gUnknown_08614164[h], g, str); + AddTextPrinterParameterized2(windowId, fontId, left, top, letterSpacing, lineSpacing, gUnknown_08614164[h], speed, str); } u8 sub_81AE124(u8 a) diff --git a/src/pokedex.c b/src/pokedex.c index f7a51e75fe..37e0515bd6 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -1630,14 +1630,14 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode) } } -void sub_80BCE2C(u8 a, u8 b, const u8* str, u8 c, u8 d) +void sub_80BCE2C(u8 windowId, u8 fontId, const u8* str, u8 left, u8 top) { - u8 sp14[3]; + u8 color[3]; - sp14[0] = 0; - sp14[1] = 15; - sp14[2] = 3; - AddTextPrinterParameterized2(a, b, c * 8, (d * 8) + 1, 0, 0, sp14, -1, str); + color[0] = 0; + color[1] = 15; + color[2] = 3; + AddTextPrinterParameterized2(windowId, fontId, left * 8, (top * 8) + 1, 0, 0, color, -1, str); } void sub_80BCE84(u8 a, u16 b, u16 c) @@ -1727,7 +1727,7 @@ void sub_80BCE84(u8 a, u16 b, u16 c) CopyWindowToVram(0, 2); } -void sub_80BD154(u16 a, u8 b, u8 c, u16 unused) +void sub_80BD154(u16 a, u8 left, u8 top, u16 unused) { u8 text[6]; u16 r6; @@ -1739,18 +1739,18 @@ void sub_80BD154(u16 a, u8 b, u8 c, u16 unused) text[2] = CHAR_0 + r6 / 100; text[3] = CHAR_0 + (r6 % 100) / 10; text[4] = CHAR_0 + (r6 % 100) % 10; - sub_80BCE2C(0, 7, text, b, c); + sub_80BCE2C(0, 7, text, left, top); } -void sub_80BD1F4(u16 a, u8 b, u8 c, u16 unused) +void sub_80BD1F4(u16 a, u8 x, u8 y, u16 unused) { if (a) - BlitBitmapToWindow(0, gUnknown_0855D2BE, b * 8, c * 8, 8, 16); + BlitBitmapToWindow(0, gUnknown_0855D2BE, x * 8, y * 8, 8, 16); else - FillWindowPixelRect(0, 0, b * 8, c * 8, 8, 16); + FillWindowPixelRect(0, 0, x * 8, y * 8, 8, 16); } -u8 sub_80BD23C(u16 num, u8 b, u8 c) +u8 sub_80BD23C(u16 num, u8 left, u8 top) { const u8* str; @@ -1759,13 +1759,13 @@ u8 sub_80BD23C(u16 num, u8 b, u8 c) str = gSpeciesNames[num]; else str = sText_TenDashes; - sub_80BCE2C(0, 7, str, b, c); + sub_80BCE2C(0, 7, str, left, top); return StringLength(str); } -void sub_80BD28C(u8 a, u8 b, u16 unused) +void sub_80BD28C(u8 x, u8 y, u16 unused) { - FillWindowPixelRect(0, 0, a * 8, b * 8, 0x60, 16); + FillWindowPixelRect(0, 0, x * 8, y * 8, 0x60, 16); } void sub_80BD2B4(u16 a, u16 b) @@ -1803,7 +1803,7 @@ void sub_80BD2B4(u16 a, u16 b) gSprites[spriteId].callback = sub_80BE4E0; gSprites[spriteId].data[5] = 32; } - + sub_80BCE84(0, a, b); SetGpuReg(REG_OFFSET_BG2VOFS, gUnknown_02039B4C->unk62D); @@ -2047,7 +2047,7 @@ u16 sub_80BDA8C(u16 a1) return 0; } -u32 sub_80BDACC(u16 a, s16 b, s16 c) +u32 sub_80BDACC(u16 num, s16 x, s16 y) { u8 i; @@ -2055,13 +2055,13 @@ u32 sub_80BDACC(u16 a, s16 b, s16 c) { if (gUnknown_02039B4C->unk61E[i] == 0xFFFF) { - u8 spriteId = sub_80C0E9C(a, b, c, i); + u8 spriteId = sub_80C0E9C(num, x, y, i); gSprites[spriteId].oam.affineMode = 1; gSprites[spriteId].oam.priority = 3; gSprites[spriteId].data[0] = 0; gSprites[spriteId].data[1] = i; - gSprites[spriteId].data[2] = NationalPokedexNumToSpecies(a); + gSprites[spriteId].data[2] = NationalPokedexNumToSpecies(num); gUnknown_02039B4C->unk61E[i] = spriteId; return spriteId; } @@ -2443,14 +2443,14 @@ void sub_80BE834(struct Sprite *sprite) } } -void sub_80BE8DC(const u8* a, u8 b, u8 c) +void sub_80BE8DC(const u8* str, u8 left, u8 top) { - u8 sp14[3]; - sp14[0] = 0; - sp14[1] = 15; - sp14[2] = 3; + u8 color[3]; + color[0] = 0; + color[1] = 15; + color[2] = 3; - AddTextPrinterParameterized2(0, 1, b, c, 0, 0, sp14, -1, a); + AddTextPrinterParameterized2(0, 1, left, top, 0, 0, color, -1, str); } u8 sub_80BE91C(struct PokedexListItem* item, u8 b) @@ -3464,7 +3464,7 @@ void sub_80C01CC(struct Sprite *sprite) sprite->pos1.y -= 1; } -void sub_80C020C(u32 num, u32 b, u32 c, u32 d) +void sub_80C020C(u32 num, u32 value, u32 c, u32 d) { u8 str[0x10]; u8 str2[0x20]; @@ -3475,11 +3475,11 @@ void sub_80C020C(u32 num, u32 b, u32 c, u32 d) if (d) sub_80BE8DC(gText_PokedexRegistration, GetStringCenterAlignXOffset(1, gText_PokedexRegistration, 0xF0), 0); - if (b == 0) - b = NationalToHoennOrder(num); + if (value == 0) + value = NationalToHoennOrder(num); else - b = num; - ConvertIntToDecimalStringN(StringCopy(str, gText_UnkCtrlF908Clear01), b, 2, 3); + value = num; + ConvertIntToDecimalStringN(StringCopy(str, gText_UnkCtrlF908Clear01), value, 2, 3); sub_80BE8DC(str, 0x60, 0x19); natNum = NationalPokedexNumToSpecies(num); if (natNum) @@ -4058,17 +4058,17 @@ void sub_80C09B0(u16 a) } } -void sub_80C0A88(u8 a, const u8 *b, u8 c, u8 d) +void sub_80C0A88(u8 windowId, const u8 *str, u8 left, u8 top) { - u8 sp14[3]; - sp14[0] = 0; - sp14[1] = 15; - sp14[2] = 3; + u8 color[3]; + color[0] = 0; + color[1] = 15; + color[2] = 3; - AddTextPrinterParameterized2(a, 1, c, d, 0, 0, sp14, -1, b); + AddTextPrinterParameterized2(windowId, 1, left, top, 0, 0, color, -1, str); } -void sub_80C0AC4(u8 a, u16 order, u8 b, u8 c) +void sub_80C0AC4(u8 windowId, u16 order, u8 left, u8 top) { u8 str[4]; @@ -4076,10 +4076,10 @@ void sub_80C0AC4(u8 a, u16 order, u8 b, u8 c) str[1] = CHAR_0 + (order % 100) / 10; str[2] = CHAR_0 + (order % 100) % 10; str[3] = EOS; - sub_80C0A88(a, str, b, c); + sub_80C0A88(windowId, str, left, top); } -u8 sub_80C0B44(u8 a, u16 num, u8 b, u8 c) +u8 sub_80C0B44(u8 windowId, u16 num, u8 left, u8 top) { u8 str[11]; u8 i; @@ -4098,11 +4098,11 @@ u8 sub_80C0B44(u8 a, u16 num, u8 b, u8 c) str[i] = CHAR_HYPHEN; break; } - sub_80C0A88(a, str, b, c); + sub_80C0A88(windowId, str, left, top); return i; } -void sub_80C0BF0(u8 a, const u8* str, u8 b, u8 c) +void sub_80C0BF0(u8 windowId, const u8* str, u8 left, u8 top) { u8 str2[11]; u8 i; @@ -4115,10 +4115,10 @@ void sub_80C0BF0(u8 a, const u8* str, u8 b, u8 c) for (i = 0; i < count; i++) str2[11 - count + i] = str[i]; str2[11] = EOS; - sub_80C0A88(a, str2, b, c); + sub_80C0A88(windowId, str2, left, top); } -void sub_80C0C6C(u8 a, u16 b, u8 left, u8 top) +void sub_80C0C6C(u8 windowId, u16 b, u8 left, u8 top) { u8 str[6]; bool8 outputted = FALSE; @@ -4152,10 +4152,10 @@ void sub_80C0C6C(u8 a, u16 b, u8 left, u8 top) str[3] = CHAR_PERIOD; str[4] = CHAR_0 + ((b % 1000) % 100) % 10; str[5] = EOS; - sub_80C0A88(a, str, left, top); + sub_80C0A88(windowId, str, left, top); } -void sub_80C0D30(u8 a0, u16 a1) +void sub_80C0D30(u8 windowId, u16 a1) { u8 image[32 * 4]; const u8 * r12 = gMonFootprintTable[NationalPokedexNumToSpecies(a1)]; @@ -4175,7 +4175,7 @@ void sub_80C0D30(u8 a0, u16 a1) r5++; } } - CopyToWindowPixelBuffer(a0, image, sizeof(image), 0); + CopyToWindowPixelBuffer(windowId, image, sizeof(image), 0); } void sub_80C0DC0(u16 a, u16 b) @@ -4229,25 +4229,25 @@ u32 sub_80C0E68(u16 a) } } -u16 sub_80C0E9C(u16 num, s16 a, s16 b, u16 c) +u16 sub_80C0E9C(u16 num, s16 x, s16 y, u16 paletteSlot) { num = NationalPokedexNumToSpecies(num); - return sub_818D7D8(num, 8, sub_80C0E68(num), 1, a, b, c, -1); + return sub_818D7D8(num, 8, sub_80C0E68(num), TRUE, x, y, paletteSlot, 0xFFFF); } -u16 sub_80C0EF8(u16 a, s16 b, s16 c, s8 d) +u16 sub_80C0EF8(u16 species, s16 x, s16 y, s8 paletteSlot) { - return sub_818D8AC(a, 1, b, c, d, -1); + return sub_818D8AC(species, TRUE, x, y, paletteSlot, 0xFFFF); } -int sub_80C0F30(u8 a, u8 b, u8 abcGroup, u8 bodyColor, u8 type1, u8 type2) +int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8 type2) { u16 species; u16 i; u16 resultsCount; u8 types[2]; - sub_80BC8D4(a, b); + sub_80BC8D4(dexMode, sortMode); for (i = 0, resultsCount = 0; i < NATIONAL_DEX_COUNT; i++) { @@ -4361,19 +4361,19 @@ u8 sub_80C1258(void) return CreateTask(sub_80C12E0, 0); } -void sub_80C1270(const u8 *str, u32 a, u32 b) +void sub_80C1270(const u8 *str, u32 left, u32 top) { - u8 sp14[3]; + u8 color[3]; - sp14[0] = 0; - sp14[1] = 15; - sp14[2] = 2; - AddTextPrinterParameterized2(0, 1, a, b, 0, 0, sp14, -1, str); + color[0] = 0; + color[1] = 15; + color[2] = 2; + AddTextPrinterParameterized2(0, 1, left, top, 0, 0, color, -1, str); } -void sub_80C12B0(u32 a, u32 b, u32 c, u32 d) +void sub_80C12B0(u32 x, u32 y, u32 width, u32 height) { - FillWindowPixelRect(0, 0, a, b, c, d); + FillWindowPixelRect(0, 0, x, y, width, height); } void sub_80C12E0(u8 taskId) @@ -5211,19 +5211,19 @@ void sub_80C2618(const u8* str) sub_80C1270(str, 8, 0x79); } -void sub_80C2638(u32 a) +void sub_80C2638(u32 y) { - sub_80C12B0(0x90, a * 16 + 8, 8, 16); + sub_80C12B0(0x90, y * 16 + 8, 8, 16); } -void sub_80C2650(u32 a) +void sub_80C2650(u32 left) { - sub_80C1270(gText_SelectorArrow, 0x90, a * 16 + 9); + sub_80C1270(gText_SelectorArrow, 0x90, left * 16 + 9); } -void sub_80C2668(u32 a, const u8* str) +void sub_80C2668(u32 left, const u8* str) { - sub_80C1270(str, 0x98, a * 16 + 9); + sub_80C1270(str, 0x98, left * 16 + 9); } void sub_80C267C(void) From d675b7578cff2352796c27d3e6fc882090c9ce21 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 10 Jul 2018 18:04:41 -0500 Subject: [PATCH 46/55] Move movement type constants into include/constants/event_object_movement_constants.h --- .../event_object_movement_constants.h | 245 +++++++++++++++++ include/event_object_movement.h | 247 ------------------ src/event_object_movement.c | 1 + 3 files changed, 246 insertions(+), 247 deletions(-) create mode 100755 include/constants/event_object_movement_constants.h diff --git a/include/constants/event_object_movement_constants.h b/include/constants/event_object_movement_constants.h new file mode 100755 index 0000000000..2a80f9a09b --- /dev/null +++ b/include/constants/event_object_movement_constants.h @@ -0,0 +1,245 @@ +#ifndef GUARD_CONSTANTS_EVENTOBJMV_H +#define GUARD_CONSTANTS_EVENTOBJMV_H + +#define MOVEMENT_TYPE_NONE 0x0 +#define MOVEMENT_TYPE_LOOK_AROUND 0x1 +#define MOVEMENT_TYPE_WANDER_AROUND 0x2 +#define MOVEMENT_TYPE_WANDER_UP_AND_DOWN 0x3 +#define MOVEMENT_TYPE_WANDER_DOWN_AND_UP 0x4 +#define MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT 0x5 +#define MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT 0x6 +#define MOVEMENT_TYPE_FACE_UP 0x7 +#define MOVEMENT_TYPE_FACE_DOWN 0x8 +#define MOVEMENT_TYPE_FACE_LEFT 0x9 +#define MOVEMENT_TYPE_FACE_RIGHT 0xA +#define MOVEMENT_TYPE_PLAYER 0xB +#define MOVEMENT_TYPE_BERRY_TREE_GROWTH 0xC +#define MOVEMENT_TYPE_FACE_DOWN_AND_UP 0xD +#define MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT 0xE +#define MOVEMENT_TYPE_FACE_UP_AND_LEFT 0xF +#define MOVEMENT_TYPE_FACE_UP_AND_RIGHT 0x10 +#define MOVEMENT_TYPE_FACE_DOWN_AND_LEFT 0x11 +#define MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT 0x12 +#define MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT 0x13 +#define MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT 0x14 +#define MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT 0x15 +#define MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT 0x16 +#define MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE 0x17 +#define MOVEMENT_TYPE_ROTATE_CLOCKWISE 0x18 +#define MOVEMENT_TYPE_WALK_UP_AND_DOWN 0x19 +#define MOVEMENT_TYPE_WALK_DOWN_AND_UP 0x1A +#define MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT 0x1B +#define MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT 0x1C +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN 0x1D +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP 0x1E +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT 0x1F +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT 0x20 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN 0x21 +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP 0x22 +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT 0x23 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT 0x24 +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT 0x25 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT 0x26 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN 0x27 +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP 0x28 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT 0x29 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT 0x2A +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN 0x2B +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP 0x2C +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT 0x2D +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT 0x2E +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP 0x2F +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN 0x30 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT 0x31 +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT 0x32 +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN 0x33 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP 0x34 +#define MOVEMENT_TYPE_COPY_PLAYER 0x35 +#define MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE 0x36 +#define MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE 0x37 +#define MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE 0x38 +#define MOVEMENT_TYPE_TREE_DISGUISE 0x39 +#define MOVEMENT_TYPE_MOUNTAIN_DISGUISE 0x3A +#define MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS 0x3B +#define MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS 0x3C +#define MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS 0x3D +#define MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS 0x3E +#define MOVEMENT_TYPE_HIDDEN 0x3F +#define MOVEMENT_TYPE_WALK_IN_PLACE_DOWN 0x40 +#define MOVEMENT_TYPE_WALK_IN_PLACE_UP 0x41 +#define MOVEMENT_TYPE_WALK_IN_PLACE_LEFT 0x42 +#define MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT 0x43 +#define MOVEMENT_TYPE_JOG_IN_PLACE_DOWN 0x44 +#define MOVEMENT_TYPE_JOG_IN_PLACE_UP 0x45 +#define MOVEMENT_TYPE_JOG_IN_PLACE_LEFT 0x46 +#define MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT 0x47 +#define MOVEMENT_TYPE_RUN_IN_PLACE_DOWN 0x48 +#define MOVEMENT_TYPE_RUN_IN_PLACE_UP 0x49 +#define MOVEMENT_TYPE_RUN_IN_PLACE_LEFT 0x4A +#define MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT 0x4B +#define MOVEMENT_TYPE_INVISIBLE 0x4C +#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN 0x4D +#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP 0x4E +#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT 0x4F +#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT 0x50 + +#define MOVEMENT_ACTION_FACE_DOWN 0x0 +#define MOVEMENT_ACTION_FACE_UP 0x1 +#define MOVEMENT_ACTION_FACE_LEFT 0x2 +#define MOVEMENT_ACTION_FACE_RIGHT 0x3 +#define MOVEMENT_ACTION_WALK_SLOW_DOWN 0x4 +#define MOVEMENT_ACTION_WALK_SLOW_UP 0x5 +#define MOVEMENT_ACTION_WALK_SLOW_LEFT 0x6 +#define MOVEMENT_ACTION_WALK_SLOW_RIGHT 0x7 +#define MOVEMENT_ACTION_WALK_NORMAL_DOWN 0x8 +#define MOVEMENT_ACTION_WALK_NORMAL_UP 0x9 +#define MOVEMENT_ACTION_WALK_NORMAL_LEFT 0xA +#define MOVEMENT_ACTION_WALK_NORMAL_RIGHT 0xB +#define MOVEMENT_ACTION_JUMP_2_DOWN 0xC +#define MOVEMENT_ACTION_JUMP_2_UP 0xD +#define MOVEMENT_ACTION_JUMP_2_LEFT 0xE +#define MOVEMENT_ACTION_JUMP_2_RIGHT 0xF +#define MOVEMENT_ACTION_DELAY_1 0x10 +#define MOVEMENT_ACTION_DELAY_2 0x11 +#define MOVEMENT_ACTION_DELAY_4 0x12 +#define MOVEMENT_ACTION_DELAY_8 0x13 +#define MOVEMENT_ACTION_DELAY_16 0x14 +#define MOVEMENT_ACTION_WALK_FAST_DOWN 0x15 +#define MOVEMENT_ACTION_WALK_FAST_UP 0x16 +#define MOVEMENT_ACTION_WALK_FAST_LEFT 0x17 +#define MOVEMENT_ACTION_WALK_FAST_RIGHT 0x18 +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN 0x19 +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP 0x1A +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT 0x1B +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT 0x1C +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN 0x1D +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP 0x1E +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT 0x1F +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT 0x20 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN 0x21 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP 0x22 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT 0x23 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT 0x24 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN 0x25 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP 0x26 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT 0x27 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT 0x28 +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN 0x29 +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP 0x2A +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT 0x2B +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT 0x2C +#define MOVEMENT_ACTION_WALK_FASTEST_DOWN 0x2D +#define MOVEMENT_ACTION_WALK_FASTEST_UP 0x2E +#define MOVEMENT_ACTION_WALK_FASTEST_LEFT 0x2F +#define MOVEMENT_ACTION_WALK_FASTEST_RIGHT 0x30 +#define MOVEMENT_ACTION_SLIDE_DOWN 0x31 +#define MOVEMENT_ACTION_SLIDE_UP 0x32 +#define MOVEMENT_ACTION_SLIDE_LEFT 0x33 +#define MOVEMENT_ACTION_SLIDE_RIGHT 0x34 +#define MOVEMENT_ACTION_PLAYER_RUN_DOWN 0x35 +#define MOVEMENT_ACTION_PLAYER_RUN_UP 0x36 +#define MOVEMENT_ACTION_PLAYER_RUN_LEFT 0x37 +#define MOVEMENT_ACTION_PLAYER_RUN_RIGHT 0x38 +#define MOVEMENT_ACTION_START_ANIM_IN_DIRECTION 0x39 +#define MOVEMENT_ACTION_JUMP_SPECIAL_DOWN 0x3A +#define MOVEMENT_ACTION_JUMP_SPECIAL_UP 0x3B +#define MOVEMENT_ACTION_JUMP_SPECIAL_LEFT 0x3C +#define MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT 0x3D +#define MOVEMENT_ACTION_FACE_PLAYER 0x3E +#define MOVEMENT_ACTION_FACE_AWAY_PLAYER 0x3F +#define MOVEMENT_ACTION_LOCK_FACING_DIRECTION 0x40 +#define MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION 0x41 +#define MOVEMENT_ACTION_JUMP_DOWN 0x42 +#define MOVEMENT_ACTION_JUMP_UP 0x43 +#define MOVEMENT_ACTION_JUMP_LEFT 0x44 +#define MOVEMENT_ACTION_JUMP_RIGHT 0x45 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN 0x46 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP 0x47 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT 0x48 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT 0x49 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP 0x4A +#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN 0x4B +#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT 0x4C +#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT 0x4D +#define MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION 0x4E +#define MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN 0x4F +#define MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT 0x50 +#define MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT 0x51 +#define MOVEMENT_ACTION_DISABLE_ANIMATION 0x52 +#define MOVEMENT_ACTION_RESTORE_ANIMATION 0x53 +#define MOVEMENT_ACTION_SET_INVISIBLE 0x54 +#define MOVEMENT_ACTION_SET_VISIBLE 0x55 +#define MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK 0x56 +#define MOVEMENT_ACTION_EMOTE_QUESTION_MARK 0x57 +#define MOVEMENT_ACTION_EMOTE_HEART 0x58 +#define MOVEMENT_ACTION_REVEAL_TRAINER 0x59 +#define MOVEMENT_ACTION_ROCK_SMASH_BREAK 0x5A +#define MOVEMENT_ACTION_CUT_TREE 0x5B +#define MOVEMENT_ACTION_SET_FIXED_PRIORITY 0x5C +#define MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY 0x5D +#define MOVEMENT_ACTION_INIT_AFFINE_ANIM 0x5E +#define MOVEMENT_ACTION_CLEAR_AFFINE_ANIM 0x5F +#define MOVEMENT_ACTION_UNKNOWN1 0x60 +#define MOVEMENT_ACTION_UNKNOWN2 0x61 +#define MOVEMENT_ACTION_WALK_DOWN_START_AFFINE 0x62 +#define MOVEMENT_ACTION_WALK_DOWN_AFFINE 0x63 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN 0x64 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP 0x65 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT 0x66 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT 0x67 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN 0x68 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP 0x69 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT 0x6A +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT 0x6B +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN 0x6C +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP 0x6D +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT 0x6E +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT 0x6F +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN 0x70 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP 0x71 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT 0x72 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT 0x73 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN 0x74 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP 0x75 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT 0x76 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT 0x77 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN 0x78 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP 0x79 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT 0x7A +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT 0x7B +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN 0x7C +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP 0x7D +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT 0x7E +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT 0x7F +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN 0x80 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP 0x81 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT 0x82 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT 0x83 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN 0x84 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP 0x85 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT 0x86 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT 0x87 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN 0x88 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP 0x89 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT 0x8A +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT 0x8B +#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_LEFT 0x8C +#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_RIGHT 0x8D +#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_LEFT 0x8E +#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_RIGHT 0x8F +#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_LEFT 0x90 +#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT 0x91 +#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT 0x92 +#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT 0x93 +#define MOVEMENT_ACTION_STORE_AND_LOCK_ANIM 0x94 +#define MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM 0x95 +#define MOVEMENT_ACTION_WALK_LEFT_AFFINE 0x96 +#define MOVEMENT_ACTION_WALK_RIGHT_AFFINE 0x97 +#define MOVEMENT_ACTION_LEVITATE 0x98 +#define MOVEMENT_ACTION_STOP_LEVITATE 0x99 +#define MOVEMENT_ACTION_DESTROY_EXTRA_TASK_IF_AT_TOP 0x9A +#define MOVEMENT_ACTION_FIGURE_8 0x9B +#define MOVEMENT_ACTION_FLY_UP 0x9C +#define MOVEMENT_ACTION_FLY_DOWN 0x9D + +#endif // GUARD_CONSTANTS_EVENTOBJMV_H diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 8a1749b0b1..99243e45f0 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -4,253 +4,6 @@ #define NUM_OBJECT_GRAPHICS_INFO 239 #define SPRITE_VAR 240 -enum -{ - MOVEMENT_TYPE_NONE, - MOVEMENT_TYPE_LOOK_AROUND, - MOVEMENT_TYPE_WANDER_AROUND, - MOVEMENT_TYPE_WANDER_UP_AND_DOWN, - MOVEMENT_TYPE_WANDER_DOWN_AND_UP, - MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, - MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT, - MOVEMENT_TYPE_FACE_UP, - MOVEMENT_TYPE_FACE_DOWN, - MOVEMENT_TYPE_FACE_LEFT, - MOVEMENT_TYPE_FACE_RIGHT, - MOVEMENT_TYPE_PLAYER, - MOVEMENT_TYPE_BERRY_TREE_GROWTH, - MOVEMENT_TYPE_FACE_DOWN_AND_UP, - MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, - MOVEMENT_TYPE_FACE_UP_AND_LEFT, - MOVEMENT_TYPE_FACE_UP_AND_RIGHT, - MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, - MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, - MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT, - MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, - MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, - MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, - MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, - MOVEMENT_TYPE_ROTATE_CLOCKWISE, - MOVEMENT_TYPE_WALK_UP_AND_DOWN, - MOVEMENT_TYPE_WALK_DOWN_AND_UP, - MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, - MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, - MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN, - MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP, - MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT, - MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT, - MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN, - MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP, - MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT, - MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT, - MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT, - MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT, - MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN, - MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP, - MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT, - MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT, - MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN, - MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP, - MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, - MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, - MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP, - MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN, - MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, - MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, - MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, - MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, - MOVEMENT_TYPE_COPY_PLAYER, - MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE, - MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE, - MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE, - MOVEMENT_TYPE_TREE_DISGUISE, - MOVEMENT_TYPE_MOUNTAIN_DISGUISE, - MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS, - MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, - MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS, - MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS, - MOVEMENT_TYPE_HIDDEN, - MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, - MOVEMENT_TYPE_WALK_IN_PLACE_UP, - MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, - MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, - MOVEMENT_TYPE_JOG_IN_PLACE_DOWN, - MOVEMENT_TYPE_JOG_IN_PLACE_UP, - MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, - MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT, - MOVEMENT_TYPE_RUN_IN_PLACE_DOWN, - MOVEMENT_TYPE_RUN_IN_PLACE_UP, - MOVEMENT_TYPE_RUN_IN_PLACE_LEFT, - MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT, - MOVEMENT_TYPE_INVISIBLE, - MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN, - MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP, - MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT, - MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, -}; - -enum -{ - MOVEMENT_ACTION_FACE_DOWN, - MOVEMENT_ACTION_FACE_UP, - MOVEMENT_ACTION_FACE_LEFT, - MOVEMENT_ACTION_FACE_RIGHT, - MOVEMENT_ACTION_WALK_SLOW_DOWN, - MOVEMENT_ACTION_WALK_SLOW_UP, - MOVEMENT_ACTION_WALK_SLOW_LEFT, - MOVEMENT_ACTION_WALK_SLOW_RIGHT, - MOVEMENT_ACTION_WALK_NORMAL_DOWN, - MOVEMENT_ACTION_WALK_NORMAL_UP, - MOVEMENT_ACTION_WALK_NORMAL_LEFT, - MOVEMENT_ACTION_WALK_NORMAL_RIGHT, - MOVEMENT_ACTION_JUMP_2_DOWN, - MOVEMENT_ACTION_JUMP_2_UP, - MOVEMENT_ACTION_JUMP_2_LEFT, - MOVEMENT_ACTION_JUMP_2_RIGHT, - MOVEMENT_ACTION_DELAY_1, - MOVEMENT_ACTION_DELAY_2, - MOVEMENT_ACTION_DELAY_4, - MOVEMENT_ACTION_DELAY_8, - MOVEMENT_ACTION_DELAY_16, - MOVEMENT_ACTION_WALK_FAST_DOWN, - MOVEMENT_ACTION_WALK_FAST_UP, - MOVEMENT_ACTION_WALK_FAST_LEFT, - MOVEMENT_ACTION_WALK_FAST_RIGHT, - MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN, - MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP, - MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT, - MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT, - MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN, - MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP, - MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT, - MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT, - MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN, - MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP, - MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT, - MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT, - MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN, - MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP, - MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT, - MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT, - MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN, - MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP, - MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT, - MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT, - MOVEMENT_ACTION_WALK_FASTEST_DOWN, - MOVEMENT_ACTION_WALK_FASTEST_UP, - MOVEMENT_ACTION_WALK_FASTEST_LEFT, - MOVEMENT_ACTION_WALK_FASTEST_RIGHT, - MOVEMENT_ACTION_SLIDE_DOWN, - MOVEMENT_ACTION_SLIDE_UP, - MOVEMENT_ACTION_SLIDE_LEFT, - MOVEMENT_ACTION_SLIDE_RIGHT, - MOVEMENT_ACTION_PLAYER_RUN_DOWN, - MOVEMENT_ACTION_PLAYER_RUN_UP, - MOVEMENT_ACTION_PLAYER_RUN_LEFT, - MOVEMENT_ACTION_PLAYER_RUN_RIGHT, - MOVEMENT_ACTION_START_ANIM_IN_DIRECTION, - MOVEMENT_ACTION_JUMP_SPECIAL_DOWN, - MOVEMENT_ACTION_JUMP_SPECIAL_UP, - MOVEMENT_ACTION_JUMP_SPECIAL_LEFT, - MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT, - MOVEMENT_ACTION_FACE_PLAYER, - MOVEMENT_ACTION_FACE_AWAY_PLAYER, - MOVEMENT_ACTION_LOCK_FACING_DIRECTION, - MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION, - MOVEMENT_ACTION_JUMP_DOWN, - MOVEMENT_ACTION_JUMP_UP, - MOVEMENT_ACTION_JUMP_LEFT, - MOVEMENT_ACTION_JUMP_RIGHT, - MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN, - MOVEMENT_ACTION_JUMP_IN_PLACE_UP, - MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT, - MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT, - MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP, - MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN, - MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT, - MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT, - MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION, - MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN, - MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT, - MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT, - MOVEMENT_ACTION_DISABLE_ANIMATION, - MOVEMENT_ACTION_RESTORE_ANIMATION, - MOVEMENT_ACTION_SET_INVISIBLE, - MOVEMENT_ACTION_SET_VISIBLE, - MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK, - MOVEMENT_ACTION_EMOTE_QUESTION_MARK, - MOVEMENT_ACTION_EMOTE_HEART, - MOVEMENT_ACTION_REVEAL_TRAINER, - MOVEMENT_ACTION_ROCK_SMASH_BREAK, - MOVEMENT_ACTION_CUT_TREE, - MOVEMENT_ACTION_SET_FIXED_PRIORITY, - MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY, - MOVEMENT_ACTION_INIT_AFFINE_ANIM, - MOVEMENT_ACTION_CLEAR_AFFINE_ANIM, - MOVEMENT_ACTION_UNKNOWN1, - MOVEMENT_ACTION_UNKNOWN2, - MOVEMENT_ACTION_WALK_DOWN_START_AFFINE, - MOVEMENT_ACTION_WALK_DOWN_AFFINE, - MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN, - MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP, - MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT, - MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT, - MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN, - MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP, - MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT, - MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT, - MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN, - MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP, - MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT, - MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT, - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN, - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP, - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT, - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT, - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN, - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP, - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT, - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT, - MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN, - MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP, - MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT, - MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT, - MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN, - MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP, - MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT, - MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT, - MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN, - MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP, - MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT, - MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT, - MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN, - MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP, - MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT, - MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT, - MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN, - MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP, - MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT, - MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT, - MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_LEFT, - MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_RIGHT, - MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_LEFT, - MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_RIGHT, - MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_LEFT, - MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT, - MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT, - MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT, - MOVEMENT_ACTION_STORE_AND_LOCK_ANIM, - MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM, - MOVEMENT_ACTION_WALK_LEFT_AFFINE, - MOVEMENT_ACTION_WALK_RIGHT_AFFINE, - MOVEMENT_ACTION_LEVITATE, - MOVEMENT_ACTION_STOP_LEVITATE, - MOVEMENT_ACTION_DESTROY_EXTRA_TASK_IF_AT_TOP, - MOVEMENT_ACTION_FIGURE_8, - MOVEMENT_ACTION_FLY_UP, - MOVEMENT_ACTION_FLY_DOWN, -}; - enum SpinnerRunnerFollowPatterns { RUNFOLLOW_ANY, diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 35b04ea1e5..953851108b 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -21,6 +21,7 @@ #include "sprite.h" #include "trainer_see.h" #include "util.h" +#include "constants/event_object_movement_constants.h" #include "constants/event_objects.h" // this file was known as evobjmv.c in Game Freak's original source From 8ffd7a70fc6d059f04a0588d2956d4f02f7eeb5d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 10 Jul 2018 18:04:51 -0500 Subject: [PATCH 47/55] Use movement type constants in object_event macros --- data/map_events.s | 1 + .../AbandonedShip_CaptainsOffice/events.inc | 4 +- .../AbandonedShip_Corridors_1F/events.inc | 4 +- .../AbandonedShip_Corridors_B1F/events.inc | 4 +- .../AbandonedShip_HiddenFloorRooms/events.inc | 8 +- data/maps/AbandonedShip_Room_B1F/events.inc | 2 +- data/maps/AbandonedShip_Rooms2_1F/events.inc | 10 +- data/maps/AbandonedShip_Rooms2_B1F/events.inc | 4 +- data/maps/AbandonedShip_Rooms_1F/events.inc | 8 +- data/maps/AbandonedShip_Rooms_B1F/events.inc | 4 +- data/maps/AncientTomb/events.inc | 2 +- data/maps/AquaHideout_1F/events.inc | 6 +- data/maps/AquaHideout_B1F/events.inc | 18 ++-- data/maps/AquaHideout_B2F/events.inc | 12 +-- data/maps/ArtisanCave_1F/events.inc | 2 +- data/maps/ArtisanCave_B1F/events.inc | 2 +- .../events.inc | 18 ++-- .../events.inc | 2 +- .../events.inc | 10 +- .../events.inc | 30 +++--- .../events.inc | 2 +- .../BattleFrontier_BattleDomeLobby/events.inc | 12 +-- .../events.inc | 2 +- .../events.inc | 16 ++-- .../events.inc | 12 +-- .../events.inc | 2 +- .../events.inc | 10 +- .../events.inc | 14 +-- .../events.inc | 12 +-- .../events.inc | 2 +- .../BattleFrontier_BattlePikeLobby/events.inc | 8 +- .../events.inc | 4 +- .../events.inc | 2 +- .../events.inc | 4 +- .../events.inc | 18 ++-- .../events.inc | 32 +++---- .../events.inc | 8 +- .../events.inc | 4 +- .../events.inc | 6 +- .../events.inc | 12 +-- .../events.inc | 2 +- .../events.inc | 8 +- .../events.inc | 2 +- .../events.inc | 18 ++-- .../events.inc | 18 ++-- data/maps/BattleFrontier_Lounge1/events.inc | 6 +- data/maps/BattleFrontier_Lounge2/events.inc | 10 +- data/maps/BattleFrontier_Lounge3/events.inc | 10 +- data/maps/BattleFrontier_Lounge4/events.inc | 6 +- data/maps/BattleFrontier_Lounge5/events.inc | 8 +- data/maps/BattleFrontier_Lounge6/events.inc | 2 +- data/maps/BattleFrontier_Lounge7/events.inc | 8 +- data/maps/BattleFrontier_Lounge8/events.inc | 6 +- data/maps/BattleFrontier_Lounge9/events.inc | 2 +- data/maps/BattleFrontier_Mart/events.inc | 8 +- .../BattleFrontier_OutsideEast/events.inc | 52 +++++------ .../BattleFrontier_OutsideWest/events.inc | 48 +++++----- .../events.inc | 10 +- .../events.inc | 8 +- .../BattleFrontier_RankingHall/events.inc | 6 +- .../BattleFrontier_ReceptionGate/events.inc | 10 +- .../BattleFrontier_ScottsHouse/events.inc | 2 +- data/maps/BattlePyramidSquare01/events.inc | 14 +-- data/maps/BattlePyramidSquare02/events.inc | 14 +-- data/maps/BattlePyramidSquare03/events.inc | 14 +-- data/maps/BattlePyramidSquare04/events.inc | 14 +-- data/maps/BattlePyramidSquare05/events.inc | 14 +-- data/maps/BattlePyramidSquare06/events.inc | 14 +-- data/maps/BattlePyramidSquare07/events.inc | 14 +-- data/maps/BattlePyramidSquare08/events.inc | 14 +-- data/maps/BattlePyramidSquare09/events.inc | 14 +-- data/maps/BattlePyramidSquare10/events.inc | 14 +-- data/maps/BattlePyramidSquare11/events.inc | 14 +-- data/maps/BattlePyramidSquare12/events.inc | 14 +-- data/maps/BattlePyramidSquare13/events.inc | 14 +-- data/maps/BattlePyramidSquare14/events.inc | 14 +-- data/maps/BattlePyramidSquare15/events.inc | 14 +-- data/maps/BattlePyramidSquare16/events.inc | 14 +-- data/maps/BirthIsland_Exterior/events.inc | 4 +- data/maps/BirthIsland_Harbor/events.inc | 4 +- data/maps/CaveOfOrigin_B1F/events.inc | 2 +- data/maps/DesertRuins/events.inc | 2 +- data/maps/DesertUnderpass/events.inc | 2 +- data/maps/DewfordTown/events.inc | 10 +- data/maps/DewfordTown_Gym/events.inc | 16 ++-- data/maps/DewfordTown_Hall/events.inc | 18 ++-- data/maps/DewfordTown_House1/events.inc | 6 +- data/maps/DewfordTown_House2/events.inc | 4 +- .../DewfordTown_PokemonCenter_1F/events.inc | 6 +- .../DewfordTown_PokemonCenter_2F/events.inc | 8 +- .../EverGrandeCity_ChampionsRoom/events.inc | 6 +- .../maps/EverGrandeCity_DrakesRoom/events.inc | 2 +- .../EverGrandeCity_GlaciasRoom/events.inc | 2 +- .../maps/EverGrandeCity_HallOfFame/events.inc | 2 +- .../EverGrandeCity_PhoebesRoom/events.inc | 2 +- .../events.inc | 8 +- .../events.inc | 8 +- .../events.inc | 8 +- .../events.inc | 8 +- .../EverGrandeCity_SidneysRoom/events.inc | 2 +- data/maps/FallarborTown/events.inc | 8 +- .../events.inc | 6 +- .../events.inc | 2 +- .../FallarborTown_BattleTentLobby/events.inc | 10 +- data/maps/FallarborTown_House1/events.inc | 4 +- data/maps/FallarborTown_House2/events.inc | 2 +- data/maps/FallarborTown_Mart/events.inc | 10 +- .../FallarborTown_PokemonCenter_1F/events.inc | 8 +- .../FallarborTown_PokemonCenter_2F/events.inc | 8 +- data/maps/FarawayIsland_Entrance/events.inc | 4 +- data/maps/FarawayIsland_Interior/events.inc | 2 +- data/maps/FieryPath/events.inc | 16 ++-- data/maps/FortreeCity/events.inc | 14 +-- .../FortreeCity_DecorationShop/events.inc | 8 +- data/maps/FortreeCity_Gym/events.inc | 16 ++-- data/maps/FortreeCity_House1/events.inc | 6 +- data/maps/FortreeCity_House2/events.inc | 4 +- data/maps/FortreeCity_House3/events.inc | 4 +- data/maps/FortreeCity_House4/events.inc | 6 +- data/maps/FortreeCity_House5/events.inc | 6 +- data/maps/FortreeCity_Mart/events.inc | 8 +- .../FortreeCity_PokemonCenter_1F/events.inc | 8 +- .../FortreeCity_PokemonCenter_2F/events.inc | 8 +- data/maps/GraniteCave_1F/events.inc | 4 +- data/maps/GraniteCave_B1F/events.inc | 2 +- data/maps/GraniteCave_B2F/events.inc | 18 ++-- data/maps/GraniteCave_StevensRoom/events.inc | 2 +- data/maps/InsideOfTruck/events.inc | 6 +- data/maps/IslandCave/events.inc | 2 +- data/maps/JaggedPass/events.inc | 14 +-- data/maps/LavaridgeTown/events.inc | 18 ++-- data/maps/LavaridgeTown_Gym_1F/events.inc | 12 +-- data/maps/LavaridgeTown_Gym_B1F/events.inc | 8 +- data/maps/LavaridgeTown_HerbShop/events.inc | 6 +- data/maps/LavaridgeTown_House/events.inc | 6 +- data/maps/LavaridgeTown_Mart/events.inc | 6 +- .../LavaridgeTown_PokemonCenter_1F/events.inc | 8 +- .../LavaridgeTown_PokemonCenter_2F/events.inc | 8 +- data/maps/LilycoveCity/events.inc | 44 ++++----- data/maps/LilycoveCity_ContestHall/events.inc | 64 ++++++------- .../maps/LilycoveCity_ContestLobby/events.inc | 50 +++++----- .../LilycoveCity_CoveLilyMotel_1F/events.inc | 2 +- .../LilycoveCity_CoveLilyMotel_2F/events.inc | 14 +-- .../events.inc | 2 +- .../events.inc | 8 +- .../events.inc | 12 +-- .../events.inc | 10 +- .../events.inc | 10 +- .../events.inc | 10 +- .../events.inc | 14 +-- data/maps/LilycoveCity_Harbor/events.inc | 10 +- data/maps/LilycoveCity_House1/events.inc | 4 +- data/maps/LilycoveCity_House2/events.inc | 2 +- data/maps/LilycoveCity_House3/events.inc | 12 +-- data/maps/LilycoveCity_House4/events.inc | 4 +- .../LilycoveCity_LilycoveMuseum_1F/events.inc | 20 ++-- .../LilycoveCity_LilycoveMuseum_2F/events.inc | 8 +- .../LilycoveCity_MoveDeletersHouse/events.inc | 2 +- .../LilycoveCity_PokemonCenter_1F/events.inc | 10 +- .../LilycoveCity_PokemonCenter_2F/events.inc | 8 +- .../events.inc | 18 ++-- data/maps/LinkContestRoom1/events.inc | 30 +++--- data/maps/LittlerootTown/events.inc | 16 ++-- .../events.inc | 14 +-- .../events.inc | 32 +++---- .../LittlerootTown_MaysHouse_1F/events.inc | 14 +-- .../LittlerootTown_MaysHouse_2F/events.inc | 32 +++---- .../events.inc | 12 +-- data/maps/MagmaHideout_1F/events.inc | 12 +-- data/maps/MagmaHideout_2F_1R/events.inc | 8 +- data/maps/MagmaHideout_2F_2R/events.inc | 12 +-- data/maps/MagmaHideout_3F_1R/events.inc | 6 +- data/maps/MagmaHideout_3F_2R/events.inc | 4 +- data/maps/MagmaHideout_3F_3R/events.inc | 2 +- data/maps/MagmaHideout_4F/events.inc | 16 ++-- data/maps/MarineCave_End/events.inc | 2 +- data/maps/MauvilleCity/events.inc | 22 ++--- data/maps/MauvilleCity_BikeShop/events.inc | 4 +- data/maps/MauvilleCity_GameCorner/events.inc | 24 ++--- data/maps/MauvilleCity_Gym/events.inc | 14 +-- data/maps/MauvilleCity_House1/events.inc | 2 +- data/maps/MauvilleCity_House2/events.inc | 2 +- data/maps/MauvilleCity_Mart/events.inc | 6 +- .../MauvilleCity_PokemonCenter_1F/events.inc | 10 +- .../MauvilleCity_PokemonCenter_2F/events.inc | 10 +- data/maps/MeteorFalls_1F_1R/events.inc | 20 ++-- data/maps/MeteorFalls_1F_2R/events.inc | 6 +- data/maps/MeteorFalls_B1F_2R/events.inc | 2 +- data/maps/MeteorFalls_StevensCave/events.inc | 2 +- data/maps/MirageTower_3F/events.inc | 4 +- data/maps/MirageTower_4F/events.inc | 6 +- data/maps/MossdeepCity/events.inc | 34 +++---- .../MossdeepCity_GameCorner_1F/events.inc | 4 +- .../MossdeepCity_GameCorner_B1F/events.inc | 2 +- data/maps/MossdeepCity_Gym/events.inc | 72 +++++++-------- data/maps/MossdeepCity_House1/events.inc | 4 +- data/maps/MossdeepCity_House2/events.inc | 6 +- data/maps/MossdeepCity_House3/events.inc | 2 +- data/maps/MossdeepCity_House4/events.inc | 6 +- data/maps/MossdeepCity_Mart/events.inc | 8 +- .../MossdeepCity_PokemonCenter_1F/events.inc | 6 +- .../MossdeepCity_PokemonCenter_2F/events.inc | 10 +- .../MossdeepCity_SpaceCenter_1F/events.inc | 22 ++--- .../MossdeepCity_SpaceCenter_2F/events.inc | 18 ++-- .../maps/MossdeepCity_StevensHouse/events.inc | 6 +- data/maps/MtChimney/events.inc | 60 ++++++------ .../maps/MtChimney_CableCarStation/events.inc | 4 +- data/maps/MtPyre_1F/events.inc | 6 +- data/maps/MtPyre_2F/events.inc | 16 ++-- data/maps/MtPyre_3F/events.inc | 8 +- data/maps/MtPyre_4F/events.inc | 4 +- data/maps/MtPyre_5F/events.inc | 4 +- data/maps/MtPyre_6F/events.inc | 6 +- data/maps/MtPyre_Exterior/events.inc | 4 +- data/maps/MtPyre_Summit/events.inc | 16 ++-- data/maps/NavelRock_Bottom/events.inc | 2 +- data/maps/NavelRock_Harbor/events.inc | 4 +- data/maps/NavelRock_Top/events.inc | 2 +- data/maps/NewMauville_Inside/events.inc | 16 ++-- data/maps/OldaleTown/events.inc | 8 +- data/maps/OldaleTown_House1/events.inc | 2 +- data/maps/OldaleTown_House2/events.inc | 4 +- data/maps/OldaleTown_Mart/events.inc | 6 +- .../OldaleTown_PokemonCenter_1F/events.inc | 8 +- .../OldaleTown_PokemonCenter_2F/events.inc | 8 +- data/maps/PacifidlogTown/events.inc | 6 +- data/maps/PacifidlogTown_House1/events.inc | 4 +- data/maps/PacifidlogTown_House2/events.inc | 6 +- data/maps/PacifidlogTown_House3/events.inc | 4 +- data/maps/PacifidlogTown_House4/events.inc | 6 +- data/maps/PacifidlogTown_House5/events.inc | 4 +- .../events.inc | 10 +- .../events.inc | 8 +- data/maps/PetalburgCity/events.inc | 18 ++-- data/maps/PetalburgCity_Gym/events.inc | 22 ++--- data/maps/PetalburgCity_House1/events.inc | 4 +- data/maps/PetalburgCity_House2/events.inc | 4 +- data/maps/PetalburgCity_Mart/events.inc | 8 +- .../PetalburgCity_PokemonCenter_1F/events.inc | 10 +- .../PetalburgCity_PokemonCenter_2F/events.inc | 8 +- .../maps/PetalburgCity_WallysHouse/events.inc | 4 +- data/maps/PetalburgWoods/events.inc | 26 +++--- data/maps/RecordCorner/events.inc | 2 +- data/maps/Route101/events.inc | 12 +-- data/maps/Route102/events.inc | 18 ++-- data/maps/Route103/events.inc | 40 ++++---- data/maps/Route104/events.inc | 68 +++++++------- data/maps/Route104_MrBrineysHouse/events.inc | 4 +- .../Route104_PrettyPetalFlowerShop/events.inc | 6 +- data/maps/Route105/events.inc | 16 ++-- data/maps/Route106/events.inc | 10 +- data/maps/Route107/events.inc | 14 +-- data/maps/Route108/events.inc | 14 +-- data/maps/Route109/events.inc | 48 +++++----- data/maps/Route109_SeashoreHouse/events.inc | 8 +- data/maps/Route110/events.inc | 72 +++++++-------- .../events.inc | 2 +- .../events.inc | 2 +- data/maps/Route110_TrickHouseEnd/events.inc | 2 +- .../Route110_TrickHouseEntrance/events.inc | 2 +- .../Route110_TrickHousePuzzle1/events.inc | 30 +++--- .../Route110_TrickHousePuzzle2/events.inc | 10 +- .../Route110_TrickHousePuzzle3/events.inc | 14 +-- .../Route110_TrickHousePuzzle4/events.inc | 28 +++--- .../Route110_TrickHousePuzzle5/events.inc | 10 +- .../Route110_TrickHousePuzzle6/events.inc | 8 +- .../Route110_TrickHousePuzzle7/events.inc | 18 ++-- .../Route110_TrickHousePuzzle8/events.inc | 8 +- data/maps/Route111/events.inc | 92 +++++++++---------- .../maps/Route111_OldLadysRestStop/events.inc | 2 +- .../Route111_WinstrateFamilysHouse/events.inc | 8 +- data/maps/Route112/events.inc | 28 +++--- data/maps/Route112_CableCarStation/events.inc | 4 +- data/maps/Route113/events.inc | 32 +++---- data/maps/Route113_GlassWorkshop/events.inc | 4 +- data/maps/Route114/events.inc | 54 +++++------ .../Route114_FossilManiacsHouse/events.inc | 2 +- .../Route114_FossilManiacsTunnel/events.inc | 2 +- data/maps/Route114_LanettesHouse/events.inc | 2 +- data/maps/Route115/events.inc | 46 +++++----- data/maps/Route116/events.inc | 56 +++++------ .../Route116_TunnelersRestHouse/events.inc | 6 +- data/maps/Route117/events.inc | 48 +++++----- data/maps/Route117_PokemonDayCare/events.inc | 2 +- data/maps/Route118/events.inc | 42 ++++----- data/maps/Route119/events.inc | 86 ++++++++--------- data/maps/Route119_House/events.inc | 14 +-- .../Route119_WeatherInstitute_1F/events.inc | 10 +- .../Route119_WeatherInstitute_2F/events.inc | 16 ++-- data/maps/Route120/events.inc | 88 +++++++++--------- data/maps/Route121/events.inc | 58 ++++++------ .../Route121_SafariZoneEntrance/events.inc | 6 +- data/maps/Route123/events.inc | 86 ++++++++--------- .../Route123_BerryMastersHouse/events.inc | 4 +- data/maps/Route124/events.inc | 24 ++--- .../events.inc | 2 +- data/maps/Route125/events.inc | 20 ++-- data/maps/Route126/events.inc | 18 ++-- data/maps/Route127/events.inc | 22 ++--- data/maps/Route128/events.inc | 20 ++-- data/maps/Route129/events.inc | 10 +- data/maps/Route130/events.inc | 8 +- data/maps/Route131/events.inc | 16 ++-- data/maps/Route132/events.inc | 20 ++-- data/maps/Route133/events.inc | 20 ++-- data/maps/Route134/events.inc | 22 ++--- data/maps/RustboroCity/events.inc | 32 +++---- .../maps/RustboroCity_CuttersHouse/events.inc | 4 +- .../maps/RustboroCity_DevonCorp_1F/events.inc | 6 +- .../maps/RustboroCity_DevonCorp_2F/events.inc | 12 +-- .../maps/RustboroCity_DevonCorp_3F/events.inc | 6 +- data/maps/RustboroCity_Flat1_1F/events.inc | 4 +- data/maps/RustboroCity_Flat1_2F/events.inc | 16 ++-- data/maps/RustboroCity_Flat2_1F/events.inc | 4 +- data/maps/RustboroCity_Flat2_2F/events.inc | 4 +- data/maps/RustboroCity_Flat2_3F/events.inc | 4 +- data/maps/RustboroCity_Gym/events.inc | 10 +- data/maps/RustboroCity_House1/events.inc | 4 +- data/maps/RustboroCity_House2/events.inc | 4 +- data/maps/RustboroCity_House3/events.inc | 6 +- data/maps/RustboroCity_Mart/events.inc | 8 +- .../RustboroCity_PokemonCenter_1F/events.inc | 8 +- .../RustboroCity_PokemonCenter_2F/events.inc | 8 +- .../RustboroCity_PokemonSchool/events.inc | 14 +-- data/maps/RusturfTunnel/events.inc | 20 ++-- data/maps/SSTidalCorridor/events.inc | 10 +- data/maps/SSTidalLowerDeck/events.inc | 4 +- data/maps/SSTidalRooms/events.inc | 16 ++-- data/maps/SafariZone_North/events.inc | 18 ++-- data/maps/SafariZone_Northeast/events.inc | 18 ++-- data/maps/SafariZone_Northwest/events.inc | 4 +- data/maps/SafariZone_RestHouse/events.inc | 6 +- data/maps/SafariZone_South/events.inc | 12 +-- data/maps/SafariZone_Southeast/events.inc | 10 +- data/maps/SafariZone_Southwest/events.inc | 4 +- data/maps/ScorchedSlab/events.inc | 2 +- data/maps/SeafloorCavern_Entrance/events.inc | 2 +- data/maps/SeafloorCavern_Room1/events.inc | 10 +- data/maps/SeafloorCavern_Room2/events.inc | 16 ++-- data/maps/SeafloorCavern_Room3/events.inc | 18 ++-- data/maps/SeafloorCavern_Room4/events.inc | 4 +- data/maps/SeafloorCavern_Room5/events.inc | 12 +-- data/maps/SeafloorCavern_Room8/events.inc | 24 ++--- data/maps/SeafloorCavern_Room9/events.inc | 14 +-- data/maps/SecretBase_BlueCave1/events.inc | 30 +++--- data/maps/SecretBase_BlueCave2/events.inc | 30 +++--- data/maps/SecretBase_BlueCave3/events.inc | 30 +++--- data/maps/SecretBase_BlueCave4/events.inc | 30 +++--- data/maps/SecretBase_BrownCave1/events.inc | 30 +++--- data/maps/SecretBase_BrownCave2/events.inc | 30 +++--- data/maps/SecretBase_BrownCave3/events.inc | 30 +++--- data/maps/SecretBase_BrownCave4/events.inc | 30 +++--- data/maps/SecretBase_RedCave1/events.inc | 30 +++--- data/maps/SecretBase_RedCave2/events.inc | 30 +++--- data/maps/SecretBase_RedCave3/events.inc | 30 +++--- data/maps/SecretBase_RedCave4/events.inc | 30 +++--- data/maps/SecretBase_Shrub1/events.inc | 30 +++--- data/maps/SecretBase_Shrub2/events.inc | 30 +++--- data/maps/SecretBase_Shrub3/events.inc | 30 +++--- data/maps/SecretBase_Shrub4/events.inc | 30 +++--- data/maps/SecretBase_Tree1/events.inc | 30 +++--- data/maps/SecretBase_Tree2/events.inc | 30 +++--- data/maps/SecretBase_Tree3/events.inc | 30 +++--- data/maps/SecretBase_Tree4/events.inc | 30 +++--- data/maps/SecretBase_YellowCave1/events.inc | 30 +++--- data/maps/SecretBase_YellowCave2/events.inc | 30 +++--- data/maps/SecretBase_YellowCave3/events.inc | 30 +++--- data/maps/SecretBase_YellowCave4/events.inc | 30 +++--- .../ShoalCave_LowTideEntranceRoom/events.inc | 4 +- data/maps/ShoalCave_LowTideIceRoom/events.inc | 4 +- .../ShoalCave_LowTideInnerRoom/events.inc | 2 +- .../ShoalCave_LowTideLowerRoom/events.inc | 4 +- .../ShoalCave_LowTideStairsRoom/events.inc | 2 +- data/maps/SingleBattleColosseum/events.inc | 2 +- data/maps/SkyPillar_Outside/events.inc | 2 +- data/maps/SkyPillar_Top/events.inc | 4 +- data/maps/SlateportCity/events.inc | 70 +++++++------- .../events.inc | 6 +- .../events.inc | 2 +- .../SlateportCity_BattleTentLobby/events.inc | 10 +- data/maps/SlateportCity_Harbor/events.inc | 16 ++-- data/maps/SlateportCity_House1/events.inc | 2 +- data/maps/SlateportCity_House2/events.inc | 4 +- data/maps/SlateportCity_Mart/events.inc | 6 +- .../SlateportCity_OceanicMuseum_1F/events.inc | 28 +++--- .../SlateportCity_OceanicMuseum_2F/events.inc | 14 +-- .../SlateportCity_PokemonCenter_1F/events.inc | 6 +- .../SlateportCity_PokemonCenter_2F/events.inc | 8 +- .../SlateportCity_PokemonFanClub/events.inc | 18 ++-- .../events.inc | 8 +- .../events.inc | 6 +- data/maps/SootopolisCity/events.inc | 36 ++++---- data/maps/SootopolisCity_Gym_1F/events.inc | 4 +- data/maps/SootopolisCity_Gym_B1F/events.inc | 20 ++-- data/maps/SootopolisCity_House1/events.inc | 4 +- data/maps/SootopolisCity_House2/events.inc | 2 +- data/maps/SootopolisCity_House3/events.inc | 4 +- data/maps/SootopolisCity_House4/events.inc | 6 +- data/maps/SootopolisCity_House5/events.inc | 4 +- data/maps/SootopolisCity_House6/events.inc | 2 +- data/maps/SootopolisCity_House7/events.inc | 4 +- .../events.inc | 4 +- data/maps/SootopolisCity_Mart/events.inc | 6 +- .../events.inc | 2 +- .../events.inc | 2 +- .../events.inc | 8 +- .../events.inc | 8 +- data/maps/SouthernIsland_Exterior/events.inc | 4 +- data/maps/SouthernIsland_Interior/events.inc | 4 +- data/maps/TerraCave_End/events.inc | 2 +- data/maps/TradeCenter/events.inc | 2 +- data/maps/TrainerHill_Elevator/events.inc | 2 +- data/maps/TrainerHill_Entrance/events.inc | 10 +- data/maps/TrainerHill_Roof/events.inc | 2 +- .../maps/Underwater_SeafloorCavern/events.inc | 8 +- data/maps/UnionRoom/events.inc | 18 ++-- data/maps/VerdanturfTown/events.inc | 8 +- .../events.inc | 6 +- .../events.inc | 2 +- .../VerdanturfTown_BattleTentLobby/events.inc | 12 +-- .../events.inc | 4 +- data/maps/VerdanturfTown_House/events.inc | 4 +- data/maps/VerdanturfTown_Mart/events.inc | 8 +- .../events.inc | 8 +- .../events.inc | 8 +- .../VerdanturfTown_WandasHouse/events.inc | 10 +- data/maps/VictoryRoad_1F/events.inc | 18 ++-- data/maps/VictoryRoad_B1F/events.inc | 42 ++++----- data/maps/VictoryRoad_B2F/events.inc | 14 +-- 429 files changed, 2777 insertions(+), 2776 deletions(-) diff --git a/data/map_events.s b/data/map_events.s index 4fcfb59796..d268cba635 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,3 +1,4 @@ +#include "constants/event_object_movement_constants.h" #include "constants/event_objects.h" #include "constants/flags.h" #include "constants/items.h" diff --git a/data/maps/AbandonedShip_CaptainsOffice/events.inc b/data/maps/AbandonedShip_CaptainsOffice/events.inc index e7e48568ca..dfe6d84e0f 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/events.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/events.inc @@ -1,6 +1,6 @@ AbandonedShip_CaptainsOffice_EventObjects: @ 8536A5C - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, 8, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, 1, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100 AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK diff --git a/data/maps/AbandonedShip_Corridors_1F/events.inc b/data/maps/AbandonedShip_Corridors_1F/events.inc index f0e2760320..6653509157 100644 --- a/data/maps/AbandonedShip_Corridors_1F/events.inc +++ b/data/maps/AbandonedShip_Corridors_1F/events.inc @@ -1,6 +1,6 @@ AbandonedShip_Corridors_1F_EventObjects: @ 85366C0 - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 17, 7, 3, 2, 1, 1, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0 - object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 10, 3, 45, 4, 7, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0 + object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 17, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0 + object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 7, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0 AbandonedShip_Corridors_1F_MapWarps: @ 85366F0 warp_def 9, 11, 3, 2, MAP_ABANDONED_SHIP_DECK diff --git a/data/maps/AbandonedShip_Corridors_B1F/events.inc b/data/maps/AbandonedShip_Corridors_B1F/events.inc index d1ee694990..d3b72825ef 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/events.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/events.inc @@ -1,6 +1,6 @@ AbandonedShip_Corridors_B1F_EventObjects: @ 8536808 - object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 2, 8, 3, 2, 1, 1, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 6, 3, 14, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0 + object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 2, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0 AbandonedShip_Corridors_B1F_MapWarps: @ 8536838 warp_def 6, 4, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_B1F diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc index e352635a5f..3c9cb9a0dd 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc @@ -1,8 +1,8 @@ AbandonedShip_HiddenFloorRooms_EventObjects: @ 8536B40 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, 1, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, 1, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101 AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0 warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS diff --git a/data/maps/AbandonedShip_Room_B1F/events.inc b/data/maps/AbandonedShip_Room_B1F/events.inc index 1f1cab59aa..f3a1d33278 100644 --- a/data/maps/AbandonedShip_Room_B1F/events.inc +++ b/data/maps/AbandonedShip_Room_B1F/events.inc @@ -1,5 +1,5 @@ AbandonedShip_Room_B1F_EventObjects: @ 853697C - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098 AbandonedShip_Room_B1F_MapWarps: @ 8536994 warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F diff --git a/data/maps/AbandonedShip_Rooms2_1F/events.inc b/data/maps/AbandonedShip_Rooms2_1F/events.inc index 7dfb4d0593..50debde1ba 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/events.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/events.inc @@ -1,9 +1,9 @@ AbandonedShip_Rooms2_1F_EventObjects: @ 85369B8 - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099 - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 3, 2, 3, 10, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0 - object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 7, 2, 3, 9, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0 + object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099 + object_event 4, EVENT_OBJ_GFX_HIKER, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0 + object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0 AbandonedShip_Rooms2_1F_MapWarps: @ 8536A30 warp_def 4, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F diff --git a/data/maps/AbandonedShip_Rooms2_B1F/events.inc b/data/maps/AbandonedShip_Rooms2_B1F/events.inc index 40e4600af2..05d48a6180 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/events.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/events.inc @@ -1,6 +1,6 @@ AbandonedShip_Rooms2_B1F_EventObjects: @ 85368F4 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, 2, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097 AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924 warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F diff --git a/data/maps/AbandonedShip_Rooms_1F/events.inc b/data/maps/AbandonedShip_Rooms_1F/events.inc index 072892b0a2..3b6fc136e7 100644 --- a/data/maps/AbandonedShip_Rooms_1F/events.inc +++ b/data/maps/AbandonedShip_Rooms_1F/events.inc @@ -1,8 +1,8 @@ AbandonedShip_Rooms_1F_EventObjects: @ 8536764 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 5, 3, 2, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095 - object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 10, 11, 3, 8, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 10, 16, 3, 16, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095 + object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 10, 16, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0 AbandonedShip_Rooms_1F_MapWarps: @ 85367C4 warp_def 4, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F diff --git a/data/maps/AbandonedShip_Rooms_B1F/events.inc b/data/maps/AbandonedShip_Rooms_B1F/events.inc index 50bc7c0ee9..97a8aa246a 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/events.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/events.inc @@ -1,6 +1,6 @@ AbandonedShip_Rooms_B1F_EventObjects: @ 8536898 - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, 9, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096 AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8 warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F diff --git a/data/maps/AncientTomb/events.inc b/data/maps/AncientTomb/events.inc index 4950be4ac3..8008e9d5c5 100644 --- a/data/maps/AncientTomb/events.inc +++ b/data/maps/AncientTomb/events.inc @@ -1,5 +1,5 @@ AncientTomb_EventObjects: @ 8536CDC - object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, 8, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937 + object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937 AncientTomb_MapWarps: @ 8536CF4 warp_def 8, 29, 3, 0, MAP_ROUTE120 diff --git a/data/maps/AquaHideout_1F/events.inc b/data/maps/AquaHideout_1F/events.inc index 7d0befd16d..ab7c49b309 100644 --- a/data/maps/AquaHideout_1F/events.inc +++ b/data/maps/AquaHideout_1F/events.inc @@ -1,7 +1,7 @@ AquaHideout_1F_EventObjects: @ 8535304 - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, 50, 13, 5, 1, 3, AquaHideout_1F_EventScript_2334F8, 924 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 13, 5, 1, 3, AquaHideout_1F_EventScript_2334F8, 924 AquaHideout_1F_MapWarps: @ 853534C warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY diff --git a/data/maps/AquaHideout_B1F/events.inc b/data/maps/AquaHideout_B1F/events.inc index 31108fa9c5..bbada49f84 100644 --- a/data/maps/AquaHideout_B1F/events.inc +++ b/data/maps/AquaHideout_B1F/events.inc @@ -1,13 +1,13 @@ AquaHideout_B1F_EventObjects: @ 8535378 - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, 8, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, 9, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, 1, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 20, 18, 3, 23, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291358, 1124 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291365, 1132 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, 978 - object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, 7, 1, 1, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 20, 18, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291358, 1124 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291365, 1132 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, 978 + object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924 AquaHideout_B1F_MapWarps: @ 8535450 warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F diff --git a/data/maps/AquaHideout_B2F/events.inc b/data/maps/AquaHideout_B2F/events.inc index eca22f5f70..628ff11589 100644 --- a/data/maps/AquaHideout_B2F/events.inc +++ b/data/maps/AquaHideout_B2F/events.inc @@ -1,10 +1,10 @@ AquaHideout_B2F_EventObjects: @ 853552C - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 19, 3, 9, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, 924 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, 45, 4, 3, 1, 3, AquaHideout_B2F_EventScript_233E8A, 924 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, 1, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072 - object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, 9, 0, 0, 0, 0, 0x0, 943 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, 10, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, 9, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, 924 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 3, 1, 3, AquaHideout_B2F_EventScript_233E8A, 924 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072 + object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 943 + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924 AquaHideout_B2F_MapWarps: @ 85355BC warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F diff --git a/data/maps/ArtisanCave_1F/events.inc b/data/maps/ArtisanCave_1F/events.inc index edd7429a32..7f7405a55f 100644 --- a/data/maps/ArtisanCave_1F/events.inc +++ b/data/maps/ArtisanCave_1F/events.inc @@ -1,5 +1,5 @@ ArtisanCave_1F_EventObjects: @ 8537774 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, 1, 1, 1, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163 ArtisanCave_1F_MapWarps: @ 853778C warp_def 10, 17, 0, 13, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/ArtisanCave_B1F/events.inc b/data/maps/ArtisanCave_B1F/events.inc index a0b96c3160..4294d60ddf 100644 --- a/data/maps/ArtisanCave_B1F/events.inc +++ b/data/maps/ArtisanCave_B1F/events.inc @@ -1,5 +1,5 @@ ArtisanCave_B1F_EventObjects: @ 8537708 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 38, 3, 1, 1, 1, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162 ArtisanCave_B1F_MapWarps: @ 8537720 warp_def 8, 48, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc index ce6eeb9523..1a8216287c 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc @@ -1,13 +1,13 @@ BattleFrontier_BattleArenaBattleRoom_EventObjects: @ 853C8EC - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 3, 3, 8, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 3, 3, 8, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 9, 3, 7, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 9, 3, 7, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 5, 3, 10, 1, 1, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 5, 3, 9, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 15, 6, 3, 9, 1, 1, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_TRADER, 0, 0, 6, 3, 10, 1, 1, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, 8, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0 + object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0 + object_event 8, EVENT_OBJ_GFX_TRADER, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 + object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattleArenaBattleRoom_MapEvents:: @ 853C9C4 map_events BattleFrontier_BattleArenaBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/events.inc b/data/maps/BattleFrontier_BattleArenaCorridor/events.inc index 03a2cb14d3..bfe28c3393 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/events.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/events.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleArenaCorridor_EventObjects: @ 853C8C0 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 12, 0, 8, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 12, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattleArenaCorridor_MapEvents:: @ 853C8D8 map_events BattleFrontier_BattleArenaCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleArenaLobby/events.inc b/data/maps/BattleFrontier_BattleArenaLobby/events.inc index d0343228ba..4b8e0de0d3 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/events.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/events.inc @@ -1,9 +1,9 @@ BattleFrontier_BattleArenaLobby_EventObjects: @ 853C814 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 7, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 10, 3, 2, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0 - object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 14, 11, 3, 9, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0 - object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 14, 12, 3, 9, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0 - object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 10, 3, 9, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0 + object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0 + object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 14, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0 + object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0 BattleFrontier_BattleArenaLobby_MapWarps: @ 853C88C warp_def 7, 12, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc index 2500a826b5..d33a3103c6 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc @@ -1,19 +1,19 @@ BattleFrontier_BattleDomeBattleRoom_EventObjects: @ 853C1C4 - object_event 1, EVENT_OBJ_GFX_REPORTER_M, 0, 5, 4, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 7, 2, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 2, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 11, 2, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 16, 2, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 4, 2, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 16, 1, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_CAMPER, 0, 8, 1, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 1, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 11, EVENT_OBJ_GFX_GIRL_2, 0, 13, 2, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 10, 2, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_TRADER, 0, 4, 9, 4, 7, 1, 1, 0, 0, 0x0, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_4, 0, 14, 2, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_HIPSTER, 0, 11, 6, 0, 9, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_REPORTER_M, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 7, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 11, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 16, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 16, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 8, EVENT_OBJ_GFX_CAMPER, 0, 8, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 11, EVENT_OBJ_GFX_GIRL_2, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 13, EVENT_OBJ_GFX_TRADER, 0, 4, 9, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 + object_event 14, EVENT_OBJ_GFX_WOMAN_4, 0, 14, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 15, EVENT_OBJ_GFX_HIPSTER, 0, 11, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattleDomeBattleRoom_MapEvents:: @ 853C32C map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/events.inc b/data/maps/BattleFrontier_BattleDomeCorridor/events.inc index 8a8d5448e2..6bce917a01 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/events.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/events.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleDomeCorridor_EventObjects: @ 853C14C - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 23, 5, 0, 8, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 23, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattleDomeCorridor_MapWarps: @ 853C164 warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/BattleFrontier_BattleDomeLobby/events.inc b/data/maps/BattleFrontier_BattleDomeLobby/events.inc index 9c6eb26496..4cd1250334 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/events.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/events.inc @@ -1,10 +1,10 @@ BattleFrontier_BattleDomeLobby_EventObjects: @ 853C068 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 10, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 1, 11, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 14, 14, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0 - object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 18, 14, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0 - object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 8, 14, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0 - object_event 6, EVENT_OBJ_GFX_TEALA, 0, 17, 10, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 1, 11, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 14, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0 + object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 18, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0 + object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 8, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0 + object_event 6, EVENT_OBJ_GFX_TEALA, 0, 17, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0 BattleFrontier_BattleDomeLobby_MapWarps: @ 853C0F8 warp_def 11, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc index 7f2133ac59..559199b292 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleDomePreBattleRoom_EventObjects: @ 853C188 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, 8, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattleDomePreBattleRoom_MapWarps: @ 853C1A0 warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc index 2ea1fbd41a..264c7d731a 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc @@ -1,12 +1,12 @@ BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 853CADC - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 7, 4, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 4, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 6, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 8, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 8, 255, 0, 5, 11, 0, 7, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 8, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 8, 255, 0, 5, 11, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattleFactoryBattleRoom_MapEvents:: @ 853CB9C map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/events.inc b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc index 13de4c5399..dd7b4029dd 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/events.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc @@ -1,10 +1,10 @@ BattleFrontier_BattleFactoryLobby_EventObjects: @ 853C9D8 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 7, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 11, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 14, 11, 0, 8, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 13, 11, 0, 10, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0 - object_event 5, EVENT_OBJ_GFX_FAT_MAN, 0, 6, 10, 0, 1, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0 - object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 7, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 11, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 14, 11, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 13, 11, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0 + object_event 5, EVENT_OBJ_GFX_FAT_MAN, 0, 6, 10, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0 + object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0 BattleFrontier_BattleFactoryLobby_MapWarps: @ 853CA68 warp_def 9, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc index b8ffbfc6d9..d341250dee 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventObjects: @ 853CAB0 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 12, 0, 7, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 12, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattleFactoryPreBattleRoom_MapEvents:: @ 853CAC8 map_events BattleFrontier_BattleFactoryPreBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc index bc1d5a525c..4c84a209fc 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc @@ -1,9 +1,9 @@ BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC - object_event 1, EVENT_OBJ_GFX_TRADER, 0, 1, 9, 3, 7, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 13, 1, 3, 8, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 1, 4, 3, 10, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 13, 1, 3, 8, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 13, 1, 3, 8, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_TRADER, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattlePalaceBattleRoom_MapWarps: @ 853C574 warp_def 0, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc index f6baf26f69..bf06dcf345 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc @@ -1,11 +1,11 @@ BattleFrontier_BattlePalaceCorridor_EventObjects: @ 853C420 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 8, 12, 3, 7, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 3, 5, 0, 2, 1, 0, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_KIRLIA, 0, 12, 6, 0, 14, 0, 2, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_PIKACHU, 0, 15, 5, 0, 1, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 9, 0, 14, 0, 2, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 13, 9, 0, 1, 0, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 3, 10, 0, 2, 1, 2, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 8, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 3, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 0, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_KIRLIA, 0, 12, 6, 0, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 2, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_PIKACHU, 0, 15, 5, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 9, 0, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 2, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 13, 9, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 1, 0, 0, 0x0, 0 + object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 3, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, 0x0, 0 BattleFrontier_BattlePalaceCorridor_MapWarps: @ 853C4C8 warp_def 8, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/events.inc b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc index 56da378cb5..c53e0f875f 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/events.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc @@ -1,10 +1,10 @@ BattleFrontier_BattlePalaceLobby_EventObjects: @ 853C340 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 6, 0, 8, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 8, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 24, 5, 0, 8, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 18, 10, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0 - object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 2, 10, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0 - object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 19, 6, 0, 8, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 8, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 24, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 18, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0 + object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 2, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0 + object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 19, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0 BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0 warp_def 12, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/events.inc b/data/maps/BattleFrontier_BattlePikeCorridor/events.inc index 67ceaaae68..8734e4dc86 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/events.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/events.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePikeCorridor_EventObjects: @ 853CC54 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 6, 6, 3, 8, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattlePikeCorridor_MapEvents:: @ 853CC6C map_events BattleFrontier_BattlePikeCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeLobby/events.inc b/data/maps/BattleFrontier_BattlePikeLobby/events.inc index 45d3da1034..5fddc6f373 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/events.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/events.inc @@ -1,8 +1,8 @@ BattleFrontier_BattlePikeLobby_EventObjects: @ 853CBB0 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 5, 5, 3, 8, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 10, 9, 3, 7, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 3, 9, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 8, 9, 3, 2, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 8, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0 BattleFrontier_BattlePikeLobby_MapWarps: @ 853CC10 warp_def 5, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc index 80c1fc3bf1..07c2866a1e 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 853CD54 - object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 4, 4, 3, 8, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0 - object_event 2, EVENT_OBJ_GFX_TRADER, 0, 3, 4, 3, 8, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0 + object_event 2, EVENT_OBJ_GFX_TRADER, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0 BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84 coord_event 4, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc index 9cff205176..3ce444a531 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePikeRandomRoom2_EventObjects: @ 853CE08 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 2, 4, 3, 8, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattlePikeRandomRoom2_MapEvents:: @ 853CE20 map_events BattleFrontier_BattlePikeRandomRoom2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc index 7a23ba8929..a04f0cf4ec 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePikeThreePathRoom_EventObjects: @ 853CC80 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 4, 10, 3, 10, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_6, 0, 8, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 4, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_6, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0 BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0 coord_event 2, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc index 7a8c584acb..2945034bc9 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc @@ -1,13 +1,13 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: @ 853D018 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 4, 0, 9, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0 - object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 5, 0, 10, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 0, 8, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 14, 6, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0 - object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 1, 9, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0 - object_event 6, EVENT_OBJ_GFX_TEALA, 0, 5, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0 - object_event 7, EVENT_OBJ_GFX_TEALA, 0, 9, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0 - object_event 8, EVENT_OBJ_GFX_TEALA, 0, 10, 4, 0, 10, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0 - object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 12, 10, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0 + object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0 + object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 14, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0 + object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 1, 9, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0 + object_event 6, EVENT_OBJ_GFX_TEALA, 0, 5, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0 + object_event 7, EVENT_OBJ_GFX_TEALA, 0, 9, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0 + object_event 8, EVENT_OBJ_GFX_TEALA, 0, 10, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0 + object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 12, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0 BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: @ 853D0F0 warp_def 7, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc index f7d22a5ed8..3e66eec7d1 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc @@ -1,20 +1,20 @@ BattleFrontier_BattlePyramidEmptySquare_EventObjects: @ 853C62C - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 0, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 0, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 0, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 0, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 0, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 0, 1, 1, 1, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 10, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 1, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 11, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 1, 0, 1, 1, 1, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 1, 0, 1, 1, 1, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 1, 0, 1, 1, 1, 0, 0, 0x0, 0 - object_event 14, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 1, 0, 1, 1, 1, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, 1, 1, 1, 0, 0, 0x0, 0 - object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 1, 0, 1, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 0, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 8, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 9, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 10, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 11, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 12, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 13, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 14, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattlePyramidEmptySquare_MapEvents:: @ 853C7AC map_events BattleFrontier_BattlePyramidEmptySquare_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc index 28b5f5c61f..dd37229450 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 diff --git a/data/maps/BattleFrontier_BattlePyramidTop/events.inc b/data/maps/BattleFrontier_BattlePyramidTop/events.inc index f724f4f9f7..a42052d96d 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/events.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/events.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePyramidTop_EventObjects: @ 853C7C0 - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 17, 11, 6, 8, 1, 1, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0 - object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 17, 7, 0, 7, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 17, 11, 6, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0 + object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 17, 7, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattlePyramidTop_MapCoordEvents: @ 853C7F0 coord_event 17, 9, 4, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePyramidTop_EventScript_255256 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc index 0bc8d04348..55aed13a44 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc @@ -1,7 +1,7 @@ BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0 - object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 888 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 BattleFrontier_BattleTowerBattleRoom_MapWarps: @ 853B818 warp_def 5, 8, 0, 2, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc index f97d8ad0cd..505a903da6 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc @@ -1,10 +1,10 @@ BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4 - object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 4, 3, 10, 0, 0, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, 10, 0, 0, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_TRADER, 0, 4, 1, 3, 8, 0, 0, 0, 0, 0x0, 888 - object_event 5, 255, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0 - object_event 6, 254, 0, 5, 8, 3, 7, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 888 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_TRADER, 0, 4, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 888 + object_event 5, 255, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 + object_event 6, 254, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 BattleFrontier_BattleTowerBattleRoom2_MapEvents:: @ 853C054 map_events BattleFrontier_BattleTowerBattleRoom2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/events.inc b/data/maps/BattleFrontier_BattleTowerCorridor/events.inc index 23f3377f37..ae3ca25754 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/events.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/events.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleTowerCorridor_EventObjects: @ 853B7A4 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 9, 2, 3, 9, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 BattleFrontier_BattleTowerCorridor_MapEvents:: @ 853B7BC map_events BattleFrontier_BattleTowerCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc index 9dce5da52e..8f6a1e2f02 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc @@ -1,8 +1,8 @@ BattleFrontier_BattleTowerCorridor2_EventObjects: @ 853BF50 - object_event 1, 255, 0, 1, 1, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 14, 3, 3, 7, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 3, 3, 7, 1, 1, 0, 0, 0x0, 0 - object_event 4, 254, 0, 14, 1, 0, 8, 1, 1, 0, 0, 0x0, 0 + object_event 1, 255, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 14, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 + object_event 4, 254, 0, 14, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattleTowerCorridor2_MapEvents:: @ 853BFB0 map_events BattleFrontier_BattleTowerCorridor2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerElevator/events.inc b/data/maps/BattleFrontier_BattleTowerElevator/events.inc index 321fc90e3d..671d6d4342 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/events.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/events.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleTowerElevator_EventObjects: @ 853B778 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, 7, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 BattleFrontier_BattleTowerElevator_MapEvents:: @ 853B790 map_events BattleFrontier_BattleTowerElevator_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerLobby/events.inc b/data/maps/BattleFrontier_BattleTowerLobby/events.inc index 86e159b635..ef38d131b8 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/events.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/events.inc @@ -1,13 +1,13 @@ BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 23, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 17, 8, 3, 2, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 15, 9, 3, 2, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 9, 3, 10, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, 918 - object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 1, 5, 3, 8, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_2B688D, 701 - object_event 7, EVENT_OBJ_GFX_TEALA, 0, 10, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0 - object_event 8, EVENT_OBJ_GFX_TEALA, 0, 14, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0 - object_event 9, EVENT_OBJ_GFX_TEALA, 0, 18, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 17, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0 + object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 15, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0 + object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, 918 + object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_2B688D, 701 + object_event 7, EVENT_OBJ_GFX_TEALA, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0 + object_event 8, EVENT_OBJ_GFX_TEALA, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0 + object_event 9, EVENT_OBJ_GFX_TEALA, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0 BattleFrontier_BattleTowerLobby_MapWarps: @ 853B710 warp_def 12, 9, 3, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc index 0c730f37d5..533e6af8be 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc @@ -1,13 +1,13 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 853BE64 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 2, 3, 8, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 2, 10, 3, 1, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, 711 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 17, 11, 3, 14, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, 712 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 6, 9, 3, 1, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, 713 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 8, 13, 3, 1, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, 714 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 10, 11, 3, 7, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, 715 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 13, 10, 3, 10, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, 716 - object_event 8, 246, 0, 15, 13, 3, 15, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, 864 - object_event 9, 247, 0, 4, 12, 3, 10, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, 865 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 2, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, 711 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, 712 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, 713 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, 714 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, 715 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, 716 + object_event 8, 246, 0, 15, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, 864 + object_event 9, 247, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, 865 BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: @ 853BF3C map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge1/events.inc b/data/maps/BattleFrontier_Lounge1/events.inc index b6c6ecdd03..1303c3c336 100644 --- a/data/maps/BattleFrontier_Lounge1/events.inc +++ b/data/maps/BattleFrontier_Lounge1/events.inc @@ -1,7 +1,7 @@ BattleFrontier_Lounge1_EventObjects: @ 853CFB4 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 6, 0, 10, 1, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 7, 6, 0, 2, 1, 2, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 0, 2, 2, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 6, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0 + object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 7, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0 + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0 BattleFrontier_Lounge1_MapWarps: @ 853CFFC warp_def 4, 9, 0, 5, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/BattleFrontier_Lounge2/events.inc b/data/maps/BattleFrontier_Lounge2/events.inc index 0616573bd5..cc32ddf425 100644 --- a/data/maps/BattleFrontier_Lounge2/events.inc +++ b/data/maps/BattleFrontier_Lounge2/events.inc @@ -1,9 +1,9 @@ BattleFrontier_Lounge2_EventObjects: @ 853D11C - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 8, 4, 0, 10, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0 - object_event 2, EVENT_OBJ_GFX_MANIAC, 0, 10, 4, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 10, 3, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0 - object_event 4, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 4, 6, 0, 2, 1, 2, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0 - object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 10, 5, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0 + object_event 2, EVENT_OBJ_GFX_MANIAC, 0, 10, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 10, 3, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0 + object_event 4, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 4, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0 + object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 10, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0 BattleFrontier_Lounge2_MapWarps: @ 853D194 warp_def 1, 7, 0, 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/BattleFrontier_Lounge3/events.inc b/data/maps/BattleFrontier_Lounge3/events.inc index dbaa20fe12..75f04250cf 100644 --- a/data/maps/BattleFrontier_Lounge3/events.inc +++ b/data/maps/BattleFrontier_Lounge3/events.inc @@ -1,9 +1,9 @@ BattleFrontier_Lounge3_EventObjects: @ 853D1B8 - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 4, 6, 0, 7, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 0, 8, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 5, 0, 10, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0 - object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 6, 0, 2, 0, 3, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 4, 6, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0 + object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 0, 3, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0 BattleFrontier_Lounge3_MapWarps: @ 853D230 warp_def 4, 9, 0, 9, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/BattleFrontier_Lounge4/events.inc b/data/maps/BattleFrontier_Lounge4/events.inc index 613adfae21..c0dfbcf3e0 100644 --- a/data/maps/BattleFrontier_Lounge4/events.inc +++ b/data/maps/BattleFrontier_Lounge4/events.inc @@ -1,7 +1,7 @@ BattleFrontier_Lounge4_EventObjects: @ 853D24C - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 4, 0, 7, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0 - object_event 2, EVENT_OBJ_GFX_COOK, 0, 6, 6, 0, 2, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 0, 10, 2, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0 + object_event 2, EVENT_OBJ_GFX_COOK, 0, 6, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 2, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0 BattleFrontier_Lounge4_MapWarps: @ 853D294 warp_def 4, 9, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/BattleFrontier_Lounge5/events.inc b/data/maps/BattleFrontier_Lounge5/events.inc index 0224ae0a95..798deb1c23 100644 --- a/data/maps/BattleFrontier_Lounge5/events.inc +++ b/data/maps/BattleFrontier_Lounge5/events.inc @@ -1,8 +1,8 @@ BattleFrontier_Lounge5_EventObjects: @ 853D2EC - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 12, 4, 4, 9, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 3, 10, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 0, 2, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 11, 7, 0, 1, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 12, 4, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0 + object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 11, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0 BattleFrontier_Lounge5_MapWarps: @ 853D34C warp_def 1, 7, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/BattleFrontier_Lounge6/events.inc b/data/maps/BattleFrontier_Lounge6/events.inc index 092be452b3..24d7958ec4 100644 --- a/data/maps/BattleFrontier_Lounge6/events.inc +++ b/data/maps/BattleFrontier_Lounge6/events.inc @@ -1,5 +1,5 @@ BattleFrontier_Lounge6_EventObjects: @ 853D370 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 2, 4, 0, 10, 1, 1, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 2, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0 BattleFrontier_Lounge6_MapWarps: @ 853D388 warp_def 4, 9, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/BattleFrontier_Lounge7/events.inc b/data/maps/BattleFrontier_Lounge7/events.inc index c5490d6c9c..901ac6641e 100644 --- a/data/maps/BattleFrontier_Lounge7/events.inc +++ b/data/maps/BattleFrontier_Lounge7/events.inc @@ -1,8 +1,8 @@ BattleFrontier_Lounge7_EventObjects: @ 853D3A4 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 7, 0, 2, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 2, 5, 0, 10, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 6, 5, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0 - object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 8, 3, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 7, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 2, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 6, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0 + object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 8, 3, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0 BattleFrontier_Lounge7_MapWarps: @ 853D404 warp_def 4, 9, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/BattleFrontier_Lounge8/events.inc b/data/maps/BattleFrontier_Lounge8/events.inc index 116cc007fa..92d27d7656 100644 --- a/data/maps/BattleFrontier_Lounge8/events.inc +++ b/data/maps/BattleFrontier_Lounge8/events.inc @@ -1,7 +1,7 @@ BattleFrontier_Lounge8_EventObjects: @ 853D4BC - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 4, 5, 0, 2, 2, 2, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 8, 7, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 4, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 4, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 8, 7, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0 BattleFrontier_Lounge8_MapWarps: @ 853D504 warp_def 4, 9, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/BattleFrontier_Lounge9/events.inc b/data/maps/BattleFrontier_Lounge9/events.inc index 6500ab66a5..6598e0229e 100644 --- a/data/maps/BattleFrontier_Lounge9/events.inc +++ b/data/maps/BattleFrontier_Lounge9/events.inc @@ -1,5 +1,5 @@ BattleFrontier_Lounge9_EventObjects: @ 853D520 - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 6, 3, 0, 1, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 6, 3, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 BattleFrontier_Lounge9_MapWarps: @ 853D538 warp_def 1, 9, 0, 11, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/BattleFrontier_Mart/events.inc b/data/maps/BattleFrontier_Mart/events.inc index 669945b990..3ca67e0389 100644 --- a/data/maps/BattleFrontier_Mart/events.inc +++ b/data/maps/BattleFrontier_Mart/events.inc @@ -1,8 +1,8 @@ BattleFrontier_Mart_EventObjects: @ 853D68C - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 5, 4, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 5, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 8, 4, 3, 9, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0 BattleFrontier_Mart_MapWarps: @ 853D6EC warp_def 3, 7, 0, 4, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/BattleFrontier_OutsideEast/events.inc b/data/maps/BattleFrontier_OutsideEast/events.inc index 37fa6e7bd8..7d25049fde 100644 --- a/data/maps/BattleFrontier_OutsideEast/events.inc +++ b/data/maps/BattleFrontier_OutsideEast/events.inc @@ -1,30 +1,30 @@ BattleFrontier_OutsideEast_EventObjects: @ 853BB10 - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 20, 17, 0, 27, 3, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 42, 15, 0, 2, 1, 3, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 53, 6, 0, 8, 2, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0 - object_event 4, EVENT_OBJ_GFX_HEX_MANIAC, 0, 54, 16, 0, 2, 2, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C82, 0 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 37, 32, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C8B, 0 - object_event 6, EVENT_OBJ_GFX_COOK, 0, 41, 56, 3, 9, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C94, 0 - object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 46, 0, 1, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CBB, 0 - object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 34, 41, 0, 28, 3, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CE1, 0 - object_event 9, EVENT_OBJ_GFX_BOY_4, 0, 45, 47, 3, 1, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CB2, 0 - object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 59, 35, 0, 26, 1, 6, 0, 0, BattleFrontier_OutsideEast_EventScript_242CC4, 0 - object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 18, 40, 0, 1, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0 - object_event 12, EVENT_OBJ_GFX_MAN_1, 0, 17, 40, 0, 10, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0 - object_event 13, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 40, 56, 3, 1, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0 - object_event 14, EVENT_OBJ_GFX_SUDOWOODO, 0, 54, 62, 3, 8, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, 842 - object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 42, 34, 3, 1, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0 - object_event 16, EVENT_OBJ_GFX_GIRL_3, 0, 51, 53, 3, 2, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0 - object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 62, 18, 0, 46, 2, 6, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0 - object_event 18, EVENT_OBJ_GFX_MAN_4, 0, 11, 21, 0, 1, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 0 - object_event 19, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 21, 0, 10, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 0 - object_event 20, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 30, 0, 2, 3, 2, 0, 0, BattleFrontier_OutsideEast_EventScript_242DA6, 0 - object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 33, 14, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DAF, 0 - object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 54, 31, 0, 9, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DB8, 0 - object_event 23, EVENT_OBJ_GFX_WOMAN_5, 0, 54, 32, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DC3, 0 - object_event 24, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 58, 55, 3, 17, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE9, 0 - object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 48, 41, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0 - object_event 26, EVENT_OBJ_GFX_CAMPER, 0, 29, 14, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 20, 17, 0, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 42, 15, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0 + object_event 3, EVENT_OBJ_GFX_HIKER, 0, 53, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 2, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0 + object_event 4, EVENT_OBJ_GFX_HEX_MANIAC, 0, 54, 16, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C82, 0 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 37, 32, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C8B, 0 + object_event 6, EVENT_OBJ_GFX_COOK, 0, 41, 56, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C94, 0 + object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 46, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CBB, 0 + object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 34, 41, 0, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 3, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CE1, 0 + object_event 9, EVENT_OBJ_GFX_BOY_4, 0, 45, 47, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CB2, 0 + object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 59, 35, 0, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 6, 0, 0, BattleFrontier_OutsideEast_EventScript_242CC4, 0 + object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 18, 40, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0 + object_event 12, EVENT_OBJ_GFX_MAN_1, 0, 17, 40, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0 + object_event 13, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 40, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0 + object_event 14, EVENT_OBJ_GFX_SUDOWOODO, 0, 54, 62, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, 842 + object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 42, 34, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0 + object_event 16, EVENT_OBJ_GFX_GIRL_3, 0, 51, 53, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0 + object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 62, 18, 0, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 2, 6, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0 + object_event 18, EVENT_OBJ_GFX_MAN_4, 0, 11, 21, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 0 + object_event 19, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 21, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 0 + object_event 20, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 30, 0, MOVEMENT_TYPE_WANDER_AROUND, 3, 2, 0, 0, BattleFrontier_OutsideEast_EventScript_242DA6, 0 + object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 33, 14, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DAF, 0 + object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 54, 31, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DB8, 0 + object_event 23, EVENT_OBJ_GFX_WOMAN_5, 0, 54, 32, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DC3, 0 + object_event 24, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 58, 55, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE9, 0 + object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 48, 41, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0 + object_event 26, EVENT_OBJ_GFX_CAMPER, 0, 29, 14, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0 BattleFrontier_OutsideEast_MapWarps: @ 853BD80 warp_def 16, 14, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY diff --git a/data/maps/BattleFrontier_OutsideWest/events.inc b/data/maps/BattleFrontier_OutsideWest/events.inc index 643e26e2e4..b2315873c2 100644 --- a/data/maps/BattleFrontier_OutsideWest/events.inc +++ b/data/maps/BattleFrontier_OutsideWest/events.inc @@ -1,28 +1,28 @@ BattleFrontier_OutsideWest_EventObjects: @ 853B350 - object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 26, 38, 0, 2, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 20, 70, 0, 10, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 19, 68, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 26, 20, 0, 5, 8, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D68B, 0 - object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 27, 30, 0, 2, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 33, 41, 0, 2, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0 - object_event 7, EVENT_OBJ_GFX_FAT_MAN, 0, 28, 43, 0, 3, 0, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 0 - object_event 8, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 20, 0, 2, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 13, 44, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 0 - object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 14, 44, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 0 - object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 23, 47, 0, 15, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0 - object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 38, 27, 0, 2, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 0 - object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 45, 18, 0, 3, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0 - object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 9, 47, 0, 15, 1, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 0 - object_event 15, EVENT_OBJ_GFX_LASS, 0, 35, 5, 0, 2, 2, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 0 - object_event 16, EVENT_OBJ_GFX_MAN_2, 0, 11, 66, 0, 9, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 0 - object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 31, 31, 0, 8, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 0 - object_event 18, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 48, 0, 18, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 0 - object_event 19, EVENT_OBJ_GFX_FAT_MAN, 0, 38, 22, 0, 3, 0, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 0 - object_event 20, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 9, 0, 8, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0 - object_event 21, EVENT_OBJ_GFX_BOY_1, 0, 12, 10, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 0 - object_event 22, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 10, 0, 23, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0 - object_event 23, EVENT_OBJ_GFX_MAN_5, 0, 8, 5, 0, 8, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0 - object_event 24, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 26, 0, 24, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0 + object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 26, 38, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 20, 70, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 19, 68, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 26, 20, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 8, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D68B, 0 + object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 27, 30, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 33, 41, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0 + object_event 7, EVENT_OBJ_GFX_FAT_MAN, 0, 28, 43, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 0 + object_event 8, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 20, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 0 + object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 13, 44, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 0 + object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 14, 44, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 0 + object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 23, 47, 0, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0 + object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 38, 27, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 0 + object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 45, 18, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0 + object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 9, 47, 0, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 0 + object_event 15, EVENT_OBJ_GFX_LASS, 0, 35, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 0 + object_event 16, EVENT_OBJ_GFX_MAN_2, 0, 11, 66, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 0 + object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 31, 31, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 0 + object_event 18, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 48, 0, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 0 + object_event 19, EVENT_OBJ_GFX_FAT_MAN, 0, 38, 22, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 0 + object_event 20, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 9, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0 + object_event 21, EVENT_OBJ_GFX_BOY_1, 0, 12, 10, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 0 + object_event 22, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 10, 0, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0 + object_event 23, EVENT_OBJ_GFX_MAN_5, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0 + object_event 24, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 26, 0, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0 BattleFrontier_OutsideWest_MapWarps: @ 853B590 warp_def 42, 27, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/events.inc b/data/maps/BattleFrontier_PokemonCenter_1F/events.inc index ba07ed15c2..cf02155734 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/events.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/events.inc @@ -1,9 +1,9 @@ BattleFrontier_PokemonCenter_1F_EventObjects: @ 853D55C - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 4, 5, 3, 14, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 11, 4, 3, 8, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 2, 3, 3, 9, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0 - object_event 5, EVENT_OBJ_GFX_SKITTY, 0, 1, 3, 3, 10, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0 + object_event 5, EVENT_OBJ_GFX_SKITTY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0 BattleFrontier_PokemonCenter_1F_MapWarps: @ 853D5D4 warp_def 7, 8, 3, 12, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/events.inc b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc index bb5bb61191..4d0b880906 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/events.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ BattleFrontier_PokemonCenter_2F_EventObjects: @ 853D600 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, 8, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_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, BattleFrontier_PokemonCenter_2F_EventScript_276B03, 702 BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660 warp_def 1, 6, 4, 2, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F diff --git a/data/maps/BattleFrontier_RankingHall/events.inc b/data/maps/BattleFrontier_RankingHall/events.inc index 239c372c6b..ba9d3a30f4 100644 --- a/data/maps/BattleFrontier_RankingHall/events.inc +++ b/data/maps/BattleFrontier_RankingHall/events.inc @@ -1,7 +1,7 @@ BattleFrontier_RankingHall_EventObjects: @ 853CEB8 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 24, 13, 3, 8, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 4, 10, 3, 2, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0 - object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 44, 11, 3, 2, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 24, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 4, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0 + object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 44, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0 BattleFrontier_RankingHall_MapWarps: @ 853CF00 warp_def 26, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/BattleFrontier_ReceptionGate/events.inc b/data/maps/BattleFrontier_ReceptionGate/events.inc index 34db359fca..c29718501d 100644 --- a/data/maps/BattleFrontier_ReceptionGate/events.inc +++ b/data/maps/BattleFrontier_ReceptionGate/events.inc @@ -1,9 +1,9 @@ BattleFrontier_ReceptionGate_EventObjects: @ 853D420 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 0, 10, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 8, 11, 0, 9, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0 - object_event 3, EVENT_OBJ_GFX_MAN_2, 0, 8, 4, 0, 9, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0 - object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 4, 5, 3, 8, 1, 1, 0, 0, 0x0, 836 - object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, 10, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 8, 11, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0 + object_event 3, EVENT_OBJ_GFX_MAN_2, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0 + object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 836 + object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0 BattleFrontier_ReceptionGate_MapWarps: @ 853D498 warp_def 4, 13, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/BattleFrontier_ScottsHouse/events.inc b/data/maps/BattleFrontier_ScottsHouse/events.inc index 6e3de083ca..3f4dcff869 100644 --- a/data/maps/BattleFrontier_ScottsHouse/events.inc +++ b/data/maps/BattleFrontier_ScottsHouse/events.inc @@ -1,5 +1,5 @@ BattleFrontier_ScottsHouse_EventObjects: @ 853D2B0 - object_event 1, EVENT_OBJ_GFX_SCOTT, 0, 2, 3, 3, 1, 1, 1, 0, 0, BattleFrontier_ScottsHouse_EventScript_2636A8, 0 + object_event 1, EVENT_OBJ_GFX_SCOTT, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_ScottsHouse_EventScript_2636A8, 0 BattleFrontier_ScottsHouse_MapWarps: @ 853D2C8 warp_def 2, 7, 3, 5, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/BattlePyramidSquare01/events.inc b/data/maps/BattlePyramidSquare01/events.inc index 6774991526..bd6b45b820 100644 --- a/data/maps/BattlePyramidSquare01/events.inc +++ b/data/maps/BattlePyramidSquare01/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare01_EventObjects: @ 853A460 - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 3, 4, 18, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 5, 3, 4, 17, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 2, 6, 4, 16, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 6, 6, 4, 9, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 1, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 3, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 5, 3, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 2, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 6, 6, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare01_MapEvents:: @ 853A508 map_events BattlePyramidSquare01_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare02/events.inc b/data/maps/BattlePyramidSquare02/events.inc index 1133979ee9..67f235026c 100644 --- a/data/maps/BattlePyramidSquare02/events.inc +++ b/data/maps/BattlePyramidSquare02/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare02_EventObjects: @ 853A51C - object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 2, 1, 4, 18, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 6, 4, 15, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 6, 4, 16, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 1, 4, 17, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 5, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare02_MapEvents:: @ 853A5C4 map_events BattlePyramidSquare02_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare03/events.inc b/data/maps/BattlePyramidSquare03/events.inc index 95fdb77bcd..1f38240c50 100644 --- a/data/maps/BattlePyramidSquare03/events.inc +++ b/data/maps/BattlePyramidSquare03/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare03_EventObjects: @ 853A5D8 - object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 2, 1, 4, 18, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 6, 1, 4, 17, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 6, 4, 4, 15, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 3, 4, 4, 18, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 6, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 3, 4, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare03_MapEvents:: @ 853A680 map_events BattlePyramidSquare03_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare04/events.inc b/data/maps/BattlePyramidSquare04/events.inc index 3b19c7f09a..f44a6e14c4 100644 --- a/data/maps/BattlePyramidSquare04/events.inc +++ b/data/maps/BattlePyramidSquare04/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare04_EventObjects: @ 853A694 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 2, 4, 17, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 7, 7, 4, 15, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 1, 4, 4, 18, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 6, 4, 4, 15, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 6, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 7, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 1, 4, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare04_MapEvents:: @ 853A73C map_events BattlePyramidSquare04_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare05/events.inc b/data/maps/BattlePyramidSquare05/events.inc index 17f6aab606..472178c56b 100644 --- a/data/maps/BattlePyramidSquare05/events.inc +++ b/data/maps/BattlePyramidSquare05/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare05_EventObjects: @ 853A750 - object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 6, 4, 4, 7, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 3, 7, 4, 16, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 3, 1, 4, 8, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 6, 0, 4, 17, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 3, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 3, 1, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare05_MapEvents:: @ 853A7F8 map_events BattlePyramidSquare05_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare06/events.inc b/data/maps/BattlePyramidSquare06/events.inc index 6ae39b52f4..3363f6d43d 100644 --- a/data/maps/BattlePyramidSquare06/events.inc +++ b/data/maps/BattlePyramidSquare06/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare06_EventObjects: @ 853A80C - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 5, 2, 4, 17, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 2, 5, 4, 16, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 5, 5, 4, 15, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 4, 18, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 5, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 2, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 5, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare06_MapEvents:: @ 853A8B4 map_events BattlePyramidSquare06_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare07/events.inc b/data/maps/BattlePyramidSquare07/events.inc index 788c5e40cd..2891e92dfb 100644 --- a/data/maps/BattlePyramidSquare07/events.inc +++ b/data/maps/BattlePyramidSquare07/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare07_EventObjects: @ 853A8C8 - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 4, 10, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 4, 0, 4, 17, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 6, 0, 4, 8, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 4, 4, 4, 15, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 4, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 4, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare07_MapEvents:: @ 853A970 map_events BattlePyramidSquare07_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare08/events.inc b/data/maps/BattlePyramidSquare08/events.inc index 780fab9ede..f095c39727 100644 --- a/data/maps/BattlePyramidSquare08/events.inc +++ b/data/maps/BattlePyramidSquare08/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare08_EventObjects: @ 853A984 - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 2, 4, 18, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 5, 4, 15, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 5, 4, 16, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 2, 4, 15, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 2, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare08_MapEvents:: @ 853AA2C map_events BattlePyramidSquare08_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare09/events.inc b/data/maps/BattlePyramidSquare09/events.inc index 569059af5a..265b9b1b61 100644 --- a/data/maps/BattlePyramidSquare09/events.inc +++ b/data/maps/BattlePyramidSquare09/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare09_EventObjects: @ 853AA40 - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 3, 0, 4, 8, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 4, 4, 15, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 0, 4, 17, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 3, 5, 4, 15, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 6, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 3, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 3, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare09_MapEvents:: @ 853AAE8 map_events BattlePyramidSquare09_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare10/events.inc b/data/maps/BattlePyramidSquare10/events.inc index ae3c4f88e4..b697a7d026 100644 --- a/data/maps/BattlePyramidSquare10/events.inc +++ b/data/maps/BattlePyramidSquare10/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare10_EventObjects: @ 853AAFC - object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 3, 0, 4, 17, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 3, 4, 10, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 6, 5, 4, 9, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 4, 10, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 3, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 3, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare10_MapEvents:: @ 853ABA4 map_events BattlePyramidSquare10_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare11/events.inc b/data/maps/BattlePyramidSquare11/events.inc index 0389ee141a..6210faa6f9 100644 --- a/data/maps/BattlePyramidSquare11/events.inc +++ b/data/maps/BattlePyramidSquare11/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare11_EventObjects: @ 853ABB8 - object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 3, 2, 4, 8, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 3, 6, 4, 14, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 6, 4, 4, 8, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 6, 7, 4, 7, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 5, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 3, 2, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 3, 6, 4, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 6, 7, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare11_MapEvents:: @ 853AC60 map_events BattlePyramidSquare11_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare12/events.inc b/data/maps/BattlePyramidSquare12/events.inc index db27c6c64a..cad871e8d2 100644 --- a/data/maps/BattlePyramidSquare12/events.inc +++ b/data/maps/BattlePyramidSquare12/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare12_EventObjects: @ 853AC74 - object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 7, 5, 4, 9, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 5, 4, 10, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 0, 4, 8, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 3, 4, 7, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 7, 5, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 5, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 3, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare12_MapEvents:: @ 853AD1C map_events BattlePyramidSquare12_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare13/events.inc b/data/maps/BattlePyramidSquare13/events.inc index 12ac8ffe7e..af56598c3f 100644 --- a/data/maps/BattlePyramidSquare13/events.inc +++ b/data/maps/BattlePyramidSquare13/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare13_EventObjects: @ 853AD30 - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 1, 4, 8, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 6, 4, 7, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 1, 4, 8, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 6, 4, 7, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 1, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 6, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 1, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 6, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare13_MapEvents:: @ 853ADD8 map_events BattlePyramidSquare13_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare14/events.inc b/data/maps/BattlePyramidSquare14/events.inc index c63fabee38..48b98a3617 100644 --- a/data/maps/BattlePyramidSquare14/events.inc +++ b/data/maps/BattlePyramidSquare14/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare14_EventObjects: @ 853ADEC - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 1, 4, 17, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 1, 4, 18, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 5, 4, 15, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 4, 16, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare14_MapEvents:: @ 853AE94 map_events BattlePyramidSquare14_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare15/events.inc b/data/maps/BattlePyramidSquare15/events.inc index f2332f18bd..50d0addf25 100644 --- a/data/maps/BattlePyramidSquare15/events.inc +++ b/data/maps/BattlePyramidSquare15/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare15_EventObjects: @ 853AEA8 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 5, 4, 16, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 1, 4, 18, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 4, 15, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 0, 4, 17, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare15_MapEvents:: @ 853AF50 map_events BattlePyramidSquare15_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare16/events.inc b/data/maps/BattlePyramidSquare16/events.inc index 38d398b5b5..84bb566c23 100644 --- a/data/maps/BattlePyramidSquare16/events.inc +++ b/data/maps/BattlePyramidSquare16/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare16_EventObjects: @ 853AF64 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 16, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 0, 0, 18, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 7, 4, 15, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 0, 4, 17, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 0, 0, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare16_MapEvents:: @ 853B00C map_events BattlePyramidSquare16_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BirthIsland_Exterior/events.inc b/data/maps/BirthIsland_Exterior/events.inc index 86f4d43cb5..4093e4086b 100644 --- a/data/maps/BirthIsland_Exterior/events.inc +++ b/data/maps/BirthIsland_Exterior/events.inc @@ -1,6 +1,6 @@ BirthIsland_Exterior_EventObjects: @ 853D7DC - object_event 1, EVENT_OBJ_GFX_DEOXYS_TRIANGLE, 0, 15, 12, 3, 8, 1, 1, 0, 0, BirthIsland_Exterior_EventScript_267F83, 764 - object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 15, 3, 0, 8, 1, 1, 0, 0, 0x0, 763 + object_event 1, EVENT_OBJ_GFX_DEOXYS_TRIANGLE, 0, 15, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BirthIsland_Exterior_EventScript_267F83, 764 + object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 15, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 763 BirthIsland_Exterior_MapWarps: @ 853D80C warp_def 15, 24, 0, 0, MAP_BIRTH_ISLAND_HARBOR diff --git a/data/maps/BirthIsland_Harbor/events.inc b/data/maps/BirthIsland_Harbor/events.inc index f5c38358db..8b8fe46607 100644 --- a/data/maps/BirthIsland_Harbor/events.inc +++ b/data/maps/BirthIsland_Harbor/events.inc @@ -1,6 +1,6 @@ BirthIsland_Harbor_EventObjects: @ 853D828 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, 7, 1, 1, 0, 0, BirthIsland_Harbor_EventScript_26805D, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, 10, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BirthIsland_Harbor_EventScript_26805D, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 BirthIsland_Harbor_MapWarps: @ 853D858 warp_def 8, 2, 0, 0, MAP_BIRTH_ISLAND_EXTERIOR diff --git a/data/maps/CaveOfOrigin_B1F/events.inc b/data/maps/CaveOfOrigin_B1F/events.inc index 72a2c62104..bd1b79bc05 100644 --- a/data/maps/CaveOfOrigin_B1F/events.inc +++ b/data/maps/CaveOfOrigin_B1F/events.inc @@ -1,5 +1,5 @@ CaveOfOrigin_B1F_EventObjects: @ 8535DD0 - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 9, 13, 3, 7, 1, 1, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, 820 + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 9, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, 820 CaveOfOrigin_B1F_MapWarps: @ 8535DE8 warp_def 9, 3, 3, 1, MAP_CAVE_OF_ORIGIN_1F diff --git a/data/maps/DesertRuins/events.inc b/data/maps/DesertRuins/events.inc index b7ccd35b02..01a2586002 100644 --- a/data/maps/DesertRuins/events.inc +++ b/data/maps/DesertRuins/events.inc @@ -1,5 +1,5 @@ DesertRuins_EventObjects: @ 8534354 - object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, 8, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, 935 + object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, 935 DesertRuins_MapWarps: @ 853436C warp_def 8, 29, 3, 1, MAP_ROUTE111 diff --git a/data/maps/DesertUnderpass/events.inc b/data/maps/DesertUnderpass/events.inc index 05fb939a04..76215c65a5 100644 --- a/data/maps/DesertUnderpass/events.inc +++ b/data/maps/DesertUnderpass/events.inc @@ -1,5 +1,5 @@ DesertUnderpass_EventObjects: @ 85376D4 - object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 132, 10, 0, 8, 1, 1, 0, 0, DesertUnderpass_EventScript_23AF41, 874 + object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 132, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DesertUnderpass_EventScript_23AF41, 874 DesertUnderpass_MapWarps: @ 85376EC warp_def 10, 12, 0, 2, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL diff --git a/data/maps/DewfordTown/events.inc b/data/maps/DewfordTown/events.inc index c96b4c95e8..77a6ab8895 100644 --- a/data/maps/DewfordTown/events.inc +++ b/data/maps/DewfordTown/events.inc @@ -1,9 +1,9 @@ DewfordTown_EventObjects: @ 8527964 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 12, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 9, 3, 9, 0, 1, 0, 3, DewfordTown_EventScript_1E9511, 740 - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 14, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0 - object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, 8, 0, 0, 0, 0, 0x0, 743 - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 6, 3, 1, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 3, DewfordTown_EventScript_1E9511, 740 + object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 14, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0 + object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 743 + object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0 DewfordTown_MapWarps: @ 85279DC warp_def 3, 3, 0, 0, MAP_DEWFORD_TOWN_HALL diff --git a/data/maps/DewfordTown_Gym/events.inc b/data/maps/DewfordTown_Gym/events.inc index 11f5d5a920..26ebf45018 100644 --- a/data/maps/DewfordTown_Gym/events.inc +++ b/data/maps/DewfordTown_Gym/events.inc @@ -1,12 +1,12 @@ DewfordTown_Gym_EventObjects: @ 852DB34 - object_event 1, EVENT_OBJ_GFX_BRAWLY, 0, 4, 3, 0, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC7C2, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 18, 0, 7, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8B7, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 15, 3, 3, 8, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8D9, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 12, 25, 3, 7, 0, 0, 1, 2, DewfordTown_Gym_EventScript_1FC8FB, 0 - object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 5, 24, 3, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC983, 0 - object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 8, 1, 10, 1, 1, 1, 3, DewfordTown_Gym_EventScript_1FC93F, 0 - object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 16, 9, 3, 8, 1, 1, 1, 3, DewfordTown_Gym_EventScript_1FC961, 0 - object_event 8, EVENT_OBJ_GFX_SAILOR, 0, 14, 12, 1, 10, 1, 1, 1, 2, DewfordTown_Gym_EventScript_1FC91D, 0 + object_event 1, EVENT_OBJ_GFX_BRAWLY, 0, 4, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC7C2, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 18, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8B7, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8D9, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 12, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, DewfordTown_Gym_EventScript_1FC8FB, 0 + object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 5, 24, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC983, 0 + object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 8, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, DewfordTown_Gym_EventScript_1FC93F, 0 + object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 16, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, DewfordTown_Gym_EventScript_1FC961, 0 + object_event 8, EVENT_OBJ_GFX_SAILOR, 0, 14, 12, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, DewfordTown_Gym_EventScript_1FC91D, 0 DewfordTown_Gym_MapWarps: @ 852DBF4 warp_def 5, 27, 0, 2, MAP_DEWFORD_TOWN diff --git a/data/maps/DewfordTown_Hall/events.inc b/data/maps/DewfordTown_Hall/events.inc index e12a02a3c6..7c494b6985 100644 --- a/data/maps/DewfordTown_Hall/events.inc +++ b/data/maps/DewfordTown_Hall/events.inc @@ -1,13 +1,13 @@ DewfordTown_Hall_EventObjects: @ 852DC48 - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 4, 6, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4D0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 1, 5, 0, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4F9, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 5, 4, 0, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD50A, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD547, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 2, 3, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD563, 0 - object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 14, 7, 0, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD57F, 0 - object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 3, 3, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD62F, 0 - object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 3, 3, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, 940 + object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 4, 6, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4D0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 1, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4F9, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD50A, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD547, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD563, 0 + object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 14, 7, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD57F, 0 + object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD62F, 0 + object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0 + object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, 940 DewfordTown_Hall_MapWarps: @ 852DD20 warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN diff --git a/data/maps/DewfordTown_House1/events.inc b/data/maps/DewfordTown_House1/events.inc index 849bb0244f..72a8dc3054 100644 --- a/data/maps/DewfordTown_House1/events.inc +++ b/data/maps/DewfordTown_House1/events.inc @@ -1,7 +1,7 @@ DewfordTown_House1_EventObjects: @ 852D9C8 - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 3, 3, 9, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3D7, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 3, 3, 3, 10, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3CE, 0 - object_event 3, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 2, 3, 8, 3, 1, 0, 0, DewfordTown_House1_EventScript_1FC3E0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3D7, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3CE, 0 + object_event 3, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 3, 1, 0, 0, DewfordTown_House1_EventScript_1FC3E0, 0 DewfordTown_House1_MapWarps: @ 852DA10 warp_def 3, 7, 0, 3, MAP_DEWFORD_TOWN diff --git a/data/maps/DewfordTown_House2/events.inc b/data/maps/DewfordTown_House2/events.inc index 8aec9176bf..9c03f4ce40 100644 --- a/data/maps/DewfordTown_House2/events.inc +++ b/data/maps/DewfordTown_House2/events.inc @@ -1,6 +1,6 @@ DewfordTown_House2_EventObjects: @ 852DD5C - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 6, 5, 3, 10, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE22E, 0 - object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 2, 3, 3, 1, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE271, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE22E, 0 + object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE271, 0 DewfordTown_House2_MapWarps: @ 852DD8C warp_def 3, 8, 0, 4, MAP_DEWFORD_TOWN diff --git a/data/maps/DewfordTown_PokemonCenter_1F/events.inc b/data/maps/DewfordTown_PokemonCenter_1F/events.inc index aad05249cd..2e43a2239f 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/events.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/events.inc @@ -1,7 +1,7 @@ DewfordTown_PokemonCenter_1F_EventObjects: @ 852DA34 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC537, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 6, 3, 10, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC545, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 0, 5, 2, 1, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC54E, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC537, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC545, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 1, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC54E, 0 DewfordTown_PokemonCenter_1F_MapWarps: @ 852DA7C warp_def 7, 8, 3, 1, MAP_DEWFORD_TOWN diff --git a/data/maps/DewfordTown_PokemonCenter_2F/events.inc b/data/maps/DewfordTown_PokemonCenter_2F/events.inc index 9c739974b2..f9d67ecbf2 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/events.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ DewfordTown_PokemonCenter_2F_EventObjects: @ 852DAA8 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_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, DewfordTown_PokemonCenter_2F_EventScript_276B03, 702 DewfordTown_PokemonCenter_2F_MapWarps: @ 852DB08 warp_def 1, 6, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/EverGrandeCity_ChampionsRoom/events.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc index c97236e419..b09221dca2 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/events.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/events.inc @@ -1,7 +1,7 @@ EverGrandeCity_ChampionsRoom_EventObjects: @ 8533700 - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 5, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 920 - object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 921 + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 920 + object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 921 EverGrandeCity_ChampionsRoom_MapWarps: @ 8533748 warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_HALL4 diff --git a/data/maps/EverGrandeCity_DrakesRoom/events.inc b/data/maps/EverGrandeCity_DrakesRoom/events.inc index 90c9af1c4a..4f61f50ea2 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/events.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/events.inc @@ -1,5 +1,5 @@ EverGrandeCity_DrakesRoom_EventObjects: @ 85336C4 - object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0 + object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0 EverGrandeCity_DrakesRoom_MapWarps: @ 85336DC warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL3 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/events.inc b/data/maps/EverGrandeCity_GlaciasRoom/events.inc index 5490ed006f..63dfbc0df2 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/events.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/events.inc @@ -1,5 +1,5 @@ EverGrandeCity_GlaciasRoom_EventObjects: @ 8533688 - object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0 + object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0 EverGrandeCity_GlaciasRoom_MapWarps: @ 85336A0 warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL2 diff --git a/data/maps/EverGrandeCity_HallOfFame/events.inc b/data/maps/EverGrandeCity_HallOfFame/events.inc index 50fc7fbdc1..ad5f088c5a 100644 --- a/data/maps/EverGrandeCity_HallOfFame/events.inc +++ b/data/maps/EverGrandeCity_HallOfFame/events.inc @@ -1,5 +1,5 @@ EverGrandeCity_HallOfFame_EventObjects: @ 85338FC - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 16, 3, 7, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 EverGrandeCity_HallOfFame_MapWarps: @ 8533914 warp_def 7, 11, 3, 1, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM diff --git a/data/maps/EverGrandeCity_PhoebesRoom/events.inc b/data/maps/EverGrandeCity_PhoebesRoom/events.inc index 296fe32400..abaa816224 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/events.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/events.inc @@ -1,5 +1,5 @@ EverGrandeCity_PhoebesRoom_EventObjects: @ 853364C - object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0 + object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0 EverGrandeCity_PhoebesRoom_MapWarps: @ 8533664 warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL1 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc index 1f7e260469..7e90c35c70 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ EverGrandeCity_PokemonCenter_1F_EventObjects: @ 8533930 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 7, 3, 10, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0 - object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 9, 4, 3, 7, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, 793 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0 + object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, 793 EverGrandeCity_PokemonCenter_1F_MapWarps: @ 8533990 warp_def 7, 8, 3, 1, MAP_EVER_GRANDE_CITY diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc index 98671f414d..08dbeb5c69 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ EverGrandeCity_PokemonCenter_2F_EventObjects: @ 85339BC - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_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, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, 702 EverGrandeCity_PokemonCenter_2F_MapWarps: @ 8533A1C warp_def 1, 6, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc index ff2ca71c2b..c04a0f30de 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc @@ -1,8 +1,8 @@ EverGrandeCity_PokemonLeague_1F_EventObjects: @ 8533860 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 3, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295FC, 0 - object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 16, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_22960A, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 2, 3, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 11, 2, 3, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295FC, 0 + object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_22960A, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0 EverGrandeCity_PokemonLeague_1F_MapWarps: @ 85338C0 warp_def 9, 11, 3, 0, MAP_EVER_GRANDE_CITY diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc index a09e8ed31d..18d45eef92 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc @@ -1,8 +1,8 @@ EverGrandeCity_PokemonLeague_2F_EventObjects: @ 8533A48 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_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, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, 702 EverGrandeCity_PokemonLeague_2F_MapWarps: @ 8533AA8 warp_def 1, 6, 4, 4, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F diff --git a/data/maps/EverGrandeCity_SidneysRoom/events.inc b/data/maps/EverGrandeCity_SidneysRoom/events.inc index af4c5de980..a1446aef82 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/events.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/events.inc @@ -1,5 +1,5 @@ EverGrandeCity_SidneysRoom_EventObjects: @ 8533610 - object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0 + object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0 EverGrandeCity_SidneysRoom_MapWarps: @ 8533628 warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL5 diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc index 91a98cc289..b6c3400c6d 100644 --- a/data/maps/FallarborTown/events.inc +++ b/data/maps/FallarborTown/events.inc @@ -1,8 +1,8 @@ FallarborTown_EventObjects: @ 8527BE0 - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, 8, 0, 1, 0, 0, FallarborTown_EventScript_1EB22B, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 9, 3, 5, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, 3, 1, 1, 0, 0, FallarborTown_EventScript_1EB234, 0 - object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, 1, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, 907 + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, FallarborTown_EventScript_1EB22B, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 9, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_EventScript_1EB234, 0 + object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, 907 FallarborTown_MapWarps: @ 8527C40 warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/events.inc b/data/maps/FallarborTown_BattleTentBattleRoom/events.inc index c4e35ebbbe..f3c8838e6a 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/events.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/events.inc @@ -1,7 +1,7 @@ FallarborTown_BattleTentBattleRoom_EventObjects: @ 852E444 - object_event 1, EVENT_OBJ_GFX_TRADER, 0, 4, 8, 3, 7, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 2, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, 8, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_TRADER, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 FallarborTown_BattleTentBattleRoom_MapEvents:: @ 852E48C map_events FallarborTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/FallarborTown_BattleTentCorridor/events.inc b/data/maps/FallarborTown_BattleTentCorridor/events.inc index 471ca66a37..4af82f3530 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/events.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/events.inc @@ -1,5 +1,5 @@ FallarborTown_BattleTentCorridor_EventObjects: @ 852E418 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 6, 3, 7, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 FallarborTown_BattleTentCorridor_MapEvents:: @ 852E430 map_events FallarborTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/FallarborTown_BattleTentLobby/events.inc b/data/maps/FallarborTown_BattleTentLobby/events.inc index 570287ae35..cdcc4c7927 100644 --- a/data/maps/FallarborTown_BattleTentLobby/events.inc +++ b/data/maps/FallarborTown_BattleTentLobby/events.inc @@ -1,9 +1,9 @@ FallarborTown_BattleTentLobby_EventObjects: @ 852E370 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 3, 8, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200001, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 1, 5, 3, 5, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 12, 6, 3, 3, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 9, 3, 8, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0 - object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 7, 3, 10, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, 767 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200001, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 12, 6, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0 + object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, 767 FallarborTown_BattleTentLobby_MapWarps: @ 852E3E8 warp_def 6, 9, 0, 1, MAP_FALLARBOR_TOWN diff --git a/data/maps/FallarborTown_House1/events.inc b/data/maps/FallarborTown_House1/events.inc index 5c2323b74a..8f16a7869d 100644 --- a/data/maps/FallarborTown_House1/events.inc +++ b/data/maps/FallarborTown_House1/events.inc @@ -1,6 +1,6 @@ FallarborTown_House1_EventObjects: @ 852E5B8 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, 2, 1, 1, 0, 0, FallarborTown_House1_EventScript_200F13, 928 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 6, 3, 5, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_House1_EventScript_200F13, 928 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0 FallarborTown_House1_MapWarps: @ 852E5E8 warp_def 3, 8, 0, 3, MAP_FALLARBOR_TOWN diff --git a/data/maps/FallarborTown_House2/events.inc b/data/maps/FallarborTown_House2/events.inc index 342e2e60b2..1b4e1c96e6 100644 --- a/data/maps/FallarborTown_House2/events.inc +++ b/data/maps/FallarborTown_House2/events.inc @@ -1,5 +1,5 @@ FallarborTown_House2_EventObjects: @ 852E60C - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 3, 8, 0, 0, 0, 0, FallarborTown_House2_EventScript_201383, 0 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_House2_EventScript_201383, 0 FallarborTown_House2_MapWarps: @ 852E624 warp_def 3, 7, 0, 4, MAP_FALLARBOR_TOWN diff --git a/data/maps/FallarborTown_Mart/events.inc b/data/maps/FallarborTown_Mart/events.inc index 6d7188c6a2..f2ec25c139 100644 --- a/data/maps/FallarborTown_Mart/events.inc +++ b/data/maps/FallarborTown_Mart/events.inc @@ -1,9 +1,9 @@ FallarborTown_Mart_EventObjects: @ 852E2D4 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCBF, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 3, 3, 2, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, 8, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCFD, 0 - object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 2, 5, 3, 1, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFD06, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 2, 3, 7, 0, 0, 0, 0, FallarborTown_Mart_EventScript_2C80B6, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCBF, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCFD, 0 + object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 2, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFD06, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_Mart_EventScript_2C80B6, 0 FallarborTown_Mart_MapWarps: @ 852E34C warp_def 3, 7, 0, 0, MAP_FALLARBOR_TOWN diff --git a/data/maps/FallarborTown_PokemonCenter_1F/events.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc index 3681909140..fffc618eb1 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/events.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ FallarborTown_PokemonCenter_1F_EventObjects: @ 852E4A0 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, 10, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 2, 3, 7, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, 871 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, 871 FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500 warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN diff --git a/data/maps/FallarborTown_PokemonCenter_2F/events.inc b/data/maps/FallarborTown_PokemonCenter_2F/events.inc index 9162a28226..563b6bc503 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/events.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ FallarborTown_PokemonCenter_2F_EventObjects: @ 852E52C - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_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, FallarborTown_PokemonCenter_2F_EventScript_276B03, 702 FallarborTown_PokemonCenter_2F_MapWarps: @ 852E58C warp_def 1, 6, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/FarawayIsland_Entrance/events.inc b/data/maps/FarawayIsland_Entrance/events.inc index 8af15533b2..e8b94c460b 100644 --- a/data/maps/FarawayIsland_Entrance/events.inc +++ b/data/maps/FarawayIsland_Entrance/events.inc @@ -1,6 +1,6 @@ FarawayIsland_Entrance_EventObjects: @ 853D710 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 39, 3, 7, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267CA2, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 41, 1, 10, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 39, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267CA2, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 41, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 FarawayIsland_Entrance_MapWarps: @ 853D740 warp_def 22, 7, 3, 0, MAP_FARAWAY_ISLAND_INTERIOR diff --git a/data/maps/FarawayIsland_Interior/events.inc b/data/maps/FarawayIsland_Interior/events.inc index c2cd25b404..b9242b5bed 100644 --- a/data/maps/FarawayIsland_Interior/events.inc +++ b/data/maps/FarawayIsland_Interior/events.inc @@ -1,5 +1,5 @@ FarawayIsland_Interior_EventObjects: @ 853D7A0 - object_event 1, EVENT_OBJ_GFX_MEW, 0, 13, 17, 3, 60, 15, 15, 0, 1, FarawayIsland_Interior_EventScript_267DF2, 718 + object_event 1, EVENT_OBJ_GFX_MEW, 0, 13, 17, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 15, 15, 0, 1, FarawayIsland_Interior_EventScript_267DF2, 718 FarawayIsland_Interior_MapWarps: @ 853D7B8 warp_def 12, 19, 0, 0, MAP_FARAWAY_ISLAND_ENTRANCE diff --git a/data/maps/FieryPath/events.inc b/data/maps/FieryPath/events.inc index 37fecaf5ea..3b39853254 100644 --- a/data/maps/FieryPath/events.inc +++ b/data/maps/FieryPath/events.inc @@ -1,12 +1,12 @@ FieryPath_EventObjects: @ 8534C80 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, 1, 1, 1, 0, 0, FieryPath_EventScript_29119E, 1091 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 17 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 18 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 19 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 20 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 21 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 22 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, 1, 1, 1, 0, 0, FieryPath_EventScript_291191, 1111 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_29119E, 1091 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 17 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 18 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 19 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 20 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 21 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 22 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_291191, 1111 FieryPath_MapWarps: @ 8534D40 warp_def 26, 36, 3, 4, MAP_ROUTE112 diff --git a/data/maps/FortreeCity/events.inc b/data/maps/FortreeCity/events.inc index c943e230d7..2b21594a17 100644 --- a/data/maps/FortreeCity/events.inc +++ b/data/maps/FortreeCity/events.inc @@ -1,11 +1,11 @@ FortreeCity_EventObjects: @ 8526B9C - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 31, 3, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25B6, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 32, 16, 3, 2, 1, 1, 0, 0, FortreeCity_EventScript_1E25DE, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 32, 10, 3, 3, 0, 1, 0, 0, FortreeCity_EventScript_1E25BF, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 11, 14, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25F0, 0 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 8, 10, 3, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0 - object_event 6, EVENT_OBJ_GFX_BOY_5, 0, 9, 16, 3, 8, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0 - object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, 76, 1, 1, 0, 0, FortreeCity_EventScript_1E2614, 969 + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 31, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25B6, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 32, 16, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_EventScript_1E25DE, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 32, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, FortreeCity_EventScript_1E25BF, 0 + object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 11, 14, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25F0, 0 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0 + object_event 6, EVENT_OBJ_GFX_BOY_5, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0 + object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, FortreeCity_EventScript_1E2614, 969 FortreeCity_MapWarps: @ 8526C44 warp_def 5, 6, 0, 0, MAP_FORTREE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/FortreeCity_DecorationShop/events.inc b/data/maps/FortreeCity_DecorationShop/events.inc index fe85e94d64..22abe3103f 100644 --- a/data/maps/FortreeCity_DecorationShop/events.inc +++ b/data/maps/FortreeCity_DecorationShop/events.inc @@ -1,8 +1,8 @@ FortreeCity_DecorationShop_EventObjects: @ 85310B0 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, 1, 1, 1, 0, 0, FortreeCity_DecorationShop_EventScript_21800E, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 4, 3, 9, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218017, 0 - object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218020, 0 - object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21804C, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FortreeCity_DecorationShop_EventScript_21800E, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218017, 0 + object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218020, 0 + object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21804C, 0 FortreeCity_DecorationShop_MapWarps: @ 8531110 warp_def 3, 5, 0, 8, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_Gym/events.inc b/data/maps/FortreeCity_Gym/events.inc index 234c10b0cf..8abef75e8d 100644 --- a/data/maps/FortreeCity_Gym/events.inc +++ b/data/maps/FortreeCity_Gym/events.inc @@ -1,12 +1,12 @@ FortreeCity_Gym_EventObjects: @ 8530C98 - object_event 1, EVENT_OBJ_GFX_WINONA, 0, 15, 2, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_2165C8, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 4, 14, 3, 8, 0, 0, 1, 3, FortreeCity_Gym_EventScript_2166A8, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 10, 10, 3, 9, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166D6, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 5, 17, 3, 9, 0, 0, 1, 1, FortreeCity_Gym_EventScript_2166ED, 0 - object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 9, 8, 3, 8, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166BF, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 15, 21, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_216732, 0 - object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 4, 23, 3, 10, 1, 1, 1, 1, FortreeCity_Gym_EventScript_216704, 0 - object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 1, 10, 3, 7, 1, 1, 1, 3, FortreeCity_Gym_EventScript_21671B, 0 + object_event 1, EVENT_OBJ_GFX_WINONA, 0, 15, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_Gym_EventScript_2165C8, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, FortreeCity_Gym_EventScript_2166A8, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166D6, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 5, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, FortreeCity_Gym_EventScript_2166ED, 0 + object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166BF, 0 + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 15, 21, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_Gym_EventScript_216732, 0 + object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 4, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, FortreeCity_Gym_EventScript_216704, 0 + object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 1, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, FortreeCity_Gym_EventScript_21671B, 0 FortreeCity_Gym_MapWarps: @ 8530D58 warp_def 15, 24, 0, 2, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_House1/events.inc b/data/maps/FortreeCity_House1/events.inc index 99d34626ce..35ed2acaf3 100644 --- a/data/maps/FortreeCity_House1/events.inc +++ b/data/maps/FortreeCity_House1/events.inc @@ -1,7 +1,7 @@ FortreeCity_House1_EventObjects: @ 8530C2C - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House1_EventScript_2162BB, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 2, 3, 3, 9, 0, 0, 0, 0, FortreeCity_House1_EventScript_216368, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 4, 3, 1, 1, 1, 0, 0, FortreeCity_House1_EventScript_21635F, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House1_EventScript_2162BB, 0 + object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, FortreeCity_House1_EventScript_216368, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FortreeCity_House1_EventScript_21635F, 0 FortreeCity_House1_MapWarps: @ 8530C74 warp_def 3, 5, 0, 1, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_House2/events.inc b/data/maps/FortreeCity_House2/events.inc index 2d78b27743..43bc1fdfc2 100644 --- a/data/maps/FortreeCity_House2/events.inc +++ b/data/maps/FortreeCity_House2/events.inc @@ -1,6 +1,6 @@ FortreeCity_House2_EventObjects: @ 8530F30 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 2, 3, 3, 5, 1, 0, 0, 0, FortreeCity_House2_EventScript_2177CB, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 3, 3, 9, 1, 0, 0, 0, FortreeCity_House2_EventScript_2C811E, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FortreeCity_House2_EventScript_2177CB, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, FortreeCity_House2_EventScript_2C811E, 0 FortreeCity_House2_MapWarps: @ 8530F60 warp_def 3, 5, 0, 4, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_House3/events.inc b/data/maps/FortreeCity_House3/events.inc index 54ac6ed6ab..23ae106883 100644 --- a/data/maps/FortreeCity_House3/events.inc +++ b/data/maps/FortreeCity_House3/events.inc @@ -1,6 +1,6 @@ FortreeCity_House3_EventObjects: @ 8530F84 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House3_EventScript_217AE8, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 5, 4, 3, 2, 1, 1, 0, 0, FortreeCity_House3_EventScript_217AF1, 0 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House3_EventScript_217AE8, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 5, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_House3_EventScript_217AF1, 0 FortreeCity_House3_MapWarps: @ 8530FB4 warp_def 3, 5, 0, 5, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_House4/events.inc b/data/maps/FortreeCity_House4/events.inc index 1bddf34165..c038066e4a 100644 --- a/data/maps/FortreeCity_House4/events.inc +++ b/data/maps/FortreeCity_House4/events.inc @@ -1,7 +1,7 @@ FortreeCity_House4_EventObjects: @ 8530FD8 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, 2, 1, 1, 0, 0, FortreeCity_House4_EventScript_217C81, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, 933 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_House4_EventScript_217C81, 0 + object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0 + object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, 933 FortreeCity_House4_MapWarps: @ 8531020 warp_def 3, 5, 0, 6, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_House5/events.inc b/data/maps/FortreeCity_House5/events.inc index d6c03578e3..0c716961ac 100644 --- a/data/maps/FortreeCity_House5/events.inc +++ b/data/maps/FortreeCity_House5/events.inc @@ -1,7 +1,7 @@ FortreeCity_House5_EventObjects: @ 8531044 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, 20, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EF2, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House5_EventScript_217F04, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, 10, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EFB, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EF2, 0 + object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House5_EventScript_217F04, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EFB, 0 FortreeCity_House5_MapWarps: @ 853108C warp_def 3, 5, 0, 7, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_Mart/events.inc b/data/maps/FortreeCity_Mart/events.inc index 115b04ccdf..5335df01db 100644 --- a/data/maps/FortreeCity_Mart/events.inc +++ b/data/maps/FortreeCity_Mart/events.inc @@ -1,8 +1,8 @@ FortreeCity_Mart_EventObjects: @ 8530EAC - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217666, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 3, 3, 7, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217698, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 8, 5, 3, 2, 1, 1, 0, 0, FortreeCity_Mart_EventScript_2176A1, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 5, 6, 3, 10, 1, 1, 0, 0, FortreeCity_Mart_EventScript_2176AA, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217666, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217698, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 8, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_Mart_EventScript_2176A1, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, FortreeCity_Mart_EventScript_2176AA, 0 FortreeCity_Mart_MapWarps: @ 8530F0C warp_def 3, 7, 0, 3, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_PokemonCenter_1F/events.inc b/data/maps/FortreeCity_PokemonCenter_1F/events.inc index 4b681b5cb6..e63b6eabbc 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/events.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ FortreeCity_PokemonCenter_1F_EventObjects: @ 8530D94 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173E7, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 7, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173F5, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 5, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173FE, 0 - object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 2, 3, 3, 8, 1, 1, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_217407, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173E7, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173F5, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173FE, 0 + object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_217407, 0 FortreeCity_PokemonCenter_1F_MapWarps: @ 8530DF4 warp_def 7, 8, 3, 0, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_PokemonCenter_2F/events.inc b/data/maps/FortreeCity_PokemonCenter_2F/events.inc index 7a7f666b2c..43e74e0d7b 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/events.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ FortreeCity_PokemonCenter_2F_EventObjects: @ 8530E20 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_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, FortreeCity_PokemonCenter_2F_EventScript_276B03, 702 FortreeCity_PokemonCenter_2F_MapWarps: @ 8530E80 warp_def 1, 6, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/GraniteCave_1F/events.inc b/data/maps/GraniteCave_1F/events.inc index 83368e186c..bba8bbe408 100644 --- a/data/maps/GraniteCave_1F/events.inc +++ b/data/maps/GraniteCave_1F/events.inc @@ -1,6 +1,6 @@ GraniteCave_1F_EventObjects: @ 85343BC - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 36, 9, 3, 1, 0, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, 8, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, 1050 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 36, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, 1050 GraniteCave_1F_MapWarps: @ 85343EC warp_def 37, 12, 3, 0, MAP_ROUTE106 diff --git a/data/maps/GraniteCave_B1F/events.inc b/data/maps/GraniteCave_B1F/events.inc index 90b0f498e8..4b4a088706 100644 --- a/data/maps/GraniteCave_B1F/events.inc +++ b/data/maps/GraniteCave_B1F/events.inc @@ -1,5 +1,5 @@ GraniteCave_B1F_EventObjects: @ 8534420 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, 1, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, 1051 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, 1051 GraniteCave_B1F_MapWarps: @ 8534438 warp_def 25, 13, 3, 1, MAP_GRANITE_CAVE_1F diff --git a/data/maps/GraniteCave_B2F/events.inc b/data/maps/GraniteCave_B2F/events.inc index d7ce418122..bcc0a5a4e3 100644 --- a/data/maps/GraniteCave_B2F/events.inc +++ b/data/maps/GraniteCave_B2F/events.inc @@ -1,13 +1,13 @@ GraniteCave_B2F_EventObjects: @ 8534484 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, 1053 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, 1054 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 17 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 14, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 18 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 16, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 19 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 12, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 20 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 22, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 21 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 22 - object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 23 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, 1053 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, 1054 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 17 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 18 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 19 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 20 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 21 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 22 + object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 23 GraniteCave_B2F_MapWarps: @ 853455C warp_def 29, 13, 3, 2, MAP_GRANITE_CAVE_B1F diff --git a/data/maps/GraniteCave_StevensRoom/events.inc b/data/maps/GraniteCave_StevensRoom/events.inc index 49e808cda8..43cc6e4440 100644 --- a/data/maps/GraniteCave_StevensRoom/events.inc +++ b/data/maps/GraniteCave_StevensRoom/events.inc @@ -1,5 +1,5 @@ GraniteCave_StevensRoom_EventObjects: @ 85345B0 - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, 1, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, 833 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, 833 GraniteCave_StevensRoom_MapWarps: @ 85345C8 warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F diff --git a/data/maps/InsideOfTruck/events.inc b/data/maps/InsideOfTruck/events.inc index 5dafdf1fde..104df23d26 100644 --- a/data/maps/InsideOfTruck/events.inc +++ b/data/maps/InsideOfTruck/events.inc @@ -1,7 +1,7 @@ InsideOfTruck_EventObjects: @ 853A078 - object_event 1, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 - object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 - object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 2, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 + object_event 1, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 + object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 3, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 + object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 2, 3, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 InsideOfTruck_MapWarps: @ 853A0C0 warp_def 4, 1, 0, 127, MAP_NONE diff --git a/data/maps/IslandCave/events.inc b/data/maps/IslandCave/events.inc index d7807a725c..c02d93dde7 100644 --- a/data/maps/IslandCave/events.inc +++ b/data/maps/IslandCave/events.inc @@ -1,5 +1,5 @@ IslandCave_EventObjects: @ 8536C74 - object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, 8, 0, 0, 0, 0, IslandCave_EventScript_238F58, 936 + object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, IslandCave_EventScript_238F58, 936 IslandCave_MapWarps: @ 8536C8C warp_def 8, 29, 3, 0, MAP_ROUTE105 diff --git a/data/maps/JaggedPass/events.inc b/data/maps/JaggedPass/events.inc index fe193cd971..ce6eb77bd0 100644 --- a/data/maps/JaggedPass/events.inc +++ b/data/maps/JaggedPass/events.inc @@ -1,11 +1,11 @@ JaggedPass_EventObjects: @ 8534AE4 - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 10, 8, 3, 10, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0 - object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 35, 3, 14, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, 1, 0, 0, 0, 0, JaggedPass_EventScript_291184, 1070 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 9, 21, 3, 16, 1, 1, 1, 3, JaggedPass_EventScript_23079C, 0 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 19, 3, 7, 1, 1, 0, 0, JaggedPass_EventScript_230718, 847 - object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 14, 25, 3, 10, 1, 1, 1, 3, JaggedPass_EventScript_230871, 0 - object_event 7, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 18, 25, 3, 9, 1, 1, 1, 3, JaggedPass_EventScript_23085A, 0 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0 + object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 35, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, JaggedPass_EventScript_291184, 1070 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 9, 21, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, JaggedPass_EventScript_23079C, 0 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, JaggedPass_EventScript_230718, 847 + object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 14, 25, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, JaggedPass_EventScript_230871, 0 + object_event 7, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 18, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, JaggedPass_EventScript_23085A, 0 JaggedPass_MapWarps: @ 8534B8C warp_def 14, 40, 3, 2, MAP_ROUTE112 diff --git a/data/maps/LavaridgeTown/events.inc b/data/maps/LavaridgeTown/events.inc index cf32b8377e..755e606b0a 100644 --- a/data/maps/LavaridgeTown/events.inc +++ b/data/maps/LavaridgeTown/events.inc @@ -1,13 +1,13 @@ LavaridgeTown_EventObjects: @ 8527A54 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 7, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 1, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 8, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 10, 13, 3, 3, 0, 2, 0, 0, LavaridgeTown_EventScript_1EA720, 0 - object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 4, 3, 18, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA729, 0 - object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 4, 3, 17, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA732, 0 - object_event 7, EVENT_OBJ_GFX_GIDDY, 0, 6, 16, 3, 9, 0, 0, 0, 0, 0x0, 930 - object_event 8, EVENT_OBJ_GFX_HIPSTER, 0, 12, 15, 0, 8, 0, 0, 0, 0, 0x0, 929 - object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 7, 3, 8, 1, 1, 0, 0, LavaridgeTown_EventScript_1EA744, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 10, 13, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, LavaridgeTown_EventScript_1EA720, 0 + object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA729, 0 + object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA732, 0 + object_event 7, EVENT_OBJ_GFX_GIDDY, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 930 + object_event 8, EVENT_OBJ_GFX_HIPSTER, 0, 12, 15, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 929 + object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_EventScript_1EA744, 0 LavaridgeTown_MapWarps: @ 8527B2C warp_def 12, 15, 0, 0, MAP_LAVARIDGE_TOWN_HERB_SHOP diff --git a/data/maps/LavaridgeTown_Gym_1F/events.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc index cc35053f08..8560ee3a80 100644 --- a/data/maps/LavaridgeTown_Gym_1F/events.inc +++ b/data/maps/LavaridgeTown_Gym_1F/events.inc @@ -1,10 +1,10 @@ LavaridgeTown_Gym_1F_EventObjects: @ 852DE1C - object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 13, 9, 3, 8, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE78C, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 3, 14, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE87F, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 2, 15, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE900, 0 - object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 3, 10, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8AF, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 5, 2, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8E5, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 12, 16, 3, 10, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE96C, 0 + object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 13, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE78C, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 3, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE87F, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 2, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE900, 0 + object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 3, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8AF, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8E5, 0 + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE96C, 0 LavaridgeTown_Gym_1F_MapWarps: @ 852DEAC warp_def 13, 18, 3, 1, MAP_LAVARIDGE_TOWN diff --git a/data/maps/LavaridgeTown_Gym_B1F/events.inc b/data/maps/LavaridgeTown_Gym_B1F/events.inc index eabf8e51de..cccd9cb14f 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/events.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/events.inc @@ -1,8 +1,8 @@ LavaridgeTown_Gym_B1F_EventObjects: @ 852DFA8 - object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 4, 18, 3, 8, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE91B, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 3, 6, 0, 8, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE8CA, 0 - object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 13, 17, 0, 8, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE936, 0 - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 4, 16, 3, 8, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE951, 0 + object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 4, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE91B, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 3, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE8CA, 0 + object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 13, 17, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE936, 0 + object_event 4, EVENT_OBJ_GFX_HIKER, 0, 4, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE951, 0 LavaridgeTown_Gym_B1F_MapWarps: @ 852E008 warp_def 10, 18, 3, 2, MAP_LAVARIDGE_TOWN_GYM_1F diff --git a/data/maps/LavaridgeTown_HerbShop/events.inc b/data/maps/LavaridgeTown_HerbShop/events.inc index dd5ffdbe92..8a80c4f757 100644 --- a/data/maps/LavaridgeTown_HerbShop/events.inc +++ b/data/maps/LavaridgeTown_HerbShop/events.inc @@ -1,7 +1,7 @@ LavaridgeTown_HerbShop_EventObjects: @ 852DDB0 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4D7, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 7, 5, 3, 1, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE505, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 3, 5, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4D7, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE505, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0 LavaridgeTown_HerbShop_MapWarps: @ 852DDF8 warp_def 3, 7, 0, 0, MAP_LAVARIDGE_TOWN diff --git a/data/maps/LavaridgeTown_House/events.inc b/data/maps/LavaridgeTown_House/events.inc index 17809fc45a..85a9d859e7 100644 --- a/data/maps/LavaridgeTown_House/events.inc +++ b/data/maps/LavaridgeTown_House/events.inc @@ -1,7 +1,7 @@ LavaridgeTown_House_EventObjects: @ 852E0DC - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 2, 3, 3, 1, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF912, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 6, 3, 1, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF91B, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 8, 4, 3, 2, 1, 1, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF912, 0 + object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF91B, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 8, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0 LavaridgeTown_House_MapWarps: @ 852E124 warp_def 3, 7, 0, 4, MAP_LAVARIDGE_TOWN diff --git a/data/maps/LavaridgeTown_Mart/events.inc b/data/maps/LavaridgeTown_Mart/events.inc index 0206eefd79..a5537f9caf 100644 --- a/data/maps/LavaridgeTown_Mart/events.inc +++ b/data/maps/LavaridgeTown_Mart/events.inc @@ -1,7 +1,7 @@ LavaridgeTown_Mart_EventObjects: @ 852E148 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9CE, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9FE, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 9, 5, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9CE, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9FE, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0 LavaridgeTown_Mart_MapWarps: @ 852E190 warp_def 3, 7, 0, 2, MAP_LAVARIDGE_TOWN diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc index 767f017135..1586553f24 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ LavaridgeTown_PokemonCenter_1F_EventObjects: @ 852E1B4 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 11, 8, 3, 7, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 0, 9, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25, 0 - object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25, 0 + object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E, 0 LavaridgeTown_PokemonCenter_1F_MapWarps: @ 852E214 warp_def 7, 8, 3, 3, MAP_LAVARIDGE_TOWN diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc index 3191e7533e..e55b08e7b9 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ LavaridgeTown_PokemonCenter_2F_EventObjects: @ 852E248 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_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, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, 702 LavaridgeTown_PokemonCenter_2F_MapWarps: @ 852E2A8 warp_def 1, 6, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/LilycoveCity/events.inc b/data/maps/LilycoveCity/events.inc index 343249c2d2..421a2c094a 100644 --- a/data/maps/LilycoveCity/events.inc +++ b/data/maps/LilycoveCity/events.inc @@ -1,26 +1,26 @@ LilycoveCity_EventObjects: @ 8526CE8 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 32, 20, 3, 3, 0, 1, 0, 0, LilycoveCity_EventScript_1E2C53, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 15, 18, 3, 2, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C2B, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 28, 28, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C22, 0 - object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 21, 15, 3, 2, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C4A, 0 - object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 16, 9, 5, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2C91, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 35, 27, 3, 2, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C72, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 35, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0 - object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 34, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0 - object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 57, 17, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0 - object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 73, 15, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, 852 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, 1, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, 1042 - object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 43, 18, 3, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, 852 - object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 46, 12, 3, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, 852 - object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 45, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, 852 - object_event 15, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 38, 9, 5, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, 852 - object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 50, 7, 5, 2, 1, 1, 0, 0, LilycoveCity_EventScript_1E2BD8, 0 - object_event 17, EVENT_OBJ_GFX_HIPSTER, 0, 27, 7, 5, 8, 1, 1, 0, 0, LilycoveCity_EventScript_1E2DDE, 971 - object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 16, 23, 3, 10, 1, 1, 0, 0, LilycoveCity_EventScript_1E302D, 0 - object_event 19, EVENT_OBJ_GFX_WOMAN_4, 0, 41, 25, 3, 9, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CEE, 0 - object_event 20, EVENT_OBJ_GFX_MAN_2, 0, 40, 25, 3, 10, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CDD, 0 - object_event 21, EVENT_OBJ_GFX_SAILOR, 0, 16, 34, 3, 8, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CCB, 0 - object_event 22, EVENT_OBJ_GFX_FAT_MAN, 0, 16, 35, 3, 7, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CD4, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 32, 20, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, LilycoveCity_EventScript_1E2C53, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 15, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C2B, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 28, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C22, 0 + object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 21, 15, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C4A, 0 + object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 16, 9, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_EventScript_1E2C91, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 35, 27, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C72, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 35, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 34, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0 + object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 57, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0 + object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 73, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, 852 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, 1042 + object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 43, 18, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, 852 + object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 46, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, 852 + object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 45, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, 852 + object_event 15, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 38, 9, 5, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, 852 + object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 50, 7, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2BD8, 0 + object_event 17, EVENT_OBJ_GFX_HIPSTER, 0, 27, 7, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2DDE, 971 + object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 16, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_EventScript_1E302D, 0 + object_event 19, EVENT_OBJ_GFX_WOMAN_4, 0, 41, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CEE, 0 + object_event 20, EVENT_OBJ_GFX_MAN_2, 0, 40, 25, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CDD, 0 + object_event 21, EVENT_OBJ_GFX_SAILOR, 0, 16, 34, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CCB, 0 + object_event 22, EVENT_OBJ_GFX_FAT_MAN, 0, 16, 35, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CD4, 0 LilycoveCity_MapWarps: @ 8526EF8 warp_def 27, 6, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F diff --git a/data/maps/LilycoveCity_ContestHall/events.inc b/data/maps/LilycoveCity_ContestHall/events.inc index dd5655bebf..c7477af3cd 100644 --- a/data/maps/LilycoveCity_ContestHall/events.inc +++ b/data/maps/LilycoveCity_ContestHall/events.inc @@ -1,36 +1,36 @@ LilycoveCity_ContestHall_EventObjects: @ 8531850 - object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 30, 30, 3, 2, 4, 4, 0, 0, LilycoveCity_ContestHall_EventScript_21B485, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 11, 7, 3, 2, 3, 3, 0, 0, LilycoveCity_ContestHall_EventScript_21B48E, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 40, 8, 3, 2, 2, 2, 0, 0, LilycoveCity_ContestHall_EventScript_21B497, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 12, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A9, 0 - object_event 5, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 15, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4C0, 0 - object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4D7, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4EE, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 14, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B505, 0 - object_event 9, EVENT_OBJ_GFX_WOMAN_6, 0, 16, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B51C, 0 - object_event 10, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 24, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B533, 0 - object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B56A, 0 - object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B53C, 0 - object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 24, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B581, 0 - object_event 14, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 27, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B598, 0 - object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 22, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5AF, 0 - object_event 16, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 24, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5C6, 0 - object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 26, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5DD, 0 - object_event 18, EVENT_OBJ_GFX_WOMAN_2, 0, 28, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5F4, 0 - object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 20, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B60B, 0 - object_event 20, EVENT_OBJ_GFX_WOMAN_1, 0, 30, 11, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B639, 0 - object_event 21, EVENT_OBJ_GFX_MAN_1, 0, 26, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B622, 0 - object_event 22, EVENT_OBJ_GFX_CAMPER, 0, 13, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B553, 0 - object_event 23, EVENT_OBJ_GFX_WOMAN_4, 0, 36, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B650, 0 - object_event 24, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 39, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B667, 0 - object_event 25, EVENT_OBJ_GFX_BOY_2, 0, 34, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B67E, 0 - object_event 26, EVENT_OBJ_GFX_GIRL_2, 0, 36, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B695, 0 - object_event 27, EVENT_OBJ_GFX_BOY_3, 0, 38, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6AC, 0 - object_event 28, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 40, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6C3, 0 - object_event 29, EVENT_OBJ_GFX_WOMAN_3, 0, 32, 23, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6DA, 0 - object_event 30, EVENT_OBJ_GFX_MAN_1, 0, 37, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B71C, 0 - object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 42, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B705, 0 - object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 23, 26, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A0, 0 + object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 30, 30, 3, MOVEMENT_TYPE_WANDER_AROUND, 4, 4, 0, 0, LilycoveCity_ContestHall_EventScript_21B485, 0 + object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 11, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 3, 0, 0, LilycoveCity_ContestHall_EventScript_21B48E, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 40, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_ContestHall_EventScript_21B497, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 12, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A9, 0 + object_event 5, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 15, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4C0, 0 + object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4D7, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4EE, 0 + object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 14, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B505, 0 + object_event 9, EVENT_OBJ_GFX_WOMAN_6, 0, 16, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B51C, 0 + object_event 10, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 24, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B533, 0 + object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B56A, 0 + object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B53C, 0 + object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 24, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B581, 0 + object_event 14, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 27, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B598, 0 + object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 22, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5AF, 0 + object_event 16, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 24, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5C6, 0 + object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 26, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5DD, 0 + object_event 18, EVENT_OBJ_GFX_WOMAN_2, 0, 28, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5F4, 0 + object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 20, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B60B, 0 + object_event 20, EVENT_OBJ_GFX_WOMAN_1, 0, 30, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B639, 0 + object_event 21, EVENT_OBJ_GFX_MAN_1, 0, 26, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B622, 0 + object_event 22, EVENT_OBJ_GFX_CAMPER, 0, 13, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B553, 0 + object_event 23, EVENT_OBJ_GFX_WOMAN_4, 0, 36, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B650, 0 + object_event 24, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 39, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B667, 0 + object_event 25, EVENT_OBJ_GFX_BOY_2, 0, 34, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B67E, 0 + object_event 26, EVENT_OBJ_GFX_GIRL_2, 0, 36, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B695, 0 + object_event 27, EVENT_OBJ_GFX_BOY_3, 0, 38, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6AC, 0 + object_event 28, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 40, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6C3, 0 + object_event 29, EVENT_OBJ_GFX_WOMAN_3, 0, 32, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6DA, 0 + object_event 30, EVENT_OBJ_GFX_MAN_1, 0, 37, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B71C, 0 + object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 42, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B705, 0 + object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 23, 26, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A0, 0 LilycoveCity_ContestHall_MapWarps: @ 8531B50 warp_def 19, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY diff --git a/data/maps/LilycoveCity_ContestLobby/events.inc b/data/maps/LilycoveCity_ContestLobby/events.inc index d7c31c8376..27448106f3 100644 --- a/data/maps/LilycoveCity_ContestLobby/events.inc +++ b/data/maps/LilycoveCity_ContestLobby/events.inc @@ -1,29 +1,29 @@ LilycoveCity_ContestLobby_EventObjects: @ 8531534 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 14, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 15, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 26, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0 - object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 9, 1, 0, 1, 0, 0, 0, 0, 0x0, 774 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 18, 8, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A708, 0 - object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 4, 9, 3, 2, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21A711, 0 - object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 3, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A71A, 0 - object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 13, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, 802 - object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 23, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A768, 0 - object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FB4, 0 - object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 21, 1, 0, 8, 0, 0, 0, 0, 0x0, 895 - object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 5, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A72C, 0 - object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 8, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A723, 0 - object_event 14, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 8, 7, 3, 3, 0, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A735, 0 - object_event 15, EVENT_OBJ_GFX_WOMAN_2, 0, 22, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0 - object_event 16, EVENT_OBJ_GFX_OLD_MAN_1, 0, 26, 5, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, 873 - object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 24, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A771, 0 - object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 27, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, 832 - object_event 19, EVENT_OBJ_GFX_CAMPER, 0, 28, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, 832 - object_event 20, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 28, 7, 3, 7, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, 832 - object_event 21, EVENT_OBJ_GFX_SCIENTIST_2, 0, 26, 7, 3, 7, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, 832 - object_event 22, EVENT_OBJ_GFX_WOMAN_1, 0, 27, 7, 3, 7, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, 832 - object_event 23, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, 832 - object_event 24, EVENT_OBJ_GFX_OLD_MAN_2, 0, 26, 5, 3, 10, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, 832 - object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 9, 10, 3, 10, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 15, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 26, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0 + object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 9, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 774 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 18, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A708, 0 + object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 4, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21A711, 0 + object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A71A, 0 + object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, 802 + object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 23, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A768, 0 + object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FB4, 0 + object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 21, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 895 + object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A72C, 0 + object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A723, 0 + object_event 14, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 8, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A735, 0 + object_event 15, EVENT_OBJ_GFX_WOMAN_2, 0, 22, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0 + object_event 16, EVENT_OBJ_GFX_OLD_MAN_1, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, 873 + object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 24, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A771, 0 + object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 27, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, 832 + object_event 19, EVENT_OBJ_GFX_CAMPER, 0, 28, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, 832 + object_event 20, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 28, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, 832 + object_event 21, EVENT_OBJ_GFX_SCIENTIST_2, 0, 26, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, 832 + object_event 22, EVENT_OBJ_GFX_WOMAN_1, 0, 27, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, 832 + object_event 23, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, 832 + object_event 24, EVENT_OBJ_GFX_OLD_MAN_2, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, 832 + object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0 LilycoveCity_ContestLobby_MapWarps: @ 853178C warp_def 14, 11, 0, 4, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc index 7ccbc4aecb..5595da7180 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc @@ -1,5 +1,5 @@ LilycoveCity_CoveLilyMotel_1F_EventObjects: @ 8531134 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 10, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218189, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218189, 0 LilycoveCity_CoveLilyMotel_1F_MapWarps: @ 853114C warp_def 5, 8, 0, 1, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc index 631eba91be..c0869f3193 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc @@ -1,11 +1,11 @@ LilycoveCity_CoveLilyMotel_2F_EventObjects: @ 8531188 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 4, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, 925 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, 925 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, 925 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 10, 3, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, 925 - object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 7, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, 925 - object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 4, 3, 9, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, 925 - object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 1, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, 787 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, 925 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, 925 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, 925 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, 925 + object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 7, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, 925 + object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, 925 + object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, 787 LilycoveCity_CoveLilyMotel_2F_MapWarps: @ 8531230 warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc index bdeda0bd99..adafc5b61e 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStoreElevator_EventObjects: @ 85324B0 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_220624, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_220624, 0 LilycoveCity_DepartmentStoreElevator_MapWarps: @ 85324C8 warp_def 1, 5, 3, 127, MAP_NONE diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc index aca7598ec0..8492376e26 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc @@ -1,8 +1,8 @@ LilycoveCity_DepartmentStoreRooftop_EventObjects: @ 853241C - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 4, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 7, 5, 3, 5, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0 - object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, 8, 1, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, 962 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 15, 5, 3, 8, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0 + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0 + object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, 962 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 15, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0 LilycoveCity_DepartmentStoreRooftop_MapWarps: @ 853247C warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc index 17a6db6157..3ebc7c803b 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc @@ -1,10 +1,10 @@ LilycoveCity_DepartmentStore_1F_EventObjects: @ 853208C - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F693, 0 - object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 10, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F69C, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 14, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F82F, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F838, 0 - object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, 1, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F841, 0 - object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 6, 3, 1, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F84A, 0 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F693, 0 + object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F69C, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F82F, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F838, 0 + object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F841, 0 + object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F84A, 0 LilycoveCity_DepartmentStore_1F_MapWarps: @ 853211C warp_def 8, 7, 0, 0, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc index 1747ece5aa..11fd1c4033 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc @@ -1,9 +1,9 @@ LilycoveCity_DepartmentStore_2F_EventObjects: @ 853215C - object_event 1, EVENT_OBJ_GFX_COOK, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB2D, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB36, 0 - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 13, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB3F, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB7A, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0 + object_event 1, EVENT_OBJ_GFX_COOK, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB2D, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB36, 0 + object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 13, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB3F, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB7A, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0 LilycoveCity_DepartmentStore_2F_MapWarps: @ 85321D4 warp_def 16, 1, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc index 93ef37b4b9..7042a1483a 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc @@ -1,9 +1,9 @@ LilycoveCity_DepartmentStore_3F_EventObjects: @ 8532200 - object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCB6, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 7, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCBF, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 13, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCC8, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC65, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0 + object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCB6, 0 + object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCBF, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 13, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCC8, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC65, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0 LilycoveCity_DepartmentStore_3F_MapWarps: @ 8532278 warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc index 5e6d0d94ac..8fe1ec45e9 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc @@ -1,9 +1,9 @@ LilycoveCity_DepartmentStore_4F_EventObjects: @ 85322A4 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDEB, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDF4, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDFD, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE06, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDEB, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDF4, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDFD, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE06, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0 LilycoveCity_DepartmentStore_4F_MapWarps: @ 853231C warp_def 16, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc index f2b9b130ae..9b56742a23 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc @@ -1,11 +1,11 @@ LilycoveCity_DepartmentStore_5F_EventObjects: @ 8532348 - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_2200BC, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 7, 3, 17, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22006C, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFA6, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFDC, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 15, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22000A, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 17, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22003A, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 5, 3, 10, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_2200BC, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22006C, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFA6, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFDC, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22000A, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 17, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22003A, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0 LilycoveCity_DepartmentStore_5F_MapWarps: @ 85323F0 warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F diff --git a/data/maps/LilycoveCity_Harbor/events.inc b/data/maps/LilycoveCity_Harbor/events.inc index 73d21e9ce4..6a157a1ad6 100644 --- a/data/maps/LilycoveCity_Harbor/events.inc +++ b/data/maps/LilycoveCity_Harbor/events.inc @@ -1,9 +1,9 @@ LilycoveCity_Harbor_EventObjects: @ 8531E1C - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, 908 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 861 - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 3, 13, 3, 2, 1, 1, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 10, 3, 8, 0, 0, 0, 0, 0x0, 909 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 8, 10, 3, 8, 1, 1, 0, 0, 0x0, 748 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, 908 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 861 + object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 3, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0 + object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 909 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 748 LilycoveCity_Harbor_MapWarps: @ 8531E94 warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_House1/events.inc b/data/maps/LilycoveCity_House1/events.inc index d268037ba3..d5768e01c6 100644 --- a/data/maps/LilycoveCity_House1/events.inc +++ b/data/maps/LilycoveCity_House1/events.inc @@ -1,6 +1,6 @@ LilycoveCity_House1_EventObjects: @ 8531EF4 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 5, 3, 9, 1, 1, 0, 0, LilycoveCity_House1_EventScript_21ECCE, 0 - object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House1_EventScript_21ECD7, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_House1_EventScript_21ECCE, 0 + object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_House1_EventScript_21ECD7, 0 LilycoveCity_House1_MapWarps: @ 8531F24 warp_def 3, 8, 0, 8, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_House2/events.inc b/data/maps/LilycoveCity_House2/events.inc index 7e5276102b..e4839eb5c5 100644 --- a/data/maps/LilycoveCity_House2/events.inc +++ b/data/maps/LilycoveCity_House2/events.inc @@ -1,5 +1,5 @@ LilycoveCity_House2_EventObjects: @ 8531F48 - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House2_EventScript_21ED75, 0 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_House2_EventScript_21ED75, 0 LilycoveCity_House2_MapWarps: @ 8531F60 warp_def 2, 7, 0, 9, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_House3/events.inc b/data/maps/LilycoveCity_House3/events.inc index 4f582bdefc..89f48e9f3d 100644 --- a/data/maps/LilycoveCity_House3/events.inc +++ b/data/maps/LilycoveCity_House3/events.inc @@ -1,10 +1,10 @@ LilycoveCity_House3_EventObjects: @ 8531F84 - object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 3, 4, 3, 8, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, 9, 0, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0 - object_event 3, EVENT_OBJ_GFX_BOY_5, 0, 1, 4, 3, 8, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0 - object_event 4, EVENT_OBJ_GFX_BOY_5, 0, 2, 5, 3, 7, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF09, 0 - object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 2, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EEA1, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 7, 5, 3, 9, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EE8A, 0 + object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0 + object_event 3, EVENT_OBJ_GFX_BOY_5, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0 + object_event 4, EVENT_OBJ_GFX_BOY_5, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF09, 0 + object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EEA1, 0 + object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EE8A, 0 LilycoveCity_House3_MapWarps: @ 8532014 warp_def 3, 7, 0, 10, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_House4/events.inc b/data/maps/LilycoveCity_House4/events.inc index e85c296d3b..6e447bf9cc 100644 --- a/data/maps/LilycoveCity_House4/events.inc +++ b/data/maps/LilycoveCity_House4/events.inc @@ -1,6 +1,6 @@ LilycoveCity_House4_EventObjects: @ 8532038 - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 1, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5B5, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 7, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5BE, 0 + object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5B5, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5BE, 0 LilycoveCity_House4_MapWarps: @ 8532068 warp_def 3, 8, 0, 11, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc index 47b39c6eeb..7a66d580c5 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc @@ -1,14 +1,14 @@ LilycoveCity_LilycoveMuseum_1F_EventObjects: @ 853124C - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 5, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, 775 - object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5, 0 - object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 13, 10, 3, 5, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E07, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 3, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E10, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 3, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, 776 - object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 19, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, 779 - object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 2, 3, 2, 2, 2, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, 780 - object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, 778 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 5, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, 775 + object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5, 0 + object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 13, 10, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E07, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E10, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, 776 + object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 19, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, 779 + object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, 780 + object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, 778 LilycoveCity_LilycoveMuseum_1F_MapWarps: @ 853133C warp_def 9, 13, 0, 3, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc index ba1e74e659..968a61b1d4 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc @@ -1,8 +1,8 @@ LilycoveCity_LilycoveMuseum_2F_EventObjects: @ 8531428 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 10, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 10, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, 777 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 3, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, 780 - object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 14, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, 780 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, 777 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, 780 + object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 14, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, 780 LilycoveCity_LilycoveMuseum_2F_MapWarps: @ 8531488 warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc index 784b388aea..a1be3924fc 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc @@ -1,5 +1,5 @@ LilycoveCity_MoveDeletersHouse_EventObjects: @ 8531EB8 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0 LilycoveCity_MoveDeletersHouse_MapWarps: @ 8531ED0 warp_def 3, 7, 0, 7, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc index dce57df3d7..42b4949a2f 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc @@ -1,9 +1,9 @@ LilycoveCity_PokemonCenter_1F_EventObjects: @ 8531BCC - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5E8, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 10, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5F6, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 11, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0 - object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 1, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0 - object_event 5, EVENT_OBJ_GFX_TRADER, 0, 2, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, 993 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5E8, 0 + object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5F6, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0 + object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0 + object_event 5, EVENT_OBJ_GFX_TRADER, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, 993 LilycoveCity_PokemonCenter_1F_MapWarps: @ 8531C44 warp_def 7, 8, 3, 2, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc index ec8e4cf6eb..910dd36ab8 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ LilycoveCity_PokemonCenter_2F_EventObjects: @ 8531C70 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_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, LilycoveCity_PokemonCenter_2F_EventScript_276B03, 702 LilycoveCity_PokemonCenter_2F_MapWarps: @ 8531CD0 warp_def 1, 6, 4, 2, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc index 228e56e4db..be478e45cc 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc @@ -1,13 +1,13 @@ LilycoveCity_PokemonTrainerFanClub_EventObjects: @ 8531D20 - object_event 1, EVENT_OBJ_GFX_LASS, 0, 3, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 8, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 6, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 5, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, 791 - object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 1, 9, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, 790 - object_event 7, EVENT_OBJ_GFX_WOMAN_4, 0, 3, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, 792 - object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 10, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, 789 - object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 11, 5, 3, 8, 1, 1, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, 730 + object_event 1, EVENT_OBJ_GFX_LASS, 0, 3, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 6, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, 791 + object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, 790 + object_event 7, EVENT_OBJ_GFX_WOMAN_4, 0, 3, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, 792 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, 789 + object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, 730 LilycoveCity_PokemonTrainerFanClub_MapWarps: @ 8531DF8 warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY diff --git a/data/maps/LinkContestRoom1/events.inc b/data/maps/LinkContestRoom1/events.inc index c1bdfe3fb4..c87a35486a 100644 --- a/data/maps/LinkContestRoom1/events.inc +++ b/data/maps/LinkContestRoom1/events.inc @@ -1,18 +1,18 @@ LinkContestRoom1_EventObjects: @ 8539EFC - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 7, 4, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 4, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_TRADER, 0, 6, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_STORYTELLER, 0, 8, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 2, 6, 3, 10, 0, 0, 0, 0, 0x0, 0 - object_event 7, 246, 0, 4, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 8, 247, 0, 5, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 9, 248, 0, 9, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 10, 249, 0, 10, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 11, 250, 0, 12, 5, 3, 9, 0, 0, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 2, 5, 3, 10, 0, 0, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, 1, 0, 0, 0, 0, 0x0, 86 - object_event 14, EVENT_OBJ_GFX_GIDDY, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, 9, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_TRADER, 0, 6, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_STORYTELLER, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 + object_event 7, 246, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 + object_event 8, 247, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 + object_event 9, 248, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 + object_event 10, 249, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 + object_event 11, 250, 0, 12, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 + object_event 12, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 + object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 86 + object_event 14, EVENT_OBJ_GFX_GIDDY, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 + object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 LinkContestRoom1_MapEvents:: @ 853A064 diff --git a/data/maps/LittlerootTown/events.inc b/data/maps/LittlerootTown/events.inc index 23b8cc3e5c..fd257b17de 100644 --- a/data/maps/LittlerootTown/events.inc +++ b/data/maps/LittlerootTown/events.inc @@ -1,12 +1,12 @@ LittlerootTown_EventObjects: @ 85276A8 - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 16, 10, 3, 2, 1, 2, 0, 0, LittlerootTown_EventScript_1E8034, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 13, 3, 2, 2, 1, 0, 0, LittlerootTown_EventScript_1E8022, 868 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 14, 17, 3, 2, 2, 1, 0, 0, LittlerootTown_EventScript_1E802B, 0 - object_event 4, EVENT_OBJ_GFX_MOM, 0, 5, 8, 3, 7, 0, 0, 0, 0, LittlerootTown_EventScript_1E863D, 752 - object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 10, 4, 10, 0, 0, 0, 0, 0x0, 761 - object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 10, 4, 10, 0, 0, 0, 0, 0x0, 762 - object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 13, 10, 3, 7, 1, 1, 0, 0, 0x0, 794 - object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 14, 10, 3, 7, 1, 1, 0, 0, 0x0, 795 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 16, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, LittlerootTown_EventScript_1E8034, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_1E8022, 868 + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 14, 17, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_1E802B, 0 + object_event 4, EVENT_OBJ_GFX_MOM, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LittlerootTown_EventScript_1E863D, 752 + object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 761 + object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 762 + object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 794 + object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 795 LittlerootTown_MapWarps: @ 8527768 warp_def 14, 8, 0, 1, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc index cd08fbad8d..df0022c999 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc @@ -1,11 +1,11 @@ LittlerootTown_BrendansHouse_1F_EventObjects: @ 852D08C - object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 6, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, 758 - object_event 2, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 1, 3, 3, 28, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, 755 - object_event 3, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 4, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, 754 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 7, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, 784 - object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, 9, 1, 1, 0, 0, 0x0, 734 - object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 5, 3, 5, 1, 1, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, 735 - object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 8, 3, 7, 1, 1, 0, 0, 0x0, 745 + object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, 758 + object_event 2, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 1, 3, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, 755 + object_event 3, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 4, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, 754 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, 784 + object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 734 + object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, 735 + object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 745 LittlerootTown_BrendansHouse_1F_MapWarps: @ 852D134 warp_def 9, 8, 0, 1, MAP_LITTLEROOT_TOWN diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc index a6649c9b6c..fbcc38a031 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc @@ -1,20 +1,20 @@ LittlerootTown_BrendansHouse_2F_EventObjects: @ 852D1A0 - object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, 8, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, 760 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 1, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 1, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 0, 1, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 4, 1, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 2, 3, 1, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 3, 3, 1, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 4, 3, 1, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 5, 0, 1, 0, 0, 0, 0, 0x0, 185 - object_event 14, EVENT_OBJ_GFX_MOM, 0, 7, 1, 3, 8, 1, 0, 0, 0, 0x0, 757 - object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 4, 0, 1, 1, 1, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, 817 - object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 5, 5, 3, 1, 1, 1, 0, 0, 0x0, 815 + object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, 760 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 1, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 5, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 185 + object_event 14, EVENT_OBJ_GFX_MOM, 0, 7, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, 757 + object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, 817 + object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 815 LittlerootTown_BrendansHouse_2F_MapWarps: @ 852D320 warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F diff --git a/data/maps/LittlerootTown_MaysHouse_1F/events.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc index 6822c20e8f..34eeeb7508 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/events.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/events.inc @@ -1,11 +1,11 @@ LittlerootTown_MaysHouse_1F_EventObjects: @ 852D36C - object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 6, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, 759 - object_event 2, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 6, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, 754 - object_event 3, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 9, 3, 3, 27, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, 755 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 7, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, 785 - object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, 10, 1, 1, 0, 0, 0x0, 734 - object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 9, 5, 3, 5, 1, 1, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, 736 - object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 2, 8, 3, 7, 1, 1, 0, 0, 0x0, 746 + object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, 759 + object_event 2, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 6, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, 754 + object_event 3, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 9, 3, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, 755 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, 785 + object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 734 + object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 9, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, 736 + object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 746 LittlerootTown_MaysHouse_1F_MapWarps: @ 852D414 warp_def 1, 8, 0, 0, MAP_LITTLEROOT_TOWN diff --git a/data/maps/LittlerootTown_MaysHouse_2F/events.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc index a5f1dd43c3..037f0538ad 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/events.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/events.inc @@ -1,20 +1,20 @@ LittlerootTown_MaysHouse_2F_EventObjects: @ 852D480 - object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 1, 1, 0, 8, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, 722 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 0, 1, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 1, 6, 3, 1, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 2, 6, 0, 1, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 3, 6, 3, 1, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 4, 6, 3, 1, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 5, 6, 3, 1, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 7, 3, 1, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 7, 3, 1, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 2, 7, 3, 1, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 3, 7, 3, 1, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 4, 7, 3, 1, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 5, 7, 3, 1, 0, 0, 0, 0, 0x0, 185 - object_event 14, EVENT_OBJ_GFX_MOM, 0, 1, 1, 3, 8, 1, 0, 0, 0, 0x0, 757 - object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 4, 4, 8, 1, 1, 0, 0, 0x0, 849 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 4, 0, 1, 1, 1, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, 818 + object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, 722 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 2, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 4, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 5, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 2, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 3, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 185 + object_event 14, EVENT_OBJ_GFX_MOM, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, 757 + object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 849 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, 818 LittlerootTown_MaysHouse_2F_MapWarps: @ 852D600 warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc index a4596ce5c8..41e5112f71 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc @@ -1,10 +1,10 @@ LittlerootTown_ProfessorBirchsLab_EventObjects: @ 852D64C - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 9, 8, 3, 2, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84, 0 - object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 4, 3, 8, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, 721 - object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 7, 4, 3, 8, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, 889 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, 8, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB, 811 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, 8, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, 812 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, 8, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, 838 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 9, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84, 0 + object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, 721 + object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, 889 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB, 811 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, 812 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, 838 LittlerootTown_ProfessorBirchsLab_MapWarps: @ 852D6DC warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN diff --git a/data/maps/MagmaHideout_1F/events.inc b/data/maps/MagmaHideout_1F/events.inc index 1274e2373f..2fa18eade5 100644 --- a/data/maps/MagmaHideout_1F/events.inc +++ b/data/maps/MagmaHideout_1F/events.inc @@ -1,10 +1,10 @@ MagmaHideout_1F_EventObjects: @ 85371CC - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 4, 5, 0, 10, 1, 1, 1, 2, MagmaHideout_1F_EventScript_23988C, 857 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 20, 0, 1, 1, 1, 0, 0, MagmaHideout_1F_EventScript_2914DE, 1151 - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 20, 3, 9, 1, 1, 1, 4, MagmaHideout_1F_EventScript_2398A3, 857 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 17 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 18 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 19 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 4, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_1F_EventScript_23988C, 857 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 20, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_1F_EventScript_2914DE, 1151 + object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 20, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_1F_EventScript_2398A3, 857 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 17 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 18 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 19 MagmaHideout_1F_MapWarps: @ 853725C warp_def 10, 34, 3, 4, MAP_JAGGED_PASS diff --git a/data/maps/MagmaHideout_2F_1R/events.inc b/data/maps/MagmaHideout_2F_1R/events.inc index 32f835efc1..723c9e9148 100644 --- a/data/maps/MagmaHideout_2F_1R/events.inc +++ b/data/maps/MagmaHideout_2F_1R/events.inc @@ -1,8 +1,8 @@ MagmaHideout_2F_1R_EventObjects: @ 8537290 - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 18, 19, 3, 51, 5, 4, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, 857 - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 14, 3, 46, 7, 6, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, 857 - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 8, 3, 10, 1, 1, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, 857 - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 11, 3, 7, 1, 1, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, 857 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 18, 19, 3, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 5, 4, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, 857 + object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 14, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 7, 6, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, 857 + object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, 857 + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, 857 MagmaHideout_2F_1R_MapWarps: @ 85372F0 warp_def 11, 23, 0, 0, MAP_MAGMA_HIDEOUT_2F_2R diff --git a/data/maps/MagmaHideout_2F_2R/events.inc b/data/maps/MagmaHideout_2F_2R/events.inc index 5567bf9cff..277dcf5300 100644 --- a/data/maps/MagmaHideout_2F_2R/events.inc +++ b/data/maps/MagmaHideout_2F_2R/events.inc @@ -1,10 +1,10 @@ MagmaHideout_2F_2R_EventObjects: @ 853731C - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 29, 8, 3, 9, 1, 1, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, 857 - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 25, 11, 3, 10, 1, 1, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, 857 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 21, 7, 3, 1, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, 1164 - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 9, 3, 8, 1, 1, 1, 4, MagmaHideout_2F_2R_EventScript_239E1F, 857 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 7, 13, 3, 10, 1, 1, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, 857 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, 1, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, 1165 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 29, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, 857 + object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, 857 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 21, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, 1164 + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, MagmaHideout_2F_2R_EventScript_239E1F, 857 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, 857 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, 1165 MagmaHideout_2F_2R_MapWarps: @ 85373AC warp_def 10, 22, 3, 0, MAP_MAGMA_HIDEOUT_2F_1R diff --git a/data/maps/MagmaHideout_3F_1R/events.inc b/data/maps/MagmaHideout_3F_1R/events.inc index b2f157f57b..0f3ff3529b 100644 --- a/data/maps/MagmaHideout_3F_1R/events.inc +++ b/data/maps/MagmaHideout_3F_1R/events.inc @@ -1,7 +1,7 @@ MagmaHideout_3F_1R_EventObjects: @ 85373D0 - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 2, 7, 4, 10, 1, 1, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, 857 - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 21, 21, 0, 9, 1, 1, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, 857 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 16, 0, 1, 1, 1, 0, 0, MagmaHideout_3F_1R_EventScript_291505, 1166 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 2, 7, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, 857 + object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 21, 21, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, 857 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 16, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_1R_EventScript_291505, 1166 MagmaHideout_3F_1R_MapWarps: @ 8537418 warp_def 7, 21, 0, 0, MAP_MAGMA_HIDEOUT_4F diff --git a/data/maps/MagmaHideout_3F_2R/events.inc b/data/maps/MagmaHideout_3F_2R/events.inc index 27ea129c35..d2bd79078c 100644 --- a/data/maps/MagmaHideout_3F_2R/events.inc +++ b/data/maps/MagmaHideout_3F_2R/events.inc @@ -1,6 +1,6 @@ MagmaHideout_3F_2R_EventObjects: @ 8537444 - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 3, 0, 17, 1, 1, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, 857 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 9, 0, 1, 1, 1, 0, 0, MagmaHideout_3F_2R_EventScript_291512, 1167 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 3, 0, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, 857 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 9, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_2R_EventScript_291512, 1167 MagmaHideout_3F_2R_MapWarps: @ 8537474 warp_def 12, 15, 0, 1, MAP_MAGMA_HIDEOUT_3F_1R diff --git a/data/maps/MagmaHideout_3F_3R/events.inc b/data/maps/MagmaHideout_3F_3R/events.inc index 3f96b56528..2ced1f4fd9 100644 --- a/data/maps/MagmaHideout_3F_3R/events.inc +++ b/data/maps/MagmaHideout_3F_3R/events.inc @@ -1,5 +1,5 @@ MagmaHideout_3F_3R_EventObjects: @ 8537574 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 19, 0, 1, 1, 1, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, 1059 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 19, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, 1059 MagmaHideout_3F_3R_MapWarps: @ 853758C warp_def 16, 1, 0, 1, MAP_MAGMA_HIDEOUT_2F_3R diff --git a/data/maps/MagmaHideout_4F/events.inc b/data/maps/MagmaHideout_4F/events.inc index 1865c3b845..435099c478 100644 --- a/data/maps/MagmaHideout_4F/events.inc +++ b/data/maps/MagmaHideout_4F/events.inc @@ -1,12 +1,12 @@ MagmaHideout_4F_EventObjects: @ 8537490 - object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 16, 17, 0, 8, 1, 1, 0, 0, 0x0, 853 - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 31, 22, 0, 10, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A68C, 857 - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 13, 0, 9, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6A3, 857 - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 13, 0, 10, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6BA, 857 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 4, 0, 8, 1, 1, 1, 4, MagmaHideout_4F_EventScript_23A6D1, 857 - object_event 6, EVENT_OBJ_GFX_MAXIE, 0, 16, 21, 0, 7, 1, 1, 0, 0, MagmaHideout_4F_EventScript_23A560, 857 - object_event 7, EVENT_OBJ_GFX_GROUDON_2, 0, 16, 17, 3, 8, 1, 1, 0, 0, 0x0, 850 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 0, 1, 1, 1, 0, 0, MagmaHideout_4F_EventScript_29151F, 1168 + object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 16, 17, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 853 + object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 31, 22, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A68C, 857 + object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 13, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6A3, 857 + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 13, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6BA, 857 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, MagmaHideout_4F_EventScript_23A6D1, 857 + object_event 6, EVENT_OBJ_GFX_MAXIE, 0, 16, 21, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MagmaHideout_4F_EventScript_23A560, 857 + object_event 7, EVENT_OBJ_GFX_GROUDON_2, 0, 16, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 850 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_4F_EventScript_29151F, 1168 MagmaHideout_4F_MapWarps: @ 8537550 warp_def 46, 7, 0, 0, MAP_MAGMA_HIDEOUT_3F_1R diff --git a/data/maps/MarineCave_End/events.inc b/data/maps/MarineCave_End/events.inc index 14903539b2..0d3014ab12 100644 --- a/data/maps/MarineCave_End/events.inc +++ b/data/maps/MarineCave_End/events.inc @@ -1,5 +1,5 @@ MarineCave_End_EventObjects: @ 85377E8 - object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 9, 22, 1, 8, 1, 1, 0, 0, 0x0, 782 + object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 9, 22, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 782 MarineCave_End_MapWarps: @ 8537800 warp_def 20, 4, 0, 0, MAP_MARINE_CAVE_ENTRANCE diff --git a/data/maps/MauvilleCity/events.inc b/data/maps/MauvilleCity/events.inc index c8318005c4..cc393513d8 100644 --- a/data/maps/MauvilleCity/events.inc +++ b/data/maps/MauvilleCity/events.inc @@ -1,15 +1,15 @@ MauvilleCity_EventObjects: @ 852662C - object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 29, 16, 3, 5, 1, 1, 0, 0, MauvilleCity_EventScript_1DF3B3, 0 - object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 24, 10, 3, 5, 1, 0, 0, 0, MauvilleCity_EventScript_1DF3CE, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 14, 11, 3, 10, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3C5, 0 - object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 17, 14, 3, 8, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3FB, 0 - object_event 6, EVENT_OBJ_GFX_WALLY, 0, 8, 6, 3, 7, 0, 0, 0, 0, MauvilleCity_EventScript_1DF452, 804 - object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_1DF41D, 805 - object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 29, 9, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF73A, 912 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 19, 3, 1, 1, 1, 0, 0, MauvilleCity_EventScript_2910CE, 1116 - object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 13, 7, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0 - object_event 11, EVENT_OBJ_GFX_SCOTT, 0, 12, 14, 3, 7, 0, 0, 0, 0, 0x0, 765 + object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 29, 16, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, MauvilleCity_EventScript_1DF3B3, 0 + object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 24, 10, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MauvilleCity_EventScript_1DF3CE, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3C5, 0 + object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 17, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3FB, 0 + object_event 6, EVENT_OBJ_GFX_WALLY, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MauvilleCity_EventScript_1DF452, 804 + object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_EventScript_1DF41D, 805 + object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 29, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_EventScript_1DF73A, 912 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MauvilleCity_EventScript_2910CE, 1116 + object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0 + object_event 11, EVENT_OBJ_GFX_SCOTT, 0, 12, 14, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 765 MauvilleCity_MapWarps: @ 8526734 warp_def 8, 5, 0, 0, MAP_MAUVILLE_CITY_GYM diff --git a/data/maps/MauvilleCity_BikeShop/events.inc b/data/maps/MauvilleCity_BikeShop/events.inc index b4c0d19dfb..c1ee859090 100644 --- a/data/maps/MauvilleCity_BikeShop/events.inc +++ b/data/maps/MauvilleCity_BikeShop/events.inc @@ -1,6 +1,6 @@ MauvilleCity_BikeShop_EventObjects: @ 852FE80 - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 2, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EBBC, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 7, 6, 3, 2, 1, 1, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0 + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EBBC, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 7, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0 MauvilleCity_BikeShop_MapWarps: @ 852FEB0 warp_def 3, 8, 0, 2, MAP_MAUVILLE_CITY diff --git a/data/maps/MauvilleCity_GameCorner/events.inc b/data/maps/MauvilleCity_GameCorner/events.inc index a956f16d83..8c30b75b7b 100644 --- a/data/maps/MauvilleCity_GameCorner/events.inc +++ b/data/maps/MauvilleCity_GameCorner/events.inc @@ -1,16 +1,16 @@ MauvilleCity_GameCorner_EventObjects: @ 852FF28 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 7, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210125, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 5, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21012E, 0 - object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 11, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FBB9, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 14, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FCF1, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 3, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210137, 0 - object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 19, 4, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21021D, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN_2, 0, 20, 8, 3, 9, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210279, 0 - object_event 8, EVENT_OBJ_GFX_COOK, 0, 6, 8, 3, 10, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210289, 0 - object_event 9, EVENT_OBJ_GFX_BEAUTY, 0, 13, 2, 3, 8, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_20FE9F, 0 - object_event 10, EVENT_OBJ_GFX_MAN_4, 0, 1, 7, 3, 10, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_210299, 0 - object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 9, 8, 3, 9, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102B6, 0 - object_event 12, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 6, 3, 9, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210125, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21012E, 0 + object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FBB9, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FCF1, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210137, 0 + object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21021D, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_2, 0, 20, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210279, 0 + object_event 8, EVENT_OBJ_GFX_COOK, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210289, 0 + object_event 9, EVENT_OBJ_GFX_BEAUTY, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_20FE9F, 0 + object_event 10, EVENT_OBJ_GFX_MAN_4, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_210299, 0 + object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102B6, 0 + object_event 12, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0 MauvilleCity_GameCorner_MapWarps: @ 8530048 warp_def 11, 10, 3, 5, MAP_MAUVILLE_CITY diff --git a/data/maps/MauvilleCity_Gym/events.inc b/data/maps/MauvilleCity_Gym/events.inc index 08c8db4449..c1b2b0053a 100644 --- a/data/maps/MauvilleCity_Gym/events.inc +++ b/data/maps/MauvilleCity_Gym/events.inc @@ -1,11 +1,11 @@ MauvilleCity_Gym_EventObjects: @ 852FD5C - object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 5, 2, 0, 8, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, 913 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 7, 8, 3, 8, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 1, 16, 0, 7, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 10, 0, 9, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0E7, 0 - object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 1, 13, 0, 8, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0B9, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 20, 0, 9, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20E12C, 0 - object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 7, 10, 3, 7, 1, 1, 1, 1, MauvilleCity_Gym_EventScript_20E115, 0 + object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 5, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, 913 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 7, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 1, 16, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 10, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0E7, 0 + object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 1, 13, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0B9, 0 + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 20, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20E12C, 0 + object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 7, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, MauvilleCity_Gym_EventScript_20E115, 0 MauvilleCity_Gym_MapWarps: @ 852FE04 warp_def 4, 20, 0, 0, MAP_MAUVILLE_CITY diff --git a/data/maps/MauvilleCity_House1/events.inc b/data/maps/MauvilleCity_House1/events.inc index 2590e33b9a..1d759b438f 100644 --- a/data/maps/MauvilleCity_House1/events.inc +++ b/data/maps/MauvilleCity_House1/events.inc @@ -1,5 +1,5 @@ MauvilleCity_House1_EventObjects: @ 852FEEC - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_House1_EventScript_20F976, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_House1_EventScript_20F976, 0 MauvilleCity_House1_MapWarps: @ 852FF04 warp_def 3, 7, 0, 4, MAP_MAUVILLE_CITY diff --git a/data/maps/MauvilleCity_House2/events.inc b/data/maps/MauvilleCity_House2/events.inc index f8e04f5eae..3ac497bbc4 100644 --- a/data/maps/MauvilleCity_House2/events.inc +++ b/data/maps/MauvilleCity_House2/events.inc @@ -1,5 +1,5 @@ MauvilleCity_House2_EventObjects: @ 853018C - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0 MauvilleCity_House2_MapWarps: @ 85301A4 warp_def 3, 8, 0, 6, MAP_MAUVILLE_CITY diff --git a/data/maps/MauvilleCity_Mart/events.inc b/data/maps/MauvilleCity_Mart/events.inc index f678407833..5e96dcfd3a 100644 --- a/data/maps/MauvilleCity_Mart/events.inc +++ b/data/maps/MauvilleCity_Mart/events.inc @@ -1,7 +1,7 @@ MauvilleCity_Mart_EventObjects: @ 8530310 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_2110E6, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_21111C, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_2110E6, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_21111C, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0 MauvilleCity_Mart_MapWarps: @ 8530358 warp_def 3, 7, 0, 3, MAP_MAUVILLE_CITY diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc index adab7d3e4f..4000ead3ec 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc @@ -1,9 +1,9 @@ MauvilleCity_PokemonCenter_1F_EventObjects: @ 85301C8 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E78, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 2, 3, 3, 9, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_28E066, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 8, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E86, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 4, 3, 3, 0, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E8F, 0 - object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 2, 8, 3, 1, 1, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E98, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E78, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_28E066, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E86, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E8F, 0 + object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 2, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E98, 0 MauvilleCity_PokemonCenter_1F_MapWarps: @ 8530240 warp_def 7, 8, 3, 1, MAP_MAUVILLE_CITY diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc index c3a0c4990a..d445b3cca8 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc @@ -1,9 +1,9 @@ MauvilleCity_PokemonCenter_2F_EventObjects: @ 853026C - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_276B03, 702 - object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 8, 8, 3, 7, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_21102F, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_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, MauvilleCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_21102F, 0 MauvilleCity_PokemonCenter_2F_MapWarps: @ 85302E4 warp_def 1, 6, 4, 2, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/MeteorFalls_1F_1R/events.inc b/data/maps/MeteorFalls_1F_1R/events.inc index 977559950b..21535add76 100644 --- a/data/maps/MeteorFalls_1F_1R/events.inc +++ b/data/maps/MeteorFalls_1F_1R/events.inc @@ -1,14 +1,14 @@ MeteorFalls_1F_1R_EventObjects: @ 8533F74 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 4, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, 1044 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 14, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, 1046 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 5, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, 1045 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 32, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911D2, 1047 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 20, 3, 8, 0, 0, 0, 0, 0x0, 939 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 21, 3, 9, 0, 0, 0, 0, 0x0, 939 - object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938 - object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 21, 3, 1, 0, 0, 0, 0, 0x0, 938 - object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 23, 3, 21, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, 942 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, 1044 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, 1046 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, 1045 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911D2, 1047 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 939 + object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 939 + object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 6, 20, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 938 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 20, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 938 + object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 938 + object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 23, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, 942 MeteorFalls_1F_1R_MapWarps: @ 8534064 warp_def 27, 18, 4, 0, MAP_ROUTE114 diff --git a/data/maps/MeteorFalls_1F_2R/events.inc b/data/maps/MeteorFalls_1F_2R/events.inc index 0436851c5c..4cab5be37a 100644 --- a/data/maps/MeteorFalls_1F_2R/events.inc +++ b/data/maps/MeteorFalls_1F_2R/events.inc @@ -1,7 +1,7 @@ MeteorFalls_1F_2R_EventObjects: @ 85340C4 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 13, 2, 3, 8, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C4DE, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 12, 3, 8, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C540, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 12, 3, 8, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C4DE, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C540, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0 MeteorFalls_1F_2R_MapWarps: @ 853410C warp_def 10, 29, 3, 2, MAP_METEOR_FALLS_1F_1R diff --git a/data/maps/MeteorFalls_B1F_2R/events.inc b/data/maps/MeteorFalls_B1F_2R/events.inc index 8e2c9e1c4e..85dafb8699 100644 --- a/data/maps/MeteorFalls_B1F_2R/events.inc +++ b/data/maps/MeteorFalls_B1F_2R/events.inc @@ -1,5 +1,5 @@ MeteorFalls_B1F_2R_EventObjects: @ 8534190 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, 1, 1, 1, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, 1080 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, 1080 MeteorFalls_B1F_2R_MapWarps: @ 85341A8 warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R diff --git a/data/maps/MeteorFalls_StevensCave/events.inc b/data/maps/MeteorFalls_StevensCave/events.inc index ff920f86d5..09225365d3 100644 --- a/data/maps/MeteorFalls_StevensCave/events.inc +++ b/data/maps/MeteorFalls_StevensCave/events.inc @@ -1,5 +1,5 @@ MeteorFalls_StevensCave_EventObjects: @ 85378B0 - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 19, 3, 3, 7, 1, 1, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 19, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0 MeteorFalls_StevensCave_MapWarps: @ 85378C8 warp_def 10, 29, 3, 5, MAP_METEOR_FALLS_1F_1R diff --git a/data/maps/MirageTower_3F/events.inc b/data/maps/MirageTower_3F/events.inc index e12b4873d9..d62e54f923 100644 --- a/data/maps/MirageTower_3F/events.inc +++ b/data/maps/MirageTower_3F/events.inc @@ -1,6 +1,6 @@ MirageTower_3F_EventObjects: @ 853761C - object_event 1, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 7, 3, 1, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, 17 - object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 8, 3, 1, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, 18 + object_event 1, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, 17 + object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, 18 MirageTower_3F_MapWarps: @ 853764C warp_def 18, 12, 3, 0, MAP_MIRAGE_TOWER_2F diff --git a/data/maps/MirageTower_4F/events.inc b/data/maps/MirageTower_4F/events.inc index 7b215a83a1..b9574637a4 100644 --- a/data/maps/MirageTower_4F/events.inc +++ b/data/maps/MirageTower_4F/events.inc @@ -1,7 +1,7 @@ MirageTower_4F_EventObjects: @ 8537670 - object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 5, 4, 4, 8, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD48, 963 - object_event 2, EVENT_OBJ_GFX_FOSSIL, 0, 7, 4, 0, 8, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD89, 964 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 7, 3, 1, 1, 1, 0, 0, MirageTower_4F_EventScript_2907A6, 17 + object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 5, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD48, 963 + object_event 2, EVENT_OBJ_GFX_FOSSIL, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD89, 964 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_4F_EventScript_2907A6, 17 MirageTower_4F_MapWarps: @ 85376B8 warp_def 1, 4, 3, 1, MAP_MIRAGE_TOWER_3F diff --git a/data/maps/MossdeepCity/events.inc b/data/maps/MossdeepCity/events.inc index d288400b56..c95cdf5cf2 100644 --- a/data/maps/MossdeepCity/events.inc +++ b/data/maps/MossdeepCity/events.inc @@ -1,21 +1,21 @@ MossdeepCity_EventObjects: @ 8527018 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 38, 12, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AD1, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 50, 34, 5, 5, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 32, 12, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AB2, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 21, 5, 3, 0, 1, 0, 0, MossdeepCity_EventScript_1E4AF0, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 45, 18, 7, 9, 0, 0, 0, 0, MossdeepCity_EventScript_1E4B02, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 35, 5, 1, 0, 0, 0, 0, MossdeepCity_EventScript_2910F5, 1043 - object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 55, 5, 7, 7, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C10, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_1, 0, 56, 21, 7, 10, 1, 1, 0, 0, MossdeepCity_EventScript_1E4B0B, 0 - object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 23, 13, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_1E4C26, 0 - object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 23, 5, 8, 1, 1, 0, 0, 0x0, 823 - object_event 11, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 24, 5, 7, 1, 1, 0, 0, 0x0, 823 - object_event 12, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 25, 5, 8, 1, 1, 0, 0, 0x0, 823 - object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 26, 5, 7, 1, 1, 0, 0, 0x0, 823 - object_event 14, EVENT_OBJ_GFX_MAXIE, 0, 45, 25, 5, 9, 1, 1, 0, 0, 0x0, 823 - object_event 15, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 25, 3, 64, 3, 3, 0, 0, MossdeepCity_EventScript_2C81EE, 0 - object_event 16, EVENT_OBJ_GFX_SCOTT, 0, 61, 29, 5, 17, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, 788 - object_event 17, EVENT_OBJ_GFX_BLACK_BELT, 0, 31, 29, 3, 64, 3, 3, 0, 0, MossdeepCity_EventScript_1E4C7C, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 38, 12, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AD1, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 50, 34, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 32, 12, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AB2, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 21, 5, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MossdeepCity_EventScript_1E4AF0, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 45, 18, 7, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_EventScript_1E4B02, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 35, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MossdeepCity_EventScript_2910F5, 1043 + object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 55, 5, 7, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C10, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_1, 0, 56, 21, 7, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_EventScript_1E4B0B, 0 + object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 23, 13, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4C26, 0 + object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 23, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 823 + object_event 11, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 24, 5, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 823 + object_event 12, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 25, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 823 + object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 26, 5, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 823 + object_event 14, EVENT_OBJ_GFX_MAXIE, 0, 45, 25, 5, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 823 + object_event 15, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 25, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 3, 3, 0, 0, MossdeepCity_EventScript_2C81EE, 0 + object_event 16, EVENT_OBJ_GFX_SCOTT, 0, 61, 29, 5, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, 788 + object_event 17, EVENT_OBJ_GFX_BLACK_BELT, 0, 31, 29, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 3, 3, 0, 0, MossdeepCity_EventScript_1E4C7C, 0 MossdeepCity_MapWarps: @ 85271B0 warp_def 28, 9, 0, 0, MAP_MOSSDEEP_CITY_HOUSE1 diff --git a/data/maps/MossdeepCity_GameCorner_1F/events.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc index 42face3c4a..603d7f3d82 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/events.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/events.inc @@ -1,6 +1,6 @@ MossdeepCity_GameCorner_1F_EventObjects: @ 8532F40 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B54, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 4, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B54, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0 MossdeepCity_GameCorner_1F_MapWarps: @ 8532F70 warp_def 5, 9, 0, 9, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_GameCorner_B1F/events.inc b/data/maps/MossdeepCity_GameCorner_B1F/events.inc index 7146d30b82..58ca66fd27 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/events.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/events.inc @@ -1,5 +1,5 @@ MossdeepCity_GameCorner_B1F_EventObjects: @ 8532FC0 - object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 6, 5, 3, 9, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 MossdeepCity_GameCorner_B1F_MapWarps: @ 8532FD8 warp_def 3, 1, 0, 2, MAP_MOSSDEEP_CITY_GAME_CORNER_1F diff --git a/data/maps/MossdeepCity_Gym/events.inc b/data/maps/MossdeepCity_Gym/events.inc index e383463aff..8245f1fc26 100644 --- a/data/maps/MossdeepCity_Gym/events.inc +++ b/data/maps/MossdeepCity_Gym/events.inc @@ -1,40 +1,40 @@ MossdeepCity_Gym_EventObjects: @ 85324EC - object_event 1, EVENT_OBJ_GFX_TATE, 0, 23, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0 - object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 30, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220AFD, 0 - object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 5, 20, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B2B, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 4, 29, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B70, 0 - object_event 5, EVENT_OBJ_GFX_LASS, 0, 4, 23, 0, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B59, 0 - object_event 6, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 9, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B14, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 6, 3, 0, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B42, 0 - object_event 8, EVENT_OBJ_GFX_MAN_2, 0, 5, 33, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220C11, 0 - object_event 9, EVENT_OBJ_GFX_LIZA, 0, 24, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0 - object_event 10, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 2, 30, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 11, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 1, 29, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 30, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 5, 29, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 14, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 5, 21, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 7, 9, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 16, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 10, 8, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 17, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 8, 3, 7, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220B9E, 0 - object_event 18, EVENT_OBJ_GFX_HEX_MANIAC, 0, 7, 5, 3, 10, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220B87, 0 - object_event 19, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 6, 6, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 20, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 5, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 21, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 11, 5, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 22, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 11, 34, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 23, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 33, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 24, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 34, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 22, 25, 3, 7, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BCC, 0 - object_event 26, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 23, 26, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 27, EVENT_OBJ_GFX_LASS, 0, 25, 25, 0, 9, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BB5, 0 - object_event 28, EVENT_OBJ_GFX_HEX_MANIAC, 0, 22, 23, 3, 8, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BFA, 0 - object_event 29, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 21, 23, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 30, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 21, 22, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 31, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 22, 22, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 32, EVENT_OBJ_GFX_PSYCHIC_M, 0, 25, 22, 3, 7, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BE3, 0 - object_event 33, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 24, 22, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 34, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 24, 23, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 35, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 6, 5, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 36, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 23, 25, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_TATE, 0, 23, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0 + object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 30, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220AFD, 0 + object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 5, 20, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B2B, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 4, 29, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B70, 0 + object_event 5, EVENT_OBJ_GFX_LASS, 0, 4, 23, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B59, 0 + object_event 6, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B14, 0 + object_event 7, EVENT_OBJ_GFX_LASS, 0, 6, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B42, 0 + object_event 8, EVENT_OBJ_GFX_MAN_2, 0, 5, 33, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220C11, 0 + object_event 9, EVENT_OBJ_GFX_LIZA, 0, 24, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0 + object_event 10, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 2, 30, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 11, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 1, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 12, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 30, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 13, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 5, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 14, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 5, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 15, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 7, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 16, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 10, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 17, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220B9E, 0 + object_event 18, EVENT_OBJ_GFX_HEX_MANIAC, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220B87, 0 + object_event 19, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 6, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 20, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 21, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 11, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 22, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 11, 34, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 23, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 33, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 24, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 34, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 22, 25, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BCC, 0 + object_event 26, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 23, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 27, EVENT_OBJ_GFX_LASS, 0, 25, 25, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BB5, 0 + object_event 28, EVENT_OBJ_GFX_HEX_MANIAC, 0, 22, 23, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BFA, 0 + object_event 29, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 21, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 30, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 21, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 31, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 22, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 32, EVENT_OBJ_GFX_PSYCHIC_M, 0, 25, 22, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BE3, 0 + object_event 33, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 24, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 34, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 24, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 35, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 36, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 23, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 MossdeepCity_Gym_MapWarps: @ 853284C warp_def 6, 35, 3, 1, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_House1/events.inc b/data/maps/MossdeepCity_House1/events.inc index a7832fb095..00e7a12fc5 100644 --- a/data/maps/MossdeepCity_House1/events.inc +++ b/data/maps/MossdeepCity_House1/events.inc @@ -1,6 +1,6 @@ MossdeepCity_House1_EventObjects: @ 8532978 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 3, 3, 3, 1, 1, 0, 0, MossdeepCity_House1_EventScript_221FD6, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, MossdeepCity_House1_EventScript_221FD6, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0 MossdeepCity_House1_MapWarps: @ 85329A8 warp_def 3, 7, 0, 0, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_House2/events.inc b/data/maps/MossdeepCity_House2/events.inc index 86ba589466..b38d1bf8dd 100644 --- a/data/maps/MossdeepCity_House2/events.inc +++ b/data/maps/MossdeepCity_House2/events.inc @@ -1,7 +1,7 @@ MossdeepCity_House2_EventObjects: @ 85329CC - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, 934 + object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0 + object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, 934 MossdeepCity_House2_MapWarps: @ 8532A14 warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_House3/events.inc b/data/maps/MossdeepCity_House3/events.inc index e40e79e100..374808598d 100644 --- a/data/maps/MossdeepCity_House3/events.inc +++ b/data/maps/MossdeepCity_House3/events.inc @@ -1,5 +1,5 @@ MossdeepCity_House3_EventObjects: @ 8532BD4 - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 4, 4, 3, 10, 0, 0, 0, 0, MossdeepCity_House3_EventScript_2225C3, 0 + object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_House3_EventScript_2225C3, 0 MossdeepCity_House3_MapWarps: @ 8532BEC warp_def 3, 7, 0, 5, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_House4/events.inc b/data/maps/MossdeepCity_House4/events.inc index 96d8fe7d89..048bd5ffd8 100644 --- a/data/maps/MossdeepCity_House4/events.inc +++ b/data/maps/MossdeepCity_House4/events.inc @@ -1,7 +1,7 @@ MossdeepCity_House4_EventObjects: @ 8532CAC - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 6, 3, 5, 1, 0, 0, 0, MossdeepCity_House4_EventScript_222DF7, 0 - object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 2, 4, 3, 1, 1, 1, 0, 0, MossdeepCity_House4_EventScript_222E1E, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_House4_EventScript_222DF7, 0 + object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_House4_EventScript_222E1E, 0 MossdeepCity_House4_MapWarps: @ 8532CF4 warp_def 4, 7, 0, 7, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_Mart/events.inc b/data/maps/MossdeepCity_Mart/events.inc index d8314e6e53..9fb1f674ad 100644 --- a/data/maps/MossdeepCity_Mart/events.inc +++ b/data/maps/MossdeepCity_Mart/events.inc @@ -1,8 +1,8 @@ MossdeepCity_Mart_EventObjects: @ 8532B50 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223C8, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 1, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 8, 3, 3, 3, 0, 1, 0, 0, MossdeepCity_Mart_EventScript_2223FF, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 5, 3, 3, 2, 1, 1, 0, 0, MossdeepCity_Mart_EventScript_222408, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223C8, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0 + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 8, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MossdeepCity_Mart_EventScript_2223FF, 0 + object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_Mart_EventScript_222408, 0 MossdeepCity_Mart_MapWarps: @ 8532BB0 warp_def 3, 7, 0, 4, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc index 7e56185b2b..ed26d83cbc 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc @@ -1,7 +1,7 @@ MossdeepCity_PokemonCenter_1F_EventObjects: @ 8532A38 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22224E, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 4, 3, 7, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22225C, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 3, 5, 3, 1, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_222265, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22224E, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22225C, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 3, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_222265, 0 MossdeepCity_PokemonCenter_1F_MapWarps: @ 8532A80 warp_def 7, 8, 3, 2, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc index c5d5af15ab..e13367153e 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc @@ -1,9 +1,9 @@ MossdeepCity_PokemonCenter_2F_EventObjects: @ 8532AAC - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, 702 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 7, 3, 5, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_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, MossdeepCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0 MossdeepCity_PokemonCenter_2F_MapWarps: @ 8532B24 warp_def 1, 6, 4, 2, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc index fa5a8f3bb1..fe1d4fcf8a 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc @@ -1,15 +1,15 @@ MossdeepCity_SpaceCenter_1F_EventObjects: @ 8532D18 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 7, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_222FD8, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223063, 0 - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223168, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 7, 3, 3, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22312D, 0 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 12, 9, 3, 9, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231DA, 756 - object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 11, 6, 3, 9, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231F1, 756 - object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 10, 2, 3, 8, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_223208, 756 - object_event 9, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 2, 3, 8, 1, 1, 1, 0, MossdeepCity_SpaceCenter_1F_EventScript_22321F, 756 - object_event 10, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 5, 0, 76, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, 737 - object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 1, 4, 3, 8, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, 753 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_222FD8, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223063, 0 + object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223168, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22312D, 0 + object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231DA, 756 + object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231F1, 756 + object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_223208, 756 + object_event 9, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, MossdeepCity_SpaceCenter_1F_EventScript_22321F, 756 + object_event 10, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 5, 0, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, 737 + object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, 753 MossdeepCity_SpaceCenter_1F_MapWarps: @ 8532E20 warp_def 7, 9, 0, 8, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc index bf143934ee..b1e7373dac 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc @@ -1,13 +1,13 @@ MossdeepCity_SpaceCenter_2F_EventObjects: @ 8532E4C - object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 6, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 8, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 5, 6, 3, 2, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223E8D, 0 - object_event 4, EVENT_OBJ_GFX_STEVEN, 0, 1, 8, 3, 8, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F7A, 863 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 2, 3, 10, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F3E, 862 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 3, 3, 7, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F50, 862 - object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 2, 3, 9, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F47, 862 - object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 3, 10, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, 862 - object_event 9, EVENT_OBJ_GFX_MAXIE, 0, 1, 9, 3, 7, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, 862 + object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223E8D, 0 + object_event 4, EVENT_OBJ_GFX_STEVEN, 0, 1, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F7A, 863 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F3E, 862 + object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F50, 862 + object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F47, 862 + object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, 862 + object_event 9, EVENT_OBJ_GFX_MAXIE, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, 862 MossdeepCity_SpaceCenter_2F_MapWarps: @ 8532F24 warp_def 13, 1, 0, 2, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F diff --git a/data/maps/MossdeepCity_StevensHouse/events.inc b/data/maps/MossdeepCity_StevensHouse/events.inc index 0ee8e7d153..521c71e722 100644 --- a/data/maps/MossdeepCity_StevensHouse/events.inc +++ b/data/maps/MossdeepCity_StevensHouse/events.inc @@ -1,7 +1,7 @@ MossdeepCity_StevensHouse_EventObjects: @ 8532C10 - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 6, 3, 10, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, 967 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, 1, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, 968 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 4, 3, 76, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, 727 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, 967 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, 968 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, 727 MossdeepCity_StevensHouse_MapWarps: @ 8532C58 warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY diff --git a/data/maps/MtChimney/events.inc b/data/maps/MtChimney/events.inc index bb7e1a9131..a8002de8f6 100644 --- a/data/maps/MtChimney/events.inc +++ b/data/maps/MtChimney/events.inc @@ -1,34 +1,34 @@ MtChimney_EventObjects: @ 85347C8 - object_event 1, EVENT_OBJ_GFX_ARCHIE, 0, 24, 19, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, 926 - object_event 2, EVENT_OBJ_GFX_MAXIE, 0, 13, 6, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, 927 - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 11, 3, 9, 0, 0, 1, 2, MtChimney_EventScript_22F06E, 927 - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 32, 5, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C0, 927 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 28, 12, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F0B7, 927 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F05C, 926 - object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 5, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F053, 926 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 12, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F065, 926 - object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EEF3, 994 - object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 39, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C9, 927 - object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 19, 3, 74, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 - object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 18, 3, 64, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 - object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 17, 3, 8, 0, 0, 0, 0, MtChimney_EventScript_22F0A5, 927 - object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 20, 3, 65, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 - object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 22, 19, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 - object_event 16, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 21, 3, 7, 0, 0, 0, 0, MtChimney_EventScript_22F0AE, 927 - object_event 17, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 19, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F09C, 927 - object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 12, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 - object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 29, 12, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 - object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 5, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 - object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 31, 5, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 - object_event 22, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 9, 16, 3, 10, 0, 0, 1, 3, MtChimney_EventScript_22F085, 927 - object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 20, 39, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 - object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 21, 39, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 - object_event 25, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 16, 18, 3, 13, 0, 0, 1, 3, MtChimney_EventScript_22F14A, 877 - object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 14, 7, 3, 70, 0, 0, 1, 6, MtChimney_EventScript_22F1AC, 877 - object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 29, 7, 3, 17, 1, 1, 1, 3, MtChimney_EventScript_22F1C3, 877 - object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 27, 17, 3, 16, 1, 1, 1, 3, MtChimney_EventScript_22F1DA, 877 - object_event 29, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 13, 16, 3, 9, 1, 1, 1, 3, MtChimney_EventScript_22F1F1, 927 - object_event 30, EVENT_OBJ_GFX_HIKER, 0, 7, 7, 3, 10, 1, 1, 1, 6, MtChimney_EventScript_22F208, 877 + object_event 1, EVENT_OBJ_GFX_ARCHIE, 0, 24, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, 926 + object_event 2, EVENT_OBJ_GFX_MAXIE, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, 927 + object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, MtChimney_EventScript_22F06E, 927 + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 32, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0C0, 927 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 28, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0B7, 927 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 19, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F05C, 926 + object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F053, 926 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F065, 926 + object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 19, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22EEF3, 994 + object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 39, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0C9, 927 + object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 19, 3, MOVEMENT_TYPE_RUN_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 + object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 18, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 + object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_22F0A5, 927 + object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 20, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 + object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 22, 19, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 + object_event 16, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 21, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MtChimney_EventScript_22F0AE, 927 + object_event 17, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F09C, 927 + object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 12, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 + object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 29, 12, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 + object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 + object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 31, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 + object_event 22, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtChimney_EventScript_22F085, 927 + object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 20, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 + object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 21, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 + object_event 25, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 16, 18, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, MtChimney_EventScript_22F14A, 877 + object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 14, 7, 3, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 1, 6, MtChimney_EventScript_22F1AC, 877 + object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 29, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MtChimney_EventScript_22F1C3, 877 + object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 27, 17, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, MtChimney_EventScript_22F1DA, 877 + object_event 29, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 13, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtChimney_EventScript_22F1F1, 927 + object_event 30, EVENT_OBJ_GFX_HIKER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, MtChimney_EventScript_22F208, 877 MtChimney_MapWarps: @ 8534A98 warp_def 17, 36, 0, 0, MAP_MT_CHIMNEY_CABLE_CAR_STATION diff --git a/data/maps/MtChimney_CableCarStation/events.inc b/data/maps/MtChimney_CableCarStation/events.inc index 19385b3d5a..491ca79977 100644 --- a/data/maps/MtChimney_CableCarStation/events.inc +++ b/data/maps/MtChimney_CableCarStation/events.inc @@ -1,6 +1,6 @@ MtChimney_CableCarStation_EventObjects: @ 8533CA8 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, 8, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_22AC4B, 0 - object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_22AC4B, 0 + object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 MtChimney_CableCarStation_MapWarps: @ 8533CD8 warp_def 6, 11, 0, 0, MAP_MT_CHIMNEY diff --git a/data/maps/MtPyre_1F/events.inc b/data/maps/MtPyre_1F/events.inc index 80bf46c2e7..179a6a5383 100644 --- a/data/maps/MtPyre_1F/events.inc +++ b/data/maps/MtPyre_1F/events.inc @@ -1,7 +1,7 @@ MtPyre_1F_EventObjects: @ 8534D64 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 21, 2, 3, 8, 1, 1, 0, 0, MtPyre_1F_EventScript_230F3F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 17, 8, 3, 7, 1, 1, 0, 0, MtPyre_1F_EventScript_230F78, 0 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 10, 3, 9, 1, 1, 0, 0, MtPyre_1F_EventScript_230F81, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 21, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_1F_EventScript_230F3F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 17, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MtPyre_1F_EventScript_230F78, 0 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MtPyre_1F_EventScript_230F81, 0 MtPyre_1F_MapWarps: @ 8534DAC warp_def 17, 18, 3, 0, MAP_ROUTE122 diff --git a/data/maps/MtPyre_2F/events.inc b/data/maps/MtPyre_2F/events.inc index d5b24c06f5..6c334ac0c9 100644 --- a/data/maps/MtPyre_2F/events.inc +++ b/data/maps/MtPyre_2F/events.inc @@ -1,12 +1,12 @@ MtPyre_2F_EventObjects: @ 8534DF0 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 6, 3, 10, 1, 1, 1, 2, MtPyre_2F_EventScript_231128, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, 1, 1, 1, 0, 0, MtPyre_2F_EventScript_2912FD, 1129 - object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 9, 3, 3, 10, 1, 1, 0, 0, MtPyre_2F_EventScript_231116, 0 - object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 12, 10, 3, 8, 1, 1, 0, 0, MtPyre_2F_EventScript_23111F, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 9, 3, 8, 1, 1, 1, 1, MtPyre_2F_EventScript_23115A, 0 - object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 3, 9, 3, 8, 1, 1, 1, 1, MtPyre_2F_EventScript_23113F, 0 - object_event 7, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 9, 3, 7, 1, 1, 1, 2, MtPyre_2F_EventScript_23118C, 0 - object_event 8, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 6, 3, 17, 1, 1, 1, 2, MtPyre_2F_EventScript_231175, 0 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MtPyre_2F_EventScript_231128, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_2F_EventScript_2912FD, 1129 + object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MtPyre_2F_EventScript_231116, 0 + object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 12, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_2F_EventScript_23111F, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MtPyre_2F_EventScript_23115A, 0 + object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 3, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MtPyre_2F_EventScript_23113F, 0 + object_event 7, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, MtPyre_2F_EventScript_23118C, 0 + object_event 8, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, MtPyre_2F_EventScript_231175, 0 MtPyre_2F_MapWarps: @ 8534EB0 warp_def 2, 1, 3, 4, MAP_MT_PYRE_1F diff --git a/data/maps/MtPyre_3F/events.inc b/data/maps/MtPyre_3F/events.inc index bf0d1af77c..ed9caf9f3d 100644 --- a/data/maps/MtPyre_3F/events.inc +++ b/data/maps/MtPyre_3F/events.inc @@ -1,8 +1,8 @@ MtPyre_3F_EventObjects: @ 8534EEC - object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, 18, 1, 1, 1, 4, MtPyre_3F_EventScript_231753, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 11, 4, 3, 17, 1, 1, 1, 4, MtPyre_3F_EventScript_23176A, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, 1, 1, 1, 0, 0, MtPyre_3F_EventScript_29130A, 1120 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, 14, 1, 1, 1, 4, MtPyre_3F_EventScript_231781, 0 + object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231753, 0 + object_event 2, EVENT_OBJ_GFX_LASS, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, MtPyre_3F_EventScript_23176A, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_3F_EventScript_29130A, 1120 + object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231781, 0 MtPyre_3F_MapWarps: @ 8534F4C warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F diff --git a/data/maps/MtPyre_4F/events.inc b/data/maps/MtPyre_4F/events.inc index e39075d8b9..73c0a59cf7 100644 --- a/data/maps/MtPyre_4F/events.inc +++ b/data/maps/MtPyre_4F/events.inc @@ -1,6 +1,6 @@ MtPyre_4F_EventObjects: @ 8534F90 - object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 7, 3, 24, 1, 1, 1, 2, MtPyre_4F_EventScript_231C6E, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, 1, 1, 1, 0, 0, MtPyre_4F_EventScript_291317, 1130 + object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 7, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, MtPyre_4F_EventScript_231C6E, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_4F_EventScript_291317, 1130 MtPyre_4F_MapWarps: @ 8534FC0 warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F diff --git a/data/maps/MtPyre_5F/events.inc b/data/maps/MtPyre_5F/events.inc index 03a9b773f4..e1fffe025c 100644 --- a/data/maps/MtPyre_5F/events.inc +++ b/data/maps/MtPyre_5F/events.inc @@ -1,6 +1,6 @@ MtPyre_5F_EventObjects: @ 8535004 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 7, 3, 17, 1, 1, 1, 2, MtPyre_5F_EventScript_231BC9, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, 1, 1, 1, 0, 0, MtPyre_5F_EventScript_291324, 1052 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, MtPyre_5F_EventScript_231BC9, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_5F_EventScript_291324, 1052 MtPyre_5F_MapWarps: @ 8535034 warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F diff --git a/data/maps/MtPyre_6F/events.inc b/data/maps/MtPyre_6F/events.inc index 1f00209b2c..607c0902ac 100644 --- a/data/maps/MtPyre_6F/events.inc +++ b/data/maps/MtPyre_6F/events.inc @@ -1,7 +1,7 @@ MtPyre_6F_EventObjects: @ 8535070 - object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, 23, 1, 1, 1, 3, MtPyre_6F_EventScript_231D3B, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, 1, 1, 1, 0, 0, MtPyre_6F_EventScript_291331, 1089 - object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 10, 3, 3, 24, 1, 1, 1, 3, MtPyre_6F_EventScript_231D9D, 0 + object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 1, 3, MtPyre_6F_EventScript_231D3B, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_6F_EventScript_291331, 1089 + object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 10, 3, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 3, MtPyre_6F_EventScript_231D9D, 0 MtPyre_6F_MapWarps: @ 85350B8 warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F diff --git a/data/maps/MtPyre_Exterior/events.inc b/data/maps/MtPyre_Exterior/events.inc index badd884f9a..ec247fd67c 100644 --- a/data/maps/MtPyre_Exterior/events.inc +++ b/data/maps/MtPyre_Exterior/events.inc @@ -1,6 +1,6 @@ MtPyre_Exterior_EventObjects: @ 85350DC - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 15, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, 1073 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 40, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, 1074 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, 1073 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 40, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, 1074 MtPyre_Exterior_MapWarps: @ 853510C warp_def 10, 42, 3, 1, MAP_MT_PYRE_1F diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc index 2df3aaafd5..35107f3f06 100644 --- a/data/maps/MtPyre_Summit/events.inc +++ b/data/maps/MtPyre_Summit/events.inc @@ -1,12 +1,12 @@ MtPyre_Summit_EventObjects: @ 85351A0 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 22, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0 - object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, 7, 0, 0, 0, 0, 0x0, 916 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 23, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 15, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, 917 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 18, 3, 9, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, 917 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 11, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, 917 - object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 25, 11, 3, 9, 1, 1, 1, 3, MtPyre_Summit_EventScript_232442, 917 - object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, 7, 1, 1, 0, 0, 0x0, 856 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0 + object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 916 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, 917 + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 18, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, 917 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, 917 + object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtPyre_Summit_EventScript_232442, 917 + object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 856 MtPyre_Summit_MapWarps: @ 8535260 warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR diff --git a/data/maps/NavelRock_Bottom/events.inc b/data/maps/NavelRock_Bottom/events.inc index fec170ae9e..49a39c162d 100644 --- a/data/maps/NavelRock_Bottom/events.inc +++ b/data/maps/NavelRock_Bottom/events.inc @@ -1,5 +1,5 @@ NavelRock_Bottom_EventObjects: @ 853DD50 - object_event 1, EVENT_OBJ_GFX_LUGIA, 0, 11, 13, 0, 8, 1, 1, 0, 0, NavelRock_Bottom_EventScript_2692A2, 800 + object_event 1, EVENT_OBJ_GFX_LUGIA, 0, 11, 13, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, NavelRock_Bottom_EventScript_2692A2, 800 NavelRock_Bottom_MapWarps: @ 853DD68 warp_def 14, 19, 0, 0, MAP_NAVEL_ROCK_DOWN11 diff --git a/data/maps/NavelRock_Harbor/events.inc b/data/maps/NavelRock_Harbor/events.inc index 2ffdc5fa1c..b5a299572a 100644 --- a/data/maps/NavelRock_Harbor/events.inc +++ b/data/maps/NavelRock_Harbor/events.inc @@ -1,6 +1,6 @@ NavelRock_Harbor_EventObjects: @ 853DA24 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, 7, 1, 1, 0, 0, NavelRock_Harbor_EventScript_2690BD, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, 10, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, NavelRock_Harbor_EventScript_2690BD, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 NavelRock_Harbor_MapWarps: @ 853DA54 warp_def 8, 2, 0, 0, MAP_NAVEL_ROCK_EXTERIOR diff --git a/data/maps/NavelRock_Top/events.inc b/data/maps/NavelRock_Top/events.inc index dc7c1e7dfd..6f7253a2b7 100644 --- a/data/maps/NavelRock_Top/events.inc +++ b/data/maps/NavelRock_Top/events.inc @@ -1,5 +1,5 @@ NavelRock_Top_EventObjects: @ 853DB74 - object_event 1, EVENT_OBJ_GFX_HOOH, 0, 12, 4, 0, 8, 1, 1, 0, 0, 0x0, 801 + object_event 1, EVENT_OBJ_GFX_HOOH, 0, 12, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 801 NavelRock_Top_MapWarps: @ 853DB8C warp_def 13, 20, 3, 1, MAP_NAVEL_ROCK_UP4 diff --git a/data/maps/NewMauville_Inside/events.inc b/data/maps/NewMauville_Inside/events.inc index 794f1965c5..805c1db6ec 100644 --- a/data/maps/NewMauville_Inside/events.inc +++ b/data/maps/NewMauville_Inside/events.inc @@ -1,12 +1,12 @@ NewMauville_Inside_EventObjects: @ 85364A8 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 25, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, 1075 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 22, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, 1076 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 4, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_291206, 1110 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 10, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_291213, 1122 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_291220, 1123 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 18, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377AF, 974 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377FC, 975 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 10, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_237849, 976 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, 1075 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, 1076 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291206, 1110 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291213, 1122 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291220, 1123 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377AF, 974 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377FC, 975 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_237849, 976 NewMauville_Inside_MapWarps: @ 8536568 warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE diff --git a/data/maps/OldaleTown/events.inc b/data/maps/OldaleTown/events.inc index b7bc6ab086..1ba9ea1241 100644 --- a/data/maps/OldaleTown/events.inc +++ b/data/maps/OldaleTown/events.inc @@ -1,8 +1,8 @@ OldaleTown_EventObjects: @ 8527854 - object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 16, 11, 3, 9, 0, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0 - object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 13, 7, 3, 8, 0, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 8, 9, 3, 10, 0, 0, 0, 0, OldaleTown_EventScript_1E901F, 0 - object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 11, 19, 3, 7, 1, 1, 0, 0, OldaleTown_EventScript_1E9070, 979 + object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 16, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0 + object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 8, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_EventScript_1E901F, 0 + object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 11, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, OldaleTown_EventScript_1E9070, 979 OldaleTown_MapWarps: @ 85278B4 warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1 diff --git a/data/maps/OldaleTown_House1/events.inc b/data/maps/OldaleTown_House1/events.inc index cf853c8aca..4933604d4e 100644 --- a/data/maps/OldaleTown_House1/events.inc +++ b/data/maps/OldaleTown_House1/events.inc @@ -1,5 +1,5 @@ OldaleTown_House1_EventObjects: @ 852D7B4 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, 2, 1, 1, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0 OldaleTown_House1_MapWarps: @ 852D7CC warp_def 3, 8, 0, 0, MAP_OLDALE_TOWN diff --git a/data/maps/OldaleTown_House2/events.inc b/data/maps/OldaleTown_House2/events.inc index 2feeb89499..a57b07c26c 100644 --- a/data/maps/OldaleTown_House2/events.inc +++ b/data/maps/OldaleTown_House2/events.inc @@ -1,6 +1,6 @@ OldaleTown_House2_EventObjects: @ 852D7F0 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, 10, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF5B, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 4, 3, 9, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF64, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF5B, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF64, 0 OldaleTown_House2_MapWarps: @ 852D820 warp_def 3, 7, 0, 1, MAP_OLDALE_TOWN diff --git a/data/maps/OldaleTown_Mart/events.inc b/data/maps/OldaleTown_Mart/events.inc index f850fa4826..73adf37184 100644 --- a/data/maps/OldaleTown_Mart/events.inc +++ b/data/maps/OldaleTown_Mart/events.inc @@ -1,7 +1,7 @@ OldaleTown_Mart_EventObjects: @ 852D95C - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC240, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC28A, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 4, 3, 3, 0, 1, 0, 0, OldaleTown_Mart_EventScript_1FC2A9, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC240, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC28A, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, OldaleTown_Mart_EventScript_1FC2A9, 0 OldaleTown_Mart_MapWarps: @ 852D9A4 warp_def 3, 7, 0, 3, MAP_OLDALE_TOWN diff --git a/data/maps/OldaleTown_PokemonCenter_1F/events.inc b/data/maps/OldaleTown_PokemonCenter_1F/events.inc index bb102baab8..ba50faea90 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/events.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ OldaleTown_PokemonCenter_1F_EventObjects: @ 852D844 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC01A, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 4, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC028, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 10, 6, 3, 10, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC031, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 3, 7, 3, 10, 1, 1, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC03A, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC01A, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC028, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC031, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC03A, 0 OldaleTown_PokemonCenter_1F_MapWarps: @ 852D8A4 warp_def 7, 8, 3, 2, MAP_OLDALE_TOWN diff --git a/data/maps/OldaleTown_PokemonCenter_2F/events.inc b/data/maps/OldaleTown_PokemonCenter_2F/events.inc index b25b155eaa..fe8490c9c7 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/events.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ OldaleTown_PokemonCenter_2F_EventObjects: @ 852D8D0 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 3, 8, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_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, OldaleTown_PokemonCenter_2F_EventScript_276B03, 702 OldaleTown_PokemonCenter_2F_MapWarps: @ 852D930 warp_def 1, 6, 4, 2, MAP_OLDALE_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/PacifidlogTown/events.inc b/data/maps/PacifidlogTown/events.inc index 41d54e9fc2..8e1134f86e 100644 --- a/data/maps/PacifidlogTown/events.inc +++ b/data/maps/PacifidlogTown/events.inc @@ -1,7 +1,7 @@ PacifidlogTown_EventObjects: @ 8527DE8 - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 10, 23, 3, 9, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBACC, 0 - object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 11, 14, 3, 10, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAD5, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 9, 16, 3, 8, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 10, 23, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBACC, 0 + object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 11, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAD5, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0 PacifidlogTown_MapWarps: @ 8527E30 warp_def 8, 15, 0, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/PacifidlogTown_House1/events.inc b/data/maps/PacifidlogTown_House1/events.inc index 77ca4c832c..4bc239ea64 100644 --- a/data/maps/PacifidlogTown_House1/events.inc +++ b/data/maps/PacifidlogTown_House1/events.inc @@ -1,6 +1,6 @@ PacifidlogTown_House1_EventObjects: @ 852EBA0 - object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 3, 5, 3, 8, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, 9, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0 + object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0 PacifidlogTown_House1_MapWarps: @ 852EBD0 warp_def 4, 8, 0, 1, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/PacifidlogTown_House2/events.inc b/data/maps/PacifidlogTown_House2/events.inc index 4505330147..fae916c735 100644 --- a/data/maps/PacifidlogTown_House2/events.inc +++ b/data/maps/PacifidlogTown_House2/events.inc @@ -1,7 +1,7 @@ PacifidlogTown_House2_EventObjects: @ 852EBF4 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 5, 3, 8, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_203792, 0 - object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 8, 6, 3, 1, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_203891, 0 - object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 1, 7, 3, 1, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_2038AC, 0 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_203792, 0 + object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_203891, 0 + object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 1, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_2038AC, 0 PacifidlogTown_House2_MapWarps: @ 852EC3C warp_def 4, 8, 0, 2, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/PacifidlogTown_House3/events.inc b/data/maps/PacifidlogTown_House3/events.inc index 635ba86a79..bdf1aae10c 100644 --- a/data/maps/PacifidlogTown_House3/events.inc +++ b/data/maps/PacifidlogTown_House3/events.inc @@ -1,6 +1,6 @@ PacifidlogTown_House3_EventObjects: @ 852EC60 - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 3, 5, 3, 18, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_203CB5, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 4, 2, 3, 10, 1, 1, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_203CB5, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0 PacifidlogTown_House3_MapWarps: @ 852EC90 warp_def 4, 8, 0, 3, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/PacifidlogTown_House4/events.inc b/data/maps/PacifidlogTown_House4/events.inc index e5f8dd4f1f..bcd3dc6e95 100644 --- a/data/maps/PacifidlogTown_House4/events.inc +++ b/data/maps/PacifidlogTown_House4/events.inc @@ -1,7 +1,7 @@ PacifidlogTown_House4_EventObjects: @ 852ECB4 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 8, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_203F55, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 7, 5, 3, 2, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F4C, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 4, 3, 2, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F5E, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_203F55, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F4C, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F5E, 0 PacifidlogTown_House4_MapWarps: @ 852ECFC warp_def 4, 8, 0, 4, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/PacifidlogTown_House5/events.inc b/data/maps/PacifidlogTown_House5/events.inc index febb80ad63..f039b7694c 100644 --- a/data/maps/PacifidlogTown_House5/events.inc +++ b/data/maps/PacifidlogTown_House5/events.inc @@ -1,6 +1,6 @@ PacifidlogTown_House5_EventObjects: @ 852ED20 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204111, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204137, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204111, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204137, 0 PacifidlogTown_House5_MapWarps: @ 852ED50 warp_def 4, 8, 0, 5, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc index 66b8caa676..8040086f80 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc @@ -1,9 +1,9 @@ PacifidlogTown_PokemonCenter_1F_EventObjects: @ 852EA70 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034B6, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 6, 3, 9, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034D6, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034C4, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 4, 5, 3, 1, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034CD, 0 - object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 12, 8, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034B6, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034D6, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034C4, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034CD, 0 + object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 12, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0 PacifidlogTown_PokemonCenter_1F_MapWarps: @ 852EAE8 warp_def 7, 8, 3, 0, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc index 1aa2799809..1b961ee74a 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ PacifidlogTown_PokemonCenter_2F_EventObjects: @ 852EB14 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_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, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, 702 PacifidlogTown_PokemonCenter_2F_MapWarps: @ 852EB74 warp_def 1, 6, 4, 2, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/PetalburgCity/events.inc b/data/maps/PetalburgCity/events.inc index 29fe0e02e5..f33ff09183 100644 --- a/data/maps/PetalburgCity/events.inc +++ b/data/maps/PetalburgCity/events.inc @@ -1,13 +1,13 @@ PetalburgCity_EventObjects: @ 8525FD0 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 18, 3, 2, 1, 1, 0, 0, PetalburgCity_EventScript_1DC3FD, 728 - object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 726 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, 8, 0, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0 - object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 20, 10, 3, 3, 0, 1, 0, 0, PetalburgCity_EventScript_1DC488, 0 - object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 830 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 2, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910B4, 1039 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 28, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910C1, 1040 - object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 12, 15, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0 - object_event 9, EVENT_OBJ_GFX_SCOTT, 0, 13, 12, 3, 1, 1, 1, 0, 0, 0x0, 995 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_EventScript_1DC3FD, 728 + object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 726 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0 + object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 20, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, PetalburgCity_EventScript_1DC488, 0 + object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 830 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_2910B4, 1039 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_2910C1, 1040 + object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 12, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0 + object_event 9, EVENT_OBJ_GFX_SCOTT, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 995 PetalburgCity_MapWarps: @ 85260A8 warp_def 10, 19, 0, 0, MAP_PETALBURG_CITY_HOUSE1 diff --git a/data/maps/PetalburgCity_Gym/events.inc b/data/maps/PetalburgCity_Gym/events.inc index 2df386d2ce..e3cfe95cc6 100644 --- a/data/maps/PetalburgCity_Gym/events.inc +++ b/data/maps/PetalburgCity_Gym/events.inc @@ -1,15 +1,15 @@ PetalburgCity_Gym_EventObjects: @ 852EDC8 - object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 2, 0, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, 772 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 94, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 4, 81, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 4, 42, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053F6, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 55, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054E6, 0 - object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 4, 68, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205432, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 16, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205522, 0 - object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 4, 29, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_20546E, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 3, 109, 3, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_20574F, 781 - object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, 7, 0, 0, 0, 0, 0x0, 866 - object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 1, 7, 3, 7, 1, 1, 0, 0, 0x0, 824 + object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, 772 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 94, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 4, 81, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 4, 42, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053F6, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 55, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054E6, 0 + object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 4, 68, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205432, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205522, 0 + object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 4, 29, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_20546E, 0 + object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 3, 109, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_20574F, 781 + object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 866 + object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 824 PetalburgCity_Gym_MapWarps: @ 852EED0 warp_def 4, 111, 3, 2, MAP_PETALBURG_CITY diff --git a/data/maps/PetalburgCity_House1/events.inc b/data/maps/PetalburgCity_House1/events.inc index dcd3b071f6..4688eefe63 100644 --- a/data/maps/PetalburgCity_House1/events.inc +++ b/data/maps/PetalburgCity_House1/events.inc @@ -1,6 +1,6 @@ PetalburgCity_House1_EventObjects: @ 852F0BC - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 7, 4, 3, 2, 2, 2, 0, 0, PetalburgCity_House1_EventScript_2077A3, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, PetalburgCity_House1_EventScript_2077A3, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0 PetalburgCity_House1_MapWarps: @ 852F0EC warp_def 3, 8, 0, 0, MAP_PETALBURG_CITY diff --git a/data/maps/PetalburgCity_House2/events.inc b/data/maps/PetalburgCity_House2/events.inc index 7d1a863cb4..17f9001e28 100644 --- a/data/maps/PetalburgCity_House2/events.inc +++ b/data/maps/PetalburgCity_House2/events.inc @@ -1,6 +1,6 @@ PetalburgCity_House2_EventObjects: @ 852F110 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 5, 3, 2, 1, 1, 0, 0, PetalburgCity_House2_EventScript_2078F3, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 5, 3, 8, 0, 0, 0, 0, PetalburgCity_House2_EventScript_2078FC, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_House2_EventScript_2078F3, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_House2_EventScript_2078FC, 0 PetalburgCity_House2_MapWarps: @ 852F140 warp_def 3, 7, 0, 4, MAP_PETALBURG_CITY diff --git a/data/maps/PetalburgCity_Mart/events.inc b/data/maps/PetalburgCity_Mart/events.inc index 3dc327c6ad..88d99918d1 100644 --- a/data/maps/PetalburgCity_Mart/events.inc +++ b/data/maps/PetalburgCity_Mart/events.inc @@ -1,8 +1,8 @@ PetalburgCity_Mart_EventObjects: @ 852F294 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207D69, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 9, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DE8, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 6, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DDF, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207D69, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DE8, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DDF, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0 PetalburgCity_Mart_MapWarps: @ 852F2F4 warp_def 3, 7, 0, 5, MAP_PETALBURG_CITY diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc index e7a4ec6e68..509ed0094f 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc @@ -1,9 +1,9 @@ PetalburgCity_PokemonCenter_1F_EventObjects: @ 852F164 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_2079FC, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 11, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_291539, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A0A, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 9, 6, 3, 2, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A13, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 4, 3, 1, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_2079FC, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_291539, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A0A, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 9, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A13, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0 PetalburgCity_PokemonCenter_1F_MapWarps: @ 852F1DC warp_def 7, 8, 3, 3, MAP_PETALBURG_CITY diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc index 7d2ff52f47..d83875c108 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ PetalburgCity_PokemonCenter_2F_EventObjects: @ 852F208 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_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, PetalburgCity_PokemonCenter_2F_EventScript_276B03, 702 PetalburgCity_PokemonCenter_2F_MapWarps: @ 852F268 warp_def 1, 6, 4, 2, MAP_PETALBURG_CITY_POKEMON_CENTER_1F diff --git a/data/maps/PetalburgCity_WallysHouse/events.inc b/data/maps/PetalburgCity_WallysHouse/events.inc index 563d61579c..cc43ca814f 100644 --- a/data/maps/PetalburgCity_WallysHouse/events.inc +++ b/data/maps/PetalburgCity_WallysHouse/events.inc @@ -1,6 +1,6 @@ PetalburgCity_WallysHouse_EventObjects: @ 852ED74 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 3, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 5, 3, 9, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0 PetalburgCity_WallysHouse_MapWarps: @ 852EDA4 warp_def 3, 7, 0, 1, MAP_PETALBURG_CITY diff --git a/data/maps/PetalburgWoods/events.inc b/data/maps/PetalburgWoods/events.inc index da904f8ef0..aaab1e7513 100644 --- a/data/maps/PetalburgWoods/events.inc +++ b/data/maps/PetalburgWoods/events.inc @@ -1,17 +1,17 @@ PetalburgWoods_EventObjects: @ 85345E4 - object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 10, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 17 - object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 11, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 18 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 17, 3, 10, 0, 0, 0, 0, 0x0, 725 - object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 26, 20, 3, 1, 0, 0, 0, 0, 0x0, 724 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 45, 7, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_29110F, 1056 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 35, 20, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_291102, 1055 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 8, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_29111C, 1058 - object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 15, 19, 3, 3, 1, 2, 0, 0, PetalburgWoods_EventScript_22E210, 0 - object_event 9, EVENT_OBJ_GFX_BUG_CATCHER, 0, 7, 32, 3, 22, 0, 0, 1, 3, PetalburgWoods_EventScript_22E26D, 0 - object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 4, 14, 3, 20, 0, 0, 1, 3, PetalburgWoods_EventScript_22E284, 0 - object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 30, 34, 3, 2, 2, 1, 0, 0, PetalburgWoods_EventScript_22E219, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 26, 3, 1, 1, 1, 0, 0, PetalburgWoods_EventScript_291129, 1117 - object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 33, 5, 3, 1, 1, 1, 0, 0, PetalburgWoods_EventScript_22E222, 0 + object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 17 + object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 18 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 725 + object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 26, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 724 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 45, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgWoods_EventScript_29110F, 1056 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 35, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgWoods_EventScript_291102, 1055 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_29111C, 1058 + object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 15, 19, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 2, 0, 0, PetalburgWoods_EventScript_22E210, 0 + object_event 9, EVENT_OBJ_GFX_BUG_CATCHER, 0, 7, 32, 3, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 0, 1, 3, PetalburgWoods_EventScript_22E26D, 0 + object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 0, 0, 1, 3, PetalburgWoods_EventScript_22E284, 0 + object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 30, 34, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, PetalburgWoods_EventScript_22E219, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgWoods_EventScript_291129, 1117 + object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 33, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgWoods_EventScript_22E222, 0 PetalburgWoods_MapWarps: @ 853471C warp_def 14, 5, 0, 2, MAP_ROUTE104 diff --git a/data/maps/RecordCorner/events.inc b/data/maps/RecordCorner/events.inc index 7970c14bad..b5e297f72a 100644 --- a/data/maps/RecordCorner/events.inc +++ b/data/maps/RecordCorner/events.inc @@ -1,5 +1,5 @@ RecordCorner_EventObjects: @ 8539DFC - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 10, 5, 3, 8, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0 RecordCorner_MapWarps: @ 8539E14 warp_def 8, 9, 3, 127, MAP_NONE diff --git a/data/maps/Route101/events.inc b/data/maps/Route101/events.inc index 82b674f9e0..969166de9c 100644 --- a/data/maps/Route101/events.inc +++ b/data/maps/Route101/events.inc @@ -1,10 +1,10 @@ Route101_EventObjects: @ 8527E98 - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 8, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0 - object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, 71, 0, 0, 0, 0, 0x0, 720 - object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBE16, 700 - object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_1, 0, 10, 13, 0, 70, 0, 0, 0, 0, 0x0, 750 - object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, 1, 0, 0, 0, 0, Route101_EventScript_272141, 897 - object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, 5, 1, 1, 0, 0, Route101_EventScript_1EBE04, 991 + object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0 + object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT, 0, 0, 0, 0, 0x0, 720 + object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBE16, 700 + object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_1, 0, 10, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 0, 0, 0x0, 750 + object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_272141, 897 + object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, Route101_EventScript_1EBE04, 991 Route101_MapCoordEvents: @ 8527F28 coord_event 10, 19, 3, 0, VAR_0x4060, 1, 0, Route101_EventScript_1EBCDE diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc index fc30a195c3..a51e09b590 100644 --- a/data/maps/Route102/events.inc +++ b/data/maps/Route102/events.inc @@ -1,13 +1,13 @@ Route102_EventObjects: @ 8527FD8 - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 18, 11, 3, 1, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 14, 3, 8, 0, 0, 1, 3, Route102_EventScript_1EC105, 0 - object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, 7, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, 18, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0 - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 37, 4, 3, 2, 1, 1, 0, 0, Route102_EventScript_1EC0FC, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, 8, 0, 0, 0, 0, Route102_EventScript_290CD8, 1000 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 2, 3, 12, 0, 0, 0, 2, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, 12, 0, 0, 0, 1, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, 8, 1, 1, 1, 3, Route102_EventScript_1EC1E1, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 18, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route102_EventScript_1EC105, 0 + object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0 + object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 37, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route102_EventScript_1EC0FC, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route102_EventScript_290CD8, 1000 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 2, BerryTreeScript, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 1, BerryTreeScript, 0 + object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route102_EventScript_1EC1E1, 0 Route102_MapBGEvents: @ 85280B0 bg_event 17, 2, 0, 0, 0, Route102_EventScript_1EC0F3 diff --git a/data/maps/Route103/events.inc b/data/maps/Route103/events.inc index e4bf741779..ab858ae137 100644 --- a/data/maps/Route103/events.inc +++ b/data/maps/Route103/events.inc @@ -1,24 +1,24 @@ Route103_EventObjects: @ 85280DC - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 49, 12, 3, 9, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 10, 3, 3, 10, 0, 0, 0, 0, Route103_EventScript_1EC3C1, 723 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 71, 11, 3, 18, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 50, 8, 3, 26, 0, 1, 1, 3, Route103_EventScript_1EC6D1, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 58, 5, 3, 12, 0, 0, 0, 5, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 5, 3, 12, 0, 0, 0, 6, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 5, 3, 12, 0, 0, 0, 7, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 20, 10, 3, 2, 1, 2, 0, 0, Route103_EventScript_1EC5D9, 0 - object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, 2, 1, 1, 0, 0, Route103_EventScript_272141, 898 - object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 56, 13, 3, 10, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0 - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 5, 3, 1, 1, 1, 0, 0, Route103_EventScript_290CE5, 1114 - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, 1, 1, 1, 0, 0, Route103_EventScript_2906BB, 18 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 72, 8, 3, 1, 1, 1, 0, 0, Route103_EventScript_2906BB, 19 - object_event 16, EVENT_OBJ_GFX_BLACK_BELT, 0, 67, 5, 3, 8, 1, 1, 1, 2, Route103_EventScript_1EC761, 0 - object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 67, 9, 3, 7, 1, 1, 1, 2, Route103_EventScript_1EC74A, 0 - object_event 18, EVENT_OBJ_GFX_SWIMMER_F, 0, 36, 6, 1, 26, 1, 3, 1, 5, Route103_EventScript_1EC78F, 0 - object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 13, 1, 25, 1, 3, 1, 5, Route103_EventScript_1EC778, 0 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 7, 0, 1, 1, 1, 0, 0, Route103_EventScript_290CF2, 1137 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 49, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route103_EventScript_1EC3C1, 723 + object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 71, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0 + object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 50, 8, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 1, 1, 3, Route103_EventScript_1EC6D1, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 58, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 5, BerryTreeScript, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 6, BerryTreeScript, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 7, BerryTreeScript, 0 + object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 20, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, Route103_EventScript_1EC5D9, 0 + object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route103_EventScript_272141, 898 + object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 56, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0 + object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CE5, 1114 + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, 18 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 72, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, 19 + object_event 16, EVENT_OBJ_GFX_BLACK_BELT, 0, 67, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, Route103_EventScript_1EC761, 0 + object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 67, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route103_EventScript_1EC74A, 0 + object_event 18, EVENT_OBJ_GFX_SWIMMER_F, 0, 36, 6, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 5, Route103_EventScript_1EC78F, 0 + object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 13, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 5, Route103_EventScript_1EC778, 0 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CF2, 1137 Route103_MapWarps: @ 85282BC warp_def 45, 6, 0, 0, MAP_ALTERING_CAVE diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc index 315b5614e7..52a60261ad 100644 --- a/data/maps/Route104/events.inc +++ b/data/maps/Route104/events.inc @@ -1,38 +1,38 @@ Route104_EventObjects: @ 85282E4 - object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 15, 60, 3, 9, 0, 0, 0, 0, Route104_EventScript_1ED00F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 25, 49, 3, 2, 1, 1, 0, 0, Route104_EventScript_1ED006, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 31, 24, 3, 9, 0, 0, 1, 7, Route104_EventScript_1ED38D, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 27, 63, 3, 3, 0, 1, 0, 0, Route104_EventScript_1ED045, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 30, 50, 3, 2, 1, 1, 0, 0, Route104_EventScript_1ED04E, 0 - object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 28, 74, 3, 7, 0, 0, 0, 0, Route104_EventScript_1ED090, 0 - object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 54, 1, 7, 0, 0, 0, 0, 0x0, 742 - object_event 8, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 51, 4, 10, 0, 0, 0, 0, 0x0, 738 - object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 29, 8, 3, 8, 0, 0, 1, 0, Route104_EventScript_1ED35F, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 6, 3, 12, 0, 0, 0, 8, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 6, 3, 12, 0, 0, 0, 9, BerryTreeScript, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 6, 3, 12, 0, 0, 0, 10, BerryTreeScript, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 41, 3, 12, 0, 0, 0, 11, BerryTreeScript, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 41, 3, 12, 0, 0, 0, 12, BerryTreeScript, 0 - object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 41, 3, 12, 0, 0, 0, 13, BerryTreeScript, 0 - object_event 16, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 37, 8, 3, 9, 1, 1, 0, 0, Route104_EventScript_1ECF8C, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 22, 3, 12, 0, 0, 0, 3, BerryTreeScript, 0 - object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 23, 3, 12, 0, 0, 0, 4, BerryTreeScript, 0 - object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 24, 3, 12, 0, 0, 0, 75, BerryTreeScript, 0 - object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 25, 3, 12, 0, 0, 0, 76, BerryTreeScript, 0 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 15, 3, 1, 0, 0, 0, 0, Route104_EventScript_290CFF, 1002 - object_event 22, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 19, 3, 5, 1, 0, 0, 0, Route104_EventScript_1ECFCD, 906 - object_event 23, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED597, 0 - object_event 24, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED5B6, 0 - object_event 25, EVENT_OBJ_GFX_BOY_4, 0, 21, 25, 3, 23, 0, 0, 1, 3, Route104_EventScript_1ED43B, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 44, 3, 16, 0, 0, 1, 3, Route104_EventScript_1ED4E9, 0 - object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, 1, 1, 1, 0, 0, Route104_EventScript_290D0C, 1057 - object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 18, 67, 3, 46, 5, 6, 1, 2, Route104_EventScript_1ED376, 0 - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 22, 3, 1, 1, 1, 0, 0, Route104_EventScript_290D19, 1115 - object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 22, 3, 1, 1, 1, 0, 0, Route104_EventScript_2906BB, 17 - object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 8, 3, 1, 1, 1, 0, 0, Route104_EventScript_290D26, 1135 - object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 5, 26, 3, 1, 1, 1, 0, 0, Route104_EventScript_1ED057, 0 - object_event 33, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 59, 3, 9, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0 - object_event 34, EVENT_OBJ_GFX_HIPSTER, 0, 17, 50, 0, 1, 1, 1, 0, 0, Route104_EventScript_1ECC9E, 719 + object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 15, 60, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route104_EventScript_1ED00F, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 25, 49, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED006, 0 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 31, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route104_EventScript_1ED38D, 0 + object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 27, 63, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route104_EventScript_1ED045, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 30, 50, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED04E, 0 + object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 28, 74, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route104_EventScript_1ED090, 0 + object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 54, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 742 + object_event 8, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 51, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 738 + object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 29, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route104_EventScript_1ED35F, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 8, BerryTreeScript, 0 + object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 9, BerryTreeScript, 0 + object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 10, BerryTreeScript, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 11, BerryTreeScript, 0 + object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 12, BerryTreeScript, 0 + object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 13, BerryTreeScript, 0 + object_event 16, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 37, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, Route104_EventScript_1ECF8C, 0 + object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 22, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 3, BerryTreeScript, 0 + object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 4, BerryTreeScript, 0 + object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 75, BerryTreeScript, 0 + object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 25, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 76, BerryTreeScript, 0 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route104_EventScript_290CFF, 1002 + object_event 22, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 19, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_EventScript_1ECFCD, 906 + object_event 23, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route104_EventScript_1ED597, 0 + object_event 24, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route104_EventScript_1ED5B6, 0 + object_event 25, EVENT_OBJ_GFX_BOY_4, 0, 21, 25, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route104_EventScript_1ED43B, 0 + object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 44, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route104_EventScript_1ED4E9, 0 + object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D0C, 1057 + object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 18, 67, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 5, 6, 1, 2, Route104_EventScript_1ED376, 0 + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D19, 1115 + object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_2906BB, 17 + object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D26, 1135 + object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 5, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED057, 0 + object_event 33, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 59, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0 + object_event 34, EVENT_OBJ_GFX_HIPSTER, 0, 17, 50, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ECC9E, 719 Route104_MapWarps: @ 8528614 warp_def 17, 50, 0, 0, MAP_ROUTE104_MR_BRINEYS_HOUSE diff --git a/data/maps/Route104_MrBrineysHouse/events.inc b/data/maps/Route104_MrBrineysHouse/events.inc index 9eccc22869..6410f02fca 100644 --- a/data/maps/Route104_MrBrineysHouse/events.inc +++ b/data/maps/Route104_MrBrineysHouse/events.inc @@ -1,6 +1,6 @@ Route104_MrBrineysHouse_EventObjects: @ 8533AD4 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 3, 3, 50, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, 739 - object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, 8, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, 881 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 3, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, 739 + object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, 881 Route104_MrBrineysHouse_MapWarps: @ 8533B04 warp_def 5, 8, 0, 0, MAP_ROUTE104 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrettyPetalFlowerShop/events.inc index 025daad048..3d622f106c 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/events.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/events.inc @@ -1,7 +1,7 @@ Route104_PrettyPetalFlowerShop_EventObjects: @ 8533B28 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 3, 10, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A373, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 3, 3, 5, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A40C, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 11, 6, 4, 2, 2, 2, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A442, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A373, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A40C, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 11, 6, 4, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A442, 0 Route104_PrettyPetalFlowerShop_MapWarps: @ 8533B70 warp_def 2, 8, 0, 1, MAP_ROUTE104 diff --git a/data/maps/Route105/events.inc b/data/maps/Route105/events.inc index bbe9cf73be..cf7addcc8c 100644 --- a/data/maps/Route105/events.inc +++ b/data/maps/Route105/events.inc @@ -1,12 +1,12 @@ Route105_EventObjects: @ 85286F0 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 19, 60, 1, 10, 0, 0, 1, 6, Route105_EventScript_1EE261, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 36, 1, 27, 7, 0, 1, 3, Route105_EventScript_1EE278, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 45, 1, 25, 0, 7, 1, 3, Route105_EventScript_1EE28F, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 19, 9, 1, 24, 0, 5, 1, 3, Route105_EventScript_1EE2A6, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, 1, 0, 0, 0, 0, Route105_EventScript_290D33, 1003 - object_event 6, EVENT_OBJ_GFX_HIKER, 0, 17, 48, 3, 26, 0, 7, 1, 3, Route105_EventScript_1EE24A, 0 - object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 4, 54, 3, 8, 0, 2, 1, 2, Route105_EventScript_1EE2BD, 0 - object_event 8, EVENT_OBJ_GFX_HIKER, 0, 4, 58, 3, 7, 0, 2, 1, 4, Route105_EventScript_1EE2D4, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 19, 60, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route105_EventScript_1EE261, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 36, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 7, 0, 1, 3, Route105_EventScript_1EE278, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 45, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 7, 1, 3, Route105_EventScript_1EE28F, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 19, 9, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 5, 1, 3, Route105_EventScript_1EE2A6, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route105_EventScript_290D33, 1003 + object_event 6, EVENT_OBJ_GFX_HIKER, 0, 17, 48, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 7, 1, 3, Route105_EventScript_1EE24A, 0 + object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 4, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 2, 1, 2, Route105_EventScript_1EE2BD, 0 + object_event 8, EVENT_OBJ_GFX_HIKER, 0, 4, 58, 3, MOVEMENT_TYPE_FACE_UP, 0, 2, 1, 4, Route105_EventScript_1EE2D4, 0 Route105_MapWarps: @ 85287B0 warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE diff --git a/data/maps/Route106/events.inc b/data/maps/Route106/events.inc index 8fdbaad5fd..22807fcec5 100644 --- a/data/maps/Route106/events.inc +++ b/data/maps/Route106/events.inc @@ -1,9 +1,9 @@ Route106_EventObjects: @ 85287E4 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 5, 1, 27, 4, 0, 1, 3, Route106_EventScript_1EE493, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 29, 10, 1, 1, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0 - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, 10, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0 - object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, 1, 0, 0, 1, 3, Route106_EventScript_1EE523, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, 1, 0, 0, 0, 0, Route106_EventScript_290D40, 1004 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 5, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 4, 0, 1, 3, Route106_EventScript_1EE493, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 29, 10, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0 + object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0 + object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE523, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route106_EventScript_290D40, 1004 Route106_MapWarps: @ 852885C warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F diff --git a/data/maps/Route107/events.inc b/data/maps/Route107/events.inc index f748e2ff90..b67e98384c 100644 --- a/data/maps/Route107/events.inc +++ b/data/maps/Route107/events.inc @@ -1,11 +1,11 @@ Route107_EventObjects: @ 85288A8 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 10, 1, 24, 1, 1, 1, 3, Route107_EventScript_1EE595, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 23, 11, 1, 52, 6, 2, 1, 2, Route107_EventScript_1EE5AC, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 16, 7, 1, 13, 0, 0, 1, 5, Route107_EventScript_1EE60E, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 50, 11, 1, 65, 1, 1, 1, 5, Route107_EventScript_1EE625, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 4, 1, 8, 1, 1, 1, 1, Route107_EventScript_1EE63C, 0 - object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 4, 1, 8, 1, 1, 1, 1, Route107_EventScript_1EE657, 0 - object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 50, 5, 1, 64, 1, 1, 1, 5, Route107_EventScript_1EE672, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 10, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 3, Route107_EventScript_1EE595, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 23, 11, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 6, 2, 1, 2, Route107_EventScript_1EE5AC, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 16, 7, 1, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 5, Route107_EventScript_1EE60E, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 50, 11, 1, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 1, 1, 1, 5, Route107_EventScript_1EE625, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 4, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route107_EventScript_1EE63C, 0 + object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 4, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route107_EventScript_1EE657, 0 + object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 50, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 1, 1, 1, 5, Route107_EventScript_1EE672, 0 Route107_MapEvents:: @ 8528950 map_events Route107_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route108/events.inc b/data/maps/Route108/events.inc index 0a0b448c48..a83027178d 100644 --- a/data/maps/Route108/events.inc +++ b/data/maps/Route108/events.inc @@ -1,11 +1,11 @@ Route108_EventObjects: @ 8528964 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 13, 1, 45, 3, 3, 1, 3, Route108_EventScript_1EE68A, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 12, 1, 13, 1, 1, 1, 3, Route108_EventScript_1EE6B8, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 13, 1, 24, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 7, 1, 20, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 41, 5, 3, 10, 1, 1, 1, 1, Route108_EventScript_1EE6E6, 0 - object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 43, 5, 3, 9, 1, 1, 1, 1, Route108_EventScript_1EE6FD, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 4, 3, 1, 1, 1, 0, 0, Route108_EventScript_290D4D, 1139 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 13, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 3, 3, 1, 3, Route108_EventScript_1EE68A, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 12, 1, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 1, 1, 1, 3, Route108_EventScript_1EE6B8, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 13, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 41, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, Route108_EventScript_1EE6E6, 0 + object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 43, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, Route108_EventScript_1EE6FD, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route108_EventScript_290D4D, 1139 Route108_MapWarps: @ 8528A0C warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK diff --git a/data/maps/Route109/events.inc b/data/maps/Route109/events.inc index 1d847897d1..66527a7ae4 100644 --- a/data/maps/Route109/events.inc +++ b/data/maps/Route109/events.inc @@ -1,28 +1,28 @@ Route109_EventObjects: @ 8528A34 - object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, 7, 0, 0, 0, 0, 0x0, 744 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 21, 24, 3, 7, 0, 0, 0, 0, Route109_EventScript_1EE910, 741 - object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 12, 36, 3, 10, 0, 0, 1, 5, Route109_EventScript_1EEA3D, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 25, 39, 1, 15, 0, 0, 1, 5, Route109_EventScript_1EEA54, 0 - object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 15, 17, 4, 8, 0, 0, 1, 1, Route109_EventScript_1EEA6B, 0 - object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 24, 13, 3, 9, 0, 0, 1, 6, Route109_EventScript_1EEA82, 0 - object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 19, 10, 3, 8, 0, 0, 1, 3, Route109_EventScript_1EEA99, 0 - object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 22, 7, 3, 80, 0, 0, 1, 4, Route109_EventScript_1EEAFB, 0 - object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 11, 6, 3, 8, 0, 0, 0, 0, Route109_EventScript_1EE995, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 46, 3, 1, 0, 0, 0, 0, Route109_EventScript_290D5A, 1005 - object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 29, 32, 3, 13, 0, 0, 1, 3, Route109_EventScript_1EEB74, 0 - object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 28, 31, 3, 17, 0, 0, 1, 3, Route109_EventScript_1EEB5D, 0 - object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 21, 56, 0, 9, 0, 0, 1, 3, Route109_EventScript_1EEB8B, 0 - object_event 14, EVENT_OBJ_GFX_TUBER_M, 0, 24, 18, 3, 10, 1, 1, 0, 0, Route109_EventScript_1EE99E, 0 - object_event 15, EVENT_OBJ_GFX_TUBER_F, 0, 25, 18, 3, 9, 1, 1, 0, 0, Route109_EventScript_1EE9B5, 0 - object_event 16, EVENT_OBJ_GFX_WOMAN_2, 0, 30, 32, 3, 8, 1, 1, 0, 0, Route109_EventScript_1EEA06, 0 - object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 41, 3, 8, 1, 1, 1, 1, Route109_EventScript_1EEBBD, 0 - object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 9, 41, 3, 8, 1, 1, 1, 1, Route109_EventScript_1EEBA2, 0 - object_event 19, EVENT_OBJ_GFX_OLD_MAN_2, 0, 33, 6, 3, 1, 1, 1, 0, 0, Route109_EventScript_1EEA0F, 0 - object_event 20, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 32, 6, 3, 1, 1, 1, 0, 0, Route109_EventScript_1EEA18, 0 - object_event 21, EVENT_OBJ_GFX_TUBER_F, 0, 17, 13, 3, 80, 1, 1, 1, 6, Route109_EventScript_1EEBEF, 0 - object_event 22, EVENT_OBJ_GFX_TUBER_M, 0, 27, 7, 3, 79, 1, 1, 1, 4, Route109_EventScript_1EEBD8, 0 - object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 6, 3, 1, 1, 1, 0, 0, Route109_EventScript_290D67, 1140 - object_event 24, EVENT_OBJ_GFX_MAN_6, 0, 17, 56, 3, 80, 1, 1, 1, 3, Route109_EventScript_1EEC06, 0 + object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 744 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 21, 24, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route109_EventScript_1EE910, 741 + object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 12, 36, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route109_EventScript_1EEA3D, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 25, 39, 1, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 5, Route109_EventScript_1EEA54, 0 + object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 15, 17, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route109_EventScript_1EEA6B, 0 + object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 24, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 6, Route109_EventScript_1EEA82, 0 + object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 19, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route109_EventScript_1EEA99, 0 + object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 22, 7, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 0, 0, 1, 4, Route109_EventScript_1EEAFB, 0 + object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route109_EventScript_1EE995, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 46, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route109_EventScript_290D5A, 1005 + object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 29, 32, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, Route109_EventScript_1EEB74, 0 + object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 28, 31, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route109_EventScript_1EEB5D, 0 + object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 21, 56, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route109_EventScript_1EEB8B, 0 + object_event 14, EVENT_OBJ_GFX_TUBER_M, 0, 24, 18, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route109_EventScript_1EE99E, 0 + object_event 15, EVENT_OBJ_GFX_TUBER_F, 0, 25, 18, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, Route109_EventScript_1EE9B5, 0 + object_event 16, EVENT_OBJ_GFX_WOMAN_2, 0, 30, 32, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route109_EventScript_1EEA06, 0 + object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 41, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route109_EventScript_1EEBBD, 0 + object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 9, 41, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route109_EventScript_1EEBA2, 0 + object_event 19, EVENT_OBJ_GFX_OLD_MAN_2, 0, 33, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_1EEA0F, 0 + object_event 20, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 32, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_1EEA18, 0 + object_event 21, EVENT_OBJ_GFX_TUBER_F, 0, 17, 13, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 6, Route109_EventScript_1EEBEF, 0 + object_event 22, EVENT_OBJ_GFX_TUBER_M, 0, 27, 7, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT, 1, 1, 1, 4, Route109_EventScript_1EEBD8, 0 + object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_290D67, 1140 + object_event 24, EVENT_OBJ_GFX_MAN_6, 0, 17, 56, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 3, Route109_EventScript_1EEC06, 0 Route109_MapWarps: @ 8528C74 warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE diff --git a/data/maps/Route109_SeashoreHouse/events.inc b/data/maps/Route109_SeashoreHouse/events.inc index 140b92a21f..9c12bd5821 100644 --- a/data/maps/Route109_SeashoreHouse/events.inc +++ b/data/maps/Route109_SeashoreHouse/events.inc @@ -1,8 +1,8 @@ Route109_SeashoreHouse_EventObjects: @ 853DDE8 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 2, 3, 8, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_2693FE, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, 8, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694E2, 0 - object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 14, 9, 3, 9, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_269518, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 10, 5, 3, 14, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694FD, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_2693FE, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694E2, 0 + object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 14, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_269518, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694FD, 0 Route109_SeashoreHouse_MapWarps: @ 853DE48 warp_def 6, 9, 0, 0, MAP_ROUTE109 diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc index a38375d8e5..4cb99b121c 100644 --- a/data/maps/Route110/events.inc +++ b/data/maps/Route110/events.inc @@ -1,40 +1,40 @@ Route110_EventObjects: @ 8528CF0 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 17, 90, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF338, 0 - object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 29, 79, 4, 8, 0, 0, 0, 0, Route110_EventScript_1EF32F, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 14, 69, 3, 3, 0, 1, 0, 0, Route110_EventScript_1EF326, 0 - object_event 4, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 9, 57, 4, 2, 1, 1, 0, 0, Route110_EventScript_1EF314, 0 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 11, 3, 2, 1, 1, 0, 0, Route110_EventScript_1EF31D, 0 - object_event 6, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 27, 24, 4, 2, 1, 3, 0, 0, Route110_EventScript_1EF30B, 0 - object_event 7, EVENT_OBJ_GFX_BOY_3, 0, 15, 7, 3, 2, 1, 1, 0, 0, Route110_EventScript_1EF302, 0 - object_event 8, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 16, 73, 4, 49, 2, 14, 1, 3, Route110_EventScript_1EF529, 0 - object_event 9, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 31, 4, 51, 10, 1, 1, 3, Route110_EventScript_1EF4B0, 0 - object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 30, 31, 4, 9, 1, 1, 1, 4, Route110_EventScript_1EF540, 0 - object_event 11, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 16, 55, 4, 45, 4, 4, 1, 3, Route110_EventScript_1EF4C7, 0 - object_event 12, EVENT_OBJ_GFX_PSYCHIC_M, 0, 3, 39, 3, 10, 0, 0, 1, 6, Route110_EventScript_1EF3F2, 0 - object_event 13, EVENT_OBJ_GFX_LASS, 0, 33, 15, 3, 9, 0, 0, 1, 1, Route110_EventScript_1EF409, 0 - object_event 14, EVENT_OBJ_GFX_MANIAC, 0, 34, 40, 3, 67, 0, 0, 1, 4, Route110_EventScript_1EF420, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 10, 19, 3, 8, 0, 0, 1, 1, Route110_EventScript_1EF482, 0 - object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 11, 3, 12, 0, 0, 0, 16, BerryTreeScript, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 11, 3, 12, 0, 0, 0, 17, BerryTreeScript, 0 - object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 11, 3, 12, 0, 0, 0, 18, BerryTreeScript, 0 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 69, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D81, 1007 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 47, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D74, 1006 - object_event 21, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 92, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF3B7, 0 - object_event 22, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2AA, 900 - object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2C0, 900 - object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2D6, 900 - object_event 25, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2EC, 900 - object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 82, 3, 8, 0, 0, 0, 0, 0x0, 900 - object_event 27, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 78, 4, 51, 7, 1, 1, 2, Route110_EventScript_1EF499, 0 - object_event 28, EVENT_OBJ_GFX_HIPSTER, 0, 34, 54, 3, 14, 0, 0, 0, 0, 0x0, 919 - object_event 29, EVENT_OBJ_GFX_GIDDY, 0, 34, 54, 3, 8, 0, 0, 0, 0, 0x0, 922 - object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 69, 3, 14, 0, 0, 1, 3, Route110_EventScript_1EF604, 0 - object_event 31, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 76, 3, 9, 0, 0, 1, 2, Route110_EventScript_1EF5A2, 0 - object_event 32, EVENT_OBJ_GFX_MAN_3, 0, 7, 76, 3, 10, 1, 1, 1, 2, Route110_EventScript_1EF61C, 0 - object_event 33, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 10, 39, 3, 9, 1, 1, 1, 6, Route110_EventScript_1EF64A, 0 - object_event 34, EVENT_OBJ_GFX_MAN_6, 0, 36, 40, 3, 66, 1, 1, 1, 3, Route110_EventScript_1EF633, 0 - object_event 35, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 38, 3, 1, 1, 1, 0, 0, Route110_EventScript_290D8E, 1141 - object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 79, 3, 1, 1, 1, 0, 0, 0x0, 837 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 17, 90, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF338, 0 + object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 29, 79, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF32F, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 14, 69, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route110_EventScript_1EF326, 0 + object_event 4, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 9, 57, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_1EF314, 0 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_1EF31D, 0 + object_event 6, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 27, 24, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, Route110_EventScript_1EF30B, 0 + object_event 7, EVENT_OBJ_GFX_BOY_3, 0, 15, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_1EF302, 0 + object_event 8, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 16, 73, 4, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, 2, 14, 1, 3, Route110_EventScript_1EF529, 0 + object_event 9, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 31, 4, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 10, 1, 1, 3, Route110_EventScript_1EF4B0, 0 + object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 30, 31, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route110_EventScript_1EF540, 0 + object_event 11, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 16, 55, 4, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 4, 1, 3, Route110_EventScript_1EF4C7, 0 + object_event 12, EVENT_OBJ_GFX_PSYCHIC_M, 0, 3, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route110_EventScript_1EF3F2, 0 + object_event 13, EVENT_OBJ_GFX_LASS, 0, 33, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_EventScript_1EF409, 0 + object_event 14, EVENT_OBJ_GFX_MANIAC, 0, 34, 40, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 1, 4, Route110_EventScript_1EF420, 0 + object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 10, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_EventScript_1EF482, 0 + object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 16, BerryTreeScript, 0 + object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 17, BerryTreeScript, 0 + object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 18, BerryTreeScript, 0 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 69, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_EventScript_290D81, 1007 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 47, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_EventScript_290D74, 1006 + object_event 21, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 92, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF3B7, 0 + object_event 22, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2AA, 900 + object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2C0, 900 + object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2D6, 900 + object_event 25, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2EC, 900 + object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 82, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 900 + object_event 27, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 78, 4, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 7, 1, 1, 2, Route110_EventScript_1EF499, 0 + object_event 28, EVENT_OBJ_GFX_HIPSTER, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 0, 0, 0x0, 919 + object_event 29, EVENT_OBJ_GFX_GIDDY, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 922 + object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 69, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 3, Route110_EventScript_1EF604, 0 + object_event 31, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 76, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_EventScript_1EF5A2, 0 + object_event 32, EVENT_OBJ_GFX_MAN_3, 0, 7, 76, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, Route110_EventScript_1EF61C, 0 + object_event 33, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 10, 39, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, Route110_EventScript_1EF64A, 0 + object_event 34, EVENT_OBJ_GFX_MAN_6, 0, 36, 40, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 3, Route110_EventScript_1EF633, 0 + object_event 35, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_EventScript_290D8E, 1141 + object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 79, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 837 Route110_MapWarps: @ 8529050 warp_def 35, 24, 3, 0, MAP_NEW_MAUVILLE_ENTRANCE diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc index adb59f580e..4af135a6de 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc @@ -1,5 +1,5 @@ Route110_SeasideCyclingRoadNorthEntrance_EventObjects: @ 853E9A0 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78, 0 Route110_SeasideCyclingRoadNorthEntrance_MapWarps: @ 853E9B8 warp_def 1, 5, 0, 4, MAP_ROUTE110 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc index 5def6e102b..3e9c99d55c 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc @@ -1,5 +1,5 @@ Route110_SeasideCyclingRoadSouthEntrance_EventObjects: @ 853EA0C - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4, 0 Route110_SeasideCyclingRoadSouthEntrance_MapWarps: @ 853EA24 warp_def 1, 5, 0, 2, MAP_ROUTE110 diff --git a/data/maps/Route110_TrickHouseEnd/events.inc b/data/maps/Route110_TrickHouseEnd/events.inc index 12659457a5..8348be5cb0 100644 --- a/data/maps/Route110_TrickHouseEnd/events.inc +++ b/data/maps/Route110_TrickHouseEnd/events.inc @@ -1,5 +1,5 @@ Route110_TrickHouseEnd_EventObjects: @ 853DEFC - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, 899 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, 899 Route110_TrickHouseEnd_MapWarps: @ 853DF14 warp_def 10, 1, 3, 2, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 diff --git a/data/maps/Route110_TrickHouseEntrance/events.inc b/data/maps/Route110_TrickHouseEntrance/events.inc index 30a6892df6..d1083bb7fa 100644 --- a/data/maps/Route110_TrickHouseEntrance/events.inc +++ b/data/maps/Route110_TrickHouseEntrance/events.inc @@ -1,5 +1,5 @@ Route110_TrickHouseEntrance_EventObjects: @ 853DE6C - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 2, 3, 9, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, 872 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, 872 Route110_TrickHouseEntrance_MapWarps: @ 853DE84 warp_def 5, 7, 3, 1, MAP_ROUTE110 diff --git a/data/maps/Route110_TrickHousePuzzle1/events.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc index 05824aa38b..38186f2176 100644 --- a/data/maps/Route110_TrickHousePuzzle1/events.inc +++ b/data/maps/Route110_TrickHousePuzzle1/events.inc @@ -1,19 +1,19 @@ Route110_TrickHousePuzzle1_EventObjects: @ 853DF88 - object_event 1, EVENT_OBJ_GFX_LASS, 0, 14, 20, 3, 9, 0, 0, 1, 6, Route110_TrickHousePuzzle1_EventScript_26B948, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 8, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B95F, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 2, 15, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B976, 0 - object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 19 - object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 18, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 18 - object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 14, 14, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 20 - object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 23 - object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 22 - object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 21 - object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 25 - object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 24 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 27 - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_29140E, 1060 - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 4, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 28 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 30 + object_event 1, EVENT_OBJ_GFX_LASS, 0, 14, 20, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 6, Route110_TrickHousePuzzle1_EventScript_26B948, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B95F, 0 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 2, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B976, 0 + object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 19 + object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 18 + object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 14, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 20 + object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 23 + object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 22 + object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 21 + object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 25 + object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 24 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 27 + object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_29140E, 1060 + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 28 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 30 Route110_TrickHousePuzzle1_MapWarps: @ 853E0F0 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route110_TrickHousePuzzle2/events.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc index a7259e3b3c..2fa2f4bbcb 100644 --- a/data/maps/Route110_TrickHousePuzzle2/events.inc +++ b/data/maps/Route110_TrickHousePuzzle2/events.inc @@ -1,9 +1,9 @@ Route110_TrickHousePuzzle2_EventObjects: @ 853E128 - object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 10, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_26BC75, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 10, 17, 3, 8, 0, 0, 1, 4, Route110_TrickHousePuzzle2_EventScript_26BC8C, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 11, 9, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_26BCA3, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, 1062 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, 1061 + object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_26BC75, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 10, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route110_TrickHousePuzzle2_EventScript_26BC8C, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_26BCA3, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, 1062 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, 1061 Route110_TrickHousePuzzle2_MapWarps: @ 853E1A0 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route110_TrickHousePuzzle3/events.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc index 2f95cf052c..986384ad4b 100644 --- a/data/maps/Route110_TrickHousePuzzle3/events.inc +++ b/data/maps/Route110_TrickHousePuzzle3/events.inc @@ -1,11 +1,11 @@ Route110_TrickHousePuzzle3_EventObjects: @ 853E218 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 7, 19, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle3_EventScript_26C5C4, 0 - object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 4, 4, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5DB, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 10, 10, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5F2, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291442, 1064 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291435, 1063 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 20, 3, 1, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 21 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 21, 3, 1, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 22 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 7, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route110_TrickHousePuzzle3_EventScript_26C5C4, 0 + object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5DB, 0 + object_event 3, EVENT_OBJ_GFX_HIKER, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5F2, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291442, 1064 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291435, 1063 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 21 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 22 Route110_TrickHousePuzzle3_MapWarps: @ 853E2C0 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route110_TrickHousePuzzle4/events.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc index b0dd3abf6a..97022a3e0a 100644 --- a/data/maps/Route110_TrickHousePuzzle4/events.inc +++ b/data/maps/Route110_TrickHousePuzzle4/events.inc @@ -1,18 +1,18 @@ Route110_TrickHousePuzzle4_EventObjects: @ 853E338 - object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 2, 2, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_26C87E, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 14, 7, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C8AC, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 14, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C895, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_29144F, 1065 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 17 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 18 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 19 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 20 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 21 - object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 22 - object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 23 - object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 24 - object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 25 - object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 26 + object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_26C87E, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 14, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C8AC, 0 + object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C895, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_29144F, 1065 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 17 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 18 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 19 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 20 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 21 + object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 22 + object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 23 + object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 24 + object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 25 + object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 26 Route110_TrickHousePuzzle4_MapWarps: @ 853E488 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route110_TrickHousePuzzle5/events.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc index 8da7daf11e..0401ef544a 100644 --- a/data/maps/Route110_TrickHousePuzzle5/events.inc +++ b/data/maps/Route110_TrickHousePuzzle5/events.inc @@ -1,9 +1,9 @@ Route110_TrickHousePuzzle5_EventObjects: @ 853E4C0 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 17, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB32, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB53, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 14, 10, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB74, 0 - object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 14, 19, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB95, 0 - object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 10, 4, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBB6, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB32, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB53, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB74, 0 + object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 14, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB95, 0 + object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 10, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBB6, 0 Route110_TrickHousePuzzle5_MapWarps: @ 853E538 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route110_TrickHousePuzzle6/events.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc index 7fc098f2c0..75d64270b6 100644 --- a/data/maps/Route110_TrickHousePuzzle6/events.inc +++ b/data/maps/Route110_TrickHousePuzzle6/events.inc @@ -1,8 +1,8 @@ Route110_TrickHousePuzzle6_EventObjects: @ 853E6D0 - object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 7, 9, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 11, 10, 3, 10, 0, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 4, 5, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 21, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, 1067 + object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 7, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 11, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, 1067 Route110_TrickHousePuzzle6_MapWarps: @ 853E730 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route110_TrickHousePuzzle7/events.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc index e72aa929a4..1d4373f251 100644 --- a/data/maps/Route110_TrickHousePuzzle7/events.inc +++ b/data/maps/Route110_TrickHousePuzzle7/events.inc @@ -1,13 +1,13 @@ Route110_TrickHousePuzzle7_EventObjects: @ 853E768 - object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 20, 0, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E389, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 10, 2, 0, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3B7, 0 - object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 8, 17, 0, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3A0, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_291469, 1068 - object_event 5, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 2, 3, 8, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3E5, 0 - object_event 6, EVENT_OBJ_GFX_LASS, 0, 8, 13, 3, 7, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3CE, 0 - object_event 7, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 12, 3, 9, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3FC, 0 - object_event 8, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 17, 0, 1, 1, 1, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 6, 0, 1, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 20, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E389, 0 + object_event 2, EVENT_OBJ_GFX_LASS, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3B7, 0 + object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 8, 17, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3A0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_291469, 1068 + object_event 5, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3E5, 0 + object_event 6, EVENT_OBJ_GFX_LASS, 0, 8, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3CE, 0 + object_event 7, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3FC, 0 + object_event 8, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 17, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 9, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 Route110_TrickHousePuzzle7_MapWarps: @ 853E840 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route110_TrickHousePuzzle8/events.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc index eacc9e940c..efeb449ffa 100644 --- a/data/maps/Route110_TrickHousePuzzle8/events.inc +++ b/data/maps/Route110_TrickHousePuzzle8/events.inc @@ -1,8 +1,8 @@ Route110_TrickHousePuzzle8_EventObjects: @ 853E908 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 1, 10, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 4, 2, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 17, 3, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, 1069 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 1, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, 1069 Route110_TrickHousePuzzle8_MapWarps: @ 853E968 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route111/events.inc b/data/maps/Route111/events.inc index cea2db8d57..b6aee76aca 100644 --- a/data/maps/Route111/events.inc +++ b/data/maps/Route111/events.inc @@ -1,50 +1,50 @@ Route111_EventObjects: @ 85291F0 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 114, 3, 8, 0, 0, 0, 0, Route111_EventScript_1F0FC5, 768 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 769 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, 8, 1, 0, 0, 0, 0x0, 770 - object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 771 - object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 28, 51, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F121B, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 5, 3, 12, 0, 0, 0, 19, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 5, 3, 12, 0, 0, 0, 20, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 8, 91, 3, 2, 1, 1, 0, 0, Route111_EventScript_1F1189, 0 - object_event 9, EVENT_OBJ_GFX_CAMPER, 0, 29, 37, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1204, 0 - object_event 10, EVENT_OBJ_GFX_HIKER, 0, 27, 69, 3, 50, 2, 2, 1, 2, Route111_EventScript_1F1260, 0 - object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 21, 47, 3, 9, 0, 0, 1, 4, Route111_EventScript_1F1232, 0 - object_event 12, EVENT_OBJ_GFX_PICNICKER, 0, 32, 66, 3, 24, 0, 0, 1, 3, Route111_EventScript_1F1249, 0 - object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDF6, 796 - object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDD6, 796 - object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 101, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 17 - object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 100, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 18 - object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 23, 8, 3, 5, 1, 0, 0, 0, Route111_EventScript_1F0EB9, 0 - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 104, 3, 1, 0, 0, 0, 0, Route111_EventScript_290D9B, 1008 - object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, 12, 0, 0, 0, 80, BerryTreeScript, 0 - object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 5, 3, 12, 0, 0, 0, 81, BerryTreeScript, 0 - object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CE96, 799 - object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CEB6, 799 - object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF16, 903 - object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF36, 903 - object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 54, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DA8, 1009 - object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 114, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DB5, 1010 - object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 22, 21, 3, 1, 0, 0, 0, 0, Route111_EventScript_2906BB, 19 - object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 10, 82, 3, 14, 0, 0, 1, 2, Route111_EventScript_1F12D9, 0 - object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 11, 71, 3, 22, 0, 0, 1, 3, Route111_EventScript_1F12C2, 0 - object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 32, 29, 3, 28, 1, 0, 1, 2, Route111_EventScript_1F12F0, 0 - object_event 31, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 11, 3, 7, 4, 0, 1, 4, Route111_EventScript_1F1369, 0 - object_event 32, EVENT_OBJ_GFX_MAN_4, 0, 9, 27, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1307, 0 - object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 13, 20, 3, 7, 1, 1, 0, 0, Route111_EventScript_2765FF, 960 - object_event 34, EVENT_OBJ_GFX_MAN_5, 0, 20, 114, 3, 2, 1, 1, 0, 0, Route111_EventScript_1F1192, 0 - object_event 35, EVENT_OBJ_GFX_CAMPER, 0, 26, 132, 3, 9, 1, 1, 1, 5, Route111_EventScript_1F13F9, 0 - object_event 36, EVENT_OBJ_GFX_WOMAN_3, 0, 20, 132, 3, 10, 1, 1, 1, 5, Route111_EventScript_1F1410, 0 - object_event 37, EVENT_OBJ_GFX_PICNICKER, 0, 19, 121, 3, 7, 1, 1, 1, 2, Route111_EventScript_1F13E2, 0 - object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 16, 119, 3, 10, 1, 1, 1, 3, Route111_EventScript_1F13CB, 0 - object_event 39, EVENT_OBJ_GFX_HIKER, 0, 29, 77, 3, 14, 1, 1, 1, 7, Route111_EventScript_1F143E, 0 - object_event 40, EVENT_OBJ_GFX_PICNICKER, 0, 22, 77, 3, 10, 1, 1, 1, 6, Route111_EventScript_1F1427, 0 - object_event 41, EVENT_OBJ_GFX_CAMPER, 0, 37, 77, 3, 9, 1, 1, 1, 7, Route111_EventScript_1F1455, 0 - object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 118, 3, 1, 1, 1, 0, 0, Route111_EventScript_290DC2, 1142 - object_event 43, EVENT_OBJ_GFX_HIKER, 0, 14, 56, 3, 16, 1, 1, 0, 0, Route111_EventScript_1F119B, 0 - object_event 44, EVENT_OBJ_GFX_FOSSIL, 0, 20, 53, 3, 8, 1, 1, 0, 0, 0x0, 876 - object_event 45, EVENT_OBJ_GFX_HIPSTER, 0, 19, 53, 3, 8, 1, 1, 0, 0, 0x0, 875 - object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 101, 3, 7, 1, 1, 0, 0, Route111_EventScript_1F11E4, 843 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 114, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1F0FC5, 768 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 769 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, 770 + object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 771 + object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 28, 51, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1F121B, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 19, BerryTreeScript, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 20, BerryTreeScript, 0 + object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 8, 91, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route111_EventScript_1F1189, 0 + object_event 9, EVENT_OBJ_GFX_CAMPER, 0, 29, 37, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1F1204, 0 + object_event 10, EVENT_OBJ_GFX_HIKER, 0, 27, 69, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 2, 2, 1, 2, Route111_EventScript_1F1260, 0 + object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 21, 47, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route111_EventScript_1F1232, 0 + object_event 12, EVENT_OBJ_GFX_PICNICKER, 0, 32, 66, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route111_EventScript_1F1249, 0 + object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CDF6, 796 + object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CDD6, 796 + object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 101, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2907A6, 17 + object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 100, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2907A6, 18 + object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 23, 8, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route111_EventScript_1F0EB9, 0 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 104, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290D9B, 1008 + object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 80, BerryTreeScript, 0 + object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 81, BerryTreeScript, 0 + object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CE96, 799 + object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CEB6, 799 + object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CF16, 903 + object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CF36, 903 + object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 54, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290DA8, 1009 + object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 114, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290DB5, 1010 + object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 22, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2906BB, 19 + object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 10, 82, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route111_EventScript_1F12D9, 0 + object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 11, 71, 3, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 0, 1, 3, Route111_EventScript_1F12C2, 0 + object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 32, 29, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 1, 0, 1, 2, Route111_EventScript_1F12F0, 0 + object_event 31, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 11, 3, MOVEMENT_TYPE_FACE_UP, 4, 0, 1, 4, Route111_EventScript_1F1369, 0 + object_event 32, EVENT_OBJ_GFX_MAN_4, 0, 9, 27, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1F1307, 0 + object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 13, 20, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_2765FF, 960 + object_event 34, EVENT_OBJ_GFX_MAN_5, 0, 20, 114, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route111_EventScript_1F1192, 0 + object_event 35, EVENT_OBJ_GFX_CAMPER, 0, 26, 132, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, Route111_EventScript_1F13F9, 0 + object_event 36, EVENT_OBJ_GFX_WOMAN_3, 0, 20, 132, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, Route111_EventScript_1F1410, 0 + object_event 37, EVENT_OBJ_GFX_PICNICKER, 0, 19, 121, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route111_EventScript_1F13E2, 0 + object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 16, 119, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route111_EventScript_1F13CB, 0 + object_event 39, EVENT_OBJ_GFX_HIKER, 0, 29, 77, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 7, Route111_EventScript_1F143E, 0 + object_event 40, EVENT_OBJ_GFX_PICNICKER, 0, 22, 77, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, Route111_EventScript_1F1427, 0 + object_event 41, EVENT_OBJ_GFX_CAMPER, 0, 37, 77, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, Route111_EventScript_1F1455, 0 + object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 118, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route111_EventScript_290DC2, 1142 + object_event 43, EVENT_OBJ_GFX_HIKER, 0, 14, 56, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 0, 0, Route111_EventScript_1F119B, 0 + object_event 44, EVENT_OBJ_GFX_FOSSIL, 0, 20, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 876 + object_event 45, EVENT_OBJ_GFX_HIPSTER, 0, 19, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 875 + object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 101, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_1F11E4, 843 Route111_MapWarps: @ 8529640 warp_def 13, 113, 0, 0, MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE diff --git a/data/maps/Route111_OldLadysRestStop/events.inc b/data/maps/Route111_OldLadysRestStop/events.inc index 5ade76ba37..16f4804603 100644 --- a/data/maps/Route111_OldLadysRestStop/events.inc +++ b/data/maps/Route111_OldLadysRestStop/events.inc @@ -1,5 +1,5 @@ Route111_OldLadysRestStop_EventObjects: @ 8533C18 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 6, 3, 3, 9, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0 Route111_OldLadysRestStop_MapWarps: @ 8533C30 warp_def 3, 7, 0, 2, MAP_ROUTE111 diff --git a/data/maps/Route111_WinstrateFamilysHouse/events.inc b/data/maps/Route111_WinstrateFamilysHouse/events.inc index 0fe5b5df49..e2c0a2fa55 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/events.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/events.inc @@ -1,8 +1,8 @@ Route111_WinstrateFamilysHouse_EventObjects: @ 8533B94 - object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 5, 3, 9, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4E8, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A48D, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, 9, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0 - object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 4, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0 + object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4E8, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A48D, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0 + object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0 Route111_WinstrateFamilysHouse_MapWarps: @ 8533BF4 warp_def 3, 7, 0, 0, MAP_ROUTE111 diff --git a/data/maps/Route112/events.inc b/data/maps/Route112/events.inc index 0e218cd784..7cf199eee3 100644 --- a/data/maps/Route112/events.inc +++ b/data/maps/Route112/events.inc @@ -1,18 +1,18 @@ Route112_EventObjects: @ 8529974 - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 30, 3, 7, 1, 1, 0, 0, Route112_EventScript_1F1DB7, 819 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, 14, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, 8, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 22, 46, 3, 23, 0, 0, 1, 3, Route112_EventScript_1F1EFA, 0 - object_event 5, EVENT_OBJ_GFX_HIKER, 0, 15, 40, 3, 16, 0, 0, 1, 3, Route112_EventScript_1F1E81, 0 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 27, 30, 3, 7, 0, 0, 0, 0, Route112_EventScript_1F1DB7, 819 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 27, 6, 0, 12, 0, 0, 0, 24, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 28, 6, 0, 12, 0, 0, 0, 23, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 6, 0, 12, 0, 0, 0, 22, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 6, 3, 12, 0, 0, 0, 21, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_HIKER, 0, 8, 50, 3, 26, 0, 3, 0, 0, Route112_EventScript_1F1E61, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, 1, 0, 0, 0, 0, Route112_EventScript_290DCF, 1011 - object_event 13, EVENT_OBJ_GFX_MAN_6, 0, 31, 7, 3, 18, 1, 1, 1, 3, Route112_EventScript_1F1F11, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 31, 11, 3, 15, 1, 1, 1, 3, Route112_EventScript_1F1F28, 0 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route112_EventScript_1F1DB7, 819 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 22, 46, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route112_EventScript_1F1EFA, 0 + object_event 5, EVENT_OBJ_GFX_HIKER, 0, 15, 40, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route112_EventScript_1F1E81, 0 + object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 27, 30, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route112_EventScript_1F1DB7, 819 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 27, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 24, BerryTreeScript, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 28, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 23, BerryTreeScript, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 22, BerryTreeScript, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 21, BerryTreeScript, 0 + object_event 11, EVENT_OBJ_GFX_HIKER, 0, 8, 50, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 3, 0, 0, Route112_EventScript_1F1E61, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route112_EventScript_290DCF, 1011 + object_event 13, EVENT_OBJ_GFX_MAN_6, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route112_EventScript_1F1F11, 0 + object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 31, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route112_EventScript_1F1F28, 0 Route112_MapWarps: @ 8529AC4 warp_def 28, 27, 0, 0, MAP_ROUTE112_CABLE_CAR_STATION diff --git a/data/maps/Route112_CableCarStation/events.inc b/data/maps/Route112_CableCarStation/events.inc index 77f37d72c8..2fe0846971 100644 --- a/data/maps/Route112_CableCarStation/events.inc +++ b/data/maps/Route112_CableCarStation/events.inc @@ -1,6 +1,6 @@ Route112_CableCarStation_EventObjects: @ 8533C54 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, 8, 0, 0, 0, 0, Route112_CableCarStation_EventScript_22AB17, 0 - object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route112_CableCarStation_EventScript_22AB17, 0 + object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 Route112_CableCarStation_MapWarps: @ 8533C84 warp_def 6, 11, 0, 0, MAP_ROUTE112 diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc index 25287a747c..23469ff17e 100644 --- a/data/maps/Route113/events.inc +++ b/data/maps/Route113/events.inc @@ -1,20 +1,20 @@ Route113_EventObjects: @ 8529B2C - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 66, 12, 3, 5, 1, 0, 0, 0, Route113_EventScript_1F2193, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 36, 10, 3, 3, 0, 1, 0, 0, Route113_EventScript_1F218A, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, 8, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 21, 11, 3, 17, 0, 0, 1, 3, Route113_EventScript_1F21D7, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 51, 11, 3, 23, 0, 0, 1, 2, Route113_EventScript_1F21EE, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DDC, 1012 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 79, 5, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DE9, 1013 - object_event 8, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F2250, 0 - object_event 9, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 71, 2, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0 - object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 45, 6, 3, 8, 1, 1, 1, 1, Route113_EventScript_1F22C9, 0 - object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 46, 6, 3, 8, 1, 1, 1, 1, Route113_EventScript_1F22E4, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 15, 3, 1, 1, 1, 0, 0, Route113_EventScript_290DF6, 1143 - object_event 13, EVENT_OBJ_GFX_MANIAC, 0, 75, 3, 3, 9, 1, 1, 1, 4, Route113_EventScript_1F2344, 0 - object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 71, 4, 3, 7, 1, 1, 1, 1, Route113_EventScript_1F232D, 0 - object_event 15, EVENT_OBJ_GFX_PICNICKER, 0, 7, 6, 3, 26, 1, 3, 1, 6, Route113_EventScript_1F22FF, 0 - object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 7, 13, 3, 25, 1, 3, 1, 6, Route113_EventScript_1F2316, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 66, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route113_EventScript_1F2193, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 36, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route113_EventScript_1F218A, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route113_EventScript_1F21D7, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 51, 11, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route113_EventScript_1F21EE, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DDC, 1012 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 79, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DE9, 1013 + object_event 8, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F2250, 0 + object_event 9, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 71, 2, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0 + object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 45, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route113_EventScript_1F22C9, 0 + object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 46, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route113_EventScript_1F22E4, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route113_EventScript_290DF6, 1143 + object_event 13, EVENT_OBJ_GFX_MANIAC, 0, 75, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route113_EventScript_1F2344, 0 + object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 71, 4, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route113_EventScript_1F232D, 0 + object_event 15, EVENT_OBJ_GFX_PICNICKER, 0, 7, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 6, Route113_EventScript_1F22FF, 0 + object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 7, 13, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 6, Route113_EventScript_1F2316, 0 Route113_MapWarps: @ 8529CAC warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP diff --git a/data/maps/Route113_GlassWorkshop/events.inc b/data/maps/Route113_GlassWorkshop/events.inc index 1d5104e1c2..352f1fabb6 100644 --- a/data/maps/Route113_GlassWorkshop/events.inc +++ b/data/maps/Route113_GlassWorkshop/events.inc @@ -1,6 +1,6 @@ Route113_GlassWorkshop_EventObjects: @ 853EA78 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_26ED1E, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 5, 4, 3, 2, 1, 1, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_26ED1E, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 5, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0 Route113_GlassWorkshop_MapWarps: @ 853EAA8 warp_def 3, 8, 0, 0, MAP_ROUTE113 diff --git a/data/maps/Route114/events.inc b/data/maps/Route114/events.inc index 3e48c5721e..1f25b59caf 100644 --- a/data/maps/Route114/events.inc +++ b/data/maps/Route114/events.inc @@ -1,31 +1,31 @@ Route114_EventObjects: @ 8529E68 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 43, 3, 12, 0, 0, 0, 77, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 44, 3, 12, 0, 0, 0, 78, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 15, 65, 7, 10, 0, 0, 1, 6, Route114_EventScript_1F2640, 0 - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 30, 72, 5, 9, 0, 0, 1, 4, Route114_EventScript_1F2657, 0 - object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 22, 50, 3, 10, 0, 0, 1, 3, Route114_EventScript_1F266E, 0 - object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 19, 35, 3, 1, 0, 0, 1, 3, Route114_EventScript_1F2685, 0 - object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 20, 56, 3, 7, 0, 0, 1, 3, Route114_EventScript_1F269C, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 45, 3, 12, 0, 0, 0, 68, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, 1, 0, 0, 0, 0, Route114_EventScript_290E03, 1014 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 37, 4, 1, 0, 0, 0, 0, Route114_EventScript_290E10, 1015 - object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 43, 4, 1, 0, 0, 0, 0, Route114_EventScript_2907A6, 17 - object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 19, 11, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F25D1, 0 - object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 19, 12, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F2612, 0 - object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 27, 42, 3, 3, 0, 1, 0, 0, Route114_EventScript_1F2582, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 25, 6, 3, 8, 0, 0, 1, 0, Route114_EventScript_1F2777, 0 - object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 19, 26, 3, 9, 0, 0, 1, 0, Route114_EventScript_1F2760, 0 - object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 30, 58, 5, 23, 0, 0, 1, 3, Route114_EventScript_1F26FE, 0 - object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 53, 5, 1, 1, 1, 0, 0, Route114_EventScript_2907A6, 18 - object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 54, 5, 1, 1, 1, 0, 0, Route114_EventScript_2907A6, 19 - object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 69, 7, 1, 1, 1, 0, 0, Route114_EventScript_2907A6, 20 - object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 64, 5, 1, 1, 1, 0, 0, Route114_EventScript_2907A6, 21 - object_event 22, EVENT_OBJ_GFX_LASS, 0, 24, 44, 3, 8, 1, 1, 1, 1, Route114_EventScript_1F27A9, 0 - object_event 23, EVENT_OBJ_GFX_LASS, 0, 23, 44, 3, 8, 1, 1, 1, 1, Route114_EventScript_1F278E, 0 - object_event 24, EVENT_OBJ_GFX_PICNICKER, 0, 28, 20, 3, 7, 1, 1, 1, 3, Route114_EventScript_1F27DB, 0 - object_event 25, EVENT_OBJ_GFX_PICNICKER, 0, 26, 72, 5, 18, 1, 1, 1, 4, Route114_EventScript_1F27C4, 0 - object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 19, 3, 1, 1, 1, 0, 0, Route114_EventScript_290E1D, 1160 - object_event 27, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 16, 3, 17, 1, 1, 1, 3, Route114_EventScript_1F27F2, 0 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 43, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 77, BerryTreeScript, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 44, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 78, BerryTreeScript, 0 + object_event 3, EVENT_OBJ_GFX_HIKER, 0, 15, 65, 7, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route114_EventScript_1F2640, 0 + object_event 4, EVENT_OBJ_GFX_HIKER, 0, 30, 72, 5, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route114_EventScript_1F2657, 0 + object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 22, 50, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route114_EventScript_1F266E, 0 + object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 19, 35, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route114_EventScript_1F2685, 0 + object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 20, 56, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, Route114_EventScript_1F269C, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 45, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 68, BerryTreeScript, 0 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_290E03, 1014 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 37, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_290E10, 1015 + object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 43, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_2907A6, 17 + object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 19, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route114_EventScript_1F25D1, 0 + object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 19, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route114_EventScript_1F2612, 0 + object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 27, 42, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route114_EventScript_1F2582, 0 + object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route114_EventScript_1F2777, 0 + object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 19, 26, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, Route114_EventScript_1F2760, 0 + object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 30, 58, 5, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route114_EventScript_1F26FE, 0 + object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 53, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, 18 + object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 54, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, 19 + object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 69, 7, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, 20 + object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 64, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, 21 + object_event 22, EVENT_OBJ_GFX_LASS, 0, 24, 44, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route114_EventScript_1F27A9, 0 + object_event 23, EVENT_OBJ_GFX_LASS, 0, 23, 44, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route114_EventScript_1F278E, 0 + object_event 24, EVENT_OBJ_GFX_PICNICKER, 0, 28, 20, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route114_EventScript_1F27DB, 0 + object_event 25, EVENT_OBJ_GFX_PICNICKER, 0, 26, 72, 5, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, Route114_EventScript_1F27C4, 0 + object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_290E1D, 1160 + object_event 27, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, Route114_EventScript_1F27F2, 0 Route114_MapWarps: @ 852A0F0 warp_def 8, 63, 0, 0, MAP_METEOR_FALLS_1F_1R diff --git a/data/maps/Route114_FossilManiacsHouse/events.inc b/data/maps/Route114_FossilManiacsHouse/events.inc index c947d9d8fa..65864133ec 100644 --- a/data/maps/Route114_FossilManiacsHouse/events.inc +++ b/data/maps/Route114_FossilManiacsHouse/events.inc @@ -1,5 +1,5 @@ Route114_FossilManiacsHouse_EventObjects: @ 8533CFC - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 3, 2, 3, 8, 1, 1, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0 Route114_FossilManiacsHouse_MapWarps: @ 8533D14 warp_def 4, 7, 0, 1, MAP_ROUTE114 diff --git a/data/maps/Route114_FossilManiacsTunnel/events.inc b/data/maps/Route114_FossilManiacsTunnel/events.inc index 99edadee15..ca61428524 100644 --- a/data/maps/Route114_FossilManiacsTunnel/events.inc +++ b/data/maps/Route114_FossilManiacsTunnel/events.inc @@ -1,5 +1,5 @@ Route114_FossilManiacsTunnel_EventObjects: @ 8533D70 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 5, 3, 3, 7, 1, 1, 0, 0, Route114_FossilManiacsTunnel_EventScript_22AF87, 0 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route114_FossilManiacsTunnel_EventScript_22AF87, 0 Route114_FossilManiacsTunnel_MapWarps: @ 8533D88 warp_def 6, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE diff --git a/data/maps/Route114_LanettesHouse/events.inc b/data/maps/Route114_LanettesHouse/events.inc index 352bb20378..a6ecd2e7f1 100644 --- a/data/maps/Route114_LanettesHouse/events.inc +++ b/data/maps/Route114_LanettesHouse/events.inc @@ -1,5 +1,5 @@ Route114_LanettesHouse_EventObjects: @ 8533DD4 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 4, 3, 1, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, 870 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, 870 Route114_LanettesHouse_MapWarps: @ 8533DEC warp_def 5, 7, 0, 2, MAP_ROUTE114 diff --git a/data/maps/Route115/events.inc b/data/maps/Route115/events.inc index 37d886e7fe..29a77c6ce7 100644 --- a/data/maps/Route115/events.inc +++ b/data/maps/Route115/events.inc @@ -1,27 +1,27 @@ Route115_EventObjects: @ 852A1BC - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 68, 3, 2, 1, 1, 0, 0, Route115_EventScript_1F2973, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 15, 3, 10, 0, 0, 1, 6, Route115_EventScript_1F298E, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 27, 53, 3, 15, 1, 1, 1, 4, Route115_EventScript_1F2A07, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, 12, 0, 0, 0, 69, BerryTreeScript, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 13, 5, 3, 12, 0, 0, 0, 70, BerryTreeScript, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, 12, 0, 0, 0, 71, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 15, 50, 3, 64, 0, 0, 1, 3, Route115_EventScript_1F2A69, 0 - object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 15, 3, 27, 5, 0, 1, 2, Route115_EventScript_1F29F0, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 24, 62, 3, 18, 0, 0, 1, 4, Route115_EventScript_1F2ACB, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 60, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E2A, 1016 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 18, 7, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E37, 1017 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 29, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E44, 1018 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 64, 3, 12, 0, 0, 0, 55, BerryTreeScript, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 65, 3, 12, 0, 0, 0, 56, BerryTreeScript, 0 - object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 50, 3, 1, 1, 1, 0, 0, Route115_EventScript_2907A6, 17 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, 1, 1, 1, 0, 0, Route115_EventScript_290E51, 1118 - object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 10, 15, 3, 46, 3, 3, 1, 2, Route115_EventScript_1F2AE2, 0 - object_event 18, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 11, 12, 3, 57, 1, 1, 1, 3, Route115_EventScript_1F2AF9, 0 - object_event 19, EVENT_OBJ_GFX_GIRL_3, 0, 15, 7, 3, 9, 1, 1, 1, 4, Route115_EventScript_1F2B27, 0 - object_event 20, EVENT_OBJ_GFX_LASS, 0, 10, 7, 3, 10, 1, 1, 1, 4, Route115_EventScript_1F2B10, 0 - object_event 21, EVENT_OBJ_GFX_LASS, 0, 28, 62, 3, 9, 1, 1, 1, 4, Route115_EventScript_1F2B3E, 0 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 67, 3, 1, 1, 1, 0, 0, Route115_EventScript_290E6B, 1161 - object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 14, 3, 1, 1, 1, 0, 0, Route115_EventScript_290E5E, 1144 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 68, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route115_EventScript_1F2973, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route115_EventScript_1F298E, 0 + object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 27, 53, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2A07, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 69, BerryTreeScript, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 13, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 70, BerryTreeScript, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 71, BerryTreeScript, 0 + object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 15, 50, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 0, 0, 1, 3, Route115_EventScript_1F2A69, 0 + object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 15, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 5, 0, 1, 2, Route115_EventScript_1F29F0, 0 + object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 24, 62, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 4, Route115_EventScript_1F2ACB, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 60, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E2A, 1016 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 18, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E37, 1017 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E44, 1018 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 64, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 55, BerryTreeScript, 0 + object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 65, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 56, BerryTreeScript, 0 + object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_2907A6, 17 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E51, 1118 + object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 10, 15, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 3, 3, 1, 2, Route115_EventScript_1F2AE2, 0 + object_event 18, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 11, 12, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route115_EventScript_1F2AF9, 0 + object_event 19, EVENT_OBJ_GFX_GIRL_3, 0, 15, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2B27, 0 + object_event 20, EVENT_OBJ_GFX_LASS, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, Route115_EventScript_1F2B10, 0 + object_event 21, EVENT_OBJ_GFX_LASS, 0, 28, 62, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2B3E, 0 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 67, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E6B, 1161 + object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E5E, 1144 Route115_MapWarps: @ 852A3E4 warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R diff --git a/data/maps/Route116/events.inc b/data/maps/Route116/events.inc index 16afe4482d..e2ba1ad15b 100644 --- a/data/maps/Route116/events.inc +++ b/data/maps/Route116/events.inc @@ -1,32 +1,32 @@ Route116_EventObjects: @ 852A4B8 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 2, 3, 12, 0, 0, 0, 25, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 2, 3, 12, 0, 0, 0, 26, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 12, 7, 3, 16, 0, 0, 1, 3, Route116_EventScript_1F2E89, 0 - object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 21, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 17 - object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 10, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 18 - object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 13, 17, 3, 24, 0, 0, 1, 2, Route116_EventScript_1F2EA0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E85, 1019 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 17, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E92, 1020 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 20, 2, 3, 12, 0, 0, 0, 66, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 21, 2, 3, 12, 0, 0, 0, 67, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_OLD_MAN_1, 0, 46, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_1F2D84, 891 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 28, 11, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 19 - object_event 13, EVENT_OBJ_GFX_HIKER, 0, 36, 17, 3, 15, 0, 0, 1, 3, Route116_EventScript_1F2F65, 0 - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 20 - object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 8, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E9F, 1021 - object_event 16, EVENT_OBJ_GFX_LASS, 0, 26, 6, 3, 10, 0, 0, 1, 2, Route116_EventScript_1F2F7C, 0 - object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 22, 16, 3, 13, 0, 0, 1, 3, Route116_EventScript_1F2F93, 0 - object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 28, 8, 3, 7, 0, 0, 1, 4, Route116_EventScript_1F2EB7, 0 - object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 46, 11, 3, 1, 1, 1, 0, 0, Route116_EventScript_1F2CA2, 947 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 12, 4, 1, 1, 1, 0, 0, Route116_EventScript_290E78, 1001 - object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 9, 3, 10, 1, 1, 0, 0, Route116_EventScript_1F2C70, 894 - object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 13, 3, 1, 1, 1, 0, 0, Route116_EventScript_1F2DB6, 813 - object_event 23, EVENT_OBJ_GFX_WOMAN_3, 0, 33, 8, 3, 7, 0, 0, 1, 1, Route116_EventScript_1F3041, 0 - object_event 24, EVENT_OBJ_GFX_BOY_2, 0, 33, 5, 3, 8, 0, 0, 1, 2, Route116_EventScript_1F3058, 0 - object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 34, 7, 0, 1, 1, 1, 0, 0, Route116_EventScript_290EAC, 1146 - object_event 26, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 5, 3, 1, 1, 1, 0, 0, Route116_EventScript_2906BB, 21 - object_event 27, EVENT_OBJ_GFX_YOUNGSTER, 0, 36, 13, 3, 18, 1, 1, 1, 5, Route116_EventScript_1F3086, 0 - object_event 28, EVENT_OBJ_GFX_HIKER, 0, 42, 13, 3, 9, 1, 1, 1, 5, Route116_EventScript_1F306F, 0 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 25, BerryTreeScript, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 26, BerryTreeScript, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route116_EventScript_1F2E89, 0 + object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 21, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, 17 + object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, 18 + object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 13, 17, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 2, Route116_EventScript_1F2EA0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E85, 1019 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E92, 1020 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 20, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 66, BerryTreeScript, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 21, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 67, BerryTreeScript, 0 + object_event 11, EVENT_OBJ_GFX_OLD_MAN_1, 0, 46, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_1F2D84, 891 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 28, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, 19 + object_event 13, EVENT_OBJ_GFX_HIKER, 0, 36, 17, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 3, Route116_EventScript_1F2F65, 0 + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, 20 + object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E9F, 1021 + object_event 16, EVENT_OBJ_GFX_LASS, 0, 26, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route116_EventScript_1F2F7C, 0 + object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 22, 16, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, Route116_EventScript_1F2F93, 0 + object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 28, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route116_EventScript_1F2EB7, 0 + object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 46, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1F2CA2, 947 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 12, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_290E78, 1001 + object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route116_EventScript_1F2C70, 894 + object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1F2DB6, 813 + object_event 23, EVENT_OBJ_GFX_WOMAN_3, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route116_EventScript_1F3041, 0 + object_event 24, EVENT_OBJ_GFX_BOY_2, 0, 33, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route116_EventScript_1F3058, 0 + object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 34, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_290EAC, 1146 + object_event 26, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_2906BB, 21 + object_event 27, EVENT_OBJ_GFX_YOUNGSTER, 0, 36, 13, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, Route116_EventScript_1F3086, 0 + object_event 28, EVENT_OBJ_GFX_HIKER, 0, 42, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, Route116_EventScript_1F306F, 0 Route116_MapWarps: @ 852A758 warp_def 47, 8, 0, 0, MAP_RUSTURF_TUNNEL diff --git a/data/maps/Route116_TunnelersRestHouse/events.inc b/data/maps/Route116_TunnelersRestHouse/events.inc index 8d133ab6d6..896949ae8a 100644 --- a/data/maps/Route116_TunnelersRestHouse/events.inc +++ b/data/maps/Route116_TunnelersRestHouse/events.inc @@ -1,7 +1,7 @@ Route116_TunnelersRestHouse_EventObjects: @ 8533E34 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, 10, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, 1, 1, 1, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, 7, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0 + object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0 Route116_TunnelersRestHouse_MapWarps: @ 8533E7C warp_def 4, 8, 0, 1, MAP_ROUTE116 diff --git a/data/maps/Route117/events.inc b/data/maps/Route117/events.inc index f84ef6212d..9747679ad2 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 diff --git a/data/maps/Route117_PokemonDayCare/events.inc b/data/maps/Route117_PokemonDayCare/events.inc index 05220bdc99..a1a8e3673d 100644 --- a/data/maps/Route117_PokemonDayCare/events.inc +++ b/data/maps/Route117_PokemonDayCare/events.inc @@ -1,5 +1,5 @@ Route117_PokemonDayCare_EventObjects: @ 8533EA0 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 2, 2, 3, 8, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0 Route117_PokemonDayCare_MapWarps: @ 8533EB8 warp_def 2, 8, 0, 0, MAP_ROUTE117 diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc index 5e732890de..f49f07faa3 100644 --- a/data/maps/Route118/events.inc +++ b/data/maps/Route118/events.inc @@ -1,25 +1,25 @@ Route118_EventObjects: @ 852AAB4 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 5, 3, 12, 0, 0, 0, 31, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, 12, 0, 0, 0, 32, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, 12, 0, 0, 0, 33, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 64, 10, 3, 8, 0, 0, 1, 3, Route118_EventScript_1F4079, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE16, 797 - object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE36, 797 - object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 12, 10, 3, 2, 1, 1, 0, 0, Route118_EventScript_1F3E73, 0 - object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CED6, 901 - object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CEF6, 901 - object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF16, 904 - object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF36, 904 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, 1, 0, 0, 0, 0, Route118_EventScript_2906BB, 17 - object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 8, 3, 9, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 12, 3, 7, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 14, 14, 3, 8, 0, 0, 1, 0, Route118_EventScript_1F4000, 0 - object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 56, 7, 3, 16, 0, 0, 1, 3, Route118_EventScript_1F4090, 0 - object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 39, 15, 3, 1, 0, 0, 1, 2, Route118_EventScript_1F3FE9, 0 - object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 17, 11, 3, 15, 1, 1, 1, 3, Route118_EventScript_1F4017, 0 - object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, 8, 1, 1, 0, 0, 0x0, 966 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, 1, 1, 1, 0, 0, Route118_EventScript_290ED3, 1121 - object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 7, 3, 8, 1, 1, 1, 4, Route118_EventScript_1F40A7, 0 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 31, BerryTreeScript, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 32, BerryTreeScript, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 33, BerryTreeScript, 0 + object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 64, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route118_EventScript_1F4079, 0 + object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE16, 797 + object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE36, 797 + object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 12, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route118_EventScript_1F3E73, 0 + object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CED6, 901 + object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CEF6, 901 + object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF16, 904 + object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF36, 904 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route118_EventScript_2906BB, 17 + object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0 + object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0 + object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 14, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route118_EventScript_1F4000, 0 + object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 56, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route118_EventScript_1F4090, 0 + object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 2, Route118_EventScript_1F3FE9, 0 + object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route118_EventScript_1F4017, 0 + object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 966 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route118_EventScript_290ED3, 1121 + object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route118_EventScript_1F40A7, 0 Route118_MapWarps: @ 852ACAC warp_def 42, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE diff --git a/data/maps/Route119/events.inc b/data/maps/Route119/events.inc index bd10dc05b6..c21f105e55 100644 --- a/data/maps/Route119/events.inc +++ b/data/maps/Route119/events.inc @@ -1,47 +1,47 @@ Route119_EventObjects: @ 852AD6C - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 5, 3, 12, 0, 0, 0, 34, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 5, 3, 12, 0, 0, 0, 35, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 26, 5, 3, 12, 0, 0, 0, 36, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 12, 123, 3, 59, 0, 0, 1, 1, Route119_EventScript_1F47E2, 0 - object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 26, 123, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F47B4, 0 - object_event 6, EVENT_OBJ_GFX_MANIAC, 0, 5, 125, 3, 62, 0, 0, 1, 1, Route119_EventScript_1F479D, 0 - object_event 7, EVENT_OBJ_GFX_CAMPER, 0, 7, 74, 3, 18, 0, 0, 1, 3, Route119_EventScript_1F4810, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 116, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F4786, 0 - object_event 9, EVENT_OBJ_GFX_PICNICKER, 0, 35, 83, 4, 8, 0, 0, 1, 2, Route119_EventScript_1F4872, 0 - object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 34, 122, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47CB, 0 - object_event 11, EVENT_OBJ_GFX_BUG_CATCHER, 0, 17, 128, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47F9, 0 - object_event 12, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 28, 14, 3, 57, 0, 0, 1, 1, Route119_EventScript_1F4902, 0 - object_event 13, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 49, 3, 58, 0, 0, 1, 3, Route119_EventScript_1F4919, 0 - object_event 14, EVENT_OBJ_GFX_MAN_6, 0, 10, 50, 4, 10, 0, 0, 1, 3, Route119_EventScript_1F48D4, 0 - object_event 15, EVENT_OBJ_GFX_MAN_6, 0, 8, 63, 3, 8, 0, 0, 1, 5, Route119_EventScript_1F48EB, 0 - object_event 16, EVENT_OBJ_GFX_HIPSTER, 0, 25, 32, 3, 7, 0, 0, 0, 0, 0x0, 851 - object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 121, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EE0, 1024 - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 96, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EED, 1025 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EFA, 1026 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 76, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F07, 1027 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 18, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F14, 1028 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 117, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F21, 1029 - object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 33, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49A3, 890 - object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 34, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49BA, 890 - object_event 25, EVENT_OBJ_GFX_GIDDY, 0, 17, 33, 4, 7, 0, 0, 0, 0, 0x0, 923 - object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 31, 109, 3, 8, 1, 1, 0, 0, Route119_EventScript_1F49D1, 0 - object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 8, 23, 3, 12, 0, 0, 0, 83, BerryTreeScript, 0 - object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 23, 3, 12, 0, 0, 0, 84, BerryTreeScript, 0 - object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 90, 3, 12, 0, 0, 0, 85, BerryTreeScript, 0 - object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 90, 3, 12, 0, 0, 0, 86, BerryTreeScript, 0 - object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 133, 3, 5, 2, 1, 0, 0, Route119_EventScript_1F476B, 0 - object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 56, 3, 1, 1, 1, 0, 0, Route119_EventScript_290F2E, 1106 - object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 35, 93, 4, 2, 1, 1, 0, 0, Route119_EventScript_1F49DA, 0 - object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, 57, 1, 1, 1, 3, Route119_EventScript_1F4930, 0 - object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 6, 3, 76, 1, 1, 0, 0, Route119_EventScript_27231C, 989 - object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 15, 3, 76, 1, 1, 0, 0, Route119_EventScript_272329, 990 - object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 104, 3, 10, 1, 1, 1, 0, Route119_EventScript_1F4947, 0 - object_event 38, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 68, 3, 7, 1, 1, 1, 5, Route119_EventScript_1F498C, 0 - object_event 39, EVENT_OBJ_GFX_MAN_6, 0, 16, 52, 3, 10, 1, 1, 1, 3, Route119_EventScript_1F4975, 0 - object_event 40, EVENT_OBJ_GFX_MAN_6, 0, 32, 15, 3, 9, 1, 1, 1, 4, Route119_EventScript_1F495E, 0 - object_event 41, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 5, 4, 1, 1, 1, 0, 0, Route119_EventScript_291399, 1134 - object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 42, 3, 1, 1, 1, 0, 0, Route119_EventScript_290F3B, 1147 - object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 28, 25, 3, 8, 0, 0, 0, 0, 0x0, 786 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 34, BerryTreeScript, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 35, BerryTreeScript, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 26, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 36, BerryTreeScript, 0 + object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 12, 123, 3, MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F47E2, 0 + object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 26, 123, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F47B4, 0 + object_event 6, EVENT_OBJ_GFX_MANIAC, 0, 5, 125, 3, MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F479D, 0 + object_event 7, EVENT_OBJ_GFX_CAMPER, 0, 7, 74, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route119_EventScript_1F4810, 0 + object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 116, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F4786, 0 + object_event 9, EVENT_OBJ_GFX_PICNICKER, 0, 35, 83, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route119_EventScript_1F4872, 0 + object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 34, 122, 3, MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F47CB, 0 + object_event 11, EVENT_OBJ_GFX_BUG_CATCHER, 0, 17, 128, 3, MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F47F9, 0 + object_event 12, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 28, 14, 3, MOVEMENT_TYPE_TREE_DISGUISE, 0, 0, 1, 1, Route119_EventScript_1F4902, 0 + object_event 13, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 49, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 0, 0, 1, 3, Route119_EventScript_1F4919, 0 + object_event 14, EVENT_OBJ_GFX_MAN_6, 0, 10, 50, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route119_EventScript_1F48D4, 0 + object_event 15, EVENT_OBJ_GFX_MAN_6, 0, 8, 63, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 5, Route119_EventScript_1F48EB, 0 + object_event 16, EVENT_OBJ_GFX_HIPSTER, 0, 25, 32, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 851 + object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 121, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EE0, 1024 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 96, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EED, 1025 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EFA, 1026 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 76, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F07, 1027 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F14, 1028 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 117, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F21, 1029 + object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 33, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1F49A3, 890 + object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 34, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1F49BA, 890 + object_event 25, EVENT_OBJ_GFX_GIDDY, 0, 17, 33, 4, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 923 + object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 31, 109, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route119_EventScript_1F49D1, 0 + object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 8, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 83, BerryTreeScript, 0 + object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 84, BerryTreeScript, 0 + object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 90, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 85, BerryTreeScript, 0 + object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 90, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 86, BerryTreeScript, 0 + object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 133, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 1, 0, 0, Route119_EventScript_1F476B, 0 + object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F2E, 1106 + object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 35, 93, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_EventScript_1F49DA, 0 + object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route119_EventScript_1F4930, 0 + object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 6, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_27231C, 989 + object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 15, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_272329, 990 + object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 104, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 0, Route119_EventScript_1F4947, 0 + object_event 38, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 68, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route119_EventScript_1F498C, 0 + object_event 39, EVENT_OBJ_GFX_MAN_6, 0, 16, 52, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route119_EventScript_1F4975, 0 + object_event 40, EVENT_OBJ_GFX_MAN_6, 0, 32, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route119_EventScript_1F495E, 0 + object_event 41, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_291399, 1134 + object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 42, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F3B, 1147 + object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 28, 25, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 786 Route119_MapWarps: @ 852B174 warp_def 6, 32, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_1F diff --git a/data/maps/Route119_House/events.inc b/data/maps/Route119_House/events.inc index 05d426fe5a..ebae9a0fcb 100644 --- a/data/maps/Route119_House/events.inc +++ b/data/maps/Route119_House/events.inc @@ -1,11 +1,11 @@ Route119_House_EventObjects: @ 853ECD0 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route119_House_EventScript_270966, 0 - object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 1, 6, 3, 2, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 3, 2, 3, 1, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 2, 2, 3, 2, 1, 1, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 5, EVENT_OBJ_GFX_WINGULL, 0, 8, 5, 3, 2, 3, 2, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 6, 6, 3, 2, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 5, 3, 3, 2, 1, 3, 0, 0, Route119_House_EventScript_27096F, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_House_EventScript_270966, 0 + object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0 + object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 1, 0, 0, Route119_House_EventScript_27096F, 0 + object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 2, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_House_EventScript_27096F, 0 + object_event 5, EVENT_OBJ_GFX_WINGULL, 0, 8, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 2, 0, 0, Route119_House_EventScript_27096F, 0 + object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 6, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0 + object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, Route119_House_EventScript_27096F, 0 Route119_House_MapWarps: @ 853ED78 warp_def 3, 8, 0, 1, MAP_ROUTE119 diff --git a/data/maps/Route119_WeatherInstitute_1F/events.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc index ee9f42ac5f..c69d053ff4 100644 --- a/data/maps/Route119_WeatherInstitute_1F/events.inc +++ b/data/maps/Route119_WeatherInstitute_1F/events.inc @@ -1,9 +1,9 @@ Route119_WeatherInstitute_1F_EventObjects: @ 853EB20 - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 3, 3, 9, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, 890 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 10, 5, 3, 8, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, 890 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 5, 4, 3, 8, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, 892 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 2, 11, 3, 1, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, 892 - object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 14, 11, 3, 2, 1, 1, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, 890 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, 890 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, 892 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, 892 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 14, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0 Route119_WeatherInstitute_1F_MapWarps: @ 853EB98 warp_def 9, 12, 0, 0, MAP_ROUTE119 diff --git a/data/maps/Route119_WeatherInstitute_2F/events.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc index 4196be41bf..d3389f6156 100644 --- a/data/maps/Route119_WeatherInstitute_2F/events.inc +++ b/data/maps/Route119_WeatherInstitute_2F/events.inc @@ -1,12 +1,12 @@ Route119_WeatherInstitute_2F_EventObjects: @ 853EBF4 - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 6, 3, 10, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, 890 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 8, 3, 13, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, 890 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 4, 6, 3, 10, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, 890 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 3, 10, 0, 0, 0, 0, 0x0, 893 - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 6, 3, 1, 2, 1, 0, 0, Route119_WeatherInstitute_2F_EventScript_27018B, 0 - object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 893 - object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 16, 6, 3, 9, 1, 1, 0, 0, 0x0, 992 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 19, 6, 3, 9, 1, 1, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, 890 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, 890 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, 890 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, 890 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 893 + object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 2, 1, 0, 0, Route119_WeatherInstitute_2F_EventScript_27018B, 0 + object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 893 + object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 16, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 992 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 19, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, 890 Route119_WeatherInstitute_2F_MapWarps: @ 853ECB4 warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F diff --git a/data/maps/Route120/events.inc b/data/maps/Route120/events.inc index a19a70f33b..fd79c716de 100644 --- a/data/maps/Route120/events.inc +++ b/data/maps/Route120/events.inc @@ -1,48 +1,48 @@ Route120_EventObjects: @ 852B3F8 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 4, 79, 3, 12, 0, 0, 0, 46, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 79, 3, 12, 0, 0, 0, 45, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 79, 3, 12, 0, 0, 0, 44, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 79, 3, 12, 0, 0, 0, 43, BerryTreeScript, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 24, 3, 12, 0, 0, 0, 37, BerryTreeScript, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 24, 3, 12, 0, 0, 0, 38, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 24, 3, 12, 0, 0, 0, 39, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 92, 5, 12, 0, 0, 0, 40, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 10, 92, 5, 12, 0, 0, 0, 41, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 92, 5, 12, 0, 0, 0, 42, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 5, 22, 3, 14, 0, 0, 1, 3, Route120_EventScript_1F57D7, 0 - object_event 12, EVENT_OBJ_GFX_MAN_6, 0, 32, 14, 3, 10, 0, 0, 1, 3, Route120_EventScript_1F57EE, 0 - object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 27, 51, 3, 9, 0, 0, 1, 7, Route120_EventScript_1F5850, 0 - object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 36, 45, 3, 9, 0, 0, 1, 2, Route120_EventScript_1F5867, 0 - object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 19, 80, 5, 15, 0, 0, 1, 3, Route120_EventScript_1F587E, 0 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 55, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F48, 1030 - object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE76, 798 - object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE56, 798 - object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF16, 902 - object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF36, 902 - object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, 1, 0, 0, 0, 0, Route120_EventScript_2906BB, 17 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F55, 1031 - object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 14, 92, 5, 5, 1, 0, 0, 0, Route120_EventScript_1F5527, 0 - object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 31, 37, 3, 15, 0, 0, 1, 4, Route120_EventScript_1F58E0, 0 - object_event 25, EVENT_OBJ_GFX_HIKER, 0, 9, 60, 3, 21, 0, 0, 1, 4, Route120_EventScript_1F58F7, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 6, 3, 23, 0, 0, 1, 4, Route120_EventScript_1F590E, 0 - object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 34, 3, 9, 0, 0, 1, 3, Route120_EventScript_1F5925, 0 - object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, 1, 1, 1, 0, 0, Route120_EventScript_290F6F, 1108 - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, 1, 1, 1, 0, 0, Route120_EventScript_290F62, 1107 - object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, 76, 1, 1, 0, 0, Route120_EventScript_1F57BC, 970 - object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, 8, 1, 1, 0, 0, Route120_EventScript_1F5641, 972 - object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, 1, 1, 1, 0, 0, Route120_EventScript_2906BB, 20 - object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, 1, 1, 1, 0, 0, Route120_EventScript_2906BB, 18 - object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 10, 72, 3, 58, 1, 1, 1, 3, Route120_EventScript_1F593C, 0 - object_event 35, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 28, 3, 57, 1, 1, 1, 3, Route120_EventScript_1F5953, 0 - object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, 8, 1, 1, 0, 0, 0x0, 981 - object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, 76, 1, 1, 0, 0, Route120_EventScript_2722DB, 982 - object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, 76, 1, 1, 0, 0, Route120_EventScript_2722E8, 985 - object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, 76, 1, 1, 0, 0, Route120_EventScript_2722F5, 986 - object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, 76, 1, 1, 0, 0, Route120_EventScript_27230F, 988 - object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, 76, 1, 1, 0, 0, Route120_EventScript_272302, 987 - object_event 42, EVENT_OBJ_GFX_GIRL_3, 0, 19, 32, 3, 7, 1, 1, 1, 3, Route120_EventScript_1F5981, 0 - object_event 43, EVENT_OBJ_GFX_MAN_4, 0, 14, 34, 3, 10, 1, 1, 1, 3, Route120_EventScript_1F596A, 0 - object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 33, 3, 1, 1, 1, 0, 0, Route120_EventScript_290F7C, 1148 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 4, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 46, BerryTreeScript, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 45, BerryTreeScript, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 44, BerryTreeScript, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 43, BerryTreeScript, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 37, BerryTreeScript, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 38, BerryTreeScript, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 39, BerryTreeScript, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 40, BerryTreeScript, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 10, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 41, BerryTreeScript, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 42, BerryTreeScript, 0 + object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 5, 22, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 3, Route120_EventScript_1F57D7, 0 + object_event 12, EVENT_OBJ_GFX_MAN_6, 0, 32, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route120_EventScript_1F57EE, 0 + object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 27, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route120_EventScript_1F5850, 0 + object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 36, 45, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route120_EventScript_1F5867, 0 + object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 19, 80, 5, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 3, Route120_EventScript_1F587E, 0 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 55, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F48, 1030 + object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE76, 798 + object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE56, 798 + object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF16, 902 + object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF36, 902 + object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_2906BB, 17 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F55, 1031 + object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 14, 92, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route120_EventScript_1F5527, 0 + object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 31, 37, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 4, Route120_EventScript_1F58E0, 0 + object_event 25, EVENT_OBJ_GFX_HIKER, 0, 9, 60, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route120_EventScript_1F58F7, 0 + object_event 26, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 6, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 4, Route120_EventScript_1F590E, 0 + object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 34, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route120_EventScript_1F5925, 0 + object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F6F, 1108 + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F62, 1107 + object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_1F57BC, 970 + object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route120_EventScript_1F5641, 972 + object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, 20 + object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, 18 + object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 10, 72, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 1, 1, 1, 3, Route120_EventScript_1F593C, 0 + object_event 35, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 28, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route120_EventScript_1F5953, 0 + object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 981 + object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722DB, 982 + object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722E8, 985 + object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722F5, 986 + object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_27230F, 988 + object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_272302, 987 + object_event 42, EVENT_OBJ_GFX_GIRL_3, 0, 19, 32, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route120_EventScript_1F5981, 0 + object_event 43, EVENT_OBJ_GFX_MAN_4, 0, 14, 34, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route120_EventScript_1F596A, 0 + object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 33, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F7C, 1148 Route120_MapWarps: @ 852B818 warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc index 17ddae47f9..7cafdc4020 100644 --- a/data/maps/Route121/events.inc +++ b/data/maps/Route121/events.inc @@ -1,33 +1,33 @@ Route121_EventObjects: @ 852BA14 - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 29, 14, 3, 10, 1, 1, 0, 0, Route121_EventScript_1F5DFD, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 2, 3, 12, 0, 0, 0, 47, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 2, 3, 12, 0, 0, 0, 48, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 16, 2, 3, 12, 0, 0, 0, 49, BerryTreeScript, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 2, 3, 12, 0, 0, 0, 50, BerryTreeScript, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 64, 14, 3, 12, 0, 0, 0, 51, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 65, 14, 3, 12, 0, 0, 0, 52, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 66, 14, 3, 12, 0, 0, 0, 53, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 67, 14, 3, 12, 0, 0, 0, 54, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_LASS, 0, 39, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F04, 0 - object_event 11, EVENT_OBJ_GFX_LASS, 0, 40, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F1F, 0 - object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 8, 3, 7, 0, 0, 0, 0, 0x0, 914 - object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 7, 3, 10, 0, 0, 0, 0, 0x0, 914 - object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 7, 3, 9, 0, 0, 0, 0, 0x0, 914 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 17 - object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 18 - object_event 17, EVENT_OBJ_GFX_WOMAN_2, 0, 63, 5, 3, 9, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0 - object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 8, 3, 9, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0 - object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 11, 3, 7, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0 - object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 5, 3, 17, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, 1, 1, 1, 0, 0, Route121_EventScript_290F89, 1103 - object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, 1, 1, 1, 0, 0, Route121_EventScript_2906BB, 19 - object_event 23, EVENT_OBJ_GFX_MANIAC, 0, 11, 6, 3, 26, 1, 4, 1, 3, Route121_EventScript_1F5F9C, 0 - object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 59, 8, 3, 8, 1, 1, 1, 4, Route121_EventScript_1F5FB3, 0 - object_event 25, EVENT_OBJ_GFX_WOMAN_3, 0, 59, 13, 3, 7, 1, 1, 1, 4, Route121_EventScript_1F5FCA, 0 - object_event 26, EVENT_OBJ_GFX_MAN_4, 0, 65, 9, 3, 18, 1, 1, 1, 6, Route121_EventScript_1F5FE1, 0 - object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 72, 9, 3, 17, 1, 1, 1, 6, Route121_EventScript_1F5FF8, 0 - object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 60, 10, 3, 1, 1, 1, 0, 0, Route121_EventScript_290F96, 1149 - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, 1, 1, 1, 0, 0, Route121_EventScript_290FA3, 1150 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 29, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route121_EventScript_1F5DFD, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 47, BerryTreeScript, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 48, BerryTreeScript, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 16, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 49, BerryTreeScript, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 50, BerryTreeScript, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 64, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 51, BerryTreeScript, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 65, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 52, BerryTreeScript, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 66, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 53, BerryTreeScript, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 67, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 54, BerryTreeScript, 0 + object_event 10, EVENT_OBJ_GFX_LASS, 0, 39, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route121_EventScript_1F5F04, 0 + object_event 11, EVENT_OBJ_GFX_LASS, 0, 40, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route121_EventScript_1F5F1F, 0 + object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 914 + object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 914 + object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 914 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, 17 + object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, 18 + object_event 17, EVENT_OBJ_GFX_WOMAN_2, 0, 63, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0 + object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0 + object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0 + object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F89, 1103 + object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_2906BB, 19 + object_event 23, EVENT_OBJ_GFX_MANIAC, 0, 11, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 3, Route121_EventScript_1F5F9C, 0 + object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 59, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route121_EventScript_1F5FB3, 0 + object_event 25, EVENT_OBJ_GFX_WOMAN_3, 0, 59, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route121_EventScript_1F5FCA, 0 + object_event 26, EVENT_OBJ_GFX_MAN_4, 0, 65, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, Route121_EventScript_1F5FE1, 0 + object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 72, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 6, Route121_EventScript_1F5FF8, 0 + object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 60, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F96, 1149 + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290FA3, 1150 Route121_MapWarps: @ 852BCCC warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE diff --git a/data/maps/Route121_SafariZoneEntrance/events.inc b/data/maps/Route121_SafariZoneEntrance/events.inc index 2d83515343..8ac15b5033 100644 --- a/data/maps/Route121_SafariZoneEntrance/events.inc +++ b/data/maps/Route121_SafariZoneEntrance/events.inc @@ -1,7 +1,7 @@ Route121_SafariZoneEntrance_EventObjects: @ 8533EDC - object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 17, 9, 3, 9, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBE6, 0 - object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 10, 2, 3, 8, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBEF, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 8, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 17, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBE6, 0 + object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBEF, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 Route121_SafariZoneEntrance_MapWarps: @ 8533F24 warp_def 2, 5, 0, 0, MAP_SAFARI_ZONE_SOUTH diff --git a/data/maps/Route123/events.inc b/data/maps/Route123/events.inc index 0fc1b015b3..7fafbb76aa 100644 --- a/data/maps/Route123/events.inc +++ b/data/maps/Route123/events.inc @@ -1,47 +1,47 @@ Route123_EventObjects: @ 852BDBC - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 3, 3, 12, 0, 0, 0, 58, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 3, 3, 12, 0, 0, 0, 59, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 3, 3, 12, 0, 0, 0, 60, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 3, 3, 12, 0, 0, 0, 61, BerryTreeScript, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 81, 1, 3, 12, 0, 0, 0, 62, BerryTreeScript, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 82, 1, 3, 12, 0, 0, 0, 63, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 83, 1, 3, 12, 0, 0, 0, 64, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 70, 12, 3, 24, 0, 0, 1, 1, Route123_EventScript_1F61C5, 0 - object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 58, 7, 3, 17, 0, 0, 1, 2, Route123_EventScript_1F61DC, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, 12, 0, 0, 0, 65, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 5, 3, 12, 0, 0, 0, 72, BerryTreeScript, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 5, 3, 12, 0, 0, 0, 73, BerryTreeScript, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, 12, 0, 0, 0, 74, BerryTreeScript, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 3, 3, 12, 0, 0, 0, 79, BerryTreeScript, 0 - object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 3, 3, 12, 0, 0, 0, 14, BerryTreeScript, 0 - object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, 12, 0, 0, 0, 15, BerryTreeScript, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, 12, 0, 0, 0, 30, BerryTreeScript, 0 - object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 101, 13, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 17 - object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 14, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 18 - object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 9, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 19 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 8, 3, 1, 0, 0, 0, 0, Route123_EventScript_290FB0, 1032 - object_event 22, EVENT_OBJ_GFX_GIRL_3, 0, 108, 13, 3, 15, 0, 0, 0, 0, Route123_EventScript_1F6151, 0 - object_event 23, EVENT_OBJ_GFX_BERRY_TREE, 0, 109, 13, 3, 12, 0, 0, 0, 87, BerryTreeScript, 0 - object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 110, 13, 3, 12, 0, 0, 0, 88, BerryTreeScript, 0 - object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 111, 13, 3, 12, 0, 0, 0, 89, BerryTreeScript, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 9, 3, 23, 0, 0, 1, 2, Route123_EventScript_1F61F3, 0 - object_event 27, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62E9, 0 - object_event 28, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 37, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62CE, 0 - object_event 29, EVENT_OBJ_GFX_PSYCHIC_M, 0, 138, 12, 3, 9, 0, 0, 1, 7, Route123_EventScript_1F620A, 0 - object_event 30, EVENT_OBJ_GFX_LASS, 0, 49, 16, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F626C, 0 - object_event 31, EVENT_OBJ_GFX_HEX_MANIAC, 0, 87, 12, 3, 8, 0, 0, 1, 4, Route123_EventScript_1F6304, 0 - object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 18, 3, 1, 1, 1, 0, 0, Route123_EventScript_290FBD, 1104 - object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 9, 3, 1, 1, 1, 0, 0, Route123_EventScript_290FCA, 1109 - object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 138, 14, 3, 57, 1, 1, 1, 1, Route123_EventScript_1F6377, 0 - object_event 35, EVENT_OBJ_GFX_WOMAN_3, 0, 138, 16, 3, 7, 1, 1, 1, 1, Route123_EventScript_1F6360, 0 - object_event 36, EVENT_OBJ_GFX_MANIAC, 0, 87, 17, 3, 7, 1, 1, 1, 4, Route123_EventScript_1F6349, 0 - object_event 37, EVENT_OBJ_GFX_MAN_6, 0, 66, 16, 3, 8, 1, 1, 1, 2, Route123_EventScript_1F63BC, 0 - object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 66, 19, 3, 7, 1, 1, 1, 2, Route123_EventScript_1F6332, 0 - object_event 39, EVENT_OBJ_GFX_OLD_MAN_1, 0, 49, 19, 3, 7, 1, 1, 1, 2, Route123_EventScript_1F631B, 0 - object_event 40, EVENT_OBJ_GFX_ITEM_BALL, 0, 43, 15, 3, 1, 1, 1, 0, 0, Route123_EventScript_290FD7, 1152 - object_event 41, EVENT_OBJ_GFX_WOMAN_7, 0, 14, 16, 3, 7, 1, 1, 1, 3, Route123_EventScript_1F638E, 0 - object_event 42, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 12, 3, 26, 1, 3, 1, 3, Route123_EventScript_1F63A5, 0 - object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 57, 16, 3, 1, 1, 1, 0, 0, Route123_EventScript_290FE4, 1153 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 58, BerryTreeScript, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 59, BerryTreeScript, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 60, BerryTreeScript, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 61, BerryTreeScript, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 81, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 62, BerryTreeScript, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 82, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 63, BerryTreeScript, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 83, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 64, BerryTreeScript, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 70, 12, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 1, Route123_EventScript_1F61C5, 0 + object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 58, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 2, Route123_EventScript_1F61DC, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 65, BerryTreeScript, 0 + object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 72, BerryTreeScript, 0 + object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 73, BerryTreeScript, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 74, BerryTreeScript, 0 + object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 79, BerryTreeScript, 0 + object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 14, BerryTreeScript, 0 + object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 15, BerryTreeScript, 0 + object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 30, BerryTreeScript, 0 + object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 101, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, 17 + object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, 18 + object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, 19 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_290FB0, 1032 + object_event 22, EVENT_OBJ_GFX_GIRL_3, 0, 108, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 0, 0, Route123_EventScript_1F6151, 0 + object_event 23, EVENT_OBJ_GFX_BERRY_TREE, 0, 109, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 87, BerryTreeScript, 0 + object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 110, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 88, BerryTreeScript, 0 + object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 111, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 89, BerryTreeScript, 0 + object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 9, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route123_EventScript_1F61F3, 0 + object_event 27, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F62E9, 0 + object_event 28, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 37, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F62CE, 0 + object_event 29, EVENT_OBJ_GFX_PSYCHIC_M, 0, 138, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route123_EventScript_1F620A, 0 + object_event 30, EVENT_OBJ_GFX_LASS, 0, 49, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F626C, 0 + object_event 31, EVENT_OBJ_GFX_HEX_MANIAC, 0, 87, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route123_EventScript_1F6304, 0 + object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FBD, 1104 + object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FCA, 1109 + object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 138, 14, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 1, Route123_EventScript_1F6377, 0 + object_event 35, EVENT_OBJ_GFX_WOMAN_3, 0, 138, 16, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route123_EventScript_1F6360, 0 + object_event 36, EVENT_OBJ_GFX_MANIAC, 0, 87, 17, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route123_EventScript_1F6349, 0 + object_event 37, EVENT_OBJ_GFX_MAN_6, 0, 66, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, Route123_EventScript_1F63BC, 0 + object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 66, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route123_EventScript_1F6332, 0 + object_event 39, EVENT_OBJ_GFX_OLD_MAN_1, 0, 49, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route123_EventScript_1F631B, 0 + object_event 40, EVENT_OBJ_GFX_ITEM_BALL, 0, 43, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FD7, 1152 + object_event 41, EVENT_OBJ_GFX_WOMAN_7, 0, 14, 16, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route123_EventScript_1F638E, 0 + object_event 42, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 12, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 3, Route123_EventScript_1F63A5, 0 + object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 57, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FE4, 1153 Route123_MapWarps: @ 852C1C4 warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE diff --git a/data/maps/Route123_BerryMastersHouse/events.inc b/data/maps/Route123_BerryMastersHouse/events.inc index 3f47258701..c848f341ba 100644 --- a/data/maps/Route123_BerryMastersHouse/events.inc +++ b/data/maps/Route123_BerryMastersHouse/events.inc @@ -1,6 +1,6 @@ Route123_BerryMastersHouse_EventObjects: @ 853EACC - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F845, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F845, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0 Route123_BerryMastersHouse_MapWarps: @ 853EAFC warp_def 3, 7, 0, 0, MAP_ROUTE123 diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc index 2dc839783b..3e4ab27809 100644 --- a/data/maps/Route124/events.inc +++ b/data/maps/Route124/events.inc @@ -1,16 +1,16 @@ Route124_EventObjects: @ 852C3C4 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 34, 25, 1, 1, 5, 0, 1, 3, Route124_EventScript_1F6585, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 61, 74, 1, 67, 5, 3, 1, 7, Route124_EventScript_1F659C, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, 24, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 23, 1, 18, 6, 8, 1, 5, Route124_EventScript_1F6615, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 58, 1, 28, 7, 0, 1, 2, Route124_EventScript_1F662C, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, 1, 1, 1, 0, 0, Route124_EventScript_290FF1, 1092 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, 1, 1, 1, 0, 0, Route124_EventScript_290FFE, 1093 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, 1, 1, 1, 0, 0, Route124_EventScript_29100B, 1066 - object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, 8, 1, 1, 1, 1, Route124_EventScript_1F6643, 0 - object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, 8, 1, 1, 1, 1, Route124_EventScript_1F66A7, 0 - object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 29, 1, 7, 1, 1, 1, 5, Route124_EventScript_1F670B, 0 - object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 74, 1, 66, 1, 1, 1, 7, Route124_EventScript_1F6722, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 34, 25, 1, MOVEMENT_TYPE_LOOK_AROUND, 5, 0, 1, 3, Route124_EventScript_1F6585, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 61, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 5, 3, 1, 7, Route124_EventScript_1F659C, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 23, 1, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 6, 8, 1, 5, Route124_EventScript_1F6615, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 58, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 7, 0, 1, 2, Route124_EventScript_1F662C, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FF1, 1092 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FFE, 1093 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_29100B, 1066 + object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route124_EventScript_1F6643, 0 + object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route124_EventScript_1F66A7, 0 + object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 29, 1, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route124_EventScript_1F670B, 0 + object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route124_EventScript_1F6722, 0 Route124_MapWarps: @ 852C4E4 warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc index 606138e384..5294f6d713 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc @@ -1,5 +1,5 @@ Route124_DivingTreasureHuntersHouse_EventObjects: @ 853ED9C - object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 5, 4, 0, 9, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0 + object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0 Route124_DivingTreasureHuntersHouse_MapWarps: @ 853EDB4 warp_def 3, 8, 0, 0, MAP_ROUTE124 diff --git a/data/maps/Route125/events.inc b/data/maps/Route125/events.inc index b767e512d8..cb13b81fac 100644 --- a/data/maps/Route125/events.inc +++ b/data/maps/Route125/events.inc @@ -1,14 +1,14 @@ Route125_EventObjects: @ 852C50C - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 31, 1, 28, 0, 0, 1, 2, Route125_EventScript_1F67A4, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 9, 1, 10, 2, 5, 1, 2, Route125_EventScript_1F67BB, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 38, 24, 1, 28, 6, 0, 1, 3, Route125_EventScript_1F67D2, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 30, 28, 1, 52, 9, 9, 1, 3, Route125_EventScript_1F67E9, 0 - object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 21, 30, 3, 13, 0, 0, 1, 2, Route125_EventScript_1F6800, 0 - object_event 6, EVENT_OBJ_GFX_LASS, 0, 17, 19, 3, 8, 1, 1, 1, 1, Route125_EventScript_1F6862, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 18, 19, 3, 8, 1, 1, 1, 1, Route125_EventScript_1F687D, 0 - object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 43, 19, 3, 28, 2, 1, 1, 3, Route125_EventScript_1F6898, 0 - object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 48, 19, 3, 27, 2, 1, 1, 3, Route125_EventScript_1F68AF, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 46, 17, 3, 1, 1, 1, 0, 0, Route125_EventScript_291018, 1154 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 31, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 0, 0, 1, 2, Route125_EventScript_1F67A4, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 2, 5, 1, 2, Route125_EventScript_1F67BB, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 38, 24, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 3, Route125_EventScript_1F67D2, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 30, 28, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 9, 9, 1, 3, Route125_EventScript_1F67E9, 0 + object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 21, 30, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 2, Route125_EventScript_1F6800, 0 + object_event 6, EVENT_OBJ_GFX_LASS, 0, 17, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route125_EventScript_1F6862, 0 + object_event 7, EVENT_OBJ_GFX_LASS, 0, 18, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route125_EventScript_1F687D, 0 + object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 43, 19, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 2, 1, 1, 3, Route125_EventScript_1F6898, 0 + object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 48, 19, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 2, 1, 1, 3, Route125_EventScript_1F68AF, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 46, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route125_EventScript_291018, 1154 Route125_MapWarps: @ 852C5FC warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM diff --git a/data/maps/Route126/events.inc b/data/maps/Route126/events.inc index cf87bb74ed..0c3180a791 100644 --- a/data/maps/Route126/events.inc +++ b/data/maps/Route126/events.inc @@ -1,13 +1,13 @@ Route126_EventObjects: @ 852C648 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 51, 65, 1, 51, 10, 3, 1, 3, Route126_EventScript_1F68D6, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 22, 1, 28, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 63, 43, 1, 24, 0, 0, 1, 3, Route126_EventScript_1F6904, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 48, 1, 7, 0, 0, 1, 3, Route126_EventScript_1F691B, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 1, 3, 1, 1, 1, 0, 0, Route126_EventScript_291025, 1105 - object_event 6, EVENT_OBJ_GFX_SWIMMER_F, 0, 15, 66, 1, 66, 1, 1, 1, 7, Route126_EventScript_1F6960, 0 - object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 66, 1, 67, 1, 1, 1, 7, Route126_EventScript_1F6977, 0 - object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 5, 1, 66, 1, 1, 1, 7, Route126_EventScript_1F6949, 0 - object_event 9, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 5, 1, 67, 1, 1, 1, 7, Route126_EventScript_1F6932, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 51, 65, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 10, 3, 1, 3, Route126_EventScript_1F68D6, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 22, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 63, 43, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route126_EventScript_1F6904, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 48, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, Route126_EventScript_1F691B, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route126_EventScript_291025, 1105 + object_event 6, EVENT_OBJ_GFX_SWIMMER_F, 0, 15, 66, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route126_EventScript_1F6960, 0 + object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 66, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 1, 1, 1, 7, Route126_EventScript_1F6977, 0 + object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route126_EventScript_1F6949, 0 + object_event 9, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 1, 1, 1, 7, Route126_EventScript_1F6932, 0 Route126_MapEvents:: @ 852C720 map_events Route126_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route127/events.inc b/data/maps/Route127/events.inc index b7c378a965..8f5fffa719 100644 --- a/data/maps/Route127/events.inc +++ b/data/maps/Route127/events.inc @@ -1,15 +1,15 @@ Route127_EventObjects: @ 852C734 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 42, 1, 14, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 68, 1, 21, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, 1, 0, 0, 0, 0, Route127_EventScript_291032, 1034 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, 1, 0, 0, 0, 0, Route127_EventScript_29103F, 1035 - object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 21, 3, 9, 1, 1, 1, 0, Route127_EventScript_1F6A63, 0 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 19, 3, 10, 1, 1, 1, 0, Route127_EventScript_1F6A91, 0 - object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 54, 14, 3, 7, 1, 1, 1, 0, Route127_EventScript_1F6A7A, 0 - object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 15, 23, 3, 9, 1, 1, 1, 2, Route127_EventScript_1F6AA8, 0 - object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 63, 3, 1, 1, 1, 1, 3, Route127_EventScript_1F6AD6, 0 - object_event 10, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 23, 3, 10, 1, 1, 1, 2, Route127_EventScript_1F6ABF, 0 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, 1, 0, 0, 0, 0, Route127_EventScript_29104C, 1155 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 42, 1, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 68, 1, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_291032, 1034 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29103F, 1035 + object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 0, Route127_EventScript_1F6A63, 0 + object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 0, Route127_EventScript_1F6A91, 0 + object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 54, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route127_EventScript_1F6A7A, 0 + object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 15, 23, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, Route127_EventScript_1F6AA8, 0 + object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 63, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 3, Route127_EventScript_1F6AD6, 0 + object_event 10, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, Route127_EventScript_1F6ABF, 0 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29104C, 1155 Route127_MapBGEvents: @ 852C83C bg_event 59, 67, 0, 8, 0, ITEM_ENERGY_ROOT, 0, 0 diff --git a/data/maps/Route128/events.inc b/data/maps/Route128/events.inc index c34f6eb16d..c4b1710faa 100644 --- a/data/maps/Route128/events.inc +++ b/data/maps/Route128/events.inc @@ -1,14 +1,14 @@ Route128_EventObjects: @ 852C88C - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 33, 1, 48, 5, 5, 1, 3, Route128_EventScript_1F6CBE, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 78, 24, 1, 28, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0 - object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, 8, 0, 0, 0, 0, 0x0, 834 - object_event 4, EVENT_OBJ_GFX_ARCHIE, 0, 37, 22, 3, 9, 1, 1, 0, 0, 0x0, 944 - object_event 5, EVENT_OBJ_GFX_MAXIE, 0, 38, 21, 3, 7, 1, 1, 0, 0, 0x0, 945 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 63, 28, 3, 7, 1, 1, 1, 0, Route128_EventScript_1F6DB0, 0 - object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 47, 9, 3, 10, 1, 1, 1, 3, Route128_EventScript_1F6D99, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 24, 8, 3, 17, 1, 1, 1, 3, Route128_EventScript_1F6D82, 0 - object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 101, 29, 1, 25, 1, 3, 1, 4, Route128_EventScript_1F6DDE, 0 - object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 101, 22, 1, 26, 1, 3, 1, 4, Route128_EventScript_1F6DC7, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 33, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN, 5, 5, 1, 3, Route128_EventScript_1F6CBE, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 78, 24, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0 + object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 834 + object_event 4, EVENT_OBJ_GFX_ARCHIE, 0, 37, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 944 + object_event 5, EVENT_OBJ_GFX_MAXIE, 0, 38, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 945 + object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 63, 28, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route128_EventScript_1F6DB0, 0 + object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 47, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route128_EventScript_1F6D99, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 24, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, Route128_EventScript_1F6D82, 0 + object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 101, 29, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 4, Route128_EventScript_1F6DDE, 0 + object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 101, 22, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 4, Route128_EventScript_1F6DC7, 0 Route128_MapBGEvents: @ 852C97C bg_event 49, 9, 3, 7, 0, ITEM_HEART_SCALE, 92, 0 diff --git a/data/maps/Route129/events.inc b/data/maps/Route129/events.inc index 7c1425ebe8..c127ec5e3b 100644 --- a/data/maps/Route129/events.inc +++ b/data/maps/Route129/events.inc @@ -1,9 +1,9 @@ Route129_EventObjects: @ 852C9B4 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 28, 16, 1, 50, 3, 4, 1, 3, Route129_EventScript_1F72EC, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 14, 1, 52, 5, 2, 1, 2, Route129_EventScript_1F7303, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 22, 1, 64, 1, 1, 1, 5, Route129_EventScript_1F7331, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 9, 1, 24, 1, 1, 1, 2, Route129_EventScript_1F731A, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 27, 1, 65, 1, 1, 1, 5, Route129_EventScript_1F7348, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 28, 16, 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 4, 1, 3, Route129_EventScript_1F72EC, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 14, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 5, 2, 1, 2, Route129_EventScript_1F7303, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 22, 1, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 1, 1, 1, 5, Route129_EventScript_1F7331, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 9, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, Route129_EventScript_1F731A, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 27, 1, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 1, 1, 1, 5, Route129_EventScript_1F7348, 0 Route129_MapEvents:: @ 852CA2C map_events Route129_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route130/events.inc b/data/maps/Route130/events.inc index ad14295535..227e359b6d 100644 --- a/data/maps/Route130/events.inc +++ b/data/maps/Route130/events.inc @@ -1,8 +1,8 @@ Route130_EventObjects: @ 852CA40 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 70, 21, 1, 51, 3, 6, 1, 3, Route130_EventScript_1F73BF, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 21, 1, 26, 1, 4, 1, 5, Route130_EventScript_1F73D6, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, 12, 0, 0, 0, 82, BerryTreeScript, 17 - object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 30, 1, 25, 1, 4, 1, 5, Route130_EventScript_1F73ED, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 70, 21, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 3, 6, 1, 3, Route130_EventScript_1F73BF, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 21, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 5, Route130_EventScript_1F73D6, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 82, BerryTreeScript, 17 + object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 30, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 4, 1, 5, Route130_EventScript_1F73ED, 0 Route130_MapEvents:: @ 852CAA0 map_events Route130_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route131/events.inc b/data/maps/Route131/events.inc index 2bb2c5cbc7..1c321a6cb3 100644 --- a/data/maps/Route131/events.inc +++ b/data/maps/Route131/events.inc @@ -1,12 +1,12 @@ Route131_EventObjects: @ 852CAB4 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 32, 1, 29, 5, 7, 1, 3, Route131_EventScript_1F7429, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 19, 1, 22, 0, 7, 1, 4, Route131_EventScript_1F7440, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 22, 1, 20, 6, 0, 1, 4, Route131_EventScript_1F7457, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 31, 25, 1, 47, 3, 5, 1, 3, Route131_EventScript_1F746E, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 16, 1, 8, 1, 1, 1, 1, Route131_EventScript_1F7485, 0 - object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 8, 16, 1, 8, 1, 1, 1, 1, Route131_EventScript_1F74A0, 0 - object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 20, 1, 26, 1, 3, 1, 5, Route131_EventScript_1F74D2, 0 - object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 52, 27, 1, 25, 1, 3, 1, 5, Route131_EventScript_1F74BB, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 32, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN, 5, 7, 1, 3, Route131_EventScript_1F7429, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 19, 1, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 7, 1, 4, Route131_EventScript_1F7440, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 22, 1, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 6, 0, 1, 4, Route131_EventScript_1F7457, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 31, 25, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP, 3, 5, 1, 3, Route131_EventScript_1F746E, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 16, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route131_EventScript_1F7485, 0 + object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 8, 16, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route131_EventScript_1F74A0, 0 + object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 20, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 5, Route131_EventScript_1F74D2, 0 + object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 52, 27, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 5, Route131_EventScript_1F74BB, 0 Route131_MapWarps: @ 852CB74 warp_def 36, 6, 3, 0, MAP_SKY_PILLAR_ENTRANCE diff --git a/data/maps/Route132/events.inc b/data/maps/Route132/events.inc index 19ff5ccc85..7d62fb3064 100644 --- a/data/maps/Route132/events.inc +++ b/data/maps/Route132/events.inc @@ -1,14 +1,14 @@ Route132_EventObjects: @ 852CB90 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 40, 13, 1, 46, 3, 3, 1, 2, Route132_EventScript_1F74EA, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 6, 1, 45, 3, 3, 1, 2, Route132_EventScript_1F7501, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, 1, 0, 0, 0, 0, Route132_EventScript_291059, 1036 - object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 15, 3, 8, 0, 0, 1, 4, Route132_EventScript_1F752F, 0 - object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 49, 28, 3, 10, 0, 0, 1, 1, Route132_EventScript_1F7518, 0 - object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 33, 26, 3, 8, 1, 1, 1, 4, Route132_EventScript_1F7546, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 33, 31, 3, 25, 1, 4, 1, 4, Route132_EventScript_1F755D, 0 - object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 21, 30, 3, 7, 1, 1, 1, 4, Route132_EventScript_1F758B, 0 - object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 21, 25, 3, 26, 1, 4, 1, 4, Route132_EventScript_1F7574, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 27, 3, 1, 1, 1, 0, 0, Route132_EventScript_291066, 1156 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 40, 13, 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 3, 3, 1, 2, Route132_EventScript_1F74EA, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 6, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 3, 3, 1, 2, Route132_EventScript_1F7501, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route132_EventScript_291059, 1036 + object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route132_EventScript_1F752F, 0 + object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 49, 28, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route132_EventScript_1F7518, 0 + object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 33, 26, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route132_EventScript_1F7546, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 33, 31, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 4, 1, 4, Route132_EventScript_1F755D, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 21, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route132_EventScript_1F758B, 0 + object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 21, 25, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 4, Route132_EventScript_1F7574, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route132_EventScript_291066, 1156 Route132_MapEvents:: @ 852CC80 map_events Route132_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route133/events.inc b/data/maps/Route133/events.inc index 6adfce330d..ba1ac2ac04 100644 --- a/data/maps/Route133/events.inc +++ b/data/maps/Route133/events.inc @@ -1,14 +1,14 @@ Route133_EventObjects: @ 852CC94 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 68, 27, 1, 25, 0, 2, 1, 3, Route133_EventScript_1F75A3, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 3, 1, 8, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 28, 1, 26, 0, 2, 1, 3, Route133_EventScript_1F75BA, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 12, 3, 1, 0, 0, 0, 0, Route133_EventScript_291073, 1037 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route133_EventScript_291080, 1038 - object_event 6, EVENT_OBJ_GFX_MAN_6, 0, 7, 14, 3, 18, 1, 1, 1, 2, Route133_EventScript_1F75FF, 0 - object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 37, 15, 3, 18, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0 - object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 56, 11, 3, 8, 1, 1, 1, 3, Route133_EventScript_1F7616, 0 - object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 56, 15, 3, 16, 1, 1, 1, 3, Route133_EventScript_1F762D, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 48, 28, 3, 1, 1, 1, 0, 0, Route133_EventScript_29108D, 1157 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 68, 27, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 2, 1, 3, Route133_EventScript_1F75A3, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 3, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 28, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 2, 1, 3, Route133_EventScript_1F75BA, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291073, 1037 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291080, 1038 + object_event 6, EVENT_OBJ_GFX_MAN_6, 0, 7, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 2, Route133_EventScript_1F75FF, 0 + object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 37, 15, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 56, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route133_EventScript_1F7616, 0 + object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 56, 15, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, Route133_EventScript_1F762D, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 48, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route133_EventScript_29108D, 1157 Route133_MapEvents:: @ 852CD84 map_events Route133_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route134/events.inc b/data/maps/Route134/events.inc index 5a2d574176..03339b0811 100644 --- a/data/maps/Route134/events.inc +++ b/data/maps/Route134/events.inc @@ -1,15 +1,15 @@ Route134_EventObjects: @ 852CD98 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 49, 9, 1, 49, 3, 5, 1, 2, Route134_EventScript_1F7653, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 58, 7, 1, 1, 0, 0, 1, 3, Route134_EventScript_1F766A, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 41, 23, 3, 10, 0, 0, 1, 2, Route134_EventScript_1F7698, 0 - object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 24, 23, 3, 26, 0, 3, 1, 6, Route134_EventScript_1F7681, 0 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 49, 16, 3, 27, 6, 0, 1, 5, Route134_EventScript_1F76AF, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 43, 23, 1, 9, 1, 1, 1, 2, Route134_EventScript_1F76F4, 0 - object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 24, 30, 3, 25, 0, 3, 1, 6, Route134_EventScript_1F770B, 0 - object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 50, 16, 3, 28, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0 - object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 63, 14, 3, 18, 1, 1, 1, 3, Route134_EventScript_1F76C6, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, 1, 1, 1, 0, 0, Route134_EventScript_29109A, 1158 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, 1, 1, 1, 0, 0, Route134_EventScript_2910A7, 1159 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 49, 9, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, 3, 5, 1, 2, Route134_EventScript_1F7653, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 58, 7, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route134_EventScript_1F766A, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 41, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route134_EventScript_1F7698, 0 + object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 24, 23, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 3, 1, 6, Route134_EventScript_1F7681, 0 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 49, 16, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 6, 0, 1, 5, Route134_EventScript_1F76AF, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 43, 23, 1, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, Route134_EventScript_1F76F4, 0 + object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 24, 30, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 3, 1, 6, Route134_EventScript_1F770B, 0 + object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 50, 16, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0 + object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 63, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route134_EventScript_1F76C6, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_29109A, 1158 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_2910A7, 1159 Route134_MapEvents:: @ 852CEA0 map_events Route134_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc index b71bdb875e..4c70edf340 100644 --- a/data/maps/RustboroCity/events.inc +++ b/data/maps/RustboroCity/events.inc @@ -1,20 +1,20 @@ RustboroCity_EventObjects: @ 85267E0 - object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 22, 34, 3, 3, 0, 1, 0, 0, RustboroCity_EventScript_1E088A, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 13, 3, 1, 1, 1, 0, 0, RustboroCity_EventScript_1E085F, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 25, 37, 3, 7, 0, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 21, 46, 3, 3, 0, 1, 0, 0, RustboroCity_EventScript_1E08D1, 0 - object_event 5, EVENT_OBJ_GFX_BOY_2, 0, 12, 45, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_1E08B2, 0 - object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 26, 23, 3, 1, 1, 1, 0, 0, RustboroCity_EventScript_1E0893, 0 - object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 24, 51, 3, 10, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0 - object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 25, 51, 3, 9, 0, 0, 0, 0, RustboroCity_EventScript_1E0938, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, 10, 1, 1, 0, 0, RustboroCity_EventScript_1E0ADD, 732 - object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 21, 3, 10, 0, 0, 0, 0, 0x0, 731 - object_event 11, EVENT_OBJ_GFX_MAN_7, 0, 13, 34, 3, 2, 1, 1, 0, 0, RustboroCity_EventScript_1E087E, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, 1041 - object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 19, 27, 3, 8, 0, 1, 0, 0, RustboroCity_EventScript_1E094E, 0 - object_event 14, EVENT_OBJ_GFX_HIPSTER, 0, 16, 50, 3, 1, 1, 1, 0, 0, RustboroCity_EventScript_1E0DB8, 814 - object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 11, 15, 0, 1, 1, 1, 0, 0, 0x0, 844 - object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 31, 36, 3, 1, 0, 1, 0, 0, RustboroCity_EventScript_1E1236, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 22, 34, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E088A, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E085F, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 25, 37, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 21, 46, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E08D1, 0 + object_event 5, EVENT_OBJ_GFX_BOY_2, 0, 12, 45, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_1E08B2, 0 + object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 26, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0893, 0 + object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 24, 51, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0 + object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 25, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_EventScript_1E0938, 0 + object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, RustboroCity_EventScript_1E0ADD, 732 + object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 21, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 731 + object_event 11, EVENT_OBJ_GFX_MAN_7, 0, 13, 34, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E087E, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, 1041 + object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 19, 27, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E094E, 0 + object_event 14, EVENT_OBJ_GFX_HIPSTER, 0, 16, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0DB8, 814 + object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 11, 15, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 844 + object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 31, 36, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 1, 0, 0, RustboroCity_EventScript_1E1236, 0 RustboroCity_MapWarps: @ 8526960 warp_def 27, 19, 0, 0, MAP_RUSTBORO_CITY_GYM diff --git a/data/maps/RustboroCity_CuttersHouse/events.inc b/data/maps/RustboroCity_CuttersHouse/events.inc index db9b6f56db..6657c9305d 100644 --- a/data/maps/RustboroCity_CuttersHouse/events.inc +++ b/data/maps/RustboroCity_CuttersHouse/events.inc @@ -1,6 +1,6 @@ RustboroCity_CuttersHouse_EventObjects: @ 8530A1C - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 7, 5, 3, 10, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215BD4, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 9, 2, 3, 5, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215C0A, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215BD4, 0 + object_event 2, EVENT_OBJ_GFX_LASS, 0, 9, 2, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215C0A, 0 RustboroCity_CuttersHouse_MapWarps: @ 8530A4C warp_def 5, 8, 0, 8, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_DevonCorp_1F/events.inc b/data/maps/RustboroCity_DevonCorp_1F/events.inc index c6d4048c41..260d64a0de 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/events.inc @@ -1,7 +1,7 @@ RustboroCity_DevonCorp_1F_EventObjects: @ 853037C - object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 2, 6, 3, 2, 1, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211261, 0 - object_event 2, EVENT_OBJ_GFX_MAN_7, 0, 15, 5, 3, 2, 2, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211293, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 5, 3, 3, 8, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0 + object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 2, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211261, 0 + object_event 2, EVENT_OBJ_GFX_MAN_7, 0, 15, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211293, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0 RustboroCity_DevonCorp_1F_MapWarps: @ 85303C4 warp_def 5, 8, 0, 5, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_DevonCorp_2F/events.inc b/data/maps/RustboroCity_DevonCorp_2F/events.inc index 31a3d1de67..f10c947805 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/events.inc @@ -1,10 +1,10 @@ RustboroCity_DevonCorp_2F_EventObjects: @ 8530408 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, 7, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_21186F, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211886, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, 15, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118B0, 0 - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 5, 3, 7, 0, 10, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118DA, 0 - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 8, 3, 7, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118F1, 0 - object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 5, 3, 7, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211BCF, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_21186F, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211886, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118B0, 0 + object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 10, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118DA, 0 + object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118F1, 0 + object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211BCF, 0 RustboroCity_DevonCorp_2F_MapWarps: @ 8530498 warp_def 14, 1, 0, 2, MAP_RUSTBORO_CITY_DEVON_CORP_1F diff --git a/data/maps/RustboroCity_DevonCorp_3F/events.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc index 8db3c085cd..0c655b8145 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/events.inc @@ -1,7 +1,7 @@ RustboroCity_DevonCorp_3F_EventObjects: @ 85304BC - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 5, 3, 9, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 - object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, 949 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 15, 5, 3, 76, 1, 1, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 + object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, 949 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 15, 5, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 RustboroCity_DevonCorp_3F_MapWarps: @ 8530504 warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F diff --git a/data/maps/RustboroCity_Flat1_1F/events.inc b/data/maps/RustboroCity_Flat1_1F/events.inc index 1f2ae85fd6..d52b495eb6 100644 --- a/data/maps/RustboroCity_Flat1_1F/events.inc +++ b/data/maps/RustboroCity_Flat1_1F/events.inc @@ -1,6 +1,6 @@ RustboroCity_Flat1_1F_EventObjects: @ 8530890 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 9, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150CE, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150CE, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0 RustboroCity_Flat1_1F_MapWarps: @ 85308C0 warp_def 6, 7, 0, 1, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_Flat1_2F/events.inc b/data/maps/RustboroCity_Flat1_2F/events.inc index 647e7a437c..13ebbbc0d5 100644 --- a/data/maps/RustboroCity_Flat1_2F/events.inc +++ b/data/maps/RustboroCity_Flat1_2F/events.inc @@ -1,12 +1,12 @@ RustboroCity_Flat1_2F_EventObjects: @ 85308EC - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 6, 3, 5, 3, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_21523D, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 5, 3, 8, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_SKITTY_DOLL, 0, 9, 4, 3, 1, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 - object_event 4, EVENT_OBJ_GFX_TREECKO_DOLL, 0, 10, 5, 3, 1, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 - object_event 5, EVENT_OBJ_GFX_TORCHIC_DOLL, 0, 10, 6, 3, 1, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 8, 5, 3, 10, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_21513A, 0 - object_event 7, EVENT_OBJ_GFX_MUDKIP_DOLL, 0, 8, 6, 3, 1, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 - object_event 8, EVENT_OBJ_GFX_PIKACHU_DOLL, 0, 9, 7, 3, 1, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 3, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_21523D, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_SKITTY_DOLL, 0, 9, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 + object_event 4, EVENT_OBJ_GFX_TREECKO_DOLL, 0, 10, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 + object_event 5, EVENT_OBJ_GFX_TORCHIC_DOLL, 0, 10, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 + object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_21513A, 0 + object_event 7, EVENT_OBJ_GFX_MUDKIP_DOLL, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 + object_event 8, EVENT_OBJ_GFX_PIKACHU_DOLL, 0, 9, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 RustboroCity_Flat1_2F_MapWarps: @ 85309AC warp_def 2, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT1_1F diff --git a/data/maps/RustboroCity_Flat2_1F/events.inc b/data/maps/RustboroCity_Flat2_1F/events.inc index 392f5b1fa8..16c79649a6 100644 --- a/data/maps/RustboroCity_Flat2_1F/events.inc +++ b/data/maps/RustboroCity_Flat2_1F/events.inc @@ -1,6 +1,6 @@ RustboroCity_Flat2_1F_EventObjects: @ 8530AC4 - object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 11, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F80, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 8, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0 + object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F80, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0 RustboroCity_Flat2_1F_MapWarps: @ 8530AF4 warp_def 2, 8, 0, 10, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_Flat2_2F/events.inc b/data/maps/RustboroCity_Flat2_2F/events.inc index 9914eed3c7..559c6e6e0b 100644 --- a/data/maps/RustboroCity_Flat2_2F/events.inc +++ b/data/maps/RustboroCity_Flat2_2F/events.inc @@ -1,6 +1,6 @@ RustboroCity_Flat2_2F_EventObjects: @ 8530B20 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FD8, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FE1, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FD8, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FE1, 0 RustboroCity_Flat2_2F_MapWarps: @ 8530B50 warp_def 3, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT2_1F diff --git a/data/maps/RustboroCity_Flat2_3F/events.inc b/data/maps/RustboroCity_Flat2_3F/events.inc index 4a67fdc472..71d03ddb1c 100644 --- a/data/maps/RustboroCity_Flat2_3F/events.inc +++ b/data/maps/RustboroCity_Flat2_3F/events.inc @@ -1,6 +1,6 @@ RustboroCity_Flat2_3F_EventObjects: @ 8530B74 - object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216117, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 12, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216120, 0 + object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216117, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216120, 0 RustboroCity_Flat2_3F_MapWarps: @ 8530BA4 warp_def 1, 1, 0, 1, MAP_RUSTBORO_CITY_FLAT2_2F diff --git a/data/maps/RustboroCity_Gym/events.inc b/data/maps/RustboroCity_Gym/events.inc index 193c416855..8d69717968 100644 --- a/data/maps/RustboroCity_Gym/events.inc +++ b/data/maps/RustboroCity_Gym/events.inc @@ -1,9 +1,9 @@ RustboroCity_Gym_EventObjects: @ 8530538 - object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 5, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_212F31, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 13, 3, 8, 0, 0, 1, 2, RustboroCity_Gym_EventScript_212FE3, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 3, 9, 3, 9, 0, 0, 1, 3, RustboroCity_Gym_EventScript_212FFA, 0 - object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 3, 18, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_213028, 0 - object_event 5, EVENT_OBJ_GFX_HIKER, 0, 1, 6, 3, 8, 1, 1, 1, 3, RustboroCity_Gym_EventScript_213011, 0 + object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Gym_EventScript_212F31, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, RustboroCity_Gym_EventScript_212FE3, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 3, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, RustboroCity_Gym_EventScript_212FFA, 0 + object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 3, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Gym_EventScript_213028, 0 + object_event 5, EVENT_OBJ_GFX_HIKER, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, RustboroCity_Gym_EventScript_213011, 0 RustboroCity_Gym_MapWarps: @ 85305B0 warp_def 5, 19, 0, 0, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_House1/events.inc b/data/maps/RustboroCity_House1/events.inc index 1d2b2d0b7c..2fc0284a92 100644 --- a/data/maps/RustboroCity_House1/events.inc +++ b/data/maps/RustboroCity_House1/events.inc @@ -1,6 +1,6 @@ RustboroCity_House1_EventObjects: @ 85309C8 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 6, 4, 3, 9, 0, 0, 0, 0, RustboroCity_House1_EventScript_21593F, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 9, 2, 3, 8, 0, 0, 0, 0, RustboroCity_House1_EventScript_2159DF, 0 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_House1_EventScript_21593F, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House1_EventScript_2159DF, 0 RustboroCity_House1_MapWarps: @ 85309F8 warp_def 5, 7, 0, 7, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_House2/events.inc b/data/maps/RustboroCity_House2/events.inc index 3a4e5e15ea..5c5ab205e7 100644 --- a/data/maps/RustboroCity_House2/events.inc +++ b/data/maps/RustboroCity_House2/events.inc @@ -1,6 +1,6 @@ RustboroCity_House2_EventObjects: @ 8530A70 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EB4, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 5, 3, 7, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EB4, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0 RustboroCity_House2_MapWarps: @ 8530AA0 warp_def 5, 8, 0, 9, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_House3/events.inc b/data/maps/RustboroCity_House3/events.inc index 07234fc2e1..2fc6a6233b 100644 --- a/data/maps/RustboroCity_House3/events.inc +++ b/data/maps/RustboroCity_House3/events.inc @@ -1,7 +1,7 @@ RustboroCity_House3_EventObjects: @ 8530BC0 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 4, 5, 3, 10, 0, 0, 0, 0, RustboroCity_House3_EventScript_216191, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 5, 3, 9, 0, 0, 0, 0, RustboroCity_House3_EventScript_21619A, 0 - object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House3_EventScript_2161A3, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_House3_EventScript_216191, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_House3_EventScript_21619A, 0 + object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House3_EventScript_2161A3, 0 RustboroCity_House3_MapWarps: @ 8530C08 warp_def 5, 8, 0, 11, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_Mart/events.inc b/data/maps/RustboroCity_Mart/events.inc index 038d13bf7e..683ed5ff7c 100644 --- a/data/maps/RustboroCity_Mart/events.inc +++ b/data/maps/RustboroCity_Mart/events.inc @@ -1,8 +1,8 @@ RustboroCity_Mart_EventObjects: @ 853080C - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F06, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 2, 5, 3, 7, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F7D, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 4, 3, 3, 0, 1, 0, 0, RustboroCity_Mart_EventScript_214F74, 0 - object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 8, 2, 3, 7, 1, 1, 0, 0, RustboroCity_Mart_EventScript_214F86, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F06, 0 + object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F7D, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_Mart_EventScript_214F74, 0 + object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_Mart_EventScript_214F86, 0 RustboroCity_Mart_MapWarps: @ 853086C warp_def 3, 7, 0, 2, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_PokemonCenter_1F/events.inc b/data/maps/RustboroCity_PokemonCenter_1F/events.inc index e2945f4350..597eace15a 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/events.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ RustboroCity_PokemonCenter_1F_EventObjects: @ 85306F4 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D76, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 11, 2, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D84, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 3, 4, 3, 2, 1, 1, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D8D, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D96, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D76, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D84, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D8D, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D96, 0 RustboroCity_PokemonCenter_1F_MapWarps: @ 8530754 warp_def 7, 8, 3, 3, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_PokemonCenter_2F/events.inc b/data/maps/RustboroCity_PokemonCenter_2F/events.inc index d1ec1adb9e..f1f9fe3560 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 diff --git a/data/maps/RustboroCity_PokemonSchool/events.inc b/data/maps/RustboroCity_PokemonSchool/events.inc index 2deabdb5c5..0fdcca3c8b 100644 --- a/data/maps/RustboroCity_PokemonSchool/events.inc +++ b/data/maps/RustboroCity_PokemonSchool/events.inc @@ -1,11 +1,11 @@ RustboroCity_PokemonSchool_EventObjects: @ 85305EC - object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 8, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0 - object_event 2, EVENT_OBJ_GFX_BOY_5, 0, 9, 6, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0 - object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 3, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F71, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F7A, 0 - object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 3, 6, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F83, 0 - object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 5, 3, 3, 8, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0 - object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 10, 0, 7, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, 999 + object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0 + object_event 2, EVENT_OBJ_GFX_BOY_5, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F71, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F7A, 0 + object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 3, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F83, 0 + object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0 + object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 10, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, 999 RustboroCity_PokemonSchool_MapWarps: @ 8530694 warp_def 5, 10, 0, 4, MAP_RUSTBORO_CITY diff --git a/data/maps/RusturfTunnel/events.inc b/data/maps/RusturfTunnel/events.inc index e294e200e8..c56a5b5ee2 100644 --- a/data/maps/RusturfTunnel/events.inc +++ b/data/maps/RusturfTunnel/events.inc @@ -1,14 +1,14 @@ RusturfTunnel_EventObjects: @ 85341C4 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, 10, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, 807 - object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 931 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, 1048 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, 1049 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, 10, 0, 0, 0, 0, 0x0, 879 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 5, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, 878 - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, 880 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, 8, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 932 - object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 13, 3, 9, 1, 1, 1, 3, RusturfTunnel_EventScript_22D1B1, 0 - object_event 10, EVENT_OBJ_GFX_WOMAN_3, 0, 25, 4, 3, 9, 1, 1, 0, 0, RusturfTunnel_EventScript_22CE5F, 983 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, 807 + object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 931 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, 1048 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, 1049 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 879 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, 878 + object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, 880 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 932 + object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, RusturfTunnel_EventScript_22D1B1, 0 + object_event 10, EVENT_OBJ_GFX_WOMAN_3, 0, 25, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, RusturfTunnel_EventScript_22CE5F, 983 RusturfTunnel_MapWarps: @ 85342B4 warp_def 4, 10, 3, 0, MAP_ROUTE116 diff --git a/data/maps/SSTidalCorridor/events.inc b/data/maps/SSTidalCorridor/events.inc index 8f0b1de77e..22827aca37 100644 --- a/data/maps/SSTidalCorridor/events.inc +++ b/data/maps/SSTidalCorridor/events.inc @@ -1,9 +1,9 @@ SSTidalCorridor_EventObjects: @ 853A158 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 11, 3, 7, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, 3, 0, 2, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 2, 3, 8, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0D9, 950 - object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, 1, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0E2, 950 - object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 9, 10, 3, 9, 0, 0, 0, 0, 0x0, 810 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0D9, 950 + object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0E2, 950 + object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 810 SSTidalCorridor_MapWarps: @ 853A1D0 warp_def 4, 9, 3, 0, MAP_SS_TIDAL_ROOMS diff --git a/data/maps/SSTidalLowerDeck/events.inc b/data/maps/SSTidalLowerDeck/events.inc index 969830d370..9722e1df18 100644 --- a/data/maps/SSTidalLowerDeck/events.inc +++ b/data/maps/SSTidalLowerDeck/events.inc @@ -1,6 +1,6 @@ SSTidalLowerDeck_EventObjects: @ 853A2BC - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 10, 4, 3, 46, 4, 4, 1, 3, SSTidalLowerDeck_EventScript_23C819, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 7, 4, 3, 50, 7, 4, 1, 3, SSTidalLowerDeck_EventScript_23C830, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 10, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 4, 4, 1, 3, SSTidalLowerDeck_EventScript_23C819, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 7, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 7, 4, 1, 3, SSTidalLowerDeck_EventScript_23C830, 0 SSTidalLowerDeck_MapWarps: @ 853A2EC warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR diff --git a/data/maps/SSTidalRooms/events.inc b/data/maps/SSTidalRooms/events.inc index a9900294cf..0e038f0f9c 100644 --- a/data/maps/SSTidalRooms/events.inc +++ b/data/maps/SSTidalRooms/events.inc @@ -1,12 +1,12 @@ SSTidalRooms_EventObjects: @ 853A314 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 7, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA49, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 34, 11, 3, 9, 0, 0, 1, 3, SSTidalRooms_EventScript_23CA60, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 21, 5, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA77, 0 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 5, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CA8E, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CAA9, 0 - object_event 6, EVENT_OBJ_GFX_BOY_4, 0, 22, 11, 3, 8, 1, 1, 1, 3, SSTidalRooms_EventScript_23CAC4, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 6, 3, 9, 0, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 5, 3, 7, 1, 1, 0, 0, SSTidalRooms_EventScript_23C9F2, 951 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA49, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 34, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, SSTidalRooms_EventScript_23CA60, 0 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 21, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA77, 0 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 5, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, SSTidalRooms_EventScript_23CA8E, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, SSTidalRooms_EventScript_23CAA9, 0 + object_event 6, EVENT_OBJ_GFX_BOY_4, 0, 22, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, SSTidalRooms_EventScript_23CAC4, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0 + object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SSTidalRooms_EventScript_23C9F2, 951 SSTidalRooms_MapWarps: @ 853A3D4 warp_def 4, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR diff --git a/data/maps/SafariZone_North/events.inc b/data/maps/SafariZone_North/events.inc index 88b41669bd..1057b4ecd4 100644 --- a/data/maps/SafariZone_North/events.inc +++ b/data/maps/SafariZone_North/events.inc @@ -1,13 +1,13 @@ SafariZone_North_EventObjects: @ 853B160 - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 22, 9, 3, 2, 1, 1, 0, 0, SafariZone_North_EventScript_23D254, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 6, 29, 3, 2, 1, 1, 0, 0, SafariZone_North_EventScript_23D25D, 0 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 10, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 17 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 13, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 18 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 14, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 19 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 6, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 20 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 7, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 21 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 7, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 22 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2912C9, 1119 + object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 22, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_23D254, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 6, 29, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_23D25D, 0 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 17 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 18 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 19 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 20 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 21 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 22 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2912C9, 1119 SafariZone_North_MapEvents:: @ 853B238 map_events SafariZone_North_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SafariZone_Northeast/events.inc b/data/maps/SafariZone_Northeast/events.inc index e71ba4dd51..38f59ff13e 100644 --- a/data/maps/SafariZone_Northeast/events.inc +++ b/data/maps/SafariZone_Northeast/events.inc @@ -1,13 +1,13 @@ SafariZone_Northeast_EventObjects: @ 853B968 - object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 8, 20, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3C6, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 30, 22, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3D8, 0 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 11, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 21 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 35, 0, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3CF, 0 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 13, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 19 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 7, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 17 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 10, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 20 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 8, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 18 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2912E3, 1169 + object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 8, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3C6, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 30, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3D8, 0 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 21 + object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 35, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3CF, 0 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 19 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 17 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 20 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 18 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2912E3, 1169 SafariZone_Northeast_MapBGEvents: @ 853BA40 bg_event 31, 35, 3, 7, 0, ITEM_RARE_CANDY, 106, 0 diff --git a/data/maps/SafariZone_Northwest/events.inc b/data/maps/SafariZone_Northwest/events.inc index 8e5b242b9b..c43db41259 100644 --- a/data/maps/SafariZone_Northwest/events.inc +++ b/data/maps/SafariZone_Northwest/events.inc @@ -1,6 +1,6 @@ SafariZone_Northwest_EventObjects: @ 853B11C - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 8, 8, 5, 8, 0, 0, 0, 0, SafariZone_Northwest_EventScript_23D24A, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 7, 3, 1, 1, 1, 0, 0, SafariZone_Northwest_EventScript_2912BC, 1094 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 8, 8, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Northwest_EventScript_23D24A, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northwest_EventScript_2912BC, 1094 SafariZone_Northwest_MapEvents:: @ 853B14C map_events SafariZone_Northwest_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SafariZone_RestHouse/events.inc b/data/maps/SafariZone_RestHouse/events.inc index 0607ffcc75..5a54de9611 100644 --- a/data/maps/SafariZone_RestHouse/events.inc +++ b/data/maps/SafariZone_RestHouse/events.inc @@ -1,7 +1,7 @@ SafariZone_RestHouse_EventObjects: @ 853B8FC - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 4, 0, 10, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BE7, 0 - object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 8, 4, 0, 9, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BF0, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 5, 3, 10, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BF9, 0 + object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BE7, 0 + object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BF0, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BF9, 0 SafariZone_RestHouse_MapWarps: @ 853B944 warp_def 3, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST diff --git a/data/maps/SafariZone_South/events.inc b/data/maps/SafariZone_South/events.inc index 46173d11a0..01a016f02c 100644 --- a/data/maps/SafariZone_South/events.inc +++ b/data/maps/SafariZone_South/events.inc @@ -1,10 +1,10 @@ SafariZone_South_EventObjects: @ 853B2A4 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 32, 34, 4, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2E5, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 26, 28, 3, 2, 1, 1, 0, 0, SafariZone_South_EventScript_23D2CA, 0 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 16, 6, 5, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 15, 31, 3, 2, 1, 1, 0, 0, SafariZone_South_EventScript_23D2DC, 0 - object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 36, 16, 3, 9, 1, 1, 0, 0, SafariZone_South_EventScript_23D390, 717 - object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 36, 17, 3, 9, 1, 1, 0, 0, SafariZone_South_EventScript_23D3A2, 717 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 32, 34, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_South_EventScript_23D2E5, 0 + object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 26, 28, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_South_EventScript_23D2CA, 0 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 16, 6, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 15, 31, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_South_EventScript_23D2DC, 0 + object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 36, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D390, 717 + object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 36, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D3A2, 717 SafariZone_South_MapWarps: @ 853B334 warp_def 32, 33, 0, 0, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE diff --git a/data/maps/SafariZone_Southeast/events.inc b/data/maps/SafariZone_Southeast/events.inc index af2da05753..f7f38f7af4 100644 --- a/data/maps/SafariZone_Southeast/events.inc +++ b/data/maps/SafariZone_Southeast/events.inc @@ -1,9 +1,9 @@ SafariZone_Southeast_EventObjects: @ 853BA6C - object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 7, 7, 3, 1, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 20, 30, 3, 2, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 8, 26, 3, 2, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 15, 3, 1, 1, 1, 0, 0, SafariZone_Southeast_EventScript_2912F0, 1170 - object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 12, 16, 3, 9, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D399, 747 + object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 7, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 20, 30, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 8, 26, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_2912F0, 1170 + object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D399, 747 SafariZone_Southeast_MapBGEvents: @ 853BAE4 bg_event 19, 36, 3, 7, 0, ITEM_PP_UP, 108, 0 diff --git a/data/maps/SafariZone_Southwest/events.inc b/data/maps/SafariZone_Southwest/events.inc index ccd775dd2b..886958342a 100644 --- a/data/maps/SafariZone_Southwest/events.inc +++ b/data/maps/SafariZone_Southwest/events.inc @@ -1,6 +1,6 @@ SafariZone_Southwest_EventObjects: @ 853B24C - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 22, 9, 3, 8, 0, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 3, 1, 1, 1, 0, 0, SafariZone_Southwest_EventScript_2912D6, 1131 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 22, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southwest_EventScript_2912D6, 1131 SafariZone_Southwest_MapWarps: @ 853B27C warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE diff --git a/data/maps/ScorchedSlab/events.inc b/data/maps/ScorchedSlab/events.inc index 588b7a9aef..5bbe88c202 100644 --- a/data/maps/ScorchedSlab/events.inc +++ b/data/maps/ScorchedSlab/events.inc @@ -1,5 +1,5 @@ ScorchedSlab_EventObjects: @ 8536F88 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, 1, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, 1079 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, 1079 ScorchedSlab_MapWarps: @ 8536FA0 warp_def 7, 16, 1, 1, MAP_ROUTE120 diff --git a/data/maps/SeafloorCavern_Entrance/events.inc b/data/maps/SeafloorCavern_Entrance/events.inc index e27362f00f..11a8211de9 100644 --- a/data/maps/SeafloorCavern_Entrance/events.inc +++ b/data/maps/SeafloorCavern_Entrance/events.inc @@ -1,5 +1,5 @@ SeafloorCavern_Entrance_EventObjects: @ 85356BC - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 2, 3, 7, 1, 1, 0, 0, SeafloorCavern_Entrance_EventScript_234485, 941 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SeafloorCavern_Entrance_EventScript_234485, 941 SeafloorCavern_Entrance_MapWarps: @ 85356D4 warp_def 10, 18, 3, 0, MAP_UNDERWATER4 diff --git a/data/maps/SeafloorCavern_Room1/events.inc b/data/maps/SeafloorCavern_Room1/events.inc index 261314b9bf..2c8e51e30f 100644 --- a/data/maps/SeafloorCavern_Room1/events.inc +++ b/data/maps/SeafloorCavern_Room1/events.inc @@ -1,9 +1,9 @@ SeafloorCavern_Room1_EventObjects: @ 85356F8 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 17 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 18 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, 19 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 6, 3, 1, 1, 1, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, 946 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 10, 3, 16, 1, 1, 1, 3, SeafloorCavern_Room1_EventScript_234803, 946 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 17 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 18 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, 19 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, 946 + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, SeafloorCavern_Room1_EventScript_234803, 946 SeafloorCavern_Room1_MapWarps: @ 8535770 warp_def 5, 18, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE diff --git a/data/maps/SeafloorCavern_Room2/events.inc b/data/maps/SeafloorCavern_Room2/events.inc index 01f6f3ba53..82f9241216 100644 --- a/data/maps/SeafloorCavern_Room2/events.inc +++ b/data/maps/SeafloorCavern_Room2/events.inc @@ -1,12 +1,12 @@ SeafloorCavern_Room2_EventObjects: @ 853579C - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 18 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 19 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 17 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 21 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 22 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 24 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 25 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 23 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 18 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 19 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 17 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 21 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 22 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 24 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 25 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 23 SeafloorCavern_Room2_MapWarps: @ 853585C warp_def 10, 7, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1 diff --git a/data/maps/SeafloorCavern_Room3/events.inc b/data/maps/SeafloorCavern_Room3/events.inc index 300db40c5a..9a1399705d 100644 --- a/data/maps/SeafloorCavern_Room3/events.inc +++ b/data/maps/SeafloorCavern_Room3/events.inc @@ -1,13 +1,13 @@ SeafloorCavern_Room3_EventObjects: @ 8535890 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 18 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 20 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 9, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 21 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 22 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 23 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 24 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 25 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 9, 5, 3, 9, 1, 1, 1, 6, SeafloorCavern_Room3_EventScript_234938, 946 - object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 5, 3, 10, 1, 1, 1, 4, SeafloorCavern_Room3_EventScript_23494F, 946 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 18 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 20 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 21 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 22 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 23 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 24 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 25 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, SeafloorCavern_Room3_EventScript_234938, 946 + object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, SeafloorCavern_Room3_EventScript_23494F, 946 SeafloorCavern_Room3_MapWarps: @ 8535968 warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8 diff --git a/data/maps/SeafloorCavern_Room4/events.inc b/data/maps/SeafloorCavern_Room4/events.inc index 6b6df78f2e..e67cb0d5b3 100644 --- a/data/maps/SeafloorCavern_Room4/events.inc +++ b/data/maps/SeafloorCavern_Room4/events.inc @@ -1,6 +1,6 @@ SeafloorCavern_Room4_EventObjects: @ 8535994 - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 8, 3, 17, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, 946 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 5, 12, 3, 7, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, 946 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, 946 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 5, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, 946 SeafloorCavern_Room4_MapWarps: @ 85359C4 warp_def 13, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM2 diff --git a/data/maps/SeafloorCavern_Room5/events.inc b/data/maps/SeafloorCavern_Room5/events.inc index 97787ebbfa..f0c69175b7 100644 --- a/data/maps/SeafloorCavern_Room5/events.inc +++ b/data/maps/SeafloorCavern_Room5/events.inc @@ -1,10 +1,10 @@ SeafloorCavern_Room5_EventObjects: @ 85359F8 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 17 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 18 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 19 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 13, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 21 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 22 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 20 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 17 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 18 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 19 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 21 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 22 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 20 SeafloorCavern_Room5_MapWarps: @ 8535A88 warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM1 diff --git a/data/maps/SeafloorCavern_Room8/events.inc b/data/maps/SeafloorCavern_Room8/events.inc index 42dcf9faa0..d69b12f7ea 100644 --- a/data/maps/SeafloorCavern_Room8/events.inc +++ b/data/maps/SeafloorCavern_Room8/events.inc @@ -1,16 +1,16 @@ SeafloorCavern_Room8_EventObjects: @ 8535B04 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 17 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 18 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 19 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 20 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 21 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 22 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 23 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 24 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 25 - object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 26 - object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 27 - object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 28 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 17 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 18 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 19 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 20 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 21 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 22 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 23 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 24 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 25 + object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 26 + object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 27 + object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 28 SeafloorCavern_Room8_MapWarps: @ 8535C24 warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9 diff --git a/data/maps/SeafloorCavern_Room9/events.inc b/data/maps/SeafloorCavern_Room9/events.inc index ac3337bed2..659ca8b03e 100644 --- a/data/maps/SeafloorCavern_Room9/events.inc +++ b/data/maps/SeafloorCavern_Room9/events.inc @@ -1,11 +1,11 @@ SeafloorCavern_Room9_EventObjects: @ 8535C48 - object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 17, 38, 3, 8, 0, 0, 0, 0, 0x0, 859 - object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 828 - object_event 3, EVENT_OBJ_GFX_MAXIE, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 829 - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 41, 3, 10, 0, 0, 0, 0, 0x0, 831 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 42, 3, 10, 0, 0, 0, 0, 0x0, 831 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, 1, 1, 1, 0, 0, SeafloorCavern_Room9_EventScript_291401, 1090 - object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 17, 38, 3, 8, 1, 1, 0, 0, 0x0, 733 + object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 859 + object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 828 + object_event 3, EVENT_OBJ_GFX_MAXIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 829 + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 41, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 831 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 831 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SeafloorCavern_Room9_EventScript_291401, 1090 + object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 733 SeafloorCavern_Room9_MapWarps: @ 8535CF0 warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 diff --git a/data/maps/SecretBase_BlueCave1/events.inc b/data/maps/SecretBase_BlueCave1/events.inc index 2905764cf1..606999612c 100644 --- a/data/maps/SecretBase_BlueCave1/events.inc +++ b/data/maps/SecretBase_BlueCave1/events.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave1_EventObjects: @ 8537BEC - object_event 1, 255, 0, 4, 2, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave1_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, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave1_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_BlueCave1_MapWarps: @ 8537D54 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BlueCave2/events.inc b/data/maps/SecretBase_BlueCave2/events.inc index 8202b7a421..0991d03e2b 100644 --- a/data/maps/SecretBase_BlueCave2/events.inc +++ b/data/maps/SecretBase_BlueCave2/events.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave2_EventObjects: @ 8538504 - object_event 1, 255, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave2_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, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave2_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_BlueCave2_MapWarps: @ 853866C warp_def 7, 5, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BlueCave3/events.inc b/data/maps/SecretBase_BlueCave3/events.inc index 733b674b70..e0bd13a3ba 100644 --- a/data/maps/SecretBase_BlueCave3/events.inc +++ b/data/maps/SecretBase_BlueCave3/events.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave3_EventObjects: @ 8538E1C - object_event 1, 255, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave3_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, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave3_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_BlueCave3_MapWarps: @ 8538F84 warp_def 4, 15, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BlueCave4/events.inc b/data/maps/SecretBase_BlueCave4/events.inc index afd1622b88..15266e18bc 100644 --- a/data/maps/SecretBase_BlueCave4/events.inc +++ b/data/maps/SecretBase_BlueCave4/events.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave4_EventObjects: @ 8539734 - object_event 1, 255, 0, 5, 13, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave4_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, 5, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave4_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_BlueCave4_MapWarps: @ 853989C warp_def 4, 15, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BrownCave1/events.inc b/data/maps/SecretBase_BrownCave1/events.inc index e4fffab493..8c2771f4ee 100644 --- a/data/maps/SecretBase_BrownCave1/events.inc +++ b/data/maps/SecretBase_BrownCave1/events.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave1_EventObjects: @ 8537A68 - object_event 1, 255, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave1_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, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave1_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_BrownCave1_MapWarps: @ 8537BD0 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BrownCave2/events.inc b/data/maps/SecretBase_BrownCave2/events.inc index 29e90b5921..f5e168e361 100644 --- a/data/maps/SecretBase_BrownCave2/events.inc +++ b/data/maps/SecretBase_BrownCave2/events.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave2_EventObjects: @ 8538380 - object_event 1, 255, 0, 11, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave2_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, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave2_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_BrownCave2_MapWarps: @ 85384E8 warp_def 1, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BrownCave3/events.inc b/data/maps/SecretBase_BrownCave3/events.inc index 3322b9d5a8..c41147bc6f 100644 --- a/data/maps/SecretBase_BrownCave3/events.inc +++ b/data/maps/SecretBase_BrownCave3/events.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave3_EventObjects: @ 8538C98 - object_event 1, 255, 0, 1, 7, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave3_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, 1, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave3_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_BrownCave3_MapWarps: @ 8538E00 warp_def 11, 9, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BrownCave4/events.inc b/data/maps/SecretBase_BrownCave4/events.inc index 3100339479..40d00597ed 100644 --- a/data/maps/SecretBase_BrownCave4/events.inc +++ b/data/maps/SecretBase_BrownCave4/events.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave4_EventObjects: @ 85395B0 - object_event 1, 255, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave4_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, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave4_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_BrownCave4_MapWarps: @ 8539718 warp_def 2, 8, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_RedCave1/events.inc b/data/maps/SecretBase_RedCave1/events.inc index eba9925866..1b5f202cff 100644 --- a/data/maps/SecretBase_RedCave1/events.inc +++ b/data/maps/SecretBase_RedCave1/events.inc @@ -1,19 +1,19 @@ SecretBase_RedCave1_EventObjects: @ 85378E4 - object_event 1, 255, 0, 7, 4, 3, 8, 0, 0, 0, 0, SecretBase_RedCave1_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, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave1_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_RedCave1_MapWarps: @ 8537A4C warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_RedCave2/events.inc b/data/maps/SecretBase_RedCave2/events.inc index c6f5349656..d84f297a28 100644 --- a/data/maps/SecretBase_RedCave2/events.inc +++ b/data/maps/SecretBase_RedCave2/events.inc @@ -1,19 +1,19 @@ SecretBase_RedCave2_EventObjects: @ 85381FC - object_event 1, 255, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave2_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, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave2_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_RedCave2_MapWarps: @ 8538364 warp_def 3, 14, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_RedCave3/events.inc b/data/maps/SecretBase_RedCave3/events.inc index dda054b445..f288371e87 100644 --- a/data/maps/SecretBase_RedCave3/events.inc +++ b/data/maps/SecretBase_RedCave3/events.inc @@ -1,19 +1,19 @@ SecretBase_RedCave3_EventObjects: @ 8538B14 - object_event 1, 255, 0, 12, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave3_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, 12, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave3_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_RedCave3_MapWarps: @ 8538C7C warp_def 3, 6, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_RedCave4/events.inc b/data/maps/SecretBase_RedCave4/events.inc index 54e33dc3d9..9090f940e4 100644 --- a/data/maps/SecretBase_RedCave4/events.inc +++ b/data/maps/SecretBase_RedCave4/events.inc @@ -1,19 +1,19 @@ SecretBase_RedCave4_EventObjects: @ 853942C - object_event 1, 255, 0, 5, 8, 3, 8, 0, 0, 0, 0, SecretBase_RedCave4_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, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave4_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_RedCave4_MapWarps: @ 8539594 warp_def 2, 12, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Shrub1/events.inc b/data/maps/SecretBase_Shrub1/events.inc index acdac9692c..aa886a0aa3 100644 --- a/data/maps/SecretBase_Shrub1/events.inc +++ b/data/maps/SecretBase_Shrub1/events.inc @@ -1,19 +1,19 @@ SecretBase_Shrub1_EventObjects: @ 8538078 - object_event 1, 255, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub1_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, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub1_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_Shrub1_MapWarps: @ 85381E0 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Shrub2/events.inc b/data/maps/SecretBase_Shrub2/events.inc index a370d2e72e..1acb5d0a13 100644 --- a/data/maps/SecretBase_Shrub2/events.inc +++ b/data/maps/SecretBase_Shrub2/events.inc @@ -1,19 +1,19 @@ SecretBase_Shrub2_EventObjects: @ 8538990 - object_event 1, 255, 0, 13, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub2_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, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub2_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_Shrub2_MapWarps: @ 8538AF8 warp_def 7, 5, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Shrub3/events.inc b/data/maps/SecretBase_Shrub3/events.inc index 942be36176..7902f3fc7e 100644 --- a/data/maps/SecretBase_Shrub3/events.inc +++ b/data/maps/SecretBase_Shrub3/events.inc @@ -1,19 +1,19 @@ SecretBase_Shrub3_EventObjects: @ 85392A8 - object_event 1, 255, 0, 5, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub3_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, 5, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub3_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_Shrub3_MapWarps: @ 8539410 warp_def 6, 9, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Shrub4/events.inc b/data/maps/SecretBase_Shrub4/events.inc index a027b266bd..c6d5f32f53 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 diff --git a/data/maps/SecretBase_Tree1/events.inc b/data/maps/SecretBase_Tree1/events.inc index 3379e8ecb7..593fb5dbb9 100644 --- a/data/maps/SecretBase_Tree1/events.inc +++ b/data/maps/SecretBase_Tree1/events.inc @@ -1,19 +1,19 @@ SecretBase_Tree1_EventObjects: @ 8537EF4 - object_event 1, 255, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree1_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, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree1_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_Tree1_MapWarps: @ 853805C warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Tree2/events.inc b/data/maps/SecretBase_Tree2/events.inc index e330951cfc..1899117558 100644 --- a/data/maps/SecretBase_Tree2/events.inc +++ b/data/maps/SecretBase_Tree2/events.inc @@ -1,19 +1,19 @@ SecretBase_Tree2_EventObjects: @ 853880C - object_event 1, 255, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree2_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, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree2_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_Tree2_MapWarps: @ 8538974 warp_def 3, 14, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Tree3/events.inc b/data/maps/SecretBase_Tree3/events.inc index b4a8c2eb38..b2d950a407 100644 --- a/data/maps/SecretBase_Tree3/events.inc +++ b/data/maps/SecretBase_Tree3/events.inc @@ -1,19 +1,19 @@ SecretBase_Tree3_EventObjects: @ 8539124 - object_event 1, 255, 0, 1, 2, 3, 8, 0, 0, 0, 0, SecretBase_Tree3_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, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree3_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_Tree3_MapWarps: @ 853928C warp_def 8, 6, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Tree4/events.inc b/data/maps/SecretBase_Tree4/events.inc index 4c57fcdfd6..a1d7f7b50e 100644 --- a/data/maps/SecretBase_Tree4/events.inc +++ b/data/maps/SecretBase_Tree4/events.inc @@ -1,19 +1,19 @@ SecretBase_Tree4_EventObjects: @ 8539A3C - object_event 1, 255, 0, 10, 9, 3, 8, 0, 0, 0, 0, SecretBase_Tree4_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, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree4_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_Tree4_MapWarps: @ 8539BA4 warp_def 7, 12, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_YellowCave1/events.inc b/data/maps/SecretBase_YellowCave1/events.inc index e7f4ed7ce4..9b394350c5 100644 --- a/data/maps/SecretBase_YellowCave1/events.inc +++ b/data/maps/SecretBase_YellowCave1/events.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave1_EventObjects: @ 8537D70 - object_event 1, 255, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave1_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, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave1_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_YellowCave1_MapWarps: @ 8537ED8 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_YellowCave2/events.inc b/data/maps/SecretBase_YellowCave2/events.inc index 84aabf3d4b..a958fcb534 100644 --- a/data/maps/SecretBase_YellowCave2/events.inc +++ b/data/maps/SecretBase_YellowCave2/events.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave2_EventObjects: @ 8538688 - object_event 1, 255, 0, 1, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave2_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, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave2_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_YellowCave2_MapWarps: @ 85387F0 warp_def 12, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_YellowCave3/events.inc b/data/maps/SecretBase_YellowCave3/events.inc index 2e1d617083..2decabcee7 100644 --- a/data/maps/SecretBase_YellowCave3/events.inc +++ b/data/maps/SecretBase_YellowCave3/events.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave3_EventObjects: @ 8538FA0 - object_event 1, 255, 0, 7, 5, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave3_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, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave3_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_YellowCave3_MapWarps: @ 8539108 warp_def 5, 9, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_YellowCave4/events.inc b/data/maps/SecretBase_YellowCave4/events.inc index 07ac363ac0..535ca8e4c8 100644 --- a/data/maps/SecretBase_YellowCave4/events.inc +++ b/data/maps/SecretBase_YellowCave4/events.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave4_EventObjects: @ 85398B8 - object_event 1, 255, 0, 9, 8, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave4_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, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave4_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_YellowCave4_MapWarps: @ 8539A20 warp_def 6, 12, 0, 126, MAP_NONE diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc index 1f4a008e3c..614c009c1e 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc @@ -1,6 +1,6 @@ ShoalCave_LowTideEntranceRoom_EventObjects: @ 853627C - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 3, 3, 1, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, 1081 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 18, 15, 3, 9, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, 1081 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 18, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0 ShoalCave_LowTideEntranceRoom_MapWarps: @ 85362AC warp_def 20, 30, 3, 0, MAP_ROUTE125 diff --git a/data/maps/ShoalCave_LowTideIceRoom/events.inc b/data/maps/ShoalCave_LowTideIceRoom/events.inc index 57922e3225..5f4fe1dac9 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/events.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/events.inc @@ -1,6 +1,6 @@ ShoalCave_LowTideIceRoom_EventObjects: @ 8537100 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 8, 3, 1, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, 1112 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 21, 4, 1, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, 1113 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, 1112 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 21, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, 1113 ShoalCave_LowTideIceRoom_MapWarps: @ 8537130 warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM diff --git a/data/maps/ShoalCave_LowTideInnerRoom/events.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc index f1d8942645..5743c8c227 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/events.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/events.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideInnerRoom_EventObjects: @ 85362E0 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 14, 5, 1, 1, 1, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, 1082 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 14, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, 1082 ShoalCave_LowTideInnerRoom_MapWarps: @ 85362F8 warp_def 34, 29, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM diff --git a/data/maps/ShoalCave_LowTideLowerRoom/events.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc index d3d6564529..8b0cc9b407 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/events.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/events.inc @@ -1,6 +1,6 @@ ShoalCave_LowTideLowerRoom_EventObjects: @ 85363DC - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 3, 3, 1, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, 17 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 4, 3, 2, 1, 1, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2371B2, 0 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, 17 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2371B2, 0 ShoalCave_LowTideLowerRoom_MapWarps: @ 853640C warp_def 7, 2, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM diff --git a/data/maps/ShoalCave_LowTideStairsRoom/events.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc index 875f337a55..b9e6955ae2 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/events.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/events.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideStairsRoom_EventObjects: @ 8536394 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 12, 3, 1, 1, 1, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, 1083 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, 1083 ShoalCave_LowTideStairsRoom_MapWarps: @ 85363AC warp_def 3, 12, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM diff --git a/data/maps/SingleBattleColosseum/events.inc b/data/maps/SingleBattleColosseum/events.inc index 4ef0de89ff..6971d42175 100644 --- a/data/maps/SingleBattleColosseum/events.inc +++ b/data/maps/SingleBattleColosseum/events.inc @@ -1,5 +1,5 @@ SingleBattleColosseum_EventObjects: @ 8539D44 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 3, 3, 9, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0 SingleBattleColosseum_MapWarps: @ 8539D5C warp_def 6, 8, 3, 127, MAP_NONE diff --git a/data/maps/SkyPillar_Outside/events.inc b/data/maps/SkyPillar_Outside/events.inc index 4fb4cc0102..386ea0b355 100644 --- a/data/maps/SkyPillar_Outside/events.inc +++ b/data/maps/SkyPillar_Outside/events.inc @@ -1,5 +1,5 @@ SkyPillar_Outside_EventObjects: @ 853701C - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 13, 7, 3, 8, 1, 1, 0, 0, SkyPillar_Outside_EventScript_2393F8, 855 + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Outside_EventScript_2393F8, 855 SkyPillar_Outside_MapWarps: @ 8537034 warp_def 17, 13, 3, 1, MAP_SKY_PILLAR_ENTRANCE diff --git a/data/maps/SkyPillar_Top/events.inc b/data/maps/SkyPillar_Top/events.inc index 26bccf67f9..79973b316d 100644 --- a/data/maps/SkyPillar_Top/events.inc +++ b/data/maps/SkyPillar_Top/events.inc @@ -1,6 +1,6 @@ SkyPillar_Top_EventObjects: @ 8537170 - object_event 1, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 14, 7, 3, 8, 1, 1, 0, 0, 0x0, 773 - object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 14, 6, 3, 8, 1, 1, 0, 0, SkyPillar_Top_EventScript_239722, 80 + object_event 1, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 14, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 773 + object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 14, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Top_EventScript_239722, 80 SkyPillar_Top_MapWarps: @ 85371A0 warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F diff --git a/data/maps/SlateportCity/events.inc b/data/maps/SlateportCity/events.inc index b8480dfb6d..3b72a57f38 100644 --- a/data/maps/SlateportCity/events.inc +++ b/data/maps/SlateportCity/events.inc @@ -1,39 +1,39 @@ SlateportCity_EventObjects: @ 85261CC - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 21, 11, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_1DCED9, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 34, 29, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCEF6, 0 - object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 5, 13, 3, 2, 1, 2, 0, 0, SlateportCity_EventScript_1DCEB8, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 26, 29, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCF17, 0 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 31, 27, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD009, 882 - object_event 6, EVENT_OBJ_GFX_COOK, 0, 5, 43, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCE42, 0 - object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 20, 37, 3, 1, 1, 1, 0, 0, SlateportCity_EventScript_1DCE63, 0 - object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 8, 42, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_1DCE84, 0 - object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 29, 13, 3, 9, 0, 0, 0, 0, SlateportCity_EventScript_1DD353, 835 - object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 28, 14, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD35C, 835 - object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 28, 13, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD1F8, 840 - object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 37, 41, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DCFE5, 0 - object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 28, 46, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCFEE, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 50, 3, 3, 0, 1, 0, 0, SlateportCity_EventScript_1DCFF7, 0 - object_event 15, EVENT_OBJ_GFX_MAN_4, 0, 16, 46, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_1DD000, 0 - object_event 16, EVENT_OBJ_GFX_MANIAC, 0, 8, 24, 3, 3, 0, 1, 0, 0, SlateportCity_EventScript_1DCFBB, 0 - object_event 17, EVENT_OBJ_GFX_WOMAN_7, 0, 15, 31, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCFDC, 0 - object_event 18, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD020, 882 - object_event 19, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD037, 882 - object_event 20, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 38, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD198, 0 - object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 5, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD16A, 0 - object_event 22, EVENT_OBJ_GFX_MAN_6, 0, 34, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD365, 0 - object_event 23, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 47, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCDE4, 0 - object_event 24, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 11, 47, 3, 8, 1, 1, 0, 0, SlateportCity_EventScript_1DD1D8, 948 - object_event 25, EVENT_OBJ_GFX_MAN_3, 0, 5, 47, 3, 8, 1, 1, 0, 0, SlateportCity_EventScript_1DCDBD, 0 - object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 22, 27, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_1DD04E, 882 - object_event 27, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 27, 3, 7, 1, 1, 0, 0, SlateportCity_EventScript_1DD065, 882 - object_event 28, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 24, 27, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_1DD07C, 882 - object_event 29, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 26, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_1DD093, 882 - object_event 30, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 26, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_1DD0AA, 882 - object_event 31, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 27, 3, 7, 1, 1, 0, 0, SlateportCity_EventScript_1DD0C1, 882 - object_event 32, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 27, 3, 7, 1, 1, 0, 0, SlateportCity_EventScript_1DD14A, 882 - object_event 33, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 27, 3, 7, 1, 1, 0, 0, SlateportCity_EventScript_1DD153, 882 - object_event 34, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 37, 3, 9, 1, 2, 0, 0, SlateportCity_EventScript_1DD36E, 0 - object_event 35, EVENT_OBJ_GFX_SCOTT, 0, 10, 12, 0, 8, 1, 2, 0, 0, 0x0, 749 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 21, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCED9, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 34, 29, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_EventScript_1DCEF6, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 5, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_EventScript_1DCEB8, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 26, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_EventScript_1DCF17, 0 + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 31, 27, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_EventScript_1DD009, 882 + object_event 6, EVENT_OBJ_GFX_COOK, 0, 5, 43, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DCE42, 0 + object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 20, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCE63, 0 + object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 8, 42, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCE84, 0 + object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 29, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_EventScript_1DD353, 835 + object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 28, 14, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_EventScript_1DD35C, 835 + object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 28, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD1F8, 840 + object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 37, 41, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DCFE5, 0 + object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 28, 46, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_EventScript_1DCFEE, 0 + object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 50, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_EventScript_1DCFF7, 0 + object_event 15, EVENT_OBJ_GFX_MAN_4, 0, 16, 46, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DD000, 0 + object_event 16, EVENT_OBJ_GFX_MANIAC, 0, 8, 24, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_EventScript_1DCFBB, 0 + object_event 17, EVENT_OBJ_GFX_WOMAN_7, 0, 15, 31, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_EventScript_1DCFDC, 0 + object_event 18, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD020, 882 + object_event 19, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD037, 882 + object_event 20, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 38, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD198, 0 + object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 5, 51, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DD16A, 0 + object_event 22, EVENT_OBJ_GFX_MAN_6, 0, 34, 51, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DD365, 0 + object_event 23, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DCDE4, 0 + object_event 24, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 11, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_EventScript_1DD1D8, 948 + object_event 25, EVENT_OBJ_GFX_MAN_3, 0, 5, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_EventScript_1DCDBD, 0 + object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 22, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD04E, 882 + object_event 27, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD065, 882 + object_event 28, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 24, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD07C, 882 + object_event 29, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 26, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD093, 882 + object_event 30, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 26, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD0AA, 882 + object_event 31, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD0C1, 882 + object_event 32, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD14A, 882 + object_event 33, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD153, 882 + object_event 34, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 37, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 2, 0, 0, SlateportCity_EventScript_1DD36E, 0 + object_event 35, EVENT_OBJ_GFX_SCOTT, 0, 10, 12, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 2, 0, 0, 0x0, 749 SlateportCity_MapWarps: @ 8526514 warp_def 19, 19, 0, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/events.inc b/data/maps/SlateportCity_BattleTentBattleRoom/events.inc index ce13a5899f..6c28d5fc5a 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/events.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/events.inc @@ -1,7 +1,7 @@ SlateportCity_BattleTentBattleRoom_EventObjects: @ 852F4DC - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 0, 10, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, 8, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 4, 8, 3, 7, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 SlateportCity_BattleTentBattleRoom_MapEvents:: @ 852F524 map_events SlateportCity_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SlateportCity_BattleTentCorridor/events.inc b/data/maps/SlateportCity_BattleTentCorridor/events.inc index b56b50a0ef..4fe072b505 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/events.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/events.inc @@ -1,5 +1,5 @@ SlateportCity_BattleTentCorridor_EventObjects: @ 852F4B0 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, 7, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 SlateportCity_BattleTentCorridor_MapEvents:: @ 852F4C8 map_events SlateportCity_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SlateportCity_BattleTentLobby/events.inc b/data/maps/SlateportCity_BattleTentLobby/events.inc index 0ceca119bb..d0875ba784 100644 --- a/data/maps/SlateportCity_BattleTentLobby/events.inc +++ b/data/maps/SlateportCity_BattleTentLobby/events.inc @@ -1,9 +1,9 @@ SlateportCity_BattleTentLobby_EventObjects: @ 852F408 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, 8, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_2088AA, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 1, 5, 3, 2, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A3D, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 3, 7, 3, 7, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A7E, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 1, 8, 3, 1, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A87, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 8, 3, 9, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_2088AA, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A3D, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A7E, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 1, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A87, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0 SlateportCity_BattleTentLobby_MapWarps: @ 852F480 warp_def 6, 9, 0, 3, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_Harbor/events.inc b/data/maps/SlateportCity_Harbor/events.inc index af274e22f1..5f6e2617f0 100644 --- a/data/maps/SlateportCity_Harbor/events.inc +++ b/data/maps/SlateportCity_Harbor/events.inc @@ -1,12 +1,12 @@ SlateportCity_Harbor_EventObjects: @ 852FA68 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, 8, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, 905 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 12, 3, 9, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, 905 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 12, 3, 10, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, 905 - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 13, 3, 1, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CCA2, 841 - object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 860 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 10, 3, 10, 0, 0, 0, 0, 0x0, 845 - object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 8, 10, 3, 9, 0, 0, 0, 0, 0x0, 846 - object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 9, 1, 10, 0, 0, 0, 0, 0x0, 848 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, 905 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, 905 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, 905 + object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CCA2, 841 + object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 860 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 845 + object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 846 + object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 848 SlateportCity_Harbor_MapWarps: @ 852FB28 warp_def 11, 14, 0, 8, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_House1/events.inc b/data/maps/SlateportCity_House1/events.inc index 493bb29220..713ff1dd50 100644 --- a/data/maps/SlateportCity_House1/events.inc +++ b/data/maps/SlateportCity_House1/events.inc @@ -1,5 +1,5 @@ SlateportCity_House1_EventObjects: @ 852F538 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 5, 3, 8, 0, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0 SlateportCity_House1_MapWarps: @ 852F550 warp_def 3, 7, 0, 6, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_House2/events.inc b/data/maps/SlateportCity_House2/events.inc index 42d0e3660d..daa627c06f 100644 --- a/data/maps/SlateportCity_House2/events.inc +++ b/data/maps/SlateportCity_House2/events.inc @@ -1,6 +1,6 @@ SlateportCity_House2_EventObjects: @ 852FB9C - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 4, 3, 10, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9AF, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 4, 3, 9, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9B8, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9AF, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9B8, 0 SlateportCity_House2_MapWarps: @ 852FBCC warp_def 3, 7, 0, 10, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_Mart/events.inc b/data/maps/SlateportCity_Mart/events.inc index d6391598e1..da5f668e0a 100644 --- a/data/maps/SlateportCity_Mart/events.inc +++ b/data/maps/SlateportCity_Mart/events.inc @@ -1,7 +1,7 @@ SlateportCity_Mart_EventObjects: @ 852FCF0 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC49, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 2, 3, 7, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC76, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, 1, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC49, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC76, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0 SlateportCity_Mart_MapWarps: @ 852FD38 warp_def 3, 7, 0, 1, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc index cfe385a3c0..aca75a698b 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc @@ -1,18 +1,18 @@ SlateportCity_OceanicMuseum_1F_EventObjects: @ 852F670 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 7, 7, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 18, 5, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, 883 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 12, 2, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, 883 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 2, 8, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE56, 883 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 3, 4, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE4D, 883 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 4, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE71, 883 - object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 3, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE7A, 883 - object_event 9, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 2, 3, 1, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, 961 - object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 10, 2, 3, 7, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, 961 - object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 17, 7, 3, 10, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, 961 - object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 8, 3, 7, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, 961 - object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 4, 3, 21, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, 965 - object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 4, 3, 1, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, 961 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, 883 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, 883 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE56, 883 + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE4D, 883 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE71, 883 + object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE7A, 883 + object_event 9, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, 961 + object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, 961 + object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, 961 + object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, 961 + object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, 965 + object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, 961 SlateportCity_OceanicMuseum_1F_MapWarps: @ 852F7C0 warp_def 9, 8, 0, 5, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc index dc0c8a8d98..9c695f745f 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc @@ -1,11 +1,11 @@ SlateportCity_OceanicMuseum_2F_EventObjects: @ 852F8A8 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 6, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, 887 - object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 886 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 884 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 885 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 12, 7, 3, 10, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, 961 - object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 6, 3, 1, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, 961 - object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 3, 3, 10, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, 961 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, 887 + object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 886 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 884 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 885 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, 961 + object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, 961 + object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, 961 SlateportCity_OceanicMuseum_2F_MapWarps: @ 852F950 warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F diff --git a/data/maps/SlateportCity_PokemonCenter_1F/events.inc b/data/maps/SlateportCity_PokemonCenter_1F/events.inc index f59413aba8..32328d255e 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/events.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/events.inc @@ -1,7 +1,7 @@ SlateportCity_PokemonCenter_1F_EventObjects: @ 852FBF0 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAD3, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAE1, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 7, 3, 10, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAD3, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAE1, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0 SlateportCity_PokemonCenter_1F_MapWarps: @ 852FC38 warp_def 7, 8, 3, 0, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_PokemonCenter_2F/events.inc b/data/maps/SlateportCity_PokemonCenter_2F/events.inc index f59512311f..e20e593cb2 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/events.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ SlateportCity_PokemonCenter_2F_EventObjects: @ 852FC64 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_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, SlateportCity_PokemonCenter_2F_EventScript_276B03, 702 SlateportCity_PokemonCenter_2F_MapWarps: @ 852FCC4 warp_def 1, 6, 4, 2, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F diff --git a/data/maps/SlateportCity_PokemonFanClub/events.inc b/data/maps/SlateportCity_PokemonFanClub/events.inc index 92974f5b48..d6a0ac4e1c 100644 --- a/data/maps/SlateportCity_PokemonFanClub/events.inc +++ b/data/maps/SlateportCity_PokemonFanClub/events.inc @@ -1,13 +1,13 @@ SlateportCity_PokemonFanClub_EventObjects: @ 852F574 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 11, 4, 0, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1E8, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 1, 5, 0, 3, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1F1, 0 - object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 5, 0, 7, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_28C943, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 2, 3, 1, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A17E, 0 - object_event 5, EVENT_OBJ_GFX_GENTLEMAN, 0, 6, 5, 4, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_209E96, 0 - object_event 6, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 3, 9, 3, 1, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A20D, 0 - object_event 7, EVENT_OBJ_GFX_SKITTY, 0, 8, 3, 3, 1, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1FA, 0 - object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 10, 8, 3, 1, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A220, 0 - object_event 9, EVENT_OBJ_GFX_MAN_5, 0, 11, 8, 0, 9, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 11, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1E8, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 1, 5, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1F1, 0 + object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 5, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_28C943, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A17E, 0 + object_event 5, EVENT_OBJ_GFX_GENTLEMAN, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_209E96, 0 + object_event 6, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 3, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A20D, 0 + object_event 7, EVENT_OBJ_GFX_SKITTY, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1FA, 0 + object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 10, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A220, 0 + object_event 9, EVENT_OBJ_GFX_MAN_5, 0, 11, 8, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0 SlateportCity_PokemonFanClub_MapWarps: @ 852F64C warp_def 6, 10, 0, 4, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_SternsShipyard_1F/events.inc b/data/maps/SlateportCity_SternsShipyard_1F/events.inc index b231f9816d..19886500f1 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/events.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/events.inc @@ -1,8 +1,8 @@ SlateportCity_SternsShipyard_1F_EventObjects: @ 852F318 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 5, 5, 3, 8, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207F40, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FED, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 8, 3, 5, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FF6, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 11, 3, 2, 1, 2, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, 869 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207F40, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FED, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 8, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FF6, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, 869 SlateportCity_SternsShipyard_1F_MapWarps: @ 852F378 warp_def 2, 14, 0, 2, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_SternsShipyard_2F/events.inc b/data/maps/SlateportCity_SternsShipyard_2F/events.inc index 450f40fe7f..f34a527264 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/events.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/events.inc @@ -1,7 +1,7 @@ SlateportCity_SternsShipyard_2F_EventObjects: @ 852F3A4 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 4, 3, 10, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_20863E, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_208647, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_20863E, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_208647, 0 SlateportCity_SternsShipyard_2F_MapWarps: @ 852F3EC warp_def 3, 1, 0, 2, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F diff --git a/data/maps/SootopolisCity/events.inc b/data/maps/SootopolisCity/events.inc index 96aaefd9c3..b7d481ac30 100644 --- a/data/maps/SootopolisCity/events.inc +++ b/data/maps/SootopolisCity/events.inc @@ -1,22 +1,22 @@ SootopolisCity_EventObjects: @ 8527314 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 31, 18, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 47, 33, 0, 9, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, 854 - object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 9, 43, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E5ED8, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 51, 14, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E608E, 0 - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 43, 26, 3, 1, 0, 0, 0, 0, SootopolisCity_EventScript_1E60E3, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 26, 4, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E6017, 839 - object_event 7, EVENT_OBJ_GFX_STEVEN, 0, 20, 36, 3, 8, 1, 1, 0, 0, SootopolisCity_EventScript_1E6166, 973 - object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 49, 34, 3, 3, 1, 1, 0, 0, SootopolisCity_EventScript_1E6038, 0 - object_event 9, EVENT_OBJ_GFX_GROUDON_3, 0, 28, 44, 0, 80, 1, 1, 0, 0, 0x0, 998 - object_event 10, EVENT_OBJ_GFX_KYOGRE_3, 0, 34, 44, 1, 79, 1, 1, 0, 0, 0x0, 997 - object_event 11, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 31, 41, 1, 10, 1, 1, 0, 0, 0x0, 996 - object_event 12, EVENT_OBJ_GFX_MANIAC, 0, 17, 44, 3, 10, 1, 1, 0, 0, SootopolisCity_EventScript_1E6411, 854 - object_event 13, EVENT_OBJ_GFX_GIRL_3, 0, 14, 42, 3, 10, 1, 1, 0, 0, SootopolisCity_EventScript_1E63DB, 854 - object_event 14, EVENT_OBJ_GFX_BLACK_BELT, 0, 17, 40, 3, 10, 1, 1, 0, 0, SootopolisCity_EventScript_1E6393, 854 - object_event 15, EVENT_OBJ_GFX_BOY_2, 0, 19, 37, 3, 8, 1, 1, 0, 0, SootopolisCity_EventScript_1E635D, 854 - object_event 16, EVENT_OBJ_GFX_MAXIE, 0, 29, 33, 3, 8, 1, 1, 0, 0, SootopolisCity_EventScript_1E64F2, 827 - object_event 17, EVENT_OBJ_GFX_ARCHIE, 0, 31, 33, 3, 8, 1, 1, 0, 0, SootopolisCity_EventScript_1E651F, 826 - object_event 18, EVENT_OBJ_GFX_WALLACE, 0, 31, 18, 3, 8, 1, 1, 0, 0, SootopolisCity_EventScript_1E6446, 816 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 31, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 47, 33, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, 854 + object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 9, 43, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_EventScript_1E5ED8, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_1E608E, 0 + object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 43, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SootopolisCity_EventScript_1E60E3, 0 + object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 26, 4, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_EventScript_1E6017, 839 + object_event 7, EVENT_OBJ_GFX_STEVEN, 0, 20, 36, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6166, 973 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 49, 34, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6038, 0 + object_event 9, EVENT_OBJ_GFX_GROUDON_3, 0, 28, 44, 0, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 0, 0, 0x0, 998 + object_event 10, EVENT_OBJ_GFX_KYOGRE_3, 0, 34, 44, 1, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT, 1, 1, 0, 0, 0x0, 997 + object_event 11, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 31, 41, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 996 + object_event 12, EVENT_OBJ_GFX_MANIAC, 0, 17, 44, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E6411, 854 + object_event 13, EVENT_OBJ_GFX_GIRL_3, 0, 14, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E63DB, 854 + object_event 14, EVENT_OBJ_GFX_BLACK_BELT, 0, 17, 40, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E6393, 854 + object_event 15, EVENT_OBJ_GFX_BOY_2, 0, 19, 37, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E635D, 854 + object_event 16, EVENT_OBJ_GFX_MAXIE, 0, 29, 33, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E64F2, 827 + object_event 17, EVENT_OBJ_GFX_ARCHIE, 0, 31, 33, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E651F, 826 + object_event 18, EVENT_OBJ_GFX_WALLACE, 0, 31, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6446, 816 SootopolisCity_MapWarps: @ 85274C4 warp_def 43, 31, 0, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F diff --git a/data/maps/SootopolisCity_Gym_1F/events.inc b/data/maps/SootopolisCity_Gym_1F/events.inc index 925acc34b0..ee78e053a9 100644 --- a/data/maps/SootopolisCity_Gym_1F/events.inc +++ b/data/maps/SootopolisCity_Gym_1F/events.inc @@ -1,6 +1,6 @@ SootopolisCity_Gym_1F_EventObjects: @ 8532FF4 - object_event 1, EVENT_OBJ_GFX_JUAN, 0, 8, 2, 0, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_224F44, 0 - object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 7, 24, 3, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_225040, 0 + object_event 1, EVENT_OBJ_GFX_JUAN, 0, 8, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_224F44, 0 + object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 7, 24, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_225040, 0 SootopolisCity_Gym_1F_MapWarps: @ 8533024 warp_def 8, 25, 0, 2, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_Gym_B1F/events.inc b/data/maps/SootopolisCity_Gym_B1F/events.inc index 1ed20fc941..9f747bc4a5 100644 --- a/data/maps/SootopolisCity_Gym_B1F/events.inc +++ b/data/maps/SootopolisCity_Gym_B1F/events.inc @@ -1,14 +1,14 @@ SootopolisCity_Gym_B1F_EventObjects: @ 8533068 - object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 17, 3, 10, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225C8B, 0 - object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 9, 19, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CD0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 7, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CB9, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 11, 9, 0, 7, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_225CE7, 0 - object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 5, 6, 3, 8, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_225D15, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 8, 3, 10, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225D2C, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 4, 8, 3, 10, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225CA2, 0 - object_event 8, EVENT_OBJ_GFX_BEAUTY, 0, 9, 7, 3, 8, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225CFE, 0 - object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 13, 3, 10, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D5A, 0 - object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 13, 3, 9, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0 + object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225C8B, 0 + object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 9, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CD0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CB9, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 11, 9, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_225CE7, 0 + object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_225D15, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225D2C, 0 + object_event 7, EVENT_OBJ_GFX_LASS, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225CA2, 0 + object_event 8, EVENT_OBJ_GFX_BEAUTY, 0, 9, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225CFE, 0 + object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D5A, 0 + object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0 SootopolisCity_Gym_B1F_MapWarps: @ 8533158 warp_def 11, 22, 3, 2, MAP_SOOTOPOLIS_CITY_GYM_1F diff --git a/data/maps/SootopolisCity_House1/events.inc b/data/maps/SootopolisCity_House1/events.inc index 4ddbd23ea4..38885d648a 100644 --- a/data/maps/SootopolisCity_House1/events.inc +++ b/data/maps/SootopolisCity_House1/events.inc @@ -1,6 +1,6 @@ SootopolisCity_House1_EventObjects: @ 85332F8 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22694D, 0 - object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22698E, 0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22694D, 0 + object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22698E, 0 SootopolisCity_House1_MapWarps: @ 8533328 warp_def 3, 6, 0, 4, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_House2/events.inc b/data/maps/SootopolisCity_House2/events.inc index 213fe39d34..a8885190e0 100644 --- a/data/maps/SootopolisCity_House2/events.inc +++ b/data/maps/SootopolisCity_House2/events.inc @@ -1,5 +1,5 @@ SootopolisCity_House2_EventObjects: @ 853334C - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0 SootopolisCity_House2_MapWarps: @ 8533364 warp_def 3, 6, 0, 5, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_House3/events.inc b/data/maps/SootopolisCity_House3/events.inc index 0feca97cb2..9f5cc781ef 100644 --- a/data/maps/SootopolisCity_House3/events.inc +++ b/data/maps/SootopolisCity_House3/events.inc @@ -1,6 +1,6 @@ SootopolisCity_House3_EventObjects: @ 8533388 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 4, 3, 8, 0, 0, 0, 0, SootopolisCity_House3_EventScript_226B72, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 6, 4, 3, 2, 1, 1, 0, 0, SootopolisCity_House3_EventScript_226B9B, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_House3_EventScript_226B72, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House3_EventScript_226B9B, 0 SootopolisCity_House3_MapWarps: @ 85333B8 warp_def 3, 6, 0, 6, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_House4/events.inc b/data/maps/SootopolisCity_House4/events.inc index 1f14ba6e99..d9948d5bed 100644 --- a/data/maps/SootopolisCity_House4/events.inc +++ b/data/maps/SootopolisCity_House4/events.inc @@ -1,7 +1,7 @@ SootopolisCity_House4_EventObjects: @ 85333DC - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House4_EventScript_226D16, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 2, 3, 7, 1, 2, 0, 0, SootopolisCity_House4_EventScript_226D1F, 0 - object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 3, 3, 1, 1, 1, 0, 0, SootopolisCity_House4_EventScript_226D28, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House4_EventScript_226D16, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 2, 0, 0, SootopolisCity_House4_EventScript_226D1F, 0 + object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SootopolisCity_House4_EventScript_226D28, 0 SootopolisCity_House4_MapWarps: @ 8533424 warp_def 3, 6, 0, 7, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_House5/events.inc b/data/maps/SootopolisCity_House5/events.inc index 566631c026..321de8b64a 100644 --- a/data/maps/SootopolisCity_House5/events.inc +++ b/data/maps/SootopolisCity_House5/events.inc @@ -1,6 +1,6 @@ SootopolisCity_House5_EventObjects: @ 8533448 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E94, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 6, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E9D, 0 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E94, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E9D, 0 SootopolisCity_House5_MapWarps: @ 8533478 warp_def 3, 6, 0, 8, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_House6/events.inc b/data/maps/SootopolisCity_House6/events.inc index a85356317e..4ca7e57453 100644 --- a/data/maps/SootopolisCity_House6/events.inc +++ b/data/maps/SootopolisCity_House6/events.inc @@ -1,5 +1,5 @@ SootopolisCity_House6_EventObjects: @ 853349C - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 3, 3, 2, 1, 1, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0 SootopolisCity_House6_MapWarps: @ 85334B4 warp_def 3, 6, 0, 9, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_House7/events.inc b/data/maps/SootopolisCity_House7/events.inc index 65b0cf9ddb..76a198f6ec 100644 --- a/data/maps/SootopolisCity_House7/events.inc +++ b/data/maps/SootopolisCity_House7/events.inc @@ -1,6 +1,6 @@ SootopolisCity_House7_EventObjects: @ 85334D8 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House7_EventScript_2270CC, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 4, 3, 2, 1, 1, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_House7_EventScript_2270CC, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0 SootopolisCity_House7_MapWarps: @ 8533508 warp_def 3, 6, 0, 10, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc index 84e642bac9..8d05129523 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc @@ -1,6 +1,6 @@ SootopolisCity_LotadAndSeedotHouse_EventObjects: @ 853352C - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 5, 4, 3, 9, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22722B, 0 + object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22722B, 0 SootopolisCity_LotadAndSeedotHouse_MapWarps: @ 853355C warp_def 3, 6, 0, 11, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_Mart/events.inc b/data/maps/SootopolisCity_Mart/events.inc index 0c32cb4829..32fc081d23 100644 --- a/data/maps/SootopolisCity_Mart/events.inc +++ b/data/maps/SootopolisCity_Mart/events.inc @@ -1,7 +1,7 @@ SootopolisCity_Mart_EventObjects: @ 853328C - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_226795, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267C2, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267EC, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_226795, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267C2, 0 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267EC, 0 SootopolisCity_Mart_MapWarps: @ 85332D4 warp_def 3, 7, 0, 1, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc index bf06c2cd9e..4eb796671f 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc @@ -1,5 +1,5 @@ SootopolisCity_MysteryEventsHouse_1F_EventObjects: @ 8533598 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 6, 4, 0, 10, 0, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 6, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0 SootopolisCity_MysteryEventsHouse_1F_MapWarps: @ 85335B0 warp_def 3, 7, 0, 12, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc index 21ea255a42..39b3366c5d 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc @@ -1,5 +1,5 @@ SootopolisCity_MysteryEventsHouse_B1F_EventObjects: @ 85335DC - object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 6, 5, 0, 9, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 6, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0 SootopolisCity_MysteryEventsHouse_B1F_MapWarps: @ 85335F4 warp_def 3, 1, 0, 2, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc index 9bca02a56f..4ca22d1f8d 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ SootopolisCity_PokemonCenter_1F_EventObjects: @ 8533174 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226500, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 4, 3, 2, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_22650E, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 7, 3, 5, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226538, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 2, 3, 3, 2, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_2C8256, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226500, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_22650E, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226538, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_2C8256, 0 SootopolisCity_PokemonCenter_1F_MapWarps: @ 85331D4 warp_def 7, 8, 3, 0, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc index 8498f9de2e..f9e4626ea9 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ SootopolisCity_PokemonCenter_2F_EventObjects: @ 8533200 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_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, SootopolisCity_PokemonCenter_2F_EventScript_276B03, 702 SootopolisCity_PokemonCenter_2F_MapWarps: @ 8533260 warp_def 1, 6, 4, 2, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F diff --git a/data/maps/SouthernIsland_Exterior/events.inc b/data/maps/SouthernIsland_Exterior/events.inc index 69cddf6036..d204708db8 100644 --- a/data/maps/SouthernIsland_Exterior/events.inc +++ b/data/maps/SouthernIsland_Exterior/events.inc @@ -1,6 +1,6 @@ SouthernIsland_Exterior_EventObjects: @ 853B83C - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 23, 3, 7, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_2429D2, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 25, 1, 10, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 23, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_2429D2, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 25, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 SouthernIsland_Exterior_MapWarps: @ 853B86C warp_def 14, 5, 3, 0, MAP_SOUTHERN_ISLAND_INTERIOR diff --git a/data/maps/SouthernIsland_Interior/events.inc b/data/maps/SouthernIsland_Interior/events.inc index c31a5568be..55bfeb6144 100644 --- a/data/maps/SouthernIsland_Interior/events.inc +++ b/data/maps/SouthernIsland_Interior/events.inc @@ -1,6 +1,6 @@ SouthernIsland_Interior_EventObjects: @ 853B89C - object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 13, 12, 3, 7, 0, 0, 0, 0, 0x0, 910 - object_event 2, EVENT_OBJ_GFX_TRADER, 0, 13, 2, 0, 8, 0, 0, 0, 0, 0x0, 911 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 13, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 910 + object_event 2, EVENT_OBJ_GFX_TRADER, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 911 SouthernIsland_Interior_MapWarps: @ 853B8CC warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR diff --git a/data/maps/TerraCave_End/events.inc b/data/maps/TerraCave_End/events.inc index 61edb1e282..b47a004419 100644 --- a/data/maps/TerraCave_End/events.inc +++ b/data/maps/TerraCave_End/events.inc @@ -1,5 +1,5 @@ TerraCave_End_EventObjects: @ 8537850 - object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 17, 22, 1, 8, 1, 1, 0, 0, 0x0, 783 + object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 17, 22, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 783 TerraCave_End_MapWarps: @ 8537868 warp_def 5, 4, 3, 1, MAP_TERRA_CAVE_ENTRANCE diff --git a/data/maps/TradeCenter/events.inc b/data/maps/TradeCenter/events.inc index 89e5eac907..a2156ff483 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 diff --git a/data/maps/TrainerHill_Elevator/events.inc b/data/maps/TrainerHill_Elevator/events.inc index 7af4c54255..0125c99361 100644 --- a/data/maps/TrainerHill_Elevator/events.inc +++ b/data/maps/TrainerHill_Elevator/events.inc @@ -1,5 +1,5 @@ TrainerHill_Elevator_EventObjects: @ 853DD84 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 3, 8, 1, 1, 0, 0, TrainerHill_Elevator_EventScript_26935F, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Elevator_EventScript_26935F, 0 TrainerHill_Elevator_MapWarps: @ 853DD9C warp_def 1, 6, 3, 1, MAP_TRAINER_HILL_ROOF diff --git a/data/maps/TrainerHill_Entrance/events.inc b/data/maps/TrainerHill_Entrance/events.inc index 4b974ce9b8..8cb0b43b96 100644 --- a/data/maps/TrainerHill_Entrance/events.inc +++ b/data/maps/TrainerHill_Entrance/events.inc @@ -1,9 +1,9 @@ TrainerHill_Entrance_EventObjects: @ 853D874 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 6, 3, 9, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2681FD, 0 - object_event 2, EVENT_OBJ_GFX_NURSE, 0, 4, 9, 3, 8, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2681EF, 0 - object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 14, 9, 3, 8, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683C7, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 5, 14, 3, 2, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683AC, 0 - object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 14, 15, 3, 2, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_268391, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2681FD, 0 + object_event 2, EVENT_OBJ_GFX_NURSE, 0, 4, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2681EF, 0 + object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 14, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683C7, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 5, 14, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683AC, 0 + object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 14, 15, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_268391, 0 TrainerHill_Entrance_MapWarps: @ 853D8EC warp_def 9, 16, 3, 4, MAP_ROUTE111 diff --git a/data/maps/TrainerHill_Roof/events.inc b/data/maps/TrainerHill_Roof/events.inc index c322d7e96c..eeab57317c 100644 --- a/data/maps/TrainerHill_Roof/events.inc +++ b/data/maps/TrainerHill_Roof/events.inc @@ -1,5 +1,5 @@ TrainerHill_Roof_EventObjects: @ 853D9C4 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 7, 3, 8, 1, 1, 0, 0, TrainerHill_Roof_EventScript_268FB2, 0 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Roof_EventScript_268FB2, 0 TrainerHill_Roof_MapWarps: @ 853D9DC warp_def 9, 5, 3, 1, MAP_TRAINER_HILL_4F diff --git a/data/maps/Underwater_SeafloorCavern/events.inc b/data/maps/Underwater_SeafloorCavern/events.inc index a22465ca0c..fbad57bc8f 100644 --- a/data/maps/Underwater_SeafloorCavern/events.inc +++ b/data/maps/Underwater_SeafloorCavern/events.inc @@ -1,8 +1,8 @@ Underwater_SeafloorCavern_EventObjects: @ 8535640 - object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 - object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 - object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 - object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 + object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 + object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 + object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 + object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 Underwater_SeafloorCavern_MapWarps: @ 85356A0 warp_def 6, 7, 0, 0, MAP_UNDERWATER4 diff --git a/data/maps/UnionRoom/events.inc b/data/maps/UnionRoom/events.inc index 1a50ea7d81..3396b5b8bb 100644 --- a/data/maps/UnionRoom/events.inc +++ b/data/maps/UnionRoom/events.inc @@ -1,13 +1,13 @@ UnionRoom_EventObjects: @ 853B020 - object_event 1, EVENT_OBJ_GFX_UNION_ROOM_NURSE, 0, 3, 2, 3, 8, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0 - object_event 2, EVENT_OBJ_GFX_GIDDY, 0, 1, 8, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D204, 706 - object_event 3, 247, 0, 7, 8, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D22C, 710 - object_event 4, 246, 0, 1, 4, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D222, 709 - object_event 5, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 7, 4, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D218, 708 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 13, 4, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D20E, 707 - object_event 7, EVENT_OBJ_GFX_STORYTELLER, 0, 10, 6, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D1FA, 705 - object_event 8, EVENT_OBJ_GFX_TRADER, 0, 13, 8, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D1F0, 704 - object_event 9, EVENT_OBJ_GFX_HIPSTER, 0, 4, 6, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D1E6, 703 + object_event 1, EVENT_OBJ_GFX_UNION_ROOM_NURSE, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0 + object_event 2, EVENT_OBJ_GFX_GIDDY, 0, 1, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D204, 706 + object_event 3, 247, 0, 7, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D22C, 710 + object_event 4, 246, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D222, 709 + object_event 5, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D218, 708 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 13, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D20E, 707 + object_event 7, EVENT_OBJ_GFX_STORYTELLER, 0, 10, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1FA, 705 + object_event 8, EVENT_OBJ_GFX_TRADER, 0, 13, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1F0, 704 + object_event 9, EVENT_OBJ_GFX_HIPSTER, 0, 4, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1E6, 703 UnionRoom_MapWarps: @ 853B0F8 warp_def 7, 11, 3, 127, MAP_NONE diff --git a/data/maps/VerdanturfTown/events.inc b/data/maps/VerdanturfTown/events.inc index c844cfa1a2..0a871136f0 100644 --- a/data/maps/VerdanturfTown/events.inc +++ b/data/maps/VerdanturfTown/events.inc @@ -1,8 +1,8 @@ VerdanturfTown_EventObjects: @ 8527CDC - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 17, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5A8, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 2, 3, 9, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB575, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 11, 3, 3, 0, 1, 0, 0, VerdanturfTown_EventScript_1EB5BA, 0 - object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 7, 6, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5B1, 0 + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 17, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5A8, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB575, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 11, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, VerdanturfTown_EventScript_1EB5BA, 0 + object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 7, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5B1, 0 VerdanturfTown_MapWarps: @ 8527D3C warp_def 3, 7, 0, 0, MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc index 6276192b37..616c0db5e7 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc @@ -1,7 +1,7 @@ VerdanturfTown_BattleTentBattleRoom_EventObjects: @ 852E734 - object_event 1, EVENT_OBJ_GFX_TRADER, 0, 2, 8, 3, 7, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 11, 1, 3, 8, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 4, 0, 10, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_TRADER, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 11, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 VerdanturfTown_BattleTentBattleRoom_MapEvents:: @ 852E77C map_events VerdanturfTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/events.inc b/data/maps/VerdanturfTown_BattleTentCorridor/events.inc index 4fa836d58e..c661738362 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/events.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/events.inc @@ -1,5 +1,5 @@ VerdanturfTown_BattleTentCorridor_EventObjects: @ 852E708 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 6, 3, 7, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 VerdanturfTown_BattleTentCorridor_MapEvents:: @ 852E720 map_events VerdanturfTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_BattleTentLobby/events.inc b/data/maps/VerdanturfTown_BattleTentLobby/events.inc index 570e600fe7..4b9b254a89 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/events.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/events.inc @@ -1,10 +1,10 @@ VerdanturfTown_BattleTentLobby_EventObjects: @ 852E648 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 5, 3, 8, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201873, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 5, 3, 2, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0 - object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 9, 7, 3, 2, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 1, 8, 3, 10, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AC5, 0 - object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 12, 6, 3, 9, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, 766 - object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 2, 8, 3, 9, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201873, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0 + object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 9, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 1, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AC5, 0 + object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, 766 + object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0 VerdanturfTown_BattleTentLobby_MapWarps: @ 852E6D8 warp_def 6, 9, 0, 0, MAP_VERDANTURF_TOWN diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc index fd5fa02921..fa3e095614 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc @@ -1,6 +1,6 @@ VerdanturfTown_FriendshipRatersHouse_EventObjects: @ 852E9C8 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203031, 0 - object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203031, 0 + object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA, 0 VerdanturfTown_FriendshipRatersHouse_MapWarps: @ 852E9F8 warp_def 3, 7, 0, 5, MAP_VERDANTURF_TOWN diff --git a/data/maps/VerdanturfTown_House/events.inc b/data/maps/VerdanturfTown_House/events.inc index 49b8d47ee4..5de3820526 100644 --- a/data/maps/VerdanturfTown_House/events.inc +++ b/data/maps/VerdanturfTown_House/events.inc @@ -1,6 +1,6 @@ VerdanturfTown_House_EventObjects: @ 852EA1C - object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 5, 3, 7, 0, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0 VerdanturfTown_House_MapWarps: @ 852EA4C warp_def 3, 8, 0, 6, MAP_VERDANTURF_TOWN diff --git a/data/maps/VerdanturfTown_Mart/events.inc b/data/maps/VerdanturfTown_Mart/events.inc index 804f396470..5bdbce786c 100644 --- a/data/maps/VerdanturfTown_Mart/events.inc +++ b/data/maps/VerdanturfTown_Mart/events.inc @@ -1,8 +1,8 @@ VerdanturfTown_Mart_EventObjects: @ 852E790 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_202587, 0 - object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025BA, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025C3, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 3, 2, 3, 9, 1, 1, 0, 0, VerdanturfTown_Mart_EventScript_2025CC, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_202587, 0 + object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025BA, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025C3, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_Mart_EventScript_2025CC, 0 VerdanturfTown_Mart_MapWarps: @ 852E7F0 warp_def 3, 7, 0, 1, MAP_VERDANTURF_TOWN diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc index 77bd6748c2..3faee7bda7 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ VerdanturfTown_PokemonCenter_1F_EventObjects: @ 852E814 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_20273A, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 5, 3, 5, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202748, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 2, 3, 7, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202751, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 10, 6, 3, 9, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_20273A, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202748, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202751, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0 VerdanturfTown_PokemonCenter_1F_MapWarps: @ 852E874 warp_def 7, 8, 3, 2, MAP_VERDANTURF_TOWN diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc index 40cbe6aec9..6aa0d681a2 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ VerdanturfTown_PokemonCenter_2F_EventObjects: @ 852E8A0 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_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, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, 702 VerdanturfTown_PokemonCenter_2F_MapWarps: @ 852E900 warp_def 1, 6, 4, 2, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/VerdanturfTown_WandasHouse/events.inc b/data/maps/VerdanturfTown_WandasHouse/events.inc index cfa46e1024..e55967bd77 100644 --- a/data/maps/VerdanturfTown_WandasHouse/events.inc +++ b/data/maps/VerdanturfTown_WandasHouse/events.inc @@ -1,9 +1,9 @@ VerdanturfTown_WandasHouse_EventObjects: @ 852E92C - object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 5, 3, 2, 1, 1, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, 806 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, 808 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, 809 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, 984 + object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, 806 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, 808 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, 809 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, 984 VerdanturfTown_WandasHouse_MapWarps: @ 852E9A4 warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN diff --git a/data/maps/VictoryRoad_1F/events.inc b/data/maps/VictoryRoad_1F/events.inc index d5fa881dc8..0c94c31a2e 100644 --- a/data/maps/VictoryRoad_1F/events.inc +++ b/data/maps/VictoryRoad_1F/events.inc @@ -1,13 +1,13 @@ VictoryRoad_1F_EventObjects: @ 8535E04 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 33, 22, 3, 8, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 6, 15, 4, 9, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 27, 34, 3, 18, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0 - object_event 4, EVENT_OBJ_GFX_WALLY, 0, 12, 25, 4, 8, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E2C, 858 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 40, 26, 3, 1, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291483, 1084 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 39, 4, 1, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291490, 1085 - object_event 7, EVENT_OBJ_GFX_WALLY, 0, 31, 9, 3, 1, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E35, 751 - object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 29, 17, 3, 10, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0 - object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 32, 17, 3, 9, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 33, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 6, 15, 4, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 27, 34, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0 + object_event 4, EVENT_OBJ_GFX_WALLY, 0, 12, 25, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E2C, 858 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 40, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291483, 1084 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 39, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291490, 1085 + object_event 7, EVENT_OBJ_GFX_WALLY, 0, 31, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E35, 751 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 29, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0 + object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 32, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0 VictoryRoad_1F_MapWarps: @ 8535EDC warp_def 15, 40, 3, 2, MAP_EVER_GRANDE_CITY diff --git a/data/maps/VictoryRoad_B1F/events.inc b/data/maps/VictoryRoad_B1F/events.inc index 26d67171d5..f96b0d4bce 100644 --- a/data/maps/VictoryRoad_B1F/events.inc +++ b/data/maps/VictoryRoad_B1F/events.inc @@ -1,25 +1,25 @@ VictoryRoad_B1F_EventObjects: @ 8535F44 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 19 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 20 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 17 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 10, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 18 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 23 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 22 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 6, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 30 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 25 - object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 26 - object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 12, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 27 - object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 28 - object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 29 - object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 31 - object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 37, 12, 3, 9, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_2364E5, 0 - object_event 15, EVENT_OBJ_GFX_WOMAN_7, 0, 26, 16, 3, 7, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_2364FC, 0 - object_event 16, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 21, 3, 9, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_236513, 0 - object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 3, 3, 1, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 21 - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 8, 4, 1, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_29149D, 1086 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 3, 3, 1, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2914AA, 1087 - object_event 20, EVENT_OBJ_GFX_MAN_4, 0, 14, 16, 3, 8, 1, 1, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0 - object_event 21, EVENT_OBJ_GFX_WOMAN_7, 0, 14, 20, 3, 16, 1, 1, 1, 3, VictoryRoad_B1F_EventScript_236541, 0 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 19 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 20 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 17 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 18 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 23 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 22 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 30 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 25 + object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 26 + object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 27 + object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 28 + object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 29 + object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 31 + object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 37, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_2364E5, 0 + object_event 15, EVENT_OBJ_GFX_WOMAN_7, 0, 26, 16, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_2364FC, 0 + object_event 16, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_236513, 0 + object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 21 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 8, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_29149D, 1086 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2914AA, 1087 + object_event 20, EVENT_OBJ_GFX_MAN_4, 0, 14, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0 + object_event 21, EVENT_OBJ_GFX_WOMAN_7, 0, 14, 20, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, VictoryRoad_B1F_EventScript_236541, 0 VictoryRoad_B1F_MapWarps: @ 853613C warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B2F diff --git a/data/maps/VictoryRoad_B2F/events.inc b/data/maps/VictoryRoad_B2F/events.inc index a25c76c813..ca7719bd7b 100644 --- a/data/maps/VictoryRoad_B2F/events.inc +++ b/data/maps/VictoryRoad_B2F/events.inc @@ -1,11 +1,11 @@ VictoryRoad_B2F_EventObjects: @ 8536188 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 15, 6, 3, 8, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 43, 14, 3, 7, 1, 1, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 17, 3, 8, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236903, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 35, 22, 3, 9, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_23691A, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 8, 3, 1, 1, 1, 0, 0, VictoryRoad_B2F_EventScript_2914B7, 1088 - object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 25, 18, 4, 8, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236948, 0 - object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 25, 21, 4, 7, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236931, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 43, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236903, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 35, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_23691A, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B2F_EventScript_2914B7, 1088 + object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 25, 18, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236948, 0 + object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 25, 21, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236931, 0 VictoryRoad_B2F_MapWarps: @ 8536230 warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B1F From 7d375972ba0e5a8a17fecbd223dd6de6e87b6090 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 11 Jul 2018 11:12:26 -0500 Subject: [PATCH 48/55] Sync bg_event macros with pokeruby --- asm/macros/map.inc | 29 ++++- data/map_events.s | 3 + .../AbandonedShip_Corridors_B1F/events.inc | 2 +- .../events.inc | 8 +- .../AbandonedShip_HiddenFloorRooms/events.inc | 20 ++-- data/maps/AncientTomb/events.inc | 6 +- data/maps/AquaHideout_B2F/events.inc | 4 +- data/maps/ArtisanCave_B1F/events.inc | 8 +- .../events.inc | 4 +- .../BattleFrontier_BattleDomeLobby/events.inc | 8 +- .../events.inc | 6 +- .../events.inc | 6 +- .../BattleFrontier_BattlePikeLobby/events.inc | 4 +- .../events.inc | 14 +-- .../events.inc | 14 +-- .../events.inc | 18 +-- .../events.inc | 4 +- .../events.inc | 2 +- .../events.inc | 10 +- .../BattleFrontier_OutsideEast/events.inc | 16 +-- .../BattleFrontier_OutsideWest/events.inc | 10 +- .../BattleFrontier_RankingHall/events.inc | 24 ++-- data/maps/DesertRuins/events.inc | 6 +- data/maps/DewfordTown/events.inc | 10 +- data/maps/DewfordTown_Gym/events.inc | 8 +- data/maps/DewfordTown_Hall/events.inc | 4 +- data/maps/DoubleBattleColosseum/events.inc | 8 +- data/maps/EverGrandeCity/events.inc | 32 ++--- data/maps/FallarborTown/events.inc | 16 +-- .../FallarborTown_BattleTentLobby/events.inc | 2 +- data/maps/FarawayIsland_Entrance/events.inc | 8 +- data/maps/FortreeCity/events.inc | 12 +- data/maps/FortreeCity_Gym/events.inc | 4 +- data/maps/GraniteCave_B2F/events.inc | 4 +- data/maps/InsideOfTruck/events.inc | 16 +-- data/maps/IslandCave/events.inc | 6 +- data/maps/JaggedPass/events.inc | 24 ++-- data/maps/LavaridgeTown/events.inc | 18 +-- data/maps/LavaridgeTown_Gym_1F/events.inc | 4 +- data/maps/LilycoveCity/events.inc | 26 ++--- data/maps/LilycoveCity_ContestHall/events.inc | 12 +- .../maps/LilycoveCity_ContestLobby/events.inc | 24 ++-- .../LilycoveCity_CoveLilyMotel_1F/events.inc | 2 +- .../events.inc | 4 +- .../events.inc | 2 +- .../LilycoveCity_LilycoveMuseum_1F/events.inc | 32 ++--- .../LilycoveCity_LilycoveMuseum_2F/events.inc | 24 ++-- data/maps/LittlerootTown/events.inc | 26 ++--- .../events.inc | 8 +- .../events.inc | 8 +- .../LittlerootTown_MaysHouse_1F/events.inc | 8 +- .../LittlerootTown_MaysHouse_2F/events.inc | 8 +- .../events.inc | 30 ++--- data/maps/MarineCave_End/events.inc | 2 +- data/maps/MauvilleCity/events.inc | 16 +-- data/maps/MauvilleCity_BikeShop/events.inc | 4 +- data/maps/MauvilleCity_GameCorner/events.inc | 48 ++++---- data/maps/MauvilleCity_Gym/events.inc | 12 +- data/maps/MeteorFalls_1F_1R/events.inc | 4 +- data/maps/MeteorFalls_1F_2R/events.inc | 2 +- data/maps/MossdeepCity/events.inc | 36 +++--- .../MossdeepCity_GameCorner_1F/events.inc | 6 +- data/maps/MossdeepCity_Gym/events.inc | 22 ++-- .../maps/MossdeepCity_StevensHouse/events.inc | 8 +- data/maps/MtChimney/events.inc | 4 +- data/maps/MtPyre_Exterior/events.inc | 14 +-- data/maps/MtPyre_Summit/events.inc | 16 +-- data/maps/NavelRock_Top/events.inc | 4 +- data/maps/NewMauville_Entrance/events.inc | 2 +- data/maps/NewMauville_Inside/events.inc | 36 +++--- data/maps/OldaleTown/events.inc | 18 +-- data/maps/PacifidlogTown/events.inc | 6 +- data/maps/PetalburgCity/events.inc | 32 ++--- data/maps/PetalburgCity_Gym/events.inc | 28 ++--- data/maps/PetalburgWoods/events.inc | 16 +-- data/maps/RecordCorner/events.inc | 8 +- data/maps/Route101/events.inc | 20 ++-- data/maps/Route102/events.inc | 4 +- data/maps/Route103/events.inc | 2 +- data/maps/Route104/events.inc | 22 ++-- data/maps/Route105/events.inc | 4 +- data/maps/Route106/events.inc | 8 +- data/maps/Route108/events.inc | 2 +- data/maps/Route109/events.inc | 16 +-- data/maps/Route110/events.inc | 52 ++++----- .../events.inc | 4 +- .../events.inc | 4 +- data/maps/Route110_TrickHouseEnd/events.inc | 4 +- .../Route110_TrickHouseEntrance/events.inc | 10 +- .../Route110_TrickHousePuzzle1/events.inc | 2 +- .../Route110_TrickHousePuzzle2/events.inc | 10 +- .../Route110_TrickHousePuzzle3/events.inc | 10 +- .../Route110_TrickHousePuzzle4/events.inc | 2 +- .../Route110_TrickHousePuzzle5/events.inc | 46 ++++---- .../Route110_TrickHousePuzzle6/events.inc | 2 +- .../Route110_TrickHousePuzzle7/events.inc | 10 +- .../Route110_TrickHousePuzzle8/events.inc | 2 +- data/maps/Route111/events.inc | 104 ++++++++--------- data/maps/Route112/events.inc | 6 +- data/maps/Route113/events.inc | 54 ++++----- data/maps/Route114/events.inc | 24 ++-- .../Route114_FossilManiacsHouse/events.inc | 8 +- .../Route114_FossilManiacsTunnel/events.inc | 4 +- data/maps/Route114_LanettesHouse/events.inc | 6 +- data/maps/Route115/events.inc | 28 ++--- data/maps/Route116/events.inc | 24 ++-- data/maps/Route117/events.inc | 8 +- data/maps/Route118/events.inc | 24 ++-- data/maps/Route119/events.inc | 86 +++++++------- .../Route119_WeatherInstitute_1F/events.inc | 8 +- data/maps/Route120/events.inc | 66 +++++------ data/maps/Route121/events.inc | 28 ++--- .../Route121_SafariZoneEntrance/events.inc | 4 +- data/maps/Route123/events.inc | 66 +++++------ data/maps/Route124/events.inc | 2 +- .../events.inc | 2 +- data/maps/Route125/events.inc | 8 +- data/maps/Route127/events.inc | 10 +- data/maps/Route128/events.inc | 6 +- data/maps/RustboroCity/events.inc | 62 +++++----- .../maps/RustboroCity_DevonCorp_1F/events.inc | 4 +- .../maps/RustboroCity_DevonCorp_3F/events.inc | 4 +- data/maps/RustboroCity_Gym/events.inc | 4 +- .../RustboroCity_PokemonSchool/events.inc | 10 +- data/maps/RusturfTunnel/events.inc | 10 +- data/maps/SSTidalCorridor/events.inc | 24 ++-- data/maps/SSTidalLowerDeck/events.inc | 2 +- data/maps/SSTidalRooms/events.inc | 4 +- data/maps/SafariZone_Northeast/events.inc | 4 +- data/maps/SafariZone_Southeast/events.inc | 4 +- data/maps/SafariZone_Southwest/events.inc | 2 +- data/maps/SeafloorCavern_Room9/events.inc | 2 +- data/maps/SealedChamber_InnerRoom/events.inc | 18 +-- data/maps/SealedChamber_OuterRoom/events.inc | 58 ++++----- .../ShoalCave_LowTideInnerRoom/events.inc | 12 +- .../ShoalCave_LowTideLowerRoom/events.inc | 2 +- .../ShoalCave_LowTideStairsRoom/events.inc | 2 +- data/maps/SingleBattleColosseum/events.inc | 4 +- data/maps/SkyPillar_Top/events.inc | 2 +- data/maps/SlateportCity/events.inc | 28 ++--- .../SlateportCity_BattleTentLobby/events.inc | 2 +- data/maps/SlateportCity_Harbor/events.inc | 8 +- .../SlateportCity_OceanicMuseum_1F/events.inc | 30 ++--- .../SlateportCity_OceanicMuseum_2F/events.inc | 42 +++---- data/maps/SootopolisCity/events.inc | 12 +- data/maps/SootopolisCity_Gym_1F/events.inc | 4 +- .../events.inc | 4 +- data/maps/SouthernIsland_Exterior/events.inc | 2 +- data/maps/SouthernIsland_Interior/events.inc | 2 +- data/maps/TerraCave_End/events.inc | 2 +- data/maps/TradeCenter/events.inc | 4 +- data/maps/TrainerHill_Entrance/events.inc | 4 +- data/maps/Underwater1/events.inc | 14 +-- data/maps/Underwater2/events.inc | 16 +-- data/maps/Underwater3/events.inc | 8 +- data/maps/Underwater4/events.inc | 4 +- data/maps/Underwater_SealedChamber/events.inc | 2 +- data/maps/VerdanturfTown/events.inc | 16 +-- .../VerdanturfTown_BattleTentLobby/events.inc | 2 +- data/maps/VictoryRoad_1F/events.inc | 6 +- data/maps/VictoryRoad_B2F/events.inc | 4 +- include/constants/bg_event_constants.h | 13 +++ include/constants/secret_bases.h | 110 ++++++++++++++++++ src/item_use.c | 5 +- src/secret_base.c | 7 +- 165 files changed, 1251 insertions(+), 1106 deletions(-) create mode 100755 include/constants/bg_event_constants.h create mode 100755 include/constants/secret_bases.h diff --git a/asm/macros/map.inc b/asm/macros/map.inc index 69b3629f6b..23806b4ccd 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -34,18 +34,27 @@ inc _num_warps .endm - .macro coord_event x, y, byte1, byte2, word1, word2, word3, script + .macro coord_event x, y, elevation, trigger, index, script .2byte \x, \y - .byte \byte1, \byte2 - .2byte \word1, \word2, \word3 + .byte \elevation, 0 + .2byte \trigger, \index, 0 .4byte \script inc _num_traps .endm - .macro bg_event x, y, byte, kind, word, arg6, arg7, arg8 + .macro coord_weather_event x, y, elevation, weather .2byte \x, \y - .byte \byte, \kind - .2byte \word + .byte \elevation, 0 + .2byte \weather + .2byte 0, 0 + .4byte 0 + inc _num_traps + .endm + + .macro bg_event x, y, elevation, kind, arg6, arg7, arg8 + .2byte \x, \y + .byte \elevation, \kind + .2byte 0 .if \kind < 5 .4byte \arg6 .else @@ -55,6 +64,14 @@ inc _num_signs .endm + .macro bg_hidden_item_event x, y, height, item, flag + bg_event \x, \y, \height, 7, \item, \flag, 0 + .endm + + .macro bg_secret_base_event x, y, height, secret_base_id + bg_event \x, \y, \height, 8, \secret_base_id, 0, 0 + .endm + .macro map_events npcs, warps, traps, signs .byte _num_npcs, _num_warps, _num_traps, _num_signs .4byte \npcs, \warps, \traps, \signs diff --git a/data/map_events.s b/data/map_events.s index d268cba635..1d4813b733 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,9 +1,12 @@ +#include "constants/bg_event_constants.h" #include "constants/event_object_movement_constants.h" #include "constants/event_objects.h" #include "constants/flags.h" #include "constants/items.h" #include "constants/maps.h" +#include "constants/secret_bases.h" #include "constants/vars.h" +#include "constants/weather.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/maps/AbandonedShip_Corridors_B1F/events.inc b/data/maps/AbandonedShip_Corridors_B1F/events.inc index d3b72825ef..34bc41cf05 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/events.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/events.inc @@ -13,7 +13,7 @@ AbandonedShip_Corridors_B1F_MapWarps: @ 8536838 warp_def 8, 2, 3, 9, MAP_ABANDONED_SHIP_CORRIDORS_1F AbandonedShip_Corridors_B1F_MapBGEvents: @ 8536878 - bg_event 11, 4, 3, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DC8 + bg_event 11, 4, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_Corridors_B1F_EventScript_237DC8 AbandonedShip_Corridors_B1F_MapEvents:: @ 8536884 map_events AbandonedShip_Corridors_B1F_EventObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc index fd5cb4ac83..54453b7290 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc @@ -7,10 +7,10 @@ AbandonedShip_HiddenFloorCorridors_MapWarps: @ 8536ACC warp_def 9, 3, 3, 8, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS AbandonedShip_HiddenFloorCorridors_MapBGEvents: @ 8536AFC - bg_event 3, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A19 - bg_event 6, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A50 - bg_event 3, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A87 - bg_event 9, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238ABE + bg_event 3, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A19 + bg_event 6, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A50 + bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A87 + bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238ABE AbandonedShip_HiddenFloorCorridors_MapEvents:: @ 8536B2C map_events 0x0, AbandonedShip_HiddenFloorCorridors_MapWarps, 0x0, AbandonedShip_HiddenFloorCorridors_MapBGEvents diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc index 3c9cb9a0dd..07dd3558be 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc @@ -16,16 +16,16 @@ AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0 warp_def 36, 1, 3, 5, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8 - bg_event 42, 10, 3, 7, 0, ITEM_ROOM_1_KEY, 31, 0 - bg_event 20, 5, 3, 7, 0, ITEM_ROOM_2_KEY, 32, 0 - bg_event 1, 12, 3, 7, 0, ITEM_ROOM_4_KEY, 33, 0 - bg_event 1, 2, 0, 7, 0, ITEM_ROOM_6_KEY, 34, 0 - bg_event 8, 5, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - bg_event 11, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - bg_event 10, 10, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - bg_event 16, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - bg_event 25, 2, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - bg_event 24, 6, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 + bg_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, 31 + bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, 32 + bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, 33 + bg_hidden_item_event 1, 2, 0, ITEM_ROOM_6_KEY, 34 + bg_event 8, 5, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 + bg_event 11, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 + bg_event 10, 10, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 + bg_event 16, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 + bg_event 25, 2, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 + bg_event 24, 6, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 AbandonedShip_HiddenFloorRooms_MapEvents:: @ 8536C60 map_events AbandonedShip_HiddenFloorRooms_EventObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents diff --git a/data/maps/AncientTomb/events.inc b/data/maps/AncientTomb/events.inc index 8008e9d5c5..207744c307 100644 --- a/data/maps/AncientTomb/events.inc +++ b/data/maps/AncientTomb/events.inc @@ -7,9 +7,9 @@ AncientTomb_MapWarps: @ 8536CF4 warp_def 8, 11, 3, 1, MAP_ANCIENT_TOMB AncientTomb_MapBGEvents: @ 8536D0C - bg_event 8, 20, 0, 0, 0, AncientTomb_EventScript_239033 - bg_event 7, 20, 0, 0, 0, AncientTomb_EventScript_239050 - bg_event 9, 20, 0, 0, 0, AncientTomb_EventScript_239050 + bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239033 + bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239050 + bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239050 AncientTomb_MapEvents:: @ 8536D30 map_events AncientTomb_EventObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents diff --git a/data/maps/AquaHideout_B2F/events.inc b/data/maps/AquaHideout_B2F/events.inc index 628ff11589..09846d401c 100644 --- a/data/maps/AquaHideout_B2F/events.inc +++ b/data/maps/AquaHideout_B2F/events.inc @@ -19,8 +19,8 @@ AquaHideout_B2F_MapWarps: @ 85355BC warp_def 32, 20, 3, 4, MAP_AQUA_HIDEOUT_B1F AquaHideout_B2F_MapCoordEvents: @ 853560C - coord_event 28, 17, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_233DE5 - coord_event 28, 16, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_233DE5 + coord_event 28, 17, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_233DE5 + coord_event 28, 16, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_233DE5 AquaHideout_B2F_MapEvents:: @ 853562C map_events AquaHideout_B2F_EventObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/ArtisanCave_B1F/events.inc b/data/maps/ArtisanCave_B1F/events.inc index 4294d60ddf..5b47d72a57 100644 --- a/data/maps/ArtisanCave_B1F/events.inc +++ b/data/maps/ArtisanCave_B1F/events.inc @@ -6,10 +6,10 @@ ArtisanCave_B1F_MapWarps: @ 8537720 warp_def 38, 5, 0, 1, MAP_ARTISAN_CAVE_1F ArtisanCave_B1F_MapBGEvents: @ 8537730 - bg_event 32, 29, 0, 7, 0, ITEM_ZINC, 102, 0 - bg_event 27, 8, 0, 7, 0, ITEM_CALCIUM, 101, 0 - bg_event 7, 5, 0, 7, 0, ITEM_PROTEIN, 103, 0 - bg_event 19, 43, 0, 7, 0, ITEM_IRON, 104, 0 + bg_hidden_item_event 32, 29, 0, ITEM_ZINC, 102 + bg_hidden_item_event 27, 8, 0, ITEM_CALCIUM, 101 + bg_hidden_item_event 7, 5, 0, ITEM_PROTEIN, 103 + bg_hidden_item_event 19, 43, 0, ITEM_IRON, 104 ArtisanCave_B1F_MapEvents:: @ 8537760 map_events ArtisanCave_B1F_EventObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents diff --git a/data/maps/BattleFrontier_BattleArenaLobby/events.inc b/data/maps/BattleFrontier_BattleArenaLobby/events.inc index 4b8e0de0d3..20233160ec 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/events.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/events.inc @@ -9,8 +9,8 @@ BattleFrontier_BattleArenaLobby_MapWarps: @ 853C88C warp_def 7, 12, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_BattleArenaLobby_MapBGEvents: @ 853C894 - bg_event 5, 9, 3, 1, 0, BattleFrontier_BattleArenaLobby_EventScript_256092 - bg_event 1, 7, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560CA + bg_event 5, 9, 3, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleArenaLobby_EventScript_256092 + bg_event 1, 7, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleArenaLobby_EventScript_2560CA BattleFrontier_BattleArenaLobby_MapEvents:: @ 853C8AC map_events BattleFrontier_BattleArenaLobby_EventObjects, BattleFrontier_BattleArenaLobby_MapWarps, 0x0, BattleFrontier_BattleArenaLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattleDomeLobby/events.inc b/data/maps/BattleFrontier_BattleDomeLobby/events.inc index 4cd1250334..c24a473011 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/events.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/events.inc @@ -11,10 +11,10 @@ BattleFrontier_BattleDomeLobby_MapWarps: @ 853C0F8 warp_def 12, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_BattleDomeLobby_MapBGEvents: @ 853C108 - bg_event 4, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249D52 - bg_event 7, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249D84 - bg_event 18, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249D6B - bg_event 15, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E34 + bg_event 4, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D52 + bg_event 7, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D84 + bg_event 18, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D6B + bg_event 15, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249E34 BattleFrontier_BattleDomeLobby_MapEvents:: @ 853C138 map_events BattleFrontier_BattleDomeLobby_EventObjects, BattleFrontier_BattleDomeLobby_MapWarps, 0x0, BattleFrontier_BattleDomeLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/events.inc b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc index dd7b4029dd..063f498131 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/events.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc @@ -11,9 +11,9 @@ BattleFrontier_BattleFactoryLobby_MapWarps: @ 853CA68 warp_def 10, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_BattleFactoryLobby_MapBGEvents: @ 853CA78 - bg_event 2, 7, 0, 1, 0, BattleFrontier_BattleFactoryLobby_EventScript_2587E1 - bg_event 11, 7, 0, 1, 0, BattleFrontier_BattleFactoryLobby_EventScript_2587FA - bg_event 9, 4, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258839 + bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587E1 + bg_event 11, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587FA + bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleFactoryLobby_EventScript_258839 BattleFrontier_BattleFactoryLobby_MapEvents:: @ 853CA9C map_events BattleFrontier_BattleFactoryLobby_EventObjects, BattleFrontier_BattleFactoryLobby_MapWarps, 0x0, BattleFrontier_BattleFactoryLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/events.inc b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc index c53e0f875f..5dae24a717 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/events.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc @@ -12,9 +12,9 @@ BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0 warp_def 5, 4, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR BattleFrontier_BattlePalaceLobby_MapBGEvents: @ 853C3E8 - bg_event 2, 7, 0, 1, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC50 - bg_event 16, 7, 0, 1, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC69 - bg_event 10, 4, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DCA6 + bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePalaceLobby_EventScript_24DC50 + bg_event 16, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePalaceLobby_EventScript_24DC69 + bg_event 10, 4, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePalaceLobby_EventScript_24DCA6 BattleFrontier_BattlePalaceLobby_MapEvents:: @ 853C40C map_events BattleFrontier_BattlePalaceLobby_EventObjects, BattleFrontier_BattlePalaceLobby_MapWarps, 0x0, BattleFrontier_BattlePalaceLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattlePikeLobby/events.inc b/data/maps/BattleFrontier_BattlePikeLobby/events.inc index 5fddc6f373..1020cef3c6 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/events.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/events.inc @@ -10,8 +10,8 @@ BattleFrontier_BattlePikeLobby_MapWarps: @ 853CC10 warp_def 6, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_BattlePikeLobby_MapBGEvents: @ 853CC28 - bg_event 8, 3, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BA80 - bg_event 1, 3, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAC6 + bg_event 8, 3, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePikeLobby_EventScript_25BA80 + bg_event 1, 3, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePikeLobby_EventScript_25BAC6 BattleFrontier_BattlePikeLobby_MapEvents:: @ 853CC40 map_events BattleFrontier_BattlePikeLobby_EventObjects, BattleFrontier_BattlePikeLobby_MapWarps, 0x0, BattleFrontier_BattlePikeLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc index 07c2866a1e..580873720a 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc @@ -3,13 +3,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 853CD54 object_event 2, EVENT_OBJ_GFX_TRADER, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0 BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84 - coord_event 4, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2 - coord_event 3, 6, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 - coord_event 3, 7, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D - coord_event 4, 6, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 - coord_event 5, 6, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 - coord_event 4, 7, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D - coord_event 5, 7, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D + coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2 + coord_event 3, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 + coord_event 3, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D + coord_event 4, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 + coord_event 5, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 + coord_event 4, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D + coord_event 5, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D BattleFrontier_BattlePikeRandomRoom1_MapEvents:: @ 853CDF4 map_events BattleFrontier_BattlePikeRandomRoom1_EventObjects, 0x0, BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents, 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc index 20e6cb085d..61cb8ede48 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc @@ -1,11 +1,11 @@ BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents: @ 853CE34 - coord_event 4, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174 - coord_event 3, 18, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 - coord_event 4, 18, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 - coord_event 5, 18, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 - coord_event 3, 19, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D - coord_event 4, 19, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D - coord_event 5, 19, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D + coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174 + coord_event 3, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 + coord_event 4, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 + coord_event 5, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 + coord_event 3, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D + coord_event 4, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D + coord_event 5, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D BattleFrontier_BattlePikeRandomRoom3_MapEvents:: @ 853CEA4 map_events 0x0, 0x0, BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents, 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc index a04f0cf4ec..dbc3584a65 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc @@ -3,15 +3,15 @@ BattleFrontier_BattlePikeThreePathRoom_EventObjects: @ 853CC80 object_event 2, EVENT_OBJ_GFX_WOMAN_6, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0 BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0 - coord_event 2, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E - coord_event 6, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59 - coord_event 10, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64 - coord_event 5, 10, 0, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D - coord_event 6, 10, 0, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D - coord_event 6, 9, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 - coord_event 5, 9, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 - coord_event 7, 9, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 - coord_event 7, 10, 0, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D + coord_event 2, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E + coord_event 6, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59 + coord_event 10, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64 + coord_event 5, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D + coord_event 6, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D + coord_event 6, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 + coord_event 5, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 + coord_event 7, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 + coord_event 7, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D BattleFrontier_BattlePikeThreePathRoom_MapEvents:: @ 853CD40 map_events BattleFrontier_BattlePikeThreePathRoom_EventObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc index dd37229450..521577c4c7 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 diff --git a/data/maps/BattleFrontier_BattlePyramidTop/events.inc b/data/maps/BattleFrontier_BattlePyramidTop/events.inc index a42052d96d..fbf4941ca2 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/events.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/events.inc @@ -3,7 +3,7 @@ BattleFrontier_BattlePyramidTop_EventObjects: @ 853C7C0 object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 17, 7, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattlePyramidTop_MapCoordEvents: @ 853C7F0 - coord_event 17, 9, 4, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePyramidTop_EventScript_255256 + coord_event 17, 9, 4, VAR_TEMP_2, 0, BattleFrontier_BattlePyramidTop_EventScript_255256 BattleFrontier_BattlePyramidTop_MapEvents:: @ 853C800 map_events BattleFrontier_BattlePyramidTop_EventObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerLobby/events.inc b/data/maps/BattleFrontier_BattleTowerLobby/events.inc index ef38d131b8..73bdeeb2bf 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/events.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/events.inc @@ -15,11 +15,11 @@ BattleFrontier_BattleTowerLobby_MapWarps: @ 853B710 warp_def 6, 1, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM BattleFrontier_BattleTowerLobby_MapBGEvents: @ 853B728 - bg_event 4, 5, 0, 1, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFC7 - bg_event 8, 5, 0, 1, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFE0 - bg_event 12, 5, 0, 1, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFF9 - bg_event 16, 5, 0, 1, 0, BattleFrontier_BattleTowerLobby_EventScript_23F012 - bg_event 2, 1, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23F4BE + bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23EFC7 + bg_event 8, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23EFE0 + bg_event 12, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23EFF9 + bg_event 16, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23F012 + bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleTowerLobby_EventScript_23F4BE BattleFrontier_BattleTowerLobby_MapEvents:: @ 853B764 map_events BattleFrontier_BattleTowerLobby_EventObjects, BattleFrontier_BattleTowerLobby_MapWarps, 0x0, BattleFrontier_BattleTowerLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_OutsideEast/events.inc b/data/maps/BattleFrontier_OutsideEast/events.inc index 7d25049fde..526c539714 100644 --- a/data/maps/BattleFrontier_OutsideEast/events.inc +++ b/data/maps/BattleFrontier_OutsideEast/events.inc @@ -43,14 +43,14 @@ BattleFrontier_OutsideEast_MapWarps: @ 853BD80 warp_def 28, 7, 0, 0, MAP_ARTISAN_CAVE_1F BattleFrontier_OutsideEast_MapBGEvents: @ 853BDF0 - bg_event 13, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C43 - bg_event 43, 56, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C4C - bg_event 36, 34, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C55 - bg_event 62, 15, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C5E - bg_event 7, 29, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DD7 - bg_event 32, 13, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DCE - bg_event 4, 51, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_271E73 - bg_event 5, 51, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_271E73 + bg_event 13, 17, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C43 + bg_event 43, 56, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C4C + bg_event 36, 34, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C55 + bg_event 62, 15, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C5E + bg_event 7, 29, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242DD7 + bg_event 32, 13, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242DCE + bg_event 4, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_271E73 + bg_event 5, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_271E73 BattleFrontier_OutsideEast_MapEvents:: @ 853BE50 map_events BattleFrontier_OutsideEast_EventObjects, BattleFrontier_OutsideEast_MapWarps, 0x0, BattleFrontier_OutsideEast_MapBGEvents diff --git a/data/maps/BattleFrontier_OutsideWest/events.inc b/data/maps/BattleFrontier_OutsideWest/events.inc index b2315873c2..8095b6d6c0 100644 --- a/data/maps/BattleFrontier_OutsideWest/events.inc +++ b/data/maps/BattleFrontier_OutsideWest/events.inc @@ -38,11 +38,11 @@ BattleFrontier_OutsideWest_MapWarps: @ 853B590 warp_def 39, 55, 0, 0, MAP_ARTISAN_CAVE_B1F BattleFrontier_OutsideWest_MapBGEvents: @ 853B5E8 - bg_event 15, 18, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D4E2 - bg_event 45, 30, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D4F4 - bg_event 16, 43, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D4EB - bg_event 52, 51, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_271E6A - bg_event 53, 51, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_271E6A + bg_event 15, 18, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4E2 + bg_event 45, 30, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4F4 + bg_event 16, 43, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4EB + bg_event 52, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_271E6A + bg_event 53, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_271E6A BattleFrontier_OutsideWest_MapEvents:: @ 853B624 map_events BattleFrontier_OutsideWest_EventObjects, BattleFrontier_OutsideWest_MapWarps, 0x0, BattleFrontier_OutsideWest_MapBGEvents diff --git a/data/maps/BattleFrontier_RankingHall/events.inc b/data/maps/BattleFrontier_RankingHall/events.inc index ba9d3a30f4..33069e0ca7 100644 --- a/data/maps/BattleFrontier_RankingHall/events.inc +++ b/data/maps/BattleFrontier_RankingHall/events.inc @@ -8,18 +8,18 @@ BattleFrontier_RankingHall_MapWarps: @ 853CF00 warp_def 27, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_RankingHall_MapBGEvents: @ 853CF10 - bg_event 26, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4AA - bg_event 23, 8, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4B6 - bg_event 26, 5, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4C2 - bg_event 29, 8, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4CE - bg_event 42, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4DA - bg_event 46, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4E6 - bg_event 10, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4F2 - bg_event 8, 7, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4FE - bg_event 6, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E50A - bg_event 44, 7, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E516 - bg_event 16, 8, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E538 - bg_event 36, 8, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E541 + bg_event 26, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4AA + bg_event 23, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4B6 + bg_event 26, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4C2 + bg_event 29, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4CE + bg_event 42, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4DA + bg_event 46, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4E6 + bg_event 10, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4F2 + bg_event 8, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4FE + bg_event 6, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E50A + bg_event 44, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E516 + bg_event 16, 8, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_RankingHall_EventScript_25E538 + bg_event 36, 8, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_RankingHall_EventScript_25E541 BattleFrontier_RankingHall_MapEvents:: @ 853CFA0 map_events BattleFrontier_RankingHall_EventObjects, BattleFrontier_RankingHall_MapWarps, 0x0, BattleFrontier_RankingHall_MapBGEvents diff --git a/data/maps/DesertRuins/events.inc b/data/maps/DesertRuins/events.inc index 01a2586002..036127ca85 100644 --- a/data/maps/DesertRuins/events.inc +++ b/data/maps/DesertRuins/events.inc @@ -7,9 +7,9 @@ DesertRuins_MapWarps: @ 853436C warp_def 8, 11, 3, 1, MAP_DESERT_RUINS DesertRuins_MapBGEvents: @ 8534384 - bg_event 8, 20, 0, 0, 0, DesertRuins_EventScript_22D9DB - bg_event 7, 20, 0, 0, 0, DesertRuins_EventScript_22D9F8 - bg_event 9, 20, 0, 0, 0, DesertRuins_EventScript_22D9F8 + bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_22D9DB + bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_22D9F8 + bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_22D9F8 DesertRuins_MapEvents:: @ 85343A8 map_events DesertRuins_EventObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents diff --git a/data/maps/DewfordTown/events.inc b/data/maps/DewfordTown/events.inc index 77a6ab8895..fadd3b2826 100644 --- a/data/maps/DewfordTown/events.inc +++ b/data/maps/DewfordTown/events.inc @@ -13,11 +13,11 @@ DewfordTown_MapWarps: @ 85279DC warp_def 8, 8, 0, 0, MAP_DEWFORD_TOWN_HOUSE2 DewfordTown_MapBGEvents: @ 8527A04 - bg_event 10, 10, 0, 0, 0, DewfordTown_EventScript_1E95BA - bg_event 11, 16, 0, 0, 0, DewfordTown_EventScript_1E95C3 - bg_event 4, 10, 0, 1, 0, DewfordTown_EventScript_271E73 - bg_event 3, 10, 0, 1, 0, DewfordTown_EventScript_271E73 - bg_event 2, 4, 0, 0, 0, DewfordTown_EventScript_1E95CC + bg_event 10, 10, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_1E95BA + bg_event 11, 16, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_1E95C3 + bg_event 4, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_EventScript_271E73 + bg_event 3, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_EventScript_271E73 + bg_event 2, 4, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_1E95CC DewfordTown_MapEvents:: @ 8527A40 map_events DewfordTown_EventObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents diff --git a/data/maps/DewfordTown_Gym/events.inc b/data/maps/DewfordTown_Gym/events.inc index 26ebf45018..a4c45c2cba 100644 --- a/data/maps/DewfordTown_Gym/events.inc +++ b/data/maps/DewfordTown_Gym/events.inc @@ -13,10 +13,10 @@ DewfordTown_Gym_MapWarps: @ 852DBF4 warp_def 6, 27, 0, 2, MAP_DEWFORD_TOWN DewfordTown_Gym_MapBGEvents: @ 852DC04 - bg_event 4, 23, 3, 1, 0, DewfordTown_Gym_EventScript_1FC9A2 - bg_event 7, 23, 3, 1, 0, DewfordTown_Gym_EventScript_1FC9B2 - bg_event 4, 24, 0, 1, 0, DewfordTown_Gym_EventScript_1FC9A2 - bg_event 7, 24, 0, 1, 0, DewfordTown_Gym_EventScript_1FC9B2 + bg_event 4, 23, 3, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9A2 + bg_event 7, 23, 3, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9B2 + bg_event 4, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9A2 + bg_event 7, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9B2 DewfordTown_Gym_MapEvents:: @ 852DC34 map_events DewfordTown_Gym_EventObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents diff --git a/data/maps/DewfordTown_Hall/events.inc b/data/maps/DewfordTown_Hall/events.inc index 7c494b6985..cd6fb5e8f4 100644 --- a/data/maps/DewfordTown_Hall/events.inc +++ b/data/maps/DewfordTown_Hall/events.inc @@ -14,8 +14,8 @@ DewfordTown_Hall_MapWarps: @ 852DD20 warp_def 6, 8, 0, 0, MAP_DEWFORD_TOWN DewfordTown_Hall_MapBGEvents: @ 852DD30 - bg_event 0, 1, 3, 0, 0, DewfordTown_Hall_EventScript_1FD590 - bg_event 7, 1, 3, 0, 0, DewfordTown_Hall_EventScript_1FD5A0 + bg_event 0, 1, 3, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_Hall_EventScript_1FD590 + bg_event 7, 1, 3, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_Hall_EventScript_1FD5A0 DewfordTown_Hall_MapEvents:: @ 852DD48 map_events DewfordTown_Hall_EventObjects, DewfordTown_Hall_MapWarps, 0x0, DewfordTown_Hall_MapBGEvents diff --git a/data/maps/DoubleBattleColosseum/events.inc b/data/maps/DoubleBattleColosseum/events.inc index f28e9e3e1c..ffea67228a 100644 --- a/data/maps/DoubleBattleColosseum/events.inc +++ b/data/maps/DoubleBattleColosseum/events.inc @@ -5,10 +5,10 @@ DoubleBattleColosseum_MapWarps: @ 8539E88 warp_def 8, 8, 3, 127, MAP_NONE DoubleBattleColosseum_MapCoordEvents: @ 8539EA8 - coord_event 3, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277388 - coord_event 3, 6, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773BE - coord_event 10, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773A3 - coord_event 10, 6, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773D9 + coord_event 3, 4, 3, VAR_TEMP_0, 0, gUnknown_08277388 + coord_event 3, 6, 3, VAR_TEMP_0, 0, gUnknown_082773BE + coord_event 10, 4, 3, VAR_TEMP_0, 0, gUnknown_082773A3 + coord_event 10, 6, 3, VAR_TEMP_0, 0, gUnknown_082773D9 DoubleBattleColosseum_MapEvents:: @ 8539EE8 map_events 0x0, DoubleBattleColosseum_MapWarps, DoubleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/EverGrandeCity/events.inc b/data/maps/EverGrandeCity/events.inc index b8ca9eea47..e6bc7a10ad 100644 --- a/data/maps/EverGrandeCity/events.inc +++ b/data/maps/EverGrandeCity/events.inc @@ -5,24 +5,24 @@ EverGrandeCity_MapWarps: @ 8527588 warp_def 18, 27, 0, 1, MAP_VICTORY_ROAD_1F EverGrandeCity_MapCoordEvents: @ 85275A8 - coord_event 17, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 16, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 18, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 19, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 20, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 21, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 22, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 23, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 24, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 25, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 26, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 + coord_event 17, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 + coord_event 16, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 + coord_event 18, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 + coord_event 19, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 + coord_event 20, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 + coord_event 21, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 + coord_event 22, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 + coord_event 23, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 + coord_event 24, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 + coord_event 25, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 + coord_event 26, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 EverGrandeCity_MapBGEvents: @ 8527658 - bg_event 19, 43, 5, 0, 0, EverGrandeCity_EventScript_1E7D2B - bg_event 29, 48, 0, 1, 0, EverGrandeCity_EventScript_271E73 - bg_event 18, 52, 5, 0, 0, EverGrandeCity_EventScript_1E7D34 - bg_event 23, 15, 0, 0, 0, EverGrandeCity_EventScript_1E7D3D - bg_event 28, 48, 0, 1, 0, EverGrandeCity_EventScript_271E73 + bg_event 19, 43, 5, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_1E7D2B + bg_event 29, 48, 0, BG_EVENT_PLAYER_FACING_NORTH, EverGrandeCity_EventScript_271E73 + bg_event 18, 52, 5, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_1E7D34 + bg_event 23, 15, 0, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_1E7D3D + bg_event 28, 48, 0, BG_EVENT_PLAYER_FACING_NORTH, EverGrandeCity_EventScript_271E73 EverGrandeCity_MapEvents:: @ 8527694 map_events 0x0, EverGrandeCity_MapWarps, EverGrandeCity_MapCoordEvents, EverGrandeCity_MapBGEvents diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc index b6c3400c6d..fae6f714ee 100644 --- a/data/maps/FallarborTown/events.inc +++ b/data/maps/FallarborTown/events.inc @@ -12,14 +12,14 @@ FallarborTown_MapWarps: @ 8527C40 warp_def 1, 6, 0, 0, MAP_FALLARBOR_TOWN_HOUSE2 FallarborTown_MapBGEvents: @ 8527C68 - bg_event 16, 15, 0, 1, 0, FallarborTown_EventScript_271E6A - bg_event 15, 7, 0, 1, 0, FallarborTown_EventScript_271E73 - bg_event 6, 8, 0, 0, 0, FallarborTown_EventScript_1EB250 - bg_event 16, 7, 0, 1, 0, FallarborTown_EventScript_271E73 - bg_event 10, 11, 0, 0, 0, FallarborTown_EventScript_1EB259 - bg_event 17, 15, 0, 1, 0, FallarborTown_EventScript_271E6A - bg_event 3, 7, 0, 0, 0, FallarborTown_EventScript_1EB262 - bg_event 2, 15, 3, 7, 0, ITEM_NUGGET, 28, 0 + bg_event 16, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E6A + bg_event 15, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E73 + bg_event 6, 8, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB250 + bg_event 16, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E73 + bg_event 10, 11, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB259 + bg_event 17, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E6A + bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB262 + bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, 28 FallarborTown_MapEvents:: @ 8527CC8 map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents diff --git a/data/maps/FallarborTown_BattleTentLobby/events.inc b/data/maps/FallarborTown_BattleTentLobby/events.inc index cdcc4c7927..cdf9c79b92 100644 --- a/data/maps/FallarborTown_BattleTentLobby/events.inc +++ b/data/maps/FallarborTown_BattleTentLobby/events.inc @@ -10,7 +10,7 @@ FallarborTown_BattleTentLobby_MapWarps: @ 852E3E8 warp_def 7, 9, 0, 1, MAP_FALLARBOR_TOWN FallarborTown_BattleTentLobby_MapBGEvents: @ 852E3F8 - bg_event 4, 5, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20024F + bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_BattleTentLobby_EventScript_20024F FallarborTown_BattleTentLobby_MapEvents:: @ 852E404 map_events FallarborTown_BattleTentLobby_EventObjects, FallarborTown_BattleTentLobby_MapWarps, 0x0, FallarborTown_BattleTentLobby_MapBGEvents diff --git a/data/maps/FarawayIsland_Entrance/events.inc b/data/maps/FarawayIsland_Entrance/events.inc index e8b94c460b..6c2a8ebe30 100644 --- a/data/maps/FarawayIsland_Entrance/events.inc +++ b/data/maps/FarawayIsland_Entrance/events.inc @@ -7,12 +7,12 @@ FarawayIsland_Entrance_MapWarps: @ 853D740 warp_def 23, 7, 3, 1, MAP_FARAWAY_ISLAND_INTERIOR FarawayIsland_Entrance_MapCoordEvents: @ 853D750 - coord_event 9, 18, 3, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267C98 - coord_event 10, 20, 3, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267C9D - coord_event 22, 9, 3, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267C98 + coord_event 9, 18, 3, 0, 0, FarawayIsland_Entrance_EventScript_267C98 + coord_event 10, 20, 3, 0, 0, FarawayIsland_Entrance_EventScript_267C9D + coord_event 22, 9, 3, 0, 0, FarawayIsland_Entrance_EventScript_267C98 FarawayIsland_Entrance_MapBGEvents: @ 853D780 - bg_event 3, 32, 0, 1, 0, FarawayIsland_Entrance_EventScript_267CF1 + bg_event 3, 32, 0, BG_EVENT_PLAYER_FACING_NORTH, FarawayIsland_Entrance_EventScript_267CF1 FarawayIsland_Entrance_MapEvents:: @ 853D78C map_events FarawayIsland_Entrance_EventObjects, FarawayIsland_Entrance_MapWarps, FarawayIsland_Entrance_MapCoordEvents, FarawayIsland_Entrance_MapBGEvents diff --git a/data/maps/FortreeCity/events.inc b/data/maps/FortreeCity/events.inc index 2b21594a17..914c4901cc 100644 --- a/data/maps/FortreeCity/events.inc +++ b/data/maps/FortreeCity/events.inc @@ -19,12 +19,12 @@ FortreeCity_MapWarps: @ 8526C44 warp_def 37, 13, 0, 0, MAP_FORTREE_CITY_DECORATION_SHOP FortreeCity_MapBGEvents: @ 8526C8C - bg_event 6, 9, 0, 0, 0, FortreeCity_EventScript_1E2602 - bg_event 7, 6, 0, 1, 0, FortreeCity_EventScript_271E73 - bg_event 5, 14, 0, 1, 0, FortreeCity_EventScript_271E6A - bg_event 26, 10, 0, 0, 0, FortreeCity_EventScript_1E260B - bg_event 6, 6, 0, 1, 0, FortreeCity_EventScript_271E73 - bg_event 6, 14, 0, 1, 0, FortreeCity_EventScript_271E6A + bg_event 6, 9, 0, BG_EVENT_PLAYER_FACING_ANY, FortreeCity_EventScript_1E2602 + bg_event 7, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E73 + bg_event 5, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E6A + bg_event 26, 10, 0, BG_EVENT_PLAYER_FACING_ANY, FortreeCity_EventScript_1E260B + bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E73 + bg_event 6, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E6A FortreeCity_MapEvents:: @ 8526CD4 map_events FortreeCity_EventObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents diff --git a/data/maps/FortreeCity_Gym/events.inc b/data/maps/FortreeCity_Gym/events.inc index 8abef75e8d..5cc222c4ea 100644 --- a/data/maps/FortreeCity_Gym/events.inc +++ b/data/maps/FortreeCity_Gym/events.inc @@ -13,8 +13,8 @@ FortreeCity_Gym_MapWarps: @ 8530D58 warp_def 16, 24, 0, 2, MAP_FORTREE_CITY FortreeCity_Gym_MapBGEvents: @ 8530D68 - bg_event 14, 21, 0, 1, 0, FortreeCity_Gym_EventScript_216751 - bg_event 17, 21, 0, 1, 0, FortreeCity_Gym_EventScript_216761 + bg_event 14, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_Gym_EventScript_216751 + bg_event 17, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_Gym_EventScript_216761 FortreeCity_Gym_MapEvents:: @ 8530D80 map_events FortreeCity_Gym_EventObjects, FortreeCity_Gym_MapWarps, 0x0, FortreeCity_Gym_MapBGEvents diff --git a/data/maps/GraniteCave_B2F/events.inc b/data/maps/GraniteCave_B2F/events.inc index bcc0a5a4e3..e128b40b21 100644 --- a/data/maps/GraniteCave_B2F/events.inc +++ b/data/maps/GraniteCave_B2F/events.inc @@ -17,8 +17,8 @@ GraniteCave_B2F_MapWarps: @ 853455C warp_def 29, 2, 3, 6, MAP_GRANITE_CAVE_B1F GraniteCave_B2F_MapBGEvents: @ 8534584 - bg_event 28, 6, 3, 7, 0, ITEM_EVERSTONE, 48, 0 - bg_event 15, 11, 3, 7, 0, ITEM_EVERSTONE, 49, 0 + bg_hidden_item_event 28, 6, 3, ITEM_EVERSTONE, 48 + bg_hidden_item_event 15, 11, 3, ITEM_EVERSTONE, 49 GraniteCave_B2F_MapEvents:: @ 853459C map_events GraniteCave_B2F_EventObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents diff --git a/data/maps/InsideOfTruck/events.inc b/data/maps/InsideOfTruck/events.inc index 104df23d26..f8dbe9ad70 100644 --- a/data/maps/InsideOfTruck/events.inc +++ b/data/maps/InsideOfTruck/events.inc @@ -9,16 +9,16 @@ InsideOfTruck_MapWarps: @ 853A0C0 warp_def 4, 3, 0, 127, MAP_NONE InsideOfTruck_MapCoordEvents: @ 853A0D8 - coord_event 3, 1, 3, 0, VAR_0x4092, 0, 0, InsideOfTruck_EventScript_23BF04 - coord_event 3, 2, 3, 0, VAR_0x4092, 0, 0, InsideOfTruck_EventScript_23BF04 - coord_event 3, 3, 3, 0, VAR_0x4092, 0, 0, InsideOfTruck_EventScript_23BF04 + coord_event 3, 1, 3, VAR_0x4092, 0, InsideOfTruck_EventScript_23BF04 + coord_event 3, 2, 3, VAR_0x4092, 0, InsideOfTruck_EventScript_23BF04 + coord_event 3, 3, 3, VAR_0x4092, 0, InsideOfTruck_EventScript_23BF04 InsideOfTruck_MapBGEvents: @ 853A108 - bg_event 1, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C - bg_event 3, 4, 0, 0, 0, InsideOfTruck_EventScript_23BF6C - bg_event 2, 3, 0, 0, 0, InsideOfTruck_EventScript_23BF6C - bg_event 0, 1, 0, 0, 0, InsideOfTruck_EventScript_23BF6C - bg_event 0, 2, 0, 0, 0, InsideOfTruck_EventScript_23BF6C + bg_event 1, 0, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C + bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C + bg_event 2, 3, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C + bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C + bg_event 0, 2, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C InsideOfTruck_MapEvents:: @ 853A144 map_events InsideOfTruck_EventObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents diff --git a/data/maps/IslandCave/events.inc b/data/maps/IslandCave/events.inc index c02d93dde7..01283e1460 100644 --- a/data/maps/IslandCave/events.inc +++ b/data/maps/IslandCave/events.inc @@ -7,9 +7,9 @@ IslandCave_MapWarps: @ 8536C8C warp_def 8, 11, 3, 1, MAP_ISLAND_CAVE IslandCave_MapBGEvents: @ 8536CA4 - bg_event 8, 20, 0, 0, 0, IslandCave_EventScript_238EEF - bg_event 7, 20, 0, 0, 0, IslandCave_EventScript_238F1D - bg_event 9, 20, 0, 0, 0, IslandCave_EventScript_238F1D + bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_238EEF + bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_238F1D + bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_238F1D IslandCave_MapEvents:: @ 8536CC8 map_events IslandCave_EventObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents diff --git a/data/maps/JaggedPass/events.inc b/data/maps/JaggedPass/events.inc index ce6eb77bd0..b1028c9789 100644 --- a/data/maps/JaggedPass/events.inc +++ b/data/maps/JaggedPass/events.inc @@ -15,20 +15,20 @@ JaggedPass_MapWarps: @ 8534B8C warp_def 16, 18, 0, 0, MAP_MAGMA_HIDEOUT_1F JaggedPass_MapCoordEvents: @ 8534BB4 - coord_event 13, 15, 3, 0, 2, 0, 0, 0x0 - coord_event 21, 12, 3, 0, 8, 0, 0, 0x0 - coord_event 14, 15, 3, 0, 2, 0, 0, 0x0 - coord_event 18, 17, 3, 0, 2, 0, 0, 0x0 - coord_event 22, 19, 3, 0, 2, 0, 0, 0x0 - coord_event 21, 15, 3, 0, VAR_0x40C8, 1, 0, JaggedPass_EventScript_2306BB - coord_event 22, 20, 3, 0, VAR_0x40C8, 1, 0, JaggedPass_EventScript_2306BB - coord_event 21, 20, 3, 0, VAR_0x40C8, 1, 0, JaggedPass_EventScript_2306BB - coord_event 14, 15, 3, 0, VAR_0x40C8, 1, 0, JaggedPass_EventScript_2306BB - coord_event 13, 15, 3, 0, VAR_0x40C8, 1, 0, JaggedPass_EventScript_2306BB + coord_weather_event 13, 15, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 21, 12, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 14, 15, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 18, 17, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 22, 19, 3, COORD_EVENT_WEATHER_SUNNY + coord_event 21, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB + coord_event 22, 20, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB + coord_event 21, 20, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB + coord_event 14, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB + coord_event 13, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB JaggedPass_MapBGEvents: @ 8534C54 - bg_event 8, 10, 3, 7, 0, ITEM_FULL_HEAL, 77, 0 - bg_event 7, 29, 3, 7, 0, ITEM_GREAT_BALL, 76, 0 + bg_hidden_item_event 8, 10, 3, ITEM_FULL_HEAL, 77 + bg_hidden_item_event 7, 29, 3, ITEM_GREAT_BALL, 76 JaggedPass_MapEvents:: @ 8534C6C map_events JaggedPass_EventObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents diff --git a/data/maps/LavaridgeTown/events.inc b/data/maps/LavaridgeTown/events.inc index 755e606b0a..184bed05e3 100644 --- a/data/maps/LavaridgeTown/events.inc +++ b/data/maps/LavaridgeTown/events.inc @@ -18,17 +18,17 @@ LavaridgeTown_MapWarps: @ 8527B2C warp_def 9, 2, 3, 3, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F LavaridgeTown_MapCoordEvents: @ 8527B5C - coord_event 6, 3, 3, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA6FA + coord_event 6, 3, 3, 0, 0, LavaridgeTown_EventScript_1EA6FA LavaridgeTown_MapBGEvents: @ 8527B6C - bg_event 14, 16, 0, 0, 0, LavaridgeTown_EventScript_1EA7B7 - bg_event 7, 15, 0, 0, 0, LavaridgeTown_EventScript_1EA7AE - bg_event 17, 5, 0, 1, 0, LavaridgeTown_EventScript_271E6A - bg_event 13, 8, 0, 0, 0, LavaridgeTown_EventScript_1EA7A5 - bg_event 10, 6, 0, 1, 0, LavaridgeTown_EventScript_271E73 - bg_event 16, 5, 0, 1, 0, LavaridgeTown_EventScript_271E6A - bg_event 11, 6, 0, 1, 0, LavaridgeTown_EventScript_271E73 - bg_event 4, 5, 3, 7, 0, ITEM_ICE_HEAL, 0, 0 + bg_event 14, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_1EA7B7 + bg_event 7, 15, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_1EA7AE + bg_event 17, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E6A + bg_event 13, 8, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_1EA7A5 + bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E73 + bg_event 16, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E6A + bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E73 + bg_hidden_item_event 4, 5, 3, ITEM_ICE_HEAL, 0 LavaridgeTown_MapEvents:: @ 8527BCC map_events LavaridgeTown_EventObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents diff --git a/data/maps/LavaridgeTown_Gym_1F/events.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc index 8560ee3a80..d8aa6daa45 100644 --- a/data/maps/LavaridgeTown_Gym_1F/events.inc +++ b/data/maps/LavaridgeTown_Gym_1F/events.inc @@ -35,8 +35,8 @@ LavaridgeTown_Gym_1F_MapWarps: @ 852DEAC warp_def 12, 12, 3, 23, MAP_LAVARIDGE_TOWN_GYM_B1F LavaridgeTown_Gym_1F_MapBGEvents: @ 852DF7C - bg_event 10, 15, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_1FE98B - bg_event 16, 15, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_1FE99B + bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_Gym_1F_EventScript_1FE98B + bg_event 16, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_Gym_1F_EventScript_1FE99B LavaridgeTown_Gym_1F_MapEvents:: @ 852DF94 map_events LavaridgeTown_Gym_1F_EventObjects, LavaridgeTown_Gym_1F_MapWarps, 0x0, LavaridgeTown_Gym_1F_MapBGEvents diff --git a/data/maps/LilycoveCity/events.inc b/data/maps/LilycoveCity/events.inc index 421a2c094a..240de9cd4b 100644 --- a/data/maps/LilycoveCity/events.inc +++ b/data/maps/LilycoveCity/events.inc @@ -39,19 +39,19 @@ LilycoveCity_MapWarps: @ 8526EF8 warp_def 12, 5, 0, 1, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F LilycoveCity_MapBGEvents: @ 8526F68 - bg_event 19, 7, 0, 0, 0, LilycoveCity_EventScript_1E2D1A - bg_event 25, 14, 0, 1, 0, LilycoveCity_EventScript_271E73 - bg_event 29, 7, 0, 0, 0, LilycoveCity_EventScript_1E2D6B - bg_event 26, 14, 0, 1, 0, LilycoveCity_EventScript_271E73 - bg_event 6, 15, 0, 0, 0, LilycoveCity_EventScript_1E2CFF - bg_event 29, 24, 0, 0, 0, LilycoveCity_EventScript_1E2D08 - bg_event 35, 24, 0, 0, 0, LilycoveCity_EventScript_1E2D11 - bg_event 6, 30, 3, 0, 0, LilycoveCity_EventScript_1E2D44 - bg_event 36, 14, 0, 0, 0, LilycoveCity_EventScript_1E2D62 - bg_event 34, 6, 0, 0, 0, LilycoveCity_EventScript_1E2D74 - bg_event 36, 31, 3, 7, 0, ITEM_HEART_SCALE, 27, 0 - bg_event 61, 7, 0, 7, 0, ITEM_PP_UP, 43, 0 - bg_event 64, 31, 0, 7, 0, ITEM_POKE_BALL, 75, 0 + bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D1A + bg_event 25, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_EventScript_271E73 + bg_event 29, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D6B + bg_event 26, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_EventScript_271E73 + bg_event 6, 15, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2CFF + bg_event 29, 24, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D08 + bg_event 35, 24, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D11 + bg_event 6, 30, 3, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D44 + bg_event 36, 14, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D62 + bg_event 34, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D74 + bg_hidden_item_event 36, 31, 3, ITEM_HEART_SCALE, 27 + bg_hidden_item_event 61, 7, 0, ITEM_PP_UP, 43 + bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, 75 LilycoveCity_MapEvents:: @ 8527004 map_events LilycoveCity_EventObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents diff --git a/data/maps/LilycoveCity_ContestHall/events.inc b/data/maps/LilycoveCity_ContestHall/events.inc index c7477af3cd..751bc0fc74 100644 --- a/data/maps/LilycoveCity_ContestHall/events.inc +++ b/data/maps/LilycoveCity_ContestHall/events.inc @@ -39,12 +39,12 @@ LilycoveCity_ContestHall_MapWarps: @ 8531B50 warp_def 31, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY LilycoveCity_ContestHall_MapBGEvents: @ 8531B70 - bg_event 27, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B733 - bg_event 39, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B73C - bg_event 11, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B745 - bg_event 15, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B745 - bg_event 23, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B733 - bg_event 35, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B73C + bg_event 27, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B733 + bg_event 39, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B73C + bg_event 11, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B745 + bg_event 15, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B745 + bg_event 23, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B733 + bg_event 35, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B73C LilycoveCity_ContestHall_MapEvents:: @ 8531BB8 map_events LilycoveCity_ContestHall_EventObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents diff --git a/data/maps/LilycoveCity_ContestLobby/events.inc b/data/maps/LilycoveCity_ContestLobby/events.inc index 27448106f3..67f6445298 100644 --- a/data/maps/LilycoveCity_ContestLobby/events.inc +++ b/data/maps/LilycoveCity_ContestLobby/events.inc @@ -32,18 +32,18 @@ LilycoveCity_ContestLobby_MapWarps: @ 853178C warp_def 21, 1, 0, 1, MAP_LILYCOVE_CITY_CONTEST_HALL LilycoveCity_ContestLobby_MapBGEvents: @ 85317AC - bg_event 23, 5, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_294055 - bg_event 23, 9, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293E1E - bg_event 23, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A753 - bg_event 25, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A75A - bg_event 27, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A761 - bg_event 30, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A77A - bg_event 3, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A73E - bg_event 5, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A745 - bg_event 7, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A74C - bg_event 27, 5, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293C3E - bg_event 27, 9, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293D4D - bg_event 18, 3, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A784 + bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_294055 + bg_event 23, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293E1E + bg_event 23, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A753 + bg_event 25, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A75A + bg_event 27, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A761 + bg_event 30, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A77A + bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A73E + bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A745 + bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A74C + bg_event 27, 5, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293C3E + bg_event 27, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293D4D + bg_event 18, 3, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A784 LilycoveCity_ContestLobby_MapEvents:: @ 853183C map_events LilycoveCity_ContestLobby_EventObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc index 5595da7180..66fd112c4e 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc @@ -7,7 +7,7 @@ LilycoveCity_CoveLilyMotel_1F_MapWarps: @ 853114C warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F LilycoveCity_CoveLilyMotel_1F_MapCoordEvents: @ 8531164 - coord_event 10, 2, 3, 0, VAR_TEMP_1, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218211 + coord_event 10, 2, 3, VAR_TEMP_1, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218211 LilycoveCity_CoveLilyMotel_1F_MapEvents:: @ 8531174 map_events LilycoveCity_CoveLilyMotel_1F_EventObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc index 8492376e26..2797722045 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc @@ -8,8 +8,8 @@ LilycoveCity_DepartmentStoreRooftop_MapWarps: @ 853247C warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F LilycoveCity_DepartmentStoreRooftop_MapBGEvents: @ 8532484 - bg_event 9, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220295 - bg_event 10, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220295 + bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_DepartmentStoreRooftop_EventScript_220295 + bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_DepartmentStoreRooftop_EventScript_220295 LilycoveCity_DepartmentStoreRooftop_MapEvents:: @ 853249C map_events LilycoveCity_DepartmentStoreRooftop_EventObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc index 3ebc7c803b..b2771391be 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc @@ -13,7 +13,7 @@ LilycoveCity_DepartmentStore_1F_MapWarps: @ 853211C warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_1F_MapBGEvents: @ 853213C - bg_event 0, 8, 0, 1, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F85D + bg_event 0, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_DepartmentStore_1F_EventScript_21F85D LilycoveCity_DepartmentStore_1F_MapEvents:: @ 8532148 map_events LilycoveCity_DepartmentStore_1F_EventObjects, LilycoveCity_DepartmentStore_1F_MapWarps, 0x0, LilycoveCity_DepartmentStore_1F_MapBGEvents diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc index 7a66d580c5..f24ede1b9a 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc @@ -16,22 +16,22 @@ LilycoveCity_LilycoveMuseum_1F_MapWarps: @ 853133C warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F LilycoveCity_LilycoveMuseum_1F_MapBGEvents: @ 8531354 - bg_event 1, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD - bg_event 2, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD - bg_event 5, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1 - bg_event 6, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1 - bg_event 9, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4 - bg_event 3, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6 - bg_event 2, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6 - bg_event 15, 12, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA - bg_event 11, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4 - bg_event 6, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8 - bg_event 17, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC - bg_event 19, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF - bg_event 20, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF - bg_event 18, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC - bg_event 18, 11, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3 - bg_event 16, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC + bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD + bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD + bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1 + bg_event 6, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1 + bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4 + bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6 + bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6 + bg_event 15, 12, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA + bg_event 11, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4 + bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8 + bg_event 17, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC + bg_event 19, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF + bg_event 20, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF + bg_event 18, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC + bg_event 18, 11, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3 + bg_event 16, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC LilycoveCity_LilycoveMuseum_1F_MapEvents:: @ 8531414 map_events LilycoveCity_LilycoveMuseum_1F_EventObjects, LilycoveCity_LilycoveMuseum_1F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_1F_MapBGEvents diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc index 968a61b1d4..d88bae478a 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc @@ -8,18 +8,18 @@ LilycoveCity_LilycoveMuseum_2F_MapWarps: @ 8531488 warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F LilycoveCity_LilycoveMuseum_2F_MapBGEvents: @ 8531490 - bg_event 14, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B - bg_event 15, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B - bg_event 3, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21993E - bg_event 2, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21993E - bg_event 10, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219951 - bg_event 11, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219951 - bg_event 19, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219964 - bg_event 18, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219964 - bg_event 6, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219977 - bg_event 7, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219977 - bg_event 11, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA - bg_event 15, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA + bg_event 14, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B + bg_event 15, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B + bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21993E + bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21993E + bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219951 + bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219951 + bg_event 19, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219964 + bg_event 18, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219964 + bg_event 6, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219977 + bg_event 7, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219977 + bg_event 11, 2, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA + bg_event 15, 2, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA LilycoveCity_LilycoveMuseum_2F_MapEvents:: @ 8531520 map_events LilycoveCity_LilycoveMuseum_2F_EventObjects, LilycoveCity_LilycoveMuseum_2F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_2F_MapBGEvents diff --git a/data/maps/LittlerootTown/events.inc b/data/maps/LittlerootTown/events.inc index fd257b17de..b6e7c3cf9b 100644 --- a/data/maps/LittlerootTown/events.inc +++ b/data/maps/LittlerootTown/events.inc @@ -14,21 +14,21 @@ LittlerootTown_MapWarps: @ 8527768 warp_def 7, 16, 0, 0, MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB LittlerootTown_MapCoordEvents: @ 8527780 - coord_event 10, 1, 3, 0, VAR_0x4050, 0, 0, LittlerootTown_EventScript_1E8091 - coord_event 11, 1, 3, 0, VAR_0x4050, 0, 0, LittlerootTown_EventScript_1E80EF - coord_event 11, 1, 3, 0, VAR_0x4050, 1, 0, LittlerootTown_EventScript_1E811F - coord_event 8, 9, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E81F9 - coord_event 9, 9, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E8205 - coord_event 10, 9, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E81E1 - coord_event 11, 9, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E81ED - coord_event 10, 2, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E81BB - coord_event 11, 2, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E81CE + coord_event 10, 1, 3, VAR_0x4050, 0, LittlerootTown_EventScript_1E8091 + coord_event 11, 1, 3, VAR_0x4050, 0, LittlerootTown_EventScript_1E80EF + coord_event 11, 1, 3, VAR_0x4050, 1, LittlerootTown_EventScript_1E811F + coord_event 8, 9, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81F9 + coord_event 9, 9, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E8205 + coord_event 10, 9, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81E1 + coord_event 11, 9, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81ED + coord_event 10, 2, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81BB + coord_event 11, 2, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81CE LittlerootTown_MapBGEvents: @ 8527810 - bg_event 15, 13, 0, 0, 0, LittlerootTown_EventScript_1E8151 - bg_event 6, 17, 0, 0, 0, LittlerootTown_EventScript_1E815A - bg_event 7, 8, 3, 0, 0, LittlerootTown_EventScript_1E8163 - bg_event 12, 8, 3, 0, 0, LittlerootTown_EventScript_1E818F + bg_event 15, 13, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E8151 + bg_event 6, 17, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E815A + bg_event 7, 8, 3, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E8163 + bg_event 12, 8, 3, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E818F LittlerootTown_MapEvents:: @ 8527840 map_events LittlerootTown_EventObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc index df0022c999..57538339fc 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc @@ -13,10 +13,10 @@ LittlerootTown_BrendansHouse_1F_MapWarps: @ 852D134 warp_def 8, 2, 0, 0, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F LittlerootTown_BrendansHouse_1F_MapCoordEvents: @ 852D14C - coord_event 8, 8, 0, 0, VAR_0x4092, 4, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F78A3 - coord_event 7, 3, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F78BE - coord_event 8, 4, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F78CA - coord_event 9, 3, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F78D6 + coord_event 8, 8, 0, VAR_0x4092, 4, LittlerootTown_BrendansHouse_1F_EventScript_1F78A3 + coord_event 7, 3, 0, VAR_0x408D, 2, LittlerootTown_BrendansHouse_1F_EventScript_1F78BE + coord_event 8, 4, 0, VAR_0x408D, 2, LittlerootTown_BrendansHouse_1F_EventScript_1F78CA + coord_event 9, 3, 0, VAR_0x408D, 2, LittlerootTown_BrendansHouse_1F_EventScript_1F78D6 LittlerootTown_BrendansHouse_1F_MapEvents:: @ 852D18C map_events LittlerootTown_BrendansHouse_1F_EventObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc index fbcc38a031..815acaa82b 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc @@ -20,10 +20,10 @@ LittlerootTown_BrendansHouse_2F_MapWarps: @ 852D320 warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F LittlerootTown_BrendansHouse_2F_MapBGEvents: @ 852D328 - bg_event 0, 1, 0, 1, 0, gUnknown_081F860D - bg_event 1, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8656 - bg_event 5, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_292781 - bg_event 3, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F865F + bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, gUnknown_081F860D + bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_1F8656 + bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_292781 + bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_1F865F LittlerootTown_BrendansHouse_2F_MapEvents:: @ 852D358 map_events LittlerootTown_BrendansHouse_2F_EventObjects, LittlerootTown_BrendansHouse_2F_MapWarps, 0x0, LittlerootTown_BrendansHouse_2F_MapBGEvents diff --git a/data/maps/LittlerootTown_MaysHouse_1F/events.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc index 34eeeb7508..fda8175bb9 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/events.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/events.inc @@ -13,10 +13,10 @@ LittlerootTown_MaysHouse_1F_MapWarps: @ 852D414 warp_def 2, 2, 0, 0, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F LittlerootTown_MaysHouse_1F_MapCoordEvents: @ 852D42C - coord_event 2, 8, 0, 0, VAR_0x4092, 4, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A4C - coord_event 1, 3, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A67 - coord_event 2, 4, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A73 - coord_event 3, 3, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A7F + coord_event 2, 8, 0, VAR_0x4092, 4, LittlerootTown_MaysHouse_1F_EventScript_1F8A4C + coord_event 1, 3, 0, VAR_0x408D, 2, LittlerootTown_MaysHouse_1F_EventScript_1F8A67 + coord_event 2, 4, 0, VAR_0x408D, 2, LittlerootTown_MaysHouse_1F_EventScript_1F8A73 + coord_event 3, 3, 0, VAR_0x408D, 2, LittlerootTown_MaysHouse_1F_EventScript_1F8A7F LittlerootTown_MaysHouse_1F_MapEvents:: @ 852D46C map_events LittlerootTown_MaysHouse_1F_EventObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/events.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc index 037f0538ad..6d541e1e3b 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/events.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/events.inc @@ -20,10 +20,10 @@ LittlerootTown_MaysHouse_2F_MapWarps: @ 852D600 warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F LittlerootTown_MaysHouse_2F_MapBGEvents: @ 852D608 - bg_event 5, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F865F - bg_event 7, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F8656 - bg_event 3, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_29278D - bg_event 8, 1, 0, 0, 0, gUnknown_081F9553 + bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_1F865F + bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_1F8656 + bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_29278D + bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, gUnknown_081F9553 LittlerootTown_MaysHouse_2F_MapEvents:: @ 852D638 map_events LittlerootTown_MaysHouse_2F_EventObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc index 41e5112f71..df992a2e35 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc @@ -11,21 +11,21 @@ LittlerootTown_ProfessorBirchsLab_MapWarps: @ 852D6DC warp_def 7, 12, 0, 2, MAP_LITTLEROOT_TOWN LittlerootTown_ProfessorBirchsLab_MapBGEvents: @ 852D6EC - bg_event 10, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3 - bg_event 11, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3 - bg_event 7, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD - bg_event 8, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD - bg_event 1, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 - bg_event 0, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 - bg_event 1, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 - bg_event 2, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 - bg_event 3, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 - bg_event 4, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - bg_event 3, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - bg_event 1, 10, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - bg_event 1, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - bg_event 11, 10, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - bg_event 11, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB + bg_event 10, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3 + bg_event 11, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3 + bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD + bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD + bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 + bg_event 0, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 + bg_event 1, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 + bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 + bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 + bg_event 4, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB + bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB + bg_event 1, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB + bg_event 1, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB + bg_event 11, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB + bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB LittlerootTown_ProfessorBirchsLab_MapEvents:: @ 852D7A0 map_events LittlerootTown_ProfessorBirchsLab_EventObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents diff --git a/data/maps/MarineCave_End/events.inc b/data/maps/MarineCave_End/events.inc index 0d3014ab12..8569e33ec8 100644 --- a/data/maps/MarineCave_End/events.inc +++ b/data/maps/MarineCave_End/events.inc @@ -5,7 +5,7 @@ MarineCave_End_MapWarps: @ 8537800 warp_def 20, 4, 0, 0, MAP_MARINE_CAVE_ENTRANCE MarineCave_End_MapCoordEvents: @ 8537808 - coord_event 9, 26, 3, 0, VAR_TEMP_1, 1, 0, MarineCave_End_EventScript_23B01B + coord_event 9, 26, 3, VAR_TEMP_1, 1, MarineCave_End_EventScript_23B01B MarineCave_End_MapEvents:: @ 8537818 map_events MarineCave_End_EventObjects, MarineCave_End_MapWarps, MarineCave_End_MapCoordEvents, 0x0 diff --git a/data/maps/MauvilleCity/events.inc b/data/maps/MauvilleCity/events.inc index cc393513d8..5b2d9927cd 100644 --- a/data/maps/MauvilleCity/events.inc +++ b/data/maps/MauvilleCity/events.inc @@ -21,14 +21,14 @@ MauvilleCity_MapWarps: @ 8526734 warp_def 19, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE2 MauvilleCity_MapBGEvents: @ 852676C - bg_event 23, 5, 0, 1, 0, MauvilleCity_EventScript_271E73 - bg_event 11, 6, 3, 0, 0, MauvilleCity_EventScript_1DF3E0 - bg_event 24, 14, 0, 1, 0, MauvilleCity_EventScript_271E6A - bg_event 25, 14, 0, 1, 0, MauvilleCity_EventScript_271E6A - bg_event 24, 5, 0, 1, 0, MauvilleCity_EventScript_271E73 - bg_event 19, 7, 0, 0, 0, MauvilleCity_EventScript_1DF3D7 - bg_event 33, 6, 0, 0, 0, MauvilleCity_EventScript_1DF3E9 - bg_event 11, 15, 0, 0, 0, MauvilleCity_EventScript_1DF3F2 + bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E73 + bg_event 11, 6, 3, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3E0 + bg_event 24, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E6A + bg_event 25, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E6A + bg_event 24, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E73 + bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3D7 + bg_event 33, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3E9 + bg_event 11, 15, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3F2 MauvilleCity_MapEvents:: @ 85267CC map_events MauvilleCity_EventObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents diff --git a/data/maps/MauvilleCity_BikeShop/events.inc b/data/maps/MauvilleCity_BikeShop/events.inc index c1ee859090..7befd0f731 100644 --- a/data/maps/MauvilleCity_BikeShop/events.inc +++ b/data/maps/MauvilleCity_BikeShop/events.inc @@ -7,8 +7,8 @@ MauvilleCity_BikeShop_MapWarps: @ 852FEB0 warp_def 4, 8, 0, 2, MAP_MAUVILLE_CITY MauvilleCity_BikeShop_MapBGEvents: @ 852FEC0 - bg_event 8, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20ED3A - bg_event 11, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EDAE + bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_BikeShop_EventScript_20ED3A + bg_event 11, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_BikeShop_EventScript_20EDAE MauvilleCity_BikeShop_MapEvents:: @ 852FED8 map_events MauvilleCity_BikeShop_EventObjects, MauvilleCity_BikeShop_MapWarps, 0x0, MauvilleCity_BikeShop_MapBGEvents diff --git a/data/maps/MauvilleCity_GameCorner/events.inc b/data/maps/MauvilleCity_GameCorner/events.inc index 8c30b75b7b..79b4364897 100644 --- a/data/maps/MauvilleCity_GameCorner/events.inc +++ b/data/maps/MauvilleCity_GameCorner/events.inc @@ -17,30 +17,30 @@ MauvilleCity_GameCorner_MapWarps: @ 8530048 warp_def 12, 10, 3, 5, MAP_MAUVILLE_CITY MauvilleCity_GameCorner_MapBGEvents: @ 8530058 - bg_event 2, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_2102D6 - bg_event 2, 8, 0, 3, 0, MauvilleCity_GameCorner_EventScript_2102F6 - bg_event 2, 9, 0, 3, 0, MauvilleCity_GameCorner_EventScript_210316 - bg_event 3, 7, 0, 4, 0, MauvilleCity_GameCorner_EventScript_210336 - bg_event 3, 8, 0, 4, 0, MauvilleCity_GameCorner_EventScript_210356 - bg_event 3, 9, 0, 4, 0, MauvilleCity_GameCorner_EventScript_210376 - bg_event 7, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_210396 - bg_event 7, 7, 0, 3, 0, MauvilleCity_GameCorner_EventScript_2103B6 - bg_event 7, 9, 0, 3, 0, MauvilleCity_GameCorner_EventScript_2103D6 - bg_event 8, 6, 0, 4, 0, MauvilleCity_GameCorner_EventScript_2103F6 - bg_event 8, 7, 0, 4, 0, MauvilleCity_GameCorner_EventScript_210416 - bg_event 8, 9, 0, 4, 0, MauvilleCity_GameCorner_EventScript_210436 - bg_event 14, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 15, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 14, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 15, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 14, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 15, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 18, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF - bg_event 19, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF - bg_event 18, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF - bg_event 19, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF - bg_event 18, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF - bg_event 19, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF + bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2102D6 + bg_event 2, 8, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2102F6 + bg_event 2, 9, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_210316 + bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210336 + bg_event 3, 8, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210356 + bg_event 3, 9, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210376 + bg_event 7, 6, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_210396 + bg_event 7, 7, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2103B6 + bg_event 7, 9, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2103D6 + bg_event 8, 6, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_2103F6 + bg_event 8, 7, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210416 + bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210436 + bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1 + bg_event 15, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1 + bg_event 14, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1 + bg_event 15, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1 + bg_event 14, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1 + bg_event 15, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1 + bg_event 18, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF + bg_event 19, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF + bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF + bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF + bg_event 18, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF + bg_event 19, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF MauvilleCity_GameCorner_MapEvents:: @ 8530178 map_events MauvilleCity_GameCorner_EventObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents diff --git a/data/maps/MauvilleCity_Gym/events.inc b/data/maps/MauvilleCity_Gym/events.inc index c1b2b0053a..cb126faef7 100644 --- a/data/maps/MauvilleCity_Gym/events.inc +++ b/data/maps/MauvilleCity_Gym/events.inc @@ -12,14 +12,14 @@ MauvilleCity_Gym_MapWarps: @ 852FE04 warp_def 5, 20, 0, 0, MAP_MAUVILLE_CITY MauvilleCity_Gym_MapCoordEvents: @ 852FE14 - coord_event 4, 12, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_20E01E - coord_event 3, 9, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_20E043 - coord_event 0, 15, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_20DFF9 - coord_event 8, 9, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_20E068 + coord_event 4, 12, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20E01E + coord_event 3, 9, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20E043 + coord_event 0, 15, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20DFF9 + coord_event 8, 9, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20E068 MauvilleCity_Gym_MapBGEvents: @ 852FE54 - bg_event 3, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_20E14B - bg_event 6, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_20E15B + bg_event 3, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_Gym_EventScript_20E14B + bg_event 6, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_Gym_EventScript_20E15B MauvilleCity_Gym_MapEvents:: @ 852FE6C map_events MauvilleCity_Gym_EventObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents diff --git a/data/maps/MeteorFalls_1F_1R/events.inc b/data/maps/MeteorFalls_1F_1R/events.inc index 21535add76..068f9a356e 100644 --- a/data/maps/MeteorFalls_1F_1R/events.inc +++ b/data/maps/MeteorFalls_1F_1R/events.inc @@ -19,10 +19,10 @@ MeteorFalls_1F_1R_MapWarps: @ 8534064 warp_def 4, 2, 0, 0, MAP_METEOR_FALLS_STEVENS_CAVE MeteorFalls_1F_1R_MapCoordEvents: @ 8534094 - coord_event 14, 18, 4, 0, VAR_0x40BF, 0, 0, MeteorFalls_1F_1R_EventScript_22BD5F + coord_event 14, 18, 4, VAR_0x40BF, 0, MeteorFalls_1F_1R_EventScript_22BD5F MeteorFalls_1F_1R_MapBGEvents: @ 85340A4 - bg_event 9, 58, 0, 0, 0, 0x0 + bg_event 9, 58, 0, BG_EVENT_PLAYER_FACING_ANY, 0x0 MeteorFalls_1F_1R_MapEvents:: @ 85340B0 map_events MeteorFalls_1F_1R_EventObjects, MeteorFalls_1F_1R_MapWarps, MeteorFalls_1F_1R_MapCoordEvents, MeteorFalls_1F_1R_MapBGEvents diff --git a/data/maps/MeteorFalls_1F_2R/events.inc b/data/maps/MeteorFalls_1F_2R/events.inc index 4cab5be37a..1e8e1f0936 100644 --- a/data/maps/MeteorFalls_1F_2R/events.inc +++ b/data/maps/MeteorFalls_1F_2R/events.inc @@ -10,7 +10,7 @@ MeteorFalls_1F_2R_MapWarps: @ 853410C warp_def 21, 23, 3, 2, MAP_METEOR_FALLS_B1F_1R MeteorFalls_1F_2R_MapBGEvents: @ 853412C - bg_event 9, 58, 0, 0, 0, 0x0 + bg_event 9, 58, 0, BG_EVENT_PLAYER_FACING_ANY, 0x0 MeteorFalls_1F_2R_MapEvents:: @ 8534138 map_events MeteorFalls_1F_2R_EventObjects, MeteorFalls_1F_2R_MapWarps, 0x0, MeteorFalls_1F_2R_MapBGEvents diff --git a/data/maps/MossdeepCity/events.inc b/data/maps/MossdeepCity/events.inc index c95cdf5cf2..0413b1be4f 100644 --- a/data/maps/MossdeepCity/events.inc +++ b/data/maps/MossdeepCity/events.inc @@ -30,26 +30,26 @@ MossdeepCity_MapWarps: @ 85271B0 warp_def 36, 24, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_1F MossdeepCity_MapCoordEvents: @ 8527200 - coord_event 25, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_1E4B38 - coord_event 26, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_1E4B38 - coord_event 32, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_1E4B38 - coord_event 33, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_1E4B38 - coord_event 42, 21, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41 - coord_event 41, 22, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41 - coord_event 41, 23, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41 - coord_event 41, 24, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41 - coord_event 40, 25, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41 - coord_event 40, 26, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41 + coord_event 25, 25, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38 + coord_event 26, 25, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38 + coord_event 32, 27, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38 + coord_event 33, 27, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38 + coord_event 42, 21, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 + coord_event 41, 22, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 + coord_event 41, 23, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 + coord_event 41, 24, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 + coord_event 40, 25, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 + coord_event 40, 26, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 MossdeepCity_MapBGEvents: @ 85272A0 - bg_event 25, 16, 0, 0, 0, MossdeepCity_EventScript_1E4B26 - bg_event 34, 9, 0, 0, 0, MossdeepCity_EventScript_1E4B1D - bg_event 29, 16, 0, 1, 0, MossdeepCity_EventScript_271E73 - bg_event 38, 18, 0, 1, 0, MossdeepCity_EventScript_271E6A - bg_event 66, 16, 0, 0, 0, MossdeepCity_EventScript_1E4B2F - bg_event 30, 16, 0, 1, 0, MossdeepCity_EventScript_271E73 - bg_event 39, 18, 0, 1, 0, MossdeepCity_EventScript_271E6A - bg_event 57, 21, 7, 0, 0, MossdeepCity_EventScript_1E4B14 + bg_event 25, 16, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B26 + bg_event 34, 9, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B1D + bg_event 29, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E73 + bg_event 38, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E6A + bg_event 66, 16, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B2F + bg_event 30, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E73 + bg_event 39, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E6A + bg_event 57, 21, 7, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B14 MossdeepCity_MapEvents:: @ 8527300 map_events MossdeepCity_EventObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents diff --git a/data/maps/MossdeepCity_GameCorner_1F/events.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc index 603d7f3d82..4186ec9cae 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/events.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/events.inc @@ -8,9 +8,9 @@ MossdeepCity_GameCorner_1F_MapWarps: @ 8532F70 warp_def 2, 0, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_B1F MossdeepCity_GameCorner_1F_MapBGEvents: @ 8532F88 - bg_event 3, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B5D - bg_event 0, 1, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_277E9D - bg_event 1, 1, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_277E96 + bg_event 3, 0, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_224B5D + bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_277E9D + bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_277E96 MossdeepCity_GameCorner_1F_MapEvents:: @ 8532FAC map_events MossdeepCity_GameCorner_1F_EventObjects, MossdeepCity_GameCorner_1F_MapWarps, 0x0, MossdeepCity_GameCorner_1F_MapBGEvents diff --git a/data/maps/MossdeepCity_Gym/events.inc b/data/maps/MossdeepCity_Gym/events.inc index 8245f1fc26..a6511d2c1f 100644 --- a/data/maps/MossdeepCity_Gym/events.inc +++ b/data/maps/MossdeepCity_Gym/events.inc @@ -53,19 +53,19 @@ MossdeepCity_Gym_MapWarps: @ 853284C warp_def 21, 10, 0, 12, MAP_MOSSDEEP_CITY_GYM MossdeepCity_Gym_MapCoordEvents: @ 85328BC - coord_event 2, 21, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220C67 - coord_event 8, 10, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220C7D - coord_event 6, 7, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220C7D - coord_event 15, 34, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220C93 - coord_event 23, 24, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220CA9 - coord_event 23, 21, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220CA9 - coord_event 8, 6, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220CBF - coord_event 21, 6, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220AF1 - coord_event 3, 30, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220C67 + coord_event 2, 21, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C67 + coord_event 8, 10, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C7D + coord_event 6, 7, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C7D + coord_event 15, 34, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C93 + coord_event 23, 24, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220CA9 + coord_event 23, 21, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220CA9 + coord_event 8, 6, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220CBF + coord_event 21, 6, 0, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220AF1 + coord_event 3, 30, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C67 MossdeepCity_Gym_MapBGEvents: @ 853294C - bg_event 4, 34, 0, 1, 0, MossdeepCity_Gym_EventScript_220C33 - bg_event 8, 34, 0, 1, 0, MossdeepCity_Gym_EventScript_220C43 + bg_event 4, 34, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_Gym_EventScript_220C33 + bg_event 8, 34, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_Gym_EventScript_220C43 MossdeepCity_Gym_MapEvents:: @ 8532964 map_events MossdeepCity_Gym_EventObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents diff --git a/data/maps/MossdeepCity_StevensHouse/events.inc b/data/maps/MossdeepCity_StevensHouse/events.inc index 521c71e722..66e00b1f4f 100644 --- a/data/maps/MossdeepCity_StevensHouse/events.inc +++ b/data/maps/MossdeepCity_StevensHouse/events.inc @@ -8,10 +8,10 @@ MossdeepCity_StevensHouse_MapWarps: @ 8532C58 warp_def 4, 7, 0, 6, MAP_MOSSDEEP_CITY MossdeepCity_StevensHouse_MapBGEvents: @ 8532C68 - bg_event 0, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222909 - bg_event 1, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222909 - bg_event 10, 4, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_222909 - bg_event 10, 6, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_222909 + bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 + bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 + bg_event 10, 4, 3, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 + bg_event 10, 6, 3, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 MossdeepCity_StevensHouse_MapEvents:: @ 8532C98 map_events MossdeepCity_StevensHouse_EventObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents diff --git a/data/maps/MtChimney/events.inc b/data/maps/MtChimney/events.inc index a8002de8f6..03806a854d 100644 --- a/data/maps/MtChimney/events.inc +++ b/data/maps/MtChimney/events.inc @@ -37,8 +37,8 @@ MtChimney_MapWarps: @ 8534A98 warp_def 21, 41, 3, 3, MAP_JAGGED_PASS MtChimney_MapBGEvents: @ 8534AB8 - bg_event 14, 6, 0, 0, 0, MtChimney_EventScript_22F0E4 - bg_event 24, 37, 3, 0, 0, MtChimney_EventScript_22F141 + bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MtChimney_EventScript_22F0E4 + bg_event 24, 37, 3, BG_EVENT_PLAYER_FACING_ANY, MtChimney_EventScript_22F141 MtChimney_MapEvents:: @ 8534AD0 map_events MtChimney_EventObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents diff --git a/data/maps/MtPyre_Exterior/events.inc b/data/maps/MtPyre_Exterior/events.inc index ec247fd67c..16fd3530fa 100644 --- a/data/maps/MtPyre_Exterior/events.inc +++ b/data/maps/MtPyre_Exterior/events.inc @@ -8,15 +8,15 @@ MtPyre_Exterior_MapWarps: @ 853510C warp_def 20, 10, 3, 1, MAP_MT_PYRE_SUMMIT MtPyre_Exterior_MapCoordEvents: @ 8535124 - coord_event 24, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_231FED - coord_event 25, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_231FED - coord_event 22, 27, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_231FF2 - coord_event 23, 28, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_231FF2 - coord_event 26, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_231FED + coord_event 24, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED + coord_event 25, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED + coord_event 22, 27, 3, 0, 0, MtPyre_Exterior_EventScript_231FF2 + coord_event 23, 28, 3, 0, 0, MtPyre_Exterior_EventScript_231FF2 + coord_event 26, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED MtPyre_Exterior_MapBGEvents: @ 8535174 - bg_event 9, 8, 0, 7, 0, ITEM_ULTRA_BALL, 29, 0 - bg_event 16, 22, 0, 7, 0, ITEM_MAX_ETHER, 78, 0 + bg_hidden_item_event 9, 8, 0, ITEM_ULTRA_BALL, 29 + bg_hidden_item_event 16, 22, 0, ITEM_MAX_ETHER, 78 MtPyre_Exterior_MapEvents:: @ 853518C map_events MtPyre_Exterior_EventObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc index 35107f3f06..669625c41c 100644 --- a/data/maps/MtPyre_Summit/events.inc +++ b/data/maps/MtPyre_Summit/events.inc @@ -14,16 +14,16 @@ MtPyre_Summit_MapWarps: @ 8535260 warp_def 24, 31, 3, 1, MAP_MT_PYRE_EXTERIOR MtPyre_Summit_MapCoordEvents: @ 8535278 - coord_event 22, 7, 3, 0, VAR_0x40B9, 0, 0, MtPyre_Summit_EventScript_232018 - coord_event 23, 7, 3, 0, VAR_0x40B9, 0, 0, MtPyre_Summit_EventScript_232024 - coord_event 24, 7, 3, 0, VAR_0x40B9, 0, 0, MtPyre_Summit_EventScript_232030 - coord_event 22, 9, 3, 0, VAR_0x40B9, 2, 0, MtPyre_Summit_EventScript_2321EC - coord_event 23, 9, 3, 0, VAR_0x40B9, 2, 0, MtPyre_Summit_EventScript_2321F8 - coord_event 24, 9, 3, 0, VAR_0x40B9, 2, 0, MtPyre_Summit_EventScript_232204 + coord_event 22, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232018 + coord_event 23, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232024 + coord_event 24, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232030 + coord_event 22, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_2321EC + coord_event 23, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_2321F8 + coord_event 24, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_232204 MtPyre_Summit_MapBGEvents: @ 85352D8 - bg_event 9, 25, 0, 7, 0, ITEM_ZINC, 79, 0 - bg_event 37, 7, 3, 7, 0, ITEM_RARE_CANDY, 80, 0 + bg_hidden_item_event 9, 25, 0, ITEM_ZINC, 79 + bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, 80 MtPyre_Summit_MapEvents:: @ 85352F0 map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents diff --git a/data/maps/NavelRock_Top/events.inc b/data/maps/NavelRock_Top/events.inc index 6f7253a2b7..ef781a8381 100644 --- a/data/maps/NavelRock_Top/events.inc +++ b/data/maps/NavelRock_Top/events.inc @@ -5,10 +5,10 @@ NavelRock_Top_MapWarps: @ 853DB8C warp_def 13, 20, 3, 1, MAP_NAVEL_ROCK_UP4 NavelRock_Top_MapCoordEvents: @ 853DB94 - coord_event 12, 10, 3, 0, VAR_TEMP_1, 0, 0, NavelRock_Top_EventScript_26916F + coord_event 12, 10, 3, VAR_TEMP_1, 0, NavelRock_Top_EventScript_26916F NavelRock_Top_MapBGEvents: @ 853DBA4 - bg_event 12, 9, 3, 7, 0, ITEM_SACRED_ASH, 109, 0 + bg_hidden_item_event 12, 9, 3, ITEM_SACRED_ASH, 109 NavelRock_Top_MapEvents:: @ 853DBB0 map_events NavelRock_Top_EventObjects, NavelRock_Top_MapWarps, NavelRock_Top_MapCoordEvents, NavelRock_Top_MapBGEvents diff --git a/data/maps/NewMauville_Entrance/events.inc b/data/maps/NewMauville_Entrance/events.inc index 29f46af201..4c333f6b3f 100644 --- a/data/maps/NewMauville_Entrance/events.inc +++ b/data/maps/NewMauville_Entrance/events.inc @@ -3,7 +3,7 @@ NewMauville_Entrance_MapWarps: @ 8536474 warp_def 4, 1, 3, 0, MAP_NEW_MAUVILLE_INSIDE NewMauville_Entrance_MapCoordEvents: @ 8536484 - coord_event 4, 2, 3, 0, VAR_0x40BA, 0, 0, NewMauville_Entrance_EventScript_2372FF + coord_event 4, 2, 3, VAR_0x40BA, 0, NewMauville_Entrance_EventScript_2372FF NewMauville_Entrance_MapEvents:: @ 8536494 map_events 0x0, NewMauville_Entrance_MapWarps, NewMauville_Entrance_MapCoordEvents, 0x0 diff --git a/data/maps/NewMauville_Inside/events.inc b/data/maps/NewMauville_Inside/events.inc index 805c1db6ec..af8f10f991 100644 --- a/data/maps/NewMauville_Inside/events.inc +++ b/data/maps/NewMauville_Inside/events.inc @@ -12,26 +12,26 @@ NewMauville_Inside_MapWarps: @ 8536568 warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE NewMauville_Inside_MapCoordEvents: @ 8536570 - coord_event 30, 38, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_237459 - coord_event 18, 36, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_237471 - coord_event 4, 26, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_237459 - coord_event 16, 22, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_237459 - coord_event 25, 18, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_237471 - coord_event 2, 11, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_237471 - coord_event 6, 11, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_237459 - coord_event 13, 10, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_237459 - coord_event 17, 10, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_237471 - coord_event 33, 6, 3, 0, VAR_0x40BA, 1, 0, NewMauville_Inside_EventScript_237725 + coord_event 30, 38, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459 + coord_event 18, 36, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471 + coord_event 4, 26, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459 + coord_event 16, 22, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459 + coord_event 25, 18, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471 + coord_event 2, 11, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471 + coord_event 6, 11, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459 + coord_event 13, 10, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459 + coord_event 17, 10, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471 + coord_event 33, 6, 3, VAR_0x40BA, 1, NewMauville_Inside_EventScript_237725 NewMauville_Inside_MapBGEvents: @ 8536610 - bg_event 32, 4, 3, 0, 0, NewMauville_Inside_EventScript_23778F - bg_event 32, 3, 3, 0, 0, NewMauville_Inside_EventScript_23778F - bg_event 32, 2, 0, 0, 0, NewMauville_Inside_EventScript_23778F - bg_event 33, 4, 3, 0, 0, NewMauville_Inside_EventScript_23778F - bg_event 34, 4, 3, 0, 0, NewMauville_Inside_EventScript_23778F - bg_event 35, 4, 3, 0, 0, NewMauville_Inside_EventScript_23778F - bg_event 35, 3, 3, 0, 0, NewMauville_Inside_EventScript_23778F - bg_event 35, 2, 0, 0, 0, NewMauville_Inside_EventScript_23778F + bg_event 32, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F + bg_event 32, 3, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F + bg_event 32, 2, 0, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F + bg_event 33, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F + bg_event 34, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F + bg_event 35, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F + bg_event 35, 3, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F + bg_event 35, 2, 0, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F NewMauville_Inside_MapEvents:: @ 8536670 map_events NewMauville_Inside_EventObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents diff --git a/data/maps/OldaleTown/events.inc b/data/maps/OldaleTown/events.inc index 1ba9ea1241..8c637b2bf4 100644 --- a/data/maps/OldaleTown/events.inc +++ b/data/maps/OldaleTown/events.inc @@ -11,17 +11,17 @@ OldaleTown_MapWarps: @ 85278B4 warp_def 14, 6, 0, 0, MAP_OLDALE_TOWN_MART OldaleTown_MapCoordEvents: @ 85278D4 - coord_event 0, 10, 3, 0, VAR_0x4051, 0, 0, OldaleTown_EventScript_1E903F - coord_event 8, 19, 3, 0, VAR_0x40C7, 1, 0, OldaleTown_EventScript_1E9086 - coord_event 9, 19, 3, 0, VAR_0x40C7, 1, 0, OldaleTown_EventScript_1E90A6 - coord_event 10, 19, 3, 0, VAR_0x40C7, 1, 0, OldaleTown_EventScript_1E90C6 + coord_event 0, 10, 3, VAR_0x4051, 0, OldaleTown_EventScript_1E903F + coord_event 8, 19, 3, VAR_0x40C7, 1, OldaleTown_EventScript_1E9086 + coord_event 9, 19, 3, VAR_0x40C7, 1, OldaleTown_EventScript_1E90A6 + coord_event 10, 19, 3, VAR_0x40C7, 1, OldaleTown_EventScript_1E90C6 OldaleTown_MapBGEvents: @ 8527914 - bg_event 11, 9, 0, 0, 0, OldaleTown_EventScript_1E8EEA - bg_event 7, 16, 0, 1, 0, OldaleTown_EventScript_271E73 - bg_event 15, 6, 0, 1, 0, OldaleTown_EventScript_271E6A - bg_event 8, 16, 0, 1, 0, OldaleTown_EventScript_271E73 - bg_event 16, 6, 0, 1, 0, OldaleTown_EventScript_271E6A + bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, OldaleTown_EventScript_1E8EEA + bg_event 7, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E73 + bg_event 15, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E6A + bg_event 8, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E73 + bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E6A OldaleTown_MapEvents:: @ 8527950 map_events OldaleTown_EventObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents diff --git a/data/maps/PacifidlogTown/events.inc b/data/maps/PacifidlogTown/events.inc index 8e1134f86e..a601c8381b 100644 --- a/data/maps/PacifidlogTown/events.inc +++ b/data/maps/PacifidlogTown/events.inc @@ -12,9 +12,9 @@ PacifidlogTown_MapWarps: @ 8527E30 warp_def 17, 21, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE5 PacifidlogTown_MapBGEvents: @ 8527E60 - bg_event 9, 15, 0, 1, 0, PacifidlogTown_EventScript_271E73 - bg_event 7, 16, 0, 0, 0, PacifidlogTown_EventScript_1EBADE - bg_event 10, 15, 0, 1, 0, PacifidlogTown_EventScript_271E73 + bg_event 9, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, PacifidlogTown_EventScript_271E73 + bg_event 7, 16, 0, BG_EVENT_PLAYER_FACING_ANY, PacifidlogTown_EventScript_1EBADE + bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, PacifidlogTown_EventScript_271E73 PacifidlogTown_MapEvents:: @ 8527E84 map_events PacifidlogTown_EventObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents diff --git a/data/maps/PetalburgCity/events.inc b/data/maps/PetalburgCity/events.inc index f33ff09183..b3fd71d2c6 100644 --- a/data/maps/PetalburgCity/events.inc +++ b/data/maps/PetalburgCity/events.inc @@ -18,24 +18,24 @@ PetalburgCity_MapWarps: @ 85260A8 warp_def 25, 12, 0, 0, MAP_PETALBURG_CITY_MART PetalburgCity_MapCoordEvents: @ 85260D8 - coord_event 8, 10, 3, 0, VAR_0x4057, 0, 0, PetalburgCity_EventScript_1DC49A - coord_event 8, 11, 3, 0, VAR_0x4057, 0, 0, PetalburgCity_EventScript_1DC4A6 - coord_event 8, 12, 3, 0, VAR_0x4057, 0, 0, PetalburgCity_EventScript_1DC4B2 - coord_event 8, 13, 3, 0, VAR_0x4057, 0, 0, PetalburgCity_EventScript_1DC4BE - coord_event 4, 10, 3, 0, VAR_0x40C9, 0, 0, PetalburgCity_EventScript_1DC691 - coord_event 4, 11, 3, 0, VAR_0x40C9, 0, 0, PetalburgCity_EventScript_1DC6A7 - coord_event 4, 12, 3, 0, VAR_0x40C9, 0, 0, PetalburgCity_EventScript_1DC6BD - coord_event 4, 13, 3, 0, VAR_0x40C9, 0, 0, PetalburgCity_EventScript_1DC6D3 + coord_event 8, 10, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC49A + coord_event 8, 11, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC4A6 + coord_event 8, 12, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC4B2 + coord_event 8, 13, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC4BE + coord_event 4, 10, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC691 + coord_event 4, 11, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC6A7 + coord_event 4, 12, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC6BD + coord_event 4, 13, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC6D3 PetalburgCity_MapBGEvents: @ 8526158 - bg_event 17, 10, 0, 0, 0, PetalburgCity_EventScript_1DC476 - bg_event 26, 12, 0, 1, 0, PetalburgCity_EventScript_271E6A - bg_event 21, 16, 0, 1, 0, PetalburgCity_EventScript_271E73 - bg_event 17, 16, 0, 0, 0, PetalburgCity_EventScript_1DC47F - bg_event 22, 16, 0, 1, 0, PetalburgCity_EventScript_271E73 - bg_event 27, 12, 0, 1, 0, PetalburgCity_EventScript_271E6A - bg_event 8, 9, 0, 0, 0, PetalburgCity_EventScript_1DC491 - bg_event 11, 29, 3, 7, 0, ITEM_RARE_CANDY, 95, 0 + bg_event 17, 10, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC476 + bg_event 26, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E6A + bg_event 21, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E73 + bg_event 17, 16, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC47F + bg_event 22, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E73 + bg_event 27, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E6A + bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC491 + bg_hidden_item_event 11, 29, 3, ITEM_RARE_CANDY, 95 PetalburgCity_MapEvents:: @ 85261B8 map_events PetalburgCity_EventObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents diff --git a/data/maps/PetalburgCity_Gym/events.inc b/data/maps/PetalburgCity_Gym/events.inc index e3cfe95cc6..209c789a08 100644 --- a/data/maps/PetalburgCity_Gym/events.inc +++ b/data/maps/PetalburgCity_Gym/events.inc @@ -52,20 +52,20 @@ PetalburgCity_Gym_MapWarps: @ 852EED0 warp_def 6, 7, 3, 33, MAP_PETALBURG_CITY_GYM PetalburgCity_Gym_MapBGEvents: @ 852F000 - bg_event 1, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_205137 - bg_event 7, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_205187 - bg_event 1, 79, 3, 0, 0, PetalburgCity_Gym_EventScript_2051BC - bg_event 7, 79, 3, 0, 0, PetalburgCity_Gym_EventScript_2051EF - bg_event 1, 92, 3, 0, 0, PetalburgCity_Gym_EventScript_205222 - bg_event 7, 92, 3, 0, 0, PetalburgCity_Gym_EventScript_205255 - bg_event 7, 40, 3, 0, 0, PetalburgCity_Gym_EventScript_205288 - bg_event 1, 53, 3, 0, 0, PetalburgCity_Gym_EventScript_2052BB - bg_event 7, 53, 3, 0, 0, PetalburgCity_Gym_EventScript_2052EE - bg_event 1, 66, 3, 0, 0, PetalburgCity_Gym_EventScript_205321 - bg_event 7, 14, 3, 0, 0, PetalburgCity_Gym_EventScript_205354 - bg_event 1, 27, 3, 0, 0, PetalburgCity_Gym_EventScript_205387 - bg_event 1, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_20576E - bg_event 7, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_20577E + bg_event 1, 105, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205137 + bg_event 7, 105, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205187 + bg_event 1, 79, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_2051BC + bg_event 7, 79, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_2051EF + bg_event 1, 92, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205222 + bg_event 7, 92, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205255 + bg_event 7, 40, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205288 + bg_event 1, 53, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_2052BB + bg_event 7, 53, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_2052EE + bg_event 1, 66, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205321 + bg_event 7, 14, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205354 + bg_event 1, 27, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205387 + bg_event 1, 110, 3, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_Gym_EventScript_20576E + bg_event 7, 110, 3, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_Gym_EventScript_20577E PetalburgCity_Gym_MapEvents:: @ 852F0A8 map_events PetalburgCity_Gym_EventObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents diff --git a/data/maps/PetalburgWoods/events.inc b/data/maps/PetalburgWoods/events.inc index aaab1e7513..e0bfbc6302 100644 --- a/data/maps/PetalburgWoods/events.inc +++ b/data/maps/PetalburgWoods/events.inc @@ -22,16 +22,16 @@ PetalburgWoods_MapWarps: @ 853471C warp_def 37, 38, 0, 7, MAP_ROUTE104 PetalburgWoods_MapCoordEvents: @ 853474C - coord_event 26, 23, 3, 0, VAR_0x4098, 0, 0, PetalburgWoods_EventScript_22DFD7 - coord_event 27, 23, 3, 0, VAR_0x4098, 0, 0, PetalburgWoods_EventScript_22E079 + coord_event 26, 23, 3, VAR_0x4098, 0, PetalburgWoods_EventScript_22DFD7 + coord_event 27, 23, 3, VAR_0x4098, 0, PetalburgWoods_EventScript_22E079 PetalburgWoods_MapBGEvents: @ 853476C - bg_event 14, 32, 3, 0, 0, PetalburgWoods_EventScript_22E25B - bg_event 39, 35, 3, 7, 0, ITEM_POTION, 58, 0 - bg_event 26, 6, 3, 7, 0, ITEM_TINY_MUSHROOM, 59, 0 - bg_event 40, 29, 3, 7, 0, ITEM_TINY_MUSHROOM, 60, 0 - bg_event 4, 19, 3, 7, 0, ITEM_POKE_BALL, 61, 0 - bg_event 11, 8, 3, 0, 0, PetalburgWoods_EventScript_22E264 + bg_event 14, 32, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_22E25B + bg_hidden_item_event 39, 35, 3, ITEM_POTION, 58 + bg_hidden_item_event 26, 6, 3, ITEM_TINY_MUSHROOM, 59 + bg_hidden_item_event 40, 29, 3, ITEM_TINY_MUSHROOM, 60 + bg_hidden_item_event 4, 19, 3, ITEM_POKE_BALL, 61 + bg_event 11, 8, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_22E264 PetalburgWoods_MapEvents:: @ 85347B4 map_events PetalburgWoods_EventObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents diff --git a/data/maps/RecordCorner/events.inc b/data/maps/RecordCorner/events.inc index b5e297f72a..8e1916a5a0 100644 --- a/data/maps/RecordCorner/events.inc +++ b/data/maps/RecordCorner/events.inc @@ -8,10 +8,10 @@ RecordCorner_MapWarps: @ 8539E14 warp_def 10, 9, 3, 127, MAP_NONE RecordCorner_MapCoordEvents: @ 8539E34 - coord_event 6, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827741D - coord_event 6, 6, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277447 - coord_event 13, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277432 - coord_event 13, 6, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827745C + coord_event 6, 4, 3, VAR_TEMP_0, 0, gUnknown_0827741D + coord_event 6, 6, 3, VAR_TEMP_0, 0, gUnknown_08277447 + coord_event 13, 4, 3, VAR_TEMP_0, 0, gUnknown_08277432 + coord_event 13, 6, 3, VAR_TEMP_0, 0, gUnknown_0827745C RecordCorner_MapEvents:: @ 8539E74 map_events RecordCorner_EventObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0 diff --git a/data/maps/Route101/events.inc b/data/maps/Route101/events.inc index 969166de9c..d43253baa1 100644 --- a/data/maps/Route101/events.inc +++ b/data/maps/Route101/events.inc @@ -7,18 +7,18 @@ Route101_EventObjects: @ 8527E98 object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, Route101_EventScript_1EBE04, 991 Route101_MapCoordEvents: @ 8527F28 - coord_event 10, 19, 3, 0, VAR_0x4060, 1, 0, Route101_EventScript_1EBCDE - coord_event 11, 19, 3, 0, VAR_0x4060, 1, 0, Route101_EventScript_1EBCDE - coord_event 10, 18, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD4E - coord_event 11, 18, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD4E - coord_event 6, 16, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD64 - coord_event 6, 15, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD64 - coord_event 6, 17, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD64 - coord_event 6, 18, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD64 - coord_event 7, 13, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD7A + coord_event 10, 19, 3, VAR_0x4060, 1, Route101_EventScript_1EBCDE + coord_event 11, 19, 3, VAR_0x4060, 1, Route101_EventScript_1EBCDE + coord_event 10, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD4E + coord_event 11, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD4E + coord_event 6, 16, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64 + coord_event 6, 15, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64 + coord_event 6, 17, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64 + coord_event 6, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64 + coord_event 7, 13, 3, VAR_0x4060, 2, Route101_EventScript_1EBD7A Route101_MapBGEvents: @ 8527FB8 - bg_event 5, 9, 0, 0, 0, Route101_EventScript_1EBE0D + bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route101_EventScript_1EBE0D Route101_MapEvents:: @ 8527FC4 map_events Route101_EventObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc index a51e09b590..58a0bf64b6 100644 --- a/data/maps/Route102/events.inc +++ b/data/maps/Route102/events.inc @@ -10,8 +10,8 @@ Route102_EventObjects: @ 8527FD8 object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route102_EventScript_1EC1E1, 0 Route102_MapBGEvents: @ 85280B0 - bg_event 17, 2, 0, 0, 0, Route102_EventScript_1EC0F3 - bg_event 40, 9, 0, 0, 0, Route102_EventScript_1EC0EA + bg_event 17, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_1EC0F3 + bg_event 40, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_1EC0EA Route102_MapEvents:: @ 85280C8 map_events Route102_EventObjects, 0x0, 0x0, Route102_MapBGEvents diff --git a/data/maps/Route103/events.inc b/data/maps/Route103/events.inc index ab858ae137..6581eb582c 100644 --- a/data/maps/Route103/events.inc +++ b/data/maps/Route103/events.inc @@ -24,7 +24,7 @@ Route103_MapWarps: @ 85282BC warp_def 45, 6, 0, 0, MAP_ALTERING_CAVE Route103_MapBGEvents: @ 85282C4 - bg_event 11, 9, 0, 0, 0, Route103_EventScript_1EC5EB + bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route103_EventScript_1EC5EB Route103_MapEvents:: @ 85282D0 map_events Route103_EventObjects, Route103_MapWarps, 0x0, Route103_MapBGEvents diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc index 52a60261ad..497ec2decd 100644 --- a/data/maps/Route104/events.inc +++ b/data/maps/Route104/events.inc @@ -45,19 +45,19 @@ Route104_MapWarps: @ 8528614 warp_def 33, 42, 3, 5, MAP_PETALBURG_WOODS Route104_MapCoordEvents: @ 8528654 - coord_event 17, 51, 3, 0, VAR_0x4063, 1, 0, Route104_EventScript_1ECCB3 + coord_event 17, 51, 3, VAR_0x4063, 1, Route104_EventScript_1ECCB3 Route104_MapBGEvents: @ 8528664 - bg_event 20, 50, 0, 0, 0, Route104_EventScript_1ED018 - bg_event 27, 66, 0, 0, 0, Route104_EventScript_1ED021 - bg_event 23, 5, 0, 0, 0, Route104_EventScript_1ED02A - bg_event 7, 20, 0, 0, 0, Route104_EventScript_1ED033 - bg_event 17, 23, 3, 0, 0, Route104_EventScript_1ED03C - bg_event 7, 6, 3, 7, 0, ITEM_SUPER_POTION, 44, 0 - bg_event 3, 9, 3, 7, 0, ITEM_POKE_BALL, 62, 0 - bg_event 14, 55, 3, 7, 0, ITEM_POTION, 37, 0 - bg_event 16, 72, 3, 7, 0, ITEM_ANTIDOTE, 85, 0 - bg_event 16, 64, 3, 7, 0, ITEM_HEART_SCALE, 88, 0 + bg_event 20, 50, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED018 + bg_event 27, 66, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED021 + bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED02A + bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED033 + bg_event 17, 23, 3, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED03C + bg_hidden_item_event 7, 6, 3, ITEM_SUPER_POTION, 44 + bg_hidden_item_event 3, 9, 3, ITEM_POKE_BALL, 62 + bg_hidden_item_event 14, 55, 3, ITEM_POTION, 37 + bg_hidden_item_event 16, 72, 3, ITEM_ANTIDOTE, 85 + bg_hidden_item_event 16, 64, 3, ITEM_HEART_SCALE, 88 Route104_MapEvents:: @ 85286DC map_events Route104_EventObjects, Route104_MapWarps, Route104_MapCoordEvents, Route104_MapBGEvents diff --git a/data/maps/Route105/events.inc b/data/maps/Route105/events.inc index cf7addcc8c..aa9b9b4205 100644 --- a/data/maps/Route105/events.inc +++ b/data/maps/Route105/events.inc @@ -12,8 +12,8 @@ Route105_MapWarps: @ 85287B0 warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE Route105_MapBGEvents: @ 85287B8 - bg_event 15, 68, 3, 7, 0, ITEM_HEART_SCALE, 89, 0 - bg_event 5, 56, 3, 7, 0, ITEM_BIG_PEARL, 111, 0 + bg_hidden_item_event 15, 68, 3, ITEM_HEART_SCALE, 89 + bg_hidden_item_event 5, 56, 3, ITEM_BIG_PEARL, 111 Route105_MapEvents:: @ 85287D0 map_events Route105_EventObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents diff --git a/data/maps/Route106/events.inc b/data/maps/Route106/events.inc index 22807fcec5..11541f2bf2 100644 --- a/data/maps/Route106/events.inc +++ b/data/maps/Route106/events.inc @@ -9,10 +9,10 @@ Route106_MapWarps: @ 852885C warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F Route106_MapBGEvents: @ 8528864 - bg_event 41, 11, 3, 7, 0, ITEM_POKE_BALL, 63, 0 - bg_event 53, 12, 0, 7, 0, ITEM_STARDUST, 46, 0 - bg_event 68, 15, 3, 7, 0, ITEM_HEART_SCALE, 47, 0 - bg_event 59, 13, 3, 0, 0, Route106_EventScript_1EE48A + bg_hidden_item_event 41, 11, 3, ITEM_POKE_BALL, 63 + bg_hidden_item_event 53, 12, 0, ITEM_STARDUST, 46 + bg_hidden_item_event 68, 15, 3, ITEM_HEART_SCALE, 47 + bg_event 59, 13, 3, BG_EVENT_PLAYER_FACING_ANY, Route106_EventScript_1EE48A Route106_MapEvents:: @ 8528894 map_events Route106_EventObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents diff --git a/data/maps/Route108/events.inc b/data/maps/Route108/events.inc index a83027178d..e18cf16d08 100644 --- a/data/maps/Route108/events.inc +++ b/data/maps/Route108/events.inc @@ -11,7 +11,7 @@ Route108_MapWarps: @ 8528A0C warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK Route108_MapBGEvents: @ 8528A14 - bg_event 38, 14, 3, 7, 0, ITEM_RARE_CANDY, 86, 0 + bg_hidden_item_event 38, 14, 3, ITEM_RARE_CANDY, 86 Route108_MapEvents:: @ 8528A20 map_events Route108_EventObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents diff --git a/data/maps/Route109/events.inc b/data/maps/Route109/events.inc index 66527a7ae4..f74e1ceab4 100644 --- a/data/maps/Route109/events.inc +++ b/data/maps/Route109/events.inc @@ -28,14 +28,14 @@ Route109_MapWarps: @ 8528C74 warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE Route109_MapBGEvents: @ 8528C7C - bg_event 15, 5, 0, 0, 0, Route109_EventScript_1EEA2B - bg_event 29, 10, 3, 0, 0, Route109_EventScript_1EEA34 - bg_event 16, 23, 3, 7, 0, ITEM_REVIVE, 50, 0 - bg_event 33, 5, 3, 7, 0, ITEM_HEART_SCALE, 52, 0 - bg_event 9, 10, 3, 7, 0, ITEM_GREAT_BALL, 51, 0 - bg_event 28, 20, 3, 7, 0, ITEM_ETHER, 64, 0 - bg_event 13, 16, 3, 7, 0, ITEM_HEART_SCALE, 90, 0 - bg_event 8, 42, 3, 7, 0, ITEM_HEART_SCALE, 91, 0 + bg_event 15, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_1EEA2B + bg_event 29, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_1EEA34 + bg_hidden_item_event 16, 23, 3, ITEM_REVIVE, 50 + bg_hidden_item_event 33, 5, 3, ITEM_HEART_SCALE, 52 + bg_hidden_item_event 9, 10, 3, ITEM_GREAT_BALL, 51 + bg_hidden_item_event 28, 20, 3, ITEM_ETHER, 64 + bg_hidden_item_event 13, 16, 3, ITEM_HEART_SCALE, 90 + bg_hidden_item_event 8, 42, 3, ITEM_HEART_SCALE, 91 Route109_MapEvents:: @ 8528CDC map_events Route109_EventObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc index 4cb99b121c..6e6d17d9a8 100644 --- a/data/maps/Route110/events.inc +++ b/data/maps/Route110/events.inc @@ -45,34 +45,34 @@ Route110_MapWarps: @ 8529050 warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE Route110_MapCoordEvents: @ 8529080 - coord_event 28, 92, 3, 0, VAR_0x40A9, 2, 0, Route110_EventScript_1EF661 - coord_event 29, 92, 3, 0, VAR_0x40A9, 2, 0, Route110_EventScript_1EF661 - coord_event 33, 56, 3, 0, VAR_0x4069, 0, 0, Route110_EventScript_1EF74D - coord_event 34, 56, 3, 0, VAR_0x4069, 0, 0, Route110_EventScript_1EF758 - coord_event 35, 56, 3, 0, VAR_0x4069, 0, 0, Route110_EventScript_1EF763 - coord_event 7, 85, 3, 0, VAR_0x40DA, 1, 0, Route110_EventScript_1EF9CB - coord_event 8, 85, 3, 0, VAR_0x40DA, 1, 0, Route110_EventScript_1EF9D6 - coord_event 9, 85, 3, 0, VAR_0x40DA, 1, 0, Route110_EventScript_1EF9E1 - coord_event 10, 85, 3, 0, VAR_0x40DA, 1, 0, Route110_EventScript_1EF9EC + coord_event 28, 92, 3, VAR_0x40A9, 2, Route110_EventScript_1EF661 + coord_event 29, 92, 3, VAR_0x40A9, 2, Route110_EventScript_1EF661 + coord_event 33, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF74D + coord_event 34, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF758 + coord_event 35, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF763 + coord_event 7, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9CB + coord_event 8, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9D6 + coord_event 9, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9E1 + coord_event 10, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9EC Route110_MapBGEvents: @ 8529110 - bg_event 15, 25, 0, 0, 0, Route110_EventScript_1EF353 - bg_event 9, 51, 0, 0, 0, Route110_EventScript_1EF365 - bg_event 14, 88, 0, 0, 0, Route110_EventScript_1EF34A - bg_event 20, 94, 0, 0, 0, Route110_EventScript_1EF341 - bg_event 7, 79, 0, 0, 0, Route110_EventScript_1EF35C - bg_event 3, 17, 0, 0, 0, Route110_EventScript_1EF36E - bg_event 16, 25, 0, 8, 0, ITEM_MACHO_BRACE, 0, 0 - bg_event 17, 25, 0, 8, 0, ITEM_SOUL_DEW, 0, 0 - bg_event 33, 39, 3, 0, 0, Route110_EventScript_1EF377 - bg_event 37, 70, 3, 0, 0, Route110_EventScript_1EF380 - bg_event 8, 67, 0, 0, 0, Route110_EventScript_1EF389 - bg_event 32, 93, 0, 0, 0, Route110_EventScript_1EF392 - bg_event 35, 39, 3, 7, 0, ITEM_REVIVE, 54, 0 - bg_event 33, 45, 3, 7, 0, ITEM_GREAT_BALL, 53, 0 - bg_event 4, 35, 3, 7, 0, ITEM_POKE_BALL, 65, 0 - bg_event 37, 67, 3, 7, 0, ITEM_FULL_HEAL, 55, 0 - bg_event 13, 16, 0, 0, 0, Route110_EventScript_1EF34A + bg_event 15, 25, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF353 + bg_event 9, 51, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF365 + bg_event 14, 88, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF34A + bg_event 20, 94, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF341 + bg_event 7, 79, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF35C + bg_event 3, 17, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF36E + bg_secret_base_event 16, 25, 0, SECRET_BASE_TREE3_1 + bg_secret_base_event 17, 25, 0, SECRET_BASE_TREE4_1 + bg_event 33, 39, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF377 + bg_event 37, 70, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF380 + bg_event 8, 67, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF389 + bg_event 32, 93, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF392 + bg_hidden_item_event 35, 39, 3, ITEM_REVIVE, 54 + bg_hidden_item_event 33, 45, 3, ITEM_GREAT_BALL, 53 + bg_hidden_item_event 4, 35, 3, ITEM_POKE_BALL, 65 + bg_hidden_item_event 37, 67, 3, ITEM_FULL_HEAL, 55 + bg_event 13, 16, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF34A Route110_MapEvents:: @ 85291DC map_events Route110_EventObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc index 4af135a6de..ee7f5ef172 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc @@ -8,8 +8,8 @@ Route110_SeasideCyclingRoadNorthEntrance_MapWarps: @ 853E9B8 warp_def 13, 5, 0, 5, MAP_ROUTE110 Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents: @ 853E9D8 - coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84 - coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6 + coord_event 7, 4, 3, VAR_TEMP_1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84 + coord_event 5, 4, 3, VAR_TEMP_1, 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6 Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: @ 853E9F8 map_events Route110_SeasideCyclingRoadNorthEntrance_EventObjects, Route110_SeasideCyclingRoadNorthEntrance_MapWarps, Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc index 3e9c99d55c..8d10ce4997 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc @@ -8,8 +8,8 @@ Route110_SeasideCyclingRoadSouthEntrance_MapWarps: @ 853EA24 warp_def 13, 5, 0, 3, MAP_ROUTE110 Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents: @ 853EA44 - coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0 - coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13 + coord_event 7, 4, 3, VAR_TEMP_1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0 + coord_event 5, 4, 3, VAR_TEMP_1, 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13 Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: @ 853EA64 map_events Route110_SeasideCyclingRoadSouthEntrance_EventObjects, Route110_SeasideCyclingRoadSouthEntrance_MapWarps, Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route110_TrickHouseEnd/events.inc b/data/maps/Route110_TrickHouseEnd/events.inc index 8348be5cb0..44539d4cc6 100644 --- a/data/maps/Route110_TrickHouseEnd/events.inc +++ b/data/maps/Route110_TrickHouseEnd/events.inc @@ -6,10 +6,10 @@ Route110_TrickHouseEnd_MapWarps: @ 853DF14 warp_def 2, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_CORRIDOR Route110_TrickHouseEnd_MapCoordEvents: @ 853DF24 - coord_event 2, 2, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHouseEnd_EventScript_26B041 + coord_event 2, 2, 3, VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_26B041 Route110_TrickHouseEnd_MapBGEvents: @ 853DF34 - bg_event 4, 5, 3, 7, 0, ITEM_NUGGET, 1, 0 + bg_hidden_item_event 4, 5, 3, ITEM_NUGGET, 1 Route110_TrickHouseEnd_MapEvents:: @ 853DF40 map_events Route110_TrickHouseEnd_EventObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents diff --git a/data/maps/Route110_TrickHouseEntrance/events.inc b/data/maps/Route110_TrickHouseEntrance/events.inc index d1083bb7fa..5255e5acfa 100644 --- a/data/maps/Route110_TrickHouseEntrance/events.inc +++ b/data/maps/Route110_TrickHouseEntrance/events.inc @@ -7,13 +7,13 @@ Route110_TrickHouseEntrance_MapWarps: @ 853DE84 warp_def 5, 2, 3, 0, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 Route110_TrickHouseEntrance_MapCoordEvents: @ 853DE9C - coord_event 4, 7, 3, 0, VAR_0x40A5, 0, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 - coord_event 5, 6, 3, 0, VAR_0x40A5, 0, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 - coord_event 6, 6, 3, 0, VAR_0x40A5, 0, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 - coord_event 7, 7, 3, 0, VAR_0x40A5, 0, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 + coord_event 4, 7, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 + coord_event 5, 6, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 + coord_event 6, 6, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 + coord_event 7, 7, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 Route110_TrickHouseEntrance_MapBGEvents: @ 853DEDC - bg_event 5, 1, 0, 1, 0, Route110_TrickHouseEntrance_EventScript_26A0D3 + bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, Route110_TrickHouseEntrance_EventScript_26A0D3 Route110_TrickHouseEntrance_MapEvents:: @ 853DEE8 map_events Route110_TrickHouseEntrance_EventObjects, Route110_TrickHouseEntrance_MapWarps, Route110_TrickHouseEntrance_MapCoordEvents, Route110_TrickHouseEntrance_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle1/events.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc index 38186f2176..ae6de093d1 100644 --- a/data/maps/Route110_TrickHousePuzzle1/events.inc +++ b/data/maps/Route110_TrickHousePuzzle1/events.inc @@ -21,7 +21,7 @@ Route110_TrickHousePuzzle1_MapWarps: @ 853E0F0 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle1_MapBGEvents: @ 853E108 - bg_event 3, 16, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_26B92B + bg_event 3, 16, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle1_EventScript_26B92B Route110_TrickHousePuzzle1_MapEvents:: @ 853E114 map_events Route110_TrickHousePuzzle1_EventObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle2/events.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc index 2fa2f4bbcb..0e8d3607b1 100644 --- a/data/maps/Route110_TrickHousePuzzle2/events.inc +++ b/data/maps/Route110_TrickHousePuzzle2/events.inc @@ -11,13 +11,13 @@ Route110_TrickHousePuzzle2_MapWarps: @ 853E1A0 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle2_MapCoordEvents: @ 853E1B8 - coord_event 11, 12, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BBDD - coord_event 0, 4, 0, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BBF0 - coord_event 14, 5, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BC03 - coord_event 7, 11, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BC16 + coord_event 11, 12, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle2_EventScript_26BBDD + coord_event 0, 4, 0, VAR_TEMP_2, 0, Route110_TrickHousePuzzle2_EventScript_26BBF0 + coord_event 14, 5, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle2_EventScript_26BC03 + coord_event 7, 11, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle2_EventScript_26BC16 Route110_TrickHousePuzzle2_MapBGEvents: @ 853E1F8 - bg_event 14, 14, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BBC0 + bg_event 14, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle2_EventScript_26BBC0 Route110_TrickHousePuzzle2_MapEvents:: @ 853E204 map_events Route110_TrickHousePuzzle2_EventObjects, Route110_TrickHousePuzzle2_MapWarps, Route110_TrickHousePuzzle2_MapCoordEvents, Route110_TrickHousePuzzle2_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle3/events.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc index 986384ad4b..38063f98d4 100644 --- a/data/maps/Route110_TrickHousePuzzle3/events.inc +++ b/data/maps/Route110_TrickHousePuzzle3/events.inc @@ -13,13 +13,13 @@ Route110_TrickHousePuzzle3_MapWarps: @ 853E2C0 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle3_MapCoordEvents: @ 853E2D8 - coord_event 4, 14, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4CD - coord_event 3, 11, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4D9 - coord_event 12, 5, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4E5 - coord_event 8, 2, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4F1 + coord_event 4, 14, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle3_EventScript_26C4CD + coord_event 3, 11, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle3_EventScript_26C4D9 + coord_event 12, 5, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle3_EventScript_26C4E5 + coord_event 8, 2, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle3_EventScript_26C4F1 Route110_TrickHousePuzzle3_MapBGEvents: @ 853E318 - bg_event 0, 14, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C5A7 + bg_event 0, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle3_EventScript_26C5A7 Route110_TrickHousePuzzle3_MapEvents:: @ 853E324 map_events Route110_TrickHousePuzzle3_EventObjects, Route110_TrickHousePuzzle3_MapWarps, Route110_TrickHousePuzzle3_MapCoordEvents, Route110_TrickHousePuzzle3_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle4/events.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc index 97022a3e0a..f5406539f7 100644 --- a/data/maps/Route110_TrickHousePuzzle4/events.inc +++ b/data/maps/Route110_TrickHousePuzzle4/events.inc @@ -20,7 +20,7 @@ Route110_TrickHousePuzzle4_MapWarps: @ 853E488 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle4_MapBGEvents: @ 853E4A0 - bg_event 14, 13, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_26C861 + bg_event 14, 13, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle4_EventScript_26C861 Route110_TrickHousePuzzle4_MapEvents:: @ 853E4AC map_events Route110_TrickHousePuzzle4_EventObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle5/events.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc index 0401ef544a..f91d26f4db 100644 --- a/data/maps/Route110_TrickHousePuzzle5/events.inc +++ b/data/maps/Route110_TrickHousePuzzle5/events.inc @@ -11,31 +11,31 @@ Route110_TrickHousePuzzle5_MapWarps: @ 853E538 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle5_MapCoordEvents: @ 853E550 - coord_event 5, 17, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBD7 - coord_event 4, 17, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBE3 - coord_event 3, 17, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBEF - coord_event 2, 17, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBFB - coord_event 1, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC13 - coord_event 2, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC1F - coord_event 13, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC5B - coord_event 12, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC67 - coord_event 11, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC73 - coord_event 13, 19, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC97 - coord_event 12, 19, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCA3 - coord_event 11, 4, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCDF - coord_event 1, 17, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC07 - coord_event 3, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC2B - coord_event 4, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC37 - coord_event 5, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC43 - coord_event 6, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC4F - coord_event 10, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC7F - coord_event 9, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC8B - coord_event 11, 19, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCAF - coord_event 10, 19, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCBB - coord_event 9, 19, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCC7 + coord_event 5, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBD7 + coord_event 4, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBE3 + coord_event 3, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBEF + coord_event 2, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBFB + coord_event 1, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC13 + coord_event 2, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC1F + coord_event 13, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC5B + coord_event 12, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC67 + coord_event 11, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC73 + coord_event 13, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CC97 + coord_event 12, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCA3 + coord_event 11, 4, 3, VAR_TEMP_5, 0, Route110_TrickHousePuzzle5_EventScript_26CCDF + coord_event 1, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CC07 + coord_event 3, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC2B + coord_event 4, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC37 + coord_event 5, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC43 + coord_event 6, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC4F + coord_event 10, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC7F + coord_event 9, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC8B + coord_event 11, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCAF + coord_event 10, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCBB + coord_event 9, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCC7 Route110_TrickHousePuzzle5_MapBGEvents: @ 853E6B0 - bg_event 11, 21, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB15 + bg_event 11, 21, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle5_EventScript_26CB15 Route110_TrickHousePuzzle5_MapEvents:: @ 853E6BC map_events Route110_TrickHousePuzzle5_EventObjects, Route110_TrickHousePuzzle5_MapWarps, Route110_TrickHousePuzzle5_MapCoordEvents, Route110_TrickHousePuzzle5_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle6/events.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc index 75d64270b6..df3ef829a7 100644 --- a/data/maps/Route110_TrickHousePuzzle6/events.inc +++ b/data/maps/Route110_TrickHousePuzzle6/events.inc @@ -10,7 +10,7 @@ Route110_TrickHousePuzzle6_MapWarps: @ 853E730 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle6_MapBGEvents: @ 853E748 - bg_event 0, 10, 3, 0, 0, Route110_TrickHousePuzzle6_EventScript_26DDC4 + bg_event 0, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle6_EventScript_26DDC4 Route110_TrickHousePuzzle6_MapEvents:: @ 853E754 map_events Route110_TrickHousePuzzle6_EventObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle7/events.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc index 1d4373f251..62a52420b9 100644 --- a/data/maps/Route110_TrickHousePuzzle7/events.inc +++ b/data/maps/Route110_TrickHousePuzzle7/events.inc @@ -25,13 +25,13 @@ Route110_TrickHousePuzzle7_MapWarps: @ 853E840 warp_def 8, 12, 0, 11, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 Route110_TrickHousePuzzle7_MapCoordEvents: @ 853E8A8 - coord_event 8, 19, 0, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E31B - coord_event 0, 14, 0, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E331 - coord_event 6, 6, 0, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E347 - coord_event 9, 7, 0, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E35D + coord_event 8, 19, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E31B + coord_event 0, 14, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E331 + coord_event 6, 6, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E347 + coord_event 9, 7, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E35D Route110_TrickHousePuzzle7_MapBGEvents: @ 853E8E8 - bg_event 6, 17, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E1D0 + bg_event 6, 17, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_26E1D0 Route110_TrickHousePuzzle7_MapEvents:: @ 853E8F4 map_events Route110_TrickHousePuzzle7_EventObjects, Route110_TrickHousePuzzle7_MapWarps, Route110_TrickHousePuzzle7_MapCoordEvents, Route110_TrickHousePuzzle7_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle8/events.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc index efeb449ffa..a5d4c0f8a9 100644 --- a/data/maps/Route110_TrickHousePuzzle8/events.inc +++ b/data/maps/Route110_TrickHousePuzzle8/events.inc @@ -10,7 +10,7 @@ Route110_TrickHousePuzzle8_MapWarps: @ 853E968 warp_def 13, 1, 0, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle8_MapBGEvents: @ 853E980 - bg_event 3, 21, 3, 0, 0, Route110_TrickHousePuzzle8_EventScript_26E802 + bg_event 3, 21, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle8_EventScript_26E802 Route110_TrickHousePuzzle8_MapEvents:: @ 853E98C map_events Route110_TrickHousePuzzle8_EventObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents diff --git a/data/maps/Route111/events.inc b/data/maps/Route111/events.inc index b6aee76aca..cd11e1ef25 100644 --- a/data/maps/Route111/events.inc +++ b/data/maps/Route111/events.inc @@ -54,60 +54,60 @@ Route111_MapWarps: @ 8529640 warp_def 31, 113, 0, 0, MAP_TRAINER_HILL_ENTRANCE Route111_MapCoordEvents: @ 8529668 - coord_event 12, 62, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD - coord_event 11, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F0A - coord_event 12, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F0A - coord_event 13, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F0A - coord_event 7, 63, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 - coord_event 12, 44, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16 - coord_event 13, 43, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16 - coord_event 14, 42, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16 - coord_event 16, 40, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16 - coord_event 14, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F0A - coord_event 18, 32, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 - coord_event 17, 31, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 - coord_event 9, 37, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 - coord_event 10, 36, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 - coord_event 17, 39, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16 - coord_event 18, 38, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16 - coord_event 8, 64, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 - coord_event 9, 65, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 - coord_event 10, 65, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 - coord_event 11, 66, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 - coord_event 12, 67, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 - coord_event 13, 68, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 - coord_event 14, 69, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 - coord_event 10, 61, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD - coord_event 11, 62, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD - coord_event 13, 62, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD - coord_event 14, 62, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD - coord_event 17, 38, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD - coord_event 16, 39, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD - coord_event 15, 40, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD - coord_event 14, 41, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD - coord_event 13, 42, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD - coord_event 12, 43, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD - coord_event 11, 44, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD + coord_event 12, 62, 3, 0, 0, Route111_EventScript_1F0FBD + coord_event 11, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A + coord_event 12, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A + coord_event 13, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A + coord_event 7, 63, 3, 0, 0, Route111_EventScript_1F0FB0 + coord_event 12, 44, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16 + coord_event 13, 43, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16 + coord_event 14, 42, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16 + coord_event 16, 40, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16 + coord_event 14, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A + coord_event 18, 32, 3, 0, 0, Route111_EventScript_1F0FB0 + coord_event 17, 31, 3, 0, 0, Route111_EventScript_1F0FB0 + coord_event 9, 37, 3, 0, 0, Route111_EventScript_1F0FB0 + coord_event 10, 36, 3, 0, 0, Route111_EventScript_1F0FB0 + coord_event 17, 39, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16 + coord_event 18, 38, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16 + coord_event 8, 64, 3, 0, 0, Route111_EventScript_1F0FB0 + coord_event 9, 65, 3, 0, 0, Route111_EventScript_1F0FB0 + coord_event 10, 65, 3, 0, 0, Route111_EventScript_1F0FB0 + coord_event 11, 66, 3, 0, 0, Route111_EventScript_1F0FB0 + coord_event 12, 67, 3, 0, 0, Route111_EventScript_1F0FB0 + coord_event 13, 68, 3, 0, 0, Route111_EventScript_1F0FB0 + coord_event 14, 69, 3, 0, 0, Route111_EventScript_1F0FB0 + coord_event 10, 61, 3, 0, 0, Route111_EventScript_1F0FBD + coord_event 11, 62, 3, 0, 0, Route111_EventScript_1F0FBD + coord_event 13, 62, 3, 0, 0, Route111_EventScript_1F0FBD + coord_event 14, 62, 3, 0, 0, Route111_EventScript_1F0FBD + coord_event 17, 38, 3, 0, 0, Route111_EventScript_1F0FBD + coord_event 16, 39, 3, 0, 0, Route111_EventScript_1F0FBD + coord_event 15, 40, 3, 0, 0, Route111_EventScript_1F0FBD + coord_event 14, 41, 3, 0, 0, Route111_EventScript_1F0FBD + coord_event 13, 42, 3, 0, 0, Route111_EventScript_1F0FBD + coord_event 12, 43, 3, 0, 0, Route111_EventScript_1F0FBD + coord_event 11, 44, 3, 0, 0, Route111_EventScript_1F0FBD Route111_MapBGEvents: @ 8529888 - bg_event 16, 114, 0, 0, 0, Route111_EventScript_1F115C - bg_event 24, 126, 0, 0, 0, Route111_EventScript_1F1153 - bg_event 7, 66, 0, 0, 0, Route111_EventScript_1F1165 - bg_event 13, 6, 0, 0, 0, Route111_EventScript_1F116E - bg_event 24, 36, 0, 8, 0, ITEM_FAB_MAIL, 0, 0 - bg_event 34, 50, 0, 8, 0, ITEM_LUM_BERRY, 0, 0 - bg_event 33, 34, 0, 8, 0, ITEM_ORANGE_MAIL, 0, 0 - bg_event 25, 19, 0, 0, 0, Route111_EventScript_1F1177 - bg_event 35, 1, 0, 8, 0, ITEM_POTION, 0, 0 - bg_event 35, 31, 0, 8, 0, ITEM_POMEG_BERRY, 0, 0 - bg_event 26, 70, 0, 7, 0, ITEM_STARDUST, 2, 0 - bg_event 27, 27, 3, 8, 0, ITEM_REVIVAL_HERB, 0, 0 - bg_event 7, 84, 3, 0, 0, Route111_EventScript_1F1180 - bg_event 14, 19, 0, 8, 0, ITEM_PAMTRE_BERRY, 0, 0 - bg_event 13, 19, 0, 8, 0, ITEM_RABUTA_BERRY, 0, 0 - bg_event 19, 55, 0, 7, 0, ITEM_PROTEIN, 56, 0 - bg_event 35, 66, 0, 7, 0, ITEM_RARE_CANDY, 57, 0 - bg_event 24, 116, 0, 0, 0, Route111_EventScript_1F146C + bg_event 16, 114, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F115C + bg_event 24, 126, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1153 + bg_event 7, 66, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1165 + bg_event 13, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F116E + bg_secret_base_event 24, 36, 0, SECRET_BASE_YELLOW_CAVE2_1 + bg_secret_base_event 34, 50, 0, SECRET_BASE_YELLOW_CAVE3_1 + bg_secret_base_event 33, 34, 0, SECRET_BASE_YELLOW_CAVE1_1 + bg_event 25, 19, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1177 + bg_secret_base_event 35, 1, 0, SECRET_BASE_RED_CAVE2_3 + bg_secret_base_event 35, 31, 0, SECRET_BASE_YELLOW_CAVE4_3 + bg_hidden_item_event 26, 70, 0, ITEM_STARDUST, 2 + bg_secret_base_event 27, 27, 3, SECRET_BASE_RED_CAVE4_3 + bg_event 7, 84, 3, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1180 + bg_secret_base_event 14, 19, 0, SECRET_BASE_TREE1_4 + bg_secret_base_event 13, 19, 0, SECRET_BASE_TREE1_1 + bg_hidden_item_event 19, 55, 0, ITEM_PROTEIN, 56 + bg_hidden_item_event 35, 66, 0, ITEM_RARE_CANDY, 57 + bg_event 24, 116, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F146C Route111_MapEvents:: @ 8529960 map_events Route111_EventObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents diff --git a/data/maps/Route112/events.inc b/data/maps/Route112/events.inc index 7cf199eee3..d612869286 100644 --- a/data/maps/Route112/events.inc +++ b/data/maps/Route112/events.inc @@ -23,9 +23,9 @@ Route112_MapWarps: @ 8529AC4 warp_def 22, 10, 0, 1, MAP_FIERY_PATH Route112_MapBGEvents: @ 8529AF4 - bg_event 19, 44, 3, 0, 0, Route112_EventScript_1F1E4F - bg_event 22, 37, 0, 0, 0, Route112_EventScript_1F1E46 - bg_event 4, 49, 0, 0, 0, Route112_EventScript_1F1E58 + bg_event 19, 44, 3, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E4F + bg_event 22, 37, 0, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E46 + bg_event 4, 49, 0, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E58 Route112_MapEvents:: @ 8529B18 map_events Route112_EventObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc index 23469ff17e..7af1afea7e 100644 --- a/data/maps/Route113/events.inc +++ b/data/maps/Route113/events.inc @@ -22,35 +22,35 @@ Route113_MapWarps: @ 8529CAC warp_def 88, 5, 0, 0, MAP_TERRA_CAVE_ENTRANCE Route113_MapCoordEvents: @ 8529CC4 - coord_event 19, 11, 3, 0, 8, 0, 0, 0x0 - coord_event 19, 10, 3, 0, 8, 0, 0, 0x0 - coord_event 19, 12, 3, 0, 8, 0, 0, 0x0 - coord_event 19, 13, 3, 0, 8, 0, 0, 0x0 - coord_event 86, 9, 3, 0, 8, 0, 0, 0x0 - coord_event 85, 10, 3, 0, 8, 0, 0, 0x0 - coord_event 85, 11, 3, 0, 8, 0, 0, 0x0 - coord_event 14, 10, 3, 0, 2, 0, 0, 0x0 - coord_event 14, 11, 3, 0, 2, 0, 0, 0x0 - coord_event 14, 12, 3, 0, 2, 0, 0, 0x0 - coord_event 14, 13, 3, 0, 2, 0, 0, 0x0 - coord_event 94, 8, 3, 0, 2, 0, 0, 0x0 - coord_event 94, 9, 3, 0, 2, 0, 0, 0x0 - coord_event 94, 10, 3, 0, 2, 0, 0, 0x0 - coord_event 94, 11, 0, 0, 2, 0, 0, 0x0 - coord_event 19, 14, 3, 0, 8, 0, 0, 0x0 - coord_event 87, 8, 3, 0, 8, 0, 0, 0x0 - coord_event 87, 6, 3, 0, 8, 0, 0, 0x0 - coord_event 87, 7, 3, 0, 8, 0, 0, 0x0 + coord_weather_event 19, 11, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 19, 10, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 19, 12, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 19, 13, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 86, 9, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 85, 10, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 85, 11, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 14, 10, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 14, 11, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 14, 12, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 14, 13, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 94, 8, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 94, 9, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 94, 10, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 94, 11, 0, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 19, 14, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 87, 8, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 87, 6, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 87, 7, 3, COORD_EVENT_WEATHER_ASH Route113_MapBGEvents: @ 8529DF4 - bg_event 85, 6, 0, 0, 0, Route113_EventScript_1F219C - bg_event 12, 9, 0, 0, 0, Route113_EventScript_1F21A5 - bg_event 58, 4, 3, 0, 0, Route113_EventScript_1F21B7 - bg_event 31, 5, 0, 0, 0, Route113_EventScript_1F21AE - bg_event 49, 8, 3, 8, 0, ITEM_GREAT_BALL, 0, 0 - bg_event 66, 3, 3, 7, 0, ITEM_ETHER, 3, 0 - bg_event 22, 5, 3, 7, 0, ITEM_TM32, 30, 0 - bg_event 73, 3, 3, 7, 0, ITEM_NUGGET, 98, 0 + bg_event 85, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F219C + bg_event 12, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21A5 + bg_event 58, 4, 3, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21B7 + bg_event 31, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21AE + bg_secret_base_event 49, 8, 3, SECRET_BASE_RED_CAVE1_3 + bg_hidden_item_event 66, 3, 3, ITEM_ETHER, 3 + bg_hidden_item_event 22, 5, 3, ITEM_TM32, 30 + bg_hidden_item_event 73, 3, 3, ITEM_NUGGET, 98 Route113_MapEvents:: @ 8529E54 map_events Route113_EventObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents diff --git a/data/maps/Route114/events.inc b/data/maps/Route114/events.inc index 1f25b59caf..70cabb8c53 100644 --- a/data/maps/Route114/events.inc +++ b/data/maps/Route114/events.inc @@ -35,18 +35,18 @@ Route114_MapWarps: @ 852A0F0 warp_def 7, 4, 0, 0, MAP_TERRA_CAVE_ENTRANCE Route114_MapBGEvents: @ 852A118 - bg_event 7, 64, 0, 0, 0, Route114_EventScript_1F2625 - bg_event 31, 7, 0, 0, 0, Route114_EventScript_1F262E - bg_event 9, 47, 0, 8, 0, ITEM_RED_FLUTE, 0, 0 - bg_event 30, 51, 0, 8, 0, ITEM_GREEN_SHARD, 0, 0 - bg_event 11, 62, 0, 8, 0, 61, 0, 0 - bg_event 19, 70, 0, 8, 0, ITEM_PP_MAX, 0, 0 - bg_event 11, 27, 0, 8, 0, ITEM_EXP_SHARE, 0, 0 - bg_event 12, 27, 0, 8, 0, ITEM_DEEP_SEA_TOOTH, 0, 0 - bg_event 25, 38, 3, 0, 0, Route114_EventScript_1F2637 - bg_event 20, 57, 3, 7, 0, ITEM_CARBOS, 4, 0 - bg_event 32, 57, 0, 8, 0, ITEM_GUARD_SPEC, 0, 0 - bg_event 7, 30, 3, 7, 0, ITEM_REVIVE, 42, 0 + bg_event 7, 64, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F2625 + bg_event 31, 7, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F262E + bg_secret_base_event 9, 47, 0, SECRET_BASE_BROWN_CAVE1_1 + bg_secret_base_event 30, 51, 0, SECRET_BASE_BROWN_CAVE2_1 + bg_secret_base_event 11, 62, 0, SECRET_BASE_BROWN_CAVE3_1 + bg_secret_base_event 19, 70, 0, SECRET_BASE_BROWN_CAVE4_1 + bg_secret_base_event 11, 27, 0, SECRET_BASE_TREE3_2 + bg_secret_base_event 12, 27, 0, SECRET_BASE_TREE4_2 + bg_event 25, 38, 3, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F2637 + bg_hidden_item_event 20, 57, 3, ITEM_CARBOS, 4 + bg_secret_base_event 32, 57, 0, SECRET_BASE_BROWN_CAVE4_3 + bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, 42 Route114_MapEvents:: @ 852A1A8 map_events Route114_EventObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents diff --git a/data/maps/Route114_FossilManiacsHouse/events.inc b/data/maps/Route114_FossilManiacsHouse/events.inc index 65864133ec..0a707820e0 100644 --- a/data/maps/Route114_FossilManiacsHouse/events.inc +++ b/data/maps/Route114_FossilManiacsHouse/events.inc @@ -7,10 +7,10 @@ Route114_FossilManiacsHouse_MapWarps: @ 8533D14 warp_def 4, 1, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL Route114_FossilManiacsHouse_MapBGEvents: @ 8533D2C - bg_event 5, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_22AD73 - bg_event 6, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_22AD73 - bg_event 7, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_22AD7C - bg_event 8, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_22AD7C + bg_event 5, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD73 + bg_event 6, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD73 + bg_event 7, 2, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD7C + bg_event 8, 2, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD7C Route114_FossilManiacsHouse_MapEvents:: @ 8533D5C map_events Route114_FossilManiacsHouse_EventObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents diff --git a/data/maps/Route114_FossilManiacsTunnel/events.inc b/data/maps/Route114_FossilManiacsTunnel/events.inc index ca61428524..ba3798f7b8 100644 --- a/data/maps/Route114_FossilManiacsTunnel/events.inc +++ b/data/maps/Route114_FossilManiacsTunnel/events.inc @@ -7,8 +7,8 @@ Route114_FossilManiacsTunnel_MapWarps: @ 8533D88 warp_def 6, 2, 0, 0, MAP_DESERT_UNDERPASS Route114_FossilManiacsTunnel_MapCoordEvents: @ 8533DA0 - coord_event 5, 4, 3, 0, VAR_0x40CC, 1, 0, Route114_FossilManiacsTunnel_EventScript_22AF66 - coord_event 6, 4, 3, 0, VAR_0x40CC, 1, 0, Route114_FossilManiacsTunnel_EventScript_22AF66 + coord_event 5, 4, 3, VAR_0x40CC, 1, Route114_FossilManiacsTunnel_EventScript_22AF66 + coord_event 6, 4, 3, VAR_0x40CC, 1, Route114_FossilManiacsTunnel_EventScript_22AF66 Route114_FossilManiacsTunnel_MapEvents:: @ 8533DC0 map_events Route114_FossilManiacsTunnel_EventObjects, Route114_FossilManiacsTunnel_MapWarps, Route114_FossilManiacsTunnel_MapCoordEvents, 0x0 diff --git a/data/maps/Route114_LanettesHouse/events.inc b/data/maps/Route114_LanettesHouse/events.inc index a6ecd2e7f1..47bd391fb7 100644 --- a/data/maps/Route114_LanettesHouse/events.inc +++ b/data/maps/Route114_LanettesHouse/events.inc @@ -6,9 +6,9 @@ Route114_LanettesHouse_MapWarps: @ 8533DEC warp_def 6, 7, 0, 2, MAP_ROUTE114 Route114_LanettesHouse_MapBGEvents: @ 8533DFC - bg_event 5, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_22B309 - bg_event 8, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_22B345 - bg_event 7, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_22B345 + bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_22B309 + bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_22B345 + bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_22B345 Route114_LanettesHouse_MapEvents:: @ 8533E20 map_events Route114_LanettesHouse_EventObjects, Route114_LanettesHouse_MapWarps, 0x0, Route114_LanettesHouse_MapBGEvents diff --git a/data/maps/Route115/events.inc b/data/maps/Route115/events.inc index 29a77c6ce7..36888bd7ab 100644 --- a/data/maps/Route115/events.inc +++ b/data/maps/Route115/events.inc @@ -29,20 +29,20 @@ Route115_MapWarps: @ 852A3E4 warp_def 36, 10, 0, 0, MAP_TERRA_CAVE_ENTRANCE Route115_MapBGEvents: @ 852A3FC - bg_event 32, 6, 0, 8, 0, 72, 0, 0 - bg_event 21, 18, 0, 8, 0, 62, 0, 0 - bg_event 16, 64, 0, 0, 0, Route115_EventScript_1F297C - bg_event 25, 38, 3, 0, 0, Route115_EventScript_1F2985 - bg_event 8, 30, 0, 8, 0, ITEM_CHERI_BERRY, 0, 0 - bg_event 32, 39, 0, 8, 0, ITEM_BLACK_FLUTE, 0, 0 - bg_event 26, 15, 0, 8, 0, 52, 0, 0 - bg_event 23, 8, 0, 8, 0, ITEM_WHITE_FLUTE, 0, 0 - bg_event 32, 46, 0, 8, 0, 53, 0, 0 - bg_event 7, 20, 0, 8, 0, ITEM_STARF_BERRY, 0, 0 - bg_event 8, 20, 0, 8, 0, ITEM_QUICK_CLAW, 0, 0 - bg_event 25, 24, 0, 8, 0, ITEM_HP_UP, 0, 0 - bg_event 20, 53, 0, 8, 0, ITEM_HYPER_POTION, 0, 0 - bg_event 15, 49, 3, 7, 0, ITEM_HEART_SCALE, 97, 0 + bg_secret_base_event 32, 6, 0, SECRET_BASE_BROWN_CAVE4_2 + bg_secret_base_event 21, 18, 0, SECRET_BASE_BROWN_CAVE3_2 + bg_event 16, 64, 0, BG_EVENT_PLAYER_FACING_ANY, Route115_EventScript_1F297C + bg_event 25, 38, 3, BG_EVENT_PLAYER_FACING_ANY, Route115_EventScript_1F2985 + bg_secret_base_event 8, 30, 0, SECRET_BASE_YELLOW_CAVE2_3 + bg_secret_base_event 32, 39, 0, SECRET_BASE_BROWN_CAVE1_2 + bg_secret_base_event 26, 15, 0, SECRET_BASE_BROWN_CAVE2_2 + bg_secret_base_event 23, 8, 0, SECRET_BASE_BROWN_CAVE1_3 + bg_secret_base_event 32, 46, 0, SECRET_BASE_BROWN_CAVE2_3 + bg_secret_base_event 7, 20, 0, SECRET_BASE_TREE2_4 + bg_secret_base_event 8, 20, 0, SECRET_BASE_TREE3_3 + bg_secret_base_event 25, 24, 0, SECRET_BASE_BROWN_CAVE3_3 + bg_secret_base_event 20, 53, 0, SECRET_BASE_RED_CAVE3_1 + bg_hidden_item_event 15, 49, 3, ITEM_HEART_SCALE, 97 Route115_MapEvents:: @ 852A4A4 map_events Route115_EventObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents diff --git a/data/maps/Route116/events.inc b/data/maps/Route116/events.inc index e2ba1ad15b..d81cf31ee8 100644 --- a/data/maps/Route116/events.inc +++ b/data/maps/Route116/events.inc @@ -36,20 +36,20 @@ Route116_MapWarps: @ 852A758 warp_def 79, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE Route116_MapCoordEvents: @ 852A780 - coord_event 47, 9, 3, 0, VAR_0x406F, 1, 0, Route116_EventScript_1F2D95 + coord_event 47, 9, 3, VAR_0x406F, 1, Route116_EventScript_1F2D95 Route116_MapBGEvents: @ 852A790 - bg_event 5, 10, 0, 0, 0, Route116_EventScript_1F2D57 - bg_event 48, 9, 0, 0, 0, Route116_EventScript_1F2D60 - bg_event 40, 9, 0, 0, 0, Route116_EventScript_1F2D69 - bg_event 71, 4, 0, 8, 0, ITEM_FLUFFY_TAIL, 0, 0 - bg_event 79, 11, 0, 8, 0, 91, 0, 0 - bg_event 16, 12, 0, 0, 0, Route116_EventScript_1F2D72 - bg_event 29, 10, 0, 0, 0, Route116_EventScript_1F2D7B - bg_event 56, 6, 0, 8, 0, 102, 0, 0 - bg_event 55, 15, 0, 8, 0, 112, 0, 0 - bg_event 22, 9, 3, 7, 0, ITEM_SUPER_POTION, 45, 0 - bg_event 70, 13, 3, 7, 0, ITEM_BLACK_GLASSES, 96, 0 + bg_event 5, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D57 + bg_event 48, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D60 + bg_event 40, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D69 + bg_secret_base_event 71, 4, 0, SECRET_BASE_BLUE_CAVE1_1 + bg_secret_base_event 79, 11, 0, SECRET_BASE_BLUE_CAVE2_1 + bg_event 16, 12, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D72 + bg_event 29, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D7B + bg_secret_base_event 56, 6, 0, SECRET_BASE_BLUE_CAVE3_2 + bg_secret_base_event 55, 15, 0, SECRET_BASE_BLUE_CAVE4_2 + bg_hidden_item_event 22, 9, 3, ITEM_SUPER_POTION, 45 + bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, 96 Route116_MapEvents:: @ 852A814 map_events Route116_EventObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents diff --git a/data/maps/Route117/events.inc b/data/maps/Route117/events.inc index 9747679ad2..ffdb9984f8 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 diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc index f49f07faa3..b24e21f445 100644 --- a/data/maps/Route118/events.inc +++ b/data/maps/Route118/events.inc @@ -26,20 +26,20 @@ Route118_MapWarps: @ 852ACAC warp_def 9, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE Route118_MapCoordEvents: @ 852ACBC - coord_event 43, 11, 3, 0, VAR_0x4071, 0, 0, Route118_EventScript_1F3E8E - coord_event 44, 11, 3, 0, VAR_0x4071, 0, 0, Route118_EventScript_1F3EAE - coord_event 45, 11, 3, 0, VAR_0x4071, 0, 0, Route118_EventScript_1F3EC4 + coord_event 43, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3E8E + coord_event 44, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3EAE + coord_event 45, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3EC4 Route118_MapBGEvents: @ 852ACEC - bg_event 47, 14, 0, 8, 0, ITEM_MASTER_BALL, 0, 0 - bg_event 13, 6, 0, 0, 0, Route118_EventScript_1F3E7C - bg_event 56, 8, 0, 0, 0, Route118_EventScript_1F3E85 - bg_event 67, 6, 0, 8, 0, ITEM_LUXURY_BALL, 0, 0 - bg_event 29, 5, 0, 8, 0, ITEM_HARBOR_MAIL, 0, 0 - bg_event 47, 5, 0, 8, 0, ITEM_SPELON_BERRY, 0, 0 - bg_event 46, 5, 0, 8, 0, ITEM_PETAYA_BERRY, 0, 0 - bg_event 31, 13, 3, 7, 0, ITEM_IRON, 67, 0 - bg_event 12, 14, 3, 7, 0, ITEM_HEART_SCALE, 66, 0 + bg_secret_base_event 47, 14, 0, SECRET_BASE_RED_CAVE1_1 + bg_event 13, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route118_EventScript_1F3E7C + bg_event 56, 8, 0, BG_EVENT_PLAYER_FACING_ANY, Route118_EventScript_1F3E85 + bg_secret_base_event 67, 6, 0, SECRET_BASE_RED_CAVE2_1 + bg_secret_base_event 29, 5, 0, SECRET_BASE_YELLOW_CAVE1_2 + bg_secret_base_event 47, 5, 0, SECRET_BASE_TREE1_3 + bg_secret_base_event 46, 5, 0, SECRET_BASE_TREE2_1 + bg_hidden_item_event 31, 13, 3, ITEM_IRON, 67 + bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, 66 Route118_MapEvents:: @ 852AD58 map_events Route118_EventObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_MapBGEvents diff --git a/data/maps/Route119/events.inc b/data/maps/Route119/events.inc index c21f105e55..587b609040 100644 --- a/data/maps/Route119/events.inc +++ b/data/maps/Route119/events.inc @@ -48,51 +48,51 @@ Route119_MapWarps: @ 852B174 warp_def 33, 109, 0, 0, MAP_ROUTE119_HOUSE Route119_MapCoordEvents: @ 852B184 - coord_event 25, 31, 0, 0, VAR_0x4072, 0, 0, Route119_EventScript_1F4472 - coord_event 26, 31, 0, 0, VAR_0x4072, 0, 0, Route119_EventScript_1F447D - coord_event 29, 13, 3, 0, 20, 0, 0, 0x0 - coord_event 30, 13, 3, 0, 20, 0, 0, 0x0 - coord_event 31, 13, 3, 0, 20, 0, 0, 0x0 - coord_event 32, 13, 3, 0, 20, 0, 0, 0x0 - coord_event 15, 133, 3, 0, 20, 0, 0, 0x0 - coord_event 16, 132, 3, 0, 20, 0, 0, 0x0 - coord_event 17, 131, 3, 0, 20, 0, 0, 0x0 - coord_event 18, 130, 3, 0, 20, 0, 0, 0x0 - coord_event 19, 131, 3, 0, 20, 0, 0, 0x0 - coord_event 20, 132, 3, 0, 20, 0, 0, 0x0 - coord_event 21, 133, 3, 0, 20, 0, 0, 0x0 - coord_event 36, 6, 3, 0, 2, 0, 0, 0x0 - coord_event 36, 7, 3, 0, 2, 0, 0, 0x0 - coord_event 35, 8, 3, 0, 2, 0, 0, 0x0 - coord_event 35, 9, 3, 0, 2, 0, 0, 0x0 - coord_event 16, 137, 3, 0, 2, 0, 0, 0x0 - coord_event 17, 137, 3, 0, 2, 0, 0, 0x0 - coord_event 18, 137, 3, 0, 2, 0, 0, 0x0 - coord_event 19, 137, 3, 0, 2, 0, 0, 0x0 - coord_event 20, 137, 3, 0, 2, 0, 0, 0x0 - coord_event 34, 13, 3, 0, 20, 0, 0, 0x0 + coord_event 25, 31, 0, VAR_0x4072, 0, Route119_EventScript_1F4472 + coord_event 26, 31, 0, VAR_0x4072, 0, Route119_EventScript_1F447D + coord_weather_event 29, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 30, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 31, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 32, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 15, 133, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 16, 132, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 17, 131, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 18, 130, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 19, 131, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 20, 132, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 21, 133, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 36, 6, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 36, 7, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 35, 8, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 35, 9, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 16, 137, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 17, 137, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 18, 137, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 19, 137, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 20, 137, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 34, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE Route119_MapBGEvents: @ 852B2F4 - bg_event 9, 33, 0, 0, 0, Route119_EventScript_1F477D - bg_event 27, 19, 0, 0, 0, Route119_EventScript_1F4774 - bg_event 5, 2, 0, 8, 0, ITEM_DRAGON_SCALE, 0, 0 - bg_event 4, 89, 0, 8, 0, ITEM_LIGHT_BALL, 0, 0 - bg_event 5, 15, 0, 8, 0, ITEM_POISON_BARB, 0, 0 - bg_event 7, 101, 3, 8, 0, ITEM_NEVER_MELT_ICE, 0, 0 - bg_event 34, 24, 3, 8, 0, ITEM_LAX_INCENSE, 0, 0 - bg_event 31, 73, 3, 8, 0, 231, 0, 0 - bg_event 16, 81, 0, 8, 0, ITEM_TINY_MUSHROOM, 0, 0 - bg_event 16, 28, 0, 8, 0, 113, 0, 0 - bg_event 17, 82, 3, 7, 0, ITEM_CALCIUM, 5, 0 - bg_event 38, 63, 3, 7, 0, ITEM_ULTRA_BALL, 6, 0 - bg_event 26, 81, 0, 8, 0, ITEM_FULL_HEAL, 0, 0 - bg_event 19, 76, 0, 8, 0, ITEM_LANSAT_BERRY, 0, 0 - bg_event 18, 76, 0, 8, 0, ITEM_DEEP_SEA_SCALE, 0, 0 - bg_event 4, 15, 0, 8, 0, ITEM_METAL_POWDER, 0, 0 - bg_event 6, 2, 0, 8, 0, 233, 0, 0 - bg_event 26, 120, 3, 7, 0, ITEM_FULL_HEAL, 68, 0 - bg_event 20, 29, 3, 7, 0, ITEM_MAX_ETHER, 87, 0 - bg_event 28, 9, 0, 0, 0, Route119_EventScript_1F49E3 + bg_event 9, 33, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F477D + bg_event 27, 19, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F4774 + bg_secret_base_event 5, 2, 0, SECRET_BASE_SHRUB1_1 + bg_secret_base_event 4, 89, 0, SECRET_BASE_SHRUB1_2 + bg_secret_base_event 5, 15, 0, SECRET_BASE_SHRUB2_1 + bg_secret_base_event 7, 101, 3, SECRET_BASE_SHRUB2_2 + bg_secret_base_event 34, 24, 3, SECRET_BASE_SHRUB3_1 + bg_secret_base_event 31, 73, 3, SECRET_BASE_SHRUB4_1 + bg_secret_base_event 16, 81, 0, SECRET_BASE_BLUE_CAVE3_3 + bg_secret_base_event 16, 28, 0, SECRET_BASE_BLUE_CAVE4_3 + bg_hidden_item_event 17, 82, 3, ITEM_CALCIUM, 5 + bg_hidden_item_event 38, 63, 3, ITEM_ULTRA_BALL, 6 + bg_secret_base_event 26, 81, 0, SECRET_BASE_RED_CAVE3_3 + bg_secret_base_event 19, 76, 0, SECRET_BASE_TREE2_3 + bg_secret_base_event 18, 76, 0, SECRET_BASE_TREE4_3 + bg_secret_base_event 4, 15, 0, SECRET_BASE_SHRUB3_3 + bg_secret_base_event 6, 2, 0, SECRET_BASE_SHRUB4_3 + bg_hidden_item_event 26, 120, 3, ITEM_FULL_HEAL, 68 + bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, 87 + bg_event 28, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F49E3 Route119_MapEvents:: @ 852B3E4 map_events Route119_EventObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents diff --git a/data/maps/Route119_WeatherInstitute_1F/events.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc index c69d053ff4..01a93f7e66 100644 --- a/data/maps/Route119_WeatherInstitute_1F/events.inc +++ b/data/maps/Route119_WeatherInstitute_1F/events.inc @@ -11,10 +11,10 @@ Route119_WeatherInstitute_1F_MapWarps: @ 853EB98 warp_def 17, 1, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_2F Route119_WeatherInstitute_1F_MapBGEvents: @ 853EBB0 - bg_event 1, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB18 - bg_event 1, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB18 - bg_event 0, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB18 - bg_event 0, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB18 + bg_event 1, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 + bg_event 1, 3, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 + bg_event 0, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 + bg_event 0, 3, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 Route119_WeatherInstitute_1F_MapEvents:: @ 853EBE0 map_events Route119_WeatherInstitute_1F_EventObjects, Route119_WeatherInstitute_1F_MapWarps, 0x0, Route119_WeatherInstitute_1F_MapBGEvents diff --git a/data/maps/Route120/events.inc b/data/maps/Route120/events.inc index fd79c716de..97ae62fe64 100644 --- a/data/maps/Route120/events.inc +++ b/data/maps/Route120/events.inc @@ -49,41 +49,41 @@ Route120_MapWarps: @ 852B818 warp_def 19, 23, 1, 0, MAP_SCORCHED_SLAB Route120_MapCoordEvents: @ 852B828 - coord_event 7, 15, 0, 0, 3, 0, 0, 0x0 - coord_event 7, 16, 0, 0, 3, 0, 0, 0x0 - coord_event 22, 61, 3, 0, 3, 0, 0, 0x0 - coord_event 12, 64, 3, 0, 3, 0, 0, 0x0 - coord_event 35, 63, 3, 0, 1, 0, 0, 0x0 - coord_event 36, 63, 3, 0, 1, 0, 0, 0x0 - coord_event 37, 63, 3, 0, 1, 0, 0, 0x0 - coord_event 38, 63, 3, 0, 1, 0, 0, 0x0 - coord_event 32, 88, 5, 0, 1, 0, 0, 0x0 - coord_event 28, 15, 0, 0, 2, 0, 0, 0x0 - coord_event 28, 16, 0, 0, 2, 0, 0, 0x0 - coord_event 28, 17, 3, 0, 2, 0, 0, 0x0 - coord_event 32, 89, 5, 0, 1, 0, 0, 0x0 - coord_event 32, 90, 5, 0, 1, 0, 0, 0x0 - coord_event 32, 91, 5, 0, 1, 0, 0, 0x0 - coord_event 10, 75, 3, 0, 1, 0, 0, 0x0 - coord_event 11, 75, 3, 0, 1, 0, 0, 0x0 - coord_event 12, 75, 3, 0, 1, 0, 0, 0x0 - coord_event 13, 75, 3, 0, 1, 0, 0, 0x0 + coord_weather_event 7, 15, 0, COORD_EVENT_WEATHER_RAIN_LIGHT + coord_weather_event 7, 16, 0, COORD_EVENT_WEATHER_RAIN_LIGHT + coord_weather_event 22, 61, 3, COORD_EVENT_WEATHER_RAIN_LIGHT + coord_weather_event 12, 64, 3, COORD_EVENT_WEATHER_RAIN_LIGHT + coord_weather_event 35, 63, 3, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 36, 63, 3, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 37, 63, 3, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 38, 63, 3, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 32, 88, 5, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 28, 15, 0, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 28, 16, 0, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 28, 17, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 32, 89, 5, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 32, 90, 5, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 32, 91, 5, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 10, 75, 3, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 11, 75, 3, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 12, 75, 3, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 13, 75, 3, COORD_EVENT_WEATHER_CLOUDS Route120_MapBGEvents: @ 852B958 - bg_event 27, 3, 3, 0, 0, Route120_EventScript_1F57C5 - bg_event 38, 88, 3, 0, 0, Route120_EventScript_1F57CE - bg_event 28, 62, 0, 8, 0, 101, 0, 0 - bg_event 30, 62, 0, 8, 0, ITEM_HEART_SCALE, 0, 0 - bg_event 26, 10, 0, 8, 0, ITEM_LUCKY_PUNCH, 0, 0 - bg_event 29, 85, 5, 8, 0, 232, 0, 0 - bg_event 18, 12, 0, 8, 0, ITEM_SUN_STONE, 0, 0 - bg_event 38, 54, 0, 8, 0, ITEM_SOFT_SAND, 0, 0 - bg_event 31, 23, 0, 8, 0, ITEM_SPELL_TAG, 0, 0 - bg_event 9, 1, 3, 7, 0, ITEM_RARE_CANDY, 71, 0 - bg_event 31, 11, 3, 7, 0, ITEM_REVIVE, 84, 0 - bg_event 0, 86, 3, 7, 0, ITEM_RARE_CANDY, 69, 0 - bg_event 24, 42, 3, 7, 0, ITEM_ZINC, 70, 0 - bg_event 5, 76, 0, 8, 0, ITEM_HARD_STONE, 0, 0 + bg_event 27, 3, 3, BG_EVENT_PLAYER_FACING_ANY, Route120_EventScript_1F57C5 + bg_event 38, 88, 3, BG_EVENT_PLAYER_FACING_ANY, Route120_EventScript_1F57CE + bg_secret_base_event 28, 62, 0, SECRET_BASE_BLUE_CAVE3_1 + bg_secret_base_event 30, 62, 0, SECRET_BASE_BLUE_CAVE4_1 + bg_secret_base_event 26, 10, 0, SECRET_BASE_SHRUB3_2 + bg_secret_base_event 29, 85, 5, SECRET_BASE_SHRUB4_2 + bg_secret_base_event 18, 12, 0, SECRET_BASE_BLUE_CAVE2_3 + bg_secret_base_event 38, 54, 0, SECRET_BASE_SHRUB1_3 + bg_secret_base_event 31, 23, 0, SECRET_BASE_SHRUB2_3 + bg_hidden_item_event 9, 1, 3, ITEM_RARE_CANDY, 71 + bg_hidden_item_event 31, 11, 3, ITEM_REVIVE, 84 + bg_hidden_item_event 0, 86, 3, ITEM_RARE_CANDY, 69 + bg_hidden_item_event 24, 42, 3, ITEM_ZINC, 70 + bg_secret_base_event 5, 76, 0, SECRET_BASE_SHRUB1_4 Route120_MapEvents:: @ 852BA00 map_events Route120_EventObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc index 7cafdc4020..03f86df429 100644 --- a/data/maps/Route121/events.inc +++ b/data/maps/Route121/events.inc @@ -33,22 +33,22 @@ Route121_MapWarps: @ 852BCCC warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE Route121_MapCoordEvents: @ 852BCD4 - coord_event 25, 5, 3, 0, VAR_0x4074, 0, 0, Route121_EventScript_1F5E18 - coord_event 25, 6, 3, 0, VAR_0x4074, 0, 0, Route121_EventScript_1F5E18 - coord_event 25, 7, 3, 0, VAR_0x4074, 0, 0, Route121_EventScript_1F5E18 - coord_event 25, 8, 3, 0, VAR_0x4074, 0, 0, Route121_EventScript_1F5E18 + coord_event 25, 5, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 + coord_event 25, 6, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 + coord_event 25, 7, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 + coord_event 25, 8, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 Route121_MapBGEvents: @ 852BD14 - bg_event 32, 14, 0, 0, 0, Route121_EventScript_1F5E06 - bg_event 40, 11, 0, 8, 0, ITEM_PREMIER_BALL, 0, 0 - bg_event 18, 13, 0, 8, 0, ITEM_SUPER_POTION, 0, 0 - bg_event 43, 7, 0, 8, 0, ITEM_NOMEL_BERRY, 0, 0 - bg_event 42, 7, 0, 8, 0, ITEM_APICOT_BERRY, 0, 0 - bg_event 39, 6, 0, 0, 0, Route121_EventScript_1F5E0F - bg_event 23, 10, 3, 7, 0, ITEM_HP_UP, 39, 0 - bg_event 58, 3, 3, 7, 0, ITEM_NUGGET, 40, 0 - bg_event 72, 5, 3, 7, 0, ITEM_FULL_HEAL, 73, 0 - bg_event 68, 8, 3, 7, 0, ITEM_MAX_REVIVE, 100, 0 + bg_event 32, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_1F5E06 + bg_secret_base_event 40, 11, 0, SECRET_BASE_RED_CAVE2_2 + bg_secret_base_event 18, 13, 0, SECRET_BASE_RED_CAVE3_2 + bg_secret_base_event 43, 7, 0, SECRET_BASE_TREE1_2 + bg_secret_base_event 42, 7, 0, SECRET_BASE_TREE2_2 + bg_event 39, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_1F5E0F + bg_hidden_item_event 23, 10, 3, ITEM_HP_UP, 39 + bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, 40 + bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, 73 + bg_hidden_item_event 68, 8, 3, ITEM_MAX_REVIVE, 100 Route121_MapEvents:: @ 852BD8C map_events Route121_EventObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents diff --git a/data/maps/Route121_SafariZoneEntrance/events.inc b/data/maps/Route121_SafariZoneEntrance/events.inc index 8ac15b5033..658be476f8 100644 --- a/data/maps/Route121_SafariZoneEntrance/events.inc +++ b/data/maps/Route121_SafariZoneEntrance/events.inc @@ -10,10 +10,10 @@ Route121_SafariZoneEntrance_MapWarps: @ 8533F24 warp_def 15, 13, 0, 0, MAP_ROUTE121 Route121_SafariZoneEntrance_MapCoordEvents: @ 8533F44 - coord_event 8, 4, 3, 0, VAR_TEMP_1, 0, 0, Route121_SafariZoneEntrance_EventScript_22BC18 + coord_event 8, 4, 3, VAR_TEMP_1, 0, Route121_SafariZoneEntrance_EventScript_22BC18 Route121_SafariZoneEntrance_MapBGEvents: @ 8533F54 - bg_event 15, 1, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BD21 + bg_event 15, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_SafariZoneEntrance_EventScript_22BD21 Route121_SafariZoneEntrance_MapEvents:: @ 8533F60 map_events Route121_SafariZoneEntrance_EventObjects, Route121_SafariZoneEntrance_MapWarps, Route121_SafariZoneEntrance_MapCoordEvents, Route121_SafariZoneEntrance_MapBGEvents diff --git a/data/maps/Route123/events.inc b/data/maps/Route123/events.inc index 7fafbb76aa..3f17c6c3da 100644 --- a/data/maps/Route123/events.inc +++ b/data/maps/Route123/events.inc @@ -47,41 +47,41 @@ Route123_MapWarps: @ 852C1C4 warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE Route123_MapCoordEvents: @ 852C1CC - coord_event 90, 16, 3, 0, 21, 0, 0, 0x0 - coord_event 92, 9, 3, 0, 21, 0, 0, 0x0 - coord_event 93, 12, 3, 0, 21, 0, 0, 0x0 - coord_event 92, 13, 3, 0, 21, 0, 0, 0x0 - coord_event 91, 14, 3, 0, 21, 0, 0, 0x0 - coord_event 19, 13, 3, 0, 21, 0, 0, 0x0 - coord_event 19, 12, 3, 0, 21, 0, 0, 0x0 - coord_event 34, 13, 3, 0, 21, 0, 0, 0x0 - coord_event 19, 14, 3, 0, 21, 0, 0, 0x0 - coord_event 19, 15, 3, 0, 21, 0, 0, 0x0 - coord_event 19, 16, 3, 0, 21, 0, 0, 0x0 - coord_event 108, 14, 3, 0, 2, 0, 0, 0x0 - coord_event 109, 15, 3, 0, 2, 0, 0, 0x0 - coord_event 110, 16, 3, 0, 2, 0, 0, 0x0 - coord_event 111, 17, 3, 0, 2, 0, 0, 0x0 - coord_event 112, 18, 3, 0, 2, 0, 0, 0x0 - coord_event 9, 12, 3, 0, 2, 0, 0, 0x0 - coord_event 9, 13, 3, 0, 2, 0, 0, 0x0 - coord_event 9, 14, 3, 0, 2, 0, 0, 0x0 - coord_event 9, 15, 3, 0, 2, 0, 0, 0x0 - coord_event 9, 16, 3, 0, 2, 0, 0, 0x0 - coord_event 94, 10, 3, 0, 21, 0, 0, 0x0 + coord_weather_event 90, 16, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 92, 9, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 93, 12, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 92, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 91, 14, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 19, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 19, 12, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 34, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 19, 14, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 19, 15, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 19, 16, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 108, 14, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 109, 15, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 110, 16, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 111, 17, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 112, 18, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 9, 12, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 9, 13, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 9, 14, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 9, 15, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 9, 16, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 94, 10, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE Route123_MapBGEvents: @ 852C32C - bg_event 117, 10, 0, 0, 0, Route123_EventScript_1F61B3 - bg_event 47, 3, 0, 8, 0, 82, 0, 0 - bg_event 49, 3, 0, 8, 0, 92, 0, 0 - bg_event 10, 12, 3, 0, 0, Route123_EventScript_1F61AA - bg_event 75, 1, 3, 7, 0, ITEM_SUPER_REPEL, 7, 0 - bg_event 20, 7, 3, 0, 0, Route123_EventScript_1F61BC - bg_event 57, 5, 0, 8, 0, ITEM_SUPER_REPEL, 0, 0 - bg_event 12, 1, 3, 7, 0, ITEM_REVIVE, 41, 0 - bg_event 91, 15, 3, 7, 0, ITEM_HYPER_POTION, 74, 0 - bg_event 139, 15, 3, 7, 0, ITEM_PP_UP, 99, 0 - bg_event 138, 18, 3, 7, 0, ITEM_RARE_CANDY, 110, 0 + bg_event 117, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61B3 + bg_secret_base_event 47, 3, 0, SECRET_BASE_BLUE_CAVE1_2 + bg_secret_base_event 49, 3, 0, SECRET_BASE_BLUE_CAVE2_2 + bg_event 10, 12, 3, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61AA + bg_hidden_item_event 75, 1, 3, ITEM_SUPER_REPEL, 7 + bg_event 20, 7, 3, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61BC + bg_secret_base_event 57, 5, 0, SECRET_BASE_BLUE_CAVE1_3 + bg_hidden_item_event 12, 1, 3, ITEM_REVIVE, 41 + bg_hidden_item_event 91, 15, 3, ITEM_HYPER_POTION, 74 + bg_hidden_item_event 139, 15, 3, ITEM_PP_UP, 99 + bg_hidden_item_event 138, 18, 3, ITEM_RARE_CANDY, 110 Route123_MapEvents:: @ 852C3B0 map_events Route123_EventObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc index 3e4ab27809..30ff07ee91 100644 --- a/data/maps/Route124/events.inc +++ b/data/maps/Route124/events.inc @@ -16,7 +16,7 @@ Route124_MapWarps: @ 852C4E4 warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE Route124_MapBGEvents: @ 852C4EC - bg_event 73, 48, 3, 0, 0, Route124_EventScript_1F657C + bg_event 73, 48, 3, BG_EVENT_PLAYER_FACING_ANY, Route124_EventScript_1F657C Route124_MapEvents:: @ 852C4F8 map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc index 5294f6d713..f76468efee 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc @@ -6,7 +6,7 @@ Route124_DivingTreasureHuntersHouse_MapWarps: @ 853EDB4 warp_def 4, 8, 0, 0, MAP_ROUTE124 Route124_DivingTreasureHuntersHouse_MapBGEvents: @ 853EDC4 - bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270F63 + bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route124_DivingTreasureHuntersHouse_EventScript_270F63 Route124_DivingTreasureHuntersHouse_MapEvents:: @ 853EDD0 map_events Route124_DivingTreasureHuntersHouse_EventObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents diff --git a/data/maps/Route125/events.inc b/data/maps/Route125/events.inc index cb13b81fac..b8ced006c4 100644 --- a/data/maps/Route125/events.inc +++ b/data/maps/Route125/events.inc @@ -14,10 +14,10 @@ Route125_MapWarps: @ 852C5FC warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM Route125_MapBGEvents: @ 852C604 - bg_event 53, 10, 0, 8, 0, ITEM_ULTRA_BALL, 0, 0 - bg_event 55, 11, 0, 8, 0, ITEM_HEAL_POWDER, 0, 0 - bg_event 7, 25, 0, 8, 0, ITEM_RETRO_MAIL, 0, 0 - bg_event 24, 32, 0, 8, 0, ITEM_PINAP_BERRY, 0, 0 + bg_secret_base_event 53, 10, 0, SECRET_BASE_RED_CAVE1_2 + bg_secret_base_event 55, 11, 0, SECRET_BASE_RED_CAVE4_2 + bg_secret_base_event 7, 25, 0, SECRET_BASE_YELLOW_CAVE2_2 + bg_secret_base_event 24, 32, 0, SECRET_BASE_YELLOW_CAVE4_2 Route125_MapEvents:: @ 852C634 map_events Route125_EventObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents diff --git a/data/maps/Route127/events.inc b/data/maps/Route127/events.inc index 8f5fffa719..6a7c07b9bf 100644 --- a/data/maps/Route127/events.inc +++ b/data/maps/Route127/events.inc @@ -12,11 +12,11 @@ Route127_EventObjects: @ 852C734 object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29104C, 1155 Route127_MapBGEvents: @ 852C83C - bg_event 59, 67, 0, 8, 0, ITEM_ENERGY_ROOT, 0, 0 - bg_event 59, 72, 0, 8, 0, ITEM_SITRUS_BERRY, 0, 0 - bg_event 67, 63, 0, 8, 0, ITEM_WEPEAR_BERRY, 0, 0 - bg_event 61, 21, 0, 8, 0, ITEM_FIGY_BERRY, 0, 0 - bg_event 45, 24, 0, 8, 0, ITEM_GLITTER_MAIL, 0, 0 + bg_secret_base_event 59, 67, 0, SECRET_BASE_RED_CAVE4_1 + bg_secret_base_event 59, 72, 0, SECRET_BASE_YELLOW_CAVE3_2 + bg_secret_base_event 67, 63, 0, SECRET_BASE_YELLOW_CAVE4_1 + bg_secret_base_event 61, 21, 0, SECRET_BASE_YELLOW_CAVE3_3 + bg_secret_base_event 45, 24, 0, SECRET_BASE_YELLOW_CAVE1_3 Route127_MapEvents:: @ 852C878 map_events Route127_EventObjects, 0x0, 0x0, Route127_MapBGEvents diff --git a/data/maps/Route128/events.inc b/data/maps/Route128/events.inc index c4b1710faa..02d28acfda 100644 --- a/data/maps/Route128/events.inc +++ b/data/maps/Route128/events.inc @@ -11,9 +11,9 @@ Route128_EventObjects: @ 852C88C object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 101, 22, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 4, Route128_EventScript_1F6DC7, 0 Route128_MapBGEvents: @ 852C97C - bg_event 49, 9, 3, 7, 0, ITEM_HEART_SCALE, 92, 0 - bg_event 57, 21, 3, 7, 0, ITEM_HEART_SCALE, 93, 0 - bg_event 31, 33, 3, 7, 0, ITEM_HEART_SCALE, 94, 0 + bg_hidden_item_event 49, 9, 3, ITEM_HEART_SCALE, 92 + bg_hidden_item_event 57, 21, 3, ITEM_HEART_SCALE, 93 + bg_hidden_item_event 31, 33, 3, ITEM_HEART_SCALE, 94 Route128_MapEvents:: @ 852C9A0 map_events Route128_EventObjects, 0x0, 0x0, Route128_MapBGEvents diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc index 4c70edf340..4471d06e02 100644 --- a/data/maps/RustboroCity/events.inc +++ b/data/maps/RustboroCity/events.inc @@ -31,39 +31,39 @@ RustboroCity_MapWarps: @ 8526960 warp_def 26, 46, 0, 0, MAP_RUSTBORO_CITY_HOUSE3 RustboroCity_MapCoordEvents: @ 85269C0 - coord_event 23, 20, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E095A - coord_event 23, 21, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E0971 - coord_event 23, 22, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E0988 - coord_event 23, 23, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E099F - coord_event 23, 24, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E09B6 - coord_event 30, 9, 3, 0, VAR_0x405A, 2, 0, RustboroCity_EventScript_1E0AFE - coord_event 29, 10, 3, 0, VAR_0x405A, 2, 0, RustboroCity_EventScript_1E0B0A - coord_event 30, 11, 3, 0, VAR_0x405A, 2, 0, RustboroCity_EventScript_1E0B16 - coord_event 30, 12, 3, 0, VAR_0x405A, 2, 0, RustboroCity_EventScript_1E0B22 - coord_event 30, 9, 3, 0, VAR_0x405A, 4, 0, RustboroCity_EventScript_1E0C2B - coord_event 31, 10, 3, 0, VAR_0x405A, 4, 0, RustboroCity_EventScript_1E0C37 - coord_event 30, 11, 3, 0, VAR_0x405A, 4, 0, RustboroCity_EventScript_1E0C43 - coord_event 30, 12, 3, 0, VAR_0x405A, 4, 0, RustboroCity_EventScript_1E0C4F - coord_event 12, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0DF3 - coord_event 13, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0E33 - coord_event 14, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0E73 - coord_event 15, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0EB3 - coord_event 16, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0EF3 - coord_event 17, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0F33 - coord_event 18, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0F73 - coord_event 19, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0FB3 + coord_event 23, 20, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E095A + coord_event 23, 21, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E0971 + coord_event 23, 22, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E0988 + coord_event 23, 23, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E099F + coord_event 23, 24, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E09B6 + coord_event 30, 9, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0AFE + coord_event 29, 10, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0B0A + coord_event 30, 11, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0B16 + coord_event 30, 12, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0B22 + coord_event 30, 9, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C2B + coord_event 31, 10, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C37 + coord_event 30, 11, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C43 + coord_event 30, 12, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C4F + coord_event 12, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0DF3 + coord_event 13, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0E33 + coord_event 14, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0E73 + coord_event 15, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0EB3 + coord_event 16, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0EF3 + coord_event 17, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0F33 + coord_event 18, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0F73 + coord_event 19, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0FB3 RustboroCity_MapBGEvents: @ 8526B10 - bg_event 23, 19, 0, 0, 0, RustboroCity_EventScript_1E08F5 - bg_event 25, 35, 0, 0, 0, RustboroCity_EventScript_1E0910 - bg_event 17, 45, 0, 1, 0, RustboroCity_EventScript_271E6A - bg_event 18, 38, 0, 1, 0, RustboroCity_EventScript_271E73 - bg_event 19, 49, 0, 0, 0, RustboroCity_EventScript_1E0907 - bg_event 18, 45, 0, 1, 0, RustboroCity_EventScript_271E6A - bg_event 17, 38, 0, 1, 0, RustboroCity_EventScript_271E73 - bg_event 17, 20, 0, 0, 0, RustboroCity_EventScript_1E08EC - bg_event 30, 8, 0, 0, 0, RustboroCity_EventScript_1E08E3 - bg_event 12, 38, 3, 0, 0, RustboroCity_EventScript_1E0919 + bg_event 23, 19, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08F5 + bg_event 25, 35, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0910 + bg_event 17, 45, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E6A + bg_event 18, 38, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E73 + bg_event 19, 49, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0907 + bg_event 18, 45, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E6A + bg_event 17, 38, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E73 + bg_event 17, 20, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08EC + bg_event 30, 8, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08E3 + bg_event 12, 38, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0919 RustboroCity_MapEvents:: @ 8526B88 map_events RustboroCity_EventObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents diff --git a/data/maps/RustboroCity_DevonCorp_1F/events.inc b/data/maps/RustboroCity_DevonCorp_1F/events.inc index 260d64a0de..baef1be49d 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/events.inc @@ -9,8 +9,8 @@ RustboroCity_DevonCorp_1F_MapWarps: @ 85303C4 warp_def 14, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_2F RustboroCity_DevonCorp_1F_MapBGEvents: @ 85303DC - bg_event 3, 2, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211312 - bg_event 8, 2, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211309 + bg_event 3, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_1F_EventScript_211312 + bg_event 8, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_1F_EventScript_211309 RustboroCity_DevonCorp_1F_MapEvents:: @ 85303F4 map_events RustboroCity_DevonCorp_1F_EventObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, RustboroCity_DevonCorp_1F_MapBGEvents diff --git a/data/maps/RustboroCity_DevonCorp_3F/events.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc index 0c655b8145..164391cf6d 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/events.inc @@ -7,8 +7,8 @@ RustboroCity_DevonCorp_3F_MapWarps: @ 8530504 warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F RustboroCity_DevonCorp_3F_MapBGEvents: @ 853050C - bg_event 1, 5, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_212600 - bg_event 1, 7, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_212600 + bg_event 1, 5, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_3F_EventScript_212600 + bg_event 1, 7, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_3F_EventScript_212600 RustboroCity_DevonCorp_3F_MapEvents:: @ 8530524 map_events RustboroCity_DevonCorp_3F_EventObjects, RustboroCity_DevonCorp_3F_MapWarps, 0x0, RustboroCity_DevonCorp_3F_MapBGEvents diff --git a/data/maps/RustboroCity_Gym/events.inc b/data/maps/RustboroCity_Gym/events.inc index 8d69717968..0d1f57cdd4 100644 --- a/data/maps/RustboroCity_Gym/events.inc +++ b/data/maps/RustboroCity_Gym/events.inc @@ -10,8 +10,8 @@ RustboroCity_Gym_MapWarps: @ 85305B0 warp_def 6, 19, 0, 0, MAP_RUSTBORO_CITY RustboroCity_Gym_MapBGEvents: @ 85305C0 - bg_event 2, 18, 0, 1, 0, RustboroCity_Gym_EventScript_213047 - bg_event 8, 18, 0, 1, 0, RustboroCity_Gym_EventScript_213057 + bg_event 2, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_Gym_EventScript_213047 + bg_event 8, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_Gym_EventScript_213057 RustboroCity_Gym_MapEvents:: @ 85305D8 map_events RustboroCity_Gym_EventObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents diff --git a/data/maps/RustboroCity_PokemonSchool/events.inc b/data/maps/RustboroCity_PokemonSchool/events.inc index 0fdcca3c8b..84548b44a6 100644 --- a/data/maps/RustboroCity_PokemonSchool/events.inc +++ b/data/maps/RustboroCity_PokemonSchool/events.inc @@ -12,11 +12,11 @@ RustboroCity_PokemonSchool_MapWarps: @ 8530694 warp_def 6, 10, 0, 4, MAP_RUSTBORO_CITY RustboroCity_PokemonSchool_MapBGEvents: @ 85306A4 - bg_event 5, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213EA9 - bg_event 4, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213EA9 - bg_event 6, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213EA9 - bg_event 7, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213EA9 - bg_event 3, 5, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F8C + bg_event 5, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 + bg_event 4, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 + bg_event 6, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 + bg_event 7, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 + bg_event 3, 5, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213F8C RustboroCity_PokemonSchool_MapEvents:: @ 85306E0 map_events RustboroCity_PokemonSchool_EventObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents diff --git a/data/maps/RusturfTunnel/events.inc b/data/maps/RusturfTunnel/events.inc index c56a5b5ee2..d0d56e6fa7 100644 --- a/data/maps/RusturfTunnel/events.inc +++ b/data/maps/RusturfTunnel/events.inc @@ -16,11 +16,11 @@ RusturfTunnel_MapWarps: @ 85342B4 warp_def 18, 20, 3, 2, MAP_ROUTE116 RusturfTunnel_MapCoordEvents: @ 85342CC - coord_event 23, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_22D071 - coord_event 9, 4, 3, 0, VAR_0x409A, 2, 0, RusturfTunnel_EventScript_22D083 - coord_event 9, 5, 3, 0, VAR_0x409A, 2, 0, RusturfTunnel_EventScript_22D083 - coord_event 25, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_22D077 - coord_event 25, 5, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_22D07D + coord_event 23, 4, 3, 0, 0, RusturfTunnel_EventScript_22D071 + coord_event 9, 4, 3, VAR_0x409A, 2, RusturfTunnel_EventScript_22D083 + coord_event 9, 5, 3, VAR_0x409A, 2, RusturfTunnel_EventScript_22D083 + coord_event 25, 4, 3, 0, 0, RusturfTunnel_EventScript_22D077 + coord_event 25, 5, 3, 0, 0, RusturfTunnel_EventScript_22D07D RusturfTunnel_MapEvents:: @ 853431C map_events RusturfTunnel_EventObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0 diff --git a/data/maps/SSTidalCorridor/events.inc b/data/maps/SSTidalCorridor/events.inc index 22827aca37..8494f36e5d 100644 --- a/data/maps/SSTidalCorridor/events.inc +++ b/data/maps/SSTidalCorridor/events.inc @@ -17,18 +17,18 @@ SSTidalCorridor_MapWarps: @ 853A1D0 warp_def 16, 2, 3, 0, MAP_SS_TIDAL_LOWER_DECK SSTidalCorridor_MapBGEvents: @ 853A218 - bg_event 2, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D - bg_event 4, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D - bg_event 6, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D - bg_event 8, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D - bg_event 10, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D - bg_event 12, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D - bg_event 14, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D - bg_event 16, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D - bg_event 5, 9, 0, 1, 0, SSTidalCorridor_EventScript_23C0F5 - bg_event 8, 9, 0, 1, 0, SSTidalCorridor_EventScript_23C0FE - bg_event 11, 9, 0, 1, 0, SSTidalCorridor_EventScript_23C107 - bg_event 14, 9, 0, 1, 0, SSTidalCorridor_EventScript_23C110 + bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D + bg_event 4, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D + bg_event 6, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D + bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D + bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D + bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D + bg_event 14, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D + bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D + bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C0F5 + bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C0FE + bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C107 + bg_event 14, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C110 SSTidalCorridor_MapEvents:: @ 853A2A8 map_events SSTidalCorridor_EventObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents diff --git a/data/maps/SSTidalLowerDeck/events.inc b/data/maps/SSTidalLowerDeck/events.inc index 9722e1df18..be32d9ad49 100644 --- a/data/maps/SSTidalLowerDeck/events.inc +++ b/data/maps/SSTidalLowerDeck/events.inc @@ -6,7 +6,7 @@ SSTidalLowerDeck_MapWarps: @ 853A2EC warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR SSTidalLowerDeck_MapBGEvents: @ 853A2F4 - bg_event 0, 2, 0, 7, 0, ITEM_LEFTOVERS, 35, 0 + bg_hidden_item_event 0, 2, 0, ITEM_LEFTOVERS, 35 SSTidalLowerDeck_MapEvents:: @ 853A300 map_events SSTidalLowerDeck_EventObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents diff --git a/data/maps/SSTidalRooms/events.inc b/data/maps/SSTidalRooms/events.inc index 0e038f0f9c..5ef669f485 100644 --- a/data/maps/SSTidalRooms/events.inc +++ b/data/maps/SSTidalRooms/events.inc @@ -23,8 +23,8 @@ SSTidalRooms_MapWarps: @ 853A3D4 warp_def 31, 1, 0, 7, MAP_SS_TIDAL_CORRIDOR SSTidalRooms_MapBGEvents: @ 853A434 - bg_event 15, 11, 0, 0, 0, SSTidalRooms_EventScript_23CA33 - bg_event 15, 12, 0, 0, 0, SSTidalRooms_EventScript_23CA33 + bg_event 15, 11, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalRooms_EventScript_23CA33 + bg_event 15, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalRooms_EventScript_23CA33 SSTidalRooms_MapEvents:: @ 853A44C map_events SSTidalRooms_EventObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents diff --git a/data/maps/SafariZone_Northeast/events.inc b/data/maps/SafariZone_Northeast/events.inc index 38f59ff13e..a3d1ad0a3a 100644 --- a/data/maps/SafariZone_Northeast/events.inc +++ b/data/maps/SafariZone_Northeast/events.inc @@ -10,8 +10,8 @@ SafariZone_Northeast_EventObjects: @ 853B968 object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2912E3, 1169 SafariZone_Northeast_MapBGEvents: @ 853BA40 - bg_event 31, 35, 3, 7, 0, ITEM_RARE_CANDY, 106, 0 - bg_event 21, 5, 3, 7, 0, ITEM_ZINC, 107, 0 + bg_hidden_item_event 31, 35, 3, ITEM_RARE_CANDY, 106 + bg_hidden_item_event 21, 5, 3, ITEM_ZINC, 107 SafariZone_Northeast_MapEvents:: @ 853BA58 map_events SafariZone_Northeast_EventObjects, 0x0, 0x0, SafariZone_Northeast_MapBGEvents diff --git a/data/maps/SafariZone_Southeast/events.inc b/data/maps/SafariZone_Southeast/events.inc index f7f38f7af4..3ba71ee8e2 100644 --- a/data/maps/SafariZone_Southeast/events.inc +++ b/data/maps/SafariZone_Southeast/events.inc @@ -6,8 +6,8 @@ SafariZone_Southeast_EventObjects: @ 853BA6C object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D399, 747 SafariZone_Southeast_MapBGEvents: @ 853BAE4 - bg_event 19, 36, 3, 7, 0, ITEM_PP_UP, 108, 0 - bg_event 32, 33, 0, 7, 0, ITEM_FULL_RESTORE, 105, 0 + bg_hidden_item_event 19, 36, 3, ITEM_PP_UP, 108 + bg_hidden_item_event 32, 33, 0, ITEM_FULL_RESTORE, 105 SafariZone_Southeast_MapEvents:: @ 853BAFC map_events SafariZone_Southeast_EventObjects, 0x0, 0x0, SafariZone_Southeast_MapBGEvents diff --git a/data/maps/SafariZone_Southwest/events.inc b/data/maps/SafariZone_Southwest/events.inc index 886958342a..468a0013d2 100644 --- a/data/maps/SafariZone_Southwest/events.inc +++ b/data/maps/SafariZone_Southwest/events.inc @@ -6,7 +6,7 @@ SafariZone_Southwest_MapWarps: @ 853B27C warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE SafariZone_Southwest_MapBGEvents: @ 853B284 - bg_event 32, 7, 3, 0, 0, SafariZone_Southwest_EventScript_23D270 + bg_event 32, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SafariZone_Southwest_EventScript_23D270 SafariZone_Southwest_MapEvents:: @ 853B290 map_events SafariZone_Southwest_EventObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents diff --git a/data/maps/SeafloorCavern_Room9/events.inc b/data/maps/SeafloorCavern_Room9/events.inc index 659ca8b03e..2fb2d069b7 100644 --- a/data/maps/SeafloorCavern_Room9/events.inc +++ b/data/maps/SeafloorCavern_Room9/events.inc @@ -11,7 +11,7 @@ SeafloorCavern_Room9_MapWarps: @ 8535CF0 warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 SeafloorCavern_Room9_MapCoordEvents: @ 8535CF8 - coord_event 17, 42, 3, 0, VAR_0x40A2, 0, 0, SeafloorCavern_Room9_EventScript_234DC9 + coord_event 17, 42, 3, VAR_0x40A2, 0, SeafloorCavern_Room9_EventScript_234DC9 SeafloorCavern_Room9_MapEvents:: @ 8535D08 map_events SeafloorCavern_Room9_EventObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0 diff --git a/data/maps/SealedChamber_InnerRoom/events.inc b/data/maps/SealedChamber_InnerRoom/events.inc index dd331570ea..ddd6c15ec9 100644 --- a/data/maps/SealedChamber_InnerRoom/events.inc +++ b/data/maps/SealedChamber_InnerRoom/events.inc @@ -2,15 +2,15 @@ SealedChamber_InnerRoom_MapWarps: @ 8536F00 warp_def 10, 19, 3, 0, MAP_SEALED_CHAMBER_OUTER_ROOM SealedChamber_InnerRoom_MapBGEvents: @ 8536F08 - bg_event 10, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_2391F8 - bg_event 6, 8, 0, 0, 0, SealedChamber_InnerRoom_EventScript_239255 - bg_event 14, 8, 0, 0, 0, SealedChamber_InnerRoom_EventScript_23925F - bg_event 4, 13, 0, 0, 0, SealedChamber_InnerRoom_EventScript_239269 - bg_event 16, 13, 0, 0, 0, SealedChamber_InnerRoom_EventScript_239273 - bg_event 6, 18, 0, 0, 0, SealedChamber_InnerRoom_EventScript_23927D - bg_event 14, 18, 0, 0, 0, SealedChamber_InnerRoom_EventScript_239287 - bg_event 9, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_2391F8 - bg_event 11, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_2391F8 + bg_event 10, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_2391F8 + bg_event 6, 8, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_239255 + bg_event 14, 8, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_23925F + bg_event 4, 13, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_239269 + bg_event 16, 13, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_239273 + bg_event 6, 18, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_23927D + bg_event 14, 18, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_239287 + bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_2391F8 + bg_event 11, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_2391F8 SealedChamber_InnerRoom_MapEvents:: @ 8536F74 map_events 0x0, SealedChamber_InnerRoom_MapWarps, 0x0, SealedChamber_InnerRoom_MapBGEvents diff --git a/data/maps/SealedChamber_OuterRoom/events.inc b/data/maps/SealedChamber_OuterRoom/events.inc index 0181f31937..3cd1b97143 100644 --- a/data/maps/SealedChamber_OuterRoom/events.inc +++ b/data/maps/SealedChamber_OuterRoom/events.inc @@ -2,35 +2,35 @@ SealedChamber_OuterRoom_MapWarps: @ 8536D88 warp_def 10, 2, 3, 0, MAP_SEALED_CHAMBER_INNER_ROOM SealedChamber_OuterRoom_MapBGEvents: @ 8536D90 - bg_event 5, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23916C - bg_event 5, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239176 - bg_event 5, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239180 - bg_event 5, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23918A - bg_event 11, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239194 - bg_event 11, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23919E - bg_event 11, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391A8 - bg_event 11, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391BC - bg_event 16, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391B2 - bg_event 16, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391C6 - bg_event 10, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391D0 - bg_event 6, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23916C - bg_event 4, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23916C - bg_event 4, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239176 - bg_event 6, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239176 - bg_event 4, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239180 - bg_event 6, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239180 - bg_event 4, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23918A - bg_event 6, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23918A - bg_event 10, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239194 - bg_event 12, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239194 - bg_event 10, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23919E - bg_event 12, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23919E - bg_event 10, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391A8 - bg_event 12, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391A8 - bg_event 10, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391BC - bg_event 12, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391BC - bg_event 9, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391ED - bg_event 11, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391ED + bg_event 5, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23916C + bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239176 + bg_event 5, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239180 + bg_event 5, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23918A + bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239194 + bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23919E + bg_event 11, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391A8 + bg_event 11, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391BC + bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391B2 + bg_event 16, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391C6 + bg_event 10, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391D0 + bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23916C + bg_event 4, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23916C + bg_event 4, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239176 + bg_event 6, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239176 + bg_event 4, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239180 + bg_event 6, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239180 + bg_event 4, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23918A + bg_event 6, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23918A + bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239194 + bg_event 12, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239194 + bg_event 10, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23919E + bg_event 12, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23919E + bg_event 10, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391A8 + bg_event 12, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391A8 + bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391BC + bg_event 12, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391BC + bg_event 9, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391ED + bg_event 11, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391ED SealedChamber_OuterRoom_MapEvents:: @ 8536EEC map_events 0x0, SealedChamber_OuterRoom_MapWarps, 0x0, SealedChamber_OuterRoom_MapBGEvents diff --git a/data/maps/ShoalCave_LowTideInnerRoom/events.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc index 5743c8c227..543a7d02b7 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/events.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/events.inc @@ -12,12 +12,12 @@ ShoalCave_LowTideInnerRoom_MapWarps: @ 85362F8 warp_def 40, 33, 5, 3, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM ShoalCave_LowTideInnerRoom_MapBGEvents: @ 8536338 - bg_event 31, 8, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_23708C - bg_event 14, 26, 3, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2370C8 - bg_event 41, 20, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_236FBA - bg_event 41, 10, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_236FF6 - bg_event 6, 9, 3, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_237028 - bg_event 16, 13, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_23705A + bg_event 31, 8, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_23708C + bg_event 14, 26, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_2370C8 + bg_event 41, 20, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_236FBA + bg_event 41, 10, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_236FF6 + bg_event 6, 9, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_237028 + bg_event 16, 13, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_23705A ShoalCave_LowTideInnerRoom_MapEvents:: @ 8536380 map_events ShoalCave_LowTideInnerRoom_EventObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents diff --git a/data/maps/ShoalCave_LowTideLowerRoom/events.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc index 8b0cc9b407..dabb859711 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/events.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/events.inc @@ -9,7 +9,7 @@ ShoalCave_LowTideLowerRoom_MapWarps: @ 853640C warp_def 28, 11, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM ShoalCave_LowTideLowerRoom_MapBGEvents: @ 853642C - bg_event 18, 2, 3, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_237176 + bg_event 18, 2, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideLowerRoom_EventScript_237176 ShoalCave_LowTideLowerRoom_MapEvents:: @ 8536438 map_events ShoalCave_LowTideLowerRoom_EventObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents diff --git a/data/maps/ShoalCave_LowTideStairsRoom/events.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc index b9e6955ae2..b6af468c5a 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/events.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/events.inc @@ -6,7 +6,7 @@ ShoalCave_LowTideStairsRoom_MapWarps: @ 85363AC warp_def 7, 4, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM ShoalCave_LowTideStairsRoom_MapBGEvents: @ 85363BC - bg_event 11, 11, 3, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_23711A + bg_event 11, 11, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideStairsRoom_EventScript_23711A ShoalCave_LowTideStairsRoom_MapEvents:: @ 85363C8 map_events ShoalCave_LowTideStairsRoom_EventObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents diff --git a/data/maps/SingleBattleColosseum/events.inc b/data/maps/SingleBattleColosseum/events.inc index 6971d42175..c0bcde1ba7 100644 --- a/data/maps/SingleBattleColosseum/events.inc +++ b/data/maps/SingleBattleColosseum/events.inc @@ -6,8 +6,8 @@ SingleBattleColosseum_MapWarps: @ 8539D5C warp_def 7, 8, 3, 127, MAP_NONE SingleBattleColosseum_MapCoordEvents: @ 8539D6C - coord_event 3, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277374 - coord_event 10, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827737E + coord_event 3, 5, 3, VAR_TEMP_0, 0, gUnknown_08277374 + coord_event 10, 5, 3, VAR_TEMP_0, 0, gUnknown_0827737E SingleBattleColosseum_MapEvents:: @ 8539D8C map_events SingleBattleColosseum_EventObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/SkyPillar_Top/events.inc b/data/maps/SkyPillar_Top/events.inc index 79973b316d..9271dd4d36 100644 --- a/data/maps/SkyPillar_Top/events.inc +++ b/data/maps/SkyPillar_Top/events.inc @@ -6,7 +6,7 @@ SkyPillar_Top_MapWarps: @ 85371A0 warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F SkyPillar_Top_MapCoordEvents: @ 85371A8 - coord_event 14, 9, 3, 0, VAR_0x40D7, 0, 0, SkyPillar_Top_EventScript_23979A + coord_event 14, 9, 3, VAR_0x40D7, 0, SkyPillar_Top_EventScript_23979A SkyPillar_Top_MapEvents:: @ 85371B8 map_events SkyPillar_Top_EventObjects, SkyPillar_Top_MapWarps, SkyPillar_Top_MapCoordEvents, 0x0 diff --git a/data/maps/SlateportCity/events.inc b/data/maps/SlateportCity/events.inc index 3b72a57f38..8b74573b73 100644 --- a/data/maps/SlateportCity/events.inc +++ b/data/maps/SlateportCity/events.inc @@ -49,22 +49,22 @@ SlateportCity_MapWarps: @ 8526514 warp_def 21, 44, 0, 0, MAP_SLATEPORT_CITY_HOUSE2 SlateportCity_MapCoordEvents: @ 852656C - coord_event 10, 13, 3, 0, VAR_0x40D2, 2, 0, SlateportCity_EventScript_1DD5DC + coord_event 10, 13, 3, VAR_0x40D2, 2, SlateportCity_EventScript_1DD5DC SlateportCity_MapBGEvents: @ 852657C - bg_event 8, 19, 0, 0, 0, SlateportCity_EventScript_1DCFB2 - bg_event 20, 19, 0, 1, 0, SlateportCity_EventScript_271E73 - bg_event 21, 19, 0, 1, 0, SlateportCity_EventScript_271E73 - bg_event 14, 26, 0, 1, 0, SlateportCity_EventScript_271E6A - bg_event 24, 12, 0, 0, 0, SlateportCity_EventScript_1DCF94 - bg_event 15, 26, 0, 1, 0, SlateportCity_EventScript_271E6A - bg_event 14, 51, 0, 0, 0, SlateportCity_EventScript_1DCF8B - bg_event 26, 26, 0, 0, 0, SlateportCity_EventScript_1DCF79 - bg_event 16, 22, 0, 0, 0, SlateportCity_EventScript_1DCF82 - bg_event 8, 26, 0, 0, 0, SlateportCity_EventScript_1DCF70 - bg_event 7, 13, 0, 0, 0, SlateportCity_EventScript_1DCF36 - bg_event 23, 38, 0, 0, 0, SlateportCity_EventScript_1DCF3F - bg_event 10, 36, 0, 1, 0, SlateportCity_EventScript_1DD643 + bg_event 8, 19, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCFB2 + bg_event 20, 19, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E73 + bg_event 21, 19, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E73 + bg_event 14, 26, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E6A + bg_event 24, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF94 + bg_event 15, 26, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E6A + bg_event 14, 51, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF8B + bg_event 26, 26, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF79 + bg_event 16, 22, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF82 + bg_event 8, 26, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF70 + bg_event 7, 13, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF36 + bg_event 23, 38, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF3F + bg_event 10, 36, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_1DD643 SlateportCity_MapEvents:: @ 8526618 map_events SlateportCity_EventObjects, SlateportCity_MapWarps, SlateportCity_MapCoordEvents, SlateportCity_MapBGEvents diff --git a/data/maps/SlateportCity_BattleTentLobby/events.inc b/data/maps/SlateportCity_BattleTentLobby/events.inc index d0875ba784..c5c60ba6d5 100644 --- a/data/maps/SlateportCity_BattleTentLobby/events.inc +++ b/data/maps/SlateportCity_BattleTentLobby/events.inc @@ -10,7 +10,7 @@ SlateportCity_BattleTentLobby_MapWarps: @ 852F480 warp_def 7, 9, 0, 3, MAP_SLATEPORT_CITY SlateportCity_BattleTentLobby_MapBGEvents: @ 852F490 - bg_event 4, 5, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A99 + bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_BattleTentLobby_EventScript_208A99 SlateportCity_BattleTentLobby_MapEvents:: @ 852F49C map_events SlateportCity_BattleTentLobby_EventObjects, SlateportCity_BattleTentLobby_MapWarps, 0x0, SlateportCity_BattleTentLobby_MapBGEvents diff --git a/data/maps/SlateportCity_Harbor/events.inc b/data/maps/SlateportCity_Harbor/events.inc index 5f6e2617f0..ba5f25d985 100644 --- a/data/maps/SlateportCity_Harbor/events.inc +++ b/data/maps/SlateportCity_Harbor/events.inc @@ -15,10 +15,10 @@ SlateportCity_Harbor_MapWarps: @ 852FB28 warp_def 20, 15, 0, 9, MAP_SLATEPORT_CITY SlateportCity_Harbor_MapCoordEvents: @ 852FB48 - coord_event 8, 11, 3, 0, VAR_0x40A0, 1, 0, SlateportCity_Harbor_EventScript_20C9BB - coord_event 8, 12, 3, 0, VAR_0x40A0, 1, 0, SlateportCity_Harbor_EventScript_20C9C7 - coord_event 8, 13, 3, 0, VAR_0x40A0, 1, 0, SlateportCity_Harbor_EventScript_20C9D3 - coord_event 8, 14, 3, 0, VAR_0x40A0, 1, 0, SlateportCity_Harbor_EventScript_20C9DF + coord_event 8, 11, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9BB + coord_event 8, 12, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9C7 + coord_event 8, 13, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9D3 + coord_event 8, 14, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9DF SlateportCity_Harbor_MapEvents:: @ 852FB88 map_events SlateportCity_Harbor_EventObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc index aca75a698b..256b2ee1c3 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc @@ -20,23 +20,23 @@ SlateportCity_OceanicMuseum_1F_MapWarps: @ 852F7C0 warp_def 6, 1, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F SlateportCity_OceanicMuseum_1F_MapCoordEvents: @ 852F7D8 - coord_event 9, 7, 3, 0, VAR_0x40AA, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD9F - coord_event 10, 7, 3, 0, VAR_0x40AA, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20ADB0 + coord_event 9, 7, 3, VAR_0x40AA, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD9F + coord_event 10, 7, 3, VAR_0x40AA, 0, SlateportCity_OceanicMuseum_1F_EventScript_20ADB0 SlateportCity_OceanicMuseum_1F_MapBGEvents: @ 852F7F8 - bg_event 2, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE83 - bg_event 2, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE8C - bg_event 9, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE95 - bg_event 12, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE9E - bg_event 10, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE95 - bg_event 13, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE9E - bg_event 15, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEA7 - bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEB0 - bg_event 18, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEB9 - bg_event 2, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEC2 - bg_event 3, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEC2 - bg_event 16, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AECB - bg_event 17, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AECB + bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE83 + bg_event 2, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE8C + bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE95 + bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE9E + bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE95 + bg_event 13, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE9E + bg_event 15, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEA7 + bg_event 18, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEB0 + bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEB9 + bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEC2 + bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEC2 + bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AECB + bg_event 17, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AECB SlateportCity_OceanicMuseum_1F_MapEvents:: @ 852F894 map_events SlateportCity_OceanicMuseum_1F_EventObjects, SlateportCity_OceanicMuseum_1F_MapWarps, SlateportCity_OceanicMuseum_1F_MapCoordEvents, SlateportCity_OceanicMuseum_1F_MapBGEvents diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc index 9c695f745f..7b407d5d24 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc @@ -11,27 +11,27 @@ SlateportCity_OceanicMuseum_2F_MapWarps: @ 852F950 warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F SlateportCity_OceanicMuseum_2F_MapBGEvents: @ 852F958 - bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD0A - bg_event 18, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD13 - bg_event 4, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD52 - bg_event 4, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD52 - bg_event 3, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD49 - bg_event 2, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD49 - bg_event 3, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD49 - bg_event 3, 6, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 - bg_event 4, 6, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 - bg_event 13, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD5B - bg_event 14, 7, 3, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD5B - bg_event 18, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD37 - bg_event 19, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD37 - bg_event 15, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD2E - bg_event 16, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD2E - bg_event 8, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD25 - bg_event 9, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD25 - bg_event 12, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD1C - bg_event 13, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD1C - bg_event 3, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 - bg_event 4, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 + bg_event 18, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD0A + bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD13 + bg_event 4, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD52 + bg_event 4, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD52 + bg_event 3, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD49 + bg_event 2, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD49 + bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD49 + bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 + bg_event 4, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 + bg_event 13, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD5B + bg_event 14, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD5B + bg_event 18, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD37 + bg_event 19, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD37 + bg_event 15, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD2E + bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD2E + bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD25 + bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD25 + bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD1C + bg_event 13, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD1C + bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 + bg_event 4, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 SlateportCity_OceanicMuseum_2F_MapEvents:: @ 852FA54 map_events SlateportCity_OceanicMuseum_2F_EventObjects, SlateportCity_OceanicMuseum_2F_MapWarps, 0x0, SlateportCity_OceanicMuseum_2F_MapBGEvents diff --git a/data/maps/SootopolisCity/events.inc b/data/maps/SootopolisCity/events.inc index b7d481ac30..7361ccc219 100644 --- a/data/maps/SootopolisCity/events.inc +++ b/data/maps/SootopolisCity/events.inc @@ -34,12 +34,12 @@ SootopolisCity_MapWarps: @ 85274C4 warp_def 51, 36, 0, 0, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F SootopolisCity_MapBGEvents: @ 852752C - bg_event 33, 34, 3, 0, 0, SootopolisCity_EventScript_1E614B - bg_event 19, 29, 0, 1, 0, SootopolisCity_EventScript_271E6A - bg_event 44, 31, 0, 1, 0, SootopolisCity_EventScript_271E73 - bg_event 45, 31, 0, 1, 0, SootopolisCity_EventScript_271E73 - bg_event 18, 29, 0, 1, 0, SootopolisCity_EventScript_271E6A - bg_event 41, 37, 0, 0, 0, SootopolisCity_EventScript_1E6154 + bg_event 33, 34, 3, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_EventScript_1E614B + bg_event 19, 29, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E6A + bg_event 44, 31, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E73 + bg_event 45, 31, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E73 + bg_event 18, 29, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E6A + bg_event 41, 37, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_EventScript_1E6154 SootopolisCity_MapEvents:: @ 8527574 map_events SootopolisCity_EventObjects, SootopolisCity_MapWarps, 0x0, SootopolisCity_MapBGEvents diff --git a/data/maps/SootopolisCity_Gym_1F/events.inc b/data/maps/SootopolisCity_Gym_1F/events.inc index ee78e053a9..36d8d7b274 100644 --- a/data/maps/SootopolisCity_Gym_1F/events.inc +++ b/data/maps/SootopolisCity_Gym_1F/events.inc @@ -8,8 +8,8 @@ SootopolisCity_Gym_1F_MapWarps: @ 8533024 warp_def 11, 22, 3, 0, MAP_SOOTOPOLIS_CITY_GYM_B1F SootopolisCity_Gym_1F_MapBGEvents: @ 853303C - bg_event 6, 24, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_22505F - bg_event 10, 24, 0, 1, 0, SootopolisCity_Gym_1F_EventScript_22506F + bg_event 6, 24, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_Gym_1F_EventScript_22505F + bg_event 10, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_Gym_1F_EventScript_22506F SootopolisCity_Gym_1F_MapEvents:: @ 8533054 map_events SootopolisCity_Gym_1F_EventObjects, SootopolisCity_Gym_1F_MapWarps, 0x0, SootopolisCity_Gym_1F_MapBGEvents diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc index 8d05129523..07c18bae5b 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc @@ -7,8 +7,8 @@ SootopolisCity_LotadAndSeedotHouse_MapWarps: @ 853355C warp_def 4, 6, 0, 11, MAP_SOOTOPOLIS_CITY SootopolisCity_LotadAndSeedotHouse_MapBGEvents: @ 853356C - bg_event 5, 1, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22734D - bg_event 2, 1, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22735B + bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_LotadAndSeedotHouse_EventScript_22734D + bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_LotadAndSeedotHouse_EventScript_22735B SootopolisCity_LotadAndSeedotHouse_MapEvents:: @ 8533584 map_events SootopolisCity_LotadAndSeedotHouse_EventObjects, SootopolisCity_LotadAndSeedotHouse_MapWarps, 0x0, SootopolisCity_LotadAndSeedotHouse_MapBGEvents diff --git a/data/maps/SouthernIsland_Exterior/events.inc b/data/maps/SouthernIsland_Exterior/events.inc index d204708db8..14dc7169bc 100644 --- a/data/maps/SouthernIsland_Exterior/events.inc +++ b/data/maps/SouthernIsland_Exterior/events.inc @@ -7,7 +7,7 @@ SouthernIsland_Exterior_MapWarps: @ 853B86C warp_def 15, 5, 3, 1, MAP_SOUTHERN_ISLAND_INTERIOR SouthernIsland_Exterior_MapBGEvents: @ 853B87C - bg_event 16, 7, 3, 0, 0, SouthernIsland_Exterior_EventScript_242A3C + bg_event 16, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SouthernIsland_Exterior_EventScript_242A3C SouthernIsland_Exterior_MapEvents:: @ 853B888 map_events SouthernIsland_Exterior_EventObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents diff --git a/data/maps/SouthernIsland_Interior/events.inc b/data/maps/SouthernIsland_Interior/events.inc index 55bfeb6144..b651346790 100644 --- a/data/maps/SouthernIsland_Interior/events.inc +++ b/data/maps/SouthernIsland_Interior/events.inc @@ -7,7 +7,7 @@ SouthernIsland_Interior_MapWarps: @ 853B8CC warp_def 14, 18, 3, 1, MAP_SOUTHERN_ISLAND_EXTERIOR SouthernIsland_Interior_MapBGEvents: @ 853B8DC - bg_event 13, 11, 3, 1, 0, SouthernIsland_Interior_EventScript_242AC4 + bg_event 13, 11, 3, BG_EVENT_PLAYER_FACING_NORTH, SouthernIsland_Interior_EventScript_242AC4 SouthernIsland_Interior_MapEvents:: @ 853B8E8 map_events SouthernIsland_Interior_EventObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents diff --git a/data/maps/TerraCave_End/events.inc b/data/maps/TerraCave_End/events.inc index b47a004419..aa23659eb5 100644 --- a/data/maps/TerraCave_End/events.inc +++ b/data/maps/TerraCave_End/events.inc @@ -5,7 +5,7 @@ TerraCave_End_MapWarps: @ 8537868 warp_def 5, 4, 3, 1, MAP_TERRA_CAVE_ENTRANCE TerraCave_End_MapCoordEvents: @ 8537870 - coord_event 17, 26, 3, 0, VAR_TEMP_1, 1, 0, TerraCave_End_EventScript_23B0EC + coord_event 17, 26, 3, VAR_TEMP_1, 1, TerraCave_End_EventScript_23B0EC TerraCave_End_MapEvents:: @ 8537880 map_events TerraCave_End_EventObjects, TerraCave_End_MapWarps, TerraCave_End_MapCoordEvents, 0x0 diff --git a/data/maps/TradeCenter/events.inc b/data/maps/TradeCenter/events.inc index a2156ff483..e1f2e2bea3 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 diff --git a/data/maps/TrainerHill_Entrance/events.inc b/data/maps/TrainerHill_Entrance/events.inc index 8cb0b43b96..ae11a879e4 100644 --- a/data/maps/TrainerHill_Entrance/events.inc +++ b/data/maps/TrainerHill_Entrance/events.inc @@ -11,10 +11,10 @@ TrainerHill_Entrance_MapWarps: @ 853D8EC warp_def 9, 1, 3, 0, MAP_TRAINER_HILL_1F TrainerHill_Entrance_MapCoordEvents: @ 853D904 - coord_event 9, 6, 3, 0, VAR_0x40D6, 0, 0, TrainerHill_Entrance_EventScript_268229 + coord_event 9, 6, 3, VAR_0x40D6, 0, TrainerHill_Entrance_EventScript_268229 TrainerHill_Entrance_MapBGEvents: @ 853D914 - bg_event 8, 10, 0, 1, 0, TrainerHill_Entrance_EventScript_268388 + bg_event 8, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, TrainerHill_Entrance_EventScript_268388 TrainerHill_Entrance_MapEvents:: @ 853D920 map_events TrainerHill_Entrance_EventObjects, TrainerHill_Entrance_MapWarps, TrainerHill_Entrance_MapCoordEvents, TrainerHill_Entrance_MapBGEvents diff --git a/data/maps/Underwater1/events.inc b/data/maps/Underwater1/events.inc index 08cf19a4c7..102a5f6e70 100644 --- a/data/maps/Underwater1/events.inc +++ b/data/maps/Underwater1/events.inc @@ -1,11 +1,11 @@ Underwater1_MapBGEvents: @ 852CEB4 - bg_event 42, 51, 0, 7, 0, ITEM_CARBOS, 8, 0 - bg_event 14, 40, 0, 7, 0, ITEM_GREEN_SHARD, 9, 0 - bg_event 66, 34, 3, 7, 0, ITEM_PEARL, 10, 0 - bg_event 64, 54, 3, 7, 0, ITEM_BIG_PEARL, 11, 0 - bg_event 70, 64, 3, 7, 0, ITEM_HEART_SCALE, 13, 0 - bg_event 42, 5, 3, 7, 0, ITEM_CALCIUM, 36, 0 - bg_event 45, 36, 3, 7, 0, ITEM_HEART_SCALE, 38, 0 + bg_hidden_item_event 42, 51, 0, ITEM_CARBOS, 8 + bg_hidden_item_event 14, 40, 0, ITEM_GREEN_SHARD, 9 + bg_hidden_item_event 66, 34, 3, ITEM_PEARL, 10 + bg_hidden_item_event 64, 54, 3, ITEM_BIG_PEARL, 11 + bg_hidden_item_event 70, 64, 3, ITEM_HEART_SCALE, 13 + bg_hidden_item_event 42, 5, 3, ITEM_CALCIUM, 36 + bg_hidden_item_event 45, 36, 3, ITEM_HEART_SCALE, 38 Underwater1_MapEvents:: @ 852CF08 map_events 0x0, 0x0, 0x0, Underwater1_MapBGEvents diff --git a/data/maps/Underwater2/events.inc b/data/maps/Underwater2/events.inc index 416e9fe865..ca98f25acf 100644 --- a/data/maps/Underwater2/events.inc +++ b/data/maps/Underwater2/events.inc @@ -2,14 +2,14 @@ Underwater2_MapWarps: @ 852CF1C warp_def 45, 65, 0, 0, MAP_UNDERWATER_SOOTOPOLIS_CITY Underwater2_MapBGEvents: @ 852CF24 - bg_event 30, 17, 3, 7, 0, ITEM_HEART_SCALE, 14, 0 - bg_event 41, 19, 3, 7, 0, ITEM_ULTRA_BALL, 15, 0 - bg_event 63, 19, 3, 7, 0, ITEM_STARDUST, 16, 0 - bg_event 10, 36, 3, 7, 0, ITEM_PEARL, 17, 0 - bg_event 11, 39, 3, 7, 0, ITEM_IRON, 19, 0 - bg_event 12, 35, 3, 7, 0, ITEM_YELLOW_SHARD, 18, 0 - bg_event 65, 60, 3, 7, 0, ITEM_BIG_PEARL, 20, 0 - bg_event 9, 77, 3, 7, 0, ITEM_BLUE_SHARD, 12, 0 + bg_hidden_item_event 30, 17, 3, ITEM_HEART_SCALE, 14 + bg_hidden_item_event 41, 19, 3, ITEM_ULTRA_BALL, 15 + bg_hidden_item_event 63, 19, 3, ITEM_STARDUST, 16 + bg_hidden_item_event 10, 36, 3, ITEM_PEARL, 17 + bg_hidden_item_event 11, 39, 3, ITEM_IRON, 19 + bg_hidden_item_event 12, 35, 3, ITEM_YELLOW_SHARD, 18 + bg_hidden_item_event 65, 60, 3, ITEM_BIG_PEARL, 20 + bg_hidden_item_event 9, 77, 3, ITEM_BLUE_SHARD, 12 Underwater2_MapEvents:: @ 852CF84 map_events 0x0, Underwater2_MapWarps, 0x0, Underwater2_MapBGEvents diff --git a/data/maps/Underwater3/events.inc b/data/maps/Underwater3/events.inc index ba8ed9508d..0a5dc773de 100644 --- a/data/maps/Underwater3/events.inc +++ b/data/maps/Underwater3/events.inc @@ -3,10 +3,10 @@ Underwater3_MapWarps: @ 852CF98 warp_def 67, 38, 0, 0, MAP_UNDERWATER_MARINE_CAVE Underwater3_MapBGEvents: @ 852CFA8 - bg_event 12, 42, 3, 7, 0, ITEM_STAR_PIECE, 21, 0 - bg_event 50, 36, 3, 7, 0, ITEM_HP_UP, 22, 0 - bg_event 34, 72, 3, 7, 0, ITEM_HEART_SCALE, 23, 0 - bg_event 72, 20, 3, 7, 0, ITEM_RED_SHARD, 24, 0 + bg_hidden_item_event 12, 42, 3, ITEM_STAR_PIECE, 21 + bg_hidden_item_event 50, 36, 3, ITEM_HP_UP, 22 + bg_hidden_item_event 34, 72, 3, ITEM_HEART_SCALE, 23 + bg_hidden_item_event 72, 20, 3, ITEM_RED_SHARD, 24 Underwater3_MapEvents:: @ 852CFD8 map_events 0x0, Underwater3_MapWarps, 0x0, Underwater3_MapBGEvents diff --git a/data/maps/Underwater4/events.inc b/data/maps/Underwater4/events.inc index 5f8b99b644..7799e0ad60 100644 --- a/data/maps/Underwater4/events.inc +++ b/data/maps/Underwater4/events.inc @@ -2,8 +2,8 @@ Underwater4_MapWarps: @ 852CFEC warp_def 38, 26, 3, 0, MAP_UNDERWATER_SEAFLOOR_CAVERN Underwater4_MapBGEvents: @ 852CFF4 - bg_event 38, 19, 3, 7, 0, ITEM_PROTEIN, 25, 0 - bg_event 69, 18, 3, 7, 0, ITEM_PEARL, 26, 0 + bg_hidden_item_event 38, 19, 3, ITEM_PROTEIN, 25 + bg_hidden_item_event 69, 18, 3, ITEM_PEARL, 26 Underwater4_MapEvents:: @ 852D00C map_events 0x0, Underwater4_MapWarps, 0x0, Underwater4_MapBGEvents diff --git a/data/maps/Underwater_SealedChamber/events.inc b/data/maps/Underwater_SealedChamber/events.inc index 350cca5d66..e0bb196429 100644 --- a/data/maps/Underwater_SealedChamber/events.inc +++ b/data/maps/Underwater_SealedChamber/events.inc @@ -2,7 +2,7 @@ Underwater_SealedChamber_MapWarps: @ 8536D60 warp_def 7, 1, 0, 0, MAP_UNDERWATER_ROUTE134 Underwater_SealedChamber_MapBGEvents: @ 8536D68 - bg_event 12, 43, 0, 0, 0, Underwater_SealedChamber_EventScript_2390FC + bg_event 12, 43, 0, BG_EVENT_PLAYER_FACING_ANY, Underwater_SealedChamber_EventScript_2390FC Underwater_SealedChamber_MapEvents:: @ 8536D74 map_events 0x0, Underwater_SealedChamber_MapWarps, 0x0, Underwater_SealedChamber_MapBGEvents diff --git a/data/maps/VerdanturfTown/events.inc b/data/maps/VerdanturfTown/events.inc index 0a871136f0..f87467d195 100644 --- a/data/maps/VerdanturfTown/events.inc +++ b/data/maps/VerdanturfTown/events.inc @@ -14,14 +14,14 @@ VerdanturfTown_MapWarps: @ 8527D3C warp_def 17, 15, 0, 0, MAP_VERDANTURF_TOWN_HOUSE VerdanturfTown_MapBGEvents: @ 8527D74 - bg_event 14, 3, 0, 1, 0, VerdanturfTown_EventScript_271E6A - bg_event 14, 6, 0, 0, 0, VerdanturfTown_EventScript_1EB5D9 - bg_event 17, 3, 0, 1, 0, VerdanturfTown_EventScript_271E73 - bg_event 7, 14, 0, 0, 0, VerdanturfTown_EventScript_1EB5E2 - bg_event 13, 3, 0, 1, 0, VerdanturfTown_EventScript_271E6A - bg_event 18, 3, 0, 1, 0, VerdanturfTown_EventScript_271E73 - bg_event 1, 8, 0, 0, 0, VerdanturfTown_EventScript_1EB5EB - bg_event 7, 3, 0, 0, 0, VerdanturfTown_EventScript_1EB5F4 + bg_event 14, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E6A + bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5D9 + bg_event 17, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E73 + bg_event 7, 14, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5E2 + bg_event 13, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E6A + bg_event 18, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E73 + bg_event 1, 8, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5EB + bg_event 7, 3, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5F4 VerdanturfTown_MapEvents:: @ 8527DD4 map_events VerdanturfTown_EventObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents diff --git a/data/maps/VerdanturfTown_BattleTentLobby/events.inc b/data/maps/VerdanturfTown_BattleTentLobby/events.inc index 4b9b254a89..1c4bafba9b 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/events.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/events.inc @@ -11,7 +11,7 @@ VerdanturfTown_BattleTentLobby_MapWarps: @ 852E6D8 warp_def 7, 9, 0, 0, MAP_VERDANTURF_TOWN VerdanturfTown_BattleTentLobby_MapBGEvents: @ 852E6E8 - bg_event 4, 5, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201B02 + bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_BattleTentLobby_EventScript_201B02 VerdanturfTown_BattleTentLobby_MapEvents:: @ 852E6F4 map_events VerdanturfTown_BattleTentLobby_EventObjects, VerdanturfTown_BattleTentLobby_MapWarps, 0x0, VerdanturfTown_BattleTentLobby_MapBGEvents diff --git a/data/maps/VictoryRoad_1F/events.inc b/data/maps/VictoryRoad_1F/events.inc index 0c94c31a2e..3df6ff6b0e 100644 --- a/data/maps/VictoryRoad_1F/events.inc +++ b/data/maps/VictoryRoad_1F/events.inc @@ -17,11 +17,11 @@ VictoryRoad_1F_MapWarps: @ 8535EDC warp_def 9, 14, 4, 4, MAP_VICTORY_ROAD_B1F VictoryRoad_1F_MapCoordEvents: @ 8535F04 - coord_event 2, 23, 4, 0, VAR_0x40C3, 0, 0, VictoryRoad_1F_EventScript_235DAF - coord_event 3, 23, 4, 0, VAR_0x40C3, 0, 0, VictoryRoad_1F_EventScript_235DC8 + coord_event 2, 23, 4, VAR_0x40C3, 0, VictoryRoad_1F_EventScript_235DAF + coord_event 3, 23, 4, VAR_0x40C3, 0, VictoryRoad_1F_EventScript_235DC8 VictoryRoad_1F_MapBGEvents: @ 8535F24 - bg_event 30, 39, 4, 7, 0, ITEM_ULTRA_BALL, 81, 0 + bg_hidden_item_event 30, 39, 4, ITEM_ULTRA_BALL, 81 VictoryRoad_1F_MapEvents:: @ 8535F30 map_events VictoryRoad_1F_EventObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents diff --git a/data/maps/VictoryRoad_B2F/events.inc b/data/maps/VictoryRoad_B2F/events.inc index ca7719bd7b..bcd5747f74 100644 --- a/data/maps/VictoryRoad_B2F/events.inc +++ b/data/maps/VictoryRoad_B2F/events.inc @@ -14,8 +14,8 @@ VictoryRoad_B2F_MapWarps: @ 8536230 warp_def 5, 26, 3, 6, MAP_VICTORY_ROAD_B1F VictoryRoad_B2F_MapBGEvents: @ 8536250 - bg_event 28, 5, 3, 7, 0, ITEM_ELIXIR, 82, 0 - bg_event 37, 1, 3, 7, 0, ITEM_MAX_REPEL, 83, 0 + bg_hidden_item_event 28, 5, 3, ITEM_ELIXIR, 82 + bg_hidden_item_event 37, 1, 3, ITEM_MAX_REPEL, 83 VictoryRoad_B2F_MapEvents:: @ 8536268 map_events VictoryRoad_B2F_EventObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents diff --git a/include/constants/bg_event_constants.h b/include/constants/bg_event_constants.h new file mode 100755 index 0000000000..a915bc5091 --- /dev/null +++ b/include/constants/bg_event_constants.h @@ -0,0 +1,13 @@ +#ifndef GUARD_CONSTANTS_BG_EVENT_H +#define GUARD_CONSTANTS_BG_EVENT_H + +#define BG_EVENT_PLAYER_FACING_ANY 0 +#define BG_EVENT_PLAYER_FACING_NORTH 1 +#define BG_EVENT_PLAYER_FACING_SOUTH 2 +#define BG_EVENT_PLAYER_FACING_EAST 3 +#define BG_EVENT_PLAYER_FACING_WEST 4 + +#define BG_EVENT_HIDDEN_ITEM 7 +#define BG_EVENT_SECRET_BASE 8 + +#endif // GUARD_CONSTANTS_BG_EVENT_H diff --git a/include/constants/secret_bases.h b/include/constants/secret_bases.h new file mode 100755 index 0000000000..0f51054a83 --- /dev/null +++ b/include/constants/secret_bases.h @@ -0,0 +1,110 @@ +#ifndef GUARD_CONSTANTS_SECRET_BASES_H +#define GUARD_CONSTANTS_SECRET_BASES_H + +// Each secret base location is assigned an identifier value. +// The secret base's map is determined by (id / 10). The ones +// digit is used to differentiate secret bases using the same map. +// Therefore, each secret base map can be used by up to 10 different +// secret bases in the game. These ids are 1-based, but there is no +// apparent reason for that. + +#define SECRET_BASE_RED_CAVE1_1 1 +#define SECRET_BASE_RED_CAVE1_2 2 +#define SECRET_BASE_RED_CAVE1_3 3 + +#define SECRET_BASE_RED_CAVE2_1 11 +#define SECRET_BASE_RED_CAVE2_2 12 +#define SECRET_BASE_RED_CAVE2_3 13 + +#define SECRET_BASE_RED_CAVE3_1 21 +#define SECRET_BASE_RED_CAVE3_2 22 +#define SECRET_BASE_RED_CAVE3_3 23 + +#define SECRET_BASE_RED_CAVE4_1 31 +#define SECRET_BASE_RED_CAVE4_2 32 +#define SECRET_BASE_RED_CAVE4_3 33 + +#define SECRET_BASE_BROWN_CAVE1_1 41 +#define SECRET_BASE_BROWN_CAVE1_2 42 +#define SECRET_BASE_BROWN_CAVE1_3 43 + +#define SECRET_BASE_BROWN_CAVE2_1 51 +#define SECRET_BASE_BROWN_CAVE2_2 52 +#define SECRET_BASE_BROWN_CAVE2_3 53 + +#define SECRET_BASE_BROWN_CAVE3_1 61 +#define SECRET_BASE_BROWN_CAVE3_2 62 +#define SECRET_BASE_BROWN_CAVE3_3 63 + +#define SECRET_BASE_BROWN_CAVE4_1 71 +#define SECRET_BASE_BROWN_CAVE4_2 72 +#define SECRET_BASE_BROWN_CAVE4_3 73 + +#define SECRET_BASE_BLUE_CAVE1_1 81 +#define SECRET_BASE_BLUE_CAVE1_2 82 +#define SECRET_BASE_BLUE_CAVE1_3 83 + +#define SECRET_BASE_BLUE_CAVE2_1 91 +#define SECRET_BASE_BLUE_CAVE2_2 92 +#define SECRET_BASE_BLUE_CAVE2_3 93 + +#define SECRET_BASE_BLUE_CAVE3_1 101 +#define SECRET_BASE_BLUE_CAVE3_2 102 +#define SECRET_BASE_BLUE_CAVE3_3 103 + +#define SECRET_BASE_BLUE_CAVE4_1 111 +#define SECRET_BASE_BLUE_CAVE4_2 112 +#define SECRET_BASE_BLUE_CAVE4_3 113 + +#define SECRET_BASE_YELLOW_CAVE1_1 121 +#define SECRET_BASE_YELLOW_CAVE1_2 122 +#define SECRET_BASE_YELLOW_CAVE1_3 123 + +#define SECRET_BASE_YELLOW_CAVE2_1 131 +#define SECRET_BASE_YELLOW_CAVE2_2 132 +#define SECRET_BASE_YELLOW_CAVE2_3 133 + +#define SECRET_BASE_YELLOW_CAVE3_1 141 +#define SECRET_BASE_YELLOW_CAVE3_2 142 +#define SECRET_BASE_YELLOW_CAVE3_3 143 + +#define SECRET_BASE_YELLOW_CAVE4_1 151 +#define SECRET_BASE_YELLOW_CAVE4_2 152 +#define SECRET_BASE_YELLOW_CAVE4_3 153 + +#define SECRET_BASE_TREE1_1 161 +#define SECRET_BASE_TREE1_2 162 +#define SECRET_BASE_TREE1_3 163 +#define SECRET_BASE_TREE1_4 164 + +#define SECRET_BASE_TREE2_1 171 +#define SECRET_BASE_TREE2_2 172 +#define SECRET_BASE_TREE2_3 173 +#define SECRET_BASE_TREE2_4 174 + +#define SECRET_BASE_TREE3_1 181 +#define SECRET_BASE_TREE3_2 182 +#define SECRET_BASE_TREE3_3 183 + +#define SECRET_BASE_TREE4_1 191 +#define SECRET_BASE_TREE4_2 192 +#define SECRET_BASE_TREE4_3 193 + +#define SECRET_BASE_SHRUB1_1 201 +#define SECRET_BASE_SHRUB1_2 202 +#define SECRET_BASE_SHRUB1_3 203 +#define SECRET_BASE_SHRUB1_4 204 + +#define SECRET_BASE_SHRUB2_1 211 +#define SECRET_BASE_SHRUB2_2 212 +#define SECRET_BASE_SHRUB2_3 213 + +#define SECRET_BASE_SHRUB3_1 221 +#define SECRET_BASE_SHRUB3_2 222 +#define SECRET_BASE_SHRUB3_3 223 + +#define SECRET_BASE_SHRUB4_1 231 +#define SECRET_BASE_SHRUB4_2 232 +#define SECRET_BASE_SHRUB4_3 233 + +#endif // GUARD_CONSTANTS_SECRET_BASES_H diff --git a/src/item_use.c b/src/item_use.c index 6bdfe1c541..9031338dd4 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -5,6 +5,7 @@ #include "berry.h" #include "bike.h" #include "coins.h" +#include "constants/bg_event_constants.h" #include "constants/flags.h" #include "constants/items.h" #include "constants/songs.h" @@ -371,7 +372,7 @@ bool8 ItemfinderCheckForHiddenItems(const struct MapEvents *events, u8 taskId) gTasks[taskId].data[2] = FALSE; for (i = 0; i < events->bgEventCount; i++) { - if (events->bgEvents[i].kind == 7 && !FlagGet(events->bgEvents[i].bgUnion.hiddenItem.hiddenItemId + 0x1F4)) + if (events->bgEvents[i].kind == BG_EVENT_HIDDEN_ITEM && !FlagGet(events->bgEvents[i].bgUnion.hiddenItem.hiddenItemId + 0x1F4)) { distanceX = (u16)events->bgEvents[i].x + 7; newDistanceX = distanceX - x; @@ -398,7 +399,7 @@ bool8 sub_80FD6D4(const struct MapEvents *events, s16 x, s16 y) for (i = 0; i < bgEventCount; i++) { - if (bgEvent[i].kind == 7 && x == (u16)bgEvent[i].x && y == (u16)bgEvent[i].y) // hidden item and coordinates matches x and y passed? + if (bgEvent[i].kind == BG_EVENT_HIDDEN_ITEM && x == (u16)bgEvent[i].x && y == (u16)bgEvent[i].y) // hidden item and coordinates matches x and y passed? { if (!FlagGet(bgEvent[i].bgUnion.hiddenItem.hiddenItemId + 0x1F4)) return TRUE; diff --git a/src/secret_base.c b/src/secret_base.c index 93b82b3cbd..b2fd54eb82 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -1,6 +1,7 @@ // Includes #include "global.h" +#include "constants/bg_event_constants.h" #include "constants/decorations.h" #include "malloc.h" #include "main.h" @@ -335,7 +336,7 @@ void sub_80E8EE0(struct MapEvents const *events) for (bgEventIndex = 0; bgEventIndex < events->bgEventCount; bgEventIndex ++) { - if (events->bgEvents[bgEventIndex].kind == 8) + if (events->bgEvents[bgEventIndex].kind == BG_EVENT_SECRET_BASE) { for (j = 0; j < 20; j ++) { @@ -600,7 +601,7 @@ void sub_80E9608(struct Coords16 *coords, struct MapEvents *events) for (bgEventIdx = 0; bgEventIdx < events->bgEventCount; bgEventIdx ++) { - if (events->bgEvents[bgEventIdx].kind == 8 && coords->x == events->bgEvents[bgEventIdx].x + 7 && coords->y == events->bgEvents[bgEventIdx].y + 7) + if (events->bgEvents[bgEventIdx].kind == BG_EVENT_SECRET_BASE && coords->x == events->bgEvents[bgEventIdx].x + 7 && coords->y == events->bgEvents[bgEventIdx].y + 7) { sCurSecretBaseId = events->bgEvents[bgEventIdx].bgUnion.secretBaseId; break; @@ -780,7 +781,7 @@ void sub_80E9AD0(void) events = gMapHeader.events; for (i = 0; i < events->bgEventCount; i ++) { - if (events->bgEvents[i].kind == 8 && gSaveBlock1Ptr->secretBases[0].secretBaseId == events->bgEvents[i].bgUnion.secretBaseId) + if (events->bgEvents[i].kind == BG_EVENT_SECRET_BASE && gSaveBlock1Ptr->secretBases[0].secretBaseId == events->bgEvents[i].bgUnion.secretBaseId) { tile = MapGridGetMetatileIdAt(events->bgEvents[i].x + 7, events->bgEvents[i].y + 7); for (j = 0; j < 7; j ++) From d5eb94330a9c626aaf72b5e5d44f7aaf1da0d00c Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 12 Jul 2018 21:47:04 -0500 Subject: [PATCH 49/55] Use region map section constants in map headers --- data/maps.s | 1 + data/maps/AbandonedShip_CaptainsOffice/header.inc | 2 +- data/maps/AbandonedShip_Corridors_1F/header.inc | 2 +- data/maps/AbandonedShip_Corridors_B1F/header.inc | 2 +- data/maps/AbandonedShip_Deck/header.inc | 2 +- data/maps/AbandonedShip_HiddenFloorCorridors/header.inc | 2 +- data/maps/AbandonedShip_HiddenFloorRooms/header.inc | 2 +- data/maps/AbandonedShip_Room_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_B1F/header.inc | 2 +- data/maps/AbandonedShip_Underwater1/header.inc | 2 +- data/maps/AbandonedShip_Underwater2/header.inc | 2 +- data/maps/AlteringCave/header.inc | 2 +- data/maps/AncientTomb/header.inc | 2 +- data/maps/AquaHideout_1F/header.inc | 2 +- data/maps/AquaHideout_B1F/header.inc | 2 +- data/maps/AquaHideout_B2F/header.inc | 2 +- data/maps/AquaHideout_UnusedRubyMap1/header.inc | 2 +- data/maps/AquaHideout_UnusedRubyMap2/header.inc | 2 +- data/maps/AquaHideout_UnusedRubyMap3/header.inc | 2 +- data/maps/ArtisanCave_1F/header.inc | 2 +- data/maps/ArtisanCave_B1F/header.inc | 2 +- data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleArenaCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattleArenaLobby/header.inc | 2 +- data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleDomeCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattleDomeLobby/header.inc | 2 +- data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleFactoryLobby/header.inc | 2 +- data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattlePalaceCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattlePalaceLobby/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeLobby/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc | 2 +- .../BattleFrontier_BattlePointExchangeServiceCorner/header.inc | 2 +- data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc | 2 +- data/maps/BattleFrontier_BattlePyramidLobby/header.inc | 2 +- data/maps/BattleFrontier_BattlePyramidTop/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerCorridor2/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerElevator/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerLobby/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_Lounge1/header.inc | 2 +- data/maps/BattleFrontier_Lounge2/header.inc | 2 +- data/maps/BattleFrontier_Lounge3/header.inc | 2 +- data/maps/BattleFrontier_Lounge4/header.inc | 2 +- data/maps/BattleFrontier_Lounge5/header.inc | 2 +- data/maps/BattleFrontier_Lounge6/header.inc | 2 +- data/maps/BattleFrontier_Lounge7/header.inc | 2 +- data/maps/BattleFrontier_Lounge8/header.inc | 2 +- data/maps/BattleFrontier_Lounge9/header.inc | 2 +- data/maps/BattleFrontier_Mart/header.inc | 2 +- data/maps/BattleFrontier_OutsideEast/header.inc | 2 +- data/maps/BattleFrontier_OutsideWest/header.inc | 2 +- data/maps/BattleFrontier_PokemonCenter_1F/header.inc | 2 +- data/maps/BattleFrontier_PokemonCenter_2F/header.inc | 2 +- data/maps/BattleFrontier_RankingHall/header.inc | 2 +- data/maps/BattleFrontier_ReceptionGate/header.inc | 2 +- data/maps/BattleFrontier_ScottsHouse/header.inc | 2 +- data/maps/BattlePyramidSquare01/header.inc | 2 +- data/maps/BattlePyramidSquare02/header.inc | 2 +- data/maps/BattlePyramidSquare03/header.inc | 2 +- data/maps/BattlePyramidSquare04/header.inc | 2 +- data/maps/BattlePyramidSquare05/header.inc | 2 +- data/maps/BattlePyramidSquare06/header.inc | 2 +- data/maps/BattlePyramidSquare07/header.inc | 2 +- data/maps/BattlePyramidSquare08/header.inc | 2 +- data/maps/BattlePyramidSquare09/header.inc | 2 +- data/maps/BattlePyramidSquare10/header.inc | 2 +- data/maps/BattlePyramidSquare11/header.inc | 2 +- data/maps/BattlePyramidSquare12/header.inc | 2 +- data/maps/BattlePyramidSquare13/header.inc | 2 +- data/maps/BattlePyramidSquare14/header.inc | 2 +- data/maps/BattlePyramidSquare15/header.inc | 2 +- data/maps/BattlePyramidSquare16/header.inc | 2 +- data/maps/BirthIsland_Exterior/header.inc | 2 +- data/maps/BirthIsland_Harbor/header.inc | 2 +- data/maps/CaveOfOrigin_1F/header.inc | 2 +- data/maps/CaveOfOrigin_B1F/header.inc | 2 +- data/maps/CaveOfOrigin_Entrance/header.inc | 2 +- data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc | 2 +- data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc | 2 +- data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc | 2 +- data/maps/DesertRuins/header.inc | 2 +- data/maps/DesertUnderpass/header.inc | 2 +- data/maps/DewfordTown/header.inc | 2 +- data/maps/DewfordTown_Gym/header.inc | 2 +- data/maps/DewfordTown_Hall/header.inc | 2 +- data/maps/DewfordTown_House1/header.inc | 2 +- data/maps/DewfordTown_House2/header.inc | 2 +- data/maps/DewfordTown_PokemonCenter_1F/header.inc | 2 +- data/maps/DewfordTown_PokemonCenter_2F/header.inc | 2 +- data/maps/DoubleBattleColosseum/header.inc | 2 +- data/maps/EverGrandeCity/header.inc | 2 +- data/maps/EverGrandeCity_ChampionsRoom/header.inc | 2 +- data/maps/EverGrandeCity_DrakesRoom/header.inc | 2 +- data/maps/EverGrandeCity_GlaciasRoom/header.inc | 2 +- data/maps/EverGrandeCity_Hall1/header.inc | 2 +- data/maps/EverGrandeCity_Hall2/header.inc | 2 +- data/maps/EverGrandeCity_Hall3/header.inc | 2 +- data/maps/EverGrandeCity_Hall4/header.inc | 2 +- data/maps/EverGrandeCity_Hall5/header.inc | 2 +- data/maps/EverGrandeCity_HallOfFame/header.inc | 2 +- data/maps/EverGrandeCity_PhoebesRoom/header.inc | 2 +- data/maps/EverGrandeCity_PokemonCenter_1F/header.inc | 2 +- data/maps/EverGrandeCity_PokemonCenter_2F/header.inc | 2 +- data/maps/EverGrandeCity_PokemonLeague_1F/header.inc | 2 +- data/maps/EverGrandeCity_PokemonLeague_2F/header.inc | 2 +- data/maps/EverGrandeCity_SidneysRoom/header.inc | 2 +- data/maps/FallarborTown/header.inc | 2 +- data/maps/FallarborTown_BattleTentBattleRoom/header.inc | 2 +- data/maps/FallarborTown_BattleTentCorridor/header.inc | 2 +- data/maps/FallarborTown_BattleTentLobby/header.inc | 2 +- data/maps/FallarborTown_House1/header.inc | 2 +- data/maps/FallarborTown_House2/header.inc | 2 +- data/maps/FallarborTown_Mart/header.inc | 2 +- data/maps/FallarborTown_PokemonCenter_1F/header.inc | 2 +- data/maps/FallarborTown_PokemonCenter_2F/header.inc | 2 +- data/maps/FarawayIsland_Entrance/header.inc | 2 +- data/maps/FarawayIsland_Interior/header.inc | 2 +- data/maps/FieryPath/header.inc | 2 +- data/maps/FortreeCity/header.inc | 2 +- data/maps/FortreeCity_DecorationShop/header.inc | 2 +- data/maps/FortreeCity_Gym/header.inc | 2 +- data/maps/FortreeCity_House1/header.inc | 2 +- data/maps/FortreeCity_House2/header.inc | 2 +- data/maps/FortreeCity_House3/header.inc | 2 +- data/maps/FortreeCity_House4/header.inc | 2 +- data/maps/FortreeCity_House5/header.inc | 2 +- data/maps/FortreeCity_Mart/header.inc | 2 +- data/maps/FortreeCity_PokemonCenter_1F/header.inc | 2 +- data/maps/FortreeCity_PokemonCenter_2F/header.inc | 2 +- data/maps/GraniteCave_1F/header.inc | 2 +- data/maps/GraniteCave_B1F/header.inc | 2 +- data/maps/GraniteCave_B2F/header.inc | 2 +- data/maps/GraniteCave_StevensRoom/header.inc | 2 +- data/maps/InsideOfTruck/header.inc | 2 +- data/maps/IslandCave/header.inc | 2 +- data/maps/JaggedPass/header.inc | 2 +- data/maps/LavaridgeTown/header.inc | 2 +- data/maps/LavaridgeTown_Gym_1F/header.inc | 2 +- data/maps/LavaridgeTown_Gym_B1F/header.inc | 2 +- data/maps/LavaridgeTown_HerbShop/header.inc | 2 +- data/maps/LavaridgeTown_House/header.inc | 2 +- data/maps/LavaridgeTown_Mart/header.inc | 2 +- data/maps/LavaridgeTown_PokemonCenter_1F/header.inc | 2 +- data/maps/LavaridgeTown_PokemonCenter_2F/header.inc | 2 +- data/maps/LilycoveCity/header.inc | 2 +- data/maps/LilycoveCity_ContestHall/header.inc | 2 +- data/maps/LilycoveCity_ContestLobby/header.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStoreElevator/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_1F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_2F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_3F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_4F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_5F/header.inc | 2 +- data/maps/LilycoveCity_Harbor/header.inc | 2 +- data/maps/LilycoveCity_House1/header.inc | 2 +- data/maps/LilycoveCity_House2/header.inc | 2 +- data/maps/LilycoveCity_House3/header.inc | 2 +- data/maps/LilycoveCity_House4/header.inc | 2 +- data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc | 2 +- data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc | 2 +- data/maps/LilycoveCity_MoveDeletersHouse/header.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_1F/header.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_2F/header.inc | 2 +- data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc | 2 +- data/maps/LilycoveCity_UnusedMart/header.inc | 2 +- data/maps/LinkContestRoom1/header.inc | 2 +- data/maps/LinkContestRoom2/header.inc | 2 +- data/maps/LinkContestRoom3/header.inc | 2 +- data/maps/LinkContestRoom4/header.inc | 2 +- data/maps/LinkContestRoom5/header.inc | 2 +- data/maps/LinkContestRoom6/header.inc | 2 +- data/maps/LittlerootTown/header.inc | 2 +- data/maps/LittlerootTown_BrendansHouse_1F/header.inc | 2 +- data/maps/LittlerootTown_BrendansHouse_2F/header.inc | 2 +- data/maps/LittlerootTown_MaysHouse_1F/header.inc | 2 +- data/maps/LittlerootTown_MaysHouse_2F/header.inc | 2 +- data/maps/LittlerootTown_ProfessorBirchsLab/header.inc | 2 +- data/maps/MagmaHideout_1F/header.inc | 2 +- data/maps/MagmaHideout_2F_1R/header.inc | 2 +- data/maps/MagmaHideout_2F_2R/header.inc | 2 +- data/maps/MagmaHideout_2F_3R/header.inc | 2 +- data/maps/MagmaHideout_3F_1R/header.inc | 2 +- data/maps/MagmaHideout_3F_2R/header.inc | 2 +- data/maps/MagmaHideout_3F_3R/header.inc | 2 +- data/maps/MagmaHideout_4F/header.inc | 2 +- data/maps/MarineCave_End/header.inc | 2 +- data/maps/MarineCave_Entrance/header.inc | 2 +- data/maps/MauvilleCity/header.inc | 2 +- data/maps/MauvilleCity_BikeShop/header.inc | 2 +- data/maps/MauvilleCity_GameCorner/header.inc | 2 +- data/maps/MauvilleCity_Gym/header.inc | 2 +- data/maps/MauvilleCity_House1/header.inc | 2 +- data/maps/MauvilleCity_House2/header.inc | 2 +- data/maps/MauvilleCity_Mart/header.inc | 2 +- data/maps/MauvilleCity_PokemonCenter_1F/header.inc | 2 +- data/maps/MauvilleCity_PokemonCenter_2F/header.inc | 2 +- data/maps/MeteorFalls_1F_1R/header.inc | 2 +- data/maps/MeteorFalls_1F_2R/header.inc | 2 +- data/maps/MeteorFalls_B1F_1R/header.inc | 2 +- data/maps/MeteorFalls_B1F_2R/header.inc | 2 +- data/maps/MeteorFalls_StevensCave/header.inc | 2 +- data/maps/MirageTower_1F/header.inc | 2 +- data/maps/MirageTower_2F/header.inc | 2 +- data/maps/MirageTower_3F/header.inc | 2 +- data/maps/MirageTower_4F/header.inc | 2 +- data/maps/MossdeepCity/header.inc | 2 +- data/maps/MossdeepCity_GameCorner_1F/header.inc | 2 +- data/maps/MossdeepCity_GameCorner_B1F/header.inc | 2 +- data/maps/MossdeepCity_Gym/header.inc | 2 +- data/maps/MossdeepCity_House1/header.inc | 2 +- data/maps/MossdeepCity_House2/header.inc | 2 +- data/maps/MossdeepCity_House3/header.inc | 2 +- data/maps/MossdeepCity_House4/header.inc | 2 +- data/maps/MossdeepCity_Mart/header.inc | 2 +- data/maps/MossdeepCity_PokemonCenter_1F/header.inc | 2 +- data/maps/MossdeepCity_PokemonCenter_2F/header.inc | 2 +- data/maps/MossdeepCity_SpaceCenter_1F/header.inc | 2 +- data/maps/MossdeepCity_SpaceCenter_2F/header.inc | 2 +- data/maps/MossdeepCity_StevensHouse/header.inc | 2 +- data/maps/MtChimney/header.inc | 2 +- data/maps/MtChimney_CableCarStation/header.inc | 2 +- data/maps/MtPyre_1F/header.inc | 2 +- data/maps/MtPyre_2F/header.inc | 2 +- data/maps/MtPyre_3F/header.inc | 2 +- data/maps/MtPyre_4F/header.inc | 2 +- data/maps/MtPyre_5F/header.inc | 2 +- data/maps/MtPyre_6F/header.inc | 2 +- data/maps/MtPyre_Exterior/header.inc | 2 +- data/maps/MtPyre_Summit/header.inc | 2 +- data/maps/NavelRock_B1F/header.inc | 2 +- data/maps/NavelRock_Bottom/header.inc | 2 +- data/maps/NavelRock_Down01/header.inc | 2 +- data/maps/NavelRock_Down02/header.inc | 2 +- data/maps/NavelRock_Down03/header.inc | 2 +- data/maps/NavelRock_Down04/header.inc | 2 +- data/maps/NavelRock_Down05/header.inc | 2 +- data/maps/NavelRock_Down06/header.inc | 2 +- data/maps/NavelRock_Down07/header.inc | 2 +- data/maps/NavelRock_Down08/header.inc | 2 +- data/maps/NavelRock_Down09/header.inc | 2 +- data/maps/NavelRock_Down10/header.inc | 2 +- data/maps/NavelRock_Down11/header.inc | 2 +- data/maps/NavelRock_Entrance/header.inc | 2 +- data/maps/NavelRock_Exterior/header.inc | 2 +- data/maps/NavelRock_Fork/header.inc | 2 +- data/maps/NavelRock_Harbor/header.inc | 2 +- data/maps/NavelRock_Top/header.inc | 2 +- data/maps/NavelRock_Up1/header.inc | 2 +- data/maps/NavelRock_Up2/header.inc | 2 +- data/maps/NavelRock_Up3/header.inc | 2 +- data/maps/NavelRock_Up4/header.inc | 2 +- data/maps/NewMauville_Entrance/header.inc | 2 +- data/maps/NewMauville_Inside/header.inc | 2 +- data/maps/OldaleTown/header.inc | 2 +- data/maps/OldaleTown_House1/header.inc | 2 +- data/maps/OldaleTown_House2/header.inc | 2 +- data/maps/OldaleTown_Mart/header.inc | 2 +- data/maps/OldaleTown_PokemonCenter_1F/header.inc | 2 +- data/maps/OldaleTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PacifidlogTown/header.inc | 2 +- data/maps/PacifidlogTown_House1/header.inc | 2 +- data/maps/PacifidlogTown_House2/header.inc | 2 +- data/maps/PacifidlogTown_House3/header.inc | 2 +- data/maps/PacifidlogTown_House4/header.inc | 2 +- data/maps/PacifidlogTown_House5/header.inc | 2 +- data/maps/PacifidlogTown_PokemonCenter_1F/header.inc | 2 +- data/maps/PacifidlogTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PetalburgCity/header.inc | 2 +- data/maps/PetalburgCity_Gym/header.inc | 2 +- data/maps/PetalburgCity_House1/header.inc | 2 +- data/maps/PetalburgCity_House2/header.inc | 2 +- data/maps/PetalburgCity_Mart/header.inc | 2 +- data/maps/PetalburgCity_PokemonCenter_1F/header.inc | 2 +- data/maps/PetalburgCity_PokemonCenter_2F/header.inc | 2 +- data/maps/PetalburgCity_WallysHouse/header.inc | 2 +- data/maps/PetalburgWoods/header.inc | 2 +- data/maps/RecordCorner/header.inc | 2 +- data/maps/Route101/header.inc | 2 +- data/maps/Route102/header.inc | 2 +- data/maps/Route103/header.inc | 2 +- data/maps/Route104/header.inc | 2 +- data/maps/Route104_MrBrineysHouse/header.inc | 2 +- data/maps/Route104_PrettyPetalFlowerShop/header.inc | 2 +- data/maps/Route104_Prototype/header.inc | 2 +- data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc | 2 +- data/maps/Route105/header.inc | 2 +- data/maps/Route106/header.inc | 2 +- data/maps/Route107/header.inc | 2 +- data/maps/Route108/header.inc | 2 +- data/maps/Route109/header.inc | 2 +- data/maps/Route109_SeashoreHouse/header.inc | 2 +- data/maps/Route110/header.inc | 2 +- data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc | 2 +- data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc | 2 +- data/maps/Route110_TrickHouseCorridor/header.inc | 2 +- data/maps/Route110_TrickHouseEnd/header.inc | 2 +- data/maps/Route110_TrickHouseEntrance/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle1/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle2/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle3/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle4/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle5/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle6/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle7/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle8/header.inc | 2 +- data/maps/Route111/header.inc | 2 +- data/maps/Route111_OldLadysRestStop/header.inc | 2 +- data/maps/Route111_WinstrateFamilysHouse/header.inc | 2 +- data/maps/Route112/header.inc | 2 +- data/maps/Route112_CableCarStation/header.inc | 2 +- data/maps/Route113/header.inc | 2 +- data/maps/Route113_GlassWorkshop/header.inc | 2 +- data/maps/Route114/header.inc | 2 +- data/maps/Route114_FossilManiacsHouse/header.inc | 2 +- data/maps/Route114_FossilManiacsTunnel/header.inc | 2 +- data/maps/Route114_LanettesHouse/header.inc | 2 +- data/maps/Route115/header.inc | 2 +- data/maps/Route116/header.inc | 2 +- data/maps/Route116_TunnelersRestHouse/header.inc | 2 +- data/maps/Route117/header.inc | 2 +- data/maps/Route117_PokemonDayCare/header.inc | 2 +- data/maps/Route118/header.inc | 2 +- data/maps/Route119/header.inc | 2 +- data/maps/Route119_House/header.inc | 2 +- data/maps/Route119_WeatherInstitute_1F/header.inc | 2 +- data/maps/Route119_WeatherInstitute_2F/header.inc | 2 +- data/maps/Route120/header.inc | 2 +- data/maps/Route121/header.inc | 2 +- data/maps/Route121_SafariZoneEntrance/header.inc | 2 +- data/maps/Route122/header.inc | 2 +- data/maps/Route123/header.inc | 2 +- data/maps/Route123_BerryMastersHouse/header.inc | 2 +- data/maps/Route124/header.inc | 2 +- data/maps/Route124_DivingTreasureHuntersHouse/header.inc | 2 +- data/maps/Route125/header.inc | 2 +- data/maps/Route126/header.inc | 2 +- data/maps/Route127/header.inc | 2 +- data/maps/Route128/header.inc | 2 +- data/maps/Route129/header.inc | 2 +- data/maps/Route130/header.inc | 2 +- data/maps/Route131/header.inc | 2 +- data/maps/Route132/header.inc | 2 +- data/maps/Route133/header.inc | 2 +- data/maps/Route134/header.inc | 2 +- data/maps/RustboroCity/header.inc | 2 +- data/maps/RustboroCity_CuttersHouse/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_1F/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_2F/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_3F/header.inc | 2 +- data/maps/RustboroCity_Flat1_1F/header.inc | 2 +- data/maps/RustboroCity_Flat1_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_1F/header.inc | 2 +- data/maps/RustboroCity_Flat2_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_3F/header.inc | 2 +- data/maps/RustboroCity_Gym/header.inc | 2 +- data/maps/RustboroCity_House1/header.inc | 2 +- data/maps/RustboroCity_House2/header.inc | 2 +- data/maps/RustboroCity_House3/header.inc | 2 +- data/maps/RustboroCity_Mart/header.inc | 2 +- data/maps/RustboroCity_PokemonCenter_1F/header.inc | 2 +- data/maps/RustboroCity_PokemonCenter_2F/header.inc | 2 +- data/maps/RustboroCity_PokemonSchool/header.inc | 2 +- data/maps/RusturfTunnel/header.inc | 2 +- data/maps/SSTidalCorridor/header.inc | 2 +- data/maps/SSTidalLowerDeck/header.inc | 2 +- data/maps/SSTidalRooms/header.inc | 2 +- data/maps/SafariZone_North/header.inc | 2 +- data/maps/SafariZone_Northeast/header.inc | 2 +- data/maps/SafariZone_Northwest/header.inc | 2 +- data/maps/SafariZone_RestHouse/header.inc | 2 +- data/maps/SafariZone_South/header.inc | 2 +- data/maps/SafariZone_Southeast/header.inc | 2 +- data/maps/SafariZone_Southwest/header.inc | 2 +- data/maps/ScorchedSlab/header.inc | 2 +- data/maps/SeafloorCavern_Entrance/header.inc | 2 +- data/maps/SeafloorCavern_Room1/header.inc | 2 +- data/maps/SeafloorCavern_Room2/header.inc | 2 +- data/maps/SeafloorCavern_Room3/header.inc | 2 +- data/maps/SeafloorCavern_Room4/header.inc | 2 +- data/maps/SeafloorCavern_Room5/header.inc | 2 +- data/maps/SeafloorCavern_Room6/header.inc | 2 +- data/maps/SeafloorCavern_Room7/header.inc | 2 +- data/maps/SeafloorCavern_Room8/header.inc | 2 +- data/maps/SeafloorCavern_Room9/header.inc | 2 +- data/maps/SealedChamber_InnerRoom/header.inc | 2 +- data/maps/SealedChamber_OuterRoom/header.inc | 2 +- data/maps/SecretBase_BlueCave1/header.inc | 2 +- data/maps/SecretBase_BlueCave2/header.inc | 2 +- data/maps/SecretBase_BlueCave3/header.inc | 2 +- data/maps/SecretBase_BlueCave4/header.inc | 2 +- data/maps/SecretBase_BrownCave1/header.inc | 2 +- data/maps/SecretBase_BrownCave2/header.inc | 2 +- data/maps/SecretBase_BrownCave3/header.inc | 2 +- data/maps/SecretBase_BrownCave4/header.inc | 2 +- data/maps/SecretBase_RedCave1/header.inc | 2 +- data/maps/SecretBase_RedCave2/header.inc | 2 +- data/maps/SecretBase_RedCave3/header.inc | 2 +- data/maps/SecretBase_RedCave4/header.inc | 2 +- data/maps/SecretBase_Shrub1/header.inc | 2 +- data/maps/SecretBase_Shrub2/header.inc | 2 +- data/maps/SecretBase_Shrub3/header.inc | 2 +- data/maps/SecretBase_Shrub4/header.inc | 2 +- data/maps/SecretBase_Tree1/header.inc | 2 +- data/maps/SecretBase_Tree2/header.inc | 2 +- data/maps/SecretBase_Tree3/header.inc | 2 +- data/maps/SecretBase_Tree4/header.inc | 2 +- data/maps/SecretBase_YellowCave1/header.inc | 2 +- data/maps/SecretBase_YellowCave2/header.inc | 2 +- data/maps/SecretBase_YellowCave3/header.inc | 2 +- data/maps/SecretBase_YellowCave4/header.inc | 2 +- data/maps/ShoalCave_HighTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_HighTideInnerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideIceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideInnerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideLowerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideStairsRoom/header.inc | 2 +- data/maps/SingleBattleColosseum/header.inc | 2 +- data/maps/SkyPillar_1F/header.inc | 2 +- data/maps/SkyPillar_2F/header.inc | 2 +- data/maps/SkyPillar_3F/header.inc | 2 +- data/maps/SkyPillar_4F/header.inc | 2 +- data/maps/SkyPillar_5F/header.inc | 2 +- data/maps/SkyPillar_Entrance/header.inc | 2 +- data/maps/SkyPillar_Outside/header.inc | 2 +- data/maps/SkyPillar_Top/header.inc | 2 +- data/maps/SlateportCity/header.inc | 2 +- data/maps/SlateportCity_BattleTentBattleRoom/header.inc | 2 +- data/maps/SlateportCity_BattleTentCorridor/header.inc | 2 +- data/maps/SlateportCity_BattleTentLobby/header.inc | 2 +- data/maps/SlateportCity_Harbor/header.inc | 2 +- data/maps/SlateportCity_House1/header.inc | 2 +- data/maps/SlateportCity_House2/header.inc | 2 +- data/maps/SlateportCity_Mart/header.inc | 2 +- data/maps/SlateportCity_OceanicMuseum_1F/header.inc | 2 +- data/maps/SlateportCity_OceanicMuseum_2F/header.inc | 2 +- data/maps/SlateportCity_PokemonCenter_1F/header.inc | 2 +- data/maps/SlateportCity_PokemonCenter_2F/header.inc | 2 +- data/maps/SlateportCity_PokemonFanClub/header.inc | 2 +- data/maps/SlateportCity_SternsShipyard_1F/header.inc | 2 +- data/maps/SlateportCity_SternsShipyard_2F/header.inc | 2 +- data/maps/SootopolisCity/header.inc | 2 +- data/maps/SootopolisCity_Gym_1F/header.inc | 2 +- data/maps/SootopolisCity_Gym_B1F/header.inc | 2 +- data/maps/SootopolisCity_House1/header.inc | 2 +- data/maps/SootopolisCity_House2/header.inc | 2 +- data/maps/SootopolisCity_House3/header.inc | 2 +- data/maps/SootopolisCity_House4/header.inc | 2 +- data/maps/SootopolisCity_House5/header.inc | 2 +- data/maps/SootopolisCity_House6/header.inc | 2 +- data/maps/SootopolisCity_House7/header.inc | 2 +- data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc | 2 +- data/maps/SootopolisCity_Mart/header.inc | 2 +- data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc | 2 +- data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc | 2 +- data/maps/SootopolisCity_PokemonCenter_1F/header.inc | 2 +- data/maps/SootopolisCity_PokemonCenter_2F/header.inc | 2 +- data/maps/SouthernIsland_Exterior/header.inc | 2 +- data/maps/SouthernIsland_Interior/header.inc | 2 +- data/maps/TerraCave_End/header.inc | 2 +- data/maps/TerraCave_Entrance/header.inc | 2 +- data/maps/TradeCenter/header.inc | 2 +- data/maps/TrainerHill_1F/header.inc | 2 +- data/maps/TrainerHill_2F/header.inc | 2 +- data/maps/TrainerHill_3F/header.inc | 2 +- data/maps/TrainerHill_4F/header.inc | 2 +- data/maps/TrainerHill_Elevator/header.inc | 2 +- data/maps/TrainerHill_Entrance/header.inc | 2 +- data/maps/TrainerHill_Roof/header.inc | 2 +- data/maps/Underwater1/header.inc | 2 +- data/maps/Underwater2/header.inc | 2 +- data/maps/Underwater3/header.inc | 2 +- data/maps/Underwater4/header.inc | 2 +- data/maps/Underwater5/header.inc | 2 +- data/maps/Underwater6/header.inc | 2 +- data/maps/Underwater7/header.inc | 2 +- data/maps/Underwater_MarineCave/header.inc | 2 +- data/maps/Underwater_Route134/header.inc | 2 +- data/maps/Underwater_SeafloorCavern/header.inc | 2 +- data/maps/Underwater_SealedChamber/header.inc | 2 +- data/maps/Underwater_SootopolisCity/header.inc | 2 +- data/maps/UnionRoom/header.inc | 2 +- data/maps/UnknownMap_25_29/header.inc | 2 +- data/maps/UnknownMap_25_30/header.inc | 2 +- data/maps/UnknownMap_25_31/header.inc | 2 +- data/maps/UnknownMap_25_32/header.inc | 2 +- data/maps/UnknownMap_25_33/header.inc | 2 +- data/maps/UnknownMap_25_34/header.inc | 2 +- data/maps/VerdanturfTown/header.inc | 2 +- data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc | 2 +- data/maps/VerdanturfTown_BattleTentCorridor/header.inc | 2 +- data/maps/VerdanturfTown_BattleTentLobby/header.inc | 2 +- data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc | 2 +- data/maps/VerdanturfTown_House/header.inc | 2 +- data/maps/VerdanturfTown_Mart/header.inc | 2 +- data/maps/VerdanturfTown_PokemonCenter_1F/header.inc | 2 +- data/maps/VerdanturfTown_PokemonCenter_2F/header.inc | 2 +- data/maps/VerdanturfTown_WandasHouse/header.inc | 2 +- data/maps/VictoryRoad_1F/header.inc | 2 +- data/maps/VictoryRoad_B1F/header.inc | 2 +- data/maps/VictoryRoad_B2F/header.inc | 2 +- 519 files changed, 519 insertions(+), 518 deletions(-) diff --git a/data/maps.s b/data/maps.s index 91c108c7ac..8a0c2d43a1 100644 --- a/data/maps.s +++ b/data/maps.s @@ -1,4 +1,5 @@ #include "constants/maps.h" +#include "constants/region_map_sections.h" #include "constants/songs.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc index 0348798fc6..a07a66947d 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc @@ -5,7 +5,7 @@ AbandonedShip_CaptainsOffice: @ 84845A4 .4byte 0x0 .2byte MUS_DAN02 .2byte 195 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc index 2ce3746178..118d918602 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Corridors_1F: @ 84844C4 .4byte 0x0 .2byte MUS_DAN02 .2byte 187 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc index e8d5fc4197..6b743af3a2 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Corridors_B1F: @ 84844FC .4byte 0x0 .2byte MUS_DAN02 .2byte 189 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc index cac71c4308..da8f1f124d 100644 --- a/data/maps/AbandonedShip_Deck/header.inc +++ b/data/maps/AbandonedShip_Deck/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Deck: @ 84844A8 .4byte 0x0 .2byte MUS_DAN02 .2byte 186 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 0 .byte 4 diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc index c03eba0b8f..e83f9a020a 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc @@ -5,7 +5,7 @@ AbandonedShip_HiddenFloorCorridors: @ 84845DC .4byte 0x0 .2byte MUS_DAN02 .2byte 289 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc index efa3a0bb97..b6b48d652a 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc @@ -5,7 +5,7 @@ AbandonedShip_HiddenFloorRooms: @ 84845F8 .4byte 0x0 .2byte MUS_DAN02 .2byte 310 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc index e2021ea857..3282054cbf 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ b/data/maps/AbandonedShip_Room_B1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Room_B1F: @ 848456C .4byte 0x0 .2byte MUS_DAN02 .2byte 193 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc index 227bf3e8f7..4d5eead342 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Rooms2_1F: @ 8484588 .4byte 0x0 .2byte MUS_DAN02 .2byte 194 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc index 55d228f472..ddac73f8ef 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Rooms2_B1F: @ 8484534 .4byte 0x0 .2byte MUS_DAN02 .2byte 191 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc index 62991d12e1..3041809557 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Rooms_1F: @ 84844E0 .4byte 0x0 .2byte MUS_DAN02 .2byte 188 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc index 7838b88752..b9be9d6671 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Rooms_B1F: @ 8484518 .4byte 0x0 .2byte MUS_DAN02 .2byte 190 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc index cc9db34431..e73f1c5d93 100644 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ b/data/maps/AbandonedShip_Underwater1/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Underwater1: @ 8484550 .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 192 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 14 .byte 5 diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc index 87650f5b2f..cb7f00a6f2 100644 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ b/data/maps/AbandonedShip_Underwater2/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Underwater2: @ 84845C0 .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 196 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 14 .byte 5 diff --git a/data/maps/AlteringCave/header.inc b/data/maps/AlteringCave/header.inc index 2361bf7693..1c390ec992 100644 --- a/data/maps/AlteringCave/header.inc +++ b/data/maps/AlteringCave/header.inc @@ -5,7 +5,7 @@ AlteringCave: @ 8484A58 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 420 - .byte 210 + .byte MAPSEC_ALTERING_CAVE_2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc index 5e958c6bd3..5cce523f90 100644 --- a/data/maps/AncientTomb/header.inc +++ b/data/maps/AncientTomb/header.inc @@ -5,7 +5,7 @@ AncientTomb: @ 8484630 .4byte 0x0 .2byte MUS_MABOROSI .2byte 281 - .byte 83 + .byte MAPSEC_ANCIENT_TOMB .byte 0 .byte 0 .byte 4 diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc index afbba57380..31085dd4c2 100644 --- a/data/maps/AquaHideout_1F/header.inc +++ b/data/maps/AquaHideout_1F/header.inc @@ -5,7 +5,7 @@ AquaHideout_1F: @ 8484144 .4byte 0x0 .2byte MUS_AJITO .2byte 143 - .byte 197 + .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte 0 .byte 8 diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc index 079c18ee96..984d167400 100644 --- a/data/maps/AquaHideout_B1F/header.inc +++ b/data/maps/AquaHideout_B1F/header.inc @@ -5,7 +5,7 @@ AquaHideout_B1F: @ 8484160 .4byte 0x0 .2byte MUS_AJITO .2byte 144 - .byte 197 + .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte 0 .byte 8 diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc index 8089a16341..230c2b7d0d 100644 --- a/data/maps/AquaHideout_B2F/header.inc +++ b/data/maps/AquaHideout_B2F/header.inc @@ -5,7 +5,7 @@ AquaHideout_B2F: @ 848417C .4byte 0x0 .2byte MUS_AJITO .2byte 145 - .byte 197 + .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte 0 .byte 8 diff --git a/data/maps/AquaHideout_UnusedRubyMap1/header.inc b/data/maps/AquaHideout_UnusedRubyMap1/header.inc index a643b729e9..c2dc760968 100644 --- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap1/header.inc @@ -5,7 +5,7 @@ AquaHideout_UnusedRubyMap1: @ 84846D8 .4byte 0x0 .2byte MUS_AJITO .2byte 316 - .byte 197 + .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/AquaHideout_UnusedRubyMap2/header.inc b/data/maps/AquaHideout_UnusedRubyMap2/header.inc index bb82dba185..cc01983a9f 100644 --- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap2/header.inc @@ -5,7 +5,7 @@ AquaHideout_UnusedRubyMap2: @ 84846F4 .4byte 0x0 .2byte MUS_AJITO .2byte 317 - .byte 197 + .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/AquaHideout_UnusedRubyMap3/header.inc b/data/maps/AquaHideout_UnusedRubyMap3/header.inc index 1fa34aab42..8adc7f2ba8 100644 --- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap3/header.inc @@ -5,7 +5,7 @@ AquaHideout_UnusedRubyMap3: @ 8484710 .4byte 0x0 .2byte MUS_AJITO .2byte 318 - .byte 197 + .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ArtisanCave_1F/header.inc b/data/maps/ArtisanCave_1F/header.inc index a8d91737e3..33d9748042 100644 --- a/data/maps/ArtisanCave_1F/header.inc +++ b/data/maps/ArtisanCave_1F/header.inc @@ -5,7 +5,7 @@ ArtisanCave_1F: @ 84849B0 .4byte 0x0 .2byte MUS_DAN01 .2byte 401 - .byte 202 + .byte MAPSEC_ARTISAN_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ArtisanCave_B1F/header.inc b/data/maps/ArtisanCave_B1F/header.inc index a82cd93f6b..8ff225a8eb 100644 --- a/data/maps/ArtisanCave_B1F/header.inc +++ b/data/maps/ArtisanCave_B1F/header.inc @@ -5,7 +5,7 @@ ArtisanCave_B1F: @ 8484994 .4byte 0x0 .2byte MUS_DAN01 .2byte 400 - .byte 202 + .byte MAPSEC_ARTISAN_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc index 7a8afda58e..927137cf0e 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleArenaBattleRoom: @ 8485484 .4byte 0x0 .2byte MUS_B_ARENA .2byte 356 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc index 5312dd0fe7..3323637385 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleArenaCorridor: @ 8485468 .4byte 0x0 .2byte MUS_B_ARENA .2byte 355 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleArenaLobby/header.inc b/data/maps/BattleFrontier_BattleArenaLobby/header.inc index 3f5e0ff4e4..541613f533 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleArenaLobby: @ 848544C .4byte 0x0 .2byte MUS_B_ARENA .2byte 354 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc index 3edfad7309..6ddf3fb459 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleDomeBattleRoom: @ 8485388 .4byte 0x0 .2byte MUS_B_DOME .2byte 335 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc index 133115e33b..25c5d684f9 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleDomeCorridor: @ 8485350 .4byte 0x0 .2byte MUS_B_DOME1 .2byte 333 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleDomeLobby/header.inc b/data/maps/BattleFrontier_BattleDomeLobby/header.inc index 26813d1f13..be93189ab2 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleDomeLobby: @ 8485334 .4byte 0x0 .2byte MUS_B_DOME1 .2byte 332 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc index e25a62ce8a..5923003536 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleDomePreBattleRoom: @ 848536C .4byte 0x0 .2byte MUS_B_DOME .2byte 334 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc index f3050926a5..c672d86cd5 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleFactoryBattleRoom: @ 84854D8 .4byte 0x0 .2byte MUS_B_FACTORY .2byte 348 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc index 7da2421832..1fa0645a3a 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleFactoryLobby: @ 84854A0 .4byte 0x0 .2byte MUS_B_FACTORY .2byte 346 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc index eb6e06a0fc..766e9689b1 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC .4byte 0x0 .2byte MUS_B_FACTORY .2byte 347 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc index b03d993fa9..696e416016 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePalaceBattleRoom: @ 84853DC .4byte 0x0 .2byte MUS_B_PALACE .2byte 344 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc index 4b62687e7b..18ddced686 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePalaceCorridor: @ 84853C0 .4byte 0x0 .2byte MUS_B_PALACE .2byte 343 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc index 8104eadfca..cc723eb42f 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePalaceLobby: @ 84853A4 .4byte 0x0 .2byte MUS_B_PALACE .2byte 342 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc index a2b84a22c2..955b0be42b 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePikeCorridor: @ 8485510 .4byte 0x0 .2byte MUS_B_TUBE .2byte 350 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePikeLobby/header.inc b/data/maps/BattleFrontier_BattlePikeLobby/header.inc index 96d249ab93..e75761bed5 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePikeLobby: @ 84854F4 .4byte 0x0 .2byte MUS_B_TUBE .2byte 349 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc index 58a662bb34..e5ea8a3ef1 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePikeRandomRoom1: @ 8485548 .4byte 0x0 .2byte MUS_B_TUBE .2byte 352 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc index 5dde0fc15d..8111043c66 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePikeRandomRoom2: @ 8485564 .4byte 0x0 .2byte MUS_B_TUBE .2byte 353 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc index 1d8848d234..2395feb52e 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePikeRandomRoom3: @ 8485580 .4byte 0x0 .2byte MUS_B_TUBE .2byte 358 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc index b1178e0a03..f6b0e63514 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePikeThreePathRoom: @ 848552C .4byte 0x0 .2byte MUS_B_TUBE .2byte 351 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc index 069dc6f76a..fca127f5fb 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4 .4byte 0x0 .2byte MUS_B_TOWER .2byte 398 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc index f2eccb9f46..a5eda44ef0 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePyramidEmptySquare: @ 8485414 .4byte 0x0 .2byte 65535 .2byte 361 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc index ed68e86c7e..06fd632f84 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 diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc index 9e9508e7ee..140a5d4e83 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePyramidTop: @ 8485430 .4byte 0x0 .2byte 65535 .2byte 378 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc index 32b7897206..fdf167b9fd 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleTowerBattleRoom: @ 848521C .4byte 0x0 .2byte MUS_SATTOWER .2byte 268 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc index a9eb2b2c56..157a9f0aea 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleTowerBattleRoom2: @ 8485318 .4byte 0x0 .2byte MUS_SATTOWER .2byte 268 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc index 361e6be034..de71a7dc64 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleTowerCorridor: @ 8485200 .4byte 0x0 .2byte MUS_SATTOWER .2byte 267 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc index ccdcb013f0..1ba6d43c9c 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleTowerCorridor2: @ 84852FC .4byte 0x0 .2byte MUS_SATTOWER .2byte 391 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleTowerElevator/header.inc b/data/maps/BattleFrontier_BattleTowerElevator/header.inc index 112c7f938e..d3e6216d23 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/header.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleTowerElevator: @ 84851E4 .4byte 0x0 .2byte MUS_SATTOWER .2byte 266 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleTowerLobby/header.inc b/data/maps/BattleFrontier_BattleTowerLobby/header.inc index 6e0e3b470a..db62f0be3e 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/header.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleTowerLobby: @ 84851C8 .4byte 0x0 .2byte MUS_SATTOWER .2byte 264 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc index cc55ae5910..5a25ffafa6 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0 .4byte 0x0 .2byte MUS_SATTOWER .2byte 390 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Lounge1/header.inc b/data/maps/BattleFrontier_Lounge1/header.inc index 44acc4b6a8..21e01eb7dc 100644 --- a/data/maps/BattleFrontier_Lounge1/header.inc +++ b/data/maps/BattleFrontier_Lounge1/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge1: @ 84855B8 .4byte 0x0 .2byte MUS_B_TOWER .2byte 429 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Lounge2/header.inc b/data/maps/BattleFrontier_Lounge2/header.inc index 69a6dba306..ad875cc4e6 100644 --- a/data/maps/BattleFrontier_Lounge2/header.inc +++ b/data/maps/BattleFrontier_Lounge2/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge2: @ 84855F0 .4byte 0x0 .2byte MUS_B_TOWER .2byte 397 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Lounge3/header.inc b/data/maps/BattleFrontier_Lounge3/header.inc index 3a18ce3473..8ce5169d7d 100644 --- a/data/maps/BattleFrontier_Lounge3/header.inc +++ b/data/maps/BattleFrontier_Lounge3/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge3: @ 848560C .4byte 0x0 .2byte MUS_B_TOWER .2byte 429 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Lounge4/header.inc b/data/maps/BattleFrontier_Lounge4/header.inc index e052e6ce6c..11f40472b0 100644 --- a/data/maps/BattleFrontier_Lounge4/header.inc +++ b/data/maps/BattleFrontier_Lounge4/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge4: @ 8485628 .4byte 0x0 .2byte MUS_B_TOWER .2byte 429 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Lounge5/header.inc b/data/maps/BattleFrontier_Lounge5/header.inc index a6fa1470ff..743ccd5120 100644 --- a/data/maps/BattleFrontier_Lounge5/header.inc +++ b/data/maps/BattleFrontier_Lounge5/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge5: @ 8485660 .4byte 0x0 .2byte MUS_B_TOWER .2byte 397 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Lounge6/header.inc b/data/maps/BattleFrontier_Lounge6/header.inc index ec6cfb1050..b6192f8a94 100644 --- a/data/maps/BattleFrontier_Lounge6/header.inc +++ b/data/maps/BattleFrontier_Lounge6/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge6: @ 848567C .4byte 0x0 .2byte MUS_B_TOWER .2byte 429 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Lounge7/header.inc b/data/maps/BattleFrontier_Lounge7/header.inc index 5124822a80..96843d502f 100644 --- a/data/maps/BattleFrontier_Lounge7/header.inc +++ b/data/maps/BattleFrontier_Lounge7/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge7: @ 8485698 .4byte 0x0 .2byte MUS_B_TOWER .2byte 429 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Lounge8/header.inc b/data/maps/BattleFrontier_Lounge8/header.inc index 46fe25e2d4..9a320a4bf4 100644 --- a/data/maps/BattleFrontier_Lounge8/header.inc +++ b/data/maps/BattleFrontier_Lounge8/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge8: @ 84856D0 .4byte 0x0 .2byte MUS_B_TOWER .2byte 429 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Lounge9/header.inc b/data/maps/BattleFrontier_Lounge9/header.inc index 24e7b3005e..999ba6ce09 100644 --- a/data/maps/BattleFrontier_Lounge9/header.inc +++ b/data/maps/BattleFrontier_Lounge9/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge9: @ 84856EC .4byte 0x0 .2byte MUS_B_TOWER .2byte 429 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Mart/header.inc b/data/maps/BattleFrontier_Mart/header.inc index 1067fc70ca..2285a9e3f2 100644 --- a/data/maps/BattleFrontier_Mart/header.inc +++ b/data/maps/BattleFrontier_Mart/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Mart: @ 8485740 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_OutsideEast/header.inc b/data/maps/BattleFrontier_OutsideEast/header.inc index f9dc82cbaa..0f49f1e4b9 100644 --- a/data/maps/BattleFrontier_OutsideEast/header.inc +++ b/data/maps/BattleFrontier_OutsideEast/header.inc @@ -5,7 +5,7 @@ BattleFrontier_OutsideEast: @ 84852C4 .4byte BattleFrontier_OutsideEast_MapConnections .2byte MUS_B_FRONTIER .2byte 345 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 3 diff --git a/data/maps/BattleFrontier_OutsideWest/header.inc b/data/maps/BattleFrontier_OutsideWest/header.inc index 319ecec6a5..bbef1d1c75 100644 --- a/data/maps/BattleFrontier_OutsideWest/header.inc +++ b/data/maps/BattleFrontier_OutsideWest/header.inc @@ -5,7 +5,7 @@ BattleFrontier_OutsideWest: @ 84851AC .4byte BattleFrontier_OutsideWest_MapConnections .2byte MUS_B_FRONTIER .2byte 265 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 3 diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc index 22e3ff6165..2b39d2cf6c 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ BattleFrontier_PokemonCenter_1F: @ 8485708 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc index 361c58a04d..7401417480 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ BattleFrontier_PokemonCenter_2F: @ 8485724 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_RankingHall/header.inc b/data/maps/BattleFrontier_RankingHall/header.inc index 340ba95979..8036032e3c 100644 --- a/data/maps/BattleFrontier_RankingHall/header.inc +++ b/data/maps/BattleFrontier_RankingHall/header.inc @@ -5,7 +5,7 @@ BattleFrontier_RankingHall: @ 848559C .4byte 0x0 .2byte MUS_BIJYUTU .2byte 396 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_ReceptionGate/header.inc b/data/maps/BattleFrontier_ReceptionGate/header.inc index 8f395bae4f..236698cd28 100644 --- a/data/maps/BattleFrontier_ReceptionGate/header.inc +++ b/data/maps/BattleFrontier_ReceptionGate/header.inc @@ -5,7 +5,7 @@ BattleFrontier_ReceptionGate: @ 84856B4 .4byte 0x0 .2byte MUS_B_TOWER .2byte 399 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_ScottsHouse/header.inc b/data/maps/BattleFrontier_ScottsHouse/header.inc index f0e0be773f..b7468a9d20 100644 --- a/data/maps/BattleFrontier_ScottsHouse/header.inc +++ b/data/maps/BattleFrontier_ScottsHouse/header.inc @@ -5,7 +5,7 @@ BattleFrontier_ScottsHouse: @ 8485644 .4byte 0x0 .2byte MUS_B_TOWER .2byte 430 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare01/header.inc b/data/maps/BattlePyramidSquare01/header.inc index 7ed6b181b6..dc3deeb489 100644 --- a/data/maps/BattlePyramidSquare01/header.inc +++ b/data/maps/BattlePyramidSquare01/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare01: @ 8484F60 .4byte 0x0 .2byte 65535 .2byte 362 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare02/header.inc b/data/maps/BattlePyramidSquare02/header.inc index 9eb6ef7544..8d65a6fa6a 100644 --- a/data/maps/BattlePyramidSquare02/header.inc +++ b/data/maps/BattlePyramidSquare02/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare02: @ 8484F7C .4byte 0x0 .2byte 65535 .2byte 363 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare03/header.inc b/data/maps/BattlePyramidSquare03/header.inc index 3f07295aee..c3bf3376d4 100644 --- a/data/maps/BattlePyramidSquare03/header.inc +++ b/data/maps/BattlePyramidSquare03/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare03: @ 8484F98 .4byte 0x0 .2byte 65535 .2byte 364 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare04/header.inc b/data/maps/BattlePyramidSquare04/header.inc index 978c4f4667..c001abc537 100644 --- a/data/maps/BattlePyramidSquare04/header.inc +++ b/data/maps/BattlePyramidSquare04/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare04: @ 8484FB4 .4byte 0x0 .2byte 65535 .2byte 365 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare05/header.inc b/data/maps/BattlePyramidSquare05/header.inc index 09a7e47034..e96d7cac7c 100644 --- a/data/maps/BattlePyramidSquare05/header.inc +++ b/data/maps/BattlePyramidSquare05/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare05: @ 8484FD0 .4byte 0x0 .2byte 65535 .2byte 366 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare06/header.inc b/data/maps/BattlePyramidSquare06/header.inc index e99531da82..440eac5492 100644 --- a/data/maps/BattlePyramidSquare06/header.inc +++ b/data/maps/BattlePyramidSquare06/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare06: @ 8484FEC .4byte 0x0 .2byte 65535 .2byte 367 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare07/header.inc b/data/maps/BattlePyramidSquare07/header.inc index 13c23c24b9..f467dfd7dd 100644 --- a/data/maps/BattlePyramidSquare07/header.inc +++ b/data/maps/BattlePyramidSquare07/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare07: @ 8485008 .4byte 0x0 .2byte 65535 .2byte 368 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare08/header.inc b/data/maps/BattlePyramidSquare08/header.inc index a12b6016e2..00c45e5779 100644 --- a/data/maps/BattlePyramidSquare08/header.inc +++ b/data/maps/BattlePyramidSquare08/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare08: @ 8485024 .4byte 0x0 .2byte 65535 .2byte 369 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare09/header.inc b/data/maps/BattlePyramidSquare09/header.inc index 486c74bc02..27a33d4b05 100644 --- a/data/maps/BattlePyramidSquare09/header.inc +++ b/data/maps/BattlePyramidSquare09/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare09: @ 8485040 .4byte 0x0 .2byte 65535 .2byte 370 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare10/header.inc b/data/maps/BattlePyramidSquare10/header.inc index a73718125a..1507f0518d 100644 --- a/data/maps/BattlePyramidSquare10/header.inc +++ b/data/maps/BattlePyramidSquare10/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare10: @ 848505C .4byte 0x0 .2byte 65535 .2byte 371 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare11/header.inc b/data/maps/BattlePyramidSquare11/header.inc index eac3cb1c7b..98c08a116b 100644 --- a/data/maps/BattlePyramidSquare11/header.inc +++ b/data/maps/BattlePyramidSquare11/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare11: @ 8485078 .4byte 0x0 .2byte 65535 .2byte 372 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare12/header.inc b/data/maps/BattlePyramidSquare12/header.inc index a1d5585c88..39cc4061a7 100644 --- a/data/maps/BattlePyramidSquare12/header.inc +++ b/data/maps/BattlePyramidSquare12/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare12: @ 8485094 .4byte 0x0 .2byte 65535 .2byte 373 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare13/header.inc b/data/maps/BattlePyramidSquare13/header.inc index 1c67b55e7c..b4b1a281d6 100644 --- a/data/maps/BattlePyramidSquare13/header.inc +++ b/data/maps/BattlePyramidSquare13/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare13: @ 84850B0 .4byte 0x0 .2byte 65535 .2byte 374 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare14/header.inc b/data/maps/BattlePyramidSquare14/header.inc index 9dcea14fa9..407cf00244 100644 --- a/data/maps/BattlePyramidSquare14/header.inc +++ b/data/maps/BattlePyramidSquare14/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare14: @ 84850CC .4byte 0x0 .2byte 65535 .2byte 375 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare15/header.inc b/data/maps/BattlePyramidSquare15/header.inc index 0429cbb0bf..37d8c75cb9 100644 --- a/data/maps/BattlePyramidSquare15/header.inc +++ b/data/maps/BattlePyramidSquare15/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare15: @ 84850E8 .4byte 0x0 .2byte 65535 .2byte 376 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare16/header.inc b/data/maps/BattlePyramidSquare16/header.inc index ea4627aa55..f264ace73b 100644 --- a/data/maps/BattlePyramidSquare16/header.inc +++ b/data/maps/BattlePyramidSquare16/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare16: @ 8485104 .4byte 0x0 .2byte 65535 .2byte 377 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc index 069bbc99cb..04a62dd6b6 100644 --- a/data/maps/BirthIsland_Exterior/header.inc +++ b/data/maps/BirthIsland_Exterior/header.inc @@ -5,7 +5,7 @@ BirthIsland_Exterior: @ 8485794 .4byte 0x0 .2byte 65535 .2byte 404 - .byte 200 + .byte MAPSEC_BIRTH_ISLAND_2 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc index e9dc265f55..e3b8a21f3b 100644 --- a/data/maps/BirthIsland_Harbor/header.inc +++ b/data/maps/BirthIsland_Harbor/header.inc @@ -5,7 +5,7 @@ BirthIsland_Harbor: @ 84857B0 .4byte 0x0 .2byte 65535 .2byte 405 - .byte 200 + .byte MAPSEC_BIRTH_ISLAND_2 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc index 0fa252cc5b..c25c0d82b2 100644 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ b/data/maps/CaveOfOrigin_1F/header.inc @@ -5,7 +5,7 @@ CaveOfOrigin_1F: @ 84842E8 .4byte 0x0 .2byte MUS_DAN03 .2byte 158 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc index 629806ad68..b5eacd7d92 100644 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ b/data/maps/CaveOfOrigin_B1F/header.inc @@ -5,7 +5,7 @@ CaveOfOrigin_B1F: @ 8484358 .4byte 0x0 .2byte 65535 .2byte 162 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte 6 .byte 4 diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc index b3e4dea973..5cda3da60c 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ b/data/maps/CaveOfOrigin_Entrance/header.inc @@ -5,7 +5,7 @@ CaveOfOrigin_Entrance: @ 84842CC .4byte 0x0 .2byte MUS_DAN03 .2byte 157 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc index 1edd4c6c23..762fb41152 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc @@ -5,7 +5,7 @@ CaveOfOrigin_UnusedRubySapphireMap1: @ 8484304 .4byte 0x0 .2byte MUS_DAN03 .2byte 159 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte 0 .byte 4 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc index 6b046b61af..bd77221f60 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc @@ -5,7 +5,7 @@ CaveOfOrigin_UnusedRubySapphireMap2: @ 8484320 .4byte 0x0 .2byte MUS_DAN03 .2byte 160 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte 6 .byte 4 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc index 819afc08ff..a5597e4e9b 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc @@ -5,7 +5,7 @@ CaveOfOrigin_UnusedRubySapphireMap3: @ 848433C .4byte 0x0 .2byte MUS_DAN03 .2byte 161 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte 6 .byte 4 diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc index 8f076bf773..009a279e19 100644 --- a/data/maps/DesertRuins/header.inc +++ b/data/maps/DesertRuins/header.inc @@ -5,7 +5,7 @@ DesertRuins: @ 8483F68 .4byte 0x0 .2byte MUS_MABOROSI .2byte 131 - .byte 82 + .byte MAPSEC_DESERT_RUINS .byte 0 .byte 0 .byte 4 diff --git a/data/maps/DesertUnderpass/header.inc b/data/maps/DesertUnderpass/header.inc index 2a420d7037..9d4bec9180 100644 --- a/data/maps/DesertUnderpass/header.inc +++ b/data/maps/DesertUnderpass/header.inc @@ -5,7 +5,7 @@ DesertUnderpass: @ 8484978 .4byte 0x0 .2byte MUS_TOZAN .2byte 389 - .byte 209 + .byte MAPSEC_DESERT_UNDERPASS .byte 0 .byte 0 .byte 4 diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc index 7c6638aed6..c6fb455819 100644 --- a/data/maps/DewfordTown/header.inc +++ b/data/maps/DewfordTown/header.inc @@ -5,7 +5,7 @@ DewfordTown: @ 84825EC .4byte DewfordTown_MapConnections .2byte MUS_HIGHTOWN .2byte 12 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc index fcb55ee29d..24866ee7a7 100644 --- a/data/maps/DewfordTown_Gym/header.inc +++ b/data/maps/DewfordTown_Gym/header.inc @@ -5,7 +5,7 @@ DewfordTown_Gym: @ 8482C60 .4byte 0x0 .2byte MUS_GIM .2byte 65 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc index 31af0f14dc..dfa5daf1f6 100644 --- a/data/maps/DewfordTown_Hall/header.inc +++ b/data/maps/DewfordTown_Hall/header.inc @@ -5,7 +5,7 @@ DewfordTown_Hall: @ 8482C7C .4byte 0x0 .2byte MUS_HIGHTOWN .2byte 66 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc index c317b12bbd..94c735b59d 100644 --- a/data/maps/DewfordTown_House1/header.inc +++ b/data/maps/DewfordTown_House1/header.inc @@ -5,7 +5,7 @@ DewfordTown_House1: @ 8482C0C .4byte 0x0 .2byte MUS_HIGHTOWN .2byte 64 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc index 6d285c4377..c27122bc58 100644 --- a/data/maps/DewfordTown_House2/header.inc +++ b/data/maps/DewfordTown_House2/header.inc @@ -5,7 +5,7 @@ DewfordTown_House2: @ 8482C98 .4byte 0x0 .2byte MUS_HIGHTOWN .2byte 67 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc index 99d29f69c2..e7b6285033 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ DewfordTown_PokemonCenter_1F: @ 8482C28 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc index 4d6a717858..90ec683d73 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ DewfordTown_PokemonCenter_2F: @ 8482C44 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc index d8275de598..05949ab05e 100644 --- a/data/maps/DoubleBattleColosseum/header.inc +++ b/data/maps/DoubleBattleColosseum/header.inc @@ -5,7 +5,7 @@ DoubleBattleColosseum: @ 8484D84 .4byte 0x0 .2byte MUS_RAINBOW .2byte 224 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc index 890d8b79fb..7ba0b694bb 100644 --- a/data/maps/EverGrandeCity/header.inc +++ b/data/maps/EverGrandeCity/header.inc @@ -5,7 +5,7 @@ EverGrandeCity: @ 8482598 .4byte EverGrandeCity_MapConnections .2byte MUS_RAINBOW .2byte 9 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc index e239ed1461..1e3591b8ad 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_ChampionsRoom: @ 8483C3C .4byte 0x0 .2byte MUS_C_ROAD .2byte 115 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc index 0a48781765..0de64f823c 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_DrakesRoom: @ 8483C20 .4byte 0x0 .2byte MUS_C_ROAD .2byte 114 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc index dbc20fd80c..2c6ad7097e 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_GlaciasRoom: @ 8483C04 .4byte 0x0 .2byte MUS_C_ROAD .2byte 113 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_Hall1/header.inc b/data/maps/EverGrandeCity_Hall1/header.inc index 4dacefc77e..eba002828c 100644 --- a/data/maps/EverGrandeCity_Hall1/header.inc +++ b/data/maps/EverGrandeCity_Hall1/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_Hall1: @ 8483C58 .4byte 0x0 .2byte MUS_C_ROAD .2byte 116 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_Hall2/header.inc b/data/maps/EverGrandeCity_Hall2/header.inc index 0c160c76e4..7c932e333a 100644 --- a/data/maps/EverGrandeCity_Hall2/header.inc +++ b/data/maps/EverGrandeCity_Hall2/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_Hall2: @ 8483C74 .4byte 0x0 .2byte MUS_C_ROAD .2byte 116 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_Hall3/header.inc b/data/maps/EverGrandeCity_Hall3/header.inc index da2ef52597..ff59994750 100644 --- a/data/maps/EverGrandeCity_Hall3/header.inc +++ b/data/maps/EverGrandeCity_Hall3/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_Hall3: @ 8483C90 .4byte 0x0 .2byte MUS_C_ROAD .2byte 116 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_Hall4/header.inc b/data/maps/EverGrandeCity_Hall4/header.inc index da0b96380b..4051a87222 100644 --- a/data/maps/EverGrandeCity_Hall4/header.inc +++ b/data/maps/EverGrandeCity_Hall4/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_Hall4: @ 8483CAC .4byte 0x0 .2byte MUS_C_ROAD .2byte 315 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_Hall5/header.inc b/data/maps/EverGrandeCity_Hall5/header.inc index 0c541bd583..1f6ade600e 100644 --- a/data/maps/EverGrandeCity_Hall5/header.inc +++ b/data/maps/EverGrandeCity_Hall5/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_Hall5: @ 8483CC8 .4byte 0x0 .2byte MUS_C_ROAD .2byte 116 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc index 786b7c598b..22bb385c33 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ b/data/maps/EverGrandeCity_HallOfFame/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_HallOfFame: @ 8483D00 .4byte 0x0 .2byte MUS_EIKOU_R .2byte 298 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc index 2e7bef16d5..267f341d5c 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_PhoebesRoom: @ 8483BE8 .4byte 0x0 .2byte MUS_C_ROAD .2byte 112 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc index 613b474463..1eb362f602 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_PokemonCenter_1F: @ 8483D1C .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc index 63539b7a10..3bfe680e59 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_PokemonCenter_2F: @ 8483D38 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc index d99e189078..e81864220b 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_PokemonLeague_1F: @ 8483CE4 .4byte 0x0 .2byte MUS_POKECEN .2byte 270 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc index 61d0b857a9..59e5234490 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_PokemonLeague_2F: @ 8483D54 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc index 3855eb87a7..a2f5ebef33 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_SidneysRoom: @ 8483BCC .4byte 0x0 .2byte MUS_C_ROAD .2byte 111 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc index c26b91f29a..caece3a223 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -5,7 +5,7 @@ FallarborTown: @ 8482624 .4byte FallarborTown_MapConnections .2byte MUS_TONEKUSA .2byte 14 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc index be81ffe6e6..17a58396f5 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc @@ -5,7 +5,7 @@ FallarborTown_BattleTentBattleRoom: @ 8482DCC .4byte 0x0 .2byte MUS_B_TOWER .2byte 386 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown_BattleTentCorridor/header.inc b/data/maps/FallarborTown_BattleTentCorridor/header.inc index 5f2023a719..adf2570af1 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/header.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/header.inc @@ -5,7 +5,7 @@ FallarborTown_BattleTentCorridor: @ 8482DB0 .4byte 0x0 .2byte MUS_B_TOWER .2byte 385 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown_BattleTentLobby/header.inc b/data/maps/FallarborTown_BattleTentLobby/header.inc index ba86df464e..60d07ff5b6 100644 --- a/data/maps/FallarborTown_BattleTentLobby/header.inc +++ b/data/maps/FallarborTown_BattleTentLobby/header.inc @@ -5,7 +5,7 @@ FallarborTown_BattleTentLobby: @ 8482D94 .4byte 0x0 .2byte MUS_B_TOWER .2byte 384 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc index 443a4dc270..e07cc4ee8a 100644 --- a/data/maps/FallarborTown_House1/header.inc +++ b/data/maps/FallarborTown_House1/header.inc @@ -5,7 +5,7 @@ FallarborTown_House1: @ 8482E20 .4byte 0x0 .2byte MUS_TONEKUSA .2byte 59 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc index 17cadef2b0..5e50c82711 100644 --- a/data/maps/FallarborTown_House2/header.inc +++ b/data/maps/FallarborTown_House2/header.inc @@ -5,7 +5,7 @@ FallarborTown_House2: @ 8482E3C .4byte 0x0 .2byte MUS_TONEKUSA .2byte 60 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc index 6e8aa3ef36..ee3d1bb7a5 100644 --- a/data/maps/FallarborTown_Mart/header.inc +++ b/data/maps/FallarborTown_Mart/header.inc @@ -5,7 +5,7 @@ FallarborTown_Mart: @ 8482D78 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc index 515518d9a5..ea7d76a360 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ FallarborTown_PokemonCenter_1F: @ 8482DE8 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc index 2c67be1788..a2e45e006e 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ FallarborTown_PokemonCenter_2F: @ 8482E04 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FarawayIsland_Entrance/header.inc b/data/maps/FarawayIsland_Entrance/header.inc index 5d7879d648..1b2e2300a0 100644 --- a/data/maps/FarawayIsland_Entrance/header.inc +++ b/data/maps/FarawayIsland_Entrance/header.inc @@ -5,7 +5,7 @@ FarawayIsland_Entrance: @ 848575C .4byte 0x0 .2byte MUS_DAN02 .2byte 402 - .byte 201 + .byte MAPSEC_FARAWAY_ISLAND .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FarawayIsland_Interior/header.inc b/data/maps/FarawayIsland_Interior/header.inc index dd29fcc26e..2ac52de61b 100644 --- a/data/maps/FarawayIsland_Interior/header.inc +++ b/data/maps/FarawayIsland_Interior/header.inc @@ -5,7 +5,7 @@ FarawayIsland_Interior: @ 8485778 .4byte 0x0 .2byte MUS_DAN02 .2byte 403 - .byte 201 + .byte MAPSEC_FARAWAY_ISLAND .byte 0 .byte 11 .byte 8 diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc index c02896935f..5ebac1143a 100644 --- a/data/maps/FieryPath/header.inc +++ b/data/maps/FieryPath/header.inc @@ -5,7 +5,7 @@ FieryPath: @ 8484048 .4byte 0x0 .2byte MUS_DAN01 .2byte 293 - .byte 74 + .byte MAPSEC_FIERY_PATH .byte 0 .byte 0 .byte 4 diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc index b091e166f9..98c24b2114 100644 --- a/data/maps/FortreeCity/header.inc +++ b/data/maps/FortreeCity/header.inc @@ -5,7 +5,7 @@ FortreeCity: @ 8482528 .4byte FortreeCity_MapConnections .2byte MUS_MACHI_S3 .2byte 5 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc index 4ebde8a93c..918a988b2b 100644 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ b/data/maps/FortreeCity_DecorationShop/header.inc @@ -5,7 +5,7 @@ FortreeCity_DecorationShop: @ 848361C .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 255 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc index eb241b368f..21b280322c 100644 --- a/data/maps/FortreeCity_Gym/header.inc +++ b/data/maps/FortreeCity_Gym/header.inc @@ -5,7 +5,7 @@ FortreeCity_Gym: @ 848353C .4byte 0x0 .2byte MUS_GIM .2byte 100 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc index 06dd18e1c4..9c933f5bba 100644 --- a/data/maps/FortreeCity_House1/header.inc +++ b/data/maps/FortreeCity_House1/header.inc @@ -5,7 +5,7 @@ FortreeCity_House1: @ 8483520 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 99 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc index 62461784fb..a339e9dde0 100644 --- a/data/maps/FortreeCity_House2/header.inc +++ b/data/maps/FortreeCity_House2/header.inc @@ -5,7 +5,7 @@ FortreeCity_House2: @ 84835AC .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 101 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc index 54297f4465..45f8e2e05e 100644 --- a/data/maps/FortreeCity_House3/header.inc +++ b/data/maps/FortreeCity_House3/header.inc @@ -5,7 +5,7 @@ FortreeCity_House3: @ 84835C8 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 99 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc index 71002c7da0..cdd8de3302 100644 --- a/data/maps/FortreeCity_House4/header.inc +++ b/data/maps/FortreeCity_House4/header.inc @@ -5,7 +5,7 @@ FortreeCity_House4: @ 84835E4 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 101 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc index 6513cde1eb..3017bae962 100644 --- a/data/maps/FortreeCity_House5/header.inc +++ b/data/maps/FortreeCity_House5/header.inc @@ -5,7 +5,7 @@ FortreeCity_House5: @ 8483600 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 99 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc index 18cb7b9712..1dd682c08d 100644 --- a/data/maps/FortreeCity_Mart/header.inc +++ b/data/maps/FortreeCity_Mart/header.inc @@ -5,7 +5,7 @@ FortreeCity_Mart: @ 8483590 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc index ae2b8e0e8a..920f961bf9 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ FortreeCity_PokemonCenter_1F: @ 8483558 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc index adb7a7bde9..197901ce7c 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ FortreeCity_PokemonCenter_2F: @ 8483574 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc index 3d29c272ad..af8cc27b70 100644 --- a/data/maps/GraniteCave_1F/header.inc +++ b/data/maps/GraniteCave_1F/header.inc @@ -5,7 +5,7 @@ GraniteCave_1F: @ 8483F84 .4byte 0x0 .2byte MUS_DAN01 .2byte 132 - .byte 55 + .byte MAPSEC_GRANITE_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc index 6ab42f0825..244eff08e6 100644 --- a/data/maps/GraniteCave_B1F/header.inc +++ b/data/maps/GraniteCave_B1F/header.inc @@ -5,7 +5,7 @@ GraniteCave_B1F: @ 8483FA0 .4byte 0x0 .2byte MUS_DAN01 .2byte 133 - .byte 55 + .byte MAPSEC_GRANITE_CAVE .byte 1 .byte 0 .byte 4 diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc index 95935c2839..0d1aeea5a6 100644 --- a/data/maps/GraniteCave_B2F/header.inc +++ b/data/maps/GraniteCave_B2F/header.inc @@ -5,7 +5,7 @@ GraniteCave_B2F: @ 8483FBC .4byte 0x0 .2byte MUS_DAN01 .2byte 134 - .byte 55 + .byte MAPSEC_GRANITE_CAVE .byte 1 .byte 0 .byte 4 diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc index 0644d8cb75..2c1514b758 100644 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ b/data/maps/GraniteCave_StevensRoom/header.inc @@ -5,7 +5,7 @@ GraniteCave_StevensRoom: @ 8483FD8 .4byte 0x0 .2byte MUS_DAN01 .2byte 288 - .byte 55 + .byte MAPSEC_GRANITE_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc index c77ea59344..e3a316015c 100644 --- a/data/maps/InsideOfTruck/header.inc +++ b/data/maps/InsideOfTruck/header.inc @@ -5,7 +5,7 @@ InsideOfTruck: @ 8484EF0 .4byte 0x0 .2byte 65535 .2byte 237 - .byte 84 + .byte MAPSEC_INSIDE_OF_TRUCK .byte 0 .byte 0 .byte 8 diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc index 6ff291c297..14fe2e7e2f 100644 --- a/data/maps/IslandCave/header.inc +++ b/data/maps/IslandCave/header.inc @@ -5,7 +5,7 @@ IslandCave: @ 8484614 .4byte 0x0 .2byte MUS_MABOROSI .2byte 280 - .byte 81 + .byte MAPSEC_ISLAND_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc index f6fc90e4eb..6bab465827 100644 --- a/data/maps/JaggedPass/header.inc +++ b/data/maps/JaggedPass/header.inc @@ -5,7 +5,7 @@ JaggedPass: @ 848402C .4byte 0x0 .2byte MUS_DAN01 .2byte 292 - .byte 76 + .byte MAPSEC_JAGGED_PASS .byte 0 .byte 0 .byte 3 diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc index 12cc74b5fc..ff1e483e0e 100644 --- a/data/maps/LavaridgeTown/header.inc +++ b/data/maps/LavaridgeTown/header.inc @@ -5,7 +5,7 @@ LavaridgeTown: @ 8482608 .4byte LavaridgeTown_MapConnections .2byte MUS_MACHI_S4 .2byte 13 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc index 30cde2e9c5..e7fb510f75 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_1F/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_Gym_1F: @ 8482CD0 .4byte 0x0 .2byte MUS_GIM .2byte 69 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 6 .byte 8 diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc index 66d7329218..1f591e8f2c 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_Gym_B1F: @ 8482CEC .4byte 0x0 .2byte MUS_GIM .2byte 70 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 6 .byte 8 diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc index c9ef33f926..bb34945c58 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ b/data/maps/LavaridgeTown_HerbShop/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_HerbShop: @ 8482CB4 .4byte 0x0 .2byte MUS_MACHI_S4 .2byte 68 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc index aa8a822f51..f9e56baea2 100644 --- a/data/maps/LavaridgeTown_House/header.inc +++ b/data/maps/LavaridgeTown_House/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_House: @ 8482D08 .4byte 0x0 .2byte MUS_MACHI_S4 .2byte 64 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc index 72d8699f18..a01610eafb 100644 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ b/data/maps/LavaridgeTown_Mart/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_Mart: @ 8482D24 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc index b3444dc0fc..ae10ecf371 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_PokemonCenter_1F: @ 8482D40 .4byte 0x0 .2byte MUS_POKECEN .2byte 71 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc index 596b0e1899..1fb9fc917e 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_PokemonCenter_2F: @ 8482D5C .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc index 1ec7fa26e8..eb3ad0011b 100644 --- a/data/maps/LilycoveCity/header.inc +++ b/data/maps/LilycoveCity/header.inc @@ -5,7 +5,7 @@ LilycoveCity: @ 8482544 .4byte LilycoveCity_MapConnections .2byte MUS_MINAMO .2byte 6 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc index d0b17f863f..29ec0ca38d 100644 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ b/data/maps/LilycoveCity_ContestHall/header.inc @@ -5,7 +5,7 @@ LilycoveCity_ContestHall: @ 84836C4 .4byte 0x0 .2byte MUS_CONLOBBY .2byte 106 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc index ddd0d6284c..6cbc84c1b1 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ b/data/maps/LilycoveCity_ContestLobby/header.inc @@ -5,7 +5,7 @@ LilycoveCity_ContestLobby: @ 84836A8 .4byte 0x0 .2byte MUS_CONLOBBY .2byte 105 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc index ed380598be..7881cf2880 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_CoveLilyMotel_1F: @ 8483638 .4byte 0x0 .2byte MUS_MINAMO .2byte 299 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc index 200e1b7bb5..3e3a5810ff 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_CoveLilyMotel_2F: @ 8483654 .4byte 0x0 .2byte MUS_MINAMO .2byte 300 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc index b5135b1ffc..3e490a6cda 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStoreElevator: @ 84838A0 .4byte 0x0 .2byte MUS_MINAMO .2byte 273 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc index 3a96f4c3b0..991117c67b 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStoreRooftop: @ 8483884 .4byte 0x0 .2byte MUS_MINAMO .2byte 262 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc index 2ad060976a..af11b9d992 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStore_1F: @ 84837F8 .4byte 0x0 .2byte MUS_MINAMO .2byte 257 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc index e4ebc314a2..dd79bf744d 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStore_2F: @ 8483814 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 258 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc index bb8cd73f77..48e90e3550 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStore_3F: @ 8483830 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 259 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc index 9bc54b8096..3a098b37c0 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStore_4F: @ 848384C .4byte 0x0 .2byte MUS_FRIENDLY .2byte 260 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc index cf1448ab87..a1af1c59f5 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStore_5F: @ 8483868 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 261 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc index abaf3ad3f4..4f8b71c7a9 100644 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ b/data/maps/LilycoveCity_Harbor/header.inc @@ -5,7 +5,7 @@ LilycoveCity_Harbor: @ 8483750 .4byte 0x0 .2byte MUS_MINAMO .2byte 88 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc index 3d884a5d21..903bcd8457 100644 --- a/data/maps/LilycoveCity_House1/header.inc +++ b/data/maps/LilycoveCity_House1/header.inc @@ -5,7 +5,7 @@ LilycoveCity_House1: @ 8483788 .4byte 0x0 .2byte MUS_MINAMO .2byte 59 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc index 3d184d3453..f78304998e 100644 --- a/data/maps/LilycoveCity_House2/header.inc +++ b/data/maps/LilycoveCity_House2/header.inc @@ -5,7 +5,7 @@ LilycoveCity_House2: @ 84837A4 .4byte 0x0 .2byte MUS_MINAMO .2byte 74 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc index 1a818490e3..49bd9d3330 100644 --- a/data/maps/LilycoveCity_House3/header.inc +++ b/data/maps/LilycoveCity_House3/header.inc @@ -5,7 +5,7 @@ LilycoveCity_House3: @ 84837C0 .4byte 0x0 .2byte MUS_MINAMO .2byte 60 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc index 9632ffa39e..331b406459 100644 --- a/data/maps/LilycoveCity_House4/header.inc +++ b/data/maps/LilycoveCity_House4/header.inc @@ -5,7 +5,7 @@ LilycoveCity_House4: @ 84837DC .4byte 0x0 .2byte MUS_MINAMO .2byte 59 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc index 3721b4432e..1b5c0ed323 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_LilycoveMuseum_1F: @ 8483670 .4byte 0x0 .2byte MUS_BIJYUTU .2byte 103 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc index c5adc0fb19..cb282a135b 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_LilycoveMuseum_2F: @ 848368C .4byte 0x0 .2byte MUS_BIJYUTU .2byte 104 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc index 19e61cf16d..3bc7054981 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -5,7 +5,7 @@ LilycoveCity_MoveDeletersHouse: @ 848376C .4byte 0x0 .2byte MUS_MINAMO .2byte 60 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc index 782efd3d0b..2dd8591340 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_PokemonCenter_1F: @ 84836E0 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc index 7db9bcb625..df902a25be 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_PokemonCenter_2F: @ 84836FC .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc index 0e23469c18..f429787fad 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc @@ -5,7 +5,7 @@ LilycoveCity_PokemonTrainerFanClub: @ 8483734 .4byte 0x0 .2byte MUS_MINAMO .2byte 107 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc index bf648b5da9..09869a0a5e 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ b/data/maps/LilycoveCity_UnusedMart/header.inc @@ -5,7 +5,7 @@ LilycoveCity_UnusedMart: @ 8483718 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc index dcd7be8598..bcb120e6ba 100644 --- a/data/maps/LinkContestRoom1/header.inc +++ b/data/maps/LinkContestRoom1/header.inc @@ -5,7 +5,7 @@ LinkContestRoom1: @ 8484DA0 .4byte 0x0 .2byte MUS_CONTEST0 .2byte 225 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index 2afb7ae00f..298bbad57a 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -5,7 +5,7 @@ LinkContestRoom2: @ 8484E64 .4byte 0x0 .2byte MUS_CONTEST0 .2byte 232 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index 97f0cdcaef..3c60ff6496 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -5,7 +5,7 @@ LinkContestRoom3: @ 8484E80 .4byte 0x0 .2byte MUS_CONTEST0 .2byte 233 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index 9c0dfdc658..6be3dba3f8 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -5,7 +5,7 @@ LinkContestRoom4: @ 8484E9C .4byte 0x0 .2byte MUS_CONTEST0 .2byte 234 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index 42c2f3fdb7..d929ef7423 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -5,7 +5,7 @@ LinkContestRoom5: @ 8484EB8 .4byte 0x0 .2byte MUS_CONTEST0 .2byte 235 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index f1487f3346..cc2a56e799 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -5,7 +5,7 @@ LinkContestRoom6: @ 8484ED4 .4byte 0x0 .2byte MUS_CONTEST0 .2byte 236 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc index 04010b50c2..dbc6effd61 100644 --- a/data/maps/LittlerootTown/header.inc +++ b/data/maps/LittlerootTown/header.inc @@ -5,7 +5,7 @@ LittlerootTown: @ 84825B4 .4byte LittlerootTown_MapConnections .2byte MUS_MISHIRO .2byte 10 - .byte 0 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc index d5a87bae9f..f4b411a067 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc @@ -5,7 +5,7 @@ LittlerootTown_BrendansHouse_1F: @ 8482AF4 .4byte 0x0 .2byte MUS_MISHIRO .2byte 54 - .byte 0 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc index 0153a3f273..39a81acd15 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc @@ -5,7 +5,7 @@ LittlerootTown_BrendansHouse_2F: @ 8482B10 .4byte 0x0 .2byte MUS_MISHIRO .2byte 55 - .byte 0 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc index 1e72c91b57..821cacc0bd 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc @@ -5,7 +5,7 @@ LittlerootTown_MaysHouse_1F: @ 8482B2C .4byte 0x0 .2byte MUS_MISHIRO .2byte 56 - .byte 0 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc index 20e9e3f5a8..711c8b3810 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc @@ -5,7 +5,7 @@ LittlerootTown_MaysHouse_2F: @ 8482B48 .4byte 0x0 .2byte MUS_MISHIRO .2byte 57 - .byte 0 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc index 8cd5eaf799..18b6d4d612 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc @@ -5,7 +5,7 @@ LittlerootTown_ProfessorBirchsLab: @ 8482B64 .4byte 0x0 .2byte MUS_ODAMAKI .2byte 58 - .byte 0 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc index 6158ed3cb6..c82b22bc3f 100644 --- a/data/maps/MagmaHideout_1F/header.inc +++ b/data/maps/MagmaHideout_1F/header.inc @@ -5,7 +5,7 @@ MagmaHideout_1F: @ 8484828 .4byte 0x0 .2byte MUS_AJITO .2byte 336 - .byte 198 + .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MagmaHideout_2F_1R/header.inc b/data/maps/MagmaHideout_2F_1R/header.inc index 1a685fe55d..2615020892 100644 --- a/data/maps/MagmaHideout_2F_1R/header.inc +++ b/data/maps/MagmaHideout_2F_1R/header.inc @@ -5,7 +5,7 @@ MagmaHideout_2F_1R: @ 8484844 .4byte 0x0 .2byte MUS_AJITO .2byte 337 - .byte 198 + .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MagmaHideout_2F_2R/header.inc b/data/maps/MagmaHideout_2F_2R/header.inc index 4105220971..5032b25a6c 100644 --- a/data/maps/MagmaHideout_2F_2R/header.inc +++ b/data/maps/MagmaHideout_2F_2R/header.inc @@ -5,7 +5,7 @@ MagmaHideout_2F_2R: @ 8484860 .4byte 0x0 .2byte MUS_AJITO .2byte 338 - .byte 198 + .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MagmaHideout_2F_3R/header.inc b/data/maps/MagmaHideout_2F_3R/header.inc index 407408bf3e..fefbbfb8d3 100644 --- a/data/maps/MagmaHideout_2F_3R/header.inc +++ b/data/maps/MagmaHideout_2F_3R/header.inc @@ -5,7 +5,7 @@ MagmaHideout_2F_3R: @ 84848EC .4byte 0x0 .2byte MUS_AJITO .2byte 380 - .byte 198 + .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MagmaHideout_3F_1R/header.inc b/data/maps/MagmaHideout_3F_1R/header.inc index 228b197ebb..52ad4945e6 100644 --- a/data/maps/MagmaHideout_3F_1R/header.inc +++ b/data/maps/MagmaHideout_3F_1R/header.inc @@ -5,7 +5,7 @@ MagmaHideout_3F_1R: @ 848487C .4byte 0x0 .2byte MUS_AJITO .2byte 339 - .byte 198 + .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MagmaHideout_3F_2R/header.inc b/data/maps/MagmaHideout_3F_2R/header.inc index d070dd32ab..14d6eeff63 100644 --- a/data/maps/MagmaHideout_3F_2R/header.inc +++ b/data/maps/MagmaHideout_3F_2R/header.inc @@ -5,7 +5,7 @@ MagmaHideout_3F_2R: @ 8484898 .4byte 0x0 .2byte MUS_AJITO .2byte 340 - .byte 198 + .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MagmaHideout_3F_3R/header.inc b/data/maps/MagmaHideout_3F_3R/header.inc index 24ed48ff5a..8e27ddbae1 100644 --- a/data/maps/MagmaHideout_3F_3R/header.inc +++ b/data/maps/MagmaHideout_3F_3R/header.inc @@ -5,7 +5,7 @@ MagmaHideout_3F_3R: @ 84848D0 .4byte 0x0 .2byte MUS_AJITO .2byte 379 - .byte 198 + .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MagmaHideout_4F/header.inc b/data/maps/MagmaHideout_4F/header.inc index 45b5a40e65..b32ba1b057 100644 --- a/data/maps/MagmaHideout_4F/header.inc +++ b/data/maps/MagmaHideout_4F/header.inc @@ -5,7 +5,7 @@ MagmaHideout_4F: @ 84848B4 .4byte 0x0 .2byte MUS_AJITO .2byte 341 - .byte 198 + .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MarineCave_End/header.inc b/data/maps/MarineCave_End/header.inc index 8e3cf5a5fa..41c7c1a860 100644 --- a/data/maps/MarineCave_End/header.inc +++ b/data/maps/MarineCave_End/header.inc @@ -5,7 +5,7 @@ MarineCave_End: @ 8484A04 .4byte 0x0 .2byte MUS_DAN01 .2byte 413 - .byte 203 + .byte MAPSEC_MARINE_CAVE .byte 0 .byte 6 .byte 4 diff --git a/data/maps/MarineCave_Entrance/header.inc b/data/maps/MarineCave_Entrance/header.inc index 17212c4f63..1affd12138 100644 --- a/data/maps/MarineCave_Entrance/header.inc +++ b/data/maps/MarineCave_Entrance/header.inc @@ -5,7 +5,7 @@ MarineCave_Entrance: @ 84849E8 .4byte 0x0 .2byte MUS_DAN01 .2byte 407 - .byte 203 + .byte MAPSEC_MARINE_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc index 6e83a33bd1..bd14b94bf9 100644 --- a/data/maps/MauvilleCity/header.inc +++ b/data/maps/MauvilleCity/header.inc @@ -5,7 +5,7 @@ MauvilleCity: @ 84824F0 .4byte MauvilleCity_MapConnections .2byte MUS_GOTOWN .2byte 3 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc index 8b7ecd54d1..2ad55f4085 100644 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ b/data/maps/MauvilleCity_BikeShop/header.inc @@ -5,7 +5,7 @@ MauvilleCity_BikeShop: @ 8483280 .4byte 0x0 .2byte MUS_GOTOWN .2byte 90 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc index 11a71f8c60..24dd5d97d1 100644 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ b/data/maps/MauvilleCity_GameCorner/header.inc @@ -5,7 +5,7 @@ MauvilleCity_GameCorner: @ 84832B8 .4byte 0x0 .2byte MUS_CASINO .2byte 91 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc index aa6430475c..21aa7c9914 100644 --- a/data/maps/MauvilleCity_Gym/header.inc +++ b/data/maps/MauvilleCity_Gym/header.inc @@ -5,7 +5,7 @@ MauvilleCity_Gym: @ 8483264 .4byte 0x0 .2byte MUS_GIM .2byte 89 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc index db43711751..719e88b1f3 100644 --- a/data/maps/MauvilleCity_House1/header.inc +++ b/data/maps/MauvilleCity_House1/header.inc @@ -5,7 +5,7 @@ MauvilleCity_House1: @ 848329C .4byte 0x0 .2byte MUS_GOTOWN .2byte 60 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc index 4acd48c6df..0ab38aa38d 100644 --- a/data/maps/MauvilleCity_House2/header.inc +++ b/data/maps/MauvilleCity_House2/header.inc @@ -5,7 +5,7 @@ MauvilleCity_House2: @ 84832D4 .4byte 0x0 .2byte MUS_GOTOWN .2byte 59 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc index 3130c2d35f..6e029f7860 100644 --- a/data/maps/MauvilleCity_Mart/header.inc +++ b/data/maps/MauvilleCity_Mart/header.inc @@ -5,7 +5,7 @@ MauvilleCity_Mart: @ 8483328 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc index 5bb682b98f..b2b2e21ce7 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ MauvilleCity_PokemonCenter_1F: @ 84832F0 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc index d29063e862..aaefbba0a6 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ MauvilleCity_PokemonCenter_2F: @ 848330C .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc index 1b1371370a..6cc631f65d 100644 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ b/data/maps/MeteorFalls_1F_1R/header.inc @@ -5,7 +5,7 @@ MeteorFalls_1F_1R: @ 8483EC0 .4byte 0x0 .2byte MUS_DAN03 .2byte 125 - .byte 63 + .byte MAPSEC_METEOR_FALLS .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc index a96c5648e0..f225660d08 100644 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ b/data/maps/MeteorFalls_1F_2R/header.inc @@ -5,7 +5,7 @@ MeteorFalls_1F_2R: @ 8483EDC .4byte 0x0 .2byte MUS_DAN03 .2byte 126 - .byte 63 + .byte MAPSEC_METEOR_FALLS .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc index 11402d3d54..ea434e50bb 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ b/data/maps/MeteorFalls_B1F_1R/header.inc @@ -5,7 +5,7 @@ MeteorFalls_B1F_1R: @ 8483EF8 .4byte 0x0 .2byte MUS_DAN03 .2byte 127 - .byte 63 + .byte MAPSEC_METEOR_FALLS .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc index 81c6276d26..b820706f5b 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ b/data/maps/MeteorFalls_B1F_2R/header.inc @@ -5,7 +5,7 @@ MeteorFalls_B1F_2R: @ 8483F14 .4byte 0x0 .2byte MUS_DAN03 .2byte 128 - .byte 63 + .byte MAPSEC_METEOR_FALLS .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MeteorFalls_StevensCave/header.inc b/data/maps/MeteorFalls_StevensCave/header.inc index 22b3aaeb6f..002031a7af 100644 --- a/data/maps/MeteorFalls_StevensCave/header.inc +++ b/data/maps/MeteorFalls_StevensCave/header.inc @@ -5,7 +5,7 @@ MeteorFalls_StevensCave: @ 8484A74 .4byte 0x0 .2byte MUS_DAN03 .2byte 431 - .byte 63 + .byte MAPSEC_METEOR_FALLS .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MirageTower_1F/header.inc b/data/maps/MirageTower_1F/header.inc index cd0717add8..a9cf03b39a 100644 --- a/data/maps/MirageTower_1F/header.inc +++ b/data/maps/MirageTower_1F/header.inc @@ -5,7 +5,7 @@ MirageTower_1F: @ 8484908 .4byte 0x0 .2byte MUS_TOZAN .2byte 381 - .byte 199 + .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MirageTower_2F/header.inc b/data/maps/MirageTower_2F/header.inc index e449c3a37b..0c983da36d 100644 --- a/data/maps/MirageTower_2F/header.inc +++ b/data/maps/MirageTower_2F/header.inc @@ -5,7 +5,7 @@ MirageTower_2F: @ 8484924 .4byte 0x0 .2byte MUS_TOZAN .2byte 382 - .byte 199 + .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MirageTower_3F/header.inc b/data/maps/MirageTower_3F/header.inc index def0a15c9e..c26f56dea1 100644 --- a/data/maps/MirageTower_3F/header.inc +++ b/data/maps/MirageTower_3F/header.inc @@ -5,7 +5,7 @@ MirageTower_3F: @ 8484940 .4byte 0x0 .2byte MUS_TOZAN .2byte 383 - .byte 199 + .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MirageTower_4F/header.inc b/data/maps/MirageTower_4F/header.inc index 7c1351ea68..fc49e37a97 100644 --- a/data/maps/MirageTower_4F/header.inc +++ b/data/maps/MirageTower_4F/header.inc @@ -5,7 +5,7 @@ MirageTower_4F: @ 848495C .4byte 0x0 .2byte MUS_TOZAN .2byte 388 - .byte 199 + .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc index fc5af866a2..2c7c774d3e 100644 --- a/data/maps/MossdeepCity/header.inc +++ b/data/maps/MossdeepCity/header.inc @@ -5,7 +5,7 @@ MossdeepCity: @ 8482560 .4byte MossdeepCity_MapConnections .2byte MUS_GOTOWN .2byte 7 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc index 9b886677ee..75074e91f6 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc @@ -5,7 +5,7 @@ MossdeepCity_GameCorner_1F: @ 84839F0 .4byte 0x0 .2byte MUS_GOTOWN .2byte 305 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc index 623b5f970e..14e89db1cd 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc @@ -5,7 +5,7 @@ MossdeepCity_GameCorner_B1F: @ 8483A0C .4byte 0x0 .2byte MUS_GOTOWN .2byte 306 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc index 321271f784..2ce3b8eaae 100644 --- a/data/maps/MossdeepCity_Gym/header.inc +++ b/data/maps/MossdeepCity_Gym/header.inc @@ -5,7 +5,7 @@ MossdeepCity_Gym: @ 84838BC .4byte 0x0 .2byte MUS_GIM .2byte 108 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc index 64dedcba63..8b7112431e 100644 --- a/data/maps/MossdeepCity_House1/header.inc +++ b/data/maps/MossdeepCity_House1/header.inc @@ -5,7 +5,7 @@ MossdeepCity_House1: @ 84838D8 .4byte 0x0 .2byte MUS_GOTOWN .2byte 60 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc index b3cf197385..72e0f38ab3 100644 --- a/data/maps/MossdeepCity_House2/header.inc +++ b/data/maps/MossdeepCity_House2/header.inc @@ -5,7 +5,7 @@ MossdeepCity_House2: @ 84838F4 .4byte 0x0 .2byte MUS_GOTOWN .2byte 59 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc index d54538b4e0..8e56d6f53a 100644 --- a/data/maps/MossdeepCity_House3/header.inc +++ b/data/maps/MossdeepCity_House3/header.inc @@ -5,7 +5,7 @@ MossdeepCity_House3: @ 8483964 .4byte 0x0 .2byte MUS_GOTOWN .2byte 60 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc index 33acf2e517..d5f7f5db90 100644 --- a/data/maps/MossdeepCity_House4/header.inc +++ b/data/maps/MossdeepCity_House4/header.inc @@ -5,7 +5,7 @@ MossdeepCity_House4: @ 848399C .4byte 0x0 .2byte MUS_GOTOWN .2byte 80 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc index 586c976e71..80bc3bc38f 100644 --- a/data/maps/MossdeepCity_Mart/header.inc +++ b/data/maps/MossdeepCity_Mart/header.inc @@ -5,7 +5,7 @@ MossdeepCity_Mart: @ 8483948 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc index 5ee83f3ce3..2277dd1739 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ MossdeepCity_PokemonCenter_1F: @ 8483910 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc index a6659fafb2..59c6ea2c89 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ MossdeepCity_PokemonCenter_2F: @ 848392C .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc index abfb64ee8f..ea035f4bee 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc @@ -5,7 +5,7 @@ MossdeepCity_SpaceCenter_1F: @ 84839B8 .4byte 0x0 .2byte MUS_GOTOWN .2byte 275 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc index 3a7fce6809..e1418859bf 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc @@ -5,7 +5,7 @@ MossdeepCity_SpaceCenter_2F: @ 84839D4 .4byte 0x0 .2byte MUS_GOTOWN .2byte 276 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc index 83a907bdac..070effff6d 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ b/data/maps/MossdeepCity_StevensHouse/header.inc @@ -5,7 +5,7 @@ MossdeepCity_StevensHouse: @ 8483980 .4byte 0x0 .2byte MUS_GOTOWN .2byte 327 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc index bbdfaeb442..8d060e4012 100644 --- a/data/maps/MtChimney/header.inc +++ b/data/maps/MtChimney/header.inc @@ -5,7 +5,7 @@ MtChimney: @ 8484010 .4byte 0x0 .2byte MUS_TOZAN .2byte 136 - .byte 56 + .byte MAPSEC_MT_CHIMNEY .byte 0 .byte 7 .byte 3 diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc index efd2245641..7c1e49a997 100644 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ b/data/maps/MtChimney_CableCarStation/header.inc @@ -5,7 +5,7 @@ MtChimney_CableCarStation: @ 8483DFC .4byte 0x0 .2byte MUS_DOORO_X1 .2byte 118 - .byte 56 + .byte MAPSEC_MT_CHIMNEY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index 17b7673c79..9e903d5b67 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -5,7 +5,7 @@ MtPyre_1F: @ 8484064 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 137 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc index d4a35c4c65..4f3687bf27 100644 --- a/data/maps/MtPyre_2F/header.inc +++ b/data/maps/MtPyre_2F/header.inc @@ -5,7 +5,7 @@ MtPyre_2F: @ 8484080 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 138 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc index 8bf9f015ab..28721a7570 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -5,7 +5,7 @@ MtPyre_3F: @ 848409C .4byte 0x0 .2byte MUS_M_DUNGON .2byte 139 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc index 9360976d4b..a0be9d5992 100644 --- a/data/maps/MtPyre_4F/header.inc +++ b/data/maps/MtPyre_4F/header.inc @@ -5,7 +5,7 @@ MtPyre_4F: @ 84840B8 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 140 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc index 193120ca86..7e756e8f5e 100644 --- a/data/maps/MtPyre_5F/header.inc +++ b/data/maps/MtPyre_5F/header.inc @@ -5,7 +5,7 @@ MtPyre_5F: @ 84840D4 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 141 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc index 3c390f9621..b9c9f38c56 100644 --- a/data/maps/MtPyre_6F/header.inc +++ b/data/maps/MtPyre_6F/header.inc @@ -5,7 +5,7 @@ MtPyre_6F: @ 84840F0 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 142 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc index 013d84e846..aba767d32a 100644 --- a/data/maps/MtPyre_Exterior/header.inc +++ b/data/maps/MtPyre_Exterior/header.inc @@ -5,7 +5,7 @@ MtPyre_Exterior: @ 848410C .4byte 0x0 .2byte MUS_MACHUPI .2byte 302 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 3 diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc index 55f9d512b7..10b8c44de2 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -5,7 +5,7 @@ MtPyre_Summit: @ 8484128 .4byte 0x0 .2byte MUS_MACHUPI .2byte 303 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 6 .byte 3 diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc index 9a9b308de2..1d982d11f0 100644 --- a/data/maps/NavelRock_B1F/header.inc +++ b/data/maps/NavelRock_B1F/header.inc @@ -5,7 +5,7 @@ NavelRock_B1F: @ 84858C8 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 427 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Bottom/header.inc b/data/maps/NavelRock_Bottom/header.inc index 84d942a9e8..ccd6e4de47 100644 --- a/data/maps/NavelRock_Bottom/header.inc +++ b/data/maps/NavelRock_Bottom/header.inc @@ -5,7 +5,7 @@ NavelRock_Bottom: @ 8485AC0 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 424 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down01/header.inc b/data/maps/NavelRock_Down01/header.inc index 4f82377613..2d6f6cdc1c 100644 --- a/data/maps/NavelRock_Down01/header.inc +++ b/data/maps/NavelRock_Down01/header.inc @@ -5,7 +5,7 @@ NavelRock_Down01: @ 848598C .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 425 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down02/header.inc b/data/maps/NavelRock_Down02/header.inc index 027de3f91a..6146db29c5 100644 --- a/data/maps/NavelRock_Down02/header.inc +++ b/data/maps/NavelRock_Down02/header.inc @@ -5,7 +5,7 @@ NavelRock_Down02: @ 84859A8 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 426 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down03/header.inc b/data/maps/NavelRock_Down03/header.inc index 41ae687228..0a0601117a 100644 --- a/data/maps/NavelRock_Down03/header.inc +++ b/data/maps/NavelRock_Down03/header.inc @@ -5,7 +5,7 @@ NavelRock_Down03: @ 84859C4 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 425 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down04/header.inc b/data/maps/NavelRock_Down04/header.inc index a45886c16a..f1014f5e8c 100644 --- a/data/maps/NavelRock_Down04/header.inc +++ b/data/maps/NavelRock_Down04/header.inc @@ -5,7 +5,7 @@ NavelRock_Down04: @ 84859E0 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 426 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down05/header.inc b/data/maps/NavelRock_Down05/header.inc index 2ab0c76ba1..e638b93063 100644 --- a/data/maps/NavelRock_Down05/header.inc +++ b/data/maps/NavelRock_Down05/header.inc @@ -5,7 +5,7 @@ NavelRock_Down05: @ 84859FC .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 425 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down06/header.inc b/data/maps/NavelRock_Down06/header.inc index d8a17e85fc..db7bbbb92a 100644 --- a/data/maps/NavelRock_Down06/header.inc +++ b/data/maps/NavelRock_Down06/header.inc @@ -5,7 +5,7 @@ NavelRock_Down06: @ 8485A18 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 426 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down07/header.inc b/data/maps/NavelRock_Down07/header.inc index 0a77e64062..27c228fe8b 100644 --- a/data/maps/NavelRock_Down07/header.inc +++ b/data/maps/NavelRock_Down07/header.inc @@ -5,7 +5,7 @@ NavelRock_Down07: @ 8485A34 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 425 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down08/header.inc b/data/maps/NavelRock_Down08/header.inc index a3cbed38a8..5cf41ad244 100644 --- a/data/maps/NavelRock_Down08/header.inc +++ b/data/maps/NavelRock_Down08/header.inc @@ -5,7 +5,7 @@ NavelRock_Down08: @ 8485A50 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 426 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down09/header.inc b/data/maps/NavelRock_Down09/header.inc index 6aed925006..b82c99552c 100644 --- a/data/maps/NavelRock_Down09/header.inc +++ b/data/maps/NavelRock_Down09/header.inc @@ -5,7 +5,7 @@ NavelRock_Down09: @ 8485A6C .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 425 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down10/header.inc b/data/maps/NavelRock_Down10/header.inc index bb96b7e3d6..2b1826572a 100644 --- a/data/maps/NavelRock_Down10/header.inc +++ b/data/maps/NavelRock_Down10/header.inc @@ -5,7 +5,7 @@ NavelRock_Down10: @ 8485A88 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 426 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down11/header.inc b/data/maps/NavelRock_Down11/header.inc index 48ed319eb3..19fc50327c 100644 --- a/data/maps/NavelRock_Down11/header.inc +++ b/data/maps/NavelRock_Down11/header.inc @@ -5,7 +5,7 @@ NavelRock_Down11: @ 8485AA4 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 425 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Entrance/header.inc b/data/maps/NavelRock_Entrance/header.inc index cc8d2446b3..2a302f904a 100644 --- a/data/maps/NavelRock_Entrance/header.inc +++ b/data/maps/NavelRock_Entrance/header.inc @@ -5,7 +5,7 @@ NavelRock_Entrance: @ 84858AC .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 422 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc index a01250cab9..4122b51cca 100644 --- a/data/maps/NavelRock_Exterior/header.inc +++ b/data/maps/NavelRock_Exterior/header.inc @@ -5,7 +5,7 @@ NavelRock_Exterior: @ 8485874 .4byte 0x0 .2byte MUS_RG_NANASHIMA .2byte 421 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc index a6dab9d207..d6da1a2c94 100644 --- a/data/maps/NavelRock_Fork/header.inc +++ b/data/maps/NavelRock_Fork/header.inc @@ -5,7 +5,7 @@ NavelRock_Fork: @ 84858E4 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 428 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc index c7243f452f..f74ca0cdd4 100644 --- a/data/maps/NavelRock_Harbor/header.inc +++ b/data/maps/NavelRock_Harbor/header.inc @@ -5,7 +5,7 @@ NavelRock_Harbor: @ 8485890 .4byte 0x0 .2byte MUS_RG_NANASHIMA .2byte 405 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/NavelRock_Top/header.inc b/data/maps/NavelRock_Top/header.inc index 4d1535615f..464e1d3ec4 100644 --- a/data/maps/NavelRock_Top/header.inc +++ b/data/maps/NavelRock_Top/header.inc @@ -5,7 +5,7 @@ NavelRock_Top: @ 8485970 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 423 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 11 .byte 4 diff --git a/data/maps/NavelRock_Up1/header.inc b/data/maps/NavelRock_Up1/header.inc index c7484c59f1..ebc18196d3 100644 --- a/data/maps/NavelRock_Up1/header.inc +++ b/data/maps/NavelRock_Up1/header.inc @@ -5,7 +5,7 @@ NavelRock_Up1: @ 8485900 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 425 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Up2/header.inc b/data/maps/NavelRock_Up2/header.inc index 824ef267de..d259d7af2e 100644 --- a/data/maps/NavelRock_Up2/header.inc +++ b/data/maps/NavelRock_Up2/header.inc @@ -5,7 +5,7 @@ NavelRock_Up2: @ 848591C .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 426 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Up3/header.inc b/data/maps/NavelRock_Up3/header.inc index 7782ca0f4d..12cc5aed76 100644 --- a/data/maps/NavelRock_Up3/header.inc +++ b/data/maps/NavelRock_Up3/header.inc @@ -5,7 +5,7 @@ NavelRock_Up3: @ 8485938 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 425 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Up4/header.inc b/data/maps/NavelRock_Up4/header.inc index c022d9d0bd..6455c85558 100644 --- a/data/maps/NavelRock_Up4/header.inc +++ b/data/maps/NavelRock_Up4/header.inc @@ -5,7 +5,7 @@ NavelRock_Up4: @ 8485954 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 426 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc index 147f003d06..212457f724 100644 --- a/data/maps/NewMauville_Entrance/header.inc +++ b/data/maps/NewMauville_Entrance/header.inc @@ -5,7 +5,7 @@ NewMauville_Entrance: @ 8484470 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 184 - .byte 62 + .byte MAPSEC_NEW_MAUVILLE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc index 3eda8df5ee..637ac378eb 100644 --- a/data/maps/NewMauville_Inside/header.inc +++ b/data/maps/NewMauville_Inside/header.inc @@ -5,7 +5,7 @@ NewMauville_Inside: @ 848448C .4byte 0x0 .2byte MUS_M_DUNGON .2byte 185 - .byte 62 + .byte MAPSEC_NEW_MAUVILLE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc index 3d8ae1db5d..16fb5aca07 100644 --- a/data/maps/OldaleTown/header.inc +++ b/data/maps/OldaleTown/header.inc @@ -5,7 +5,7 @@ OldaleTown: @ 84825D0 .4byte OldaleTown_MapConnections .2byte MUS_MACHI_S4 .2byte 11 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc index 6039540ccd..f593d5769b 100644 --- a/data/maps/OldaleTown_House1/header.inc +++ b/data/maps/OldaleTown_House1/header.inc @@ -5,7 +5,7 @@ OldaleTown_House1: @ 8482B80 .4byte 0x0 .2byte MUS_MACHI_S4 .2byte 59 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc index 75753041fa..f7a265561e 100644 --- a/data/maps/OldaleTown_House2/header.inc +++ b/data/maps/OldaleTown_House2/header.inc @@ -5,7 +5,7 @@ OldaleTown_House2: @ 8482B9C .4byte 0x0 .2byte MUS_MACHI_S4 .2byte 60 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc index 043acab8dd..09fb145c8a 100644 --- a/data/maps/OldaleTown_Mart/header.inc +++ b/data/maps/OldaleTown_Mart/header.inc @@ -5,7 +5,7 @@ OldaleTown_Mart: @ 8482BF0 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc index d51331b612..dd942886a9 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ OldaleTown_PokemonCenter_1F: @ 8482BB8 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc index 9b9df67fde..21e6fc1f9e 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ OldaleTown_PokemonCenter_2F: @ 8482BD4 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc index 3244c01b83..3e4d88784c 100644 --- a/data/maps/PacifidlogTown/header.inc +++ b/data/maps/PacifidlogTown/header.inc @@ -5,7 +5,7 @@ PacifidlogTown: @ 848265C .4byte PacifidlogTown_MapConnections .2byte MUS_MINAMO .2byte 16 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc index b78d36a2ab..95d820a953 100644 --- a/data/maps/PacifidlogTown_House1/header.inc +++ b/data/maps/PacifidlogTown_House1/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_House1: @ 8482F8C .4byte 0x0 .2byte MUS_MINAMO .2byte 77 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc index 571dcd9cec..79c591b4a2 100644 --- a/data/maps/PacifidlogTown_House2/header.inc +++ b/data/maps/PacifidlogTown_House2/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_House2: @ 8482FA8 .4byte 0x0 .2byte MUS_MINAMO .2byte 78 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc index fb60530a6f..5222263f1c 100644 --- a/data/maps/PacifidlogTown_House3/header.inc +++ b/data/maps/PacifidlogTown_House3/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_House3: @ 8482FC4 .4byte 0x0 .2byte MUS_MINAMO .2byte 77 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc index 7beed0a393..3774ccf3e7 100644 --- a/data/maps/PacifidlogTown_House4/header.inc +++ b/data/maps/PacifidlogTown_House4/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_House4: @ 8482FE0 .4byte 0x0 .2byte MUS_MINAMO .2byte 78 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc index 671c7d28e5..b8789b2492 100644 --- a/data/maps/PacifidlogTown_House5/header.inc +++ b/data/maps/PacifidlogTown_House5/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_House5: @ 8482FFC .4byte 0x0 .2byte MUS_MINAMO .2byte 77 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc index d11ea93d21..6fdc148e33 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_PokemonCenter_1F: @ 8482F54 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc index 00724203f5..dc78b95ac6 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_PokemonCenter_2F: @ 8482F70 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index 248c6d2ae6..fab1f946c5 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -5,7 +5,7 @@ PetalburgCity: @ 84824B8 .4byte PetalburgCity_MapConnections .2byte MUS_MACHI_S2 .2byte 1 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc index 739f19b74a..6d3a477bee 100644 --- a/data/maps/PetalburgCity_Gym/header.inc +++ b/data/maps/PetalburgCity_Gym/header.inc @@ -5,7 +5,7 @@ PetalburgCity_Gym: @ 8483034 .4byte 0x0 .2byte MUS_GIM .2byte 79 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc index 6aeb5deefa..7f96551539 100644 --- a/data/maps/PetalburgCity_House1/header.inc +++ b/data/maps/PetalburgCity_House1/header.inc @@ -5,7 +5,7 @@ PetalburgCity_House1: @ 8483050 .4byte 0x0 .2byte MUS_MACHI_S2 .2byte 59 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc index 9595c13721..8471a0f012 100644 --- a/data/maps/PetalburgCity_House2/header.inc +++ b/data/maps/PetalburgCity_House2/header.inc @@ -5,7 +5,7 @@ PetalburgCity_House2: @ 848306C .4byte 0x0 .2byte MUS_MACHI_S2 .2byte 80 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc index 7742f8bfe2..d7b062ba23 100644 --- a/data/maps/PetalburgCity_Mart/header.inc +++ b/data/maps/PetalburgCity_Mart/header.inc @@ -5,7 +5,7 @@ PetalburgCity_Mart: @ 84830C0 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc index af57b7bab2..6dc976d05a 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ PetalburgCity_PokemonCenter_1F: @ 8483088 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc index 1528ab6244..46f83636fd 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ PetalburgCity_PokemonCenter_2F: @ 84830A4 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc index 4e207706d4..b6a064a8eb 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -5,7 +5,7 @@ PetalburgCity_WallysHouse: @ 8483018 .4byte 0x0 .2byte MUS_MACHI_S2 .2byte 60 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc index 096f4a7040..b7f1ad8184 100644 --- a/data/maps/PetalburgWoods/header.inc +++ b/data/maps/PetalburgWoods/header.inc @@ -5,7 +5,7 @@ PetalburgWoods: @ 8483FF4 .4byte 0x0 .2byte MUS_DAN01 .2byte 135 - .byte 59 + .byte MAPSEC_PETALBURG_WOODS .byte 0 .byte 11 .byte 3 diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc index 7235504fae..aa3a7dd199 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -5,7 +5,7 @@ RecordCorner: @ 8484D68 .4byte 0x0 .2byte MUS_RAINBOW .2byte 223 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc index ef027d1c68..34a1ef7642 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -5,7 +5,7 @@ Route101: @ 8482678 .4byte Route101_MapConnections .2byte MUS_DOORO1 .2byte 17 - .byte 16 + .byte MAPSEC_ROUTE_101 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index 22da93b7a3..8a3b38d627 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -5,7 +5,7 @@ Route102: @ 8482694 .4byte Route102_MapConnections .2byte MUS_DOORO1 .2byte 18 - .byte 17 + .byte MAPSEC_ROUTE_102 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc index 1a8825bc1d..e59af7c13d 100644 --- a/data/maps/Route103/header.inc +++ b/data/maps/Route103/header.inc @@ -5,7 +5,7 @@ Route103: @ 84826B0 .4byte Route103_MapConnections .2byte MUS_DOORO1 .2byte 19 - .byte 18 + .byte MAPSEC_ROUTE_103 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc index f431118c15..4d600499c0 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -5,7 +5,7 @@ Route104: @ 84826CC .4byte Route104_MapConnections .2byte MUS_NEXTROAD .2byte 20 - .byte 19 + .byte MAPSEC_ROUTE_104 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc index c6335b13ff..14b8c18010 100644 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ b/data/maps/Route104_MrBrineysHouse/header.inc @@ -5,7 +5,7 @@ Route104_MrBrineysHouse: @ 8483D70 .4byte 0x0 .2byte MUS_MACHI_S2 .2byte 102 - .byte 19 + .byte MAPSEC_ROUTE_104 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc index e23012fb48..b951291581 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc @@ -5,7 +5,7 @@ Route104_PrettyPetalFlowerShop: @ 8483D8C .4byte 0x0 .2byte MUS_MACHI_S2 .2byte 117 - .byte 19 + .byte MAPSEC_ROUTE_104 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc index 50f1b7b089..6c60ccfbe0 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -5,7 +5,7 @@ Route104_Prototype: @ 8485AF8 .4byte 0x0 .2byte MUS_NEXTROAD .2byte 287 - .byte 19 + .byte MAPSEC_ROUTE_104 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc index 61217a576f..24cc091e90 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc @@ -5,7 +5,7 @@ Route104_PrototypePrettyPetalFlowerShop: @ 8485B14 .4byte 0x0 .2byte MUS_NEXTROAD .2byte 117 - .byte 19 + .byte MAPSEC_ROUTE_104 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc index f7538b7237..3b34c3e70a 100644 --- a/data/maps/Route105/header.inc +++ b/data/maps/Route105/header.inc @@ -5,7 +5,7 @@ Route105: @ 84826E8 .4byte Route105_MapConnections .2byte MUS_NEXTROAD .2byte 21 - .byte 20 + .byte MAPSEC_ROUTE_105 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index 93f4bd8354..51dfac9e3a 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -5,7 +5,7 @@ Route106: @ 8482704 .4byte Route106_MapConnections .2byte MUS_NEXTROAD .2byte 22 - .byte 21 + .byte MAPSEC_ROUTE_106 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc index a27885664a..2c61323b5b 100644 --- a/data/maps/Route107/header.inc +++ b/data/maps/Route107/header.inc @@ -5,7 +5,7 @@ Route107: @ 8482720 .4byte Route107_MapConnections .2byte MUS_NEXTROAD .2byte 23 - .byte 22 + .byte MAPSEC_ROUTE_107 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index 2c4cea90db..eb982f2dec 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -5,7 +5,7 @@ Route108: @ 848273C .4byte Route108_MapConnections .2byte MUS_NEXTROAD .2byte 24 - .byte 23 + .byte MAPSEC_ROUTE_108 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc index c9482cf31c..b4e5776789 100644 --- a/data/maps/Route109/header.inc +++ b/data/maps/Route109/header.inc @@ -5,7 +5,7 @@ Route109: @ 8482758 .4byte Route109_MapConnections .2byte MUS_NEXTROAD .2byte 25 - .byte 24 + .byte MAPSEC_ROUTE_109 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc index cec1ace276..68ae187baa 100644 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ b/data/maps/Route109_SeashoreHouse/header.inc @@ -5,7 +5,7 @@ Route109_SeashoreHouse: @ 8485B30 .4byte 0x0 .2byte MUS_HIGHTOWN .2byte 243 - .byte 24 + .byte MAPSEC_ROUTE_109 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc index d6d394209a..55bd7dbd02 100644 --- a/data/maps/Route110/header.inc +++ b/data/maps/Route110/header.inc @@ -5,7 +5,7 @@ Route110: @ 8482774 .4byte Route110_MapConnections .2byte MUS_DOORO_X1 .2byte 26 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc index 35a466e1e2..a271dba584 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc @@ -5,7 +5,7 @@ Route110_SeasideCyclingRoadNorthEntrance: @ 8485C80 .4byte 0x0 .2byte MUS_FINECITY .2byte 256 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc index 2529d7366b..811184bd9a 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc @@ -5,7 +5,7 @@ Route110_SeasideCyclingRoadSouthEntrance: @ 8485C9C .4byte 0x0 .2byte MUS_FINECITY .2byte 256 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc index 99a4a694a2..07a795f3ae 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ b/data/maps/Route110_TrickHouseCorridor/header.inc @@ -5,7 +5,7 @@ Route110_TrickHouseCorridor: @ 8485B84 .4byte 0x0 .2byte MUS_KARAKURI .2byte 246 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc index 0b38de121b..0ed34b2d17 100644 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ b/data/maps/Route110_TrickHouseEnd/header.inc @@ -5,7 +5,7 @@ Route110_TrickHouseEnd: @ 8485B68 .4byte 0x0 .2byte MUS_KARAKURI .2byte 245 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc index 842b2f32d2..5a90430fd2 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ b/data/maps/Route110_TrickHouseEntrance/header.inc @@ -5,7 +5,7 @@ Route110_TrickHouseEntrance: @ 8485B4C .4byte 0x0 .2byte MUS_KARAKURI .2byte 244 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc index ef53883649..c5620a2ce3 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ b/data/maps/Route110_TrickHousePuzzle1/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle1: @ 8485BA0 .4byte 0x0 .2byte MUS_KARAKURI .2byte 247 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc index d54eb77525..202a75774d 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ b/data/maps/Route110_TrickHousePuzzle2/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle2: @ 8485BBC .4byte 0x0 .2byte MUS_KARAKURI .2byte 248 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc index 3bcf40de18..2ad32f43f5 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ b/data/maps/Route110_TrickHousePuzzle3/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle3: @ 8485BD8 .4byte 0x0 .2byte MUS_KARAKURI .2byte 249 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc index 85df95a1ae..40b394a276 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ b/data/maps/Route110_TrickHousePuzzle4/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle4: @ 8485BF4 .4byte 0x0 .2byte MUS_KARAKURI .2byte 250 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc index 2402f4cc53..9bb6f40b93 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ b/data/maps/Route110_TrickHousePuzzle5/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle5: @ 8485C10 .4byte 0x0 .2byte MUS_KARAKURI .2byte 251 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc index 946ad91f4e..fa3bc610ac 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ b/data/maps/Route110_TrickHousePuzzle6/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle6: @ 8485C2C .4byte 0x0 .2byte MUS_KARAKURI .2byte 252 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc index 5de9d64001..8a9f6e6cd9 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ b/data/maps/Route110_TrickHousePuzzle7/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle7: @ 8485C48 .4byte 0x0 .2byte MUS_KARAKURI .2byte 253 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc index 750270dea9..8023f4478e 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ b/data/maps/Route110_TrickHousePuzzle8/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle8: @ 8485C64 .4byte 0x0 .2byte MUS_KARAKURI .2byte 254 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc index 89feae870e..a65a8c849c 100644 --- a/data/maps/Route111/header.inc +++ b/data/maps/Route111/header.inc @@ -5,7 +5,7 @@ Route111: @ 8482790 .4byte Route111_MapConnections .2byte MUS_DOORO_X1 .2byte 27 - .byte 26 + .byte MAPSEC_ROUTE_111 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc index c2c055af62..2f827017f2 100644 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ b/data/maps/Route111_OldLadysRestStop/header.inc @@ -5,7 +5,7 @@ Route111_OldLadysRestStop: @ 8483DC4 .4byte 0x0 .2byte MUS_GOTOWN .2byte 64 - .byte 26 + .byte MAPSEC_ROUTE_111 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc index 4cf6ca0232..909277b85c 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -5,7 +5,7 @@ Route111_WinstrateFamilysHouse: @ 8483DA8 .4byte 0x0 .2byte MUS_GOTOWN .2byte 60 - .byte 26 + .byte MAPSEC_ROUTE_111 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc index 397c0060a1..24589a71e3 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -5,7 +5,7 @@ Route112: @ 84827AC .4byte Route112_MapConnections .2byte MUS_DOORO_X1 .2byte 28 - .byte 27 + .byte MAPSEC_ROUTE_112 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc index 72667053d4..dff57293ea 100644 --- a/data/maps/Route112_CableCarStation/header.inc +++ b/data/maps/Route112_CableCarStation/header.inc @@ -5,7 +5,7 @@ Route112_CableCarStation: @ 8483DE0 .4byte 0x0 .2byte MUS_DOORO_X1 .2byte 118 - .byte 27 + .byte MAPSEC_ROUTE_112 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc index 87d56215e2..3ed0f54553 100644 --- a/data/maps/Route113/header.inc +++ b/data/maps/Route113/header.inc @@ -5,7 +5,7 @@ Route113: @ 84827C8 .4byte Route113_MapConnections .2byte MUS_KAZANBAI .2byte 29 - .byte 28 + .byte MAPSEC_ROUTE_113 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc index e9424580ad..5298c41c2b 100644 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ b/data/maps/Route113_GlassWorkshop/header.inc @@ -5,7 +5,7 @@ Route113_GlassWorkshop: @ 8485CB8 .4byte 0x0 .2byte MUS_GOTOWN .2byte 67 - .byte 28 + .byte MAPSEC_ROUTE_113 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc index cda0036b36..d717c1235a 100644 --- a/data/maps/Route114/header.inc +++ b/data/maps/Route114/header.inc @@ -5,7 +5,7 @@ Route114: @ 84827E4 .4byte Route114_MapConnections .2byte MUS_DOORO_X1 .2byte 30 - .byte 29 + .byte MAPSEC_ROUTE_114 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc index efe6a1b767..01ac3e4dd3 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ b/data/maps/Route114_FossilManiacsHouse/header.inc @@ -5,7 +5,7 @@ Route114_FossilManiacsHouse: @ 8483E18 .4byte 0x0 .2byte MUS_TONEKUSA .2byte 119 - .byte 29 + .byte MAPSEC_ROUTE_114 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc index c20e1b2d36..b3794190b7 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ b/data/maps/Route114_FossilManiacsTunnel/header.inc @@ -5,7 +5,7 @@ Route114_FossilManiacsTunnel: @ 8483E34 .4byte 0x0 .2byte MUS_TONEKUSA .2byte 120 - .byte 29 + .byte MAPSEC_ROUTE_114 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc index 9a57633941..031ae74b6a 100644 --- a/data/maps/Route114_LanettesHouse/header.inc +++ b/data/maps/Route114_LanettesHouse/header.inc @@ -5,7 +5,7 @@ Route114_LanettesHouse: @ 8483E50 .4byte 0x0 .2byte MUS_TONEKUSA .2byte 121 - .byte 29 + .byte MAPSEC_ROUTE_114 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc index 97156442e4..56cbab0124 100644 --- a/data/maps/Route115/header.inc +++ b/data/maps/Route115/header.inc @@ -5,7 +5,7 @@ Route115: @ 8482800 .4byte Route115_MapConnections .2byte MUS_NEXTROAD .2byte 31 - .byte 30 + .byte MAPSEC_ROUTE_115 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc index 919dffa6f5..8fef8f257f 100644 --- a/data/maps/Route116/header.inc +++ b/data/maps/Route116/header.inc @@ -5,7 +5,7 @@ Route116: @ 848281C .4byte Route116_MapConnections .2byte MUS_NEXTROAD .2byte 32 - .byte 31 + .byte MAPSEC_ROUTE_116 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc index ac319327f5..8dad76407a 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ b/data/maps/Route116_TunnelersRestHouse/header.inc @@ -5,7 +5,7 @@ Route116_TunnelersRestHouse: @ 8483E6C .4byte 0x0 .2byte MUS_GOTOWN .2byte 122 - .byte 31 + .byte MAPSEC_ROUTE_116 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index 897d37afb0..02804667c5 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 diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc index f690fa432b..ea69af862d 100644 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ b/data/maps/Route117_PokemonDayCare/header.inc @@ -5,7 +5,7 @@ Route117_PokemonDayCare: @ 8483E88 .4byte 0x0 .2byte MUS_GOTOWN .2byte 123 - .byte 32 + .byte MAPSEC_ROUTE_117 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc index 3bf779b278..ad90e8f553 100644 --- a/data/maps/Route118/header.inc +++ b/data/maps/Route118/header.inc @@ -5,7 +5,7 @@ Route118: @ 8482854 .4byte Route118_MapConnections .2byte MUS_ROUTE_118 .2byte 34 - .byte 33 + .byte MAPSEC_ROUTE_118 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc index cb61c3a38d..af32f0bde1 100644 --- a/data/maps/Route119/header.inc +++ b/data/maps/Route119/header.inc @@ -5,7 +5,7 @@ Route119: @ 8482870 .4byte Route119_MapConnections .2byte MUS_GRANROAD .2byte 35 - .byte 34 + .byte MAPSEC_ROUTE_119 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc index 754b0c2456..8f966eaf4f 100644 --- a/data/maps/Route119_House/header.inc +++ b/data/maps/Route119_House/header.inc @@ -5,7 +5,7 @@ Route119_House: @ 8485D28 .4byte 0x0 .2byte MUS_GOTOWN .2byte 59 - .byte 34 + .byte MAPSEC_ROUTE_119 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc index fac499e3ff..7d324311ee 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ b/data/maps/Route119_WeatherInstitute_1F/header.inc @@ -5,7 +5,7 @@ Route119_WeatherInstitute_1F: @ 8485CF0 .4byte 0x0 .2byte MUS_GOTOWN .2byte 271 - .byte 34 + .byte MAPSEC_ROUTE_119 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc index 69a3510828..d2a09b1b71 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ b/data/maps/Route119_WeatherInstitute_2F/header.inc @@ -5,7 +5,7 @@ Route119_WeatherInstitute_2F: @ 8485D0C .4byte 0x0 .2byte MUS_GOTOWN .2byte 272 - .byte 34 + .byte MAPSEC_ROUTE_119 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc index 9b8d641d9d..1fa502a2ba 100644 --- a/data/maps/Route120/header.inc +++ b/data/maps/Route120/header.inc @@ -5,7 +5,7 @@ Route120: @ 848288C .4byte Route120_MapConnections .2byte MUS_DOORO_X3 .2byte 36 - .byte 35 + .byte MAPSEC_ROUTE_120 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc index 4a05c76fed..588540fd44 100644 --- a/data/maps/Route121/header.inc +++ b/data/maps/Route121/header.inc @@ -5,7 +5,7 @@ Route121: @ 84828A8 .4byte Route121_MapConnections .2byte MUS_DOORO_X3 .2byte 37 - .byte 36 + .byte MAPSEC_ROUTE_121 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc index 56a07a3fa5..9bb2b86fc0 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ b/data/maps/Route121_SafariZoneEntrance/header.inc @@ -5,7 +5,7 @@ Route121_SafariZoneEntrance: @ 8483EA4 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 124 - .byte 36 + .byte MAPSEC_ROUTE_121 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc index 591501de1a..d5bbaccf4c 100644 --- a/data/maps/Route122/header.inc +++ b/data/maps/Route122/header.inc @@ -5,7 +5,7 @@ Route122: @ 84828C4 .4byte Route122_MapConnections .2byte MUS_DOORO_X4 .2byte 38 - .byte 37 + .byte MAPSEC_ROUTE_122 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc index 7d7a4590fa..e3fa357ddc 100644 --- a/data/maps/Route123/header.inc +++ b/data/maps/Route123/header.inc @@ -5,7 +5,7 @@ Route123: @ 84828E0 .4byte Route123_MapConnections .2byte MUS_DOORO_X4 .2byte 39 - .byte 38 + .byte MAPSEC_ROUTE_123 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc index f1466f9e78..89b03ed880 100644 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -5,7 +5,7 @@ Route123_BerryMastersHouse: @ 8485CD4 .4byte 0x0 .2byte MUS_GOTOWN .2byte 60 - .byte 38 + .byte MAPSEC_ROUTE_123 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index 811fb3ec7d..2ad541e817 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -5,7 +5,7 @@ Route124: @ 84828FC .4byte Route124_MapConnections .2byte MUS_DOORO_X3 .2byte 40 - .byte 39 + .byte MAPSEC_ROUTE_124 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc index a7501cddca..d68c93985d 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc @@ -5,7 +5,7 @@ Route124_DivingTreasureHuntersHouse: @ 8485D44 .4byte 0x0 .2byte MUS_MINAMO .2byte 301 - .byte 39 + .byte MAPSEC_ROUTE_124 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc index 4e67b3cb64..30691d2705 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -5,7 +5,7 @@ Route125: @ 8482918 .4byte Route125_MapConnections .2byte MUS_DOORO_X3 .2byte 41 - .byte 40 + .byte MAPSEC_ROUTE_125 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc index 13e741159b..c00086a0ba 100644 --- a/data/maps/Route126/header.inc +++ b/data/maps/Route126/header.inc @@ -5,7 +5,7 @@ Route126: @ 8482934 .4byte Route126_MapConnections .2byte MUS_DOORO_X3 .2byte 42 - .byte 41 + .byte MAPSEC_ROUTE_126 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc index fa3ee02001..c242fe898e 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -5,7 +5,7 @@ Route127: @ 8482950 .4byte Route127_MapConnections .2byte MUS_DOORO_X3 .2byte 43 - .byte 42 + .byte MAPSEC_ROUTE_127 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index 08acd71f2b..6ced2f3206 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -5,7 +5,7 @@ Route128: @ 848296C .4byte Route128_MapConnections .2byte MUS_DOORO_X3 .2byte 44 - .byte 43 + .byte MAPSEC_ROUTE_128 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc index 53abdbebe0..4128e5dece 100644 --- a/data/maps/Route129/header.inc +++ b/data/maps/Route129/header.inc @@ -5,7 +5,7 @@ Route129: @ 8482988 .4byte Route129_MapConnections .2byte MUS_GRANROAD .2byte 45 - .byte 44 + .byte MAPSEC_ROUTE_129 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc index 47b4b613c6..105e4316ce 100644 --- a/data/maps/Route130/header.inc +++ b/data/maps/Route130/header.inc @@ -5,7 +5,7 @@ Route130: @ 84829A4 .4byte Route130_MapConnections .2byte MUS_GRANROAD .2byte 263 - .byte 45 + .byte MAPSEC_ROUTE_130 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc index b13a344fcd..0151fefded 100644 --- a/data/maps/Route131/header.inc +++ b/data/maps/Route131/header.inc @@ -5,7 +5,7 @@ Route131: @ 84829C0 .4byte Route131_MapConnections .2byte MUS_GRANROAD .2byte 47 - .byte 46 + .byte MAPSEC_ROUTE_131 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc index b4fe2bc0d6..77392dae8a 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -5,7 +5,7 @@ Route132: @ 84829DC .4byte Route132_MapConnections .2byte MUS_GRANROAD .2byte 48 - .byte 47 + .byte MAPSEC_ROUTE_132 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index e8bc66e6fb..0233c4b1b7 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -5,7 +5,7 @@ Route133: @ 84829F8 .4byte Route133_MapConnections .2byte MUS_GRANROAD .2byte 49 - .byte 48 + .byte MAPSEC_ROUTE_133 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index 20f6dd90a6..b4bc18251e 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -5,7 +5,7 @@ Route134: @ 8482A14 .4byte Route134_MapConnections .2byte MUS_GRANROAD .2byte 50 - .byte 49 + .byte MAPSEC_ROUTE_134 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc index adce7ef75b..f26674d87c 100644 --- a/data/maps/RustboroCity/header.inc +++ b/data/maps/RustboroCity/header.inc @@ -5,7 +5,7 @@ RustboroCity: @ 848250C .4byte RustboroCity_MapConnections .2byte MUS_GOTOWN .2byte 4 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc index 5423772bfc..b1e738b798 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ b/data/maps/RustboroCity_CuttersHouse/header.inc @@ -5,7 +5,7 @@ RustboroCity_CuttersHouse: @ 8483478 .4byte 0x0 .2byte MUS_GOTOWN .2byte 98 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc index 9e270b9fc0..56dc269943 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc @@ -5,7 +5,7 @@ RustboroCity_DevonCorp_1F: @ 8483344 .4byte 0x0 .2byte MUS_GOTOWN .2byte 92 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc index f3954aed09..65046644fe 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -5,7 +5,7 @@ RustboroCity_DevonCorp_2F: @ 8483360 .4byte 0x0 .2byte MUS_GOTOWN .2byte 93 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc index c0bbdebd12..7a5968b182 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -5,7 +5,7 @@ RustboroCity_DevonCorp_3F: @ 848337C .4byte 0x0 .2byte MUS_GOTOWN .2byte 269 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc index 4f424b8535..e9754f54f9 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ b/data/maps/RustboroCity_Flat1_1F/header.inc @@ -5,7 +5,7 @@ RustboroCity_Flat1_1F: @ 8483424 .4byte 0x0 .2byte MUS_GOTOWN .2byte 313 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc index 49e5c14818..a07f7fba92 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ b/data/maps/RustboroCity_Flat1_2F/header.inc @@ -5,7 +5,7 @@ RustboroCity_Flat1_2F: @ 8483440 .4byte 0x0 .2byte MUS_GOTOWN .2byte 314 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc index 4080980a08..66e8b9e0e6 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ b/data/maps/RustboroCity_Flat2_1F/header.inc @@ -5,7 +5,7 @@ RustboroCity_Flat2_1F: @ 84834B0 .4byte 0x0 .2byte MUS_GOTOWN .2byte 294 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc index d4ad99dbc9..8a7884e58a 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ b/data/maps/RustboroCity_Flat2_2F/header.inc @@ -5,7 +5,7 @@ RustboroCity_Flat2_2F: @ 84834CC .4byte 0x0 .2byte MUS_GOTOWN .2byte 295 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc index 90918421fe..70e622e46a 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ b/data/maps/RustboroCity_Flat2_3F/header.inc @@ -5,7 +5,7 @@ RustboroCity_Flat2_3F: @ 84834E8 .4byte 0x0 .2byte MUS_GOTOWN .2byte 296 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc index 8aef6fe283..f5297aaa26 100644 --- a/data/maps/RustboroCity_Gym/header.inc +++ b/data/maps/RustboroCity_Gym/header.inc @@ -5,7 +5,7 @@ RustboroCity_Gym: @ 8483398 .4byte 0x0 .2byte MUS_GIM .2byte 94 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc index c921d3a5ea..e668e63272 100644 --- a/data/maps/RustboroCity_House1/header.inc +++ b/data/maps/RustboroCity_House1/header.inc @@ -5,7 +5,7 @@ RustboroCity_House1: @ 848345C .4byte 0x0 .2byte MUS_GOTOWN .2byte 97 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc index 6f4d6c02db..bd075650ed 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -5,7 +5,7 @@ RustboroCity_House2: @ 8483494 .4byte 0x0 .2byte MUS_GOTOWN .2byte 96 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc index 73b5d4a0b3..f03668a60a 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -5,7 +5,7 @@ RustboroCity_House3: @ 8483504 .4byte 0x0 .2byte MUS_GOTOWN .2byte 96 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc index cb82a65003..58a9f6075e 100644 --- a/data/maps/RustboroCity_Mart/header.inc +++ b/data/maps/RustboroCity_Mart/header.inc @@ -5,7 +5,7 @@ RustboroCity_Mart: @ 8483408 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc index 3db96f00d7..f482ba0448 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ RustboroCity_PokemonCenter_1F: @ 84833D0 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index 74f2647024..48e731a3ed 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 diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index 3d68afc480..6948dc3662 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ b/data/maps/RustboroCity_PokemonSchool/header.inc @@ -5,7 +5,7 @@ RustboroCity_PokemonSchool: @ 84833B4 .4byte 0x0 .2byte MUS_P_SCHOOL .2byte 95 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc index d4f1fdad57..998208e806 100644 --- a/data/maps/RusturfTunnel/header.inc +++ b/data/maps/RusturfTunnel/header.inc @@ -5,7 +5,7 @@ RusturfTunnel: @ 8483F30 .4byte 0x0 .2byte MUS_DAN01 .2byte 129 - .byte 60 + .byte MAPSEC_RUSTURF_TUNNEL .byte 0 .byte 6 .byte 4 diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc index 046eedc85d..a33e236dd9 100644 --- a/data/maps/SSTidalCorridor/header.inc +++ b/data/maps/SSTidalCorridor/header.inc @@ -5,7 +5,7 @@ SSTidalCorridor: @ 8484F0C .4byte 0x0 .2byte MUS_M_BOAT .2byte 277 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc index 3e2f5bacb5..2c627ad0b7 100644 --- a/data/maps/SSTidalLowerDeck/header.inc +++ b/data/maps/SSTidalLowerDeck/header.inc @@ -5,7 +5,7 @@ SSTidalLowerDeck: @ 8484F28 .4byte 0x0 .2byte MUS_M_BOAT .2byte 278 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc index c5f0aaa005..935427cae7 100644 --- a/data/maps/SSTidalRooms/header.inc +++ b/data/maps/SSTidalRooms/header.inc @@ -5,7 +5,7 @@ SSTidalRooms: @ 8484F44 .4byte 0x0 .2byte MUS_M_BOAT .2byte 279 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc index d7ad06ffaf..5452be556d 100644 --- a/data/maps/SafariZone_North/header.inc +++ b/data/maps/SafariZone_North/header.inc @@ -5,7 +5,7 @@ SafariZone_North: @ 8485158 .4byte SafariZone_North_MapConnections .2byte MUS_SAFARI .2byte 239 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc index 58685eafe7..9e8be13523 100644 --- a/data/maps/SafariZone_Northeast/header.inc +++ b/data/maps/SafariZone_Northeast/header.inc @@ -5,7 +5,7 @@ SafariZone_Northeast: @ 848528C .4byte SafariZone_Northeast_MapConnections .2byte MUS_SAFARI .2byte 394 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc index 81718dc650..b3c98ee11c 100644 --- a/data/maps/SafariZone_Northwest/header.inc +++ b/data/maps/SafariZone_Northwest/header.inc @@ -5,7 +5,7 @@ SafariZone_Northwest: @ 848513C .4byte SafariZone_Northwest_MapConnections .2byte MUS_SAFARI .2byte 238 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc index 92488b12d4..b56865835b 100644 --- a/data/maps/SafariZone_RestHouse/header.inc +++ b/data/maps/SafariZone_RestHouse/header.inc @@ -5,7 +5,7 @@ SafariZone_RestHouse: @ 8485270 .4byte 0x0 .2byte MUS_SAFARI .2byte 329 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SafariZone_South/header.inc b/data/maps/SafariZone_South/header.inc index 3ffd068c22..9780b80d9d 100644 --- a/data/maps/SafariZone_South/header.inc +++ b/data/maps/SafariZone_South/header.inc @@ -5,7 +5,7 @@ SafariZone_South: @ 8485190 .4byte SafariZone_South_MapConnections .2byte MUS_SAFARI .2byte 241 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc index 438d3ea7f7..17d73acf80 100644 --- a/data/maps/SafariZone_Southeast/header.inc +++ b/data/maps/SafariZone_Southeast/header.inc @@ -5,7 +5,7 @@ SafariZone_Southeast: @ 84852A8 .4byte SafariZone_Southeast_MapConnections .2byte MUS_SAFARI .2byte 395 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc index 5cff316ae5..5c82a2c3ad 100644 --- a/data/maps/SafariZone_Southwest/header.inc +++ b/data/maps/SafariZone_Southwest/header.inc @@ -5,7 +5,7 @@ SafariZone_Southwest: @ 8485174 .4byte SafariZone_Southwest_MapConnections .2byte MUS_SAFARI .2byte 240 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 .byte 0 .byte 3 diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc index 543f83ebb3..23aab68fe8 100644 --- a/data/maps/ScorchedSlab/header.inc +++ b/data/maps/ScorchedSlab/header.inc @@ -5,7 +5,7 @@ ScorchedSlab: @ 84846BC .4byte 0x0 .2byte MUS_DAN01 .2byte 311 - .byte 80 + .byte MAPSEC_SCORCHED_SLAB .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc index 3e26232dca..32e0cbb755 100644 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ b/data/maps/SeafloorCavern_Entrance/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Entrance: @ 84841B4 .4byte 0x0 .2byte MUS_TOZAN .2byte 147 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc index 29a75081f3..4dd67bdb34 100644 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ b/data/maps/SeafloorCavern_Room1/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room1: @ 84841D0 .4byte 0x0 .2byte MUS_TOZAN .2byte 148 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc index 749b4b9eee..bec8fc16ab 100644 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ b/data/maps/SeafloorCavern_Room2/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room2: @ 84841EC .4byte 0x0 .2byte MUS_TOZAN .2byte 149 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc index 4ef0565be6..3e6b0f5c85 100644 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ b/data/maps/SeafloorCavern_Room3/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room3: @ 8484208 .4byte 0x0 .2byte MUS_TOZAN .2byte 150 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc index 0edd39d4af..a45bb4f6ae 100644 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ b/data/maps/SeafloorCavern_Room4/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room4: @ 8484224 .4byte 0x0 .2byte MUS_TOZAN .2byte 151 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc index 013f447dc8..831c853943 100644 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ b/data/maps/SeafloorCavern_Room5/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room5: @ 8484240 .4byte 0x0 .2byte MUS_TOZAN .2byte 152 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc index 9bbb14463d..5e39909fc1 100644 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ b/data/maps/SeafloorCavern_Room6/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room6: @ 848425C .4byte 0x0 .2byte MUS_TOZAN .2byte 153 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc index d4b0db2674..fa9e728044 100644 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ b/data/maps/SeafloorCavern_Room7/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room7: @ 8484278 .4byte 0x0 .2byte MUS_TOZAN .2byte 154 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc index 903e25a149..8248b89f7c 100644 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ b/data/maps/SeafloorCavern_Room8/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room8: @ 8484294 .4byte 0x0 .2byte MUS_TOZAN .2byte 155 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc index 0d43deb236..2fb1a3b705 100644 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ b/data/maps/SeafloorCavern_Room9/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room9: @ 84842B0 .4byte 0x0 .2byte MUS_TOZAN .2byte 156 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 6 .byte 4 diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc index 4a26587bc8..5e2b0c3632 100644 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ b/data/maps/SealedChamber_InnerRoom/header.inc @@ -5,7 +5,7 @@ SealedChamber_InnerRoom: @ 84846A0 .4byte 0x0 .2byte MUS_MABOROSI .2byte 304 - .byte 78 + .byte MAPSEC_SEALED_CHAMBER .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc index fd5fe39f32..1fabd6be1d 100644 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ b/data/maps/SealedChamber_OuterRoom/header.inc @@ -5,7 +5,7 @@ SealedChamber_OuterRoom: @ 8484684 .4byte 0x0 .2byte MUS_MABOROSI .2byte 284 - .byte 78 + .byte MAPSEC_SEALED_CHAMBER .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc index 4e987702cb..4783af7a71 100644 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ b/data/maps/SecretBase_BlueCave1/header.inc @@ -5,7 +5,7 @@ SecretBase_BlueCave1: @ 8484AC8 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 199 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc index ed22bbb044..208a27ae85 100644 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ b/data/maps/SecretBase_BlueCave2/header.inc @@ -5,7 +5,7 @@ SecretBase_BlueCave2: @ 8484B70 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 205 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc index 412d1f4afc..0bdfe5f0f2 100644 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ b/data/maps/SecretBase_BlueCave3/header.inc @@ -5,7 +5,7 @@ SecretBase_BlueCave3: @ 8484C18 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 211 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc index 542df39545..4902148034 100644 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ b/data/maps/SecretBase_BlueCave4/header.inc @@ -5,7 +5,7 @@ SecretBase_BlueCave4: @ 8484CC0 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 217 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc index aceddbfdac..ad8dc034c7 100644 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ b/data/maps/SecretBase_BrownCave1/header.inc @@ -5,7 +5,7 @@ SecretBase_BrownCave1: @ 8484AAC .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 198 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc index de95374bae..2e10374ec7 100644 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ b/data/maps/SecretBase_BrownCave2/header.inc @@ -5,7 +5,7 @@ SecretBase_BrownCave2: @ 8484B54 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 204 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc index 8535b1e897..2133641666 100644 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ b/data/maps/SecretBase_BrownCave3/header.inc @@ -5,7 +5,7 @@ SecretBase_BrownCave3: @ 8484BFC .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 210 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc index d73f382570..2dc17b4e07 100644 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ b/data/maps/SecretBase_BrownCave4/header.inc @@ -5,7 +5,7 @@ SecretBase_BrownCave4: @ 8484CA4 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 216 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc index 1cb6c4f5ed..70dcb91af6 100644 --- a/data/maps/SecretBase_RedCave1/header.inc +++ b/data/maps/SecretBase_RedCave1/header.inc @@ -5,7 +5,7 @@ SecretBase_RedCave1: @ 8484A90 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 197 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc index 744e8b24e5..23f96fb4e9 100644 --- a/data/maps/SecretBase_RedCave2/header.inc +++ b/data/maps/SecretBase_RedCave2/header.inc @@ -5,7 +5,7 @@ SecretBase_RedCave2: @ 8484B38 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 203 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc index c153e74c66..68e302a717 100644 --- a/data/maps/SecretBase_RedCave3/header.inc +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -5,7 +5,7 @@ SecretBase_RedCave3: @ 8484BE0 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 209 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc index be475a7adb..faf3fd44b7 100644 --- a/data/maps/SecretBase_RedCave4/header.inc +++ b/data/maps/SecretBase_RedCave4/header.inc @@ -5,7 +5,7 @@ SecretBase_RedCave4: @ 8484C88 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 215 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc index 6ab9f9d946..2a98c0dd74 100644 --- a/data/maps/SecretBase_Shrub1/header.inc +++ b/data/maps/SecretBase_Shrub1/header.inc @@ -5,7 +5,7 @@ SecretBase_Shrub1: @ 8484B1C .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 202 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc index 760781e478..b3ccb04462 100644 --- a/data/maps/SecretBase_Shrub2/header.inc +++ b/data/maps/SecretBase_Shrub2/header.inc @@ -5,7 +5,7 @@ SecretBase_Shrub2: @ 8484BC4 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 208 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc index cef2a45976..7e408128e1 100644 --- a/data/maps/SecretBase_Shrub3/header.inc +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -5,7 +5,7 @@ SecretBase_Shrub3: @ 8484C6C .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 214 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index 12fa26c3c1..ea2c263bb6 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 diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index c5b5a2aed0..e3951f3c16 100644 --- a/data/maps/SecretBase_Tree1/header.inc +++ b/data/maps/SecretBase_Tree1/header.inc @@ -5,7 +5,7 @@ SecretBase_Tree1: @ 8484B00 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 201 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc index ddea5c0bce..23e8da9b90 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -5,7 +5,7 @@ SecretBase_Tree2: @ 8484BA8 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 207 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc index 630dbb6e30..61378b8a30 100644 --- a/data/maps/SecretBase_Tree3/header.inc +++ b/data/maps/SecretBase_Tree3/header.inc @@ -5,7 +5,7 @@ SecretBase_Tree3: @ 8484C50 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 213 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc index bc6f846640..b5f601189d 100644 --- a/data/maps/SecretBase_Tree4/header.inc +++ b/data/maps/SecretBase_Tree4/header.inc @@ -5,7 +5,7 @@ SecretBase_Tree4: @ 8484CF8 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 219 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc index 9a6ae54387..1eee3cfed2 100644 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ b/data/maps/SecretBase_YellowCave1/header.inc @@ -5,7 +5,7 @@ SecretBase_YellowCave1: @ 8484AE4 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 200 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc index da1949abe6..27d5a0ecc4 100644 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ b/data/maps/SecretBase_YellowCave2/header.inc @@ -5,7 +5,7 @@ SecretBase_YellowCave2: @ 8484B8C .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 206 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc index 8bfeff0f5d..f2e986b1cf 100644 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ b/data/maps/SecretBase_YellowCave3/header.inc @@ -5,7 +5,7 @@ SecretBase_YellowCave3: @ 8484C34 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 212 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc index baf6b7d896..2926729763 100644 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ b/data/maps/SecretBase_YellowCave4/header.inc @@ -5,7 +5,7 @@ SecretBase_YellowCave4: @ 8484CDC .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 218 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc index 2f3f34b431..3c02b2433e 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_HighTideEntranceRoom: @ 8484438 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 168 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc index 673bc6becd..b58e123353 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_HighTideInnerRoom: @ 8484454 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 169 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc index c742d2b8c4..c34c87a10a 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_LowTideEntranceRoom: @ 84843C8 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 164 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc index 6571068cec..69aa8114e2 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_LowTideIceRoom: @ 84847D4 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 328 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc index b6de02c7d5..9fea56a0fa 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_LowTideInnerRoom: @ 84843E4 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 165 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc index 719a92c3e6..3dc8cae944 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_LowTideLowerRoom: @ 848441C .4byte 0x0 .2byte MUS_M_DUNGON .2byte 167 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc index 74d0ec94fe..5123f9a802 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_LowTideStairsRoom: @ 8484400 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 166 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc index 54d003c275..9100eb6de9 100644 --- a/data/maps/SingleBattleColosseum/header.inc +++ b/data/maps/SingleBattleColosseum/header.inc @@ -5,7 +5,7 @@ SingleBattleColosseum: @ 8484D30 .4byte 0x0 .2byte MUS_RAINBOW .2byte 221 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc index 3a47df4739..7f55c68fb3 100644 --- a/data/maps/SkyPillar_1F/header.inc +++ b/data/maps/SkyPillar_1F/header.inc @@ -5,7 +5,7 @@ SkyPillar_1F: @ 8484764 .4byte 0x0 .2byte MUS_TOZAN .2byte 322 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc index a1cc8fb8f9..2be149c007 100644 --- a/data/maps/SkyPillar_2F/header.inc +++ b/data/maps/SkyPillar_2F/header.inc @@ -5,7 +5,7 @@ SkyPillar_2F: @ 8484780 .4byte 0x0 .2byte MUS_TOZAN .2byte 323 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc index 81ac3046da..e54ede7450 100644 --- a/data/maps/SkyPillar_3F/header.inc +++ b/data/maps/SkyPillar_3F/header.inc @@ -5,7 +5,7 @@ SkyPillar_3F: @ 848479C .4byte 0x0 .2byte MUS_TOZAN .2byte 324 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc index 10a68ddc29..9823646f4f 100644 --- a/data/maps/SkyPillar_4F/header.inc +++ b/data/maps/SkyPillar_4F/header.inc @@ -5,7 +5,7 @@ SkyPillar_4F: @ 84847B8 .4byte 0x0 .2byte MUS_TOZAN .2byte 325 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc index bb38a2d5d2..f721247438 100644 --- a/data/maps/SkyPillar_5F/header.inc +++ b/data/maps/SkyPillar_5F/header.inc @@ -5,7 +5,7 @@ SkyPillar_5F: @ 84847F0 .4byte 0x0 .2byte MUS_TOZAN .2byte 330 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc index 8031521e94..8efd8c5427 100644 --- a/data/maps/SkyPillar_Entrance/header.inc +++ b/data/maps/SkyPillar_Entrance/header.inc @@ -5,7 +5,7 @@ SkyPillar_Entrance: @ 848472C .4byte 0x0 .2byte MUS_TOZAN .2byte 320 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc index 38bb57bae2..24a7a4e2bd 100644 --- a/data/maps/SkyPillar_Outside/header.inc +++ b/data/maps/SkyPillar_Outside/header.inc @@ -5,7 +5,7 @@ SkyPillar_Outside: @ 8484748 .4byte 0x0 .2byte MUS_TOZAN .2byte 321 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc index 3836ab067e..1f99a1cb87 100644 --- a/data/maps/SkyPillar_Top/header.inc +++ b/data/maps/SkyPillar_Top/header.inc @@ -5,7 +5,7 @@ SkyPillar_Top: @ 848480C .4byte 0x0 .2byte MUS_TOZAN .2byte 331 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc index 7ac123723f..e617b0a91a 100644 --- a/data/maps/SlateportCity/header.inc +++ b/data/maps/SlateportCity/header.inc @@ -5,7 +5,7 @@ SlateportCity: @ 84824D4 .4byte SlateportCity_MapConnections .2byte MUS_FINECITY .2byte 2 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc index 4c8c947530..c76e6230b9 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc @@ -5,7 +5,7 @@ SlateportCity_BattleTentBattleRoom: @ 848314C .4byte 0x0 .2byte MUS_B_TOWER .2byte 386 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_BattleTentCorridor/header.inc b/data/maps/SlateportCity_BattleTentCorridor/header.inc index 7ea7cca9e2..ddc1bfcef7 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/header.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/header.inc @@ -5,7 +5,7 @@ SlateportCity_BattleTentCorridor: @ 8483130 .4byte 0x0 .2byte MUS_B_TOWER .2byte 385 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_BattleTentLobby/header.inc b/data/maps/SlateportCity_BattleTentLobby/header.inc index 1a809a5676..767410cbb4 100644 --- a/data/maps/SlateportCity_BattleTentLobby/header.inc +++ b/data/maps/SlateportCity_BattleTentLobby/header.inc @@ -5,7 +5,7 @@ SlateportCity_BattleTentLobby: @ 8483114 .4byte 0x0 .2byte MUS_B_TOWER .2byte 384 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc index 7f214b54c1..8ec8c294bf 100644 --- a/data/maps/SlateportCity_Harbor/header.inc +++ b/data/maps/SlateportCity_Harbor/header.inc @@ -5,7 +5,7 @@ SlateportCity_Harbor: @ 84831D8 .4byte 0x0 .2byte MUS_FINECITY .2byte 88 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc index 4f7bc3f98b..8f221fcc7d 100644 --- a/data/maps/SlateportCity_House1/header.inc +++ b/data/maps/SlateportCity_House1/header.inc @@ -5,7 +5,7 @@ SlateportCity_House1: @ 8483168 .4byte 0x0 .2byte MUS_FINECITY .2byte 80 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc index 12389ed446..bc4fc03cee 100644 --- a/data/maps/SlateportCity_House2/header.inc +++ b/data/maps/SlateportCity_House2/header.inc @@ -5,7 +5,7 @@ SlateportCity_House2: @ 84831F4 .4byte 0x0 .2byte MUS_FINECITY .2byte 60 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc index e13692bba2..569969de31 100644 --- a/data/maps/SlateportCity_Mart/header.inc +++ b/data/maps/SlateportCity_Mart/header.inc @@ -5,7 +5,7 @@ SlateportCity_Mart: @ 8483248 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc index 4b02240750..88c4e349b1 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc @@ -5,7 +5,7 @@ SlateportCity_OceanicMuseum_1F: @ 84831A0 .4byte 0x0 .2byte MUS_FUNE_KAN .2byte 86 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc index 7d4272d09c..e300ced6ae 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc @@ -5,7 +5,7 @@ SlateportCity_OceanicMuseum_2F: @ 84831BC .4byte 0x0 .2byte MUS_FUNE_KAN .2byte 87 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc index 8d1e8cc172..2b3d99694c 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ SlateportCity_PokemonCenter_1F: @ 8483210 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc index 7bf64b6037..6070cab3cc 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ SlateportCity_PokemonCenter_2F: @ 848322C .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc index 87a6c0c5b5..34a3f1916c 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ b/data/maps/SlateportCity_PokemonFanClub/header.inc @@ -5,7 +5,7 @@ SlateportCity_PokemonFanClub: @ 8483184 .4byte 0x0 .2byte MUS_FINECITY .2byte 85 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc index c04b411f1f..d4b8e9aea3 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc @@ -5,7 +5,7 @@ SlateportCity_SternsShipyard_1F: @ 84830DC .4byte 0x0 .2byte MUS_FINECITY .2byte 81 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc index e3b36f4edd..894aabb9a0 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc @@ -5,7 +5,7 @@ SlateportCity_SternsShipyard_2F: @ 84830F8 .4byte 0x0 .2byte MUS_FINECITY .2byte 82 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc index 74469da7c1..0b48dbca0c 100644 --- a/data/maps/SootopolisCity/header.inc +++ b/data/maps/SootopolisCity/header.inc @@ -5,7 +5,7 @@ SootopolisCity: @ 848257C .4byte 0x0 .2byte MUS_RUNECITY .2byte 8 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc index 4200a7ed80..663a64800c 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ b/data/maps/SootopolisCity_Gym_1F/header.inc @@ -5,7 +5,7 @@ SootopolisCity_Gym_1F: @ 8483A28 .4byte 0x0 .2byte MUS_GIM .2byte 109 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc index 6265830e93..11bb3b502a 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ b/data/maps/SootopolisCity_Gym_B1F/header.inc @@ -5,7 +5,7 @@ SootopolisCity_Gym_B1F: @ 8483A44 .4byte 0x0 .2byte MUS_GIM .2byte 110 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc index 2551aedc1f..5eaa8d4705 100644 --- a/data/maps/SootopolisCity_House1/header.inc +++ b/data/maps/SootopolisCity_House1/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House1: @ 8483AB4 .4byte 0x0 .2byte MUS_RUNECITY .2byte 307 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc index 24e7a778aa..36daf5bb26 100644 --- a/data/maps/SootopolisCity_House2/header.inc +++ b/data/maps/SootopolisCity_House2/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House2: @ 8483AD0 .4byte 0x0 .2byte MUS_RUNECITY .2byte 308 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc index 97ae23fb7d..dfe26c5eaa 100644 --- a/data/maps/SootopolisCity_House3/header.inc +++ b/data/maps/SootopolisCity_House3/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House3: @ 8483AEC .4byte 0x0 .2byte MUS_RUNECITY .2byte 309 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc index d394991326..1275ccf91d 100644 --- a/data/maps/SootopolisCity_House4/header.inc +++ b/data/maps/SootopolisCity_House4/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House4: @ 8483B08 .4byte 0x0 .2byte MUS_RUNECITY .2byte 307 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc index d6de286cfa..0d634d549a 100644 --- a/data/maps/SootopolisCity_House5/header.inc +++ b/data/maps/SootopolisCity_House5/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House5: @ 8483B24 .4byte 0x0 .2byte MUS_RUNECITY .2byte 308 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc index 36460f1474..9f151e7375 100644 --- a/data/maps/SootopolisCity_House6/header.inc +++ b/data/maps/SootopolisCity_House6/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House6: @ 8483B40 .4byte 0x0 .2byte MUS_RUNECITY .2byte 309 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc index 383ab24b5f..7dac9a0290 100644 --- a/data/maps/SootopolisCity_House7/header.inc +++ b/data/maps/SootopolisCity_House7/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House7: @ 8483B5C .4byte 0x0 .2byte MUS_RUNECITY .2byte 307 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc index 792b5ae31c..d0fa71556f 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc @@ -5,7 +5,7 @@ SootopolisCity_LotadAndSeedotHouse: @ 8483B78 .4byte 0x0 .2byte MUS_RUNECITY .2byte 297 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc index ac4ae5ea03..f1fc07ae2f 100644 --- a/data/maps/SootopolisCity_Mart/header.inc +++ b/data/maps/SootopolisCity_Mart/header.inc @@ -5,7 +5,7 @@ SootopolisCity_Mart: @ 8483A98 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc index 2e5ea1f847..7828f6bbbd 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc @@ -5,7 +5,7 @@ SootopolisCity_MysteryEventsHouse_1F: @ 8483B94 .4byte 0x0 .2byte MUS_RUNECITY .2byte 439 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc index c3ffec414f..5ebbff88be 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc @@ -5,7 +5,7 @@ SootopolisCity_MysteryEventsHouse_B1F: @ 8483BB0 .4byte 0x0 .2byte MUS_RUNECITY .2byte 440 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc index 83485cbf17..537ab17090 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ SootopolisCity_PokemonCenter_1F: @ 8483A60 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc index ba2bb5c0d0..76493dcfa2 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ SootopolisCity_PokemonCenter_2F: @ 8483A7C .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc index d0d35fea1b..82948348b3 100644 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ b/data/maps/SouthernIsland_Exterior/header.inc @@ -5,7 +5,7 @@ SouthernIsland_Exterior: @ 8485238 .4byte 0x0 .2byte MUS_DAN02 .2byte 290 - .byte 73 + .byte MAPSEC_SOUTHERN_ISLAND .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc index 1a080af1e6..be575d25b8 100644 --- a/data/maps/SouthernIsland_Interior/header.inc +++ b/data/maps/SouthernIsland_Interior/header.inc @@ -5,7 +5,7 @@ SouthernIsland_Interior: @ 8485254 .4byte 0x0 .2byte MUS_DAN02 .2byte 291 - .byte 73 + .byte MAPSEC_SOUTHERN_ISLAND .byte 0 .byte 11 .byte 3 diff --git a/data/maps/TerraCave_End/header.inc b/data/maps/TerraCave_End/header.inc index 900f5930f7..94a871f6a6 100644 --- a/data/maps/TerraCave_End/header.inc +++ b/data/maps/TerraCave_End/header.inc @@ -5,7 +5,7 @@ TerraCave_End: @ 8484A3C .4byte 0x0 .2byte MUS_DAN01 .2byte 409 - .byte 205 + .byte MAPSEC_TERRA_CAVE .byte 0 .byte 6 .byte 4 diff --git a/data/maps/TerraCave_Entrance/header.inc b/data/maps/TerraCave_Entrance/header.inc index 02c5edb917..81c405cdf1 100644 --- a/data/maps/TerraCave_Entrance/header.inc +++ b/data/maps/TerraCave_Entrance/header.inc @@ -5,7 +5,7 @@ TerraCave_Entrance: @ 8484A20 .4byte 0x0 .2byte MUS_DAN01 .2byte 408 - .byte 205 + .byte MAPSEC_TERRA_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 55afa79f33..92d6c14a7d 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 diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc index e5fd3b5760..fba54fabdb 100644 --- a/data/maps/TrainerHill_1F/header.inc +++ b/data/maps/TrainerHill_1F/header.inc @@ -5,7 +5,7 @@ TrainerHill_1F: @ 84857E8 .4byte 0x0 .2byte MUS_B_TOWER .2byte 415 - .byte 212 + .byte MAPSEC_TRAINER_HILL .byte 0 .byte 0 .byte 8 diff --git a/data/maps/TrainerHill_2F/header.inc b/data/maps/TrainerHill_2F/header.inc index 712c99cec0..d47e960ede 100644 --- a/data/maps/TrainerHill_2F/header.inc +++ b/data/maps/TrainerHill_2F/header.inc @@ -5,7 +5,7 @@ TrainerHill_2F: @ 8485804 .4byte 0x0 .2byte MUS_B_TOWER .2byte 416 - .byte 212 + .byte MAPSEC_TRAINER_HILL .byte 0 .byte 0 .byte 8 diff --git a/data/maps/TrainerHill_3F/header.inc b/data/maps/TrainerHill_3F/header.inc index 92bbd40a18..60f981e3db 100644 --- a/data/maps/TrainerHill_3F/header.inc +++ b/data/maps/TrainerHill_3F/header.inc @@ -5,7 +5,7 @@ TrainerHill_3F: @ 8485820 .4byte 0x0 .2byte MUS_B_TOWER .2byte 417 - .byte 212 + .byte MAPSEC_TRAINER_HILL .byte 0 .byte 0 .byte 8 diff --git a/data/maps/TrainerHill_4F/header.inc b/data/maps/TrainerHill_4F/header.inc index 5de7697787..6b7edf22b7 100644 --- a/data/maps/TrainerHill_4F/header.inc +++ b/data/maps/TrainerHill_4F/header.inc @@ -5,7 +5,7 @@ TrainerHill_4F: @ 848583C .4byte 0x0 .2byte MUS_B_TOWER .2byte 418 - .byte 212 + .byte MAPSEC_TRAINER_HILL .byte 0 .byte 0 .byte 8 diff --git a/data/maps/TrainerHill_Elevator/header.inc b/data/maps/TrainerHill_Elevator/header.inc index 13912579de..dd5daa4e25 100644 --- a/data/maps/TrainerHill_Elevator/header.inc +++ b/data/maps/TrainerHill_Elevator/header.inc @@ -5,7 +5,7 @@ TrainerHill_Elevator: @ 8485ADC .4byte 0x0 .2byte MUS_B_TOWER .2byte 266 - .byte 212 + .byte MAPSEC_TRAINER_HILL .byte 0 .byte 0 .byte 8 diff --git a/data/maps/TrainerHill_Entrance/header.inc b/data/maps/TrainerHill_Entrance/header.inc index f37950d989..60422a9407 100644 --- a/data/maps/TrainerHill_Entrance/header.inc +++ b/data/maps/TrainerHill_Entrance/header.inc @@ -5,7 +5,7 @@ TrainerHill_Entrance: @ 84857CC .4byte 0x0 .2byte MUS_B_TOWER .2byte 414 - .byte 212 + .byte MAPSEC_TRAINER_HILL .byte 0 .byte 0 .byte 8 diff --git a/data/maps/TrainerHill_Roof/header.inc b/data/maps/TrainerHill_Roof/header.inc index 3527f447f5..c6c3e626c9 100644 --- a/data/maps/TrainerHill_Roof/header.inc +++ b/data/maps/TrainerHill_Roof/header.inc @@ -5,7 +5,7 @@ TrainerHill_Roof: @ 8485858 .4byte 0x0 .2byte MUS_B_TOWER .2byte 419 - .byte 212 + .byte MAPSEC_TRAINER_HILL .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc index d63ca88157..6d3603bf5a 100644 --- a/data/maps/Underwater1/header.inc +++ b/data/maps/Underwater1/header.inc @@ -5,7 +5,7 @@ Underwater1: @ 8482A30 .4byte Underwater1_MapConnections .2byte MUS_DEEPDEEP .2byte 274 - .byte 50 + .byte MAPSEC_UNDERWATER_124 .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc index a2754c69ec..03230042ba 100644 --- a/data/maps/Underwater2/header.inc +++ b/data/maps/Underwater2/header.inc @@ -5,7 +5,7 @@ Underwater2: @ 8482A4C .4byte Underwater2_MapConnections .2byte MUS_DEEPDEEP .2byte 51 - .byte 51 + .byte MAPSEC_UNDERWATER_125 .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc index 8329304a87..203cf8b3c1 100644 --- a/data/maps/Underwater3/header.inc +++ b/data/maps/Underwater3/header.inc @@ -5,7 +5,7 @@ Underwater3: @ 8482A68 .4byte Underwater3_MapConnections .2byte MUS_DEEPDEEP .2byte 52 - .byte 52 + .byte MAPSEC_UNDERWATER_126 .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc index f4f3e8c4b1..b5de8aa073 100644 --- a/data/maps/Underwater4/header.inc +++ b/data/maps/Underwater4/header.inc @@ -5,7 +5,7 @@ Underwater4: @ 8482A84 .4byte Underwater4_MapConnections .2byte MUS_DEEPDEEP .2byte 53 - .byte 53 + .byte MAPSEC_UNDERWATER_127 .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater5/header.inc b/data/maps/Underwater5/header.inc index 043a6997e6..e6a8463037 100644 --- a/data/maps/Underwater5/header.inc +++ b/data/maps/Underwater5/header.inc @@ -5,7 +5,7 @@ Underwater5: @ 8482AA0 .4byte Underwater5_MapConnections .2byte MUS_DEEPDEEP .2byte 412 - .byte 208 + .byte MAPSEC_UNDERWATER_129 .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater6/header.inc b/data/maps/Underwater6/header.inc index 1be09d6a13..0aadca37db 100644 --- a/data/maps/Underwater6/header.inc +++ b/data/maps/Underwater6/header.inc @@ -5,7 +5,7 @@ Underwater6: @ 8482ABC .4byte Underwater6_MapConnections .2byte MUS_DEEPDEEP .2byte 410 - .byte 206 + .byte MAPSEC_UNDERWATER_TERRA_CAVE .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater7/header.inc b/data/maps/Underwater7/header.inc index 4ededa296d..388c3510fa 100644 --- a/data/maps/Underwater7/header.inc +++ b/data/maps/Underwater7/header.inc @@ -5,7 +5,7 @@ Underwater7: @ 8482AD8 .4byte Underwater7_MapConnections .2byte MUS_DEEPDEEP .2byte 411 - .byte 207 + .byte MAPSEC_UNDERWATER_UNK1 .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater_MarineCave/header.inc b/data/maps/Underwater_MarineCave/header.inc index 54bffb710d..4aca9a7342 100644 --- a/data/maps/Underwater_MarineCave/header.inc +++ b/data/maps/Underwater_MarineCave/header.inc @@ -5,7 +5,7 @@ Underwater_MarineCave: @ 84849CC .4byte 0x0 .2byte MUS_DAN01 .2byte 406 - .byte 204 + .byte MAPSEC_UNDERWATER_MARINE_CAVE .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc index f08f506a17..5715c5e90b 100644 --- a/data/maps/Underwater_Route134/header.inc +++ b/data/maps/Underwater_Route134/header.inc @@ -5,7 +5,7 @@ Underwater_Route134: @ 848464C .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 282 - .byte 79 + .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc index 6415ac7878..b39773d233 100644 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ b/data/maps/Underwater_SeafloorCavern/header.inc @@ -5,7 +5,7 @@ Underwater_SeafloorCavern: @ 8484198 .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 146 - .byte 69 + .byte MAPSEC_UNDERWATER_128 .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc index a72666d125..8ca54e9fbc 100644 --- a/data/maps/Underwater_SealedChamber/header.inc +++ b/data/maps/Underwater_SealedChamber/header.inc @@ -5,7 +5,7 @@ Underwater_SealedChamber: @ 8484668 .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 283 - .byte 79 + .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc index ef9ee1612d..661c4d105a 100644 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ b/data/maps/Underwater_SootopolisCity/header.inc @@ -5,7 +5,7 @@ Underwater_SootopolisCity: @ 8483F4C .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 130 - .byte 54 + .byte MAPSEC_UNDERWATER_SOOTOPOLIS .byte 0 .byte 14 .byte 5 diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc index b79ae81a29..55566ceef0 100644 --- a/data/maps/UnionRoom/header.inc +++ b/data/maps/UnionRoom/header.inc @@ -5,7 +5,7 @@ UnionRoom: @ 8485120 .4byte 0x0 .2byte MUS_RAINBOW .2byte 393 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index 4c8edd31ce..79438a8d40 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -5,7 +5,7 @@ UnknownMap_25_29: @ 8484DBC .4byte 0x0 .2byte MUS_NIBI .2byte 226 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc index 46465019e1..f5a6fde393 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -5,7 +5,7 @@ UnknownMap_25_30: @ 8484DD8 .4byte 0x0 .2byte MUS_NIBI .2byte 227 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc index 13e428cfd3..cf5318be07 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -5,7 +5,7 @@ UnknownMap_25_31: @ 8484DF4 .4byte 0x0 .2byte MUS_NIBI .2byte 228 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc index 8244c38020..538798a4c3 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -5,7 +5,7 @@ UnknownMap_25_32: @ 8484E10 .4byte 0x0 .2byte MUS_NIBI .2byte 229 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc index b4da8dd485..c4d384729f 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -5,7 +5,7 @@ UnknownMap_25_33: @ 8484E2C .4byte 0x0 .2byte MUS_NIBI .2byte 230 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc index bb1ce881cb..3d08bf4bac 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -5,7 +5,7 @@ UnknownMap_25_34: @ 8484E48 .4byte 0x0 .2byte MUS_NIBI .2byte 231 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc index 047ba12ada..aa176dbfdd 100644 --- a/data/maps/VerdanturfTown/header.inc +++ b/data/maps/VerdanturfTown/header.inc @@ -5,7 +5,7 @@ VerdanturfTown: @ 8482640 .4byte VerdanturfTown_MapConnections .2byte MUS_GOMACHI0 .2byte 15 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc index 1eef213015..bcdd211eec 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_BattleTentBattleRoom: @ 8482E90 .4byte 0x0 .2byte MUS_B_TOWER .2byte 387 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc index 9b8f62260f..e704df2f01 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_BattleTentCorridor: @ 8482E74 .4byte 0x0 .2byte MUS_B_TOWER .2byte 385 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_BattleTentLobby/header.inc b/data/maps/VerdanturfTown_BattleTentLobby/header.inc index 4d1e0ca9e4..7c7bc244ce 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/header.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_BattleTentLobby: @ 8482E58 .4byte 0x0 .2byte MUS_B_TOWER .2byte 384 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc index 51f3dadbda..a83a7f2fe2 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_FriendshipRatersHouse: @ 8482F1C .4byte 0x0 .2byte MUS_GOMACHI0 .2byte 60 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc index e6571b7f08..ebc8d20832 100644 --- a/data/maps/VerdanturfTown_House/header.inc +++ b/data/maps/VerdanturfTown_House/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_House: @ 8482F38 .4byte 0x0 .2byte MUS_GOMACHI0 .2byte 59 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc index 6f69b3aac9..90b1e7e0ab 100644 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ b/data/maps/VerdanturfTown_Mart/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_Mart: @ 8482EAC .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc index b6c5177ce3..5a8e1183f5 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_PokemonCenter_1F: @ 8482EC8 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc index ee657d77b2..0de25d4fa9 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_PokemonCenter_2F: @ 8482EE4 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc index cb727234e2..7f9a923ec9 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ b/data/maps/VerdanturfTown_WandasHouse/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_WandasHouse: @ 8482F00 .4byte 0x0 .2byte MUS_GOMACHI0 .2byte 76 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index 35ff7bd3bb..7e13504a51 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -5,7 +5,7 @@ VictoryRoad_1F: @ 8484374 .4byte 0x0 .2byte MUS_C_ROAD .2byte 163 - .byte 70 + .byte MAPSEC_VICTORY_ROAD .byte 0 .byte 0 .byte 4 diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc index b9edeeb172..107eb524f3 100644 --- a/data/maps/VictoryRoad_B1F/header.inc +++ b/data/maps/VictoryRoad_B1F/header.inc @@ -5,7 +5,7 @@ VictoryRoad_B1F: @ 8484390 .4byte 0x0 .2byte MUS_C_ROAD .2byte 285 - .byte 70 + .byte MAPSEC_VICTORY_ROAD .byte 1 .byte 0 .byte 4 diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc index b6c80a656d..3c9453154e 100644 --- a/data/maps/VictoryRoad_B2F/header.inc +++ b/data/maps/VictoryRoad_B2F/header.inc @@ -5,7 +5,7 @@ VictoryRoad_B2F: @ 84843AC .4byte 0x0 .2byte MUS_C_ROAD .2byte 286 - .byte 70 + .byte MAPSEC_VICTORY_ROAD .byte 1 .byte 0 .byte 4 From d53e8137cd1e14c7fd5435562a979bb6bd83d20e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 12 Jul 2018 22:15:35 -0500 Subject: [PATCH 50/55] Use weather constants in map headers --- data/maps.s | 1 + data/maps/AbandonedShip_CaptainsOffice/header.inc | 2 +- data/maps/AbandonedShip_Corridors_1F/header.inc | 2 +- data/maps/AbandonedShip_Corridors_B1F/header.inc | 2 +- data/maps/AbandonedShip_Deck/header.inc | 2 +- data/maps/AbandonedShip_HiddenFloorCorridors/header.inc | 2 +- data/maps/AbandonedShip_HiddenFloorRooms/header.inc | 2 +- data/maps/AbandonedShip_Room_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_B1F/header.inc | 2 +- data/maps/AbandonedShip_Underwater1/header.inc | 2 +- data/maps/AbandonedShip_Underwater2/header.inc | 2 +- data/maps/AlteringCave/header.inc | 2 +- data/maps/AncientTomb/header.inc | 2 +- data/maps/AquaHideout_1F/header.inc | 2 +- data/maps/AquaHideout_B1F/header.inc | 2 +- data/maps/AquaHideout_B2F/header.inc | 2 +- data/maps/AquaHideout_UnusedRubyMap1/header.inc | 2 +- data/maps/AquaHideout_UnusedRubyMap2/header.inc | 2 +- data/maps/AquaHideout_UnusedRubyMap3/header.inc | 2 +- data/maps/ArtisanCave_1F/header.inc | 2 +- data/maps/ArtisanCave_B1F/header.inc | 2 +- data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleArenaCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattleArenaLobby/header.inc | 2 +- data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleDomeCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattleDomeLobby/header.inc | 2 +- data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleFactoryLobby/header.inc | 2 +- data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattlePalaceCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattlePalaceLobby/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeLobby/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc | 2 +- .../BattleFrontier_BattlePointExchangeServiceCorner/header.inc | 2 +- data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc | 2 +- data/maps/BattleFrontier_BattlePyramidLobby/header.inc | 2 +- data/maps/BattleFrontier_BattlePyramidTop/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerCorridor2/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerElevator/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerLobby/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_Lounge1/header.inc | 2 +- data/maps/BattleFrontier_Lounge2/header.inc | 2 +- data/maps/BattleFrontier_Lounge3/header.inc | 2 +- data/maps/BattleFrontier_Lounge4/header.inc | 2 +- data/maps/BattleFrontier_Lounge5/header.inc | 2 +- data/maps/BattleFrontier_Lounge6/header.inc | 2 +- data/maps/BattleFrontier_Lounge7/header.inc | 2 +- data/maps/BattleFrontier_Lounge8/header.inc | 2 +- data/maps/BattleFrontier_Lounge9/header.inc | 2 +- data/maps/BattleFrontier_Mart/header.inc | 2 +- data/maps/BattleFrontier_OutsideEast/header.inc | 2 +- data/maps/BattleFrontier_OutsideWest/header.inc | 2 +- data/maps/BattleFrontier_PokemonCenter_1F/header.inc | 2 +- data/maps/BattleFrontier_PokemonCenter_2F/header.inc | 2 +- data/maps/BattleFrontier_RankingHall/header.inc | 2 +- data/maps/BattleFrontier_ReceptionGate/header.inc | 2 +- data/maps/BattleFrontier_ScottsHouse/header.inc | 2 +- data/maps/BattlePyramidSquare01/header.inc | 2 +- data/maps/BattlePyramidSquare02/header.inc | 2 +- data/maps/BattlePyramidSquare03/header.inc | 2 +- data/maps/BattlePyramidSquare04/header.inc | 2 +- data/maps/BattlePyramidSquare05/header.inc | 2 +- data/maps/BattlePyramidSquare06/header.inc | 2 +- data/maps/BattlePyramidSquare07/header.inc | 2 +- data/maps/BattlePyramidSquare08/header.inc | 2 +- data/maps/BattlePyramidSquare09/header.inc | 2 +- data/maps/BattlePyramidSquare10/header.inc | 2 +- data/maps/BattlePyramidSquare11/header.inc | 2 +- data/maps/BattlePyramidSquare12/header.inc | 2 +- data/maps/BattlePyramidSquare13/header.inc | 2 +- data/maps/BattlePyramidSquare14/header.inc | 2 +- data/maps/BattlePyramidSquare15/header.inc | 2 +- data/maps/BattlePyramidSquare16/header.inc | 2 +- data/maps/BirthIsland_Exterior/header.inc | 2 +- data/maps/BirthIsland_Harbor/header.inc | 2 +- data/maps/CaveOfOrigin_1F/header.inc | 2 +- data/maps/CaveOfOrigin_B1F/header.inc | 2 +- data/maps/CaveOfOrigin_Entrance/header.inc | 2 +- data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc | 2 +- data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc | 2 +- data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc | 2 +- data/maps/DesertRuins/header.inc | 2 +- data/maps/DesertUnderpass/header.inc | 2 +- data/maps/DewfordTown/header.inc | 2 +- data/maps/DewfordTown_Gym/header.inc | 2 +- data/maps/DewfordTown_Hall/header.inc | 2 +- data/maps/DewfordTown_House1/header.inc | 2 +- data/maps/DewfordTown_House2/header.inc | 2 +- data/maps/DewfordTown_PokemonCenter_1F/header.inc | 2 +- data/maps/DewfordTown_PokemonCenter_2F/header.inc | 2 +- data/maps/DoubleBattleColosseum/header.inc | 2 +- data/maps/EverGrandeCity/header.inc | 2 +- data/maps/EverGrandeCity_ChampionsRoom/header.inc | 2 +- data/maps/EverGrandeCity_DrakesRoom/header.inc | 2 +- data/maps/EverGrandeCity_GlaciasRoom/header.inc | 2 +- data/maps/EverGrandeCity_Hall1/header.inc | 2 +- data/maps/EverGrandeCity_Hall2/header.inc | 2 +- data/maps/EverGrandeCity_Hall3/header.inc | 2 +- data/maps/EverGrandeCity_Hall4/header.inc | 2 +- data/maps/EverGrandeCity_Hall5/header.inc | 2 +- data/maps/EverGrandeCity_HallOfFame/header.inc | 2 +- data/maps/EverGrandeCity_PhoebesRoom/header.inc | 2 +- data/maps/EverGrandeCity_PokemonCenter_1F/header.inc | 2 +- data/maps/EverGrandeCity_PokemonCenter_2F/header.inc | 2 +- data/maps/EverGrandeCity_PokemonLeague_1F/header.inc | 2 +- data/maps/EverGrandeCity_PokemonLeague_2F/header.inc | 2 +- data/maps/EverGrandeCity_SidneysRoom/header.inc | 2 +- data/maps/FallarborTown/header.inc | 2 +- data/maps/FallarborTown_BattleTentBattleRoom/header.inc | 2 +- data/maps/FallarborTown_BattleTentCorridor/header.inc | 2 +- data/maps/FallarborTown_BattleTentLobby/header.inc | 2 +- data/maps/FallarborTown_House1/header.inc | 2 +- data/maps/FallarborTown_House2/header.inc | 2 +- data/maps/FallarborTown_Mart/header.inc | 2 +- data/maps/FallarborTown_PokemonCenter_1F/header.inc | 2 +- data/maps/FallarborTown_PokemonCenter_2F/header.inc | 2 +- data/maps/FarawayIsland_Entrance/header.inc | 2 +- data/maps/FarawayIsland_Interior/header.inc | 2 +- data/maps/FieryPath/header.inc | 2 +- data/maps/FortreeCity/header.inc | 2 +- data/maps/FortreeCity_DecorationShop/header.inc | 2 +- data/maps/FortreeCity_Gym/header.inc | 2 +- data/maps/FortreeCity_House1/header.inc | 2 +- data/maps/FortreeCity_House2/header.inc | 2 +- data/maps/FortreeCity_House3/header.inc | 2 +- data/maps/FortreeCity_House4/header.inc | 2 +- data/maps/FortreeCity_House5/header.inc | 2 +- data/maps/FortreeCity_Mart/header.inc | 2 +- data/maps/FortreeCity_PokemonCenter_1F/header.inc | 2 +- data/maps/FortreeCity_PokemonCenter_2F/header.inc | 2 +- data/maps/GraniteCave_1F/header.inc | 2 +- data/maps/GraniteCave_B1F/header.inc | 2 +- data/maps/GraniteCave_B2F/header.inc | 2 +- data/maps/GraniteCave_StevensRoom/header.inc | 2 +- data/maps/InsideOfTruck/header.inc | 2 +- data/maps/IslandCave/header.inc | 2 +- data/maps/JaggedPass/header.inc | 2 +- data/maps/LavaridgeTown/header.inc | 2 +- data/maps/LavaridgeTown_Gym_1F/header.inc | 2 +- data/maps/LavaridgeTown_Gym_B1F/header.inc | 2 +- data/maps/LavaridgeTown_HerbShop/header.inc | 2 +- data/maps/LavaridgeTown_House/header.inc | 2 +- data/maps/LavaridgeTown_Mart/header.inc | 2 +- data/maps/LavaridgeTown_PokemonCenter_1F/header.inc | 2 +- data/maps/LavaridgeTown_PokemonCenter_2F/header.inc | 2 +- data/maps/LilycoveCity/header.inc | 2 +- data/maps/LilycoveCity_ContestHall/header.inc | 2 +- data/maps/LilycoveCity_ContestLobby/header.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStoreElevator/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_1F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_2F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_3F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_4F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_5F/header.inc | 2 +- data/maps/LilycoveCity_Harbor/header.inc | 2 +- data/maps/LilycoveCity_House1/header.inc | 2 +- data/maps/LilycoveCity_House2/header.inc | 2 +- data/maps/LilycoveCity_House3/header.inc | 2 +- data/maps/LilycoveCity_House4/header.inc | 2 +- data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc | 2 +- data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc | 2 +- data/maps/LilycoveCity_MoveDeletersHouse/header.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_1F/header.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_2F/header.inc | 2 +- data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc | 2 +- data/maps/LilycoveCity_UnusedMart/header.inc | 2 +- data/maps/LinkContestRoom1/header.inc | 2 +- data/maps/LinkContestRoom2/header.inc | 2 +- data/maps/LinkContestRoom3/header.inc | 2 +- data/maps/LinkContestRoom4/header.inc | 2 +- data/maps/LinkContestRoom5/header.inc | 2 +- data/maps/LinkContestRoom6/header.inc | 2 +- data/maps/LittlerootTown/header.inc | 2 +- data/maps/LittlerootTown_BrendansHouse_1F/header.inc | 2 +- data/maps/LittlerootTown_BrendansHouse_2F/header.inc | 2 +- data/maps/LittlerootTown_MaysHouse_1F/header.inc | 2 +- data/maps/LittlerootTown_MaysHouse_2F/header.inc | 2 +- data/maps/LittlerootTown_ProfessorBirchsLab/header.inc | 2 +- data/maps/MagmaHideout_1F/header.inc | 2 +- data/maps/MagmaHideout_2F_1R/header.inc | 2 +- data/maps/MagmaHideout_2F_2R/header.inc | 2 +- data/maps/MagmaHideout_2F_3R/header.inc | 2 +- data/maps/MagmaHideout_3F_1R/header.inc | 2 +- data/maps/MagmaHideout_3F_2R/header.inc | 2 +- data/maps/MagmaHideout_3F_3R/header.inc | 2 +- data/maps/MagmaHideout_4F/header.inc | 2 +- data/maps/MarineCave_End/header.inc | 2 +- data/maps/MarineCave_Entrance/header.inc | 2 +- data/maps/MauvilleCity/header.inc | 2 +- data/maps/MauvilleCity_BikeShop/header.inc | 2 +- data/maps/MauvilleCity_GameCorner/header.inc | 2 +- data/maps/MauvilleCity_Gym/header.inc | 2 +- data/maps/MauvilleCity_House1/header.inc | 2 +- data/maps/MauvilleCity_House2/header.inc | 2 +- data/maps/MauvilleCity_Mart/header.inc | 2 +- data/maps/MauvilleCity_PokemonCenter_1F/header.inc | 2 +- data/maps/MauvilleCity_PokemonCenter_2F/header.inc | 2 +- data/maps/MeteorFalls_1F_1R/header.inc | 2 +- data/maps/MeteorFalls_1F_2R/header.inc | 2 +- data/maps/MeteorFalls_B1F_1R/header.inc | 2 +- data/maps/MeteorFalls_B1F_2R/header.inc | 2 +- data/maps/MeteorFalls_StevensCave/header.inc | 2 +- data/maps/MirageTower_1F/header.inc | 2 +- data/maps/MirageTower_2F/header.inc | 2 +- data/maps/MirageTower_3F/header.inc | 2 +- data/maps/MirageTower_4F/header.inc | 2 +- data/maps/MossdeepCity/header.inc | 2 +- data/maps/MossdeepCity_GameCorner_1F/header.inc | 2 +- data/maps/MossdeepCity_GameCorner_B1F/header.inc | 2 +- data/maps/MossdeepCity_Gym/header.inc | 2 +- data/maps/MossdeepCity_House1/header.inc | 2 +- data/maps/MossdeepCity_House2/header.inc | 2 +- data/maps/MossdeepCity_House3/header.inc | 2 +- data/maps/MossdeepCity_House4/header.inc | 2 +- data/maps/MossdeepCity_Mart/header.inc | 2 +- data/maps/MossdeepCity_PokemonCenter_1F/header.inc | 2 +- data/maps/MossdeepCity_PokemonCenter_2F/header.inc | 2 +- data/maps/MossdeepCity_SpaceCenter_1F/header.inc | 2 +- data/maps/MossdeepCity_SpaceCenter_2F/header.inc | 2 +- data/maps/MossdeepCity_StevensHouse/header.inc | 2 +- data/maps/MtChimney/header.inc | 2 +- data/maps/MtChimney_CableCarStation/header.inc | 2 +- data/maps/MtPyre_1F/header.inc | 2 +- data/maps/MtPyre_2F/header.inc | 2 +- data/maps/MtPyre_3F/header.inc | 2 +- data/maps/MtPyre_4F/header.inc | 2 +- data/maps/MtPyre_5F/header.inc | 2 +- data/maps/MtPyre_6F/header.inc | 2 +- data/maps/MtPyre_Exterior/header.inc | 2 +- data/maps/MtPyre_Summit/header.inc | 2 +- data/maps/NavelRock_B1F/header.inc | 2 +- data/maps/NavelRock_Bottom/header.inc | 2 +- data/maps/NavelRock_Down01/header.inc | 2 +- data/maps/NavelRock_Down02/header.inc | 2 +- data/maps/NavelRock_Down03/header.inc | 2 +- data/maps/NavelRock_Down04/header.inc | 2 +- data/maps/NavelRock_Down05/header.inc | 2 +- data/maps/NavelRock_Down06/header.inc | 2 +- data/maps/NavelRock_Down07/header.inc | 2 +- data/maps/NavelRock_Down08/header.inc | 2 +- data/maps/NavelRock_Down09/header.inc | 2 +- data/maps/NavelRock_Down10/header.inc | 2 +- data/maps/NavelRock_Down11/header.inc | 2 +- data/maps/NavelRock_Entrance/header.inc | 2 +- data/maps/NavelRock_Exterior/header.inc | 2 +- data/maps/NavelRock_Fork/header.inc | 2 +- data/maps/NavelRock_Harbor/header.inc | 2 +- data/maps/NavelRock_Top/header.inc | 2 +- data/maps/NavelRock_Up1/header.inc | 2 +- data/maps/NavelRock_Up2/header.inc | 2 +- data/maps/NavelRock_Up3/header.inc | 2 +- data/maps/NavelRock_Up4/header.inc | 2 +- data/maps/NewMauville_Entrance/header.inc | 2 +- data/maps/NewMauville_Inside/header.inc | 2 +- data/maps/OldaleTown/header.inc | 2 +- data/maps/OldaleTown_House1/header.inc | 2 +- data/maps/OldaleTown_House2/header.inc | 2 +- data/maps/OldaleTown_Mart/header.inc | 2 +- data/maps/OldaleTown_PokemonCenter_1F/header.inc | 2 +- data/maps/OldaleTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PacifidlogTown/header.inc | 2 +- data/maps/PacifidlogTown_House1/header.inc | 2 +- data/maps/PacifidlogTown_House2/header.inc | 2 +- data/maps/PacifidlogTown_House3/header.inc | 2 +- data/maps/PacifidlogTown_House4/header.inc | 2 +- data/maps/PacifidlogTown_House5/header.inc | 2 +- data/maps/PacifidlogTown_PokemonCenter_1F/header.inc | 2 +- data/maps/PacifidlogTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PetalburgCity/header.inc | 2 +- data/maps/PetalburgCity_Gym/header.inc | 2 +- data/maps/PetalburgCity_House1/header.inc | 2 +- data/maps/PetalburgCity_House2/header.inc | 2 +- data/maps/PetalburgCity_Mart/header.inc | 2 +- data/maps/PetalburgCity_PokemonCenter_1F/header.inc | 2 +- data/maps/PetalburgCity_PokemonCenter_2F/header.inc | 2 +- data/maps/PetalburgCity_WallysHouse/header.inc | 2 +- data/maps/PetalburgWoods/header.inc | 2 +- data/maps/RecordCorner/header.inc | 2 +- data/maps/Route101/header.inc | 2 +- data/maps/Route102/header.inc | 2 +- data/maps/Route103/header.inc | 2 +- data/maps/Route104/header.inc | 2 +- data/maps/Route104_MrBrineysHouse/header.inc | 2 +- data/maps/Route104_PrettyPetalFlowerShop/header.inc | 2 +- data/maps/Route104_Prototype/header.inc | 2 +- data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc | 2 +- data/maps/Route105/header.inc | 2 +- data/maps/Route106/header.inc | 2 +- data/maps/Route107/header.inc | 2 +- data/maps/Route108/header.inc | 2 +- data/maps/Route109/header.inc | 2 +- data/maps/Route109_SeashoreHouse/header.inc | 2 +- data/maps/Route110/header.inc | 2 +- data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc | 2 +- data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc | 2 +- data/maps/Route110_TrickHouseCorridor/header.inc | 2 +- data/maps/Route110_TrickHouseEnd/header.inc | 2 +- data/maps/Route110_TrickHouseEntrance/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle1/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle2/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle3/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle4/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle5/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle6/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle7/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle8/header.inc | 2 +- data/maps/Route111/header.inc | 2 +- data/maps/Route111_OldLadysRestStop/header.inc | 2 +- data/maps/Route111_WinstrateFamilysHouse/header.inc | 2 +- data/maps/Route112/header.inc | 2 +- data/maps/Route112_CableCarStation/header.inc | 2 +- data/maps/Route113/header.inc | 2 +- data/maps/Route113_GlassWorkshop/header.inc | 2 +- data/maps/Route114/header.inc | 2 +- data/maps/Route114_FossilManiacsHouse/header.inc | 2 +- data/maps/Route114_FossilManiacsTunnel/header.inc | 2 +- data/maps/Route114_LanettesHouse/header.inc | 2 +- data/maps/Route115/header.inc | 2 +- data/maps/Route116/header.inc | 2 +- data/maps/Route116_TunnelersRestHouse/header.inc | 2 +- data/maps/Route117/header.inc | 2 +- data/maps/Route117_PokemonDayCare/header.inc | 2 +- data/maps/Route118/header.inc | 2 +- data/maps/Route119/header.inc | 2 +- data/maps/Route119_House/header.inc | 2 +- data/maps/Route119_WeatherInstitute_1F/header.inc | 2 +- data/maps/Route119_WeatherInstitute_2F/header.inc | 2 +- data/maps/Route120/header.inc | 2 +- data/maps/Route121/header.inc | 2 +- data/maps/Route121_SafariZoneEntrance/header.inc | 2 +- data/maps/Route122/header.inc | 2 +- data/maps/Route123/header.inc | 2 +- data/maps/Route123_BerryMastersHouse/header.inc | 2 +- data/maps/Route124/header.inc | 2 +- data/maps/Route124_DivingTreasureHuntersHouse/header.inc | 2 +- data/maps/Route125/header.inc | 2 +- data/maps/Route126/header.inc | 2 +- data/maps/Route127/header.inc | 2 +- data/maps/Route128/header.inc | 2 +- data/maps/Route129/header.inc | 2 +- data/maps/Route130/header.inc | 2 +- data/maps/Route131/header.inc | 2 +- data/maps/Route132/header.inc | 2 +- data/maps/Route133/header.inc | 2 +- data/maps/Route134/header.inc | 2 +- data/maps/RustboroCity/header.inc | 2 +- data/maps/RustboroCity_CuttersHouse/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_1F/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_2F/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_3F/header.inc | 2 +- data/maps/RustboroCity_Flat1_1F/header.inc | 2 +- data/maps/RustboroCity_Flat1_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_1F/header.inc | 2 +- data/maps/RustboroCity_Flat2_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_3F/header.inc | 2 +- data/maps/RustboroCity_Gym/header.inc | 2 +- data/maps/RustboroCity_House1/header.inc | 2 +- data/maps/RustboroCity_House2/header.inc | 2 +- data/maps/RustboroCity_House3/header.inc | 2 +- data/maps/RustboroCity_Mart/header.inc | 2 +- data/maps/RustboroCity_PokemonCenter_1F/header.inc | 2 +- data/maps/RustboroCity_PokemonCenter_2F/header.inc | 2 +- data/maps/RustboroCity_PokemonSchool/header.inc | 2 +- data/maps/RusturfTunnel/header.inc | 2 +- data/maps/SSTidalCorridor/header.inc | 2 +- data/maps/SSTidalLowerDeck/header.inc | 2 +- data/maps/SSTidalRooms/header.inc | 2 +- data/maps/SafariZone_North/header.inc | 2 +- data/maps/SafariZone_Northeast/header.inc | 2 +- data/maps/SafariZone_Northwest/header.inc | 2 +- data/maps/SafariZone_RestHouse/header.inc | 2 +- data/maps/SafariZone_South/header.inc | 2 +- data/maps/SafariZone_Southeast/header.inc | 2 +- data/maps/SafariZone_Southwest/header.inc | 2 +- data/maps/ScorchedSlab/header.inc | 2 +- data/maps/SeafloorCavern_Entrance/header.inc | 2 +- data/maps/SeafloorCavern_Room1/header.inc | 2 +- data/maps/SeafloorCavern_Room2/header.inc | 2 +- data/maps/SeafloorCavern_Room3/header.inc | 2 +- data/maps/SeafloorCavern_Room4/header.inc | 2 +- data/maps/SeafloorCavern_Room5/header.inc | 2 +- data/maps/SeafloorCavern_Room6/header.inc | 2 +- data/maps/SeafloorCavern_Room7/header.inc | 2 +- data/maps/SeafloorCavern_Room8/header.inc | 2 +- data/maps/SeafloorCavern_Room9/header.inc | 2 +- data/maps/SealedChamber_InnerRoom/header.inc | 2 +- data/maps/SealedChamber_OuterRoom/header.inc | 2 +- data/maps/SecretBase_BlueCave1/header.inc | 2 +- data/maps/SecretBase_BlueCave2/header.inc | 2 +- data/maps/SecretBase_BlueCave3/header.inc | 2 +- data/maps/SecretBase_BlueCave4/header.inc | 2 +- data/maps/SecretBase_BrownCave1/header.inc | 2 +- data/maps/SecretBase_BrownCave2/header.inc | 2 +- data/maps/SecretBase_BrownCave3/header.inc | 2 +- data/maps/SecretBase_BrownCave4/header.inc | 2 +- data/maps/SecretBase_RedCave1/header.inc | 2 +- data/maps/SecretBase_RedCave2/header.inc | 2 +- data/maps/SecretBase_RedCave3/header.inc | 2 +- data/maps/SecretBase_RedCave4/header.inc | 2 +- data/maps/SecretBase_Shrub1/header.inc | 2 +- data/maps/SecretBase_Shrub2/header.inc | 2 +- data/maps/SecretBase_Shrub3/header.inc | 2 +- data/maps/SecretBase_Shrub4/header.inc | 2 +- data/maps/SecretBase_Tree1/header.inc | 2 +- data/maps/SecretBase_Tree2/header.inc | 2 +- data/maps/SecretBase_Tree3/header.inc | 2 +- data/maps/SecretBase_Tree4/header.inc | 2 +- data/maps/SecretBase_YellowCave1/header.inc | 2 +- data/maps/SecretBase_YellowCave2/header.inc | 2 +- data/maps/SecretBase_YellowCave3/header.inc | 2 +- data/maps/SecretBase_YellowCave4/header.inc | 2 +- data/maps/ShoalCave_HighTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_HighTideInnerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideIceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideInnerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideLowerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideStairsRoom/header.inc | 2 +- data/maps/SingleBattleColosseum/header.inc | 2 +- data/maps/SkyPillar_1F/header.inc | 2 +- data/maps/SkyPillar_2F/header.inc | 2 +- data/maps/SkyPillar_3F/header.inc | 2 +- data/maps/SkyPillar_4F/header.inc | 2 +- data/maps/SkyPillar_5F/header.inc | 2 +- data/maps/SkyPillar_Entrance/header.inc | 2 +- data/maps/SkyPillar_Outside/header.inc | 2 +- data/maps/SkyPillar_Top/header.inc | 2 +- data/maps/SlateportCity/header.inc | 2 +- data/maps/SlateportCity_BattleTentBattleRoom/header.inc | 2 +- data/maps/SlateportCity_BattleTentCorridor/header.inc | 2 +- data/maps/SlateportCity_BattleTentLobby/header.inc | 2 +- data/maps/SlateportCity_Harbor/header.inc | 2 +- data/maps/SlateportCity_House1/header.inc | 2 +- data/maps/SlateportCity_House2/header.inc | 2 +- data/maps/SlateportCity_Mart/header.inc | 2 +- data/maps/SlateportCity_OceanicMuseum_1F/header.inc | 2 +- data/maps/SlateportCity_OceanicMuseum_2F/header.inc | 2 +- data/maps/SlateportCity_PokemonCenter_1F/header.inc | 2 +- data/maps/SlateportCity_PokemonCenter_2F/header.inc | 2 +- data/maps/SlateportCity_PokemonFanClub/header.inc | 2 +- data/maps/SlateportCity_SternsShipyard_1F/header.inc | 2 +- data/maps/SlateportCity_SternsShipyard_2F/header.inc | 2 +- data/maps/SootopolisCity/header.inc | 2 +- data/maps/SootopolisCity_Gym_1F/header.inc | 2 +- data/maps/SootopolisCity_Gym_B1F/header.inc | 2 +- data/maps/SootopolisCity_House1/header.inc | 2 +- data/maps/SootopolisCity_House2/header.inc | 2 +- data/maps/SootopolisCity_House3/header.inc | 2 +- data/maps/SootopolisCity_House4/header.inc | 2 +- data/maps/SootopolisCity_House5/header.inc | 2 +- data/maps/SootopolisCity_House6/header.inc | 2 +- data/maps/SootopolisCity_House7/header.inc | 2 +- data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc | 2 +- data/maps/SootopolisCity_Mart/header.inc | 2 +- data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc | 2 +- data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc | 2 +- data/maps/SootopolisCity_PokemonCenter_1F/header.inc | 2 +- data/maps/SootopolisCity_PokemonCenter_2F/header.inc | 2 +- data/maps/SouthernIsland_Exterior/header.inc | 2 +- data/maps/SouthernIsland_Interior/header.inc | 2 +- data/maps/TerraCave_End/header.inc | 2 +- data/maps/TerraCave_Entrance/header.inc | 2 +- data/maps/TradeCenter/header.inc | 2 +- data/maps/TrainerHill_1F/header.inc | 2 +- data/maps/TrainerHill_2F/header.inc | 2 +- data/maps/TrainerHill_3F/header.inc | 2 +- data/maps/TrainerHill_4F/header.inc | 2 +- data/maps/TrainerHill_Elevator/header.inc | 2 +- data/maps/TrainerHill_Entrance/header.inc | 2 +- data/maps/TrainerHill_Roof/header.inc | 2 +- data/maps/Underwater1/header.inc | 2 +- data/maps/Underwater2/header.inc | 2 +- data/maps/Underwater3/header.inc | 2 +- data/maps/Underwater4/header.inc | 2 +- data/maps/Underwater5/header.inc | 2 +- data/maps/Underwater6/header.inc | 2 +- data/maps/Underwater7/header.inc | 2 +- data/maps/Underwater_MarineCave/header.inc | 2 +- data/maps/Underwater_Route134/header.inc | 2 +- data/maps/Underwater_SeafloorCavern/header.inc | 2 +- data/maps/Underwater_SealedChamber/header.inc | 2 +- data/maps/Underwater_SootopolisCity/header.inc | 2 +- data/maps/UnionRoom/header.inc | 2 +- data/maps/UnknownMap_25_29/header.inc | 2 +- data/maps/UnknownMap_25_30/header.inc | 2 +- data/maps/UnknownMap_25_31/header.inc | 2 +- data/maps/UnknownMap_25_32/header.inc | 2 +- data/maps/UnknownMap_25_33/header.inc | 2 +- data/maps/UnknownMap_25_34/header.inc | 2 +- data/maps/VerdanturfTown/header.inc | 2 +- data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc | 2 +- data/maps/VerdanturfTown_BattleTentCorridor/header.inc | 2 +- data/maps/VerdanturfTown_BattleTentLobby/header.inc | 2 +- data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc | 2 +- data/maps/VerdanturfTown_House/header.inc | 2 +- data/maps/VerdanturfTown_Mart/header.inc | 2 +- data/maps/VerdanturfTown_PokemonCenter_1F/header.inc | 2 +- data/maps/VerdanturfTown_PokemonCenter_2F/header.inc | 2 +- data/maps/VerdanturfTown_WandasHouse/header.inc | 2 +- data/maps/VictoryRoad_1F/header.inc | 2 +- data/maps/VictoryRoad_B1F/header.inc | 2 +- data/maps/VictoryRoad_B2F/header.inc | 2 +- 519 files changed, 519 insertions(+), 518 deletions(-) diff --git a/data/maps.s b/data/maps.s index 8a0c2d43a1..59a6b4930c 100644 --- a/data/maps.s +++ b/data/maps.s @@ -1,6 +1,7 @@ #include "constants/maps.h" #include "constants/region_map_sections.h" #include "constants/songs.h" +#include "constants/weather.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc index a07a66947d..149f276551 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc @@ -7,7 +7,7 @@ AbandonedShip_CaptainsOffice: @ 84845A4 .2byte 195 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc index 118d918602..a0971779c3 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_1F/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Corridors_1F: @ 84844C4 .2byte 187 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc index 6b743af3a2..12cb7e6976 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Corridors_B1F: @ 84844FC .2byte 189 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc index da8f1f124d..f6616f885b 100644 --- a/data/maps/AbandonedShip_Deck/header.inc +++ b/data/maps/AbandonedShip_Deck/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Deck: @ 84844A8 .2byte 186 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc index e83f9a020a..f375e0beed 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc @@ -7,7 +7,7 @@ AbandonedShip_HiddenFloorCorridors: @ 84845DC .2byte 289 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc index b6b48d652a..0ef17861ae 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc @@ -7,7 +7,7 @@ AbandonedShip_HiddenFloorRooms: @ 84845F8 .2byte 310 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 7 diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc index 3282054cbf..5dc438acdb 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ b/data/maps/AbandonedShip_Room_B1F/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Room_B1F: @ 848456C .2byte 193 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc index 4d5eead342..e4bf899114 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Rooms2_1F: @ 8484588 .2byte 194 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc index ddac73f8ef..fa713bf29a 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Rooms2_B1F: @ 8484534 .2byte 191 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc index 3041809557..d552a8cac7 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_1F/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Rooms_1F: @ 84844E0 .2byte 188 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc index b9be9d6671..7b121a2d22 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Rooms_B1F: @ 8484518 .2byte 190 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc index e73f1c5d93..0176f1637c 100644 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ b/data/maps/AbandonedShip_Underwater1/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Underwater1: @ 8484550 .2byte 192 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc index cb7f00a6f2..7ca32edb8f 100644 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ b/data/maps/AbandonedShip_Underwater2/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Underwater2: @ 84845C0 .2byte 196 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/AlteringCave/header.inc b/data/maps/AlteringCave/header.inc index 1c390ec992..344bdaf8cb 100644 --- a/data/maps/AlteringCave/header.inc +++ b/data/maps/AlteringCave/header.inc @@ -7,7 +7,7 @@ AlteringCave: @ 8484A58 .2byte 420 .byte MAPSEC_ALTERING_CAVE_2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc index 5cce523f90..afc0f475c4 100644 --- a/data/maps/AncientTomb/header.inc +++ b/data/maps/AncientTomb/header.inc @@ -7,7 +7,7 @@ AncientTomb: @ 8484630 .2byte 281 .byte MAPSEC_ANCIENT_TOMB .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc index 31085dd4c2..7590ebce5b 100644 --- a/data/maps/AquaHideout_1F/header.inc +++ b/data/maps/AquaHideout_1F/header.inc @@ -7,7 +7,7 @@ AquaHideout_1F: @ 8484144 .2byte 143 .byte MAPSEC_AQUA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 8 diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc index 984d167400..51ec824929 100644 --- a/data/maps/AquaHideout_B1F/header.inc +++ b/data/maps/AquaHideout_B1F/header.inc @@ -7,7 +7,7 @@ AquaHideout_B1F: @ 8484160 .2byte 144 .byte MAPSEC_AQUA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 8 diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc index 230c2b7d0d..0d903e1cf3 100644 --- a/data/maps/AquaHideout_B2F/header.inc +++ b/data/maps/AquaHideout_B2F/header.inc @@ -7,7 +7,7 @@ AquaHideout_B2F: @ 848417C .2byte 145 .byte MAPSEC_AQUA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 8 diff --git a/data/maps/AquaHideout_UnusedRubyMap1/header.inc b/data/maps/AquaHideout_UnusedRubyMap1/header.inc index c2dc760968..242f32e61d 100644 --- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap1/header.inc @@ -7,7 +7,7 @@ AquaHideout_UnusedRubyMap1: @ 84846D8 .2byte 316 .byte MAPSEC_AQUA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AquaHideout_UnusedRubyMap2/header.inc b/data/maps/AquaHideout_UnusedRubyMap2/header.inc index cc01983a9f..ebc999cf43 100644 --- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap2/header.inc @@ -7,7 +7,7 @@ AquaHideout_UnusedRubyMap2: @ 84846F4 .2byte 317 .byte MAPSEC_AQUA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AquaHideout_UnusedRubyMap3/header.inc b/data/maps/AquaHideout_UnusedRubyMap3/header.inc index 8adc7f2ba8..f9d571c8eb 100644 --- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap3/header.inc @@ -7,7 +7,7 @@ AquaHideout_UnusedRubyMap3: @ 8484710 .2byte 318 .byte MAPSEC_AQUA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/ArtisanCave_1F/header.inc b/data/maps/ArtisanCave_1F/header.inc index 33d9748042..b801c08af4 100644 --- a/data/maps/ArtisanCave_1F/header.inc +++ b/data/maps/ArtisanCave_1F/header.inc @@ -7,7 +7,7 @@ ArtisanCave_1F: @ 84849B0 .2byte 401 .byte MAPSEC_ARTISAN_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/ArtisanCave_B1F/header.inc b/data/maps/ArtisanCave_B1F/header.inc index 8ff225a8eb..8e106ea1cd 100644 --- a/data/maps/ArtisanCave_B1F/header.inc +++ b/data/maps/ArtisanCave_B1F/header.inc @@ -7,7 +7,7 @@ ArtisanCave_B1F: @ 8484994 .2byte 400 .byte MAPSEC_ARTISAN_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc index 927137cf0e..d20c65c2e6 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleArenaBattleRoom: @ 8485484 .2byte 356 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc index 3323637385..ba4431464f 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleArenaCorridor: @ 8485468 .2byte 355 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleArenaLobby/header.inc b/data/maps/BattleFrontier_BattleArenaLobby/header.inc index 541613f533..112fb86bdd 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleArenaLobby: @ 848544C .2byte 354 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc index 6ddf3fb459..19d1941690 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleDomeBattleRoom: @ 8485388 .2byte 335 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc index 25c5d684f9..72caf95238 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleDomeCorridor: @ 8485350 .2byte 333 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleDomeLobby/header.inc b/data/maps/BattleFrontier_BattleDomeLobby/header.inc index be93189ab2..0d607e6718 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleDomeLobby: @ 8485334 .2byte 332 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc index 5923003536..db09e9b419 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleDomePreBattleRoom: @ 848536C .2byte 334 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc index c672d86cd5..27e2c89525 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleFactoryBattleRoom: @ 84854D8 .2byte 348 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc index 1fa0645a3a..b9fb23a034 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleFactoryLobby: @ 84854A0 .2byte 346 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc index 766e9689b1..e1fa2d5247 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC .2byte 347 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc index 696e416016..701647467c 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattlePalaceBattleRoom: @ 84853DC .2byte 344 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc index 18ddced686..d867a0dafd 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattlePalaceCorridor: @ 84853C0 .2byte 343 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc index cc723eb42f..3b53c9397c 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattlePalaceLobby: @ 84853A4 .2byte 342 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc index 955b0be42b..0f93684c30 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattlePikeCorridor: @ 8485510 .2byte 350 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/BattleFrontier_BattlePikeLobby/header.inc b/data/maps/BattleFrontier_BattlePikeLobby/header.inc index e75761bed5..d6fe6e3406 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattlePikeLobby: @ 84854F4 .2byte 349 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc index e5ea8a3ef1..f4fde68ade 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattlePikeRandomRoom1: @ 8485548 .2byte 352 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc index 8111043c66..4274d8eeec 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattlePikeRandomRoom2: @ 8485564 .2byte 353 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc index 2395feb52e..15b65af638 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattlePikeRandomRoom3: @ 8485580 .2byte 358 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc index f6b0e63514..b744f348f4 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattlePikeThreePathRoom: @ 848552C .2byte 351 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc index fca127f5fb..289c024558 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4 .2byte 398 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc index a5eda44ef0..a0face861e 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattlePyramidEmptySquare: @ 8485414 .2byte 361 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc index 06fd632f84..9fa6b7fa35 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 diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc index 140a5d4e83..970aadfbee 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattlePyramidTop: @ 8485430 .2byte 378 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc index fdf167b9fd..18d60521c7 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleTowerBattleRoom: @ 848521C .2byte 268 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc index 157a9f0aea..6606a9be79 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleTowerBattleRoom2: @ 8485318 .2byte 268 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc index de71a7dc64..13b0ebbf39 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleTowerCorridor: @ 8485200 .2byte 267 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc index 1ba6d43c9c..1a6e40299e 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleTowerCorridor2: @ 84852FC .2byte 391 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerElevator/header.inc b/data/maps/BattleFrontier_BattleTowerElevator/header.inc index d3e6216d23..380a5400e9 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/header.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleTowerElevator: @ 84851E4 .2byte 266 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerLobby/header.inc b/data/maps/BattleFrontier_BattleTowerLobby/header.inc index db62f0be3e..5d9252fbbc 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/header.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleTowerLobby: @ 84851C8 .2byte 264 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc index 5a25ffafa6..9bcd28c756 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0 .2byte 390 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/BattleFrontier_Lounge1/header.inc b/data/maps/BattleFrontier_Lounge1/header.inc index 21e01eb7dc..25e88a5dfd 100644 --- a/data/maps/BattleFrontier_Lounge1/header.inc +++ b/data/maps/BattleFrontier_Lounge1/header.inc @@ -7,7 +7,7 @@ BattleFrontier_Lounge1: @ 84855B8 .2byte 429 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge2/header.inc b/data/maps/BattleFrontier_Lounge2/header.inc index ad875cc4e6..71b9334744 100644 --- a/data/maps/BattleFrontier_Lounge2/header.inc +++ b/data/maps/BattleFrontier_Lounge2/header.inc @@ -7,7 +7,7 @@ BattleFrontier_Lounge2: @ 84855F0 .2byte 397 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge3/header.inc b/data/maps/BattleFrontier_Lounge3/header.inc index 8ce5169d7d..2f4b74d7eb 100644 --- a/data/maps/BattleFrontier_Lounge3/header.inc +++ b/data/maps/BattleFrontier_Lounge3/header.inc @@ -7,7 +7,7 @@ BattleFrontier_Lounge3: @ 848560C .2byte 429 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge4/header.inc b/data/maps/BattleFrontier_Lounge4/header.inc index 11f40472b0..6fea64a15f 100644 --- a/data/maps/BattleFrontier_Lounge4/header.inc +++ b/data/maps/BattleFrontier_Lounge4/header.inc @@ -7,7 +7,7 @@ BattleFrontier_Lounge4: @ 8485628 .2byte 429 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge5/header.inc b/data/maps/BattleFrontier_Lounge5/header.inc index 743ccd5120..f38db8f29d 100644 --- a/data/maps/BattleFrontier_Lounge5/header.inc +++ b/data/maps/BattleFrontier_Lounge5/header.inc @@ -7,7 +7,7 @@ BattleFrontier_Lounge5: @ 8485660 .2byte 397 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge6/header.inc b/data/maps/BattleFrontier_Lounge6/header.inc index b6192f8a94..78f103166a 100644 --- a/data/maps/BattleFrontier_Lounge6/header.inc +++ b/data/maps/BattleFrontier_Lounge6/header.inc @@ -7,7 +7,7 @@ BattleFrontier_Lounge6: @ 848567C .2byte 429 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge7/header.inc b/data/maps/BattleFrontier_Lounge7/header.inc index 96843d502f..871e16cc2d 100644 --- a/data/maps/BattleFrontier_Lounge7/header.inc +++ b/data/maps/BattleFrontier_Lounge7/header.inc @@ -7,7 +7,7 @@ BattleFrontier_Lounge7: @ 8485698 .2byte 429 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge8/header.inc b/data/maps/BattleFrontier_Lounge8/header.inc index 9a320a4bf4..620e79304e 100644 --- a/data/maps/BattleFrontier_Lounge8/header.inc +++ b/data/maps/BattleFrontier_Lounge8/header.inc @@ -7,7 +7,7 @@ BattleFrontier_Lounge8: @ 84856D0 .2byte 429 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge9/header.inc b/data/maps/BattleFrontier_Lounge9/header.inc index 999ba6ce09..37b608edf1 100644 --- a/data/maps/BattleFrontier_Lounge9/header.inc +++ b/data/maps/BattleFrontier_Lounge9/header.inc @@ -7,7 +7,7 @@ BattleFrontier_Lounge9: @ 84856EC .2byte 429 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Mart/header.inc b/data/maps/BattleFrontier_Mart/header.inc index 2285a9e3f2..b356e7d7a3 100644 --- a/data/maps/BattleFrontier_Mart/header.inc +++ b/data/maps/BattleFrontier_Mart/header.inc @@ -7,7 +7,7 @@ BattleFrontier_Mart: @ 8485740 .2byte 63 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_OutsideEast/header.inc b/data/maps/BattleFrontier_OutsideEast/header.inc index 0f49f1e4b9..3db684e8fc 100644 --- a/data/maps/BattleFrontier_OutsideEast/header.inc +++ b/data/maps/BattleFrontier_OutsideEast/header.inc @@ -7,7 +7,7 @@ BattleFrontier_OutsideEast: @ 84852C4 .2byte 345 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/BattleFrontier_OutsideWest/header.inc b/data/maps/BattleFrontier_OutsideWest/header.inc index bbef1d1c75..2c1d3754e8 100644 --- a/data/maps/BattleFrontier_OutsideWest/header.inc +++ b/data/maps/BattleFrontier_OutsideWest/header.inc @@ -7,7 +7,7 @@ BattleFrontier_OutsideWest: @ 84851AC .2byte 265 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc index 2b39d2cf6c..283c3744a9 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ BattleFrontier_PokemonCenter_1F: @ 8485708 .2byte 61 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc index 7401417480..44442a28cb 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ BattleFrontier_PokemonCenter_2F: @ 8485724 .2byte 62 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_RankingHall/header.inc b/data/maps/BattleFrontier_RankingHall/header.inc index 8036032e3c..2e91cbfafd 100644 --- a/data/maps/BattleFrontier_RankingHall/header.inc +++ b/data/maps/BattleFrontier_RankingHall/header.inc @@ -7,7 +7,7 @@ BattleFrontier_RankingHall: @ 848559C .2byte 396 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_ReceptionGate/header.inc b/data/maps/BattleFrontier_ReceptionGate/header.inc index 236698cd28..f009f93e55 100644 --- a/data/maps/BattleFrontier_ReceptionGate/header.inc +++ b/data/maps/BattleFrontier_ReceptionGate/header.inc @@ -7,7 +7,7 @@ BattleFrontier_ReceptionGate: @ 84856B4 .2byte 399 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_ScottsHouse/header.inc b/data/maps/BattleFrontier_ScottsHouse/header.inc index b7468a9d20..11cf240226 100644 --- a/data/maps/BattleFrontier_ScottsHouse/header.inc +++ b/data/maps/BattleFrontier_ScottsHouse/header.inc @@ -7,7 +7,7 @@ BattleFrontier_ScottsHouse: @ 8485644 .2byte 430 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare01/header.inc b/data/maps/BattlePyramidSquare01/header.inc index dc3deeb489..ef8c315d9b 100644 --- a/data/maps/BattlePyramidSquare01/header.inc +++ b/data/maps/BattlePyramidSquare01/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare01: @ 8484F60 .2byte 362 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare02/header.inc b/data/maps/BattlePyramidSquare02/header.inc index 8d65a6fa6a..41f1523cfd 100644 --- a/data/maps/BattlePyramidSquare02/header.inc +++ b/data/maps/BattlePyramidSquare02/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare02: @ 8484F7C .2byte 363 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare03/header.inc b/data/maps/BattlePyramidSquare03/header.inc index c3bf3376d4..2938d52804 100644 --- a/data/maps/BattlePyramidSquare03/header.inc +++ b/data/maps/BattlePyramidSquare03/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare03: @ 8484F98 .2byte 364 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare04/header.inc b/data/maps/BattlePyramidSquare04/header.inc index c001abc537..ae838f26d7 100644 --- a/data/maps/BattlePyramidSquare04/header.inc +++ b/data/maps/BattlePyramidSquare04/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare04: @ 8484FB4 .2byte 365 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare05/header.inc b/data/maps/BattlePyramidSquare05/header.inc index e96d7cac7c..e893cfbcb1 100644 --- a/data/maps/BattlePyramidSquare05/header.inc +++ b/data/maps/BattlePyramidSquare05/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare05: @ 8484FD0 .2byte 366 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare06/header.inc b/data/maps/BattlePyramidSquare06/header.inc index 440eac5492..397c7c27c1 100644 --- a/data/maps/BattlePyramidSquare06/header.inc +++ b/data/maps/BattlePyramidSquare06/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare06: @ 8484FEC .2byte 367 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare07/header.inc b/data/maps/BattlePyramidSquare07/header.inc index f467dfd7dd..3d9e1c2c5b 100644 --- a/data/maps/BattlePyramidSquare07/header.inc +++ b/data/maps/BattlePyramidSquare07/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare07: @ 8485008 .2byte 368 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare08/header.inc b/data/maps/BattlePyramidSquare08/header.inc index 00c45e5779..af3df7eba2 100644 --- a/data/maps/BattlePyramidSquare08/header.inc +++ b/data/maps/BattlePyramidSquare08/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare08: @ 8485024 .2byte 369 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare09/header.inc b/data/maps/BattlePyramidSquare09/header.inc index 27a33d4b05..2fb732618e 100644 --- a/data/maps/BattlePyramidSquare09/header.inc +++ b/data/maps/BattlePyramidSquare09/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare09: @ 8485040 .2byte 370 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare10/header.inc b/data/maps/BattlePyramidSquare10/header.inc index 1507f0518d..8f95706d3f 100644 --- a/data/maps/BattlePyramidSquare10/header.inc +++ b/data/maps/BattlePyramidSquare10/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare10: @ 848505C .2byte 371 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare11/header.inc b/data/maps/BattlePyramidSquare11/header.inc index 98c08a116b..8d0ffdaae9 100644 --- a/data/maps/BattlePyramidSquare11/header.inc +++ b/data/maps/BattlePyramidSquare11/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare11: @ 8485078 .2byte 372 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare12/header.inc b/data/maps/BattlePyramidSquare12/header.inc index 39cc4061a7..268f24cb17 100644 --- a/data/maps/BattlePyramidSquare12/header.inc +++ b/data/maps/BattlePyramidSquare12/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare12: @ 8485094 .2byte 373 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare13/header.inc b/data/maps/BattlePyramidSquare13/header.inc index b4b1a281d6..b4d09580ff 100644 --- a/data/maps/BattlePyramidSquare13/header.inc +++ b/data/maps/BattlePyramidSquare13/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare13: @ 84850B0 .2byte 374 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare14/header.inc b/data/maps/BattlePyramidSquare14/header.inc index 407cf00244..7d43feff02 100644 --- a/data/maps/BattlePyramidSquare14/header.inc +++ b/data/maps/BattlePyramidSquare14/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare14: @ 84850CC .2byte 375 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare15/header.inc b/data/maps/BattlePyramidSquare15/header.inc index 37d8c75cb9..c67e86abef 100644 --- a/data/maps/BattlePyramidSquare15/header.inc +++ b/data/maps/BattlePyramidSquare15/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare15: @ 84850E8 .2byte 376 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare16/header.inc b/data/maps/BattlePyramidSquare16/header.inc index f264ace73b..3026d44bd9 100644 --- a/data/maps/BattlePyramidSquare16/header.inc +++ b/data/maps/BattlePyramidSquare16/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare16: @ 8485104 .2byte 377 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc index 04a62dd6b6..5bda312503 100644 --- a/data/maps/BirthIsland_Exterior/header.inc +++ b/data/maps/BirthIsland_Exterior/header.inc @@ -7,7 +7,7 @@ BirthIsland_Exterior: @ 8485794 .2byte 404 .byte MAPSEC_BIRTH_ISLAND_2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 12 diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc index e3b8a21f3b..f0ea9a70a9 100644 --- a/data/maps/BirthIsland_Harbor/header.inc +++ b/data/maps/BirthIsland_Harbor/header.inc @@ -7,7 +7,7 @@ BirthIsland_Harbor: @ 84857B0 .2byte 405 .byte MAPSEC_BIRTH_ISLAND_2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc index c25c0d82b2..2b44649375 100644 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ b/data/maps/CaveOfOrigin_1F/header.inc @@ -7,7 +7,7 @@ CaveOfOrigin_1F: @ 84842E8 .2byte 158 .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc index b5eacd7d92..46cac34335 100644 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ b/data/maps/CaveOfOrigin_B1F/header.inc @@ -7,7 +7,7 @@ CaveOfOrigin_B1F: @ 8484358 .2byte 162 .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 - .byte 6 + .byte WEATHER_FOG_1 .byte 4 .2byte 0 .byte 14 diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc index 5cda3da60c..a19256b391 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ b/data/maps/CaveOfOrigin_Entrance/header.inc @@ -7,7 +7,7 @@ CaveOfOrigin_Entrance: @ 84842CC .2byte 157 .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc index 762fb41152..155670bf07 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc @@ -7,7 +7,7 @@ CaveOfOrigin_UnusedRubySapphireMap1: @ 8484304 .2byte 159 .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc index bd77221f60..12d34ac46e 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc @@ -7,7 +7,7 @@ CaveOfOrigin_UnusedRubySapphireMap2: @ 8484320 .2byte 160 .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 - .byte 6 + .byte WEATHER_FOG_1 .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc index a5597e4e9b..9edfd72a82 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc @@ -7,7 +7,7 @@ CaveOfOrigin_UnusedRubySapphireMap3: @ 848433C .2byte 161 .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 - .byte 6 + .byte WEATHER_FOG_1 .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc index 009a279e19..7e63a9023b 100644 --- a/data/maps/DesertRuins/header.inc +++ b/data/maps/DesertRuins/header.inc @@ -7,7 +7,7 @@ DesertRuins: @ 8483F68 .2byte 131 .byte MAPSEC_DESERT_RUINS .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/DesertUnderpass/header.inc b/data/maps/DesertUnderpass/header.inc index 9d4bec9180..d3f41bd726 100644 --- a/data/maps/DesertUnderpass/header.inc +++ b/data/maps/DesertUnderpass/header.inc @@ -7,7 +7,7 @@ DesertUnderpass: @ 8484978 .2byte 389 .byte MAPSEC_DESERT_UNDERPASS .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc index c6fb455819..fb1270636a 100644 --- a/data/maps/DewfordTown/header.inc +++ b/data/maps/DewfordTown/header.inc @@ -7,7 +7,7 @@ DewfordTown: @ 84825EC .2byte 12 .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 1 .2byte 0 .byte 13 diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc index 24866ee7a7..de821f1169 100644 --- a/data/maps/DewfordTown_Gym/header.inc +++ b/data/maps/DewfordTown_Gym/header.inc @@ -7,7 +7,7 @@ DewfordTown_Gym: @ 8482C60 .2byte 65 .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc index dfa5daf1f6..934a5a0397 100644 --- a/data/maps/DewfordTown_Hall/header.inc +++ b/data/maps/DewfordTown_Hall/header.inc @@ -7,7 +7,7 @@ DewfordTown_Hall: @ 8482C7C .2byte 66 .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc index 94c735b59d..46352ccc66 100644 --- a/data/maps/DewfordTown_House1/header.inc +++ b/data/maps/DewfordTown_House1/header.inc @@ -7,7 +7,7 @@ DewfordTown_House1: @ 8482C0C .2byte 64 .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc index c27122bc58..0d7070caee 100644 --- a/data/maps/DewfordTown_House2/header.inc +++ b/data/maps/DewfordTown_House2/header.inc @@ -7,7 +7,7 @@ DewfordTown_House2: @ 8482C98 .2byte 67 .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc index e7b6285033..8a22a27f8b 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ DewfordTown_PokemonCenter_1F: @ 8482C28 .2byte 61 .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc index 90ec683d73..cd54f5fe05 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ DewfordTown_PokemonCenter_2F: @ 8482C44 .2byte 62 .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc index 05949ab05e..8d4de2924a 100644 --- a/data/maps/DoubleBattleColosseum/header.inc +++ b/data/maps/DoubleBattleColosseum/header.inc @@ -7,7 +7,7 @@ DoubleBattleColosseum: @ 8484D84 .2byte 224 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc index 7ba0b694bb..7401e4f2f4 100644 --- a/data/maps/EverGrandeCity/header.inc +++ b/data/maps/EverGrandeCity/header.inc @@ -7,7 +7,7 @@ EverGrandeCity: @ 8482598 .2byte 9 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 2 .2byte 0 .byte 13 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc index 1e3591b8ad..3cbf3d3b7c 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_ChampionsRoom: @ 8483C3C .2byte 115 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc index 0de64f823c..87ee3f9b61 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_DrakesRoom: @ 8483C20 .2byte 114 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc index 2c6ad7097e..b8170952ea 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_GlaciasRoom: @ 8483C04 .2byte 113 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Hall1/header.inc b/data/maps/EverGrandeCity_Hall1/header.inc index eba002828c..2b993b9a6d 100644 --- a/data/maps/EverGrandeCity_Hall1/header.inc +++ b/data/maps/EverGrandeCity_Hall1/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_Hall1: @ 8483C58 .2byte 116 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Hall2/header.inc b/data/maps/EverGrandeCity_Hall2/header.inc index 7c932e333a..9d7a836feb 100644 --- a/data/maps/EverGrandeCity_Hall2/header.inc +++ b/data/maps/EverGrandeCity_Hall2/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_Hall2: @ 8483C74 .2byte 116 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Hall3/header.inc b/data/maps/EverGrandeCity_Hall3/header.inc index ff59994750..d22707542c 100644 --- a/data/maps/EverGrandeCity_Hall3/header.inc +++ b/data/maps/EverGrandeCity_Hall3/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_Hall3: @ 8483C90 .2byte 116 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Hall4/header.inc b/data/maps/EverGrandeCity_Hall4/header.inc index 4051a87222..80867002f7 100644 --- a/data/maps/EverGrandeCity_Hall4/header.inc +++ b/data/maps/EverGrandeCity_Hall4/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_Hall4: @ 8483CAC .2byte 315 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Hall5/header.inc b/data/maps/EverGrandeCity_Hall5/header.inc index 1f6ade600e..1d1ac9edd6 100644 --- a/data/maps/EverGrandeCity_Hall5/header.inc +++ b/data/maps/EverGrandeCity_Hall5/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_Hall5: @ 8483CC8 .2byte 116 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc index 22bb385c33..6918cc2f12 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ b/data/maps/EverGrandeCity_HallOfFame/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_HallOfFame: @ 8483D00 .2byte 298 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc index 267f341d5c..b852e1c8ed 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_PhoebesRoom: @ 8483BE8 .2byte 112 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc index 1eb362f602..d43b97fbca 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_PokemonCenter_1F: @ 8483D1C .2byte 61 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc index 3bfe680e59..3ee23fe994 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_PokemonCenter_2F: @ 8483D38 .2byte 62 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc index e81864220b..17d01bfaec 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_PokemonLeague_1F: @ 8483CE4 .2byte 270 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc index 59e5234490..217647a567 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_PokemonLeague_2F: @ 8483D54 .2byte 62 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc index a2f5ebef33..875c190f5b 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_SidneysRoom: @ 8483BCC .2byte 111 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc index caece3a223..77be7ebaa1 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -7,7 +7,7 @@ FallarborTown: @ 8482624 .2byte 14 .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 1 .2byte 0 .byte 13 diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc index 17a58396f5..0781e0c306 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc @@ -7,7 +7,7 @@ FallarborTown_BattleTentBattleRoom: @ 8482DCC .2byte 386 .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FallarborTown_BattleTentCorridor/header.inc b/data/maps/FallarborTown_BattleTentCorridor/header.inc index adf2570af1..6e5950e85b 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/header.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/header.inc @@ -7,7 +7,7 @@ FallarborTown_BattleTentCorridor: @ 8482DB0 .2byte 385 .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FallarborTown_BattleTentLobby/header.inc b/data/maps/FallarborTown_BattleTentLobby/header.inc index 60d07ff5b6..6702e2f9d0 100644 --- a/data/maps/FallarborTown_BattleTentLobby/header.inc +++ b/data/maps/FallarborTown_BattleTentLobby/header.inc @@ -7,7 +7,7 @@ FallarborTown_BattleTentLobby: @ 8482D94 .2byte 384 .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc index e07cc4ee8a..b801201f34 100644 --- a/data/maps/FallarborTown_House1/header.inc +++ b/data/maps/FallarborTown_House1/header.inc @@ -7,7 +7,7 @@ FallarborTown_House1: @ 8482E20 .2byte 59 .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc index 5e50c82711..b30fdf5157 100644 --- a/data/maps/FallarborTown_House2/header.inc +++ b/data/maps/FallarborTown_House2/header.inc @@ -7,7 +7,7 @@ FallarborTown_House2: @ 8482E3C .2byte 60 .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc index ee3d1bb7a5..7c9be5b8f6 100644 --- a/data/maps/FallarborTown_Mart/header.inc +++ b/data/maps/FallarborTown_Mart/header.inc @@ -7,7 +7,7 @@ FallarborTown_Mart: @ 8482D78 .2byte 63 .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc index ea7d76a360..0e1402710d 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ FallarborTown_PokemonCenter_1F: @ 8482DE8 .2byte 61 .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc index a2e45e006e..f00757c910 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ FallarborTown_PokemonCenter_2F: @ 8482E04 .2byte 62 .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FarawayIsland_Entrance/header.inc b/data/maps/FarawayIsland_Entrance/header.inc index 1b2e2300a0..539a797f11 100644 --- a/data/maps/FarawayIsland_Entrance/header.inc +++ b/data/maps/FarawayIsland_Entrance/header.inc @@ -7,7 +7,7 @@ FarawayIsland_Entrance: @ 848575C .2byte 402 .byte MAPSEC_FARAWAY_ISLAND .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 13 diff --git a/data/maps/FarawayIsland_Interior/header.inc b/data/maps/FarawayIsland_Interior/header.inc index 2ac52de61b..a5b52d0765 100644 --- a/data/maps/FarawayIsland_Interior/header.inc +++ b/data/maps/FarawayIsland_Interior/header.inc @@ -7,7 +7,7 @@ FarawayIsland_Interior: @ 8485778 .2byte 403 .byte MAPSEC_FARAWAY_ISLAND .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 8 .2byte 0 .byte 13 diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc index 5ebac1143a..bdf2ec584f 100644 --- a/data/maps/FieryPath/header.inc +++ b/data/maps/FieryPath/header.inc @@ -7,7 +7,7 @@ FieryPath: @ 8484048 .2byte 293 .byte MAPSEC_FIERY_PATH .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc index 98c24b2114..7e20bfffff 100644 --- a/data/maps/FortreeCity/header.inc +++ b/data/maps/FortreeCity/header.inc @@ -7,7 +7,7 @@ FortreeCity: @ 8482528 .2byte 5 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 2 .2byte 0 .byte 13 diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc index 918a988b2b..dadd55e029 100644 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ b/data/maps/FortreeCity_DecorationShop/header.inc @@ -7,7 +7,7 @@ FortreeCity_DecorationShop: @ 848361C .2byte 255 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc index 21b280322c..459db5bd5e 100644 --- a/data/maps/FortreeCity_Gym/header.inc +++ b/data/maps/FortreeCity_Gym/header.inc @@ -7,7 +7,7 @@ FortreeCity_Gym: @ 848353C .2byte 100 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc index 9c933f5bba..013caf4d25 100644 --- a/data/maps/FortreeCity_House1/header.inc +++ b/data/maps/FortreeCity_House1/header.inc @@ -7,7 +7,7 @@ FortreeCity_House1: @ 8483520 .2byte 99 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc index a339e9dde0..b631de0240 100644 --- a/data/maps/FortreeCity_House2/header.inc +++ b/data/maps/FortreeCity_House2/header.inc @@ -7,7 +7,7 @@ FortreeCity_House2: @ 84835AC .2byte 101 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc index 45f8e2e05e..477706e682 100644 --- a/data/maps/FortreeCity_House3/header.inc +++ b/data/maps/FortreeCity_House3/header.inc @@ -7,7 +7,7 @@ FortreeCity_House3: @ 84835C8 .2byte 99 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc index cdd8de3302..15182d88f9 100644 --- a/data/maps/FortreeCity_House4/header.inc +++ b/data/maps/FortreeCity_House4/header.inc @@ -7,7 +7,7 @@ FortreeCity_House4: @ 84835E4 .2byte 101 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc index 3017bae962..29dbe8c13c 100644 --- a/data/maps/FortreeCity_House5/header.inc +++ b/data/maps/FortreeCity_House5/header.inc @@ -7,7 +7,7 @@ FortreeCity_House5: @ 8483600 .2byte 99 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc index 1dd682c08d..0a67a7b511 100644 --- a/data/maps/FortreeCity_Mart/header.inc +++ b/data/maps/FortreeCity_Mart/header.inc @@ -7,7 +7,7 @@ FortreeCity_Mart: @ 8483590 .2byte 63 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc index 920f961bf9..02819535e4 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ FortreeCity_PokemonCenter_1F: @ 8483558 .2byte 61 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc index 197901ce7c..ab03878eb6 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ FortreeCity_PokemonCenter_2F: @ 8483574 .2byte 62 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc index af8cc27b70..df957dc4d0 100644 --- a/data/maps/GraniteCave_1F/header.inc +++ b/data/maps/GraniteCave_1F/header.inc @@ -7,7 +7,7 @@ GraniteCave_1F: @ 8483F84 .2byte 132 .byte MAPSEC_GRANITE_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc index 244eff08e6..183cece4a5 100644 --- a/data/maps/GraniteCave_B1F/header.inc +++ b/data/maps/GraniteCave_B1F/header.inc @@ -7,7 +7,7 @@ GraniteCave_B1F: @ 8483FA0 .2byte 133 .byte MAPSEC_GRANITE_CAVE .byte 1 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc index 0d1aeea5a6..452fd1e2fe 100644 --- a/data/maps/GraniteCave_B2F/header.inc +++ b/data/maps/GraniteCave_B2F/header.inc @@ -7,7 +7,7 @@ GraniteCave_B2F: @ 8483FBC .2byte 134 .byte MAPSEC_GRANITE_CAVE .byte 1 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc index 2c1514b758..159d492774 100644 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ b/data/maps/GraniteCave_StevensRoom/header.inc @@ -7,7 +7,7 @@ GraniteCave_StevensRoom: @ 8483FD8 .2byte 288 .byte MAPSEC_GRANITE_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc index e3a316015c..438f3bd0a0 100644 --- a/data/maps/InsideOfTruck/header.inc +++ b/data/maps/InsideOfTruck/header.inc @@ -7,7 +7,7 @@ InsideOfTruck: @ 8484EF0 .2byte 237 .byte MAPSEC_INSIDE_OF_TRUCK .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc index 14fe2e7e2f..6d097c21d3 100644 --- a/data/maps/IslandCave/header.inc +++ b/data/maps/IslandCave/header.inc @@ -7,7 +7,7 @@ IslandCave: @ 8484614 .2byte 280 .byte MAPSEC_ISLAND_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc index 6bab465827..3262694071 100644 --- a/data/maps/JaggedPass/header.inc +++ b/data/maps/JaggedPass/header.inc @@ -7,7 +7,7 @@ JaggedPass: @ 848402C .2byte 292 .byte MAPSEC_JAGGED_PASS .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc index ff1e483e0e..9ddad27586 100644 --- a/data/maps/LavaridgeTown/header.inc +++ b/data/maps/LavaridgeTown/header.inc @@ -7,7 +7,7 @@ LavaridgeTown: @ 8482608 .2byte 13 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 1 .2byte 0 .byte 13 diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc index e7fb510f75..1257c09c0a 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_1F/header.inc @@ -7,7 +7,7 @@ LavaridgeTown_Gym_1F: @ 8482CD0 .2byte 69 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 6 + .byte WEATHER_FOG_1 .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc index 1f591e8f2c..fc90b501ff 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc @@ -7,7 +7,7 @@ LavaridgeTown_Gym_B1F: @ 8482CEC .2byte 70 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 6 + .byte WEATHER_FOG_1 .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc index bb34945c58..db621e67d3 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ b/data/maps/LavaridgeTown_HerbShop/header.inc @@ -7,7 +7,7 @@ LavaridgeTown_HerbShop: @ 8482CB4 .2byte 68 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc index f9e56baea2..b8f607e15a 100644 --- a/data/maps/LavaridgeTown_House/header.inc +++ b/data/maps/LavaridgeTown_House/header.inc @@ -7,7 +7,7 @@ LavaridgeTown_House: @ 8482D08 .2byte 64 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc index a01610eafb..f06a48f723 100644 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ b/data/maps/LavaridgeTown_Mart/header.inc @@ -7,7 +7,7 @@ LavaridgeTown_Mart: @ 8482D24 .2byte 63 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc index ae10ecf371..42a4636245 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ LavaridgeTown_PokemonCenter_1F: @ 8482D40 .2byte 71 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc index 1fb9fc917e..7149858a84 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ LavaridgeTown_PokemonCenter_2F: @ 8482D5C .2byte 62 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc index eb3ad0011b..f372e381c8 100644 --- a/data/maps/LilycoveCity/header.inc +++ b/data/maps/LilycoveCity/header.inc @@ -7,7 +7,7 @@ LilycoveCity: @ 8482544 .2byte 6 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 2 .2byte 0 .byte 13 diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc index 29ec0ca38d..1cd935b55c 100644 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ b/data/maps/LilycoveCity_ContestHall/header.inc @@ -7,7 +7,7 @@ LilycoveCity_ContestHall: @ 84836C4 .2byte 106 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc index 6cbc84c1b1..ee9660ebf5 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ b/data/maps/LilycoveCity_ContestLobby/header.inc @@ -7,7 +7,7 @@ LilycoveCity_ContestLobby: @ 84836A8 .2byte 105 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc index 7881cf2880..166d868283 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_CoveLilyMotel_1F: @ 8483638 .2byte 299 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc index 3e3a5810ff..9b8f051063 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_CoveLilyMotel_2F: @ 8483654 .2byte 300 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc index 3e490a6cda..23e99c9819 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStoreElevator: @ 84838A0 .2byte 273 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc index 991117c67b..ffd3d40216 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStoreRooftop: @ 8483884 .2byte 262 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc index af11b9d992..695b5560db 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_1F: @ 84837F8 .2byte 257 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc index dd79bf744d..34beb40f78 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_2F: @ 8483814 .2byte 258 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc index 48e90e3550..5c49de2eb3 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_3F: @ 8483830 .2byte 259 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc index 3a098b37c0..c298bc024b 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_4F: @ 848384C .2byte 260 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc index a1af1c59f5..32c1786283 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_5F: @ 8483868 .2byte 261 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc index 4f8b71c7a9..a28edee35c 100644 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ b/data/maps/LilycoveCity_Harbor/header.inc @@ -7,7 +7,7 @@ LilycoveCity_Harbor: @ 8483750 .2byte 88 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc index 903bcd8457..e29bdfbc56 100644 --- a/data/maps/LilycoveCity_House1/header.inc +++ b/data/maps/LilycoveCity_House1/header.inc @@ -7,7 +7,7 @@ LilycoveCity_House1: @ 8483788 .2byte 59 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc index f78304998e..0ffeffd035 100644 --- a/data/maps/LilycoveCity_House2/header.inc +++ b/data/maps/LilycoveCity_House2/header.inc @@ -7,7 +7,7 @@ LilycoveCity_House2: @ 84837A4 .2byte 74 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc index 49bd9d3330..fc2868a9c5 100644 --- a/data/maps/LilycoveCity_House3/header.inc +++ b/data/maps/LilycoveCity_House3/header.inc @@ -7,7 +7,7 @@ LilycoveCity_House3: @ 84837C0 .2byte 60 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc index 331b406459..66c3636cf7 100644 --- a/data/maps/LilycoveCity_House4/header.inc +++ b/data/maps/LilycoveCity_House4/header.inc @@ -7,7 +7,7 @@ LilycoveCity_House4: @ 84837DC .2byte 59 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc index 1b5c0ed323..292c61623e 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_LilycoveMuseum_1F: @ 8483670 .2byte 103 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc index cb282a135b..9bdff8e90a 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_LilycoveMuseum_2F: @ 848368C .2byte 104 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc index 3bc7054981..1adc065dd8 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -7,7 +7,7 @@ LilycoveCity_MoveDeletersHouse: @ 848376C .2byte 60 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc index 2dd8591340..92bc0e9d9f 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_PokemonCenter_1F: @ 84836E0 .2byte 61 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc index df902a25be..1ae72be257 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_PokemonCenter_2F: @ 84836FC .2byte 62 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc index f429787fad..2137aecc90 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc @@ -7,7 +7,7 @@ LilycoveCity_PokemonTrainerFanClub: @ 8483734 .2byte 107 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc index 09869a0a5e..ecff7b16f2 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ b/data/maps/LilycoveCity_UnusedMart/header.inc @@ -7,7 +7,7 @@ LilycoveCity_UnusedMart: @ 8483718 .2byte 63 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc index bcb120e6ba..8b35b2629b 100644 --- a/data/maps/LinkContestRoom1/header.inc +++ b/data/maps/LinkContestRoom1/header.inc @@ -7,7 +7,7 @@ LinkContestRoom1: @ 8484DA0 .2byte 225 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index 298bbad57a..b8e3e18226 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -7,7 +7,7 @@ LinkContestRoom2: @ 8484E64 .2byte 232 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index 3c60ff6496..5b1e2d8f3e 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -7,7 +7,7 @@ LinkContestRoom3: @ 8484E80 .2byte 233 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index 6be3dba3f8..6a4190ca74 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -7,7 +7,7 @@ LinkContestRoom4: @ 8484E9C .2byte 234 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index d929ef7423..bf95bb2ef1 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -7,7 +7,7 @@ LinkContestRoom5: @ 8484EB8 .2byte 235 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index cc2a56e799..231f31001c 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -7,7 +7,7 @@ LinkContestRoom6: @ 8484ED4 .2byte 236 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc index dbc6effd61..5fb0a6eab3 100644 --- a/data/maps/LittlerootTown/header.inc +++ b/data/maps/LittlerootTown/header.inc @@ -7,7 +7,7 @@ LittlerootTown: @ 84825B4 .2byte 10 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 1 .2byte 0 .byte 13 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc index f4b411a067..69eff71f70 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc @@ -7,7 +7,7 @@ LittlerootTown_BrendansHouse_1F: @ 8482AF4 .2byte 54 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc index 39a81acd15..7b5fa73758 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc @@ -7,7 +7,7 @@ LittlerootTown_BrendansHouse_2F: @ 8482B10 .2byte 55 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc index 821cacc0bd..56b925c2a3 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc @@ -7,7 +7,7 @@ LittlerootTown_MaysHouse_1F: @ 8482B2C .2byte 56 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc index 711c8b3810..496d3cf831 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc @@ -7,7 +7,7 @@ LittlerootTown_MaysHouse_2F: @ 8482B48 .2byte 57 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc index 18b6d4d612..7ba2b7e0e2 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc @@ -7,7 +7,7 @@ LittlerootTown_ProfessorBirchsLab: @ 8482B64 .2byte 58 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc index c82b22bc3f..65e781626a 100644 --- a/data/maps/MagmaHideout_1F/header.inc +++ b/data/maps/MagmaHideout_1F/header.inc @@ -7,7 +7,7 @@ MagmaHideout_1F: @ 8484828 .2byte 336 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MagmaHideout_2F_1R/header.inc b/data/maps/MagmaHideout_2F_1R/header.inc index 2615020892..50bf554d75 100644 --- a/data/maps/MagmaHideout_2F_1R/header.inc +++ b/data/maps/MagmaHideout_2F_1R/header.inc @@ -7,7 +7,7 @@ MagmaHideout_2F_1R: @ 8484844 .2byte 337 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MagmaHideout_2F_2R/header.inc b/data/maps/MagmaHideout_2F_2R/header.inc index 5032b25a6c..376c2f232e 100644 --- a/data/maps/MagmaHideout_2F_2R/header.inc +++ b/data/maps/MagmaHideout_2F_2R/header.inc @@ -7,7 +7,7 @@ MagmaHideout_2F_2R: @ 8484860 .2byte 338 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MagmaHideout_2F_3R/header.inc b/data/maps/MagmaHideout_2F_3R/header.inc index fefbbfb8d3..bc8816d1c8 100644 --- a/data/maps/MagmaHideout_2F_3R/header.inc +++ b/data/maps/MagmaHideout_2F_3R/header.inc @@ -7,7 +7,7 @@ MagmaHideout_2F_3R: @ 84848EC .2byte 380 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MagmaHideout_3F_1R/header.inc b/data/maps/MagmaHideout_3F_1R/header.inc index 52ad4945e6..412756e49c 100644 --- a/data/maps/MagmaHideout_3F_1R/header.inc +++ b/data/maps/MagmaHideout_3F_1R/header.inc @@ -7,7 +7,7 @@ MagmaHideout_3F_1R: @ 848487C .2byte 339 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MagmaHideout_3F_2R/header.inc b/data/maps/MagmaHideout_3F_2R/header.inc index 14d6eeff63..d0ae8c4e11 100644 --- a/data/maps/MagmaHideout_3F_2R/header.inc +++ b/data/maps/MagmaHideout_3F_2R/header.inc @@ -7,7 +7,7 @@ MagmaHideout_3F_2R: @ 8484898 .2byte 340 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MagmaHideout_3F_3R/header.inc b/data/maps/MagmaHideout_3F_3R/header.inc index 8e27ddbae1..f27df336ce 100644 --- a/data/maps/MagmaHideout_3F_3R/header.inc +++ b/data/maps/MagmaHideout_3F_3R/header.inc @@ -7,7 +7,7 @@ MagmaHideout_3F_3R: @ 84848D0 .2byte 379 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MagmaHideout_4F/header.inc b/data/maps/MagmaHideout_4F/header.inc index b32ba1b057..7788998309 100644 --- a/data/maps/MagmaHideout_4F/header.inc +++ b/data/maps/MagmaHideout_4F/header.inc @@ -7,7 +7,7 @@ MagmaHideout_4F: @ 84848B4 .2byte 341 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MarineCave_End/header.inc b/data/maps/MarineCave_End/header.inc index 41c7c1a860..da43bbc462 100644 --- a/data/maps/MarineCave_End/header.inc +++ b/data/maps/MarineCave_End/header.inc @@ -7,7 +7,7 @@ MarineCave_End: @ 8484A04 .2byte 413 .byte MAPSEC_MARINE_CAVE .byte 0 - .byte 6 + .byte WEATHER_FOG_1 .byte 4 .2byte 0 .byte 14 diff --git a/data/maps/MarineCave_Entrance/header.inc b/data/maps/MarineCave_Entrance/header.inc index 1affd12138..6432ee987b 100644 --- a/data/maps/MarineCave_Entrance/header.inc +++ b/data/maps/MarineCave_Entrance/header.inc @@ -7,7 +7,7 @@ MarineCave_Entrance: @ 84849E8 .2byte 407 .byte MAPSEC_MARINE_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 14 diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc index bd14b94bf9..a6a3db192e 100644 --- a/data/maps/MauvilleCity/header.inc +++ b/data/maps/MauvilleCity/header.inc @@ -7,7 +7,7 @@ MauvilleCity: @ 84824F0 .2byte 3 .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 2 .2byte 0 .byte 13 diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc index 2ad55f4085..942859e0cc 100644 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ b/data/maps/MauvilleCity_BikeShop/header.inc @@ -7,7 +7,7 @@ MauvilleCity_BikeShop: @ 8483280 .2byte 90 .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc index 24dd5d97d1..20e6b5a090 100644 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ b/data/maps/MauvilleCity_GameCorner/header.inc @@ -7,7 +7,7 @@ MauvilleCity_GameCorner: @ 84832B8 .2byte 91 .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc index 21aa7c9914..e10fa76c80 100644 --- a/data/maps/MauvilleCity_Gym/header.inc +++ b/data/maps/MauvilleCity_Gym/header.inc @@ -7,7 +7,7 @@ MauvilleCity_Gym: @ 8483264 .2byte 89 .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc index 719e88b1f3..b5f6b91758 100644 --- a/data/maps/MauvilleCity_House1/header.inc +++ b/data/maps/MauvilleCity_House1/header.inc @@ -7,7 +7,7 @@ MauvilleCity_House1: @ 848329C .2byte 60 .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc index 0ab38aa38d..fe7b14fcc2 100644 --- a/data/maps/MauvilleCity_House2/header.inc +++ b/data/maps/MauvilleCity_House2/header.inc @@ -7,7 +7,7 @@ MauvilleCity_House2: @ 84832D4 .2byte 59 .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc index 6e029f7860..082ff60457 100644 --- a/data/maps/MauvilleCity_Mart/header.inc +++ b/data/maps/MauvilleCity_Mart/header.inc @@ -7,7 +7,7 @@ MauvilleCity_Mart: @ 8483328 .2byte 63 .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc index b2b2e21ce7..ddc901f444 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ MauvilleCity_PokemonCenter_1F: @ 84832F0 .2byte 61 .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc index aaefbba0a6..e4981b2771 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ MauvilleCity_PokemonCenter_2F: @ 848330C .2byte 62 .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc index 6cc631f65d..2b012f5b83 100644 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ b/data/maps/MeteorFalls_1F_1R/header.inc @@ -7,7 +7,7 @@ MeteorFalls_1F_1R: @ 8483EC0 .2byte 125 .byte MAPSEC_METEOR_FALLS .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc index f225660d08..e2b3524064 100644 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ b/data/maps/MeteorFalls_1F_2R/header.inc @@ -7,7 +7,7 @@ MeteorFalls_1F_2R: @ 8483EDC .2byte 126 .byte MAPSEC_METEOR_FALLS .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc index ea434e50bb..a90a21049c 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ b/data/maps/MeteorFalls_B1F_1R/header.inc @@ -7,7 +7,7 @@ MeteorFalls_B1F_1R: @ 8483EF8 .2byte 127 .byte MAPSEC_METEOR_FALLS .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc index b820706f5b..df6a9ee01f 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ b/data/maps/MeteorFalls_B1F_2R/header.inc @@ -7,7 +7,7 @@ MeteorFalls_B1F_2R: @ 8483F14 .2byte 128 .byte MAPSEC_METEOR_FALLS .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MeteorFalls_StevensCave/header.inc b/data/maps/MeteorFalls_StevensCave/header.inc index 002031a7af..cf9796360d 100644 --- a/data/maps/MeteorFalls_StevensCave/header.inc +++ b/data/maps/MeteorFalls_StevensCave/header.inc @@ -7,7 +7,7 @@ MeteorFalls_StevensCave: @ 8484A74 .2byte 431 .byte MAPSEC_METEOR_FALLS .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MirageTower_1F/header.inc b/data/maps/MirageTower_1F/header.inc index a9cf03b39a..90bc41a909 100644 --- a/data/maps/MirageTower_1F/header.inc +++ b/data/maps/MirageTower_1F/header.inc @@ -7,7 +7,7 @@ MirageTower_1F: @ 8484908 .2byte 381 .byte MAPSEC_MIRAGE_TOWER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MirageTower_2F/header.inc b/data/maps/MirageTower_2F/header.inc index 0c983da36d..4a984edeac 100644 --- a/data/maps/MirageTower_2F/header.inc +++ b/data/maps/MirageTower_2F/header.inc @@ -7,7 +7,7 @@ MirageTower_2F: @ 8484924 .2byte 382 .byte MAPSEC_MIRAGE_TOWER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MirageTower_3F/header.inc b/data/maps/MirageTower_3F/header.inc index c26f56dea1..c3c126d56e 100644 --- a/data/maps/MirageTower_3F/header.inc +++ b/data/maps/MirageTower_3F/header.inc @@ -7,7 +7,7 @@ MirageTower_3F: @ 8484940 .2byte 383 .byte MAPSEC_MIRAGE_TOWER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MirageTower_4F/header.inc b/data/maps/MirageTower_4F/header.inc index fc49e37a97..c0b51c1748 100644 --- a/data/maps/MirageTower_4F/header.inc +++ b/data/maps/MirageTower_4F/header.inc @@ -7,7 +7,7 @@ MirageTower_4F: @ 848495C .2byte 388 .byte MAPSEC_MIRAGE_TOWER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc index 2c7c774d3e..eba3043638 100644 --- a/data/maps/MossdeepCity/header.inc +++ b/data/maps/MossdeepCity/header.inc @@ -7,7 +7,7 @@ MossdeepCity: @ 8482560 .2byte 7 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 2 .2byte 0 .byte 13 diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc index 75074e91f6..b04ffb8728 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc @@ -7,7 +7,7 @@ MossdeepCity_GameCorner_1F: @ 84839F0 .2byte 305 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc index 14e89db1cd..d0b115b372 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc @@ -7,7 +7,7 @@ MossdeepCity_GameCorner_B1F: @ 8483A0C .2byte 306 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc index 2ce3b8eaae..df190975c2 100644 --- a/data/maps/MossdeepCity_Gym/header.inc +++ b/data/maps/MossdeepCity_Gym/header.inc @@ -7,7 +7,7 @@ MossdeepCity_Gym: @ 84838BC .2byte 108 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc index 8b7112431e..0843eb3f4d 100644 --- a/data/maps/MossdeepCity_House1/header.inc +++ b/data/maps/MossdeepCity_House1/header.inc @@ -7,7 +7,7 @@ MossdeepCity_House1: @ 84838D8 .2byte 60 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc index 72e0f38ab3..b844bd961b 100644 --- a/data/maps/MossdeepCity_House2/header.inc +++ b/data/maps/MossdeepCity_House2/header.inc @@ -7,7 +7,7 @@ MossdeepCity_House2: @ 84838F4 .2byte 59 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc index 8e56d6f53a..6e47ed443a 100644 --- a/data/maps/MossdeepCity_House3/header.inc +++ b/data/maps/MossdeepCity_House3/header.inc @@ -7,7 +7,7 @@ MossdeepCity_House3: @ 8483964 .2byte 60 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc index d5f7f5db90..dbd201c2ef 100644 --- a/data/maps/MossdeepCity_House4/header.inc +++ b/data/maps/MossdeepCity_House4/header.inc @@ -7,7 +7,7 @@ MossdeepCity_House4: @ 848399C .2byte 80 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc index 80bc3bc38f..72dc8a4097 100644 --- a/data/maps/MossdeepCity_Mart/header.inc +++ b/data/maps/MossdeepCity_Mart/header.inc @@ -7,7 +7,7 @@ MossdeepCity_Mart: @ 8483948 .2byte 63 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc index 2277dd1739..e39eb81830 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ MossdeepCity_PokemonCenter_1F: @ 8483910 .2byte 61 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc index 59c6ea2c89..022761465c 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ MossdeepCity_PokemonCenter_2F: @ 848392C .2byte 62 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc index ea035f4bee..c38fc57eb8 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc @@ -7,7 +7,7 @@ MossdeepCity_SpaceCenter_1F: @ 84839B8 .2byte 275 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc index e1418859bf..53fb8a06a0 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc @@ -7,7 +7,7 @@ MossdeepCity_SpaceCenter_2F: @ 84839D4 .2byte 276 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc index 070effff6d..43b5f92cfd 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ b/data/maps/MossdeepCity_StevensHouse/header.inc @@ -7,7 +7,7 @@ MossdeepCity_StevensHouse: @ 8483980 .2byte 327 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc index 8d060e4012..29c068992e 100644 --- a/data/maps/MtChimney/header.inc +++ b/data/maps/MtChimney/header.inc @@ -7,7 +7,7 @@ MtChimney: @ 8484010 .2byte 136 .byte MAPSEC_MT_CHIMNEY .byte 0 - .byte 7 + .byte WEATHER_ASH .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc index 7c1e49a997..3de6d823ea 100644 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ b/data/maps/MtChimney_CableCarStation/header.inc @@ -7,7 +7,7 @@ MtChimney_CableCarStation: @ 8483DFC .2byte 118 .byte MAPSEC_MT_CHIMNEY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index 9e903d5b67..88306a7dee 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -7,7 +7,7 @@ MtPyre_1F: @ 8484064 .2byte 137 .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 8 diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc index 4f3687bf27..0afddfb49c 100644 --- a/data/maps/MtPyre_2F/header.inc +++ b/data/maps/MtPyre_2F/header.inc @@ -7,7 +7,7 @@ MtPyre_2F: @ 8484080 .2byte 138 .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 8 diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc index 28721a7570..8ccabb8c88 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -7,7 +7,7 @@ MtPyre_3F: @ 848409C .2byte 139 .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 8 diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc index a0be9d5992..22a41d25ce 100644 --- a/data/maps/MtPyre_4F/header.inc +++ b/data/maps/MtPyre_4F/header.inc @@ -7,7 +7,7 @@ MtPyre_4F: @ 84840B8 .2byte 140 .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 8 diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc index 7e756e8f5e..47f92d2c87 100644 --- a/data/maps/MtPyre_5F/header.inc +++ b/data/maps/MtPyre_5F/header.inc @@ -7,7 +7,7 @@ MtPyre_5F: @ 84840D4 .2byte 141 .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 8 diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc index b9c9f38c56..ceaceca411 100644 --- a/data/maps/MtPyre_6F/header.inc +++ b/data/maps/MtPyre_6F/header.inc @@ -7,7 +7,7 @@ MtPyre_6F: @ 84840F0 .2byte 142 .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 8 diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc index aba767d32a..c5e7576cfe 100644 --- a/data/maps/MtPyre_Exterior/header.inc +++ b/data/maps/MtPyre_Exterior/header.inc @@ -7,7 +7,7 @@ MtPyre_Exterior: @ 848410C .2byte 302 .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc index 10b8c44de2..29597bceb2 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -7,7 +7,7 @@ MtPyre_Summit: @ 8484128 .2byte 303 .byte MAPSEC_MT_PYRE .byte 0 - .byte 6 + .byte WEATHER_FOG_1 .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc index 1d982d11f0..2f8d472d29 100644 --- a/data/maps/NavelRock_B1F/header.inc +++ b/data/maps/NavelRock_B1F/header.inc @@ -7,7 +7,7 @@ NavelRock_B1F: @ 84858C8 .2byte 427 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Bottom/header.inc b/data/maps/NavelRock_Bottom/header.inc index ccd6e4de47..ee2eeb102e 100644 --- a/data/maps/NavelRock_Bottom/header.inc +++ b/data/maps/NavelRock_Bottom/header.inc @@ -7,7 +7,7 @@ NavelRock_Bottom: @ 8485AC0 .2byte 424 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Down01/header.inc b/data/maps/NavelRock_Down01/header.inc index 2d6f6cdc1c..8b11f8d937 100644 --- a/data/maps/NavelRock_Down01/header.inc +++ b/data/maps/NavelRock_Down01/header.inc @@ -7,7 +7,7 @@ NavelRock_Down01: @ 848598C .2byte 425 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Down02/header.inc b/data/maps/NavelRock_Down02/header.inc index 6146db29c5..0b56cba11e 100644 --- a/data/maps/NavelRock_Down02/header.inc +++ b/data/maps/NavelRock_Down02/header.inc @@ -7,7 +7,7 @@ NavelRock_Down02: @ 84859A8 .2byte 426 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Down03/header.inc b/data/maps/NavelRock_Down03/header.inc index 0a0601117a..a674e38491 100644 --- a/data/maps/NavelRock_Down03/header.inc +++ b/data/maps/NavelRock_Down03/header.inc @@ -7,7 +7,7 @@ NavelRock_Down03: @ 84859C4 .2byte 425 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Down04/header.inc b/data/maps/NavelRock_Down04/header.inc index f1014f5e8c..34359e5b89 100644 --- a/data/maps/NavelRock_Down04/header.inc +++ b/data/maps/NavelRock_Down04/header.inc @@ -7,7 +7,7 @@ NavelRock_Down04: @ 84859E0 .2byte 426 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Down05/header.inc b/data/maps/NavelRock_Down05/header.inc index e638b93063..2be325badf 100644 --- a/data/maps/NavelRock_Down05/header.inc +++ b/data/maps/NavelRock_Down05/header.inc @@ -7,7 +7,7 @@ NavelRock_Down05: @ 84859FC .2byte 425 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Down06/header.inc b/data/maps/NavelRock_Down06/header.inc index db7bbbb92a..c38950b205 100644 --- a/data/maps/NavelRock_Down06/header.inc +++ b/data/maps/NavelRock_Down06/header.inc @@ -7,7 +7,7 @@ NavelRock_Down06: @ 8485A18 .2byte 426 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Down07/header.inc b/data/maps/NavelRock_Down07/header.inc index 27c228fe8b..65af6ccd8e 100644 --- a/data/maps/NavelRock_Down07/header.inc +++ b/data/maps/NavelRock_Down07/header.inc @@ -7,7 +7,7 @@ NavelRock_Down07: @ 8485A34 .2byte 425 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Down08/header.inc b/data/maps/NavelRock_Down08/header.inc index 5cf41ad244..fd08b39ea9 100644 --- a/data/maps/NavelRock_Down08/header.inc +++ b/data/maps/NavelRock_Down08/header.inc @@ -7,7 +7,7 @@ NavelRock_Down08: @ 8485A50 .2byte 426 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Down09/header.inc b/data/maps/NavelRock_Down09/header.inc index b82c99552c..9b22ca051c 100644 --- a/data/maps/NavelRock_Down09/header.inc +++ b/data/maps/NavelRock_Down09/header.inc @@ -7,7 +7,7 @@ NavelRock_Down09: @ 8485A6C .2byte 425 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Down10/header.inc b/data/maps/NavelRock_Down10/header.inc index 2b1826572a..4301b5f93f 100644 --- a/data/maps/NavelRock_Down10/header.inc +++ b/data/maps/NavelRock_Down10/header.inc @@ -7,7 +7,7 @@ NavelRock_Down10: @ 8485A88 .2byte 426 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Down11/header.inc b/data/maps/NavelRock_Down11/header.inc index 19fc50327c..a45e057954 100644 --- a/data/maps/NavelRock_Down11/header.inc +++ b/data/maps/NavelRock_Down11/header.inc @@ -7,7 +7,7 @@ NavelRock_Down11: @ 8485AA4 .2byte 425 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Entrance/header.inc b/data/maps/NavelRock_Entrance/header.inc index 2a302f904a..5509d0cde6 100644 --- a/data/maps/NavelRock_Entrance/header.inc +++ b/data/maps/NavelRock_Entrance/header.inc @@ -7,7 +7,7 @@ NavelRock_Entrance: @ 84858AC .2byte 422 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc index 4122b51cca..ed9234f349 100644 --- a/data/maps/NavelRock_Exterior/header.inc +++ b/data/maps/NavelRock_Exterior/header.inc @@ -7,7 +7,7 @@ NavelRock_Exterior: @ 8485874 .2byte 421 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 13 diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc index d6da1a2c94..73aab8ad6e 100644 --- a/data/maps/NavelRock_Fork/header.inc +++ b/data/maps/NavelRock_Fork/header.inc @@ -7,7 +7,7 @@ NavelRock_Fork: @ 84858E4 .2byte 428 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc index f74ca0cdd4..9e60e032fb 100644 --- a/data/maps/NavelRock_Harbor/header.inc +++ b/data/maps/NavelRock_Harbor/header.inc @@ -7,7 +7,7 @@ NavelRock_Harbor: @ 8485890 .2byte 405 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/NavelRock_Top/header.inc b/data/maps/NavelRock_Top/header.inc index 464e1d3ec4..3a1c8254da 100644 --- a/data/maps/NavelRock_Top/header.inc +++ b/data/maps/NavelRock_Top/header.inc @@ -7,7 +7,7 @@ NavelRock_Top: @ 8485970 .2byte 423 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Up1/header.inc b/data/maps/NavelRock_Up1/header.inc index ebc18196d3..41a342eb38 100644 --- a/data/maps/NavelRock_Up1/header.inc +++ b/data/maps/NavelRock_Up1/header.inc @@ -7,7 +7,7 @@ NavelRock_Up1: @ 8485900 .2byte 425 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Up2/header.inc b/data/maps/NavelRock_Up2/header.inc index d259d7af2e..db13a9adf5 100644 --- a/data/maps/NavelRock_Up2/header.inc +++ b/data/maps/NavelRock_Up2/header.inc @@ -7,7 +7,7 @@ NavelRock_Up2: @ 848591C .2byte 426 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Up3/header.inc b/data/maps/NavelRock_Up3/header.inc index 12cc5aed76..e6e1406960 100644 --- a/data/maps/NavelRock_Up3/header.inc +++ b/data/maps/NavelRock_Up3/header.inc @@ -7,7 +7,7 @@ NavelRock_Up3: @ 8485938 .2byte 425 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Up4/header.inc b/data/maps/NavelRock_Up4/header.inc index 6455c85558..be297090a8 100644 --- a/data/maps/NavelRock_Up4/header.inc +++ b/data/maps/NavelRock_Up4/header.inc @@ -7,7 +7,7 @@ NavelRock_Up4: @ 8485954 .2byte 426 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc index 212457f724..08df718853 100644 --- a/data/maps/NewMauville_Entrance/header.inc +++ b/data/maps/NewMauville_Entrance/header.inc @@ -7,7 +7,7 @@ NewMauville_Entrance: @ 8484470 .2byte 184 .byte MAPSEC_NEW_MAUVILLE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc index 637ac378eb..87628d4cf4 100644 --- a/data/maps/NewMauville_Inside/header.inc +++ b/data/maps/NewMauville_Inside/header.inc @@ -7,7 +7,7 @@ NewMauville_Inside: @ 848448C .2byte 185 .byte MAPSEC_NEW_MAUVILLE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc index 16fb5aca07..de85668233 100644 --- a/data/maps/OldaleTown/header.inc +++ b/data/maps/OldaleTown/header.inc @@ -7,7 +7,7 @@ OldaleTown: @ 84825D0 .2byte 11 .byte MAPSEC_OLDALE_TOWN .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 1 .2byte 0 .byte 13 diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc index f593d5769b..0accc508b9 100644 --- a/data/maps/OldaleTown_House1/header.inc +++ b/data/maps/OldaleTown_House1/header.inc @@ -7,7 +7,7 @@ OldaleTown_House1: @ 8482B80 .2byte 59 .byte MAPSEC_OLDALE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc index f7a265561e..2d6cffcfad 100644 --- a/data/maps/OldaleTown_House2/header.inc +++ b/data/maps/OldaleTown_House2/header.inc @@ -7,7 +7,7 @@ OldaleTown_House2: @ 8482B9C .2byte 60 .byte MAPSEC_OLDALE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc index 09fb145c8a..d2bc44d392 100644 --- a/data/maps/OldaleTown_Mart/header.inc +++ b/data/maps/OldaleTown_Mart/header.inc @@ -7,7 +7,7 @@ OldaleTown_Mart: @ 8482BF0 .2byte 63 .byte MAPSEC_OLDALE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc index dd942886a9..2a09884758 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ OldaleTown_PokemonCenter_1F: @ 8482BB8 .2byte 61 .byte MAPSEC_OLDALE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc index 21e6fc1f9e..b1399a1b0a 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ OldaleTown_PokemonCenter_2F: @ 8482BD4 .2byte 62 .byte MAPSEC_OLDALE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc index 3e4d88784c..f903637a36 100644 --- a/data/maps/PacifidlogTown/header.inc +++ b/data/maps/PacifidlogTown/header.inc @@ -7,7 +7,7 @@ PacifidlogTown: @ 848265C .2byte 16 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 1 .2byte 0 .byte 13 diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc index 95d820a953..90098ec2c1 100644 --- a/data/maps/PacifidlogTown_House1/header.inc +++ b/data/maps/PacifidlogTown_House1/header.inc @@ -7,7 +7,7 @@ PacifidlogTown_House1: @ 8482F8C .2byte 77 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc index 79c591b4a2..a1433fbbce 100644 --- a/data/maps/PacifidlogTown_House2/header.inc +++ b/data/maps/PacifidlogTown_House2/header.inc @@ -7,7 +7,7 @@ PacifidlogTown_House2: @ 8482FA8 .2byte 78 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc index 5222263f1c..28d0fd8a5e 100644 --- a/data/maps/PacifidlogTown_House3/header.inc +++ b/data/maps/PacifidlogTown_House3/header.inc @@ -7,7 +7,7 @@ PacifidlogTown_House3: @ 8482FC4 .2byte 77 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc index 3774ccf3e7..adbd42c6a3 100644 --- a/data/maps/PacifidlogTown_House4/header.inc +++ b/data/maps/PacifidlogTown_House4/header.inc @@ -7,7 +7,7 @@ PacifidlogTown_House4: @ 8482FE0 .2byte 78 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc index b8789b2492..b30fb80d37 100644 --- a/data/maps/PacifidlogTown_House5/header.inc +++ b/data/maps/PacifidlogTown_House5/header.inc @@ -7,7 +7,7 @@ PacifidlogTown_House5: @ 8482FFC .2byte 77 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc index 6fdc148e33..6d95c3b6e8 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ PacifidlogTown_PokemonCenter_1F: @ 8482F54 .2byte 61 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc index dc78b95ac6..9cc1d04703 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ PacifidlogTown_PokemonCenter_2F: @ 8482F70 .2byte 62 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index fab1f946c5..bd94ab120a 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -7,7 +7,7 @@ PetalburgCity: @ 84824B8 .2byte 1 .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 2 .2byte 0 .byte 13 diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc index 6d3a477bee..661552e20b 100644 --- a/data/maps/PetalburgCity_Gym/header.inc +++ b/data/maps/PetalburgCity_Gym/header.inc @@ -7,7 +7,7 @@ PetalburgCity_Gym: @ 8483034 .2byte 79 .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc index 7f96551539..00e26fe1ae 100644 --- a/data/maps/PetalburgCity_House1/header.inc +++ b/data/maps/PetalburgCity_House1/header.inc @@ -7,7 +7,7 @@ PetalburgCity_House1: @ 8483050 .2byte 59 .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc index 8471a0f012..1a643f7e24 100644 --- a/data/maps/PetalburgCity_House2/header.inc +++ b/data/maps/PetalburgCity_House2/header.inc @@ -7,7 +7,7 @@ PetalburgCity_House2: @ 848306C .2byte 80 .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc index d7b062ba23..85d8331a1e 100644 --- a/data/maps/PetalburgCity_Mart/header.inc +++ b/data/maps/PetalburgCity_Mart/header.inc @@ -7,7 +7,7 @@ PetalburgCity_Mart: @ 84830C0 .2byte 63 .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc index 6dc976d05a..3369580886 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ PetalburgCity_PokemonCenter_1F: @ 8483088 .2byte 61 .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc index 46f83636fd..7b1e01861f 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ PetalburgCity_PokemonCenter_2F: @ 84830A4 .2byte 62 .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc index b6a064a8eb..68c746b58e 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -7,7 +7,7 @@ PetalburgCity_WallysHouse: @ 8483018 .2byte 60 .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc index b7f1ad8184..bda2a3ab52 100644 --- a/data/maps/PetalburgWoods/header.inc +++ b/data/maps/PetalburgWoods/header.inc @@ -7,7 +7,7 @@ PetalburgWoods: @ 8483FF4 .2byte 135 .byte MAPSEC_PETALBURG_WOODS .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc index aa3a7dd199..4d4583acfe 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -7,7 +7,7 @@ RecordCorner: @ 8484D68 .2byte 223 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc index 34a1ef7642..0c76acfbc9 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -7,7 +7,7 @@ Route101: @ 8482678 .2byte 17 .byte MAPSEC_ROUTE_101 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index 8a3b38d627..33e22d3bd3 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -7,7 +7,7 @@ Route102: @ 8482694 .2byte 18 .byte MAPSEC_ROUTE_102 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc index e59af7c13d..22f0976d32 100644 --- a/data/maps/Route103/header.inc +++ b/data/maps/Route103/header.inc @@ -7,7 +7,7 @@ Route103: @ 84826B0 .2byte 19 .byte MAPSEC_ROUTE_103 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc index 4d600499c0..02019604da 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -7,7 +7,7 @@ Route104: @ 84826CC .2byte 20 .byte MAPSEC_ROUTE_104 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc index 14b8c18010..e67afc46cc 100644 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ b/data/maps/Route104_MrBrineysHouse/header.inc @@ -7,7 +7,7 @@ Route104_MrBrineysHouse: @ 8483D70 .2byte 102 .byte MAPSEC_ROUTE_104 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc index b951291581..caf3f3f864 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc @@ -7,7 +7,7 @@ Route104_PrettyPetalFlowerShop: @ 8483D8C .2byte 117 .byte MAPSEC_ROUTE_104 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc index 6c60ccfbe0..ca694df004 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -7,7 +7,7 @@ Route104_Prototype: @ 8485AF8 .2byte 287 .byte MAPSEC_ROUTE_104 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 8 diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc index 24cc091e90..87a7945244 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc @@ -7,7 +7,7 @@ Route104_PrototypePrettyPetalFlowerShop: @ 8485B14 .2byte 117 .byte MAPSEC_ROUTE_104 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 8 diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc index 3b34c3e70a..a55cb3edea 100644 --- a/data/maps/Route105/header.inc +++ b/data/maps/Route105/header.inc @@ -7,7 +7,7 @@ Route105: @ 84826E8 .2byte 21 .byte MAPSEC_ROUTE_105 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index 51dfac9e3a..df51d42223 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -7,7 +7,7 @@ Route106: @ 8482704 .2byte 22 .byte MAPSEC_ROUTE_106 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc index 2c61323b5b..09a47a2aea 100644 --- a/data/maps/Route107/header.inc +++ b/data/maps/Route107/header.inc @@ -7,7 +7,7 @@ Route107: @ 8482720 .2byte 23 .byte MAPSEC_ROUTE_107 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index eb982f2dec..3b55160d8d 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -7,7 +7,7 @@ Route108: @ 848273C .2byte 24 .byte MAPSEC_ROUTE_108 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc index b4e5776789..30f3501a59 100644 --- a/data/maps/Route109/header.inc +++ b/data/maps/Route109/header.inc @@ -7,7 +7,7 @@ Route109: @ 8482758 .2byte 25 .byte MAPSEC_ROUTE_109 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc index 68ae187baa..c9cbe2d23f 100644 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ b/data/maps/Route109_SeashoreHouse/header.inc @@ -7,7 +7,7 @@ Route109_SeashoreHouse: @ 8485B30 .2byte 243 .byte MAPSEC_ROUTE_109 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc index 55bd7dbd02..92157a59d7 100644 --- a/data/maps/Route110/header.inc +++ b/data/maps/Route110/header.inc @@ -7,7 +7,7 @@ Route110: @ 8482774 .2byte 26 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc index a271dba584..3105a321db 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc @@ -7,7 +7,7 @@ Route110_SeasideCyclingRoadNorthEntrance: @ 8485C80 .2byte 256 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 1 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc index 811184bd9a..45260d6c41 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc @@ -7,7 +7,7 @@ Route110_SeasideCyclingRoadSouthEntrance: @ 8485C9C .2byte 256 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 1 diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc index 07a795f3ae..815a6a9e10 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ b/data/maps/Route110_TrickHouseCorridor/header.inc @@ -7,7 +7,7 @@ Route110_TrickHouseCorridor: @ 8485B84 .2byte 246 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc index 0ed34b2d17..86e923bb4d 100644 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ b/data/maps/Route110_TrickHouseEnd/header.inc @@ -7,7 +7,7 @@ Route110_TrickHouseEnd: @ 8485B68 .2byte 245 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc index 5a90430fd2..7eb37293a0 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ b/data/maps/Route110_TrickHouseEntrance/header.inc @@ -7,7 +7,7 @@ Route110_TrickHouseEntrance: @ 8485B4C .2byte 244 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc index c5620a2ce3..1b8a7249b2 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ b/data/maps/Route110_TrickHousePuzzle1/header.inc @@ -7,7 +7,7 @@ Route110_TrickHousePuzzle1: @ 8485BA0 .2byte 247 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc index 202a75774d..1832db9ee2 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ b/data/maps/Route110_TrickHousePuzzle2/header.inc @@ -7,7 +7,7 @@ Route110_TrickHousePuzzle2: @ 8485BBC .2byte 248 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc index 2ad32f43f5..b4f7a2ac86 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ b/data/maps/Route110_TrickHousePuzzle3/header.inc @@ -7,7 +7,7 @@ Route110_TrickHousePuzzle3: @ 8485BD8 .2byte 249 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc index 40b394a276..5c33fa74a5 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ b/data/maps/Route110_TrickHousePuzzle4/header.inc @@ -7,7 +7,7 @@ Route110_TrickHousePuzzle4: @ 8485BF4 .2byte 250 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc index 9bb6f40b93..049a1b49bd 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ b/data/maps/Route110_TrickHousePuzzle5/header.inc @@ -7,7 +7,7 @@ Route110_TrickHousePuzzle5: @ 8485C10 .2byte 251 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc index fa3bc610ac..e312c1439d 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ b/data/maps/Route110_TrickHousePuzzle6/header.inc @@ -7,7 +7,7 @@ Route110_TrickHousePuzzle6: @ 8485C2C .2byte 252 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc index 8a9f6e6cd9..d962c50eab 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ b/data/maps/Route110_TrickHousePuzzle7/header.inc @@ -7,7 +7,7 @@ Route110_TrickHousePuzzle7: @ 8485C48 .2byte 253 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc index 8023f4478e..ce6caf06e7 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ b/data/maps/Route110_TrickHousePuzzle8/header.inc @@ -7,7 +7,7 @@ Route110_TrickHousePuzzle8: @ 8485C64 .2byte 254 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc index a65a8c849c..df43dd19c4 100644 --- a/data/maps/Route111/header.inc +++ b/data/maps/Route111/header.inc @@ -7,7 +7,7 @@ Route111: @ 8482790 .2byte 27 .byte MAPSEC_ROUTE_111 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc index 2f827017f2..05d4e14f1b 100644 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ b/data/maps/Route111_OldLadysRestStop/header.inc @@ -7,7 +7,7 @@ Route111_OldLadysRestStop: @ 8483DC4 .2byte 64 .byte MAPSEC_ROUTE_111 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc index 909277b85c..79e7c76de0 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -7,7 +7,7 @@ Route111_WinstrateFamilysHouse: @ 8483DA8 .2byte 60 .byte MAPSEC_ROUTE_111 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc index 24589a71e3..01bf8a4377 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -7,7 +7,7 @@ Route112: @ 84827AC .2byte 28 .byte MAPSEC_ROUTE_112 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc index dff57293ea..8a650439d6 100644 --- a/data/maps/Route112_CableCarStation/header.inc +++ b/data/maps/Route112_CableCarStation/header.inc @@ -7,7 +7,7 @@ Route112_CableCarStation: @ 8483DE0 .2byte 118 .byte MAPSEC_ROUTE_112 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc index 3ed0f54553..bbcb77d41c 100644 --- a/data/maps/Route113/header.inc +++ b/data/maps/Route113/header.inc @@ -7,7 +7,7 @@ Route113: @ 84827C8 .2byte 29 .byte MAPSEC_ROUTE_113 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc index 5298c41c2b..77ecfd0025 100644 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ b/data/maps/Route113_GlassWorkshop/header.inc @@ -7,7 +7,7 @@ Route113_GlassWorkshop: @ 8485CB8 .2byte 67 .byte MAPSEC_ROUTE_113 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc index d717c1235a..ab90821ee8 100644 --- a/data/maps/Route114/header.inc +++ b/data/maps/Route114/header.inc @@ -7,7 +7,7 @@ Route114: @ 84827E4 .2byte 30 .byte MAPSEC_ROUTE_114 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc index 01ac3e4dd3..459238ffd9 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ b/data/maps/Route114_FossilManiacsHouse/header.inc @@ -7,7 +7,7 @@ Route114_FossilManiacsHouse: @ 8483E18 .2byte 119 .byte MAPSEC_ROUTE_114 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc index b3794190b7..47fabca3bf 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ b/data/maps/Route114_FossilManiacsTunnel/header.inc @@ -7,7 +7,7 @@ Route114_FossilManiacsTunnel: @ 8483E34 .2byte 120 .byte MAPSEC_ROUTE_114 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc index 031ae74b6a..437aaef75b 100644 --- a/data/maps/Route114_LanettesHouse/header.inc +++ b/data/maps/Route114_LanettesHouse/header.inc @@ -7,7 +7,7 @@ Route114_LanettesHouse: @ 8483E50 .2byte 121 .byte MAPSEC_ROUTE_114 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc index 56cbab0124..aa91043b65 100644 --- a/data/maps/Route115/header.inc +++ b/data/maps/Route115/header.inc @@ -7,7 +7,7 @@ Route115: @ 8482800 .2byte 31 .byte MAPSEC_ROUTE_115 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc index 8fef8f257f..ec37ba4649 100644 --- a/data/maps/Route116/header.inc +++ b/data/maps/Route116/header.inc @@ -7,7 +7,7 @@ Route116: @ 848281C .2byte 32 .byte MAPSEC_ROUTE_116 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc index 8dad76407a..566e0bf100 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ b/data/maps/Route116_TunnelersRestHouse/header.inc @@ -7,7 +7,7 @@ Route116_TunnelersRestHouse: @ 8483E6C .2byte 122 .byte MAPSEC_ROUTE_116 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index 02804667c5..3ed11a3eed 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 diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc index ea69af862d..53e20cb542 100644 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ b/data/maps/Route117_PokemonDayCare/header.inc @@ -7,7 +7,7 @@ Route117_PokemonDayCare: @ 8483E88 .2byte 123 .byte MAPSEC_ROUTE_117 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc index ad90e8f553..47fa716382 100644 --- a/data/maps/Route118/header.inc +++ b/data/maps/Route118/header.inc @@ -7,7 +7,7 @@ Route118: @ 8482854 .2byte 34 .byte MAPSEC_ROUTE_118 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc index af32f0bde1..e5c3e5d54c 100644 --- a/data/maps/Route119/header.inc +++ b/data/maps/Route119/header.inc @@ -7,7 +7,7 @@ Route119: @ 8482870 .2byte 35 .byte MAPSEC_ROUTE_119 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc index 8f966eaf4f..ee5c6ee434 100644 --- a/data/maps/Route119_House/header.inc +++ b/data/maps/Route119_House/header.inc @@ -7,7 +7,7 @@ Route119_House: @ 8485D28 .2byte 59 .byte MAPSEC_ROUTE_119 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc index 7d324311ee..a9e533460b 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ b/data/maps/Route119_WeatherInstitute_1F/header.inc @@ -7,7 +7,7 @@ Route119_WeatherInstitute_1F: @ 8485CF0 .2byte 271 .byte MAPSEC_ROUTE_119 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc index d2a09b1b71..6b339317df 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ b/data/maps/Route119_WeatherInstitute_2F/header.inc @@ -7,7 +7,7 @@ Route119_WeatherInstitute_2F: @ 8485D0C .2byte 272 .byte MAPSEC_ROUTE_119 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc index 1fa502a2ba..75419c711a 100644 --- a/data/maps/Route120/header.inc +++ b/data/maps/Route120/header.inc @@ -7,7 +7,7 @@ Route120: @ 848288C .2byte 36 .byte MAPSEC_ROUTE_120 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc index 588540fd44..9c441064f8 100644 --- a/data/maps/Route121/header.inc +++ b/data/maps/Route121/header.inc @@ -7,7 +7,7 @@ Route121: @ 84828A8 .2byte 37 .byte MAPSEC_ROUTE_121 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc index 9bb2b86fc0..6fa3b03080 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ b/data/maps/Route121_SafariZoneEntrance/header.inc @@ -7,7 +7,7 @@ Route121_SafariZoneEntrance: @ 8483EA4 .2byte 124 .byte MAPSEC_ROUTE_121 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc index d5bbaccf4c..37d9a7a14b 100644 --- a/data/maps/Route122/header.inc +++ b/data/maps/Route122/header.inc @@ -7,7 +7,7 @@ Route122: @ 84828C4 .2byte 38 .byte MAPSEC_ROUTE_122 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc index e3fa357ddc..f7d1348941 100644 --- a/data/maps/Route123/header.inc +++ b/data/maps/Route123/header.inc @@ -7,7 +7,7 @@ Route123: @ 84828E0 .2byte 39 .byte MAPSEC_ROUTE_123 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc index 89b03ed880..7516de2398 100644 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -7,7 +7,7 @@ Route123_BerryMastersHouse: @ 8485CD4 .2byte 60 .byte MAPSEC_ROUTE_123 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index 2ad541e817..6f4f3c5402 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -7,7 +7,7 @@ Route124: @ 84828FC .2byte 40 .byte MAPSEC_ROUTE_124 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 13 diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc index d68c93985d..fd405a1289 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc @@ -7,7 +7,7 @@ Route124_DivingTreasureHuntersHouse: @ 8485D44 .2byte 301 .byte MAPSEC_ROUTE_124 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc index 30691d2705..3e4affa652 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -7,7 +7,7 @@ Route125: @ 8482918 .2byte 41 .byte MAPSEC_ROUTE_125 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 13 diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc index c00086a0ba..ae2dae20f2 100644 --- a/data/maps/Route126/header.inc +++ b/data/maps/Route126/header.inc @@ -7,7 +7,7 @@ Route126: @ 8482934 .2byte 42 .byte MAPSEC_ROUTE_126 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 13 diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc index c242fe898e..c92a963c70 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -7,7 +7,7 @@ Route127: @ 8482950 .2byte 43 .byte MAPSEC_ROUTE_127 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 13 diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index 6ced2f3206..b4f08635f2 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -7,7 +7,7 @@ Route128: @ 848296C .2byte 44 .byte MAPSEC_ROUTE_128 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 13 diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc index 4128e5dece..c16a9c91ff 100644 --- a/data/maps/Route129/header.inc +++ b/data/maps/Route129/header.inc @@ -7,7 +7,7 @@ Route129: @ 8482988 .2byte 45 .byte MAPSEC_ROUTE_129 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 13 diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc index 105e4316ce..2787d369b1 100644 --- a/data/maps/Route130/header.inc +++ b/data/maps/Route130/header.inc @@ -7,7 +7,7 @@ Route130: @ 84829A4 .2byte 263 .byte MAPSEC_ROUTE_130 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 13 diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc index 0151fefded..eeb09e0eac 100644 --- a/data/maps/Route131/header.inc +++ b/data/maps/Route131/header.inc @@ -7,7 +7,7 @@ Route131: @ 84829C0 .2byte 47 .byte MAPSEC_ROUTE_131 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 13 diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc index 77392dae8a..672f4d3f75 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -7,7 +7,7 @@ Route132: @ 84829DC .2byte 48 .byte MAPSEC_ROUTE_132 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 13 diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index 0233c4b1b7..bd7ab0e104 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -7,7 +7,7 @@ Route133: @ 84829F8 .2byte 49 .byte MAPSEC_ROUTE_133 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 13 diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index b4bc18251e..623db96b5d 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -7,7 +7,7 @@ Route134: @ 8482A14 .2byte 50 .byte MAPSEC_ROUTE_134 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 13 diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc index f26674d87c..3aed4b2f2f 100644 --- a/data/maps/RustboroCity/header.inc +++ b/data/maps/RustboroCity/header.inc @@ -7,7 +7,7 @@ RustboroCity: @ 848250C .2byte 4 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 2 .2byte 0 .byte 13 diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc index b1e738b798..742a590e2d 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ b/data/maps/RustboroCity_CuttersHouse/header.inc @@ -7,7 +7,7 @@ RustboroCity_CuttersHouse: @ 8483478 .2byte 98 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc index 56dc269943..28b4a1d1c9 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc @@ -7,7 +7,7 @@ RustboroCity_DevonCorp_1F: @ 8483344 .2byte 92 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc index 65046644fe..f1bf1cd833 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -7,7 +7,7 @@ RustboroCity_DevonCorp_2F: @ 8483360 .2byte 93 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc index 7a5968b182..2bf6129fea 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -7,7 +7,7 @@ RustboroCity_DevonCorp_3F: @ 848337C .2byte 269 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc index e9754f54f9..792d6a87cb 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ b/data/maps/RustboroCity_Flat1_1F/header.inc @@ -7,7 +7,7 @@ RustboroCity_Flat1_1F: @ 8483424 .2byte 313 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc index a07f7fba92..50fbdf6d05 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ b/data/maps/RustboroCity_Flat1_2F/header.inc @@ -7,7 +7,7 @@ RustboroCity_Flat1_2F: @ 8483440 .2byte 314 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc index 66e8b9e0e6..271127402a 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ b/data/maps/RustboroCity_Flat2_1F/header.inc @@ -7,7 +7,7 @@ RustboroCity_Flat2_1F: @ 84834B0 .2byte 294 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc index 8a7884e58a..f8bb6826de 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ b/data/maps/RustboroCity_Flat2_2F/header.inc @@ -7,7 +7,7 @@ RustboroCity_Flat2_2F: @ 84834CC .2byte 295 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc index 70e622e46a..9fec8f2981 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ b/data/maps/RustboroCity_Flat2_3F/header.inc @@ -7,7 +7,7 @@ RustboroCity_Flat2_3F: @ 84834E8 .2byte 296 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc index f5297aaa26..fbac653514 100644 --- a/data/maps/RustboroCity_Gym/header.inc +++ b/data/maps/RustboroCity_Gym/header.inc @@ -7,7 +7,7 @@ RustboroCity_Gym: @ 8483398 .2byte 94 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc index e668e63272..7db64f8f99 100644 --- a/data/maps/RustboroCity_House1/header.inc +++ b/data/maps/RustboroCity_House1/header.inc @@ -7,7 +7,7 @@ RustboroCity_House1: @ 848345C .2byte 97 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc index bd075650ed..db3ef40f44 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -7,7 +7,7 @@ RustboroCity_House2: @ 8483494 .2byte 96 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc index f03668a60a..08d31197b0 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -7,7 +7,7 @@ RustboroCity_House3: @ 8483504 .2byte 96 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc index 58a9f6075e..d7126406ec 100644 --- a/data/maps/RustboroCity_Mart/header.inc +++ b/data/maps/RustboroCity_Mart/header.inc @@ -7,7 +7,7 @@ RustboroCity_Mart: @ 8483408 .2byte 63 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc index f482ba0448..67070920e3 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ RustboroCity_PokemonCenter_1F: @ 84833D0 .2byte 61 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index 48e731a3ed..15e8537df9 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 diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index 6948dc3662..13138b65ea 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ b/data/maps/RustboroCity_PokemonSchool/header.inc @@ -7,7 +7,7 @@ RustboroCity_PokemonSchool: @ 84833B4 .2byte 95 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc index 998208e806..e87800965f 100644 --- a/data/maps/RusturfTunnel/header.inc +++ b/data/maps/RusturfTunnel/header.inc @@ -7,7 +7,7 @@ RusturfTunnel: @ 8483F30 .2byte 129 .byte MAPSEC_RUSTURF_TUNNEL .byte 0 - .byte 6 + .byte WEATHER_FOG_1 .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc index a33e236dd9..6e66b473c3 100644 --- a/data/maps/SSTidalCorridor/header.inc +++ b/data/maps/SSTidalCorridor/header.inc @@ -7,7 +7,7 @@ SSTidalCorridor: @ 8484F0C .2byte 277 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc index 2c627ad0b7..1c7e1d01ca 100644 --- a/data/maps/SSTidalLowerDeck/header.inc +++ b/data/maps/SSTidalLowerDeck/header.inc @@ -7,7 +7,7 @@ SSTidalLowerDeck: @ 8484F28 .2byte 278 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc index 935427cae7..c02176a9b0 100644 --- a/data/maps/SSTidalRooms/header.inc +++ b/data/maps/SSTidalRooms/header.inc @@ -7,7 +7,7 @@ SSTidalRooms: @ 8484F44 .2byte 279 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc index 5452be556d..745e608a28 100644 --- a/data/maps/SafariZone_North/header.inc +++ b/data/maps/SafariZone_North/header.inc @@ -7,7 +7,7 @@ SafariZone_North: @ 8485158 .2byte 239 .byte MAPSEC_SAFARI_ZONE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc index 9e8be13523..e25a8497bd 100644 --- a/data/maps/SafariZone_Northeast/header.inc +++ b/data/maps/SafariZone_Northeast/header.inc @@ -7,7 +7,7 @@ SafariZone_Northeast: @ 848528C .2byte 394 .byte MAPSEC_SAFARI_ZONE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc index b3c98ee11c..01b7e8198c 100644 --- a/data/maps/SafariZone_Northwest/header.inc +++ b/data/maps/SafariZone_Northwest/header.inc @@ -7,7 +7,7 @@ SafariZone_Northwest: @ 848513C .2byte 238 .byte MAPSEC_SAFARI_ZONE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc index b56865835b..e6739ff667 100644 --- a/data/maps/SafariZone_RestHouse/header.inc +++ b/data/maps/SafariZone_RestHouse/header.inc @@ -7,7 +7,7 @@ SafariZone_RestHouse: @ 8485270 .2byte 329 .byte MAPSEC_SAFARI_ZONE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SafariZone_South/header.inc b/data/maps/SafariZone_South/header.inc index 9780b80d9d..e60f44f9ec 100644 --- a/data/maps/SafariZone_South/header.inc +++ b/data/maps/SafariZone_South/header.inc @@ -7,7 +7,7 @@ SafariZone_South: @ 8485190 .2byte 241 .byte MAPSEC_SAFARI_ZONE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc index 17d73acf80..5da814cff0 100644 --- a/data/maps/SafariZone_Southeast/header.inc +++ b/data/maps/SafariZone_Southeast/header.inc @@ -7,7 +7,7 @@ SafariZone_Southeast: @ 84852A8 .2byte 395 .byte MAPSEC_SAFARI_ZONE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc index 5c82a2c3ad..25115a13a1 100644 --- a/data/maps/SafariZone_Southwest/header.inc +++ b/data/maps/SafariZone_Southwest/header.inc @@ -7,7 +7,7 @@ SafariZone_Southwest: @ 8485174 .2byte 240 .byte MAPSEC_SAFARI_ZONE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc index 23aab68fe8..51666baf3a 100644 --- a/data/maps/ScorchedSlab/header.inc +++ b/data/maps/ScorchedSlab/header.inc @@ -7,7 +7,7 @@ ScorchedSlab: @ 84846BC .2byte 311 .byte MAPSEC_SCORCHED_SLAB .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc index 32e0cbb755..68bb920663 100644 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ b/data/maps/SeafloorCavern_Entrance/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Entrance: @ 84841B4 .2byte 147 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc index 4dd67bdb34..56bfc32cd6 100644 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ b/data/maps/SeafloorCavern_Room1/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room1: @ 84841D0 .2byte 148 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc index bec8fc16ab..bfb1645209 100644 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ b/data/maps/SeafloorCavern_Room2/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room2: @ 84841EC .2byte 149 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc index 3e6b0f5c85..c49f283e1f 100644 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ b/data/maps/SeafloorCavern_Room3/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room3: @ 8484208 .2byte 150 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc index a45bb4f6ae..e440157e13 100644 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ b/data/maps/SeafloorCavern_Room4/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room4: @ 8484224 .2byte 151 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc index 831c853943..3cfd1b9d06 100644 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ b/data/maps/SeafloorCavern_Room5/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room5: @ 8484240 .2byte 152 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc index 5e39909fc1..e336955eb0 100644 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ b/data/maps/SeafloorCavern_Room6/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room6: @ 848425C .2byte 153 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc index fa9e728044..9f8c89f6ff 100644 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ b/data/maps/SeafloorCavern_Room7/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room7: @ 8484278 .2byte 154 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc index 8248b89f7c..f701d53f2f 100644 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ b/data/maps/SeafloorCavern_Room8/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room8: @ 8484294 .2byte 155 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc index 2fb1a3b705..8345ee1889 100644 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ b/data/maps/SeafloorCavern_Room9/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room9: @ 84842B0 .2byte 156 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 6 + .byte WEATHER_FOG_1 .byte 4 .2byte 0 .byte 14 diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc index 5e2b0c3632..1061ce4c11 100644 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ b/data/maps/SealedChamber_InnerRoom/header.inc @@ -7,7 +7,7 @@ SealedChamber_InnerRoom: @ 84846A0 .2byte 304 .byte MAPSEC_SEALED_CHAMBER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc index 1fabd6be1d..66d278fabb 100644 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ b/data/maps/SealedChamber_OuterRoom/header.inc @@ -7,7 +7,7 @@ SealedChamber_OuterRoom: @ 8484684 .2byte 284 .byte MAPSEC_SEALED_CHAMBER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc index 4783af7a71..ebf5eea009 100644 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ b/data/maps/SecretBase_BlueCave1/header.inc @@ -7,7 +7,7 @@ SecretBase_BlueCave1: @ 8484AC8 .2byte 199 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc index 208a27ae85..69d2cf8605 100644 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ b/data/maps/SecretBase_BlueCave2/header.inc @@ -7,7 +7,7 @@ SecretBase_BlueCave2: @ 8484B70 .2byte 205 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc index 0bdfe5f0f2..40a99dcdc1 100644 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ b/data/maps/SecretBase_BlueCave3/header.inc @@ -7,7 +7,7 @@ SecretBase_BlueCave3: @ 8484C18 .2byte 211 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc index 4902148034..1b22ee18ec 100644 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ b/data/maps/SecretBase_BlueCave4/header.inc @@ -7,7 +7,7 @@ SecretBase_BlueCave4: @ 8484CC0 .2byte 217 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc index ad8dc034c7..79c7f3e8d4 100644 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ b/data/maps/SecretBase_BrownCave1/header.inc @@ -7,7 +7,7 @@ SecretBase_BrownCave1: @ 8484AAC .2byte 198 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc index 2e10374ec7..030ceea85e 100644 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ b/data/maps/SecretBase_BrownCave2/header.inc @@ -7,7 +7,7 @@ SecretBase_BrownCave2: @ 8484B54 .2byte 204 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc index 2133641666..2bdb4838e1 100644 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ b/data/maps/SecretBase_BrownCave3/header.inc @@ -7,7 +7,7 @@ SecretBase_BrownCave3: @ 8484BFC .2byte 210 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc index 2dc17b4e07..e3137603ae 100644 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ b/data/maps/SecretBase_BrownCave4/header.inc @@ -7,7 +7,7 @@ SecretBase_BrownCave4: @ 8484CA4 .2byte 216 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc index 70dcb91af6..f2f0a00fcb 100644 --- a/data/maps/SecretBase_RedCave1/header.inc +++ b/data/maps/SecretBase_RedCave1/header.inc @@ -7,7 +7,7 @@ SecretBase_RedCave1: @ 8484A90 .2byte 197 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc index 23f96fb4e9..4d11b7da3c 100644 --- a/data/maps/SecretBase_RedCave2/header.inc +++ b/data/maps/SecretBase_RedCave2/header.inc @@ -7,7 +7,7 @@ SecretBase_RedCave2: @ 8484B38 .2byte 203 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc index 68e302a717..b935650d66 100644 --- a/data/maps/SecretBase_RedCave3/header.inc +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -7,7 +7,7 @@ SecretBase_RedCave3: @ 8484BE0 .2byte 209 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc index faf3fd44b7..b5240755ee 100644 --- a/data/maps/SecretBase_RedCave4/header.inc +++ b/data/maps/SecretBase_RedCave4/header.inc @@ -7,7 +7,7 @@ SecretBase_RedCave4: @ 8484C88 .2byte 215 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc index 2a98c0dd74..cb91408529 100644 --- a/data/maps/SecretBase_Shrub1/header.inc +++ b/data/maps/SecretBase_Shrub1/header.inc @@ -7,7 +7,7 @@ SecretBase_Shrub1: @ 8484B1C .2byte 202 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc index b3ccb04462..5b14ac5ac0 100644 --- a/data/maps/SecretBase_Shrub2/header.inc +++ b/data/maps/SecretBase_Shrub2/header.inc @@ -7,7 +7,7 @@ SecretBase_Shrub2: @ 8484BC4 .2byte 208 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc index 7e408128e1..725cbd9dce 100644 --- a/data/maps/SecretBase_Shrub3/header.inc +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -7,7 +7,7 @@ SecretBase_Shrub3: @ 8484C6C .2byte 214 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index ea2c263bb6..7dc3af57e3 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 diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index e3951f3c16..1ca8f43744 100644 --- a/data/maps/SecretBase_Tree1/header.inc +++ b/data/maps/SecretBase_Tree1/header.inc @@ -7,7 +7,7 @@ SecretBase_Tree1: @ 8484B00 .2byte 201 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc index 23e8da9b90..880f0dd906 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -7,7 +7,7 @@ SecretBase_Tree2: @ 8484BA8 .2byte 207 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc index 61378b8a30..3cf6fef749 100644 --- a/data/maps/SecretBase_Tree3/header.inc +++ b/data/maps/SecretBase_Tree3/header.inc @@ -7,7 +7,7 @@ SecretBase_Tree3: @ 8484C50 .2byte 213 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc index b5f601189d..2688c2ecab 100644 --- a/data/maps/SecretBase_Tree4/header.inc +++ b/data/maps/SecretBase_Tree4/header.inc @@ -7,7 +7,7 @@ SecretBase_Tree4: @ 8484CF8 .2byte 219 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc index 1eee3cfed2..b6d42f0a28 100644 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ b/data/maps/SecretBase_YellowCave1/header.inc @@ -7,7 +7,7 @@ SecretBase_YellowCave1: @ 8484AE4 .2byte 200 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc index 27d5a0ecc4..08253975a7 100644 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ b/data/maps/SecretBase_YellowCave2/header.inc @@ -7,7 +7,7 @@ SecretBase_YellowCave2: @ 8484B8C .2byte 206 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc index f2e986b1cf..0c1464cd9b 100644 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ b/data/maps/SecretBase_YellowCave3/header.inc @@ -7,7 +7,7 @@ SecretBase_YellowCave3: @ 8484C34 .2byte 212 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc index 2926729763..b20409781e 100644 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ b/data/maps/SecretBase_YellowCave4/header.inc @@ -7,7 +7,7 @@ SecretBase_YellowCave4: @ 8484CDC .2byte 218 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc index 3c02b2433e..b263badba7 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc @@ -7,7 +7,7 @@ ShoalCave_HighTideEntranceRoom: @ 8484438 .2byte 168 .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc index b58e123353..386cf2b509 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc @@ -7,7 +7,7 @@ ShoalCave_HighTideInnerRoom: @ 8484454 .2byte 169 .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc index c34c87a10a..9f1423424d 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc @@ -7,7 +7,7 @@ ShoalCave_LowTideEntranceRoom: @ 84843C8 .2byte 164 .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc index 69aa8114e2..f280c68795 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc @@ -7,7 +7,7 @@ ShoalCave_LowTideIceRoom: @ 84847D4 .2byte 328 .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc index 9fea56a0fa..bcb536380d 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc @@ -7,7 +7,7 @@ ShoalCave_LowTideInnerRoom: @ 84843E4 .2byte 165 .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc index 3dc8cae944..9fde2f89d8 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc @@ -7,7 +7,7 @@ ShoalCave_LowTideLowerRoom: @ 848441C .2byte 167 .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc index 5123f9a802..d111213f4d 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc @@ -7,7 +7,7 @@ ShoalCave_LowTideStairsRoom: @ 8484400 .2byte 166 .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc index 9100eb6de9..c3542e15f5 100644 --- a/data/maps/SingleBattleColosseum/header.inc +++ b/data/maps/SingleBattleColosseum/header.inc @@ -7,7 +7,7 @@ SingleBattleColosseum: @ 8484D30 .2byte 221 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc index 7f55c68fb3..d634f1006e 100644 --- a/data/maps/SkyPillar_1F/header.inc +++ b/data/maps/SkyPillar_1F/header.inc @@ -7,7 +7,7 @@ SkyPillar_1F: @ 8484764 .2byte 322 .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc index 2be149c007..0379980bb1 100644 --- a/data/maps/SkyPillar_2F/header.inc +++ b/data/maps/SkyPillar_2F/header.inc @@ -7,7 +7,7 @@ SkyPillar_2F: @ 8484780 .2byte 323 .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc index e54ede7450..da58b47e59 100644 --- a/data/maps/SkyPillar_3F/header.inc +++ b/data/maps/SkyPillar_3F/header.inc @@ -7,7 +7,7 @@ SkyPillar_3F: @ 848479C .2byte 324 .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc index 9823646f4f..54c9432b50 100644 --- a/data/maps/SkyPillar_4F/header.inc +++ b/data/maps/SkyPillar_4F/header.inc @@ -7,7 +7,7 @@ SkyPillar_4F: @ 84847B8 .2byte 325 .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc index f721247438..84c7a9ae89 100644 --- a/data/maps/SkyPillar_5F/header.inc +++ b/data/maps/SkyPillar_5F/header.inc @@ -7,7 +7,7 @@ SkyPillar_5F: @ 84847F0 .2byte 330 .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc index 8efd8c5427..52a71aefce 100644 --- a/data/maps/SkyPillar_Entrance/header.inc +++ b/data/maps/SkyPillar_Entrance/header.inc @@ -7,7 +7,7 @@ SkyPillar_Entrance: @ 848472C .2byte 320 .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc index 24a7a4e2bd..50bc46b247 100644 --- a/data/maps/SkyPillar_Outside/header.inc +++ b/data/maps/SkyPillar_Outside/header.inc @@ -7,7 +7,7 @@ SkyPillar_Outside: @ 8484748 .2byte 321 .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc index 1f99a1cb87..578341f9ca 100644 --- a/data/maps/SkyPillar_Top/header.inc +++ b/data/maps/SkyPillar_Top/header.inc @@ -7,7 +7,7 @@ SkyPillar_Top: @ 848480C .2byte 331 .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 12 diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc index e617b0a91a..e6ee88487c 100644 --- a/data/maps/SlateportCity/header.inc +++ b/data/maps/SlateportCity/header.inc @@ -7,7 +7,7 @@ SlateportCity: @ 84824D4 .2byte 2 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 2 .2byte 0 .byte 13 diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc index c76e6230b9..7d4879fc70 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc @@ -7,7 +7,7 @@ SlateportCity_BattleTentBattleRoom: @ 848314C .2byte 386 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_BattleTentCorridor/header.inc b/data/maps/SlateportCity_BattleTentCorridor/header.inc index ddc1bfcef7..177c05db8c 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/header.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/header.inc @@ -7,7 +7,7 @@ SlateportCity_BattleTentCorridor: @ 8483130 .2byte 385 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_BattleTentLobby/header.inc b/data/maps/SlateportCity_BattleTentLobby/header.inc index 767410cbb4..562905e49a 100644 --- a/data/maps/SlateportCity_BattleTentLobby/header.inc +++ b/data/maps/SlateportCity_BattleTentLobby/header.inc @@ -7,7 +7,7 @@ SlateportCity_BattleTentLobby: @ 8483114 .2byte 384 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc index 8ec8c294bf..6cc9cda8e1 100644 --- a/data/maps/SlateportCity_Harbor/header.inc +++ b/data/maps/SlateportCity_Harbor/header.inc @@ -7,7 +7,7 @@ SlateportCity_Harbor: @ 84831D8 .2byte 88 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc index 8f221fcc7d..102784c6ff 100644 --- a/data/maps/SlateportCity_House1/header.inc +++ b/data/maps/SlateportCity_House1/header.inc @@ -7,7 +7,7 @@ SlateportCity_House1: @ 8483168 .2byte 80 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc index bc4fc03cee..60faa1552e 100644 --- a/data/maps/SlateportCity_House2/header.inc +++ b/data/maps/SlateportCity_House2/header.inc @@ -7,7 +7,7 @@ SlateportCity_House2: @ 84831F4 .2byte 60 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc index 569969de31..8fd2113cb1 100644 --- a/data/maps/SlateportCity_Mart/header.inc +++ b/data/maps/SlateportCity_Mart/header.inc @@ -7,7 +7,7 @@ SlateportCity_Mart: @ 8483248 .2byte 63 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc index 88c4e349b1..9cb13d8cf1 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc @@ -7,7 +7,7 @@ SlateportCity_OceanicMuseum_1F: @ 84831A0 .2byte 86 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc index e300ced6ae..69e244a917 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc @@ -7,7 +7,7 @@ SlateportCity_OceanicMuseum_2F: @ 84831BC .2byte 87 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc index 2b3d99694c..085db4d85b 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ SlateportCity_PokemonCenter_1F: @ 8483210 .2byte 61 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc index 6070cab3cc..c2bbb5097a 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ SlateportCity_PokemonCenter_2F: @ 848322C .2byte 62 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc index 34a3f1916c..33796df810 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ b/data/maps/SlateportCity_PokemonFanClub/header.inc @@ -7,7 +7,7 @@ SlateportCity_PokemonFanClub: @ 8483184 .2byte 85 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc index d4b8e9aea3..73b7c113d2 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc @@ -7,7 +7,7 @@ SlateportCity_SternsShipyard_1F: @ 84830DC .2byte 81 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc index 894aabb9a0..f3bc5fde22 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc @@ -7,7 +7,7 @@ SlateportCity_SternsShipyard_2F: @ 84830F8 .2byte 82 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc index 0b48dbca0c..ccc9c1671c 100644 --- a/data/maps/SootopolisCity/header.inc +++ b/data/maps/SootopolisCity/header.inc @@ -7,7 +7,7 @@ SootopolisCity: @ 848257C .2byte 8 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 2 .2byte 0 .byte 13 diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc index 663a64800c..2d51a6b918 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ b/data/maps/SootopolisCity_Gym_1F/header.inc @@ -7,7 +7,7 @@ SootopolisCity_Gym_1F: @ 8483A28 .2byte 109 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc index 11bb3b502a..420ee8f53f 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ b/data/maps/SootopolisCity_Gym_B1F/header.inc @@ -7,7 +7,7 @@ SootopolisCity_Gym_B1F: @ 8483A44 .2byte 110 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc index 5eaa8d4705..d60dd358f0 100644 --- a/data/maps/SootopolisCity_House1/header.inc +++ b/data/maps/SootopolisCity_House1/header.inc @@ -7,7 +7,7 @@ SootopolisCity_House1: @ 8483AB4 .2byte 307 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc index 36daf5bb26..817b676930 100644 --- a/data/maps/SootopolisCity_House2/header.inc +++ b/data/maps/SootopolisCity_House2/header.inc @@ -7,7 +7,7 @@ SootopolisCity_House2: @ 8483AD0 .2byte 308 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc index dfe26c5eaa..a5225747b4 100644 --- a/data/maps/SootopolisCity_House3/header.inc +++ b/data/maps/SootopolisCity_House3/header.inc @@ -7,7 +7,7 @@ SootopolisCity_House3: @ 8483AEC .2byte 309 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc index 1275ccf91d..2e2697d4d6 100644 --- a/data/maps/SootopolisCity_House4/header.inc +++ b/data/maps/SootopolisCity_House4/header.inc @@ -7,7 +7,7 @@ SootopolisCity_House4: @ 8483B08 .2byte 307 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc index 0d634d549a..0ec392f92e 100644 --- a/data/maps/SootopolisCity_House5/header.inc +++ b/data/maps/SootopolisCity_House5/header.inc @@ -7,7 +7,7 @@ SootopolisCity_House5: @ 8483B24 .2byte 308 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc index 9f151e7375..97d0a73e96 100644 --- a/data/maps/SootopolisCity_House6/header.inc +++ b/data/maps/SootopolisCity_House6/header.inc @@ -7,7 +7,7 @@ SootopolisCity_House6: @ 8483B40 .2byte 309 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc index 7dac9a0290..9318e6ebeb 100644 --- a/data/maps/SootopolisCity_House7/header.inc +++ b/data/maps/SootopolisCity_House7/header.inc @@ -7,7 +7,7 @@ SootopolisCity_House7: @ 8483B5C .2byte 307 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc index d0fa71556f..96d0ea1d1d 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc @@ -7,7 +7,7 @@ SootopolisCity_LotadAndSeedotHouse: @ 8483B78 .2byte 297 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc index f1fc07ae2f..982ac6fa40 100644 --- a/data/maps/SootopolisCity_Mart/header.inc +++ b/data/maps/SootopolisCity_Mart/header.inc @@ -7,7 +7,7 @@ SootopolisCity_Mart: @ 8483A98 .2byte 63 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc index 7828f6bbbd..0fd0fbf5e7 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc @@ -7,7 +7,7 @@ SootopolisCity_MysteryEventsHouse_1F: @ 8483B94 .2byte 439 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc index 5ebbff88be..660f26ae27 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc @@ -7,7 +7,7 @@ SootopolisCity_MysteryEventsHouse_B1F: @ 8483BB0 .2byte 440 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc index 537ab17090..f39608216b 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ SootopolisCity_PokemonCenter_1F: @ 8483A60 .2byte 61 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc index 76493dcfa2..0844847c80 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ SootopolisCity_PokemonCenter_2F: @ 8483A7C .2byte 62 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc index 82948348b3..e72b6f3102 100644 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ b/data/maps/SouthernIsland_Exterior/header.inc @@ -7,7 +7,7 @@ SouthernIsland_Exterior: @ 8485238 .2byte 290 .byte MAPSEC_SOUTHERN_ISLAND .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc index be575d25b8..42bb8497da 100644 --- a/data/maps/SouthernIsland_Interior/header.inc +++ b/data/maps/SouthernIsland_Interior/header.inc @@ -7,7 +7,7 @@ SouthernIsland_Interior: @ 8485254 .2byte 291 .byte MAPSEC_SOUTHERN_ISLAND .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/TerraCave_End/header.inc b/data/maps/TerraCave_End/header.inc index 94a871f6a6..bda560677b 100644 --- a/data/maps/TerraCave_End/header.inc +++ b/data/maps/TerraCave_End/header.inc @@ -7,7 +7,7 @@ TerraCave_End: @ 8484A3C .2byte 409 .byte MAPSEC_TERRA_CAVE .byte 0 - .byte 6 + .byte WEATHER_FOG_1 .byte 4 .2byte 0 .byte 14 diff --git a/data/maps/TerraCave_Entrance/header.inc b/data/maps/TerraCave_Entrance/header.inc index 81c405cdf1..e38dc2fa81 100644 --- a/data/maps/TerraCave_Entrance/header.inc +++ b/data/maps/TerraCave_Entrance/header.inc @@ -7,7 +7,7 @@ TerraCave_Entrance: @ 8484A20 .2byte 408 .byte MAPSEC_TERRA_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 92d6c14a7d..4b2c0f840f 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 diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc index fba54fabdb..41fddfeed2 100644 --- a/data/maps/TrainerHill_1F/header.inc +++ b/data/maps/TrainerHill_1F/header.inc @@ -7,7 +7,7 @@ TrainerHill_1F: @ 84857E8 .2byte 415 .byte MAPSEC_TRAINER_HILL .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/TrainerHill_2F/header.inc b/data/maps/TrainerHill_2F/header.inc index d47e960ede..740afdba70 100644 --- a/data/maps/TrainerHill_2F/header.inc +++ b/data/maps/TrainerHill_2F/header.inc @@ -7,7 +7,7 @@ TrainerHill_2F: @ 8485804 .2byte 416 .byte MAPSEC_TRAINER_HILL .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/TrainerHill_3F/header.inc b/data/maps/TrainerHill_3F/header.inc index 60f981e3db..79597b6866 100644 --- a/data/maps/TrainerHill_3F/header.inc +++ b/data/maps/TrainerHill_3F/header.inc @@ -7,7 +7,7 @@ TrainerHill_3F: @ 8485820 .2byte 417 .byte MAPSEC_TRAINER_HILL .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/TrainerHill_4F/header.inc b/data/maps/TrainerHill_4F/header.inc index 6b7edf22b7..8286c131ae 100644 --- a/data/maps/TrainerHill_4F/header.inc +++ b/data/maps/TrainerHill_4F/header.inc @@ -7,7 +7,7 @@ TrainerHill_4F: @ 848583C .2byte 418 .byte MAPSEC_TRAINER_HILL .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/TrainerHill_Elevator/header.inc b/data/maps/TrainerHill_Elevator/header.inc index dd5daa4e25..c6ed43e08d 100644 --- a/data/maps/TrainerHill_Elevator/header.inc +++ b/data/maps/TrainerHill_Elevator/header.inc @@ -7,7 +7,7 @@ TrainerHill_Elevator: @ 8485ADC .2byte 266 .byte MAPSEC_TRAINER_HILL .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/TrainerHill_Entrance/header.inc b/data/maps/TrainerHill_Entrance/header.inc index 60422a9407..a45f77c990 100644 --- a/data/maps/TrainerHill_Entrance/header.inc +++ b/data/maps/TrainerHill_Entrance/header.inc @@ -7,7 +7,7 @@ TrainerHill_Entrance: @ 84857CC .2byte 414 .byte MAPSEC_TRAINER_HILL .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/TrainerHill_Roof/header.inc b/data/maps/TrainerHill_Roof/header.inc index c6c3e626c9..e6000a2d5c 100644 --- a/data/maps/TrainerHill_Roof/header.inc +++ b/data/maps/TrainerHill_Roof/header.inc @@ -7,7 +7,7 @@ TrainerHill_Roof: @ 8485858 .2byte 419 .byte MAPSEC_TRAINER_HILL .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc index 6d3603bf5a..3ce516a3d3 100644 --- a/data/maps/Underwater1/header.inc +++ b/data/maps/Underwater1/header.inc @@ -7,7 +7,7 @@ Underwater1: @ 8482A30 .2byte 274 .byte MAPSEC_UNDERWATER_124 .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc index 03230042ba..1109fd52ab 100644 --- a/data/maps/Underwater2/header.inc +++ b/data/maps/Underwater2/header.inc @@ -7,7 +7,7 @@ Underwater2: @ 8482A4C .2byte 51 .byte MAPSEC_UNDERWATER_125 .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc index 203cf8b3c1..c132e8e844 100644 --- a/data/maps/Underwater3/header.inc +++ b/data/maps/Underwater3/header.inc @@ -7,7 +7,7 @@ Underwater3: @ 8482A68 .2byte 52 .byte MAPSEC_UNDERWATER_126 .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc index b5de8aa073..ec0818b57a 100644 --- a/data/maps/Underwater4/header.inc +++ b/data/maps/Underwater4/header.inc @@ -7,7 +7,7 @@ Underwater4: @ 8482A84 .2byte 53 .byte MAPSEC_UNDERWATER_127 .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/Underwater5/header.inc b/data/maps/Underwater5/header.inc index e6a8463037..ba247e68d1 100644 --- a/data/maps/Underwater5/header.inc +++ b/data/maps/Underwater5/header.inc @@ -7,7 +7,7 @@ Underwater5: @ 8482AA0 .2byte 412 .byte MAPSEC_UNDERWATER_129 .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/Underwater6/header.inc b/data/maps/Underwater6/header.inc index 0aadca37db..259f04eec5 100644 --- a/data/maps/Underwater6/header.inc +++ b/data/maps/Underwater6/header.inc @@ -7,7 +7,7 @@ Underwater6: @ 8482ABC .2byte 410 .byte MAPSEC_UNDERWATER_TERRA_CAVE .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/Underwater7/header.inc b/data/maps/Underwater7/header.inc index 388c3510fa..f04015ba8f 100644 --- a/data/maps/Underwater7/header.inc +++ b/data/maps/Underwater7/header.inc @@ -7,7 +7,7 @@ Underwater7: @ 8482AD8 .2byte 411 .byte MAPSEC_UNDERWATER_UNK1 .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/Underwater_MarineCave/header.inc b/data/maps/Underwater_MarineCave/header.inc index 4aca9a7342..51980c78cd 100644 --- a/data/maps/Underwater_MarineCave/header.inc +++ b/data/maps/Underwater_MarineCave/header.inc @@ -7,7 +7,7 @@ Underwater_MarineCave: @ 84849CC .2byte 406 .byte MAPSEC_UNDERWATER_MARINE_CAVE .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc index 5715c5e90b..6c746e8f14 100644 --- a/data/maps/Underwater_Route134/header.inc +++ b/data/maps/Underwater_Route134/header.inc @@ -7,7 +7,7 @@ Underwater_Route134: @ 848464C .2byte 282 .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc index b39773d233..e5efbacf78 100644 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ b/data/maps/Underwater_SeafloorCavern/header.inc @@ -7,7 +7,7 @@ Underwater_SeafloorCavern: @ 8484198 .2byte 146 .byte MAPSEC_UNDERWATER_128 .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc index 8ca54e9fbc..d6f2c22024 100644 --- a/data/maps/Underwater_SealedChamber/header.inc +++ b/data/maps/Underwater_SealedChamber/header.inc @@ -7,7 +7,7 @@ Underwater_SealedChamber: @ 8484668 .2byte 283 .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc index 661c4d105a..94b0392929 100644 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ b/data/maps/Underwater_SootopolisCity/header.inc @@ -7,7 +7,7 @@ Underwater_SootopolisCity: @ 8483F4C .2byte 130 .byte MAPSEC_UNDERWATER_SOOTOPOLIS .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc index 55566ceef0..ff4220697c 100644 --- a/data/maps/UnionRoom/header.inc +++ b/data/maps/UnionRoom/header.inc @@ -7,7 +7,7 @@ UnionRoom: @ 8485120 .2byte 393 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index 79438a8d40..7ce8ad751a 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -7,7 +7,7 @@ UnknownMap_25_29: @ 8484DBC .2byte 226 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc index f5a6fde393..5735bdc9dc 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -7,7 +7,7 @@ UnknownMap_25_30: @ 8484DD8 .2byte 227 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc index cf5318be07..be7d4d9331 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -7,7 +7,7 @@ UnknownMap_25_31: @ 8484DF4 .2byte 228 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc index 538798a4c3..2040ed5c77 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -7,7 +7,7 @@ UnknownMap_25_32: @ 8484E10 .2byte 229 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc index c4d384729f..038e5d7605 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -7,7 +7,7 @@ UnknownMap_25_33: @ 8484E2C .2byte 230 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc index 3d08bf4bac..c59bd0b7fe 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -7,7 +7,7 @@ UnknownMap_25_34: @ 8484E48 .2byte 231 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc index aa176dbfdd..c7bd8ee441 100644 --- a/data/maps/VerdanturfTown/header.inc +++ b/data/maps/VerdanturfTown/header.inc @@ -7,7 +7,7 @@ VerdanturfTown: @ 8482640 .2byte 15 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 1 .2byte 0 .byte 13 diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc index bcdd211eec..22d20c23d9 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc @@ -7,7 +7,7 @@ VerdanturfTown_BattleTentBattleRoom: @ 8482E90 .2byte 387 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc index e704df2f01..0c24a5cd8c 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc @@ -7,7 +7,7 @@ VerdanturfTown_BattleTentCorridor: @ 8482E74 .2byte 385 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_BattleTentLobby/header.inc b/data/maps/VerdanturfTown_BattleTentLobby/header.inc index 7c7bc244ce..3afb04c31c 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/header.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/header.inc @@ -7,7 +7,7 @@ VerdanturfTown_BattleTentLobby: @ 8482E58 .2byte 384 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc index a83a7f2fe2..a60b166fcb 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -7,7 +7,7 @@ VerdanturfTown_FriendshipRatersHouse: @ 8482F1C .2byte 60 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc index ebc8d20832..91e9b1179b 100644 --- a/data/maps/VerdanturfTown_House/header.inc +++ b/data/maps/VerdanturfTown_House/header.inc @@ -7,7 +7,7 @@ VerdanturfTown_House: @ 8482F38 .2byte 59 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc index 90b1e7e0ab..c1c6616544 100644 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ b/data/maps/VerdanturfTown_Mart/header.inc @@ -7,7 +7,7 @@ VerdanturfTown_Mart: @ 8482EAC .2byte 63 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc index 5a8e1183f5..d4524d031b 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ VerdanturfTown_PokemonCenter_1F: @ 8482EC8 .2byte 61 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc index 0de25d4fa9..77113ff7fa 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ VerdanturfTown_PokemonCenter_2F: @ 8482EE4 .2byte 62 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc index 7f9a923ec9..26752c39db 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ b/data/maps/VerdanturfTown_WandasHouse/header.inc @@ -7,7 +7,7 @@ VerdanturfTown_WandasHouse: @ 8482F00 .2byte 76 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index 7e13504a51..a7159f5e1e 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -7,7 +7,7 @@ VictoryRoad_1F: @ 8484374 .2byte 163 .byte MAPSEC_VICTORY_ROAD .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc index 107eb524f3..5aa5b120e8 100644 --- a/data/maps/VictoryRoad_B1F/header.inc +++ b/data/maps/VictoryRoad_B1F/header.inc @@ -7,7 +7,7 @@ VictoryRoad_B1F: @ 8484390 .2byte 285 .byte MAPSEC_VICTORY_ROAD .byte 1 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc index 3c9453154e..95e0537a42 100644 --- a/data/maps/VictoryRoad_B2F/header.inc +++ b/data/maps/VictoryRoad_B2F/header.inc @@ -7,7 +7,7 @@ VictoryRoad_B2F: @ 84843AC .2byte 286 .byte MAPSEC_VICTORY_ROAD .byte 1 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 From 546819bc722b706a1c49a3d323b3b36d03fa612a Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 12 Jul 2018 22:39:38 -0500 Subject: [PATCH 51/55] Use map type constants in map headers --- data/maps.s | 2 ++ .../AbandonedShip_CaptainsOffice/header.inc | 2 +- .../AbandonedShip_Corridors_1F/header.inc | 2 +- .../AbandonedShip_Corridors_B1F/header.inc | 2 +- data/maps/AbandonedShip_Deck/header.inc | 2 +- .../header.inc | 2 +- .../AbandonedShip_HiddenFloorRooms/header.inc | 2 +- data/maps/AbandonedShip_Room_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_B1F/header.inc | 2 +- .../maps/AbandonedShip_Underwater1/header.inc | 2 +- .../maps/AbandonedShip_Underwater2/header.inc | 2 +- data/maps/AlteringCave/header.inc | 2 +- data/maps/AncientTomb/header.inc | 2 +- data/maps/AquaHideout_1F/header.inc | 2 +- data/maps/AquaHideout_B1F/header.inc | 2 +- data/maps/AquaHideout_B2F/header.inc | 2 +- .../AquaHideout_UnusedRubyMap1/header.inc | 2 +- .../AquaHideout_UnusedRubyMap2/header.inc | 2 +- .../AquaHideout_UnusedRubyMap3/header.inc | 2 +- data/maps/ArtisanCave_1F/header.inc | 2 +- data/maps/ArtisanCave_B1F/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../BattleFrontier_BattleDomeLobby/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../BattleFrontier_BattlePikeLobby/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/BattleFrontier_Lounge1/header.inc | 2 +- data/maps/BattleFrontier_Lounge2/header.inc | 2 +- data/maps/BattleFrontier_Lounge3/header.inc | 2 +- data/maps/BattleFrontier_Lounge4/header.inc | 2 +- data/maps/BattleFrontier_Lounge5/header.inc | 2 +- data/maps/BattleFrontier_Lounge6/header.inc | 2 +- data/maps/BattleFrontier_Lounge7/header.inc | 2 +- data/maps/BattleFrontier_Lounge8/header.inc | 2 +- data/maps/BattleFrontier_Lounge9/header.inc | 2 +- data/maps/BattleFrontier_Mart/header.inc | 2 +- .../BattleFrontier_OutsideEast/header.inc | 2 +- .../BattleFrontier_OutsideWest/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../BattleFrontier_RankingHall/header.inc | 2 +- .../BattleFrontier_ReceptionGate/header.inc | 2 +- .../BattleFrontier_ScottsHouse/header.inc | 2 +- data/maps/BattlePyramidSquare01/header.inc | 2 +- data/maps/BattlePyramidSquare02/header.inc | 2 +- data/maps/BattlePyramidSquare03/header.inc | 2 +- data/maps/BattlePyramidSquare04/header.inc | 2 +- data/maps/BattlePyramidSquare05/header.inc | 2 +- data/maps/BattlePyramidSquare06/header.inc | 2 +- data/maps/BattlePyramidSquare07/header.inc | 2 +- data/maps/BattlePyramidSquare08/header.inc | 2 +- data/maps/BattlePyramidSquare09/header.inc | 2 +- data/maps/BattlePyramidSquare10/header.inc | 2 +- data/maps/BattlePyramidSquare11/header.inc | 2 +- data/maps/BattlePyramidSquare12/header.inc | 2 +- data/maps/BattlePyramidSquare13/header.inc | 2 +- data/maps/BattlePyramidSquare14/header.inc | 2 +- data/maps/BattlePyramidSquare15/header.inc | 2 +- data/maps/BattlePyramidSquare16/header.inc | 2 +- data/maps/BirthIsland_Exterior/header.inc | 2 +- data/maps/BirthIsland_Harbor/header.inc | 2 +- data/maps/CaveOfOrigin_1F/header.inc | 2 +- data/maps/CaveOfOrigin_B1F/header.inc | 2 +- data/maps/CaveOfOrigin_Entrance/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/DesertRuins/header.inc | 2 +- data/maps/DesertUnderpass/header.inc | 2 +- data/maps/DewfordTown/header.inc | 2 +- data/maps/DewfordTown_Gym/header.inc | 2 +- data/maps/DewfordTown_Hall/header.inc | 2 +- data/maps/DewfordTown_House1/header.inc | 2 +- data/maps/DewfordTown_House2/header.inc | 2 +- .../DewfordTown_PokemonCenter_1F/header.inc | 2 +- .../DewfordTown_PokemonCenter_2F/header.inc | 2 +- data/maps/DoubleBattleColosseum/header.inc | 2 +- data/maps/EverGrandeCity/header.inc | 2 +- .../EverGrandeCity_ChampionsRoom/header.inc | 2 +- .../maps/EverGrandeCity_DrakesRoom/header.inc | 2 +- .../EverGrandeCity_GlaciasRoom/header.inc | 2 +- data/maps/EverGrandeCity_Hall1/header.inc | 2 +- data/maps/EverGrandeCity_Hall2/header.inc | 2 +- data/maps/EverGrandeCity_Hall3/header.inc | 2 +- data/maps/EverGrandeCity_Hall4/header.inc | 2 +- data/maps/EverGrandeCity_Hall5/header.inc | 2 +- .../maps/EverGrandeCity_HallOfFame/header.inc | 2 +- .../EverGrandeCity_PhoebesRoom/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../EverGrandeCity_SidneysRoom/header.inc | 2 +- data/maps/FallarborTown/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../FallarborTown_BattleTentLobby/header.inc | 2 +- data/maps/FallarborTown_House1/header.inc | 2 +- data/maps/FallarborTown_House2/header.inc | 2 +- data/maps/FallarborTown_Mart/header.inc | 2 +- .../FallarborTown_PokemonCenter_1F/header.inc | 2 +- .../FallarborTown_PokemonCenter_2F/header.inc | 2 +- data/maps/FarawayIsland_Entrance/header.inc | 2 +- data/maps/FarawayIsland_Interior/header.inc | 2 +- data/maps/FieryPath/header.inc | 2 +- data/maps/FortreeCity/header.inc | 2 +- .../FortreeCity_DecorationShop/header.inc | 2 +- data/maps/FortreeCity_Gym/header.inc | 2 +- data/maps/FortreeCity_House1/header.inc | 2 +- data/maps/FortreeCity_House2/header.inc | 2 +- data/maps/FortreeCity_House3/header.inc | 2 +- data/maps/FortreeCity_House4/header.inc | 2 +- data/maps/FortreeCity_House5/header.inc | 2 +- data/maps/FortreeCity_Mart/header.inc | 2 +- .../FortreeCity_PokemonCenter_1F/header.inc | 2 +- .../FortreeCity_PokemonCenter_2F/header.inc | 2 +- data/maps/GraniteCave_1F/header.inc | 2 +- data/maps/GraniteCave_B1F/header.inc | 2 +- data/maps/GraniteCave_B2F/header.inc | 2 +- data/maps/GraniteCave_StevensRoom/header.inc | 2 +- data/maps/InsideOfTruck/header.inc | 2 +- data/maps/IslandCave/header.inc | 2 +- data/maps/JaggedPass/header.inc | 2 +- data/maps/LavaridgeTown/header.inc | 2 +- data/maps/LavaridgeTown_Gym_1F/header.inc | 2 +- data/maps/LavaridgeTown_Gym_B1F/header.inc | 2 +- data/maps/LavaridgeTown_HerbShop/header.inc | 2 +- data/maps/LavaridgeTown_House/header.inc | 2 +- data/maps/LavaridgeTown_Mart/header.inc | 2 +- .../LavaridgeTown_PokemonCenter_1F/header.inc | 2 +- .../LavaridgeTown_PokemonCenter_2F/header.inc | 2 +- data/maps/LilycoveCity/header.inc | 2 +- data/maps/LilycoveCity_ContestHall/header.inc | 2 +- .../maps/LilycoveCity_ContestLobby/header.inc | 2 +- .../LilycoveCity_CoveLilyMotel_1F/header.inc | 2 +- .../LilycoveCity_CoveLilyMotel_2F/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/LilycoveCity_Harbor/header.inc | 2 +- data/maps/LilycoveCity_House1/header.inc | 2 +- data/maps/LilycoveCity_House2/header.inc | 2 +- data/maps/LilycoveCity_House3/header.inc | 2 +- data/maps/LilycoveCity_House4/header.inc | 2 +- .../LilycoveCity_LilycoveMuseum_1F/header.inc | 2 +- .../LilycoveCity_LilycoveMuseum_2F/header.inc | 2 +- .../LilycoveCity_MoveDeletersHouse/header.inc | 2 +- .../LilycoveCity_PokemonCenter_1F/header.inc | 2 +- .../LilycoveCity_PokemonCenter_2F/header.inc | 2 +- .../header.inc | 2 +- data/maps/LilycoveCity_UnusedMart/header.inc | 2 +- data/maps/LinkContestRoom1/header.inc | 2 +- data/maps/LinkContestRoom2/header.inc | 2 +- data/maps/LinkContestRoom3/header.inc | 2 +- data/maps/LinkContestRoom4/header.inc | 2 +- data/maps/LinkContestRoom5/header.inc | 2 +- data/maps/LinkContestRoom6/header.inc | 2 +- data/maps/LittlerootTown/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../LittlerootTown_MaysHouse_1F/header.inc | 2 +- .../LittlerootTown_MaysHouse_2F/header.inc | 2 +- .../header.inc | 2 +- data/maps/MagmaHideout_1F/header.inc | 2 +- data/maps/MagmaHideout_2F_1R/header.inc | 2 +- data/maps/MagmaHideout_2F_2R/header.inc | 2 +- data/maps/MagmaHideout_2F_3R/header.inc | 2 +- data/maps/MagmaHideout_3F_1R/header.inc | 2 +- data/maps/MagmaHideout_3F_2R/header.inc | 2 +- data/maps/MagmaHideout_3F_3R/header.inc | 2 +- data/maps/MagmaHideout_4F/header.inc | 2 +- data/maps/MarineCave_End/header.inc | 2 +- data/maps/MarineCave_Entrance/header.inc | 2 +- data/maps/MauvilleCity/header.inc | 2 +- data/maps/MauvilleCity_BikeShop/header.inc | 2 +- data/maps/MauvilleCity_GameCorner/header.inc | 2 +- data/maps/MauvilleCity_Gym/header.inc | 2 +- data/maps/MauvilleCity_House1/header.inc | 2 +- data/maps/MauvilleCity_House2/header.inc | 2 +- data/maps/MauvilleCity_Mart/header.inc | 2 +- .../MauvilleCity_PokemonCenter_1F/header.inc | 2 +- .../MauvilleCity_PokemonCenter_2F/header.inc | 2 +- data/maps/MeteorFalls_1F_1R/header.inc | 2 +- data/maps/MeteorFalls_1F_2R/header.inc | 2 +- data/maps/MeteorFalls_B1F_1R/header.inc | 2 +- data/maps/MeteorFalls_B1F_2R/header.inc | 2 +- data/maps/MeteorFalls_StevensCave/header.inc | 2 +- data/maps/MirageTower_1F/header.inc | 2 +- data/maps/MirageTower_2F/header.inc | 2 +- data/maps/MirageTower_3F/header.inc | 2 +- data/maps/MirageTower_4F/header.inc | 2 +- data/maps/MossdeepCity/header.inc | 2 +- .../MossdeepCity_GameCorner_1F/header.inc | 2 +- .../MossdeepCity_GameCorner_B1F/header.inc | 2 +- data/maps/MossdeepCity_Gym/header.inc | 2 +- data/maps/MossdeepCity_House1/header.inc | 2 +- data/maps/MossdeepCity_House2/header.inc | 2 +- data/maps/MossdeepCity_House3/header.inc | 2 +- data/maps/MossdeepCity_House4/header.inc | 2 +- data/maps/MossdeepCity_Mart/header.inc | 2 +- .../MossdeepCity_PokemonCenter_1F/header.inc | 2 +- .../MossdeepCity_PokemonCenter_2F/header.inc | 2 +- .../MossdeepCity_SpaceCenter_1F/header.inc | 2 +- .../MossdeepCity_SpaceCenter_2F/header.inc | 2 +- .../maps/MossdeepCity_StevensHouse/header.inc | 2 +- data/maps/MtChimney/header.inc | 2 +- .../maps/MtChimney_CableCarStation/header.inc | 2 +- data/maps/MtPyre_1F/header.inc | 2 +- data/maps/MtPyre_2F/header.inc | 2 +- data/maps/MtPyre_3F/header.inc | 2 +- data/maps/MtPyre_4F/header.inc | 2 +- data/maps/MtPyre_5F/header.inc | 2 +- data/maps/MtPyre_6F/header.inc | 2 +- data/maps/MtPyre_Exterior/header.inc | 2 +- data/maps/MtPyre_Summit/header.inc | 2 +- data/maps/NavelRock_B1F/header.inc | 2 +- data/maps/NavelRock_Bottom/header.inc | 2 +- data/maps/NavelRock_Down01/header.inc | 2 +- data/maps/NavelRock_Down02/header.inc | 2 +- data/maps/NavelRock_Down03/header.inc | 2 +- data/maps/NavelRock_Down04/header.inc | 2 +- data/maps/NavelRock_Down05/header.inc | 2 +- data/maps/NavelRock_Down06/header.inc | 2 +- data/maps/NavelRock_Down07/header.inc | 2 +- data/maps/NavelRock_Down08/header.inc | 2 +- data/maps/NavelRock_Down09/header.inc | 2 +- data/maps/NavelRock_Down10/header.inc | 2 +- data/maps/NavelRock_Down11/header.inc | 2 +- data/maps/NavelRock_Entrance/header.inc | 2 +- data/maps/NavelRock_Exterior/header.inc | 2 +- data/maps/NavelRock_Fork/header.inc | 2 +- data/maps/NavelRock_Harbor/header.inc | 2 +- data/maps/NavelRock_Top/header.inc | 2 +- data/maps/NavelRock_Up1/header.inc | 2 +- data/maps/NavelRock_Up2/header.inc | 2 +- data/maps/NavelRock_Up3/header.inc | 2 +- data/maps/NavelRock_Up4/header.inc | 2 +- data/maps/NewMauville_Entrance/header.inc | 2 +- data/maps/NewMauville_Inside/header.inc | 2 +- data/maps/OldaleTown/header.inc | 2 +- data/maps/OldaleTown_House1/header.inc | 2 +- data/maps/OldaleTown_House2/header.inc | 2 +- data/maps/OldaleTown_Mart/header.inc | 2 +- .../OldaleTown_PokemonCenter_1F/header.inc | 2 +- .../OldaleTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PacifidlogTown/header.inc | 2 +- data/maps/PacifidlogTown_House1/header.inc | 2 +- data/maps/PacifidlogTown_House2/header.inc | 2 +- data/maps/PacifidlogTown_House3/header.inc | 2 +- data/maps/PacifidlogTown_House4/header.inc | 2 +- data/maps/PacifidlogTown_House5/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/PetalburgCity/header.inc | 2 +- data/maps/PetalburgCity_Gym/header.inc | 2 +- data/maps/PetalburgCity_House1/header.inc | 2 +- data/maps/PetalburgCity_House2/header.inc | 2 +- data/maps/PetalburgCity_Mart/header.inc | 2 +- .../PetalburgCity_PokemonCenter_1F/header.inc | 2 +- .../PetalburgCity_PokemonCenter_2F/header.inc | 2 +- .../maps/PetalburgCity_WallysHouse/header.inc | 2 +- data/maps/PetalburgWoods/header.inc | 2 +- data/maps/RecordCorner/header.inc | 2 +- data/maps/Route101/header.inc | 2 +- data/maps/Route102/header.inc | 2 +- data/maps/Route103/header.inc | 2 +- data/maps/Route104/header.inc | 2 +- data/maps/Route104_MrBrineysHouse/header.inc | 2 +- .../Route104_PrettyPetalFlowerShop/header.inc | 2 +- data/maps/Route104_Prototype/header.inc | 2 +- .../header.inc | 2 +- data/maps/Route105/header.inc | 2 +- data/maps/Route106/header.inc | 2 +- data/maps/Route107/header.inc | 2 +- data/maps/Route108/header.inc | 2 +- data/maps/Route109/header.inc | 2 +- data/maps/Route109_SeashoreHouse/header.inc | 2 +- data/maps/Route110/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../Route110_TrickHouseCorridor/header.inc | 2 +- data/maps/Route110_TrickHouseEnd/header.inc | 2 +- .../Route110_TrickHouseEntrance/header.inc | 2 +- .../Route110_TrickHousePuzzle1/header.inc | 2 +- .../Route110_TrickHousePuzzle2/header.inc | 2 +- .../Route110_TrickHousePuzzle3/header.inc | 2 +- .../Route110_TrickHousePuzzle4/header.inc | 2 +- .../Route110_TrickHousePuzzle5/header.inc | 2 +- .../Route110_TrickHousePuzzle6/header.inc | 2 +- .../Route110_TrickHousePuzzle7/header.inc | 2 +- .../Route110_TrickHousePuzzle8/header.inc | 2 +- data/maps/Route111/header.inc | 2 +- .../maps/Route111_OldLadysRestStop/header.inc | 2 +- .../Route111_WinstrateFamilysHouse/header.inc | 2 +- data/maps/Route112/header.inc | 2 +- data/maps/Route112_CableCarStation/header.inc | 2 +- data/maps/Route113/header.inc | 2 +- data/maps/Route113_GlassWorkshop/header.inc | 2 +- data/maps/Route114/header.inc | 2 +- .../Route114_FossilManiacsHouse/header.inc | 2 +- .../Route114_FossilManiacsTunnel/header.inc | 2 +- data/maps/Route114_LanettesHouse/header.inc | 2 +- data/maps/Route115/header.inc | 2 +- data/maps/Route116/header.inc | 2 +- .../Route116_TunnelersRestHouse/header.inc | 2 +- data/maps/Route117/header.inc | 2 +- data/maps/Route117_PokemonDayCare/header.inc | 2 +- data/maps/Route118/header.inc | 2 +- data/maps/Route119/header.inc | 2 +- data/maps/Route119_House/header.inc | 2 +- .../Route119_WeatherInstitute_1F/header.inc | 2 +- .../Route119_WeatherInstitute_2F/header.inc | 2 +- data/maps/Route120/header.inc | 2 +- data/maps/Route121/header.inc | 2 +- .../Route121_SafariZoneEntrance/header.inc | 2 +- data/maps/Route122/header.inc | 2 +- data/maps/Route123/header.inc | 2 +- .../Route123_BerryMastersHouse/header.inc | 2 +- data/maps/Route124/header.inc | 2 +- .../header.inc | 2 +- data/maps/Route125/header.inc | 2 +- data/maps/Route126/header.inc | 2 +- data/maps/Route127/header.inc | 2 +- data/maps/Route128/header.inc | 2 +- data/maps/Route129/header.inc | 2 +- data/maps/Route130/header.inc | 2 +- data/maps/Route131/header.inc | 2 +- data/maps/Route132/header.inc | 2 +- data/maps/Route133/header.inc | 2 +- data/maps/Route134/header.inc | 2 +- data/maps/RustboroCity/header.inc | 2 +- .../maps/RustboroCity_CuttersHouse/header.inc | 2 +- .../maps/RustboroCity_DevonCorp_1F/header.inc | 2 +- .../maps/RustboroCity_DevonCorp_2F/header.inc | 2 +- .../maps/RustboroCity_DevonCorp_3F/header.inc | 2 +- data/maps/RustboroCity_Flat1_1F/header.inc | 2 +- data/maps/RustboroCity_Flat1_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_1F/header.inc | 2 +- data/maps/RustboroCity_Flat2_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_3F/header.inc | 2 +- data/maps/RustboroCity_Gym/header.inc | 2 +- data/maps/RustboroCity_House1/header.inc | 2 +- data/maps/RustboroCity_House2/header.inc | 2 +- data/maps/RustboroCity_House3/header.inc | 2 +- data/maps/RustboroCity_Mart/header.inc | 2 +- .../RustboroCity_PokemonCenter_1F/header.inc | 2 +- .../RustboroCity_PokemonCenter_2F/header.inc | 2 +- .../RustboroCity_PokemonSchool/header.inc | 2 +- data/maps/RusturfTunnel/header.inc | 2 +- data/maps/SSTidalCorridor/header.inc | 2 +- data/maps/SSTidalLowerDeck/header.inc | 2 +- data/maps/SSTidalRooms/header.inc | 2 +- data/maps/SafariZone_North/header.inc | 2 +- data/maps/SafariZone_Northeast/header.inc | 2 +- data/maps/SafariZone_Northwest/header.inc | 2 +- data/maps/SafariZone_RestHouse/header.inc | 2 +- data/maps/SafariZone_South/header.inc | 2 +- data/maps/SafariZone_Southeast/header.inc | 2 +- data/maps/SafariZone_Southwest/header.inc | 2 +- data/maps/ScorchedSlab/header.inc | 2 +- data/maps/SeafloorCavern_Entrance/header.inc | 2 +- data/maps/SeafloorCavern_Room1/header.inc | 2 +- data/maps/SeafloorCavern_Room2/header.inc | 2 +- data/maps/SeafloorCavern_Room3/header.inc | 2 +- data/maps/SeafloorCavern_Room4/header.inc | 2 +- data/maps/SeafloorCavern_Room5/header.inc | 2 +- data/maps/SeafloorCavern_Room6/header.inc | 2 +- data/maps/SeafloorCavern_Room7/header.inc | 2 +- data/maps/SeafloorCavern_Room8/header.inc | 2 +- data/maps/SeafloorCavern_Room9/header.inc | 2 +- data/maps/SealedChamber_InnerRoom/header.inc | 2 +- data/maps/SealedChamber_OuterRoom/header.inc | 2 +- data/maps/SecretBase_BlueCave1/header.inc | 2 +- data/maps/SecretBase_BlueCave2/header.inc | 2 +- data/maps/SecretBase_BlueCave3/header.inc | 2 +- data/maps/SecretBase_BlueCave4/header.inc | 2 +- data/maps/SecretBase_BrownCave1/header.inc | 2 +- data/maps/SecretBase_BrownCave2/header.inc | 2 +- data/maps/SecretBase_BrownCave3/header.inc | 2 +- data/maps/SecretBase_BrownCave4/header.inc | 2 +- data/maps/SecretBase_RedCave1/header.inc | 2 +- data/maps/SecretBase_RedCave2/header.inc | 2 +- data/maps/SecretBase_RedCave3/header.inc | 2 +- data/maps/SecretBase_RedCave4/header.inc | 2 +- data/maps/SecretBase_Shrub1/header.inc | 2 +- data/maps/SecretBase_Shrub2/header.inc | 2 +- data/maps/SecretBase_Shrub3/header.inc | 2 +- data/maps/SecretBase_Shrub4/header.inc | 2 +- data/maps/SecretBase_Tree1/header.inc | 2 +- data/maps/SecretBase_Tree2/header.inc | 2 +- data/maps/SecretBase_Tree3/header.inc | 2 +- data/maps/SecretBase_Tree4/header.inc | 2 +- data/maps/SecretBase_YellowCave1/header.inc | 2 +- data/maps/SecretBase_YellowCave2/header.inc | 2 +- data/maps/SecretBase_YellowCave3/header.inc | 2 +- data/maps/SecretBase_YellowCave4/header.inc | 2 +- .../ShoalCave_HighTideEntranceRoom/header.inc | 2 +- .../ShoalCave_HighTideInnerRoom/header.inc | 2 +- .../ShoalCave_LowTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideIceRoom/header.inc | 2 +- .../ShoalCave_LowTideInnerRoom/header.inc | 2 +- .../ShoalCave_LowTideLowerRoom/header.inc | 2 +- .../ShoalCave_LowTideStairsRoom/header.inc | 2 +- data/maps/SingleBattleColosseum/header.inc | 2 +- data/maps/SkyPillar_1F/header.inc | 2 +- data/maps/SkyPillar_2F/header.inc | 2 +- data/maps/SkyPillar_3F/header.inc | 2 +- data/maps/SkyPillar_4F/header.inc | 2 +- data/maps/SkyPillar_5F/header.inc | 2 +- data/maps/SkyPillar_Entrance/header.inc | 2 +- data/maps/SkyPillar_Outside/header.inc | 2 +- data/maps/SkyPillar_Top/header.inc | 2 +- data/maps/SlateportCity/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../SlateportCity_BattleTentLobby/header.inc | 2 +- data/maps/SlateportCity_Harbor/header.inc | 2 +- data/maps/SlateportCity_House1/header.inc | 2 +- data/maps/SlateportCity_House2/header.inc | 2 +- data/maps/SlateportCity_Mart/header.inc | 2 +- .../SlateportCity_OceanicMuseum_1F/header.inc | 2 +- .../SlateportCity_OceanicMuseum_2F/header.inc | 2 +- .../SlateportCity_PokemonCenter_1F/header.inc | 2 +- .../SlateportCity_PokemonCenter_2F/header.inc | 2 +- .../SlateportCity_PokemonFanClub/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/SootopolisCity/header.inc | 2 +- data/maps/SootopolisCity_Gym_1F/header.inc | 2 +- data/maps/SootopolisCity_Gym_B1F/header.inc | 2 +- data/maps/SootopolisCity_House1/header.inc | 2 +- data/maps/SootopolisCity_House2/header.inc | 2 +- data/maps/SootopolisCity_House3/header.inc | 2 +- data/maps/SootopolisCity_House4/header.inc | 2 +- data/maps/SootopolisCity_House5/header.inc | 2 +- data/maps/SootopolisCity_House6/header.inc | 2 +- data/maps/SootopolisCity_House7/header.inc | 2 +- .../header.inc | 2 +- data/maps/SootopolisCity_Mart/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/SouthernIsland_Exterior/header.inc | 2 +- data/maps/SouthernIsland_Interior/header.inc | 2 +- data/maps/TerraCave_End/header.inc | 2 +- data/maps/TerraCave_Entrance/header.inc | 2 +- data/maps/TradeCenter/header.inc | 2 +- data/maps/TrainerHill_1F/header.inc | 2 +- data/maps/TrainerHill_2F/header.inc | 2 +- data/maps/TrainerHill_3F/header.inc | 2 +- data/maps/TrainerHill_4F/header.inc | 2 +- data/maps/TrainerHill_Elevator/header.inc | 2 +- data/maps/TrainerHill_Entrance/header.inc | 2 +- data/maps/TrainerHill_Roof/header.inc | 2 +- data/maps/Underwater1/header.inc | 2 +- data/maps/Underwater2/header.inc | 2 +- data/maps/Underwater3/header.inc | 2 +- data/maps/Underwater4/header.inc | 2 +- data/maps/Underwater5/header.inc | 2 +- data/maps/Underwater6/header.inc | 2 +- data/maps/Underwater7/header.inc | 2 +- data/maps/Underwater_MarineCave/header.inc | 2 +- data/maps/Underwater_Route134/header.inc | 2 +- .../maps/Underwater_SeafloorCavern/header.inc | 2 +- data/maps/Underwater_SealedChamber/header.inc | 2 +- .../maps/Underwater_SootopolisCity/header.inc | 2 +- data/maps/UnionRoom/header.inc | 2 +- data/maps/UnknownMap_25_29/header.inc | 2 +- data/maps/UnknownMap_25_30/header.inc | 2 +- data/maps/UnknownMap_25_31/header.inc | 2 +- data/maps/UnknownMap_25_32/header.inc | 2 +- data/maps/UnknownMap_25_33/header.inc | 2 +- data/maps/UnknownMap_25_34/header.inc | 2 +- data/maps/VerdanturfTown/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../VerdanturfTown_BattleTentLobby/header.inc | 2 +- .../header.inc | 2 +- data/maps/VerdanturfTown_House/header.inc | 2 +- data/maps/VerdanturfTown_Mart/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../VerdanturfTown_WandasHouse/header.inc | 2 +- data/maps/VictoryRoad_1F/header.inc | 2 +- data/maps/VictoryRoad_B1F/header.inc | 2 +- data/maps/VictoryRoad_B2F/header.inc | 2 +- include/constants/map_types.h | 25 ++++++++++++++++ include/global.fieldmap.h | 29 ------------------- src/battle_bg.c | 1 + src/battle_setup.c | 1 + src/bike.c | 1 + src/overworld.c | 1 + src/rom6.c | 1 + src/secret_base.c | 1 + 527 files changed, 551 insertions(+), 547 deletions(-) create mode 100755 include/constants/map_types.h diff --git a/data/maps.s b/data/maps.s index 59a6b4930c..56d9571396 100644 --- a/data/maps.s +++ b/data/maps.s @@ -1,4 +1,6 @@ +#include "constants/map_types.h" #include "constants/maps.h" +#include "constants/weather.h" #include "constants/region_map_sections.h" #include "constants/songs.h" #include "constants/weather.h" diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc index 149f276551..53c7196e10 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc @@ -8,7 +8,7 @@ AbandonedShip_CaptainsOffice: @ 84845A4 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc index a0971779c3..75347beab0 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_1F/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Corridors_1F: @ 84844C4 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc index 12cb7e6976..91ea7b76d8 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Corridors_B1F: @ 84844FC .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc index f6616f885b..4197ef0c0a 100644 --- a/data/maps/AbandonedShip_Deck/header.inc +++ b/data/maps/AbandonedShip_Deck/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Deck: @ 84844A8 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc index f375e0beed..b075158dd6 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc @@ -8,7 +8,7 @@ AbandonedShip_HiddenFloorCorridors: @ 84845DC .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc index 0ef17861ae..dc18c55af3 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc @@ -8,7 +8,7 @@ AbandonedShip_HiddenFloorRooms: @ 84845F8 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 7 .byte 0 diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc index 5dc438acdb..ce93934624 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ b/data/maps/AbandonedShip_Room_B1F/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Room_B1F: @ 848456C .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc index e4bf899114..338e9a37af 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Rooms2_1F: @ 8484588 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc index fa713bf29a..5482655a86 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Rooms2_B1F: @ 8484534 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc index d552a8cac7..7cbf2f30f6 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_1F/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Rooms_1F: @ 84844E0 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc index 7b121a2d22..d75870116a 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Rooms_B1F: @ 8484518 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc index 0176f1637c..ce2267768d 100644 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ b/data/maps/AbandonedShip_Underwater1/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Underwater1: @ 8484550 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc index 7ca32edb8f..afb2287a7c 100644 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ b/data/maps/AbandonedShip_Underwater2/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Underwater2: @ 84845C0 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/AlteringCave/header.inc b/data/maps/AlteringCave/header.inc index 344bdaf8cb..3abc6981fd 100644 --- a/data/maps/AlteringCave/header.inc +++ b/data/maps/AlteringCave/header.inc @@ -8,7 +8,7 @@ AlteringCave: @ 8484A58 .byte MAPSEC_ALTERING_CAVE_2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc index afc0f475c4..c1e109537c 100644 --- a/data/maps/AncientTomb/header.inc +++ b/data/maps/AncientTomb/header.inc @@ -8,7 +8,7 @@ AncientTomb: @ 8484630 .byte MAPSEC_ANCIENT_TOMB .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc index 7590ebce5b..1b5dd0498c 100644 --- a/data/maps/AquaHideout_1F/header.inc +++ b/data/maps/AquaHideout_1F/header.inc @@ -8,7 +8,7 @@ AquaHideout_1F: @ 8484144 .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 .byte 3 diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc index 51ec824929..14bf999a66 100644 --- a/data/maps/AquaHideout_B1F/header.inc +++ b/data/maps/AquaHideout_B1F/header.inc @@ -8,7 +8,7 @@ AquaHideout_B1F: @ 8484160 .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 .byte 3 diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc index 0d903e1cf3..9a096ac9b5 100644 --- a/data/maps/AquaHideout_B2F/header.inc +++ b/data/maps/AquaHideout_B2F/header.inc @@ -8,7 +8,7 @@ AquaHideout_B2F: @ 848417C .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 .byte 3 diff --git a/data/maps/AquaHideout_UnusedRubyMap1/header.inc b/data/maps/AquaHideout_UnusedRubyMap1/header.inc index 242f32e61d..07dc3be28c 100644 --- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap1/header.inc @@ -8,7 +8,7 @@ AquaHideout_UnusedRubyMap1: @ 84846D8 .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 2 diff --git a/data/maps/AquaHideout_UnusedRubyMap2/header.inc b/data/maps/AquaHideout_UnusedRubyMap2/header.inc index ebc999cf43..4b50fff532 100644 --- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap2/header.inc @@ -8,7 +8,7 @@ AquaHideout_UnusedRubyMap2: @ 84846F4 .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 2 diff --git a/data/maps/AquaHideout_UnusedRubyMap3/header.inc b/data/maps/AquaHideout_UnusedRubyMap3/header.inc index f9d571c8eb..1b0a82f3ae 100644 --- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap3/header.inc @@ -8,7 +8,7 @@ AquaHideout_UnusedRubyMap3: @ 8484710 .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 2 diff --git a/data/maps/ArtisanCave_1F/header.inc b/data/maps/ArtisanCave_1F/header.inc index b801c08af4..493cf5c7cd 100644 --- a/data/maps/ArtisanCave_1F/header.inc +++ b/data/maps/ArtisanCave_1F/header.inc @@ -8,7 +8,7 @@ ArtisanCave_1F: @ 84849B0 .byte MAPSEC_ARTISAN_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/ArtisanCave_B1F/header.inc b/data/maps/ArtisanCave_B1F/header.inc index 8e106ea1cd..3f7bd293a6 100644 --- a/data/maps/ArtisanCave_B1F/header.inc +++ b/data/maps/ArtisanCave_B1F/header.inc @@ -8,7 +8,7 @@ ArtisanCave_B1F: @ 8484994 .byte MAPSEC_ARTISAN_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc index d20c65c2e6..60b61c3cd0 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleArenaBattleRoom: @ 8485484 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc index ba4431464f..4519b0de20 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleArenaCorridor: @ 8485468 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleArenaLobby/header.inc b/data/maps/BattleFrontier_BattleArenaLobby/header.inc index 112fb86bdd..cf75d18c93 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleArenaLobby: @ 848544C .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc index 19d1941690..5c6c65fb94 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleDomeBattleRoom: @ 8485388 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc index 72caf95238..ed349c8d72 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleDomeCorridor: @ 8485350 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleDomeLobby/header.inc b/data/maps/BattleFrontier_BattleDomeLobby/header.inc index 0d607e6718..8866c02639 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleDomeLobby: @ 8485334 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc index db09e9b419..99986cc7c4 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleDomePreBattleRoom: @ 848536C .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc index 27e2c89525..d9896fd35f 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleFactoryBattleRoom: @ 84854D8 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc index b9fb23a034..511a09c340 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleFactoryLobby: @ 84854A0 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc index e1fa2d5247..539ca0e3fd 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc index 701647467c..e4b5517407 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattlePalaceBattleRoom: @ 84853DC .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc index d867a0dafd..73e7dc952d 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattlePalaceCorridor: @ 84853C0 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc index 3b53c9397c..975ed46662 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattlePalaceLobby: @ 84853A4 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc index 0f93684c30..c3b4f41b88 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattlePikeCorridor: @ 8485510 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePikeLobby/header.inc b/data/maps/BattleFrontier_BattlePikeLobby/header.inc index d6fe6e3406..d05767d81e 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattlePikeLobby: @ 84854F4 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc index f4fde68ade..544bb93d4f 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattlePikeRandomRoom1: @ 8485548 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc index 4274d8eeec..de239780e3 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattlePikeRandomRoom2: @ 8485564 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc index 15b65af638..3d7ce40b95 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattlePikeRandomRoom3: @ 8485580 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc index b744f348f4..9c6d367d35 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattlePikeThreePathRoom: @ 848552C .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc index 289c024558..3718fd37c1 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc index a0face861e..239a543b0a 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattlePyramidEmptySquare: @ 8485414 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc index 9fa6b7fa35..a64b371790 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 diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc index 970aadfbee..9b46bf7f77 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattlePyramidTop: @ 8485430 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc index 18d60521c7..aef5c1ea1f 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleTowerBattleRoom: @ 848521C .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc index 6606a9be79..539bec694c 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleTowerBattleRoom2: @ 8485318 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc index 13b0ebbf39..b5430947f6 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleTowerCorridor: @ 8485200 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc index 1a6e40299e..074e02cc2d 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleTowerCorridor2: @ 84852FC .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerElevator/header.inc b/data/maps/BattleFrontier_BattleTowerElevator/header.inc index 380a5400e9..f46a0f1c67 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/header.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleTowerElevator: @ 84851E4 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerLobby/header.inc b/data/maps/BattleFrontier_BattleTowerLobby/header.inc index 5d9252fbbc..9820be7ae1 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/header.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleTowerLobby: @ 84851C8 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc index 9bcd28c756..01c9169ee2 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge1/header.inc b/data/maps/BattleFrontier_Lounge1/header.inc index 25e88a5dfd..e8c45b3ecb 100644 --- a/data/maps/BattleFrontier_Lounge1/header.inc +++ b/data/maps/BattleFrontier_Lounge1/header.inc @@ -8,7 +8,7 @@ BattleFrontier_Lounge1: @ 84855B8 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge2/header.inc b/data/maps/BattleFrontier_Lounge2/header.inc index 71b9334744..8858adccec 100644 --- a/data/maps/BattleFrontier_Lounge2/header.inc +++ b/data/maps/BattleFrontier_Lounge2/header.inc @@ -8,7 +8,7 @@ BattleFrontier_Lounge2: @ 84855F0 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge3/header.inc b/data/maps/BattleFrontier_Lounge3/header.inc index 2f4b74d7eb..430161a6fc 100644 --- a/data/maps/BattleFrontier_Lounge3/header.inc +++ b/data/maps/BattleFrontier_Lounge3/header.inc @@ -8,7 +8,7 @@ BattleFrontier_Lounge3: @ 848560C .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge4/header.inc b/data/maps/BattleFrontier_Lounge4/header.inc index 6fea64a15f..b2d44e55e6 100644 --- a/data/maps/BattleFrontier_Lounge4/header.inc +++ b/data/maps/BattleFrontier_Lounge4/header.inc @@ -8,7 +8,7 @@ BattleFrontier_Lounge4: @ 8485628 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge5/header.inc b/data/maps/BattleFrontier_Lounge5/header.inc index f38db8f29d..231ce3b884 100644 --- a/data/maps/BattleFrontier_Lounge5/header.inc +++ b/data/maps/BattleFrontier_Lounge5/header.inc @@ -8,7 +8,7 @@ BattleFrontier_Lounge5: @ 8485660 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge6/header.inc b/data/maps/BattleFrontier_Lounge6/header.inc index 78f103166a..b4a9c780b3 100644 --- a/data/maps/BattleFrontier_Lounge6/header.inc +++ b/data/maps/BattleFrontier_Lounge6/header.inc @@ -8,7 +8,7 @@ BattleFrontier_Lounge6: @ 848567C .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge7/header.inc b/data/maps/BattleFrontier_Lounge7/header.inc index 871e16cc2d..9cea5c401e 100644 --- a/data/maps/BattleFrontier_Lounge7/header.inc +++ b/data/maps/BattleFrontier_Lounge7/header.inc @@ -8,7 +8,7 @@ BattleFrontier_Lounge7: @ 8485698 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge8/header.inc b/data/maps/BattleFrontier_Lounge8/header.inc index 620e79304e..60fb1edd2d 100644 --- a/data/maps/BattleFrontier_Lounge8/header.inc +++ b/data/maps/BattleFrontier_Lounge8/header.inc @@ -8,7 +8,7 @@ BattleFrontier_Lounge8: @ 84856D0 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge9/header.inc b/data/maps/BattleFrontier_Lounge9/header.inc index 37b608edf1..952b6aa268 100644 --- a/data/maps/BattleFrontier_Lounge9/header.inc +++ b/data/maps/BattleFrontier_Lounge9/header.inc @@ -8,7 +8,7 @@ BattleFrontier_Lounge9: @ 84856EC .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Mart/header.inc b/data/maps/BattleFrontier_Mart/header.inc index b356e7d7a3..2d8befefd3 100644 --- a/data/maps/BattleFrontier_Mart/header.inc +++ b/data/maps/BattleFrontier_Mart/header.inc @@ -8,7 +8,7 @@ BattleFrontier_Mart: @ 8485740 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_OutsideEast/header.inc b/data/maps/BattleFrontier_OutsideEast/header.inc index 3db684e8fc..23698cbbfa 100644 --- a/data/maps/BattleFrontier_OutsideEast/header.inc +++ b/data/maps/BattleFrontier_OutsideEast/header.inc @@ -8,7 +8,7 @@ BattleFrontier_OutsideEast: @ 84852C4 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/BattleFrontier_OutsideWest/header.inc b/data/maps/BattleFrontier_OutsideWest/header.inc index 2c1d3754e8..886b04095b 100644 --- a/data/maps/BattleFrontier_OutsideWest/header.inc +++ b/data/maps/BattleFrontier_OutsideWest/header.inc @@ -8,7 +8,7 @@ BattleFrontier_OutsideWest: @ 84851AC .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc index 283c3744a9..a830633ea0 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ BattleFrontier_PokemonCenter_1F: @ 8485708 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc index 44442a28cb..c868da343e 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ BattleFrontier_PokemonCenter_2F: @ 8485724 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_RankingHall/header.inc b/data/maps/BattleFrontier_RankingHall/header.inc index 2e91cbfafd..2bb632ee8b 100644 --- a/data/maps/BattleFrontier_RankingHall/header.inc +++ b/data/maps/BattleFrontier_RankingHall/header.inc @@ -8,7 +8,7 @@ BattleFrontier_RankingHall: @ 848559C .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_ReceptionGate/header.inc b/data/maps/BattleFrontier_ReceptionGate/header.inc index f009f93e55..38c514351c 100644 --- a/data/maps/BattleFrontier_ReceptionGate/header.inc +++ b/data/maps/BattleFrontier_ReceptionGate/header.inc @@ -8,7 +8,7 @@ BattleFrontier_ReceptionGate: @ 84856B4 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_ScottsHouse/header.inc b/data/maps/BattleFrontier_ScottsHouse/header.inc index 11cf240226..8f4d0593bd 100644 --- a/data/maps/BattleFrontier_ScottsHouse/header.inc +++ b/data/maps/BattleFrontier_ScottsHouse/header.inc @@ -8,7 +8,7 @@ BattleFrontier_ScottsHouse: @ 8485644 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare01/header.inc b/data/maps/BattlePyramidSquare01/header.inc index ef8c315d9b..0e1f791201 100644 --- a/data/maps/BattlePyramidSquare01/header.inc +++ b/data/maps/BattlePyramidSquare01/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare01: @ 8484F60 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare02/header.inc b/data/maps/BattlePyramidSquare02/header.inc index 41f1523cfd..cf619b3cb1 100644 --- a/data/maps/BattlePyramidSquare02/header.inc +++ b/data/maps/BattlePyramidSquare02/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare02: @ 8484F7C .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare03/header.inc b/data/maps/BattlePyramidSquare03/header.inc index 2938d52804..7640e62ce0 100644 --- a/data/maps/BattlePyramidSquare03/header.inc +++ b/data/maps/BattlePyramidSquare03/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare03: @ 8484F98 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare04/header.inc b/data/maps/BattlePyramidSquare04/header.inc index ae838f26d7..7739ac463c 100644 --- a/data/maps/BattlePyramidSquare04/header.inc +++ b/data/maps/BattlePyramidSquare04/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare04: @ 8484FB4 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare05/header.inc b/data/maps/BattlePyramidSquare05/header.inc index e893cfbcb1..b44ef03a32 100644 --- a/data/maps/BattlePyramidSquare05/header.inc +++ b/data/maps/BattlePyramidSquare05/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare05: @ 8484FD0 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare06/header.inc b/data/maps/BattlePyramidSquare06/header.inc index 397c7c27c1..1983fce443 100644 --- a/data/maps/BattlePyramidSquare06/header.inc +++ b/data/maps/BattlePyramidSquare06/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare06: @ 8484FEC .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare07/header.inc b/data/maps/BattlePyramidSquare07/header.inc index 3d9e1c2c5b..c371d05a70 100644 --- a/data/maps/BattlePyramidSquare07/header.inc +++ b/data/maps/BattlePyramidSquare07/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare07: @ 8485008 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare08/header.inc b/data/maps/BattlePyramidSquare08/header.inc index af3df7eba2..cfa836e3e8 100644 --- a/data/maps/BattlePyramidSquare08/header.inc +++ b/data/maps/BattlePyramidSquare08/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare08: @ 8485024 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare09/header.inc b/data/maps/BattlePyramidSquare09/header.inc index 2fb732618e..398ed89e8d 100644 --- a/data/maps/BattlePyramidSquare09/header.inc +++ b/data/maps/BattlePyramidSquare09/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare09: @ 8485040 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare10/header.inc b/data/maps/BattlePyramidSquare10/header.inc index 8f95706d3f..50a3db9bee 100644 --- a/data/maps/BattlePyramidSquare10/header.inc +++ b/data/maps/BattlePyramidSquare10/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare10: @ 848505C .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare11/header.inc b/data/maps/BattlePyramidSquare11/header.inc index 8d0ffdaae9..b5340bb166 100644 --- a/data/maps/BattlePyramidSquare11/header.inc +++ b/data/maps/BattlePyramidSquare11/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare11: @ 8485078 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare12/header.inc b/data/maps/BattlePyramidSquare12/header.inc index 268f24cb17..9e24c67b72 100644 --- a/data/maps/BattlePyramidSquare12/header.inc +++ b/data/maps/BattlePyramidSquare12/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare12: @ 8485094 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare13/header.inc b/data/maps/BattlePyramidSquare13/header.inc index b4d09580ff..e9e78332cb 100644 --- a/data/maps/BattlePyramidSquare13/header.inc +++ b/data/maps/BattlePyramidSquare13/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare13: @ 84850B0 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare14/header.inc b/data/maps/BattlePyramidSquare14/header.inc index 7d43feff02..1b300f4c1e 100644 --- a/data/maps/BattlePyramidSquare14/header.inc +++ b/data/maps/BattlePyramidSquare14/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare14: @ 84850CC .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare15/header.inc b/data/maps/BattlePyramidSquare15/header.inc index c67e86abef..67df053a28 100644 --- a/data/maps/BattlePyramidSquare15/header.inc +++ b/data/maps/BattlePyramidSquare15/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare15: @ 84850E8 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare16/header.inc b/data/maps/BattlePyramidSquare16/header.inc index 3026d44bd9..09576c40eb 100644 --- a/data/maps/BattlePyramidSquare16/header.inc +++ b/data/maps/BattlePyramidSquare16/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare16: @ 8485104 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc index 5bda312503..e29dd83bdc 100644 --- a/data/maps/BirthIsland_Exterior/header.inc +++ b/data/maps/BirthIsland_Exterior/header.inc @@ -8,7 +8,7 @@ BirthIsland_Exterior: @ 8485794 .byte MAPSEC_BIRTH_ISLAND_2 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc index f0ea9a70a9..a3278a8b64 100644 --- a/data/maps/BirthIsland_Harbor/header.inc +++ b/data/maps/BirthIsland_Harbor/header.inc @@ -8,7 +8,7 @@ BirthIsland_Harbor: @ 84857B0 .byte MAPSEC_BIRTH_ISLAND_2 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc index 2b44649375..740f0d8183 100644 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ b/data/maps/CaveOfOrigin_1F/header.inc @@ -8,7 +8,7 @@ CaveOfOrigin_1F: @ 84842E8 .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc index 46cac34335..64a8ea5d43 100644 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ b/data/maps/CaveOfOrigin_B1F/header.inc @@ -8,7 +8,7 @@ CaveOfOrigin_B1F: @ 8484358 .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte WEATHER_FOG_1 - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 14 .byte 0 diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc index a19256b391..046c318547 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ b/data/maps/CaveOfOrigin_Entrance/header.inc @@ -8,7 +8,7 @@ CaveOfOrigin_Entrance: @ 84842CC .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc index 155670bf07..feb17e90ab 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc @@ -8,7 +8,7 @@ CaveOfOrigin_UnusedRubySapphireMap1: @ 8484304 .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc index 12d34ac46e..17a6e8a324 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc @@ -8,7 +8,7 @@ CaveOfOrigin_UnusedRubySapphireMap2: @ 8484320 .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte WEATHER_FOG_1 - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc index 9edfd72a82..b8da3b1665 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc @@ -8,7 +8,7 @@ CaveOfOrigin_UnusedRubySapphireMap3: @ 848433C .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte WEATHER_FOG_1 - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc index 7e63a9023b..05820c0cbb 100644 --- a/data/maps/DesertRuins/header.inc +++ b/data/maps/DesertRuins/header.inc @@ -8,7 +8,7 @@ DesertRuins: @ 8483F68 .byte MAPSEC_DESERT_RUINS .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/DesertUnderpass/header.inc b/data/maps/DesertUnderpass/header.inc index d3f41bd726..6190cf6b08 100644 --- a/data/maps/DesertUnderpass/header.inc +++ b/data/maps/DesertUnderpass/header.inc @@ -8,7 +8,7 @@ DesertUnderpass: @ 8484978 .byte MAPSEC_DESERT_UNDERPASS .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc index fb1270636a..f3f4e41f04 100644 --- a/data/maps/DewfordTown/header.inc +++ b/data/maps/DewfordTown/header.inc @@ -8,7 +8,7 @@ DewfordTown: @ 84825EC .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_SUNNY - .byte 1 + .byte MAP_TYPE_TOWN .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc index de821f1169..1693883795 100644 --- a/data/maps/DewfordTown_Gym/header.inc +++ b/data/maps/DewfordTown_Gym/header.inc @@ -8,7 +8,7 @@ DewfordTown_Gym: @ 8482C60 .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc index 934a5a0397..a62bfe31ef 100644 --- a/data/maps/DewfordTown_Hall/header.inc +++ b/data/maps/DewfordTown_Hall/header.inc @@ -8,7 +8,7 @@ DewfordTown_Hall: @ 8482C7C .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc index 46352ccc66..2ba5bbcc94 100644 --- a/data/maps/DewfordTown_House1/header.inc +++ b/data/maps/DewfordTown_House1/header.inc @@ -8,7 +8,7 @@ DewfordTown_House1: @ 8482C0C .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc index 0d7070caee..487b763e85 100644 --- a/data/maps/DewfordTown_House2/header.inc +++ b/data/maps/DewfordTown_House2/header.inc @@ -8,7 +8,7 @@ DewfordTown_House2: @ 8482C98 .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc index 8a22a27f8b..95243a6eec 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ DewfordTown_PokemonCenter_1F: @ 8482C28 .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc index cd54f5fe05..5223c36e00 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ DewfordTown_PokemonCenter_2F: @ 8482C44 .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc index 8d4de2924a..b8bfdbd79b 100644 --- a/data/maps/DoubleBattleColosseum/header.inc +++ b/data/maps/DoubleBattleColosseum/header.inc @@ -8,7 +8,7 @@ DoubleBattleColosseum: @ 8484D84 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc index 7401e4f2f4..16da616993 100644 --- a/data/maps/EverGrandeCity/header.inc +++ b/data/maps/EverGrandeCity/header.inc @@ -8,7 +8,7 @@ EverGrandeCity: @ 8482598 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_SUNNY - .byte 2 + .byte MAP_TYPE_CITY .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc index 3cbf3d3b7c..6b091b199e 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_ChampionsRoom: @ 8483C3C .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc index 87ee3f9b61..e3ffc75f69 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_DrakesRoom: @ 8483C20 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 7 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc index b8170952ea..1c766c26f2 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_GlaciasRoom: @ 8483C04 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 6 diff --git a/data/maps/EverGrandeCity_Hall1/header.inc b/data/maps/EverGrandeCity_Hall1/header.inc index 2b993b9a6d..3af5f5a8ea 100644 --- a/data/maps/EverGrandeCity_Hall1/header.inc +++ b/data/maps/EverGrandeCity_Hall1/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_Hall1: @ 8483C58 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Hall2/header.inc b/data/maps/EverGrandeCity_Hall2/header.inc index 9d7a836feb..f87bc28bd9 100644 --- a/data/maps/EverGrandeCity_Hall2/header.inc +++ b/data/maps/EverGrandeCity_Hall2/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_Hall2: @ 8483C74 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Hall3/header.inc b/data/maps/EverGrandeCity_Hall3/header.inc index d22707542c..19fc74ed79 100644 --- a/data/maps/EverGrandeCity_Hall3/header.inc +++ b/data/maps/EverGrandeCity_Hall3/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_Hall3: @ 8483C90 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Hall4/header.inc b/data/maps/EverGrandeCity_Hall4/header.inc index 80867002f7..7058f7bef9 100644 --- a/data/maps/EverGrandeCity_Hall4/header.inc +++ b/data/maps/EverGrandeCity_Hall4/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_Hall4: @ 8483CAC .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Hall5/header.inc b/data/maps/EverGrandeCity_Hall5/header.inc index 1d1ac9edd6..ba5428b3d3 100644 --- a/data/maps/EverGrandeCity_Hall5/header.inc +++ b/data/maps/EverGrandeCity_Hall5/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_Hall5: @ 8483CC8 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc index 6918cc2f12..190433735b 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ b/data/maps/EverGrandeCity_HallOfFame/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_HallOfFame: @ 8483D00 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc index b852e1c8ed..dcfbeecf44 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_PhoebesRoom: @ 8483BE8 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 5 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc index d43b97fbca..b042264134 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_PokemonCenter_1F: @ 8483D1C .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc index 3ee23fe994..dea51de86d 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_PokemonCenter_2F: @ 8483D38 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc index 17d01bfaec..e58c53baac 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_PokemonLeague_1F: @ 8483CE4 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc index 217647a567..5aca74ce1c 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_PokemonLeague_2F: @ 8483D54 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc index 875c190f5b..8cd3539dcc 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_SidneysRoom: @ 8483BCC .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 4 diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc index 77be7ebaa1..c28bc8e502 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -8,7 +8,7 @@ FallarborTown: @ 8482624 .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_SUNNY - .byte 1 + .byte MAP_TYPE_TOWN .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc index 0781e0c306..b884c6f66d 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc @@ -8,7 +8,7 @@ FallarborTown_BattleTentBattleRoom: @ 8482DCC .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FallarborTown_BattleTentCorridor/header.inc b/data/maps/FallarborTown_BattleTentCorridor/header.inc index 6e5950e85b..efa4dde922 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/header.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/header.inc @@ -8,7 +8,7 @@ FallarborTown_BattleTentCorridor: @ 8482DB0 .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FallarborTown_BattleTentLobby/header.inc b/data/maps/FallarborTown_BattleTentLobby/header.inc index 6702e2f9d0..d1f0ece92c 100644 --- a/data/maps/FallarborTown_BattleTentLobby/header.inc +++ b/data/maps/FallarborTown_BattleTentLobby/header.inc @@ -8,7 +8,7 @@ FallarborTown_BattleTentLobby: @ 8482D94 .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc index b801201f34..fbc36a3f42 100644 --- a/data/maps/FallarborTown_House1/header.inc +++ b/data/maps/FallarborTown_House1/header.inc @@ -8,7 +8,7 @@ FallarborTown_House1: @ 8482E20 .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc index b30fdf5157..9041fd2b27 100644 --- a/data/maps/FallarborTown_House2/header.inc +++ b/data/maps/FallarborTown_House2/header.inc @@ -8,7 +8,7 @@ FallarborTown_House2: @ 8482E3C .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc index 7c9be5b8f6..2b29e7d437 100644 --- a/data/maps/FallarborTown_Mart/header.inc +++ b/data/maps/FallarborTown_Mart/header.inc @@ -8,7 +8,7 @@ FallarborTown_Mart: @ 8482D78 .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc index 0e1402710d..0c09089a1e 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ FallarborTown_PokemonCenter_1F: @ 8482DE8 .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc index f00757c910..c345b977e2 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ FallarborTown_PokemonCenter_2F: @ 8482E04 .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FarawayIsland_Entrance/header.inc b/data/maps/FarawayIsland_Entrance/header.inc index 539a797f11..11d0f1a46e 100644 --- a/data/maps/FarawayIsland_Entrance/header.inc +++ b/data/maps/FarawayIsland_Entrance/header.inc @@ -8,7 +8,7 @@ FarawayIsland_Entrance: @ 848575C .byte MAPSEC_FARAWAY_ISLAND .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/FarawayIsland_Interior/header.inc b/data/maps/FarawayIsland_Interior/header.inc index a5b52d0765..9b194f6746 100644 --- a/data/maps/FarawayIsland_Interior/header.inc +++ b/data/maps/FarawayIsland_Interior/header.inc @@ -8,7 +8,7 @@ FarawayIsland_Interior: @ 8485778 .byte MAPSEC_FARAWAY_ISLAND .byte 0 .byte WEATHER_SHADE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc index bdf2ec584f..3a07058831 100644 --- a/data/maps/FieryPath/header.inc +++ b/data/maps/FieryPath/header.inc @@ -8,7 +8,7 @@ FieryPath: @ 8484048 .byte MAPSEC_FIERY_PATH .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc index 7e20bfffff..6dfafd2c81 100644 --- a/data/maps/FortreeCity/header.inc +++ b/data/maps/FortreeCity/header.inc @@ -8,7 +8,7 @@ FortreeCity: @ 8482528 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_SUNNY - .byte 2 + .byte MAP_TYPE_CITY .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc index dadd55e029..fbfeee27b4 100644 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ b/data/maps/FortreeCity_DecorationShop/header.inc @@ -8,7 +8,7 @@ FortreeCity_DecorationShop: @ 848361C .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc index 459db5bd5e..4e462da1a3 100644 --- a/data/maps/FortreeCity_Gym/header.inc +++ b/data/maps/FortreeCity_Gym/header.inc @@ -8,7 +8,7 @@ FortreeCity_Gym: @ 848353C .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc index 013caf4d25..44e9ef8a40 100644 --- a/data/maps/FortreeCity_House1/header.inc +++ b/data/maps/FortreeCity_House1/header.inc @@ -8,7 +8,7 @@ FortreeCity_House1: @ 8483520 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc index b631de0240..f8d160d203 100644 --- a/data/maps/FortreeCity_House2/header.inc +++ b/data/maps/FortreeCity_House2/header.inc @@ -8,7 +8,7 @@ FortreeCity_House2: @ 84835AC .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc index 477706e682..4b2f639d5d 100644 --- a/data/maps/FortreeCity_House3/header.inc +++ b/data/maps/FortreeCity_House3/header.inc @@ -8,7 +8,7 @@ FortreeCity_House3: @ 84835C8 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc index 15182d88f9..98f72f1ef6 100644 --- a/data/maps/FortreeCity_House4/header.inc +++ b/data/maps/FortreeCity_House4/header.inc @@ -8,7 +8,7 @@ FortreeCity_House4: @ 84835E4 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc index 29dbe8c13c..7b5f8ce275 100644 --- a/data/maps/FortreeCity_House5/header.inc +++ b/data/maps/FortreeCity_House5/header.inc @@ -8,7 +8,7 @@ FortreeCity_House5: @ 8483600 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc index 0a67a7b511..6cab5d4403 100644 --- a/data/maps/FortreeCity_Mart/header.inc +++ b/data/maps/FortreeCity_Mart/header.inc @@ -8,7 +8,7 @@ FortreeCity_Mart: @ 8483590 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc index 02819535e4..0f2db86585 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ FortreeCity_PokemonCenter_1F: @ 8483558 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc index ab03878eb6..e13260f57f 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ FortreeCity_PokemonCenter_2F: @ 8483574 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc index df957dc4d0..d99b48f59d 100644 --- a/data/maps/GraniteCave_1F/header.inc +++ b/data/maps/GraniteCave_1F/header.inc @@ -8,7 +8,7 @@ GraniteCave_1F: @ 8483F84 .byte MAPSEC_GRANITE_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc index 183cece4a5..9ed11de6fe 100644 --- a/data/maps/GraniteCave_B1F/header.inc +++ b/data/maps/GraniteCave_B1F/header.inc @@ -8,7 +8,7 @@ GraniteCave_B1F: @ 8483FA0 .byte MAPSEC_GRANITE_CAVE .byte 1 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc index 452fd1e2fe..da4c70c4b9 100644 --- a/data/maps/GraniteCave_B2F/header.inc +++ b/data/maps/GraniteCave_B2F/header.inc @@ -8,7 +8,7 @@ GraniteCave_B2F: @ 8483FBC .byte MAPSEC_GRANITE_CAVE .byte 1 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc index 159d492774..9f355ad816 100644 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ b/data/maps/GraniteCave_StevensRoom/header.inc @@ -8,7 +8,7 @@ GraniteCave_StevensRoom: @ 8483FD8 .byte MAPSEC_GRANITE_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc index 438f3bd0a0..3c878c0c8c 100644 --- a/data/maps/InsideOfTruck/header.inc +++ b/data/maps/InsideOfTruck/header.inc @@ -8,7 +8,7 @@ InsideOfTruck: @ 8484EF0 .byte MAPSEC_INSIDE_OF_TRUCK .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc index 6d097c21d3..39408decf8 100644 --- a/data/maps/IslandCave/header.inc +++ b/data/maps/IslandCave/header.inc @@ -8,7 +8,7 @@ IslandCave: @ 8484614 .byte MAPSEC_ISLAND_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc index 3262694071..99ca54b041 100644 --- a/data/maps/JaggedPass/header.inc +++ b/data/maps/JaggedPass/header.inc @@ -8,7 +8,7 @@ JaggedPass: @ 848402C .byte MAPSEC_JAGGED_PASS .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc index 9ddad27586..4c0def95d9 100644 --- a/data/maps/LavaridgeTown/header.inc +++ b/data/maps/LavaridgeTown/header.inc @@ -8,7 +8,7 @@ LavaridgeTown: @ 8482608 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_SUNNY - .byte 1 + .byte MAP_TYPE_TOWN .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc index 1257c09c0a..b2a4a50fd7 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_1F/header.inc @@ -8,7 +8,7 @@ LavaridgeTown_Gym_1F: @ 8482CD0 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_FOG_1 - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc index fc90b501ff..d04d827c92 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc @@ -8,7 +8,7 @@ LavaridgeTown_Gym_B1F: @ 8482CEC .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_FOG_1 - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc index db621e67d3..f7858be911 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ b/data/maps/LavaridgeTown_HerbShop/header.inc @@ -8,7 +8,7 @@ LavaridgeTown_HerbShop: @ 8482CB4 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc index b8f607e15a..1d8c562904 100644 --- a/data/maps/LavaridgeTown_House/header.inc +++ b/data/maps/LavaridgeTown_House/header.inc @@ -8,7 +8,7 @@ LavaridgeTown_House: @ 8482D08 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc index f06a48f723..f6a4df95d2 100644 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ b/data/maps/LavaridgeTown_Mart/header.inc @@ -8,7 +8,7 @@ LavaridgeTown_Mart: @ 8482D24 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc index 42a4636245..1504e0176e 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ LavaridgeTown_PokemonCenter_1F: @ 8482D40 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc index 7149858a84..f52965272e 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ LavaridgeTown_PokemonCenter_2F: @ 8482D5C .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc index f372e381c8..f4565d25ae 100644 --- a/data/maps/LilycoveCity/header.inc +++ b/data/maps/LilycoveCity/header.inc @@ -8,7 +8,7 @@ LilycoveCity: @ 8482544 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_SUNNY - .byte 2 + .byte MAP_TYPE_CITY .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc index 1cd935b55c..d31f692c25 100644 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ b/data/maps/LilycoveCity_ContestHall/header.inc @@ -8,7 +8,7 @@ LilycoveCity_ContestHall: @ 84836C4 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc index ee9660ebf5..aff7cb64e9 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ b/data/maps/LilycoveCity_ContestLobby/header.inc @@ -8,7 +8,7 @@ LilycoveCity_ContestLobby: @ 84836A8 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc index 166d868283..258501718b 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_CoveLilyMotel_1F: @ 8483638 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc index 9b8f051063..dd38adbb84 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_CoveLilyMotel_2F: @ 8483654 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc index 23e99c9819..a7375dbd75 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc @@ -8,7 +8,7 @@ LilycoveCity_DepartmentStoreElevator: @ 84838A0 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc index ffd3d40216..92a3c5ed9d 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc @@ -8,7 +8,7 @@ LilycoveCity_DepartmentStoreRooftop: @ 8483884 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc index 695b5560db..136b923e0d 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_DepartmentStore_1F: @ 84837F8 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc index 34beb40f78..fd868ce9de 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_DepartmentStore_2F: @ 8483814 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc index 5c49de2eb3..fd946aee75 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_DepartmentStore_3F: @ 8483830 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc index c298bc024b..7f343e860d 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_DepartmentStore_4F: @ 848384C .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc index 32c1786283..2019489b47 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_DepartmentStore_5F: @ 8483868 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc index a28edee35c..addb803f08 100644 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ b/data/maps/LilycoveCity_Harbor/header.inc @@ -8,7 +8,7 @@ LilycoveCity_Harbor: @ 8483750 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc index e29bdfbc56..c5dde27212 100644 --- a/data/maps/LilycoveCity_House1/header.inc +++ b/data/maps/LilycoveCity_House1/header.inc @@ -8,7 +8,7 @@ LilycoveCity_House1: @ 8483788 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc index 0ffeffd035..1a6c27a937 100644 --- a/data/maps/LilycoveCity_House2/header.inc +++ b/data/maps/LilycoveCity_House2/header.inc @@ -8,7 +8,7 @@ LilycoveCity_House2: @ 84837A4 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc index fc2868a9c5..73fd14e047 100644 --- a/data/maps/LilycoveCity_House3/header.inc +++ b/data/maps/LilycoveCity_House3/header.inc @@ -8,7 +8,7 @@ LilycoveCity_House3: @ 84837C0 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc index 66c3636cf7..d265ea010e 100644 --- a/data/maps/LilycoveCity_House4/header.inc +++ b/data/maps/LilycoveCity_House4/header.inc @@ -8,7 +8,7 @@ LilycoveCity_House4: @ 84837DC .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc index 292c61623e..1a92a6d690 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_LilycoveMuseum_1F: @ 8483670 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc index 9bdff8e90a..b47d700a91 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_LilycoveMuseum_2F: @ 848368C .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc index 1adc065dd8..9c167f3003 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -8,7 +8,7 @@ LilycoveCity_MoveDeletersHouse: @ 848376C .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc index 92bc0e9d9f..6e0b34fac4 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_PokemonCenter_1F: @ 84836E0 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc index 1ae72be257..070ae9aef9 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_PokemonCenter_2F: @ 84836FC .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc index 2137aecc90..bdbb5aefa0 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc @@ -8,7 +8,7 @@ LilycoveCity_PokemonTrainerFanClub: @ 8483734 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc index ecff7b16f2..772e57cba8 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ b/data/maps/LilycoveCity_UnusedMart/header.inc @@ -8,7 +8,7 @@ LilycoveCity_UnusedMart: @ 8483718 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc index 8b35b2629b..b416ddd626 100644 --- a/data/maps/LinkContestRoom1/header.inc +++ b/data/maps/LinkContestRoom1/header.inc @@ -8,7 +8,7 @@ LinkContestRoom1: @ 8484DA0 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index b8e3e18226..73c459674c 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -8,7 +8,7 @@ LinkContestRoom2: @ 8484E64 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index 5b1e2d8f3e..bf12c6d306 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -8,7 +8,7 @@ LinkContestRoom3: @ 8484E80 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index 6a4190ca74..675a023988 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -8,7 +8,7 @@ LinkContestRoom4: @ 8484E9C .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index bf95bb2ef1..da5e9ff585 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -8,7 +8,7 @@ LinkContestRoom5: @ 8484EB8 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index 231f31001c..153d55b34b 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -8,7 +8,7 @@ LinkContestRoom6: @ 8484ED4 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc index 5fb0a6eab3..df9a5b47ab 100644 --- a/data/maps/LittlerootTown/header.inc +++ b/data/maps/LittlerootTown/header.inc @@ -8,7 +8,7 @@ LittlerootTown: @ 84825B4 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_SUNNY - .byte 1 + .byte MAP_TYPE_TOWN .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc index 69eff71f70..364acb64ab 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc @@ -8,7 +8,7 @@ LittlerootTown_BrendansHouse_1F: @ 8482AF4 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc index 7b5fa73758..d4d1703f2b 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc @@ -8,7 +8,7 @@ LittlerootTown_BrendansHouse_2F: @ 8482B10 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc index 56b925c2a3..23c59b0820 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc @@ -8,7 +8,7 @@ LittlerootTown_MaysHouse_1F: @ 8482B2C .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc index 496d3cf831..dfba805beb 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc @@ -8,7 +8,7 @@ LittlerootTown_MaysHouse_2F: @ 8482B48 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc index 7ba2b7e0e2..3969b46fd4 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc @@ -8,7 +8,7 @@ LittlerootTown_ProfessorBirchsLab: @ 8482B64 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc index 65e781626a..c9bdce2a18 100644 --- a/data/maps/MagmaHideout_1F/header.inc +++ b/data/maps/MagmaHideout_1F/header.inc @@ -8,7 +8,7 @@ MagmaHideout_1F: @ 8484828 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MagmaHideout_2F_1R/header.inc b/data/maps/MagmaHideout_2F_1R/header.inc index 50bf554d75..8fdac83d22 100644 --- a/data/maps/MagmaHideout_2F_1R/header.inc +++ b/data/maps/MagmaHideout_2F_1R/header.inc @@ -8,7 +8,7 @@ MagmaHideout_2F_1R: @ 8484844 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MagmaHideout_2F_2R/header.inc b/data/maps/MagmaHideout_2F_2R/header.inc index 376c2f232e..9512d17346 100644 --- a/data/maps/MagmaHideout_2F_2R/header.inc +++ b/data/maps/MagmaHideout_2F_2R/header.inc @@ -8,7 +8,7 @@ MagmaHideout_2F_2R: @ 8484860 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MagmaHideout_2F_3R/header.inc b/data/maps/MagmaHideout_2F_3R/header.inc index bc8816d1c8..39a0710f58 100644 --- a/data/maps/MagmaHideout_2F_3R/header.inc +++ b/data/maps/MagmaHideout_2F_3R/header.inc @@ -8,7 +8,7 @@ MagmaHideout_2F_3R: @ 84848EC .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MagmaHideout_3F_1R/header.inc b/data/maps/MagmaHideout_3F_1R/header.inc index 412756e49c..436103ffe8 100644 --- a/data/maps/MagmaHideout_3F_1R/header.inc +++ b/data/maps/MagmaHideout_3F_1R/header.inc @@ -8,7 +8,7 @@ MagmaHideout_3F_1R: @ 848487C .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MagmaHideout_3F_2R/header.inc b/data/maps/MagmaHideout_3F_2R/header.inc index d0ae8c4e11..b0bcd92c2c 100644 --- a/data/maps/MagmaHideout_3F_2R/header.inc +++ b/data/maps/MagmaHideout_3F_2R/header.inc @@ -8,7 +8,7 @@ MagmaHideout_3F_2R: @ 8484898 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MagmaHideout_3F_3R/header.inc b/data/maps/MagmaHideout_3F_3R/header.inc index f27df336ce..a4fe7b936e 100644 --- a/data/maps/MagmaHideout_3F_3R/header.inc +++ b/data/maps/MagmaHideout_3F_3R/header.inc @@ -8,7 +8,7 @@ MagmaHideout_3F_3R: @ 84848D0 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MagmaHideout_4F/header.inc b/data/maps/MagmaHideout_4F/header.inc index 7788998309..50a1a2b993 100644 --- a/data/maps/MagmaHideout_4F/header.inc +++ b/data/maps/MagmaHideout_4F/header.inc @@ -8,7 +8,7 @@ MagmaHideout_4F: @ 84848B4 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MarineCave_End/header.inc b/data/maps/MarineCave_End/header.inc index da43bbc462..044d54304b 100644 --- a/data/maps/MarineCave_End/header.inc +++ b/data/maps/MarineCave_End/header.inc @@ -8,7 +8,7 @@ MarineCave_End: @ 8484A04 .byte MAPSEC_MARINE_CAVE .byte 0 .byte WEATHER_FOG_1 - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 14 .byte 0 diff --git a/data/maps/MarineCave_Entrance/header.inc b/data/maps/MarineCave_Entrance/header.inc index 6432ee987b..a95f2c7dd0 100644 --- a/data/maps/MarineCave_Entrance/header.inc +++ b/data/maps/MarineCave_Entrance/header.inc @@ -8,7 +8,7 @@ MarineCave_Entrance: @ 84849E8 .byte MAPSEC_MARINE_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 14 .byte 0 diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc index a6a3db192e..c2101da803 100644 --- a/data/maps/MauvilleCity/header.inc +++ b/data/maps/MauvilleCity/header.inc @@ -8,7 +8,7 @@ MauvilleCity: @ 84824F0 .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_SUNNY - .byte 2 + .byte MAP_TYPE_CITY .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc index 942859e0cc..cc9a7102ca 100644 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ b/data/maps/MauvilleCity_BikeShop/header.inc @@ -8,7 +8,7 @@ MauvilleCity_BikeShop: @ 8483280 .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc index 20e6b5a090..c1626ba7fb 100644 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ b/data/maps/MauvilleCity_GameCorner/header.inc @@ -8,7 +8,7 @@ MauvilleCity_GameCorner: @ 84832B8 .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc index e10fa76c80..9a9de6ebf7 100644 --- a/data/maps/MauvilleCity_Gym/header.inc +++ b/data/maps/MauvilleCity_Gym/header.inc @@ -8,7 +8,7 @@ MauvilleCity_Gym: @ 8483264 .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc index b5f6b91758..43691b5899 100644 --- a/data/maps/MauvilleCity_House1/header.inc +++ b/data/maps/MauvilleCity_House1/header.inc @@ -8,7 +8,7 @@ MauvilleCity_House1: @ 848329C .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc index fe7b14fcc2..8c46284627 100644 --- a/data/maps/MauvilleCity_House2/header.inc +++ b/data/maps/MauvilleCity_House2/header.inc @@ -8,7 +8,7 @@ MauvilleCity_House2: @ 84832D4 .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc index 082ff60457..bb00f8dd03 100644 --- a/data/maps/MauvilleCity_Mart/header.inc +++ b/data/maps/MauvilleCity_Mart/header.inc @@ -8,7 +8,7 @@ MauvilleCity_Mart: @ 8483328 .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc index ddc901f444..665e25cddc 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ MauvilleCity_PokemonCenter_1F: @ 84832F0 .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc index e4981b2771..6ebef36e51 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ MauvilleCity_PokemonCenter_2F: @ 848330C .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc index 2b012f5b83..d21e637778 100644 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ b/data/maps/MeteorFalls_1F_1R/header.inc @@ -8,7 +8,7 @@ MeteorFalls_1F_1R: @ 8483EC0 .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc index e2b3524064..c7d0286281 100644 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ b/data/maps/MeteorFalls_1F_2R/header.inc @@ -8,7 +8,7 @@ MeteorFalls_1F_2R: @ 8483EDC .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc index a90a21049c..e6079dade9 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ b/data/maps/MeteorFalls_B1F_1R/header.inc @@ -8,7 +8,7 @@ MeteorFalls_B1F_1R: @ 8483EF8 .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc index df6a9ee01f..100c19b4e0 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ b/data/maps/MeteorFalls_B1F_2R/header.inc @@ -8,7 +8,7 @@ MeteorFalls_B1F_2R: @ 8483F14 .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MeteorFalls_StevensCave/header.inc b/data/maps/MeteorFalls_StevensCave/header.inc index cf9796360d..e01833b400 100644 --- a/data/maps/MeteorFalls_StevensCave/header.inc +++ b/data/maps/MeteorFalls_StevensCave/header.inc @@ -8,7 +8,7 @@ MeteorFalls_StevensCave: @ 8484A74 .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MirageTower_1F/header.inc b/data/maps/MirageTower_1F/header.inc index 90bc41a909..46b167eade 100644 --- a/data/maps/MirageTower_1F/header.inc +++ b/data/maps/MirageTower_1F/header.inc @@ -8,7 +8,7 @@ MirageTower_1F: @ 8484908 .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MirageTower_2F/header.inc b/data/maps/MirageTower_2F/header.inc index 4a984edeac..375fef35d7 100644 --- a/data/maps/MirageTower_2F/header.inc +++ b/data/maps/MirageTower_2F/header.inc @@ -8,7 +8,7 @@ MirageTower_2F: @ 8484924 .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MirageTower_3F/header.inc b/data/maps/MirageTower_3F/header.inc index c3c126d56e..8f3f40f4b3 100644 --- a/data/maps/MirageTower_3F/header.inc +++ b/data/maps/MirageTower_3F/header.inc @@ -8,7 +8,7 @@ MirageTower_3F: @ 8484940 .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MirageTower_4F/header.inc b/data/maps/MirageTower_4F/header.inc index c0b51c1748..ad4079d0c2 100644 --- a/data/maps/MirageTower_4F/header.inc +++ b/data/maps/MirageTower_4F/header.inc @@ -8,7 +8,7 @@ MirageTower_4F: @ 848495C .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc index eba3043638..5756307eb3 100644 --- a/data/maps/MossdeepCity/header.inc +++ b/data/maps/MossdeepCity/header.inc @@ -8,7 +8,7 @@ MossdeepCity: @ 8482560 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_SUNNY - .byte 2 + .byte MAP_TYPE_CITY .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc index b04ffb8728..c7e781b7a1 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc @@ -8,7 +8,7 @@ MossdeepCity_GameCorner_1F: @ 84839F0 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc index d0b115b372..c431f8b06e 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc @@ -8,7 +8,7 @@ MossdeepCity_GameCorner_B1F: @ 8483A0C .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc index df190975c2..af4198c833 100644 --- a/data/maps/MossdeepCity_Gym/header.inc +++ b/data/maps/MossdeepCity_Gym/header.inc @@ -8,7 +8,7 @@ MossdeepCity_Gym: @ 84838BC .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc index 0843eb3f4d..31cb2aa2a3 100644 --- a/data/maps/MossdeepCity_House1/header.inc +++ b/data/maps/MossdeepCity_House1/header.inc @@ -8,7 +8,7 @@ MossdeepCity_House1: @ 84838D8 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc index b844bd961b..d89be9872a 100644 --- a/data/maps/MossdeepCity_House2/header.inc +++ b/data/maps/MossdeepCity_House2/header.inc @@ -8,7 +8,7 @@ MossdeepCity_House2: @ 84838F4 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc index 6e47ed443a..02b2489fd5 100644 --- a/data/maps/MossdeepCity_House3/header.inc +++ b/data/maps/MossdeepCity_House3/header.inc @@ -8,7 +8,7 @@ MossdeepCity_House3: @ 8483964 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc index dbd201c2ef..c86b1f8af2 100644 --- a/data/maps/MossdeepCity_House4/header.inc +++ b/data/maps/MossdeepCity_House4/header.inc @@ -8,7 +8,7 @@ MossdeepCity_House4: @ 848399C .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc index 72dc8a4097..4086c0142b 100644 --- a/data/maps/MossdeepCity_Mart/header.inc +++ b/data/maps/MossdeepCity_Mart/header.inc @@ -8,7 +8,7 @@ MossdeepCity_Mart: @ 8483948 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc index e39eb81830..aef0702281 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ MossdeepCity_PokemonCenter_1F: @ 8483910 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc index 022761465c..32c2bbc285 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ MossdeepCity_PokemonCenter_2F: @ 848392C .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc index c38fc57eb8..c5eb7515ed 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc @@ -8,7 +8,7 @@ MossdeepCity_SpaceCenter_1F: @ 84839B8 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc index 53fb8a06a0..ec580ec8e3 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc @@ -8,7 +8,7 @@ MossdeepCity_SpaceCenter_2F: @ 84839D4 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc index 43b5f92cfd..446d6f5409 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ b/data/maps/MossdeepCity_StevensHouse/header.inc @@ -8,7 +8,7 @@ MossdeepCity_StevensHouse: @ 8483980 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc index 29c068992e..17173424b2 100644 --- a/data/maps/MtChimney/header.inc +++ b/data/maps/MtChimney/header.inc @@ -8,7 +8,7 @@ MtChimney: @ 8484010 .byte MAPSEC_MT_CHIMNEY .byte 0 .byte WEATHER_ASH - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc index 3de6d823ea..864d0a0c85 100644 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ b/data/maps/MtChimney_CableCarStation/header.inc @@ -8,7 +8,7 @@ MtChimney_CableCarStation: @ 8483DFC .byte MAPSEC_MT_CHIMNEY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index 88306a7dee..bb38876c87 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -8,7 +8,7 @@ MtPyre_1F: @ 8484064 .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 .byte 0 diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc index 0afddfb49c..2ed8817a6b 100644 --- a/data/maps/MtPyre_2F/header.inc +++ b/data/maps/MtPyre_2F/header.inc @@ -8,7 +8,7 @@ MtPyre_2F: @ 8484080 .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 .byte 0 diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc index 8ccabb8c88..115479a97f 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -8,7 +8,7 @@ MtPyre_3F: @ 848409C .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 .byte 0 diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc index 22a41d25ce..ed554cb5fd 100644 --- a/data/maps/MtPyre_4F/header.inc +++ b/data/maps/MtPyre_4F/header.inc @@ -8,7 +8,7 @@ MtPyre_4F: @ 84840B8 .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 .byte 0 diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc index 47f92d2c87..1f1829279b 100644 --- a/data/maps/MtPyre_5F/header.inc +++ b/data/maps/MtPyre_5F/header.inc @@ -8,7 +8,7 @@ MtPyre_5F: @ 84840D4 .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 .byte 0 diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc index ceaceca411..b665007db5 100644 --- a/data/maps/MtPyre_6F/header.inc +++ b/data/maps/MtPyre_6F/header.inc @@ -8,7 +8,7 @@ MtPyre_6F: @ 84840F0 .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 .byte 0 diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc index c5e7576cfe..b453b7691f 100644 --- a/data/maps/MtPyre_Exterior/header.inc +++ b/data/maps/MtPyre_Exterior/header.inc @@ -8,7 +8,7 @@ MtPyre_Exterior: @ 848410C .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc index 29597bceb2..67185120a4 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -8,7 +8,7 @@ MtPyre_Summit: @ 8484128 .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_FOG_1 - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc index 2f8d472d29..4f92661da9 100644 --- a/data/maps/NavelRock_B1F/header.inc +++ b/data/maps/NavelRock_B1F/header.inc @@ -8,7 +8,7 @@ NavelRock_B1F: @ 84858C8 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Bottom/header.inc b/data/maps/NavelRock_Bottom/header.inc index ee2eeb102e..ddf383ee20 100644 --- a/data/maps/NavelRock_Bottom/header.inc +++ b/data/maps/NavelRock_Bottom/header.inc @@ -8,7 +8,7 @@ NavelRock_Bottom: @ 8485AC0 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Down01/header.inc b/data/maps/NavelRock_Down01/header.inc index 8b11f8d937..2585dc9583 100644 --- a/data/maps/NavelRock_Down01/header.inc +++ b/data/maps/NavelRock_Down01/header.inc @@ -8,7 +8,7 @@ NavelRock_Down01: @ 848598C .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Down02/header.inc b/data/maps/NavelRock_Down02/header.inc index 0b56cba11e..5f6e48b821 100644 --- a/data/maps/NavelRock_Down02/header.inc +++ b/data/maps/NavelRock_Down02/header.inc @@ -8,7 +8,7 @@ NavelRock_Down02: @ 84859A8 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Down03/header.inc b/data/maps/NavelRock_Down03/header.inc index a674e38491..2e256ec778 100644 --- a/data/maps/NavelRock_Down03/header.inc +++ b/data/maps/NavelRock_Down03/header.inc @@ -8,7 +8,7 @@ NavelRock_Down03: @ 84859C4 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Down04/header.inc b/data/maps/NavelRock_Down04/header.inc index 34359e5b89..c5c1ee394c 100644 --- a/data/maps/NavelRock_Down04/header.inc +++ b/data/maps/NavelRock_Down04/header.inc @@ -8,7 +8,7 @@ NavelRock_Down04: @ 84859E0 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Down05/header.inc b/data/maps/NavelRock_Down05/header.inc index 2be325badf..40f8cf0c94 100644 --- a/data/maps/NavelRock_Down05/header.inc +++ b/data/maps/NavelRock_Down05/header.inc @@ -8,7 +8,7 @@ NavelRock_Down05: @ 84859FC .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Down06/header.inc b/data/maps/NavelRock_Down06/header.inc index c38950b205..7c9f16d60c 100644 --- a/data/maps/NavelRock_Down06/header.inc +++ b/data/maps/NavelRock_Down06/header.inc @@ -8,7 +8,7 @@ NavelRock_Down06: @ 8485A18 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Down07/header.inc b/data/maps/NavelRock_Down07/header.inc index 65af6ccd8e..ef679ae6b3 100644 --- a/data/maps/NavelRock_Down07/header.inc +++ b/data/maps/NavelRock_Down07/header.inc @@ -8,7 +8,7 @@ NavelRock_Down07: @ 8485A34 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Down08/header.inc b/data/maps/NavelRock_Down08/header.inc index fd08b39ea9..27ca1b3177 100644 --- a/data/maps/NavelRock_Down08/header.inc +++ b/data/maps/NavelRock_Down08/header.inc @@ -8,7 +8,7 @@ NavelRock_Down08: @ 8485A50 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Down09/header.inc b/data/maps/NavelRock_Down09/header.inc index 9b22ca051c..2dd586587c 100644 --- a/data/maps/NavelRock_Down09/header.inc +++ b/data/maps/NavelRock_Down09/header.inc @@ -8,7 +8,7 @@ NavelRock_Down09: @ 8485A6C .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Down10/header.inc b/data/maps/NavelRock_Down10/header.inc index 4301b5f93f..b8a2123d5b 100644 --- a/data/maps/NavelRock_Down10/header.inc +++ b/data/maps/NavelRock_Down10/header.inc @@ -8,7 +8,7 @@ NavelRock_Down10: @ 8485A88 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Down11/header.inc b/data/maps/NavelRock_Down11/header.inc index a45e057954..9073b1b64e 100644 --- a/data/maps/NavelRock_Down11/header.inc +++ b/data/maps/NavelRock_Down11/header.inc @@ -8,7 +8,7 @@ NavelRock_Down11: @ 8485AA4 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Entrance/header.inc b/data/maps/NavelRock_Entrance/header.inc index 5509d0cde6..d795e2bb94 100644 --- a/data/maps/NavelRock_Entrance/header.inc +++ b/data/maps/NavelRock_Entrance/header.inc @@ -8,7 +8,7 @@ NavelRock_Entrance: @ 84858AC .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc index ed9234f349..ec7ea49686 100644 --- a/data/maps/NavelRock_Exterior/header.inc +++ b/data/maps/NavelRock_Exterior/header.inc @@ -8,7 +8,7 @@ NavelRock_Exterior: @ 8485874 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc index 73aab8ad6e..8a145ad642 100644 --- a/data/maps/NavelRock_Fork/header.inc +++ b/data/maps/NavelRock_Fork/header.inc @@ -8,7 +8,7 @@ NavelRock_Fork: @ 84858E4 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc index 9e60e032fb..f798d56dfd 100644 --- a/data/maps/NavelRock_Harbor/header.inc +++ b/data/maps/NavelRock_Harbor/header.inc @@ -8,7 +8,7 @@ NavelRock_Harbor: @ 8485890 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/NavelRock_Top/header.inc b/data/maps/NavelRock_Top/header.inc index 3a1c8254da..43b9d951db 100644 --- a/data/maps/NavelRock_Top/header.inc +++ b/data/maps/NavelRock_Top/header.inc @@ -8,7 +8,7 @@ NavelRock_Top: @ 8485970 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Up1/header.inc b/data/maps/NavelRock_Up1/header.inc index 41a342eb38..c409781be1 100644 --- a/data/maps/NavelRock_Up1/header.inc +++ b/data/maps/NavelRock_Up1/header.inc @@ -8,7 +8,7 @@ NavelRock_Up1: @ 8485900 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Up2/header.inc b/data/maps/NavelRock_Up2/header.inc index db13a9adf5..a2f627a1cd 100644 --- a/data/maps/NavelRock_Up2/header.inc +++ b/data/maps/NavelRock_Up2/header.inc @@ -8,7 +8,7 @@ NavelRock_Up2: @ 848591C .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Up3/header.inc b/data/maps/NavelRock_Up3/header.inc index e6e1406960..bce8a899f0 100644 --- a/data/maps/NavelRock_Up3/header.inc +++ b/data/maps/NavelRock_Up3/header.inc @@ -8,7 +8,7 @@ NavelRock_Up3: @ 8485938 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Up4/header.inc b/data/maps/NavelRock_Up4/header.inc index be297090a8..02a05c79ef 100644 --- a/data/maps/NavelRock_Up4/header.inc +++ b/data/maps/NavelRock_Up4/header.inc @@ -8,7 +8,7 @@ NavelRock_Up4: @ 8485954 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc index 08df718853..706a215639 100644 --- a/data/maps/NewMauville_Entrance/header.inc +++ b/data/maps/NewMauville_Entrance/header.inc @@ -8,7 +8,7 @@ NewMauville_Entrance: @ 8484470 .byte MAPSEC_NEW_MAUVILLE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc index 87628d4cf4..a3740f48ac 100644 --- a/data/maps/NewMauville_Inside/header.inc +++ b/data/maps/NewMauville_Inside/header.inc @@ -8,7 +8,7 @@ NewMauville_Inside: @ 848448C .byte MAPSEC_NEW_MAUVILLE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc index de85668233..074c453200 100644 --- a/data/maps/OldaleTown/header.inc +++ b/data/maps/OldaleTown/header.inc @@ -8,7 +8,7 @@ OldaleTown: @ 84825D0 .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_SUNNY - .byte 1 + .byte MAP_TYPE_TOWN .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc index 0accc508b9..f188a6559e 100644 --- a/data/maps/OldaleTown_House1/header.inc +++ b/data/maps/OldaleTown_House1/header.inc @@ -8,7 +8,7 @@ OldaleTown_House1: @ 8482B80 .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc index 2d6cffcfad..6e942e50c1 100644 --- a/data/maps/OldaleTown_House2/header.inc +++ b/data/maps/OldaleTown_House2/header.inc @@ -8,7 +8,7 @@ OldaleTown_House2: @ 8482B9C .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc index d2bc44d392..bbc85e7cba 100644 --- a/data/maps/OldaleTown_Mart/header.inc +++ b/data/maps/OldaleTown_Mart/header.inc @@ -8,7 +8,7 @@ OldaleTown_Mart: @ 8482BF0 .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc index 2a09884758..3f01beee4b 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ OldaleTown_PokemonCenter_1F: @ 8482BB8 .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc index b1399a1b0a..99356ce575 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ OldaleTown_PokemonCenter_2F: @ 8482BD4 .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc index f903637a36..34c15d53f1 100644 --- a/data/maps/PacifidlogTown/header.inc +++ b/data/maps/PacifidlogTown/header.inc @@ -8,7 +8,7 @@ PacifidlogTown: @ 848265C .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_SUNNY - .byte 1 + .byte MAP_TYPE_TOWN .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc index 90098ec2c1..33449542fd 100644 --- a/data/maps/PacifidlogTown_House1/header.inc +++ b/data/maps/PacifidlogTown_House1/header.inc @@ -8,7 +8,7 @@ PacifidlogTown_House1: @ 8482F8C .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc index a1433fbbce..c095f6827d 100644 --- a/data/maps/PacifidlogTown_House2/header.inc +++ b/data/maps/PacifidlogTown_House2/header.inc @@ -8,7 +8,7 @@ PacifidlogTown_House2: @ 8482FA8 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc index 28d0fd8a5e..5aa4981410 100644 --- a/data/maps/PacifidlogTown_House3/header.inc +++ b/data/maps/PacifidlogTown_House3/header.inc @@ -8,7 +8,7 @@ PacifidlogTown_House3: @ 8482FC4 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc index adbd42c6a3..9530591f6a 100644 --- a/data/maps/PacifidlogTown_House4/header.inc +++ b/data/maps/PacifidlogTown_House4/header.inc @@ -8,7 +8,7 @@ PacifidlogTown_House4: @ 8482FE0 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc index b30fb80d37..915d053cb2 100644 --- a/data/maps/PacifidlogTown_House5/header.inc +++ b/data/maps/PacifidlogTown_House5/header.inc @@ -8,7 +8,7 @@ PacifidlogTown_House5: @ 8482FFC .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc index 6d95c3b6e8..15b0044c38 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ PacifidlogTown_PokemonCenter_1F: @ 8482F54 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc index 9cc1d04703..72331ab8df 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ PacifidlogTown_PokemonCenter_2F: @ 8482F70 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index bd94ab120a..2b8520a7bd 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -8,7 +8,7 @@ PetalburgCity: @ 84824B8 .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_SUNNY - .byte 2 + .byte MAP_TYPE_CITY .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc index 661552e20b..b6604647f0 100644 --- a/data/maps/PetalburgCity_Gym/header.inc +++ b/data/maps/PetalburgCity_Gym/header.inc @@ -8,7 +8,7 @@ PetalburgCity_Gym: @ 8483034 .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc index 00e26fe1ae..c804521829 100644 --- a/data/maps/PetalburgCity_House1/header.inc +++ b/data/maps/PetalburgCity_House1/header.inc @@ -8,7 +8,7 @@ PetalburgCity_House1: @ 8483050 .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc index 1a643f7e24..61b9b16ca6 100644 --- a/data/maps/PetalburgCity_House2/header.inc +++ b/data/maps/PetalburgCity_House2/header.inc @@ -8,7 +8,7 @@ PetalburgCity_House2: @ 848306C .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc index 85d8331a1e..92cabd5a33 100644 --- a/data/maps/PetalburgCity_Mart/header.inc +++ b/data/maps/PetalburgCity_Mart/header.inc @@ -8,7 +8,7 @@ PetalburgCity_Mart: @ 84830C0 .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc index 3369580886..1a3e764bbb 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ PetalburgCity_PokemonCenter_1F: @ 8483088 .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc index 7b1e01861f..73dbb7aa4a 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ PetalburgCity_PokemonCenter_2F: @ 84830A4 .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc index 68c746b58e..033e194888 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -8,7 +8,7 @@ PetalburgCity_WallysHouse: @ 8483018 .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc index bda2a3ab52..387032076a 100644 --- a/data/maps/PetalburgWoods/header.inc +++ b/data/maps/PetalburgWoods/header.inc @@ -8,7 +8,7 @@ PetalburgWoods: @ 8483FF4 .byte MAPSEC_PETALBURG_WOODS .byte 0 .byte WEATHER_SHADE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc index 4d4583acfe..98573d9a42 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -8,7 +8,7 @@ RecordCorner: @ 8484D68 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc index 0c76acfbc9..feb3aa4405 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -8,7 +8,7 @@ Route101: @ 8482678 .byte MAPSEC_ROUTE_101 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index 33e22d3bd3..6102e69a07 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -8,7 +8,7 @@ Route102: @ 8482694 .byte MAPSEC_ROUTE_102 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc index 22f0976d32..6c99d4df2d 100644 --- a/data/maps/Route103/header.inc +++ b/data/maps/Route103/header.inc @@ -8,7 +8,7 @@ Route103: @ 84826B0 .byte MAPSEC_ROUTE_103 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc index 02019604da..1c09ae166d 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -8,7 +8,7 @@ Route104: @ 84826CC .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc index e67afc46cc..5dab30f42b 100644 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ b/data/maps/Route104_MrBrineysHouse/header.inc @@ -8,7 +8,7 @@ Route104_MrBrineysHouse: @ 8483D70 .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc index caf3f3f864..f1f273c739 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc @@ -8,7 +8,7 @@ Route104_PrettyPetalFlowerShop: @ 8483D8C .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc index ca694df004..99284e5662 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -8,7 +8,7 @@ Route104_Prototype: @ 8485AF8 .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 8 .byte 0 diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc index 87a7945244..4bb9351d80 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc @@ -8,7 +8,7 @@ Route104_PrototypePrettyPetalFlowerShop: @ 8485B14 .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 .byte 0 diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc index a55cb3edea..040e26110a 100644 --- a/data/maps/Route105/header.inc +++ b/data/maps/Route105/header.inc @@ -8,7 +8,7 @@ Route105: @ 84826E8 .byte MAPSEC_ROUTE_105 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index df51d42223..69ab66b037 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -8,7 +8,7 @@ Route106: @ 8482704 .byte MAPSEC_ROUTE_106 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc index 09a47a2aea..399096d16f 100644 --- a/data/maps/Route107/header.inc +++ b/data/maps/Route107/header.inc @@ -8,7 +8,7 @@ Route107: @ 8482720 .byte MAPSEC_ROUTE_107 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index 3b55160d8d..a59ddf7619 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -8,7 +8,7 @@ Route108: @ 848273C .byte MAPSEC_ROUTE_108 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc index 30f3501a59..2262cadfa4 100644 --- a/data/maps/Route109/header.inc +++ b/data/maps/Route109/header.inc @@ -8,7 +8,7 @@ Route109: @ 8482758 .byte MAPSEC_ROUTE_109 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc index c9cbe2d23f..93deeb8a99 100644 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ b/data/maps/Route109_SeashoreHouse/header.inc @@ -8,7 +8,7 @@ Route109_SeashoreHouse: @ 8485B30 .byte MAPSEC_ROUTE_109 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc index 92157a59d7..dd66f9f3da 100644 --- a/data/maps/Route110/header.inc +++ b/data/maps/Route110/header.inc @@ -8,7 +8,7 @@ Route110: @ 8482774 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc index 3105a321db..0a5259894c 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc @@ -8,7 +8,7 @@ Route110_SeasideCyclingRoadNorthEntrance: @ 8485C80 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc index 45260d6c41..a366132136 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc @@ -8,7 +8,7 @@ Route110_SeasideCyclingRoadSouthEntrance: @ 8485C9C .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc index 815a6a9e10..af28f5ed01 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ b/data/maps/Route110_TrickHouseCorridor/header.inc @@ -8,7 +8,7 @@ Route110_TrickHouseCorridor: @ 8485B84 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc index 86e923bb4d..9b0436a68b 100644 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ b/data/maps/Route110_TrickHouseEnd/header.inc @@ -8,7 +8,7 @@ Route110_TrickHouseEnd: @ 8485B68 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc index 7eb37293a0..f86f11b929 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ b/data/maps/Route110_TrickHouseEntrance/header.inc @@ -8,7 +8,7 @@ Route110_TrickHouseEntrance: @ 8485B4C .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc index 1b8a7249b2..cdb272aa7f 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ b/data/maps/Route110_TrickHousePuzzle1/header.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle1: @ 8485BA0 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc index 1832db9ee2..946da22a8a 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ b/data/maps/Route110_TrickHousePuzzle2/header.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle2: @ 8485BBC .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc index b4f7a2ac86..0686eef43e 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ b/data/maps/Route110_TrickHousePuzzle3/header.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle3: @ 8485BD8 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc index 5c33fa74a5..05bde230f8 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ b/data/maps/Route110_TrickHousePuzzle4/header.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle4: @ 8485BF4 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc index 049a1b49bd..de723c3024 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ b/data/maps/Route110_TrickHousePuzzle5/header.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle5: @ 8485C10 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc index e312c1439d..e5a2864de6 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ b/data/maps/Route110_TrickHousePuzzle6/header.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle6: @ 8485C2C .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc index d962c50eab..5b884a138e 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ b/data/maps/Route110_TrickHousePuzzle7/header.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle7: @ 8485C48 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc index ce6caf06e7..def3cab3db 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ b/data/maps/Route110_TrickHousePuzzle8/header.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle8: @ 8485C64 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc index df43dd19c4..3ae44b79a9 100644 --- a/data/maps/Route111/header.inc +++ b/data/maps/Route111/header.inc @@ -8,7 +8,7 @@ Route111: @ 8482790 .byte MAPSEC_ROUTE_111 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc index 05d4e14f1b..b58e0f3df3 100644 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ b/data/maps/Route111_OldLadysRestStop/header.inc @@ -8,7 +8,7 @@ Route111_OldLadysRestStop: @ 8483DC4 .byte MAPSEC_ROUTE_111 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc index 79e7c76de0..43ce6de6df 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -8,7 +8,7 @@ Route111_WinstrateFamilysHouse: @ 8483DA8 .byte MAPSEC_ROUTE_111 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc index 01bf8a4377..040d0d0848 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -8,7 +8,7 @@ Route112: @ 84827AC .byte MAPSEC_ROUTE_112 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc index 8a650439d6..05b88a15b2 100644 --- a/data/maps/Route112_CableCarStation/header.inc +++ b/data/maps/Route112_CableCarStation/header.inc @@ -8,7 +8,7 @@ Route112_CableCarStation: @ 8483DE0 .byte MAPSEC_ROUTE_112 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc index bbcb77d41c..7cd3914788 100644 --- a/data/maps/Route113/header.inc +++ b/data/maps/Route113/header.inc @@ -8,7 +8,7 @@ Route113: @ 84827C8 .byte MAPSEC_ROUTE_113 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc index 77ecfd0025..3cbad800bc 100644 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ b/data/maps/Route113_GlassWorkshop/header.inc @@ -8,7 +8,7 @@ Route113_GlassWorkshop: @ 8485CB8 .byte MAPSEC_ROUTE_113 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc index ab90821ee8..99cda55b5c 100644 --- a/data/maps/Route114/header.inc +++ b/data/maps/Route114/header.inc @@ -8,7 +8,7 @@ Route114: @ 84827E4 .byte MAPSEC_ROUTE_114 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc index 459238ffd9..43749207d9 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ b/data/maps/Route114_FossilManiacsHouse/header.inc @@ -8,7 +8,7 @@ Route114_FossilManiacsHouse: @ 8483E18 .byte MAPSEC_ROUTE_114 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc index 47fabca3bf..4892f1077a 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ b/data/maps/Route114_FossilManiacsTunnel/header.inc @@ -8,7 +8,7 @@ Route114_FossilManiacsTunnel: @ 8483E34 .byte MAPSEC_ROUTE_114 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc index 437aaef75b..2b6ef1e787 100644 --- a/data/maps/Route114_LanettesHouse/header.inc +++ b/data/maps/Route114_LanettesHouse/header.inc @@ -8,7 +8,7 @@ Route114_LanettesHouse: @ 8483E50 .byte MAPSEC_ROUTE_114 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc index aa91043b65..4490ad646e 100644 --- a/data/maps/Route115/header.inc +++ b/data/maps/Route115/header.inc @@ -8,7 +8,7 @@ Route115: @ 8482800 .byte MAPSEC_ROUTE_115 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc index ec37ba4649..675ba4568c 100644 --- a/data/maps/Route116/header.inc +++ b/data/maps/Route116/header.inc @@ -8,7 +8,7 @@ Route116: @ 848281C .byte MAPSEC_ROUTE_116 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc index 566e0bf100..d18ac8e845 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ b/data/maps/Route116_TunnelersRestHouse/header.inc @@ -8,7 +8,7 @@ Route116_TunnelersRestHouse: @ 8483E6C .byte MAPSEC_ROUTE_116 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index 3ed11a3eed..70104035a2 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 diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc index 53e20cb542..72ba07c3ad 100644 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ b/data/maps/Route117_PokemonDayCare/header.inc @@ -8,7 +8,7 @@ Route117_PokemonDayCare: @ 8483E88 .byte MAPSEC_ROUTE_117 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc index 47fa716382..ca2da85244 100644 --- a/data/maps/Route118/header.inc +++ b/data/maps/Route118/header.inc @@ -8,7 +8,7 @@ Route118: @ 8482854 .byte MAPSEC_ROUTE_118 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc index e5c3e5d54c..9e37cfdf4b 100644 --- a/data/maps/Route119/header.inc +++ b/data/maps/Route119/header.inc @@ -8,7 +8,7 @@ Route119: @ 8482870 .byte MAPSEC_ROUTE_119 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc index ee5c6ee434..50eb5482b0 100644 --- a/data/maps/Route119_House/header.inc +++ b/data/maps/Route119_House/header.inc @@ -8,7 +8,7 @@ Route119_House: @ 8485D28 .byte MAPSEC_ROUTE_119 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc index a9e533460b..f5a73c34cc 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ b/data/maps/Route119_WeatherInstitute_1F/header.inc @@ -8,7 +8,7 @@ Route119_WeatherInstitute_1F: @ 8485CF0 .byte MAPSEC_ROUTE_119 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc index 6b339317df..effe5f0661 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ b/data/maps/Route119_WeatherInstitute_2F/header.inc @@ -8,7 +8,7 @@ Route119_WeatherInstitute_2F: @ 8485D0C .byte MAPSEC_ROUTE_119 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc index 75419c711a..7675680158 100644 --- a/data/maps/Route120/header.inc +++ b/data/maps/Route120/header.inc @@ -8,7 +8,7 @@ Route120: @ 848288C .byte MAPSEC_ROUTE_120 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc index 9c441064f8..6a106d24df 100644 --- a/data/maps/Route121/header.inc +++ b/data/maps/Route121/header.inc @@ -8,7 +8,7 @@ Route121: @ 84828A8 .byte MAPSEC_ROUTE_121 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc index 6fa3b03080..665eacd570 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ b/data/maps/Route121_SafariZoneEntrance/header.inc @@ -8,7 +8,7 @@ Route121_SafariZoneEntrance: @ 8483EA4 .byte MAPSEC_ROUTE_121 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc index 37d9a7a14b..e2554ed2a4 100644 --- a/data/maps/Route122/header.inc +++ b/data/maps/Route122/header.inc @@ -8,7 +8,7 @@ Route122: @ 84828C4 .byte MAPSEC_ROUTE_122 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc index f7d1348941..5b662b8f5d 100644 --- a/data/maps/Route123/header.inc +++ b/data/maps/Route123/header.inc @@ -8,7 +8,7 @@ Route123: @ 84828E0 .byte MAPSEC_ROUTE_123 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc index 7516de2398..7ae6169d6d 100644 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -8,7 +8,7 @@ Route123_BerryMastersHouse: @ 8485CD4 .byte MAPSEC_ROUTE_123 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index 6f4f3c5402..217befb9cb 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -8,7 +8,7 @@ Route124: @ 84828FC .byte MAPSEC_ROUTE_124 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc index fd405a1289..74d6665915 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc @@ -8,7 +8,7 @@ Route124_DivingTreasureHuntersHouse: @ 8485D44 .byte MAPSEC_ROUTE_124 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc index 3e4affa652..f093b492c2 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -8,7 +8,7 @@ Route125: @ 8482918 .byte MAPSEC_ROUTE_125 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc index ae2dae20f2..dd713fc558 100644 --- a/data/maps/Route126/header.inc +++ b/data/maps/Route126/header.inc @@ -8,7 +8,7 @@ Route126: @ 8482934 .byte MAPSEC_ROUTE_126 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc index c92a963c70..76ebe06c3c 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -8,7 +8,7 @@ Route127: @ 8482950 .byte MAPSEC_ROUTE_127 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index b4f08635f2..5de5e3d91a 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -8,7 +8,7 @@ Route128: @ 848296C .byte MAPSEC_ROUTE_128 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc index c16a9c91ff..936c951bea 100644 --- a/data/maps/Route129/header.inc +++ b/data/maps/Route129/header.inc @@ -8,7 +8,7 @@ Route129: @ 8482988 .byte MAPSEC_ROUTE_129 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc index 2787d369b1..99d1b8aa31 100644 --- a/data/maps/Route130/header.inc +++ b/data/maps/Route130/header.inc @@ -8,7 +8,7 @@ Route130: @ 84829A4 .byte MAPSEC_ROUTE_130 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc index eeb09e0eac..cf3b18e0b3 100644 --- a/data/maps/Route131/header.inc +++ b/data/maps/Route131/header.inc @@ -8,7 +8,7 @@ Route131: @ 84829C0 .byte MAPSEC_ROUTE_131 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc index 672f4d3f75..46587bf7d0 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -8,7 +8,7 @@ Route132: @ 84829DC .byte MAPSEC_ROUTE_132 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index bd7ab0e104..9f1aad37d8 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -8,7 +8,7 @@ Route133: @ 84829F8 .byte MAPSEC_ROUTE_133 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index 623db96b5d..cdd43da738 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -8,7 +8,7 @@ Route134: @ 8482A14 .byte MAPSEC_ROUTE_134 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc index 3aed4b2f2f..c0edf38c9d 100644 --- a/data/maps/RustboroCity/header.inc +++ b/data/maps/RustboroCity/header.inc @@ -8,7 +8,7 @@ RustboroCity: @ 848250C .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_SUNNY - .byte 2 + .byte MAP_TYPE_CITY .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc index 742a590e2d..26b4cc1ff5 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ b/data/maps/RustboroCity_CuttersHouse/header.inc @@ -8,7 +8,7 @@ RustboroCity_CuttersHouse: @ 8483478 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc index 28b4a1d1c9..855ceb419c 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc @@ -8,7 +8,7 @@ RustboroCity_DevonCorp_1F: @ 8483344 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc index f1bf1cd833..0200f56d21 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -8,7 +8,7 @@ RustboroCity_DevonCorp_2F: @ 8483360 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc index 2bf6129fea..e212f3dcc5 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -8,7 +8,7 @@ RustboroCity_DevonCorp_3F: @ 848337C .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc index 792d6a87cb..e861278db8 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ b/data/maps/RustboroCity_Flat1_1F/header.inc @@ -8,7 +8,7 @@ RustboroCity_Flat1_1F: @ 8483424 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc index 50fbdf6d05..960813992f 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ b/data/maps/RustboroCity_Flat1_2F/header.inc @@ -8,7 +8,7 @@ RustboroCity_Flat1_2F: @ 8483440 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc index 271127402a..1c048f61c2 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ b/data/maps/RustboroCity_Flat2_1F/header.inc @@ -8,7 +8,7 @@ RustboroCity_Flat2_1F: @ 84834B0 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc index f8bb6826de..326a374f52 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ b/data/maps/RustboroCity_Flat2_2F/header.inc @@ -8,7 +8,7 @@ RustboroCity_Flat2_2F: @ 84834CC .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc index 9fec8f2981..a9914830c9 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ b/data/maps/RustboroCity_Flat2_3F/header.inc @@ -8,7 +8,7 @@ RustboroCity_Flat2_3F: @ 84834E8 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc index fbac653514..a31aeeb8bc 100644 --- a/data/maps/RustboroCity_Gym/header.inc +++ b/data/maps/RustboroCity_Gym/header.inc @@ -8,7 +8,7 @@ RustboroCity_Gym: @ 8483398 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc index 7db64f8f99..9ee33359ff 100644 --- a/data/maps/RustboroCity_House1/header.inc +++ b/data/maps/RustboroCity_House1/header.inc @@ -8,7 +8,7 @@ RustboroCity_House1: @ 848345C .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc index db3ef40f44..f966977568 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -8,7 +8,7 @@ RustboroCity_House2: @ 8483494 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc index 08d31197b0..aa479cb3f9 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -8,7 +8,7 @@ RustboroCity_House3: @ 8483504 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc index d7126406ec..0462855677 100644 --- a/data/maps/RustboroCity_Mart/header.inc +++ b/data/maps/RustboroCity_Mart/header.inc @@ -8,7 +8,7 @@ RustboroCity_Mart: @ 8483408 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc index 67070920e3..ca5fc513d4 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ RustboroCity_PokemonCenter_1F: @ 84833D0 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index 15e8537df9..7c2467234a 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 diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index 13138b65ea..4c7ca3897f 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ b/data/maps/RustboroCity_PokemonSchool/header.inc @@ -8,7 +8,7 @@ RustboroCity_PokemonSchool: @ 84833B4 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc index e87800965f..6bf405b3b1 100644 --- a/data/maps/RusturfTunnel/header.inc +++ b/data/maps/RusturfTunnel/header.inc @@ -8,7 +8,7 @@ RusturfTunnel: @ 8483F30 .byte MAPSEC_RUSTURF_TUNNEL .byte 0 .byte WEATHER_FOG_1 - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc index 6e66b473c3..1d892094ce 100644 --- a/data/maps/SSTidalCorridor/header.inc +++ b/data/maps/SSTidalCorridor/header.inc @@ -8,7 +8,7 @@ SSTidalCorridor: @ 8484F0C .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc index 1c7e1d01ca..1e2c5b58d0 100644 --- a/data/maps/SSTidalLowerDeck/header.inc +++ b/data/maps/SSTidalLowerDeck/header.inc @@ -8,7 +8,7 @@ SSTidalLowerDeck: @ 8484F28 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc index c02176a9b0..6f2facdcdc 100644 --- a/data/maps/SSTidalRooms/header.inc +++ b/data/maps/SSTidalRooms/header.inc @@ -8,7 +8,7 @@ SSTidalRooms: @ 8484F44 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc index 745e608a28..cbf7fae30e 100644 --- a/data/maps/SafariZone_North/header.inc +++ b/data/maps/SafariZone_North/header.inc @@ -8,7 +8,7 @@ SafariZone_North: @ 8485158 .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc index e25a8497bd..5630e462aa 100644 --- a/data/maps/SafariZone_Northeast/header.inc +++ b/data/maps/SafariZone_Northeast/header.inc @@ -8,7 +8,7 @@ SafariZone_Northeast: @ 848528C .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc index 01b7e8198c..526111c905 100644 --- a/data/maps/SafariZone_Northwest/header.inc +++ b/data/maps/SafariZone_Northwest/header.inc @@ -8,7 +8,7 @@ SafariZone_Northwest: @ 848513C .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc index e6739ff667..87e506ac19 100644 --- a/data/maps/SafariZone_RestHouse/header.inc +++ b/data/maps/SafariZone_RestHouse/header.inc @@ -8,7 +8,7 @@ SafariZone_RestHouse: @ 8485270 .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SafariZone_South/header.inc b/data/maps/SafariZone_South/header.inc index e60f44f9ec..160cfea7da 100644 --- a/data/maps/SafariZone_South/header.inc +++ b/data/maps/SafariZone_South/header.inc @@ -8,7 +8,7 @@ SafariZone_South: @ 8485190 .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc index 5da814cff0..f87a4db6ac 100644 --- a/data/maps/SafariZone_Southeast/header.inc +++ b/data/maps/SafariZone_Southeast/header.inc @@ -8,7 +8,7 @@ SafariZone_Southeast: @ 84852A8 .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc index 25115a13a1..28bd8c761c 100644 --- a/data/maps/SafariZone_Southwest/header.inc +++ b/data/maps/SafariZone_Southwest/header.inc @@ -8,7 +8,7 @@ SafariZone_Southwest: @ 8485174 .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc index 51666baf3a..eb61455fae 100644 --- a/data/maps/ScorchedSlab/header.inc +++ b/data/maps/ScorchedSlab/header.inc @@ -8,7 +8,7 @@ ScorchedSlab: @ 84846BC .byte MAPSEC_SCORCHED_SLAB .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc index 68bb920663..dc62eba0ca 100644 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ b/data/maps/SeafloorCavern_Entrance/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Entrance: @ 84841B4 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc index 56bfc32cd6..dd0a2db3cc 100644 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ b/data/maps/SeafloorCavern_Room1/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room1: @ 84841D0 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc index bfb1645209..09be291c28 100644 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ b/data/maps/SeafloorCavern_Room2/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room2: @ 84841EC .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc index c49f283e1f..ff514a631a 100644 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ b/data/maps/SeafloorCavern_Room3/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room3: @ 8484208 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc index e440157e13..130f198aa5 100644 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ b/data/maps/SeafloorCavern_Room4/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room4: @ 8484224 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc index 3cfd1b9d06..5945206290 100644 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ b/data/maps/SeafloorCavern_Room5/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room5: @ 8484240 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc index e336955eb0..24c8fde989 100644 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ b/data/maps/SeafloorCavern_Room6/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room6: @ 848425C .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc index 9f8c89f6ff..b2c247ab92 100644 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ b/data/maps/SeafloorCavern_Room7/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room7: @ 8484278 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc index f701d53f2f..6bab8f16b5 100644 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ b/data/maps/SeafloorCavern_Room8/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room8: @ 8484294 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc index 8345ee1889..b50127ffc4 100644 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ b/data/maps/SeafloorCavern_Room9/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room9: @ 84842B0 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_FOG_1 - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 14 .byte 0 diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc index 1061ce4c11..f61e4d1f9a 100644 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ b/data/maps/SealedChamber_InnerRoom/header.inc @@ -8,7 +8,7 @@ SealedChamber_InnerRoom: @ 84846A0 .byte MAPSEC_SEALED_CHAMBER .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc index 66d278fabb..dd214cba65 100644 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ b/data/maps/SealedChamber_OuterRoom/header.inc @@ -8,7 +8,7 @@ SealedChamber_OuterRoom: @ 8484684 .byte MAPSEC_SEALED_CHAMBER .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc index ebf5eea009..bfce096695 100644 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ b/data/maps/SecretBase_BlueCave1/header.inc @@ -8,7 +8,7 @@ SecretBase_BlueCave1: @ 8484AC8 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc index 69d2cf8605..33555b1b19 100644 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ b/data/maps/SecretBase_BlueCave2/header.inc @@ -8,7 +8,7 @@ SecretBase_BlueCave2: @ 8484B70 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc index 40a99dcdc1..0f48e009dc 100644 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ b/data/maps/SecretBase_BlueCave3/header.inc @@ -8,7 +8,7 @@ SecretBase_BlueCave3: @ 8484C18 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc index 1b22ee18ec..c43be047e7 100644 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ b/data/maps/SecretBase_BlueCave4/header.inc @@ -8,7 +8,7 @@ SecretBase_BlueCave4: @ 8484CC0 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc index 79c7f3e8d4..b423185f28 100644 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ b/data/maps/SecretBase_BrownCave1/header.inc @@ -8,7 +8,7 @@ SecretBase_BrownCave1: @ 8484AAC .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc index 030ceea85e..e51a43f138 100644 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ b/data/maps/SecretBase_BrownCave2/header.inc @@ -8,7 +8,7 @@ SecretBase_BrownCave2: @ 8484B54 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc index 2bdb4838e1..5b9fe83e4b 100644 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ b/data/maps/SecretBase_BrownCave3/header.inc @@ -8,7 +8,7 @@ SecretBase_BrownCave3: @ 8484BFC .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc index e3137603ae..fc821510f8 100644 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ b/data/maps/SecretBase_BrownCave4/header.inc @@ -8,7 +8,7 @@ SecretBase_BrownCave4: @ 8484CA4 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc index f2f0a00fcb..2bb11dac2b 100644 --- a/data/maps/SecretBase_RedCave1/header.inc +++ b/data/maps/SecretBase_RedCave1/header.inc @@ -8,7 +8,7 @@ SecretBase_RedCave1: @ 8484A90 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc index 4d11b7da3c..f0e5d976ad 100644 --- a/data/maps/SecretBase_RedCave2/header.inc +++ b/data/maps/SecretBase_RedCave2/header.inc @@ -8,7 +8,7 @@ SecretBase_RedCave2: @ 8484B38 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc index b935650d66..b62553c883 100644 --- a/data/maps/SecretBase_RedCave3/header.inc +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -8,7 +8,7 @@ SecretBase_RedCave3: @ 8484BE0 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc index b5240755ee..1b7a86f06c 100644 --- a/data/maps/SecretBase_RedCave4/header.inc +++ b/data/maps/SecretBase_RedCave4/header.inc @@ -8,7 +8,7 @@ SecretBase_RedCave4: @ 8484C88 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc index cb91408529..604f32e19b 100644 --- a/data/maps/SecretBase_Shrub1/header.inc +++ b/data/maps/SecretBase_Shrub1/header.inc @@ -8,7 +8,7 @@ SecretBase_Shrub1: @ 8484B1C .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc index 5b14ac5ac0..2454dd2ada 100644 --- a/data/maps/SecretBase_Shrub2/header.inc +++ b/data/maps/SecretBase_Shrub2/header.inc @@ -8,7 +8,7 @@ SecretBase_Shrub2: @ 8484BC4 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc index 725cbd9dce..9a0f7e8d7d 100644 --- a/data/maps/SecretBase_Shrub3/header.inc +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -8,7 +8,7 @@ SecretBase_Shrub3: @ 8484C6C .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index 7dc3af57e3..4cfdf043b8 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 diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index 1ca8f43744..dc2c07918e 100644 --- a/data/maps/SecretBase_Tree1/header.inc +++ b/data/maps/SecretBase_Tree1/header.inc @@ -8,7 +8,7 @@ SecretBase_Tree1: @ 8484B00 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc index 880f0dd906..7a35c54668 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -8,7 +8,7 @@ SecretBase_Tree2: @ 8484BA8 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc index 3cf6fef749..bffa571d56 100644 --- a/data/maps/SecretBase_Tree3/header.inc +++ b/data/maps/SecretBase_Tree3/header.inc @@ -8,7 +8,7 @@ SecretBase_Tree3: @ 8484C50 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc index 2688c2ecab..55f3f56f1b 100644 --- a/data/maps/SecretBase_Tree4/header.inc +++ b/data/maps/SecretBase_Tree4/header.inc @@ -8,7 +8,7 @@ SecretBase_Tree4: @ 8484CF8 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc index b6d42f0a28..69287b49f1 100644 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ b/data/maps/SecretBase_YellowCave1/header.inc @@ -8,7 +8,7 @@ SecretBase_YellowCave1: @ 8484AE4 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc index 08253975a7..98b4739e06 100644 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ b/data/maps/SecretBase_YellowCave2/header.inc @@ -8,7 +8,7 @@ SecretBase_YellowCave2: @ 8484B8C .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc index 0c1464cd9b..681dc7c439 100644 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ b/data/maps/SecretBase_YellowCave3/header.inc @@ -8,7 +8,7 @@ SecretBase_YellowCave3: @ 8484C34 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc index b20409781e..edfe53d6e3 100644 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ b/data/maps/SecretBase_YellowCave4/header.inc @@ -8,7 +8,7 @@ SecretBase_YellowCave4: @ 8484CDC .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc index b263badba7..5d136baee7 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc @@ -8,7 +8,7 @@ ShoalCave_HighTideEntranceRoom: @ 8484438 .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc index 386cf2b509..867de3f37e 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc @@ -8,7 +8,7 @@ ShoalCave_HighTideInnerRoom: @ 8484454 .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc index 9f1423424d..005e502ad8 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc @@ -8,7 +8,7 @@ ShoalCave_LowTideEntranceRoom: @ 84843C8 .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc index f280c68795..df62a5cfb9 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc @@ -8,7 +8,7 @@ ShoalCave_LowTideIceRoom: @ 84847D4 .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc index bcb536380d..9caf4d5c3e 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc @@ -8,7 +8,7 @@ ShoalCave_LowTideInnerRoom: @ 84843E4 .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc index 9fde2f89d8..9b2a56e230 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc @@ -8,7 +8,7 @@ ShoalCave_LowTideLowerRoom: @ 848441C .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc index d111213f4d..674ce7f6db 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc @@ -8,7 +8,7 @@ ShoalCave_LowTideStairsRoom: @ 8484400 .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc index c3542e15f5..f89fe04507 100644 --- a/data/maps/SingleBattleColosseum/header.inc +++ b/data/maps/SingleBattleColosseum/header.inc @@ -8,7 +8,7 @@ SingleBattleColosseum: @ 8484D30 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 8 diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc index d634f1006e..1358d164c8 100644 --- a/data/maps/SkyPillar_1F/header.inc +++ b/data/maps/SkyPillar_1F/header.inc @@ -8,7 +8,7 @@ SkyPillar_1F: @ 8484764 .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc index 0379980bb1..b861a2ab4d 100644 --- a/data/maps/SkyPillar_2F/header.inc +++ b/data/maps/SkyPillar_2F/header.inc @@ -8,7 +8,7 @@ SkyPillar_2F: @ 8484780 .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc index da58b47e59..68903b8a2b 100644 --- a/data/maps/SkyPillar_3F/header.inc +++ b/data/maps/SkyPillar_3F/header.inc @@ -8,7 +8,7 @@ SkyPillar_3F: @ 848479C .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc index 54c9432b50..f74d33ce83 100644 --- a/data/maps/SkyPillar_4F/header.inc +++ b/data/maps/SkyPillar_4F/header.inc @@ -8,7 +8,7 @@ SkyPillar_4F: @ 84847B8 .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc index 84c7a9ae89..40c2fbe729 100644 --- a/data/maps/SkyPillar_5F/header.inc +++ b/data/maps/SkyPillar_5F/header.inc @@ -8,7 +8,7 @@ SkyPillar_5F: @ 84847F0 .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc index 52a71aefce..5ef569e651 100644 --- a/data/maps/SkyPillar_Entrance/header.inc +++ b/data/maps/SkyPillar_Entrance/header.inc @@ -8,7 +8,7 @@ SkyPillar_Entrance: @ 848472C .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc index 50bc46b247..e61123f1c7 100644 --- a/data/maps/SkyPillar_Outside/header.inc +++ b/data/maps/SkyPillar_Outside/header.inc @@ -8,7 +8,7 @@ SkyPillar_Outside: @ 8484748 .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc index 578341f9ca..919534fc22 100644 --- a/data/maps/SkyPillar_Top/header.inc +++ b/data/maps/SkyPillar_Top/header.inc @@ -8,7 +8,7 @@ SkyPillar_Top: @ 848480C .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc index e6ee88487c..adbda2e3a4 100644 --- a/data/maps/SlateportCity/header.inc +++ b/data/maps/SlateportCity/header.inc @@ -8,7 +8,7 @@ SlateportCity: @ 84824D4 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_SUNNY - .byte 2 + .byte MAP_TYPE_CITY .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc index 7d4879fc70..3f5e5809a4 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc @@ -8,7 +8,7 @@ SlateportCity_BattleTentBattleRoom: @ 848314C .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_BattleTentCorridor/header.inc b/data/maps/SlateportCity_BattleTentCorridor/header.inc index 177c05db8c..6721bdef11 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/header.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/header.inc @@ -8,7 +8,7 @@ SlateportCity_BattleTentCorridor: @ 8483130 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_BattleTentLobby/header.inc b/data/maps/SlateportCity_BattleTentLobby/header.inc index 562905e49a..46b5d595ea 100644 --- a/data/maps/SlateportCity_BattleTentLobby/header.inc +++ b/data/maps/SlateportCity_BattleTentLobby/header.inc @@ -8,7 +8,7 @@ SlateportCity_BattleTentLobby: @ 8483114 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc index 6cc9cda8e1..22b61d048a 100644 --- a/data/maps/SlateportCity_Harbor/header.inc +++ b/data/maps/SlateportCity_Harbor/header.inc @@ -8,7 +8,7 @@ SlateportCity_Harbor: @ 84831D8 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc index 102784c6ff..d61584a37b 100644 --- a/data/maps/SlateportCity_House1/header.inc +++ b/data/maps/SlateportCity_House1/header.inc @@ -8,7 +8,7 @@ SlateportCity_House1: @ 8483168 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc index 60faa1552e..3e2e6434d2 100644 --- a/data/maps/SlateportCity_House2/header.inc +++ b/data/maps/SlateportCity_House2/header.inc @@ -8,7 +8,7 @@ SlateportCity_House2: @ 84831F4 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc index 8fd2113cb1..36c3dfb573 100644 --- a/data/maps/SlateportCity_Mart/header.inc +++ b/data/maps/SlateportCity_Mart/header.inc @@ -8,7 +8,7 @@ SlateportCity_Mart: @ 8483248 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc index 9cb13d8cf1..fa4366df62 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc @@ -8,7 +8,7 @@ SlateportCity_OceanicMuseum_1F: @ 84831A0 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc index 69e244a917..dc3f5a2453 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc @@ -8,7 +8,7 @@ SlateportCity_OceanicMuseum_2F: @ 84831BC .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc index 085db4d85b..abafe50fdf 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ SlateportCity_PokemonCenter_1F: @ 8483210 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc index c2bbb5097a..343c205122 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ SlateportCity_PokemonCenter_2F: @ 848322C .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc index 33796df810..fcbe42d2c9 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ b/data/maps/SlateportCity_PokemonFanClub/header.inc @@ -8,7 +8,7 @@ SlateportCity_PokemonFanClub: @ 8483184 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc index 73b7c113d2..1d054f587b 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc @@ -8,7 +8,7 @@ SlateportCity_SternsShipyard_1F: @ 84830DC .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc index f3bc5fde22..9be63a0bba 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc @@ -8,7 +8,7 @@ SlateportCity_SternsShipyard_2F: @ 84830F8 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc index ccc9c1671c..a7d0d04d5f 100644 --- a/data/maps/SootopolisCity/header.inc +++ b/data/maps/SootopolisCity/header.inc @@ -8,7 +8,7 @@ SootopolisCity: @ 848257C .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_SUNNY - .byte 2 + .byte MAP_TYPE_CITY .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc index 2d51a6b918..aaaeb85ed8 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ b/data/maps/SootopolisCity_Gym_1F/header.inc @@ -8,7 +8,7 @@ SootopolisCity_Gym_1F: @ 8483A28 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc index 420ee8f53f..f2e9e2b4dd 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ b/data/maps/SootopolisCity_Gym_B1F/header.inc @@ -8,7 +8,7 @@ SootopolisCity_Gym_B1F: @ 8483A44 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc index d60dd358f0..e728413634 100644 --- a/data/maps/SootopolisCity_House1/header.inc +++ b/data/maps/SootopolisCity_House1/header.inc @@ -8,7 +8,7 @@ SootopolisCity_House1: @ 8483AB4 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc index 817b676930..555c1c7a15 100644 --- a/data/maps/SootopolisCity_House2/header.inc +++ b/data/maps/SootopolisCity_House2/header.inc @@ -8,7 +8,7 @@ SootopolisCity_House2: @ 8483AD0 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc index a5225747b4..da684a6326 100644 --- a/data/maps/SootopolisCity_House3/header.inc +++ b/data/maps/SootopolisCity_House3/header.inc @@ -8,7 +8,7 @@ SootopolisCity_House3: @ 8483AEC .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc index 2e2697d4d6..badfcc2011 100644 --- a/data/maps/SootopolisCity_House4/header.inc +++ b/data/maps/SootopolisCity_House4/header.inc @@ -8,7 +8,7 @@ SootopolisCity_House4: @ 8483B08 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc index 0ec392f92e..bf52a354f1 100644 --- a/data/maps/SootopolisCity_House5/header.inc +++ b/data/maps/SootopolisCity_House5/header.inc @@ -8,7 +8,7 @@ SootopolisCity_House5: @ 8483B24 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc index 97d0a73e96..82decfbba2 100644 --- a/data/maps/SootopolisCity_House6/header.inc +++ b/data/maps/SootopolisCity_House6/header.inc @@ -8,7 +8,7 @@ SootopolisCity_House6: @ 8483B40 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc index 9318e6ebeb..27afdc4ee6 100644 --- a/data/maps/SootopolisCity_House7/header.inc +++ b/data/maps/SootopolisCity_House7/header.inc @@ -8,7 +8,7 @@ SootopolisCity_House7: @ 8483B5C .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc index 96d0ea1d1d..573b465bac 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc @@ -8,7 +8,7 @@ SootopolisCity_LotadAndSeedotHouse: @ 8483B78 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc index 982ac6fa40..66400ad1d6 100644 --- a/data/maps/SootopolisCity_Mart/header.inc +++ b/data/maps/SootopolisCity_Mart/header.inc @@ -8,7 +8,7 @@ SootopolisCity_Mart: @ 8483A98 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc index 0fd0fbf5e7..b9b7172988 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc @@ -8,7 +8,7 @@ SootopolisCity_MysteryEventsHouse_1F: @ 8483B94 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc index 660f26ae27..0630ba7496 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc @@ -8,7 +8,7 @@ SootopolisCity_MysteryEventsHouse_B1F: @ 8483BB0 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc index f39608216b..d50ba8f019 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ SootopolisCity_PokemonCenter_1F: @ 8483A60 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc index 0844847c80..380f346a65 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ SootopolisCity_PokemonCenter_2F: @ 8483A7C .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc index e72b6f3102..f7498c0707 100644 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ b/data/maps/SouthernIsland_Exterior/header.inc @@ -8,7 +8,7 @@ SouthernIsland_Exterior: @ 8485238 .byte MAPSEC_SOUTHERN_ISLAND .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc index 42bb8497da..eb5e1d5723 100644 --- a/data/maps/SouthernIsland_Interior/header.inc +++ b/data/maps/SouthernIsland_Interior/header.inc @@ -8,7 +8,7 @@ SouthernIsland_Interior: @ 8485254 .byte MAPSEC_SOUTHERN_ISLAND .byte 0 .byte WEATHER_SHADE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/TerraCave_End/header.inc b/data/maps/TerraCave_End/header.inc index bda560677b..b84a1a0718 100644 --- a/data/maps/TerraCave_End/header.inc +++ b/data/maps/TerraCave_End/header.inc @@ -8,7 +8,7 @@ TerraCave_End: @ 8484A3C .byte MAPSEC_TERRA_CAVE .byte 0 .byte WEATHER_FOG_1 - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 14 .byte 0 diff --git a/data/maps/TerraCave_Entrance/header.inc b/data/maps/TerraCave_Entrance/header.inc index e38dc2fa81..69f541f7c1 100644 --- a/data/maps/TerraCave_Entrance/header.inc +++ b/data/maps/TerraCave_Entrance/header.inc @@ -8,7 +8,7 @@ TerraCave_Entrance: @ 8484A20 .byte MAPSEC_TERRA_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 4b2c0f840f..497a3219d0 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 diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc index 41fddfeed2..fae6fccae0 100644 --- a/data/maps/TrainerHill_1F/header.inc +++ b/data/maps/TrainerHill_1F/header.inc @@ -8,7 +8,7 @@ TrainerHill_1F: @ 84857E8 .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/TrainerHill_2F/header.inc b/data/maps/TrainerHill_2F/header.inc index 740afdba70..7cb9d5e674 100644 --- a/data/maps/TrainerHill_2F/header.inc +++ b/data/maps/TrainerHill_2F/header.inc @@ -8,7 +8,7 @@ TrainerHill_2F: @ 8485804 .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/TrainerHill_3F/header.inc b/data/maps/TrainerHill_3F/header.inc index 79597b6866..f9834ed5f2 100644 --- a/data/maps/TrainerHill_3F/header.inc +++ b/data/maps/TrainerHill_3F/header.inc @@ -8,7 +8,7 @@ TrainerHill_3F: @ 8485820 .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/TrainerHill_4F/header.inc b/data/maps/TrainerHill_4F/header.inc index 8286c131ae..59c3391122 100644 --- a/data/maps/TrainerHill_4F/header.inc +++ b/data/maps/TrainerHill_4F/header.inc @@ -8,7 +8,7 @@ TrainerHill_4F: @ 848583C .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/TrainerHill_Elevator/header.inc b/data/maps/TrainerHill_Elevator/header.inc index c6ed43e08d..ca48bb8236 100644 --- a/data/maps/TrainerHill_Elevator/header.inc +++ b/data/maps/TrainerHill_Elevator/header.inc @@ -8,7 +8,7 @@ TrainerHill_Elevator: @ 8485ADC .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/TrainerHill_Entrance/header.inc b/data/maps/TrainerHill_Entrance/header.inc index a45f77c990..91b6cf3459 100644 --- a/data/maps/TrainerHill_Entrance/header.inc +++ b/data/maps/TrainerHill_Entrance/header.inc @@ -8,7 +8,7 @@ TrainerHill_Entrance: @ 84857CC .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/TrainerHill_Roof/header.inc b/data/maps/TrainerHill_Roof/header.inc index e6000a2d5c..f70f69aa07 100644 --- a/data/maps/TrainerHill_Roof/header.inc +++ b/data/maps/TrainerHill_Roof/header.inc @@ -8,7 +8,7 @@ TrainerHill_Roof: @ 8485858 .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc index 3ce516a3d3..d62735bb85 100644 --- a/data/maps/Underwater1/header.inc +++ b/data/maps/Underwater1/header.inc @@ -8,7 +8,7 @@ Underwater1: @ 8482A30 .byte MAPSEC_UNDERWATER_124 .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc index 1109fd52ab..bc71590eaf 100644 --- a/data/maps/Underwater2/header.inc +++ b/data/maps/Underwater2/header.inc @@ -8,7 +8,7 @@ Underwater2: @ 8482A4C .byte MAPSEC_UNDERWATER_125 .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc index c132e8e844..83fbe61554 100644 --- a/data/maps/Underwater3/header.inc +++ b/data/maps/Underwater3/header.inc @@ -8,7 +8,7 @@ Underwater3: @ 8482A68 .byte MAPSEC_UNDERWATER_126 .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc index ec0818b57a..2f826994b0 100644 --- a/data/maps/Underwater4/header.inc +++ b/data/maps/Underwater4/header.inc @@ -8,7 +8,7 @@ Underwater4: @ 8482A84 .byte MAPSEC_UNDERWATER_127 .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Underwater5/header.inc b/data/maps/Underwater5/header.inc index ba247e68d1..9cdd79bf7a 100644 --- a/data/maps/Underwater5/header.inc +++ b/data/maps/Underwater5/header.inc @@ -8,7 +8,7 @@ Underwater5: @ 8482AA0 .byte MAPSEC_UNDERWATER_129 .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Underwater6/header.inc b/data/maps/Underwater6/header.inc index 259f04eec5..2da188f55a 100644 --- a/data/maps/Underwater6/header.inc +++ b/data/maps/Underwater6/header.inc @@ -8,7 +8,7 @@ Underwater6: @ 8482ABC .byte MAPSEC_UNDERWATER_TERRA_CAVE .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Underwater7/header.inc b/data/maps/Underwater7/header.inc index f04015ba8f..d9e75b02bb 100644 --- a/data/maps/Underwater7/header.inc +++ b/data/maps/Underwater7/header.inc @@ -8,7 +8,7 @@ Underwater7: @ 8482AD8 .byte MAPSEC_UNDERWATER_UNK1 .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Underwater_MarineCave/header.inc b/data/maps/Underwater_MarineCave/header.inc index 51980c78cd..f8de0fb73d 100644 --- a/data/maps/Underwater_MarineCave/header.inc +++ b/data/maps/Underwater_MarineCave/header.inc @@ -8,7 +8,7 @@ Underwater_MarineCave: @ 84849CC .byte MAPSEC_UNDERWATER_MARINE_CAVE .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc index 6c746e8f14..42c890ef6e 100644 --- a/data/maps/Underwater_Route134/header.inc +++ b/data/maps/Underwater_Route134/header.inc @@ -8,7 +8,7 @@ Underwater_Route134: @ 848464C .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc index e5efbacf78..96c31fa88a 100644 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ b/data/maps/Underwater_SeafloorCavern/header.inc @@ -8,7 +8,7 @@ Underwater_SeafloorCavern: @ 8484198 .byte MAPSEC_UNDERWATER_128 .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc index d6f2c22024..b2fa29ceb5 100644 --- a/data/maps/Underwater_SealedChamber/header.inc +++ b/data/maps/Underwater_SealedChamber/header.inc @@ -8,7 +8,7 @@ Underwater_SealedChamber: @ 8484668 .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc index 94b0392929..35d0891adf 100644 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ b/data/maps/Underwater_SootopolisCity/header.inc @@ -8,7 +8,7 @@ Underwater_SootopolisCity: @ 8483F4C .byte MAPSEC_UNDERWATER_SOOTOPOLIS .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc index ff4220697c..436c396142 100644 --- a/data/maps/UnionRoom/header.inc +++ b/data/maps/UnionRoom/header.inc @@ -8,7 +8,7 @@ UnionRoom: @ 8485120 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 8 diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index 7ce8ad751a..cdeeb42076 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -8,7 +8,7 @@ UnknownMap_25_29: @ 8484DBC .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc index 5735bdc9dc..5648f07154 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -8,7 +8,7 @@ UnknownMap_25_30: @ 8484DD8 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc index be7d4d9331..6e87bdc753 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -8,7 +8,7 @@ UnknownMap_25_31: @ 8484DF4 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc index 2040ed5c77..d899a6e516 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -8,7 +8,7 @@ UnknownMap_25_32: @ 8484E10 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc index 038e5d7605..bd048756d1 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -8,7 +8,7 @@ UnknownMap_25_33: @ 8484E2C .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc index c59bd0b7fe..33b51a4048 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -8,7 +8,7 @@ UnknownMap_25_34: @ 8484E48 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc index c7bd8ee441..16a1a3e2a7 100644 --- a/data/maps/VerdanturfTown/header.inc +++ b/data/maps/VerdanturfTown/header.inc @@ -8,7 +8,7 @@ VerdanturfTown: @ 8482640 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_SUNNY - .byte 1 + .byte MAP_TYPE_TOWN .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc index 22d20c23d9..8c70d2cbaa 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc @@ -8,7 +8,7 @@ VerdanturfTown_BattleTentBattleRoom: @ 8482E90 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc index 0c24a5cd8c..bcd2185ab9 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc @@ -8,7 +8,7 @@ VerdanturfTown_BattleTentCorridor: @ 8482E74 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_BattleTentLobby/header.inc b/data/maps/VerdanturfTown_BattleTentLobby/header.inc index 3afb04c31c..fe779c062e 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/header.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/header.inc @@ -8,7 +8,7 @@ VerdanturfTown_BattleTentLobby: @ 8482E58 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc index a60b166fcb..015f71d0ce 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -8,7 +8,7 @@ VerdanturfTown_FriendshipRatersHouse: @ 8482F1C .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc index 91e9b1179b..599b1f59ae 100644 --- a/data/maps/VerdanturfTown_House/header.inc +++ b/data/maps/VerdanturfTown_House/header.inc @@ -8,7 +8,7 @@ VerdanturfTown_House: @ 8482F38 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc index c1c6616544..315a42e568 100644 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ b/data/maps/VerdanturfTown_Mart/header.inc @@ -8,7 +8,7 @@ VerdanturfTown_Mart: @ 8482EAC .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc index d4524d031b..5d17e03b91 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ VerdanturfTown_PokemonCenter_1F: @ 8482EC8 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc index 77113ff7fa..0f881653de 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ VerdanturfTown_PokemonCenter_2F: @ 8482EE4 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc index 26752c39db..69eae1a165 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ b/data/maps/VerdanturfTown_WandasHouse/header.inc @@ -8,7 +8,7 @@ VerdanturfTown_WandasHouse: @ 8482F00 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index a7159f5e1e..81e866d499 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -8,7 +8,7 @@ VictoryRoad_1F: @ 8484374 .byte MAPSEC_VICTORY_ROAD .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc index 5aa5b120e8..341350a7aa 100644 --- a/data/maps/VictoryRoad_B1F/header.inc +++ b/data/maps/VictoryRoad_B1F/header.inc @@ -8,7 +8,7 @@ VictoryRoad_B1F: @ 8484390 .byte MAPSEC_VICTORY_ROAD .byte 1 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc index 95e0537a42..cd3451af71 100644 --- a/data/maps/VictoryRoad_B2F/header.inc +++ b/data/maps/VictoryRoad_B2F/header.inc @@ -8,7 +8,7 @@ VictoryRoad_B2F: @ 84843AC .byte MAPSEC_VICTORY_ROAD .byte 1 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/include/constants/map_types.h b/include/constants/map_types.h new file mode 100755 index 0000000000..504575859e --- /dev/null +++ b/include/constants/map_types.h @@ -0,0 +1,25 @@ +#ifndef GUARD_CONSTANTS_MAP_TYPES_H +#define GUARD_CONSTANTS_MAP_TYPES_H + +#define MAP_TYPE_0 0 +#define MAP_TYPE_TOWN 1 +#define MAP_TYPE_CITY 2 +#define MAP_TYPE_ROUTE 3 +#define MAP_TYPE_UNDERGROUND 4 +#define MAP_TYPE_UNDERWATER 5 +#define MAP_TYPE_6 6 +#define MAP_TYPE_7 7 +#define MAP_TYPE_INDOOR 8 +#define MAP_TYPE_SECRET_BASE 9 + +#define MAP_BATTLE_SCENE_NORMAL 0 +#define MAP_BATTLE_SCENE_GYM 1 +#define MAP_BATTLE_SCENE_MAGMA 2 +#define MAP_BATTLE_SCENE_AQUA 3 +#define MAP_BATTLE_SCENE_SIDNEY 4 +#define MAP_BATTLE_SCENE_PHOEBE 5 +#define MAP_BATTLE_SCENE_GLACIA 6 +#define MAP_BATTLE_SCENE_DRAKE 7 +#define MAP_BATTLE_SCENE_FRONTIER 8 + +#endif // GUARD_CONSTANTS_MAP_TYPES_H diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 5b2944a2bd..4bec8e0c7c 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -13,35 +13,6 @@ enum CONNECTION_EMERGE }; -// map types -enum -{ - MAP_TYPE_0, - MAP_TYPE_TOWN, - MAP_TYPE_CITY, - MAP_TYPE_ROUTE, - MAP_TYPE_UNDERGROUND, - MAP_TYPE_UNDERWATER, - MAP_TYPE_6, - MAP_TYPE_7, - MAP_TYPE_INDOOR, - MAP_TYPE_SECRET_BASE -}; - -// map battle scenes -enum -{ - MAP_BATTLE_SCENE_NORMAL, // 0 - MAP_BATTLE_SCENE_GYM, // 1 - MAP_BATTLE_SCENE_MAGMA, // 2 - MAP_BATTLE_SCENE_AQUA, // 3 - MAP_BATTLE_SCENE_SIDNEY, // 4 - MAP_BATTLE_SCENE_PHOEBE, // 5 - MAP_BATTLE_SCENE_GLACIA, // 6 - MAP_BATTLE_SCENE_DRAKE, // 7 - MAP_BATTLE_SCENE_FRONTIER, // 8 -}; - typedef void (*TilesetCB)(void); struct Tileset diff --git a/src/battle_bg.c b/src/battle_bg.c index d4bfd297aa..0af3116310 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -18,6 +18,7 @@ #include "text_window.h" #include "menu.h" #include "battle_setup.h" +#include "constants/map_types.h" struct BattleBackground { diff --git a/src/battle_setup.c b/src/battle_setup.c index c8440a35fd..16612e24de 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -32,6 +32,7 @@ #include "overworld.h" #include "field_weather.h" #include "gym_leader_rematch.h" +#include "constants/map_types.h" enum { diff --git a/src/bike.c b/src/bike.c index 87110b87bc..6ffd479f7a 100644 --- a/src/bike.c +++ b/src/bike.c @@ -9,6 +9,7 @@ #include "overworld.h" #include "constants/songs.h" #include "sound.h" +#include "constants/map_types.h" extern bool8 gBikeCyclingChallenge; extern u8 gBikeCollisions; diff --git a/src/overworld.c b/src/overworld.c index d4cb25e6cf..9cbc8dc521 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -57,6 +57,7 @@ #include "malloc.h" #include "gpu_regs.h" #include "link_rfu.h" +#include "constants/map_types.h" // event scripts extern const u8 EventScript_WhiteOut[]; diff --git a/src/rom6.c b/src/rom6.c index 78cbbe2de5..cc146fc94d 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -15,6 +15,7 @@ #include "sound.h" #include "sprite.h" #include "task.h" +#include "constants/map_types.h" // static functions static void task08_080C9820(u8 taskId); diff --git a/src/secret_base.c b/src/secret_base.c index b2fd54eb82..2e127dd844 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -39,6 +39,7 @@ #include "link.h" #include "tv.h" #include "secret_base.h" +#include "constants/map_types.h" extern void mapldr_default(void); From 94650495c669f673c59f4912b805b51360c0797a Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 12 Jul 2018 22:45:41 -0500 Subject: [PATCH 52/55] Use map battle scene constants in map headers --- data/maps/AbandonedShip_CaptainsOffice/header.inc | 2 +- data/maps/AbandonedShip_Corridors_1F/header.inc | 2 +- data/maps/AbandonedShip_Corridors_B1F/header.inc | 2 +- data/maps/AbandonedShip_Deck/header.inc | 2 +- data/maps/AbandonedShip_HiddenFloorCorridors/header.inc | 2 +- data/maps/AbandonedShip_HiddenFloorRooms/header.inc | 2 +- data/maps/AbandonedShip_Room_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_B1F/header.inc | 2 +- data/maps/AbandonedShip_Underwater1/header.inc | 2 +- data/maps/AbandonedShip_Underwater2/header.inc | 2 +- data/maps/AlteringCave/header.inc | 2 +- data/maps/AncientTomb/header.inc | 2 +- data/maps/AquaHideout_1F/header.inc | 2 +- data/maps/AquaHideout_B1F/header.inc | 2 +- data/maps/AquaHideout_B2F/header.inc | 2 +- data/maps/AquaHideout_UnusedRubyMap1/header.inc | 2 +- data/maps/AquaHideout_UnusedRubyMap2/header.inc | 2 +- data/maps/AquaHideout_UnusedRubyMap3/header.inc | 2 +- data/maps/ArtisanCave_1F/header.inc | 2 +- data/maps/ArtisanCave_B1F/header.inc | 2 +- data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleArenaCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattleArenaLobby/header.inc | 2 +- data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleDomeCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattleDomeLobby/header.inc | 2 +- data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleFactoryLobby/header.inc | 2 +- data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattlePalaceCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattlePalaceLobby/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeLobby/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc | 2 +- .../BattleFrontier_BattlePointExchangeServiceCorner/header.inc | 2 +- data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc | 2 +- data/maps/BattleFrontier_BattlePyramidLobby/header.inc | 2 +- data/maps/BattleFrontier_BattlePyramidTop/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerCorridor2/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerElevator/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerLobby/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_Lounge1/header.inc | 2 +- data/maps/BattleFrontier_Lounge2/header.inc | 2 +- data/maps/BattleFrontier_Lounge3/header.inc | 2 +- data/maps/BattleFrontier_Lounge4/header.inc | 2 +- data/maps/BattleFrontier_Lounge5/header.inc | 2 +- data/maps/BattleFrontier_Lounge6/header.inc | 2 +- data/maps/BattleFrontier_Lounge7/header.inc | 2 +- data/maps/BattleFrontier_Lounge8/header.inc | 2 +- data/maps/BattleFrontier_Lounge9/header.inc | 2 +- data/maps/BattleFrontier_Mart/header.inc | 2 +- data/maps/BattleFrontier_OutsideEast/header.inc | 2 +- data/maps/BattleFrontier_OutsideWest/header.inc | 2 +- data/maps/BattleFrontier_PokemonCenter_1F/header.inc | 2 +- data/maps/BattleFrontier_PokemonCenter_2F/header.inc | 2 +- data/maps/BattleFrontier_RankingHall/header.inc | 2 +- data/maps/BattleFrontier_ReceptionGate/header.inc | 2 +- data/maps/BattleFrontier_ScottsHouse/header.inc | 2 +- data/maps/BattlePyramidSquare01/header.inc | 2 +- data/maps/BattlePyramidSquare02/header.inc | 2 +- data/maps/BattlePyramidSquare03/header.inc | 2 +- data/maps/BattlePyramidSquare04/header.inc | 2 +- data/maps/BattlePyramidSquare05/header.inc | 2 +- data/maps/BattlePyramidSquare06/header.inc | 2 +- data/maps/BattlePyramidSquare07/header.inc | 2 +- data/maps/BattlePyramidSquare08/header.inc | 2 +- data/maps/BattlePyramidSquare09/header.inc | 2 +- data/maps/BattlePyramidSquare10/header.inc | 2 +- data/maps/BattlePyramidSquare11/header.inc | 2 +- data/maps/BattlePyramidSquare12/header.inc | 2 +- data/maps/BattlePyramidSquare13/header.inc | 2 +- data/maps/BattlePyramidSquare14/header.inc | 2 +- data/maps/BattlePyramidSquare15/header.inc | 2 +- data/maps/BattlePyramidSquare16/header.inc | 2 +- data/maps/BirthIsland_Exterior/header.inc | 2 +- data/maps/BirthIsland_Harbor/header.inc | 2 +- data/maps/CaveOfOrigin_1F/header.inc | 2 +- data/maps/CaveOfOrigin_B1F/header.inc | 2 +- data/maps/CaveOfOrigin_Entrance/header.inc | 2 +- data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc | 2 +- data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc | 2 +- data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc | 2 +- data/maps/DesertRuins/header.inc | 2 +- data/maps/DesertUnderpass/header.inc | 2 +- data/maps/DewfordTown/header.inc | 2 +- data/maps/DewfordTown_Gym/header.inc | 2 +- data/maps/DewfordTown_Hall/header.inc | 2 +- data/maps/DewfordTown_House1/header.inc | 2 +- data/maps/DewfordTown_House2/header.inc | 2 +- data/maps/DewfordTown_PokemonCenter_1F/header.inc | 2 +- data/maps/DewfordTown_PokemonCenter_2F/header.inc | 2 +- data/maps/DoubleBattleColosseum/header.inc | 2 +- data/maps/EverGrandeCity/header.inc | 2 +- data/maps/EverGrandeCity_ChampionsRoom/header.inc | 2 +- data/maps/EverGrandeCity_DrakesRoom/header.inc | 2 +- data/maps/EverGrandeCity_GlaciasRoom/header.inc | 2 +- data/maps/EverGrandeCity_Hall1/header.inc | 2 +- data/maps/EverGrandeCity_Hall2/header.inc | 2 +- data/maps/EverGrandeCity_Hall3/header.inc | 2 +- data/maps/EverGrandeCity_Hall4/header.inc | 2 +- data/maps/EverGrandeCity_Hall5/header.inc | 2 +- data/maps/EverGrandeCity_HallOfFame/header.inc | 2 +- data/maps/EverGrandeCity_PhoebesRoom/header.inc | 2 +- data/maps/EverGrandeCity_PokemonCenter_1F/header.inc | 2 +- data/maps/EverGrandeCity_PokemonCenter_2F/header.inc | 2 +- data/maps/EverGrandeCity_PokemonLeague_1F/header.inc | 2 +- data/maps/EverGrandeCity_PokemonLeague_2F/header.inc | 2 +- data/maps/EverGrandeCity_SidneysRoom/header.inc | 2 +- data/maps/FallarborTown/header.inc | 2 +- data/maps/FallarborTown_BattleTentBattleRoom/header.inc | 2 +- data/maps/FallarborTown_BattleTentCorridor/header.inc | 2 +- data/maps/FallarborTown_BattleTentLobby/header.inc | 2 +- data/maps/FallarborTown_House1/header.inc | 2 +- data/maps/FallarborTown_House2/header.inc | 2 +- data/maps/FallarborTown_Mart/header.inc | 2 +- data/maps/FallarborTown_PokemonCenter_1F/header.inc | 2 +- data/maps/FallarborTown_PokemonCenter_2F/header.inc | 2 +- data/maps/FarawayIsland_Entrance/header.inc | 2 +- data/maps/FarawayIsland_Interior/header.inc | 2 +- data/maps/FieryPath/header.inc | 2 +- data/maps/FortreeCity/header.inc | 2 +- data/maps/FortreeCity_DecorationShop/header.inc | 2 +- data/maps/FortreeCity_Gym/header.inc | 2 +- data/maps/FortreeCity_House1/header.inc | 2 +- data/maps/FortreeCity_House2/header.inc | 2 +- data/maps/FortreeCity_House3/header.inc | 2 +- data/maps/FortreeCity_House4/header.inc | 2 +- data/maps/FortreeCity_House5/header.inc | 2 +- data/maps/FortreeCity_Mart/header.inc | 2 +- data/maps/FortreeCity_PokemonCenter_1F/header.inc | 2 +- data/maps/FortreeCity_PokemonCenter_2F/header.inc | 2 +- data/maps/GraniteCave_1F/header.inc | 2 +- data/maps/GraniteCave_B1F/header.inc | 2 +- data/maps/GraniteCave_B2F/header.inc | 2 +- data/maps/GraniteCave_StevensRoom/header.inc | 2 +- data/maps/InsideOfTruck/header.inc | 2 +- data/maps/IslandCave/header.inc | 2 +- data/maps/JaggedPass/header.inc | 2 +- data/maps/LavaridgeTown/header.inc | 2 +- data/maps/LavaridgeTown_Gym_1F/header.inc | 2 +- data/maps/LavaridgeTown_Gym_B1F/header.inc | 2 +- data/maps/LavaridgeTown_HerbShop/header.inc | 2 +- data/maps/LavaridgeTown_House/header.inc | 2 +- data/maps/LavaridgeTown_Mart/header.inc | 2 +- data/maps/LavaridgeTown_PokemonCenter_1F/header.inc | 2 +- data/maps/LavaridgeTown_PokemonCenter_2F/header.inc | 2 +- data/maps/LilycoveCity/header.inc | 2 +- data/maps/LilycoveCity_ContestHall/header.inc | 2 +- data/maps/LilycoveCity_ContestLobby/header.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStoreElevator/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_1F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_2F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_3F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_4F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_5F/header.inc | 2 +- data/maps/LilycoveCity_Harbor/header.inc | 2 +- data/maps/LilycoveCity_House1/header.inc | 2 +- data/maps/LilycoveCity_House2/header.inc | 2 +- data/maps/LilycoveCity_House3/header.inc | 2 +- data/maps/LilycoveCity_House4/header.inc | 2 +- data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc | 2 +- data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc | 2 +- data/maps/LilycoveCity_MoveDeletersHouse/header.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_1F/header.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_2F/header.inc | 2 +- data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc | 2 +- data/maps/LilycoveCity_UnusedMart/header.inc | 2 +- data/maps/LinkContestRoom1/header.inc | 2 +- data/maps/LinkContestRoom2/header.inc | 2 +- data/maps/LinkContestRoom3/header.inc | 2 +- data/maps/LinkContestRoom4/header.inc | 2 +- data/maps/LinkContestRoom5/header.inc | 2 +- data/maps/LinkContestRoom6/header.inc | 2 +- data/maps/LittlerootTown/header.inc | 2 +- data/maps/LittlerootTown_BrendansHouse_1F/header.inc | 2 +- data/maps/LittlerootTown_BrendansHouse_2F/header.inc | 2 +- data/maps/LittlerootTown_MaysHouse_1F/header.inc | 2 +- data/maps/LittlerootTown_MaysHouse_2F/header.inc | 2 +- data/maps/LittlerootTown_ProfessorBirchsLab/header.inc | 2 +- data/maps/MagmaHideout_1F/header.inc | 2 +- data/maps/MagmaHideout_2F_1R/header.inc | 2 +- data/maps/MagmaHideout_2F_2R/header.inc | 2 +- data/maps/MagmaHideout_2F_3R/header.inc | 2 +- data/maps/MagmaHideout_3F_1R/header.inc | 2 +- data/maps/MagmaHideout_3F_2R/header.inc | 2 +- data/maps/MagmaHideout_3F_3R/header.inc | 2 +- data/maps/MagmaHideout_4F/header.inc | 2 +- data/maps/MarineCave_End/header.inc | 2 +- data/maps/MarineCave_Entrance/header.inc | 2 +- data/maps/MauvilleCity/header.inc | 2 +- data/maps/MauvilleCity_BikeShop/header.inc | 2 +- data/maps/MauvilleCity_GameCorner/header.inc | 2 +- data/maps/MauvilleCity_Gym/header.inc | 2 +- data/maps/MauvilleCity_House1/header.inc | 2 +- data/maps/MauvilleCity_House2/header.inc | 2 +- data/maps/MauvilleCity_Mart/header.inc | 2 +- data/maps/MauvilleCity_PokemonCenter_1F/header.inc | 2 +- data/maps/MauvilleCity_PokemonCenter_2F/header.inc | 2 +- data/maps/MeteorFalls_1F_1R/header.inc | 2 +- data/maps/MeteorFalls_1F_2R/header.inc | 2 +- data/maps/MeteorFalls_B1F_1R/header.inc | 2 +- data/maps/MeteorFalls_B1F_2R/header.inc | 2 +- data/maps/MeteorFalls_StevensCave/header.inc | 2 +- data/maps/MirageTower_1F/header.inc | 2 +- data/maps/MirageTower_2F/header.inc | 2 +- data/maps/MirageTower_3F/header.inc | 2 +- data/maps/MirageTower_4F/header.inc | 2 +- data/maps/MossdeepCity/header.inc | 2 +- data/maps/MossdeepCity_GameCorner_1F/header.inc | 2 +- data/maps/MossdeepCity_GameCorner_B1F/header.inc | 2 +- data/maps/MossdeepCity_Gym/header.inc | 2 +- data/maps/MossdeepCity_House1/header.inc | 2 +- data/maps/MossdeepCity_House2/header.inc | 2 +- data/maps/MossdeepCity_House3/header.inc | 2 +- data/maps/MossdeepCity_House4/header.inc | 2 +- data/maps/MossdeepCity_Mart/header.inc | 2 +- data/maps/MossdeepCity_PokemonCenter_1F/header.inc | 2 +- data/maps/MossdeepCity_PokemonCenter_2F/header.inc | 2 +- data/maps/MossdeepCity_SpaceCenter_1F/header.inc | 2 +- data/maps/MossdeepCity_SpaceCenter_2F/header.inc | 2 +- data/maps/MossdeepCity_StevensHouse/header.inc | 2 +- data/maps/MtChimney/header.inc | 2 +- data/maps/MtChimney_CableCarStation/header.inc | 2 +- data/maps/MtPyre_1F/header.inc | 2 +- data/maps/MtPyre_2F/header.inc | 2 +- data/maps/MtPyre_3F/header.inc | 2 +- data/maps/MtPyre_4F/header.inc | 2 +- data/maps/MtPyre_5F/header.inc | 2 +- data/maps/MtPyre_6F/header.inc | 2 +- data/maps/MtPyre_Exterior/header.inc | 2 +- data/maps/MtPyre_Summit/header.inc | 2 +- data/maps/NavelRock_B1F/header.inc | 2 +- data/maps/NavelRock_Bottom/header.inc | 2 +- data/maps/NavelRock_Down01/header.inc | 2 +- data/maps/NavelRock_Down02/header.inc | 2 +- data/maps/NavelRock_Down03/header.inc | 2 +- data/maps/NavelRock_Down04/header.inc | 2 +- data/maps/NavelRock_Down05/header.inc | 2 +- data/maps/NavelRock_Down06/header.inc | 2 +- data/maps/NavelRock_Down07/header.inc | 2 +- data/maps/NavelRock_Down08/header.inc | 2 +- data/maps/NavelRock_Down09/header.inc | 2 +- data/maps/NavelRock_Down10/header.inc | 2 +- data/maps/NavelRock_Down11/header.inc | 2 +- data/maps/NavelRock_Entrance/header.inc | 2 +- data/maps/NavelRock_Exterior/header.inc | 2 +- data/maps/NavelRock_Fork/header.inc | 2 +- data/maps/NavelRock_Harbor/header.inc | 2 +- data/maps/NavelRock_Top/header.inc | 2 +- data/maps/NavelRock_Up1/header.inc | 2 +- data/maps/NavelRock_Up2/header.inc | 2 +- data/maps/NavelRock_Up3/header.inc | 2 +- data/maps/NavelRock_Up4/header.inc | 2 +- data/maps/NewMauville_Entrance/header.inc | 2 +- data/maps/NewMauville_Inside/header.inc | 2 +- data/maps/OldaleTown/header.inc | 2 +- data/maps/OldaleTown_House1/header.inc | 2 +- data/maps/OldaleTown_House2/header.inc | 2 +- data/maps/OldaleTown_Mart/header.inc | 2 +- data/maps/OldaleTown_PokemonCenter_1F/header.inc | 2 +- data/maps/OldaleTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PacifidlogTown/header.inc | 2 +- data/maps/PacifidlogTown_House1/header.inc | 2 +- data/maps/PacifidlogTown_House2/header.inc | 2 +- data/maps/PacifidlogTown_House3/header.inc | 2 +- data/maps/PacifidlogTown_House4/header.inc | 2 +- data/maps/PacifidlogTown_House5/header.inc | 2 +- data/maps/PacifidlogTown_PokemonCenter_1F/header.inc | 2 +- data/maps/PacifidlogTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PetalburgCity/header.inc | 2 +- data/maps/PetalburgCity_Gym/header.inc | 2 +- data/maps/PetalburgCity_House1/header.inc | 2 +- data/maps/PetalburgCity_House2/header.inc | 2 +- data/maps/PetalburgCity_Mart/header.inc | 2 +- data/maps/PetalburgCity_PokemonCenter_1F/header.inc | 2 +- data/maps/PetalburgCity_PokemonCenter_2F/header.inc | 2 +- data/maps/PetalburgCity_WallysHouse/header.inc | 2 +- data/maps/PetalburgWoods/header.inc | 2 +- data/maps/RecordCorner/header.inc | 2 +- data/maps/Route101/header.inc | 2 +- data/maps/Route102/header.inc | 2 +- data/maps/Route103/header.inc | 2 +- data/maps/Route104/header.inc | 2 +- data/maps/Route104_MrBrineysHouse/header.inc | 2 +- data/maps/Route104_PrettyPetalFlowerShop/header.inc | 2 +- data/maps/Route104_Prototype/header.inc | 2 +- data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc | 2 +- data/maps/Route105/header.inc | 2 +- data/maps/Route106/header.inc | 2 +- data/maps/Route107/header.inc | 2 +- data/maps/Route108/header.inc | 2 +- data/maps/Route109/header.inc | 2 +- data/maps/Route109_SeashoreHouse/header.inc | 2 +- data/maps/Route110/header.inc | 2 +- data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc | 2 +- data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc | 2 +- data/maps/Route110_TrickHouseCorridor/header.inc | 2 +- data/maps/Route110_TrickHouseEnd/header.inc | 2 +- data/maps/Route110_TrickHouseEntrance/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle1/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle2/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle3/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle4/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle5/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle6/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle7/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle8/header.inc | 2 +- data/maps/Route111/header.inc | 2 +- data/maps/Route111_OldLadysRestStop/header.inc | 2 +- data/maps/Route111_WinstrateFamilysHouse/header.inc | 2 +- data/maps/Route112/header.inc | 2 +- data/maps/Route112_CableCarStation/header.inc | 2 +- data/maps/Route113/header.inc | 2 +- data/maps/Route113_GlassWorkshop/header.inc | 2 +- data/maps/Route114/header.inc | 2 +- data/maps/Route114_FossilManiacsHouse/header.inc | 2 +- data/maps/Route114_FossilManiacsTunnel/header.inc | 2 +- data/maps/Route114_LanettesHouse/header.inc | 2 +- data/maps/Route115/header.inc | 2 +- data/maps/Route116/header.inc | 2 +- data/maps/Route116_TunnelersRestHouse/header.inc | 2 +- data/maps/Route117/header.inc | 2 +- data/maps/Route117_PokemonDayCare/header.inc | 2 +- data/maps/Route118/header.inc | 2 +- data/maps/Route119/header.inc | 2 +- data/maps/Route119_House/header.inc | 2 +- data/maps/Route119_WeatherInstitute_1F/header.inc | 2 +- data/maps/Route119_WeatherInstitute_2F/header.inc | 2 +- data/maps/Route120/header.inc | 2 +- data/maps/Route121/header.inc | 2 +- data/maps/Route121_SafariZoneEntrance/header.inc | 2 +- data/maps/Route122/header.inc | 2 +- data/maps/Route123/header.inc | 2 +- data/maps/Route123_BerryMastersHouse/header.inc | 2 +- data/maps/Route124/header.inc | 2 +- data/maps/Route124_DivingTreasureHuntersHouse/header.inc | 2 +- data/maps/Route125/header.inc | 2 +- data/maps/Route126/header.inc | 2 +- data/maps/Route127/header.inc | 2 +- data/maps/Route128/header.inc | 2 +- data/maps/Route129/header.inc | 2 +- data/maps/Route130/header.inc | 2 +- data/maps/Route131/header.inc | 2 +- data/maps/Route132/header.inc | 2 +- data/maps/Route133/header.inc | 2 +- data/maps/Route134/header.inc | 2 +- data/maps/RustboroCity/header.inc | 2 +- data/maps/RustboroCity_CuttersHouse/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_1F/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_2F/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_3F/header.inc | 2 +- data/maps/RustboroCity_Flat1_1F/header.inc | 2 +- data/maps/RustboroCity_Flat1_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_1F/header.inc | 2 +- data/maps/RustboroCity_Flat2_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_3F/header.inc | 2 +- data/maps/RustboroCity_Gym/header.inc | 2 +- data/maps/RustboroCity_House1/header.inc | 2 +- data/maps/RustboroCity_House2/header.inc | 2 +- data/maps/RustboroCity_House3/header.inc | 2 +- data/maps/RustboroCity_Mart/header.inc | 2 +- data/maps/RustboroCity_PokemonCenter_1F/header.inc | 2 +- data/maps/RustboroCity_PokemonCenter_2F/header.inc | 2 +- data/maps/RustboroCity_PokemonSchool/header.inc | 2 +- data/maps/RusturfTunnel/header.inc | 2 +- data/maps/SSTidalCorridor/header.inc | 2 +- data/maps/SSTidalLowerDeck/header.inc | 2 +- data/maps/SSTidalRooms/header.inc | 2 +- data/maps/SafariZone_North/header.inc | 2 +- data/maps/SafariZone_Northeast/header.inc | 2 +- data/maps/SafariZone_Northwest/header.inc | 2 +- data/maps/SafariZone_RestHouse/header.inc | 2 +- data/maps/SafariZone_South/header.inc | 2 +- data/maps/SafariZone_Southeast/header.inc | 2 +- data/maps/SafariZone_Southwest/header.inc | 2 +- data/maps/ScorchedSlab/header.inc | 2 +- data/maps/SeafloorCavern_Entrance/header.inc | 2 +- data/maps/SeafloorCavern_Room1/header.inc | 2 +- data/maps/SeafloorCavern_Room2/header.inc | 2 +- data/maps/SeafloorCavern_Room3/header.inc | 2 +- data/maps/SeafloorCavern_Room4/header.inc | 2 +- data/maps/SeafloorCavern_Room5/header.inc | 2 +- data/maps/SeafloorCavern_Room6/header.inc | 2 +- data/maps/SeafloorCavern_Room7/header.inc | 2 +- data/maps/SeafloorCavern_Room8/header.inc | 2 +- data/maps/SeafloorCavern_Room9/header.inc | 2 +- data/maps/SealedChamber_InnerRoom/header.inc | 2 +- data/maps/SealedChamber_OuterRoom/header.inc | 2 +- data/maps/SecretBase_BlueCave1/header.inc | 2 +- data/maps/SecretBase_BlueCave2/header.inc | 2 +- data/maps/SecretBase_BlueCave3/header.inc | 2 +- data/maps/SecretBase_BlueCave4/header.inc | 2 +- data/maps/SecretBase_BrownCave1/header.inc | 2 +- data/maps/SecretBase_BrownCave2/header.inc | 2 +- data/maps/SecretBase_BrownCave3/header.inc | 2 +- data/maps/SecretBase_BrownCave4/header.inc | 2 +- data/maps/SecretBase_RedCave1/header.inc | 2 +- data/maps/SecretBase_RedCave2/header.inc | 2 +- data/maps/SecretBase_RedCave3/header.inc | 2 +- data/maps/SecretBase_RedCave4/header.inc | 2 +- data/maps/SecretBase_Shrub1/header.inc | 2 +- data/maps/SecretBase_Shrub2/header.inc | 2 +- data/maps/SecretBase_Shrub3/header.inc | 2 +- data/maps/SecretBase_Shrub4/header.inc | 2 +- data/maps/SecretBase_Tree1/header.inc | 2 +- data/maps/SecretBase_Tree2/header.inc | 2 +- data/maps/SecretBase_Tree3/header.inc | 2 +- data/maps/SecretBase_Tree4/header.inc | 2 +- data/maps/SecretBase_YellowCave1/header.inc | 2 +- data/maps/SecretBase_YellowCave2/header.inc | 2 +- data/maps/SecretBase_YellowCave3/header.inc | 2 +- data/maps/SecretBase_YellowCave4/header.inc | 2 +- data/maps/ShoalCave_HighTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_HighTideInnerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideIceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideInnerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideLowerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideStairsRoom/header.inc | 2 +- data/maps/SingleBattleColosseum/header.inc | 2 +- data/maps/SkyPillar_1F/header.inc | 2 +- data/maps/SkyPillar_2F/header.inc | 2 +- data/maps/SkyPillar_3F/header.inc | 2 +- data/maps/SkyPillar_4F/header.inc | 2 +- data/maps/SkyPillar_5F/header.inc | 2 +- data/maps/SkyPillar_Entrance/header.inc | 2 +- data/maps/SkyPillar_Outside/header.inc | 2 +- data/maps/SkyPillar_Top/header.inc | 2 +- data/maps/SlateportCity/header.inc | 2 +- data/maps/SlateportCity_BattleTentBattleRoom/header.inc | 2 +- data/maps/SlateportCity_BattleTentCorridor/header.inc | 2 +- data/maps/SlateportCity_BattleTentLobby/header.inc | 2 +- data/maps/SlateportCity_Harbor/header.inc | 2 +- data/maps/SlateportCity_House1/header.inc | 2 +- data/maps/SlateportCity_House2/header.inc | 2 +- data/maps/SlateportCity_Mart/header.inc | 2 +- data/maps/SlateportCity_OceanicMuseum_1F/header.inc | 2 +- data/maps/SlateportCity_OceanicMuseum_2F/header.inc | 2 +- data/maps/SlateportCity_PokemonCenter_1F/header.inc | 2 +- data/maps/SlateportCity_PokemonCenter_2F/header.inc | 2 +- data/maps/SlateportCity_PokemonFanClub/header.inc | 2 +- data/maps/SlateportCity_SternsShipyard_1F/header.inc | 2 +- data/maps/SlateportCity_SternsShipyard_2F/header.inc | 2 +- data/maps/SootopolisCity/header.inc | 2 +- data/maps/SootopolisCity_Gym_1F/header.inc | 2 +- data/maps/SootopolisCity_Gym_B1F/header.inc | 2 +- data/maps/SootopolisCity_House1/header.inc | 2 +- data/maps/SootopolisCity_House2/header.inc | 2 +- data/maps/SootopolisCity_House3/header.inc | 2 +- data/maps/SootopolisCity_House4/header.inc | 2 +- data/maps/SootopolisCity_House5/header.inc | 2 +- data/maps/SootopolisCity_House6/header.inc | 2 +- data/maps/SootopolisCity_House7/header.inc | 2 +- data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc | 2 +- data/maps/SootopolisCity_Mart/header.inc | 2 +- data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc | 2 +- data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc | 2 +- data/maps/SootopolisCity_PokemonCenter_1F/header.inc | 2 +- data/maps/SootopolisCity_PokemonCenter_2F/header.inc | 2 +- data/maps/SouthernIsland_Exterior/header.inc | 2 +- data/maps/SouthernIsland_Interior/header.inc | 2 +- data/maps/TerraCave_End/header.inc | 2 +- data/maps/TerraCave_Entrance/header.inc | 2 +- data/maps/TradeCenter/header.inc | 2 +- data/maps/TrainerHill_1F/header.inc | 2 +- data/maps/TrainerHill_2F/header.inc | 2 +- data/maps/TrainerHill_3F/header.inc | 2 +- data/maps/TrainerHill_4F/header.inc | 2 +- data/maps/TrainerHill_Elevator/header.inc | 2 +- data/maps/TrainerHill_Entrance/header.inc | 2 +- data/maps/TrainerHill_Roof/header.inc | 2 +- data/maps/Underwater1/header.inc | 2 +- data/maps/Underwater2/header.inc | 2 +- data/maps/Underwater3/header.inc | 2 +- data/maps/Underwater4/header.inc | 2 +- data/maps/Underwater5/header.inc | 2 +- data/maps/Underwater6/header.inc | 2 +- data/maps/Underwater7/header.inc | 2 +- data/maps/Underwater_MarineCave/header.inc | 2 +- data/maps/Underwater_Route134/header.inc | 2 +- data/maps/Underwater_SeafloorCavern/header.inc | 2 +- data/maps/Underwater_SealedChamber/header.inc | 2 +- data/maps/Underwater_SootopolisCity/header.inc | 2 +- data/maps/UnionRoom/header.inc | 2 +- data/maps/UnknownMap_25_29/header.inc | 2 +- data/maps/UnknownMap_25_30/header.inc | 2 +- data/maps/UnknownMap_25_31/header.inc | 2 +- data/maps/UnknownMap_25_32/header.inc | 2 +- data/maps/UnknownMap_25_33/header.inc | 2 +- data/maps/UnknownMap_25_34/header.inc | 2 +- data/maps/VerdanturfTown/header.inc | 2 +- data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc | 2 +- data/maps/VerdanturfTown_BattleTentCorridor/header.inc | 2 +- data/maps/VerdanturfTown_BattleTentLobby/header.inc | 2 +- data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc | 2 +- data/maps/VerdanturfTown_House/header.inc | 2 +- data/maps/VerdanturfTown_Mart/header.inc | 2 +- data/maps/VerdanturfTown_PokemonCenter_1F/header.inc | 2 +- data/maps/VerdanturfTown_PokemonCenter_2F/header.inc | 2 +- data/maps/VerdanturfTown_WandasHouse/header.inc | 2 +- data/maps/VictoryRoad_1F/header.inc | 2 +- data/maps/VictoryRoad_B1F/header.inc | 2 +- data/maps/VictoryRoad_B2F/header.inc | 2 +- 518 files changed, 518 insertions(+), 518 deletions(-) diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc index 53c7196e10..21573c079d 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc @@ -11,5 +11,5 @@ AbandonedShip_CaptainsOffice: @ 84845A4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc index 75347beab0..0ffb5d1f70 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_1F/header.inc @@ -11,5 +11,5 @@ AbandonedShip_Corridors_1F: @ 84844C4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc index 91ea7b76d8..5e4eb1dd68 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc @@ -11,5 +11,5 @@ AbandonedShip_Corridors_B1F: @ 84844FC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc index 4197ef0c0a..a9f8945d9b 100644 --- a/data/maps/AbandonedShip_Deck/header.inc +++ b/data/maps/AbandonedShip_Deck/header.inc @@ -11,5 +11,5 @@ AbandonedShip_Deck: @ 84844A8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc index b075158dd6..6645c9d960 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc @@ -11,5 +11,5 @@ AbandonedShip_HiddenFloorCorridors: @ 84845DC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc index dc18c55af3..5cc5bf0adc 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc @@ -11,5 +11,5 @@ AbandonedShip_HiddenFloorRooms: @ 84845F8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 7 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc index ce93934624..4e6212d017 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ b/data/maps/AbandonedShip_Room_B1F/header.inc @@ -11,5 +11,5 @@ AbandonedShip_Room_B1F: @ 848456C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc index 338e9a37af..8e004365e3 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc @@ -11,5 +11,5 @@ AbandonedShip_Rooms2_1F: @ 8484588 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc index 5482655a86..2f64a63151 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc @@ -11,5 +11,5 @@ AbandonedShip_Rooms2_B1F: @ 8484534 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc index 7cbf2f30f6..9ee2f40bc4 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_1F/header.inc @@ -11,5 +11,5 @@ AbandonedShip_Rooms_1F: @ 84844E0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc index d75870116a..d6f656e3bc 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc @@ -11,5 +11,5 @@ AbandonedShip_Rooms_B1F: @ 8484518 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc index ce2267768d..82fbdc0e94 100644 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ b/data/maps/AbandonedShip_Underwater1/header.inc @@ -11,5 +11,5 @@ AbandonedShip_Underwater1: @ 8484550 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc index afb2287a7c..c26d65df02 100644 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ b/data/maps/AbandonedShip_Underwater2/header.inc @@ -11,5 +11,5 @@ AbandonedShip_Underwater2: @ 84845C0 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AlteringCave/header.inc b/data/maps/AlteringCave/header.inc index 3abc6981fd..4796b37ff4 100644 --- a/data/maps/AlteringCave/header.inc +++ b/data/maps/AlteringCave/header.inc @@ -11,5 +11,5 @@ AlteringCave: @ 8484A58 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc index c1e109537c..a314ad3baa 100644 --- a/data/maps/AncientTomb/header.inc +++ b/data/maps/AncientTomb/header.inc @@ -11,5 +11,5 @@ AncientTomb: @ 8484630 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc index 1b5dd0498c..c632eb2048 100644 --- a/data/maps/AquaHideout_1F/header.inc +++ b/data/maps/AquaHideout_1F/header.inc @@ -11,5 +11,5 @@ AquaHideout_1F: @ 8484144 .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 - .byte 3 + .byte MAP_BATTLE_SCENE_AQUA diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc index 14bf999a66..ba017fb565 100644 --- a/data/maps/AquaHideout_B1F/header.inc +++ b/data/maps/AquaHideout_B1F/header.inc @@ -11,5 +11,5 @@ AquaHideout_B1F: @ 8484160 .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 - .byte 3 + .byte MAP_BATTLE_SCENE_AQUA diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc index 9a096ac9b5..ea15240b9d 100644 --- a/data/maps/AquaHideout_B2F/header.inc +++ b/data/maps/AquaHideout_B2F/header.inc @@ -11,5 +11,5 @@ AquaHideout_B2F: @ 848417C .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 - .byte 3 + .byte MAP_BATTLE_SCENE_AQUA diff --git a/data/maps/AquaHideout_UnusedRubyMap1/header.inc b/data/maps/AquaHideout_UnusedRubyMap1/header.inc index 07dc3be28c..455941160d 100644 --- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap1/header.inc @@ -11,5 +11,5 @@ AquaHideout_UnusedRubyMap1: @ 84846D8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 2 + .byte MAP_BATTLE_SCENE_MAGMA diff --git a/data/maps/AquaHideout_UnusedRubyMap2/header.inc b/data/maps/AquaHideout_UnusedRubyMap2/header.inc index 4b50fff532..b4e2e712e4 100644 --- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap2/header.inc @@ -11,5 +11,5 @@ AquaHideout_UnusedRubyMap2: @ 84846F4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 2 + .byte MAP_BATTLE_SCENE_MAGMA diff --git a/data/maps/AquaHideout_UnusedRubyMap3/header.inc b/data/maps/AquaHideout_UnusedRubyMap3/header.inc index 1b0a82f3ae..7abe192b68 100644 --- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap3/header.inc @@ -11,5 +11,5 @@ AquaHideout_UnusedRubyMap3: @ 8484710 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 2 + .byte MAP_BATTLE_SCENE_MAGMA diff --git a/data/maps/ArtisanCave_1F/header.inc b/data/maps/ArtisanCave_1F/header.inc index 493cf5c7cd..a69128ee78 100644 --- a/data/maps/ArtisanCave_1F/header.inc +++ b/data/maps/ArtisanCave_1F/header.inc @@ -11,5 +11,5 @@ ArtisanCave_1F: @ 84849B0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ArtisanCave_B1F/header.inc b/data/maps/ArtisanCave_B1F/header.inc index 3f7bd293a6..aba179fc64 100644 --- a/data/maps/ArtisanCave_B1F/header.inc +++ b/data/maps/ArtisanCave_B1F/header.inc @@ -11,5 +11,5 @@ ArtisanCave_B1F: @ 8484994 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc index 60b61c3cd0..8332c42360 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleArenaBattleRoom: @ 8485484 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc index 4519b0de20..2ed587f6eb 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleArenaCorridor: @ 8485468 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleArenaLobby/header.inc b/data/maps/BattleFrontier_BattleArenaLobby/header.inc index cf75d18c93..5c02e0c8a5 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleArenaLobby: @ 848544C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc index 5c6c65fb94..3f1eb25b20 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleDomeBattleRoom: @ 8485388 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc index ed349c8d72..940ba24e6e 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleDomeCorridor: @ 8485350 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleDomeLobby/header.inc b/data/maps/BattleFrontier_BattleDomeLobby/header.inc index 8866c02639..5d1a7eb82f 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleDomeLobby: @ 8485334 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc index 99986cc7c4..e35435b275 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleDomePreBattleRoom: @ 848536C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc index d9896fd35f..cef72bc09a 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleFactoryBattleRoom: @ 84854D8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc index 511a09c340..d56a2a23d5 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleFactoryLobby: @ 84854A0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc index 539ca0e3fd..3dc5d23cce 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc index e4b5517407..d63d3b2682 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattlePalaceBattleRoom: @ 84853DC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc index 73e7dc952d..ff8af8ca85 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattlePalaceCorridor: @ 84853C0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc index 975ed46662..060013cce1 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattlePalaceLobby: @ 84853A4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc index c3b4f41b88..574d0cbab0 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattlePikeCorridor: @ 8485510 .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePikeLobby/header.inc b/data/maps/BattleFrontier_BattlePikeLobby/header.inc index d05767d81e..239c317211 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattlePikeLobby: @ 84854F4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc index 544bb93d4f..dcb088c272 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattlePikeRandomRoom1: @ 8485548 .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc index de239780e3..1ee69c0778 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattlePikeRandomRoom2: @ 8485564 .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc index 3d7ce40b95..68ca305469 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattlePikeRandomRoom3: @ 8485580 .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc index 9c6d367d35..5e0afedb5f 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattlePikeThreePathRoom: @ 848552C .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc index 3718fd37c1..ccaa1cbca6 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc index 239a543b0a..a92f009dd0 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattlePyramidEmptySquare: @ 8485414 .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc index a64b371790..6da3143043 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 diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc index 9b46bf7f77..28de39cad9 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattlePyramidTop: @ 8485430 .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc index aef5c1ea1f..797022beb4 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleTowerBattleRoom: @ 848521C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc index 539bec694c..90ae26c25e 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleTowerBattleRoom2: @ 8485318 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc index b5430947f6..bd2d38b378 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleTowerCorridor: @ 8485200 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc index 074e02cc2d..94e46b1968 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleTowerCorridor2: @ 84852FC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleTowerElevator/header.inc b/data/maps/BattleFrontier_BattleTowerElevator/header.inc index f46a0f1c67..fa1e08fafa 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/header.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleTowerElevator: @ 84851E4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleTowerLobby/header.inc b/data/maps/BattleFrontier_BattleTowerLobby/header.inc index 9820be7ae1..e16e2a7003 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/header.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleTowerLobby: @ 84851C8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc index 01c9169ee2..727322b941 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Lounge1/header.inc b/data/maps/BattleFrontier_Lounge1/header.inc index e8c45b3ecb..a4cf64a781 100644 --- a/data/maps/BattleFrontier_Lounge1/header.inc +++ b/data/maps/BattleFrontier_Lounge1/header.inc @@ -11,5 +11,5 @@ BattleFrontier_Lounge1: @ 84855B8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Lounge2/header.inc b/data/maps/BattleFrontier_Lounge2/header.inc index 8858adccec..c363d54bf9 100644 --- a/data/maps/BattleFrontier_Lounge2/header.inc +++ b/data/maps/BattleFrontier_Lounge2/header.inc @@ -11,5 +11,5 @@ BattleFrontier_Lounge2: @ 84855F0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Lounge3/header.inc b/data/maps/BattleFrontier_Lounge3/header.inc index 430161a6fc..e5649a3695 100644 --- a/data/maps/BattleFrontier_Lounge3/header.inc +++ b/data/maps/BattleFrontier_Lounge3/header.inc @@ -11,5 +11,5 @@ BattleFrontier_Lounge3: @ 848560C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Lounge4/header.inc b/data/maps/BattleFrontier_Lounge4/header.inc index b2d44e55e6..a9da9677cf 100644 --- a/data/maps/BattleFrontier_Lounge4/header.inc +++ b/data/maps/BattleFrontier_Lounge4/header.inc @@ -11,5 +11,5 @@ BattleFrontier_Lounge4: @ 8485628 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Lounge5/header.inc b/data/maps/BattleFrontier_Lounge5/header.inc index 231ce3b884..7f1142f2d0 100644 --- a/data/maps/BattleFrontier_Lounge5/header.inc +++ b/data/maps/BattleFrontier_Lounge5/header.inc @@ -11,5 +11,5 @@ BattleFrontier_Lounge5: @ 8485660 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Lounge6/header.inc b/data/maps/BattleFrontier_Lounge6/header.inc index b4a9c780b3..e07dd297f6 100644 --- a/data/maps/BattleFrontier_Lounge6/header.inc +++ b/data/maps/BattleFrontier_Lounge6/header.inc @@ -11,5 +11,5 @@ BattleFrontier_Lounge6: @ 848567C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Lounge7/header.inc b/data/maps/BattleFrontier_Lounge7/header.inc index 9cea5c401e..22797d04e4 100644 --- a/data/maps/BattleFrontier_Lounge7/header.inc +++ b/data/maps/BattleFrontier_Lounge7/header.inc @@ -11,5 +11,5 @@ BattleFrontier_Lounge7: @ 8485698 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Lounge8/header.inc b/data/maps/BattleFrontier_Lounge8/header.inc index 60fb1edd2d..5494c964fd 100644 --- a/data/maps/BattleFrontier_Lounge8/header.inc +++ b/data/maps/BattleFrontier_Lounge8/header.inc @@ -11,5 +11,5 @@ BattleFrontier_Lounge8: @ 84856D0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Lounge9/header.inc b/data/maps/BattleFrontier_Lounge9/header.inc index 952b6aa268..5248720c75 100644 --- a/data/maps/BattleFrontier_Lounge9/header.inc +++ b/data/maps/BattleFrontier_Lounge9/header.inc @@ -11,5 +11,5 @@ BattleFrontier_Lounge9: @ 84856EC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Mart/header.inc b/data/maps/BattleFrontier_Mart/header.inc index 2d8befefd3..4b3e7f79ad 100644 --- a/data/maps/BattleFrontier_Mart/header.inc +++ b/data/maps/BattleFrontier_Mart/header.inc @@ -11,5 +11,5 @@ BattleFrontier_Mart: @ 8485740 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_OutsideEast/header.inc b/data/maps/BattleFrontier_OutsideEast/header.inc index 23698cbbfa..a30a148c25 100644 --- a/data/maps/BattleFrontier_OutsideEast/header.inc +++ b/data/maps/BattleFrontier_OutsideEast/header.inc @@ -11,5 +11,5 @@ BattleFrontier_OutsideEast: @ 84852C4 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_OutsideWest/header.inc b/data/maps/BattleFrontier_OutsideWest/header.inc index 886b04095b..a42ac30ff2 100644 --- a/data/maps/BattleFrontier_OutsideWest/header.inc +++ b/data/maps/BattleFrontier_OutsideWest/header.inc @@ -11,5 +11,5 @@ BattleFrontier_OutsideWest: @ 84851AC .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc index a830633ea0..a136e803da 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ BattleFrontier_PokemonCenter_1F: @ 8485708 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc index c868da343e..4cd607aefa 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ BattleFrontier_PokemonCenter_2F: @ 8485724 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_RankingHall/header.inc b/data/maps/BattleFrontier_RankingHall/header.inc index 2bb632ee8b..6fcb187edf 100644 --- a/data/maps/BattleFrontier_RankingHall/header.inc +++ b/data/maps/BattleFrontier_RankingHall/header.inc @@ -11,5 +11,5 @@ BattleFrontier_RankingHall: @ 848559C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_ReceptionGate/header.inc b/data/maps/BattleFrontier_ReceptionGate/header.inc index 38c514351c..88f806e83f 100644 --- a/data/maps/BattleFrontier_ReceptionGate/header.inc +++ b/data/maps/BattleFrontier_ReceptionGate/header.inc @@ -11,5 +11,5 @@ BattleFrontier_ReceptionGate: @ 84856B4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_ScottsHouse/header.inc b/data/maps/BattleFrontier_ScottsHouse/header.inc index 8f4d0593bd..0fbbb55e33 100644 --- a/data/maps/BattleFrontier_ScottsHouse/header.inc +++ b/data/maps/BattleFrontier_ScottsHouse/header.inc @@ -11,5 +11,5 @@ BattleFrontier_ScottsHouse: @ 8485644 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattlePyramidSquare01/header.inc b/data/maps/BattlePyramidSquare01/header.inc index 0e1f791201..bcbc06c90b 100644 --- a/data/maps/BattlePyramidSquare01/header.inc +++ b/data/maps/BattlePyramidSquare01/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare01: @ 8484F60 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare02/header.inc b/data/maps/BattlePyramidSquare02/header.inc index cf619b3cb1..24255ea1a2 100644 --- a/data/maps/BattlePyramidSquare02/header.inc +++ b/data/maps/BattlePyramidSquare02/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare02: @ 8484F7C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare03/header.inc b/data/maps/BattlePyramidSquare03/header.inc index 7640e62ce0..21e15dc82c 100644 --- a/data/maps/BattlePyramidSquare03/header.inc +++ b/data/maps/BattlePyramidSquare03/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare03: @ 8484F98 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare04/header.inc b/data/maps/BattlePyramidSquare04/header.inc index 7739ac463c..fae10152a5 100644 --- a/data/maps/BattlePyramidSquare04/header.inc +++ b/data/maps/BattlePyramidSquare04/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare04: @ 8484FB4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare05/header.inc b/data/maps/BattlePyramidSquare05/header.inc index b44ef03a32..17e05fc199 100644 --- a/data/maps/BattlePyramidSquare05/header.inc +++ b/data/maps/BattlePyramidSquare05/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare05: @ 8484FD0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare06/header.inc b/data/maps/BattlePyramidSquare06/header.inc index 1983fce443..9a1543a337 100644 --- a/data/maps/BattlePyramidSquare06/header.inc +++ b/data/maps/BattlePyramidSquare06/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare06: @ 8484FEC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare07/header.inc b/data/maps/BattlePyramidSquare07/header.inc index c371d05a70..78d3cf7f49 100644 --- a/data/maps/BattlePyramidSquare07/header.inc +++ b/data/maps/BattlePyramidSquare07/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare07: @ 8485008 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare08/header.inc b/data/maps/BattlePyramidSquare08/header.inc index cfa836e3e8..de960bab0c 100644 --- a/data/maps/BattlePyramidSquare08/header.inc +++ b/data/maps/BattlePyramidSquare08/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare08: @ 8485024 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare09/header.inc b/data/maps/BattlePyramidSquare09/header.inc index 398ed89e8d..96b2beb370 100644 --- a/data/maps/BattlePyramidSquare09/header.inc +++ b/data/maps/BattlePyramidSquare09/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare09: @ 8485040 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare10/header.inc b/data/maps/BattlePyramidSquare10/header.inc index 50a3db9bee..37901889fc 100644 --- a/data/maps/BattlePyramidSquare10/header.inc +++ b/data/maps/BattlePyramidSquare10/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare10: @ 848505C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare11/header.inc b/data/maps/BattlePyramidSquare11/header.inc index b5340bb166..c188ecb869 100644 --- a/data/maps/BattlePyramidSquare11/header.inc +++ b/data/maps/BattlePyramidSquare11/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare11: @ 8485078 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare12/header.inc b/data/maps/BattlePyramidSquare12/header.inc index 9e24c67b72..11e6c7b989 100644 --- a/data/maps/BattlePyramidSquare12/header.inc +++ b/data/maps/BattlePyramidSquare12/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare12: @ 8485094 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare13/header.inc b/data/maps/BattlePyramidSquare13/header.inc index e9e78332cb..2f5746143d 100644 --- a/data/maps/BattlePyramidSquare13/header.inc +++ b/data/maps/BattlePyramidSquare13/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare13: @ 84850B0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare14/header.inc b/data/maps/BattlePyramidSquare14/header.inc index 1b300f4c1e..5926a9d2ac 100644 --- a/data/maps/BattlePyramidSquare14/header.inc +++ b/data/maps/BattlePyramidSquare14/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare14: @ 84850CC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare15/header.inc b/data/maps/BattlePyramidSquare15/header.inc index 67df053a28..e65db912d7 100644 --- a/data/maps/BattlePyramidSquare15/header.inc +++ b/data/maps/BattlePyramidSquare15/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare15: @ 84850E8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare16/header.inc b/data/maps/BattlePyramidSquare16/header.inc index 09576c40eb..f8f97b671f 100644 --- a/data/maps/BattlePyramidSquare16/header.inc +++ b/data/maps/BattlePyramidSquare16/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare16: @ 8485104 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc index e29dd83bdc..dabad3a713 100644 --- a/data/maps/BirthIsland_Exterior/header.inc +++ b/data/maps/BirthIsland_Exterior/header.inc @@ -11,5 +11,5 @@ BirthIsland_Exterior: @ 8485794 .byte MAP_TYPE_INDOOR .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc index a3278a8b64..f2493d7386 100644 --- a/data/maps/BirthIsland_Harbor/header.inc +++ b/data/maps/BirthIsland_Harbor/header.inc @@ -11,5 +11,5 @@ BirthIsland_Harbor: @ 84857B0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc index 740f0d8183..384d08bd7f 100644 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ b/data/maps/CaveOfOrigin_1F/header.inc @@ -11,5 +11,5 @@ CaveOfOrigin_1F: @ 84842E8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc index 64a8ea5d43..d8dab3bea9 100644 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ b/data/maps/CaveOfOrigin_B1F/header.inc @@ -11,5 +11,5 @@ CaveOfOrigin_B1F: @ 8484358 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 14 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc index 046c318547..d42f912da8 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ b/data/maps/CaveOfOrigin_Entrance/header.inc @@ -11,5 +11,5 @@ CaveOfOrigin_Entrance: @ 84842CC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc index feb17e90ab..b8edb52bca 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc @@ -11,5 +11,5 @@ CaveOfOrigin_UnusedRubySapphireMap1: @ 8484304 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc index 17a6e8a324..8d0f838923 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc @@ -11,5 +11,5 @@ CaveOfOrigin_UnusedRubySapphireMap2: @ 8484320 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc index b8da3b1665..00e07549e0 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc @@ -11,5 +11,5 @@ CaveOfOrigin_UnusedRubySapphireMap3: @ 848433C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc index 05820c0cbb..16e2ce55af 100644 --- a/data/maps/DesertRuins/header.inc +++ b/data/maps/DesertRuins/header.inc @@ -11,5 +11,5 @@ DesertRuins: @ 8483F68 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DesertUnderpass/header.inc b/data/maps/DesertUnderpass/header.inc index 6190cf6b08..c4f3a05c70 100644 --- a/data/maps/DesertUnderpass/header.inc +++ b/data/maps/DesertUnderpass/header.inc @@ -11,5 +11,5 @@ DesertUnderpass: @ 8484978 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc index f3f4e41f04..c905fd6068 100644 --- a/data/maps/DewfordTown/header.inc +++ b/data/maps/DewfordTown/header.inc @@ -11,5 +11,5 @@ DewfordTown: @ 84825EC .byte MAP_TYPE_TOWN .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc index 1693883795..4463cc40e5 100644 --- a/data/maps/DewfordTown_Gym/header.inc +++ b/data/maps/DewfordTown_Gym/header.inc @@ -11,5 +11,5 @@ DewfordTown_Gym: @ 8482C60 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc index a62bfe31ef..1ba44b49de 100644 --- a/data/maps/DewfordTown_Hall/header.inc +++ b/data/maps/DewfordTown_Hall/header.inc @@ -11,5 +11,5 @@ DewfordTown_Hall: @ 8482C7C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc index 2ba5bbcc94..219c70fc3a 100644 --- a/data/maps/DewfordTown_House1/header.inc +++ b/data/maps/DewfordTown_House1/header.inc @@ -11,5 +11,5 @@ DewfordTown_House1: @ 8482C0C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc index 487b763e85..248b7a9902 100644 --- a/data/maps/DewfordTown_House2/header.inc +++ b/data/maps/DewfordTown_House2/header.inc @@ -11,5 +11,5 @@ DewfordTown_House2: @ 8482C98 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc index 95243a6eec..6813134f93 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ DewfordTown_PokemonCenter_1F: @ 8482C28 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc index 5223c36e00..43485dcad2 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ DewfordTown_PokemonCenter_2F: @ 8482C44 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc index b8bfdbd79b..6bfc003936 100644 --- a/data/maps/DoubleBattleColosseum/header.inc +++ b/data/maps/DoubleBattleColosseum/header.inc @@ -11,5 +11,5 @@ DoubleBattleColosseum: @ 8484D84 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc index 16da616993..2bebe5d125 100644 --- a/data/maps/EverGrandeCity/header.inc +++ b/data/maps/EverGrandeCity/header.inc @@ -11,5 +11,5 @@ EverGrandeCity: @ 8482598 .byte MAP_TYPE_CITY .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc index 6b091b199e..03ab762db4 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_ChampionsRoom: @ 8483C3C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc index e3ffc75f69..fedc35c76a 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_DrakesRoom: @ 8483C20 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 7 + .byte MAP_BATTLE_SCENE_DRAKE diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc index 1c766c26f2..dd23d11efd 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_GlaciasRoom: @ 8483C04 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 6 + .byte MAP_BATTLE_SCENE_GLACIA diff --git a/data/maps/EverGrandeCity_Hall1/header.inc b/data/maps/EverGrandeCity_Hall1/header.inc index 3af5f5a8ea..b055ba8b17 100644 --- a/data/maps/EverGrandeCity_Hall1/header.inc +++ b/data/maps/EverGrandeCity_Hall1/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_Hall1: @ 8483C58 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_Hall2/header.inc b/data/maps/EverGrandeCity_Hall2/header.inc index f87bc28bd9..a80a688e0b 100644 --- a/data/maps/EverGrandeCity_Hall2/header.inc +++ b/data/maps/EverGrandeCity_Hall2/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_Hall2: @ 8483C74 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_Hall3/header.inc b/data/maps/EverGrandeCity_Hall3/header.inc index 19fc74ed79..18a9d90dcd 100644 --- a/data/maps/EverGrandeCity_Hall3/header.inc +++ b/data/maps/EverGrandeCity_Hall3/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_Hall3: @ 8483C90 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_Hall4/header.inc b/data/maps/EverGrandeCity_Hall4/header.inc index 7058f7bef9..1aeb8e6a2d 100644 --- a/data/maps/EverGrandeCity_Hall4/header.inc +++ b/data/maps/EverGrandeCity_Hall4/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_Hall4: @ 8483CAC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_Hall5/header.inc b/data/maps/EverGrandeCity_Hall5/header.inc index ba5428b3d3..dd82e6b569 100644 --- a/data/maps/EverGrandeCity_Hall5/header.inc +++ b/data/maps/EverGrandeCity_Hall5/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_Hall5: @ 8483CC8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc index 190433735b..c575b2f08f 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ b/data/maps/EverGrandeCity_HallOfFame/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_HallOfFame: @ 8483D00 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc index dcfbeecf44..64bcaec0da 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_PhoebesRoom: @ 8483BE8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 5 + .byte MAP_BATTLE_SCENE_PHOEBE diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc index b042264134..46af6f51e1 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_PokemonCenter_1F: @ 8483D1C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc index dea51de86d..163663bb98 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_PokemonCenter_2F: @ 8483D38 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc index e58c53baac..c6a86baa50 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_PokemonLeague_1F: @ 8483CE4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc index 5aca74ce1c..61370c18d4 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_PokemonLeague_2F: @ 8483D54 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc index 8cd3539dcc..ce3356a954 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_SidneysRoom: @ 8483BCC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 4 + .byte MAP_BATTLE_SCENE_SIDNEY diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc index c28bc8e502..0c2053b8bd 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -11,5 +11,5 @@ FallarborTown: @ 8482624 .byte MAP_TYPE_TOWN .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc index b884c6f66d..81dbad44ac 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc @@ -11,5 +11,5 @@ FallarborTown_BattleTentBattleRoom: @ 8482DCC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_BattleTentCorridor/header.inc b/data/maps/FallarborTown_BattleTentCorridor/header.inc index efa4dde922..4e9484d11b 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/header.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/header.inc @@ -11,5 +11,5 @@ FallarborTown_BattleTentCorridor: @ 8482DB0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_BattleTentLobby/header.inc b/data/maps/FallarborTown_BattleTentLobby/header.inc index d1f0ece92c..416d700d04 100644 --- a/data/maps/FallarborTown_BattleTentLobby/header.inc +++ b/data/maps/FallarborTown_BattleTentLobby/header.inc @@ -11,5 +11,5 @@ FallarborTown_BattleTentLobby: @ 8482D94 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc index fbc36a3f42..aa182e2ed8 100644 --- a/data/maps/FallarborTown_House1/header.inc +++ b/data/maps/FallarborTown_House1/header.inc @@ -11,5 +11,5 @@ FallarborTown_House1: @ 8482E20 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc index 9041fd2b27..c8c22eacf3 100644 --- a/data/maps/FallarborTown_House2/header.inc +++ b/data/maps/FallarborTown_House2/header.inc @@ -11,5 +11,5 @@ FallarborTown_House2: @ 8482E3C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc index 2b29e7d437..3119638bf6 100644 --- a/data/maps/FallarborTown_Mart/header.inc +++ b/data/maps/FallarborTown_Mart/header.inc @@ -11,5 +11,5 @@ FallarborTown_Mart: @ 8482D78 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc index 0c09089a1e..65df98a81e 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ FallarborTown_PokemonCenter_1F: @ 8482DE8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc index c345b977e2..5308b4e098 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ FallarborTown_PokemonCenter_2F: @ 8482E04 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FarawayIsland_Entrance/header.inc b/data/maps/FarawayIsland_Entrance/header.inc index 11d0f1a46e..e06051d7e1 100644 --- a/data/maps/FarawayIsland_Entrance/header.inc +++ b/data/maps/FarawayIsland_Entrance/header.inc @@ -11,5 +11,5 @@ FarawayIsland_Entrance: @ 848575C .byte MAP_TYPE_INDOOR .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FarawayIsland_Interior/header.inc b/data/maps/FarawayIsland_Interior/header.inc index 9b194f6746..b45ac71c36 100644 --- a/data/maps/FarawayIsland_Interior/header.inc +++ b/data/maps/FarawayIsland_Interior/header.inc @@ -11,5 +11,5 @@ FarawayIsland_Interior: @ 8485778 .byte MAP_TYPE_INDOOR .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc index 3a07058831..3c9f51bc12 100644 --- a/data/maps/FieryPath/header.inc +++ b/data/maps/FieryPath/header.inc @@ -11,5 +11,5 @@ FieryPath: @ 8484048 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc index 6dfafd2c81..3f671fb6c9 100644 --- a/data/maps/FortreeCity/header.inc +++ b/data/maps/FortreeCity/header.inc @@ -11,5 +11,5 @@ FortreeCity: @ 8482528 .byte MAP_TYPE_CITY .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc index fbfeee27b4..651b374887 100644 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ b/data/maps/FortreeCity_DecorationShop/header.inc @@ -11,5 +11,5 @@ FortreeCity_DecorationShop: @ 848361C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc index 4e462da1a3..54a45633dc 100644 --- a/data/maps/FortreeCity_Gym/header.inc +++ b/data/maps/FortreeCity_Gym/header.inc @@ -11,5 +11,5 @@ FortreeCity_Gym: @ 848353C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc index 44e9ef8a40..1c106b8f54 100644 --- a/data/maps/FortreeCity_House1/header.inc +++ b/data/maps/FortreeCity_House1/header.inc @@ -11,5 +11,5 @@ FortreeCity_House1: @ 8483520 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc index f8d160d203..1e20a0227e 100644 --- a/data/maps/FortreeCity_House2/header.inc +++ b/data/maps/FortreeCity_House2/header.inc @@ -11,5 +11,5 @@ FortreeCity_House2: @ 84835AC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc index 4b2f639d5d..f2d53219a1 100644 --- a/data/maps/FortreeCity_House3/header.inc +++ b/data/maps/FortreeCity_House3/header.inc @@ -11,5 +11,5 @@ FortreeCity_House3: @ 84835C8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc index 98f72f1ef6..efc5f06bed 100644 --- a/data/maps/FortreeCity_House4/header.inc +++ b/data/maps/FortreeCity_House4/header.inc @@ -11,5 +11,5 @@ FortreeCity_House4: @ 84835E4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc index 7b5f8ce275..c4d07f46be 100644 --- a/data/maps/FortreeCity_House5/header.inc +++ b/data/maps/FortreeCity_House5/header.inc @@ -11,5 +11,5 @@ FortreeCity_House5: @ 8483600 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc index 6cab5d4403..5179187bec 100644 --- a/data/maps/FortreeCity_Mart/header.inc +++ b/data/maps/FortreeCity_Mart/header.inc @@ -11,5 +11,5 @@ FortreeCity_Mart: @ 8483590 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc index 0f2db86585..9f2b78dd4c 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ FortreeCity_PokemonCenter_1F: @ 8483558 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc index e13260f57f..ccfc5bd09b 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ FortreeCity_PokemonCenter_2F: @ 8483574 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc index d99b48f59d..4a754207b3 100644 --- a/data/maps/GraniteCave_1F/header.inc +++ b/data/maps/GraniteCave_1F/header.inc @@ -11,5 +11,5 @@ GraniteCave_1F: @ 8483F84 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc index 9ed11de6fe..beb7fdb83a 100644 --- a/data/maps/GraniteCave_B1F/header.inc +++ b/data/maps/GraniteCave_B1F/header.inc @@ -11,5 +11,5 @@ GraniteCave_B1F: @ 8483FA0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc index da4c70c4b9..0eb017bc42 100644 --- a/data/maps/GraniteCave_B2F/header.inc +++ b/data/maps/GraniteCave_B2F/header.inc @@ -11,5 +11,5 @@ GraniteCave_B2F: @ 8483FBC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc index 9f355ad816..78df1ff837 100644 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ b/data/maps/GraniteCave_StevensRoom/header.inc @@ -11,5 +11,5 @@ GraniteCave_StevensRoom: @ 8483FD8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc index 3c878c0c8c..51f499ee46 100644 --- a/data/maps/InsideOfTruck/header.inc +++ b/data/maps/InsideOfTruck/header.inc @@ -11,5 +11,5 @@ InsideOfTruck: @ 8484EF0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc index 39408decf8..a56a3e4d0b 100644 --- a/data/maps/IslandCave/header.inc +++ b/data/maps/IslandCave/header.inc @@ -11,5 +11,5 @@ IslandCave: @ 8484614 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc index 99ca54b041..797760e918 100644 --- a/data/maps/JaggedPass/header.inc +++ b/data/maps/JaggedPass/header.inc @@ -11,5 +11,5 @@ JaggedPass: @ 848402C .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc index 4c0def95d9..006896453f 100644 --- a/data/maps/LavaridgeTown/header.inc +++ b/data/maps/LavaridgeTown/header.inc @@ -11,5 +11,5 @@ LavaridgeTown: @ 8482608 .byte MAP_TYPE_TOWN .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc index b2a4a50fd7..6ea20174ca 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_1F/header.inc @@ -11,5 +11,5 @@ LavaridgeTown_Gym_1F: @ 8482CD0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc index d04d827c92..579c1dd3ee 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc @@ -11,5 +11,5 @@ LavaridgeTown_Gym_B1F: @ 8482CEC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc index f7858be911..418632b28e 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ b/data/maps/LavaridgeTown_HerbShop/header.inc @@ -11,5 +11,5 @@ LavaridgeTown_HerbShop: @ 8482CB4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc index 1d8c562904..9a350db799 100644 --- a/data/maps/LavaridgeTown_House/header.inc +++ b/data/maps/LavaridgeTown_House/header.inc @@ -11,5 +11,5 @@ LavaridgeTown_House: @ 8482D08 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc index f6a4df95d2..30683052be 100644 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ b/data/maps/LavaridgeTown_Mart/header.inc @@ -11,5 +11,5 @@ LavaridgeTown_Mart: @ 8482D24 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc index 1504e0176e..e657a688a4 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ LavaridgeTown_PokemonCenter_1F: @ 8482D40 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc index f52965272e..3d40c93cfd 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ LavaridgeTown_PokemonCenter_2F: @ 8482D5C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc index f4565d25ae..dafbfaccd0 100644 --- a/data/maps/LilycoveCity/header.inc +++ b/data/maps/LilycoveCity/header.inc @@ -11,5 +11,5 @@ LilycoveCity: @ 8482544 .byte MAP_TYPE_CITY .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc index d31f692c25..2049fd74c3 100644 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ b/data/maps/LilycoveCity_ContestHall/header.inc @@ -11,5 +11,5 @@ LilycoveCity_ContestHall: @ 84836C4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc index aff7cb64e9..6aba3e4163 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ b/data/maps/LilycoveCity_ContestLobby/header.inc @@ -11,5 +11,5 @@ LilycoveCity_ContestLobby: @ 84836A8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc index 258501718b..a2737b05bc 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc @@ -11,5 +11,5 @@ LilycoveCity_CoveLilyMotel_1F: @ 8483638 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc index dd38adbb84..112a6e8d71 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc @@ -11,5 +11,5 @@ LilycoveCity_CoveLilyMotel_2F: @ 8483654 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc index a7375dbd75..0c8cc574d9 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc @@ -11,5 +11,5 @@ LilycoveCity_DepartmentStoreElevator: @ 84838A0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc index 92a3c5ed9d..cd6ded7d68 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc @@ -11,5 +11,5 @@ LilycoveCity_DepartmentStoreRooftop: @ 8483884 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc index 136b923e0d..bae2b837d4 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc @@ -11,5 +11,5 @@ LilycoveCity_DepartmentStore_1F: @ 84837F8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc index fd868ce9de..88ca3ece3a 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc @@ -11,5 +11,5 @@ LilycoveCity_DepartmentStore_2F: @ 8483814 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc index fd946aee75..1753be637e 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc @@ -11,5 +11,5 @@ LilycoveCity_DepartmentStore_3F: @ 8483830 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc index 7f343e860d..c9b0870fa3 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc @@ -11,5 +11,5 @@ LilycoveCity_DepartmentStore_4F: @ 848384C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc index 2019489b47..62d836d567 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc @@ -11,5 +11,5 @@ LilycoveCity_DepartmentStore_5F: @ 8483868 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc index addb803f08..7f970b4634 100644 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ b/data/maps/LilycoveCity_Harbor/header.inc @@ -11,5 +11,5 @@ LilycoveCity_Harbor: @ 8483750 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc index c5dde27212..4cc0a80614 100644 --- a/data/maps/LilycoveCity_House1/header.inc +++ b/data/maps/LilycoveCity_House1/header.inc @@ -11,5 +11,5 @@ LilycoveCity_House1: @ 8483788 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc index 1a6c27a937..988b7fa4cf 100644 --- a/data/maps/LilycoveCity_House2/header.inc +++ b/data/maps/LilycoveCity_House2/header.inc @@ -11,5 +11,5 @@ LilycoveCity_House2: @ 84837A4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc index 73fd14e047..41f01234c2 100644 --- a/data/maps/LilycoveCity_House3/header.inc +++ b/data/maps/LilycoveCity_House3/header.inc @@ -11,5 +11,5 @@ LilycoveCity_House3: @ 84837C0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc index d265ea010e..656e60bf3c 100644 --- a/data/maps/LilycoveCity_House4/header.inc +++ b/data/maps/LilycoveCity_House4/header.inc @@ -11,5 +11,5 @@ LilycoveCity_House4: @ 84837DC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc index 1a92a6d690..0d6faebe8e 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc @@ -11,5 +11,5 @@ LilycoveCity_LilycoveMuseum_1F: @ 8483670 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc index b47d700a91..641859ac60 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc @@ -11,5 +11,5 @@ LilycoveCity_LilycoveMuseum_2F: @ 848368C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc index 9c167f3003..6a0ddfebcf 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -11,5 +11,5 @@ LilycoveCity_MoveDeletersHouse: @ 848376C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc index 6e0b34fac4..c040d77153 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ LilycoveCity_PokemonCenter_1F: @ 84836E0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc index 070ae9aef9..e9c27fd816 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ LilycoveCity_PokemonCenter_2F: @ 84836FC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc index bdbb5aefa0..78102855c5 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc @@ -11,5 +11,5 @@ LilycoveCity_PokemonTrainerFanClub: @ 8483734 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc index 772e57cba8..0384e495fc 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ b/data/maps/LilycoveCity_UnusedMart/header.inc @@ -11,5 +11,5 @@ LilycoveCity_UnusedMart: @ 8483718 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc index b416ddd626..9aa0c9cc77 100644 --- a/data/maps/LinkContestRoom1/header.inc +++ b/data/maps/LinkContestRoom1/header.inc @@ -11,5 +11,5 @@ LinkContestRoom1: @ 8484DA0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index 73c459674c..342ed7d0bd 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -11,5 +11,5 @@ LinkContestRoom2: @ 8484E64 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index bf12c6d306..ff29d7e872 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -11,5 +11,5 @@ LinkContestRoom3: @ 8484E80 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index 675a023988..025e5971e0 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -11,5 +11,5 @@ LinkContestRoom4: @ 8484E9C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index da5e9ff585..7c145d0e40 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -11,5 +11,5 @@ LinkContestRoom5: @ 8484EB8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index 153d55b34b..939d56426c 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -11,5 +11,5 @@ LinkContestRoom6: @ 8484ED4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc index df9a5b47ab..db13d6def4 100644 --- a/data/maps/LittlerootTown/header.inc +++ b/data/maps/LittlerootTown/header.inc @@ -11,5 +11,5 @@ LittlerootTown: @ 84825B4 .byte MAP_TYPE_TOWN .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc index 364acb64ab..6224e7a509 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc @@ -11,5 +11,5 @@ LittlerootTown_BrendansHouse_1F: @ 8482AF4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc index d4d1703f2b..ec7eb66cee 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc @@ -11,5 +11,5 @@ LittlerootTown_BrendansHouse_2F: @ 8482B10 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc index 23c59b0820..7681d9a83e 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc @@ -11,5 +11,5 @@ LittlerootTown_MaysHouse_1F: @ 8482B2C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc index dfba805beb..9e5d0c8070 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc @@ -11,5 +11,5 @@ LittlerootTown_MaysHouse_2F: @ 8482B48 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc index 3969b46fd4..3e55729a88 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc @@ -11,5 +11,5 @@ LittlerootTown_ProfessorBirchsLab: @ 8482B64 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc index c9bdce2a18..851f562788 100644 --- a/data/maps/MagmaHideout_1F/header.inc +++ b/data/maps/MagmaHideout_1F/header.inc @@ -11,5 +11,5 @@ MagmaHideout_1F: @ 8484828 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MagmaHideout_2F_1R/header.inc b/data/maps/MagmaHideout_2F_1R/header.inc index 8fdac83d22..d8118281f1 100644 --- a/data/maps/MagmaHideout_2F_1R/header.inc +++ b/data/maps/MagmaHideout_2F_1R/header.inc @@ -11,5 +11,5 @@ MagmaHideout_2F_1R: @ 8484844 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MagmaHideout_2F_2R/header.inc b/data/maps/MagmaHideout_2F_2R/header.inc index 9512d17346..1de48fb62e 100644 --- a/data/maps/MagmaHideout_2F_2R/header.inc +++ b/data/maps/MagmaHideout_2F_2R/header.inc @@ -11,5 +11,5 @@ MagmaHideout_2F_2R: @ 8484860 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MagmaHideout_2F_3R/header.inc b/data/maps/MagmaHideout_2F_3R/header.inc index 39a0710f58..b374192781 100644 --- a/data/maps/MagmaHideout_2F_3R/header.inc +++ b/data/maps/MagmaHideout_2F_3R/header.inc @@ -11,5 +11,5 @@ MagmaHideout_2F_3R: @ 84848EC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MagmaHideout_3F_1R/header.inc b/data/maps/MagmaHideout_3F_1R/header.inc index 436103ffe8..d5347ed254 100644 --- a/data/maps/MagmaHideout_3F_1R/header.inc +++ b/data/maps/MagmaHideout_3F_1R/header.inc @@ -11,5 +11,5 @@ MagmaHideout_3F_1R: @ 848487C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MagmaHideout_3F_2R/header.inc b/data/maps/MagmaHideout_3F_2R/header.inc index b0bcd92c2c..45cda066b5 100644 --- a/data/maps/MagmaHideout_3F_2R/header.inc +++ b/data/maps/MagmaHideout_3F_2R/header.inc @@ -11,5 +11,5 @@ MagmaHideout_3F_2R: @ 8484898 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MagmaHideout_3F_3R/header.inc b/data/maps/MagmaHideout_3F_3R/header.inc index a4fe7b936e..347ec1897c 100644 --- a/data/maps/MagmaHideout_3F_3R/header.inc +++ b/data/maps/MagmaHideout_3F_3R/header.inc @@ -11,5 +11,5 @@ MagmaHideout_3F_3R: @ 84848D0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MagmaHideout_4F/header.inc b/data/maps/MagmaHideout_4F/header.inc index 50a1a2b993..f11c5eadd3 100644 --- a/data/maps/MagmaHideout_4F/header.inc +++ b/data/maps/MagmaHideout_4F/header.inc @@ -11,5 +11,5 @@ MagmaHideout_4F: @ 84848B4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MarineCave_End/header.inc b/data/maps/MarineCave_End/header.inc index 044d54304b..36bff96d68 100644 --- a/data/maps/MarineCave_End/header.inc +++ b/data/maps/MarineCave_End/header.inc @@ -11,5 +11,5 @@ MarineCave_End: @ 8484A04 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 14 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MarineCave_Entrance/header.inc b/data/maps/MarineCave_Entrance/header.inc index a95f2c7dd0..9feb17fe2b 100644 --- a/data/maps/MarineCave_Entrance/header.inc +++ b/data/maps/MarineCave_Entrance/header.inc @@ -11,5 +11,5 @@ MarineCave_Entrance: @ 84849E8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 14 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc index c2101da803..f6aadf1ff6 100644 --- a/data/maps/MauvilleCity/header.inc +++ b/data/maps/MauvilleCity/header.inc @@ -11,5 +11,5 @@ MauvilleCity: @ 84824F0 .byte MAP_TYPE_CITY .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc index cc9a7102ca..baa4f18d57 100644 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ b/data/maps/MauvilleCity_BikeShop/header.inc @@ -11,5 +11,5 @@ MauvilleCity_BikeShop: @ 8483280 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc index c1626ba7fb..45fd23da08 100644 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ b/data/maps/MauvilleCity_GameCorner/header.inc @@ -11,5 +11,5 @@ MauvilleCity_GameCorner: @ 84832B8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc index 9a9de6ebf7..736b491db8 100644 --- a/data/maps/MauvilleCity_Gym/header.inc +++ b/data/maps/MauvilleCity_Gym/header.inc @@ -11,5 +11,5 @@ MauvilleCity_Gym: @ 8483264 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc index 43691b5899..6a29041cc6 100644 --- a/data/maps/MauvilleCity_House1/header.inc +++ b/data/maps/MauvilleCity_House1/header.inc @@ -11,5 +11,5 @@ MauvilleCity_House1: @ 848329C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc index 8c46284627..3fc04798e6 100644 --- a/data/maps/MauvilleCity_House2/header.inc +++ b/data/maps/MauvilleCity_House2/header.inc @@ -11,5 +11,5 @@ MauvilleCity_House2: @ 84832D4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc index bb00f8dd03..3722f45653 100644 --- a/data/maps/MauvilleCity_Mart/header.inc +++ b/data/maps/MauvilleCity_Mart/header.inc @@ -11,5 +11,5 @@ MauvilleCity_Mart: @ 8483328 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc index 665e25cddc..659176f800 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ MauvilleCity_PokemonCenter_1F: @ 84832F0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc index 6ebef36e51..462fdc47dc 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ MauvilleCity_PokemonCenter_2F: @ 848330C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc index d21e637778..abf0e85c5e 100644 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ b/data/maps/MeteorFalls_1F_1R/header.inc @@ -11,5 +11,5 @@ MeteorFalls_1F_1R: @ 8483EC0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc index c7d0286281..a0d0741216 100644 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ b/data/maps/MeteorFalls_1F_2R/header.inc @@ -11,5 +11,5 @@ MeteorFalls_1F_2R: @ 8483EDC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc index e6079dade9..078998891c 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ b/data/maps/MeteorFalls_B1F_1R/header.inc @@ -11,5 +11,5 @@ MeteorFalls_B1F_1R: @ 8483EF8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc index 100c19b4e0..dabf884b42 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ b/data/maps/MeteorFalls_B1F_2R/header.inc @@ -11,5 +11,5 @@ MeteorFalls_B1F_2R: @ 8483F14 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MeteorFalls_StevensCave/header.inc b/data/maps/MeteorFalls_StevensCave/header.inc index e01833b400..7236159f32 100644 --- a/data/maps/MeteorFalls_StevensCave/header.inc +++ b/data/maps/MeteorFalls_StevensCave/header.inc @@ -11,5 +11,5 @@ MeteorFalls_StevensCave: @ 8484A74 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MirageTower_1F/header.inc b/data/maps/MirageTower_1F/header.inc index 46b167eade..584ed3f7ff 100644 --- a/data/maps/MirageTower_1F/header.inc +++ b/data/maps/MirageTower_1F/header.inc @@ -11,5 +11,5 @@ MirageTower_1F: @ 8484908 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MirageTower_2F/header.inc b/data/maps/MirageTower_2F/header.inc index 375fef35d7..03f762758b 100644 --- a/data/maps/MirageTower_2F/header.inc +++ b/data/maps/MirageTower_2F/header.inc @@ -11,5 +11,5 @@ MirageTower_2F: @ 8484924 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MirageTower_3F/header.inc b/data/maps/MirageTower_3F/header.inc index 8f3f40f4b3..3930ca2ba4 100644 --- a/data/maps/MirageTower_3F/header.inc +++ b/data/maps/MirageTower_3F/header.inc @@ -11,5 +11,5 @@ MirageTower_3F: @ 8484940 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MirageTower_4F/header.inc b/data/maps/MirageTower_4F/header.inc index ad4079d0c2..505e671eb8 100644 --- a/data/maps/MirageTower_4F/header.inc +++ b/data/maps/MirageTower_4F/header.inc @@ -11,5 +11,5 @@ MirageTower_4F: @ 848495C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc index 5756307eb3..f5196d035e 100644 --- a/data/maps/MossdeepCity/header.inc +++ b/data/maps/MossdeepCity/header.inc @@ -11,5 +11,5 @@ MossdeepCity: @ 8482560 .byte MAP_TYPE_CITY .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc index c7e781b7a1..302f13d7e0 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc @@ -11,5 +11,5 @@ MossdeepCity_GameCorner_1F: @ 84839F0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc index c431f8b06e..86e796c525 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc @@ -11,5 +11,5 @@ MossdeepCity_GameCorner_B1F: @ 8483A0C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc index af4198c833..1b325fc9af 100644 --- a/data/maps/MossdeepCity_Gym/header.inc +++ b/data/maps/MossdeepCity_Gym/header.inc @@ -11,5 +11,5 @@ MossdeepCity_Gym: @ 84838BC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc index 31cb2aa2a3..25b8f5558b 100644 --- a/data/maps/MossdeepCity_House1/header.inc +++ b/data/maps/MossdeepCity_House1/header.inc @@ -11,5 +11,5 @@ MossdeepCity_House1: @ 84838D8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc index d89be9872a..718ed1f1ab 100644 --- a/data/maps/MossdeepCity_House2/header.inc +++ b/data/maps/MossdeepCity_House2/header.inc @@ -11,5 +11,5 @@ MossdeepCity_House2: @ 84838F4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc index 02b2489fd5..53aeb0a29f 100644 --- a/data/maps/MossdeepCity_House3/header.inc +++ b/data/maps/MossdeepCity_House3/header.inc @@ -11,5 +11,5 @@ MossdeepCity_House3: @ 8483964 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc index c86b1f8af2..41cbc6a7ac 100644 --- a/data/maps/MossdeepCity_House4/header.inc +++ b/data/maps/MossdeepCity_House4/header.inc @@ -11,5 +11,5 @@ MossdeepCity_House4: @ 848399C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc index 4086c0142b..659c7e1333 100644 --- a/data/maps/MossdeepCity_Mart/header.inc +++ b/data/maps/MossdeepCity_Mart/header.inc @@ -11,5 +11,5 @@ MossdeepCity_Mart: @ 8483948 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc index aef0702281..75f151c518 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ MossdeepCity_PokemonCenter_1F: @ 8483910 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc index 32c2bbc285..5a98563b8c 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ MossdeepCity_PokemonCenter_2F: @ 848392C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc index c5eb7515ed..a0dd1e0501 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc @@ -11,5 +11,5 @@ MossdeepCity_SpaceCenter_1F: @ 84839B8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc index ec580ec8e3..7f6c20a663 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc @@ -11,5 +11,5 @@ MossdeepCity_SpaceCenter_2F: @ 84839D4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc index 446d6f5409..68da469654 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ b/data/maps/MossdeepCity_StevensHouse/header.inc @@ -11,5 +11,5 @@ MossdeepCity_StevensHouse: @ 8483980 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc index 17173424b2..04bfa4a450 100644 --- a/data/maps/MtChimney/header.inc +++ b/data/maps/MtChimney/header.inc @@ -11,5 +11,5 @@ MtChimney: @ 8484010 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc index 864d0a0c85..e12bfbacb7 100644 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ b/data/maps/MtChimney_CableCarStation/header.inc @@ -11,5 +11,5 @@ MtChimney_CableCarStation: @ 8483DFC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index bb38876c87..241f3dff38 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -11,5 +11,5 @@ MtPyre_1F: @ 8484064 .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc index 2ed8817a6b..a542638a77 100644 --- a/data/maps/MtPyre_2F/header.inc +++ b/data/maps/MtPyre_2F/header.inc @@ -11,5 +11,5 @@ MtPyre_2F: @ 8484080 .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc index 115479a97f..b09729f813 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -11,5 +11,5 @@ MtPyre_3F: @ 848409C .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc index ed554cb5fd..bee0a548f4 100644 --- a/data/maps/MtPyre_4F/header.inc +++ b/data/maps/MtPyre_4F/header.inc @@ -11,5 +11,5 @@ MtPyre_4F: @ 84840B8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc index 1f1829279b..d17d642628 100644 --- a/data/maps/MtPyre_5F/header.inc +++ b/data/maps/MtPyre_5F/header.inc @@ -11,5 +11,5 @@ MtPyre_5F: @ 84840D4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc index b665007db5..a783fc7c38 100644 --- a/data/maps/MtPyre_6F/header.inc +++ b/data/maps/MtPyre_6F/header.inc @@ -11,5 +11,5 @@ MtPyre_6F: @ 84840F0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc index b453b7691f..b9b2575e8a 100644 --- a/data/maps/MtPyre_Exterior/header.inc +++ b/data/maps/MtPyre_Exterior/header.inc @@ -11,5 +11,5 @@ MtPyre_Exterior: @ 848410C .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc index 67185120a4..d1a65792fd 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -11,5 +11,5 @@ MtPyre_Summit: @ 8484128 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc index 4f92661da9..59e9a3f594 100644 --- a/data/maps/NavelRock_B1F/header.inc +++ b/data/maps/NavelRock_B1F/header.inc @@ -11,5 +11,5 @@ NavelRock_B1F: @ 84858C8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Bottom/header.inc b/data/maps/NavelRock_Bottom/header.inc index ddf383ee20..0711b5b815 100644 --- a/data/maps/NavelRock_Bottom/header.inc +++ b/data/maps/NavelRock_Bottom/header.inc @@ -11,5 +11,5 @@ NavelRock_Bottom: @ 8485AC0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down01/header.inc b/data/maps/NavelRock_Down01/header.inc index 2585dc9583..fd5b2c0f39 100644 --- a/data/maps/NavelRock_Down01/header.inc +++ b/data/maps/NavelRock_Down01/header.inc @@ -11,5 +11,5 @@ NavelRock_Down01: @ 848598C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down02/header.inc b/data/maps/NavelRock_Down02/header.inc index 5f6e48b821..7827fe4cb3 100644 --- a/data/maps/NavelRock_Down02/header.inc +++ b/data/maps/NavelRock_Down02/header.inc @@ -11,5 +11,5 @@ NavelRock_Down02: @ 84859A8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down03/header.inc b/data/maps/NavelRock_Down03/header.inc index 2e256ec778..4652974821 100644 --- a/data/maps/NavelRock_Down03/header.inc +++ b/data/maps/NavelRock_Down03/header.inc @@ -11,5 +11,5 @@ NavelRock_Down03: @ 84859C4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down04/header.inc b/data/maps/NavelRock_Down04/header.inc index c5c1ee394c..7ee2eee47b 100644 --- a/data/maps/NavelRock_Down04/header.inc +++ b/data/maps/NavelRock_Down04/header.inc @@ -11,5 +11,5 @@ NavelRock_Down04: @ 84859E0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down05/header.inc b/data/maps/NavelRock_Down05/header.inc index 40f8cf0c94..3f41991959 100644 --- a/data/maps/NavelRock_Down05/header.inc +++ b/data/maps/NavelRock_Down05/header.inc @@ -11,5 +11,5 @@ NavelRock_Down05: @ 84859FC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down06/header.inc b/data/maps/NavelRock_Down06/header.inc index 7c9f16d60c..189c269691 100644 --- a/data/maps/NavelRock_Down06/header.inc +++ b/data/maps/NavelRock_Down06/header.inc @@ -11,5 +11,5 @@ NavelRock_Down06: @ 8485A18 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down07/header.inc b/data/maps/NavelRock_Down07/header.inc index ef679ae6b3..378b7bbd29 100644 --- a/data/maps/NavelRock_Down07/header.inc +++ b/data/maps/NavelRock_Down07/header.inc @@ -11,5 +11,5 @@ NavelRock_Down07: @ 8485A34 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down08/header.inc b/data/maps/NavelRock_Down08/header.inc index 27ca1b3177..7ad3e736a6 100644 --- a/data/maps/NavelRock_Down08/header.inc +++ b/data/maps/NavelRock_Down08/header.inc @@ -11,5 +11,5 @@ NavelRock_Down08: @ 8485A50 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down09/header.inc b/data/maps/NavelRock_Down09/header.inc index 2dd586587c..60cec1da89 100644 --- a/data/maps/NavelRock_Down09/header.inc +++ b/data/maps/NavelRock_Down09/header.inc @@ -11,5 +11,5 @@ NavelRock_Down09: @ 8485A6C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down10/header.inc b/data/maps/NavelRock_Down10/header.inc index b8a2123d5b..08b2d975b5 100644 --- a/data/maps/NavelRock_Down10/header.inc +++ b/data/maps/NavelRock_Down10/header.inc @@ -11,5 +11,5 @@ NavelRock_Down10: @ 8485A88 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down11/header.inc b/data/maps/NavelRock_Down11/header.inc index 9073b1b64e..8182f1c418 100644 --- a/data/maps/NavelRock_Down11/header.inc +++ b/data/maps/NavelRock_Down11/header.inc @@ -11,5 +11,5 @@ NavelRock_Down11: @ 8485AA4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Entrance/header.inc b/data/maps/NavelRock_Entrance/header.inc index d795e2bb94..a0ec2bdc20 100644 --- a/data/maps/NavelRock_Entrance/header.inc +++ b/data/maps/NavelRock_Entrance/header.inc @@ -11,5 +11,5 @@ NavelRock_Entrance: @ 84858AC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc index ec7ea49686..582fd9cbc1 100644 --- a/data/maps/NavelRock_Exterior/header.inc +++ b/data/maps/NavelRock_Exterior/header.inc @@ -11,5 +11,5 @@ NavelRock_Exterior: @ 8485874 .byte MAP_TYPE_INDOOR .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc index 8a145ad642..53c0fdaed6 100644 --- a/data/maps/NavelRock_Fork/header.inc +++ b/data/maps/NavelRock_Fork/header.inc @@ -11,5 +11,5 @@ NavelRock_Fork: @ 84858E4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc index f798d56dfd..79b1dbafb6 100644 --- a/data/maps/NavelRock_Harbor/header.inc +++ b/data/maps/NavelRock_Harbor/header.inc @@ -11,5 +11,5 @@ NavelRock_Harbor: @ 8485890 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Top/header.inc b/data/maps/NavelRock_Top/header.inc index 43b9d951db..9c0a7b1c0b 100644 --- a/data/maps/NavelRock_Top/header.inc +++ b/data/maps/NavelRock_Top/header.inc @@ -11,5 +11,5 @@ NavelRock_Top: @ 8485970 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Up1/header.inc b/data/maps/NavelRock_Up1/header.inc index c409781be1..3fa05854eb 100644 --- a/data/maps/NavelRock_Up1/header.inc +++ b/data/maps/NavelRock_Up1/header.inc @@ -11,5 +11,5 @@ NavelRock_Up1: @ 8485900 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Up2/header.inc b/data/maps/NavelRock_Up2/header.inc index a2f627a1cd..62fed7dc3b 100644 --- a/data/maps/NavelRock_Up2/header.inc +++ b/data/maps/NavelRock_Up2/header.inc @@ -11,5 +11,5 @@ NavelRock_Up2: @ 848591C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Up3/header.inc b/data/maps/NavelRock_Up3/header.inc index bce8a899f0..723329d92f 100644 --- a/data/maps/NavelRock_Up3/header.inc +++ b/data/maps/NavelRock_Up3/header.inc @@ -11,5 +11,5 @@ NavelRock_Up3: @ 8485938 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Up4/header.inc b/data/maps/NavelRock_Up4/header.inc index 02a05c79ef..33501a6783 100644 --- a/data/maps/NavelRock_Up4/header.inc +++ b/data/maps/NavelRock_Up4/header.inc @@ -11,5 +11,5 @@ NavelRock_Up4: @ 8485954 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc index 706a215639..092cf841fc 100644 --- a/data/maps/NewMauville_Entrance/header.inc +++ b/data/maps/NewMauville_Entrance/header.inc @@ -11,5 +11,5 @@ NewMauville_Entrance: @ 8484470 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc index a3740f48ac..3f8d3192ed 100644 --- a/data/maps/NewMauville_Inside/header.inc +++ b/data/maps/NewMauville_Inside/header.inc @@ -11,5 +11,5 @@ NewMauville_Inside: @ 848448C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc index 074c453200..8d94687a6b 100644 --- a/data/maps/OldaleTown/header.inc +++ b/data/maps/OldaleTown/header.inc @@ -11,5 +11,5 @@ OldaleTown: @ 84825D0 .byte MAP_TYPE_TOWN .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc index f188a6559e..934cb22b03 100644 --- a/data/maps/OldaleTown_House1/header.inc +++ b/data/maps/OldaleTown_House1/header.inc @@ -11,5 +11,5 @@ OldaleTown_House1: @ 8482B80 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc index 6e942e50c1..55a6fd8a30 100644 --- a/data/maps/OldaleTown_House2/header.inc +++ b/data/maps/OldaleTown_House2/header.inc @@ -11,5 +11,5 @@ OldaleTown_House2: @ 8482B9C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc index bbc85e7cba..4727f0da96 100644 --- a/data/maps/OldaleTown_Mart/header.inc +++ b/data/maps/OldaleTown_Mart/header.inc @@ -11,5 +11,5 @@ OldaleTown_Mart: @ 8482BF0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc index 3f01beee4b..cdd572a957 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ OldaleTown_PokemonCenter_1F: @ 8482BB8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc index 99356ce575..24cf90aab5 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ OldaleTown_PokemonCenter_2F: @ 8482BD4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc index 34c15d53f1..5b572682b9 100644 --- a/data/maps/PacifidlogTown/header.inc +++ b/data/maps/PacifidlogTown/header.inc @@ -11,5 +11,5 @@ PacifidlogTown: @ 848265C .byte MAP_TYPE_TOWN .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc index 33449542fd..511692df1d 100644 --- a/data/maps/PacifidlogTown_House1/header.inc +++ b/data/maps/PacifidlogTown_House1/header.inc @@ -11,5 +11,5 @@ PacifidlogTown_House1: @ 8482F8C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc index c095f6827d..04d6853232 100644 --- a/data/maps/PacifidlogTown_House2/header.inc +++ b/data/maps/PacifidlogTown_House2/header.inc @@ -11,5 +11,5 @@ PacifidlogTown_House2: @ 8482FA8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc index 5aa4981410..48f4617978 100644 --- a/data/maps/PacifidlogTown_House3/header.inc +++ b/data/maps/PacifidlogTown_House3/header.inc @@ -11,5 +11,5 @@ PacifidlogTown_House3: @ 8482FC4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc index 9530591f6a..a1edad163b 100644 --- a/data/maps/PacifidlogTown_House4/header.inc +++ b/data/maps/PacifidlogTown_House4/header.inc @@ -11,5 +11,5 @@ PacifidlogTown_House4: @ 8482FE0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc index 915d053cb2..850b4864b4 100644 --- a/data/maps/PacifidlogTown_House5/header.inc +++ b/data/maps/PacifidlogTown_House5/header.inc @@ -11,5 +11,5 @@ PacifidlogTown_House5: @ 8482FFC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc index 15b0044c38..b301336540 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ PacifidlogTown_PokemonCenter_1F: @ 8482F54 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc index 72331ab8df..db6f8b3df8 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ PacifidlogTown_PokemonCenter_2F: @ 8482F70 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index 2b8520a7bd..4dae59652d 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -11,5 +11,5 @@ PetalburgCity: @ 84824B8 .byte MAP_TYPE_CITY .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc index b6604647f0..e320638943 100644 --- a/data/maps/PetalburgCity_Gym/header.inc +++ b/data/maps/PetalburgCity_Gym/header.inc @@ -11,5 +11,5 @@ PetalburgCity_Gym: @ 8483034 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc index c804521829..85bc3e460d 100644 --- a/data/maps/PetalburgCity_House1/header.inc +++ b/data/maps/PetalburgCity_House1/header.inc @@ -11,5 +11,5 @@ PetalburgCity_House1: @ 8483050 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc index 61b9b16ca6..f7f16748f0 100644 --- a/data/maps/PetalburgCity_House2/header.inc +++ b/data/maps/PetalburgCity_House2/header.inc @@ -11,5 +11,5 @@ PetalburgCity_House2: @ 848306C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc index 92cabd5a33..624c8b6a1f 100644 --- a/data/maps/PetalburgCity_Mart/header.inc +++ b/data/maps/PetalburgCity_Mart/header.inc @@ -11,5 +11,5 @@ PetalburgCity_Mart: @ 84830C0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc index 1a3e764bbb..2a05feb291 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ PetalburgCity_PokemonCenter_1F: @ 8483088 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc index 73dbb7aa4a..473e3c7363 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ PetalburgCity_PokemonCenter_2F: @ 84830A4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc index 033e194888..91ee3622bc 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -11,5 +11,5 @@ PetalburgCity_WallysHouse: @ 8483018 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc index 387032076a..94b5bdfd1b 100644 --- a/data/maps/PetalburgWoods/header.inc +++ b/data/maps/PetalburgWoods/header.inc @@ -11,5 +11,5 @@ PetalburgWoods: @ 8483FF4 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc index 98573d9a42..9029f306f5 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -11,5 +11,5 @@ RecordCorner: @ 8484D68 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc index feb3aa4405..64836245fc 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -11,5 +11,5 @@ Route101: @ 8482678 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index 6102e69a07..dc2b3240a6 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -11,5 +11,5 @@ Route102: @ 8482694 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc index 6c99d4df2d..c7510701e8 100644 --- a/data/maps/Route103/header.inc +++ b/data/maps/Route103/header.inc @@ -11,5 +11,5 @@ Route103: @ 84826B0 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc index 1c09ae166d..df6f0d34a6 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -11,5 +11,5 @@ Route104: @ 84826CC .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc index 5dab30f42b..139efeb74d 100644 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ b/data/maps/Route104_MrBrineysHouse/header.inc @@ -11,5 +11,5 @@ Route104_MrBrineysHouse: @ 8483D70 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc index f1f273c739..cd34cd3f4c 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc @@ -11,5 +11,5 @@ Route104_PrettyPetalFlowerShop: @ 8483D8C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc index 99284e5662..ea0b1390a9 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -11,5 +11,5 @@ Route104_Prototype: @ 8485AF8 .byte MAP_TYPE_ROUTE .2byte 0 .byte 8 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc index 4bb9351d80..fce17ef009 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc @@ -11,5 +11,5 @@ Route104_PrototypePrettyPetalFlowerShop: @ 8485B14 .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc index 040e26110a..59ea4f3dfd 100644 --- a/data/maps/Route105/header.inc +++ b/data/maps/Route105/header.inc @@ -11,5 +11,5 @@ Route105: @ 84826E8 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index 69ab66b037..9292cae39e 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -11,5 +11,5 @@ Route106: @ 8482704 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc index 399096d16f..e038ea7057 100644 --- a/data/maps/Route107/header.inc +++ b/data/maps/Route107/header.inc @@ -11,5 +11,5 @@ Route107: @ 8482720 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index a59ddf7619..a6314172f2 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -11,5 +11,5 @@ Route108: @ 848273C .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc index 2262cadfa4..489ea8789a 100644 --- a/data/maps/Route109/header.inc +++ b/data/maps/Route109/header.inc @@ -11,5 +11,5 @@ Route109: @ 8482758 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc index 93deeb8a99..1f6f067cad 100644 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ b/data/maps/Route109_SeashoreHouse/header.inc @@ -11,5 +11,5 @@ Route109_SeashoreHouse: @ 8485B30 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc index dd66f9f3da..c1dd037899 100644 --- a/data/maps/Route110/header.inc +++ b/data/maps/Route110/header.inc @@ -11,5 +11,5 @@ Route110: @ 8482774 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc index 0a5259894c..d98361dd3d 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc @@ -11,5 +11,5 @@ Route110_SeasideCyclingRoadNorthEntrance: @ 8485C80 .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc index a366132136..24baeb0427 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc @@ -11,5 +11,5 @@ Route110_SeasideCyclingRoadSouthEntrance: @ 8485C9C .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc index af28f5ed01..9d9cf23edf 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ b/data/maps/Route110_TrickHouseCorridor/header.inc @@ -11,5 +11,5 @@ Route110_TrickHouseCorridor: @ 8485B84 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc index 9b0436a68b..3ea5a8eb86 100644 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ b/data/maps/Route110_TrickHouseEnd/header.inc @@ -11,5 +11,5 @@ Route110_TrickHouseEnd: @ 8485B68 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc index f86f11b929..8e202e650d 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ b/data/maps/Route110_TrickHouseEntrance/header.inc @@ -11,5 +11,5 @@ Route110_TrickHouseEntrance: @ 8485B4C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc index cdb272aa7f..593b807ce1 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ b/data/maps/Route110_TrickHousePuzzle1/header.inc @@ -11,5 +11,5 @@ Route110_TrickHousePuzzle1: @ 8485BA0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc index 946da22a8a..e632dbca98 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ b/data/maps/Route110_TrickHousePuzzle2/header.inc @@ -11,5 +11,5 @@ Route110_TrickHousePuzzle2: @ 8485BBC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc index 0686eef43e..77e2e4a38a 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ b/data/maps/Route110_TrickHousePuzzle3/header.inc @@ -11,5 +11,5 @@ Route110_TrickHousePuzzle3: @ 8485BD8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc index 05bde230f8..9ad6159f31 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ b/data/maps/Route110_TrickHousePuzzle4/header.inc @@ -11,5 +11,5 @@ Route110_TrickHousePuzzle4: @ 8485BF4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc index de723c3024..910638d825 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ b/data/maps/Route110_TrickHousePuzzle5/header.inc @@ -11,5 +11,5 @@ Route110_TrickHousePuzzle5: @ 8485C10 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc index e5a2864de6..ab6c752cb2 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ b/data/maps/Route110_TrickHousePuzzle6/header.inc @@ -11,5 +11,5 @@ Route110_TrickHousePuzzle6: @ 8485C2C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc index 5b884a138e..68a7098fbe 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ b/data/maps/Route110_TrickHousePuzzle7/header.inc @@ -11,5 +11,5 @@ Route110_TrickHousePuzzle7: @ 8485C48 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc index def3cab3db..a330e3c1f7 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ b/data/maps/Route110_TrickHousePuzzle8/header.inc @@ -11,5 +11,5 @@ Route110_TrickHousePuzzle8: @ 8485C64 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc index 3ae44b79a9..449498ed49 100644 --- a/data/maps/Route111/header.inc +++ b/data/maps/Route111/header.inc @@ -11,5 +11,5 @@ Route111: @ 8482790 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc index b58e0f3df3..70bbe3777f 100644 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ b/data/maps/Route111_OldLadysRestStop/header.inc @@ -11,5 +11,5 @@ Route111_OldLadysRestStop: @ 8483DC4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc index 43ce6de6df..dea0352e68 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -11,5 +11,5 @@ Route111_WinstrateFamilysHouse: @ 8483DA8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc index 040d0d0848..5961e48c2e 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -11,5 +11,5 @@ Route112: @ 84827AC .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc index 05b88a15b2..8e1dbc8079 100644 --- a/data/maps/Route112_CableCarStation/header.inc +++ b/data/maps/Route112_CableCarStation/header.inc @@ -11,5 +11,5 @@ Route112_CableCarStation: @ 8483DE0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc index 7cd3914788..e1b0827129 100644 --- a/data/maps/Route113/header.inc +++ b/data/maps/Route113/header.inc @@ -11,5 +11,5 @@ Route113: @ 84827C8 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc index 3cbad800bc..9f31f510f0 100644 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ b/data/maps/Route113_GlassWorkshop/header.inc @@ -11,5 +11,5 @@ Route113_GlassWorkshop: @ 8485CB8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc index 99cda55b5c..c0920ada92 100644 --- a/data/maps/Route114/header.inc +++ b/data/maps/Route114/header.inc @@ -11,5 +11,5 @@ Route114: @ 84827E4 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc index 43749207d9..a1ad307e41 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ b/data/maps/Route114_FossilManiacsHouse/header.inc @@ -11,5 +11,5 @@ Route114_FossilManiacsHouse: @ 8483E18 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc index 4892f1077a..2506956710 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ b/data/maps/Route114_FossilManiacsTunnel/header.inc @@ -11,5 +11,5 @@ Route114_FossilManiacsTunnel: @ 8483E34 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc index 2b6ef1e787..8ba9dd58cd 100644 --- a/data/maps/Route114_LanettesHouse/header.inc +++ b/data/maps/Route114_LanettesHouse/header.inc @@ -11,5 +11,5 @@ Route114_LanettesHouse: @ 8483E50 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc index 4490ad646e..5da7c89903 100644 --- a/data/maps/Route115/header.inc +++ b/data/maps/Route115/header.inc @@ -11,5 +11,5 @@ Route115: @ 8482800 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc index 675ba4568c..d0f4bfedf4 100644 --- a/data/maps/Route116/header.inc +++ b/data/maps/Route116/header.inc @@ -11,5 +11,5 @@ Route116: @ 848281C .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc index d18ac8e845..ce7de5c71d 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ b/data/maps/Route116_TunnelersRestHouse/header.inc @@ -11,5 +11,5 @@ Route116_TunnelersRestHouse: @ 8483E6C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index 70104035a2..c720839deb 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 diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc index 72ba07c3ad..d8fb67ce9d 100644 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ b/data/maps/Route117_PokemonDayCare/header.inc @@ -11,5 +11,5 @@ Route117_PokemonDayCare: @ 8483E88 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc index ca2da85244..826281c095 100644 --- a/data/maps/Route118/header.inc +++ b/data/maps/Route118/header.inc @@ -11,5 +11,5 @@ Route118: @ 8482854 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc index 9e37cfdf4b..cb9b211d98 100644 --- a/data/maps/Route119/header.inc +++ b/data/maps/Route119/header.inc @@ -11,5 +11,5 @@ Route119: @ 8482870 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc index 50eb5482b0..e06dc31477 100644 --- a/data/maps/Route119_House/header.inc +++ b/data/maps/Route119_House/header.inc @@ -11,5 +11,5 @@ Route119_House: @ 8485D28 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc index f5a73c34cc..ce15e7ea7b 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ b/data/maps/Route119_WeatherInstitute_1F/header.inc @@ -11,5 +11,5 @@ Route119_WeatherInstitute_1F: @ 8485CF0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc index effe5f0661..eb8d25cd0a 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ b/data/maps/Route119_WeatherInstitute_2F/header.inc @@ -11,5 +11,5 @@ Route119_WeatherInstitute_2F: @ 8485D0C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc index 7675680158..a3b062bcaa 100644 --- a/data/maps/Route120/header.inc +++ b/data/maps/Route120/header.inc @@ -11,5 +11,5 @@ Route120: @ 848288C .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc index 6a106d24df..5f744afafd 100644 --- a/data/maps/Route121/header.inc +++ b/data/maps/Route121/header.inc @@ -11,5 +11,5 @@ Route121: @ 84828A8 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc index 665eacd570..3617aa5b01 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ b/data/maps/Route121_SafariZoneEntrance/header.inc @@ -11,5 +11,5 @@ Route121_SafariZoneEntrance: @ 8483EA4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc index e2554ed2a4..7e6dc55c26 100644 --- a/data/maps/Route122/header.inc +++ b/data/maps/Route122/header.inc @@ -11,5 +11,5 @@ Route122: @ 84828C4 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc index 5b662b8f5d..9eba6be87f 100644 --- a/data/maps/Route123/header.inc +++ b/data/maps/Route123/header.inc @@ -11,5 +11,5 @@ Route123: @ 84828E0 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc index 7ae6169d6d..009b6fa98f 100644 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -11,5 +11,5 @@ Route123_BerryMastersHouse: @ 8485CD4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index 217befb9cb..43aab1b68a 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -11,5 +11,5 @@ Route124: @ 84828FC .byte MAP_TYPE_6 .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc index 74d6665915..777edeff27 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc @@ -11,5 +11,5 @@ Route124_DivingTreasureHuntersHouse: @ 8485D44 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc index f093b492c2..8cf6f85310 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -11,5 +11,5 @@ Route125: @ 8482918 .byte MAP_TYPE_6 .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc index dd713fc558..3e489dffd2 100644 --- a/data/maps/Route126/header.inc +++ b/data/maps/Route126/header.inc @@ -11,5 +11,5 @@ Route126: @ 8482934 .byte MAP_TYPE_6 .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc index 76ebe06c3c..950e11df7b 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -11,5 +11,5 @@ Route127: @ 8482950 .byte MAP_TYPE_6 .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index 5de5e3d91a..6065e257ca 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -11,5 +11,5 @@ Route128: @ 848296C .byte MAP_TYPE_6 .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc index 936c951bea..1bc9ac5f0b 100644 --- a/data/maps/Route129/header.inc +++ b/data/maps/Route129/header.inc @@ -11,5 +11,5 @@ Route129: @ 8482988 .byte MAP_TYPE_6 .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc index 99d1b8aa31..bff8b4e40d 100644 --- a/data/maps/Route130/header.inc +++ b/data/maps/Route130/header.inc @@ -11,5 +11,5 @@ Route130: @ 84829A4 .byte MAP_TYPE_6 .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc index cf3b18e0b3..3e6bf34b36 100644 --- a/data/maps/Route131/header.inc +++ b/data/maps/Route131/header.inc @@ -11,5 +11,5 @@ Route131: @ 84829C0 .byte MAP_TYPE_6 .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc index 46587bf7d0..4e292a92b6 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -11,5 +11,5 @@ Route132: @ 84829DC .byte MAP_TYPE_6 .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index 9f1aad37d8..26428b3dc6 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -11,5 +11,5 @@ Route133: @ 84829F8 .byte MAP_TYPE_6 .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index cdd43da738..d1df504edd 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -11,5 +11,5 @@ Route134: @ 8482A14 .byte MAP_TYPE_6 .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc index c0edf38c9d..6e7bb70d4a 100644 --- a/data/maps/RustboroCity/header.inc +++ b/data/maps/RustboroCity/header.inc @@ -11,5 +11,5 @@ RustboroCity: @ 848250C .byte MAP_TYPE_CITY .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc index 26b4cc1ff5..40742887b4 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ b/data/maps/RustboroCity_CuttersHouse/header.inc @@ -11,5 +11,5 @@ RustboroCity_CuttersHouse: @ 8483478 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc index 855ceb419c..d86b8537c0 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc @@ -11,5 +11,5 @@ RustboroCity_DevonCorp_1F: @ 8483344 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc index 0200f56d21..b0da75514b 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -11,5 +11,5 @@ RustboroCity_DevonCorp_2F: @ 8483360 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc index e212f3dcc5..21a33d5b8b 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -11,5 +11,5 @@ RustboroCity_DevonCorp_3F: @ 848337C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc index e861278db8..b2a4da3172 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ b/data/maps/RustboroCity_Flat1_1F/header.inc @@ -11,5 +11,5 @@ RustboroCity_Flat1_1F: @ 8483424 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc index 960813992f..5a9a5a1332 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ b/data/maps/RustboroCity_Flat1_2F/header.inc @@ -11,5 +11,5 @@ RustboroCity_Flat1_2F: @ 8483440 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc index 1c048f61c2..8df5659360 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ b/data/maps/RustboroCity_Flat2_1F/header.inc @@ -11,5 +11,5 @@ RustboroCity_Flat2_1F: @ 84834B0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc index 326a374f52..92161bb4d8 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ b/data/maps/RustboroCity_Flat2_2F/header.inc @@ -11,5 +11,5 @@ RustboroCity_Flat2_2F: @ 84834CC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc index a9914830c9..fafca84e7f 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ b/data/maps/RustboroCity_Flat2_3F/header.inc @@ -11,5 +11,5 @@ RustboroCity_Flat2_3F: @ 84834E8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc index a31aeeb8bc..8c07e3637c 100644 --- a/data/maps/RustboroCity_Gym/header.inc +++ b/data/maps/RustboroCity_Gym/header.inc @@ -11,5 +11,5 @@ RustboroCity_Gym: @ 8483398 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc index 9ee33359ff..94ae5e1e41 100644 --- a/data/maps/RustboroCity_House1/header.inc +++ b/data/maps/RustboroCity_House1/header.inc @@ -11,5 +11,5 @@ RustboroCity_House1: @ 848345C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc index f966977568..51a6f79844 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -11,5 +11,5 @@ RustboroCity_House2: @ 8483494 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc index aa479cb3f9..89e62cf507 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -11,5 +11,5 @@ RustboroCity_House3: @ 8483504 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc index 0462855677..766c1cb0c4 100644 --- a/data/maps/RustboroCity_Mart/header.inc +++ b/data/maps/RustboroCity_Mart/header.inc @@ -11,5 +11,5 @@ RustboroCity_Mart: @ 8483408 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc index ca5fc513d4..17f717230a 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ RustboroCity_PokemonCenter_1F: @ 84833D0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index 7c2467234a..e7a1999cc8 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 diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index 4c7ca3897f..909e85c691 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ b/data/maps/RustboroCity_PokemonSchool/header.inc @@ -11,5 +11,5 @@ RustboroCity_PokemonSchool: @ 84833B4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc index 6bf405b3b1..4dc4e2797e 100644 --- a/data/maps/RusturfTunnel/header.inc +++ b/data/maps/RusturfTunnel/header.inc @@ -11,5 +11,5 @@ RusturfTunnel: @ 8483F30 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc index 1d892094ce..9c1f2bab2c 100644 --- a/data/maps/SSTidalCorridor/header.inc +++ b/data/maps/SSTidalCorridor/header.inc @@ -11,5 +11,5 @@ SSTidalCorridor: @ 8484F0C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc index 1e2c5b58d0..6db9d2415d 100644 --- a/data/maps/SSTidalLowerDeck/header.inc +++ b/data/maps/SSTidalLowerDeck/header.inc @@ -11,5 +11,5 @@ SSTidalLowerDeck: @ 8484F28 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc index 6f2facdcdc..a5788a49f8 100644 --- a/data/maps/SSTidalRooms/header.inc +++ b/data/maps/SSTidalRooms/header.inc @@ -11,5 +11,5 @@ SSTidalRooms: @ 8484F44 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc index cbf7fae30e..3e667fafce 100644 --- a/data/maps/SafariZone_North/header.inc +++ b/data/maps/SafariZone_North/header.inc @@ -11,5 +11,5 @@ SafariZone_North: @ 8485158 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc index 5630e462aa..7342546118 100644 --- a/data/maps/SafariZone_Northeast/header.inc +++ b/data/maps/SafariZone_Northeast/header.inc @@ -11,5 +11,5 @@ SafariZone_Northeast: @ 848528C .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc index 526111c905..786316fcd6 100644 --- a/data/maps/SafariZone_Northwest/header.inc +++ b/data/maps/SafariZone_Northwest/header.inc @@ -11,5 +11,5 @@ SafariZone_Northwest: @ 848513C .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc index 87e506ac19..1f02725b0b 100644 --- a/data/maps/SafariZone_RestHouse/header.inc +++ b/data/maps/SafariZone_RestHouse/header.inc @@ -11,5 +11,5 @@ SafariZone_RestHouse: @ 8485270 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_South/header.inc b/data/maps/SafariZone_South/header.inc index 160cfea7da..5c60a541b7 100644 --- a/data/maps/SafariZone_South/header.inc +++ b/data/maps/SafariZone_South/header.inc @@ -11,5 +11,5 @@ SafariZone_South: @ 8485190 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc index f87a4db6ac..54f2c505ac 100644 --- a/data/maps/SafariZone_Southeast/header.inc +++ b/data/maps/SafariZone_Southeast/header.inc @@ -11,5 +11,5 @@ SafariZone_Southeast: @ 84852A8 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc index 28bd8c761c..332d2f9a4a 100644 --- a/data/maps/SafariZone_Southwest/header.inc +++ b/data/maps/SafariZone_Southwest/header.inc @@ -11,5 +11,5 @@ SafariZone_Southwest: @ 8485174 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc index eb61455fae..1de3fd4139 100644 --- a/data/maps/ScorchedSlab/header.inc +++ b/data/maps/ScorchedSlab/header.inc @@ -11,5 +11,5 @@ ScorchedSlab: @ 84846BC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc index dc62eba0ca..417467ac57 100644 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ b/data/maps/SeafloorCavern_Entrance/header.inc @@ -11,5 +11,5 @@ SeafloorCavern_Entrance: @ 84841B4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc index dd0a2db3cc..e259b065bf 100644 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ b/data/maps/SeafloorCavern_Room1/header.inc @@ -11,5 +11,5 @@ SeafloorCavern_Room1: @ 84841D0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc index 09be291c28..6331b3b185 100644 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ b/data/maps/SeafloorCavern_Room2/header.inc @@ -11,5 +11,5 @@ SeafloorCavern_Room2: @ 84841EC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc index ff514a631a..a91ef42ef1 100644 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ b/data/maps/SeafloorCavern_Room3/header.inc @@ -11,5 +11,5 @@ SeafloorCavern_Room3: @ 8484208 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc index 130f198aa5..7385a41fba 100644 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ b/data/maps/SeafloorCavern_Room4/header.inc @@ -11,5 +11,5 @@ SeafloorCavern_Room4: @ 8484224 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc index 5945206290..aa2b0dc56e 100644 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ b/data/maps/SeafloorCavern_Room5/header.inc @@ -11,5 +11,5 @@ SeafloorCavern_Room5: @ 8484240 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc index 24c8fde989..2f76c9b8f4 100644 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ b/data/maps/SeafloorCavern_Room6/header.inc @@ -11,5 +11,5 @@ SeafloorCavern_Room6: @ 848425C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc index b2c247ab92..3640bb597a 100644 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ b/data/maps/SeafloorCavern_Room7/header.inc @@ -11,5 +11,5 @@ SeafloorCavern_Room7: @ 8484278 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc index 6bab8f16b5..66e6523f02 100644 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ b/data/maps/SeafloorCavern_Room8/header.inc @@ -11,5 +11,5 @@ SeafloorCavern_Room8: @ 8484294 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc index b50127ffc4..2f08ec83a0 100644 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ b/data/maps/SeafloorCavern_Room9/header.inc @@ -11,5 +11,5 @@ SeafloorCavern_Room9: @ 84842B0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 14 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc index f61e4d1f9a..541842c26f 100644 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ b/data/maps/SealedChamber_InnerRoom/header.inc @@ -11,5 +11,5 @@ SealedChamber_InnerRoom: @ 84846A0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc index dd214cba65..5fa6728d85 100644 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ b/data/maps/SealedChamber_OuterRoom/header.inc @@ -11,5 +11,5 @@ SealedChamber_OuterRoom: @ 8484684 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc index bfce096695..f75acd84a6 100644 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ b/data/maps/SecretBase_BlueCave1/header.inc @@ -11,5 +11,5 @@ SecretBase_BlueCave1: @ 8484AC8 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc index 33555b1b19..6b80b45bb1 100644 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ b/data/maps/SecretBase_BlueCave2/header.inc @@ -11,5 +11,5 @@ SecretBase_BlueCave2: @ 8484B70 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc index 0f48e009dc..19a4afdfda 100644 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ b/data/maps/SecretBase_BlueCave3/header.inc @@ -11,5 +11,5 @@ SecretBase_BlueCave3: @ 8484C18 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc index c43be047e7..3a51deec48 100644 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ b/data/maps/SecretBase_BlueCave4/header.inc @@ -11,5 +11,5 @@ SecretBase_BlueCave4: @ 8484CC0 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc index b423185f28..7a79eab3e3 100644 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ b/data/maps/SecretBase_BrownCave1/header.inc @@ -11,5 +11,5 @@ SecretBase_BrownCave1: @ 8484AAC .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc index e51a43f138..5f0e61f8c6 100644 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ b/data/maps/SecretBase_BrownCave2/header.inc @@ -11,5 +11,5 @@ SecretBase_BrownCave2: @ 8484B54 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc index 5b9fe83e4b..bd88bf1d3f 100644 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ b/data/maps/SecretBase_BrownCave3/header.inc @@ -11,5 +11,5 @@ SecretBase_BrownCave3: @ 8484BFC .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc index fc821510f8..8183eee678 100644 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ b/data/maps/SecretBase_BrownCave4/header.inc @@ -11,5 +11,5 @@ SecretBase_BrownCave4: @ 8484CA4 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc index 2bb11dac2b..774e8471ea 100644 --- a/data/maps/SecretBase_RedCave1/header.inc +++ b/data/maps/SecretBase_RedCave1/header.inc @@ -11,5 +11,5 @@ SecretBase_RedCave1: @ 8484A90 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc index f0e5d976ad..2137748afc 100644 --- a/data/maps/SecretBase_RedCave2/header.inc +++ b/data/maps/SecretBase_RedCave2/header.inc @@ -11,5 +11,5 @@ SecretBase_RedCave2: @ 8484B38 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc index b62553c883..04b0ae23a0 100644 --- a/data/maps/SecretBase_RedCave3/header.inc +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -11,5 +11,5 @@ SecretBase_RedCave3: @ 8484BE0 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc index 1b7a86f06c..94c8605a02 100644 --- a/data/maps/SecretBase_RedCave4/header.inc +++ b/data/maps/SecretBase_RedCave4/header.inc @@ -11,5 +11,5 @@ SecretBase_RedCave4: @ 8484C88 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc index 604f32e19b..85e94f1581 100644 --- a/data/maps/SecretBase_Shrub1/header.inc +++ b/data/maps/SecretBase_Shrub1/header.inc @@ -11,5 +11,5 @@ SecretBase_Shrub1: @ 8484B1C .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc index 2454dd2ada..7beeb3d8b0 100644 --- a/data/maps/SecretBase_Shrub2/header.inc +++ b/data/maps/SecretBase_Shrub2/header.inc @@ -11,5 +11,5 @@ SecretBase_Shrub2: @ 8484BC4 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc index 9a0f7e8d7d..18b1f132ac 100644 --- a/data/maps/SecretBase_Shrub3/header.inc +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -11,5 +11,5 @@ SecretBase_Shrub3: @ 8484C6C .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index 4cfdf043b8..72c5724f6f 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 diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index dc2c07918e..a9a3416964 100644 --- a/data/maps/SecretBase_Tree1/header.inc +++ b/data/maps/SecretBase_Tree1/header.inc @@ -11,5 +11,5 @@ SecretBase_Tree1: @ 8484B00 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc index 7a35c54668..86898ed155 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -11,5 +11,5 @@ SecretBase_Tree2: @ 8484BA8 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc index bffa571d56..6ef9407965 100644 --- a/data/maps/SecretBase_Tree3/header.inc +++ b/data/maps/SecretBase_Tree3/header.inc @@ -11,5 +11,5 @@ SecretBase_Tree3: @ 8484C50 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc index 55f3f56f1b..2a2523a074 100644 --- a/data/maps/SecretBase_Tree4/header.inc +++ b/data/maps/SecretBase_Tree4/header.inc @@ -11,5 +11,5 @@ SecretBase_Tree4: @ 8484CF8 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc index 69287b49f1..d15eacc36e 100644 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ b/data/maps/SecretBase_YellowCave1/header.inc @@ -11,5 +11,5 @@ SecretBase_YellowCave1: @ 8484AE4 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc index 98b4739e06..a1afc748a2 100644 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ b/data/maps/SecretBase_YellowCave2/header.inc @@ -11,5 +11,5 @@ SecretBase_YellowCave2: @ 8484B8C .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc index 681dc7c439..798754531a 100644 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ b/data/maps/SecretBase_YellowCave3/header.inc @@ -11,5 +11,5 @@ SecretBase_YellowCave3: @ 8484C34 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc index edfe53d6e3..89921f1d4d 100644 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ b/data/maps/SecretBase_YellowCave4/header.inc @@ -11,5 +11,5 @@ SecretBase_YellowCave4: @ 8484CDC .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc index 5d136baee7..507ad70549 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc @@ -11,5 +11,5 @@ ShoalCave_HighTideEntranceRoom: @ 8484438 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc index 867de3f37e..1d334424b1 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc @@ -11,5 +11,5 @@ ShoalCave_HighTideInnerRoom: @ 8484454 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc index 005e502ad8..98614de643 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc @@ -11,5 +11,5 @@ ShoalCave_LowTideEntranceRoom: @ 84843C8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc index df62a5cfb9..05b77a442b 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc @@ -11,5 +11,5 @@ ShoalCave_LowTideIceRoom: @ 84847D4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc index 9caf4d5c3e..b1ab8a459e 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc @@ -11,5 +11,5 @@ ShoalCave_LowTideInnerRoom: @ 84843E4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc index 9b2a56e230..0c8380b794 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc @@ -11,5 +11,5 @@ ShoalCave_LowTideLowerRoom: @ 848441C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc index 674ce7f6db..8a977c94ec 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc @@ -11,5 +11,5 @@ ShoalCave_LowTideStairsRoom: @ 8484400 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc index f89fe04507..fe4b69f968 100644 --- a/data/maps/SingleBattleColosseum/header.inc +++ b/data/maps/SingleBattleColosseum/header.inc @@ -11,5 +11,5 @@ SingleBattleColosseum: @ 8484D30 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc index 1358d164c8..842ec79cda 100644 --- a/data/maps/SkyPillar_1F/header.inc +++ b/data/maps/SkyPillar_1F/header.inc @@ -11,5 +11,5 @@ SkyPillar_1F: @ 8484764 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc index b861a2ab4d..e018869b9d 100644 --- a/data/maps/SkyPillar_2F/header.inc +++ b/data/maps/SkyPillar_2F/header.inc @@ -11,5 +11,5 @@ SkyPillar_2F: @ 8484780 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc index 68903b8a2b..e3b2c3c40c 100644 --- a/data/maps/SkyPillar_3F/header.inc +++ b/data/maps/SkyPillar_3F/header.inc @@ -11,5 +11,5 @@ SkyPillar_3F: @ 848479C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc index f74d33ce83..23addaa769 100644 --- a/data/maps/SkyPillar_4F/header.inc +++ b/data/maps/SkyPillar_4F/header.inc @@ -11,5 +11,5 @@ SkyPillar_4F: @ 84847B8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc index 40c2fbe729..46830945d5 100644 --- a/data/maps/SkyPillar_5F/header.inc +++ b/data/maps/SkyPillar_5F/header.inc @@ -11,5 +11,5 @@ SkyPillar_5F: @ 84847F0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc index 5ef569e651..bafe1880a4 100644 --- a/data/maps/SkyPillar_Entrance/header.inc +++ b/data/maps/SkyPillar_Entrance/header.inc @@ -11,5 +11,5 @@ SkyPillar_Entrance: @ 848472C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc index e61123f1c7..5e7ff153cc 100644 --- a/data/maps/SkyPillar_Outside/header.inc +++ b/data/maps/SkyPillar_Outside/header.inc @@ -11,5 +11,5 @@ SkyPillar_Outside: @ 8484748 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc index 919534fc22..d4afb6ad16 100644 --- a/data/maps/SkyPillar_Top/header.inc +++ b/data/maps/SkyPillar_Top/header.inc @@ -11,5 +11,5 @@ SkyPillar_Top: @ 848480C .byte MAP_TYPE_ROUTE .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc index adbda2e3a4..335a1a0947 100644 --- a/data/maps/SlateportCity/header.inc +++ b/data/maps/SlateportCity/header.inc @@ -11,5 +11,5 @@ SlateportCity: @ 84824D4 .byte MAP_TYPE_CITY .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc index 3f5e5809a4..0b6c6bd39a 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc @@ -11,5 +11,5 @@ SlateportCity_BattleTentBattleRoom: @ 848314C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_BattleTentCorridor/header.inc b/data/maps/SlateportCity_BattleTentCorridor/header.inc index 6721bdef11..926a367eeb 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/header.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/header.inc @@ -11,5 +11,5 @@ SlateportCity_BattleTentCorridor: @ 8483130 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_BattleTentLobby/header.inc b/data/maps/SlateportCity_BattleTentLobby/header.inc index 46b5d595ea..d4689afde9 100644 --- a/data/maps/SlateportCity_BattleTentLobby/header.inc +++ b/data/maps/SlateportCity_BattleTentLobby/header.inc @@ -11,5 +11,5 @@ SlateportCity_BattleTentLobby: @ 8483114 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc index 22b61d048a..5a31901a37 100644 --- a/data/maps/SlateportCity_Harbor/header.inc +++ b/data/maps/SlateportCity_Harbor/header.inc @@ -11,5 +11,5 @@ SlateportCity_Harbor: @ 84831D8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc index d61584a37b..06e2689cdd 100644 --- a/data/maps/SlateportCity_House1/header.inc +++ b/data/maps/SlateportCity_House1/header.inc @@ -11,5 +11,5 @@ SlateportCity_House1: @ 8483168 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc index 3e2e6434d2..5612c6df05 100644 --- a/data/maps/SlateportCity_House2/header.inc +++ b/data/maps/SlateportCity_House2/header.inc @@ -11,5 +11,5 @@ SlateportCity_House2: @ 84831F4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc index 36c3dfb573..764b8e9b5b 100644 --- a/data/maps/SlateportCity_Mart/header.inc +++ b/data/maps/SlateportCity_Mart/header.inc @@ -11,5 +11,5 @@ SlateportCity_Mart: @ 8483248 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc index fa4366df62..40b265c1d8 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc @@ -11,5 +11,5 @@ SlateportCity_OceanicMuseum_1F: @ 84831A0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc index dc3f5a2453..857443db14 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc @@ -11,5 +11,5 @@ SlateportCity_OceanicMuseum_2F: @ 84831BC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc index abafe50fdf..0c4696d863 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ SlateportCity_PokemonCenter_1F: @ 8483210 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc index 343c205122..8026aaf415 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ SlateportCity_PokemonCenter_2F: @ 848322C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc index fcbe42d2c9..90b17f14a9 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ b/data/maps/SlateportCity_PokemonFanClub/header.inc @@ -11,5 +11,5 @@ SlateportCity_PokemonFanClub: @ 8483184 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc index 1d054f587b..48d1845174 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc @@ -11,5 +11,5 @@ SlateportCity_SternsShipyard_1F: @ 84830DC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc index 9be63a0bba..b868e843af 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc @@ -11,5 +11,5 @@ SlateportCity_SternsShipyard_2F: @ 84830F8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc index a7d0d04d5f..e635b6f807 100644 --- a/data/maps/SootopolisCity/header.inc +++ b/data/maps/SootopolisCity/header.inc @@ -11,5 +11,5 @@ SootopolisCity: @ 848257C .byte MAP_TYPE_CITY .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc index aaaeb85ed8..8b5c93c0d0 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ b/data/maps/SootopolisCity_Gym_1F/header.inc @@ -11,5 +11,5 @@ SootopolisCity_Gym_1F: @ 8483A28 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc index f2e9e2b4dd..84caedcf87 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ b/data/maps/SootopolisCity_Gym_B1F/header.inc @@ -11,5 +11,5 @@ SootopolisCity_Gym_B1F: @ 8483A44 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc index e728413634..0b4eae6199 100644 --- a/data/maps/SootopolisCity_House1/header.inc +++ b/data/maps/SootopolisCity_House1/header.inc @@ -11,5 +11,5 @@ SootopolisCity_House1: @ 8483AB4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc index 555c1c7a15..a0d8b4fb49 100644 --- a/data/maps/SootopolisCity_House2/header.inc +++ b/data/maps/SootopolisCity_House2/header.inc @@ -11,5 +11,5 @@ SootopolisCity_House2: @ 8483AD0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc index da684a6326..015f6fe6c5 100644 --- a/data/maps/SootopolisCity_House3/header.inc +++ b/data/maps/SootopolisCity_House3/header.inc @@ -11,5 +11,5 @@ SootopolisCity_House3: @ 8483AEC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc index badfcc2011..21c8c9235c 100644 --- a/data/maps/SootopolisCity_House4/header.inc +++ b/data/maps/SootopolisCity_House4/header.inc @@ -11,5 +11,5 @@ SootopolisCity_House4: @ 8483B08 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc index bf52a354f1..60fa216ca0 100644 --- a/data/maps/SootopolisCity_House5/header.inc +++ b/data/maps/SootopolisCity_House5/header.inc @@ -11,5 +11,5 @@ SootopolisCity_House5: @ 8483B24 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc index 82decfbba2..112aa8a6d3 100644 --- a/data/maps/SootopolisCity_House6/header.inc +++ b/data/maps/SootopolisCity_House6/header.inc @@ -11,5 +11,5 @@ SootopolisCity_House6: @ 8483B40 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc index 27afdc4ee6..a016164191 100644 --- a/data/maps/SootopolisCity_House7/header.inc +++ b/data/maps/SootopolisCity_House7/header.inc @@ -11,5 +11,5 @@ SootopolisCity_House7: @ 8483B5C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc index 573b465bac..b89221bacb 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc @@ -11,5 +11,5 @@ SootopolisCity_LotadAndSeedotHouse: @ 8483B78 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc index 66400ad1d6..4bdd9ef8d9 100644 --- a/data/maps/SootopolisCity_Mart/header.inc +++ b/data/maps/SootopolisCity_Mart/header.inc @@ -11,5 +11,5 @@ SootopolisCity_Mart: @ 8483A98 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc index b9b7172988..be2d37eb62 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc @@ -11,5 +11,5 @@ SootopolisCity_MysteryEventsHouse_1F: @ 8483B94 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc index 0630ba7496..6635dc3d7d 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc @@ -11,5 +11,5 @@ SootopolisCity_MysteryEventsHouse_B1F: @ 8483BB0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc index d50ba8f019..c66b725fd9 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ SootopolisCity_PokemonCenter_1F: @ 8483A60 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc index 380f346a65..3a2844f4ed 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ SootopolisCity_PokemonCenter_2F: @ 8483A7C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc index f7498c0707..f6153e13ff 100644 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ b/data/maps/SouthernIsland_Exterior/header.inc @@ -11,5 +11,5 @@ SouthernIsland_Exterior: @ 8485238 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc index eb5e1d5723..e674840cfb 100644 --- a/data/maps/SouthernIsland_Interior/header.inc +++ b/data/maps/SouthernIsland_Interior/header.inc @@ -11,5 +11,5 @@ SouthernIsland_Interior: @ 8485254 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TerraCave_End/header.inc b/data/maps/TerraCave_End/header.inc index b84a1a0718..b69a9b5011 100644 --- a/data/maps/TerraCave_End/header.inc +++ b/data/maps/TerraCave_End/header.inc @@ -11,5 +11,5 @@ TerraCave_End: @ 8484A3C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 14 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TerraCave_Entrance/header.inc b/data/maps/TerraCave_Entrance/header.inc index 69f541f7c1..88ef9d3efe 100644 --- a/data/maps/TerraCave_Entrance/header.inc +++ b/data/maps/TerraCave_Entrance/header.inc @@ -11,5 +11,5 @@ TerraCave_Entrance: @ 8484A20 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 497a3219d0..947cdbde26 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 diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc index fae6fccae0..b21e67e69a 100644 --- a/data/maps/TrainerHill_1F/header.inc +++ b/data/maps/TrainerHill_1F/header.inc @@ -11,5 +11,5 @@ TrainerHill_1F: @ 84857E8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TrainerHill_2F/header.inc b/data/maps/TrainerHill_2F/header.inc index 7cb9d5e674..e2a02834e0 100644 --- a/data/maps/TrainerHill_2F/header.inc +++ b/data/maps/TrainerHill_2F/header.inc @@ -11,5 +11,5 @@ TrainerHill_2F: @ 8485804 .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TrainerHill_3F/header.inc b/data/maps/TrainerHill_3F/header.inc index f9834ed5f2..c7513cc96b 100644 --- a/data/maps/TrainerHill_3F/header.inc +++ b/data/maps/TrainerHill_3F/header.inc @@ -11,5 +11,5 @@ TrainerHill_3F: @ 8485820 .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TrainerHill_4F/header.inc b/data/maps/TrainerHill_4F/header.inc index 59c3391122..f25ce4e976 100644 --- a/data/maps/TrainerHill_4F/header.inc +++ b/data/maps/TrainerHill_4F/header.inc @@ -11,5 +11,5 @@ TrainerHill_4F: @ 848583C .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TrainerHill_Elevator/header.inc b/data/maps/TrainerHill_Elevator/header.inc index ca48bb8236..0d4e95af31 100644 --- a/data/maps/TrainerHill_Elevator/header.inc +++ b/data/maps/TrainerHill_Elevator/header.inc @@ -11,5 +11,5 @@ TrainerHill_Elevator: @ 8485ADC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TrainerHill_Entrance/header.inc b/data/maps/TrainerHill_Entrance/header.inc index 91b6cf3459..8e8eb4b919 100644 --- a/data/maps/TrainerHill_Entrance/header.inc +++ b/data/maps/TrainerHill_Entrance/header.inc @@ -11,5 +11,5 @@ TrainerHill_Entrance: @ 84857CC .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TrainerHill_Roof/header.inc b/data/maps/TrainerHill_Roof/header.inc index f70f69aa07..d4d431dc59 100644 --- a/data/maps/TrainerHill_Roof/header.inc +++ b/data/maps/TrainerHill_Roof/header.inc @@ -11,5 +11,5 @@ TrainerHill_Roof: @ 8485858 .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc index d62735bb85..bf5589117d 100644 --- a/data/maps/Underwater1/header.inc +++ b/data/maps/Underwater1/header.inc @@ -11,5 +11,5 @@ Underwater1: @ 8482A30 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc index bc71590eaf..5bd5b037b9 100644 --- a/data/maps/Underwater2/header.inc +++ b/data/maps/Underwater2/header.inc @@ -11,5 +11,5 @@ Underwater2: @ 8482A4C .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc index 83fbe61554..064a732a5f 100644 --- a/data/maps/Underwater3/header.inc +++ b/data/maps/Underwater3/header.inc @@ -11,5 +11,5 @@ Underwater3: @ 8482A68 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc index 2f826994b0..7752479de1 100644 --- a/data/maps/Underwater4/header.inc +++ b/data/maps/Underwater4/header.inc @@ -11,5 +11,5 @@ Underwater4: @ 8482A84 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater5/header.inc b/data/maps/Underwater5/header.inc index 9cdd79bf7a..dda2f54b19 100644 --- a/data/maps/Underwater5/header.inc +++ b/data/maps/Underwater5/header.inc @@ -11,5 +11,5 @@ Underwater5: @ 8482AA0 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater6/header.inc b/data/maps/Underwater6/header.inc index 2da188f55a..17769c3317 100644 --- a/data/maps/Underwater6/header.inc +++ b/data/maps/Underwater6/header.inc @@ -11,5 +11,5 @@ Underwater6: @ 8482ABC .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater7/header.inc b/data/maps/Underwater7/header.inc index d9e75b02bb..f5bc3bfa35 100644 --- a/data/maps/Underwater7/header.inc +++ b/data/maps/Underwater7/header.inc @@ -11,5 +11,5 @@ Underwater7: @ 8482AD8 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater_MarineCave/header.inc b/data/maps/Underwater_MarineCave/header.inc index f8de0fb73d..7232ba916c 100644 --- a/data/maps/Underwater_MarineCave/header.inc +++ b/data/maps/Underwater_MarineCave/header.inc @@ -11,5 +11,5 @@ Underwater_MarineCave: @ 84849CC .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc index 42c890ef6e..71332ec787 100644 --- a/data/maps/Underwater_Route134/header.inc +++ b/data/maps/Underwater_Route134/header.inc @@ -11,5 +11,5 @@ Underwater_Route134: @ 848464C .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc index 96c31fa88a..bc2efc58e5 100644 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ b/data/maps/Underwater_SeafloorCavern/header.inc @@ -11,5 +11,5 @@ Underwater_SeafloorCavern: @ 8484198 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc index b2fa29ceb5..0c6e945750 100644 --- a/data/maps/Underwater_SealedChamber/header.inc +++ b/data/maps/Underwater_SealedChamber/header.inc @@ -11,5 +11,5 @@ Underwater_SealedChamber: @ 8484668 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc index 35d0891adf..c4f55b1ef4 100644 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ b/data/maps/Underwater_SootopolisCity/header.inc @@ -11,5 +11,5 @@ Underwater_SootopolisCity: @ 8483F4C .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc index 436c396142..29608287d4 100644 --- a/data/maps/UnionRoom/header.inc +++ b/data/maps/UnionRoom/header.inc @@ -11,5 +11,5 @@ UnionRoom: @ 8485120 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index cdeeb42076..3241622ac7 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -11,5 +11,5 @@ UnknownMap_25_29: @ 8484DBC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc index 5648f07154..c1188df548 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -11,5 +11,5 @@ UnknownMap_25_30: @ 8484DD8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc index 6e87bdc753..68eb31bc6c 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -11,5 +11,5 @@ UnknownMap_25_31: @ 8484DF4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc index d899a6e516..c8d16cd09c 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -11,5 +11,5 @@ UnknownMap_25_32: @ 8484E10 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc index bd048756d1..45f9543dfa 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -11,5 +11,5 @@ UnknownMap_25_33: @ 8484E2C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc index 33b51a4048..0b612b27c4 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -11,5 +11,5 @@ UnknownMap_25_34: @ 8484E48 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc index 16a1a3e2a7..e07566710e 100644 --- a/data/maps/VerdanturfTown/header.inc +++ b/data/maps/VerdanturfTown/header.inc @@ -11,5 +11,5 @@ VerdanturfTown: @ 8482640 .byte MAP_TYPE_TOWN .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc index 8c70d2cbaa..30daf14ca6 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc @@ -11,5 +11,5 @@ VerdanturfTown_BattleTentBattleRoom: @ 8482E90 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc index bcd2185ab9..e75e2f0035 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc @@ -11,5 +11,5 @@ VerdanturfTown_BattleTentCorridor: @ 8482E74 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_BattleTentLobby/header.inc b/data/maps/VerdanturfTown_BattleTentLobby/header.inc index fe779c062e..5852d60f4d 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/header.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/header.inc @@ -11,5 +11,5 @@ VerdanturfTown_BattleTentLobby: @ 8482E58 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc index 015f71d0ce..dfb4b0d05a 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -11,5 +11,5 @@ VerdanturfTown_FriendshipRatersHouse: @ 8482F1C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc index 599b1f59ae..7f223d09ae 100644 --- a/data/maps/VerdanturfTown_House/header.inc +++ b/data/maps/VerdanturfTown_House/header.inc @@ -11,5 +11,5 @@ VerdanturfTown_House: @ 8482F38 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc index 315a42e568..4846b25e32 100644 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ b/data/maps/VerdanturfTown_Mart/header.inc @@ -11,5 +11,5 @@ VerdanturfTown_Mart: @ 8482EAC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc index 5d17e03b91..9ae2edb7fe 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ VerdanturfTown_PokemonCenter_1F: @ 8482EC8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc index 0f881653de..a2a5a929e1 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ VerdanturfTown_PokemonCenter_2F: @ 8482EE4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc index 69eae1a165..1887b78804 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ b/data/maps/VerdanturfTown_WandasHouse/header.inc @@ -11,5 +11,5 @@ VerdanturfTown_WandasHouse: @ 8482F00 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index 81e866d499..56b800a29d 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -11,5 +11,5 @@ VictoryRoad_1F: @ 8484374 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc index 341350a7aa..6650653ef5 100644 --- a/data/maps/VictoryRoad_B1F/header.inc +++ b/data/maps/VictoryRoad_B1F/header.inc @@ -11,5 +11,5 @@ VictoryRoad_B1F: @ 8484390 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc index cd3451af71..c89256b339 100644 --- a/data/maps/VictoryRoad_B2F/header.inc +++ b/data/maps/VictoryRoad_B2F/header.inc @@ -11,5 +11,5 @@ VictoryRoad_B2F: @ 84843AC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL From 731d6d59bc624e0350b3396f135a35f6c9bdc4f8 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sun, 15 Jul 2018 04:23:38 -0700 Subject: [PATCH 53/55] Document list_menu.c and main_menu.c --- asm/easy_chat.s | 2 +- asm/field_specials.s | 4 +- asm/learn_move.s | 2 +- asm/link_rfu.s | 2 +- asm/party_menu.s | 2 +- asm/pokemon_storage_system.s | 4 +- asm/pokemon_summary_screen.s | 6 +- asm/pokenav.s | 6 +- asm/rom_8011DC0.s | 34 +- asm/shop.s | 4 +- asm/slot_machine.s | 2 +- asm/trade.s | 2 +- common_syms/list_menu.txt | 2 +- .../scripts.inc | 2 +- .../LilycoveCity_ContestLobby/scripts.inc | 2 +- data/rom_8011DC0.s | 20 +- data/scripts/cable_club.inc | 8 +- data/scripts/pokeblocks.inc | 2 +- data/specials.inc | 2 +- include/event_object_movement.h | 2 +- include/gba/io_reg.h | 29 + include/link.h | 2 +- include/list_menu.h | 66 +- include/palette.h | 14 +- include/sprite.h | 37 +- include/text.h | 11 + include/text_window.h | 4 +- src/battle_bg.c | 4 +- src/battle_controller_player.c | 8 +- src/battle_controller_safari.c | 2 +- src/battle_controller_wally.c | 2 +- src/battle_main.c | 12 +- src/battle_records.c | 4 +- src/battle_script_commands.c | 4 +- src/battle_transition.c | 10 +- src/berry_blender.c | 16 +- src/berry_tag_screen.c | 4 +- src/clear_save_data_screen.c | 2 +- src/daycare.c | 10 +- src/decoration.c | 2 +- src/diploma.c | 4 +- src/egg_hatch.c | 10 +- src/event_object_movement.c | 2 +- src/evolution_scene.c | 16 +- src/field_region_map.c | 6 +- src/hall_of_fame.c | 8 +- src/item_menu.c | 16 +- src/link.c | 4 +- src/list_menu.c | 611 +++++++++--------- src/mail.c | 4 +- src/main_menu.c | 380 ++++++----- src/map_name_popup.c | 2 +- src/menu.c | 30 +- src/mystery_event_menu.c | 6 +- src/option_menu.c | 4 +- src/player_pc.c | 4 +- src/pokeblock.c | 18 +- src/pokeblock_feed.c | 8 +- src/pokemon_summary_screen.c | 4 +- src/rayquaza_scene.c | 20 +- src/recorded_battle.c | 2 +- src/region_map.c | 6 +- src/reset_rtc_screen.c | 4 +- src/scrcmd.c | 2 +- src/secret_base.c | 2 +- src/start_menu.c | 4 +- src/starter_choose.c | 6 +- src/text.c | 22 +- src/text_window.c | 8 +- src/title_screen.c | 10 +- src/unk_transition.c | 2 +- src/use_pokeblock.c | 2 +- src/wallclock.c | 8 +- 73 files changed, 836 insertions(+), 752 deletions(-) diff --git a/asm/easy_chat.s b/asm/easy_chat.s index eb423cf4cf..1d8753fa05 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -5988,7 +5988,7 @@ sub_811D0BC: @ 811D0BC movs r0, 0x1 movs r1, 0x1 movs r2, 0xE0 - bl sub_809882C + bl LoadUserWindowBorderGfx movs r0, 0x1 movs r1, 0x1 movs r2, 0xE diff --git a/asm/field_specials.s b/asm/field_specials.s index 3db5080015..75aa161e5a 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -912,7 +912,7 @@ _0813839C: adds r0, r5, 0 adds r2, r4, 0 mov r3, r12 - bl SpawnSpecialEventObjectParametrized + bl SpawnSpecialEventObjectParameterized adds r0, r5, 0 adds r1, r4, 0 adds r2, r6, 0 @@ -2557,7 +2557,7 @@ SpawnScriptEventObject: @ 8139158 movs r0, 0x7 movs r1, 0x8 movs r2, 0x7F - bl SpawnSpecialEventObjectParametrized + bl SpawnSpecialEventObjectParameterized lsls r0, 24 lsrs r0, 24 ldr r2, =gEventObjects diff --git a/asm/learn_move.s b/asm/learn_move.s index a33bd11b65..109f1a32e2 100644 --- a/asm/learn_move.s +++ b/asm/learn_move.s @@ -1270,7 +1270,7 @@ _081611D4: ldrb r0, [r0] cmp r0, 0xFF bne _08161210 - ldr r0, =gUnknown_0203CE8C + ldr r0, =gTempScrollArrowTemplate adds r2, r0, 0 ldr r1, =gUnknown_085CEBD0 ldm r1!, {r3,r5,r6} diff --git a/asm/link_rfu.s b/asm/link_rfu.s index e53685c281..1179b9866c 100644 --- a/asm/link_rfu.s +++ b/asm/link_rfu.s @@ -856,7 +856,7 @@ sub_8011AFC: @ 8011AFC bl ResetPaletteFade ldr r0, =sub_8011AE8 bl SetVBlankCallback - bl sub_80093CC + bl IsWirelessAdapterConnected lsls r0, 24 cmp r0, 0 beq _08011B70 diff --git a/asm/party_menu.s b/asm/party_menu.s index 5c1e6c1b09..ff370a552a 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -4396,7 +4396,7 @@ _081B23E8: movs r0, 0 movs r1, 0x4F movs r2, 0xD0 - bl sub_809882C + bl LoadUserWindowBorderGfx bl GetOverworldTextboxPalettePtr movs r1, 0xE0 movs r2, 0x20 diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 5988eb7323..b02f3e58a4 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -1837,7 +1837,7 @@ _080C805E: movs r0, 0x1 movs r1, 0xB movs r2, 0xE0 - bl sub_809882C + bl LoadUserWindowBorderGfx b _080C8198 .pool _080C808C: @@ -6712,7 +6712,7 @@ sub_80CAC1C: @ 80CAC1C movs r0, 0x1 movs r1, 0x2 movs r2, 0xD0 - bl sub_809882C + bl LoadUserWindowBorderGfx movs r0, 0x20 str r0, [sp] movs r0, 0x14 diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index d758aa3141..12ed6341d0 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -2869,7 +2869,7 @@ sub_81C5674: @ 81C5674 movs r1, 0xAC movs r2, 0xC movs r3, 0x94 - bl AddScrollIndicatorArrowPairParametrized + bl AddScrollIndicatorArrowPairParameterized ldr r1, [r4] ldr r2, =0x00000816 adds r1, r2 @@ -4868,7 +4868,7 @@ sub_81C67CC: @ 81C67CC ldrb r0, [r5] movs r1, 0x10 movs r2, 0x1 - bl sub_81AF15C + bl ListMenuSetUnkIndicatorsStructField ldr r0, =gSaveBlock2Ptr ldr r3, [r0] movs r0, 0x2 @@ -5293,7 +5293,7 @@ sub_81C6BD8: @ 81C6BD8 movs r0, 0 movs r1, 0x1 movs r2, 0xE0 - bl sub_809882C + bl LoadUserWindowBorderGfx movs r0, 0 movs r1, 0xA movs r2, 0xD0 diff --git a/asm/pokenav.s b/asm/pokenav.s index ecba5a6271..23f5d8d2af 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -10101,7 +10101,7 @@ sub_81CC09C: @ 81CC09C ldrb r0, [r4, 0x14] movs r1, 0x1 movs r2, 0x40 - bl sub_809882C + bl LoadUserWindowBorderGfx ldrb r0, [r4, 0x14] movs r1, 0x1 movs r2, 0x4 @@ -21001,7 +21001,7 @@ sub_81D1E90: @ 81D1E90 movs r1, 0xC8 movs r2, 0xC movs r3, 0x94 - bl AddScrollIndicatorArrowPairParametrized + bl AddScrollIndicatorArrowPairParameterized strb r0, [r4, 0x9] add sp, 0x10 pop {r4} @@ -22282,7 +22282,7 @@ sub_81D2824: @ 81D2824 movs r0, 0 movs r1, 0x1 movs r2, 0xE0 - bl sub_809882C + bl LoadUserWindowBorderGfx ldr r0, =gUnknown_0860F074 movs r1, 0xF0 movs r2, 0x20 diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index f906304cad..cec26643d1 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -679,7 +679,7 @@ _08012B3C: bl sub_8013398 strb r0, [r6, 0x13] ldrb r0, [r6, 0x12] - bl sub_81AE70C + bl RedrawListMenu b _08012E5C .pool _08012B54: @@ -837,7 +837,7 @@ _08012C5C: movs r0, 0 strb r0, [r1, 0x1B] ldrb r0, [r6, 0x12] - bl sub_81AE70C + bl RedrawListMenu ldrb r0, [r6, 0x13] adds r0, 0x1 strb r0, [r6, 0x13] @@ -908,7 +908,7 @@ _08012D04: ldr r0, [r6] bl sub_8013398 ldrb r0, [r6, 0x12] - bl sub_81AE70C + bl RedrawListMenu _08012D40: movs r0, 0x4 strb r0, [r6, 0xC] @@ -1459,7 +1459,7 @@ _08013228: movs r0, 0x2 bl PlaySE ldrb r0, [r4, 0x12] - bl sub_81AE70C + bl RedrawListMenu ldr r0, =gStringVar2 ldrb r2, [r4, 0x13] lsls r2, 5 @@ -1478,7 +1478,7 @@ _0801325C: movs r1, 0 bl sub_8011A64 ldrb r0, [r4, 0x12] - bl sub_81AE70C + bl RedrawListMenu strb r5, [r4, 0xC] movs r0, 0x1 b _08013272 @@ -2373,7 +2373,7 @@ _08013A70: strb r0, [r6, 0x8] _08013A72: ldrb r0, [r6, 0xE] - bl sub_81AE70C + bl RedrawListMenu b _08013B82 _08013A7A: bl sub_8011A74 @@ -2542,7 +2542,7 @@ sub_8013BD8: @ 8013BD8 movs r1, 0 bl CreateWirelessStatusIndicatorSprite ldrb r0, [r4, 0xE] - bl sub_81AE70C + bl RedrawListMenu ldr r0, =gStringVar1 ldrb r2, [r4, 0xF] lsls r2, 5 @@ -4281,7 +4281,7 @@ _08014C34: bl sub_8013398 strb r0, [r5, 0x13] ldrb r0, [r5, 0x12] - bl sub_81AE70C + bl RedrawListMenu _08014C42: movs r0, 0x2 strb r0, [r5, 0xC] @@ -4326,7 +4326,7 @@ _08014C82: adds r1, r0 strb r4, [r1, 0x1B] ldrb r0, [r5, 0x12] - bl sub_81AE70C + bl RedrawListMenu movs r0, 0x5 strb r0, [r5, 0x19] ldrb r1, [r5, 0x13] @@ -4396,7 +4396,7 @@ _08014CF2: movs r0, 0 strb r0, [r1, 0x1B] ldrb r0, [r5, 0x12] - bl sub_81AE70C + bl RedrawListMenu ldrb r0, [r5, 0x13] adds r0, 0x1 strb r0, [r5, 0x13] @@ -4441,7 +4441,7 @@ _08014D64: ldr r0, [r5] bl sub_8013398 ldrb r0, [r5, 0x12] - bl sub_81AE70C + bl RedrawListMenu movs r0, 0x2 strb r0, [r5, 0xC] _08014DA4: @@ -4784,7 +4784,7 @@ _080150B8: bl PlaySE _080150CE: ldrb r0, [r7, 0xE] - bl sub_81AE70C + bl RedrawListMenu b _080152A0 _080150D6: ldrb r0, [r7, 0xE] @@ -4818,7 +4818,7 @@ _080150D6: movs r1, 0 bl CreateWirelessStatusIndicatorSprite ldrb r0, [r7, 0xE] - bl sub_81AE70C + bl RedrawListMenu ldr r0, =gStringVar1 ldrb r2, [r7, 0xF] lsls r2, 5 @@ -5152,7 +5152,7 @@ _08015436: b _08015604 _0801543E: ldrb r0, [r5, 0xE] - bl sub_81AE70C + bl RedrawListMenu b _08015604 _08015446: ldrb r0, [r5, 0x13] @@ -10972,7 +10972,7 @@ _08018574: movs r0, 0 movs r1, 0xA movs r2, 0xE0 - bl sub_809882C + bl LoadUserWindowBorderGfx movs r0, 0 movs r1, 0x1 movs r2, 0xF0 @@ -15907,7 +15907,7 @@ _0801AD8C: movs r0, 0 movs r1, 0x1 movs r2, 0xD0 - bl sub_809882C + bl LoadUserWindowBorderGfx movs r0, 0 movs r1, 0x1 movs r2, 0xD0 @@ -27081,7 +27081,7 @@ sub_8020740: @ 8020740 movs r0, 0x3 movs r1, 0x1 movs r2, 0xD0 - bl sub_809882C + bl LoadUserWindowBorderGfx movs r0, 0x3 movs r1, 0xA movs r2, 0x20 diff --git a/asm/shop.s b/asm/shop.s index b498da70d5..a51b5d628e 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -877,7 +877,7 @@ BuyMenuAddScrollIndicatorArrows: @ 80E01C8 movs r1, 0xAC movs r2, 0xC movs r3, 0x94 - bl AddScrollIndicatorArrowPairParametrized + bl AddScrollIndicatorArrowPairParameterized ldr r1, [r5] adds r1, r4 strb r0, [r1] @@ -1157,7 +1157,7 @@ BuyMenuInitWindows: @ 80E0468 movs r0, 0 movs r1, 0x1 movs r2, 0xD0 - bl sub_809882C + bl LoadUserWindowBorderGfx movs r0, 0 movs r1, 0xA movs r2, 0xE0 diff --git a/asm/slot_machine.s b/asm/slot_machine.s index fc475c2e3d..6ff7e927f8 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -639,7 +639,7 @@ sub_812AA48: @ 812AA48 lsls r1, 2 movs r0, 0 movs r2, 0xE0 - bl sub_809882C + bl LoadUserWindowBorderGfx movs r0, 0 bl PutWindowTilemap pop {r0} diff --git a/asm/trade.s b/asm/trade.s index b96fb8ca9e..c39aa8a175 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -245,7 +245,7 @@ _08077310: movs r0, 0x2 movs r1, 0x1 movs r2, 0xE0 - bl sub_809882C + bl LoadUserWindowBorderGfx bl LoadMonIconPalettes ldr r2, =gUnknown_0203229C ldr r0, [r2] diff --git a/common_syms/list_menu.txt b/common_syms/list_menu.txt index a346edeef6..ed5343618c 100644 --- a/common_syms/list_menu.txt +++ b/common_syms/list_menu.txt @@ -1,2 +1,2 @@ -gUnknown_03006300 +gListMenuOverride gMultiuseListMenuTemplate diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 478d61656c..1cd2ff74ab 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -551,7 +551,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68 compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 - specialvar VAR_RESULT, sub_80093CC + specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3E8 goto BattleFrontier_BattleTowerLobby_EventScript_23F2C5 diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index a4609ab548..9d37c58edf 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -649,7 +649,7 @@ LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856 goto_eq LilycoveCity_ContestLobby_EventScript_21A97F message LilycoveCity_ContestLobby_Text_27C8FD waitmessage - specialvar VAR_TEMP_D, sub_80093CC + specialvar VAR_TEMP_D, IsWirelessAdapterConnected multichoice 0, 0, 85, 0 switch VAR_RESULT case 0, LilycoveCity_ContestLobby_EventScript_21A8BB diff --git a/data/rom_8011DC0.s b/data/rom_8011DC0.s index bcc7dcd1b5..2d7e09958e 100644 --- a/data/rom_8011DC0.s +++ b/data/rom_8011DC0.s @@ -1315,7 +1315,7 @@ gUnknown_082F0184:: @ 82F0184 .align 2 gUnknown_082F0204:: @ 82F0204 struct ListMenuTemplate .4byte gUnknown_082F0184 - .4byte sub_81AF078 + .4byte ListMenuDefaultCursorMoveFunc .4byte sub_8013DF4 .byte 0x10, 0x00, 0x05, 0x00, 0x00, 0x00, 0x08, 0x00 .byte 0x21, 0x31, 0x40, 0x01 @@ -1351,7 +1351,7 @@ gUnknown_082F0264:: @ 82F0264 .align 2 gUnknown_082F027C:: @ 82F027C .4byte gUnknown_082F0264 - .4byte sub_81AF078 + .4byte ListMenuDefaultCursorMoveFunc .4byte NULL .byte 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00 .byte 0x21, 0x31, 0x00, 0x01 @@ -1384,7 +1384,7 @@ gUnknown_082F029C:: @ 82F029C .align 2 gUnknown_082F032C:: @ 82F032C .4byte gUnknown_082F029C - .4byte sub_81AF078 + .4byte ListMenuDefaultCursorMoveFunc .4byte NULL .byte 0x12, 0x00, 0x06, 0x00, 0x00, 0x00, 0x08, 0x00 .byte 0x21, 0x31, 0x00, 0x01 @@ -1413,7 +1413,7 @@ gUnknown_082F0354:: @ 82F0354 .align 2 gUnknown_082F03A4:: @ 82F03A4 .4byte gUnknown_082F0354 - .4byte sub_81AF078 + .4byte ListMenuDefaultCursorMoveFunc .4byte sub_8017BE8 .byte 0x0a, 0x00, 0x06, 0x00, 0x00, 0x00, 0x08, 0x00 .byte 0xe1, 0xdf, 0x00, 0x01 @@ -1442,7 +1442,7 @@ gUnknown_082F03C4:: @ 82F03C4 .align 2 .4byte gUnknown_082F03C4 - .4byte sub_81AF078 + .4byte ListMenuDefaultCursorMoveFunc .4byte nullsub_14 .byte 0x10, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00 .byte 0x21, 0x31, 0x40, 0x01 @@ -1637,7 +1637,7 @@ gUnknown_082F0620:: @ 82F0620 .align 2 gUnknown_082F0638:: @ 82F0638 struct ListMenuTemplate .4byte NULL - .4byte sub_81AF078 + .4byte ListMenuDefaultCursorMoveFunc .4byte NULL .byte 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00 .byte 0x21, 0x31, 0x00, 0x01 @@ -1669,7 +1669,7 @@ gUnknown_082F06A0:: @ 82F06A0 .align 2 gUnknown_082F06B0:: @ 82F06B0 struct ListMenuTemplate .4byte gUnknown_082F0650 - .4byte sub_81AF078 + .4byte ListMenuDefaultCursorMoveFunc .4byte NULL .byte 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00 .byte 0x21, 0x31, 0x00, 0x01 @@ -1677,7 +1677,7 @@ gUnknown_082F06B0:: @ 82F06B0 struct ListMenuTemplate .align 2 gUnknown_082F06C8:: @ 82F06C8 .4byte gUnknown_082F0670 - .4byte sub_81AF078 + .4byte ListMenuDefaultCursorMoveFunc .4byte NULL .byte 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00 .byte 0x21, 0x31, 0x00, 0x01 @@ -1685,7 +1685,7 @@ gUnknown_082F06C8:: @ 82F06C8 .align 2 gUnknown_082F06E0:: @ 82F06E0 .4byte gUnknown_082F0688 - .4byte sub_81AF078 + .4byte ListMenuDefaultCursorMoveFunc .4byte NULL .byte 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00 .byte 0x21, 0x31, 0x00, 0x01 @@ -1693,7 +1693,7 @@ gUnknown_082F06E0:: @ 82F06E0 .align 2 gUnknown_082F06F8:: @ 82F06F8 .4byte gUnknown_082F06A0 - .4byte sub_81AF078 + .4byte ListMenuDefaultCursorMoveFunc .4byte NULL .byte 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00 .byte 0x21, 0x31, 0x00, 0x01 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index f02ffbe662..adf02ddd04 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -999,7 +999,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27751B:: @ 827751B compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_27731B copyvar VAR_0x8007, VAR_LAST_TALKED - specialvar VAR_RESULT, sub_80093CC + specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277668 message OldaleTown_PokemonCenter_2F_Text_27940D @@ -1108,7 +1108,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2776A4:: @ 82776A4 specialvar VAR_RESULT, sub_813990C compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_27731B - specialvar VAR_RESULT, sub_80093CC + specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276E13 message OldaleTown_PokemonCenter_2F_Text_279013 @@ -1396,7 +1396,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277B8A:: @ 8277B8A lockall checkflag FLAG_SYS_POKEDEX_GET goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_27733F - specialvar VAR_RESULT, sub_80093CC + specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 0 goto_eq EventScript_277BB4 fadescreen 1 @@ -1495,7 +1495,7 @@ MossdeepCity_GameCorner_1F_EventScript_277C91:: @ 8277C91 faceplayer message MossdeepCity_GameCorner_1F_Text_278CEB waitmessage - specialvar VAR_RESULT, sub_80093CC + specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 0 goto_eq MossdeepCity_GameCorner_1F_EventScript_277E48 delay 60 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 9c4b46ae21..bd8d0cd0c7 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -594,7 +594,7 @@ LilycoveCity_ContestLobby_EventScript_2940BB:: @ 82940BB call LilycoveCity_ContestLobby_EventScript_27134F compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_294160 - specialvar VAR_RESULT, sub_80093CC + specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_2941ED message LilycoveCity_ContestLobby_Text_293955 diff --git a/data/specials.inc b/data/specials.inc index dfbac56faa..1020b1c803 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -423,7 +423,7 @@ gSpecials:: @ 81DBA64 def_special sub_81BE79C def_special sub_81BE7F4 def_special sub_81398C0 - def_special sub_80093CC + def_special IsWirelessAdapterConnected def_special BerryBlenderLinkBecomeLeader def_special BerryBlenderLinkJoinGroup def_special UnionRoomSpecial diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 8a1749b0b1..4458f9347d 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -351,7 +351,7 @@ void TrySpawnEventObjects(s16, s16); u8 sprite_new(u8, u8, s16, s16, u8, u8); u8 AddPseudoEventObject(u16, void (*)(struct Sprite *), s16, s16, u8); u8 show_sprite(u8, u8, u8); -u8 SpawnSpecialEventObjectParametrized(u8, u8, u8, s16, s16, u8); +u8 SpawnSpecialEventObjectParameterized(u8, u8, u8, s16, s16, u8); u8 SpawnSpecialEventObject(struct EventObjectTemplate *); void sub_8093038(s16, s16, s16 *, s16 *); void CameraObjectReset1(void); diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h index 03fe505b5e..6498c6a99e 100644 --- a/include/gba/io_reg.h +++ b/include/gba/io_reg.h @@ -545,6 +545,35 @@ #define BGCNT_AFF512x512 0x8000 #define BGCNT_AFF1024x1024 0xC000 +// WININ/OUT +#define WININ_WIN0_BG0 (1 << 0) +#define WININ_WIN0_BG1 (1 << 1) +#define WININ_WIN0_BG2 (1 << 2) +#define WININ_WIN0_BG3 (1 << 3) +#define WININ_WIN0_OBJ (1 << 4) +#define WININ_WIN0_CLR (1 << 5) +#define WININ_WIN1_BG0 (1 << 8) +#define WININ_WIN1_BG1 (1 << 9) +#define WININ_WIN1_BG2 (1 << 10) +#define WININ_WIN1_BG3 (1 << 11) +#define WININ_WIN1_OBJ (1 << 12) +#define WININ_WIN1_CLR (1 << 13) + +#define WINOUT_WIN01_BG0 (1 << 0) +#define WINOUT_WIN01_BG1 (1 << 1) +#define WINOUT_WIN01_BG2 (1 << 2) +#define WINOUT_WIN01_BG3 (1 << 3) +#define WINOUT_WIN01_OBJ (1 << 4) +#define WINOUT_WIN01_CLR (1 << 5) +#define WINOUT_WINOBJ_BG0 (1 << 8) +#define WINOUT_WINOBJ_BG1 (1 << 9) +#define WINOUT_WINOBJ_BG2 (1 << 10) +#define WINOUT_WINOBJ_BG3 (1 << 11) +#define WINOUT_WINOBJ_OBJ (1 << 12) +#define WINOUT_WINOBJ_CLR (1 << 13) + +#define WINHV_COORDS(m, n) (((m) << 8) | (n)) + // BLDCNT // Bits 0-5 select layers for the 1st target #define BLDCNT_TGT1_BG0 (1 << 0) diff --git a/include/link.h b/include/link.h index 5b3cd26ca5..afc5008e6c 100644 --- a/include/link.h +++ b/include/link.h @@ -201,7 +201,7 @@ extern u32 gLinkStatus; void c2_mystery_gift(void); void sub_801867C(void); -bool8 sub_80093CC(void); +bool8 IsWirelessAdapterConnected(void); void Task_DestroySelf(u8 taskId); void OpenLink(void); void CloseLink(void); diff --git a/include/list_menu.h b/include/list_menu.h index d8b526b614..d38980213c 100644 --- a/include/list_menu.h +++ b/include/list_menu.h @@ -3,11 +3,19 @@ #define LIST_NOTHING_CHOSEN -1 #define LIST_B_PRESSED -2 +#define LIST_HEADER -3 #define LIST_NO_MULTIPLE_SCROLL 0 #define LIST_MULTIPLE_SCROLL_DPAD 1 #define LIST_MULTIPLE_SCROLL_L_R 2 +enum { + SCROLL_ARROW_LEFT, + SCROLL_ARROW_RIGHT, + SCROLL_ARROW_UP, + SCROLL_ARROW_DOWN +}; + struct ListMenu; struct ListMenuItem @@ -19,20 +27,20 @@ struct ListMenuItem struct ListMenuTemplate { const struct ListMenuItem *items; - void (* moveCursorFunc)(s32, bool8, struct ListMenu *); - void (* unk_08)(u8 windowId, s32 itemId, u8 y); + void (* moveCursorFunc)(s32 itemIndex, bool8 onInit, struct ListMenu *list); + void (* itemPrintFunc)(u8 windowId, s32 itemId, u8 y); u16 totalItems; u16 maxShowed; u8 windowId; - u8 unk_11; - u8 unk_12; + u8 header_X; + u8 item_X; u8 cursor_X; u8 upText_Y:4; // x1, x2, x4, x8 = xF u8 cursorPal:4; // x10, x20, x40, x80 = xF0 u8 fillValue:4; // x1, x2, x4, x8 = xF u8 cursorShadowPal:4; // x10, x20, x40, x80 = xF0 u8 lettersSpacing:3; - u8 unk_16_3:3; + u8 itemVerticalPadding:3; u8 scrollMultiple:2; // x40, x80 = xC0 u8 fontId:6; // x1, x2, x4, x8, x10, x20 = x3F u8 cursorKind:2; // x40, x80 @@ -45,11 +53,11 @@ struct ListMenu u16 selectedRow; u8 unk_1C; u8 unk_1D; - u8 unk_1E; + u8 taskId; u8 unk_1F; }; -struct UnknownListMenuWindowStruct +struct ListMenuWindowRect { u8 x; u8 y; @@ -58,16 +66,16 @@ struct UnknownListMenuWindowStruct u8 palNum; }; -struct ArrowStruct +struct ScrollArrowsTemplate { - u8 unk0; - u8 unk1; - u8 unk2; - u8 unk3; - u8 unk4; - u8 unk5; - u16 unk6; - u16 unk8; + u8 firstArrowType; + u8 firstX; + u8 firstY; + u8 secondArrowType; + u8 secondX; + u8 secondY; + u16 fullyUpThreshold; + u16 fullyDownThreshold; u16 tileTag; u16 palTag; u8 palNum; @@ -75,36 +83,36 @@ struct ArrowStruct struct CursorStruct { - u8 unk0; - u8 unk1; - u16 unk2; - u16 unk4; + u8 left; + u8 top; + u16 rowWidth; + u16 rowHeight; u16 tileTag; u16 palTag; u8 palNum; }; -extern struct ArrowStruct gUnknown_0203CE8C; +extern struct ScrollArrowsTemplate gTempScrollArrowTemplate; extern struct ListMenuTemplate gMultiuseListMenuTemplate; s32 DoMysteryGiftListMenu(struct WindowTemplate *windowTemplate, struct ListMenuTemplate *listMenuTemplate, u8 arg2, u16 tileNum, u16 palNum); u8 ListMenuInit(struct ListMenuTemplate *listMenuTemplate, u16 scrollOffset, u16 selectedRow); -u8 ListMenuInitWithWindows(struct ListMenuTemplate *listMenuTemplate, struct UnknownListMenuWindowStruct *arg1, u16 scrollOffset, u16 selectedRow); +u8 ListMenuInitInRect(struct ListMenuTemplate *listMenuTemplate, struct ListMenuWindowRect *arg1, u16 scrollOffset, u16 selectedRow); s32 ListMenuHandleInputGetItemId(u8 listTaskId); void DestroyListMenuTask(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow); -void sub_81AE70C(u8 listTaskId); +void RedrawListMenu(u8 listTaskId); void ChangeListMenuPals(u8 listTaskId, u8 cursorPal, u8 fillValue, u8 cursorShadowPal); void ChangeListMenuCoords(u8 listTaskId, u8 x, u8 y); s32 ListMenuTestInput(struct ListMenuTemplate *template, u32 scrollOffset, u32 selectedRow, u16 keys, u16 *newScrollOffset, u16 *newSelectedRow); void ListMenuGetCurrentItemArrayId(u8 listTaskId, u16 *arrayId); void ListMenuGetScrollAndRow(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow); u16 ListMenuGetYCoordForPrintingArrowCursor(u8 listTaskId); -void sub_81AF028(u8 cursorPal, u8 fillValue, u8 cursorShadowPal); -void sub_81AF078(s32 arg0, u8 arg1, struct ListMenu *list); -s32 sub_81AF08C(u8 taskId, u8 field); -void sub_81AF15C(u8 taskId, u8 field, s32 value); -u8 AddScrollIndicatorArrowPair(const struct ArrowStruct *arrowInfo, u16 *arg1); -u8 AddScrollIndicatorArrowPairParametrized(u32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 tileTag, s32 palTag, void *arg7); +void ListMenuOverrideSetColors(u8 cursorPal, u8 fillValue, u8 cursorShadowPal); +void ListMenuDefaultCursorMoveFunc(s32 arg0, u8 arg1, struct ListMenu *list); +s32 ListMenuGetUnkIndicatorsStructFields(u8 taskId, u8 field); +void ListMenuSetUnkIndicatorsStructField(u8 taskId, u8 field, s32 value); +u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate *arrowInfo, u16 *arg1); +u8 AddScrollIndicatorArrowPairParameterized(u32 arrowType, s32 commonPos, s32 firstPos, s32 secondPos, s32 fullyDownThreshold, s32 tileTag, s32 palTag, u16 *currItemPtr); void RemoveScrollIndicatorArrowPair(u8 taskId); void Task_ScrollIndicatorArrowPairOnMainMenu(u8 taskId); diff --git a/include/palette.h b/include/palette.h index a1259d3277..d14fa1fcd8 100644 --- a/include/palette.h +++ b/include/palette.h @@ -24,16 +24,16 @@ struct PaletteFadeControl u16 y:5; // blend coefficient u16 targetY:5; // target blend coefficient u16 blendColor:15; - u16 active:1; + bool16 active:1; u16 multipurpose2:6; - u16 yDec:1; // whether blend coefficient is decreasing - u16 bufferTransferDisabled:1; + bool16 yDec:1; // whether blend coefficient is decreasing + bool16 bufferTransferDisabled:1; u16 mode:2; - u16 shouldResetBlendRegisters:1; - u16 hardwareFadeFinishing:1; + bool16 shouldResetBlendRegisters:1; + bool16 hardwareFadeFinishing:1; u16 softwareFadeFinishingCounter:5; - u16 softwareFadeFinishing:1; - u16 objPaletteToggle:1; + bool16 softwareFadeFinishing:1; + bool16 objPaletteToggle:1; u8 deltaY:4; // rate of change of blend coefficient }; diff --git a/include/sprite.h b/include/sprite.h index 4723b66e1a..f972d09cc9 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -2,6 +2,7 @@ #define GUARD_SPRITE_H #define MAX_SPRITES 64 +#define SPRITE_INVALID_TAG 0xFFFF struct SpriteSheet { @@ -186,29 +187,29 @@ struct Sprite /*0x2A*/ u8 animNum; /*0x2B*/ u8 animCmdIndex; /*0x2C*/ u8 animDelayCounter:6; - u8 animPaused:1; - u8 affineAnimPaused:1; + bool8 animPaused:1; + bool8 affineAnimPaused:1; /*0x2D*/ u8 animLoopCounter; // general purpose data fields /*0x2E*/ s16 data[8]; - /*0x3E*/ u16 inUse:1; //1 - u16 coordOffsetEnabled:1; //2 - u16 invisible:1; //4 - u16 flags_3:1; //8 - u16 flags_4:1; //0x10 - u16 flags_5:1; //0x20 - u16 flags_6:1; //0x40 - u16 flags_7:1; //0x80 - /*0x3F*/ u16 hFlip:1; //1 - u16 vFlip:1; //2 - u16 animBeginning:1; //4 - u16 affineAnimBeginning:1; //8 - u16 animEnded:1; //0x10 - u16 affineAnimEnded:1; //0x20 - u16 usingSheet:1; //0x40 - u16 flags_f:1; //0x80 + /*0x3E*/ bool16 inUse:1; //1 + bool16 coordOffsetEnabled:1; //2 + bool16 invisible:1; //4 + bool16 flags_3:1; //8 + bool16 flags_4:1; //0x10 + bool16 flags_5:1; //0x20 + bool16 flags_6:1; //0x40 + bool16 flags_7:1; //0x80 + /*0x3F*/ bool16 hFlip:1; //1 + bool16 vFlip:1; //2 + bool16 animBeginning:1; //4 + bool16 affineAnimBeginning:1; //8 + bool16 animEnded:1; //0x10 + bool16 affineAnimEnded:1; //0x20 + bool16 usingSheet:1; //0x40 + bool16 flags_f:1; //0x80 /*0x40*/ u16 sheetTileStart; diff --git a/include/text.h b/include/text.h index 2566b51b77..7038149e92 100644 --- a/include/text.h +++ b/include/text.h @@ -98,6 +98,17 @@ #define TEXT_SPEED_FF 0xFF +enum { + FONTATTR_MAX_LETTER_WIDTH, + FONTATTR_MAX_LETTER_HEIGHT, + FONTATTR_LETTER_SPACING, + FONTATTR_LINE_SPACING, + FONTATTR_COLOR_LOWNIBBLE, // dunno what this is yet + FONTATTR_COLOR_FOREGROUND, + FONTATTR_COLOR_BACKGROUND, + FONTATTR_COLOR_SHADOW +}; + struct TextPrinterSubStruct { u8 font_type:4; // 0x14 diff --git a/include/text_window.h b/include/text_window.h index 2ac13fab75..20eab57c8b 100644 --- a/include/text_window.h +++ b/include/text_window.h @@ -14,8 +14,8 @@ extern const u16 gTextWindowFrame1_Pal[]; const struct TilesPal* GetWindowFrameTilesPal(u8 id); void copy_textbox_border_tile_patterns_to_vram(u8 windowId, u16 destOffset, u8 palOffset); -void sub_809882C(u8 windowId, u16 destOffset, u8 palOffset); -void sub_80987D4(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset); +void LoadUserWindowBorderGfx(u8 windowId, u16 destOffset, u8 palOffset); +void LoadWindowGfx(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset); void box_border_load_tiles_and_pal(u8 windowId, u16 destOffset, u8 palOffset); void sub_8098858(u8 windowId, u16 tileNum, u8 palNum); void sub_80989E0(u8 windowId, u16 tileNum, u8 palNum); diff --git a/src/battle_bg.c b/src/battle_bg.c index d4bfd297aa..d4a2c61b2d 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -75,8 +75,8 @@ void sub_80356D0(void) void ApplyPlayerChosenFrameToBattleMenu(void) { - sub_809882C(2, 0x12, 0x10); - sub_809882C(2, 0x22, 0x10); + LoadUserWindowBorderGfx(2, 0x12, 0x10); + LoadUserWindowBorderGfx(2, 0x22, 0x10); LoadCompressedPalette(gUnknown_08D85600, 0x50, 0x20); if (gBattleTypeFlags & BATTLE_TYPE_ARENA) diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 9fc0c68eac..7f14d5926d 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -2420,7 +2420,7 @@ static void PlayerHandleFaintAnimation(void) static void PlayerHandlePaletteFade(void) { - BeginNormalPaletteFade(-1, 2, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, 0); PlayerBufferExecCompleted(); } @@ -2640,7 +2640,7 @@ static void PlayerHandleChooseItem(void) { s32 i; - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem; gBattlerInMenuId = gActiveBattler; @@ -2667,7 +2667,7 @@ static void PlayerHandleChoosePokemon(void) *(&gBattleStruct->field_49) = gBattleBufferA[gActiveBattler][1] >> 4; *(&gBattleStruct->field_8B) = gBattleBufferA[gActiveBattler][2]; *(&gBattleStruct->field_B0) = gBattleBufferA[gActiveBattler][3]; - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); gBattlerControllerFuncs[gActiveBattler] = sub_80597CC; gBattlerInMenuId = gActiveBattler; } @@ -2676,7 +2676,7 @@ static void PlayerHandleChoosePokemon(void) static void PlayerHandleCmd23(void) { BattleStopLowHpSound(); - BeginNormalPaletteFade(-1, 2, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, 0); PlayerBufferExecCompleted(); } diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index 09776f1504..9f83ebcf00 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -478,7 +478,7 @@ static void SafariHandleChooseItem(void) { s32 i; - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); gBattlerControllerFuncs[gActiveBattler] = SafariOpenPokeblockCase; gBattlerInMenuId = gActiveBattler; } diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index ca7b2fd44b..20716c679f 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -1251,7 +1251,7 @@ static void WallyHandleChooseMove(void) static void WallyHandleChooseItem(void) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); gBattlerControllerFuncs[gActiveBattler] = OpenBagAfterPaletteFade; gBattlerInMenuId = gActiveBattler; } diff --git a/src/battle_main.c b/src/battle_main.c index ace481c26e..24d598f4aa 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -1819,7 +1819,7 @@ void BattleMainCB2(void) { gSpecialVar_Result = gBattleOutcome = B_OUTCOME_PLAYER_TELEPORTED; ResetPaletteFadeControl(); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); SetMainCallback2(CB2_QuitRecordedBattle); } } @@ -2255,7 +2255,7 @@ static void sub_8038F34(void) case 1: if (--gBattleCommunication[1] == 0) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); gBattleCommunication[MULTIUSE_STATE]++; } break; @@ -2312,7 +2312,7 @@ static void sub_8038F34(void) for (i = 0; i < 2; i++) LoadChosenBattleElement(i); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); gBattleCommunication[MULTIUSE_STATE]++; break; case 4: @@ -2417,7 +2417,7 @@ static void sub_80392A8(void) gReservedSpritePaletteCount = 4; SetVBlankCallback(VBlankCB_Battle); SetMainCallback2(sub_803937C); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); gBattleCommunication[MULTIUSE_STATE] = 0; } @@ -2577,7 +2577,7 @@ static void sub_803939C(void) { if (sub_800A520() == TRUE) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); gBattleCommunication[1] = 0x20; gBattleCommunication[MULTIUSE_STATE] = 8; } @@ -2585,7 +2585,7 @@ static void sub_803939C(void) } else { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); gBattleCommunication[1] = 0x20; gBattleCommunication[MULTIUSE_STATE] = 8; } diff --git a/src/battle_records.c b/src/battle_records.c index a148f998fa..c06005b17b 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -348,7 +348,7 @@ static void Task_CloseTrainerHillRecordsOnButton(u8 taskId) static void Task_BeginPaletteFade(u8 taskId) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); gTasks[taskId].func = Task_ExitTrainerHillRecords; } @@ -495,7 +495,7 @@ static void CB2_ShowTrainerHillRecords(void) gMain.state++; break; case 6: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); gMain.state++; break; case 7: diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 811aba1285..89fee825e5 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -5713,7 +5713,7 @@ static void atk5A_yesnoboxlearnmove(void) if (gBattleCommunication[1] == 0) { HandleBattleWindow(0x18, 0x8, 0x1D, 0xD, WINDOW_CLEAR); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); gBattleScripting.learnMoveState++; } else @@ -10288,7 +10288,7 @@ static void atkF2_displaydexinfo(void) switch (gBattleCommunication[0]) { case 0: - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); gBattleCommunication[0]++; break; case 1: diff --git a/src/battle_transition.c b/src/battle_transition.c index 41729eec9d..d1d92cb50f 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -1080,7 +1080,7 @@ static bool8 Phase2_Blur_Func2(struct Task *task) { task->tData1 = 4; if (++task->tData2 == 10) - BeginNormalPaletteFade(-1, -1, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 0x10, 0); SetGpuReg(REG_OFFSET_MOSAIC, (task->tData2 & 15) * 17); if (task->tData2 > 14) task->tState++; @@ -1107,7 +1107,7 @@ static bool8 Phase2_Swirl_Func1(struct Task *task) { sub_8149F08(); ScanlineEffect_Clear(); - BeginNormalPaletteFade(-1, 4, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 0x10, 0); sub_8149F98(gScanlineEffectRegBuffers[1], sTransitionStructPtr->field_14, 0, 2, 0, 160); SetVBlankCallback(VBlankCB_Phase2_Swirl); @@ -1162,7 +1162,7 @@ static bool8 Phase2_Shuffle_Func1(struct Task *task) sub_8149F08(); ScanlineEffect_Clear(); - BeginNormalPaletteFade(-1, 4, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 0x10, 0); memset(gScanlineEffectRegBuffers[1], sTransitionStructPtr->field_16, 0x140); SetVBlankCallback(VBlankCB_Phase2_Shuffle); @@ -1973,7 +1973,7 @@ static bool8 Phase2_Ripple_Func2(struct Task *task) if (++task->tData3 == 81) { task->tData4++; - BeginNormalPaletteFade(-1, -2, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 0x10, 0); } if (task->tData4 != 0 && !gPaletteFade.active) @@ -3982,7 +3982,7 @@ static bool8 Phase2_30_Func4(struct Task *task) if (++task->tData3 == 101) { task->tData4++; - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); } if (task->tData4 != 0 && !gPaletteFade.active) diff --git a/src/berry_blender.c b/src/berry_blender.c index 2edb147485..575d6b2852 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -153,7 +153,7 @@ extern const u8 gText_234Players[]; extern void sub_800A418(void); extern u8 sub_800A9D8(void); -extern void sub_809882C(u8, u16, u8); +extern void LoadUserWindowBorderGfx(u8, u16, u8); extern void copy_textbox_border_tile_patterns_to_vram(u8, u16, u8); extern void sub_81AABF0(void (*callback)(void)); extern void sub_800B4C0(void); @@ -927,7 +927,7 @@ static void sub_807FAC8(void) InitBgsFromTemplates(1, sBerryBlenderBgTemplates, ARRAY_COUNT(sBerryBlenderBgTemplates)); SetBgTilemapBuffer(1, sBerryBlenderData->tilemapBuffers[0]); SetBgTilemapBuffer(2, sBerryBlenderData->tilemapBuffers[1]); - sub_809882C(0, 1, 0xD0); + LoadUserWindowBorderGfx(0, 1, 0xD0); copy_textbox_border_tile_patterns_to_vram(0, 0x14, 0xF0); InitBerryBlenderWindows(); @@ -959,7 +959,7 @@ static void sub_807FAC8(void) } break; case 2: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); sub_8082D28(); sBerryBlenderData->mainState++; break; @@ -973,7 +973,7 @@ static void sub_807FAC8(void) sBerryBlenderData->mainState++; break; case 5: - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); sBerryBlenderData->mainState++; break; case 6: @@ -1163,7 +1163,7 @@ static void sub_8080018(void) sBerryBlenderData->mainState++; break; case 3: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); sBerryBlenderData->mainState++; break; case 4: @@ -1331,7 +1331,7 @@ static void sub_8080588(void) SetBgTilemapBuffer(1, sBerryBlenderData->tilemapBuffers[0]); SetBgTilemapBuffer(2, sBerryBlenderData->tilemapBuffers[1]); - sub_809882C(0, 1, 0xD0); + LoadUserWindowBorderGfx(0, 1, 0xD0); copy_textbox_border_tile_patterns_to_vram(0, 0x14, 0xF0); InitBerryBlenderWindows(); @@ -1490,7 +1490,7 @@ static void sub_80808D4(void) sBerryBlenderData->mainState++; break; case 3: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); sBerryBlenderData->mainState++; sBerryBlenderData->framesToWait = 0; break; @@ -2656,7 +2656,7 @@ static void CB2_HandlePlayerLinkPlayAgainChoice(void) case 9: if (sub_800A520()) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); sBerryBlenderData->gameEndState++; } break; diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index a755f4f440..fb4bf68177 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -247,7 +247,7 @@ static bool8 InitBerryTagScreen(void) gMain.state++; break; case 15: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); gPaletteFade.bufferTransferDisabled = 0; gMain.state++; break; @@ -481,7 +481,7 @@ static void DestroyFlavorCircleSprites(void) static void PrepareToCloseBerryTagScreen(u8 taskId) { PlaySE(SE_SELECT); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); gTasks[taskId].func = Task_CloseBerryTagScreen; } diff --git a/src/clear_save_data_screen.c b/src/clear_save_data_screen.c index ca2037d2f6..266ea8250f 100644 --- a/src/clear_save_data_screen.c +++ b/src/clear_save_data_screen.c @@ -202,6 +202,6 @@ static void InitClearSaveDataScreenWindows(void) InitWindows(sClearSaveTextWindow); DeactivateAllTextPrinters(); FillWindowPixelBuffer(0, 0); - sub_80987D4(0, 0, 2, 224); + LoadWindowGfx(0, 0, 2, 224); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); } diff --git a/src/daycare.c b/src/daycare.c index 5a6aa2b40a..c73d915213 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -73,20 +73,20 @@ static const struct ListMenuItem sLevelMenuItems[] = static const struct ListMenuTemplate sDaycareListMenuLevelTemplate = { .items = sLevelMenuItems, - .moveCursorFunc = sub_81AF078, - .unk_08 = DaycarePrintMonInfo, + .moveCursorFunc = ListMenuDefaultCursorMoveFunc, + .itemPrintFunc = DaycarePrintMonInfo, .totalItems = 3, .maxShowed = 3, .windowId = 0, - .unk_11 = 0, - .unk_12 = 8, + .header_X = 0, + .item_X = 8, .cursor_X = 0, .upText_Y = 1, .cursorPal = 2, .fillValue = 1, .cursorShadowPal = 3, .lettersSpacing = 1, - .unk_16_3 = 0, + .itemVerticalPadding = 0, .scrollMultiple = LIST_NO_MULTIPLE_SCROLL, .fontId = 1, .cursorKind = 0 diff --git a/src/decoration.c b/src/decoration.c index 0510b9f312..b21d512780 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -838,7 +838,7 @@ void sub_8127500(void) { if (sDecorPCBuffer->unk_522 == 0xFF) { - sDecorPCBuffer->unk_522 = AddScrollIndicatorArrowPairParametrized(0x02, 0x3c, 0x0c, 0x94, sDecorPCBuffer->unk_520 - sDecorPCBuffer->unk_521, 0x6e, 0x6e, &sSecretBasePCSelectDecorPageNo); + sDecorPCBuffer->unk_522 = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0x3c, 0x0c, 0x94, sDecorPCBuffer->unk_520 - sDecorPCBuffer->unk_521, 0x6e, 0x6e, &sSecretBasePCSelectDecorPageNo); } } diff --git a/src/diploma.c b/src/diploma.c index 289e0e043e..599ceec723 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -89,7 +89,7 @@ void CB2_ShowDiploma(void) CopyBgTilemapBufferToVram(1); DisplayDiplomaText(); BlendPalettes(-1, 16, 0); - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); EnableInterrupts(1); SetVBlankCallback(VBlankCB); SetMainCallback2(MainCB2); @@ -114,7 +114,7 @@ static void Task_DiplomaWaitForKeyPress(u8 taskId) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); gTasks[taskId].func = Task_DiplomaFadeOut; } } diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 1ed38c67e9..575050ca50 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -593,7 +593,7 @@ static void CB2_EggHatch_1(void) switch (sEggHatchData->CB2_state) { case 0: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); sEggHatchData->eggSpriteID = CreateSprite(&sSpriteTemplate_EggHatch, 120, 75, 5); ShowBg(0); ShowBg(1); @@ -655,7 +655,7 @@ static void CB2_EggHatch_1(void) case 9: if (!IsTextPrinterActive(sEggHatchData->windowId)) { - sub_809882C(sEggHatchData->windowId, 0x140, 0xE0); + LoadUserWindowBorderGfx(sEggHatchData->windowId, 0x140, 0xE0); CreateYesNoMenu(&sYesNoWinTemplate, 0x140, 0xE, 0); sEggHatchData->CB2_state++; } @@ -676,7 +676,7 @@ static void CB2_EggHatch_1(void) } break; case 11: - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); sEggHatchData->CB2_state++; break; case 12: @@ -786,7 +786,7 @@ static void SpriteCB_Egg_4(struct Sprite* sprite) { s16 i; if (sprite->data[0] == 0) - BeginNormalPaletteFade(-1, -1, 0, 0x10, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 0x10, 0xFFFF); if (sprite->data[0] < 4u) { for (i = 0; i <= 3; i++) @@ -810,7 +810,7 @@ static void SpriteCB_Egg_5(struct Sprite* sprite) StartSpriteAffineAnim(&gSprites[sEggHatchData->pokeSpriteID], 1); } if (sprite->data[0] == 8) - BeginNormalPaletteFade(-1, -1, 0x10, 0, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, -1, 0x10, 0, 0xFFFF); if (sprite->data[0] <= 9) gSprites[sEggHatchData->pokeSpriteID].pos1.y -= 1; if (sprite->data[0] > 40) diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 35b04ea1e5..8095c23ba8 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1537,7 +1537,7 @@ u8 SpawnSpecialEventObject(struct EventObjectTemplate *eventObjectTemplate) return TrySpawnEventObject(eventObjectTemplate, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY); } -u8 SpawnSpecialEventObjectParametrized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z) +u8 SpawnSpecialEventObjectParameterized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z) { struct EventObjectTemplate eventObjectTemplate; diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 74eac32de5..1d350c83af 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -189,7 +189,7 @@ static void Task_BeginEvolutionScene(u8 taskID) switch (gTasks[taskID].tState) { case 0: - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); gTasks[taskID].tState++; break; case 1: @@ -386,7 +386,7 @@ static void CB2_EvolutionSceneLoadGraphics(void) SetVBlankCallback(VBlankCB_EvolutionScene); SetMainCallback2(CB2_EvolutionSceneUpdate); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); ShowBg(0); ShowBg(1); @@ -470,7 +470,7 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void) gMain.state++; break; case 7: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); sub_807B140(); ShowBg(0); ShowBg(1); @@ -623,7 +623,7 @@ static void Task_EvolutionScene(u8 taskID) switch (gTasks[taskID].tState) { case 0: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); gSprites[sEvoStructPtr->preEvoSpriteID].invisible = 0; gTasks[taskID].tState++; ShowBg(0); @@ -771,7 +771,7 @@ static void Task_EvolutionScene(u8 taskID) } else // no move to learn { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); gTasks[taskID].tState++; } } @@ -905,7 +905,7 @@ static void Task_EvolutionScene(u8 taskID) { gTasks[taskID].tLearnMoveState = gTasks[taskID].tData7; if (gTasks[taskID].tLearnMoveState == 5) - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); } } if (gMain.newKeys & B_BUTTON) @@ -1215,7 +1215,7 @@ static void Task_TradeEvolutionScene(u8 taskID) case 3: if (!IsTextPrinterActive(0) && !IsSEPlaying()) { - sub_809882C(0, 0xA8, 0xE0); + LoadUserWindowBorderGfx(0, 0xA8, 0xE0); CreateYesNoMenu(&gUnknown_0833900C, 0xA8, 0xE, 0); sEvoCursorPos = 0; gTasks[taskID].tLearnMoveState++; @@ -1231,7 +1231,7 @@ static void Task_TradeEvolutionScene(u8 taskID) sub_807F1A8(0, gDisplayedStringBattle, 1); gTasks[taskID].tLearnMoveState = gTasks[taskID].tData7; if (gTasks[taskID].tLearnMoveState == 5) - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); break; case 1: case -1: diff --git a/src/field_region_map.c b/src/field_region_map.c index b7d677c903..34b6089dfb 100644 --- a/src/field_region_map.c +++ b/src/field_region_map.c @@ -89,7 +89,7 @@ static void MCB2_InitRegionMapRegisters(void) InitBgsFromTemplates(1, gUnknown_085E5068, 2); InitWindows(gUnknown_085E5070); DeactivateAllTextPrinters(); - sub_809882C(0, 0x27, 0xd0); + LoadUserWindowBorderGfx(0, 0x27, 0xd0); clear_scheduled_bg_copies_to_vram(); SetMainCallback2(MCB2_FieldUpdateRegionMap); SetVBlankCallback(VBCB_FieldUpdateRegionMap); @@ -130,7 +130,7 @@ static void FieldUpdateRegionMap(void) schedule_bg_copy_tilemap_to_vram(0); SetWindowBorderStyle(0, 0, 0x27, 0xd); PrintRegionMapSecName(); - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); sFieldRegionMapHandler->state++; break; case 2: @@ -158,7 +158,7 @@ static void FieldUpdateRegionMap(void) } break; case 5: - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); sFieldRegionMapHandler->state++; break; case 6: diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 83df30d05e..e6b20f807a 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -89,7 +89,7 @@ extern void sub_8197434(u8, u8); extern u16 sub_818D97C(u8 playerGender, u8); extern u16 sub_818D8AC(u16, u8, s16, s16, u8, u16); extern const void* stdpal_get(u8); -extern void sub_80987D4(u8, u8, u16, u8); +extern void LoadWindowGfx(u8, u8, u16, u8); extern u16 sub_818D820(u16); extern u16 sub_818D8F0(u16); extern u16 sub_818D7D8(u16 species, u32 trainerId, u32 personality, u8 arg3, s16 sp0, s16 sp1, u8 sp2, u16 sp3); @@ -414,7 +414,7 @@ static bool8 InitHallOfFameScreen(void) if (!sub_8175024()) { SetVBlankCallback(VBlankCB_HallOfFame); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); gMain.state++; } break; @@ -725,7 +725,7 @@ static void sub_8173EE4(u8 taskId) ShowBg(3); gTasks[taskId].tPlayerSpriteID = sub_818D8AC(sub_818D97C(gSaveBlock2Ptr->playerGender, 1), 1, 120, 72, 6, 0xFFFF); AddWindow(&sHof_WindowTemplate); - sub_80987D4(1, gSaveBlock2Ptr->optionsWindowFrameType, 0x21D, 0xD0); + LoadWindowGfx(1, gSaveBlock2Ptr->optionsWindowFrameType, 0x21D, 0xD0); LoadPalette(stdpal_get(1), 0xE0, 0x20); gTasks[taskId].tFrameCount = 120; gTasks[taskId].func = Task_Hof_WaitAndPrintPlayerInfo; @@ -764,7 +764,7 @@ static void Task_Hof_ExitOnKeyPressed(u8 taskId) static void Task_Hof_HandlePaletteOnExit(u8 taskId) { CpuCopy16(gPlttBufferFaded, gPlttBufferUnfaded, 0x400); - BeginNormalPaletteFade(-1, 8, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 8, 0, 0x10, 0); gTasks[taskId].func = Task_Hof_HandleExit; } diff --git a/src/item_menu.c b/src/item_menu.c index e18d8fdd80..b45e1f4db2 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -209,7 +209,7 @@ const struct YesNoFuncTable gUnknown_08614084 = {BagMenuActuallyToss, BagMenuCan const struct YesNoFuncTable gUnknown_0861408C = {sub_81AD84C, sub_81AD6FC}; -const struct ArrowStruct gUnknown_08614094 = {0, 0x1C, 16, 1, 100, 16, -1, -1, 0x6F, 0x6F, 0}; +const struct ScrollArrowsTemplate gUnknown_08614094 = {SCROLL_ARROW_LEFT, 0x1C, 16, SCROLL_ARROW_RIGHT, 100, 16, -1, -1, 0x6F, 0x6F, 0}; const u8 gUnknown_086140A4[] = INCBIN_U8("graphics/interface/select_button.4bpp"); @@ -488,7 +488,7 @@ bool8 setup_bag_menu(void) gMain.state++; break; case 20: - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); gPaletteFade.bufferTransferDisabled = FALSE; gMain.state++; break; @@ -733,7 +733,7 @@ void bag_menu_print_cursor(u8 a, u8 b) void bag_menu_add_pocket_scroll_arrow_indicators_maybe(void) { if (gUnknown_0203CE54->unk81E == 0xFF) - gUnknown_0203CE54->unk81E = AddScrollIndicatorArrowPairParametrized(2, 0xAC, 12, 0x94, gUnknown_0203CE54->unk829[gUnknown_0203CE58.pocket] - gUnknown_0203CE54->unk82E[gUnknown_0203CE58.pocket], 0x6E, 0x6E, &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket]); + gUnknown_0203CE54->unk81E = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xAC, 12, 0x94, gUnknown_0203CE54->unk829[gUnknown_0203CE58.pocket] - gUnknown_0203CE54->unk82E[gUnknown_0203CE58.pocket], 0x6E, 0x6E, &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket]); } void sub_81AB824(void) @@ -771,7 +771,7 @@ void free_bag_item_list_buffers(void) void unknown_ItemMenu_Confirm(u8 taskId) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); gTasks[taskId].func = task_close_bag_menu_2; } @@ -1114,7 +1114,7 @@ void bag_menu_swap_items(u8 taskId) { s16* data = gTasks[taskId].data; - sub_81AF15C(data[0], 16, 1); + ListMenuSetUnkIndicatorsStructField(data[0], 16, 1); data[1] = gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket] + gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]; gUnknown_0203CE54->unk81A = data[1]; CopyItemName(BagGetItemIdByPocketPosition(gUnknown_0203CE58.pocket + 1, data[1]), gStringVar1); @@ -2078,7 +2078,7 @@ void bag_menu_print_pocket_names(u8 *pocketName1, u8 *pocketName2) offset = GetStringCenterAlignXOffset(1, pocketName2, 0x40); bag_menu_print(windowId, 1, pocketName2, offset + 0x40, 1, 0, 0, -1, 1); } - CpuCopy32((u8*)GetWindowAttribute(windowId, 7), gUnknown_0203CE54->unk844, 0x400); + CpuCopy32((u8*)GetWindowAttribute(windowId, WINDOW_TILE_DATA), gUnknown_0203CE54->unk844, 0x400); RemoveWindow(windowId); } @@ -2090,7 +2090,7 @@ void bag_menu_copy_pocket_name_to_window(u32 a) if (a > 8) a = 8; r4 = &gUnknown_0203CE54->unk844; - windowAttribute = (u8*)GetWindowAttribute(2, 7); + windowAttribute = (u8*)GetWindowAttribute(2, WINDOW_TILE_DATA); CpuCopy32(r4[0][a], windowAttribute, 0x100); b = a + 16; CpuCopy32(r4[0][b], windowAttribute + 0x100, 0x100); @@ -2103,7 +2103,7 @@ void setup_bag_menu_textboxes(void) InitWindows(gUnknown_08614174); DeactivateAllTextPrinters(); - sub_809882C(0, 1, -32); + LoadUserWindowBorderGfx(0, 1, -32); copy_textbox_border_tile_patterns_to_vram(0, 10, -48); sub_819A2BC(-64, 1); LoadPalette(&gUnknown_0860F074, 0xF0, 0x20); diff --git a/src/link.c b/src/link.c index acdb6cae06..ca9a5bb132 100644 --- a/src/link.c +++ b/src/link.c @@ -219,7 +219,7 @@ const u8 gUnknown_082ED224[] = { // .text -bool8 sub_80093CC(void) +bool8 IsWirelessAdapterConnected(void) { sub_800B488(); sub_800E700(); @@ -444,7 +444,7 @@ static void LinkTestProcessKeyInput(void) } if (gMain.newKeys & L_BUTTON) { - BeginNormalPaletteFade(-1, 0, 16, 0, 2); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 2); } if (gMain.newKeys & START_BUTTON) { diff --git a/src/list_menu.c b/src/list_menu.c index de7de82690..933d9835f7 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -13,27 +13,6 @@ #include "sound.h" #include "constants/songs.h" -// This file needs better labels and function names. - -struct UnknownMysteryGiftLinkMenuStruct -{ - s32 field_0; - u8 field_4; - u8 field_5; - u8 field_6; -}; - -struct UnknownListMenuPals -{ - u8 cursorPal:4; - u8 fillValue:4; - u8 cursorShadowPal:4; - u8 lettersSpacing:6; - u8 field_2_2:6; // unused - u8 fontId:7; - u8 field_3_7:1; -}; - struct UnkIndicatorsStruct { u8 field_0; @@ -57,26 +36,19 @@ struct UnkIndicatorsStruct u8 field_17_1:2; }; -struct UnkIndicatorsStruct2 +struct ScrollIndicatorPair { u8 field_0; - u16 *field_4; - u16 field_8; - u16 field_A; - u8 field_C; - u8 field_D; + u16 *currItemPtr; + u16 fullyUpThreshold; + u16 fullyDownThreshold; + u8 topSpriteId; + u8 bottomSpriteId; u16 tileTag; u16 palTag; - u16 field_12; - u16 field_14; - u16 field_16; - u16 field_18; - u16 field_1A; - u16 field_1C; - s16 field_1E; }; -struct UnkIndicatorsStruct3 +struct RedOutlineCursor { struct SubspriteTable subspriteTable; struct Subsprite *subspritesPtr; // not a const pointer @@ -85,27 +57,19 @@ struct UnkIndicatorsStruct3 u16 palTag; }; -struct UnkIndicatorsStruct4 +struct RedArrowCursor { - u8 field_0; + u8 spriteId; u16 tileTag; u16 palTag; }; -struct UnkSmallIndicatorsStruct -{ - u8 field_0_0:4; - u8 field_0_1:4; - u8 field_1; - u16 field_2; -}; - // this file's functions static u8 ListMenuInitInternal(struct ListMenuTemplate *listMenuTemplate, u16 scrollOffset, u16 selectedRow); static bool8 ListMenuChangeSelection(struct ListMenu *list, bool8 updateCursorAndCallCallback, u8 count, bool8 movingDown); static void ListMenuPrintEntries(struct ListMenu *list, u16 startIndex, u16 yOffset, u16 count); static void ListMenuDrawCursor(struct ListMenu *list); -static void ListMenuCallSelectionChangedCallback(struct ListMenu *list, u8 a2); +static void ListMenuCallSelectionChangedCallback(struct ListMenu *list, u8 onInit); static u8 ListMenuAddCursorObject(struct ListMenu *list, u32 cursorKind); static void Task_ScrollIndicatorArrowPair(u8 taskId); static u8 ListMenuAddRedOutlineCursorObject(struct CursorStruct *cursor); @@ -117,19 +81,40 @@ static void ListMenuRemoveRedArrowCursorObject(u8 taskId); static u8 ListMenuAddCursorObjectInternal(struct CursorStruct *cursor, u32 cursorKind); static void ListMenuUpdateCursorObject(u8 taskId, u16 x, u16 y, u32 cursorKind); static void ListMenuRemoveCursorObject(u8 taskId, u32 cursorKind); -static void sub_81AF264(struct Sprite *sprite); -static void ObjectCB_RedArrowCursor(struct Sprite *sprite); +static void SpriteCallback_ScrollIndicatorArrow(struct Sprite *sprite); +static void SpriteCallback_RedArrowCursor(struct Sprite *sprite); // EWRAM vars - EWRAM_DATA struct UnknownMysteryGiftLinkMenuStruct gUnknown_0203CE84 = {0}; - EWRAM_DATA struct ArrowStruct gUnknown_0203CE8C = {0}; +static EWRAM_DATA struct { + s32 currItemId; + u8 state; + u8 windowId; + u8 listTaskId; +} sMysteryGiftLinkMenu = {0}; + +EWRAM_DATA struct ScrollArrowsTemplate gTempScrollArrowTemplate = {0}; // IWRAM common -struct UnknownListMenuPals gUnknown_03006300; +struct { + u8 cursorPal:4; + u8 fillValue:4; + u8 cursorShadowPal:4; + u8 lettersSpacing:6; + u8 field_2_2:6; // unused + u8 fontId:7; + bool8 enabled:1; +} gListMenuOverride; + struct ListMenuTemplate gMultiuseListMenuTemplate; // const rom data -static const struct UnkSmallIndicatorsStruct gUnknown_086141FC[] = +static const struct +{ + u8 animNum:4; + u8 bounceDir:4; + u8 multiplier; + u16 frequency; +} sScrollIndicatorTemplates[] = { {0, 0, 2, 8}, {1, 0, 2, -8}, @@ -137,7 +122,7 @@ static const struct UnkSmallIndicatorsStruct gUnknown_086141FC[] = {3, 1, 2, -8}, }; -static const struct OamData sOamData_861420C = +static const struct OamData sOamData_ScrollArrowIndicator = { .y = 0, .affineMode = 0, @@ -154,50 +139,50 @@ static const struct OamData sOamData_861420C = .affineParam = 0 }; -static const union AnimCmd sSpriteAnim_8614214[] = +static const union AnimCmd sSpriteAnim_ScrollArrowIndicator0[] = { ANIMCMD_FRAME(0, 30), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_861421C[] = +static const union AnimCmd sSpriteAnim_ScrollArrowIndicator1[] = { ANIMCMD_FRAME(0, 30, 1, 0), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_8614224[] = +static const union AnimCmd sSpriteAnim_ScrollArrowIndicator2[] = { ANIMCMD_FRAME(4, 30), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_861422C[] = +static const union AnimCmd sSpriteAnim_ScrollArrowIndicator3[] = { ANIMCMD_FRAME(4, 30, 0, 1), ANIMCMD_END }; -static const union AnimCmd *const sSpriteAnimTable_8614234[] = +static const union AnimCmd *const sSpriteAnimTable_ScrollArrowIndicator[] = { - sSpriteAnim_8614214, - sSpriteAnim_861421C, - sSpriteAnim_8614224, - sSpriteAnim_861422C + sSpriteAnim_ScrollArrowIndicator0, + sSpriteAnim_ScrollArrowIndicator1, + sSpriteAnim_ScrollArrowIndicator2, + sSpriteAnim_ScrollArrowIndicator3 }; -static const struct SpriteTemplate gUnknown_08614244 = +static const struct SpriteTemplate sSpriteTemplate_ScrollArrowIndicator = { .tileTag = 0, .paletteTag = 0, - .oam = &sOamData_861420C, - .anims = sSpriteAnimTable_8614234, + .oam = &sOamData_ScrollArrowIndicator, + .anims = sSpriteAnimTable_ScrollArrowIndicator, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_81AF264, + .callback = SpriteCallback_ScrollIndicatorArrow, }; -static const struct Subsprite sSubsprite_861425C = +static const struct Subsprite sSubsprite_RedOutline1 = { .x = 0, .y = 0, @@ -207,7 +192,7 @@ static const struct Subsprite sSubsprite_861425C = .priority = 0, }; -static const struct Subsprite sSubsprite_8614260 = +static const struct Subsprite sSubsprite_RedOutline2 = { .x = 0, .y = 0, @@ -217,7 +202,7 @@ static const struct Subsprite sSubsprite_8614260 = .priority = 0, }; -static const struct Subsprite sSubsprite_8614264 = +static const struct Subsprite sSubsprite_RedOutline3 = { .x = 0, .y = 0, @@ -227,7 +212,7 @@ static const struct Subsprite sSubsprite_8614264 = .priority = 0, }; -static const struct Subsprite sSubsprite_8614268 = +static const struct Subsprite sSubsprite_RedOutline4 = { .x = 0, .y = 0, @@ -237,7 +222,7 @@ static const struct Subsprite sSubsprite_8614268 = .priority = 0, }; -static const struct Subsprite sSubsprite_861426C = +static const struct Subsprite sSubsprite_RedOutline5 = { .x = 0, .y = 0, @@ -247,7 +232,7 @@ static const struct Subsprite sSubsprite_861426C = .priority = 0, }; -static const struct Subsprite sSubsprite_8614270 = +static const struct Subsprite sSubsprite_RedOutline6 = { .x = 0, .y = 0, @@ -257,7 +242,7 @@ static const struct Subsprite sSubsprite_8614270 = .priority = 0, }; -static const struct Subsprite sSubsprite_8614274 = +static const struct Subsprite sSubsprite_RedOutline7 = { .x = 0, .y = 0, @@ -267,7 +252,7 @@ static const struct Subsprite sSubsprite_8614274 = .priority = 0, }; -static const struct Subsprite sSubsprite_8614278 = +static const struct Subsprite sSubsprite_RedOutline8 = { .x = 0, .y = 0, @@ -277,7 +262,7 @@ static const struct Subsprite sSubsprite_8614278 = .priority = 0, }; -static const struct OamData sOamData_861427C = +static const struct OamData sOamData_RedArrowCursor = { .y = 0, .affineMode = 0, @@ -294,32 +279,32 @@ static const struct OamData sOamData_861427C = .affineParam = 0 }; -static const union AnimCmd sSpriteAnim_8614284[] = +static const union AnimCmd sSpriteAnim_RedArrowCursor[] = { ANIMCMD_FRAME(0, 30), ANIMCMD_END }; -static const union AnimCmd *const sSpriteAnimTable_861428C[] = +static const union AnimCmd *const sSpriteAnimTable_RedArrowCursor[] = { - sSpriteAnim_8614284 + sSpriteAnim_RedArrowCursor }; -static const struct SpriteTemplate gUnknown_08614290 = +static const struct SpriteTemplate sSpriteTemplate_RedArrowCursor = { .tileTag = 0, .paletteTag = 0, - .oam = &sOamData_861427C, - .anims = sSpriteAnimTable_861428C, + .oam = &sOamData_RedArrowCursor, + .anims = sSpriteAnimTable_RedArrowCursor, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = ObjectCB_RedArrowCursor, + .callback = SpriteCallback_RedArrowCursor, }; -static const u16 gUnknown_086142A8[] = INCBIN_U16("graphics/interface/red_arrow.gbapal"); -static const u8 gUnknown_086142C8[] = INCBIN_U8("graphics/interface/red_arrow_other.4bpp.lz"); -static const u8 gUnknown_08614338[] = INCBIN_U8("graphics/interface/selector_outline.4bpp.lz"); -static const u8 gUnknown_08614378[] = INCBIN_U8("graphics/interface/red_arrow.4bpp.lz"); +static const u16 sRedArrowPal[] = INCBIN_U16("graphics/interface/red_arrow.gbapal"); +static const u8 sRedArrowOtherGfx[] = INCBIN_U8("graphics/interface/red_arrow_other.4bpp.lz"); +static const u8 sSelectorOutlineGfx[] = INCBIN_U8("graphics/interface/selector_outline.4bpp.lz"); +static const u8 sRedArrowGfx[] = INCBIN_U8("graphics/interface/red_arrow.4bpp.lz"); // code static void ListMenuDummyTask(u8 taskId) @@ -329,67 +314,67 @@ static void ListMenuDummyTask(u8 taskId) s32 DoMysteryGiftListMenu(struct WindowTemplate *windowTemplate, struct ListMenuTemplate *listMenuTemplate, u8 arg2, u16 tileNum, u16 palNum) { - switch (gUnknown_0203CE84.field_4) + switch (sMysteryGiftLinkMenu.state) { case 0: default: - gUnknown_0203CE84.field_5 = AddWindow(windowTemplate); + sMysteryGiftLinkMenu.windowId = AddWindow(windowTemplate); switch (arg2) { case 2: - sub_809882C(gUnknown_0203CE84.field_5, tileNum, palNum); + LoadUserWindowBorderGfx(sMysteryGiftLinkMenu.windowId, tileNum, palNum); case 1: - sub_8098858(gUnknown_0203CE84.field_5, tileNum, palNum / 16); + sub_8098858(sMysteryGiftLinkMenu.windowId, tileNum, palNum / 16); break; } gMultiuseListMenuTemplate = *listMenuTemplate; - gMultiuseListMenuTemplate.windowId = gUnknown_0203CE84.field_5; - gUnknown_0203CE84.field_6 = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0); - CopyWindowToVram(gUnknown_0203CE84.field_5, 1); - gUnknown_0203CE84.field_4 = 1; + gMultiuseListMenuTemplate.windowId = sMysteryGiftLinkMenu.windowId; + sMysteryGiftLinkMenu.listTaskId = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0); + CopyWindowToVram(sMysteryGiftLinkMenu.windowId, 1); + sMysteryGiftLinkMenu.state = 1; break; case 1: - gUnknown_0203CE84.field_0 = ListMenuHandleInputGetItemId(gUnknown_0203CE84.field_6); + sMysteryGiftLinkMenu.currItemId = ListMenuHandleInputGetItemId(sMysteryGiftLinkMenu.listTaskId); if (gMain.newKeys & A_BUTTON) { - gUnknown_0203CE84.field_4 = 2; + sMysteryGiftLinkMenu.state = 2; } if (gMain.newKeys & B_BUTTON) { - gUnknown_0203CE84.field_0 = LIST_B_PRESSED; - gUnknown_0203CE84.field_4 = 2; + sMysteryGiftLinkMenu.currItemId = LIST_B_PRESSED; + sMysteryGiftLinkMenu.state = 2; } - if (gUnknown_0203CE84.field_4 == 2) + if (sMysteryGiftLinkMenu.state == 2) { if (arg2 == 0) { - ClearWindowTilemap(gUnknown_0203CE84.field_5); + ClearWindowTilemap(sMysteryGiftLinkMenu.windowId); } else { switch (arg2) { case 0: // can never be reached, because of the if statement above - sub_819746C(gUnknown_0203CE84.field_5, FALSE); + sub_819746C(sMysteryGiftLinkMenu.windowId, FALSE); break; case 2: case 1: - sub_819746C(gUnknown_0203CE84.field_5, FALSE); + sub_819746C(sMysteryGiftLinkMenu.windowId, FALSE); break; } } - CopyWindowToVram(gUnknown_0203CE84.field_5, 1); + CopyWindowToVram(sMysteryGiftLinkMenu.windowId, 1); } break; case 2: - DestroyListMenuTask(gUnknown_0203CE84.field_6, NULL, NULL); - RemoveWindow(gUnknown_0203CE84.field_5); - gUnknown_0203CE84.field_4 = 0; - return gUnknown_0203CE84.field_0; + DestroyListMenuTask(sMysteryGiftLinkMenu.listTaskId, NULL, NULL); + RemoveWindow(sMysteryGiftLinkMenu.windowId); + sMysteryGiftLinkMenu.state = 0; + return sMysteryGiftLinkMenu.currItemId; } - return -1; + return LIST_NOTHING_CHOSEN; } u8 ListMenuInit(struct ListMenuTemplate *listMenuTemplate, u16 scrollOffset, u16 selectedRow) @@ -402,19 +387,19 @@ u8 ListMenuInit(struct ListMenuTemplate *listMenuTemplate, u16 scrollOffset, u16 } // unused -u8 ListMenuInitWithWindows(struct ListMenuTemplate *listMenuTemplate, struct UnknownListMenuWindowStruct *arg1, u16 scrollOffset, u16 selectedRow) +u8 ListMenuInitInRect(struct ListMenuTemplate *listMenuTemplate, struct ListMenuWindowRect *rect, u16 scrollOffset, u16 selectedRow) { s32 i; u8 taskId = ListMenuInitInternal(listMenuTemplate, scrollOffset, selectedRow); - for (i = 0; arg1[i].palNum != 0xFF; i++) + for (i = 0; rect[i].palNum != 0xFF; i++) { PutWindowRectTilemapOverridePalette(listMenuTemplate->windowId, - arg1[i].x, - arg1[i].y, - arg1[i].width, - arg1[i].height, - arg1[i].palNum); + rect[i].x, + rect[i].y, + rect[i].width, + rect[i].height, + rect[i].palNum); } CopyWindowToVram(listMenuTemplate->windowId, 2); @@ -480,6 +465,8 @@ s32 ListMenuHandleInputGetItemId(u8 listTaskId) } } +#define TASK_NONE 0xFF + void DestroyListMenuTask(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow) { struct ListMenu *list = (void*) gTasks[listTaskId].data; @@ -489,13 +476,13 @@ void DestroyListMenuTask(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow) if (selectedRow != NULL) *selectedRow = list->selectedRow; - if (list->unk_1E != 0xFF) - ListMenuRemoveCursorObject(list->unk_1E, list->template.cursorKind - 2); + if (list->taskId != TASK_NONE) + ListMenuRemoveCursorObject(list->taskId, list->template.cursorKind - 2); DestroyTask(listTaskId); } -void sub_81AE70C(u8 listTaskId) +void RedrawListMenu(u8 listTaskId) { struct ListMenu *list = (void*) gTasks[listTaskId].data; @@ -569,7 +556,7 @@ void ListMenuGetScrollAndRow(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow) u16 ListMenuGetYCoordForPrintingArrowCursor(u8 listTaskId) { struct ListMenu *list = (void*) gTasks[listTaskId].data; - u8 yMultiplier = GetFontAttribute(list->template.fontId, 1) + list->template.unk_16_3; + u8 yMultiplier = GetFontAttribute(list->template.fontId, FONTATTR_MAX_LETTER_HEIGHT) + list->template.itemVerticalPadding; return list->selectedRow * yMultiplier + list->template.upText_Y; } @@ -584,15 +571,15 @@ static u8 ListMenuInitInternal(struct ListMenuTemplate *listMenuTemplate, u16 sc list->selectedRow = selectedRow; list->unk_1C = 0; list->unk_1D = 0; - list->unk_1E = 0xFF; + list->taskId = TASK_NONE; list->unk_1F = 0; - gUnknown_03006300.cursorPal = list->template.cursorPal; - gUnknown_03006300.fillValue = list->template.fillValue; - gUnknown_03006300.cursorShadowPal = list->template.cursorShadowPal; - gUnknown_03006300.lettersSpacing = list->template.lettersSpacing; - gUnknown_03006300.fontId = list->template.fontId; - gUnknown_03006300.field_3_7 = 0; + gListMenuOverride.cursorPal = list->template.cursorPal; + gListMenuOverride.fillValue = list->template.fillValue; + gListMenuOverride.cursorShadowPal = list->template.cursorShadowPal; + gListMenuOverride.lettersSpacing = list->template.lettersSpacing; + gListMenuOverride.fontId = list->template.fontId; + gListMenuOverride.enabled = FALSE; if (list->template.totalItems < list->template.maxShowed) list->template.maxShowed = list->template.totalItems; @@ -600,7 +587,7 @@ static u8 ListMenuInitInternal(struct ListMenuTemplate *listMenuTemplate, u16 sc FillWindowPixelBuffer(list->template.windowId, (list->template.fillValue << 4) | (list->template.fillValue)); ListMenuPrintEntries(list, list->scrollOffset, 0, list->template.maxShowed); ListMenuDrawCursor(list); - ListMenuCallSelectionChangedCallback(list, 1); + ListMenuCallSelectionChangedCallback(list, TRUE); return listTaskId; } @@ -608,18 +595,18 @@ static u8 ListMenuInitInternal(struct ListMenuTemplate *listMenuTemplate, u16 sc static void ListMenuPrint(struct ListMenu *list, const u8 *str, u8 x, u8 y) { u8 colors[3]; - if (gUnknown_03006300.field_3_7) + if (gListMenuOverride.enabled) { - colors[0] = gUnknown_03006300.fillValue; - colors[1] = gUnknown_03006300.cursorPal; - colors[2] = gUnknown_03006300.cursorShadowPal; + colors[0] = gListMenuOverride.fillValue; + colors[1] = gListMenuOverride.cursorPal; + colors[2] = gListMenuOverride.cursorShadowPal; AddTextPrinterParameterized2(list->template.windowId, - gUnknown_03006300.fontId, + gListMenuOverride.fontId, x, y, - gUnknown_03006300.lettersSpacing, + gListMenuOverride.lettersSpacing, 0, colors, TEXT_SPEED_FF, str); - gUnknown_03006300.field_3_7 = 0; + gListMenuOverride.enabled = FALSE; } else { @@ -638,18 +625,18 @@ static void ListMenuPrintEntries(struct ListMenu *list, u16 startIndex, u16 yOff { s32 i; u8 x, y; - u8 yMultiplier = GetFontAttribute(list->template.fontId, 1) + list->template.unk_16_3; + u8 yMultiplier = GetFontAttribute(list->template.fontId, FONTATTR_MAX_LETTER_HEIGHT) + list->template.itemVerticalPadding; for (i = 0; i < count; i++) { - if (list->template.items[startIndex].id != -3) - x = list->template.unk_12; + if (list->template.items[startIndex].id != LIST_HEADER) + x = list->template.item_X; else - x = list->template.unk_11; + x = list->template.header_X; y = (yOffset + i) * yMultiplier + list->template.upText_Y; - if (list->template.unk_08 != NULL) - list->template.unk_08(list->template.windowId, list->template.items[startIndex].id, y); + if (list->template.itemPrintFunc != NULL) + list->template.itemPrintFunc(list->template.windowId, list->template.items[startIndex].id, y); ListMenuPrint(list, list->template.items[startIndex].name, x, y); startIndex++; @@ -658,7 +645,7 @@ static void ListMenuPrintEntries(struct ListMenu *list, u16 startIndex, u16 yOff static void ListMenuDrawCursor(struct ListMenu *list) { - u8 yMultiplier = GetFontAttribute(list->template.fontId, 1) + list->template.unk_16_3; + u8 yMultiplier = GetFontAttribute(list->template.fontId, FONTATTR_MAX_LETTER_HEIGHT) + list->template.itemVerticalPadding; u8 x = list->template.cursor_X; u8 y = list->selectedRow * yMultiplier + list->template.upText_Y; switch (list->template.cursorKind) @@ -669,33 +656,35 @@ static void ListMenuDrawCursor(struct ListMenu *list) case 1: break; case 2: - if (list->unk_1E == 0xFF) - list->unk_1E = ListMenuAddCursorObject(list, 0); - ListMenuUpdateCursorObject(list->unk_1E, + if (list->taskId == TASK_NONE) + list->taskId = ListMenuAddCursorObject(list, 0); + ListMenuUpdateCursorObject(list->taskId, GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_LEFT) * 8 - 1, GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_TOP) * 8 + y - 1, 0); break; case 3: - if (list->unk_1E == 0xFF) - list->unk_1E = ListMenuAddCursorObject(list, 1); - ListMenuUpdateCursorObject(list->unk_1E, + if (list->taskId == TASK_NONE) + list->taskId = ListMenuAddCursorObject(list, 1); + ListMenuUpdateCursorObject(list->taskId, GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_LEFT) * 8 + x, GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_TOP) * 8 + y, 1); break; } } +#undef TASK_NONE + static u8 ListMenuAddCursorObject(struct ListMenu *list, u32 cursorKind) { struct CursorStruct cursor; - cursor.unk0 = 0; - cursor.unk1 = 0xA0; - cursor.unk2 = GetWindowAttribute(list->template.windowId, WINDOW_WIDTH) * 8 + 2; - cursor.unk4 = GetFontAttribute(list->template.fontId, 1) + 2; + cursor.left = 0; + cursor.top = 160; + cursor.rowWidth = GetWindowAttribute(list->template.windowId, WINDOW_WIDTH) * 8 + 2; + cursor.rowHeight = GetFontAttribute(list->template.fontId, FONTATTR_MAX_LETTER_HEIGHT) + 2; cursor.tileTag = 0x4000; - cursor.palTag = 0xFFFF; - cursor.palNum = 0xF; + cursor.palTag = SPRITE_INVALID_TAG; + cursor.palNum = 15; return ListMenuAddCursorObjectInternal(&cursor, cursorKind); } @@ -705,7 +694,7 @@ static void ListMenuErasePrintedCursor(struct ListMenu *list, u16 selectedRow) u8 cursorKind = list->template.cursorKind; if (cursorKind == 0) { - u8 yMultiplier = GetFontAttribute(list->template.fontId, 1) + list->template.unk_16_3; + u8 yMultiplier = GetFontAttribute(list->template.fontId, FONTATTR_MAX_LETTER_HEIGHT) + list->template.itemVerticalPadding; u8 width = GetMenuCursorDimensionByFont(list->template.fontId, 0); u8 height = GetMenuCursorDimensionByFont(list->template.fontId, 1); FillWindowPixelRect(list->template.windowId, @@ -736,7 +725,7 @@ static u8 ListMenuUpdateSelectedRowIndexAndScrollOffset(struct ListMenu *list, b while (selectedRow != 0) { selectedRow--; - if (list->template.items[scrollOffset + selectedRow].id != -3) + if (list->template.items[scrollOffset + selectedRow].id != LIST_HEADER) { list->selectedRow = selectedRow; return 1; @@ -750,7 +739,7 @@ static u8 ListMenuUpdateSelectedRowIndexAndScrollOffset(struct ListMenu *list, b while (selectedRow > newRow) { selectedRow--; - if (list->template.items[scrollOffset + selectedRow].id != -3) + if (list->template.items[scrollOffset + selectedRow].id != LIST_HEADER) { list->selectedRow = selectedRow; return 1; @@ -772,7 +761,7 @@ static u8 ListMenuUpdateSelectedRowIndexAndScrollOffset(struct ListMenu *list, b while (selectedRow < list->template.maxShowed - 1) { selectedRow++; - if (list->template.items[scrollOffset + selectedRow].id != -3) + if (list->template.items[scrollOffset + selectedRow].id != LIST_HEADER) { list->selectedRow = selectedRow; return 1; @@ -786,7 +775,7 @@ static u8 ListMenuUpdateSelectedRowIndexAndScrollOffset(struct ListMenu *list, b while (selectedRow < newRow) { selectedRow++; - if (list->template.items[scrollOffset + selectedRow].id != -3) + if (list->template.items[scrollOffset + selectedRow].id != LIST_HEADER) { list->selectedRow = selectedRow; return 1; @@ -811,7 +800,7 @@ static void ListMenuScroll(struct ListMenu *list, u8 count, bool8 movingDown) } else { - u8 yMultiplier = GetFontAttribute(list->template.fontId, 1) + list->template.unk_16_3; + u8 yMultiplier = GetFontAttribute(list->template.fontId, FONTATTR_MAX_LETTER_HEIGHT) + list->template.itemVerticalPadding; if (!movingDown) { @@ -859,7 +848,7 @@ static bool8 ListMenuChangeSelection(struct ListMenu *list, bool8 updateCursorAn if (ret != 2) break; cursorCount++; - } while (list->template.items[list->scrollOffset + list->selectedRow].id == -3); + } while (list->template.items[list->scrollOffset + list->selectedRow].id == LIST_HEADER); } if (updateCursorAndCallCallback) @@ -872,7 +861,7 @@ static bool8 ListMenuChangeSelection(struct ListMenu *list, bool8 updateCursorAn case 1: ListMenuErasePrintedCursor(list, oldSelectedRow); ListMenuDrawCursor(list); - ListMenuCallSelectionChangedCallback(list, 0); + ListMenuCallSelectionChangedCallback(list, FALSE); CopyWindowToVram(list->template.windowId, 2); break; case 2: @@ -880,7 +869,7 @@ static bool8 ListMenuChangeSelection(struct ListMenu *list, bool8 updateCursorAn ListMenuErasePrintedCursor(list, oldSelectedRow); ListMenuScroll(list, cursorCount, movingDown); ListMenuDrawCursor(list); - ListMenuCallSelectionChangedCallback(list, 0); + ListMenuCallSelectionChangedCallback(list, FALSE); CopyWindowToVram(list->template.windowId, 2); break; } @@ -889,29 +878,29 @@ static bool8 ListMenuChangeSelection(struct ListMenu *list, bool8 updateCursorAn return FALSE; } -static void ListMenuCallSelectionChangedCallback(struct ListMenu *list, u8 a2) +static void ListMenuCallSelectionChangedCallback(struct ListMenu *list, u8 onInit) { if (list->template.moveCursorFunc != NULL) - list->template.moveCursorFunc(list->template.items[list->scrollOffset + list->selectedRow].id, a2, list); + list->template.moveCursorFunc(list->template.items[list->scrollOffset + list->selectedRow].id, onInit, list); } // unused -void sub_81AF028(u8 cursorPal, u8 fillValue, u8 cursorShadowPal) +void ListMenuOverrideSetColors(u8 cursorPal, u8 fillValue, u8 cursorShadowPal) { - gUnknown_03006300.cursorPal = cursorPal; - gUnknown_03006300.fillValue = fillValue; - gUnknown_03006300.cursorShadowPal = cursorShadowPal; - gUnknown_03006300.field_3_7 = 1; + gListMenuOverride.cursorPal = cursorPal; + gListMenuOverride.fillValue = fillValue; + gListMenuOverride.cursorShadowPal = cursorShadowPal; + gListMenuOverride.enabled = TRUE; } -void sub_81AF078(s32 arg0, u8 arg1, struct ListMenu *list) +void ListMenuDefaultCursorMoveFunc(s32 itemIndex, bool8 onInit, struct ListMenu *list) { - if (!arg1) + if (!onInit) PlaySE(SE_SELECT); } // unused -s32 sub_81AF08C(u8 taskId, u8 field) +s32 ListMenuGetUnkIndicatorsStructFields(u8 taskId, u8 field) { struct UnkIndicatorsStruct *data = (void*) gTasks[taskId].data; @@ -955,8 +944,7 @@ s32 sub_81AF08C(u8 taskId, u8 field) } } -// unused -void sub_81AF15C(u8 taskId, u8 field, s32 value) +void ListMenuSetUnkIndicatorsStructField(u8 taskId, u8 field, s32 value) { struct UnkIndicatorsStruct *data = (void*) &gTasks[taskId].data; @@ -1014,73 +1002,87 @@ void sub_81AF15C(u8 taskId, u8 field, s32 value) } } -static void sub_81AF264(struct Sprite *sprite) +#define tState data[0] +#define tAnimNum data[1] +#define tBounceDir data[2] +#define tMultiplier data[3] +#define tFrequency data[4] +#define tSinePos data[5] + +static void SpriteCallback_ScrollIndicatorArrow(struct Sprite *sprite) { s32 multiplier; - switch (sprite->data[0]) + switch (sprite->tState) { case 0: - StartSpriteAnim(sprite, sprite->data[1]); - sprite->data[0]++; + StartSpriteAnim(sprite, sprite->tAnimNum); + sprite->tState++; break; case 1: - switch (sprite->data[2]) + switch (sprite->tBounceDir) { case 0: - multiplier = sprite->data[3]; - sprite->pos2.x = (gSineTable[(u8)(sprite->data[5])] * multiplier) / 256; + multiplier = sprite->tMultiplier; + sprite->pos2.x = (gSineTable[(u8)(sprite->tSinePos)] * multiplier) / 256; break; case 1: - multiplier = sprite->data[3]; - sprite->pos2.y = (gSineTable[(u8)(sprite->data[5])] * multiplier) / 256; + multiplier = sprite->tMultiplier; + sprite->pos2.y = (gSineTable[(u8)(sprite->tSinePos)] * multiplier) / 256; break; } - sprite->data[5] += sprite->data[4]; + sprite->tSinePos += sprite->tFrequency; break; } } -static u8 AddScrollIndicatorArrowObject(u8 arg0, u8 x, u8 y, u16 tileTag, u16 palTag) +static u8 AddScrollIndicatorArrowObject(u8 arrowDir, u8 x, u8 y, u16 tileTag, u16 palTag) { u8 spriteId; struct SpriteTemplate spriteTemplate; - spriteTemplate = gUnknown_08614244; + spriteTemplate = sSpriteTemplate_ScrollArrowIndicator; spriteTemplate.tileTag = tileTag; spriteTemplate.paletteTag = palTag; spriteId = CreateSprite(&spriteTemplate, x, y, 0); - gSprites[spriteId].invisible = 1; - gSprites[spriteId].data[0] = 0; - gSprites[spriteId].data[1] = gUnknown_086141FC[arg0].field_0_0; - gSprites[spriteId].data[2] = gUnknown_086141FC[arg0].field_0_1; - gSprites[spriteId].data[3] = gUnknown_086141FC[arg0].field_1; - gSprites[spriteId].data[4] = gUnknown_086141FC[arg0].field_2; - gSprites[spriteId].data[5] = 0; + gSprites[spriteId].invisible = TRUE; + gSprites[spriteId].tState = 0; + gSprites[spriteId].tAnimNum = sScrollIndicatorTemplates[arrowDir].animNum; + gSprites[spriteId].tBounceDir = sScrollIndicatorTemplates[arrowDir].bounceDir; + gSprites[spriteId].tMultiplier = sScrollIndicatorTemplates[arrowDir].multiplier; + gSprites[spriteId].tFrequency = sScrollIndicatorTemplates[arrowDir].frequency; + gSprites[spriteId].tSinePos = 0; return spriteId; } -u8 AddScrollIndicatorArrowPair(const struct ArrowStruct *arrowInfo, u16 *arg1) +#undef tState +#undef tAnimNum +#undef tBounceDir +#undef tMultiplier +#undef tFrequency +#undef tSinePos + +u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate *arrowInfo, u16 *currItemPtr) { struct CompressedSpriteSheet spriteSheet; struct SpritePalette spritePal; - struct UnkIndicatorsStruct2 *data; + struct ScrollIndicatorPair *data; u8 taskId; - spriteSheet.data = gUnknown_086142C8; + spriteSheet.data = sRedArrowOtherGfx; spriteSheet.size = 0x100; spriteSheet.tag = arrowInfo->tileTag; LoadCompressedObjectPic(&spriteSheet); - if (arrowInfo->palTag == 0xFFFF) + if (arrowInfo->palTag == SPRITE_INVALID_TAG) { - LoadPalette(gUnknown_086142A8, (16 * arrowInfo->palNum) + 0x100, 0x20); + LoadPalette(sRedArrowPal, (16 * arrowInfo->palNum) + 0x100, 0x20); } else { - spritePal.data = gUnknown_086142A8; + spritePal.data = sRedArrowPal; spritePal.tag = arrowInfo->palTag; LoadSpritePalette(&spritePal); } @@ -1089,96 +1091,101 @@ u8 AddScrollIndicatorArrowPair(const struct ArrowStruct *arrowInfo, u16 *arg1) data = (void*) gTasks[taskId].data; data->field_0 = 0; - data->field_4 = arg1; - data->field_8 = arrowInfo->unk6; - data->field_A = arrowInfo->unk8; + data->currItemPtr = currItemPtr; + data->fullyUpThreshold = arrowInfo->fullyUpThreshold; + data->fullyDownThreshold = arrowInfo->fullyDownThreshold; data->tileTag = arrowInfo->tileTag; data->palTag = arrowInfo->palTag; - data->field_C = AddScrollIndicatorArrowObject(arrowInfo->unk0, arrowInfo->unk1, arrowInfo->unk2, arrowInfo->tileTag, arrowInfo->palTag); - data->field_D = AddScrollIndicatorArrowObject(arrowInfo->unk3, arrowInfo->unk4, arrowInfo->unk5, arrowInfo->tileTag, arrowInfo->palTag); + data->topSpriteId = AddScrollIndicatorArrowObject(arrowInfo->firstArrowType, arrowInfo->firstX, arrowInfo->firstY, arrowInfo->tileTag, arrowInfo->palTag); + data->bottomSpriteId = AddScrollIndicatorArrowObject(arrowInfo->secondArrowType, arrowInfo->secondX, arrowInfo->secondY, arrowInfo->tileTag, arrowInfo->palTag); - if (arrowInfo->palTag == 0xFFFF) + if (arrowInfo->palTag == SPRITE_INVALID_TAG) { - gSprites[data->field_C].oam.paletteNum = arrowInfo->palNum; - gSprites[data->field_D].oam.paletteNum = arrowInfo->palNum; + gSprites[data->topSpriteId].oam.paletteNum = arrowInfo->palNum; + gSprites[data->bottomSpriteId].oam.paletteNum = arrowInfo->palNum; } return taskId; } -u8 AddScrollIndicatorArrowPairParametrized(u32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 tileTag, s32 palTag, void *arg7) +u8 AddScrollIndicatorArrowPairParameterized(u32 arrowType, s32 commonPos, s32 firstPos, s32 secondPos, s32 fullyDownThreshold, s32 tileTag, s32 palTag, u16 *currItemPtr) { - if (arg0 == 2 || arg0 == 3) + if (arrowType == SCROLL_ARROW_UP || arrowType == SCROLL_ARROW_DOWN) { - gUnknown_0203CE8C.unk0 = 2; - gUnknown_0203CE8C.unk1 = arg1; - gUnknown_0203CE8C.unk2 = arg2; - gUnknown_0203CE8C.unk3 = 3; - gUnknown_0203CE8C.unk4 = arg1; - gUnknown_0203CE8C.unk5 = arg3; + gTempScrollArrowTemplate.firstArrowType = SCROLL_ARROW_UP; + gTempScrollArrowTemplate.firstX = commonPos; + gTempScrollArrowTemplate.firstY = firstPos; + gTempScrollArrowTemplate.secondArrowType = SCROLL_ARROW_DOWN; + gTempScrollArrowTemplate.secondX = commonPos; + gTempScrollArrowTemplate.secondY = secondPos; } else { - gUnknown_0203CE8C.unk0 = 0; - gUnknown_0203CE8C.unk1 = arg2; - gUnknown_0203CE8C.unk2 = arg1; - gUnknown_0203CE8C.unk3 = 1; - gUnknown_0203CE8C.unk4 = arg3; - gUnknown_0203CE8C.unk5 = arg1; + gTempScrollArrowTemplate.firstArrowType = SCROLL_ARROW_LEFT; + gTempScrollArrowTemplate.firstX = firstPos; + gTempScrollArrowTemplate.firstY = commonPos; + gTempScrollArrowTemplate.secondArrowType = SCROLL_ARROW_RIGHT; + gTempScrollArrowTemplate.secondX = secondPos; + gTempScrollArrowTemplate.secondY = commonPos; } - gUnknown_0203CE8C.unk6 = 0; - gUnknown_0203CE8C.unk8 = arg4; - gUnknown_0203CE8C.tileTag = tileTag; - gUnknown_0203CE8C.palTag = palTag; - gUnknown_0203CE8C.palNum = 0; + gTempScrollArrowTemplate.fullyUpThreshold = 0; + gTempScrollArrowTemplate.fullyDownThreshold = fullyDownThreshold; + gTempScrollArrowTemplate.tileTag = tileTag; + gTempScrollArrowTemplate.palTag = palTag; + gTempScrollArrowTemplate.palNum = 0; - return AddScrollIndicatorArrowPair(&gUnknown_0203CE8C, arg7); + return AddScrollIndicatorArrowPair(&gTempScrollArrowTemplate, currItemPtr); } static void Task_ScrollIndicatorArrowPair(u8 taskId) { - struct UnkIndicatorsStruct2 *data = (void*) gTasks[taskId].data; - u16 var = (*data->field_4); + struct ScrollIndicatorPair *data = (void*) gTasks[taskId].data; + u16 currItem = (*data->currItemPtr); - if (var == data->field_8 && var != 0xFFFF) - gSprites[data->field_C].invisible = 1; + if (currItem == data->fullyUpThreshold && currItem != 0xFFFF) + gSprites[data->topSpriteId].invisible = TRUE; else - gSprites[data->field_C].invisible = 0; + gSprites[data->topSpriteId].invisible = FALSE; - if (var == data->field_A) - gSprites[data->field_D].invisible = 1; + if (currItem == data->fullyDownThreshold) + gSprites[data->bottomSpriteId].invisible = TRUE; else - gSprites[data->field_D].invisible = 0; + gSprites[data->bottomSpriteId].invisible = FALSE; } +#define tIsScrolled data[15] + void Task_ScrollIndicatorArrowPairOnMainMenu(u8 taskId) { - struct UnkIndicatorsStruct2 *data = (void*) gTasks[taskId].data; + s16 *data = gTasks[taskId].data; + struct ScrollIndicatorPair *scrollData = (void*) data; - if (data->field_1E != 0) + if (tIsScrolled) { - gSprites[data->field_C].invisible = 0; - gSprites[data->field_D].invisible = 1; + gSprites[scrollData->topSpriteId].invisible = FALSE; + gSprites[scrollData->bottomSpriteId].invisible = TRUE; } else { - gSprites[data->field_C].invisible = 1; - gSprites[data->field_D].invisible = 0; + gSprites[scrollData->topSpriteId].invisible = TRUE; + gSprites[scrollData->bottomSpriteId].invisible = FALSE; } } +#undef tIsScrolled + void RemoveScrollIndicatorArrowPair(u8 taskId) { - struct UnkIndicatorsStruct2 *data = (void*) gTasks[taskId].data; + struct ScrollIndicatorPair *data = (void*) gTasks[taskId].data; - if (data->tileTag != 0xFFFF) + if (data->tileTag != SPRITE_INVALID_TAG) FreeSpriteTilesByTag(data->tileTag); - if (data->palTag != 0xFFFF) + if (data->palTag != SPRITE_INVALID_TAG) FreeSpritePaletteByTag(data->palTag); - DestroySprite(&gSprites[data->field_C]); - DestroySprite(&gSprites[data->field_D]); + DestroySprite(&gSprites[data->topSpriteId]); + DestroySprite(&gSprites[data->bottomSpriteId]); DestroyTask(taskId); } @@ -1226,76 +1233,76 @@ static void Task_RedOutlineCursor(u8 taskId) } -u8 ListMenuGetRedOutlineCursorSpriteCount(u16 arg0, u16 arg1) +u8 ListMenuGetRedOutlineCursorSpriteCount(u16 rowWidth, u16 rowHeight) { s32 i; s32 count = 4; - if (arg0 > 16) + if (rowWidth > 16) { - for (i = 8; i < (arg0 - 8); i += 8) + for (i = 8; i < (rowWidth - 8); i += 8) count += 2; } - if (arg1 > 16) + if (rowHeight > 16) { - for (i = 8; i < (arg1 - 8); i += 8) + for (i = 8; i < (rowHeight - 8); i += 8) count += 2; } return count; } -void ListMenuSetUpRedOutlineCursorSpriteOamTable(u16 arg0, u16 arg1, struct Subsprite *subsprites) +void ListMenuSetUpRedOutlineCursorSpriteOamTable(u16 rowWidth, u16 rowHeight, struct Subsprite *subsprites) { s32 i, j, id = 0; - subsprites[id] = sSubsprite_861425C; + subsprites[id] = sSubsprite_RedOutline1; subsprites[id].x = 136; subsprites[id].y = 136; id++; - subsprites[id] = sSubsprite_8614260; - subsprites[id].x = arg0 + 128; + subsprites[id] = sSubsprite_RedOutline2; + subsprites[id].x = rowWidth + 128; subsprites[id].y = 136; id++; - subsprites[id] = sSubsprite_8614274; + subsprites[id] = sSubsprite_RedOutline7; subsprites[id].x = 136; - subsprites[id].y = arg1 + 128; + subsprites[id].y = rowHeight + 128; id++; - subsprites[id] = sSubsprite_8614278; - subsprites[id].x = arg0 + 128; - subsprites[id].y = arg1 + 128; + subsprites[id] = sSubsprite_RedOutline8; + subsprites[id].x = rowWidth + 128; + subsprites[id].y = rowHeight + 128; id++; - if (arg0 > 16) + if (rowWidth > 16) { - for (i = 8; i < arg0 - 8; i += 8) + for (i = 8; i < rowWidth - 8; i += 8) { - subsprites[id] = sSubsprite_8614264; + subsprites[id] = sSubsprite_RedOutline3; subsprites[id].x = i - 120; subsprites[id].y = 136; id++; - subsprites[id] = sSubsprite_8614270; + subsprites[id] = sSubsprite_RedOutline6; subsprites[id].x = i - 120; - subsprites[id].y = arg1 + 128; + subsprites[id].y = rowHeight + 128; id++; } } - if (arg1 > 16) + if (rowHeight > 16) { - for (j = 8; j < arg1 - 8; j += 8) + for (j = 8; j < rowHeight - 8; j += 8) { - subsprites[id] = sSubsprite_8614268; + subsprites[id] = sSubsprite_RedOutline4; subsprites[id].x = 136; subsprites[id].y = j - 120; id++; - subsprites[id] = sSubsprite_861426C; - subsprites[id].x = arg0 + 128; + subsprites[id] = sSubsprite_RedOutline5; + subsprites[id].x = rowWidth + 128; subsprites[id].y = j - 120; id++; } @@ -1306,22 +1313,22 @@ static u8 ListMenuAddRedOutlineCursorObject(struct CursorStruct *cursor) { struct CompressedSpriteSheet spriteSheet; struct SpritePalette spritePal; - struct UnkIndicatorsStruct3 *data; + struct RedOutlineCursor *data; struct SpriteTemplate spriteTemplate; u8 taskId; - spriteSheet.data = gUnknown_08614338; + spriteSheet.data = sSelectorOutlineGfx; spriteSheet.size = 0x100; spriteSheet.tag = cursor->tileTag; LoadCompressedObjectPic(&spriteSheet); - if (cursor->palTag == 0xFFFF) + if (cursor->palTag == SPRITE_INVALID_TAG) { - LoadPalette(gUnknown_086142A8, (16 * cursor->palNum) + 0x100, 0x20); + LoadPalette(sRedArrowPal, (16 * cursor->palNum) + 0x100, 0x20); } else { - spritePal.data = gUnknown_086142A8; + spritePal.data = sRedArrowPal; spritePal.tag = cursor->palTag; LoadSpritePalette(&spritePal); } @@ -1331,21 +1338,21 @@ static u8 ListMenuAddRedOutlineCursorObject(struct CursorStruct *cursor) data->tileTag = cursor->tileTag; data->palTag = cursor->palTag; - data->subspriteTable.subspriteCount = ListMenuGetRedOutlineCursorSpriteCount(cursor->unk2, cursor->unk4); + data->subspriteTable.subspriteCount = ListMenuGetRedOutlineCursorSpriteCount(cursor->rowWidth, cursor->rowHeight); data->subspriteTable.subsprites = data->subspritesPtr = Alloc(data->subspriteTable.subspriteCount * 4); - ListMenuSetUpRedOutlineCursorSpriteOamTable(cursor->unk2, cursor->unk4, data->subspritesPtr); + ListMenuSetUpRedOutlineCursorSpriteOamTable(cursor->rowWidth, cursor->rowHeight, data->subspritesPtr); spriteTemplate = gDummySpriteTemplate; spriteTemplate.tileTag = cursor->tileTag; spriteTemplate.paletteTag = cursor->palTag; - data->spriteId = CreateSprite(&spriteTemplate, cursor->unk0 + 120, cursor->unk1 + 120, 0); + data->spriteId = CreateSprite(&spriteTemplate, cursor->left + 120, cursor->top + 120, 0); SetSubspriteTables(&gSprites[data->spriteId], &data->subspriteTable); gSprites[data->spriteId].oam.priority = 0; gSprites[data->spriteId].subpriority = 0; gSprites[data->spriteId].subspriteTableNum = 0; - if (cursor->palTag == 0xFFFF) + if (cursor->palTag == SPRITE_INVALID_TAG) { gSprites[data->spriteId].oam.paletteNum = cursor->palNum; } @@ -1355,7 +1362,7 @@ static u8 ListMenuAddRedOutlineCursorObject(struct CursorStruct *cursor) static void ListMenuUpdateRedOutlineCursorObject(u8 taskId, u16 x, u16 y) { - struct UnkIndicatorsStruct3 *data = (void*) gTasks[taskId].data; + struct RedOutlineCursor *data = (void*) gTasks[taskId].data; gSprites[data->spriteId].pos1.x = x + 120; gSprites[data->spriteId].pos1.y = y + 120; @@ -1363,20 +1370,20 @@ static void ListMenuUpdateRedOutlineCursorObject(u8 taskId, u16 x, u16 y) static void ListMenuRemoveRedOutlineCursorObject(u8 taskId) { - struct UnkIndicatorsStruct3 *data = (void*) gTasks[taskId].data; + struct RedOutlineCursor *data = (void*) gTasks[taskId].data; Free(data->subspritesPtr); - if (data->tileTag != 0xFFFF) + if (data->tileTag != SPRITE_INVALID_TAG) FreeSpriteTilesByTag(data->tileTag); - if (data->palTag != 0xFFFF) + if (data->palTag != SPRITE_INVALID_TAG) FreeSpritePaletteByTag(data->palTag); DestroySprite(&gSprites[data->spriteId]); DestroyTask(taskId); } -static void ObjectCB_RedArrowCursor(struct Sprite *sprite) +static void SpriteCallback_RedArrowCursor(struct Sprite *sprite) { sprite->pos2.x = gSineTable[(u8)(sprite->data[0])] / 64; sprite->data[0] += 8; @@ -1391,22 +1398,22 @@ static u8 ListMenuAddRedArrowCursorObject(struct CursorStruct *cursor) { struct CompressedSpriteSheet spriteSheet; struct SpritePalette spritePal; - struct UnkIndicatorsStruct4 *data; + struct RedArrowCursor *data; struct SpriteTemplate spriteTemplate; u8 taskId; - spriteSheet.data = gUnknown_08614378; + spriteSheet.data = sRedArrowGfx; spriteSheet.size = 0x80; spriteSheet.tag = cursor->tileTag; LoadCompressedObjectPic(&spriteSheet); - if (cursor->palTag == 0xFFFF) + if (cursor->palTag == SPRITE_INVALID_TAG) { - LoadPalette(gUnknown_086142A8, (16 * cursor->palNum) + 0x100, 0x20); + LoadPalette(sRedArrowPal, (16 * cursor->palNum) + 0x100, 0x20); } else { - spritePal.data = gUnknown_086142A8; + spritePal.data = sRedArrowPal; spritePal.tag = cursor->palTag; LoadSpritePalette(&spritePal); } @@ -1417,17 +1424,17 @@ static u8 ListMenuAddRedArrowCursorObject(struct CursorStruct *cursor) data->tileTag = cursor->tileTag; data->palTag = cursor->palTag; - spriteTemplate = gUnknown_08614290; + spriteTemplate = sSpriteTemplate_RedArrowCursor; spriteTemplate.tileTag = cursor->tileTag; spriteTemplate.paletteTag = cursor->palTag; - data->field_0 = CreateSprite(&spriteTemplate, cursor->unk0, cursor->unk1, 0); - gSprites[data->field_0].pos2.x = 8; - gSprites[data->field_0].pos2.y = 8; + data->spriteId = CreateSprite(&spriteTemplate, cursor->left, cursor->top, 0); + gSprites[data->spriteId].pos2.x = 8; + gSprites[data->spriteId].pos2.y = 8; - if (cursor->palTag == 0xFFFF) + if (cursor->palTag == SPRITE_INVALID_TAG) { - gSprites[data->field_0].oam.paletteNum = cursor->palNum; + gSprites[data->spriteId].oam.paletteNum = cursor->palNum; } return taskId; @@ -1435,21 +1442,21 @@ static u8 ListMenuAddRedArrowCursorObject(struct CursorStruct *cursor) static void ListMenuUpdateRedArrowCursorObject(u8 taskId, u16 x, u16 y) { - struct UnkIndicatorsStruct4 *data = (void*) gTasks[taskId].data; + struct RedArrowCursor *data = (void*) gTasks[taskId].data; - gSprites[data->field_0].pos1.x = x; - gSprites[data->field_0].pos1.y = y; + gSprites[data->spriteId].pos1.x = x; + gSprites[data->spriteId].pos1.y = y; } static void ListMenuRemoveRedArrowCursorObject(u8 taskId) { - struct UnkIndicatorsStruct4 *data = (void*) gTasks[taskId].data; + struct RedArrowCursor *data = (void*) gTasks[taskId].data; - if (data->tileTag != 0xFFFF) + if (data->tileTag != SPRITE_INVALID_TAG) FreeSpriteTilesByTag(data->tileTag); - if (data->palTag != 0xFFFF) + if (data->palTag != SPRITE_INVALID_TAG) FreeSpritePaletteByTag(data->palTag); - DestroySprite(&gSprites[data->field_0]); + DestroySprite(&gSprites[data->spriteId]); DestroyTask(taskId); } diff --git a/src/mail.c b/src/mail.c index 8fddc7045a..625b52de36 100644 --- a/src/mail.c +++ b/src/mail.c @@ -417,7 +417,7 @@ static bool8 MailReadBuildGraphics(void) ShowBg(0); ShowBg(1); ShowBg(2); - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); gPaletteFade.bufferTransferDisabled = FALSE; sMailRead->callback2 = CB2_WaitForPaletteExitOnKeyPress; return TRUE; @@ -526,7 +526,7 @@ static void CB2_ExitOnKeyPress(void) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); sMailRead->callback2 = CB2_ExitMailReadFreeVars; } } diff --git a/src/main_menu.c b/src/main_menu.c index 3490424aff..91a5eba532 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -44,10 +44,10 @@ // Static RAM declarations -EWRAM_DATA u8 gUnknown_02022D04 = 0; -EWRAM_DATA u16 gUnknown_02022D06 = 0; +static EWRAM_DATA u8 gUnknown_02022D04 = 0; +static EWRAM_DATA u16 sCurrItemAndOptionMenuCheck = 0; -IWRAM_DATA u8 gUnknown_03000DD0; +static IWRAM_DATA u8 gUnknown_03000DD0; // Static ROM declarations @@ -56,7 +56,7 @@ void Task_MainMenuCheckSaveFile(u8); void Task_MainMenuCheckBattery(u8); void Task_WaitForSaveFileErrorWindow(u8); void CreateMainMenuErrorWindow(const u8*); -void sub_8032250(const struct WindowTemplate*); +static void ClearMainMenuWindowTilemap(const struct WindowTemplate*); void Task_DisplayMainMenu(u8); void Task_WaitForBatteryDryErrorWindow(u8); void fmt_savegame(void); @@ -133,12 +133,12 @@ const u8 gUnknown_082FEEF0[] = INCBIN_U8("graphics/birch_speech/map.bin.lz"); const u16 gUnknown_082FF018[] = INCBIN_U16("graphics/birch_speech/bg2.gbapal"); const u16 gUnknown_082FF028[] = {0, 0, 0, 0, 0, 0, 0, 0}; -const struct WindowTemplate gUnknown_082FF038[] = { +const struct WindowTemplate sWindowTemplates_NoSavedGame[] = { {0, 2, 1, 26, 2, 15, 1}, {0, 2, 5, 26, 2, 15, 0x35} }; -const struct WindowTemplate gUnknown_082FF048[] = { +const struct WindowTemplate sWindowTemplates_HasSavedGame[] = { {0, 2, 1, 26, 6, 15, 1}, {0, 2, 9, 26, 2, 15, 0x9D}, {0, 2, 13, 26, 2, 15, 0xD1}, @@ -146,7 +146,7 @@ const struct WindowTemplate gUnknown_082FF048[] = { {0, 2, 21, 26, 2, 15, 0x139} }; -const struct WindowTemplate gUnknown_082FF070[] = { +const struct WindowTemplate sWindowTemplate_ErrorWindow[] = { {0, 2, 15, 26, 4, 15, 0x16D}, {0xFF, 0, 0, 0, 0, 0, 0} }; @@ -161,7 +161,7 @@ const struct WindowTemplate gUnknown_082FF080[] = { const u16 gMainMenuBgPal[] = INCBIN_U16("graphics/misc/main_menu_bg.gbapal"); const u16 gMainMenuTextPal[] = INCBIN_U16("graphics/misc/main_menu_text.gbapal"); -const u8 gUnknown_082FF0E0[] = {10, 11, 12}; +const u8 gTextColor_Headers[] = {10, 11, 12}; const u8 gUnknown_082FF0E3[] = {10, 1, 12}; const struct BgTemplate gUnknown_082FF0E8[] = { @@ -195,7 +195,7 @@ const struct BgTemplate gUnknown_082FF0F0 = { .baseTile = 0 }; -const struct ArrowStruct gUnknown_082FF0F4 = {2, 0x78, 8, 3, 0x78, 0x98, 3, 4, 1, 1, 0}; +const struct ScrollArrowsTemplate sScrollArrowsTemplate_MainMenu = {2, 0x78, 8, 3, 0x78, 0x98, 3, 4, 1, 1, 0}; const union AffineAnimCmd gUnknown_082FF104[] = { AFFINEANIMCMD_FRAME(-2, -2, 0, 0x30), @@ -265,6 +265,16 @@ enum HAS_MYSTERY_EVENTS, }; +enum { + ACTION_NEW_GAME, + ACTION_CONTINUE, + ACTION_OPTIONS, + ACTION_MYSTERY_GIFT, + ACTION_MYSTERY_EVENTS, + ACTION_UNKNOWN, // TODO: change when rom_8011DC0 decompiled + ACTION_INVALID +}; + #define MAIN_MENU_BORDER_TILE 0x1D5 void CB2_MainMenu(void) @@ -319,16 +329,16 @@ u32 InitMainMenu(bool8 returningFromOptionsMenu) ResetSpriteData(); FreeAllSpritePalettes(); if (returningFromOptionsMenu) - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0x0000); // fade to black + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0x0000); // fade to black else - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0xFFFF); // fade to white + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0xFFFF); // fade to white ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, gUnknown_082FF0E8, 2); ChangeBgX(0, 0, 0); ChangeBgY(0, 0, 0); ChangeBgX(1, 0, 0); ChangeBgY(1, 0, 0); - InitWindows(gUnknown_082FF038); + InitWindows(sWindowTemplates_NoSavedGame); DeactivateAllTextPrinters(); LoadMainMenuWindowFrameTiles(0, MAIN_MENU_BORDER_TILE); @@ -351,6 +361,15 @@ u32 InitMainMenu(bool8 returningFromOptionsMenu) return 0; } +#define tMenuType data[0] +#define tCurrItem data[1] +#define tItemCount data[12] +#define tScrollArrowTaskId data[13] +#define tIsScrolled data[14] +#define tWirelessAdapterConnected data[15] + +#define tArrowTaskIsScrolled data[15] // For scroll indicator arrow task + void Task_MainMenuCheckSaveFile(u8 taskId) { s16* data = gTasks[taskId].data; @@ -359,64 +378,64 @@ void Task_MainMenuCheckSaveFile(u8 taskId) { SetGpuReg(REG_OFFSET_WIN0H, 0); SetGpuReg(REG_OFFSET_WIN0V, 0); - SetGpuReg(REG_OFFSET_WININ, 17); - SetGpuReg(REG_OFFSET_WINOUT, 0x31); + SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG0 | WININ_WIN0_OBJ); + SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG0 | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR); SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_DARKEN | BLDCNT_TGT1_BG0); SetGpuReg(REG_OFFSET_BLDALPHA, 0); SetGpuReg(REG_OFFSET_BLDY, 7); - if (sub_80093CC()) - data[15] = 1; + if (IsWirelessAdapterConnected()) + tWirelessAdapterConnected = TRUE; switch (gSaveFileStatus) { case 1: - data[0] = HAS_SAVED_GAME; + tMenuType = HAS_SAVED_GAME; if (IsMysteryGiftEnabled()) - data[0]++; + tMenuType++; gTasks[taskId].func = Task_MainMenuCheckBattery; break; case 2: CreateMainMenuErrorWindow(gText_SaveFileErased); - data[0] = 0; + tMenuType = HAS_NO_SAVED_GAME; gTasks[taskId].func = Task_WaitForSaveFileErrorWindow; break; case 0xFF: CreateMainMenuErrorWindow(gText_SaveFileCorrupted); gTasks[taskId].func = Task_WaitForSaveFileErrorWindow; - data[0] = HAS_SAVED_GAME; + tMenuType = HAS_SAVED_GAME; if (IsMysteryGiftEnabled() == TRUE) - data[0]++; + tMenuType++; break; case 0: default: - data[0] = HAS_NO_SAVED_GAME; + tMenuType = HAS_NO_SAVED_GAME; gTasks[taskId].func = Task_MainMenuCheckBattery; break; case 4: CreateMainMenuErrorWindow(gJPText_No1MSubCircuit); - gTasks[taskId].data[0] = HAS_NO_SAVED_GAME; + gTasks[taskId].tMenuType = HAS_NO_SAVED_GAME; gTasks[taskId].func = Task_WaitForSaveFileErrorWindow; break; } - if (gUnknown_02022D06 & 0x8000) + if (sCurrItemAndOptionMenuCheck & 0x8000) // are we returning from the options menu? { - switch (data[0]) + switch (tMenuType) // if so, highlight the OPTIONS item { case HAS_NO_SAVED_GAME: case HAS_SAVED_GAME: - gUnknown_02022D06 = data[0] + 1; + sCurrItemAndOptionMenuCheck = tMenuType + 1; break; case HAS_MYSTERY_GIFT: - gUnknown_02022D06 = 3; + sCurrItemAndOptionMenuCheck = 3; break; - case 3: - gUnknown_02022D06 = 4; + case HAS_MYSTERY_EVENTS: + sCurrItemAndOptionMenuCheck = 4; break; } } - gUnknown_02022D06 &= 0x7FFF; - data[1] = gUnknown_02022D06; - data[12] = data[0] + 2; + sCurrItemAndOptionMenuCheck &= 0x7FFF; // turn off the "returning from options menu" flag + tCurrItem = sCurrItemAndOptionMenuCheck; + tItemCount = tMenuType + 2; } } @@ -426,7 +445,7 @@ void Task_WaitForSaveFileErrorWindow(u8 taskId) if (!IsTextPrinterActive(7) && (gMain.newKeys & A_BUTTON)) { ClearWindowTilemap(7); - sub_8032250(gUnknown_082FF070); + ClearMainMenuWindowTilemap(sWindowTemplate_ErrorWindow); gTasks[taskId].func = Task_MainMenuCheckBattery; } } @@ -437,8 +456,8 @@ void Task_MainMenuCheckBattery(u8 taskId) { SetGpuReg(REG_OFFSET_WIN0H, 0); SetGpuReg(REG_OFFSET_WIN0V, 0); - SetGpuReg(REG_OFFSET_WININ, 17); - SetGpuReg(REG_OFFSET_WINOUT, 0x31); + SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG0 | WININ_WIN0_OBJ); + SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG0 | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR); SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_DARKEN | BLDCNT_TGT1_BG0); SetGpuReg(REG_OFFSET_BLDALPHA, 0); SetGpuReg(REG_OFFSET_BLDY, 7); @@ -461,7 +480,7 @@ void Task_WaitForBatteryDryErrorWindow(u8 taskId) if (!IsTextPrinterActive(7) && (gMain.newKeys & A_BUTTON)) { ClearWindowTilemap(7); - sub_8032250(gUnknown_082FF070); + ClearMainMenuWindowTilemap(sWindowTemplate_ErrorWindow); gTasks[taskId].func = Task_DisplayMainMenu; } } @@ -475,8 +494,8 @@ void Task_DisplayMainMenu(u8 taskId) { SetGpuReg(REG_OFFSET_WIN0H, 0); SetGpuReg(REG_OFFSET_WIN0V, 0); - SetGpuReg(REG_OFFSET_WININ, 17); - SetGpuReg(REG_OFFSET_WINOUT, 0x31); + SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG0 | WININ_WIN0_OBJ); + SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG0 | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR); SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_DARKEN | BLDCNT_TGT1_BG0); SetGpuReg(REG_OFFSET_BLDALPHA, 0); SetGpuReg(REG_OFFSET_BLDY, 7); @@ -504,28 +523,28 @@ void Task_DisplayMainMenu(u8 taskId) LoadPalette(&palette, 241, 2); } - switch (gTasks[taskId].data[0]) + switch (gTasks[taskId].tMenuType) { case HAS_NO_SAVED_GAME: default: FillWindowPixelBuffer(0, 0xAA); FillWindowPixelBuffer(1, 0xAA); - box_print(0, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuNewGame); - box_print(1, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuOption); + box_print(0, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuNewGame); + box_print(1, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuOption); PutWindowTilemap(0); PutWindowTilemap(1); CopyWindowToVram(0, 2); CopyWindowToVram(1, 2); - DrawMainMenuWindowBorder(gUnknown_082FF038, MAIN_MENU_BORDER_TILE); - DrawMainMenuWindowBorder(&gUnknown_082FF038[1], MAIN_MENU_BORDER_TILE); + DrawMainMenuWindowBorder(&sWindowTemplates_NoSavedGame[0], MAIN_MENU_BORDER_TILE); + DrawMainMenuWindowBorder(&sWindowTemplates_NoSavedGame[1], MAIN_MENU_BORDER_TILE); break; case HAS_SAVED_GAME: FillWindowPixelBuffer(2, 0xAA); FillWindowPixelBuffer(3, 0xAA); FillWindowPixelBuffer(4, 0xAA); - box_print(2, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuContinue); - box_print(3, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuNewGame); - box_print(4, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuOption); + box_print(2, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuContinue); + box_print(3, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuNewGame); + box_print(4, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuOption); fmt_savegame(); PutWindowTilemap(2); PutWindowTilemap(3); @@ -533,19 +552,19 @@ void Task_DisplayMainMenu(u8 taskId) CopyWindowToVram(2, 2); CopyWindowToVram(3, 2); CopyWindowToVram(4, 2); - DrawMainMenuWindowBorder(gUnknown_082FF048, MAIN_MENU_BORDER_TILE); - DrawMainMenuWindowBorder(&gUnknown_082FF048[1], MAIN_MENU_BORDER_TILE); - DrawMainMenuWindowBorder(&gUnknown_082FF048[2], MAIN_MENU_BORDER_TILE); + DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[0], MAIN_MENU_BORDER_TILE); + DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[1], MAIN_MENU_BORDER_TILE); + DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[2], MAIN_MENU_BORDER_TILE); break; case HAS_MYSTERY_GIFT: FillWindowPixelBuffer(2, 0xAA); FillWindowPixelBuffer(3, 0xAA); FillWindowPixelBuffer(4, 0xAA); FillWindowPixelBuffer(5, 0xAA); - box_print(2, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuContinue); - box_print(3, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuNewGame); - box_print(4, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuMysteryGift); - box_print(5, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuOption); + box_print(2, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuContinue); + box_print(3, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuNewGame); + box_print(4, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuMysteryGift); + box_print(5, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuOption); fmt_savegame(); PutWindowTilemap(2); PutWindowTilemap(3); @@ -555,10 +574,10 @@ void Task_DisplayMainMenu(u8 taskId) CopyWindowToVram(3, 2); CopyWindowToVram(4, 2); CopyWindowToVram(5, 2); - DrawMainMenuWindowBorder(gUnknown_082FF048, MAIN_MENU_BORDER_TILE); - DrawMainMenuWindowBorder(&gUnknown_082FF048[1], MAIN_MENU_BORDER_TILE); - DrawMainMenuWindowBorder(&gUnknown_082FF048[2], MAIN_MENU_BORDER_TILE); - DrawMainMenuWindowBorder(&gUnknown_082FF048[3], MAIN_MENU_BORDER_TILE); + DrawMainMenuWindowBorder(sWindowTemplates_HasSavedGame, MAIN_MENU_BORDER_TILE); + DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[1], MAIN_MENU_BORDER_TILE); + DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[2], MAIN_MENU_BORDER_TILE); + DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[3], MAIN_MENU_BORDER_TILE); break; case HAS_MYSTERY_EVENTS: FillWindowPixelBuffer(2, 0xAA); @@ -566,11 +585,11 @@ void Task_DisplayMainMenu(u8 taskId) FillWindowPixelBuffer(4, 0xAA); FillWindowPixelBuffer(5, 0xAA); FillWindowPixelBuffer(6, 0xAA); - box_print(2, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuContinue); - box_print(3, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuNewGame); - box_print(4, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuMysteryGift2); - box_print(5, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuMysteryEvents); - box_print(6, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuOption); + box_print(2, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuContinue); + box_print(3, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuNewGame); + box_print(4, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuMysteryGift2); + box_print(5, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuMysteryEvents); + box_print(6, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuOption); fmt_savegame(); PutWindowTilemap(2); PutWindowTilemap(3); @@ -582,19 +601,19 @@ void Task_DisplayMainMenu(u8 taskId) CopyWindowToVram(4, 2); CopyWindowToVram(5, 2); CopyWindowToVram(6, 2); - DrawMainMenuWindowBorder(gUnknown_082FF048, MAIN_MENU_BORDER_TILE); - DrawMainMenuWindowBorder(&gUnknown_082FF048[1], MAIN_MENU_BORDER_TILE); - DrawMainMenuWindowBorder(&gUnknown_082FF048[2], MAIN_MENU_BORDER_TILE); - DrawMainMenuWindowBorder(&gUnknown_082FF048[3], MAIN_MENU_BORDER_TILE); - DrawMainMenuWindowBorder(&gUnknown_082FF048[4], MAIN_MENU_BORDER_TILE); - data[13] = AddScrollIndicatorArrowPair(&gUnknown_082FF0F4, &gUnknown_02022D06); - gTasks[data[13]].func = Task_ScrollIndicatorArrowPairOnMainMenu; - if (gUnknown_02022D06 == 4) + DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[0], MAIN_MENU_BORDER_TILE); + DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[1], MAIN_MENU_BORDER_TILE); + DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[2], MAIN_MENU_BORDER_TILE); + DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[3], MAIN_MENU_BORDER_TILE); + DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[4], MAIN_MENU_BORDER_TILE); + tScrollArrowTaskId = AddScrollIndicatorArrowPair(&sScrollArrowsTemplate_MainMenu, &sCurrItemAndOptionMenuCheck); + gTasks[tScrollArrowTaskId].func = Task_ScrollIndicatorArrowPairOnMainMenu; + if (sCurrItemAndOptionMenuCheck == 4) { ChangeBgY(0, 0x2000, 1); ChangeBgY(1, 0x2000, 1); - data[14] = 1; - gTasks[data[13]].data[15] = 1; + tIsScrolled = TRUE; + gTasks[tScrollArrowTaskId].tArrowTaskIsScrolled = TRUE; } break; } @@ -604,7 +623,7 @@ void Task_DisplayMainMenu(u8 taskId) void Task_HighlightSelectedMainMenuItem(u8 taskId) { - HighlightSelectedMainMenuItem(gTasks[taskId].data[0], gTasks[taskId].data[1], gTasks[taskId].data[14]); + HighlightSelectedMainMenuItem(gTasks[taskId].tMenuType, gTasks[taskId].tCurrItem, gTasks[taskId].tIsScrolled); gTasks[taskId].func = Task_HandleMainMenuInput; } @@ -615,40 +634,40 @@ bool8 HandleMainMenuInput(u8 taskId) if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - sub_80093CC(); - BeginNormalPaletteFade(-1, 0, 0, 0x10, RGB_BLACK); + IsWirelessAdapterConnected(); // why bother calling this here? debug? Task_HandleMainMenuAPressed will check too + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].func = Task_HandleMainMenuAPressed; } else if (gMain.newKeys & B_BUTTON) { PlaySE(SE_SELECT); - BeginNormalPaletteFade(-1, 0, 0, 0x10, RGB_WHITEALPHA); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_WHITEALPHA); SetGpuReg(REG_OFFSET_WIN0H, 0xF0); SetGpuReg(REG_OFFSET_WIN0V, 0xA0); gTasks[taskId].func = Task_HandleMainMenuBPressed; } - else if ((gMain.newKeys & DPAD_UP) && data[1] > 0) + else if ((gMain.newKeys & DPAD_UP) && tCurrItem > 0) { - if (data[0] == 3 && data[14] == 1 && data[1] == 1) + if (tMenuType == HAS_MYSTERY_EVENTS && tIsScrolled == TRUE && tCurrItem == 1) { ChangeBgY(0, 0x2000, 2); ChangeBgY(1, 0x2000, 2); - gTasks[data[13]].data[15] = data[14] = 0; + gTasks[tScrollArrowTaskId].tArrowTaskIsScrolled = tIsScrolled = FALSE; } - data[1]--; - gUnknown_02022D06 = data[1]; + tCurrItem--; + sCurrItemAndOptionMenuCheck = tCurrItem; return TRUE; } - else if ((gMain.newKeys & DPAD_DOWN) && data[1] < data[12] - 1) + else if ((gMain.newKeys & DPAD_DOWN) && tCurrItem < tItemCount - 1) { - if (data[0] == 3 && data[1] == 3 && data[14] == 0) + if (tMenuType == HAS_MYSTERY_EVENTS && tCurrItem == 3 && tIsScrolled == FALSE) { ChangeBgY(0, 0x2000, 1); ChangeBgY(1, 0x2000, 1); - gTasks[data[13]].data[15] = data[14] = 1; + gTasks[tScrollArrowTaskId].tArrowTaskIsScrolled = tIsScrolled = TRUE; } - data[1]++; - gUnknown_02022D06 = data[1]; + tCurrItem++; + sCurrItemAndOptionMenuCheck = tCurrItem; return TRUE; } return FALSE; @@ -662,13 +681,13 @@ void Task_HandleMainMenuInput(u8 taskId) void Task_HandleMainMenuAPressed(u8 taskId) { - bool8 r2; + bool8 wirelessAdapterConnected; u8 action; if (!gPaletteFade.active) { - if (gTasks[taskId].data[0] == 3) - RemoveScrollIndicatorArrowPair(gTasks[taskId].data[13]); + if (gTasks[taskId].tMenuType == HAS_MYSTERY_EVENTS) + RemoveScrollIndicatorArrowPair(gTasks[taskId].tScrollArrowTaskId); sub_819746C(0, 1); sub_819746C(1, 1); sub_819746C(2, 1); @@ -677,103 +696,103 @@ void Task_HandleMainMenuAPressed(u8 taskId) sub_819746C(5, 1); sub_819746C(6, 1); sub_819746C(7, 1); - r2 = sub_80093CC(); - switch (gTasks[taskId].data[0]) + wirelessAdapterConnected = IsWirelessAdapterConnected(); + switch (gTasks[taskId].tMenuType) { case HAS_NO_SAVED_GAME: default: - switch (gTasks[taskId].data[1]) + switch (gTasks[taskId].tCurrItem) { case 0: default: - action = 0; + action = ACTION_NEW_GAME; break; case 1: - action = 2; + action = ACTION_OPTIONS; break; } break; case HAS_SAVED_GAME: - switch (gTasks[taskId].data[1]) + switch (gTasks[taskId].tCurrItem) { case 0: default: - action = 1; + action = ACTION_CONTINUE; break; case 1: - action = 0; + action = ACTION_NEW_GAME; break; case 2: - action = 2; + action = ACTION_OPTIONS; break; } break; case HAS_MYSTERY_GIFT: - switch (gTasks[taskId].data[1]) + switch (gTasks[taskId].tCurrItem) { case 0: default: - action = 1; + action = ACTION_CONTINUE; break; case 1: - action = 0; + action = ACTION_NEW_GAME; break; case 2: - action = 3; - if (r2 == FALSE) + action = ACTION_MYSTERY_GIFT; + if (!wirelessAdapterConnected) { - action = 6; - gTasks[taskId].data[0] = 0; + action = ACTION_INVALID; + gTasks[taskId].tMenuType = 0; } break; case 3: - action = 2; + action = ACTION_OPTIONS; break; } break; case HAS_MYSTERY_EVENTS: - switch (gTasks[taskId].data[1]) + switch (gTasks[taskId].tCurrItem) { case 0: default: - action = 1; + action = ACTION_CONTINUE; break; case 1: - action = 0; + action = ACTION_NEW_GAME; break; case 2: - if (gTasks[taskId].data[15]) + if (gTasks[taskId].tWirelessAdapterConnected) { - action = 3; - if (r2 == FALSE) + action = ACTION_MYSTERY_GIFT; + if (!wirelessAdapterConnected) { - action = 6; - gTasks[taskId].data[0] = 0; + action = ACTION_INVALID; + gTasks[taskId].tMenuType = 0; } } - else if (r2) + else if (wirelessAdapterConnected) { - action = 6; - gTasks[taskId].data[0] = 1; + action = ACTION_INVALID; + gTasks[taskId].tMenuType = 1; } else { - action = 5; + action = ACTION_UNKNOWN; } break; case 3: - if (r2) + if (wirelessAdapterConnected) { - action = 6; - gTasks[taskId].data[0] = 2; + action = ACTION_INVALID; + gTasks[taskId].tMenuType = 2; } else { - action = 4; + action = ACTION_MYSTERY_EVENTS; } break; case 4: - action = 2; + action = ACTION_OPTIONS; break; } break; @@ -782,37 +801,37 @@ void Task_HandleMainMenuAPressed(u8 taskId) ChangeBgY(1, 0, 0); switch (action) { - case 0: + case ACTION_NEW_GAME: default: gPlttBufferUnfaded[0] = RGB_BLACK; gPlttBufferFaded[0] = RGB_BLACK; gTasks[taskId].func = task_new_game_prof_birch_speech_1; break; - case 1: + case ACTION_CONTINUE: gPlttBufferUnfaded[0] = RGB_BLACK; gPlttBufferFaded[0] = RGB_BLACK; SetMainCallback2(CB2_ContinueSavedGame); DestroyTask(taskId); break; - case 2: + case ACTION_OPTIONS: gMain.savedCallback = CB2_ReinitMainMenu; SetMainCallback2(CB2_InitOptionMenu); DestroyTask(taskId); break; - case 3: + case ACTION_MYSTERY_GIFT: SetMainCallback2(c2_mystery_gift); DestroyTask(taskId); break; - case 4: + case ACTION_MYSTERY_EVENTS: SetMainCallback2(CB2_InitMysteryEventMenu); DestroyTask(taskId); break; - case 5: + case ACTION_UNKNOWN: SetMainCallback2(sub_801867C); DestroyTask(taskId); break; - case 6: - gTasks[taskId].data[1] = 0; + case ACTION_INVALID: + gTasks[taskId].tCurrItem = 0; gTasks[taskId].func = Task_DisplayMainMenuInvalidActionError; gPlttBufferUnfaded[0xF1] = RGB_WHITE; gPlttBufferFaded[0xF1] = RGB_WHITE; @@ -822,14 +841,14 @@ void Task_HandleMainMenuAPressed(u8 taskId) SetGpuReg(REG_OFFSET_BG1VOFS, 0); SetGpuReg(REG_OFFSET_BG0HOFS, 0); SetGpuReg(REG_OFFSET_BG0VOFS, 0); - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); return; } FreeAllWindowBuffers(); - if (action != 2) - gUnknown_02022D06 = 0; + if (action != ACTION_OPTIONS) + sCurrItemAndOptionMenuCheck = 0; else - gUnknown_02022D06 |= 0x8000; + sCurrItemAndOptionMenuCheck |= 0x8000; // entering the options menu } } @@ -837,9 +856,9 @@ void Task_HandleMainMenuBPressed(u8 taskId) { if (!gPaletteFade.active) { - if (gTasks[taskId].data[0] == 3) - RemoveScrollIndicatorArrowPair(gTasks[taskId].data[13]); - gUnknown_02022D06 = 0; + if (gTasks[taskId].tMenuType == 3) + RemoveScrollIndicatorArrowPair(gTasks[taskId].tScrollArrowTaskId); + sCurrItemAndOptionMenuCheck = 0; FreeAllWindowBuffers(); SetMainCallback2(CB2_InitTitleScreen); DestroyTask(taskId); @@ -848,11 +867,11 @@ void Task_HandleMainMenuBPressed(u8 taskId) void Task_DisplayMainMenuInvalidActionError(u8 taskId) { - switch (gTasks[taskId].data[1]) + switch (gTasks[taskId].tCurrItem) { case 0: FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 30, 20); - switch (gTasks[taskId].data[0]) + switch (gTasks[taskId].tMenuType) { case 0: CreateMainMenuErrorWindow(gText_WirelessNotConnected); @@ -864,30 +883,39 @@ void Task_DisplayMainMenuInvalidActionError(u8 taskId) CreateMainMenuErrorWindow(gText_MysteryEventsCantUse); break; } - gTasks[taskId].data[1]++; + gTasks[taskId].tCurrItem++; break; case 1: if (!gPaletteFade.active) - gTasks[taskId].data[1]++; + gTasks[taskId].tCurrItem++; break; case 2: RunTextPrinters(); if (!IsTextPrinterActive(7)) - gTasks[taskId].data[1]++; + gTasks[taskId].tCurrItem++; break; case 3: if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { PlaySE(SE_SELECT); - BeginNormalPaletteFade(-1, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); gTasks[taskId].func = Task_HandleMainMenuBPressed; } } } -void HighlightSelectedMainMenuItem(u8 menuType, u8 selectedMenuItem, s16 a) +#undef tMenuType +#undef tCurrItem +#undef tItemCount +#undef tScrollArrowTaskId +#undef tIsScrolled +#undef tWirelessAdapterConnected + +#undef tArrowTaskIsScrolled + +void HighlightSelectedMainMenuItem(u8 menuType, u8 selectedMenuItem, s16 isScrolled) { - SetGpuReg(REG_OFFSET_WIN0H, 0x9E7); + SetGpuReg(REG_OFFSET_WIN0H, WINHV_COORDS(9, 231)); switch (menuType) { @@ -897,10 +925,10 @@ void HighlightSelectedMainMenuItem(u8 menuType, u8 selectedMenuItem, s16 a) { case 0: default: - SetGpuReg(REG_OFFSET_WIN0V, 0x11F); + SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(1, 31)); break; case 1: - SetGpuReg(REG_OFFSET_WIN0V, 0x213F); + SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(33, 63)); break; } break; @@ -909,13 +937,13 @@ void HighlightSelectedMainMenuItem(u8 menuType, u8 selectedMenuItem, s16 a) { case 0: default: - SetGpuReg(REG_OFFSET_WIN0V, 0x13F); + SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(1, 63)); break; case 1: - SetGpuReg(REG_OFFSET_WIN0V, 0x415F); + SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(65, 95)); break; case 2: - SetGpuReg(REG_OFFSET_WIN0V, 0x617F); + SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(97, 127)); break; } break; @@ -924,16 +952,16 @@ void HighlightSelectedMainMenuItem(u8 menuType, u8 selectedMenuItem, s16 a) { case 0: default: - SetGpuReg(REG_OFFSET_WIN0V, 0x13F); + SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(1, 63)); break; case 1: - SetGpuReg(REG_OFFSET_WIN0V, 0x415F); + SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(65, 95)); break; case 2: - SetGpuReg(REG_OFFSET_WIN0V, 0x617F); + SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(97, 127)); break; case 3: - SetGpuReg(REG_OFFSET_WIN0V, 0x819F); + SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(129, 159)); break; } break; @@ -942,28 +970,28 @@ void HighlightSelectedMainMenuItem(u8 menuType, u8 selectedMenuItem, s16 a) { case 0: default: - SetGpuReg(REG_OFFSET_WIN0V, 0x13F); + SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(1, 63)); break; case 1: - if (a) - SetGpuReg(REG_OFFSET_WIN0V, 0x213F); + if (isScrolled) + SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(33, 63)); else - SetGpuReg(REG_OFFSET_WIN0V, 0x415F); + SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(65, 95)); break; case 2: - if (a) - SetGpuReg(REG_OFFSET_WIN0V, 0x415F); + if (isScrolled) + SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(65, 95)); else - SetGpuReg(REG_OFFSET_WIN0V, 0x617F); + SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(97, 127)); break; case 3: - if (a) - SetGpuReg(REG_OFFSET_WIN0V, 0x617F); + if (isScrolled) + SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(97, 127)); else - SetGpuReg(REG_OFFSET_WIN0V, 0x819F); + SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(129, 159)); break; case 4: - SetGpuReg(REG_OFFSET_WIN0V, 0x819F); + SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(129, 159)); break; } break; @@ -992,7 +1020,7 @@ void task_new_game_prof_birch_speech_1(u8 taskId) FreeAllSpritePalettes(); dp13_810BB8C(); AddBirchSpeechObjects(taskId); - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); gTasks[taskId].data[4] = 0; gTasks[taskId].func = task_new_game_prof_birch_speech_2; gTasks[taskId].data[2] = 0xFF; @@ -1298,7 +1326,7 @@ void task_new_game_prof_birch_speech_16(u8 taskId) { if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON)) { - BeginNormalPaletteFade(-1, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); gTasks[taskId].func = task_new_game_prof_birch_speech_17; } } @@ -1547,7 +1575,7 @@ void new_game_prof_birch_speech_part2_start(void) gSprites[spriteId].invisible = 0; gTasks[taskId].data[2] = spriteId; SetGpuReg(REG_OFFSET_BG1HOFS, -60); - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); SetGpuReg(REG_OFFSET_WIN0H, 0); SetGpuReg(REG_OFFSET_WIN0V, 0); SetGpuReg(REG_OFFSET_WININ, 0); @@ -1797,7 +1825,7 @@ void CreateMainMenuErrorWindow(const u8* str) PrintTextOnWindow(7, 1, str, 0, 1, 2, 0); PutWindowTilemap(7); CopyWindowToVram(7, 2); - DrawMainMenuWindowBorder(gUnknown_082FF070, MAIN_MENU_BORDER_TILE); + DrawMainMenuWindowBorder(sWindowTemplate_ErrorWindow, MAIN_MENU_BORDER_TILE); SetGpuReg(REG_OFFSET_WIN0H, 0x9E7); SetGpuReg(REG_OFFSET_WIN0V, 0x719F); } @@ -1892,7 +1920,7 @@ void DrawMainMenuWindowBorder(const struct WindowTemplate *template, u16 baseTil CopyBgTilemapBufferToVram(template->priority); } -void sub_8032250(const struct WindowTemplate *template) +static void ClearMainMenuWindowTilemap(const struct WindowTemplate *template) { FillBgTilemapBufferRect(template->priority, 0, template->tilemapLeft - 1, template->tilemapTop - 1, template->tilemapLeft + template->width + 1, template->tilemapTop + template->height + 1, 2); CopyBgTilemapBufferToVram(template->priority); @@ -1914,11 +1942,11 @@ void sub_80322E0(u8 windowId, u8 a) void sub_8032318(u8 a) { - u8 fontAttribute = GetFontAttribute(1, 6); - u8 fontAttribute2 = GetFontAttribute(1, 0); - u8 fontAttribute3 = GetFontAttribute(1, 1); - u8 windowAttribute = GetWindowAttribute(a, 3); - u8 windowAttribute2 = GetWindowAttribute(a, 4); + u8 fontAttribute = GetFontAttribute(1, FONTATTR_COLOR_BACKGROUND); + u8 fontAttribute2 = GetFontAttribute(1, FONTATTR_MAX_LETTER_WIDTH); + u8 fontAttribute3 = GetFontAttribute(1, FONTATTR_MAX_LETTER_HEIGHT); + u8 windowAttribute = GetWindowAttribute(a, WINDOW_WIDTH); + u8 windowAttribute2 = GetWindowAttribute(a, WINDOW_HEIGHT); FillWindowPixelRect(a, fontAttribute, 0, 0, fontAttribute2 * windowAttribute, fontAttribute3 * windowAttribute2); CopyWindowToVram(a, 2); diff --git a/src/map_name_popup.c b/src/map_name_popup.c index 758ce3b3dd..578636d403 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -463,7 +463,7 @@ static void LoadMapNamePopUpWindowBg(void) } popUpThemeId = gRegionMapSectionId_To_PopUpThemeIdMapping[regionMapSectionId]; - LoadBgTiles(GetWindowAttribute(popupWindowId, 0), &(gMapPopUp_Outline_Table[popUpThemeId][0]), 0x400, 0x21D); + LoadBgTiles(GetWindowAttribute(popupWindowId, WINDOW_PRIORITY), &(gMapPopUp_Outline_Table[popUpThemeId][0]), 0x400, 0x21D); CallWindowFunction(popupWindowId, sub_80D4A78); PutWindowTilemap(popupWindowId); if(gMapHeader.weather == WEATHER_BUBBLES) diff --git a/src/menu.c b/src/menu.c index dedfcc3be0..2f21dbe520 100644 --- a/src/menu.c +++ b/src/menu.c @@ -194,7 +194,7 @@ void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonP void sub_81973A4(void) { copy_textbox_border_tile_patterns_to_vram(0, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM * 0x10); - sub_809882C(0, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM * 0x10); + LoadUserWindowBorderGfx(0, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM * 0x10); } void NewMenuHelpers_DrawDialogueFrame(u8 windowId, bool8 copyToVram) @@ -1107,12 +1107,12 @@ void AddItemMenuActionTextPrinters(u8 windowId, u8 fontId, u8 left, u8 top, u8 l printer.windowId = windowId; printer.fontId = fontId; - printer.fgColor = GetFontAttribute(fontId, 5); - printer.bgColor = GetFontAttribute(fontId, 6); - printer.shadowColor = GetFontAttribute(fontId, 7); - printer.fontColor_l = GetFontAttribute(fontId, 4); + printer.fgColor = GetFontAttribute(fontId, FONTATTR_COLOR_FOREGROUND); + printer.bgColor = GetFontAttribute(fontId, FONTATTR_COLOR_BACKGROUND); + printer.shadowColor = GetFontAttribute(fontId, FONTATTR_COLOR_SHADOW); + printer.fontColor_l = GetFontAttribute(fontId, FONTATTR_COLOR_LOWNIBBLE); printer.letterSpacing = letterSpacing; - printer.lineSpacing = GetFontAttribute(fontId, 3); + printer.lineSpacing = GetFontAttribute(fontId, FONTATTR_LINE_SPACING); printer.x = left; printer.currentX = left; @@ -1129,7 +1129,7 @@ void AddItemMenuActionTextPrinters(u8 windowId, u8 fontId, u8 left, u8 top, u8 l void sub_81989B8(u8 windowId, u8 fontId, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, const u8 *a5) { - AddItemMenuActionTextPrinters(windowId, fontId, GetFontAttribute(fontId, 0), 1, GetFontAttribute(fontId, 2), lineHeight, itemCount, strs, a5); + AddItemMenuActionTextPrinters(windowId, fontId, GetFontAttribute(fontId, FONTATTR_MAX_LETTER_WIDTH), 1, GetFontAttribute(fontId, FONTATTR_LETTER_SPACING), lineHeight, itemCount, strs, a5); } void SetWindowTemplateFields(struct WindowTemplate *template, u8 bg, u8 left, u8 top, u8 width, u8 height, u8 paletteNum, u16 baseBlock) @@ -1167,20 +1167,20 @@ void sub_8198AF8(const struct WindowTemplate *window, u8 fontId, u8 left, u8 top printer.current_text_offset = gText_YesNo; printer.windowId = gUnknown_0203CD9F; printer.fontId = fontId; - printer.x = GetFontAttribute(fontId, 0) + left; + printer.x = GetFontAttribute(fontId, FONTATTR_MAX_LETTER_WIDTH) + left; printer.y = top; printer.currentX = printer.x; printer.currentY = printer.y; - printer.fgColor = GetFontAttribute(fontId, 5); - printer.bgColor = GetFontAttribute(fontId, 6); - printer.shadowColor = GetFontAttribute(fontId, 7); - printer.fontColor_l = GetFontAttribute(fontId, 4); - printer.letterSpacing = GetFontAttribute(fontId, 2); - printer.lineSpacing = GetFontAttribute(fontId, 3); + printer.fgColor = GetFontAttribute(fontId, FONTATTR_COLOR_FOREGROUND); + printer.bgColor = GetFontAttribute(fontId, FONTATTR_COLOR_BACKGROUND); + printer.shadowColor = GetFontAttribute(fontId, FONTATTR_COLOR_SHADOW); + printer.fontColor_l = GetFontAttribute(fontId, FONTATTR_COLOR_LOWNIBBLE); + printer.letterSpacing = GetFontAttribute(fontId, FONTATTR_LETTER_SPACING); + printer.lineSpacing = GetFontAttribute(fontId, FONTATTR_LINE_SPACING); AddTextPrinter(&printer, 0xFF, NULL); - sub_81983AC(gUnknown_0203CD9F, fontId, left, top, GetFontAttribute(fontId, 1), 2, initialCursorPos); + sub_81983AC(gUnknown_0203CD9F, fontId, left, top, GetFontAttribute(fontId, FONTATTR_MAX_LETTER_HEIGHT), 2, initialCursorPos); } void sub_8198C34(const struct WindowTemplate *window, u8 fontId, u16 baseTileNum, u8 paletteNum) diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c index 8a7671c5b7..68f31584b8 100644 --- a/src/mystery_event_menu.c +++ b/src/mystery_event_menu.c @@ -77,7 +77,7 @@ void CB2_InitMysteryEventMenu(void) FillWindowPixelBuffer(i, 0); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x1E, 0x14); - sub_809882C(0, 1u, 0xD0u); + LoadUserWindowBorderGfx(0, 1u, 0xD0u); sub_81978B0(0xE0); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON); SetGpuReg(REG_OFFSET_BLDCNT, 0); @@ -121,7 +121,7 @@ static void CB2_MysteryEventMenu(void) PutWindowTilemap(0); CopyWindowToVram(0, 3); ShowBg(0); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); gMain.state++; break; case 1: @@ -264,7 +264,7 @@ static void CB2_MysteryEventMenu(void) } break; case 15: - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); gMain.state++; break; case 16: diff --git a/src/option_menu.c b/src/option_menu.c index de9a216a63..fc0c0c24e8 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -235,7 +235,7 @@ void CB2_InitOptionMenu(void) break; } case 11: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); SetVBlankCallback(VBlankCB); SetMainCallback2(MainCB2); return; @@ -344,7 +344,7 @@ static void Task_OptionMenuSave(u8 taskId) gSaveBlock2Ptr->optionsButtonMode = gTasks[taskId].data[TD_BUTTONMODE]; gSaveBlock2Ptr->optionsWindowFrameType = gTasks[taskId].data[TD_FRAMETYPE]; - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); gTasks[taskId].func = Task_OptionMenuFadeOut; } diff --git a/src/player_pc.c b/src/player_pc.c index 48be0633f4..ba18b45ab7 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -903,7 +903,7 @@ static void sub_816BEF0(s32 id) static void ItemStorage_StartScrollIndicator(void) { if(playerPCItemPageInfo.scrollIndicatorId == 0xFF) - playerPCItemPageInfo.scrollIndicatorId = AddScrollIndicatorArrowPairParametrized(0x2, 0xB0, 0xC, 0x94, playerPCItemPageInfo.count - playerPCItemPageInfo.pageItems, 0x13F8, 0x13F8, &(playerPCItemPageInfo.itemsAbove)); + playerPCItemPageInfo.scrollIndicatorId = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xB0, 0xC, 0x94, playerPCItemPageInfo.count - playerPCItemPageInfo.pageItems, 0x13F8, 0x13F8, &(playerPCItemPageInfo.itemsAbove)); } static void ItemStorage_RemoveScrollIndicator(void) @@ -1116,7 +1116,7 @@ static void ItemStorage_ItemSwapChoosePrompt(u8 taskId) s16 *data; data = gTasks[taskId].data; - sub_81AF15C(data[5], 16, 1); + ListMenuSetUnkIndicatorsStructField(data[5], 16, 1); gUnknown_0203BCC4->unk666 = (playerPCItemPageInfo.itemsAbove + playerPCItemPageInfo.cursorPos); sub_816BFB8(data[5], 0, 0); sub_816C690(gUnknown_0203BCC4->unk666); diff --git a/src/pokeblock.c b/src/pokeblock.c index 216c9e2c50..36f2c82939 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -75,7 +75,7 @@ extern const u16 gUnknown_0860F074[]; extern void CB2_ReturnToField(void); extern bool8 sub_81221EC(void); -extern void sub_809882C(u8, u16, u8); +extern void LoadUserWindowBorderGfx(u8, u16, u8); extern void copy_textbox_border_tile_patterns_to_vram(u8, u16, u8); extern void sub_80AF168(void); @@ -315,19 +315,19 @@ static const struct ListMenuTemplate sPokeblockListMenuTemplate = { .items = NULL, .moveCursorFunc = MovePokeblockMenuCursor, - .unk_08 = NULL, + .itemPrintFunc = NULL, .totalItems = 0, .maxShowed = 0, .windowId = 1, - .unk_11 = 0, - .unk_12 = 1, + .header_X = 0, + .item_X = 1, .cursor_X = 0, .upText_Y = 1, .cursorPal = 2, .fillValue = 0, .cursorShadowPal = 3, .lettersSpacing = 0, - .unk_16_3 = 0, + .itemVerticalPadding = 0, .scrollMultiple = LIST_MULTIPLE_SCROLL_DPAD, .fontId = 1, .cursorKind = 1 @@ -492,7 +492,7 @@ static bool8 InitPokeblockMenu(void) gMain.state++; break; case 18: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); gPaletteFade.bufferTransferDisabled = 0; gMain.state++; break; @@ -566,7 +566,7 @@ static void HandleInitWindows(void) InitWindows(sWindowTemplatesForPokeblockMenu); DeactivateAllTextPrinters(); - sub_809882C(0, 1, 0xE0); + LoadUserWindowBorderGfx(0, 1, 0xE0); copy_textbox_border_tile_patterns_to_vram(0, 0xA, 0xD0); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); @@ -807,7 +807,7 @@ static void sub_81363BC(void) { if (sPokeblockMenu->unkTaskId == 0xFF) { - sPokeblockMenu->unkTaskId = AddScrollIndicatorArrowPairParametrized(2, 0xB0, 8, 0x98, sPokeblockMenu->itemsNo - sPokeblockMenu->maxShowed, + sPokeblockMenu->unkTaskId = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xB0, 8, 0x98, sPokeblockMenu->itemsNo - sPokeblockMenu->maxShowed, 0x456, 0x456, &sSavedPokeblockData.lastItemPage); } } @@ -855,7 +855,7 @@ static void sub_8136470(struct Sprite *sprite) static void FadePaletteAndSetTaskToClosePokeblockCase(u8 taskId) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); gTasks[taskId].func = Task_FreeDataAndExitPokeblockCase; } diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index db92d56a85..463e821e5e 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -59,7 +59,7 @@ extern const u16 gUnknown_0860F074[]; extern bool8 sub_81221EC(void); extern void sub_806A068(u16, u8); -extern void sub_809882C(u8, u16, u8); +extern void LoadUserWindowBorderGfx(u8, u16, u8); // this file's functions static void HandleInitBackgrounds(void); @@ -597,7 +597,7 @@ static bool8 TransitionToPokeblockFeedScene(void) gMain.state++; break; case 13: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); gPaletteFade.bufferTransferDisabled = 0; gMain.state++; break; @@ -706,7 +706,7 @@ static void HandleInitWindows(void) { InitWindows(sWindowTemplates); DeactivateAllTextPrinters(); - sub_809882C(0, 1, 0xE0); + LoadUserWindowBorderGfx(0, 1, 0xE0); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); FillWindowPixelBuffer(0, 0); PutWindowTilemap(0); @@ -811,7 +811,7 @@ static void Task_ReturnAfterPaletteFade(u8 taskId) static void Task_PaletteFadeToReturn(u8 taskId) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); gTasks[taskId].func = Task_ReturnAfterPaletteFade; } diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 74dc119738..0cbbba4ddf 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -541,7 +541,7 @@ bool8 sub_81BFB10(void) gMain.state++; break; case 24: - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); gPaletteFade.bufferTransferDisabled = 0; gMain.state++; break; @@ -761,7 +761,7 @@ void sub_81C0434() void sub_81C044C(u8 taskId) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); gTasks[taskId].func = sub_81C0484; } diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c index 25b9ccd533..4783f73c07 100644 --- a/src/rayquaza_scene.c +++ b/src/rayquaza_scene.c @@ -1563,7 +1563,7 @@ static void Task_DuoFightAnim(u8 taskId) } BlendPalettes(-1, 0x10, 0); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); SetVBlankCallback(VBlankCB_DuoFight); PlaySE(SE_T_OOAME); } @@ -1715,7 +1715,7 @@ static void sub_81D752C(u8 taskId) static void DuoFightEnd(u8 taskId, s8 palDelay) { PlaySE(SE_T_OOAME_E); - BeginNormalPaletteFade(-1, palDelay, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, palDelay, 0, 0x10, 0); gTasks[taskId].func = Task_DuoFightEnd; } @@ -1971,7 +1971,7 @@ static void Task_HandleRayTakesFlight(u8 taskId) case 0: if (data[1] == 8) { - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); data[2] = 0; data[3] = 30; data[4] = 0; @@ -2012,7 +2012,7 @@ static void Task_HandleRayTakesFlight(u8 taskId) if (data[1] > 295) { data[0]++; - BeginNormalPaletteFade(-1, 6, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 6, 0, 0x10, 0); } } break; @@ -2174,7 +2174,7 @@ static void Task_HandleRayDescends(u8 taskId) case 0: if (data[1] == 8) { - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); data[1] = 0; data[0]++; } @@ -2219,7 +2219,7 @@ static void Task_HandleRayDescends(u8 taskId) } break; case 4: - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); gTasks[taskId].func = Task_RayDescendsEnd; break; } @@ -2366,7 +2366,7 @@ static void Task_HandleRayCharges(u8 taskId) case 0: if (data[1] == 8) { - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); data[1] = 0; data[0]++; } @@ -2399,7 +2399,7 @@ static void Task_HandleRayCharges(u8 taskId) } break; case 3: - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); gTasks[taskId].func = Task_RayChargesEnd; break; } @@ -2532,7 +2532,7 @@ static void Task_HandleRayChasesAway(u8 taskId) if (data[1] == 8) { sub_81D90A8(taskId); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); data[1] = 0; data[0]++; } @@ -2574,7 +2574,7 @@ static void Task_HandleRayChasesAway(u8 taskId) } break; case 3: - BeginNormalPaletteFade(-1, 4, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 0x10, 0); gTasks[taskId].func = Task_RayChasesAwayEnd; break; } diff --git a/src/recorded_battle.c b/src/recorded_battle.c index a9360d49a1..eb8d0e0600 100644 --- a/src/recorded_battle.c +++ b/src/recorded_battle.c @@ -219,7 +219,7 @@ u8 RecordedBattle_GetBattlerAction(u8 battlerId) { gSpecialVar_Result = gBattleOutcome = B_OUTCOME_PLAYER_TELEPORTED; // hah ResetPaletteFadeControl(); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); SetMainCallback2(CB2_QuitRecordedBattle); return -1; } diff --git a/src/region_map.c b/src/region_map.c index 0dcccfdab6..5176d49968 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -1603,7 +1603,7 @@ void MCB2_FlyMap(void) gMain.state++; break; case 3: - sub_809882C(0, 0x65, 0xd0); + LoadUserWindowBorderGfx(0, 0x65, 0xd0); clear_scheduled_bg_copies_to_vram(); gMain.state++; break; @@ -1849,7 +1849,7 @@ static void sub_8124D14(void) switch (gUnknown_0203A148->unk_004) { case 0: - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); gUnknown_0203A148->unk_004++; break; case 1: @@ -1896,7 +1896,7 @@ static void sub_8124E0C(void) switch (gUnknown_0203A148->unk_004) { case 0: - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); gUnknown_0203A148->unk_004++; break; case 1: diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c index 9bd462b60a..416a8da9d7 100644 --- a/src/reset_rtc_screen.c +++ b/src/reset_rtc_screen.c @@ -552,7 +552,7 @@ static void Task_ResetRtcScreen(u8 taskId) switch (data[0]) { case 0: - BeginNormalPaletteFade(-1, 1, 0x10, 0, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 1, 0x10, 0, 0xFFFF); data[0] = 1; break; case 1: @@ -621,7 +621,7 @@ static void Task_ResetRtcScreen(u8 taskId) case 5: if (gMain.newKeys & A_BUTTON) { - BeginNormalPaletteFade(-1, 1, 0, 0x10, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 1, 0, 0x10, 0xFFFF); data[0] = 6; } else diff --git a/src/scrcmd.c b/src/scrcmd.c index 4e3fceb10b..57ae9cffa7 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1517,7 +1517,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) winTemplate = sub_8198A50(0, xWindow, yWindow + 1, width, height, 0xF, 0x1); gUnknown_03000F30 = AddWindow(&winTemplate); - sub_809882C(gUnknown_03000F30, 0x214, 0xE0); + LoadUserWindowBorderGfx(gUnknown_03000F30, 0x214, 0xE0); NewMenuHelpers_DrawStdWindowFrame(gUnknown_03000F30, 0); PutWindowTilemap(gUnknown_03000F30); FillWindowPixelBuffer(gUnknown_03000F30, 0x11); diff --git a/src/secret_base.c b/src/secret_base.c index 93b82b3cbd..ea2b3b614d 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -940,7 +940,7 @@ void sub_80E9E44(u8 taskId) s16 *data; data = gTasks[taskId].data; - data[8] = AddScrollIndicatorArrowPairParametrized(0x02, 0xbc, 0x0c, 0x94, data[0] - data[3], 0x13f8, 0x13f8, &data[2]); + data[8] = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xbc, 0x0c, 0x94, data[0] - data[3], 0x13f8, 0x13f8, &data[2]); } void sub_80E9E90(u8 taskId) diff --git a/src/start_menu.c b/src/start_menu.c index 37cafc0ff1..7e343e0313 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -1261,7 +1261,7 @@ static void sub_80A0550(u8 taskId) sub_8098858(0, 8, 14); PutWindowTilemap(0); CopyWindowToVram(0, 3); - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); if (gWirelessCommType != 0 && InUnionRoom()) { @@ -1294,7 +1294,7 @@ static void sub_80A0550(u8 taskId) } break; case 3: - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); *step = 4; break; case 4: diff --git a/src/starter_choose.c b/src/starter_choose.c index 480edbcb74..14592dac1f 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -46,7 +46,7 @@ extern const u8 gStarterChoose_LabelCoords[][2]; extern const u8 gUnknown_085B1E0C[]; extern const u8 gUnknown_085B1E28[][2]; -extern void sub_809882C(u8, u16, u8); +extern void LoadUserWindowBorderGfx(u8, u16, u8); extern void ScanlineEffect_Stop(void); extern void clear_scheduled_bg_copies_to_vram(void); extern void dp13_810BB8C(void); @@ -126,7 +126,7 @@ void CB2_ChooseStarter(void) InitWindows(gUnknown_085B1DCC); DeactivateAllTextPrinters(); - sub_809882C(0, 0x2A8, 0xD0); + LoadUserWindowBorderGfx(0, 0x2A8, 0xD0); clear_scheduled_bg_copies_to_vram(); ScanlineEffect_Stop(); ResetTasks(); @@ -140,7 +140,7 @@ void CB2_ChooseStarter(void) LoadCompressedObjectPic(&gUnknown_085B1ED8[0]); LoadCompressedObjectPic(&gUnknown_085B1EE8[0]); LoadSpritePalettes(gUnknown_085B1EF8); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); EnableInterrupts(DISPSTAT_VBLANK); SetVBlankCallback(VblankCB_StarterChoose); diff --git a/src/text.c b/src/text.c index f7c68f549e..0fc00c9b9a 100644 --- a/src/text.c +++ b/src/text.c @@ -3157,7 +3157,7 @@ u32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing) width = lineWidths[strPos]; } - return (u8)(GetFontAttribute(fontId, 0) + letterSpacing) * width; + return (u8)(GetFontAttribute(fontId, FONTATTR_MAX_LETTER_WIDTH) + letterSpacing) * width; } u32 (*GetFontWidthFunc(u8 glyphId))(u16, bool32) @@ -3193,7 +3193,7 @@ u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing) return 0; if (letterSpacing == -1) - localLetterSpacing = GetFontAttribute(fontId, 2); + localLetterSpacing = GetFontAttribute(fontId, FONTATTR_LETTER_SPACING); else localLetterSpacing = letterSpacing; @@ -3269,7 +3269,7 @@ u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing) if (func == NULL) return 0; if (letterSpacing == -1) - localLetterSpacing = GetFontAttribute(*str, 2); + localLetterSpacing = GetFontAttribute(*str, FONTATTR_LETTER_SPACING); break; case 0x11: glyphWidth = *++str; @@ -3497,28 +3497,28 @@ u8 GetFontAttribute(u8 fontId, u8 attributeId) int result = 0; switch (attributeId) { - case 0: + case FONTATTR_MAX_LETTER_WIDTH: result = gFontInfos[fontId].maxLetterWidth; break; - case 1: + case FONTATTR_MAX_LETTER_HEIGHT: result = gFontInfos[fontId].maxLetterHeight; break; - case 2: + case FONTATTR_LETTER_SPACING: result = gFontInfos[fontId].letterSpacing; break; - case 3: + case FONTATTR_LINE_SPACING: result = gFontInfos[fontId].lineSpacing; break; - case 4: + case FONTATTR_COLOR_LOWNIBBLE: result = gFontInfos[fontId].fontColor_l; break; - case 5: + case FONTATTR_COLOR_FOREGROUND: result = gFontInfos[fontId].fgColor; break; - case 6: + case FONTATTR_COLOR_BACKGROUND: result = gFontInfos[fontId].bgColor; break; - case 7: + case FONTATTR_COLOR_SHADOW: result = gFontInfos[fontId].shadowColor; break; } diff --git a/src/text_window.c b/src/text_window.c index c3b9f7197f..54bae6055d 100644 --- a/src/text_window.c +++ b/src/text_window.c @@ -99,18 +99,18 @@ void copy_textbox_border_tile_patterns_to_vram(u8 windowId, u16 destOffset, u8 p void box_border_load_tiles_and_pal(u8 windowId, u16 destOffset, u8 palOffset) { - sub_809882C(windowId, destOffset, palOffset); + LoadUserWindowBorderGfx(windowId, destOffset, palOffset); } -void sub_80987D4(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset) +void LoadWindowGfx(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset) { LoadBgTiles(GetWindowAttribute(windowId, WINDOW_PRIORITY), sWindowFrames[frameId].tiles, 0x120, destOffset); LoadPalette(sWindowFrames[frameId].pal, palOffset, 0x20); } -void sub_809882C(u8 windowId, u16 destOffset, u8 palOffset) +void LoadUserWindowBorderGfx(u8 windowId, u16 destOffset, u8 palOffset) { - sub_80987D4(windowId, gSaveBlock2Ptr->optionsWindowFrameType, destOffset, palOffset); + LoadWindowGfx(windowId, gSaveBlock2Ptr->optionsWindowFrameType, destOffset, palOffset); } void sub_8098858(u8 windowId, u16 tileNum, u8 palNum) diff --git a/src/title_screen.c b/src/title_screen.c index 15a0482dca..8a2c011929 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -546,7 +546,7 @@ void CB2_InitTitleScreen(void) break; } case 3: - BeginNormalPaletteFade(-1, 1, 0x10, 0, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 1, 0x10, 0, 0xFFFF); SetVBlankCallback(VBlankCB); gMain.state = 4; break; @@ -696,7 +696,7 @@ static void Task_TitleScreenPhase3(u8 taskId) if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & START_BUTTON)) { FadeOutBGM(4); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0xFFFF); SetMainCallback2(CB2_GoToMainMenu); } else if ((gMain.heldKeys & CLEAR_SAVE_BUTTON_COMBO) == CLEAR_SAVE_BUTTON_COMBO) @@ -707,13 +707,13 @@ static void Task_TitleScreenPhase3(u8 taskId) && CanResetRTC() == TRUE) { FadeOutBGM(4); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); SetMainCallback2(CB2_GoToResetRtcScreen); } else if ((gMain.heldKeys & BERRY_UPDATE_BUTTON_COMBO) == BERRY_UPDATE_BUTTON_COMBO) { FadeOutBGM(4); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); SetMainCallback2(CB2_GoToBerryFixScreen); } else @@ -730,7 +730,7 @@ static void Task_TitleScreenPhase3(u8 taskId) UpdateLegendaryMarkingColor(gTasks[taskId].tCounter); if ((gMPlayInfo_BGM.status & 0xFFFF) == 0) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0xFFFF); SetMainCallback2(CB2_GoToCopyrightScreen); } } diff --git a/src/unk_transition.c b/src/unk_transition.c index feaddc8ced..20692bb7c1 100644 --- a/src/unk_transition.c +++ b/src/unk_transition.c @@ -356,7 +356,7 @@ static bool8 sub_81DAB4C(struct Task *task) { if (task->data[3] == 31) { - BeginNormalPaletteFade(-1, -1, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 0x10, 0); task->tState++; } else diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index c8898d08f4..72c33100f1 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -164,7 +164,7 @@ void sub_8166380(void) InitBgsFromTemplates(0, gUnknown_085DFCCC, ARRAY_COUNT(gUnknown_085DFCCC)); InitWindows(gUnknown_085DFCDC); DeactivateAllTextPrinters(); - sub_809882C(0, 0x97, 0xE0); + LoadUserWindowBorderGfx(0, 0x97, 0xE0); gUnknown_0203BC90->field_50++; break; case 4: diff --git a/src/wallclock.c b/src/wallclock.c index f15bbbc274..9b96d416cc 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -576,7 +576,7 @@ static void LoadWallClockGraphics(void) InitBgsFromTemplates(0, gUnknown_085B21FC, 3); InitWindows(gUnknown_085B21DC); DeactivateAllTextPrinters(); - sub_809882C(0, 0x250, 0xd0); + LoadUserWindowBorderGfx(0, 0x250, 0xd0); clear_scheduled_bg_copies_to_vram(); ScanlineEffect_Stop(); ResetTasks(); @@ -589,7 +589,7 @@ static void LoadWallClockGraphics(void) static void WallClockInit(void) { - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); EnableInterrupts(INTR_FLAG_VBLANK); SetVBlankCallback(WallClockVblankCallback); SetMainCallback2(WallClockMainCallback); @@ -782,7 +782,7 @@ static void Task_SetClock4(u8 taskId) static void Task_SetClock5(u8 taskId) { RtcInitLocalTimeOffset(gTasks[taskId].tHours, gTasks[taskId].tMinutes); - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); gTasks[taskId].func = Task_SetClock6; } @@ -814,7 +814,7 @@ static void Task_ViewClock2(u8 taskId) static void Task_ViewClock3(u8 taskId) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); gTasks[taskId].func = Task_ViewClock4; } From bf0178238a179b298f465b64a4f23ff43db48fc9 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 16 Jul 2018 20:47:30 +0200 Subject: [PATCH 54/55] Battle files - review changes --- include/battle.h | 8 +-- include/battle_controllers.h | 2 +- include/constants/trainers.h | 6 +- include/gba/io_reg.h | 2 + src/battle_ai_script_commands.c | 10 ++-- src/battle_controller_player.c | 4 +- src/battle_controller_player_partner.c | 4 +- src/battle_interface.c | 4 +- src/battle_message.c | 8 +-- src/battle_script_commands.c | 8 +-- src/battle_util.c | 80 +++++++++++++------------- src/braille_puzzles.c | 20 +++++-- src/pokemon.c | 21 ++++--- 13 files changed, 95 insertions(+), 82 deletions(-) diff --git a/include/battle.h b/include/battle.h index fba5fb460a..3843bc5e69 100644 --- a/include/battle.h +++ b/include/battle.h @@ -214,8 +214,8 @@ struct SpecialStatus { u8 statLowered:1; // 0x1 u8 lightningRodRedirected:1; // 0x2 - u8 restoredBankSprite: 1; // 0x4 - u8 intimidatedPoke:1; // 0x8 + u8 restoredBattlerSprite: 1; // 0x4 + u8 intimidatedMon:1; // 0x8 u8 traced:1; // 0x10 u8 flag20:1; u8 flag40:1; @@ -607,8 +607,8 @@ struct BattleScripting // rom_80A5C6C u8 GetBattlerSide(u8 battler); -u8 GetBattlerPosition(u8 bank); -u8 GetBattlerAtPosition(u8 bank); +u8 GetBattlerPosition(u8 battler); +u8 GetBattlerAtPosition(u8 battler); struct BattleSpriteInfo { diff --git a/include/battle_controllers.h b/include/battle_controllers.h index 8ba45fad14..ff5a629af5 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -81,7 +81,7 @@ enum #define INSTANT_HP_BAR_DROP 32767 // Special return values in gBattleBufferB from Battle Controller functions. -#define RET_VALUE_LEVELLED_UP 11 +#define RET_VALUE_LEVELED_UP 11 struct UnusedControllerStruct { diff --git a/include/constants/trainers.h b/include/constants/trainers.h index eb695e4ab1..43ea6d0b6a 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -862,9 +862,9 @@ // Special Trainer Ids. #define TRAINER_FRONTIER_BRAIN 1022 #define TRAINER_SECRET_BASE 1024 -#define TRAINER_LINK_OPPONENT 0x800 -#define TRAINER_OPPONENT_C00 0xC00 -#define TRAINER_STEVEN_PARTNER 0xC03 +#define TRAINER_LINK_OPPONENT 2048 +#define TRAINER_OPPONENT_C00 3072 +#define TRAINER_STEVEN_PARTNER 3075 #define TRAINER_PIC_HIKER 0 #define TRAINER_PIC_AQUA_GRUNT_M 1 diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h index 6498c6a99e..01d8c311eb 100644 --- a/include/gba/io_reg.h +++ b/include/gba/io_reg.h @@ -582,6 +582,7 @@ #define BLDCNT_TGT1_BG3 (1 << 3) #define BLDCNT_TGT1_OBJ (1 << 4) #define BLDCNT_TGT1_BD (1 << 5) +#define BLDCNT_TGT1_ALL (BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD) // Bits 6-7 select the special effect #define BLDCNT_EFFECT_NONE (0 << 6) // no special effect #define BLDCNT_EFFECT_BLEND (1 << 6) // 1st+2nd targets mixed (controlled by BLDALPHA) @@ -594,6 +595,7 @@ #define BLDCNT_TGT2_BG3 (1 << 11) #define BLDCNT_TGT2_OBJ (1 << 12) #define BLDCNT_TGT2_BD (1 << 13) +#define BLDCNT_TGT2_ALL (BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD) // BLDALPHA #define BLDALPHA_BLEND(target1, target2) (((target2) << 8) | (target1)) diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index e82d225762..74247f8a2d 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -352,7 +352,7 @@ void BattleAI_SetupAIData(u8 defaultScoreMoves) if (gAbsentBattlerFlags & gBitTable[gBattlerTarget]) gBattlerTarget ^= BIT_FLANK; } - // There's only one choice in signle battles. + // There's only one choice in single battles. else { gBattlerTarget = sBattler_AI ^ BIT_SIDE; @@ -774,7 +774,7 @@ static void BattleAICmd_if_status(void) status = T1_READ_32(gAIScriptPtr + 2); - if ((gBattleMons[battlerId].status1 & status)) + if (gBattleMons[battlerId].status1 & status) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -846,7 +846,7 @@ static void BattleAICmd_if_status3(void) status = T1_READ_32(gAIScriptPtr + 2); - if ((gStatuses3[battlerId] & status)) + if (gStatuses3[battlerId] & status) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -883,7 +883,7 @@ static void BattleAICmd_if_side_affecting(void) side = GET_BATTLER_SIDE(battlerId); status = T1_READ_32(gAIScriptPtr + 2); - if ((gSideStatuses[side] & status)) + if (gSideStatuses[side] & status) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -1949,7 +1949,7 @@ static void BattleAICmd_if_curr_move_disabled_or_encored(void) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); else gAIScriptPtr += 6; - break;; + break; case 1: if (gDisableStructs[gActiveBattler].encoredMove == AI_THINKING_STRUCT->moveConsidered) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 843d241ce0..6ab19e368c 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -1169,7 +1169,7 @@ static void Task_GiveExpToMon(u8 taskId) gainedExp -= nextLvlExp - currExp; savedActiveBattler = gActiveBattler; gActiveBattler = battlerId; - BtlController_EmitTwoReturnValues(1, RET_VALUE_LEVELLED_UP, gainedExp); + BtlController_EmitTwoReturnValues(1, RET_VALUE_LEVELED_UP, gainedExp); gActiveBattler = savedActiveBattler; if (IsDoubleBattle() == TRUE @@ -1248,7 +1248,7 @@ static void sub_8059400(u8 taskId) gainedExp -= expOnNextLvl - currExp; savedActiveBattler = gActiveBattler; gActiveBattler = battlerId; - BtlController_EmitTwoReturnValues(1, RET_VALUE_LEVELLED_UP, gainedExp); + BtlController_EmitTwoReturnValues(1, RET_VALUE_LEVELED_UP, gainedExp); gActiveBattler = savedActiveBattler; gTasks[taskId].func = Task_LaunchLvlUpAnim; } diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index cd3a946924..601b8dcc1e 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -345,7 +345,7 @@ static void Task_GiveExpToMon(u8 taskId) gainedExp -= nextLvlExp - currExp; savedActiveBank = gActiveBattler; gActiveBattler = battlerId; - BtlController_EmitTwoReturnValues(1, RET_VALUE_LEVELLED_UP, gainedExp); + BtlController_EmitTwoReturnValues(1, RET_VALUE_LEVELED_UP, gainedExp); gActiveBattler = savedActiveBank; if (IsDoubleBattle() == TRUE @@ -424,7 +424,7 @@ static void sub_81BB4E4(u8 taskId) gainedExp -= expOnNextLvl - currExp; savedActiveBank = gActiveBattler; gActiveBattler = battlerId; - BtlController_EmitTwoReturnValues(1, RET_VALUE_LEVELLED_UP, gainedExp); + BtlController_EmitTwoReturnValues(1, RET_VALUE_LEVELED_UP, gainedExp); gActiveBattler = savedActiveBank; gTasks[taskId].func = sub_81BB628; } diff --git a/src/battle_interface.c b/src/battle_interface.c index a6032adc3d..278edb6f43 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -1710,8 +1710,8 @@ void Task_HidePartyStatusSummary(u8 taskId) for (i = 0; i < PARTY_SIZE; i++) ballIconSpriteIds[i] = gTasks[taskId].tBallIconSpriteId(i); - SetGpuReg(REG_OFFSET_BLDCNT, 0x3F40); - SetGpuReg(REG_OFFSET_BLDALPHA, 0x10); + SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16, 0)); gTasks[taskId].tData15 = 16; diff --git a/src/battle_message.c b/src/battle_message.c index 32097fd761..4f5190dec8 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -2940,19 +2940,19 @@ static void ChooseTypeOfMoveUsedString(u8* dst) void BattlePutTextOnWindow(const u8 *text, u8 windowId) { const struct BattleWindowText *textInfo = sBattleTextOnWindowsInfo[gBattleScripting.windowsType]; - bool32 toVram; + bool32 copyToVram; struct TextSubPrinter textSubPrinter; u8 speed; if (windowId & 0x80) { windowId &= ~(0x80); - toVram = FALSE; + copyToVram = FALSE; } else { FillWindowPixelBuffer(windowId, textInfo[windowId].fillValue); - toVram = TRUE; + copyToVram = TRUE; } textSubPrinter.current_text_offset = text; @@ -3005,7 +3005,7 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId) AddTextPrinter(&textSubPrinter, speed, NULL); - if (toVram) + if (copyToVram) { PutWindowTilemap(windowId); CopyWindowToVram(windowId, 3); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index eb31c22dc7..87244ff5a3 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -3449,7 +3449,7 @@ static void atk23_getexp(void) if (gBattleControllerExecFlags == 0) { gActiveBattler = gBattleStruct->expGetterBattlerId; - if (gBattleBufferB[gActiveBattler][0] == CONTROLLER_TWORETURNVALUES && gBattleBufferB[gActiveBattler][1] == RET_VALUE_LEVELLED_UP) + if (gBattleBufferB[gActiveBattler][0] == CONTROLLER_TWORETURNVALUES && gBattleBufferB[gActiveBattler][1] == RET_VALUE_LEVELED_UP) { if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gBattlerPartyIndexes[gActiveBattler] == gBattleStruct->expGetterMonId) HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); @@ -4649,14 +4649,14 @@ static void atk49_moveend(void) BtlController_EmitSpriteInvisibility(0, FALSE); MarkBattlerForControllerExec(gActiveBattler); gStatuses3[gBattlerAttacker] &= ~(STATUS3_SEMI_INVULNERABLE); - gSpecialStatuses[gBattlerAttacker].restoredBankSprite = 1; + gSpecialStatuses[gBattlerAttacker].restoredBattlerSprite = 1; gBattleScripting.atk49_state++; return; } gBattleScripting.atk49_state++; break; case 10: // make target sprite visible - if (!gSpecialStatuses[gBattlerTarget].restoredBankSprite && gBattlerTarget < gBattlersCount + if (!gSpecialStatuses[gBattlerTarget].restoredBattlerSprite && gBattlerTarget < gBattlersCount && !(gStatuses3[gBattlerTarget] & STATUS3_SEMI_INVULNERABLE)) { gActiveBattler = gBattlerTarget; @@ -6632,7 +6632,7 @@ static void atk76_various(void) gBattleCommunication[0] = 0; break; case VARIOUS_RESET_INTIMIDATE_TRACE_BITS: - gSpecialStatuses[gActiveBattler].intimidatedPoke = 0; + gSpecialStatuses[gActiveBattler].intimidatedMon = 0; gSpecialStatuses[gActiveBattler].traced = 0; break; case VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP: diff --git a/src/battle_util.c b/src/battle_util.c index 6e3fc3e7fd..c739c648c4 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -470,11 +470,11 @@ u8 GetImprisonedMovesCount(u8 battlerId, u16 move) { s32 i; u8 imprisionedMoves = 0; - u8 BattlerSide = GetBattlerSide(battlerId); + u8 battlerSide = GetBattlerSide(battlerId); for (i = 0; i < gBattlersCount; i++) { - if (BattlerSide != GetBattlerSide(i) && gStatuses3[i] & STATUS3_IMPRISONED_OTHERS) + if (battlerSide != GetBattlerSide(i) && gStatuses3[i] & STATUS3_IMPRISONED_OTHERS) { s32 j; for (j = 0; j < 4; j++) @@ -1840,10 +1840,10 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA } break; case ABILITY_INTIMIDATE: - if (!(gSpecialStatuses[battler].intimidatedPoke)) + if (!(gSpecialStatuses[battler].intimidatedMon)) { gStatuses3[battler] |= STATUS3_INTIMIDATE_POKES; - gSpecialStatuses[battler].intimidatedPoke = 1; + gSpecialStatuses[battler].intimidatedMon = 1; } break; case ABILITY_FORECAST: @@ -2511,32 +2511,32 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) int i = 0; u8 effect = ITEM_NO_EFFECT; u8 changedPP = 0; - u8 BattlerHoldEffect, atkHoldEffect, defHoldEffect; - u8 BattlerQuality, atkQuality, defQuality; + u8 battlerHoldEffect, atkHoldEffect, defHoldEffect; + u8 battlerHoldEffectParam, atkHoldEffectParam, defHoldEffectParam; u16 atkItem, defItem; gLastUsedItem = gBattleMons[battlerId].item; if (gLastUsedItem == ITEM_ENIGMA_BERRY) { - BattlerHoldEffect = gEnigmaBerries[battlerId].holdEffect; - BattlerQuality = gEnigmaBerries[battlerId].holdEffectParam; + battlerHoldEffect = gEnigmaBerries[battlerId].holdEffect; + battlerHoldEffectParam = gEnigmaBerries[battlerId].holdEffectParam; } else { - BattlerHoldEffect = ItemId_GetHoldEffect(gLastUsedItem); - BattlerQuality = ItemId_GetHoldEffectParam(gLastUsedItem); + battlerHoldEffect = ItemId_GetHoldEffect(gLastUsedItem); + battlerHoldEffectParam = ItemId_GetHoldEffectParam(gLastUsedItem); } atkItem = gBattleMons[gBattlerAttacker].item; if (atkItem == ITEM_ENIGMA_BERRY) { atkHoldEffect = gEnigmaBerries[gBattlerAttacker].holdEffect; - atkQuality = gEnigmaBerries[gBattlerAttacker].holdEffectParam; + atkHoldEffectParam = gEnigmaBerries[gBattlerAttacker].holdEffectParam; } else { atkHoldEffect = ItemId_GetHoldEffect(atkItem); - atkQuality = ItemId_GetHoldEffectParam(atkItem); + atkHoldEffectParam = ItemId_GetHoldEffectParam(atkItem); } // def variables are unused @@ -2544,18 +2544,18 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) if (defItem == ITEM_ENIGMA_BERRY) { defHoldEffect = gEnigmaBerries[gBattlerTarget].holdEffect; - defQuality = gEnigmaBerries[gBattlerTarget].holdEffectParam; + defHoldEffectParam = gEnigmaBerries[gBattlerTarget].holdEffectParam; } else { defHoldEffect = ItemId_GetHoldEffect(defItem); - defQuality = ItemId_GetHoldEffectParam(defItem); + defHoldEffectParam = ItemId_GetHoldEffectParam(defItem); } switch (caseID) { case ITEMEFFECT_ON_SWITCH_IN: - switch (BattlerHoldEffect) + switch (battlerHoldEffect) { case HOLD_EFFECT_DOUBLE_PRIZE: if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) @@ -2583,13 +2583,13 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) case 1: if (gBattleMons[battlerId].hp) { - switch (BattlerHoldEffect) + switch (battlerHoldEffect) { case HOLD_EFFECT_RESTORE_HP: if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / 2 && !moveTurn) { - gBattleMoveDamage = BattlerQuality; - if (gBattleMons[battlerId].hp + BattlerQuality > gBattleMons[battlerId].maxHP) + gBattleMoveDamage = battlerHoldEffectParam; + if (gBattleMons[battlerId].hp + battlerHoldEffectParam > gBattleMons[battlerId].maxHP) gBattleMoveDamage = gBattleMons[battlerId].maxHP - gBattleMons[battlerId].hp; gBattleMoveDamage *= -1; BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem); @@ -2618,10 +2618,10 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) if (i != 4) { u8 maxPP = CalculatePPWithBonus(move, ppBonuses, i); - if (changedPP + BattlerQuality > maxPP) + if (changedPP + battlerHoldEffectParam > maxPP) changedPP = maxPP; else - changedPP = changedPP + BattlerQuality; + changedPP = changedPP + battlerHoldEffectParam; PREPARE_MOVE_BUFFER(gBattleTextBuff1, move); @@ -2660,7 +2660,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) gBattleMoveDamage *= -1; BattleScriptExecute(BattleScript_ItemHealHP_End2); effect = ITEM_HP_CHANGE; - RecordItemEffectBattle(battlerId, BattlerHoldEffect); + RecordItemEffectBattle(battlerId, battlerHoldEffect); } break; // nice copy/paste there gamefreak, making a function for confuse berries was too much eh? @@ -2669,7 +2669,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) { PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_SPICY); - gBattleMoveDamage = gBattleMons[battlerId].maxHP / BattlerQuality; + gBattleMoveDamage = gBattleMons[battlerId].maxHP / battlerHoldEffectParam; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; if (gBattleMons[battlerId].hp + gBattleMoveDamage > gBattleMons[battlerId].maxHP) @@ -2687,7 +2687,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) { PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_DRY); - gBattleMoveDamage = gBattleMons[battlerId].maxHP / BattlerQuality; + gBattleMoveDamage = gBattleMons[battlerId].maxHP / battlerHoldEffectParam; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; if (gBattleMons[battlerId].hp + gBattleMoveDamage > gBattleMons[battlerId].maxHP) @@ -2705,7 +2705,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) { PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_SWEET); - gBattleMoveDamage = gBattleMons[battlerId].maxHP / BattlerQuality; + gBattleMoveDamage = gBattleMons[battlerId].maxHP / battlerHoldEffectParam; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; if (gBattleMons[battlerId].hp + gBattleMoveDamage > gBattleMons[battlerId].maxHP) @@ -2723,7 +2723,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) { PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_BITTER); - gBattleMoveDamage = gBattleMons[battlerId].maxHP / BattlerQuality; + gBattleMoveDamage = gBattleMons[battlerId].maxHP / battlerHoldEffectParam; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; if (gBattleMons[battlerId].hp + gBattleMoveDamage > gBattleMons[battlerId].maxHP) @@ -2741,7 +2741,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) { PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_SOUR); - gBattleMoveDamage = gBattleMons[battlerId].maxHP / BattlerQuality; + gBattleMoveDamage = gBattleMons[battlerId].maxHP / battlerHoldEffectParam; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; if (gBattleMons[battlerId].hp + gBattleMoveDamage > gBattleMons[battlerId].maxHP) @@ -2756,7 +2756,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) break; // copy/paste again, smh case HOLD_EFFECT_ATTACK_UP: - if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_ATK] < 0xC) + if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn && gBattleMons[battlerId].statStages[STAT_ATK] < 0xC) { PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_ATK); PREPARE_STRING_BUFFER(gBattleTextBuff2, STRINGID_STATROSE); @@ -2770,7 +2770,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) } break; case HOLD_EFFECT_DEFENSE_UP: - if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_DEF] < 0xC) + if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn && gBattleMons[battlerId].statStages[STAT_DEF] < 0xC) { PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_DEF); @@ -2783,7 +2783,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) } break; case HOLD_EFFECT_SPEED_UP: - if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPEED] < 0xC) + if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPEED] < 0xC) { PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_SPEED); @@ -2796,7 +2796,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) } break; case HOLD_EFFECT_SP_ATTACK_UP: - if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPATK] < 0xC) + if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPATK] < 0xC) { PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_SPATK); @@ -2809,7 +2809,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) } break; case HOLD_EFFECT_SP_DEFENSE_UP: - if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPDEF] < 0xC) + if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPDEF] < 0xC) { PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_SPDEF); @@ -2822,7 +2822,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) } break; case HOLD_EFFECT_CRITICAL_UP: - if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality && !moveTurn && !(gBattleMons[battlerId].status2 & STATUS2_FOCUS_ENERGY)) + if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn && !(gBattleMons[battlerId].status2 & STATUS2_FOCUS_ENERGY)) { gBattleMons[battlerId].status2 |= STATUS2_FOCUS_ENERGY; BattleScriptExecute(BattleScript_BerryFocusEnergyEnd2); @@ -2830,7 +2830,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) } break; case HOLD_EFFECT_RANDOM_STAT_UP: - if (!moveTurn && gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality) + if (!moveTurn && gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam) { for (i = 0; i < 5; i++) { @@ -2996,15 +2996,15 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) gLastUsedItem = gBattleMons[battlerId].item; if (gBattleMons[battlerId].item == ITEM_ENIGMA_BERRY) { - BattlerHoldEffect = gEnigmaBerries[battlerId].holdEffect; - BattlerQuality = gEnigmaBerries[battlerId].holdEffectParam; + battlerHoldEffect = gEnigmaBerries[battlerId].holdEffect; + battlerHoldEffectParam = gEnigmaBerries[battlerId].holdEffectParam; } else { - BattlerHoldEffect = ItemId_GetHoldEffect(gLastUsedItem); - BattlerQuality = ItemId_GetHoldEffectParam(gLastUsedItem); + battlerHoldEffect = ItemId_GetHoldEffect(gLastUsedItem); + battlerHoldEffectParam = ItemId_GetHoldEffectParam(gLastUsedItem); } - switch (BattlerHoldEffect) + switch (battlerHoldEffect) { case HOLD_EFFECT_CURE_PAR: if (gBattleMons[battlerId].status1 & STATUS1_PARALYSIS) @@ -3146,7 +3146,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) case HOLD_EFFECT_FLINCH: if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && TARGET_TURN_DAMAGED - && (Random() % 100) < atkQuality + && (Random() % 100) < atkHoldEffectParam && gBattleMoves[gCurrentMove].flags & FLAG_KINGSROCK_AFFECTED && gBattleMons[gBattlerTarget].hp) { @@ -3167,7 +3167,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) gLastUsedItem = atkItem; gPotentialItemEffectBattler = gBattlerAttacker; gBattleScripting.battler = gBattlerAttacker; - gBattleMoveDamage = (gSpecialStatuses[gBattlerTarget].dmg / atkQuality) * -1; + gBattleMoveDamage = (gSpecialStatuses[gBattlerTarget].dmg / atkHoldEffectParam) * -1; if (gBattleMoveDamage == 0) gBattleMoveDamage = -1; gSpecialStatuses[gBattlerTarget].dmg = 0; diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index 91fcf8c460..b7ed1f7135 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -7,6 +7,7 @@ #include "task.h" #include "field_effect.h" #include "constants/flags.h" +#include "constants/maps.h" extern void MapGridSetMetatileIdAt(s32 x, s32 y, u16 metatileId); // fieldmap extern void DrawWholeMapView(); // field_camera @@ -205,14 +206,25 @@ void SealedChamberShakingEffect(u8 taskId) // moved later in the function because it was rewritten. bool8 ShouldDoBrailleStrengthEffect(void) { - if (!FlagGet(FLAG_SYS_BRAILLE_STRENGTH) && (gSaveBlock1Ptr->location.mapGroup == 0x18 && gSaveBlock1Ptr->location.mapNum == 0x06)) + if (!FlagGet(FLAG_SYS_BRAILLE_STRENGTH) + && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(DESERT_RUINS) + && gSaveBlock1Ptr->location.mapNum == MAP_NUM(DESERT_RUINS)) { if (gSaveBlock1Ptr->pos.x == 6 && gSaveBlock1Ptr->pos.y == 23) - { sBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; return TRUE; } + { + sBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; + return TRUE; + } else if (gSaveBlock1Ptr->pos.x == 5 && gSaveBlock1Ptr->pos.y == 23) - { sBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; return TRUE; } + { + sBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; + return TRUE; + } else if (gSaveBlock1Ptr->pos.x == 7 && gSaveBlock1Ptr->pos.y == 23) - { sBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; return TRUE; } + { + sBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; + return TRUE; + } } return FALSE; diff --git a/src/pokemon.c b/src/pokemon.c index 5406cfee99..bb2959eda3 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2265,7 +2265,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if (attackerHoldEffect == sHoldEffectToType[i][0] && type == sHoldEffectToType[i][1]) { - if (type <= 8) + if (IS_MOVE_PHYSICAL(type)) attack = (attack * (attackerHoldEffectParam + 100)) / 100; else spAttack = (spAttack * (attackerHoldEffectParam + 100)) / 100; @@ -2293,9 +2293,9 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de spAttack /= 2; if (attacker->ability == ABILITY_HUSTLE) attack = (150 * attack) / 100; - if (attacker->ability == ABILITY_PLUS && AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, ABILITY_MINUS, 0, 0)) + if (attacker->ability == ABILITY_PLUS && ABILITY_ON_FIELD2(ABILITY_MINUS)) spAttack = (150 * spAttack) / 100; - if (attacker->ability == ABILITY_MINUS && AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, ABILITY_PLUS, 0, 0)) + if (attacker->ability == ABILITY_MINUS && ABILITY_ON_FIELD2(ABILITY_PLUS)) spAttack = (150 * spAttack) / 100; if (attacker->ability == ABILITY_GUTS && attacker->status1) attack = (150 * attack) / 100; @@ -2316,7 +2316,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if (gBattleMoves[gCurrentMove].effect == EFFECT_EXPLOSION) defense /= 2; - if (type < TYPE_MYSTERY) // is physical + if (IS_MOVE_PHYSICAL(type) && type != TYPE_MYSTERY) { if (gCritMultiplier == 2) { @@ -2366,7 +2366,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if (type == TYPE_MYSTERY) damage = 0; // is ??? type. does 0 damage. - if (type > TYPE_MYSTERY) // is special? + if (IS_MOVE_SPECIAL(type)) { if (gCritMultiplier == 2) { @@ -2406,8 +2406,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de damage /= 2; // are effects of weather negated with cloud nine or air lock - if (!AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, ABILITY_CLOUD_NINE, 0, 0) - && !AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, ABILITY_AIR_LOCK, 0, 0)) + if (WEATHER_HAS_EFFECT2) { if (gBattleWeather & WEATHER_RAIN_TEMPORARY) { @@ -4514,7 +4513,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem) holdEffect = ItemId_GetHoldEffect(heldItem); if (holdEffect == HOLD_EFFECT_PREVENT_EVOLVE && type != 3) - return 0; + return SPECIES_NONE; switch (type) { @@ -4522,7 +4521,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem) level = GetMonData(mon, MON_DATA_LEVEL, 0); friendship = GetMonData(mon, MON_DATA_FRIENDSHIP, 0); - for (i = 0; i < 5; i++) + for (i = 0; i < EVOS_PER_MON; i++) { switch (gEvolutionTable[species][i].method) { @@ -4579,7 +4578,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem) } break; case 1: - for (i = 0; i < 5; i++) + for (i = 0; i < EVOS_PER_MON; i++) { switch (gEvolutionTable[species][i].method) { @@ -4599,7 +4598,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem) break; case 2: case 3: - for (i = 0; i < 5; i++) + for (i = 0; i < EVOS_PER_MON; i++) { if (gEvolutionTable[species][i].method == EVO_ITEM && gEvolutionTable[species][i].param == evolutionItem) From 118fa3afcee68deb3eeb2bc876a9afd02a45677c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 16 Jul 2018 22:00:27 +0200 Subject: [PATCH 55/55] IS_MOVE_PHYSICAL to IS_TYPE_PHYSIAL --- include/battle.h | 4 ++-- src/battle_script_commands.c | 6 +++--- src/pokemon.c | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/battle.h b/include/battle.h index 3843bc5e69..bd7ba4b35f 100644 --- a/include/battle.h +++ b/include/battle.h @@ -555,8 +555,8 @@ struct BattleStruct typeArg = gBattleMoves[move].type; \ } -#define IS_MOVE_PHYSICAL(moveType)(moveType < TYPE_MYSTERY) -#define IS_MOVE_SPECIAL(moveType)(moveType > TYPE_MYSTERY) +#define IS_TYPE_PHYSICAL(moveType)(moveType < TYPE_MYSTERY) +#define IS_TYPE_SPECIAL(moveType)(moveType > TYPE_MYSTERY) #define TARGET_TURN_DAMAGED ((gSpecialStatuses[gBattlerTarget].physicalDmg != 0 || gSpecialStatuses[gBattlerTarget].specialDmg != 0)) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 87244ff5a3..3af03a5e0f 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -1173,7 +1173,7 @@ static void atk01_accuracycheck(void) calc = (calc * 130) / 100; // 1.3 compound eyes boost if (WEATHER_HAS_EFFECT && gBattleMons[gBattlerTarget].ability == ABILITY_SAND_VEIL && gBattleWeather & WEATHER_SANDSTORM_ANY) calc = (calc * 80) / 100; // 1.2 sand veil loss - if (gBattleMons[gBattlerAttacker].ability == ABILITY_HUSTLE && IS_MOVE_PHYSICAL(type)) + if (gBattleMons[gBattlerAttacker].ability == ABILITY_HUSTLE && IS_TYPE_PHYSICAL(type)) calc = (calc * 80) / 100; // 1.2 hustle loss if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY) @@ -1945,7 +1945,7 @@ static void atk0C_datahpupdate(void) if (!gSpecialStatuses[gActiveBattler].dmg && !(gHitMarker & HITMARKER_x100000)) gSpecialStatuses[gActiveBattler].dmg = gHpDealt; - if (IS_MOVE_PHYSICAL(moveType) && !(gHitMarker & HITMARKER_x100000) && gCurrentMove != MOVE_PAIN_SPLIT) + if (IS_TYPE_PHYSICAL(moveType) && !(gHitMarker & HITMARKER_x100000) && gCurrentMove != MOVE_PAIN_SPLIT) { gProtectStructs[gActiveBattler].physicalDmg = gHpDealt; gSpecialStatuses[gActiveBattler].physicalDmg = gHpDealt; @@ -1960,7 +1960,7 @@ static void atk0C_datahpupdate(void) gSpecialStatuses[gActiveBattler].physicalBattlerId = gBattlerTarget; } } - else if (!IS_MOVE_PHYSICAL(moveType) && !(gHitMarker & HITMARKER_x100000)) + else if (!IS_TYPE_PHYSICAL(moveType) && !(gHitMarker & HITMARKER_x100000)) { gProtectStructs[gActiveBattler].specialDmg = gHpDealt; gSpecialStatuses[gActiveBattler].specialDmg = gHpDealt; diff --git a/src/pokemon.c b/src/pokemon.c index bb2959eda3..c572ee10e8 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2265,7 +2265,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if (attackerHoldEffect == sHoldEffectToType[i][0] && type == sHoldEffectToType[i][1]) { - if (IS_MOVE_PHYSICAL(type)) + if (IS_TYPE_PHYSICAL(type)) attack = (attack * (attackerHoldEffectParam + 100)) / 100; else spAttack = (spAttack * (attackerHoldEffectParam + 100)) / 100; @@ -2316,7 +2316,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if (gBattleMoves[gCurrentMove].effect == EFFECT_EXPLOSION) defense /= 2; - if (IS_MOVE_PHYSICAL(type) && type != TYPE_MYSTERY) + if (IS_TYPE_PHYSICAL(type)) { if (gCritMultiplier == 2) { @@ -2366,7 +2366,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if (type == TYPE_MYSTERY) damage = 0; // is ??? type. does 0 damage. - if (IS_MOVE_SPECIAL(type)) + if (IS_TYPE_SPECIAL(type)) { if (gCritMultiplier == 2) {